6727 files changed, 183542 insertions, 185790 deletions

diff --git a/acct-group/gnome-remote-desktop/gnome-remote-desktop-0.ebuild b/acct-group/gnome-remote-desktop/gnome-remote-desktop-0.ebuild
new file mode 100644
index 000000000000..da364f69f1d6
--- /dev/null
+++ b/acct-group/gnome-remote-desktop/gnome-remote-desktop-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=545
diff --git a/acct-group/gnome-remote-desktop/metadata.xml b/acct-group/gnome-remote-desktop/metadata.xml
new file mode 100644
index 000000000000..f453528b934f
--- /dev/null
+++ b/acct-group/gnome-remote-desktop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/gnome-remote-desktop/gnome-remote-desktop-0.ebuild b/acct-user/gnome-remote-desktop/gnome-remote-desktop-0.ebuild
new file mode 100644
index 000000000000..8fd43900bcaa
--- /dev/null
+++ b/acct-user/gnome-remote-desktop/gnome-remote-desktop-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for running gnome-remote-desktop"
+
+ACCT_USER_ID=545
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME=/var/lib/gnome-remote-desktop
+
+acct-user_add_deps
diff --git a/acct-user/gnome-remote-desktop/metadata.xml b/acct-user/gnome-remote-desktop/metadata.xml
new file mode 100644
index 000000000000..f453528b934f
--- /dev/null
+++ b/acct-user/gnome-remote-desktop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 16dd34fa6712..9a974573d9d7 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,3 +1,4 @@
 DIST at-spi2-core-2.50.1.tar.xz 567836 BLAKE2B 88916f322efa547be2249388a5f7b698ff7fb9464bc98fa929524616d0d25237328c10678df800b9ce325a3050804e9b0044a43024d06b71381dfc32917700a3 SHA512 d0b342a1ff2a3dd91aa87663412289d1616906c14a37e81b8514882d44981092356dc8a5d5c66b6d980d2cdf22128fff74651a4af6cad73cb62fd3154c5bbeae
 DIST at-spi2-core-2.50.2.tar.xz 569124 BLAKE2B 7a69dbeb68b674d5b4e458dc10ba0e266583216f6a45f1924dee28e848bc124802f5181b0b1cc969eae2dfbb13df56b0c87bb1f347f6e323f6474d02a3543664 SHA512 a1c9ca77d34801b421c13f66d72e6101b23896dd210efbd7931ac0778e30c51a20759796a8c121946f57c1683626fd3ef34f88e5ad6495c20f6ac79fd0a96aa4
 DIST at-spi2-core-2.52.0.tar.xz 574684 BLAKE2B 642cf8a63700ed5d5e20eb356f60c5d5e771d34bb0a373e95c71898ea2318c41484faec736ec44b1162fac22a075ca5f7b4698b105972ea060d107f9afc7f5b9 SHA512 0482cae97cf5e2295ab56f6ae83db9e1047813a1c3c2b6cd6012f95dfabec1f7a93d0045a1a7c3fabb7a389f71dc43f797b2ad9242e97ddf565cf63948ae146b
+DIST at-spi2-core-2.54.1.tar.xz 576224 BLAKE2B b1a1657081f22623bba7730f687dc69e4b7c1562020edc42b29f0a8842ea8443021aab1b8fd23d75877c8023c43c586ce70640be42fef5663983381018e9e80b SHA512 28f94e745b2c563e7515207dc24da0658f68c2badd3085b15b14405e10e128ef776d674d840dfd8c2222bdb8fd88348a1a7e70df0bb19deed0e688d1c0c8b3c3
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.54.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.54.1.ebuild
new file mode 100644
index 000000000000..43d52a15eec4
--- /dev/null
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.54.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson-multilib systemd virtualx xdg
+
+DESCRIPTION="D-Bus accessibility specifications and registration daemon"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/at-spi2-core"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="X dbus-broker gtk-doc +introspection systemd"
+REQUIRED_USE="
+	dbus-broker? ( systemd )
+	gtk-doc? ( X )
+"
+
+DEPEND="
+	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.67.4:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
+	systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+	)
+
+	!<dev-libs/atk-2.46.0
+	!<app-accessibility/at-spi2-atk-2.46.0
+"
+RDEPEND="${DEPEND}
+	dbus-broker? ( sys-apps/dbus-broker )
+"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		dev-python/sphinx
+		dev-util/gdbus-codegen
+		>=dev-util/gi-docgen-2021.1
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_bus=$(usex dbus-broker dbus-broker dbus-daemon)
+		$(meson_use systemd use_systemd)
+		-Dgtk2_atk_adaptor=true
+		-Dsystemd_user_dir="$(systemd_get_userunitdir)"
+		$(meson_native_use_bool gtk-doc docs)
+		$(meson_native_use_feature introspection)
+		$(meson_feature X x11)
+		-Datk_only=false
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	# Avoid locates using commas as decimal separators and breaking some
+	# tests
+	LC_ALL=C.UTF-8 virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/{libatspi,atk} || die
+		mv "${ED}"/usr/share/doc/libatspi "${ED}"/usr/share/gtk-doc/libatspi/html || die
+		mv "${ED}"/usr/share/doc/atk "${ED}"/usr/share/gtk-doc/atk/html || die
+	fi
+}
diff --git a/app-accessibility/emacspeak/Manifest b/app-accessibility/emacspeak/Manifest
index b01f904e548b..25e0a9b61d29 100644
--- a/app-accessibility/emacspeak/Manifest
+++ b/app-accessibility/emacspeak/Manifest
@@ -1 +1,2 @@
 DIST emacspeak-56.0.tar.bz2 7158646 BLAKE2B 484b98e5fac51d30bd9b2705308042ed9e0a49a4684ca777cbc60368fdadd8206ef212af514a5940509c84fee3fdcad12486a31a47cac658c912d7573a484fb7 SHA512 9b18fada991b914ddd3ed30950e685c1c164434536c3dd119b9ed52db80e7e31b7399c72a584938bfb63daa7e1aa76a1f377d664cc1118ffa7f0a4cbdddf0818
+DIST emacspeak-60.0.tar.bz2 3056708 BLAKE2B 34e2112992fb95aa58e7ab1adf02c8839ab4729ffb920df7d93917c748d6d1c2d6c4ad68d8174da89f7fd6d6ea23d5a3d3f9bf1c59df0b988f3db70a9a1eeea4 SHA512 f48040f2dfaf7cb67d779d219c59477aaddb9c8b400666e5e9d9850e75575d5276f5b596ab1e8976057e5078d914a610cd537068ccc748e6c45aef64b02eaba9
diff --git a/app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild b/app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild
new file mode 100644
index 000000000000..bad87d3aa3fa
--- /dev/null
+++ b/app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="29.1"
+FORCE_PRINT_ELOG="1"
+DISABLE_AUTOFORMATTING="1"
+
+inherit elisp toolchain-funcs readme.gentoo-r1
+
+DESCRIPTION="The emacspeak audio desktop"
+HOMEPAGE="http://emacspeak.sourceforge.net/
+	https://github.com/tvraman/emacspeak/"
+
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/tvraman/${PN}"
+else
+	SRC_URI="https://github.com/tvraman/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="+espeak"
+
+# Usually need := dep with tcl anyway but in particular, it's needed
+# here as we do a version check in src_compile and bake in the results.
+DEPEND="
+	app-emacs/hydra
+	dev-lang/tcl:=
+	espeak? ( app-accessibility/espeak-ng )
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-tcltk/tclx-8.4
+"
+
+DOC_CONTENTS='
+As of version 39.0 and later, the /usr/bin/emacspeak
+shell script has been removed downstream in Gentoo.
+You should launch emacspeak by another method, for instance by adding
+the following to your init file (~/.emacs or ~/.config/emacs/init.el):
+(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el")
+'
+
+HTML_DOCS=( etc/ info/ )
+
+src_prepare() {
+	elisp_src_prepare
+
+	# A Make rule will regenerate it.
+	rm -f ./lisp/emacspeak-loaddefs.el || die
+}
+
+src_configure() {
+	MAKEOPTS+=" -j1 "
+	tc-export CXX
+
+	emake config
+}
+
+src_compile() {
+	emake README
+
+	cd "${S}/lisp" || die
+	emake emacspeak-loaddefs.el
+	local -x BYTECOMPFLAGS="-L . -l emacspeak-preamble.el -l emacspeak-loaddefs.el"
+	elisp_src_compile
+
+	if use espeak ; then
+		local tcl_version="$(echo 'puts $tcl_version;exit 0' |tclsh)"
+
+		if [[ -z ${tcl_version} ]]; then
+			die 'Unable to detect the installed version of dev-lang/tcl.'
+		fi
+
+		cd "${S}/servers/native-espeak" || die
+		emake TCL_VERSION="${tcl_version}"
+	fi
+}
+
+src_install() {
+	elisp-install emacspeak/lisp ./lisp/*.el{,c}
+
+	if use espeak ; then
+		pushd ./servers/native-espeak > /dev/null || die
+
+		emake DESTDIR="${D}" install
+		local orig_serverdir="/usr/share/emacs/site-lisp/emacspeak/servers/native-espeak"
+		local serverfile="${ED}${orig_serverdir}/tclespeak.so"
+
+		install -Dm755 "${serverfile}" \
+			"${ED}/usr/$(get_libdir)/emacspeak/tclespeak.so" || die
+		rm -f "${serverfile}" || die
+
+		dosym -r "/usr/$(get_libdir)/emacspeak/tclespeak.so" \
+			  "${orig_serverdir}/tclespeak.so"
+
+		popd > /dev/null || die
+
+		exeinto /usr/share/emacs/site-lisp/emacspeak/servers
+		doexe ./servers/espeak
+
+		insinto /usr/share/emacs/site-lisp/emacspeak/servers
+		doins ./servers/tts-lib.tcl
+	fi
+
+	dodoc README etc/NEWS* etc/COPYRIGHT
+	einstalldocs
+
+	readme.gentoo_create_doc
+}
diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-9999.ebuild
index 9c9472dcc6bf..bad87d3aa3fa 100644
--- a/app-accessibility/emacspeak/emacspeak-9999.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild
@@ -1,22 +1,26 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-NEED_EMACS=26.1
-FORCE_PRINT_ELOG=1
-DISABLE_AUTOFORMATTING=1
+NEED_EMACS="29.1"
+FORCE_PRINT_ELOG="1"
+DISABLE_AUTOFORMATTING="1"
+
 inherit elisp toolchain-funcs readme.gentoo-r1
 
 DESCRIPTION="The emacspeak audio desktop"
-HOMEPAGE="http://emacspeak.sourceforge.net/"
+HOMEPAGE="http://emacspeak.sourceforge.net/
+	https://github.com/tvraman/emacspeak/"
 
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git"
+if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/tvraman/${PN}"
 else
-	SRC_URI="https://github.com/tvraman/emacspeak/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	SRC_URI="https://github.com/tvraman/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-2+ GPL-3+"
@@ -26,6 +30,7 @@ IUSE="+espeak"
 # Usually need := dep with tcl anyway but in particular, it's needed
 # here as we do a version check in src_compile and bake in the results.
 DEPEND="
+	app-emacs/hydra
 	dev-lang/tcl:=
 	espeak? ( app-accessibility/espeak-ng )
 "
@@ -37,39 +42,52 @@ RDEPEND="
 DOC_CONTENTS='
 As of version 39.0 and later, the /usr/bin/emacspeak
 shell script has been removed downstream in Gentoo.
-You should launch emacspeak by another method, for instance
-by adding the following to your ~/.emacs file:
+You should launch emacspeak by another method, for instance by adding
+the following to your init file (~/.emacs or ~/.config/emacs/init.el):
 (load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el")
 '
 
 HTML_DOCS=( etc/ info/ )
 
-src_configure() {
-	MAKEOPTS+=" -j1"
+src_prepare() {
+	elisp_src_prepare
 
+	# A Make rule will regenerate it.
+	rm -f ./lisp/emacspeak-loaddefs.el || die
+}
+
+src_configure() {
+	MAKEOPTS+=" -j1 "
 	tc-export CXX
 
 	emake config
 }
 
 src_compile() {
-	emake emacspeak
-	if use espeak; then
+	emake README
+
+	cd "${S}/lisp" || die
+	emake emacspeak-loaddefs.el
+	local -x BYTECOMPFLAGS="-L . -l emacspeak-preamble.el -l emacspeak-loaddefs.el"
+	elisp_src_compile
+
+	if use espeak ; then
 		local tcl_version="$(echo 'puts $tcl_version;exit 0' |tclsh)"
+
 		if [[ -z ${tcl_version} ]]; then
 			die 'Unable to detect the installed version of dev-lang/tcl.'
 		fi
 
-		cd servers/native-espeak || die
+		cd "${S}/servers/native-espeak" || die
 		emake TCL_VERSION="${tcl_version}"
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	elisp-install emacspeak/lisp ./lisp/*.el{,c}
 
-	if use espeak; then
-		pushd servers/native-espeak > /dev/null || die
+	if use espeak ; then
+		pushd ./servers/native-espeak > /dev/null || die
 
 		emake DESTDIR="${D}" install
 		local orig_serverdir="/usr/share/emacs/site-lisp/emacspeak/servers/native-espeak"
@@ -80,15 +98,19 @@ src_install() {
 		rm -f "${serverfile}" || die
 
 		dosym -r "/usr/$(get_libdir)/emacspeak/tclespeak.so" \
-			"${orig_serverdir}/tclespeak.so"
+			  "${orig_serverdir}/tclespeak.so"
+
 		popd > /dev/null || die
+
+		exeinto /usr/share/emacs/site-lisp/emacspeak/servers
+		doexe ./servers/espeak
+
+		insinto /usr/share/emacs/site-lisp/emacspeak/servers
+		doins ./servers/tts-lib.tcl
 	fi
 
 	dodoc README etc/NEWS* etc/COPYRIGHT
 	einstalldocs
 
-	cd "${ED}"/usr/share/emacs/site-lisp/${PN} || die
-	rm -rf README etc/NEWS* etc/COPYRIGHT install-guide \
-		user-guide || die
 	readme.gentoo_create_doc
 }
diff --git a/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild b/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild
index 07dff018be83..d0dd844c65b2 100644
--- a/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild
+++ b/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -70,7 +70,8 @@ src_compile() {
 }
 
 src_test() {
-	emake check
+	# bug #947014
+	emake check -j1
 }
 
 src_install() {
diff --git a/app-accessibility/kontrast/Manifest b/app-accessibility/kontrast/Manifest
index 7e59b06e6f6a..28e8508de4c1 100644
--- a/app-accessibility/kontrast/Manifest
+++ b/app-accessibility/kontrast/Manifest
@@ -1,2 +1,2 @@
 DIST kontrast-24.08.3.tar.xz 216192 BLAKE2B a645d18ad35da68078e811719aef0891274b711f1c6b7e4243fce28c3b3387a3583f441c50a9350525e5dc975ae392f7561de776dbbb7f3020fc2f6f384347fa SHA512 739dbcdaac77642eb3cf1b70fc163802ebf89071c10db5d2fd5ee7ce170a0648146634b5fde1570d760be92c13f7b727ae6d84b66b512ac1d2b94437ab3c1c4e
-DIST kontrast-24.12.0.tar.xz 217092 BLAKE2B 82e0ec488ff6d917ee551e92e4c4572e4cdefc61bc2a66928b9af81eefa81f1ef3c1e412e7f1c73bb6b21854d71fd1af0fd1b1a8645a8d8219c83f59d6ddbe59 SHA512 a04c3bdea387a783432180ab4c30065d31d6a797468ba69059a2a50a37d0c41bcf8a8cbe120cf4b0f01abfdb4e1420678f158a9299f508171faf848d92161c11
+DIST kontrast-24.12.1.tar.xz 217316 BLAKE2B 6e402cb7f7061f14dc07670213ec1c166c8050b04af499b28ae7567f5a2ce606dff750ac31869c1b864cf9b39d997c94d455045b782518fb2ed5454c63d3e4d8 SHA512 88221c514c28c4055e7c7bd6edf230dfffae8f43a624417dccb7ad62a03db861cb2c310085071963b883b55c5f3bb23085d477fbb6aa152604b2e9453fa36a62
diff --git a/app-accessibility/kontrast/kontrast-24.12.0.ebuild b/app-accessibility/kontrast/kontrast-24.12.0.ebuild
deleted file mode 100644
index c2b75be2e29c..000000000000
--- a/app-accessibility/kontrast/kontrast-24.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Tool to check contrast for colors to verify they are correctly accessible"
-HOMEPAGE="https://apps.kde.org/kontrast/"
-
-LICENSE="GPL-3+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	dev-db/futuresql
-	dev-libs/qcoro
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	kde-plasma/xdg-desktop-portal-kde:*
-"
diff --git a/app-accessibility/kontrast/kontrast-24.12.1.ebuild b/app-accessibility/kontrast/kontrast-24.12.1.ebuild
new file mode 100644
index 000000000000..a13d7f3a7a90
--- /dev/null
+++ b/app-accessibility/kontrast/kontrast-24.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Tool to check contrast for colors to verify they are correctly accessible"
+HOMEPAGE="https://apps.kde.org/kontrast/"
+
+LICENSE="GPL-3+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	dev-db/futuresql
+	dev-libs/qcoro
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	kde-plasma/xdg-desktop-portal-kde:*
+"
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index 5bf5519916d7..657df1a97cb0 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,2 +1,2 @@
-DIST orca-45.2.tar.xz 3997024 BLAKE2B dfdf113694127323a92450b04b20fcc5655be0236c0173167d5d15478703b676c3fd8c1de0e75783875c5d2d40541c764fb002314d66c7570475cd63f6bfa473 SHA512 57eee451cf0da52e1297beae6c6d527886721b23c3415a5e046f3431876fdf1603dbd81ca763ed614ace68e7db96d90b413c663f113d0033ec1f2797df7bf589
 DIST orca-46.2.tar.xz 3431952 BLAKE2B 56b8c31318ecfaf6acda365192e0dd70feb835e449ebe1e0c0292a2230c44659ddc4e9cf1fa87aba1694e3ba2c8c695754901c4a797720979af3a8143f0b0b00 SHA512 e55d5dba18b70ac2b70809f9e0af82e1fad8c72d9f3a7e03c6e4c1da29e133f80b3dabf9ad007873587b4b01a4ff36947e4ea38d7afd60748f8f98219a6a24e0
+DIST orca-47.3.tar.xz 3393540 BLAKE2B c66a4d98e96bcdc87ccc96c1c77fbb5fef1c3db36df9490c74144c2e1cc31d1e8db133ab421c39e11a1d602d6ef5a27e6334443d6cbe9374d4a302ef768b0a8f SHA512 96fde41afdf5d1f67dfda1aad5f8c84415e65e92d162ae0e231c8b3c73b23412096a055fe1c8e9fdf87180b427af25953ce2acf60407f8f1bf20c3a8c50a3b6f
diff --git a/app-accessibility/orca/orca-45.2-r1.ebuild b/app-accessibility/orca/orca-45.2-r1.ebuild
deleted file mode 100644
index 12a2669f5c4a..000000000000
--- a/app-accessibility/orca/orca-45.2-r1.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
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
-
-IUSE="+braille"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-core-2.48:2[introspection]
-	>=dev-libs/glib-2.28:2
-	media-libs/gstreamer:1.0[introspection]
-	>=x11-libs/gtk+-3.6.2:3[introspection]
-	$(python_gen_cond_dep '
-		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}]
-	')
-	braille? (
-		$(python_gen_cond_dep '
-			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
-		')
-		|| (
-			>=dev-libs/liblouis-3.29.0[${PYTHON_SINGLE_USEDEP}]
-			$(python_gen_cond_dep '
-				<dev-libs/liblouis-3.29.0[python,${PYTHON_USEDEP}]
-			')
-		)
-	)
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
-		>=dev-python/pyatspi-2.46[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-	')
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-"
-BDEPEND="
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-#	app-text/yelp-tools
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with braille liblouis)
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize
-}
diff --git a/app-accessibility/orca/orca-46.2.ebuild b/app-accessibility/orca/orca-46.2.ebuild
deleted file mode 100644
index 4a121202b13d..000000000000
--- a/app-accessibility/orca/orca-46.2.ebuild
+++ /dev/null
@@ -1,61 +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} )
-
-inherit gnome2 meson python-single-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="+braille"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-core-2.50:2[introspection]
-	>=dev-libs/glib-2.28:2
-	media-libs/gstreamer:1.0[introspection]
-	>=x11-libs/gtk+-3.6.2:3[introspection]
-	$(python_gen_cond_dep '
-		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}]
-	')
-	braille? (
-		$(python_gen_cond_dep '
-			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
-			dev-libs/liblouis[${PYTHON_SINGLE_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
-		>=dev-python/pyatspi-2.46[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-	')
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-"
-BDEPEND="
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-#	app-text/yelp-tools
-
-src_configure() {
-	local emesonargs=(
-		-Dspiel=false # spiel not yet in gentoo
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_optimize
-}
diff --git a/app-accessibility/orca/orca-47.3.ebuild b/app-accessibility/orca/orca-47.3.ebuild
new file mode 100644
index 000000000000..dd16556748d7
--- /dev/null
+++ b/app-accessibility/orca/orca-47.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit gnome2 meson python-single-r1
+
+DESCRIPTION="Extensible screen reader that provides access to the desktop"
+HOMEPAGE="https://orca.gnome.org/"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="+braille"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=app-accessibility/at-spi2-core-2.50:2[introspection]
+	>=dev-libs/glib-2.28:2
+	media-libs/gstreamer:1.0[introspection]
+	>=x11-libs/gtk+-3.6.2:3[introspection]
+	$(python_gen_cond_dep '
+		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}]
+	')
+	braille? (
+		$(python_gen_cond_dep '
+			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
+			dev-libs/liblouis[${PYTHON_SINGLE_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
+		>=dev-python/pyatspi-2.46[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+	')
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+"
+BDEPEND="
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+#	app-text/yelp-tools
+
+src_configure() {
+	local emesonargs=(
+		-Dspiel=false # spiel not yet in gentoo
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"
+	python_optimize
+}
diff --git a/app-admin/ansible-core/ansible-core-2.18.1-r1.ebuild b/app-admin/ansible-core/ansible-core-2.18.1-r1.ebuild
index 59a4cb8c1778..ac38dbddfc5b 100644
--- a/app-admin/ansible-core/ansible-core-2.18.1-r1.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.18.1-r1.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
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="devel"
 else
 	inherit pypi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible-core/files/resolvelib.patch b/app-admin/ansible-core/files/resolvelib.patch
deleted file mode 100644
index c38f10945d52..000000000000
--- a/app-admin/ansible-core/files/resolvelib.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From e30959723a9603ff94bc18ba58ee3adbf305a6b6 Mon Sep 17 00:00:00 2001
-From: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
-Date: Sun, 12 Mar 2023 23:27:41 +0800
-Subject: [PATCH] ansible-galaxy - support `resolvelib >= 0.5.3, < 1.1.0`
-
-<https://pypi.org/project/resolvelib/1.0.1> released on 2023-03-09:
-
--   <https://github.com/sarugaku/resolvelib/blob/main/CHANGELOG.rst#101-2023-03-09>
--   <https://github.com/sarugaku/resolvelib/releases/tag/1.0.1>
-
-Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
----
- changelogs/fragments/80196-resolvelib_lt_1_1_0.yml    | 2 ++
- lib/ansible/galaxy/dependency_resolution/providers.py | 4 ++--
- requirements.txt                                      | 2 +-
- test/lib/ansible_test/_data/requirements/ansible.txt  | 2 +-
- test/sanity/code-smell/docs-build.requirements.in     | 2 +-
- test/sanity/code-smell/docs-build.requirements.txt    | 2 +-
- test/sanity/code-smell/package-data.requirements.in   | 2 +-
- test/sanity/code-smell/package-data.requirements.txt  | 2 +-
- 8 files changed, 10 insertions(+), 8 deletions(-)
- create mode 100644 changelogs/fragments/80196-resolvelib_lt_1_1_0.yml
-
-diff --git a/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml b/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml
-new file mode 100644
-index 00000000000000..6fd419f0d4f929
---- /dev/null
-+++ b/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml
-@@ -0,0 +1,2 @@
-+minor_changes:
-+  - ansible-galaxy - support ``resolvelib >= 0.5.3, < 1.1.0``.
-diff --git a/lib/ansible/galaxy/dependency_resolution/providers.py b/lib/ansible/galaxy/dependency_resolution/providers.py
-index d52006b24d7a77..1dcaf1c8d2cff1 100644
---- a/lib/ansible/galaxy/dependency_resolution/providers.py
-+++ b/lib/ansible/galaxy/dependency_resolution/providers.py
-@@ -42,7 +42,7 @@ class AbstractProvider:  # type: ignore[no-redef]
- 
- # TODO: add python requirements to ansible-test's ansible-core distribution info and remove the hardcoded lowerbound/upperbound fallback
- RESOLVELIB_LOWERBOUND = SemanticVersion("0.5.3")
--RESOLVELIB_UPPERBOUND = SemanticVersion("0.9.0")
-+RESOLVELIB_UPPERBOUND = SemanticVersion("1.1.0")
- RESOLVELIB_VERSION = SemanticVersion.from_loose_version(LooseVersion(resolvelib_version))
- 
- 
-@@ -220,7 +220,7 @@ def get_preference(self, *args, **kwargs):
-             Mapping of identifier, list of named tuple pairs.
-             The named tuples have the entries ``requirement`` and ``parent``.
- 
--        resolvelib >=0.8.0, <= 0.8.1
-+        resolvelib >=0.8.0, <= 1.0.1
- 
-         :param identifier: The value returned by ``identify()``.
- 
-diff --git a/requirements.txt b/requirements.txt
-index d096901ec2bcdb..a07aa985063b6a 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -15,4 +15,4 @@ importlib_resources >= 5.0, < 5.1; python_version < '3.10'
- # NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
- # NOTE: When updating the upper bound, also update the latest version used
- # NOTE: in the ansible-galaxy-collection test suite.
--resolvelib >= 0.5.3, < 0.9.0  # dependency resolver used by ansible-galaxy
-+resolvelib >= 0.5.3, < 1.1.0  # dependency resolver used by ansible-galaxy
-diff --git a/test/lib/ansible_test/_data/requirements/ansible.txt b/test/lib/ansible_test/_data/requirements/ansible.txt
-index d096901ec2bcdb..a07aa985063b6a 100644
---- a/test/lib/ansible_test/_data/requirements/ansible.txt
-+++ b/test/lib/ansible_test/_data/requirements/ansible.txt
-@@ -15,4 +15,4 @@ importlib_resources >= 5.0, < 5.1; python_version < '3.10'
- # NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
- # NOTE: When updating the upper bound, also update the latest version used
- # NOTE: in the ansible-galaxy-collection test suite.
--resolvelib >= 0.5.3, < 0.9.0  # dependency resolver used by ansible-galaxy
-+resolvelib >= 0.5.3, < 1.1.0  # dependency resolver used by ansible-galaxy
-diff --git a/test/sanity/code-smell/docs-build.requirements.in b/test/sanity/code-smell/docs-build.requirements.in
-index 80e8f66bc7f6fb..9209dd34ebecdf 100644
---- a/test/sanity/code-smell/docs-build.requirements.in
-+++ b/test/sanity/code-smell/docs-build.requirements.in
-@@ -1,6 +1,6 @@
- jinja2
- pyyaml
--resolvelib < 0.9.0
-+resolvelib < 1.1.0
- sphinx == 4.2.0
- sphinx-notfound-page
- sphinx-ansible-theme
-diff --git a/test/sanity/code-smell/docs-build.requirements.txt b/test/sanity/code-smell/docs-build.requirements.txt
-index 663e2c6c53d28a..7b4d563574c595 100644
---- a/test/sanity/code-smell/docs-build.requirements.txt
-+++ b/test/sanity/code-smell/docs-build.requirements.txt
-@@ -27,7 +27,7 @@ Pygments==2.14.0
- pytz==2022.2.1
- PyYAML==6.0
- requests==2.28.1
--resolvelib==0.8.1
-+resolvelib==1.0.1
- rstcheck==3.5.0
- semantic-version==2.10.0
- sh==1.14.3
-diff --git a/test/sanity/code-smell/package-data.requirements.in b/test/sanity/code-smell/package-data.requirements.in
-index acec62eff91ff8..50e8568c5cf8bc 100644
---- a/test/sanity/code-smell/package-data.requirements.in
-+++ b/test/sanity/code-smell/package-data.requirements.in
-@@ -1,6 +1,6 @@
- docutils < 0.18  # match version required by sphinx in the docs-build sanity test
- jinja2
- pyyaml  # ansible-core requirement
--resolvelib < 0.9.0
-+resolvelib < 1.1.0
- rstcheck < 4  # match version used in other sanity tests
- antsibull-changelog
-diff --git a/test/sanity/code-smell/package-data.requirements.txt b/test/sanity/code-smell/package-data.requirements.txt
-index 6411020e47c67b..afc3cd6418e84d 100644
---- a/test/sanity/code-smell/package-data.requirements.txt
-+++ b/test/sanity/code-smell/package-data.requirements.txt
-@@ -5,7 +5,7 @@ Jinja2==3.1.2
- MarkupSafe==2.1.1
- packaging==21.3
- pyparsing==3.0.9
- PyYAML==6.0
--resolvelib==0.8.1
-+resolvelib==1.0.1
- rstcheck==3.5.0
- semantic-version==2.10.0
- types-docutils==1.5.0
diff --git a/app-admin/aws-session-manager-plugin/Manifest b/app-admin/aws-session-manager-plugin/Manifest
new file mode 100644
index 000000000000..f0a95e63b276
--- /dev/null
+++ b/app-admin/aws-session-manager-plugin/Manifest
@@ -0,0 +1 @@
+DIST aws-session-manager-plugin-1.2.694.0.tar.gz 35491825 BLAKE2B 134c4a83a5e906206bd0665509d96ed77d5f2c2ea3ca58d9ba776328a36c1eb018674d77d63719c6ba2d00006a60d8e6ccf62f828fca84fdfe7b6b3d5a2a22b9 SHA512 64372b552a7e6d534de886ea1fba26292c1ff71fdc658becbc3ea0ecf7e000de0c69a931ddcaf3d44f50ddc9c331233b169575534d3a46e2cdd9c711d2e21483
diff --git a/app-admin/aws-session-manager-plugin/aws-session-manager-plugin-1.2.694.0.ebuild b/app-admin/aws-session-manager-plugin/aws-session-manager-plugin-1.2.694.0.ebuild
new file mode 100644
index 000000000000..9246a7dcc5be
--- /dev/null
+++ b/app-admin/aws-session-manager-plugin/aws-session-manager-plugin-1.2.694.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="AWS Session Manager Plugin for aws-cli"
+HOMEPAGE="https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager.html
+	https://github.com/aws/session-manager-plugin"
+SRC_URI="https://github.com/aws/session-manager-plugin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${P#aws-}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_prepare() {
+	default
+	sed -e '/^build-linux/s/ checkstyle//' -i makefile || die
+}
+
+src_compile() {
+	emake GO_BUILD="go build" build-linux-${GOARCH}
+}
+
+src_install() {
+	dobin bin/linux_${GOARCH}/ssmcli bin/linux_${GOARCH}_plugin/session-manager-plugin
+	local DOCS=( README.md RELEASENOTES.md )
+	einstalldocs
+
+	systemd_dounit packaging/linux/ssmcli.service
+}
diff --git a/app-admin/aws-session-manager-plugin/metadata.xml b/app-admin/aws-session-manager-plugin/metadata.xml
new file mode 100644
index 000000000000..29b1745e8d0f
--- /dev/null
+++ b/app-admin/aws-session-manager-plugin/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">aws/session-manager-plugin</remote-id>
+		<changelog>https://github.com/aws/session-manager-plugin/blob/mainline/RELEASENOTES.md</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 799821a698c0..72daed24f361 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,4 +1,8 @@
-DIST aws-cli-1.36.22.gh.tar.gz 2853997 BLAKE2B a9f309c157595edd37e87834e7b67c16c04edb8f9f2381e8dd2335cc932b2071f7cfd24ca4abd16100ef1de21adb7f502af911d71c20459e0321a9375a49ec0e SHA512 05ee5d22f5f552ba0e7eaf4a1a88bcb3a2cb8db30315fdbf04d9c9c1c69b07ae3a8727e1dca1b154d9dad4bf89aa5950c0f369a965f92ec99f7e0251665f13eb
-DIST aws-cli-1.36.27.gh.tar.gz 2874317 BLAKE2B 5f696b14ba47e6b9b0150e600d7f3241d5bebc1c66e848239221db74dada3c358c5eae795e9d3988383ac431f449729c4226e17724d54d5a6b9531e046c15810 SHA512 0e8dd2bb6dc086f3ff29931c1f41778f6c25e3a173def142f12b6e57fac6edd0df0cd588bc522045561afc44827b8fd2a0bcd582bb72ee01727d22bd0b34a3cc
 DIST aws-cli-1.36.31.gh.tar.gz 2876521 BLAKE2B 6ba90d3852b25608bb908b3853bff3de7c0fb94ee6177177abefab16993e7cbd85dec62db8e453c4de2e846bda7ab46efb8e71f6bbb28a458e5bf7cbd53cdc7f SHA512 a0b7de55c3bd518f61d112fa9bd710636ba0118322ceedb959cd2f814fb6dd983516717a3a0c6b3af3a507365da2b73553ede4e0e6dd691601fdbe8e90c0fa68
-DIST aws-cli-1.36.32.gh.tar.gz 2877216 BLAKE2B 41e5033374cb39d3ee1cb871d3b01a67944dc397ea21e7069acd7b8059c8a1aa04698d78c0090a75bf00b8c4e55d961e34b47f896d7e678d6bfac9d417154826 SHA512 b02b9ae9e92c7fc2d3e46e7d1aea83ce23ab3e40d8f908e68e4e6afd4b58e8222caeea34a48ce934d8494290e1e0279dd4b49305c6d4dc73216944d0dec264db
+DIST aws-cli-1.36.33.gh.tar.gz 2877337 BLAKE2B 0e3cdbac864370c0ef785191fc692e1a28c81467fac6e8bc5840b6fa79ef6b09583ce70f85b2220538c587ddf4c320aef9ba2cb9bfaaa30c68f0498556b256f0 SHA512 78a106f0fd30eef9f6e0d48800fd7f2144ffd7a01adf669d6d84ab5f064045a6c163bbd042a788c3d51a70060165f0d29a603734ac43680afcb4711dc8e31b53
+DIST aws-cli-1.36.38.gh.tar.gz 2879388 BLAKE2B 2780cfeb9e6ca61635638ad3df9a0e6cb81eeeb45d7573f5033f37a2366c907e1cc4661766a72d4b45ced5e52d5dae82bd61c2dec455a6e5763ae2605b1e8f0f SHA512 626b606d86cb877c562031c23da57385b5014046d97cbf6cb3f6e73bb528755ff4a12190211feffbe326533500d988e93f55090f242b2b49ae725fc509575780
+DIST aws-cli-1.36.39.gh.tar.gz 2879615 BLAKE2B 54bed9cb8e5cb2d5f27178040a4f5f38fb9233a3be3531003c0a91a254185389a2508195520bfb43e7c9666e966ca66ab909d38cd09365cd1014ad541ddf3dd8 SHA512 752e80bae33456057b9c8ddc4e4fd0f97c522cae59d2e6749f549268b0ec9c7d4dd32c797962dd6e0282fd8ced4c3a1ce4f002af96af32c62faefd499f862e4d
+DIST aws-cli-1.36.40.gh.tar.gz 2879864 BLAKE2B f6d8ae65edb2f3bb6f15376560f5ad93936f81b1a14d6573af011e9b4fb48552888f52a5b25a29237dc66d54802babec3bd9df640119b10c713b9de7dc6fe7d0 SHA512 1c0de5ff22cd5be7d33dbf0ae3fbe11d7eb5ced13773d8567dee3f57f62aaa7f135555234c659fd33ac0ae9e1c55f95e34ac0b1490e1b7f983ce9cc4a8953809
+DIST aws-cli-1.37.0.gh.tar.gz 2881507 BLAKE2B 4c6fc8921304d8f4c9cf4ce760325be42c2f7b9f072946bba1bd9e9c4d9b28d4033c39bb69b553f6c7a3b07014091d1cffffb4cb9a40bbd22ec4410b06006199 SHA512 170ba977abb2b655346cb1c507126a341e830226f8844ac719c6c7e10c7962055df8c4ff667fde3aa595be518f481a7ed1b85e249f8991365df51c6201bc04f2
+DIST aws-cli-1.37.1.gh.tar.gz 2881540 BLAKE2B 99dc9be76e0cb2a6052d630e5d87d56fde13a0fb1dc954b523e9ef8529f88234b47ab0eac02611dac2f40e7c38abf69983336e99e2ee8f9f7bc8c808e5f8ee1e SHA512 b48d1d0038ce400a1874c09c481569422211ef2d3894368a32e144fec130480bfbe31cbdecf107b632703ab2a4ee4028173d3a97f9ea2a7a0cef9cf80743cad9
+DIST aws-cli-1.37.2.gh.tar.gz 2882709 BLAKE2B be8e03342f8c105646c7a92bd9f4716952700cb1cee883669b532851f73b896dd3f55266851db0351348ca50e3d96ec78f296327545eaac1e5d4ceba58a71eeb SHA512 492ac75a47187a5579cae3211b7e4b9df34c7fcab8903cc52a61cc9dc6238f32268a04e45eb4edead76504636a85987355d4bf71f700df7c14dc215b45e8058b
diff --git a/app-admin/awscli/awscli-1.36.22.ebuild b/app-admin/awscli/awscli-1.36.22.ebuild
deleted file mode 100644
index df478e59dd61..000000000000
--- a/app-admin/awscli/awscli-1.36.22.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-# botocore is x.(y-1).(z+59)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=(
-		"${serial_tests[@]}"
-
-		# flaky (some ordering?)
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-	)
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.36.27.ebuild b/app-admin/awscli/awscli-1.36.27.ebuild
deleted file mode 100644
index 2960403cf7e0..000000000000
--- a/app-admin/awscli/awscli-1.36.27.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y-1).(z+59)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=(
-		"${serial_tests[@]}"
-
-		# flaky (some ordering?)
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-	)
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.36.31.ebuild b/app-admin/awscli/awscli-1.36.31.ebuild
index 2960403cf7e0..33a278734de6 100644
--- a/app-admin/awscli/awscli-1.36.31.ebuild
+++ b/app-admin/awscli/awscli-1.36.31.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
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 # botocore is x.(y-1).(z+59)
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
diff --git a/app-admin/awscli/awscli-1.36.32.ebuild b/app-admin/awscli/awscli-1.36.33.ebuild
index cffe1be806db..cffe1be806db 100644
--- a/app-admin/awscli/awscli-1.36.32.ebuild
+++ b/app-admin/awscli/awscli-1.36.33.ebuild
diff --git a/app-admin/awscli/awscli-1.36.38.ebuild b/app-admin/awscli/awscli-1.36.38.ebuild
new file mode 100644
index 000000000000..cffe1be806db
--- /dev/null
+++ b/app-admin/awscli/awscli-1.36.38.ebuild
@@ -0,0 +1,95 @@
+# 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 bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y-1).(z+59)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=(
+		"${serial_tests[@]}"
+
+		# flaky (some ordering?)
+		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+	)
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.36.39.ebuild b/app-admin/awscli/awscli-1.36.39.ebuild
new file mode 100644
index 000000000000..cffe1be806db
--- /dev/null
+++ b/app-admin/awscli/awscli-1.36.39.ebuild
@@ -0,0 +1,95 @@
+# 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 bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y-1).(z+59)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=(
+		"${serial_tests[@]}"
+
+		# flaky (some ordering?)
+		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+	)
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.36.40.ebuild b/app-admin/awscli/awscli-1.36.40.ebuild
new file mode 100644
index 000000000000..cffe1be806db
--- /dev/null
+++ b/app-admin/awscli/awscli-1.36.40.ebuild
@@ -0,0 +1,95 @@
+# 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 bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y-1).(z+59)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=(
+		"${serial_tests[@]}"
+
+		# flaky (some ordering?)
+		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+	)
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.37.0.ebuild b/app-admin/awscli/awscli-1.37.0.ebuild
new file mode 100644
index 000000000000..4a8e0ae852e0
--- /dev/null
+++ b/app-admin/awscli/awscli-1.37.0.ebuild
@@ -0,0 +1,95 @@
+# 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 bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y-1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.11.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=(
+		"${serial_tests[@]}"
+
+		# flaky (some ordering?)
+		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+	)
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.37.1.ebuild b/app-admin/awscli/awscli-1.37.1.ebuild
new file mode 100644
index 000000000000..4a8e0ae852e0
--- /dev/null
+++ b/app-admin/awscli/awscli-1.37.1.ebuild
@@ -0,0 +1,95 @@
+# 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 bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y-1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.11.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=(
+		"${serial_tests[@]}"
+
+		# flaky (some ordering?)
+		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+	)
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.37.2.ebuild b/app-admin/awscli/awscli-1.37.2.ebuild
new file mode 100644
index 000000000000..4a8e0ae852e0
--- /dev/null
+++ b/app-admin/awscli/awscli-1.37.2.ebuild
@@ -0,0 +1,95 @@
+# 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 bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y-1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.11.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=(
+		"${serial_tests[@]}"
+
+		# flaky (some ordering?)
+		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+	)
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/chrpath/chrpath-0.16-r1.ebuild b/app-admin/chrpath/chrpath-0.16-r1.ebuild
index 4d20ca70a949..3262d4306ec7 100644
--- a/app-admin/chrpath/chrpath-0.16-r1.ebuild
+++ b/app-admin/chrpath/chrpath-0.16-r1.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="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-multilib.patch
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index a1a53ff9587c..95692e555ffb 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,3 +1,3 @@
 DIST conky-1.21.7.tar.gz 1961997 BLAKE2B 80ca17e0d1065655c410d8108668b3f09df574b761d57e374a2d51c946b51bd1ce4d29d320def0a197d465401cb4a665fb84a394406611903877c0acf42b4ad3 SHA512 52b6621e3e693654610ebd1b9e1adbeaec2ae2a2aaed4b038882a6825e6573f4afdea85f9156e1ffaa5999e30b3b05170b6b101f415980f0edab5c85151e9e6c
-DIST conky-1.21.8.tar.gz 1963431 BLAKE2B 86b93971cb442fc6c2c61b7f681b6ad11e5b3dbfdcb39231da1dc70501497b364a0e99007d961d4310a7f76b9568114d3fce41455d461077cf703b795a53f278 SHA512 72c5cadc89760445888029cc54320267ad0d2ada8d76a6ee85056a9822005232900df2e8c7c1667c970ab72316115f6b2c5d6af72a9b5810aa6a024fbb487001
 DIST conky-1.21.9.tar.gz 1966277 BLAKE2B 90735ab5e4a42f31ccc12c27fa7a5ca35c6c6cc93d97a06d33f37ee7f1300e7c4546ed34f348338661c8efe7a598b32564977ded2f28dc48a0133696031fee69 SHA512 649b7cb2ab482bae33010239ee96deb08a5f3b6954e55e6380f45d753a7690ac446f4471682e293b25f94c3c68e7d5373f5b63a42fec69392e34c4336c6f1b96
+DIST conky-1.22.0.tar.gz 2030830 BLAKE2B b262b76fac24d74db0fe099e6e1c54be463d9453c5e9bcb9de33beeccda9e7b063287c189018f673bf0fc1d46029de9ac4f6c333c579b3f7fc86e2a7866e761e SHA512 df110bbec225127b6b9e2cb8998a21d99beb00225c7df6a6d35d6758135c8882d3e06c796f5c94eec7653da73af32f7a87ae631755b0e715306799f89de63cdd
diff --git a/app-admin/conky/conky-1.21.8.ebuild b/app-admin/conky/conky-1.21.8.ebuild
deleted file mode 100644
index 9598436ba46d..000000000000
--- a/app-admin/conky/conky-1.21.8.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-PYTHON_COMPAT=( python3_{10,11,12} )
-
-inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="https://github.com/brndnmtthws/conky"
-SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="apcupsd bundled-toluapp cmus colour-name-map curl doc extras hddtemp ical
-	iconv imlib intel-backlight iostats irc lua-cairo lua-cairo-xlib
-	lua-imlib lua-rsvg math moc mouse-events mpd mysql ncurses nvidia
-	+portmon pulseaudio rss systemd test thinkpad truetype wayland webserver
-	wifi X xinerama xinput xmms2"
-RESTRICT="!test? ( test )"
-
-# Note: toluapp is bundled in conky since 1.11.2
-# Note: maintainer mode "-DMAINTAINER_MODE=yes" sets CMAKE_BUILD_TYPE Debug
-#       which creates debug symbols and enables "-DBUILD_TESTS" which also
-#       results in conky_core debug library getting installed
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	ical? ( dev-libs/libical:= )
-	iconv? ( virtual/libiconv )
-	imlib? ( >=media-libs/imlib2-1.11.0[X] )
-	irc? ( net-libs/libircclient )
-	lua-cairo? ( x11-libs/cairo[X?] )
-	lua-cairo-xlib? ( x11-libs/cairo[X] )
-	lua-imlib? ( >=media-libs/imlib2-1.11.0[X] )
-	lua-rsvg? ( gnome-base/librsvg )
-	mysql? ( dev-db/mysql-connector-c )
-	ncurses? ( sys-libs/ncurses:= )
-	nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	pulseaudio? ( media-libs/libpulse )
-	rss? (
-		dev-libs/libxml2
-		dev-libs/glib:2
-	)
-	systemd? ( sys-apps/systemd )
-	truetype? (
-		x11-libs/libXft
-		>=media-libs/freetype-2
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/pango
-	)
-	wifi? ( net-wireless/wireless-tools )
-	webserver? ( net-libs/libmicrohttpd:= )
-	X? (
-		x11-libs/libXdamage
-		x11-libs/libXfixes
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libX11
-	)
-	xinerama? ( x11-libs/libXinerama )
-	xmms2? ( media-sound/xmms2 )
-	${LUA_DEPS}
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	apcupsd? ( sys-power/apcupsd )
-	cmus? ( media-sound/cmus )
-	hddtemp? ( app-admin/hddtemp )
-	moc? ( media-sound/moc )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? (
-		dev-cpp/catch
-	)
-	wayland? (
-		dev-libs/wayland-protocols
-	)
-"
-BDEPEND="
-	colour-name-map? (
-		dev-util/gperf
-	)
-	doc? (
-		virtual/pandoc
-		$(python_gen_any_dep '
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			dev-python/jinja2[${PYTHON_USEDEP}]
-		')
-	)
-	extras? (
-		$(python_gen_any_dep '
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			dev-python/jinja2[${PYTHON_USEDEP}]
-		')
-	)
-	wayland? ( dev-util/wayland-scanner )
-"
-
-python_check_deps() {
-	use doc || use extras || return 0
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/jinja2[${PYTHON_USEDEP}]"
-}
-
-REQUIRED_USE="
-	${LUA_REQUIRED_USE}
-	imlib? ( X )
-	lua-cairo? ( || ( X wayland ) bundled-toluapp )
-	lua-cairo-xlib? ( X  bundled-toluapp )
-	lua-imlib? ( X bundled-toluapp )
-	lua-rsvg? ( || ( X wayland ) bundled-toluapp )
-	mouse-events? ( X wayland )
-	nvidia? ( X )
-	rss? ( curl )
-	truetype? ( X )
-	xinerama? ( X )
-	xinput? ( X )
-"
-
-CONFIG_CHECK="~IPV6"
-
-DOCS=( README.md AUTHORS )
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at /usr/share/doc/${PF}.
-To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf and edit it to your liking.
-
-There are pretty html docs available at https://conky.cc/.
-
-Also see https://github.com/brndnmtthws/conky/wiki or https://wiki.gentoo.org/wiki/Conky"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	lua-single_pkg_setup
-	if use doc || use extras; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# pin lua 5.4
-	sed -i -e 's|Lua "5.3" REQUIRED|Lua "5.4" EXACT|g' \
-		cmake/ConkyPlatformChecks.cmake || die "ConkyPlatformChecks.cmake"
-
-	cmake_src_prepare
-	xdg_environment_reset
-}
-
-src_configure() {
-	local mycmakeargs=()
-
-	if use X; then
-		mycmakeargs+=(
-			-DOWN_WINDOW=yes
-			-DBUILD_XDAMAGE=yes
-			-DBUILD_XFIXES=yes
-			-DBUILD_ARGB=yes
-			-DBUILD_XDBE=yes
-			-DBUILD_XSHAPE=yes
-			-DBUILD_X11=yes
-		)
-	else
-		mycmakeargs+=(
-			-DBUILD_X11=no
-		)
-	fi
-
-	mycmakeargs+=(
-		-DBUILD_APCUPSD=$(usex apcupsd)
-		-DBUILD_AUDACIOUS=no
-		-DBUILD_BUILTIN_CONFIG=yes
-		-DBUILD_CMUS=$(usex cmus)
-		-DBUILD_COLOUR_NAME_MAP=$(usex colour-name-map)
-		-DBUILD_CURL=$(usex curl)
-		-DBUILD_DOCS=$(usex doc)
-		-DBUILD_EXTRAS=$(usex extras)
-		-DBUILD_HDDTEMP=$(usex hddtemp)
-		-DBUILD_HTTP=$(usex webserver)
-		-DBUILD_I18N=yes
-		-DBUILD_IBM=$(usex thinkpad)
-		-DBUILD_ICAL=$(usex ical)
-		-DBUILD_ICONV=$(usex iconv)
-		-DBUILD_IMLIB2=$(usex imlib)
-		-DBUILD_INTEL_BACKLIGHT=$(usex intel-backlight)
-		-DBUILD_IOSTATS=$(usex iostats)
-		-DBUILD_IPV6=yes
-		-DBUILD_IRC=$(usex irc)
-		-DBUILD_JOURNAL=$(usex systemd)
-		-DBUILD_LUA_CAIRO=$(usex lua-cairo)
-		-DBUILD_LUA_CAIRO_XLIB=$(usex lua-cairo-xlib)
-		-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
-		-DBUILD_LUA_RSVG=$(usex lua-rsvg)
-		-DBUILD_MATH=$(usex math)
-		-DBUILD_MOC=$(usex moc)
-		-DBUILD_MOUSE_EVENTS=$(usex mouse-events)
-		-DBUILD_MPD=$(usex mpd)
-		-DBUILD_MYSQL=$(usex mysql)
-		-DBUILD_NCURSES=$(usex ncurses)
-		-DBUILD_NVIDIA=$(usex nvidia)
-		-DBUILD_OLD_CONFIG=yes
-		-DBUILD_PORT_MONITORS=$(usex portmon)
-		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_RSS=$(usex rss)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_WAYLAND=$(usex wayland)
-		-DBUILD_WLAN=$(usex wifi)
-		-DBUILD_XFT=$(usex truetype)
-		-DBUILD_XINERAMA=$(usex xinerama)
-		-DBUILD_XINPUT=$(usex xinput)
-		-DBUILD_XMMS2=$(usex xmms2)
-		-DDOC_PATH=/usr/share/doc/${PF}
-		-DMAINTAINER_MODE=no
-		-DRELEASE=yes
-	)
-
-	if use doc || use extras; then
-		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use extras; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${BUILD_DIR}"/extras/vim/syntax/conkyrc.vim
-
-		insinto /usr/share/nano/
-		doins "${BUILD_DIR}"/extras/nano/conky.nanorc
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	xdg_pkg_postinst
-}
diff --git a/app-admin/conky/conky-1.22.0.ebuild b/app-admin/conky/conky-1.22.0.ebuild
new file mode 100644
index 000000000000..3d106fec1f7d
--- /dev/null
+++ b/app-admin/conky/conky-1.22.0.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="apcupsd bundled-toluapp cmus colour-name-map curl doc extras hddtemp ical
+	iconv imlib intel-backlight iostats irc lua-cairo lua-cairo-xlib
+	lua-imlib lua-rsvg math moc mouse-events mpd mysql ncurses nvidia
+	+portmon pulseaudio rss systemd test thinkpad truetype wayland webserver
+	wifi X xinerama xinput xmms2"
+RESTRICT="!test? ( test )"
+
+# Note: toluapp is bundled in conky since 1.11.2
+# Note: maintainer mode "-DMAINTAINER_MODE=yes" sets CMAKE_BUILD_TYPE Debug
+#       which creates debug symbols and enables "-DBUILD_TESTS" which also
+#       results in conky_core debug library getting installed
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	ical? ( dev-libs/libical:= )
+	iconv? ( virtual/libiconv )
+	imlib? ( >=media-libs/imlib2-1.11.0[X] )
+	irc? ( net-libs/libircclient )
+	lua-cairo? ( x11-libs/cairo[X?] )
+	lua-cairo-xlib? ( x11-libs/cairo[X] )
+	lua-imlib? ( >=media-libs/imlib2-1.11.0[X] )
+	lua-rsvg? ( gnome-base/librsvg )
+	mysql? ( dev-db/mysql-connector-c )
+	ncurses? ( sys-libs/ncurses:= )
+	nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+	pulseaudio? ( media-libs/libpulse )
+	rss? (
+		dev-libs/libxml2
+		dev-libs/glib:2
+	)
+	systemd? ( sys-apps/systemd )
+	truetype? (
+		x11-libs/libXft
+		>=media-libs/freetype-2
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/pango
+	)
+	wifi? ( net-wireless/wireless-tools )
+	webserver? ( net-libs/libmicrohttpd:= )
+	X? (
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libX11
+	)
+	xinerama? ( x11-libs/libXinerama )
+	xmms2? ( media-sound/xmms2 )
+	${LUA_DEPS}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	apcupsd? ( sys-power/apcupsd )
+	cmus? ( media-sound/cmus )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		dev-cpp/catch
+	)
+	wayland? (
+		dev-libs/wayland-protocols
+	)
+"
+BDEPEND="
+	colour-name-map? (
+		dev-util/gperf
+	)
+	doc? (
+		virtual/pandoc
+		$(python_gen_any_dep '
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			dev-python/jinja2[${PYTHON_USEDEP}]
+		')
+	)
+	extras? (
+		$(python_gen_any_dep '
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			dev-python/jinja2[${PYTHON_USEDEP}]
+		')
+	)
+	wayland? ( dev-util/wayland-scanner )
+"
+
+python_check_deps() {
+	use doc || use extras || return 0
+	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/jinja2[${PYTHON_USEDEP}]"
+}
+
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	imlib? ( X )
+	lua-cairo? ( || ( X wayland ) bundled-toluapp )
+	lua-cairo-xlib? ( X  bundled-toluapp )
+	lua-imlib? ( X bundled-toluapp )
+	lua-rsvg? ( || ( X wayland ) bundled-toluapp )
+	mouse-events? ( X wayland )
+	nvidia? ( X )
+	rss? ( curl )
+	truetype? ( X )
+	xinerama? ( X )
+	xinput? ( X )
+"
+
+CONFIG_CHECK="~IPV6"
+
+DOCS=( README.md AUTHORS )
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at /usr/share/doc/${PF}.
+To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf and edit it to your liking.
+
+There are pretty html docs available at https://conky.cc/.
+
+Also see https://github.com/brndnmtthws/conky/wiki or https://wiki.gentoo.org/wiki/Conky"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	lua-single_pkg_setup
+	if use doc || use extras; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# pin lua 5.4
+	sed -i -e 's|Lua "5.3" REQUIRED|Lua "5.4" EXACT|g' \
+		cmake/ConkyPlatformChecks.cmake || die "ConkyPlatformChecks.cmake"
+
+	cmake_src_prepare
+	xdg_environment_reset
+}
+
+src_configure() {
+	local mycmakeargs=()
+
+	if use X; then
+		mycmakeargs+=(
+			-DOWN_WINDOW=yes
+			-DBUILD_XDAMAGE=yes
+			-DBUILD_XFIXES=yes
+			-DBUILD_ARGB=yes
+			-DBUILD_XDBE=yes
+			-DBUILD_XSHAPE=yes
+			-DBUILD_X11=yes
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_X11=no
+		)
+	fi
+
+	mycmakeargs+=(
+		-DBUILD_APCUPSD=$(usex apcupsd)
+		-DBUILD_AUDACIOUS=no
+		-DBUILD_BUILTIN_CONFIG=yes
+		-DBUILD_CMUS=$(usex cmus)
+		-DBUILD_COLOUR_NAME_MAP=$(usex colour-name-map)
+		-DBUILD_CURL=$(usex curl)
+		-DBUILD_DOCS=$(usex doc)
+		-DBUILD_EXTRAS=$(usex extras)
+		-DBUILD_HDDTEMP=$(usex hddtemp)
+		-DBUILD_HTTP=$(usex webserver)
+		-DBUILD_I18N=yes
+		-DBUILD_IBM=$(usex thinkpad)
+		-DBUILD_ICAL=$(usex ical)
+		-DBUILD_ICONV=$(usex iconv)
+		-DBUILD_IMLIB2=$(usex imlib)
+		-DBUILD_INTEL_BACKLIGHT=$(usex intel-backlight)
+		-DBUILD_IOSTATS=$(usex iostats)
+		-DBUILD_IPV6=yes
+		-DBUILD_IRC=$(usex irc)
+		-DBUILD_JOURNAL=$(usex systemd)
+		-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+		-DBUILD_LUA_CAIRO_XLIB=$(usex lua-cairo-xlib)
+		-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+		-DBUILD_LUA_RSVG=$(usex lua-rsvg)
+		-DBUILD_MATH=$(usex math)
+		-DBUILD_MOC=$(usex moc)
+		-DBUILD_MOUSE_EVENTS=$(usex mouse-events)
+		-DBUILD_MPD=$(usex mpd)
+		-DBUILD_MYSQL=$(usex mysql)
+		-DBUILD_NCURSES=$(usex ncurses)
+		-DBUILD_NVIDIA=$(usex nvidia)
+		-DBUILD_OLD_CONFIG=yes
+		-DBUILD_PORT_MONITORS=$(usex portmon)
+		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_RSS=$(usex rss)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_WAYLAND=$(usex wayland)
+		-DBUILD_WLAN=$(usex wifi)
+		-DBUILD_XFT=$(usex truetype)
+		-DBUILD_XINERAMA=$(usex xinerama)
+		-DBUILD_XINPUT=$(usex xinput)
+		-DBUILD_XMMS2=$(usex xmms2)
+		-DDOC_PATH=/usr/share/doc/${PF}
+		-DMAINTAINER_MODE=no
+		-DRELEASE=yes
+	)
+
+	if use doc || use extras; then
+		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use extras; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${BUILD_DIR}"/extras/vim/syntax/conkyrc.vim
+
+		insinto /usr/share/nano/
+		doins "${BUILD_DIR}"/extras/nano/conky.nanorc
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	xdg_pkg_postinst
+}
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 42388c83f255..26bfeebb3bd5 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -6,3 +6,5 @@ DIST consul-1.19.1-deps.tar.xz 10102748 BLAKE2B 9d121764915ff191e660450007adaab4
 DIST consul-1.19.1.tar.gz 35683711 BLAKE2B 47504c91413388ef3439adc848af19af2e344944845e0a275fb9b5e5df81b13d86002f4df421a467a82b194b738422e90691b281c37ff7807093905eba95ff10 SHA512 d5912b5340e49f38823f265c0a90f09a20d6b7d8920d6d1bcce96ee556e7edf2fca0441afe4b2f65cc50b3c228479ef6babc917c5c0f17fa521c136a5147c899
 DIST consul-1.20.1-deps.tar.xz 10033856 BLAKE2B dcd9df79d1f5948eb7ed1c6279a679d1d368271c2dd971451fffe58c7de7d15e6656f9f8fbfd274bd0269a2d6495d5f9d88a5440e82ca71e9ebf50d1dfa1aafa SHA512 7484183b0b38665df7758afb18928d0cc4a96e8df1f71c4654e6527370c74451c96c3f5cc7b055cdd9fe33dd7e9a39b02e9254b4faeb60171043c624947b800b
 DIST consul-1.20.1.tar.gz 35647978 BLAKE2B 3287c57ea426f5fc0be6c023bd5c3701908d1d2f2309dcb815a1087f2b2c10bc40895d362c56ac53a1daac90d65c8dbb03b55126244608d18eb7bb19f79a8bb0 SHA512 88ddb750f60d87d31713dabd6cc22590fd96ec12d912d08f1d4690839c64e896254e207c029001233b7e47ddf03b171e0daaf24a26437c36199c30632b183163
+DIST consul-1.20.2-deps.tar.xz 10069664 BLAKE2B 7a6ac97367625da734fd9a399e14744e284ae0b1beb27f50176f10ec448a7b177a6e4897e3b1eca313e9d0a31d7c9764187c0812bfbcf05b603533be288dc2c5 SHA512 759c8346b04f1e7a8c273c46bbcf7da28b388243564ae3d834d388c27a099e74f92a5da4676b953e5851a45a5f1bb1c31fda10d44f69b13cca36c604829d8fc3
+DIST consul-1.20.2.tar.gz 39310768 BLAKE2B 9d6d05a6d16e842fd0cdb1a8d8a93adedfc82388fbf72bb8088ab1fd96ac9d98762f0e67c0b22c240e801655bc2c478ba09d0cfc563b3151c2d56f59e4f001f5 SHA512 687c30b55aedcd0b9154ae4a05c6a828e453146ae171a1407497fb45aed952fc888306c48590cc9243dd7c1f59795b345f04f36c2de183f64e13e35e4a61d66b
diff --git a/app-admin/consul/consul-1.20.2.ebuild b/app-admin/consul/consul-1.20.2.ebuild
new file mode 100644
index 000000000000..9bd8713eb416
--- /dev/null
+++ b/app-admin/consul/consul-1.20.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+GIT_COMMIT="33e5727aac81d744f16ede69233b2e5fd95a0b75"
+GIT_DATE="2025-01-03T14:38:40Z" # source build-support/functions/10-util.sh; git_date
+
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+LICENSE="BUSL-1.1 MPL-2.0"
+LICENSE+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="test"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+	acct-group/consul
+	acct-user/consul"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	default
+	sed -e "s|^GIT_DATE=.*|GIT_DATE=${GIT_DATE}|" -i Makefile || die
+}
+
+src_compile() {
+	if use x86; then
+		#924629 pie breaks build on x86
+		GOFLAGS=${GOFLAGS//-buildmode=pie}
+	fi
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake dev-build
+}
+
+src_install() {
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/consul
+	fowners consul:consul /var/log/consul
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/git-credential-gopass/git-credential-gopass-1.15.15.ebuild b/app-admin/git-credential-gopass/git-credential-gopass-1.15.15.ebuild
index 50939531c011..c40edc3cffe9 100644
--- a/app-admin/git-credential-gopass/git-credential-gopass-1.15.15.ebuild
+++ b/app-admin/git-credential-gopass/git-credential-gopass-1.15.15.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
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta
 
 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 DEPEND=">=dev-lang/go-1.16"
 RDEPEND="
diff --git a/app-admin/gopass-hibp/gopass-hibp-1.15.15.ebuild b/app-admin/gopass-hibp/gopass-hibp-1.15.15.ebuild
index dcc9f7b6470b..88287084b60e 100644
--- a/app-admin/gopass-hibp/gopass-hibp-1.15.15.ebuild
+++ b/app-admin/gopass-hibp/gopass-hibp-1.15.15.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
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta
 
 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 DEPEND=">=dev-lang/go-1.16"
 RDEPEND="
diff --git a/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.15.ebuild b/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.15.ebuild
index 699540bb5843..6981075ef569 100644
--- a/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.15.ebuild
+++ b/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.15.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
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta
 
 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 DEPEND=">=dev-lang/go-1.16"
 RDEPEND="
diff --git a/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.15.ebuild b/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.15.ebuild
index 44e42f854afe..c74488d1d6a4 100644
--- a/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.15.ebuild
+++ b/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.15.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
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta
 
 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 DEPEND=">=dev-lang/go-1.16"
 RDEPEND="
diff --git a/app-admin/gopass/gopass-1.15.15.ebuild b/app-admin/gopass/gopass-1.15.15.ebuild
index bac64dde98cc..911e39994059 100644
--- a/app-admin/gopass/gopass-1.15.15.ebuild
+++ b/app-admin/gopass/gopass-1.15.15.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://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta
 
 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 DEPEND=">=dev-lang/go-1.18"
 RDEPEND="
diff --git a/app-admin/hardinfo/Manifest b/app-admin/hardinfo/Manifest
index 413516588e6e..777b0f995074 100644
--- a/app-admin/hardinfo/Manifest
+++ b/app-admin/hardinfo/Manifest
@@ -1 +1,2 @@
 DIST hardinfo-0.6_alpha_pre20221113-a798cbaed6f1b083cc3c26dbede74cf40947d0ef.tar.gz 1411038 BLAKE2B 8a6ca1a8e2bd53804cd6f55f0b9ce89d24d61aff9e267636301331d329229cd11778ea087e1906e7313cb1bd077ca69766e6fdf86c21985deba51f942cedf904 SHA512 faa7db1c8a7ac4f432a27cf10d21b453091136dd2d171b63f0b91eeea65c3cec25e7b4c2a845dfb64ff572ee6acaddfec56bd51f7292ed8b3674b44755a7a631
+DIST hardinfo-0.6_alpha_pre20240320-4c97625c5666fa5fc353e7cab322b09159e54ed4.tar.gz 1467190 BLAKE2B 7d34e5ace15008471bb488fe19cde320e8a4fd4939b69bc417ea653bdd4fffe49c87e60b5c03c57a30130350a2b9fe649673738bffe8e5d2246ebea5076054bb SHA512 022646e78ed90e36db432fa6a49ba327d455012e91059a41f8e0f5d5a2b1619cd4b22b93e6d2c6bab80965f2bb7cb295b2c24b780938ac24507d654a95b44fc8
diff --git a/app-admin/hardinfo/hardinfo-0.6_alpha_pre20240320.ebuild b/app-admin/hardinfo/hardinfo-0.6_alpha_pre20240320.ebuild
new file mode 100644
index 000000000000..aa7605b5124c
--- /dev/null
+++ b/app-admin/hardinfo/hardinfo-0.6_alpha_pre20240320.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg cmake
+
+GIT_COMMIT="4c97625c5666fa5fc353e7cab322b09159e54ed4"
+
+DESCRIPTION="System information and benchmark tool for Linux systems"
+HOMEPAGE="https://github.com/lpereira/hardinfo"
+SRC_URI="https://github.com/lpereira/hardinfo/archive/${GIT_COMMIT}.tar.gz -> ${P}-${GIT_COMMIT}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="debug"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib
+	sys-libs/zlib
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.0:3"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+
+PATCHES=( "${FILESDIR}"/hardinfo-0.6-fix-function-declarations.patch )
+
+src_configure() {
+	# Only used for update checking. Revisit when switching to hardinfo2.
+	sed -i -e '/LIBSOUP/d' CMakeLists.txt || die
+
+	local mycmakeargs=(
+		-DHARDINFO_GTK3=1
+		-DHARDINFO_DEBUG=$(usex debug 1 0)
+	)
+	cmake_src_configure
+}
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index dae9fa3b27ee..ee974ce79859 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,2 +1 @@
-DIST hcloud-1.47.0.tar.xz 2199764 BLAKE2B 02c06449ab62904b3f21ddaadc6182a965488e72f453b8d03d73b4be8a585ae42a7f1db4012588b8983e77cb181fa1aeff1a778205fc23731bc12565cdea1d7b SHA512 ca5999ef59a3b11e589a6c199f87ff2487b1384dfb6244adf286b84ee7de9dc6cbc4879dc72b6a5196c0f067efa7d3202110471debc4fe020114bf97ea10f9c8
 DIST hcloud-1.49.0.tar.xz 2400804 BLAKE2B 50752dd18c20a0ad5783157d2b51514375d3c14ab945188208043709af1f74109e2adc0d31cbb0cd2b6078f4e2ad22940f81bfb538a4cd4acb93a9c069ee18b9 SHA512 4f26f70d9e90e2cabdbca7d0bebc545117c9b684bf03c263dc2bfca66bd8d2088afdc47ecbb9f835a6ab30700aea75dcb27998d71afd18f803205239dcfb50c4
diff --git a/app-admin/hcloud/hcloud-1.47.0.ebuild b/app-admin/hcloud/hcloud-1.47.0.ebuild
deleted file mode 100644
index 1b73743024ed..000000000000
--- a/app-admin/hcloud/hcloud-1.47.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="A command-line interface for Hetzner Cloud"
-HOMEPAGE="https://github.com/hetznercloud/cli"
-SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-src_compile() {
-	ego build -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.versionPrerelease=gentoo" ./cmd/${PN}
-}
-
-src_test() {
-	# For upstream a simple test is run 'hcloud version'
-	./hcloud version
-	if [[ $? -ne 0 ]]
-	then
-		die "Test failed"
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-admin/hcloud/hcloud-1.49.0.ebuild b/app-admin/hcloud/hcloud-1.49.0.ebuild
index 49cedeae2460..d45c862a60dd 100644
--- a/app-admin/hcloud/hcloud-1.49.0.ebuild
+++ b/app-admin/hcloud/hcloud-1.49.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
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_compile() {
 	ego build -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.versionPrerelease=gentoo" ./cmd/${PN}
diff --git a/app-admin/kio-admin/Manifest b/app-admin/kio-admin/Manifest
index c09c0086713c..77f7718d494e 100644
--- a/app-admin/kio-admin/Manifest
+++ b/app-admin/kio-admin/Manifest
@@ -1,2 +1,2 @@
 DIST kio-admin-24.08.3.tar.xz 38688 BLAKE2B ededa0da867c76e45efec80d60e8f4c720fe7fa663d574dd910a35d5f7b77e8b8b5d23f0322b2f635dc34f7318351400e9c9f9e032f014a68ec3ecbf86f4054b SHA512 d357ce492798cbcc1f91933c0ded5c3d1c80c9fdb9d53a7e9c98038cf87825ccc10608c763e66b46410508d9afb52a9f93623e4dcad647657d0c5237395dc1b1
-DIST kio-admin-24.12.0.tar.xz 39064 BLAKE2B ea7666b1174459bb3ba31b66d6c240a33a69d79404540423a0f08a2c7ec4e224606777174ba1a9fa94d1f00ae5abefa0e4a835396c8a4e0cbf68e45927af5359 SHA512 19dbe7852001cd765760a48a59e5ec871765cd74b8d322d036afeb01462d131fe759aff0859fd131341597101a0eef66c02845f6fab8e4bbb0bc709fe9a89f66
+DIST kio-admin-24.12.1.tar.xz 39084 BLAKE2B 1c3339c46a49781ed4d315121e8b9523f219b423159cd11be22161da92689d3d49e6176e270bb8aeaa13ac1dc9d76cb35849ddd5366ca28189259764d92772dc SHA512 dcae417fe3befff12ac575d5830c3c8944ba3cfe84042c4e8dd60c7936e496f83cade3e718651b955d507f9a9e5e9466918d406db179a236e742d4749d7e8fdd
diff --git a/app-admin/kio-admin/kio-admin-24.12.0.ebuild b/app-admin/kio-admin/kio-admin-24.12.0.ebuild
deleted file mode 100644
index 44a8a949ff24..000000000000
--- a/app-admin/kio-admin/kio-admin-24.12.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="system"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Manage files as administrator using the admin:// KIO protocol"
-HOMEPAGE="https://invent.kde.org/system/kio-admin"
-
-LICENSE="BSD CC0-1.0 FSFAP GPL-2 GPL-3"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=sys-auth/polkit-qt-0.175[qt6(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/app-admin/kio-admin/kio-admin-24.12.1.ebuild b/app-admin/kio-admin/kio-admin-24.12.1.ebuild
new file mode 100644
index 000000000000..f952f5f81dfb
--- /dev/null
+++ b/app-admin/kio-admin/kio-admin-24.12.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="system"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Manage files as administrator using the admin:// KIO protocol"
+HOMEPAGE="https://invent.kde.org/system/kio-admin"
+
+LICENSE="BSD CC0-1.0 FSFAP GPL-2 GPL-3"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=sys-auth/polkit-qt-0.175[qt6(+)]
+"
+RDEPEND="${DEPEND}"
diff --git a/app-admin/linode-cli/Manifest b/app-admin/linode-cli/Manifest
index 71d3de47e385..f977a662f55a 100644
--- a/app-admin/linode-cli/Manifest
+++ b/app-admin/linode-cli/Manifest
@@ -1,2 +1,3 @@
 DIST linode_cli-5.54.0.tar.gz 153961 BLAKE2B ae147c7c29532d53e8230e8374acb5727791f07f3177720637d7b23d1169821b2a65975b6e22f45bb53f69d241525ecb081a18f854d3d904da9de406f27f146f SHA512 7cad0e899ebced5c27923f4b8ea6fc4c854f90f7925ff5e8e010565ec51f20c75976a0efacfebceb78c4befa0e64ea0a2c896bb82f541903413fe96c8b0c68e1
 DIST linode_cli-5.55.0.tar.gz 159746 BLAKE2B 1ef914ec316bebb40961f075c528d8311c21030bcc643e45e18e187cce8d52f2a79629be7482778e5f0061c3db143685b5899e7e0c563f0565bbad3390dc3783 SHA512 37b88fbdbc66a6057a3b50379928d7f0547136aa8d068109b2dd3d2c6969698598a26c84b1f7494952795dc52a7ab05e2240680d86e88c85007df1e53445052d
+DIST linode_cli-5.56.0.tar.gz 160792 BLAKE2B 25d2099d0363e699444245a939ede518530f1dda63a063db74b34650f7f7d76cf1f0d630cc01ca6dbeaed659a10f1429792d06615db4f773669234267f608d24 SHA512 5f3b075479a00b3d8c210c98040029bf44b10dc505a711e373bab49b53556a4ae4d26799a998c0354b562bfa1bbdbfa6d4b965c52d8c9bd57fae8d3c1eb27e72
diff --git a/app-admin/linode-cli/linode-cli-5.56.0.ebuild b/app-admin/linode-cli/linode-cli-5.56.0.ebuild
new file mode 100644
index 000000000000..1353a61b0c36
--- /dev/null
+++ b/app-admin/linode-cli/linode-cli-5.56.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2023-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 distutils-r1 pypi shell-completion
+
+DESCRIPTION="Official command-line interface for interacting with the Linode API"
+HOMEPAGE="https://github.com/linode/linode-cli https://www.linode.com/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Tests require network, a linode account and an API key.
+# WARNING: tests will incur costs and will wipe the account.
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/boto3[${PYTHON_USEDEP}]
+	>=dev-python/linode-metadata-0.3[${PYTHON_USEDEP}]
+	dev-python/openapi3[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	<dev-python/urllib3-3[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	PYTHONPATH=. ${EPYTHON} linodecli completion bash > "${T}/${PN}".bash || die
+	PYTHONPATH=. ${EPYTHON} linodecli completion fish > "${T}/${PN}".fish || die
+
+	newbashcomp "${T}/${PN}".bash ${PN}
+	newfishcomp "${T}/${PN}".fish ${PN}
+
+	dosym ${PN} "$(get_bashcompdir)"/linode
+	dosym ${PN} "$(get_bashcompdir)"/lin
+	dosym ${PN} "$(get_fishcompdir)"/linode
+	dosym ${PN} "$(get_fishcompdir)"/lin
+}
diff --git a/app-admin/opentofu/Manifest b/app-admin/opentofu/Manifest
index 85fbeba6afcf..9a15de5754b5 100644
--- a/app-admin/opentofu/Manifest
+++ b/app-admin/opentofu/Manifest
@@ -10,3 +10,7 @@ DIST opentofu-1.7.2-deps.tar.xz 107787580 BLAKE2B 10d7f8e114ca43964de34f4ecc7d8a
 DIST opentofu-1.7.2.tar.gz 3890420 BLAKE2B 7e234b535cd76b8716ed69271fd2ba13670c7ab7ae5fcff8c1e5a16097a518eee2d437772ae90b680e38adf5e64d77fdfa543f087492a36eb866405500eb3cc4 SHA512 49f93c1f7e1469b69a784424b724460c199e54c351801ef7ad3db1fea24089b585a5cf9ffef90b45ba2713d853b8d99828ceffa7c3469737bcd201b6ce34f362
 DIST opentofu-1.8.1-deps.tar.xz 107813812 BLAKE2B 965afc691f6cab85774ca543088bd6dbfb37af22ed59a4fefd8b352924435d2569c7968475d272ead6d710e4279956aecd6f3a6a1421ee1ffc758255918f0399 SHA512 af429415110dfc19cb588390d49cc0aad057505d6de3897cb52d996473d81f294f239cc1a767682355d97fd292c7c1cf56e42f8127375eff9c3affdbc372fbcc
 DIST opentofu-1.8.1.tar.gz 3995189 BLAKE2B d6bfd35172960180defee30e0fa3135f6aac5017d307f236145931cc134c58b123a1e368278e2fcce613a184c90b1ae3fb15a0e4da32c4fbf2e291b8f4c2251d SHA512 c6bb6cab979cb5bb53eb53eea6c1a0b2766b06fd5c66564597b3df8d4561d2b2af3f5a4804f3427da3addc11c12b99ef913637b2126452f5f2168d88a06af478
+DIST opentofu-1.8.8-deps.tar.xz 107062472 BLAKE2B e1ad2b7e7a28fd8040b3bef000b795fff501b06c443e657b75e9489d4ad2c747670d9e9fc75e796590513cdae7eb59c33aa7786ca7fe6dc31a2325c2d7028b5c SHA512 b497ac10ae7b8d9b44645c159af625336e50678707ca8cb69af15f1fae62dbfdcd1e537c8a3adff368947fc5d6269c6a964c51fa19108f602018045aa4e12d84
+DIST opentofu-1.8.8.tar.gz 4007751 BLAKE2B 7aff3cf4c01bf253975d50ac7d398299b881952bb9f8bffaf8548a6cef2e8f2b89249e9d8f7345ac284ed46fd152815d051a21598e2f1f1e5029a39c23764581 SHA512 ec58bac2cd2fc17879425631d5af2c660e9d42406f06254b3b4ffda8ebc30d9359c9d0491c8a53944ccb9ae4110ab9b658b43fc113e80c8cec18e854fb3a68d9
+DIST opentofu-1.9.0-deps.tar.xz 107229436 BLAKE2B f0c2074cccdd7be8504eaf1e389a6bb1fec12a2a2a5bba88ae281527611eb3a0a8f3a5d2bbddbd76edce710641367ed8d878db54ab070946d04cbeb3f680c72c SHA512 dac5c4d1238641bcdb1fa37ff53d92924f424330e7c46d60ad14cf5c1e8f33267690468f11e4e4b853cdc8f06937f07200373bbbe845b4faaee1a5b086b10c33
+DIST opentofu-1.9.0.tar.gz 4126960 BLAKE2B da87112a68f35689297bdaab261fd8916160fea9154da2578bb037fa21dc416b24233fbf5144d03cff73677cbaabdc019d10c8d60816e7ecae0ceabcc1fcfc62 SHA512 3b8219f778ede549def2d112c4939a95aa0484689e739b30a5e81bc723cc6ea7284eb6dc83001d415451dba39ecfaa4855a682ce2ea2e716bba385df2e8e0a08
diff --git a/app-admin/opentofu/opentofu-1.7.1.ebuild b/app-admin/opentofu/opentofu-1.7.1.ebuild
index 544c2e0b5f16..5c4750a94a3f 100644
--- a/app-admin/opentofu/opentofu-1.7.1.ebuild
+++ b/app-admin/opentofu/opentofu-1.7.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
@@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="dev-go/gox"
 
diff --git a/app-admin/opentofu/opentofu-1.8.8.ebuild b/app-admin/opentofu/opentofu-1.8.8.ebuild
new file mode 100644
index 000000000000..d80ebed9007a
--- /dev/null
+++ b/app-admin/opentofu/opentofu-1.8.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="The open source infrastructure as code tool"
+HOMEPAGE="https://www.opentofu.org/"
+SRC_URI="https://github.com/opentofu/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-go/gox"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	export CGO_ENABLED=0
+	gox \
+		-os=$(go env GOOS) \
+		-arch=$(go env GOARCH) \
+		-output bin/tofu \
+		-verbose \
+		./cmd/tofu || die
+}
+
+src_install() {
+	dobin bin/*
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    tofu -install-autocomplete"
+}
diff --git a/app-admin/opentofu/opentofu-1.9.0.ebuild b/app-admin/opentofu/opentofu-1.9.0.ebuild
new file mode 100644
index 000000000000..d80ebed9007a
--- /dev/null
+++ b/app-admin/opentofu/opentofu-1.9.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="The open source infrastructure as code tool"
+HOMEPAGE="https://www.opentofu.org/"
+SRC_URI="https://github.com/opentofu/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-go/gox"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	export CGO_ENABLED=0
+	gox \
+		-os=$(go env GOOS) \
+		-arch=$(go env GOARCH) \
+		-output bin/tofu \
+		-verbose \
+		./cmd/tofu || die
+}
+
+src_install() {
+	dobin bin/*
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    tofu -install-autocomplete"
+}
diff --git a/app-admin/rasdaemon/rasdaemon-0.8.2.ebuild b/app-admin/rasdaemon/rasdaemon-0.8.2.ebuild
index 7f83b3d05ac6..ed6a9992206c 100644
--- a/app-admin/rasdaemon/rasdaemon-0.8.2.ebuild
+++ b/app-admin/rasdaemon/rasdaemon-0.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
@@ -11,7 +11,7 @@ SRC_URI="https://www.infradead.org/~mchehab/rasdaemon/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="selinux"
 
 DEPEND="
diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest
index 67a4279984bf..a41708511d2c 100644
--- a/app-admin/restart-services/Manifest
+++ b/app-admin/restart-services/Manifest
@@ -1,2 +1,3 @@
 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
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-admin/setools/setools-4.5.1.ebuild b/app-admin/setools/setools-4.5.1.ebuild
index 434f02a834a1..d191d79f839e 100644
--- a/app-admin/setools/setools-4.5.1.ebuild
+++ b/app-admin/setools/setools-4.5.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"
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}"
 else
 	SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="amd64 arm64 ~riscv ~x86"
 	S="${WORKDIR}/${PN}"
 fi
 
diff --git a/app-admin/sudo/sudo-1.9.16_p2-r1.ebuild b/app-admin/sudo/sudo-1.9.16_p2-r1.ebuild
index 7d85346474e6..77e044b35614 100644
--- a/app-admin/sudo/sudo-1.9.16_p2-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.16_p2-r1.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,7 +33,7 @@ else
 	"
 
 	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	fi
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sudo )"
diff --git a/app-admin/syslog-ng/syslog-ng-4.8.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-4.8.1-r1.ebuild
index afc80939e2b7..ce68a841b2cb 100644
--- a/app-admin/syslog-ng/syslog-ng-4.8.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-4.8.1-r1.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://github.com/syslog-ng/syslog-ng/releases/download/${P}/${P}.tar.
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="amqp caps dbi geoip2 grpc http json kafka mongodb mqtt pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( python )"
diff --git a/app-admin/syslog-ng/syslog-ng-4.8.1.ebuild b/app-admin/syslog-ng/syslog-ng-4.8.1.ebuild
index 683981f5d44e..d02b43113d6e 100644
--- a/app-admin/syslog-ng/syslog-ng-4.8.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-4.8.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/syslog-ng/syslog-ng/releases/download/${P}/${P}.tar.
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="amqp caps dbi geoip2 grpc http json kafka mongodb mqtt pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( python )"
diff --git a/app-admin/winbox/Manifest b/app-admin/winbox/Manifest
index b0635924e617..7c9c52c5c1fc 100644
--- a/app-admin/winbox/Manifest
+++ b/app-admin/winbox/Manifest
@@ -1 +1 @@
-DIST winbox-4.0_beta14.zip 23298527 BLAKE2B a56392ef04d0267399b456b02ea5c39215649444d5d1de7d593f62fb4ad0cc16a90672e16efda4afe25709a3b5e6582e8724065f7aca7432ef6e4d272ebf65d6 SHA512 3b84434b438a8b0c59ff66cf3b5240e8e301352e1dd1f048bba7441c754c593bc0059bb5a62c8c08632aab0d23bf99b6004901ca3e7f1a1252f54e5fd36bea21
+DIST winbox-4.0_beta16.zip 23482580 BLAKE2B fffaccaa23e76acf839308be51768480c139ae57fc3aae44d239e787e024b258d0da0a4bcf7b7dd1016bbb15df4d0434aef64f458261719824960bf4bf15c625 SHA512 e23469d2106b547ccb877efd2820fd7f39c6941026742d4a162a509fa0b12a4dc643ed514979fea3c09c443d1b49a626de8da58c42499f3d102dbcd957e927fe
diff --git a/app-admin/winbox/winbox-4.0_beta14.ebuild b/app-admin/winbox/winbox-4.0_beta14.ebuild
deleted file mode 100644
index 1507eb35582d..000000000000
--- a/app-admin/winbox/winbox-4.0_beta14.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop
-
-DESCRIPTION="Management Software for MikroTik RouterOS"
-HOMEPAGE="https://mikrotik.com/"
-SRC_URI="https://download.mikrotik.com/routeros/winbox/$(ver_cut 1-2)$(ver_cut 3-4)/WinBox_Linux.zip -> ${P}.zip"
-S="${WORKDIR}"
-
-LICENSE="MikroTik"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libglvnd
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-renderutil
-	x11-libs/xcb-util-wm
-"
-BDEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="opt/winbox/WinBox"
-
-src_install() {
-	exeinto /opt/winbox
-	doexe WinBox
-
-	insinto /opt/winbox
-	doins -r assets
-
-	dodir /opt/bin
-	dosym ../winbox/WinBox /opt/bin/winbox
-
-	doicon assets/img/winbox.png
-	make_desktop_entry winbox WinBox WinBox Network
-}
diff --git a/app-admin/winbox/winbox-4.0_beta16.ebuild b/app-admin/winbox/winbox-4.0_beta16.ebuild
new file mode 100644
index 000000000000..84392ba5ea14
--- /dev/null
+++ b/app-admin/winbox/winbox-4.0_beta16.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Management Software for MikroTik RouterOS"
+HOMEPAGE="https://mikrotik.com/"
+SRC_URI="https://download.mikrotik.com/routeros/winbox/$(ver_cut 1-2)$(ver_cut 3-4)/WinBox_Linux.zip -> ${P}.zip"
+S="${WORKDIR}"
+
+LICENSE="MikroTik"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libglvnd
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-renderutil
+	x11-libs/xcb-util-wm
+"
+BDEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="opt/winbox/WinBox"
+
+src_install() {
+	exeinto /opt/winbox
+	doexe WinBox
+
+	insinto /opt/winbox
+	doins -r assets
+
+	dodir /opt/bin
+	dosym ../winbox/WinBox /opt/bin/winbox
+
+	doicon assets/img/winbox.png
+	make_desktop_entry winbox WinBox WinBox Network
+}
diff --git a/app-antivirus/clamav/clamav-0.103.12.ebuild b/app-antivirus/clamav/clamav-0.103.12.ebuild
index 403147a45936..c983071cd63f 100644
--- a/app-antivirus/clamav/clamav-0.103.12.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.12.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="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2 unRAR"
 SLOT="0/lts"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv libclamav-only milter metadata-analysis-api selinux systemd test xml"
 
 REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
diff --git a/app-arch/7zip/7zip-24.09.ebuild b/app-arch/7zip/7zip-24.09.ebuild
index 65deea631e60..dee12baa0394 100644
--- a/app-arch/7zip/7zip-24.09.ebuild
+++ b/app-arch/7zip/7zip-24.09.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
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv"
+KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~riscv"
 IUSE="uasm jwasm rar"
 REQUIRED_USE="?? ( uasm jwasm )"
 
diff --git a/app-arch/clzip/Manifest b/app-arch/clzip/Manifest
index b2f74c5e9c73..b2fdbe8e0842 100644
--- a/app-arch/clzip/Manifest
+++ b/app-arch/clzip/Manifest
@@ -1,2 +1,4 @@
 DIST clzip-1.14.tar.gz 125412 BLAKE2B e28dc890ef233871f8b38e1d4c306032131b714a560e7ebfe756ce3bddb84c9fd0ac3a04e789884951b74760e248503ec2f3555eccf568244c3b3efeae80cb4a SHA512 54047979cc4477e8edba648074ff64b512627aba4da693052052e96faf2c41386db986d73a477aab8ebaef974d753e6b42fa53a0fd293b047efcf60b1fc7483d
 DIST clzip-1.14.tar.gz.sig 72 BLAKE2B f397d586ae3c052bdda80229993746c085196bd01e7e4eddd843ed053b8449109c774199c74c7cd97f1a19623d57965188cf3d3a046e581d9cfbae58f16723c8 SHA512 31e23c3deb63c2c09b71bc9b11d12337a629bed097905d37560f3b8cbcb4730355dc8effa050ec95c1e7e0e00eb4651fa891d9fabdf58df66563e38b3f8b6380
+DIST clzip-1.15.tar.gz 117173 BLAKE2B 0a56db3ee0cc5a5407401d79524453607a0ef752268f2df6621cfedcdb3808f06eba26497da1d1f33a6cb24156fdf73f19a848eda71bfc976ba8cf910d3340df SHA512 9b17ff8e35990db2d71a29153dadd909abfee062803f354affe4e4e2f64c9e726b45480bcdfbd45c40e32347d9af8dee18ba1c3f18cb062bc5bd374dfb9891d3
+DIST clzip-1.15.tar.gz.sig 72 BLAKE2B 3fb13ba9fb1907457c17858c09994f750930d64d8deec3799f04002ecd68b20ec8da6a97bcfd16af7739c80a8fb2ce6f41e90c88e06d6603d1020bf942dc02b8 SHA512 bf5c8ac6628d52a3b4dd62aa9b1b36e8f1d156cf28ebae81e32ef0688a83daa38d63b4c4493947a5730968b9e27f35ff07da4bd93fdab84b977deeb3b0ff5225
diff --git a/app-arch/clzip/clzip-1.15.ebuild b/app-arch/clzip/clzip-1.15.ebuild
new file mode 100644
index 000000000000..65cb18286b9d
--- /dev/null
+++ b/app-arch/clzip/clzip-1.15.ebuild
@@ -0,0 +1,32 @@
+# 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 toolchain-funcs verify-sig
+
+DESCRIPTION="C language version of lzip"
+HOMEPAGE="https://www.nongnu.org/lzip/clzip.html"
+SRC_URI="https://download.savannah.gnu.org/releases/lzip/clzip/${P/_/-}.tar.gz"
+SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/${P/_/-}.tar.gz.sig )"
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
+
+src_configure() {
+	# not autotools-based
+	local myconf=(
+		--prefix="${EPREFIX}"/usr
+		CC="$(tc-getCC)"
+		CPPFLAGS="${CPPFLAGS}"
+		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+	)
+
+	./configure "${myconf[@]}" || die
+}
diff --git a/app-arch/csnappy/csnappy-0_pre20220804.ebuild b/app-arch/csnappy/csnappy-0_pre20220804.ebuild
index 307b6e230772..a25bba37e88f 100644
--- a/app-arch/csnappy/csnappy-0_pre20220804.ebuild
+++ b/app-arch/csnappy/csnappy-0_pre20220804.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-${MY_COMMIT}
 LICENSE="BSD"
 # 0/${PV} b/c of the SONAME situation (see below).
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # https://github.com/zeevt/csnappy/issues/33
 # No SONAME yet.
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 42d6427c79ae..66f6ab609aa6 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,2 +1,3 @@
 DIST dpkg_1.21.15.tar.xz 5350148 BLAKE2B f26611db365266ef9f43484c20d3150889238b34b156cac26f0ae8ae9572e7e4a9839e08a0073a25c886cd2891fc6d84afc97262ae6992267b47fa6e86c03a33 SHA512 eb31db63dd454048c3b7539b539720ed71239303ca679df92b934e971914d63dd771da09149054048e24dde1f5627ee24d43dbd8782ca1dc28c4a2bd3ed8f26a
 DIST dpkg_1.22.11.tar.xz 5697040 BLAKE2B 7bd7f90a8ae98ac7401bc2b8e7b0d2cc002a57bfdc5521d9049a995130011a3042ac6d24d6ecd5410e1db2c2e936eae5085a2af5fb11b0a73fd66bae33b33956 SHA512 8caeb52625e34109bbc3abf1b62792053f989e560b541ec9de85f3fe563f8bcb06db102dbae83058aba16e6f4729260e15e1c7a470762a261bec5460358c0fe9
+DIST dpkg_1.22.14.tar.xz 5728012 BLAKE2B d14e4550f562fd054a073bfb5e9269aff82a3b582ce8676073b67c9ee72baf5a242ee62a91b56966db2569f93255a6475c75b246527142f94f3c1de91c48f673 SHA512 43b0776cf6fef8beb771c552b9824e86bbe554b0738c13ae4d1b89821c79aa2ae26a7d30d3b3b865df89374a1625adbb31da45bf208dafe87fc1a7b175fe4a28
diff --git a/app-arch/dpkg/dpkg-1.22.14.ebuild b/app-arch/dpkg/dpkg-1.22.14.ebuild
new file mode 100644
index 000000000000..5c3113576222
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.22.14.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Package maintenance system for Debian"
+HOMEPAGE="https://packages.qa.debian.org/dpkg"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+bzip2 +lzma nls selinux static-libs test +update-alternatives +zlib +zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/gzip-1.7
+	>=app-arch/tar-1.34-r1
+	app-crypt/libmd
+	>=dev-lang/perl-5.32.1:=
+	sys-libs/ncurses:=[unicode(+)]
+	bzip2? ( app-arch/bzip2 )
+	elibc_musl? ( sys-libs/obstack-standalone )
+	lzma? ( app-arch/xz-utils )
+	nls? ( virtual/libintl )
+	selinux? ( sys-libs/libselinux )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? (
+		dev-perl/IO-String
+		dev-perl/Test-Pod
+		virtual/perl-Test-Harness
+	)
+"
+BDEPEND="
+	sys-devel/flex
+	nls? (
+		app-text/po4a
+		>=sys-devel/gettext-0.18.2
+	)
+"
+RDEPEND+=" selinux? ( sec-policy/selinux-dpkg )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.22.0-flags.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's|\<ar\>|${AR}|g' src/at/deb-format.at src/at/testsuite || die
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export AR CC
+
+	local myconf=(
+		--disable-compiler-warnings
+		--disable-devel-docs
+		--disable-dselect
+		--disable-start-stop-daemon
+		--enable-unicode
+		--localstatedir="${EPREFIX}"/var
+		$(use_enable nls)
+		$(use_enable update-alternatives)
+		$(use_with bzip2 libbz2)
+		$(use_with lzma liblzma)
+		$(use_with selinux libselinux)
+		$(use_with zlib libz)
+		$(use_with zstd libzstd)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	local DOCS=( debian/changelog THANKS TODO )
+	default
+
+	# https://bugs.gentoo.org/835520
+	mv -v "${ED}"/usr/share/zsh/{vendor-completions,site-functions} || die
+
+	# https://bugs.gentoo.org/840320
+	insinto /etc/dpkg/origins
+	newins - gentoo <<-_EOF_
+		Vendor: Gentoo
+		Vendor-URL: https://www.gentoo.org/
+		Bugs: https://bugs.gentoo.org/
+	_EOF_
+	dosym gentoo /etc/dpkg/origins/default
+
+	keepdir \
+		/usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
+		/var/lib/dpkg/{alternatives,info,parts,updates}
+
+	find "${ED}" -name '*.la' -delete || die
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
diff --git a/app-arch/lbzip2/lbzip2-2.5_p20181227-r2.ebuild b/app-arch/lbzip2/lbzip2-2.5_p20181227-r2.ebuild
deleted file mode 100644
index bedd0f60435a..000000000000
--- a/app-arch/lbzip2/lbzip2-2.5_p20181227-r2.ebuild
+++ /dev/null
@@ -1,36 +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="Parallel bzip2 utility"
-HOMEPAGE="https://github.com/kjn/lbzip2/"
-SRC_URI="mirror://gentoo/05/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug static"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3-s_isreg.patch
-	"${FILESDIR}"/${P}-fix-unaligned.patch
-	"${FILESDIR}"/${P}-clang16.patch
-	"${FILESDIR}"/${P}-clang16-musl-info.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local myeconfargs=(
-		$(use_enable debug tracing)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/app-arch/lbzip2/lbzip2-2.5_p20181227-r3.ebuild b/app-arch/lbzip2/lbzip2-2.5_p20181227-r3.ebuild
new file mode 100644
index 000000000000..9efc87278b84
--- /dev/null
+++ b/app-arch/lbzip2/lbzip2-2.5_p20181227-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Parallel bzip2 utility"
+HOMEPAGE="https://github.com/kjn/lbzip2/"
+SRC_URI="mirror://gentoo/05/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="debug static"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3-s_isreg.patch
+	"${FILESDIR}"/${P}-fix-unaligned.patch
+	"${FILESDIR}"/${P}-clang16.patch
+	"${FILESDIR}"/${P}-clang16-musl-info.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	# fix clang miscompilation: #910438
+	# see also: https://github.com/llvm/llvm-project/issues/87189
+	tc-is-clang && test-flag-CC -mno-avx512f && append-cflags -mno-avx512f
+
+	local myeconfargs=(
+		$(use_enable debug tracing)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-arch/libdeflate/libdeflate-1.23.ebuild b/app-arch/libdeflate/libdeflate-1.23.ebuild
index d44e68b21d11..782a8b4efe16 100644
--- a/app-arch/libdeflate/libdeflate-1.23.ebuild
+++ b/app-arch/libdeflate/libdeflate-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-arch/lrzip-next/Manifest b/app-arch/lrzip-next/Manifest
index d2676b28c624..e23d2939e2c8 100644
--- a/app-arch/lrzip-next/Manifest
+++ b/app-arch/lrzip-next/Manifest
@@ -1 +1 @@
-DIST lrzip-next-0.13.1.tar.gz 604938 BLAKE2B f31becc3fb9e332a9682d41d2c6408bf08ee9173ddf7794259d1a5c7ea13b2a6d41f66c6ed9c88f840a48845f99d47526dd64667a788aefef5cea630bce4a094 SHA512 6c62d555c6596dba1184f9240ea31351ff0f091335607d44cb6d5d84589a42e234faccc6c835529b85917ebfcd712b676f1cdd66316be1f3d0c204c196043c65
+DIST lrzip-next-0.13.2.tar.gz 605175 BLAKE2B 1d30d058662397d65a021b7ecef18334ece35412a3285a6f173267c888845fab44076d8a00446b88ec33c8e45fb9c23d6c94cb0b7da3f3b21a2d83bbc6d476e9 SHA512 bf4d81ce7efc3d0ba56064365488cf0bf99ae661b58d5ee305cde06cfbdd94c0c2449919777bd369ee2c93db2407198e410e2899fb944e6261f29c0847ead852
diff --git a/app-arch/lrzip-next/lrzip-next-0.13.1.ebuild b/app-arch/lrzip-next/lrzip-next-0.13.1.ebuild
deleted file mode 100644
index de6ccb5d0dce..000000000000
--- a/app-arch/lrzip-next/lrzip-next-0.13.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools
-
-DESCRIPTION="Fork of Con Kolivas' lrzip program for compressing large files"
-HOMEPAGE="https://github.com/pete4abw/lrzip-next"
-
-GH_BASE="https://github.com/pete4abw/lrzip-next"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="${GH_BASE}.git"
-else
-	SRC_URI="${GH_BASE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="asm +largefile static-libs year2038"
-
-RDEPEND="app-arch/bzip2
-	app-arch/bzip3
-	app-arch/lz4
-	app-arch/zstd
-	dev-libs/libgcrypt
-	dev-libs/libgpg-error
-	dev-libs/lzo
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-BDEPEND="amd64? ( dev-lang/nasm )"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}/${PN}-0.13.1-fix-lzma_asm_makefile-echo.patch"
-	eapply "${FILESDIR}/${PN}-0.13.1-use-acx_pthread-configure_ac.patch"
-
-	# configure.ac uses a small helper script, ./util/gitdesc.sh, to
-	# see if it's a tarball or git repo copy.  If tarball, it extracts
-	# the version information from a local VERSION file and puts it into
-	# configure.ac at the top for major/minor/micro.  To avoid the need
-	# for a BDEPEND on dev-vcs/git, we can do this directly.
-	local major=$(awk '/Major: / {printf "%s",$2; exit}' VERSION)
-	local minor=$(awk '/Minor: / {printf "%s",$2; exit}' VERSION)
-	local micro=$(awk '/Micro: / {printf "%s",$2; exit}' VERSION)
-	sed -i -e "s:\[m4_esyscmd_s(\[./util/gitdesc.sh major\])\]:${major}:" configure.ac
-	sed -i -e "s:\[m4_esyscmd_s(\[./util/gitdesc.sh minor\])\]:${minor}:" configure.ac
-	sed -i -e "s:\[m4_esyscmd_s(\[./util/gitdesc.sh micro\])\]:${micro}:" configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable amd64 asm)
-		$(use_enable largefile) \
-		$(use_enable static-libs static)
-	)
-
-	# This configure switch only appears on glibc-based userlands.
-	# It enables 64-bit time_t to support timestamps greater than
-	# the year 2038 (D_TIME_BITS=64).
-	if use elibc_glibc; then
-		myconf+=( $(use_enable year2038) )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/app-arch/lrzip-next/lrzip-next-0.13.2.ebuild b/app-arch/lrzip-next/lrzip-next-0.13.2.ebuild
new file mode 100644
index 000000000000..eca2f00015ea
--- /dev/null
+++ b/app-arch/lrzip-next/lrzip-next-0.13.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools
+
+DESCRIPTION="Fork of Con Kolivas' lrzip program for compressing large files"
+HOMEPAGE="https://github.com/pete4abw/lrzip-next"
+
+GH_BASE="https://github.com/pete4abw/lrzip-next"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="${GH_BASE}.git"
+else
+	SRC_URI="${GH_BASE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="asm +largefile static-libs year2038"
+
+RDEPEND="app-arch/bzip2
+	app-arch/bzip3
+	app-arch/lz4
+	app-arch/zstd
+	dev-libs/libgcrypt
+	dev-libs/libgpg-error
+	dev-libs/lzo
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+BDEPEND="amd64? ( dev-lang/nasm )"
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}/${PN}-0.13.1-fix-lzma_asm_makefile-echo.patch"
+	eapply "${FILESDIR}/${PN}-0.13.1-use-acx_pthread-configure_ac.patch"
+
+	# configure.ac uses a small helper script, ./util/gitdesc.sh, to
+	# see if it's a tarball or git repo copy.  If tarball, it extracts
+	# the version information from a local VERSION file and puts it into
+	# configure.ac at the top for major/minor/micro.  To avoid the need
+	# for a BDEPEND on dev-vcs/git, we can do this directly.
+	local major=$(awk '/Major: / {printf "%s",$2; exit}' VERSION)
+	local minor=$(awk '/Minor: / {printf "%s",$2; exit}' VERSION)
+	local micro=$(awk '/Micro: / {printf "%s",$2; exit}' VERSION)
+	sed -i -e "s:\[m4_esyscmd_s(\[./util/gitdesc.sh major\])\]:${major}:" configure.ac
+	sed -i -e "s:\[m4_esyscmd_s(\[./util/gitdesc.sh minor\])\]:${minor}:" configure.ac
+	sed -i -e "s:\[m4_esyscmd_s(\[./util/gitdesc.sh micro\])\]:${micro}:" configure.ac
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable amd64 asm)
+		$(use_enable largefile) \
+		$(use_enable static-libs static)
+	)
+
+	# This configure switch only appears on glibc-based userlands.
+	# It enables 64-bit time_t to support timestamps greater than
+	# the year 2038 (D_TIME_BITS=64).
+	if use elibc_glibc; then
+		myconf+=( $(use_enable year2038) )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/app-arch/lrzip-next/lrzip-next-9999.ebuild b/app-arch/lrzip-next/lrzip-next-9999.ebuild
index 0de353974a2c..eca2f00015ea 100644
--- a/app-arch/lrzip-next/lrzip-next-9999.ebuild
+++ b/app-arch/lrzip-next/lrzip-next-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"
@@ -60,7 +60,7 @@ src_configure() {
 		$(use_enable static-libs static)
 	)
 
-	# This configure switch only appears for glibc-based userlands.
+	# This configure switch only appears on glibc-based userlands.
 	# It enables 64-bit time_t to support timestamps greater than
 	# the year 2038 (D_TIME_BITS=64).
 	if use elibc_glibc; then
diff --git a/app-arch/lunzip/Manifest b/app-arch/lunzip/Manifest
index a0288d57857a..daa81277fe95 100644
--- a/app-arch/lunzip/Manifest
+++ b/app-arch/lunzip/Manifest
@@ -1,2 +1,4 @@
 DIST lunzip-1.14.tar.gz 69284 BLAKE2B 8ef63a5cfd0cf839889785845ec84b23451cb69b1e09c84526e000b82b73aaaa01b99407e87bde416ca2ab638d9f9688fcb37f77fd53e2a8e0875646a54d304c SHA512 2aa530c4ef7ebcfa345c8ac8701712e7f973ee4a92d34c33a03dd02a31d76507c919da373b64bc6b49b7868af8e4444d4b12bd71b8760e9b333c2a013ad95da1
 DIST lunzip-1.14.tar.gz.sig 72 BLAKE2B ab2ba6c265f197c322884898ae8ff5c8679ab8a1d2f71a2dfedcce9011e16fb723fd592b0edc3f48d540ad8d2578b799f28f9d609a7e26379e39e0cb7f908cc3 SHA512 38806848f904fb3700c908166a1ad2d601409fa13f1b0dc69372766b41a6f37ae0c5792964b8aae494320d47e603dc79f36b3fa7361ccf84b89835c14a6b7b11
+DIST lunzip-1.15.tar.gz 59612 BLAKE2B cd39d5cab04244c1c7303393f8ca56f9530d5283123a2745de18f675a1c1971f57295df1f83952cf9677c1752ff00b65d01741a09ddac65cebfea719e16e33e9 SHA512 737eec2a62f068aa1ef6ec316a04b7caa90ce99d7a7292d2358568bad455342d38dd82aae468123bd121240b12c6db0bd499e1f2f9e483d5d7540a40e5f00603
+DIST lunzip-1.15.tar.gz.sig 72 BLAKE2B e20a81167ca436c1b666f22ae608abd02b9853ef80025f98ce283c7f120277b5a202d0769b05aa763929ecf4bde662f26a6ec313ebd46bf4bf87c1e28fcc21c2 SHA512 9287496313576f5f09271bbee6ba3657e9e3ceffb118758807d4e8fbe011eba550d46c04c2193c30177f5b191850d5a53f7bea02776a3f339eee827f6744104a
diff --git a/app-arch/lunzip/lunzip-1.15.ebuild b/app-arch/lunzip/lunzip-1.15.ebuild
new file mode 100644
index 000000000000..a1bbbf0f32bc
--- /dev/null
+++ b/app-arch/lunzip/lunzip-1.15.ebuild
@@ -0,0 +1,31 @@
+# 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 toolchain-funcs verify-sig
+
+DESCRIPTION="Decompressor for the lzip format, written in C"
+HOMEPAGE="https://www.nongnu.org/lzip/lunzip.html"
+SRC_URI="https://download.savannah.gnu.org/releases/lzip/lunzip/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/${P/_/-}.tar.gz.sig )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
+
+src_configure() {
+	# not autotools-based
+	local myconf=(
+		--prefix="${EPREFIX}"/usr
+		CC="$(tc-getCC)"
+		CPPFLAGS="${CPPFLAGS}"
+		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+	)
+
+	./configure "${myconf[@]}" || die
+}
diff --git a/app-arch/lziprecover/Manifest b/app-arch/lziprecover/Manifest
index be787d9ba915..e78d0f2dcfbd 100644
--- a/app-arch/lziprecover/Manifest
+++ b/app-arch/lziprecover/Manifest
@@ -1,2 +1,4 @@
 DIST lziprecover-1.24.tar.gz 161471 BLAKE2B b96bba4aff4423c8681ae5c86efa66af61ee88b50050e262959b51c22927c594a8f5ca8f3d59a46ddae842a5078fe2ed955e279a412708247f7dd3140e6763b7 SHA512 b1f126fa24b1627c6e98ba8fa4fc30dac248f81f92be12f1063db6e40fd9c6f9f8b5a2306bde72f30623a64de5befec28b34073309f393317b56a38527947466
 DIST lziprecover-1.24.tar.gz.sig 72 BLAKE2B 8f4aa191b19e92c225138331f278bb907cf823917ee528ec3f9da9fa75abcc94eea4d676979d7b914fe099b7bed49c1feccf6e9fb069a873ad3b723a4e65af85 SHA512 d708a0573d9a46b92d59c08a988068735e0f76316896489f2ce0585d09f0178718bdd5fd59dc869c7314ba8fb64c4c4aa73eb8e226db1564cbc964422bde13e4
+DIST lziprecover-1.25.tar.gz 198358 BLAKE2B 191485dbdcc1f01e1ff3eb49587181e11493a78ffa547875e10666a9d7b015751f8f89283705c73242a8389b215bd57e752606cf011d30c834f6375e0a46c45e SHA512 ed75642fcd7b50b5d58f31b1525a433fb462f2c2b2e9a7988ff8dea6f1c2195a905d0e00946b186c1459e1bb06c1b1294f4be2f3796bcf4cb52da7a4aaadf0e5
+DIST lziprecover-1.25.tar.gz.sig 72 BLAKE2B be44ac2747c14d8c8df6ca057a851b2ef0e79b8b2bf3521bd6b2c072b9426a9df4bd31e7e969be850a52ffa40fc0b628d8388ac787d028c5c3e421e2886f141b SHA512 81eb6d623349575faafe79f6d17bf749758c74ecf5c7409505eb197d6f2a73c6af7306ac56d572c0b3914e6addbb29c74ca848de4cd5766e6e1a0a358155d490
diff --git a/app-arch/lziprecover/lziprecover-1.25.ebuild b/app-arch/lziprecover/lziprecover-1.25.ebuild
new file mode 100644
index 000000000000..1e811b72ec41
--- /dev/null
+++ b/app-arch/lziprecover/lziprecover-1.25.ebuild
@@ -0,0 +1,34 @@
+# 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 toolchain-funcs verify-sig
+
+DESCRIPTION="Lziprecover is a data recovery tool and decompressor for lzip compressed files"
+HOMEPAGE="https://www.nongnu.org/lzip/lziprecover.html"
+SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P/_/-}.tar.gz"
+SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/${P/_/-}.tar.gz.sig )"
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( app-arch/lzip )
+	verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )
+"
+
+src_configure() {
+	# not autotools-based
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		CXX="$(tc-getCXX)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" || die
+}
diff --git a/app-arch/lzlib/Manifest b/app-arch/lzlib/Manifest
index de0cfa78feec..2f97c07bd54e 100644
--- a/app-arch/lzlib/Manifest
+++ b/app-arch/lzlib/Manifest
@@ -1,2 +1,4 @@
 DIST lzlib-1.14.tar.gz 131624 BLAKE2B d975fece48d92be354202581a5be5c709b8acdbb41b3782ec0a79939278ada42aa6765bcef7a1cb70bfb7808b8a88d5e6ed48924f13fcc291a4a0d2057f0f4bf SHA512 1582b99149af18ea119f015a9dbf224aa2ebc78240432415b2da20bd5a4e4dc3fdea2489789bc581bdccdba6f4eab13c69c5801e8a43ab9a829c2eb9b801797f
 DIST lzlib-1.14.tar.gz.sig 72 BLAKE2B 104d914d4b85bab0457017ab5663962ac1573dac421e11a94eaa9e77f6338501c96444d45e1e4101e9ea48409c2b30037a7b07c2a188cff6fcf47c6d067d1398 SHA512 852ebd4a460021e642a673a8c6d88b25a2b45dff4a45f7ccfc6bbb531be3c967b8e01308aa35088c843002561c1c4b813a47ff4b0fd4417ebf12f188af8d36be
+DIST lzlib-1.15.tar.gz 115185 BLAKE2B cf952129ea7e4beb08e9c82d2035bf0bb6f25294734d0b882244df210132c4b425e6d6d6e999949cc66a686acb9c59a5bdae25e45cc004e9f2e2e36fd37ce772 SHA512 12dca273b3aa45507495bcca9d260cd0c7fcad0deb32e9b146e24d1cb3d65261e67e67e36da8012689cb0f28e6034e0a4f5129cee7d9c97d4e2c98c270e8bd49
+DIST lzlib-1.15.tar.gz.sig 72 BLAKE2B b5539628be7953b34526ad8806d10f7f9c4754e162b2e9fde10425d832389d1f1770c2966d6c6f99759142c106adbeb0bcb989887993cbe376c0d12e3a15d06b SHA512 fd29d4f8e4996c3df65194a4fac2866e1191a7574d84950a4f68500355ae22276cc8ad1555be9142e32d79b767cfd1eaf4f331b411e01867349559d6834ebd14
diff --git a/app-arch/lzlib/lzlib-1.15.ebuild b/app-arch/lzlib/lzlib-1.15.ebuild
new file mode 100644
index 000000000000..00a6adbf8964
--- /dev/null
+++ b/app-arch/lzlib/lzlib-1.15.ebuild
@@ -0,0 +1,41 @@
+# 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 toolchain-funcs verify-sig
+
+DESCRIPTION="Library for lzip compression"
+HOMEPAGE="https://www.nongnu.org/lzip/lzlib.html"
+SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/${P/_/-}.tar.gz.sig )"
+
+LICENSE="libstdc++" # fancy form of GPL-2+ with library exception
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
+
+src_configure() {
+	local myconf=(
+		--enable-shared
+		--disable-static
+		--disable-ldconfig
+		--prefix="${EPREFIX}"/usr
+		--libdir='$(prefix)'/$(get_libdir)
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		CPPFLAGS="${CPPFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+	)
+
+	# not autotools-based
+	./configure "${myconf[@]}" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-man
+	einstalldocs
+}
diff --git a/app-arch/ncompress/ncompress-5.0-r2.ebuild b/app-arch/ncompress/ncompress-5.0-r2.ebuild
index 3df3f1e865ab..d257d90209ca 100644
--- a/app-arch/ncompress/ncompress-5.0-r2.ebuild
+++ b/app-arch/ncompress/ncompress-5.0-r2.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="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.0-c23.patch
diff --git a/app-arch/pdlzip/Manifest b/app-arch/pdlzip/Manifest
index a37f3abf8412..0fafc62c60e7 100644
--- a/app-arch/pdlzip/Manifest
+++ b/app-arch/pdlzip/Manifest
@@ -1,2 +1,4 @@
 DIST pdlzip-1.13.tar.gz 74681 BLAKE2B 459b1be6c1526c9fe10f9208f7e9ecb0316304ff7d484991fd4a6c786efcef7ff46ce1e5f11c2df5aab403ebe047baf2c3f037b77b67f0601f176e718c61849e SHA512 3fdcfb3be40df564163fd429cefddaccc0b0dc487e8c9c0fb6ca79a26a875f6cfb3cf051b3a155467b333a54b7512ce1604249ae5b198414da5757b723110dd5
 DIST pdlzip-1.13.tar.gz.sig 72 BLAKE2B 666f80542b88c41af8a5e4b9df459ae2c804fd0500997092389efbc7c2f8ae615805a9fe915066eef77b3052fc75a21ec077500767679a9c8460c25adc4f688b SHA512 8b70f96c38db86f6d2dded432bad50875d29abeacc587db1ab6cdacb9c684130a46ca07abaf030e95cf09ac9bdd9ecc14a2360979e928194a9345525dcf1a191
+DIST pdlzip-1.14.tar.gz 65387 BLAKE2B 4794668f2fe9200a829ffbb0e5c5fb5dc2a060c038aab35958c97bb5d35537e6d0641acef16130fcc205df3e5896dd4570bb753a31484daa56eced960a120199 SHA512 43dcb8db6aae9ed3b5a18bb1d5858ddf0f83ef2c70495fd89e0e3c716491b2271baf2ad842918125c745f0a0992d109344c9c3479323534538ab575a1c776014
+DIST pdlzip-1.14.tar.gz.sig 72 BLAKE2B f089d59f4efd33cd2c9f0b578ae6b25d5f1b9706d90eca2c47b1abf6fcf3da2b6767f03d4490803260d562aef1f6ded40fa582ee28e71e64928e1cbbdc4dcd1c SHA512 58e83ac8a0d9882cbfbb2d281569c6bed2d3f206efbe708e0dd261f0c73b2b9d1bafbd837f361cd89da631a9cfe4b1c80597eac23f5b3008d3e497a0289fe4de
diff --git a/app-arch/pdlzip/pdlzip-1.14.ebuild b/app-arch/pdlzip/pdlzip-1.14.ebuild
new file mode 100644
index 000000000000..e4e938b5aede
--- /dev/null
+++ b/app-arch/pdlzip/pdlzip-1.14.ebuild
@@ -0,0 +1,31 @@
+# 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 toolchain-funcs verify-sig
+
+DESCRIPTION="Public-domain version of lzip compressor"
+HOMEPAGE="https://www.nongnu.org/lzip/pdlzip.html"
+SRC_URI="https://download.savannah.gnu.org/releases/lzip/pdlzip/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/${P/_/-}.tar.gz.sig )"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
+
+src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}"/usr
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		CPPFLAGS="${CPPFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+	)
+
+	# not autotools-based
+	./configure "${myconf[@]}" || die
+}
diff --git a/app-arch/plzip/Manifest b/app-arch/plzip/Manifest
index 946d5852dbf0..413dcdd528f0 100644
--- a/app-arch/plzip/Manifest
+++ b/app-arch/plzip/Manifest
@@ -1,2 +1,4 @@
 DIST plzip-1.11.tar.gz 96572 BLAKE2B 8de36791390c7b71cd42866a8be4503d601a94ca89a23355be48dff75bf8a6b34b260eea4b1e5ef68e63d20b8dfd6f5acd1e60a9b51290425f22c7a9905469ae SHA512 3a0f0443e68a6b776d85b69ed24d21e03d7bad1b788d6e8f741cc0ebb2537aebde2d68aa6765bcb4d61df6521779af27d176f5ef348014fa3088aa219d5ec691
 DIST plzip-1.11.tar.gz.sig 72 BLAKE2B b7543e93c7736135c95b179472c85226af4b489daa686ede710ac03dc1fb9c3cc31bfcff5452cdf855eb49d00f6548214e94143ed19f8d8420bd05bcb72ae1f9 SHA512 458edf3fb78716cb39164761b2f90cd32011ec2634370791918adc4845b377563f76a32fda9b99e478fb52a0b05c4dc6d4d8df5098da0c95670f205fa4a56511
+DIST plzip-1.12.tar.gz 89256 BLAKE2B 8efcb6eb1b7d89d747f281b57c08638837073f7f377062ce3604f54482e7099f8a51af25ccaf50eb963964bca47b021fe789d5513f77bbf56f01285a45b6fb52 SHA512 b6fa75e30aba33f98b91683f4dbd2ec274b2c2b881bc31fc1841614d69aa1e5ca70dacf664efeefb3378deecc715a93000a27dc29e0103d7ce205168e81c27ae
+DIST plzip-1.12.tar.gz.sig 72 BLAKE2B bb78336a380ea48e7271a46df4090d6a767724731e83d36568896ad5d5694d30468bd0ea2b21b41661cb663e1c80b387544948ffcd107511182ae1e137fe5c8f SHA512 a7e28d768d7dc5d002c992509caaecbc4d52aa36ab961dc8bf3b7cfa9c0a9bfcc9cfb5de67227f5b634e6f38ccf3e6832add82ef2ee51db50982097792045728
diff --git a/app-arch/plzip/plzip-1.12.ebuild b/app-arch/plzip/plzip-1.12.ebuild
new file mode 100644
index 000000000000..db098e8bd648
--- /dev/null
+++ b/app-arch/plzip/plzip-1.12.ebuild
@@ -0,0 +1,33 @@
+# 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 toolchain-funcs verify-sig
+
+DESCRIPTION="Parallel lzip compressor"
+HOMEPAGE="https://www.nongnu.org/lzip/plzip.html"
+SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz.sig )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="app-arch/lzlib:0="
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
+
+src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}"/usr
+		CXX="$(tc-getCXX)"
+		CPPFLAGS="${CPPFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+	)
+
+	# not autotools-based
+	./configure "${myconf[@]}" || die
+}
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 5b9c752e5d7f..ede81ebcaba3 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,2 +1,3 @@
 DIST unrar-7.0.9.tar.gz 258287 BLAKE2B 4933d62c8b7ea227b5eee8ce078a08cbe7534f35641ee0ce33bdd246f1045c65f773894d5868738b2174ea2bb2858745b5bd31dc5f958ef70188bcb805165300 SHA512 4dff760bd69275dcd9bacac7a8fa9a6e68e2d047ea3775abc16a80d9a6e277b686153faafb1b711582d86eabfdf3254c601d9f585b28104dbd85ece4868876ed
 DIST unrar-7.1.2.tar.gz 264081 BLAKE2B e5cd9c577ae4c8b8025970e597b7b270fe74beb47974ce038ce334c6cd49eb3bbbd1126eecf7093703f998f5a55a3be3ea911d950dd25040ef0f98272d5d84dd SHA512 3492334ef95916728af573f8f5bcb8d5a8c4a014b5daa0ffeaa67c9c56a5603a2389b030c6e0126064b1f281db5143907fa83f8c4249d23abc3273a5387d90d6
+DIST unrar-7.1.3.tar.gz 266820 BLAKE2B c18f9ef0208c893a6c4ff1ac0df7abcd54216f2f6341a08083af695729cba6773ee1de74af8b0fc1fce94e90ce1cbbf14fbe34ad0c8f1a3dcd6a3598b978c706 SHA512 210a4c65e5c3f3a3f9561a8fab805b6a6a182ac6274f8671d22020076873952b92cb8cc2523943df20a97ed01415b38e2bb59082f03dd5f7da0d6e85dc9193d4
diff --git a/app-arch/unrar/unrar-7.1.2.ebuild b/app-arch/unrar/unrar-7.1.2.ebuild
index 126f730b8cc9..02b05da6ccb4 100644
--- a/app-arch/unrar/unrar-7.1.2.ebuild
+++ b/app-arch/unrar/unrar-7.1.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
@@ -14,7 +14,7 @@ S="${WORKDIR}/unrar"
 
 LICENSE="unRAR"
 SLOT="0/7" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 PATCHES=( "${FILESDIR}/${PN}-6.2.6-honor-flags.patch" )
 
diff --git a/app-arch/unrar/unrar-7.1.3.ebuild b/app-arch/unrar/unrar-7.1.3.ebuild
new file mode 100644
index 000000000000..355f68e21b19
--- /dev/null
+++ b/app-arch/unrar/unrar-7.1.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/unrar"
+
+LICENSE="unRAR"
+SLOT="0/7" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+PATCHES=( "${FILESDIR}/${PN}-6.2.6-honor-flags.patch" )
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin} || die
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	# unrar doesn't officially install headers, but unofficially, software
+	# depends on it anyway. There is no standard for where to install them,
+	# but the most common location (shared by nearly all vendors) is "unrar".
+	# FreeBSD alone uses "libunrar". Gentoo formerly used "libunrar6" and
+	# had a compat symlink for FreeBSD, then passed the compat location in
+	# ./configure scripts e.g. for sys-fs/rar2fs. Software in the wild
+	# seems to expect either "unrar" or "libunrar".
+	# See: https://bugs.gentoo.org/916036
+	#
+	# We now use the "standard" (hah) location, and keep the compat symlink but
+	# change the destination. The version-suffixed location lacks utility, but
+	# we would keep it if we could, just in case -- unfortunately portage is
+	# buggy: https://bugs.gentoo.org/834600
+	#
+	# Hopefully, no one has ever actually used it and therefore this does not
+	# matter. The odds are on our side, since it periodically changed location
+	# arbitrarily.
+	insinto /usr/include/unrar
+	doins *.hpp
+	dosym unrar /usr/include/libunrar
+
+	find "${ED}" -type f -name "*.a" -delete || die
+}
diff --git a/app-backup/backintime/backintime-1.5.1.ebuild b/app-backup/backintime/backintime-1.5.1.ebuild
index 49677dd73c3d..f19c53a8e11c 100644
--- a/app-backup/backintime/backintime-1.5.1.ebuild
+++ b/app-backup/backintime/backintime-1.5.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
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/bit-team/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 79ac896cb237..be173fb6f717 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,3 +1 @@
-DIST bacula-13.0.3.tar.gz 6235649 BLAKE2B c1053e784f995aa45f2810a8b1370211a6e42f9512c11e0290f059d0e39489c24d4a7951fa055a00ecd2c4acb44581cc220271952c6d477d15c86e0a7e8680f7 SHA512 59ec616535959bde26b5b03a60355f3f8d80ae7a719a079d354f41c0f103b0e467177b6f813ef3eb4d30866f73c393d766e8337e20bb97f19ffd7eba5e5c59c5
-DIST bacula-13.0.4.tar.gz 6227040 BLAKE2B e54a754280178f74f97fdbb3c91a596b632d80739fedd5f847d183f0852ea9e82bba55ad9a745ee1ceb945bd527d33b117bc3c866783bd3073166bd20607a72a SHA512 5d33714d5575c351e28676cbd165fe7648ce15a1bc2a03f6d5635528083f3ec3bd6c7137a987690dcc8b232105e5768be91ba405a033ad60c4b82f3c88d73812
 DIST bacula-15.0.2.tar.gz 6524812 BLAKE2B 1dd0722ce2bb6363936ed9cc9df1b6d842945f17277c77f40884bafc4b0a254c5fdd2c21bd200c6ca8b77c8eb718a319552e50135c9925d2b4ad81a64ab819d2 SHA512 71bd206a2bb0cf3ca0f2cb6547b63946bc2a8a5f70c5506b9a589e5ed9871bb98b56205da7d12e54a41c9ab3539fe1114bc94d926f0f831ee9e15bba36f167f3
diff --git a/app-backup/bacula/bacula-13.0.3-r2.ebuild b/app-backup/bacula/bacula-13.0.3-r2.ebuild
deleted file mode 100644
index 952e13c53f82..000000000000
--- a/app-backup/bacula/bacula-13.0.3-r2.ebuild
+++ /dev/null
@@ -1,449 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop libtool qmake-utils systemd
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bacula.org/"
-SRC_URI="https://downloads.sourceforge.net/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline selinux +sqlite ssl static tcpd vim-syntax X"
-
-DEPEND="
-	!bacula-clientonly? (
-		!bacula-nodir? ( virtual/mta )
-		postgres? ( dev-db/postgresql:=[threads(+)] )
-		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
-		sqlite? ( dev-db/sqlite:3 )
-	)
-	dev-libs/gmp:0
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtsvg:5
-		x11-libs/qwt:6
-	)
-	logwatch? ( sys-apps/logwatch )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		dev-libs/lzo[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		sys-libs/zlib[static-libs]
-		acl? ( virtual/acl[static-libs(+)] )
-		ssl? (
-			dev-libs/openssl:0=[static-libs]
-		)
-	)
-	!static? (
-		dev-libs/lzo
-		sys-libs/ncurses:=
-		sys-libs/zlib
-		acl? ( virtual/acl )
-		ssl? (
-			dev-libs/openssl:0=
-		)
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	dev-util/patchelf
-"
-RDEPEND="${DEPEND}
-	acct-user/bacula
-	acct-group/bacula
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			app-arch/mt-st
-			sys-block/mtx
-		)
-	)
-	selinux? ( sec-policy/selinux-bacula )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-REQUIRED_USE="
-	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-	static? ( bacula-clientonly )
-"
-
-# suppress warning wrt 'implicit function declaration' in config logs
-# bug 900663
-QA_CONFIG_IMPL_DECL_SKIP=(
-	makedev		# designed to check availability in
-				# used header file
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	if use bacula-clientonly && use static && use qt5; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# bug 466688 drop deprecated categories from Desktop file
-	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
-	# bug 466690 Use CXXFLAGS instead of CFLAGS
-	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-	# bug #310087
-	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-	# bug #311161
-	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
-	# bat needs to respect LDFLAGS and CFLAGS
-	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-
-	# tray-monitor needs to respect LDFLAGS and CFLAGS
-	eapply -p0 "${FILESDIR}"/tray-monitor-pro.patch
-
-	# bug #328701
-	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-	eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch
-
-	# fix soname in libbaccat.so, see bugs #602952, #790140 and #845126
-	eapply "${FILESDIR}/bacula-fix-sonames-new.patch"
-
-	# correct library search path for slibtool usage (bug #914389)
-	eapply -p0 "${FILESDIR}/fix_slibtool.patch"
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-	sed -i -e "s/+= qt$/+= qt nostrip/" \
-			src/qt-console/tray-monitor/tray-monitor.pro.in || die
-
-	eapply_user
-
-	# Fix systemd unit files:
-	# bug 497748
-	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
-	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
-	# bug 504370
-	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
-	# bug 584442 and 504368
-	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
-
-	# build 'bat' for Qt5
-	export QMAKE="$(qt5_get_bindir)"/qmake
-
-	# adapt to >=Qt-5.9 (see bug #644566)
-	# qmake needs an existing target file to generate install instructions
-	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
-		src/qt-console/bat.pro.in || die
-	mkdir src/qt-console/.libs || die
-	touch src/qt-console/.libs/bat || die
-	chmod 755 src/qt-console/.libs/bat || die
-
-	# same for tray-monitor (bug #915605)
-	sed -i -e 's#bins.files = bac#bins.files = .libs/bac#g' \
-		src/qt-console/tray-monitor/tray-monitor.pro.in || die
-	mkdir src/qt-console/tray-monitor/.libs || die
-	touch src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
-	chmod 755 src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
-
-	eapply -p0 "${FILESDIR}/fix_tray_monitor.patch" || die
-
-	# Don't let program install man pages directly
-	sed -i -e 's/ manpages//' Makefile.in || die
-
-	# correct installation for plugins to mode 0755 (bug #725946)
-	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile ||die
-	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||die
-
-	# fix bundled libtool (bug 466696)
-	# But first move directory with M4 macros out of the way.
-	# It is only needed by autoconf and gives errors during elibtoolize.
-	mv autoconf/libtool autoconf/libtool1 || die
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable !static libtool) \
-			$(use_enable static static-cons) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		# bug #311099
-		# database support needed by dir-only *and* sd-only
-		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf}
-			--with-${mydbtype}"
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt5 bat)"
-	fi
-
-	myconf="${myconf} \
-		$(use_with X x) \
-		$(use_enable batch-insert) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with ssl openssl) \
-		$(use_enable ipv6) \
-		$(use_enable acl) \
-		$(use_with tcpd tcp-wrappers)"
-
-	econf \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--with-archivedir=/var/lib/bacula/tmp \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/lib/bacula \
-		--with-logdir=/var/lib/bacula \
-		--with-scriptdir=/usr/libexec/bacula \
-		--with-systemd=$(systemd_get_systemunitdir) \
-		--with-dir-user=bacula \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--enable-smartalloc \
-		--disable-afs \
-		--without-s3 \
-		--host=${CHOST} \
-		${myconf}
-}
-
-src_compile() {
-	# Make build log verbose (bug #447806)
-	emake NO_ECHO=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doicon scripts/bacula.png
-	keepdir /var/lib/bacula/tmp
-
-	# remove not needed .la files #840957
-	find "${ED}" -name '*.la' -delete || die
-
-	# install bat icon and desktop file when enabled
-	# (for some reason ./configure doesn't pick this up)
-	if use qt5 && ! use static ; then
-		doicon src/qt-console/images/bat_icon.png
-		domenu scripts/bat.desktop
-	fi
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-	# rename statically linked apps
-	if use bacula-clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		insinto /usr/libexec/bacula/updatedb
-		insopts -m0754
-		doins "${S}"/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /usr/share/logwatch/scripts/services
-			dodir /usr/share/logwatch/scripts/shared
-			dodir /etc/logwatch/conf/logfiles
-			dodir /etc/logwatch/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	# Install all man pages
-	doman "${S}"/manpages/*.[18]
-
-	if ! use qt5; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-		rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-	fi
-
-	if use bacula-clientonly || use bacula-nodir ; then
-		rm -vf "${D}"/usr/libexec/bacula/create_*_database
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-	fi
-	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/libexec/bacula/disk-changer
-		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-	fi
-
-	# documentation
-	dodoc ChangeLog ReleaseNotes SUPPORT
-
-	# install examples (bug #457504)
-	if use examples; then
-		docinto examples/
-		dodoc -r examples/*
-	fi
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bacula-fd"
-	if ! use bacula-clientonly; then
-		if ! use bacula-nodir; then
-			myscripts="${myscripts} bacula-dir"
-		fi
-		if ! use bacula-nosd; then
-			myscripts="${myscripts} bacula-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependency for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	einfo
-	einfo "A group 'bacula' has been created. Any users you add to this"
-	einfo "group have access to files created by the daemons."
-	einfo
-	einfo "A user 'bacula' has been created.  Please see the bacula manual"
-	einfo "for information about running bacula as a non-root user."
-	einfo
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn "ATTENTION!"
-		ewarn "The format of the database may have changed."
-		ewarn "If you just upgraded from a version below 9.0.0 you must run"
-		ewarn "'update_bacula_tables' now."
-		ewarn "Make sure to have a backup of your catalog before."
-		ewarn
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bacula does not officially support SQLite database anymore."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt5'."
-	einfo
-	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
-	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
-
-	einfo
-	einfo "If you adapt the port numbers for baculas components in the config files"
-	einfo "make sure to adapt the file names for the pidfile accordingly"
-	einfo "(see init.d scripts)."
-}
diff --git a/app-backup/bacula/bacula-13.0.4.ebuild b/app-backup/bacula/bacula-13.0.4.ebuild
deleted file mode 100644
index 6a4d2259bb25..000000000000
--- a/app-backup/bacula/bacula-13.0.4.ebuild
+++ /dev/null
@@ -1,449 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop libtool qmake-utils systemd
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bacula.org/"
-SRC_URI="https://downloads.sourceforge.net/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline selinux +sqlite ssl static tcpd vim-syntax X"
-
-DEPEND="
-	!bacula-clientonly? (
-		!bacula-nodir? ( virtual/mta )
-		postgres? ( dev-db/postgresql:=[threads(+)] )
-		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
-		sqlite? ( dev-db/sqlite:3 )
-	)
-	dev-libs/gmp:0
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtsvg:5
-		x11-libs/qwt:6
-	)
-	logwatch? ( sys-apps/logwatch )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		dev-libs/lzo[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		sys-libs/zlib[static-libs]
-		acl? ( virtual/acl[static-libs(+)] )
-		ssl? (
-			dev-libs/openssl:0=[static-libs]
-		)
-	)
-	!static? (
-		dev-libs/lzo
-		sys-libs/ncurses:=
-		sys-libs/zlib
-		acl? ( virtual/acl )
-		ssl? (
-			dev-libs/openssl:0=
-		)
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	dev-util/patchelf
-"
-RDEPEND="${DEPEND}
-	acct-user/bacula
-	acct-group/bacula
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			app-arch/mt-st
-			sys-block/mtx
-		)
-	)
-	selinux? ( sec-policy/selinux-bacula )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-REQUIRED_USE="
-	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-	static? ( bacula-clientonly )
-"
-
-# suppress warning wrt 'implicit function declaration' in config logs
-# bug 900663
-QA_CONFIG_IMPL_DECL_SKIP=(
-	makedev		# designed to check availability in
-				# used header file
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	if use bacula-clientonly && use static && use qt5; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# bug 466688 drop deprecated categories from Desktop file
-	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
-	# bug 466690 Use CXXFLAGS instead of CFLAGS
-	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-	# bug #310087
-	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-	# bug #311161
-	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
-	# bat needs to respect LDFLAGS and CFLAGS
-	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-
-	# tray-monitor needs to respect LDFLAGS and CFLAGS
-	eapply -p0 "${FILESDIR}"/tray-monitor-pro.patch
-
-	# bug #328701
-	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-	eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch
-
-	# fix soname in libbaccat.so, see bugs #602952, #790140 and #845126
-	eapply "${FILESDIR}/bacula-fix-sonames-new.patch"
-
-	# correct library search path for slibtool usage (bug #914389)
-	eapply -p0 "${FILESDIR}/fix_slibtool.patch"
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-	sed -i -e "s/+= qt$/+= qt nostrip/" \
-			src/qt-console/tray-monitor/tray-monitor.pro.in || die
-
-	eapply_user
-
-	# Fix systemd unit files:
-	# bug 497748
-	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
-	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
-	# bug 504370
-	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
-	# bug 584442 and 504368
-	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
-
-	# build 'bat' for Qt5
-	export QMAKE="$(qt5_get_bindir)"/qmake
-
-	# adapt to >=Qt-5.9 (see bug #644566)
-	# qmake needs an existing target file to generate install instructions
-	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
-		src/qt-console/bat.pro.in || die
-	mkdir src/qt-console/.libs || die
-	touch src/qt-console/.libs/bat || die
-	chmod 755 src/qt-console/.libs/bat || die
-
-	# same for tray-monitor (bug #915605)
-	sed -i -e 's#bins.files = bac#bins.files = .libs/bac#g' \
-		src/qt-console/tray-monitor/tray-monitor.pro.in || die
-	mkdir src/qt-console/tray-monitor/.libs || die
-	touch src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
-	chmod 755 src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
-
-	eapply -p0 "${FILESDIR}/fix_tray_monitor.patch" || die
-
-	# Don't let program install man pages directly
-	sed -i -e 's/ manpages//' Makefile.in || die
-
-	# correct installation for plugins to mode 0755 (bug #725946)
-	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile ||die
-	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||die
-
-	# fix bundled libtool (bug 466696)
-	# But first move directory with M4 macros out of the way.
-	# It is only needed by autoconf and gives errors during elibtoolize.
-	mv autoconf/libtool autoconf/libtool1 || die
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable !static libtool) \
-			$(use_enable static static-cons) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		# bug #311099
-		# database support needed by dir-only *and* sd-only
-		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf}
-			--with-${mydbtype}"
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt5 bat)"
-	fi
-
-	myconf="${myconf} \
-		$(use_with X x) \
-		$(use_enable batch-insert) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with ssl openssl) \
-		$(use_enable ipv6) \
-		$(use_enable acl) \
-		$(use_with tcpd tcp-wrappers)"
-
-	econf \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--with-archivedir=/var/lib/bacula/tmp \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/lib/bacula \
-		--with-logdir=/var/lib/bacula \
-		--with-scriptdir=/usr/libexec/bacula \
-		--with-systemd=$(systemd_get_systemunitdir) \
-		--with-dir-user=bacula \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--enable-smartalloc \
-		--disable-afs \
-		--without-s3 \
-		--host=${CHOST} \
-		${myconf}
-}
-
-src_compile() {
-	# Make build log verbose (bug #447806)
-	emake NO_ECHO=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doicon scripts/bacula.png
-	keepdir /var/lib/bacula/tmp
-
-	# remove not needed .la files #840957
-	find "${ED}" -name '*.la' -delete || die
-
-	# install bat icon and desktop file when enabled
-	# (for some reason ./configure doesn't pick this up)
-	if use qt5 && ! use static ; then
-		doicon src/qt-console/images/bat_icon.png
-		domenu scripts/bat.desktop
-	fi
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-	# rename statically linked apps
-	if use bacula-clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		insinto /usr/libexec/bacula/updatedb
-		insopts -m0754
-		doins "${S}"/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /usr/share/logwatch/scripts/services
-			dodir /usr/share/logwatch/scripts/shared
-			dodir /etc/logwatch/conf/logfiles
-			dodir /etc/logwatch/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	# Install all man pages
-	doman "${S}"/manpages/*.[18]
-
-	if ! use qt5; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-		rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-	fi
-
-	if use bacula-clientonly || use bacula-nodir ; then
-		rm -vf "${D}"/usr/libexec/bacula/create_*_database
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-	fi
-	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/libexec/bacula/disk-changer
-		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-	fi
-
-	# documentation
-	dodoc ChangeLog ReleaseNotes SUPPORT
-
-	# install examples (bug #457504)
-	if use examples; then
-		docinto examples/
-		dodoc -r examples/*
-	fi
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bacula-fd"
-	if ! use bacula-clientonly; then
-		if ! use bacula-nodir; then
-			myscripts="${myscripts} bacula-dir"
-		fi
-		if ! use bacula-nosd; then
-			myscripts="${myscripts} bacula-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependency for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	einfo
-	einfo "A group 'bacula' has been created. Any users you add to this"
-	einfo "group have access to files created by the daemons."
-	einfo
-	einfo "A user 'bacula' has been created.  Please see the bacula manual"
-	einfo "for information about running bacula as a non-root user."
-	einfo
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn "ATTENTION!"
-		ewarn "The format of the database may have changed."
-		ewarn "If you just upgraded from a version below 9.0.0 you must run"
-		ewarn "'update_bacula_tables' now."
-		ewarn "Make sure to have a backup of your catalog before."
-		ewarn
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bacula does not officially support SQLite database anymore."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt5'."
-	einfo
-	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
-	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
-
-	einfo
-	einfo "If you adapt the port numbers for baculas components in the config files"
-	einfo "make sure to adapt the file names for the pidfile accordingly"
-	einfo "(see init.d scripts)."
-}
diff --git a/app-backup/bacula/bacula-15.0.2.ebuild b/app-backup/bacula/bacula-15.0.2.ebuild
index 80993afbc014..61bca6622ef2 100644
--- a/app-backup/bacula/bacula-15.0.2.ebuild
+++ b/app-backup/bacula/bacula-15.0.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
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline selinux +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="
diff --git a/app-backup/bacula/files/bacula-11.0.2-fix-static.patch b/app-backup/bacula/files/bacula-11.0.2-fix-static.patch
deleted file mode 100644
index f7ffccf0fe58..000000000000
--- a/app-backup/bacula/files/bacula-11.0.2-fix-static.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- src/console/Makefile.in.orig	2017-07-25 19:03:05.664760298 +0200
-+++ src/console/Makefile.in	2017-07-25 19:05:43.576706091 +0200
-@@ -24,6 +24,7 @@
- CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@
- CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
- JSONOBJS = bbconsjson.o console_conf.o
-+ZLIBS=@ZLIBS@
- 
- # these are the objects that are changed by the .configure process
- EXTRAOBJS = @OBJLIST@
-@@ -50,18 +51,18 @@
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 
- bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 	strip $@
- 
- 
---- src/filed/Makefile.in.orig	2017-07-25 19:09:19.655852979 +0200
-+++ src/filed/Makefile.in	2017-07-25 19:11:39.519558592 +0200
-@@ -69,19 +69,19 @@
- bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
--	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(IOKITLIBS)
-+	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(IOKITLIBS)
- 
- bfdjson:  Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \
--	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-+	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 
- static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
--	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-+	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 	strip $@
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/app-backup/bacula/files/fix_slibtool.patch b/app-backup/bacula/files/fix_slibtool.patch
deleted file mode 100644
index e38448faa30c..000000000000
--- a/app-backup/bacula/files/fix_slibtool.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-# slibtool creates library in .libs directory but need -L. to find them
-# Bug #914389
---- src/stored/Makefile.in.orig	2023-11-15 14:20:23.135630968 +0100
-+++ src/stored/Makefile.in	2023-11-15 14:22:35.771246680 +0100
-@@ -267,7 +267,7 @@
- 	   -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
- 
- btape: Makefile  $(TAPEOBJS) libbacsd.la drivers ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
--	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(TAPEOBJS) \
-+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(TAPEOBJS) \
- 	  $(SD_LIBS) $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- 
-@@ -277,7 +277,7 @@
-            -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
- 
- cloud_test: Makefile cloud_test.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)  $(BLSOBJS)  libbacsd.la drivers
--	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \
-+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \
-            $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bcloud.o: bcloud.c
-@@ -286,7 +286,7 @@
-            -I$(basedir) $(DINCLUDE) $(S3_INC) $(CFLAGS) $<
- 
- bcloud: Makefile bcloud.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)  $(BLSOBJS)  libbacsd.la drivers
--	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \
-+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \
-            $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(S3_LIBS)
- 
- bls.o:	bls.c
-@@ -296,7 +296,7 @@
- 
- bls:	Makefile $(BLSOBJS) libbacsd.la drivers  ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	@echo "Compiling $<"
--	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
-+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
- 	   $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bextract.o: bextract.c
-@@ -306,7 +306,7 @@
- 
- bextract: Makefile $(BEXTOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	@echo "Compiling $<"
--	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \
-+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \
- 	   $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bscan.o: bscan.c
-@@ -316,7 +316,7 @@
- 
- bscan:	Makefile $(SCNOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
- 	../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE)
--	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
-+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
- 	   $(SD_LIBS) -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bcopy.o: bcopy.c
-@@ -325,7 +325,7 @@
- 	   -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
- 
- bcopy:	Makefile $(COPYOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
--	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(COPYOBJS) \
-+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(COPYOBJS) \
- 	   $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- cloud_parts_test: Makefile cloud_parts.c
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 0413062fc98b..cd806a7fca65 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,5 +1,4 @@
-DIST borgmatic-1.8.14.tar.gz 623966 BLAKE2B fd52bc5be4f63e1207a0bedcf654af075082d31af76ddc65ea30a3259f1ec093c826612e114fd9f9fa46668f80eed3b2b6a88262fbb9e4db49c36ba31efa70c5 SHA512 74daecbf02f957b21121dff073c2e114c87b1afdf6b3408b8fc2bf465102425cca60e4bdc8bc8d0e2d0a9c20b1f514eb7c9a2e136e71cb61969e07a38841235a
-DIST borgmatic-1.9.2.tar.gz 641879 BLAKE2B 0c1678c905235ee435fdeb7fc57eabb44054344fab596ecb17f5cbeb0a2afa944b3105b08c61547de853de561c58971a6d32ac677434475b38cc90af4600b88d SHA512 8226155f049141b80bed32f955faa37cd8d2c01489092510440c1f53247d1aabf7d8730aa8c22b20f16ffb5686b158966a544e2bea4558178ec52da187b18c13
 DIST borgmatic-1.9.3.tar.gz 645018 BLAKE2B ae069bece54d80eab080cb30d4fb4b523cc7f31ca5d434a7f2fdfc8447ab72e6687fc6775a7811e15f120a0ad57284c539813c07b5cb258a2acf92e02dd55999 SHA512 22624e1a4454660288a3019513509006b389aafd657a45fa9e24c0b13b6a1266450c5b4ed531be5d8574c5f5fa5b869cb6860273f5d3d9a53b4e41474fb1b90e
 DIST borgmatic-1.9.4.tar.gz 635562 BLAKE2B aac7cea7c7b9537a1f13f6cdd5fc15c3a7d439f9c609a3b05aeb0c10a844f479f0f3a1ec9470283b38594646985cc87c45445602e264f2e8fbabb509691feab4 SHA512 db258ebaa87ac88873c73ab750b7f72278376679c3641c91f4d3565d690a9cb25be5df94bb94aead83f09b27a1d41edbb7e457261440c33fddc9fde3477e7006
 DIST borgmatic-1.9.5.tar.gz 638074 BLAKE2B 9947a443bcdd04abe29a3eaf3f790491cddc8283d6e09b56cb3b2aed97e0a424e0251aa9b19b3b5687416f59dec2944ed6d41c99df6e7790fa54a5b2608af0bf SHA512 9ab23865aeef61399a85532450cf7c9bc853a95560d383c83d43966eba0a66718976abdfcb2feec104c8941c0acd5406e2f1812be31b0f4baa76caf6a8ae81c9
+DIST borgmatic-1.9.6.tar.gz 640257 BLAKE2B 6d95fe1d12fa401b25d00187a20520003ebc05ceb481add6c0706fcc6bb40f275830cd35f3fa90ea3680457e93a33bf21abb7f3d6423c9268c95b4e356587fdc SHA512 ff2050dcde579e5dffeef915bead5672158387c9a883d9f5b996ba8e804e37d9445b07839f84959cae2b367735f742cab83e143b363cedbb61f38621e2b0a95b
diff --git a/app-backup/borgmatic/borgmatic-1.8.14.ebuild b/app-backup/borgmatic/borgmatic-1.8.14.ebuild
deleted file mode 100644
index 3654974c5dd9..000000000000
--- a/app-backup/borgmatic/borgmatic-1.8.14.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
-
-PYTHON_COMPAT=( python3_{10..13} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 systemd pypi
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv"
-IUSE="apprise"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
-	$(python_gen_cond_dep '
-		<dev-python/colorama-0.5[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	')
-	apprise? ( $(python_gen_cond_dep '
-		dev-python/apprise[${PYTHON_USEDEP}]
-	') )"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/apprise[${PYTHON_USEDEP}]
-			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
-		')
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.13-no_test_coverage.patch
-	"${FILESDIR}"/${PN}-1.7.14-systemd_service_bin_path.patch
-)
-
-# A fragile test whose only purpose is to make sure the NEWS file
-# has been updated for the current version.
-EPYTEST_DESELECT=(
-	tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit sample/systemd/borgmatic.{service,timer}
-	keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To generate a sample configuration file, run:"
-		elog "    ${PN} config generate"
-	else
-		local oldver
-		for oldver in ${REPLACING_VERSIONS}; do
-			if ver_test "${oldver}" -lt 1.8.0; then
-				ewarn "Please be warned that ${PN}-1.8.0 has introduced several breaking changes."
-				ewarn "For details, please see"
-				ewarn
-				ewarn "	https://github.com/borgmatic-collective/borgmatic/releases/tag/1.8.0"
-				ewarn
-				break
-			fi
-		done
-	fi
-	elog
-	elog "Systemd users wishing to periodically run ${PN} can use the provided timer and service units."
-}
diff --git a/app-backup/borgmatic/borgmatic-1.9.2.ebuild b/app-backup/borgmatic/borgmatic-1.9.2.ebuild
deleted file mode 100644
index f9833cb80a62..000000000000
--- a/app-backup/borgmatic/borgmatic-1.9.2.ebuild
+++ /dev/null
@@ -1,85 +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} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 systemd pypi
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="
-	https://torsion.org/borgmatic/
-	https://projects.torsion.org/borgmatic-collective/borgmatic
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv"
-IUSE="apprise"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
-	$(python_gen_cond_dep '
-		<dev-python/colorama-0.5[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	')
-	apprise? ( $(python_gen_cond_dep '
-		dev-python/apprise[${PYTHON_USEDEP}]
-	') )"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/apprise[${PYTHON_USEDEP}]
-			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
-		')
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.14-systemd_service_bin_path.patch
-	"${FILESDIR}"/${PN}-1.9.0-no_test_coverage.patch
-)
-
-EPYTEST_DESELECT=(
-	# A fragile test whose only purpose is to make sure the NEWS file
-	# has been updated for the current version.
-	tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
-
-	# The test expects unset NO_COLOR, bug 943393. See also
-	# https://projects.torsion.org/borgmatic-collective/borgmatic/issues/943
-	tests/unit/test_logger.py::test_should_do_markup_respects_config_value
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit sample/systemd/borgmatic.{service,timer}
-	keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To generate a sample configuration file, run:"
-		elog "    ${PN} config generate"
-		elog
-		elog "Systemd users wishing to periodically run ${PN} can use the provided timer and service units."
-	else
-		local oldver
-		for oldver in ${REPLACING_VERSIONS}; do
-			if ver_test "${oldver}" -lt 1.9.0; then
-				ewarn "Please be warned that ${PN}-1.9.0 has introduced several breaking changes."
-				ewarn "For details, please see"
-				ewarn
-				ewarn "	https://github.com/borgmatic-collective/borgmatic/releases/tag/1.9.0"
-				ewarn
-				break
-			fi
-		done
-	fi
-}
diff --git a/app-backup/borgmatic/borgmatic-1.9.4.ebuild b/app-backup/borgmatic/borgmatic-1.9.4.ebuild
index c8ac8622d33f..1e9c83f8a70d 100644
--- a/app-backup/borgmatic/borgmatic-1.9.4.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.9.4.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv"
 IUSE="apprise"
 
 # borg is called as an external tool, hence no pythonic stuff
diff --git a/app-backup/borgmatic/borgmatic-1.9.6.ebuild b/app-backup/borgmatic/borgmatic-1.9.6.ebuild
new file mode 100644
index 000000000000..dea28ebb55e3
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.9.6.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 systemd pypi
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="
+	https://torsion.org/borgmatic/
+	https://projects.torsion.org/borgmatic-collective/borgmatic
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+IUSE="apprise"
+
+# borg is called as an external tool, hence no pythonic stuff
+RDEPEND="
+	app-backup/borgbackup
+	$(python_gen_cond_dep '
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	')
+	apprise? ( $(python_gen_cond_dep '
+		dev-python/apprise[${PYTHON_USEDEP}]
+	') )
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/apprise[${PYTHON_USEDEP}]
+			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.14-systemd_service_bin_path.patch
+	"${FILESDIR}"/${PN}-1.9.3-no_test_coverage.patch
+)
+
+EPYTEST_DESELECT=(
+	# A fragile test whose only purpose is to make sure the NEWS file
+	# has been updated for the current version.
+	tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
+)
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+	systemd_dounit sample/systemd/borgmatic.{service,timer}
+	keepdir /etc/borgmatic
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "To generate a sample configuration file, run:"
+		elog "    ${PN} config generate"
+		elog
+		elog "Systemd users wishing to periodically run ${PN} can use the provided timer and service units."
+	else
+		local oldver
+		for oldver in ${REPLACING_VERSIONS}; do
+			if ver_test "${oldver}" -lt 1.9.0; then
+				ewarn "Please be warned that ${PN}-1.9.0 has introduced several breaking changes."
+				ewarn "For details, please see"
+				ewarn
+				ewarn "	https://github.com/borgmatic-collective/borgmatic/releases/tag/1.9.0"
+				ewarn
+				break
+			fi
+		done
+	fi
+}
diff --git a/app-backup/borgmatic/files/borgmatic-1.7.13-no_test_coverage.patch b/app-backup/borgmatic/files/borgmatic-1.7.13-no_test_coverage.patch
deleted file mode 100644
index a3c02598b724..000000000000
--- a/app-backup/borgmatic/files/borgmatic-1.7.13-no_test_coverage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -3,7 +3,7 @@
- 
- [tool:pytest]
- testpaths = tests
--addopts = --cov-report term-missing:skip-covered --cov=borgmatic --ignore=tests/end-to-end
-+addopts = --ignore=tests/end-to-end
- 
- [flake8]
- max-line-length = 100
diff --git a/app-backup/borgmatic/files/borgmatic-1.9.0-no_test_coverage.patch b/app-backup/borgmatic/files/borgmatic-1.9.0-no_test_coverage.patch
deleted file mode 100644
index 1c69a1e83c3a..000000000000
--- a/app-backup/borgmatic/files/borgmatic-1.9.0-no_test_coverage.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-no test coverage
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 6197d3df..713554e9 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -50,7 +50,7 @@ skip-string-normalization = true
- 
- [tool.pytest.ini_options]
- testpaths = "tests"
--addopts = "--cov-report term-missing:skip-covered --cov=borgmatic --ignore=tests/end-to-end"
-+addopts = "--ignore=tests/end-to-end"
- 
- [tool.isort]
- profile = "black"
--- 
-2.45.2
-
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index c46fa9ad6d2c..d92b1feb4273 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,2 +1 @@
-DIST dar-2.7.15.tar.gz 2443741 BLAKE2B 6af22a471dc0b5230843b73b7bddf931c281b8b3f0ea4cf1eb01f37e06651fa90a06b3e45be342ab799960f27460dfa8b95022791b9b471df2834a786784951f SHA512 c35c47c5ef307e3a36394cff44b37de0b9e7ad95d2810de476197897d368fa20401d567b18b763d39663167ec2ca093e54535fb5741c99a8e4bf9b78a460eaba
 DIST dar-2.7.16.tar.gz 2444321 BLAKE2B 019f441fe5ca951fbb43b661cbc9d6c5c1992e825005fb434579b2dedb6dc379593ffa11a1ee651da6047c16b8264a19dbbbc7e98bb2d20790890058f245a03c SHA512 bc70aecc05641314144c9a252fec1d256b3a19e38837ee2bb1320bfc7b659bc1e7399e6e1377862e25d25c798fdf90e535794d8ba68f0b9754d9e6bfb9cb50fe
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/dar/dar-2.7.16.ebuild b/app-backup/dar/dar-2.7.16.ebuild
index dbcd82bb8c00..c27c48c28653 100644
--- a/app-backup/dar/dar-2.7.16.ebuild
+++ b/app-backup/dar/dar-2.7.16.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="https://downloads.sourceforge.net/project/dar/dar/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
 IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync xattr"
 
 REQUIRED_USE="
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-backup/restic/Manifest b/app-backup/restic/Manifest
index 1631bf94863a..a8105b2e9143 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -7,3 +7,6 @@ DIST restic-0.17.1.tar.gz 24104588 BLAKE2B cdfb89f21afe31c0f7bd881e8fbdfdeef020d
 DIST restic-0.17.2-deps.tar.xz 173467792 BLAKE2B 211142acd818e236bdd19709a641afd072670ebed082a914cda0a1b51c49cbd0c92877afb552abeabfa0482e51f39eee399f53a8731099851cf89a0340f06ebb SHA512 958bc3dc2af328a097b925e20f1a22ae238425fed2afc9ce382c31c54152d28a00cc64dc90a88c939e17670608dcb786a972f64fa7cba40cbcc9bf1f9964b49d
 DIST restic-0.17.2.tar.gz 24107857 BLAKE2B 56bc1035a9f9721f74db9645330700489dddf18a8116dec4b5c9a0fa1192e3b015a288c6f9409e840b6d783b34b777c2d0f8aa38ffc2cee38733a984b50e068e SHA512 73d6706203cd75288633f15fb440a05f5eee8b3e352f3f3ce78a53f6397a82a431f0d53bfe6559fd302314b33d98cb1290845c25b338931f8b829bf634b2fb36
 DIST restic-0.17.2.tar.gz.asc 833 BLAKE2B 4671fb794c40412e91df91c0fc80da2a6fe382e7226b2f7cdb2f70c8c95812d4ec1dd81b58067a1cb8d12adf019b94e92f419a32dd429b30f9414cf0d9ee7ac9 SHA512 8363cf66e1251fda9d2dec7832fc9717c3da249eea87af94385dc2b69bf2acd7051c9bce4577a8ea3ccfa48f38dcf2d46be31deab9a8daa6e693aa590de78bae
+DIST restic-0.17.3-deps.tar.xz 62516448 BLAKE2B 21874e8cf6dd2be669e6d2ad13bde02073ec25920214a758e01f16869abce964fa29e6bcd9c91ba5d47edf47673975e0c0ffe8161547f8e5d854462d402aa2e5 SHA512 3869e4aec35bd04b323b0b0ba86eebdf5b2dfd89011cae5f47888a6dc027e7e35ec01a3fad45fb5fc2b7c41a24b2c82a234b3a74e09fadcb82fa803c7acca174
+DIST restic-0.17.3.tar.gz 24109574 BLAKE2B 0ef828207a2c925246d780377e531b47254c3afcd89231f4dda7aad063c5335134c87e8747b138a725a8b2b5deafddef09eaccce67ae508b0b3c82369d878ea7 SHA512 d2efc27588f4b08120f68ba4e72d007c49b340c66928aaa261312a9caa32ec44c80d562c69ae25d2e7be1b5fa3600b3239fc49651a8c8be50581bfd73ae59036
+DIST restic-0.17.3.tar.gz.asc 833 BLAKE2B f703e66d3637e254020c9cc34b92b8b12fcb860e0f505aa89f0c8f8b682ef0bf16a6321233a83d8ddbb30ccae6c9cbdba1e8a60136513d3158c97949fd1033f7 SHA512 8daa8a70fe2de292dce67a8a2ceea3856d0332975234d46dc12bd79208b3aa129064e303a1e4ff32cea37765cc63ed3f8d1fb080737e4ef6b2d9b9073593fd85
diff --git a/app-backup/restic/restic-0.17.2.ebuild b/app-backup/restic/restic-0.17.2.ebuild
index ca8727ad11c3..cb137087ef39 100644
--- a/app-backup/restic/restic-0.17.2.ebuild
+++ b/app-backup/restic/restic-0.17.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
@@ -16,7 +16,7 @@ SRC_URI+=" https://gentoo.kropotkin.rocks/go-pkgs/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="sys-fs/fuse:0"
 DEPEND="${RDEPEND}"
diff --git a/app-backup/restic/restic-0.17.3.ebuild b/app-backup/restic/restic-0.17.3.ebuild
new file mode 100644
index 000000000000..20fcc84b224c
--- /dev/null
+++ b/app-backup/restic/restic-0.17.3.ebuild
@@ -0,0 +1,60 @@
+# 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/alexanderneumann.asc
+inherit go-module shell-completion verify-sig
+
+DESCRIPTION="A backup program that is fast, efficient and secure"
+HOMEPAGE="https://restic.github.io/"
+SRC_URI="
+	https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	verify-sig? ( https://github.com/restic/restic/releases/download/v${PV}/${P}.tar.gz.asc )
+"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-alexanderneumann )"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz "${DISTDIR}"/${P}.tar.gz.asc
+	fi
+
+	default
+}
+
+src_compile() {
+	local mygoargs=(
+		-tags release
+		-ldflags "-X main.version=${PV}"
+		-asmflags "-trimpath=${S}"
+		-gcflags "-trimpath=${S}"
+	)
+
+	ego build "${mygoargs[@]}" -o restic ./cmd/restic
+}
+
+src_test() {
+	addwrite /dev/fuse
+	# a number of the ./cmd/... tests fail
+	# ego test -timeout 30m ./cmd/... ./internal/...
+	RESTIC_TEST_FUSE=0 ego test -timeout 30m ./internal/...
+}
+
+src_install() {
+	dobin restic
+
+	newbashcomp doc/bash-completion.sh "${PN}"
+	newzshcomp doc/zsh-completion.zsh _restic
+	newfishcomp doc/fish-completion.fish "${PN}"
+
+	doman doc/man/*
+	dodoc doc/*.rst
+}
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 188c8abd1f94..3c79f14b5846 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,3 +1,2 @@
-DIST snapper-0.11.0.tar.gz 445685 BLAKE2B 301e6d745d8d6d7acc6ca0c9fc431a0e46700aabd9882785bb2be38152693f9dbe897f85f6ad724c9529a0754b6146b53dda0a24141b386e59e7737855bc5da2 SHA512 fe86be4ceb1439b5be3fa61f5bc037bc51a5fe47451d0698851f83e2783d6c245ef8d40a33f79b03e8d1d8b63433743c35938ad7dca0747e0e1f650a5a766c40
-DIST snapper-0.11.2.tar.gz 451240 BLAKE2B 08afbdb7808d16555ca476e2a4336b9ee7da7e368a8bba1f131b7413d60ce0c61cb8e6ebc14cfebf5184d426b39c2d042f450494dcd65de30627870407ec8652 SHA512 b418ff91c6ba655edebd600691e2a7c0bc277eb6e327d5c57d0e5b2e008ee859e82a7dc49f2b25003001f0e6e5fc69e611c843231160bbb4626867cfc4cf95e2
 DIST snapper-0.12.0.tar.gz 530406 BLAKE2B 575a1cf251c789c38f3cce623e6074dde4d195914f7b391f2a0d4f588e5ff90b47c56b1897cb9a6d6a7789ed6d5e3676cb9ac3719fa33e9dabdc26227ea5b1e2 SHA512 f022ce76633e3d64e2c3c825a9113b2f77d0e672188b4af644e37388cb3636b4878131917a734aab3b74e744b5e437d53657744df37ec53671442cef4e3bb873
+DIST snapper-0.12.1.tar.gz 536687 BLAKE2B 1fbc8a99848016974db82c3993cd22fe402fba49ab128919e291704f602447c3d5b63f9681eff038e4bfbf89da8e5516516b22e8d93ca637ecca89c33ce89df6 SHA512 be7e227c7b7935d9be25ada77b758e654102881b8b7886fca312a9be990fbf701db774bfcccde4a05b9e1c0b31aa7f757a7a94a254c49fd54ba7a1395b3a6716
diff --git a/app-backup/snapper/snapper-0.11.0.ebuild b/app-backup/snapper/snapper-0.11.0.ebuild
deleted file mode 100644
index 011eb5479f3e..000000000000
--- a/app-backup/snapper/snapper-0.11.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd
-
-DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
-HOMEPAGE="http://snapper.io/"
-SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="lvm pam test systemd xattr"
-RESTRICT="test"
-
-BDEPEND="app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-RDEPEND="dev-libs/boost:=
-	dev-libs/json-c:=
-	dev-libs/libxml2
-	dev-libs/icu:=
-	sys-apps/acl
-	sys-apps/dbus
-	sys-apps/util-linux
-	>=sys-fs/btrfs-progs-3.17.1
-	sys-libs/zlib
-	virtual/libintl
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-	xattr? ( sys-apps/attr )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cron-confd.patch
-	"${FILESDIR}"/${PN}-0.10.1-testsuite.patch
-)
-
-src_prepare() {
-	default
-
-	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
-		-i data/Makefile.* \
-		|| die "Failed to fix systemd services and timers installation path"
-	eautoreconf
-}
-
-src_configure() {
-	# ext4 code does not work anymore
-	# snapper does not build without btrfs
-	local myeconfargs=(
-		--disable-silent-rules
-		--with-conf="/etc/conf.d"
-		--enable-zypp
-		--enable-rollback
-		--enable-btrfs-quota
-		--disable-ext4
-		--enable-btrfs
-		--enable-doc
-		$(use_enable lvm)
-		$(use_enable pam)
-		$(use_enable test tests)
-		$(use_enable systemd)
-		$(use_enable xattr xattrs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# Existing configuration file required to function
-	keepdir /etc/snapper/configs
-	newconfd data/sysconfig.snapper snapper
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "In order to use Snapper, you need to set up"
-	elog "at least one config first. To do this, run:"
-	elog "snapper create-config <subvolume>"
-	elog "For more information, see man (8) snapper or"
-	elog "http://snapper.io/documentation.html and"
-	elog "https://wiki.gentoo.org/wiki/Snapper"
-}
diff --git a/app-backup/snapper/snapper-0.11.2.ebuild b/app-backup/snapper/snapper-0.11.2.ebuild
deleted file mode 100644
index 92c569f5b215..000000000000
--- a/app-backup/snapper/snapper-0.11.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd
-
-DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
-HOMEPAGE="http://snapper.io/"
-SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="lvm pam test systemd xattr"
-RESTRICT="test"
-
-BDEPEND="app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-RDEPEND="dev-libs/boost:=
-	dev-libs/json-c:=
-	dev-libs/libxml2
-	dev-libs/icu:=
-	sys-apps/acl
-	sys-apps/dbus
-	sys-apps/util-linux
-	>=sys-fs/btrfs-progs-3.17.1
-	sys-libs/zlib
-	virtual/libintl
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-	xattr? ( sys-apps/attr )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.11.0-cron-confd.patch
-	"${FILESDIR}"/${PN}-0.10.1-testsuite.patch
-)
-
-src_prepare() {
-	default
-
-	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
-		-i data/Makefile.* \
-		|| die "Failed to fix systemd services and timers installation path"
-	eautoreconf
-}
-
-src_configure() {
-	# ext4 code does not work anymore
-	# snapper does not build without btrfs
-	local myeconfargs=(
-		--disable-silent-rules
-		--with-conf="/etc/conf.d"
-		--enable-zypp
-		--enable-rollback
-		--enable-btrfs-quota
-		--disable-ext4
-		--enable-btrfs
-		--enable-doc
-		$(use_enable lvm)
-		$(use_enable pam)
-		$(use_enable test tests)
-		$(use_enable systemd)
-		$(use_enable xattr xattrs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# Existing configuration file required to function
-	keepdir /etc/snapper/configs
-	newconfd data/sysconfig.snapper snapper
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "In order to use Snapper, you need to set up"
-	elog "at least one config first. To do this, run:"
-	elog "snapper create-config <subvolume>"
-	elog "For more information, see man (8) snapper or"
-	elog "http://snapper.io/documentation.html and"
-	elog "https://wiki.gentoo.org/wiki/Snapper"
-}
diff --git a/app-backup/snapper/snapper-0.12.0.ebuild b/app-backup/snapper/snapper-0.12.0.ebuild
index 92c569f5b215..9dad18fc9847 100644
--- a/app-backup/snapper/snapper-0.12.0.ebuild
+++ b/app-backup/snapper/snapper-0.12.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="lvm pam test systemd xattr"
 RESTRICT="test"
 
diff --git a/app-backup/snapper/snapper-0.12.1.ebuild b/app-backup/snapper/snapper-0.12.1.ebuild
new file mode 100644
index 000000000000..46ac21b22084
--- /dev/null
+++ b/app-backup/snapper/snapper-0.12.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
+HOMEPAGE="http://snapper.io/"
+SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="lvm pam test systemd xattr"
+RESTRICT="test"
+
+BDEPEND="app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+RDEPEND="dev-libs/boost:=
+	dev-libs/json-c:=
+	dev-libs/libxml2
+	dev-libs/icu:=
+	sys-apps/acl
+	sys-apps/dbus
+	sys-apps/util-linux
+	>=sys-fs/btrfs-progs-3.17.1
+	sys-libs/zlib
+	virtual/libintl
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+	xattr? ( sys-apps/attr )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.11.0-cron-confd.patch
+	"${FILESDIR}"/${PN}-0.10.1-testsuite.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
+		-i data/Makefile.* \
+		|| die "Failed to fix systemd services and timers installation path"
+	eautoreconf
+}
+
+src_configure() {
+	# ext4 code does not work anymore
+	# snapper does not build without btrfs
+	local myeconfargs=(
+		--disable-silent-rules
+		--with-conf="/etc/conf.d"
+		--enable-zypp
+		--enable-rollback
+		--enable-btrfs-quota
+		--disable-ext4
+		--enable-btrfs
+		--enable-doc
+		$(use_enable lvm)
+		$(use_enable pam)
+		$(use_enable test tests)
+		$(use_enable systemd)
+		$(use_enable xattr xattrs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# Existing configuration file required to function
+	keepdir /etc/snapper/configs
+	newconfd data/sysconfig.snapper snapper
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "In order to use Snapper, you need to set up"
+	elog "at least one config first. To do this, run:"
+	elog "snapper create-config <subvolume>"
+	elog "For more information, see man (8) snapper or"
+	elog "http://snapper.io/documentation.html and"
+	elog "https://wiki.gentoo.org/wiki/Snapper"
+}
diff --git a/app-benchmarks/i7z/files/i7z_GUI.policy b/app-benchmarks/i7z/files/i7z_GUI.policy
new file mode 100644
index 000000000000..03756867650a
--- /dev/null
+++ b/app-benchmarks/i7z/files/i7z_GUI.policy
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+  <vendor>i7z</vendor>
+  <vendor_url>https://github.com/ajaiantilal/i7z</vendor_url>
+  <icon_name>i7z</icon_name>
+  <action id="i7z_GUI">
+    <description>Run i7z_GUI as root</description>
+    <message>Authentication is required to run i7z GUI as root</message>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/i7z_GUI</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+  </action>
+</policyconfig>
diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r3.ebuild b/app-benchmarks/i7z/i7z-93_p20131012-r3.ebuild
new file mode 100644
index 000000000000..4941ccb69943
--- /dev/null
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop qmake-utils toolchain-funcs
+
+COMMIT="5023138d7c35c4667c938b853e5ea89737334e92"
+DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
+HOMEPAGE="https://github.com/ajaiantilal/i7z"
+SRC_URI="https://github.com/ajaiantilal/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="policykit qt6"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	qt6? (
+		policykit? ( sys-auth/polkit )
+		dev-qt/qtbase:6[gui,widgets]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/i7z-0.27.2-ncurses.patch
+	"${FILESDIR}"/qt5.patch
+	"${FILESDIR}"/gcc5.patch
+
+	# From Debian
+	"${FILESDIR}"/fix-insecure-tempfile.patch
+	"${FILESDIR}"/fix_cpuid_asm.patch
+	"${FILESDIR}"/hyphen-used-as-minus-sign.patch
+	"${FILESDIR}"/install-i7z_rw_registers.patch
+	"${FILESDIR}"/use_stdbool.patch
+	"${FILESDIR}"/nehalem.patch
+	"${FILESDIR}"/gcc-10.patch
+	"${FILESDIR}"/typos.patch
+)
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+	cd GUI || die
+	use qt6 && eqmake6 ${PN}_GUI.pro
+}
+
+src_compile() {
+	default
+
+	if use qt6; then
+		emake -C GUI clean
+		emake -C GUI
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${ED}" docdir=/usr/share/doc/${PF} install
+
+	if use qt6; then
+		dosbin GUI/i7z_GUI
+		if use policykit; then
+			insinto /usr/share/polkit-1/actions
+			doins "${FILESDIR}/i7z_GUI.policy"
+			make_desktop_entry "pkexec --disable-internal-agent /usr/sbin/i7z_GUI" i7z kcmprocessor
+		fi
+	fi
+}
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 7f228b900871..f706816b7abe 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1 +1,2 @@
 DIST siege-4.1.6.tar.gz 527103 BLAKE2B aea71c93d0243113f8d9087ab4ea02ad1c64e10d8a10918139473ba865230a8e945d5371f19234bce22c95f8a412f68e94792ea0ea00eb451f208a17a37467f4 SHA512 cc674c9dc33aac35988708cd73b5061343cb1939e8a10b4dc50ceab42e65647b58557b6f3b48a03f5c992109bcac233425bf363e1f899135cfd9333d2517cfb2
+DIST siege-4.1.7.tar.gz 543447 BLAKE2B a4a5e7290ddace57f69a70d38bbcc901fb7651084840635981ea8b26c6bfc829215b03814a4b283709516a3994bd62f9e19fc304604249347b53238527108b97 SHA512 b7a842433410c7425c20308515db35151346249bd6886f9a36ef57c839ee974e05147792bff0fa72c3284dcb30b603fd6122c78f3220e144c688f41ebec9fec5
diff --git a/app-benchmarks/siege/files/siege-4.1.7-clang16-build-fix.patch b/app-benchmarks/siege/files/siege-4.1.7-clang16-build-fix.patch
new file mode 100644
index 000000000000..ba11315a3960
--- /dev/null
+++ b/app-benchmarks/siege/files/siege-4.1.7-clang16-build-fix.patch
@@ -0,0 +1,32 @@
+Bug: https://bugs.gentoo.org/894338
+--- a/src/cookies.c
++++ b/src/cookies.c
+@@ -66,7 +66,7 @@
+ BOOLEAN
+ cookies_add(COOKIES this, char *str, char *host)
+ {
+-  size_t  id    = pthread_self();
++  size_t  id    = (size_t) pthread_self();
+   NODE   *cur   = NULL; 
+   NODE   *pre   = NULL; 
+   NODE   *new   = NULL;
+@@ -174,7 +174,7 @@
+   time_t now;
+   struct tm tm;
+   char   oreo[MAX_COOKIES_SIZE];
+-  size_t id = pthread_self();
++  size_t id = (size_t) pthread_self();
+ 
+   memset(oreo, '\0', sizeof oreo);
+   tmp = time(NULL);
+--- a/src/ftp.c
++++ b/src/ftp.c
+@@ -151,7 +151,7 @@
+ {
+   size_t  len;
+   char    *file;
+-  size_t  id = pthread_self();
++  size_t  id = (size_t) pthread_self();
+   int     num = 2;
+   char    **parts;
+  
diff --git a/app-benchmarks/siege/siege-4.1.7.ebuild b/app-benchmarks/siege/siege-4.1.7.ebuild
new file mode 100644
index 000000000000..26e8142ae9ad
--- /dev/null
+++ b/app-benchmarks/siege/siege-4.1.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="HTTP regression testing and benchmarking utility"
+HOMEPAGE="https://www.joedog.org/siege-home https://github.com/JoeDog/siege"
+SRC_URI="https://download.joedog.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~x86 ~x64-macos"
+IUSE="ssl"
+
+RDEPEND="
+	sys-libs/zlib
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clang16-build-fix.patch
+)
+
+src_prepare() {
+	default
+	# bundled macros break recent libtool
+	# remove /usr/lib from LDFLAGS, bug #732886
+	sed -i \
+		-e '/AC_PROG_SHELL/d' \
+		-e 's/SSL_LDFLAGS="-L.*lib"/SSL_LDFLAGS=""/g' \
+		-e 's/Z_LDFLAGS="-L.*lib"/Z_LDFLAGS=""/g' \
+		configure.ac || die "Failed to sed configure.ac"
+	rm *.m4 || die "failed to remove bundled macros"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=( $(use_with ssl ssl "${EPREFIX}/usr") )
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	dodoc AUTHORS ChangeLog INSTALL README* doc/siegerc doc/urls.txt
+
+	newbashcomp "${FILESDIR}/${PN}".bash-completion "${PN}"
+}
+
+pkg_postinst() {
+	elog "An example ~/.siegerc file has been installed in"
+	elog "${EPREFIX}/usr/share/doc/${PF}/"
+}
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 44be5ac24ead..83feee01b9fa 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1 @@
-DIST stress-ng-0.18.07.tar.gz 6693742 BLAKE2B 452275807233cc740aa20b87793d2dfbb36adde17c539e7cf3bcfa22c6753dd46e551f5795ba3ee05956083ee33d906e18975f5451aaec56e68ae9aab1a66872 SHA512 359c88567b6a8e8fc743d6eacaef01d4a472748147fc044b9382abfd4ef75e3bcb625a9bed151db38b0f9ad48fd907a4373f1b7624c26f9c20d331046c3a57d8
+DIST stress-ng-0.18.09.tar.gz 6710486 BLAKE2B 9b73a783110e116869601ce31c08896470eae13ae03277c60f39e498a6fea4ff6b8784e1561cca772294022540a159a51f438ca117bb6e1ab40371dfe677e1c6 SHA512 6d3131d4509491a29dd72342b5a71946ad71e48f49c5d85e430346f96ecf30a639364fbeb60805b275415b313c0661964b1d43bd508efa3e3a305631c08370e7
diff --git a/app-benchmarks/stress-ng/stress-ng-0.18.07.ebuild b/app-benchmarks/stress-ng/stress-ng-0.18.07.ebuild
deleted file mode 100644
index 0dcbc1e87678..000000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.18.07.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="Stress test for a computer system with various selectable ways"
-HOMEPAGE="https://github.com/ColinIanKing/stress-ng"
-SRC_URI="https://github.com/ColinIanKing/${PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="apparmor keyutils jpeg sctp"
-
-DEPEND="
-	dev-libs/libaio
-	dev-libs/libbsd
-	dev-libs/libgcrypt:0=
-	sys-apps/attr
-	sys-libs/libcap
-	sys-libs/zlib
-	virtual/libcrypt:=
-	apparmor? (
-		sys-apps/apparmor-utils
-		sys-libs/libapparmor
-	)
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	keyutils? ( sys-apps/keyutils:= )
-	sctp? ( net-misc/lksctp-tools )
-"
-
-RDEPEND="${DEPEND}"
-
-DOCS=( "README.md" "README.Android" "TODO" "syscalls.txt" )
-
-pkg_pretend() {
-	if use apparmor; then
-		CONFIG_CHECK="SECURITY_APPARMOR"
-		check_extra_config
-	fi
-}
-
-src_compile() {
-	tc-export CC
-
-	export MAN_COMPRESS="0"
-
-	local myemakeopts=(
-		HAVE_APPARMOR="$(usex apparmor 1 0)"
-		HAVE_LIB_JPEG="$(usex jpeg 1 0)"
-		HAVE_KEYUTILS_H="$(usex keyutils 1 0)"
-		HAVE_LIB_SCTP="$(usex sctp 1 0)"
-		VERBOSE="1"
-	)
-
-	emake "${myemakeopts[@]}"
-}
diff --git a/app-benchmarks/stress-ng/stress-ng-0.18.09.ebuild b/app-benchmarks/stress-ng/stress-ng-0.18.09.ebuild
new file mode 100644
index 000000000000..e228cb2832dc
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.18.09.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="Stress test for a computer system with various selectable ways"
+HOMEPAGE="https://github.com/ColinIanKing/stress-ng"
+SRC_URI="https://github.com/ColinIanKing/${PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="apparmor keyutils jpeg sctp"
+
+DEPEND="
+	dev-libs/libaio
+	dev-libs/libbsd
+	dev-libs/libgcrypt:0=
+	sys-apps/attr
+	sys-libs/libcap
+	sys-libs/zlib
+	virtual/libcrypt:=
+	apparmor? (
+		sys-apps/apparmor-utils
+		sys-libs/libapparmor
+	)
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	keyutils? ( sys-apps/keyutils:= )
+	sctp? ( net-misc/lksctp-tools )
+"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.md" "README.Android" "TODO" "syscalls.txt" )
+
+pkg_pretend() {
+	if use apparmor; then
+		CONFIG_CHECK="SECURITY_APPARMOR"
+		check_extra_config
+	fi
+}
+
+src_compile() {
+	tc-export CC
+
+	export MAN_COMPRESS="0"
+
+	local myemakeopts=(
+		HAVE_APPARMOR="$(usex apparmor 1 0)"
+		HAVE_LIB_JPEG="$(usex jpeg 1 0)"
+		HAVE_KEYUTILS_H="$(usex keyutils 1 0)"
+		HAVE_LIB_SCTP="$(usex sctp 1 0)"
+		VERBOSE="1"
+	)
+
+	emake "${myemakeopts[@]}"
+}
diff --git a/app-cdr/dolphin-plugins-mountiso/Manifest b/app-cdr/dolphin-plugins-mountiso/Manifest
index 9f9e5c795e45..774bb947d928 100644
--- a/app-cdr/dolphin-plugins-mountiso/Manifest
+++ b/app-cdr/dolphin-plugins-mountiso/Manifest
@@ -1,2 +1,2 @@
 DIST dolphin-plugins-24.08.3.tar.xz 317540 BLAKE2B 54fa2e13be2cceb53b12b1edb2d6d7c1793f6ba2bbec67e9e00121b33683aa6bd4895392cbdf5aa7627958c6323984ae3db8b5bbf6b14faba86b13181e0a2614 SHA512 05da7ac7b3ebe085cf0808d8e1eba49372bfeb1488800f40c1d0b9025e743efede1200095a1e660c1d538b2cc1b19f0f717f3d0723043517859f5c2015f961ce
-DIST dolphin-plugins-24.12.0.tar.xz 319128 BLAKE2B c793b10b882029eb7b2b681f15220fa065c2f59e4a1aa35ecf6ebfee253c4bd68aaf32c6555a8e03dad0ec8de7fba824834f1c0cbcb88c0c702b731b3d9b78d8 SHA512 94b4f8cd785c380b915da0e4a8efb9521d3a8440246466e4903746a2eb44188f1ae8cf3b483ec901f70c49c60a391de7c09d567e9a1a905b4229378c2623ee42
+DIST dolphin-plugins-24.12.1.tar.xz 319152 BLAKE2B afb5d587e38d1fc24117a083eedc5d970ceeed93e0bbfe13fb991a85046224730c5a1490337ac82a04b613c216f1dd6be07de514c664c80e2e5a0f70bd7615cc SHA512 ebae4d9d363f6928eb89ceede74ca0cc3e0707f81fe782b07fb4d4e3c06bcb266f4981bc5f0374b76bf55b8e86d427bbab0a0fbf82552a288ab8ddb9916f5df9
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.12.0.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.12.0.ebuild
deleted file mode 100644
index 4d0b3e8cd8a8..000000000000
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.12.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="sdk"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="mountiso"
-KFMIN=6.5.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Dolphin plugin for ISO loopback device mounting"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-apps/dolphin-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/dolphin-plugins-common-${PV}
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-	# qtconcurrent only required by git
-	ecm_punt_qt_module Concurrent
-	# kxmlgui, qtnetwork only required by dropbox
-	ecm_punt_qt_module Network
-	ecm_punt_kf_module XmlGui
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_makefileactions=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.12.1.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.12.1.ebuild
new file mode 100644
index 000000000000..73645584218b
--- /dev/null
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.12.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="sdk"
+KDE_ORG_NAME="dolphin-plugins"
+MY_PLUGIN_NAME="mountiso"
+KFMIN=6.7.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Dolphin plugin for ISO loopback device mounting"
+HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-apps/dolphin-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/dolphin-plugins-common-${PV}
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+	# qtconcurrent only required by git
+	ecm_punt_qt_module Concurrent
+	# kxmlgui, qtnetwork only required by dropbox
+	ecm_punt_qt_module Network
+	ecm_punt_kf_module XmlGui
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_bazaar=OFF
+		-DBUILD_dropbox=OFF
+		-DBUILD_git=OFF
+		-DBUILD_hg=OFF
+		-DBUILD_makefileactions=OFF
+		-DBUILD_svn=OFF
+	)
+	ecm_src_configure
+}
diff --git a/app-cdr/isoimagewriter/Manifest b/app-cdr/isoimagewriter/Manifest
index b937ed44853a..1fe32e885aee 100644
--- a/app-cdr/isoimagewriter/Manifest
+++ b/app-cdr/isoimagewriter/Manifest
@@ -1,2 +1,2 @@
 DIST isoimagewriter-24.08.3.tar.xz 467764 BLAKE2B bb01dc2308dfffb6a42fcfbfbb937371afbc5f4c2b1cb894591f087cf89343134e88b5d769fa74321dbf243497663e8f6b5efec0f94a494cf1b74bd91651b8fb SHA512 c566e8b8c35f08c21e243e0623fe8775c30fc7489887ecfcd9c8148a835c79bf2156811f56656e5f5affe084d158da3629b267b67fab51bbab8133e5e09ec540
-DIST isoimagewriter-24.12.0.tar.xz 468060 BLAKE2B ec8d8fd669dc121a7f5200f17dc16f35764b8ba577bb8481f0b9097528c02e458b10feded3be06d2f13d6df289474485afebc5dcaf7f54fa554358a07241c1a2 SHA512 6e1dd361959b8f07058d168cf8254b00e64bd8c284ed93fbb3d55b5f14dcae54da3bda588004d6a41acfa71d2927da8f01bab91afe75fd2b050d00d3dae8f4b3
+DIST isoimagewriter-24.12.1.tar.xz 468072 BLAKE2B 9b45d55037834a4d6e23f56609d26a630029ef372183396083f681c69a373a71290a0e1349423f2745147c6c219f8a1103b31c6e3fc1de4a881123564cdfc53e SHA512 ae1dab2ca9fc8676a64c68a9dbc1750c7e57ad56e1d0debdabfec186429ab51c471ea4f8d656deeb5f68778f097e6625f8a500a5a83766d2699470e77ffe3556
diff --git a/app-cdr/isoimagewriter/isoimagewriter-24.12.0.ebuild b/app-cdr/isoimagewriter/isoimagewriter-24.12.0.ebuild
deleted file mode 100644
index ccce32557bf4..000000000000
--- a/app-cdr/isoimagewriter/isoimagewriter-24.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Write hybrid ISO files onto a USB disk"
-HOMEPAGE="https://community.kde.org/ISOImageWriter"
-
-LICENSE="GPL-3"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=app-crypt/gpgme-1.23.1-r1:=[cxx(+),qt6]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	sys-fs/udisks:2
-"
diff --git a/app-cdr/isoimagewriter/isoimagewriter-24.12.1.ebuild b/app-cdr/isoimagewriter/isoimagewriter-24.12.1.ebuild
new file mode 100644
index 000000000000..f4033b091f90
--- /dev/null
+++ b/app-cdr/isoimagewriter/isoimagewriter-24.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Write hybrid ISO files onto a USB disk"
+HOMEPAGE="https://community.kde.org/ISOImageWriter"
+
+LICENSE="GPL-3"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=app-crypt/gpgme-1.23.1-r1:=[cxx(+),qt6]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	sys-fs/udisks:2
+"
diff --git a/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch b/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch
deleted file mode 100644
index 520a355e595f..000000000000
--- a/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 50113aa660d2a867f3f8bfd67e1ba601c8b5294a Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 27 Jan 2020 23:33:49 +0100
-Subject: [PATCH] Add missing (Gentoo specific) include path for iniparser 4
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 8f4f23b..124a035 100644
---- a/Makefile
-+++ b/Makefile
-@@ -65,7 +65,7 @@ CPPFLAGS +=  -DICONPATH=\"$(ICONPATH)\" -DLOCALEDIR=\"$(LOCALEDIR)\" -DDEFAULT_E
- CPPFLAGS += -D_FILE_OFFSET_BITS=64
- 
- ifdef USE_SYSTEM_INIPARSER
--CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER)
-+CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER) -I/usr/include/iniparser4
- endif
- 
- OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o about.o settings.o boot.o editfile.o
--- 
-2.24.1
-
diff --git a/app-cdr/isomaster/isomaster-1.3.17-r1.ebuild b/app-cdr/isomaster/isomaster-1.3.17-r1.ebuild
new file mode 100644
index 000000000000..547f5024b765
--- /dev/null
+++ b/app-cdr/isomaster/isomaster-1.3.17-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
+HOMEPAGE="http://littlesvr.ca/isomaster"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/iniparser-4.1-r2:=
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448
+
+src_prepare() {
+	default
+	rm -f configure || die #274361
+	rm -R iniparser-4.1 || die
+}
+
+src_compile() {
+	tc-export AR CC
+
+	# iniparser.pc only exists in >=4.2 and it changes headers location
+	has_version '>=dev-libs/iniparser-4.2' &&
+		append-cflags $($(tc-getPKG_CONFIG) --cflags iniparser || die)
+
+	myisoconf=(
+		DEFAULT_EDITOR=leafpad
+		MYDOCPATH=/usr/share/doc/${PF}/bkisofs
+		USE_SYSTEM_INIPARSER=1
+		PREFIX=/usr
+	)
+
+	use nls || myisoconf+=( WITHOUT_NLS=1 )
+
+	emake "${myisoconf[@]}"
+}
+
+_apply_linguas() {
+	mv "${D}"/usr/share/locale{,_ALL} || die
+	dodir /usr/share/locale
+	for lingua in ${LINGUAS}; do
+		[[ -d "${D}"/usr/share/locale_ALL/${lingua} ]] || break
+		mv "${D}"/usr/share/{locale_ALL/${lingua},locale/} || die
+	done
+	rm -R "${D}"/usr/share/locale_ALL || die
+}
+
+src_install() {
+	emake "${myisoconf[@]}" DESTDIR="${D}" install
+	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT *.txt
+
+	use nls && _apply_linguas  # bug 402679, bug 512448
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-cdr/isomaster/isomaster-1.3.17.ebuild b/app-cdr/isomaster/isomaster-1.3.17.ebuild
deleted file mode 100644
index bfed4c776be9..000000000000
--- a/app-cdr/isomaster/isomaster-1.3.17.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
-HOMEPAGE="http://littlesvr.ca/isomaster"
-SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/iniparser-4.1:4
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.14-include-path.patch
-)
-
-pkg_setup() {
-	myisoconf=(
-		DEFAULT_EDITOR=leafpad
-		MYDOCPATH=/usr/share/doc/${PF}/bkisofs
-		USE_SYSTEM_INIPARSER=1
-		LIB_INIPARSER=iniparser4
-		PREFIX=/usr
-		)
-
-	use nls || myisoconf+=( WITHOUT_NLS=1 )
-}
-
-src_prepare() {
-	default
-	rm -f configure || die #274361
-	rm -R iniparser-4.1 || die
-}
-
-src_compile() {
-	tc-export AR CC
-	emake "${myisoconf[@]}"
-}
-
-_apply_linguas() {
-	mv "${D}"/usr/share/locale{,_ALL} || die
-	dodir /usr/share/locale
-	for lingua in ${LINGUAS}; do
-		[[ -d "${D}"/usr/share/locale_ALL/${lingua} ]] || break
-		mv "${D}"/usr/share/{locale_ALL/${lingua},locale/} || die
-	done
-	rm -R "${D}"/usr/share/locale_ALL || die
-}
-
-src_install() {
-	emake "${myisoconf[@]}" DESTDIR="${D}" install
-	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT *.txt
-
-	use nls && _apply_linguas  # bug 402679, bug 512448
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-containers/aardvark-dns/aardvark-dns-1.12.2-r1.ebuild b/app-containers/aardvark-dns/aardvark-dns-1.12.2-r1.ebuild
index 6eb7550f45c2..bdd917d608eb 100644
--- a/app-containers/aardvark-dns/aardvark-dns-1.12.2-r1.ebuild
+++ b/app-containers/aardvark-dns/aardvark-dns-1.12.2-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
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="${CARGO_CRATE_URIS}"
 	SRC_URI+="https://github.com/containers/aardvark-dns/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv"
 fi
 
 # main
diff --git a/app-containers/amazon-ecr-credential-helper/Manifest b/app-containers/amazon-ecr-credential-helper/Manifest
new file mode 100644
index 000000000000..1492792f460d
--- /dev/null
+++ b/app-containers/amazon-ecr-credential-helper/Manifest
@@ -0,0 +1,2 @@
+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
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/apptainer/Manifest b/app-containers/apptainer/Manifest
index cdb61e57210b..89b0f69c1d9e 100644
--- a/app-containers/apptainer/Manifest
+++ b/app-containers/apptainer/Manifest
@@ -1 +1,2 @@
 DIST apptainer-1.3.2.tar.gz 17129103 BLAKE2B a2c15d408dc956a4bc8cb154dadfe0e60aa8b4216277ff4afd508058f9425722fb66200e7d4ab33cf5a73aee34761ac198e7b31439ab69dfaceebb9f768b58e6 SHA512 c3112c8254c995f83e3ae424ecf734e8ca9583c34cd8b0e56fdde2a7ef8d5145ac68a7a2c9575b071515a2cb681d11423fe57a5a3910750d3bc697c85c15585d
+DIST apptainer-1.3.6.tar.gz 17129602 BLAKE2B 2dd17c1a0601c7d191d4604f2c0e3fb5d8cc4e831dba7bf4cfcbfc359eba1bb3f255ab2c1a81ae844cbebfc6e96729911e5ac4a92195b30f74d77fafac12059f SHA512 e50b8cbdac544241a56d7dc662ad927fdcf9a0f245bab4be0bc35ba9658f9db7c851a95de500e32c0975a2f5e8bcf7f16628e963ebb945ca036de9e91bd8a4a9
diff --git a/app-containers/apptainer/apptainer-1.3.6.ebuild b/app-containers/apptainer/apptainer-1.3.6.ebuild
new file mode 100644
index 000000000000..1adfbf38c500
--- /dev/null
+++ b/app-containers/apptainer/apptainer-1.3.6.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="The container system for secure high-performance computing"
+HOMEPAGE="https://apptainer.org/"
+SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples +network suid systemd"
+
+# Do not complain about CFLAGS etc. since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+DEPEND="app-crypt/gpgme
+	>=dev-lang/go-1.20.0
+	dev-libs/openssl
+	sys-apps/util-linux
+	sys-fs/cryptsetup
+	sys-fs/squashfs-tools
+	sys-libs/libseccomp
+	!suid? (
+		sys-fs/e2fsprogs[fuse]
+		sys-fs/squashfuse
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~SQUASHFS"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2-trim_upstream_cflags.patch
+)
+
+DOCS=( README.md CONTRIBUTORS.md CONTRIBUTING.md )
+
+src_configure() {
+	local myconfargs=(
+		-c "$(tc-getBUILD_CC)" \
+		-x "$(tc-getBUILD_CXX)" \
+		-C "$(tc-getCC)" \
+		-X "$(tc-getCXX)" \
+		--prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		--runstatedir="${EPREFIX}"/run \
+		--localstatedir="${EPREFIX}"/var \
+		$(usex network "" "--without-network") \
+		$(use_with suid)
+	)
+	./mconfig -v ${myconfargs[@]} || die "Error invoking mconfig"
+}
+
+src_compile() {
+	emake -C builddir
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C builddir install
+	keepdir /var/${PN}/mnt/session
+
+	if use systemd; then
+		sed -i -e '/systemd cgroups/ s/no/yes/' "${ED}"/etc/${PN}/${PN}.conf \
+			|| die "Failed to enable systemd use in configuration"
+	else
+		sed -i -e '/systemd cgroups/ s/yes/no/' "${ED}"/etc/${PN}/${PN}.conf \
+			|| die "Failed to disable systemd use in configuration"
+	fi
+
+	einstalldocs
+	if use examples; then
+		dodoc -r examples
+	fi
+}
+
+pkg_postinst() {
+	if ! use suid; then
+		local oldver
+		for oldver in ${REPLACING_VERSIONS}; do
+			if ver_test "${oldver}" -lt 1.1.0; then
+				ewarn "Since version 1.1.0 ${PN} no longer installs setuid-root components by default, relying on unprivileged user namespaces instead. For details, see https://apptainer.org/docs/admin/main/user_namespace.html"
+				ewarn "Make sure user namespaces (possibly except network ones for improved security) are enabled on your system, or re-enable installation of setuid root components by passing USE=suid to ${CATEGORY}/${PN}"
+				break
+			fi
+		done
+	fi
+}
diff --git a/app-containers/buildah/buildah-1.38.0.ebuild b/app-containers/buildah/buildah-1.38.0.ebuild
index 846ea4c76856..9ec7c2ddf698 100644
--- a/app-containers/buildah/buildah-1.38.0.ebuild
+++ b/app-containers/buildah/buildah-1.38.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
@@ -27,7 +27,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/containers/buildah.git"
 else
 	SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 fi
 
 RDEPEND="
diff --git a/app-containers/cadvisor/Manifest b/app-containers/cadvisor/Manifest
index cb18d0aa0fee..a6bc23693a0c 100644
--- a/app-containers/cadvisor/Manifest
+++ b/app-containers/cadvisor/Manifest
@@ -1,2 +1,4 @@
 DIST cadvisor-0.36.0-deps.tar.xz 149740960 BLAKE2B cff89f7661ed78addd1551b4353a93183c0fc317add01756a250429ad27a1b7c1c92fa6c1f0a129337204f89e85b1bfe16b1e17ff2ef7587f921ce1c9aaffdee SHA512 3e159c38fde84cb513bac3e2c3abce6ee1d4a60a2e77ba6a2c55e1abffde7df56c34b60e9b22379681d4d98575e4099f295735418bac8e960932183b9561c82a
 DIST cadvisor-0.36.0.tar.gz 6182273 BLAKE2B 0406bd88c6595f23de06be1e63e7c0affda7f94a3bbbb1b9e390f2747fdd3ef3199622a5003b79ed083a0cd80e6c013d7776e18269044150dafb98341c54425b SHA512 2da8a2e81d33b97e6f7c5ba3982e51b6d87748b138345ff94eb7671df851f0a535ceeef61358b0ee43bc161a88becdb153065bd7ff8fc9d7c390a4629ad10f02
+DIST cadvisor-0.49.2-deps.tar.xz 101993792 BLAKE2B c76a951b0741b513b7a700d9a31b6a0c49d0ae747375e9e968e77035d119a9351ba09e83c7d5d34bd081924e1fdccfd8851c9c7215d049c27da7469c63aab578 SHA512 2a104a236749bfcc1b785bf13352d217633c835beddf0c98219dd7dad602a36a934a2acf21975db06e72456ba15a01a5b685b9019f05f0d19e4eb562861478aa
+DIST cadvisor-0.49.2.tar.gz 1198084 BLAKE2B 7d4a28a22404f324c8cc0d956959bd397426b4fef8462d85bfd3cd5a1f9ec6f5add26c996cce9fb7e2edc382b592ca4cf1ff984371e32ad4fbc3daab050bfc67 SHA512 b789ab9d1b96b63edeeba2b474e9d6fb23bfb3c7e4778811fc92cc9b39084a70aaea991aa859b863a44d57934d0231c8ff5c48abfa6dce4b020827f6db3b5cb4
diff --git a/app-containers/cadvisor/cadvisor-0.49.2.ebuild b/app-containers/cadvisor/cadvisor-0.49.2.ebuild
new file mode 100644
index 000000000000..93c595db33e9
--- /dev/null
+++ b/app-containers/cadvisor/cadvisor-0.49.2.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 systemd
+
+COMMIT=6876475afe3755d62b65df0d32b005047fc69377
+
+DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
+HOMEPAGE="https://github.com/google/cadvisor"
+SRC_URI="https://github.com/google/cadvisor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/app-containers/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/cadvisor
+	acct-user/cadvisor"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	default
+	sed -i build/assets.sh -e "/go install/d"  || die
+	sed -i build/build.sh \
+		-e "/^version=/s/=.*/=${PV}/" \
+		-e "/^revision=/s/=.*/=${COMMIT}/" \
+		-e "/^branch=/s/=.*/=v${PV}/" || die
+}
+
+src_compile() {
+	GO_FLAGS="${GOFLAGS}" VERBOSE="true" emake build
+}
+
+src_test() {
+	GO_FLAGS="${GOFLAGS}" VERBOSE="true" emake test
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	dobin _output/${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-containers/cadvisor/files/cadvisor.service b/app-containers/cadvisor/files/cadvisor.service
new file mode 100644
index 000000000000..13966305156f
--- /dev/null
+++ b/app-containers/cadvisor/files/cadvisor.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=cAdvisor - Analyzes resource usage and performance characteristics of running containers
+Documentation=https://github.com/google/cadvisor
+After=network-online.target docker.socket
+
+[Service]
+User=cadvisor
+Restart=on-failure
+ExecStart=/usr/bin/cadvisor
+TimeoutStopSec=20s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index 208e0855f92d..237fcc5c6a63 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -1,8 +1,2 @@
-DIST containerd-1.7.15.tar.gz 10071827 BLAKE2B 91de9b7d777d53ecdab4af5bbb0d4ccbe755e4cf0fb7bc99a7bb15c66e0e11ad30aa2af685e0e8b0df80dbeef451704fa056a04b460d92adceebd290977febfc SHA512 84a94c7658a431cfd7a5321ac262d966f4291337ddff14211951b0d2025cd3af25a48175794d2b3a630ffc25ba03047579163546a4758a2fb5d1898cd233854f
-DIST containerd-1.7.19.tar.gz 10157428 BLAKE2B 3f51d63d4280a11ffe308c3e65df2fefdd91f543169501cf361bb8c6d5085b6b606cc3425508246ce872c86a475e2d195dd2473fee89a47548cfdfbd810307c2 SHA512 cb58bf5148381f9f0eba096e159592f294f887c5b17f8aaf6de8fed80c515abf4f08c849bbbd266dd85ede09fe709bf7d15a61a749f1136456329c47508dbe34
-DIST containerd-1.7.21.tar.gz 10188737 BLAKE2B 0a3eef5bd97b4249963d6e6b80652e2abef0ac7ece726d15efc3b1d364b3525ac7602afecfde3d376bdbec7d5ca39636e09dd8d2a96c420012ef4232afc2a6dd SHA512 fba998c8d7f2907b3e5fb09c3947c3272661ec33379c611c5110ca0151812adcd70ff6b837e97a5d4228d685902276eeb98cd82bb4c46149686e169e81943c75
-DIST containerd-1.7.22.tar.gz 10189969 BLAKE2B b1fac9764a8bac0b883849786bd20c9a8e64d764186c6362978faec5ba360636caccc6c1a7c51c6781aa51f96a4e713968d1e86b54b6fe2fa9e3dfcc07727e64 SHA512 9572f2b0f49365cc3888999a0c0b7d29694922f0cbefb33e1fbbfc71781cde402537da3a23e36fd3a600a1d819bcef9acbeee423df2699fa9e3f07cfde7f9128
-DIST containerd-1.7.23.tar.gz 10192816 BLAKE2B 592e3a1992a637879f1669a660991f811db6f3d11a788c9809277b3fb9639d8b89445cbbca1de16ed45703e8506c8850d9ce68b64d1213817732d008a1847ea6 SHA512 4cb003a6ef2f9fe856665c3b7099e13b23cf07c77ed9a9ed50988d74de1933e3fe9463ae123635230f25cde38cd8a487133b11e20d829a79517c4d7fbe2ce012
-DIST containerd-1.7.24.tar.gz 10196410 BLAKE2B be5238208170f63e7328627a4407da3eefa2c03051c95228bc26dac04560c564330ae118e1b01fcbd22983073b9fe25161f1da7698449507cd8222f41ff59eba SHA512 eba2d562f336ffac981b67d2574c5951774f4c6a70ad1cc8aabb59204d1c8e9aa5b3be50c048bf04a018be1335b7ec8e47b73013de2e19805c978587b53bc85e
-DIST containerd-2.0.0.tar.gz 10420188 BLAKE2B 4a75c845cabf3e0213a7cd312febc0c45b127b5b70caa5b6843e669b554e4fa65112585f3b16382180539527144d2371f02bc791cb01415eb60ad01d17f0065a SHA512 b1a89c4c53db2c69757bc40d90d585e2662ab4fffb28acb904f9710b281a9f22273ecdbab49250b229bf95b29cf1a33a352afb81967db7580ae209a83c5fb2ea
 DIST containerd-2.0.1.tar.gz 10423945 BLAKE2B 7f77678557bf649c71475d3ff08a57579b8959ef19a5f8fc1c27b8e8eacea01572d44d3f6dff1f53b72c1b7cf153413a5152391a78b0d5bd624a4c5267381144 SHA512 7875eee0fb274545acb4d62f5bca808105580177db6007e59164fd57830ea3e8ab646b8e227027016bf8dd4816341d38a620bfef48bb0fd83de006b1a91826b7
+DIST containerd-2.0.2.tar.gz 10379986 BLAKE2B aee39f749f056965b899f6525bebe00d46b72b6c437efbd01ed890c5ae9c5d812464bc6d10e32aea20fd0c6df00d98cd30502dd73f9a27b0d8d143a5542976d9 SHA512 86eb24acfa5d4d87ae396f8888e2484693823fad897a29f1a5ada78e2318640927cfcff1e85415bfd6c66f5417e582203eb94976d52e3dd373997e6e2cbae354
diff --git a/app-containers/containerd/containerd-1.7.15.ebuild b/app-containers/containerd/containerd-1.7.15.ebuild
deleted file mode 100644
index 4d421941b684..000000000000
--- a/app-containers/containerd/containerd-1.7.15.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_REVISION=926c9586fe4a6236699318391cd44976a98e31f1
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${DEPEND}
-	~app-containers/runc-1.1.12[apparmor?,seccomp?]
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-RESTRICT+="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/-s -w//" \
-		-e "s/-mod=readonly//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION="${GIT_REVISION}"
-		VERSION=v${PV}
-	)
-
-	# race condition in man target https://bugs.gentoo.org/765100
-	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-	rm "${D}"/bin/gen-manpages
-	dobin bin/*
-	doman man/*
-	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
diff --git a/app-containers/containerd/containerd-1.7.19.ebuild b/app-containers/containerd/containerd-1.7.19.ebuild
deleted file mode 100644
index 964617a43951..000000000000
--- a/app-containers/containerd/containerd-1.7.19.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_REVISION=2bf793ef6dc9a18e00cb12efb64355c2c9d5eb41
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${DEPEND}
-	~app-containers/runc-1.1.13[apparmor?,seccomp?]
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-RESTRICT+="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/-s -w//" \
-		-e "s/-mod=readonly//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION="${GIT_REVISION}"
-		VERSION=v${PV}
-	)
-
-	# race condition in man target https://bugs.gentoo.org/765100
-	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-	rm "${D}"/bin/gen-manpages
-	dobin bin/*
-	doman man/*
-	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
diff --git a/app-containers/containerd/containerd-1.7.21.ebuild b/app-containers/containerd/containerd-1.7.21.ebuild
deleted file mode 100644
index f558099e86a6..000000000000
--- a/app-containers/containerd/containerd-1.7.21.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_REVISION=472731909fa34bd7bc9c087e4c27943f9835f111
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-COMMON_DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-DEPEND="
-${COMMON_DEPEND}
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${COMMON_DEPEND}
-	~app-containers/runc-1.1.13[apparmor?,seccomp?]
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-RESTRICT+="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/-s -w//" \
-		-e "s/-mod=readonly//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION="${GIT_REVISION}"
-		VERSION=v${PV}
-	)
-
-	# race condition in man target https://bugs.gentoo.org/765100
-	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-	rm "${D}"/bin/gen-manpages
-	dobin bin/*
-	doman man/*
-	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
diff --git a/app-containers/containerd/containerd-1.7.22.ebuild b/app-containers/containerd/containerd-1.7.22.ebuild
deleted file mode 100644
index 1399f6ef7ba4..000000000000
--- a/app-containers/containerd/containerd-1.7.22.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_REVISION=b2ce781edcbd6cb758f172ecab61c79d607cc41d
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-COMMON_DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-DEPEND="
-${COMMON_DEPEND}
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${COMMON_DEPEND}
-	~app-containers/runc-1.1.14[apparmor?,seccomp?]
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-RESTRICT+="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/-s -w//" \
-		-e "s/-mod=readonly//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION="${GIT_REVISION}"
-		VERSION=v${PV}
-	)
-
-	# race condition in man target https://bugs.gentoo.org/765100
-	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-	rm bin/gen-manpages || die
-	dobin bin/*
-	doman man/*
-	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
diff --git a/app-containers/containerd/containerd-1.7.23.ebuild b/app-containers/containerd/containerd-1.7.23.ebuild
deleted file mode 100644
index c974b09a3845..000000000000
--- a/app-containers/containerd/containerd-1.7.23.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_REVISION=57f17b0a6295a39009d861b89e3b3b87b005ca27
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-COMMON_DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-DEPEND="
-${COMMON_DEPEND}
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${COMMON_DEPEND}
-	~app-containers/runc-1.1.14[apparmor?,seccomp?]
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-RESTRICT+="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/-s -w//" \
-		-e "s/-mod=readonly//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION="${GIT_REVISION}"
-		VERSION=v${PV}
-	)
-
-	# race condition in man target https://bugs.gentoo.org/765100
-	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-	rm bin/gen-manpages || die
-	dobin bin/*
-	doman man/*
-	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
diff --git a/app-containers/containerd/containerd-1.7.24.ebuild b/app-containers/containerd/containerd-1.7.24.ebuild
deleted file mode 100644
index 7e9f508cd288..000000000000
--- a/app-containers/containerd/containerd-1.7.24.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_REVISION=88bf19b2105c8b17560993bee28a01ddc2f97182
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-COMMON_DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-DEPEND="
-${COMMON_DEPEND}
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${COMMON_DEPEND}
-	~app-containers/runc-1.2.2[apparmor?,seccomp?]
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-RESTRICT+="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/-s -w//" \
-		-e "s/-mod=readonly//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION="${GIT_REVISION}"
-		VERSION=v${PV}
-	)
-
-	# race condition in man target https://bugs.gentoo.org/765100
-	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-	rm bin/gen-manpages || die
-	dobin bin/*
-	doman man/*
-	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
diff --git a/app-containers/containerd/containerd-2.0.0-r1.ebuild b/app-containers/containerd/containerd-2.0.0-r1.ebuild
deleted file mode 100644
index 41fa3c68f10e..000000000000
--- a/app-containers/containerd/containerd-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_REVISION=88bf19b2105c8b17560993bee28a01ddc2f97182
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-COMMON_DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-DEPEND="
-${COMMON_DEPEND}
-"
-
-# recommended minimum version of runc is found in script/setup/runc-version
-RDEPEND="
-	${COMMON_DEPEND}
-	>=app-containers/runc-1.2.1[apparmor?,seccomp?]
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-RESTRICT+="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/-s -w//" \
-		-e "s/-mod=readonly//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION="${GIT_REVISION}"
-		VERSION=v${PV}
-	)
-
-	# race condition in man target https://bugs.gentoo.org/765100
-	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-	rm bin/gen-manpages || die
-	dobin bin/*
-	doman man/*
-	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
diff --git a/app-containers/containerd/containerd-2.0.0.ebuild b/app-containers/containerd/containerd-2.0.0.ebuild
deleted file mode 100644
index 5f1930094da4..000000000000
--- a/app-containers/containerd/containerd-2.0.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_REVISION=88bf19b2105c8b17560993bee28a01ddc2f97182
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-COMMON_DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-DEPEND="
-${COMMON_DEPEND}
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${COMMON_DEPEND}
-	~app-containers/runc-1.2.1[apparmor?,seccomp?]
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-RESTRICT+="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/-s -w//" \
-		-e "s/-mod=readonly//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION="${GIT_REVISION}"
-		VERSION=v${PV}
-	)
-
-	# race condition in man target https://bugs.gentoo.org/765100
-	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-	rm bin/gen-manpages || die
-	dobin bin/*
-	doman man/*
-	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
diff --git a/app-containers/containerd/containerd-2.0.1.ebuild b/app-containers/containerd/containerd-2.0.1.ebuild
index b375d170ea25..82e4dbe7a8d6 100644
--- a/app-containers/containerd/containerd-2.0.1.ebuild
+++ b/app-containers/containerd/containerd-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-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/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 COMMON_DEPEND="
diff --git a/app-containers/containerd/containerd-2.0.2.ebuild b/app-containers/containerd/containerd-2.0.2.ebuild
new file mode 100644
index 000000000000..37fb931e5186
--- /dev/null
+++ b/app-containers/containerd/containerd-2.0.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+GIT_REVISION=c507a0257ea6462fbd6f5ba4f5c74facb04021f4
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+COMMON_DEPEND="
+	btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )
+"
+
+DEPEND="
+${COMMON_DEPEND}
+"
+
+# recommended minimum version of runc is found in script/setup/runc-version
+RDEPEND="
+	${COMMON_DEPEND}
+	>=app-containers/runc-1.2.4[apparmor?,seccomp?]
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+
+# tests require root or docker
+RESTRICT+="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s/-s -w//" \
+		-e "s/-mod=readonly//" \
+		Makefile || die
+	sed -i \
+		-e "s:/usr/local:/usr:" \
+		containerd.service || die
+}
+
+src_compile() {
+	local options=(
+		$(usev apparmor)
+		$(usex btrfs "" "no_btrfs")
+		$(usex cri "" "no_cri")
+		$(usex device-mapper "" "no_devmapper")
+		$(usev seccomp)
+		$(usev selinux)
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+		REVISION="${GIT_REVISION}"
+		VERSION=v${PV}
+	)
+
+	# race condition in man target https://bugs.gentoo.org/765100
+	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
+	emake "${myemakeargs[@]}" man -j1 #nowarn
+	emake "${myemakeargs[@]}" all
+
+}
+
+src_install() {
+	rm bin/gen-manpages || die
+	dobin bin/*
+	doman man/*
+	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
+	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+	systemd_dounit containerd.service
+	keepdir /var/lib/containerd
+
+	# we already installed manpages, remove markdown source
+	# before installing docs directory
+	rm -r docs/man || die
+
+	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
+	einstalldocs
+}
diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest
index bcb3c04ac308..37f5f98f8931 100644
--- a/app-containers/containers-common/Manifest
+++ b/app-containers/containers-common/Manifest
@@ -1,4 +1,2 @@
-DIST containers-common-0.57.0.tar.gz 12700958 BLAKE2B 8432a7d839b94b59eabd75d4978a4d0c1340a64ed626db74e74a8318e08c61172bfba5e4f4c4b0dfffec302c5a310bb5be8fad3ab4d91a6d89ced373a0a6f297 SHA512 b993821040788085ff44e48023a64cea4e3e7e50731c359087bd287168e6849a543d930acbdaff2437fc7951acc46f7183f337dd977215eca814332e6869d1e3
-DIST containers-common-0.58.0.tar.gz 13164567 BLAKE2B 17795eec2d38b4d8b9d6afeb20e249208c5ae2ac767a365ef7313d1e7c36eadb9a9eb284a657dfe3f4fcb0577448d4883fabbad76e0318425fdc03809e27cd7c SHA512 6f569d68d3b0e5ead304c7f23341808d66a47b6352c772d353d50c5f4777cd8a5a5b85d6faaf2887f828c17ec49b9c5f929177a67294b5bbb69baa80656982a8
 DIST containers-common-0.59.1.tar.gz 13131960 BLAKE2B 5b3b947789f889955716816fa15a84eb2f398d6cfb59c85bd969442fb8f55715f2c17c78d963ae913d96e6a109f69da745cfc7db8d23e2ed6516f992b982dda0 SHA512 452c9b84f7631afdf39b7b1fcaf2f721bede312d8fb55b89a953f16ca3546c0df11bb23c99588a592b6375275516d1364570261fbc15301ca3ad486ee66eae32
 DIST containers-common-0.60.4.tar.gz 13106900 BLAKE2B 1afb428044bc8eebd002b884f2a2072971cd83fca561fd509b83088ccdf82b3a62d63ff32ec5ef856c3d0ee0ffac316201fa8f1d7956153ce30e2244cc860f02 SHA512 5d61415d4959486223a36ff98304363a558e6da9ccbdca94f976649a37d404ac00c8454019f60a79360029c91c9565d22868b109dbb84c19f13377e0e23dcc4d
diff --git a/app-containers/containers-common/containers-common-0.57.0-r1.ebuild b/app-containers/containers-common/containers-common-0.57.0-r1.ebuild
deleted file mode 100644
index 3cb764cb31ce..000000000000
--- a/app-containers/containers-common/containers-common-0.57.0-r1.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
-
-DESCRIPTION="Common config files and docs for Containers stack"
-HOMEPAGE="https://github.com/containers/common"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/common.git"
-else
-	SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="amd64 arm64 ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-RESTRICT="test"
-RDEPEND="
-	>=app-containers/containers-image-5.29.2
-	app-containers/containers-storage
-	app-containers/containers-shortnames
-	!<app-containers/podman-4.5.0-r1
-	net-firewall/nftables
-	net-firewall/iptables[nftables]
-	|| ( app-containers/crun app-containers/runc )
-	|| (
-		( >=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 )
-		>=app-containers/cni-plugins-0.9.1
-	)
-"
-
-BDEPEND="
-	>=dev-go/go-md2man-2.0.2
-"
-
-src_prepare() {
-	default
-
-	[[ -f docs/Makefile && -f Makefile ]] || die
-	sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die
-
-	# add comments to mounts.conf
-	eapply "${FILESDIR}/examplify-mounts-conf.patch"
-}
-
-src_compile() {
-	emake docs
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	insinto /usr/share/containers
-	doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
-
-	keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore
-}
diff --git a/app-containers/containers-common/containers-common-0.58.0-r1.ebuild b/app-containers/containers-common/containers-common-0.58.0-r1.ebuild
deleted file mode 100644
index 4a0427e20df7..000000000000
--- a/app-containers/containers-common/containers-common-0.58.0-r1.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 readme.gentoo-r1
-
-DESCRIPTION="Common config files and docs for Containers stack"
-HOMEPAGE="https://github.com/containers/common"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/common.git"
-else
-	SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-RESTRICT="test"
-RDEPEND="
-	>=app-containers/aardvark-dns-1.10.0
-	>=app-containers/crun-1.14.3
-	>=app-containers/containers-image-5.30.0
-	>=app-containers/containers-storage-1.53.0
-	app-containers/containers-shortnames
-	>=app-containers/netavark-1.10.3
-	net-firewall/nftables
-	net-firewall/iptables[nftables]
-	>=net-misc/passt-2024.03.20
-	>=sys-fs/fuse-overlayfs-1.13
-"
-
-BDEPEND="
-	>=dev-go/go-md2man-2.0.3
-"
-
-PATCHES=(
-	"${FILESDIR}/examplify-mounts-conf.patch"
-)
-
-DOC_CONTENTS="\n
-For rootless operations, one needs to configure subuid(5) and subgid(5)\n
-See /etc/sub{uid,gid} to check whether rootless user is already configured\n
-If not, quickly configure it with:\n
-usermod --add-subuids 1065536-1131071 <rootless user>\n
-usermod --add-subgids 1065536-1131071 <rootless user>\n
-"
-
-src_prepare() {
-	default
-
-	[[ -f docs/Makefile && -f Makefile ]] || die
-	sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die
-}
-
-src_compile() {
-	emake docs
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	readme.gentoo_create_doc
-
-	insinto /usr/share/containers
-	doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
-
-	keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-containers/containers-common/containers-common-0.60.4.ebuild b/app-containers/containers-common/containers-common-0.60.4.ebuild
index 985ebb5c0ca4..d49ffa4b4dad 100644
--- a/app-containers/containers-common/containers-common-0.60.4.ebuild
+++ b/app-containers/containers-common/containers-common-0.60.4.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 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/containers-image/Manifest b/app-containers/containers-image/Manifest
index f1adcbdab4a1..c08b5f79dd8a 100644
--- a/app-containers/containers-image/Manifest
+++ b/app-containers/containers-image/Manifest
@@ -1,3 +1,2 @@
-DIST containers-image-5.29.2.tar.gz 707618 BLAKE2B f1556cbb26ceedd74a338355caf8b557c43286726f4be63544cebc9a8f4b92be78d7a0cddbedaba7352d13e9fc399f62ee114caba6c8b1ecc334dab1379e523b SHA512 f3f6e09670dc393067992a78303f01e2584dabe79ba156973a50d7a460c011e5a27d0ccdf0ff6b399099a9a3a4c57f3badf24fb5d0704efd645ab7196a544d8f
 DIST containers-image-5.30.0.tar.gz 719070 BLAKE2B 5952ab703b6df793f326dd4fc82f50c5f672e2b9d142e0bc706014092420e3563599d9f1c1f65f743e1a8144b91f92b2326d7bf4c3024b5efb466d777a8ad613 SHA512 89cd0d482bb5d70037ff51413b7abca01d36bc7f39e9dc130c78462e501dae32193137a367d81532afd216a7432e127728147e6e839d5d99eeb6b6680f31d4dc
 DIST containers-image-5.32.2.tar.gz 735422 BLAKE2B a0585c877b4679226d1760bf873ceeb5cba7f5177ab83fa6f8a161b1f3958f3d660445556b13b4221712c241cee94429cabdb1fd4186d4dc6edba7b032fce2bc SHA512 7498f9e446b2c205b033703641f7cfcb6c8bd8f097b12ef3f734c94772d63fc7b9b40a6700d53d93919d2c34772f079aa3cb7d9f9e5a130b6587f4fe2a558df6
diff --git a/app-containers/containers-image/containers-image-5.29.2-r1.ebuild b/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
deleted file mode 100644
index 5a0b9d37566c..000000000000
--- a/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Default config and docs related to Containers' images"
-HOMEPAGE="https://github.com/containers/image"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/image.git"
-else
-	SRC_URI="https://github.com/containers/image/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="amd64 arm64 ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
-RESTRICT='test'
-BDEPEND=">=dev-go/go-md2man-2.0.3"
-RDEPEND="!<=app-containers/containers-common-0.57.0"
-PATCHES=(
-	"${FILESDIR}"/moving-policy-json-default-yaml.patch
-	"${FILESDIR}"/prevent-downloading-mods-5.29.2.patch
-)
-
-src_compile() {
-	emake docs
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	insinto /etc/containers
-	doins registries.conf
-}
diff --git a/app-containers/containers-image/containers-image-5.32.2.ebuild b/app-containers/containers-image/containers-image-5.32.2.ebuild
index 2b3c1bcb8666..4226aabc608e 100644
--- a/app-containers/containers-image/containers-image-5.32.2.ebuild
+++ b/app-containers/containers-image/containers-image-5.32.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
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/image/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/containers-image/files/moving-policy-json-default-yaml.patch b/app-containers/containers-image/files/moving-policy-json-default-yaml.patch
deleted file mode 100644
index 1713839371a5..000000000000
--- a/app-containers/containers-image/files/moving-policy-json-default-yaml.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 45441676e34e6410ae8af6dbb46b6161c5c81a7c Mon Sep 17 00:00:00 2001
-From: Rahil Bhimjiani <me@rahil.website>
-Date: Thu, 7 Dec 2023 14:12:26 +0530
-Subject: [PATCH] Moving policy.json and default.yaml from containers/skopeo
-
-It makes more sense to keep these 2 files along with their man
-pages...in c/image
-https://github.com/containers/common/pull/1757
-
-Signed-off-by: Rahil Bhimjiani <me@rahil.website>
----
- Makefile            | 11 +++++++++++
- default-policy.json | 14 ++++++++++++++
- default.yaml        | 27 +++++++++++++++++++++++++++
- 3 files changed, 52 insertions(+)
- create mode 100644 default-policy.json
- create mode 100644 default.yaml
-
-diff --git a/Makefile b/Makefile
-index f329ef083..5e9799b19 100644
---- a/Makefile
-+++ b/Makefile
-@@ -24,6 +24,13 @@ GOMD2MAN ?= $(shell command -v go-md2man || echo '$(GOBIN)/go-md2man')
- MANPAGES_MD = $(wildcard docs/*.5.md)
- MANPAGES ?= $(MANPAGES_MD:%.md=%)
- 
-+ifeq ($(shell uname -s),FreeBSD)
-+CONTAINERSCONFDIR ?= /usr/local/etc/containers
-+else
-+CONTAINERSCONFDIR ?= /etc/containers
-+endif
-+REGISTRIESDDIR ?= ${CONTAINERSCONFDIR}/registries.d
-+
- # N/B: This value is managed by Renovate, manual changes are
- # possible, as long as they don't disturb the formatting
- # (i.e. DO NOT ADD A 'v' prefix!)
-@@ -46,6 +53,10 @@ install-docs: docs
- 	install -m 644 docs/*.5 ${MANINSTALLDIR}/man5/
- 
- install: install-docs
-+	install -d -m 755 ${DESTDIR}${CONTAINERSCONFDIR}
-+	install -m 644 default-policy.json ${DESTDIR}${CONTAINERSCONFDIR}/policy.json
-+	install -d -m 755 ${DESTDIR}${REGISTRIESDDIR}
-+	install -m 644 default.yaml ${DESTDIR}${REGISTRIESDDIR}/default.yaml
- 
- cross:
- 	GOOS=windows $(MAKE) build BUILDTAGS="$(BUILDTAGS) $(BUILD_TAGS_WINDOWS_CROSS)"
-diff --git a/default-policy.json b/default-policy.json
-new file mode 100644
-index 000000000..dffc54a62
---- /dev/null
-+++ b/default-policy.json
-@@ -0,0 +1,14 @@
-+{
-+    "default": [
-+        {
-+            "type": "insecureAcceptAnything"
-+        }
-+    ],
-+    "transports":
-+        {
-+            "docker-daemon":
-+                {
-+                    "": [{"type":"insecureAcceptAnything"}]
-+                }
-+        }
-+}
-diff --git a/default.yaml b/default.yaml
-new file mode 100644
-index 000000000..9e892d760
---- /dev/null
-+++ b/default.yaml
-@@ -0,0 +1,27 @@
-+# This is a default registries.d configuration file.  You may
-+# add to this file or create additional files in registries.d/.
-+#
-+# lookaside: for reading/writing simple signing signatures
-+# lookaside-staging: for writing simple signing signatures, preferred over lookaside
-+#
-+# lookaside and lookaside-staging take a value of the following:
-+#   lookaside:  {schema}://location
-+#
-+# For reading signatures, schema may be http, https, or file.
-+# For writing signatures, schema may only be file.
-+
-+# The default locations are built-in, for both reading and writing:
-+# /var/lib/containers/sigstore for root, or
-+# ~/.local/share/containers/sigstore for non-root users.
-+default-docker:
-+#  lookaside: https://…
-+#  lookaside-staging: file:///…
-+
-+# The 'docker' indicator here is the start of the configuration
-+# for docker registries.
-+#
-+# docker:
-+#
-+#   privateregistry.com:
-+#    lookaside: https://privateregistry.com/sigstore/
-+#    lookaside-staging: /mnt/nfs/privateregistry/sigstore
diff --git a/app-containers/containers-image/files/prevent-downloading-mods-5.29.2.patch b/app-containers/containers-image/files/prevent-downloading-mods-5.29.2.patch
deleted file mode 100644
index 8d70156bfb6f..000000000000
--- a/app-containers/containers-image/files/prevent-downloading-mods-5.29.2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -15,7 +15,6 @@
- BUILDTAGS = btrfs_noversion libdm_no_deferred_remove
- BUILDFLAGS := -tags "$(BUILDTAGS)"
- 
--PACKAGES := $(shell GO111MODULE=on go list $(BUILDFLAGS) ./...)
- SOURCE_DIRS = $(shell echo $(PACKAGES) | awk 'BEGIN{FS="/"; RS=" "}{print $$4}' | uniq)
- 
- PREFIX ?= ${DESTDIR}/usr
diff --git a/app-containers/cosign/cosign-2.4.0.ebuild b/app-containers/cosign/cosign-2.4.0.ebuild
index de622f965ee3..70638b1898d9 100644
--- a/app-containers/cosign/cosign-2.4.0.ebuild
+++ b/app-containers/cosign/cosign-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RESTRICT="test"
 
diff --git a/app-containers/cosign/metadata.xml b/app-containers/cosign/metadata.xml
index db463f3eeb66..dfccbfcf246c 100644
--- a/app-containers/cosign/metadata.xml
+++ b/app-containers/cosign/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">sigstore/cosign</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-containers/cri-o/Manifest b/app-containers/cri-o/Manifest
index cc00c81c09d8..7e0049ba9acd 100644
--- a/app-containers/cri-o/Manifest
+++ b/app-containers/cri-o/Manifest
@@ -1 +1,2 @@
 DIST cri-o-1.31.2.tar.gz 19921920 BLAKE2B 4e60c15d73691dabab8f7f1229b0b8e534393128a53cd31639509454286ec237cf5e6bf258c8e06478b76b872b6e1e8d3481b19a277be4c0bf756b1a6d858d95 SHA512 be42d08ee2a9d030d9279dee269d121822de5c74aafa765688c91383a284cda890aa969a5a2b0649835893bd3b382e6bf2a1f81991710b479b4159877e0626aa
+DIST cri-o-1.31.4.tar.gz 19919611 BLAKE2B b9c2a855c8f8b780e4f77172dab0070cf9fa96216c1b03d1c06b42ac1385dbd9e57e4dadd88a54c4c0dde8366dda95293c1763c3fec554b79573ddd8da02aa6e SHA512 c10cb633a2bbc7c3d0fdbae7b5541fc948804ca797a71532e0dcd783d0e56158650ea93d3cce36995922e04f9f22c27c4255bc40a81930e263ebb0c710372a06
diff --git a/app-containers/cri-o/cri-o-1.31.4.ebuild b/app-containers/cri-o/cri-o-1.31.4.ebuild
new file mode 100644
index 000000000000..3bc77ec3ed72
--- /dev/null
+++ b/app-containers/cri-o/cri-o-1.31.4.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_COMMIT=33d75981bee230f791709975125d7386fe2c530a
+
+inherit go-module
+
+DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
+HOMEPAGE="https://cri-o.io/"
+SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="btrfs +device-mapper selinux systemd"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	app-containers/conmon
+	app-containers/runc
+	dev-libs/glib:=
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	net-firewall/conntrack-tools
+	net-firewall/iptables
+	app-containers/cni-plugins
+	net-misc/socat
+	sys-apps/iproute2
+	sys-libs/libseccomp:=
+	btrfs? ( sys-fs/btrfs-progs )
+	device-mapper? ( sys-fs/lvm2:= )
+	selinux? ( sys-libs/libselinux:= )
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}
+	!<app-containers/podman-1.3.2-r1
+	selinux? ( sec-policy/selinux-crio )"
+BDEPEND="sys-apps/which"
+
+src_prepare() {
+	default
+
+	sed -e '/^export GOPROXY=/d' \
+		-e '/^GIT_.*/d' \
+		-e '/	git diff --exit-code/d' \
+		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
+		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
+		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
+		-e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
+		-i Makefile || die
+
+	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
+
+	sed -e 's:/usr/local/bin:/usr/bin:' \
+		-i contrib/systemd/* || die
+}
+
+src_compile() {
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+		hack/btrfs_installed_tag.sh || die; }
+
+	[[ -f hack/libdm_installed.sh ]] || die
+	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
+		hack/libdm_installed.sh || die; }
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		hack/selinux_tag.sh || die; }
+
+	mkdir -p bin || die
+	emake all \
+		GOBIN="${S}/bin" \
+		GO_BUILD="go build ${GOFLAGS}" \
+		GO_MD2MAN="$(which go-md2man)"
+}
+
+src_install() {
+	emake install install.config install.systemd \
+		DESTDIR="${D}" \
+		GO_MD2MAN="$(which go-md2man)" \
+		PREFIX="${D}${EPREFIX}/usr"
+	keepdir /etc/crio
+	mv "${ED}/etc/crio/crio.conf"{,.example} || die
+
+	newinitd "${FILESDIR}/crio.initd" crio
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+
+	# Suppress crio log error messages triggered if these don't exist.
+	keepdir /etc/containers/oci/hooks.d
+	keepdir /usr/share/containers/oci/hooks.d
+
+	# Suppress crio "Missing CNI default network" log message.
+	keepdir /etc/cni/net.d
+	insinto /etc/cni/net.d
+	doins contrib/cni/99-loopback.conflist
+}
diff --git a/app-containers/cri-tools/Manifest b/app-containers/cri-tools/Manifest
index ee719ecb7abb..797cfd9fdb52 100644
--- a/app-containers/cri-tools/Manifest
+++ b/app-containers/cri-tools/Manifest
@@ -1,4 +1,2 @@
-DIST cri-tools-1.25.0.tar.gz 7905707 BLAKE2B 79595f31fc22aff608406bad4319a60dddcabda5f4dab8706305f11500b3db43f1d7021a340a096227d4580212953f32a95b05bbf81c1236f8fa8cf635017abb SHA512 dc04359320d59d6b3789e4e81fb613f3795b7e82dbad681393eaeff2c876e5b0393dd9384d7857d24ada5de34d03e151f7cf121367cc20e71d0b78607372b3a1
 DIST cri-tools-1.27.0.tar.gz 8465050 BLAKE2B d6c0429271ebc4085e75b54d7f3b9f75ab796e63bc9ae7562105296b13bbad8b512293a7d25abf1ab946f4bf54e672016fdb72696c12c730d21ac74724da465c SHA512 b94122e6401eb0c33b9c3d112274b7ab20cbbad05e76a54933e79d2e42ded2d684771cb9ed703a6c1afa381844142b6f1b4dc77d17e915f9a42c236fd8426b9b
-DIST cri-tools-1.31.1.tar.gz 7830559 BLAKE2B 5ec935be8d453a2d024fb8b07c8c7a21a15c23c7aba03b9030806c5ed47698f41a5167b02c3d38e792fec035725fccdff92867e68c5b2c8a06ff040e4c37cc9e SHA512 a72946944207d20f27236da12f7c2d532a1c9ebc881c3af4709494f7abc6f7b2d421934006a535a0b4a35926f09f58315ff0aaf4da870fd5a65281f547ef86a1
 DIST cri-tools-1.32.0.tar.gz 7682096 BLAKE2B 125fc9014942e681353ef49d4d397af4fc77500c0fb37d2d1be0850839c37f51f2ef41b5c7d9ca422e814d1fe50f985bfd42d2bba11d391cea66b3bec381dc08 SHA512 654cfd4d546932d48c02e19071e137fa7565a5134ba1845498d61f2dfef45fca722a51dbadb7a467214f7424290c53cb79a2908684d1fbd3820836b55640f66d
diff --git a/app-containers/cri-tools/cri-tools-1.25.0.ebuild b/app-containers/cri-tools/cri-tools-1.25.0.ebuild
deleted file mode 100644
index 67c3e8b38870..000000000000
--- a/app-containers/cri-tools/cri-tools-1.25.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
-HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
-SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-DEPEND="dev-lang/go"
-
-RESTRICT+=" test"
-
-src_compile() {
-	emake VERSION="${PV}"
-	./build/bin/crictl completion bash > "crictl.bash" || die
-	./build/bin/crictl completion zsh > "crictl.zsh" || die
-}
-
-src_install() {
-	dobin ./build/bin/crictl
-
-	newbashcomp crictl.bash crictl
-	insinto /usr/share/zsh/site-functions
-	newins crictl.zsh _crictl
-
-	dodoc -r docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md
-}
diff --git a/app-containers/cri-tools/cri-tools-1.31.1.ebuild b/app-containers/cri-tools/cri-tools-1.31.1.ebuild
deleted file mode 100644
index 21381a7af4bb..000000000000
--- a/app-containers/cri-tools/cri-tools-1.31.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
-HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
-SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-DOCS=( docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md )
-
-src_compile() {
-	emake VERSION="${PV}"
-	find build/ -name crictl -exec cp {} build/bin/ \; || die
-	./build/bin/crictl completion bash > "crictl.bash" || die
-	./build/bin/crictl completion zsh > "crictl.zsh" || die
-}
-
-src_install() {
-	einstalldocs
-
-	dobin ./build/bin/crictl
-	newbashcomp crictl.bash crictl
-	insinto /usr/share/zsh/site-functions
-	newins crictl.zsh _crictl
-}
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/crun/Manifest b/app-containers/crun/Manifest
index 6681d587bded..1623112afe6a 100644
--- a/app-containers/crun/Manifest
+++ b/app-containers/crun/Manifest
@@ -1,5 +1,4 @@
-DIST crun-1.11.2.tar.xz 738176 BLAKE2B ef13475089c87599159ce00dd26fbb19c7f2bb9564352c1f8040925e521bb924cf28a8d1f37cc95ce7d1b2797b8654740e9ad08352e357c8c9e2d176466101e0 SHA512 ae35ffb9bd1c7acebfd7f6236fa6a7ad524593d8f2cea1203f0e89023e9791d2d5bbc5c5cfc32ee5f18ad80662a1659076ab5f4d5ff74c6026842f2dd12be977
 DIST crun-1.14.3.tar.xz 750456 BLAKE2B 5a63b5da2f85ff1a83d4589be224c5b7a1123b6d7714b90a63c1907b78d42392aff25ffe5d9a4127173ac47026d57e9c93a39f5ba4b07de7f9f3722c14e6d203 SHA512 d6645c519ff00dda5def6d58240600d15e76969489918d51c0def2fee7dbad6374f83e5afc14a998d176aa2944765df5cd84c3031b265a1931ab23f2fc965fc1
 DIST crun-1.16.tar.gz 1759549 BLAKE2B 1dfdf9177ae52e627c92e70e48a558bb355c87f629e95f1debaf6b7d8c38802110bd796545d5b2dbe3cac7f8de1f9c94e9b5f046cc618e73afd4c434188d585c SHA512 718e17abdb8c2a9e1fdd39f09e7e3e435d88c5785cc13c1e67f492847d7d938cf399aecc055ecf88720fa8f73b8539f057e3b0e53f10f4e382f5664a2243b959
 DIST crun-1.17.tar.gz 1773153 BLAKE2B 9f75cb6879e0b8cd47bb8939c1cf6f88d5e13e6d8932c652ea20c64501bc69fbda84dd061866a9c08e353848f39d1022bf67fbc0d160d5ef7fdc08c1edec03f9 SHA512 7556467c5e0e93bb7321e2e88de8a2f537340e3e0acaa5501eab8deb0f4bb93c4561f8d063156789d3ee98fdd49069fc52c0ed0c773bd44db476eeeccc16aa1a
-DIST crun-1.8.4.tar.xz 729552 BLAKE2B 8169518a0ddd8deb3820f7030d03dec6941d5d34fb73a036b82f15b0d8f2f702e117de00b829a16cb9976e118f5a5ca732b1cd572708f664cfeafc564f883824 SHA512 2ed80db2e7ddd1438bbe33e99ec2cdbcc55c4869504f719ff9302e834929752af09a59cd905accb37ee5f6cae3b9b16fd4f4c3fdab31db5fc38b007c1505bfa0
+DIST crun-1.19.1.tar.gz 1786019 BLAKE2B 555f7c917c9e9ed80919b708cd711890d47c395b5b6fa1c2b542d311176941c5ece23bd7ff0cb4c3dcf81be4f46fec21fa8127da57092657157707537771dfe1 SHA512 6cb6148a3b6e18b4dbb0178ea23eaaa57c040781a34b5c5c5dac71be513941717011fe996a7400b9dee0a73f7f0dd2fc36544fe72382a3f2543e4de90589fe6a
diff --git a/app-containers/crun/crun-1.11.2.ebuild b/app-containers/crun/crun-1.11.2.ebuild
deleted file mode 100644
index 029066f58826..000000000000
--- a/app-containers/crun/crun-1.11.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit python-any-r1
-
-DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
-HOMEPAGE="https://github.com/containers/crun"
-SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
-IUSE="+bpf +caps criu +seccomp selinux systemd static-libs"
-
-DEPEND="
-	dev-libs/libgcrypt:=
-	dev-libs/yajl:=
-	sys-kernel/linux-headers
-	caps? ( sys-libs/libcap )
-	criu? ( >=sys-process/criu-3.15 )
-	seccomp? ( sys-libs/libseccomp )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-container )"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# merged upstream: https://github.com/containers/crun/pull/1345
-	# drop when we get 1.11.3
-	"${FILESDIR}/${P}-caps.patch"
-)
-
-src_configure() {
-	local myeconfargs=(
-		--cache-file="${S}"/config.cache
-		$(use_enable bpf)
-		$(use_enable caps)
-		$(use_enable criu)
-		$(use_enable seccomp)
-		$(use_enable systemd)
-		$(usex static-libs '--enable-shared --enable-static' '--enable-shared --disable-static' '' '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake git-version.h
-	emake -C libocispec
-	emake crun
-}
-
-# the crun test suite is comprehensive to the extent that tests will fail
-# within a sandbox environment, due to the nature of the privileges
-# required to create linux "containers".
-# due to this we disable most of the core test suite by unsetting PYTHON_TESTS
-src_test() {
-	emake check PYTHON_TESTS=
-}
-
-src_install() {
-	emake "DESTDIR=${D}" install-exec
-	doman crun.1
-	einstalldocs
-
-	einfo "Cleaning up .la files"
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-containers/crun/crun-1.17.ebuild b/app-containers/crun/crun-1.17.ebuild
index fb6ca32f1cad..b54381361852 100644
--- a/app-containers/crun/crun-1.17.ebuild
+++ b/app-containers/crun/crun-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ if [[ "$PV" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/containers/${PN}.git"
 else
 	SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv"
+	KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-containers/crun/crun-1.19.1.ebuild b/app-containers/crun/crun-1.19.1.ebuild
new file mode 100644
index 000000000000..f1b4ab06660e
--- /dev/null
+++ b/app-containers/crun/crun-1.19.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2019-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit python-any-r1
+
+DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
+HOMEPAGE="https://github.com/containers/crun"
+
+if [[ "$PV" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/${PN}.git"
+else
+	SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="+bpf +caps criu +seccomp selinux systemd static-libs"
+
+DEPEND="
+	dev-libs/yajl:=
+	sys-kernel/linux-headers
+	caps? ( sys-libs/libcap )
+	criu? ( >=sys-process/criu-3.15 )
+	seccomp? ( sys-libs/libseccomp )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-container )"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myeconfargs=(
+		--cache-file="${S}"/config.cache
+		$(use_enable bpf)
+		$(use_enable caps)
+		$(use_enable criu)
+		$(use_enable seccomp)
+		$(use_enable systemd)
+		$(usex static-libs '--enable-shared --enable-static' '--enable-shared --disable-static' '' '')
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check-TESTS -C ./libocispec
+
+	# the crun test suite is comprehensive to the extent that tests will fail
+	# within a sandbox environment, due to the nature of the privileges
+	# required to create linux "containers".
+	local supported_tests=(
+		"tests/tests_libcrun_utils"
+		"tests/tests_libcrun_errors"
+		"tests/tests_libcrun_intelrdt"
+		"tests/test_oci_features"
+	)
+	emake check-TESTS TESTS="${supported_tests[*]}"
+}
+
+src_install() {
+	emake "DESTDIR=${D}" install-exec
+	doman crun.1
+	einstalldocs
+
+	einfo "Cleaning up .la files"
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-containers/crun/crun-1.8.4.ebuild b/app-containers/crun/crun-1.8.4.ebuild
deleted file mode 100644
index c0e0200e403c..000000000000
--- a/app-containers/crun/crun-1.8.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-# Can drop autotools/eautoreconf after next release & glibc patch gone
-inherit autotools python-any-r1
-
-DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
-HOMEPAGE="https://github.com/containers/crun"
-SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv"
-IUSE="+bpf +caps criu +seccomp selinux systemd static-libs"
-
-DEPEND="
-	dev-libs/libgcrypt:=
-	dev-libs/yajl:=
-	sys-kernel/linux-headers
-	caps? ( sys-libs/libcap )
-	criu? ( >=sys-process/criu-3.15 )
-	seccomp? ( sys-libs/libseccomp )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-container )"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-# the crun test suite is comprehensive to the extent that tests will fail
-# within a sandbox environment, due to the nature of the privileges
-# required to create linux "containers".
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable bpf)
-		$(use_enable caps)
-		$(use_enable criu)
-		$(use_enable seccomp)
-		$(use_enable systemd)
-		$(usex static-libs '--enable-shared --enable-static' '--enable-shared --disable-static' '' '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake git-version.h
-	emake -C libocispec
-	emake crun
-}
-
-src_install() {
-	emake "DESTDIR=${D}" install-exec
-	doman crun.1
-	einstalldocs
-
-	einfo "Cleaning up .la files"
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-containers/crun/files/crun-1.11.2-caps.patch b/app-containers/crun/files/crun-1.11.2-caps.patch
deleted file mode 100644
index d32a4dd1a8f8..000000000000
--- a/app-containers/crun/files/crun-1.11.2-caps.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 767ba88ef363115e80e077ce312f89f20488da01 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert=20G=C3=BCnzler?= <r@gnzler.io>
-Date: Thu, 9 Nov 2023 14:16:08 +0100
-Subject: [PATCH] Fix build without libcap
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The work to support features introduced another point of dependency on
-libcap that previously wasn't guarded by ifdefs
-
-Refs: https://github.com/containers/crun/pull/1237
-Signed-off-by: Robert GĂĽnzler <r@gnzler.io>
----
- src/libcrun/container.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/libcrun/container.c b/src/libcrun/container.c
-index ed0fa29bb..7be1713ab 100644
---- a/src/libcrun/container.c
-+++ b/src/libcrun/container.c
-@@ -3925,8 +3925,10 @@ libcrun_container_get_features (libcrun_context_t *context, struct features_info
-   // Populate namespaces
-   populate_array_field (&((*info)->linux.namespaces), namespaces, num_namspaces);
- 
-+#ifdef HAVE_CAP
-   // Populate capabilities
-   populate_capabilities (*info, &capabilities, &num_capabilities);
-+#endif
- 
-   // Hardcode the values for cgroup
-   (*info)->linux.cgroup.v1 = true;
diff --git a/app-containers/distrobuilder/distrobuilder-3.1.ebuild b/app-containers/distrobuilder/distrobuilder-3.1.ebuild
index babc8dc8f04f..b8331783130d 100644
--- a/app-containers/distrobuilder/distrobuilder-3.1.ebuild
+++ b/app-containers/distrobuilder/distrobuilder-3.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 @@ SRC_URI="https://linuxcontainers.org/downloads/distrobuilder/distrobuilder-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="verify-sig"
 
 RDEPEND="app-cdr/cdrtools
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/docker-cli/Manifest b/app-containers/docker-cli/Manifest
index 025c88ef0cfc..e7cd7a7fda99 100644
--- a/app-containers/docker-cli/Manifest
+++ b/app-containers/docker-cli/Manifest
@@ -1,10 +1,4 @@
-DIST docker-cli-26.1.0-man.tar.xz 79004 BLAKE2B 36dcf969c6567680990420d6d177101bf457f7fc1c24dff195ce8b478268335419fba5ff51a7b77bb8c0a6e0e6077d83ddb50f2ecf08bf069be89fc4849afd6e SHA512 36297ee3cbf096112ec41db2cd1d06796ddd27a57c4323e71a727e17d3930102710f643a77df9e68cd9b3294a6bb0fdf5565379e9fae7331e25afcd147b0084f
-DIST docker-cli-26.1.0.tar.gz 7213165 BLAKE2B 302236467f2b6f3f46b0f0c75e89c2cef0cd251d36e12f78a67c906cfb85b842b998fd3b07f4a2dfc0a04825a9b105d90f11d176055ded397f2d4e9145639d5d SHA512 1a1e9af1a836765ffa91f7f2e1b27911e2b6b373c308a7db332a7cd1825459ab1c04a93d03c9947b631bead0af21d9f03e06c3a60855cc56ca7039e50e38ba87
-DIST docker-cli-27.2.0-man.tar.xz 79052 BLAKE2B 019299b8cd0adbb1a3749f9aa37b1e38bf212b2c13eee81ae49f843bcc56ff3f41413e1021bebf5c88b4406d7928c2c40de026df861195aa2df79d9c724f8b87 SHA512 d61d6f9f9139f2d22268932d795a50e7b9b1ff993699ba87ca9353cb9908ac18c103a34ee9a486f3537988d6ba7317b05588cd84ff8327b86826ab7ed5023947
-DIST docker-cli-27.2.0.tar.gz 7236608 BLAKE2B 828f002d83de47efad370e28df2f5e50f75da7952bf4fcbe30d3d66c9bc281ee99fab820f7bca002c8eb13fa29b7518e951974b62008e213662c1d384a286c0d SHA512 5dce9e974a96b2518a73d50a9421d12feeb9cc792bb89000f26e04a91fdddade2648dea39aa721e48c9b07bfc18f7a6676fb7e286ae779556753886ec45e86c3
-DIST docker-cli-27.3.1-man.tar.xz 75056 BLAKE2B 791cd4fab7c36417cdfd3078bbbaff6a7e87a61908bbfd38fdfdb7fff6dfc6bac80ee351a54d5673f5c5e25180d4e0429b4b6d0a220cbea3880d568faa64dc96 SHA512 24a1f6aa923d8aa878c2007d49597e1384494b05bb0886f64b15e575fecf96941235f1f89c8731074e85f49dda5efec087d6759cb7622cb834461e76ebfb3fcd
-DIST docker-cli-27.3.1.tar.gz 7225408 BLAKE2B 1c3d428b3e7d653b0a246ee51f9bea47eba5f2b80bbfb1915f31f57e420750a28e2615482058f4051c55c8b723d4935d2711dd4a4c423ec3a17932fd9363d13e SHA512 6e80e94a0e9e16aaf2b19bc97c99ead39184745f601aea94e47c066a19b6436850d5269962e0802e9f7fa9f7dcb357ec0756c9466afa2c0a6ae239d61ef15961
-DIST docker-cli-27.4.0-man.tar.xz 75096 BLAKE2B bc3a6edfa83d506ba2cd9407506d7e3e60c57fe7bd319e08b50d559bfbce289b83a44440b1cf948f163b3b348787ae7a9e5e5e897f6ae113b60bc33407870ab3 SHA512 e2701a76ab028bc325183f52d96a2129f425a14c5c038411e928507c8e103638e9b376eb3192be9c8a99996fadf453d0205d1b64d92661a61df5feea6609e58d
-DIST docker-cli-27.4.0.tar.gz 7270507 BLAKE2B 18ddd86952016fbf6d423812c28ab7983e55517d832dec278e7a0cef4af0790cba54ed74ba7ca60036116ff6170a6578f7eec24ca8c852ee6b8cea321c9d0ae9 SHA512 432ebf450b03f2e4ca6e7230bbb2b37d5c8372bc62bf3c4c24469d1015974231f9f5cadf949a2340fa1e8d3ba82c88cadae604a029141a9e037ee1fd6ff89355
 DIST docker-cli-27.4.1-man.tar.xz 70252 BLAKE2B 3fbefe359b39cfb7eda125830dc6c8e9e49685a833f7f46b111e9e7c0ed4d0009ab5a6ccdd27a97a1885453a7e43ae4f557c63f9201fc2604d0146f20f14763c SHA512 ddd7017fb0d5193e6f7b39e67f047edf3c98e86f299d0a7ab318efc3fb8b712a71ee5ac933ccf33945f846e2b20d2b1efc7fa9fcbd12f9a56b9d519bec4bcee1
 DIST docker-cli-27.4.1.tar.gz 7273057 BLAKE2B 3ebebe0e0918dd54d45c058c2922107fc2e82170c6e00540fde2c884c8f88945ceb5428fd5917014af5d35a554a0d9e83306d173ceea9c7461508b902f0023f8 SHA512 5880053d44e169b93fe50f3d4b13fa2f8f60de32a96f8ee2923a3291385532c1903027f0654a65a8eab51f29caf7b805857b491c0bfeee2e1983f822e579851e
+DIST docker-cli-27.5.0-man.tar.xz 70224 BLAKE2B 4c2a4025721fbfbb63c24e20bdbc68f3a8b2d355d57060a86190ea30ec4dc1e01eae1265a3de6077c3952e1c9d859c1c28c707caccf07260f6dabe8bf3ef5439 SHA512 4450669971503665ca644899a657c587e86edaf4462ef47bd49b09da961111e8bc27a61caf8a8dbf9a617427bb2ebf92ab8d7adb6c4f33001383e590b59cfff3
+DIST docker-cli-27.5.0.tar.gz 7462649 BLAKE2B 89ae65834c606d9ef4f8ebc9fee5052d3e12b8aa6d9f4df7c0415157b24a55e89d0758b4f5cf0e4f3f5b6ea2f9c46bfc010c604995cb5cf1d162c068ba679787 SHA512 3c7c709f38fffd4d4e134d2abd7e6dc606e1cba765d36924a53f9470d6077be2282983eb23995bd56d772da253a69a854fe3112fea1a7ed2c9a1b70d2cc45b57
diff --git a/app-containers/docker-cli/docker-cli-26.1.0.ebuild b/app-containers/docker-cli/docker-cli-26.1.0.ebuild
deleted file mode 100644
index 12a42233ff2f..000000000000
--- a/app-containers/docker-cli/docker-cli-26.1.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GIT_COMMIT=9714adc6c797755f63053726c56bc1c17c0c9204
-
-EGO_PN="github.com/docker/cli"
-MY_PV=${PV/_/-}
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
-IUSE="hardened selinux"
-
-RDEPEND="!<app-containers/docker-20.10.1
-	selinux? ( sec-policy/selinux-docker )"
-BDEPEND="
-	>=dev-lang/go-1.16.6"
-
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	set -- ${A}
-	unpack ${2}
-}
-
-src_prepare() {
-	default
-	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
-}
-
-src_compile() {
-	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	export GOPATH="${WORKDIR}/${P}"
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-	CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
-		emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="${PV}" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-}
-
-src_install() {
-	dobin build/docker
-	doman "${WORKDIR}"/man/man?/*
-	dobashcomp contrib/completion/bash/*
-	bashcomp_alias docker dockerd
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-}
-
-pkg_postinst() {
-	has_version "app-containers/docker-buildx" && return
-	ewarn "the 'docker build' command is deprecated and will be removed in a"
-	ewarn "future release. If you need this functionality, install"
-	ewarn "app-containers/docker-buildx."
-}
diff --git a/app-containers/docker-cli/docker-cli-27.2.0.ebuild b/app-containers/docker-cli/docker-cli-27.2.0.ebuild
deleted file mode 100644
index 704097070ac4..000000000000
--- a/app-containers/docker-cli/docker-cli-27.2.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GIT_COMMIT=3ab42569583b58dbc6f167d842d5a3dd5972065f
-
-EGO_PN="github.com/docker/cli"
-MY_PV=${PV/_/-}
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="hardened selinux"
-
-RDEPEND="!<app-containers/docker-20.10.1
-	selinux? ( sec-policy/selinux-docker )"
-BDEPEND="
-	>=dev-lang/go-1.16.6"
-
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	set -- ${A}
-	unpack ${2}
-}
-
-src_prepare() {
-	default
-	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
-}
-
-src_compile() {
-	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	export GOPATH="${WORKDIR}/${P}"
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-	CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
-		emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="${PV}" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-}
-
-src_install() {
-	dobin build/docker
-	doman "${WORKDIR}"/man/man?/*
-	dobashcomp contrib/completion/bash/*
-	bashcomp_alias docker dockerd
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-}
-
-pkg_postinst() {
-	has_version "app-containers/docker-buildx" && return
-	ewarn "the 'docker build' command is deprecated and will be removed in a"
-	ewarn "future release. If you need this functionality, install"
-	ewarn "app-containers/docker-buildx."
-}
diff --git a/app-containers/docker-cli/docker-cli-27.3.1.ebuild b/app-containers/docker-cli/docker-cli-27.3.1.ebuild
deleted file mode 100644
index 166bc1757d93..000000000000
--- a/app-containers/docker-cli/docker-cli-27.3.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GIT_COMMIT=ce1223035ac3ab8922717092e63a184cf67b493d
-
-EGO_PN="github.com/docker/cli"
-MY_PV=${PV/_/-}
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="hardened selinux"
-
-RDEPEND="!<app-containers/docker-20.10.1
-	selinux? ( sec-policy/selinux-docker )"
-BDEPEND="
-	>=dev-lang/go-1.16.6"
-
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	set -- ${A}
-	unpack ${2}
-}
-
-src_prepare() {
-	default
-	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
-}
-
-src_compile() {
-	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	export GOPATH="${WORKDIR}/${P}"
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-	CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
-		emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="${PV}" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-}
-
-src_install() {
-	dobin build/docker
-	doman "${WORKDIR}"/man/man?/*
-	dobashcomp contrib/completion/bash/*
-	bashcomp_alias docker dockerd
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-}
-
-pkg_postinst() {
-	has_version "app-containers/docker-buildx" && return
-	ewarn "the 'docker build' command is deprecated and will be removed in a"
-	ewarn "future release. If you need this functionality, install"
-	ewarn "app-containers/docker-buildx."
-}
diff --git a/app-containers/docker-cli/docker-cli-27.4.0.ebuild b/app-containers/docker-cli/docker-cli-27.4.0.ebuild
deleted file mode 100644
index 83361a3c2d6b..000000000000
--- a/app-containers/docker-cli/docker-cli-27.4.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GIT_COMMIT=bde2b893136c1c7a2894386e4f8743089c89b041
-
-EGO_PN="github.com/docker/cli"
-MY_PV=${PV/_/-}
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="hardened selinux"
-
-RDEPEND="!<app-containers/docker-20.10.1
-	selinux? ( sec-policy/selinux-docker )"
-BDEPEND="
-	>=dev-lang/go-1.16.6"
-
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	set -- ${A}
-	unpack ${2}
-}
-
-src_prepare() {
-	default
-	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
-}
-
-src_compile() {
-	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	export GOPATH="${WORKDIR}/${P}"
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-	CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
-		emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="${PV}" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-}
-
-src_install() {
-	dobin build/docker
-	doman "${WORKDIR}"/man/man?/*
-	dobashcomp contrib/completion/bash/*
-	bashcomp_alias docker dockerd
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-}
-
-pkg_postinst() {
-	has_version "app-containers/docker-buildx" && return
-	ewarn "the 'docker build' command is deprecated and will be removed in a"
-	ewarn "future release. If you need this functionality, install"
-	ewarn "app-containers/docker-buildx."
-}
diff --git a/app-containers/docker-cli/docker-cli-27.4.1.ebuild b/app-containers/docker-cli/docker-cli-27.4.1.ebuild
index 7658c2a15348..88442539b243 100644
--- a/app-containers/docker-cli/docker-cli-27.4.1.ebuild
+++ b/app-containers/docker-cli/docker-cli-27.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
@@ -17,7 +17,7 @@ S="${WORKDIR}/cli-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
 IUSE="hardened selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-docker )"
diff --git a/app-containers/docker-cli/docker-cli-27.5.0.ebuild b/app-containers/docker-cli/docker-cli-27.5.0.ebuild
new file mode 100644
index 000000000000..1ea57a7694f4
--- /dev/null
+++ b/app-containers/docker-cli/docker-cli-27.5.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+# update this on every bump
+GIT_COMMIT=a187fa5d2d0d5f12db920734e425afc758e98ead
+
+DESCRIPTION="the command line binary for docker"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz"
+S="${WORKDIR}/cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="hardened selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-docker )"
+
+RESTRICT="installsources strip test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	ln -s vendor.mod go.mod
+	ln -s vendor.sum go.sum
+}
+
+src_prepare() {
+	default
+	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
+}
+
+src_compile() {
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
+	CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
+		emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="${PV}" \
+		GITCOMMIT="${GIT_COMMIT}" \
+		dynbinary
+}
+
+src_install() {
+	dobin build/docker
+	doman "${WORKDIR}"/man/man?/*
+	dobashcomp contrib/completion/bash/docker
+	bashcomp_alias docker dockerd
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+}
+
+pkg_postinst() {
+	has_version "app-containers/docker-buildx" && return
+	ewarn "the 'docker build' command is deprecated and will be removed in a"
+	ewarn "future release. If you need this functionality, install"
+	ewarn "app-containers/docker-buildx."
+}
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index ccde19aef1a9..83b8e2934dfc 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -3,3 +3,5 @@ DIST docker-compose-2.28.1-deps.tar.xz 63440736 BLAKE2B 8af853b07539a413d2532e4d
 DIST docker-compose-2.28.1.gh.tar.gz 362304 BLAKE2B d18b6c2c5cd92aa7aaae57edd7343b5c282b0d88911b8a73393d4bdc994e4addda09b6a921bd3b0ebe370abd856b8b950ccad62ac43b29de0f8a25e3f7106269 SHA512 87e7296d42a697c477601db85d08dc11ada42ccc8e59d5b560db7bf74c27b63f9f09424949b94ec33bf17a8537d3b549fe9727933396257464ad42730736a608
 DIST docker-compose-2.32.1-deps.tar.xz 62997012 BLAKE2B a726ecc43b6201169f846719c5f1a833fc49c0a329cefb4080bc12b5c9f7460f77068938353f69a323b9faa02ff7b099c25cfd9f7781cc60d819040155ddcb07 SHA512 f9514093ea04b08a5be3863f40ff8cb96e19d5c3f12047bd21bb8159b40b24a8db9171dd069a415dd0bf873ef69da9a40b0b81a11dcb0b41cfaec8f474a95e0c
 DIST docker-compose-2.32.1.gh.tar.gz 381904 BLAKE2B e26b7f38c00196c58743e6aaae3538135ba7cfc0b1ad9dbb7704c7cce281817e452d6bf569d968d62b47b95397f6cc1419efddb818bf71ccc9b8c24923d058d2 SHA512 1577910990193099016b20a49b9f0f79ec89d1f9e39f5f484253405bb33f341d06b18e0e82f7d65ed9d8b5be8d7510b739fd53e130b98ad1a6edf40f2282cbe5
+DIST docker-compose-2.32.3-deps.tar.xz 63026156 BLAKE2B 14fbf37a3daae8cb3d4b9ebe0fd46bc8900dc74ef6661edea6fd7452b653ea987c223cabaf88e6e01d71f57238809b5ee3ffdec39a01b851168fc5eb1bdcbb76 SHA512 6ec2d4d586a0e6e93aa46db1b6d6f5c25ad461a0f8552ce8ed7f9e47e12e70d0e9f91b84498bee84218acf23285f319304e36a94f84d97f8c71ea35c25fd3f9b
+DIST docker-compose-2.32.3.gh.tar.gz 382194 BLAKE2B a2739832123dddb2a6c7d71a52294bad711d4fe99887c5e8272d59d697c50db721779ee12e6813b9e4f22f536a063b14f3636ba50064c7e51c273f71bbdeff41 SHA512 33b952af17ee518e0499d4ee5ff6da525bc55791cc76b94d013c05bdc80bb34d9290feb8b1ec52decc4df9c2c36e07ed601f9b8985f5d576e877550de39b650a
diff --git a/app-containers/docker-compose/docker-compose-2.32.3.ebuild b/app-containers/docker-compose/docker-compose-2.32.3.ebuild
new file mode 100644
index 000000000000..56ce445af68f
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.32.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2018-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND=">=dev-lang/go-1.21"
+RDEPEND=">=app-containers/docker-cli-23.0.0"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	# do not strip
+	sed -i -e 's/-s -w//' Makefile || die
+}
+
+src_compile() {
+	emake VERSION=v${PV}
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	exeinto /usr/libexec/docker/cli-plugins
+	doexe bin/build/docker-compose
+	dodoc README.md
+}
+
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		ver_test ${v} -ge 2 && return
+	done
+	ewarn
+	ewarn "docker-compose 2.x is a sub command of docker"
+	ewarn "Use 'docker compose' from the command line instead of"
+	ewarn "'docker-compose'"
+	ewarn "If you need to keep 1.x around, please run the following"
+	ewarn "command before your next --depclean"
+	ewarn "# emerge --noreplace docker-compose:0"
+}
diff --git a/app-containers/docker-credential-helpers/Manifest b/app-containers/docker-credential-helpers/Manifest
index 73b7729ba3f7..0eef5e2f8ddb 100644
--- a/app-containers/docker-credential-helpers/Manifest
+++ b/app-containers/docker-credential-helpers/Manifest
@@ -1 +1,2 @@
 DIST docker-credential-helpers-0.6.3.tar.gz 28971 BLAKE2B b50e4de0f3b126e0118f24f845a94be5e932975ab54ad6e0a52129a56109ecafb021f14986569295242cb0af4ea109d8786b8a5ca8481cc48daad14671841432 SHA512 2d15be8df134bff08eef9461348f07cd57c70c15a0ab044de2e69296c400b8c0e16198c90fd064d5ce83037d0bad57520e7524b0832b7a00e69397203dc90d10
+DIST docker-credential-helpers-0.8.2.tar.gz 283816 BLAKE2B 334ca059b619e5e3528864a99b07eea61b98083989aa8e8b619c83d781caad97fbf5f3ed60879adacf27d81e0b991a38567e1fa2bc27b9a772d86b51437a6e03 SHA512 ca04b7fe78871389c9f968b730c18e2aca2d2a818ce87c1f138efb7dafbfdea7b83c2c16504131d04c295428debee2187036e603dba711369b5de1a3993c2e8c
diff --git a/app-containers/docker-credential-helpers/docker-credential-helpers-0.8.2.ebuild b/app-containers/docker-credential-helpers/docker-credential-helpers-0.8.2.ebuild
new file mode 100644
index 000000000000..d49feeba1dbc
--- /dev/null
+++ b/app-containers/docker-credential-helpers/docker-credential-helpers-0.8.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Suite of programs to use native stores to keep Docker credentials safe"
+HOMEPAGE="https://github.com/docker/docker-credential-helpers"
+SRC_URI="https://github.com/docker/docker-credential-helpers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+IUSE="keyring pass"
+REQUIRED_USE="|| ( keyring pass )"
+RESTRICT="test"
+
+DEPEND="keyring? ( app-crypt/libsecret )"
+RDEPEND="${DEPEND}
+	pass? ( app-admin/pass )
+"
+
+src_compile() {
+	local mymakeflags=(
+		VERSION="${PV}"
+		REVISION="v${PV}"
+	)
+	use keyring && mymakeflags+=( secretservice )
+	use pass && mymakeflags+=( pass )
+	emake -j1 "${mymakeflags[@]}"
+}
+
+src_install() {
+	dobin bin/build/*
+	dodoc MAINTAINERS README.md
+}
+
+pkg_postinst() {
+	if use keyring; then
+		elog "For keyring/kwallet add:\n"
+		elog '		"credStore": "secretservice"'"\n"
+	fi
+	if use pass; then
+		elog "For 'pass' add:\n"
+		elog '		"credStore": "pass"'"\n"
+	fi
+	elog "to your ~/.docker/config.json"
+}
diff --git a/app-containers/docker-credential-helpers/metadata.xml b/app-containers/docker-credential-helpers/metadata.xml
index 2f589c3c8517..238401d193a9 100644
--- a/app-containers/docker-credential-helpers/metadata.xml
+++ b/app-containers/docker-credential-helpers/metadata.xml
@@ -20,4 +20,7 @@
 			Build pass helper for the pass utility.
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">docker/docker-credential-helpers</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-containers/docker-registry/Manifest b/app-containers/docker-registry/Manifest
index a5925694786d..4cef544bc6a9 100644
--- a/app-containers/docker-registry/Manifest
+++ b/app-containers/docker-registry/Manifest
@@ -1,2 +1 @@
-DIST docker-registry-2.8.1.tar.gz 2007611 BLAKE2B abf3e630652f195cf3ad4d07e6d9845000e79d340b0bb8046528bb62592df754c125fd38a92d1af27d068fcd51910f80f356d6a894cb1b97f28d7042af24b898 SHA512 b9c8525051458ff4bf4592ca3ddba83c4325e88c6812ddb28c1567e331c1571f112e3b646ca970f0fe420f3b1d61d00f7151450d7b9948a08733606255731266
 DIST docker-registry-2.8.2.tar.gz 2008415 BLAKE2B 824325f835b2c7cc18f711204b4a92d21f661129ee2b446e3fc42f0e064b8dde43f119bff29216625cfb5e25aec152225680148ae3fc157886acb1e248b6d3b5 SHA512 c2270c14e09399b10fa474a93855e542b82a7746764ec581a218826581e30b76d4d31ae8f91957b8e48a7c14c054b84091c73679e40dbdff1a5bd0de8b18af83
diff --git a/app-containers/docker-registry/docker-registry-2.8.1.ebuild b/app-containers/docker-registry/docker-registry-2.8.1.ebuild
deleted file mode 100644
index 773fa15bb205..000000000000
--- a/app-containers/docker-registry/docker-registry-2.8.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-vcs-snapshot systemd
-
-EGIT_COMMIT="b5ca020cfbe998e5af3457fda087444cf5116496"
-EGO_PN="github.com/docker/distribution"
-
-DESCRIPTION="Docker Registry 2.0"
-HOMEPAGE="https://github.com/docker/distribution"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 MIT ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-DEPEND="
-	acct-group/registry
-	acct-user/registry
-"
-RDEPEND="${DEPEND}"
-
-SVCNAME="registry"
-
-src_prepare() {
-	default
-	pushd src/${EGO_PN} || die
-	eapply "${FILESDIR}"/${PN}-2.7.0-notification-metrics.patch
-	sed -e "s/git describe.*/echo ${PV})/" \
-		-e "s/git rev-parse.*/echo ${EGIT_COMMIT})/" \
-		-e "s/-s -w/-w/" \
-		-i Makefile || die
-	popd || die
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #681072
-	GOPATH="${S}" GO_BUILD_FLAGS="-v" emake -C src/${EGO_PN} binaries
-}
-
-src_install() {
-	exeinto /usr/libexec/${PN}
-	doexe src/${EGO_PN}/bin/*
-	insinto /etc/docker/registry
-	newins src/${EGO_PN}/cmd/registry/config-example.yml config.yml.example
-	newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
-	newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
-	systemd_dounit "${FILESDIR}/${SVCNAME}.service"
-	keepdir /var/log/${SVCNAME}
-	fowners ${SVCNAME}:${SVCNAME} /var/log/${SVCNAME}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${SVCNAME}.logrotated" "${SVCNAME}"
-}
diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index cfe2371f801d..ce0f4353cabc 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -1,5 +1,2 @@
-DIST docker-26.1.0.tar.gz 16390376 BLAKE2B 6703e9b153c430bc28aed2e7de7bada0203353d61f0a2ce3d49ddbd017eab196a685dd1ab1e719a6b287813eb5fa4f2c612e2cf1ab95789d6e79ebe5dac7ace3 SHA512 47b6b9af9947016884614b6bc25977e1db281da95c9b8b34c753c21c664a737a893f9fa65d92cbb897735aae3893567e106e6bababb5507e069b1e0981e48d50
-DIST docker-27.2.0.tar.gz 16689537 BLAKE2B faf0bae9f7da127d5b65b9989acd82dc726bc3f09ace502df151b9f03a84b6f1ec2a946d905263aaa7d2e7d7a3cd4ad1a09291dcfc6691e73cc9a8738f150d55 SHA512 97abaf56d2249c1514beacf17fc9096848b960846e064f1a9bd800a59762a1f1888b32e83b3e8289e23656496ca0293fea65931210d68faaa8a713aab6e48b65
-DIST docker-27.3.1.tar.gz 16790553 BLAKE2B 64670eec5a957cb1a088047836fe5e906435f85a062178f52276bafa3df750207bfd02ebb8783e642a6817b2bfa9fb439e441d412e448eba0f3cf15869067d72 SHA512 0fddcc8314eed2e7b131af78f1fa01292cfc4fcb7fd0af94b79d5435349ab54a21b0a78cffbf29dd4c58747d8bcd1f47473cc5f5ab2596e133828b2e6540d172
-DIST docker-27.4.0.tar.gz 16836980 BLAKE2B 9bea16a6177cf8c4f05f015bb241b51f7c96ca8813167a07d3b951e418f38aff09277f83772342bf326a5acb05c7c3a0659120d92d6d57df2e9f9fbba3006c79 SHA512 f684d6e91bf0a00247605ea88ea6421cc13b9152239b8f51eb640a568b43b3898ea6bcd22ef64a0e263d6e795362160473db849490672dd1fd39d174ad6f45a0
 DIST docker-27.4.1.tar.gz 16837429 BLAKE2B da2e915944a0260619b1e036b43d40f5cbff66f07182153c0ae238ecbcecdfe2066473887882fdaaffa5ef29e2328211f1d07ba3a5239381f9e82d34d9da43fe SHA512 3d77708f7373c1b58b1c46428c2cfc9e8985076e494e40ab86709f37a686cf92b9e2c9db5aa34293f728bb7ccd6a7e08e0cbb1c6d20acfd025c4c787d5908dc0
+DIST docker-27.5.0.tar.gz 17076981 BLAKE2B 20dfdb9fb3d594520f063352c28ccc7a936ec2dc0cd6d04737c2d8c78c54db024ac33fc986ddf06cbe4f496b27bd6e63cc3a2532f3c36b83cf8f9eca0dbae3a2 SHA512 89245805edebd7d43d5b47a38aba115239c20448fc10bce5a1605f99951a303ba360456a54815ffc5346cdd97ddd08657df1881c97f79066e9e2bd075af542da
diff --git a/app-containers/docker/docker-26.1.0-r1.ebuild b/app-containers/docker/docker-26.1.0-r1.ebuild
deleted file mode 100644
index 980c31950f3d..000000000000
--- a/app-containers/docker/docker-26.1.0-r1.ebuild
+++ /dev/null
@@ -1,322 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN=github.com/docker/docker
-MY_PV=${PV/_/-}
-inherit golang-vcs-snapshot linux-info systemd udev
-GIT_COMMIT=061aa95809be396a6b5542618d8a34b02a21ff77
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs +container-init overlay seccomp selinux systemd"
-
-DEPEND="
-	acct-group/docker
-	>=dev-db/sqlite-3.7.9:3
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-	systemd? ( sys-apps/systemd )
-"
-
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	>=app-containers/containerd-1.7.15[apparmor?,btrfs?,seccomp?]
-	>=app-containers/runc-1.1.12[apparmor?,seccomp?]
-	!app-containers/docker-proxy
-	container-init? ( >=sys-process/tini-0.19.0[static] )
-	selinux? ( sec-policy/selinux-docker )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-BDEPEND="
-	>=dev-lang/go-1.16.12
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-# tests require running dockerd as root and downloading containers
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
-PATCHES=(
-	"${FILESDIR}/0001-Openrc-Depend-on-containerd-init-script.patch"
-	"${FILESDIR}/docker-26.1.0-automagic-systemd.patch"
-)
-
-pkg_setup() {
-	# this is based on "contrib/check-config.sh" from upstream's sources
-	# required features.
-	CONFIG_CHECK="
-		~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-		~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-		~KEYS
-		~VETH ~BRIDGE ~BRIDGE_NETFILTER
-		~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-		~NETFILTER_XT_MATCH_ADDRTYPE
-		~NETFILTER_XT_MATCH_CONNTRACK
-		~NETFILTER_XT_MATCH_IPVS
-		~NETFILTER_XT_MARK
-		~IP_NF_NAT ~NF_NAT
-		~POSIX_MQUEUE
-	"
-	WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers"
-
-	if kernel_is lt 4 8; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is le 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-		"
-	fi
-
-	if kernel_is le 5 2; then
-		CONFIG_CHECK+="
-			~NF_NAT_NEEDED
-		"
-	fi
-
-	if kernel_is ge 4 15; then
-		CONFIG_CHECK+="
-			~CGROUP_BPF
-		"
-	fi
-
-	# optional features
-	CONFIG_CHECK+="
-		~USER_NS
-	"
-
-	if use seccomp; then
-		CONFIG_CHECK+="
-			~SECCOMP ~SECCOMP_FILTER
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~CGROUP_PIDS
-	"
-
-	if kernel_is lt 6 1; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP
-			"
-	fi
-
-	if kernel_is le 5 8; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP_ENABLED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NATIVE
-		"
-	if kernel_is lt 5 19; then
-		CONFIG_CHECK+="
-			~LEGACY_VSYSCALL_EMULATE
-			"
-	fi
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NONE
-		"
-	WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \
-		Containers with <=glibc-2.13 will not work"
-
-	if kernel_is le 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-	fi
-
-	if kernel_is lt 5; then
-		CONFIG_CHECK+="
-			~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~BLK_CGROUP ~BLK_DEV_THROTTLING
-		~CGROUP_PERF
-		~CGROUP_HUGETLB
-		~NET_CLS_CGROUP ~CGROUP_NET_PRIO
-		~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
-		~IP_NF_TARGET_REDIRECT
-		~IP_VS
-		~IP_VS_NFCT
-		~IP_VS_PROTO_TCP
-		~IP_VS_PROTO_UDP
-		~IP_VS_RR
-		"
-
-	if use selinux; then
-		CONFIG_CHECK+="
-			~SECURITY_SELINUX
-			"
-	fi
-
-	if use apparmor; then
-		CONFIG_CHECK+="
-			~SECURITY_APPARMOR
-			"
-	fi
-
-	# if ! is_set EXT4_USE_FOR_EXT2; then
-	#	check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
-	#	if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
-	#		echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
-	#	fi
-	# fi
-
-	CONFIG_CHECK+="
-		~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-	"
-
-	# if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then
-	#	if is_set EXT4_USE_FOR_EXT2; then
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)"
-	#	else
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
-	#	fi
-	# fi
-
-	# network drivers
-	CONFIG_CHECK+="
-		~VXLAN ~BRIDGE_VLAN_FILTERING
-		~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH
-		~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP
-	"
-	if kernel_is le 5 3; then
-		CONFIG_CHECK+="
-			~INET_XFRM_MODE_TRANSPORT
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~IPVLAN
-		"
-	CONFIG_CHECK+="
-		~MACVLAN ~DUMMY
-		"
-	CONFIG_CHECK+="
-		~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP
-	"
-
-	# storage drivers
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~OVERLAY_FS
-	"
-
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
-	export GOPATH="${WORKDIR}/${P}"
-	export VERSION=${PV}
-	tc-export PKG_CONFIG
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-	CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in btrfs overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	export SYSTEMD=$(usex systemd 1 0)
-
-	# build binaries
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-	dobin bundles/dynbinary-daemon/dockerd
-	dobin bundles/dynbinary-daemon/docker-proxy
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md NOTICE README.md
-	dodoc -r docs/*
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot:"
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "  systemctl enable docker.service"
-	else
-		elog "  rc-update add docker default"
-	fi
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog '  usermod -aG docker <youruser>'
-	elog
-
-	if use overlay; then
-		elog " Overlay storage driver/USEflag has been deprecated"
-		elog " in favor of overlay2 (enabled unconditionally)"
-		elog
-	fi
-
-	if has_version sys-fs/zfs; then
-		elog " ZFS storage driver is available"
-		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-containers/docker/docker-27.2.0.ebuild b/app-containers/docker/docker-27.2.0.ebuild
deleted file mode 100644
index 4f5f1df2aba3..000000000000
--- a/app-containers/docker/docker-27.2.0.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN=github.com/docker/docker
-MY_PV=${PV/_/-}
-inherit golang-vcs-snapshot linux-info optfeature systemd udev
-GIT_COMMIT=3ab5c7d0036ca8fc43141e83b167456ec79828aa
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs +container-init +overlay2 seccomp selinux systemd"
-
-DEPEND="
-	acct-group/docker
-	>=dev-db/sqlite-3.7.9:3
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-	systemd? ( sys-apps/systemd )
-"
-
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	>=app-containers/containerd-1.7.21[apparmor?,btrfs?,seccomp?]
-	>=app-containers/runc-1.1.13[apparmor?,seccomp?]
-	!app-containers/docker-proxy
-	container-init? ( >=sys-process/tini-0.19.0[static] )
-	selinux? ( sec-policy/selinux-docker )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-BDEPEND="
-	>=dev-lang/go-1.16.12
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-# tests require running dockerd as root and downloading containers
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
-PATCHES=(
-	"${FILESDIR}/0001-Openrc-Depend-on-containerd-init-script.patch"
-)
-
-pkg_setup() {
-	# this is based on "contrib/check-config.sh" from upstream's sources
-	# required features.
-	CONFIG_CHECK="
-		~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-		~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-		~KEYS
-		~VETH ~BRIDGE ~BRIDGE_NETFILTER
-		~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-		~NETFILTER_XT_MATCH_ADDRTYPE
-		~NETFILTER_XT_MATCH_CONNTRACK
-		~NETFILTER_XT_MATCH_IPVS
-		~NETFILTER_XT_MARK
-		~IP_NF_NAT ~NF_NAT
-		~POSIX_MQUEUE
-	"
-	WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers"
-
-	if kernel_is lt 4 8; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is le 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-		"
-	fi
-
-	if kernel_is le 5 2; then
-		CONFIG_CHECK+="
-			~NF_NAT_NEEDED
-		"
-	fi
-
-	if kernel_is ge 4 15; then
-		CONFIG_CHECK+="
-			~CGROUP_BPF
-		"
-	fi
-
-	# optional features
-	CONFIG_CHECK+="
-		~USER_NS
-	"
-
-	if use seccomp; then
-		CONFIG_CHECK+="
-			~SECCOMP ~SECCOMP_FILTER
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~CGROUP_PIDS
-	"
-
-	if kernel_is lt 6 1; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP
-			"
-	fi
-
-	if kernel_is le 5 8; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP_ENABLED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NATIVE
-		"
-	if kernel_is lt 5 19; then
-		CONFIG_CHECK+="
-			~LEGACY_VSYSCALL_EMULATE
-			"
-	fi
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NONE
-		"
-	WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \
-		Containers with <=glibc-2.13 will not work"
-
-	if kernel_is le 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-	fi
-
-	if kernel_is lt 5; then
-		CONFIG_CHECK+="
-			~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~BLK_CGROUP ~BLK_DEV_THROTTLING
-		~CGROUP_PERF
-		~CGROUP_HUGETLB
-		~NET_CLS_CGROUP ~CGROUP_NET_PRIO
-		~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
-		~IP_NF_TARGET_REDIRECT
-		~IP_VS
-		~IP_VS_NFCT
-		~IP_VS_PROTO_TCP
-		~IP_VS_PROTO_UDP
-		~IP_VS_RR
-		"
-
-	if use selinux; then
-		CONFIG_CHECK+="
-			~SECURITY_SELINUX
-			"
-	fi
-
-	if use apparmor; then
-		CONFIG_CHECK+="
-			~SECURITY_APPARMOR
-			"
-	fi
-
-	# if ! is_set EXT4_USE_FOR_EXT2; then
-	#	check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
-	#	if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
-	#		echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
-	#	fi
-	# fi
-
-	CONFIG_CHECK+="
-		~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-	"
-
-	# if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then
-	#	if is_set EXT4_USE_FOR_EXT2; then
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)"
-	#	else
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
-	#	fi
-	# fi
-
-	# network drivers
-	CONFIG_CHECK+="
-		~VXLAN ~BRIDGE_VLAN_FILTERING
-		~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH
-		~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP
-	"
-	if kernel_is le 5 3; then
-		CONFIG_CHECK+="
-			~INET_XFRM_MODE_TRANSPORT
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~IPVLAN
-		"
-	CONFIG_CHECK+="
-		~MACVLAN ~DUMMY
-		"
-	CONFIG_CHECK+="
-		~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP
-	"
-
-	# storage drivers
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~OVERLAY_FS
-	"
-
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
-	export GOPATH="${WORKDIR}/${P}"
-	export VERSION=${PV}
-	tc-export PKG_CONFIG
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-	CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in btrfs overlay2; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	export EXCLUDE_AUTO_BUILDTAG_JOURNALD=$(usex systemd '' 'y')
-
-	# build binaries
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-	dobin bundles/dynbinary-daemon/dockerd
-	dobin bundles/dynbinary-daemon/docker-proxy
-	for f in dockerd-rootless-setuptool.sh dockerd-rootless.sh; do
-		dosym ../share/docker/contrib/${f} /usr/bin/${f}
-	done
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md NOTICE README.md
-	dodoc -r docs/*
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot:"
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "  systemctl enable docker.service"
-	else
-		elog "  rc-update add docker default"
-	fi
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog '  usermod -aG docker <youruser>'
-	elog
-
-	if has_version sys-fs/zfs; then
-		elog " ZFS storage driver is available"
-		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
-		elog
-	fi
-
-	optfeature "rootless mode support" sys-apps/shadow
-	optfeature "rootless mode support" sys-apps/rootlesskit
-	optfeature_header "for rootless mode you also need a network stack"
-	optfeature "rootless mode network stack" app-containers/slirp4netns
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-containers/docker/docker-27.3.1.ebuild b/app-containers/docker/docker-27.3.1.ebuild
deleted file mode 100644
index 3fe81a9b43df..000000000000
--- a/app-containers/docker/docker-27.3.1.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN=github.com/docker/docker
-MY_PV=${PV/_/-}
-inherit golang-vcs-snapshot linux-info optfeature systemd udev
-GIT_COMMIT=41ca978a0a5400cc24b274137efa9f25517fcc0b
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs +container-init +overlay2 seccomp selinux systemd"
-
-DEPEND="
-	acct-group/docker
-	>=dev-db/sqlite-3.7.9:3
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-	systemd? ( sys-apps/systemd )
-"
-
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	>=app-containers/containerd-1.7.22[apparmor?,btrfs?,seccomp?]
-	>=app-containers/runc-1.1.14[apparmor?,seccomp?]
-	!app-containers/docker-proxy
-	container-init? ( >=sys-process/tini-0.19.0[static] )
-	selinux? ( sec-policy/selinux-docker )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-BDEPEND="
-	>=dev-lang/go-1.16.12
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-# tests require running dockerd as root and downloading containers
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
-pkg_setup() {
-	# this is based on "contrib/check-config.sh" from upstream's sources
-	# required features.
-	CONFIG_CHECK="
-		~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-		~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-		~KEYS
-		~VETH ~BRIDGE ~BRIDGE_NETFILTER
-		~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-		~NETFILTER_XT_MATCH_ADDRTYPE
-		~NETFILTER_XT_MATCH_CONNTRACK
-		~NETFILTER_XT_MATCH_IPVS
-		~NETFILTER_XT_MARK
-		~IP_NF_NAT ~NF_NAT
-		~POSIX_MQUEUE
-	"
-	WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers"
-
-	if kernel_is lt 4 8; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is le 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-		"
-	fi
-
-	if kernel_is le 5 2; then
-		CONFIG_CHECK+="
-			~NF_NAT_NEEDED
-		"
-	fi
-
-	if kernel_is ge 4 15; then
-		CONFIG_CHECK+="
-			~CGROUP_BPF
-		"
-	fi
-
-	# optional features
-	CONFIG_CHECK+="
-		~USER_NS
-	"
-
-	if use seccomp; then
-		CONFIG_CHECK+="
-			~SECCOMP ~SECCOMP_FILTER
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~CGROUP_PIDS
-	"
-
-	if kernel_is lt 6 1; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP
-			"
-	fi
-
-	if kernel_is le 5 8; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP_ENABLED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NATIVE
-		"
-	if kernel_is lt 5 19; then
-		CONFIG_CHECK+="
-			~LEGACY_VSYSCALL_EMULATE
-			"
-	fi
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NONE
-		"
-	WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \
-		Containers with <=glibc-2.13 will not work"
-
-	if kernel_is le 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-	fi
-
-	if kernel_is lt 5; then
-		CONFIG_CHECK+="
-			~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~BLK_CGROUP ~BLK_DEV_THROTTLING
-		~CGROUP_PERF
-		~CGROUP_HUGETLB
-		~NET_CLS_CGROUP ~CGROUP_NET_PRIO
-		~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
-		~IP_NF_TARGET_REDIRECT
-		~IP_VS
-		~IP_VS_NFCT
-		~IP_VS_PROTO_TCP
-		~IP_VS_PROTO_UDP
-		~IP_VS_RR
-		"
-
-	if use selinux; then
-		CONFIG_CHECK+="
-			~SECURITY_SELINUX
-			"
-	fi
-
-	if use apparmor; then
-		CONFIG_CHECK+="
-			~SECURITY_APPARMOR
-			"
-	fi
-
-	# if ! is_set EXT4_USE_FOR_EXT2; then
-	#	check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
-	#	if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
-	#		echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
-	#	fi
-	# fi
-
-	CONFIG_CHECK+="
-		~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-	"
-
-	# if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then
-	#	if is_set EXT4_USE_FOR_EXT2; then
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)"
-	#	else
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
-	#	fi
-	# fi
-
-	# network drivers
-	CONFIG_CHECK+="
-		~VXLAN ~BRIDGE_VLAN_FILTERING
-		~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH
-		~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP
-	"
-	if kernel_is le 5 3; then
-		CONFIG_CHECK+="
-			~INET_XFRM_MODE_TRANSPORT
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~IPVLAN
-		"
-	CONFIG_CHECK+="
-		~MACVLAN ~DUMMY
-		"
-	CONFIG_CHECK+="
-		~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP
-	"
-
-	# storage drivers
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~OVERLAY_FS
-	"
-
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
-	export GOPATH="${WORKDIR}/${P}"
-	export VERSION=${PV}
-	tc-export PKG_CONFIG
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-	CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in btrfs overlay2; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	export EXCLUDE_AUTO_BUILDTAG_JOURNALD=$(usex systemd '' 'y')
-
-	# build binaries
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-	dobin bundles/dynbinary-daemon/dockerd
-	dobin bundles/dynbinary-daemon/docker-proxy
-	for f in dockerd-rootless-setuptool.sh dockerd-rootless.sh; do
-		dosym ../share/docker/contrib/${f} /usr/bin/${f}
-	done
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md NOTICE README.md
-	dodoc -r docs/*
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot:"
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "  systemctl enable docker.service"
-	else
-		elog "  rc-update add docker default"
-	fi
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog '  usermod -aG docker <youruser>'
-	elog
-
-	if has_version sys-fs/zfs; then
-		elog " ZFS storage driver is available"
-		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
-		elog
-	fi
-
-	optfeature "rootless mode support" sys-apps/shadow
-	optfeature "rootless mode support" sys-apps/rootlesskit
-	optfeature_header "for rootless mode you also need a network stack"
-	optfeature "rootless mode network stack" app-containers/slirp4netns
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-containers/docker/docker-27.4.0.ebuild b/app-containers/docker/docker-27.4.0.ebuild
deleted file mode 100644
index 97c7ea5319e3..000000000000
--- a/app-containers/docker/docker-27.4.0.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN=github.com/docker/docker
-MY_PV=${PV/_/-}
-inherit golang-vcs-snapshot linux-info optfeature systemd udev
-GIT_COMMIT=92a83937d0280dcbea92099b01e01aa4251c1777
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs +container-init +overlay2 seccomp selinux systemd"
-
-DEPEND="
-	acct-group/docker
-	>=dev-db/sqlite-3.7.9:3
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-	systemd? ( sys-apps/systemd )
-"
-
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	>=app-containers/containerd-1.7.24[apparmor?,btrfs?,seccomp?]
-	>=app-containers/runc-1.2.2[apparmor?,seccomp?]
-	!app-containers/docker-proxy
-	container-init? ( >=sys-process/tini-0.19.0[static] )
-	selinux? ( sec-policy/selinux-docker )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-BDEPEND="
-	>=dev-lang/go-1.16.12
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-# tests require running dockerd as root and downloading containers
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
-pkg_setup() {
-	# this is based on "contrib/check-config.sh" from upstream's sources
-	# required features.
-	CONFIG_CHECK="
-		~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-		~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-		~KEYS
-		~VETH ~BRIDGE ~BRIDGE_NETFILTER
-		~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-		~NETFILTER_XT_MATCH_ADDRTYPE
-		~NETFILTER_XT_MATCH_CONNTRACK
-		~NETFILTER_XT_MATCH_IPVS
-		~NETFILTER_XT_MARK
-		~IP_NF_NAT ~NF_NAT
-		~POSIX_MQUEUE
-	"
-	WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers"
-
-	if kernel_is lt 4 8; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is le 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-		"
-	fi
-
-	if kernel_is le 5 2; then
-		CONFIG_CHECK+="
-			~NF_NAT_NEEDED
-		"
-	fi
-
-	if kernel_is ge 4 15; then
-		CONFIG_CHECK+="
-			~CGROUP_BPF
-		"
-	fi
-
-	# optional features
-	CONFIG_CHECK+="
-		~USER_NS
-	"
-
-	if use seccomp; then
-		CONFIG_CHECK+="
-			~SECCOMP ~SECCOMP_FILTER
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~CGROUP_PIDS
-	"
-
-	if kernel_is lt 6 1; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP
-			"
-	fi
-
-	if kernel_is le 5 8; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP_ENABLED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NATIVE
-		"
-	if kernel_is lt 5 19; then
-		CONFIG_CHECK+="
-			~LEGACY_VSYSCALL_EMULATE
-			"
-	fi
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NONE
-		"
-	WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \
-		Containers with <=glibc-2.13 will not work"
-
-	if kernel_is le 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-	fi
-
-	if kernel_is lt 5; then
-		CONFIG_CHECK+="
-			~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~BLK_CGROUP ~BLK_DEV_THROTTLING
-		~CGROUP_PERF
-		~CGROUP_HUGETLB
-		~NET_CLS_CGROUP ~CGROUP_NET_PRIO
-		~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
-		~IP_NF_TARGET_REDIRECT
-		~IP_VS
-		~IP_VS_NFCT
-		~IP_VS_PROTO_TCP
-		~IP_VS_PROTO_UDP
-		~IP_VS_RR
-		"
-
-	if use selinux; then
-		CONFIG_CHECK+="
-			~SECURITY_SELINUX
-			"
-	fi
-
-	if use apparmor; then
-		CONFIG_CHECK+="
-			~SECURITY_APPARMOR
-			"
-	fi
-
-	# if ! is_set EXT4_USE_FOR_EXT2; then
-	#	check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
-	#	if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
-	#		echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
-	#	fi
-	# fi
-
-	CONFIG_CHECK+="
-		~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-	"
-
-	# if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then
-	#	if is_set EXT4_USE_FOR_EXT2; then
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)"
-	#	else
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
-	#	fi
-	# fi
-
-	# network drivers
-	CONFIG_CHECK+="
-		~VXLAN ~BRIDGE_VLAN_FILTERING
-		~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH
-		~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP
-	"
-	if kernel_is le 5 3; then
-		CONFIG_CHECK+="
-			~INET_XFRM_MODE_TRANSPORT
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~IPVLAN
-		"
-	CONFIG_CHECK+="
-		~MACVLAN ~DUMMY
-		"
-	CONFIG_CHECK+="
-		~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP
-	"
-
-	# storage drivers
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~OVERLAY_FS
-	"
-
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
-	export GOPATH="${WORKDIR}/${P}"
-	export VERSION=${PV}
-	tc-export PKG_CONFIG
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-	CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in btrfs overlay2; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	export EXCLUDE_AUTO_BUILDTAG_JOURNALD=$(usex systemd '' 'y')
-
-	# build binaries
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-	dobin bundles/dynbinary-daemon/dockerd
-	dobin bundles/dynbinary-daemon/docker-proxy
-	for f in dockerd-rootless-setuptool.sh dockerd-rootless.sh; do
-		dosym ../share/docker/contrib/${f} /usr/bin/${f}
-	done
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md NOTICE README.md
-	dodoc -r docs/*
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot:"
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "  systemctl enable docker.service"
-	else
-		elog "  rc-update add docker default"
-	fi
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog '  usermod -aG docker <youruser>'
-	elog
-
-	if has_version sys-fs/zfs; then
-		elog " ZFS storage driver is available"
-		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
-		elog
-	fi
-
-	optfeature "rootless mode support" sys-apps/shadow
-	optfeature "rootless mode support" sys-apps/rootlesskit
-	optfeature_header "for rootless mode you also need a network stack"
-	optfeature "rootless mode network stack" app-containers/slirp4netns
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-containers/docker/docker-27.4.1-r1.ebuild b/app-containers/docker/docker-27.4.1-r1.ebuild
index baaae0de2739..c3992cb0f31f 100644
--- a/app-containers/docker/docker-27.4.1-r1.ebuild
+++ b/app-containers/docker/docker-27.4.1-r1.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 @@ S="${WORKDIR}/moby-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 IUSE="apparmor btrfs +container-init cuda +overlay2 seccomp selinux systemd"
 
 DEPEND="
diff --git a/app-containers/docker/docker-27.4.1.ebuild b/app-containers/docker/docker-27.4.1.ebuild
deleted file mode 100644
index 846092ae8cf8..000000000000
--- a/app-containers/docker/docker-27.4.1.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-MY_PV=${PV/_/-}
-inherit go-module linux-info optfeature systemd toolchain-funcs udev
-GIT_COMMIT=c710b88579fcb5e0d53f96dcae976d79323b9166
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/moby-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs +container-init +overlay2 seccomp selinux systemd"
-
-DEPEND="
-	acct-group/docker
-	>=dev-db/sqlite-3.7.9:3
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-	systemd? ( sys-apps/systemd )
-"
-
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	>=app-containers/containerd-1.7.24[apparmor?,btrfs?,seccomp?]
-	>=app-containers/runc-1.2.2[apparmor?,seccomp?]
-	!app-containers/docker-proxy
-	container-init? ( >=sys-process/tini-0.19.0[static] )
-	selinux? ( sec-policy/selinux-docker )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-# tests require running dockerd as root and downloading containers
-RESTRICT="installsources strip test"
-
-# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
-pkg_setup() {
-	# this is based on "contrib/check-config.sh" from upstream's sources
-	# required features.
-	CONFIG_CHECK="
-		~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-		~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-		~KEYS
-		~VETH ~BRIDGE ~BRIDGE_NETFILTER
-		~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-		~NETFILTER_XT_MATCH_ADDRTYPE
-		~NETFILTER_XT_MATCH_CONNTRACK
-		~NETFILTER_XT_MATCH_IPVS
-		~NETFILTER_XT_MARK
-		~IP_NF_NAT ~NF_NAT
-		~POSIX_MQUEUE
-	"
-	WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers"
-
-	if kernel_is lt 4 8; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is le 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-		"
-	fi
-
-	if kernel_is le 5 2; then
-		CONFIG_CHECK+="
-			~NF_NAT_NEEDED
-		"
-	fi
-
-	if kernel_is ge 4 15; then
-		CONFIG_CHECK+="
-			~CGROUP_BPF
-		"
-	fi
-
-	# optional features
-	CONFIG_CHECK+="
-		~USER_NS
-	"
-
-	if use seccomp; then
-		CONFIG_CHECK+="
-			~SECCOMP ~SECCOMP_FILTER
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~CGROUP_PIDS
-	"
-
-	if kernel_is lt 6 1; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP
-			"
-	fi
-
-	if kernel_is le 5 8; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP_ENABLED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NATIVE
-		"
-	if kernel_is lt 5 19; then
-		CONFIG_CHECK+="
-			~LEGACY_VSYSCALL_EMULATE
-			"
-	fi
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NONE
-		"
-	WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \
-		Containers with <=glibc-2.13 will not work"
-
-	if kernel_is le 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-	fi
-
-	if kernel_is lt 5; then
-		CONFIG_CHECK+="
-			~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~BLK_CGROUP ~BLK_DEV_THROTTLING
-		~CGROUP_PERF
-		~CGROUP_HUGETLB
-		~NET_CLS_CGROUP ~CGROUP_NET_PRIO
-		~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
-		~IP_NF_TARGET_REDIRECT
-		~IP_VS
-		~IP_VS_NFCT
-		~IP_VS_PROTO_TCP
-		~IP_VS_PROTO_UDP
-		~IP_VS_RR
-		"
-
-	if use selinux; then
-		CONFIG_CHECK+="
-			~SECURITY_SELINUX
-			"
-	fi
-
-	if use apparmor; then
-		CONFIG_CHECK+="
-			~SECURITY_APPARMOR
-			"
-	fi
-
-	# if ! is_set EXT4_USE_FOR_EXT2; then
-	#	check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
-	#	if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
-	#		echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
-	#	fi
-	# fi
-
-	CONFIG_CHECK+="
-		~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-	"
-
-	# if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then
-	#	if is_set EXT4_USE_FOR_EXT2; then
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)"
-	#	else
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
-	#	fi
-	# fi
-
-	# network drivers
-	CONFIG_CHECK+="
-		~VXLAN ~BRIDGE_VLAN_FILTERING
-		~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH
-		~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP
-	"
-	if kernel_is le 5 3; then
-		CONFIG_CHECK+="
-			~INET_XFRM_MODE_TRANSPORT
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~IPVLAN
-		"
-	CONFIG_CHECK+="
-		~MACVLAN ~DUMMY
-		"
-	CONFIG_CHECK+="
-		~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP
-	"
-
-	# storage drivers
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~OVERLAY_FS
-	"
-
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	default
-	cd "${S}"
-	[[ -f go.mod ]] || ln -s vendor.mod go.mod || die
-	[[ -f go.sum ]] || ln -s vendor.sum go.sum || die
-}
-
-src_compile() {
-	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
-	export VERSION=${PV}
-	tc-export PKG_CONFIG
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-	CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in btrfs overlay2; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	export AUTO_GOPATH=1
-	export EXCLUDE_AUTO_BUILDTAG_JOURNALD=$(usex systemd '' 'y')
-	export GO_MD2MAN=/usr/bin/go-md2man
-
-	# build binaries
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	# build man page
-	cd man || die
-	emake || die
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-	dobin bundles/dynbinary-daemon/dockerd
-	dobin bundles/dynbinary-daemon/docker-proxy
-	for f in dockerd-rootless-setuptool.sh dockerd-rootless.sh; do
-		dosym ../share/docker/contrib/${f} /usr/bin/${f}
-	done
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md NOTICE README.md
-	dodoc -r docs/*
-	doman man/man8/dockerd.8
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot:"
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "  systemctl enable docker.service"
-	else
-		elog "  rc-update add docker default"
-	fi
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog '  usermod -aG docker <youruser>'
-	elog
-
-	if has_version sys-fs/zfs; then
-		elog " ZFS storage driver is available"
-		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
-		elog
-	fi
-
-	optfeature "rootless mode support" sys-apps/shadow
-	optfeature "rootless mode support" sys-apps/rootlesskit
-	optfeature_header "for rootless mode you also need a network stack"
-	optfeature "rootless mode network stack" app-containers/slirp4netns
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-containers/docker/docker-27.5.0.ebuild b/app-containers/docker/docker-27.5.0.ebuild
new file mode 100644
index 000000000000..852b70a8ce03
--- /dev/null
+++ b/app-containers/docker/docker-27.5.0.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+MY_PV=${PV/_/-}
+inherit go-module linux-info optfeature systemd toolchain-funcs udev
+GIT_COMMIT=38b84dce32c45732606fe09ffebef8b29a783644
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/moby-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor btrfs +container-init cuda +overlay2 seccomp selinux systemd"
+
+DEPEND="
+	acct-group/docker
+	>=dev-db/sqlite-3.7.9:3
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+	systemd? ( sys-apps/systemd )
+"
+
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+	${DEPEND}
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	>=app-containers/containerd-1.7.24[apparmor?,btrfs?,seccomp?]
+	>=app-containers/runc-1.2.2[apparmor?,seccomp?]
+	!app-containers/docker-proxy
+	!<app-containers/docker-cli-${PV}
+	container-init? ( >=sys-process/tini-0.19.0[static] )
+	cuda? ( app-containers/nvidia-container-toolkit )
+	selinux? ( sec-policy/selinux-docker )
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+BDEPEND="
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+# tests require running dockerd as root and downloading containers
+RESTRICT="installsources strip test"
+
+# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
+pkg_setup() {
+	# this is based on "contrib/check-config.sh" from upstream's sources
+	# required features.
+	CONFIG_CHECK="
+		~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+		~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+		~KEYS
+		~VETH ~BRIDGE ~BRIDGE_NETFILTER
+		~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+		~NETFILTER_XT_MATCH_ADDRTYPE
+		~NETFILTER_XT_MATCH_CONNTRACK
+		~NETFILTER_XT_MATCH_IPVS
+		~NETFILTER_XT_MARK
+		~IP_NF_NAT ~NF_NAT
+		~POSIX_MQUEUE
+	"
+	WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers"
+
+	if kernel_is lt 4 8; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if kernel_is le 5 1; then
+		CONFIG_CHECK+="
+			~NF_NAT_IPV4
+		"
+	fi
+
+	if kernel_is le 5 2; then
+		CONFIG_CHECK+="
+			~NF_NAT_NEEDED
+		"
+	fi
+
+	if kernel_is ge 4 15; then
+		CONFIG_CHECK+="
+			~CGROUP_BPF
+		"
+	fi
+
+	# optional features
+	CONFIG_CHECK+="
+		~USER_NS
+	"
+
+	if use seccomp; then
+		CONFIG_CHECK+="
+			~SECCOMP ~SECCOMP_FILTER
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~CGROUP_PIDS
+	"
+
+	if kernel_is lt 6 1; then
+		CONFIG_CHECK+="
+			~MEMCG_SWAP
+			"
+	fi
+
+	if kernel_is le 5 8; then
+		CONFIG_CHECK+="
+			~MEMCG_SWAP_ENABLED
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~!LEGACY_VSYSCALL_NATIVE
+		"
+	if kernel_is lt 5 19; then
+		CONFIG_CHECK+="
+			~LEGACY_VSYSCALL_EMULATE
+			"
+	fi
+	CONFIG_CHECK+="
+		~!LEGACY_VSYSCALL_NONE
+		"
+	WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \
+		Containers with <=glibc-2.13 will not work"
+
+	if kernel_is le 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+	fi
+
+	if kernel_is lt 5; then
+		CONFIG_CHECK+="
+			~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~BLK_CGROUP ~BLK_DEV_THROTTLING
+		~CGROUP_PERF
+		~CGROUP_HUGETLB
+		~NET_CLS_CGROUP ~CGROUP_NET_PRIO
+		~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
+		~IP_NF_TARGET_REDIRECT
+		~IP_VS
+		~IP_VS_NFCT
+		~IP_VS_PROTO_TCP
+		~IP_VS_PROTO_UDP
+		~IP_VS_RR
+		"
+
+	if use selinux; then
+		CONFIG_CHECK+="
+			~SECURITY_SELINUX
+			"
+	fi
+
+	if use apparmor; then
+		CONFIG_CHECK+="
+			~SECURITY_APPARMOR
+			"
+	fi
+
+	# if ! is_set EXT4_USE_FOR_EXT2; then
+	#	check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
+	#	if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
+	#		echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
+	#	fi
+	# fi
+
+	CONFIG_CHECK+="
+		~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+	"
+
+	# if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then
+	#	if is_set EXT4_USE_FOR_EXT2; then
+	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)"
+	#	else
+	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
+	#	fi
+	# fi
+
+	# network drivers
+	CONFIG_CHECK+="
+		~VXLAN ~BRIDGE_VLAN_FILTERING
+		~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH
+		~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP
+	"
+	if kernel_is le 5 3; then
+		CONFIG_CHECK+="
+			~INET_XFRM_MODE_TRANSPORT
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~IPVLAN
+		"
+	CONFIG_CHECK+="
+		~MACVLAN ~DUMMY
+		"
+	CONFIG_CHECK+="
+		~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP
+	"
+
+	# storage drivers
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~OVERLAY_FS
+	"
+
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	default
+	cd "${S}"
+	[[ -f go.mod ]] || ln -s vendor.mod go.mod || die
+	[[ -f go.sum ]] || ln -s vendor.sum go.sum || die
+}
+
+src_compile() {
+	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
+	export VERSION=${PV}
+	tc-export PKG_CONFIG
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
+	CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in btrfs overlay2; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	export AUTO_GOPATH=1
+	export EXCLUDE_AUTO_BUILDTAG_JOURNALD=$(usex systemd '' 'y')
+	export GO_MD2MAN=/usr/bin/go-md2man
+
+	# build binaries
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	# build man page
+	cd man || die
+	emake || die
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim-runc-v2 /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+	dobin bundles/dynbinary-daemon/dockerd
+	dobin bundles/dynbinary-daemon/docker-proxy
+	for f in dockerd-rootless-setuptool.sh dockerd-rootless.sh; do
+		dosym ../share/docker/contrib/${f} /usr/bin/${f}
+	done
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md NOTICE README.md
+	dodoc -r docs/*
+	doman man/man8/dockerd.8
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot:"
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "  systemctl enable docker.service"
+	else
+		elog "  rc-update add docker default"
+	fi
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog '  usermod -aG docker <youruser>'
+	elog
+
+	if has_version sys-fs/zfs; then
+		elog " ZFS storage driver is available"
+		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
+		elog
+	fi
+
+	optfeature "rootless mode support" sys-apps/shadow
+	optfeature "rootless mode support" sys-apps/rootlesskit
+	optfeature_header "for rootless mode you also need a network stack"
+	optfeature "rootless mode network stack" app-containers/slirp4netns
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-containers/docker/files/0001-Openrc-Depend-on-containerd-init-script.patch b/app-containers/docker/files/0001-Openrc-Depend-on-containerd-init-script.patch
deleted file mode 100644
index 22aa145f33b8..000000000000
--- a/app-containers/docker/files/0001-Openrc-Depend-on-containerd-init-script.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bb69104381805014eb7675682d204fe460a52388 Mon Sep 17 00:00:00 2001
-From: Jan Breig <git@pygos.space>
-Date: Mon, 16 May 2022 14:58:36 +0200
-Subject: [PATCH] Openrc: Depend on containerd init script
-
-Signed-off-by: Jan Breig <git@pygos.space>
----
- contrib/init/openrc/docker.initd | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/contrib/init/openrc/docker.initd b/contrib/init/openrc/docker.initd
-index 3229223bad..57defb8f57 100644
---- a/contrib/init/openrc/docker.initd
-+++ b/contrib/init/openrc/docker.initd
-@@ -17,6 +17,10 @@ rc_ulimit="${DOCKER_ULIMIT:--c unlimited -n 1048576 -u unlimited}"
- 
- retry="${DOCKER_RETRY:-TERM/60/KILL/10}"
- 
-+depend() {
-+	need containerd
-+}
-+
- start_pre() {
- 	checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE"
- }
--- 
-2.35.1
-
diff --git a/app-containers/docker/files/docker-26.1.0-automagic-systemd.patch b/app-containers/docker/files/docker-26.1.0-automagic-systemd.patch
deleted file mode 100644
index 004dbb9ad3c7..000000000000
--- a/app-containers/docker/files/docker-26.1.0-automagic-systemd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/914076
-https://github.com/moby/moby/issues/47770
---- a/hack/make.sh
-+++ b/hack/make.sh
-@@ -83,7 +83,7 @@ if [ ! "$GOPATH" ]; then
- 	exit 1
- fi
- 
--if ${PKG_CONFIG} 'libsystemd' 2> /dev/null; then
-+if [[ -n "$SYSTEMD" ]] && [[ "$SYSTEMD" == 1 ]] && ${PKG_CONFIG} 'libsystemd' 2> /dev/null; then
- 	DOCKER_BUILDTAGS+=" journald"
- fi
- 
diff --git a/app-containers/docker/metadata.xml b/app-containers/docker/metadata.xml
index dfe556527506..29ae0a0b6db9 100644
--- a/app-containers/docker/metadata.xml
+++ b/app-containers/docker/metadata.xml
@@ -21,10 +21,6 @@
 			Makes the a staticly-linked init system tini available inside a
 			container.
 		</flag>
-		<flag name="overlay">
-			Enables dependencies for the "overlay" graph driver, including
-			necessary kernel flags.
-		</flag>
 		<flag name="overlay2">
 			Enables dependencies for the "overlay2" graph driver, including
 			necessary kernel flags.
diff --git a/app-containers/flannel/Manifest b/app-containers/flannel/Manifest
index adad8566f465..61655d7ab7e8 100644
--- a/app-containers/flannel/Manifest
+++ b/app-containers/flannel/Manifest
@@ -1,2 +1,4 @@
 DIST flannel-0.17.0.tar.gz 9534647 BLAKE2B 03d6d036d5877641a2fc7b6654995822522d378943e4d7b2531be8197de6e7d6e0509143cd8d4dfd3d2ef11c9355011bfc44c834f966e14fd3aa774350bcab11 SHA512 f0625339e387a6ae81780d21025c282c2e0caf8b32ac778634a877a4e04ebf10d41fc10b50ae477c28815cedaf34af867b651ed5a8c5267177ea925abc6a1253
 DIST flannel-0.20.0.tar.gz 10737855 BLAKE2B d2e5821c4457a8c0781618a62245132f862d7877ce10467f8d9c72be2440f7b60f0866a3420a69d13bc53826407b0b653e6c2385f8e56d684ee1e09acf0528f0 SHA512 624a293607d3d4d5e53b41b5fd26a416f8499a763f8cfbe39c79796644a56d5eb3605664592d15eddde519f2dba55da241889be159644bbe40e78ae72ed5a43b
+DIST flannel-0.26.3-deps.tar.xz 4762164 BLAKE2B c6fcbc0bf9b99f36332af3ddbbfcc10f150da36f3464ab44ad04170aff1cdec49e4bde89065e2945260fd4e8ecb8aebcfa31f1800985269a47ea12a6ba743318 SHA512 f0d78ea6351b0851491b2d00bfeac5e12acbbc7baf387162617f9330a56a7e6b80f11ba6e3c9c895624c8df6969c214721aea3d63156420418044d3280fb5cbe
+DIST flannel-0.26.3.tar.gz 2344640 BLAKE2B 6671f64ca90804cbe9293a66d9611fd276ddc8be886bd7bffc4d11b3ef4c5ca9119d8494a7719c578f402713f11ab2c6d19a3688a8897ba4c549abe71f55e284 SHA512 7888f28b2994fa0ae6036e54d0291e57aef54cbfb8db5869bd62e33ae092fe028adb3780acfdb2017187ba035f7c3310cc51d0214aa78713321f062343364bcb
diff --git a/app-containers/flannel/flannel-0.26.3.ebuild b/app-containers/flannel/flannel-0.26.3.ebuild
new file mode 100644
index 000000000000..25f1a6a148cc
--- /dev/null
+++ b/app-containers/flannel/flannel-0.26.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd tmpfiles
+
+KEYWORDS="~amd64 ~arm64"
+DESCRIPTION="An etcd backed network fabric for containers"
+HOMEPAGE="https://github.com/flannel-io/flannel"
+SRC_URI="https://github.com/flannel-io/flannel/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+LICENSE+=" BSD ISC LGPL-3 MIT"
+SLOT="0"
+IUSE="hardened"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	sed -e "s:^var Version =.*:var Version = \"${PV}\":" \
+		-i "${S}/pkg/version/version.go" || die
+}
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"\
+	ego build -o dist/flanneld -ldflags "
+		-X github.com/flannel-io/flannel/version.Version=v${PV}
+		-extldflags \"-static\"" . || die
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}" \
+		ego test -v -work -x "${EGO_PN}" || die
+}
+
+src_install() {
+	dobin dist/${PN}d
+	exeinto /usr/libexec/flannel
+	doexe dist/mk-docker-opts.sh
+	insinto /etc/systemd/system/docker.service.d
+	newins "${FILESDIR}/flannel-docker.conf" flannel.conf
+	newinitd "${FILESDIR}"/flanneld.initd flanneld
+	newconfd "${FILESDIR}"/flanneld.confd flanneld
+	keepdir /var/log/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/flanneld.logrotated flanneld
+	newtmpfiles "${FILESDIR}/flannel.tmpfilesd" flannel.conf
+	systemd_dounit "${FILESDIR}/flanneld.service"
+	dodoc README.md
+}
+
+pkg_postinst() {
+	tmpfiles_process flannel.conf
+}
diff --git a/app-containers/grype/Manifest b/app-containers/grype/Manifest
index 79ea391c2718..f92d78054435 100644
--- a/app-containers/grype/Manifest
+++ b/app-containers/grype/Manifest
@@ -8,3 +8,5 @@ DIST grype-0.73.0-deps.tar.xz 627765660 BLAKE2B 3d3949922a635d0654120aaf05edef38
 DIST grype-0.73.0.tar.gz 1124082 BLAKE2B 835b1833e6809510821f07906df06c55b418f7226dba190b4bf4f32ae603c006842496512d5e788eef8f2ce7e215a923bc338a1c55f089a3942476275663a6b2 SHA512 06be60104f23be38578660a79d3c593e988e2c5fce646b00dedec9af4d3442f204f81d063806944cfdaa04daffdff256ac71b52ed94d8ae07acde1e15c442f08
 DIST grype-0.79.3-deps.tar.xz 219363916 BLAKE2B 7396b4f0bd734504b30c971c592dae49a7ebc118db6efdb668d412622708797b8ef0ebded3a1d0474e3fb2fc1d6a3ac078b11de9fb38f5d15cc5edcbd57276be SHA512 b037535208652b64dd424a2daf9caf5232e40e0dba344c62600c0065f342206edc2797b9e155a5830f013744c3aa1d6564e623261a0cd6c1c3124eaae3f80899
 DIST grype-0.79.3.tar.gz 1165282 BLAKE2B 016e2a0ccad51757be83146fd6d187929e61f37531881bf811b6058daf935733f6a6ed23a9fac818a6a6ef815227fa045806c79ef2820a9ee78711cb417c0698 SHA512 0fbae679e8fd43efc2440d6db2f46a51ea4b6acd76f72a69d278b9eec85204b2b36d9077963fea2541bb4ada168802349fc066ffa260678e13429301cecac960
+DIST grype-0.86.1-deps.tar.xz 195229268 BLAKE2B 79fcd429fef63abdc640e326025f4f722ab52b9936d50560a0b5876e48c8058b565551c40569466077c1c02caedbbfeb772508c1e92820e6eadba5fe62edf21e SHA512 3d03679899316ffe7adccaf4341eb3c56f89d794c0341bee1531907818d687de8d96522c4e4b16c62277135c09226b4701d224e8eafc680727bebe47136f354a
+DIST grype-0.86.1.tar.gz 1224651 BLAKE2B 28c514402e3d7c40867048f1b5497b39036b2a69a60202344f2dfdcafda6bbbedeadb57feef8cadd120b494d90b8f25fd032b5a5b80efc00ba057d835c33f567 SHA512 3ee482eca7c67b2e5ab25107614c9336bbeaa428e7ecaa1d602378ecd4173918da16b8ea7ef3829fc6524035f3bad0097a241cf5f34f8a83902db9fb6c7ba192
diff --git a/app-containers/grype/grype-0.86.1.ebuild b/app-containers/grype/grype-0.86.1.ebuild
new file mode 100644
index 000000000000..cf2b08010f9b
--- /dev/null
+++ b/app-containers/grype/grype-0.86.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+GIT_COMMIT=5c4fee7b1170976ab435de052fc3611bc955f1f1
+SYFT_VERSION=1.18.1
+
+DESCRIPTION="A vulnerability scanner for container images and filesystems"
+HOMEPAGE="https://www.anchore.com"
+SRC_URI="https://github.com/anchore/grype/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# tests require a running docker
+RESTRICT="test"
+
+src_compile() {
+	ego build -o bin/grype -ldflags "
+		-extldflags '-static'
+		-X github.com/anchore/grype/internal/version.version=${PV}
+		-X github.com/anchore/grype/internal/version.syftVersion=${SYFT_VERSION}
+		-X github.com/anchore/grype/internal/version.gitCommit=${GIT_COMMIT}
+		-X github.com/anchore/grype/internal/version.buildDate=${BUILD_DATE}
+		-X github.com/anchore/grype/internal/version.gitDescription=v${PV}
+		" ./cmd/grype
+}
+
+src_install() {
+	dobin bin/grype
+}
diff --git a/app-containers/lxc-templates/Manifest b/app-containers/lxc-templates/Manifest
index 292a5eb8bce9..fe3706b4c610 100644
--- a/app-containers/lxc-templates/Manifest
+++ b/app-containers/lxc-templates/Manifest
@@ -1,2 +1,3 @@
 DIST lxc-templates-3.0.4.tar.gz 257015 BLAKE2B 599c0cb083cf358c8252467b3870450e754b2aa30daf8d72e07e746ce37e2fb26fecc0adf416325c9e02b1f98f5745af5985360e9494e5ed54a242a3e17330d4 SHA512 e5b628b40e7108fca858dbd9ae92495016069ff3cba7feb34e9559c7f61dfc36944a9ef441369952a988e821f8b5d883ae97b81f6eef0683a22f1f702b5b913e
 DIST lxc-templates-3.0.4.tar.gz.asc 833 BLAKE2B a125e46200cbc1bce6a721ba338b6c896098711a7454ee18a153b9e7a3d25e08ea29cf13accf25e8af085865237fe4b20d633c92d71103213a49ba7d80de0154 SHA512 1195a3d835935606af405af77d5ee629dc7b7c0f05a17c05df191f6275c8e7ebec9eb05201bbfb46060af5a36aba4f17b53122904fd10f2d8b28524f4e5b5e71
+DIST lxc-templates-3.0.4_p20240917.tar.gz 161974 BLAKE2B c3c3bee881197779a09d931c5bdd53ef14a58ee4e38dc1bc44cf4f048bf7bd4c78a3e499633ca705299d24675b67f16ab99e3680b8a9b485155a2bf386fe863e SHA512 a4365024ab0cfa6c6558b00e1904c13aaab2e998dba4f8a5f78e6091d8c5f633d42a66234512a90c1695a9bd05f24fb87d7a7085d0680b2331a4c814138f28bd
diff --git a/app-containers/lxc-templates/lxc-templates-3.0.4_p20240917.ebuild b/app-containers/lxc-templates/lxc-templates-3.0.4_p20240917.ebuild
new file mode 100644
index 000000000000..3a1ba2016b5e
--- /dev/null
+++ b/app-containers/lxc-templates/lxc-templates-3.0.4_p20240917.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_COMMIT="da14466ce09afa3b39adb2b324be20084b776eb7"
+DESCRIPTION="Old style template scripts for LXC"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc-templates"
+SRC_URI="https://github.com/lxc/lxc-templates/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+RDEPEND=">=app-containers/lxc-3.0"
+DEPEND="${RDEPEND}"
+
+DOCS=()
+
+S="${WORKDIR}/lxc-templates-${MY_COMMIT}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/app-containers/netavark/Manifest b/app-containers/netavark/Manifest
index 819ceee19b19..2b474ebc5985 100644
--- a/app-containers/netavark/Manifest
+++ b/app-containers/netavark/Manifest
@@ -1,10 +1,2 @@
-DIST netavark-1.10.2.crate 154261 BLAKE2B 2da5b12917f5db01d82c47808f403e06d6abbcbad0b777d1871de73d52d25219e3d6f8db48feb862aff8a20ed2184c728e813871aa1acc1d02e3997987a932b6 SHA512 362dd2652b3a9d9d1dec99cd85bc6e74b323d86b79ded742e68472e0b58881a5306d7217218d88e27d5e1c4094f2d67c9cb766d4b4c1ee2185c8b4fcbd299e3d
-DIST netavark-1.10.3.crate 154416 BLAKE2B a7750304484ae820eb3bb1bc4de8c2ad22d95494fe10471014e0eb999fb7578c5e9c2ab352fe357d964d701206ee7016f87134a62afe0a03cd1b574cae1264ca SHA512 6ed9cd5a69a6eacc4ad839a82680c7b98d453564aadee41eb6ea632223fba7fbdb20f11e4146dc74b6c6d3695ac50624424b3260dbb7769a4100a918e4328dbf
-DIST netavark-1.11.0.crate 155698 BLAKE2B df460f6a2e5ce82645dccf6ca487724da2abc6f3f2c90f56d935d691ddd9a4229b785177a4e6360f75aa13ee7cdb29a2794c0b7360ef9d40ea3f946771d3ab73 SHA512 e25b075f98cb2aa55cf0e8d8868aac3b6ff0b390f4f0632d6ee2f431cede144948ed98015576cf8a64fcc1a2c33c454415159951aacbdf0611613da867db9a13
 DIST netavark-1.12.2.crate 156878 BLAKE2B 787fd23e3fa233a18a753aa55a43413aafff47b4d0733a9f2250d3f2159c1a3d0dd20272997701b3bc39a6a042060e3d2edad2418326873111d8183f0060560c SHA512 45e423e15945ce63e1bb5d2364377de65efd2f2edfeb0fd3522d2d8afb5cb60e1951b5810ac1dbdbbdf77176885b738ad864132daa8d7de858fb4edce340d7ea
-DIST netavark-1.9.0.crate 139321 BLAKE2B c0c40c5b109544c094bf83ba9c73f829472c7703a72e25ec3dcb9b62b926f404618b2cb143fcc944f2240db074de14e711115d6f51d722125e152eea0ac0a631 SHA512 7a5fb4a856b5815c141ad63abbe0f122d762a411b86189add76cfff99adfdb066e24a7b577683950efdc39f2b7955bbdfb31f2c1c41037702fb732916e8aeebe
-DIST netavark-v1.10.2-vendor.tar.gz 16135498 BLAKE2B 607cad9d80067d579adaafdea22b238f5e2f6f92a3c6aed530c8e97bce2f7f869adeabbc7b7d1c04f7c517459112c42b5588aa3ccbf04d5205d2b8212c1e7a42 SHA512 a5079b724d25af60cc094dd5c0bc9e01d503f64bee7ef1c8e616e79793726d848a5e000d951f02d2516f10feea23e30ab637b37ae09da5580f4edb1e783240c0
-DIST netavark-v1.10.3-vendor.tar.gz 16135507 BLAKE2B 114519b76d932c5918fd91cea73e8bc9f5aa3a63275f9218e667e400c3e2512e5db29ce806b5e5b509b043c04a3436344a27cf170e203d4360d00247e48b5ca9 SHA512 b8a99f45ba4ebb20414fe052ff08b1e7a7a86994c7dfa2f36d0500d52bcbd2d279aeff19fb0844a65e2375e86da33af735851f038f598771d2dac96ff7e032a5
-DIST netavark-v1.11.0-vendor.tar.gz 17751524 BLAKE2B b466b27674e6944b2de8a684ee3e14f26775b6065f0f1e82987a0c240725c01f88d2138641b768b5e03fce5b26908d0281b1983b8c1844af4999064bf24d8f15 SHA512 d858bddaaf41b284af9ede84a4d3aab5b5935ea83df5261dfa58e2b7d14962dd55983b1a95b2692e323ea40fc2dc4d9b1bdf2aed90644739e6333c794a7915cb
 DIST netavark-v1.12.2-vendor.tar.gz 18364290 BLAKE2B e2f09d53ac8106196aa873732df66f0357a5e26488cc1b8f1d10f5f5d650d471272efca7f33860afe6242500d934ee22d9ea58c256e47e296ed57d8d563f1f27 SHA512 1396eb4e41282745949a7a511c6c44e703c810624e56b8ca9455fec52c59d4ec4333103e00188b2b8c08a60bb9e8a8eca6ed995103c0dc20b3b91c1e0a1d0dfb
-DIST netavark-v1.9.0-vendor.tar.gz 16032862 BLAKE2B 313bcde75f2355dab3fa4fdc82881109924c07408aa352e92b590356cf292cd60ad39d8ef31687935e3fed6f22ec8c3b8f26e6eae21fdf211c29c83b745c8a84 SHA512 a5c11dd47122490579a260b6ac3b1c8f01d1c2881e58dbcc5bece398c7d6ef01f376f8c342df4ef619b135cc92a95c48741c8098413c33ede696c87a9cdcc96c
diff --git a/app-containers/netavark/netavark-1.10.2-r1.ebuild b/app-containers/netavark/netavark-1.10.2-r1.ebuild
deleted file mode 100644
index 42ba29c8332d..000000000000
--- a/app-containers/netavark/netavark-1.10.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
-
-inherit cargo systemd
-
-DESCRIPTION="A container network stack"
-HOMEPAGE="https://github.com/containers/netavark"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/netavark.git"
-else
-	SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-fi
-
-# main
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB"
-SLOT="0"
-BDEPEND="dev-go/go-md2man
-	dev-libs/protobuf"
-
-QA_FLAGS_IGNORED="
-	usr/libexec/podman/${PN}"
-QA_PRESTRIPPED="
-	usr/libexec/podman/${PN}"
-
-ECARGO_VENDOR="${WORKDIR}/vendor"
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die
-}
-
-src_compile() {
-	cargo_src_compile
-	export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)"
-	emake docs
-}
-
-# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass)
-src_install() {
-	default
-}
diff --git a/app-containers/netavark/netavark-1.10.3-r1.ebuild b/app-containers/netavark/netavark-1.10.3-r1.ebuild
deleted file mode 100644
index 499417f28d96..000000000000
--- a/app-containers/netavark/netavark-1.10.3-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
-
-inherit cargo systemd
-
-DESCRIPTION="A container network stack"
-HOMEPAGE="https://github.com/containers/netavark"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/netavark.git"
-else
-	SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
-fi
-
-# main
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB"
-SLOT="0"
-BDEPEND="dev-go/go-md2man
-	dev-libs/protobuf"
-
-QA_FLAGS_IGNORED="
-	usr/libexec/podman/${PN}"
-QA_PRESTRIPPED="
-	usr/libexec/podman/${PN}"
-
-ECARGO_VENDOR="${WORKDIR}/vendor"
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die
-}
-
-src_compile() {
-	cargo_src_compile
-	export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)"
-	emake docs
-}
-
-# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass)
-src_install() {
-	default
-}
diff --git a/app-containers/netavark/netavark-1.11.0-r1.ebuild b/app-containers/netavark/netavark-1.11.0-r1.ebuild
deleted file mode 100644
index 35792c7d1868..000000000000
--- a/app-containers/netavark/netavark-1.11.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
-
-inherit cargo systemd
-
-DESCRIPTION="A container network stack"
-HOMEPAGE="https://github.com/containers/netavark"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/netavark.git"
-else
-	SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
-	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv"
-fi
-
-# main
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB"
-SLOT="0"
-BDEPEND="dev-go/go-md2man
-	dev-libs/protobuf"
-
-QA_FLAGS_IGNORED="
-	usr/libexec/podman/${PN}"
-QA_PRESTRIPPED="
-	usr/libexec/podman/${PN}"
-
-ECARGO_VENDOR="${WORKDIR}/vendor"
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die
-}
-
-src_compile() {
-	cargo_src_compile
-	export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)"
-	emake docs
-}
-
-# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass)
-src_install() {
-	default
-}
diff --git a/app-containers/netavark/netavark-1.12.2-r1.ebuild b/app-containers/netavark/netavark-1.12.2-r1.ebuild
index 81168b09df45..e0cf15c2ee10 100644
--- a/app-containers/netavark/netavark-1.12.2-r1.ebuild
+++ b/app-containers/netavark/netavark-1.12.2-r1.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 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/containers/netavark.git"
 else
 	SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv"
 fi
 
 # main
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0"
 LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB"
 SLOT="0"
 BDEPEND="dev-go/go-md2man
-	dev-libs/protobuf"
+	dev-libs/protobuf[protoc]"
 
 QA_FLAGS_IGNORED="
 	usr/libexec/podman/${PN}"
diff --git a/app-containers/netavark/netavark-1.9.0-r1.ebuild b/app-containers/netavark/netavark-1.9.0-r1.ebuild
deleted file mode 100644
index 499417f28d96..000000000000
--- a/app-containers/netavark/netavark-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
-
-inherit cargo systemd
-
-DESCRIPTION="A container network stack"
-HOMEPAGE="https://github.com/containers/netavark"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/netavark.git"
-else
-	SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
-fi
-
-# main
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB"
-SLOT="0"
-BDEPEND="dev-go/go-md2man
-	dev-libs/protobuf"
-
-QA_FLAGS_IGNORED="
-	usr/libexec/podman/${PN}"
-QA_PRESTRIPPED="
-	usr/libexec/podman/${PN}"
-
-ECARGO_VENDOR="${WORKDIR}/vendor"
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die
-}
-
-src_compile() {
-	cargo_src_compile
-	export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)"
-	emake docs
-}
-
-# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass)
-src_install() {
-	default
-}
diff --git a/app-containers/netavark/netavark-9999.ebuild b/app-containers/netavark/netavark-9999.ebuild
index 81168b09df45..689cd3e01897 100644
--- a/app-containers/netavark/netavark-9999.ebuild
+++ b/app-containers/netavark/netavark-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
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0"
 LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB"
 SLOT="0"
 BDEPEND="dev-go/go-md2man
-	dev-libs/protobuf"
+	dev-libs/protobuf[protoc]"
 
 QA_FLAGS_IGNORED="
 	usr/libexec/podman/${PN}"
diff --git a/app-containers/podman-compose/Manifest b/app-containers/podman-compose/Manifest
index 9b60d9686f04..d0382f962bb3 100644
--- a/app-containers/podman-compose/Manifest
+++ b/app-containers/podman-compose/Manifest
@@ -1 +1,2 @@
 DIST podman-compose-1.2.0.gh.tar.gz 84708 BLAKE2B ab1f458cef6db99c5727a6676cd1a15ccc58108a14763b9bf8e1093bc674e1adbee21c81744a0cb7798be6134e7b566a4ed9222be71bda0d8f7e4568b3d2fcb7 SHA512 2b45bcb331e334d362a0906563377e1514aca95f50c575e4b53039e58394b39af1ceeb606d90c652ef6d8cc5e8764a27edf11fc9782a89b186812a474b583579
+DIST podman-compose-1.3.0.gh.tar.gz 103006 BLAKE2B aa3202e23728d71cb7685ceeac5ba67d638477666ae5863d67ed36d404a84e897ffbf60c4188aedf5fda06b43db697baff338f43c8637981ffa3c4e62872f140 SHA512 7f7be6d0d230554f766aa9d7d2e4a8b16155780706859f6f0ee94b7e73bd6b095f20948ff168f5492690ee7e8f5acd7dd8d88219d8721c483214eba74575a582
diff --git a/app-containers/podman-compose/podman-compose-1.3.0.ebuild b/app-containers/podman-compose/podman-compose-1.3.0.ebuild
new file mode 100644
index 000000000000..881806f6e2a1
--- /dev/null
+++ b/app-containers/podman-compose/podman-compose-1.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2023-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="A script to run docker-compose.yml using Podman"
+HOMEPAGE="https://github.com/containers/podman-compose"
+SRC_URI="https://github.com/containers/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	app-containers/aardvark-dns
+	app-containers/netavark
+	app-containers/podman
+"
+
+RDEPEND="
+	${DEPEND}
+	dev-python/pyaml[${PYTHON_USEDEP}]
+	dev-python/python-dotenv[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests/unit
+}
diff --git a/app-containers/podman/podman-5.3.0.ebuild b/app-containers/podman/podman-5.3.0.ebuild
index 1deb45b19629..365a368d763d 100644
--- a/app-containers/podman/podman-5.3.0.ebuild
+++ b/app-containers/podman/podman-5.3.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
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P/_rc/-rc}"
 	[[ ${PV} != *rc* ]] && \
-		KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+		KEYWORDS="amd64 arm64 ~loong ~riscv"
 fi
 
 # main pkg
diff --git a/app-containers/runc/Manifest b/app-containers/runc/Manifest
index 2c7cd812dcff..34d4e0724d48 100644
--- a/app-containers/runc/Manifest
+++ b/app-containers/runc/Manifest
@@ -1,7 +1 @@
-DIST runc-1.1.12.tar.gz 2522196 BLAKE2B 14fe8d5f82d5b4d7f6b4bb9111c5d258e74f6a44aeb51fc87c69104e95b9bf24a3d503f4cc5dedb40d542fbd4b6e27273f456bda4fcf3bc298eb93ae292d9663 SHA512 92e8ac54a77d7ebcc76b5a9cc08d9a064211f12e9d26f064070cc203a5afb11c3af28d8f556f297513f797a2933d50bf10a8f22e307724041d66aa8c5ca1d9d3
-DIST runc-1.1.13.tar.gz 2532849 BLAKE2B f3d3171ffce2bb833bfb5cc21d0dc034fd7e38c47ee098cc1fc75c06fd4dfae21dfe25c2e69a1ca93b29d36e8799727ea41725eee8aca3a059c14dab6c8a435f SHA512 644bf9e6359bf49bbdec667c0f7c69ded78c7eacfc2d1b730d52fdcf7348571c6406b8e5790811fe3662a458c878e4225c3559885f0d95f8905273e7e40e55ad
-DIST runc-1.1.14.tar.gz 2543890 BLAKE2B 3eede8cd7d04d2a3826cfc7caae032744551799e8262d28e989d3d5c66ca3969ce8dede064ebd37361a00eb276fa7c9961180dd9fc9b0d53535421ecc99acb39 SHA512 bdefbf34cf57485c6b961babc8294d0e6b2e003eb836b8e99c49ef4d00acf11f30a46ad0bcd399ee9346610419591daf1eecb3b6b127962357d629bf5f252e22
-DIST runc-1.2.0.tar.gz 2776027 BLAKE2B 743ea8641c0fabda5e32c1d3e044627241337bcdfd92b740bf8ef406e2ad4f37f7069975d93639954a1b20b2627b6456a66847eabfb544ee0eef44e59b2a7453 SHA512 30194521e9ff8e5586309bedbb29812f057220f765b68145d88f2e0008f7f9b5a22fa185d448247d7c71aeade3f48f76b48d4289c94a6c02a1e3384ae5674617
-DIST runc-1.2.1.tar.gz 2742512 BLAKE2B 06beda96edb4fa0796371d28f646b01760cd9b663104045407ae27f3ddd51e0318eddba8fc3dbe107629831a5f4051af0f50406418213485b7ee90cdf9a86085 SHA512 098ba9810d6a6704b11f97360cf403d0e5cccdf635a9b5c594b70e26c2c1554c328506265754f500e2faec1f08655839837036010c6a25265047a47c31f4defd
-DIST runc-1.2.2.tar.gz 2743483 BLAKE2B d1e59aff284dcacdc50a17c4efab09b4bdda5d93ce13822542ea73ec696d3642d4dcc715d2adad308622100b04ef62365d3848be6418db5a325ac574b66e314c SHA512 87066ff0fe7ff6dc0eefd61ba2b194fa96433a091a34e9035350123b7da7dccf7fcec6f52b377c72be853820b4a57154b42bcd58c872263f8b7a16bfc480e5d7
-DIST runc-1.2.3.tar.gz 2757883 BLAKE2B adc3b23ddc487d674a406de8e9e17c2d41d2335e4e18ed2a8a1f5add0909ec235a01fc9483e91e74fb2869950c572d0a22882034b8b5f80c4719d20790e3b38c SHA512 e422e469dbcd60fbc3bf9ca348ba04f8b27b2a43bca8f3ee4c9407539f5dec71373d53d192b47d42eaefa1d7ca2ac9e64839cbe4b82bf930b5a496f3028e5212
+DIST runc-1.2.4.tar.gz 2759394 BLAKE2B 02b282c9fbe7f82ad1d4297b9d2576ee99db7f4db193aa6b08b595d1a18f4a0cb41c5fddb8184ca389e77726c71f4b64b686b2ee1b8e8df97179669362c17ff7 SHA512 2a14bfe7759e0cefcf88fac9d756eb2cbed8a9ebf7b6eacb96855467ea151c278ae0d58735d2a5a2d3335fc54eae4625dfcdb641065df58ba10fd1faafbd3119
diff --git a/app-containers/runc/runc-1.1.12.ebuild b/app-containers/runc/runc-1.1.12.ebuild
deleted file mode 100644
index ed23ef215d7b..000000000000
--- a/app-containers/runc/runc-1.1.12.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 linux-info
-
-# update on bump, look for https://github.com/docker\
-# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
-RUNC_COMMIT=51d5e94601ceffbbd85688df1c928ecccbfa4685
-CONFIG_CHECK="~USER_NS"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://github.com/opencontainers/runc/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
-IUSE="apparmor hardened +kmem +seccomp selinux test"
-
-DEPEND="seccomp? ( sys-libs/libseccomp )"
-
-RDEPEND="
-	${DEPEND}
-	!app-emulation/docker-runc
-	apparmor? ( sys-libs/libapparmor )
-	selinux? ( sec-policy/selinux-container )
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )
-"
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_compile() {
-	# Taken from app-containers/docker-1.7.0-r1
-	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-	CGO_LDFLAGS+=" $(usex hardened '-fno-PIC ' '')
-		-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usev apparmor)
-		$(usev seccomp)
-		$(usex kmem '' 'nokmem')
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		COMMIT="${RUNC_COMMIT}"
-	)
-
-	emake "${myemakeargs[@]}" runc man
-}
-
-src_install() {
-	myemakeargs+=(
-		PREFIX="${ED}/usr"
-		BINDIR="${ED}/usr/bin"
-		MANDIR="${ED}/usr/share/man"
-	)
-	emake "${myemakeargs[@]}" install install-man install-bash
-
-	local DOCS=( README.md PRINCIPLES.md docs/. )
-	einstalldocs
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" localunittest
-}
diff --git a/app-containers/runc/runc-1.1.13.ebuild b/app-containers/runc/runc-1.1.13.ebuild
deleted file mode 100644
index 821b7ad84de7..000000000000
--- a/app-containers/runc/runc-1.1.13.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info
-
-# update on bump, look for commit ID on release tag.
-# https://github.com/opencontainers/runc
-RUNC_COMMIT=58aa9203c123022138b22cf96540c284876a7910
-CONFIG_CHECK="~USER_NS"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="https://github.com/opencontainers/runc/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor hardened +kmem +seccomp selinux test"
-
-DEPEND="seccomp? ( sys-libs/libseccomp )"
-
-RDEPEND="
-	${DEPEND}
-	!app-emulation/docker-runc
-	apparmor? ( sys-libs/libapparmor )
-	selinux? ( sec-policy/selinux-container )
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )
-"
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-src_compile() {
-	# Taken from app-containers/docker-1.7.0-r1
-	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-	CGO_LDFLAGS+=" $(usex hardened '-fno-PIC ' '')
-		-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usev apparmor)
-		$(usev seccomp)
-		$(usex kmem '' 'nokmem')
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		COMMIT="${RUNC_COMMIT}"
-	)
-
-	emake "${myemakeargs[@]}" runc man
-}
-
-src_install() {
-	myemakeargs+=(
-		PREFIX="${ED}/usr"
-		BINDIR="${ED}/usr/bin"
-		MANDIR="${ED}/usr/share/man"
-	)
-	emake "${myemakeargs[@]}" install install-man install-bash
-
-	local DOCS=( README.md PRINCIPLES.md docs/. )
-	einstalldocs
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" localunittest
-}
diff --git a/app-containers/runc/runc-1.1.14.ebuild b/app-containers/runc/runc-1.1.14.ebuild
deleted file mode 100644
index e9d447700b12..000000000000
--- a/app-containers/runc/runc-1.1.14.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info
-
-# update on bump, look for commit ID on release tag.
-# https://github.com/opencontainers/runc
-RUNC_COMMIT=2c9f5602f0ba3d9da1c2596322dfc4e156844890
-CONFIG_CHECK="~USER_NS"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="https://github.com/opencontainers/runc/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor hardened +kmem +seccomp selinux test"
-
-DEPEND="seccomp? ( sys-libs/libseccomp )"
-
-RDEPEND="
-	${DEPEND}
-	!app-emulation/docker-runc
-	apparmor? ( sys-libs/libapparmor )
-	selinux? ( sec-policy/selinux-container )
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )
-"
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-src_compile() {
-	# Taken from app-containers/docker-1.7.0-r1
-	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-	CGO_LDFLAGS+=" $(usex hardened '-fno-PIC ' '')
-		-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usev apparmor)
-		$(usev seccomp)
-		$(usex kmem '' 'nokmem')
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		COMMIT="${RUNC_COMMIT}"
-	)
-
-	emake "${myemakeargs[@]}" runc man
-}
-
-src_install() {
-	myemakeargs+=(
-		PREFIX="${ED}/usr"
-		BINDIR="${ED}/usr/bin"
-		MANDIR="${ED}/usr/share/man"
-	)
-	emake "${myemakeargs[@]}" install install-man install-bash
-
-	local DOCS=( README.md PRINCIPLES.md docs/. )
-	einstalldocs
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" localunittest
-}
diff --git a/app-containers/runc/runc-1.2.0.ebuild b/app-containers/runc/runc-1.2.0.ebuild
deleted file mode 100644
index 4ebe9d4e820f..000000000000
--- a/app-containers/runc/runc-1.2.0.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 linux-info
-
-# update on bump, look for commit ID on release tag.
-# https://github.com/opencontainers/runc
-RUNC_COMMIT=0b9fa21be2bcba45f6d9d748b4bcf70cfbffbc19
-
-CONFIG_CHECK="~USER_NS"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="https://github.com/opencontainers/runc/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor hardened +kmem +seccomp selinux test"
-
-COMMON_DEPEND="
-	apparmor? ( sys-libs/libapparmor )
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!app-emulation/docker-runc
-	selinux? ( sec-policy/selinux-container )"
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )"
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-src_compile() {
-	# Taken from app-containers/docker-1.7.0-r1
-	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-	CGO_LDFLAGS+=" $(usex hardened '-fno-PIC ' '')
-		-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usev apparmor)
-		$(usev seccomp)
-		$(usex kmem '' 'nokmem')
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		COMMIT="${RUNC_COMMIT}"
-	)
-
-	emake "${myemakeargs[@]}" runc man
-}
-
-src_install() {
-	myemakeargs+=(
-		PREFIX="${ED}/usr"
-		BINDIR="${ED}/usr/bin"
-		MANDIR="${ED}/usr/share/man"
-	)
-	emake "${myemakeargs[@]}" install install-man install-bash
-
-	local DOCS=( README.md PRINCIPLES.md docs/. )
-	einstalldocs
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" localunittest
-}
diff --git a/app-containers/runc/runc-1.2.1.ebuild b/app-containers/runc/runc-1.2.1.ebuild
deleted file mode 100644
index 56751cc62a35..000000000000
--- a/app-containers/runc/runc-1.2.1.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 linux-info
-
-# update on bump, look for commit ID on release tag.
-# https://github.com/opencontainers/runc
-RUNC_COMMIT=7cb363254b69e10320360b63fb73e0ffb5da7bf2
-
-CONFIG_CHECK="~USER_NS"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="https://github.com/opencontainers/runc/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor hardened +kmem +seccomp selinux test"
-
-COMMON_DEPEND="
-	apparmor? ( sys-libs/libapparmor )
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!app-emulation/docker-runc
-	selinux? ( sec-policy/selinux-container )"
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )"
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-src_compile() {
-	# Taken from app-containers/docker-1.7.0-r1
-	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-	CGO_LDFLAGS+=" $(usex hardened '-fno-PIC ' '')
-		-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usev apparmor)
-		$(usev seccomp)
-		$(usex kmem '' 'nokmem')
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		COMMIT="${RUNC_COMMIT}"
-	)
-
-	emake "${myemakeargs[@]}" runc man
-}
-
-src_install() {
-	myemakeargs+=(
-		PREFIX="${ED}/usr"
-		BINDIR="${ED}/usr/bin"
-		MANDIR="${ED}/usr/share/man"
-	)
-	emake "${myemakeargs[@]}" install install-man install-bash
-
-	local DOCS=( README.md PRINCIPLES.md docs/. )
-	einstalldocs
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" localunittest
-}
diff --git a/app-containers/runc/runc-1.2.2.ebuild b/app-containers/runc/runc-1.2.2.ebuild
deleted file mode 100644
index 56751cc62a35..000000000000
--- a/app-containers/runc/runc-1.2.2.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 linux-info
-
-# update on bump, look for commit ID on release tag.
-# https://github.com/opencontainers/runc
-RUNC_COMMIT=7cb363254b69e10320360b63fb73e0ffb5da7bf2
-
-CONFIG_CHECK="~USER_NS"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="https://github.com/opencontainers/runc/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor hardened +kmem +seccomp selinux test"
-
-COMMON_DEPEND="
-	apparmor? ( sys-libs/libapparmor )
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!app-emulation/docker-runc
-	selinux? ( sec-policy/selinux-container )"
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )"
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-src_compile() {
-	# Taken from app-containers/docker-1.7.0-r1
-	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-	CGO_LDFLAGS+=" $(usex hardened '-fno-PIC ' '')
-		-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usev apparmor)
-		$(usev seccomp)
-		$(usex kmem '' 'nokmem')
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		COMMIT="${RUNC_COMMIT}"
-	)
-
-	emake "${myemakeargs[@]}" runc man
-}
-
-src_install() {
-	myemakeargs+=(
-		PREFIX="${ED}/usr"
-		BINDIR="${ED}/usr/bin"
-		MANDIR="${ED}/usr/share/man"
-	)
-	emake "${myemakeargs[@]}" install install-man install-bash
-
-	local DOCS=( README.md PRINCIPLES.md docs/. )
-	einstalldocs
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" localunittest
-}
diff --git a/app-containers/runc/runc-1.2.3.ebuild b/app-containers/runc/runc-1.2.3.ebuild
deleted file mode 100644
index 5aa85977a545..000000000000
--- a/app-containers/runc/runc-1.2.3.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 linux-info
-
-# update on bump, look for commit ID on release tag.
-# https://github.com/opencontainers/runc
-RUNC_COMMIT=0d37cfd4b557771e555a184d5a78d0ed4bdb79a5
-
-CONFIG_CHECK="~USER_NS"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="https://github.com/opencontainers/runc/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor hardened +kmem +seccomp selinux test"
-
-COMMON_DEPEND="
-	apparmor? ( sys-libs/libapparmor )
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!app-emulation/docker-runc
-	selinux? ( sec-policy/selinux-container )"
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )"
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-src_compile() {
-	# Taken from app-containers/docker-1.7.0-r1
-	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-	CGO_LDFLAGS+=" $(usex hardened '-fno-PIC ' '')
-		-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usev apparmor)
-		$(usev seccomp)
-		$(usex kmem '' 'nokmem')
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		COMMIT="${RUNC_COMMIT}"
-	)
-
-	emake "${myemakeargs[@]}" runc man
-}
-
-src_install() {
-	myemakeargs+=(
-		PREFIX="${ED}/usr"
-		BINDIR="${ED}/usr/bin"
-		MANDIR="${ED}/usr/share/man"
-	)
-	emake "${myemakeargs[@]}" install install-man install-bash
-
-	local DOCS=( README.md PRINCIPLES.md docs/. )
-	einstalldocs
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" localunittest
-}
diff --git a/app-containers/runc/runc-1.2.4.ebuild b/app-containers/runc/runc-1.2.4.ebuild
new file mode 100644
index 000000000000..9d93d3d7ccda
--- /dev/null
+++ b/app-containers/runc/runc-1.2.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module linux-info
+
+# update on bump, look for commit ID on release tag.
+# https://github.com/opencontainers/runc
+RUNC_COMMIT=6c52b3fc541fb26fe8c374d5f58112a0a5dbda66
+
+CONFIG_CHECK="~USER_NS"
+
+DESCRIPTION="runc container cli tools"
+HOMEPAGE="https://github.com/opencontainers/runc/"
+MY_PV="${PV/_/-}"
+SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="Apache-2.0 BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
+IUSE="apparmor hardened +kmem +seccomp selinux test"
+
+COMMON_DEPEND="
+	apparmor? ( sys-libs/libapparmor )
+	seccomp? ( sys-libs/libseccomp )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!app-emulation/docker-runc
+	selinux? ( sec-policy/selinux-container )"
+BDEPEND="
+	dev-go/go-md2man
+	test? ( "${RDEPEND}" )"
+
+# tests need busybox binary, and portage namespace
+# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
+# majority of tests pass
+RESTRICT+=" test"
+
+src_compile() {
+	# Taken from app-containers/docker-1.7.0-r1
+	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
+	CGO_LDFLAGS+=" $(usex hardened '-fno-PIC ' '')
+		-L${ESYSROOT}/usr/$(get_libdir)"
+
+	# build up optional flags
+	local options=(
+		$(usev apparmor)
+		$(usev seccomp)
+		$(usex kmem '' 'nokmem')
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		COMMIT="${RUNC_COMMIT}"
+	)
+
+	emake "${myemakeargs[@]}" runc man
+}
+
+src_install() {
+	myemakeargs+=(
+		PREFIX="${ED}/usr"
+		BINDIR="${ED}/usr/bin"
+		MANDIR="${ED}/usr/share/man"
+	)
+	emake "${myemakeargs[@]}" install install-man install-bash
+
+	local DOCS=( README.md PRINCIPLES.md docs/. )
+	einstalldocs
+}
+
+src_test() {
+	emake "${myemakeargs[@]}" localunittest
+}
diff --git a/app-containers/sen/Manifest b/app-containers/sen/Manifest
index 5cabc2c10433..a049f1be890e 100644
--- a/app-containers/sen/Manifest
+++ b/app-containers/sen/Manifest
@@ -1,2 +1,2 @@
-DIST sen-0.6.1_p20200905.tar.gz 1913978 BLAKE2B 189bff583770265de29ca3e54cad1283051c05eccab4fc98160801e50b31376188c52e49b43972292fe231b376ba42879fb34d7b1ae70c2246d676a6e25f670b SHA512 cd1899c1b4c5c7cf7f1f2f5e557bd609a7d7619dbc3fc6457f5ef5ce5c9ab43d92a6fbfa228c43d543d4f46c7928d74dbed9ab8346cabc772c8e7c63a7c07bfe
 DIST sen-0.7.0.tar.gz 1930302 BLAKE2B b17eeb080d2873485e81e90b7bee81f4930ace05b5d10a259a062b1dc818659d61a45d8bf01df95c33514060cce84f5c09f82066400afe11e4797fffa4303b6b SHA512 fc350eaf6694df2ff2378e24e06a07247a5c5bc060e09c4bb5478deca781d4f4fc593927dff14a1e7c7779eabb897fb6170183daee48a4e6b03bcfef975521b0
+DIST sen-0.8.0.tar.gz 1931211 BLAKE2B a8c6a4fc3343fd90c03ab9d0dfa85ff39639a21bb807a2122d29e000c6df1832b2277553b3d3cf88bbc0ef51a0105a5f9246f1e9b05439dd7f1ea71fcadc49cf SHA512 03fa23c5e5e8e4d556f6b2154db5a4128a8a51c60ea57792a11080ac7870af6bd128e374f682fc7ba1c206148c2a146bc81233b36306a27da77f09f8a508713f
diff --git a/app-containers/sen/sen-0.6.1_p20200905-r1.ebuild b/app-containers/sen/sen-0.6.1_p20200905-r1.ebuild
deleted file mode 100644
index 9f7bf271cf92..000000000000
--- a/app-containers/sen/sen-0.6.1_p20200905-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-COMMIT="02e5872ee2905861e1da06ab5174e1a3f41f0e0b"
-
-DESCRIPTION="Terminal User Interface for docker engine"
-HOMEPAGE="https://github.com/TomasTomecek/sen"
-SRC_URI="https://github.com/TomasTomecek/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/urwidtrees[${PYTHON_USEDEP}]
-	dev-python/docker[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/flexmock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r docs
-}
-
-python_test() {
-	epytest tests
-}
diff --git a/app-containers/sen/sen-0.8.0.ebuild b/app-containers/sen/sen-0.8.0.ebuild
new file mode 100644
index 000000000000..e954d938ca66
--- /dev/null
+++ b/app-containers/sen/sen-0.8.0.ebuild
@@ -0,0 +1,33 @@
+# 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="Terminal User Interface for docker engine"
+HOMEPAGE="https://github.com/TomasTomecek/sen"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/urwidtrees[${PYTHON_USEDEP}]
+	dev-python/docker[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/flexmock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc -r docs
+}
diff --git a/app-containers/skopeo/Manifest b/app-containers/skopeo/Manifest
index f66fa103541a..3c16ede399f4 100644
--- a/app-containers/skopeo/Manifest
+++ b/app-containers/skopeo/Manifest
@@ -1,4 +1,2 @@
-DIST skopeo-1.14.0.tar.gz 10548883 BLAKE2B 6ecf54d236405ce59bedf77acc124fa8b3bb12acefa24a679a1d2d85957ddf585b5a6ba163806b8b7b510485d936adbe1afd6eee8c92b267b948f7d78ac83d05 SHA512 59d329036a97cbeca4de20b15d9dd8adacd5201834b26ae5e5c88b05594b2a7101c22da91f22c35c07a98e41afa28f2c7103e660b3847c7f8c9691f27f4c4146
-DIST skopeo-1.14.2.tar.gz 10547979 BLAKE2B bca47d82380ad714397dc8e36e365a3e81fc628b47519b022ecb5edd2a03ce8972c066af350cd1f0b5a3d9d6c1585f0729b32a1a829cfc4eaefc1c7fc9dc2667 SHA512 ffb3c00cdde05f7a916bd3980c9cec1bb82b3f3bf90058bfff1837d3a9902087ac011828e6164baec18210d4aeee1a5258b75405411fd15ea2470a2522a6da73
-DIST skopeo-1.15.0.tar.gz 10710505 BLAKE2B b6804561ec96ce7f987ccdaf5a89aa7f5fd0ed2da1307467b4c1857386508d88e3fd28f066f49b136962e232b89594484610fc4f6b494be6a98b64908900865b SHA512 71fb94fd2cf9937bf2dd969c8b1b74f5b66eb2ac2bd9358e8c8983c3fd6548311ca274ed2f8c3f088c3c9d6032962075da1890449dcd25dcfd49882acbfa20de
 DIST skopeo-1.15.1.tar.gz 10709125 BLAKE2B aa688197fe0d803b6cb1f4e7c5c998a917e7d588fa41b9e6ede6d60fd1ef12f209e2f119bc29143bf92ae3349c1168e33f79cb36d6c7f5a1a22bcbf3f4e51792 SHA512 686d17da4a84d9029d688cfca08724576564ce2a05aed9380bf55059c244c90cffa3b21c2dbe84b19b746773e98d5f26e5ceaca58f7be26b656125977685c663
+DIST skopeo-1.17.0.tar.gz 10682765 BLAKE2B 88e658a29bacaead26ef19309e2c138d5b689c04b56291a93f23765a97bcee0e3acfa82014babd5cf375127b78cc3ac4fb42b6ba3284632d43b1ac865a618969 SHA512 72cee72a88764a85252ff1812aff284215805db10708fdfd4f3c778d7efec16b8a0d4d26b966a2e18ca36eea9a98265d75e78967dfb3ea0bf94f98c3b61c6504
diff --git a/app-containers/skopeo/skopeo-1.14.0-r3.ebuild b/app-containers/skopeo/skopeo-1.14.0-r3.ebuild
deleted file mode 100644
index 462b948cd231..000000000000
--- a/app-containers/skopeo/skopeo-1.14.0-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info
-
-DESCRIPTION="Work with remote container images registries"
-HOMEPAGE="https://github.com/containers/skopeo"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/skopeo.git"
-else
-	SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64"
-fi
-
-# main
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-IUSE="btrfs device-mapper rootless"
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3:=
-	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
-	device-mapper? ( >=sys-fs/lvm2-2.02.145:= )
-	rootless? ( sys-apps/shadow:= )
-"
-
-# TODO: Is this really needed? cause upstream doesnt mention it https://github.com/containers/skopeo/blob/main/install.md#building-from-source
-# 	dev-libs/libgpg-error:=
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-containers/containers-common
-"
-BDEPEND="dev-go/go-md2man"
-
-RESTRICT="test"
-
-pkg_setup() {
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	use device-mapper && CONFIG_CHECK+=" ~MD"
-	linux-info_pkg_setup
-}
-
-run_make() {
-	emake \
-		BTRFS_BUILD_TAG="$(usex btrfs '' 'btrfs_noversion exclude_graphdriver_btrfs')" \
-		CONTAINERSCONFDIR="${EPREFIX}/etc/containers" \
-		LIBDM_BUILD_TAG="$(usex device-mapper '' 'libdm_no_deferred_remove exclude_graphdriver_devicemapper')" \
-		LIBSUBID_BUILD_TAG="$(usex rootless 'libsubid' '')" \
-		PREFIX="${EPREFIX}/usr" \
-		$@
-}
-
-src_compile() {
-	run_make all completions
-}
-
-src_install() {
-	# The install target in the Makefile tries to rebuild the binary and
-	# installs things that are already installed by containers-common.
-	dobin bin/skopeo
-	einstalldocs
-	doman docs/*.1
-	run_make "DESTDIR=${D}" install-completions
-}
diff --git a/app-containers/skopeo/skopeo-1.14.2.ebuild b/app-containers/skopeo/skopeo-1.14.2.ebuild
deleted file mode 100644
index ab892d6789a8..000000000000
--- a/app-containers/skopeo/skopeo-1.14.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info
-
-DESCRIPTION="Work with remote container images registries"
-HOMEPAGE="https://github.com/containers/skopeo"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/skopeo.git"
-else
-	SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-# main
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-IUSE="btrfs device-mapper rootless"
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3:=
-	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
-	device-mapper? ( >=sys-fs/lvm2-2.02.145:= )
-	rootless? ( sys-apps/shadow:= )
-"
-
-# TODO: Is this really needed? cause upstream doesnt mention it https://github.com/containers/skopeo/blob/main/install.md#building-from-source
-# 	dev-libs/libgpg-error:=
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-containers/containers-common
-"
-BDEPEND="dev-go/go-md2man"
-
-RESTRICT="test"
-
-pkg_setup() {
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	use device-mapper && CONFIG_CHECK+=" ~MD"
-	linux-info_pkg_setup
-}
-
-run_make() {
-	emake \
-		BTRFS_BUILD_TAG="$(usex btrfs '' 'btrfs_noversion exclude_graphdriver_btrfs')" \
-		CONTAINERSCONFDIR="${EPREFIX}/etc/containers" \
-		LIBDM_BUILD_TAG="$(usex device-mapper '' 'libdm_no_deferred_remove exclude_graphdriver_devicemapper')" \
-		LIBSUBID_BUILD_TAG="$(usex rootless 'libsubid' '')" \
-		PREFIX="${EPREFIX}/usr" \
-		$@
-}
-
-src_compile() {
-	run_make all completions
-}
-
-src_install() {
-	# The install target in the Makefile tries to rebuild the binary and
-	# installs things that are already installed by containers-common.
-	dobin bin/skopeo
-	einstalldocs
-	doman docs/*.1
-	run_make "DESTDIR=${D}" install-completions
-}
diff --git a/app-containers/skopeo/skopeo-1.15.0.ebuild b/app-containers/skopeo/skopeo-1.15.0.ebuild
deleted file mode 100644
index ab892d6789a8..000000000000
--- a/app-containers/skopeo/skopeo-1.15.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info
-
-DESCRIPTION="Work with remote container images registries"
-HOMEPAGE="https://github.com/containers/skopeo"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/skopeo.git"
-else
-	SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-# main
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-IUSE="btrfs device-mapper rootless"
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3:=
-	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
-	device-mapper? ( >=sys-fs/lvm2-2.02.145:= )
-	rootless? ( sys-apps/shadow:= )
-"
-
-# TODO: Is this really needed? cause upstream doesnt mention it https://github.com/containers/skopeo/blob/main/install.md#building-from-source
-# 	dev-libs/libgpg-error:=
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-containers/containers-common
-"
-BDEPEND="dev-go/go-md2man"
-
-RESTRICT="test"
-
-pkg_setup() {
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	use device-mapper && CONFIG_CHECK+=" ~MD"
-	linux-info_pkg_setup
-}
-
-run_make() {
-	emake \
-		BTRFS_BUILD_TAG="$(usex btrfs '' 'btrfs_noversion exclude_graphdriver_btrfs')" \
-		CONTAINERSCONFDIR="${EPREFIX}/etc/containers" \
-		LIBDM_BUILD_TAG="$(usex device-mapper '' 'libdm_no_deferred_remove exclude_graphdriver_devicemapper')" \
-		LIBSUBID_BUILD_TAG="$(usex rootless 'libsubid' '')" \
-		PREFIX="${EPREFIX}/usr" \
-		$@
-}
-
-src_compile() {
-	run_make all completions
-}
-
-src_install() {
-	# The install target in the Makefile tries to rebuild the binary and
-	# installs things that are already installed by containers-common.
-	dobin bin/skopeo
-	einstalldocs
-	doman docs/*.1
-	run_make "DESTDIR=${D}" install-completions
-}
diff --git a/app-containers/skopeo/skopeo-1.17.0.ebuild b/app-containers/skopeo/skopeo-1.17.0.ebuild
new file mode 100644
index 000000000000..cf1341e8921c
--- /dev/null
+++ b/app-containers/skopeo/skopeo-1.17.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module linux-info
+
+DESCRIPTION="Work with remote container images registries"
+HOMEPAGE="https://github.com/containers/skopeo"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/skopeo.git"
+else
+	SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+# main
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+IUSE="btrfs device-mapper rootless"
+
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.5.5:=
+	>=dev-libs/libassuan-2.4.3:=
+	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
+	device-mapper? ( >=sys-fs/lvm2-2.02.145:= )
+	rootless? ( sys-apps/shadow:= )
+"
+
+# TODO: Is this really needed? cause upstream doesnt mention it https://github.com/containers/skopeo/blob/main/install.md#building-from-source
+# 	dev-libs/libgpg-error:=
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-containers/containers-common
+"
+BDEPEND="dev-go/go-md2man"
+
+RESTRICT="test"
+
+pkg_setup() {
+	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
+	use device-mapper && CONFIG_CHECK+=" ~MD"
+	linux-info_pkg_setup
+}
+
+run_make() {
+	emake \
+		BTRFS_BUILD_TAG="$(usex btrfs '' 'btrfs_noversion exclude_graphdriver_btrfs')" \
+		CONTAINERSCONFDIR="${EPREFIX}/etc/containers" \
+		LIBDM_BUILD_TAG="$(usex device-mapper '' 'libdm_no_deferred_remove exclude_graphdriver_devicemapper')" \
+		LIBSUBID_BUILD_TAG="$(usex rootless 'libsubid' '')" \
+		PREFIX="${EPREFIX}/usr" \
+		$@
+}
+
+src_compile() {
+	run_make all completions
+}
+
+src_install() {
+	# The install target in the Makefile tries to rebuild the binary and
+	# installs things that are already installed by containers-common.
+	dobin bin/skopeo
+	einstalldocs
+	doman docs/*.1
+	run_make "DESTDIR=${D}" install-completions
+}
diff --git a/app-containers/slirp4netns/Manifest b/app-containers/slirp4netns/Manifest
index aaf8b2828349..9c8b358f07fe 100644
--- a/app-containers/slirp4netns/Manifest
+++ b/app-containers/slirp4netns/Manifest
@@ -1,3 +1 @@
-DIST slirp4netns-1.1.12.tar.gz 60223 BLAKE2B 2bd4ed6cded075a151fec0e6b2222b0a72f2027d702cd3e2760ab8c811e375ea5becfeb32ccf71f4b41a257b9e7f32852d6d805912ad950da3364e240d191674 SHA512 82584e40079c2a7730c098f2a2406dc042498f7d50cc9ad8404acf3bb3a50c6969737be531d64b2eca6ba86a968bb5bfea9ad10eba4979cc40a5da5c9745ebdb
-DIST slirp4netns-1.1.9.tar.gz 58951 BLAKE2B e4fde408b3cd55dec0cca495c58936ec32c6201a0fe63c1a9fc9502ac41da615f92271d5fb365475f6864dd3c195097c81f01268b1b8d10d0f888c4e154cac34 SHA512 6471bf2b2eff9bd3ef037de986ab612f20bfce7a52bfd2b1b434d0606a3d2e6170b3fc43b168c8cc6f56ffb82f8361f21a26522ac1092c71f6e694a9588d5854
 DIST slirp4netns-1.2.0.tar.gz 62617 BLAKE2B ddedfbbd64094142392bcb1730900634983a8422ae33bc9eb798e42e8f45a773ad30ba78f7a406c9db2c2a7393572a313b9464bc09c2f13343bcf6d960a9f609 SHA512 4ede7323aab92d0ad0026bc5e1aefc07898a5b50c4ff57c13eb9d8e75d73a4bb5ac992f021404053fcba2b05c56dcafcbfefbc4bbc47f72a0797ab62bd76a60a
diff --git a/app-containers/slirp4netns/slirp4netns-1.1.12-r1.ebuild b/app-containers/slirp4netns/slirp4netns-1.1.12-r1.ebuild
deleted file mode 100644
index 3895f2b716fe..000000000000
--- a/app-containers/slirp4netns/slirp4netns-1.1.12-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
-
-RDEPEND="
-	dev-libs/glib:2=
-	net-libs/libslirp:=
-	sys-libs/libseccomp:=
-	sys-libs/libcap:="
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-
-	# Respect AR variable for bug 722162.
-	sed -e 's|^AC_PROG_CC$|AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])\nAC_PROG_AR\n\0|' \
-		-i configure.ac || die
-	eautoreconf
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You need to have the tun kernel module loaded in order to have"
-		elog "slirp4netns working"
-	fi
-}
diff --git a/app-containers/slirp4netns/slirp4netns-1.1.9.ebuild b/app-containers/slirp4netns/slirp4netns-1.1.9.ebuild
deleted file mode 100644
index d200849be68c..000000000000
--- a/app-containers/slirp4netns/slirp4netns-1.1.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2=
-	dev-libs/libpcre:=
-	net-libs/libslirp:=
-	sys-libs/libseccomp:=
-	sys-libs/libcap:="
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RESTRICT="test"
-
-src_prepare() {
-	# Respect AR variable for bug 722162.
-	sed -e 's|^AC_PROG_CC$|AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])\nAC_PROG_AR\n\0|' \
-		-i configure.ac || die
-	eautoreconf
-	default
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You need to have the tun kernel module loaded in order to have"
-		elog "slirp4netns working"
-	fi
-}
diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest
index 6ddc12332feb..70b0dfc56188 100644
--- a/app-containers/snapd/Manifest
+++ b/app-containers/snapd/Manifest
@@ -1,4 +1,2 @@
-DIST snapd-2.58.tar.xz 6980916 BLAKE2B d3de507513db808fa4f85498b5c238de143f06660f1d677186c8c763b38643a2486e25b747977b3eb584619d79ea0a12e88dc5a909045a853c1d8f849f2c1638 SHA512 555915b8b4d9d2d91a3ba19e9e78cf6b19d9683a9f390ad225aa5876320cb8595b464d6133706c4923fc15fbe04ba2b65a47e403c9a2d8859adae827f8ec000a
-DIST snapd-2.61.tar.xz 7626784 BLAKE2B d716e91df4702fbd415bb6204a4557f37afd3dce187e3bca33b12a2ac5a1b54d1c31473d1537a784f6cbbfaf213f676d1f1b29d716e8c5f45a785229c9f3e018 SHA512 2fd432d7ef2204535576e980de7060ad15a0b3610b25e0f41b630ae34e172f97460f0a38d9d456af08dd36c619e90119219788a49e56a69afc7fbf014fc1db22
 DIST snapd-2.63-bug-933073-GNU_SOURCE.patch 870 BLAKE2B acc2a9ec7ca16849736701b37e51f238be5700cf0cd40dac6493f126a48235ffc1f103096d546313d05a2262f8bdb6f84966cbb79c4cf3f5c1cdf4dfd5dc231e SHA512 5e4018d1972e18496666cf60c6e132f8655d8f0f4d6f8a77f9a7e5d2063b823f97a17bf26b562e6ab93ea32f081a90df6969a617e77114f37553a350f44f11fb
 DIST snapd-2.63.tar.xz 7502152 BLAKE2B 8ae38699227b7f0e6b512526fc8857b3e50ed220ac95860c372ca0a4b26f5a034bd9309688217696444254e41cc70fe3a45c0bf026c84e5f950e7df8aebd47a0 SHA512 956ee142ab6cb5de522307f7844819c861b2831e22dab56f7bfca16ff7f947093f8a8727d49370cc000ed71f3af9c57cff9c4be93ebf199e8c631a152a68ec5b
diff --git a/app-containers/snapd/snapd-2.58.ebuild b/app-containers/snapd/snapd-2.58.ebuild
deleted file mode 100644
index 09043d528c25..000000000000
--- a/app-containers/snapd/snapd-2.58.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd tmpfiles xdg-utils
-
-DESCRIPTION="Service and tools for management of snap packages"
-HOMEPAGE="http://snapcraft.io/"
-
-SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
-MY_PV=${PV}
-KEYWORDS="amd64"
-
-LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-IUSE="apparmor +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
-
-CONFIG_CHECK="~CGROUPS
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~NAMESPACES
-		~SQUASHFS
-		~SQUASHFS_ZLIB
-		~SQUASHFS_LZO
-		~SQUASHFS_XZ
-		~BLK_DEV_LOOP
-		~SECCOMP
-		~SECCOMP_FILTER"
-
-RDEPEND="
-	sys-libs/libseccomp:=
-	apparmor? (
-		sec-policy/apparmor-profiles
-		sys-apps/apparmor:=
-	)
-	dev-libs/glib
-	virtual/libudev
-	systemd? ( sys-apps/systemd )
-	sys-libs/libcap:=
-	sys-fs/squashfs-tools[lzma]"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	>=dev-lang/go-1.9
-	dev-python/docutils
-	sys-devel/gettext
-	sys-fs/xfsprogs"
-
-PDEPEND="sys-auth/polkit[gtk?,kde?]"
-
-README_GENTOO_SUFFIX=""
-
-pkg_setup() {
-	if use apparmor; then
-		CONFIG_CHECK+=" ~SECURITY_APPARMOR"
-	fi
-	linux-info_pkg_setup
-
-	# Seems to have issues building with -O3, switch to -O2
-	replace-flags -O3 -O2
-}
-
-src_prepare() {
-	default
-	# Update apparmor profile to allow libtinfow.so*
-	sed -i 's/libtinfo/libtinfo{,w}/' \
-		"cmd/snap-confine/snap-confine.apparmor.in" || die
-
-	if ! use forced-devmode; then
-		sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
-			-i "sandbox/forcedevmode.go" || die
-		grep -q 'panic("USE=forced-devmode is disabled")' "sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
-	fi
-
-	sed -i 's:command -v git >/dev/null:false:' -i "mkversion.sh" || die
-
-	./mkversion.sh "${PV}"
-	pushd "cmd" >/dev/null || die
-	eautoreconf
-}
-
-src_configure() {
-	SNAPD_MAKEARGS=(
-		"BINDIR=${EPREFIX}/usr/bin"
-		"DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
-		"LIBEXECDIR=${EPREFIX}/usr/lib"
-		"SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
-		"SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
-	)
-	export CGO_ENABLED="1"
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-
-	pushd "${S}/cmd" >/dev/null || die
-	econf --libdir="${EPREFIX}/usr/lib" \
-		--libexecdir="${EPREFIX}/usr/lib/snapd" \
-		$(use_enable apparmor) \
-		--enable-nvidia-biarch \
-		--with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	export GOBIN="${S}/bin"
-
-	local file
-	for file in "${S}/po/"*.po; do
-		msgfmt "${file}" -o "${file%.po}.mo" || die
-	done
-
-	emake -C "${S}/data" "${SNAPD_MAKEARGS[@]}"
-
-	local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
-	local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
-
-	local cmd
-	for cmd in snap snapd snapd-apparmor snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
-		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${flags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-	for cmd in snapctl snap-exec snap-update-ns; do
-		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-}
-
-src_install() {
-	emake -C "${S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-	emake -C "${S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-
-	if use apparmor; then
-		mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
-		keepdir /var/lib/snapd/apparmor/profiles
-	fi
-	keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
-	fperms 700 /var/lib/snapd/{cache,cookie}
-
-	dobin "${GOBIN}/"{snap,snapctl}
-	ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
-
-	exeinto /usr/lib/snapd
-	doexe "${GOBIN}/"{snapd,snapd-apparmor,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
-		"${S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
-		"${S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
-
-	dobashcomp "${S}/data/completion/bash/snap"
-
-	insinto /usr/share/zsh/site-functions
-	doins "${S}/data/completion/zsh/_snap"
-
-	insinto "/usr/share/polkit-1/actions"
-	doins "${S}/data/polkit/io.snapcraft.snapd.policy"
-
-	dodoc "${S}/packaging/ubuntu-16.04/changelog"
-	domo "${S}/po/"*.mo
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_desktop_database_update
-	tmpfiles_process snapd.conf
-
-	if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
-		$(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
-		apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-containers/snapd/snapd-2.61.ebuild b/app-containers/snapd/snapd-2.61.ebuild
deleted file mode 100644
index 3acdd26301ec..000000000000
--- a/app-containers/snapd/snapd-2.61.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd tmpfiles xdg-utils
-
-DESCRIPTION="Service and tools for management of snap packages"
-HOMEPAGE="http://snapcraft.io/"
-
-SRC_URI="https://github.com/snapcore/snapd/releases/download/${PV}/snapd_${PV}.vendor.tar.xz -> ${P}.tar.xz"
-MY_PV=${PV}
-KEYWORDS="amd64"
-
-LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-IUSE="apparmor +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
-
-CONFIG_CHECK="~CGROUPS
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~NAMESPACES
-		~SQUASHFS
-		~SQUASHFS_ZLIB
-		~SQUASHFS_LZO
-		~SQUASHFS_XZ
-		~BLK_DEV_LOOP
-		~SECCOMP
-		~SECCOMP_FILTER"
-
-RDEPEND="
-	sys-libs/libseccomp:=
-	apparmor? (
-		sec-policy/apparmor-profiles
-		sys-apps/apparmor:=
-	)
-	dev-libs/glib
-	virtual/libudev
-	systemd? ( sys-apps/systemd )
-	sys-libs/libcap:=
-	sys-fs/squashfs-tools[lzma,lzo]"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	>=dev-lang/go-1.9
-	dev-python/docutils
-	sys-devel/gettext
-	sys-fs/xfsprogs"
-
-PDEPEND="sys-auth/polkit[gtk?,kde?]"
-
-README_GENTOO_SUFFIX=""
-
-pkg_setup() {
-	if use apparmor; then
-		CONFIG_CHECK+=" ~SECURITY_APPARMOR"
-	fi
-	linux-info_pkg_setup
-
-	# Seems to have issues building with -O3, switch to -O2
-	replace-flags -O3 -O2
-}
-
-src_prepare() {
-	default
-	# Update apparmor profile to allow libtinfow.so*
-	sed -i 's/libtinfo/libtinfo{,w}/' \
-		"cmd/snap-confine/snap-confine.apparmor.in" || die
-
-	if ! use forced-devmode; then
-		sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
-			-i "sandbox/forcedevmode.go" || die
-		grep -q 'panic("USE=forced-devmode is disabled")' "sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
-	fi
-
-	sed -i 's:command -v git >/dev/null:false:' -i "mkversion.sh" || die
-
-	./mkversion.sh "${PV}"
-	pushd "cmd" >/dev/null || die
-	eautoreconf
-}
-
-src_configure() {
-	SNAPD_MAKEARGS=(
-		"BINDIR=${EPREFIX}/usr/bin"
-		"DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
-		"LIBEXECDIR=${EPREFIX}/usr/lib"
-		"SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
-		"SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
-	)
-	export CGO_ENABLED="1"
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-
-	pushd "${S}/cmd" >/dev/null || die
-	econf --libdir="${EPREFIX}/usr/lib" \
-		--libexecdir="${EPREFIX}/usr/lib/snapd" \
-		$(use_enable apparmor) \
-		--enable-nvidia-biarch \
-		--with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	export GOBIN="${S}/bin"
-
-	local file
-	for file in "${S}/po/"*.po; do
-		msgfmt "${file}" -o "${file%.po}.mo" || die
-	done
-
-	emake -C "${S}/data" "${SNAPD_MAKEARGS[@]}"
-
-	local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
-	local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
-
-	local cmd
-	for cmd in snap snapd snapd-apparmor snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
-		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${flags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-	for cmd in snapctl snap-exec snap-update-ns; do
-		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-}
-
-src_install() {
-	emake -C "${S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-	emake -C "${S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-
-	if use apparmor; then
-		mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
-		keepdir /var/lib/snapd/apparmor/profiles
-	fi
-	keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
-	fperms 700 /var/lib/snapd/{cache,cookie}
-
-	dobin "${GOBIN}/"{snap,snapctl}
-	ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
-
-	exeinto /usr/lib/snapd
-	doexe "${GOBIN}/"{snapd,snapd-apparmor,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
-		"${S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
-		"${S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
-
-	dobashcomp "${S}/data/completion/bash/snap"
-
-	insinto /usr/share/zsh/site-functions
-	doins "${S}/data/completion/zsh/_snap"
-
-	insinto "/usr/share/polkit-1/actions"
-	doins "${S}/data/polkit/io.snapcraft.snapd.policy"
-
-	dodoc "${S}/packaging/ubuntu-16.04/changelog"
-	domo "${S}/po/"*.mo
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_desktop_database_update
-	tmpfiles_process snapd.conf
-
-	if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
-		$(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
-		apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-containers/syft/Manifest b/app-containers/syft/Manifest
index 0f06e232f8c7..917a175b7a60 100644
--- a/app-containers/syft/Manifest
+++ b/app-containers/syft/Manifest
@@ -6,5 +6,7 @@ DIST syft-0.94.0-deps.tar.xz 502576092 BLAKE2B 35c13d34a7a4b2afafb9b73502f4258b3
 DIST syft-0.94.0.tar.gz 5266343 BLAKE2B 892c7bf90a1d15fd926207acd1a28e8bd907ae5869be763e48ccd8d3279975c2ec84d9ec5842e3799460a823b5aa611a028982d8d40d90248c1cfad25415c672 SHA512 171b23271f03e1e824dcac41a563f7947d004797a21e762eea883ea680e0de65a532e03e4b245a4021288fec60142da8c1c16d6520eadece65728728b9d15f91
 DIST syft-0.95.0-deps.tar.xz 525784260 BLAKE2B 8aa9da529a605725ecbcc4ec98bef651218ee7b1ed08564fae0911fc83f78a13f7773c8c6e7c12f0ecb4b979477e1ea1a89354c11de932ef2e0a45b1fb80ec10 SHA512 0571b3586d27d1cf76a6bfd4c3fd5c06f796bd94feea63303c8464c602ce91f94e4bdc0002eb7241ff967e4146ec2a91cce428ad495d89dfda078a968e43d63f
 DIST syft-0.95.0.tar.gz 5328311 BLAKE2B 555844c771dc57dd396f4016095a8e462b5088abf7d7dc2f77b14dcd98bd77fb58598c1011145ce001117ea3059cf93f2b4a1d2a7c01914cd1e5b855e79394cc SHA512 6509d7a505ff1adc37386bccfefb8ce106ff8c1ffe267ee768f731ef865c731dec3603c055d094363aae8b0ad6dd09547cb4b7e5a8d6993d7f8e09ef47f195c3
+DIST syft-1.18.1-deps.tar.xz 162627924 BLAKE2B c68a14ede812e6573f90d3e6ebeb3e60f26e3caa92d71f008d3706921f3f873d78305f3c24ede226ee67d1ac39ac3cc2412e6c03a3386a89ee7cfd75e7df80b1 SHA512 df2a1182200074ec0bd5be08340e3fdddc4ee76a857741359a2c0a2469b16dface84e1f3540fe3034dab89562a1adb8ba341d42521686d7566b8d81f39da9217
+DIST syft-1.18.1.tar.gz 5951602 BLAKE2B d73714c11143ca8f84e8b3167c4416417845af736a677369703d7aa334cfc69fb71bd0de05dc6cd21e5282e3df3c1548c8d1306c3311054c02266a19ece37d1e SHA512 05693eb5d13be1dc5682c91906027b67de881fb5513667f98d40302130a10bd082cc1c4df006cdd5d09968e3d77ec97d8cc620d0a816d325e3571f67e98b0143
 DIST syft-1.9.0-deps.tar.xz 207469280 BLAKE2B 38b428c8062f006586c0b7f1b8aeb2af09063d9f665a5a18c50dbe3848436cac80da2d2fd441a07d76787cb8e66d35fd322c7f9d1254662bf34fd29d05116e22 SHA512 34aa74de4befc2d097cb01e0ff3b37fd30cfca60b4d916f3fe7578848b6f2bb4ea263431adff7852b2b70dc9a4f7b50e75cfd58ee6ea3c604d03f7bde5ab10e6
 DIST syft-1.9.0.tar.gz 5825322 BLAKE2B e6b0808de2179a8956a1ba30138bcf11b0fead1c154a8d432cd852d6be2753075491c43f238943883d1c8080f7c24fc9a617daff4457aba6731831c619ff9223 SHA512 0a116accd3762fa6c43475b52c85d9a103423aa5f747b86209f128a2484b54e20d17d0dce7ec88c412e95f6685f8a47032bbfe812e6fceb39451cf1faa9e7fbb
diff --git a/app-containers/syft/syft-1.18.1.ebuild b/app-containers/syft/syft-1.18.1.ebuild
new file mode 100644
index 000000000000..20e8cdef9dff
--- /dev/null
+++ b/app-containers/syft/syft-1.18.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+GIT_COMMIT=5e16e5031a13f8a11057feb8544decebfc43b4ed
+
+DESCRIPTION="Generate a Software Bill of Materials from container images and filesystems"
+HOMEPAGE="https://www.anchore.com"
+SRC_URI="https://github.com/anchore/syft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+# tests require a running docker daemon
+RESTRICT="test"
+
+src_compile() {
+	local BUILD_DATE
+	BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+	ego build -o bin/syft -ldflags "
+		-extldflags '-static'
+		-X github.com/anchore/syft/internal/version.version=${PV}
+		-X github.com/anchore/syft/internal/version.gitCommit=${GIT_COMMIT}
+			-X github.com/anchore/syft/internal/version.buildDate=${BUILD_DATE}
+			-X github.com/anchore/syft/internal/version.gitDescription=v${PV}
+		" ./cmd/syft
+}
+
+src_install() {
+	dobin bin/*
+	insinto /usr/share/"${PN}"
+	doins -r examples
+}
diff --git a/app-containers/umoci/Manifest b/app-containers/umoci/Manifest
index 47ca93d6d0f8..29cf157c4622 100644
--- a/app-containers/umoci/Manifest
+++ b/app-containers/umoci/Manifest
@@ -1 +1,2 @@
 DIST umoci-0.4.6.tar.gz 2273608 BLAKE2B d5a36c78918697b9c8f54a5c4b914a9124b5e989dff3efc81a9f64f1bd276189d15a565a6ec2e8d4021925017e9a7a17f7cc5359a552f7c57dda414c25d2fb02 SHA512 0614dd583e00b6e2e69256f1ae1d3316e5bb5989a177d18c5ceacf3af18ab82ccf8edef879b6c813855d878d5af53c541ac433d81e6c20796885a26c57564118
+DIST umoci-0.4.7.tar.gz 2515579 BLAKE2B 595fdaf8b3e8c330a2966bdb70a4915964fa6b8823572b0bc7dfc797fce47771732cdf24514f3458833a048c155155920306838eab8654a547553897458d5013 SHA512 bb76c6c74766bc6558fa414b66a626194c60a9dee49aee050ad459590675bd79032b8e8c390439c0aa74c09abc921a6789fac57fc996ef958a376bc1c675d9fc
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/acme/Manifest b/app-crypt/acme/Manifest
index 44db289daad2..47b249c84df7 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,3 +1,4 @@
 DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd
 DIST certbot-2.11.0.gh.tar.gz 2322114 BLAKE2B d266483d1ffc9f9274df3d5e389ed961758e77e9455a7324132bb2bfe4896db663642a98ac7250d35fbbd60d6aef0d6d2a58f98ad17130958dcfcd61283c2479 SHA512 ba47fc98faaf47278c58e107356371c06039f70ad539d2ca1ac39462bb45c7a6c55ed525d8bd8b11cd35cf807f3423e19309022751a492ba19ded79cfbb6d7f4
 DIST certbot-3.0.1.gh.tar.gz 2325233 BLAKE2B 247505fb500c829de875aa0886f27727de4ccc4f474dd13957b524b84af99e6ee5d1e86f09577422932a498ec9fda24ae36377d117365531ad1f8eddb0148272 SHA512 7aec63ec7705f4e13acb7cef5d770f103222ddf3dca30760c42cd3aeb0531d630111518960c299d89bccba4134b544a329fa02659fac5f977c9ca0321b2d1e2e
+DIST certbot-3.1.0.gh.tar.gz 2299990 BLAKE2B 596f11d4ebb161ee6ba67f4f150a77e081399f11f4e4652923c94297661149c9cb889afc51b46b6111847820823d90edc3a7f1e14c451122f88e6e777bf48795 SHA512 efd0b0c1540a6e3b631fa80eac65c9e8b31b1e5e1242f56d3723ca7e1b1b2121dfe1bf8e122fe9a9b994460553f1fa085b11d1369b3160f5c51c939b2cccd638
diff --git a/app-crypt/acme/acme-3.1.0.ebuild b/app-crypt/acme/acme-3.1.0.ebuild
new file mode 100644
index 000000000000..3a210871357e
--- /dev/null
+++ b/app-crypt/acme/acme-3.1.0.ebuild
@@ -0,0 +1,65 @@
+# 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
+
+PARENT_PN="certbot"
+PARENT_P="${PARENT_PN}-${PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="
+	https://github.com/certbot/certbot/
+	https://pypi.org/project/acme/
+	https://letsencrypt.org/
+"
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND="
+	test? (
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+# The requirement is really 17.5.0 but easier to require latest stable >= 23.1.1
+# to avoid broken 23.1.0.
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
+	<dev-python/josepy-2[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-23.1.1[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/app-crypt/badkeys/Manifest b/app-crypt/badkeys/Manifest
index b039e6825149..722a6c5b8921 100644
--- a/app-crypt/badkeys/Manifest
+++ b/app-crypt/badkeys/Manifest
@@ -1,2 +1 @@
-DIST badkeys-0.0.11.tar.gz 374536 BLAKE2B d06ffa109ab99c6d747349fc01e0039900c7674524bec50e6dd25fe1f20bed6ad723087ab3f4726d7821bf89da098fcd54255d5286ea3a79e4ec87a855fe20ef SHA512 72e24935caacda35e20234a801e844f801422d59b7d6d5f831bada4e8e184ff5ce831d6aee677b9ac43eb8f49b6621ad479310a8dbd34bed03eafa33f0763cbd
 DIST badkeys-0.0.12.tar.gz 374956 BLAKE2B 4d9670d12bccb72e3ce3cc686967c58602da559da4cbf2157576f5122c3064059def1154b2c7bda1bc6f9e13f8dc8a1cd341917610ffb36e0bf10616c614d955 SHA512 b76dd0b6cd10b4136d83d8b2e44adc8b8fb7d4ef7ae78ec404826283de2410356c3abecaac8c1434e181b8ccd0b77b6ae1dd5eaf568be15c8124868c25027e96
diff --git a/app-crypt/badkeys/badkeys-0.0.11.ebuild b/app-crypt/badkeys/badkeys-0.0.11.ebuild
deleted file mode 100644
index c6fcf93434e2..000000000000
--- a/app-crypt/badkeys/badkeys-0.0.11.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 pypi
-
-DESCRIPTION="Check cryptographic keys for known weaknesses"
-HOMEPAGE="https://badkeys.info/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="dkim ssh"
-
-DEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/gmpy2[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dkim? ( dev-python/dnspython[${PYTHON_USEDEP}] )
-	ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )"
-# TODO: add optional binary-file-search dependency once
-# it is packaged.
-DOCS=( README.md )
-
-distutils_enable_tests unittest
diff --git a/app-crypt/badkeys/badkeys-0.0.12.ebuild b/app-crypt/badkeys/badkeys-0.0.12.ebuild
deleted file mode 100644
index c6fcf93434e2..000000000000
--- a/app-crypt/badkeys/badkeys-0.0.12.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 pypi
-
-DESCRIPTION="Check cryptographic keys for known weaknesses"
-HOMEPAGE="https://badkeys.info/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="dkim ssh"
-
-DEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/gmpy2[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dkim? ( dev-python/dnspython[${PYTHON_USEDEP}] )
-	ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )"
-# TODO: add optional binary-file-search dependency once
-# it is packaged.
-DOCS=( README.md )
-
-distutils_enable_tests unittest
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 1bfef9091904..0900da35c173 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1 +1,2 @@
 DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd
+DIST certbot-3.1.0.gh.tar.gz 2299990 BLAKE2B 596f11d4ebb161ee6ba67f4f150a77e081399f11f4e4652923c94297661149c9cb889afc51b46b6111847820823d90edc3a7f1e14c451122f88e6e777bf48795 SHA512 efd0b0c1540a6e3b631fa80eac65c9e8b31b1e5e1242f56d3723ca7e1b1b2121dfe1bf8e122fe9a9b994460553f1fa085b11d1369b3160f5c51c939b2cccd638
diff --git a/app-crypt/certbot-apache/certbot-apache-3.1.0.ebuild b/app-crypt/certbot-apache/certbot-apache-3.1.0.ebuild
new file mode 100644
index 000000000000..b65adf0df968
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-3.1.0.ebuild
@@ -0,0 +1,46 @@
+# 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
+
+PARENT_PN="${PN%-apache}"
+PARENT_P="${PARENT_PN}-${PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
+	"
+	# Only for amd64, arm64 and x86 because of dev-python/python-augeas
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Apache plugin for Certbot (Let’s Encrypt client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot/
+	https://pypi.org/project/certbot-apache/
+	https://letsencrypt.org/
+"
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 1bfef9091904..0900da35c173 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1 +1,2 @@
 DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd
+DIST certbot-3.1.0.gh.tar.gz 2299990 BLAKE2B 596f11d4ebb161ee6ba67f4f150a77e081399f11f4e4652923c94297661149c9cb889afc51b46b6111847820823d90edc3a7f1e14c451122f88e6e777bf48795 SHA512 efd0b0c1540a6e3b631fa80eac65c9e8b31b1e5e1242f56d3723ca7e1b1b2121dfe1bf8e122fe9a9b994460553f1fa085b11d1369b3160f5c51c939b2cccd638
diff --git a/app-crypt/certbot-nginx/certbot-nginx-3.1.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-3.1.0.ebuild
new file mode 100644
index 000000000000..a5a1b4b7e4c2
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-3.1.0.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=( python3_{10..13} )
+
+inherit distutils-r1
+
+PARENT_PN="${PN%-nginx}"
+PARENT_P="${PARENT_PN}-${PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Nginx plugin for Certbot (Let’s Encrypt client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# The requirement is really 17.5.0 but easier to require latest stable >= 23.1.1
+# to avoid broken 23.1.0.
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-23.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 44db289daad2..47b249c84df7 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,3 +1,4 @@
 DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd
 DIST certbot-2.11.0.gh.tar.gz 2322114 BLAKE2B d266483d1ffc9f9274df3d5e389ed961758e77e9455a7324132bb2bfe4896db663642a98ac7250d35fbbd60d6aef0d6d2a58f98ad17130958dcfcd61283c2479 SHA512 ba47fc98faaf47278c58e107356371c06039f70ad539d2ca1ac39462bb45c7a6c55ed525d8bd8b11cd35cf807f3423e19309022751a492ba19ded79cfbb6d7f4
 DIST certbot-3.0.1.gh.tar.gz 2325233 BLAKE2B 247505fb500c829de875aa0886f27727de4ccc4f474dd13957b524b84af99e6ee5d1e86f09577422932a498ec9fda24ae36377d117365531ad1f8eddb0148272 SHA512 7aec63ec7705f4e13acb7cef5d770f103222ddf3dca30760c42cd3aeb0531d630111518960c299d89bccba4134b544a329fa02659fac5f977c9ca0321b2d1e2e
+DIST certbot-3.1.0.gh.tar.gz 2299990 BLAKE2B 596f11d4ebb161ee6ba67f4f150a77e081399f11f4e4652923c94297661149c9cb889afc51b46b6111847820823d90edc3a7f1e14c451122f88e6e777bf48795 SHA512 efd0b0c1540a6e3b631fa80eac65c9e8b31b1e5e1242f56d3723ca7e1b1b2121dfe1bf8e122fe9a9b994460553f1fa085b11d1369b3160f5c51c939b2cccd638
diff --git a/app-crypt/certbot/certbot-3.1.0.ebuild b/app-crypt/certbot/certbot-3.1.0.ebuild
new file mode 100644
index 000000000000..ac59ba6b64e7
--- /dev/null
+++ b/app-crypt/certbot/certbot-3.1.0.ebuild
@@ -0,0 +1,66 @@
+# 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
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Let’s Encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="
+	https://github.com/certbot/certbot/
+	https://pypi.org/project/certbot/
+	https://letsencrypt.org/
+"
+
+S="${WORKDIR}/${P}/${PN}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="selinux"
+
+BDEPEND="
+	test? (
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+# See certbot/setup.py for acme >= dep
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-1.5.3[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
+	<dev-python/josepy-2[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	selinux? ( sec-policy/selinux-certbot )
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 996fa9e7d6a9..f2e7694ba0ee 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1 @@
-DIST eid-mw-5.1.19.tar.gz 16299622 BLAKE2B a66c861c1120851ecbfd66de4b61db2c2f0951735982365ad516f2cf31249e7241180829e2992738821ecbd09c0fd83a0cba11cf34b23cdc45bfd9899072777a SHA512 9383fa4661a6e46510c3c0f1509aa9c9ee772b7222faacdad3de9433529591c9e7b102d954363f345e47104f4f0473e241c0be57d1049936842e67dac45adc2f
+DIST eid-mw-5.1.21.tar.gz 16299868 BLAKE2B 9b01b25782ca8d64c1abf9beadf556f4691af5ba68deb3d0fb25a6b9ba13c845565aa5308360f3ebe69ec88871d60f3f1340178cd6133429946a5ebcdd249ad8 SHA512 f94a7c6fb6b72603adeb1e8e42bccddb0917b2597f0826736974e120d3ece6cc17242999790209d6a8e440545d8905565793f7a2ff5877ddbd788b50098248c8
diff --git a/app-crypt/eid-mw/eid-mw-5.1.19.ebuild b/app-crypt/eid-mw/eid-mw-5.1.19.ebuild
deleted file mode 100644
index 905a49b49f47..000000000000
--- a/app-crypt/eid-mw/eid-mw-5.1.19.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools desktop gnome2-utils
-
-DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
-HOMEPAGE="https://eid.belgium.be"
-SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+dialogs +gtk p11-kit"
-
-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 )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="dialogs? ( gtk )"
-
-PATCHES=(
-	"${FILESDIR}/0001-Do-not-build-xpi-module.patch"
-	"${FILESDIR}/0001-Fix-libdir-for-manifestdir.patch"
-	"${FILESDIR}/0001-Remove-uml-build.patch"
-	)
-
-src_prepare() {
-	default
-
-	# Buggy internal versioning when autoreconf a tarball release.
-	# Weird numbering is required otherwise we get a seg fault in
-	# about-eid-mw program.
-	echo "${PV}-v${PV}" > .version
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable dialogs) \
-		$(use_enable p11-kit p11kit) \
-		$(use_with gtk gtkvers '3') \
-		--with-gnu-ld
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-	if use gtk; then
-		domenu plugins_tools/eid-viewer/eid-viewer.desktop
-		doicon plugins_tools/eid-viewer/gtk/eid-viewer.png
-	fi
-}
-
-pkg_postinst() {
-	if use gtk; then
-		gnome2_schemas_update
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-
-		local peimpl=$(eselect --brief --colour=no pinentry show)
-		case "${peimpl}" in
-		*gnome*|*qt*) ;;
-		*)	ewarn "The pinentry front-end currently selected is not supported by eid-mw."
-			ewarn "You may be prompted for your pin code in an inaccessible shell!!"
-			ewarn "Please select pinentry-gnome3 as default pinentry provider:"
-			ewarn " # eselect pinentry set pinentry-gnome3"
-		;;
-		esac
-	fi
-}
-
-pkg_postrm() {
-	if use gtk; then
-		gnome2_schemas_update
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}
diff --git a/app-crypt/eid-mw/eid-mw-5.1.21.ebuild b/app-crypt/eid-mw/eid-mw-5.1.21.ebuild
new file mode 100644
index 000000000000..7b69d353e6db
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-5.1.21.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop gnome2-utils
+
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+HOMEPAGE="https://eid.belgium.be"
+SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+dialogs +gtk p11-kit"
+
+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 )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="dialogs? ( gtk )"
+
+PATCHES=(
+	"${FILESDIR}/0001-Do-not-build-xpi-module.patch"
+	"${FILESDIR}/0001-Fix-libdir-for-manifestdir.patch"
+	"${FILESDIR}/0001-Remove-uml-build.patch"
+	)
+
+src_prepare() {
+	default
+
+	# Buggy internal versioning when autoreconf a tarball release.
+	# Weird numbering is required otherwise we get a seg fault in
+	# about-eid-mw program.
+	echo "${PV}-v${PV}" > .version
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable dialogs) \
+		$(use_enable p11-kit p11kit) \
+		$(use_with gtk gtkvers '3') \
+		--with-gnu-ld
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+	if use gtk; then
+		domenu plugins_tools/eid-viewer/eid-viewer.desktop
+		doicon plugins_tools/eid-viewer/gtk/eid-viewer.png
+	fi
+}
+
+pkg_postinst() {
+	if use gtk; then
+		gnome2_schemas_update
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+
+		local peimpl=$(eselect --brief --colour=no pinentry show)
+		case "${peimpl}" in
+		*gnome*|*qt*) ;;
+		*)	ewarn "The pinentry front-end currently selected is not supported by eid-mw."
+			ewarn "You may be prompted for your pin code in an inaccessible shell!!"
+			ewarn "Please select pinentry-gnome3 as default pinentry provider:"
+			ewarn " # eselect pinentry set pinentry-gnome3"
+		;;
+		esac
+	fi
+}
+
+pkg_postrm() {
+	if use gtk; then
+		gnome2_schemas_update
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 520f875e448e..2b8ace4defde 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,2 +1,3 @@
 DIST gcr-3.41.1.tar.xz 1030368 BLAKE2B 9d254b7f2ad864c45200e58b685db97c1ffbc83d29ba8cbda94d30ec565aa3dc5a2535305dc63b3264131b68ec9e48f37ac30d5ba08d0ce156f3b6091cd62dc1 SHA512 dd70d41636ede863d05824b26823a8f572902f7a9b6f09b0c70586ef0d4c046864e6956130b9231850a515a9fbfcd56faf20354c1cf8f697f005827c048a2325
 DIST gcr-4.2.1.tar.xz 719392 BLAKE2B a9134258f6daa59de4924f6bac01499d3bf87aae5e9d9ff5c69b2289ba0e82ef4c3f93a1ca7b1b007815e51e0c56f10a8abc616b31518dfa83581e8ffc5b3309 SHA512 fbb1664f6e276e35296aec46dab53ff308d031cae2f25b7d1ff5abdb56c5bd3764927d38b997d2ccbd260975f445d71619b2487327786c30b5f34d5e8865ff25
+DIST gcr-4.3.0.tar.xz 726488 BLAKE2B 9981c6d6cf1b4d7d83b1771439a2fab84360e6a1ab28d73dcbd4d6aab831e1fb69a10d3e073f8735c4842f58f2b4e189fd624b78d3007867cfc7fda767e1d15f SHA512 3f252de55e07d47a49c03b714e323ceb00d82e010fe1bb606073e3188bf8bef84359a322ed6fe843620fa5d108e825dd7e9a60136c8a0e802b8f2178aa87b164
diff --git a/app-crypt/gcr/gcr-4.3.0.ebuild b/app-crypt/gcr/gcr-4.3.0.ebuild
new file mode 100644
index 000000000000..20c2d3eddc06
--- /dev/null
+++ b/app-crypt/gcr/gcr-4.3.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="4/gcr-4.4-gck-2.2" # subslot = soname and soversion of libgcr and libgck
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="gnutls gtk gtk-doc +introspection systemd test +vala"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.68.0:2
+	!gnutls? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	gnutls? ( >=net-libs/gnutls-3.8.5:0 )
+	>=app-crypt/p11-kit-0.19.0
+	>=app-crypt/libsecret-0.20
+	systemd? ( sys-apps/systemd:= )
+	gtk? ( gui-libs/gtk:4[introspection?] )
+	>=sys-apps/dbus-1
+	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
+	!<app-crypt/gcr-3.41.1-r1
+"
+RDEPEND="${DEPEND}"
+PDEPEND="app-crypt/gnupg"
+BDEPEND="
+	gtk? ( dev-libs/libxml2:2 )
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	gtk-doc? ( dev-util/gi-docgen )
+	>=sys-devel/gettext-0.19.8
+	test? ( app-crypt/gnupg )
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	filter-lto # https://gitlab.gnome.org/GNOME/gcr/-/issues/43
+	local emesonargs=(
+		$(meson_use introspection)
+		$(meson_use gtk gtk4)
+		$(meson_use gtk-doc gtk_doc)
+		-Dgpg_path="${EPREFIX}"/usr/bin/gpg
+		-Dssh_agent=true
+		$(meson_feature systemd)
+		$(meson_use vala vapi)
+	)
+	if use gnutls; then
+		emesonargs+=( -Dcrypto=gnutls )
+	else
+		emesonargs+=( -Dcrypto=libgcrypt )
+	fi
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+src_install() {
+	meson_src_install
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/{gck-2,gcr-4} "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-crypt/gnupg/gnupg-2.2.45.ebuild b/app-crypt/gnupg/gnupg-2.2.45.ebuild
index 06ff2f90dcaa..bf482df1cdeb 100644
--- a/app-crypt/gnupg/gnupg-2.2.45.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.45.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 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/gpgme/gpgme-1.24.1.ebuild b/app-crypt/gpgme/gpgme-1.24.1.ebuild
index a64b047b85bd..70de6a23a100 100644
--- a/app-crypt/gpgme/gpgme-1.24.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.24.1.ebuild
@@ -34,7 +34,7 @@ LICENSE="GPL-2 LGPL-2.1"
 # Bump FUDGE if a release is made which breaks ABI without changing SONAME.
 # (Reset to 0 if FUDGE != 0 if libgpgme/libgpgmepp/libqpggme change.)
 SLOT="1/11.6.15.2"
-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"
 IUSE="common-lisp static-libs +cxx python qt5 qt6 test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/app-crypt/kencfs-plasma/Manifest b/app-crypt/kencfs-plasma/Manifest
deleted file mode 100644
index 4e0aeb05e4e6..000000000000
--- a/app-crypt/kencfs-plasma/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kencfs-plasma-2.0.2a.tar.gz 224022 BLAKE2B 281f1db349085ccc69db7e3795eb82a591d83beffb1036de7689939c2e9d07bad6c0677da72a45ef0df5d399bdc768d3ce1157112fa63403fb65bfed84a366ed SHA512 859dfd493b01343960210025ca3dde8bb18a141b48f68e941c0a832c88210eff775d10a6b3eb45d6f1a89ecbc812fe6785077e54e648b1a9ff66e73ea1cebfe0
diff --git a/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-include.patch b/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-include.patch
deleted file mode 100644
index 2bdd692c122f..000000000000
--- a/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix build when kdelibs is not installed.
-
---- a/mainwindow.cpp
-+++ b/mainwindow.cpp
-@@ -52,7 +52,7 @@
- 
- QStandardItemModel *model;
- 
--#include <KDE/KWallet/Wallet>
-+#include <KWallet>
- using KWallet::Wallet;
- Wallet *m_wallet;
- QString WalletFolder="Kencfs-Plasma";
diff --git a/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-qt-5.11.patch b/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-qt-5.11.patch
deleted file mode 100644
index 3efc5e418383..000000000000
--- a/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-qt-5.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/kencfs-plasma.pro	2017-02-05 10:09:37.000000000 +0100
-+++ b/kencfs-plasma.pro	2018-09-11 19:43:41.594198503 +0200
-@@ -15,7 +15,7 @@
-     
- TRANSLATIONS = kencfs_it_IT.ts kencfs_ro_RO.ts kencfs_cs_CZ.ts kencfs_ru_RU.ts
- 
--QT += widgets KWallet KConfigCore KNotifications
-+QT += dbus widgets KWallet KConfigCore KNotifications
- CONFIG += qtsingleapplication
- 
- include(singleapplication.pri)
diff --git a/app-crypt/kencfs-plasma/kencfs-plasma-2.0.2_alpha.ebuild b/app-crypt/kencfs-plasma/kencfs-plasma-2.0.2_alpha.ebuild
deleted file mode 100644
index 44f1d5472436..000000000000
--- a/app-crypt/kencfs-plasma/kencfs-plasma-2.0.2_alpha.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_alpha/a}"
-inherit qmake-utils
-
-DESCRIPTION="GUI frontend for encfs"
-HOMEPAGE="https://www.linux-apps.com/p/1170068/"
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	kde-frameworks/kconfig:5
-	kde-frameworks/knotifications:5
-	kde-frameworks/kwallet:5
-"
-RDEPEND="${DEPEND}
-	sys-fs/encfs
-"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.1_alpha-include.patch"
-	"${FILESDIR}/${PN}-2.0.1_alpha-qt-5.11.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i ${PN}.pro -e "/^INSTALLS/s/ doc//" || die
-
-	# fix desktop validation
-	sed -i ${PN}.desktop -e "s|kencfs-plasma/kencfs-icon|/usr/share/icons/&.png|" || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/app-crypt/kencfs-plasma/metadata.xml b/app-crypt/kencfs-plasma/metadata.xml
deleted file mode 100644
index 8641e5bdd399..000000000000
--- a/app-crypt/kencfs-plasma/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-crypt/keysmith/Manifest b/app-crypt/keysmith/Manifest
index 351ab3b4d768..fa1e8eae41bf 100644
--- a/app-crypt/keysmith/Manifest
+++ b/app-crypt/keysmith/Manifest
@@ -1,2 +1,2 @@
 DIST keysmith-24.08.3.tar.xz 171432 BLAKE2B 3849b02928b0aff80e28cc09d208ff543cf930e8e997a5c2c139325e1ce1785c5e569604eb64217f02b2ca99ae5b5edd651069f601a5a01ed59aaf65202ffedf SHA512 bfb67ea99c1435bee49e3a5170c9ca102f9d6ffe81ca66c1fa97e8c86fdf4464abb8a1c945cb7ffa2d89bfa995dda3ef7d20a512476642d38b9483789163b8eb
-DIST keysmith-24.12.0.tar.xz 172432 BLAKE2B f3a61cfe09cf54919fb676719c5e751f1065e6b74f824573a7b655e2323b6c81787cb8f7d106c57706d8846760b1c18439ca6a57a372e00c7be3f7dd4d4a9628 SHA512 9cf48a564676435430bebfe92b5f9a8613fa4fc4c8c222f219c064c381349ef7b0c3350dc004086e764ee0caba5b02b8f0f36038dbeca7867d2ea948ec2d5cec
+DIST keysmith-24.12.1.tar.xz 174024 BLAKE2B a1f4ef4b1c958bffea7ee95784ba172d0de344e5761dcf98df2658451ab02447412a83264cff5f14b6d920c206bdf0c0435f6d0fe7b1929a337a21336a974024 SHA512 f3aa3feb50da43065491837080f12877590f2c67df6d10260b2dddfc1978e25d86dac84ed323278b0a580e0013bf5fe298be926f93a09984d69d8e0bbf70e6f6
diff --git a/app-crypt/keysmith/keysmith-24.12.0.ebuild b/app-crypt/keysmith/keysmith-24.12.0.ebuild
deleted file mode 100644
index 103db7d6a0a1..000000000000
--- a/app-crypt/keysmith/keysmith-24.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="utilities"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="OTP client for Plasma Mobile and Desktop"
-HOMEPAGE="https://apps.kde.org/keysmith/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-libs/kirigami-addons:6
-	dev-libs/libsodium:=
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
-"
diff --git a/app-crypt/keysmith/keysmith-24.12.1.ebuild b/app-crypt/keysmith/keysmith-24.12.1.ebuild
new file mode 100644
index 000000000000..a2d49325b99b
--- /dev/null
+++ b/app-crypt/keysmith/keysmith-24.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="utilities"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="OTP client for Plasma Mobile and Desktop"
+HOMEPAGE="https://apps.kde.org/keysmith/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-libs/kirigami-addons:6
+	dev-libs/libsodium:=
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+"
diff --git a/app-crypt/minisign/Manifest b/app-crypt/minisign/Manifest
index 4c879cc7316f..d3716360c1ff 100644
--- a/app-crypt/minisign/Manifest
+++ b/app-crypt/minisign/Manifest
@@ -1 +1,2 @@
 DIST minisign-0.11.tar.gz 18410 BLAKE2B 503d73f53b9405f337865536d132e0de880cdefa9df2c08815b4cc9f7e2995a0d3032fe7b2ec48610c10b6023d998286ac705e0d10c6a475185b60405f69ec50 SHA512 a7445cb9646ae56fcba718f61f73486d5774d9cafe72ef051a3e60f94baf852b597261778bce50371ea5ee63395b0477bf1a33c7683fde32d003fab66029241f
+DIST minisign-0.12.tar.gz 20663 BLAKE2B 4d704816c1fc9aea645418a1a01a0d7d3fa19354afae282dcd2a4979500c0b44df0f254d5f5e19ea57584e29d88878c596418107c546605d03b4fabb3c9fe080 SHA512 fc95020fef3ae63ab974a20c39b9bf05df957c40838fceb73cb10d6cec9880d882727b6a0240b81b4a7593ff2603d4eef4b32b0857dcf5f85de5e0b7573086ed
diff --git a/app-crypt/minisign/minisign-0.12.ebuild b/app-crypt/minisign/minisign-0.12.ebuild
new file mode 100644
index 000000000000..6103c8054fa0
--- /dev/null
+++ b/app-crypt/minisign/minisign-0.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2019-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Dead simple tool to sign files and verify signatures"
+HOMEPAGE="https://github.com/jedisct1/minisign/"
+SRC_URI="
+	https://github.com/jedisct1/minisign/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="
+	dev-libs/libsodium:=[-minimal(-)]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_STRIP=OFF
+	)
+	cmake_src_configure
+}
diff --git a/app-crypt/sbctl/sbctl-0.16.ebuild b/app-crypt/sbctl/sbctl-0.16.ebuild
index 97f67663daf4..779694d56722 100644
--- a/app-crypt/sbctl/sbctl-0.16.ebuild
+++ b/app-crypt/sbctl/sbctl-0.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.ta
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="app-text/asciidoc
 	verify-sig? ( sec-keys/openpgp-keys-foxboron )"
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index a34a2741571a..0dab42e0acfa 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1 +1,2 @@
 DIST seahorse-43.0.tar.xz 1392460 BLAKE2B b7ae8b42042ad8e07eaf2633583b566f9757f83bd066eb8b0786d5e89353901f5526ed925bb6152820a5b2a36defb0c0f38dea634c3ae78ebf8d29ab07ff9cfb SHA512 168fdfc829134915f513028b1d35b647aa18a0390786cbf512f7ddb7b125b239f3f3d880a847119a5aa22580354f0b594e553fe3940a3afbda5861e69dd88e5d
+DIST seahorse-47.0.1.tar.xz 1401872 BLAKE2B 11b10b1bb1cf4836f7490620169630b71ccf0df67ed25f46e035bb97fbd1450564252cad1974c6e69bfd00019dff8da88875fd605dbcf31bfa64104cb0704e6c SHA512 ac2a20f4d9106f26932c77dc11b4fbd18c8a83d15991f31ae89223a487fa1b4d97cb19de858cc6f53435b7ebcc1dd0f16148d0d1d3080436f0b541de5a56bfcb
diff --git a/app-crypt/seahorse/seahorse-43.0-r3.ebuild b/app-crypt/seahorse/seahorse-43.0-r3.ebuild
deleted file mode 100644
index f2850ce46df5..000000000000
--- a/app-crypt/seahorse/seahorse-43.0-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Manage your passwords and encryption keys"
-HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE="ldap zeroconf"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.66:2
-	>=app-crypt/gcr-3.38:0=
-	>=app-crypt/gpgme-1.14.0:=
-	>=x11-libs/gtk+-3.24.0:3
-	>=app-crypt/gnupg-2.2
-	>=gui-libs/libhandy-1.6.0:1
-	>=app-crypt/libsecret-0.16
-	dev-libs/libpwquality
-	virtual/openssh
-	ldap? ( net-nds/openldap:= )
-	net-libs/libsoup:3.0
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-libs/libxml2:2
-	app-crypt/gcr:0[vala]
-	app-crypt/libsecret[vala]
-	gui-libs/libhandy:1[vala]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gnupg-2.4.patch
-	"${FILESDIR}"/${P}-musl-stdout.patch
-	"${FILESDIR}"/${P}-clang16.patch
-)
-
-src_prepare() {
-	default
-	vala_setup
-	gnome2_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dhelp=true
-		-Dpgp-support=true
-		-Dcheck-compatible-gpg=false # keep lowest version listed as compatible as min dep for gnupg RDEPEND
-		-Dpkcs11-support=true
-		-Dkeyservers-support=true
-		-Dhkp-support=true
-		$(meson_use ldap ldap-support)
-		$(meson_use zeroconf key-sharing)
-		-Dmanpage=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-crypt/seahorse/seahorse-47.0.1.ebuild b/app-crypt/seahorse/seahorse-47.0.1.ebuild
new file mode 100644
index 000000000000..234b504bd362
--- /dev/null
+++ b/app-crypt/seahorse/seahorse-47.0.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Manage your passwords and encryption keys"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/seahorse"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="ldap zeroconf"
+
+RDEPEND="
+	>=dev-libs/glib-2.66:2
+	>=app-crypt/gcr-3.38:0=
+	>=app-crypt/gpgme-1.14.0:=
+	>=x11-libs/gtk+-3.24.0:3
+	>=app-crypt/gnupg-2.2
+	>=gui-libs/libhandy-1.6.0:1
+	>=app-crypt/libsecret-0.16
+	dev-libs/libpwquality
+	virtual/openssh
+	ldap? ( net-nds/openldap:= )
+	net-libs/libsoup:3.0
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-libs/libxml2:2
+	app-crypt/gcr:0[vala]
+	app-crypt/libsecret[vala]
+	gui-libs/libhandy:1[vala]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	vala_setup
+	gnome2_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dhelp=true
+		-Dpgp-support=true
+		-Dcheck-compatible-gpg=false # keep lowest version listed as compatible as min dep for gnupg RDEPEND
+		-Dpkcs11-support=true
+		-Dkeyservers-support=true
+		-Dhkp-support=true
+		$(meson_use ldap ldap-support)
+		$(meson_use zeroconf key-sharing)
+		-Dmanpage=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-crypt/sequoia-chameleon-gnupg/Manifest b/app-crypt/sequoia-chameleon-gnupg/Manifest
index 9c54b2f14955..d7bce47b8733 100644
--- a/app-crypt/sequoia-chameleon-gnupg/Manifest
+++ b/app-crypt/sequoia-chameleon-gnupg/Manifest
@@ -1,24 +1,23 @@
-DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b
 DIST addr2line-0.22.0.crate 39156 BLAKE2B 3fbb55f6cacbb177d06359bcd39885247a9eeef96d95ffac0dfd1d45ed394dcd1e9e069c02c71a9ffca0b69e3a974e4d96bc3385470ee39c87d7a30ea7914303 SHA512 b334f51bd369348b4446805b4f624ec9b4cc8eefcc53ceb57b523ff55bf018d1dfe23259daf48d1878170ad4fcb44181d4738456eb5e35ede6932ff29686268e
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
+DIST adler2-2.0.0.crate 13529 BLAKE2B ec575b0bf12e321399ac3a1d59fce4ddbeabcc60cb3d7c2f362cce23eb29b4ea836451372d6d88552a4435ae29bb41d6230d55f625a4359eace680b9b771d0ad SHA512 12d12579ad617cf1a94cf95ab9d3f5db566c3b2de4bd5735eccd83c668fdad0eff134c996b73c46cbb9f932837682043878b8cc4764191625e9f93ccffcce423
 DIST aead-0.5.2.crate 15509 BLAKE2B 0214f3e8ee85a7e18c7d20f9a3fcbdbb9e5af6fdfdcb427e915279b505556dbd2df6d09d5c90561417c56796236a56ab24b2b11389745bc03a0a6da45c0e8636 SHA512 61926a615618e64efd0e9342d729a89f80d6e092dda50e018252a06147e2ca0dc2a989136416f57ae02019695757dfa3d3f3cf3799f138e440662744ecab4a44
 DIST aes-0.8.4.crate 124812 BLAKE2B c4a9cadbbfd9d24a758bd5d18b851fb86bd74f5b1f0f6f5706275329d92396a00dc2c35fa0aa2af5b55fd336934d35df413a31f85ba886e85a037296f9df25bd SHA512 96243337546acf64f89bf9ba23011eea1a205d82d96707f9c45bf28cc62ef00cdac5cdfacb8d6013155ee1522ad73dd1b7f166c74ed18159bf23c3c48ec77d79
 DIST aes-gcm-0.10.3.crate 148991 BLAKE2B e1376b741386577277a8cb9535c1ad3e15ea383c0f324bc5cedff09a76b11f2c9e29226535688f9431e904bf2800b8e140c4b1cab333e572208eefd19ca897f1 SHA512 f9aec1e2609262c30921bf83cdd82117d147905d4ca311f9fef4b9f1734d3a57893ba2586f0ccfd39cf9264d347ba2c2d2c52b4726495eda8fec7fbec42d6db3
 DIST ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d
 DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
-DIST allocator-api2-0.2.16.crate 59025 BLAKE2B fda69b52435a7243eb19bc55914a1961e59dbad5ac12c40db39cccdf7a99c742da59c3ef160350808698db24b91e0ce655cd1acedbbcbe20c717604aae23ea5e SHA512 e1eb0df6b44b62115795ebf772f81e9ac0b6d273afd81659dbddb7eb6628b6e5ef6a60ea21413e79ee638afb72e6872ba83a075f6324daf93f2f1eda48daff2f
-DIST allocator-api2-0.2.18.crate 62504 BLAKE2B 8152c5a611be91ba23b1e8647511e21f48e7d4f1a7b9a828083f5bb8747cdc92aee66f73251b19195bbdc1f65aad992632e820d86cbeff287d598257ae3628a6 SHA512 5e5b0e23e1f5b259e5d3746e3e05817af8dee95af7105ea775a5c1d69b4e537a4d6a25e2c1d46ab83e2385217b158f7940dc1315ae581c35ee23289647105e73
 DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
-DIST anyhow-1.0.81.crate 45142 BLAKE2B 9b8678c5336fe5fd2823c58eae827f7aba726e12fb6edfa958c6e3b38a96dc3310bc8d044ee2e9db0bc611548f0be9a7b664b75321bd0b8a7e168d27dd3d7e78 SHA512 3d328c6b45a4780cfb6fc8daa5581cb5e45b230cb5f55837b0fcc8331c8d53630950c281115c06b21e655821a46d360c4aa667cbb24e87f3a534206361b08af5
-DIST anyhow-1.0.83.crate 45650 BLAKE2B 522121300f10688756aac1c39e83e867e20b9f142fdc1bb87732d8a64f6bf67411f1e35542fae7aa036d9221412a29b47acc75de8a2bb019bab90fece55e2c86 SHA512 4e4b29fd0a97ac55269d23efa399a372ef6128e1909ce464f178ae91fc61dc90a5867cd2a7218205f53988aea8cff6649302f7f6f12e07d1b5d3472d4c5eaaf3
+DIST anstream-0.6.15.crate 29231 BLAKE2B cc4cf0f381c210fecc20b5796fe872b533419e5f957021b0c3be3cdc23fb84ce029fbef6f9b6f174a76ad713c07f0811145a70572de7c24cfab060fdd990f49a SHA512 1cb01a0293b4c9bcc010909707e71c464416d3ec6fc9789060b7aa9fe4cc04424fefa8013cc8765ccdae6dfd9a1c50a11f7b30b39a32c4aeaf525f28167ddb92
+DIST anstyle-1.0.8.crate 15771 BLAKE2B c039613e7de27cc990e5764810f9351754b160928a8954dc19041354cf9fef1422ed964237a5d39d16e4e9f8592ed52c523ccf36b0b5506f464d4f818f3332ff SHA512 3b867f73df0b2f69a0c7d5d6e62c7515045e053656afaa303e5aade8012e838cdf5d15d2c3d7c297db9e297d08ea69a9c8eed04b97922a83f56c58962c1c0b69
+DIST anstyle-parse-0.2.5.crate 22680 BLAKE2B 7473651b1eee08857a6ed1419d3d62ba4b9a9aa0d6657965ad9c67bddd793d825737d3804961716a89bdebed9879ac43b42c897cd229c6e7bd780859e1e3c247 SHA512 cd94ad0e88ad4547a660da1473bf4e6dfed805a066782124204143c7f754c12db719bd3a1774c299f1a035740bfc4830919da191bd14e0acede410f6dbd1e2ef
+DIST anstyle-query-1.1.1.crate 9891 BLAKE2B c298114c1864a5233fb39c365e079a7f1f4ef23499dc330e5deb06f83f27bc727015befef79075c7e39952547f799b4135d7db287cf72dfc914191df784a4989 SHA512 1b2e888f025142a0d9b01314cf083831a2a45d8da737c1be3a6a9aa177e73e0d2ae7999fe7610dd450b7096115e8cf38c5da23723cebf1deaa7d3501d3dbd5ce
+DIST anstyle-wincon-3.0.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c57b22b57e32a5c75847f2e2bd68a52b33c24797db662aa5fd7e799b9644075c8c939d93b0cf8598b16ee80fc817b77f SHA512 24b3a9a44382609ad449425a657d4b42a792d4703c36e0953f09a03817759c266a2f0ff4ecc9e8b93ea8403df2badef1f1af6a6e50af56205176c41b13501ae6
 DIST anyhow-1.0.86.crate 46741 BLAKE2B 21b1f3acd1c1b659e6e9a53693178de67c806d7dbad30dedea0fb7078b2388baa196d1e7240a7dc88ed9dc93ee4c00bca8e608dad1b6bfb5bfa4f4c5ab51f0d3 SHA512 3853da32a2c53d73969bb29a1e622f3a6d5832d8888dc6bc8eedb76394b392f983aa3fcb1f542933e238841486106f0f38e9a2400c12c7699baba0ebe1d8193a
 DIST ascii-canvas-3.0.0.crate 10575 BLAKE2B fc40c40551e3e1b2bec6ae5a85ee8b0a1ab1ef3425cdd19ec6dd47d849205004781a2c8f51470417fe7556cf8524cc63b84a532532c5081604adbcd92d286b44 SHA512 216056640604f5faba6d46e2c94ff75234fec83d3bc2dc7cf34dd279706362874e3a513c717b23bc591da07cc3088458913c4e9aa5f280550c93d261095c8703
-DIST async-trait-0.1.79.crate 29558 BLAKE2B f6c5c4c28b85e1907f37f9f6e556c8f4304e15d6af8f7535fd201919496fa03fb213a0389644e2d1433a8e528f36dc9aec9699bdfd37082404d4026ec03fe666 SHA512 4c417b01776d939675b0c4717edbb8e11810cf08ccccb26697809fe10898b73e03ba3332ebd20a2cea72e8f4f16903737d9923e0048f1ce6eb9c8f04465f2487
 DIST async-trait-0.1.80.crate 28775 BLAKE2B d95384a8828c9273e0f295d3c3826b3a8716cd0c4ab39bdb43d65ec57fe886f7c5926c1666a76ca25b1536eedef61b0d92c78ff9c8a52a0515900360b66b0f13 SHA512 3e92bc8d38feea49ebb5011303e55853bbbf5d0fb7c4f6ed6aa471b9000a2a0ea5475619f98831641e8ee484beaa6fd8880770a96b8a5a7df26e392c1b4b3a19
-DIST autocfg-1.2.0.crate 14808 BLAKE2B 122327d6ffd32e08dc9fbdb4dcf69128b19d56280f9d934311b946741003b40571cdd1f3ef54b2be02c8dc505aea11c962b244d33a92206bf4ee8f6b2b9da432 SHA512 66cbfd13e33b36284cf4c74c8d654f93adcc45893d127d9aaa4c1d183e47336096e72d74e7c17dd481fb7a98931ab6cfec7e4d4165cfb491861d4e3ffe2416fc
+DIST async-trait-0.1.81.crate 28896 BLAKE2B 154e6b8da082193832bca7bbc097eb5ee25ed8365d1cb8dedf27f62fbffc710cfbfd0094a200a10399e942014083b74f521dae01cc4601e0f6b9d7364761fce0 SHA512 1fabbaa813ba320012c0bad54d27232eebca4d3fff1cc5ed771df9f90d9e9bfaca4f7b018358dc599fd30c5974d00b34ffc05ce6e9151a57ba572543bff83fd0
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
-DIST backtrace-0.3.71.crate 86553 BLAKE2B 15ed93574fb9e8e28d5ad901bb1f94013b5fec7a79aa96d17f13f6f11a02d29a274ec14ce51a9f515574839aa41232e5aaf6e6fa3ad9c0483591055bd0a78c8a SHA512 5d9307757349e860fb4cab7e9ba1c9d0f1faf49ebcd935ba879b85fed2a9812786c7458abb59a742842a0796fc29ce9921cf575792402486ecdbd9a2568cdd89
 DIST backtrace-0.3.73.crate 87617 BLAKE2B 585eebbb44671dfb3ff088092f62c7b25118ffc34e148b9b6ac67707923254ea43056861e2658c5fac7b9ed16fa56c30e7734e976fc3178f1fc03912d1d44c40 SHA512 dacedfd32cb91fe408e4f395441baf09c0a4b3bc4ba8f79d088359455cc903c93d24969567c7c5b2feb806433ffbb63a526d73f53caa4bee9c51961b61f831d9
 DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9
 DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9763070e269b56a14b150cbfc4b7f599d4c2a0a5f783638170ee132f0796fefb14fcac7fd73c58db0791007a SHA512 91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20
@@ -27,66 +26,61 @@ DIST bindgen-0.68.1.crate 218997 BLAKE2B e3706a992c166c16cd8b8ef996b2eba6a0d67f4
 DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
 DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9
 DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf
 DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb
 DIST block-padding-0.3.3.crate 8504 BLAKE2B d62481c25fd8680cdf0ad0bc259bd3777c3985ee91d5bb4995f484a15d4a9bde21c5d20f8c2efd0eb340aa0b8c7faac0f3fd817202ef4350d17994f478715eae SHA512 0849c99f2027f4e1a12872d2210310e9669f98929c99690febfeec90c0199b2274e20a5f83824f200f75f2553be2029ca85b0c5d0db4d9d477ffee9a71dd3b7c
 DIST botan-0.10.7.crate 40376 BLAKE2B 63332415636f353323b72a4a2aec2910da4da71adedbe649b753b8d8531a4b10054aea588e216ae2a240bcb91873acb63cef2a1d34c364bbee383dda0f24718e SHA512 a03e0a76b8bc0bc777bafc3e2df7667dc78fffb35dc3bb227773aa23b3ebef872efec9d5144513940dcd44e18ddd87d881806803ce3736c73cf96221befe16c5
 DIST botan-sys-0.10.5.crate 8245 BLAKE2B beef1579600f7fea44b7a701cc29b2f530cd1da8da6090f1cf8fdcc00e68fab711064b0d037604796aa0633f2e71495f8cbcbe69047ef773098a36ffe2069867 SHA512 6f22a5c42e4b13ae2531e1b46ad0d93c62faf96b056f80a145370816296fbf33c93c2dda94736afca7a73bcfd336003a39171c359723e05bb5c269ebb4784339
-DIST buffered-reader-1.3.0.crate 62825 BLAKE2B d36e03412d004b74b15cc4214e279344efb0119d5bac10593aaabca531c9d7052ed5bbbd191c705277f03b0e0f286365eb22300b1bc0eefc22d7a8a22c2e74ea SHA512 4c9cf94593c33e09152b1a4faf75e169be954421e1e3bcff7bb536d1103256fbc296680da01a94c0852c7ff10fcd63cd6693958f338160e5caf8a179a6b6a381
 DIST buffered-reader-1.3.1.crate 63723 BLAKE2B 7a7553b5994c01666c95a678712005ed3c02fbf8f0b45d80f2e80b2bd46c5993376b16f5d89d50a7cd915aed9da6dc164901c6e62091922e615bc8b9284f3328 SHA512 4b7efde96c2db48f8452e56a904b1fc865b7317bcc324c10c0a23147b96eb14cd5097b3178910a1a74d54948b50d6499fa7f5c8630274a80ff05f1eeb2c7054f
 DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
 DIST bytes-1.6.0.crate 60605 BLAKE2B 3e4cd094443969c6062b51917ad9df314b61ec9ddcb0336cf2621d8966c568d5b1fdbf16b11b5e2fab01b43ea76f6609f753eb5c2380a5e4aa8fb6e807a2ff5d SHA512 6507bc4274204d0a19b6a95c3284c52245c71cbf5f2dfb5cd372193d989e49869ec557c0c4e449e96ed4e3028c90606dfb0dcdc1d72bb234a36bc5f344c0a7a8
+DIST bytes-1.7.1.crate 63623 BLAKE2B c399f7f25b85ac284bd2f139d895838eeba7deb56d109c8579966be4b8a7a56bbc26f9387bd0bef9fe5449d5e2ae8d11b254a7ef93048a4827d945ddddb5ce09 SHA512 04cb5bb1718ee378be1d9d56aef2d117ed561935ddadd78139ef2839f998e92c88369c79560bce9d23246a3ebda1dc888af373f9ad4827a0b9a249379bc71e81
 DIST bzip2-0.4.4.crate 34197 BLAKE2B b69f8ad38b44eb4912b33d53467492b0ebe6ed740451bdfe9133e71c47a8dbd85b1110a9607c4cc627fbabc44cd86fe0396bb545864632ffb6169f9cfa547b6c SHA512 9cd2b9159bd0b42ac908ecad41f0a737272af94ae0d6dcfe182d2f44bcea4632d32b0456f02322047ea9d6f46377db6cd083f468782bccd6126bcc75cb852555
 DIST bzip2-sys-0.1.11+1.0.8.crate 633444 BLAKE2B 01578c512443134fc786669bea4f2ec4b9c457b9936c907315299d8b67ed78045d458c83ccc119f0fad511529fb5af5feff5fa2d983fdae832d2fcc1b343e102 SHA512 d0a86b9f03acb1e4e309d5739dc2e88cab582757d467a433afe0017017f0e5d2c0282529e3a117160958ed170d8d695ecae739805888305df0e35e4dc440582b
-DIST capnp-0.19.3.crate 142400 BLAKE2B 291c5bb1fe1fcbae7391f828fe72c0acb3088d518e95c7ec4a8f43007abe2ea154cb6d262bbd72a74f14c170a5944baa53c687d4c909b04c6eb41ca4265fc47b SHA512 e0cccbf806712dd68d7d1bb3576bdf806135c804679d83d254d2d85d97a2c757681a3215104615fa4d58d20784f9cfe891dd44aa6e87d042bc232f939c941089
 DIST capnp-0.19.6.crate 143197 BLAKE2B 39ac9a96351609e6ae57cdc44798444f99be346366756aabf5b9499709650795783cb826bc105be27b05b03104a902b4870420f5fa534f6a4f216642d9b6d82e SHA512 1fb8804b86fdb85f70681203261b16993cce6be720968be757c53c836c536d0a1a231256c523b69f8e4f1c8f0db4fd5edaa0394cc95d16d53d57cbe07632baf6
 DIST capnp-futures-0.19.0.crate 12275 BLAKE2B 86eb409ce0ac5b1340572cd3ac0c79c4ae4db8418b3a6183aba5774ebc3f7e7c3d6d89984201e93f29a3f11f70ed2a38bb4a47816495967e2339fdb0474b68e9 SHA512 3db50310d40921d082b09d99dd2ecff1de901ac64672236d9c32f28858cd7e0beb377cc129c83f791c2b87aaa6d0ed2cac26a852244010d1970597afb23b4316
-DIST capnp-rpc-0.19.0.crate 92481 BLAKE2B 8323ccf3c0782a70403b8da80cecd1217fb180b453c176855113c5aca9d04e66f13dc452cde658919ef62c25130ded07693b59cf86bb57163230f3766c6ec14b SHA512 5dc37ac1433c302aa20c61a06527a7952b22738785b501ca6adc0d12372ecd7f423d0158b18aeeb74246c5444915b2eedb556ba9fbf8acba069a1bbb6287fa4c
 DIST capnp-rpc-0.19.2.crate 93175 BLAKE2B 5affd8e2bdc11e734ace094b8e9bd811f06af341c871c800fd071a7dd5116a9d5ba3d4b2beb7ef900f2c8bdd50b1187f100518de75925abf973fc052199458af SHA512 08a9e766289f9e849ee56cff527e84c4a8d4afb62ebcd554402ab67d71b53c53797fae61d3930aeab50b0e0976663aac7ba0a7fe8b9ba3e29265423ffba8bc84
 DIST cc-1.0.101.crate 79446 BLAKE2B fbecc04723577abd209d16c34269b5ac2652fbd5385838190c744abf573912fa7a062e2fcf1dc76486c5b61677225a826a65dbd6eca58398ff60ddd1e47a3caf SHA512 6edaf3dcc2e58dffd7221a6b457057c83bdec03b6fad9cbd2d702af6820fd8354fdb3960cd78d8b38568ef408171354f0313f17a32f0caa64f97736c0840a148
-DIST cc-1.0.92.crate 76130 BLAKE2B 45e7ea0f7f744bc26f81249dd4bf48b2022ce60abb2d7c421fac12e657fd621dde06510bca9331761aceb31f3eb69517aa59a46749ceb92b7fe70de855ac6045 SHA512 66fb052f123cd06f7901fa6db641773a2f016ea3636ec26670c83a25b68d33ab088d3893f4f08920de50f5ec932a7f7a33e00f1774aabfc55d14253d45b4b7b7
-DIST cc-1.0.97.crate 76951 BLAKE2B ec2e65797dfe13223b64f28bf6d143e00362f8bdd14e4df3d16ec2c5b68b8c603968f8cf6e7ede95b527ef16a748775bf247e8bf11010a326bbac4b296d72eb5 SHA512 119d1769530ec2fcc643b9b4a0f2a45db6f0772e4df882b832f961824bbb41d101d4a507573b4e05b4627d647fa823e81bc66dafdde40146878616af96b24143
-DIST cc-1.0.99.crate 76961 BLAKE2B d615f647bc5e4f7f580f878fc41baee172e9513f1157d421c491c36af2ca330dde2a6ddd4238c03aae27feed5e8cc042f4b790d7b145952a8676ac553f72e356 SHA512 2f6c9a0869b3b636b011390efade0085ed5fe616ecb33ff586c948779b9c9bea9169cb1c31441b0aeb63dbaa35cdb76b6e67ace38d561e2c150e06853a2b1757
+DIST cc-1.1.15.crate 83085 BLAKE2B 14077692d5fc47afc59b44227353aa24d91708fecd316b058e553940e6a9b6c8f148115cde2b7d6cb2a3462f487aa3b45bd670a2beab03f677e4bf63a06fc3f7 SHA512 2f1e4f3a4dad3638f680448520e218e3c984a7c13c3984d620949a9d3c4f13d68b3a0749997dace1e43faffe3477ea15394bd4e32a959bd56e3c35c27a4aa4de
 DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST chrono-0.4.37.crate 234441 BLAKE2B d1c10bcdf33324f1dbe9a79cd8c5a70b8223ca289753446aef778c93bf18863714ab2ade88f1e67432d1451b0d408065325a7d8dd3578211a0e39caae733ceee SHA512 46d77f291c7c60a25d0c06ebbd89935ef3ae1b736d504b8faf39aad8210a9fc68b45b5afb024763979f666308750b1a662afdabc36c59974567cadadfc17fcbf
 DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
 DIST cipher-0.4.4.crate 19073 BLAKE2B 144c45c1bdc5f7aef7f4fc63b6dd85955c453537567d1f1074e436e50d0d61f8413973cf3da207a48f1560ea92f2280fc5880569c78a1dd66bf97fd1d88ccde7 SHA512 1856d8b08bc3dbd2fa5c8b97e9eae43323c7aa19203ef3e80bb49cf15b5ddc832acb7b97121a52032656353e764f1f722200b638f7c28975fec1b5c9dc908846
-DIST clang-sys-1.7.0.crate 42088 BLAKE2B d1ed314a910c1b676eb780fc1c96f5ac391217ec135480d0a91b11d6f447ad06484b48966ae99115e35d921a506caf6aa7ffbc4ed86aa64367dca321678cfd7d SHA512 e544984d5bd76824ea2093f43f98b59a99e1ca8a5de40e49164b870ed4a91a530f3492faf0678190b91e74aa5d122bdbb32c649998d0ce24912dfb0b83ed6b81
 DIST clang-sys-1.8.1.crate 44009 BLAKE2B 9173de6dfbd3ef9d5d1fdc559700cd3a52f95cd77302063a97e8cf311a35825825e030b47f252c857853663ae8a16709e1f7bd0c608d67c2a74eb36ed588e778 SHA512 a68c426c20110fddb8bba07d6631517b0528fad45802e5a34a22561d7e6dad82dc5001387019a03f275e9a671b09ee0a06b6e86793c4fb4ec655700bb0f5e125
+DIST clap-4.5.16.crate 56627 BLAKE2B 83a6a9ad12b826affa68df179dc1cb534f58b6ae505f4794ca6dfaa8f8a9e33d93b9babd7931bf48bc13da31cb3078b442c4a2a2e84a8f2e675b5d620100c50d SHA512 d13bfda2c3f77cf194acd87763d5f2fea83ec2135504b173af2941547a7d3dcf75c3757532c60b53c57600bf4859395ddc94a7dd92b17f44c60d3e781741f928
+DIST clap_builder-4.5.15.crate 163717 BLAKE2B 795fa9c6de6a3f4d9a1288c3340613c14b11a5346e314f5f486bee76346f5f88396e54d95d051bd84184a91bb1f2d3575f870fca56a4b9b590ea2d9939beb415 SHA512 52efd99bce20bb8ff2187c4cef8bc27bef6cdc52598f00b47639b797683f18c76a79a6ebf34d1d250621a49cab0e9ec9e7824d323516f1ed3fa721cfd34cd713
+DIST clap_complete-4.5.24.crate 51275 BLAKE2B 1ef83aa5ae504ac98fd8ebbaae840a166124a54eb0d35d918a85ac501a827047b7e5b510eaeeafc51be62fed5776d8845506eca9f56f9000c29a39f3e843d3df SHA512 42b247aa2fc9ce26ac2d8a69b6faffdcf96618f0dd38ca2d3ca6067335356b21c604da0c735ffc6245d15f815bfb13a4e2b81eda73e8be1daed87f58e4777a15
+DIST clap_lex-0.7.2.crate 12805 BLAKE2B 952bf3f3885ae7bedd0e8add236590da5fce72a7ccd88ebda063410aef337ce7ccdb5e5e929cb870bc993891610edc0197150a3aa82a62fadc4bbfd96324fcdf SHA512 a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380
+DIST clap_mangen-0.2.23.crate 15368 BLAKE2B 915cc4250a3f377ac0f5ea103d18cfaa7b827b3c686fb485f98619465eac23400df828cb06572c4748af42584c7e78c0a903c4114c8e4cb867e320521d8d8add SHA512 fddcf6e7173eb0ff84fd05218bf70b2bcbc3a212b7cc1dbb8eb85cd59504fe89f8b4078669d4a45308ca5c2d9d87d387c5cd0c48cc9a9376646f13008971e531
 DIST cmac-0.7.2.crate 44847 BLAKE2B ab8539f41e720f132b2da3176e9c533a2309cbb3dcdb027af4c5bdd6ac68e4a2a97f53efda52236527a15786b73bd96ad940385002412330d7cde60e3492a6fc SHA512 9e55f9f9323dff330ef45da953bc35da79ff8fe643b3984479dbab10b35e05e4d613f7329c46bc119fefa589d8f5f3bb268a7e7f0853003c1e192fe324e83315
+DIST colorchoice-1.0.2.crate 7924 BLAKE2B a4027d5f870b4d9a718ac3f9d89ce04e2ed38406658c4a55ffaf39ed0cb1ce7e1c691eb56c66596b519ca82309e8ec7eebac65e69394cdd277f44f9b6280d560 SHA512 f34d5f66f84e90f473b6b9a62a61a59575e712d3e9b140324683f80af42d40c1d079701aa2ed651d0dd95a5ac8838e1f6f6c034e2adef79509d32357b8093117
 DIST const-oid-0.9.6.crate 45382 BLAKE2B ac27c689784fbb1f486cec1c17502c8738ce3d7d1b579391a151cb0f0a6a0c8335e474d0a517c59230fcac74317396f20ac15d66e2f6685780be01dab197fd96 SHA512 b871d3b4326c4828b1c1d7a3e968315fa320e0b52e97081a95617ded0dc5b93d42b3f79ad26ff3b58a4835dcc442473f3965c2b60026412ad6aacc0c23e9f399
 DIST core-foundation-0.9.4.crate 27743 BLAKE2B 5b695e671cc833170bc6bad436b2d0d8d386ffb8181bfcf2e92a1d93cee67c3ba1768cf57064fb91b0897c6aec1be7db40b5bd256a052c1bdaf872ec19f6e15e SHA512 82d0878a1b9e3d56b3666fb5a78f92c6f7806d01665c242c06a640bd6b1fd36260211e92dc05e1a16d1430622bfdd650aabb0b5bd8e5592f74abdcf412448e33
 DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100
+DIST core-foundation-sys-0.8.7.crate 37712 BLAKE2B 0e1dd99a5bbb0fe92f55181a37426f6e86445cb20e355f553b3162c88ccc075644461731a0cdcd93dcca65b6cef1de62b409afbd73ba3070a199ab8e7422dcfa SHA512 17492d5314db03abdb3b1998bf0c396ec8ed0f83bc978ae22d6026afdc86c50b58cbac073b3a0d97b92da7e98be11302faf1249d24313494bc058add4f4cb63a
 DIST cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6
-DIST crc32fast-1.4.0.crate 38665 BLAKE2B 77398dedfa5e61357fb9abe3415ee53e45d3f1f7aaee959cbc9774f31a10ed324da2a558d20fd7c0674d450c8985b1e9c78b0b65e6ae2d9da6c873fe631c5ce7 SHA512 3e0bf1d2411ad9c651e0242c574cfda09403db24ab4b55560145ee73b31b08be45e5e12ce2db991d165ff056c7f2f67203fb2c048651f1c66ce90ec3276c455e
+DIST cpufeatures-0.2.13.crate 12999 BLAKE2B 4c49e01e91fff33c61bfae48a07a9d76a69565840f5a12399a3515f6e6808743dda0d4c6877feabfd276bdeb05c285daa3bce6062a87cc3da50bbe3b6c0fe1e3 SHA512 e961ccd9fc001cce661b6360b18abc4ce2daa4080eb5fd84dc5704d8d5ddb6ce6cc66b5d42440bffdda03137af9c5ba20b6793130692168e7e28729841c3f352
 DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd SHA512 c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266
 DIST crossbeam-0.8.4.crate 10500 BLAKE2B 03212d9789a66c1eee7d1f4c7883eec1267089ab9d652ba5d7d59a22e04ab878e5defeccf8cff4587a34d976488ffa689bffde596588057d814b633ab3d67d1d SHA512 63650fe2d46ff2e593342b398c153facd3cb7cd72dac9b057ee0aac5ef5e9dd9df0e71536d66879676c0edaa89787d1f365eea35c82604ca46090e527749f994
-DIST crossbeam-channel-0.5.12.crate 90515 BLAKE2B 5a302e58411d99d52630cd154f4f642ec925af3330ced9456a16e417e2e43a37dc2b2288ccc88137a75e682e7b10ab2979f1f90c0bd42ceca8fa84c700b7dd0d SHA512 e17b0e41901b2b41e89913a0a50cd1eaacbf64cd07f454605a85781b8b1373c35bedd16ccf6b24029404a3171e0d670fc2b1474a6448d0feb40ba0e41f99019c
 DIST crossbeam-channel-0.5.13.crate 91174 BLAKE2B 7a9aed6f4922c1d10e4ae12508a03dc7daca773adad6a317c4ea38e544d7c28c56a06623d958aec540fcaa86fa9051a1aaa2c859dadff72873f18f2f3a951449 SHA512 0f31223a7099f84e39e6b76b19cf26736e0c3907fffc2ed3eb0012c7984b1993570bf6d155eba5bfb82897ef0e4fc93b89096071410bbac256ca6be9a9568ff8
 DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864
 DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2
 DIST crossbeam-queue-0.3.11.crate 15581 BLAKE2B 91b9797f985af06c854c38b8124cb67864bdb47979d2e253928678118515fbc1257108c7102bad66e1f65fd6f324a93749dde86b4ea28f3bb5a16491f3f56ed2 SHA512 c6007307ef9d219889e6244805ae759998396e1d0548e3664ce9ab366ea78917dee75251c4265b0e3ef4ab15b5c6d42d6a5e9b286d17ad42ec169e7fcddb8ffe
-DIST crossbeam-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9
 DIST crossbeam-utils-0.8.20.crate 42487 BLAKE2B b50da06721cfbfff07825574feada8a28d3814edb218434288683eec31bddabe2ffbf7e5ef1281ee14a8a77c56db3b66f3c5ceabaea9c72317c1bd2cecda0c26 SHA512 7175eadf9fa7c526fa11ff87e40ff203f0e7a4bcec15cb972f924f3c7ff7cc20b6e2e8dbbc1ede142a0207cd2baa4f446deb25d825d28a54cbd25c263701bfaa
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
-DIST ctor-0.2.7.crate 11042 BLAKE2B ceb1996d88909f657f605e769b6e73670cb75c361a3b2efcb656bf283971071dd18a683f5c6e12cddab27ea1d87a0b8b4fea39cccd3347e77250bf771668b1da SHA512 f29042559c59881e1917c28aaa6676b61731b9eb50be4efc358efd75a2c53e0939c2a90799543317d600643c52b81b5bbe2d1dd5f9a554af002feb7ca34a7b5c
 DIST ctor-0.2.8.crate 11053 BLAKE2B 6451c50f78bbfd0f9661f17a9a5fbd99b16cfe9e33af7ff2458f72a65d76541fdfdea9dc780bdf711b308d0ff264ba50d8866d664e68b90a432e00bd82112cd1 SHA512 576700ff278039c37105697e67812ab451fd9439c890342bcb2d7dffe167a45561d867b2a60a9b730477d7754a74b2db7ea552d72e70fe5aa28afb411ba67d1a
 DIST ctr-0.9.2.crate 18344 BLAKE2B 195dce5872a0f59b90bedc268c5a5796f3076d12868f29f887294301b3576047ea82098e73ae996f564e400ce316cf1cdd9016ffb714559aaa0465dc826f0cbf SHA512 6a027f4e3881e51e3dbcb89348c961a2086bb63e70652c49107f49b7d021e31f74ec8c6ae91fd1605928f93f5ffa27889f257c166669e18508995168f17b46a5
-DIST curve25519-dalek-4.1.2.crate 305477 BLAKE2B 7553435f9d431739793feeb503a542619dd67178bfb0f41fd3d56907e9217f114e68ea78e6d6ad57c746b6e6a281f38023cd9b6f78e39e65725591d0295a9d5a SHA512 a6aa320a16c5a64f1a151717175978df651765d0772bfc2e06590e7656d34ff898e47fe11a5590580340a028b0d3524b1a5e150b37996e3c5774b8bf93c5f3d5
 DIST curve25519-dalek-4.1.3.crate 306017 BLAKE2B 0c02e769ae48e6839e37e622fecb8b1987fec0653049775a80bc53827329b50d6b8aa8288f26af306208d4a2edb94ef92a64d955c395d980cdd2624c35f0cc26 SHA512 a1dd318f96b5f1851d82a6fbd29c44dc85d2f75da16e5bcf9d6ba3abecddf5e0eaee4a7415d8afc09923064fa41529ede2622f8a5fe0b3e6d4c88b418c41bb5d
 DIST curve25519-dalek-derive-0.1.1.crate 11723 BLAKE2B 442b0e4fc519f233d3fa46c17c2e25807374360bd6576e97b4ec33e6c2cc228bc917e4e395a1d70aa19be7bae57db36d2c09c4c7d505691b53d5a624db67eb6e SHA512 60861002465d2ba12a6089b31fcd7a75f7a6d77319159d5383f29e857adea8cb7e5c9c0ab6977c8cfa34b60e1012a1a5dec57f637e6a225e60269ff49c25b29b
 DIST daemonize-0.5.0.crate 7125 BLAKE2B 9706f4ffb140533f73fe520755a06ee909fe1768e3f2e9b553acd2c1b80bcd4aff152058d1d70fb1ece7a7de6059cefa9d2db0fadf493aae641e1445e3c6d686 SHA512 8ab439f3cb43a83a84ff11fed4ef37adaac4ef5a83e497e8d6ad06ba1f10359366eed9741a07f3c97f3c83472da5513b5e28b6ded4b4b3ca9a1c536b7de62921
-DIST darling-0.20.8.crate 31234 BLAKE2B 13e8ec124715f743486d740241273fa5ff046b5ede86c39ad5413b3e767166dd90e7ba7344a69c1e14991f0572f7ffa24b081ef54236712c5286f211fcfbafd2 SHA512 2b4cf37cf7cce9af8e93f576dcf36b539816e1ee7b8881b5b8480c45e038c97ca2d3a80c54e243d7c6e1ae23782947efaf0d67a37c0d4dc66301c8a86ce0fcc3
+DIST darling-0.20.10.crate 32031 BLAKE2B 038c2a4d919a8e9ff6eff5f83911b40cf4e918ac27c90f313b6b9131c41770f83cc3901973fea1c6fea2886a8360f3c5cf73b807d14e579b8b8e87f15e3bc6dc SHA512 7a14eebc20e48fd39ddf7b8376dc937a04f561d723aba864432cabd5ab46eb189706b43e5121a7f4fb0d68dbfd044353875bb479d4bd5cd96b76e3571733ce55
 DIST darling-0.20.9.crate 31777 BLAKE2B f27b62e098461bdda18cbd78682e5d99d4f319ffca91cf9153c4aa99a55cbf91868a1fdb68b06910eaf12501f9f1bc0e2515375e6c425cd998052640b1e9af58 SHA512 801671ff5d63af09a861ef5c260c98477a49a75084ed4aabd2be2b8b5a01c742f106a71b94872a64ff2b1ec8f4e95809f334f0471343c9802549ebf2899a763d
-DIST darling_core-0.20.8.crate 64442 BLAKE2B bf1844eba6bac260104e2ef310721d3aae7ff222d99b01b9bb66e3c71ab700095af7dd5b3a77043d6751d94af131f02f23bd321fe9d4a7066f93d1fb7c0c605b SHA512 6f2d047758541355b81e43273cd1eb8865624096c951643e6ce777d716e17256528c47fe012f33eeb1f63883ca08f532b1ca52f43394dff82fd1bbf323763751
+DIST darling_core-0.20.10.crate 65015 BLAKE2B a94adcc6092a7a69728725ec4bf4cb7c163bc3fe0890f272bba9963c256697bbe1ad964d58a975c80742019c59d4e1b3e56e624f938576996e216d2f99e21f2d SHA512 2b971156b8c1433dd0ddb2213ee522e2fe9968a62889285d1457b5e733daa70a09c21bca9b8573d9c742026b4c06f4dd2025a6a196ec0b08b25a78d8737dff6d
 DIST darling_core-0.20.9.crate 65014 BLAKE2B 27422074f55ebc413ec893c27bcefec2cb4bd26156d272e637a1530ff63694a43929f55bd87baa517dba683ad6f24f97e097dd69e0407e24f656cf673c2ba07e SHA512 2c24469b2836139566713da59a3c2e3cf9cc7c1a01baa571cd59ae8a25b9c0a42bd9bd8ab7a9dae95cee2a46c344aef2c36792c05c799f195afb1925d82b81f1
-DIST darling_macro-0.20.8.crate 1856 BLAKE2B d7087fa67033c897aae582e5f4d3126e06e024b7db203de7e7513308af7a0ff6ef0584a150c6f30ce434ba6ce4cc2a438f89f024c9d6338198aba3bd15cdd116 SHA512 97d18bb22b79dd95dc5ab23ea7226f9fd2d6e418b7ce9aecd4d43b7a15b37cb91e509607b89eb3a914a5d3dc562b2a292d1343f87f594ab32d41fb583d7cbdc0
+DIST darling_macro-0.20.10.crate 1874 BLAKE2B 29cbdc6bd63e4eb0731c8f8f0a50cfcae9a88f116f8cfc0068e5d3cddc20b42b7f0f20f128ffa0f7bcb8d72f0188b04b3838b8327fa6f3ab45de4cf5c3bbf317 SHA512 565b8d535248d9d88b49a58e2a210ecc70f1cd39bfaf029ac6576a9b2eac70a6b18b4930aeca746d76d53b745c6aa82172bb341c4844b3757fc7978732fc2f52
 DIST darling_macro-0.20.9.crate 1875 BLAKE2B 80ef248c7699d7c6d45e0ff3d4828175c7c15967272cbdfd8a91037b57911c4c264b46bd6369da53e45a0970de2e9c8d7f7e13a1788c0e8069d01cc026ce83b4 SHA512 16ccf4b30b413377249fe7fade5976bb5230500783e784d765e7920b46d5f9cbc3c316dba6c8d5a23e82ab28509b31406bfd265caebfa9f127017fa2881c39e6
-DIST data-encoding-2.5.0.crate 20632 BLAKE2B 16ea08dd12f09f2e6f8ba2910b3db07d4e7c9916e6a70d41420ef1a0e5393284b49787c47af0868bceb7f5d3f1fadf203f5a547dc8cb97713d5225dc9181fdef SHA512 b1de8bcfd7cfbfb988091fdb550eb98dfa5739ff58c4b789663e5db0d539c9acf145ccd72d87f7e1cdefd09d5771772d131d2b2e2589ac8f0bc6972c801ee0ae
 DIST data-encoding-2.6.0.crate 20769 BLAKE2B 9d5713e63f6f6a4d6e5324fb0be9308a231ccefa20d69cda9e19609a2250e2cd72030ec28309068f71c932327a3ef680b749125658e27d35273354c3465f9931 SHA512 a685c7bbd251a5738b27ac3ac8121a0db049221510c99e0ada6f245ed7499d04ec29d725ad01c688ad283e3d2d5aae0751685c804f6d95cae84e63a160d04c9c
 DIST dbl-0.3.2.crate 6336 BLAKE2B bb912351efaf270363c2a6cefe4da42ae8c6a552690b566e5a7b70115721efd2ef42801500d534de0245b6feff5b6895bed74924c86eda3c5e9a5322f32e1392 SHA512 efed499069e1eacb709598b9a250be353d65dd9a1a27c7fac6d23af6262af0fda60b121c283b9318f301be2d80194ec1ce33733daa554f54ed3f690478d37cfe
 DIST der-0.7.9.crate 85173 BLAKE2B f2dcf402e3d8b6a7ca818a8f260e0996290c77517b06bba8b22849c4d0e0c8f3dd57d664a06d9a7bfb1da6a39abd0740cd7d9776e75669aa970cc3ef63f924d4 SHA512 6de996346365647ac0da23d3fa9c72100d665c9225dc2f0bf1f553c4f0e7eb5c6acf3f1e36a11a7cc20e8b1c44752997e6f592c1d142755df145c5e302800f5b
@@ -97,7 +91,6 @@ DIST dirs-5.0.1.crate 12255 BLAKE2B eadd38e85211ed5aee7fab964e90342273320644c362
 DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
 DIST dirs-sys-0.4.1.crate 10719 BLAKE2B 30334f2192698d7d03bd4e8bc8a682482da7d13baacb8547a132f55019d3727ac35579926ba4367fe0a5b7fa917945abc03e010cb7363683753c87440581df42 SHA512 53c7c8bc76d7211d08a0e6b25caaed12eeb7283cb4b352c12311db3c796794330943259a08e48ff9d3a280917920a088e5aede32677a4b2f9f819c2dca6adb9a
 DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
-DIST displaydoc-0.2.4.crate 23200 BLAKE2B 91b0ae7018109d407095060b6bbd6aed1cc21120bc30348e8b16b5121f7c35ab72b65e80bf97dbea6cb4ee6b4d5215e8e5c4374f92a569697bc9c862348620cd SHA512 a1de2c200584bfac640f8b84b5103d8687919cd29f59a14898e98d480f476a8e4dc06e3b929af479d536cd02186e2a9be72e6414338bc117b97bc0d160029592
 DIST displaydoc-0.2.5.crate 24219 BLAKE2B ba3396c93d27a99a92ff4a0f01a8d192b419bad25e48d9427b76260ebf2f9982291d77f2eb24d239c0b1fbb097e866a20bc46dc1879fdfc6637ea49928444a92 SHA512 5ca35fa59f263162389c1180331e9df607d9374bcb056cb04bc46c98e4d87277162ddb2335ffa8a8c5f69218abc3eabccdcaa71c21b8dd9081cc4146f266b948
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
 DIST dyn-clone-1.0.17.crate 11848 BLAKE2B 1f90492639630036e1e877537328e46ee3fa697d85b2f87c45990d4a51cc900a6f604d077b16575015bbf0a970c26f898226e87e6e2af82d624f5fa565036617 SHA512 b51fee8c4fa3c6b0bc677e9997d4b6921bfee9a11e369eedc649d19eb5d95d7872b533b37fb1ca842c75e714b46afb1231369341c45071db94f09b53e37e03f6
@@ -105,34 +98,26 @@ DIST eax-0.5.0.crate 14882 BLAKE2B e0c4a922cf71aa5ae09f8dc434301242443004895a638
 DIST ed25519-2.2.3.crate 17802 BLAKE2B aff96de3343d0cfba058203e90b6fd2c6cbd24531abca3a37977a1ed2f1eff0f4d4b6decbfcd9759617f381f88eed32d78397e6fa8d310b99b98d603b809de44 SHA512 3bfbfcd7f442dbb6d49860c530525bac60182bc57f6778e4ee097c7ace9c6a9d32ce430339ec15931070a538d3bb1e1f7b1cf572537ffb782bc5551fab49b2b2
 DIST ed25519-dalek-2.1.1.crate 85736 BLAKE2B 77dd4019467da3dfbe574ceb574849ea665ffd8dc91660f6a9b2596fb886400508bc632dac10a06461f35fce5400f27b89b1270514188ab488a952288309beda SHA512 a3e3838a3d4eef726b65a38196e66456f586b7e29cc328eb243bacc5a247b50f10ce76df6259aa102a08ca921f07d0395793088445f36de33f5dc1aae5223ed9
 DIST editdistancek-1.0.2.crate 9254 BLAKE2B b7ae2f34dac51b47dbdf89c0789d5f835849914892961c061f77bb57335bee781b11f531d02d16043d745ab7a6e29f6926c92b2ba8d33687d6f2261ab0d095c9 SHA512 209d17055032d90b62661907f36d1fab2e93c3744a19a9c7ce0ec5307a88ec140147dc5a2fdf0e60094daa4fd4db1572941bc2d8af11e626a1c80426602b9c96
-DIST either-1.10.0.crate 18334 BLAKE2B ac5d81e0822132846e29f8959671b14ac6047330d54020ea7d4ad790ef985ecb4ddcb96ec7e327b1a66b9c89d37b112dae33c9ac35232c136f60ad9baab7d5a2 SHA512 2de38a37b7f3e61effa89648acadbf220eacfda1ca7c82fb77484e45577769b724f7dbaa297e73e3d355d6b1bd5109373c3e96e4c1a13a918176162b33ea2432
-DIST either-1.11.0.crate 18973 BLAKE2B 31ece6eb44a367926b5f9ee817f6ac9d93746f5b95c95fab360361f6b3a02160c682d298d115f39615e5b4758953f3f29ece22a72fe4285875dce03483f87486 SHA512 f62a3859afdba762b004d4c766090a25d3bd81e4a14509c3bd0f39b0d433aeff997b39759f7dbc5a012bf3b680fc4510a4b2643d63dda8171bad7403554905ff
-DIST either-1.12.0.crate 18974 BLAKE2B 9db82a8eb351dbc1643ccbe304796610f6090b263d9a991b4d7308a699bdc67d25096ed1e923f521fe3dbfe9195569c1297b46a4b1d0b74bcea4c11bc0a2c388 SHA512 88e1ac4053c39740cf643a8fd445f2d939a8398e952b4b66ab38bb48bd54bc7a976967c4bebab36fed66c4f5fb76082e9c6d40e146914283fca28f31af0e0138
 DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
 DIST embedded-io-0.6.1.crate 13133 BLAKE2B 2521aa9ee265515aa1b393764d4930cfa1c7ff3833c4fa7385da93488ae536ad19eeb787e8cd45f136ca36d3cd2f96c42d0b2a0c79c9e8458fea4946d60d66bc SHA512 7fbd25740c74de3ed20c0effb39818576add1d3caf696e5a1e617db2f802eb75d08138771f2eb29047fe83e928a667ced6a23edb9f971143d198340235378e54
-DIST ena-0.14.2.crate 22991 BLAKE2B b609831e2f5dfb6602293cc3260098bf0dac09afd516a8e6062453724d7d3f516bf14811e81ac3e11efd917087dbbf4f9a3524fd30ba79cca85cee2c0c63d77a SHA512 e66eea99484c2b7fa2df7c8b3df3a10dd185163b781fa03b1695900a148a7c1a1676f7e6dfe2c5d18b61a90a6756de0bc42e9c873fc7a53de3dac799b7c23c01
 DIST ena-0.14.3.crate 22986 BLAKE2B d79daa3b5f3723aa7cd3c0b432b7332a0c43a5961adfcc8bed7e43bc656e54ea7e06eb1028714c7f0b52509cf8e6b972d2ac95c65ce808deb0facad2bafe0f62 SHA512 d4c893973372011505a762f4a823ddd4b50d8ff3a2f91298382f9c580fb6f688aeaab43d504a0783f8384280f7be9c585e8a079cb38959e8fdd4a078d1a642f0
-DIST encoding_rs-0.8.33.crate 1370071 BLAKE2B 0e81419086ca6e18f2aba5194b87eaba49ddf20493fd6ee09d479db86306e39dff9b23f399594afc42f1fdb33855e070beaa1871794dc0b0371c35d296a6369a SHA512 20d28a4c0ff0710f911f510be56c2bc5e7514b76d370493d2b89b7f25d1c0cd46ffa64862e54fc472f07f928a2cc24cf9d790a37751cafafc81f263705aac4bc
 DIST encoding_rs-0.8.34.crate 1378166 BLAKE2B 528692170cdb1d74ffb0b122a5aee61f50a2a7e4ce6db049ebea4a185e5c43d4ed99e515f08524053a110e061f788f861e62e0b04eb016e7a9e2678235a04577 SHA512 e23b87003814dd6e7e17924bd1f53989a5008dd1da07baa23c40d2a18dc1ab2d786d61e2c304b3f60e73be5f180ae2deea3b4499c0157b6afe3c9273d2f739f6
 DIST endian-type-0.1.2.crate 2340 BLAKE2B 6048948b467403409807fec776add4366685282a277d4ca40c5fc901228c0652c5759210048b28a94c8bb04c39bb3b359d43254e953e5b476112da7e49151a5b SHA512 d8a9b125fb87099f8bcbaf3688e2feb1c463ce624cd3dd36396e75e7aff177ed5033ecc295c02f491be04dbf240aac376e79a5c7cb591c3b208c442e1c1e6bbd
 DIST enum-as-inner-0.6.0.crate 12079 BLAKE2B fea251b187470b6204f686eede8d9d2fc3869a396d50051a45c72e3628b4d893a2393760afdbe14676cf505b1892ff67846226ffdc4a23f59a18b2cda1a2629c SHA512 c06e0bbc43068161a07a8b34bf1382311273cfc5390f3fb4c90b758d47cf49baf648f6bb277770a983942f7d2effd242bf1f6eaa4eab77e7f6f4fe9ef6ce188b
-DIST enumber-0.3.0.crate 10202 BLAKE2B 9e8935a98c48253debde571ab96f8bb9b2f9715235b64870547a9c72fa3e5a2535270b23435ca8bca0221f8665eae00ac2aee75ed68c5d9b4c8ee9e8d7152afd SHA512 f7f8c9049e757fed1481f08c8493d898cc3d2f8303b482a988d69f4a126a4e532648cce44b453119b5ccf3e71dae7b698fa63bab00844849cf42c46fa968a2ad
 DIST enumber-0.3.1.crate 10171 BLAKE2B dc5d404430d380f83825042de278d43ec9492fa77b56f1eb42cd55dcd2a3a2841732e63d56764e7c13aba43f1c0cd9750f5a7eadb5b02e5fca7f607ea58daf5e SHA512 f27f81fe0ff2f940a20617a032ccf07c1dc4d4d27c2eb286c815d817f158cc229d2dbf11fa54643b0990d14aa7dde955d76ae9b3190b0ca6b44810265d5d70cd
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
-DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
 DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
 DIST fallible-iterator-0.3.0.crate 19639 BLAKE2B 58b8fe842fd6514fa4327eacc81b157a4a9bec4ad9b8e69248c0f0aa5610dbddb9c8a72e6e6ef9fb8216e8f79e6aab439e90d4d527e35634ab222347cbe39974 SHA512 c655918fcda5deb8ce792708509e4959139f113c1006dd41b94d7073ffc204512a22cdeeee05c87534db9c414da3f4eb716e1a26970646fcb1c139a14eb8a2fa
 DIST fallible-streaming-iterator-0.1.9.crate 9249 BLAKE2B cc4459b34a9ad00552a5248d090d1f25804b92838f41131e475abb83ae0b89401248feeb52a49dbffd499ccc0ba0f2f1d044f2f3e9b06662be01fe2257a4e885 SHA512 34824e2007cb944eaf54b10d6d3885bb17ef2a2976c6dd7695ff82a937cc95eb65d343dd7a5cd2fab5aa5859faae3352a9e1c78f239ff736900c1dbc3f5ef7dc
-DIST fastrand-2.0.2.crate 14674 BLAKE2B ea23f52d745f4fcfd4ec911d48d77c60da837f57942994b17458daac7cae38953cf679459908d68e5f393d03a90cd6eddba23d2a86c2bc11ebfeed0bb41fe4dd SHA512 3ef9c21e4928071619adbad6421165ea82feb04c26ee18893b172f9f8a510b9a2097257ae31647a907680412b68d6662eff13cb27649ed9f5e68c374619701cf
 DIST fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104
+DIST fastrand-2.1.1.crate 14983 BLAKE2B a4535b1612b103376fe64d71a393f7bfc37668c574d9122ca90a631aeb91cf0895bb030e597b79a80a4a37ea4d514c4c0836332030bb10a60bd971573a6d6ee0 SHA512 9a51185132c1c89fc31af463c664e996f431e607ce96676b8301f28ff11a99661d18025dd460e3332e373af68d20017d96481719746fc3c5de742d08d63aba3e
 DIST fd-lock-4.0.2.crate 13675 BLAKE2B 055e7254c6ea0185a099cba229c15a1044a6c0826eb6151e990134c816be4dd26bb8ab41631be8650340bacc16324a706656d2901c3969354a854216ad3cb306 SHA512 acc5aaf6e89169062c1c59d5258b590d4bde21a35f0acb7da2e3167d0668fa678d1febc305e32d95329a7e5bdb784fadb9b85417a5e4e5deea53d59f05bea74e
-DIST fiat-crypto-0.2.7.crate 495388 BLAKE2B bf3c64cea6e28bff4b21be6bad51e6acd38c5a63e24214ef52feffc43bdcd30e5bf6cf9ed2423026b71b028cea16f949d130c8a570c28e7721043a321401893a SHA512 aba4ec81c04b7dc5358a9cc35b50c2596f46ef9d47d848dee51e1727d82b5cfc2ca9e6de1a45958900f030a5bb4b6a564518193b2ffd4ba85aa6f82aef48d95a
-DIST fiat-crypto-0.2.8.crate 495396 BLAKE2B efdbcd1d5f4c13cde6d790a0fa01f002ac988880fbf6a856a91f922e2a632b530e08c2e6fac30d40c3f8cb737e1eb8ebac28614f368bfa8c2d8ae9f20b72a654 SHA512 865a39b2143eae7c429c32de047e81727f3e7f259e91761c481def15989d91fd0b3557a8c4d6a39eff1ee2cbeed592f4751e87b1bc03c445f09f4ced35b53982
 DIST fiat-crypto-0.2.9.crate 495390 BLAKE2B 9201d3faedab8c73b606dce70d65d1138f5fb29e480d56b25cd66a8d2a150fb6d946c9e0ca98eaab0227490cea288b4c78917ccfb6693022d70d74dee94e6e78 SHA512 d916fe8ba3e82a365d20485b93c36994363059dead84c0266b7bfa0bcc74122d71b4a5c8689226c0e1007e7e01fc6f6c76e8687ae14fcc38f6f159287810f510
 DIST filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3
+DIST filetime-0.2.24.crate 14938 BLAKE2B 85e05026b35ba195637dec12d2f47cc30a189db0c565c2aae22ab1bf407e910874abebf401167b0c330c790f3e014c37108610063b5428031d28452eb78009d2 SHA512 b371bcdbd0e41b875de623c7b7f122e8f0e421382e741084645372b774cf09614eec9fe74514c90199b7110e8af27c62625e92281f3544afc9374889372c27f8
 DIST fixedbitset-0.4.2.crate 15954 BLAKE2B 91270883db5ad0e999ebbca1123d8729d3040eb936034ab8da3cda72a830e45fcb977b3fe3c2b94e870c1fbc366ee8602357bb77e8b9a40cc41a04afad1b266b SHA512 57c5d756b0a202b2506270f0d5e890f7617a1e0c015b6059ea23fab49cf7af47fd06927eb56feb03b37cb2b6c467e326b3f0da1e32cfcb6339cf11a130a3ccab
-DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284
 DIST flate2-1.0.30.crate 75511 BLAKE2B c25d9ab787ef60312523d80cf277bcaae16c7e54b1deb0fc8723a3b22c2586092343db1c538d96a37690d21e52ff822a38c90e10bc554fedb75671fdff6df309 SHA512 21528f80c1709cfa764723dce012903581dbc2b63ecad194ec601fc75103307e1b2ef17479186ad895ad957c9a33c6fd666b2981382a8a68ca78dfac7cb5d578
+DIST flate2-1.0.33.crate 108838 BLAKE2B 9fd23b3b0a75c29f750c873f74de8565f0d8f3a574c7d28e11d15e6c3c4686c42ba98b5769a08c21f3b9c6ffe7140196c3e7001153ff5a046ee7af40f7f6d965 SHA512 59a871137518586f1d66810528595acad5ca763ec5acc100098a372194f55f33b48e59c0806fd237c644a6d797b5deb26c541fa871a1194ee3ac725da3b6d134
 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
@@ -149,38 +134,30 @@ DIST futures-task-0.3.30.crate 11126 BLAKE2B c2ded9b9b709fc10c44cfeaa72d4e7477e4
 DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b6cfc17c137c36372709e8d575b306a4d7c4da89328067c9482a645aceb7b44ef57deb21a0c25964a5515e738a039d0 SHA512 7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951
 DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d
 DIST generic-array-1.0.0.crate 26360 BLAKE2B 2f64bf8aa61bb8bd7f2224d75b2de96e424adb1011787f543006b84e57795b66e53bf4afb89c94a07d14811264a84eecf7d022deb021c8a91be247605f4c12b8 SHA512 07ff026762713d5efb716a4d8ff1c3028a97fb7808352b1207d4e07ac2f02fc93c4068f53d3b359e025cf74b7629e1b5d045b8c763b677b4786779fc6f3e6074
+DIST generic-array-1.1.0.crate 27344 BLAKE2B c3aab4928709a33898082fa440440ad66e9e6b37167a746d276c8a2502d2a2c1aec66c97193b31a6a1241af425e7b869d19961e6a4cbb7dde436b37168f7769f SHA512 d7666c4fd7de31693837359dfd167d1660afc41bae1bde1a6aaf17340c65e9b269c9b2d3848afff2db74df619956a18155896b10055d9501cf3d72cfc3d3cb29
 DIST gethostname-0.4.3.crate 9336 BLAKE2B 12be5fdca0b6e3788cf3d67a4a80f283d240611b4fd37b6d1c37eb2503e4a7025b17bbb70adf421ac840d8f952434bdedf4691f31362780a267e21e8c4d3a006 SHA512 8c5dc404132f2ecf9bf82d8b89cbd698b4cb6d43141c47a60b95401da2e8c314347ab0a0ad5fba50cf98f01a621faa68293cb78f48977d3ddfe6e6f21926abf7
-DIST getrandom-0.2.14.crate 37307 BLAKE2B 5904388869335ea904d950ee83ad1867a0d3f6831b7139102b53f4bb4a2c12371c9396f1f1cbcc44e3ce69a4ea316651b1674722071bfa7562385ad4b6a88c33 SHA512 6c334415e09f570e3123e3c6c6eed1727533ac6c9c4142e16ae995c237a16effe146832a891be9fdde4335bd02b454e0fdd9160f20dc02f107ad106756221658
 DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb
 DIST ghash-0.5.1.crate 9482 BLAKE2B 77510c9a42ebc486e35cda6893e7f9f464628d6e4ef2f2f1adfe5d6371dc2f7e2d0578665d02dc5647651a96f3f06ed9cd3825caf462d70a740c9e937ac8cb50 SHA512 00041605bb458305f0fc54d2c8dde2cae672451646fc41a94dacf83950ee44f75464a926439e7e6d1ca3ded05a9b697138f62fba6f4e86ea3df034ad7240af06
-DIST gimli-0.28.1.crate 270497 BLAKE2B 4089e0f871295d464e548610ab5f0c2fd863825416109cf58ca827e482897f00eab23b795295758f1e3af16167b52c77c91df6f707f1f445984a6c4bcd68c6ef SHA512 695e46471fc07813dc4a47744458729b097f6efbfceeb57eb3db4165654e99bebb98dde2d73230b90bb5dd7c0ca0c6e77c7c3dc6f2abf70058b830a2fb386d25
 DIST gimli-0.29.0.crate 275756 BLAKE2B 092e5bce9503a337451f63706e7ae7d12a4228db6a43d2c14fa6af74640a790ec70ea2055ac84db3919d19612ee6ee0453f64981390667abec97637679ff06d3 SHA512 a6b591d48dbe93a1fa6b814759a5cb61fba0838288840667aaecf01346a3ab862fbfe1cab51b057a425ba9a0ce35c8421b28cd5195464be881f38905062f1446
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
 DIST h2-0.3.26.crate 168315 BLAKE2B 81c65e519bacc8570a28b82808828044d1c94f8cf9111ae432b1684f216ce51c1b583b87a2bda3c36cf206dd508084b8f0877e93d58c8d511f87eb143bc77ca9 SHA512 3e1fb02d42d86c9fbaee6f10fec78eebd9a31a70efbead1f4ca22664ee0e96809a52b06e23a9b6f5d0646422dc8054b5ff5d82644ef65cbc0ed2b3729d849163
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
-DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356
 DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
-DIST hashlink-0.9.0.crate 26390 BLAKE2B ba93177de6be0ca355038b80091454b1ba4daae5f266b9796b300db08e73a5399471a73c55fa3b9207f8702fb10f75d4ba4b1c6d9d7ee0a75fe5b93ee5de2bce SHA512 bf9d356d39e14e4de4a95ac6f43064ce42f42fac15ce005d7225d2538968ab171c89c4fade7b1f76e480783406d2f6afd005f8450e0c674b9a138951f0abd7a9
 DIST hashlink-0.9.1.crate 28928 BLAKE2B 14276fe00fb8aa7a8183b5cedc99eb403c0a68cb662555cd51efbe55a46c864f68f3d421395f56defcd1a87576c5a38509581adb5d02b831d9aab2efdd376f9f SHA512 16189f332b9e2a71f8cf4c8b72485eb107c4a84d4bfe3c739ecea8fe5dec33ad3c796d57830b12c176bc65a2066913c809a0f7c8db83e9da1bb0c555de8d3717
 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
 DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
-DIST hickory-client-0.24.0.crate 37831 BLAKE2B a0fae0f448ee632fb024fa226981a492a8fd7a1b5defeb9e4b8a506e393e89449961bc76302857271bd5767d50f6aed244675326ac904e14f1d592dad672f2dc SHA512 610d5677b2b5cfdb6ca69babe57767a908f2420a8fb60e9a145f0b879b03ef7fef2127ff6ea65ba77d6f30b748a9c9bd07b102510249997819b57217a8890734
 DIST hickory-client-0.24.1.crate 37830 BLAKE2B 5b996ffc2d2e10edec0fb2aad9f361be2383c2adc2524ce583ffc3c43f3cb0a49236a00c70ff10624b805b41f20016c12d9ac97281fb79a16fe1710868f91287 SHA512 b47f6e7e237c803ce0a1ae7b034e9173b64b9c4e5db74259348e943004f5a506b36c57563590337755ad2eb411524f09593d771f3d2bb66eba225a7418ee0792
-DIST hickory-proto-0.24.0.crate 374416 BLAKE2B 9dcd982073ca2d4d7ed64c0b4a88ef206fcd739dd32d89cf6eaa6d24c71f0e2f24ac11361b1a1579214871af4cddc53b938af57ca322365f055ea1f8c8f939a0 SHA512 de27c186548baae47965f450aea53a140fa66b98285239411accc83c0f00f485dffa3a255e8402362e5fe3952a4fdc11f780782a876db46202930b84370017b4
 DIST hickory-proto-0.24.1.crate 374410 BLAKE2B 342ac0893684c2f350e4e1e26d37323e066782ab1c37db41f00d97b47856f2ff9b18c216fd162884b330dfeb542d9bd4da1eaad05a869d83f3245b5e6d451ab7 SHA512 9b14d8f4763b8034313ec48f96ffbcab0cbbdac73c0b32e04eabb5a11cfbb3ba8c6d2a84bff5ce2b1a625db5a76be895929a60bc3582b56012c736c897fb99ba
-DIST hickory-resolver-0.24.0.crate 90666 BLAKE2B 367f71f8558f4ef7f376dff7e3b57bcf3f5dffa51aa61568511c886a2d81e45bffa2de0e9a98ccd67c3ea97ad560268f814a95c3fe3e022845abf206447931a2 SHA512 b3bbbb193d4c4e2e32f7a5d59f0c63bd808c31b840b814f771e483613feb70dd31aee17391206e99f6156431b64085edf6cf6d7d7f8bff5b931589ee2ad78c27
 DIST hickory-resolver-0.24.1.crate 91134 BLAKE2B 9a0930e26f64317012e507ceab8b06ba44a367bc32bea7d0d58cf27a6980a6b82a66411cb629a576a5890a1d7ebe8717634dba928f5d420094d4f1f971f215d6 SHA512 f24e726b4f6b884be6d5072d030e4f542c9f25bbdc594fcb68f2003aa6425209a51a044fd4e83f2ac4746e67bd7a5fcd2b6b0105e5b63fcfc777dde173029609
 DIST histo-1.0.0.crate 12629 BLAKE2B 7af155af1b99d2fc83a753ad99c69bbe084b916fedb5d2a7b2e065aa0a205e67c269df6c7828dbb1d8bad63fe4e9f9d1293812e7e3e79b85f320274ca1e6ca62 SHA512 4c38fe917efbfba05f24cefba0f3d1777ca5061f2332ad7b59d41985891b254e27cc9e9229109b663c4a2895c80a37e27f0e7116eb4a09496995b239e5da293b
 DIST hostname-0.3.1.crate 9272 BLAKE2B cafcae4bbfadd51d058e3daba3e63d897bc3418723d8e843fd941d9663dbc89dba131c77d14ce7a5da552650ea3c40c4e418c88d465f1bab2fa20c178596852d SHA512 a90407996353c9bcf5b76be03713e3a0455ac80a50892e77a508744cf436a938ddb87ef97d8cc91ec7dc4353cfb7bca0fd28c90a72f8a9ecd4f29220d174edf2
 DIST http-0.2.12.crate 101964 BLAKE2B c35c2ae5f9494cafdfacefd778b4b6824588e74685fe5204bc6efa87b667d00b28f59cae667115fe45ae332d8542e7a0c2c7c42fdeb302302f89b00cb716f380 SHA512 e32dd4600aae7e26f1d530871815b30fa0b9bf95293005649bd9a7bc4df7f69a1d8de503d1b8873e67a5496e644d0a47db2a0680fa1e9058bee4dcecccebee58
 DIST http-body-0.4.6.crate 10773 BLAKE2B 828a43f8ec79a7187cd6f5379edd50127cefa8e80e9bc1205e80c567f506f4778387dcb1d2808e68f1b88bfc7e2d6405ddf9ede9403d35584e31bc62db0b7756 SHA512 fd74fcbd25044aefa183e3caad6cde0967cbb00b6d80addec2589d037b752cdafcdfd02d29d38a12b5c7d87cf1cb5e5ed80488057735b9dd73e03904006a5462
-DIST httparse-1.8.0.crate 29954 BLAKE2B 82c48fdd6d28e94c42df180415ea3e30d471ace2fee09d7d8d33aff0a8e9a15d3029c90f3bb036b4f587c8902094a2ec21e4ca6ca7b654a82562bd84fe208ef9 SHA512 849159d9876e0474c71f3c7aa3a7271699b807b293832d88d52e4326ed410b25f9d7b9ad75a143a51fb5c8ea5016c2513348edbc050d3b62dc9a6737ae98ee8f
-DIST httparse-1.9.3.crate 38227 BLAKE2B fa79791feeb4bf22bdb845c947dd7b857c2955992e649fa3b247d71365e9b1a4011a07e62e4a39b0a554634259ff156d65a2628400b6bc7bb333c620b12b1688 SHA512 16f9baeb1b00920b4a29c93556482a2da38b58aa661b87c6b543b551c731a037c9ee6a4c535f03c62fbd30f2e5433ddc9ef1a5e9373a2debd930fd1cb9ba304e
 DIST httparse-1.9.4.crate 38555 BLAKE2B 24949d12a08fad7c90f57de628fed1cf9d0a726ddf1b1f66def1d7037f509406911e6a54067eb299436d865881fcb5b4dcd54bc9a7fd166f9ab6f562ca29a3c7 SHA512 7a6c34cd0e60aea6a4e747b1e0711c7227f0cb6f332ed34b8b5424ab2d21772a77e60295e4df6421e921f6f9afe1e9955db1be5bf1dbc065200d4aa7d23a4aef
 DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a
-DIST hyper-0.14.28.crate 197204 BLAKE2B b99c91eaf65947642e217d159372750ce57e332675705cabfdcafdcc9ed3cd90130a9c600118c76e167b927a481b2120d0f4b499772e4fa710803abbec5385cf SHA512 deb26e3815e6315dd193c4db22efe1e73e44bc7c1d400bc7654e950bd074a200b7cbb730ca30faac0940c88529fea60d5737a4fc7ccd4fa24c2ecdb2a0b450a7
 DIST hyper-0.14.29.crate 198107 BLAKE2B 9bb42a18c9ecd0a3055daf2be5e0308ceb3bb66cc73fbcf0fe91746c40f437be0cfff88ac653fd43f25bb855fe563ff9f7a70c031e02f007f5fbaaf5d752283c SHA512 998c0ae60a6fd2b80717da1aa9596553489a8af890f34d9d9e6b0afe1e7e8960645fd5cbcf1379bd14d91f006fd4eb1c45e0d1ac5d3bd68731395c1b51b1dd07
+DIST hyper-0.14.30.crate 198175 BLAKE2B 9aa000132bc5db1cf566df48d243484b52a099d47d68aa2fc02d11455f3eece99f6a954bcc9900c0173cb39f145d371cf97b024517aefee4c7bea7746f800dfd SHA512 037f19ad0ee461dede269acc634955b087cc021abe52053de74805243621e35037b4968e20fa0ce7fcfd83ae05bf485c8003cf1df55dc30bc4cd64e62fcde633
 DIST hyper-tls-0.5.0.crate 13257 BLAKE2B 50cbe4ca7c1862fd3fff192de070341dd32bfb9f108b516e1e261ec8da7c4f7972b7b66e3d45c1497733a913b0281bef706994270ec8bd03eba7368612127aa4 SHA512 45dc16cc9ce48706e0b3575dca35ba1b6b3084dda8c2cc489d126e1c4f0bb96a9b2baa860d09f68c5e0a48c2a69e3eaf62f4f0406fffc4efefcd79d26c82896e
 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
@@ -190,7 +167,6 @@ DIST icu_locid_transform-1.5.0.crate 29094 BLAKE2B c7bb5c5ed273a6a97279d4599f612
 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.0.crate 64474 BLAKE2B 5a38e830609fbf57f5dfc78acce4adcb6cf32865075dbef9e4f9f1a5518ec500a6c967f2dd2f020509d4efce915028eb5b131fc4519364a5d42eed326b3e35e4 SHA512 a5ec9036b5c8ae35cd9afaa143ad29d0656078e1b5f2c589d7ad6a9e4755c4a383e45c2a3b9335455f414e4d068f7e8f7b41e9cc79309c84ac769c40634f03cc
 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
@@ -198,109 +174,98 @@ DIST icu_provider_macros-1.5.0.crate 6436 BLAKE2B 7405924dca41db72ce422437434a4a
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST idna-0.4.0.crate 271429 BLAKE2B 8b81bc4535d2e8a1100ddeaf6f43c043fd601ee3b37eb109a9dff01630a81603223407bd5c2f1a1b108d741c811781b205c10148a0122b8125c237a5d5ba8a58 SHA512 b4133c5f73bd9c4ccc05245a9edcc5c980714129ce4f6eb7851eea7e509617ff972fadefe6ac78db6b4106667d9d6070de52c4d42414c95921e3d9fe1b7a76cb
 DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c
-DIST idna-1.0.0.crate 142693 BLAKE2B 6d5cbe7f80667503ce14eb09e13eebfaa16f5dba2f78c1f6475bb85a430fe7accca8dd7cece1a34d59b8d243c1e404fd291d6ccd6e34ddcdaee932f54ec6a89a SHA512 9230b6e7410532190e77c9783da477c3f09b34cdda8376ac813bf905b116e6490470afd93fe2bcb383a0234074605de5e93780873685020732cbdea422eaad29
 DIST idna-1.0.1.crate 142718 BLAKE2B 0c3d1cc6b6dd9bf8ba1ef559b03581271e772c1b0a1cf208191e6a5510cf7230faefaf5ef402fb0fd7ed2ea5715d7beedb37c4fb558d1840f1ca38c889e11fb5 SHA512 a4979a4aae733b06650ae0d395f68373ba4025cb5db28a8fac8d02ef3544198fb4d716c85e6c80943e7ad56ab891394c1f8821c44c5db1c853373c79248a9e2b
+DIST idna-1.0.2.crate 142869 BLAKE2B d37c0c6937671750c1f3a682e829e870c01e025c453cb9d5e32e532aaeb1cbe5c70bcee26395b25480563466b209e598d73fc4484a514bd2e3876df6daa31319 SHA512 41a27ff65e606d4ad5cfb149962bf9b0d3aa60a0a582b269b9311f05135890e1dbe9f613dc5b0860549f458399dcd66061f4536eeafc2d9aa8925a70a13b437a
 DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
 DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea
+DIST indexmap-2.4.0.crate 83544 BLAKE2B f4b3e1b877c9355a491e33d10e3ef730f943b54bb14f33ed476120e2a8f0cd3550f6aeee1a56e1868881e1853b3d41283ab803faf5afbf32c86b36e08e7f2026 SHA512 9c7f2b495f0568ce56e2fa8d3355948783b490b23b46a83acade2864e41eb31a50cf372d818b2a1d3d24327282a9866e690348134a20ee481d748bdc581145ec
 DIST inout-0.1.3.crate 10743 BLAKE2B ac2fa5cadd98088ea3f6eb94ca46b3a9ceb6547ba49f0de311d86474d71024d1a087ce9b8d44ec808008db69146e9c81446bcfeebeb2fd74d2e8d0ad2c4975ed SHA512 1db5bc2bd87aae145b3b0be6669a9a722df2aac8f970fda210aaf945c372e641b941cee822917926dfa1ab8381c6e99cc7df4b18d2f4e2fbef17fdec36ed2beb
 DIST interprocess-1.2.1.crate 115320 BLAKE2B 51a149b89cb6798883e0f4af3e27748ee8b54162f5c976a271856885cb8037374c5bd586f01ef47514a3dc9371bc02ccf71d127e83934605baacd5c660281fef SHA512 37f528d875059d6ffade117d7ecad3fac50895ded8d8be7a96a748e9097df0860e2f236bdb5761fcea5dff28c1fa088104a1f2743868db99a33604a8f3a011fe
 DIST ipconfig-0.3.2.crate 24468 BLAKE2B dbaedc8f4ec23fbbe48a8c79f16fa1575b8374f055237447d12eb009694067a82bd54b503f73f9520e9b731dbf2b7797ee2d6fe2c07ad3946146b32cdc68ad0e SHA512 6029a7d453db77bcf397580fd44c5c777ce6c288c251376cb591174e9fe0aa66b49925764050cc9bcb2d656a8f6c4af0cbcd6685b2ea4616c2d2cf8de9bd67bf
 DIST ipnet-2.9.0.crate 27627 BLAKE2B e7e1c74815b965e9cec1cd37cc3dca76671168feb689620d44d5e635f3a5fa92a7276cb3022f25a9512ffbaaa11b0a8719cc1b838a7dacda71a5beb1a992ecc0 SHA512 8ce429ba2bae53cfdaf8a7d6bf980e10b9dd515446ef3ed4e4e11432043a18e09454260567419818f523bc589fc367194bc345660f2cc808d281db235d3e0b54
+DIST is_terminal_polyfill-1.70.1.crate 7492 BLAKE2B fa663f858ab8e5fd56202d731b572bfdd4ab0e8262100424e27360a9ffd2820182bc57d6718a305ef82d04c3798111841c0d9f9dcfe219765c0f63edb560dc1e SHA512 4730fa09401cb4e69c92b38b2b43afd74699c61f5bd7b37605efbc0c08ca7a1318d43e4a844e46e0f84f83f42432f01e33771be2b18eb5977702ab9f894837e1
 DIST itertools-0.11.0.crate 125074 BLAKE2B 8e686f176764e92e4da3697eb781e1bc30d6c57ac61d97343b4fc3a48e4febf669d5771fa8620005c620cce52c236760ee2e1bc344cf602e878bc168a2e69cab SHA512 8ece00ba0a7cf481ad4586da24385a6f0b1719b9c3f0c25b9b5b373dd1a0ca7b9687a77cd179853392890b7bf4d31e0356a4e5fd540465b4ac62bd74ef717fd8
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9
+DIST js-sys-0.3.70.crate 53863 BLAKE2B 15e75a94a2b7c77ff18847f98f76a1442b6e5f66960f3375534440c382a255e6b16ba3cb8c5345365d2195f7598564bf856755988f1288eb1b0b964e26446e21 SHA512 5dff8e790447a475b3c0a7068f0bdf1cced5fb8be2d66c92cb6f6c799f9d807f9d3c498e4f42c67e16d83dd4bb3be70472ece20fc42c3a8c8d57615ac8d398d7
 DIST lalrpop-0.20.2.crate 240370 BLAKE2B 024026e9d206f24f3f0675f87a5d8204237c00c96331c3cce43f563639c2750f363b173bcf928bb69b3707917ef0769c9e174316b1c85f76e8fbedc6d0262bb8 SHA512 1f22f3aab724e720c7f78b268a9f6ee468fbdc7fbc0ecf83e0a35130ca56371aa2e38752e02cff5ddf0f003d5a8bce43c735c6d5ce09a3bfcda924f2c5ab0674
 DIST lalrpop-util-0.20.2.crate 15064 BLAKE2B 7304f30748afad37ac9be5f9cb890b70b0362bf889a86f7385e7e83a067e5919e42d85f892a018d255d0eab56f7c3b8fd9564fc5d24b657916dd915bc45f0a46 SHA512 91034c6d82a0a006bf35208f84503660d55170a36e38d5c64a6c0ceaa0302c43e268df21feee6b60b70723462f6e4f09022ce83547560ab7c51b5de0954cfb28
-DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
-DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
-DIST libc-0.2.154.crate 743304 BLAKE2B 25ff132ec29b78dec455f0a1fc9fbfc744ee0d6eb410aba05ec6b1b08af9d83ec61e56f840f86cb833f590e8cdec7f67ce6e7b630ee227a36581650c81298b84 SHA512 891a36cf153a9f4d58793412c104504c57280994e428ce8ba208673a924b2de38cc21eece09b91696eaea3b2359606dbe9f1509f9bf364bdabdb366ef2dd0f61
 DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
-DIST libloading-0.8.3.crate 28480 BLAKE2B b8588be0e7034e94c808490adb8ee6e81c29e962aec436a0d8f8c7617b3ba9177887ce59b95b2f0af00ab030bc77b73e0a889d8a77b84deb437245211a969c94 SHA512 af8fa5fe2428fa98177d6adfc01bcd6e701b0d77ac18c95b8b8d5abb3a6376f16241ccc71b9fe100782c73c843ca53c9bad465545d8bb7def52320dad0eecef9
+DIST libc-0.2.158.crate 751340 BLAKE2B a67318ab24bb86c4df682cdf846d51f5f0a69504567acff43cc6e724f2641521945dc75dddc10c1c265fda960cb28b528575b5d39ce321073844dbddbc77bdb8 SHA512 c2d90d58480cca3464db475d7c70cd66bc1492239d8183038b48def8f5d8a437a1e2a2f084cb2bd9456889221b10aa07981cd5e9bcbb6bea28a2bde3c76f1105
 DIST libloading-0.8.4.crate 28636 BLAKE2B 5961c69ce15cf2bfb4ad743ead808374f5a7a9d98ad5585d895fa4654b1c31309d968eb3f5d63e7dd5fa95b77ea59c80e666ab0e467849c858a807cc3a68ffb2 SHA512 670d82fde2ddbfcc28efaf7736d799690e4fe4b7872d95854b9c4320d64f45d4b33c0e1917228302a7625f2e5e55e5ad56e113ee8e67d59fb384b7054a0cc849
+DIST libloading-0.8.5.crate 28902 BLAKE2B a0fca8f8876092e874964b3dcbaacd417451704fc1d687669a95a0b9df22ccda73a754118ac0bd706a7c7d86e4eceb2ad012e20e341d71548b34ea8d629bbfdf SHA512 f332884fa75cf210460f4678d45091345b23469c09301614c476e95bc54163afd6d4f098a34f9e0d529fa1ec63892395b50957598070ff327743e4c3b0871074
 DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
 DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
 DIST libsqlite3-sys-0.28.0.crate 4975624 BLAKE2B e8d9e637a9ed616372e6e9496a9a7095eea281e1496ffa5b312f632958c751d50d9051f5ad09777e23a18dec08821cf9c43a405c4ac64fbb8719820c12886b54 SHA512 4a3d16eec47c6e3e53e00232501fd50fa77f1ee1370f4ab6c984496f2f897b4acd1c15c697caa8babd635d31a946e147d5d090378615676a3b5c4a9656355016
 DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
-DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62
 DIST linux-raw-sys-0.4.14.crate 1826665 BLAKE2B 804af73daf396bb20da14f831f26ce06325181de14f0c277350bd22d21789f2bdd663a964cc0e7c5cbd2e084285d02a401a6bfbb3e8a8f079c120f9488b56f99 SHA512 28149660bd975ede05624af3582d5c78f498239f5d89713c2c32f5372fc16f4ca024dec35f81ea973a2cf986098890395dbda06ac6cf4ee29df3f9a0e11eaea7
 DIST litemap-0.7.3.crate 28728 BLAKE2B 00a04ca0e4e774b317218ab990da4c6ca1f342bbf229957db51801f8ec36339b665133bfe3847ca68a40d901d78d87e0041e09f0740898ac38ea3c8504309c31 SHA512 2c3bc6c4cbf6609f3cc2d986e701d23b73f5bac55995887c90aed01bf4392a42c718a69c0050296fa635a46f7cc9ef3dd6c6a2a505d3cccc690899aa345455a8
-DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3
 DIST lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe884dd69c61c54dec978733b95a853c3e5af26f237e48ebb4ee9dbebfce0f6c06067f74a3d122e92f5ace40e22d7 SHA512 525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7
 DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
+DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
 DIST lru-cache-0.1.2.crate 9307 BLAKE2B 606072bc5390a13cf24b4c64c77ba7f84c4c2b1a73c4abe8ead4e1d19067b063888d5cbe478dc9108d193f0a66aa5fb2ddc073f3edfac466de34f85a52a15ef2 SHA512 ecc67b4b2ed8d3596816c47e9c6aa242c7bdd1ee8087646e90c27a60d59175f661ec3ef82058c196bef2abdd302d429b7ea4279169689254a9f322dfd5697bf1
 DIST match_cfg-0.1.0.crate 7153 BLAKE2B d3f40e5b16761fed337ed18dfa9db9e46aa2ad84ca8cfdc7cf7c72bea7cff8d084d95214ce013b3515bbe5b1ad4b8527bfce692569551e4588fe6f396a8a96ee SHA512 fd36f2b128d70a0f278e708bcb3274d90380229f754aed7ce9b808138b0189d5e1a07e0ba732216f788a530cecddcdd980559b3f71efa371d8805a213ff8f2d6
 DIST md-5-0.10.6.crate 16161 BLAKE2B bdd43889aed114cfa97ed0c70bc97b89fda28b14033a0a26bc7309ed744ee907d59151ab92e9cb95f0ff0ca1cfe2af360c48f1b99fc8a246a25c803a4b444a0f SHA512 024a9e14aaf860e748f64dddbb8aec01bb9f40d702d8de31497fde1d66a663e97ca1b06b600d8a818a0c707d1ef02eb0f210befaeacada458acba69ccbf476ca
-DIST memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
-DIST memsec-0.6.3.crate 5512 BLAKE2B ed2a36cb139098be66fda58f052c2cf22bc025e34b9ac2b11a1a8f848d94df6165f205543ea30a5e7b347b85fe41670973155f68c970dde145b41fda551c5644 SHA512 6d4ed30d9b975b00a3eb4b92bb1c7b83269c2fcec7629975334e53b7683ee28e4432ba4390d1590d88d1c4a0e689dcab38f338a6bdcefd3bfaba75067b819d8f
 DIST memsec-0.7.0.crate 6532 BLAKE2B 48fd0c732a5c83c5e0ca23816b61bdb7283c665ad73d20089238ba0b6863992554a7f8a3b41ae8b4cb0f31204b03b32b3cc7fd5a0af657a24bcee01b3443ce58 SHA512 73501130770d2ac0e3904e7f293cf0ca6bd0947a6e05e53a40498c950b8519fe591d3888badd5cf6134e1f567c18fa2ed6ce6fa3ac3c8c0d441645c3e95cddc0
 DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
-DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975cb60f0499498a73ce4375e7d452c9ed62d4b0b6f6a4fa591aab55e5d7ff20033baa007fd6c839b9d74b31142c0b1 SHA512 2f8f09d7afdb9d78bfc80a228ded85a215fea05e577e907921f1808f84aae30ab118048d7b53295f11aeb5de70ab6cbdec892f3a2417bedf6f53a4576d095432
-DIST miniz_oxide-0.7.3.crate 55774 BLAKE2B 41e11d955b75ffad131104a6cb3e61d7219a932d2dbafe3ab1229fa8b85b6def569a264b76a47324e35d1b9296e74a19585d6ac043469b61fb9b7565b81022bc SHA512 b9e2cc214d6213fb343cacc5f87228487592883fc8f7cf46c9a26b7148691783b2729ef80c0d0e11fbedf6edb1332dd87d88b253f7c2e645fe86ff2ffd47121f
 DIST miniz_oxide-0.7.4.crate 56119 BLAKE2B 68facfec9ff405bebe99f52bcf3aac6788f1b5eef313ca393e2a15e1158bf294003cbe31efea4c793e644e8ab4e00ef67d38f7d32849ab6f01a8e19d31c30221 SHA512 482bf02d7bfd25bd8abe5e5959132677202d8c5dc014b9b0b64fbdc204be1b8431867095c140a1183dd1ca59f6ba871a355422fbd148ce34d62960cad2b7a978
+DIST miniz_oxide-0.8.0.crate 56343 BLAKE2B e4abcacab4c8698d0489faca8556faa7bff53d272ea0c80e2e7843dc0f6f9229b7d5b0a17ae210344722a379853e7f14212505ee05da4e60549081cf77717c1b SHA512 044b641ce6d98d1968c1ee0906f91963f9f524d6f3fdf3059708177a759e1d498c63e595d3a3f0f9f3210c45c828b9b70274134ba078b899d7fefc2bbddbeee6
 DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
-DIST native-tls-0.2.11.crate 29008 BLAKE2B 594511c364e639e309f32f37ae20ecfc5ddeeb39c3f7180c5f3f2cf304d8c323b977af933ffe70cce696a5a63e17c5fa7ddb119d46fc3db819a28e31a388640b SHA512 7e77959932f2859757f1aeb37b78fdd459b7b6fd02424f4b7399525b94c21d1f499a718775503b8f3dfe3b4b740e1cfbee77052a2ebd0994468addb3fa665e6c
+DIST mio-1.0.2.crate 102777 BLAKE2B 9b87abd99269c62e48c6be4fa197d2b12527b672c435d5f1f623f986c60ed391597dbde7d5b73a624a4df0eeaf9c9cedcd56cfd7ce4239757d59e67e9892c59f SHA512 77eae1170a318d4a53550dda3462ae070d25656cda51db4cb2dbcb28210802f9b7e279900e6d6eba68314a0c814c90eb4af7acc561f611535cb364f75ad4e317
 DIST native-tls-0.2.12.crate 29517 BLAKE2B 76f4bb2aa8fefc306a04ff50a62d6617f71c3c34aa83ed35f11714ef2306fd82f76c7e26ab7ce50f8eabed40602ba02589dde2d98b55ea6113b45cc539c84bb6 SHA512 15fbc9d02134d3d55334d2f02fe4f64be50db991d75720b38d802088f06cf5f844cba6b25dfd7beb92f2cd367ba477ec2098e3c7336c4e5a5a7fd39c753fc723
 DIST nettle-7.4.0.crate 583944 BLAKE2B 79392e3b2df0551ed22865a42f0ededeab2421764e6daf0b6388c08080d0674bbb88f733ae5d29ada841e567c734a641e7fa6ab2bd8e8c627f63125c9c153598 SHA512 f132a9c7ea566930fcc813a9c799d4ec6849522dc70e8b478655988a9ce1f75ca731b0c0b7d2a702f96273d51770b47725014e6d1e407ff58343a0b4b7560871
 DIST nettle-sys-2.3.0.crate 28576 BLAKE2B 23518adea067a8a2cd4235ccaa851ed62336847db9bc8a6adfd77cfde8c57f4a8de104cfac0e17068027702e1e4d79efbe77c3733cdb032650fff1eb1ff15457 SHA512 f453608d860edf86ba62ed959aa1d04301c06d13bef5179b2a69f7faebe1e1ea41fce163aa4a48617d21fc493cce16c28cc11a051ccfd13d0be93c66405aa5d3
 DIST new_debug_unreachable-1.0.6.crate 2582 BLAKE2B 2ac3dd86f1a532832a40ccfda95654e43709a62faebb8182c87309827afdd23e6d3f250f2345f044cb789015c30b7907be63253b487d368e68c4fdbc7de20492 SHA512 73a61acbc9b20b3595925360827ba8798f3338471b291fa37c72a1c9505b3ec9f688808fcaac9a2eb494e5f3ea5331d30545d5f21f89559111bec6126ac90b48
 DIST nibble_vec-0.1.0.crate 11796 BLAKE2B 2e80648e4e18d17fdd41671acc1e166a8337fe1ec1765e5a7f08c19fbcb23ce43b11d1cb396b867b9a2c0ae58e30225d9b13fa337793d8c32abf99969e7c11af SHA512 21bc50bfa5f11f50b19a20691346f098db083ceb6891faed72fb91d2e911cee060ad4d19ee1c98792c5809cb6ab2bd65061bc051a1dea75d9096060b87497f67
 DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
-DIST ntest-0.9.2.crate 4580 BLAKE2B f6641bd5e192a28c2a5a0ad36709d1f2d409b7c50a59a2d7d7667f89ca33679b833298eace95701ac0c881038c6bbaedbfe0342122bce0acd354d09d9d940ac3 SHA512 96470cba1e1fdd7402704bb5eb30253f85fc5f3a88e320c7f493d68bbe7e60d2134e3d56a254c7759fd6aec375ebc2b32f49ea908051547dc5f2ccb88e71a2b3
 DIST ntest-0.9.3.crate 4582 BLAKE2B dafe2efb3e124fca7884beb476d25940953f447a04d04e73ccb0f19b5434631ec89cd79604db1b2305fddf6c55a6c3ca148e3b3757bad2b0ff1018c60f5b5125 SHA512 8b8b18b802773191ece4a3f683099b9340524d2a4a45004d71a54128ee126a8298bd0715147a9d99ffb5a7acaa2a902093e4718eb53b4dc3daf932e490e3bbdc
-DIST ntest_test_cases-0.9.2.crate 4806 BLAKE2B 1723b94dfba88b87647cb04359e5581f090e250936abe466857964dedce6892a0612116bdfe97f9d3444fa0717f13f9d1aeda05897d37f00ee12188094ce62c2 SHA512 9361c14c690e45d762436644f43c913a4d1d0911aa6bb7e562fe49561d804096a85bb46af9557e0b56ae7571ebe34538fbd4a987a79fc2dc109c84e36fd84bb2
 DIST ntest_test_cases-0.9.3.crate 4804 BLAKE2B c8c992f03a61ea74fa6bc3a2f7b3f9e9f3eda41d2cbd652bba4afede8a39ed34f937761c06867ad7ef229d90b0e74262941bda38336ef0d0a7df98d2a3f60593 SHA512 8de679f8fe246b8489bbf1c20c1a8da2c55cb3bbf52f7b6816ccab46483d525dfe749d12bf1e60349daf319a12c027066763bb368f77409032de534c64726b21
-DIST ntest_timeout-0.9.2.crate 3068 BLAKE2B 990977a0dd2d4f1e97ce418da714f0339bc6135655473d2ad61c4ee6df21af89a6e5c88bb8a2de9be3240569b4e3aeb78b8ca5848f81dd949268966cfde8557a SHA512 537b6c477a3780cf78c4721eecb8e53ad1640fd3e1349122a7ffd6dae2a87661d6968248a68f575158d7729b10f13468ea86fcb02b4d12f3e8340ea50a310db7
 DIST ntest_timeout-0.9.3.crate 3229 BLAKE2B 25940ea34e335646cc4b8d16c7cb406244382cfac8e35409bd1eeac72b4deb0855326aed4639c1ab9650558b83ebef0d7de914fa70e0f4a0f5d28befbc4d2e47 SHA512 754cefc5aca666fe33a15d7454628d9a67db51d35b8b08b1c06756aed23a2ddee7b332c87f2433838080d236a6df912534c0114f84f59c22e53701bb0d88efe0
 DIST num-bigint-dig-0.8.4.crate 123825 BLAKE2B 9710266116ea15d0e56792b7c8e217931765dcf2377bc05f23bd386625087eb6a7d7aca7b8f0beeb78ace9f280895565a6de3b14ffda7721e35c741ff64b71c0 SHA512 88ea682c5aabc61c0cab9234e31a2dccdb5458d3bc018e1f9ccbbf0a9f09ed0053341e93bc53f65b5bee55bafe71d50bbcd48fd085ac723ef4662e15664925b8
 DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100
 DIST num-integer-0.1.46.crate 22331 BLAKE2B d88c9f84e5d803a3aa8f44dfc1bd6d9b5e336e7cbf47231cb3a7de30dfe263c41c62c586d31f0029459c8c240475cd329b3fce79f355be7643bdccf8d56dcbba SHA512 e27986d91f6c6dc3d5a0900defe28ab5f47905cde3f84d0914b7acee076dca8fec6fdb7b631ac94d3a31eb01ecbc5854e51afc3187cd1abfa21e1bfafdc700ae
-DIST num-iter-0.1.44.crate 10249 BLAKE2B 9e70a4ee02e784c5eafb033dd321f70ee92582c2a75871688ad43970a1313ffbcd49c26a8c6787e537f041ac60fd269131e157bb61ff2bef09e5ccfa372b2a09 SHA512 f7cff4e6ceee82aa6de469b9db834a45b50a3b73cb068ea714fe237f74fe4875a33881f3421a71ed31c47dca847e3f3b7e21cdaaec52f0aafe6dfb8927f39f42
 DIST num-iter-0.1.45.crate 10320 BLAKE2B 9f2a60a819e31a6e7e048ae86f7fa029015a73888348676e54ec6fdfe76abe94b632a49a82b53b86488ea5af1031f677b0eed8ba7c5e843ce804c6d6af123622 SHA512 6195c7bd5f904e9f0aeee3ce17b42c0383d053f9d37954a9ce3b4ff0a048afa121c9a37aa9c74b9ace7353d7fd9f57a7d04c7a18e1456fc2c4c298d8ecfd0172
-DIST num-traits-0.2.18.crate 51930 BLAKE2B 6c40e155d7a52267a7183d8030ef34245492d33f103cc24551b10da3eaa18e3db485062ff87057dc23e6b55e381e5c5d2a2633aaf6f4763c06677a0a0c524f02 SHA512 e395ad9f3b21b0dd1d3a94cefe0d68a42d1b1d429ddb2823696f9cd75042568a635d93d133ddb9497ed357e5b3be5caddb8e4a4af87b65882bbdc60b05c74ebc
 DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956
 DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
-DIST object-0.32.2.crate 286994 BLAKE2B b9085200fe0107ab0f8ddd5c5ac82bc681dc6266c6503e4a803ae4dbdec775ae84ca4a736754b770d858ebb058342af45d485d4c9a41f57966ca1466de40a4c5 SHA512 5d03d998f06dc592c3be141f7163bd72a0e73396f95d22ef1e0ffbfc66489bf727a6f6fb813a32739609b619b8e34a471974b2231dcfa23df8bff52007c25a96
 DIST object-0.36.0.crate 321771 BLAKE2B 6350df2cd8e2cd733397768e3fd9a2a79d182e0e3fe653bffe0d688a944713cb83434b2810a48638b30f89f0fc5311784a7c7dc82291191a8e5bd310c82531a9 SHA512 5a75b296bde7a01a9a5cb59da98b7599b51c3ccdea2c135c5291ed10af8b1fab46dfe936e43de617328c216fd113913545fdedde00adf22fca251149b22bd6bc
+DIST object-0.36.3.crate 325288 BLAKE2B 0701822a51a82a1674514d7572c5f91bb40834e23d40b0fb440d933221e8256b7eb36711e8b8870d866384774c7c1e36b89363d7f6bb94af92f9f567f7aca211 SHA512 2f8175d757a66658bf91234d6a58905ef9a410bb19973e81bdd8b28322f6865e32f5b9cfd0ad38195cb07b2721ababf240876270f39a6c7ab8a36a127dc18f0e
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
 DIST opaque-debug-0.3.1.crate 7066 BLAKE2B dc1dcadbb5654a5f69c59b84faeb3095f008a6eb4f63e3cff95bd4e97f803201e2f16f59a65f8ea21b662e77e3fed0d0870eb1db7f5a4f95cc02422907732951 SHA512 f325214d604e74197ddd9209a596851c5bf0c0f3299b79b6267c35e0ff6351205b628fb5086279684fbb29fd07746c91ede4f45019657e761d8400fef2b3d8bf
 DIST openpgp-cert-d-0.3.2.crate 31488 BLAKE2B 56823716b125c1d7e57f9c5c2d3fe8c7a5a6bf635cb4b28a9fdfcba527ad20ee37dfdf019f00951c7f8d2d0b252e4bf3cb9f6b00093b1b7c065b45f0b4ecf984 SHA512 849e1597677822aacc1dbe4b9854ae0acbfc113a5620206f4732a1f51fc6b67e91dd7ed020d789a4bba9458ea79391618aa3a949aeacd31007dd790076651adf
 DIST openssh-keys-0.6.2.crate 21643 BLAKE2B 25bfcd6ae96261312c40c755ca28c2824b0270c2f93b99c0550d63c9875b9a1c41490c88400f9ff288cfab8f03b474cab895b9b0fc2dc845e96f14b1f6febdad SHA512 71e73c2efcd53bbd336d9d49dc5924d3d5c223f240f9dc63682a2cb20517c26c41f0b2d581252568d2d1f9a8afd16a56641993366619cbfb56c8c12c9558cc69
+DIST openssh-keys-0.6.4.crate 22213 BLAKE2B 249b6dc48785b59cd0ce649a90e788b3be477702e95cbd34fa4bdfbaf558b3e9b360d82ec2fba0b63166192e13871bdb6c5a295f7795a603348f4a8668e3732f SHA512 6d572dbb4656352d4abfa5a622e3e9f1f5576d7ac1216947a524032bf6d8772c672c351bfe3f7c33c21716a4c4ae9cf410379f7529f3ba2deec7edd1bdf0c066
 DIST openssl-0.10.64.crate 272306 BLAKE2B a8b618aa403cdb06a7f135cd966775f21c99739365c55aabde2680a6154d03c7d554bfae6c62a069841c70ed82ece6c3f0cd589da8c26022b7022c3c4d79a6d8 SHA512 a1fa9f71cfebbb37ed9d4a902360f2cc95a78f55b5da5d51eef69db38cef016fc03236485158d689ccf054e04937b8cddf88e3f0f31672997fb30c6cac73cbf6
+DIST openssl-0.10.66.crate 273705 BLAKE2B 7892e96dac3b24ad5622833b4061bd82028210f9f26ec9772cebb65905ff6e45da8b21ad1aabfb87bb5610f534018da6bd20c10eaee8c189dd08a7ebfbf12b4b SHA512 2f4dd6e40dd8aff8c04563517fabeecd5ac0d986764649cc9af9bf4ce25757a67f75655eee207703b46fe57661a216ff00144358ffcbc70525447a063fa086c1
 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.102.crate 68622 BLAKE2B 0d3d3c9ef8e2542c7f35db1d8feaf512cc7313481bfcc99354d601e8d6332adfc2e7ee8b35599a9241de35c163efd840186e904375bdc9c65ee743abbc154cba SHA512 7ecfaa0b49cea5c60f6f063fe5217252a65b27c5e6d1185e0aa1bb4b59c4cf9bf326840e8795a870a537c18ee5a987feedaaf2dd767cd6f1380f25468a1622bd
+DIST openssl-sys-0.9.103.crate 71552 BLAKE2B 4cc1ab93f5a444b4b985c84f6ae90f345da4639e4ff7c5502dc1ae59f842d46e3855057a7c05855f7cd739b5311f330dff361480ef2a0102fe46471506956148 SHA512 61b802f6baf918ec055be90ee47c69fe0184f6d9a1d29c748386192a11d4df115758961ec9b636126a6b42d7d8f7509248c59f7c035905558c4cc35b804a8eaf
 DIST option-ext-0.2.0.crate 7345 BLAKE2B cbfc03e7c960fe3023512a4ad816d657b4f54f8ecbde9f9c4df4c5fee3b36b68ab463c67ad650778279e01c7ffaa63a0dacbd0c080c8c3d15b1611de0e71f92d SHA512 f8539f97b01af97e0b80fc96556002251befa60f8ddd19613311e62f9dc9834d71c22f5d8e7c53c4925046e38cdcf834c3c28042a4da862d6f6a21ddff8d8e56
-DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
-DIST parking_lot-0.12.2.crate 41723 BLAKE2B 7c9a4f483b09f4e4bb25fc758c80e8259cb02960b791695a061fe595cd6ed9b13f62903513cefb595bd633488b23254dee054a98282162fc4664301ce04853c0 SHA512 42794b06d410771d1ffdfdd4a9cab136cfb80cf95385876a580fc45739fa41f0769adfbf16be54a9a931632e02d2464278c5395092a1d6107703875e9ad112b2
 DIST parking_lot-0.12.3.crate 41860 BLAKE2B d1899a1132035aaea3a784290cf4951ea3b36b2018d407e27d333b2a2ce3820e040d635009c44cb6e58ad07cec6565c0347af6f6fb02954eac2d4c348bb036f0 SHA512 368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703
 DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389
-DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb03a3b223173a3bb8cee65a28724eeb7bac87f62aa7b1df5ea3fc93af3cee3ef30b83d06c6773d6b856a7e6fa5fa197ea SHA512 7f0df70f9f1ca8d3da0b9dcc96e49daf05d95c3a995289266b5333f68818d686d32b0c733dfe3a0f62da78fa45caa843a963923b2d0c80899c33413dc749c032
 DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
-DIST petgraph-0.6.4.crate 185895 BLAKE2B 9ddfb2796c461d2820db8227753113b02024e5dcb694a0bb2826bc1f375f028d8b98a3bd67555485db7fab88eb86043f5b768585dbe0c60703cc655976030a2c SHA512 b5a21572526387af3151dd4f864bd95c94f65eaf0612d96f99926faf646214df205bcc652b98d3b281f2e270779a4c1fdd6a32614ed60b3612e5d594b2bf3f20
 DIST petgraph-0.6.5.crate 710970 BLAKE2B 7f590e93fb44f1bfb8920e512402edc1cb087ff9d5dac7bc4be965f64ffacf9c1c503eab4156cd2005f41099f6b34f51e49b21dfa217271fcc0d4ee16ae85366 SHA512 454e9805731374abf1085f1a8a72aaed85e83cd30ab9601bcfe0e46882ba6656242284bdf32b6e75c2f5ebdd1325d5f8873d5f720aabf297822ca97311afb677
 DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b127f4af79b2b5855cb014a0080bec1ec45be466513bd57faa39c77cfde0d6ca02b6bb77d37a23d697603227da37 SHA512 f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5
 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 pkcs8-0.10.2.crate 26360 BLAKE2B a62b5b7386eedba6fcbc4cff2b103b899dbf6179101445283f9076080489129543561af1ad6f09061564f68c28954262e49d0bb3e182f2ce7495e19d6f34bd5e SHA512 87127d51f0e1fe085d46b30394f2a580e857cd64f5c6fe4a3ac3b8871230aa426598dbb007e8bdfd5d729b99a9c0b4d84116f0768886605342d2ed112c51dfa8
 DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
-DIST platforms-3.4.0.crate 29298 BLAKE2B 7d3f85ffc526ec95b2e95073d0621bd57e9becd86406789971cb87ee072fecdb42c90cc01e16f320d793dcb6ccae02688c0952861e8c7b25723347c21e1663f0 SHA512 16bd9bd104040827d457595bbea3385e103cd82530e84f17132ffccd3a20fca80cc92b5b72b452e7307c7aefa8e4a947c0bde7d9224f0e38b06caaad28907c70
 DIST polyval-0.6.2.crate 18425 BLAKE2B 59ae2ec631060ee8e2e1d4bc250abbb4762c97ca7ba5c543c0292f561bb967e059410ad7e79d8dfd7912cb30a6284169ecc2f4c94bdb165037acf8c3eaf1209c SHA512 113646edef3a7f60d59db3cf06c1796bf81305b66835c71bbce0fdc07345f41e23f2bbd7d5cebc50c72eac11c98f351bc793e2f568b5fc0bbf9fb2597eb44f0d
 DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029
 DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
+DIST ppv-lite86-0.2.20.crate 22478 BLAKE2B 9d68dc36d8148047d571c0147ed29f586f3c6ac9394b56bd955c8ae5bb18f5a8da5369809f7b8c3199074e23660325158c32c62e1bf69a16cb1f5da2a01f5df0 SHA512 6d171f63b42296f7765732fce3af7ea05d0d81f1541ffb3ad86e81210715ef4afe5bc9e58926e97e757aea6ff96a8012c8411eac78be0fd080898318ed21d7d1
 DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05
 DIST proc-macro-crate-3.1.0.crate 11084 BLAKE2B 9a9d02f0f34a30668ba94e34d51199c332209c47fd8bef28c452924f75984dcf3aef2c92c4ab3fb03205d589e4f773d960064b4d08fdb2480168f10b84fafe98 SHA512 eb5ad763aa700f2cb1604c32a4bf2fad499a03ad868a22d06b0697b77875b1cc13c739fcf165b2bd547207ef6dc3bd13ceb75e1a59c596daf916f356ed27d8e2
-DIST proc-macro2-1.0.79.crate 47200 BLAKE2B fff8e514d618b8ef60d6a4ca7610607641cb25701fc5e8452e0db5f942a3c38c724acbbfb0474823fe0f4864df07958c1524383e7640105266608f1d5a741368 SHA512 8bfa6fc1022556cbabe0050a37b93c5ef1056ebda9d3dd368e705a7c695df9dfb5cd5adc18ad1eadf7338631ad1d5ed6f63f0adff3616429ef8c50a930b1838f
-DIST proc-macro2-1.0.82.crate 48452 BLAKE2B c01f60b788c1395d1041d7eb55fe9519ae4e78f86e3dfa732458747767ff801fcdd5a19a81ee9a8d8cd2457eb0a2bb7cec118299a5a9a64d65b5cf06b9d81165 SHA512 3726463868483243adce01c319c1deb1ab153188f1adcb083b53bff838fa80371091bb8e20ce88709ea850ab3ef74dcd99ca5aa95fa375b330841fd4230c842d
-DIST proc-macro2-1.0.85.crate 48988 BLAKE2B 236f2a07c758d0d8628f003b70d4b25d5f0d2bd8cbd3955fc4262d7d9b271c6571eb0fc45c95fd816b426a84ed5ec5dfeb81d8041d4de955cce6f3b9fceda1f1 SHA512 54c61dd0581bb5802e077a58fa41f113aa1fab59026478268ece293f2643921b7649844c1675a21a3a21674cdb3ccf94928e5bd069a02bf6813ccc1114d37262
+DIST proc-macro-crate-3.2.0.crate 11164 BLAKE2B dba3e1f4e38f427df72794ad891746fbb8c24239cf06b076e75ab6795a7e8c9abf25ae0f40379e07a696827156e7a3780ae242da7e5442cf1224d058f54b83a6 SHA512 41479ec5e414a8b05dffaa0ece21122387d5165a54e60d8ee3502f8a3c0a2ac0247f56996f933d5d77f1efe41a56bffe16874e8c6a34b66100cf047e4b760863
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
-DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
+DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
 DIST radix_trie-0.2.1.crate 251366 BLAKE2B 14b50e45eacbc5b42cdde8a4f8e8642adfdfa3cc569c3fe0e3aa1fdab901713b3929d706dc0aede1b679762fb8fb1af345efca15befc9234322db434c8a3923c SHA512 f6f54511860b6b878c83de4455bdbd71289599dba93234d5c7469342f3401cba99a9ea6bca2d32df2e31ba657f40e42e7d5fd7de66786ddd2814e22fe867f9d8
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
@@ -309,141 +274,114 @@ DIST rand_distr-0.4.3.crate 58255 BLAKE2B c93a4db62e1c27bde51c77423e15674c4bafd0
 DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2a0a0dc24f0282fa7eb01fd1351a7dc8b5af3a55ea321e6526fbe037fec3cf8b32463166a082a6e417a51fca SHA512 3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3
 DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
 DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
-DIST redox_syscall-0.5.1.crate 22536 BLAKE2B b7766fcf35dd865fc98495f60da54ca9a6b4cff007f4323d1c63de5d1152766aa5517139b5ec50afca39d934360c701a180c4516feccbc2600085d5d72dabd2a SHA512 0952b5f4f79f2cff04b4c21d964df7b56bc0cbff8d8a2a9a7d38ba66fd69cbd0fb004cd3d8ac6feadde8d9590858cd7e1763da7e4a5de840cdef42b1b6f1e460
 DIST redox_syscall-0.5.2.crate 23957 BLAKE2B 6261df25a59af5119a21d31fc3b6a8800bb1783cf2fd63a5524d48d0b187f5f2e65ebbdec00d9282adf110ba8f307d4ceb154bf029a0c6a26e8a887fc722b2d7 SHA512 b7e39a08e220153370449cec7b058c2dbc4916ff7be01b34658e1793035323ecc28f40712194cb9bfc9b863e4bb316e58662721eb0e54f68f09438bd880ea032
+DIST redox_syscall-0.5.3.crate 23830 BLAKE2B 0a38235ec277144f0c3e7bcb1d273c7f357d85aef33dbd06328ef16bab7df0a07b523431590899ea58d55e8e1d84c32392478530200cca3a9483e8a47b29e233 SHA512 777d1208004b7756887d6c5745ea408972670e59430e1d299d01a463ae41b98e0920ee77aefef8755fc949d4799dca679afaaae9c1a7d060f76f69af5b90427e
 DIST redox_users-0.4.5.crate 15514 BLAKE2B 9fc9d9c4875ed711efb75fb08f345b5f4f0667717d37710143742e48251a709c53760bcbc31ce13e6432672f9417be429c38c2e77a6b786887841714290a1194 SHA512 7a25cc91c9d1bfe537f20b83255990681d136ced5aaa7aa0cdb1b1fc024ba36aa1fb75c335c768a85ee078019a9ca2460efd911cad8ae6fe8b0385fb171aa4b4
-DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b
+DIST redox_users-0.4.6.crate 15585 BLAKE2B 1d60d0b7781395ff271d79264910d24fb021cd8ef612714265abae25b26ac158d48f542f1e73701bf5b99bd67546a7b878e4a14e40cdbd478b35bcc8b4778f5f SHA512 719d63fec42bad3cbed39deb9242ce1daf3f391bccafa8121f63198120371f112d78b0da8d66458519e946581511004983f04b0a697071f22294ac7c831120c9
 DIST regex-1.10.5.crate 253805 BLAKE2B 9f5418b577209051640c3614a98b15604a1e71144763a6f00caa7757f0ff67fd833a7d14fe9d6acef96386a2a4eb60cf5d490472e73fd62ca8bb0e78d4f9f125 SHA512 177fddb001e14281510e34070f88f8e5167278a46f1d93d9286d9606b7673346f504e4064d7ad53558e6988a400c728e33b663ab398fee12ae23fba7158da5fb
-DIST regex-automata-0.4.6.crate 617565 BLAKE2B 8f1e2a3cc1d2d50478776281d2bf10164ef441dcf7127994f4a0341ec40588ec8dc1c07fdf9f670da9e61a7753551500b80314df130370b61d2c03c2b2e3135a SHA512 b288e1facae2612f73d3de3fe9fd1af13d337107004f990263abe6277b31b948478ad9c2b807dcafa73fa565e48bdf2113139f5ca67eb73165b7d29e2ee5c9f1
+DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
 DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3
-DIST regex-syntax-0.8.3.crate 347497 BLAKE2B 9ac2f63098ffa3fff51fe2bc0bcf9ef164cf9389a909a3f0cb668d2598e7ca65d573e47d571ee2e6bba3a1a96ef7c298b8d681e1ef89c8c53b7d590e0e22839b SHA512 925f7bcc50d94c65d34fcc770c6e58dd5b8a045541c0109e77b8efe842eef4c110087ac9c0f86c7c3022ed013abbc5c0a187d796dce292ad5361a0cdf7153d76
 DIST regex-syntax-0.8.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed
 DIST reqwest-0.11.27.crate 163155 BLAKE2B 0135a99a42400d601a19299d379e28f2df7454dc85864bf3905a8148c908fb1b0f363cecd3fc2ed0c4ba0c108739eb3ec5116d511bcb73530bbff6acb10c691e SHA512 95e5c2e375e345a3ac9d4f4b4fa9aec28f45a457c1615d303d4b4dddb639749995ef2834a6f8659f5f0cbb49e0876e89c9925bb2b2ba62207e393c9b12e58ad3
 DIST resolv-conf-0.7.0.crate 17352 BLAKE2B 32b565a11d5d752e2cce2ac7b44e483b8a682220c99a9ca34d0a440d87cb5a874c407d474e47757f128bc5d78ea57940452eb099ea6fa433d8f6d1fe881f4302 SHA512 538b97f88fee8b82f15845f9a596e09757e3c2869c4e8708ddff97e19348e9f88d4bcf75e810d2aee47113fa64d550a9fe2deac6fc38d95242ebc20228e9b5f4
+DIST roff-0.2.2.crate 11648 BLAKE2B 38431e1dbfe394274c09e32a9f4c99f7e208130efd1765e9df0c08cf313a0ca81d13198158af6342ec658648cfcfe2e3cae5a5306f8e27e18af7b8163359e896 SHA512 0098d4cc921435cd48fd924d96e8dd27f6443a9b6cba847388ec4be7c2222bffa7a1507862b8c120314d32d08e0cc04e52d44973e25d85536a3a2560fa2a06aa
 DIST rpassword-7.3.1.crate 8164 BLAKE2B 60e89fc36d78a64d9441bd902866500872f4ddbd28ffe4bc5c26b5882ec1dd9bcf50dc06105c87f5fef8c51b327bb9af1a324831cb6396796afab3cb7f4a2288 SHA512 28905b33e5fa26d9a7bc0d682b94edc6119b2d8c2a6826c89d61fa86033230707c54f3ed8047ee3f5da4393c119c70f102ff61efdc1d4bac38e583c04e3b4382
 DIST rtoolbox-0.0.2.crate 9179 BLAKE2B 4cc9faea86aaf0f9e9ed95269d0fa8c633d7c05d539a435bbfcadc563ad5fd0d3f06bc33f83a24432a53da483bc7771edca21e6237888254b1d000f7af1ee41c SHA512 2e239e821d0bdb171ff9d03d3b8df2fbb561ae67ed653f66096ca32b2a83badc7d1b74b4ed1f0f41f141ff2a383fd06618f4f7740a03514b256eca4db0699d42
 DIST rusqlite-0.31.0.crate 152252 BLAKE2B 5ef8396ab6ee9f6887466e7ff856c6260f40ef85361ca451e230d8590019d6ffa4952df15abd21cf300cf51da4a6ea4e82f5dc88dfba474f2f62036cee76caa3 SHA512 6d20b015ab72d3d75c363111c0cb41feae8bff83104ebdfcb8e5efc1bfb63eb48a17f6de2e6c96cb1e916b4795fea6d58466ab0820b151b12d1dc4c29800ba66
-DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247
 DIST rustc-demangle-0.1.24.crate 29047 BLAKE2B 8248b014eedb26cdc0b748544ba91b9aae9c992a6f93b4d3ac256b78f691d572f8885a3575492ea556698a241d2759743968293079ca02bb6a5f318b0ed66dd4 SHA512 eb897c35300b87766e6105917a907fca1c5b1f7691fc03c6c1aaf38075ac883a73d1eb54a245d13ba59c7b0f0333d6543e23fc1b1c542fbbd5c750a84660b9e8
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
-DIST rustix-0.38.32.crate 376999 BLAKE2B 681ea50f5405b3a749a26a481995d3a85800378067734bb857e32e5d3764687b0da4b3749d227174440e432b374ae9ada154a8288e4353ca2ff1b851698477f4 SHA512 8f028b4df785aa78fc798f3e053d0a4fb9b3c552a47f66f52f1666f4c1324441be6581ed643c4ef0f56d92e1a078c6d3b45be183fc3df0ed1fc89de0d610cad6
 DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
+DIST rustix-0.38.35.crate 369206 BLAKE2B f52d40dce187c8712fe8dbeb0fb8c338656f5d9bc92b7e886bd93008732462e8a2cb64f64825e9fa8ada41054f22bc2a0eb2b9c32c856c89d6d572f9eb9b894b SHA512 0f5367d596797f5719a154e0f929b24db8c5f2b92b3ed4772b89e11663beb0b3fd6447e1ddbde32bb2507450ca60504ba0ba6b4d58510fc64dfd70e5099ccdef
 DIST rustls-pemfile-1.0.4.crate 22092 BLAKE2B 9a776027d6e43a336ecfdd6713d4b1e6642378f81b73c97752563ee1d2cac5b3988afd48c92d25d55f655a6fa248436954aaa0e0bd9c7c679c987ce7df0cc99f SHA512 bc748ee06f2c101d8e54e8c4555e88c5ca824ac7bb0182f8e49bfe1fc66d418d2a3da8e454f3741697f491ad0c7bc8e924a752697023a191c1bb6eb98c48aa37
-DIST rustversion-1.0.15.crate 17406 BLAKE2B ef68a3a83e11f6734be94117e5170f92f9e1211d353a81b45ed11d4c738278c7f519ebfc9896681d564698fbcc579da10f97fddd77d56b14dbb96b90e16ea811 SHA512 e0e37511c25b71a64bd6f91cd8b29e43c4073ef56196de808634f3408cc297fc7fda1316a5adc5fffde9192b7d64f1940deb7cf396277a3805e89e15b2a855da
-DIST rustversion-1.0.16.crate 17510 BLAKE2B de8af0ef28cb5739188eaf19a7d813b6ab303955ee21fbc4e641dbbb9190a9816b16174db14a1e1d13e801f90d5329e3b52ca736db9c06bf18bc50bde2812ae1 SHA512 d1c290879c18db18103619356d88d18e8f93ae3b2e8e60682a5de2572ca0ac5b5e42217672f0b2a187c4d8cd3844012ad141f9fe01c34158e7f8cc9134332b8d
 DIST rustversion-1.0.17.crate 17621 BLAKE2B 1f077ca6fd90333724d1ea9df7f5b178f37f895b71a7b2814e9ba8618bffcd2307f9cb4ac2eea25d461a6686a4b5b51eebb80f1b1ccc773d4da1948c47fe8abe SHA512 0565cddecaedae17e7cd99bc34f54cda242d4c29cd4269f8e3b178ff91d49f3682e7ffe66e436bbb138299736c8e55cc143fefb74c076911fefcc41ba98064f3
-DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST schannel-0.1.23.crate 41667 BLAKE2B 3f34ecf4cc519f5302f0ab5207907a275c68e6fcbb47630aec4ed5d5f1a1cc7475f6d7a8c22361e9878002f9f54314c1f630ab0c1f77ea309714bdb7ada6c9af SHA512 dfce25e3b8bc09d8dd1fce2783fe02ec83f74697cb24aa212ef9369a628685ba488f821cb3e5f863798e0e59995038c8d748f74b89f7929eb8cfd804d5066b84
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
-DIST security-framework-2.10.0.crate 79723 BLAKE2B 9978af62742c6f58c6720a7a9d76aef3627531a4e5cb2b131584727237ec743eb1e688029c8abfcecdc8280b16e6fc85fb9c6fd93be65621363b0e3945899a83 SHA512 693944670032db795ceb944b187ecd96f094449fc801cc5f8b903a5cf117832a4db97c23dd0ab6d66a61da7ab56b5e9433b5993cbcd0b8dfd88f96e819958a5e
 DIST security-framework-2.11.0.crate 80191 BLAKE2B 23515556ff935e7a19f282f7dcdb28bcc93ff1b14fae069d1e1be35abd5651a38c7c71594eae085c8385e48b25fb84b6f5fbc44636b5d1badb15e89ec6acfcbc SHA512 7a1a1d1b807cfcc0c87b27a13aa0007d5c29560a45f20963cc84fc705385554b969b4062c7f8b15fe793291ab624fb2a5257c05d140c53200c2eb344547652be
-DIST security-framework-sys-2.10.0.crate 18676 BLAKE2B 4c16983b5bad471b18c52e34fb6a2762097bcbb0891c7c8a8423777e01bb27341576114f6ed90aaa80cc3e0ee264b3bbe9335886565f7b2a91e37f0ac3f555e2 SHA512 10c006488bd52bffba72f7aa44cc58e292c186259054aa85f882c3f0198586574a9c722ba80f101710b867148e823596f8d1ead1b6a753e6b50e702f5fcbf904
+DIST security-framework-2.11.1.crate 80188 BLAKE2B 844d36d2b2216cc7055687110d54ea783a7ed9bfe6375fd4dcbea267ec85531e666fe002648110315f42c3364ff5ff5aeba711cf8d1f5358ba65c8393e96f55c SHA512 02786d62fd9dded80bae3942896bc8fea2a90763427f582bf5d9f127ca5682097b59b5dbff2cde373198ba659316ab5906a68d3141ba00c7408b73ebe353fac1
 DIST security-framework-sys-2.11.0.crate 18718 BLAKE2B 4fd8e8eabdc910f656cbed6d6f941992eebc2ebe29c1d85e4ee2de5aee2e4840f2952ffa0b0f9ae88329a2b16d66c3575796f476b873c6bb3c3efcc8d119ab6f SHA512 e3848a45391ebd98026ecafb0777852aa826b465613ef184cc33cdbaa75fb91053d46d417dfda6398339abd3b67788a567562e99b3c509b676b7ee5a4372acd8
-DIST semver-1.0.22.crate 30446 BLAKE2B b77a951d959a3685b0373c80b9991a8567f8926d093b23b7b8fab48595b5d565acf7408fbfc8f4d58331f39e316a8068885d28bcd70c1476d1cda436a2dd88b2 SHA512 7dcf9b6a02650d71d6c9ab3c29e44fdef95af296208f26aa7be6fd6e16773e5e5e66418c303a0589d1165df6dbfd46ad6ebf9eb5b3adab25a51f340947b2d949
+DIST security-framework-sys-2.11.1.crate 18755 BLAKE2B 6e4f8617ab92304a435489492f1126eff2913f5332dacb8b48704b5f051e87893e5f4239ee5d6a8e5c350d14cf5226fe57a36d8119b1e150407e9b157e74232d SHA512 8565d7ca296995c2bba78a328758c84c500e95cbafc988cb595e040ce95d4114c1de46fa30224a310981c3dd2a9b7d1d98c87f129d98a0b2fbc44c72f9085d23
 DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743ad0feca0929bf2409eb81e03637ec5f92ba9f38ea386c4ee5cde72bd3d2042083e2fb0d6fa0b839b1c5093a SHA512 5ea1fa17c08d1280c3a4bc8d28494e88ee05acd5dc969ef6f0c6f91fd3b5a8fbe999c9e8bbd2da383413038b8d29fabf02b87bd5265bbb8333f3fcbe409103ec
-DIST sequoia-cert-store-0.5.1.crate 181298 BLAKE2B 9e1e65481652b1386b6215e170eee4af86950cb7a2923df8660ad436dd993599e82736972bae1d6394c2e5f0800b73ffb4ccb133d72bbae127d3c0035df9011a SHA512 c61935d674c15705add5d709a9610a12ac927edf4439abc617dacf1bee3f324b9a1c084142903232b895731421242c1ee5fb5f8b14d090c697b837f27651f8a3
-DIST sequoia-cert-store-0.5.3.crate 181761 BLAKE2B 498e354e2bb7d6cf2d67c1b361456f31e7fb60bdf7b12c970294b65a5581fd285f03ed744d7eb49b60d974c5b919fac890cfc339eda5053bd61e0e309a0065c8 SHA512 8198243aefb3dc11dc0e44a09079d410cc1a50c1d0cc463ad03379c4b8566631ec713f7e5b963e811fbd7147658bc53d9ef09e9acfb9ff137ff33bf4d94467f2
 DIST sequoia-cert-store-0.6.0.crate 187906 BLAKE2B 1372e9938120997ae2d385849cc11df8ad6a47007e5d42b61d1dfddd504926e40662e874edee24f45d1fb665eb3d72a72060622142bf6280b30efca4a5fd0d65 SHA512 94b1c66acdb2101e20898ffa3428af25b60c3951a8247b63c4f87f71fed4b10f1b6fc88720de4136556a61a0a360dc8828f7e1a0f25f915dfe5c0544a98c496c
-DIST sequoia-chameleon-gnupg-0.10.0-v0.10.0.tar.bz2 966355 BLAKE2B 7f8da27ce170473edc1f89cb255f8aeb2cc2016a3b61d703903c5db37e232cb03da7de7c9b0db531d50c4af897f0ab6c7b6d081ffde1e833e90fedaafe70f684 SHA512 a6750bc507b28e0bdfd81e650a21efae680c9eb414d04b39917632ab1e6e0d4c0e37a763ecc6c6625856bddea4c3775c3e48b39411c65384f6a940ed9886ab34
 DIST sequoia-chameleon-gnupg-0.10.1-v0.10.1.tar.bz2 966710 BLAKE2B 54bb459f578bf9da62e038308e24aee80faa757436e5645e8d548496d73226a6ce50b60e299e3b2602347f0231dc3a7a41ea9b993a79dca00540338ed4dbeee9 SHA512 e1fe78f1697ce85a72f3e913c3dafc3a4211e125c74473d964830c8f92b6f5e8670925aac9143482313029b8b82a413f347a0d77281653646b9e4f0f34cc124f
-DIST sequoia-chameleon-gnupg-0.8.0-v0.8.0.tar.bz2 900139 BLAKE2B ce8dfefcf8dd73ba56aec6534ae06e675b2a373d6602a277ee4d2560ae837e40b97083c478a5a86f294c1006150cc29c2d5f99ab9d9ea5ac8c766fc884b7f850 SHA512 bd74156d89c5a8f678b72238b9f6f6ecacdd9c78893d5ec743feb11a1f3c46118f5b8603168d79b9eb72ec54d949d1bc004160821d6e342e028dd952c3033a58
-DIST sequoia-chameleon-gnupg-0.9.0-v0.9.0.tar.bz2 913143 BLAKE2B 44c46846f8a62dfc5c1bb81b924f4ce959f4e9b19f116dca098c06327ae309968937f9e648ef1ee0625b7aa73c57ff8310d9c6058ebed9a0ce26a9464f702ece SHA512 071625eb98aca4e778ae5a1f5484a929886c891c22d8187d123df72740f620c94743ceab66f6b7612e88f20eb3009d8c3d256924c2a22aa6f7393807bf7331a1
-DIST sequoia-gpg-agent-0.3.1.crate 101496 BLAKE2B 71793d9c105459c11e1dd06a3574548a19b4c68c8cc8a25ab77b5d524a59a72d55689d83c0915dabc230427c46bca44203ec46450ffba1bfaf37013695958fa8 SHA512 45ecf84ed22deb7f8ac6d4ef253721f8e53a5a5131d29a547fb9288158c5433f64aa71233f57a112b8de360ec6e2bf0f9886aeaf8c19ffd0e7f8381c60071b82
-DIST sequoia-gpg-agent-0.4.1.crate 142927 BLAKE2B 76ac5f30370067afd29f4392fb6b84f86e56fef2fc43d921e814b35e97be6d8922d12bdb9cc7c9ac28825061d9e0ca649904e3ccee762ab30bf8f5e3d6a888eb SHA512 081d5dda4b0a97c07bd75645230a162f9f5fca18689b8ab53900807ca848ed53aa94a75a60c0adb5a80e021e9cfbae2a5e6b08866871d34ddcfea92bbc05c958
+DIST sequoia-chameleon-gnupg-0.11.2-v0.11.2.tar.bz2 974784 BLAKE2B ea70b015b63ad10dc28a539269e3414258403149d5aa79d7f1e12717f3704bb52308aa7ef1633dd6e80de380e8291928430fff6524afe3006526449d6c7d302e SHA512 5d1c71fd365e3bc4658e60e0413c32b898e1d29d2d345605e34cb53dd212b8d8b6df559fb43ecfec584c7805682c27777dcac6180eb7df959f911f282c409c9c
 DIST sequoia-gpg-agent-0.4.2.crate 142966 BLAKE2B 7699ed02620c186a58a68a3c2b8d7d8fb7028207a28322b5da3bb0c3407184f99793eac4df7f8c11a33fbe41626b9733ce71a236c30ae4c12dc330c600746cf1 SHA512 2fcfa38c14c9ed3990f05e3db735c094fc8f7a6ad7595e1044fb7f22a198fa21d07e67e361425d16bb15e508f12c0ca353d91445524291b4aa044e889db1192a
-DIST sequoia-ipc-0.34.1.crate 4505028 BLAKE2B c8d6f1a75ecd67bbeaf2b7af8c975dce9a66d18d9fe72dd6d14982edfd61cc00e96d7931d5521031cb2be7e2f9511ffa92d1b4ef0a7b9122555207f5c4225fdc SHA512 75df9b6230df07ff354185c8650382f44dd20d6e05594793872d5f05d828aac77293e05f93142feba5b3c97544d58e2fae075c67a2597bbedd6c0647b7736fa1
 DIST sequoia-ipc-0.35.0.crate 4484979 BLAKE2B 68705ffe74d4b6163730971ccdfb022b7516913247cfdff743f31b04afb26b294e65e894d6d81ca3bf5dbf77f4ff6acd4c66ecba22a70002419afb4a4bec625a SHA512 020f48cdd20a2df79c6c8889d5d60822afc171f1dedd433ced725d124850b75ace5dc9dddee1534b5a7873791a4e0d6c1d3275e9de6cdf7ab4fbf55209357072
 DIST sequoia-net-0.28.0.crate 49672 BLAKE2B e89656e0428bdadb6f9d4fb479c985d5d187dcbade342906610222d85c22d90c60b09ff4eaa3eef62d6650ed06c92b86a3123a001faa358fc775ef0e74d44265 SHA512 1a87d9b078c2b44220882611e8d49c6117906d8cbd81e50301a6b31d7428cef5622223ed234e28558fa83e31c47df84dfed087f1b1962bd42a7d1bc2f0fe9fff
-DIST sequoia-openpgp-1.19.0.crate 2995131 BLAKE2B fd5102136dbe748591576193de1f9b919fadc0da1a96d70ef4cd902fcf15fc226877067a81e06b842ea3582d3acfb6954b6f47034d91f7942aba13a988c03175 SHA512 db3f4016e78c4c917e10364cab2120f2facfc239d1ce5a684307ba95a30cc4260597f6b9bfa5014d423c77a690b88d8ca69493311b77f10447aa94592161a64e
-DIST sequoia-openpgp-1.20.0.crate 3002022 BLAKE2B 7bd2ecdbe2885b749dc3b7f36f58a0092cc2b96409631d5b6da87488476eaa9bc3e71033ce292b04bb17b3b824fb3d163e6f95c470c5fa17b5482b7daadcdfb0 SHA512 692664d80a029395f0d921a4250baf7ae12111f2038f9fa1b98217d4c862b14ea07e36d4f3684d2828c97a8652149c3cb698d8b18f2a74d8927c06e7d74d1130
 DIST sequoia-openpgp-1.21.0.crate 3017472 BLAKE2B 9fb94e3cd2c223a8129776434d1bb8dcdb9ada526bdbc97303497024030341c2ad2a6bee277e940d6af72c1c4ecc251cf96f81f0381a8ebad970468c95258420 SHA512 4ca4df4e7ad0ffec68249df9dedf2b7f7c2585b5f8fab1695ce698d09d6e4d065c125882d3955aacd7e43f0677d0083f4743b933772256324dfa4a55219c5f75
+DIST sequoia-openpgp-1.21.2.crate 3017548 BLAKE2B 86fd51244c808c3fa44e2722c7028bc2746c9ae9db1f6620f6935ae7c1af7ab331b322fd9e8b28dd0119c71aa72dc2a3e2cc144b84112ad465ff2e9cedb7571f SHA512 bc8f0121dcbe083c688d14abfa9dbe3f850aedc02ede98ea4c56f8b8fc28adabcbe1a2ab02cc266e35b28c1f5f563377422e5f8f99ecee0f21eb05a32b94e8a8
 DIST sequoia-policy-config-0.6.0.crate 42529 BLAKE2B b58960a3296d1c3289036a2218e842bb63bfef11968ccae7c42cb61869e04d26fb52736876bcf32d276177c488d0be4d9ff3ed50fbfb0ba68bff3c0410a460cd SHA512 499d350426f80627278310b2eded6a69a7ad833058129ea5ed9ebd0255621ff70f9f04228fc8ca79830e6ec11d14b121bb3e5a6c5fc2721135d725bdf0d886ee
-DIST sequoia-wot-0.11.0.crate 1080482 BLAKE2B 7abdf5b5402d923965c541001f705812ec61b11a46e79cbc55abdb7b1bc62913274a8f294c2b925e6c0420fad9b7709d6d4449678188373d68a1daf12f2be628 SHA512 a200e0008fa3a14311b488d84425fb108a7c31c481a4b1077650755debfdf1061e74f5061dee99bcbec01d2f643733a76e95963f312396def5d8c7cd6c0f39bd
 DIST sequoia-wot-0.12.0.crate 1079750 BLAKE2B 8b42a4f3f0ec99671ba244d8db85c6664a5fd26b03c5a76ac7feab9a7603f6a002a937fcfbeb64aa9fa1bf802f092ded19a5f31729eb70b54113a3f2f4b207a4 SHA512 fb4e99e620cd03549d5b39f9fa4b0054f27ec820b911341fce93f1e2ba02d84b4e949b98c9ce6973c6cf916dc485ed467752f688d4f396ef0bf9c3900583c10a
-DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410
-DIST serde-1.0.200.crate 77611 BLAKE2B 57f4a76cf534ffda009a5441e694b0ac87b30e470c97d77bfd572eb54f039c3cec56f9bf5e035e4b3b257ddb341cb4b7fdb85ca3c4684167220dbb98d1e6a762 SHA512 d4d01d62e7338b147f83bdbe358813e70b7ac218ddbdeab534926d205d46f86e2086f73a01f453c9d4a3bfed07e10d57ebd1f86bdafd4fe96c6298f1e527b8eb
 DIST serde-1.0.203.crate 77935 BLAKE2B 3d3dd4f81f7d74b60483d6759879a9f87c0c7d615aec308bad1bc575fac4e2071dc86551c2789e87331dbf8089e923ae56fff82e6f5a9992cf850121b052ce1d SHA512 a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec
-DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994
-DIST serde_derive-1.0.200.crate 55785 BLAKE2B 45eca5504aff6bd099a42dfc794cf732c7e76e5ed362d16082ac069d29e1e6c22bb3e13dede4bc498df8f008bdba15479de618380f37c9742a34d97c9ca12efe SHA512 e70f0e092d81542a96b33610da8ddbf04023d8ecc1fa4a4f31978699c118f096e8534f9e3e4e479ee74280efb86d752dd1fce038ef2def329fdcc10c1aa50942
+DIST serde-1.0.209.crate 78364 BLAKE2B f6b4c2bd931a8067482ca033211c4e85c0dfd6084cb599c38a9ba666cce30489685a3a6a8a539eb6e41141a52328943dccbfe25dbd857af16665094fdf7c3f45 SHA512 25d2236eedc08fa3b9d078a1971df705c4f428b7a4e6a2d28d9f0f9893c19de745bffffe3fa9f3c08074bf4359aaf09cc28770e4b14c21c66d6a0b9411738f7b
 DIST serde_derive-1.0.203.crate 55867 BLAKE2B 1bc8aa96328bb83e4e4ff527b1df855bbcefd333f0c43c96d1e0b93f98a46273dd88a21653bccc8f517c4fc06d17b9b44332a963d024796e0a2c18a5bfecc824 SHA512 b2aeeab33395ac11ebdbd922fcdbda29f2592e7a20e78aef250713baf269cacf497271be7aa407f657aba33da132df0e035be046fef070f915f234097d1dd392
-DIST serde_json-1.0.115.crate 147100 BLAKE2B baa2dce9d85e331d1308f2ece9dbeff24bcc70e37be3f06c7e819ad9f4eb59fb1f00658736fd336a41a65e3616d1bf75a0c9adb359eb606e1418159a9455132f SHA512 d1a60e20af770fdfe0585853c87c5631e56944a3c1bbdf9e1e91003af8e924a8076335bd37563d167c760aad10d4c08fe59ebd47fc52e461bc3586b835808d22
-DIST serde_json-1.0.116.crate 146790 BLAKE2B 20492ac3c431fd3666599f079383a9d945549e02357127a58acaa7011684ef0caca221a253218402ceff6956ee8a20cc41ca3394b25bb69669be75ab22b66a1e SHA512 d383de754b0a50cc4ab3e6378b758ebd6178ad32ebed80cb4e32a9d8e81d0c689585ee5cd35f12b376e488d25ecfaca659be943c9bb4104b63a1c4f9ded2f337
-DIST serde_json-1.0.117.crate 146921 BLAKE2B fda4f87c300762c24163cceb449bb27fc96b089d5ee869b89f204dbeeec704231cdea7a14bc303cb40b621288fcb1a2b03f50552767e32a73c982d459762624b SHA512 363443af23e8e03dd17c0efc94b376f0d89b596c74d70d0437471e78bc20c6beb61da59404ff150af52000162f6df728ce73475feb828c453e58ea43e66ca056
+DIST serde_derive-1.0.209.crate 56023 BLAKE2B 752bc9f46b880d0ed8a4f7e29ffde1343c63c4be1e9740afb1a28dcbff5bedfe077eb51c7052adecfbdbd9942c30b63a27914deb6401a2ecaf70fef0f64cd80a SHA512 22c4eb76412bd73814d0b86209b110b9e59626f64b41cbc250755144e545ff30fa69972ac93d74f988a3a6a239d9138f4e8a23b283c746a0aa5fcddfbe077cd6
 DIST serde_json-1.0.118.crate 146962 BLAKE2B b85f17cbef0cb9fcc8af5d8d18a74850804de631f8ac94193bdb0ff8c95d4c8507876e4802005e0bc8fc4745d52c79be153d825e106090b680b620acc5b1add4 SHA512 1fa7e01d849684e3ed6f9bd67ba9862f822dcecdcb9110a43182367225f559416f855d59f2b8bd943756957932710b930244963a1f47a3d7d530be19dd412f20
+DIST serde_json-1.0.127.crate 149465 BLAKE2B da5048f70a0b7594be0112efbfccf8d6575a77b324d59321cbd34d355978aadb2ceea1bbcb182412547587235f58873ddd2232822f020e2db85c1599cb0bca8b SHA512 f14f5eeebe07261daded47c3cbb6d511da4633bfcc46ea1b0600063730dd4211a0c310959e4f8731a688d18d60a46f6dc1c1a1f052f170b6207877b93742a88b
 DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
-DIST serde_with-3.7.0.crate 140905 BLAKE2B fa749055ab1b1f271d46f68a169b18c7e670640e937002ee6f59814c4ed7a7dcee13340ec4a4bc116c57224472f919dad85ac64270441987d3cb0110162d6b05 SHA512 a923993d3ebf1543de6f73e264f436849de6d9a292668ca5508e20c1231b78105307f62140d06bd401fa7001d83a46b56a14f3ad95a2360a55e276ec7b94e142
 DIST serde_with-3.8.1.crate 142294 BLAKE2B 92b3692f80b613b8d8d68e69c387a65285a969d5bb8b03d9c65af2e40b77e20be2e504044a0c59ed6de7e36b66dd31eff3686cc0b74199ae146d871b7d6f51e7 SHA512 1db8ea26a292c9c08c9451e946e74904a0a063bde854e22983a6575a6bf1c3cabeb8109dedbe028d6acb2abdb8c26adf4758b2f31c844cab692266e522a899c8
-DIST serde_with_macros-3.7.0.crate 30834 BLAKE2B 2da5db01fbbbc9e3ad94531c4947bab966e7284c3867f1bb2520cfad23f5a7f5dabe58b821ecfd8bd1f89041e57ee388910636479faea2506fad232c5c7aeafe SHA512 43d666624e6216de285aa3ff8435bc01bfacb675544f63922d1113c4d1a37e8556c61d19807558e002aa05888f8a5d19e7ff8b339b50c4b9c54f0a2cdfc4e9b0
+DIST serde_with-3.9.0.crate 145089 BLAKE2B a4d5032d864a996c2d6edf0b1ef4657784ab76b9cc437d86214024f6bd77dd59908efa594f24db4d2dca490f4e072d688681eee9d24f92c8a528d8940e991fc4 SHA512 90ae5faa9bdcc2ce2198599c546a0ee9593fffb3271c3fcc07bef5eb39fe7b44697dabdd6eaf059a166a67dc5694c70ae2908ca3f6fc65e25747cd391e3121b1
 DIST serde_with_macros-3.8.1.crate 30796 BLAKE2B e7fb0a20c839ecea75f52d6ad5841c918f2c01ead7efb5ec5f0dacca23715cb9868ad792c7811f20951429f289ebc5a90ec4c4f833ebeddc5ff484dce7839f1d SHA512 fc1b854729efb24377f830087c21b6d996b19024ed38fca31dd4377f65991189e32db481387143f6fbb4b16eb5e80a89d91e97f40fc1beedd873ee93b01abe7b
+DIST serde_with_macros-3.9.0.crate 30865 BLAKE2B 69c764f45180463047045f81106961f274411200ecec6997baad0c8ed0cc25f7550ceccba122fe3fd8d248e3a3a6bc3326f7f9ea0bd3c08e81b93589b75de537 SHA512 451af6f14cac8ead53b9705c530cb6494063ea8f20d1a7ca80561d16334985b98541bd9c3a50857a4cf377ab5d84593baadd5503676540da8212f9c5fea89e90
 DIST sha1collisiondetection-0.3.4.crate 799321 BLAKE2B 6a36035f19330da30fff69ec304c17ca0d8af74673b43dbf421dd9e67f3e522575e7a6780a2eaca3c4e799304acb40eecd0a3909642f03f18996196b3dde19e3 SHA512 d74b317f272ea600659288af786c656005009b7e2fcf060eafb71df07cb3de2b698e74088217ff99fa911a59e00653835cebe6bbd5457e549c3f9015d8dc8d7a
 DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785
 DIST shellexpand-3.1.0.crate 25591 BLAKE2B ba395d9d98fed37979e97609689f909b264ddb44dae56ae4958da9a0e85aa382a00bbca42530cda2701e934233aa1d44509495235ba0512beb33a827cee5c9f0 SHA512 9b20074425db359cf92f29c52be91a3a58a91e6f3116b210913f24dc31b5371ef9d77fe46e7da39e42eac87fa4ccb8ebf9175d7bd5fe6b520d12b9d3b31cc65e
 DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
-DIST signal-hook-registry-1.4.1.crate 17987 BLAKE2B f1df8bba55c72a506b9210347f9dcac4d158948e73f6d1e60f43340ddfae368aff1bbb6a109af326af47246d9738d49f76d380c52208efc3c6f79ea0acd31f0b SHA512 e83acec2b0083967555f6c659dfaacc32d851a9485c9f6f4b4cf257742ae3ffba8c14708c75f1a5520e9d132ea9e21d6eb65aba492eec481e8492af8b798c5d1
 DIST signal-hook-registry-1.4.2.crate 18064 BLAKE2B 7274d4c115678eae2640a709bf9d682ce867c1f6295a0c5f49e492f95dd1c457f20b56207a74221df1fd9d744b24c6260e28f705777e3c7d47b7bdd36f1d57fb SHA512 16362d232b1d301007c069198d7716848aa73d898ef92e050422b36c09001b4334390dc95a6650e5315377fd8960d4336e5ae869b0a305e8525e977b8327c508
 DIST signature-2.2.0.crate 15531 BLAKE2B c584d9ad52a1ab3cdc129c36cb2ed6dedc40a8d49f7294352a7df8121dc57de78268f15d9ff9ce076abf1dd3c56773daa26ed5ec39c83a600b6a377b51d4db37 SHA512 673a8f6229c795cc8f640fbfe02cd912b41c6359ca23c5ddeb1679f49784b84f109c6c45e6210201c9ca05e441c1be64ce6537e81ccd3589b37be6d0bf50dca7
 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.6.crate 55270 BLAKE2B 10eb32486b9a2908e05ab24620ad7a79243e59c2c2db5a7793f87f32765745b21746423d5b3896ef37d3dc9e76410fba97826cc64cafb7dd45adb485900c2282 SHA512 10f14ce7bcb9fabac56f98bd34ccd6368dcf4ca245ba2df80fe0f1157e177056eeffc6fcfb1d1fea6e89c0eaafb99d8056fbd10101031d3ccabb98950ec563dc
 DIST socket2-0.5.7.crate 55758 BLAKE2B 148d2e2b6610895ec555b1357b340576984eb76cb3ea719f85af50cc4215b2ea2db739e2a61434c09360a0c1ff8e05911764e18dc4a59451c0aeb0eb60b8403f SHA512 ca37157bfa970cf3cee8b45c7fe64930becf2ffbbc309ea4613be968400279b70edd084d159f65b76fe1130917312d81455023c0d7c1bab7a59c79542aef9dcd
-DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee
 DIST spki-0.7.3.crate 16409 BLAKE2B 6b39144e4e718ce5eb454e21ee89fb936ffd31ec99554b0150fee47bca396bdfe4ef39603ec029d4af4d8c4c3ba2de7f6c549244f8c20114de9b43ff14921681 SHA512 d33a6a7844b33c37628024ccf25c1a631f7a6661595e063049b8c9a9b4edb28f0335397faefc592c6fc5e96378b870ab5dab9b0649c3387577b2370ec8210db9
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
 DIST stfu8-0.2.7.crate 42753 BLAKE2B 0fd14038b094f0351fc80d9de4b8d5f83b047577d0c59af549e7ba5c980f4e7db71b8368dfa29d877c8d834dcb59a752e2234c502914900a97d4a0bf796c83ec SHA512 5584cd8b16b78e6131a6f4f6601fcfafc737bcf614855595e5a2253b20c031045dd48fa5fddc124538f27c031b879be7d71918f588edc273dd52fdece70e3e59
 DIST streaming-stats-0.1.29.crate 8816 BLAKE2B bc73050da55ebd0208d3d3a9c48c98a7ad2aca46f3feb3996f29f3ae76ca0302211f185a66f797d40271d4ad7d960eb60be7ea4fd8d9d95dd59a834e447d56e6 SHA512 84d4c1ca803740e41f8c3b60939f9f78de3ee99fa53316afd636713790207cd9f5c2fd5053106f615d4fc8db0fac050c0fa911e55421c99270e4d948ba2bbd42
 DIST string_cache-0.8.7.crate 16655 BLAKE2B 9a017f3248a3d5e7b8c1a05462a882862b20174c7ce5dda1568c3d3f61c422e84ba2ccd5d6dbd726d1c752f1eaa8062a179470927a80d5bdda0ce530d1ae2c17 SHA512 03f9cdd2c01c0f233284851f17eaefebd68a91ae2ed2b231fab2d6d6476bd19e0696d7d3a74fb6ecb2ec36b89e79ad966ab73051255c9e194bcf9c5029fb8479
-DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c
-DIST subtle-2.5.0.crate 13909 BLAKE2B 660c3a472ca54c9843ce3feea74b802e27fd7f62dd37a30e2a4ba82e4b3a71df63562e8865d5fc675d31d0900998a8730503f91a61450884446a3bdd6af0041b SHA512 f150b1e2037554f8cd3213a54ddbc258f8f670cc4f39e7084cdea4b47538dbc58b834bc93b443d58a4b9087224efc003234042aaf366687dbd32b1e7174082a0
 DIST subtle-2.6.1.crate 14562 BLAKE2B 3cf4940b7a01f04715da1057f6a92b1043a6b86ab2ee7f9fee0337b680ff781201d330409460f6f90b3f81bb5fd4b563e17c762c6e824ba3b0af99e4ae7d66bd SHA512 f5946ebd9bcb8776ee3446abcbf4afb3cca5d8bd847cadda87e864333ac7ded537a3efa773e9648adf20ce4add2c1da85172cff88c1e1a3a6cb051401b00c6bd
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
-DIST syn-2.0.58.crate 254920 BLAKE2B 64c3e09adea47f5a5f332416e75ba9e86d1d20e208f859940b80986884b3456130a842685e9002416803d0f8a2b8d61e6d2ec518929c8ebee09a1142d9d77b15 SHA512 168196da11cd854e5dc7e37bfb50b229ecc3a73f7992f36be431dca85a7a1b4ee61b60471be9f6303fd29de6747190701cc475c4b2830fe31f678f102e54d387
-DIST syn-2.0.61.crate 257199 BLAKE2B d2133732d9a7f16c47729be1b4c18c05ffdcb9cb1395ca9b8e0ee68098c746e92b82b7fe02d33b70985a04c943b38895996da115489c712011f7cfb4820d4f1e SHA512 368f5b5eff3988f6408be59ed4861397d532f6b0225abaac8befb458e87d4f48a92977d986b1a994bb7fc80d9ab455529bcbe5e2ec4e16d0e4810a1e66bd3042
-DIST syn-2.0.66.crate 264855 BLAKE2B 5029091b2cfa88e5c739be913a647dc9492696398c09b891f84089350e6f09baafd9935b81e0f3519d5465eff2e1822ef6cdc96c15d6a40d1b6b8dd2f9e7d073 SHA512 60a617bfd37d74c52e4d4d63ef0a27a2f9b982469a6926922f2f6e96754a0c66affb0847b9a44d505c053cbd788b97e998efb8d1e558ea00ae4a0b7f15bed9b0
 DIST syn-2.0.68.crate 265035 BLAKE2B 8bc6f68ed286bea617a2cfaf3949bb699d3a0466faeca735314a51596ce950e4ee57eda88154bd562c1728cfaff4cdb5bc1ba701b9d47a9c50d4c4f011bee975 SHA512 7b781f8ea2b0d01c06f47d165da99cd96e3b44a33de1d77c78a2cb37ebe3f8304f426ba3d0d1cf766241dcc0537908774504df7d455d63bf89ec22ac0499d372
+DIST syn-2.0.76.crate 268798 BLAKE2B 5446965c6331fbb445a313ca8da9d8e7454e31d9a36c2f595747edc65c0d2a05e9d8e4e9fb6dbb30da8264c7db36b1cea14110201bb06e40bca69b25c3f79f1c SHA512 c633b9f68e67b3cbf2432d3648e42f8d92403877a0128becd22cb108c0cfab9f1bc6b941b9cde225d8b727890e9f86457fad05b544fd07be4c01c2e60a2cdeaa
 DIST sync_wrapper-0.1.2.crate 6933 BLAKE2B 0ec797ddead298a95bde0a508ae942a4e90943948d3c1e4833fb3ad1cefd3566b7fd1aa0b133d614839707e3f416e3e739099ac73441527213da81b6d1c47d50 SHA512 ca7cd7a6dd242fa420e8dba820117d85b1b11ea6a9fd99c92a5a260f12263cac0c034c9f9fe10090d5830fb5bf5eefc8a5a0d0b5a40f3f809d69e5393693d5c8
 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 tar-0.4.40.crate 51844 BLAKE2B b51c771611c2c1bc6a36d25493dd775bcb5891a2e4a8ae918781abe66c0335a3da30c5e44281fa5282dace34c09754fd2df840c0d74e5b0b4624a519fd455a8b SHA512 90bde0dfca91b6c304d5bcd4c93c653c066b76592927f5ed3025752d6d0244c0d5786c44af99df94dd6cc7a417663205d86f406a3b60f7307ca3c1757239bc12
 DIST tar-0.4.41.crate 51871 BLAKE2B 7b24e1d923089cff48e7f5be141838f5a3db78477ba58304b7a076d5d2eb31525f307d674546e0023e78836f992566646724870eee556db50e96d5a0c851cbcb SHA512 547d4a10cca5b593a04e3775bfc175a3a4de27f3c4dede305c6d50b63b4eb38152c6f06280098f14c4fadcca4cc9aa98626ea50aebe9bab2cb7b7f4e0c4d2b92
 DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
+DIST tempfile-3.12.0.crate 34423 BLAKE2B a8b84f54a54be636f5b69791ca567e8b692d6a8485ef37e5a8340d26b32b1b0f9f8e9fcd9a2da90ec2fbd39c281d364dfc5723d06892832edb79ea5cf45d069c SHA512 1a27513548060984be894e6f8fc215831e4b2054b2244c6188bee76c477c001f294c762f2f4a14488c58c04e5d1473806d589c7bba1eaa2cc02d97656709be66
 DIST term-0.7.0.crate 37082 BLAKE2B cb7947c696f71fc68bab3b25cc6cbde74b92380fdde5447399b06de99534b0cb2160963792824ac74a350444ce41a4fa16d6a9792a68d84578a15ab37ab76ca2 SHA512 9de6e836f1fd205b3b58645ec880eaabfc0fd8991e3980ef90bc6184b370a14676edb688a2a75bce412dd8ebd97345aef742afe5b964250e2b6f84e6b15b486a
-DIST thiserror-1.0.58.crate 21025 BLAKE2B 2915ed6ab691fe94e97a834ce5874d37a388c3240499889cff633ee6c67d46a2ca88098ba40c225ca0e2e3c1ac7bdcfafcfde3dcefc50867e299dc49505d6fc0 SHA512 3cba2d1f4965bc56bac8fc70540d8cd442ab6b8c7d25d328bde7f4cc108535d83c75f293316d730bbd86eb247400b6e35107d610c7caf47f43a28b1f52fed578
-DIST thiserror-1.0.60.crate 21247 BLAKE2B 433d54b0938451a4458da709576f78e957d243bd7a27619f070c05f395fa6717566fa3d40be61f85e3b95edb11391107b11be3945bc6ee8a70bb9f55c17f08e3 SHA512 4fbd8770fed56da490436a018d5bcc00075493e9772b8249e72bb7213262766574b83743469fabc602d417ca0a787ee43f539dd9f08d87e9ec73c6c65768381f
 DIST thiserror-1.0.61.crate 21264 BLAKE2B 97337830507c009dbb4cad84cdfc02bc097b9d39d0af2fdecfaa63f0c12229e60727244fa4e44c2d54daee67bf8b4e8492d94a5de55d1a90b8eeab8c0d082e80 SHA512 9c08b868eaa47178ee60733aaeeda60dc46d58d2b9c15985ba3dcae4923e8edf02b97556df52f508753b0ff52782f6ca3227e9ef6343066e5d5d3a89e03f3f15
-DIST thiserror-impl-1.0.58.crate 15645 BLAKE2B 9c6f643a582666ee4eb43330340888e7141f0dd89d927e3345268c3eaca02fa42b018514ef38b3db3ff9722b25ebdd43c36b11ecfc7bcb36950ce2c204ff78e1 SHA512 9bbc623f54c71595e48b33bdb3e4f12eb2e48074b15ebe400d6faab43410b363e5af94df071aaa324c59dc6958173e3c301fd51b216969f095e19cb98a27292b
-DIST thiserror-impl-1.0.60.crate 15787 BLAKE2B e83014f3cfed1e0c54d7854787a6bcc5a099af33fd14431831e607884f1658339e5e1f9d666d6d92d362a285337ac5f170c71bbdece96a343bd80007e73009d4 SHA512 607356d744e1becf7b7070878b8738d853978d28ef4a589bae739f1c3cebde90e8d70e7ec79d67588f6d024784a0fe91c21658befbfeeb71d33f5eaea9416325
+DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
 DIST thiserror-impl-1.0.61.crate 15786 BLAKE2B d63773424aa047c6eed8a6c9bcc8dfcee9841a2d4fdf6fc2c117695c09359371931722198b2e0b2bae32b0c54b6275f964e679b78b8bef1c365ca33aa41562c9 SHA512 b43bd2ba6b751b777e2fc78aac92a3e662a1876f704625c4e894019fc68a6b7628b9c3b7ddfbd2cb15fe6fdc0ff679ff94b0c47e2660a40919000ad2fe1cfeec
-DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116
+DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102
 DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
 DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
-DIST time-macros-0.2.17.crate 24443 BLAKE2B 5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14 SHA512 c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c
 DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
 DIST tiny-keccak-2.0.2.crate 20129 BLAKE2B 105a2d2af36cc053cd95721ea563108f33b8a3feb2ae84c75a04a65ed5d548dfe35d8b2e48977a82f725c0ebcf914f21157c547f4a74bb4d98c2e894385139be SHA512 c0219f23361eb07e0a68575c461a36b7286d9bdebae89080d9e259178d402b0c7762ccf33e65a16951ea168392322c44a24eb55189cf143e22d09d6dfc4acec1
 DIST tinystr-0.7.6.crate 16971 BLAKE2B 33a248261c4cded41a81f0d6e6c8df55437f042b37f235c39787986ec562f0dbff50b282ad0f1483daaf49c4b33e6618e139a6677d1238c21f4e12082562b4ae SHA512 a33051848de248cac0a2d151760a78cb3aa62c787d84ff7aac38b11c0660e9188e4d43d43a77fb8676e49ac6102015e9c3db057848d809e71981851875d0fb25
-DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec-1.6.1.crate 46657 BLAKE2B 0579dd18a6ad47d995200535950ce0c2a0f63ac081ff5c54a5be5e6a9d5f0545266a2e44b09b847e2fbe88e374a9467ddcf7fcea6ad404e443c387d343eac3e9 SHA512 fc00617fe56c438ed417b9c18fb2525e624b6b6effd1b729da9b8f144b36cd02dbcefbbb6fd423c30b1f19309d42117a1eaab99deb0a46b2a474c2cdc02c1695
+DIST tinyvec-1.8.0.crate 46796 BLAKE2B 720d0e6d881855a36779e12f5ffa708d3a8b96e6d0de9056cb33c9b8ce0d408f99b22f5b2bb9d64bee72a011fef846dbebbea2ccd238d7b951eb5ef0c4866e05 SHA512 b7b32e38229645965900f80f298685f13e6d13e58cfd6945409a6643ca9c9adc2621456956d5998ab9dd91c2db4ae79638b156ca0d9c7c5505023fd9b28414df
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST to_method-1.1.0.crate 4738 BLAKE2B 3648a6da105b96ed442f0d9c0ad279c60667b77590e861292357effc433108a734ddc0fa756e662887fc9114ed00978e1cab5b4cea8fc7f3b1a363df58cb61b2 SHA512 a5fba8d041f1862460fad430361ada6e622bf0879e4e7fb39d1d1d0aa286426e5de0a48f97c5019b4cc6bd8a04b7e58b3a5a42eb37ecca43e8f224995902c376
-DIST tokio-1.37.0.crate 764297 BLAKE2B 725f3b62c52ae962623df84c690db7c54438581b8d2108dda76f05bfabdf1688f2de8b4fed2ab0db5c04c7659af8d95a7e19702654a12fd498d85a1d030c7a45 SHA512 fc3c070ed0c09e57205b76618a93b8b00f4d74c2ad89df3295254ec2a984f4fdfa9ed5472ff935e1644e89cf2abc44354742603c0e006f14861deab2b873cd85
 DIST tokio-1.38.0.crate 774094 BLAKE2B c7d85234ed0de32526246d2ecb52b70b1c4b81681c6b26aeec256090b4aafb41a9173dbe754a5716baecf2c45d9e3cc02fa375fbb343da09e728890b0194b9ff SHA512 4bc16fe979f2261cb17f007ce8ebb05b915be79c1000c5c429744cab01755b933908aadba0005c84faba6bf5d486ae6e3aae6c8f9bf0d6a5dc0ab6d0390ebae9
-DIST tokio-macros-2.2.0.crate 11520 BLAKE2B b688669f8bcb44967fe0d3db51fc5d5f86da3cd0c7eb7b5803feb250ea3444d134ecc7f79345f0b947cd3479a46659f3a158a04e0edaaa52deb8d343deac4761 SHA512 7e33fa62e0cf4b829638553a51f849242788d217264437444b3bf478fb40be26800d5cfd954b1bcdca1e5191b3c6c60879050f0f7e707461f7b090ae5025e0c6
+DIST tokio-1.39.3.crate 782858 BLAKE2B f7612d99dd400d6bf28a7da8fd392bcfcc99b84c1c97bea9282cde86e655c48e9c5257271157e6d463af2ca8a479753fafab005531451e550d3c3c45d0a9c693 SHA512 cd3c4ec1a3a7ffb9a7c9b0e320d7b9dba3258fa0feebc0ab38b50ee2a34314632c4f62347089197e23eed7c76700bd12a73f9caba56dea51077ad1de56063567
 DIST tokio-macros-2.3.0.crate 11753 BLAKE2B 53429417a6fe3bc6c320ac5e321ffb2b19a64236a8a499fbb10b501d875e9d266fca2d82364a8aabdfecab46e4aef1b48d3b8ab3ac20086b54834c3e2f0f1b98 SHA512 cdb2f13141895035b76d38137dfd0e6829a5f8a617d0b63ec53ff51723c69e301d49f19c4b8b7e86c6e6a2cf58c1aeb35d071193029005fdfb9127f5a12841ae
+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-socks-0.5.1.crate 16137 BLAKE2B 195c302b357369aabc9759709eed3369bce26d423d4349ee8c85e06dce8f985062e19e52f338d65fba76844bb56b1b36c4d501ef4079fc001aabd0be38dd783d SHA512 dc0ea053d11935646df436d19a653d18c7a495af1dd8dd0c02696dceabfa5b6e91f370072dae426848915f91c95f7c37a1f3835256e3e23b144b9380210fca2d
-DIST tokio-util-0.7.10.crate 110508 BLAKE2B 073b25e1484d54911bc15fc2a4b3fb7658f24f7f77a2382f9f84c5122871cf8c5d6097d5c784cd75b17a79aa63eca80644ff54bb496b52e53bb89650ce35cab0 SHA512 d77db36cfa5a2ace3090874d8996b9e94058ac31648308da8dd92a7bdc9b9b61adb703dbd2131adfef0b428cd61b4de76fbdb674f718e89b297f762af11ec50c
+DIST tokio-socks-0.5.2.crate 22102 BLAKE2B e090d5bf4cba7962f135728bec9b6c2745fa500c1876239ef4e5f88562b59600bd94cb5375a1c65ed923f0f11a0ee08d374dcdaa77e68d848b1b6c81612aa603 SHA512 ee0704ae63ccf65715bed2bb1b27f92042016e2cf4ea7c2dbb3799e60d068ab9a541ab3bf1a55523d8391351430b54c93829cb54f7290f47ee949e826c98342f
 DIST tokio-util-0.7.11.crate 113421 BLAKE2B 2bb1c64e4698b99a149ac3db137d9f80a691199397f98f1e6fbba14f411e849859d061e7052cd3955f000b31d97d594a4bab7928fcbfefcc9723980d3a1c80f5 SHA512 09956fc3eac8587f48cc739370883b96d19eb3de19293d240396b64b187178adc081248a5ed3d15accf97c27f9aabd0e6a1e3e2a194f330a0efcbebcd5055360
 DIST toml-0.5.11.crate 54910 BLAKE2B 9ecd5103b33ab47d4be23c897c7095ca381cb79bedcaac4918cddc36fc7cf5d34ab664da52c2273d935f04486e9325241d6b66785d50aac78453c219aab49e1e SHA512 eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317
-DIST toml_datetime-0.6.5.crate 10910 BLAKE2B 93a21ab2784e96ee2e6b56c7b4f733f6ac4c68c1e7d7dac3fbd8aceedb3580e25b4a9c7d9c3f9b5ed152560353b3e80906e37824956dc4ea90bc6f039768f6cb SHA512 502bdedbcbd2ac9fbaa5f4b51f2e409af185f3633f01f8845de5e3b007f2400215ddeb82ac588bc915ed5a5f9d7251ccf93fe2a57cd40fca2927f4c0966357e6
 DIST toml_datetime-0.6.6.crate 11698 BLAKE2B 8db35da8a3f6fec053bc82995f4abeb8d2855f2e94ed6ef4a4a6f47e956ea2cb6f8d0edd5c1b1cdebf83c7c218d9f2d80f48346e62fa7985532cba925891edd5 SHA512 710182bcca90f0d830423df41ff0f8e7bd10b866fd7ea1f6d37a315c7b4732a3b6fd61cf411b28051959034534010f24e250e10282c4e5a2539c2858f447aca0
+DIST toml_datetime-0.6.8.crate 12028 BLAKE2B 62113366771f22b437b2ed0d3bb2489ae9078cb589cfad2ad2e92c81ddbda48f689e5a573366eea4f54c2b3cbc6b37eaa8b442b6d935b631a992de4917268757 SHA512 d38b98db3b2d4eebd3001d88e2135b6fdbae63b200f7e900c6bb9c121dd3f170e557332bd26f237312c1cbef61666716b0cf550c2d730f86fa7cd9eb5f64a16f
 DIST toml_edit-0.21.1.crate 101661 BLAKE2B e794b6121ba7e2b1b3f50966cd40eebacee6968b6b28986cfe4cb7312b51ffff19f74826910d8e4ce307f74940f11e71e6afdd768ac196427bddf44595bbc797 SHA512 10cd3b16f763f55294923ce8f166f96fbd67a0acc4a93a46fb3044d8a38148097c592ebb405ced87030d35154abfcc971eacf0172b624ab477a11e616efbaa07
+DIST toml_edit-0.22.20.crate 106726 BLAKE2B c545e7460ffcff1404dcb77e577121f6ef332645cc0566b2e23af72743cd40e571a74660e8034ddfe75c4ae5b0bac8d9cf2915e8c62c283eb977ed3a43449410 SHA512 f1514cb1c89fd0d89bcf13a448cd8f0a0a31e05b9c483d9167e6890d70594175dab570c267cbc6596382c2300299c8d1677a5a331bc407e80832da5b7a580294
 DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005
+DIST tower-service-0.3.3.crate 6950 BLAKE2B 32ca66bff783eeb015af982b539acb63c9d426b931832b27aa45088382712df3894132a9e6e96fe1ed9d0f9e582b7a25b33e0ab73711acb06b4e134e69158452 SHA512 770cbca46d8500ff36fe84a9a420beb84a0e893dbeaccdd93a3970e746c893b5d32580182ef3017662f421e4b2d71f079ed2cf1727dcd5fc3443a4484f9b43fd
 DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275
 DIST tracing-attributes-0.1.27.crate 32241 BLAKE2B a20af0f50a90dcd64e5318e55779142da294ba18d1cd40059a8aa964fd3c92834e03ee563e41caaeef71a30e3f027e5c8d167d90e2844da79e0774b267e179b4 SHA512 7dc59f4234c3bf3434fb352baed2b81db4e931eeb3ed207c4a204e480da734be40847b167b808058d2807b5583815625bcd5153e2bbe79804cfa6f069a74ffa0
 DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521
@@ -453,77 +391,87 @@ DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c8782321b1bbbee724db1e4d8c1d43af4e6bd8044b99307c227d93631d178d10fda445a941a485882ae0015a6e3d3c347e4bd465bbe1d9 SHA512 539f04010810d73fde7b0ab314faf813f3e7ecd2e51d7975281554b7cba4a8706e2b5523c4b7840568593652360ca59e9db0e1ce342e71c28db635ff55ffb0f5
 DIST unicode-xid-0.2.4.crate 15352 BLAKE2B 80c327b39f3b8f2cdb5747cde968cfa1efe7b65b6bee9136adc881fa19f66aa5b1010d9d08de55a61b322d665b5b0cb0395e9ac471f6333c40d8dca5d97e123c SHA512 e67bd1258e1961807d9d5fe583a89ab5b82b2a529ecd32cadfc79aa5331380eb4a2db9fd96b74c8eace47f2f29021587d69bcdbf79f7e2650e92a25f7839d03c
+DIST unicode-xid-0.2.5.crate 15530 BLAKE2B 99dc8a0f9727c86fe3ec1ee119487ba4cae579d009720556ed598b58c0ec593f32b4f7459df81d4e4d06db351d368d2c565af7b03e15d4e5c984fd50f133cbe4 SHA512 ad8a23407aaf16eae14a44de201c4a0152bb07584bd36a5c460fb744859978cae131424c32033be4ebacc9f9a1dcd611f9ff4a98b84f560109d0c313585ce5ce
 DIST universal-hash-0.5.1.crate 9146 BLAKE2B 9095f95faa8ed4128c3787226f3899acec4278d36799ae30a7ca71ade7179c274a1807f62605e687e60ee97e6bebfe818100ed0441db455bdee0f8e5dd451809 SHA512 83b3ddb1f0d7ff621ca2b3d426c2e682d8339a2adedbbbb3a4584977e2e996549d665578729bff65b5693059460e9e04b9df2181c404980d3b3d946c80e0b589
-DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3
-DIST url-2.5.1.crate 79677 BLAKE2B 02667b78e1ca11e38f4d76689a1a07bcdb2ee28c4705f6dce558e0686db7a764e5f3f1c3f77b3850647b59ad4278651f089d8a1a340a2fe2fd72b084d4bfc5cb SHA512 1ba5cd14166517a5114feee1f7d2ae7c1d2763a34c0e331171f9cc07fc35bcadbb0c87318533fd07b4c01e052abd88ac417fad7f898abe62126919e3f02c0528
 DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d9183478cf501c26fb5f22d7704ef1313ba6d355e849cbf8ab7980310c1aae85e253a2b28d59099e23af29 SHA512 2515903e41c0659cb226f9bb049ef80f2a49d1b609b6ac480e570a84e899088ffe3be4fb58f41a1fa7f5288eb5f97ab513f331aeb6d56979df783d48e2ace28a
 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 vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
+DIST version_check-0.9.5.crate 15554 BLAKE2B 131e75cc287518831e142430e2a39b48e4275874f4473780d47a27552294097aa1cddb65c385583e1022478f940b495eb43c24a8b1617b8ac5a24af3340c0d72 SHA512 d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db
 DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf3ab82536295019268b3125084da5dbcad818070bfdcb6a5de08da4eb483475bc225a829f58a1e3e040b5fba SHA512 da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad
 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-0.2.93.crate 43769 BLAKE2B e1abf981a042ebbc5c506975d5c2258942278fc000ac62aafe4221725fc52003c4032dc04a396e8fc8ec6712155e056ea9381a72070ee7c45b348ce470f52c7c SHA512 0c0a63b04b02b57fca78d2c0b885ea752ef1e8e4317c27dc84fd35843c9c396ae20557a1321c03a405b050f21895e6f25e95ddb56f3a3e8cec13928858ae8422
 DIST wasm-bindgen-backend-0.2.92.crate 28348 BLAKE2B 425497aa7a023b70549c55d5a15dfed80877c5503863b186c0a9d11b29551c4606c1cd5961c7dfdeee2eab5662952ad7ad215513e93abe727a33f84b30bd181e SHA512 22e4f5848d62bd1fd55f4f054ea1293e223b3cd6f916bde2523eec10388e733623492c3a3246d61831e696dffdec5d000b95e9aa1217be6e38dd6459872166aa
+DIST wasm-bindgen-backend-0.2.93.crate 30344 BLAKE2B d0b9f0cd0e6191dc3f57869023450952f2d73c0432fd4516522df5f63090de021f44f11ce7676fd2f87b31f6b236eb155b22b36eb80c3ccf3880f55ca23d4b0b SHA512 c67dad5fa26f78b233612cb6ebd44f48edd84253e46a2f5094e95da935185cf2a7be14d49247e8b8cd1d916721ed82ea44046080a40b2fe37ad88175a5f96597
 DIST wasm-bindgen-futures-0.4.42.crate 15380 BLAKE2B a20ba9f2bc814d7aac031f1cbaec90289f63893b76c60b536a65af85379771e102d6c3d949a8528328587ac776d7a3b684c12a217f9e186bf10046a1fcb34652 SHA512 0a77203499381b6bc4e9258480d7ef499d9c26b195baf38d0b7b228872f844d24c827cd57c8e2b0176927fd5957428084f53fe80cf60b35b7ba02d02b27a4682
+DIST wasm-bindgen-futures-0.4.43.crate 14207 BLAKE2B b7337c1863af9975ef4a10ef64b129cb7b579fa83849ffb8406637c10bd86da4db0709d1af4161c787de986c98acfb9c6b382a4871f53298e0db30cf2c482eb8 SHA512 2499b47329c3dec1d15666eb7307fabaca086881a46e1a53ff2a551df1122eb2b74b18ea1e7620152a35407ad49a93223332e20ac042295799e55f156b7061de
 DIST wasm-bindgen-macro-0.2.92.crate 13835 BLAKE2B 1f2202fdaeb78c32813eaf08b2fbd7aa9c469228386df71b8ffd81a46374e39a7104b79991f702505f9b7e97957fda8574517fbb03e3f9e93098c4d6e1e46be3 SHA512 78d2ddac88a9ca3ca5eef8a7af81cdf2366187a67d844e69f65f6893d1949f9723ab5f2be762c2217a5c21aee2f3dbc2d5d55ef0c9cbf0dec0d52d67a6ba7462
+DIST wasm-bindgen-macro-0.2.93.crate 6822 BLAKE2B 3704c01b90ae900032e455a265b614d1057a7ed7b7eef1ebfdce75a7b0f0b97083211db562d1602160cf9e70843a1949be836465398787315d66ccf85fbe0801 SHA512 8b1a690bf4fc344728bae21a11c8ce4641d81b02e215d88a489f8155433d8e579ed367c96bc19a345b561f2ddb42afa44056b71e15dc935a4fe38fd7f937a632
 DIST wasm-bindgen-macro-support-0.2.92.crate 20092 BLAKE2B 8e274a4053e7afc680740e811c3941478caf5342e2206e3d28cdea9f9514bedbfa4f2b6bc608817306a1c455dd7134b7e17f0f04499f6bfb5302f29b041ac7ae SHA512 92543d2aad0b25798ec20e68832b823610c2c01401088cd9cac1684a86ddd1b567b3e2712acb862060f9c645a0df509b01d9834fd3e13cdaab97960f66d8daa7
+DIST wasm-bindgen-macro-support-0.2.93.crate 20642 BLAKE2B 3fef9d35c09e97317e8531f11c3cfcafc5cb58126ab7a96374cd5e2e3f8736ef016b4c0b3b16bcdc0bef686e9f07439f263c54dc980649e9963b12d0a6814ddc SHA512 9fe590636e229184a944acbb8472c03db0a48a9094cd9ee204c09cee6c5241194a9757f06b09e7c30ba9db1a2feca616cd1e7dc0e52c7f1c1560c50c9d3adbb8
 DIST wasm-bindgen-shared-0.2.92.crate 7263 BLAKE2B e54895486b9a31cc4651b7bb042059cc84421708346c06a9764315ebd4f440a1077520c7d325d6889a690b2c06aa185d40cede2dc4d061b363594cbde20fac31 SHA512 70e3a22731ed8aec428433bf30500eb3f62e3b7f4f1be34d8bb3b6f34f99690fc85d49eb413caecab807064494cfec64242c6a42709dffd638046e370bf86e07
+DIST wasm-bindgen-shared-0.2.93.crate 7527 BLAKE2B a2df995ba72d83beb3f347909c004d9693ee06cec62de248a1f96b0244c05dd8b62d46356f1b7eb0a29122517bc23270eb4eaf045e6cdbb7122089dc84829d9f SHA512 4e9271a746d3b3ea44bae472b7d9722edbcf262fdec2e03c18788d95b923c71c26f309e316ad3c621d5773311d6b1d5ad468cd7bdff015d162193b6effaf8420
 DIST web-sys-0.3.69.crate 728877 BLAKE2B 9f1678cbddb15f5a37331216a43785c72896f87e8ce62c6b9e69007316ca6eeaa7edbb33b9f2d9bf96c98de2a1e10afe491d8734657b186e2c3905ad1ff19ad9 SHA512 78b79ceb6a47485c766ad660bb8b971ba549424542a020c35c7db64a19f7b161617e464eaea0602f433b6ac4973b8d1a86a56e76dcda179ccea60aef1245347b
+DIST web-sys-0.3.70.crate 615438 BLAKE2B cbc8b7ec572a3df1b42d603efb3af1914621957a79f0217e75b6eaa192db6dcf2de9782e130ebc364f704e624913a13cf9dbbe816087db340bcff4a4021b7526 SHA512 337a12d7eaf2a643a7a49a026bccebde73fbef44f729daa6feb71c228d7d8ef72155f9f501b7ef9ea5c22a619b8a8591487841a67a1e12a6d1105d92f3cc708b
 DIST widestring-1.1.0.crate 85046 BLAKE2B 591f8ba6c3c45721d342fd4668805c19915d500b2b46b8e1e75a485ebc772db187acec791205415e5cbf288ee70299a5813a3185d933443d426eb61d7fc6003f SHA512 a4feb959e19d5238e89b0973f040b26849f896e7e9fd567d0e74fbb4972958a4dd76e74de5ea8d407b74cff28f20f9c80446488da6abdbee38aa87a94d683435
 DIST win-crypto-ng-0.5.1.crate 44667 BLAKE2B 112a40af7aaa7d3e1c6d6eba99f3eafc7173a10f149e122eb5c658619f6898add8086ab8523695b8433bed89952d70a63e6f445b39ad4e9bd64ed98931002817 SHA512 735d245c56928db70dd4ca0b95dbd8be9f3b55dcd88961549dd51cf8e671eaa3a203b76a1e2ba073ed8b0042f9aea08fdff505f7efe19d8b2153589f9e811692
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9
 DIST winapi-util-0.1.8.crate 12416 BLAKE2B 5b48c27dfbb5db5c332f7e248138327b35ceec0909788b940168e7f6fe1402800da5e7690b2b1654da6c510b5c720330a92da16dff53ef15821f37fef6f335e3 SHA512 e186111398f9f0f0686e791ad0d72c39205e5f246b6e020df413e477ee07f32e91d09405c61dc92752f061f54fd7533435545c1a151477b40e2d68acc94a57fd
+DIST winapi-util-0.1.9.crate 12464 BLAKE2B 7fb9dd803fc2608c4e5bc75674472992d82da364f24c22072d5624d6ae6abc44abd3e3ea3c45a7558e045331f3d87572b306b4ab5de52c07ff3706e7f13c2a38 SHA512 c46b893f67ec6e36499b00736bb6b9421e0e2611e76784afa6da01d7ebd033df82f1be7cf8d871d541125d290983f98f26f759488ba9aface49efce8edd682e9
 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-sys-0.59.0.crate 2387323 BLAKE2B 3110c8cd2bc005f8c95cd038a8d574af648dc19788fe4485f977376f92e36b911b1a542d669a07ae9cd4ea72a884ab01ec78b8a2b5587456eb202452d1d8fa0d SHA512 d35e009e979633a1f3c8468cd038bd5c8c0381405165ce03497decd7d9edaaac485d704487e4a61d9aaf4e4d011b4248408912df6a0044d50e8457259867e061
 DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709
-DIST windows-targets-0.52.4.crate 6310 BLAKE2B 0393bf3e7f8823edc455055e9977798bd6cdc1e523127cf840ee1b9e36febe40e01dcad9875a06aea283dd55443d02f643d42752103a5ec1de933285fe410b17 SHA512 4b2c26468df54b9801e6badd120dcffc15429fc78a614f45efa16d5fed1a36983198fbb621cc3beb4a4f9f0161ef8ddeca3a5c6a6ac48b5589681936f4d2bf50
 DIST windows-targets-0.52.5.crate 6376 BLAKE2B 1d39fd86380ab086c536d88e67b60956410b345790ccea62a25e6a700757b2a9cfa6dfeb7b86934cf47b981ea2e5f42dddf49780ad9829a551dc507fcf108641 SHA512 d00d7bc7eec3c10272e803ee5c9ea0d9b07c43311124dae975b4f5aae7408c5f2ccb2fe6e68228ea3d4e70b6b658382cac6992ea177f43a9cba2ef95c4fda0ee
+DIST windows-targets-0.52.6.crate 6403 BLAKE2B eb98d0a8daeed5fe76e7fa8edb2743e2a3e77dfb9c4ea68605a6ab10532cb7cfc43bc1cea0180869445bd940be762a40136500e26b84ca88b5e0c502004c7a4c SHA512 d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f
 DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996
-DIST windows_aarch64_gnullvm-0.52.4.crate 433373 BLAKE2B 5678cf2371e4c566b7ff0dd1fabcae92d12ce9f97670524c93fd8c34bf6b09d054e7de2f852302b8d994f52c81015b7cc8a74f529490c7bdd17a3b5d2c88a12e SHA512 dbb914a866873892a8cffecd4ed4977fe6c3fc48a58bb9f88655d86e7f8969cc27e6f5bb7d40eee41ae7d78f6f4be65d46650719321a7697c7b5b99a0f07a5dd
 DIST windows_aarch64_gnullvm-0.52.5.crate 433266 BLAKE2B dee1b69cdf1fbd4143136909e4df3adaa7b80d7630a01ca9a42fc5ad0d5a4d9a9e2873b43c6d8e55de59f237d9199fad0768c4e1cda3b1e5354847bd70d4c79e SHA512 b4cf511025458fe30d5b11368af285610e1654a8986ea9f78fa81b8bb87d38a00c4869441c62692534df66d06baf14c8a4d17f8eb06468eb260b99e2fda6439d
+DIST windows_aarch64_gnullvm-0.52.6.crate 435718 BLAKE2B 8b12ae02892cb69401329034bbca671d13bd268a112120b56b90504707cef89decfbd2560492844a9f0588fab62dc1476ab7e931126b939015d25a8cc91ca334 SHA512 f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5
 DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff
-DIST windows_aarch64_msvc-0.52.4.crate 828055 BLAKE2B 3088f2f66fc91ad698906315eae7e6c0dd7da5414c28cfa25b24e138fc4a7da40535be09129cd37b8e331d8d6e8c41d0106fba1ef9e5b4ac561140653e9ded4d SHA512 dcc538d0a9c276e7ec415575ec1392bf476219348984d9567f56d5cc7af0f9beeac523a9a6651f763dd4f50f89535a3ea2275d5321ec022c2ee8814e4e84e95b
 DIST windows_aarch64_msvc-0.52.5.crate 827944 BLAKE2B 3bcb16d527be1dfdf18a9105ab259a064f00e949937ca423c8dcd1d2b90090d85aa7e42ca6ccc50c9baeee1aa144123d0a04643f9ff1147e62b2fce28b8a697b SHA512 c8974f81e37a43d92c4a8b142705e36b7acc58d9150d80ffa3997433da878044c467a2d9167ba792d37a183a0082d912500fea8c8fed743f395b63ca62a5758d
+DIST windows_aarch64_msvc-0.52.6.crate 832615 BLAKE2B adc8ff61b6dc96d39c92c7d4221ae6aa0575edfc016cfcd046067ca5d8fcfd56d10e8e227be1c038ce34684be22c7ccaf5f18cd5a7638d28fbff4ba15b48b90b SHA512 a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b
 DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a
-DIST windows_i686_gnu-0.52.4.crate 875736 BLAKE2B 31ee3017a6db246b0d5fc02e10cdb517a69ceac3dbbc9d41b4051f5dfa1196e4a46e7b3f5f90935560c03bb139b897e5dce69989a3698d9c88ebae923e24ef30 SHA512 9d57260744607eb63453040c532bf3693cf3d8d93c56543ee00aa66adf3a71919e72bdef7811f287167403ade893248f189b797a5d2dcb24ef4e6f3d915a88c6
 DIST windows_i686_gnu-0.52.5.crate 875699 BLAKE2B 528ea431d080c5326e4c6ed316d9ea3e38b40c2e1322a12a432506a2c11555a94537661a0941e90c20eff4a9ce42c12539876dae6e77a1df18b522529928b309 SHA512 cc3e0362fb62dd5e8a855bda3be0177708ec8629ee9685f1f9aaac3f71a8cb082387388bdf49b09d3f5ee24a636b0b4f933d2c8bb75db434ee0192c8ce0547d2
+DIST windows_i686_gnu-0.52.6.crate 880402 BLAKE2B 5aab8ee07132eccb7695807eb44811beeb0657aadfb672c54e99b6ae39c067ba9b93e38fc69bb5b9b14a9759f263ccd5e301597d2727d83b31b49a409b6bd405 SHA512 a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822
 DIST windows_i686_gnullvm-0.52.5.crate 473064 BLAKE2B abe41ee330c05ee1366b3a835d15c6db3964ffd7b340ee69d215056b0d4b65c67f2782b0c04a55db64001098de87c93e2d447e25ef2a27f2cfa6685b8cf20c88 SHA512 da45c882248070911bf55698f62c245cb081a23254cdcf578df053905adb9117454235e52dcf1dd97c0d2248f92ff1d2fd3e18844a7be8d93ba08590c1eca22b
+DIST windows_i686_gnullvm-0.52.6.crate 475940 BLAKE2B fec4fda8bb2bf319a501a22372fa642ae682e4dee3235b258a028190ee73220bfc55b3142f06249bb4579b17e5fde662bb2b121aefe18544653350d7d0fe7d8e SHA512 95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f
 DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e
-DIST windows_i686_msvc-0.52.4.crate 895530 BLAKE2B 87ec4628472beec8697317662fd599a8ea0ba5a11a0cad6b23f2481f39b3a4e0546d37fade4d715ad06a4798cf7faa6435bafa1e5054105c064cb560468b6025 SHA512 0d5526b21bfb96ab352b5181dcf84ff31007ce338245a374b3b413805239359a689b1a21de56ae998cc13444e40867bc30c4200454b84ef9ffa7117318baef1e
 DIST windows_i686_msvc-0.52.5.crate 895404 BLAKE2B 02555169f8c5b944231a877de8693fc871ea0d7d33f52f60e164bacb35cec13d463af07c57fec4667948047cc222d8bda7f6a0be01a07e7184b69e4adc2b4577 SHA512 08c96f8e9385ac121549bae8ed228741b32004be20b2955d163a98d4b62af464f1682cb813681fa22823d20646f19335cf0a66203a876b105e119e05a4db0634
+DIST windows_i686_msvc-0.52.6.crate 901163 BLAKE2B 99ed34e052db5ba77bab240ed5d38ce450be347a794d63ec39b719304c32722c9999b540ab40abe0216318900b7412970df99dfb36d1516a9517cae0c77d1bdc SHA512 ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96
 DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
-DIST windows_x86_64_gnu-0.52.4.crate 831627 BLAKE2B 64d29f6e0837be822d89cc8aaea2514382d2c03b33deb5684df1d6b81573b3817add39d99f66181a762fae7c155e60a8c070affe43a0f2e247fb0c5ddcc7afd9 SHA512 96c673fb330af597fc3c71b53b9b66cacc9f3f64f05dc7cfe4a77447b7545280f065df22b7d91a6b7cf681a442d8b71c9d2dd128e76580664d8598c481cbb95e
 DIST windows_x86_64_gnu-0.52.5.crate 831539 BLAKE2B 54f84c19988addeb7cbbbddb940e430e7345944589419592b99addf9b83bf6d801b18f4e80399b85bbb0b0ccf4608e36d9a50b79d8b1d6ce2b93745856e06eba SHA512 d9bf91765d02d2727344e42081f4bcfa73be97991495126f7e633f27e56a261ada3a8b865a559cfe71f9bc9aed5b14504f89138796766937b3521009726dfab8
+DIST windows_x86_64_gnu-0.52.6.crate 836363 BLAKE2B e2335829155cdbd4a55cc9f9babc237e14e32aab97f6f91afabcdf80d2aee37d6fb4b8669aaf433ff532c85dba59b3d366c7d41b61a2f29b96f960169c900687 SHA512 c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb
 DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
-DIST windows_x86_64_gnullvm-0.52.4.crate 433358 BLAKE2B ffd55fba15ef713bd48caec5ed5f32936e05ac4897b721bd2b041229bc8c7beeca77ca018c3258dcdb09495629aa359d1dadaaf5112d38e7ea54670309d0ddf4 SHA512 f153d86b01e47f17ef08271b69becf7883bab92f96d40cdb1d74432f2bc6a7a65aa4ed931d8f6f4c2679e360bbd8d12037dc2a74a6a444fcaec5e4c784c54c74
 DIST windows_x86_64_gnullvm-0.52.5.crate 433246 BLAKE2B f34328a6d100e092ecb34a6305daedf4fecd71840432f104e8707f049b60d784584ce4f02fabdd0281fdb8bc7ebed34b38fdacf3be9c8abd60084e9a4ee9fd56 SHA512 22a978c40df9705cd94e4c52f2b706e477e667b564c608d0adb144b38cb486c279c09d1eb1dd2d6c7bd3401b75a2dc5eafe0f7d642ffe6453f394d1f59483a08
+DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
-DIST windows_x86_64_msvc-0.52.4.crate 828019 BLAKE2B 08163b63d934114457cd64b1c372f8a0cfc1ebf48a2efb41d79031c58ea64e023acd32d2f5075b8b78536998188138562e584ece95f2021b4bc71087ac45f026 SHA512 0671fa3c0463c6d65b525ece8bc91eab2f75cb534de86ba2b1e854d4136fcb439717441881206dba7cfb602493bc24d2aefa96abf8977f5a0fe38d41eadc90f1
 DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
+DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
 DIST winnow-0.5.40.crate 159316 BLAKE2B aae5076d59b3459c901d918d8aaa97ba8bfcc993b8484344f52e45f1f37deb96d6cd3a1663a67f3c367be2b05d633286f270274c621bda9f3ab72b98bb652cc2 SHA512 525156f08514b0110697360be6e331a68d08f0cb65ee4ba3ac9d101dd2d42a8c89601e7409bdb5652c5b05145626506651010f58a854c47712065334c61ff39c
+DIST winnow-0.6.18.crate 163357 BLAKE2B 7a43eba294c43b187211c6eabc449775081f44405045ec4786c5f10290639e18d002e872f9db14caa94e26fd99079c7ce2f99e70dcb20d842c0886ac203d8ca8 SHA512 3a146d9dc8fe3fcc855f7766852cd69c49a28f9048d553d3952d7722d49216cb44652d98b15ae1ddee99b2bbc3caefb107a9b85c309242dac943deeca65a81dc
 DIST winreg-0.50.0.crate 29703 BLAKE2B db9a968ef96cc07bc1088831affc4627e09c7ab8170a54fdf70a599c2d6180a8a9ac46b6304b61fdd2fac96e01bb004ebd8051940300c7b52c5b7b7975732d11 SHA512 2f52a9e3ab794665263499c88dfdf06009c6477d180a90ebbe86e786ae7f5003c9dc8b3c26224024e79450f3b94688000458f2ea8b1ae1c3691453c3d4df4787
 DIST write16-1.0.0.crate 7218 BLAKE2B 548796314339463e4b71f8af3d344e45dc89480e103180b6d56c90fcb816ad1a37ab2ba20766c4b9754f2cc686752eb1f3a5a12ec1ed4369a9cef749ad4f3e97 SHA512 655a207b8082bb88e462f992ecb4833cef9d590da06d6356b41d109df2862b49ee5705189c78a607b549e7343035119d158020d58fcad49608e51659357a83c1
 DIST writeable-0.5.5.crate 22354 BLAKE2B e4ff9862c070b413568ce0c75d1eccafcf1db8578eee4795ea9046dadd643f8a77258b437be288b93af247199d63455298ac2cff909226bc432f91c0aa863921 SHA512 818b2546c8ec25816aeaf5e31a1ded927d197bf7256e7c5073738c2709bc58a95d382a0256eb38a99235ae83729b578701261866d42ea3357a26024906e196c1
 DIST xxhash-rust-0.8.10.crate 20066 BLAKE2B 5fca80ff05e00d5f78c2655093a963b08a16d2bd40e74e53c9e48e9812f81d668f9d60cd23872cb76ecb643cd381eddb841da5ba93a5f9fc92e42e6d8bb7e871 SHA512 c5a66c4c7a30dffe9d925dbfa8d0b5ae5b825770cb5d52a0d5de2eadf24c9af1b08b11b2e7a94ce60a30dabb2ce61cd3066cc781d05c90bc6a9d46daa2e04b71
+DIST xxhash-rust-0.8.12.crate 21329 BLAKE2B e9596bb83cd0f0465c279deecaf4dd87aac05db1c8c7d3aed4f0689022c5a0522d976379fb3dcf6cfe1c18452c87890e95f3d17998c777d92f5cbe58119a20a9 SHA512 6fd17ec65be94b58f109b6aa9bb283e51092621e8af624f8c2c2c95558a3d0461d743cb8a65a0da5853ff7fd98273daec0dcc5b632440868524f99894beeff3d
 DIST yoke-0.7.4.crate 27781 BLAKE2B 42d6176af3e8d046b42fa89eacc0bb249eb0a6e13dbe7e97890b0cae98c3cc0059255f15314bbc343610d60605bf2d13869402c17d36cbf7f495956496572212 SHA512 b3d1456e28d53723470644ae15a4298fa96a79593d90729221ca4e45a6f09de4d7c554703425c61595c4e78959652122db95865c0337cc0cd6a4ec57d7bea84d
 DIST yoke-derive-0.7.4.crate 7470 BLAKE2B e5c0ca6f9cad4336b6b7554d05c3926d1720707aa70b588ebb884426747eb7d3d82614ba20563a5e801c4645f90fed9e067f50f43749a66e52f20c4204fb94db SHA512 5be38b8ae8dcb640a3fcb097e5b118354b45a41a0367afeff3c2ba5d13458524e88f9433848f09c670533d36a49a0e2b393e23368921553b5bb008e66e8e4a40
 DIST z-base-32-0.1.4.crate 14008 BLAKE2B 099ed86e96c8434f1784c8e80143de91a357fdbf9db096fc461daa13de031b8561dac5e6cc1ab6edea1732b50e2dca3e15541b09e239852c04cad82e324dd96e SHA512 83eef93391d22782fd38ba30957a5569a74e7be529354eed3b24da71eb958a7bf17da7b3366e4f204accc2145a967819f0a07ae33e021063640ce9ffce7534aa
 DIST zbase32-0.1.2.crate 8721 BLAKE2B d7f5881c8d3f06f5fd78669ae6943ffa5ebe35b5e34db2718825e88e5602fa03bbc33c11589021ad2e8754414b355b86a9391335e4df9361627aede9336b14d3 SHA512 50d703350a6404f0084b4d341ac1aef16f7a5f8924662c4d180ffaece00d295aec3f9925168d39c20837c7306ef88f98ffc5ef4c945d01c7fc6e5078c5dfb4bc
-DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82
 DIST zerocopy-0.7.34.crate 151177 BLAKE2B 30b65131370dfa4f41d3c2705d3b75da9b76f2a4ed723dec66345939de8bafe2c181ab6c98036c25a30739cae1720d927e27e5fa5587442d5cfb7f39a7018c8f SHA512 4d27b1230ebcea4e9d4c15f38a979aa3fe8b23833e95df781a0a67054e920637642b89345596fe331907edc27abab83c766967f2a04399a6fe0a4e89fa0dd148
-DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d
+DIST zerocopy-0.7.35.crate 152645 BLAKE2B 8f13123c9d9257ac5a5c6954d38c3510fa658624442f7e03cdcc6db5a0977d9f26bb4e277be172b7872ec365cf6e58ac742e5578636f7698f9f37093e9249d9a SHA512 17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c
 DIST zerocopy-derive-0.7.34.crate 37907 BLAKE2B 23a698c3c892187307007cbc76c9338dbe163e4f14d4ea73969ba834f5c6732d16f5bc26e2e85c5e3df2100b28e6e72ae6473b2159f5160ee19befdef3615f98 SHA512 1bd93062b0d2c699066f8a991326b4470426aae0517d33748a8f0e52b009fc46e6b0b238abe97462a2e13c870fa3d0d070615870e6dbbf8b6991c0e3fb5c3e63
+DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb
 DIST zerofrom-0.1.4.crate 5044 BLAKE2B 8ad9a14b8b0c251cffb420f7ac673669fd29b74bc2f5e220c8e86d592f58cbb2c7be88d906b7dac8803dbd76ec459c4a249b7d1ede75a055454a1626b387f128 SHA512 11f37a67108185a8090cda71338b02492fabd15e6cfe018833a165cd869ed65338e12d7c5680ffb0b763fc3acbdff6fe4df30457653dfe4d79ecc864b69d780f
 DIST zerofrom-derive-0.1.4.crate 8232 BLAKE2B 98f69cdeff7df52822b982e3c089ccfa3ac2ce67f320b0d32eeffa899d2b34627268ed0a01b03504a0a6fcb6bef34d808cc79c811d5daed7f8acf59282e82088 SHA512 f2ea4650fcb4e7c3583f0f7c6146c7734cf6e80e07d92c330c6bc6a0a4e0fe14ae3393845713331240c70685e92eec114565c5be21189e687fe6232aef75a9c0
-DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756
 DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe14ab9e7f0b4ef3cb1ecbc42fbec2b951414e26ab00bc65aaddc2c93eddd5a1963b27c6cd613ac71c65d5cc24 SHA512 dd40ebe98b98fd742608d4066b5ab66caba94b2e679428fcaff9fe547d8cd6ff2360dc85d671ee9183e32fb79cb554d00d6aef9eb8f3d8ad0ec92d0435aa4ebe
-DIST zerovec-0.10.2.crate 126403 BLAKE2B f6f7e08c27e5724c9071cf007c09a3fdc80b84bc3f7a08647d6e312674f82c1e35335e8c72da5d47904a937bdc6f29c26729b35123f6e8119f6991c7055318af SHA512 159cb90d2ee2a2662429141e0948cfb44e7784ba35e92c32b2ac7183d6b69a9318b0617ff4de7b87831f9727f9d5c9d7d4fd3a9b1f54e67ca29a4ed6afc8d046
 DIST zerovec-0.10.3.crate 126403 BLAKE2B ed783804e7852c85f2d19225c2c397f9e87c9c52e1e31b222796aee5772503e9cf7bdf21c44c1566804a5e69585420d57d5af11b8024df69df063acc9704f5e0 SHA512 692ed6150047b131cd540c392351fa953fe477d9eea7a8b05f5e6d3bf27434e27c149099f8875bb0db5aa24ed1c974ab9f8afa14e9557022e91ad168d2831a0d
-DIST zerovec-derive-0.10.2.crate 19366 BLAKE2B 226d599e59c682ba167506d9cedf4f1b004881a624cec3b462ae0d2a1982e9297b9943b70649f0e98e46bf6a6fca68952d181625723a5bdcf779f07cf412dba7 SHA512 da4a056e9147142e51a58c3b16a12179433fc889b4efacbadd1294bb5a750860201a472bf7d72a10e7e82e95d97761a67ec93a727620c1c1844a15362f6736ea
+DIST zerovec-0.10.4.crate 126398 BLAKE2B b078784d6f178bbb9de1c3c1b6c7ef996f00bdd7dfd2924bda921e62f3e09e953fbf50f8d0da99ac6ff6d134f146253846f5663549dcf8df08eaf34b9d4016b3 SHA512 db12bba1d7476ddead92e6dfcdcc30e2e0defff4f263a740244eabee265a2cab265473a663d3dc3210f48e113b66d951da496dfab7965ce1bc792e5f2db422a0
 DIST zerovec-derive-0.10.3.crate 19438 BLAKE2B 9f7df8a4e4a0b62ab25aed967b26509db4bcc5d5b10b3bd73305099a4c49a60be8921484ced1a34d9b7ae30ffa5abe789686f432416a8f1cfc07de1db1dff594 SHA512 caefbffeb35265db9f74933bf07109d57f0da48156cafd4f330af78a5c7eb9ab0831a80789ad4fb119875ebc6cfd7e3de68c9984b77dca5151f9be41f1ae6e09
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild
deleted file mode 100644
index 77e21bae6c1c..000000000000
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,453 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.6.2
-
-EAPI=8
-
-CRATES="
-	addr2line@0.22.0
-	adler@1.0.2
-	aead@0.5.2
-	aes-gcm@0.10.3
-	aes@0.8.4
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	anyhow@1.0.86
-	ascii-canvas@3.0.0
-	async-trait@0.1.80
-	autocfg@1.3.0
-	backtrace@0.3.73
-	base64@0.21.7
-	base64@0.22.1
-	base64ct@1.6.0
-	bindgen@0.68.1
-	bit-set@0.5.3
-	bit-vec@0.6.3
-	bitflags@1.3.2
-	bitflags@2.5.0
-	block-buffer@0.10.4
-	block-padding@0.3.3
-	botan-sys@0.10.5
-	botan@0.10.7
-	buffered-reader@1.3.1
-	bumpalo@3.16.0
-	byteorder@1.5.0
-	bytes@1.6.0
-	bzip2-sys@0.1.11+1.0.8
-	bzip2@0.4.4
-	capnp-futures@0.19.0
-	capnp-rpc@0.19.2
-	capnp@0.19.6
-	cc@1.0.99
-	cexpr@0.6.0
-	cfg-if@1.0.0
-	chrono@0.4.38
-	cipher@0.4.4
-	clang-sys@1.8.1
-	cmac@0.7.2
-	const-oid@0.9.6
-	core-foundation-sys@0.8.6
-	core-foundation@0.9.4
-	cpufeatures@0.2.12
-	crc32fast@1.4.2
-	crossbeam-channel@0.5.13
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-queue@0.3.11
-	crossbeam-utils@0.8.20
-	crossbeam@0.8.4
-	crunchy@0.2.2
-	crypto-common@0.1.6
-	ctor@0.2.8
-	ctr@0.9.2
-	curve25519-dalek-derive@0.1.1
-	curve25519-dalek@4.1.2
-	daemonize@0.5.0
-	darling@0.20.9
-	darling_core@0.20.9
-	darling_macro@0.20.9
-	data-encoding@2.6.0
-	dbl@0.3.2
-	der@0.7.9
-	deranged@0.3.11
-	diff@0.1.13
-	digest@0.10.7
-	dirs-next@2.0.0
-	dirs-sys-next@0.1.2
-	dirs-sys@0.4.1
-	dirs@5.0.1
-	displaydoc@0.2.4
-	doc-comment@0.3.3
-	dyn-clone@1.0.17
-	eax@0.5.0
-	ed25519-dalek@2.1.1
-	ed25519@2.2.3
-	editdistancek@1.0.2
-	either@1.12.0
-	embedded-io@0.6.1
-	ena@0.14.3
-	encoding_rs@0.8.34
-	endian-type@0.1.2
-	enum-as-inner@0.6.0
-	enumber@0.3.1
-	equivalent@1.0.1
-	errno@0.3.9
-	fallible-iterator@0.3.0
-	fallible-streaming-iterator@0.1.9
-	fastrand@2.1.0
-	fd-lock@4.0.2
-	fiat-crypto@0.2.9
-	filetime@0.2.23
-	fixedbitset@0.4.2
-	flate2@1.0.30
-	fnv@1.0.7
-	foreign-types-shared@0.1.1
-	foreign-types@0.3.2
-	form_urlencoded@1.2.1
-	fs2@0.4.3
-	futures-channel@0.3.30
-	futures-core@0.3.30
-	futures-executor@0.3.30
-	futures-io@0.3.30
-	futures-macro@0.3.30
-	futures-sink@0.3.30
-	futures-task@0.3.30
-	futures-util@0.3.30
-	futures@0.3.30
-	generic-array@0.14.7
-	generic-array@1.0.0
-	gethostname@0.4.3
-	getrandom@0.2.15
-	ghash@0.5.1
-	gimli@0.29.0
-	glob@0.3.1
-	h2@0.3.26
-	hashbrown@0.12.3
-	hashbrown@0.14.5
-	hashlink@0.9.1
-	heck@0.4.1
-	hermit-abi@0.3.9
-	hex@0.4.3
-	hickory-client@0.24.1
-	hickory-proto@0.24.1
-	hickory-resolver@0.24.1
-	histo@1.0.0
-	hostname@0.3.1
-	http-body@0.4.6
-	http@0.2.12
-	httparse@1.9.3
-	httpdate@1.0.3
-	hyper-tls@0.5.0
-	hyper@0.14.29
-	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.0
-	icu_properties_data@1.5.0
-	icu_provider@1.5.0
-	icu_provider_macros@1.5.0
-	ident_case@1.0.1
-	idna@0.4.0
-	idna@0.5.0
-	idna@1.0.0
-	indexmap@1.9.3
-	indexmap@2.2.6
-	inout@0.1.3
-	interprocess@1.2.1
-	ipconfig@0.3.2
-	ipnet@2.9.0
-	itertools@0.11.0
-	itoa@1.0.11
-	js-sys@0.3.69
-	lalrpop-util@0.20.2
-	lalrpop@0.20.2
-	lazy_static@1.4.0
-	lazycell@1.3.0
-	libc@0.2.155
-	libloading@0.8.3
-	libm@0.2.8
-	libredox@0.1.3
-	libsqlite3-sys@0.28.0
-	linked-hash-map@0.5.6
-	linux-raw-sys@0.4.14
-	litemap@0.7.3
-	lock_api@0.4.12
-	log@0.4.21
-	lru-cache@0.1.2
-	match_cfg@0.1.0
-	md-5@0.10.6
-	memchr@2.7.4
-	memsec@0.6.3
-	memsec@0.7.0
-	mime@0.3.17
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.3
-	mio@0.8.11
-	native-tls@0.2.12
-	nettle-sys@2.3.0
-	nettle@7.4.0
-	new_debug_unreachable@1.0.6
-	nibble_vec@0.1.0
-	nom@7.1.3
-	ntest@0.9.2
-	ntest_test_cases@0.9.2
-	ntest_timeout@0.9.2
-	num-bigint-dig@0.8.4
-	num-conv@0.1.0
-	num-integer@0.1.46
-	num-iter@0.1.45
-	num-traits@0.2.19
-	num_cpus@1.16.0
-	object@0.36.0
-	once_cell@1.19.0
-	opaque-debug@0.3.1
-	openpgp-cert-d@0.3.2
-	openssh-keys@0.6.2
-	openssl-macros@0.1.1
-	openssl-probe@0.1.5
-	openssl-sys@0.9.102
-	openssl@0.10.64
-	option-ext@0.2.0
-	parking_lot@0.12.3
-	parking_lot_core@0.9.10
-	peeking_take_while@0.1.2
-	percent-encoding@2.3.1
-	petgraph@0.6.5
-	phf_shared@0.10.0
-	pin-project-lite@0.2.14
-	pin-utils@0.1.0
-	pkcs8@0.10.2
-	pkg-config@0.3.30
-	platforms@3.4.0
-	polyval@0.6.2
-	powerfmt@0.2.0
-	ppv-lite86@0.2.17
-	precomputed-hash@0.1.1
-	proc-macro-crate@3.1.0
-	proc-macro2@1.0.85
-	quick-error@1.2.3
-	quote@1.0.36
-	radix_trie@0.2.1
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rand_distr@0.4.3
-	rayon-core@1.12.1
-	rayon@1.10.0
-	redox_syscall@0.4.1
-	redox_syscall@0.5.2
-	redox_users@0.4.5
-	regex-automata@0.4.7
-	regex-syntax@0.8.4
-	regex@1.10.5
-	reqwest@0.11.27
-	resolv-conf@0.7.0
-	rpassword@7.3.1
-	rtoolbox@0.0.2
-	rusqlite@0.31.0
-	rustc-demangle@0.1.24
-	rustc-hash@1.1.0
-	rustc_version@0.4.0
-	rustix@0.38.34
-	rustls-pemfile@1.0.4
-	rustversion@1.0.17
-	ryu@1.0.18
-	same-file@1.0.6
-	schannel@0.1.23
-	scopeguard@1.2.0
-	security-framework-sys@2.11.0
-	security-framework@2.11.0
-	semver@1.0.23
-	sequoia-cert-store@0.6.0
-	sequoia-gpg-agent@0.4.1
-	sequoia-ipc@0.35.0
-	sequoia-net@0.28.0
-	sequoia-openpgp@1.20.0
-	sequoia-policy-config@0.6.0
-	sequoia-wot@0.12.0
-	serde@1.0.203
-	serde_derive@1.0.203
-	serde_json@1.0.117
-	serde_urlencoded@0.7.1
-	serde_with@3.8.1
-	serde_with_macros@3.8.1
-	sha1collisiondetection@0.3.4
-	sha2@0.10.8
-	shellexpand@3.1.0
-	shlex@1.3.0
-	signal-hook-registry@1.4.2
-	signature@2.2.0
-	siphasher@0.3.11
-	slab@0.4.9
-	smallvec@1.13.2
-	socket2@0.5.7
-	spin@0.5.2
-	spki@0.7.3
-	stable_deref_trait@1.2.0
-	stfu8@0.2.7
-	streaming-stats@0.1.29
-	string_cache@0.8.7
-	strsim@0.11.1
-	subtle@2.5.0
-	syn@1.0.109
-	syn@2.0.66
-	sync_wrapper@0.1.2
-	synstructure@0.13.1
-	system-configuration-sys@0.5.0
-	system-configuration@0.5.1
-	tar@0.4.41
-	tempfile@3.10.1
-	term@0.7.0
-	thiserror-impl@1.0.61
-	thiserror@1.0.61
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tiny-keccak@2.0.2
-	tinystr@0.7.6
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	to_method@1.1.0
-	tokio-macros@2.3.0
-	tokio-native-tls@0.3.1
-	tokio-socks@0.5.1
-	tokio-util@0.7.11
-	tokio@1.38.0
-	toml@0.5.11
-	toml_datetime@0.6.6
-	toml_edit@0.21.1
-	tower-service@0.3.2
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing@0.1.40
-	try-lock@0.2.5
-	typenum@1.17.0
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	unicode-xid@0.2.4
-	universal-hash@0.5.1
-	url@2.5.1
-	utf16_iter@1.0.5
-	utf8_iter@1.0.4
-	vcpkg@0.2.15
-	version_check@0.9.4
-	walkdir@2.5.0
-	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
-	widestring@1.1.0
-	win-crypto-ng@0.5.1
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.8
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-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
-	winreg@0.50.0
-	write16@1.0.0
-	writeable@0.5.5
-	xxhash-rust@0.8.10
-	yoke-derive@0.7.4
-	yoke@0.7.4
-	z-base-32@0.1.4
-	zbase32@0.1.2
-	zerocopy-derive@0.7.34
-	zerocopy@0.7.34
-	zerofrom-derive@0.1.4
-	zerofrom@0.1.4
-	zeroize@1.8.1
-	zerovec-derive@0.10.2
-	zerovec@0.10.2
-"
-
-LLVM_COMPAT=( 17 18 )
-RUST_NEEDS_LLVM=1
-
-inherit cargo llvm-r1 xdg-utils
-
-DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
-HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"
-SRC_URI="
-	https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/archive/v${PV}/${P}-v${PV}.tar.bz2
-	${CARGO_CRATE_URIS}
-"
-S="${WORKDIR}"/${PN}-v${PV}-ff7ef2c893283c6fcdeab971de19593c239d2f5f
-
-LICENSE="GPL-3+"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 ISC LGPL-2+ LGPL-3+ MIT MPL-2.0
-	Unicode-3.0 Unicode-DFS-2016
-	|| ( GPL-2 GPL-3 LGPL-3 )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-# Still some issue to do with columns?
-RESTRICT="test"
-
-DEPEND="
-	dev-db/sqlite:3
-	dev-libs/gmp:=
-	dev-libs/nettle:=
-	dev-libs/openssl:=
-"
-RDEPEND="${DEPEND}"
-# Clang needed for bindgen
-BDEPEND="
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-	')
-"
-
-QA_FLAGS_IGNORED="usr/bin/gpg-sq usr/bin/gpgv-sq"
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	rust_pkg_setup
-}
-
-src_test() {
-	local -x GNUPGHOME="${T}"/.gnupg
-	local -x REAL_GPG_BIN="${BROOT}"/usr/bin/gpg
-	local -x REAL_GPGV_BIN="${BROOT}"/usr/bin/gpgv
-
-	mkdir "${GNUPGHOME}" || die
-	chmod 700 "${GNUPGHOME}" || die
-
-	xdg_environment_reset
-	RUST_BACKTRACE=full cargo_src_test -vv
-}
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild
index e88952d1ac7b..cafcc0f0b87e 100644
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-r1.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.10.1-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
 
 # Autogenerated by pycargoebuild 0.6.2
@@ -413,7 +413,7 @@ LICENSE+="
 	|| ( GPL-2 GPL-3 LGPL-3 )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 # Still some issue to do with columns?
 RESTRICT="test"
 
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.11.2.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.11.2.ebuild
new file mode 100644
index 000000000000..c2b0e3caac58
--- /dev/null
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.11.2.ebuild
@@ -0,0 +1,466 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.6.2
+
+EAPI=8
+
+CRATES="
+	addr2line@0.22.0
+	adler2@2.0.0
+	adler@1.0.2
+	aead@0.5.2
+	aes-gcm@0.10.3
+	aes@0.8.4
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anstream@0.6.15
+	anstyle-parse@0.2.5
+	anstyle-query@1.1.1
+	anstyle-wincon@3.0.4
+	anstyle@1.0.8
+	anyhow@1.0.86
+	ascii-canvas@3.0.0
+	async-trait@0.1.81
+	autocfg@1.3.0
+	backtrace@0.3.73
+	base64@0.21.7
+	base64@0.22.1
+	base64ct@1.6.0
+	bindgen@0.68.1
+	bit-set@0.5.3
+	bit-vec@0.6.3
+	bitflags@1.3.2
+	bitflags@2.6.0
+	block-buffer@0.10.4
+	block-padding@0.3.3
+	botan-sys@0.10.5
+	botan@0.10.7
+	buffered-reader@1.3.1
+	bumpalo@3.16.0
+	byteorder@1.5.0
+	bytes@1.7.1
+	bzip2-sys@0.1.11+1.0.8
+	bzip2@0.4.4
+	capnp-futures@0.19.0
+	capnp-rpc@0.19.2
+	capnp@0.19.6
+	cc@1.1.15
+	cexpr@0.6.0
+	cfg-if@1.0.0
+	chrono@0.4.38
+	cipher@0.4.4
+	clang-sys@1.8.1
+	clap@4.5.16
+	clap_builder@4.5.15
+	clap_complete@4.5.24
+	clap_lex@0.7.2
+	clap_mangen@0.2.23
+	cmac@0.7.2
+	colorchoice@1.0.2
+	const-oid@0.9.6
+	core-foundation-sys@0.8.7
+	core-foundation@0.9.4
+	cpufeatures@0.2.13
+	crc32fast@1.4.2
+	crossbeam-channel@0.5.13
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-queue@0.3.11
+	crossbeam-utils@0.8.20
+	crossbeam@0.8.4
+	crunchy@0.2.2
+	crypto-common@0.1.6
+	ctor@0.2.8
+	ctr@0.9.2
+	curve25519-dalek-derive@0.1.1
+	curve25519-dalek@4.1.3
+	daemonize@0.5.0
+	darling@0.20.10
+	darling_core@0.20.10
+	darling_macro@0.20.10
+	data-encoding@2.6.0
+	dbl@0.3.2
+	der@0.7.9
+	deranged@0.3.11
+	diff@0.1.13
+	digest@0.10.7
+	dirs-next@2.0.0
+	dirs-sys-next@0.1.2
+	dirs-sys@0.4.1
+	dirs@5.0.1
+	displaydoc@0.2.5
+	doc-comment@0.3.3
+	dyn-clone@1.0.17
+	eax@0.5.0
+	ed25519-dalek@2.1.1
+	ed25519@2.2.3
+	editdistancek@1.0.2
+	either@1.13.0
+	embedded-io@0.6.1
+	ena@0.14.3
+	encoding_rs@0.8.34
+	endian-type@0.1.2
+	enum-as-inner@0.6.0
+	enumber@0.3.1
+	equivalent@1.0.1
+	errno@0.3.9
+	fallible-iterator@0.3.0
+	fallible-streaming-iterator@0.1.9
+	fastrand@2.1.1
+	fd-lock@4.0.2
+	fiat-crypto@0.2.9
+	filetime@0.2.24
+	fixedbitset@0.4.2
+	flate2@1.0.33
+	fnv@1.0.7
+	foreign-types-shared@0.1.1
+	foreign-types@0.3.2
+	form_urlencoded@1.2.1
+	fs2@0.4.3
+	futures-channel@0.3.30
+	futures-core@0.3.30
+	futures-executor@0.3.30
+	futures-io@0.3.30
+	futures-macro@0.3.30
+	futures-sink@0.3.30
+	futures-task@0.3.30
+	futures-util@0.3.30
+	futures@0.3.30
+	generic-array@0.14.7
+	generic-array@1.1.0
+	gethostname@0.4.3
+	getrandom@0.2.15
+	ghash@0.5.1
+	gimli@0.29.0
+	glob@0.3.1
+	h2@0.3.26
+	hashbrown@0.12.3
+	hashbrown@0.14.5
+	hashlink@0.9.1
+	heck@0.4.1
+	hermit-abi@0.3.9
+	hex@0.4.3
+	hickory-client@0.24.1
+	hickory-proto@0.24.1
+	hickory-resolver@0.24.1
+	histo@1.0.0
+	hostname@0.3.1
+	http-body@0.4.6
+	http@0.2.12
+	httparse@1.9.4
+	httpdate@1.0.3
+	hyper-tls@0.5.0
+	hyper@0.14.30
+	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
+	ident_case@1.0.1
+	idna@0.4.0
+	idna@0.5.0
+	idna@1.0.2
+	indexmap@1.9.3
+	indexmap@2.4.0
+	inout@0.1.3
+	interprocess@1.2.1
+	ipconfig@0.3.2
+	ipnet@2.9.0
+	is_terminal_polyfill@1.70.1
+	itertools@0.11.0
+	itoa@1.0.11
+	js-sys@0.3.70
+	lalrpop-util@0.20.2
+	lalrpop@0.20.2
+	lazy_static@1.5.0
+	lazycell@1.3.0
+	libc@0.2.158
+	libloading@0.8.5
+	libm@0.2.8
+	libredox@0.1.3
+	libsqlite3-sys@0.28.0
+	linked-hash-map@0.5.6
+	linux-raw-sys@0.4.14
+	litemap@0.7.3
+	lock_api@0.4.12
+	log@0.4.22
+	lru-cache@0.1.2
+	match_cfg@0.1.0
+	md-5@0.10.6
+	memchr@2.7.4
+	memsec@0.7.0
+	mime@0.3.17
+	minimal-lexical@0.2.1
+	miniz_oxide@0.7.4
+	miniz_oxide@0.8.0
+	mio@1.0.2
+	native-tls@0.2.12
+	nettle-sys@2.3.0
+	nettle@7.4.0
+	new_debug_unreachable@1.0.6
+	nibble_vec@0.1.0
+	nom@7.1.3
+	ntest@0.9.3
+	ntest_test_cases@0.9.3
+	ntest_timeout@0.9.3
+	num-bigint-dig@0.8.4
+	num-conv@0.1.0
+	num-integer@0.1.46
+	num-iter@0.1.45
+	num-traits@0.2.19
+	num_cpus@1.16.0
+	object@0.36.3
+	once_cell@1.19.0
+	opaque-debug@0.3.1
+	openpgp-cert-d@0.3.2
+	openssh-keys@0.6.4
+	openssl-macros@0.1.1
+	openssl-probe@0.1.5
+	openssl-sys@0.9.103
+	openssl@0.10.66
+	option-ext@0.2.0
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	peeking_take_while@0.1.2
+	percent-encoding@2.3.1
+	petgraph@0.6.5
+	phf_shared@0.10.0
+	pin-project-lite@0.2.14
+	pin-utils@0.1.0
+	pkcs8@0.10.2
+	pkg-config@0.3.30
+	polyval@0.6.2
+	powerfmt@0.2.0
+	ppv-lite86@0.2.20
+	precomputed-hash@0.1.1
+	proc-macro-crate@3.2.0
+	proc-macro2@1.0.86
+	quick-error@1.2.3
+	quote@1.0.37
+	radix_trie@0.2.1
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rand_distr@0.4.3
+	rayon-core@1.12.1
+	rayon@1.10.0
+	redox_syscall@0.5.3
+	redox_users@0.4.6
+	regex-automata@0.4.7
+	regex-syntax@0.8.4
+	regex@1.10.6
+	reqwest@0.11.27
+	resolv-conf@0.7.0
+	roff@0.2.2
+	rpassword@7.3.1
+	rtoolbox@0.0.2
+	rusqlite@0.31.0
+	rustc-demangle@0.1.24
+	rustc-hash@1.1.0
+	rustc_version@0.4.0
+	rustix@0.38.35
+	rustls-pemfile@1.0.4
+	rustversion@1.0.17
+	ryu@1.0.18
+	same-file@1.0.6
+	schannel@0.1.23
+	scopeguard@1.2.0
+	security-framework-sys@2.11.1
+	security-framework@2.11.1
+	semver@1.0.23
+	sequoia-cert-store@0.6.0
+	sequoia-gpg-agent@0.4.2
+	sequoia-ipc@0.35.0
+	sequoia-net@0.28.0
+	sequoia-openpgp@1.21.2
+	sequoia-policy-config@0.6.0
+	sequoia-wot@0.12.0
+	serde@1.0.209
+	serde_derive@1.0.209
+	serde_json@1.0.127
+	serde_urlencoded@0.7.1
+	serde_with@3.9.0
+	serde_with_macros@3.9.0
+	sha1collisiondetection@0.3.4
+	sha2@0.10.8
+	shellexpand@3.1.0
+	shlex@1.3.0
+	signal-hook-registry@1.4.2
+	signature@2.2.0
+	siphasher@0.3.11
+	slab@0.4.9
+	smallvec@1.13.2
+	socket2@0.5.7
+	spin@0.9.8
+	spki@0.7.3
+	stable_deref_trait@1.2.0
+	stfu8@0.2.7
+	streaming-stats@0.1.29
+	string_cache@0.8.7
+	strsim@0.11.1
+	subtle@2.6.1
+	syn@1.0.109
+	syn@2.0.76
+	sync_wrapper@0.1.2
+	synstructure@0.13.1
+	system-configuration-sys@0.5.0
+	system-configuration@0.5.1
+	tar@0.4.41
+	tempfile@3.12.0
+	term@0.7.0
+	thiserror-impl@1.0.63
+	thiserror@1.0.63
+	time-core@0.1.2
+	time-macros@0.2.18
+	time@0.3.36
+	tiny-keccak@2.0.2
+	tinystr@0.7.6
+	tinyvec@1.8.0
+	tinyvec_macros@0.1.1
+	to_method@1.1.0
+	tokio-macros@2.4.0
+	tokio-native-tls@0.3.1
+	tokio-socks@0.5.2
+	tokio-util@0.7.11
+	tokio@1.39.3
+	toml@0.5.11
+	toml_datetime@0.6.8
+	toml_edit@0.22.20
+	tower-service@0.3.3
+	tracing-attributes@0.1.27
+	tracing-core@0.1.32
+	tracing@0.1.40
+	try-lock@0.2.5
+	typenum@1.17.0
+	unicode-bidi@0.3.15
+	unicode-ident@1.0.12
+	unicode-normalization@0.1.23
+	unicode-xid@0.2.5
+	universal-hash@0.5.1
+	url@2.5.2
+	utf16_iter@1.0.5
+	utf8_iter@1.0.4
+	utf8parse@0.2.2
+	vcpkg@0.2.15
+	version_check@0.9.5
+	walkdir@2.5.0
+	want@0.3.1
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.93
+	wasm-bindgen-futures@0.4.43
+	wasm-bindgen-macro-support@0.2.93
+	wasm-bindgen-macro@0.2.93
+	wasm-bindgen-shared@0.2.93
+	wasm-bindgen@0.2.93
+	web-sys@0.3.70
+	widestring@1.1.0
+	win-crypto-ng@0.5.1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.9
+	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-sys@0.59.0
+	windows-targets@0.48.5
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.6
+	winnow@0.6.18
+	winreg@0.50.0
+	write16@1.0.0
+	writeable@0.5.5
+	xxhash-rust@0.8.12
+	yoke-derive@0.7.4
+	yoke@0.7.4
+	z-base-32@0.1.4
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+	zerofrom-derive@0.1.4
+	zerofrom@0.1.4
+	zeroize@1.8.1
+	zerovec-derive@0.10.3
+	zerovec@0.10.4
+"
+
+LLVM_COMPAT=( 17 18 )
+RUST_NEEDS_LLVM=1
+
+inherit cargo llvm-r1 xdg-utils
+
+DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
+HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"
+SRC_URI="
+	https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/archive/v${PV}/${P}-v${PV}.tar.bz2
+	${CARGO_CRATE_URIS}
+"
+S="${WORKDIR}"/${PN}-v${PV}-baeb68d59f3af6bfb15bf7bc1562ba922e58bfa7
+
+LICENSE="GPL-3+"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD Boost-1.0 CC0-1.0 ISC LGPL-2+ MIT MPL-2.0 Unicode-3.0
+	Unicode-DFS-2016
+	|| ( GPL-2 GPL-3 LGPL-3 )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+# Still some issue to do with columns?
+RESTRICT="test"
+
+DEPEND="
+	dev-db/sqlite:3
+	dev-libs/gmp:=
+	dev-libs/nettle:=
+	dev-libs/openssl:=
+"
+RDEPEND="${DEPEND}"
+# Clang needed for bindgen
+BDEPEND="
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+	')
+"
+
+QA_FLAGS_IGNORED="usr/bin/gpg-sq usr/bin/gpgv-sq"
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
+src_test() {
+	local -x GNUPGHOME="${T}"/.gnupg
+	local -x REAL_GPG_BIN="${BROOT}"/usr/bin/gpg
+	local -x REAL_GPGV_BIN="${BROOT}"/usr/bin/gpgv
+
+	mkdir "${GNUPGHOME}" || die
+	chmod 700 "${GNUPGHOME}" || die
+
+	xdg_environment_reset
+	RUST_BACKTRACE=full cargo_src_test -vv
+}
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild
deleted file mode 100644
index 36d5eb24e7c4..000000000000
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,424 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.6.2
-
-EAPI=8
-
-CRATES="
-	addr2line@0.21.0
-	adler@1.0.2
-	aead@0.5.2
-	aes-gcm@0.10.3
-	aes@0.8.4
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	allocator-api2@0.2.16
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	anyhow@1.0.81
-	ascii-canvas@3.0.0
-	async-trait@0.1.79
-	autocfg@1.2.0
-	backtrace@0.3.71
-	base64@0.21.7
-	base64ct@1.6.0
-	bindgen@0.68.1
-	bit-set@0.5.3
-	bit-vec@0.6.3
-	bitflags@1.3.2
-	bitflags@2.5.0
-	block-buffer@0.10.4
-	block-padding@0.3.3
-	botan-sys@0.10.5
-	botan@0.10.7
-	buffered-reader@1.3.0
-	bumpalo@3.16.0
-	byteorder@1.5.0
-	bytes@1.6.0
-	bzip2-sys@0.1.11+1.0.8
-	bzip2@0.4.4
-	capnp-futures@0.19.0
-	capnp-rpc@0.19.0
-	capnp@0.19.3
-	cc@1.0.92
-	cexpr@0.6.0
-	cfg-if@1.0.0
-	chrono@0.4.37
-	cipher@0.4.4
-	clang-sys@1.7.0
-	cmac@0.7.2
-	const-oid@0.9.6
-	core-foundation-sys@0.8.6
-	core-foundation@0.9.4
-	cpufeatures@0.2.12
-	crc32fast@1.4.0
-	crossbeam-channel@0.5.12
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-queue@0.3.11
-	crossbeam-utils@0.8.19
-	crossbeam@0.8.4
-	crunchy@0.2.2
-	crypto-common@0.1.6
-	ctor@0.2.7
-	ctr@0.9.2
-	curve25519-dalek-derive@0.1.1
-	curve25519-dalek@4.1.2
-	daemonize@0.5.0
-	darling@0.20.8
-	darling_core@0.20.8
-	darling_macro@0.20.8
-	data-encoding@2.5.0
-	dbl@0.3.2
-	der@0.7.9
-	deranged@0.3.11
-	diff@0.1.13
-	digest@0.10.7
-	dirs-next@2.0.0
-	dirs-sys-next@0.1.2
-	dirs-sys@0.4.1
-	dirs@5.0.1
-	doc-comment@0.3.3
-	dyn-clone@1.0.17
-	eax@0.5.0
-	ed25519-dalek@2.1.1
-	ed25519@2.2.3
-	editdistancek@1.0.2
-	either@1.10.0
-	embedded-io@0.6.1
-	ena@0.14.2
-	encoding_rs@0.8.33
-	endian-type@0.1.2
-	enum-as-inner@0.6.0
-	enumber@0.3.0
-	equivalent@1.0.1
-	errno@0.3.8
-	fallible-iterator@0.3.0
-	fallible-streaming-iterator@0.1.9
-	fastrand@2.0.2
-	fd-lock@4.0.2
-	fiat-crypto@0.2.7
-	filetime@0.2.23
-	fixedbitset@0.4.2
-	flate2@1.0.28
-	fnv@1.0.7
-	foreign-types-shared@0.1.1
-	foreign-types@0.3.2
-	form_urlencoded@1.2.1
-	fs2@0.4.3
-	futures-channel@0.3.30
-	futures-core@0.3.30
-	futures-executor@0.3.30
-	futures-io@0.3.30
-	futures-macro@0.3.30
-	futures-sink@0.3.30
-	futures-task@0.3.30
-	futures-util@0.3.30
-	futures@0.3.30
-	generic-array@0.14.7
-	generic-array@1.0.0
-	gethostname@0.4.3
-	getrandom@0.2.14
-	ghash@0.5.1
-	gimli@0.28.1
-	glob@0.3.1
-	h2@0.3.26
-	hashbrown@0.12.3
-	hashbrown@0.14.3
-	hashlink@0.9.0
-	heck@0.4.1
-	hermit-abi@0.3.9
-	hex@0.4.3
-	hickory-client@0.24.0
-	hickory-proto@0.24.0
-	hickory-resolver@0.24.0
-	histo@1.0.0
-	hostname@0.3.1
-	http-body@0.4.6
-	http@0.2.12
-	httparse@1.8.0
-	httpdate@1.0.3
-	hyper-tls@0.5.0
-	hyper@0.14.28
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.60
-	ident_case@1.0.1
-	idna@0.4.0
-	idna@0.5.0
-	indexmap@1.9.3
-	indexmap@2.2.6
-	inout@0.1.3
-	interprocess@1.2.1
-	ipconfig@0.3.2
-	ipnet@2.9.0
-	itertools@0.11.0
-	itoa@1.0.11
-	js-sys@0.3.69
-	lalrpop-util@0.20.2
-	lalrpop@0.20.2
-	lazy_static@1.4.0
-	lazycell@1.3.0
-	libc@0.2.153
-	libloading@0.8.3
-	libm@0.2.8
-	libredox@0.1.3
-	libsqlite3-sys@0.28.0
-	linked-hash-map@0.5.6
-	linux-raw-sys@0.4.13
-	lock_api@0.4.11
-	log@0.4.21
-	lru-cache@0.1.2
-	match_cfg@0.1.0
-	md-5@0.10.6
-	memchr@2.7.2
-	memsec@0.6.3
-	mime@0.3.17
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.2
-	mio@0.8.11
-	native-tls@0.2.11
-	nettle-sys@2.3.0
-	nettle@7.4.0
-	new_debug_unreachable@1.0.6
-	nibble_vec@0.1.0
-	nom@7.1.3
-	ntest@0.9.2
-	ntest_test_cases@0.9.2
-	ntest_timeout@0.9.2
-	num-bigint-dig@0.8.4
-	num-conv@0.1.0
-	num-integer@0.1.46
-	num-iter@0.1.44
-	num-traits@0.2.18
-	num_cpus@1.16.0
-	object@0.32.2
-	once_cell@1.19.0
-	opaque-debug@0.3.1
-	openpgp-cert-d@0.3.2
-	openssh-keys@0.6.2
-	openssl-macros@0.1.1
-	openssl-probe@0.1.5
-	openssl-sys@0.9.102
-	openssl@0.10.64
-	option-ext@0.2.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.9
-	peeking_take_while@0.1.2
-	percent-encoding@2.3.1
-	petgraph@0.6.4
-	phf_shared@0.10.0
-	pin-project-lite@0.2.14
-	pin-utils@0.1.0
-	pkcs8@0.10.2
-	pkg-config@0.3.30
-	platforms@3.4.0
-	polyval@0.6.2
-	powerfmt@0.2.0
-	ppv-lite86@0.2.17
-	precomputed-hash@0.1.1
-	proc-macro-crate@3.1.0
-	proc-macro2@1.0.79
-	quick-error@1.2.3
-	quote@1.0.35
-	radix_trie@0.2.1
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rand_distr@0.4.3
-	rayon-core@1.12.1
-	rayon@1.10.0
-	redox_syscall@0.4.1
-	redox_users@0.4.5
-	regex-automata@0.4.6
-	regex-syntax@0.8.3
-	regex@1.10.4
-	reqwest@0.11.27
-	resolv-conf@0.7.0
-	rpassword@7.3.1
-	rtoolbox@0.0.2
-	rusqlite@0.31.0
-	rustc-demangle@0.1.23
-	rustc-hash@1.1.0
-	rustc_version@0.4.0
-	rustix@0.38.32
-	rustls-pemfile@1.0.4
-	rustversion@1.0.15
-	ryu@1.0.17
-	same-file@1.0.6
-	schannel@0.1.23
-	scopeguard@1.2.0
-	security-framework-sys@2.10.0
-	security-framework@2.10.0
-	semver@1.0.22
-	sequoia-cert-store@0.5.1
-	sequoia-gpg-agent@0.3.1
-	sequoia-ipc@0.34.1
-	sequoia-net@0.28.0
-	sequoia-openpgp@1.19.0
-	sequoia-policy-config@0.6.0
-	sequoia-wot@0.11.0
-	serde@1.0.197
-	serde_derive@1.0.197
-	serde_json@1.0.115
-	serde_urlencoded@0.7.1
-	serde_with@3.7.0
-	serde_with_macros@3.7.0
-	sha1collisiondetection@0.3.4
-	sha2@0.10.8
-	shellexpand@3.1.0
-	shlex@1.3.0
-	signal-hook-registry@1.4.1
-	signature@2.2.0
-	siphasher@0.3.11
-	slab@0.4.9
-	smallvec@1.13.2
-	socket2@0.5.6
-	spin@0.5.2
-	spki@0.7.3
-	stfu8@0.2.7
-	streaming-stats@0.1.29
-	string_cache@0.8.7
-	strsim@0.10.0
-	subtle@2.5.0
-	syn@1.0.109
-	syn@2.0.58
-	sync_wrapper@0.1.2
-	system-configuration-sys@0.5.0
-	system-configuration@0.5.1
-	tar@0.4.40
-	tempfile@3.10.1
-	term@0.7.0
-	thiserror-impl@1.0.58
-	thiserror@1.0.58
-	time-core@0.1.2
-	time-macros@0.2.17
-	time@0.3.34
-	tiny-keccak@2.0.2
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	to_method@1.1.0
-	tokio-macros@2.2.0
-	tokio-native-tls@0.3.1
-	tokio-socks@0.5.1
-	tokio-util@0.7.10
-	tokio@1.37.0
-	toml@0.5.11
-	toml_datetime@0.6.5
-	toml_edit@0.21.1
-	tower-service@0.3.2
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing@0.1.40
-	try-lock@0.2.5
-	typenum@1.17.0
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	unicode-xid@0.2.4
-	universal-hash@0.5.1
-	url@2.5.0
-	vcpkg@0.2.15
-	version_check@0.9.4
-	walkdir@2.5.0
-	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
-	widestring@1.1.0
-	win-crypto-ng@0.5.1
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.6
-	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.4
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.4
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.4
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.4
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.4
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.4
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.4
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.4
-	winnow@0.5.40
-	winreg@0.50.0
-	xxhash-rust@0.8.10
-	z-base-32@0.1.4
-	zbase32@0.1.2
-	zerocopy-derive@0.7.32
-	zerocopy@0.7.32
-	zeroize@1.7.0
-"
-
-LLVM_COMPAT=( 17 18 )
-RUST_NEEDS_LLVM=1
-
-inherit cargo llvm-r1 xdg-utils
-
-DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
-HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"
-SRC_URI="
-	https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/archive/v${PV}/${P}-v${PV}.tar.bz2
-	${CARGO_CRATE_URIS}
-"
-S="${WORKDIR}"/${PN}-v${PV}-ef91231624ede121c9b112eb9b94107fca1aa71b
-
-LICENSE="GPL-3+"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 ISC LGPL-2+ LGPL-3+ MIT MPL-2.0
-	Unicode-DFS-2016
-	|| ( GPL-2 GPL-3 LGPL-3 )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-# Still some issue to do with columns?
-RESTRICT="test"
-
-DEPEND="
-	dev-db/sqlite:3
-	dev-libs/gmp:=
-	dev-libs/nettle:=
-	dev-libs/openssl:=
-"
-RDEPEND="${DEPEND}"
-# Clang needed for bindgen
-BDEPEND="
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-	')
-"
-
-QA_FLAGS_IGNORED="usr/bin/gpg-sq usr/bin/gpgv-sq"
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	rust_pkg_setup
-}
-
-src_test() {
-	local -x GNUPGHOME="${T}"/.gnupg
-	local -x REAL_GPG_BIN="${BROOT}"/usr/bin/gpg
-	local -x REAL_GPGV_BIN="${BROOT}"/usr/bin/gpgv
-
-	mkdir "${GNUPGHOME}" || die
-	chmod 700 "${GNUPGHOME}" || die
-
-	xdg_environment_reset
-	RUST_BACKTRACE=full cargo_src_test -vv
-}
diff --git a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild
deleted file mode 100644
index 9f1505dc419f..000000000000
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,427 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.6.2
-
-EAPI=8
-
-CRATES="
-	addr2line@0.21.0
-	adler@1.0.2
-	aead@0.5.2
-	aes-gcm@0.10.3
-	aes@0.8.4
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	allocator-api2@0.2.18
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	anyhow@1.0.83
-	ascii-canvas@3.0.0
-	async-trait@0.1.80
-	autocfg@1.3.0
-	backtrace@0.3.71
-	base64@0.21.7
-	base64@0.22.1
-	base64ct@1.6.0
-	bindgen@0.68.1
-	bit-set@0.5.3
-	bit-vec@0.6.3
-	bitflags@1.3.2
-	bitflags@2.5.0
-	block-buffer@0.10.4
-	block-padding@0.3.3
-	botan-sys@0.10.5
-	botan@0.10.7
-	buffered-reader@1.3.1
-	bumpalo@3.16.0
-	byteorder@1.5.0
-	bytes@1.6.0
-	bzip2-sys@0.1.11+1.0.8
-	bzip2@0.4.4
-	capnp-futures@0.19.0
-	capnp-rpc@0.19.0
-	capnp@0.19.3
-	cc@1.0.97
-	cexpr@0.6.0
-	cfg-if@1.0.0
-	chrono@0.4.38
-	cipher@0.4.4
-	clang-sys@1.7.0
-	cmac@0.7.2
-	const-oid@0.9.6
-	core-foundation-sys@0.8.6
-	core-foundation@0.9.4
-	cpufeatures@0.2.12
-	crc32fast@1.4.0
-	crossbeam-channel@0.5.12
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-queue@0.3.11
-	crossbeam-utils@0.8.19
-	crossbeam@0.8.4
-	crunchy@0.2.2
-	crypto-common@0.1.6
-	ctor@0.2.8
-	ctr@0.9.2
-	curve25519-dalek-derive@0.1.1
-	curve25519-dalek@4.1.2
-	daemonize@0.5.0
-	darling@0.20.8
-	darling_core@0.20.8
-	darling_macro@0.20.8
-	data-encoding@2.6.0
-	dbl@0.3.2
-	der@0.7.9
-	deranged@0.3.11
-	diff@0.1.13
-	digest@0.10.7
-	dirs-next@2.0.0
-	dirs-sys-next@0.1.2
-	dirs-sys@0.4.1
-	dirs@5.0.1
-	doc-comment@0.3.3
-	dyn-clone@1.0.17
-	eax@0.5.0
-	ed25519-dalek@2.1.1
-	ed25519@2.2.3
-	editdistancek@1.0.2
-	either@1.11.0
-	embedded-io@0.6.1
-	ena@0.14.3
-	encoding_rs@0.8.34
-	endian-type@0.1.2
-	enum-as-inner@0.6.0
-	enumber@0.3.1
-	equivalent@1.0.1
-	errno@0.3.8
-	fallible-iterator@0.3.0
-	fallible-streaming-iterator@0.1.9
-	fastrand@2.1.0
-	fd-lock@4.0.2
-	fiat-crypto@0.2.8
-	filetime@0.2.23
-	fixedbitset@0.4.2
-	flate2@1.0.30
-	fnv@1.0.7
-	foreign-types-shared@0.1.1
-	foreign-types@0.3.2
-	form_urlencoded@1.2.1
-	fs2@0.4.3
-	futures-channel@0.3.30
-	futures-core@0.3.30
-	futures-executor@0.3.30
-	futures-io@0.3.30
-	futures-macro@0.3.30
-	futures-sink@0.3.30
-	futures-task@0.3.30
-	futures-util@0.3.30
-	futures@0.3.30
-	generic-array@0.14.7
-	generic-array@1.0.0
-	gethostname@0.4.3
-	getrandom@0.2.15
-	ghash@0.5.1
-	gimli@0.28.1
-	glob@0.3.1
-	h2@0.3.26
-	hashbrown@0.12.3
-	hashbrown@0.14.5
-	hashlink@0.9.0
-	heck@0.4.1
-	hermit-abi@0.3.9
-	hex@0.4.3
-	hickory-client@0.24.1
-	hickory-proto@0.24.1
-	hickory-resolver@0.24.1
-	histo@1.0.0
-	hostname@0.3.1
-	http-body@0.4.6
-	http@0.2.12
-	httparse@1.8.0
-	httpdate@1.0.3
-	hyper-tls@0.5.0
-	hyper@0.14.28
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.60
-	ident_case@1.0.1
-	idna@0.4.0
-	idna@0.5.0
-	indexmap@1.9.3
-	indexmap@2.2.6
-	inout@0.1.3
-	interprocess@1.2.1
-	ipconfig@0.3.2
-	ipnet@2.9.0
-	itertools@0.11.0
-	itoa@1.0.11
-	js-sys@0.3.69
-	lalrpop-util@0.20.2
-	lalrpop@0.20.2
-	lazy_static@1.4.0
-	lazycell@1.3.0
-	libc@0.2.154
-	libloading@0.8.3
-	libm@0.2.8
-	libredox@0.1.3
-	libsqlite3-sys@0.28.0
-	linked-hash-map@0.5.6
-	linux-raw-sys@0.4.13
-	lock_api@0.4.12
-	log@0.4.21
-	lru-cache@0.1.2
-	match_cfg@0.1.0
-	md-5@0.10.6
-	memchr@2.7.2
-	memsec@0.6.3
-	mime@0.3.17
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.2
-	mio@0.8.11
-	native-tls@0.2.11
-	nettle-sys@2.3.0
-	nettle@7.4.0
-	new_debug_unreachable@1.0.6
-	nibble_vec@0.1.0
-	nom@7.1.3
-	ntest@0.9.2
-	ntest_test_cases@0.9.2
-	ntest_timeout@0.9.2
-	num-bigint-dig@0.8.4
-	num-conv@0.1.0
-	num-integer@0.1.46
-	num-iter@0.1.45
-	num-traits@0.2.19
-	num_cpus@1.16.0
-	object@0.32.2
-	once_cell@1.19.0
-	opaque-debug@0.3.1
-	openpgp-cert-d@0.3.2
-	openssh-keys@0.6.2
-	openssl-macros@0.1.1
-	openssl-probe@0.1.5
-	openssl-sys@0.9.102
-	openssl@0.10.64
-	option-ext@0.2.0
-	parking_lot@0.12.2
-	parking_lot_core@0.9.10
-	peeking_take_while@0.1.2
-	percent-encoding@2.3.1
-	petgraph@0.6.4
-	phf_shared@0.10.0
-	pin-project-lite@0.2.14
-	pin-utils@0.1.0
-	pkcs8@0.10.2
-	pkg-config@0.3.30
-	platforms@3.4.0
-	polyval@0.6.2
-	powerfmt@0.2.0
-	ppv-lite86@0.2.17
-	precomputed-hash@0.1.1
-	proc-macro-crate@3.1.0
-	proc-macro2@1.0.82
-	quick-error@1.2.3
-	quote@1.0.36
-	radix_trie@0.2.1
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rand_distr@0.4.3
-	rayon-core@1.12.1
-	rayon@1.10.0
-	redox_syscall@0.4.1
-	redox_syscall@0.5.1
-	redox_users@0.4.5
-	regex-automata@0.4.6
-	regex-syntax@0.8.3
-	regex@1.10.4
-	reqwest@0.11.27
-	resolv-conf@0.7.0
-	rpassword@7.3.1
-	rtoolbox@0.0.2
-	rusqlite@0.31.0
-	rustc-demangle@0.1.24
-	rustc-hash@1.1.0
-	rustc_version@0.4.0
-	rustix@0.38.34
-	rustls-pemfile@1.0.4
-	rustversion@1.0.16
-	ryu@1.0.18
-	same-file@1.0.6
-	schannel@0.1.23
-	scopeguard@1.2.0
-	security-framework-sys@2.11.0
-	security-framework@2.11.0
-	semver@1.0.23
-	sequoia-cert-store@0.5.3
-	sequoia-gpg-agent@0.3.1
-	sequoia-ipc@0.34.1
-	sequoia-net@0.28.0
-	sequoia-openpgp@1.20.0
-	sequoia-policy-config@0.6.0
-	sequoia-wot@0.11.0
-	serde@1.0.200
-	serde_derive@1.0.200
-	serde_json@1.0.116
-	serde_urlencoded@0.7.1
-	serde_with@3.8.1
-	serde_with_macros@3.8.1
-	sha1collisiondetection@0.3.4
-	sha2@0.10.8
-	shellexpand@3.1.0
-	shlex@1.3.0
-	signal-hook-registry@1.4.2
-	signature@2.2.0
-	siphasher@0.3.11
-	slab@0.4.9
-	smallvec@1.13.2
-	socket2@0.5.7
-	spin@0.5.2
-	spki@0.7.3
-	stfu8@0.2.7
-	streaming-stats@0.1.29
-	string_cache@0.8.7
-	strsim@0.10.0
-	subtle@2.5.0
-	syn@1.0.109
-	syn@2.0.61
-	sync_wrapper@0.1.2
-	system-configuration-sys@0.5.0
-	system-configuration@0.5.1
-	tar@0.4.40
-	tempfile@3.10.1
-	term@0.7.0
-	thiserror-impl@1.0.60
-	thiserror@1.0.60
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tiny-keccak@2.0.2
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	to_method@1.1.0
-	tokio-macros@2.2.0
-	tokio-native-tls@0.3.1
-	tokio-socks@0.5.1
-	tokio-util@0.7.11
-	tokio@1.37.0
-	toml@0.5.11
-	toml_datetime@0.6.5
-	toml_edit@0.21.1
-	tower-service@0.3.2
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing@0.1.40
-	try-lock@0.2.5
-	typenum@1.17.0
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	unicode-xid@0.2.4
-	universal-hash@0.5.1
-	url@2.5.0
-	vcpkg@0.2.15
-	version_check@0.9.4
-	walkdir@2.5.0
-	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
-	widestring@1.1.0
-	win-crypto-ng@0.5.1
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.8
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-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
-	winreg@0.50.0
-	xxhash-rust@0.8.10
-	z-base-32@0.1.4
-	zbase32@0.1.2
-	zerocopy-derive@0.7.34
-	zerocopy@0.7.34
-	zeroize@1.7.0
-"
-
-LLVM_COMPAT=( 17 18 )
-RUST_NEEDS_LLVM=1
-
-inherit cargo llvm-r1 xdg-utils
-
-DESCRIPTION="Sequoia's reimplementation of the GnuPG interface"
-HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/"
-SRC_URI="
-	https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/archive/v${PV}/${P}-v${PV}.tar.bz2
-	${CARGO_CRATE_URIS}
-"
-S="${WORKDIR}"/${PN}-v${PV}-81b95c7807d13a8adef5277ae840ca7ed73c02c0
-
-LICENSE="GPL-3+"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 ISC LGPL-2+ LGPL-3+ MIT MPL-2.0
-	Unicode-DFS-2016
-	|| ( GPL-2 GPL-3 LGPL-3 )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-# Still some issue to do with columns?
-RESTRICT="test"
-
-DEPEND="
-	dev-db/sqlite:3
-	dev-libs/gmp:=
-	dev-libs/nettle:=
-	dev-libs/openssl:=
-"
-RDEPEND="${DEPEND}"
-# Clang needed for bindgen
-BDEPEND="
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-	')
-"
-
-QA_FLAGS_IGNORED="usr/bin/gpg-sq usr/bin/gpgv-sq"
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	rust_pkg_setup
-}
-
-src_test() {
-	local -x GNUPGHOME="${T}"/.gnupg
-	local -x REAL_GPG_BIN="${BROOT}"/usr/bin/gpg
-	local -x REAL_GPGV_BIN="${BROOT}"/usr/bin/gpgv
-
-	mkdir "${GNUPGHOME}" || die
-	chmod 700 "${GNUPGHOME}" || die
-
-	xdg_environment_reset
-	RUST_BACKTRACE=full cargo_src_test -vv
-}
diff --git a/app-crypt/sequoia-sq/Manifest b/app-crypt/sequoia-sq/Manifest
index 09860b3ac0a2..9c0989956f23 100644
--- a/app-crypt/sequoia-sq/Manifest
+++ b/app-crypt/sequoia-sq/Manifest
@@ -1,4 +1,3 @@
-DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b
 DIST addr2line-0.22.0.crate 39156 BLAKE2B 3fbb55f6cacbb177d06359bcd39885247a9eeef96d95ffac0dfd1d45ed394dcd1e9e069c02c71a9ffca0b69e3a974e4d96bc3385470ee39c87d7a30ea7914303 SHA512 b334f51bd369348b4446805b4f624ec9b4cc8eefcc53ceb57b523ff55bf018d1dfe23259daf48d1878170ad4fcb44181d4738456eb5e35ede6932ff29686268e
 DIST addr2line-0.24.2.crate 39015 BLAKE2B 57186d6b957542cd71a0aa19f1355dfaabe6efa19b853c42f306494728b03d1e3183efdb2d2c7734a3e2347cd83a985d004f50c097e06b7520bd152310532e9b SHA512 39cbec3c920ffc0f37584afb55e1cfe4f182e4415319a4e9bfe842360f102f7b9315f6171c0cf71ba0337123903e604096cd573fe98698a26c8eebc2376d965b
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
@@ -9,23 +8,16 @@ DIST aes-gcm-0.10.3.crate 148991 BLAKE2B e1376b741386577277a8cb9535c1ad3e15ea383
 DIST ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d
 DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
 DIST aligned-0.4.2.crate 8519 BLAKE2B 338a4b1e06e754206fb37a86a46ddad3d9c3b11f1a72ae2354cd752d59dd0f9af5b67b150f4483aaff79097ad177d27ab89ee074af866c77b9af65cdefd1212f SHA512 e3aed914447ca1f6ea6338238f4dba8f903f673ac7d4299a8dde486335b0448161882b49b2f41d78c79d9c319b98d5cfaef73d99a797e160355aaa1f03561903
-DIST allocator-api2-0.2.18.crate 62504 BLAKE2B 8152c5a611be91ba23b1e8647511e21f48e7d4f1a7b9a828083f5bb8747cdc92aee66f73251b19195bbdc1f65aad992632e820d86cbeff287d598257ae3628a6 SHA512 5e5b0e23e1f5b259e5d3746e3e05817af8dee95af7105ea775a5c1d69b4e537a4d6a25e2c1d46ab83e2385217b158f7940dc1315ae581c35ee23289647105e73
 DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
-DIST anstream-0.6.13.crate 30928 BLAKE2B 0c6d0932dc486ccbe8d7e6f97bd8aae03fb84d4db90d0488070b7109de673e0af845a70a39e546af87f71f4c7f7bb159ab8ed68ac0f03a0297457062d9d69dc0 SHA512 4f9ccfd135de9be22a01230f39d571c8d8ccf7c3eba837fbf0868c9660693b60ee0c1c2f9490a587d5307e892ed45cb946da7a0690a9f972619c94fb050bde09
 DIST anstream-0.6.14.crate 29160 BLAKE2B 1120895a51ed7a285c5d5a03d2f7e26dc956d95f39cf500ba9f547d71a62ed0326f519860ddcf8db77cb09e9119e914a62693369eca51cbf9c01ef874ade9112 SHA512 65ece20958e3fb1ed4a5ff1d45f5bfdcb942c64994a3d14eefb0dfd5b04f433f6e1b06ebff240c67ed8ff7cc01d93ca0acf8c8ea29cb41309c6c882e7c192b34
 DIST anstream-0.6.18.crate 29681 BLAKE2B b6f72cda084b38f1e1cfe60de2562e8d62ebbc352176bdf668a2d6be09349bec46d291cd475e8af814ce66def44d95cb98c325761150130752284a82d8a84f21 SHA512 5149977d6f7b5e9cf6350f1ef130caa3ff46c7e78976358452a185ce196cdd77fee48a3a9838f434ae6ea9c15b19f6bfbab156edf819f81179d6774318f08963
 DIST anstyle-1.0.10.crate 15725 BLAKE2B 36e656bd8f9c584f11fda5cfe0c2e24e8426b9e1b602aad34ed118ae6950a55440e292d2e0ff7615f5e4f466fd06f07536be198a59506a587d40cb0c4ede4f80 SHA512 621e7a89fad13db985f07375d316cf8efba57fd44ae18628a8049a65aefbaef27949f99317872e91e0922bb089a00234055199ea3167f80ae03d00ada4f75dea
-DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa
 DIST anstyle-1.0.7.crate 15709 BLAKE2B 872e0ed09e7e94c6f6b812349e39f949aff4d7cbb87744ab26fe49f57a7d330e0f79447213374f7f862ea276aab2dd1077dc8df3f7c5f34079ef30c4d17eeeba SHA512 e20d49f7d148e03f7b127be7802e0b6b7a2b05720614d46c2ade5e440ce322b44ddd3a9239b897886faa03ed1cb30f947ee27d3811fa83dffba10b3975eba7ed
-DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399
 DIST anstyle-parse-0.2.4.crate 23069 BLAKE2B e80bd81e351326a222238b3f559020a2430ac37293e61b6b6309b37bbb8bdb78ec11ca9c0fd270098af5e5ffb2f5660cfbfda949d20fd2efd336ed1c143215b2 SHA512 c1dac475df77d090a4d2041ba40ff418abe66e93e4ddda54653bf024fb4995e431166684343509a2337bc813fe06f362d3df8a1d7d05d177cec1a488bcb9942a
 DIST anstyle-parse-0.2.6.crate 22343 BLAKE2B 85eba405dc5cf806283cf442984e86583dfe6c681f849eb7a347b7b67bd2b6f692e84fc9b5bd86486633cb2f05960ec16e8778300df114ae6676da43442db9bb SHA512 e28c9818afcda0e9b84c205d9c6697ce64cb06c21df2c3666869c07d66893105d9c5e96a27fcf2410a09f6af00735252e22b5c7d8c6cb3f68c4a8f376c49d396
-DIST anstyle-query-1.0.2.crate 8739 BLAKE2B c06643e8616f1f4469a32f9c0512941ce53ac5db9ebfa7a5b2f19233040cd4438dd2ee69ab89ecbc1c239e92b674dea9df15ed673408c6f3fe21787cc17d76f3 SHA512 f409b624cbeecf58fd87c47f85be28cae1fe48f65d692195fb80854c514e38c40d0e0ffad3a5b388a3929c47bd2060302ebb635aa98dc57329f3a5ed7be3e2dc
-DIST anstyle-query-1.0.3.crate 9742 BLAKE2B cfcba0a2773f07b9292279afd70832c5d4eb441ed61bcacdbeeda9184c63b7e01af70a8744d6efceb7f74a2c2dfa5672b873255cc1d273bd6a2d3d7ee08c2d2b SHA512 38637f49e547836a4958d9f528cb270abfc81c5ca644d6d43b0f3aaef8c6f1301a8bc30a23afec5e71722c3afe7eb0f48f9fdea88b73e36f597b74531da84226
 DIST anstyle-query-1.1.0.crate 9832 BLAKE2B de106e289c874bca806214e275647415bdd02e2878f3a80e7d337cfbcdb755d8c182b2879371f00f5cad97cdf68224ac11ca41cc89ad7ab3929f854a9f9e76a6 SHA512 321ddfa7b090142116c96bc8c70d81cec3e816922249ae0f07389e2d1b62c8b40636675ccfdfd23d52e29c162ae7d929637dfc7d697dafb79e596d04eb8cd90b
 DIST anstyle-query-1.1.2.crate 9969 BLAKE2B 179b8dd6dd709c2ca67f4eb5c9a502b2867cb6744a39f824c4fdebedc67c6c3e07d107c7d817e2ffb589d13b7ed4900cf9653ddc0a43663217042ee92ce8c9da SHA512 26069d936c4b1fb09bc65cda0253fe9be8fa4e96c0821f980c772602b4e9230035ec8c9d092ef95e0a0354ac559f8d25f57a14c34086d4d241b5fba688951837
-DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931
 DIST anstyle-wincon-3.0.3.crate 12179 BLAKE2B 37793975a05ad60bb2b670c208db11c5cda8a2a456242cd118748709d0a220b541b6f088676eccd19870cfb8f910d4aa1e7764393785a6db0531af4a3ffc8047 SHA512 55217c65fc9ec674e5b4dd70716a221bd108b507dce9baaeb542f0e0a47027ec7fe61f9cd3cccfda43e4a4cd785b42f13400daf89884c32d3768e48bdff2d179
 DIST anstyle-wincon-3.0.6.crate 12271 BLAKE2B d9f4d9d46fa93a1168ca340562681718be852ffa94e30c9ea208af53af9d6697ca84921837a325ddc36681caab2b866b7f574901c80b5c0d862dcb765b81b68b SHA512 59ec6f5a53bd68b6344d82e923eb8c45ddac481dd0d270a7b452dc5b0540ee1656705697c1508942ecc131e7c075248c85d8f4159f27d97ea94f22469ce2eeb5
 DIST anyhow-1.0.76.crate 44259 BLAKE2B 7be61550d78bafe866fc90dd1643cf335110e1f41faaecf295c5433c81894e7398f31f825394aa13df783a3bde3aa6dc11f129d882f0e452a635cfe88b77b84e SHA512 53f2240f952fd806ad0f247b1ee26f988cb8e237e067ddaa12e67efc8d2477ecc5eea0e7fbe59a7f35935185238b184860e3c594c67a96856b0c6407a09cad55
@@ -41,10 +33,8 @@ DIST async-generic-1.1.2.crate 7441 BLAKE2B 1c3f77cd721643a1d0bda6a7bbe20bc3eba5
 DIST async-trait-0.1.80.crate 28775 BLAKE2B d95384a8828c9273e0f295d3c3826b3a8716cd0c4ab39bdb43d65ec57fe886f7c5926c1666a76ca25b1536eedef61b0d92c78ff9c8a52a0515900360b66b0f13 SHA512 3e92bc8d38feea49ebb5011303e55853bbbf5d0fb7c4f6ed6aa471b9000a2a0ea5475619f98831641e8ee484beaa6fd8880770a96b8a5a7df26e392c1b4b3a19
 DIST async-trait-0.1.83.crate 29054 BLAKE2B 4991f79abd8b9260b9541e754c30d3e0731ff786fcf65cc3f3eb75a5fcedcb37be147222778e1a0fa6c68d8fb872144b2b55b43cf6f8f4de371f24175cef405d SHA512 15969eafbdbe51e80433b53196962293daed2a70d3d9bac91c58e5e7359f60fc99ef519ceb1fd54e34d627c94f821329474a602f25f85179318d10c3147b5649
 DIST atomic-waker-1.1.2.crate 12422 BLAKE2B fc6632f3c9d719b1d24a1c8e05947d94028909d1c629b80576e176e567636dd4cca699c7e91cae2df63541da574146b3ce766374e93f0ee429bb5bc89a4d3cae SHA512 e07e58db7955791259d0ec00fc4d53318aefb4506e062914819c4220c6dc75fa11a7af0289b4653aa1f9041eb975a025635190de68b4800a0e91e33cdb0ba11c
-DIST autocfg-1.2.0.crate 14808 BLAKE2B 122327d6ffd32e08dc9fbdb4dcf69128b19d56280f9d934311b946741003b40571cdd1f3ef54b2be02c8dc505aea11c962b244d33a92206bf4ee8f6b2b9da432 SHA512 66cbfd13e33b36284cf4c74c8d654f93adcc45893d127d9aaa4c1d183e47336096e72d74e7c17dd481fb7a98931ab6cfec7e4d4165cfb491861d4e3ffe2416fc
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST autocfg-1.4.0.crate 17712 BLAKE2B 7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6 SHA512 3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c
-DIST backtrace-0.3.71.crate 86553 BLAKE2B 15ed93574fb9e8e28d5ad901bb1f94013b5fec7a79aa96d17f13f6f11a02d29a274ec14ce51a9f515574839aa41232e5aaf6e6fa3ad9c0483591055bd0a78c8a SHA512 5d9307757349e860fb4cab7e9ba1c9d0f1faf49ebcd935ba879b85fed2a9812786c7458abb59a742842a0796fc29ce9921cf575792402486ecdbd9a2568cdd89
 DIST backtrace-0.3.73.crate 87617 BLAKE2B 585eebbb44671dfb3ff088092f62c7b25118ffc34e148b9b6ac67707923254ea43056861e2658c5fac7b9ed16fa56c30e7734e976fc3178f1fc03912d1d44c40 SHA512 dacedfd32cb91fe408e4f395441baf09c0a4b3bc4ba8f79d088359455cc903c93d24969567c7c5b2feb806433ffbb63a526d73f53caa4bee9c51961b61f831d9
 DIST backtrace-0.3.74.crate 88516 BLAKE2B 594b537f3860560bc790d04d72a91ea25bbf5f2494b9c43377129a8021c02d9c16471a223e518889775a816c45513b14bf097c453846b62302a58b59753a5fcb SHA512 00cb2be0626f0bf6ec8b8f525bb129d3ac74c386c5e46ee0f343edb78c863222521f8132876057a5a1facacf40792dea51f2f20e986b35f3a85bca3dcf5c1520
 DIST base16ct-0.2.0.crate 10240 BLAKE2B a8097674e84bb85fa72ea752d71446fc39e695fea9acc0f98178bb4e6569180f9acb4c7a9820708359d1c4733b57af6448015cce83f8c610985e6d2f7858fc33 SHA512 efe7c810102646733cb24c5cab62bd58d797e77b117d0fa5d651c34630f77de4d768fb99c981af5968393734bc32a2c1944a719f9f1a192b5062c0af8bb3413a
@@ -78,20 +68,14 @@ DIST bzip2-0.4.4.crate 34197 BLAKE2B b69f8ad38b44eb4912b33d53467492b0ebe6ed74045
 DIST bzip2-0.5.0.crate 34197 BLAKE2B 77c60e6cbec72b667781f1f676b296e69d81725f4e1287515ed16bf0c0a2246a1077652a39403cc73bb5dd129cc6228c7ff67b92954fc0614565071f06ac7686 SHA512 afd17286e6eaa4a9acfd2dcd37b52a9a24a1fa711308b958c207e27a7f4170a4686c4ee071b0b1580ebcc9c342352398ca0a0fb93c5dbd0b9c25a03e5cc558a1
 DIST bzip2-sys-0.1.11+1.0.8.crate 633444 BLAKE2B 01578c512443134fc786669bea4f2ec4b9c457b9936c907315299d8b67ed78045d458c83ccc119f0fad511529fb5af5feff5fa2d983fdae832d2fcc1b343e102 SHA512 d0a86b9f03acb1e4e309d5739dc2e88cab582757d467a433afe0017017f0e5d2c0282529e3a117160958ed170d8d695ecae739805888305df0e35e4dc440582b
 DIST camellia-0.1.0.crate 89085 BLAKE2B 88f67a01f18e236a8ec2613cea4f0d38fdd65b2191e5478bd7c1155feb45832d693bff15ad4b880651cdc9c74e89cdc0131548864b2c51f7cec38ecb11b5d113 SHA512 b851c285509d21ed02428ab45378dc145959bd196ab75daebb7df60bce3b71e059d4dbb5639697ef21fd6f7554c122cab8a5702b1d118c743fe02f65054f66df
-DIST capnp-0.19.3.crate 142400 BLAKE2B 291c5bb1fe1fcbae7391f828fe72c0acb3088d518e95c7ec4a8f43007abe2ea154cb6d262bbd72a74f14c170a5944baa53c687d4c909b04c6eb41ca4265fc47b SHA512 e0cccbf806712dd68d7d1bb3576bdf806135c804679d83d254d2d85d97a2c757681a3215104615fa4d58d20784f9cfe891dd44aa6e87d042bc232f939c941089
-DIST capnp-0.19.5.crate 143141 BLAKE2B bab046a138e6ced5e607413b789be899059bd9fa39c9d43054ee3f4e6f94118c1bd26908ae1a321cb943965bd3892abb1b2dbfcfe876236bbac0d4e61c7387df SHA512 ff3c45e202ac929f6fa03231f539756f508d82245c529b2262d42b4bbb40f05cbf499b224c5f6df0cef77118ec5154308833c554489a59d5722240a51ce0b688
 DIST capnp-0.19.6.crate 143197 BLAKE2B 39ac9a96351609e6ae57cdc44798444f99be346366756aabf5b9499709650795783cb826bc105be27b05b03104a902b4870420f5fa534f6a4f216642d9b6d82e SHA512 1fb8804b86fdb85f70681203261b16993cce6be720968be757c53c836c536d0a1a231256c523b69f8e4f1c8f0db4fd5edaa0394cc95d16d53d57cbe07632baf6
 DIST capnp-0.19.8.crate 143635 BLAKE2B 826ca0f2d815e0224eb56e5d6e75cc5ca021e739bb0c254db25200cd7566bf4c65e45e954a3963f5596d348d486f509a1cf35ad94abf4323495d955ae7099c24 SHA512 8047aec230f4056994714e31c572e0fa65a8dbf6bd633d63ac1e83f8aff723775d283e474ede9806c29bdfa8c602ad80529294ce2fdcbba1308a43df867b6761
 DIST capnp-futures-0.19.0.crate 12275 BLAKE2B 86eb409ce0ac5b1340572cd3ac0c79c4ae4db8418b3a6183aba5774ebc3f7e7c3d6d89984201e93f29a3f11f70ed2a38bb4a47816495967e2339fdb0474b68e9 SHA512 3db50310d40921d082b09d99dd2ecff1de901ac64672236d9c32f28858cd7e0beb377cc129c83f791c2b87aaa6d0ed2cac26a852244010d1970597afb23b4316
 DIST capnp-futures-0.19.1.crate 12493 BLAKE2B bcca7626ea4b384c5a6b8863eff9f01d603bd7e1c9128bfad08aeafbcbc3c327a70d12cb2ec35d14487bdd32e760a3329bf648c12756d98733a0d9303b9136db SHA512 c9ce9743a36cd54301499e0e8bd2ab8cc2746c661d6f09c1d6b1d5249c1bc2c9c39d031944b587c6041d9047efe7c4f9a67e96d7edabf28ddcf562ed68f45682
-DIST capnp-rpc-0.19.0.crate 92481 BLAKE2B 8323ccf3c0782a70403b8da80cecd1217fb180b453c176855113c5aca9d04e66f13dc452cde658919ef62c25130ded07693b59cf86bb57163230f3766c6ec14b SHA512 5dc37ac1433c302aa20c61a06527a7952b22738785b501ca6adc0d12372ecd7f423d0158b18aeeb74246c5444915b2eedb556ba9fbf8acba069a1bbb6287fa4c
-DIST capnp-rpc-0.19.1.crate 92536 BLAKE2B aa75581371ec91b33f30ac7ccc8bbf45115ac01cd7adffd2c17f50e8ca3d906d321171069b39ecab9980fee615bfaf651d847ecf2b787546dd7cb1905316e0c2 SHA512 c6246f89baeae7251b607c2b7b50f17dcac22132783d7c2b18f7f05243698970cdb3674a059caf4e9c002b2ff0d0b4421f833c8fbbdcd3b183a210e701f0e0c9
 DIST capnp-rpc-0.19.2.crate 93175 BLAKE2B 5affd8e2bdc11e734ace094b8e9bd811f06af341c871c800fd071a7dd5116a9d5ba3d4b2beb7ef900f2c8bdd50b1187f100518de75925abf973fc052199458af SHA512 08a9e766289f9e849ee56cff527e84c4a8d4afb62ebcd554402ab67d71b53c53797fae61d3930aeab50b0e0976663aac7ba0a7fe8b9ba3e29265423ffba8bc84
 DIST capnp-rpc-0.19.5.crate 94361 BLAKE2B 3137b328d47acaced0be7783d4c0942893084a5b7a0a809daff6174c4b932629315ea80beeb9372adc6b9e79a0d4da781d02ece884c36f53272ac61afe3f958f SHA512 bee03fb348d521406b15fdf9d09a395b8e8fb2622939c42aa8bc5efe542712f30faf1571269ac3dd15696ad7f1e2a334ae64911076685b4929358af0347b5527
 DIST capnpc-0.19.0.crate 33806 BLAKE2B 05224fcfd8c848651f8f7ac1ebf301db9c66504e3a003fe64a0df1b61c0325b8db7a79958d2c9941b306707a87ae4b82b3b0a7011bcf16c48c643a9d26627ca1 SHA512 df2e6917b20c414cd09c50f58803c4368029999af76a7ff70559eb1e31b8d6c75ed789f8075591269a31e1b73e268da9c555fc745b0121aa94f721c742288f7d
 DIST cast5-0.11.1.crate 37018 BLAKE2B ed3d9283131df32dc18a5e4110a325b7713936e109b43bed8da0d22b0afe81a0f00c9e4fab0bca1194c93fe6f0bf326a5474af6f9274c310632b93d24dc9328a SHA512 0fe363b576ece2661616c47c4de1801756c5aaa2a56c720a7b4eedf23e031ba9d30af9d086a16b0f957c39b473cea1f059295dd1c776e9a9cd4393e6c895d015
-DIST cc-1.0.94.crate 76456 BLAKE2B bf72e0007d9fe022a66ccc12be48acbc5dd1b716a47f18e4062b415405140764db6ed26bcab071307142167309c9c9ab55382c7973ad43fd15d06e3fe6b24b69 SHA512 67ce0e73904cf7fac81b0b914ec5fd4d9e59f358602199530f51d203a2e42be9814b04f65497a644a0e2720cc6e58c5e4bf1ad4782ded35b710b22c9b0f2bee5
-DIST cc-1.0.98.crate 76780 BLAKE2B 64124ebdda70b211b6fde8c02d256d97d57fc3a0db433371bad896c06e36caaa5f938074d92ca82724b34fde06bc10af63c7fdde8f52ac50a3ea6e3329d18d93 SHA512 dfeb194266a4a9cf2ddf69fe20f8e20a72a0a9c2f72b1ea578fd48dae5b0c3589f501068ca24e0da7b3691860cd8c05247c803f3ef2f338d56eef8b1f4f4fbd2
 DIST cc-1.0.99.crate 76961 BLAKE2B d615f647bc5e4f7f580f878fc41baee172e9513f1157d421c491c36af2ca330dde2a6ddd4238c03aae27feed5e8cc042f4b790d7b145952a8676ac553f72e356 SHA512 2f6c9a0869b3b636b011390efade0085ed5fe616ecb33ff586c948779b9c9bea9169cb1c31441b0aeb63dbaa35cdb76b6e67ace38d561e2c150e06853a2b1757
 DIST cc-1.2.4.crate 99823 BLAKE2B f05e52fd921578f14907911730f1c5bd7cf2c03e83f2d5ebaae9c2710025f5e5ea7c8f713888bd75d80abfed1b8e932a2047410f043f0b62e296389c9bf695a4 SHA512 76274e9676f09277a22e4cfb8c53a08bf562f98b710b479af6f95d590d3762fca1d6ec34791a219d59e3184774f13f624e84733f7c90c13c48707b75d75c0ec9
 DIST cc-1.2.6.crate 99923 BLAKE2B 61e091267c5b18d3c2886ee50870ccd3aced59d9f5eea31967e8739a49523226e2d1f0f383c7b5c3c9b6dc19d65bee319efb081f0c05c9d25847063d7f628081 SHA512 a9a2a00c58e0625aef2023c0c84827f17ee260bcde7e9407c98b38300ecaa5df852babbe896d857920c3455089e3608b54014812da88e597c500017bdd9a52ab
@@ -102,7 +86,6 @@ DIST cfg_aliases-0.2.1.crate 6355 BLAKE2B a758d9c88527f0e6e7cfd6d4c83eda1bcb4d6e
 DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
 DIST chrono-0.4.39.crate 222248 BLAKE2B eeff1694a98e8775524c261c5c46ebf09bf1ffc6222a945576960e8153af99e4549d8c988bd086507fa430f9cb15a3159be85300247ab3c6f5e77ab515f0988b SHA512 5b258f76bea58ab9baa0fe8fb32c41928b8b655c76bb2fbaae9300ef8380cbb881296cee6b9e9886dce62b0759c73e84f6409e374a86cf0c80e3383512f98571
 DIST cipher-0.4.4.crate 19073 BLAKE2B 144c45c1bdc5f7aef7f4fc63b6dd85955c453537567d1f1074e436e50d0d61f8413973cf3da207a48f1560ea92f2280fc5880569c78a1dd66bf97fd1d88ccde7 SHA512 1856d8b08bc3dbd2fa5c8b97e9eae43323c7aa19203ef3e80bb49cf15b5ddc832acb7b97121a52032656353e764f1f722200b638f7c28975fec1b5c9dc908846
-DIST clang-sys-1.7.0.crate 42088 BLAKE2B d1ed314a910c1b676eb780fc1c96f5ac391217ec135480d0a91b11d6f447ad06484b48966ae99115e35d921a506caf6aa7ffbc4ed86aa64367dca321678cfd7d SHA512 e544984d5bd76824ea2093f43f98b59a99e1ca8a5de40e49164b870ed4a91a530f3492faf0678190b91e74aa5d122bdbb32c649998d0ce24912dfb0b83ed6b81
 DIST clang-sys-1.8.1.crate 44009 BLAKE2B 9173de6dfbd3ef9d5d1fdc559700cd3a52f95cd77302063a97e8cf311a35825825e030b47f252c857853663ae8a16709e1f7bd0c608d67c2a74eb36ed588e778 SHA512 a68c426c20110fddb8bba07d6631517b0528fad45802e5a34a22561d7e6dad82dc5001387019a03f275e9a671b09ee0a06b6e86793c4fb4ec655700bb0f5e125
 DIST clap-4.4.18.crate 55269 BLAKE2B cb5d4b093bb7958d013b28ee25f9cbf0479ada392b81265834d75a5fa2e6a4a687f8d4a71520d5bdce05785a874ffaa09beb5707766d59e70928dab00bc122ad SHA512 1f151864b92dcfcc69a66c2a8aa8310ce28171895698d82e2e69e19a6b51ed8780e5eaa77410df9aae2d17c9b45117b913a4c23ef879106c1b7a96182656ebb9
 DIST clap-4.5.23.crate 56460 BLAKE2B 5c0ff6ecc072368022b8dc08703d87802160817e40228fccbf9cbdc15d86dfaf0eec141dec4e8f1327e5a6d1622df9b334e94797027372dbe8765a12b918961e SHA512 4a8ef8731c9768844debcd1ba83a79a607fd32d9fbfe7411abefb8939c5c442e8a206738bb54dddd136117d3992f519ffd1640694ad7796c4e0aae3f95502c7c
@@ -116,7 +99,6 @@ DIST clap_derive-4.5.18.crate 30131 BLAKE2B ff962e52d8d8afcc9639365e27753c6c6943
 DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e
 DIST clap_lex-0.7.4.crate 12858 BLAKE2B a5ecd50cc503157dd69746f3b6e9c288e0fe4f6d5d82271499f657134fd401fbe076255e2be6a23ed0b69daf3941c6429dad8b288223b0ad390a2c435575cdd1 SHA512 a2566868f4619679d3b74b70592ffa6a04b13e38e3196c56bb1dae8bea0c711bddbccd778d2aba3cc0ee074c9b1cc0335222818f0d47fb3cc8109cbc35bb992e
 DIST cmac-0.7.2.crate 44847 BLAKE2B ab8539f41e720f132b2da3176e9c533a2309cbb3dcdb027af4c5bdd6ac68e4a2a97f53efda52236527a15786b73bd96ad940385002412330d7cde60e3492a6fc SHA512 9e55f9f9323dff330ef45da953bc35da79ff8fe643b3984479dbab10b35e05e4d613f7329c46bc119fefa589d8f5f3bb268a7e7f0853003c1e192fe324e83315
-DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
 DIST colorchoice-1.0.1.crate 7895 BLAKE2B f1c841e74f01f33fa83cf41c5f0a1286ca3899239d9a188a838550abde507af374a4fe3e85934d10d28bd5eae2c7fa1f662307bd46d5dd4daa52249cb64ebb5b SHA512 3d216ba46cfcca5c52a56884ed09fe7d6d350ccb44144a60c75006582f7f9a28df21d44375a8cb304c721b9de615875675b3a03c485eb209b2a12d745fa609cd
 DIST colorchoice-1.0.3.crate 7923 BLAKE2B 7055fe61677143f0d4445ed5f6be2cbc284c155aa6ceac04df6f3fa2563a225e440ba708bf40e298ad09775ab7c7e1842b5f6dd78422b06dbd1250908e3227ee SHA512 fc26696189d3935d5510a1237504339c1f354d03ffd3b4e830b7080335aa778bc72787ac5fa9a67a731b9bde2788da778d497f2ef97ec68bdec5145fedf4cd14
 DIST console-0.15.10.crate 36449 BLAKE2B d0d2f161ea045854f0f53af39490c37af170888241b2f63bb47749b288ac387e24e52f936651763a5584a20bcca3512b28d50cfc4435d97ff06cb5de20768e29 SHA512 2d4b99912215a1e7083ac4cdd594f6ef7914152c683f007babecde2be7f3d6c2a861a198c9b4306242d84722d44965185ba846041e2ef13ee9ee9a5d43c370d5
@@ -127,10 +109,8 @@ DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8
 DIST core-foundation-sys-0.8.7.crate 37712 BLAKE2B 0e1dd99a5bbb0fe92f55181a37426f6e86445cb20e355f553b3162c88ccc075644461731a0cdcd93dcca65b6cef1de62b409afbd73ba3070a199ab8e7422dcfa SHA512 17492d5314db03abdb3b1998bf0c396ec8ed0f83bc978ae22d6026afdc86c50b58cbac073b3a0d97b92da7e98be11302faf1249d24313494bc058add4f4cb63a
 DIST cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6
 DIST cpufeatures-0.2.16.crate 13405 BLAKE2B 06d061cb2577057bd2afbc8cd6783488595701dbc46772533645d86aed71ba8b20905625b897840c90aaebb41360a286935824ca49bdebc0763a81df4bd64402 SHA512 97707ae1b533ecd3a6fe412a22fb70cf4ac278c2d7dba407fa7dbebd110d06f88a7b3aee3fb7cf4b0b5ca88f6fecf390c4d3e5ccbd4d18a75fc2f93a647e7074
-DIST crc32fast-1.4.0.crate 38665 BLAKE2B 77398dedfa5e61357fb9abe3415ee53e45d3f1f7aaee959cbc9774f31a10ed324da2a558d20fd7c0674d450c8985b1e9c78b0b65e6ae2d9da6c873fe631c5ce7 SHA512 3e0bf1d2411ad9c651e0242c574cfda09403db24ab4b55560145ee73b31b08be45e5e12ce2db991d165ff056c7f2f67203fb2c048651f1c66ce90ec3276c455e
 DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd SHA512 c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266
 DIST crossbeam-0.8.4.crate 10500 BLAKE2B 03212d9789a66c1eee7d1f4c7883eec1267089ab9d652ba5d7d59a22e04ab878e5defeccf8cff4587a34d976488ffa689bffde596588057d814b633ab3d67d1d SHA512 63650fe2d46ff2e593342b398c153facd3cb7cd72dac9b057ee0aac5ef5e9dd9df0e71536d66879676c0edaa89787d1f365eea35c82604ca46090e527749f994
-DIST crossbeam-channel-0.5.12.crate 90515 BLAKE2B 5a302e58411d99d52630cd154f4f642ec925af3330ced9456a16e417e2e43a37dc2b2288ccc88137a75e682e7b10ab2979f1f90c0bd42ceca8fa84c700b7dd0d SHA512 e17b0e41901b2b41e89913a0a50cd1eaacbf64cd07f454605a85781b8b1373c35bedd16ccf6b24029404a3171e0d670fc2b1474a6448d0feb40ba0e41f99019c
 DIST crossbeam-channel-0.5.13.crate 91174 BLAKE2B 7a9aed6f4922c1d10e4ae12508a03dc7daca773adad6a317c4ea38e544d7c28c56a06623d958aec540fcaa86fa9051a1aaa2c859dadff72873f18f2f3a951449 SHA512 0f31223a7099f84e39e6b76b19cf26736e0c3907fffc2ed3eb0012c7984b1993570bf6d155eba5bfb82897ef0e4fc93b89096071410bbac256ca6be9a9568ff8
 DIST crossbeam-channel-0.5.14.crate 92728 BLAKE2B 0da1bb0f0dc6f35c4ce8d4bb058d61b7c3ff4854f71b58968edc691c1d7016ec845f27e2fffa34835e86f19fdf4507275b013946b2fe3135dfa83d328ecb5199 SHA512 ab3448f7adeccab3c1d988746c3db1fc1e8854a53f7b5cad63fb7874e5b6f5663d34541d4c5383472db56a7c8b272fddfc78ea2ac1792a18d6c8230dfbabad45
 DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864
@@ -138,13 +118,11 @@ DIST crossbeam-deque-0.8.6.crate 22471 BLAKE2B 02b854df171b0430ca8a40349674ff251
 DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2
 DIST crossbeam-queue-0.3.11.crate 15581 BLAKE2B 91b9797f985af06c854c38b8124cb67864bdb47979d2e253928678118515fbc1257108c7102bad66e1f65fd6f324a93749dde86b4ea28f3bb5a16491f3f56ed2 SHA512 c6007307ef9d219889e6244805ae759998396e1d0548e3664ce9ab366ea78917dee75251c4265b0e3ef4ab15b5c6d42d6a5e9b286d17ad42ec169e7fcddb8ffe
 DIST crossbeam-queue-0.3.12.crate 16270 BLAKE2B 75be9d53340ab72e5e52c940bf6ba5dc417d3245fe18c456ca68b460c7747f7d99340517fa1387c7153faa8a0beac002fe3eabedc8638d044e0c05f4c5b98d56 SHA512 a117977e55c0c2eca2a6141e3292dbc75ae5d80c087f0667cd767b9e9ee0f9c87084ceab34937b66b28a586b071e518a483684bb041e6410b2c3ab5924bef769
-DIST crossbeam-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9
 DIST crossbeam-utils-0.8.20.crate 42487 BLAKE2B b50da06721cfbfff07825574feada8a28d3814edb218434288683eec31bddabe2ffbf7e5ef1281ee14a8a77c56db3b66f3c5ceabaea9c72317c1bd2cecda0c26 SHA512 7175eadf9fa7c526fa11ff87e40ff203f0e7a4bcec15cb972f924f3c7ff7cc20b6e2e8dbbc1ede142a0207cd2baa4f446deb25d825d28a54cbd25c263701bfaa
 DIST crossbeam-utils-0.8.21.crate 42691 BLAKE2B cd9015c41f532eb3c90101603f32d383f01e6880718b727d6d1fe46872ae276cda685e1b548cf77dd22bb1a05f0d4c4982332c2bde90e1743dbd7f51919022a7 SHA512 6f4aa7ca10c20da291c4714b56ceb1fab1c06b03b2f4e28e474e9aeb95ab6615a25462dc7819713652c3b5f6a06fa0f24ebc92c533fcf35dfcf2655857d975f8
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST crypto-bigint-0.5.5.crate 83384 BLAKE2B f688f22331b4b3620299ae9b50aa9ba6e1b2c7a4ae55e4236f7ccb8ddee4f61950ee0332b6b67005bad505434f3be74b1a0caa426036dde94162289c6926c8d4 SHA512 04668d432b4169154934d55b8ab14f708e59f70a70704b56cd72ceaca460e15589965aa92a22bef20b32ce637a423cc6e1a8819dfba38a32353bd749f7126021
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
-DIST ctor-0.2.7.crate 11042 BLAKE2B ceb1996d88909f657f605e769b6e73670cb75c361a3b2efcb656bf283971071dd18a683f5c6e12cddab27ea1d87a0b8b4fea39cccd3347e77250bf771668b1da SHA512 f29042559c59881e1917c28aaa6676b61731b9eb50be4efc358efd75a2c53e0939c2a90799543317d600643c52b81b5bbe2d1dd5f9a554af002feb7ca34a7b5c
 DIST ctor-0.2.8.crate 11053 BLAKE2B 6451c50f78bbfd0f9661f17a9a5fbd99b16cfe9e33af7ff2458f72a65d76541fdfdea9dc780bdf711b308d0ff264ba50d8866d664e68b90a432e00bd82112cd1 SHA512 576700ff278039c37105697e67812ab451fd9439c890342bcb2d7dffe167a45561d867b2a60a9b730477d7754a74b2db7ea552d72e70fe5aa28afb411ba67d1a
 DIST ctor-0.2.9.crate 11032 BLAKE2B 3dd71580df939114cbaa0555410c721c66eef82628aa5be34a51365217944d3880d9b51ffbe3d734349cf87e4341237bed9093cc59e281ab8fc5cd49b9e73ee0 SHA512 70c3febb597883eaf99e5c640c41d29091d4da436e272e22238110cde1a762c37dc2f4a0d26c76a212c25013b00a88d7a391dd5e28a36dce88523974519808bf
 DIST ctr-0.9.2.crate 18344 BLAKE2B 195dce5872a0f59b90bedc268c5a5796f3076d12868f29f887294301b3576047ea82098e73ae996f564e400ce316cf1cdd9016ffb714559aaa0465dc826f0cbf SHA512 6a027f4e3881e51e3dbcb89348c961a2086bb63e70652c49107f49b7d021e31f74ec8c6ae91fd1605928f93f5ffa27889f257c166669e18508995168f17b46a5
@@ -154,14 +132,12 @@ DIST curve25519-dalek-4.1.2.crate 305477 BLAKE2B 7553435f9d431739793feeb503a5426
 DIST curve25519-dalek-4.1.3.crate 306017 BLAKE2B 0c02e769ae48e6839e37e622fecb8b1987fec0653049775a80bc53827329b50d6b8aa8288f26af306208d4a2edb94ef92a64d955c395d980cdd2624c35f0cc26 SHA512 a1dd318f96b5f1851d82a6fbd29c44dc85d2f75da16e5bcf9d6ba3abecddf5e0eaee4a7415d8afc09923064fa41529ede2622f8a5fe0b3e6d4c88b418c41bb5d
 DIST curve25519-dalek-derive-0.1.1.crate 11723 BLAKE2B 442b0e4fc519f233d3fa46c17c2e25807374360bd6576e97b4ec33e6c2cc228bc917e4e395a1d70aa19be7bae57db36d2c09c4c7d505691b53d5a624db67eb6e SHA512 60861002465d2ba12a6089b31fcd7a75f7a6d77319159d5383f29e857adea8cb7e5c9c0ab6977c8cfa34b60e1012a1a5dec57f637e6a225e60269ff49c25b29b
 DIST cvt-0.1.2.crate 6214 BLAKE2B e4cd8f4ad2735d0d81cc4ae1a2b0c4b0b6da23aad1fdcb757417e7bbd711a33560605551144d9a1c08bf85ffbcd074c758884e1684c608f89645a98ce382f2a2 SHA512 88c5030e88ac367259017b3dd4940079b29c568343b922280eb0c558fe98c5d57b165008491d8cef0534c8f54e60e4179ce08ec5b01dc0fbc42db68c3527218d
-DIST data-encoding-2.5.0.crate 20632 BLAKE2B 16ea08dd12f09f2e6f8ba2910b3db07d4e7c9916e6a70d41420ef1a0e5393284b49787c47af0868bceb7f5d3f1fadf203f5a547dc8cb97713d5225dc9181fdef SHA512 b1de8bcfd7cfbfb988091fdb550eb98dfa5739ff58c4b789663e5db0d539c9acf145ccd72d87f7e1cdefd09d5771772d131d2b2e2589ac8f0bc6972c801ee0ae
 DIST data-encoding-2.6.0.crate 20769 BLAKE2B 9d5713e63f6f6a4d6e5324fb0be9308a231ccefa20d69cda9e19609a2250e2cd72030ec28309068f71c932327a3ef680b749125658e27d35273354c3465f9931 SHA512 a685c7bbd251a5738b27ac3ac8121a0db049221510c99e0ada6f245ed7499d04ec29d725ad01c688ad283e3d2d5aae0751685c804f6d95cae84e63a160d04c9c
 DIST dbl-0.3.2.crate 6336 BLAKE2B bb912351efaf270363c2a6cefe4da42ae8c6a552690b566e5a7b70115721efd2ef42801500d534de0245b6feff5b6895bed74924c86eda3c5e9a5322f32e1392 SHA512 efed499069e1eacb709598b9a250be353d65dd9a1a27c7fac6d23af6262af0fda60b121c283b9318f301be2d80194ec1ce33733daa554f54ed3f690478d37cfe
 DIST der-0.7.9.crate 85173 BLAKE2B f2dcf402e3d8b6a7ca818a8f260e0996290c77517b06bba8b22849c4d0e0c8f3dd57d664a06d9a7bfb1da6a39abd0740cd7d9776e75669aa970cc3ef63f924d4 SHA512 6de996346365647ac0da23d3fa9c72100d665c9225dc2f0bf1f553c4f0e7eb5c6acf3f1e36a11a7cc20e8b1c44752997e6f592c1d142755df145c5e302800f5b
 DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43
 DIST des-0.8.1.crate 38783 BLAKE2B e85ae2d87866a537baf593afeb4e8c9aa2d6d7e239ceb0db077176455d8bae8e7e1617cec084360ebd7b1f1b47245beaa5dc7a4021d920ed1e8a07dde836c3f7 SHA512 2d54b2eecc3fb269f3fd17231088644d685feb81473043131f5bc68b5f682f726065426dc710f76e8c25cec9de597c90a30790ea3a62163a9e9539115e16c88f
 DIST descape-2.0.3.crate 12266 BLAKE2B cb89babf02cedd75f304250d8fb88129cc5f2839f2dea0913a072c801f27ee2198f406557b5e3a1dc8e93b8f8b03388378475b54ec4c71d62c9a8f9fe28e9e9e SHA512 e146b763770cbcff501236b4e7eb0f90172bc44334cba5ba7ab301333551225d0b86c6192b58d9684d855df720ac487b7eefe855405fe49742a79646d708c64c
-DIST deunicode-1.4.4.crate 177174 BLAKE2B b5819528551d60036a4a5a926ddff1c7ed557ca8bcdc49104ffade1434c03ddce061bd718f5fc650e367c7c6daae7ff5f4c4e7681e6e4fb4d2e34a7a81f84cb1 SHA512 1d158c7b44bc1b3d788e2dc0319fae7e97bd3441ba0e290b5a058e014c0c7056143397faede5aef670ed6e9710b6bde9480fdfecaeffe46537ebec440b037b1b
 DIST deunicode-1.6.0.crate 170864 BLAKE2B db0a3d0459a43c224fc0bbe84bed044ff81b9f05063e364fa38c44bc51a12106805f93569d07469b6544745b684097cf3f03d6cebefc93dfa0deb232fc73f7f9 SHA512 39e5de0d1ed93bf3fcd37e87a04ac3b23d3a50d28b37b0962b30f9461753b3c1e3639c9760101bbaf1d4269c7eaa8568764b481d3cac6faa6b9580f51d11144c
 DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
 DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c
@@ -182,12 +158,10 @@ DIST ecb-0.1.2.crate 6210 BLAKE2B 6e8ea36849f3deaf685c689823f2c276431d84353c8fc5
 DIST ecdsa-0.16.9.crate 31406 BLAKE2B f827c0ea9f80555a1c4e37efa3509ef57bcb8c2abbefac29cfd85c3904d82495753bc5917e8e2b8659bd091d73c2d57bc2f6c8477b7d5d44ab858bd3a99229af SHA512 c69f921653a3dd47fede16aa886675c35b082c7b83486a6fea2c39cf2f98535a00263d7f0e68c5593d16b7cbee757ea913060bcaaa4c69884ca6fe2d3b149222
 DIST ed25519-2.2.3.crate 17802 BLAKE2B aff96de3343d0cfba058203e90b6fd2c6cbd24531abca3a37977a1ed2f1eff0f4d4b6decbfcd9759617f381f88eed32d78397e6fa8d310b99b98d603b809de44 SHA512 3bfbfcd7f442dbb6d49860c530525bac60182bc57f6778e4ee097c7ace9c6a9d32ce430339ec15931070a538d3bb1e1f7b1cf572537ffb782bc5551fab49b2b2
 DIST ed25519-dalek-2.1.1.crate 85736 BLAKE2B 77dd4019467da3dfbe574ceb574849ea665ffd8dc91660f6a9b2596fb886400508bc632dac10a06461f35fce5400f27b89b1270514188ab488a952288309beda SHA512 a3e3838a3d4eef726b65a38196e66456f586b7e29cc328eb243bacc5a247b50f10ce76df6259aa102a08ca921f07d0395793088445f36de33f5dc1aae5223ed9
-DIST either-1.11.0.crate 18973 BLAKE2B 31ece6eb44a367926b5f9ee817f6ac9d93746f5b95c95fab360361f6b3a02160c682d298d115f39615e5b4758953f3f29ece22a72fe4285875dce03483f87486 SHA512 f62a3859afdba762b004d4c766090a25d3bd81e4a14509c3bd0f39b0d433aeff997b39759f7dbc5a012bf3b680fc4510a4b2643d63dda8171bad7403554905ff
 DIST either-1.12.0.crate 18974 BLAKE2B 9db82a8eb351dbc1643ccbe304796610f6090b263d9a991b4d7308a699bdc67d25096ed1e923f521fe3dbfe9195569c1297b46a4b1d0b74bcea4c11bc0a2c388 SHA512 88e1ac4053c39740cf643a8fd445f2d939a8398e952b4b66ab38bb48bd54bc7a976967c4bebab36fed66c4f5fb76082e9c6d40e146914283fca28f31af0e0138
 DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
 DIST elliptic-curve-0.13.8.crate 63198 BLAKE2B 542536886019beb276b587f906c5552d88229eb06364d93db5eb6c93f70555e9e38e4636bda14789e5ba5b54321c0c6da85aa8d584e638fccda107e296c4d8f1 SHA512 64ec7868cfd2350f5a0e9f4fa7e2225b7f5532b8514ed6d5b8a7718f252f94caba4acf51b2471ac59717783289c9f2ab35d47881210ffbdeff08a85f68ef3042
 DIST embedded-io-0.6.1.crate 13133 BLAKE2B 2521aa9ee265515aa1b393764d4930cfa1c7ff3833c4fa7385da93488ae536ad19eeb787e8cd45f136ca36d3cd2f96c42d0b2a0c79c9e8458fea4946d60d66bc SHA512 7fbd25740c74de3ed20c0effb39818576add1d3caf696e5a1e617db2f802eb75d08138771f2eb29047fe83e928a667ced6a23edb9f971143d198340235378e54
-DIST ena-0.14.2.crate 22991 BLAKE2B b609831e2f5dfb6602293cc3260098bf0dac09afd516a8e6062453724d7d3f516bf14811e81ac3e11efd917087dbbf4f9a3524fd30ba79cca85cee2c0c63d77a SHA512 e66eea99484c2b7fa2df7c8b3df3a10dd185163b781fa03b1695900a148a7c1a1676f7e6dfe2c5d18b61a90a6756de0bc42e9c873fc7a53de3dac799b7c23c01
 DIST ena-0.14.3.crate 22986 BLAKE2B d79daa3b5f3723aa7cd3c0b432b7332a0c43a5961adfcc8bed7e43bc656e54ea7e06eb1028714c7f0b52509cf8e6b972d2ac95c65ce808deb0facad2bafe0f62 SHA512 d4c893973372011505a762f4a823ddd4b50d8ff3a2f91298382f9c580fb6f688aeaab43d504a0783f8384280f7be9c585e8a079cb38959e8fdd4a078d1a642f0
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST encode_unicode-1.0.0.crate 56986 BLAKE2B 76e8915408c26bdc909e9ff2d59a1655344dcb4ca0e6accaf038434b7518f1b86554954fda8c7874285924c7d16cc81f62e68afcb8b0efc639407b558df1470b SHA512 c9a21d48ba9d50750789cb6fbe32afd903c583c9ef05a9741007dcdf64b1344735f71dd882ad71ab9e5f96f8839578ca53bca14d13d57b9e27b8cce2cd507359
@@ -196,7 +170,6 @@ DIST encoding_rs-0.8.35.crate 1381050 BLAKE2B 2db6797e4f226b3836c18496ed77f3fb11
 DIST endian-type-0.1.2.crate 2340 BLAKE2B 6048948b467403409807fec776add4366685282a277d4ca40c5fc901228c0652c5759210048b28a94c8bb04c39bb3b359d43254e953e5b476112da7e49151a5b SHA512 d8a9b125fb87099f8bcbaf3688e2feb1c463ce624cd3dd36396e75e7aff177ed5033ecc295c02f491be04dbf240aac376e79a5c7cb591c3b208c442e1c1e6bbd
 DIST enum-as-inner-0.6.0.crate 12079 BLAKE2B fea251b187470b6204f686eede8d9d2fc3869a396d50051a45c72e3628b4d893a2393760afdbe14676cf505b1892ff67846226ffdc4a23f59a18b2cda1a2629c SHA512 c06e0bbc43068161a07a8b34bf1382311273cfc5390f3fb4c90b758d47cf49baf648f6bb277770a983942f7d2effd242bf1f6eaa4eab77e7f6f4fe9ef6ce188b
 DIST enum-as-inner-0.6.1.crate 12190 BLAKE2B c2162a838bb717ea7859d5c11ea820aa6bc79210bd6a9e06e4f05bcd17a3c92bdb7d98453d58911f96dac79bdf553730b58d4949d268321aeae324187602ae09 SHA512 e6f80a4a47f5901301debff47f1e88291ee6d29dda2805373ebee62f77c149a2c7f8d1188f8a365f2e11f5497025036aae4a4c3a7f570928961d1d25d6caabd1
-DIST enumber-0.3.0.crate 10202 BLAKE2B 9e8935a98c48253debde571ab96f8bb9b2f9715235b64870547a9c72fa3e5a2535270b23435ca8bca0221f8665eae00ac2aee75ed68c5d9b4c8ee9e8d7152afd SHA512 f7f8c9049e757fed1481f08c8493d898cc3d2f8303b482a988d69f4a126a4e532648cce44b453119b5ccf3e71dae7b698fa63bab00844849cf42c46fa968a2ad
 DIST enumber-0.3.1.crate 10171 BLAKE2B dc5d404430d380f83825042de278d43ec9492fa77b56f1eb42cd55dcd2a3a2841732e63d56764e7c13aba43f1c0cd9750f5a7eadb5b02e5fca7f607ea58daf5e SHA512 f27f81fe0ff2f940a20617a032ccf07c1dc4d4d27c2eb286c815d817f158cc229d2dbf11fa54643b0990d14aa7dde955d76ae9b3190b0ca6b44810265d5d70cd
 DIST env_filter-0.1.2.crate 13327 BLAKE2B 96f888b30ec8b40032e588f8ac73e9fe23340af71d5ec69cd8b4dc2bcc272ecd64d1d3ab54bc57e7a71a44cbac497ee7ad3df52930dfe3c7ba7dd129df290b73 SHA512 b1f21a5d4aadfd940bde3e53935c04da48e48cd4f825cedaa83968a08244722aa4e92afb9fd2fdd228412754f040f7bb68f24e05c0bf9bf57783aec042808606
 DIST env_filter-0.1.3.crate 15191 BLAKE2B 95fa27602c10e819ef09b8f4935dcc3204104f7c5a0227e5fd33cc51fd77f70cdab3d822670d216321f263643d1f5220f5849002ad857925d4170b1b56cd3fd7 SHA512 94db29f1639636655e05ab02611cf14d5c2c8778be6eddddf0b6b8c21f364a71909a2ecc3acf3f4062d5d3c79a6316e9ef30b2fe042f617108af8431e198d344
@@ -205,24 +178,20 @@ DIST env_logger-0.11.5.crate 30683 BLAKE2B 9dd2b461be5c5cb3411ebba8bcdb53a78fff2
 DIST env_logger-0.11.6.crate 31105 BLAKE2B 536f7b02bc6bd4f186061d55d2c5fb0d57aa91adc73d0c2521e0136573283147d5d336228fa7b64306daec9f488a2a83c83b96f06d648f45c3b52d04699b15d9 SHA512 1ec41e4c4eee4ea6bea38d40e739b1f324ef236fc786553fd77c6bacf6303f13d35c1626d3408a18346d42ebf5c896869deba133ef34b8cccf3729957c72de0e
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
 DIST errno-0.3.10.crate 11824 BLAKE2B f9976b538868daba3cd2d47ff2fdcda16b4a436ca767f865f23d1139e7f232aba263dd4aa38d573442c762999c8a8beab8a4a8c10649d21b49090fa65ced1ec7 SHA512 fa4b9a368f254cd90c6f69f6883af4c579829a6da6f31481a1b527ac9602c8ffcb5e9518cdc32c39b5589c151a20e75a7300c8a907d178346185ecc6e8749f3f
-DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
 DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
 DIST fallible-iterator-0.3.0.crate 19639 BLAKE2B 58b8fe842fd6514fa4327eacc81b157a4a9bec4ad9b8e69248c0f0aa5610dbddb9c8a72e6e6ef9fb8216e8f79e6aab439e90d4d527e35634ab222347cbe39974 SHA512 c655918fcda5deb8ce792708509e4959139f113c1006dd41b94d7073ffc204512a22cdeeee05c87534db9c414da3f4eb716e1a26970646fcb1c139a14eb8a2fa
 DIST fallible-streaming-iterator-0.1.9.crate 9249 BLAKE2B cc4459b34a9ad00552a5248d090d1f25804b92838f41131e475abb83ae0b89401248feeb52a49dbffd499ccc0ba0f2f1d044f2f3e9b06662be01fe2257a4e885 SHA512 34824e2007cb944eaf54b10d6d3885bb17ef2a2976c6dd7695ff82a937cc95eb65d343dd7a5cd2fab5aa5859faae3352a9e1c78f239ff736900c1dbc3f5ef7dc
-DIST fastrand-2.0.2.crate 14674 BLAKE2B ea23f52d745f4fcfd4ec911d48d77c60da837f57942994b17458daac7cae38953cf679459908d68e5f393d03a90cd6eddba23d2a86c2bc11ebfeed0bb41fe4dd SHA512 3ef9c21e4928071619adbad6421165ea82feb04c26ee18893b172f9f8a510b9a2097257ae31647a907680412b68d6662eff13cb27649ed9f5e68c374619701cf
 DIST fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104
 DIST fastrand-2.3.0.crate 15076 BLAKE2B 15c9a1c4f64d94c4bfd38ae139c6fe19b6b621a495c1b57209edd6d76d978eaf018ba77f356b5086c3f462a6de044fb5e3b172fc288309569911a17ec39951bc SHA512 267fecbb7459c8840f03425733d278dd6c4e7637b85b99552877117ed5e8015e094d86aa95841f77064136b7f382276c3cb2c2bef7b2881d272f4aa57c5cf947
 DIST fd-lock-4.0.2.crate 13675 BLAKE2B 055e7254c6ea0185a099cba229c15a1044a6c0826eb6151e990134c816be4dd26bb8ab41631be8650340bacc16324a706656d2901c3969354a854216ad3cb306 SHA512 acc5aaf6e89169062c1c59d5258b590d4bde21a35f0acb7da2e3167d0668fa678d1febc305e32d95329a7e5bdb784fadb9b85417a5e4e5deea53d59f05bea74e
 DIST fehler-1.0.0.crate 9032 BLAKE2B 02ec60e347bde84b67ec41ecc22c07de3059f53301e68f850e3c971dbfe470a805e918ceb5064c5718f16fdf5be497d1d9ee41aa7cc9bbb942de6d5dca814ae4 SHA512 37a481f4488cde37b5ec342f2f58dd3ccd4ad1284ceec2b00032777b1755c8b6fa6ed3accebfc56c7556ee434ae2af79c33612aaa8a02d8b5dba7c3644da154b
 DIST fehler-macros-1.0.0.crate 3271 BLAKE2B 738b8945869c7837368f083c9531986e1cee81d2ca1ab11a43f56731ab73d849c3c70fda8cbdfc23de64a51ca2e727f400fc20f3adeaa777098ab81b032f8983 SHA512 737b73a7f150f0ce308cdb8d069cce3df8aae47e46039dc2e342059af4340a0f35cd3435b26cba9c3c5267fbab6d2688628355c4fcb45781d1bbab8caae1c89d
 DIST ff-0.13.0.crate 17688 BLAKE2B c32379ebfea6cadd162dc169e0b413577fd191620f4f2a1c7d18e50ddfbe561ca865bc3e0fee3be287f43f6c9f2982992cbc56629889689bcbbf652e512da80b SHA512 eab19938f5a2cddb0fcc78b0724efd788aab7f17f04c482e0d06acac4d1cef2bcbfc74d6e4b2d9f535f9c955bf39c2153e010bdd2fa72d6d637d44baf8bf5f63
-DIST fiat-crypto-0.2.7.crate 495388 BLAKE2B bf3c64cea6e28bff4b21be6bad51e6acd38c5a63e24214ef52feffc43bdcd30e5bf6cf9ed2423026b71b028cea16f949d130c8a570c28e7721043a321401893a SHA512 aba4ec81c04b7dc5358a9cc35b50c2596f46ef9d47d848dee51e1727d82b5cfc2ca9e6de1a45958900f030a5bb4b6a564518193b2ffd4ba85aa6f82aef48d95a
 DIST fiat-crypto-0.2.9.crate 495390 BLAKE2B 9201d3faedab8c73b606dce70d65d1138f5fb29e480d56b25cd66a8d2a150fb6d946c9e0ca98eaab0227490cea288b4c78917ccfb6693022d70d74dee94e6e78 SHA512 d916fe8ba3e82a365d20485b93c36994363059dead84c0266b7bfa0bcc74122d71b4a5c8689226c0e1007e7e01fc6f6c76e8687ae14fcc38f6f159287810f510
 DIST file_diff-1.0.0.crate 282318 BLAKE2B 628bbbd75e7a8f192e54f75e3898b2c128f23c0111299fe54676f00ebfe532794f4b7fa28b27df3f94d96c8e4405fb9d2dd73e3459dbb888a38a4e99c6383389 SHA512 260313bcf0860e63d9f78523d81416fbc360a33c7c1740306d9d5b8aa1640e509b7330313c38105cd662881a47c46f89193e473f0b7da12d3848ed59d84e9905
 DIST filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3
 DIST filetime-0.2.25.crate 14940 BLAKE2B 1ffcbad3b2023ba5e9b2d71e279fd8c3564458b28290f3e19bf43b87083e1e3c0e18f191f6dc67540baccb83075df453950230089f243e6276e413321cceedc7 SHA512 90b4f3c4df29a3456c393f78f636d70f2615cba748a972dc9b937c2fcbbf4544f5b0d28c6c8fcfed5d5eda026ac670afffec18ab7d7127cee9afa2717146ccf2
 DIST fixedbitset-0.4.2.crate 15954 BLAKE2B 91270883db5ad0e999ebbca1123d8729d3040eb936034ab8da3cda72a830e45fcb977b3fe3c2b94e870c1fbc366ee8602357bb77e8b9a40cc41a04afad1b266b SHA512 57c5d756b0a202b2506270f0d5e890f7617a1e0c015b6059ea23fab49cf7af47fd06927eb56feb03b37cb2b6c467e326b3f0da1e32cfcb6339cf11a130a3ccab
-DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284
 DIST flate2-1.0.30.crate 75511 BLAKE2B c25d9ab787ef60312523d80cf277bcaae16c7e54b1deb0fc8723a3b22c2586092343db1c538d96a37690d21e52ff822a38c90e10bc554fedb75671fdff6df309 SHA512 21528f80c1709cfa764723dce012903581dbc2b63ecad194ec601fc75103307e1b2ef17479186ad895ad957c9a33c6fd666b2981382a8a68ca78dfac7cb5d578
 DIST flate2-1.0.35.crate 109188 BLAKE2B 8bd6e51c3bcc06044e5b8d7ead950c3beab6c6337052fd48e86175f0fc98c8d12804274308ee515dc6156bbedb2277dfa2706cdcd7baaf2a789122473248486e SHA512 aa2c4f0ad46cfbc7d2bfbdffd226eaa37f5223a34d132d8fb2dfd04c20d15a96c4882cc377fd72afbc7d13e512f5e9934386b0390a0ab2b171d081335c58fad4
 DIST float-cmp-0.10.0.crate 10702 BLAKE2B e1285cdaa5abc561cea8916bb89cb022da8574faa0070d05cd4ab7537b6e429220ae9a11db2ee24551a52eda5b541c157b8d18f00f27458bf380b45df6f20f00 SHA512 024d6cce0c16f56e4f42381fecff1f3c6b9f960d62e81cdd78b1c77103dc4bbac11c5d656d44ec5fcb644edcd7b9c1a905533df3d758470137e48e3dde4633c7
@@ -259,10 +228,8 @@ DIST generic-array-1.1.1.crate 27846 BLAKE2B b8c88e419a1fa801f7bc437191a65f4820d
 DIST gethostname-0.4.3.crate 9336 BLAKE2B 12be5fdca0b6e3788cf3d67a4a80f283d240611b4fd37b6d1c37eb2503e4a7025b17bbb70adf421ac840d8f952434bdedf4691f31362780a267e21e8c4d3a006 SHA512 8c5dc404132f2ecf9bf82d8b89cbd698b4cb6d43141c47a60b95401da2e8c314347ab0a0ad5fba50cf98f01a621faa68293cb78f48977d3ddfe6e6f21926abf7
 DIST gethostname-0.5.0.crate 8772 BLAKE2B 00617e07f5a96a5c67b33e614b1cf92864e8ed48d4dd882ab952821379f03cf88c21a979a8d7ed9c5a32b3c0eeae671a1a5bc6b5ee3a9b1841bc22d5d450f88d SHA512 67a7341724fd7a67c4d9bfbf809cd39d0149a669ce65679db91c70869624f3ec397953494e03c03804827fea269ec961f678076627b1a9c25369a871305a6294
 DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
-DIST getrandom-0.2.14.crate 37307 BLAKE2B 5904388869335ea904d950ee83ad1867a0d3f6831b7139102b53f4bb4a2c12371c9396f1f1cbcc44e3ce69a4ea316651b1674722071bfa7562385ad4b6a88c33 SHA512 6c334415e09f570e3123e3c6c6eed1727533ac6c9c4142e16ae995c237a16effe146832a891be9fdde4335bd02b454e0fdd9160f20dc02f107ad106756221658
 DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb
 DIST ghash-0.5.1.crate 9482 BLAKE2B 77510c9a42ebc486e35cda6893e7f9f464628d6e4ef2f2f1adfe5d6371dc2f7e2d0578665d02dc5647651a96f3f06ed9cd3825caf462d70a740c9e937ac8cb50 SHA512 00041605bb458305f0fc54d2c8dde2cae672451646fc41a94dacf83950ee44f75464a926439e7e6d1ca3ded05a9b697138f62fba6f4e86ea3df034ad7240af06
-DIST gimli-0.28.1.crate 270497 BLAKE2B 4089e0f871295d464e548610ab5f0c2fd863825416109cf58ca827e482897f00eab23b795295758f1e3af16167b52c77c91df6f707f1f445984a6c4bcd68c6ef SHA512 695e46471fc07813dc4a47744458729b097f6efbfceeb57eb3db4165654e99bebb98dde2d73230b90bb5dd7c0ca0c6e77c7c3dc6f2abf70058b830a2fb386d25
 DIST gimli-0.29.0.crate 275756 BLAKE2B 092e5bce9503a337451f63706e7ae7d12a4228db6a43d2c14fa6af74640a790ec70ea2055ac84db3919d19612ee6ee0453f64981390667abec97637679ff06d3 SHA512 a6b591d48dbe93a1fa6b814759a5cb61fba0838288840667aaecf01346a3ab862fbfe1cab51b057a425ba9a0ce35c8421b28cd5195464be881f38905062f1446
 DIST gimli-0.31.1.crate 279515 BLAKE2B c8924ce351af5b8f96ef757a189f7a9be14533c024d496c62037cd4eda790b3f6282cd3013ba82ecc83082acab1b60ea80b83e0fd5f8eeb381fd7f9df88ce0ee SHA512 b9c8c11547dc7420fe936b9f32a4f5ccf3bb68d1d9f39dedffd40d631360f6e032e719d858668826f1099b8a262e8096aa7ae1f6d7d3d7aaf47934d832715949
 DIST git-testament-0.2.5.crate 9312 BLAKE2B 0d36d28a36d1b477518aa4cf5d8488ceabf947d54dd9ee1607df475c75a8976792a152c866af27c312d222cc0c3b2a57d7d29eddc8c751bb5b99465058e1b60a SHA512 9fa04b6cbd1e13d2ebdaafd852fab2bceaf4e59d8aca584462b7cb92a53c798c17f4ddf9bfff209fd59e18a1af4eb60499070b7eff7b3cf4cc84d44208268246
@@ -273,27 +240,21 @@ DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5
 DIST glob-0.3.2.crate 22359 BLAKE2B 564b72e2738cce5311aee12d8d6147631cb571f7b96d8d3823098d3dd449bcc23ffed5a6584f8979402bef95536b0e73fe9772f273295a0079782b9f7d88d19f SHA512 d15389441e337e3fab9c30102fe7b4b1b3e68d8cbb5d14162d2fd7e7d01a9812b2d6d6d2a24a60116418be41e2075e70becd6994c13b34365d512521e8debb02
 DIST globset-0.4.14.crate 25090 BLAKE2B 2c3e6f8384a066ebfa1f36bf03125b5eae79329255674e32c58963451d4b342ada10f17524232a953bee133b3c77b678a141543759ebc622b5fd659fe55622ae SHA512 e83e4f5e42a97609e2579b09f49c2cb0a76a94e7e2975c5871f2c5af5d3b809736e0a7b220404c582f4a0c7eebdbfad6cb432e89b26401b58f2b253f8c0151bc
 DIST globset-0.4.15.crate 25177 BLAKE2B 5556f4cd7c311b2ead3a83fb2c84280a48e493f024bfd7269c91cde6ab81315d2d7f051f7cee9d7d34e6c8563c2452f0ec04a9d5a8ba5273bce66f5ff8f9054b SHA512 b9281b8bf48d2e297be533aa31c701c0115978b4e580b684b78a385eb2ecb4125187605368a6858311d6cdf5caae7d733cf1406c79241b7d19e7193f5a111dad
-DIST globwalk-0.8.1.crate 13705 BLAKE2B 4d0fcc805cfddb47af24f5d8f2c4f9bcbba48a8a523e565f7ce7bea767b6d108ae5e3f5cccf6647b497b3690f862e1652812b9d83ffd02c634119d5e03d1a7e6 SHA512 3235fdd9c24ffc54994a0b37862c44e16a4c9ef6a7e1a008c5d83dc62a9683ade97e451e4da7f6db710be2532339a55038fa3bb85dbe6685d1c807cf42f6d955
 DIST globwalk-0.9.1.crate 12572 BLAKE2B 3518672646219e391aa0f157ae6597c78603bbef776d92403b874f848846d60ff8734e75b117dc76b1be91f830157cfce698058f445773748b9dda9cdaf3afce SHA512 9c95d6832950b35cf6ac87bd986116a75c847f11dd2e96ec0cbeb6c223ff901c949429669698cd75c4244a60c3de7df9adec648bc531303cdfba889e09f29448
 DIST group-0.13.0.crate 16526 BLAKE2B 099ced5b8d16e6fefc331f2d89aee931ec5900a168dbe31bfbe29bd00304e8525fa5763dbcd60cb19ac6c62c8d77877f2d83e700c7ab18255b08c9b42be60d24 SHA512 359db06bee4cb51ffe799d9c408791e310e72fde3bb3fd447cf97482ebb909af07b43e9b728e3639d5497fc905b650bf00403b3a6b21515e6628c2466e0851e3
 DIST h2-0.3.26.crate 168315 BLAKE2B 81c65e519bacc8570a28b82808828044d1c94f8cf9111ae432b1684f216ce51c1b583b87a2bda3c36cf206dd508084b8f0877e93d58c8d511f87eb143bc77ca9 SHA512 3e1fb02d42d86c9fbaee6f10fec78eebd9a31a70efbead1f4ca22664ee0e96809a52b06e23a9b6f5d0646422dc8054b5ff5d82644ef65cbc0ed2b3729d849163
 DIST h2-0.4.7.crate 174114 BLAKE2B bf146baa6f998b6d95bfee77f190be7f85af5304a8b8b9931674a35a0ba0a1262d26ba097149327482dd988f8900e996086a820fd828fb023e52adb104e21bce SHA512 0d56fd3a67473d98199e0d944d2bc094c36638f3a2d986942e6bb2e1c8022e7a53f184d5ac5e8d435ae97da481ddb8d5b2a039c70180345c8006290fef39a59e
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
-DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356
 DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
 DIST hashbrown-0.15.2.crate 138478 BLAKE2B 453888ce68b10cd6e93d787986603fceb29b83fe2dc417e7e57316b9e0060d0bba51ec7fb71d46a038662c99f60deac8237a8f349297208d1d223bcc13f0d0ea SHA512 d6fc0613623f9313533dfcab1240e97f652f78f05baa21419f7edb2eff030c4a2c5f426d3eaae747923cffdd8aa9cc2648340e5fc229395b5eacc6fae087c8cd
-DIST hashlink-0.9.0.crate 26390 BLAKE2B ba93177de6be0ca355038b80091454b1ba4daae5f266b9796b300db08e73a5399471a73c55fa3b9207f8702fb10f75d4ba4b1c6d9d7ee0a75fe5b93ee5de2bce SHA512 bf9d356d39e14e4de4a95ac6f43064ce42f42fac15ce005d7225d2538968ab171c89c4fade7b1f76e480783406d2f6afd005f8450e0c674b9a138951f0abd7a9
 DIST hashlink-0.9.1.crate 28928 BLAKE2B 14276fe00fb8aa7a8183b5cedc99eb403c0a68cb662555cd51efbe55a46c864f68f3d421395f56defcd1a87576c5a38509581adb5d02b831d9aab2efdd376f9f SHA512 16189f332b9e2a71f8cf4c8b72485eb107c4a84d4bfe3c739ecea8fe5dec33ad3c796d57830b12c176bc65a2066913c809a0f7c8db83e9da1bb0c555de8d3717
 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
-DIST hickory-client-0.24.0.crate 37831 BLAKE2B a0fae0f448ee632fb024fa226981a492a8fd7a1b5defeb9e4b8a506e393e89449961bc76302857271bd5767d50f6aed244675326ac904e14f1d592dad672f2dc SHA512 610d5677b2b5cfdb6ca69babe57767a908f2420a8fb60e9a145f0b879b03ef7fef2127ff6ea65ba77d6f30b748a9c9bd07b102510249997819b57217a8890734
 DIST hickory-client-0.24.1.crate 37830 BLAKE2B 5b996ffc2d2e10edec0fb2aad9f361be2383c2adc2524ce583ffc3c43f3cb0a49236a00c70ff10624b805b41f20016c12d9ac97281fb79a16fe1710868f91287 SHA512 b47f6e7e237c803ce0a1ae7b034e9173b64b9c4e5db74259348e943004f5a506b36c57563590337755ad2eb411524f09593d771f3d2bb66eba225a7418ee0792
 DIST hickory-client-0.24.2.crate 37573 BLAKE2B 9a0a0a055e02a3db4893163f981dcc293879af323374a934ba719f306a31cd9bf7e4e839e0ce56155c07c112db4580a978d0b81b43585f127179c061b93e5e5a SHA512 ca819f9936af515c31e646a337a9e73f67a02e1991a56a07015214786f77ef891a2a20ec247c151efcacf1b3d93ba526552ff9c58944716aa65b138f49ef7aa1
-DIST hickory-proto-0.24.0.crate 374416 BLAKE2B 9dcd982073ca2d4d7ed64c0b4a88ef206fcd739dd32d89cf6eaa6d24c71f0e2f24ac11361b1a1579214871af4cddc53b938af57ca322365f055ea1f8c8f939a0 SHA512 de27c186548baae47965f450aea53a140fa66b98285239411accc83c0f00f485dffa3a255e8402362e5fe3952a4fdc11f780782a876db46202930b84370017b4
 DIST hickory-proto-0.24.1.crate 374410 BLAKE2B 342ac0893684c2f350e4e1e26d37323e066782ab1c37db41f00d97b47856f2ff9b18c216fd162884b330dfeb542d9bd4da1eaad05a869d83f3245b5e6d451ab7 SHA512 9b14d8f4763b8034313ec48f96ffbcab0cbbdac73c0b32e04eabb5a11cfbb3ba8c6d2a84bff5ce2b1a625db5a76be895929a60bc3582b56012c736c897fb99ba
 DIST hickory-proto-0.24.2.crate 372860 BLAKE2B 81e36f8e86f3a9884e4e22bab989d9183e9efc53c57bbc611cf99549c2dd083fef5f4f8f982e72147dc4c64c313be5d6fa3c56c8309f8384518ebb3df3c1a4ed SHA512 f3ab93d60f28ebe85225c55b27abf43613e73db645699c8b8291ce8cdf76dc66bb0160ad0f1dd4b3f7e01e23d05bcf0fd702f2753d72ac0de62c5b5f2256f275
-DIST hickory-resolver-0.24.0.crate 90666 BLAKE2B 367f71f8558f4ef7f376dff7e3b57bcf3f5dffa51aa61568511c886a2d81e45bffa2de0e9a98ccd67c3ea97ad560268f814a95c3fe3e022845abf206447931a2 SHA512 b3bbbb193d4c4e2e32f7a5d59f0c63bd808c31b840b814f771e483613feb70dd31aee17391206e99f6156431b64085edf6cf6d7d7f8bff5b931589ee2ad78c27
 DIST hickory-resolver-0.24.1.crate 91134 BLAKE2B 9a0930e26f64317012e507ceab8b06ba44a367bc32bea7d0d58cf27a6980a6b82a66411cb629a576a5890a1d7ebe8717634dba928f5d420094d4f1f971f215d6 SHA512 f24e726b4f6b884be6d5072d030e4f542c9f25bbdc594fcb68f2003aa6425209a51a044fd4e83f2ac4746e67bd7a5fcd2b6b0105e5b63fcfc777dde173029609
 DIST hickory-resolver-0.24.2.crate 90292 BLAKE2B 7b09d1a954d3aaa89d2b44b180ef922da3068505432361b1f4e522bf386d381dd788830313b3257c169d74fb0d3363de46e518db9710ba83c61e34bff007fede SHA512 8a6febc9036a163a5c5dfe83468ede61121270763ea8d672bd5e32277becf84789d32e62074dedb49fc88a51eb19589bb0b489620eb77a3d3b6e61df21e9171d
 DIST hkdf-0.12.4.crate 171163 BLAKE2B ffa03876879110dcdd3081cdeadc9490534c44763b3b49f1d6a5f4407a7346e6fa1ea18303f429b23adcd23e8898ba8fbf3797f5ef9f7ab7b11499d130311d68 SHA512 a43fe20b7d14fa26b118c6eba2b84219645f65f2ff33fcca679b139ae3e96f72abc1e7a47eb8887aac5afe4e34211434a4eb5a2fdbc014666d82c4af340a4b21
@@ -306,13 +267,11 @@ DIST http-1.2.0.crate 105932 BLAKE2B efc9fc4ccc4a622781ed895f77c1752baf34e82d249
 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 httparse-1.9.3.crate 38227 BLAKE2B fa79791feeb4bf22bdb845c947dd7b857c2955992e649fa3b247d71365e9b1a4011a07e62e4a39b0a554634259ff156d65a2628400b6bc7bb333c620b12b1688 SHA512 16f9baeb1b00920b4a29c93556482a2da38b58aa661b87c6b543b551c731a037c9ee6a4c535f03c62fbd30f2e5433ddc9ef1a5e9373a2debd930fd1cb9ba304e
 DIST httparse-1.9.5.crate 39029 BLAKE2B 3318ed1d82f1cc52cf3596a133b59b9613fd09b6e50e4cc0073fbd37275fe53ae6dc23c322569d06272068cc196aa253527d45a939361797f6c77a488ebda874 SHA512 88f4489610c6d3338353731c38cd368a565f362bba1e9b0e1e9cffc1ad9fb871ec2282ab1e3956947e41e0087d1170d35a0e2b71b9e823c1acbb7ee4c6c8f48d
 DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a
 DIST humansize-2.1.3.crate 11953 BLAKE2B f5ed4a378fd6692a6241c84657f9ce5422ba7331be6fe79b3d94ec87827ecb8459a1b214f7ff6db00696fbb17bf921c718860de4139b969a0f386d7423c1a4b5 SHA512 0adb6825650fa074a0ff33a4090563987ef311de5ab23e12f715286d8198310d17cca9028f41b8ef0e17d15b939e50d165419853ffde6a7ccf977d33acd920fe
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
-DIST hyper-0.14.28.crate 197204 BLAKE2B b99c91eaf65947642e217d159372750ce57e332675705cabfdcafdcc9ed3cd90130a9c600118c76e167b927a481b2120d0f4b499772e4fa710803abbec5385cf SHA512 deb26e3815e6315dd193c4db22efe1e73e44bc7c1d400bc7654e950bd074a200b7cbb730ca30faac0940c88529fea60d5737a4fc7ccd4fa24c2ecdb2a0b450a7
 DIST hyper-0.14.29.crate 198107 BLAKE2B 9bb42a18c9ecd0a3055daf2be5e0308ceb3bb66cc73fbcf0fe91746c40f437be0cfff88ac653fd43f25bb855fe563ff9f7a70c031e02f007f5fbaaf5d752283c SHA512 998c0ae60a6fd2b80717da1aa9596553489a8af890f34d9d9e6b0afe1e7e8960645fd5cbcf1379bd14d91f006fd4eb1c45e0d1ac5d3bd68731395c1b51b1dd07
 DIST hyper-1.5.1.crate 152653 BLAKE2B be470a4a902b464d95f30e656f0f54c8a426308f03f118aecf583a1994fb12ec8229e09b43168d856adf6d3dd39d8dd0f97945d4202f4badf4a3076eab1e4dfb SHA512 ec90992a7569e8e7fb3e4a9250131a272851ec0938da48730198ac41347f82e7a308b1c4ba8b864de58ac849367d4360dd2d8a03cde58b330329949e87ff85d4
 DIST hyper-1.5.2.crate 152817 BLAKE2B e5e1cdf2bbedc51e076d6084261b6c4462495c5e71ae230251758b1271d7909b612ceb97b7e5a83e7668ca5af0fdf3918e3cf02680dc75df609ae7b16734e579 SHA512 bbf3b72650c464b8ce36c96e25dbb975fc1c28cf2a78315d03be8e377b505e57534dda4ce600a5b1d57ae974ba869675ff5bdc3e80c8721b575593fc12b55b94
@@ -349,7 +308,6 @@ DIST indexmap-2.7.0.crate 85335 BLAKE2B c7430ef510738ac5fc4658f3e4d927ca5cde7807
 DIST indicatif-0.17.8.crate 64869 BLAKE2B c534020b2c7b25bb07cdd0fd4414fc817506647cf5b8e2081c22be58857d5adb170082a3756004c69187619fc5625f8b9a1904566dc51c621838e09ecda5b43e SHA512 487e73445c5c7d3c16d6f93a3d9767f41b37d2832e56851154f8b69e678ab7d9ab04eba225a6bcf8b48842ae0db0249b060e998e29a252dedf8afacdc88b1aaf
 DIST indicatif-0.17.9.crate 65246 BLAKE2B 9ce758e7dbafb3394d632a6fca910ea3d1237309ac9bad0ca1236cca9563abfc442509ca96fda1cc7be6916875416cf2b85390c53266f59bc18c6589addbeef1 SHA512 a0d798fa86cc4b75d080bd233e274d6554d82e1532b3590d27b9fcdfdfde4da2717afa16ef42b180ca0ad43ad151db8b0963890de106e36b6bdf07f87a519bdf
 DIST inout-0.1.3.crate 10743 BLAKE2B ac2fa5cadd98088ea3f6eb94ca46b3a9ceb6547ba49f0de311d86474d71024d1a087ce9b8d44ec808008db69146e9c81446bcfeebeb2fd74d2e8d0ad2c4975ed SHA512 1db5bc2bd87aae145b3b0be6669a9a722df2aac8f970fda210aaf945c372e641b941cee822917926dfa1ab8381c6e99cc7df4b18d2f4e2fbef17fdec36ed2beb
-DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST instant-0.1.13.crate 6305 BLAKE2B 83a2c479e21e789ca9795f66116ebc55481a42afb21f4c0ec0551edf07781901a28978667e92b01355b43e0e1a7ffcd3cc37b5501a7521da78f4f352e586c9fd SHA512 b7839431e8920c4c0841d0974eede75fc50f2bb7a9475664bd2c4ff6c558a10084e1c025e5be977c3364ae9112c365c0a6f480cb9b35ee4130ca2beebcf650a9
 DIST ipconfig-0.3.2.crate 24468 BLAKE2B dbaedc8f4ec23fbbe48a8c79f16fa1575b8374f055237447d12eb009694067a82bd54b503f73f9520e9b731dbf2b7797ee2d6fe2c07ad3946146b32cdc68ad0e SHA512 6029a7d453db77bcf397580fd44c5c777ce6c288c251376cb591174e9fe0aa66b49925764050cc9bcb2d656a8f6c4af0cbcd6685b2ea4616c2d2cf8de9bd67bf
 DIST ipnet-2.10.1.crate 28407 BLAKE2B 50c27384d58bf57ad2c3dd0ffe44f1ceb1ae302dd40e451b0c0d69f227050fae17c368c417666c1ec9d087caf775132db7387d5a6c919a0863c78a151912ea64 SHA512 7f55f23b2b0936e3a7dafa2db0447dcf1b63a092df4af8f6fd88a02ecc8f0a290b0d21b18fe777eb573201bf82f56ae475a447650ed0803af676b1e0c0970cb4
@@ -372,7 +330,6 @@ DIST lalrpop-util-0.22.0.crate 15225 BLAKE2B efcd5d94968b1f90a3e68729d54797d403e
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
-DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
 DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
 DIST libc-0.2.168.crate 757025 BLAKE2B 2597fdf5a77345754b8c9168d9f07f83ebaa0413262b94ebb19f976f49cc2c47893e788ee2abb3d00a995bc8f99b6ebcf24abbdb320e18037e779e1241599b44 SHA512 499f7273ab5eac0961fd927d5204ff4d5b3b290c20d00ac99054ee596b6d3ec4d6712772c52b09c84554f0514a8f66b41995ceb5b0ec38a7295a4fccf0e94349
 DIST libc-0.2.169.crate 757901 BLAKE2B 1012cf93d8975aa20fc3f2332e253426ff66be6aed63ace5292cc8568ee419b0f1a4b5b39ddbb78d9c2dfd8d72eb0d068c98faa229ab55556da5e674429f0e97 SHA512 c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce
@@ -385,11 +342,9 @@ DIST libsqlite3-sys-0.28.0.crate 4975624 BLAKE2B e8d9e637a9ed616372e6e9496a9a709
 DIST libsqlite3-sys-0.30.1.crate 5122296 BLAKE2B 3f3d5ecc434af6ce6e28836dc6bccc812d53da909e5e4a92f0eb7b6dd56c66c5243e29901867df2e72be424f20fed6c896da59bfd5349fad831a6305cb25db51 SHA512 6ffb2a23a78f3221ac8f6c9260713741970e522bebc1ec7f3e1d7405f25dac9024ebe3a73d76a6ed74dc7109a8333d6936ad1c64a0a7c75d6d81f97c3524e952
 DIST line-col-0.2.1.crate 3915 BLAKE2B 7723ef44a9e7f1cf875db5dc496133b4c1b282850d9e5595d90f35f9ecd4dc83e3f3fda500702d177153d02cb243f2816b624e2bac21880f145a1dd5c37e1554 SHA512 386827d209d462f38929b0615921764ffe77ddb116b322c61f4220fe4eb19c3ba62e1a235263afd22b01416f2005073964d7ccbc775366f735e3d7306547b427
 DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
-DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62
 DIST linux-raw-sys-0.4.14.crate 1826665 BLAKE2B 804af73daf396bb20da14f831f26ce06325181de14f0c277350bd22d21789f2bdd663a964cc0e7c5cbd2e084285d02a401a6bfbb3e8a8f079c120f9488b56f99 SHA512 28149660bd975ede05624af3582d5c78f498239f5d89713c2c32f5372fc16f4ca024dec35f81ea973a2cf986098890395dbda06ac6cf4ee29df3f9a0e11eaea7
 DIST litemap-0.7.3.crate 28728 BLAKE2B 00a04ca0e4e774b317218ab990da4c6ca1f342bbf229957db51801f8ec36339b665133bfe3847ca68a40d901d78d87e0041e09f0740898ac38ea3c8504309c31 SHA512 2c3bc6c4cbf6609f3cc2d986e701d23b73f5bac55995887c90aed01bf4392a42c718a69c0050296fa635a46f7cc9ef3dd6c6a2a505d3cccc690899aa345455a8
 DIST litemap-0.7.4.crate 28257 BLAKE2B 52989ad353a782e9592357530dca3504e3ef5475bd2f1b2c795b60825d971ee6d3e6da51fbb6bbc26cb3c3303f6a751a3e15d1caa78c0cb888288a965666279c SHA512 5009c486a87b2f52237e15e2e772365424e4780c146776656d8e1551e52bc8e06e5c1cee8db1c59ef20d0463962fc07ba5221a46020a82df17a2f623a175f58f
-DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3
 DIST lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe884dd69c61c54dec978733b95a853c3e5af26f237e48ebb4ee9dbebfce0f6c06067f74a3d122e92f5ace40e22d7 SHA512 525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7
 DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
 DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
@@ -399,19 +354,16 @@ DIST marked-yaml-0.7.2.crate 24771 BLAKE2B aae1094bf8be3c4cec12a47b23f19841b6f60
 DIST match_cfg-0.1.0.crate 7153 BLAKE2B d3f40e5b16761fed337ed18dfa9db9e46aa2ad84ca8cfdc7cf7c72bea7cff8d084d95214ce013b3515bbe5b1ad4b8527bfce692569551e4588fe6f396a8a96ee SHA512 fd36f2b128d70a0f278e708bcb3274d90380229f754aed7ce9b808138b0189d5e1a07e0ba732216f788a530cecddcdd980559b3f71efa371d8805a213ff8f2d6
 DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
 DIST md-5-0.10.6.crate 16161 BLAKE2B bdd43889aed114cfa97ed0c70bc97b89fda28b14033a0a26bc7309ed744ee907d59151ab92e9cb95f0ff0ca1cfe2af360c48f1b99fc8a246a25c803a4b444a0f SHA512 024a9e14aaf860e748f64dddbb8aec01bb9f40d702d8de31497fde1d66a663e97ca1b06b600d8a818a0c707d1ef02eb0f210befaeacada458acba69ccbf476ca
-DIST memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST memsec-0.6.3.crate 5512 BLAKE2B ed2a36cb139098be66fda58f052c2cf22bc025e34b9ac2b11a1a8f848d94df6165f205543ea30a5e7b347b85fe41670973155f68c970dde145b41fda551c5644 SHA512 6d4ed30d9b975b00a3eb4b92bb1c7b83269c2fcec7629975334e53b7683ee28e4432ba4390d1590d88d1c4a0e689dcab38f338a6bdcefd3bfaba75067b819d8f
 DIST memsec-0.7.0.crate 6532 BLAKE2B 48fd0c732a5c83c5e0ca23816b61bdb7283c665ad73d20089238ba0b6863992554a7f8a3b41ae8b4cb0f31204b03b32b3cc7fd5a0af657a24bcee01b3443ce58 SHA512 73501130770d2ac0e3904e7f293cf0ca6bd0947a6e05e53a40498c950b8519fe591d3888badd5cf6134e1f567c18fa2ed6ce6fa3ac3c8c0d441645c3e95cddc0
 DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
-DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975cb60f0499498a73ce4375e7d452c9ed62d4b0b6f6a4fa591aab55e5d7ff20033baa007fd6c839b9d74b31142c0b1 SHA512 2f8f09d7afdb9d78bfc80a228ded85a215fea05e577e907921f1808f84aae30ab118048d7b53295f11aeb5de70ab6cbdec892f3a2417bedf6f53a4576d095432
 DIST miniz_oxide-0.7.3.crate 55774 BLAKE2B 41e11d955b75ffad131104a6cb3e61d7219a932d2dbafe3ab1229fa8b85b6def569a264b76a47324e35d1b9296e74a19585d6ac043469b61fb9b7565b81022bc SHA512 b9e2cc214d6213fb343cacc5f87228487592883fc8f7cf46c9a26b7148691783b2729ef80c0d0e11fbedf6edb1332dd87d88b253f7c2e645fe86ff2ffd47121f
 DIST miniz_oxide-0.8.0.crate 56343 BLAKE2B e4abcacab4c8698d0489faca8556faa7bff53d272ea0c80e2e7843dc0f6f9229b7d5b0a17ae210344722a379853e7f14212505ee05da4e60549081cf77717c1b SHA512 044b641ce6d98d1968c1ee0906f91963f9f524d6f3fdf3059708177a759e1d498c63e595d3a3f0f9f3210c45c828b9b70274134ba078b899d7fefc2bbddbeee6
 DIST miniz_oxide-0.8.2.crate 59068 BLAKE2B 22808b2137b4afae29cc5cf25d9f643d24824293524542e2cbac3ed0fb0341417c052310602a6f0a003843abdbe7715a95a6068c807cc0c843ed867958650215 SHA512 e58802e332a72123954ba1751cdb59509789bf930ad74da3d06e2c1c3737547fc0b9848be816a66b6585830786b7a0fce7c9fb574789e15f3b540709563cf854
 DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
 DIST mio-1.0.3.crate 103703 BLAKE2B 0d2360e4ef45f37104208a31e9aa467d6db041dfeb97403a010a36e1e1427f51d97f8408948c75c0084e6c118f058267bfe87d36e7911cb37366f2b1ac6eb693 SHA512 2142edc7e9378fc3437110c85ba2cee9c9683e87034cd44275d2c389645979db53fbbc29fec304f1d8c8f0464ae17d2a5db1aa9215d696fa0282f5069700b1e2
-DIST native-tls-0.2.11.crate 29008 BLAKE2B 594511c364e639e309f32f37ae20ecfc5ddeeb39c3f7180c5f3f2cf304d8c323b977af933ffe70cce696a5a63e17c5fa7ddb119d46fc3db819a28e31a388640b SHA512 7e77959932f2859757f1aeb37b78fdd459b7b6fd02424f4b7399525b94c21d1f499a718775503b8f3dfe3b4b740e1cfbee77052a2ebd0994468addb3fa665e6c
 DIST native-tls-0.2.12.crate 29517 BLAKE2B 76f4bb2aa8fefc306a04ff50a62d6617f71c3c34aa83ed35f11714ef2306fd82f76c7e26ab7ce50f8eabed40602ba02589dde2d98b55ea6113b45cc539c84bb6 SHA512 15fbc9d02134d3d55334d2f02fe4f64be50db991d75720b38d802088f06cf5f844cba6b25dfd7beb92f2cd367ba477ec2098e3c7336c4e5a5a7fd39c753fc723
 DIST nettle-7.4.0.crate 583944 BLAKE2B 79392e3b2df0551ed22865a42f0ededeab2421764e6daf0b6388c08080d0674bbb88f733ae5d29ada841e567c734a641e7fa6ab2bd8e8c627f63125c9c153598 SHA512 f132a9c7ea566930fcc813a9c799d4ec6849522dc70e8b478655988a9ce1f75ca731b0c0b7d2a702f96273d51770b47725014e6d1e407ff58343a0b4b7560871
 DIST nettle-sys-2.3.0.crate 28576 BLAKE2B 23518adea067a8a2cd4235ccaa851ed62336847db9bc8a6adfd77cfde8c57f4a8de104cfac0e17068027702e1e4d79efbe77c3733cdb032650fff1eb1ff15457 SHA512 f453608d860edf86ba62ed959aa1d04301c06d13bef5179b2a69f7faebe1e1ea41fce163aa4a48617d21fc493cce16c28cc11a051ccfd13d0be93c66405aa5d3
@@ -422,19 +374,15 @@ DIST nix-0.29.0.crate 318248 BLAKE2B 3a13a88375a359cf77b28d7f77f47f178bd31ef74b7
 DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
 DIST normpath-1.1.0.crate 19785 BLAKE2B 9d5567f54dfbce894d6550cfd20832d78faa8a457ea81686fb6ca3a430a2aa4c944fd4aa977d33fb67c6ead0d609355055863492c1c975b6f47b03cea2423261 SHA512 b30ae64a57cde1a32f3ed1cc8cf136f1fb04fb3b350018245e072327927c7346d2a5bcf53a8844de4ae51188bc15fa245267fe0f422fad763fb8304d7f518729
-DIST normpath-1.1.1.crate 19786 BLAKE2B 39c955c41283051e414f8576fdaa51f11f0ab5a23bfb7f6aaaac38fd9474912721c546810c02da335a9095fdd6d8e37ff2f5fad2aa93d93c21b4be76267088fa SHA512 05f1f498f571c57c2307d201d5fa15c72fd2f297b7854757107bb27684470d43a4d40137d31c735018dd2ba50c11f23dfd5e989909e809bdedcd7bbf018385ca
 DIST normpath-1.3.0.crate 20719 BLAKE2B 6f7e91bd80a6fac14fbb72e304aecb6353b05a5e970d75899b8c40313b095f79463fa4cca1f7879c11d41e2437d499247c36915075b4190054f2f9a810e1e682 SHA512 a3cd341d1b4ead252f25a77e42165cd5a6b1459946ef55a5319558b89301e01e445f7cdafa13231836d336284798e48cd4e17632cba53a17213badbad3ce7a6f
 DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996d1b07a0fa40839072df3061bd7e5bc9341363403ea3ef8d19c7725ba3b7a8ed540c63e2209123b1b93f69418288b6 SHA512 b4f37786dc85e0596e2b7b261a5a9fe0265bf1651c39efb358dd649b926b12c3093f307b98bf0c4df3899f0a7cb1854f2596bd5c3e22fbbef42f912ab2eb5043
 DIST num-bigint-dig-0.8.4.crate 123825 BLAKE2B 9710266116ea15d0e56792b7c8e217931765dcf2377bc05f23bd386625087eb6a7d7aca7b8f0beeb78ace9f280895565a6de3b14ffda7721e35c741ff64b71c0 SHA512 88ea682c5aabc61c0cab9234e31a2dccdb5458d3bc018e1f9ccbbf0a9f09ed0053341e93bc53f65b5bee55bafe71d50bbcd48fd085ac723ef4662e15664925b8
 DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100
 DIST num-integer-0.1.46.crate 22331 BLAKE2B d88c9f84e5d803a3aa8f44dfc1bd6d9b5e336e7cbf47231cb3a7de30dfe263c41c62c586d31f0029459c8c240475cd329b3fce79f355be7643bdccf8d56dcbba SHA512 e27986d91f6c6dc3d5a0900defe28ab5f47905cde3f84d0914b7acee076dca8fec6fdb7b631ac94d3a31eb01ecbc5854e51afc3187cd1abfa21e1bfafdc700ae
-DIST num-iter-0.1.44.crate 10249 BLAKE2B 9e70a4ee02e784c5eafb033dd321f70ee92582c2a75871688ad43970a1313ffbcd49c26a8c6787e537f041ac60fd269131e157bb61ff2bef09e5ccfa372b2a09 SHA512 f7cff4e6ceee82aa6de469b9db834a45b50a3b73cb068ea714fe237f74fe4875a33881f3421a71ed31c47dca847e3f3b7e21cdaaec52f0aafe6dfb8927f39f42
 DIST num-iter-0.1.45.crate 10320 BLAKE2B 9f2a60a819e31a6e7e048ae86f7fa029015a73888348676e54ec6fdfe76abe94b632a49a82b53b86488ea5af1031f677b0eed8ba7c5e843ce804c6d6af123622 SHA512 6195c7bd5f904e9f0aeee3ce17b42c0383d053f9d37954a9ce3b4ff0a048afa121c9a37aa9c74b9ace7353d7fd9f57a7d04c7a18e1456fc2c4c298d8ecfd0172
-DIST num-traits-0.2.18.crate 51930 BLAKE2B 6c40e155d7a52267a7183d8030ef34245492d33f103cc24551b10da3eaa18e3db485062ff87057dc23e6b55e381e5c5d2a2633aaf6f4763c06677a0a0c524f02 SHA512 e395ad9f3b21b0dd1d3a94cefe0d68a42d1b1d429ddb2823696f9cd75042568a635d93d133ddb9497ed357e5b3be5caddb8e4a4af87b65882bbdc60b05c74ebc
 DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956
 DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
 DIST number_prefix-0.4.0.crate 6922 BLAKE2B 81bd3b588c788e6865104e5ce87119b5e0c5a526042963d52cd582ff23c2f8c9f32b4c445ef0397fc402b6d047e031d8e2c67ac97e191bde22e17662eec3a554 SHA512 a43b668d7314218b86ca7451daa9dfef71f6c9f6616bc34c12d94ae6030f182bcca9da83905cb46f3d49d0aa81385a787e92e4f3ae239658067adc249f8174df
-DIST object-0.32.2.crate 286994 BLAKE2B b9085200fe0107ab0f8ddd5c5ac82bc681dc6266c6503e4a803ae4dbdec775ae84ca4a736754b770d858ebb058342af45d485d4c9a41f57966ca1466de40a4c5 SHA512 5d03d998f06dc592c3be141f7163bd72a0e73396f95d22ef1e0ffbfc66489bf727a6f6fb813a32739609b619b8e34a471974b2231dcfa23df8bff52007c25a96
 DIST object-0.36.0.crate 321771 BLAKE2B 6350df2cd8e2cd733397768e3fd9a2a79d182e0e3fe653bffe0d688a944713cb83434b2810a48638b30f89f0fc5311784a7c7dc82291191a8e5bd310c82531a9 SHA512 5a75b296bde7a01a9a5cb59da98b7599b51c3ccdea2c135c5291ed10af8b1fab46dfe936e43de617328c216fd113913545fdedde00adf22fca251149b22bd6bc
 DIST object-0.36.5.crate 327435 BLAKE2B 1ffbb8ba57024a7273217edb1db76eff03e0689f81ba27b0aef0a622972e7f6acdbdc480384b50d603dee6c38c960fd25125a313264187aa0e429aa839198dd4 SHA512 b85375ab3660a8a0c57833c28c4dc665dc0664857e1eb3cd472a61b9ec8c16c470b16475545c2c311fc23cb3c43755967f93feac12c7bfad013cfed5f879e355
 DIST object-0.36.7.crate 329938 BLAKE2B 0b02cf2f44e99002909b38125edada1a259feae59fd0e5ef52001755b6878cac710c87c60fbafdbe405281e039f68572ea3d8093d16128899090fd70df7f2fa8 SHA512 dd69172349ecf51fd2351d32cc4453760ca1d15e854a1cf5ed99112032901a54b4645b24163b946deed11f81d3e3035e1a5afd8bff20f335dbd05eceab073478
@@ -454,29 +402,20 @@ DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a
 DIST p256-0.13.2.crate 63434 BLAKE2B 8c0d6997b60299382f1da2b7caa1b0353b787352bc3de9ec7168bf224ff7ca15b2ffa28f99377eb11cb6cec3481e5d28c68042ac88c1cea27e84aa8fff5e0658 SHA512 4105c597346e2bc74ad7b7173d13b3b46cf4a1df87ea1699586cb7d09beb1b9f8d152b2bd0bc6849c69771fe4d320dc15a9e275470923b495971e9aae54b0ca9
 DIST p384-0.13.0.crate 236495 BLAKE2B 240fa9cf7cc066cba64e9c89d78ae65d0f0fff3e875b0175646114784a2eb0083cbdac9e1a17e6de6b3e9a6074b8f318e8d6abfe63b7de432c2d19dfc0fc0091 SHA512 e81451d336b2fd0c1dc3483f1e586b7d4059b3ee7cfc935edca6be1be02d23b1e380859a44d0a6cc6538fbdfbb22cc22b8d3aba11cf90c6fdfd0e8edecdfba17
 DIST p521-0.13.3.crate 138499 BLAKE2B 758cd3d1917e9e3055d1ce26194443b4c5aa72812194cf63abef0750342501d58a4c27b92272504e2295a44fa291e614b462dc112742e8576126e280a6cccb0b SHA512 fada6c066deb17c1d046ab4e321b32b35ab851e4f39ef9d095b7a05163a4a43d1e4d35fed4f9594b854a6a1dc32d257685eeff33956698f20f805980ee763a8b
-DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
-DIST parking_lot-0.12.2.crate 41723 BLAKE2B 7c9a4f483b09f4e4bb25fc758c80e8259cb02960b791695a061fe595cd6ed9b13f62903513cefb595bd633488b23254dee054a98282162fc4664301ce04853c0 SHA512 42794b06d410771d1ffdfdd4a9cab136cfb80cf95385876a580fc45739fa41f0769adfbf16be54a9a931632e02d2464278c5395092a1d6107703875e9ad112b2
 DIST parking_lot-0.12.3.crate 41860 BLAKE2B d1899a1132035aaea3a784290cf4951ea3b36b2018d407e27d333b2a2ce3820e040d635009c44cb6e58ad07cec6565c0347af6f6fb02954eac2d4c348bb036f0 SHA512 368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703
 DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389
-DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb03a3b223173a3bb8cee65a28724eeb7bac87f62aa7b1df5ea3fc93af3cee3ef30b83d06c6773d6b856a7e6fa5fa197ea SHA512 7f0df70f9f1ca8d3da0b9dcc96e49daf05d95c3a995289266b5333f68818d686d32b0c733dfe3a0f62da78fa45caa843a963923b2d0c80899c33413dc749c032
-DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee
 DIST paste-1.0.15.crate 18374 BLAKE2B 69ee7def55e658a9aa72405bad62325e8d6021a4989fbf11c88d1bf05fbac520f7b04d467bc3c6eb45043a41119f65aceecc4a6a1418a9192d73f33134545062 SHA512 5026d3ec7141ec4e2517a0b1283912d0801e9356f77b703d954b379439b8d85e3886d42fb28f7835edaeeac465582da14233564fb010c71425a59c9e1cbd46b4
 DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
 DIST pem-rfc7468-0.7.0.crate 24159 BLAKE2B 478d355dd970b9705ebcf44d74d61ae0694db6de16b2018548fda88546f53e35b965ff72d939def399a49fe97d3c8317a10385ace94b3d552797ec64ace1eb8f SHA512 f47d3b6c7c8bf4547916acc2a3d6671f6c1308e74641419c8f1df810d8bd940aba8f94d361e4cbef3eae3b7f11587cd3996a11be3be41d19111abfcde7a9272a
 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
 DIST pest-2.7.10.crate 123707 BLAKE2B df683c015ac230f2e51ded7f2400b68fb733845dd4601cba89052a2d1148c89d5ffc8ff7e15a42f1822d617c872b5a59fa0f1db88cc94edf5e1b8cbec57be44e SHA512 3facdb4a8bcf0356b702cbff4d314db32a80b33fb3512e52c31114a3f666414a49445a1f502c911cccfb28b7390fa058207570bf9127677815842b4988d1f34a
 DIST pest-2.7.15.crate 127895 BLAKE2B 6a0161a85c35e533f1c4992b842d6d1e8b83a0f39365280f6e156dacaf5a313c8a4dd24c241788200282fe0df8ab3372dbffe648b6326b3917dabff7b0ce7945 SHA512 a044c8e92bf63dca6522da1aecf714329278def96b037ebb38dd485d6063bb7b15ecf762fdfdecd2026136c42b6edd89702f624cde14b437161c372d6c3d87c3
-DIST pest-2.7.9.crate 123517 BLAKE2B 96ce6c1be69b0b117a5d7f76111ef341d095696cb3ae923d56b8996f936f0bd9c114ca0d922525108e515cf55e0b94709fc7b7cb08167d3c1de9416dd8d7eb01 SHA512 818ccc355ded72a752dcaaa2a0deb7cbcf215759604aabbbfa31641495120612312f8659ee8c7a7cbc57705d24d635654bfa314ecf4beaaf41a3cd9209bf4f2e
 DIST pest_derive-2.7.10.crate 36221 BLAKE2B 5cbb80d894f501b282346520d900ac718b36724e46429b17d96ea91e6359f0115173a4331f0db48596e77b6bb2c605535c774231a0c19ff69b1c34ee0c7c0ced SHA512 c63ec4c6849b27946f68afeb0eed6d3f3bf6160bf73ef4228c3303b5b9271e30db8e93d01842ab3cf1ea6a987f33b1e4f55ef4bb62fdf7d9ec32220193ba2b89
 DIST pest_derive-2.7.15.crate 40745 BLAKE2B 6d1b81bc50a6a70e88cf5ef2f40adecbfd65702dacb7c8ae64f3d77bcb6c632f4cb17b0facd72e3bc60a12d758461acbbdc6d81b110faf8df6c764904bce970b SHA512 22cd53c1c9062db988dcf8645a6320f96219777fe35f9d8fe05f69df445d58a39157c029a93d5fc26781c5c44961afffb9bd959b3d4ecba2d4e17b23cc422250
-DIST pest_derive-2.7.9.crate 36139 BLAKE2B f9c550040a771fa3fc47c677ac5951799be3388d62d5728ca5ee0c935bb29858927de3a95aaa58bab55cb527494d4a614fbe340d1e617623b4eceba561dce47f SHA512 3b0030036ab7395a397a72eb40fb3c6ed000b819d5e8a6f19a3c5125f9fd23bac0dbdfdcb05cb4a33e0280fe1e8a432f6d2808e6e8516b9013442717fba22ff8
 DIST pest_generator-2.7.10.crate 18411 BLAKE2B 67e4df45b33e6f7b212c2e1a0ca2e064359b9237fb94a2d3eb40a886ac761c55f198be734a3812b61915f75f6646cca277fae03faadc06f3cfcc6b3a36f36487 SHA512 8fd4678f445780cccdac73c51d75a823a9b71c9b9c52c9fd4dca32b2bc4e8a8b33e68d8d90bbe039e4fb2fd9eb8247bcb7911019325c1137ff4d9d835adb0f59
 DIST pest_generator-2.7.15.crate 18417 BLAKE2B 258d73a82601722a791801b2b0b8c676b9c793cf5e3f74bb39fc7cbbf3b2be247b839eef01ac4aebe98363a865bc19235c9b13cb06b3d1f383bf7b7a15c64b96 SHA512 98e0101900cb4fd0e22af2a214f380269de10b590078a7a9f03154ead159912abfec664e1f89c57aae38ca8b54a163da4302d2954713711bb133a9c2ced32f48
-DIST pest_generator-2.7.9.crate 18412 BLAKE2B de57133be03c7511a66541d7c4d34022f74ec454fe831d4409b84eae161cf23229fe8855235a895eab3497b83e86b4871f5ae6450a2e203e0b9460295eb6b54c SHA512 9d828ec0ffee47cb83b747a2c26fdd1d3497c348f00a224e34db161cc6d5910715628d4a1be630a1756457d99074859a6983d23e607e939fcc49a4aaa54c11d9
 DIST pest_meta-2.7.10.crate 41550 BLAKE2B 2a5799519a7032cfd3afd1c2cd23b6af2e9f317717613bb635128c578dc92bfb51706492a083bd6e46c737784c0a69017ecca0f09124786ea633377124ef1f36 SHA512 8c931690d025be0af8ef3ef997eb95d3ebcef47ce0672544a632c77281651f2d0c9c34f1b477426164b169bab638171853bfdad2696d32a90ac22a8bb143cf6e
 DIST pest_meta-2.7.15.crate 42121 BLAKE2B 7211276778d6f6017cf9273a5c181740808fb67782b59993158641a67a670d496d59f5702486d07fbdfb15eda225dff9ba7fa35c2235eba8e60d7111aee39b5b SHA512 dac3e599b280f2ad9d3d6c1362ca18e27929f15047ed9195a3cea1e1ecc03bab98355cb39de1c793764affe41b24f0efcb6660ad0c81f7a6c5201f402e4c6a64
-DIST pest_meta-2.7.9.crate 41547 BLAKE2B fce814275e14b98b6a8c86ebce614b772cf263747af7c17d8eeba83879924eb8f9e6b892338f0164e0f1e2ef276c5f2b73c330369e2260c894ee8ca9eea4ede5 SHA512 2137a5721e72fa1d85d7430e9966ad7a8e16fab0e7cabf2e177d6eb4844236f28e869f20093c1f8d4458ab37c8793ae2184ce17e4f9c53190e8d4b7dc100318c
-DIST petgraph-0.6.4.crate 185895 BLAKE2B 9ddfb2796c461d2820db8227753113b02024e5dcb694a0bb2826bc1f375f028d8b98a3bd67555485db7fab88eb86043f5b768585dbe0c60703cc655976030a2c SHA512 b5a21572526387af3151dd4f864bd95c94f65eaf0612d96f99926faf646214df205bcc652b98d3b281f2e270779a4c1fdd6a32614ed60b3612e5d594b2bf3f20
 DIST petgraph-0.6.5.crate 710970 BLAKE2B 7f590e93fb44f1bfb8920e512402edc1cb087ff9d5dac7bc4be965f64ffacf9c1c503eab4156cd2005f41099f6b34f51e49b21dfa217271fcc0d4ee16ae85366 SHA512 454e9805731374abf1085f1a8a72aaed85e83cd30ab9601bcfe0e46882ba6656242284bdf32b6e75c2f5ebdd1325d5f8873d5f720aabf297822ca97311afb677
 DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b127f4af79b2b5855cb014a0080bec1ec45be466513bd57faa39c77cfde0d6ca02b6bb77d37a23d697603227da37 SHA512 f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5
 DIST pikchr-0.1.3.crate 77527 BLAKE2B b08214feacbfa6c693fc3ffa81557b8e2b63b2a1b21da4baebdff1f243843e85380f43d1a5ed71375da1546958d8ffce709114b16b012fa23aeaceee5b436ab4 SHA512 4794b6abe022127fe90619b3a78fd1cc23139a89607576892a5fbf783fafb75317ca66c612ccb84a0c3adf8b8b4a027aa745271044257926a4206cc2b671fa14
@@ -505,8 +444,6 @@ DIST predicates-tree-1.0.11.crate 8393 BLAKE2B a8ed762ab18f3cd72ed749cb3db3d756d
 DIST predicates-tree-1.0.12.crate 8392 BLAKE2B 4b124a7b718d2942f5624d410fb8c59c06e90ec5b576fdfe20542dd00da64fe6a5fbacadcde3c3a6f19b8ef99efd862b08be08e08691e858a4b3d7bd72a4cf71 SHA512 f5f6d7d0cba4ca7176a26d9adea5ded46f1a3361f9b6ceaa7dcf468ce616912cf3b764b8250f39a42a24eac71fb94e0d4d822c89361aae02472cf761ba55dfaa
 DIST predicates-tree-1.0.9.crate 7960 BLAKE2B b758c52dcdd0ea237ce25f0a092200604765bc83c5edcaea646c6b1db49431296b61aebddea3b325e62f0ba9bbd5edba7ec92fd031cb597e7e8d642b966b401a SHA512 1fd5d9a84ca8fdd1b3c4759d5e6fb16e3d8fe8b0dfe5afbd16bb509c8558b0750705fff47701c95f7a8df1a222f639116a1b9ba4d89775bf03b06daf34f249a3
 DIST primeorder-0.13.6.crate 21296 BLAKE2B 2ba479defa1c26d14f8711f6be5020eee9bb91a39fa7a7c14a93dedc6de920e0ef1c9f6240d308233d0e0d6bce4be9500d0e9cfb01b6c4f9902e0f77a2f97352 SHA512 fdf52b47b36403d5218220b886a3ccec7828731b5a59ea1d48a25fa85de754544fa9c94d51356d2ed904bf2d908bdb4fa87c53e597a3c9f2941d7310f70198ac
-DIST proc-macro2-1.0.80.crate 48227 BLAKE2B 1b4d2a1d613af8e03fab7a976707ed9ad4809ba50775992df54de10e5b8deabfcce423ca962fbce5c22090421cb0b8b26b8026d56562aa6569a8acfbb49d55de SHA512 d40181bbc4f83ee66be7721e8f89f9a08e368e12a8a0d4c1dcdb1c29cc72b1bcb8da598de1ad1a155a8182026ab7f8365f7a46fc76d589282fbffbd35aa228a0
-DIST proc-macro2-1.0.83.crate 48661 BLAKE2B 787507c35d0a922613e9f52628d7798a0d5a32a68398bf73f84acf490e982b9a6e6552277799f3682d7c9a5a759fa7491e94314fb1fbd97d1933e0835191884f SHA512 dea63362b905c8c762ed5f8a0f4402e43189dcedf418ed734e4ed14230a6be4940ab325bd5302aa2aabbff88b58205a19858cf295333c0a4d92737828cb1442b
 DIST proc-macro2-1.0.85.crate 48988 BLAKE2B 236f2a07c758d0d8628f003b70d4b25d5f0d2bd8cbd3955fc4262d7d9b271c6571eb0fc45c95fd816b426a84ed5ec5dfeb81d8041d4de955cce6f3b9fceda1f1 SHA512 54c61dd0581bb5802e077a58fa41f113aa1fab59026478268ece293f2643921b7649844c1675a21a3a21674cdb3ccf94928e5bd069a02bf6813ccc1114d37262
 DIST proc-macro2-1.0.92.crate 52353 BLAKE2B 9aa29fa6f1c56c0392a94a81b4c61953f4d185012cdca37e356817845535da79d7094bf43472ce63109ce479a2fd0cbef4d802afd61daf92c4db303bcac60e7e SHA512 e614f08acc0a7e97ef580479cf5b682378df1ca16f09bfb2296ebb3490a435229dea9d682c621c54ce57e8e1d3b7803eb8ff83c88bd02e07228dba6d02f14aee
 DIST pulldown-cmark-0.12.2.crate 149070 BLAKE2B 35e4543dd530a80ed500384c6a6f2bd10bba0cdb4e03f472d630ed17251b85f7d0a91635995964ad8d40f7c849e0b179de643ee3645a81b311b78c4ec3678f47 SHA512 7514c4282d3c4ef0b0f7ae65374a549c1a027d7fdd5eddad8a2de93dde49aee2e3a2eec2c5c598967b128c2edc6981fa6dc55972c8194206abc9e7a673eb9482
@@ -523,20 +460,16 @@ DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808
 DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2a0a0dc24f0282fa7eb01fd1351a7dc8b5af3a55ea321e6526fbe037fec3cf8b32463166a082a6e417a51fca SHA512 3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3
 DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
 DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
-DIST redox_syscall-0.5.1.crate 22536 BLAKE2B b7766fcf35dd865fc98495f60da54ca9a6b4cff007f4323d1c63de5d1152766aa5517139b5ec50afca39d934360c701a180c4516feccbc2600085d5d72dabd2a SHA512 0952b5f4f79f2cff04b4c21d964df7b56bc0cbff8d8a2a9a7d38ba66fd69cbd0fb004cd3d8ac6feadde8d9590858cd7e1763da7e4a5de840cdef42b1b6f1e460
 DIST redox_syscall-0.5.2.crate 23957 BLAKE2B 6261df25a59af5119a21d31fc3b6a8800bb1783cf2fd63a5524d48d0b187f5f2e65ebbdec00d9282adf110ba8f307d4ceb154bf029a0c6a26e8a887fc722b2d7 SHA512 b7e39a08e220153370449cec7b058c2dbc4916ff7be01b34658e1793035323ecc28f40712194cb9bfc9b863e4bb316e58662721eb0e54f68f09438bd880ea032
 DIST redox_syscall-0.5.8.crate 26319 BLAKE2B bd69a69e2a0f3d84843a8f76199ef6b3991698ebac58b23f69c26d02f5f3e24e77a9d5e8259e9fbff3887f06d15ced94ff23b5a3272ab475918e6e3e753dcde6 SHA512 5f9632f1f89f4963c36ede4da9b955c3474b673c3414d81cdbb61f46c08eff67167f703a0b06b239beeb2d720f8fa592a5493c0f7e872728b5b95f561ff11348
 DIST redox_users-0.4.5.crate 15514 BLAKE2B 9fc9d9c4875ed711efb75fb08f345b5f4f0667717d37710143742e48251a709c53760bcbc31ce13e6432672f9417be429c38c2e77a6b786887841714290a1194 SHA512 7a25cc91c9d1bfe537f20b83255990681d136ced5aaa7aa0cdb1b1fc024ba36aa1fb75c335c768a85ee078019a9ca2460efd911cad8ae6fe8b0385fb171aa4b4
 DIST redox_users-0.4.6.crate 15585 BLAKE2B 1d60d0b7781395ff271d79264910d24fb021cd8ef612714265abae25b26ac158d48f542f1e73701bf5b99bd67546a7b878e4a14e40cdbd478b35bcc8b4778f5f SHA512 719d63fec42bad3cbed39deb9242ce1daf3f391bccafa8121f63198120371f112d78b0da8d66458519e946581511004983f04b0a697071f22294ac7c831120c9
-DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b
 DIST regex-1.10.5.crate 253805 BLAKE2B 9f5418b577209051640c3614a98b15604a1e71144763a6f00caa7757f0ff67fd833a7d14fe9d6acef96386a2a4eb60cf5d490472e73fd62ca8bb0e78d4f9f125 SHA512 177fddb001e14281510e34070f88f8e5167278a46f1d93d9286d9606b7673346f504e4064d7ad53558e6988a400c728e33b663ab398fee12ae23fba7158da5fb
 DIST regex-1.11.1.crate 254170 BLAKE2B 5cf41012fc2ba8a006c0eb4a922cbbf1614bf300be361c9e2d98956a9a5e9b140e37bea09132fab7bfb633d4439158723624bcf45e8c619c4061b399253c1b82 SHA512 d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
-DIST regex-automata-0.4.6.crate 617565 BLAKE2B 8f1e2a3cc1d2d50478776281d2bf10164ef441dcf7127994f4a0341ec40588ec8dc1c07fdf9f670da9e61a7753551500b80314df130370b61d2c03c2b2e3135a SHA512 b288e1facae2612f73d3de3fe9fd1af13d337107004f990263abe6277b31b948478ad9c2b807dcafa73fa565e48bdf2113139f5ca67eb73165b7d29e2ee5c9f1
 DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3
 DIST regex-automata-0.4.9.crate 618525 BLAKE2B ee3fc41c8c445be4c1aa3e5b19a3e61efd641b1a24e7a1ed55f837c1fba9c816272cb4645c13232b66b170bc7c413802928beb22e3891500141ad4ede65b60b0 SHA512 40bde0ec91cc27bc0c3fa237a37ecee5a1f023dbe006a999c5888f8f578ee2c4c64d9edfe1827546cea8e92ca3c10f8b4d494d81f3d0422b40d90bca9cf598d2
 DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e
-DIST regex-syntax-0.8.3.crate 347497 BLAKE2B 9ac2f63098ffa3fff51fe2bc0bcf9ef164cf9389a909a3f0cb668d2598e7ca65d573e47d571ee2e6bba3a1a96ef7c298b8d681e1ef89c8c53b7d590e0e22839b SHA512 925f7bcc50d94c65d34fcc770c6e58dd5b8a045541c0109e77b8efe842eef4c110087ac9c0f86c7c3022ed013abbc5c0a187d796dce292ad5361a0cdf7153d76
 DIST regex-syntax-0.8.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed
 DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff736f2d9991b19814ffc1a414ebc5b76e84fb8fd36c983b38e8e391d165cdd9047832b0d9100f0e1ba7085484b7db5 SHA512 549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8
 DIST remove_dir_all-0.8.2.crate 19074 BLAKE2B 1ccbc24f5e687d4c816d10e69abfd0a28d35d05e38d626e53e3b1a695ba94e503dd837efc964ada43f4ed9d95ca84f2e715bb92a39333bf2f958fccbacbbbd40 SHA512 db20998b6db76ead161b69ad4f92cc7139a67285b1d7cd7a3631b4c46450503b378a597d3e27c618dd5a4f77c0b3f20a25036ad495c88a9a1d134a6af58f0134
@@ -560,12 +493,10 @@ DIST rsa-0.9.7.crate 80231 BLAKE2B b8f6e435f35776f2a67f79f5791d035ee5753512fb8e0
 DIST rtoolbox-0.0.2.crate 9179 BLAKE2B 4cc9faea86aaf0f9e9ed95269d0fa8c633d7c05d539a435bbfcadc563ad5fd0d3f06bc33f83a24432a53da483bc7771edca21e6237888254b1d000f7af1ee41c SHA512 2e239e821d0bdb171ff9d03d3b8df2fbb561ae67ed653f66096ca32b2a83badc7d1b74b4ed1f0f41f141ff2a383fd06618f4f7740a03514b256eca4db0699d42
 DIST rusqlite-0.31.0.crate 152252 BLAKE2B 5ef8396ab6ee9f6887466e7ff856c6260f40ef85361ca451e230d8590019d6ffa4952df15abd21cf300cf51da4a6ea4e82f5dc88dfba474f2f62036cee76caa3 SHA512 6d20b015ab72d3d75c363111c0cb41feae8bff83104ebdfcb8e5efc1bfb63eb48a17f6de2e6c96cb1e916b4795fea6d58466ab0820b151b12d1dc4c29800ba66
 DIST rusqlite-0.32.1.crate 155563 BLAKE2B fb310ccf297ca0be6f0fa045ece633f12c5664defc56c71763fb44f60292e85103ef235cd37eb60fb2cdc91cbdabdb311b6937696bb96146513f687af9a786d9 SHA512 f21986063af655842c41cb1f9a7711d289d52f69850d02b7c08eb5381e43c0b740fc047912dca5f9a745469ccf6bed12b751d2cc5e351adafdbf37fd69946cd9
-DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247
 DIST rustc-demangle-0.1.24.crate 29047 BLAKE2B 8248b014eedb26cdc0b748544ba91b9aae9c992a6f93b4d3ac256b78f691d572f8885a3575492ea556698a241d2759743968293079ca02bb6a5f318b0ed66dd4 SHA512 eb897c35300b87766e6105917a907fca1c5b1f7691fc03c6c1aaf38075ac883a73d1eb54a245d13ba59c7b0f0333d6543e23fc1b1c542fbbd5c750a84660b9e8
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
 DIST rustc_version-0.4.1.crate 12245 BLAKE2B 0ed627c560d88e5ade830cc5f72c62f6ba88be3e30d0f8db34761fcd0b284e5b2fc063c240149aabdfb12c8410ecdbe50cb10a3544500b5a020f95a31cd6709c SHA512 7aa8a487ca7411b6d23cae62f7568fa3474a7b1fd1589621071be3428a550ed3b7c4ad68277a8f86849e5900397d7d0e9d678f5d423742a045dc7c660fa6c598
-DIST rustix-0.38.32.crate 376999 BLAKE2B 681ea50f5405b3a749a26a481995d3a85800378067734bb857e32e5d3764687b0da4b3749d227174440e432b374ae9ada154a8288e4353ca2ff1b851698477f4 SHA512 8f028b4df785aa78fc798f3e053d0a4fb9b3c552a47f66f52f1666f4c1324441be6581ed643c4ef0f56d92e1a078c6d3b45be183fc3df0ed1fc89de0d610cad6
 DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
 DIST rustix-0.38.42.crate 378683 BLAKE2B 4071e1118ab8111bab9efef39c6e35f8a3030cb230cb3643df7ae09ffc750b18becf1f069c2714b0b6d13e334c12446433057fd015c9dec04d7a1372a354ae05 SHA512 438bf1e4663cacbc7c0af23b10ecc11c8b01c53e18c2e82a740c46b4a61f06cdd25d926aff27a9c39084c39d9c950c222a1a3a6d5878dd240554fa593fa762a5
 DIST rustls-0.23.20.crate 335933 BLAKE2B 754a580f74b16ebb8f0f3dea9f3730fdd0ab9c4d04b0abb5741ecb69548cc32c54713636922031ac1acf2019df602db101da2dc363e50f224c815f1f8edca37e SHA512 3778f649026b59c4698bca9207ecb516a237e3d782d7727bcd93a2a20f0ed7b02e3931cf956b75cbec8fd806b54a9b231e3b663d0123f9894b54283e34e78dfd
@@ -573,11 +504,9 @@ DIST rustls-pemfile-1.0.4.crate 22092 BLAKE2B 9a776027d6e43a336ecfdd6713d4b1e664
 DIST rustls-pemfile-2.2.0.crate 25849 BLAKE2B dfb94a77fe9d86b17b0c6badc6b715f247e9aaf0b312bc9698dbe8d38fff281428ceaec2ec73bef8009667dd93536dda2bc7e7c49d194b36244dca38dd86d577 SHA512 1e69f0b72c6060eb0a54ec8a1cb51809525b053771a1d417892205f8f5dbcf4ba45250fc0d6a836e0cc8fede06d934f0a90c47d475cd8e066dcb3f7504ddaf17
 DIST rustls-pki-types-1.10.1.crate 58944 BLAKE2B 1bf83e046802a5eef5dc597bcbe045a7aef146c489ef5fca442bc20a9a80dcb2d15cc8e07ffff45890df069b99698bca2a9463d1c2925a8f1a5eaa673ebf621c SHA512 ec63005b54bb9676fb6ab3f7a399aa816881c34670577e8c8de7f86a46a834e71c2363049ef152475d784f12b6cc9301b4fa20e9d478e95a8f1b9ad75f6ba2d8
 DIST rustls-webpki-0.102.8.crate 204327 BLAKE2B 8db832f181b46bdecc419e1433dd5550bc181cbffa1961aa90b2533f92696ebe15d71d742225bf806e2dc3a4ebb110d48bf62b0677089df1eede6d5a072c0a28 SHA512 8cdd5d07bb8d6c3f0d1d6663babc3b7ccbe8c9b1463870a3dd095c67f46addf4097a715da796c70f1891ebc1d045ae7d7c3a352400e8bfd6687e6cddfd33b1ba
-DIST rustversion-1.0.15.crate 17406 BLAKE2B ef68a3a83e11f6734be94117e5170f92f9e1211d353a81b45ed11d4c738278c7f519ebfc9896681d564698fbcc579da10f97fddd77d56b14dbb96b90e16ea811 SHA512 e0e37511c25b71a64bd6f91cd8b29e43c4073ef56196de808634f3408cc297fc7fda1316a5adc5fffde9192b7d64f1940deb7cf396277a3805e89e15b2a855da
 DIST rustversion-1.0.17.crate 17621 BLAKE2B 1f077ca6fd90333724d1ea9df7f5b178f37f895b71a7b2814e9ba8618bffcd2307f9cb4ac2eea25d461a6686a4b5b51eebb80f1b1ccc773d4da1948c47fe8abe SHA512 0565cddecaedae17e7cd99bc34f54cda242d4c29cd4269f8e3b178ff91d49f3682e7ffe66e436bbb138299736c8e55cc143fefb74c076911fefcc41ba98064f3
 DIST rustversion-1.0.18.crate 17794 BLAKE2B fa35445404b836214bdbaa3de8e43312b6d8f50eea32540f808a6255908d756bb1a5dcf49ca6268a1d214c535c2ee770e295c0e7d6430268142a190b31032421 SHA512 263d2cef02b6df4d38b35af7a9ee3a6a044f160f3cf7c6771528f23dea342232087f73f89e419ef7869db771e73c273c05b3dccfe9e29f707586b2059e820645
 DIST rustversion-1.0.19.crate 20616 BLAKE2B 025944fe053ef928f26affb890ef6a563b0e63cf6acc0ce7bd4ff104541f819bbda48ebb59fd8a677e44ca1ea21f4a18c209adf2004c9ad79604dfbeca43b5fb SHA512 45b959aea8155ee47c51aa1d87c6c344b5f4b20199a2646ca30bdabe1c2458b014be91fe0c48c29c2261ad9e5de6df7eef7ddead1682e584d4a906c17984baab
-DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST schannel-0.1.23.crate 41667 BLAKE2B 3f34ecf4cc519f5302f0ab5207907a275c68e6fcbb47630aec4ed5d5f1a1cc7475f6d7a8c22361e9878002f9f54314c1f630ab0c1f77ea309714bdb7ada6c9af SHA512 dfce25e3b8bc09d8dd1fce2783fe02ec83f74697cb24aa212ef9369a628685ba488f821cb3e5f863798e0e59995038c8d748f74b89f7929eb8cfd804d5066b84
@@ -585,43 +514,28 @@ DIST schannel-0.1.27.crate 42772 BLAKE2B 55b3cdf596d6d490fdbc10298eed7cb1b1bb8d6
 DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST sec1-0.7.3.crate 17979 BLAKE2B c30d4e617f9c0c21b80f14a7df88a164ad43f4c18fbedc1ec32af41193053e67ff6ea83db54f46c8cd6389d930984120c2a1688662fd8083e0c23bd4995d510b SHA512 be646413d84b39a43a0af478854f47db3b167c2bf1bedf7a58392782c423aaaa38df3b3676f9807a98c6128152295c426edd16d67d62ae7048caa635bf39641e
-DIST security-framework-2.10.0.crate 79723 BLAKE2B 9978af62742c6f58c6720a7a9d76aef3627531a4e5cb2b131584727237ec743eb1e688029c8abfcecdc8280b16e6fc85fb9c6fd93be65621363b0e3945899a83 SHA512 693944670032db795ceb944b187ecd96f094449fc801cc5f8b903a5cf117832a4db97c23dd0ab6d66a61da7ab56b5e9433b5993cbcd0b8dfd88f96e819958a5e
 DIST security-framework-2.11.0.crate 80191 BLAKE2B 23515556ff935e7a19f282f7dcdb28bcc93ff1b14fae069d1e1be35abd5651a38c7c71594eae085c8385e48b25fb84b6f5fbc44636b5d1badb15e89ec6acfcbc SHA512 7a1a1d1b807cfcc0c87b27a13aa0007d5c29560a45f20963cc84fc705385554b969b4062c7f8b15fe793291ab624fb2a5257c05d140c53200c2eb344547652be
 DIST security-framework-2.11.1.crate 80188 BLAKE2B 844d36d2b2216cc7055687110d54ea783a7ed9bfe6375fd4dcbea267ec85531e666fe002648110315f42c3364ff5ff5aeba711cf8d1f5358ba65c8393e96f55c SHA512 02786d62fd9dded80bae3942896bc8fea2a90763427f582bf5d9f127ca5682097b59b5dbff2cde373198ba659316ab5906a68d3141ba00c7408b73ebe353fac1
-DIST security-framework-sys-2.10.0.crate 18676 BLAKE2B 4c16983b5bad471b18c52e34fb6a2762097bcbb0891c7c8a8423777e01bb27341576114f6ed90aaa80cc3e0ee264b3bbe9335886565f7b2a91e37f0ac3f555e2 SHA512 10c006488bd52bffba72f7aa44cc58e292c186259054aa85f882c3f0198586574a9c722ba80f101710b867148e823596f8d1ead1b6a753e6b50e702f5fcbf904
 DIST security-framework-sys-2.11.0.crate 18718 BLAKE2B 4fd8e8eabdc910f656cbed6d6f941992eebc2ebe29c1d85e4ee2de5aee2e4840f2952ffa0b0f9ae88329a2b16d66c3575796f476b873c6bb3c3efcc8d119ab6f SHA512 e3848a45391ebd98026ecafb0777852aa826b465613ef184cc33cdbaa75fb91053d46d417dfda6398339abd3b67788a567562e99b3c509b676b7ee5a4372acd8
 DIST security-framework-sys-2.12.1.crate 20112 BLAKE2B c03abcc08f068e8cd4dbfb4d5054b4c0a75cc68f0dcc955ea5f5f958db9c28588841723bd7047207dc51bba46868fc1b8d3367b612c7f4a07984d94fc8710cd9 SHA512 5ecae3e1280d99e3730ca3be3dfdebd16971d54b8fe167d29cb07f7b3837a2bb9db2d8131bab679c395e329b10ed28ad9ad8d6764048f6019587d5e2b52c7eef
 DIST security-framework-sys-2.13.0.crate 20496 BLAKE2B 5ac84d004ed09afdeeaf531d96e81fcaac3af32207d7c8b2180a506fe0512fe6616ab3b4244c75667088e7a8215c1d33dd9274a60a400afb1952254070dbbb15 SHA512 a5b69044571e8426277b2ac241bafb53d268adbb7340c0626cf00fd356c654baccdd36277995d38601e19cfca00da8481a9c861d01bbab3ce51685a7dd186832
-DIST semver-1.0.22.crate 30446 BLAKE2B b77a951d959a3685b0373c80b9991a8567f8926d093b23b7b8fab48595b5d565acf7408fbfc8f4d58331f39e316a8068885d28bcd70c1476d1cda436a2dd88b2 SHA512 7dcf9b6a02650d71d6c9ab3c29e44fdef95af296208f26aa7be6fd6e16773e5e5e66418c303a0589d1165df6dbfd46ad6ebf9eb5b3adab25a51f340947b2d949
 DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743ad0feca0929bf2409eb81e03637ec5f92ba9f38ea386c4ee5cde72bd3d2042083e2fb0d6fa0b839b1c5093a SHA512 5ea1fa17c08d1280c3a4bc8d28494e88ee05acd5dc969ef6f0c6f91fd3b5a8fbe999c9e8bbd2da383413038b8d29fabf02b87bd5265bbb8333f3fcbe409103ec
 DIST semver-1.0.24.crate 31267 BLAKE2B 934f55d953ca52f6c11696889182e1e4c660a6eae3917b15b411d91a18b22c6a1178708caf95da93e70e6ea97c0762ed9154333d60bf0a08b156ca7b50c4077e SHA512 751bb04fb50abfbb92b2612e1d1097f612a1ceee1861852681d6ad67fe459d77a72898903b14f2f01d8185fbbc022c7471913785610c2a8e9d6530e48094869a
 DIST sequoia-autocrypt-0.25.1.crate 41241 BLAKE2B 5fcb7131447b2e11aceeef037743b0a368693a92fca3b4296bd6d0d76fca5ef89c059556dc2591c944b2e9f545fd4e1a8008def5ccb1110b293e3a0f93954141 SHA512 a8835ddf7c782abbedc182d1d6062e23d420898480277f01869fe7d06ca5338ef1199c41b11091e4eec9ec304106ce1d09cc033ee298d4f72c918688584e3705
-DIST sequoia-cert-store-0.5.3.crate 181761 BLAKE2B 498e354e2bb7d6cf2d67c1b361456f31e7fb60bdf7b12c970294b65a5581fd285f03ed744d7eb49b60d974c5b919fac890cfc339eda5053bd61e0e309a0065c8 SHA512 8198243aefb3dc11dc0e44a09079d410cc1a50c1d0cc463ad03379c4b8566631ec713f7e5b963e811fbd7147658bc53d9ef09e9acfb9ff137ff33bf4d94467f2
 DIST sequoia-cert-store-0.6.0.crate 187906 BLAKE2B 1372e9938120997ae2d385849cc11df8ad6a47007e5d42b61d1dfddd504926e40662e874edee24f45d1fb665eb3d72a72060622142bf6280b30efca4a5fd0d65 SHA512 94b1c66acdb2101e20898ffa3428af25b60c3951a8247b63c4f87f71fed4b10f1b6fc88720de4136556a61a0a360dc8828f7e1a0f25f915dfe5c0544a98c496c
 DIST sequoia-cert-store-0.6.1.crate 253084 BLAKE2B 434bb1f62e1528c7e776ef3339b85620441d395b31d200d21523fa9b73dcabf2d897e6096953aa27f6cd7140166260d1be71700328077a9596ea0f82555528b7 SHA512 9de0301c6994c2a45b45951a7131d0b7f66977f6f2f9d7a6906fb94a95521b365e64da802d026014d985157c370d00e4ac90209b09241084e75aa71cede96567
 DIST sequoia-cert-store-0.6.2.crate 263569 BLAKE2B 455faf4620fd975101685fc496dfe5f7d091e84cfd74e3bfa9539874c20b7721e13589f532182dc4405d0152bcde05225bf358ebc6fb90be5f4bc5898170c0b6 SHA512 c833697afa1fdcfc60a6c73e6ac30e3fa902a15f2325045ad5eba8082c686ad123311488e946ad76b0fdb86d7573289ffe5f482cbccd9b32f91f7c98f87da944
 DIST sequoia-directories-0.1.0.crate 21519 BLAKE2B 58e324dc7b72c8edda6a598d8de40c06c9b9254caf4ea73f464a3a6373f3018ffc3e25461ad7cb9059257204be43db328f7448fd6114940885a9300680bb661a SHA512 e814a14eba5873f1c58f25630cdf4549a0e1145f52e784c81c294467c64f67f2a50c674a26ad62d46e2082f71c7e09863ca2f9e1cd4dfcc311946dc5060caceb
-DIST sequoia-gpg-agent-0.3.1.crate 101496 BLAKE2B 71793d9c105459c11e1dd06a3574548a19b4c68c8cc8a25ab77b5d524a59a72d55689d83c0915dabc230427c46bca44203ec46450ffba1bfaf37013695958fa8 SHA512 45ecf84ed22deb7f8ac6d4ef253721f8e53a5a5131d29a547fb9288158c5433f64aa71233f57a112b8de360ec6e2bf0f9886aeaf8c19ffd0e7f8381c60071b82
-DIST sequoia-gpg-agent-0.4.0.crate 142453 BLAKE2B 37eae1533aef7961fe269c79b62156c12dc1d046121210125487168f2480b5e05c84221f8cacbb1731bbc14a140a48ec61fb363c67611cce44a74a773fae9852 SHA512 c5664b5dfb43e8f19b58e24898f3006ea2776b09ab8633258f304eefb9137ff8c6d739bb8fe171c8597a5fd26abf4837a83e92b39c20c8d26b6cf3f11e125e3e
 DIST sequoia-gpg-agent-0.4.1.crate 142927 BLAKE2B 76ac5f30370067afd29f4392fb6b84f86e56fef2fc43d921e814b35e97be6d8922d12bdb9cc7c9ac28825061d9e0ca649904e3ccee762ab30bf8f5e3d6a888eb SHA512 081d5dda4b0a97c07bd75645230a162f9f5fca18689b8ab53900807ca848ed53aa94a75a60c0adb5a80e021e9cfbae2a5e6b08866871d34ddcfea92bbc05c958
 DIST sequoia-gpg-agent-0.5.0.crate 138617 BLAKE2B 87b252f9e145e33fe98889458ceb62ec7969fee844c6a9f5c6c9a166148cf69164c09fc98b26df36856749a9d65231a6c3c6ca30c06ed33c77ea80529cb5169b SHA512 c49aed11f85ed657775649d184ca575eb9a740ea4e224d46043cb2d0477bce0faf6d9abbc73b33a18aff8fa05bc487db4a3f546b8b61a31fba84948b7d8c698f
-DIST sequoia-ipc-0.34.1.crate 4505028 BLAKE2B c8d6f1a75ecd67bbeaf2b7af8c975dce9a66d18d9fe72dd6d14982edfd61cc00e96d7931d5521031cb2be7e2f9511ffa92d1b4ef0a7b9122555207f5c4225fdc SHA512 75df9b6230df07ff354185c8650382f44dd20d6e05594793872d5f05d828aac77293e05f93142feba5b3c97544d58e2fae075c67a2597bbedd6c0647b7736fa1
 DIST sequoia-ipc-0.35.0.crate 4484979 BLAKE2B 68705ffe74d4b6163730971ccdfb022b7516913247cfdff743f31b04afb26b294e65e894d6d81ca3bf5dbf77f4ff6acd4c66ecba22a70002419afb4a4bec625a SHA512 020f48cdd20a2df79c6c8889d5d60822afc171f1dedd433ced725d124850b75ace5dc9dddee1534b5a7873791a4e0d6c1d3275e9de6cdf7ab4fbf55209357072
 DIST sequoia-ipc-0.35.1.crate 4503842 BLAKE2B 9892e43cbcfdeb96284a34ea948d1ed4f2ff70e58289a5cdbfb1b4e96c3e88604173262ea9bf2da19c84f0956b8408175b8929a23205073aca5968bbab2bb08a SHA512 0cc7cb84436795497f51d884feb96930c44ad79ff88374c117a068ef95f1fa469e15f38dacf7f9f47790d9d2c2eea3aac9f943bd1668713a819e3ded5d290a38
-DIST sequoia-keystore-0.3.0.crate 81628 BLAKE2B 115cab313d47a396c96a0ad6e0f782387d87e46780c26a1358328b65717332ff74b9b5c3f809c54430ce8f60d6db24444cecbef5760d0407346e9bc1f8f7161c SHA512 bb7aa1665b5e2c8e55f1e1d214b71b470d8a6e109cb19efbd93df1dfad9cf7dfce807f444e9cd41a30d0e95fcc909eb69860901b5939bdf457dd78151326816a
-DIST sequoia-keystore-0.4.1.crate 85919 BLAKE2B ffeb58018cd5ce69b02f6951e05715457a61b2806a8c51b4f57887c57572dd65a790a0f3d8eb3e9d495fe2adb10a46c7646107704e128df5a9ea03846b232d3b SHA512 b79a5806145c9e9e82523d0be366a914f1bca724b5e3757c9122f8725944943de6b1520fa3723fc2d2b37ea957f7e713cfd8dda794b6cca51ba99141c0331445
 DIST sequoia-keystore-0.5.0.crate 89050 BLAKE2B 773ae6a4450b72f77534d0622c2fbc5bcbd611d5c7967603d222278f592c0b7f025def1f95e8fbcad9716920183ac89f1d8805f750fe80b85814dbf6fc0c8c3d SHA512 80a01e6e5e008aa25ad5793b9a9c24324ed3be75c03b4917845bf46f17ff881b9c733dfff2e789ae563c70449940e188a61af63cb1fff30cf820451320faea83
 DIST sequoia-keystore-0.6.2.crate 90708 BLAKE2B 71f281df32bfc9dcf15ba3c5e9378948adc8dbfae4196a874f8caf2e8591c6fba7f747d84f7e7094b3ae35f83a202f336a897e7461265907861f709bcc247c2d SHA512 90d6492543521b97686f64b560bf80f42b6acafe5fa2f746a0acbf43a079c3845193ce8ace7f466545be0e897ff1febe77f5e4109dcb858a43171ea8cf5b35ae
-DIST sequoia-keystore-backend-0.3.0.crate 55520 BLAKE2B 198ab84a5bc292e2bf8cf6d0ebaf8570951335ddd37fa842357e722632fb815768629a12b96d4d7ea4aa89bd7d869c3c5c7b28167356407ded4b22efe9d77c77 SHA512 0d981b00e257cc46a73a2ba8f6b378ea6b9af10959c0ee6646baa29085b0c7016a40e88e73fdcdef13e4a8c41a4272bf8dd8efd5dcaef8bdc778f2ba5ea26e2a
-DIST sequoia-keystore-backend-0.4.0.crate 57362 BLAKE2B 92c1b491412f64958fe1148d3b3adf043d90fcfae7e138193950edbe4af658524c87a89e404cea39711815586ee1128b0f0775e35d0f94eee93621858a2f151a SHA512 c97f62c20123a65d8754af58f08bd236c1baf2a5f86d5f916eaabd4ff87ff231446a3111560bb5585e2625a4ebb60647e8becd86f8855a0c8afa83b5151594ea
 DIST sequoia-keystore-backend-0.5.0.crate 59073 BLAKE2B d1f6c1ccb7a31a70475a75f8a522de4815b852a5ab297fa2c2529b814869b3cc711e4efca03a10e8bb780901220ea7e52749c97413f6920b3e873490953cc7a9 SHA512 58ab7a6657a22a6786e61f8f6eaaa045db801a6f062ead9c0cebf68367fcd92643fd551f9cf51cac194f0c79925c5a01bd885f0c289102982cad6cc376c0ee5f
 DIST sequoia-keystore-backend-0.6.0.crate 76232 BLAKE2B 71b1e3f3407a7e9c451a84e96ebe6b016ec8164e8c7a522e0594abec3a83f85187e9aa67b0a6492382386c79e2b5187643f56584e715ed4b5e475136953911db SHA512 1589f80fe5a96f3a3f205739e8e1d44ad784dd403e80cf3ae32fb541b1594e402fe7a533da22bc6e25477806444397d31ca96bced688c18669324ab327def388
-DIST sequoia-keystore-gpg-agent-0.1.0.crate 17347 BLAKE2B d4a87977fc31ef05ac2f0b5c5cdde680c8e1ced02c9b5c68906038765c9d887934a744ca490acede7ff95a8d769608ee71e8ea5a421029ebf94b2439c9c0ef96 SHA512 cabfd343fec62b23b0cccb98d9fd5ffd123eee2c89aada023503d8218a87a776d68a4a945f193e35ecebc3de0fff1a30f8d0d6d40ac26f9569c9036c363c6e3d
-DIST sequoia-keystore-gpg-agent-0.2.0.crate 17991 BLAKE2B 8279c4eac57f3983efc8f91ac33d85314c9cc12ed1aad7028edafa658fbce34d2ed9c8e6eac2a4847b2d057faaefb744331809753b46dd0ebe8121ab6e6faf83 SHA512 28ed7972640e3d363711dae18ad2d2480037ac3725dcaa2289effe3a845e4a36139c515ee1bcd2ce5fbfcb4cf2ee942c071f4f1f402a1139f5023d70871c4509
 DIST sequoia-keystore-gpg-agent-0.3.0.crate 18294 BLAKE2B 706feec0d49394898b0194fb2f1e4923901d9270d48f47ddd57859c8dcc9394413842e6c5b403163cbdd9197495820e37211ba92349829183dd3043cd9699a82 SHA512 0ef9971b5517308e0e3ac7f22599444a0821d083c119a2c3bc493a83ffceeda18b9ececa284af577070592fc2aca53c325a79b8b559ac41f539ad134e15ccc20
 DIST sequoia-keystore-gpg-agent-0.4.1.crate 18482 BLAKE2B d4a44d767a57a492e4624e71aaebab0d999e7eba0e0c56c534762689cfb0c5eed2c86cf720b721be88b0586fbaadd3860c2d3d9fdf443cac269aa56d89c76fe1 SHA512 ed77b34b80c67eff4e66421f2d7dfba6927403115104f8ba77fd2aa298b081268bdfbeaa2952298362be600a418e3ff9e0f160fcf95dbfd990ab084b8919e38d
-DIST sequoia-keystore-softkeys-0.3.0.crate 16052 BLAKE2B df749733027c05d08af9df5f778e6da0f73a61127fac508538231b53efce5d4de851a2df21e349cecb506e38d3763740711378f622bdb4847855c24cb75ea92a SHA512 4051600cb34e5b65a053d8fc8c7c3e99685a6ff11cef9e747b20c2db9c78b9a2c781be4794dd199d15c86f0c9cf8d38f0f2d3bb796b0a6026b0f7216c3f5cca8
-DIST sequoia-keystore-softkeys-0.4.1.crate 17646 BLAKE2B 457484bc10b521a38bec4fef35a0d714cd9d91feb11fd450738449aa070a2b5303ea0055c22d67f76666d61b876d34312f9c5e51576765a4110ecc0607a10d52 SHA512 27343cc04f34d3778b2c0493025499d244d0793f67a39eab1be3fb57fe553e14c2cc01543c19d59fff8ff578b7140d313d1bcbf6a3ce26b9de445343eab1db43
 DIST sequoia-keystore-softkeys-0.5.0.crate 19610 BLAKE2B 524a3aba77d32580bff5ade0f9dd5467343df5783cb33fc41c77b6f86c74ea0b1828600cf1378d4ca8e92ef3b0f0304ee656f9bca8773e6e56391de7f46856ea SHA512 1f2bba2a57474b0a51b3f3067ab7c7329bd36a292576d40bb1c8b72c070fb8345e2771e884ca4246f203f3affcf2688b0efcc1d88f000927af45136ee08bcf86
 DIST sequoia-keystore-softkeys-0.6.0.crate 19702 BLAKE2B 2639a83cae845b613d8c11df94b310376749b2acc4a1768aa188be9de18b5cea06011fba07164e2cf4350560b99dd870219e4a8b21a0f8f4b5026c87914648e1 SHA512 7d3e683cf17c8cb1cc07ed2c8f17f2c3fb16bba0f33bf2756f9eeb00237b1b90ccfa4c7ca4d5d439a4b6cfe6eb4fcd93baf11edf342eeaa5ce9e56967885bb20
 DIST sequoia-net-0.28.0.crate 49672 BLAKE2B e89656e0428bdadb6f9d4fb479c985d5d187dcbade342906610222d85c22d90c60b09ff4eaa3eef62d6650ed06c92b86a3123a001faa358fc775ef0e74d44265 SHA512 1a87d9b078c2b44220882611e8d49c6117906d8cbd81e50301a6b31d7428cef5622223ed234e28558fa83e31c47df84dfed087f1b1962bd42a7d1bc2f0fe9fff
@@ -630,26 +544,18 @@ DIST sequoia-openpgp-1.20.0.crate 3002022 BLAKE2B 7bd2ecdbe2885b749dc3b7f36f58a0
 DIST sequoia-openpgp-1.22.0.crate 3017622 BLAKE2B 83be10aaa9adcd3af9a8b4657474892d4042c262c2349e2b7cd4669c23c27606c04674317daa6c143f8277684f58a1b85a2df77bc1cfeff3d79473480937401e SHA512 10893cff011ced034382d4fca9c04e61b7bdb5f2f621cbf4f36d611423248c7b411d7440433607cffdc1d646898607ede159248d1e69a6d2ca69bbc14db6f95a
 DIST sequoia-policy-config-0.6.0.crate 42529 BLAKE2B b58960a3296d1c3289036a2218e842bb63bfef11968ccae7c42cb61869e04d26fb52736876bcf32d276177c488d0be4d9ff3ed50fbfb0ba68bff3c0410a460cd SHA512 499d350426f80627278310b2eded6a69a7ad833058129ea5ed9ebd0255621ff70f9f04228fc8ca79830e6ec11d14b121bb3e5a6c5fc2721135d725bdf0d886ee
 DIST sequoia-policy-config-0.7.0.crate 106066 BLAKE2B e3d02172c530264fb6af51ecc7729d0e9b70b7e88e74d25ef66b1fd60d50c88fa6eed5bf9df0f954c18e8d68251e761752dd75196971b6c0d29fece569b5c7e7 SHA512 24db46b8d47877bb533f2379db104464e78492305e2d7c0b058a1fefe5408ddb744a8a84ec239d750d9dc12166e79a49595e096e9d3cc24989455571b7c4e0f3
-DIST sequoia-sq-v0.35.0.tar.bz2 472305 BLAKE2B d9c83c4ada4aaf7b6976d1b44eb53168ccfbdcd3c4559de4fbf8e884f0f8ef6a853910b6ffcddd1b22487ec67c81ed156ae2ff2438dac14b1d70b35624e7e40b SHA512 18439273ef3811c57d71a88ce7e10d25fd3ecfc26820f9a8827298bd170583574dba49e178ba7318e2e22ad645331d441db62e78e2e5879758722f00f22dfb75
-DIST sequoia-sq-v0.36.0.tar.bz2 474304 BLAKE2B d8a660a575307d515f27086b00ca188304ebf2acf2dad0be467a480aeaa053bf55ea317178edb9b5acc81e76fc47cfa714c5ef00592fbe43b43c0f1b20ea94d3 SHA512 4faea8d7c6f8086d892d694957dbfddaa674d8672acd2c8afd6f187995aa2b908972399f79d2261aa9c7b818ef1e799570da31909a3fdece50eb06efbcfc9c8c
 DIST sequoia-sq-v0.37.0.tar.bz2 493246 BLAKE2B dfda484f584a899bf4c70cf802632f139d7d92301d461cf0197ab68acd80d4614035fb27fdec717f118c826c50b86ce37a4ea082a783cd055763b7a6a486b608 SHA512 772f39553ac0979d170a8e6861d628914cf283747ad7f0d82ee513d9a004d2d656279ec0661662a960864a7254c93f50dde1b8c8ac254139b823718f6a6ca541
 DIST sequoia-sq-v1.0.0.tar.bz2 663498 BLAKE2B 2ed637f1dc18e335099b0cbe45b1ab1cafad41d6cd9dc1d761ba656e14e8fd27913090f7c611d1b0b05eb999a36234bf08eb6651bcd9cc46da0d92ae24c21203 SHA512 62a6d58f14fdd288835cc13ce321887e946cab19ea1b7458ff9624eb68b299b1a135d34fa47332358cd06bab55bf7eeaf256e398431c2aad3c9091d65a629399
 DIST sequoia-sq-v1.1.0.tar.bz2 670352 BLAKE2B c69f77b0c8f1f3d4f02d3518d240b6c15a711838e565bb080c22863240a1bfd2a47958d39313ac274bbc4d808548043ad8dd07252f310cb9d51f5f098a0159a6 SHA512 f23103f1863dd6712e7830ed9d23b0209cddeeb4d209b4d71d920b41d58adaac22b9e19218f7a26d4f513e0a211646f6c2eb8b8cdf18da13c96c599cbf116f6f
-DIST sequoia-wot-0.11.0.crate 1080482 BLAKE2B 7abdf5b5402d923965c541001f705812ec61b11a46e79cbc55abdb7b1bc62913274a8f294c2b925e6c0420fad9b7709d6d4449678188373d68a1daf12f2be628 SHA512 a200e0008fa3a14311b488d84425fb108a7c31c481a4b1077650755debfdf1061e74f5061dee99bcbec01d2f643733a76e95963f312396def5d8c7cd6c0f39bd
 DIST sequoia-wot-0.12.0.crate 1079750 BLAKE2B 8b42a4f3f0ec99671ba244d8db85c6664a5fd26b03c5a76ac7feab9a7603f6a002a937fcfbeb64aa9fa1bf802f092ded19a5f31729eb70b54113a3f2f4b207a4 SHA512 fb4e99e620cd03549d5b39f9fa4b0054f27ec820b911341fce93f1e2ba02d84b4e949b98c9ce6973c6cf916dc485ed467752f688d4f396ef0bf9c3900583c10a
 DIST sequoia-wot-0.13.2.crate 1021102 BLAKE2B 1d8cea68cb13f3092ac08912ba83ac0ff1a5cff21e6cace2768ca3d2bb77f7a5870ec7cbcd2788ffb13f50958d69396595e3b80571e7303dccd5d92aad5b372d SHA512 c606e8f07fc239d0f6042873f460c05540b25faacd04a1284fdcb77e88d030c52f3be4bc00bcc572c24d63a6ab2cf6f84cc2b82572afbdb1be7262cf66f0a7ea
-DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410
-DIST serde-1.0.202.crate 77722 BLAKE2B 8c921fe39b399e0840b9e375895fb4b730bb2df126ef07d0e5701dccd58ab7fa4d111e718d116ae28c32faa7ba89a6b4dc9dfbe0db098a008484d42932bef389 SHA512 19a6906f575f98e3f92bae1b4665d15d98e8ceaeaafb5a2c993206b4556adc92a38dc7b4978b4f0a14f55a7a93c128567d011fb0e871494005b27877d7f98b9c
 DIST serde-1.0.203.crate 77935 BLAKE2B 3d3dd4f81f7d74b60483d6759879a9f87c0c7d615aec308bad1bc575fac4e2071dc86551c2789e87331dbf8089e923ae56fff82e6f5a9992cf850121b052ce1d SHA512 a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec
 DIST serde-1.0.216.crate 79000 BLAKE2B 98c0f5cee2f9212c6b7620d2068665379471ceb7557d1454cab9b1c2120b526ef597fbb642f65440e70f92a4764cad33613b478bacf99138dd5bd51fdbdbee6b SHA512 baabf4c7aac4a540c9ed18b336662087258b71c9cb0e547c8d83a2734818ab2cbbe62f910d812eb61d3d46e653c41a3eebc99b1d679bfc51f95710c71a8ecc20
 DIST serde-1.0.217.crate 79019 BLAKE2B a0aacff795d34583365ddd469fa14c58a6cccf8afbb248210aaff3134c7ce6e34b3d03f437326d7c01b3e78f82a5d19c37ed9fa4372970d8b2793f2889288e1c SHA512 f97b3b54b9e99c9a027390405cc054c3072f49c92803a4ed5f5f69e76a179deda9d77993b645b3581437085912d881da88d0451b9e0da423c64033a23fdd8054
 DIST serde-aux-4.5.0.crate 12448 BLAKE2B 33b59c46f182e6e6a7d8bf9273863cfed3eceaca5fda53b9c3381dd10096ecefb4a38fc00f165eac26f97fa52c8a11d9399fc49220e6e5d4432a0b1b32b1a8ef SHA512 1b40fa8aeb6698bcd625c49fee25c34d6a2e796a20c3767d09812bbde532864b3a528981c7972ba97dd320ccc2694fde597f6fb9f6245f06ebc7e554277a94b3
-DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994
-DIST serde_derive-1.0.202.crate 55867 BLAKE2B aac9781a405cad646ab05c39082e0e075e14d13efe0c6c7f4db895bdfd2bf508a9089b594f994730c4eb6e9eb158079a830d0b2ab990c10b7711d8df2c943feb SHA512 78da51c769eb97518da7ec42a4666931979c5dc79860c0187dcbdb8a2d73643dd060d9b3fb5bf870758d22d08af38efaf4afe42bd023c9dbeaa10f72f1181c14
 DIST serde_derive-1.0.203.crate 55867 BLAKE2B 1bc8aa96328bb83e4e4ff527b1df855bbcefd333f0c43c96d1e0b93f98a46273dd88a21653bccc8f517c4fc06d17b9b44332a963d024796e0a2c18a5bfecc824 SHA512 b2aeeab33395ac11ebdbd922fcdbda29f2592e7a20e78aef250713baf269cacf497271be7aa407f657aba33da132df0e035be046fef070f915f234097d1dd392
 DIST serde_derive-1.0.216.crate 57674 BLAKE2B 12a9228679c16288c08c8b256707e276aec79f84ac7af0c4cfd1f109500dfea80438df17d798acdd30a9743c753e70093b22bd324217529bac483f257682a3e2 SHA512 80fcb552279ac7562297df878f2f5e9ac09241701f5cf1088fcbf473b638f58cd3092a7930d8937ca0df9a47b9ae1a42d490cd46a275259cd8089fe8f5426469
 DIST serde_derive-1.0.217.crate 57749 BLAKE2B 63b4930122d80d64492ba2718630513012202e42bbaa74510729ee66a0e72b8a1ad123784b479697ba562db43868f4bddfdf5e94bb3d744cd68a547471ba40aa SHA512 31020f4533d04b31ae125580a3c5093fad36438d324e2d9b063923aa8c125c654102ae7fbc3b3df892bb41db6b321962a23e0a37950e080055d715d15b18af76
-DIST serde_json-1.0.115.crate 147100 BLAKE2B baa2dce9d85e331d1308f2ece9dbeff24bcc70e37be3f06c7e819ad9f4eb59fb1f00658736fd336a41a65e3616d1bf75a0c9adb359eb606e1418159a9455132f SHA512 d1a60e20af770fdfe0585853c87c5631e56944a3c1bbdf9e1e91003af8e924a8076335bd37563d167c760aad10d4c08fe59ebd47fc52e461bc3586b835808d22
 DIST serde_json-1.0.117.crate 146921 BLAKE2B fda4f87c300762c24163cceb449bb27fc96b089d5ee869b89f204dbeeec704231cdea7a14bc303cb40b621288fcb1a2b03f50552767e32a73c982d459762624b SHA512 363443af23e8e03dd17c0efc94b376f0d89b596c74d70d0437471e78bc20c6beb61da59404ff150af52000162f6df728ce73475feb828c453e58ea43e66ca056
 DIST serde_json-1.0.133.crate 150739 BLAKE2B 7891eb5b8edcc7fd09ab1e15d3881ffdcb629aa39f2bd758c0505700a5f2dfabd85b1b66c3b094268bc1627b346e204c792f4ca61efa76c54ab9cd5744fb0ee2 SHA512 20e65ec87bff319897a141960d13deb5cadcf821209c1ee8799f1dc7f458ce432bc62c16df5bdada1c8d3cc01ff23b8125e8fa0a03545d4614f32efd687dc69f
 DIST serde_json-1.0.134.crate 154351 BLAKE2B 546f8ffe9373444e8c9e81910476da281dcef10498dceabc8bec9f9063c55f4a9033b83586a09b0f410369515882c37712a2bd75ff1fff05815d904f37386124 SHA512 ab6323799bf19da8ec6e6c428370d37cd230192b45ef54d2c65c7d83907b2dde71d51650e44f1fcca1084e75e0e195e97b28437f53a331bf48effed3d59b58a5
@@ -670,7 +576,6 @@ DIST slug-0.1.5.crate 6833 BLAKE2B 47e4765e70a501e823eb02ecdc3fce30aa2216b3c2b32
 DIST slug-0.1.6.crate 6787 BLAKE2B 941e41d80d63e13fde103af7a750ecd93992a1ee6bd168a82b67163973f1d088082cea6a458008db26b2dbd77328612e7287955483cd2f50fb2317f34af3e11f SHA512 31f29befdbba462a1e5a34d3ab97c0e2d054869daf76420dc1985c4f9a87098ba0353d52da19476bd848bd8b625b6af94c13303bb25d4cd58f3b90ab133e191d
 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
 DIST smawk-0.3.2.crate 13831 BLAKE2B 551ed3406db797765034e2ba53d5aa75eec57cce608097eaf0f1a94fd1df8aa8bd248087a8a3b037d844fc91773f74501686180802a6d75165f771ea1f20ba96 SHA512 39f3cab5a6eaaef6f4e7703a6840ce7a805f6175e02968090a58a12d3420f0a144533e5d6542f1e9ec0e36902046a180386548713ef6148064922ff837fa1602
-DIST socket2-0.5.6.crate 55270 BLAKE2B 10eb32486b9a2908e05ab24620ad7a79243e59c2c2db5a7793f87f32765745b21746423d5b3896ef37d3dc9e76410fba97826cc64cafb7dd45adb485900c2282 SHA512 10f14ce7bcb9fabac56f98bd34ccd6368dcf4ca245ba2df80fe0f1157e177056eeffc6fcfb1d1fea6e89c0eaafb99d8056fbd10101031d3ccabb98950ec563dc
 DIST socket2-0.5.7.crate 55758 BLAKE2B 148d2e2b6610895ec555b1357b340576984eb76cb3ea719f85af50cc4215b2ea2db739e2a61434c09360a0c1ff8e05911764e18dc4a59451c0aeb0eb60b8403f SHA512 ca37157bfa970cf3cee8b45c7fe64930becf2ffbbc309ea4613be968400279b70edd084d159f65b76fe1130917312d81455023c0d7c1bab7a59c79542aef9dcd
 DIST socket2-0.5.8.crate 56309 BLAKE2B 309e5a0e46d0b9debbbd6049a138e56b82df4fc0e9d1115745ed935eb40c81b004ad748844f641934e13b5b88773db5cc4a57fc9e61dc82b5322fa0232110864 SHA512 b7d03608a3d4cf3e2d1539b5a375412effcc96279e8f57668fa8cf67b3f0a3a6b611ea5e2e72f282460582954acbb5364320611f7798a11ec9e4833e53830b60
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
@@ -698,8 +603,6 @@ DIST subplotlib-derive-0.9.0.crate 4490 BLAKE2B faef04b799c4759afe1677e82c2182e8
 DIST subtle-2.5.0.crate 13909 BLAKE2B 660c3a472ca54c9843ce3feea74b802e27fd7f62dd37a30e2a4ba82e4b3a71df63562e8865d5fc675d31d0900998a8730503f91a61450884446a3bdd6af0041b SHA512 f150b1e2037554f8cd3213a54ddbc258f8f670cc4f39e7084cdea4b47538dbc58b834bc93b443d58a4b9087224efc003234042aaf366687dbd32b1e7174082a0
 DIST subtle-2.6.1.crate 14562 BLAKE2B 3cf4940b7a01f04715da1057f6a92b1043a6b86ab2ee7f9fee0337b680ff781201d330409460f6f90b3f81bb5fd4b563e17c762c6e824ba3b0af99e4ae7d66bd SHA512 f5946ebd9bcb8776ee3446abcbf4afb3cca5d8bd847cadda87e864333ac7ded537a3efa773e9648adf20ce4add2c1da85172cff88c1e1a3a6cb051401b00c6bd
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
-DIST syn-2.0.59.crate 255393 BLAKE2B 872c6fdf55eef2f050c02fd054f383ede1793286e787f447d242a0436186e67151ce4f47a63c7ac8ab00a87d2fa9452ccc166a32cc7f1c1de2e0f2581c01d2ee SHA512 0e9e1529a0ce43afeec5e9847f8f4c86939ebb1fa0236d25aab73a9fc253b97ebc62f1c741e137a5a3173e2342b33d776a488210ccbdcd36177a1df31188afdc
-DIST syn-2.0.65.crate 264863 BLAKE2B d5812ed42215012a0d01525270c4930c3619208d3f740ac64b4c13af113ffcff428fcd4a93c4a790b46ae4c41d54386a7b91ba875efb271471ff744a1d2d62ef SHA512 444a49adf9b9bc2345eb28a673464cdb0c4122a672230f41e48983500fe42a0638280935d3d3fe157b5208ebe82f46558b866494189cf43756525c93fe9ae539
 DIST syn-2.0.66.crate 264855 BLAKE2B 5029091b2cfa88e5c739be913a647dc9492696398c09b891f84089350e6f09baafd9935b81e0f3519d5465eff2e1822ef6cdc96c15d6a40d1b6b8dd2f9e7d073 SHA512 60a617bfd37d74c52e4d4d63ef0a27a2f9b982469a6926922f2f6e96754a0c66affb0847b9a44d505c053cbd788b97e998efb8d1e558ea00ae4a0b7f15bed9b0
 DIST syn-2.0.90.crate 290584 BLAKE2B 9f469001c1439ffe57c578119653d3021c2709767e8e881441459a190402679f4fb78aa65e7822ff20913801c3be00d9b8f115189ea8e63ed94ed359b40fc9e1 SHA512 44606124f113c259c19edcb2adc1378d8292b422d800604c0e0d1ba89bd2d13d518cf4a6afa58daded54da9cb285464aadb113815406a0f09c5e18f865789ae0
 DIST syn-2.0.93.crate 293925 BLAKE2B c36aabae91b4d25149d03d58576dcc067a481ba456ebd6ec9ebe2ab5606e0dc1aff3c6aa714e6a0dd40dd8b8e01d3f48243b6e831f68ed2c12c799b25a347ddb SHA512 0f76fb495402b9d4eda239d65fd4697f77231b702ad4aa1c4d2991b899a092b892c30d1dace92bb54a53f5a7d2baf7637ed3c1804d11c6708987cb1e2b50450b
@@ -713,7 +616,6 @@ DIST system-configuration-sys-0.6.0.crate 11090 BLAKE2B 2bc38fa55070e33e762cba4b
 DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
 DIST tempfile-3.14.0.crate 35065 BLAKE2B d155a39f6ed6e846bfd572ffdc73f306d30942642e07f2b497963ae150b8ef774dd046bfb3ce410fa326c8e1df27b0cada804100215e01d02272d6059d5294e3 SHA512 98c1ab70eb3efd2d8b16ed58c8c83f8599663af7ef269304e908a04c38334f659a4d0b1647a13dc0d1eb90a293f1b37ec8ff0b9b45ef5b7ff1b4452bbfcdcb15
 DIST tempfile-fast-0.3.4.crate 8991 BLAKE2B 98fae1979a2be1aef1d9c6abafdffb6b90df92328af5c74d19ea4991539f8c3be7cd823e980c13e90f16300611d222c1d81b7eac4c55b7a3da3c38abe385cc36 SHA512 b0d44bbf78e9991784a9d20f3f3ea8d5e59e95d74d782889a3f38f732a0fb06920ec81295c8abdff7603675c55c43c3ff7d9f4bcc094f403ad83bfb96a9ceb1f
-DIST tera-1.19.1.crate 104237 BLAKE2B 244e300101e13f05a8547f50799f5809714696d4314f739a8daa5d5e5e4f45eec9bfba6e1e8fa036da73e2765b84735ddbf4cc0843eb0ea4e1e3c91852d3803c SHA512 e66944615221c45ffcf9ed3685300fae5076fc09019b6576f82e885347b3d06c1a1a26fa59297957516121539e24bbf888a35231daed66e6b67d16533493ed3f
 DIST tera-1.20.0.crate 104452 BLAKE2B 8d264f78bf2c9fecd16d94b15def76e3109763f74818f70e0aaa2fb7897733259402103f0416578c36cf1b918e3d734528e0a47a8a1ad5200a4c32f7a1d8ecb8 SHA512 1bea8153253c1c301077bda258bc88ff2f4092efb67066f07b46754df00a01908e5aacaa41df089a73d5d8ffc49e518b6d0312a7d6846d5b548c85298bde6150
 DIST term-0.7.0.crate 37082 BLAKE2B cb7947c696f71fc68bab3b25cc6cbde74b92380fdde5447399b06de99534b0cb2160963792824ac74a350444ce41a4fa16d6a9792a68d84578a15ab37ab76ca2 SHA512 9de6e836f1fd205b3b58645ec880eaabfc0fd8991e3980ef90bc6184b370a14676edb688a2a75bce412dd8ebd97345aef742afe5b964250e2b6f84e6b15b486a
 DIST term-1.0.0.crate 36590 BLAKE2B f425b99e62d2c3ae8be417f451c09c13f29e8fda64ff499b59a3b0ab4488acedbd40ecade9a9a5d1f9245599472a70ca438fdfcbe9b94afb5d75bc2c6a49995c SHA512 dd727170cd03c3667cc51a5db3d2d3dbd0f6c0da5903896eddcef86d8217d65c461e328b91367992a94446d12b03dd484831e469f371b637dea2cd7cd84fb761
@@ -725,12 +627,10 @@ DIST termtree-0.4.1.crate 4557 BLAKE2B d4300b0e6e908c519a0a76f5e08167f4467f428b2
 DIST termtree-0.5.1.crate 8498 BLAKE2B ebe1face80741908e28d3fbf828bd0a7a70bb317f4532fe38ac9b6adae898a7032f751718a39300ecca8c7bf0ea6cca028c02c93c7ce7a645d67656318e90172 SHA512 43d92132cef6d352c6c0190ce4a688d7cffb61ee86dbc6b49ba1f4c404661f9b329331198063d913ae52b2d4c69e6a2d9f5cd62886894c468093abd8604f0125
 DIST textwrap-0.15.2.crate 53191 BLAKE2B 6f9488a5d44e8bcdb63eefe6b7d95772ef84196b0002dc12257fcc0ea79c50225478af865551617f2346005cfe73bd0604aa18e9996ec076f27569054f41776a SHA512 1c5190d136fc9fdab1fca36dbfd3ce9228c0bc2a10780d1a7fa64cf5c6ff30d4c0e3827c2253c50e8a5c980a15441679edf65f024f2b997dcd61e32f2acc624a
 DIST textwrap-0.16.1.crate 56012 BLAKE2B 9b5a7c76eca64d089f4fab7095f2d35624527ca223e53b03cc807c6bfe913a99b55197b973a3102e3e5c4055bcd6ab580a0c9d67657180b61435bd6eb7631211 SHA512 3a8d2036c8e4b88866d68b8066a2991756f6bd4ac5c726e63fdffbc894fbdc03bf8b6e0ece4b96684c8e1facb6413190768d51a8539094efe47977c120d31f1b
-DIST thiserror-1.0.58.crate 21025 BLAKE2B 2915ed6ab691fe94e97a834ce5874d37a388c3240499889cff633ee6c67d46a2ca88098ba40c225ca0e2e3c1ac7bdcfafcfde3dcefc50867e299dc49505d6fc0 SHA512 3cba2d1f4965bc56bac8fc70540d8cd442ab6b8c7d25d328bde7f4cc108535d83c75f293316d730bbd86eb247400b6e35107d610c7caf47f43a28b1f52fed578
 DIST thiserror-1.0.61.crate 21264 BLAKE2B 97337830507c009dbb4cad84cdfc02bc097b9d39d0af2fdecfaa63f0c12229e60727244fa4e44c2d54daee67bf8b4e8492d94a5de55d1a90b8eeab8c0d082e80 SHA512 9c08b868eaa47178ee60733aaeeda60dc46d58d2b9c15985ba3dcae4923e8edf02b97556df52f508753b0ff52782f6ca3227e9ef6343066e5d5d3a89e03f3f15
 DIST thiserror-1.0.69.crate 22198 BLAKE2B fdd8ca8c8ca78702377d0bf7b253440519018275b105db980d63229d0d44aa5c39a703e14aa6fe453c779b3c864d8044009dfef893d2a5294950f067656d7a80 SHA512 ef50d2867d965da1dfb29d26faf6de273b5fadf78f95313f6caf44d68bfc610b9bd4b7544200b05bb0861231cfc84e961007f8db83c7905244c492037fd31899
 DIST thiserror-2.0.6.crate 28433 BLAKE2B 11f70af76b17ff3b48f27b47031f2f976b9939372a145bb9261236acf316a7230ab1bcf51e85b66bbca3a12a4a9eef404f1fb24e8588979b8cb707f374514140 SHA512 95c436442e3a6e3c841583669e5504c009522d23e124a9d5b7ac4a91346040baa294ca810ac035155189283f7d82c54ea2ed9392619821f6d2e3cdc439d48772
 DIST thiserror-2.0.9.crate 28531 BLAKE2B 7789458ffcb381e2cf02f182248396c5e6c20a818e4c5a2c7da8a8f50099c548646b51dbfe0630a242f24e9aff65e215a4473e13f63bbffbd80a3429237c65c7 SHA512 b7b5f54cde87c21e8fac3526d5a140c0d64116e700d07eb28714df3db372a42fba30bb37817282d0ee1b5333f1998d1f628d43054e59fc39393fb567c3df4cb0
-DIST thiserror-impl-1.0.58.crate 15645 BLAKE2B 9c6f643a582666ee4eb43330340888e7141f0dd89d927e3345268c3eaca02fa42b018514ef38b3db3ff9722b25ebdd43c36b11ecfc7bcb36950ce2c204ff78e1 SHA512 9bbc623f54c71595e48b33bdb3e4f12eb2e48074b15ebe400d6faab43410b363e5af94df071aaa324c59dc6958173e3c301fd51b216969f095e19cb98a27292b
 DIST thiserror-impl-1.0.61.crate 15786 BLAKE2B d63773424aa047c6eed8a6c9bcc8dfcee9841a2d4fdf6fc2c117695c09359371931722198b2e0b2bae32b0c54b6275f964e679b78b8bef1c365ca33aa41562c9 SHA512 b43bd2ba6b751b777e2fc78aac92a3e662a1876f704625c4e894019fc68a6b7628b9c3b7ddfbd2cb15fe6fdc0ff679ff94b0c47e2660a40919000ad2fe1cfeec
 DIST thiserror-impl-1.0.69.crate 18365 BLAKE2B 51663251ea6ec99c59aec35fe73c5f9760809d6b6b7eaa8ecbc8f6939acdc4d0ebc11f9034d9204dde7bd689d5e8303ae0be86e298745e9ef96825bf73453a08 SHA512 579eb796c8885feb01d27638862823acd96c79440655bb444c3445ac00121852603396ce7439aed617c0a0ac69f62102167fde5845411c906997574a46d6d9e3
 DIST thiserror-impl-2.0.6.crate 20946 BLAKE2B 44d9530c7477e26628cc668ec5d74dbe3e27e9f69ee2d2a5c9694875570abd5dbb73f4b6c45bad311254c3fa21d3a7511006b8d8db4ce15355f1ab1d68f51316 SHA512 73c5e180d087c6cecf3421d3c56a8d13b4a908fa9dec02a028f30adeaebbfc6ad7748837f08c5286007f09b7430df8677eadc50527d6f17e2341341441ed6059
@@ -747,15 +647,12 @@ DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf
 DIST tinyvec-1.8.0.crate 46796 BLAKE2B 720d0e6d881855a36779e12f5ffa708d3a8b96e6d0de9056cb33c9b8ce0d408f99b22f5b2bb9d64bee72a011fef846dbebbea2ccd238d7b951eb5ef0c4866e05 SHA512 b7b32e38229645965900f80f298685f13e6d13e58cfd6945409a6643ca9c9adc2621456956d5998ab9dd91c2db4ae79638b156ca0d9c7c5505023fd9b28414df
 DIST tinyvec-1.8.1.crate 47269 BLAKE2B d72ec2417520fa0481b8447e6d75e1f24731d38f9083a711185785174a8567c81f6416468b9eabf426f9d32683231e7c5e80202292d1e424f9e4ac9cc8b3e765 SHA512 db32a6beb1c86eb3e9f5ff2732a4acc03d1d684f0e54df5de2ecbfd08399639f47396ae8b17eb5f0122a09ba0c313f39bd73a6f7c44cc38d1891d1bdf3f2d176
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
-DIST tokio-1.37.0.crate 764297 BLAKE2B 725f3b62c52ae962623df84c690db7c54438581b8d2108dda76f05bfabdf1688f2de8b4fed2ab0db5c04c7659af8d95a7e19702654a12fd498d85a1d030c7a45 SHA512 fc3c070ed0c09e57205b76618a93b8b00f4d74c2ad89df3295254ec2a984f4fdfa9ed5472ff935e1644e89cf2abc44354742603c0e006f14861deab2b873cd85
 DIST tokio-1.38.0.crate 774094 BLAKE2B c7d85234ed0de32526246d2ecb52b70b1c4b81681c6b26aeec256090b4aafb41a9173dbe754a5716baecf2c45d9e3cc02fa375fbb343da09e728890b0194b9ff SHA512 4bc16fe979f2261cb17f007ce8ebb05b915be79c1000c5c429744cab01755b933908aadba0005c84faba6bf5d486ae6e3aae6c8f9bf0d6a5dc0ab6d0390ebae9
 DIST tokio-1.42.0.crate 806998 BLAKE2B 9d33a892eb8de63a65218da70f29f21b75b5b9635cbde0ae0667f6de117a4c6660cb2bbc1316b76e9e796960b7dc6c2b31c146f016cc147a2f11333b26391a5d SHA512 3cdc72f3209057cd0f954913f3d26d275246e0a2d63171f84449257de55d1a416c65b340d38a0d0c7fa33bde36bb612f550cbd43a49df22781c84f8ab2bdad9f
-DIST tokio-macros-2.2.0.crate 11520 BLAKE2B b688669f8bcb44967fe0d3db51fc5d5f86da3cd0c7eb7b5803feb250ea3444d134ecc7f79345f0b947cd3479a46659f3a158a04e0edaaa52deb8d343deac4761 SHA512 7e33fa62e0cf4b829638553a51f849242788d217264437444b3bf478fb40be26800d5cfd954b1bcdca1e5191b3c6c60879050f0f7e707461f7b090ae5025e0c6
 DIST tokio-macros-2.3.0.crate 11753 BLAKE2B 53429417a6fe3bc6c320ac5e321ffb2b19a64236a8a499fbb10b501d875e9d266fca2d82364a8aabdfecab46e4aef1b48d3b8ab3ac20086b54834c3e2f0f1b98 SHA512 cdb2f13141895035b76d38137dfd0e6829a5f8a617d0b63ec53ff51723c69e301d49f19c4b8b7e86c6e6a2cf58c1aeb35d071193029005fdfb9127f5a12841ae
 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.26.1.crate 31214 BLAKE2B c5829570c90b5d4dffe73c8b3a5bcba799bc48e8b742ff10030805067201848c362fad9f4ff319b003eb734b078389a35420186e90a434464f45dc1b6b3391ad SHA512 0cee6b356ebc4be05c484d459ac457280f41401093ca942cc61a6e6514dd4a48b1cc921f7dc02f9c8bc34b751d4d40d6d4768b21193d5a12c38ebd140bad4896
-DIST tokio-util-0.7.10.crate 110508 BLAKE2B 073b25e1484d54911bc15fc2a4b3fb7658f24f7f77a2382f9f84c5122871cf8c5d6097d5c784cd75b17a79aa63eca80644ff54bb496b52e53bb89650ce35cab0 SHA512 d77db36cfa5a2ace3090874d8996b9e94058ac31648308da8dd92a7bdc9b9b61adb703dbd2131adfef0b428cd61b4de76fbdb674f718e89b297f762af11ec50c
 DIST tokio-util-0.7.11.crate 113421 BLAKE2B 2bb1c64e4698b99a149ac3db137d9f80a691199397f98f1e6fbba14f411e849859d061e7052cd3955f000b31d97d594a4bab7928fcbfefcc9723980d3a1c80f5 SHA512 09956fc3eac8587f48cc739370883b96d19eb3de19293d240396b64b187178adc081248a5ed3d15accf97c27f9aabd0e6a1e3e2a194f330a0efcbebcd5055360
 DIST tokio-util-0.7.13.crate 115191 BLAKE2B f4acc65d0fd14a88d46545bec2313cb1f25e1cb76014d09c34f8a8be62c6901ab09b18d7b32fdab58f6594fb861bfcb8bfdc8825871347d7eabe2bd8117768bf SHA512 2a1e8fbdd094f81e00ee87eb5ebc4c62825945048105970e52d6d0a872769d268a41ddf91c60158c02a303ecbaa1b19795948b5416f9bbfcb079c5b27d39d51f
 DIST toml-0.5.11.crate 54910 BLAKE2B 9ecd5103b33ab47d4be23c897c7095ca381cb79bedcaac4918cddc36fc7cf5d34ab664da52c2273d935f04486e9325241d6b66785d50aac78453c219aab49e1e SHA512 eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317
@@ -794,8 +691,6 @@ DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542d
 DIST unicode-ident-1.0.14.crate 47547 BLAKE2B 30e0b6d7f3a967aaf5b9d91237008a60c3a8ded53bda901696e23cea3931dd71b01ddab866dca9e31e17c395d5f5a68f2a938655b693e894962568c2cff5ca15 SHA512 7c6dcd1724e8cfedc37546d1abd49088b633dad228097acc73d7b6cab255b223e830c541144e05a00388fd8ca8066f27c18792419cfa58ee9da4460a38d0bc0a
 DIST unicode-linebreak-0.1.5.crate 15324 BLAKE2B dc560d5b36ed01357c22750feb7f09fd0f57fb0ea543180f6e31c0b71b51df4faaa70ac8482f9cd60e5d1faa5bfd4bebfbfd628dd5913c2c4a858ec04beeca3f SHA512 f37be2f7b04b886e95bb7d0f33bd392b78bb940ef9a01cec487062cf31ec0367306650fad7004df556887a324c714eeb28f697044aad9a429ce07b7b7344af60
 DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c8782321b1bbbee724db1e4d8c1d43af4e6bd8044b99307c227d93631d178d10fda445a941a485882ae0015a6e3d3c347e4bd465bbe1d9 SHA512 539f04010810d73fde7b0ab314faf813f3e7ecd2e51d7975281554b7cba4a8706e2b5523c4b7840568593652360ca59e9db0e1ce342e71c28db635ff55ffb0f5
-DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe
-DIST unicode-width-0.1.12.crate 24062 BLAKE2B 61afd22353d46a8a77519af9b3580d75dafc7965967f7724cb740f1ee199c7742b3549ad6c67776b876dbda5b8f27c634431f68517e29a72ade1622da9fde446 SHA512 0bafd7a69bdf49c849e7c063ebf0487eca8a76244e3bc18c9a5f4609465dc0e5d482daceb6a9a6f4125b801bf7063cb8225fdb55173e5dc55e7bf278300df1b4
 DIST unicode-width-0.1.13.crate 457228 BLAKE2B 757c4da5fa090369a26130b08440c2348f1cd1c0dfbb6770dd75b65eba797eaa65f5d683f0c2862cced06124d46a89b4825af0d990f6adc2df8709b8ef291665 SHA512 9781d6dab2c6343e8c28ec66b50cb4293261bb2114e122fa80ad2facdb23020f5b621c38030193b918669e58adf143808e5ab4c507c18beb6dc61e97b2e296f4
 DIST unicode-width-0.1.14.crate 271615 BLAKE2B dd2e1504caedecb5d37c397ba05446d3d762b8b6833a8032ebbc213e324d53d89db5e96ed2f7223096e5754d800b39a54105906effc88d9437d7acb9e7beb81e SHA512 3c58a18776aa82cc13c761789a47901616cd98a30356f93d7eb05ae457314209d0a66213e2bbfa5eb8b59be6beacf62438234ce8daafa31b128dbf7d5d6fcadb
 DIST unicode-width-0.2.0.crate 271509 BLAKE2B 53015f24c57ba65d7ffc6e15e947f5ab96fa272996fe5a4d2f9203051972238ea7591c99f1d8ae5d2610c7b83c215b6912eff7aaae034237aec8d79620bfb843 SHA512 38149ad512a44fc79b2c991c6b5667da2e8f8b442ab6bb7e4f404e7fbb034f7540c7e0e8b9e72a1ff6117b899d6034862239f43b6423fa89d55dcf489caff37d
@@ -804,13 +699,11 @@ DIST unicode-xid-0.2.6.crate 15744 BLAKE2B b1bad25897717f6346f988d5a7c90c51fb842
 DIST universal-hash-0.5.1.crate 9146 BLAKE2B 9095f95faa8ed4128c3787226f3899acec4278d36799ae30a7ca71ade7179c274a1807f62605e687e60ee97e6bebfe818100ed0441db455bdee0f8e5dd451809 SHA512 83b3ddb1f0d7ff621ca2b3d426c2e682d8339a2adedbbbb3a4584977e2e996549d665578729bff65b5693059460e9e04b9df2181c404980d3b3d946c80e0b589
 DIST unsafe-libyaml-0.2.11.crate 62101 BLAKE2B 7ba17f2c19d96fc8999448594ba67bfc0eceaff47a39e560f856d13229ad5e69a9c8ba8794ec814e6b7c3cb7d597b7c7a366c8e880f17c0efc6a03a5677d82bf SHA512 a42c95eaed1ae2e438d3ba19ccd92337327c34f6174a43db80e1f37c507154249c7510e93f81726890c6032c89fe21b1876582afb7fbb811e3931480c4727712
 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.1.crate 79677 BLAKE2B 02667b78e1ca11e38f4d76689a1a07bcdb2ee28c4705f6dce558e0686db7a764e5f3f1c3f77b3850647b59ad4278651f089d8a1a340a2fe2fd72b084d4bfc5cb SHA512 1ba5cd14166517a5114feee1f7d2ae7c1d2763a34c0e331171f9cc07fc35bcadbb0c87318533fd07b4c01e052abd88ac417fad7f898abe62126919e3f02c0528
 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-width-0.1.7.crate 2977 BLAKE2B 319871431fd21dc30f812460ca69bf0f3b1f6f9bdf749e4ab650eee1597e3a86afebeb646f4abf4b32ab661142433eb9bd2b0917d0f5c0a93d154168c2ea3278 SHA512 ae870bc338bc74f9e214acbb31155ed37e3c686abcda81e7a3f9b8440d2782e4b29efa6d1a52afb22da390f3e64f012380f18ba1e3c1a37bde927812c361909e
 DIST utf8_iter-1.0.4.crate 10437 BLAKE2B 1e7a8b9241ebbb62cb497542b970473780f735010a0af900771a43abceae4e7f362d21d4f79f7c00630e4549400875ea17574b2cbe4f5ea19e8ed428e3b5577d SHA512 a72671995b3eb295581c60dc632e4a25ba257227fb5d58a8bec322428b6d69529bba79a6f02b8e7ee6698b7779d9d6695f5badad73e07c254b00c9d6256c9090
-DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
 DIST utf8parse-0.2.2.crate 13499 BLAKE2B 095b5d219ab8ff04c06fd6303e03d913ae36a57845f0b2ca3217a40e31a54cb0fb5ecedbde165d28f5f60f1553d8252986d7098fa83befc84a7cb20bf3b76144 SHA512 f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
@@ -840,7 +733,6 @@ DIST widestring-1.1.0.crate 85046 BLAKE2B 591f8ba6c3c45721d342fd4668805c19915d50
 DIST win-crypto-ng-0.5.1.crate 44667 BLAKE2B 112a40af7aaa7d3e1c6d6eba99f3eafc7173a10f149e122eb5c658619f6898add8086ab8523695b8433bed89952d70a63e6f445b39ad4e9bd64ed98931002817 SHA512 735d245c56928db70dd4ca0b95dbd8be9f3b55dcd88961549dd51cf8e671eaa3a203b76a1e2ba073ed8b0042f9aea08fdff505f7efe19d8b2153589f9e811692
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9
 DIST winapi-util-0.1.8.crate 12416 BLAKE2B 5b48c27dfbb5db5c332f7e248138327b35ceec0909788b940168e7f6fe1402800da5e7690b2b1654da6c510b5c720330a92da16dff53ef15821f37fef6f335e3 SHA512 e186111398f9f0f0686e791ad0d72c39205e5f246b6e020df413e477ee07f32e91d09405c61dc92752f061f54fd7533435545c1a151477b40e2d68acc94a57fd
 DIST winapi-util-0.1.9.crate 12464 BLAKE2B 7fb9dd803fc2608c4e5bc75674472992d82da364f24c22072d5624d6ae6abc44abd3e3ea3c45a7558e045331f3d87572b306b4ab5de52c07ff3706e7f13c2a38 SHA512 c46b893f67ec6e36499b00736bb6b9421e0e2611e76784afa6da01d7ebd033df82f1be7cf8d871d541125d290983f98f26f759488ba9aface49efce8edd682e9
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
@@ -903,17 +795,14 @@ DIST yoke-0.7.5.crate 29673 BLAKE2B cd2e42103140e080a29bf579fe5176b36a192f9b1309
 DIST yoke-derive-0.7.4.crate 7470 BLAKE2B e5c0ca6f9cad4336b6b7554d05c3926d1720707aa70b588ebb884426747eb7d3d82614ba20563a5e801c4645f90fed9e067f50f43749a66e52f20c4204fb94db SHA512 5be38b8ae8dcb640a3fcb097e5b118354b45a41a0367afeff3c2ba5d13458524e88f9433848f09c670533d36a49a0e2b393e23368921553b5bb008e66e8e4a40
 DIST yoke-derive-0.7.5.crate 7525 BLAKE2B 9b6b97eaf3c50f0f5ce8cebf685a1a17d4c21eb9b26d38eac99e0a4c0f9d592e95a7843b7a0b897945a14c4eb78ffdf2c0972b448d31d7bc7b077f27aad81d9a SHA512 e30b06b020aa283080905004295fb643c539b130d0d53bda51927b95e79ba562336aad30d8a6202d9a0c62d5b64559a01218c6f02f3faada6003d4b03c205cd6
 DIST z-base-32-0.1.4.crate 14008 BLAKE2B 099ed86e96c8434f1784c8e80143de91a357fdbf9db096fc461daa13de031b8561dac5e6cc1ab6edea1732b50e2dca3e15541b09e239852c04cad82e324dd96e SHA512 83eef93391d22782fd38ba30957a5569a74e7be529354eed3b24da71eb958a7bf17da7b3366e4f204accc2145a967819f0a07ae33e021063640ce9ffce7534aa
-DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82
 DIST zerocopy-0.7.34.crate 151177 BLAKE2B 30b65131370dfa4f41d3c2705d3b75da9b76f2a4ed723dec66345939de8bafe2c181ab6c98036c25a30739cae1720d927e27e5fa5587442d5cfb7f39a7018c8f SHA512 4d27b1230ebcea4e9d4c15f38a979aa3fe8b23833e95df781a0a67054e920637642b89345596fe331907edc27abab83c766967f2a04399a6fe0a4e89fa0dd148
 DIST zerocopy-0.7.35.crate 152645 BLAKE2B 8f13123c9d9257ac5a5c6954d38c3510fa658624442f7e03cdcc6db5a0977d9f26bb4e277be172b7872ec365cf6e58ac742e5578636f7698f9f37093e9249d9a SHA512 17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c
-DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d
 DIST zerocopy-derive-0.7.34.crate 37907 BLAKE2B 23a698c3c892187307007cbc76c9338dbe163e4f14d4ea73969ba834f5c6732d16f5bc26e2e85c5e3df2100b28e6e72ae6473b2159f5160ee19befdef3615f98 SHA512 1bd93062b0d2c699066f8a991326b4470426aae0517d33748a8f0e52b009fc46e6b0b238abe97462a2e13c870fa3d0d070615870e6dbbf8b6991c0e3fb5c3e63
 DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb
 DIST zerofrom-0.1.4.crate 5044 BLAKE2B 8ad9a14b8b0c251cffb420f7ac673669fd29b74bc2f5e220c8e86d592f58cbb2c7be88d906b7dac8803dbd76ec459c4a249b7d1ede75a055454a1626b387f128 SHA512 11f37a67108185a8090cda71338b02492fabd15e6cfe018833a165cd869ed65338e12d7c5680ffb0b763fc3acbdff6fe4df30457653dfe4d79ecc864b69d780f
 DIST zerofrom-0.1.5.crate 5091 BLAKE2B a2b938197957755c4a8ccfb258f60f90931a0a342d9d4bd098c7a25e1c9069148a51ddfffd2b72a6a9856d8c6e66fe1482ab2081a5f3478b4b318062caffff42 SHA512 11f16a1003967b3f30d7b32ffc8541ec05fb335690b08cf4f7554c624ad4312ee0961c83390a997e2a73aee06d8bb09a0ff4e6a5e489f8fb925141e732006544
 DIST zerofrom-derive-0.1.4.crate 8232 BLAKE2B 98f69cdeff7df52822b982e3c089ccfa3ac2ce67f320b0d32eeffa899d2b34627268ed0a01b03504a0a6fcb6bef34d808cc79c811d5daed7f8acf59282e82088 SHA512 f2ea4650fcb4e7c3583f0f7c6146c7734cf6e80e07d92c330c6bc6a0a4e0fe14ae3393845713331240c70685e92eec114565c5be21189e687fe6232aef75a9c0
 DIST zerofrom-derive-0.1.5.crate 8285 BLAKE2B d19bf1b74be89f4d27eda36ba6407d598358d3d69bed64f02903ab7dc509faa006cde9c13e19f5f3cde09cf9049120575263996c922b20da366a11e18baa42dc SHA512 75098e0f1c690bd8476f819f4ea2a7645b88237042a8876259bf4e025b070a4b105caf16ca7a824c5dd6c4690b693fcc74bed9ac0b5e6fdab05a5bed1b5cb298
-DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756
 DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe14ab9e7f0b4ef3cb1ecbc42fbec2b951414e26ab00bc65aaddc2c93eddd5a1963b27c6cd613ac71c65d5cc24 SHA512 dd40ebe98b98fd742608d4066b5ab66caba94b2e679428fcaff9fe547d8cd6ff2360dc85d671ee9183e32fb79cb554d00d6aef9eb8f3d8ad0ec92d0435aa4ebe
 DIST zeroize_derive-1.4.2.crate 11141 BLAKE2B a40add656369a3a40d5b5f3397a77a1e9f803d4b8ae5b7d51c9f2ebb332a289b3c1ea528655806a26998e081a1cc9f4b07828664542de8d8d2619faf079d25c5 SHA512 d6966b024ce5e265c93e7056659ccbb97bbf6baa30f759fd96dc4391a6487426637f61f0a2713b6160019d778cf7d8ff1f25bb33d6c4f4585b990baae418b226
 DIST zerovec-0.10.2.crate 126403 BLAKE2B f6f7e08c27e5724c9071cf007c09a3fdc80b84bc3f7a08647d6e312674f82c1e35335e8c72da5d47904a937bdc6f29c26729b35123f6e8119f6991c7055318af SHA512 159cb90d2ee2a2662429141e0948cfb44e7784ba35e92c32b2ac7183d6b69a9318b0617ff4de7b87831f9727f9d5c9d7d4fd3a9b1f54e67ca29a4ed6afc8d046
diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild
deleted file mode 100644
index 67da219c4c14..000000000000
--- a/app-crypt/sequoia-sq/sequoia-sq-0.35.0-r1.ebuild
+++ /dev/null
@@ -1,559 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	addr2line@0.21.0
-	adler@1.0.2
-	aead@0.5.2
-	aes-gcm@0.10.3
-	aes@0.8.4
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	aligned@0.4.2
-	allocator-api2@0.2.18
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	anstream@0.6.13
-	anstyle-parse@0.2.3
-	anstyle-query@1.0.2
-	anstyle-wincon@3.0.2
-	anstyle@1.0.6
-	anyhow@1.0.76
-	as-slice@0.2.1
-	ascii-canvas@3.0.0
-	assert_cmd@2.0.13
-	async-trait@0.1.80
-	autocfg@1.2.0
-	backtrace@0.3.71
-	base16ct@0.2.0
-	base64@0.21.7
-	base64ct@1.6.0
-	bindgen@0.68.1
-	bit-set@0.5.3
-	bit-vec@0.6.3
-	bitflags@1.3.2
-	bitflags@2.5.0
-	block-buffer@0.10.4
-	block-padding@0.3.3
-	blowfish@0.9.1
-	botan-sys@0.10.5
-	botan@0.10.7
-	bstr@1.9.1
-	buffered-reader@1.3.1
-	bumpalo@3.16.0
-	byteorder@1.5.0
-	bytes@1.6.0
-	bzip2-sys@0.1.11+1.0.8
-	bzip2@0.4.4
-	camellia@0.1.0
-	capnp-futures@0.19.0
-	capnp-rpc@0.19.0
-	capnp@0.19.3
-	capnpc@0.19.0
-	cast5@0.11.1
-	cc@1.0.94
-	cexpr@0.6.0
-	cfb-mode@0.8.2
-	cfg-if@1.0.0
-	chrono@0.4.38
-	cipher@0.4.4
-	clang-sys@1.7.0
-	clap@4.4.18
-	clap_builder@4.4.18
-	clap_complete@4.4.10
-	clap_derive@4.4.7
-	clap_lex@0.6.0
-	cmac@0.7.2
-	colorchoice@1.0.0
-	console@0.15.8
-	const-oid@0.9.6
-	core-foundation-sys@0.8.6
-	core-foundation@0.9.4
-	cpufeatures@0.2.12
-	crc32fast@1.4.0
-	crossbeam-channel@0.5.12
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-queue@0.3.11
-	crossbeam-utils@0.8.19
-	crossbeam@0.8.4
-	crunchy@0.2.2
-	crypto-bigint@0.5.5
-	crypto-common@0.1.6
-	ctor@0.2.7
-	ctr@0.9.2
-	curve25519-dalek-derive@0.1.1
-	curve25519-dalek@4.1.2
-	cvt@0.1.2
-	data-encoding@2.5.0
-	dbl@0.3.2
-	der@0.7.9
-	deranged@0.3.11
-	des@0.8.1
-	deunicode@1.4.4
-	difflib@0.4.0
-	digest@0.10.7
-	dircpy@0.3.16
-	dirs-next@2.0.0
-	dirs-sys-next@0.1.2
-	dirs-sys@0.4.1
-	dirs@5.0.1
-	doc-comment@0.3.3
-	dot-writer@0.1.3
-	dsa@0.6.3
-	dyn-clone@1.0.17
-	eax@0.5.0
-	ecb@0.1.2
-	ecdsa@0.16.9
-	ed25519-dalek@2.1.1
-	ed25519@2.2.3
-	either@1.11.0
-	elliptic-curve@0.13.8
-	embedded-io@0.6.1
-	ena@0.14.2
-	encode_unicode@0.3.6
-	encoding_rs@0.8.34
-	endian-type@0.1.2
-	enum-as-inner@0.6.0
-	enumber@0.3.0
-	env_logger@0.10.2
-	equivalent@1.0.1
-	errno@0.3.8
-	fallible-iterator@0.3.0
-	fallible-streaming-iterator@0.1.9
-	fastrand@2.0.2
-	fd-lock@4.0.2
-	fehler-macros@1.0.0
-	fehler@1.0.0
-	ff@0.13.0
-	fiat-crypto@0.2.7
-	file_diff@1.0.0
-	filetime@0.2.23
-	fixedbitset@0.4.2
-	flate2@1.0.28
-	float-cmp@0.9.0
-	fnv@1.0.7
-	foreign-types-shared@0.1.1
-	foreign-types@0.3.2
-	form_urlencoded@1.2.1
-	fs2@0.4.3
-	fs_at@0.1.10
-	futures-channel@0.3.30
-	futures-core@0.3.30
-	futures-executor@0.3.30
-	futures-io@0.3.30
-	futures-macro@0.3.30
-	futures-sink@0.3.30
-	futures-task@0.3.30
-	futures-util@0.3.30
-	futures@0.3.30
-	generator@0.7.5
-	generic-array@0.14.7
-	gethostname@0.4.3
-	getopts@0.2.21
-	getrandom@0.2.14
-	ghash@0.5.1
-	gimli@0.28.1
-	git-testament-derive@0.2.0
-	git-testament@0.2.5
-	glob@0.3.1
-	globset@0.4.14
-	globwalk@0.8.1
-	group@0.13.0
-	h2@0.3.26
-	hashbrown@0.12.3
-	hashbrown@0.14.3
-	hashlink@0.9.0
-	heck@0.4.1
-	hermit-abi@0.3.9
-	hickory-client@0.24.0
-	hickory-proto@0.24.0
-	hickory-resolver@0.24.0
-	hkdf@0.12.4
-	hmac@0.12.1
-	hostname@0.3.1
-	html-escape@0.2.13
-	http-body@0.4.6
-	http@0.2.12
-	httparse@1.8.0
-	httpdate@1.0.3
-	humansize@2.1.3
-	humantime@2.1.0
-	hyper-tls@0.5.0
-	hyper@0.14.28
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.60
-	idea@0.5.1
-	idna@0.4.0
-	idna@0.5.0
-	ignore@0.4.22
-	indexmap@1.9.3
-	indexmap@2.2.6
-	indicatif@0.17.8
-	inout@0.1.3
-	instant@0.1.12
-	ipconfig@0.3.2
-	ipnet@2.9.0
-	is-terminal@0.4.12
-	itertools@0.11.0
-	itoa@1.0.11
-	js-sys@0.3.69
-	jwalk@0.8.1
-	lalrpop-util@0.20.2
-	lalrpop@0.20.2
-	lazy_static@1.4.0
-	lazycell@1.3.0
-	libc@0.2.153
-	libloading@0.8.3
-	libm@0.2.8
-	libredox@0.1.3
-	libsqlite3-sys@0.28.0
-	line-col@0.2.1
-	linked-hash-map@0.5.6
-	linux-raw-sys@0.4.13
-	lock_api@0.4.11
-	log@0.4.21
-	loom@0.5.6
-	lru-cache@0.1.2
-	match_cfg@0.1.0
-	matchers@0.1.0
-	md-5@0.10.6
-	memchr@2.7.2
-	memsec@0.6.3
-	mime@0.3.17
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.2
-	mio@0.8.11
-	native-tls@0.2.11
-	nettle-sys@2.3.0
-	nettle@7.4.0
-	new_debug_unreachable@1.0.6
-	nibble_vec@0.1.0
-	nix@0.26.4
-	nom@7.1.3
-	normalize-line-endings@0.3.0
-	normpath@1.1.1
-	nu-ansi-term@0.46.0
-	num-bigint-dig@0.8.4
-	num-conv@0.1.0
-	num-integer@0.1.46
-	num-iter@0.1.44
-	num-traits@0.2.18
-	num_cpus@1.16.0
-	number_prefix@0.4.0
-	object@0.32.2
-	once_cell@1.19.0
-	opaque-debug@0.3.1
-	openpgp-cert-d@0.3.2
-	openssl-macros@0.1.1
-	openssl-probe@0.1.5
-	openssl-sys@0.9.102
-	openssl@0.10.64
-	option-ext@0.2.0
-	overload@0.1.1
-	p256@0.13.2
-	parking_lot@0.12.1
-	parking_lot_core@0.9.9
-	paste@1.0.14
-	peeking_take_while@0.1.2
-	pem-rfc7468@0.7.0
-	percent-encoding@2.3.1
-	pest@2.7.9
-	pest_derive@2.7.9
-	pest_generator@2.7.9
-	pest_meta@2.7.9
-	petgraph@0.6.4
-	phf_shared@0.10.0
-	pikchr@0.1.3
-	pin-project-lite@0.2.14
-	pin-utils@0.1.0
-	pkcs1@0.7.5
-	pkcs8@0.10.2
-	pkg-config@0.3.30
-	platforms@3.4.0
-	polyval@0.6.2
-	portable-atomic@1.6.0
-	powerfmt@0.2.0
-	ppv-lite86@0.2.17
-	precomputed-hash@0.1.1
-	predicates-core@1.0.6
-	predicates-tree@1.0.9
-	predicates@3.1.0
-	primeorder@0.13.6
-	proc-macro2@1.0.80
-	pulldown-cmark@0.9.6
-	quick-error@1.2.3
-	quote@1.0.36
-	radix_trie@0.2.1
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rayon-core@1.12.1
-	rayon@1.10.0
-	redox_syscall@0.4.1
-	redox_users@0.4.5
-	regex-automata@0.1.10
-	regex-automata@0.4.6
-	regex-syntax@0.6.29
-	regex-syntax@0.8.3
-	regex@1.10.4
-	remove_dir_all@0.8.2
-	reqwest@0.11.27
-	resolv-conf@0.7.0
-	rfc6979@0.4.0
-	ripemd@0.1.3
-	roadmap@0.5.0
-	roff@0.2.1
-	rpassword@7.3.1
-	rsa@0.9.6
-	rtoolbox@0.0.2
-	rusqlite@0.31.0
-	rustc-demangle@0.1.23
-	rustc-hash@1.1.0
-	rustc_version@0.4.0
-	rustix@0.38.32
-	rustls-pemfile@1.0.4
-	rustversion@1.0.15
-	ryu@1.0.17
-	same-file@1.0.6
-	schannel@0.1.23
-	scoped-tls@1.0.1
-	scopeguard@1.2.0
-	sec1@0.7.3
-	security-framework-sys@2.10.0
-	security-framework@2.10.0
-	semver@1.0.22
-	sequoia-autocrypt@0.25.1
-	sequoia-cert-store@0.5.3
-	sequoia-gpg-agent@0.3.1
-	sequoia-ipc@0.34.1
-	sequoia-keystore-backend@0.3.0
-	sequoia-keystore-gpg-agent@0.1.0
-	sequoia-keystore-softkeys@0.3.0
-	sequoia-keystore@0.3.0
-	sequoia-net@0.28.0
-	sequoia-openpgp@1.20.0
-	sequoia-policy-config@0.6.0
-	sequoia-wot@0.11.0
-	serde-aux@4.5.0
-	serde@1.0.197
-	serde_derive@1.0.197
-	serde_json@1.0.115
-	serde_urlencoded@0.7.1
-	serde_yaml@0.8.26
-	serde_yaml@0.9.34+deprecated
-	sha1collisiondetection@0.3.4
-	sha2@0.10.8
-	sharded-slab@0.1.7
-	shell-words@1.1.0
-	shlex@1.3.0
-	signature@2.2.0
-	siphasher@0.3.11
-	slab@0.4.9
-	slug@0.1.5
-	smallvec@1.13.2
-	smawk@0.3.2
-	socket2@0.5.6
-	spin@0.5.2
-	spki@0.7.3
-	stable_deref_trait@1.2.0
-	state@0.5.3
-	stfu8@0.2.7
-	string_cache@0.8.7
-	strsim@0.10.0
-	subplot-build@0.9.0
-	subplot@0.9.0
-	subplotlib-derive@0.9.0
-	subplotlib@0.9.0
-	subtle@2.5.0
-	syn@1.0.109
-	syn@2.0.59
-	sync_wrapper@0.1.2
-	system-configuration-sys@0.5.0
-	system-configuration@0.5.1
-	tempfile-fast@0.3.4
-	tempfile@3.10.1
-	tera@1.19.1
-	term@0.7.0
-	termcolor@1.4.1
-	terminal_size@0.3.0
-	termtree@0.4.1
-	textwrap@0.15.2
-	thiserror-impl@1.0.58
-	thiserror@1.0.58
-	thread_local@1.1.8
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tiny-keccak@2.0.2
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	tokio-macros@2.2.0
-	tokio-native-tls@0.3.1
-	tokio-util@0.7.10
-	tokio@1.37.0
-	toml@0.5.11
-	tower-service@0.3.2
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing-log@0.2.0
-	tracing-subscriber@0.3.18
-	tracing@0.1.40
-	try-lock@0.2.5
-	twofish@0.7.1
-	typenum@1.17.0
-	ucd-trie@0.1.6
-	unescape@0.1.0
-	unic-char-property@0.9.0
-	unic-char-range@0.9.0
-	unic-common@0.9.0
-	unic-segment@0.9.0
-	unic-ucd-segment@0.9.0
-	unic-ucd-version@0.9.0
-	unicase@2.7.0
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-linebreak@0.1.5
-	unicode-normalization@0.1.23
-	unicode-width@0.1.11
-	unicode-xid@0.2.4
-	universal-hash@0.5.1
-	unsafe-libyaml@0.2.11
-	url@2.5.0
-	utf8-width@0.1.7
-	utf8parse@0.2.1
-	valuable@0.1.0
-	vcpkg@0.2.15
-	version_check@0.9.4
-	wait-timeout@0.2.0
-	walkdir@2.5.0
-	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
-	widestring@1.1.0
-	win-crypto-ng@0.5.1
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.6
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-core@0.52.0
-	windows-sys@0.45.0
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-targets@0.42.2
-	windows-targets@0.48.5
-	windows-targets@0.52.5
-	windows@0.48.0
-	windows_aarch64_gnullvm@0.42.2
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.5
-	windows_aarch64_msvc@0.42.2
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.5
-	windows_i686_gnu@0.42.2
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.5
-	windows_i686_gnullvm@0.52.5
-	windows_i686_msvc@0.42.2
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.5
-	windows_x86_64_gnu@0.42.2
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.5
-	windows_x86_64_gnullvm@0.42.2
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.5
-	windows_x86_64_msvc@0.42.2
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.5
-	winreg@0.50.0
-	x25519-dalek@2.0.1
-	xxhash-rust@0.8.10
-	yaml-rust@0.4.5
-	z-base-32@0.1.4
-	zerocopy-derive@0.7.32
-	zerocopy@0.7.32
-	zeroize@1.7.0
-	zeroize_derive@1.4.2
-"
-
-LLVM_COMPAT=( {16..17} )
-
-inherit cargo llvm-r1 shell-completion
-
-DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
-HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sq"
-SRC_URI="
-	https://gitlab.com/sequoia-pgp/sequoia-sq/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
-	${CARGO_CRATE_URIS}
-"
-S="${WORKDIR}"/${PN}-v${PV}
-
-LICENSE="LGPL-2.1+"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 ISC LGPL-2+ MIT MIT-0 MPL-2.0
-	Unicode-DFS-2016
-	|| ( GPL-2 GPL-3 LGPL-3 )
-"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64"
-
-QA_FLAGS_IGNORED="usr/bin/sq"
-
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	dev-libs/gmp:=
-	dev-libs/nettle:=
-	dev-libs/openssl:=
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/capnproto
-"
-RDEPEND="
-	${COMMON_DEPEND}
-"
-# Clang needed for bindgen
-BDEPEND="
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-	')
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	rust_pkg_setup
-}
-
-src_compile() {
-	# Set this here so that it doesn't change if we run tests
-	# and cause a recompilation.
-	asset_dir="${T}"/assets
-	export ASSET_OUT_DIR="${asset_dir}"
-
-	# Setting CARGO_TARGET_DIR is required to have the build system
-	# create the bash and zsh completion files.
-	export CARGO_TARGET_DIR="${S}/target"
-	cargo_src_compile
-}
-
-src_install() {
-	cargo_src_install
-
-	doman "${asset_dir}"/man-pages/*
-
-	local completion_dir="${asset_dir}"/shell-completions
-	newbashcomp "${completion_dir}"/sq.bash sq
-	dozshcomp "${completion_dir}"/_sq
-	dofishcomp "${completion_dir}"/sq.fish
-}
diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild
deleted file mode 100644
index ff40d8957e9d..000000000000
--- a/app-crypt/sequoia-sq/sequoia-sq-0.36.0-r1.ebuild
+++ /dev/null
@@ -1,563 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	addr2line@0.21.0
-	adler@1.0.2
-	aead@0.5.2
-	aes-gcm@0.10.3
-	aes@0.8.4
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	aligned@0.4.2
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	anstream@0.6.14
-	anstyle-parse@0.2.4
-	anstyle-query@1.0.3
-	anstyle-wincon@3.0.3
-	anstyle@1.0.7
-	anyhow@1.0.76
-	as-slice@0.2.1
-	ascii-canvas@3.0.0
-	assert_cmd@2.0.13
-	async-trait@0.1.80
-	autocfg@1.3.0
-	backtrace@0.3.71
-	base16ct@0.2.0
-	base64@0.21.7
-	base64@0.22.1
-	base64ct@1.6.0
-	bindgen@0.68.1
-	bit-set@0.5.3
-	bit-vec@0.6.3
-	bitflags@1.3.2
-	bitflags@2.5.0
-	block-buffer@0.10.4
-	block-padding@0.3.3
-	blowfish@0.9.1
-	botan-sys@0.10.5
-	botan@0.10.7
-	bstr@1.9.1
-	buffered-reader@1.3.1
-	bumpalo@3.16.0
-	byteorder@1.5.0
-	bytes@1.6.0
-	bzip2-sys@0.1.11+1.0.8
-	bzip2@0.4.4
-	camellia@0.1.0
-	capnp-futures@0.19.0
-	capnp-rpc@0.19.1
-	capnp@0.19.5
-	capnpc@0.19.0
-	cast5@0.11.1
-	cc@1.0.98
-	cexpr@0.6.0
-	cfb-mode@0.8.2
-	cfg-if@1.0.0
-	chrono@0.4.38
-	cipher@0.4.4
-	clang-sys@1.7.0
-	clap@4.4.18
-	clap_builder@4.4.18
-	clap_complete@4.4.10
-	clap_derive@4.4.7
-	clap_lex@0.6.0
-	cmac@0.7.2
-	colorchoice@1.0.1
-	console@0.15.8
-	const-oid@0.9.6
-	core-foundation-sys@0.8.6
-	core-foundation@0.9.4
-	cpufeatures@0.2.12
-	crc32fast@1.4.2
-	crossbeam-channel@0.5.13
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-queue@0.3.11
-	crossbeam-utils@0.8.20
-	crossbeam@0.8.4
-	crunchy@0.2.2
-	crypto-bigint@0.5.5
-	crypto-common@0.1.6
-	ctor@0.2.8
-	ctr@0.9.2
-	curve25519-dalek-derive@0.1.1
-	curve25519-dalek@4.1.2
-	cvt@0.1.2
-	data-encoding@2.6.0
-	dbl@0.3.2
-	der@0.7.9
-	deranged@0.3.11
-	des@0.8.1
-	deunicode@1.6.0
-	difflib@0.4.0
-	digest@0.10.7
-	dircpy@0.3.16
-	directories@5.0.1
-	dirs-next@2.0.0
-	dirs-sys-next@0.1.2
-	dirs-sys@0.4.1
-	dirs@5.0.1
-	doc-comment@0.3.3
-	dot-writer@0.1.3
-	dsa@0.6.3
-	dyn-clone@1.0.17
-	eax@0.5.0
-	ecb@0.1.2
-	ecdsa@0.16.9
-	ed25519-dalek@2.1.1
-	ed25519@2.2.3
-	either@1.12.0
-	elliptic-curve@0.13.8
-	embedded-io@0.6.1
-	ena@0.14.3
-	encode_unicode@0.3.6
-	encoding_rs@0.8.34
-	endian-type@0.1.2
-	enum-as-inner@0.6.0
-	enumber@0.3.1
-	env_logger@0.10.2
-	equivalent@1.0.1
-	errno@0.3.9
-	fallible-iterator@0.3.0
-	fallible-streaming-iterator@0.1.9
-	fastrand@2.1.0
-	fd-lock@4.0.2
-	fehler-macros@1.0.0
-	fehler@1.0.0
-	ff@0.13.0
-	fiat-crypto@0.2.9
-	file_diff@1.0.0
-	filetime@0.2.23
-	fixedbitset@0.4.2
-	flate2@1.0.30
-	float-cmp@0.9.0
-	fnv@1.0.7
-	foreign-types-shared@0.1.1
-	foreign-types@0.3.2
-	form_urlencoded@1.2.1
-	fs2@0.4.3
-	fs_at@0.1.10
-	futures-channel@0.3.30
-	futures-core@0.3.30
-	futures-executor@0.3.30
-	futures-io@0.3.30
-	futures-macro@0.3.30
-	futures-sink@0.3.30
-	futures-task@0.3.30
-	futures-util@0.3.30
-	futures@0.3.30
-	generator@0.7.5
-	generic-array@0.14.7
-	gethostname@0.4.3
-	getopts@0.2.21
-	getrandom@0.2.15
-	ghash@0.5.1
-	gimli@0.28.1
-	git-testament-derive@0.2.0
-	git-testament@0.2.5
-	glob@0.3.1
-	globset@0.4.14
-	globwalk@0.8.1
-	group@0.13.0
-	h2@0.3.26
-	hashbrown@0.12.3
-	hashbrown@0.14.5
-	hashlink@0.9.1
-	heck@0.4.1
-	hermit-abi@0.3.9
-	hickory-client@0.24.1
-	hickory-proto@0.24.1
-	hickory-resolver@0.24.1
-	hkdf@0.12.4
-	hmac@0.12.1
-	hostname@0.3.1
-	html-escape@0.2.13
-	http-body@0.4.6
-	http@0.2.12
-	httparse@1.8.0
-	httpdate@1.0.3
-	humansize@2.1.3
-	humantime@2.1.0
-	hyper-tls@0.5.0
-	hyper@0.14.28
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.60
-	idea@0.5.1
-	idna@0.4.0
-	idna@0.5.0
-	ignore@0.4.22
-	indexmap@1.9.3
-	indexmap@2.2.6
-	indicatif@0.17.8
-	inout@0.1.3
-	instant@0.1.13
-	ipconfig@0.3.2
-	ipnet@2.9.0
-	is-terminal@0.4.12
-	is_terminal_polyfill@1.70.0
-	itertools@0.11.0
-	itoa@1.0.11
-	js-sys@0.3.69
-	jwalk@0.8.1
-	lalrpop-util@0.20.2
-	lalrpop@0.20.2
-	lazy_static@1.4.0
-	lazycell@1.3.0
-	libc@0.2.155
-	libloading@0.8.3
-	libm@0.2.8
-	libredox@0.1.3
-	libsqlite3-sys@0.28.0
-	line-col@0.2.1
-	linked-hash-map@0.5.6
-	linux-raw-sys@0.4.14
-	lock_api@0.4.12
-	log@0.4.21
-	loom@0.5.6
-	lru-cache@0.1.2
-	match_cfg@0.1.0
-	matchers@0.1.0
-	md-5@0.10.6
-	memchr@2.7.2
-	memsec@0.6.3
-	mime@0.3.17
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.3
-	mio@0.8.11
-	native-tls@0.2.11
-	nettle-sys@2.3.0
-	nettle@7.4.0
-	new_debug_unreachable@1.0.6
-	nibble_vec@0.1.0
-	nix@0.26.4
-	nom@7.1.3
-	normalize-line-endings@0.3.0
-	normpath@1.1.1
-	nu-ansi-term@0.46.0
-	num-bigint-dig@0.8.4
-	num-conv@0.1.0
-	num-integer@0.1.46
-	num-iter@0.1.45
-	num-traits@0.2.19
-	num_cpus@1.16.0
-	number_prefix@0.4.0
-	object@0.32.2
-	once_cell@1.19.0
-	opaque-debug@0.3.1
-	openpgp-cert-d@0.3.2
-	openssl-macros@0.1.1
-	openssl-probe@0.1.5
-	openssl-sys@0.9.102
-	openssl@0.10.64
-	option-ext@0.2.0
-	overload@0.1.1
-	p256@0.13.2
-	parking_lot@0.12.2
-	parking_lot_core@0.9.10
-	paste@1.0.15
-	peeking_take_while@0.1.2
-	pem-rfc7468@0.7.0
-	percent-encoding@2.3.1
-	pest@2.7.10
-	pest_derive@2.7.10
-	pest_generator@2.7.10
-	pest_meta@2.7.10
-	petgraph@0.6.5
-	phf_shared@0.10.0
-	pikchr@0.1.3
-	pin-project-lite@0.2.14
-	pin-utils@0.1.0
-	pkcs1@0.7.5
-	pkcs8@0.10.2
-	pkg-config@0.3.30
-	platforms@3.4.0
-	polyval@0.6.2
-	portable-atomic@1.6.0
-	powerfmt@0.2.0
-	ppv-lite86@0.2.17
-	precomputed-hash@0.1.1
-	predicates-core@1.0.6
-	predicates-tree@1.0.9
-	predicates@3.1.0
-	primeorder@0.13.6
-	proc-macro2@1.0.83
-	pulldown-cmark@0.9.6
-	quick-error@1.2.3
-	quote@1.0.36
-	radix_trie@0.2.1
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rayon-core@1.12.1
-	rayon@1.10.0
-	redox_syscall@0.4.1
-	redox_syscall@0.5.1
-	redox_users@0.4.5
-	regex-automata@0.1.10
-	regex-automata@0.4.6
-	regex-syntax@0.6.29
-	regex-syntax@0.8.3
-	regex@1.10.4
-	remove_dir_all@0.8.2
-	reqwest@0.11.27
-	resolv-conf@0.7.0
-	rfc6979@0.4.0
-	ripemd@0.1.3
-	roadmap@0.5.0
-	roff@0.2.1
-	rpassword@7.3.1
-	rsa@0.9.6
-	rtoolbox@0.0.2
-	rusqlite@0.31.0
-	rustc-demangle@0.1.24
-	rustc-hash@1.1.0
-	rustc_version@0.4.0
-	rustix@0.38.34
-	rustls-pemfile@1.0.4
-	rustversion@1.0.17
-	ryu@1.0.18
-	same-file@1.0.6
-	schannel@0.1.23
-	scoped-tls@1.0.1
-	scopeguard@1.2.0
-	sec1@0.7.3
-	security-framework-sys@2.11.0
-	security-framework@2.11.0
-	semver@1.0.23
-	sequoia-autocrypt@0.25.1
-	sequoia-cert-store@0.5.3
-	sequoia-directories@0.1.0
-	sequoia-gpg-agent@0.4.0
-	sequoia-ipc@0.35.0
-	sequoia-keystore-backend@0.4.0
-	sequoia-keystore-gpg-agent@0.2.0
-	sequoia-keystore-softkeys@0.4.1
-	sequoia-keystore@0.4.1
-	sequoia-net@0.28.0
-	sequoia-openpgp@1.20.0
-	sequoia-policy-config@0.6.0
-	sequoia-wot@0.11.0
-	serde-aux@4.5.0
-	serde@1.0.202
-	serde_derive@1.0.202
-	serde_json@1.0.117
-	serde_urlencoded@0.7.1
-	serde_yaml@0.8.26
-	serde_yaml@0.9.34+deprecated
-	sha1collisiondetection@0.3.4
-	sha2@0.10.8
-	sharded-slab@0.1.7
-	shell-words@1.1.0
-	shlex@1.3.0
-	signature@2.2.0
-	siphasher@0.3.11
-	slab@0.4.9
-	slug@0.1.5
-	smallvec@1.13.2
-	smawk@0.3.2
-	socket2@0.5.7
-	spin@0.5.2
-	spki@0.7.3
-	stable_deref_trait@1.2.0
-	state@0.5.3
-	stfu8@0.2.7
-	string_cache@0.8.7
-	strsim@0.10.0
-	subplot-build@0.9.0
-	subplot@0.9.0
-	subplotlib-derive@0.9.0
-	subplotlib@0.9.0
-	subtle@2.5.0
-	syn@1.0.109
-	syn@2.0.65
-	sync_wrapper@0.1.2
-	system-configuration-sys@0.5.0
-	system-configuration@0.5.1
-	tempfile-fast@0.3.4
-	tempfile@3.10.1
-	tera@1.19.1
-	term@0.7.0
-	termcolor@1.4.1
-	terminal_size@0.3.0
-	termtree@0.4.1
-	textwrap@0.15.2
-	thiserror-impl@1.0.61
-	thiserror@1.0.61
-	thread_local@1.1.8
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tiny-keccak@2.0.2
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	tokio-macros@2.2.0
-	tokio-native-tls@0.3.1
-	tokio-util@0.7.11
-	tokio@1.37.0
-	toml@0.5.11
-	tower-service@0.3.2
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing-log@0.2.0
-	tracing-subscriber@0.3.18
-	tracing@0.1.40
-	try-lock@0.2.5
-	twofish@0.7.1
-	typenum@1.17.0
-	ucd-trie@0.1.6
-	unescape@0.1.0
-	unic-char-property@0.9.0
-	unic-char-range@0.9.0
-	unic-common@0.9.0
-	unic-segment@0.9.0
-	unic-ucd-segment@0.9.0
-	unic-ucd-version@0.9.0
-	unicase@2.7.0
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-linebreak@0.1.5
-	unicode-normalization@0.1.23
-	unicode-width@0.1.12
-	unicode-xid@0.2.4
-	universal-hash@0.5.1
-	unsafe-libyaml@0.2.11
-	url@2.5.0
-	utf8-width@0.1.7
-	utf8parse@0.2.1
-	valuable@0.1.0
-	vcpkg@0.2.15
-	version_check@0.9.4
-	wait-timeout@0.2.0
-	walkdir@2.5.0
-	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
-	widestring@1.1.0
-	win-crypto-ng@0.5.1
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.8
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-core@0.52.0
-	windows-sys@0.45.0
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-targets@0.42.2
-	windows-targets@0.48.5
-	windows-targets@0.52.5
-	windows@0.48.0
-	windows_aarch64_gnullvm@0.42.2
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.5
-	windows_aarch64_msvc@0.42.2
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.5
-	windows_i686_gnu@0.42.2
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.5
-	windows_i686_gnullvm@0.52.5
-	windows_i686_msvc@0.42.2
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.5
-	windows_x86_64_gnu@0.42.2
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.5
-	windows_x86_64_gnullvm@0.42.2
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.5
-	windows_x86_64_msvc@0.42.2
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.5
-	winreg@0.50.0
-	x25519-dalek@2.0.1
-	xxhash-rust@0.8.10
-	yaml-rust@0.4.5
-	z-base-32@0.1.4
-	zerocopy-derive@0.7.34
-	zerocopy@0.7.34
-	zeroize@1.7.0
-	zeroize_derive@1.4.2
-"
-
-LLVM_COMPAT=( {16..18} )
-
-inherit cargo llvm-r1 shell-completion
-
-DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
-HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia-sq"
-SRC_URI="
-	https://gitlab.com/sequoia-pgp/sequoia-sq/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
-	${CARGO_CRATE_URIS}
-"
-S="${WORKDIR}"/${PN}-v${PV}
-
-LICENSE="LGPL-2.1+"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 ISC LGPL-2+ MIT MIT-0 MPL-2.0
-	Unicode-DFS-2016
-	|| ( GPL-2 GPL-3 LGPL-3 )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-
-QA_FLAGS_IGNORED="usr/bin/sq"
-
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	dev-libs/gmp:=
-	dev-libs/nettle:=
-	dev-libs/openssl:=
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/capnproto
-"
-RDEPEND="
-	${COMMON_DEPEND}
-"
-# Clang needed for bindgen
-BDEPEND="
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-	')
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	rust_pkg_setup
-}
-
-src_compile() {
-	# Set this here so that it doesn't change if we run tests
-	# and cause a recompilation.
-	asset_dir="${T}"/assets
-	export ASSET_OUT_DIR="${asset_dir}"
-
-	# Setting CARGO_TARGET_DIR is required to have the build system
-	# create the bash and zsh completion files.
-	export CARGO_TARGET_DIR="${S}/target"
-	cargo_src_compile
-}
-
-src_install() {
-	cargo_src_install
-
-	doman "${asset_dir}"/man-pages/*
-
-	local completion_dir="${asset_dir}"/shell-completions
-	newbashcomp "${completion_dir}"/sq.bash sq
-	dozshcomp "${completion_dir}"/_sq
-	dofishcomp "${completion_dir}"/sq.fish
-}
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index e08c54ad4a15..25adb5daaa34 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,3 +1,2 @@
-DIST tpm2-tss-4.0.1.tar.gz 1787139 BLAKE2B 627cdefeff6c64148f9da1425922a0a7a72debcee4930ffab208a3b9b66127c2d4f923e3e105bfd45410cdb13c19cb40cc15a720e9a05dd32ff622dabf5fcc32 SHA512 ed6ddc52cb0e8c1082a4bb001e1225eb9905fd2380da88db5fd69ff5b5d9d43a93eb67b634e49d53eb5d586832da3aef2c4c7e5f18d51bb730481f8913319d7d
 DIST tpm2-tss-4.0.2.tar.gz 1833499 BLAKE2B 91e70bcc66099fe5d7d53cf98a2c46582e96f204fc7bcb89c46497cc811ca1eb39c752be077a6e8132fc980a6581a2df075fcc6670d646d1270e642c144f043c SHA512 e92038de985ac928bf87a707b0f9b190aaa936827923ea5e3cbdda216cbc6cf8590af650c59c2e1e420ad9914dc6c1f14232ab7930ffc1a50fb0c49fdef6d3f0
 DIST tpm2-tss-4.1.3.tar.gz 1902009 BLAKE2B d8592f4797a4254883667476efb2fdf3c95547d9c472fe3557031e934c725e20e3cc70a9b7b41eaddac71e8d9f94beb5fbb39aec5d81b3eeb1b612df27312923 SHA512 c9a5e1e90f6545a466d43790ab2d67c52c4b788a0b21f8212575e27e04e0ac663105863fe00824e08a4e56a4f8c6b00c48c1a1c132531b8569cd5042c3bb9e69
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-4.0.0-Dont-install-files-into-run.patch b/app-crypt/tpm2-tss/files/tpm2-tss-4.0.0-Dont-install-files-into-run.patch
deleted file mode 100644
index ca51ab7f9382..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-4.0.0-Dont-install-files-into-run.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 2c81cfa9..2673995c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -767,13 +767,11 @@ define set_tss_permissions
- endef
- 
- define make_fapi_dirs
--    ($(call make_tss_dir,$(DESTDIR)$(runstatedir)/tpm2-tss/eventlog/) || true) && \
-     ($(call make_tss_dir,$(DESTDIR)$(localstatedir)/lib/tpm2-tss/system/keystore/))
- endef
- 
- define set_fapi_permissions
-     if test -z "${DESTDIR}"; then \ e
--        ($(call set_tss_permissions,$(DESTDIR)$(runstatedir)/tpm2-tss)) && \
-         ($(call set_tss_permissions,$(DESTDIR)$(localstatedir)/lib/tpm2-tss)) \
-     fi
- endef
-@@ -784,7 +782,6 @@ endef
- 
- define check_fapi_dirs
-     if test -z "${DESTDIR}"; then \
--        ($(call check_dir,$(DESTDIR)$(runstatedir)/tpm2-tss/eventlog/)) && \
-         ($(call check_dir,$(DESTDIR)$(localstatedir)/lib/tpm2-tss/system/keystore/)) \
-     fi;
- endef
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.1-r1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.1-r1.ebuild
deleted file mode 100644
index 558f221a5be8..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-4.0.1-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 linux-info multilib-minimal tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="doc +fapi +openssl mbedtls +policy static-libs test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	^^ ( mbedtls openssl )
-	fapi? ( openssl !mbedtls )
-	policy? ( openssl !mbedtls )
-"
-
-RDEPEND="
-	acct-group/tss
-	acct-user/tss
-	sys-apps/util-linux:=[${MULTILIB_USEDEP}]
-	fapi? (
-		dev-libs/json-c:=[${MULTILIB_USEDEP}]
-		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}]
-	)
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="
-	${RDEPEND}
-	test? ( app-crypt/swtpm
-		dev-libs/uthash
-		dev-util/cmocka
-		fapi? ( >=net-misc/curl-7.80.0 ) )
-"
-
-BDEPEND="
-	sys-apps/acl
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.0-Dont-install-files-into-run.patch"
-	"${FILESDIR}/${PN}-4.0.1-Make-sysusers-and-tmpfiles-optional.patch"
-	"${FILESDIR}/${PN}-4.0.1-Do-not-consider-failures-to-write-files-in-sys-hard.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~TCG_TPM"
-	linux-info_pkg_setup
-	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Fails with inlining
-	filter-flags -fno-semantic-interposition
-	# tests fail with LTO enabbled. See bug 865275 and 865279
-	filter-lto
-
-	local myconf=(
-		--localstatedir=/var
-		$(multilib_native_use_enable doc doxygen-doc)
-		$(use_enable fapi)
-		$(use_enable policy)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable test unit)
-		$(multilib_native_use_enable test integration)
-		$(multilib_native_use_enable test self-generated-certificate)
-		--disable-tcti-libtpms
-		--disable-defaultflags
-		--disable-weakcrypto
-		--with-crypto="$(usex mbedtls mbed ossl)"
-		--with-runstatedir=/run
-		--with-udevrulesdir="$(get_udevdir)/rules.d"
-		--with-udevrulesprefix=60-
-		--without-sysusersdir
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-	)
-
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	keepdir /var/lib/tpm2-tss/system/keystore
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process tpm2-tss-fapi.conf
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild
deleted file mode 100644
index d4391f09ea96..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild
+++ /dev/null
@@ -1,97 +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 linux-info multilib-minimal tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/4"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="doc +fapi +openssl mbedtls +policy static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( mbedtls openssl )
-		fapi? ( openssl !mbedtls )
-		policy? ( openssl !mbedtls )"
-
-RDEPEND="acct-group/tss
-	acct-user/tss
-	sys-apps/util-linux:=[${MULTILIB_USEDEP}]
-	fapi? ( dev-libs/json-c:=[${MULTILIB_USEDEP}]
-		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	test? ( app-crypt/swtpm
-		dev-libs/uthash
-		dev-util/cmocka
-		fapi? ( >=net-misc/curl-7.80.0 ) )"
-BDEPEND="sys-apps/acl
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.0-Dont-install-files-into-run.patch"
-	"${FILESDIR}/${PN}-4.0.1-Make-sysusers-and-tmpfiles-optional.patch"
-	)
-
-pkg_setup() {
-	local CONFIG_CHECK=" \
-		~TCG_TPM
-	"
-	linux-info_pkg_setup
-	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Fails with inlining
-	filter-flags -fno-semantic-interposition
-	# tests fail with LTO enabbled. See bug 865275 and 865279
-	filter-lto
-
-	ECONF_SOURCE=${S} econf \
-		--localstatedir=/var \
-		$(multilib_native_use_enable doc doxygen-doc) \
-		$(use_enable fapi) \
-		$(use_enable policy) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable test unit) \
-		$(multilib_native_use_enable test integration) \
-		$(multilib_native_use_enable test self-generated-certificate) \
-		--disable-tcti-libtpms \
-		--disable-defaultflags \
-		--disable-weakcrypto \
-		--with-crypto="$(usex mbedtls mbed ossl)" \
-		--with-runstatedir=/run \
-		--with-udevrulesdir="$(get_udevdir)/rules.d" \
-		--with-udevrulesprefix=60- \
-		--without-sysusersdir \
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-multilib_src_install() {
-	default
-	keepdir /var/lib/tpm2-tss/system/keystore
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process tpm2-tss-fapi.conf
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r1.ebuild
deleted file mode 100644
index d9036d26badd..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,110 +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 linux-info multilib-minimal tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/4"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="doc +fapi +openssl mbedtls +policy static-libs test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	^^ ( mbedtls openssl )
-	fapi? ( openssl !mbedtls )
-	policy? ( openssl !mbedtls )
-"
-
-RDEPEND="
-	acct-group/tss
-	acct-user/tss
-	sys-apps/util-linux:=[${MULTILIB_USEDEP}]
-	fapi? (
-		dev-libs/json-c:=[${MULTILIB_USEDEP}]
-		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}]
-	)
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="
-	${RDEPEND}
-	test? ( app-crypt/swtpm
-		dev-libs/uthash
-		dev-util/cmocka
-		fapi? ( >=net-misc/curl-7.80.0 ) )
-"
-
-BDEPEND="
-	sys-apps/acl
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.2-Dont-install-files-into-run.patch"
-	"${FILESDIR}/${PN}-4.0.1-Make-sysusers-and-tmpfiles-optional.patch"
-	"${FILESDIR}/${PN}-4.0.1-Do-not-consider-failures-to-write-files-in-sys-hard.patch"
-	"${FILESDIR}/${PN}-4.0.2-Hide-write-all-function.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~TCG_TPM"
-	linux-info_pkg_setup
-	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Fails with inlining
-	filter-flags -fno-semantic-interposition
-	# tests fail with LTO enabbled. See bug 865275 and 865279
-	filter-lto
-
-	local myconf=(
-		--localstatedir=/var
-		$(multilib_native_use_enable doc doxygen-doc)
-		$(use_enable fapi)
-		$(use_enable policy)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable test unit)
-		$(multilib_native_use_enable test integration)
-		$(multilib_native_use_enable test self-generated-certificate)
-		--disable-tcti-libtpms
-		--disable-defaultflags
-		--disable-weakcrypto
-		--with-crypto="$(usex mbedtls mbed ossl)"
-		--with-runstatedir=/run
-		--with-udevrulesdir="$(get_udevdir)/rules.d"
-		--with-udevrulesprefix=60-
-		--without-sysusersdir
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-	)
-
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	keepdir /var/lib/tpm2-tss/system/keystore
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process tpm2-tss-fapi.conf
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r2.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r2.ebuild
new file mode 100644
index 000000000000..b5f0eb1e7049
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev
+
+DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/4"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="doc +fapi +openssl mbedtls +policy static-libs test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	^^ ( mbedtls openssl )
+	fapi? ( openssl !mbedtls )
+	policy? ( openssl !mbedtls )
+"
+
+RDEPEND="
+	acct-group/tss
+	acct-user/tss
+	sys-apps/util-linux:=[${MULTILIB_USEDEP}]
+	fapi? (
+		dev-libs/json-c:=[${MULTILIB_USEDEP}]
+		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}]
+	)
+	mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
+	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="
+	${RDEPEND}
+	test? ( app-crypt/swtpm
+		dev-libs/uthash
+		dev-util/cmocka
+		fapi? ( >=net-misc/curl-7.80.0 ) )
+"
+
+BDEPEND="
+	sys-apps/acl
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.2-Dont-install-files-into-run.patch"
+	"${FILESDIR}/${PN}-4.0.1-Make-sysusers-and-tmpfiles-optional.patch"
+	"${FILESDIR}/${PN}-4.0.1-Do-not-consider-failures-to-write-files-in-sys-hard.patch"
+	"${FILESDIR}/${PN}-4.0.2-Hide-write-all-function.patch"
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~TCG_TPM"
+	linux-info_pkg_setup
+	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Fails with inlining
+	filter-flags -fno-semantic-interposition
+	# tests fail with LTO enabbled. See bug 865275 and 865279
+	filter-lto
+
+	local myconf=(
+		--localstatedir=/var
+		$(multilib_native_use_enable doc doxygen-doc)
+		$(use_enable fapi)
+		$(use_enable policy)
+		$(use_enable static-libs static)
+		$(multilib_native_use_enable test unit)
+		$(multilib_native_use_enable test integration)
+		$(multilib_native_use_enable test self-generated-certificate)
+		--disable-tcti-libtpms
+		--disable-defaultflags
+		--disable-weakcrypto
+		--with-crypto="$(usex mbedtls mbed ossl)"
+		--with-runstatedir=/run
+		--with-udevrulesdir="$(get_udevdir)/rules.d"
+		--with-udevrulesprefix=60-
+		--without-sysusersdir
+		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
+	)
+
+	ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+	keepdir /var/lib/tpm2-tss/system/keystore
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process tpm2-tss-fapi.conf
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.2.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.2.ebuild
deleted file mode 100644
index 40a410cf2a97..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-4.0.2.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 linux-info multilib-minimal tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/4"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="doc +fapi +openssl mbedtls +policy static-libs test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	^^ ( mbedtls openssl )
-	fapi? ( openssl !mbedtls )
-	policy? ( openssl !mbedtls )
-"
-
-RDEPEND="
-	acct-group/tss
-	acct-user/tss
-	sys-apps/util-linux:=[${MULTILIB_USEDEP}]
-	fapi? (
-		dev-libs/json-c:=[${MULTILIB_USEDEP}]
-		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}]
-	)
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="
-	${RDEPEND}
-	test? ( app-crypt/swtpm
-		dev-libs/uthash
-		dev-util/cmocka
-		fapi? ( >=net-misc/curl-7.80.0 ) )
-"
-
-BDEPEND="
-	sys-apps/acl
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.2-Dont-install-files-into-run.patch"
-	"${FILESDIR}/${PN}-4.0.1-Make-sysusers-and-tmpfiles-optional.patch"
-	"${FILESDIR}/${PN}-4.0.1-Do-not-consider-failures-to-write-files-in-sys-hard.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~TCG_TPM"
-	linux-info_pkg_setup
-	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Fails with inlining
-	filter-flags -fno-semantic-interposition
-	# tests fail with LTO enabbled. See bug 865275 and 865279
-	filter-lto
-
-	local myconf=(
-		--localstatedir=/var
-		$(multilib_native_use_enable doc doxygen-doc)
-		$(use_enable fapi)
-		$(use_enable policy)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable test unit)
-		$(multilib_native_use_enable test integration)
-		$(multilib_native_use_enable test self-generated-certificate)
-		--disable-tcti-libtpms
-		--disable-defaultflags
-		--disable-weakcrypto
-		--with-crypto="$(usex mbedtls mbed ossl)"
-		--with-runstatedir=/run
-		--with-udevrulesdir="$(get_udevdir)/rules.d"
-		--with-udevrulesprefix=60-
-		--without-sysusersdir
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-	)
-
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	keepdir /var/lib/tpm2-tss/system/keystore
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process tpm2-tss-fapi.conf
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.1.3-r1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.1.3-r1.ebuild
new file mode 100644
index 000000000000..c9b5cd0a29b1
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-4.1.3-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev
+
+DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/4"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="doc +fapi +openssl mbedtls +policy static-libs test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	^^ ( mbedtls openssl )
+	fapi? ( openssl !mbedtls )
+	policy? ( openssl !mbedtls )
+"
+
+RDEPEND="
+	acct-group/tss
+	acct-user/tss
+	sys-apps/util-linux:=[${MULTILIB_USEDEP}]
+	fapi? (
+		dev-libs/json-c:=[${MULTILIB_USEDEP}]
+		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}]
+	)
+	mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
+	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="
+	${RDEPEND}
+	test? ( app-crypt/swtpm
+		dev-libs/uthash
+		dev-util/cmocka
+		fapi? ( >=net-misc/curl-7.80.0 ) )
+"
+
+BDEPEND="
+	sys-apps/acl
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.2-Dont-install-files-into-run.patch"
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~TCG_TPM"
+	linux-info_pkg_setup
+	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Fails with inlining
+	filter-flags -fno-semantic-interposition
+	# tests fail with LTO enabbled. See bug 865275 and 865279
+	filter-lto
+
+	local myconf=(
+		--localstatedir=/var
+		$(multilib_native_use_enable doc doxygen-doc)
+		$(use_enable fapi)
+		$(use_enable policy)
+		$(use_enable static-libs static)
+		$(multilib_native_use_enable test unit)
+		$(multilib_native_use_enable test integration)
+		$(multilib_native_use_enable test self-generated-certificate)
+		--disable-tcti-libtpms
+		--disable-tcti-spi-ltt2go
+		--disable-tcti-spi-ftdi
+		--disable-tcti-i2c-ftdi
+		--disable-defaultflags
+		--disable-weakcrypto
+		--with-crypto="$(usex mbedtls mbed ossl)"
+		--with-runstatedir=/run
+		--with-udevrulesdir="$(get_udevdir)/rules.d"
+		--with-udevrulesprefix=60-
+		--without-sysusersdir
+		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
+	)
+
+	ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+	keepdir /var/lib/tpm2-tss/system/keystore
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process tpm2-tss-fapi.conf
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.1.3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.1.3.ebuild
deleted file mode 100644
index 0f0b23883e0b..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-4.1.3.ebuild
+++ /dev/null
@@ -1,110 +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 linux-info multilib-minimal tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/4"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="doc +fapi +openssl mbedtls +policy static-libs test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	^^ ( mbedtls openssl )
-	fapi? ( openssl !mbedtls )
-	policy? ( openssl !mbedtls )
-"
-
-RDEPEND="
-	acct-group/tss
-	acct-user/tss
-	sys-apps/util-linux:=[${MULTILIB_USEDEP}]
-	fapi? (
-		dev-libs/json-c:=[${MULTILIB_USEDEP}]
-		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}]
-	)
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="
-	${RDEPEND}
-	test? ( app-crypt/swtpm
-		dev-libs/uthash
-		dev-util/cmocka
-		fapi? ( >=net-misc/curl-7.80.0 ) )
-"
-
-BDEPEND="
-	sys-apps/acl
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.2-Dont-install-files-into-run.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~TCG_TPM"
-	linux-info_pkg_setup
-	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Fails with inlining
-	filter-flags -fno-semantic-interposition
-	# tests fail with LTO enabbled. See bug 865275 and 865279
-	filter-lto
-
-	local myconf=(
-		--localstatedir=/var
-		$(multilib_native_use_enable doc doxygen-doc)
-		$(use_enable fapi)
-		$(use_enable policy)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable test unit)
-		$(multilib_native_use_enable test integration)
-		$(multilib_native_use_enable test self-generated-certificate)
-		--disable-tcti-libtpms
-		--disable-tcti-spi-ltt2go
-		--disable-tcti-spi-ftdi
-		--disable-tcti-i2c-ftdi
-		--disable-defaultflags
-		--disable-weakcrypto
-		--with-crypto="$(usex mbedtls mbed ossl)"
-		--with-runstatedir=/run
-		--with-udevrulesdir="$(get_udevdir)/rules.d"
-		--with-udevrulesprefix=60-
-		--without-sysusersdir
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-	)
-
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	keepdir /var/lib/tpm2-tss/system/keystore
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process tpm2-tss-fapi.conf
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-crypt/xca/xca-2.8.0.ebuild b/app-crypt/xca/xca-2.8.0.ebuild
index 9c6ad5666134..7afb46ff3c5a 100644
--- a/app-crypt/xca/xca-2.8.0.ebuild
+++ b/app-crypt/xca/xca-2.8.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"
@@ -12,7 +12,7 @@ S="${WORKDIR}/xca-RELEASE.${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/app-doc/dita-ot-bin/dita-ot-bin-4.2.3.ebuild b/app-doc/dita-ot-bin/dita-ot-bin-4.2.3.ebuild
index 9282e60ecec8..c0c13a0b121d 100644
--- a/app-doc/dita-ot-bin/dita-ot-bin-4.2.3.ebuild
+++ b/app-doc/dita-ot-bin/dita-ot-bin-4.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND=">=virtual/jdk-17:*"
 RDEPEND=">=virtual/jre-17:*"
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index a352b222091d..e01ec1807eff 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,3 +1,4 @@
 DIST eclass-manpages-20241115.tar.xz 456160 BLAKE2B eeaa4c964dbc784ae6351b89c4a8d6bac15c80cfefc4c3df17b3a243b1f95c682ca2d25fcf62a2fb23dc9b47f18f468dd43b9a73588cb9e38b7bbe90ed616773 SHA512 42152fd59a660b63a0bb50f285dfb95de132d3687833491b92ce91602fcc10fde1419ab985763c61d32c4753b350070ee47a3fd163d3b31636f27ac31ce3dafd
 DIST eclass-manpages-20241117.tar.xz 456132 BLAKE2B 7111d9817b32ede80fb1e917f43e94b9342573684b715b874a2d880121840bbe67fa7c5aff95f5e7c99a25f2ae5beebadb3326c3a0df7117e99c0903cdcf3052 SHA512 73e28a2c40e89bbe2ba6611dc70c0b0320c8cf981b479ba3be86165d0b90c75f84c209d203d0ad612544709da881f7549d66560b4bccdb73209586d1a2cf8590
 DIST eclass-manpages-20241210.tar.xz 459680 BLAKE2B 076038d98bfae109ceaa1b14eff7f3e5ba575622243c60f59e7102d23d80e640c5e2932e2c614200cf3f653fc6cf4d0041dc4cc3011207273a690fc930e06091 SHA512 c3252f797ca71e9ca89b6d45715d763031733deb0f220aef65ddf750343693757f51d6535a22536b973c1c189b7cbe11306408c9c160e6ee3864e89af060ed8d
+DIST eclass-manpages-20250105.tar.xz 471540 BLAKE2B f21e783d233611349e036bb2e9ec52e3a8293891dcc56be15c628e9507b6bf5b650184eb7d57296a006f2a9764ac586257b61e1b810622bffff52c78708dfb9d SHA512 13c6ec0ad7251d287ba18dff6a362088c7e4f80036e225d1dc993cb467536566d88e588df0983207f26a06e39450c3072c436e391431df8d3e2b8a595a809022
diff --git a/app-doc/eclass-manpages/eclass-manpages-20250105.ebuild b/app-doc/eclass-manpages/eclass-manpages-20250105.ebuild
new file mode 100644
index 000000000000..0e318cc5afd8
--- /dev/null
+++ b/app-doc/eclass-manpages/eclass-manpages-20250105.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Instructions to make a dist tarball:
+# git clone https://github.com/projg2/eclass-to-manpage.git
+# cd eclass-to-manpage
+# make dist ECLASSDIR=~/g/eclass/
+
+DESCRIPTION="Collection of Gentoo eclass manpages"
+HOMEPAGE="https://github.com/projg2/eclass-to-manpage"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Keep the keywords stable. No need to change to ~arch.
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="sys-apps/gawk"
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+}
diff --git a/app-doc/gnucash-docs/files/gnucash-docs-4.13-reverese-kde-help-dir.patch b/app-doc/gnucash-docs/files/gnucash-docs-4.13-reverese-kde-help-dir.patch
deleted file mode 100644
index 0f48fd5056b8..000000000000
--- a/app-doc/gnucash-docs/files/gnucash-docs-4.13-reverese-kde-help-dir.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 513747413efc4732f5ae824ccc84316169b1523f Mon Sep 17 00:00:00 2001
-From: Geert Janssens <geert@kobaltwit.be>
-Date: Thu, 20 Oct 2022 11:25:19 +0200
-Subject: [PATCH] Ensure our documentation is also found when gnucash is run in
- KDE
-
-Turns out KDE is not adhering to the xdg spec after all.
-It has support for the old ghelp mechanism, but when using
-the help: prefix, it falls back to an internal protocol.
-In that case the requested document is searched for in
-<prefix>/share/doc/HTML/<lang>.
-Extra caveat - the English documentation is searched for
-in a directory 'en' instead of 'C'.
-This is not a problem in yelp, only in khelpcenter. Unfortunately
-khelpcenter is the default application to process help: prefixes
-in a Kde plasma desktop, hence the workaround.
----
- cmake/AddXdgHelpTarget.cmake | 28 +++++++++++++++++++++++++---
- 1 file changed, 25 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/AddXdgHelpTarget.cmake b/cmake/AddXdgHelpTarget.cmake
-index efbe20f25..f0c800f2e 100644
---- a/cmake/AddXdgHelpTarget.cmake
-+++ b/cmake/AddXdgHelpTarget.cmake
-@@ -10,7 +10,16 @@
- 
- function (add_xdghelp_target docname lang entities figures)
- 
--    set(BUILD_DIR "${DATADIR_BUILD}/help/${lang}/${docname}")
-+    set(BUILD_DIR_BASE "${DATADIR_BUILD}/help/${lang}")
-+    set(BUILD_DIR "${BUILD_DIR_BASE}/${docname}")
-+
-+    # Define location where KDE's help system looks for <doc>
-+    # when invoked with help:<doc>
-+    set(kde_lang ${lang})
-+    if (lang STREQUAL "C")
-+        set(kde_lang "en")
-+    endif()
-+    set(BUILD_DIR_KDE_BASE "${DATADIR_BUILD}/doc/HTML")
- 
-     set(source_files "")
-     foreach(xml_file ${entities} index.docbook)
-@@ -33,6 +42,10 @@ function (add_xdghelp_target docname lang entities figures)
-       OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/xdghelptrigger"
-       COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}"
-       COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}/figures"
-+
-+      # Add links to make our documentation visible for KDE's help system
-+      COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR_KDE_BASE}"
-+      COMMAND ${CMAKE_COMMAND} -E create_symlink "${BUILD_DIR_BASE}" "${BUILD_DIR_KDE_BASE}/${kde_lang}"
-       COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/xdghelptrigger")
- 
- 
-@@ -66,10 +79,19 @@ function (add_xdghelp_target docname lang entities figures)
- 
-     add_dependencies(${docname}-xdghelp "${lang}-${docname}-xdghelp")
- 
-+    set(doc_install_dir_base "${CMAKE_INSTALL_DATADIR}/help/${lang}")
-+    set(doc_install_dir "${doc_install_dir_base}/${docname}")
-     install(FILES ${source_files}
--        DESTINATION "${CMAKE_INSTALL_DATADIR}/help/${lang}/${docname}"
-+        DESTINATION "${doc_install_dir}"
-         COMPONENT "xdghelp")
-     install(FILES ${figures}
--        DESTINATION "${CMAKE_INSTALL_DATADIR}/help/${lang}/${docname}/figures"
-+        DESTINATION "${doc_install_dir}/figures"
-+        COMPONENT "xdghelp")
-+
-+    # Add links to make our documentation visible for KDE's help system
-+    set(doc_install_dir_kde_base "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/doc/HTML")
-+    install(CODE "execute_process (COMMAND ${CMAKE_COMMAND} -E make_directory \"${doc_install_dir_kde_base}\")"
-+        COMPONENT "xdghelp")
-+    install(CODE "execute_process (COMMAND ${CMAKE_COMMAND} -E create_symlink \"../../../${doc_install_dir_base}\" \"${doc_install_dir_kde_base}/${kde_lang}\")"
-         COMPONENT "xdghelp")
- endfunction()
diff --git a/app-doc/gnucash-docs/files/gnucash-docs-5.1-partially-revert-kde-help-dir.patch b/app-doc/gnucash-docs/files/gnucash-docs-5.1-partially-revert-kde-help-dir.patch
deleted file mode 100644
index 3df07bf74cb3..000000000000
--- a/app-doc/gnucash-docs/files/gnucash-docs-5.1-partially-revert-kde-help-dir.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b3ee1bea524db8bffab9de7f2ae20193fc093c80 Mon Sep 17 00:00:00 2001
-From: Guido Falsi <madpilot@FreeBSD.org>
-Date: Mon, 19 Dec 2022 09:44:49 +0100
-Subject: finance/gnucash-docs: Update to 4.13
-
-- Partly revert upstream commit 513747413e which causes build to fail.
-
---- a/cmake/AddXdgHelpTarget.cmake.orig	2022-12-17 21:04:07 UTC
-+++ b/cmake/AddXdgHelpTarget.cmake
-@@ -44,8 +44,8 @@ function (add_xdghelp_target docname lang entities fig
-       COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}/figures"
- 
-       # Add links to make our documentation visible for KDE's help system
--      COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR_KDE_BASE}"
--      COMMAND ${CMAKE_COMMAND} -E create_symlink "${BUILD_DIR_BASE}" "${BUILD_DIR_KDE_BASE}/${kde_lang}"
-+      # COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR_KDE_BASE}"
-+      # COMMAND ${CMAKE_COMMAND} -E create_symlink "${BUILD_DIR_BASE}" "${BUILD_DIR_KDE_BASE}/${kde_lang}"
-       COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/xdghelptrigger")
- 
- 
-@@ -90,8 +90,8 @@ function (add_xdghelp_target docname lang entities fig
- 
-     # Add links to make our documentation visible for KDE's help system
-     set(doc_install_dir_kde_base "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/doc/HTML")
--    install(CODE "execute_process (COMMAND ${CMAKE_COMMAND} -E make_directory \"${doc_install_dir_kde_base}\")"
--        COMPONENT "xdghelp")
--    install(CODE "execute_process (COMMAND ${CMAKE_COMMAND} -E create_symlink \"../../../${doc_install_dir_base}\" \"${doc_install_dir_kde_base}/${kde_lang}\")"
--        COMPONENT "xdghelp")
-+    # install(CODE "execute_process (COMMAND ${CMAKE_COMMAND} -E make_directory \"${doc_install_dir_kde_base}\")"
-+    #    COMPONENT "xdghelp")
-+    # install(CODE "execute_process (COMMAND ${CMAKE_COMMAND} -E create_symlink \"../../../${doc_install_dir_base}\" \"${doc_install_dir_kde_base}/${kde_lang}\")"
-+    #    COMPONENT "xdghelp")
- endfunction()
diff --git a/app-doc/python-docs/Manifest b/app-doc/python-docs/Manifest
index a0e8bc0693d9..849f6936528a 100644
--- a/app-doc/python-docs/Manifest
+++ b/app-doc/python-docs/Manifest
@@ -1,12 +1,7 @@
 DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709641e0844c42e924262d6ee21a55e515aaf4d023bf394681bab780ab83998de9f409685e2d5870506810432145acc6422eff9d SHA512 db39390577ec86f13c9b6b57c01cba36fe9fd89092a773dc94f1a6a19d912759d097c4d80e765d3657b572abc731c1da9e7b4cd4c38065cd444606b906744abe
-DIST python-3.10.15-docs-html.tar.bz2 7452520 BLAKE2B e9003e2a839bc934d3ba5903e1b730239e48d06686b5472660d49c51333b77ec1b0c3c48c307007e4f5d27901764d29203de475e60e97d8d8004e0b2436d168d SHA512 7056b2e9d3672b79aee26f994fd1e5168860452ec783f37cdc604dc25d3df297a9c43bda43add03a36aec85dbd1875d0c9b8eaec0fd75b809fd3811a977b69a0
 DIST python-3.10.16-docs-html.tar.bz2 7425105 BLAKE2B db25e08cd5355559a374f6ec30d2fef386b4bedfe67a55a72d4b1e5a620df8155b742a54de2d83f97901aa93f21868682dae41c88b1b3aa4c3aa2985d6e40464 SHA512 91f6f9cf1fee2bfe29404701394715bfebfd66339a4b95f530b9eef856257aaef69652908c24b150f9ac6cb5a71eea203c7bc18d94c17661e155979300f597ce
-DIST python-3.11.10-docs-html.tar.bz2 7988162 BLAKE2B bc0d47ca235c8c14c4f62b554578068bf3e8460211e358cec586511be35b0aa2011075ace0602385dca2b4c2667d6bd3cb8ce4e6e6be1ed52d84b877cf3a7f6a SHA512 a14e18d3641d4379144ead7341536c781a94e9f15c9b53b2647a7c7c4cd15211963564fb2519e756b79db9234f555ede2442a678d6b4f27de6f7fb0b2993c266
 DIST python-3.11.11-docs-html.tar.bz2 7983082 BLAKE2B 9e44612a894e96f2e745562672f568a65ed07df998162f7dcdcdaa550d91139750ca84d303a4eaa85358c14e60987e25f14695be9b08bd6c8d0fb581565abe8a SHA512 34f355c999a93d60226f269b51bb3499e248b316dc80413a42089a29bfbaacdc830647f68e4c0758a729424a61486564a843524905d5f0fbfdf914f346c3c474
-DIST python-3.12.6-docs-html.tar.bz2 8360479 BLAKE2B 09294f5ba1ca8f53c0261e0db626aeb62ac3d66115b87feb212987ca181a2d6324a24eda97b374e6ea56e93623e487da23c50613335af4166ecba845837ae582 SHA512 5f5d37ea047810c0ae3a99585008ee02a3d4dd1b3eb573dc96eaf590c542267034fafdefd1aeb2b3e59a5b5019e4dc2562ed27d1699013c7a0609b557e5ce27c
-DIST python-3.12.7-docs-html.tar.bz2 8390435 BLAKE2B 4541c8e553b8d8aef79b266c874d9023de2cc2eba764a67cf2c2f3bc83cc7b8e614473d2667c5b3ba394cad353385af9a02621bec4fd0a58b37c7c2af719002b SHA512 812586ca009d16ffa5be957b56489d9a3aca90fed225f5ef202863d45c9e90a5f0997068c9fd9b284a356467574e0f31f6154118f4b40300e739b3341e9f73e4
 DIST python-3.12.8-docs-html.tar.bz2 8694030 BLAKE2B 8a60d7d5c35a8755b9829a5cf122bb773dfc8ae5bc0868e2b45e5cfa9c21810ec90c4b030acd0b70ee1d8ebf59a295de15c3fb9e54f8cf9ba7b51d7dde650b47 SHA512 d7010ccc74c6e9dd4bab88964dc2f1b0f087b99ab7ac7c60e653ca9dcafe5e9f25884c311f1be0fe431b942a84d53c45a1d07a3e285b81bbf785a513c27d66e1
-DIST python-3.13.0-docs-html.tar.bz2 10238095 BLAKE2B e413eb5b2935734c2ea3aacc03be142e904c7e693acd3dfe8559d42694cbb67f0cd724927d19b3361f401f88ed17aec529ec91807d73558169cd160d9ebbd730 SHA512 446c53c2a091ac369c4f498d5fa2de99719478a12827751e291e0372b9f148c3757a4b76599ceec95180a926d4fc2030a412392542552638e602b4577f8b6902
 DIST python-3.13.1-docs-html.tar.bz2 10586243 BLAKE2B 8e67d2e3e31c03788cc789fe7df0e9147cd244ab0ee1cd7a04a3ffe12d9a7a903c8aa229de430c992f9673a607b2350c48229e01b924de8165579db6469ec7f8 SHA512 b04b472787b83166104af6c46bc59ce0b873be073503d2673098b81e336511b2a6db0044e5a46e03266aa7279cb01206b8c760e54786648d3544393aa9753425
 DIST python-3.8.20-docs-html.tar.bz2 6727651 BLAKE2B ec11857b5bdfb4646a2762353db877a558cfc543563a7a9b0db100f675511c31450d16c30a986d39226a9b16be3ffd132863e396ef05165047ab73bf037bf2a6 SHA512 0a77f0240d6d495a5099d4a95e151f38517730815e6f3d9b82964cf60be95b8bdc960916d317e19bb8e14a9604217cd1fa85703996aec972004a6a93d4ffa6d0
 DIST python-3.9.20-docs-html.tar.bz2 6988218 BLAKE2B 0e463d8fa0643a9c01ba52d35c8880b00f5d4b83d778947937ac86e2db4f5af312d6d2b580ceb498db76c0ca61231befaf0fc6d1a17d8b1b84981ddea16bcebb SHA512 524ebdc8b082ba50691fb8eadf6bf17374a1d9d6e61a6b49efecf597bbd2c7b50bca908fb94c5ca9350c06895330d88086d0d1ee9ccb7306362b1cd37282a53d
diff --git a/app-doc/python-docs/python-docs-3.10.15.ebuild b/app-doc/python-docs/python-docs-3.10.15.ebuild
deleted file mode 100644
index 245f2d5986b2..000000000000
--- a/app-doc/python-docs/python-docs-3.10.15.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/app-doc/python-docs/python-docs-3.10.16.ebuild b/app-doc/python-docs/python-docs-3.10.16.ebuild
index abfa49878354..5f50312e7109 100644
--- a/app-doc/python-docs/python-docs-3.10.16.ebuild
+++ b/app-doc/python-docs/python-docs-3.10.16.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=7
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/app-doc/python-docs/python-docs-3.11.10.ebuild b/app-doc/python-docs/python-docs-3.11.10.ebuild
deleted file mode 100644
index 245f2d5986b2..000000000000
--- a/app-doc/python-docs/python-docs-3.11.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/app-doc/python-docs/python-docs-3.11.11.ebuild b/app-doc/python-docs/python-docs-3.11.11.ebuild
index b3c1acde8a5c..5f50312e7109 100644
--- a/app-doc/python-docs/python-docs-3.11.11.ebuild
+++ b/app-doc/python-docs/python-docs-3.11.11.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=7
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/app-doc/python-docs/python-docs-3.12.6.ebuild b/app-doc/python-docs/python-docs-3.12.6.ebuild
deleted file mode 100644
index 245f2d5986b2..000000000000
--- a/app-doc/python-docs/python-docs-3.12.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/app-doc/python-docs/python-docs-3.12.7.ebuild b/app-doc/python-docs/python-docs-3.12.7.ebuild
deleted file mode 100644
index 8c050f94c506..000000000000
--- a/app-doc/python-docs/python-docs-3.12.7.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
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-3.12-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/app-doc/python-docs/python-docs-3.12.8.ebuild b/app-doc/python-docs/python-docs-3.12.8.ebuild
index 6b4105cf3d81..6e2b30bf2815 100644
--- a/app-doc/python-docs/python-docs-3.12.8.ebuild
+++ b/app-doc/python-docs/python-docs-3.12.8.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
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/app-doc/python-docs/python-docs-3.13.0.ebuild b/app-doc/python-docs/python-docs-3.13.0.ebuild
deleted file mode 100644
index dd1010e6ca8b..000000000000
--- a/app-doc/python-docs/python-docs-3.13.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P=python-${PV}-docs-html
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/app-doc/python-docs/python-docs-3.13.1.ebuild b/app-doc/python-docs/python-docs-3.13.1.ebuild
index 7ce7834bd881..ce6e3e6ac2db 100644
--- a/app-doc/python-docs/python-docs-3.13.1.ebuild
+++ b/app-doc/python-docs/python-docs-3.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
@@ -11,7 +11,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/app-doc/single-unix-specification/Manifest b/app-doc/single-unix-specification/Manifest
index aad8e510b075..b48fedc4f14e 100644
--- a/app-doc/single-unix-specification/Manifest
+++ b/app-doc/single-unix-specification/Manifest
@@ -1,3 +1,3 @@
 DIST susv4-2018.tar.bz2 3352852 BLAKE2B 0f05f2dd6444d35b2d962651643eb8bd0520169c8670072fdb1ce2c671b3bdeed8e4d99dfacceba69f846c107c73c4a60f3f51e48c64499f40a9fa594ac877ba SHA512 2484d24d19b9731808c61219b61d63cdf4d8dff6498fb4655478b76808a583064a5cfbcfcf18f1d27c56e03a6b47cc6833f94483784ec29059bef063724c2567
 DIST susv4tc2.tar.bz2 3649434 BLAKE2B c09eb835badec0bf191da4caaa7b35ccedfb1512218d3ebb66d0301bbe6404a30df2e3c51838dcd9f91912f41ce3e39478d2c061ac2f075ef678ae20fcaf0ad6 SHA512 cc86b2b4860b1069cb8712ef7b5a9702510f48d6585b5414ff561f85677974c156d8cc95cf29dfdab360c13ecb884e19e2112fe5c6bc49666417c9a744a816ad
-DIST susv5.tar.bz2 3092782 BLAKE2B 1faa75cadf97f73367bec8588206b0cf39975cd7eb9df1860059da8bc731744528cfd8cf3a77decf41d697ea0ff532f46728199d880d59093f870f78317c854b SHA512 fcdd0969f36a58a177187f5ca8ff4308e3875d47978ddbed4ba81510f45ec35fb790e5f9e43df4c26485647f7cbcd45ab22910305da18cb004703097d2bea04b
+DIST susv5-2025-01-02.tar.bz2 3505183 BLAKE2B 470d2959a57f792adb63d7fd150a3c6c6eea823f6600ccd4e5ed0780f057f833399573440346a74b577dc1edcb5cb8128bc9ff39a87c16644c4a3d72e7bacdb6 SHA512 4db5330e9ecc652cdcdef5a80e4d0637e79edab23c5261c553fde55a92975f388d4b69fdf5be5ff0d1c1bf2e95345c533980e88f04eef70c2911058466d24dce
diff --git a/app-doc/single-unix-specification/single-unix-specification-5-r1.ebuild b/app-doc/single-unix-specification/single-unix-specification-5-r1.ebuild
new file mode 100644
index 000000000000..7c4e708f2c2f
--- /dev/null
+++ b/app-doc/single-unix-specification/single-unix-specification-5-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="The Single UNIX Specification, Version 5, 2024 Edition"
+HOMEPAGE="https://publications.opengroup.org/"
+# Rename for bug #948039
+SRC_URI="https://pubs.opengroup.org/onlinepubs/9799919799/download/susv5.tar.bz2 -> susv5-2025-01-02.tar.bz2"
+S="${WORKDIR}/susv5-html"
+
+LICENSE="sus4-copyright"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+RESTRICT="mirror"
+
+src_install() {
+	dodoc -r *
+}
diff --git a/app-doc/single-unix-specification/single-unix-specification-5.ebuild b/app-doc/single-unix-specification/single-unix-specification-5.ebuild
deleted file mode 100644
index dbfb7e329012..000000000000
--- a/app-doc/single-unix-specification/single-unix-specification-5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="The Single UNIX Specification, Version 5, 2024 Edition"
-HOMEPAGE="https://publications.opengroup.org/"
-SRC_URI="https://pubs.opengroup.org/onlinepubs/9799919799/download/susv5.tar.bz2"
-S="${WORKDIR}/susv5-html"
-
-LICENSE="sus4-copyright"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-RESTRICT="mirror"
-
-src_install() {
-	dodoc -r *
-}
diff --git a/app-editors/diakonos/Manifest b/app-editors/diakonos/Manifest
index 6fd115fffe4d..cbf6de3ee8e9 100644
--- a/app-editors/diakonos/Manifest
+++ b/app-editors/diakonos/Manifest
@@ -1 +1,2 @@
+DIST diakonos-0.9.12.tar.gz 142840 BLAKE2B dd9d03da6ee7fc83235ca5d1041f7f3eea74febf2e5bdc32aa663939a6b79c649bb4a3457b56827a6fd362dd293500b3f2eee7045940c242654c50371031d59a SHA512 515308fccdfb7dc7915359e4f7c0911f666b9e8a4a04ba5ad00e236e0b09d8e7a4a06ddab260e74322dfb0dc5b3ce617a407df1bcea3448a04f965626afeb847
 DIST diakonos-0.9.7.tar.gz 129807 BLAKE2B 26c3a72a00e1d41b4a7b2916b37024658d7607ac657d4f71a12b939830578d7939a4f9f4c3886693eae9eeaf91bfe1abe055be7bcc7681619448e298acb5c546 SHA512 ec23d93ed6871d18b6a91e02bc6916ac667ca773be5f093a68fffa5c9cbe89b123e80b18762c8649620eda23b1b9ba582a5236eb9eaefc0e22a411390cd30c73
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/emacs/Manifest b/app-editors/emacs/Manifest
index 69fa9dbd3db9..82476cb5f0a7 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -6,8 +6,8 @@ DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee7
 DIST emacs-27.2-patches-10.tar.xz 15260 BLAKE2B 7e5771013e3912e0c3115d819be673399e5dc07b7fb4d8567b8666099049552ce539cfac92cc90762e517deaf6e7c46cbbbd207a4d9ac631ea8ea78cf93442ff SHA512 36f1410b70ff1a972d23919add6153497f1142bef654ac601149da7014eb1cf6bd05029877cc3262f572682b5d99b11d67cae24154b76d6e742e3ebd448865a3
 DIST emacs-27.2-patches-11.tar.xz 15552 BLAKE2B 42a23064268229adc6e90ba3342cd222698966b93dc39b75bebe0ebfc75142ebdc51c24a44a108dc7e96937fbcb763fb186da5444b27ac92b708004bc97cbb6e SHA512 688bc846ea999d56dedf06228c53e71df28048307bff8aa03207fe8b4ed5faa815ee975d3e2be65bfe0dedf972364dca625f7cb2cba2cf1812ae1dc735bb0bb4
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
+DIST emacs-28.2-patches-10.tar.xz 10992 BLAKE2B 324a28b3d74340dcafbca36af8550fe012b876651236fa9bbf7a1a8fca7da04d51260d4f7a5f065ec3de18adfaca9782cdc3e9b723c8910890c361315de5de97 SHA512 9892005b051bb092a1f3a8522ac2d29300b991cba22a281184d537388e73629c3db02be181bb9e4a7d98bfd2a405a222c334e018898109997804b6c087e3def6
 DIST emacs-28.2-patches-8.tar.xz 10504 BLAKE2B fe21b417a79f6f22ac594168aaa786359d13509011992ab958a268764e520b5c2b2270415f118013de8672280bb4c2acb645ab014b8d26ab6f634778a91b90bb SHA512 9c8fc7c4a76fe4c9d742c4e3343b31f9b696483c1774388e23f7db92f5e78bfed3871e344899996bcba142dc782f6a13b6a3df9684c977b86225afaa97a0bab8
-DIST emacs-28.2-patches-9.tar.xz 10792 BLAKE2B 3755959c1bcaa8d375cc8fc617483143bc5db47dc27233c2db7164c1ef4edb9868e445eb1825623c5d6cb6c33c4141ac8c76f939fd00ea6e8d5c4f3e51b8fee7 SHA512 512568b27e177477e22f514462fc4ec3e19828333513f5e2acdf19fcb07594857b8b1934be3643e5d5ce34b2ca51a20cec99d772e1ca3e0295f75181f091e5ef
 DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552 SHA512 a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8
 DIST emacs-29.4-patches-3.tar.xz 2364 BLAKE2B bf0d044ad0b12eeea1b87d76f143f3a542857eff6b29685abb2b37efd0105580cba2f4ca49655b4da6e13d3997e6c26f2966e597f66753b5321f6aa09f8c563d SHA512 4c6321a63a3f917f9644d464c74925fad0942caeb57966b2a5a0ed171eeb8987230b7039b2829f96526d205b4ad97fcc94f991ecdf7296d8dee355eb14d4df36
 DIST emacs-29.4.tar.xz 52210344 BLAKE2B 825fd2665b6427dbc3cb618b40df2f71fa6b08883bdd07be6d8acf0039df2aeebd294e679e98f4c64a9dd9bdad93589fc7c176cf3860d4fb823fce23f7f2b3cd SHA512 66b38081cb01d2c46ff7beefb45986cc225b4c922c30712ad0d456c6cae5507176ed99418c8f26948c5375c8afde4e4b2507d23ed997dbb5392d12150a121d80
diff --git a/app-editors/emacs/emacs-18.59-r15.ebuild b/app-editors/emacs/emacs-18.59-r15.ebuild
index 7e73a99d9984..4fe9c8340b7f 100644
--- a/app-editors/emacs/emacs-18.59-r15.ebuild
+++ b/app-editors/emacs/emacs-18.59-r15.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
@@ -154,9 +154,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	eselect emacs update ifunset
+	eselect --root="${ROOT}" emacs update ifunset
 }
 
 pkg_postrm() {
-	eselect emacs update ifunset
+	eselect --root="${ROOT}" emacs update ifunset
 }
diff --git a/app-editors/emacs/emacs-26.3-r21.ebuild b/app-editors/emacs/emacs-26.3-r21.ebuild
index 7a019f707cab..e90f6e5eaf28 100644
--- a/app-editors/emacs/emacs-26.3-r21.ebuild
+++ b/app-editors/emacs/emacs-26.3-r21.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
@@ -105,7 +105,7 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 PATCHES=("${WORKDIR}/patch")
 
 # Suppress false positive QA warnings #898304
-QA_CONFIG_IMPL_DECL_SKIP=( malloc_{set,get}_state MIN )
+QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state )
 
 src_prepare() {
 	default
@@ -321,7 +321,7 @@ src_install() {
 	X	   (while (and (cdr q) (not (string-match re (cadr q))))
 	X	     (setq q (cdr q)))
 	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
+	X	   (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":"))))))
 	EOF
 	elisp-site-file-install "${T}/${SITEFILE}" || die
 
@@ -365,16 +365,13 @@ pkg_postinst() {
 	elisp-site-regen
 	readme.gentoo_print_elog
 
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
+	# Force an update of the emacs symlink for the livecd/dvd,
+	# because some microemacs packages set it with USE=livecd.
+	# Otherwise, create it only when it is not yet set.
+	eselect --root="${ROOT}" emacs update $(usev !livecd ifunset)
 }
 
 pkg_postrm() {
 	elisp-site-regen
-	eselect emacs update ifunset
+	eselect --root="${ROOT}" emacs update ifunset
 }
diff --git a/app-editors/emacs/emacs-27.2-r19.ebuild b/app-editors/emacs/emacs-27.2-r19.ebuild
index 38117bed7e91..38ea37db5eb6 100644
--- a/app-editors/emacs/emacs-27.2-r19.ebuild
+++ b/app-editors/emacs/emacs-27.2-r19.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
@@ -134,10 +134,7 @@ EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
 # Suppress false positive QA warnings #898304 #925449
-QA_CONFIG_IMPL_DECL_SKIP=(
-	malloc_set_state malloc_get_state MIN
-	statvfs64 re_set_syntax re_compile_pattern re_search re_match
-)
+QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state statvfs64 )
 
 src_prepare() {
 	if [[ ${PV##*.} = 9999 ]]; then
@@ -389,7 +386,7 @@ src_install() {
 	X	   (while (and (cdr q) (not (string-match re (cadr q))))
 	X	     (setq q (cdr q)))
 	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
+	X	   (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":"))))))
 	EOF
 	elisp-site-file-install "${T}/${SITEFILE}" || die
 
@@ -438,16 +435,13 @@ pkg_postinst() {
 	elisp-site-regen
 	readme.gentoo_print_elog
 
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
+	# Force an update of the emacs symlink for the livecd/dvd,
+	# because some microemacs packages set it with USE=livecd.
+	# Otherwise, create it only when it is not yet set.
+	eselect --root="${ROOT}" emacs update $(usev !livecd ifunset)
 }
 
 pkg_postrm() {
 	elisp-site-regen
-	eselect emacs update ifunset
+	eselect --root="${ROOT}" emacs update ifunset
 }
diff --git a/app-editors/emacs/emacs-28.2-r15.ebuild b/app-editors/emacs/emacs-28.2-r15.ebuild
index 2c7d3a1e56dd..481e7c32b58c 100644
--- a/app-editors/emacs/emacs-28.2-r15.ebuild
+++ b/app-editors/emacs/emacs-28.2-r15.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,7 +32,7 @@ else
 		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
 	fi
 	# Patchset from proj/emacs-patches.git
-	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-9.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-10.tar.xz"
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
@@ -137,10 +137,7 @@ EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
 # Suppress false positive QA warnings #898304 #925449
-QA_CONFIG_IMPL_DECL_SKIP=(
-	malloc_set_state malloc_get_state MIN
-	statvfs64 re_set_syntax re_compile_pattern re_search re_match
-)
+QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state statvfs64 )
 
 src_prepare() {
 	if [[ ${PV##*.} = 9999 ]]; then
@@ -495,7 +492,7 @@ src_install() {
 	X	   (while (and (cdr q) (not (string-match re (cadr q))))
 	X	     (setq q (cdr q)))
 	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
+	X	   (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":"))))))
 	EOF
 	elisp-site-file-install "${T}/${SITEFILE}" || die
 
@@ -544,16 +541,13 @@ pkg_postinst() {
 	elisp-site-regen
 	readme.gentoo_print_elog
 
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
+	# Force an update of the emacs symlink for the livecd/dvd,
+	# because some microemacs packages set it with USE=livecd.
+	# Otherwise, create it only when it is not yet set.
+	eselect --root="${ROOT}" emacs update $(usev !livecd ifunset)
 }
 
 pkg_postrm() {
 	elisp-site-regen
-	eselect emacs update ifunset
+	eselect --root="${ROOT}" emacs update ifunset
 }
diff --git a/app-editors/emacs/emacs-29.4-r1.ebuild b/app-editors/emacs/emacs-29.4-r1.ebuild
index 6fb6a878891e..1b785b5cd9fd 100644
--- a/app-editors/emacs/emacs-29.4-r1.ebuild
+++ b/app-editors/emacs/emacs-29.4-r1.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
@@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
@@ -165,10 +165,7 @@ EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
 # Suppress false positive QA warnings #898304 #925091
-QA_CONFIG_IMPL_DECL_SKIP=(
-	malloc_set_state malloc_get_state MIN static_assert alignof
-	statvfs64 re_set_syntax re_compile_pattern re_search re_match
-)
+QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state statvfs64 )
 
 src_prepare() {
 	if [[ ${PV##*.} = 9999 ]]; then
@@ -577,7 +574,7 @@ src_install() {
 	X	   (while (and (cdr q) (not (string-match re (cadr q))))
 	X	     (setq q (cdr q)))
 	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
+	X	   (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":"))))))
 	EOF
 	elisp-site-file-install "${T}/${SITEFILE}" || die
 
@@ -634,16 +631,13 @@ pkg_postinst() {
 	elisp-site-regen
 	readme.gentoo_print_elog
 
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
+	# Force an update of the emacs symlink for the livecd/dvd,
+	# because some microemacs packages set it with USE=livecd.
+	# Otherwise, create it only when it is not yet set.
+	eselect --root="${ROOT}" emacs update $(usev !livecd ifunset)
 }
 
 pkg_postrm() {
 	elisp-site-regen
-	eselect emacs update ifunset
+	eselect --root="${ROOT}" emacs update ifunset
 }
diff --git a/app-editors/emacs/emacs-30.0.91.ebuild b/app-editors/emacs/emacs-30.0.91.ebuild
index dd6905d7ea65..db0b032c1121 100644
--- a/app-editors/emacs/emacs-30.0.91.ebuild
+++ b/app-editors/emacs/emacs-30.0.91.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
@@ -162,10 +162,7 @@ EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
 # Suppress false positive QA warnings #898304 #925091
-QA_CONFIG_IMPL_DECL_SKIP=(
-	malloc_set_state malloc_get_state MIN static_assert alignof unreachable
-	statvfs64 re_set_syntax re_compile_pattern re_search re_match
-)
+QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state statvfs64 )
 
 src_prepare() {
 	if [[ ${PV##*.} = 9999 ]]; then
@@ -564,7 +561,7 @@ src_install() {
 	X	   (while (and (cdr q) (not (string-match re (cadr q))))
 	X	     (setq q (cdr q)))
 	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
+	X	   (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":"))))))
 	EOF
 	elisp-site-file-install "${T}/${SITEFILE}" || die
 
@@ -621,16 +618,13 @@ pkg_postinst() {
 	elisp-site-regen
 	readme.gentoo_print_elog
 
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
+	# Force an update of the emacs symlink for the livecd/dvd,
+	# because some microemacs packages set it with USE=livecd.
+	# Otherwise, create it only when it is not yet set.
+	eselect --root="${ROOT}" emacs update $(usev !livecd ifunset)
 }
 
 pkg_postrm() {
 	elisp-site-regen
-	eselect emacs update ifunset
+	eselect --root="${ROOT}" emacs update ifunset
 }
diff --git a/app-editors/emacs/emacs-30.0.92.ebuild b/app-editors/emacs/emacs-30.0.92.ebuild
index dd6905d7ea65..db0b032c1121 100644
--- a/app-editors/emacs/emacs-30.0.92.ebuild
+++ b/app-editors/emacs/emacs-30.0.92.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
@@ -162,10 +162,7 @@ EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
 # Suppress false positive QA warnings #898304 #925091
-QA_CONFIG_IMPL_DECL_SKIP=(
-	malloc_set_state malloc_get_state MIN static_assert alignof unreachable
-	statvfs64 re_set_syntax re_compile_pattern re_search re_match
-)
+QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state statvfs64 )
 
 src_prepare() {
 	if [[ ${PV##*.} = 9999 ]]; then
@@ -564,7 +561,7 @@ src_install() {
 	X	   (while (and (cdr q) (not (string-match re (cadr q))))
 	X	     (setq q (cdr q)))
 	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
+	X	   (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":"))))))
 	EOF
 	elisp-site-file-install "${T}/${SITEFILE}" || die
 
@@ -621,16 +618,13 @@ pkg_postinst() {
 	elisp-site-regen
 	readme.gentoo_print_elog
 
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
+	# Force an update of the emacs symlink for the livecd/dvd,
+	# because some microemacs packages set it with USE=livecd.
+	# Otherwise, create it only when it is not yet set.
+	eselect --root="${ROOT}" emacs update $(usev !livecd ifunset)
 }
 
 pkg_postrm() {
 	elisp-site-regen
-	eselect emacs update ifunset
+	eselect --root="${ROOT}" emacs update ifunset
 }
diff --git a/app-editors/emacs/emacs-30.0.93.ebuild b/app-editors/emacs/emacs-30.0.93.ebuild
index dd6905d7ea65..db0b032c1121 100644
--- a/app-editors/emacs/emacs-30.0.93.ebuild
+++ b/app-editors/emacs/emacs-30.0.93.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
@@ -162,10 +162,7 @@ EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
 # Suppress false positive QA warnings #898304 #925091
-QA_CONFIG_IMPL_DECL_SKIP=(
-	malloc_set_state malloc_get_state MIN static_assert alignof unreachable
-	statvfs64 re_set_syntax re_compile_pattern re_search re_match
-)
+QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state statvfs64 )
 
 src_prepare() {
 	if [[ ${PV##*.} = 9999 ]]; then
@@ -564,7 +561,7 @@ src_install() {
 	X	   (while (and (cdr q) (not (string-match re (cadr q))))
 	X	     (setq q (cdr q)))
 	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
+	X	   (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":"))))))
 	EOF
 	elisp-site-file-install "${T}/${SITEFILE}" || die
 
@@ -621,16 +618,13 @@ pkg_postinst() {
 	elisp-site-regen
 	readme.gentoo_print_elog
 
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
+	# Force an update of the emacs symlink for the livecd/dvd,
+	# because some microemacs packages set it with USE=livecd.
+	# Otherwise, create it only when it is not yet set.
+	eselect --root="${ROOT}" emacs update $(usev !livecd ifunset)
 }
 
 pkg_postrm() {
 	elisp-site-regen
-	eselect emacs update ifunset
+	eselect --root="${ROOT}" emacs update ifunset
 }
diff --git a/app-editors/emacs/emacs-30.0.9999-r1.ebuild b/app-editors/emacs/emacs-30.0.9999-r1.ebuild
index dd6905d7ea65..db0b032c1121 100644
--- a/app-editors/emacs/emacs-30.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999-r1.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
@@ -162,10 +162,7 @@ EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
 # Suppress false positive QA warnings #898304 #925091
-QA_CONFIG_IMPL_DECL_SKIP=(
-	malloc_set_state malloc_get_state MIN static_assert alignof unreachable
-	statvfs64 re_set_syntax re_compile_pattern re_search re_match
-)
+QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state statvfs64 )
 
 src_prepare() {
 	if [[ ${PV##*.} = 9999 ]]; then
@@ -564,7 +561,7 @@ src_install() {
 	X	   (while (and (cdr q) (not (string-match re (cadr q))))
 	X	     (setq q (cdr q)))
 	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
+	X	   (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":"))))))
 	EOF
 	elisp-site-file-install "${T}/${SITEFILE}" || die
 
@@ -621,16 +618,13 @@ pkg_postinst() {
 	elisp-site-regen
 	readme.gentoo_print_elog
 
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
+	# Force an update of the emacs symlink for the livecd/dvd,
+	# because some microemacs packages set it with USE=livecd.
+	# Otherwise, create it only when it is not yet set.
+	eselect --root="${ROOT}" emacs update $(usev !livecd ifunset)
 }
 
 pkg_postrm() {
 	elisp-site-regen
-	eselect emacs update ifunset
+	eselect --root="${ROOT}" emacs update ifunset
 }
diff --git a/app-editors/emacs/emacs-31.0.9999.ebuild b/app-editors/emacs/emacs-31.0.9999.ebuild
index ec1f01bdf898..5d0ad710cf1f 100644
--- a/app-editors/emacs/emacs-31.0.9999.ebuild
+++ b/app-editors/emacs/emacs-31.0.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
@@ -162,10 +162,7 @@ EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
 # Suppress false positive QA warnings #898304 #925091
-QA_CONFIG_IMPL_DECL_SKIP=(
-	malloc_set_state malloc_get_state MIN static_assert alignof unreachable
-	statvfs64 re_set_syntax re_compile_pattern re_search re_match
-)
+QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state statvfs64 )
 
 src_prepare() {
 	if [[ ${PV##*.} = 9999 ]]; then
@@ -564,7 +561,7 @@ src_install() {
 	X	   (while (and (cdr q) (not (string-match re (cadr q))))
 	X	     (setq q (cdr q)))
 	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
+	X	   (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":"))))))
 	EOF
 	elisp-site-file-install "${T}/${SITEFILE}" || die
 
@@ -621,16 +618,13 @@ pkg_postinst() {
 	elisp-site-regen
 	readme.gentoo_print_elog
 
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
+	# Force an update of the emacs symlink for the livecd/dvd,
+	# because some microemacs packages set it with USE=livecd.
+	# Otherwise, create it only when it is not yet set.
+	eselect --root="${ROOT}" emacs update $(usev !livecd ifunset)
 }
 
 pkg_postrm() {
 	elisp-site-regen
-	eselect emacs update ifunset
+	eselect --root="${ROOT}" emacs update ifunset
 }
diff --git a/app-editors/featherpad/Manifest b/app-editors/featherpad/Manifest
index 6b381b1384e1..797c9b384ae9 100644
--- a/app-editors/featherpad/Manifest
+++ b/app-editors/featherpad/Manifest
@@ -1,3 +1 @@
-DIST featherpad-1.5.0.tar.gz 1087068 BLAKE2B aef468f426c9c635624fe16f8180647a9f62a12c98d654dfb340758ff524e629341469ec3f37cfe8a481def99ba6c99672aa31c49b03226e2e895dce11e9b5e6 SHA512 984d1fba0e4bcb1eda8c2dd3bee34cf2ee0ba5604dd2c9328cc67531099b8a806e8ab79020510049eb788764cf0ad4486c128eefb43d9ab1ccdc4a3c06c48497
-DIST featherpad-1.5.1.tar.gz 1087189 BLAKE2B ede7cde803f5133ccab847c1fd1279de97b4cc3ad3e56874f26096e2cbf17dd197a3db1e6ff8b41c603501d541e314ea9ff434c0be486abd42ce4c9ec1555e56 SHA512 2fff60896c30402ffc87a8daecd6b80d86ff1b19dcc3946d507c8f37742b033cad60fbcb7df61e7e4cbb53821c0d06b5b732a5728cbbb6af3ea03b5872075ea3
 DIST featherpad-1.5.2.tar.gz 1101561 BLAKE2B 24f5c8ed30b363b11a5ca1fba6edde13142202535c4ad11f70cf960b8021e8d46b2b49fc2eb96f141cf9e7f11946cde14f794c4fc1aa7e2242dba9e71864955c SHA512 b0d869e4f9d684d150fc2ccd34399bba5e6c80f00cb69d554fbcfd0be3457dd224b03b3c3fbb610d9396be480abc9d79d3c170c535469b6c7aa2525ea5ec365a
diff --git a/app-editors/featherpad/featherpad-1.5.0-r1.ebuild b/app-editors/featherpad/featherpad-1.5.0-r1.ebuild
deleted file mode 100644
index 9b69e0fe90b1..000000000000
--- a/app-editors/featherpad/featherpad-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Lightweight Qt5 Plain-Text Editor for Linux"
-HOMEPAGE="https://github.com/tsujan/FeatherPad"
-SRC_URI="https://github.com/tsujan/FeatherPad/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/FeatherPad-${PV}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+X"
-
-RDEPEND="
-	app-text/hunspell:=
-	dev-qt/qtbase:6[dbus,gui,widgets]
-	dev-qt/qtsvg:6
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="dev-qt/qttools:6[linguist]"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITHOUT_X11=$(usex !X)
-	)
-	cmake_src_configure
-}
diff --git a/app-editors/featherpad/featherpad-1.5.1.ebuild b/app-editors/featherpad/featherpad-1.5.1.ebuild
deleted file mode 100644
index 8b5d88a99c71..000000000000
--- a/app-editors/featherpad/featherpad-1.5.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Lightweight Qt5 Plain-Text Editor for Linux"
-HOMEPAGE="https://github.com/tsujan/FeatherPad"
-SRC_URI="https://github.com/tsujan/FeatherPad/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/FeatherPad-${PV}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+X"
-
-RDEPEND="
-	app-text/hunspell:=
-	dev-qt/qtbase:6[dbus,gui,widgets]
-	dev-qt/qtsvg:6
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="dev-qt/qttools:6[linguist]"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITHOUT_X11=$(usex !X)
-	)
-	cmake_src_configure
-}
diff --git a/app-editors/featherpad/featherpad-1.5.2.ebuild b/app-editors/featherpad/featherpad-1.5.2.ebuild
index 9b69e0fe90b1..591002192695 100644
--- a/app-editors/featherpad/featherpad-1.5.2.ebuild
+++ b/app-editors/featherpad/featherpad-1.5.2.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
@@ -12,7 +12,7 @@ S="${WORKDIR}/FeatherPad-${PV}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+X"
 
 RDEPEND="
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index d9f6d758d6ab..56f11cdeae33 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -1,2 +1,2 @@
-DIST ghex-45.2.tar.xz 902616 BLAKE2B 24e42b6d719280ab459d0ed7b96a502df7a5502e3d6cf385c0aa73b11808e40cac6112a3e0c3a228d5363578ccb875836efd8a13d6fc6c7e8ea4fe5a76bdb9c7 SHA512 2843b23a0673457ec72bd2aad20888fbc2ca890d3d859e6c2657af24cedc6185f6e11244574b603c0e32db2f54968e6584adf2c7e5abee84521c55148f536496
 DIST ghex-46.0.tar.xz 920568 BLAKE2B fe1608faa58e36d6c6f7aa01044acbfbf21a46547f755b37cf0ad673d7c58c882512c1790c74dde0e7fd18af92d0d9a3fc6c42c687413c5811bf8fc30e937adc SHA512 7f6c26b0644c1a253eef6eded0265ffaf882fb2400d1c4c40e9cefd9291d412b1425452930269d35c110fc88e6cf994f33a0ca9e937a419885f3c1820003220d
+DIST ghex-46.1.tar.xz 920380 BLAKE2B b25c2dcd58c5f6f71dfae7fd186847fc72192bde61a677b2a6be15eab4cdf31bb24f82f680d9d53f88d646af9c832c10f31c74142f9361e22237693616e84439 SHA512 83a61819b5ab7319dc160c7c948769a20c516f9ae3946f533ea0f6bb4169d1f0867a2c79441ed50bbd223745efb3c2ab8b9ffaac372b7777be97ef36e331585b
diff --git a/app-editors/ghex/ghex-45.2.ebuild b/app-editors/ghex/ghex-45.2.ebuild
deleted file mode 100644
index 504d9010a46e..000000000000
--- a/app-editors/ghex/ghex-45.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="GNOME hexadecimal editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
-	SRC_URI=""
-else
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2+ FDL-1.1+"
-IUSE="gtk-doc test"
-RESTRICT="!test? ( test )"
-SLOT="4"
-
-RDEPEND="
-	>=dev-libs/glib-2.68.0:2
-	>=gui-libs/gtk-4.4.0:4[introspection]
-	gui-libs/libadwaita:1
-	dev-libs/gobject-introspection
-	!app-editors/ghex:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? ( dev-util/gi-docgen )
-	test? (
-		dev-util/desktop-file-utils
-		dev-libs/appstream-glib
-	)
-	dev-util/gtk-update-icon-cache
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/gtk-doc/
-		-Ddevelopment=false
-		-Dmmap-buffer-backend=true
-		-Ddirect-buffer-backend=true
-		-Dintrospection=enabled
-		$(meson_use gtk-doc gtk_doc)
-		-Dstatic-html-help=false
-		-Dvapi=false
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/ghex/ghex-46.1.ebuild b/app-editors/ghex/ghex-46.1.ebuild
new file mode 100644
index 000000000000..c2121de2a7f6
--- /dev/null
+++ b/app-editors/ghex/ghex-46.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="GNOME hexadecimal editor"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/ghex"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="4"
+IUSE="gtk-doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.68.0:2
+	>=gui-libs/gtk-4.4.0:4
+	>=gui-libs/libadwaita-1.2:1
+	dev-libs/gobject-introspection
+	!app-editors/ghex:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? ( dev-util/gi-docgen )
+	test? (
+		dev-util/desktop-file-utils
+		dev-libs/appstream-glib
+	)
+	dev-util/gtk-update-icon-cache
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/gtk-doc/
+		-Ddevelopment=false
+		-Dmmap-buffer-backend=true
+		-Ddirect-buffer-backend=true
+		-Dintrospection=enabled
+		$(meson_use gtk-doc gtk_doc)
+		-Dstatic-html-help=false
+		-Dvapi=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-editors/ghex/ghex-9999.ebuild b/app-editors/ghex/ghex-9999.ebuild
index a1bb4fdd3f75..c2121de2a7f6 100644
--- a/app-editors/ghex/ghex-9999.ebuild
+++ b/app-editors/ghex/ghex-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
@@ -17,9 +17,9 @@ else
 fi
 
 LICENSE="GPL-2+ FDL-1.1+"
+SLOT="4"
 IUSE="gtk-doc test"
 RESTRICT="!test? ( test )"
-SLOT="4"
 
 RDEPEND="
 	>=dev-libs/glib-2.68.0:2
diff --git a/app-editors/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest
index 0e10776f02be..fcc64d9f6cd0 100644
--- a/app-editors/ghostwriter/Manifest
+++ b/app-editors/ghostwriter/Manifest
@@ -1,2 +1,2 @@
 DIST ghostwriter-24.08.3.tar.xz 2708104 BLAKE2B f64343a2911410791f2b748a543b0c6355ddfd488d18120152adb021c2b01d1887a120b1febc00ccfbdd6f2ce2bf716a4a3b7e56338962924b61c53fbee0498c SHA512 1cb28738674687dddee0155b4b16ef436d79ab10aef653d7bb083fd76820f02e4c5d48f04d22dcd16d44d1893abf37ce4bdf3bbb1897d978cc199b89259103d9
-DIST ghostwriter-24.12.0.tar.xz 2708924 BLAKE2B 2597c44aa0c289223f9195a049808d6a1fb6c962caa215e84decc662216dfe14d76b4ab1c23c016e57d1be6db17858f95cc2b10276a102e7a217bcec20e7a4ca SHA512 6ddb7b70bf54aaa243e2c9f0eab0023dd945c1f7d01a6564d390c7406ea63590dc28b43ff8a88053a710fca7bf4ccb2ed97ac586d22543d369127c43dff67e04
+DIST ghostwriter-24.12.1.tar.xz 2709712 BLAKE2B dc04912628dbcdaf86f65212f6a3336e30f9c718e43649637402f1eaa2a4ba9d834028cad5aa771f7d4b17115d49473c327d4879c2de0026cbd5838a3d8b84d0 SHA512 589e09dd4969dcb25966b7c865010bb1458ee740357b89a1993a56562570643d3d2056a6a4e490715561d00525af189a71ea10c4abeee013d5a19a7ff72cd80c
diff --git a/app-editors/ghostwriter/ghostwriter-24.12.0.ebuild b/app-editors/ghostwriter/ghostwriter-24.12.0.ebuild
deleted file mode 100644
index cde0cc6ee4db..000000000000
--- a/app-editors/ghostwriter/ghostwriter-24.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="office"
-ECM_HANDBOOK="optional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Cross-platform, aesthetic, distraction-free markdown editor"
-HOMEPAGE="https://ghostwriter.kde.org/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RDEPEND="
-	app-text/hunspell:=
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=dev-qt/qtwebchannel-${QTMIN}:6
-	>=dev-qt/qtwebengine-${QTMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
-"
-BDEPEND="
-	>=dev-qt/qttools-${QTMIN}:6[linguist]
-	virtual/pkgconfig
-"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/app-editors/ghostwriter/ghostwriter-24.12.1.ebuild b/app-editors/ghostwriter/ghostwriter-24.12.1.ebuild
new file mode 100644
index 000000000000..eafb0008acb8
--- /dev/null
+++ b/app-editors/ghostwriter/ghostwriter-24.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="office"
+ECM_HANDBOOK="optional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Cross-platform, aesthetic, distraction-free markdown editor"
+HOMEPAGE="https://ghostwriter.kde.org/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RDEPEND="
+	app-text/hunspell:=
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwebchannel-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	virtual/opengl
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+BDEPEND="
+	>=dev-qt/qttools-${QTMIN}:6[linguist]
+	virtual/pkgconfig
+"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/app-editors/gnome-text-editor/Manifest b/app-editors/gnome-text-editor/Manifest
index 1ba8576b18fc..7095cf398c58 100644
--- a/app-editors/gnome-text-editor/Manifest
+++ b/app-editors/gnome-text-editor/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-text-editor-45.3.tar.xz 618756 BLAKE2B 45a6a78a665f833b0fb2e179125224e1d3757390deee5845b750bbc13368cd9b0b8521b290e42a2c5be82e2e7d78bab5e3aad256d1c87eade22547696807a8ba SHA512 d9fbdbb0dfbb5d10dc1b817f9ebf114a63e20724c3c230da683c8b7f1332371acf869c723a7067dbdafb5b4df23529944b40e5ec212e52a5a3220ca725388c95
 DIST gnome-text-editor-46.3.tar.xz 654128 BLAKE2B 42a3b89bfe977cb2160c390a0391da1634ae4b2490aaf2ba8dc3230695d6064aa5c3aa03596e3f3e075fef50bf4ed5890d52acfe053fe2e98e238c9a839e58b1 SHA512 576b60e3f005cefd9930838d12173609cf7a0e9f6cb16b91be0e68a215c5c814df67c18c8adcf5083b5e1a3280149ed4b0aa1d830ab367aa76949a9ce81efea4
+DIST gnome-text-editor-47.2.tar.xz 647948 BLAKE2B b498cf787b1a8e4c77868430a76ae0b054ca9bb6558b15ada23e2559cfb3e0df6967dd25293b8e20456540766f37b693a70140077a7f30cbff171ff7a946427d SHA512 728000abf1af37facb51a7f73df5db605204c8fb988cd04286a6b5fa8109a1a53d77a5239b4c013094894674eb8eb7ba093458866a0a5e9e723a26452a638b64
diff --git a/app-editors/gnome-text-editor/gnome-text-editor-45.3.ebuild b/app-editors/gnome-text-editor/gnome-text-editor-45.3.ebuild
deleted file mode 100644
index 5c84d35e67dc..000000000000
--- a/app-editors/gnome-text-editor/gnome-text-editor-45.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="A simple text editor for the GNOME desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-text-editor"
-S="${WORKDIR}/gnome-text-editor-${PV/_/.}"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="spell"
-
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-
-DEPEND="
-	>=dev-libs/glib-2.73.0:2
-	>=gui-libs/gtk-4.7:4
-	>=gui-libs/gtksourceview-5.5.0:5
-	>=gui-libs/libadwaita-1.4_alpha:1
-	app-text/editorconfig-core-c
-	x11-libs/cairo
-	spell? (
-		>=app-text/enchant-2.2.0:2
-		dev-libs/icu:=
-	)
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.21
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature spell enchant)
-		-Dbugreport_url="https://bugs.gentoo.org"
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/gnome-text-editor/gnome-text-editor-47.2.ebuild b/app-editors/gnome-text-editor/gnome-text-editor-47.2.ebuild
new file mode 100644
index 000000000000..6b4297208b15
--- /dev/null
+++ b/app-editors/gnome-text-editor/gnome-text-editor-47.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="A simple text editor for the GNOME desktop"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-text-editor"
+S="${WORKDIR}/gnome-text-editor-${PV/_/.}"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~riscv"
+
+IUSE="+editorconfig spell"
+
+DEPEND="
+	>=dev-libs/glib-2.80.0:2
+	>=gui-libs/gtk-4.15:4
+	>=gui-libs/gtksourceview-5.10.0:5
+	>=gui-libs/libadwaita-1.6_alpha:1
+	app-text/editorconfig-core-c
+	x11-libs/cairo
+	>=app-text/libspelling-0.3.0
+	spell? (
+		>=app-text/enchant-2.2.0:2
+		dev-libs/icu:=
+	)
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.21
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature spell enchant)
+		$(meson_feature editorconfig)
+		-Dbugreport_url="https://bugs.gentoo.org"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-editors/gnome-text-editor/metadata.xml b/app-editors/gnome-text-editor/metadata.xml
index b96389a37794..65109d72f6f0 100644
--- a/app-editors/gnome-text-editor/metadata.xml
+++ b/app-editors/gnome-text-editor/metadata.xml
@@ -5,6 +5,9 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
+  <use>
+    <flag name="editorconfig">Use EditorConfig for file settings</flag>
+  </use>
   <upstream>
     <remote-id type="gnome-gitlab">GNOME/gnome-text-editor</remote-id>
   </upstream>
diff --git a/app-editors/helix/Manifest b/app-editors/helix/Manifest
index be2b743d7bd0..b8a083f91247 100644
--- a/app-editors/helix/Manifest
+++ b/app-editors/helix/Manifest
@@ -1,337 +1,498 @@
 DIST addr2line-0.20.0.crate 39558 BLAKE2B 1f66fcb361161599a87f874a3bf28a05614e235488d02205d4c8e207ae193280949ad957fd0eb383a49f4c1bc287569454d3c6872ed6e31c081e6fd03f8d460e SHA512 f9794772a31dd01096b168b4b4ffe311d4850c69fd77dd72c1e532a94ef7b23c31cccb9033848822521510f1fcc2ad0fdd824cf7efb9ed43828dc0165165b319
+DIST addr2line-0.22.0.crate 39156 BLAKE2B 3fbb55f6cacbb177d06359bcd39885247a9eeef96d95ffac0dfd1d45ed394dcd1e9e069c02c71a9ffca0b69e3a974e4d96bc3385470ee39c87d7a30ea7914303 SHA512 b334f51bd369348b4446805b4f624ec9b4cc8eefcc53ceb57b523ff55bf018d1dfe23259daf48d1878170ad4fcb44181d4738456eb5e35ede6932ff29686268e
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
+DIST adler2-2.0.0.crate 13529 BLAKE2B ec575b0bf12e321399ac3a1d59fce4ddbeabcc60cb3d7c2f362cce23eb29b4ea836451372d6d88552a4435ae29bb41d6230d55f625a4359eace680b9b771d0ad SHA512 12d12579ad617cf1a94cf95ab9d3f5db566c3b2de4bd5735eccd83c668fdad0eff134c996b73c46cbb9f932837682043878b8cc4764191625e9f93ccffcce423
 DIST ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d
 DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c
+DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
 DIST allocator-api2-0.2.14.crate 57689 BLAKE2B b3895370e5e73ed339b2dccb875275150dac29f717ce67e8c3375bbbc963b20dfa87b346dca9261aa1d386f37f4315bc5fdfe08843c560cce75d379ec711f7cb SHA512 3bbe0fb71e0dc2a2fa6739d5917f4686ceb94084c6fc10067ad585e7418772478396012fb6e3e9bd874a48adc7894554479a8c5041eee7bd1cca99ea049b2cd2
+DIST allocator-api2-0.2.18.crate 62504 BLAKE2B 8152c5a611be91ba23b1e8647511e21f48e7d4f1a7b9a828083f5bb8747cdc92aee66f73251b19195bbdc1f65aad992632e820d86cbeff287d598257ae3628a6 SHA512 5e5b0e23e1f5b259e5d3746e3e05817af8dee95af7105ea775a5c1d69b4e537a4d6a25e2c1d46ab83e2385217b158f7940dc1315ae581c35ee23289647105e73
 DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
-DIST anyhow-1.0.81.crate 45142 BLAKE2B 9b8678c5336fe5fd2823c58eae827f7aba726e12fb6edfa958c6e3b38a96dc3310bc8d044ee2e9db0bc611548f0be9a7b664b75321bd0b8a7e168d27dd3d7e78 SHA512 3d328c6b45a4780cfb6fc8daa5581cb5e45b230cb5f55837b0fcc8331c8d53630950c281115c06b21e655821a46d360c4aa667cbb24e87f3a534206361b08af5
 DIST anyhow-1.0.86.crate 46741 BLAKE2B 21b1f3acd1c1b659e6e9a53693178de67c806d7dbad30dedea0fb7078b2388baa196d1e7240a7dc88ed9dc93ee4c00bca8e608dad1b6bfb5bfa4f4c5ab51f0d3 SHA512 3853da32a2c53d73969bb29a1e622f3a6d5832d8888dc6bc8eedb76394b392f983aa3fcb1f542933e238841486106f0f38e9a2400c12c7699baba0ebe1d8193a
+DIST anyhow-1.0.95.crate 52155 BLAKE2B fc9cebdfae0afed86f2dfb7faf62f5a108000895317dd0cab9c83d6e48c891558fc3a1d8b9940b623b4c6fd861631a0f0344a9915517a9bc39dbfbe48ec6b45b SHA512 8c5c176381c3e861c3c4451f7cd3d9e2447c0a55735ececfd3199288d65d36dc5fdc4a19a0798f62a0b9d6ca2c155a616c7eab8bcd53e6ece743aed57ec3d0fa
 DIST arc-swap-1.7.1.crate 68512 BLAKE2B 5ddeffd2ae8af4125a5b43d4a0a1afc7948533bf037d8cd3e47603c13b57b156618280d99b840bf318b25b6eb29400ad68499695e182acdc05bc5f621c42ee16 SHA512 070fa8dd17b380b6d7d72f6f45c84e591de9a9770b9662351e7a41af03798bf5e34d185a5fcb948f4d8ac5e210a33acd465c39eff6097662c2442b34ee3dbdff
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST backtrace-0.3.68.crate 79891 BLAKE2B 38ec5881bdd8f2ee55db9da423e030603a6ad0b50edeb37e0899ca781bbc9f54fdd00e4f27f8589cc34ceaefac05f26fdcdf693cc08d9d06a2811783ba7c5c2a SHA512 4c4e5d47154e64d2192a6358d0861097e31b5a53d5863b03dd38562dccda7cbec584e006ce29563cadfd03b0031ed7a16fa43328f515cc66a296048c9a2f5d89
+DIST backtrace-0.3.73.crate 87617 BLAKE2B 585eebbb44671dfb3ff088092f62c7b25118ffc34e148b9b6ac67707923254ea43056861e2658c5fac7b9ed16fa56c30e7734e976fc3178f1fc03912d1d44c40 SHA512 dacedfd32cb91fe408e4f395441baf09c0a4b3bc4ba8f79d088359455cc903c93d24969567c7c5b2feb806433ffbb63a526d73f53caa4bee9c51961b61f831d9
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9
 DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf
+DIST bstr-1.10.0.crate 380426 BLAKE2B 19330a5a293430c09908d2174ff814351b16419f60de6463abf9b8a9dff06a4e6845e889d8047a710cef54842f2790d9cd5080b92cdcb113d89742b869979c74 SHA512 823abdbda9b13802facc7d6b1ed9ad809ed3b0b827d26e418348ffb8481b5f5735f129c5a9a8c7b2ab010d7f32ca57cba69a1ee10a64225c54c6ceacd22c05d2
 DIST bstr-1.8.0.crate 380176 BLAKE2B 017ba2818bd636297cfb16fa975b34aa83367aef6df2cc321443754e5fbf4a9afa8ec9e99328e0cb0e5929268d6a4c2301e55aa2a6516e43e87280789c8d159f SHA512 9b8828790f3e342e69bb92cb9231c7134188c168a9b67a8705dc2e3370b86885f99e4d47f21ff68afc9147968b0fbf5a293307b09f132dddc550d8cd576f1048
 DIST bumpalo-3.12.0.crate 81604 BLAKE2B 2370094f0c23a3e9b75c8e523e54637189543d9df90ae7ddc349d316054d3d1abd1319e51cf1578f1630be0673fd7f65d130469b2729aa32617372e8bc5dd5f7 SHA512 37f2228f251340e82c27f2b34da2af6eb520077b3809331547cbe4887c0b4791b1a7d75a017decccef162cd02a088d504214b7a44b484a7d93eb6a278b329ee4
+DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
 DIST bytes-1.4.0.crate 58080 BLAKE2B 99a9d343424e04649bd209bf2a6c3a089a6cc9fdb799968f8c3a711189328e4499df2e09cc6a2a8ce05d2cc668149b364cf30cb3b09e96e21d50a39519c2f49f SHA512 502c63b9fdcd36ed28ede55a63cd359dc7b28658ecd43020511d17d48d7c34e45aa8ff7e4b17770f12197451040c2b724fe68d2aa3ab4f81c9171d052f2aa000
+DIST bytes-1.7.1.crate 63623 BLAKE2B c399f7f25b85ac284bd2f139d895838eeba7deb56d109c8579966be4b8a7a56bbc26f9387bd0bef9fe5449d5e2ae8d11b254a7ef93048a4827d945ddddb5ce09 SHA512 04cb5bb1718ee378be1d9d56aef2d117ed561935ddadd78139ef2839f998e92c88369c79560bce9d23246a3ebda1dc888af373f9ad4827a0b9a249379bc71e81
 DIST cassowary-0.3.0.crate 22876 BLAKE2B 7e74a08e02050548ade7dd1ebba7ce4e4360d258ea6acf126453889dbf16df433bed7b68789736881c957f4c09eead1f763a0c02f2474157b1650a1e77e6eca9 SHA512 0838c0b79ed31f0c514fe4ac82633976e34b0d6cb08616313cda0e00623514fc6498c6c308cfef54ea029f1fdbaafe2991ca8ac3c38437a113ac62e37f9397f8
 DIST cc-1.0.106.crate 80289 BLAKE2B 10a7c9e25f9ea0fc09bcac63111d7655029da65e00c0d3f920b6b8c3748c298a253b023cae252e991815be041b4dadc656d0c4c31102623d9ecf4f2bb05eda1c SHA512 1ffe4b1f109bb889a68498f5b60f81865de7d1d528508f013c82463d12883684f7c0c623e7b3483b53e6b2beef9ffa649bc07271b28f09747b53c182f2d071a3
-DIST cc-1.0.90.crate 73954 BLAKE2B 840417889519dec96a745c49ecbc8b0d3da9b37a4b6b0165ee8983c07b8150061690b34409381365ae4c70c5780923d19cddce29d5fbc370eb6b6fff29121436 SHA512 349f3c3f8208632f8754cc05d70976eb14f3f13a14d59413994c656efc36bb32b7310adc7d5f3a6745f15e0aaa88334644c9aba8d29fb961215d74bec605307e
+DIST cc-1.2.6.crate 99923 BLAKE2B 61e091267c5b18d3c2886ee50870ccd3aced59d9f5eea31967e8739a49523226e2d1f0f383c7b5c3c9b6dc19d65bee319efb081f0c05c9d25847063d7f628081 SHA512 a9a2a00c58e0625aef2023c0c84827f17ee260bcde7e9407c98b38300ecaa5df852babbe896d857920c3455089e3608b54014812da88e597c500017bdd9a52ab
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chardetng-0.1.17.crate 56362 BLAKE2B c99d2f1044fc652858e6de0f2be9a24bec68550bc79fc8a7424c3a97a8cc5e28e859c2577d7969bad744dd8adc640c5f79a0fb8ba6043975f048f305f8745df6 SHA512 0b537b68e6da14e4a8b63cd069b3e9d6b09a4df5e473157f3ddce91d7a01f755c7b5278bfc9dc09ded92f660535c5944712f0ffa2737fbfaafbf5b95e29c7aa7
-DIST chrono-0.4.35.crate 234267 BLAKE2B 92552b9c8fb40160de9ee62ed8c5bea12bf8bae393caf91c1c64596d6b2efd09dce94355fb757ed46eaf4a13d27ee3ebb43af91e2d8c26df1f9a9f429869f319 SHA512 aed8bc3298c8f8dd8146c6a919610b6dda52c038a28b56c837a21590e41fda605cd466dc1b85e407f365e116d741cb82afbeff5d29f95f3f5bce4a62abf80812
 DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
-DIST clipboard-win-5.3.0.crate 19597 BLAKE2B 1f61d0c7049e6b2d9f09d6ef47196153ca4f592cb0eff7602317cb871cf06a54ecf7b49a121f45842cf49555c171f27db38e41975ba13920e5eed456283b6c10 SHA512 decd0b73e2d879c7b650f525b74e2ff20d271ac21598a64d447d863cd3d1fe344b3f4b4420514644c777d1d1793b585336e877759734c7234627ada0510daffc
+DIST chrono-0.4.39.crate 222248 BLAKE2B eeff1694a98e8775524c261c5c46ebf09bf1ffc6222a945576960e8153af99e4549d8c988bd086507fa430f9cb15a3159be85300247ab3c6f5e77ab515f0988b SHA512 5b258f76bea58ab9baa0fe8fb32c41928b8b655c76bb2fbaae9300ef8380cbb881296cee6b9e9886dce62b0759c73e84f6409e374a86cf0c80e3383512f98571
 DIST clipboard-win-5.4.0.crate 20559 BLAKE2B b4c795cf707500b429322dfd0c593188b63f9330c916f2559953e5bb4192599fbc2337280940ff287b9691683ebc421ed56aa5adf64fd09fe1c560fa88df2d45 SHA512 1e5bb8dcc860f989a46183a748a47fb18aa66a164df1fe366081fd620ffba9a858f8e87ca19783c37b93cdaafa11029170d149ee30422b1c9b98020784055503
 DIST clru-0.6.1.crate 16507 BLAKE2B 6379e70a2d75530bde76e82c370c4481ce84d8196a395e94b30dddc1126529774e7ac662da2611e4da10cad6dd54fbe55e1bca4d554369ec5f4798bab59a9d53 SHA512 bb9303ea245e3df6321bbf3c4cf9f899648067f8d3950638387badc79ab37e7570ee73c90af96dfe4eefc004d116c5fc77cc8d89a2809defa2107cde530cd192
+DIST clru-0.6.2.crate 16497 BLAKE2B f77d90984f8b030c43380cc8fd80cfde916f8f9fc4b288a340e9c00f0fe177b2918734c7948ab4bc8fd01abf7864488c76e7744c5974ba23f79fcd1b23b6814c SHA512 6dabdbc4b956fffed9c362b6f33b71625ba62651b0820dcc78b61319d981513d479b453906604de173110bcd9a7441451ef10cb0978e5e587cd0df23fec2c4bc
 DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844
 DIST content_inspector-0.2.4.crate 11386 BLAKE2B 2393cf83b2dd338ded7f5acd695e05a4a08fa639a52a8042dd0692be5e959cd1cc670472e25ca696a151d161c821eb899b2a950c74f4cb5b880bc42bc53d1d57 SHA512 1acb8b4f12ce3479f5a60b7b6a0c05b86548591e488e7be529c4a2f9aaa60a76ed07e7ce1e557664d31ddd9964e7f73415ad667cd14ada919f61511bf486ed6f
 DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6
+DIST core-foundation-sys-0.8.7.crate 37712 BLAKE2B 0e1dd99a5bbb0fe92f55181a37426f6e86445cb20e355f553b3162c88ccc075644461731a0cdcd93dcca65b6cef1de62b409afbd73ba3070a199ab8e7422dcfa SHA512 17492d5314db03abdb3b1998bf0c396ec8ed0f83bc978ae22d6026afdc86c50b58cbac073b3a0d97b92da7e98be11302faf1249d24313494bc058add4f4cb63a
 DIST cov-mark-1.1.0.crate 9801 BLAKE2B b0bf83bacaa1ea42adec1e476fa31b022f682853c925043729b9e31616adacf5a29842edc976b0b0493c167db2f1a56f7d74902ea19a7d3332dbfb3216d404b9 SHA512 500bb4d1484fe83468d2d304967a25927ffda55fbd300948476472192a8efc71fd924b31a72120f8b838630913d4a72d15094f204be3ef09e19da4e6bbd3a258
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
+DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd SHA512 c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266
 DIST crossbeam-channel-0.5.8.crate 90455 BLAKE2B 017132056f1b40e55fbc7a09b75509d72b0a6123a0e5ea5d6104fe822f73b3ccce670d711d3b84b5ce743dcab5f10445297a6701b71213b77c0d56e2c3fd7160 SHA512 47677d6fe63050c51393e4a0537a3c65d7055c9eae118ebe60c5d716b4f47f23c2b1947b1e1b66bfb34a57c4db3a44631d323e996dd545565fe4f58c25863ff4
 DIST crossbeam-deque-0.8.3.crate 21746 BLAKE2B c24025c65d7c1c98e442af95491749dd4f777af0509636ed66886dcf656359ec50dc2a5e26327559c6659f6b355d2b0b992dafa691a36571c99637cb47372d0f SHA512 f3201c9afef7d2d119702696f7e5e7997a104b8f7d67c7adebd1cbed84d3a3415636ff674f1ccdfd95d0dc162384e46c6138c8203ede69577b0d5359a4b44672
+DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864
 DIST crossbeam-epoch-0.9.15.crate 48553 BLAKE2B 23aa0532d3126e22efc779859478098e505b4ec895c643530a3f7e8dba0543df3d8ffcb6825b1d3869a4418e17d798d464b3e1bb51522435d50f53ac224e22c8 SHA512 d9292c059ef1d156da52950137b2b3ea5eab66c4cc2f763d02078d0b0106980839ebed2ae2aec53e026ee7b3ddc37c4b51370d925ada1ad13d9981934daa7bde
+DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2
 DIST crossbeam-utils-0.8.16.crate 42508 BLAKE2B dfaf9e7cade2cb5a2de90dc622e58a69c5b28fe9f69d3cbb945431683cf48fb409565190e3414a815563afb12631d990476919890fc482ce6b5792fdc25536a7 SHA512 4b8d599a8b93015eea2fd404cdf1526fbb94662fffc7c64d2f0659aeef349e4ad682f61b2b85d075c7f3fbbc4d8106cd7caf6e65dae117ba982f31262df3f831
+DIST crossbeam-utils-0.8.20.crate 42487 BLAKE2B b50da06721cfbfff07825574feada8a28d3814edb218434288683eec31bddabe2ffbf7e5ef1281ee14a8a77c56db3b66f3c5ceabaea9c72317c1bd2cecda0c26 SHA512 7175eadf9fa7c526fa11ff87e40ff203f0e7a4bcec15cb972f924f3c7ff7cc20b6e2e8dbbc1ede142a0207cd2baa4f446deb25d825d28a54cbd25c263701bfaa
 DIST crossterm-0.27.0.crate 125311 BLAKE2B 93724dddcfcce9249db721213985fbd9b30eeabf0e8c1c8626744eae3a15f181cc2bb871a77fdefdb2b1a7139453b1c81081c6d82a62233f3574ccadcef18686 SHA512 b7b2b7d8affd845902e0dfa06edbcba9c7794e0839895998f39ea1b118de5251fb87c6b5de27e85c490a436b04943ff51d609cecb780674c3768c12ec401d2eb
+DIST crossterm-0.28.1.crate 132275 BLAKE2B 30a5bf5b48a4bddbfb53726b675adfdf6d64cc387e027a69d6ab721f5ebe574abed3a862504f0db723a733662fbf0ed13163730a7ab49ac9c7fc05681a3545dd SHA512 0d53e328eb606cabc3e309cc6193b34a14c8746081a7b2c9645c1c03d66dbcda99656d629c0dcfcd43bada7a863df3e83fded6b642b2474035165ed7b16f7931
 DIST crossterm_winapi-0.9.1.crate 16027 BLAKE2B ea63abf751aeab203f326e77260cfbd1de286be26acf714a083ae1262b0cc2a35b5cb6d0bd54f45b33c1942eb22f916141c5870aab34149fdb30faccf4d4642e SHA512 48eee242f477f43b69c00e3a5d4d255de2ce1774f6e73d869c5472b35d85af0b63f3a607097da8ace437b1e52a524ded4106767b83d4ec53c30c2e37ac4b46a7
 DIST cxx-1.0.94.crate 196058 BLAKE2B f504685292650a076c3689540cbb5906721fcba1cda0391e855d75b9b1270249805986b501291d91c947c124ba8affa1659e43e040bb264d3ab3aa23b98d9718 SHA512 fb66c3d53dfa1fdfe8fa31ffb6ffe0f53fc87d5f56038b5d2f588fc56668f96954e75db1fc7304d183ebae2735f0c7297b396936d588242556f40557854f22be
 DIST cxx-build-1.0.94.crate 84842 BLAKE2B 39b8a11b925244410ac2dca3be5a27576ea67f5386588e768d9ac1041336170834c7c2d0cd0a61b3e6eadea4d6364e98bf4dca64204126ef815235a17f1edef3 SHA512 4e2b7ccb8ca2ba35d14fda222595528d3e7abf6b4bf5b8e23f19f9668377103808151ddf63bc1c5f725fa362dc3f33a827b026edab176cc99a36e0f890c13adf
 DIST cxxbridge-flags-1.0.94.crate 5253 BLAKE2B f7746ca703e95f8b6197655aae08b88509132b89d035c62420e3d0cc4857687171063e2da69a787938188dc5e40fccd2b50713ed929f3f097efbc5b5956b5263 SHA512 9d577cf6bd2afa2301e8c227f201c138a379457624833c3cad4e75c7ed046544b363ac4bd0f7a1a2142ab1c9d879b56ccfd681a3962be917099db5ee4c63fb02
 DIST cxxbridge-macro-1.0.94.crate 59873 BLAKE2B 9a29a2818cdd6047b49002c10542e2d04702ceb41823a12e27b151bcc524a05377390c65164e53062630d7ad9f849ec71070118de5eb348c98072e301dbd1416 SHA512 59120f8d0f498539a16921d18e0e53a745f4ee58f4ed40465b13722188d28975820adc3c632a4592c6813771056fe084674daee6c56940e50f6e9c492c4fd90d
 DIST dashmap-5.4.0.crate 22862 BLAKE2B e24fdd4bba250f1fcf9baaf05184726f4da5dba592d23c0a31f68f903bf6a8f9071c46a11f17e61716a745597338cf52d1db04bf6a8f4c6bdafd745f249f6db6 SHA512 886ec6dd43d4053ca964ade99586a31b420953e47a6e710a1259d8d5f34936f847683844db5c73dfe243803ba45b30ab9641b27af1ae5d825180119a7d61a910
+DIST dashmap-6.1.0.crate 24828 BLAKE2B de8632e7e22132fb2464653cbf6d928d7f2abd8e7352a50e6fcbf6b522aaec67ab2a7618cdd34f0d48d0bdfbef026a1515d5ada98ac5b123fc7856246e392968 SHA512 03a727e41505e5e7068df8fb27fad6d348fc14f6b1609d7f606fba765fb92fec7fb42c6427bc11d057ad2ad52d1b44bcf5a802651765148941ba41fa75968cb0
 DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43
+DIST displaydoc-0.2.5.crate 24219 BLAKE2B ba3396c93d27a99a92ff4a0f01a8d192b419bad25e48d9427b76260ebf2f9982291d77f2eb24d239c0b1fbb097e866a20bc46dc1879fdfc6637ea49928444a92 SHA512 5ca35fa59f263162389c1180331e9df607d9374bcb056cb04bc46c98e4d87277162ddb2335ffa8a8c5f69218abc3eabccdcaa71c21b8dd9081cc4146f266b948
 DIST dunce-1.0.4.crate 8034 BLAKE2B e1e7ffbcf1e3632036c03303ab46fc37b2b0a991598790b2dc65d7a61341a78bf555230ccded8fbb87d6288282af3ed2a8641212a0f1fab929bf99298e878b6b SHA512 f57d9c53c177bac8e10a4b56ae421c604085aef0f264b8d6871abb7e1ff713b55f396c5c5f24422763319c504c6ea6a774416af1c2ba23ba7b67b2282f6731f8
+DIST dunce-1.0.5.crate 8244 BLAKE2B 1499ae0bb3d34e8d42e97eaf551308efc95697366b804dc83c51171a939d45bad46fce9f82a39e17b6b92fc833aecc85eabd2104823c7db30396833388125728 SHA512 36d7d75217d629185a9a9187f7d2e2dc346a28be0ad1c21b1b6bcbe3991e9cd11797e53d745c0b3b5ae94cf1e4cf141cdb2322bab86d97cc258b4145e3b97a56
+DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
 DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd7aa0aa9c99d44abf8428939362f32fc8dbb1b60ac56016e0096201071d0bf8c0431b660605d0dfa97da466 SHA512 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177
-DIST encoding_rs-0.8.33.crate 1370071 BLAKE2B 0e81419086ca6e18f2aba5194b87eaba49ddf20493fd6ee09d479db86306e39dff9b23f399594afc42f1fdb33855e070beaa1871794dc0b0371c35d296a6369a SHA512 20d28a4c0ff0710f911f510be56c2bc5e7514b76d370493d2b89b7f25d1c0cd46ffa64862e54fc472f07f928a2cc24cf9d790a37751cafafc81f263705aac4bc
 DIST encoding_rs-0.8.34.crate 1378166 BLAKE2B 528692170cdb1d74ffb0b122a5aee61f50a2a7e4ce6db049ebea4a185e5c43d4ed99e515f08524053a110e061f788f861e62e0b04eb016e7a9e2678235a04577 SHA512 e23b87003814dd6e7e17924bd1f53989a5008dd1da07baa23c40d2a18dc1ab2d786d61e2c304b3f60e73be5f180ae2deea3b4499c0157b6afe3c9273d2f739f6
+DIST encoding_rs-0.8.35.crate 1381050 BLAKE2B 2db6797e4f226b3836c18496ed77f3fb113fbc075864fd264f23c4fec8396eb3a01c439985ba0586a4464ac4043ddd3acac80e0ecf897cb59569e5065ce2137c SHA512 4b55b53553c5cb6fe05ae81d1c6f3b0bab73ecd3d426b15c58b9de9ea8dd61617bf0bb2e6d3ae2514c7cb6e73019b1a083173d1423b3ece2d190770c597114c4
 DIST encoding_rs_io-0.1.7.crate 16969 BLAKE2B 8d51835dc0882d0e0512f0a177f10da3a1c384f38cb4eb163f957cc134ef5b7aee65d951cf65c99cc80b087e0e92ca4dae431e3a8987fe6b86bbf0dd1bfa8ef8 SHA512 0c7d33616e96fcdf225599dbf469232d150fa4bef5809346c4003ff7fa0362a1cded8f3392fb5945f4950e2b2cd71b60c93025d73ecfdd2ba4fda5e03a16902c
+DIST env_home-0.1.0.crate 9006 BLAKE2B 3737d6a3c2c750271d67727a2f7f3466a20ffe2e88998c104416f4814643f929af744b91c2c89ef3db5353faaf8a5daf34430f9e413b0d09c79cee3d10863399 SHA512 5c79ed50e48f35bef62a1135d661ba15b3b30fe93c27d0854f58e9397058579ece4b7083bd2ecdfdf6d7ada6c84c1710c07cdc57fa638d758cc3f54afc46f22f
 DIST equivalent-1.0.0.crate 6621 BLAKE2B 5e2c461898c2b029430c526db25188ca37b5c1f9f562c1950a7cb26b824c8b06d0ce62542c234e909873c329982641abe091f99074b6e40f13898b39fc4a5a86 SHA512 006fd57e6829b1dd9644abaa6f650098f22302e9882fa5b852c695aecdead8e353426626c56b772ab362303dff23777cc7012ec04f9618403d54f0e03e29278e
+DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
+DIST errno-0.3.10.crate 11824 BLAKE2B f9976b538868daba3cd2d47ff2fdcda16b4a436ca767f865f23d1139e7f232aba263dd4aa38d573442c762999c8a8beab8a4a8c10649d21b49090fa65ced1ec7 SHA512 fa4b9a368f254cd90c6f69f6883af4c579829a6da6f31481a1b527ac9602c8ffcb5e9518cdc32c39b5589c151a20e75a7300c8a907d178346185ecc6e8749f3f
 DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
 DIST error-code-3.0.0.crate 6176 BLAKE2B 569fbc0fe97c3e9369ea751e04b5cb7e523bb00e6b2f5e7b866c4eec2e98b453b85f5efdcb4efeab8da6399cd7a9e77965896233c0cae668d0bf1514ccfe41ee SHA512 86a9c6ab7d7e229646ba193d5376bc9e705315858e3920c2cf6b284f1fa529942764b68f0a95ccb1bc92f8e2b73f4fd138654dfb03bba7e4361549aee620c908
+DIST error-code-3.2.0.crate 7569 BLAKE2B 815e83d67a1f257b4e9b3058ff849b3c37a44a0339b8a3ba175b7c3cf4794ffbc76369ddb433ec278002200702b83e32042d62e5603af5010ad4df4c9364c501 SHA512 d3a6dbfdbc1626d9502964dd4615fa5d39f8507996fe6e727bc694c1da54c1760b000d4827bca7a2190db5f04b8549c6345f262702eaca88d8b83a43649c37e2
 DIST etcetera-0.8.0.crate 13295 BLAKE2B 33069c496eb846bc3e602812cd2ed182c660ae06b8a33ecea294a5ec9e37a1fc15391cadc9fde23f3e885e506031cbfb6b7d036b94cc4f94d42b8dfa8ad0ec7b SHA512 857151a9af143c7149feff2aecee8fceec45a7a2ff64a8c1a482aef89ce2f91de05123afd7d22d67cd664d9ec3800652c7800affdde4ec317437f5d925883b3a
 DIST faster-hex-0.9.0.crate 13053 BLAKE2B 36e07a1b08544f273b30b6c8b79eb97bb0e97efc29c570f59fbe9fb4c818dfc0cbd9f42ccd4e196845c5d1f39db1a49cf61d1931ea5c1f761da2b0da49b03430 SHA512 7713b0929ffe5596823d001a83a40fe1c4c500b7cc4218921ebb65f69826a9a9fd6e7b948fbd093cb921bea52e9f2cf3285c9d1d11f2a321dcfba0fb3c9aa5d9
-DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9
 DIST fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104
+DIST fastrand-2.1.1.crate 14983 BLAKE2B a4535b1612b103376fe64d71a393f7bfc37668c574d9122ca90a631aeb91cf0895bb030e597b79a80a4a37ea4d514c4c0836332030bb10a60bd971573a6d6ee0 SHA512 9a51185132c1c89fc31af463c664e996f431e607ce96676b8301f28ff11a99661d18025dd460e3332e373af68d20017d96481719746fc3c5de742d08d63aba3e
 DIST fern-0.6.2.crate 304626 BLAKE2B 7dbfc8a1cf0adc288732a1dcc23e30bfea6668b01e162b60e867b67b995b7eeea5399b9e9a630510e3f56c8f36b79b34913342b7c8834783ddacb2cd7b94e140 SHA512 f9c44d1387f803b567b7254d91cd942c55d30a1c3cd37786101d7d49d346bc2bbc593fa8a3b2e59711c5320c1496354e8d2f3ecf0967030ac1e5199650523fba
+DIST fern-0.7.1.crate 304533 BLAKE2B f525e0dbd7c36690d47fd48eb52651588719de72e185b4922e37ac3bb5fd6c59d03761c69bc3ce7c151728a0d930bf919e80295e743f2e79a52b7e6b9a238792 SHA512 550c47b49364b1e517de67655b9422356434b05be9bc52392d6dcb80a94f738ae84d5e3cf8efae9e3b91f2830fbaa2d19f7f4d37d34bfab1971d8b3fd4805691
 DIST filedescriptor-0.8.2.crate 10830 BLAKE2B 964470acbd1f36487755a74666a46649d6012c0782b3622652bd41b086e5d804298d6126c980ecce5a2ce91994d3a006288739b472ecc518099d4e690c89f402 SHA512 dd808b8f26bff4d8b37826241f30c9396bb0f731a0fc3ef53ecb3bd0c0fb7adec6bfe5ff6ecebb6e02c9de6fc5f2f6c0fc361e9c6ba564708dd1c29ab2662f65
 DIST filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3
+DIST filetime-0.2.25.crate 14940 BLAKE2B 1ffcbad3b2023ba5e9b2d71e279fd8c3564458b28290f3e19bf43b87083e1e3c0e18f191f6dc67540baccb83075df453950230089f243e6276e413321cceedc7 SHA512 90b4f3c4df29a3456c393f78f636d70f2615cba748a972dc9b937c2fcbbf4544f5b0d28c6c8fcfed5d5eda026ac670afffec18ab7d7127cee9afa2717146ccf2
 DIST flate2-1.0.27.crate 73460 BLAKE2B 5603848098ac02c9c83893df79ea9d9ad3df5b7e02ffa155ac74602bda7e28e14e6b7de2ff321b38d24fa3741ccea8a4c811abb47690cc295f90d4cf2bdd0bbf SHA512 e76e76444686433acabd16513e6e5860d4d6fa53a810f37266f36900f154acacac6dcd77b0373599a6d33a09175f5f02146d84726b982c59a78926950e19ff09
+DIST flate2-1.0.33.crate 108838 BLAKE2B 9fd23b3b0a75c29f750c873f74de8565f0d8f3a574c7d28e11d15e6c3c4686c42ba98b5769a08c21f3b9c6ffe7140196c3e7001153ff5a046ee7af40f7f6d965 SHA512 59a871137518586f1d66810528595acad5ca763ec5acc100098a372194f55f33b48e59c0806fd237c644a6d797b5deb26c541fa871a1194ee3ac725da3b6d134
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
 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-executor-0.3.31.crate 17965 BLAKE2B e111467391cc99d1b6a1f5fd3aafdb86922a2d2d9e360112402d68489577527aa35f4f65e6c0dc8f48372927e6d7a6a4a97c7b9525c369cb14e34ca2dafbe64c SHA512 337e70bd3a3bd3075b51e2afe8f157902ebe486696587cc2706b6a5770478ee2ee4216aa9e155e9821ed1d02ba437cdd3abd0c05aa960378ea192e2ed39af564
 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 getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb
 DIST getrandom-0.2.9.crate 34457 BLAKE2B ccf7232ece1047000140ed6bb9a1afa784be87b5cf83e2f58dff77abcd79e34120b45336cb05e47fbfde36407957fe9da8b04971092ec05f67b321fde9142d29 SHA512 48e341125223945d1c02c4dfc54df303ae27d3ceca0d5a30b42065f5e40da600cb2010bb59e88af6b990d54b5eb4bf83ae5bbd27e13e56363f5f68be03ea9082
 DIST gimli-0.27.3.crate 287904 BLAKE2B 97ba399c72cde7b11f0a103598747b58b242ebb808c60c037292b992e30d8fc5e212e5620c233e485adbca61cfc433a4697de3ca76c183ed517a93cad4f75c25 SHA512 b3782d510bbfcbcfd8801b4343a6864b91cf954808e935745caaf1b7e7b3f2f94814f1543de9a36a8d4e5c29d08d69be9361aa2b31e7a261d5dc6e7b66ef4ccd
-DIST gix-0.61.0.crate 270542 BLAKE2B b92e232eebc99b21252652bc93825d68c77faf83682bd54449af07a76295cdda1b8460c1877f5833935c691a9733610f6b8fb74bba58bb65408e4078ac3eefdf SHA512 361a751d66f3fe454791e190e5f809f30f255f6ed248cb0b6f12311b296b60f48b925049164f4a00f0ad8e967e1323cac133c11500ceb8286ac586fd52d60b12
+DIST gimli-0.29.0.crate 275756 BLAKE2B 092e5bce9503a337451f63706e7ae7d12a4228db6a43d2c14fa6af74640a790ec70ea2055ac84db3919d19612ee6ee0453f64981390667abec97637679ff06d3 SHA512 a6b591d48dbe93a1fa6b814759a5cb61fba0838288840667aaecf01346a3ab862fbfe1cab51b057a425ba9a0ce35c8421b28cd5195464be881f38905062f1446
 DIST gix-0.63.0.crate 270869 BLAKE2B 834e0f5aecdc5ac391e14550d881d70c1903e3ef96bea3b02372ff82312737bdf571e5907c6c1f06df69a84e8dc6f1aa07c1b6ec471a4425afbcc29dfffdb0fe SHA512 7864cbb80f0c81c3cf8c69f357279c64c3c860d9997a1445b955f32351069d02e66f213cc4b0d5c2631c4bcf0a8ed492f56fda81a7ca9c29c4ec2b7ae47422c5
-DIST gix-actor-0.31.1.crate 8952 BLAKE2B e582c415e9c7b13f9b92cca97777e2097de6884c2f1c10e71d9076981bfe809d8f46a140d1d2328e443b835fceb7954ff1c5ddc3e807c86a86ea9607e391a17b SHA512 fdf59aad0880ea94e5d9deb4308e2a1ad6e4facb3ec16aef06f04317c01925cd93ffc634803234973c6862ede44d280b3f634570d118763b74f40c73b9eabfaf
+DIST gix-0.69.1.crate 283914 BLAKE2B 8024c931523ace0375817c8c94df04d2fb0de754b74dc68d09dcfae1ed39fc145c0c7aa7170b689f0ac0dbf135b1ba1ec114dea41ec5de263a5f9e3007e2b4fa SHA512 49cc671a251939f0433224e20f96fd0078634a8a56c9959c0da369f5c5f5d1435e30002ebd4ba8e6d40147bca4f55518fcef56957651cd78e9c08ebf7608d2ac
 DIST gix-actor-0.31.2.crate 8999 BLAKE2B 89858e2b03a8d7ed5980a88e99418c1e59a8bc73afd6a246d1613cfc8e721155329166156945ee864f98e984dcf27d0dec69acc3eaa2547f3a915c2a8e84e93f SHA512 82271347550187d81513e99e08a1cd76ec4542ed3b9bc22517f47da02dacf8c19e6a2fe0782bcfe0939ed866e1379d35211384c967a7844f26ebacc52246bc64
+DIST gix-actor-0.33.1.crate 10085 BLAKE2B 807e2d1a9f7c84c515838f0bde3942557bcf2fbeab11855e5b42c91f64be48efb8e1daa2e3f2abdf82476a5478b1fbf1c7ff0ca688851b841436f2e7919908f8 SHA512 cc852e6a4abbeab7059d83b175271c88a79528e039e4995145bacd50c26db143c27a9986b86309cb8824890c791ebf7b74d3275249e684c4b03fca725fb6f6ff
 DIST gix-attributes-0.22.2.crate 19043 BLAKE2B 0f6043ff1ed46be4cae9f38c57069c7de2424f09757971b38d728f9329f6aceb58e9ee5e1e63203e1cb718c49726dfa786b11dbfa0fdecf013052269fd898ce2 SHA512 2dd8cb1e1b3fdd0bd9f6b6fdfb77a710d81e85d86605a17d4e173de6969013ca954ec7ce255349a6336f76b0c65c9f0ae12fe56fd27d6c817c30f99ebdd6f60d
+DIST gix-attributes-0.23.1.crate 19861 BLAKE2B 489d9284d6ddacc1a4fcfe00db3f77287153f5d5ee976499819406252f5f1169d1a72c94c7cae5622387826cad18839c86a187c34f94daef7e2ad8a950bae12e SHA512 38aa6a589edbf7cbbc9fda9f1cf20ff0ee265c43152ef1f4653a1400bd62dd44e768f8e911f5b6a643b19db9805cd0d239433e78cf884b079fa3db639e4c8bda
 DIST gix-bitmap-0.2.11.crate 6920 BLAKE2B eebacb07d6150bc16d4068fb0d5d1646f78cac93ab6cc82b64f3fd9d4ec928f5e904a3ab2bb66f697df2ca51c17eb586d873bec73380e894b66f05b94b7ed690 SHA512 889e0195b9c16f6cafe6d66a7d18da1dcc5f3aaebeb63415665102d838bf702eabe142fcbbebc28f3b69372eec5f51a9dace3d333caa6f5fe8158df89eddc40b
+DIST gix-bitmap-0.2.13.crate 7689 BLAKE2B 966087f65e6a037155c4b75ddf6fd9374694df794acf003228b79946fcd0507ac6521cf0f6de16b2b84416188a7e235fc38b7d0b9ae7c77d6d5a1e167a372e23 SHA512 52b7f61f4ca51d31d127d62bff5fa07493f5bad4ec03d0db58cca3bb83f330c5eb67d93ddce0b8b710714afed9ef0869b9ad48ddafd20055c317236719d63f4d
+DIST gix-chunk-0.4.10.crate 10131 BLAKE2B 3dd2d7d0a2196ab8dca8575ec1c579e4b91b95d8a7a3cb6a78d78d4d31af7bc0059dcd195d5fc1a4978034647bba7115fbe6ce4eb7600199cda0207923a6a0a2 SHA512 1d1f80e1cf204e5107d17ba5f73bc446351ca868fc01d52eb950bc353415de3de01ed953eaeee40def1e0d1d704af4f164bb1f111f26b301f54c73d0d2e8e2b8
 DIST gix-chunk-0.4.8.crate 9358 BLAKE2B 6034c836716906e7b8cf490c9f066ea6a995d384be6b931df3db96c6e71ee53dc4e2efc065d1eaae130528f23ebbddda27608f0d08afb9a8cabb106bf053dd5b SHA512 3c0bf0b9aa998907f1f2c3e610f86f250c4f9bcc9384f4c636d3c8d637e9011b48f7ee33f21dd8b91fa66c01209410886ac68c2f04fcd4262c37fca0ff9ea6cf
-DIST gix-command-0.3.6.crate 10757 BLAKE2B eeb6238b355cc8f2e1b285fe3538dde2b8bd3d6a1d65c9ee44de54afd38778bc7689c205a81fc1afd03552ee3a8b0c77ac7f52f4dd5b9556c58a41b7afe3c3ee SHA512 74c5047e1df08deac03638e8905fc83c301ed238455c5926ba74872ab56ff78ffddf94950fbfea3f27e8b7d372e5a13114936f467bd221a874ebc28eb908a0fa
 DIST gix-command-0.3.7.crate 10802 BLAKE2B c692ace582be6ec581bebc8458d65a831b758be39e5af96825ce014c2dea15e0161cdd98d20ba936f8bdbe732d7fb71caebf6d5b2835b9f264e5034c48d8cad9 SHA512 b8f9844ff7d0fd395100c77c9b5f2b8ce733c53ac17fc8872b3c37de2270d67e68fee8d2dff61a7942ff481ea39080abec436eb49454a41d76bff07f9bdfd633
+DIST gix-command-0.4.0.crate 11815 BLAKE2B 0c8ff68055bba36b7478a1ee677c0ef5fdc2bd254b04a1846723b389f09c504e89b45257e0e39aa88b42aa2f7a03e1af5091e0820dbb9d19fe370ea09f4406d0 SHA512 2e4673e1f1fafb4fe602891848d4a72902cc9d1d242e9ec56bdf1aea1d9921e35bd94811a5e77ae9c20870857548e342ca18705e8c5b90c12c7c585bfdb51186
 DIST gix-commitgraph-0.24.2.crate 18187 BLAKE2B e536c5abcd1736eb800ce48d4fd6ad919a70aee5d210d086f35d1fd6aba309d3f3446429eb102dd41dedcbe1fe578429fa70a94679c50784490172e4a22a32e6 SHA512 3ddb2e78bf47c1e3d0803d5b7387eefd6c5a0ed046bf042523e49d3bebbf156c9ab213b7b4ad270849a760dddd2d8fb37425dfc0d3250446a368947dfc85185c
-DIST gix-config-0.36.0.crate 61643 BLAKE2B f1f931bdf0e5d1a7cb71342f73465d414a690206c77c17aae5230e5d1604454a2d6736d1c7053426e7c92875710f52a634bea3b7afc1e184e99cb66bafcbe56d SHA512 ec3998cee2314a0e51421d83fdea904790d9645074b4cbe3b9b76109ad5a210cdfaf7d1ffebe389ee4ffd12c8f5681a4d390786be74076fdee8cfcdfef68f5dd
+DIST gix-commitgraph-0.25.1.crate 18945 BLAKE2B 65c69910ffaa374ca1c1737d8d04c6c01ae9e5e8bbea31299d1be00d4ffd768f46f3425ca5acff20558d74248f005ea1c3cecd77f0ee8d36fd058b0d3fbc1708 SHA512 27c617d2b81184ef012fb9ced3d05e621f07ff58947132db615bd1059ade26acecf1e6203188c570f253d03196fabe167619f810110459adfc4359c08c5a2014
 DIST gix-config-0.37.0.crate 61780 BLAKE2B 548ce00ee51a3c7f380aa83fbb98b97e95d03321e0ce2d04498c9774ccc27b5fa3ae61a3495dee6d450bb6218a234241e8830663e15b38ea51b16a1fd84708d2 SHA512 9802f72a467305916f96ca7eb8476edad8d710d54982681d5c88fcf07c12bd6d2433c14d0407abed50cca76c2eb05551ae3f223846f3431014c388b306178c23
+DIST gix-config-0.42.0.crate 64315 BLAKE2B 11ee6cff62d2981a6246741010ba724707075c08039a51c54230369256e9ecc31ec0b9d7fb60583bfefa75306f8f65f0864bb873467bbbecbd4c147617e518ac SHA512 e205e07c8cc55b3456ed2612ccd504a307daadffbba598f62164fa7797abae2159110b455194ffc2ced02039d0e76e9881a12ce1a26763b79954836d17e6b4bf
+DIST gix-config-value-0.14.10.crate 13604 BLAKE2B 79acdf7ee7769fd0ae666b534c03b02de45bdce74d5bedb702feb993903cd4e1817ab779e6f66f708198a8a35746612e5d063c454551547ffcaf8c04bd32ea53 SHA512 90e63d76bcd4c678f4452b7b312282b330104059307f6bf6184431fe8b63599e1afaf23d93c9440ddc3f9542708a03df2a23ddf88a413c294af03effac50fbf7
 DIST gix-config-value-0.14.6.crate 12769 BLAKE2B bd807a037a74905f7575c295567207a5200830fefcc802e11ec271d238af0f391b3f639cd2686e77c267bc4b4d2a15aff290d926bea194a25473f7c87e12dddb SHA512 547d527c248016135504b4544ff8958168279fe20720da9e2ce6e2f148741f8e870875515ce4f069509583186e0c0e9856e8c08ae1e14620a001482fbcc8f8b3
-DIST gix-date-0.8.5.crate 10185 BLAKE2B 564d90bf3f6c4adc2b731772132ba6e984271d62114c682e66eb49fa3b31e7bead40822901a182e2f25ee9f82303a867bae9052fa5d74d3929e7de2f79899e94 SHA512 f2b7a283f3884ea1a569e02deb10659b80a44e330a9e7b648dc7b3d38bcc54c66d2c5abbb238eaae4e1e7516092379151d43d2b927f4428936b357ce913dfef6
 DIST gix-date-0.8.6.crate 10349 BLAKE2B 2884d012b597554f8f177b13b88c77da8f74aadf4c402af60482a6059c227739aa8c604951875733a5d969c5a111f77ae003f20ced447cd6fb94f8640bb52d7c SHA512 7112034675cd0e3a7ca04e4b81a83c6e6d07d019147eca8ba5953595eb9ea009cd7a8a853ce8895f49c5e891e09110104bc9af1a117e02ef3483828d3691777e
-DIST gix-diff-0.42.0.crate 32151 BLAKE2B 9b35116bfe05089fe50052d03f2e3964d787e8d39370e412194168700b8ed3ffa8ddc7d66c4dcb29b8a4231e7e85f3241fcf6dcf544ef813c0f6e933a50b2924 SHA512 8f953276818965840513127e51e0b12485e41059199ee33dc52dc2b6f40b776de7c89f8b7a21fd4d5530c1ce2c6f9d179d76f897d887cf064c668445928cd4c5
+DIST gix-date-0.9.3.crate 11299 BLAKE2B 5a15e00418ac01c9174e2d4c776d1a04fc32c7269396b5de44b5c89f4ac3bc2a721618b4bc59e2e66982d40214168d6022174adece227c85de53c546389ae7f8 SHA512 c75a0108f5289ff82df7cf4f003d3c501b6c8cffa713e0b8d1628ae54744474324e9c9e77c839b94e4a7c9a2ce8d9e5662796d46dfd4cb31a208c6c3ed25a790
 DIST gix-diff-0.44.0.crate 32198 BLAKE2B 569cba509932a93f1a2e47c985e80da68239f7e3cc0928e9846c9485060401c6b5ea9468781e89eb5980ee139f436bd36f2416489576770967984abe99263a00 SHA512 54ffb18f2e0f1047994f26120014b981a1d73213b3481d4de3187318d0582ea2a00513a0eddd9964869dad5518bd2a727a330a72e7b26d03cf6e8d50df52205b
+DIST gix-diff-0.49.0.crate 41572 BLAKE2B 3a54efcebcd19aa22c2cea8e18e8b98f6a54161764a5d0e9190e522b14c3690dc447abbd26446b64517d24488313bd6688fceacc6374a3bf5de16cab086f2ec0 SHA512 c448813d14328ad3ae65df4507223701823b6d0d39a74e757335a02755e29b7f6cd69f9f246541004407e874659cbfe092c76559ca101ae39acfa82a3de12413
+DIST gix-dir-0.11.0.crate 54967 BLAKE2B fb2ddaac7d35aa397fc6bd6c42962d63bb8c712f1bdbba486f982ad5a98f12de793620c8101f13d1d14a7942e405ee8d5d416f9a9f91c5d86df97c7e61ca2a0e SHA512 5d835700a0f4b3a74dcf76d7cca69d64abf2918e8ff5c4811c10cd094b578db5f22d61c24870dcb5b54361a3b499b6bc9c88b026b1b01ea64378d6378392a024
 DIST gix-dir-0.5.0.crate 45881 BLAKE2B 2a6f5f1431b8421bee0524d009cd1b16879d88e7907a27783ba1de58eed84f67c280832746436899664aff419d9fa077a3c30069f43300c82441ad57d1ee041a SHA512 c7c02da930eb210d829ab519d129448184bac25865a7940adbec36ac60c07745a796f23b0b3c72067fd254b369c2efa619e3515bef5ade6618a169db4056715b
-DIST gix-discover-0.31.0.crate 16644 BLAKE2B ce1de90ebefcd71cf80fc154a156a2f4ed40cf3bab85f1bd1e1d8171962f20c10dc905006486f55479448288a103edc300f2166257795173e45fc37d2adae1ea SHA512 fa2c0f0112384e202f3c4a82a65c27460c5b941b94a67d13e13ecd49ddc0e811f35f2a0121fd24add6acde8d8742f7aa56a173bc6b78e1b5e98db6236157bce5
 DIST gix-discover-0.32.0.crate 16630 BLAKE2B 785b22f86fced1c5b27c71ae9c416efb0241376d511574e9333bea0281ce03e8be547d79c8a599701ef63f508bbbfb8a9dfe98e57366ae37005350f156d21c29 SHA512 876127a5272351a1ae218682c34b3fd47fe10e930508e0543f086f4e351e0db1f19bc679ffe4b7515b91013fea67aa766784d7c82eb82e2fcf3634902704e6e6
-DIST gix-features-0.38.1.crate 30596 BLAKE2B 9b0a6957566abdf7a11a9ad9df245f88d1b03cce4d6e23432bf3ed12314043c43518ae0be2048f28dfac1b99b196fb131751949d8ac2d2639f827e3d832f738a SHA512 8a405dca152a4c913153b458646632097edcbb0a57320837f7e7fbb1d6f0e5293e9148f77a65ac19a1869203636c17c1d5aebcfabb5b3f31e8cc6e71da7827ec
+DIST gix-discover-0.37.0.crate 16673 BLAKE2B 8e57fe5e44192c2929228969ca16f3c7d88d8a8c2fded00837c7aa8c561397d9798448f0e5e205ac979f246a37c23ad13b6b90684e11192fd2bc9dc8ea243483 SHA512 e26869a2700a972ed6714a0fa29f2302a74e2a1d8d57e78d20e373779601b4ef367aab2f5c5c866a9b506a76b1faaa13bbbbbcbe10b507969a30c23aa9bc0c0e
 DIST gix-features-0.38.2.crate 30604 BLAKE2B 68bb0154bc444a84dd20bdd1a56d770a8c68a816389dc8ba0a94ae71da9c9955974cf7a154de5548f65e547a5e25303efc19b5e225664ce8f827cdb661bb17d8 SHA512 d82f70bd8831701b2c17a761b306e4b630fd5b558e4b936aa8b2f87440e53127b48f024c392b487af23e0c541de4b064c27c35ee57005a81352eba0e6bcf79a1
-DIST gix-filter-0.11.0.crate 35851 BLAKE2B e810c145e5be9189faab9f90ab2d9ae4f07d132ad096296f0e97ef45f3a9fe2178f8b3665e6338c9f697302cc883a4ac51b4846f8e18fd1b60714e22ee37d66c SHA512 f463a694bdde34eac62497df2b80f8acaa08d5c778d70bda52e04e0a058e076b47d1fa09cc6e5d8c571d50058dec7260f48e354e6453a3c4361a41328e4a5277
+DIST gix-features-0.39.1.crate 31228 BLAKE2B b41a71cb0eaebc6139e2b8dcdde9377144bb508f5eee48e2202dc9e3d9c98ed5807963b1c4bd16da1b00d064ecb0e75a4b66a9ef4ef82a93188e9bebc690fc59 SHA512 a150d723b5bf223adc8bcf7faa2eab8f5c5a35ae706dd09d940c6232c9f62c9c36b2ad255f5c4c6fddfa41c4bd301d46b044953e5ce5cdc57790fb234fa81546
 DIST gix-filter-0.11.2.crate 35873 BLAKE2B f78fc41fe532c6f8cecdd4f3470c751457aeb936ccbb262b9411b2097553cc8ea377c5ba7e445b3b9335f4874b79fb932565277984c968b2a74cd3aaee78f422 SHA512 50a57f3f909893f96c947ca4621e9fecf7758b6d7f1e2a0ee105f9469fc13f0ac0fdf6ce1a2e86878faea06d1eb7b9e2b2de92501709250963ef5bc3e99a6da9
-DIST gix-fs-0.10.1.crate 14369 BLAKE2B c2ce356b6a578c3503b6cf3f23301bc32dd3837e4995154fee6f0c1e17623e9494db5df2b40e928bf010de80172c3f8adb711667057d79003d1b7fd5538cfe03 SHA512 3a93fb80d9eb331c45d0644b6b120531abadc8ad173c00a214d2e42a99caf614074382fd4819d2a239488797337e0ae519c2c9680fd52cae1516565914f6a14b
+DIST gix-filter-0.16.0.crate 36654 BLAKE2B 4c353543a4a2b6a650dedc134f89b17842eaad6b9f0458e0b0b6786bf60d84c6f8f5e9a0fd85e715cf294703cd75d6cb4eab5199012715332d2dc2a9bec04a23 SHA512 1f109d4b781610f48cc47bbec181170ec3a3b3b38d80bd86f5c02a9f0876bb3032390bf754d5b6200f02ba672f880367c0eadbf42144310619da69970589fab8
 DIST gix-fs-0.11.0.crate 14912 BLAKE2B 3b2be348e1afc2a0b8509beda3c77dd93357c6ba13c6c5361390d40bdb3ba9bc177a6b59c9cac6b167b053be6736a5d4f7f2a1dda4786fd34df6283842a4e800 SHA512 fedabb20ebb1e76b9672f768c7b739c83df995c2a9eb4ef875f409b583becc6802eb20526894a14d0ad5ea49539c8c1b219670adcf59fc94e1df813e97eef2eb
+DIST gix-fs-0.12.1.crate 15734 BLAKE2B 03263ccd2107c89ca87568fa670d5d9f5f1a186d4b47e9d5fb76fa25e10d0825c1a60226f65562c0cbc8a5f0711f3d5b58bf35cb39f33134b5bb111cc2386155 SHA512 e795cea9077ac74480d848ab3d8287a4e14a3f5718e329e28915547304ab415d55b193d91dfa9b97cc09fd32cb7570faa2dd33f6b464c94e996c29e8ee90b390
 DIST gix-glob-0.16.2.crate 13261 BLAKE2B 9274187d3af9a770abb5b31258182003d44756f0639220c6475098964ba517cb8db651d15ea1ac18c38b2f9d47ae05d589bb7b18e6766717b9b30522a9889477 SHA512 9d540eed9995395f3987831d5d6e8bfc6349c712692cf5aef41d216e923eff84e14f528552d611bdbfe25e9cbf79b34d514ef4e3e98c38dae6244cac66312f07
+DIST gix-glob-0.17.1.crate 14136 BLAKE2B 9d8a147de57b7406539b117db96ca8aad91eefa85d2da212a152026f315cfbf8120bc4a54ec7c0dbbc42991353f81dd73aa69a07a1b2b3205ccbb7d3e8162913 SHA512 3eec32350076b5a8257b447c8d683fcb38a7c171cf6187c30186ebf02f12ddc487bbf18c8c260c3721fe69ca84b861bfb003ec8b26fbd00b5056e543a4d8905a
 DIST gix-hash-0.14.2.crate 12759 BLAKE2B 033f46ba342fea5e2a7b5b91eeeac06aabaae527d10ed665ef1d2d7f34362ae7ea27df652012c5ae25872ab18175aefe15de3e981647086d8008a32bdffb2d0e SHA512 32ba5cc7805146fa858501bdf0cd75bd000550aacee258fdd63572323cdd06e54c78b4a71761d410c46471dc1bcf856e5564586f24ca2cca03c60b9e08b4386d
+DIST gix-hash-0.15.1.crate 13513 BLAKE2B 1d80fc96bb4407c424b42a75ea215f6f360fb6025920f3dc04818ccf5c89995b6a7fa62e9a4d9568fedc83f599262747983b57f84628d5ff4189e47e5b3000db SHA512 bf90d93cb676d3558ae14ea3e5bac6643fe7a39a6e596465b0c4a126a4181d721326bd01509ac502d8ed4ab4445a606223bce81e466cbb0ce71e46daadb8af34
 DIST gix-hashtable-0.5.2.crate 6421 BLAKE2B 483871bb398815c4be337e494244a9f9f6bfcf2788bcc975c96a5095f213f6b70a19902bf00987d3f16316625617727cb84408431398d32e5bc1fffdeeb84340 SHA512 d3b963cf2e82dd034bfa5912bdd0fa384cdd501efa6a0dacc70838245ad072daaf49e2f7a84d2d41360c0677af9c0162831423b4a903a77f5f7f8027034bc36a
+DIST gix-hashtable-0.6.0.crate 7189 BLAKE2B 6440018095e5554842ea7ee93b4d44367cf3dac891a2ac4c2e159c926ca4e48d3ad1b505288169703b66ced1046ee6e6233d5529c0a34bdc08de3e22b49bbfd3 SHA512 308358fce4dc1c53dd9a32891b10321364b3c7665b7e646021829ffb94669cff6c3dd53b23cba3186882f3f0a039630cb20b0081bb690233a8b9069ed91e4b7b
 DIST gix-ignore-0.11.2.crate 9090 BLAKE2B 9b9ceb2679d7d0f500741f481354c66b552bb1a858fa1be2de02eddb3ec751090fcc252ce597e6b8b6ea77e004dacba04b71c7b2097e58f442158d27ce9b4035 SHA512 6ea8f39d50a0ad46f043fbc15c1c7372ecdfcdd75208a71dbae1215e6bc4914e64564e9828c8b4333f3727a49b1141719e015d97c0d7d00a42f32c2764ffa3de
-DIST gix-index-0.31.1.crate 44358 BLAKE2B 347fbe9252e4c38f1adc5a137e43952afbd709132d156dfe4a842e7be8aec00ae155264096b812159c49da058d0f9aa6a09e35090326c35b5dde376798fd5314 SHA512 3b79229dacfa293f2de7e2e437f8b0f40752465e774a88fc944e8f30661cb09a50c41481e64c75f06c8809c215e353092335ed9466f8c8ee98569a0dc8ce4b43
+DIST gix-ignore-0.12.1.crate 9873 BLAKE2B b50fbff14e036b2e12559030936542cbb7f4724ae153757240ba3b0a3202626cbeda705d2239dcff3b7328004c2393a148132b154835a0efaccef59cf5bf9778 SHA512 091e1cdd7922e39211a8227e7b8e5f082e44439fe4ff624902dca897afe2fa5c3b8e1be6974b83018df53c78e75bc9652fca87e736b4bbc06d90de4c54e28f8b
 DIST gix-index-0.33.0.crate 45745 BLAKE2B d08a90c51e0d91f0a26fa01b3957aab356a72f49ce7e99e0b07c1fdf611f1cba62b71017909b38239c4e9bcbf4ce1c9ec18bcb58d2235e747d9ce8c09bef67ed SHA512 2f3685083ef279bb00988b3359e2742e1dbb9dcbcea9173c93010867769dbc83961604eddd8e16b675ea7b17a3e9d89cdb46ba71053e04b2d0eaa8abf6772edb
-DIST gix-lock-13.0.0.crate 9441 BLAKE2B 21e19c8cd6c43b05c72a93987ba56f9ce45a637b1aeb021200fdf81142e45c115505a02084a9091b7388c2519a794032fc2d434af3625f09d3298314fc6e1cad SHA512 b0d1bf9a783ce3cde9da5df89e0238891044b9a0d6de2a1b75e306e8bdb142b2fff139c51025becd28362e9d542d59624f2070e9e807fab39f2ccaf18b0003b8
+DIST gix-index-0.37.0.crate 46644 BLAKE2B f868ee6085ccda181cb4cad522d73b6ed4b408dbc2b168864ca3f8aa33d422d1262b7865d5347ef3e3960d294e4638284d3f70b07a774d3d62bf3df4c2011272 SHA512 08b5526db632b5e889bae333503a8c9fc8322d9a1e420e50deb47845c870239750efd577751471f8d3c10048524e01d4f49409c818999369fda4449cf41998f6
 DIST gix-lock-14.0.0.crate 9795 BLAKE2B fd6c378bdf904be22182ae48e7898e9b8d5ee5e3248545ebdc7dc21195e7da0c5977717104102b050af35a7152829987383c0e8973da18c1620dac1f637b0aa6 SHA512 46228f8ae0d931c6594f2ce08eb8aebcf77901dd9664d134ba5e5583855e40460f08061ab5d9287bdf17e452b821f0c336d49b7aa181b44dc091925d6982205e
-DIST gix-macros-0.1.4.crate 8582 BLAKE2B b4c09240fc6b3447192253691d40c48e8166f4223b76ea9de7e532983571981f1f847ebd227d522be2272ef6587151a68e8e8fb7ac83ab5b85c403fc537b3180 SHA512 3780c2b1736747a66b9ba5d13b943ec545662d91f3c85ba39918ebefadb69b6de684154a552647420e06e12d92bf33a53de99b2a354d7f8100ee55423ca16f66
+DIST gix-lock-15.0.0.crate 10524 BLAKE2B 2249af5dc8eafcb7725f1a26b2c10ef4d002ed688a350455f550d07380e6594971ed77e295c1b2e13286496001387231c671f13b02c1a3d00a54493cb80660ae SHA512 d92dd0d3acc8bc9767d3d1f06a0293c7b536042534f3b932e6ae90841e0b082ef5ba9158a5013ff168478e4b628da922f94c8daf129567c5e4c2aacc538ebc0e
 DIST gix-macros-0.1.5.crate 8627 BLAKE2B f685187e5c6dcd91012b0d3030121fb2f913efa12dcdfa080b936812f9acfb36fe282b8fd6fcc3f41c5eb78f6aac82792bb38a22db851ce06ead2031112a705e SHA512 61f21cfb309da85c5ec00e3023e79ca40af23597e676ffa2875bfc46ab531fa49d5843a25aa7d9293151c6d321ce82b3339bbb1a6bf83721f1fd145b3c77c471
-DIST gix-object-0.42.1.crate 32453 BLAKE2B 51857a49286c81f240deb67441bbd42d1ed4df23f377bd5bfb8b893284d16c365cacf24a15836dfcdcbdde4e5124e169bb68460c1ff87b9869e07097fb1b9b47 SHA512 8fce352ea0519cfdca1faeb09a4478020357bde519ddccd49793d281ee4cc254bd989c5d8d3e555713f740547adb9432c03c6e7e398065a9c787063ee55d6cd2
 DIST gix-object-0.42.2.crate 32491 BLAKE2B 0b7e7015ad21149dd674adf96b85d527da7766079baa181cf53f2d53505cd29dcfb1e7e98531814500fecfc67b4ec21f18967f68d20754d9f97e82bef3980a4c SHA512 a3f030acacc6ec6799bd660f8a98a59b51d2366ad9b6fde47a63df472b2a072a03123ddf09734e9197782148a9d0c181bb4a4b9e7e3457f7c6b0aacfc8e0493c
-DIST gix-odb-0.59.0.crate 54132 BLAKE2B c393e871eae85b28f9525a1ba0923ac87f498e390baae9d0038df4a09912015231a4d160083ec832d1f5272f9aa269080fb125b8363a542eab0e5982edfef08b SHA512 4d6357caef64e7253e9c2046432fe8cacdf1a0d77c0bb6ed6f30ffbc1757fb0c915c75e4d899ce48740b3293ff7654982883b5451fbdfe3572d588185ae39c59
+DIST gix-object-0.46.1.crate 40544 BLAKE2B e7996db68fbffb0e66e2d7e9859eeb829c5d409edcfc1e585c71badb9036298e846a545ccf24534c211a9cd303769c87b98ffb9b44055748da3d3eeca1035217 SHA512 fc85dc59a4494787d00e39a9a4b8fdedfba2b0963f08a9f2de720d36e3eb63ced683622dc127fb6492c1311a40ae5f6978d99bf92a0f4660a172ee725e39dd90
 DIST gix-odb-0.61.0.crate 54300 BLAKE2B 99e9255d900a8bd821ca7afc5786c3bdc752384b2c63b621c68b4388b094a50901ae2b83aa82fffce58c565c79eac7761ab806ba20f264fd301a73e863daec91 SHA512 b7d9ffd59af63b46ff2dc6615c4333cbf9e418ed9dafe5a85bdeb10f8a93ee2469257a7eb5a5e527cebda3bf721aa8e957eeb1ef1ac9214bdb160de482c6dab7
-DIST gix-pack-0.49.0.crate 96264 BLAKE2B 18ca8b0e1d9f1ff38dcace4b047a5c0432f39fe8eca1f822bd20f2f343b41dac1ee223fda2fa7c99f92b2f80a7a3a49067004954bf2bd2eb82285e92b30d32e4 SHA512 9cffae623b9c404b204f07c846f0bd435b4243bde49f92e33a3cde9cf932262c76aac9880ebbf99168163f5c7cadf8105c1f80edcb5b9e902bf022e9dac4ed7a
+DIST gix-odb-0.66.0.crate 56319 BLAKE2B ea576c9f5560ade09cadf1e17d296823e6713f5433c7e626a1a4407fd02c29b494331cbacb12e2c07f02d6579331ff1db2ad3ff15ac163e1a2652761e05e2947 SHA512 ea092c6f669ecbe21726d7fd0399135810e4dcb6f5646c19dac179f919c602a6a2d9a1f7fce17b10ae5ff58f5421e7965349a183278613347ca8c0368cedb40c
 DIST gix-pack-0.51.0.crate 96495 BLAKE2B b4ed7e194dc89a151f12c3de45492db923a0497d069bb326eb277100dc3a1954453b60b59eb9d16c601d902f73bef1254a4b63ba9e21c7599f0472f7575c9428 SHA512 18d3fe6e0f53d36fc85f8c5672f7e1202d7155f3d2511b034093252d4ca89ede3a0e5b4b9a5af63e9c6e11ba7d9b51712e9ca9cf932156cf67e37603149c30c0
-DIST gix-packetline-blocking-0.17.3.crate 20044 BLAKE2B 7e18c011b1890ec0fa8e757250ea5058b0ace5c4f9038e0fe12f2580632389bff3150ac60b3fa1a4b9db0b33ab9d18de48a5d5ac08521da88777a478084c631b SHA512 bbeba4fee83371b9a7b2cd14739b3674e1f6c7995063ee4055dd590877e172a0e002c8c9e8f6a1ae8da1aa3d31746df42fadd74fcbacac89b417bfab13b4db60
+DIST gix-pack-0.56.0.crate 97454 BLAKE2B 2a57d84a02c95faae740c29b4a87f86fc17255e57659ab794602ea4ab783c4eeabb898ef489a2660c0db50fd2baea222d2a2b85cd6226292d7d2d460e3b5eecd SHA512 23e23f19d7284eec66d21d5965c277e28a1e243a51b38f59971dd41046535524bf30cb743247681c06b23d202a9894e2068a4da31de5af3352845710179b6686
+DIST gix-packetline-0.18.2.crate 21148 BLAKE2B ccff09892d256ca930a8b589294a66eb13d922dd4ce7288440d1639b34b50c1a2b650105bf483b44d2bfa89edee3bbbd7953f5ad6301f9ba1e8325d1dc8cc0c1 SHA512 6a68f9af368f607218a4885d401e4f0bddbc65e5eb4e2addff32766d9ddf6ce804efb07bb67af48b60539787d979196cf426f8b4389aab4f99ceb79ee621fb1a
 DIST gix-packetline-blocking-0.17.4.crate 20176 BLAKE2B 706d03a20e6aaf40817f87df849882855a6995324744a8c389fa16b4f4d26bcefec6dd0e023b844566c78afb01cbe8777ad4dbc70796b7998bb25566127afc1b SHA512 6f072ab298eb0e8acaa2c8616b0141edd3a09480770a21c72958b75f09b6a98d19b1f994b0651a547a69e061c432a28e5c7d5579440d89ae57ffc8d9036be68b
+DIST gix-packetline-blocking-0.18.1.crate 20988 BLAKE2B 0a33e5dc05066847c2f1260a563c00db85754373e45f5fe43a9fb6307e689a10fc64717224cd62610e0de3a8f4a95dae526afd7a6819504c4ce79b3d8da565ac SHA512 b60c19caad254a47719c17df7ad204e370f771c81f6b3165f85dc9fee405fd252c4787c1d9afc61793eb86ce0184d3d0d7d91b651efc093e2ef4ea4c9d5024bf
+DIST gix-path-0.10.13.crate 22831 BLAKE2B 23d0d228000362771349cbad65804b2248de1b42e202ba26cbdce4bfb2087b25def13012069d163b273574a1734999928109bcc400afdcf2e2d89c87deec4886 SHA512 7bbe2ff099523869fb8c3d3522988919798ae2ae77188876ef1aa86f2ad484f15ab8f7563eacbee9787c88dd23695601982b9574474f9c1258be2a271c737dad
 DIST gix-path-0.10.7.crate 14406 BLAKE2B 4c1fa71116d42c75ac0a19c3b9580b20a64eb6c0a100532b97b5202194341600788d14c9d98d36ab22ca56c1279dfb0d61af3ff1fe18d39533b67ce93fc64a8f SHA512 f5aa7af04b98082a2e28545d024196ddfb2fcf0aef8aa3a051e4c9eb35f75217a1716f3323d86c484e522252efa25fea9970afcc1ca81767e886cf4509123c24
-DIST gix-pathspec-0.7.2.crate 18087 BLAKE2B c63a5df6f8ae758530cd40518c4b8c80235944cf5164ff94ce9688142e1dc3093a13d17e0e80237ae5554c85786d37f6379c8188f417c104776fa8019affa9ea SHA512 da67057e25154cb29129e98504cc08271b22c99635c4ca2a7bccfd16a00adc97cbfb8e7b80e655402e8bc241d160a0b2cf05202e6395de7bf5edd39c040744f3
 DIST gix-pathspec-0.7.5.crate 18145 BLAKE2B 0d206a6fb0de9895691aed9a76d63b12d4063a95f906e6cfaf1a297b0d6184da26526cb756c663f9c78a8fba2859f8b6e7aa96184cf4161eb382c58cea99ce3a SHA512 1231ee3f8621d1fe1d26e69fc86d835d9047e84a5f885cd6f716a74b69dae60624a51e7368337d2aa14c5d71529e996df7076243a960c06e62b649904c3d8c2c
+DIST gix-pathspec-0.8.1.crate 18854 BLAKE2B ea6d543152e6b908ce5eb901a8571bad3cea7815943d71e8a8a871d4f1b4bf34cf50e3e5089bd410a6ec590c745f53b8f0aeadbf0412e13c234f5172971d5529 SHA512 29d00955a5260c2460b6ffc0c2de6a618dd5954ed46730cce2f9923ade0dc1c47f1e64ef00fa918eeed3a85266d5676d85d051c25d447a580a18358c1db693e9
+DIST gix-protocol-0.47.0.crate 44961 BLAKE2B 68d8ab6ff855bfc8ed9e160be2b850d32728a482a73204174c21d89ef095dfd6677ca291b6a6df9f4033e761bcfe03f72a9a25b77212763e699c56835e1d2193 SHA512 e4d1288b4a31da830d35bb173483fd3357288b391fdae7422663cac090a49e6a92dcae96b3320afb5d1f9b8fd1bc82cb47d8c3464c3bd887135cb563a2e1bef7
 DIST gix-quote-0.4.12.crate 7055 BLAKE2B e3bbcc1bc1ec169a4d9b36b1fa23caf559bf70bef14a485c2652d59b4562c514457c14ee4d2178e0f564560c310e5d304af993c587d6d352d0d6906dde4e4bbf SHA512 904da737aca01dfda12453b3593410e9aa49b852b91a7d25298ca885be0922d9498fd622e36f0601de0fbc7b2706e73e79f8281e74417b3b7084dbcefaa3cbec
-DIST gix-ref-0.43.0.crate 55990 BLAKE2B 0286c019294065623ca0ada9de065e4b3f2d22621397ff103eb0b6bea5eef9aa97e356569762cd859fee70d4858c632b17f52c7f5f82e66ae666066f4e9aeb85 SHA512 b035a094f589e3e9a9ea0aea76856843d83948e7def921ff4dde4b9a3025c91ed53fdd4603ab89cc2de8cea2f5836c85cacd79d6f364bd3eab071279afd8ec0b
+DIST gix-quote-0.4.14.crate 7828 BLAKE2B cfae180c1fb14e2461453a7ffe83644673cfe99ee473d7788f3202cf68a36bf75ed6d08827d8e12ccaa9517bb6240d64bf63e68a19775b93ac21dd4578a669e9 SHA512 e88ce5f3c6712c3026336115f02628ba35aaff78e39b65ea4749a26851c22cd8ad3da859744559f9fd6d89cd54075b18b28868397d50b6be30048a6a80e5b8f9
 DIST gix-ref-0.44.0.crate 56722 BLAKE2B fd4c3a3360c9c0c55121f806b5466d1bf8c2bde1dbba632e72c771b7fcd96aedfa68a2c70c181793fed9066f2dfd46c6876b61953c090fe93ea4f4c5b0fa8b5a SHA512 bef93c5c6cbc664ad1e169baef97bf086904802e7ff3751d3bc4b37dff6fbfc8a0d3b6dd91a7a37cd47ea307c839a76e7dc3a11697d7c53efcff5e915fcd267d
+DIST gix-ref-0.49.1.crate 58105 BLAKE2B 2a5514d296d63451a21750c5156d0f2dd5ddd5ceb03aaae89f644c9c54d8e4eef348661c0c516db12675b502b894d5726e555b69790d1103c2dcde4e0c3fc68b SHA512 4554a81fc260e09f783463ec49f7b298fb38ef3db131ee6bb8fde02a23769e6510c324a1da68b3c26b4425833b57deadd9df24898f9435ff1b7e8adc765eac15
 DIST gix-refspec-0.23.0.crate 16129 BLAKE2B 36df095d841bf4eaa6c6ea700b493efb35c419fa7f4183a80634850c88f13f2e912cadd9a8aa3755a05efc3184a9cc071202bdaddf3db6803c44de5a3267d212 SHA512 d4649f1046bc8b3ca1a5f5729b515a7e9a442d24defd98b526f6b22c2f36cc73638ab7cd26aec234dcee72ab9621ef3f55fd3c009b2e02635d6b481a699247d3
-DIST gix-revision-0.27.0.crate 19138 BLAKE2B e0628502830ea9f69ff03151e605c760f6005f01e269b8de772604072d500c9343e412eaadbf5ee103f83f33b8473f2a25ebffef5b94f4cd1638a36c5dfadbfb SHA512 d3a581bc85688a6d802109048863987dc958db298eee3fe38104db1b0c2c66763d3931188662343bde8d590767e924c9ebfcbb07e58903cfee7ebcf343cfbbe2
+DIST gix-refspec-0.27.0.crate 16887 BLAKE2B 70661821ed339396c9822c71fefd368976c60bb0b44a0a92cfdaf2ecb7a81ea86007cba8b7fc8ae15b4e8595ad17b64494df7c203205b4fc4e3f259d07be2055 SHA512 6ce8515d40a159e1a69bbacece67fe86e1a5b41e4a7bbe3a4f772e91cf19bbf759a63ea4f39c102d7d26c76f590eb291c7228ec7b4dce84b5a859ac92523953b
 DIST gix-revision-0.27.1.crate 19171 BLAKE2B 0bd8504bcddd676e362efb981c8e392ec43d811bba1e90bdab0bbfe3a8c8630edf340541e157dad7cb8063b6701cd59db4b53baba63fed5c79ea4e4a8b85b654 SHA512 87ec40a4037da132819c08991f80e8376f0a9ee4b2d05b3019be40184d08c5e75b5888b8712bae915bf134951cfc897e8d29ad90839dd6ab8ef8fda7bdbb1eb4
-DIST gix-revwalk-0.13.0.crate 11797 BLAKE2B 70337d619571fc8e0897b5c95eec339cd535ed95dcd1abf0f3ec2d150b82dce6ab6d31b3d4ca1a197b0de1313dd7549a8b0b238fd10c25beac7a8947ed026ee8 SHA512 bc4d5f49ae63f6f037bdb01c2061481294fb2d7b0975a49f4bf21306df11bd7117110380e71f196ddc5d7d3e0c406e9e164c968b5e224352ba11286bd00e7b9d
+DIST gix-revision-0.31.1.crate 22665 BLAKE2B e6df6851dfe9a2cc50d6008b47712d5377fb2953ba80f86d2fa4808b5a2468e6f5502e5c4f5e32eea65cea8b8c9f936f1d5e34e0c3a7d20d6eb20b8942dcccd0 SHA512 78184de8151dc892b59aaed72ac0ff985601e60c40086a2b693ce03e8ebc990fb8d39f66f38ce952fb1caa928e71ea7caa2927f9a582e607455ef3fb4e5a95d4
 DIST gix-revwalk-0.13.1.crate 11851 BLAKE2B 10c5d9b27af9cccb77211ab7750ea4508c81ffed1cd62a19c49ab1fd124dd516cf5687940c17b92a21e1dad69c2e55936cd027c2e05fbf84e37630cfd590843f SHA512 a5672bde052c2528ccb253852b163a50ed6827c9cdae4834892d438c06bb176196683ddbc2e1c61c9c1d17baf7096b89b6bbca86c948b0024a182af66e25c631
+DIST gix-revwalk-0.17.0.crate 13323 BLAKE2B 8c83a8a0b27a889ffdfedad5a1705adcad8cf47259d99bc2e78da67b728f2d7c63a6da3347f18740c90e49dc04b2d2cf5af420988e98c7d69c9a7bf392c21a34 SHA512 f25491da946632fa1ea973c794aff88ec8edfa16a929e1453f8f009547c71299d829feeb1dcf4e5f7e3016f0380460030c5cf7f1422f004d65461d911d4ea99c
+DIST gix-sec-0.10.10.crate 10205 BLAKE2B ba1a7e2f955a54c6bb16fda361e4f7b59ac2ceaa044aaad09893d913e3520f4d40dcef62d457143280b3dfb76ccc24426badd38c4a0e19f35f2505dcbdfbc906 SHA512 0a5733e321e05ca0774518bdf2f171fcc8c63986269184a96ac9faf3d8b14b87c3cb31d731f80e84f098e7419f278d9dbd3b952fcf1150eb952e38e85d799189
 DIST gix-sec-0.10.6.crate 9356 BLAKE2B 1892b97a2755d3fe5736db392331c1822c3afcf573c22a67e849ccd7e8c32e01d526062f960fd193aa968317327a7b282c442de02e774b1a729f7e4ade3ea1be SHA512 92240898c2f90f371bbd3dcd3fe6a0e3e6c6e516ce943a531712f391e613445d256bb61d5ef132d9391d58d20a0771c3949008e74cf35404b5d41e69bf5cd9fa
+DIST gix-shallow-0.1.0.crate 7545 BLAKE2B 76761739708eb5e0dae211cbd10c7523dca2635a94a152c59e14cc3487ebfb2d2449775af510b7e0d64aa9b48dc1a05833f4bc64ae292bf5c414f49447aac183 SHA512 0f8c2fac75bf1082d51059d955e572aa5986a1a1ddad0430b707cb6f1a61d913284ae3c701aaafabc5de01b87fc55492d4e556cac3b504cb0e9f02f0996c8ca9
 DIST gix-status-0.10.0.crate 29475 BLAKE2B 4aa40322098fcf9bc8563965d36527a1d6f2e60531a957cd4ab90094a7d382454f3f2d8c034cad1005d2eba876824289e277adabf8d3e3dbff9f0327acd51b00 SHA512 aa5c3c65b36a7fc9e7e61463d5dd48d2f74ac4e1caaba93e3536b7419ed9c449d3046d7011bef3bea71eff4d80b24db6ef9e2559151420136b9bda86186b8c45
-DIST gix-submodule-0.10.0.crate 12089 BLAKE2B 85bfe9de3d51849b585af15e76e54e93bf94aacc3aa793c3556578021e8fccd99ae27ce0270062e3db5f1204ca6fffd25836d8fd46ec8bcf5f9c845e9500f99e SHA512 4540e2b7fdd0c2642be53f766efdc517adce57dc791e7955af6e20727d5a55780d1130184275579fa942f622f42c61aa6d6a503d8b1e318e524133361ee308b6
+DIST gix-status-0.16.0.crate 30873 BLAKE2B dfc057b5a358589b680c402d3d34ff5527e3247f6fa72fa7455163d065a62be81ad4e97fd8968702fb0a0956570b2d6b79ef440b42b3bdc9f2ea7715ab69221f SHA512 2a1dfd19cc3fb77a6d9b637d7746fec8f8036d55dae99438255ed6c661e282d21c405d2d6341c6c13bc6165b3774390c14f0c2246428eba3f212bdc092fa2e25
 DIST gix-submodule-0.11.0.crate 12137 BLAKE2B 514e51413aae2f44f5e1f3439396579a9de16f1d665bd46cf920a947118e1e421c60217e195166683f5aabe313e41e601483b50c57c6704b83f3a2b5a57cb1ca SHA512 2d2138a69af63b0541c285c376ab23f81644835b1be0dd3fdf1b83f28d63cd130ff4b96d4ce62ee437b692fc2ee57234c4ca4dc97f14b0f4c6962d8e0b146c6a
-DIST gix-tempfile-13.0.0.crate 17778 BLAKE2B 929126e3e73f73280af8e8272ae04f2e176dbf1d23931c58ed01ff9c789d7fabf9ca40bb8b202eaa9ebe2bde9d016005f3fde39c0d99f11c73b5e4b7a3f93301 SHA512 32dc76483612ecc75fa6009402bd0aeac909bfdfd4e26ec549165856c15b9a398ecc5bc634da5f17a8e97ce3b430853b067b321d78c51edb8c2a284356a89d0f
+DIST gix-submodule-0.16.0.crate 12832 BLAKE2B 119bbd226db08c4eddfe3a02f24efa05c4e598cbaa2223fbb07f2c97b14d529f44813d09ba6886a90262c97506adb496581f46cc9d11f49a5bb892b753c1979b SHA512 aaf05e64930cfe702f7e5315b3ddf8df29982c4dacc964f5c47c395f3494f2e94d0d7aad4d8fd1a13b8c76213b3d8e77bc40e8159f2ef77308c311be00f3db61
 DIST gix-tempfile-14.0.0.crate 17879 BLAKE2B 155684fb155b4ded036563cf06f3e0d04f5c3a6afa23bf52a62b8be90dbfb5b7b3b425c14bc9fca2e0d19612bab94aa72638ce0ea545ba9deb0f46eda68aa604 SHA512 52ca19d40c07a8f078d62a6aa70611f952dec2c9352bb01d5792cca987dc2725d8e718bc0dff2cdee4034eb4a0ae3a9db21ffb913369d97eecaaf8fc28582ec8
-DIST gix-trace-0.1.8.crate 9657 BLAKE2B 357dc34cebb04e7a190bb4d8c348ff535b313ba52dea952b3226af2206a2795b160547759beffa914372ce4e23b3dc5898e62f4266242a0f0eaa24462ae6a099 SHA512 2ab5ce97df70c0eac7cde8c2eb963659d22335f9de9874e61a9cb8491271e170cc014ed18e82ff2f63862ad55a273544b4debeb5687702477a8fb1c7d22c5291
+DIST gix-tempfile-15.0.0.crate 18426 BLAKE2B 11d5484b4593191f2579da85f20cd2dee4527e056a9f5dfb35873ea09476b1fcc0ecac821c75e99249938b4ede627d153aca6c1a43e31f46f605ce20265ecca1 SHA512 cc21ef833ee087e6b49fc74da11da3e4bca55fd808952e1283db11f97e38b2318044e1704e78dca2e4eae9e5b66eca039343d78bde7b4b5d4a417190c62c3ad2
+DIST gix-trace-0.1.11.crate 10424 BLAKE2B 3a8fd50adfa33200691d9bd4143906e78ecd0a6ab2aeab69f3b797f7c55f650032f99e7501247373acaea1da36d86cbfb5a9d0ac3cec0fb89c1c75b98f02881f SHA512 11c626d81d73d21a4cd5b0bbc6d60c839331ebcf3c83850e7acdcbe8968b87bbe5ac57290fc33a2477843a9dce07903a86c519987b68ab1c7dc474016ccabe14
 DIST gix-trace-0.1.9.crate 9659 BLAKE2B ce18f59e91f4fb33346869beb2b6f69721d8b374a3a6f583ff77f27b21126f359c812449ea5fff9da00f688bc59e1f32004564a49c2a179a33d4fc184b8ebd22 SHA512 bbff4a4ec60e639238ab0f2623bca6c56914eefa321c8f45ca37507faa431f15d743832facd026dd3a9e3d9aeaf21aa3dd6987284a1876e20000888243cfc0a9
-DIST gix-traverse-0.38.0.crate 12475 BLAKE2B ce7b69ac470c29fadb577f40897e49f2e1033cb9cbaef0bae880d7d3767b7320d79f115951c46862a5514637c81d49ec5d1814aaa65450bdd83574245ebb8aa8 SHA512 262d0da11a99e7c5b1d6e19ad276f3b171c9d5837b8bd6dea420731d47efcb9b4495ae3d02b59e4d97677e9240cb3baa26c9fad00838c837f96b28aae6c735da
+DIST gix-transport-0.44.0.crate 50856 BLAKE2B df16a043abe38db0e6d983f5376ad24ac604a9e3b39fe76133670147de08bf5b8790ac585d12439602c04fb22f356715767facde63fc568611fedccdf8fd712c SHA512 a4f990e44054d760773b8377b648fe2757bc30fc17193046049ec4f23b88f9e715678ec689f9db0627245b9daea83e29866f145bca7cece9e4c5b149748b9ffc
 DIST gix-traverse-0.39.1.crate 17286 BLAKE2B 538702f7831ad51aa5753400b2f09f9d5abce50525f3064276e8810e57704381daf20f6087e5cdee6e1a810cd6e05b374f70e91699bdc10c4d604471c1081559 SHA512 33e8fddd7888e465efac875166fea984287ace21e65cd51122652bb56c594937f4b717e850fa2324228ef23f6d7f73710493995a8e202cadd83406e0d457d096
-DIST gix-url-0.27.2.crate 13552 BLAKE2B 8e960eef64ea65042676bc3317ab5d4094d1a6b8f142800f94c5dd3147867c38430b20058a6a3c575aa16f7ee2a2189b9a8117e05b02b860f9d52c70eebd7ce5 SHA512 a8482c8d34ac1a0a6b1f7915d0e7f6249e5547e664334ef587b782e26c71c2cd7525b4638c8de80774a91c992e213beaea6ae15148273c257029820029df2c1e
+DIST gix-traverse-0.43.1.crate 18569 BLAKE2B f168f568e281d266d09e37a3a696e0f58898b28841840ad31a8a01c4ea2165f5b35a45e39def84a3dbfb4842ee280a27078176145188ad0a8273ac536056ebd6 SHA512 a1c9ec18788cce7ff2a93a3686dfd546bd83dea6abd0131509ecdf4bb643b62558b51f1deaa479a1ff86902dfd32ce80ee031f5fbe87e78ad119040308218402
 DIST gix-url-0.27.3.crate 14329 BLAKE2B 7f9dce2dc50e05eda35e6942d868ae0352393b4a758c6801a8977680a4f822258ed889a0223d8fbbf39ae7e054e0f95279127134d0df8e32d7798c4c15476ce7 SHA512 acdb1d68590be1f61543535a368d7ea7904d1830998c64cc9b4aeecaa4452b33adb93dbc815a39e0119b0f804fb47e2b67ce79ef38f19a2e8c6605118a600fe0
-DIST gix-utils-0.1.11.crate 9426 BLAKE2B 9f087b7f62f11b8eee291c3a45fe002ac4a884d9b43e1a295914a9b54e5e32250d3450ff4324c43d71596242ae1d110f7ec3f1b815d84656dc34d0cdcf6a200c SHA512 8335eedda865c4d0057ce01f65a07d23863803c80ce2ae3b656f3b8bb3a14b81977d30b88b34b883f58739bdfee9ab5b9e380577a4d9296259178cbfe1de824e
+DIST gix-url-0.28.2.crate 15297 BLAKE2B dad48c6e518a8a2bdba4ad665badb9935b352cfca7d1540c9f652e9ad450c556a0416056dd153e8f6a2e418845b6296b1a66881b0499aba8485e357a2a329534 SHA512 39b56a5636ec1a490bda88cbb7c0cdbeac2b6cec1f0b2ccafee7a58ecd3e412e61a14747a4176c09e25a666127e7a4bf8f3e9e4945f5af2715a5b9f52b8322bf
 DIST gix-utils-0.1.12.crate 9418 BLAKE2B bb51d3d56670350b9512f7ab8e0646a9390fe2da4b4e2888e312c4ee0a5c935d8e2540dab2883159d5bf164276cf29505914451b5761777fc5e770ff2fe403bf SHA512 5cd4a93a6080eca6e84a13f9e2d63c7c6215cc86c6662f1204fb8d6feafd94cdc6b0bb3b6343e24157b10edb9504d89fd479e707a4c7a017372f1f1530e6d672
-DIST gix-validate-0.8.4.crate 6960 BLAKE2B d827080de6f3980feea9198f1e6d87e866673bb040c7be31d2d29ed5bd68e42556dd6ad363a48399dd172fe5dd3de23654ca2c9438f76f3a905d734f8d611cbb SHA512 fc1db05c00f1259ad9c431d12c8eb0958be4ac003708b3423af2428a086627590fee57e942ce4259fbfd824c81a195e1ef77e33d1c4de7fdeef101b38ca88f5a
+DIST gix-utils-0.1.13.crate 10194 BLAKE2B f9cd4133cc98548d3b4d3c8b43f62f1b84a3725e5de1e3875c6a989e5d3b6fd7086329ba2bb034634414900980345958b0d91a94c87a703956877b9ff787728a SHA512 b30d983b14a7350b4d644a84afda108df34bfc94fdbdd643a68c9d8dbe7c2186de5f6d87e7b31277c24c38ab106508d8dd95a253e232f3356fb9c2ac8705688a
 DIST gix-validate-0.8.5.crate 10408 BLAKE2B 673f056b674e93fac90e996b7f0e63c419d18eb345587b3f1cb1c1744ee9596e4e6b0540db980f55dff6519fdb94f21d67b4ae6c579159893dc672cc9d500219 SHA512 4e9bc069785d23612b93dadd6a39cf29344ab9526bb31fcd980a6b52a85288cdbeae47adbb8a52bc1615073f696512d5faea9ed7512ddf6345c5fa0aa21913b4
-DIST gix-worktree-0.32.0.crate 16320 BLAKE2B 7469e31447ab02b56e2dbe09a4f94d6f43ab154a7dceeeffe80d931e75bfec13fa5357b2c73ebfc01f81af24f6b46e099675b26d5cef0e01a35f9940fceef2b8 SHA512 5fb4c4109ae760cd3098d78cb64e178b1095ca1eb2a759d1cc759d2d920d8d6b1d25dd8947771faf77e76e571312947503b1e99bdb40d946981ca6140a75b8f9
+DIST gix-validate-0.9.2.crate 11923 BLAKE2B 5f49496903a0ac439a6cbbab0593eea90ed52299800b2b272d699badfda4e42ebd7d73c618901ed060ac299acda40a63d598e0bf0b53138e3ca80df1b99f576b SHA512 8c79cae368e7cb4e3354b4639fd829418ca8b3ea4731c382f367c23c1ea341be0da29b9dd324fb11dee39827da0439a6623440bbe59dcde2209f1e17165e019c
 DIST gix-worktree-0.34.0.crate 16821 BLAKE2B 8f4d21f55b7e9f03904398ac7779cd08e46fe76ab7a8feeffe6fb21ebefa19e89c7e160102af77008d971b6a0036df2119e64f8526290bf651e06b7533041049 SHA512 c31614ca512fc3667fd1f150d6f6bcc3c224cb482cec3c6c74a987a72fd7f17656b60b3c323aa069e6f99b081e2164a881302e612e36e47771e9a27349c36c4d
+DIST gix-worktree-0.38.0.crate 17557 BLAKE2B 0f5a6a7c7bd7d46374adb2d7617db44ef4b56df9c7b4dc76509a85f6126f217b8f274c5a3b54816d5e8bd3dd7bc5d9e2d0e2505072d72fceb6e91706c7deb660 SHA512 d16c3bd0189181ea137ec569fc4552f3e97d7d1e48299c6d9f1c9809750baaa2788d4dfce76db4acf5e51929df44730bf6047fb0dbe879bc77dfb0e08405ad96
 DIST globset-0.4.14.crate 25090 BLAKE2B 2c3e6f8384a066ebfa1f36bf03125b5eae79329255674e32c58963451d4b342ada10f17524232a953bee133b3c77b678a141543759ebc622b5fd659fe55622ae SHA512 e83e4f5e42a97609e2579b09f49c2cb0a76a94e7e2975c5871f2c5af5d3b809736e0a7b220404c582f4a0c7eebdbfad6cb432e89b26401b58f2b253f8c0151bc
+DIST globset-0.4.15.crate 25177 BLAKE2B 5556f4cd7c311b2ead3a83fb2c84280a48e493f024bfd7269c91cde6ab81315d2d7f051f7cee9d7d34e6c8563c2452f0ec04a9d5a8ba5273bce66f5ff8f9054b SHA512 b9281b8bf48d2e297be533aa31c701c0115978b4e580b684b78a385eb2ecb4125187605368a6858311d6cdf5caae7d733cf1406c79241b7d19e7193f5a111dad
 DIST grep-matcher-0.1.7.crate 15609 BLAKE2B 3899303670eccd6a4dd6f6582358f94bc204e8977fa18646b83f4d034575c7ec5fa56a77169f8a7f519b87b960f191de4d756b99b4ec419fc727878069a2a90b SHA512 bc15eec0b6f409926099f2aa46f040c8de240e50537358a50d12ce7cfaff4894ec43910d2e01ec087c2c0777773ef25e2f0d653c33a59c5162e23e85e76ec9f8
 DIST grep-regex-0.1.12.crate 27844 BLAKE2B 0eba374ac05c22fb4fc2a2ccc20019fbdf61e1f94f36c867c40fe7838f3049c845aff938d1ab4e3cb34d35ffef65f841222f927354bdf23cf198de2c0e610169 SHA512 95df80807aa14cdbefa4d8d8cb8fd91263fe26009ba3ecb4a30acff1332bd51b87c94935a489405c6bf98e76126a5a06cfe7f5b677001da4e18c18375c00f142
+DIST grep-regex-0.1.13.crate 28030 BLAKE2B 68e78569c78a0dfbe4c05a9978b275c126c4861024f59e208ae25c4e51e35373f58bd34b79dfa330a95c549f15a7ec8365e4a2ec14a43e42bb5e2a972d9a45d9 SHA512 92854c5c99c4d2b9b1b1f9d8783fdad3dd2d33ec61713056309eca78817791d604a671e25c64802504dc87931edc9be2a2e881794d3425d162968b64d9cf762d
 DIST grep-searcher-0.1.13.crate 45303 BLAKE2B bacd658e73323c83edb10d260bfdb0ff4eb6da82b291a99fea0db65cf2fee699e8b5ca44eab04805d4137f5ff1f09fe97c19b352ff98117834a1dfdff8ab281e SHA512 8e7ecbcbe09f5a57fad71e0010d2cc29f3b622bf6ff80cd2d75a8898b43ec7ca43a1d8efb4921032f865a81c38176c694faf6627cc747350a31510bef662cf9f
+DIST grep-searcher-0.1.14.crate 45073 BLAKE2B 351ef9d31b9db3eb8e9442b774366fed0c9bfa00aa108a563dacec64f558e311dba7f3d1e68a3a4b3b67353b1217ae97568d3c7649a3c9eaed92f72942f07fb4 SHA512 d98d0cbb4d1f8e209c53205ab627a919381bd83e867ffcd54345ed17e858f243295e27de7557d3ef6ce9cb36c387c1d26a436df37bf08b050730bee2e9498366
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
-DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356
 DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
-DIST helix-24.03.tar.xz 133067920 BLAKE2B c033892e4a4d0e5f03c100e74c251d37af01c94deb67a683ebbe7e4de67c773d8de0348fb16b51752af65747cf365941f0f040dafd85f355d6a5fcd067ab6b7e SHA512 0954d0a85dae36a987b3ddddd8599fe9607eb29b77bc965730dbf8394ba6aa2c70c6180decac2302a2b53517eefebc9903b103c8c441e6e4d1d75be53b5b3558
 DIST helix-24.07.tar.xz 142746572 BLAKE2B 0214fb8fd07b83ba45d90a22bf232ddaaf20e17be5914e86946cafcfd391ac5ecaa6042c558d3c74a3f41f670572ac4925ec24a5acee3f57fdf60d18536a8967 SHA512 fa64e046d165cf1fa6c5e4a6ac37ea43d3829193e178e46d604efa2b11e4bf0fbe8b6526853936c952deba26e1781dad39f3d48b168c564c205d5df3629843ca
+DIST helix-25.01.tar.xz 150345008 BLAKE2B 64eba3a25c133d65a1fab90f2ab9e361e6fe0e0d6ec22b914f46200b2b1e9a5b36c5d61139f29a5944feb77541d50ed2f31064583a3d1ea3daaa9566a513881b SHA512 50eb80f08e9720ce6a54da8877f8dcc0d7a41289e2ba11cbe3b5b322d29d6f6ffba934816ae85fe10e9a5ec088d0545bb53dc4a313536dc8d62c097114e70b03
 DIST hermit-abi-0.2.6.crate 13027 BLAKE2B 4df5306639511a5f69594e903f8ce62482cbbfbfe272a91a12f407483dbac4e87c2d7e5668cc06ca5c0fc149ca93a3152fe6ad4bb3b96cacf56a22cb635e5b7f SHA512 bad8442bb822a9c99f6536db16523c80f5139af6a139bcc359c03725c59ff935816e2ecc5c491dc362ac75ab2dff41ab1e9dd29431f5e9a109b60eb9b7a8dc28
+DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
 DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
 DIST iana-time-zone-0.1.56.crate 19517 BLAKE2B 88a83a65b2e17afff6491953c1ec508168e3cb0d720992c7958aa98ffec263d3b32f4ad07664703b1e429d96faa211a50c557d5a1398a849c45ab9df796f8e4c SHA512 d1bc3ccc17c6d3abc44f8662a15b5c84f5381f90dceb5e14a826595706178ba0f8cbf7cfa86d3b7e967a51ef75a27cb868fda7a3531be9bd6e77e813580131e8
+DIST iana-time-zone-0.1.60.crate 27074 BLAKE2B 6f534056e220e2f721fc7c7f3ed24152eea7f07d1f4cb3609ca734ade32a2d6b18fd0164ed831170cdff192cbe48653b2c4eb0903fb6f157292b3b5bf47299bb SHA512 5619b994d3277f56e65322a7903e4c5e03928a87bdb72831cbef88788aaf5573b8460abc0a4d5488c5df7052bb978531d973dd66002b0ec4a3af468928c9b722
 DIST iana-time-zone-haiku-0.1.1.crate 7200 BLAKE2B 9e748694423cadd6edebc1daef2aa4126904f5597202874d68066a15580cade77f48f1e6f2a77e17c7de0fae5204ef1262ad5b6f30bd95f4faec77748aa2ae0a SHA512 daa7570aaf5a07c990b07fdc2153b63d947598ed35aa9c35c4773772a6c67997143b120a18ff4c7c13474d296e81a92975ebf5b9aa9d204c1820e9629cb2e369
+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 ignore-0.4.22.crate 55462 BLAKE2B a9a29e5286c9a9c132f2fa319226bfa85c9555150afd18e34bd3b37915250842c46f6079208dce75674fef448450dfd23242858ee2e4e2bdb7eb65f89d689d0c SHA512 9647a4887258dd970c87798dee32a16c1cda75ce3e352829f78d97e1b786d67f74d89b2fd76d48a607fe795213965c04c9dfb47713f8fa80561f87ac465956d9
-DIST imara-diff-0.1.5.crate 154821 BLAKE2B 5be6954d53e1787e6c88b23c7cbc8848f92aa7892a4590fa7d55269550dd7e0a355ea13ff646abb4f91467ef4fca12e74da60958181ff0c6800d9965f6a536d6 SHA512 9c8254012958869cb4845f76d34849b140dd1604d14dc9822f969ffd66c32a94ae6151a1b11052817e1ef60fb94ec52ac9bd0a122b5a1e6a994952445e4d869e
+DIST ignore-0.4.23.crate 55901 BLAKE2B 8c5138e723cbccffe84aa215b2e73daa18d8b2d39136a901ba1514def3a67437f79d932e4762578dd1b28dd8360a397aaba29ab8bb67a93a587a1c71cf5d1aa1 SHA512 ae354b00994ae8570751bc5c09167edd0e2891709d4c4878cf75b24619421d23a1b83e28886d54ed9d31aa427f49153e9a5fc42b5de7262abda20c1c0061b299
 DIST imara-diff-0.1.6.crate 155605 BLAKE2B cd6c7d8647d53d2732fd67741869e04422ba1dfe86158ea37003d68d7816e48cd19ff25ac9d30136045ff44849360f929d535ee8ca173fa495e439e56bb9ab59 SHA512 aca5c7a1766a1414626780b70a9e9e9274b6a969afe3eb61af8c54ba98db147b1b9a8a24d7937287af98ef02954c8e574c70c9c4894a3d42752dca73160efc2e
+DIST imara-diff-0.1.7.crate 155688 BLAKE2B 13dd1ee85099d51a858e936e1509969ab81d597c69f58eda9f5d6724c9cf3ce9c0de834d697501ee0632f2fa64c845ff612380eee0bb1c2066cd45603559d622 SHA512 7a728321bdad9341f7d2f8ba0f812bf5212a8bcefe55898c974e59d40fd8add084e132be9c4144d07f954519340a00d1c881a039928114271044ce7bd3174d11
 DIST indexmap-2.0.0.crate 64038 BLAKE2B e7a1b2bbd790f1446f77262b5b0799c2a816a01295a9a4db66f10e6c0502f8970982fb808581472e840cc34dc70e7938b89408799ed0d91aa50d3dd0b4807995 SHA512 59bc19653436389e1408e21b0933e5ca6f9fe228f0f5fbe9a7e4fb461b9712ba82983cbf22c0581eaf7913298b9ef5842702946152b493c1dc651381d6bce1a3
+DIST indexmap-2.5.0.crate 85919 BLAKE2B 766da0a2ddc406e3fb1a70a0bee00141045ff72b52cc412adf05972ccef59d416f502c429dada111461cb522a5c442087e01d8fb235c2f1fd5493adea00e79dc SHA512 c4627d43b1bc5c5fd64861d1a7ed66255ec3f790367028b2758a40751286d6677da7170cfb04dd88ca4c2d163df621583d2e0dc4e9db6d7ed9bd0cbea42b1729
 DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f
 DIST is-docker-0.2.0.crate 2664 BLAKE2B 6c3b10a805bb077b9d0c54155fb9e72a15304fb3d6f0ebfc3efea8b42e02b99737d22c16a5352ee0c1f820699f765673bf0ca8f46c6a49b45796796c01015b84 SHA512 759e00292710b685954df031ef96bb650993cc3384cf03760ebaec377524cadc929c6561dde5fd3e14d71f9f122c86495dcf9893d1216d99055048542123ff06
 DIST is-wsl-0.4.0.crate 3264 BLAKE2B bb9842ea007d5ff132c77b719c877c370eb5cdf63aebea8f3165ab49fbf6c68d624a3809de2b374cc4c6c86dfd0fb23b9dc32c2e7cc5f2378b2efc918dd710c5 SHA512 69ffd419eb4de2e50ef4e61efca76ec4547216957d5422ac7b2bde85264080c2f522714aa40b5a6566c25eaf791d12ec0df09afe3060cc43087d18510f33d049
+DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST itoa-1.0.6.crate 10410 BLAKE2B 8b1dc9ae9d55a006bb2abe3b0282e5e77397814b692a87b9becdc2bb74deabf5db09e3d5a2f604964cbff046148025988a5d916480e0402b2b80646fbed32875 SHA512 e1fb82fe16e1248141d48de9e05e7abed0c6fef58f2ff8b77b52aca5f16f3600c46707ff4c7a0f0307047610f29775bda74948d6d1efceb74b37cdd22e1fcf31
+DIST jiff-0.1.13.crate 604330 BLAKE2B b49600f8fde014e6705cb792075b1492c816107161af5d74577de5c9f95db4362d2e8e4493969852c665da5dd72de9c05d42e81cd5ed2869a7245997b14a827b SHA512 70025484872505d2ea50e59c463343280cf2ef5041a1a166f499802022d8ebd1f7ad2fc6ed569688a7bea097988941f21ccb1bae690c3924a6828381fe05c35d
+DIST jiff-tzdb-0.1.1.crate 82030 BLAKE2B 2d1b7931608ceb547962987f7f7abbe4d0eb90bc1c3d62c8dabe7f0836126ca58044a459d55e5dc51899f118b4c17cb08b8dc48f49b6a95c468446918c941fad SHA512 97717db33d0a1399e69077ff4c41af06abeeadbd3dde60ba8dbd649413f6f14c35248cb93ed166a4d5ce7c5133c6ae9aaec9d9ec19d7b25f3272c76c6f1596cf
+DIST jiff-tzdb-platform-0.1.1.crate 2945 BLAKE2B 848926e0a950c7667779242e31773a8972643999a12576cb7debea7bf7f08860a3df1d77f800ad074f32308ab8a3382d402f330551f27acd90c70c7c68785cae SHA512 2a9f58e5318665cfb9864232dc9dd28bc816a27e48d06578bf44e41ee99524efde6471ef6268b99383caeabb2c8bf37f69f6c6b126d35fbc3ba9944aa6777f2d
 DIST js-sys-0.3.61.crate 80158 BLAKE2B 07980db627a1f4f385586ad0609b5daf30d590931d2ca0c123f2d84f6c97be0ea935aaae3ccd082440c7e7da1adb4eccfd054a3598d99351fafdfa748f567b5b SHA512 f97bb546af2111fe072a23cbdc71e4fbfd39fbfc6be37132b306853d5737175d4c9c0c4661096012f7fce3612f81509e62a97df8bcb21d7cc796a8084e5b2e16
+DIST js-sys-0.3.70.crate 53863 BLAKE2B 15e75a94a2b7c77ff18847f98f76a1442b6e5f66960f3375534440c382a255e6b16ba3cb8c5345365d2195f7598564bf856755988f1288eb1b0b964e26446e21 SHA512 5dff8e790447a475b3c0a7068f0bdf1cced5fb8be2d66c92cb6f6c799f9d807f9d3c498e4f42c67e16d83dd4bb3be70472ece20fc42c3a8c8d57615ac8d398d7
 DIST kstring-2.0.0.crate 22063 BLAKE2B 71e58489a167d57326ce974c8e05dd4d2e18f7fa142249aea86594b56b83d566e14fdd79b7202a20ca9dc9e0911f7f873454925fed642d51241e6fc920775831 SHA512 17cf8f86f0a1df9de75ded552c4bfb9f7f0567802c83c0a8fa71625aa33cc537b498c3a247716a7b91b01c609a3722233d6316322210aa44850fd564ca16f624
-DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
+DIST kstring-2.0.2.crate 23044 BLAKE2B d61488bb67b0fbca7f655415b6147dfe003d6df9f746a836c4a29797af2627b2480fa0d4832a8121a04eb23d8623dbe37621a000661a45afc92013e04ac76dec SHA512 b0af4555a20ec30ea4ed03c2bed77b403446ec2dc5eac8064a9629b10f6e961f428d6be65ca1c107a19bee942930fbc08522647401106167feb4856eeb03bdea
 DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
-DIST libloading-0.8.3.crate 28480 BLAKE2B b8588be0e7034e94c808490adb8ee6e81c29e962aec436a0d8f8c7617b3ba9177887ce59b95b2f0af00ab030bc77b73e0a889d8a77b84deb437245211a969c94 SHA512 af8fa5fe2428fa98177d6adfc01bcd6e701b0d77ac18c95b8b8d5abb3a6376f16241ccc71b9fe100782c73c843ca53c9bad465545d8bb7def52320dad0eecef9
+DIST libc-0.2.169.crate 757901 BLAKE2B 1012cf93d8975aa20fc3f2332e253426ff66be6aed63ace5292cc8568ee419b0f1a4b5b39ddbb78d9c2dfd8d72eb0d068c98faa229ab55556da5e674429f0e97 SHA512 c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce
 DIST libloading-0.8.4.crate 28636 BLAKE2B 5961c69ce15cf2bfb4ad743ead808374f5a7a9d98ad5585d895fa4654b1c31309d968eb3f5d63e7dd5fa95b77ea59c80e666ab0e467849c858a807cc3a68ffb2 SHA512 670d82fde2ddbfcc28efaf7736d799690e4fe4b7872d95854b9c4320d64f45d4b33c0e1917228302a7625f2e5e55e5ad56e113ee8e67d59fb384b7054a0cc849
+DIST libloading-0.8.6.crate 28922 BLAKE2B cd9d7c2652bc4b0220e1c29cbfbca41f44d12d76c4dab3d025c21e5d317407ab656a88add0db95f1086934a424f55b4b413f33cb2a52cdcadde7641f9c5b3fc3 SHA512 f49ab79244d4b54c2f181bd9d7506fe5df9824a09446924dc429636e08ed7bcd6f5d2afaf8a0c862982e2c2c5832370b118266d36f36bc7b7522668bd598fc81
+DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
 DIST link-cplusplus-1.0.8.crate 7674 BLAKE2B cbb93184d9deadd4912f6e03dfb7bb9d37f01b6d8d47dc9744724c848f297adb9cafb1599c2bbaffbff336f883e9a24c3cb4f11745ec4716a9a2c8cfa05f6305 SHA512 690afe063eb9726faa03443bfd01789a559aa10ded4bb3714ef7b13095005c817ad019fcc62b5f7b286c974a81e387ca3342d238e60ed7ab237c3628383a661e
 DIST linux-raw-sys-0.4.12.crate 1465800 BLAKE2B 2f70a344c427093fd55732b68239f771cf6563edfe2db4b2f50cdbc904dfc7565b30bf06454b91482eaeea787b9cd4214979665bfa32f3c1c586551333cf4d2e SHA512 d9564d02d5f41356478066592e438629adb3275df0e5a1a44030cc99bf8856b8af64f18f27371f84122a828b34712aae16495a1a16050fbdbece6d95e9cdace9
+DIST linux-raw-sys-0.4.14.crate 1826665 BLAKE2B 804af73daf396bb20da14f831f26ce06325181de14f0c277350bd22d21789f2bdd663a964cc0e7c5cbd2e084285d02a401a6bfbb3e8a8f079c120f9488b56f99 SHA512 28149660bd975ede05624af3582d5c78f498239f5d89713c2c32f5372fc16f4ca024dec35f81ea973a2cf986098890395dbda06ac6cf4ee29df3f9a0e11eaea7
+DIST litemap-0.7.3.crate 28728 BLAKE2B 00a04ca0e4e774b317218ab990da4c6ca1f342bbf229957db51801f8ec36339b665133bfe3847ca68a40d901d78d87e0041e09f0740898ac38ea3c8504309c31 SHA512 2c3bc6c4cbf6609f3cc2d986e701d23b73f5bac55995887c90aed01bf4392a42c718a69c0050296fa635a46f7cc9ef3dd6c6a2a505d3cccc690899aa345455a8
+DIST lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe884dd69c61c54dec978733b95a853c3e5af26f237e48ebb4ee9dbebfce0f6c06067f74a3d122e92f5ace40e22d7 SHA512 525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
-DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
 DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
 DIST lsp-types-0.95.1.crate 68324 BLAKE2B 3275136692d7d722d1adfaf7f051534ffc04a10d70cef470820cf15bbb6c6feb56636ae536ef28b0997611efc235c345004752bbbf10f1bbbc57d61642cd3adb SHA512 5358645b22a4e43cfd227c2266333a019bf9ac4b4e3d42d0bbdfbeaa25a6f02c405cae89a0caed719103ed87c4e68ee270f13a43f614008e753ad69ad6f34414
+DIST maybe-async-0.2.10.crate 22107 BLAKE2B 2b8bea636cc271574bad08313b86d5b3a2163199addb0b6320630655a8b238d811db302f1c9c7168bed5963f0b55a90554627c48f59ec2ccfd5674303b1cb344 SHA512 c41fc42385a47706167fa9c51fbd2e4dac74683c362d66f71705de4125dd639a518207a2ae4cc3e5f913279ea205d260b0ed3fe2edbce68f27ddaa9e9989e59b
 DIST memchr-2.6.3.crate 94377 BLAKE2B 5f1603397d6703ddd9a1e68429cb6e9dae9021e14692c1e084f3b5c82d36645a1fa930c7a76b97df8e1919402fa7e1c621969ce85ce20c82b3087104afe18f25 SHA512 8d5e1425ea702a0950c95271dfd2e81610731496f77af0d683536b074a22922a7d7ec6da41577487d1d658e3b27257b7d1e142761b523e68760a2f5f24f049bc
+DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST memmap2-0.9.0.crate 31529 BLAKE2B 555a4160470a4f71ae3f72a8dc1de963b7df89ba83d0a50438a27a6df0d875c4fb1ce6454883b24cce3a8e8ec77b663eace08fd9d531b3c4af7393e71831e0dc SHA512 f46dcb4159fce188bb247a568ca3d86488c379bc18c8c24ce5cac5c34963f9da39af9dc9436c3d741ad364bc3b9d6d6a65b2c724aca3e6caea921127ac807e93
+DIST memmap2-0.9.4.crate 32752 BLAKE2B 1b21af908061e6fe09484ce5f84d31ed1751301dffb6439512b38c53f9f090cef7541b591b968d0207c6d8351ee4d5949007caef7832ce130ffda1b3716b5454 SHA512 8bba078dba73253e8ee88f0bd2202dcd2afd0b7b800d08af8af593b882cb4acff7e297a3f299e253f5adf103893fc390dcd73e882a2e7d93ca96099fc2eace4a
 DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
 DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c
+DIST miniz_oxide-0.7.4.crate 56119 BLAKE2B 68facfec9ff405bebe99f52bcf3aac6788f1b5eef313ca393e2a15e1158bf294003cbe31efea4c793e644e8ab4e00ef67d38f7d32849ab6f01a8e19d31c30221 SHA512 482bf02d7bfd25bd8abe5e5959132677202d8c5dc014b9b0b64fbdc204be1b8431867095c140a1183dd1ca59f6ba871a355422fbd148ce34d62960cad2b7a978
+DIST miniz_oxide-0.8.0.crate 56343 BLAKE2B e4abcacab4c8698d0489faca8556faa7bff53d272ea0c80e2e7843dc0f6f9229b7d5b0a17ae210344722a379853e7f14212505ee05da4e60549081cf77717c1b SHA512 044b641ce6d98d1968c1ee0906f91963f9f524d6f3fdf3059708177a759e1d498c63e595d3a3f0f9f3210c45c828b9b70274134ba078b899d7fefc2bbddbeee6
 DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
+DIST mio-1.0.2.crate 102777 BLAKE2B 9b87abd99269c62e48c6be4fa197d2b12527b672c435d5f1f623f986c60ed391597dbde7d5b73a624a4df0eeaf9c9cedcd56cfd7ce4239757d59e67e9892c59f SHA512 77eae1170a318d4a53550dda3462ae070d25656cda51db4cb2dbcb28210802f9b7e279900e6d6eba68314a0c814c90eb4af7acc561f611535cb364f75ad4e317
 DIST nucleo-0.2.1.crate 34742 BLAKE2B e84952894f2dfd5bacef1ca6a5c9be7aaee5a3a14836dad81cb4fa866da7c8578f9e27445676c32360b2797a796d4ddd6d07370c076438918987cdac221b8423 SHA512 8f094375f07105b4ab1040c47c6e8f43538cd0fc6bf6b42fda6f79870db1b36b64048695644494adef8664c87825eb519ca503af0584887023cf771a8eb9234f
+DIST nucleo-0.5.0.crate 35547 BLAKE2B a674d7b6633423c835c5fecfa31ab8bf754e3f49e39166442d0b5f74e9c3ae86069c8dc03195cb2ea74040c7d2e807a553a113a8f9c4e73955f06404bf225f7b SHA512 85d7d4c8dba5974caa9ba86a1ea08c4a81cbfd4268e1ee2e1754858ded2b43b8e71e51a2c259f49cabda0e549986ffc0918132fee1c79c8d83676aa3f4a27fca
 DIST nucleo-matcher-0.2.0.crate 44472 BLAKE2B e16f19f6004e493a554db16bdf0a71dac29be543ef630a49a3195a2896949662f334512d78cf316ab46f7546ae8bb62501d98ebed857bcff5013b053cb4723e2 SHA512 d2c685201e9235bcdfd55b3b49f627e48fcd461890e2ffc59d0fb958a05cd6440e44faec705e18e8c76bf0e4c0a16ec1cedfedc023235fbbb3a599b88900140b
+DIST nucleo-matcher-0.3.1.crate 50501 BLAKE2B 543d735117ea073ac8519017d56eeac51291a69a424177ae9361d6a9bb57851192b25291351c59c1f5dd4fe512171c414b29e011174533bf0fcfd6c99520f363 SHA512 16d7b5386950bfff1a491c45b1f5da5c840e6405c340704cb8c600766b7c1b77e0229ce11166f8975ab41b74480f68c38b3bd593bc53614b2e1226c78b36e651
 DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100
 DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
+DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956
 DIST num_cpus-1.15.0.crate 15680 BLAKE2B a4d98b29ad534de9bc262f58f615ec06bde5d5a2f5252f09b5a0a6ecb06a9daf9709ad9045eb08f7cb744d8a838854b9095aa73918e06624a84efbc11a9a5c1d SHA512 fd4772868def9460a6ee17ef6fc00b0bc74115eec891bb3fdb07ba5b5fe4057a2ac69eb31ba8beddbd3189c7be4545888e5724879f3a89132fbc9b32aa7bb10f
+DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
 DIST num_threads-0.1.6.crate 7334 BLAKE2B 416efdf395b0299b6b01e1508823afdda08cf67ca54e1d644fc5accbb0490945a492a34bc5ba70c3e838e6405d17ddce164ef87468bd9da27097de8994ad9577 SHA512 b2d9897e29e59353379b6372a629fc7f9afc89f777b4410eaeac7b4729527948a8dbecb175f056899f9076693ef855cc0d40e725cc54f28af588fbac5f7ce3b6
 DIST object-0.31.1.crate 272843 BLAKE2B 1f2e8ce0bfc2f428889df856bf8fcefcdc754d5c9a934a65b65903ed10c143daa1408e97a1f190996ea451541d215d4e4d7a53c5d2c8d9a6c9ffe4ac6513a56c SHA512 e9cc2eb5ba516e4a08cf3fd5f496d05bc74ddbf1846d6b6ad6fd25a689aa315652fc5710be6bc68fdd678673b7ec8d63b4ce999f1fcfd5b281154bc25a915e9c
+DIST object-0.36.4.crate 325802 BLAKE2B 1eb4fbe0cb2882a5371947234b4421b224c40a61cf71b994ee53074d70e010ee9b30638290ae89e14a9c6e1e339001852dbfedd4d740c642415c58327d121a76 SHA512 b929b3ad9ca32a5830a2ba103e6e14419b145c324b834b453d53f3cbfb5181246b2628baf5fc668c449f5337411d374b56abdd4d1dc4a744f65aaaab284bf77c
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
-DIST open-5.1.2.crate 23336 BLAKE2B 1ef8cfd66073be63f6d9c71d68e2f4cf79c70d70b533a92a67f88aab0411ac35423832edca34c110136ac5cc9bac56a5145aae4a89a375b51fb4e06e26bf4f7a SHA512 bd2aa675f7eb25362179354735a3c03856697af1dcbef1383e425196c77080be829b8ffc0edc4d343172ad2876e169764944b2b76a8ed32cf7f66ccb7590c933
+DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
 DIST open-5.2.0.crate 24499 BLAKE2B 665555faa4df744ee1b1e15b64daedc47f0229918a455134850341c25ee3ca946db6e79bd27cd02f38c9440c6a50eef1f743c6ced934c2d3a876d889e30986d3 SHA512 b28cca080565cf345df8f18b22261f5472961fba4f3f0420c924a1eb5ad039571df1fa251fa3dcd8e3ec1b4bc8259655e1f87e1498461a34cbf876151c16633e
-DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
+DIST open-5.3.1.crate 25229 BLAKE2B 243687469294fcc62cedde17b3d07f727a77c57342f30696e8b042976a5e656aab06ef7270094d0c4bd1dbbc55ab48564f2ed0a09680a6b210ec4013575615f9 SHA512 29dfc068f51f3742e1424400a22c234402267f321876d8f34a5942da767e6e119e6e64d5a0001ff012d03bb5ed4dc369dc7e64ebca800200ab9fcb368061b08e
 DIST parking_lot-0.12.3.crate 41860 BLAKE2B d1899a1132035aaea3a784290cf4951ea3b36b2018d407e27d333b2a2ce3820e040d635009c44cb6e58ad07cec6565c0347af6f6fb02954eac2d4c348bb036f0 SHA512 368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703
+DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389
 DIST parking_lot_core-0.9.7.crate 32412 BLAKE2B fec3ed2cf28e6d5090aae6a7c0ad583acf3ce6e54e881b78a9cb6721ca1e7040d46c044d405852728e74baff6ff1feaee7a89a64c69d20531f29942dfaafcc72 SHA512 1f232f1a87ba9377621244ba49378663f3113da7192a399fdb70be971ff5e5ca0d0601e1210a3fd8ab75ef464dc8505e719f81902e3448cce5e7848ef4bdbef0
 DIST pathdiff-0.2.1.crate 7142 BLAKE2B 7f9a162c2add4acd69a81171fdb31aa9a67beb4e1be0fe93d76dc46b320729257240fca5d65dee38901f6b6ed1e536e3fff09c93cf3482859e6ba27e7206fc5b SHA512 a646f271ce81d5f6d4a8e0d98a2c802a8796a961cf8fe8177911e7757bdaecd8b156ff22046f1663a9efcd5fef1e6f000e5509d3949dbaeb494126b7e8a546b7
 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
 DIST pin-project-lite-0.2.12.crate 29073 BLAKE2B ab66a6dad606804eb6121fac25bfbca3ad00e8d80af2e7d1ab38add91c3f76761fd1864f0fb184cb305cd216cc92e81c2f73f0cd2e6f210ede3bde4cbdeff77c SHA512 9d2eb190169819fadece7fcf33d006863ebe2c298066ad97d97ba96ced6229892b4087ec1f364d5c6150cc80b0ded8f431d9d4285adceb5fc9ae1da8e1a6d82e
+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 portable-atomic-1.7.0.crate 145385 BLAKE2B 7d9622d636677e3adae0f909405090318a9d6189fc18683ed21074e9360f213b44c5213f3561e3dd1f642547c2c2e6682b9e1efa63243c1f12636bb11bd15dbe SHA512 0849edaa7a1f9ea66182443e31691e7839c857240916521bbd6009b5e692b13f5b315df36e656134651386bc50d895ecf6155a906750009514cad8bfc7e57fe2
 DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029
 DIST proc-macro2-1.0.76.crate 45660 BLAKE2B 40b538d9d9fec10b9e4b147ce0a86efb10feedf9e0452e5568e8ad7d2b88a201ca6ffd2cd62d8815a1ee72d557fe6280120a913868c3d868c1235686742cd8b8 SHA512 2ea7ade475171166489ab3e745e8c526e49c7521bc39b1bfec6dd2fd0807fd3cc5579235f77534be855f9ecab481205e77e66b14ebb22e66d2c3cff842567247
+DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST prodash-28.0.0.crate 90695 BLAKE2B c4a78e86174003e2aa18899fc9214acfeb04637d2b90d64eed17d5dd2569fdb4a58991c23f6e6fc21549e4412eacfab9dccc50a8e62683e8d91a922075968f4a SHA512 36a9099fdb61f604d902d28f7082195891056af916727f7d7b78986dca35539238de0c4816c96ca2c3e74fd04f503c59599988e95be46f0ed87af70ae8ef3c70
-DIST pulldown-cmark-0.10.0.crate 139056 BLAKE2B 72974ca5b8fa8de1dccadb65900295ea3a0adf9f86913c89ab16c5c49f65d4f3368453dc2fae807f5cfda5646b26a822e3f7e4b7f6f15bdd7ef058365f3eafef SHA512 cf6dd2f0a3a4a9a1f4032ae7f6084ca7805d54576de8083951c50dfff7a426ee5b0846bc7719ecf07c43a298a02e85ff1fcd891d0a163528361baf19a0b19044
+DIST prodash-29.0.0.crate 90594 BLAKE2B d35c31cdc949591e81e73e5cbdbdf52a46d3bf2d7b05058c28d7924a9a8432ce377876a310cb0e49b3e7fb27fcecc294717def09810865e621014d0d1092ee8d SHA512 d7d625c4679864183da78c3c036f84805957db10f63c52480e9defca3bf4df23476e65dcfb5a9cffc46983db96a97a9dde7aca119ea0e6e9b1889770f7072705
 DIST pulldown-cmark-0.11.0.crate 149170 BLAKE2B 3e53d141bbe79fd385b32f6980d080bc111f4486e57db0f374904b663763a91c6d24d004c65d26c520ca0624ccd33b67782701ca54b7d3959fbb26167f5d16e2 SHA512 80e485e69fbf7330737bb35befb41b587bf0e5fa6e04c628e0da77d8383a5a2da3f765a696a877d605b5580f85297e723c76e0c0f6bca0235e83a683f67cba14
+DIST pulldown-cmark-0.12.2.crate 149070 BLAKE2B 35e4543dd530a80ed500384c6a6f2bd10bba0cdb4e03f472d630ed17251b85f7d0a91635995964ad8d40f7c849e0b179de643ee3645a81b311b78c4ec3678f47 SHA512 7514c4282d3c4ef0b0f7ae65374a549c1a027d7fdd5eddad8a2de93dde49aee2e3a2eec2c5c598967b128c2edc6981fa6dc55972c8194206abc9e7a673eb9482
 DIST quickcheck-1.0.3.crate 28069 BLAKE2B 5f0ddc8e22fec55e879745a95024abaa03d7bcfc6453286eec072663b36a5d6ae247b3c1622c4743e1ca9b7c4bb21da0d095aa5247f32b0bedc393f92cda6bc0 SHA512 07dd707c9d3fd0b9cedbba545bc8b4fc1ca2770d169e444f8c96f8306d3161a6a3e9189cc5d0d6b3dc4221f7dbc05887dfe2dedc914f88d5e69ab2b94179185a
 DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
+DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
+DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2a0a0dc24f0282fa7eb01fd1351a7dc8b5af3a55ea321e6526fbe037fec3cf8b32463166a082a6e417a51fca SHA512 3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3
 DIST rayon-1.7.0.crate 169488 BLAKE2B 518f0eda1fcbd1b1b230587ea18cab0023a699e796c819bf35a6492b7edb051137446bfbc49aaab0a68aef8280c970ad14301a9f8f7461d537af119a65b33a38 SHA512 d999c811b701d0aa4e547234bdc20a7df56728e142c4aa882bae081b7b057e8c3a72f4a62fb35535e57501e8c2ba7ff072068b59d6b5374e9ca6bb66cc0984d3
 DIST rayon-core-1.11.0.crate 73118 BLAKE2B 313d65bb6e3a010569b317b32ac91c72e38282f4fcddbcb56ffa97de42d88c0d34f35f76b62e1ad60ee96b596aa681caf2071a8d5dfdca085fb1fbafb07c3ee4 SHA512 00ac782f49d688da90e823980e83b5ccd858f93769e2d801061fdef78728cff37d3a9fa4fd47a5cddb058f28f3289de349f8c8fdd94fa2f8c400d73bc4529800
+DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
 DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
-DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b
+DIST redox_syscall-0.5.3.crate 23830 BLAKE2B 0a38235ec277144f0c3e7bcb1d273c7f357d85aef33dbd06328ef16bab7df0a07b523431590899ea58d55e8e1d84c32392478530200cca3a9483e8a47b29e233 SHA512 777d1208004b7756887d6c5745ea408972670e59430e1d299d01a463ae41b98e0920ee77aefef8755fc949d4799dca679afaaae9c1a7d060f76f69af5b90427e
 DIST regex-1.10.5.crate 253805 BLAKE2B 9f5418b577209051640c3614a98b15604a1e71144763a6f00caa7757f0ff67fd833a7d14fe9d6acef96386a2a4eb60cf5d490472e73fd62ca8bb0e78d4f9f125 SHA512 177fddb001e14281510e34070f88f8e5167278a46f1d93d9286d9606b7673346f504e4064d7ad53558e6988a400c728e33b663ab398fee12ae23fba7158da5fb
+DIST regex-1.11.1.crate 254170 BLAKE2B 5cf41012fc2ba8a006c0eb4a922cbbf1614bf300be361c9e2d98956a9a5e9b140e37bea09132fab7bfb633d4439158723624bcf45e8c619c4061b399253c1b82 SHA512 d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8
 DIST regex-automata-0.4.5.crate 617406 BLAKE2B 21826731ed5439a12cdda5a1ef217dc3239a0884d038170855985bf830f2782bdf4dbfd1b1a8812812db3a2399dadf8c173e75db635dfabc97382fda0561bba3 SHA512 0e9681d5c4529d49ff2555b7b73cf234b1f321a7fc634beccdf76c2bce5094e8501403e8caee2b3a16ac299cbe4701d891f1efa380b54f9dc2d92bbacd4de611
+DIST regex-automata-0.4.9.crate 618525 BLAKE2B ee3fc41c8c445be4c1aa3e5b19a3e61efd641b1a24e7a1ed55f837c1fba9c816272cb4645c13232b66b170bc7c413802928beb22e3891500141ad4ede65b60b0 SHA512 40bde0ec91cc27bc0c3fa237a37ecee5a1f023dbe006a999c5888f8f578ee2c4c64d9edfe1827546cea8e92ca3c10f8b4d494d81f3d0422b40d90bca9cf598d2
 DIST regex-cursor-0.1.4.crate 151904 BLAKE2B 1c0981932017a3cd91defef9b4ab74a70c38341717f5733129b398df2a5af7be58a76686a5aeb231f9ea88ed71b6da9ee566cc683e1f134d70af786190c16c65 SHA512 d3113342c44890b095fa4c41669c2f426bbb074dc3381a75096eb690f596a827ce59d8994f6400c9611722afbe958c3908ae99f3c00e2e341ecdb42edaf680be
 DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
+DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff736f2d9991b19814ffc1a414ebc5b76e84fb8fd36c983b38e8e391d165cdd9047832b0d9100f0e1ba7085484b7db5 SHA512 549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8
 DIST ropey-1.6.1.crate 119463 BLAKE2B a0d02ada75d96381b02715ddf28ceff9dc6ce718054d11eef5710d0b044d42c4d324cb136e69719806b0441be47c2d94f67eb5668aad344806f31a9f96c36974 SHA512 2c7d4379fd3c8058d25e746a830357f1e0740bcab99da58274b2ac54c17999d166768f4c366c85fbf56507841a2526c5a0a69290ccf3f9879c0df39204b094b3
 DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247
-DIST rustix-0.38.32.crate 376999 BLAKE2B 681ea50f5405b3a749a26a481995d3a85800378067734bb857e32e5d3764687b0da4b3749d227174440e432b374ae9ada154a8288e4353ca2ff1b851698477f4 SHA512 8f028b4df785aa78fc798f3e053d0a4fb9b3c552a47f66f52f1666f4c1324441be6581ed643c4ef0f56d92e1a078c6d3b45be183fc3df0ed1fc89de0d610cad6
+DIST rustc-demangle-0.1.24.crate 29047 BLAKE2B 8248b014eedb26cdc0b748544ba91b9aae9c992a6f93b4d3ac256b78f691d572f8885a3575492ea556698a241d2759743968293079ca02bb6a5f318b0ed66dd4 SHA512 eb897c35300b87766e6105917a907fca1c5b1f7691fc03c6c1aaf38075ac883a73d1eb54a245d13ba59c7b0f0333d6543e23fc1b1c542fbbd5c750a84660b9e8
 DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
+DIST rustix-0.38.42.crate 378683 BLAKE2B 4071e1118ab8111bab9efef39c6e35f8a3030cb230cb3643df7ae09ffc750b18becf1f069c2714b0b6d13e334c12446433057fd015c9dec04d7a1372a354ae05 SHA512 438bf1e4663cacbc7c0af23b10ecc11c8b01c53e18c2e82a740c46b4a61f06cdd25d926aff27a9c39084c39d9c950c222a1a3a6d5878dd240554fa593fa762a5
 DIST ryu-1.0.13.crate 46823 BLAKE2B c6d661cbff5e7b273da5a6bb704bb1910b897c55d854b05bd417f53853a832791afc351e5a5aeaa94ba99a8fe64c8a930221c52a8784519728da748371a4ae04 SHA512 25f60216d91e68cb47695ce4e966fae674d5b3e4b0cf33e740248c1605fdcf0c963acd278a485c5b4bb0a1c1144002e73173592222af4989df7a4ba402508c13
+DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST scratch-1.0.5.crate 8013 BLAKE2B 64bad5081da3765fab34b582c679fdb345d592adbdba09071357dd3306eaa55d885a4f282732972b6f856ef9cfbcf73a18e9f5b2591ab05ef9104119299d4159 SHA512 522e24868568e9e3c4c6a9b0af4e1890d5ca6753ea68660e13bdc95b98c30576058dc949d20a5df95a6313378083ca138c7bfbde5c60916a011cf9697180692d
-DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410
 DIST serde-1.0.204.crate 78253 BLAKE2B 6fdebf3cbcc0327b404caaae43c87ba2b6105374a5ee3eaa34d44866e782132cff535da4c069c007783b7b6468d55cb1ceb6a41da74b9eab03ace7cf4811e09e SHA512 2fefbeed0117bd791fd25dd5ad0c99ed4f60aac5919605b6f642050f748dd472bf9d4d121b78b0cfe8719db30a675559d097bcc7542cb57451d1779dfd8d294f
-DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994
+DIST serde-1.0.217.crate 79019 BLAKE2B a0aacff795d34583365ddd469fa14c58a6cccf8afbb248210aaff3134c7ce6e34b3d03f437326d7c01b3e78f82a5d19c37ed9fa4372970d8b2793f2889288e1c SHA512 f97b3b54b9e99c9a027390405cc054c3072f49c92803a4ed5f5f69e76a179deda9d77993b645b3581437085912d881da88d0451b9e0da423c64033a23fdd8054
 DIST serde_derive-1.0.204.crate 55871 BLAKE2B 8f0cdb244a820712d557a3273e505c4461f4d7db89e8394040b4c66ede787b6b38b4c9923b38959ab4042c9076b8af72008c0dd15ac93a0ecdeb99da8fb526ae SHA512 bbb2b5e60e2af5bc7528b937ffaf0d3ffd433dbd9cb2592c1e07090620309057e4f11cbd6112fc1d2c5557e1bb3c0f4d59eb06ff06fa021ec683ab880997140e
-DIST serde_json-1.0.114.crate 146986 BLAKE2B 229f0a8e2c0bc35435b49774fab9d4cec4e2323e85e2f97ccaa2a18277ecfb9cff9e9b165786e782cba043e9ac670717364b0f9c145254eefd74582b728f2186 SHA512 2c35cd0e29ee2af6046ce849b5854b82b90f402b51c04ea86b32ce7d67869736f17a4d028dd8245c31201036bcca7a1d3df11d842a92a45b0eaebd809687d436
+DIST serde_derive-1.0.217.crate 57749 BLAKE2B 63b4930122d80d64492ba2718630513012202e42bbaa74510729ee66a0e72b8a1ad123784b479697ba562db43868f4bddfdf5e94bb3d744cd68a547471ba40aa SHA512 31020f4533d04b31ae125580a3c5093fad36438d324e2d9b063923aa8c125c654102ae7fbc3b3df892bb41db6b321962a23e0a37950e080055d715d15b18af76
 DIST serde_json-1.0.120.crate 147062 BLAKE2B 54f93ef2b0f1c9e7c5a8e8797fd298c96513913a20c3e08a21aea39a15ffb5ad0269d5daab10fceea7164ba432e355b89d89dea2985f86bd0e73ac3920f827c5 SHA512 dab44850326f9020d6f6dd3fc8147e22eed693527fe9cac2c6bc8f6a030f461061e8e54d2780382ce32cced63b5a016372a4f9938effdd1631d8f3dc96014e3e
+DIST serde_json-1.0.134.crate 154351 BLAKE2B 546f8ffe9373444e8c9e81910476da281dcef10498dceabc8bec9f9063c55f4a9033b83586a09b0f410369515882c37712a2bd75ff1fff05815d904f37386124 SHA512 ab6323799bf19da8ec6e6c428370d37cd230192b45ef54d2c65c7d83907b2dde71d51650e44f1fcca1084e75e0e195e97b28437f53a331bf48effed3d59b58a5
 DIST serde_repr-0.1.12.crate 9549 BLAKE2B 03f1fecd3edd4c2e14f936db0c1a4452784da327eae63af4086d38323a56ef06b34bf49bd10ca4afe35afa67db4cfd119cdcf98532a57d6badd055bc931f4dff SHA512 c0897efb6ee046b29c810bfa28c6aa5d8cf10ab33e220ee7e1747e9abd2ea0721585f267060cf0a1b03c8f3e5588a48d344079bee2fc9d7472ba2ed61461c714
-DIST serde_spanned-0.6.5.crate 8349 BLAKE2B f4f8f798ae3a02c0d5178aa12a94bd1bc08fef88b6a81d782ba07ba36fb0d89927ecf621087faf376b6e53de12f6a96e0880ce0cd01ecc31c5dab7dadc6f3ff4 SHA512 bffe2398629ae5a5a5bb6d5fc2fa0f4b94d02c96e25d1be2fb9ad95d8ca2fa9bfdeb3af11049ee9c050e497f3beca108f03020f88f6de29b208063c3898af354
+DIST serde_repr-0.1.19.crate 9997 BLAKE2B 1bfc8e94b8c3cf897813f4749d6a1112c1097c2c257821eb366073a41ac46084a21bdc0ee4e3b99d82444619a894472e24fccb60cbd8a41ab7d5b0469cad7c41 SHA512 678216a62702b3300fef850f10ee60d88f31de1fbeb7300e3fbbdc4e4a9cbc95c6890c8e7b9385223ec837d9504edd53e69b620f80609e54579c0994ed1ab0a1
 DIST serde_spanned-0.6.6.crate 9120 BLAKE2B 6748b04f30cc63297fe01cacdef743b688aa0777b600d603919d05676913133450c97a179c6cbd4a62534431b74c4bcf63a60c1185ba89cd8266411d3824aff9 SHA512 e07254723645c80d10c1ab9a7282251fcafa0b5144991568b1b1f85e7c8c8bbd82b5992f2ed73fc7a988f6a0175fd79fc927c6b28b7420e83269c3364d7ead4f
+DIST serde_spanned-0.6.7.crate 9164 BLAKE2B 559a62c0ac00a1559947224bd268842f35c52f65d0d52102c98b5e683dfe4c36acb015edf97c5f79ff818dc575b3ae43c3f100d18eb7afc3ab9c96e348ba6794 SHA512 d0ef413867a705080fa68f84a059b4d04b604bec59323329ded7ae03e0caec49c89fc53640c1e58c27bb23b5c9f260ed176ac52f3a93d25d8d7643252dba037f
 DIST sha1_smol-1.0.0.crate 9782 BLAKE2B 214b58f6a8681399b9c925815f4ff48974466b399e96e372c9592cb139ba9306ba162b3b426dc12b585ea15b616fb58a60d253b4d928dde46217de6ddf7d0437 SHA512 75d6809a2aafd47cd5f5888f42283985895a9c82b53ead7529a23cd6f2484f32654094dda7a9e5d93e82afc9d0049938def1bdc28803502d140d06a3496adea7
+DIST sha1_smol-1.0.1.crate 9809 BLAKE2B 954039c19b4c9faad6cd9f3f83edce220afb6970cb6628e69a1dd914a945a7b9466a8d46c41a650d505a3c01f406210ad59ed56504db18aa45125df3f2369cce SHA512 d0a67ca75b0617a39d28fdd73ae9aae3d3bf01ba24f6cc579b26da6f06125a304be90d446d17775959ab96ab165145657a54173679e6c0f42562a61c0e932b79
 DIST shell-words-1.1.0.crate 9871 BLAKE2B 7923b36f0ba50c17ac4eebfdda34566b615291253b7b41879b3f64b3fc1325e63948d3d44801e40748b11ddd2ab201b81d238af2a2007c7a57d71f5dcd0667f6 SHA512 05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00
+DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST signal-hook-0.3.17.crate 50296 BLAKE2B 5469a11485362b4a76f99c06071c69f6cc083bf4cceea93fce0b43385163ac3621b7a3c98d18ea1fb9e1439460ea37f470a29bfde9dea199e60a12b248be5d25 SHA512 045ac6268e504c5561d3884610a48c930dfd936086f793839f42602e92e4a8cef289955776e8eba8a5ca1a91b5f27ccb3724f49b32091f8f06c8bde984d82298
 DIST signal-hook-mio-0.2.3.crate 9064 BLAKE2B 2bd11d0fad02fab92871e0129fc4ea3a609a43cee5d33737d82a624018eaa90077f2c92fec88f7b19d3ada619b8618f9d33fbd2cf6b7c63d3175dc57fb0341a7 SHA512 98429330c109dacbeca5f0788d993d1ec2830b6f95886a433592b2096508dfef2027d62a99b985654dfcd927f7f3f93fbfc19361f8efaef5efe84cbacfc1ab08
+DIST signal-hook-mio-0.2.4.crate 9314 BLAKE2B 018d406ae25802cb376c1f02241ae8e7018f2f7837127a9db40fd17df1cb3e13299c2c372257b0e82aeac1a77b75c732c7344e50e969180e696bf3f8e4836f62 SHA512 1ce372f4550c046f1420b8f4a29cc4c8e904c08fd089cf973f26aa25b39cc6199db56d2ee3bb34684732b79237648e904389eebbc32b5e108f7d6a2d22b1cf3f
 DIST signal-hook-registry-1.4.1.crate 17987 BLAKE2B f1df8bba55c72a506b9210347f9dcac4d158948e73f6d1e60f43340ddfae368aff1bbb6a109af326af47246d9738d49f76d380c52208efc3c6f79ea0acd31f0b SHA512 e83acec2b0083967555f6c659dfaacc32d851a9485c9f6f4b4cf257742ae3ffba8c14708c75f1a5520e9d132ea9e21d6eb65aba492eec481e8492af8b798c5d1
+DIST signal-hook-registry-1.4.2.crate 18064 BLAKE2B 7274d4c115678eae2640a709bf9d682ce867c1f6295a0c5f49e492f95dd1c457f20b56207a74221df1fd9d744b24c6260e28f705777e3c7d47b7bdd36f1d57fb SHA512 16362d232b1d301007c069198d7716848aa73d898ef92e050422b36c09001b4334390dc95a6650e5315377fd8960d4336e5ae869b0a305e8525e977b8327c508
 DIST signal-hook-tokio-0.3.1.crate 7984 BLAKE2B 9e45b63cb335ce3c449deb085db7154c90a717151dcb7ec81ad393d0c040f2d816573203632eca47249306754935ba7ecccad5c039b8383e997a9c713b9e5f31 SHA512 14df27bb3b210480a26cedfc453cff92329f22f4783b2803482137abca396dd3c268ae114e54c6287b0d55e5f8f1a6851146b1623febf4ccf7f209ef4d83f639
 DIST slab-0.4.8.crate 16928 BLAKE2B f20603e1331a767c3f55b56d58bbdb9fc126794a116db128fce6d204122c420e9a65478f9f10a26f86c045dbd55a62556862f4339f3a41419f810bcfa9fd145d SHA512 1d713a217b3816a1e6c230d4bb52c32c90f600e64520f0c339ea8255ee8aefd887d969fa23497f1bd8b2b1f7dcb4b220957889746f04dc3453240b5f28517192
+DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
 DIST slotmap-1.0.7.crate 61390 BLAKE2B 56f7ee840f848f2331bee7d7e31aa66f2185db5b57fc72694e1514b462dab8f673442c36f7b9260d5db7b68a522ca76f7748aab774246bb12c2ecfbfd3e7bb8f SHA512 f130275c506a3d648b5d66acddf7ed88274fc381d8d0101ea5b3ad931069d4ca46b856d75311e95e09a23c009af343c7a4321023bd1d065d3d516a0b4b8a3080
 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
 DIST smartstring-1.0.1.crate 29555 BLAKE2B e6706bff07889a39e40c764c51f0f3271570e2ddeaa2d11c510ffc9a07dc34005b62078abb7dc6f0bec5439f0bfb26d7b20be48a5189f6a468e4977352bcc941 SHA512 18e359d869bf006d49d6981c26a31ed73424c2734d8225c235b5f3c65124e5ca9d5f5bc95f4b190dc65746b73f31e2588bf9f50eb2b30535e5d05ebcd23ad760
 DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f
+DIST smawk-0.3.2.crate 13831 BLAKE2B 551ed3406db797765034e2ba53d5aa75eec57cce608097eaf0f1a94fd1df8aa8bd248087a8a3b037d844fc91773f74501686180802a6d75165f771ea1f20ba96 SHA512 39f3cab5a6eaaef6f4e7703a6840ce7a805f6175e02968090a58a12d3420f0a144533e5d6542f1e9ec0e36902046a180386548713ef6148064922ff837fa1602
 DIST socket2-0.5.5.crate 54863 BLAKE2B 4237b540dfaa96d3f8a8b9178519e5ea37b6b96480a2aed5287f462845231427a18f5add26756c7b03c18d4d4aa617a5a36c5462258ebd8be326e8fed1c48641 SHA512 afa8df546234d4e8f89289622448aa42d8c2ba74a0a3a4b13c0ff7bc30fa435a7d6d6e8c9e2a6933cfa23ebdfb4908c865e82c657611defbc16e1f1bf66f9f8c
+DIST socket2-0.5.7.crate 55758 BLAKE2B 148d2e2b6610895ec555b1357b340576984eb76cb3ea719f85af50cc4215b2ea2db739e2a61434c09360a0c1ff8e05911764e18dc4a59451c0aeb0eb60b8403f SHA512 ca37157bfa970cf3cee8b45c7fe64930becf2ffbbc309ea4613be968400279b70edd084d159f65b76fe1130917312d81455023c0d7c1bab7a59c79542aef9dcd
+DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST str_indices-0.4.1.crate 17658 BLAKE2B 2b09383bb3c330819d9bd13d72924c924017258538c029d73cab5951ac808789f8c4084df3cefc5d9ba9b69e69e2229305823386008b367ed69cdf42bc20af49 SHA512 3ef64bde04a57e5946854f7b2adc7fb8cd01d885046b0b31d02f2155e3c3b29d2004d55cf69d54c3bbba661487a9dfd351a41144603838cc15391e3dcacf69a0
+DIST str_indices-0.4.3.crate 19096 BLAKE2B e1a1a93a80041a935495c21140862f415c53818adaae9e507fcc56a81994ae8823483145f20a4ef389becca1f5de52387f06f0c33a1f14e713153059e5b998bf SHA512 5db263130eb605f4a2ee9bbb34ea21e0989d87ab2d6b7cf1a3ae6e756956970b0cb6e8f45d2e935e81c3abe7172e93ac682f4aaad464d171263aa306235033cd
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325
+DIST syn-2.0.87.crate 278076 BLAKE2B 93385f64103fdb482bec34c7912474ae7a5935948715e6eb9a54907e0db5c39f089f6cd393bab33c935c59a1bbb0f4099431f206343811c1a450554d96a35756 SHA512 bcfff545d6dfefd81e09f8f30a86bdd85759b3a7d4093ef3365ed02718e10dbd604c52b94c9d7fa955d339fdc5b6c079940c6f345b5a48c52b5c8607794ca6f2
+DIST synstructure-0.13.1.crate 18327 BLAKE2B b29ee88c559a2d58fa46b7af155b448f001649ea79a1898f0ac87e69108b87c65cbd287d8f9001f360df7fef06ff39c937b48d33e487a30c8eec6a46c639c0c2 SHA512 09024193b44fc9a8901bda845b9f86c57dad65d0f53e309b2e7e968538fab6f67db1c86e5e52a2eb8fd116dc073e3ad10983bd60764662ec6ba94fee22a958aa
 DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
+DIST tempfile-3.14.0.crate 35065 BLAKE2B d155a39f6ed6e846bfd572ffdc73f306d30942642e07f2b497963ae150b8ef774dd046bfb3ce410fa326c8e1df27b0cada804100215e01d02272d6059d5294e3 SHA512 98c1ab70eb3efd2d8b16ed58c8c83f8599663af7ef269304e908a04c38334f659a4d0b1647a13dc0d1eb90a293f1b37ec8ff0b9b45ef5b7ff1b4452bbfcdcb15
 DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7
 DIST termini-1.0.0.crate 14075 BLAKE2B 3b69d3b7518c077b96a9f451efcdb376045aff3bfc2c9d8af5a41d302b68cc633303852a8bcab531d99a2a6820c9dd0bde7193c79a9036263e2007699c0253e3 SHA512 3296af101d3687d3863881e96e0344fa9ec6b14f997791cafef99616af646a71e2369fc3f08e40d08a0a7d25c01a9e17149291dc95ee210e37c501a087ae9f4d
 DIST textwrap-0.16.1.crate 56012 BLAKE2B 9b5a7c76eca64d089f4fab7095f2d35624527ca223e53b03cc807c6bfe913a99b55197b973a3102e3e5c4055bcd6ab580a0c9d67657180b61435bd6eb7631211 SHA512 3a8d2036c8e4b88866d68b8066a2991756f6bd4ac5c726e63fdffbc894fbdc03bf8b6e0ece4b96684c8e1facb6413190768d51a8539094efe47977c120d31f1b
-DIST thiserror-1.0.58.crate 21025 BLAKE2B 2915ed6ab691fe94e97a834ce5874d37a388c3240499889cff633ee6c67d46a2ca88098ba40c225ca0e2e3c1ac7bdcfafcfde3dcefc50867e299dc49505d6fc0 SHA512 3cba2d1f4965bc56bac8fc70540d8cd442ab6b8c7d25d328bde7f4cc108535d83c75f293316d730bbd86eb247400b6e35107d610c7caf47f43a28b1f52fed578
 DIST thiserror-1.0.61.crate 21264 BLAKE2B 97337830507c009dbb4cad84cdfc02bc097b9d39d0af2fdecfaa63f0c12229e60727244fa4e44c2d54daee67bf8b4e8492d94a5de55d1a90b8eeab8c0d082e80 SHA512 9c08b868eaa47178ee60733aaeeda60dc46d58d2b9c15985ba3dcae4923e8edf02b97556df52f508753b0ff52782f6ca3227e9ef6343066e5d5d3a89e03f3f15
-DIST thiserror-impl-1.0.58.crate 15645 BLAKE2B 9c6f643a582666ee4eb43330340888e7141f0dd89d927e3345268c3eaca02fa42b018514ef38b3db3ff9722b25ebdd43c36b11ecfc7bcb36950ce2c204ff78e1 SHA512 9bbc623f54c71595e48b33bdb3e4f12eb2e48074b15ebe400d6faab43410b363e5af94df071aaa324c59dc6958173e3c301fd51b216969f095e19cb98a27292b
+DIST thiserror-1.0.69.crate 22198 BLAKE2B fdd8ca8c8ca78702377d0bf7b253440519018275b105db980d63229d0d44aa5c39a703e14aa6fe453c779b3c864d8044009dfef893d2a5294950f067656d7a80 SHA512 ef50d2867d965da1dfb29d26faf6de273b5fadf78f95313f6caf44d68bfc610b9bd4b7544200b05bb0861231cfc84e961007f8db83c7905244c492037fd31899
+DIST thiserror-2.0.9.crate 28531 BLAKE2B 7789458ffcb381e2cf02f182248396c5e6c20a818e4c5a2c7da8a8f50099c548646b51dbfe0630a242f24e9aff65e215a4473e13f63bbffbd80a3429237c65c7 SHA512 b7b5f54cde87c21e8fac3526d5a140c0d64116e700d07eb28714df3db372a42fba30bb37817282d0ee1b5333f1998d1f628d43054e59fc39393fb567c3df4cb0
 DIST thiserror-impl-1.0.61.crate 15786 BLAKE2B d63773424aa047c6eed8a6c9bcc8dfcee9841a2d4fdf6fc2c117695c09359371931722198b2e0b2bae32b0c54b6275f964e679b78b8bef1c365ca33aa41562c9 SHA512 b43bd2ba6b751b777e2fc78aac92a3e662a1876f704625c4e894019fc68a6b7628b9c3b7ddfbd2cb15fe6fdc0ff679ff94b0c47e2660a40919000ad2fe1cfeec
+DIST thiserror-impl-1.0.69.crate 18365 BLAKE2B 51663251ea6ec99c59aec35fe73c5f9760809d6b6b7eaa8ecbc8f6939acdc4d0ebc11f9034d9204dde7bd689d5e8303ae0be86e298745e9ef96825bf73453a08 SHA512 579eb796c8885feb01d27638862823acd96c79440655bb444c3445ac00121852603396ce7439aed617c0a0ac69f62102167fde5845411c906997574a46d6d9e3
+DIST thiserror-impl-2.0.9.crate 21023 BLAKE2B c2def0cfe9b9854ce33075fc246a2baba386d8f3a70f26516124f5ff4f7dbb0cd0b8887882c491f37652b565ee4fb3e7895a39cf34564a21e96890fa6e3ce125 SHA512 408f6a4c0f6cee36f69fff5a2f08cbd349db44753e6b6ac730c418fa1fc06ba7f69fbf248182af947843ae49d5cb5ff53980cdb18cb850ea8d7d9ac7dc8d67fa
 DIST threadpool-1.8.1.crate 14408 BLAKE2B 8bd64ede19184e18460f6b2ad5bc888d6facd5fcaa5b43c35269e35909c9c68a884203f5c4b92619c097ad48c19ec29f73085755ee348cc637233ff3b5b50ccc SHA512 adaa5aecdeec25848af15b160e5b39833978454d834974211bd586d81837f2ce89e5590f08b7e0d4868346cf57056913a5d41bc8bf92b89109ed769cce4a8be0
-DIST time-0.3.23.crate 115028 BLAKE2B 2d3782aaad37156d6a51fd98c6f69955410e3bcbd313a4739c4e68260fc0fff4bebb05a02e2a0acc5d68a4f2f9583b0fd8d4d5b7b1cae23fbf99c9eb597fa60a SHA512 cb3671ade408daf3b8f929ec412bc2eaf7cdd2486673269e83c381c277eba8ff04450ebdbc73af35c3abc6a822dde10b767a800434621c697363558a42c88ff3
 DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
-DIST time-core-0.1.1.crate 7197 BLAKE2B 9d0be2ef7111a8b66e5c750b2c372627ae4acfb2c68b0c6ed44b3c23bea1cdca4f65b24d2f2027b4d334667b1620019f4cb8c6d9799c1c2c537e6cfe692ab88a SHA512 a29d6619581d3fed73d6bc66a2c18805b80a3d54197feac5ad987a2c31d003bf4fef88a312d5315d2fa5c7d3e509066a65c1732be2ce280cf937bb4eff012e14
 DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
-DIST time-macros-0.2.10.crate 23680 BLAKE2B 44b755081cb2cfe8af1bd4fdcfcedf40e4b37261a9a72a70c45fea72af9eac32dca795002845a0be6b62274ef17fd99ed9a27ffd943b9c9e8b36168949ae0e6a SHA512 b325eaa48c7fcc30a478e05e92b9db15b825e21ae77351941b9557824ffc810aea554c61d4b057fe28f3b209d307e96f1a33dd21b52eefec77857645b88c8654
 DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
+DIST tinystr-0.7.6.crate 16971 BLAKE2B 33a248261c4cded41a81f0d6e6c8df55437f042b37f235c39787986ec562f0dbff50b282ad0f1483daaf49c4b33e6618e139a6677d1238c21f4e12082562b4ae SHA512 a33051848de248cac0a2d151760a78cb3aa62c787d84ff7aac38b11c0660e9188e4d43d43a77fb8676e49ac6102015e9c3db057848d809e71981851875d0fb25
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
+DIST tinyvec-1.8.0.crate 46796 BLAKE2B 720d0e6d881855a36779e12f5ffa708d3a8b96e6d0de9056cb33c9b8ce0d408f99b22f5b2bb9d64bee72a011fef846dbebbea2ccd238d7b951eb5ef0c4866e05 SHA512 b7b32e38229645965900f80f298685f13e6d13e58cfd6945409a6643ca9c9adc2621456956d5998ab9dd91c2db4ae79638b156ca0d9c7c5505023fd9b28414df
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
-DIST tokio-1.36.0.crate 757286 BLAKE2B be9fccb7c41fa6a48f500509ce7b7ce0e1c831a5ee51772ed10fdf054b5872395d0037864f10da4d8cd160d15e8dd8e2445446de75b8e8613debd01e530fd0b8 SHA512 0687980dd375965647c89cd6f569f74ded6400dbbf73318f02d8221e8f49a03151a4f023fced542cf63197d7bb150ca45417c10dfd91517d10bafe0d329d6848
 DIST tokio-1.38.0.crate 774094 BLAKE2B c7d85234ed0de32526246d2ecb52b70b1c4b81681c6b26aeec256090b4aafb41a9173dbe754a5716baecf2c45d9e3cc02fa375fbb343da09e728890b0194b9ff SHA512 4bc16fe979f2261cb17f007ce8ebb05b915be79c1000c5c429744cab01755b933908aadba0005c84faba6bf5d486ae6e3aae6c8f9bf0d6a5dc0ab6d0390ebae9
-DIST tokio-macros-2.2.0.crate 11520 BLAKE2B b688669f8bcb44967fe0d3db51fc5d5f86da3cd0c7eb7b5803feb250ea3444d134ecc7f79345f0b947cd3479a46659f3a158a04e0edaaa52deb8d343deac4761 SHA512 7e33fa62e0cf4b829638553a51f849242788d217264437444b3bf478fb40be26800d5cfd954b1bcdca1e5191b3c6c60879050f0f7e707461f7b090ae5025e0c6
+DIST tokio-1.42.0.crate 806998 BLAKE2B 9d33a892eb8de63a65218da70f29f21b75b5b9635cbde0ae0667f6de117a4c6660cb2bbc1316b76e9e796960b7dc6c2b31c146f016cc147a2f11333b26391a5d SHA512 3cdc72f3209057cd0f954913f3d26d275246e0a2d63171f84449257de55d1a416c65b340d38a0d0c7fa33bde36bb612f550cbd43a49df22781c84f8ab2bdad9f
 DIST tokio-macros-2.3.0.crate 11753 BLAKE2B 53429417a6fe3bc6c320ac5e321ffb2b19a64236a8a499fbb10b501d875e9d266fca2d82364a8aabdfecab46e4aef1b48d3b8ab3ac20086b54834c3e2f0f1b98 SHA512 cdb2f13141895035b76d38137dfd0e6829a5f8a617d0b63ec53ff51723c69e301d49f19c4b8b7e86c6e6a2cf58c1aeb35d071193029005fdfb9127f5a12841ae
+DIST tokio-macros-2.4.0.crate 12501 BLAKE2B 9b358adb86e828faeb956d24a1ebf68b51a69bce519ad9760ec3d3b8eb1cf4435afd4edc5ddbf634fe152bc77b8675182dda3f076f1011c5b5b97850c1fa1689 SHA512 f4a445f6c2cc7c1cfb5825919cd3dea3af52720c7793c20601d05870e7efbcfe0c6231fba7ada49b5ce46757f0e1475b3667914ff33c2fcb25e9a40151bd2501
 DIST tokio-stream-0.1.15.crate 36284 BLAKE2B e12d50652cb39227da004ce6850413d21294142fff229dede50f2d6736753cce87a6b0d864b0446fd878b4cfbf715ce94a9a7fdde0ca6fceff3d5d5fa402553f SHA512 3e6b0ecedd45fe6333689b9dff06c85a5dd9beae461879278c795782bdad0680c6744cadca9ef64d30abddcf1bc83b04b489768a0777f7c6a621d2ea7cb1328b
-DIST toml-0.8.12.crate 51145 BLAKE2B bbd5b7c536c16b23f26bc520298172a61a61cf72195191d1d3eddcf54ef0ceef781902ad2c0033fab5aed11229400ec537e3cf86c24645a6d111b387ca8d54c7 SHA512 dd8054e20aac5320a2a6a7d47640cc56e48c2b6db01069786382fe5ae19e9b307fe7f4811ce5b8fd283a307c0aabb2b7f57101e05edadf79636785128b5cc265
+DIST tokio-stream-0.1.17.crate 38477 BLAKE2B 9b8d7307ad8194145ff8afe682874d9f4cc7b06a11429005912dd9bfe1bbfb980876bf831b7d715552bc86ee18344eec331fc18c8871681d58171abcda7252e7 SHA512 c44c5da6f916ce128e8a13025d9c3e92ddb4c82d2cad52bde4bfb982e6f83eb89125b616f89f2fbbf9ba8b7f800ce46e33f43104a59153db2e950bc2f0d570c4
 DIST toml-0.8.14.crate 50645 BLAKE2B 264a757d09f443e9d4d2cd7efa07bec4bfa382d1ca82e59d268c0099114547536858be323e8004fe7add72967b5c193bea176a823b688ad8be2bd71b186607f2 SHA512 31af40bb5d8a172f45b5f0ea7f089862cfec57bc9bcea6559932b045efefe9e8be349df24f55d6ebe536f414fc35950f6545a4703e13a202212eec9fed6ecf62
-DIST toml_datetime-0.6.5.crate 10910 BLAKE2B 93a21ab2784e96ee2e6b56c7b4f733f6ac4c68c1e7d7dac3fbd8aceedb3580e25b4a9c7d9c3f9b5ed152560353b3e80906e37824956dc4ea90bc6f039768f6cb SHA512 502bdedbcbd2ac9fbaa5f4b51f2e409af185f3633f01f8845de5e3b007f2400215ddeb82ac588bc915ed5a5f9d7251ccf93fe2a57cd40fca2927f4c0966357e6
+DIST toml-0.8.19.crate 50974 BLAKE2B f68987353837b74421256fd9a76134bfbfe93887cfb25145b65b7e6b31ad2c3a3384829a06f50c771a2a0be0c5467c856cc631af69f586ea056c4f15af9e3b7c SHA512 16fdc58d14516e81badbe8c9a4506db75b559b377c9c4fecee79e76007b31a4abfc8c8868bf9159f79c6f7c0218f93bdcfb92b669b0917db7da42b51ec155751
 DIST toml_datetime-0.6.6.crate 11698 BLAKE2B 8db35da8a3f6fec053bc82995f4abeb8d2855f2e94ed6ef4a4a6f47e956ea2cb6f8d0edd5c1b1cdebf83c7c218d9f2d80f48346e62fa7985532cba925891edd5 SHA512 710182bcca90f0d830423df41ff0f8e7bd10b866fd7ea1f6d37a315c7b4732a3b6fd61cf411b28051959034534010f24e250e10282c4e5a2539c2858f447aca0
+DIST toml_datetime-0.6.8.crate 12028 BLAKE2B 62113366771f22b437b2ed0d3bb2489ae9078cb589cfad2ad2e92c81ddbda48f689e5a573366eea4f54c2b3cbc6b37eaa8b442b6d935b631a992de4917268757 SHA512 d38b98db3b2d4eebd3001d88e2135b6fdbae63b200f7e900c6bb9c121dd3f170e557332bd26f237312c1cbef61666716b0cf550c2d730f86fa7cd9eb5f64a16f
 DIST toml_edit-0.22.14.crate 103761 BLAKE2B 54acbfda77cb071d280790bdf167a9a7a3fc6c8297ef96c5a82d55c93fb036c0ed167fcfd380d558fba3602bfad26080947e6477a6011819795d2debb74e8d14 SHA512 fef6ca35315482f635bfe35c2c6753d09f9bd33681d8f032f448fb9c6f494d30fc5789d96f99657879be9fdd7b35a640d52fce7722fc6ca05d8b9d5ed91903c4
-DIST toml_edit-0.22.8.crate 104016 BLAKE2B 6dcdc076e7662bfbf21096baed32b6a7859311670824eef01b5df21c543f9a7c30c6d17a77a9b2708ba62c9a7d147cb1ab37043deb82817b28480064d3cf6014 SHA512 36f1fab6dd0c7e0d20171cb556b59c683e29aa8fe1bd50d4e745593217bdae467e01ca51a8122623f44bdf0d6fecd24c0f1b4b648e9c48d3985b77f907b54f0e
-DIST tree-sitter-0.22.2.crate 178270 BLAKE2B 6d76fdc92744923ee4b856954fe18c8c197345181b1ea113f92d53bd82f9718f7681192af5ddd4b146dc1fd1880481603a42fc4bf782366c65cc53da9515c33b SHA512 e5241d0ad6beb7d86f611a4a2aa43461083e37d60ac37455860f5fd21184e17174e147e361ea98b125c8a8d2d7c90921e1f3eee2dde678ec9e6edf4d1b986d2d
+DIST toml_edit-0.22.20.crate 106726 BLAKE2B c545e7460ffcff1404dcb77e577121f6ef332645cc0566b2e23af72743cd40e571a74660e8034ddfe75c4ae5b0bac8d9cf2915e8c62c283eb977ed3a43449410 SHA512 f1514cb1c89fd0d89bcf13a448cd8f0a0a31e05b9c483d9167e6890d70594175dab570c267cbc6596382c2300299c8d1677a5a331bc407e80832da5b7a580294
 DIST tree-sitter-0.22.6.crate 173157 BLAKE2B 547697a592d4ff289d5656f5189f69d272ab22c4bee884bc0f768d2f73cfeff695a63e80a5f1ae63264dd36d9cead72a522d485c36083d76b553680c07416f8d SHA512 ac86b10065e128039053aa359f8d8a922d1c871802d5f488dcbde50fde6ec29faf652bd2cc14f5b59a9b9dd708f1b5d334b35d35b675738d586608b4596be22e
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
-DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4d51047803e61ed3f7c80361987947b2029a2b679bd301e8a0766ee8ea7f080e9b9b6ebcbb4354e19813a0f7da2abc SHA512 fb094fcfd907d90fa7232432aca0143209446e4c5c73d8a0fe6d2dc44b9dbb5b8b926c59b5e3f9a5a0a36f91c04613509b6e430c9c4adf526e7445e6e8d7a3d9
+DIST unicase-2.7.0.crate 23783 BLAKE2B 2b74b932b45c9d5b984b57bfe8249496c192944e2e66916919177eac81c509e2d7a5d30a85ea58e8cd5a0b47fec746bdb18723f3f14002fc64af3a0d320a9e7d SHA512 c2b05a3bbd8996e1cf65d7458f5ad95de9797c8349484f8db04967bde15c1f057f62b2f7a60e7367871512071ed5076c0da042169dbbdcaf4d6c16cae62da828
 DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8
 DIST unicode-bom-2.0.2.crate 10717 BLAKE2B 9029e45504ff6c535ae6b78a797d5cfb85c2733f16ecacf87abfd69b64460ff75c80eabdb670cec0d8d6d79501879614395db6d7c88ba37584cbfef6bc62a8b8 SHA512 3ba6ac52d2fd356134f0c3be2b29098b189a791b2256d62100687fae07ef9b104be8e7dbc1a496d3f18b3e7349081ca3609d6c1d481dcc2bebd5a4bd52b1197b
+DIST unicode-bom-2.0.3.crate 10773 BLAKE2B 0c47796f83faa4eb5c4405fa385c245fe7b8b6d9eb6ce422738f7aa1788604ed3df22810afc6ce6da78c1592f7f68b41311914ff04d5e49ba4f719310ffa9afd SHA512 3a756761198be468776511ff7b899ee7adf214a678b13b31f42ef3cb3e0320894d8ff0df23bfa02a057727d83082f16b465ff25efa8dbef362977bf308bccffd
 DIST unicode-general-category-0.6.0.crate 35177 BLAKE2B 35106d8138989da4950c17cf68d85e492499ebd33e2ea46811a05bf8e9dc740fd8dc75ddff19dc8b8782663b592d35d86f99eac457c8419f2cb603286e1c7713 SHA512 3e4b50b64ce992fa488441105c1264ca84b1f09181e393dfb6843da2f6e2ec294024cf8b62161aa6e8757bedad360ef99b6ca838379c38fba8b08c5da9cce1d5
+DIST unicode-general-category-1.0.0.crate 36037 BLAKE2B 83aeedbac8795f07e9b3fdaaaddb171bdd80bf579f0623a47ac1a3c3ac0c83170a57b95aff4a3963d21c57ab97dbbd39641e9c80057b0da15e1a0db0c7f078ce SHA512 8d8ec78754c1cf835c11b82ee032191406c5d3426a0dd4e2793aac02838de01bad0e6ba24502f63089e2931b5f96d8fc9f2dd4694b533af3e1277840f76237b3
+DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 DIST unicode-ident-1.0.8.crate 41962 BLAKE2B 3e3394a421460b0cdd56f96e1149b3816651ffd7064f9ec85c12050917d0b271eeee4bc3f6d3f0a3c1596635df3dac54bd610243d34e459743fe29b3b931a237 SHA512 8104999c6fff002c5aa109e2ca75ce3eaf772155d31dff87bcf39e3eb3da58b6cb543717be7b55acdb0cb1a4bd2a3d2e9c9974f7f75b6528668f5ef665ef4088
 DIST unicode-linebreak-0.1.5.crate 15324 BLAKE2B dc560d5b36ed01357c22750feb7f09fd0f57fb0ea543180f6e31c0b71b51df4faaa70ac8482f9cd60e5d1faa5bfd4bebfbfd628dd5913c2c4a858ec04beeca3f SHA512 f37be2f7b04b886e95bb7d0f33bd392b78bb940ef9a01cec487062cf31ec0367306650fad7004df556887a324c714eeb28f697044aad9a429ce07b7b7344af60
 DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c
+DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c8782321b1bbbee724db1e4d8c1d43af4e6bd8044b99307c227d93631d178d10fda445a941a485882ae0015a6e3d3c347e4bd465bbe1d9 SHA512 539f04010810d73fde7b0ab314faf813f3e7ecd2e51d7975281554b7cba4a8706e2b5523c4b7840568593652360ca59e9db0e1ce342e71c28db635ff55ffb0f5
 DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef
-DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe
+DIST unicode-segmentation-1.12.0.crate 106323 BLAKE2B 268b60aff6694434f05afb7e2b8187eeccdceb77460f8ce2ac0f84d470f8a4e03182ce3f7906177cd2f00f989273a7e69061a763006245f0876bf21b15076804 SHA512 55eebfe5e9972b39d7c0011d80eb5f517d636de37870999119a3d8f064f21f67b66a5ba9761d562738b05f220e21d56b5be7bbd9cc51662994e40dd67c38f946
 DIST unicode-width-0.1.12.crate 24062 BLAKE2B 61afd22353d46a8a77519af9b3580d75dafc7965967f7724cb740f1ee199c7742b3549ad6c67776b876dbda5b8f27c634431f68517e29a72ade1622da9fde446 SHA512 0bafd7a69bdf49c849e7c063ebf0487eca8a76244e3bc18c9a5f4609465dc0e5d482daceb6a9a6f4125b801bf7063cb8225fdb55173e5dc55e7bf278300df1b4
-DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3
 DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d9183478cf501c26fb5f22d7704ef1313ba6d355e849cbf8ab7980310c1aae85e253a2b28d59099e23af29 SHA512 2515903e41c0659cb226f9bb049ef80f2a49d1b609b6ac480e570a84e899088ffe3be4fb58f41a1fa7f5288eb5f97ab513f331aeb6d56979df783d48e2ace28a
+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 version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
+DIST version_check-0.9.5.crate 15554 BLAKE2B 131e75cc287518831e142430e2a39b48e4275874f4473780d47a27552294097aa1cddb65c385583e1022478f940b495eb43c24a8b1617b8ac5a24af3340c0d72 SHA512 d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db
 DIST walkdir-2.4.0.crate 23550 BLAKE2B b4298c01cb38be0479b7ddfee627af01f889b6b6ff432e368bb67f65134c3958a4fe271a5a7dd61b19259ae88f5680e5ce8e12e50a872b05fcba68f59b7073ec SHA512 09e1bc852c01b452c95b26a369831a97bc5c9e0ada3111c73774570dd73bb5b9e4735317d5572304fb48dca44ce7b9f77bbd17c418b6b047b2ab17b8bb42d9d9
+DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf3ab82536295019268b3125084da5dbcad818070bfdcb6a5de08da4eb483475bc225a829f58a1e3e040b5fba SHA512 da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST wasm-bindgen-0.2.84.crate 172947 BLAKE2B 90c9b846bcea9d099a394b42f126990db82d1dcbe247f8b63f8c91cdfbb5e2d184d36daedaf8fcee58c34afe89bf9a30454063693d64806ead3427680a87e7af SHA512 20f8c9e4f8d81c66e34d9ca2b266fabaae30da9015d139cd4eba3f314c67c17cb562c6eec5127c41302c11c2f314237add2524a8b9a4d5346b8822a37e467b2d
+DIST wasm-bindgen-0.2.93.crate 43769 BLAKE2B e1abf981a042ebbc5c506975d5c2258942278fc000ac62aafe4221725fc52003c4032dc04a396e8fc8ec6712155e056ea9381a72070ee7c45b348ce470f52c7c SHA512 0c0a63b04b02b57fca78d2c0b885ea752ef1e8e4317c27dc84fd35843c9c396ae20557a1321c03a405b050f21895e6f25e95ddb56f3a3e8cec13928858ae8422
 DIST wasm-bindgen-backend-0.2.84.crate 26344 BLAKE2B 5686a252082afe128ded295584d972fe4af11a30fe37a80e142d213eb2e4bca567182bfc5addf1571696bd12e68e029148cffaa9af088d1269a1201af72e64d1 SHA512 afb06e21d916cf1af137159ac86924fbee3a958ef73725bdf6bf205e15465857791070c721e0fc0164eb6e37d195bbb6a3f03661c81e1e5a9ab8502bc3704058
+DIST wasm-bindgen-backend-0.2.93.crate 30344 BLAKE2B d0b9f0cd0e6191dc3f57869023450952f2d73c0432fd4516522df5f63090de021f44f11ce7676fd2f87b31f6b236eb155b22b36eb80c3ccf3880f55ca23d4b0b SHA512 c67dad5fa26f78b233612cb6ebd44f48edd84253e46a2f5094e95da935185cf2a7be14d49247e8b8cd1d916721ed82ea44046080a40b2fe37ad88175a5f96597
 DIST wasm-bindgen-macro-0.2.84.crate 12857 BLAKE2B 23ae9963cc2cf9bc589f5d77c8d3819aeb9d671f0bddd17093b2df096cc800d2130bd2a994b786a5f446e9194947199b3f0cdf1c16f15e7283a4ae319ca849a1 SHA512 23b69ff601c149909d81200bc2902018ec71efad8aec9cd84a0653025aaf852cc86d93e28c5f60144ba6ce5aeff04b90d23761e263e3783d45097316525d6f43
+DIST wasm-bindgen-macro-0.2.93.crate 6822 BLAKE2B 3704c01b90ae900032e455a265b614d1057a7ed7b7eef1ebfdce75a7b0f0b97083211db562d1602160cf9e70843a1949be836465398787315d66ccf85fbe0801 SHA512 8b1a690bf4fc344728bae21a11c8ce4641d81b02e215d88a489f8155433d8e579ed367c96bc19a345b561f2ddb42afa44056b71e15dc935a4fe38fd7f937a632
 DIST wasm-bindgen-macro-support-0.2.84.crate 19076 BLAKE2B 4f779d7d0a406f376092ea8193851dbc86e9dbb822464db66a2022274665b03b9bf6552f79263014510cfaf4284847e98e8173263a6565f1af0c29054bd33fff SHA512 f2a8b6e0170dcea0d2f4a50361f036ad6604c499a89f0cf602578d0958d47c193aecebbd98e63310f592b08f8fe53da6c3d7a124b433ee384aa22371d9c963e5
+DIST wasm-bindgen-macro-support-0.2.93.crate 20642 BLAKE2B 3fef9d35c09e97317e8531f11c3cfcafc5cb58126ab7a96374cd5e2e3f8736ef016b4c0b3b16bcdc0bef686e9f07439f263c54dc980649e9963b12d0a6814ddc SHA512 9fe590636e229184a944acbb8472c03db0a48a9094cd9ee204c09cee6c5241194a9757f06b09e7c30ba9db1a2feca616cd1e7dc0e52c7f1c1560c50c9d3adbb8
 DIST wasm-bindgen-shared-0.2.84.crate 7219 BLAKE2B 4910158ed884dd9dbb32b1539b0c89a583f98df05cb29654487a26db063c973d44cb086dad4b466f9bc63104e3d4da72fe9feed32618f8243151dfb9ccfaff29 SHA512 fc4bf134a33c71852b91d09fbf1e1801e2b97b5c2756e2680d0c1f8701da30b22b56777d8e806e13602beb040775824966e378f7b9805e131a385e7816ddd010
+DIST wasm-bindgen-shared-0.2.93.crate 7527 BLAKE2B a2df995ba72d83beb3f347909c004d9693ee06cec62de248a1f96b0244c05dd8b62d46356f1b7eb0a29122517bc23270eb4eaf045e6cdbb7122089dc84829d9f SHA512 4e9271a746d3b3ea44bae472b7d9722edbcf262fdec2e03c18788d95b923c71c26f309e316ad3c621d5773311d6b1d5ad468cd7bdff015d162193b6effaf8420
 DIST which-6.0.1.crate 16542 BLAKE2B 20fc6e56405a9774569f315703b2d8f20029c225e7839ad620121aca7e1e0ee3a0295e402b6a0f504d18774f3266b98b56ffcafbda153321b1947f44205ae51e SHA512 6a80b7bf46a7fde1fd4ec6cddb7bafdf9b9878a493fc5fb6ed425827206100bb45850541b42113be43aa7b336a30f98e14a5fa20d09a6411e3f420b96f7273af
+DIST which-7.0.1.crate 18596 BLAKE2B 6680c091eb2cefa54d7a5f0b1a039819a0bd5c7abd059ee41b62e0d6132d06824eec352f2bdb973f4ff116b2920619f750aaa7ad9c7932d0dbeb0fe5afd7d7ff SHA512 def4242d6e84c2738692ea1c2dcb73c5204c36b124f6b5903197fc39c29caa46b8c1ad180a3ad0045bf58ede95902cb4c55f0e2eac3537a62afd44aada3eb4c3
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
+DIST winapi-util-0.1.9.crate 12464 BLAKE2B 7fb9dd803fc2608c4e5bc75674472992d82da364f24c22072d5624d6ae6abc44abd3e3ea3c45a7558e045331f3d87572b306b4ab5de52c07ff3706e7f13c2a38 SHA512 c46b893f67ec6e36499b00736bb6b9421e0e2611e76784afa6da01d7ebd033df82f1be7cf8d871d541125d290983f98f26f759488ba9aface49efce8edd682e9
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST windows-0.48.0.crate 11864177 BLAKE2B 39c0e4f058f68a829ee08721818a0b04287af20dfe6e03a125b75566b4c8a58b56557d685600f1f9c215811154f9782f12368d42848445d54dcf9bfd6471349d SHA512 7c906f885fa0a730f1cb1ef4e62f5b602a49d44343febe1d38fcd4cbc28e0342766983796042585fe457aa229333558715b6270e378946faa8f398a7ecc2af8c
+DIST windows-core-0.52.0.crate 42154 BLAKE2B 9670bf02261b4ab2a24eff97dad11e305deac823cacfae286965b62b11bc035f19a55ca710eaa4359c8a4905433a94fe62a836b77ddd68f244ad6ac2c9657f58 SHA512 0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36
 DIST windows-sys-0.45.0.crate 2568659 BLAKE2B 6f2d634d121a9bf41e2887e277a73f33aee69b04c7fcfc6ff973d21902787997f1e186f530e9226cddc003ffc3f85a179c069c8a8688de459f617df92d33f94f SHA512 f239346c0141b95aa76e0771e2f4e38b9a592f3cd92c6001de353637cd65cd73b94cbf9917a4eaa9b0c0b2e6e2af920b9cf6b3fccb52770df5160254cffc1c47
 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-sys-0.59.0.crate 2387323 BLAKE2B 3110c8cd2bc005f8c95cd038a8d574af648dc19788fe4485f977376f92e36b911b1a542d669a07ae9cd4ea72a884ab01ec78b8a2b5587456eb202452d1d8fa0d SHA512 d35e009e979633a1f3c8468cd038bd5c8c0381405165ce03497decd7d9edaaac485d704487e4a61d9aaf4e4d011b4248408912df6a0044d50e8457259867e061
 DIST windows-targets-0.42.2.crate 5492 BLAKE2B 42fc4a7d3e287fe2a70637e890304b49737776596f4a94a6d216668247092135e84322bd04caddd19c83b7700b0f27278e600ce8ed326957fabc21bffcae89b0 SHA512 84fbaffcad9a80beca77506aac26d0c5cb75aa0f21a5a70bcd3f6a16e71e8753ae00d3b89da9262c99756624163dcc0d6074fa9f99dfaae0dc098018209025f9
 DIST windows-targets-0.48.0.crate 7466 BLAKE2B 4ef6d89ad5b1acf26a1a24348122b86d3943bd95935499bc9032fbc7aa01c04999c723df7fecb4989854cb6b7cceffe141537dfb05a9eaf3902c4cb490533116 SHA512 1d2a29602a1e0846c8577ec9167c5f9972091998a5df449d67b13ad918bf37680e7f97247baf5e3010c166d0b3182418c2925470998b92893ee9469939b91e22
+DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709
 DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e
+DIST windows-targets-0.52.6.crate 6403 BLAKE2B eb98d0a8daeed5fe76e7fa8edb2743e2a3e77dfb9c4ea68605a6ab10532cb7cfc43bc1cea0180869445bd940be762a40136500e26b84ca88b5e0c502004c7a4c SHA512 d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f
 DIST windows_aarch64_gnullvm-0.42.2.crate 364071 BLAKE2B 97c4e3b2a2dd3f936f9bfcdad23639c9c4c499eed220aec361d26d6013d798efa118e6b298f9cf841ac149d2ae5d58ca653731718450fcf2910bb5f6fa39159f SHA512 75cd7eb1def8ce9d0ff3d7468d2b1cc31cc76c08f981a2460c3d1eb09cff7100d7442863a3591621c1f5f3b3f4badf0b5c95285b6ed583e37283a8403f1095f1
 DIST windows_aarch64_gnullvm-0.48.0.crate 366543 BLAKE2B 9b10f65089fe6da3ff38a1061783f635644ae84f567f891eaced280af68f7ff3919b34289e8850aa34554bb0346903273ff0a7fa743ca8794c2d23a9f1b0185f SHA512 80c5aa74c5669f7acff3882a8e7575f15e8d7cc58c11a1cb731ff423eb9cc9ba43cc6b80e52803c0d44e6a9001655ba87de6f43a9fe858da6d6e3a5c983a2711
+DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996
 DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f
+DIST windows_aarch64_gnullvm-0.52.6.crate 435718 BLAKE2B 8b12ae02892cb69401329034bbca671d13bd268a112120b56b90504707cef89decfbd2560492844a9f0588fab62dc1476ab7e931126b939015d25a8cc91ca334 SHA512 f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5
 DIST windows_aarch64_msvc-0.42.2.crate 666981 BLAKE2B 9f3cc5592cdede08bcdc1e7c455325279e3b763d96942695e10dccf1dfc37a81c749b69a7d6de883d4c0fa6e8a0d2f578fe2a8d6c42ad8ef6282590bf8fc87b7 SHA512 d2dafa8c94d01c1b65ca1bd631d31f2ef842f1db7accb132ff78c3f8483221b991afd3391563e03dcec42bbc9cbdc0ebdab47b991d25af85b5ba2ac1bbf8db63
 DIST windows_aarch64_msvc-0.48.0.crate 671479 BLAKE2B 0c80f210437628e1d878d1d14e884fea532c7539b3030aa76d46f27d02372c715c6e33d7efdbbd770666472b44a66c30711a33d819ede9cdcd51c96355802d45 SHA512 617e47a7202f1db4dbd3ecea509682135ccd85e3a458c0331b9bc7aa1d84e5756b59c881cb098d5c6d4c951248d13c8253a8e8a50938e1997bd19ceba77262df
+DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff
 DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1
+DIST windows_aarch64_msvc-0.52.6.crate 832615 BLAKE2B adc8ff61b6dc96d39c92c7d4221ae6aa0575edfc016cfcd046067ca5d8fcfd56d10e8e227be1c038ce34684be22c7ccaf5f18cd5a7638d28fbff4ba15b48b90b SHA512 a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b
 DIST windows_i686_gnu-0.42.2.crate 736236 BLAKE2B 4ef0496462afc73d9d72af7e5da1e6d3506a92f8172930e88ae64ab97596ffd31c4f97fb969e9b677e30159c27f00a8e756deb006b630fb98ce83f03c8b762e2 SHA512 ad09d650a05cb91cb6b40f59025c023a4c286bc1194586697c506016df2b9b0d5b02606b81687bc634795a0d9a9b8a73e486599328ae09c853e8e5ba662fc59c
 DIST windows_i686_gnu-0.48.0.crate 741490 BLAKE2B 5a4a584f8d8ee5bbd2d4c5b6749a66f2d43fc9e4ef90faab2227709b270f0d46fc26578c029edd96877c71309316ddb32d91c39f46d88f9a484c614f866e3dbe SHA512 15149fdd48b61b6d993acd392dbd353d0280d984ea88745217e4207937174bb90cdd9701f69ff0fe06a842f03607cbb57937d20d79ab577181e605a8a8fadc68
+DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a
 DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e
+DIST windows_i686_gnu-0.52.6.crate 880402 BLAKE2B 5aab8ee07132eccb7695807eb44811beeb0657aadfb672c54e99b6ae39c067ba9b93e38fc69bb5b9b14a9759f263ccd5e301597d2727d83b31b49a409b6bd405 SHA512 a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822
+DIST windows_i686_gnullvm-0.52.6.crate 475940 BLAKE2B fec4fda8bb2bf319a501a22372fa642ae682e4dee3235b258a028190ee73220bfc55b3142f06249bb4579b17e5fde662bb2b121aefe18544653350d7d0fe7d8e SHA512 95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f
 DIST windows_i686_msvc-0.42.2.crate 724951 BLAKE2B b084286cd4927efd2889b149abf8a9fe9d3d777130db9e592982660dbf9a96a0f5e723ca121465787aa11877d2d29a5a7d7cf066cdc8fa7e90d7ca7dcb7677f1 SHA512 c1706fc36d4b157c020744a11b3eb5d7dfbf05a0b56775bc717e94b7fd725816b20154fdbcd69ac08dbfb8b8bbfa74fab72d7a9c10399aad6a1cc54cf597e804
 DIST windows_i686_msvc-0.48.0.crate 730056 BLAKE2B 4e4ad6ed94948145199c2ed50fc65e4af08455a0fd058bb0f763d481f30b029f99a2b8dbac087b29e762500a19270f6683baf62ba99d141eb002a5b0b5c8ea05 SHA512 11a50800e709712dbea907275bc0faa46d2eb2969118445ed5b932d9c5957a09592a5b26a40e554c1f5fd56c6d074a07637e6f88eedd2224e1001e62df7b469b
+DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e
 DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671
+DIST windows_i686_msvc-0.52.6.crate 901163 BLAKE2B 99ed34e052db5ba77bab240ed5d38ce450be347a794d63ec39b719304c32722c9999b540ab40abe0216318900b7412970df99dfb36d1516a9517cae0c77d1bdc SHA512 ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96
 DIST windows_x86_64_gnu-0.42.2.crate 699373 BLAKE2B 01c70809d564b16b268656e47295e99c992d8f9839fac8a51338a0e7c3b9cdcd0429c456ca8c1c139a8c687ed7ed6c43a82250889d881aadaa65bd037223e0a6 SHA512 5767af3c86e717f93137a89d442230e6b60a649057edb3ab104b1f82c0bcd64fe089dcdf2f4fd486a799bece1ddb5f0449641536b678211945e749ae24f35c1f
 DIST windows_x86_64_gnu-0.48.0.crate 703595 BLAKE2B b227efb78a99c43d0538cceadada3fa1840df29adc665787fdcf845b73e77d782da8a9f9aa602e1da61401b550d0107176feb6c397c922a6240b38cc8f04a180 SHA512 38eff1164fb37dbd2bbe53404b20cba92de84cbbd5e4eb9ad60d51fb43d6fdb8b87a1488e2c88ebd4b3ff3b708f93fdc05df4b14a285d3ff11c33ff0d9828602
+DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
 DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7
+DIST windows_x86_64_gnu-0.52.6.crate 836363 BLAKE2B e2335829155cdbd4a55cc9f9babc237e14e32aab97f6f91afabcdf80d2aee37d6fb4b8669aaf433ff532c85dba59b3d366c7d41b61a2f29b96f960169c900687 SHA512 c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb
 DIST windows_x86_64_gnullvm-0.42.2.crate 364068 BLAKE2B 64bc53e98eb3fc649c9b43a6e734de4e65088e41edacabd49f7afcc5dc6e1065c563ecfc682747dda05978dea2dba4f45c16fcc18c3b00684c3d93681e5a7deb SHA512 d39a8bc948110fe612d3f8d6628b3f0d56620df11d8a49e0fabb6c90389ad407582b3af10e4eab46c79b3d11d2e10753d73d9e55963fbeac085f41e9749bdba3
 DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d1579978045f4058b1a315083a8ab842bddf5800ec3460b1530ad88c3464acab712a229290aca235810de8a3b6a253859a354d9fa97277e58 SHA512 8d82fad4c8445030844708aa026a62f1ca43362b8e15f14b0d226c7e9cda04ffa0715087b6a025dbb738e8891de24fcc4a2df071a532917cf03c4a46f934f396
+DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
 DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0
+DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd
 DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788
 DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
+DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7
+DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
+DIST winnow-0.6.18.crate 163357 BLAKE2B 7a43eba294c43b187211c6eabc449775081f44405045ec4786c5f10290639e18d002e872f9db14caa94e26fd99079c7ce2f99e70dcb20d842c0886ac203d8ca8 SHA512 3a146d9dc8fe3fcc855f7766852cd69c49a28f9048d553d3952d7722d49216cb44652d98b15ae1ddee99b2bbc3caefb107a9b85c309242dac943deeca65a81dc
 DIST winnow-0.6.5.crate 159316 BLAKE2B d28c6a069e3d557335c09ae04f1d90a9086b1744d711e259da230c031a0302e270e304f8f9e8bc690c01cedcf07b46e05938ab3468b3e388ae8c51ac361b6408 SHA512 5395db16797beb158e9458099279abf53c5ea62c65584bbb9e0111213ab21c88cd0b0674062757e57ceb6c762a349f22db6ef60deef866fe15ebb0818287ab99
 DIST winsafe-0.0.19.crate 492820 BLAKE2B 4eba26861f85f668e134b08c60e9522b698aed61eaa5e6d4e89ef31c1b97953fa08a5157add52d9a306075df4ad97e9aaf1767eea4208b72401ec0bc1c3eb0e9 SHA512 0555ec74c5acbb69ab08e54d920094e806258079bffaff3f90297bb94a000c7da36d6eba0eae445d425c781465235dd70a198437cf83a1f113438bfd9baf4c21
+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.4.crate 27781 BLAKE2B 42d6176af3e8d046b42fa89eacc0bb249eb0a6e13dbe7e97890b0cae98c3cc0059255f15314bbc343610d60605bf2d13869402c17d36cbf7f495956496572212 SHA512 b3d1456e28d53723470644ae15a4298fa96a79593d90729221ca4e45a6f09de4d7c554703425c61595c4e78959652122db95865c0337cc0cd6a4ec57d7bea84d
+DIST yoke-derive-0.7.4.crate 7470 BLAKE2B e5c0ca6f9cad4336b6b7554d05c3926d1720707aa70b588ebb884426747eb7d3d82614ba20563a5e801c4645f90fed9e067f50f43749a66e52f20c4204fb94db SHA512 5be38b8ae8dcb640a3fcb097e5b118354b45a41a0367afeff3c2ba5d13458524e88f9433848f09c670533d36a49a0e2b393e23368921553b5bb008e66e8e4a40
 DIST zerocopy-0.7.31.crate 151100 BLAKE2B 0363306c4b0f024bf87d8d689bfa63b7a12fcbf670cfb07a27a69d5b8269c38eadb73319b8788842d292bc73eb41a2a16820cb265cdf40f6a1f9dade3aa44d5c SHA512 672c71003c26a6cae1fc0704e13210b20055e66ccb1682e590effda094ab6c0409d56060c7dc8e94e4a0295b55e476f50bd2145096cbdad7b14c4abf613a251e
+DIST zerocopy-0.7.35.crate 152645 BLAKE2B 8f13123c9d9257ac5a5c6954d38c3510fa658624442f7e03cdcc6db5a0977d9f26bb4e277be172b7872ec365cf6e58ac742e5578636f7698f9f37093e9249d9a SHA512 17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c
 DIST zerocopy-derive-0.7.31.crate 533507 BLAKE2B e0872636d43956d1405e296f51f313989b1cddd9911adc5f1c2a59274f9668003356bbc942cbe7f339d7173f8caca8378e7ba11461c181fa1b51e582bf833a5f SHA512 33a0e2b1045c6f584fd67c34a64d4262c848090acbeafbc75e4c553ec2e2d14dcb70285a1a2d840257757b1836fdb44778737aa06199cd4e831ac74623932827
+DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb
+DIST zerofrom-0.1.4.crate 5044 BLAKE2B 8ad9a14b8b0c251cffb420f7ac673669fd29b74bc2f5e220c8e86d592f58cbb2c7be88d906b7dac8803dbd76ec459c4a249b7d1ede75a055454a1626b387f128 SHA512 11f37a67108185a8090cda71338b02492fabd15e6cfe018833a165cd869ed65338e12d7c5680ffb0b763fc3acbdff6fe4df30457653dfe4d79ecc864b69d780f
+DIST zerofrom-derive-0.1.4.crate 8232 BLAKE2B 98f69cdeff7df52822b982e3c089ccfa3ac2ce67f320b0d32eeffa899d2b34627268ed0a01b03504a0a6fcb6bef34d808cc79c811d5daed7f8acf59282e82088 SHA512 f2ea4650fcb4e7c3583f0f7c6146c7734cf6e80e07d92c330c6bc6a0a4e0fe14ae3393845713331240c70685e92eec114565c5be21189e687fe6232aef75a9c0
+DIST zerovec-0.10.4.crate 126398 BLAKE2B b078784d6f178bbb9de1c3c1b6c7ef996f00bdd7dfd2924bda921e62f3e09e953fbf50f8d0da99ac6ff6d134f146253846f5663549dcf8df08eaf34b9d4016b3 SHA512 db12bba1d7476ddead92e6dfcdcc30e2e0defff4f263a740244eabee265a2cab265473a663d3dc3210f48e113b66d951da496dfab7965ce1bc792e5f2db422a0
+DIST zerovec-derive-0.10.3.crate 19438 BLAKE2B 9f7df8a4e4a0b62ab25aed967b26509db4bcc5d5b10b3bd73305099a4c49a60be8921484ced1a34d9b7ae30ffa5abe789686f432416a8f1cfc07de1db1dff594 SHA512 caefbffeb35265db9f74933bf07109d57f0da48156cafd4f330af78a5c7eb9ab0831a80789ad4fb119875ebc6cfd7e3de68c9984b77dca5151f9be41f1ae6e09
diff --git a/app-editors/helix/helix-24.03-r2.ebuild b/app-editors/helix/helix-24.03-r2.ebuild
deleted file mode 100644
index 46ee3c25397e..000000000000
--- a/app-editors/helix/helix-24.03-r2.ebuild
+++ /dev/null
@@ -1,362 +0,0 @@
-# Copyright 2024-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.13.2
-
-EAPI=8
-
-CRATES="
-	addr2line@0.20.0
-	adler@1.0.2
-	ahash@0.8.11
-	aho-corasick@1.1.2
-	allocator-api2@0.2.14
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	anyhow@1.0.81
-	arc-swap@1.7.1
-	autocfg@1.1.0
-	backtrace@0.3.68
-	bitflags@1.3.2
-	bitflags@2.5.0
-	bstr@1.8.0
-	bumpalo@3.12.0
-	bytes@1.4.0
-	cassowary@0.3.0
-	cc@1.0.90
-	cfg-if@1.0.0
-	chardetng@0.1.17
-	chrono@0.4.35
-	clipboard-win@5.3.0
-	clru@0.6.1
-	codespan-reporting@0.11.1
-	content_inspector@0.2.4
-	core-foundation-sys@0.8.4
-	cov-mark@1.1.0
-	crc32fast@1.3.2
-	crossbeam-channel@0.5.8
-	crossbeam-deque@0.8.3
-	crossbeam-epoch@0.9.15
-	crossbeam-utils@0.8.16
-	crossterm@0.27.0
-	crossterm_winapi@0.9.1
-	cxx-build@1.0.94
-	cxx@1.0.94
-	cxxbridge-flags@1.0.94
-	cxxbridge-macro@1.0.94
-	dunce@1.0.4
-	either@1.9.0
-	encoding_rs@0.8.33
-	encoding_rs_io@0.1.7
-	equivalent@1.0.0
-	errno@0.3.8
-	error-code@3.0.0
-	etcetera@0.8.0
-	faster-hex@0.9.0
-	fastrand@2.0.1
-	fern@0.6.2
-	filedescriptor@0.8.2
-	filetime@0.2.23
-	flate2@1.0.27
-	fnv@1.0.7
-	form_urlencoded@1.2.1
-	futures-core@0.3.30
-	futures-executor@0.3.30
-	futures-task@0.3.30
-	futures-util@0.3.30
-	getrandom@0.2.9
-	gimli@0.27.3
-	gix-actor@0.31.1
-	gix-attributes@0.22.2
-	gix-bitmap@0.2.11
-	gix-chunk@0.4.8
-	gix-command@0.3.6
-	gix-commitgraph@0.24.2
-	gix-config-value@0.14.6
-	gix-config@0.36.0
-	gix-date@0.8.5
-	gix-diff@0.42.0
-	gix-discover@0.31.0
-	gix-features@0.38.1
-	gix-filter@0.11.0
-	gix-fs@0.10.1
-	gix-glob@0.16.2
-	gix-hash@0.14.2
-	gix-hashtable@0.5.2
-	gix-ignore@0.11.2
-	gix-index@0.31.1
-	gix-lock@13.0.0
-	gix-macros@0.1.4
-	gix-object@0.42.1
-	gix-odb@0.59.0
-	gix-pack@0.49.0
-	gix-packetline-blocking@0.17.3
-	gix-path@0.10.7
-	gix-pathspec@0.7.2
-	gix-quote@0.4.12
-	gix-ref@0.43.0
-	gix-refspec@0.23.0
-	gix-revision@0.27.0
-	gix-revwalk@0.13.0
-	gix-sec@0.10.6
-	gix-submodule@0.10.0
-	gix-tempfile@13.0.0
-	gix-trace@0.1.8
-	gix-traverse@0.38.0
-	gix-url@0.27.2
-	gix-utils@0.1.11
-	gix-validate@0.8.4
-	gix-worktree@0.32.0
-	gix@0.61.0
-	globset@0.4.14
-	grep-matcher@0.1.7
-	grep-regex@0.1.12
-	grep-searcher@0.1.13
-	hashbrown@0.12.3
-	hashbrown@0.14.3
-	hermit-abi@0.2.6
-	home@0.5.9
-	iana-time-zone-haiku@0.1.1
-	iana-time-zone@0.1.56
-	idna@0.5.0
-	ignore@0.4.22
-	imara-diff@0.1.5
-	indexmap@2.0.0
-	indoc@2.0.5
-	is-docker@0.2.0
-	is-wsl@0.4.0
-	itoa@1.0.6
-	js-sys@0.3.61
-	kstring@2.0.0
-	libc@0.2.153
-	libloading@0.8.3
-	link-cplusplus@1.0.8
-	linux-raw-sys@0.4.12
-	lock_api@0.4.9
-	log@0.4.21
-	lsp-types@0.95.1
-	memchr@2.6.3
-	memmap2@0.9.0
-	memoffset@0.9.0
-	miniz_oxide@0.7.1
-	mio@0.8.11
-	nucleo-matcher@0.2.0
-	nucleo@0.2.1
-	num-traits@0.2.15
-	num_cpus@1.15.0
-	num_threads@0.1.6
-	object@0.31.1
-	once_cell@1.19.0
-	open@5.1.2
-	parking_lot@0.12.1
-	parking_lot_core@0.9.7
-	pathdiff@0.2.1
-	percent-encoding@2.3.1
-	pin-project-lite@0.2.12
-	pin-utils@0.1.0
-	proc-macro2@1.0.76
-	prodash@28.0.0
-	pulldown-cmark@0.10.0
-	quickcheck@1.0.3
-	quote@1.0.35
-	rand@0.8.5
-	rand_core@0.6.4
-	rayon-core@1.11.0
-	rayon@1.7.0
-	redox_syscall@0.2.16
-	redox_syscall@0.4.1
-	regex-automata@0.4.5
-	regex-cursor@0.1.4
-	regex-syntax@0.8.2
-	regex@1.10.4
-	ropey@1.6.1
-	rustc-demangle@0.1.23
-	rustix@0.38.32
-	ryu@1.0.13
-	same-file@1.0.6
-	scopeguard@1.1.0
-	scratch@1.0.5
-	serde@1.0.197
-	serde_derive@1.0.197
-	serde_json@1.0.114
-	serde_repr@0.1.12
-	serde_spanned@0.6.5
-	sha1_smol@1.0.0
-	shell-words@1.1.0
-	signal-hook-mio@0.2.3
-	signal-hook-registry@1.4.1
-	signal-hook-tokio@0.3.1
-	signal-hook@0.3.17
-	slab@0.4.8
-	slotmap@1.0.7
-	smallvec@1.13.2
-	smartstring@1.0.1
-	smawk@0.3.1
-	socket2@0.5.5
-	static_assertions@1.1.0
-	str_indices@0.4.1
-	syn@1.0.109
-	syn@2.0.48
-	tempfile@3.10.1
-	termcolor@1.2.0
-	termini@1.0.0
-	textwrap@0.16.1
-	thiserror-impl@1.0.58
-	thiserror@1.0.58
-	threadpool@1.8.1
-	time-core@0.1.1
-	time-macros@0.2.10
-	time@0.3.23
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	tokio-macros@2.2.0
-	tokio-stream@0.1.15
-	tokio@1.36.0
-	toml@0.8.12
-	toml_datetime@0.6.5
-	toml_edit@0.22.8
-	tree-sitter@0.22.2
-	unicase@2.6.0
-	unicode-bidi@0.3.13
-	unicode-bom@2.0.2
-	unicode-general-category@0.6.0
-	unicode-ident@1.0.8
-	unicode-linebreak@0.1.5
-	unicode-normalization@0.1.22
-	unicode-segmentation@1.11.0
-	unicode-width@0.1.11
-	url@2.5.0
-	version_check@0.9.4
-	walkdir@2.4.0
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-backend@0.2.84
-	wasm-bindgen-macro-support@0.2.84
-	wasm-bindgen-macro@0.2.84
-	wasm-bindgen-shared@0.2.84
-	wasm-bindgen@0.2.84
-	which@6.0.1
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.5
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-sys@0.45.0
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-targets@0.42.2
-	windows-targets@0.48.0
-	windows-targets@0.52.0
-	windows@0.48.0
-	windows_aarch64_gnullvm@0.42.2
-	windows_aarch64_gnullvm@0.48.0
-	windows_aarch64_gnullvm@0.52.0
-	windows_aarch64_msvc@0.42.2
-	windows_aarch64_msvc@0.48.0
-	windows_aarch64_msvc@0.52.0
-	windows_i686_gnu@0.42.2
-	windows_i686_gnu@0.48.0
-	windows_i686_gnu@0.52.0
-	windows_i686_msvc@0.42.2
-	windows_i686_msvc@0.48.0
-	windows_i686_msvc@0.52.0
-	windows_x86_64_gnu@0.42.2
-	windows_x86_64_gnu@0.48.0
-	windows_x86_64_gnu@0.52.0
-	windows_x86_64_gnullvm@0.42.2
-	windows_x86_64_gnullvm@0.48.0
-	windows_x86_64_gnullvm@0.52.0
-	windows_x86_64_msvc@0.42.2
-	windows_x86_64_msvc@0.48.0
-	windows_x86_64_msvc@0.52.0
-	winnow@0.6.5
-	winsafe@0.0.19
-	zerocopy-derive@0.7.31
-	zerocopy@0.7.31
-"
-
-inherit cargo desktop shell-completion xdg
-
-DESCRIPTION="A post-modern text editor"
-HOMEPAGE="
-	https://helix-editor.com/
-	https://github.com/helix-editor/helix
-"
-SRC_URI="
-	https://github.com/helix-editor/helix/releases/download/${PV}/${P}-source.tar.xz -> ${P}.tar.xz
-	${CARGO_CRATE_URIS}
-"
-
-S="${WORKDIR}"
-
-LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+grammar"
-
-RDEPEND="dev-vcs/git"
-
-QA_FLAGS_IGNORED="
-	usr/bin/hx
-	usr/share/helix/runtime/grammars/.*\.so
-"
-
-DOCS=(
-	README.md
-	CHANGELOG.md
-	book/
-	docs/
-)
-
-src_compile() {
-	use grammar || local -x HELIX_DISABLE_AUTO_GRAMMAR_BUILD=1
-
-	cargo_src_compile
-}
-
-src_install() {
-	cargo_src_install --path helix-term
-
-	insinto "/usr/$(get_libdir)/${PN}"
-	use grammar && doins runtime/grammars/*.so
-	rm -r runtime/grammars || die
-	use grammar && dosym "../../../$(get_libdir)/${PN}" "${EPREFIX}/usr/share/${PN}/runtime/grammars"
-
-	insinto /usr/share/helix
-	doins -r runtime
-	dodoc -r "${DOCS[@]}"
-
-	doicon -s 256x256 contrib/${PN}.png
-	domenu contrib/Helix.desktop
-
-	insinto /usr/share/metainfo
-	doins contrib/Helix.appdata.xml
-
-	newbashcomp contrib/completion/hx.bash hx
-	newzshcomp contrib/completion/hx.zsh _hx
-	dofishcomp contrib/completion/hx.fish
-
-	newenvd - 99helix <<< 'HELIX_RUNTIME="/usr/share/helix/runtime"'
-}
-
-pkg_postinst() {
-	einfo "The runtime files have been"
-	einfo "installed in '/usr/share/helix/runtime'. The environment variable"
-	einfo "HELIX_RUNTIME was also installed on your system. In running shell instances"
-	einfo "you need to run 'source /etc/profile' to pick up the new variable"
-	einfo "or manually set the environment variable HELIX_RUNTIME=/usr/share/helix/runtime."
-
-	if ! use grammar ; then
-		einfo ""
-		einfo "Grammars are not installed yet. To fetch and install them, run:"
-		einfo ""
-		einfo "  hx --grammar fetch"
-		einfo "  hx --grammar build"
-	fi
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-editors/helix/helix-25.01.ebuild b/app-editors/helix/helix-25.01.ebuild
new file mode 100644
index 000000000000..9e5575b46378
--- /dev/null
+++ b/app-editors/helix/helix-25.01.ebuild
@@ -0,0 +1,375 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.4
+
+EAPI=8
+
+CRATES="
+	addr2line@0.22.0
+	adler2@2.0.0
+	adler@1.0.2
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	allocator-api2@0.2.18
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anyhow@1.0.95
+	arc-swap@1.7.1
+	autocfg@1.3.0
+	backtrace@0.3.73
+	bitflags@2.6.0
+	bstr@1.10.0
+	bumpalo@3.16.0
+	bytes@1.7.1
+	cassowary@0.3.0
+	cc@1.2.6
+	cfg-if@1.0.0
+	chardetng@0.1.17
+	chrono@0.4.39
+	clipboard-win@5.4.0
+	clru@0.6.2
+	content_inspector@0.2.4
+	core-foundation-sys@0.8.7
+	crc32fast@1.4.2
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.20
+	crossterm@0.28.1
+	crossterm_winapi@0.9.1
+	dashmap@6.1.0
+	displaydoc@0.2.5
+	dunce@1.0.5
+	either@1.13.0
+	encoding_rs@0.8.35
+	encoding_rs_io@0.1.7
+	env_home@0.1.0
+	equivalent@1.0.1
+	errno@0.3.10
+	error-code@3.2.0
+	etcetera@0.8.0
+	faster-hex@0.9.0
+	fastrand@2.1.1
+	fern@0.7.1
+	filedescriptor@0.8.2
+	filetime@0.2.25
+	flate2@1.0.33
+	fnv@1.0.7
+	form_urlencoded@1.2.1
+	futures-core@0.3.31
+	futures-executor@0.3.31
+	futures-task@0.3.31
+	futures-util@0.3.31
+	getrandom@0.2.15
+	gimli@0.29.0
+	gix-actor@0.33.1
+	gix-attributes@0.23.1
+	gix-bitmap@0.2.13
+	gix-chunk@0.4.10
+	gix-command@0.4.0
+	gix-commitgraph@0.25.1
+	gix-config-value@0.14.10
+	gix-config@0.42.0
+	gix-date@0.9.3
+	gix-diff@0.49.0
+	gix-dir@0.11.0
+	gix-discover@0.37.0
+	gix-features@0.39.1
+	gix-filter@0.16.0
+	gix-fs@0.12.1
+	gix-glob@0.17.1
+	gix-hash@0.15.1
+	gix-hashtable@0.6.0
+	gix-ignore@0.12.1
+	gix-index@0.37.0
+	gix-lock@15.0.0
+	gix-object@0.46.1
+	gix-odb@0.66.0
+	gix-pack@0.56.0
+	gix-packetline-blocking@0.18.1
+	gix-packetline@0.18.2
+	gix-path@0.10.13
+	gix-pathspec@0.8.1
+	gix-protocol@0.47.0
+	gix-quote@0.4.14
+	gix-ref@0.49.1
+	gix-refspec@0.27.0
+	gix-revision@0.31.1
+	gix-revwalk@0.17.0
+	gix-sec@0.10.10
+	gix-shallow@0.1.0
+	gix-status@0.16.0
+	gix-submodule@0.16.0
+	gix-tempfile@15.0.0
+	gix-trace@0.1.11
+	gix-transport@0.44.0
+	gix-traverse@0.43.1
+	gix-url@0.28.2
+	gix-utils@0.1.13
+	gix-validate@0.9.2
+	gix-worktree@0.38.0
+	gix@0.69.1
+	globset@0.4.15
+	grep-matcher@0.1.7
+	grep-regex@0.1.13
+	grep-searcher@0.1.14
+	hashbrown@0.14.5
+	hermit-abi@0.3.9
+	home@0.5.9
+	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
+	ignore@0.4.23
+	imara-diff@0.1.7
+	indexmap@2.5.0
+	indoc@2.0.5
+	is-docker@0.2.0
+	is-wsl@0.4.0
+	itoa@1.0.11
+	jiff-tzdb-platform@0.1.1
+	jiff-tzdb@0.1.1
+	jiff@0.1.13
+	js-sys@0.3.70
+	kstring@2.0.2
+	libc@0.2.169
+	libloading@0.8.6
+	libredox@0.1.3
+	linux-raw-sys@0.4.14
+	litemap@0.7.3
+	lock_api@0.4.12
+	log@0.4.22
+	maybe-async@0.2.10
+	memchr@2.7.4
+	memmap2@0.9.4
+	miniz_oxide@0.7.4
+	miniz_oxide@0.8.0
+	mio@1.0.2
+	nucleo-matcher@0.3.1
+	nucleo@0.5.0
+	num-traits@0.2.19
+	num_cpus@1.16.0
+	object@0.36.4
+	once_cell@1.20.2
+	open@5.3.1
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	pathdiff@0.2.1
+	percent-encoding@2.3.1
+	pin-project-lite@0.2.14
+	pin-utils@0.1.0
+	portable-atomic@1.7.0
+	proc-macro2@1.0.86
+	prodash@29.0.0
+	pulldown-cmark@0.12.2
+	quickcheck@1.0.3
+	quote@1.0.37
+	rand@0.8.5
+	rand_core@0.6.4
+	rayon-core@1.12.1
+	rayon@1.10.0
+	redox_syscall@0.5.3
+	regex-automata@0.4.9
+	regex-cursor@0.1.4
+	regex-syntax@0.8.5
+	regex@1.11.1
+	ropey@1.6.1
+	rustc-demangle@0.1.24
+	rustix@0.38.42
+	ryu@1.0.18
+	same-file@1.0.6
+	scopeguard@1.2.0
+	serde@1.0.217
+	serde_derive@1.0.217
+	serde_json@1.0.134
+	serde_repr@0.1.19
+	serde_spanned@0.6.7
+	sha1_smol@1.0.1
+	shell-words@1.1.0
+	shlex@1.3.0
+	signal-hook-mio@0.2.4
+	signal-hook-registry@1.4.2
+	signal-hook-tokio@0.3.1
+	signal-hook@0.3.17
+	slab@0.4.9
+	slotmap@1.0.7
+	smallvec@1.13.2
+	smartstring@1.0.1
+	smawk@0.3.2
+	socket2@0.5.7
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	str_indices@0.4.3
+	syn@2.0.87
+	synstructure@0.13.1
+	tempfile@3.14.0
+	termini@1.0.0
+	textwrap@0.16.1
+	thiserror-impl@1.0.69
+	thiserror-impl@2.0.9
+	thiserror@1.0.69
+	thiserror@2.0.9
+	threadpool@1.8.1
+	tinystr@0.7.6
+	tinyvec@1.8.0
+	tinyvec_macros@0.1.1
+	tokio-macros@2.4.0
+	tokio-stream@0.1.17
+	tokio@1.42.0
+	toml@0.8.19
+	toml_datetime@0.6.8
+	toml_edit@0.22.20
+	tree-sitter@0.22.6
+	unicase@2.7.0
+	unicode-bom@2.0.3
+	unicode-general-category@1.0.0
+	unicode-ident@1.0.12
+	unicode-linebreak@0.1.5
+	unicode-normalization@0.1.23
+	unicode-segmentation@1.12.0
+	unicode-width@0.1.12
+	url@2.5.4
+	utf16_iter@1.0.5
+	utf8_iter@1.0.4
+	version_check@0.9.5
+	walkdir@2.5.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.93
+	wasm-bindgen-macro-support@0.2.93
+	wasm-bindgen-macro@0.2.93
+	wasm-bindgen-shared@0.2.93
+	wasm-bindgen@0.2.93
+	which@7.0.1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.9
+	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-sys@0.59.0
+	windows-targets@0.48.5
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.6
+	winnow@0.6.18
+	winsafe@0.0.19
+	write16@1.0.0
+	writeable@0.5.5
+	yoke-derive@0.7.4
+	yoke@0.7.4
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+	zerofrom-derive@0.1.4
+	zerofrom@0.1.4
+	zerovec-derive@0.10.3
+	zerovec@0.10.4
+"
+
+RUST_MIN_VER="1.76"
+
+inherit cargo desktop shell-completion xdg
+
+DESCRIPTION="A post-modern text editor"
+HOMEPAGE="
+	https://helix-editor.com/
+	https://github.com/helix-editor/helix
+"
+SRC_URI="
+	https://github.com/helix-editor/helix/releases/download/${PV}/${P}-source.tar.xz -> ${P}.tar.xz
+	${CARGO_CRATE_URIS}
+"
+S="${WORKDIR}"
+
+LICENSE="MPL-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD Boost-1.0 ISC MIT MPL-2.0 MPL-2.0 Unicode-DFS-2016
+	ZLIB
+"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="+grammar"
+
+RDEPEND="dev-vcs/git"
+
+pkg_setup() {
+	QA_FLAGS_IGNORED="
+		usr/bin/hx
+		/usr/$(get_libdir)/helix/.*\.so
+	"
+	export HELIX_DEFAULT_RUNTIME="${EPREFIX}/usr/share/${PN}/runtime"
+	use grammar || export HELIX_DISABLE_AUTO_GRAMMAR_BUILD=1
+	rust_pkg_setup
+}
+
+src_install() {
+	cargo_src_install --path helix-term
+
+	insinto "/usr/$(get_libdir)/${PN}"
+	use grammar && doins runtime/grammars/*.so
+	rm -r runtime/grammars || die
+	use grammar && dosym "../../../$(get_libdir)/${PN}" "${EPREFIX}/usr/share/${PN}/runtime/grammars"
+
+	insinto /usr/share/helix
+	doins -r runtime
+
+	doicon -s 256x256 contrib/${PN}.png
+	domenu contrib/Helix.desktop
+
+	insinto /usr/share/metainfo
+	doins contrib/Helix.appdata.xml
+
+	newbashcomp contrib/completion/hx.bash hx
+	newzshcomp contrib/completion/hx.zsh _hx
+	dofishcomp contrib/completion/hx.fish
+
+	DOCS=(
+		README.md
+		CHANGELOG.md
+		docs/
+	)
+	HTML_DOCS=(
+		book/
+	)
+	einstalldocs
+}
+
+pkg_postinst() {
+	if ! use grammar ; then
+		einfo "Grammars are not installed yet. To fetch them, run:"
+		einfo ""
+		einfo "  hx --grammar fetch && hx --grammar build"
+	fi
+
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
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-r1.ebuild b/app-editors/nano/nano-8.2-r1.ebuild
new file mode 100644
index 000000000000..087f82b40db1
--- /dev/null
+++ b/app-editors/nano/nano-8.2-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
+	inherit autotools git-r3
+else
+	MY_P="${PN}-${PV/_}"
+	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
+	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
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Guide"
+
+LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )"
+SLOT="0"
+IUSE="debug justify magic minimal ncurses nls +spell unicode"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
+	magic? ( sys-apps/file )
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	magic? ( !minimal )
+"
+
+# gnulib FPs
+QA_CONFIG_IMPL_DECL_SKIP=( unreachable MIN static_assert )
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--htmldir=/trash
+		$(use_enable !minimal color)
+		$(use_enable !minimal multibuffer)
+		$(use_enable !minimal nanorc)
+		$(use_enable magic libmagic)
+		$(use_enable spell speller)
+		$(use_enable justify)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable unicode utf8)
+		$(use_enable minimal tiny)
+	)
+
+	econf "${myconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Don't use "${ED}" here or things break (#654534)
+	rm -r "${D}"/trash || die
+
+	dodoc doc/sample.nanorc
+	docinto html
+	dodoc doc/faq.html
+	insinto /etc
+	newins doc/sample.nanorc nanorc
+
+	if ! use minimal ; then
+		# Enable colorization by default.
+		sed -i \
+			-e '/^# include /s:# *::' \
+			"${ED}"/etc/nanorc || die
+
+		# Since nano-5.0 these are no longer being "enabled" by default
+		# (bug #736848)
+		local rcdir="/usr/share/nano"
+		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
+		rmdir "${ED}"${rcdir}/extra || die
+
+		insinto "${rcdir}"
+		newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc
+	fi
+}
+
+pkg_postrm() {
+	[[ -n ${REPLACED_BY_VERSION} ]] && return
+
+	local e
+	e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}")
+	if [[ ${e##*/} == nano ]]; then
+		ewarn "The EDITOR variable is still set to ${e}."
+		ewarn "You can update it with \"eselect editor\"."
+	fi
+}
diff --git a/app-editors/nano/nano-8.2.ebuild b/app-editors/nano/nano-8.2.ebuild
deleted file mode 100644
index c5887d078ab6..000000000000
--- a/app-editors/nano/nano-8.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
-	inherit autotools git-r3
-else
-	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
-	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
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Guide"
-
-LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )"
-SLOT="0"
-IUSE="debug justify magic minimal ncurses nls +spell unicode"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
-	magic? ( sys-apps/file )
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	magic? ( !minimal )
-"
-
-# gnulib FPs
-QA_CONFIG_IMPL_DECL_SKIP=( unreachable MIN static_assert )
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-	)
-
-	econf "${myconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Don't use "${ED}" here or things break (#654534)
-	rm -r "${D}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED}"/etc/nanorc || die
-
-		# Since nano-5.0 these are no longer being "enabled" by default
-		# (bug #736848)
-		local rcdir="/usr/share/nano"
-		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-		rmdir "${ED}"${rcdir}/extra || die
-
-		insinto "${rcdir}"
-		newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc
-	fi
-}
-
-pkg_postrm() {
-	[[ -n ${REPLACED_BY_VERSION} ]] && return
-
-	local e
-	e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}")
-	if [[ ${e##*/} == nano ]]; then
-		ewarn "The EDITOR variable is still set to ${e}."
-		ewarn "You can update it with \"eselect editor\"."
-	fi
-}
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-editors/vscode/Manifest b/app-editors/vscode/Manifest
index f8f862f6108c..919d5d64073a 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -1,9 +1,6 @@
-DIST vscode-1.96.0-amd64.tar.gz 149448388 BLAKE2B ab54f0044d819a76acfb9f637a15c7118db30f5b1f84df622b8aa48aca7cbffa85115f187990c16105c8548ea1a1caa29f18fbb395f307710c8d273c6fd3a300 SHA512 9ac57fc51c42bd62aa3094be5f5184c194255af9a32b5454b66d648f7f315b2323717fce50637debd0d6ec5f9bb94ba9366b92eec6d06e952bb2c52a37dbc77a
-DIST vscode-1.96.0-arm.tar.gz 133515870 BLAKE2B addead61ed9dc147f28e3fd0f2bf49036d24bd0301a1fd6fc014743af72d0c3b10c8e1e515a31b50d030e2642eda325d02110fab245c3ec4635485aae8243f40 SHA512 8b110086e94b88093909724b14653394c91e6047560c4090c5e1e9c0d84dbe1525b9281c1e60fdb70675fb5588bc031028207f3f4d3ca11069c3e7bac51301ec
-DIST vscode-1.96.0-arm64.tar.gz 145446774 BLAKE2B 985a06ac1a3aae33b308dab803901ca468752a92474a9983a0c9e61d257c9e18d9d60114b7ed6dbd8d71d563695931863fcf1ef20872d2644c61a0b3bdc69257 SHA512 8c0a53506b4992ec4b3ed9655bee6cccea89a1b7e29dc9baca6af7656383b10562707f14820bfbe48bf74defcba294ecfe7751cac7063ede9082a1484d4fba0d
-DIST vscode-1.96.1-amd64.tar.gz 149426003 BLAKE2B 0de1b15b5858faaa7293f1991a75f1e1317f62c5479235f8c4b0d4dfbe5e07db7dcb57002b1889be80979a65c31ca6069d94f5486628ef0cb14a144f8df9a082 SHA512 c4190963437c8b10f6ee03ad38c91bbaf710f35017c9ef0547836df9deba462ee2da2e0262669dfc494bacdb3e175ae1e83138d977538c190521e35441b2f57a
-DIST vscode-1.96.1-arm.tar.gz 133485634 BLAKE2B b384ea0163106f0074a7f156319a17398f1d0780b2698abcd4f9ba16df07d2c252e27db2710876928a286f259b07586b560d9fafbef02bd0161daa102c0d1d8f SHA512 cd68531c9c90aaa76a4289e87e377ca7de5e1a721db27d169aad95e3319d312cae3ced447b6405f23b6f3a4b8fc40ea3830ed6039c4785b67f9a72f483809aee
-DIST vscode-1.96.1-arm64.tar.gz 145430910 BLAKE2B 31a6883572c2e34f7d8b301f3e2e1f82ca48f37c55df1156a6a1c0d4f51cb9a2f7e00694b102bdd70063a65eb3a2d3b685b992dd9fb87e9e8c5421e20a283b7a SHA512 dc92380bcfd4a08ffa6ec56a5df99fa36b43282ea8de1243bd7d171b24d7afe33eec02fd3b56a17372a8400bf293ec2ace1b8ebe6f92b5d9177239dd26a35c40
-DIST vscode-1.96.2-amd64.tar.gz 149445440 BLAKE2B 8ce96afc00e318ad5010d26e8ad27a4c160e4b5b1eb56c50816887170015da9bddf6d05f13d284b2256ecb16ce84f1bc0b50b3ce7a60ff12409f14bdb1031406 SHA512 840f38166f25e6b6f5ab79b7f5249be784e6861a35b17e32e0f14431dd3c3a44e85fd43f27c4c2a4fc2defe49a1e1158f1a431c9242efe668ac92c0ecbc7f3c9
-DIST vscode-1.96.2-arm.tar.gz 133505393 BLAKE2B 242ece1e995211d98b6854ed9468f613789605530c2f46563ccaaddfae4adae853bb44ed79fd49cd3f60910c6ddf7ed3a871b18d36413f17352303e3c7d64814 SHA512 956ea48931a5fb3aa97ee953ab9ef203f1ce534a58d71574924179ae8df3fb1557e3ecc37f60b8090b70516f02c0c456c6d71db9d020a595e248092899f311a7
-DIST vscode-1.96.2-arm64.tar.gz 145441808 BLAKE2B 183b7c3a3754dc155fcadef184e6273f641c52493e32ce4c9e113c8904347746322537ffee1d393116f7e6caeb0729971253bd44fe19645780a1f2658b96ace5 SHA512 11fdcffddae0112e86e9cfde411028cf467ed59bb3fb68321616937a8f68f4d279878f0ed67d9be94036ce8e076959b9541ac07122ee64054813e5fe9a414255
+DIST vscode-1.96.3-amd64.tar.gz 149447740 BLAKE2B d27ffd0b7ec39b754ec5b7bcc40642fbf02699a90f8ce23e97f677e4983814579f6215e995f9810f1c357f522ecf1c7598affeec0bbaea08787d103388b8a6f3 SHA512 8b77d82d08ec5a53e802bc3b38d6177287519eff689b6aa57e6f722e99ec27035cf41caaed024192d61b23001c2a21ff9ebdebc496fcdbbd855b061e163ea882
+DIST vscode-1.96.3-arm.tar.gz 133495363 BLAKE2B 43a77542b9654e63c3f2cf3534fc5bae82780c9294f2dee1ebf8e19aca93b692eed9b74605b5073a1f5a3e235bb8510c8c365f61391cc30985727e9e382e4792 SHA512 0d20d87056b6e4015ae692279943f013e459ebfa55a5bf753a1ad7dfe9f0476e0456f1dd5ea80720c2df5ed4b616808ad8806fa8cb325886f8cbfae0d0b8d1b1
+DIST vscode-1.96.3-arm64.tar.gz 145452700 BLAKE2B 5e4a2ba15479549feb832a9d1feec69e0c4313146a265d351e6d811126cff7f07224db9e76faa829d0a615f94dacbc54184778ceeb3f7825796325dc792cecd4 SHA512 7a5a6360f2d2b84c4ec9747a8408c0223c1a6f6694405bd9da05e052a74842084b87c2f6d711d974fc43f08ff74bcf9864e1ddadb1fac390967a27c99912ff7f
+DIST vscode-1.96.4-amd64.tar.gz 149442416 BLAKE2B 50003ff1b0bc04f53040d6b3119826bb92a9318dfa54d42ce326f2b9e6d00f8c0e57f3a0119d994ae7a5b773964c488115f70b0ce6d95840d206fc5397bc6e24 SHA512 67b25bb6f130aaaa74bfc98d9636ead3db03ad09827e71848a578b87ad90de940b6379d0d71acc6c8305ddabb47f3826ee12ee9eb17e51fd7b8b5112e70ac461
+DIST vscode-1.96.4-arm.tar.gz 133502392 BLAKE2B 5c01b9c40332cc39f66de17b37623d26b92a9fae797526caef472274e8c5d6c5f84dc52e110cea4a0288ae229634748fa1d0b1992ac5c57fb8a27b9a00cbf205 SHA512 1233dcdcabe640be59ddd9f3d6da1d34ccff165406dc2139b387708f5b95c941b1bb9e7506e3ae50af164ee9192d6f33cb99248f52eac5082bf352c508a31673
+DIST vscode-1.96.4-arm64.tar.gz 145445086 BLAKE2B 4caddcccb57e9e8623cbcf03f4fb9dfb6c9cf2a4456f655346cf0ddc264a9e96a99a768695080f382972c4e876651c334405f23dadcccbe412e866ccd6b15631 SHA512 fb987dfd85c529be46c7a76d4a44c4a3aa0a4e6a0a9df2cfa5e4984d4849cbfbf772dff6b410957fab92f560a56bea499309d14b682d293ac8e9dfb56c601e71
diff --git a/app-editors/vscode/vscode-1.96.0.ebuild b/app-editors/vscode/vscode-1.96.0.ebuild
deleted file mode 100644
index 57c59f907d74..000000000000
--- a/app-editors/vscode/vscode-1.96.0.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils xdg optfeature
-
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
-HOMEPAGE="https://code.visualstudio.com"
-SRC_URI="
-	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
-	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
-	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
-"
-S="${WORKDIR}"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	Microsoft-vscode
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64"
-IUSE="egl kerberos wayland"
-RESTRICT="mirror strip bindist"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret[crypt]
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/libglvnd
-	media-libs/mesa
-	net-misc/curl
-	sys-apps/dbus
-	sys-libs/zlib
-	sys-process/lsof
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/pango
-	x11-misc/xdg-utils
-	kerberos? ( app-crypt/mit-krb5 )
-"
-
-QA_PREBUILT="*"
-
-src_install() {
-	if use amd64; then
-		cd "${WORKDIR}/VSCode-linux-x64" || die
-	elif use arm; then
-		cd "${WORKDIR}/VSCode-linux-armhf" || die
-	elif use arm64; then
-		cd "${WORKDIR}/VSCode-linux-arm64" || die
-	else
-		die "Visual Studio Code only supports amd64, arm and arm64"
-	fi
-
-	# Cleanup
-	rm -r ./resources/app/ThirdPartyNotices.txt || die
-
-	# Disable update server
-	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
-
-	if ! use kerberos; then
-		rm -r ./resources/app/node_modules/kerberos || die
-	fi
-
-	# Install
-	pax-mark m code
-	mkdir -p "${ED}/opt/${PN}" || die
-	cp -r . "${ED}/opt/${PN}" || die
-	fperms 4711 /opt/${PN}/chrome-sandbox
-
-	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
-	dosym -r "/opt/${PN}/bin/code" "usr/bin/code"
-
-	local EXEC_EXTRA_FLAGS=()
-	if use wayland; then
-		EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" "--enable-wayland-ime" )
-	fi
-	if use egl; then
-		EXEC_EXTRA_FLAGS+=( "--use-gl=egl" )
-	fi
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/code-url-handler.desktop" \
-		> "${T}/code-url-handler.desktop" || die
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/code.desktop" \
-		> "${T}/code.desktop" || die
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/code-open-in-new-window.desktop" \
-		> "${T}/code-open-in-new-window.desktop" || die
-
-	domenu "${T}/code.desktop"
-	domenu "${T}/code-url-handler.desktop"
-	domenu "${T}/code-open-in-new-window.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscode.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "desktop notifications" x11-libs/libnotify
-	optfeature "keyring support inside vscode" "virtual/secret-service"
-	optfeature "Live Share" dev-libs/icu
-}
diff --git a/app-editors/vscode/vscode-1.96.1.ebuild b/app-editors/vscode/vscode-1.96.1.ebuild
deleted file mode 100644
index 57c59f907d74..000000000000
--- a/app-editors/vscode/vscode-1.96.1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils xdg optfeature
-
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
-HOMEPAGE="https://code.visualstudio.com"
-SRC_URI="
-	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
-	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
-	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
-"
-S="${WORKDIR}"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	Microsoft-vscode
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64"
-IUSE="egl kerberos wayland"
-RESTRICT="mirror strip bindist"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret[crypt]
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/libglvnd
-	media-libs/mesa
-	net-misc/curl
-	sys-apps/dbus
-	sys-libs/zlib
-	sys-process/lsof
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/pango
-	x11-misc/xdg-utils
-	kerberos? ( app-crypt/mit-krb5 )
-"
-
-QA_PREBUILT="*"
-
-src_install() {
-	if use amd64; then
-		cd "${WORKDIR}/VSCode-linux-x64" || die
-	elif use arm; then
-		cd "${WORKDIR}/VSCode-linux-armhf" || die
-	elif use arm64; then
-		cd "${WORKDIR}/VSCode-linux-arm64" || die
-	else
-		die "Visual Studio Code only supports amd64, arm and arm64"
-	fi
-
-	# Cleanup
-	rm -r ./resources/app/ThirdPartyNotices.txt || die
-
-	# Disable update server
-	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
-
-	if ! use kerberos; then
-		rm -r ./resources/app/node_modules/kerberos || die
-	fi
-
-	# Install
-	pax-mark m code
-	mkdir -p "${ED}/opt/${PN}" || die
-	cp -r . "${ED}/opt/${PN}" || die
-	fperms 4711 /opt/${PN}/chrome-sandbox
-
-	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
-	dosym -r "/opt/${PN}/bin/code" "usr/bin/code"
-
-	local EXEC_EXTRA_FLAGS=()
-	if use wayland; then
-		EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" "--enable-wayland-ime" )
-	fi
-	if use egl; then
-		EXEC_EXTRA_FLAGS+=( "--use-gl=egl" )
-	fi
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/code-url-handler.desktop" \
-		> "${T}/code-url-handler.desktop" || die
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/code.desktop" \
-		> "${T}/code.desktop" || die
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/code-open-in-new-window.desktop" \
-		> "${T}/code-open-in-new-window.desktop" || die
-
-	domenu "${T}/code.desktop"
-	domenu "${T}/code-url-handler.desktop"
-	domenu "${T}/code-open-in-new-window.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscode.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "desktop notifications" x11-libs/libnotify
-	optfeature "keyring support inside vscode" "virtual/secret-service"
-	optfeature "Live Share" dev-libs/icu
-}
diff --git a/app-editors/vscode/vscode-1.96.2.ebuild b/app-editors/vscode/vscode-1.96.2.ebuild
deleted file mode 100644
index 57c59f907d74..000000000000
--- a/app-editors/vscode/vscode-1.96.2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils xdg optfeature
-
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
-HOMEPAGE="https://code.visualstudio.com"
-SRC_URI="
-	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
-	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
-	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
-"
-S="${WORKDIR}"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	Microsoft-vscode
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64"
-IUSE="egl kerberos wayland"
-RESTRICT="mirror strip bindist"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret[crypt]
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/libglvnd
-	media-libs/mesa
-	net-misc/curl
-	sys-apps/dbus
-	sys-libs/zlib
-	sys-process/lsof
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/pango
-	x11-misc/xdg-utils
-	kerberos? ( app-crypt/mit-krb5 )
-"
-
-QA_PREBUILT="*"
-
-src_install() {
-	if use amd64; then
-		cd "${WORKDIR}/VSCode-linux-x64" || die
-	elif use arm; then
-		cd "${WORKDIR}/VSCode-linux-armhf" || die
-	elif use arm64; then
-		cd "${WORKDIR}/VSCode-linux-arm64" || die
-	else
-		die "Visual Studio Code only supports amd64, arm and arm64"
-	fi
-
-	# Cleanup
-	rm -r ./resources/app/ThirdPartyNotices.txt || die
-
-	# Disable update server
-	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
-
-	if ! use kerberos; then
-		rm -r ./resources/app/node_modules/kerberos || die
-	fi
-
-	# Install
-	pax-mark m code
-	mkdir -p "${ED}/opt/${PN}" || die
-	cp -r . "${ED}/opt/${PN}" || die
-	fperms 4711 /opt/${PN}/chrome-sandbox
-
-	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
-	dosym -r "/opt/${PN}/bin/code" "usr/bin/code"
-
-	local EXEC_EXTRA_FLAGS=()
-	if use wayland; then
-		EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" "--enable-wayland-ime" )
-	fi
-	if use egl; then
-		EXEC_EXTRA_FLAGS+=( "--use-gl=egl" )
-	fi
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/code-url-handler.desktop" \
-		> "${T}/code-url-handler.desktop" || die
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/code.desktop" \
-		> "${T}/code.desktop" || die
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/code-open-in-new-window.desktop" \
-		> "${T}/code-open-in-new-window.desktop" || die
-
-	domenu "${T}/code.desktop"
-	domenu "${T}/code-url-handler.desktop"
-	domenu "${T}/code-open-in-new-window.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscode.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "desktop notifications" x11-libs/libnotify
-	optfeature "keyring support inside vscode" "virtual/secret-service"
-	optfeature "Live Share" dev-libs/icu
-}
diff --git a/app-editors/vscode/vscode-1.96.3.ebuild b/app-editors/vscode/vscode-1.96.3.ebuild
new file mode 100644
index 000000000000..04f694acb893
--- /dev/null
+++ b/app-editors/vscode/vscode-1.96.3.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils xdg optfeature
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
+	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
+	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	Microsoft-vscode
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* amd64 ~arm ~arm64"
+IUSE="egl kerberos wayland"
+RESTRICT="mirror strip bindist"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret[crypt]
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/libglvnd
+	media-libs/mesa
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib
+	sys-process/lsof
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/pango
+	x11-misc/xdg-utils
+	kerberos? ( app-crypt/mit-krb5 )
+"
+
+QA_PREBUILT="*"
+
+src_install() {
+	if use amd64; then
+		cd "${WORKDIR}/VSCode-linux-x64" || die
+	elif use arm; then
+		cd "${WORKDIR}/VSCode-linux-armhf" || die
+	elif use arm64; then
+		cd "${WORKDIR}/VSCode-linux-arm64" || die
+	else
+		die "Visual Studio Code only supports amd64, arm and arm64"
+	fi
+
+	# Cleanup
+	rm -r ./resources/app/ThirdPartyNotices.txt || die
+
+	# Disable update server
+	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
+
+	if ! use kerberos; then
+		rm -r ./resources/app/node_modules/kerberos || die
+	fi
+
+	# Install
+	pax-mark m code
+	mkdir -p "${ED}/opt/${PN}" || die
+	cp -r . "${ED}/opt/${PN}" || die
+	fperms 4711 /opt/${PN}/chrome-sandbox
+
+	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
+	dosym -r "/opt/${PN}/bin/code" "usr/bin/code"
+
+	local EXEC_EXTRA_FLAGS=()
+	if use wayland; then
+		EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" "--enable-wayland-ime" )
+	fi
+	if use egl; then
+		EXEC_EXTRA_FLAGS+=( "--use-gl=egl" )
+	fi
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/code-url-handler.desktop" \
+		> "${T}/code-url-handler.desktop" || die
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/code.desktop" \
+		> "${T}/code.desktop" || die
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/code-open-in-new-window.desktop" \
+		> "${T}/code-open-in-new-window.desktop" || die
+
+	domenu "${T}/code.desktop"
+	domenu "${T}/code-url-handler.desktop"
+	domenu "${T}/code-open-in-new-window.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscode.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "keyring support inside vscode" "virtual/secret-service"
+	optfeature "Live Share" dev-libs/icu
+}
diff --git a/app-editors/vscode/vscode-1.96.4.ebuild b/app-editors/vscode/vscode-1.96.4.ebuild
new file mode 100644
index 000000000000..04f694acb893
--- /dev/null
+++ b/app-editors/vscode/vscode-1.96.4.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils xdg optfeature
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
+	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
+	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	Microsoft-vscode
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* amd64 ~arm ~arm64"
+IUSE="egl kerberos wayland"
+RESTRICT="mirror strip bindist"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret[crypt]
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/libglvnd
+	media-libs/mesa
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib
+	sys-process/lsof
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/pango
+	x11-misc/xdg-utils
+	kerberos? ( app-crypt/mit-krb5 )
+"
+
+QA_PREBUILT="*"
+
+src_install() {
+	if use amd64; then
+		cd "${WORKDIR}/VSCode-linux-x64" || die
+	elif use arm; then
+		cd "${WORKDIR}/VSCode-linux-armhf" || die
+	elif use arm64; then
+		cd "${WORKDIR}/VSCode-linux-arm64" || die
+	else
+		die "Visual Studio Code only supports amd64, arm and arm64"
+	fi
+
+	# Cleanup
+	rm -r ./resources/app/ThirdPartyNotices.txt || die
+
+	# Disable update server
+	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
+
+	if ! use kerberos; then
+		rm -r ./resources/app/node_modules/kerberos || die
+	fi
+
+	# Install
+	pax-mark m code
+	mkdir -p "${ED}/opt/${PN}" || die
+	cp -r . "${ED}/opt/${PN}" || die
+	fperms 4711 /opt/${PN}/chrome-sandbox
+
+	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
+	dosym -r "/opt/${PN}/bin/code" "usr/bin/code"
+
+	local EXEC_EXTRA_FLAGS=()
+	if use wayland; then
+		EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" "--enable-wayland-ime" )
+	fi
+	if use egl; then
+		EXEC_EXTRA_FLAGS+=( "--use-gl=egl" )
+	fi
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/code-url-handler.desktop" \
+		> "${T}/code-url-handler.desktop" || die
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/code.desktop" \
+		> "${T}/code.desktop" || die
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/code-open-in-new-window.desktop" \
+		> "${T}/code-open-in-new-window.desktop" || die
+
+	domenu "${T}/code.desktop"
+	domenu "${T}/code-url-handler.desktop"
+	domenu "${T}/code-open-in-new-window.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscode.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "keyring support inside vscode" "virtual/secret-service"
+	optfeature "Live Share" dev-libs/icu
+}
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index 8da9df47283b..151bcf70c7d1 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -1,7 +1,3 @@
-DIST vscodium-1.96.0.24347-amd64.tar.gz 136734771 BLAKE2B bd849a59b75a7ff0c8c18fe07ae66352b551df553b2bee60f9ad31ad7cadd8805d0112c2acde9b14ca22ab119f641e2f88feec4dabd687d9dda40b38c8709f94 SHA512 7e797c50399f6ae8aaec2586bd9b1c401a152cab7d10bd1b30684252351ef2f30764f1c9979992e1c86e4931b68a3205f29e475edbf48d897fc5feb7e8ec67bf
-DIST vscodium-1.96.0.24347-arm.tar.gz 122778879 BLAKE2B bf695c654718c63af5822fc7820a1e50e7031b0f375a5aeff73c30e9b7037de8c7e1410bc195d9a9a1b47b20f5589b414477766ee6fd250742b69c9d14272d13 SHA512 0a07e7fc457f373eaa45124641bb31d5f61495ec47741e145e172bcf08e916053b890c8208855832018f58d3e8a41c9535f8c9bf9391cbaa7b3a12c7e8ff55e2
-DIST vscodium-1.96.0.24347-arm64.tar.gz 134689376 BLAKE2B 8691d8c4694276e2b05bf09bb9f39b5bd6f458cee424d3ebbb0c9afe89287f6062861ef7e895623f9793f72825be3e7dbb1009b04c44351e424664bedd0ebe30 SHA512 6e628308913dc99f2d290d84abd429ef93ae2bbf6277c4d73556e91d2865b38a881f6fa84c25a1ac0070bf00c20eee565895a56a5dba395ef6cb74e3d8d3a13b
-DIST vscodium-1.96.0.24347-loong.tar.gz 142668160 BLAKE2B a149bc53a7c61de3db9dd106a26fa4bb1b40187932648d4f8051215f02d8283abadb2e8b9a3217f24a2c1ae690173a91239bfab746334a2d989b892b7b5f370a SHA512 10f161fe88395e9338e7025ffcc5500628f86082b844ab63763cd34309178daeea99e559c9a5bc37a5bdfdf7d0814aa4de832a4c87a2e251e33195b93f190ae1
 DIST vscodium-1.96.2.24355-amd64.tar.gz 136733609 BLAKE2B 1033f3a58725c7ec0b1264a51a10fbb448b4c70c30b60e6aa63b8e72aeb0d14d64d1b9be4ff44ce7ee67915de6c79dde07125e22f9420b715ae79cf3dc6a20a1 SHA512 d3d8f150da9382a3a94a9fefab4c42d15ff23949e2e7f153f9e92ae48d3dc9c3322a547fdc5837b7c4511bf73caa2d993b6d59717307d31e1e587a108b183551
 DIST vscodium-1.96.2.24355-arm.tar.gz 122782157 BLAKE2B ab20f464ebb9406d68643998d9e5d6aa29ca1482705f763d1c24458b0295e9bc7ef1022ed41e59e507e5b6032425e9d69c2cefcf45e40359747a669ab5de9c4f SHA512 bdedec06c3cfd9954754706c3b69da8cb8e8cbfe17517816964aba8475a6fcc2ebba248f8310ad098ca73323e7057d2d2263dfd719b44177eb8566fc1c65c0bd
 DIST vscodium-1.96.2.24355-arm64.tar.gz 134688898 BLAKE2B 873c01669c79f754ad5ca892afc0f09cba5c2423aad107ca99fc8197469921dc94e97df3d5c773635c497e7c67b43a71361cfd6fd05f16c41ef148b0ca3ac511 SHA512 cd2802cc250fc5cdfd41df7244c7629ace31c219f5ca132030b0a506b62b154c409cc44629212026e927fd83d54a60ade25e0df0572262f1c3358db4873e3700
diff --git a/app-editors/vscodium/vscodium-1.96.0.24347.ebuild b/app-editors/vscodium/vscodium-1.96.0.24347.ebuild
deleted file mode 100644
index 038abc0e1fe3..000000000000
--- a/app-editors/vscodium/vscodium-1.96.0.24347.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils xdg optfeature
-
-# Usage: arch_src_uri <gentoo arch> <upstream arch>
-arch_src_uri() {
-	echo "${1}? (
-		https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-${2}-${PV}.tar.gz
-			-> ${P}-${1}.tar.gz
-	)"
-}
-
-DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
-HOMEPAGE="https://vscodium.com/"
-SRC_URI="
-	$(arch_src_uri amd64 x64)
-	$(arch_src_uri arm armhf)
-	$(arch_src_uri arm64 arm64)
-	$(arch_src_uri loong loong64)
-"
-S="${WORKDIR}"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64 ~loong"
-IUSE="egl kerberos wayland"
-RESTRICT="strip bindist"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret[crypt]
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/libglvnd
-	media-libs/mesa
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/zlib
-	sys-process/lsof
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/pango
-	x11-misc/xdg-utils
-	kerberos? ( app-crypt/mit-krb5 )
-"
-
-QA_PREBUILT="*"
-
-src_install() {
-	# Cleanup license file - it exists only in amd64 tarball
-	rm -f "${S}/resources/app/LICENSE.txt" || die
-
-	if ! use kerberos; then
-		rm -rf "${S}/resources/app/node_modules.asar.unpacked/kerberos" || die
-	fi
-
-	# Install
-	pax-mark m codium
-	mkdir -p "${ED}/opt/${PN}" || die
-	cp -r . "${ED}/opt/${PN}" || die
-	fperms 4711 /opt/${PN}/chrome-sandbox
-
-	dosym -r "/opt/${PN}/bin/codium" "usr/bin/vscodium"
-	dosym -r "/opt/${PN}/bin/codium" "usr/bin/codium"
-
-	local EXEC_EXTRA_FLAGS=()
-	if use wayland; then
-		EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" )
-	fi
-	if use egl; then
-		EXEC_EXTRA_FLAGS+=( "--use-gl=egl" )
-	fi
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/codium-url-handler.desktop" \
-		> "${T}/codium-url-handler.desktop" || die
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/codium.desktop" \
-		> "${T}/codium.desktop" || die
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/code-open-in-new-window.desktop" \
-		> "${T}/code-open-in-new-window.desktop" || die
-
-	domenu "${T}/codium.desktop"
-	domenu "${T}/codium-url-handler.desktop"
-	domenu "${T}/codium-open-in-new-window.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscodium.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "When compared to the regular VSCode, VSCodium has a few quirks"
-	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/docs/index.md"
-	optfeature "desktop notifications" x11-libs/libnotify
-	optfeature "keyring support inside vscode" "virtual/secret-service"
-}
diff --git a/app-editors/xemacs/metadata.xml b/app-editors/xemacs/metadata.xml
index 07a844ae677c..27c5d797810a 100644
--- a/app-editors/xemacs/metadata.xml
+++ b/app-editors/xemacs/metadata.xml
@@ -6,8 +6,6 @@
   </maintainer>
   <use>
     <flag name="athena">Chooses the MIT Athena widget set</flag>
-    <flag name="dnd">Enables support for the <pkg>x11-libs/dnd</pkg>
-      drag-n-drop library</flag>
     <flag name="pop">Support POP for mail retrieval</flag>
     <flag name="xim">Enable X11 XiM input method</flag>
     <flag name="bignum">Support for OpenSSL bignum implementation</flag>
diff --git a/app-editors/xemacs/xemacs-21.5.35-r4.ebuild b/app-editors/xemacs/xemacs-21.5.35-r4.ebuild
deleted file mode 100644
index 4b40276b8055..000000000000
--- a/app-editors/xemacs/xemacs-21.5.35-r4.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI=8
-
-inherit flag-o-matic xdg-utils desktop autotools
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="https://www.xemacs.org/"
-
-SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 1-2)/${P}.tar.gz
-	neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif xft xim athena neXt Xaw3d gdbm berkdb +bignum"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
-	berkdb? ( >=sys-libs/db-4:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb(+)] )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0=
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap:= )
-	alsa? ( media-libs/alsa-lib )
-	nas? ( media-libs/nas )
-	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/motif-2.3:0[xft=] )
-	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
-	xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:= )
-	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	>=sys-libs/ncurses-5.2:=
-	>=app-eselect/eselect-emacs-1.15
-	bignum? ( dev-libs/openssl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BDEPEND="sys-apps/texinfo"
-
-PDEPEND="app-xemacs/xemacs-base
-	app-xemacs/mule-base"
-
-src_unpack() {
-	default_src_unpack
-}
-
-src_prepare() {
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-	find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
-	eapply "${FILESDIR}/${P}-configure.patch"
-	eapply "${FILESDIR}/${P}-mule-tests.patch"
-	eapply "${FILESDIR}/${P}-configure-libc-version.patch"
-	eapply "${FILESDIR}/${P}-which.patch"
-	eapply "${FILESDIR}/${P}-misalignment.patch"
-	eapply "${FILESDIR}/${P}-va_args.patch"
-	eapply "${FILESDIR}/${P}-linker-flags.patch"
-
-	eapply_user
-
-	eautoconf
-
-	# Some binaries and man pages are installed under suffixed names
-	# to avoid collions with their GNU Emacs counterparts (see below).
-	# Fix internal filename references.
-	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
-	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
-	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# bug #639642
-	test-flags -no-pie >/dev/null && append-flags -no-pie
-	filter-flags -pie
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena or use Xaw3d ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop"
-
-		myconf="${myconf} $(use_with tiff )"
-		myconf="${myconf} $(use_with png )"
-		myconf="${myconf} $(use_with jpeg )"
-		myconf="${myconf} $(use_with xface )"
-
-		use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
-			myconf="${myconf} --with-xft=no"
-
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-xft=no
-			--with-gif=no"
-	fi
-
-	if use xim ; then
-		if use motif ; then
-			myconf="${myconf} --with-xim=motif"
-		else
-		myconf="${myconf} --with-xim=xlib"
-		fi
-	else
-	  myconf="${myconf} --with-xim=no"
-	fi
-
-	myconf="${myconf} --without-wnn"
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-	use alsa && soundconf="${soundconf},alsa"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm   && mydb="gdbm"
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	if use debug ; then
-		myconf="${myconf} --with-debug"
-		# bug #924339
-		append-flags -fno-strict-aliasing
-	else
-		myconf="${myconf} --with-optimization --with-cflags-debugging="
-	fi
-
-	use bignum && myconf="${myconf} --with-bignum=openssl" ||
-		myconf="${myconf} --with-bignum=no"
-
-	econf ${myconf} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with pop ) \
-		--prefix=/usr \
-		--with-mule \
-		--with-unicode-internal \
-		--without-canna \
-		--with-ncurses \
-		--with-msw=no \
-		--with-mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		--enable-option-checking=no \
-		--with-last-packages=/usr/lib/xemacs
-}
-
-src_compile() {
-	emake EMACSLOADPATH="${S}"/lisp
-}
-
-src_install() {
-	emake prefix="${ED}"/usr \
-		mandir="${ED}"/usr/share/man/man1 \
-		infodir="${ED}"/usr/share/info \
-		libdir="${ED}"/usr/$(get_libdir) \
-		datadir="${ED}"/usr/share \
-		install
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags gnuclient gnudoit gnuattach; do
-		mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-	done
-
-	# rename man pages
-	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
-		mv "${ED}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-	dodir /usr/lib/xemacs/mule-packages
-
-	# remove extraneous info files
-	cd "${ED}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
-
-	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-
-	einfo "If you are upgrading from XEmacs 21.4 you should note the following"
-	einfo "incompatibilities:"
-	einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
-	einfo "- The X resource class has changed from Emacs to XEmacs,"
-	einfo "  settings in your .Xdefaults file should be updated accordingly."
-
-	if use xft;
-	then
-	  einfo "You have enabled Xft font support. Xft requires font names to be provided"
-	  einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
-	fi
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
diff --git a/app-editors/xemacs/xemacs-21.5.35-r6.ebuild b/app-editors/xemacs/xemacs-21.5.35-r6.ebuild
index 49eda864be13..99c86bee5d66 100644
--- a/app-editors/xemacs/xemacs-21.5.35-r6.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35-r6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 1-2)/${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="alsa debug gif gpm pop postgres ldap xface nas X jpeg tiff png motif xft xim athena neXt Xaw3d gdbm berkdb +bignum"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
diff --git a/app-emacs/autoconf-mode/autoconf-mode-2.72.ebuild b/app-emacs/autoconf-mode/autoconf-mode-2.72.ebuild
index c7a2669ca83a..0228ea5c903f 100644
--- a/app-emacs/autoconf-mode/autoconf-mode-2.72.ebuild
+++ b/app-emacs/autoconf-mode/autoconf-mode-2.72.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,6 +12,6 @@ S="${WORKDIR}/autoconf-${PV}/lib/emacs"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/autothemer/files/50autothemer-gentoo.el b/app-emacs/autothemer/files/50autothemer-gentoo.el
index 6753ed5b720b..431f7e90ae73 100644
--- a/app-emacs/autothemer/files/50autothemer-gentoo.el
+++ b/app-emacs/autothemer/files/50autothemer-gentoo.el
@@ -1,2 +1 @@
-;;; app-emacs/cape site configuration  -*- lexical-binding: t; -*-
 (add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/autothemer/metadata.xml b/app-emacs/autothemer/metadata.xml
index 0d944cf35b3a..dd551e88d8ee 100644
--- a/app-emacs/autothemer/metadata.xml
+++ b/app-emacs/autothemer/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>arsen@gentoo.org</email>
-    <description>Arsen Arsenović</description>
+    <name>Arsen Arsenović</name>
   </maintainer>
   <maintainer type="project">
     <email>gnu-emacs@gentoo.org</email>
diff --git a/app-emacs/buttercup/buttercup-1.36.ebuild b/app-emacs/buttercup/buttercup-1.36.ebuild
index 1a71958474a4..414e00897951 100644
--- a/app-emacs/buttercup/buttercup-1.36.ebuild
+++ b/app-emacs/buttercup/buttercup-1.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/emacs-${P}"
 
-	KEYWORDS="~alpha amd64 ~arm arm64 ppc ~ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/buttercup/buttercup-9999.ebuild b/app-emacs/buttercup/buttercup-9999.ebuild
index 413b4cf227ab..146e8940c4e0 100644
--- a/app-emacs/buttercup/buttercup-9999.ebuild
+++ b/app-emacs/buttercup/buttercup-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/emacs-${P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/cape/files/50cape-gentoo.el b/app-emacs/cape/files/50cape-gentoo.el
index 84d436d35cd5..98cc87be4814 100644
--- a/app-emacs/cape/files/50cape-gentoo.el
+++ b/app-emacs/cape/files/50cape-gentoo.el
@@ -1,3 +1,2 @@
-;;; app-emacs/cape site configuration  -*- lexical-binding: t; -*-
 (add-to-list 'load-path "@SITELISP@")
 (load "@SITELISP@/cape-autoloads.el" nil t)
diff --git a/app-emacs/cape/metadata.xml b/app-emacs/cape/metadata.xml
index 3927de1c26bc..7f5ba992ab64 100644
--- a/app-emacs/cape/metadata.xml
+++ b/app-emacs/cape/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>arsen@gentoo.org</email>
-    <description>Arsen Arsenović</description>
+    <name>Arsen Arsenović</name>
   </maintainer>
   <maintainer type="project">
     <email>gnu-emacs@gentoo.org</email>
diff --git a/app-emacs/cask/Manifest b/app-emacs/cask/Manifest
index 03f7ea962c9d..601d3da1df07 100644
--- a/app-emacs/cask/Manifest
+++ b/app-emacs/cask/Manifest
@@ -1 +1 @@
-DIST cask-0.8.8.tar.gz 348574 BLAKE2B 9eb2b18b6082a3500642660eebb471bff3bcbb00656a8a3c66bede3cf756e738b1cb8affbdeed97373bbdc0031d093a6ad5c7e4659e14732fbc531a416c78b99 SHA512 2708fa431dc17cb5d4fe56f0c73c3089a213d8ff0bca19091ab4ebf26c4e416c0a500a980daa424bf16b54d0e72b004762f5260329189eb4f8e803de38bc0ace
+DIST cask-0.9.0.gh.tar.gz 280606 BLAKE2B 17d216ac354c4b34d1663a23a0f7961c68acf544d64e911e54fac29a454a1b4737718903db637097c17dd28d083f91519ea7543a8ee57f2188d20d67cd604e3c SHA512 9e1e9eb0146504fc3ff2dc5358edc59b8157948df4698c7fbec14c28720458cd28b0b9ef9dc34b23a615e5b0a8ef843f9a9bdd9f7030aef797fa3df7864ae46a
diff --git a/app-emacs/cask/cask-0.8.8.ebuild b/app-emacs/cask/cask-0.8.8.ebuild
deleted file mode 100644
index abf6cb9e8c5b..000000000000
--- a/app-emacs/cask/cask-0.8.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Project management for Emacs package development"
-HOMEPAGE="https://github.com/cask/cask/"
-SRC_URI="https://github.com/cask/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="test"  # Most tests fail
-
-RDEPEND="
-	app-emacs/ansi
-	app-emacs/commander
-	app-emacs/epl
-	app-emacs/f
-	app-emacs/package-build
-	app-emacs/s
-	app-emacs/shut-up
-"
-BDEPEND="${RDEPEND}"
-
-DOCS=( README.org cask_small.png )
-PATCHES=(
-	"${FILESDIR}"/${PN}-bin-launcher-fix.patch
-	"${FILESDIR}"/${PN}-no-bootstrap.patch
-)
-
-ELISP_REMOVE="${PN}-bootstrap.el
-	package-build-legacy.el package-recipe-legacy.el"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	elisp_src_prepare
-
-	sed "s|@SITELISP@|${EPREFIX}${SITELISP}/${PN}|" -i bin/${PN} || die
-}
-
-src_install() {
-	elisp_src_install
-
-	dobin bin/${PN}
-}
diff --git a/app-emacs/cask/cask-0.9.0.ebuild b/app-emacs/cask/cask-0.9.0.ebuild
new file mode 100644
index 000000000000..20490171fab5
--- /dev/null
+++ b/app-emacs/cask/cask-0.9.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp optfeature
+
+DESCRIPTION="Project management for Emacs package development"
+HOMEPAGE="https://github.com/cask/cask/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/cask/${PN}"
+else
+	SRC_URI="https://github.com/cask/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+RESTRICT="test"  # Most tests fail.
+
+RDEPEND="
+	app-emacs/ansi
+	app-emacs/commander
+	app-emacs/epl
+	app-emacs/f
+	app-emacs/package-build
+	app-emacs/s
+	app-emacs/shut-up
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/cask-0.9.0-bin-launcher-fix.patch"
+	"${FILESDIR}/cask-0.9.0-home-dir.patch"
+	"${FILESDIR}/cask-no-bootstrap.patch"
+)
+ELISP_REMOVE="
+	${PN}-bootstrap.el
+"
+
+DOCS=( README.org cask_small.png )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITELISP@|${EPREFIX}${SITELISP}/${PN}|" -i "./bin/${PN}" || die
+}
+
+src_install() {
+	elisp_src_install
+
+	exeinto /usr/bin
+	doexe "./bin/${PN}"
+}
+
+pkg_postinst() {
+	elisp_pkg_postinst
+	optfeature "using ELPA archives via SSL" \
+		"net-libs/gnutls[tools] app-editors/emacs[ssl]"
+}
diff --git a/app-emacs/cask/files/cask-0.9.0-bin-launcher-fix.patch b/app-emacs/cask/files/cask-0.9.0-bin-launcher-fix.patch
new file mode 100644
index 000000000000..c4d949ab1141
--- /dev/null
+++ b/app-emacs/cask/files/cask-0.9.0-bin-launcher-fix.patch
@@ -0,0 +1,26 @@
+--- a/bin/cask
++++ b/bin/cask
+@@ -41,11 +41,13 @@ if [ -z "$SRCDIR__" ]; then
+     SRCDIR__=$(python -c "import os, sys; print(os.path.realpath(sys.argv[1]))" "$CASK")
+ fi
+ SRCDIR_=$(dirname "$SRCDIR__")
+-SRCDIR=$(dirname "$SRCDIR_")
++# SRCDIR=$(dirname "$SRCDIR_")
++SRCDIR="@SITELISP@"
++
+ case $subcommand in
+ 	emacs)
+ 		EMACS="$EMACS" \
+-                "$EMACS" -Q -L "$SRCDIR" -l "$SRCDIR/cask" \
++                "$EMACS" -q -L "$SRCDIR" -l "$SRCDIR/cask" \
+                 --eval "(cask--initialize (expand-file-name default-directory))" \
+                 "$@"
+ 		;;
+@@ -53,6 +55,6 @@ case $subcommand in
+ 		EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" "$@"
+ 		;;
+ 	*)
+-		"$EMACS" -Q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@"
++		"$EMACS" -q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@"
+ 		;;
+ esac
diff --git a/app-emacs/cask/files/cask-0.9.0-home-dir.patch b/app-emacs/cask/files/cask-0.9.0-home-dir.patch
new file mode 100644
index 000000000000..c6c102ecb57c
--- /dev/null
+++ b/app-emacs/cask/files/cask-0.9.0-home-dir.patch
@@ -0,0 +1,13 @@
+--- a/cask.el
++++ b/cask.el
+@@ -345,9 +345,7 @@ Evaluate BODY in the package context of BUNDLE.  Then restore package context."
+             (package-load-list
+              (eval (car (get 'package-load-list 'standard-value))))
+             (package-user-dir (cask-elpa-path ,bundle))
+-	    (,@(if (special-variable-p 'package-gnupghome-dir)
+-		   (cons 'package-gnupghome-dir (list (expand-file-name "gnupg" package-user-dir)))
+-		 (list '_package-gnupghome-dir))))
++	    (package-gnupghome-dir (expand-file-name "gnupg" package-user-dir)))
+        (cask--use-environment ,bundle ,refresh ,no-activate)
+        ;; following will evaluate keys e.g., `:activate t` as separate s-exprs
+        ;; which ought to be no-ops
diff --git a/app-emacs/cask/files/cask-bin-launcher-fix.patch b/app-emacs/cask/files/cask-bin-launcher-fix.patch
deleted file mode 100644
index 704d284a13dc..000000000000
--- a/app-emacs/cask/files/cask-bin-launcher-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/bin/cask b/bin/cask
-index 55d4d86..37a5c9c 100755
---- a/bin/cask
-+++ b/bin/cask
-@@ -39,17 +39,7 @@ case $subcommand in
- 	*)
- 		WHICH=${WHICH:-which}
- 		READLINK=$($WHICH readlink || true)
--		if [ "$(uname || true)" == "Darwin" ] ; then
--			READLINK=
--		fi
--		READLINK=${READLINK:-$($WHICH greadlink || true)}
--		if [ ! -z "$READLINK" ] ; then
--			SRCDIR__=$($READLINK -f "$CASK")
--		else
--			SRCDIR__=$(python -c "import os, sys; print(os.path.realpath(sys.argv[1]))" "$CASK")
--		fi
--		SRCDIR_=$(dirname "$SRCDIR__")
--		SRCDIR=$(dirname "$SRCDIR_")
--		"$EMACS" -Q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@"
-+		SRCDIR="@SITELISP@"
-+		"$EMACS" -q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@"
- 		;;
- esac
diff --git a/app-emacs/cdlatex/Manifest b/app-emacs/cdlatex/Manifest
new file mode 100644
index 000000000000..ba7e353f48bd
--- /dev/null
+++ b/app-emacs/cdlatex/Manifest
@@ -0,0 +1 @@
+DIST cdlatex-4.18.5.tar.xz 22644 BLAKE2B e3301fde8ef2c67c0660fee212e7d0024d16e6ca85bc8272f069d0205cff978037a0eb739efa749fc2a17b09af522fd2f46d60e6dc7ccaf585453f09a12383db SHA512 152670de2ce5698eed8ff2d746c21846ae0eb8d84706d6d25e5625e8dd3e45de022055950a62e1a7b45b465799710c48d204f1cdb142a8483785cac7a35a0ad5
diff --git a/app-emacs/cdlatex/cdlatex-4.18.5.ebuild b/app-emacs/cdlatex/cdlatex-4.18.5.ebuild
new file mode 100644
index 000000000000..c6b5040bf8f9
--- /dev/null
+++ b/app-emacs/cdlatex/cdlatex-4.18.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Fast input methods for LaTeX environments and math"
+HOMEPAGE="https://elpa.nongnu.org/nongnu/cdlatex.html"
+SRC_URI="https://dev.gentoo.org/~arsen/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-emacs/auctex
+"
+BDEPEND="${RDEPEND}"
+
+ELISP_REMOVE="${PN}-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp-make-autoload-file
+	elisp_src_compile
+}
diff --git a/app-emacs/cdlatex/files/50cdlatex-gentoo.el b/app-emacs/cdlatex/files/50cdlatex-gentoo.el
new file mode 100644
index 000000000000..e7aa549a9632
--- /dev/null
+++ b/app-emacs/cdlatex/files/50cdlatex-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "@SITELISP@/cdlatex-autoloads.el" nil t)
diff --git a/app-emacs/cdlatex/metadata.xml b/app-emacs/cdlatex/metadata.xml
new file mode 100644
index 000000000000..ae5b4a102973
--- /dev/null
+++ b/app-emacs/cdlatex/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>arsen@gentoo.org</email>
+    <name>Arsen Arsenović</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-emacs/closql/metadata.xml b/app-emacs/closql/metadata.xml
index 62a4a4f10446..188c379641cc 100644
--- a/app-emacs/closql/metadata.xml
+++ b/app-emacs/closql/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>arsen@gentoo.org</email>
-    <description>Arsen Arsenović</description>
+    <name>Arsen Arsenović</name>
   </maintainer>
   <maintainer type="person">
     <email>sam@gentoo.org</email>
-    <description>Sam James</description>
+    <name>Sam James</name>
   </maintainer>
   <maintainer type="project">
     <email>gnu-emacs@gentoo.org</email>
diff --git a/app-emacs/compat/Manifest b/app-emacs/compat/Manifest
index 099613812f0e..337bf4f24898 100644
--- a/app-emacs/compat/Manifest
+++ b/app-emacs/compat/Manifest
@@ -1,2 +1,3 @@
 DIST compat-30.0.0.0.tar.gz 140329 BLAKE2B 7de4dffc518e521d0c15d3deb0f544972eb6660e19e3028f956b39b9ce355901f3d39339d9f2060a3b7754d67ec9ce92a720cc83afc468f3a2cedc189d8eb922 SHA512 04e2c26f6c1fbb78fc0f2de70913694b3f37614a6992b2a36cec5288c2083481701bdfb7d7e981582c8b22cf61b71e5a3e6011f86c1602331a26ad61c1fe2f66
 DIST compat-30.0.1.0.tar.gz 142477 BLAKE2B dc0f912f8c019846a6dde9c3013527589cb7b8f21cbc3478c16f0dd0edfca15a71f67df91b417ff26a401954b047bc7f6a7fc8efd6d874e3e96e17cf3acd16dd SHA512 cbab795c8ef890307eb6e161d900948a84948ea4b2462056a39ca21e8a4d0aebc985f7ff536658156e9d6e760e33b2b234bc2460f64193b9d07b733a267c1dfe
+DIST compat-30.0.2.0.tar.gz 142328 BLAKE2B aed05c7b352076a455185760e2a90515f15e4606d2845791ec7e77e89724bc6177cca6669d5f7955b6d1c728824502e634340b0db12cd800b6e61c567e20ae73 SHA512 4706d161e352987897cf23bd50c9afdb4e861e39f829031a0f5c4693c8c0b84a181ec1a21023438d0d3b85d2164edcdd839bacb11ef158ec60d4a945d7b1d436
diff --git a/app-emacs/compat/compat-30.0.2.0.ebuild b/app-emacs/compat/compat-30.0.2.0.ebuild
new file mode 100644
index 000000000000..dca8f1fa5a52
--- /dev/null
+++ b/app-emacs/compat/compat-30.0.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Compatibility libraries for Emacs"
+HOMEPAGE="https://github.com/emacs-compat/compat/
+	https://git.sr.ht/~pkal/compat/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/emacs-compat/${PN}.git"
+else
+	SRC_URI="https://github.com/emacs-compat/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+BDEPEND="
+	sys-apps/texinfo
+"
+
+ELISP_TEXINFO="${PN}.texi"
+
+src_test() {
+	local has_json="$("${EMACS}" ${EMACSFLAGS} --eval "(princ (fboundp 'json-parse-string))")"
+	if [[ "${has_json}" != t ]] ; then
+		local line
+		while read line ; do
+			ewarn "${line}"
+		done <<-EOF
+		Your current Emacs version does not support native JSON parsing,
+		which is required for running tests of ${CATEGORY}/${PN}.
+		Emerge >=app-editors/emacs-27 with USE="json" and use "eselect emacs"
+		to select that version.
+		EOF
+	else
+		emake test
+	fi
+}
+
+src_install() {
+	rm ./compat-tests.el || die
+
+	elisp_src_install
+}
diff --git a/app-emacs/dape/Manifest b/app-emacs/dape/Manifest
index 2072bba05d01..45563fc94ae5 100644
--- a/app-emacs/dape/Manifest
+++ b/app-emacs/dape/Manifest
@@ -1,2 +1,3 @@
-DIST dape-0.18.0.tar.gz 78174 BLAKE2B cf883262a7d23d67c5f76dacb47dbc6ea6ed62d81506e1f124d4d85e8a818c692bd26b7d3ef7543fdead999713603a3b008832d5296edcd7fa2d784a2019ec1b SHA512 4d447c7b0fb01707046baa7c6bcd9528fc12bc295259be34a3dca21f9dea85a020cec9557468282947257aad059b174ae211f953ade6d67d615fa2daf50d1400
 DIST dape-0.19.0.tar.gz 78244 BLAKE2B aaa4d0b129c1a3f80228527836a202ce7352c6fe4d5ac31710c62d6f9069108ed66a4e3e35808c2e197e8d57b7688249a1605eb288f212cd4f48879dcc687e68 SHA512 7533a0e88dd5418f924378861f7fa33e60c886684dff50785add4347c1cb3c0e728625f7fd9ef703787eea671ead6e5fd81ed3a3c468205e163c352dbe2a49d0
+DIST dape-0.20.0.tar.gz 78429 BLAKE2B 9f079311883ffae56226ad7bbe6835c404397980333dd9539835b2f9301908fe83be6c88eebb2e5fe553eda94303bbc6cbb4f497b92131fa9979c88dccd5a032 SHA512 8a770d84c54fe75275067ca981c96fced384797896a19331d53f782029ec984d3755801dfd29d8c4446e6ac531ffa9dc534cca3b21ae3af52547292da4158b0a
+DIST dape-0.21.0.tar.gz 78689 BLAKE2B 12ae2ea5771ff303693b1477fe5f535d9295d138bd16ca0859bd7cbdfbf93c18347cb6dc9910c93001947dc58cba4064c0782f0007057ea99932a2674963da90 SHA512 0ecbe997859148f5bd1154b946d617df054772244cadb8697c97fe82d1deb572d47d26668229e3d0dbb02f4339b51a334cd06922050dbb592a4f05581fb35012
diff --git a/app-emacs/dape/dape-0.18.0-r1.ebuild b/app-emacs/dape/dape-0.18.0-r1.ebuild
deleted file mode 100644
index 3238a5a3963b..000000000000
--- a/app-emacs/dape/dape-0.18.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS=29.1
-
-inherit elisp
-
-DESCRIPTION="Debug Adapter Protocol for Emacs"
-HOMEPAGE="https://github.com/svaante/dape"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/svaante/${PN}.git"
-else
-	SRC_URI="https://github.com/svaante/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	|| (
-		app-emacs/jsonrpc
-		>=app-editors/emacs-30:*
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-
-# Requires debugpy, but we do not package debugpy right now, as well as
-# js-debug.  Most tests use only the former.
-RESTRICT="test"
-
-DOCS=( README.org CHANGELOG.org LICENSE )
-SITEFILE="50${PN}-gentoo.el"
-
-# elisp-enable-tests ert . -l dape-tests.el
-
-pkg_setup() {
-	elisp_pkg_setup
-	local has_jsonrpc="$(${EMACS} ${EMACSFLAGS} \
-		--eval "(princ (>= emacs-major-version 30))")"
-	if has_version app-emacs/jsonrpc || [[ ${has_jsonrpc} = t ]]; then
-		:
-	else
-		die "Emacs does not have jsonrpc.el 1.0.25 or later, nor was app-emacs/jsonrpc installed"
-	fi
-}
-
-src_compile() {
-	elisp_src_compile
-	elisp-make-autoload-file
-}
-
-# src_test() {
-# 	elisp-test
-# }
-
-src_install() {
-	# Need to ignore dape-tests.el.
-	einstalldocs
-	elisp-install "${PN}" dape.el dape.elc dape-autoloads.el
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/dape/dape-0.20.0.ebuild b/app-emacs/dape/dape-0.20.0.ebuild
new file mode 100644
index 000000000000..c4b8f0561c5d
--- /dev/null
+++ b/app-emacs/dape/dape-0.20.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="29.1"
+
+inherit elisp
+
+DESCRIPTION="Debug Adapter Protocol for Emacs"
+HOMEPAGE="https://github.com/svaante/dape"
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/svaante/${PN}.git"
+else
+	SRC_URI="https://github.com/svaante/${PN}/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	|| (
+		app-emacs/jsonrpc
+		>=app-editors/emacs-30:*
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+
+# Requires debugpy, but we do not package debugpy right now, as well as
+# js-debug.  Most tests use only the former.
+RESTRICT="test"
+
+DOCS=( README.org CHANGELOG.org LICENSE )
+SITEFILE="50${PN}-gentoo.el"
+
+# elisp-enable-tests ert . -l dape-tests.el
+
+pkg_setup() {
+	elisp_pkg_setup
+	local has_jsonrpc="$(${EMACS} ${EMACSFLAGS} \
+		--eval "(princ (>= emacs-major-version 30))")"
+	if has_version app-emacs/jsonrpc || [[ ${has_jsonrpc} = t ]]; then
+		:
+	else
+		die "Emacs does not have jsonrpc.el 1.0.25 or later, nor was app-emacs/jsonrpc installed"
+	fi
+}
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
+
+# src_test() {
+# 	elisp-test
+# }
+
+src_install() {
+	# Need to ignore dape-tests.el.
+	einstalldocs
+	elisp-install "${PN}" dape.el dape.elc dape-autoloads.el
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/dape/dape-0.21.0.ebuild b/app-emacs/dape/dape-0.21.0.ebuild
new file mode 100644
index 000000000000..c4b8f0561c5d
--- /dev/null
+++ b/app-emacs/dape/dape-0.21.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="29.1"
+
+inherit elisp
+
+DESCRIPTION="Debug Adapter Protocol for Emacs"
+HOMEPAGE="https://github.com/svaante/dape"
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/svaante/${PN}.git"
+else
+	SRC_URI="https://github.com/svaante/${PN}/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	|| (
+		app-emacs/jsonrpc
+		>=app-editors/emacs-30:*
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+
+# Requires debugpy, but we do not package debugpy right now, as well as
+# js-debug.  Most tests use only the former.
+RESTRICT="test"
+
+DOCS=( README.org CHANGELOG.org LICENSE )
+SITEFILE="50${PN}-gentoo.el"
+
+# elisp-enable-tests ert . -l dape-tests.el
+
+pkg_setup() {
+	elisp_pkg_setup
+	local has_jsonrpc="$(${EMACS} ${EMACSFLAGS} \
+		--eval "(princ (>= emacs-major-version 30))")"
+	if has_version app-emacs/jsonrpc || [[ ${has_jsonrpc} = t ]]; then
+		:
+	else
+		die "Emacs does not have jsonrpc.el 1.0.25 or later, nor was app-emacs/jsonrpc installed"
+	fi
+}
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
+
+# src_test() {
+# 	elisp-test
+# }
+
+src_install() {
+	# Need to ignore dape-tests.el.
+	einstalldocs
+	elisp-install "${PN}" dape.el dape.elc dape-autoloads.el
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/dape/files/50dape-gentoo.el b/app-emacs/dape/files/50dape-gentoo.el
index a9e318c2f6f9..01948d9c03e9 100644
--- a/app-emacs/dape/files/50dape-gentoo.el
+++ b/app-emacs/dape/files/50dape-gentoo.el
@@ -1,3 +1,2 @@
-;;; app-emacs/dape site configuration  -*- lexical-binding: t; -*-
 (add-to-list 'load-path "@SITELISP@")
 (load "@SITELISP@/dape-autoloads.el" nil t)
diff --git a/app-emacs/dape/metadata.xml b/app-emacs/dape/metadata.xml
index 1d0732121c49..69faaba85413 100644
--- a/app-emacs/dape/metadata.xml
+++ b/app-emacs/dape/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>arsen@gentoo.org</email>
-    <description>Arsen Arsenović</description>
+    <name>Arsen Arsenović</name>
   </maintainer>
   <maintainer type="person">
     <email>sam@gentoo.org</email>
-    <description>Sam James</description>
+    <name>Sam James</name>
   </maintainer>
   <maintainer type="project">
     <email>gnu-emacs@gentoo.org</email>
diff --git a/app-emacs/dash/dash-2.19.1.ebuild b/app-emacs/dash/dash-2.19.1.ebuild
index 777dcbbf9cfc..c6b2dd3b2065 100644
--- a/app-emacs/dash/dash-2.19.1.ebuild
+++ b/app-emacs/dash/dash-2.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 1f37c71aff64..a8d2ea10d9b4 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,3 +1,2 @@
-DIST ebuild-mode-1.75.tar.xz 48592 BLAKE2B 2273357c2736e0952637bb00754f0eff8379b5bd27793dac43d4d17e12affb8e88925ef321bd74709bc1054953f3fe3263b676c9faab93434558f45f55a70b28 SHA512 c00835513db517f07361ffa9fc86e8b268c89126fb1a0c88950e8566fcae296f115e29e6fa371bd93be34d6938e2a828e3382ea0b489a3e72af972b4f7b22e2e
 DIST ebuild-mode-1.76.tar.xz 50404 BLAKE2B 9aeda48858155286c9df2075b61f596723d457ac1592ab581e1589d291db2f54d3c5d81dd610a41506d43d5d90943404a8f74fc4b742d7ed33f4e623930d1fc7 SHA512 e9659878109de92789204d6bd9493465b1d078a5ac5a10937397478a20766bab453bdfc8d3352625570b37b8bf8aadc28369652979032427a1c8d6d13242aa64
 DIST ebuild-mode-1.77.tar.xz 50840 BLAKE2B 29ecc60dc232def8ef811da88efd68b6ffe66fa5df6a53390e6d01b858160f16f3f5f1f481f3d34628ccbd7228113867df3f81b0587d1f5ced721d129111f3a9 SHA512 f40f294158a36783f6d08297d51f0a0931209368449a6edeb50235568c4347b27070d20227c0d6d32d3581609dc288effefb8dda982d2e45b046243ce0e3495d
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.75.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.75.ebuild
deleted file mode 100644
index 26379ca497a0..000000000000
--- a/app-emacs/ebuild-mode/ebuild-mode-1.75.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp optfeature
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-BDEPEND="sys-apps/texinfo"
-
-DOCS="ChangeLog keyword-generation.sh"
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.72.el"
-
-pkg_postinst() {
-	elisp_pkg_postinst
-	optfeature "ebuild commands support" sys-apps/portage
-	optfeature "additional development tools" dev-util/pkgdev
-	optfeature "ebuild QA utilities" dev-util/pkgcheck
-	optfeature "decode ANSI colors in build.log" app-emacs/tty-format
-	optfeature "XML syntax validation" app-emacs/nxml-gentoo-schemas
-	optfeature "generating HTML from GLEPs" dev-python/docutils-glep
-}
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.77.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.77.ebuild
index 8ab41edb1ee4..a0d920110205 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.77.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.77.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="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/ebuild-run-mode/ebuild-run-mode-20221116.ebuild b/app-emacs/ebuild-run-mode/ebuild-run-mode-20221116.ebuild
index 16b546873aba..3ad4774350a9 100644
--- a/app-emacs/ebuild-run-mode/ebuild-run-mode-20221116.ebuild
+++ b/app-emacs/ebuild-run-mode/ebuild-run-mode-20221116.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_PN}-v${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND=">=app-emacs/ebuild-mode-1.53"
 
diff --git a/app-emacs/ecb/Manifest b/app-emacs/ecb/Manifest
deleted file mode 100644
index 4d577d27be63..000000000000
--- a/app-emacs/ecb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ecb-2.50_pre20170728.tar.xz 562144 BLAKE2B 922a1f101d01717c5d078fbb055903c43e91360061b792e96e9aa9421d19df2cd47f7e69aae6dba4f188e26682d2a758ff8aa57ff500e5b6fdeaea6920b21a25 SHA512 074738cc323b595caf3d34d6eaa08d6a1a8d3a53762c9bf48b751ab25a16a26a8c71984996b7e7616f4999a0876c6d03751e1e45b68aad712020778da387a59d
diff --git a/app-emacs/ecb/ecb-2.50_pre20170728.ebuild b/app-emacs/ecb/ecb-2.50_pre20170728.ebuild
deleted file mode 100644
index 9c0199f9da19..000000000000
--- a/app-emacs/ecb/ecb-2.50_pre20170728.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="Source code browser for Emacs"
-HOMEPAGE="http://ecb.sourceforge.net/"
-# snapshot of https://github.com/ecb-home/ecb.git, created with "make distrib"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-SITEFILE="70${PN}-gentoo.el"
-DOC_CONTENTS="ECB is autoloaded in site-gentoo.el. Add the line
-	\n\t(require 'ecb)
-	\nto your ~/.emacs file to enable all features on Emacs startup."
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-2.32-gentoo.patch
-	sed -i -e "s:@PF@:${PF}:" ecb-help.el || die "sed failed"
-	eapply_user
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	elisp_src_install
-
-	insinto "${SITEETC}/${PN}"
-	doins -r ecb-images
-
-	doinfo info-help/ecb.info*
-	dodoc NEWS README RELEASE_NOTES
-	docinto html
-	dodoc html-help/*.html
-}
diff --git a/app-emacs/ecb/files/70ecb-gentoo.el b/app-emacs/ecb/files/70ecb-gentoo.el
deleted file mode 100644
index bc71f7c18e94..000000000000
--- a/app-emacs/ecb/files/70ecb-gentoo.el
+++ /dev/null
@@ -1,2 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(require 'ecb-autoloads)
diff --git a/app-emacs/ecb/files/ecb-2.32-gentoo.patch b/app-emacs/ecb/files/ecb-2.32-gentoo.patch
deleted file mode 100644
index 09d3d86afdcd..000000000000
--- a/app-emacs/ecb/files/ecb-2.32-gentoo.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Change default paths to Gentoo install locations.
-Allow for compressed Info files.
-
---- ecb-2.32-orig/ecb-common-browser.el	2005-07-11 16:16:01.000000000 +0200
-+++ ecb-2.32/ecb-common-browser.el	2009-03-03 09:42:51.000000000 +0100
-@@ -261,10 +261,7 @@
- ;; additonal images are necessary - but currently i don't think we need
- ;; special images for this analyse-stuff.
- (defcustom ecb-tree-image-icons-directories
--  (let ((base (concat (if ecb-regular-xemacs-package-p
--                          (format "%s" (locate-data-directory "ecb"))
--                        ecb-ecb-dir)
--                      "ecb-images/")))
-+  (let ((base "/usr/share/emacs/etc/ecb/ecb-images/"))
-     (cons (concat base "default/height-17")
-           (mapcar (function (lambda (i)
-                               (cons (car i) (concat base (cdr i)))))
---- ecb-2.32-orig/ecb-help.el	2005-07-11 16:16:00.000000000 +0200
-+++ ecb-2.32/ecb-help.el	2009-03-03 09:47:49.000000000 +0100
-@@ -81,16 +81,8 @@
-                  (const :tag "Html" :value html)))
- 
- 
--(defcustom ecb-help-info-path (concat
--                               (if ecb-running-xemacs
--                                   (if (file-exists-p
--                                        (concat ecb-ecb-dir
--                                                ecb-help-info-subdir
--                                                ecb-help-info-start-file))
--                                       ecb-help-info-subdir
--                                     "../../info/")
--                                 ecb-help-info-subdir)
--                               ecb-help-info-start-file)
-+(defcustom ecb-help-info-path
-+  (concat "/usr/share/info/" ecb-help-info-start-file)
-   "*Path where the ECB online help in info format resides.
- This must be the location of the file \"ecb.info\" which comes with the ECB
- distribution. If is installed by unpacking the archive available on the ECB
-@@ -107,24 +99,7 @@
-   :type 'file)
- 
- (defcustom ecb-help-html-path
--  (if (not ecb-running-xemacs)
--      (concat ecb-help-html-subdir ecb-help-html-start-file)
--    (cond ((file-exists-p
--            (concat ecb-ecb-dir
--                    ecb-help-html-subdir
--                    ecb-help-html-start-file))
--           (concat ecb-help-html-subdir ecb-help-html-start-file))
--          ((file-exists-p
--            (concat ecb-ecb-dir
--                    "../../html/"
--                    ecb-help-html-start-file))
--           (concat "../../html/" ecb-help-html-start-file))
--          ((file-exists-p
--            (concat ecb-ecb-dir
--                    "../../html/ecb/index.html"))
--           "../../html/ecb/index.html")
--          (t
--           (concat "../../etc/ecb/html/" ecb-help-html-start-file))))
-+  (concat "/usr/share/doc/@PF@/html/" ecb-help-html-start-file)
-   "*Path where the ECB online help in HTML format resides.
- This must be the location of the file \"index.html\" which comes with the ECB
- distribution. If is installed by unpacking the archive available on the ECB
-@@ -145,7 +120,7 @@
-   "Starts `info' with INFO-FILE. If INFO-FILE does not exists then nil is
- returned otherwise true. If NO-FILE-NOT-EXIST-ERR is not nil then just nil is
- returned if INFO-FILE does not exist otherwise an error is reported."
--  (if (file-exists-p info-file)
-+  (if (file-expand-wildcards (concat info-file "*"))
-       (prog1 t
-         (info info-file))
-     (unless no-file-not-exist-err
diff --git a/app-emacs/ecb/metadata.xml b/app-emacs/ecb/metadata.xml
deleted file mode 100644
index bae34f078d8a..000000000000
--- a/app-emacs/ecb/metadata.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<longdescription>
-  ECB stands for "Emacs Code Browser". While Emacs already has good editing
-  support for many modes, its browsing support is somewhat lacking. That's
-  where ECB comes in: it displays a number of informational windows that allow
-  for easy source code navigation and overview.
-
-  The informational windows can contain:
-
-    * A directory tree,
-    * a list of source files in the current directory,
-    * a list of functions/classes/methods/... in the current file, (ECB uses
-      the Semantic Bovinator, or Imenu, or etags, for getting this list so all
-      languages supported by any of these tools are automatically supported by
-      ECB too),
-    * a history of recently visited files,
-    * the Speedbar and
-    * output from compilation (the compilation window) and other modes like
-      help, grep etc. or whatever a user defines to be displayed in this
-      window.
-
-  As an added bonus, ECB makes sure to keep these informational windows
-  visible, even when you use C-x 1 and similar commands.
-
-  It goes without saying that you can configure the layout, ie. which
-  informational windows should be displayed where. ECB comes with a number of
-  ready-made window layouts to choose from.
-</longdescription>
-<stabilize-allarches/>
-<upstream>
-  <remote-id type="sourceforge">ecb</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/app-emacs/eldoc-box/Manifest b/app-emacs/eldoc-box/Manifest
index 0d07adb001a7..408baa1d053a 100644
--- a/app-emacs/eldoc-box/Manifest
+++ b/app-emacs/eldoc-box/Manifest
@@ -1,2 +1,3 @@
 DIST eldoc-box-1.11.1.tar.gz 718679 BLAKE2B 3ba731f851849275609d309f0121971484aade6f6aa0c974efc8c6a6b79c7460230199b03eb58f8fc918f82d8d24fa068b5586702098009e6c314ae275d6f0f3 SHA512 0c984cd086e7640da439ca1be2fe37bfadb40fa3a87476fb2b19df1c35c0b0efdd777632027165a74b29631dd38be1829c6b05d6edc66942721ed755666d500d
 DIST eldoc-box-1.12.1.tar.gz 719666 BLAKE2B 0dd9a66c4834e38f0d60bca68571659f1fb147a17acfdaf3aedb74a8f23b81e2cd825742bbabcbb4cbc6b604bf2026a1abb7ad45a68fb39e41d2cf64ce5d9a1c SHA512 47cfed000d6fd2747b2e76077a907ad53bcc34d8cb14886c8a6021591310612784815432b9434eaa853b9f69429e55bb2b33100ed3547e0381254283570bcefd
+DIST eldoc-box-1.13.2.tar.gz 1274152 BLAKE2B d7bf41e517a043d66ee24b62ca4a5647f89902f0e859e18ceb1c12646fa3e65fce8a742024ba9f446f23315a730e6d868f773e9acbde7dff8a5712e822f51e2e SHA512 ea1042ae2d59cbdcb5dadb7214cfc8cbc794d6400c8676f5eaf9e672cec4e82499667858326b1f3f753dd44f5012e5047ca62c9a551ffa2662b26ae1a2e27d1c
diff --git a/app-emacs/eldoc-box/eldoc-box-1.13.2.ebuild b/app-emacs/eldoc-box/eldoc-box-1.13.2.ebuild
new file mode 100644
index 000000000000..a56d0489ab3a
--- /dev/null
+++ b/app-emacs/eldoc-box/eldoc-box-1.13.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Child frame doc for Eglot and anything that uses ElDoc"
+HOMEPAGE="https://github.com/casouri/eldoc-box"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/casouri/${PN}.git"
+else
+	SRC_URI="https://github.com/casouri/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp-make-autoload-file
+	elisp_src_compile
+}
diff --git a/app-emacs/eldoc-box/metadata.xml b/app-emacs/eldoc-box/metadata.xml
index b6c56be55788..751e1f86fa61 100644
--- a/app-emacs/eldoc-box/metadata.xml
+++ b/app-emacs/eldoc-box/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>arsen@gentoo.org</email>
-    <description>Arsen Arsenović</description>
+    <name>Arsen Arsenović</name>
   </maintainer>
   <maintainer type="project">
     <email>gnu-emacs@gentoo.org</email>
diff --git a/app-emacs/emacs-common/emacs-common-1.10.ebuild b/app-emacs/emacs-common/emacs-common-1.10.ebuild
index 2966e899528c..30d2f5838e2e 100644
--- a/app-emacs/emacs-common/emacs-common-1.10.ebuild
+++ b/app-emacs/emacs-common/emacs-common-1.10.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="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="games gsettings gui"
 
 DEPEND="games? ( acct-group/gamestat )"
diff --git a/app-emacs/emacsql/metadata.xml b/app-emacs/emacsql/metadata.xml
index 0b03e24c9c24..5dcac1496f73 100644
--- a/app-emacs/emacsql/metadata.xml
+++ b/app-emacs/emacsql/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>arsen@gentoo.org</email>
-    <description>Arsen Arsenović</description>
+    <name>Arsen Arsenović</name>
   </maintainer>
   <maintainer type="project">
     <email>gnu-emacs@gentoo.org</email>
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.28.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.28.ebuild
index 20cad0cead52..91516e5b02e2 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.28.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.28.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=7
@@ -18,6 +18,6 @@ S="${WORKDIR}/${MY_P}/misc"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
index d0e01cf8ce71..5b44aa00fa48 100644
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@@ -1 +1,2 @@
 DIST ess-24.01.1.tar.gz 681901 BLAKE2B 892e60f33252f0dca979eb52cdc2eca7a79bad247037f599b6e640b02930019523ad276f764af281bc232040c34fb05ac884f1915940b09c3e89d2394f6887f8 SHA512 3ff7084f1182bad30771e264e491c7ab1b2501d4d6558ed6c4acb98aec6abed3c45c2049cf565164406611b1e8a5b92485b15da1c1696694454c5f65a8617191
+DIST ess-25.01.0.tar.gz 691573 BLAKE2B de6b40149bbf3d47cba32d03c486ee08153719902d04ed35df49c17c8415f34c6272e66f4c66cc144e798c2d838589a1c476d13679190437855b0f7ab5000e24 SHA512 93339ac72220c8aa4cadb4c0e03fa4eb8fc095d84dd5cc27dbc9bc7d3682d9676c9ba05e8568cd3ffdbcdf7c789706413b7f487993e63b2e160c7ea3b4673eb9
diff --git a/app-emacs/ess/ess-24.01.1.ebuild b/app-emacs/ess/ess-24.01.1.ebuild
deleted file mode 100644
index f2435174b015..000000000000
--- a/app-emacs/ess/ess-24.01.1.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 elisp readme.gentoo-r1
-
-DESCRIPTION="Emacs Speaks Statistics"
-HOMEPAGE="https://ess.r-project.org/
-	https://github.com/emacs-ess/ESS/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/emacs-ess/${PN^^}.git"
-else
-	SRC_URI="https://github.com/emacs-ess/${PN^^}/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}/${PN^^}-${PV}"
-
-	KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
-SLOT="0"
-
-BDEPEND="
-	app-text/texi2html
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-	dev-texlive/texlive-mathscience
-	dev-texlive/texlive-plaingeneric
-	virtual/latex-base
-"
-
-DOCS=( ChangeLog NEWS ONEWS README
-	   doc/html/{ess,news,readme}.html doc/{ess,readme}.pdf )
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	elisp_src_prepare
-
-	sed -e "s|font-lock-reference-face|font-lock-constant-face|g" \
-		-i lisp/*.el || die
-}
-
-src_compile() {
-	local -x BYTECOMPFLAGS="-L lisp -L lisp/obsolete"
-
-	elisp-compile lisp/*.el lisp/obsolete/*.el
-	emake autoloads
-	emake -C doc all html pdf
-}
-
-src_test() {
-	elisp-test-ert . -L lisp -L test -l test/ess-test.el
-}
-
-src_install() {
-	# Version >=18 doesn't install *.el files any more #685978
-	elisp-install "${PN}" lisp/*.{el,elc} lisp/obsolete/*.{el,elc}
-	elisp-make-site-file "${SITEFILE}" "${PN}" "(load \"ess-autoloads\" nil t)"
-
-	insinto "${SITEETC}/${PN}"
-	doins -r etc/*
-
-	doinfo ./doc/info/ess.info
-
-	local DOC_CONTENTS="\
-		Please see /usr/share/doc/${PF} for the complete documentation."
-	readme.gentoo_create_doc
-
-	einstalldocs
-}
diff --git a/app-emacs/ess/ess-25.01.0.ebuild b/app-emacs/ess/ess-25.01.0.ebuild
new file mode 100644
index 000000000000..1e4c7dc7204d
--- /dev/null
+++ b/app-emacs/ess/ess-25.01.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Emacs Speaks Statistics"
+HOMEPAGE="https://ess.r-project.org/
+	https://github.com/emacs-ess/ESS/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/emacs-ess/${PN^^}.git"
+else
+	SRC_URI="https://github.com/emacs-ess/${PN^^}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN^^}-${PV}"
+
+	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
+SLOT="0"
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		app-text/texi2html
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-mathscience
+		dev-texlive/texlive-plaingeneric
+		virtual/latex-base
+	)
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed -e "s|font-lock-reference-face|font-lock-constant-face|g" \
+		-i lisp/*.el || die
+}
+
+src_compile() {
+	local -x BYTECOMPFLAGS="-L lisp -L lisp/obsolete"
+
+	elisp-compile lisp/*.el lisp/obsolete/*.el
+	emake autoloads
+	emake -C doc all
+	use doc && emake -C doc html pdf
+}
+
+src_test() {
+	elisp-test-ert . -L lisp -L test -l test/ess-test.el
+}
+
+src_install() {
+	# Version >=18 doesn't install *.el files any more #685978
+	elisp-install "${PN}" lisp/*.{el,elc} lisp/obsolete/*.{el,elc}
+	elisp-make-site-file "${SITEFILE}" "${PN}" "(load \"ess-autoloads\" nil t)"
+
+	insinto "${SITEETC}/${PN}"
+	doins -r etc/*
+
+	doinfo ./doc/info/ess.info
+
+	local DOC_CONTENTS="\
+		Please see /usr/share/doc/${PF} for the complete documentation."
+	readme.gentoo_create_doc
+
+	dodoc ChangeLog NEWS ONEWS README
+	if use doc; then
+		dodoc doc/{ess,readme}.pdf
+		docinto html
+		dodoc doc/html/{ess,news,readme}.html
+	fi
+}
diff --git a/app-emacs/f/f-0.21.0.ebuild b/app-emacs/f/f-0.21.0.ebuild
index 002ae856eebe..b315b5f80596 100644
--- a/app-emacs/f/f-0.21.0.ebuild
+++ b/app-emacs/f/f-0.21.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
@@ -17,7 +17,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/f.el-${PV}"
 
-	KEYWORDS="~alpha amd64 ~arm arm64 ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/flycheck/flycheck-34.1.ebuild b/app-emacs/flycheck/flycheck-34.1.ebuild
index 5a4ced52238d..be2959eae62f 100644
--- a/app-emacs/flycheck/flycheck-34.1.ebuild
+++ b/app-emacs/flycheck/flycheck-34.1.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
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/forge/Manifest b/app-emacs/forge/Manifest
index 608b3deb7551..76dee3c6b681 100644
--- a/app-emacs/forge/Manifest
+++ b/app-emacs/forge/Manifest
@@ -1,2 +1,2 @@
-DIST forge-0.4.4.tar.gz 129892 BLAKE2B 5edc6d7cd9a5203df64e3ce58aa3dc5ee0c4eab975271ef23d408d8219a89a22f84927886532e045ec0601be32eb07a7c1233e24399d30c83e2b10668cb6ed3d SHA512 04390b9f5b0109b0e360a8b1e9f4eca217e71086416217d24116bf42da344aca93a65c300bcb40ddea522f1e3dd806a523c83bbf6bd674ee2d798dc0b61ba5b0
 DIST forge-0.4.5.tar.gz 129600 BLAKE2B 55a0e48d79a0dc17e8a1b923a324a9210e25cd6fda11294d09b3659a47dc3fe324134c0e2d2a274db97fd86aefd58068739f5c1d1da1e6b68cbc57b371c70347 SHA512 e4b4269c1b4f9630861c988a12eb4c86b76cdaf57d0d80d2acd697f30315daa586caef39c53fb3b9490f05fea70d04476a99804b131c7028a7cc0b769758f594
+DIST forge-0.4.6.tar.gz 129829 BLAKE2B 33262a395f27a00b240573b2b4a909b1044c7e9f6ca6d506d3652f88c5b43667bdb3e09d3a122492c98388a14568e7c2dd73625fbf112b9ffda86443a6994579 SHA512 06693c05b21bc09f0f72f6d44a7c23350b0a7c277b0eeb588db40bfcb6b387ebf81f1d76b1f78f3248576802a2cca9eae0240d3ee691357539b7e395e31d1dce
diff --git a/app-emacs/forge/forge-0.4.4-r1.ebuild b/app-emacs/forge/forge-0.4.4-r1.ebuild
deleted file mode 100644
index b4fc84a31230..000000000000
--- a/app-emacs/forge/forge-0.4.4-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS=27.1
-inherit elisp
-
-DESCRIPTION="Work with Git forges from the comfort of Magit"
-HOMEPAGE="https://magit.vc/
-	https://github.com/magit/forge/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/magit/${PN}.git"
-else
-	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-S="${WORKDIR}/${P}/lisp"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-DOCS=( ../README.org )
-ELISP_TEXINFO="../docs/*.texi"
-SITEFILE="50${PN}-gentoo.el"
-
-RDEPEND="
-	app-emacs/compat
-	app-emacs/closql
-	app-emacs/dash
-	app-emacs/emacsql
-	>=app-emacs/ghub-4.1.1
-	>=app-emacs/magit-4.1.1
-	app-emacs/markdown-mode
-	>=app-emacs/transient-0.7.6
-	app-emacs/yaml
-"
-BDEPEND="
-	${RDEPEND}
-	sys-apps/texinfo
-"
diff --git a/app-emacs/forge/forge-0.4.6.ebuild b/app-emacs/forge/forge-0.4.6.ebuild
new file mode 100644
index 000000000000..ccc37c078018
--- /dev/null
+++ b/app-emacs/forge/forge-0.4.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="27.1"
+
+inherit elisp
+
+DESCRIPTION="Work with Git forges from the comfort of Magit"
+HOMEPAGE="https://magit.vc/
+	https://github.com/magit/forge/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/magit/${PN}.git"
+else
+	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+S="${WORKDIR}/${P}/lisp"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/compat-30.0.1.0
+	>=app-emacs/ghub-4.1.1
+	>=app-emacs/magit-4.1.3
+	>=app-emacs/transient-0.7.6
+	app-emacs/closql
+	app-emacs/dash
+	app-emacs/emacsql
+	app-emacs/markdown-mode
+	app-emacs/yaml
+"
+BDEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+"
+
+DOCS=( ../README.org )
+ELISP_TEXINFO="../docs/*.texi"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/forge/forge-9999.ebuild b/app-emacs/forge/forge-9999.ebuild
index 8730e6326b17..ccc37c078018 100644
--- a/app-emacs/forge/forge-9999.ebuild
+++ b/app-emacs/forge/forge-9999.ebuild
@@ -1,9 +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
 
-NEED_EMACS=27.1
+NEED_EMACS="27.1"
+
 inherit elisp
 
 DESCRIPTION="Work with Git forges from the comfort of Magit"
@@ -26,22 +27,22 @@ S="${WORKDIR}/${P}/lisp"
 LICENSE="GPL-3+"
 SLOT="0"
 
-DOCS=( ../README.org )
-ELISP_TEXINFO="../docs/*.texi"
-SITEFILE="50${PN}-gentoo.el"
-
 RDEPEND="
-	app-emacs/compat
+	>=app-emacs/compat-30.0.1.0
+	>=app-emacs/ghub-4.1.1
+	>=app-emacs/magit-4.1.3
+	>=app-emacs/transient-0.7.6
 	app-emacs/closql
 	app-emacs/dash
 	app-emacs/emacsql
-	>=app-emacs/ghub-4.1.1
-	>=app-emacs/magit-4.1.1
 	app-emacs/markdown-mode
-	>=app-emacs/transient-9999
 	app-emacs/yaml
 "
 BDEPEND="
 	${RDEPEND}
 	sys-apps/texinfo
 "
+
+DOCS=( ../README.org )
+ELISP_TEXINFO="../docs/*.texi"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/forge/metadata.xml b/app-emacs/forge/metadata.xml
index 76c51b994288..6b52cc6dff49 100644
--- a/app-emacs/forge/metadata.xml
+++ b/app-emacs/forge/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>arsen@gentoo.org</email>
-    <description>Arsen Arsenović</description>
+    <name>Arsen Arsenović</name>
   </maintainer>
   <maintainer type="person">
     <email>sam@gentoo.org</email>
-    <description>Sam James</description>
+    <name>Sam James</name>
   </maintainer>
   <maintainer type="project">
     <email>gnu-emacs@gentoo.org</email>
diff --git a/app-emacs/gruvbox-theme/Manifest b/app-emacs/gruvbox-theme/Manifest
index e519d6cd261e..76cf32dc9d7c 100644
--- a/app-emacs/gruvbox-theme/Manifest
+++ b/app-emacs/gruvbox-theme/Manifest
@@ -1 +1 @@
-DIST gruvbox-theme-1.30.1.tar.gz 2849739 BLAKE2B 1d9c005b65237431f62ccda120b3adf5bed66c2238fcab263d6c18cc79b79553fbfdd04fb56cb053990b2c09fdd8f5a607d7b2a86c1164ec3a6ee1134de43b49 SHA512 52d20729c4bcc4677bb4aa9fa14a95bb3ae9a5729e70d93817030ebb3235d7e7d72562e34ab74c8c0e8c03183ae3711ef50d04160e04608bc9968d651c40f1d8
+DIST gruvbox-theme-1.30.2.tar.gz 2849853 BLAKE2B 7afd464b1108c0d1dbe5dc35f460d68b25ec3eb01f06e3b99a9f9c2d3e7bb276ece8394886f319eb43e2501cdc8be75a65fc141ec0840940ef4a9de9d0fb1883 SHA512 ddfcf963503d0958862ee99f0e799edff2d43e97f7b56e585f3d8a3d377d7a3e66eb8d5c719569a3d016d20173ddafb02771dcceb4a2878d4fad9ea1e50aab86
diff --git a/app-emacs/gruvbox-theme/files/50gruvbox-theme-gentoo.el b/app-emacs/gruvbox-theme/files/50gruvbox-theme-gentoo.el
index 7e3219a1f424..9dc3b0d2c6ce 100644
--- a/app-emacs/gruvbox-theme/files/50gruvbox-theme-gentoo.el
+++ b/app-emacs/gruvbox-theme/files/50gruvbox-theme-gentoo.el
@@ -1,2 +1,3 @@
-;;; app-emacs/gruvbox-theme site configuration  -*- lexical-binding: t; -*-
 (add-to-list 'load-path "@SITELISP@")
+(when (boundp 'custom-theme-load-path)
+  (add-to-list 'custom-theme-load-path "@SITELISP@"))
diff --git a/app-emacs/gruvbox-theme/gruvbox-theme-1.30.1-r1.ebuild b/app-emacs/gruvbox-theme/gruvbox-theme-1.30.1-r1.ebuild
deleted file mode 100644
index f0931620842d..000000000000
--- a/app-emacs/gruvbox-theme/gruvbox-theme-1.30.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS=26.1
-
-inherit elisp
-
-DESCRIPTION="Gruvbox is a retro groove color scheme, now in Emacs"
-HOMEPAGE="https://github.com/greduan/emacs-theme-gruvbox/"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/greduan/emacs-theme-gruvbox.git"
-else
-	SRC_URI="https://github.com/greduan/emacs-theme-gruvbox/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}/emacs-theme-gruvbox-${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	>=app-emacs/autothemer-0.2
-"
-BDEPEND="${RDEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/gruvbox-theme/gruvbox-theme-1.30.2.ebuild b/app-emacs/gruvbox-theme/gruvbox-theme-1.30.2.ebuild
new file mode 100644
index 000000000000..769f543e160c
--- /dev/null
+++ b/app-emacs/gruvbox-theme/gruvbox-theme-1.30.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Gruvbox is a retro groove color scheme, now in Emacs"
+HOMEPAGE="https://github.com/greduan/emacs-theme-gruvbox/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/greduan/emacs-theme-gruvbox.git"
+else
+	SRC_URI="https://github.com/greduan/emacs-theme-gruvbox/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/emacs-theme-gruvbox-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/autothemer-0.2
+"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/gruvbox-theme/metadata.xml b/app-emacs/gruvbox-theme/metadata.xml
index 340581005307..640eda291996 100644
--- a/app-emacs/gruvbox-theme/metadata.xml
+++ b/app-emacs/gruvbox-theme/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>arsen@gentoo.org</email>
-    <description>Arsen Arsenović</description>
+    <name>Arsen Arsenović</name>
   </maintainer>
   <maintainer type="project">
     <email>gnu-emacs@gentoo.org</email>
diff --git a/app-emacs/hl-todo/Manifest b/app-emacs/hl-todo/Manifest
index 5f0cd91e130f..a5cdf789e5ae 100644
--- a/app-emacs/hl-todo/Manifest
+++ b/app-emacs/hl-todo/Manifest
@@ -1,2 +1,2 @@
-DIST hl-todo-3.8.0.tar.gz 19403 BLAKE2B 1e3752c3466899b444167924b6d273812f622c4bac9bc473d5d2181686d3faa9ba936b1eb61d3cd231f44c18ad8c762651b30044d222d9b01f6c3039ccc166bf SHA512 3a5c466d3ffa883b48e342640502dfa0a54a064ca12b9b8fe40db9dacf27f8083bcb383e3ec332e7ae2683eb6dfbba3f6d6c83f8c53c6edb8183cb4711be27b3
 DIST hl-todo-3.8.1.tar.gz 19400 BLAKE2B 035cfdd0bcd859c48acc59a9f2bbd797c1e0f2a3510d3ac4f8538cd0a467afc01175cfbcd17ea597e83d5aeb366f74f8f52a5316e40236fa95bcf6e6334f7fcc SHA512 9cbb0537a375f54b73f39bd9c2ec80ba7fa425630e516b147fb5e674c9123eaf5fe79d3cba829b4b0dbb249834df5f7fe2240830d313d84c03cdb8eb0f9266a2
+DIST hl-todo-3.8.2.tar.gz 19502 BLAKE2B 5bea842f4fc92f0b9668357d4d43c665eb26f3326ff9fa48ce5c411d0548e81b81f3a5eae6342471438c1e49d715383f46c15170140e864f8ba47efb7bd21b2a SHA512 fa6bb473b611203f1e275b75abbefba1df9c731b81a0f7f2a0d3e606450b085e5b20c55e8d0fc0b9bf959e46896173683bd1a47bad8fd70f2179b91ac25470e8
diff --git a/app-emacs/hl-todo/hl-todo-3.8.0.ebuild b/app-emacs/hl-todo/hl-todo-3.8.0.ebuild
deleted file mode 100644
index 50a91455193c..000000000000
--- a/app-emacs/hl-todo/hl-todo-3.8.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Highlight TODO and similar keywords in comments and strings"
-HOMEPAGE="https://github.com/tarsius/hl-todo/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/tarsius/${PN}.git"
-else
-	SRC_URI="https://github.com/tarsius/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	>=app-emacs/compat-29.1.4.5
-"
-BDEPEND="
-	${RDEPEND}
-"
-
-DOCS=( README.org )
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/hl-todo/hl-todo-3.8.2.ebuild b/app-emacs/hl-todo/hl-todo-3.8.2.ebuild
new file mode 100644
index 000000000000..4a7f681d3358
--- /dev/null
+++ b/app-emacs/hl-todo/hl-todo-3.8.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Highlight TODO and similar keywords in comments and strings"
+HOMEPAGE="https://github.com/tarsius/hl-todo/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/tarsius/${PN}.git"
+else
+	SRC_URI="https://github.com/tarsius/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/compat-30.0.0.0
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/hydra/hydra-0.15.0.ebuild b/app-emacs/hydra/hydra-0.15.0.ebuild
index ea5e434bc011..368c1520c29a 100644
--- a/app-emacs/hydra/hydra-0.15.0.ebuild
+++ b/app-emacs/hydra/hydra-0.15.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/abo-abo/hydra/"
 SRC_URI="https://github.com/abo-abo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64 ~x86"
 SLOT="0"
 
 RDEPEND="app-emacs/lv"
diff --git a/app-emacs/jinx/files/50jinx-gentoo.el b/app-emacs/jinx/files/50jinx-gentoo.el
index dda9db8dd61b..e8fa9d57a78b 100644
--- a/app-emacs/jinx/files/50jinx-gentoo.el
+++ b/app-emacs/jinx/files/50jinx-gentoo.el
@@ -1,4 +1,3 @@
-;;; app-emacs/jinx site configuration  -*- lexical-binding: t; -*-
 (add-to-list 'load-path "@SITELISP@")
 (add-to-list 'load-path "@EMACSMODULES@")
 (load "@SITELISP@/jinx-autoloads.el" nil t)
diff --git a/app-emacs/jinx/metadata.xml b/app-emacs/jinx/metadata.xml
index 983a85253bdd..05116e74a416 100644
--- a/app-emacs/jinx/metadata.xml
+++ b/app-emacs/jinx/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>arsen@gentoo.org</email>
-    <description>Arsen Arsenović</description>
+    <name>Arsen Arsenović</name>
   </maintainer>
   <maintainer type="person">
     <email>sam@gentoo.org</email>
-    <description>Sam James</description>
+    <name>Sam James</name>
   </maintainer>
   <maintainer type="project">
     <email>gnu-emacs@gentoo.org</email>
diff --git a/app-emacs/jsonrpc/metadata.xml b/app-emacs/jsonrpc/metadata.xml
index 9b95fb911351..81ba86a2cd71 100644
--- a/app-emacs/jsonrpc/metadata.xml
+++ b/app-emacs/jsonrpc/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>arsen@gentoo.org</email>
-    <description>Arsen Arsenović</description>
+    <name>Arsen Arsenović</name>
   </maintainer>
   <maintainer type="person">
     <email>sam@gentoo.org</email>
-    <description>Sam James</description>
+    <name>Sam James</name>
   </maintainer>
   <maintainer type="project">
     <email>gnu-emacs@gentoo.org</email>
diff --git a/app-emacs/kind-icon/files/50kind-icon-gentoo.el b/app-emacs/kind-icon/files/50kind-icon-gentoo.el
index b9e72be87371..f2c5a9eed060 100644
--- a/app-emacs/kind-icon/files/50kind-icon-gentoo.el
+++ b/app-emacs/kind-icon/files/50kind-icon-gentoo.el
@@ -1,3 +1,2 @@
-;;; app-emacs/kind-icon site configuration   -*- lexical-binding: t; -*-
 (add-to-list 'load-path "@SITELISP@")
 (load "@SITELISP@/kind-icon-autoloads.el" nil t)
diff --git a/app-emacs/lv/lv-0.15.0-r1.ebuild b/app-emacs/lv/lv-0.15.0-r1.ebuild
index cec213f0d313..b669766ce565 100644
--- a/app-emacs/lv/lv-0.15.0-r1.ebuild
+++ b/app-emacs/lv/lv-0.15.0-r1.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/abo-abo/hydra/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/hydra-${PV}"
-	KEYWORDS="amd64 ~arm64"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 647019de2a9c..674ddcc86e70 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,3 +1,3 @@
-DIST magit-4.1.1.tar.gz 674147 BLAKE2B 4878061957f342aa1c76e8f356a59d6e13ceba35dad6ed0adf4ba59484a3cb9585855aaeec91a40f6dddd9bfa53c0ed0733b506c19be70a5b056ba70dbb27f4e SHA512 c1ab5b4dadf11a0eafcb69ac46c7c1aa19595a1a76e0cf3b8afa987e64c4b525007753179da1e146dab89504f1b436e9141c76025019bd1077d2172beab8105b
 DIST magit-4.1.2.tar.gz 675015 BLAKE2B 0ae4ac04d5b7a20d0ac444e9b87819ca98bebb5b66b6a193f5f9be0d050b07319ed6262f20a0167ecc2d34e9f00b80f4f0eed04b1e673a87b056c33cd9fe564d SHA512 c41abb1525e46b6121f8b7339c598c2773ff23ec35f1dbc3392d63b35e656499026e64b0905a2c97ddbb21e4f547ea9cab0c8df9b0b5ff996c26995940c27f79
 DIST magit-4.1.3.tar.gz 676146 BLAKE2B 427f77653d49bab9ce8b29e006597e639b3a125c156976625337b57e1490250c39431515667381c2ab49149d5e4d49d44fe2c0b589f3ee9d11d754e52d3f5e73 SHA512 1f589b9d08e29a072d71e363c4326db341890e25e52d8c5dd75c0f9dd5bb1e663d2fc0d5c6be396dd557318725cc063b7cb0ed2acddbf9fa980c6e36a415edf3
+DIST magit-4.2.0.tar.gz 673702 BLAKE2B 436a2cbe88ffb6a4940eeb8b7f9ab9c1535942df6a35dab5cd4de9052bb5f9d2fa70abc61f26688c792de19a4d9a22c87d90d98515b3ea4a32356f6f163a7980 SHA512 e5488f759e3cd2c72966a31142f90bee2e3c8bb10bd4a77db69899a13cafb68222656331d7b8ac8a042b431994af03f0f0ce04658e967a07d4f3c3440da2e0d9
diff --git a/app-emacs/magit/magit-4.1.1.ebuild b/app-emacs/magit/magit-4.1.1.ebuild
deleted file mode 100644
index aaf5f9670581..000000000000
--- a/app-emacs/magit/magit-4.1.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="A Git porcelain inside Emacs"
-HOMEPAGE="https://magit.vc/
-	https://github.com/magit/magit/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-fi
-
-S="${WORKDIR}/${P}/lisp"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-DOCS=( ../README.md ../docs/AUTHORS.md ../docs/RelNotes )
-ELISP_TEXINFO="../docs/*.texi"
-SITEFILE="50${PN}-gentoo.el"
-
-RDEPEND="
-	>=app-emacs/compat-30.0.0.0
-	>=app-emacs/dash-2.19.1
-	>=app-emacs/transient-0.7.6
-	>=app-emacs/with-editor-3.4.2
-"
-BDEPEND="
-	${RDEPEND}
-	sys-apps/texinfo
-"
-RDEPEND+="
-	>=dev-vcs/git-2.44.2
-"
-
-src_prepare() {
-	default
-
-	echo "(setq ${PN}-version \"${PV}\")" > "./${PN}-version.el" || die
-}
diff --git a/app-emacs/magit/magit-4.2.0.ebuild b/app-emacs/magit/magit-4.2.0.ebuild
new file mode 100644
index 000000000000..bec72b2184ed
--- /dev/null
+++ b/app-emacs/magit/magit-4.2.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="A Git porcelain inside Emacs"
+HOMEPAGE="https://magit.vc/
+	https://github.com/magit/magit/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+S="${WORKDIR}/${P}/lisp"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DOCS=( ../README.md ../docs/AUTHORS.md ../docs/RelNotes )
+ELISP_TEXINFO="../docs/*.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+RDEPEND="
+	>=app-emacs/compat-30.0.0.0
+	>=app-emacs/dash-2.19.1
+	>=app-emacs/transient-0.7.7
+	>=app-emacs/with-editor-3.4.2
+"
+BDEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+"
+RDEPEND+="
+	>=dev-vcs/git-2.44.2
+"
+
+src_prepare() {
+	default
+
+	echo "(setq ${PN}-version \"${PV}\")" > "./${PN}-version.el" || die
+}
diff --git a/app-emacs/magit/magit-9999.ebuild b/app-emacs/magit/magit-9999.ebuild
index 19d51447f288..bec72b2184ed 100644
--- a/app-emacs/magit/magit-9999.ebuild
+++ b/app-emacs/magit/magit-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
@@ -32,8 +32,8 @@ SITEFILE="50${PN}-gentoo.el"
 RDEPEND="
 	>=app-emacs/compat-30.0.0.0
 	>=app-emacs/dash-2.19.1
-	>=app-emacs/transient-0.7.4
-	>=app-emacs/with-editor-3.4.1
+	>=app-emacs/transient-0.7.7
+	>=app-emacs/with-editor-3.4.2
 "
 BDEPEND="
 	${RDEPEND}
@@ -46,5 +46,5 @@ RDEPEND+="
 src_prepare() {
 	default
 
-	echo "(setq ${PN}-version \"${PV}\")" > ./${PN}-version.el || die
+	echo "(setq ${PN}-version \"${PV}\")" > "./${PN}-version.el" || die
 }
diff --git a/app-emacs/mastodon/Manifest b/app-emacs/mastodon/Manifest
index a638023b8256..49acd473844e 100644
--- a/app-emacs/mastodon/Manifest
+++ b/app-emacs/mastodon/Manifest
@@ -1,3 +1 @@
-DIST mastodon-1.0.27.tar.gz 628054 BLAKE2B 7c023cfcd674ee221312ce65293ea39ceba4be4bed50682f546c2195404867ad3cdf790c806d52e128564e9f30e09ed2633d7c81d76cc8c211478389fa73db2d SHA512 dd1061d13104ea0ab8fc39333feb9aeb0b566130fb7ec5039b8b5b11809fabc65a7829346f76c0b66e922e5fb4cf70a96efcb6c9f972d90f6489c819a622fb9e
-DIST mastodon-1.1.0.tar.gz 691247 BLAKE2B 45052db00d143d3b225e4bd8be22796421528b4b7e7a87d9d71346c6e26e027dc9fc8b6982c458c3582ec16728ba81b959d2a88182aa2f00d9d5206d33f117a0 SHA512 6258d7859adb7a29a8a19a89367f02a56a453ec1f054f55015a5adaf20fe1d9d4f3847fb6ad2821735ecb547d653870f500f7d9cb7163a385a2502ed0a2cafe7
 DIST mastodon-1.1.1.tar.gz 691228 BLAKE2B 4912659ec39ff159af1bd839befa29d91811865d5cc88f5c825d746dee021a43e856a6a1a1d230300b34b51c7a645605a1d2f2421437a00f4bd42c4274538cda SHA512 181db930ec5f64c13666bd626a57a556e2857e99f70a950c994488ae7ab0061ab0c7ff4b767416844688de6cf1fbdced365e00f4d94076d35065ead8db3aa46d
diff --git a/app-emacs/mastodon/mastodon-1.0.27.ebuild b/app-emacs/mastodon/mastodon-1.0.27.ebuild
deleted file mode 100644
index f74c55d68c78..000000000000
--- a/app-emacs/mastodon/mastodon-1.0.27.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS=27.1
-
-inherit elisp
-
-DESCRIPTION="Emacs client for Mastodon, federated microblogging social network"
-HOMEPAGE="https://codeberg.org/martianh/mastodon.el/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://codeberg.org/martianh/mastodon.el.git"
-	S="${WORKDIR}/${P}/lisp"
-else
-	SRC_URI="https://codeberg.org/martianh/${PN}.el/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}.el/lisp"
-
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	app-emacs/persist
-	app-emacs/request
-"
-BDEPEND="
-	${RDEPEND}
-"
-
-DOCS=( ../README.org )
-ELISP_TEXINFO="../${PN}.texi"
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/mastodon/mastodon-1.1.0.ebuild b/app-emacs/mastodon/mastodon-1.1.0.ebuild
deleted file mode 100644
index 5f2eb49458d6..000000000000
--- a/app-emacs/mastodon/mastodon-1.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS="28.1"
-
-inherit elisp
-
-DESCRIPTION="Emacs client for Mastodon, federated microblogging social network"
-HOMEPAGE="https://codeberg.org/martianh/mastodon.el/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://codeberg.org/martianh/${PN}.el.git"
-	S="${WORKDIR}/${P}/lisp"
-else
-	SRC_URI="https://codeberg.org/martianh/${PN}.el/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}.el/lisp"
-
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	app-emacs/persist
-	app-emacs/request
-	app-emacs/tp
-"
-BDEPEND="
-	${RDEPEND}
-"
-
-DOCS=( ../README.org )
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
-	elisp_src_install
-	doinfo "../${PN}.info"
-}
diff --git a/app-emacs/no-littering/Manifest b/app-emacs/no-littering/Manifest
index d2463a7acf39..7b5105b11a5f 100644
--- a/app-emacs/no-littering/Manifest
+++ b/app-emacs/no-littering/Manifest
@@ -1,2 +1,2 @@
-DIST no-littering-1.7.3.tar.gz 26033 BLAKE2B 4da7f4c5aa6648260b6d340cc2e7cdbec38f174f5f6f0ee19a888b2634e6fc2700f07025ce17b6e6a06b853bf9c8325c44bba7cb303c031262adc8bb590d7ecf SHA512 f6adb36ecb6078030affd14d7fc2b42a893fe3da214f5aaf960fdcf611459233ba620829dab8d687a825309dc62c6e5a182f691d2744d8f9136699416876b4d9
 DIST no-littering-1.7.4.tar.gz 26082 BLAKE2B 84de76c82abc2e3ce6c8c85e7b9361b1acafde6e7b77e42c98b8c2313023a3b05a8c6b12ffdcf1e9398b789c7cc16665cbd8a4a3fa01f17264e5c778e4f9d1f0 SHA512 21255a643608a5a5c5783c5ca3f84bceca39c01dd801528d55134cbaffac4b5770e26d3b5b7b51b8d62e3c2909b66f1d2f955b6ee6f7daa182760e644a71daa4
+DIST no-littering-1.7.5.tar.gz 26109 BLAKE2B c6329eba7d1b53acfd37a83cb97707f0aa85a3feb95f846b62d22a3ff42d3f6a5b24ce11a06c96f2178e3fafc3d7e37323f731e6e63e1d06832edc3bf9a2a1d3 SHA512 e066a59a85d3930f87145208788477cb9ce358e8f85fae86292b075a9d59dcee75a8eedacdf455004c015dfc985eeb9268de8a8f1931134f40eab9ab8598f075
diff --git a/app-emacs/no-littering/no-littering-1.7.3.ebuild b/app-emacs/no-littering/no-littering-1.7.3.ebuild
deleted file mode 100644
index 265b8c212a37..000000000000
--- a/app-emacs/no-littering/no-littering-1.7.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="ELisp library that helps keeping Emacs configuration directory clean"
-HOMEPAGE="https://github.com/emacscollective/no-littering/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/emacscollective/${PN}.git"
-else
-	SRC_URI="https://github.com/emacscollective/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	>=app-emacs/compat-30.0.0.0
-"
-BDEPEND="
-	${RDEPEND}
-"
-
-DOCS=( README.org migrate.org )
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/no-littering/no-littering-1.7.5.ebuild b/app-emacs/no-littering/no-littering-1.7.5.ebuild
new file mode 100644
index 000000000000..4f3e84e2facf
--- /dev/null
+++ b/app-emacs/no-littering/no-littering-1.7.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="ELisp library that helps keeping Emacs configuration directory clean"
+HOMEPAGE="https://github.com/emacscollective/no-littering/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/emacscollective/${PN}.git"
+else
+	SRC_URI="https://github.com/emacscollective/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/compat-30.0.2.0
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+DOCS=( README.org migrate.org )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild b/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
index eda49daba469..0403407fe8fc 100644
--- a/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${MY_P}/emacs"
 SITEFILE="50${PN}-gentoo-3.12.1.el"
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 7bbba6e78789..e9f4de7068e9 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,3 +1,4 @@
 DIST org-mode-release_9.7.16.tar.gz 2364239 BLAKE2B eb379531f5dbc6407e32bcd4fd9ee8427dba91bbfe2a5d63bd825dd6d886b5666355a5a649064c93121113a95406b0ded755812c8580f47b45c8979d68e5e568 SHA512 b099f53bbf47add9dfd8f6cc33aa7b4021e86613431cf71fcca5a7133b72b0b77ad7b48bf48b716052c6f2b0c06eacfb05fcca610e2f3b3d3d2d6bdb1e5fa908
 DIST org-mode-release_9.7.17.tar.gz 2364232 BLAKE2B b0f3c94e92f6721b0ffb4b9196391a0520c2cad8124eb9afda58f3e1705d7031e616cd0549eed2ed16b1d6e8d10113f7f384f4c1ca969a83d9b5975a9cd95d76 SHA512 4bb12ed1aa3be2ab32037450960535f1552395409b49721cae5babf0f2eb3d96497c635d08141efdc7b7fc738b8df8422cf0ee65cb3c329ad4db578c4478dc19
 DIST org-mode-release_9.7.18.tar.gz 2364125 BLAKE2B 6def92460c96c02e4fa0304bf02437819b3a3541db4f30ee6cf354faaa55860886b785940af6cb32d9b6881d6484c3eaf50942b9a788712f84e2a1676f06940f SHA512 c019d82c2bc2bde3ee555f7a99e0b935e3dc9b64bdecdb2f83b2ed8460c822cd1d7a3f318dff637c57ed905070df98aff32cdc82b3c96a10f26038859c540e0a
+DIST org-mode-release_9.7.19.tar.gz 2364122 BLAKE2B d7e65b8af54968a812e012aa11f380f64d65bd5e0829ecdc96d64a539c54f384157a336c192806d9fb32be50a0c6c62e60bc8d067ab581049b0edc8a57ad1327 SHA512 bef652cc8e31f86ccaf6ce0288389f1cb10aa43fd9d8f4191ab30e7d4563b977f4da309c322367a6f2beb27e88c3d771b5c4d4e259ca4c8c6a0b145c1e8d43ca
diff --git a/app-emacs/org-mode/metadata.xml b/app-emacs/org-mode/metadata.xml
index ab6e8b67070e..933704be8c3b 100644
--- a/app-emacs/org-mode/metadata.xml
+++ b/app-emacs/org-mode/metadata.xml
@@ -25,4 +25,10 @@
   <flag name="odt-schema">Install non-free schema files
     for OpenDocument Text exporter</flag>
 </use>
+<upstream>
+  <bugs-to>https://orgmode.org/manual/Feedback.html</bugs-to>
+  <changelog>https://orgmode.org/Changes.html</changelog>
+  <doc>https://orgmode.org/manuals.html</doc>
+  <remote-id type="savannah">emacs</remote-id> <!-- Development Tools → Emacs Org mode -->
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/org-mode/org-mode-9.7.19.ebuild b/app-emacs/org-mode/org-mode-9.7.19.ebuild
new file mode 100644
index 000000000000..7c045e5649c4
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.7.19.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="https://orgmode.org/"
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs/${PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/org"
+	S="${WORKDIR}/org"
+else
+	MY_P="${PN}-release_${PV}"
+	SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
+SLOT="0"
+IUSE="doc odt-schema"
+RESTRICT="test"
+
+BDEPEND="
+	doc? ( virtual/texi2dvi )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	# Remove failing tests.
+	rm ./testing/lisp/test-{ob,ob-exp,ob-tangle,ob-shell}.el || die
+}
+
+src_compile() {
+	emake -j1 \
+		ORGVERSION="${PV}" \
+		datadir="${EPREFIX}${SITEETC}/${PN}"
+
+	use doc && emake -j1 pdf card
+}
+
+src_install() {
+	emake -j1 \
+		ORGVERSION="${PV}" \
+		DESTDIR="${D}" \
+		ETCDIRS="styles csl $(use odt-schema && echo schema)" \
+		lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		datadir="${EPREFIX}${SITEETC}/${PN}" \
+		infodir="${EPREFIX}/usr/share/info" \
+		install
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc README.org CONTRIBUTE.org etc/ORG-NEWS
+	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+
+	local DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
+		so you may have to install one or more additional packages.
+		A non-exhaustive list of these dependencies may be found at
+		<http://orgmode.org/worg/org-dependencies.html>."
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/org-roam/files/50org-roam-gentoo.el b/app-emacs/org-roam/files/50org-roam-gentoo.el
index ac1c52bf5855..27ced864f34d 100644
--- a/app-emacs/org-roam/files/50org-roam-gentoo.el
+++ b/app-emacs/org-roam/files/50org-roam-gentoo.el
@@ -1,3 +1,2 @@
-;;; app-emacs/org-roam site configuration  -*- lexical-binding: t; -*-
 (add-to-list 'load-path "@SITELISP@")
 (load "@SITELISP@/org-roam-autoloads.el" nil t)
diff --git a/app-emacs/org-roam/metadata.xml b/app-emacs/org-roam/metadata.xml
index a88691fba13b..3b71e4981e00 100644
--- a/app-emacs/org-roam/metadata.xml
+++ b/app-emacs/org-roam/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>arsen@gentoo.org</email>
-    <description>Arsen Arsenović</description>
+    <name>Arsen Arsenović</name>
   </maintainer>
   <maintainer type="project">
     <email>gnu-emacs@gentoo.org</email>
diff --git a/app-emacs/parsebib/Manifest b/app-emacs/parsebib/Manifest
index 76a3d9851a65..16ae70387d9f 100644
--- a/app-emacs/parsebib/Manifest
+++ b/app-emacs/parsebib/Manifest
@@ -1,3 +1,4 @@
 DIST parsebib-4.7.tar.gz 26944 BLAKE2B 24d6d8927c5d5d607eb8b53b6cc21653f99cceaf81bcd4c6993082ef8b9bfd648b21c9a7efd4e800184a5a3b0f65b46660e1374cdf3ec5feede9ea05ce00d5fb SHA512 ad50fec3c18d2084761947c0dbca3e47b7f605beb10977bd351ecff492823a5a34c48fea3a839836a32aeb8cd43f2000f91e772790349176634009bf4be6744d
 DIST parsebib-6.2.gh.tar.gz 29422 BLAKE2B 243b13492716dce450f5a84da16b546f91d28e5fe80c45a9b3b4b43a58ad8582c34e2959ef1087d2ae4de19af5c64075572e862456bcf64c569efa475ffcc6cf SHA512 aee541feef91bdee6dd3967defcb205023c44e98c9a860596cc23baf5801902f58248f4b2202a29bb0048b74db3de31c4682872f7770dec8597fd06aef8661eb
 DIST parsebib-6.3.gh.tar.gz 29686 BLAKE2B 7bc1e3514420e2e04b3fb933ce835daee64eb80a3a1bdd4e945751c247aa4334e78f6ee9fe6508b8eda8160ef63b148bd73b3bd50dacb5471801358399f765de SHA512 fffe46b025ec07969945751a16fd473c7c955d68764a50a66d3dd8c7183be05c79be01eb77268c18e4071881b09f5e7d74cf7a01175655e101f087b1dc7d1cce
+DIST parsebib-6.4.gh.tar.gz 29833 BLAKE2B a7ab75df71adb991aa7b58729a54a9169e84de0d435b7a6ed23cd2b48df31cbf798dca996c0c9ff0964057296e0086fe4df6846b225786b893a0e0ccf7f7916f SHA512 ef54f99da612f1514af17a8e673d2dabfdf091c24b759f2fc09f398faadaf35713ddafffb5aa76ba1aad8ddbeb43571c426bfb07df9d27e197601adfcf39c8e7
diff --git a/app-emacs/parsebib/parsebib-6.4.ebuild b/app-emacs/parsebib/parsebib-6.4.ebuild
new file mode 100644
index 000000000000..824632b28588
--- /dev/null
+++ b/app-emacs/parsebib/parsebib-6.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Emacs Lisp library for reading .bib files"
+HOMEPAGE="https://github.com/joostkremers/parsebib/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/joostkremers/${PN}.git"
+else
+	SRC_URI="https://github.com/joostkremers/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests ert-runner test
diff --git a/app-emacs/pinentry/pinentry-0.1_p20231126.ebuild b/app-emacs/pinentry/pinentry-0.1_p20231126.ebuild
index c1376ed47d2a..146119e0710e 100644
--- a/app-emacs/pinentry/pinentry-0.1_p20231126.ebuild
+++ b/app-emacs/pinentry/pinentry-0.1_p20231126.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}/${PN}-el-${COMMIT}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="app-crypt/pinentry[emacs]"
 
diff --git a/app-emacs/po-mode/po-mode-0.22.ebuild b/app-emacs/po-mode/po-mode-0.22.ebuild
index b54e8b0b3b14..232a2cf959ea 100644
--- a/app-emacs/po-mode/po-mode-0.22.ebuild
+++ b/app-emacs/po-mode/po-mode-0.22.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=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 S="${WORKDIR}/gettext-${PV}/gettext-tools/emacs"
 ELISP_REMOVE="start-po.el"
diff --git a/app-emacs/poke-mode/files/50poke-mode-gentoo.el b/app-emacs/poke-mode/files/50poke-mode-gentoo.el
index 53fd87c88d6d..8c093daadc2e 100644
--- a/app-emacs/poke-mode/files/50poke-mode-gentoo.el
+++ b/app-emacs/poke-mode/files/50poke-mode-gentoo.el
@@ -1,4 +1,3 @@
-;;; poke-mode site configuration
 (add-to-list 'load-path "@SITELISP@")
 
 (autoload 'poke-mode "poke-mode"
diff --git a/app-emacs/poke-mode/metadata.xml b/app-emacs/poke-mode/metadata.xml
index bdc4a010d142..ae5b4a102973 100644
--- a/app-emacs/poke-mode/metadata.xml
+++ b/app-emacs/poke-mode/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>arsen@gentoo.org</email>
-    <description>Arsen Arsenović</description>
+    <name>Arsen Arsenović</name>
   </maintainer>
   <maintainer type="project">
     <email>gnu-emacs@gentoo.org</email>
diff --git a/app-emacs/poke/files/50poke-el-gentoo.el b/app-emacs/poke/files/50poke-el-gentoo.el
index 55cd5c14a628..546724f8667b 100644
--- a/app-emacs/poke/files/50poke-el-gentoo.el
+++ b/app-emacs/poke/files/50poke-el-gentoo.el
@@ -1,4 +1,3 @@
-;;; The GNU Emacs poke frontend site-list configuration
 (add-to-list 'load-path "@SITELISP@")
 
 (autoload 'poke "poke"
diff --git a/app-emacs/poke/metadata.xml b/app-emacs/poke/metadata.xml
index e2185014fbab..7a00078bf9bc 100644
--- a/app-emacs/poke/metadata.xml
+++ b/app-emacs/poke/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>arsen@gentoo.org</email>
-    <description>Arsen Arsenović</description>
+    <name>Arsen Arsenović</name>
   </maintainer>
   <maintainer type="project">
     <email>gnu-emacs@gentoo.org</email>
diff --git a/app-emacs/s/s-1.13.0.ebuild b/app-emacs/s/s-1.13.0.ebuild
index 405923755f4f..b1b9ac7b07eb 100644
--- a/app-emacs/s/s-1.13.0.ebuild
+++ b/app-emacs/s/s-1.13.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
@@ -12,7 +12,7 @@ S="${WORKDIR}"/s.el-${PV}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc64 ~riscv ~sparc x86"
 
 DOCS=( README.md )
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/semi/semi-1.14.7_p20230811-r1.ebuild b/app-emacs/semi/semi-1.14.7_p20230811-r1.ebuild
new file mode 100644
index 000000000000..09656ccf40b8
--- /dev/null
+++ b/app-emacs/semi/semi-1.14.7_p20230811-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="A library to provide MIME feature for GNU Emacs"
+HOMEPAGE="https://github.com/wanderlust/semi"
+GITHUB_SHA1="9370961ddcee78e389e44b36d38c3d93f8351619"
+SRC_URI="https://github.com/wanderlust/${PN}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="l10n_ja"
+
+RDEPEND=">=app-emacs/apel-10.8
+	>=app-emacs/flim-1.14.9"
+DEPEND="${RDEPEND}"
+
+PATCHES="${FILESDIR}/${PN}-1.14.7_p20210613-info.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	emake PACKAGE_LISPDIR="NONE"
+
+	${EMACS} ${EMACSFLAGS} --visit mime-ui-en.texi -f texi2info || die
+	if use l10n_ja; then
+		${EMACS} ${EMACSFLAGS} \
+			--eval "(set-default-coding-systems 'iso-2022-jp)" \
+			--visit mime-ui-ja.texi -f texi2info || die
+	fi
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" \
+		LISPDIR="${ED}/${SITELISP}" \
+		PACKAGE_LISPDIR="NONE" \
+		VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" install
+
+	elisp-make-site-file "${SITEFILE}"
+
+	doinfo mime-ui-en.info
+	dodoc README.en ChangeLog* VERSION NEWS
+	if use l10n_ja; then
+		doinfo mime-ui-ja.info
+		dodoc README.ja
+	fi
+}
diff --git a/app-emacs/shut-up/shut-up-0.3.3.ebuild b/app-emacs/shut-up/shut-up-0.3.3.ebuild
index 6765c6368ed6..33967afd2359 100644
--- a/app-emacs/shut-up/shut-up-0.3.3.ebuild
+++ b/app-emacs/shut-up/shut-up-0.3.3.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
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/cask/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/slime/slime-2.31.ebuild b/app-emacs/slime/slime-2.31.ebuild
index faeafd09686d..ef5d11ed9c6f 100644
--- a/app-emacs/slime/slime-2.31.ebuild
+++ b/app-emacs/slime/slime-2.31.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://github.com/slime/slime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain GPL-2+ GPL-3+ LLGPL-2.1 ZLIB xref? ( xref.lisp )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="doc xref"
 RESTRICT="test" # tests fail to contact sbcl
 
diff --git a/app-emacs/svg-lib/files/50svg-lib-gentoo.el b/app-emacs/svg-lib/files/50svg-lib-gentoo.el
index 3fcdfc9d180c..431f7e90ae73 100644
--- a/app-emacs/svg-lib/files/50svg-lib-gentoo.el
+++ b/app-emacs/svg-lib/files/50svg-lib-gentoo.el
@@ -1,2 +1 @@
-;;; app-emacs/svg-lib site configuration     -*- lexical-binding: t; -*-
 (add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/transient/Manifest b/app-emacs/transient/Manifest
index 35331b64a6d8..22e9090ec1d4 100644
--- a/app-emacs/transient/Manifest
+++ b/app-emacs/transient/Manifest
@@ -1,2 +1,3 @@
 DIST transient-0.7.9.tar.gz 144323 BLAKE2B 458fc59484d9a8b39e6810ece2f7eea43493d58107b3bf0950f87c6325ed7812b87eddb335a00094bd298e4a7a71b42a1388c8cf4d4e6f6cba0cea53fd6b6cfa SHA512 176082cc56d495d5fb0776abf16a9ddbe45fc0c0efefa6b1d2724689134ecacdb9630fa4b2d5034e16c716f0772a921125602b09ee07acb013e026eb55ff4998
 DIST transient-0.8.1.tar.gz 152761 BLAKE2B cc62becaff81b803cf0a7c843b1da4996cd06171ac151c1e54381f4e3d54b1b17105557577bd3fe1ae8fca2041c556dccbaf6a000ed1eef14434404b7f8022c5 SHA512 7d278452dbbd259654aa5f9576b94613224b7243f26445a364081a7e50eaf8fcc82d2699dceeffdd9a1364bcd4bc27af139b73ac90c251c45332247c0fe61c66
+DIST transient-0.8.3.tar.gz 155293 BLAKE2B 2cf559409f1c6044f07513e6e3c5bd6ca1c180a863d90b28a9e4c4b933b5235226c5b8d2edcc7b9b19d0ae695dfb6135b071bb0e1fac03001f60595f94c006b3 SHA512 1be74143975f8f2b82b8c054f984b7aece6de803d6a4605266e1b2cb6dc00f71ea4d0bf70377bcdd863f01fd534a59d279502868d050d4eec86405916b511073
diff --git a/app-emacs/transient/transient-0.8.3.ebuild b/app-emacs/transient/transient-0.8.3.ebuild
new file mode 100644
index 000000000000..de1c9d2bd003
--- /dev/null
+++ b/app-emacs/transient/transient-0.8.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Transient commands abstraction for GNU Emacs"
+HOMEPAGE="https://magit.vc/manual/transient/
+	https://github.com/magit/transient/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/magit/${PN}.git"
+else
+	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/compat-30.0.1.0
+"
+BDEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+"
+
+DOCS=( CHANGELOG README.org "docs/${PN}.org" )
+ELISP_TEXINFO="docs/${PN}.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	mv ./lisp/*.el . || die
+
+	elisp_src_prepare
+}
diff --git a/app-emacs/transient/transient-9999.ebuild b/app-emacs/transient/transient-9999.ebuild
index f99ae40b0465..de1c9d2bd003 100644
--- a/app-emacs/transient/transient-9999.ebuild
+++ b/app-emacs/transient/transient-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,20 +23,20 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 
-DOCS=( CHANGELOG README.org "docs/${PN}.org" )
-ELISP_TEXINFO="docs/${PN}.texi"
-SITEFILE="50${PN}-gentoo.el"
-
 RDEPEND="
-	>=app-emacs/compat-30.0.0.0
+	>=app-emacs/compat-30.0.1.0
 "
 BDEPEND="
 	${RDEPEND}
 	sys-apps/texinfo
 "
 
+DOCS=( CHANGELOG README.org "docs/${PN}.org" )
+ELISP_TEXINFO="docs/${PN}.texi"
+SITEFILE="50${PN}-gentoo.el"
+
 src_prepare() {
-	mv lisp/*.el . || die
+	mv ./lisp/*.el . || die
 
 	elisp_src_prepare
 }
diff --git a/app-emacs/with-editor/with-editor-3.4.3.ebuild b/app-emacs/with-editor/with-editor-3.4.3.ebuild
index f01c1a6f71dd..45fb0d906f2d 100644
--- a/app-emacs/with-editor/with-editor-3.4.3.ebuild
+++ b/app-emacs/with-editor/with-editor-3.4.3.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
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 S="${WORKDIR}/${P}/lisp"
diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 1af62839e198..4ebecac30979 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -1,7 +1,7 @@
-DIST dxvk-1.10.3.tar.gz 1204407 BLAKE2B 3507ffe4abf9c45f2a138b05e7cf706322a6bf3d2e9ae86a9d6216b206c09f79eac696ee7dfe33d0bef55e727f51301c36eb89bfa3b3f429d7d5fafc1eebdcb4 SHA512 8995b231b3f3650beda04c01f30186d10a373075a4774b4ecbfb3bbeb4de99c57555f1db0611e5c61c6a411a7215e0faf228f9861f6b7adae6fc365e8056f7e3
 DIST dxvk-2.3.1.tar.gz 1005669 BLAKE2B d78448fcde9d600f7206dfa606fca4069e7563bb8b181fbc172691d6c45586904ae529550926a03612ed3cc1f2a2dff00990638125c1d7ce6179d3cd3ba8df04 SHA512 085567ac263872eb93d776ce7cf982690603e240a977dbb51ad69344af387fd745536ca62819afd4a809732a6f2d22b36c3df9538decf37dec527973d41e392f
 DIST dxvk-2.4.1.tar.gz 1060662 BLAKE2B 43294af5829fe306acdb72c07b94c28d34eb798a2eaf6d2e42c2b80900e9b6f4f323569dfd51d565c836237fddce26b843f69e4ff57fc2a5838382993a9dd6ed SHA512 629e45bbdaddf83cd8a394877289781e8f54330b4c865b2d453ba3068a6054511a3697ca115497b64df0ce9ee36748a7fdb01fdc5f49a7dc44c4a3d3e47bf6de
 DIST dxvk-2.5.2.tar.gz 1135676 BLAKE2B 4f0f030867365e75ec4fdc56fcbbaba26393ed4beb2fb34c351457fe4a23c2e1d9c50f96370112ac4eb98af86e833788f9b075ca399915e37b87a27591d9847a SHA512 b7ee35911c777e27a56aa3b43c26acec14a03531a39f9c465460011d0f2f0c3ee43d09095fbaa8890beae37dcb48520fe232def79279d6a11d0295224b60ce5f
+DIST dxvk-2.5.3.tar.gz 1142475 BLAKE2B 04bfb577902effec9e22b6546cdfc2b3dd76b84e72c23cb26ac4e54f7aa9464b15d7d74b41dd810fc62d4fff9bbb24cee2771f562a7b931025abfa5995b000bc SHA512 93de46ab69dceea9e13904d9f267a53295a885676bce432c13d992ea33553250e03a695caf15f2c0a9a416c0ed3d799a9155a09dcadfeb43e516780fb188b122
 DIST libdisplay-info-275e6459c7ab1ddd4b125f28d0440716e4888078.tar.bz2 81172 BLAKE2B 7a1e9e2feeb95e06e9d3f49ad9d14a8a152cca525085e819cda0b69c238fb79dddd6d547cd0f0a4b51dfc1ec74ac4c006345b9fc48563807bc8ab3bab58ea5ff SHA512 794e94e8c16d65901a7b705d1ba3361817b4e9e19e520b1004bcab232d0347f5713594d67f3c2b79d4f86b3012e710c648975547d27a63de043fcbe9e6b7e66d
 DIST setup_dxvk.sh 4631 BLAKE2B 25270e1f6dfd446b1d124eac3bd19da8bc770527d02d987949fc3ae0bead07866dafa25f77a90b9a408413a724354a29a4a156ff5c9dc75e26b66e079824ec86 SHA512 257fd84e29a7037f04a1a2a506502c71d527af58f8c84d8c3dfb64597ebdc41c3dca362eaf20ab4bc1982b76428c1f843815d56a6e1369d072e0009e270cb121
 DIST spirv-headers-8b246ff75c6615ba4532fe4fde20f1be090c3764.tar.gz 472513 BLAKE2B f1ad7e11c306c62509655eb41d74efc5fb88688780d006c6944844e964b339baa000f70e115c4df2947e882c9ac33186e301b31138c38fe5f997f7af7260f521 SHA512 fe1d9d70b217b194c92dd397bca386ce8452bc5ec3967d64a257b3a531386fe6a6ecb5e9ed8ab5bc5a2707c5378f02f05809d6d197dcfb3f87cd33304c3b1959
diff --git a/app-emulation/dxvk/dxvk-1.10.3-r1.ebuild b/app-emulation/dxvk/dxvk-1.10.3-r1.ebuild
deleted file mode 100644
index 701ccb453a83..000000000000
--- a/app-emulation/dxvk/dxvk-1.10.3-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# note: version <2.0 should be kept for longer given it's the
-# last version to support <wine-7.1 and <nvidia-drivers-510
-
-MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit flag-o-matic meson-multilib
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
-else
-	SRC_URI="https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* amd64 x86"
-fi
-
-DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine"
-HOMEPAGE="https://github.com/doitsujin/dxvk/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="+abi_x86_32 crossdev-mingw +d3d9 +d3d10 +d3d11 debug +dxgi"
-REQUIRED_USE="
-	|| ( d3d9 d3d10 d3d11 dxgi )
-	d3d10? ( d3d11 )
-	dxgi? ( d3d11 )"
-
-BDEPEND="
-	dev-util/glslang
-	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.3-gcc13.patch
-	"${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local tool=-w64-mingw32-g++
-		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
-			if ! type -P ${tool} >/dev/null; then
-				eerror "With USE=crossdev-mingw, it is necessary to setup the mingw toolchain."
-				eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw"
-				use abi_x86_32 && use abi_x86_64 &&
-					eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains."
-				die "USE=crossdev-mingw is set but ${tool} was not found"
-			elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then
-				eerror "${PN} requires GCC to be built with --enable-threads=posix"
-				eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows"
-				die "USE=crossdev-mingw is set but ${tool} does not use POSIX threads"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_dxvk.sh || die
-}
-
-src_configure() {
-	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-	# random segfaults been reported with LTO in some games, filter as
-	# a safety (note that optimizing this further won't really help
-	# performance, GPU does the actual work)
-	filter-lto
-
-	# -mavx with mingw-gcc has a history of obscure issues and
-	# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
-	# crashes with -march=skylake >=wine-8.10, similar issues with
-	# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-	append-flags -mno-avx
-
-	if [[ ${CHOST} != *-mingw* ]]; then
-		if [[ ! -v MINGW_BYPASS ]]; then
-			unset AR CC CXX RC STRIP
-			filter-flags '-fuse-ld=*'
-			filter-flags '-mfunction-return=thunk*' #878849
-
-			# some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then
-			# strip-unsupported-flags miss these during compile-only tests
-			# (primarily done for 23.0 profiles' -z, not full coverage)
-			filter-flags '-Wl,-z,*' #928038
-		fi
-
-		CHOST_amd64=x86_64-w64-mingw32
-		CHOST_x86=i686-w64-mingw32
-		CHOST=$(usex x86 ${CHOST_x86} ${CHOST_amd64})
-
-		strip-unsupported-flags
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev,
-	# unset again so meson eclass will set ${CHOST}-gcc + others
-	use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX RC STRIP
-
-	local emesonargs=(
-		--prefix="${EPREFIX}"/usr/lib/${PN}
-		--{bin,lib}dir=x${MULTILIB_ABI_FLAG: -2}
-		$(meson_use {,enable_}d3d9)
-		$(meson_use {,enable_}d3d10)
-		$(meson_use {,enable_}d3d11)
-		$(meson_use {,enable_}dxgi)
-		$(usev !debug --strip) # portage won't strip .dll, so allow it here
-		-Denable_tests=false # needs wine/vulkan and is intended for manual use
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	dobin setup_dxvk.sh
-	dodoc README.md dxvk.conf
-
-	find "${ED}" -type f -name '*.a' -delete || die
-}
-
-pkg_preinst() {
-	[[ -e ${EROOT}/usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY=
-}
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "To enable ${PN} on a wine prefix, you can run the following command:"
-		elog
-		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
-		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
-	elif [[ -v DXVK_HAD_OVERLAY ]]; then
-		# temporary warning until this version is more widely used
-		elog "Gentoo's main repo ebuild for ${PN} uses different paths than most overlays."
-		elog "If you were using symbolic links in wine prefixes it may be necessary to"
-		elog "refresh them by re-running the command:"
-		elog
-		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
-		elog
-		elog "Also, if you were using /etc/${PN}.conf, ${PN} is no longer patched to load"
-		elog "it. See ${EROOT}/usr/share/doc/${PF}/README.md* for handling configs."
-	fi
-}
diff --git a/app-emulation/dxvk/dxvk-2.5.3.ebuild b/app-emulation/dxvk/dxvk-2.5.3.ebuild
new file mode 100644
index 000000000000..88a2aa6294bc
--- /dev/null
+++ b/app-emulation/dxvk/dxvk-2.5.3.ebuild
@@ -0,0 +1,181 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit flag-o-matic meson-multilib python-any-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
+	EGIT_SUBMODULES=(
+		# picky about headers and is cross-compiled making -I/usr/include troublesome
+		include/{spirv,vulkan}
+		subprojects/libdisplay-info
+	)
+else
+	HASH_SPIRV=8b246ff75c6615ba4532fe4fde20f1be090c3764
+	HASH_VULKAN=46dc0f6e514f5730784bb2cac2a7c731636839e8
+	HASH_DISPLAYINFO=275e6459c7ab1ddd4b125f28d0440716e4888078
+	SRC_URI="
+		https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
+			-> spirv-headers-${HASH_SPIRV}.tar.gz
+		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+			-> vulkan-headers-${HASH_VULKAN}.tar.gz
+		https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/libdisplay-info-${HASH_DISPLAYINFO}.tar.bz2
+	"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine"
+HOMEPAGE="https://github.com/doitsujin/dxvk/"
+
+# setup_dxvk.sh is no longer provided, fetch old until a better solution
+SRC_URI+=" https://raw.githubusercontent.com/doitsujin/dxvk/cd21cd7fa3b0df3e0819e21ca700b7627a838d69/setup_dxvk.sh"
+
+LICENSE="ZLIB Apache-2.0 MIT"
+SLOT="0"
+IUSE="+abi_x86_32 crossdev-mingw +d3d8 +d3d9 +d3d10 +d3d11 +dxgi +strip"
+REQUIRED_USE="
+	|| ( d3d8 d3d9 d3d10 d3d11 dxgi )
+	d3d8? ( d3d9 )
+	d3d10? ( d3d11 )
+	d3d11? ( dxgi )
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glslang
+	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch
+	"${FILESDIR}"/${PN}-2.4-d3d8-setup.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local tool=-w64-mingw32-g++
+		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
+			if ! type -P ${tool} >/dev/null; then
+				eerror "With USE=crossdev-mingw, it is necessary to setup the mingw toolchain."
+				eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw"
+				use abi_x86_32 && use abi_x86_64 &&
+					eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains."
+				die "USE=crossdev-mingw is set but ${tool} was not found"
+			elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then
+				eerror "${PN} requires GCC to be built with --enable-threads=posix"
+				eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows"
+				die "USE=crossdev-mingw is set but ${tool} does not use POSIX threads"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]]; then
+		rmdir include/{spirv,vulkan} subprojects/libdisplay-info || die
+		mv ../SPIRV-Headers-${HASH_SPIRV} include/spirv || die
+		mv ../Vulkan-Headers-${HASH_VULKAN} include/vulkan || die
+		mv ../libdisplay-info-${HASH_DISPLAYINFO} subprojects/libdisplay-info || die
+	fi
+	cp -- "${DISTDIR}"/setup_dxvk.sh . || die
+
+	default
+
+	sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_dxvk.sh || die
+}
+
+src_configure() {
+	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+	# random segfaults been reported with LTO in some games, filter as
+	# a safety (note that optimizing this further won't really help
+	# performance, GPU does the actual work)
+	filter-lto
+
+	# -mavx with mingw-gcc has a history of obscure issues and
+	# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
+	# crashes with -march=skylake >=wine-8.10, similar issues with
+	# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
+	append-flags -mno-avx
+
+	if [[ ${CHOST} != *-mingw* ]]; then
+		if [[ ! -v MINGW_BYPASS ]]; then
+			unset AR CC CXX RC STRIP
+			filter-flags '-fuse-ld=*'
+			filter-flags '-mfunction-return=thunk*' #878849
+
+			# some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then
+			# strip-unsupported-flags miss these during compile-only tests
+			# (primarily done for 23.0 profiles' -z, not full coverage)
+			filter-flags '-Wl,-z,*' #928038
+		fi
+
+		CHOST_amd64=x86_64-w64-mingw32
+		CHOST_x86=i686-w64-mingw32
+		CHOST=$(usex x86 ${CHOST_x86} ${CHOST_amd64})
+
+		strip-unsupported-flags
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev,
+	# unset again so meson eclass will set ${CHOST}-gcc + others
+	use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX RC STRIP
+
+	local emesonargs=(
+		--prefix="${EPREFIX}"/usr/lib/${PN}
+		--{bin,lib}dir=x${MULTILIB_ABI_FLAG: -2}
+		--force-fallback-for=libdisplay-info # system's is ELF (unusable)
+		$(meson_use {,enable_}d3d8)
+		$(meson_use {,enable_}d3d9)
+		$(meson_use {,enable_}d3d10)
+		$(meson_use {,enable_}d3d11)
+		$(meson_use {,enable_}dxgi)
+		$(usev strip --strip) # portage won't strip .dll, so allow it here
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	dobin setup_dxvk.sh
+	dodoc README.md dxvk.conf
+
+	find "${ED}" -type f -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "To enable ${PN} on a wine prefix, you can run the following command:"
+		elog
+		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
+		elog "Note: setup_dxvk.sh is unofficially temporarily provided as it was"
+		elog "removed upstream, handling may change in the future."
+	fi
+
+	if use d3d8 && [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 2.4
+	then
+		elog
+		elog ">=${PN}-2.4 now provides d3d8.dll, to make use of it will need to"
+		elog "update old wine prefixes which is typically done by re-running:"
+		elog
+		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
+		elog
+	fi
+}
diff --git a/app-emulation/dxvk/files/dxvk-1.10.3-gcc13.patch b/app-emulation/dxvk/files/dxvk-1.10.3-gcc13.patch
deleted file mode 100644
index 580e412fcd6e..000000000000
--- a/app-emulation/dxvk/files/dxvk-1.10.3-gcc13.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/doitsujin/dxvk/commit/1a5afc77b1859e6c7e31b55e11ece899e3b5295a
---- a/src/util/config/config.h
-+++ b/src/util/config/config.h
-@@ -1,4 +1,5 @@
- #pragma once
- 
-+#include <cstdint>
- #include <string>
- #include <unordered_map>
---- a/src/util/util_bit.h
-+++ b/src/util/util_bit.h
-@@ -17,4 +17,5 @@
- #include "util_math.h"
- 
-+#include <cstdint>
- #include <cstring>
- #include <iterator>
diff --git a/app-emulation/gallium-nine-standalone/files/0.3-nine-dll-path.patch b/app-emulation/gallium-nine-standalone/files/0.3-nine-dll-path.patch
deleted file mode 100644
index 830bdc4b32ed..000000000000
--- a/app-emulation/gallium-nine-standalone/files/0.3-nine-dll-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ninewinecfg/main.c b/ninewinecfg/main.c
-index 3d58d67..e69668d 100644
---- a/ninewinecfg/main.c
-+++ b/ninewinecfg/main.c
-@@ -32,7 +32,7 @@
- 
- WINE_DEFAULT_DEBUG_CHANNEL(ninecfg);
- 
--static const char * const fn_nine_dll = "d3d9-nine.dll";
-+static const char * const fn_nine_dll = G9DLL;
- static const char * const fn_d3d9_dll = "d3d9.dll";
- static const char * const fn_nine_exe = "ninewinecfg.exe";
- 
diff --git a/app-emulation/pcem/Manifest b/app-emulation/pcem/Manifest
index 00b41e28ca92..e30539c0bd91 100644
--- a/app-emulation/pcem/Manifest
+++ b/app-emulation/pcem/Manifest
@@ -1,2 +1 @@
-DIST PCemV17Linux.tar.gz 1880868 BLAKE2B 64068f0f98e8fe3e9bfe42a04f462375a7ee0cb8259b103237f3b0542f54ad13ed625a55c8379e2c54a87348ed504496a6b163419855ceeda8e4f18e1ea5dcd9 SHA512 6d84c8cbe9b6116f6439f542ac08139cfc5652a34b615a1ed841a6f8c227e77f1d26573ec35d57511b9a69e7472fbe51f2abb9307f8f8c1207c74fbe8107cadd
 DIST pcem-17_p20241210.tar.gz 1668232 BLAKE2B 5fdf4e0067dfe3924be1ee4a22055e4f5f2dfdfcf3494d0f0ee9e6b3f1641ccc7f1767524416b0fe39daaccab6e805f839c35ca9a178ad4355a0100784ab31dc SHA512 78353704529d7f333d5fc5513be34cc895423418242642e3b7a35e008700a444b1f8b0d477dbd26a84081112eaba2829248c0506cd333e22479751e9e99252e0
diff --git a/app-emulation/pcem/files/pcem-17-respect-cflags.patch b/app-emulation/pcem/files/pcem-17-respect-cflags.patch
deleted file mode 100644
index 0e9d28885595..000000000000
--- a/app-emulation/pcem/files/pcem-17-respect-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,8 +31,6 @@
-    CXXFLAGS="-Wall -O0 -g -D_DEBUG -fcommon"
-    AC_MSG_RESULT([yes])
- else
--   CFLAGS="-O3 -fcommon"
--   CXXFLAGS="-O3 -fcommon"
-    AC_MSG_RESULT([no])
- fi
- 
diff --git a/app-emulation/pcem/pcem-17-r2.ebuild b/app-emulation/pcem/pcem-17-r2.ebuild
deleted file mode 100644
index 47e17b588639..000000000000
--- a/app-emulation/pcem/pcem-17-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-gtk3"
-inherit autotools desktop flag-o-matic wxwidgets
-
-DESCRIPTION="A PC emulator that specializes in running old operating systems and software"
-HOMEPAGE="
-	https://pcem-emulator.co.uk/
-	https://github.com/sarah-walker-pcem/pcem/
-"
-SRC_URI="https://pcem-emulator.co.uk/files/PCemV${PV}Linux.tar.gz"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="alsa networking"
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	media-libs/libsdl2
-	media-libs/openal
-	x11-libs/wxGTK:${WX_GTK_VER}[tiff,X]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "README.md" "TESTED.md" )
-
-PATCHES=( "${FILESDIR}/${PN}-17-respect-cflags.patch" )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	setup-wxwidgets
-
-	# Does not compile with -fno-common.
-	# See https://pcem-emulator.co.uk/phpBB3/viewtopic.php?f=3&t=3443
-	append-cflags -fcommon
-
-	# LTO needs to be filtered
-	# See https://bugs.gentoo.org/854528
-	filter-lto
-	append-flags -fno-strict-aliasing
-
-	local myeconfargs=(
-		--enable-release-build
-		$(use_enable alsa)
-		$(use_enable networking)
-		--with-wx-config="${WX_CONFIG}"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/pcem
-	doins -r configs nvr roms
-
-	newicon src/icons/32x32/motherboard.png pcem.png
-	make_desktop_entry "pcem" "PCem" pcem "Development;Utility"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "In order to use PCem, you will need some roms for various emulated systems."
-	elog "You can either install globally for all users or locally for yourself."
-	elog ""
-	elog "To install globally, put your ROM files into '${ROOT}/usr/share/pcem/roms/<system>'."
-	elog "To install locally, put your ROM files into '~/.pcem/roms/<system>'."
-}
diff --git a/app-emulation/qemu/qemu-7.2.15.ebuild b/app-emulation/qemu/qemu-7.2.15.ebuild
index 08f05e58f7dd..11b2753234b0 100644
--- a/app-emulation/qemu/qemu-7.2.15.ebuild
+++ b/app-emulation/qemu/qemu-7.2.15.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
@@ -41,7 +41,7 @@ else
 	fi
 
 	S="${WORKDIR}/${MY_P}"
-	[[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	[[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-emulation/qemu/qemu-8.2.7.ebuild b/app-emulation/qemu/qemu-8.2.7.ebuild
index 4f1e891938a1..aad4de6c278f 100644
--- a/app-emulation/qemu/qemu-8.2.7.ebuild
+++ b/app-emulation/qemu/qemu-8.2.7.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
 	fi
 
 	S="${WORKDIR}/${MY_P}"
-	[[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+	[[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-emulation/uxn/Manifest b/app-emulation/uxn/Manifest
index ce4250cfc6a5..ae733c986e80 100644
--- a/app-emulation/uxn/Manifest
+++ b/app-emulation/uxn/Manifest
@@ -1,2 +1 @@
-DIST uxn-0_p20240304.tar.gz 307083 BLAKE2B 2b3a556c5094fd777d82d75c87f721d1a9ea136334cdbc8553662281ae498beb79514e9e567e79b84a625b2fe60b486aa7f6892594cbd08abbbfeb4c9a50b2e9 SHA512 048e24e33de04913e03fbf1b242837dd1ad190f52ede16c302cf436399f0ee478afca545236dd438e03d8dfc29252478c2d79c9b6d3e8d34bb83c99f1930d026
 DIST uxn-0_p20241112.tar.gz 303651 BLAKE2B d632d59bb6b271b8dd9e03ff9efc6e4cf822793b06c3f95278d9e9b0be2242c615611ba87560b5ce9c6cde549752b6f4f578ad4872682665b3c019fcf07efeb5 SHA512 66b3c8ccdd6a79f507f6672161660b3d2f491ac1a186bff963f156e322cdf11494269e73d4bb08b22bb1fe7c7bacb59cb5ba850fef6cb4fe183777fdd8cba2ac
diff --git a/app-emulation/uxn/uxn-0_p20240304.ebuild b/app-emulation/uxn/uxn-0_p20240304.ebuild
deleted file mode 100644
index 8e63625c852d..000000000000
--- a/app-emulation/uxn/uxn-0_p20240304.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="An assembler and emulator for the Uxn stack-machine, written in ANSI C"
-HOMEPAGE="https://wiki.xxiivv.com/site/uxn.html
-	https://git.sr.ht/~rabbits/uxn/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://git.sr.ht/~rabbits/${PN}"
-elif [[ "${PV}" == *_p20240304 ]] ; then
-	COMMIT=e7c25fad05850f0e577fc83a140405ca6ccd93c2
-	SRC_URI="https://git.sr.ht/~rabbits/${PN}/archive/${COMMIT}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}/uxn-${COMMIT}"
-
-	KEYWORDS="amd64 ~x86"
-else
-	die "wrong package version (PV), please update the ebuild, given: ${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	media-libs/libsdl2:=
-"
-DEPEND="
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/uxn-0_p20230609-build.sh.patch"
-)
-
-src_compile() {
-	CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"	\
-	  ./build.sh --no-run							\
-		|| die "building with \"build.sh\" failed"
-
-	# Fails to assemble via following loop.
-	# Possibly not mean to be assembled by hand.
-	rm -rf ./projects/library ./projects/software/{asma,launcher}.tal || die
-
-	local tal_file
-	local tal_file_base
-
-	while read -r tal_file ; do
-		tal_file_base="$(basename "${tal_file}" .tal)"
-
-		ebegin "Assembling ROM ${tal_file_base}"
-		bin/uxnasm "${tal_file}" "$(dirname "${tal_file}")/${tal_file_base}.rom"
-		eend ${?} || die "failed to assemble ${tal_file}"
-	done \
-		< <(find projects -type f -name "*.tal")
-}
-
-src_install() {
-	insinto /usr/bin
-	doins bin/uxn{asm,cli,emu}
-	fperms 0755 /usr/bin/uxn{asm,cli,emu}
-
-	insinto /usr/share/uxn
-	doins -r projects
-
-	einstalldocs
-}
diff --git a/app-emulation/virt-firmware/virt-firmware-24.11.ebuild b/app-emulation/virt-firmware/virt-firmware-24.11.ebuild
index ade74cf49ab8..d89bf032e673 100644
--- a/app-emulation/virt-firmware/virt-firmware-24.11.ebuild
+++ b/app-emulation/virt-firmware/virt-firmware-24.11.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/app-emulation/virt-firmware/virt-firmware-24.7.ebuild b/app-emulation/virt-firmware/virt-firmware-24.7.ebuild
index 33bca1b06d18..baf10f7aaed4 100644
--- a/app-emulation/virt-firmware/virt-firmware-24.7.ebuild
+++ b/app-emulation/virt-firmware/virt-firmware-24.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 arm arm64 x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index c9600713ffce..f34443587bc1 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,2 +1,3 @@
 DIST virt-manager-4.1.0.tar.gz 3151412 BLAKE2B 1b4203be81bd7b82251225d691a4d9068f268e610f049bcadb96de5b539e964ca0b001f22f06ddd8266b58b079f60046f6d11942a1e4eadbc43f0607c46bbddd SHA512 725cb5bcbaebaafae417f95deffb4243ccdad769668cba6e1235f4607e2b29dbd099d2a9a3885981158f53ea854dd71cc29ed9d7557b2791161c13d34f2ef883
 DIST virt-manager-5.0.0.tar.xz 1466724 BLAKE2B b8b93587b1e1cdb398f33e4820aeaa9c1aecfbe26cd54597830fcbc009a51e70b0dd10b947b9392a1d3fdc5b28c19573a1d417b5748c38658b6e03725023bcfb SHA512 d0cb7eb844fc98ad29413717e5fa5834bc6f9f6cb6b9339b59c2721bb37a58f71280e3d2a04a64a6021614626329d76c92474f826bb1d9b7a9040b479f20d4e8
+DIST virt-manager-5.0.0.tar.xz.asc 833 BLAKE2B f97127a4cb1c0c24c6627c5d8e1e510075df3ad492e716f0cf07e5f41b3226295da4d73f5cef5903a9bc5a3d7a6f34bd07e7b0f2e21e9d42997c117708de1ada SHA512 e0bec28ce61af5dd2a6895006d60e11dd7b384cd4fec305ebfbf05831864aeb334d212511d6f92827fe15f6d6dcab3ff1d13309afa686d3e8e76c6b354ffa494
diff --git a/app-emulation/virt-manager/metadata.xml b/app-emulation/virt-manager/metadata.xml
index 40002fc45349..ece3c51f6b11 100644
--- a/app-emulation/virt-manager/metadata.xml
+++ b/app-emulation/virt-manager/metadata.xml
@@ -16,7 +16,17 @@
 		libvirtd instances (e.g. Kerberos-protected instances).
 		</flag>
 	</use>
+	<longdescription>
+		Virtual Machine Manager provides a graphical tool for administering virtual
+		machines for KVM, Xen, and LXC. Start, stop, add or remove virtual devices,
+		connect to a graphical or serial console, and see resource usage statistics
+		for existing VMs on local or remote machines. Uses libvirt as the backend
+		management API.
+	</longdescription>
 	<upstream>
+		<bugs-to>https://github.com/virt-manager/virt-manager/issues</bugs-to>
+		<changelog>https://github.com/virt-manager/virt-manager/blob/main/NEWS.md</changelog>
+		<doc>https://virt-manager.org/documentation.html</doc> <!-- not of much use -->
 		<remote-id type="github">virt-manager/virt-manager</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/virt-manager/virt-manager-5.0.0-r1.ebuild b/app-emulation/virt-manager/virt-manager-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..828d4e623a57
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-5.0.0-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit gnome2 python-single-r1 optfeature meson verify-sig
+
+DESCRIPTION="A graphical tool for administering virtual machines"
+HOMEPAGE="https://virt-manager.org https://github.com/virt-manager/virt-manager"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
+	EGIT_BRANCH="main"
+	SRC_URI=""
+	inherit git-r3
+else
+	SRC_URI="
+		https://releases.pagure.org/${PN}/${P}.tar.xz
+		verify-sig? ( https://releases.pagure.org/${PN}/${P}.tar.xz.asc	)
+	"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="gui policykit sasl verify-sig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# https://github.com/virt-manager/virt-manager/blob/main/virt-manager.spec.in
+RDEPEND="
+	${PYTHON_DEPS}
+	|| ( dev-libs/libisoburn app-cdr/cdrtools )
+	>=app-emulation/libvirt-glib-0.0.9[introspection]
+	>=sys-libs/libosinfo-0.2.10[introspection]
+	$(python_gen_cond_dep '
+		dev-libs/libxml2[python,${PYTHON_USEDEP}]
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/libvirt-python-6.10.0[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	gui? (
+		gnome-base/dconf
+		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
+		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
+		sys-apps/dbus
+		x11-libs/gtk+:3[introspection]
+		|| (
+			x11-libs/gtksourceview:4[introspection]
+			x11-libs/gtksourceview:3.0[introspection]
+		)
+		x11-libs/vte:2.91[introspection]
+		policykit? ( sys-auth/polkit[introspection] )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/docutils
+	sys-devel/gettext
+	verify-sig? ( >=sec-keys/openpgp-keys-virt-manager-20250106 )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/virt-manager.asc
+
+DOCS=( {DESIGN,NEWS,README}.md )
+
+src_configure() {
+	local emesonargs=( # in upstream's order
+		-Dupdate-icon-cache=false
+		-Dcompile-schemas=false
+
+		# -Ddefault-graphics=spice # default
+		# we do not ship OpenVZ and bhyve does not work on linux
+		-Ddefault-hvs="['qemu','xen','lxc']"
+
+		# While in the past we did allow test suite to run, any errors from
+		# test_cli.py were ignored. Since that's where like 90% of tests actually
+		# lives, just disable tests (and do not drag additional dependencies).
+		-Dtests=disabled
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use gui; then
+		rm -r "${ED}/usr/share/applications/${PN}.desktop" || die
+		rm -r "${ED}/usr/share/${PN}/icons/" || die
+		rm -r "${ED}/usr/share/${PN}/ui/" || die
+		rm -r "${ED}/usr/share/icons/" || die
+		rm -r "${ED}/usr/bin/${PN}" || die
+	fi
+
+	python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+	use gui && gnome2_pkg_postinst
+
+	optfeature "Full QEMU host support" app-emulation/qemu[usbredir,spice]
+	optfeature "SSH_ASKPASS program implementation" lxqt-base/lxqt-openssh-askpass \
+		net-misc/ssh-askpass-fullscreen net-misc/x11-ssh-askpass
+	# it's possible this also requires libguestfs-appliance but it's a RDEPEND of libguestfs
+	optfeature "Inspection of guest filesystems" app-emulation/libguestfs[libvirt,python]
+}
diff --git a/app-emulation/virt-manager/virt-manager-5.0.0.ebuild b/app-emulation/virt-manager/virt-manager-5.0.0.ebuild
index f2095898d5d0..0f9b087de276 100644
--- a/app-emulation/virt-manager/virt-manager-5.0.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-5.0.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
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 arm64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index f2095898d5d0..828d4e623a57 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.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_COMPAT=( python3_{10..13} )
-inherit gnome2 python-single-r1 optfeature meson
+inherit gnome2 python-single-r1 optfeature meson verify-sig
 
 DESCRIPTION="A graphical tool for administering virtual machines"
 HOMEPAGE="https://virt-manager.org https://github.com/virt-manager/virt-manager"
@@ -15,20 +15,24 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 	inherit git-r3
 else
-	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
+	SRC_URI="
+		https://releases.pagure.org/${PN}/${P}.tar.xz
+		verify-sig? ( https://releases.pagure.org/${PN}/${P}.tar.xz.asc	)
+	"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="gui policykit sasl"
+IUSE="gui policykit sasl verify-sig"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+# https://github.com/virt-manager/virt-manager/blob/main/virt-manager.spec.in
 RDEPEND="
 	${PYTHON_DEPS}
 	|| ( dev-libs/libisoburn app-cdr/cdrtools )
-	>=app-emulation/libvirt-glib-1.0.0[introspection]
+	>=app-emulation/libvirt-glib-0.0.9[introspection]
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	$(python_gen_cond_dep '
 		dev-libs/libxml2[python,${PYTHON_USEDEP}]
@@ -41,27 +45,40 @@ RDEPEND="
 		gnome-base/dconf
 		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
 		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
-		sys-apps/dbus[X]
+		sys-apps/dbus
 		x11-libs/gtk+:3[introspection]
-		x11-libs/gtksourceview:4[introspection]
+		|| (
+			x11-libs/gtksourceview:4[introspection]
+			x11-libs/gtksourceview:3.0[introspection]
+		)
 		x11-libs/vte:2.91[introspection]
 		policykit? ( sys-auth/polkit[introspection] )
 	)
 "
 DEPEND="${RDEPEND}"
-BDEPEND="dev-python/docutils"
+BDEPEND="
+	dev-python/docutils
+	sys-devel/gettext
+	verify-sig? ( >=sec-keys/openpgp-keys-virt-manager-20250106 )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/virt-manager.asc
 
-DOCS=( README.md NEWS.md )
+DOCS=( {DESIGN,NEWS,README}.md )
 
 src_configure() {
-	# While in the past we did allow test suite to run, any errors from
-	# test_cli.py were ignored. Since that's where like 90% of tests actually
-	# lives, just disable tests (and do not drag additional dependencies).
-	local emesonargs=(
+	local emesonargs=( # in upstream's order
+		-Dupdate-icon-cache=false
 		-Dcompile-schemas=false
-		-Ddefault-graphics=spice
+
+		# -Ddefault-graphics=spice # default
+		# we do not ship OpenVZ and bhyve does not work on linux
+		-Ddefault-hvs="['qemu','xen','lxc']"
+
+		# While in the past we did allow test suite to run, any errors from
+		# test_cli.py were ignored. Since that's where like 90% of tests actually
+		# lives, just disable tests (and do not drag additional dependencies).
 		-Dtests=disabled
-		-Dupdate-icon-cache=false
 	)
 
 	meson_src_configure
@@ -70,12 +87,12 @@ src_configure() {
 src_install() {
 	meson_src_install
 
-	if ! use gui ; then
-		rm -r "${ED}/usr/share/virt-manager/ui/" || die
-		rm -r "${ED}/usr/share/virt-manager/icons/" || die
+	if ! use gui; then
+		rm -r "${ED}/usr/share/applications/${PN}.desktop" || die
+		rm -r "${ED}/usr/share/${PN}/icons/" || die
+		rm -r "${ED}/usr/share/${PN}/ui/" || die
 		rm -r "${ED}/usr/share/icons/" || die
-		rm -r "${ED}/usr/share/applications/virt-manager.desktop" || die
-		rm -r "${ED}/usr/bin/virt-manager" || die
+		rm -r "${ED}/usr/bin/${PN}" || die
 	fi
 
 	python_fix_shebang "${ED}"
@@ -84,6 +101,9 @@ src_install() {
 pkg_postinst() {
 	use gui && gnome2_pkg_postinst
 
-	optfeature "SSH_ASKPASS program implementation" lxqt-base/lxqt-openssh-askpass net-misc/ssh-askpass-fullscreen net-misc/x11-ssh-askpass
-	optfeature "QEMU host support" app-emulation/qemu[usbredir,spice]
+	optfeature "Full QEMU host support" app-emulation/qemu[usbredir,spice]
+	optfeature "SSH_ASKPASS program implementation" lxqt-base/lxqt-openssh-askpass \
+		net-misc/ssh-askpass-fullscreen net-misc/x11-ssh-askpass
+	# it's possible this also requires libguestfs-appliance but it's a RDEPEND of libguestfs
+	optfeature "Inspection of guest filesystems" app-emulation/libguestfs[libvirt,python]
 }
diff --git a/app-emulation/virtiofsd/virtiofsd-1.11.1-r1.ebuild b/app-emulation/virtiofsd/virtiofsd-1.11.1-r1.ebuild
index 410c131a66b5..b3bb153f56ea 100644
--- a/app-emulation/virtiofsd/virtiofsd-1.11.1-r1.ebuild
+++ b/app-emulation/virtiofsd/virtiofsd-1.11.1-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
@@ -119,7 +119,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://gitlab.com/virtio-fs/virtiofsd/-/archive/v${PV}/virtiofsd-v${PV}.tar.bz2"
 	SRC_URI+=" ${CARGO_CRATE_URIS}"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="amd64 ppc64"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-7.1.4.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-7.1.4.ebuild
index c1633c28ffeb..c42e59eacc24 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-7.1.4.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-7.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-3 || ( GPL-3 CDDL )"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_unpack() {
 	return 0
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.1.4.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.1.4.ebuild
index ffa939f5e0fa..d5d33777cb62 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.1.4.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}"
 
 LICENSE="PUEL-12"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 RESTRICT="bindist mirror strip"
 
 RDEPEND="
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.1.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.1.4.ebuild
index 6a4d48acf31d..e85f23e1b239 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.1.4.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-${MY_PV}"
 # Reminder: see the LICENSE related comment in app-emulation/virtualbox-additions ebuild
 LICENSE="GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+dbus gui"
 
 RDEPEND="
diff --git a/app-emulation/virtualbox-kvm/Manifest b/app-emulation/virtualbox-kvm/Manifest
index a90879e5ec46..44ab5c1fdf86 100644
--- a/app-emulation/virtualbox-kvm/Manifest
+++ b/app-emulation/virtualbox-kvm/Manifest
@@ -5,4 +5,4 @@ DIST virtualbox-help-7.1.4.tar.xz 1586108 BLAKE2B e8219ed67b1db9a5e4d0271e25980f
 DIST virtualbox-kvm-20240828.tar.gz 130388 BLAKE2B 68589fce348efe37a46d4e6cb28ced18969c5cffbd3dcaf85a4f0a085782521a26b4fe4901bda914a17dc97514df7c2a0548d616830abdb9b279afc1508f6c28 SHA512 3625a069729158e48d0f356d34657b925e235f24af0cd42d01625936b6baf1f16ab11448fb7c82190722e24b81b240b08786154ad26050ed6dff2c69c89e0cd4
 DIST virtualbox-kvm-20241220.tar.gz 86479 BLAKE2B d0b152bcc1ab2c5255d5e39b297b7375ad527c510d2d518d007aabfa1bcfb94a3decc847e80d01b7b2e8d0b014988d1764ea952fbf2921f337ca2480abd91eca SHA512 54c645368d0769c8da6d630132976b049722baa43846bcd019778f36e272df6714a7634273105cdb965a02904b326bede153c7387d581b713bcef9bfc665a3f7
 DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d2790b2bb9eb69e333a8773ad500b29dd127b401943abf59ca59d01858a3ed5551fb3a6c93c4c893c8de971a714ce5306d577 SHA512 a488cbc6660fe8637c44cd79d87156609af089988239a7e76fea8a3c7e6319512c574bef2e942b354b14ce671a8e75ab8b2160abf7c40963795ee8a545ecd992
-DIST virtualbox-patches-7.1.0.tar.bz2 5952 BLAKE2B cb024f36249d7d312c9d0f9231c22a9609d45de1d4c82ca36672fea703765d437d7a414d810adb5eb5f2db92018b669c3b5d0c32372c5ced90f5e13f82344ffa SHA512 c6ef54b7d60f01f5f2b89c6fd7f8b7b509bc62bca0502114cedcbaaf9643445ea413bba481dcf43fb96b5b4d94d64395965682c1ee160d889213615c9272184c
+DIST virtualbox-patches-7.1.4-r1.tar.bz2 6140 BLAKE2B dc84a0522629d06b72ff98e330e2c104e55185914238fed53d696399e43400a1c32979724c156479c3a67d2c64f7f8389d58a83242de559cf8dd89fbda0804e6 SHA512 3541ace61bd64f6ecb2f7b3aaa2383c33ae51682676eead78b267ff82d46e769117f074a534301e734408efa0e622d63e778085f06741223b35ed8caaacc003d
diff --git a/app-emulation/virtualbox-kvm/virtualbox-kvm-7.1.4_pre20241220.ebuild b/app-emulation/virtualbox-kvm/virtualbox-kvm-7.1.4_pre20241220.ebuild
index b0c6978ad12d..47c33c01d7f6 100644
--- a/app-emulation/virtualbox-kvm/virtualbox-kvm-7.1.4_pre20241220.ebuild
+++ b/app-emulation/virtualbox-kvm/virtualbox-kvm-7.1.4_pre20241220.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ PYTHON_COMPAT=( python3_{10..11} )
 inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
 	python-single-r1 tmpfiles toolchain-funcs udev xdg
 
-PATCHES_PV="7.1.0"
+PATCHES_PV="7.1.4-r1"
 ORIGIN_PN="VirtualBox"
 ORIGIN_PV=${PV%_pre*}
 
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-7.1.4-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.1.4-r1.ebuild
index d94781cae808..502aa90cb335 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-7.1.4-r1.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-7.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # XXX: the tarball here is just the kernel modules split out of the binary
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-3"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 CONFIG_CHECK="~!SPINLOCK JUMP_LABEL"
 
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 26eb521fcef7..0b80f5337d02 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -5,6 +5,6 @@ DIST virtualbox-help-7.0.22.tar.xz 3950712 BLAKE2B 381743c2d6e5da940865818c725bc
 DIST virtualbox-help-7.1.0.tar.xz 1631644 BLAKE2B 408748619d1e981b9d5b5e615baca75ff297e9b7e745751767361b7b9c74345a3db1980734439f3868c412fe28a6b687b417adc3cc148d2e2b8a9fa60e48463b SHA512 513b8474d4fbf7cdb83624dc8d344122c524d92f9f84b32784161c8e1cac8ddc2c265447621d7cd3cf105d555a044e6abf42155f413ba89d507eba7ce3b2da89
 DIST virtualbox-help-7.1.4.tar.xz 1586108 BLAKE2B e8219ed67b1db9a5e4d0271e25980fbcbfb8c72316dc4bd3337080c81082bb8ecad9c9317b5b9be77db1eeac42c567512a64fe86ae9bb6371dea8632e7afc9ab SHA512 185249fe2bdf2138a034c53e23eedb88cf487e1fb26a8bd623f0d75ea0d2ff4dff3484564a5b317703fb3f302ec7037cb0a49c7c3845e229fe2ac9e2c8c96af6
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
-DIST virtualbox-patches-7.0.22.tar.bz2 6920 BLAKE2B 1ac6f5ee15c1fa18e64007540d54d5f2df84f145948dd0d8d9984d5ef300502b54f45a213f729753636c09bbc9e6b2f6ddb7fa6dbd460cea5235efdf6ef7508f SHA512 4d956a0bc2213c1ba68c44a0c277b9f235ff396eee6276b8c92e7b8b81b1332d6e3f0efbfc3a23dc70ab6c7feefc3c1c6bf23eca86460cb2af8e484ed7c7d159
-DIST virtualbox-patches-7.1.4.tar.bz2 6090 BLAKE2B c0edfd36c5e6e74c14180269d3bd97f442c35500dc0901563722ed9cda820b5c592374eb57bc5a566b07904a8bbac5cfa50475b8a60847ffe14d6e2588c203bc SHA512 bac19f22bd95caf63099c0c640b236e4c7d2d533989a0278c6e2a38af5ff1936efc15ab91eb4d32ad31072c421ad7ec6cf6bc9bab325e1e47be6c13857946ddb
-DIST virtualbox-patches-7.2.0_pre20241229.tar.bz2 6177 BLAKE2B 4f9d5280fbec82b8fc1d88a663c9285d1ee1e3a5c29dfeea862725f31d1c819cc8da057b9bd95f6d1e867421bad13f0d162acbaea4329f3e5bc8ca6dee8b0baa SHA512 f1dba1a709afa341ffb4012057c4531267f60f9db9bf63f49c235766e6257c0c846d48806179e0dd265be98798f51aab747fe6d96377134c0ca46ba3bd793253
+DIST virtualbox-patches-7.0.22-r1.tar.bz2 6972 BLAKE2B e9116cb2ed874f9a0133e756b725a48ee665a412114d04195849f5930782c65678a2aaf581b9b02bc29001be4191116e322643232ee37de5cba0f2b5049b615f SHA512 be72b596f63229bd28b22c026108cf5a5c951f58343a709f158446593e6f872a81734dd83a838dd91c02c80854312e2cad81f3a525035db5ffabeb96729a8276
+DIST virtualbox-patches-7.1.4-r1.tar.bz2 6140 BLAKE2B dc84a0522629d06b72ff98e330e2c104e55185914238fed53d696399e43400a1c32979724c156479c3a67d2c64f7f8389d58a83242de559cf8dd89fbda0804e6 SHA512 3541ace61bd64f6ecb2f7b3aaa2383c33ae51682676eead78b267ff82d46e769117f074a534301e734408efa0e622d63e778085f06741223b35ed8caaacc003d
+DIST virtualbox-patches-7.2.0_pre20250106.tar.bz2 6235 BLAKE2B a87cbd118024d9b996cbabd19e16013d1a8e97ae34001b24abd33026c2cec7ab0a4c0cf5ea490cbf7e57c3848f011c579d03ba715e9c56efdc9f7a667166c524 SHA512 a77c6279cff8d7a655443d88ac9ae609fb9c801fd91f84eabcb3612a57501df191da4ee7e8dc92715d923dc25f703070508b28cc5b8b0147db6ea56a02728338
diff --git a/app-emulation/virtualbox/virtualbox-7.0.22.ebuild b/app-emulation/virtualbox/virtualbox-7.0.22.ebuild
index 9914f680db00..268e11c12192 100644
--- a/app-emulation/virtualbox/virtualbox-7.0.22.ebuild
+++ b/app-emulation/virtualbox/virtualbox-7.0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ DESCRIPTION="Family of powerful x86 virtualization products for enterprise and h
 HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="
 	https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.22.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.22-r1.tar.bz2
 	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${PV}.tar.xz ) )
 "
 S="${WORKDIR}/${MY_PN}-${PV}"
@@ -198,7 +198,7 @@ REQUIRED_USE="
 
 PATCHES=(
 	# Downloaded patchset
-	"${WORKDIR}"/virtualbox-patches-7.0.22/patches
+	"${WORKDIR}"/virtualbox-patches-7.0.22-r1/patches
 )
 
 pkg_pretend() {
diff --git a/app-emulation/virtualbox/virtualbox-7.1.4.ebuild b/app-emulation/virtualbox/virtualbox-7.1.4.ebuild
index bba788f29690..ef21366a55f3 100644
--- a/app-emulation/virtualbox/virtualbox-7.1.4.ebuild
+++ b/app-emulation/virtualbox/virtualbox-7.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,14 +28,14 @@ DESCRIPTION="Family of powerful x86 virtualization products for enterprise and h
 HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="
 	https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.1.4.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.1.4-r1.tar.bz2
 	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${HELP_PV}.tar.xz ) )
 "
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl test +udev vboxwebsrv vde +vmmraw vnc"
 RESTRICT="!test? ( test )"
 
@@ -199,7 +199,7 @@ REQUIRED_USE="
 
 PATCHES=(
 	# Downloaded patchset
-	"${WORKDIR}"/virtualbox-patches-7.1.4/patches
+	"${WORKDIR}"/virtualbox-patches-7.1.4-r1/patches
 )
 
 pkg_pretend() {
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
index f40763806c02..14672f2e29a8 100644
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ DESCRIPTION="Family of powerful x86 virtualization products for enterprise and h
 HOMEPAGE="https://www.virtualbox.org/"
 ESVN_REPO_URI="https://www.virtualbox.org/svn/vbox/trunk"
 SRC_URI="
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.2.0_pre20241229.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.2.0_pre20250106.tar.bz2
 	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${BASE_PV}.tar.xz ) )
 "
 S="${WORKDIR}/trunk"
@@ -198,7 +198,7 @@ REQUIRED_USE="
 
 PATCHES=(
 	# Downloaded patchset
-	"${WORKDIR}"/virtualbox-patches-7.2.0_pre20241229/patches
+	"${WORKDIR}"/virtualbox-patches-7.2.0_pre20250106/patches
 )
 
 DOCS=()	# Don't install the default README file during einstalldocs
@@ -565,7 +565,7 @@ src_install() {
 	done
 
 	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{32,64}.fd ; do
+	for each in VBoxEFI{-x86,-amd64}.fd ; do
 		vbox_inst ${each} 0644
 	done
 
diff --git a/app-emulation/vkd3d-proton/Manifest b/app-emulation/vkd3d-proton/Manifest
index c9e1ad744e94..561d961cb609 100644
--- a/app-emulation/vkd3d-proton/Manifest
+++ b/app-emulation/vkd3d-proton/Manifest
@@ -6,6 +6,7 @@ DIST spirv-headers-8b246ff75c6615ba4532fe4fde20f1be090c3764.tar.gz 472513 BLAKE2
 DIST spirv-headers-ec59c77a3bb5c747a369931ef101ac7c14823f2f.tar.gz 524120 BLAKE2B c0207283d22d72b4a3914f40161b8dec6fa6e8ed55fd91ae14da4499575d9f3a03c932dc7bcbdab084eec7f34d3657d00ce5b1a1398f0b815ec3aeb1e5589c58 SHA512 0523f5001414b6cb945d36a0551e848a586a07dc9893ffcf8b4360f5ce87d6c42315298b3386e3e2073cf4f11122a5a06b157ad88c49318d7ac93e92056d50d2
 DIST vkd3d-proton-2.12.tar.gz 2109289 BLAKE2B 805298efa2f49a82dcc4b989856fb24469a1de9a1d175d5844be3e72187d14f3454ced52bcd65f557ec6776fda00112f4b9849dd48679e10aadf277d82b928ca SHA512 fbd4102fc9917a8e7c28edcaa500c26352a0652a008da453108cd21325ef2c757b5c0842a50e2e5ea6efcacdabe86b2ce570647313d0036967a135b01850fbe8
 DIST vkd3d-proton-2.13.tar.gz 2210823 BLAKE2B 106d7c204b3761c119001af9cda7bd32443e3dcda4426b49f4a2d5f5c8bd19cb16fad21e6a73f6b6eaca8a8501e2d65db6f8b10fd31c488df01cf7f1ceedf8f6 SHA512 a39fc8fb5db379e91fabf10cf81b5087ead7fd7eb833620803acfbc3bd3eec32a81ad193030e8521013bcd55df59a0dee49320313493eac79aa32203a0742e28
+DIST vkd3d-proton-2.14.1.tar.gz 2271935 BLAKE2B c136ba61511bcf8c3202bfd3ab63c663739c2bb6085f04c43227f270e2314e66ba0eb1dcb0e44e0a7aa9d04b24397a7e5b3684530ffe7165997aaaa014d5d4e1 SHA512 7c401a5b100d85b5f674488ff2591034b974eae2ed02e878a21959e23a7682d090e377d5caa8d5508ceeb35f5750fedea36d2fdb3cf0997d5bc171410171ff82
 DIST vkd3d-proton-2.14.tar.gz 2270290 BLAKE2B e79316d80b455912e712a4f97f724c0471201a27f12d7016fb24d22860d3b9ccf5add012b8e02e220cb2a206fcdb0710ad5f0b742f3c5ddc88a017886ae9ec80 SHA512 bce96de2ce4c9b66365fb4056415ec93dae5bd4419a1dd1a45fe7b1bc5ff610c04af72b74e126cec12e11662d10fb3e7c4476ba73384b28f4fde40c577814dd7
 DIST vkd3d-proton-2.6.tar.gz 1271948 BLAKE2B 02d2574a66614613748fe3471a6fd5aac2650fdae15a17b17ea2ed028fa53a0579b866e7240036a26108afc343395826474bb99e015b9299c2abec811bb872ab SHA512 6f27d213652e2380a9ba4534ac9ffe4b752b4608fbc2e8acd273fa151ab19ad0b132e3436384d2b8591cd1a59f0b69d342c893dc3a64be85188b5e3274bcf3f1
 DIST vkd3d-proton-dxil-spirv-b537bbb91b.tar.gz 631130 BLAKE2B 99f40c5efde87d0af86542b427e5b0429be68ca69ba0c2b6d10a821811756d8dadff4449f268ae404f8ace09a91b3e8aaa135e534a77c0239e58c1a970a044cc SHA512 3c20090b7a1b53c30fd4967622fc7384e1bcc504c30d8075068b87dad1bd2c6f4a12459bf42e61bf76b9dd454ec17a9d529f74ab0d5583627e966d94bb341dc3
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.14.1.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.14.1.ebuild
new file mode 100644
index 000000000000..124415b08e86
--- /dev/null
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.14.1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit flag-o-matic meson-multilib toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/HansKristian-Work/vkd3d-proton.git"
+	EGIT_SUBMODULES=(
+		# uses hacks / recent features and easily breaks, keep bundled headers
+		# (also cross-compiled and -I/usr/include is troublesome)
+		khronos/{SPIRV,Vulkan}-Headers
+		subprojects/dxil-spirv
+		subprojects/dxil-spirv/third_party/spirv-headers # skip cross/tools
+	)
+else
+	HASH_VKD3D=0d66699b1b1e250ef19d793f2649d9288b0808ff # match tag on bumps
+	HASH_DXIL=33cd5b2eee8a27da50ad7ed2762e56cca3a7b2c9
+	HASH_SPIRV=8b246ff75c6615ba4532fe4fde20f1be090c3764
+	HASH_SPIRV_DXIL=ec59c77a3bb5c747a369931ef101ac7c14823f2f
+	HASH_VULKAN=29f979ee5aa58b7b005f805ea8df7a855c39ff37
+	SRC_URI="
+		https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
+		https://github.com/HansKristian-Work/dxil-spirv/archive/${HASH_DXIL}.tar.gz
+			-> dxil-spirv-${HASH_DXIL}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
+			-> spirv-headers-${HASH_SPIRV}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV_DXIL}.tar.gz
+			-> spirv-headers-${HASH_SPIRV_DXIL}.tar.gz
+		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+			-> vulkan-headers-${HASH_VULKAN}.tar.gz
+	"
+	KEYWORDS="-* amd64 x86"
+fi
+
+DESCRIPTION="Fork of VKD3D, development branches for Proton's Direct3D 12 implementation"
+HOMEPAGE="https://github.com/HansKristian-Work/vkd3d-proton/"
+
+LICENSE="LGPL-2.1+ Apache-2.0 MIT"
+SLOT="0"
+IUSE="+abi_x86_32 crossdev-mingw debug extras +strip"
+
+BDEPEND="
+	dev-util/glslang
+	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6-wow64-setup.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local tool=-w64-mingw32-g++
+		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
+			if ! type -P ${tool} >/dev/null; then
+				eerror "With USE=crossdev-mingw, it is necessary to setup the mingw toolchain."
+				eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw"
+				use abi_x86_32 && use abi_x86_64 &&
+					eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains."
+				die "USE=crossdev-mingw is enabled, but ${tool} was not found"
+			elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then
+				eerror "${PN} requires GCC to be built with --enable-threads=posix"
+				eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows"
+				die "USE=crossdev-mingw is enabled, but ${tool} does not use POSIX threads"
+			fi
+		done
+		tool=-w64-mingw32-widl
+		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
+			if ! type -P widl >/dev/null && ! type -P ${tool} >/dev/null; then
+				eerror "With USE=crossdev-mingw, you need to provide the widl compiler by either"
+				eerror "building crossdev mingw64-runtime with USE=tools or installing wine."
+				die "USE=crossdev-mingw is set but neither widl nor ${tool} were found"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]]; then
+		rmdir khronos/{SPIRV,Vulkan}-Headers subprojects/dxil-spirv || die
+		mv ../dxil-spirv-${HASH_DXIL} subprojects/dxil-spirv || die
+		mv ../SPIRV-Headers-${HASH_SPIRV} khronos/SPIRV-Headers || die
+		mv ../Vulkan-Headers-${HASH_VULKAN} khronos/Vulkan-Headers || die
+
+		rmdir subprojects/dxil-spirv/third_party/spirv-headers || die
+		# dxil and vkd3d's spirv headers sometime mismatch and are incompatible
+		if [[ ${HASH_SPIRV} == "${HASH_SPIRV_DXIL}" ]]; then
+			ln -s ../../../khronos/SPIRV-Headers \
+				subprojects/dxil-spirv/third_party/spirv-headers || die
+		else
+			mv ../SPIRV-Headers-${HASH_SPIRV_DXIL} \
+				subprojects/dxil-spirv/third_party/spirv-headers || die
+		fi
+	fi
+
+	default
+
+	sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_vkd3d_proton.sh || die
+
+	if [[ ${PV} != 9999 ]]; then
+		# without .git, meson sets vkd3d_build as 0x${PV} leading to failure
+		sed -i "s/@VCS_TAG@/${HASH_VKD3D::15}/" vkd3d_build.h.in || die
+		sed -i "s/@VCS_TAG@/${HASH_VKD3D::7}/" vkd3d_version.h.in || die
+	fi
+}
+
+src_configure() {
+	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+	# random segfaults been reported with LTO in some games, filter as
+	# a safety (note that optimizing this further won't really help
+	# performance, GPU does the actual work)
+	filter-lto
+
+	# -mavx with mingw-gcc has a history of obscure issues and
+	# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
+	# crashes with -march=skylake >=wine-8.10, similar issues with
+	# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
+	append-flags -mno-avx
+
+	if [[ ${CHOST} != *-mingw* ]]; then
+		if [[ ! -v MINGW_BYPASS ]]; then
+			unset AR CC CXX RC STRIP WIDL
+			filter-flags '-fuse-ld=*'
+			filter-flags '-mfunction-return=thunk*' #878849
+
+			# some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then
+			# strip-unsupported-flags miss these during compile-only tests
+			# (primarily done for 23.0 profiles' -z, not full coverage)
+			filter-flags '-Wl,-z,*' #928038
+		fi
+
+		CHOST_amd64=x86_64-w64-mingw32
+		CHOST_x86=i686-w64-mingw32
+		CHOST=$(usex x86 ${CHOST_x86} ${CHOST_amd64})
+
+		strip-unsupported-flags
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev,
+	# unset again so meson eclass will set ${CHOST}-gcc + others
+	use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX STRIP WIDL
+
+	# prefer ${CHOST}'s widl (mingw) over wine's as used by upstream if
+	# possible, but eclasses don't handle that so setup machine files
+	local widl=$(tc-getPROG WIDL widl)
+	use amd64 && [[ ${widl} == widl && ${ABI} == x86 ]] && widl="widl','-m32"
+	printf "[binaries]\nwidl = ['${widl}']\n" > "${T}"/widl.${ABI}.ini || die
+
+	local emesonargs=(
+		--prefix="${EPREFIX}"/usr/lib/${PN}
+		--{bin,lib}dir=x${ABI: -2}
+		--{cross,native}-file="${T}"/widl.${ABI}.ini
+		$(meson_use {,enable_}extras)
+		$(meson_use debug enable_trace)
+		$(usev strip --strip) # portage won't strip .dll, so allow it here
+		-Denable_tests=false # needs wine/vulkan and is intended for manual use
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	dobin setup_vkd3d_proton.sh
+	einstalldocs
+
+	find "${ED}" -type f -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "To enable ${PN} on a wine prefix, you can run the following command:"
+		elog
+		elog "	WINEPREFIX=/path/to/prefix setup_vkd3d_proton.sh install --symlink"
+		elog
+		elog "Should also ensure that >=app-emulation/dxvk-2.1's dxgi.dll is available"
+		elog "on it, not meant to function independently even if only using d3d12."
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
+	elif [[ ${REPLACING_VERSIONS##* } ]]; then
+		if ver_test ${REPLACING_VERSIONS##* } -lt 2.7; then
+			elog
+			elog ">=${PN}-2.7 requires drivers and Wine to support vulkan-1.3, meaning:"
+			elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)"
+		fi
+
+		if ver_test ${REPLACING_VERSIONS##* } -lt 2.9; then
+			elog
+			elog ">=${PN}-2.9 has a new file to install (d3d12core.dll), old Wine prefixes that"
+			elog "relied on '--symlink' may need updates by using the setup_vkd3d_proton.sh."
+			elog
+			elog "Furthermore, it may not function properly if >=app-emulation/dxvk-2.1's"
+			elog "dxgi.dll is not available on that prefix (even if only using d3d12)."
+		fi
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.19.1.ebuild b/app-emulation/xen-tools/xen-tools-4.19.1.ebuild
index 34dff1b52cd3..a7d7cfdd27de 100644
--- a/app-emulation/xen-tools/xen-tools-4.19.1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.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
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://xenbits.xen.org/git-http/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 x86"
 
 	SEABIOS_VER="1.16.0"
 	EDK2_COMMIT="b16284e2a0011489f6e16dfcc6af7623c3cbaf0b"
diff --git a/app-eselect/eselect-emacs/eselect-emacs-1.19.ebuild b/app-eselect/eselect-emacs/eselect-emacs-1.19.ebuild
index 4b920f8c3c27..e993f563b04e 100644
--- a/app-eselect/eselect-emacs/eselect-emacs-1.19.ebuild
+++ b/app-eselect/eselect-emacs/eselect-emacs-1.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND=">=app-admin/eselect-1.2.6
 	~app-eselect/eselect-ctags-${PV}"
diff --git a/app-forensics/aflplusplus/aflplusplus-4.30c.ebuild b/app-forensics/aflplusplus/aflplusplus-4.30c.ebuild
index f80e61caf6cb..4dfdf523d8d5 100644
--- a/app-forensics/aflplusplus/aflplusplus-4.30c.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-4.30c.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
@@ -16,7 +16,7 @@ S="${WORKDIR}"/AFLplusplus-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-forensics/volatility3/volatility3-2.8.0.ebuild b/app-forensics/volatility3/volatility3-2.8.0.ebuild
index 3a97cf0e3549..f0db988c8286 100644
--- a/app-forensics/volatility3/volatility3-2.8.0.ebuild
+++ b/app-forensics/volatility3/volatility3-2.8.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
@@ -23,7 +23,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="crypt disasm jsonschema leechcore snappy test yara"
 
 # We need to select *all* subslots of app-arch/snappy which select
diff --git a/app-i18n/ibus-rime/Manifest b/app-i18n/ibus-rime/Manifest
index 16cefd8c8726..a4ca0cc2cb7c 100644
--- a/app-i18n/ibus-rime/Manifest
+++ b/app-i18n/ibus-rime/Manifest
@@ -1 +1,2 @@
 DIST ibus-rime-1.5.0.tar.gz 35170 BLAKE2B 30cba341c3ae29438bf94fd93f030d6aa4fde3988d11b1b5e92aa4190ceac7e0776e07248cb1930819f455b378e01e3305fbf687efc997e675f23ff3120037ad SHA512 59b05efe7d5c7dd6dd88a213f05967b19f4946ad0685e29c6c87fbc47ffb3059cc16c88403cfbb945bcbf8637b20d34dcfd91d442c23bb6a9a18d60febbaf27b
+DIST ibus-rime-1.5.1.tar.gz 35122 BLAKE2B b2f0b7e7961c1aa95595cbd6277aa66089273bed7730e347ea63c37ef35359b4a3cb8f951922bf2c4fe0bef210c4fdad0b91f53496a575c2850e0c5ebc7ec7bc SHA512 378f5cca07c4b732ab86e211b7a0780fe6f610541e0bd698a75720d4dc9d2a37899a905dee677dac87918229c7b963206bb7be12e28e0aafc2de2a36fd7d16ad
diff --git a/app-i18n/ibus-rime/ibus-rime-1.5.1.ebuild b/app-i18n/ibus-rime/ibus-rime-1.5.1.ebuild
new file mode 100644
index 000000000000..f7be329d5e97
--- /dev/null
+++ b/app-i18n/ibus-rime/ibus-rime-1.5.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Chinese Rime Input Method Engine for IBus"
+HOMEPAGE="https://rime.im/ https://github.com/rime/ibus-rime"
+SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+
+RDEPEND="
+	app-i18n/ibus
+	app-i18n/librime
+	app-i18n/rime-data
+	x11-libs/libnotify"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-build/cmake
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e "/^libexecdir/s:/lib:/libexec:" \
+		-e "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" \
+		-e "s/ make/ \$(MAKE)/" Makefile || die
+
+	default
+}
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index a5a6f7c8f700..5a54e716e4a8 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,2 +1,4 @@
 DIST ibus-typing-booster-2.26.11.tar.gz 13334659 BLAKE2B 833bd3f86439369495105ab0013ee9e86b3505dce25b7effa763885137c1c14ee18c43d7d7cf6311c61729b19afe3943e9c64955b41f382a2cdcab00a2f1138b SHA512 1cd6f15831e7258bbb7cb02e59f2cc92d1e17cc9359a17a4b98a965c7bcc91d29ff562fc54007bbb67a331ad40123723852c65d16dc5944bfa6c480ac560641f
 DIST ibus-typing-booster-2.27.1.tar.gz 13410885 BLAKE2B d92a51969dc8a8491f02fa8044205b90105102f81e94f26fd346dbf6ed2c80a9d5f43319a50510077a5b1153596e970be76e11ca7f381fdece092d6be427338b SHA512 2c729d662084c17ccba998573d64e2fb762b65b9e7786c4803979524cf6c76defac3b61d4698c8a9d1fad459b563f7bfe255a38fc98d264cd5dfe23e1ac73b99
+DIST ibus-typing-booster-2.27.8.tar.gz 13434975 BLAKE2B e2f55cae02938b80289f529616ce9ba4a7a7bbb3d460fe6fa50e02bc1839bf6d4c8d45be5e543230bf9634a0636e3cd95472ab6389875dd3844ae1c43defc6b6 SHA512 0d74c68152c188bd6edc268f46143a46d00b62c8e406672a30aa9ce18152e76ebb311fe9e75cf21f7c39e529a9c8625424d13629406d4ddd121e76cc1a178db7
+DIST ibus-typing-booster-2.27.9.tar.gz 13444868 BLAKE2B 4d3fd804756be93f674239102d0447c855ac439526336905ef7685fdcd216b3f3db90be06cd151548145065996e6fcd87da5deb8f50db304c68987530b50dcfd SHA512 b592d2727602e40ca07f5090b5735d1e93b385f9d4e0c73a314b05509cdfde9f6a9b2332bb76c5561ec7dff656dee717df68851fb94626677ac22c96bfd5faac
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.27.8.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.27.8.ebuild
new file mode 100644
index 000000000000..9cc8a6c713e5
--- /dev/null
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.27.8.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="Completion input method for IBus"
+HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
+SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/m17n-lib
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pyenchant[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	')"
+RDEPEND="${DEPEND}
+	>=dev-db/m17n-db-1.7"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.27.9.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.27.9.ebuild
new file mode 100644
index 000000000000..9cc8a6c713e5
--- /dev/null
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.27.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="Completion input method for IBus"
+HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
+SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/m17n-lib
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pyenchant[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	')"
+RDEPEND="${DEPEND}
+	>=dev-db/m17n-db-1.7"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-i18n/opencc/opencc-1.1.7-r1.ebuild b/app-i18n/opencc/opencc-1.1.7-r1.ebuild
index afce6038391d..eabc31068ad5 100644
--- a/app-i18n/opencc/opencc-1.1.7-r1.ebuild
+++ b/app-i18n/opencc/opencc-1.1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2024 Gentoo Authors
+# Copyright 2010-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ S="${WORKDIR}/OpenCC-ver.${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0/1.1"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
index 258fe4b3e776..97f6b96c39bd 100644
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@@ -1,2 +1 @@
-DIST poedit-2.3.1.tar.gz 2891956 BLAKE2B 11fb8c19f439edc2c9df08529e815d47f5bdfe3cac486bd07bfaef90932edf05ce099b61f058d8d08ba1a3a41f35ed59bf2901de1d1d80ecc6178536cdcff908 SHA512 73439ae96d3e04d8f6fc7e49f72cd259606e669f01490bd9a59f3fa7b33a6e11fb3af70a3a6e155b1edcee49ac9222b16e05e937088748a9c0f3ed9a6c97a208
 DIST poedit-3.5.2.tar.gz 3173111 BLAKE2B 8e7ae9fc06af173107fa46fa4f07cab3637d75cd60bc8bc0d48df23cdc97434e05a55b2eb4e28295de4e0072ba43bb2078e51768294510946c0b400a028ccd5d SHA512 5728b23ae64751754f8d23e24ba12311bf55f6a0fee3ef44d74b78ed74ed5397e198353388dadb3ce217996ee5b09d9a8e963614ce78a62ce108d4fa22c1cdf1
diff --git a/app-i18n/poedit/poedit-2.3.1.ebuild b/app-i18n/poedit/poedit-2.3.1.ebuild
deleted file mode 100644
index f2e75b498ac5..000000000000
--- a/app-i18n/poedit/poedit-2.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="af an ar az be be@latin bg bs ca ckb co cs da de el en_GB es et eu fa fi fr ga gl he hr hu hy id is it ja ka kab kk ko lt lv ms nb nl oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv tg th tr uk uz vi zh_CN zh_TW"
-WX_GTK_VER=3.0-gtk3
-
-inherit gnome2-utils plocale wxwidgets xdg
-
-DESCRIPTION="GUI gettext translations editor"
-HOMEPAGE="https://poedit.net"
-SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
-
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	app-text/gtkspell:3
-	x11-libs/gtk+:3
-	>=dev-cpp/lucene++-3.0.5
-	>=dev-libs/pugixml-1.9
-	dev-libs/boost:=[nls]
-	dev-libs/icu:=
-	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	my_rm_loc() {
-		sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die
-		rm "locales/${1}.mo" || die
-	}
-
-	plocale_find_changes 'locales' '' '.mo'
-	plocale_for_each_disabled_locale my_rm_loc
-
-	setup-wxwidgets
-	xdg_src_prepare
-}
-
-src_configure() {
-	# CLD2 and C++ Rest are not available in Gentoo, bug 674916
-	local myeconfargs=(
-		--without-cld2
-		--without-cpprest
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest
index 1b6998d1aadb..c7bda550dcec 100644
--- a/app-i18n/uchardet/Manifest
+++ b/app-i18n/uchardet/Manifest
@@ -1 +1,2 @@
 DIST uchardet-0.0.7.tar.xz 215492 BLAKE2B 1f8b171676bc6edf1f3493a4a370e32b7b956104ea0b12a03837d817c386d59aa512c3a107426aedb087987cf3a7b99c4b2df4a667ed685ff9959f6bc6b4506c SHA512 ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f
+DIST uchardet-0.0.8.tar.xz 222648 BLAKE2B 8da78cba3c73afab0e94cac53b2b5c7832d11d58641ff221174d051a1610f8368c8bb536f2b0729c30ed0d13d7e2319d524597d1ca49fd1c6cefb3176aa76b9a SHA512 4a5dcc9ff021352f3b252e103ff1475cec62c974294b264ee9243f024633c3ae44be8c7733608624066113e635f8b156ecb08c8ff87c736d04b07641eb166382
diff --git a/app-i18n/uchardet/metadata.xml b/app-i18n/uchardet/metadata.xml
index 44ce99064069..ec3a2f313a85 100644
--- a/app-i18n/uchardet/metadata.xml
+++ b/app-i18n/uchardet/metadata.xml
@@ -1,17 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person" proxied="yes">
-        <email>coppens.matthias.abc@gmail.com</email>
-        <name>Matthias Coppens</name>
-    </maintainer>
-    <maintainer type="project" proxied="proxy">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
-    <upstream>
-        <bugs-to>https://gitlab.freedesktop.org/uchardet/uchardet/-/issues</bugs-to>
-        <doc>https://www.freedesktop.org/wiki/Software/uchardet/#usage</doc>
-        <remote-id type="gitlab">uchardet/uchardet</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="freedesktop-gitlab">uchardet/uchardet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/uchardet/uchardet-0.0.8.ebuild b/app-i18n/uchardet/uchardet-0.0.8.ebuild
new file mode 100644
index 000000000000..34b08f0e6e33
--- /dev/null
+++ b/app-i18n/uchardet/uchardet-0.0.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Encoding detector library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
+SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
+
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="cpu_flags_x86_sse2"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC=no
+		-DCHECK_SSE2=$(usex cpu_flags_x86_sse2)
+		-DTARGET_ARCHITECTURE="${ARCH}"
+	)
+
+	cmake_src_configure
+}
diff --git a/app-i18n/uchardet/uchardet-9999.ebuild b/app-i18n/uchardet/uchardet-9999.ebuild
deleted file mode 100644
index 031c6d829482..000000000000
--- a/app-i18n/uchardet/uchardet-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-if [ "${PV}" = 9999 ]
-then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/uchardet/uchardet.git"
-else
-	SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
-fi
-
-DESCRIPTION="An encoding detector library"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
-
-LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
-SLOT="0"
-KEYWORDS=""
-IUSE="cpu_flags_x86_sse2 static-libs test"
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	cmake_src_prepare
-	use test || cmake_comment_add_subdirectory test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DTARGET_ARCHITECTURE="${ARCH}"
-		-DBUILD_STATIC=$(usex static-libs)
-		-DCHECK_SSE2=$(usex cpu_flags_x86_sse2)
-	)
-	cmake_src_configure
-}
diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest
index 0f94de21614b..761d9c0b919f 100644
--- a/app-i18n/unicode-cldr/Manifest
+++ b/app-i18n/unicode-cldr/Manifest
@@ -1,3 +1,2 @@
-DIST unicode-cldr-common-45.0.zip 31812363 BLAKE2B 031d08f2db4a6c75585488faf43196a912e348edc9ff582e9c507c8f1c8ae2cf7c86aaa8265a8fa60540c2b3f4844d0aa01dad516344195bd4d40926d65a48fc SHA512 638123882bd29911fc9492ec152926572fec48eb6c1f5dd706aee3e59cad8be4963a334bb7a09a645dbedc3356f60ef7ac2ef7ab4ccf2c8926b547782175603c
 DIST unicode-cldr-common-46.0.zip 34181233 BLAKE2B c54942576dc779ef07d62b791f67a9ca71f3ae4f6833cd3ce44b54ad94ec4a7e3b114f0d611fddf1f7238582180a1e701886f047c76d28070d1f2cfa74020d9d SHA512 316d644b79a4976d4da57d59ca57c689b339908fe61bb49110bfe1a9269c94144cb27322a0ea080398e6dc4c54a16752fd1ca837e14c054b3a6806b1ef9d3ec3
 DIST unicode-cldr-common-46.1.zip 34308024 BLAKE2B 5010296270c95f1226fecd0cfecfebdc5f5dd1a940d2e948e0fcfa3bdfdbd3c0e5ecd7c38da93017b53e20c69f5a2c0dc016d9e67a5aa8cbcfcd441053462cc5 SHA512 6f5bece848d8187da35cc4c4022bea6a673e40a6032864b09ef24744f35bbf5e89e32e9852bbfd91d7466332db87c8f4f514ff70221729275701b7d95bac2925
diff --git a/app-i18n/unicode-cldr/unicode-cldr-45.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-45.0.ebuild
deleted file mode 100644
index eb57387d0c98..000000000000
--- a/app-i18n/unicode-cldr/unicode-cldr-45.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="Unicode Common Locale Data Repository"
-HOMEPAGE="https://cldr.unicode.org/"
-SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip"
-
-LICENSE="unicode"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-RDEPEND=""
-BDEPEND="app-arch/unzip"
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/${PN/-//}
-	doins -r common
-}
diff --git a/app-i18n/unicode-cldr/unicode-cldr-46.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-46.0.ebuild
index cbd693bb8436..14bdea7182fe 100644
--- a/app-i18n/unicode-cldr/unicode-cldr-46.0.ebuild
+++ b/app-i18n/unicode-cldr/unicode-cldr-46.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"
@@ -9,7 +9,7 @@ SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-metrics/bind_exporter/Manifest b/app-metrics/bind_exporter/Manifest
index 262a8c84766b..59eb9adf2753 100644
--- a/app-metrics/bind_exporter/Manifest
+++ b/app-metrics/bind_exporter/Manifest
@@ -1,2 +1,4 @@
 DIST bind_exporter-0.6.1-vendor.tar.xz 1300068 BLAKE2B 058f4f61ff9c403a5672390dd3944dec9a6b4b1dcf8ac7bcb6943494d43c116236e23f4b0437d5b2e91cb0d936377ba896740594d90b50ce99a61963713ab70c SHA512 9fd880655ac9657d49c0d250b22e46c53a63c0a2d4097763ca8856da36f75527d515a4e4cde7dd68c2c5cbf4ea784c07d9bd5e38a01eeb2d308a585c31d5c19b
 DIST bind_exporter-0.6.1.tar.gz 48904 BLAKE2B ad2def162e0fac5e857328bb142bc20655d0d1ea4a9d90a3bd8d305a3d86f9247671ca92f90d5ccdcb1a8bd147ed56858a9782feeac019b87666b4b18b7219c1 SHA512 d710b7228587e12a101a1d626ec5e0290b0740074f3976eee02463165030b361d3b6df556ab949d632488582ef6d4a3197270afc197d6d756a99c16e55c5448c
+DIST bind_exporter-0.8.0-deps.tar.xz 40418500 BLAKE2B 68150ebd654de67b00ecf75acb846dca37a647149b1a53c9fc8d1b26ea6d0807d1690d721cb14c9f4411cc592454465664e7754e822934a302e08c81d7c57a4c SHA512 a6540110d1bba9c08caa4c0f9682a22e29a0058a38adfd0984f97cb214ff245f801cbc01fd962029493329679dbb955e1f1f498b687c8a750080434fa7ab7686
+DIST bind_exporter-0.8.0.tar.gz 43098 BLAKE2B d6a1ecf0cd42509aac8f8755c55f9a405d549a4de60ae45ebdf9933b0be73986e24fbffd3b255445c4121ca762e672e76d0629910c6e116e245136ba16e436b5 SHA512 2b54ceed99ad386d699961a821bd0f1061f487536029cfa5dd1192c9cb6fc485bbf4a82548c8dcd70c602e7e38e905cbe24968649923eede77be7dc7aaf05cc6
diff --git a/app-metrics/bind_exporter/bind_exporter-0.8.0.ebuild b/app-metrics/bind_exporter/bind_exporter-0.8.0.ebuild
new file mode 100644
index 000000000000..6786b162e378
--- /dev/null
+++ b/app-metrics/bind_exporter/bind_exporter-0.8.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo go-module systemd
+
+GIT_COMMIT=5cc1b62b9c866184193007a0f7ec3b2eb31460bf
+
+DESCRIPTION="Prometheus exporter for BIND"
+HOMEPAGE="https://github.com/prometheus-community/bind_exporter"
+SRC_URI="
+	https://github.com/prometheus-community/bind_exporter/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/app-metrics/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	acct-group/bind_exporter
+	acct-user/bind_exporter
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-util/promu"
+
+src_prepare() {
+	default
+	sed -i .promu.yml -e "s/{{.Revision}}/${GIT_COMMIT}/" || die
+}
+
+src_compile() {
+	mkdir -p bin || die
+	edo promu build -v --prefix bin
+}
+
+src_test() {
+	emake test-flags= test
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc {README,CHANGELOG}.md
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
+
+pkg_postinst() {
+	elog "Make sure BIND was built with libxml2 support. You can check with the"
+	elog "following command: named -V | grep libxml2."
+	elog "Configure BIND to open a statistics channel. It's recommended to run"
+	elog "the bind_exporter next to BIND, so it's only necessary to open a port"
+	elog "locally."
+	elog ""
+	elog "statistics-channels {"
+	elog "inet 127.0.0.1 port 8053 allow { 127.0.0.1; };"
+	elog "};"
+}
diff --git a/app-metrics/chrony_exporter/chrony_exporter-0.11.0.ebuild b/app-metrics/chrony_exporter/chrony_exporter-0.11.0.ebuild
index d264fa860fc5..586091d21639 100644
--- a/app-metrics/chrony_exporter/chrony_exporter-0.11.0.ebuild
+++ b/app-metrics/chrony_exporter/chrony_exporter-0.11.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/SuperQ/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="acct-group/chrony_exporter
 		acct-user/chrony_exporter"
diff --git a/app-metrics/mongodb_exporter/Manifest b/app-metrics/mongodb_exporter/Manifest
index 81cf71b6f0e8..110b2c3ed195 100644
--- a/app-metrics/mongodb_exporter/Manifest
+++ b/app-metrics/mongodb_exporter/Manifest
@@ -1,3 +1,4 @@
-DIST mongodb_exporter-0.11.1.tar.gz 2640277 BLAKE2B 8ae0418466462d4dfebe97d48b47d0a163435f1776bceb6d35ab50d98cefa0bf737f57fc74aadebf16c285e2dd63fe2e4719571db7c5a9f942e740dab7509d91 SHA512 81a9c5877bba6e85fcdcc9e3781bbec82b255710e8292ea377ea9c9234526b7ad521350f8bd36ae7773f76f40b650cd724d552020e17feb61210ed6197be5172
 DIST mongodb_exporter-0.39.0-deps.tar.xz 100818596 BLAKE2B 65be5f2ac1d24838f88b3c1338d5d5bba3a02f76c8edf46605104f834950961d635e736b7ab7afcaed66834853a7ff7465b36d34afa863d1caeb32c428c24ef2 SHA512 32c04138a92d63a22daada9fbe3fb3433cbc5192dbd22854275e298b7c3e37310116249e7ba86c78055a97c5c0a903a5d15cb2ae2c01cf2cc752f050daebb920
 DIST mongodb_exporter-0.39.0.tar.gz 166721 BLAKE2B 39d2dfab342119fd14fb0f90097062770e86502c8ffffb73789e356e32248efacc30c1c0cf1c0216be25fbb021e82f80435f902f1f0beba698844e14ada206e0 SHA512 103f1d8e42ddd04f8be7def199b16ad017bce79139b16bde50c1a0f6cc24c025ec26b644d9db0134ca37233d3e87b3921177445c1d863a040d817fcd4c851e75
+DIST mongodb_exporter-0.43.1-deps.tar.xz 104860652 BLAKE2B 3d40052ba11dea73aa67a2e72b303d4e27baec13f7429627684c44de3504909efdf2959ef1a658331cb346faaa5212e474c7c0d38fced0a60423843c66c8e7fc SHA512 c5443ebe1ecde6a571480acd2130f20bdcf23c6495ef9c304db545666bd1e18f41b5c377a59300ebeb2a06d38575046e506536856a35041c8447e37257da2fff
+DIST mongodb_exporter-0.43.1.tar.gz 161862 BLAKE2B 337edcf34e6c44d5ffb9b9d2b6d1da7e72a12d1430561d070bfd7569816d34b2e918faa3fa5e32aea6e480208a27f200438c55a0fb6d80be3c9564ce8feccc79 SHA512 3a9437a61d588af6d971aa954bced247cbf59c17dcdaed833b03f95904bf583c56c8210f535b07ffa1fc46583f7d1e92465e0d7623601b463667a01ec8bcfca3
diff --git a/app-metrics/mongodb_exporter/mongodb_exporter-0.11.1.ebuild b/app-metrics/mongodb_exporter/mongodb_exporter-0.11.1.ebuild
deleted file mode 100644
index 30b674765a5d..000000000000
--- a/app-metrics/mongodb_exporter/mongodb_exporter-0.11.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-COMMIT=f5e8ebea31d6fa128ae3a2fb1b747fdf4b782b2b
-BRANCH=0.11.0
-
-DESCRIPTION="Prometheus exporter for MongoDB"
-HOMEPAGE="https://github.com/percona/mongodb_exporter"
-SRC_URI="https://github.com/percona/mongodb_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 AGPL-3 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON_DEPEND="acct-group/mongodb_exporter
-	acct-user/mongodb_exporter"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
-	GOFLAGS="${GOFLAGS} -mod=vendor" emake \
-		TRAVIS_TAG="${PV}" \
-		APP_REVISION=${COMMIT} \
-		TRAVIS_BRANCH=${BRANCH} \
-		build
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc {README,CHANGELOG}.md
-	keepdir /var/log/mongodb_exporter
-	fowners ${PN}:${PN} /var/log/mongodb_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/mongodb_exporter/mongodb_exporter-0.43.1.ebuild b/app-metrics/mongodb_exporter/mongodb_exporter-0.43.1.ebuild
new file mode 100644
index 000000000000..99a59f0222cf
--- /dev/null
+++ b/app-metrics/mongodb_exporter/mongodb_exporter-0.43.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+# update these on every bump
+BRANCH='tags/v0.43.1^0'
+COMMIT=2b2cccca21104c2a00cb53bd0d785b3d656fe803
+
+DESCRIPTION="Prometheus exporter for MongoDB"
+HOMEPAGE="https://github.com/percona/mongodb_exporter"
+SRC_URI="https://github.com/percona/mongodb_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/app-metrics/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 AGPL-3 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# tests require docker compose
+RESTRICT="test"
+
+DEPEND="
+	acct-group/mongodb_exporter
+	acct-user/mongodb_exporter
+"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake \
+		COMPONENT_BRANCH=${BRANCH} \
+		COMPONENT_VERSION=${PV} \
+		PMM_RELEASE_FULLCOMMIT=${COMMIT} \
+		build
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc CHANGELOG {CONTRIBUTING,README,REFERENCE}.md
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	systemd_dounit .scripts/systemd/${PN}.service
+
+	keepdir /var/log/mongodb_exporter
+	fowners ${PN}:${PN} /var/log/mongodb_exporter
+}
diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index e20e2d50da7a..316a68b6d905 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -1,7 +1,4 @@
-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
diff --git a/app-metrics/node_exporter/files/01-default-settings-1.7.0.patch b/app-metrics/node_exporter/files/01-default-settings-1.7.0.patch
deleted file mode 100644
index 114c6d23423e..000000000000
--- a/app-metrics/node_exporter/files/01-default-settings-1.7.0.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-Grabbed from https://salsa.debian.org/go-team/packages/prometheus-node-exporter/-/tree/debian/sid/debian/patches
-Only thing changed is textFileDirectory default path adapted for Gentoo
-##############
-Description: Set defaults that make sense for Debian systems.
- We remove the deprecated options completely because they were introduced in
- 1.0.0 and were never part of a stable release, and are causing issues with
- the default value setting as it then makes the code consider it a usage and
- errors out when the legacy option is used.
-Forwarded: not-needed
----
- collector/filesystem_linux.go |  2 +-
- collector/netdev_common.go    | 22 +---------------------
- collector/systemd_linux.go    | 23 ++---------------------
- collector/textfile.go         |  2 +-
- 4 files changed, 5 insertions(+), 44 deletions(-)
-
---- a/collector/filesystem_linux.go
-+++ b/collector/filesystem_linux.go
-@@ -33,7 +33,7 @@ import (
- )
- 
- const (
--	defMountPointsExcluded = "^/(dev|proc|run/credentials/.+|sys|var/lib/docker/.+|var/lib/containers/storage/.+)($|/)"
-+	defMountPointsExcluded = "^/(dev|proc|run|sys|mnt|media|var/lib/docker/.+|var/lib/containers/storage/.+)($|/)"
- 	defFSTypesExcluded     = "^(autofs|binfmt_misc|bpf|cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$"
- )
- 
---- a/collector/netdev_common.go
-+++ b/collector/netdev_common.go
-@@ -32,9 +32,7 @@ import (
- 
- var (
- 	netdevDeviceInclude    = kingpin.Flag("collector.netdev.device-include", "Regexp of net devices to include (mutually exclusive to device-exclude).").String()
--	oldNetdevDeviceInclude = kingpin.Flag("collector.netdev.device-whitelist", "DEPRECATED: Use collector.netdev.device-include").Hidden().String()
--	netdevDeviceExclude    = kingpin.Flag("collector.netdev.device-exclude", "Regexp of net devices to exclude (mutually exclusive to device-include).").String()
--	oldNetdevDeviceExclude = kingpin.Flag("collector.netdev.device-blacklist", "DEPRECATED: Use collector.netdev.device-exclude").Hidden().String()
-+	netdevDeviceExclude    = kingpin.Flag("collector.netdev.device-exclude", "Regexp of net devices to exclude (mutually exclusive to device-include).").Default("^lo$").String()
- 	netdevAddressInfo      = kingpin.Flag("collector.netdev.address-info", "Collect address-info for every device").Bool()
- 	netdevDetailedMetrics  = kingpin.Flag("collector.netdev.enable-detailed-metrics", "Use (incompatible) metric names that provide more detailed stats on Linux").Bool()
- )
-@@ -55,24 +53,6 @@ func init() {
- 
- // NewNetDevCollector returns a new Collector exposing network device stats.
- func NewNetDevCollector(logger log.Logger) (Collector, error) {
--	if *oldNetdevDeviceInclude != "" {
--		if *netdevDeviceInclude == "" {
--			level.Warn(logger).Log("msg", "--collector.netdev.device-whitelist is DEPRECATED and will be removed in 2.0.0, use --collector.netdev.device-include")
--			*netdevDeviceInclude = *oldNetdevDeviceInclude
--		} else {
--			return nil, errors.New("--collector.netdev.device-whitelist and --collector.netdev.device-include are mutually exclusive")
--		}
--	}
--
--	if *oldNetdevDeviceExclude != "" {
--		if *netdevDeviceExclude == "" {
--			level.Warn(logger).Log("msg", "--collector.netdev.device-blacklist is DEPRECATED and will be removed in 2.0.0, use --collector.netdev.device-exclude")
--			*netdevDeviceExclude = *oldNetdevDeviceExclude
--		} else {
--			return nil, errors.New("--collector.netdev.device-blacklist and --collector.netdev.device-exclude are mutually exclusive")
--		}
--	}
--
- 	if *netdevDeviceExclude != "" && *netdevDeviceInclude != "" {
- 		return nil, errors.New("device-exclude & device-include are mutually exclusive")
- 	}
---- a/collector/systemd_linux.go
-+++ b/collector/systemd_linux.go
-@@ -18,7 +18,6 @@ package collector
- 
- import (
- 	"context"
--	"errors"
- 	"fmt"
- 	"math"
- 	"regexp"
-@@ -47,13 +46,11 @@ var (
- 		systemdUnitIncludeSet = true
- 		return nil
- 	}).String()
--	oldSystemdUnitInclude = kingpin.Flag("collector.systemd.unit-whitelist", "DEPRECATED: Use --collector.systemd.unit-include").Hidden().String()
- 	systemdUnitExcludeSet bool
--	systemdUnitExclude    = kingpin.Flag("collector.systemd.unit-exclude", "Regexp of systemd units to exclude. Units must both match include and not match exclude to be included.").Default(".+\\.(automount|device|mount|scope|slice)").PreAction(func(c *kingpin.ParseContext) error {
-+	systemdUnitExclude    = kingpin.Flag("collector.systemd.unit-exclude", "Regexp of systemd units to exclude. Units must both match include and not match exclude to be included.").Default(".+\\.(automount|device|mount|scope|slice|target)").PreAction(func(c *kingpin.ParseContext) error {
- 		systemdUnitExcludeSet = true
- 		return nil
- 	}).String()
--	oldSystemdUnitExclude  = kingpin.Flag("collector.systemd.unit-blacklist", "DEPRECATED: Use collector.systemd.unit-exclude").Hidden().String()
- 	systemdPrivate         = kingpin.Flag("collector.systemd.private", "Establish a private, direct connection to systemd without dbus (Strongly discouraged since it requires root. For testing purposes only).").Hidden().Bool()
- 	enableTaskMetrics      = kingpin.Flag("collector.systemd.enable-task-metrics", "Enables service unit tasks metrics unit_tasks_current and unit_tasks_max").Bool()
- 	enableRestartsMetrics  = kingpin.Flag("collector.systemd.enable-restarts-metrics", "Enables service unit metric service_restart_total").Bool()
-@@ -83,7 +80,7 @@ type systemdCollector struct {
- var unitStatesName = []string{"active", "activating", "deactivating", "inactive", "failed"}
- 
- func init() {
--	registerCollector("systemd", defaultDisabled, NewSystemdCollector)
-+	registerCollector("systemd", defaultEnabled, NewSystemdCollector)
- }
- 
- // NewSystemdCollector returns a new Collector exposing systemd statistics.
-@@ -133,22 +130,6 @@ func NewSystemdCollector(logger log.Logg
- 		prometheus.BuildFQName(namespace, subsystem, "version"),
- 		"Detected systemd version", []string{"version"}, nil)
- 
--	if *oldSystemdUnitExclude != "" {
--		if !systemdUnitExcludeSet {
--			level.Warn(logger).Log("msg", "--collector.systemd.unit-blacklist is DEPRECATED and will be removed in 2.0.0, use --collector.systemd.unit-exclude")
--			*systemdUnitExclude = *oldSystemdUnitExclude
--		} else {
--			return nil, errors.New("--collector.systemd.unit-blacklist and --collector.systemd.unit-exclude are mutually exclusive")
--		}
--	}
--	if *oldSystemdUnitInclude != "" {
--		if !systemdUnitIncludeSet {
--			level.Warn(logger).Log("msg", "--collector.systemd.unit-whitelist is DEPRECATED and will be removed in 2.0.0, use --collector.systemd.unit-include")
--			*systemdUnitInclude = *oldSystemdUnitInclude
--		} else {
--			return nil, errors.New("--collector.systemd.unit-whitelist and --collector.systemd.unit-include are mutually exclusive")
--		}
--	}
- 	level.Info(logger).Log("msg", "Parsed flag --collector.systemd.unit-include", "flag", *systemdUnitInclude)
- 	systemdUnitIncludePattern := regexp.MustCompile(fmt.Sprintf("^(?:%s)$", *systemdUnitInclude))
- 	level.Info(logger).Log("msg", "Parsed flag --collector.systemd.unit-exclude", "flag", *systemdUnitExclude)
---- a/collector/textfile.go
-+++ b/collector/textfile.go
-@@ -33,7 +33,7 @@ import (
- )
- 
- var (
--	textFileDirectory = kingpin.Flag("collector.textfile.directory", "Directory to read text files with metrics from.").Default("").String()
-+	textFileDirectory = kingpin.Flag("collector.textfile.directory", "Directory to read text files with metrics from.").Default("/var/lib/node_exporter").String()
- 	mtimeDesc         = prometheus.NewDesc(
- 		"node_textfile_mtime_seconds",
- 		"Unixtime mtime of textfiles successfully read.",
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.1.ebuild b/app-metrics/node_exporter/node_exporter-1.8.1.ebuild
index e3855837cbdc..7a377584ee5f 100644
--- a/app-metrics/node_exporter/node_exporter-1.8.1.ebuild
+++ b/app-metrics/node_exporter/node_exporter-1.8.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
@@ -16,7 +16,7 @@ else
 	https://github.com/prometheus/node_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/rahilarious/gentoo-distfiles/releases/download/${PN}-1.8.0/deps.tar.xz -> ${PN}-1.8.0-deps.tar.xz
 	"
-	KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~riscv ~x86"
 fi
 
 # main pkg
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-metrics/postgres_exporter/Manifest b/app-metrics/postgres_exporter/Manifest
index 5bc51b57b3b2..7ab6e44a0b86 100644
--- a/app-metrics/postgres_exporter/Manifest
+++ b/app-metrics/postgres_exporter/Manifest
@@ -1,4 +1,4 @@
-DIST postgres_exporter-0.10.1-deps.tar.xz 106506900 BLAKE2B 3f32d804d9bd07a91ac623656896d23bba217e2ceed90ff2fcfa19d02093912fe35008064b1248ee98a23e02efdef2761ad7c1dfc96c636d051686ed4a58eceb SHA512 842c6d519c537989cfba36961d38b1cb0e315241a88e1f53532ebf1829d31c7c17b5986680193663e4de3c5cfab3bb25f38e5c6afe6b2ab14ce2efd47a052ae7
-DIST postgres_exporter-0.10.1.tar.gz 73157 BLAKE2B bc56dfdd50878615768fc4e4a193784b73ee48cb1b2743deae21d6caf5db60e3eabe2987cee27742081bea1c506a9c96fb11808304a0007c5e2e252a1e4cb752 SHA512 75ba08354174980d55fb1deed1035323d89f3331f0c366165a0262b4081b99d083f14dbcdd7539836399d0d69a75a296cb978a42d94ff0b1c0bcb8f3933fcabc
 DIST postgres_exporter-0.15.0-deps.tar.xz 10107168 BLAKE2B 2c63161629b7a7aa7e4ca8332f1ad140bfd4c6d496cf860964da4b1897ca67e8716f22db35df6e0558c2764442afea657f3d3e2406762f14b88bf2266f2464f7 SHA512 91a0d8b471ef06635ee3520c8b2a15e19ebb9427356602752f0b35d87efacc129709cac50873f94305edf85149d0b9bb0b2cf6d2bfa8d1ec88e6c6a6be1f4880
 DIST postgres_exporter-0.15.0.tar.gz 86818 BLAKE2B bf4b3f842c98e82c54eb8393271bd9879a93cd8f28b2fcafa09bbb907caf96c4b728139b08074f1de08295b18d61aaa29b4fb53321164c8b4fc93545f7da5b7a SHA512 332700809454dba11e1e6b9cbc46be9683925a6c692e110efa1204ce1ad1457a8d2237ee8af20f1ee6d5c663266fc1629da6f4f5ff9151faf294a26af8be7682
+DIST postgres_exporter-0.16.0-deps.tar.xz 42043172 BLAKE2B 0a7adca9f8f93e8bef092492c6b8f6478ca27c61bb31ac9b4427a11579b9a5c232996ae2c9e24d8d04daacb8a6e407468181a6a0a7871fe0b6293de28c4f3194 SHA512 f87f1d6e6a5390092b188fcf6510c54d88036ad493bc996d9b2b72941d21606cd7a14e10b9b7cb85800c7ae99400983704309b9edfddc4b9f4adf83cf8d1dde3
+DIST postgres_exporter-0.16.0.tar.gz 88742 BLAKE2B 2cb8240a350b80bb2681d65f4ba1030f47effb45e9b3e21d260e9bd8ecb8e76d05cf7523b6e0bf973c27457ac547851c71162826a4f88c52b35cce1e22fc0c24 SHA512 a4930ec95e0b5eb08712814a99662bdadbdcefd77f9950ca8ffc8015f1df09345aa7992ed2848e5aad505db249be79a0c5d0d8550a9e138f29b3a82e5229ef0e
diff --git a/app-metrics/postgres_exporter/files/postgres_exporter.service b/app-metrics/postgres_exporter/files/postgres_exporter.service
new file mode 100644
index 000000000000..d80f6725f7f6
--- /dev/null
+++ b/app-metrics/postgres_exporter/files/postgres_exporter.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=PostgreSQL Exporter
+Documentation="https://github.com/prometheus-community/postgres_exporter"
+
+[Service]
+User=postgres_exporter
+#Environment=DATA_SOURCE_URI=localhost:5432/postgres?sslmode=disable
+#Environment=DATA_SOURCE_USER=postgres
+#Environment=DATA_SOURCE_PASS=password
+#Environment=DATA_SOURCE_PASS_FILE=/path/to/passwordfile
+ExecStart=/usr/bin/postgres_exporter
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-metrics/postgres_exporter/postgres_exporter-0.10.1.ebuild b/app-metrics/postgres_exporter/postgres_exporter-0.10.1.ebuild
deleted file mode 100644
index 3f393e013f2f..000000000000
--- a/app-metrics/postgres_exporter/postgres_exporter-0.10.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=6cff384d7433bcb1104efe3b496cd27c0658eb09
-
-DESCRIPTION="PostgreSQL stats exporter for Prometheus"
-HOMEPAGE="https://github.com/prometheus-community/postgres_exporter"
-SRC_URI="https://github.com/prometheus-community/postgres_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/postgres_exporter
-	acct-user/postgres_exporter"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-util/promu"
-
-RESTRICT=" test "
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/{{.Branch}}/HEAD/" \
-		-e "s/{{.Revision}}/${GIT_COMMIT}/" \
-		.promu.yml || die "sed failed"
-}
-
-src_compile() {
-	promu build -v --prefix bin || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc README.md queries.yaml
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-metrics/postgres_exporter/postgres_exporter-0.16.0.ebuild b/app-metrics/postgres_exporter/postgres_exporter-0.16.0.ebuild
new file mode 100644
index 000000000000..83f78935d115
--- /dev/null
+++ b/app-metrics/postgres_exporter/postgres_exporter-0.16.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module edo systemd
+
+GIT_COMMIT=a324fe37bca5193a293118b940b3df7ab3a8505c
+
+DESCRIPTION="PostgreSQL stats exporter for Prometheus"
+HOMEPAGE="https://github.com/prometheus-community/postgres_exporter"
+SRC_URI="https://github.com/prometheus-community/postgres_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/app-metrics/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	acct-group/postgres_exporter
+	acct-user/postgres_exporter
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-util/promu"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s/{{.Branch}}/HEAD/" \
+		-e "s/{{.Revision}}/${GIT_COMMIT}/" \
+		.promu.yml || die "sed failed"
+}
+
+src_compile() {
+	edo promu build -v --prefix bin
+}
+
+src_install() {
+	dobin bin/*
+	dodoc README.md queries.yaml
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-metrics/prom2json/Manifest b/app-metrics/prom2json/Manifest
index 698cd6719906..bf31513c6dd5 100644
--- a/app-metrics/prom2json/Manifest
+++ b/app-metrics/prom2json/Manifest
@@ -1 +1,3 @@
 DIST prom2json-1.3.0.tar.gz 1646893 BLAKE2B 9b8fcfa4a3e45ee08a57016fa6a7611604cbb578f162f0bf7ff8338f345f98788b75c3ac047ffca95b62020e972c302bc1c44f2f7f00240cfd978f73b8d9c829 SHA512 8f02c7b2616d915e2b4ff5f195a8c2eff89d18417f7396dc02d2aa4cf34711358b0beef6effae9b42a3d6f4b0616c5d3ab995a73ab9e37a4a0ec230adff6f249
+DIST prom2json-1.4.1-deps.tar.xz 2788996 BLAKE2B b720c8d4fb0157c63873e2c15ad2adaef057ac6e6f340d25b321f9a380ee35d6d8eac153fc4cd6e75e60f0a75f6f74c17d8caaa51c46cead0e9942a2b9e29660 SHA512 47f33537a83ed0d24f49f3faa1805593ad4f848b1ff79fe19d3a6a3b2dc3a1e1587217ea7a985c6ae4eae4aca2fac2cff8773e3782c0d0e265722341d0296247
+DIST prom2json-1.4.1.tar.gz 21261 BLAKE2B 76d0f4ba6f7433fbb8701945d297df5fd011d2c62ca39c12647c114202e0a74db8d2c08808b179a5b07f08b7ec7742da238dec9b31bead6b1414b1265f495834 SHA512 4ec0aad8df3e1da4768fdf0c81c4f556589c7d84bee05ad5cf00eface323f3d8770ccb1c48b43a1598be4455307c21af3a0e62842c429ac194e34535b02fa8e8
diff --git a/app-metrics/prom2json/prom2json-1.4.1.ebuild b/app-metrics/prom2json/prom2json-1.4.1.ebuild
new file mode 100644
index 000000000000..34d59e6ec49d
--- /dev/null
+++ b/app-metrics/prom2json/prom2json-1.4.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module edo
+
+GIT_COMMIT=e76e84858a35a1094458b792c631cb75867fd550
+
+DESCRIPTION="A tool to scrape a Prometheus client and dump the result as JSON"
+HOMEPAGE="https://github.com/prometheus/prom2json"
+SRC_URI="https://github.com/prometheus/prom2json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/app-metrics/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-util/promu"
+
+src_prepare() {
+	default
+	sed -i .promu.yml \
+		-e "s/{{.Revision}}/${GIT_COMMIT}/" \
+		-e "s/{{.Version}}/${PV}/" || die
+}
+
+src_compile() {
+	mkdir bin || die
+	edo promu build --prefix bin
+}
+
+src_test() {
+	emake test-flags= test
+}
+
+src_install() {
+	dobin bin/*
+	dodoc {README,CONTRIBUTING}.md
+}
diff --git a/app-metrics/prometheus/prometheus-2.52.0.ebuild b/app-metrics/prometheus/prometheus-2.52.0.ebuild
index b170685f7e08..ba8401e87264 100644
--- a/app-metrics/prometheus/prometheus-2.52.0.ebuild
+++ b/app-metrics/prometheus/prometheus-2.52.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
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/prometheus/prometheus/archive/${MY_PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv"
 
 COMMON_DEPEND="acct-group/prometheus
 	acct-user/prometheus"
diff --git a/app-metrics/pushgateway/Manifest b/app-metrics/pushgateway/Manifest
index 8ba404f83dd2..e7dfdee508a2 100644
--- a/app-metrics/pushgateway/Manifest
+++ b/app-metrics/pushgateway/Manifest
@@ -1,2 +1,4 @@
+DIST pushgateway-1.11.0-deps.tar.xz 1519980 BLAKE2B 9d3c6a20911191da1330671cf055100e934db1d07c834ca8af8a0354fc0ded51132a677b9ff8978ac4b329c31cb4de74a1894b31ad64889a3cc34c865233ff9d SHA512 c4156845d9ea5d591acce7e232b73263a7dd01850592c570efe806d5e9a373e6374b3ac665caa4a430a39f76a81d806c8b4d267b92d1f22713a2c7a28bec82df
+DIST pushgateway-1.11.0.tar.gz 4256647 BLAKE2B 2861bed8705b40772fe41e70c7e21b3f30f7a70ef4a8d2eb2283c11202f65d0d38befb778f8be8a9c9117605fc2a8b9254c20f43f73c6de675fbb7e3402627f8 SHA512 d4bb1d77cf0fb03160f3d7e05d0b570464e77d09f952e0ea1eb220d89fe60cd8599375c1230c8cd85d378ce9f32b27826a1f6cb462da9962da77c62f398ec156
 DIST pushgateway-1.5.1-deps.tar.xz 28913128 BLAKE2B dc7f352a4085ff365a3039501992e7678c1c8b59d3f56ecafa4fe7e50d5693c8399edede9f994c6fca8af739d33bc5cb627b1dbfe27bd0dd63539834290f816d SHA512 82f586be350b1d5f3169adee7e88c9522e34e37de1c9741a32b824d3f9e5b3bdc914177f1a1cff722de89eebe9bd6221ad6b9c29684a348cc7ba93d8cc3c05fd
 DIST pushgateway-1.5.1.tar.gz 4272543 BLAKE2B 01aeda87efdbbd6c7d0c1a8676fe0798c8d97f7638ca26eb8720412eb00d2abff5c7e73d21e1c2424bd375efa8878c85642a06196e933e44ea804e6e053adbf2 SHA512 01ebcdb85f059c330195f37f9466e2042311d8196948881f07d53f1ac4c7daedf343c14856f51db274df00b652b09eb52c735f04f774baf66559697864e1f93b
diff --git a/app-metrics/pushgateway/pushgateway-1.11.0.ebuild b/app-metrics/pushgateway/pushgateway-1.11.0.ebuild
new file mode 100644
index 000000000000..9600ad158dd1
--- /dev/null
+++ b/app-metrics/pushgateway/pushgateway-1.11.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+GIT_COMMIT="0d81964"
+DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
+HOMEPAGE="https://github.com/prometheus/pushgateway"
+SRC_URI="
+	https://github.com/prometheus/pushgateway/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz
+"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+RESTRICT="test"
+RDEPEND="
+	acct-group/pushgateway
+	acct-user/pushgateway
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND=">=dev-util/promu-0.3.0"
+
+src_prepare() {
+	default
+	sed -i -e 's|{{\.Revision}}|'${GIT_COMMIT}'|g' .promu.yml || die
+}
+
+src_compile() {
+	mkdir -p bin || die
+	promu build -v --prefix bin || die
+}
+
+src_install() {
+	newbin "bin/${P}" "${PN}"
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}-1.service"
+}
diff --git a/app-metrics/rabbitmq_exporter/Manifest b/app-metrics/rabbitmq_exporter/Manifest
index f3cbbd152252..75ebbf36e29f 100644
--- a/app-metrics/rabbitmq_exporter/Manifest
+++ b/app-metrics/rabbitmq_exporter/Manifest
@@ -1,12 +1,2 @@
-DIST github.com-Sirupsen-logrus-78fb3852d92683dc28da6cc3d5f965100677c27d.tar.gz 38596 BLAKE2B 777c96b5da859d9db92653c922e0ee296c4d3839981389c7e31f0c92913772cbd83227420b9c5eb3de55f465d513b1b0b8fe72b07f80277bb891a127314ce45f SHA512 cb08995d0705a8999b3eec044d3efe209e4110c15da5116f364ee3fb7dba0372d47e0d35cd1cfd7e75e31fd3c867bd023e90565bbd78f4eaf2c29ebf0e53fd53
-DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
-DIST github.com-golang-crypto-ff983b9c42bc9fbf91556e191cc8efb585c16908.tar.gz 1645106 BLAKE2B 3d7271479ef812761a02c1d20429800cd29706e802a8ccf57e916bdb8befc87a9b1b1a88d42adb764a32fa5f4c5f5a5e434af63812a5bcd3de625658792a49a3 SHA512 19746e84901c0749da544ba02c74c8ccabfee5f186a0d00509e54f20c191da9ea56844de988265f072af1fae671d78d741a44f782b8c1704c9da0441436c2122
-DIST github.com-golang-protobuf-347cf4a86c1cb8d262994d8ef5924d4576c5b331.tar.gz 329489 BLAKE2B 828678cee603917e7f4efee2dd0902730a73932b94b12d4f4b35f0fcecaa329cdc39c3fa9926ce3706f86cc52c0aa4984f68ee0943ecc6d9571b0175ff671ab0 SHA512 de4307b91923a6890ab2f8eaf2ed4f7f32a45a4a0cc7b0d6f53ce31c5fe3ed08f378072075456d2c99c89a3b5acbca315814b8e5ec70e6ceb0ca62f7013f618c
-DIST github.com-golang-sys-2be51725563103c17124a318f1745b66f2347acb.tar.gz 1220240 BLAKE2B ae08467ca600c6f837a2b2203f2e86ecbdb14d8865bea9dd1069f30028324ca20a9a2f5b1a5dbd4323a0fe8a2aa94fd64878de37bc628f67149318ec9594614c SHA512 87e9f267c06baa2ecf6fb84cd0b092c9fea54f729c27ab86f9702f05a971cbe47f23cd03c50a4eefc90e2b2559844b56866504df64829d8fb45451e461999807
-DIST github.com-kbudde-gobert-a6daecb9ddeb548b7cfb3f5ac9deef9ded522730.tar.gz 14629 BLAKE2B 0731b1fd24ac5139f12a2a11b9f921c2afeedb78c573e7a788bcf2d95695f3212ff8a2d107c6fc6ad5045c9f4a5610a34ffcdc3b1580bc366860331b0c4731b9 SHA512 daaeea3cbe1f813e024272479b2a4af550071c82cf9261b7901279c28fe44e8d12afff707fb8a393a46396a6eaec7c6ef5da07220a85c1b70aa0a13f769bbc73
-DIST github.com-matttproud-golang_protobuf_extensions-c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz 37541 BLAKE2B f78899afa1390aca6cb1b412271713c60107771d512ead83482e0bb1716d175b791b4b04bd24b7f469cc1a29176eadcf0545ac3bf166c5b350602420d3c05aec SHA512 141b1b781a4d1c59f5eb1af93c966343b80ed405a5f63774e6cda9f12c34536e892c7a84699d6cf2e9c775457a4c2ad5d5d0b4d302fc25a923ab81d46ad65580
-DIST github.com-prometheus-client_golang-d2ead25884778582e740573999f7b07f47e171b4.tar.gz 131949 BLAKE2B 352e0ef2bd704f6c490e57520d415e89d950241c39f3cdf851524d4cca87c25c31bf2ffb77914981cb730cb474033f4551b50c5b6085e5e273c2d29aaab1f012 SHA512 ca89d613e8bc6cff928d9ce8d3d563c8277cb31756c66d8c0e6f6b6ce00c1405d10e465245ac63fd6889aeafae0d6914814384e94e127929fbcfd606a59e42a5
-DIST github.com-prometheus-client_model-f287a105a20ec685d797f65cd0ce8fbeaef42da1.tar.gz 57203 BLAKE2B 2d56b90ced967f5f7a2c59bb330aaf8c56cf522091ee413ff27c22cb9e7d656080bd7d4dd2372938a873617054c7c98925e10fdc7996b136eaa4fd1b6482b734 SHA512 b4f900e725a638a7131eee1c6ff5bf550025b4d9e5bb2dd09149e91ce02a7aba458039c2162b6a1f9a6b6c7c8fc0fc29510b6c752caad51282a960d18860f960
-DIST github.com-prometheus-common-2998b132700a7d019ff618c06a234b47c1f3f681.tar.gz 87368 BLAKE2B fc6c6e197d4cc61afefa9fb8e3a8d6b36ab029f62e3cf9adf8359e4885554f94427f17218d45c90c9d7f4a6985b2e4143a4d304d39f806bd70d2c6f05de29bc2 SHA512 b2095da96596fc500ece6b331cda2558f8c813720853f2489aee3dec65de95eb13f7b0853e3812433fdc040f16990d2f05b2a6b8b41275210c504ff333ca625d
-DIST github.com-prometheus-procfs-b1a0a9a36d7453ba0f62578b99712f3a6c5f82d1.tar.gz 61720 BLAKE2B 2f9b25506527aaf6e1bf560a1b680b958d1281acbaa2bb896bfea50b5b7de8992d10e8e812f8ae449ab67145c88179c15afe1f719851d1717b28963071088082 SHA512 5938b4a8fa9a5ee32be995fed0d0e6b26941765470aca4eda63a7c42db457e83da43fde2f33b2d4ded3545e5643f607ec7060406b0a1b15e64cc732bb2badd4a
-DIST rabbitmq_exporter-0.29.0.tar.gz 36950 BLAKE2B c4e10acb4fb610725dfc82c227ccf79ca60ffc30cd6c3f4ff741020cd7d2a757895af046bc2ded8a9b6a8c3fec870abb746e0f363e12d5221ccbce4b0fa6ca3c SHA512 8806e4a0c62126ef3575be2d558663165c04bf9b94a865d078e1ca92c0bb2d4ab057f6c37993236ab2327c1932bcf155c90ce9729924a06066da74e68086485d
+DIST rabbitmq_exporter-1.0.0-deps.tar.xz 9804184 BLAKE2B 3b3ff8a2911104f708f4c3b7272648bf4a36ee06251216bf91e5bb5591c8aba6a5d0f392494e597d83ef0850f821a25388b2546cbb65039cf8a2451076344e7f SHA512 1ae21e35f9762a2c45c69c382a01367f425b5e5faa0a421d2f5c1ad98356915447ea0f76b15cb65a4816506e7753d8c60836479b5760d21db643d309b9567d9d
+DIST rabbitmq_exporter-1.0.0.tar.gz 59708 BLAKE2B 1caff29efe8b5d41089587c0a35c4ec581eada54f8a54fdc308e3d3200dcff8c5cff9ebe0f6b10d026af28484c931ac9c9c01285d0b37714002b4fb5f13c47ee SHA512 29592c9ca1d8b67efbdfb44c5c1f881977a74e4e9aabb44903d5afd5c10696202198ac02b84beb90853f8927cd05abcf8f4ff43a467a8f22b1c8af00df0a52b2
diff --git a/app-metrics/rabbitmq_exporter/rabbitmq_exporter-0.29.0-r1.ebuild b/app-metrics/rabbitmq_exporter/rabbitmq_exporter-0.29.0-r1.ebuild
deleted file mode 100644
index 9fede10a764d..000000000000
--- a/app-metrics/rabbitmq_exporter/rabbitmq_exporter-0.29.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN=github.com/kbudde/rabbitmq_exporter
-EGO_VENDOR=(
-	"github.com/kbudde/gobert a6daecb9ddeb548b7cfb3f5ac9deef9ded522730"
-	"github.com/prometheus/client_model f287a105a20ec685d797f65cd0ce8fbeaef42da1"
-	"github.com/prometheus/common 2998b132700a7d019ff618c06a234b47c1f3f681"
-	"github.com/prometheus/client_golang d2ead25884778582e740573999f7b07f47e171b4"
-	"github.com/prometheus/procfs b1a0a9a36d7453ba0f62578b99712f3a6c5f82d1"
-	"github.com/matttproud/golang_protobuf_extensions c182affec369e30f25d3eb8cd8a478dee585ae7d"
-	"github.com/golang/protobuf 347cf4a86c1cb8d262994d8ef5924d4576c5b331"
-	"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
-	"github.com/Sirupsen/logrus 78fb3852d92683dc28da6cc3d5f965100677c27d"
-	"golang.org/x/crypto ff983b9c42bc9fbf91556e191cc8efb585c16908 github.com/golang/crypto"
-	"golang.org/x/sys 2be51725563103c17124a318f1745b66f2347acb github.com/golang/sys"
-)
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Rabbitmq exporter for Prometheus"
-HOMEPAGE="https://github.com/kbudde/rabbitmq_exporter"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="MIT Apache-2.0 BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="acct-group/rabbitmq_exporter
-	acct-user/rabbitmq_exporter"
-	RDEPEND="${DEPEND}"
-BDEPEND="dev-util/promu"
-
-RESTRICT+=" test "
-
-src_prepare() {
-	default
-	sed -i -e "/-s$/d" -e "s/{{.Revision}}/v${PV}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/${PN}
-	dodoc *.md
-	popd || die
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-metrics/rabbitmq_exporter/rabbitmq_exporter-1.0.0.ebuild b/app-metrics/rabbitmq_exporter/rabbitmq_exporter-1.0.0.ebuild
new file mode 100644
index 000000000000..8f47d4555b87
--- /dev/null
+++ b/app-metrics/rabbitmq_exporter/rabbitmq_exporter-1.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Rabbitmq exporter for Prometheus"
+HOMEPAGE="https://github.com/kbudde/rabbitmq_exporter"
+SRC_URI="https://github.com/kbudde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+="	https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="acct-group/rabbitmq_exporter
+	acct-user/rabbitmq_exporter"
+	RDEPEND="${DEPEND}"
+
+RESTRICT+=" test "
+
+src_compile() {
+	ego build .
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc *.md
+	insinto /usr/share/${PN}
+	doins *.json
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-metrics/uwsgi_exporter/Manifest b/app-metrics/uwsgi_exporter/Manifest
index 5e156c4c575c..2c11e8d76412 100644
--- a/app-metrics/uwsgi_exporter/Manifest
+++ b/app-metrics/uwsgi_exporter/Manifest
@@ -1,3 +1,2 @@
-DIST uwsgi_exporter-0.8.0.tar.gz 3040547 BLAKE2B 5b6769487b3a08752cdff9dccc727096bc6b9d49e12e8aa35d04bbd0c3534503c19a4dda882c7efd7409549f3cae750021fa7ce87d12b798a2998efcdfc9f1cf SHA512 a5a1439f554749c7db4857651a11cbbf0ad0a0a8da0ffd421e374fe08194ba289a6bb04a95e4169ba6a75d0358c7a96e5b9f3cc5813cc39004f81dce42edb3ed
 DIST uwsgi_exporter-1.1.0-deps.tar.xz 6393556 BLAKE2B ce75723b9de728560fc367c31b8f70498ffda083f1aa3ed138aaed37d540ed4b05681c022c63bd3f8aa6c1bf9d9e7fc7e6f947c556794b5d65724b1ff95ceb60 SHA512 e5140951a895981eb85be571035e017b3d3a344cb074a40b693f46e25d9355192debecb9710afb4952cbfe6beb62741ddca2c16ac5454df8643927400e3f2d6b
 DIST uwsgi_exporter-1.1.0.tar.gz 39335 BLAKE2B af7fc7ba6d2479467e4b0b90c469fd3a3de1d967b1f4130ce54b5db5bec4dcf910687cf375dcc98a6b68463831d49117e23f589d03d37579b2d83b33a74b519f SHA512 62db351903f6876efea60cc25bea1560b5061ecdf6ca1f113bfa51a745d1524b397350cc2bd0e720aab9357f4f9f6dbca0285eb41ed9cdabebeb4f4176d9c652
diff --git a/app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0-r1.ebuild b/app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0-r1.ebuild
deleted file mode 100644
index 5be77e4e77ed..000000000000
--- a/app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-build golang-vcs-snapshot systemd
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-EGO_PN="github.com/timonwong/uwsgi_exporter"
-UWSGI_EXPORTER_COMMIT="ddbc18f"
-
-DESCRIPTION="uWSGI metrics exporter for prometheus.io"
-HOMEPAGE="https://github.com/timonwong/uwsgi_exporter"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0 BSD ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	acct-group/uwsgi_exporter
-	acct-user/uwsgi_exporter
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-util/promu
-"
-
-src_prepare() {
-	default
-	sed -e "s/{{.Revision}}/${UWSGI_EXPORTER_COMMIT}/" -i src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/uwsgi_exporter
-	dodoc README.md
-	popd || die
-	local dir
-	for dir in /var/log/${PN}; do
-		keepdir "${dir}"
-		fowners ${PN}:${PN} "${dir}"
-	done
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
diff --git a/app-metrics/vault_exporter/Manifest b/app-metrics/vault_exporter/Manifest
index 2bd4e869f9fb..3abe5684690a 100644
--- a/app-metrics/vault_exporter/Manifest
+++ b/app-metrics/vault_exporter/Manifest
@@ -1 +1,2 @@
-DIST vault_exporter-0.1.2.tar.gz 34555506 BLAKE2B 53178f8a16fceca442e38a756081cca438abdd786960de3dae073f3ce5f2ac2c5d06684ec56e48a2057b4a2161a25527b41c36d3705a054f0bae37357f33faee SHA512 71941c17d7146861a09ed48289efe15143d3fba18e56accdfdf977bf4443bb650e7201a4870b63793d372dcca8f53a04131c12803f019efbdcac9e0ca8909cbd
+DIST vault_exporter-0.1.3-deps.tar.xz 19727436 BLAKE2B acabd1e3080e068d0c59f6485184bcf4736e4f02e2391ea761ad25cb1ba80122cd9fbeea3e72bcc6341e595b861999b07bdedffc846c076ec2c0c80f7012966c SHA512 bfa6077d71e8b3c8768e2d86b117de58a275daf856ede27c1bca099b88b299ad03f3f73dbbbae21869fe054b2907c0f199529860dbdd8f2acad20ee544ca0ce3
+DIST vault_exporter-0.1.3.tar.gz 184621 BLAKE2B 90f80e5e8258110ac2e29a8b6d845b0de220acf67c36c627f7c0f433a8ffe992aebea3d95cb3ef6b4fd286739f71e76fcbb581e329534709d5a8f84ae73901ce SHA512 002c481d87b97e7e884473fe660b3d3b9b98077e11f02f125e99735634bd33f0d46be04919a8423e345ba3064ef1b1f3a28c9e890aab95adcd44c22dde5cfd94
diff --git a/app-metrics/vault_exporter/vault_exporter-0.1.2-r1.ebuild b/app-metrics/vault_exporter/vault_exporter-0.1.2-r1.ebuild
deleted file mode 100644
index 4f8185cc0e8c..000000000000
--- a/app-metrics/vault_exporter/vault_exporter-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/grapeshot/vault_exporter"
-MY_PV="${PV/_/}"
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Vault exporter for Prometheus"
-HOMEPAGE="https://github.com/grapeshot/vault_exporter"
-SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	acct-group/vault_exporter
-	acct-user/vault_exporter
-"
-
-BDEPEND="${RDEPEND}"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	GOPATH="${S}" emake build
-	popd || die
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	newbin _output/bin/vault_exporter-v${PV}* vault_exporter
-	dodoc README.md
-	popd || die
-
-	keepdir /var/log/vault_exporter
-	fowners vault_exporter:vault_exporter /var/log/vault_exporter
-
-	newinitd "${FILESDIR}"/vault_exporter.initd vault_exporter
-	newconfd "${FILESDIR}"/vault_exporter.confd vault_exporter
-}
diff --git a/app-metrics/vault_exporter/vault_exporter-0.1.3.ebuild b/app-metrics/vault_exporter/vault_exporter-0.1.3.ebuild
new file mode 100644
index 000000000000..a374a536dd40
--- /dev/null
+++ b/app-metrics/vault_exporter/vault_exporter-0.1.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+MY_PV="${PV/_/}"
+
+DESCRIPTION="Vault exporter for Prometheus"
+HOMEPAGE="https://github.com/talend/vault_exporter"
+SRC_URI="https://github.com/talend/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	acct-group/vault_exporter
+	acct-user/vault_exporter
+"
+
+BDEPEND="${RDEPEND}"
+
+src_compile() {
+	ego build -ldflags '-d -s -w' -tags netgo -installsuffix netgo -v -x .
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc *.md
+	insinto /usr/share/${PN}
+	doins -r vault-mixin
+	newinitd "${FILESDIR}"/vault_exporter.initd vault_exporter
+	newconfd "${FILESDIR}"/vault_exporter.confd vault_exporter
+	keepdir /var/log/vault_exporter
+	fowners vault_exporter:vault_exporter /var/log/vault_exporter
+}
diff --git a/app-misc/beep/beep-1.4.12-r1.ebuild b/app-misc/beep/beep-1.4.12-r1.ebuild
deleted file mode 100644
index 6615cc9f090a..000000000000
--- a/app-misc/beep/beep-1.4.12-r1.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
-
-inherit fcaps toolchain-funcs
-
-DESCRIPTION="Advanced PC speaker beeper"
-HOMEPAGE="https://github.com/spkr-beep/beep"
-SRC_URI="https://github.com/spkr-beep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-
-# Tests require a speaker
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	cat <<-EOF > local.mk || die
-	CC=$(tc-getCC)
-	CFLAGS=${CFLAGS}
-	CPPFLAGS=${CPPFLAGS}
-	LDFLAGS=${LDFLAGS}
-	EOF
-
-	sed -i \
-		-e "s#-D_FORTIFY_SOURCE=2##g;" \
-		-e '/\-Werror)/d' \
-		GNUmakefile || die
-}
-
-src_install() {
-	dobin beep
-	doman "${PN}.1"
-
-	fperms 0711 /usr/bin/beep
-
-	local DOCS=(
-		CREDITS.md DEVELOPMENT.md INSTALL.md NEWS.md PACKAGING.md PERMISSIONS.md README.md
-	)
-	einstalldocs
-}
-
-pkg_postinst() {
-	FILECAPS=(
-		-m0711 cap_dac_override,cap_sys_tty_config "${EROOT}/usr/bin/beep"
-	)
-
-	elog "Please note that for security reasons, beep will no longer allow"
-	elog "to running w/ SUID or as root under sudo. You will need to give"
-	elog "permissions for the PC speaker device to allow non-root users to"
-	elog "use 'beep' by either:"
-	elog "  setfacl -m u:<youruser>:rw /dev/input/by-path/platform-pcspkr-event-spkr"
-	elog "or add yourself to the 'input' group:"
-	elog "  usermod -aG input <youruser>"
-	elog "It's preferred to use setfacl with least privilege."
-}
diff --git a/app-misc/beep/beep-1.4.12-r2.ebuild b/app-misc/beep/beep-1.4.12-r2.ebuild
new file mode 100644
index 000000000000..723adb9759bc
--- /dev/null
+++ b/app-misc/beep/beep-1.4.12-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps toolchain-funcs
+
+DESCRIPTION="Advanced PC speaker beeper"
+HOMEPAGE="https://github.com/spkr-beep/beep"
+SRC_URI="https://github.com/spkr-beep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+# Tests require a speaker
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	cat <<-EOF > local.mk || die
+	CC=$(tc-getCC)
+	CFLAGS=${CFLAGS}
+	CPPFLAGS=${CPPFLAGS}
+	LDFLAGS=${LDFLAGS}
+	EOF
+
+	sed -i \
+		-e "s#-D_FORTIFY_SOURCE=2##g;" \
+		-e '/\-Werror)/d' \
+		GNUmakefile || die
+}
+
+src_install() {
+	dobin beep
+	doman ${PN}.1
+	dodoc CREDITS.md DEVELOPMENT.md NEWS.md PERMISSIONS.md README.md
+}
+
+pkg_postinst() {
+	fcaps -m 0755 cap_dac_override,cap_sys_tty_config usr/bin/beep
+
+	elog "Please note that for security reasons, beep will no longer allow"
+	elog "to running w/ SUID or as root under sudo. You will need to give"
+	elog "permissions for the PC speaker device to allow non-root users to"
+	elog "use 'beep' by either:"
+	elog "  setfacl -m u:<youruser>:rw /dev/input/by-path/platform-pcspkr-event-spkr"
+	elog "or add yourself to the 'input' group:"
+	elog "  usermod -aG input <youruser>"
+	elog "It's preferred to use setfacl with least privilege."
+}
diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest
index ee42a2e69804..849e0ca92f52 100644
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@@ -20,15 +20,15 @@ DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e
 DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
 DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9
 DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9763070e269b56a14b150cbfc4b7f599d4c2a0a5f783638170ee132f0796fefb14fcac7fd73c58db0791007a SHA512 91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20
-DIST bet-1.0.3.crate 7835 BLAKE2B 2c96628e866cb39cc6b671e48d6935172f7bc3e230eb55a9a81a81259afea753d74faf37f8a55bda7be7de3072359aaeb78df996029c0d9faea4dafcb0bf55f8 SHA512 9e44e723699ffe8436cf1f98d63dd2ca4dae57eba257f8948cddff17b67bdb8a6e3ba714ac0d9509ca08202e64e126d04b2c83b0860e866c1a0cf5473bae862c
 DIST bet-1.0.4.crate 8781 BLAKE2B d68dd74e7904eb986b1e4375395e09d9b31c5648cb00f0565a6fc13fa42771d1f2e29b0eb44a6f60424188e098148451c548ee50e1e224e7fc59a8b413184d22 SHA512 bdee816fe530d9d23c508c6ac1625a771de0a8f892955e7d2a520498d827e9699a35cbf95840aede3bf85103ac5b9bda377e2d35ffaf680f717789d30d395933
 DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
 DIST bit_field-0.10.2.crate 10568 BLAKE2B 4dc92498b5f2befb9e3d8d5a7bcac478b7f905e708cb674e7589f23b60a3ade33b2c660c3f57105520aa863ef19787a00221e1f61914f090f9ec500961e3f70b SHA512 99bacb002aa9ef89cef1403429807042135898614df85e59475772b90d2d21972ddc77ef9b129ca931355ff11bfb3de66b55b828bbf792f76300fc5cfef066a8
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf
 DIST block-0.1.6.crate 4077 BLAKE2B a2c11873b8cb1a1ea399ecc99ed45e5d0b9399bd88435cdea346910b8707b7da94eeef522dafa5cdb09929534472b2a096c03c373744a789962d4175fd1b110e SHA512 c278e3c0346cae423b533a8f5d6b822e788ec450c92ef0f5f559d5705764a0a11df49f0f66bb1c8af7e89bec8ec802934676b969e43f92255a38b210d0fbd710
-DIST broot-1.42.0.tar.gz 13911224 BLAKE2B 2f1c4429227eb6add7d78def5f52024ec1a76cb586cd596fa5b1ae10ab8854840066611e31c2c5ec99c3b782e09efd1a882e46a96bf415648e0b8ad3e2d0c6ab SHA512 5a43be1e2fe4e856ba005a5142e3f279a9c86efa2fd0a50ea02e94d9a06b16d50411a38b47aed114b6a1c9df4f886f6839f9a274db942621c03503a5d5e8a595
 DIST broot-1.44.2.tar.gz 14065451 BLAKE2B 60a39d970fd659e79ef5dbc3a93f3210bf375d4d1de149b7efc97485da4b1cf599cce639169b03732f906800033e0116c7bda66315dea2f2faea6ee74eb7c7cc SHA512 d182788aebe91f11317b0510e6f285c607dc7ba884f6d0e6f2dbba110c56ff27a4c916f650c3d3303a38df3f361f7d2db2357fb0f8cd4bc6c2f738c602ac896c
+DIST broot-1.44.6-crates.tar.xz 39940672 BLAKE2B a2ddb6b2fde1cb485d0efed044a6b1d0f24465994060d1bc830dd45ddecbd99c0847cecfbfffabb6f1508a1696359d458a093b015623e2c763b095fc5e9d2698 SHA512 0b4c33b0ffc09de59d2eb293e98efa4a3dab8885913cfb3eaada651979443a3f38d4246f58edb89eb5a00153730f511fb0b6a50caba0cc39d9b4b9294c462d6f
+DIST broot-1.44.6.tar.gz 15295709 BLAKE2B 2ebfef9e9b2440d7f30a34664e81d13f86af7349a9ccf0c473247e43a56ece1e0082cd8c8b2a2114d92cbddf75ead89cff509b105b88e5ead87e144ad6b79c88 SHA512 36735c1c206c4bd92069e08628ed1111e24c2faa9128fad182e4cba6906c47eb1d72ff376f066cbb22f70ef071a3703bed00554e1c1ef9cfe78541edbb1a570a
 DIST bstr-1.10.0.crate 380426 BLAKE2B 19330a5a293430c09908d2174ff814351b16419f60de6463abf9b8a9dff06a4e6845e889d8047a710cef54842f2790d9cd5080b92cdcb113d89742b869979c74 SHA512 823abdbda9b13802facc7d6b1ed9ad809ed3b0b827d26e418348ffb8481b5f5735f129c5a9a8c7b2ab010d7f32ca57cba69a1ee10a64225c54c6ceacd22c05d2
 DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
 DIST bytemuck-1.16.3.crate 49539 BLAKE2B 5e9a4c9e5bb1ec5398670edad455fa54b08955b48390d784c29c7ba153db4d0fb25c4d14f445ed28c443379a761354b1d9eb8c9c6e2a2930f5fb3f9085ad45b2 SHA512 17bf35d082c8009ce6ae24ae681715d8fd303f728f9bb2a0702096fd8635b5e7294eeea5375217a8276ba6136a16f94eb670c5d5baba9020674dc958173342f8
@@ -45,7 +45,6 @@ DIST clap_complete-4.5.16.crate 49011 BLAKE2B 01ecd71cbccb5fe9f99ee942aa234581ae
 DIST clap_derive-4.5.13.crate 30132 BLAKE2B d5fcd2c5a213817165c61ba2071fc6424ce822e4881686556b8379fc71188f60d8c6712f6f4a8e5c8b125b58d7454aa9846214caf324fbc93300abba240bea17 SHA512 2dae32bffd91de9311d94e2be0d990074cb2e2edc832f422cd5e7c5177f5daafc0c335e74f865024c77cae5fff631ddaba58028fcfc24b203467478fd473bbf5
 DIST clap_lex-0.7.2.crate 12805 BLAKE2B 952bf3f3885ae7bedd0e8add236590da5fce72a7ccd88ebda063410aef337ce7ccdb5e5e929cb870bc993891610edc0197150a3aa82a62fadc4bbfd96324fcdf SHA512 a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380
 DIST clap_mangen-0.2.23.crate 15368 BLAKE2B 915cc4250a3f377ac0f5ea103d18cfaa7b827b3c686fb485f98619465eac23400df828cb06572c4748af42584c7e78c0a903c4114c8e4cb867e320521d8d8add SHA512 fddcf6e7173eb0ff84fd05218bf70b2bcbc3a212b7cc1dbb8eb85cd59504fe89f8b4078669d4a45308ca5c2d9d87d387c5cd0c48cc9a9376646f13008971e531
-DIST cli-log-2.0.0.crate 5302 BLAKE2B f36b117e4b2e89ca54132c9227236dd663256ccb16afefa414ec6bdc11d840fa2565ddaf6824a6a87c7bec8499df1686b068b340c2b9ed4c368fe802c2652492 SHA512 16273b783875c80a43fc9ff86e3d35b47226a6cce2ea2c258b2fb24863d75cc01fa7ef447b1ed5ff775ddd57aa9ea39a45fd483d0db079a8f2fbc50d9184aa43
 DIST cli-log-2.1.0.crate 7035 BLAKE2B 08f7a5ca03e10b56ab0967d76e04ca09cc778b19c1775609f3bc0411a586aadffdd93fd26ecc182eca2788c67c07eaa10b0951eed90ea6dfd6231fd4ef61b718 SHA512 9a98d3ce45db1654589f5aeb24dcd8803a91525351c4f23c70747bebf648545b9a3f3f041f85c884244955b58135cdda3cf297c43ee0a12fd299b4d4082e107d
 DIST clipboard-win-4.5.0.crate 13476 BLAKE2B bfe3e9c21d58e0001b85c69d724b03b2bc7128fe67420948dffe0b9709504924339c93b5acc2a572a7780bb1adcb51ab10ac172b972c26d325f3ceb7f7f6dde7 SHA512 2dfaf30119eb77c9f069310417f11e836e158ba43f988ff49f79647f5fe44bacf7e28dcc11ba2cd95389c685a69be0f5ef8b033ef09b94c9a3e484952e891d8e
 DIST clipboard_macos-0.1.0.crate 5958 BLAKE2B b16b41b412ebe1ad59bab48e43f394bcfde683f73827e43b2ac52f43dbdad354181c9ae3f69bf948791c014be86aad20503f44154cee0a8307012397a0562dff SHA512 a63800826ff680e24fd60cb77945dafa19feffca2a99a2f5ce9bdaf19856bfc628b4ceca5d28a30d0b6db69b18bde16634a7291817aa10421ad8ead566614f8a
@@ -127,14 +126,11 @@ DIST jobserver-0.1.32.crate 27549 BLAKE2B 5f6556788d10af992fafcb578ecfd2c81698ee
 DIST jpeg-decoder-0.3.1.crate 744364 BLAKE2B 0ccc3a7f42e471fc1fc7995fa99573b798da89911667e477a310d10b95745708e583d53776467b9d54a399047b727a3fd4c26a1387382c226f6594770b21ba05 SHA512 103b7602876069603620cc2b5530e84fdab88ec96855a821606560a67cfa26f628b401eace62ee793e6c16ef282f958ed789f5db725ff901124fe6c9b123de00
 DIST js-sys-0.3.70.crate 53863 BLAKE2B 15e75a94a2b7c77ff18847f98f76a1442b6e5f66960f3375534440c382a255e6b16ba3cb8c5345365d2195f7598564bf856755988f1288eb1b0b964e26446e21 SHA512 5dff8e790447a475b3c0a7068f0bdf1cced5fb8be2d66c92cb6f6c799f9d807f9d3c498e4f42c67e16d83dd4bb3be70472ece20fc42c3a8c8d57615ac8d398d7
 DIST kurbo-0.9.5.crate 108513 BLAKE2B e354dfffefcda08da6b4e4b2048b9aef9b0f6f9aeac5b35e1ccfe540b947733e7cf824e4fc701896216d5a2895b7e18fa3ab562262a9e3f0f874194e46bd629b SHA512 2f145fd6ee686fbf7156bcd201ff66b6e92c15eb673fe1e3bd49a1f8d89e2b32c944d090d866a4d818fe54a3197d6a805504562a3df835c477aebab2d18e771d
-DIST lazy-regex-3.2.0.crate 7547 BLAKE2B 32bb7ab3f9b0790092e63c9603ad87bab1c5a86fa03a30bb8298ad866ad4f7f9498e01c1d2e1c08a777506e3bae99518333e2aac8e6293c649596e2bede09b1f SHA512 bfd91441644e382756541eb7719a325def0807fe18f44d785255fd458b457312c554d79008b21f0a7a4cb56168f4295d4fcbf43de57131c523b115f0974d91f5
 DIST lazy-regex-3.3.0.crate 7509 BLAKE2B d4f238f01602d2506fcc92a7d625502532cd461ea1c604c3a64fb4eb33c2c5a743804ea305dcf5db40cb84ec3beec7eb943c68996bed11f5b88f18cb2cad0a4c SHA512 177fe10630054b28b323295471ae2cb5c72e36625033cf77d945c246c534ac954849bff418f608cbf58ce71a38422949ec246ea5cf4f9e405fa9e4d89ba18340
-DIST lazy-regex-proc_macros-3.2.0.crate 5665 BLAKE2B 1762b13c0533622b3811a4adffe51e8834cfead74434c108c9af15ff953599f0d216498ce7ff6ae9341da86fc7c83e45cab12df25d04546316576f93c33c68ba SHA512 401d5d086d9c65dcf49934cec9cb882fbe9f30840384c839405bc261ccdb89ee2dc15a6ee97914bf8880556d3dafb2726c67c414fc2d552d087a1f47ebaff9c8
 DIST lazy-regex-proc_macros-3.3.0.crate 5720 BLAKE2B be257d8114f6837ac612b109452deb62cc146a69e63827f6da818df6ed633bfb24f9fc1edf8b7d91d85c521ffd9cf5716335f6009c8d68e4dac204fa6a72ac67 SHA512 dc61271da716c271311899a547d56f865252412fe2c85295411701164dab7b00e9a14b190b12f8b4bd7c6357566a3050f3d45729c3938bb3b3de919cc046f31c
 DIST lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f
 DIST lebe-0.5.2.crate 8422 BLAKE2B afa49a1945d623b34139e31406f4780a5ab7b3d34648caf5f73b1504dbec4c4c02fc3aad3fdcdf85509eb8ba733a131a96478d6b9494cc9f69048f9ae28eb880 SHA512 ae8fce41c9a934999dad672ad74acabac9d7998aac4f1d03b54910d4b941375b9e9721cb1bfc8cd7cfcc4206fc0b18d725b0ea256a3a10a125a8d5848ed761ae
 DIST lfs-core-0.11.2.crate 8568 BLAKE2B bbf9f74b59c009a4dcf49f16d54cc235dd68663de67c97b1c70b054b0a362e8884020d10b8c8da497516a2d45a9821dd5243544825f649992870336a0e9dc1f0 SHA512 db963297b7f8f267139b6b18b4e96bd58a5574628182e0453a370a4db346cc5ce62418cded7128617c6630e4a1b9cde5dd1c70f886002634154e21a61cc90dcb
-DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
 DIST libc-0.2.158.crate 751340 BLAKE2B a67318ab24bb86c4df682cdf846d51f5f0a69504567acff43cc6e724f2641521945dc75dddc10c1c265fda960cb28b528575b5d39ce321073844dbddbc77bdb8 SHA512 c2d90d58480cca3464db475d7c70cd66bc1492239d8183038b48def8f5d8a437a1e2a2f084cb2bd9456889221b10aa07981cd5e9bcbb6bea28a2bde3c76f1105
 DIST libgit2-sys-0.17.0+1.8.1.crate 1812997 BLAKE2B 91f61437450398c24a7dbb85803665a0cba268615a0e9d8176e094a192b9e8441d5d985a430722ebdf8c003acd47d40dc5b9e464fb7dae8d9c12b3adbad796fe SHA512 4c37c30426dbba1d9981d65ee42210ec07e2dae73ce2d18beee17b161eb96de0c7b1696cc8b97fa514eb9fdcb8b853713cd19174fc55f033b6a9c1e25520f75b
 DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
@@ -149,13 +145,10 @@ DIST malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad9
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST memmap2-0.8.0.crate 30990 BLAKE2B 409550e5ca4e03f91bf7d7f335304e6f2487b85a14563d836bea67aff91e1d93b84dab3e94a0b4e120b5913a472320933eb13c6bb51f440c470f759b569105b2 SHA512 4fb5e4af5882ea685e55e4f1f297aff99ea484c526467d2e70a418d536c979706c09f77ee272df0d81c1a9288f7c1856bdd117d50b8ded7bb74dad8f11bf6d46
 DIST memmap2-0.9.4.crate 32752 BLAKE2B 1b21af908061e6fe09484ce5f84d31ed1751301dffb6439512b38c53f9f090cef7541b591b968d0207c6d8351ee4d5949007caef7832ce130ffda1b3716b5454 SHA512 8bba078dba73253e8ee88f0bd2202dcd2afd0b7b800d08af8af593b882cb4acff7e297a3f299e253f5adf103893fc390dcd73e882a2e7d93ca96099fc2eace4a
-DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST memoffset-0.7.1.crate 8556 BLAKE2B 1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3 SHA512 40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157
 DIST minimad-0.13.1.crate 21041 BLAKE2B 021e8b08bd0ca62ff27f106182a9282c55de7e043601036e973670dc37563e66215078b7d92503aa130f5be4c0e07f0dc87736a7259a2686aa66ff19e191226b SHA512 0e6c2a6b7176a0ff173f7f0b7015abd9aed11df1f553c6f46295555f89878aa56e7e2fef622c14a430ce04db0ddd0728dabb27aa8848faf6555d4e13ff954af2
 DIST miniz_oxide-0.7.4.crate 56119 BLAKE2B 68facfec9ff405bebe99f52bcf3aac6788f1b5eef313ca393e2a15e1158bf294003cbe31efea4c793e644e8ab4e00ef67d38f7d32849ab6f01a8e19d31c30221 SHA512 482bf02d7bfd25bd8abe5e5959132677202d8c5dc014b9b0b64fbdc204be1b8431867095c140a1183dd1ca59f6ba871a355422fbd148ce34d62960cad2b7a978
-DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
 DIST mio-1.0.2.crate 102777 BLAKE2B 9b87abd99269c62e48c6be4fa197d2b12527b672c435d5f1f623f986c60ed391597dbde7d5b73a624a4df0eeaf9c9cedcd56cfd7ce4239757d59e67e9892c59f SHA512 77eae1170a318d4a53550dda3462ae070d25656cda51db4cb2dbcb28210802f9b7e279900e6d6eba68314a0c814c90eb4af7acc561f611535cb364f75ad4e317
-DIST nix-0.22.3.crate 230252 BLAKE2B a65e42918c99f903a3f0b1cb64b7e4ded5ddf22aa4d4b7976938f166ab457fd5c0abd821060f7df777ca770254cc3018234a15ac4c00c6240cceb9ebb8c00430 SHA512 ee0c9c57f57ce7e723b32575e41ccce973af9fb290e314c7a1ed57c4c08dafc8500c81da34788a1c11e921e765098e074587c31498b5c0133b19530ce4a9cd28
 DIST nix-0.26.4.crate 279099 BLAKE2B 41debf1f21427ad6c25c6cd26b7867feb8ba46366028c4b74073307e902e526543f536fc0a66db2cdc5a52fbbf9166a6a4843aba57e5e5caada3d914286ddd60 SHA512 cc68ff8e3e8ea8635c6fd4c0a866cf42121aa3e25165666ef3b97b5b2c1d9273cba6f689e80eb812b55b5ee513390924a926d95fce45de0a74b98764dd1fa27d
 DIST nix-0.29.0.crate 318248 BLAKE2B 3a13a88375a359cf77b28d7f77f47f178bd31ef74b7627b6701bc6fc601024706be4e9ac1a076c7cba26b64d3bac4de17aab45fe3c045aa7a36e2d9232e872ca SHA512 86c05084aa0e6238f8d48df0f5ce6e6d7661b589f4f3fbdad43387c59c0d6afafea4badf25d31db1611615de19a0b9ef18ce614846b79a47cad4e2c9367dbe7f
 DIST normpath-1.3.0.crate 20719 BLAKE2B 6f7e91bd80a6fac14fbb72e304aecb6353b05a5e970d75899b8c40313b095f79463fa4cca1f7879c11d41e2437d499247c36915075b4190054f2f9a810e1e682 SHA512 a3cd341d1b4ead252f25a77e42165cd5a6b1459946ef55a5319558b89301e01e445f7cdafa13231836d336284798e48cd4e17632cba53a17213badbad3ce7a6f
@@ -205,9 +198,7 @@ DIST roff-0.2.2.crate 11648 BLAKE2B 38431e1dbfe394274c09e32a9f4c99f7e208130efd17
 DIST roxmltree-0.18.1.crate 43040 BLAKE2B 3b27385805466363d082dba273f35a975d1b2f02842f150a91cb94f86b478bb220a1824150d3650677af069e225f0498f90733e9c2462b7614fde382c78366fa SHA512 36409eb077bb3b26663096ad6457338f124eaad7bfb11de08d57bf44eef0653736d234a9bf8ed6d49ea357741d775e0f01bea931b298aa4445a086d58bcea937
 DIST roxmltree-0.20.0.crate 54594 BLAKE2B 9605ca407af248c71e0d2bc24d213aa6ff08a14eb548b85de16de7e172a617cdf12c2e4c686f6dd1c80455448a313f6e7d760885f189ae726934efbe06fb5603 SHA512 f8a934d3809e417c43bca53478cef0a7a18d908620175c84cfa2cdb8c85775b52cc641fb7eb12c80c483e0c17eb500dd3358ace858aceaa810d3ddbdef902d91
 DIST rusqlite-0.31.0.crate 152252 BLAKE2B 5ef8396ab6ee9f6887466e7ff856c6260f40ef85361ca451e230d8590019d6ffa4952df15abd21cf300cf51da4a6ea4e82f5dc88dfba474f2f62036cee76caa3 SHA512 6d20b015ab72d3d75c363111c0cb41feae8bff83104ebdfcb8e5efc1bfb63eb48a17f6de2e6c96cb1e916b4795fea6d58466ab0820b151b12d1dc4c29800ba66
-DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustc-hash-2.0.0.crate 12691 BLAKE2B b6a619f681e897c8a9167bb88d6ba78715010ac6c1ef9a7a9e115fe8aab10fcd9d4f5e1893e89a36a59118819dbf67de3d261a190fe37948137f097bc99b3fd2 SHA512 996ad683db2e6839ee28fdc4a31293aecce7baefaf6051220a633a00beddef1be41aef0995d7501e5b92dbc85350ced920bc980d05f5ba235e9a5d1a13464339
-DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
 DIST rustix-0.38.37.crate 371243 BLAKE2B bceaa4861747208f1f2b68f8924c7247648d88deb200e97d8ed17c5cbf9c934488065f0ee7e4406bc96e8709b292ee1fe15beb346bff57b5f05af36174420a0c SHA512 6c0ad1be1fcf1b74f670b2c7599ba68c2ce834c760ff7486674d190ae0d552165b0c2abdc35b13eee8c0333a904c67f5dd1efa742c20fd3735c7ccdf2a439619
 DIST rustybuzz-0.10.0.crate 240016 BLAKE2B d2355c49eb98a71f40f0c11b2a932fa28f82fdc1ee6aa70c8a425235a042490bd9db30f059dd41e78bd82c96dc08e9e5e2db00cc6a26ae12d3bb5dfa5d4a428b SHA512 04c0028099b411fc88cdd3f513c898d3609f4ddc3dbac9a067374e6301dbc0c0eb6f58ba9834183d61f4d11974a9e07c566a9bdf23cced26bd4da56de451ad42
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
@@ -242,10 +233,8 @@ DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e
 DIST syn-2.0.74.crate 267998 BLAKE2B f47aa22011b42038a1db1486822335b7c2c2453de04ccd881ade8c17bab192667977b689925c36b3c579bf2086d516f2b26f48e81cdce22ed8798e2664195119 SHA512 c0b602d9ba5342aec609e67a3ecabfaf49cc81be86fb0cc8e576c1a882b36678de5b139fb41981f437fa49012c6493ab0f68a528910a10a3a86c98a22451aa93
 DIST syntect-no-panic-4.6.1.crate 732925 BLAKE2B c93d1a0c3ad61c4c091968b5c0330221d26954bc21a298157cc97a583a89805dde00461dc226a417d2e72260e345789632929ccfdf4312bbccbc3064e8e7330a SHA512 34ada6c0678f355f6addac480cfec5effcea76ea8330cd9448dda5886d6e117d3af288a169825eb4e846bdf4a96986abe406def4b8e9da17ead11c5a28ae5ffc
 DIST tempfile-3.12.0.crate 34423 BLAKE2B a8b84f54a54be636f5b69791ca567e8b692d6a8485ef37e5a8340d26b32b1b0f9f8e9fcd9a2da90ec2fbd39c281d364dfc5723d06892832edb79ea5cf45d069c SHA512 1a27513548060984be894e6f8fc215831e4b2054b2244c6188bee76c477c001f294c762f2f4a14488c58c04e5d1473806d589c7bba1eaa2cc02d97656709be66
-DIST termimad-0.30.0.crate 442191 BLAKE2B b4077b8a90e07fad02076096c0b039f31e5e02c51c208632f66eb77e94df5b0ca6eaa0dfff2f91c004120a98f23db9c5358081ae754eb30ed985fbe6b7b63212 SHA512 7fb172d1a9f44e04190ad7b67ff6cdb94f528cf3dbd1e832152b6e30fa1597066bd7765c0283fe66459edf4938d6833c4969e268845a0b02c622dee5f0e2e94a
 DIST termimad-0.30.1.crate 442428 BLAKE2B 279ec9ce4ef8fc5ec290ad23ee992842cf4e563653c8d89c6faba6893ad7f48c0c4a63de0d2b5321001f0ee20ea4c360040f63e0ea054b3a59449abf58ae1478 SHA512 9c29966522ba20d4a65185d16bc93eb5a45b4054324e118401ff0e448d0206573031f3d4d1408906a815b4bedbb7699dd7446e4b8ed8e3fc318c696a8dff07c4
 DIST terminal-clipboard-0.4.1.crate 8043 BLAKE2B 3d1380df326081cb72034b9d5a1f946aec5e874385fa0c50dd2b9a6dd7e0a5ac07b5faf533b4aa45fd58567e2582153242e4b44f4501dcfea06670b4229127a0 SHA512 c856038b79e6e0c77fe69133e4e7bb80178459d192059885a7841fbb972d1fde1846a2bdd83703e70650f7c0a09f629d0bd169df5512b61449bf1fbb19a2f60d
-DIST terminal-light-1.5.0.crate 39651 BLAKE2B 5da31fc467b506b91360c6483ca65215597fca27ecd5d9d380b735354850b21f048c42cdc9886e1b23893ff17c7d0f4a0074a502b91e0fce6b3cc8ed7fe1d8d2 SHA512 4b89f0977051c3caccdff9996af69b2145ad60b4c0c267d47076aa1c3d4c2f76f70d1badcbbb75ab05ed6d1ea730d26f8e207ae7ca84f2886a7dce2371050a1b
 DIST terminal-light-1.7.0.crate 39658 BLAKE2B 0cf0079b77b70aaf75230b54c7f4849db4f82774cd810c6a71dff5bb6f53c8e9228e382f9e851e0940895219af3d3269722317988f5db690e02c2ee7736b6953 SHA512 53ec358e95cd6eb9edd704a58196778a0dd85b13ac98f4904b0dcad4c8cd44fff9f19999044746e72295516508c7083587ce856ea2a29352f36afc43ac45fff3
 DIST termux-clipboard-0.1.0.crate 2033 BLAKE2B 33003b25e6236370b2423472e87deaac8ee282c375e02faa3575aaec7ef547674f0218a50f0a2d42ff75dcf088ef31d94f44c4b05c0f526dddbaef2e06a8c722 SHA512 acd972d9c9eaa20dfadf1ec01274ed27fb33d16d97b504d8f41fea9c6598557a32d939d0a8a8585d919ee9d1b411d714851d662b5bc7d1a5f3b97d8cd423a434
 DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
@@ -279,7 +268,6 @@ DIST usvg-parser-0.36.0.crate 64951 BLAKE2B 922bbcfd52bdd473534dd19b0d657e75991c
 DIST usvg-text-layout-0.36.0.crate 21691 BLAKE2B cb59fe1256de92f9b2a52f8d9f1417f28fad09f2a2e0aa701ac1b829498bf2c32f2cf4cf5e31cef963fa9ad6e1855d18c3b603710bbfc556c681c7916c43b5be SHA512 c8fbcaf34c4e4a74726a5aba69d43621770cec92c4e65e3298615987652e0447e2b7d0c87524a4934afd6d50ae6cffbfd59c3eb27e43f4f72c473c3fe3e7040d
 DIST usvg-tree-0.36.0.crate 20092 BLAKE2B fd6ff13ca882effdc5dbe881165a3d19a1fd76ffe40909144aa1285da03a7ca2587433a3f1d176f230a9f7ebc40260da5ca970f3f1bb99fda955506cca455ad3 SHA512 72225099e6a51909714aacfea69a6178f2bdd09d532881e0d1244e083b3e4d59a91fdb60d67caeadef61b31ca71a5c993a745add8dc56305f140adfd1805bebb
 DIST utf8parse-0.2.2.crate 13499 BLAKE2B 095b5d219ab8ff04c06fd6303e03d913ae36a57845f0b2ca3217a40e31a54cb0fb5ecedbde165d28f5f60f1553d8252986d7098fa83befc84a7cb20bf3b76144 SHA512 f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266
-DIST uzers-0.11.3.crate 22745 BLAKE2B 59a64624c1a59dff483e28f1b80499191c9a860dcb00e4f27c5c39942ba5a1ec6a4fbe98bb585fca079f4594a57fb24db41675e1aac87fb4873e6056ef13c98f SHA512 3a4eb2d2479550bb34319d2d3841f1e4a5b024dd85193ce127a90479b3d801880d9d3624caa265aaaf9908c7dea73fd7da5780c12c2984db3db04ce45668d97d
 DIST uzers-0.12.1.crate 29272 BLAKE2B 1a79446814c636702a8845291c8f0add0a0a6b468de8e07a7d8fc5bc3098490e48125abc809c0f44a9e47c9becb4806e29dcf390a6311f952de35a886b85d721 SHA512 93c4160bfcbdca57a3c945b73a94d1ba8612e0258950f7c10307dd57c838a0664890cbe34a98649c18fb783744423a7fd240da8b5eabe1e660a533e9b32f6260
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST version_check-0.9.5.crate 15554 BLAKE2B 131e75cc287518831e142430e2a39b48e4275874f4473780d47a27552294097aa1cddb65c385583e1022478f940b495eb43c24a8b1617b8ac5a24af3340c0d72 SHA512 d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db
@@ -333,8 +321,6 @@ DIST x11rb-0.12.0.crate 218514 BLAKE2B a067d012cf2aa5e7a20a11270fa1101bf6a2464bb
 DIST x11rb-protocol-0.12.0.crate 478311 BLAKE2B f00f66053ef81d664a6f8bd083bd91ebe5c607b9190e9e7259bfd6f4b2920dbc05c0b85267a1cf878d0f43cd4b11fc5e45233744c18b5aeea02dad6d04445479 SHA512 3ef8a79a98f428e82b250c2162357f9965618aa3d9b92e37521e42de884d7b71fd7de51c56ba117f0cced674151c9bc6451dc919326ddea362b4e44f839ae492
 DIST xmlparser-0.13.6.crate 26718 BLAKE2B 40796a610755a10de4f435c36e251093719321d9ddaa2f994640e37a48ab8a61742f3b5e031b6ef08de3327fb6acf1b19c2afd0ea80edb66ea5963a41e03b47b SHA512 25a42844c015aed196bdb35c99008d656137c6eab2194f274840e8f93ad382e5291768f138ffbe809bd07900e80f939b5755517cd51340ab8142b9b5b4d72db1
 DIST xmlwriter-0.1.0.crate 6261 BLAKE2B daaeac50ff4f0ec71dfe5e6292a895f8f33ae8dfcb40f6df46a47a5b866c4d69f4aee5c48a1a84d3c7ccafe768a438d177bc9b4bb4b5b0d5194e67b106575615 SHA512 a0d8bfe6e3d220358e8523212cddb84541e9d8208b2aea64a89037e4e9f4de62a7b549c9f1bacbd71e14de16707f061e547d89ba459843be45fa802db297fd58
-DIST xterm-query-0.3.0.crate 6549 BLAKE2B 2413af69ec551b797cf34832bc9d28d67189d2a65239469ffa0cafb8f737120875c94a2e297647d562f8a03571e326f310e1e736c8e13c9945fdcf428c539032 SHA512 0ab4b696e3f2ca30b7b34fb7a36f16b00933c1559818a6145a3e6f3940fe0070d1b4f9fefd7eba01ca0431c574fe0e128123af2a01fcafe2b66cc38703510259
-DIST xterm-query-0.4.1.crate 6153 BLAKE2B 9a7f519d1ce5967a01afbcb32df904dafac66efaade4cedefbd02829f99eaf1a0767e9826ea89772f407e12eb9d5cdb04e3c552bb3d469e6b30b62a8a18edf44 SHA512 accbc4b46fd1a5bbe366f5a8a2ea057ec4d13a0715be9678ec120a50e0309b4d4c69cfb0e0d0501904bddd7882e77301df2e7bdb841a0ad57d41750d838633a6
 DIST xterm-query-0.5.0.crate 6899 BLAKE2B 8d7eff2cf336c9e79fabcfbc977a119ecc3e1e60388b64c8988251989ddf3b4f97c34fffc2b6458f0f648ae2fedeff6d6a0e819bca18175593b36ee76eed2a8a SHA512 78fed63eb833f2a88fce3ef154b31d34970d2ecfc6f53443ff6b7cc138a3793ee762851dc704e6adbd3e42821685165be499b22ee15953a652c476d781a1a3a2
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 DIST zerocopy-0.7.35.crate 152645 BLAKE2B 8f13123c9d9257ac5a5c6954d38c3510fa658624442f7e03cdcc6db5a0977d9f26bb4e277be172b7872ec365cf6e58ac742e5578636f7698f9f37093e9249d9a SHA512 17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c
diff --git a/app-misc/broot/broot-1.42.0-r1.ebuild b/app-misc/broot/broot-1.42.0-r1.ebuild
deleted file mode 100644
index 15532af1196f..000000000000
--- a/app-misc/broot/broot-1.42.0-r1.ebuild
+++ /dev/null
@@ -1,389 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-adler@1.0.2
-ahash@0.8.11
-aho-corasick@1.1.3
-android-tzdata@0.1.1
-android_system_properties@0.1.5
-ansi_colours@1.2.3
-anstream@0.6.15
-anstyle@1.0.8
-anstyle-parse@0.2.5
-anstyle-query@1.1.1
-anstyle-wincon@3.0.4
-anyhow@1.0.86
-argh@0.1.12
-argh_derive@0.1.12
-argh_shared@0.1.12
-arrayref@0.3.8
-arrayvec@0.7.4
-autocfg@1.3.0
-base64@0.13.1
-base64@0.21.7
-base64@0.22.1
-bet@1.0.3
-bincode@1.3.3
-bit_field@0.10.2
-bitflags@1.3.2
-bitflags@2.6.0
-block@0.1.6
-bstr@1.10.0
-bumpalo@3.16.0
-bytemuck@1.16.3
-byteorder@1.5.0
-cc@1.1.12
-cfg-if@1.0.0
-cfg_aliases@0.2.1
-char_reader@0.1.1
-chrono@0.4.38
-clap@4.5.15
-clap-help@1.3.0
-clap_builder@4.5.15
-clap_complete@4.5.16
-clap_derive@4.5.13
-clap_lex@0.7.2
-clap_mangen@0.2.23
-cli-log@2.0.0
-clipboard-win@4.5.0
-clipboard_macos@0.1.0
-color_quant@1.1.0
-colorchoice@1.0.2
-coolor@1.0.0
-core-foundation-sys@0.8.7
-crc32fast@1.4.2
-crokey@1.1.0
-crokey-proc_macros@1.1.0
-crossbeam@0.8.4
-crossbeam-channel@0.5.13
-crossbeam-deque@0.8.5
-crossbeam-epoch@0.9.18
-crossbeam-queue@0.3.11
-crossbeam-utils@0.8.20
-crossterm@0.28.1
-crossterm_winapi@0.9.1
-crunchy@0.2.2
-csv@1.3.0
-csv-core@0.1.11
-csv2svg@0.2.3
-custom_error@1.9.2
-data-url@0.3.1
-deranged@0.3.11
-deser-hjson@2.2.4
-directories@4.0.1
-directories@5.0.1
-dirs-sys@0.3.7
-dirs-sys@0.4.1
-doc-comment@0.3.3
-either@1.13.0
-equivalent@1.0.1
-errno@0.3.9
-error-code@2.3.1
-exr@1.72.0
-fallible-iterator@0.3.0
-fallible-streaming-iterator@0.1.9
-fastrand@2.1.0
-fdeflate@0.3.4
-file-size@1.0.3
-flate2@1.0.31
-float-cmp@0.9.0
-flume@0.11.0
-fnv@1.0.7
-fontconfig-parser@0.5.7
-fontdb@0.15.0
-form_urlencoded@1.2.1
-gethostname@0.3.0
-getrandom@0.2.15
-gif@0.12.0
-gif@0.13.1
-git2@0.19.0
-glassbench@0.4.3
-glob@0.3.1
-half@2.4.1
-hashbrown@0.14.5
-hashlink@0.9.1
-heck@0.4.1
-heck@0.5.0
-hermit-abi@0.3.9
-home@0.5.9
-iana-time-zone@0.1.60
-iana-time-zone-haiku@0.1.2
-id-arena@2.2.1
-idna@0.5.0
-image@0.24.9
-imagesize@0.12.0
-include_dir@0.7.4
-include_dir_macros@0.7.4
-indexmap@2.4.0
-is_executable@1.0.1
-is_terminal_polyfill@1.70.1
-itoa@1.0.11
-jobserver@0.1.32
-jpeg-decoder@0.3.1
-js-sys@0.3.70
-kurbo@0.9.5
-lazy-regex@3.2.0
-lazy-regex-proc_macros@3.2.0
-lazy_static@1.5.0
-lebe@0.5.2
-lfs-core@0.11.2
-libc@0.2.155
-libgit2-sys@0.17.0+1.8.1
-libredox@0.1.3
-libsqlite3-sys@0.28.0
-libz-sys@1.1.19
-linked-hash-map@0.5.6
-linux-raw-sys@0.4.14
-lock_api@0.4.12
-log@0.4.22
-malloc_buf@0.0.6
-memchr@2.7.4
-memmap2@0.8.0
-memmap2@0.9.4
-memoffset@0.6.5
-memoffset@0.7.1
-minimad@0.13.1
-miniz_oxide@0.7.4
-mio@0.8.11
-mio@1.0.2
-nix@0.22.3
-nix@0.26.4
-nix@0.29.0
-normpath@1.3.0
-num-conv@0.1.0
-num-traits@0.2.19
-objc@0.2.7
-objc-foundation@0.1.1
-objc_id@0.1.1
-once_cell@1.19.0
-onig@6.4.0
-onig_sys@69.8.1
-open@1.7.1
-opener@0.6.1
-option-ext@0.2.0
-parking_lot@0.12.3
-parking_lot_core@0.9.10
-pathdiff@0.2.1
-percent-encoding@2.3.1
-phf@0.11.2
-phf_generator@0.11.2
-phf_macros@0.11.2
-phf_shared@0.11.2
-pico-args@0.5.0
-pkg-config@0.3.30
-plist@1.7.0
-png@0.17.13
-powerfmt@0.2.0
-proc-macro2@1.0.86
-proc-status@0.1.1
-qoi@0.4.1
-quick-xml@0.32.0
-quote@1.0.36
-rand@0.8.5
-rand_core@0.6.4
-rayon@1.10.0
-rayon-core@1.12.1
-rctree@0.5.0
-redox_syscall@0.5.3
-redox_users@0.4.5
-regex@1.10.6
-regex-automata@0.4.7
-regex-syntax@0.6.29
-regex-syntax@0.8.4
-resvg@0.36.0
-rgb@0.8.48
-roff@0.2.2
-roxmltree@0.18.1
-roxmltree@0.20.0
-rusqlite@0.31.0
-rustc-hash@1.1.0
-rustix@0.38.34
-rustybuzz@0.10.0
-ryu@1.0.18
-same-file@1.0.6
-scopeguard@1.2.0
-secular@1.0.1
-serde@1.0.207
-serde_derive@1.0.207
-serde_json@1.0.125
-serde_spanned@0.6.7
-shlex@1.3.0
-signal-hook@0.3.17
-signal-hook-mio@0.2.4
-signal-hook-registry@1.4.2
-simd-adler32@0.3.7
-simplecss@0.2.1
-siphasher@0.3.11
-slotmap@1.0.7
-smallvec@1.13.2
-snafu@0.7.5
-snafu-derive@0.7.5
-spin@0.9.8
-splitty@1.0.2
-str-buf@1.0.6
-strict@0.1.4
-strict@0.2.0
-strict-num@0.1.1
-strsim@0.11.1
-svg@0.16.0
-svgtypes@0.12.0
-syn@1.0.109
-syn@2.0.74
-syntect-no-panic@4.6.1
-tempfile@3.12.0
-termimad@0.30.0
-terminal-clipboard@0.4.1
-terminal-light@1.5.0
-termux-clipboard@0.1.0
-thiserror@1.0.63
-thiserror-impl@1.0.63
-tiff@0.9.1
-time@0.3.36
-time-core@0.1.2
-time-macros@0.2.18
-tiny-skia@0.11.4
-tiny-skia-path@0.11.4
-tinyvec@1.8.0
-tinyvec_macros@0.1.1
-toml@0.8.19
-toml_datetime@0.6.8
-toml_edit@0.22.20
-trash@3.3.1
-ttf-parser@0.19.2
-umask@2.1.0
-unicode-bidi@0.3.15
-unicode-bidi-mirroring@0.1.0
-unicode-ccc@0.1.2
-unicode-ident@1.0.12
-unicode-normalization@0.1.23
-unicode-properties@0.1.1
-unicode-script@0.5.6
-unicode-vo@0.1.0
-unicode-width@0.1.13
-url@2.5.2
-usvg@0.36.0
-usvg-parser@0.36.0
-usvg-text-layout@0.36.0
-usvg-tree@0.36.0
-utf8parse@0.2.2
-uzers@0.11.3
-vcpkg@0.2.15
-version_check@0.9.5
-walkdir@2.5.0
-wasi@0.11.0+wasi-snapshot-preview1
-wasm-bindgen@0.2.93
-wasm-bindgen-backend@0.2.93
-wasm-bindgen-macro@0.2.93
-wasm-bindgen-macro-support@0.2.93
-wasm-bindgen-shared@0.2.93
-weezl@0.1.8
-which@4.4.2
-winapi@0.3.9
-winapi-i686-pc-windows-gnu@0.4.0
-winapi-util@0.1.9
-winapi-wsapoll@0.1.2
-winapi-x86_64-pc-windows-gnu@0.4.0
-windows@0.44.0
-windows-core@0.52.0
-windows-sys@0.48.0
-windows-sys@0.52.0
-windows-sys@0.59.0
-windows-targets@0.42.2
-windows-targets@0.48.5
-windows-targets@0.52.6
-windows_aarch64_gnullvm@0.42.2
-windows_aarch64_gnullvm@0.48.5
-windows_aarch64_gnullvm@0.52.6
-windows_aarch64_msvc@0.42.2
-windows_aarch64_msvc@0.48.5
-windows_aarch64_msvc@0.52.6
-windows_i686_gnu@0.42.2
-windows_i686_gnu@0.48.5
-windows_i686_gnu@0.52.6
-windows_i686_gnullvm@0.52.6
-windows_i686_msvc@0.42.2
-windows_i686_msvc@0.48.5
-windows_i686_msvc@0.52.6
-windows_x86_64_gnu@0.42.2
-windows_x86_64_gnu@0.48.5
-windows_x86_64_gnu@0.52.6
-windows_x86_64_gnullvm@0.42.2
-windows_x86_64_gnullvm@0.48.5
-windows_x86_64_gnullvm@0.52.6
-windows_x86_64_msvc@0.42.2
-windows_x86_64_msvc@0.48.5
-windows_x86_64_msvc@0.52.6
-winnow@0.6.18
-x11-clipboard@0.8.1
-x11rb@0.12.0
-x11rb-protocol@0.12.0
-xmlparser@0.13.6
-xmlwriter@0.1.0
-xterm-query@0.3.0
-xterm-query@0.4.1
-yaml-rust@0.4.5
-zerocopy@0.7.35
-zerocopy-derive@0.7.35
-zune-inflate@0.2.54
-"
-
-RUST_MIN_VER="1.77.1"
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="A new way to see and navigate directory trees"
-HOMEPAGE="https://dystroy.org/broot/ https://github.com/Canop/broot"
-SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${CARGO_CRATE_URIS}"
-
-LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="X"
-
-RDEPEND="
-	dev-libs/libgit2:=
-	sys-libs/zlib
-	X? ( x11-libs/libxcb:= )
-"
-DEPEND="${RDEPEND}"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_configure() {
-	export RUSTFLAGS="-Cstrip=none ${RUSTFLAGS}" #835400
-	local myfeatures=( $(usev X clipboard) trash )
-
-	cargo_src_configure --no-default-features
-}
-
-src_prepare() {
-	default
-
-	local mandate=$(date -r man/page +'%Y/%m/%d' || die)
-	sed -e "s|#version|${PV}|" \
-		-e "s|#date|${mandate}|" \
-		man/page > "${T}"/${PN}.1 || die
-}
-
-src_install() {
-	cargo_src_install
-
-	doman "${T}"/${PN}.1
-
-	local build_dir=( "$(cargo_target_dir)"/build/${PN}-*/out )
-	cd ${build_dir[0]} || die
-
-	newbashcomp ${PN}.bash ${PN}
-	newbashcomp br.bash br
-
-	insinto /usr/share/zsh/site-functions
-	doins _${PN}
-	doins _br
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-	doins br.fish
-}
diff --git a/app-misc/broot/broot-1.44.2.ebuild b/app-misc/broot/broot-1.44.2.ebuild
index 3b6f6c4bbab3..bd1899d23171 100644
--- a/app-misc/broot/broot-1.44.2.ebuild
+++ b/app-misc/broot/broot-1.44.2.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
@@ -341,7 +341,7 @@ SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="X"
 
 RDEPEND="
diff --git a/app-misc/broot/broot-1.44.6.ebuild b/app-misc/broot/broot-1.44.6.ebuild
new file mode 100644
index 000000000000..2603e085c113
--- /dev/null
+++ b/app-misc/broot/broot-1.44.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=""
+RUST_MIN_VER="1.79.0"
+inherit cargo shell-completion
+
+DESCRIPTION="A new way to see and navigate directory trees"
+HOMEPAGE="https://dystroy.org/broot/ https://github.com/Canop/broot"
+SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}"
+SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/app-misc/${PN}/${P}-crates.tar.xz"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0
+	LGPL-3+ MIT MPL-2.0 Unicode-3.0 ZLIB
+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X"
+
+RDEPEND="
+	dev-libs/libgit2:=
+	sys-libs/zlib
+	X? ( x11-libs/libxcb:= )
+"
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_prepare() {
+	default
+
+	local mandate=$(date -r man/page +'%Y/%m/%d' || die)
+	sed -e "s|#version|${PV}|" \
+		-e "s|#date|${mandate}|" \
+		man/page > "${T}"/${PN}.1 || die
+}
+
+src_configure() {
+	export RUSTFLAGS="-Cstrip=none ${RUSTFLAGS}" #835400
+	local myfeatures=( $(usev X clipboard) trash )
+
+	cargo_src_configure --no-default-features
+}
+
+src_install() {
+	cargo_src_install
+
+	doman "${T}"/${PN}.1
+
+	local build_dir=( "$(cargo_target_dir)"/build/${PN}-*/out )
+	cd ${build_dir[0]} || die
+
+	newbashcomp ${PN}.bash ${PN}
+	newbashcomp br.bash br
+
+	dozshcomp _${PN} _br
+	dofishcomp ${PN}.fish br.fish
+}
diff --git a/app-misc/dateutils/Manifest b/app-misc/dateutils/Manifest
index edfdc3dbca37..31ee987f1cc0 100644
--- a/app-misc/dateutils/Manifest
+++ b/app-misc/dateutils/Manifest
@@ -1,2 +1 @@
 DIST dateutils-0.4.10.tar.xz 652548 BLAKE2B b1fe3b07edfd223c9265df99888bf2edc37458b487b0f3b913f4c19e23b86d4a7f8cb3f0610bf140e6ce0233a9008ccd26cbe0b1462c5f85b2424cd39ffcbdb7 SHA512 04a9fff177596bb9bc47d3b221865bbeafeafbc708385610845a1cdcb2a7fa379e8d9363cce578836ae121dab7ee64e19f61d82e8f222250e52d23c5f43cf521
-DIST dateutils-0.4.9.tar.xz 651024 BLAKE2B 9b9bab5f990689a367fa574c20113c01f4847cdcced47275b992655cb91cd14076c22e2d550a969c20ef979b63156c72a485c42105022e522dce4d1376aa0393 SHA512 b5cda838f8fa01e4208e11842f835503357c02b4a21b003db08ef88763a65f26ad2cd6f5d71c80b499d4e5ee5c0b4e552469ef91aa6cd02ebe5c5d2ad6e3105e
diff --git a/app-misc/dateutils/dateutils-0.4.10.ebuild b/app-misc/dateutils/dateutils-0.4.10.ebuild
index 3191e93aa50f..58b1ee2c92ef 100644
--- a/app-misc/dateutils/dateutils-0.4.10.ebuild
+++ b/app-misc/dateutils/dateutils-0.4.10.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 @@ case "${PV}" in
 		;;
 	*)
 		SRC_URI="https://github.com/hroptatyr/dateutils/releases/download/v${PV}/${P}.tar.xz"
-		KEYWORDS="~amd64 x86"
+		KEYWORDS="amd64 x86"
 esac
 
 LICENSE="BSD"
diff --git a/app-misc/dateutils/dateutils-0.4.9.ebuild b/app-misc/dateutils/dateutils-0.4.9.ebuild
deleted file mode 100644
index 69d0857f63a4..000000000000
--- a/app-misc/dateutils/dateutils-0.4.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command line date and time utilities"
-HOMEPAGE="https://www.fresse.org/dateutils/ https://github.com/hroptatyr/dateutils"
-
-case "${PV}" in
-	9999)
-		inherit autotools git-r3
-		EGIT_REPO_URI="https://github.com/hroptatyr/dateutils.git"
-		;;
-	*)
-		SRC_URI="https://github.com/hroptatyr/dateutils/releases/download/v${PV}/${P}.tar.xz"
-		KEYWORDS="amd64 x86"
-esac
-
-LICENSE="BSD"
-SLOT="0"
-
-BDEPEND="app-arch/xz-utils"
-DEPEND="sys-libs/timezone-data"
-
-# bug 429810
-RDEPEND="${DEPEND}
-	!sys-fabric/dapl"
-
-src_prepare() {
-	default
-	[[ "${PV}" = 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf CFLAGS="${CFLAGS}"
-}
diff --git a/app-misc/dateutils/dateutils-9999.ebuild b/app-misc/dateutils/dateutils-9999.ebuild
deleted file mode 100644
index 7c1baaa588b0..000000000000
--- a/app-misc/dateutils/dateutils-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command line date and time utilities"
-HOMEPAGE="https://www.fresse.org/dateutils/ https://github.com/hroptatyr/dateutils"
-
-case "${PV}" in
-	9999)
-		inherit autotools git-r3
-		EGIT_REPO_URI="https://github.com/hroptatyr/dateutils.git"
-		;;
-	*)
-		SRC_URI="https://github.com/hroptatyr/dateutils/releases/download/v${PV}/${P}.tar.xz"
-		KEYWORDS="~amd64 ~x86"
-esac
-
-LICENSE="BSD"
-SLOT="0"
-
-BDEPEND="app-arch/xz-utils"
-DEPEND="sys-libs/timezone-data"
-
-# bug 429810
-RDEPEND="${DEPEND}
-	!sys-fabric/dapl"
-
-src_prepare() {
-	default
-	[[ "${PV}" = 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf CFLAGS="${CFLAGS}"
-}
diff --git a/app-misc/dateutils/metadata.xml b/app-misc/dateutils/metadata.xml
index 3e9ffe7cb21b..75ab11b68941 100644
--- a/app-misc/dateutils/metadata.xml
+++ b/app-misc/dateutils/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person" proxied="yes">
-        <email>coppens.matthias.abc@gmail.com</email>
-        <name>Matthias Coppens</name>
-    </maintainer>
-    <maintainer type="project" proxied="proxy">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
+    <!-- maintainer-needed -->
     <upstream>
         <maintainer>
             <name>Sebastian Freundt</name>
diff --git a/app-misc/datovka/Manifest b/app-misc/datovka/Manifest
index 973386920d3f..a5bdcde13697 100644
--- a/app-misc/datovka/Manifest
+++ b/app-misc/datovka/Manifest
@@ -1 +1 @@
-DIST datovka-4.23.7.tar.xz 3227396 BLAKE2B 3045c46e5c548eb04a81989ba351f4fe4ea3a4e78afa74e9ba7b88bc40352b60009b54b7f7bc83b97e5b749d51e3594d143b5cb8ecfcfcc781a12d326c9effec SHA512 c4cf1f473bf9c5b8b1aba9d2caa133bb10efa7c4cf1cfbf91e6f8fa32fc8da80faa6496cc87cf0bfefd0877f1ad0fea7efa17025082b4551d223e68c7e12b722
+DIST datovka-4.25.0.tar.xz 3789772 BLAKE2B a9388b2c8702b8f1bdf95e90f87bf438cc66200c50be36e355bafeb1357f010dde717aa6bf178c7fc75771eceda89050114d014e01e8e80c390f6f150983e1c6 SHA512 10d02de0b3c10e21fc4a1318fcb19c04ac059f4da0945d4cfea4d7a6ad1c31a960277956da1dd47b897a178765bc34814205916c7baca6751b8125dd3d26e62b
diff --git a/app-misc/datovka/datovka-4.23.7.ebuild b/app-misc/datovka/datovka-4.23.7.ebuild
deleted file mode 100644
index 332fd01af304..000000000000
--- a/app-misc/datovka/datovka-4.23.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="GUI to access the Czech data box e-government system"
-HOMEPAGE="https://www.datovka.cz/"
-SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# minimum Qt version required
-QT_PV="5.14.0:5"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:=
-	dev-libs/quazip:=[qt5(+)]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qtnetwork-${QT_PV}[ssl]
-	>=dev-qt/qtprintsupport-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}[sqlite]
-	>=dev-qt/qtsvg-${QT_PV}
-	>=dev-qt/qtwebsockets-${QT_PV}
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=app-misc/libdatovka-0.6.0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog README )
-
-src_configure() {
-	$(qt5_get_bindir)/lrelease datovka.pro || die
-	eqmake5 PREFIX="/usr" SYSTEM_LIBQUAZIP=1 DISABLE_VERSION_NOTIFICATION=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-misc/datovka/datovka-4.25.0.ebuild b/app-misc/datovka/datovka-4.25.0.ebuild
new file mode 100644
index 000000000000..cd9125be849e
--- /dev/null
+++ b/app-misc/datovka/datovka-4.25.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# minimum Qt version required
+QTMIN=6.7.2
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="GUI to access the Czech data box e-government system"
+HOMEPAGE="https://www.datovka.cz/cs/"
+SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-libs/openssl-1.1.1:=
+	>=dev-libs/quazip-1.4:=[qt6(+)]
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,sql,sqlite,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwebsockets-${QTMIN}:6
+	>=app-misc/libdatovka-0.7.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-qt/qttools-${QTMIN}:6[linguist]
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+	$(qt6_get_bindir)/lrelease datovka.pro || die
+	eqmake6 PREFIX="/usr" SYSTEM_LIBQUAZIP=1 DISABLE_VERSION_NOTIFICATION=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-misc/ddcui/Manifest b/app-misc/ddcui/Manifest
index 1bf36ecc1e93..ff761f3de967 100644
--- a/app-misc/ddcui/Manifest
+++ b/app-misc/ddcui/Manifest
@@ -1,2 +1 @@
-DIST ddcui-0.4.2.tar.gz 613765 BLAKE2B 2479570d9a79c298d8823c8a658c190e230ec83afc1b1deb9e3659e723c30bd0f2c1d55bc0aa5dcdf975adbab5792afd8ef5d350247eef5710cee4c99f4b56a6 SHA512 7f4339d292e42feb5912570be3b5629d61433a51bfdf0197deb10f8c0bc0e568dbc72f8e117c82dade30f01e3f00b5e805c4458e2bf9e6cc5932e33b7e7e51aa
 DIST ddcui-0.5.4.tar.gz 617279 BLAKE2B a8a4fe8ad938efdee4baed1f8d450cc9aa0e8687fbe35bc2f4593a2214413e1b00ad1ee9884f4ef1eaebc3d7173a6aa01b0ace1b0ee99afc7b06f83fffd06da1 SHA512 f6e044f99419e0841663034ee84c1ad038ed64f8287fd48bbe5ba19b1dea3b714e4952cb11e04a04548e7c31e476459554b75748b2c0f844ed7b68fa5bb543e6
diff --git a/app-misc/ddcui/ddcui-0.4.2.ebuild b/app-misc/ddcui/ddcui-0.4.2.ebuild
deleted file mode 100644
index 94f61da45cdd..000000000000
--- a/app-misc/ddcui/ddcui-0.4.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Check for bumps & cleanup with app-misc/ddcutil
-
-inherit cmake xdg
-
-DESCRIPTION="Graphical user interface for ddcutil - control monitor settings"
-HOMEPAGE="https://www.ddcutil.com/ddcui_main/"
-SRC_URI="https://github.com/rockowitz/ddcui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2+"
-SLOT="0"
-
-DEPEND="
-	dev-libs/glib
-	>=app-misc/ddcutil-2.0.0:0/5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.2-drop-qthelp-dep.patch"
-)
-
-src_prepare() {
-	# move docs to correct dir
-	sed -i -e "s%share/doc/ddcui%share/doc/${PF}%g" CMakeLists.txt || die
-	cmake_src_prepare
-}
diff --git a/app-misc/ddcui/ddcui-0.5.4-r1.ebuild b/app-misc/ddcui/ddcui-0.5.4-r1.ebuild
new file mode 100644
index 000000000000..0319174c3ebb
--- /dev/null
+++ b/app-misc/ddcui/ddcui-0.5.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2019-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Check for bumps & cleanup with app-misc/ddcutil
+
+inherit cmake xdg
+
+DESCRIPTION="Graphical user interface for ddcutil - control monitor settings"
+HOMEPAGE="https://www.ddcutil.com/ddcui_main/"
+SRC_URI="https://github.com/rockowitz/ddcui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-libs/glib
+	>=app-misc/ddcutil-2.1.3:0/5
+	>=dev-qt/qtbase-6.1:6[gui,widgets]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.3-drop-qthelp-dep.patch"
+	"${FILESDIR}/${PN}-0.5.4-qt6.patch"
+)
+
+src_prepare() {
+	# move docs to correct dir
+	sed -i -e "s%share/doc/ddcui%share/doc/${PF}%g" CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Not quite there yet, so force off
+		-DUSE_QT6=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/app-misc/ddcui/ddcui-0.5.4.ebuild b/app-misc/ddcui/ddcui-0.5.4.ebuild
deleted file mode 100644
index 9858454df36b..000000000000
--- a/app-misc/ddcui/ddcui-0.5.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Check for bumps & cleanup with app-misc/ddcutil
-
-inherit cmake xdg
-
-DESCRIPTION="Graphical user interface for ddcutil - control monitor settings"
-HOMEPAGE="https://www.ddcutil.com/ddcui_main/"
-SRC_URI="https://github.com/rockowitz/ddcui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2+"
-SLOT="0"
-
-DEPEND="
-	dev-libs/glib
-	>=app-misc/ddcutil-2.1.3:0/5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.5.3-drop-qthelp-dep.patch"
-)
-
-src_prepare() {
-	# move docs to correct dir
-	sed -i -e "s%share/doc/ddcui%share/doc/${PF}%g" CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Not quite there yet, so force off
-		-DUSE_QT6=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/app-misc/ddcui/files/ddcui-0.4.2-drop-qthelp-dep.patch b/app-misc/ddcui/files/ddcui-0.4.2-drop-qthelp-dep.patch
deleted file mode 100644
index d7552b323ba1..000000000000
--- a/app-misc/ddcui/files/ddcui-0.4.2-drop-qthelp-dep.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aa68d60..522c9f3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -98,12 +98,11 @@ message( ${VERBOSE} "  CMAKE_AUTORCC:           ${CMAKE_AUTORCC}")
- 
- set(QT5_LIBRARIES Qt5::Widgets )
- # Ensures all Qt componenets have same version: 
--find_package(Qt5 ${ddcui_qt_version} COMPONENTS Core Widgets Gui Help REQUIRED)
-+find_package(Qt5 ${ddcui_qt_version} COMPONENTS Core Widgets Gui REQUIRED)
- message( ${VERBOSE} "Qt directories:")
- message( ${VERBOSE} "  Qt5Widgets_INCLUDE_DIRS:  ${Qt5Widgets_INCLUDE_DIRS}" )
- message( ${VERBOSE} "  Qt5Core_INCLUDE_DIRS:     ${Qt5Core_INCLUDE_DIRS}"    )
- message( ${VERBOSE} "  Qt5Gui_INCLUDE_DIRS:      ${Qt5Gui_INCLUDE_DIRS}"     )
--message( ${VERBOSE} "  Qt5Help_INCLUDE_DIRS:     ${Qt5Help_INCLUDE_DIRS}"    )
- 
- find_package (PkgConfig REQUIRED )
- pkg_check_modules(GLIB2 REQUIRED glib-2.0>=${ddcui_glib_version})
-@@ -239,9 +238,9 @@ target_compile_options(ddcui PUBLIC "-fPIC" ${coverity_cflags})
- # add_compile_options(-Og -H V=1)
- 
- # redundant: ${Qt5Gui_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}. 
--#            ${Qt5Help_INCLUDE_DIRS} is a superset of them all 
- target_include_directories(ddcui SYSTEM PRIVATE
--                                 ${Qt5Help_INCLUDE_DIRS}
-+                                 ${Qt5Gui_INCLUDE_DIRS}
-+                                 ${Qt5Widgets_INCLUDE_DIRS}
-                                  ${GLIB2_INCLUDE_DIRS} 
-                                  ${DDCUTIL_INCLUDE_DIRS})
- 
diff --git a/app-misc/ddcui/files/ddcui-0.5.4-qt6.patch b/app-misc/ddcui/files/ddcui-0.5.4-qt6.patch
new file mode 100644
index 000000000000..efc363a17086
--- /dev/null
+++ b/app-misc/ddcui/files/ddcui-0.5.4-qt6.patch
@@ -0,0 +1,51 @@
+From d1773d3625388f4e56f0debabff3a3b6bd4100cb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= <luis.artur.pereira@gmail.com>
+Date: Tue, 15 Oct 2024 18:22:50 +0100
+Subject: [PATCH] Fixes a FTBFS using Qt6
+
+Also builds with Qt5.
+The use of "universal" headers allows source compatibility between Qt5 and
+Qt6.
+---
+ src/main/mainwindow.cpp  |  2 +-
+ src/main/mainwindow_ui.h | 14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/main/mainwindow.cpp b/src/main/mainwindow.cpp
+index fbf3fc5..4b42ea1 100644
+--- a/src/main/mainwindow.cpp
++++ b/src/main/mainwindow.cpp
+@@ -15,7 +15,7 @@
+ #include <QtGui/QKeyEvent>
+ #include <QtWidgets/QMessageBox>
+ #include <QtWidgets/QWidget>
+-#include <QtWidgets/QShortcut>     // 5.9
++#include <QShortcut>     // 5.9
+ 
+ #include <ddcutil_c_api.h>
+ #include <ddcutil_status_codes.h>
+diff --git a/src/main/mainwindow_ui.h b/src/main/mainwindow_ui.h
+index edd7d88..2665fe4 100644
+--- a/src/main/mainwindow_ui.h
++++ b/src/main/mainwindow_ui.h
+@@ -9,13 +9,13 @@
+ #include <iostream>
+ 
+ #include <QtGui/QFont>
+-#include <QtWidgets/QAction>
+-#include <QtWidgets/QApplication>
+-#include <QtWidgets/QMainWindow>
+-#include <QtWidgets/QMenuBar>
+-#include <QtWidgets/QStackedWidget>
+-#include <QtWidgets/QStatusBar>
+-#include <QtWidgets/QToolBar>
++#include <QAction>
++#include <QApplication>
++#include <QMainWindow>
++#include <QMenuBar>
++#include <QStackedWidget>
++#include <QStatusBar>
++#include <QToolBar>
+ #include <QtGui/QKeyEvent>
+ 
+ #include "base/ddcui_core.h"
diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index fe256b0543c7..df5f46a5a11c 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -1,6 +1,3 @@
-DIST ddcutil-1.2.2.tar.gz 803943 BLAKE2B 65cc5dc0d1ee85d1e2b6670f7c24508ab817c6eebdb596b5f6f70c7ff7b9257f12f70abfea2d735e23755e508d4829d4be6574ac16564d4d828e0b1153cf8afe SHA512 0329711e536cbcaee2efe6cf981a17181ab318846e9c6a82f2ceacc42691ba49c06df44a52d1f079568e9ccec588cc85d4de4adf19b6db83bebe4bb90ae29207
 DIST ddcutil-1.3.0.tar.gz 816789 BLAKE2B 1cb3b64961503416b85b792e1002ec67788f8cf7d622be1c4930808f99e16974ff57ed582d1d02a67580e3f4d92bef54b3669fd7378462bf4c98a3643d6786be SHA512 93d69958b2e1dcb66ad700712742536179383c93f2ec1f746b6a6c78adfd6daa861275208850cc807e0c16a11ea84904cb13ceef512ca76e1daa910410303d41
-DIST ddcutil-1.4.1.tar.gz 816782 BLAKE2B ebc8b8893fda9a1e5b278b198594619f7c26a309e15aab90d5f8c61da352c54173076c86ce4e9d9bdcad8857e8ee45500de0c28d5de073038c841caf12080e5f SHA512 e53820662c12cd3a91b1182e02ad74841238117c129e88c8bcdede42d4e0dec22a9c1ec37a7b1e1dd512f2cf7ef410e737d9fdba62d95ea48e5912e43e6d3857
 DIST ddcutil-1.4.5.tar.gz 817492 BLAKE2B b6442d9f7ec3687a3e75d9784dc9f62563f42c72c82a8a2ea24a392c3c4f186578c2c2f6592ba12c324568a20b7b25082acce9e7b753c41c1ac925d9d6de62dd SHA512 c355f104b60dbc3c893dea473d841181cfcaacd0cb2e97bc41ea829185c7ccdcff19ab19189ee572e7f2f6b41cbb2bd6c569ad3c09f6d645f9e342b7d1a5310f
-DIST ddcutil-2.0.0.tar.gz 882984 BLAKE2B 19f92ab7fb02130c84e029a8055fe85ea99b9bd2959ad3c86b698afba9a45844817c0828fd2ad3178b954493a12dc62e95815e2700a42d37c340f098ad9d3f16 SHA512 e1880cf0e3e724f6ac88f807a867a34f451422b58ce7d23bee7b2fc40b253ef8de13df7706749e0c8242fe5de6db8da91784d16fbf008bb5161732a598c3b9e7
 DIST ddcutil-2.1.4.tar.gz 924298 BLAKE2B d11c4daa6a6b4c5c694cf45fa3a76709bcacc8a63bbe7ea331bcf2dd45a7e99dcdf890d97a9515dda909e6a54ca90c30d966e0dd5437fdd0972232878c4de581 SHA512 8c352bfacc2a5cdd22b8d84f2facd58de6d425d0d3f98de543cf36a3e6b15aa10fc86e87780c82f872f0bf0db984e1cc800aaff914bafe4dbf17602e2a7caeb0
diff --git a/app-misc/ddcutil/ddcutil-1.2.2.ebuild b/app-misc/ddcutil/ddcutil-1.2.2.ebuild
deleted file mode 100644
index 2286e15815e9..000000000000
--- a/app-misc/ddcutil/ddcutil-1.2.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Check for bumps & cleanup with app-misc/ddcui
-
-inherit autotools linux-info udev
-
-DESCRIPTION="Program for querying and changing monitor settings"
-HOMEPAGE="https://www.ddcutil.com/"
-SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="drm introspection usb-monitor user-permissions video_cards_nvidia X"
-REQUIRED_USE="drm? ( X )"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-apps/i2c-tools
-	virtual/udev
-	drm? ( x11-libs/libdrm )
-	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
-	usb-monitor? (
-		dev-libs/hidapi
-		virtual/libusb:1
-		sys-apps/usbutils
-	)
-	user-permissions? (
-		acct-group/i2c
-		usb-monitor? ( acct-group/video )
-	)
-	X? (
-		x11-libs/libXrandr
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.2-no-werror.patch
-)
-
-pkg_pretend() {
-	# This program needs /dev/ic2-* devices to communicate with the monitor.
-	CONFIG_CHECK="~I2C_CHARDEV"
-	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
-	if use usb-monitor; then
-		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
-		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
-		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
-	fi
-
-	# Now do the actual checks setup above
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable drm)
-		$(use_enable usb-monitor usb)
-		$(use_enable X x11)
-		--enable-lib
-		$(use_enable introspection)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if use user-permissions; then
-		udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
-		if use usb-monitor; then
-			udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use user-permissions; then
-		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
-		einfo "users to the i2c group: usermod -aG i2c user"
-		einfo "Restart the computer or reload the i2c-dev module to activate"
-		einfo "the new udev rule."
-		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
-
-		if use usb-monitor; then
-			einfo "To allow non-root users access to USB monitors, add those users"
-			einfo "to the video group: usermod -aG video user"
-			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
-			einfo "the monitor to activate the new udev rule."
-			einfo "For more information read: http://www.ddcutil.com/usb/"
-		fi
-
-		udev_reload
-	fi
-
-	if use video_cards_nvidia; then
-		ewarn "Please read the following webpage on proper usage with the nVidia "
-		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
-	fi
-}
diff --git a/app-misc/ddcutil/ddcutil-1.4.1.ebuild b/app-misc/ddcutil/ddcutil-1.4.1.ebuild
deleted file mode 100644
index abfe0f0ce127..000000000000
--- a/app-misc/ddcutil/ddcutil-1.4.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Check for bumps & cleanup with app-misc/ddcui
-
-inherit autotools linux-info udev
-
-DESCRIPTION="Program for querying and changing monitor settings"
-HOMEPAGE="https://www.ddcutil.com/"
-SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/4"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
-REQUIRED_USE="drm? ( X )"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-apps/i2c-tools
-	virtual/udev
-	drm? ( x11-libs/libdrm )
-	usb-monitor? (
-		dev-libs/hidapi
-		virtual/libusb:1
-		sys-apps/usbutils
-	)
-	user-permissions? (
-		acct-group/i2c
-		usb-monitor? ( acct-group/video )
-	)
-	X? (
-		x11-libs/libXrandr
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-# doc? ( app-text/doxygen[dot] )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-werror.patch
-)
-
-pkg_pretend() {
-	# This program needs /dev/ic2-* devices to communicate with the monitor.
-	CONFIG_CHECK="~I2C_CHARDEV"
-	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
-	if use usb-monitor; then
-		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
-		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
-		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
-	fi
-
-	# Now do the actual checks setup above
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		# FAILS: doxyfile: No such file or directory
-		# $(use_enable doc doxygen)
-		$(use_enable drm)
-		--enable-udev
-		$(use_enable usb-monitor usb)
-		--enable-lib
-		$(use_enable X x11)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if use user-permissions; then
-		udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
-		if use usb-monitor; then
-			udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use user-permissions; then
-		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
-		einfo "users to the i2c group: usermod -aG i2c user"
-		einfo "Restart the computer or reload the i2c-dev module to activate"
-		einfo "the new udev rule."
-		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
-
-		if use usb-monitor; then
-			einfo "To allow non-root users access to USB monitors, add those users"
-			einfo "to the video group: usermod -aG video user"
-			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
-			einfo "the monitor to activate the new udev rule."
-			einfo "For more information read: http://www.ddcutil.com/usb/"
-		fi
-
-		udev_reload
-	fi
-
-	if use video_cards_nvidia; then
-		ewarn "Please read the following webpage on proper usage with the nVidia "
-		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
-	fi
-}
-
-pkg_postrm() {
-	if use user-permissions; then
-		udev_reload
-	fi
-}
diff --git a/app-misc/ddcutil/ddcutil-2.0.0-r2.ebuild b/app-misc/ddcutil/ddcutil-2.0.0-r2.ebuild
deleted file mode 100644
index bb578a0e25c5..000000000000
--- a/app-misc/ddcutil/ddcutil-2.0.0-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Check for bumps & cleanup with app-misc/ddcui
-
-inherit autotools linux-info udev
-
-DESCRIPTION="Program for querying and changing monitor settings"
-HOMEPAGE="https://www.ddcutil.com/"
-SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/5"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
-REQUIRED_USE="drm? ( X )"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=dev-libs/jansson-2
-	sys-apps/i2c-tools
-	virtual/udev
-	drm? ( x11-libs/libdrm )
-	usb-monitor? (
-		dev-libs/hidapi
-		virtual/libusb:1
-		sys-apps/usbutils
-	)
-	user-permissions? (
-		acct-group/i2c
-		usb-monitor? ( acct-group/video )
-	)
-	X? (
-		x11-libs/libXrandr
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-# doc? ( app-text/doxygen[dot] )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.1-no-werror.patch
-	"${FILESDIR}"/${PN}-2.0.0-fix-build-with-usb-monitor-disabled.patch
-)
-
-pkg_pretend() {
-	# This program needs /dev/ic2-* devices to communicate with the monitor.
-	CONFIG_CHECK="~I2C_CHARDEV"
-	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
-	if use usb-monitor; then
-		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
-		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
-		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
-	fi
-
-	# Now do the actual checks setup above
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		# FAILS: doxyfile: No such file or directory
-		# $(use_enable doc doxygen)
-		$(use_enable drm)
-		--enable-udev
-		$(use_enable usb-monitor usb)
-		--enable-lib
-		$(use_enable X x11)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if use user-permissions; then
-		udev_dorules data/usr/lib/udev/rules.d/60-ddcutil-i2c.rules
-		if use usb-monitor; then
-			udev_dorules data/usr/lib/udev/rules.d/60-ddcutil-usb.rules
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use user-permissions; then
-		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
-		einfo "users to the i2c group: usermod -aG i2c user"
-		einfo "Restart the computer or reload the i2c-dev module to activate"
-		einfo "the new udev rule."
-		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
-
-		if use usb-monitor; then
-			einfo "To allow non-root users access to USB monitors, add those users"
-			einfo "to the video group: usermod -aG video user"
-			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
-			einfo "the monitor to activate the new udev rule."
-			einfo "For more information read: http://www.ddcutil.com/usb/"
-		fi
-
-		udev_reload
-	fi
-
-	if use video_cards_nvidia; then
-		ewarn "Please read the following webpage on proper usage with the nVidia "
-		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
-	fi
-}
-
-pkg_postrm() {
-	if use user-permissions; then
-		udev_reload
-	fi
-}
diff --git a/app-misc/ddcutil/files/ddcutil-1.2.2-no-werror.patch b/app-misc/ddcutil/files/ddcutil-1.2.2-no-werror.patch
deleted file mode 100644
index caedb9922d27..000000000000
--- a/app-misc/ddcutil/files/ddcutil-1.2.2-no-werror.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/src/adl/Makefile.am
-+++ b/src/adl/Makefile.am
-@@ -6,7 +6,6 @@ AM_CPPFLAGS =        \
- AM_CPPFLAGS +=  -I@ADL_HEADER_DIR@
- 
- AM_CFLAGS = -Wall 
--AM_CFLAGS += -Werror
- 
- if ENABLE_CALLGRAPH_COND
- AM_CFLAGS += -fdump-rtl-expand
---- a/src/app_sysenv/Makefile.am
-+++ b/src/app_sysenv/Makefile.am
-@@ -12,7 +12,6 @@ endif
- 
- 
- AM_CFLAGS = -Wall 
--AM_CFLAGS += -Werror
- # AM_CFLAGS += -Wpedantic
- 
- if ENABLE_CALLGRAPH_COND
---- a/src/i2c/Makefile.am
-+++ b/src/i2c/Makefile.am
-@@ -4,7 +4,6 @@ AM_CPPFLAGS =        \
-   -I$(top_srcdir)/src/public
- 
- AM_CFLAGS = -Wall 
--AM_CFLAGS += -Werror
- # AM_CFLAGS += -Wpedantic
- 
- if ENABLE_CALLGRAPH_COND
---- a/src/test/Makefile.am
-+++ b/src/test/Makefile.am
-@@ -4,7 +4,7 @@ $(GLIB_CFLAGS)  \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/public 
- 
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- 
- CLEANFILES = \
- *expand 
diff --git a/app-misc/ddcutil/files/ddcutil-2.0.0-fix-build-with-usb-monitor-disabled.patch b/app-misc/ddcutil/files/ddcutil-2.0.0-fix-build-with-usb-monitor-disabled.patch
deleted file mode 100644
index 3fc988eac350..000000000000
--- a/app-misc/ddcutil/files/ddcutil-2.0.0-fix-build-with-usb-monitor-disabled.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/918124
-https://github.com/rockowitz/ddcutil/commit/4e2681a89fc5ba1ab5f909e30baf9eef0c99e5bd
-diff --git a/src/cmdline/cmd_parser_goption.c b/src/cmdline/cmd_parser_goption.c
-index 342d7b03..5168861f 100644
---- a/src/cmdline/cmd_parser_goption.c
-+++ b/src/cmdline/cmd_parser_goption.c
-@@ -1604,6 +1604,7 @@ parse_command(
-       FREE(fl2_work);
-    }
- 
-+#ifdef USE_USB
-    if (ignored_vid_pid) {
-       int ndx = 0;
-       for (char * cur = ignored_vid_pid[ndx]; cur && ndx < 10; cur=ignored_vid_pid[++ndx]) {
-@@ -1630,6 +1631,7 @@ parse_command(
-       ntsa_free(ignored_vid_pid,true);
-       ignored_vid_pid = NULL;
-    }
-+#endif
- 
-    if (sleep_multiplier_work) {
-       float multiplier = 0.0f;
diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index fd2c74d8246d..be13c7c4d833 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1,2 +1,3 @@
 DIST fastfetch-2.30.1.tar.gz 1144835 BLAKE2B f44e0d8b74f124a1978403c0af61450eae4f668c0ed8e3d56505ede715366c90ad8099ae652a9afbb1c57ed2af01a930834a53ca6e871d6ad8078ce0179970f0 SHA512 626eaea5cb4ea3c61b44d24acf836734e7a04e8a3cf78bd0c8c3d4dcaf28bc165501906f97cc1423aadf8d822539e82251b65f3089780232dc214d07ce6aba7a
 DIST fastfetch-2.33.0.tar.gz 1161845 BLAKE2B 1a31aa0b7651c27ecff34067360c136ad5c0dddac60e5bc2c4ae749194d63c49df3bc92de91e5a3249b8bcd1f640b62025a01d7f6b89b96991ad1623ca079bb5 SHA512 f9d824f908e36e3dc1b7784f2da818d764be6bbc6baa77d6b26ea6776acb5f101c4c39267fa42d1c9ae735c9889badc7b3a65170d81308de852a178e50140154
+DIST fastfetch-2.34.1.tar.gz 1168310 BLAKE2B 2b3e617cd2c7b2168ad9844ba907aa533b500cf90b19762c180555967605ed3ba83030e07893adee9ec2f30887ace3f63840fdc62cbad00c7c9d1d9bd9021952 SHA512 026b71c8d6ad5d5683ededf173d4cb2e936b3e934c7f27227fa7c5f665b9628717e90413626a4fab25fa5f5fde50cae6cdeb75621d6a2cac1ca6368c943293de
diff --git a/app-misc/fastfetch/fastfetch-2.34.1.ebuild b/app-misc/fastfetch/fastfetch-2.34.1.ebuild
new file mode 100644
index 000000000000..a6fd045ed767
--- /dev/null
+++ b/app-misc/fastfetch/fastfetch-2.34.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Fast neofetch-like system information tool"
+HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fastfetch-cli/fastfetch.git"
+	[[ ${PV} == *0.1.9999 ]] && EGIT_BRANCH=master
+	[[ ${PV} == *0.2.9999 ]] && EGIT_BRANCH=dev
+	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
+else
+	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="X chafa dbus ddcutil drm elf gnome imagemagick opencl opengl osmesa pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
+RESTRICT="!test? ( test )"
+
+# note - qa-vdb will always report errors because fastfetch loads the libs dynamically
+# make sure to crank yyjson minimum version to match bundled version
+RDEPEND="
+	>=dev-libs/yyjson-0.10.0
+	sys-apps/hwdata
+	sys-libs/zlib
+	chafa? ( media-gfx/chafa )
+	dbus? ( sys-apps/dbus )
+	ddcutil? ( app-misc/ddcutil:= )
+	drm? ( x11-libs/libdrm )
+	elf? ( virtual/libelf:= )
+	gnome? (
+		dev-libs/glib
+		gnome-base/dconf
+	)
+	imagemagick? ( media-gfx/imagemagick:= )
+	opencl? ( virtual/opencl )
+	opengl? (
+		media-libs/libglvnd[X?]
+		X? ( x11-libs/libX11 )
+	)
+	osmesa? ( media-libs/mesa[osmesa] )
+	pulseaudio? ( media-libs/libpulse )
+	sqlite? ( dev-db/sqlite:3 )
+	vulkan? (
+		media-libs/vulkan-loader
+		sys-apps/pciutils
+	)
+	wayland? ( dev-libs/wayland )
+	xcb? ( x11-libs/libxcb )
+	xfce? ( xfce-base/xfconf )
+	xrandr? ( x11-libs/libXrandr )
+"
+DEPEND="
+	${RDEPEND}
+	opengl? ( X? ( x11-base/xorg-proto ) )
+	xcb? ( x11-base/xorg-proto )
+	xrandr? ( x11-base/xorg-proto )
+	vulkan? ( dev-util/vulkan-headers )
+"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	chafa? ( imagemagick )
+"
+
+pkg_pretend() {
+	if use X && ! use opengl; then
+		einfo 'USE="X" adds GLX support for USE="opengl"'
+		einfo 'This build with USE="X -opengl" will not include any extra X support.'
+	fi
+}
+
+src_configure() {
+	local fastfetch_enable_imagemagick7=no
+	local fastfetch_enable_imagemagick6=no
+	if use imagemagick; then
+		fastfetch_enable_imagemagick7=$(has_version '>=media-gfx/imagemagick-7.0.0' && echo yes || echo no)
+		fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no)
+	fi
+
+	local glx=no
+	if use opengl && use X; then
+		glx=yes
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_RPM=no
+		-DENABLE_ZLIB=yes
+		-DENABLE_SYSTEM_YYJSON=yes
+		-DIS_MUSL=$(usex elibc_musl)
+		-DINSTALL_LICENSE=no
+		-DBUILD_FLASHFETCH=no
+
+		-DENABLE_CHAFA=$(usex chafa)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DCONF=$(usex gnome)
+		-DENABLE_DDCUTIL=$(usex ddcutil)
+		-DENABLE_DRM=$(usex drm)
+		-DENABLE_ELF=$(usex elf)
+		-DENABLE_EGL=$(usex opengl)
+		-DENABLE_GIO=$(usex gnome)
+		-DENABLE_GLX=${glx}
+		-DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
+		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
+		-DENABLE_OPENCL=$(usex opencl)
+		-DENABLE_OSMESA=$(usex osmesa)
+		-DENABLE_PULSE=$(usex pulseaudio)
+		-DENABLE_SQLITE3=$(usex sqlite)
+		-DENABLE_VULKAN=$(usex vulkan)
+		-DENABLE_WAYLAND=$(usex wayland)
+		-DENABLE_XCB_RANDR=$(usex xcb)
+		-DENABLE_XFCONF=$(usex xfce)
+		-DENABLE_XRANDR=$(usex xrandr)
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	append-cppflags -DNDEBUG
+
+	cmake_src_configure
+}
diff --git a/app-misc/francis/Manifest b/app-misc/francis/Manifest
index e9541b50fcd0..e03e0ba09d05 100644
--- a/app-misc/francis/Manifest
+++ b/app-misc/francis/Manifest
@@ -1 +1 @@
-DIST francis-24.12.0.tar.xz 113920 BLAKE2B 4dffd5835668a7ba0189eb7665def1192d2e16c1f6995ce980c13253f0802f455bc3c34affbd09c1994a4c66871e0efceb379a0046d14fb2cfc8ee39a58370ab SHA512 2ecaaf35fd1f781c13ba1e306f5004b5a2135797937c4613589bc79191e4b08e0429579078c74399bdc6a669286419ef71d039b15a4b5b4f510a748e6c5e9050
+DIST francis-24.12.1.tar.xz 114552 BLAKE2B ad4a1b8664e4c3206bb1eadc2ef9d8fa1e8ab4966bad267bf52c213d9e803e4b877af63effb6dcddc35feb54b0bc55c918700d6d2fac17d62884b8c7fae12ee7 SHA512 f893233c30732a16320991f004ff8550ea7fdd64d24cc881f39f221eafb2090cda758c3617588722bb264e789206b6533bb627598f1817f41054ff0d3eaed6ef
diff --git a/app-misc/francis/francis-24.12.0.ebuild b/app-misc/francis/francis-24.12.0.ebuild
deleted file mode 100644
index 15ac0baf419d..000000000000
--- a/app-misc/francis/francis-24.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="utilities"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Productivity application using the well-known pomodoro technique"
-HOMEPAGE="https://apps.kde.org/francis/"
-
-LICENSE="BSD BSD-2 CC0-1.0 GPL-3+ LGPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-DEPEND="
-	>=dev-libs/kirigami-addons-1.0:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6[svg,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/app-misc/francis/francis-24.12.1.ebuild b/app-misc/francis/francis-24.12.1.ebuild
new file mode 100644
index 000000000000..b065a3560552
--- /dev/null
+++ b/app-misc/francis/francis-24.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="utilities"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Productivity application using the well-known pomodoro technique"
+HOMEPAGE="https://apps.kde.org/francis/"
+
+LICENSE="BSD BSD-2 CC0-1.0 GPL-3+ LGPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+DEPEND="
+	>=dev-libs/kirigami-addons-1.0:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[svg,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 0bcba1fd6ad3..1fdc8b4e3355 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,3 +1,4 @@
 DIST gnote-45.2.tar.xz 3248256 BLAKE2B ab687802aa6046556c579f1a11fb807398e69f2a256a8a63f50ea76bbcdfc8708ead603f25274b678912bb567c45e96bfe708ea2d56f9733ee1e6061195826bf SHA512 5380a50cfbf235b0007c47c3a1f4860ade599789e1746a7741fc672265698bb0717858bb39e5c0612d4d4e13040f1865674ddeda1427a4818aff508ba5ce8059
 DIST gnote-46.0.tar.xz 3414728 BLAKE2B c53c4f1b5fa1c1dc0105f52736913ef3562a95e324fe4693e4b2729d5cc3ce47ab97ab8c22e2edb124a7cdd94c735b2b8417a02f88a9c23a310a027452fe8c3d SHA512 a56557ed1d5adb3d5416d8032218c953204737dd813e09c13875a084fd579145f94470b61d8c2322d01dba06ad0bb26d553e5009f5d3e10db284afc8b42e0b79
 DIST gnote-46.1.tar.xz 3414768 BLAKE2B cd0c942d97c06a275bce1dd6317ee4135ba8ea692b39d812de2c057ad2cb523965a701b62214d57c07bb7097293d5e946b19bd98d4629e98df42f13821afa27d SHA512 222cff949bb4403a4004210576d8f141fe4ee811da1ec8ca26a6d5474b4ec6d0fe49f9a8c8952e1228d200ca3b5c3e0eab18efb6787dda8d60608254c47d06a9
+DIST gnote-47.2.tar.xz 3839184 BLAKE2B 66e2daa127d2b169767d007d66ebd833163883441065638eb84ed5aa9ec17c0026bfb97d8cac6a4c28294eb273c44e43d6030663a59775f0c7d379528f268319 SHA512 eb8938e3d62b12edf869ce10292032a3c6f63af36bfeef704ed0cd769f906e637d0e8738c0bebb8a22e5367e70042a2faabaf5bb1388020f9e6bd55e94442b6c
diff --git a/app-misc/gnote/gnote-47.2.ebuild b/app-misc/gnote/gnote-47.2.ebuild
new file mode 100644
index 000000000000..9cc62c5c94ba
--- /dev/null
+++ b/app-misc/gnote/gnote-47.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 meson readme.gentoo-r1
+
+DESCRIPTION="Desktop note-taking application"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnote"
+
+LICENSE="GPL-3+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.74:2[dbus]
+	>=dev-cpp/glibmm-2.74:2.68
+	>=dev-cpp/gtkmm-4.10.0:4.0
+	>=gui-libs/libadwaita-1
+	>=app-crypt/libsecret-0.8
+	>=dev-libs/libxml2-2:2
+	dev-libs/libxslt
+	>=sys-apps/util-linux-2.16
+	test? ( dev-libs/unittest++ )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+BDEPEND="
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	# Build system requires UnitTest++ >=1.5.1, but the .pc file doesn't
+	# specify a version
+	# https://gitlab.gnome.org/GNOME/gnote/-/issues/199
+	sed -i -e "/UnitTest++/ s/version: [^,]*,//" meson.build || die
+
+	if ! use test; then
+		sed -i -e "/unit_test_pp/ s/ = .*/ = disabler()/" meson.build || die
+	fi
+
+	if has_version net-fs/wdfs; then
+		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
+		synchronize notes."
+	else
+		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
+		If you want to use that functionality just emerge net-fs/wdfs.
+		Gnote will automatically detect that you did and let you use it."
+	fi
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-misc/gojq/gojq-0.12.17.ebuild b/app-misc/gojq/gojq-0.12.17.ebuild
index 05d4e9a472ae..7176082ea805 100644
--- a/app-misc/gojq/gojq-0.12.17.ebuild
+++ b/app-misc/gojq/gojq-0.12.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/itchyny/gojq/archive/refs/tags/v${PV}.tar.gz -> ${P}
 LICENSE="MIT"
 LICENSE+=" Apache-2.0 BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~loong"
 DOCS=(README.md)
 
 src_prepare() {
diff --git a/app-misc/jaq/Manifest b/app-misc/jaq/Manifest
index ac6628f0c42f..d5376d591786 100644
--- a/app-misc/jaq/Manifest
+++ b/app-misc/jaq/Manifest
@@ -10,11 +10,14 @@ DIST base64-0.22.0.crate 81568 BLAKE2B 55e6bf8888de846bc14010fd706686544a1706dc9
 DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9763070e269b56a14b150cbfc4b7f599d4c2a0a5f783638170ee132f0796fefb14fcac7fd73c58db0791007a SHA512 91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20
 DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST bitflags-2.7.0.crate 45924 BLAKE2B d4266b77e4ee15d7083c8e8eebe1b050029e3f3d21029606d4e9d3c4fe03820b6d5ba2e1309f47cd6ca2a043b5d7e1b19dd991f3fbe97c4bb018aadb54c60818 SHA512 c97246c09551bf1b333850135d82c40650be4aa8df1ab55dc190d80ea8e950ebd122635fa7d82c43d477150e207acfc4e830b9fde41aaca1edbbe7c0a800c174
 DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b
 DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
 DIST cc-1.2.1.crate 92731 BLAKE2B c9cb100964834692781ecc3f47972f83adaf27e019ca212f896b19a853521cf2084da213f2c2fc5c8a1bc794cc83fe9f81faf7751e1b065a3a2a08137cda0b61 SHA512 54bc5d85d48d678d33dc795aa6cc823a59ae6d17b4ec5708a1dd515e3495eabccdd949e9467e9bb3a29e44847a2d3ccd75055dfda241d8abbb16bfad650f2819
+DIST cc-1.2.9.crate 101156 BLAKE2B 05f44c0c8161b75a9697c55e0d024f305cceb685823085d449f98612de71c58a913ceca5a472a89cce3ccf3ae58c21ecc0f5a3e14283facf92937da8f4a8c31b SHA512 a4368b1b2bb7f428139c0fe8ce5d0c17386d274f0f02de459c5d127052d39b089cf6e2920a258721196453cc89960292fde4d811e9f6b94c69a679b96713c756
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
+DIST chrono-0.4.39.crate 222248 BLAKE2B eeff1694a98e8775524c261c5c46ebf09bf1ffc6222a945576960e8153af99e4549d8c988bd086507fa430f9cb15a3159be85300247ab3c6f5e77ab515f0988b SHA512 5b258f76bea58ab9baa0fe8fb32c41928b8b655c76bb2fbaae9300ef8380cbb881296cee6b9e9886dce62b0759c73e84f6409e374a86cf0c80e3383512f98571
 DIST chumsky-0.9.3.crate 75112 BLAKE2B e74663dcf524513bf54494c62ad154fc3c3560910c429b91644f35327569df835c13645b148ec1b1339f78e9fe6ab3d5b83f10d53235a8e137756a548a9e6abc SHA512 f304bafa831c47fff4ede3b2e67628d7cf33d267559ff0f3eebba9355439f8bfbf08ed576aaaa1d51462114113ec1dc5d3593fa5a1510f6e2032da88d021423a
 DIST clap-4.0.22.crate 205175 BLAKE2B a0d0284c00b5011b8ce24a290444947970c784d13ad2273227a4d619d14bac7bcf9336911df5d49748b38ca29dcca211596630b5ed121a058492ff4e0463b616 SHA512 d6b54e31c4780be7d712bed266b2cee4ad1454c75d9dc542fac301156e1724ca07422228632d901b4e7590eda13ec2c8349ba59c5da12ac1991e9fac540d0c55
 DIST clap_derive-4.0.21.crate 27567 BLAKE2B cbef7e547b0d0a145ee7696a773e1dce541866dd4878797e9b810b7506dd11d75ae9cd2547b4c3330569390568a1039588406ee614b9eaa2b1a619951b0e67e5 SHA512 95bbddfd09de9dc1c64266743e9877aaed086be56f7e0f6e933dc5245724fead7163316a7bb4a744bc81597e4d079fb0abfea891766a17e0b1aafba011dd74df
@@ -30,36 +33,49 @@ DIST env_logger-0.10.0.crate 36574 BLAKE2B d2f387682059fe9b4566ab995be449c58c57b
 DIST env_logger-0.10.2.crate 36402 BLAKE2B 34ef02d0f53fea474e7284fd7021ed3b44b11be2c0d0c9a66ace8792bac74d1a6b43997e0e7d043ef89e14903f6ab6d42c169bbb164f05cfe4e1688611639edb SHA512 c44131efb703eed984d8f4edcf18c77ef14036edf013e8bf445703c74a4386e4c3f4b55a272490da1ccb47a692ccde4670772c74d35c5723601c870416144b69
 DIST equivalent-1.0.0.crate 6621 BLAKE2B 5e2c461898c2b029430c526db25188ca37b5c1f9f562c1950a7cb26b824c8b06d0ce62542c234e909873c329982641abe091f99074b6e40f13898b39fc4a5a86 SHA512 006fd57e6829b1dd9644abaa6f650098f22302e9882fa5b852c695aecdead8e353426626c56b772ab362303dff23777cc7012ec04f9618403d54f0e03e29278e
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
+DIST errno-0.3.10.crate 11824 BLAKE2B f9976b538868daba3cd2d47ff2fdcda16b4a436ca767f865f23d1139e7f232aba263dd4aa38d573442c762999c8a8beab8a4a8c10649d21b49090fa65ced1ec7 SHA512 fa4b9a368f254cd90c6f69f6883af4c579829a6da6f31481a1b527ac9602c8ffcb5e9518cdc32c39b5589c151a20e75a7300c8a907d178346185ecc6e8749f3f
 DIST fastrand-1.9.0.crate 11910 BLAKE2B 570c66ec1d4ace08b9790299759e3b6f0394aca52c4ec2e02258229c198846cba7c0627807548bac3ef1f86c7e512c4bd105f1e18e35ac0ea6934f76a6838e1f SHA512 321567b5fad8552c0efc4393b1e77d1bce288b0a88c475d432f79e91b3457ee6eb5db9e4d65ac6381b9990c9916f4651b6a76250df44d51ea3e25bd8184bdc52
+DIST fastrand-2.3.0.crate 15076 BLAKE2B 15c9a1c4f64d94c4bfd38ae139c6fe19b6b621a495c1b57209edd6d76d978eaf018ba77f356b5086c3f462a6de044fb5e3b172fc288309569911a17ec39951bc SHA512 267fecbb7459c8840f03425733d278dd6c4e7637b85b99552877117ed5e8015e094d86aa95841f77064136b7f382276c3cb2c2bef7b2881d272f4aa57c5cf947
 DIST foldhash-0.1.3.crate 13712 BLAKE2B e5913d3aa493d0176af9650354d98870b7e97523ca743a7d9605da3f559463654f391e42438d96fc797397ced449f13ce499c20ed5db7aec772aae97c5f29175 SHA512 844d5b699db632254dfc378d46e34909637118647250e2382cbb88855f6739fb9b5f1b840bb8e250dc8fbd2a97c9155e5d8fd0c5c760b8e02dd0aecd96818a5b
+DIST foldhash-0.1.4.crate 13764 BLAKE2B 7dde82c52671b93d91b2ec9984c0ce539d89d5c80cb115c0db18cf72f84f4fbbe4f7b36b745143102fc83c307df2cae051e4fb461a3131f52c8f98172fc0e72b SHA512 096efd30917c42e75e162a79d5c0ef068af76c7b6206cef880c4a3af92d096b4b4a1cd3de5b66ddb040730d58678c9a651734517dc8a60a265ebddd5559b95c1
 DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b
 DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb
 DIST hashbrown-0.14.2.crate 140080 BLAKE2B 4a9fc89d77940d116d781ac6ca2a07a8ba3146fed54bd5d304d5ccb7722d27c053bbd83ec5ef897f1a25db50f838b73421677fd92be5d534a91909a7ad390d3b SHA512 a611359ccc8d859a72e812b94123ff162f5653caa1839c5f5e3269ed18b5fe2b2c7b15b4f03ae8076a622d08090a90e747d8cbcdfce9cf7f317592f1a3695351
 DIST hashbrown-0.15.1.crate 135873 BLAKE2B 2ea5caf324b9574b2fd25a5659ffe00f4c05015b92fa8cdb8b33658469986c6117f7123085c41de83dc0ff1e91986cd5ee9ddf692b7a162d97bbf50aec76ded0 SHA512 8bdd4966b336f5d5b184cf14d4a7e625d184d8f3f0782845c746f374f92425055def71e64087fb3a3770fd9b2d9ed40310fa45f60e56d298accaf9c500add841
+DIST hashbrown-0.15.2.crate 138478 BLAKE2B 453888ce68b10cd6e93d787986603fceb29b83fe2dc417e7e57316b9e0060d0bba51ec7fb71d46a038662c99f60deac8237a8f349297208d1d223bcc13f0d0ea SHA512 d6fc0613623f9313533dfcab1240e97f652f78f05baa21419f7edb2eff030c4a2c5f426d3eaae747923cffdd8aa9cc2648340e5fc229395b5eacc6fae087c8cd
 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
+DIST hermit-abi-0.4.0.crate 16310 BLAKE2B efcd1dee7bcd6d185cbe0051c7bc7e2776857ffcfd2adc3fb101febd7c1bd75994b7e4a4a0a59c5b4628cc2521b4c1f043e98a0c44935d0180e7499667690ab8 SHA512 b1a21f6d54598185a8e8c29565ffc2e1bc5da57cf1c9d87ba643d23d7c23d53e8ad36ee2f5c1ec8a504334b6f98b0f17a832ff37877c7b7f9238b196f4034e6f
 DIST hifijson-0.2.0.crate 17534 BLAKE2B d0aadb9615c1fa3f84ed0a0a9b8397a8741fe2f1b550d727875a30d4ba2bc3d354ad28d3d30ec2e116fc55113c2b6331440fa9f037da49712727cb3172315a51 SHA512 d4f2298428f3c9b0701ad1f4bee881d1f205af72d8670a2ef671387169a413de5f93a3f7b3ea962adb507298f89d2e0ccfec4a1735177818a8124d27047598d2
 DIST hifijson-0.2.2.crate 23401 BLAKE2B 3588af63ef132e4190ceb66bac679c0e404c3ae0c022125612a4323ceadbe0736fe8d5a6d8d620df5d2cbe7b68b1a373634f2c5259e3686ff3ccb2518ad6bc28 SHA512 4880a92834b718dc7caa3aa54cf2b1707be5a4e32c05360e501a2171ad9348a05de3b169751810f5680e2c9b44bf5378e5b15a6e06f60d42c851e2607affcdad
 DIST indexmap-2.1.0.crate 68224 BLAKE2B 9d833570cbb63ecae138ca234b998bd0e5b11b1a7e3d5ef4a21212bb32d0998395f1fc609f66860bdbab198081687630f583f5a2e495fac1afa40ff48bee8a0f SHA512 9d303eef918b9264b9fe326cc1d71f4095f7ed5639ed8696efa3e9be65dff2c50ada4495409e109e7718997db51ae1fd865cf8e88978107d7823faba14380600
 DIST indexmap-2.6.0.crate 85204 BLAKE2B 420a3cceedab93e5023b476f9b6b93e57057238425d4095de59eb9490c2a088193873e643dcad2f739e34e5798baa9a18939424cac1afc5fc7b93ae496ba188c SHA512 c870348691f5acf97e7bff25c805e60f2e9db9e3ee7b3b939b7be45b6bcfaadee9880e6ad27adbbe2545865193655b5fa9de18487b7a1d030017b2fca48616ca
+DIST indexmap-2.7.0.crate 85335 BLAKE2B c7430ef510738ac5fc4658f3e4d927ca5cde780774a07848791ea87503be09fb4677c52803f6cdaaed73eee600f47e0595ac3db74a498947d0e180cbd10fb7aa SHA512 efac370b9f365a49489aa2c5406eb503044a4df7d6ceb772e0191b02244b6c2c1bf6c43ad4c8924160c1a2bd76d46c630b500a1c4252fc52366295d1cb04b48d
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST instant-0.1.13.crate 6305 BLAKE2B 83a2c479e21e789ca9795f66116ebc55481a42afb21f4c0ec0551edf07781901a28978667e92b01355b43e0e1a7ffcd3cc37b5501a7521da78f4f352e586c9fd SHA512 b7839431e8920c4c0841d0974eede75fc50f2bb7a9475664bd2c4ff6c558a10084e1c025e5be977c3364ae9112c365c0a6f480cb9b35ee4130ca2beebcf650a9
+DIST is-terminal-0.4.13.crate 7665 BLAKE2B 47a024e135ca4931a04a8dc8151f999f816ab50c924f17321af4295dd84fd51bf98ff057de967e646a461c1cc9ffbfd7ae245a9021b3a77f3812f43707b44aa2 SHA512 ea5b18dbfc965b96a27086eabc070747fdc557a6a9acd06203164e846c2f390c4bebedb29211ec008e060dc80b10f53de6d6cdc822d4f51a543057736fe33448
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
+DIST itoa-1.0.14.crate 11210 BLAKE2B b2d33dc384757963eab3ae7d80bb672d828a549967986e3af8c70fe71a0ad46c4a278da2db4dfccef99e804e6cd4934067e97c0697a33ac3302cafbc46eeb416 SHA512 ea2d38df373652ddacccd11e610dfdad4e3ae7f0d476514e6ac58092733c817bd834e8cd88c3bc4178dd5a646ba628ae626195e0aa407e8534ae3c2a7b049987
 DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d
 DIST jaq-1.4.0.gh.tar.gz 97078 BLAKE2B 6b5286848035bf96d6b91d7af195998af0effca6a5c89c477d928f58107c6b1fd4da66d6b27861032ee34484248f0077c936d28956a1471a2de001ae2b908eac SHA512 1d5ea0d0a4dc109fb8696e518eed4a235c14423cab1859cffe81f2fd8a085ebfcb3a01bfd87f6d6ad398a1945662ab83cc064bb2da1af618e46acdf262504b13
 DIST jaq-1.5.0.gh.tar.gz 98828 BLAKE2B 0fb64d9622302c44f27bdcb71db46c16939c86a7fae7357639d309a3cb152685fb2b622837cc1158bc96b401817a1f0c9cde98435d92def670e1bdae9d2e51eb SHA512 1b3839a07b4539d61e4d18645fd90bb4312675df36b01702b373ea16534155fa000208b11d21ce000136e237f5ae5321ca3531144012c7dade3f5f8768c1575a
 DIST jaq-1.6.0.gh.tar.gz 110659 BLAKE2B 40b6b948d10da484c64d567259a6855e85f468e1876acba52e39a0f6ef52783fde98417e7a8f8e91c188cf34f78607ae73ac450f3e782a94c8e8d10c3aa00229 SHA512 1ad7f313f175b3dc373d3627f8afde224e557c01c5c0e4ad17fce35034c1e85feb169ec3282aa44585a61ca08129a116e9aa2c72eaa471bb7395b2ad6331b3a1
 DIST jaq-2.0.1.gh.tar.gz 111011 BLAKE2B cbcd0684d53b303cd7c88aa7ece78991616c9e1a6e21ce45cf1a0d16bbde6587773afad9b4c2f7b30e2f09340b9bc29f95659ef9286cf95cd8bba0c426efaae4 SHA512 1b062c613a10352c43b34c141986cb34fcf0e4ce74078327bef1028e3acb227c8c40de2231f20ecfae9f9e510fd736e9f73ec42ceba9a3bc19df52f1e9e77a81
+DIST jaq-2.1.0.gh.tar.gz 111883 BLAKE2B 210375c827f0a14b999e7fbe166fa22ee11924e42925dbdd31ca59410dded55117c116ba4f19debbffc59c5c9108c54f1ba169058091fb7595b150a1b95a92ca SHA512 36cddd0d6868535f6c433460196ae215a357ca920f23febc29757d5a6d4b3d0b08235ecf016573f0fdcf95f88b7903ac3ebfa04ded7d400ecef2c46b90c71c56
 DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9
 DIST js-sys-0.3.72.crate 54096 BLAKE2B 76c1044b7684ccfbc06c6d43541fc39552c058fda5ccdcb7154c930d03f5260706ed42b36b305e56c5a0eb0dcee27180d3df3fbde92f3b7ba5104b0709f5714e SHA512 5a83d711a02bead2d9c05aaf8a7e3f351307b3219f4f6697bf190d9a9b36bcc10fd33ce0a334e4f3e251d52fc7411020a3631d0874097e9b519e839b713e1c42
+DIST js-sys-0.3.77.crate 55538 BLAKE2B 8a4c04a8e93bf5dab63784a24320a314cc5cb629df788e116c452857b8c049c6bf357f3bf8f35086eaa81bc2d7f0954001addfd0577d845844871ee138e81bc6 SHA512 d9370ed6ea892bd51ea181630ca661c348f82d575381aa4c8b529113dfcab6687f4d19bceecad7e1b28ebaca74d405862150a5b5ee2d5d55efdaf98eed1ab255
 DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e
 DIST libc-0.2.164.crate 769055 BLAKE2B cfb757ea04ec8ad6d6a0dff92cbedd626aa4932cd83d67d19ac51cc140f9aeb54b38b488796c4a0e722f7bceaf54c4807a32ec0560bae4840a82fc1c4a5151ab SHA512 614835ee7388c854cacdc179b5700b7de0c696ec0eebca2b997f1039157f737fa79e208832a46f2fa27fcedb6fe7a27faf26079f06ee0e679b6f35d4a5371e3f
+DIST libc-0.2.169.crate 757901 BLAKE2B 1012cf93d8975aa20fc3f2332e253426ff66be6aed63ace5292cc8568ee419b0f1a4b5b39ddbb78d9c2dfd8d72eb0d068c98faa229ab55556da5e674429f0e97 SHA512 c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce
 DIST libm-0.2.11.crate 111477 BLAKE2B b1247b197dc66a38b9a1f9db0e32655c9ee09575347895bb1e3f22e6953c334d74574a7015f214b0af0eed564ff2ee4576d07d0db5421aae917a7aa1e10ea142 SHA512 86742b5d97dc976cec5bbf75f565b40c7058e74cf840cbc7baf4d84823318040ac692b5796a407bd44caac553dda3f5a087d3bf8d6099cf26305123ce106c7bb
 DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
 DIST libmimalloc-sys-0.1.35.crate 184695 BLAKE2B 13d7793a67c6e2bf2377af59818c2e109e7b9f6d6415089970626b614bb33e96fd30bc962f820d5bb2beeefae6e155a30b7584e7027e3187f088c190eb8115f7 SHA512 7f9ef551d23d7e22073cf9d8593103a4ca17cf82b65b2bc1404dbfc2cec46c4f305ad9dfda9ca1c61e7ff3a617196c6798f505d62c90552dd25b4ba0c05e5847
 DIST libmimalloc-sys-0.1.39.crate 198523 BLAKE2B 371751d8eabd682d879a4d85b163d3c2f3dc3968232241cd2d7b573a5b78164efa6cd90c2b81d350c69354fee5676edb3e37f75f676731fccc913a83878c7358 SHA512 db578da8722b82eafac3b587b2db24cbf95fbd85a25b7ce30286deb9eda6820b5d452ece7c3126a2d8c96400941dc3946b4cb2f46172241861405aa09a3a2451
+DIST linux-raw-sys-0.4.15.crate 2150898 BLAKE2B d1936eb74377d9bfddccef3830b56eb716c38ea3cb7e13b73325dfd00f9fc0df74bae49e4214dd7f27c257403b8b12cd1ef332d53336279d13f7e9497caf4135 SHA512 b5c39181fb6b901abddd8b2e7b449142e2e5691cddadb8e6b74ddc3b53076b1d410522cfa45af68dd18befd24ff12313c2494cf2cb0cf142e2228bfe42014309
 DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
 DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
+DIST log-0.4.25.crate 44876 BLAKE2B ab9433934d16edca42b38f559c3c87f949c4540fc422e6d65c75aedd5055c7a4935ac0f735e7ef5c901a7443e70d60be77079a104dc61a3955b0c900162b3967 SHA512 b420404c82aeb04219e9f63505d60b8853cad44d1de0bec0750715baae21afae806bd4f741bb8964dd39bb5d1e0f5be41bc38d76773bdfd5e920d30533146231
 DIST memchr-2.6.4.crate 94439 BLAKE2B d1136f7105a33565214fdeecdc5a95e74d7fc7cf45997f81bf3cf389f3015fa561ab326433ddcff2db0b7259246eb6d26fc7b4e3c90c3af8b9b7ed7e8ec56ba0 SHA512 1065a67e04ec9210c70e430288e0a8d39f36ce6414722099553e99112ea2f8f710eae44bf39f8775b9850e6c8a50e634a1b1b084a8eb4f6b2eae6697dcf5b5f4
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST memmap2-0.9.0.crate 31529 BLAKE2B 555a4160470a4f71ae3f72a8dc1de963b7df89ba83d0a50438a27a6df0d875c4fb1ce6454883b24cce3a8e8ec77b663eace08fd9d531b3c4af7393e71831e0dc SHA512 f46dcb4159fce188bb247a568ca3d86488c379bc18c8c24ce5cac5c34963f9da39af9dc9436c3d741ad364bc3b9d6d6a65b2c724aca3e6caea921127ac807e93
@@ -74,27 +90,36 @@ DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro2-1.0.69.crate 44271 BLAKE2B 9d1531a0b123e6238363d574bee03ad050454b65710b9800c12597f3a9ae2f9bf50c617da0472b7ac0b549afaca19c546ccd6519e648598500efda9c0db2ef6d SHA512 d197cbe9b6100c3193a01fd7dd6b4e49d440290012ababb5d9f139409f0afe816f213d67a03abeb1f3227228e0a1f2446d1dc0a2775363a15d1237c38b45d6a1
 DIST proc-macro2-1.0.89.crate 49446 BLAKE2B 844c021394e7a2551bc179592a6769d672360150abf92debcb9ac60a94a2e426c48c408f06aeb2128686f5f04d66dc12973714670c21a5063ee6b9f3bae4e671 SHA512 488ab38a04df1d0330309382a7e4f667238cbc9b4d513da6a8f5718f8a762f76cc122af67fefe8f4b021a286b3d23e3ec83d781fe6ac823042a6daf14d147e2f
+DIST proc-macro2-1.0.93.crate 52388 BLAKE2B dae4493215b88f68cc485bc0ae80f0a48ebad68e0260839b1c367832d1ab778197bf040647b3fe36cfe9d5f7a496e05cd71b5914f531eb129c2d458d5f0be896 SHA512 1ae650e390e4f1b18d05f42d2ffcd025cabf72568a326cd85496c722600108b0aa0ab0161b39fcc931b8b302427f678650e703f4db57aa1a60f1751db881dc6c
 DIST quote-1.0.29.crate 28345 BLAKE2B 3aeb637a4139730348775caab4d48173650d8bdce08247263d741ccc657dfff7f2facff05725bcaa73486818d394c392c64ecbc61bae3f5b612104aec16ff289 SHA512 d686a3943dca059a8e79689c77e6e8f6dbfa9b16a1a7ecdd27099339b77a55334252eaa8b4340e79c35ebb1f6e4deeb3f6356dfd02484f9c724e66a74387e30b
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
+DIST quote-1.0.38.crate 31252 BLAKE2B a3836efbe5c21dec70c684002b47b8fc7cef643c82ee903b537a48bc0707a28106c4b33d98e60ff81e04c7520f7404b1dc4d49446e8d91dded517e476c36e1c2 SHA512 530c47c5e6372b508bf5b2b88a138408a7afa5ef52c47280ed20eccf39f8e97dfc1e0a18c1bd5472efcdc49a7a1e69566333a0a1b4c0b4f0e11e6a7a85bfe8af
 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
 DIST regex-1.9.4.crate 253112 BLAKE2B 434a56ab97d988d0121407f4b49825807c639cbd9c498249da9fdd186a40340157adfeadfb8b0f442fbd63968f4c9fb36c487d9472cacacd1fdba9c357bb9218 SHA512 4c7c478c74dd6a470ff89320a6944ea301967543a5ab281341cb4c8abf1dbbf909f329e73082ff5157db8108eb61b7a1a8b1e88555f848a876bcc5072d23e894
 DIST regex-automata-0.3.7.crate 607421 BLAKE2B ed040e37e24979118edfe37ddd25443986cab4ab96e6391f9a6f70c6ac308678d5773a14bc2d10e809d7bd26d2725bc45d01493efaaef7e6038152de6fc7fc08 SHA512 967f5d0b452ba782b7e5edcb3e7f1e730407cd65f072eecf9d28d1e4c2cec9954a891a3fb4d69310d299a287a5c6afd22f71f7403dc65e07b7be207a2eac83d9
 DIST regex-lite-0.1.6.crate 95278 BLAKE2B 02b9cf7758e6eda37384cf8d0ca2560bc0ee595015c17cc8a230f7dfa365305eed8d5a99218aa53ef49fc62ce1158014ab81a7c8497beea5a3729867e984eaf3 SHA512 98b5224ae530c78ce9f1981f31d8d9ab5ffceaa2e391ee33d74e7fd21650bc5f40eaa8e627c596772cedf084f37f0463c57c9bb1b7180473c6d0c5f95906aa9d
 DIST regex-syntax-0.7.5.crate 343366 BLAKE2B af07596e45e3525ffd253d6070ddad08dffc8f0409ea14843a135646da8b37a7a568c12ede809d9fa47eec2329f68da7a3b3c0e0cabfa200de64affe6ecefee3 SHA512 6388dbf68c8c86d8a5bd8cfb13a86e9ab2da1a339fd607c1a16848f85dd21c85d744d694c7b918954ea27eeefc90b589926c9da464343fb78ab639a5e2925efd
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
+DIST rustix-0.38.43.crate 379134 BLAKE2B 7e527b0a98485c029b89f2946f07226d772d9ddcce2f21d7fc7b74c2f2377f780d7fb0529f9af1be6a750a0d1a00393534708dff48f4bbd0678cc75ac1a9a6df SHA512 0122fc3ef3b1199105f63e3d06df0992b7fbf4a3f0bf54cf68ff8035ed96329c90c2ec30b365f02a7a9ae1f0018897489f5be77787b4048c2bfe49b30d7839df
+DIST rustversion-1.0.19.crate 20616 BLAKE2B 025944fe053ef928f26affb890ef6a563b0e63cf6acc0ce7bd4ff104541f819bbda48ebb59fd8a677e44ca1ea21f4a18c209adf2004c9ad79604dfbeca43b5fb SHA512 45b959aea8155ee47c51aa1d87c6c344b5f4b20199a2646ca30bdabe1c2458b014be91fe0c48c29c2261ad9e5de6df7eef7ddead1682e584d4a906c17984baab
 DIST ryu-1.0.14.crate 46861 BLAKE2B 208fa87e54e3c6831193ddefcdfa7e9731a3b72de6ea23a4af708a15487cf4d6cbc49fd3681da078390741595ff5d44b02e607cab6ea9e37e7f5f05c7275b4a9 SHA512 9832c760d1ac674ba362639968962928971231d696e450738045ca36ae2780116ad865b2bdd96e36f14d8f92e12107dc8b75be90c74d76e3bb834a94bd6e5599
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST serde-1.0.190.crate 76455 BLAKE2B d0f6a52615136d810760c6da3078387abc67ff5119e25953004d470ec6f5c569abf1c324b777c004714b4b15bd49a9972ec592372c807b26f3b4f124d534c833 SHA512 7f1cbe819fbae803865beb20b5d8b9fa52d503e04083be7181c1d04b702aaecf553796db960bfea87dc17ef864246e78a919219588064fb083e77dd2c6c16ce1
 DIST serde-1.0.215.crate 78527 BLAKE2B ca8e1175839ca45a4d78a155f5943396211408a85e0840b065c52948188010653d68fc4fc7b63bf2c39a11a6988abb7f6f3c6d878ca1373596e0a5d62186e109 SHA512 3da13f1a74393f1fcb6d659b5e060a11ecae358f55cdf4a2fd05bfc863fea6f75d3140d3bc74902f8feba8cddf7dae71a3f4e4e78e78e1b08ed46b3e4900281f
+DIST serde-1.0.217.crate 79019 BLAKE2B a0aacff795d34583365ddd469fa14c58a6cccf8afbb248210aaff3134c7ce6e34b3d03f437326d7c01b3e78f82a5d19c37ed9fa4372970d8b2793f2889288e1c SHA512 f97b3b54b9e99c9a027390405cc054c3072f49c92803a4ed5f5f69e76a179deda9d77993b645b3581437085912d881da88d0451b9e0da423c64033a23fdd8054
 DIST serde_derive-1.0.190.crate 55676 BLAKE2B a6558987927298a6551a52d7a8e265acf1a3a0576716a881329803637b6f7ee7b3329e161bf5b37e410264c03913c2c16166df7dd25110b1295d61806600f4f2 SHA512 5b37b659c45ab95b0333d787cc5e8374076121d548837556774cbe768073b02aef4a6889e32b738ce5d85613264ba78570c0af48d049102d4d687ad791dd09ea
 DIST serde_derive-1.0.215.crate 57092 BLAKE2B f28bb66017599afdcd8d45c514b8e07854eb944c1dcf931e052a01ce421e0de6c20c13b3867da5922e2153e25ce88bf9fa27e2e68ddc9d212977f71fa0bd6352 SHA512 cae686bdf10c683149956ffe1c64fcf3e9b9bf0cd6e33b4ce7429d0ca35b9fdb55443693866c1202fa79348c6ea0f49ab3be3d5f857de4ae0818d2b4c8c67d9b
+DIST serde_derive-1.0.217.crate 57749 BLAKE2B 63b4930122d80d64492ba2718630513012202e42bbaa74510729ee66a0e72b8a1ad123784b479697ba562db43868f4bddfdf5e94bb3d744cd68a547471ba40aa SHA512 31020f4533d04b31ae125580a3c5093fad36438d324e2d9b063923aa8c125c654102ae7fbc3b3df892bb41db6b321962a23e0a37950e080055d715d15b18af76
 DIST serde_json-1.0.108.crate 146476 BLAKE2B 9c0ceae5566a4e0ce7a6264939862f9dd920bb47d18acebb179798b036c376d97a4e9b0717092903ab90cfbf6fb73d37518e3cc25f3217af010296f5644de396 SHA512 7d8d1b74515388d99983ffbc5696cba022305cf4c797d3ff5d2959fc8fc8f4ce01cc4c9e7ccae7097b06b5acf5307027f6b7315df1fd8f58e681cc5968e79fb6
 DIST serde_json-1.0.133.crate 150739 BLAKE2B 7891eb5b8edcc7fd09ab1e15d3881ffdcb629aa39f2bd758c0505700a5f2dfabd85b1b66c3b094268bc1627b346e204c792f4ca61efa76c54ab9cd5744fb0ee2 SHA512 20e65ec87bff319897a141960d13deb5cadcf821209c1ee8799f1dc7f458ce432bc62c16df5bdada1c8d3cc01ff23b8125e8fa0a03545d4614f32efd687dc69f
+DIST serde_json-1.0.135.crate 154499 BLAKE2B deeb22932145715d6a443b36b9b984b6ace1e254199db9586c48dcfdd270a3208ef127584431e19a826947df705de78f07e58d9126ee1c5ccd2bc73d1e779bd8 SHA512 e19c583aa4a55f1c3b9a4e49b8b5c6b66e91c893db06e52f33e87608be1ff0aa27996065157f45dd4d2c59b752259ae747b2d353fe7cd1d466f56cd8a97fe71d
 DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-2.0.38.crate 243284 BLAKE2B 660de454989016dbb352c262d5d066ddc663eafcb928a2f62f61e6faf14cceed5cfbc37559e3795e1ce7886c78842be71eaa82ddced0cd6dd99ad99f95ab8ca4 SHA512 84fd4f4bc6de97cdb63a1ee9161daf8fb8fd1fa0f3c3bba4a29c463cd62cffd292c45b8cf17fd0911e580098cadc7b167e4e686595d31d72e7b53ee7df6d5f04
 DIST syn-2.0.87.crate 278076 BLAKE2B 93385f64103fdb482bec34c7912474ae7a5935948715e6eb9a54907e0db5c39f089f6cd393bab33c935c59a1bbb0f4099431f206343811c1a450554d96a35756 SHA512 bcfff545d6dfefd81e09f8f30a86bdd85759b3a7d4093ef3365ed02718e10dbd604c52b94c9d7fa955d339fdc5b6c079940c6f345b5a48c52b5c8607794ca6f2
+DIST syn-2.0.96.crate 297497 BLAKE2B 68b62de28ad670572096a1d92ff8ed6fb55fee441f2d429edfeffcc48fa1d4f1cd39327540a4216d94a9763b84831956cb7e5c8ce89b81f1dc5767ea5734620d SHA512 ec2e352a5b0b2aa619774c01d7a7767674a44ffe91dea45d3379bf172d13039c3d37f264e98e26b20fe1d86db6d5190f220831c842f3316469d4ae73c2bfddec
+DIST tempfile-3.15.0.crate 35693 BLAKE2B 1b4d6b17ed4263ff89ef6967650b0c18671b2b80cbfe388cbfd77ca597473e91c1c7aebfc715d0fe4360c20d0f235df31147b1f029b471aea8c57d188f7c2be0 SHA512 82636d50a29e1ea8cc61e80dc1fa28ea4cfaeb6175e5bf0558d6cd6f8da823f50a808a555ec17fc8601acfd0f504e15688fe95f64e8792feeb216bf27678807d
 DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
 DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7
 DIST time-0.3.20.crate 111856 BLAKE2B d4fd3d3f9fb164b26317fa26788014419902147c7f17816a09565590245acf72019fb57e88d4f4ad4a399c5dc92247af9e915fc5d2168710f81673ed609a055d SHA512 689099bcd5cfea6b92d88584d92e7c15163f427f621c653026e3b3f8066a3932836de3f8be9716a41b77f1d36a9fa6c3e2a42ab011d21ca38efeb55522a39145
@@ -103,27 +128,45 @@ DIST time-macros-0.2.8.crate 24295 BLAKE2B 6b54c83b11db8c8490383764a0e6f3a2c3f17
 DIST typed-arena-2.0.2.crate 11848 BLAKE2B 1d2821519c959b8e5f32942fb106f836a9aa753a43058cad6898588f8e0d9abcbe7a94a91ec8d30c62e59833563df48229c6aeec8bf7a396de20895e39571d11 SHA512 33f43488ff63ab763e4330d124e3290ece41e50ab78b6f12dae3a2be4d7f5bdf6ec876ab3b1f8cd81874e335fc41f3a2254994f250d3d6aba682fce557a6a399
 DIST unicode-ident-1.0.10.crate 42039 BLAKE2B 3365850e1991b9e572c6917a35f3c85523d921d5ebd9fa7025fbc1ce2a0518b06aaa9f3e3bfafb47d357226b5b9964145c7f1b5ddc16cb7280542f6c96f650ec SHA512 5dcc24e138a86f84cb05290332d02953b0ca18839ead1e74b0319bc361ea449700e04d62a51e435cba266121e463643e017718d3023a84f844a59e4ca4475686
 DIST unicode-ident-1.0.13.crate 43279 BLAKE2B b5e935020d1c9f3aa24f7d382f6b73d6510d654a61ce1c9c024e2e365bb817182e076139f370e822573531356fb78ff7499049b1f29aa1e2f4a2cc74a955b47b SHA512 5ba884f39debe9c8eb0b1d251ca713f7e2bc191d211707ed10cd81465487dbdca53914c19e131edfa1da15af132dc2c346260c3969c61e3747b63399ccb1cc51
+DIST unicode-ident-1.0.14.crate 47547 BLAKE2B 30e0b6d7f3a967aaf5b9d91237008a60c3a8ded53bda901696e23cea3931dd71b01ddab866dca9e31e17c395d5f5a68f2a938655b693e894962568c2cff5ca15 SHA512 7c6dcd1724e8cfedc37546d1abd49088b633dad228097acc73d7b6cab255b223e830c541144e05a00388fd8ca8066f27c18792419cfa58ee9da4460a38d0bc0a
 DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe
 DIST unicode-width-0.1.13.crate 457228 BLAKE2B 757c4da5fa090369a26130b08440c2348f1cd1c0dfbb6770dd75b65eba797eaa65f5d683f0c2862cced06124d46a89b4825af0d990f6adc2df8709b8ef291665 SHA512 9781d6dab2c6343e8c28ec66b50cb4293261bb2114e122fa80ad2facdb23020f5b621c38030193b918669e58adf143808e5ab4c507c18beb6dc61e97b2e296f4
 DIST urlencoding-2.1.3.crate 6538 BLAKE2B 65777b0990aa6b3d27a47f36114da8622026ac8946b5ffb6e04172b666ec7244a55c250a7fb626472bb2b636eb32ee945599cee5ce7351c3cef2322366db15ff SHA512 035848d9243ed6a4528377b56edd7f8bcb5f824381b420dc8f5c4bfc3f1246655c54eaa7de0e4aaa7138e0b08fd796b9ace140ab919aed2d94f6952b577386ac
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
+DIST wasm-bindgen-0.2.100.crate 48288 BLAKE2B 8fc4f71c7d6cef15f131a9bdbb50e3eaf9f3894a5b6c1d73876824efb731b46e8c3449947893103f23bc15cad228a1b8bcccd45ada20df53b3f3dde6e419c184 SHA512 2a8ea7ec669efe10f5701dc3b2bf496e33afa70c31dbc65fda5191c9c28ddde54fa38bb168a41b0319a4ff0bb5ccd897ce51ccd7e523e647b3544fb390f8a4e3
 DIST wasm-bindgen-0.2.92.crate 184119 BLAKE2B ca256c686bb3854492bad6afe3cd27dab314561a1ea2e0205579820066b462bacdb2cc01075fb420bd20eb33b03a648ce1ff46feee04d8759ea8aa990ff8232a SHA512 6e46501276c0d4befbf930c816d6ae6c3764e3b5ce0ef4aafa627a6ea371f1a056ecc15970a817e9e9bf51c0a2ffa57df427d758b2d367beb6a474d75b8939a5
 DIST wasm-bindgen-0.2.95.crate 43894 BLAKE2B f14fa63110c62d3bd51c947f31ee96b11812fa60d6adb9cf1907f99c011bd43ab8e14b437fe8b6357cde37124769080b3bd20a2a947fafe3bfd6cccdb875b5a2 SHA512 5a303a6e9bc71030371d6a60a04064b148423d89b6d5de4232b24ff5205175c5236812209eccfc60d8f82a876d3b745ae76ebcb30811eaa6f39701c9a84e1251
+DIST wasm-bindgen-backend-0.2.100.crate 32111 BLAKE2B 6bbbef709753e22230176121388a95fdb8f4dd32e0755dce5bf6c1127c54a236af292f319d14b5cd97bdb310fee65288e8f404921b83693e287164cf9d589a2e SHA512 a2ee30c1185644f989af6be34e93149a791c05125de24c0ff91c320f683f6f5d939fe42b8ca09d629096388a39256469f8b96a6e35722ccfdbe8d978c9a51770
 DIST wasm-bindgen-backend-0.2.92.crate 28348 BLAKE2B 425497aa7a023b70549c55d5a15dfed80877c5503863b186c0a9d11b29551c4606c1cd5961c7dfdeee2eab5662952ad7ad215513e93abe727a33f84b30bd181e SHA512 22e4f5848d62bd1fd55f4f054ea1293e223b3cd6f916bde2523eec10388e733623492c3a3246d61831e696dffdec5d000b95e9aa1217be6e38dd6459872166aa
 DIST wasm-bindgen-backend-0.2.95.crate 30487 BLAKE2B f199e3392e964c4b0e6a7b2e3ccbbdc458973b4aae4193ce36ee0ac18d595230be9ea6708caa439d70aa92a7b924f51928059984f560e5dad20d41eaf06616dd SHA512 1bea648ca248cf13383b297917a5c315da9e4830a8c49cd3ba23392566725cceae818b4e7e60ad85360c9073c2e557fa36452a2cbc8e05b60318feda7404026e
+DIST wasm-bindgen-macro-0.2.100.crate 9663 BLAKE2B b8a3fc6b3571f8caf106a9e9f3d9cc48b86096d714c5d0208f03d44d47003b3b26441b5cd68bcd49a8c05758bc1b984e460fb62ab439ff2d68c72766ce20358f SHA512 a1942f838eff5fd54406b573d81fe18f262df48a19535245b1a46cb31db2a022746e861d72e5286c632969d15d416655460d3865309c4947cd3d7965dead5c42
 DIST wasm-bindgen-macro-0.2.92.crate 13835 BLAKE2B 1f2202fdaeb78c32813eaf08b2fbd7aa9c469228386df71b8ffd81a46374e39a7104b79991f702505f9b7e97957fda8574517fbb03e3f9e93098c4d6e1e46be3 SHA512 78d2ddac88a9ca3ca5eef8a7af81cdf2366187a67d844e69f65f6893d1949f9723ab5f2be762c2217a5c21aee2f3dbc2d5d55ef0c9cbf0dec0d52d67a6ba7462
 DIST wasm-bindgen-macro-0.2.95.crate 6938 BLAKE2B 672509ff595fae86492dad98a4480f28d74a51fc8156ce7f96928b148f3af7f0f45ca9560b72148c6ad2d45ddfbbf3dbe39e2c94603ef92a925ac5503d939d2f SHA512 1f52188932e20145cb23d527a733fb5fe211813826c6b5ec04277e376127b700aea181efa5f60e34d120f10652066fbdf001952024017cccc7af728a3c8e41d9
+DIST wasm-bindgen-macro-support-0.2.100.crate 26243 BLAKE2B c18e35978b62dd2822ba8a4f6955cd5154b2a0d81b8e8032c2f8bda42c1c25f74a13f3e1c3a7bf47a823de2517a237e6a1aef18b189bf1f2b934123c58d1eb34 SHA512 0d03eaeda37c9c6ae06c0fa96e872b54780c4cf545b621c730dcc113dd59a8cb6333c5e3818f51365f71913b9669d8a870a06e70729722d03c07a49cff8a4fdf
 DIST wasm-bindgen-macro-support-0.2.92.crate 20092 BLAKE2B 8e274a4053e7afc680740e811c3941478caf5342e2206e3d28cdea9f9514bedbfa4f2b6bc608817306a1c455dd7134b7e17f0f04499f6bfb5302f29b041ac7ae SHA512 92543d2aad0b25798ec20e68832b823610c2c01401088cd9cac1684a86ddd1b567b3e2712acb862060f9c645a0df509b01d9834fd3e13cdaab97960f66d8daa7
 DIST wasm-bindgen-macro-support-0.2.95.crate 21331 BLAKE2B a1f71b727736b7166af5a9ad739da33f07ac3d7a190a27621f8a9821530f9bed78a6c437d194f9609bef91ebea0ed9ce1738eea0a9800344b8af9ce7df868da0 SHA512 f45d78831c37401a417c837281d1705b84eae5db430630a9caf544ce5d92f1ddd945baa3bccf26f4c58170e3cbea035174d8b60f906d2757b152e1d090baea58
+DIST wasm-bindgen-shared-0.2.100.crate 8570 BLAKE2B 886fa72cae891d4c2311e12e28f0a7bde9bcaca893603afa3428a402726b3b2bcdb6cb7dca6fdf983bd8fac5f049f0543537f2161318769b43c7eebfc906df27 SHA512 3fca8ddd1c6b2f66f70f6608c9b341822603f1c0dd71d47d27c6be8fe3f2c88598619946627720734b48cf999cafd0c63a08af5db28ea78a1538d2165a5fba61
 DIST wasm-bindgen-shared-0.2.92.crate 7263 BLAKE2B e54895486b9a31cc4651b7bb042059cc84421708346c06a9764315ebd4f440a1077520c7d325d6889a690b2c06aa185d40cede2dc4d061b363594cbde20fac31 SHA512 70e3a22731ed8aec428433bf30500eb3f62e3b7f4f1be34d8bb3b6f34f99690fc85d49eb413caecab807064494cfec64242c6a42709dffd638046e370bf86e07
 DIST wasm-bindgen-shared-0.2.95.crate 7649 BLAKE2B c18f531c6094b49af3b2beea93914d16b0054a707011890f9054f4cb313ed6b433e3f73c7b42accbd1fa59d1f14c2db5ab0f0a82cde107b9cf437fad8b4cd7bd SHA512 3ce689a4c845765bd6e1f84b94948df3ef84560d98d830a15c1932a2ab1942ec91465db65cbf14a045526cf003218aa5c3209dd06e8ee8a39815757f56356099
 DIST web-sys-0.3.69.crate 728877 BLAKE2B 9f1678cbddb15f5a37331216a43785c72896f87e8ce62c6b9e69007316ca6eeaa7edbb33b9f2d9bf96c98de2a1e10afe491d8734657b186e2c3905ad1ff19ad9 SHA512 78b79ceb6a47485c766ad660bb8b971ba549424542a020c35c7db64a19f7b161617e464eaea0602f433b6ac4973b8d1a86a56e76dcda179ccea60aef1245347b
 DIST web-sys-0.3.72.crate 629190 BLAKE2B e8cbf0bf36a1de4b0507c4a57724083f8a7f6332a138455de5ae1090e757872b217e2d2f6d0cb345088cfb4cd5ccf49360919838a299a74aebd0afe4dc688462 SHA512 997b27fdfd0291079f3f16999499404968a9d079ccf326d8eb17dc0f89a87cfe52f6fa780654612c769cb24dffd61baac22c5965b9feaa9c1f0624c203d2d039
+DIST web-sys-0.3.77.crate 638246 BLAKE2B 3f21ab03a18d82cffd96432e4f08bfae183b24f9a50dcfc51c927e9973dabfb8b6bb1f3ae044890832809ec91709242c1c37463931770d347fdf521587a72515 SHA512 cd149286105288f7c385a29eae7df2306d4066edfca4de1255efc7bd8a4e8eaafc313dab85091025c3b5d5e333fce8b7fcef1fb824fe4d799bcc9bb78b73c97a
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03
+DIST windows-sys-0.59.0.crate 2387323 BLAKE2B 3110c8cd2bc005f8c95cd038a8d574af648dc19788fe4485f977376f92e36b911b1a542d669a07ae9cd4ea72a884ab01ec78b8a2b5587456eb202452d1d8fa0d SHA512 d35e009e979633a1f3c8468cd038bd5c8c0381405165ce03497decd7d9edaaac485d704487e4a61d9aaf4e4d011b4248408912df6a0044d50e8457259867e061
+DIST windows-targets-0.52.6.crate 6403 BLAKE2B eb98d0a8daeed5fe76e7fa8edb2743e2a3e77dfb9c4ea68605a6ab10532cb7cfc43bc1cea0180869445bd940be762a40136500e26b84ca88b5e0c502004c7a4c SHA512 d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f
+DIST windows_aarch64_gnullvm-0.52.6.crate 435718 BLAKE2B 8b12ae02892cb69401329034bbca671d13bd268a112120b56b90504707cef89decfbd2560492844a9f0588fab62dc1476ab7e931126b939015d25a8cc91ca334 SHA512 f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5
+DIST windows_aarch64_msvc-0.52.6.crate 832615 BLAKE2B adc8ff61b6dc96d39c92c7d4221ae6aa0575edfc016cfcd046067ca5d8fcfd56d10e8e227be1c038ce34684be22c7ccaf5f18cd5a7638d28fbff4ba15b48b90b SHA512 a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b
+DIST windows_i686_gnu-0.52.6.crate 880402 BLAKE2B 5aab8ee07132eccb7695807eb44811beeb0657aadfb672c54e99b6ae39c067ba9b93e38fc69bb5b9b14a9759f263ccd5e301597d2727d83b31b49a409b6bd405 SHA512 a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822
+DIST windows_i686_gnullvm-0.52.6.crate 475940 BLAKE2B fec4fda8bb2bf319a501a22372fa642ae682e4dee3235b258a028190ee73220bfc55b3142f06249bb4579b17e5fde662bb2b121aefe18544653350d7d0fe7d8e SHA512 95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f
+DIST windows_i686_msvc-0.52.6.crate 901163 BLAKE2B 99ed34e052db5ba77bab240ed5d38ce450be347a794d63ec39b719304c32722c9999b540ab40abe0216318900b7412970df99dfb36d1516a9517cae0c77d1bdc SHA512 ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96
+DIST windows_x86_64_gnu-0.52.6.crate 836363 BLAKE2B e2335829155cdbd4a55cc9f9babc237e14e32aab97f6f91afabcdf80d2aee37d6fb4b8669aaf433ff532c85dba59b3d366c7d41b61a2f29b96f960169c900687 SHA512 c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb
+DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd
+DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
 DIST yansi-1.0.1.crate 75497 BLAKE2B c0d396c93a733ed6ec12aca3385d816f39b1f1fbed75da460f491f0cbfc30ba462842ebd1627fa8e5d2b7c0f37913a23747e5f5e23df1cb7c85d965e6c37159b SHA512 182c8c6c60a30a727d8f8b90bbf0527d91fa8ae9d8eb20e5414614b43ee6dc532f4b19241adbfb9299cb0004b39fe627036269b60b0c3860d9e1ea4413aca541
 DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82
diff --git a/app-misc/jaq/jaq-2.1.0.ebuild b/app-misc/jaq/jaq-2.1.0.ebuild
new file mode 100644
index 000000000000..061b9806f74a
--- /dev/null
+++ b/app-misc/jaq/jaq-2.1.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.4
+
+EAPI=8
+
+CRATES="
+	aho-corasick@1.1.3
+	autocfg@1.4.0
+	base64@0.22.1
+	bitflags@2.7.0
+	bumpalo@3.14.0
+	cc@1.2.9
+	cfg-if@1.0.0
+	chrono@0.4.39
+	codesnake@0.2.1
+	console_log@1.0.0
+	dyn-clone@1.0.17
+	env_logger@0.10.2
+	equivalent@1.0.1
+	errno@0.3.10
+	fastrand@2.3.0
+	foldhash@0.1.4
+	getrandom@0.2.15
+	hashbrown@0.15.2
+	hermit-abi@0.4.0
+	hifijson@0.2.2
+	indexmap@2.7.0
+	is-terminal@0.4.13
+	itoa@1.0.14
+	js-sys@0.3.77
+	libc@0.2.169
+	libm@0.2.11
+	libmimalloc-sys@0.1.39
+	linux-raw-sys@0.4.15
+	log@0.4.25
+	memchr@2.7.4
+	memmap2@0.9.5
+	mimalloc@0.1.43
+	num-traits@0.2.19
+	once_cell@1.20.2
+	proc-macro2@1.0.93
+	quote@1.0.38
+	regex-lite@0.1.6
+	rustix@0.38.43
+	rustversion@1.0.19
+	ryu@1.0.18
+	serde@1.0.217
+	serde_derive@1.0.217
+	serde_json@1.0.135
+	shlex@1.3.0
+	syn@2.0.96
+	tempfile@3.15.0
+	typed-arena@2.0.2
+	unicode-ident@1.0.14
+	unicode-width@0.1.13
+	urlencoding@2.1.3
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.100
+	wasm-bindgen-macro-support@0.2.100
+	wasm-bindgen-macro@0.2.100
+	wasm-bindgen-shared@0.2.100
+	wasm-bindgen@0.2.100
+	web-sys@0.3.77
+	windows-sys@0.52.0
+	windows-sys@0.59.0
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.52.6
+	yansi@1.0.1
+"
+
+#RUST_MIN_VER="1.65.0"
+inherit cargo
+
+DESCRIPTION="Just another JSON query tool"
+HOMEPAGE="https://github.com/01mf02/jaq"
+SRC_URI="
+	https://github.com/01mf02/jaq/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	MIT Unicode-3.0 ZLIB
+	|| ( Apache-2.0 Boost-1.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_FLAGS_IGNORED="usr/bin/jaq"
+QA_PRESTRIPPED="usr/bin/jaq"
+
+DOCS=(
+	README.md
+	examples/
+)
+
+src_install() {
+	pushd "${S}/jaq" >/dev/null || die
+	cargo_src_install
+	popd >/dev/null || die
+
+	default
+}
diff --git a/app-misc/jdupes/Manifest b/app-misc/jdupes/Manifest
index 316a49a0e4a5..d0e2d3a028f2 100644
--- a/app-misc/jdupes/Manifest
+++ b/app-misc/jdupes/Manifest
@@ -1 +1,2 @@
 DIST jdupes-1.27.3.tar.gz 174779 BLAKE2B f6697df396e2f6e285d17465de183904f87e0b34b2a46bb7aeea6da8696ae31951af3f2f26b6e71cedbd25c756456ece055b99e76f92eadabd79a01183161d59 SHA512 ee2d60a922558e2aa819f9074fb0b3b38cc93ddc4f6ca3a1d0dd8731c4ecf72d1b6cbb0bc85be7cd63b21f7d9138efadfb64208122a4eebd4e55756a3edd5bcc
+DIST jdupes-1.28.0.tar.gz 176657 BLAKE2B 51f560db6b49eefd1ddc249d05e4034321fae03e6ba8d316c964e021dfca658e8f46311eebb261fad922060c4ecbced2316cb780c71e88cb021b084f31f181c9 SHA512 5de369b92653382845bf89f4a1fe894cee9914cd0124c3ca0217d05e5cef14050a14ad538e154c970f81b1b300e02fd055befdbbcd1c79bd790e6e26a4be5b84
diff --git a/app-misc/jdupes/jdupes-1.28.0.ebuild b/app-misc/jdupes/jdupes-1.28.0.ebuild
new file mode 100644
index 000000000000..3ea4cf00fa46
--- /dev/null
+++ b/app-misc/jdupes/jdupes-1.28.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Identify duplicate files on the filesystem"
+HOMEPAGE="https://codeberg.org/jbruchon/jdupes"
+if [[ "${PV}" == *9999 ]] ; then
+	EGIT_REPO_URI="https://codeberg.org/jbruchon/jdupes.git"
+	inherit git-r3
+else
+	SRC_URI="https://codeberg.org/jbruchon/jdupes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+LICENSE="MIT"
+SLOT="0"
+
+# Please keep a careful eye on the minimum libjoycode version! (Just pick
+# latest released at the time if necessary.)
+DEPEND=">=dev-libs/libjodycode-3.1"
+RDEPEND="${DEPEND}"
+
+IUSE="+dedupe hardened"
+
+# tests exists, but are empty (dropped by upstream)
+RESTRICT="test"
+
+src_prepare() {
+	sed -i -e '/PREFIX/s/=/?=/' Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export CC
+	local myconf=(
+		$(usex dedupe 'ENABLE_DEDUPE=1' '')
+		$(usex hardened 'HARDEN=1' '')
+	)
+	emake ${myconf[@]}
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	einstalldocs
+}
diff --git a/app-misc/jdupes/metadata.xml b/app-misc/jdupes/metadata.xml
index c1543e415690..85fffd06f66c 100644
--- a/app-misc/jdupes/metadata.xml
+++ b/app-misc/jdupes/metadata.xml
@@ -13,6 +13,6 @@
 		<flag name="dedupe">Enable deduplication support</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">jbruchon/jdupes</remote-id>
+		<remote-id type="codeberg">jbruchon/jdupes</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-misc/koleo-cli/Manifest b/app-misc/koleo-cli/Manifest
new file mode 100644
index 000000000000..6e32b077b4d4
--- /dev/null
+++ b/app-misc/koleo-cli/Manifest
@@ -0,0 +1 @@
+DIST koleo_cli-0.2.137.16.tar.gz 26468 BLAKE2B 7f42691dcf32dd11b82c7664cdf1234ee21b7898857c6f44a33e66533140b055ae90f6d50b44d1bf3e7db806292eeff56dc82923d1e07d2129994355c6d7c32b SHA512 7ea6ebb84986bdcdf679b13eba625d6c1e4f07c4b706c7eb3dfb4efafae420fb414c756bcb2fcdf72cca088374be67e233a176e3bb0f6edea26d54cda79d9018
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-misc/kryoflux-dtc/kryoflux-dtc-3.50_p2-r1.ebuild b/app-misc/kryoflux-dtc/kryoflux-dtc-3.50_p2-r1.ebuild
deleted file mode 100644
index b70bb530a9ce..000000000000
--- a/app-misc/kryoflux-dtc/kryoflux-dtc-3.50_p2-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="$(ver_cut 1-2)"
-MY_PV_DTC="3.5.0"
-MY_P="kryoflux_${MY_PV}_linux_$(ver_cut 4)"
-MY_P_DTC="${PN}-${MY_PV_DTC}-Linux"
-
-inherit desktop udev wrapper xdg-utils
-
-DESCRIPTION="KryoFlux Host Software"
-HOMEPAGE="https://www.kryoflux.com"
-SRC_URI="https://www.kryoflux.com/download/${MY_P}.tar.gz"
-S="${WORKDIR}/Linux_Release${MY_PV}"
-
-LICENSE="SPS"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm64"
-IUSE="demos doc gui"
-
-RDEPEND="
-	<dev-libs/libfmt-11
-	virtual/libusb:1
-	gui? ( virtual/jre )
-"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=( "RELEASE.txt" )
-RESTRICT="bindist mirror"
-QA_PREBUILT="
-	usr/lib64/libCAPSImage.so.5.2
-	usr/bin/kryoflux-dtc
-"
-
-src_unpack() {
-	unpack ${A}
-	unpack Linux_Release${MY_PV}/dtc/$(usex amd64 x86_64 arm64)/${MY_P_DTC}.tar.gz
-	use gui && unpack Linux_Release${MY_PV}/dtc/kryoflux-ui.jar
-}
-
-src_prepare() {
-	default
-
-	# Remove whitespace for demo files
-	pushd testimages
-	mv "G64 (C64)" g64_demo || die
-	mv "IPF (Amiga, Atari ST)" ipf_demo || die
-	popd
-}
-
-src_install() {
-	newbin ../${MY_P_DTC}/bin/dtc kryoflux-dtc
-
-	# We need to use bundled libs instead of 'dev-libs/spsdeclib',
-	# as source code is currently not released.
-	# See https://forum.kryoflux.com/viewtopic.php\?p\=17105
-	dolib.so ../${MY_P_DTC}/lib/libCAPSImage.so.5.2
-
-	insinto /lib/firmware
-	doins ../${MY_P_DTC}/share/dtc/firmware_kf_usb_rosalie.bin
-
-	cat <<-EOF > "${T}"/80-kryoflux.rules || die
-	ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="6124", GROUP="floppy", MODE="0660"
-	EOF
-	udev_dorules "${T}"/80-kryoflux.rules
-
-	if use gui; then
-		insinto /usr/share/kryoflux-ui
-		doins dtc/kryoflux-ui.jar
-
-		dosym ../../bin/kryoflux-dtc /usr/share/kryoflux-ui/dtc
-		make_wrapper kryoflux-ui "java -jar kryoflux-ui.jar" /usr/share/kryoflux-ui
-
-		newicon ../images/disk.png kryoflux-ui.png
-		make_desktop_entry "kryoflux-ui" "KryoFlux UI" kryoflux-ui Development
-		dodoc dtc/kryoflux-ui_README.txt
-	fi
-
-	if use demos; then
-		pushd testimages
-		dodoc -r g64_demo ipf_demo
-		docompress -x /usr/share/doc/${PF}/g64_demo/BBSB/*.g64
-		docompress -x /usr/share/doc/${PF}/g64_demo/DOTC/*.g64
-		docompress -x /usr/share/doc/${PF}/ipf_demo/*.ipf
-		popd
-	fi
-
-	if use doc; then
-		dodoc -r docs schematics
-		docompress -x /usr/share/doc/${PF}/{docs,schematics}/*.pdf
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "If you want to access your Kryoflux without root access,"
-	elog "please add yourself to the floppy group."
-
-	udev_reload
-
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/app-misc/kryoflux-dtc/kryoflux-dtc-3.50_p2-r2.ebuild b/app-misc/kryoflux-dtc/kryoflux-dtc-3.50_p2-r2.ebuild
new file mode 100644
index 000000000000..93523baee0e4
--- /dev/null
+++ b/app-misc/kryoflux-dtc/kryoflux-dtc-3.50_p2-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="$(ver_cut 1-2)"
+MY_PV_DTC="3.5.0"
+MY_P="kryoflux_${MY_PV}_linux_$(ver_cut 4)"
+MY_P_DTC="${PN}-${MY_PV_DTC}-Linux"
+
+inherit desktop udev wrapper xdg-utils
+
+DESCRIPTION="KryoFlux Host Software"
+HOMEPAGE="https://www.kryoflux.com"
+SRC_URI="https://www.kryoflux.com/download/${MY_P}.tar.gz"
+S="${WORKDIR}/Linux_Release${MY_PV}"
+
+LICENSE="SPS"
+SLOT="0"
+KEYWORDS="-* amd64 ~arm64"
+IUSE="demos doc gui"
+
+RDEPEND="
+	<dev-libs/libfmt-10
+	virtual/libusb:1
+	gui? ( virtual/jre )
+"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=( "RELEASE.txt" )
+RESTRICT="bindist mirror"
+QA_PREBUILT="
+	usr/lib64/libCAPSImage.so.5.2
+	usr/bin/kryoflux-dtc
+"
+
+src_unpack() {
+	unpack ${A}
+	unpack Linux_Release${MY_PV}/dtc/$(usex amd64 x86_64 arm64)/${MY_P_DTC}.tar.gz
+	use gui && unpack Linux_Release${MY_PV}/dtc/kryoflux-ui.jar
+}
+
+src_prepare() {
+	default
+
+	# Remove whitespace for demo files
+	pushd testimages
+	mv "G64 (C64)" g64_demo || die
+	mv "IPF (Amiga, Atari ST)" ipf_demo || die
+	popd
+}
+
+src_install() {
+	newbin ../${MY_P_DTC}/bin/dtc kryoflux-dtc
+
+	# We need to use bundled libs instead of 'dev-libs/spsdeclib',
+	# as source code is currently not released.
+	# See https://forum.kryoflux.com/viewtopic.php\?p\=17105
+	dolib.so ../${MY_P_DTC}/lib/libCAPSImage.so.5.2
+
+	insinto /lib/firmware
+	doins ../${MY_P_DTC}/share/dtc/firmware_kf_usb_rosalie.bin
+
+	cat <<-EOF > "${T}"/80-kryoflux.rules || die
+	ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="6124", GROUP="floppy", MODE="0660"
+	EOF
+	udev_dorules "${T}"/80-kryoflux.rules
+
+	if use gui; then
+		insinto /usr/share/kryoflux-ui
+		doins dtc/kryoflux-ui.jar
+
+		dosym ../../bin/kryoflux-dtc /usr/share/kryoflux-ui/dtc
+		make_wrapper kryoflux-ui "java -jar kryoflux-ui.jar" /usr/share/kryoflux-ui
+
+		newicon ../images/disk.png kryoflux-ui.png
+		make_desktop_entry "kryoflux-ui" "KryoFlux UI" kryoflux-ui Development
+		dodoc dtc/kryoflux-ui_README.txt
+	fi
+
+	if use demos; then
+		pushd testimages
+		dodoc -r g64_demo ipf_demo
+		docompress -x /usr/share/doc/${PF}/g64_demo/BBSB/*.g64
+		docompress -x /usr/share/doc/${PF}/g64_demo/DOTC/*.g64
+		docompress -x /usr/share/doc/${PF}/ipf_demo/*.ipf
+		popd
+	fi
+
+	if use doc; then
+		dodoc -r docs schematics
+		docompress -x /usr/share/doc/${PF}/{docs,schematics}/*.pdf
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you want to access your Kryoflux without root access,"
+	elog "please add yourself to the floppy group."
+
+	udev_reload
+
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/app-misc/libdatovka/Manifest b/app-misc/libdatovka/Manifest
index 0d2435aa6ddb..b87d84e06f0e 100644
--- a/app-misc/libdatovka/Manifest
+++ b/app-misc/libdatovka/Manifest
@@ -1,2 +1 @@
-DIST libdatovka-0.6.0.tar.xz 721408 BLAKE2B b8b4398a3adc85a9eb9b642733941929a8d14aa6e4323fe5345f62adb6f7488c9c5b10688f0ed1e0fde8252377ae2b5e21d00bfe00f966523cd025fd4a35f60d SHA512 5a1b1574ae81f5d3c1ca8c2cd6e2fa9c9b3dc7dde6d1dd6de662a64120f2a8d107137b77da03043d4943fa6d51e4d7bdf330e3ddb2fe73467d705b0f7baf841c
-DIST libdatovka-0.6.2.tar.xz 720944 BLAKE2B 617a0cb367d84cdbac50b2cc2d446af361828b34ca329c7872846283ea52bc2d611d97ea650e9de919ec09085ac7e5053c761e3d01373a98176f5419fe3d7fe1 SHA512 5eace37bcf3ede1ac6c35f9ce62e8eb0bb963c1eba16afa001f0d3033ad4761b4a6e9023d2a0eaa3c9d8a51423c918c7c1a98b1336d6f4c6844d7fbaa3ee2b26
+DIST libdatovka-0.7.0.tar.xz 722344 BLAKE2B 0f9658e2f7c079142c1a914d858ed1a223bba2ac6619e908f63e22b93fd2fe00112414247a0368379ce492a04504bafcfdccb5a150207c202298b1f3d241dfd3 SHA512 134b48d1d489cb514474d73ec7b38958c5f6ca0af75d818eb6233b0867fd2f8a909a1a7bd3586f1e22e77efce896e3a38ec0bc6fe575e2ca3fe4bb3453a510da
diff --git a/app-misc/libdatovka/libdatovka-0.6.0.ebuild b/app-misc/libdatovka/libdatovka-0.6.0.ebuild
deleted file mode 100644
index 49155b443888..000000000000
--- a/app-misc/libdatovka/libdatovka-0.6.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Client library for accessing ISDS SOAP services"
-HOMEPAGE="https://www.datovka.cz/cs/pages/libdatovka.html"
-SRC_URI="https://secure.nic.cz/files/datove_schranky/${PN}/${P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="+curl debug doc nls openssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/libxml2
-	curl? ( net-misc/curl[ssl] )
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-	openssl? ( dev-libs/openssl:= )
-	!openssl? (
-		app-crypt/gnupg
-		app-crypt/gpgme:=
-		dev-libs/libgcrypt:=
-	)"
-DEPEND="${RDEPEND}
-	test? ( net-libs/gnutls )"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-fatalwarnings
-		--disable-static
-		$(use_with curl libcurl)
-		$(use_enable curl curlreauthorizationbug)
-		$(use_enable doc)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable openssl openssl-backend)
-		$(use_enable test)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-misc/libdatovka/libdatovka-0.6.2.ebuild b/app-misc/libdatovka/libdatovka-0.6.2.ebuild
deleted file mode 100644
index da916814f61e..000000000000
--- a/app-misc/libdatovka/libdatovka-0.6.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Client library for accessing ISDS SOAP services"
-HOMEPAGE="https://www.datovka.cz/cs/pages/libdatovka.html"
-SRC_URI="https://secure.nic.cz/files/datove_schranky/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+curl debug doc nls openssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/libxml2
-	curl? ( net-misc/curl[ssl] )
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-	openssl? ( dev-libs/openssl:= )
-	!openssl? (
-		app-crypt/gnupg
-		app-crypt/gpgme:=
-		dev-libs/libgcrypt:=
-	)"
-DEPEND="${RDEPEND}
-	test? ( net-libs/gnutls )"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-fatalwarnings
-		--disable-static
-		$(use_with curl libcurl)
-		$(use_enable curl curlreauthorizationbug)
-		$(use_enable doc)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable openssl openssl-backend)
-		$(use_enable test)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-misc/libdatovka/libdatovka-0.7.0.ebuild b/app-misc/libdatovka/libdatovka-0.7.0.ebuild
new file mode 100644
index 000000000000..31fad3e42b39
--- /dev/null
+++ b/app-misc/libdatovka/libdatovka-0.7.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Client library for accessing ISDS SOAP services"
+HOMEPAGE="https://www.datovka.cz/cs/pages/libdatovka.html"
+SRC_URI="https://secure.nic.cz/files/datove_schranky/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+curl debug doc nls openssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/libxml2
+	curl? ( net-misc/curl[ssl] )
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+	openssl? ( dev-libs/openssl:= )
+	!openssl? (
+		app-crypt/gnupg
+		app-crypt/gpgme:=
+		dev-libs/libgcrypt:=
+	)"
+DEPEND="${RDEPEND}
+	test? ( net-libs/gnutls )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	local myeconfargs=(
+		--disable-fatalwarnings
+		$(use_with curl libcurl)
+		$(use_enable curl curlreauthorizationbug)
+		$(use_enable doc)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable openssl openssl-backend)
+		$(use_enable test)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index f767fac30fec..250bbb63f2a4 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,2 +1,3 @@
 DIST mc-4.8.30.tar.xz 2380824 BLAKE2B 2bf759314abae39db7596426cba22f6eaac0efc58e7025f1a7ef1863496ea7a3c00d298d101123b9defb109e76e31fe988227fb5c1112e06051b3c7a5b3dc1b6 SHA512 f793f744eaff236c9952d477236dd775a24d9ddd7ff46940bfe2d06da5596bed91d6bd9c85250696da6dcdc0a1890dc01c736654df3f59039674eff38e12e68e
 DIST mc-4.8.32.tar.xz 2385648 BLAKE2B eb2ac2474c86dbcfe43b4f229cdc458bdfc9de2acf1d0206198721b56ec188010aba24063c1fc079ada295c73ab915786749be1ead599a582832ca649b9a8347 SHA512 f7f46e4f065331ede638a79c821ab5ef65952ba99cf71710d4282efa9ed7de75f06c786a8f8feb27d487417f438a48959439b40bb6456eb64796d46518a3f4a8
+DIST mc-4.8.33_rc1.tar.gz 3119661 BLAKE2B 18d2f98c488a7d440e38ebc5006e10c5543b59392ed0cdc50949e8bec0c09733867a9411237edf3e15501eac7ad6ba72c288bf4c985605e5e70f6cdc54bc88ce SHA512 1a56e5c3b320b2778f9d80fc1b8f95f1ba7ef2ccc3a6bdad0bc4b795a015e3906fb914c011699787607b59a86c1ff650577aa0018f9b07f36cdd31631e8dca83
diff --git a/app-misc/mc/mc-4.8.33_rc1.ebuild b/app-misc/mc/mc-4.8.33_rc1.ebuild
new file mode 100644
index 000000000000..38a14b263024
--- /dev/null
+++ b/app-misc/mc/mc-4.8.33_rc1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_P="${P/_/-}"
+MY_PV="${PV/_rc/-pre}"
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://midnight-commander.org"
+SRC_URI="https://github.com/MidnightCommander/mc/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+edit gpm sftp +slang spell test unicode X"
+
+REQUIRED_USE="spell? ( edit )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.30.0:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs[tools(+)] )
+	sftp? ( net-libs/libssh2 )
+	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses:=[unicode(+)?] )
+	spell? ( app-text/aspell )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+RDEPEND="
+	${DEPEND}
+	spell? ( app-dicts/aspell-en )
+"
+
+# Force nls so xgettext is installed.  Will revert this.
+BDEPEND="
+	sys-devel/gettext
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
+	"${FILESDIR}"/${PN}-4.8.29-gentoo-tools.patch
+)
+
+# This is a check for AIX, on Linux mc uses statvfs() regardless of whether
+# LFS64 interfaces are available in libc or not.
+QA_CONFIG_IMPL_DECL_SKIP=(
+	statvfs64
+)
+
+src_prepare() {
+	default
+
+	# Bug #906194, #922483
+	if use elibc_musl; then
+		eapply "${FILESDIR}"/${PN}-4.8.30-musl-tests.patch
+		eapply "${FILESDIR}"/${PN}-4.8.31-musl-tests.patch
+	fi
+
+	eautoreconf
+
+	# Copied from autogen.sh
+	xgettext --keyword=_ --keyword=N_ --keyword=Q_ --output=- \
+		`find . -name '*.[ch]'` | sed -ne '/^#:/{s/#://;s/:[0-9]*/\
+/g;s/ //g;p;}' | \
+		grep -v '^$' | sort | uniq >po/POTFILES.in || die
+
+}
+
+src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	local myeconfargs=(
+		--enable-charset
+		--enable-vfs
+		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
+		$(use_enable kernel_linux vfs-undelfs)
+		# Today mclib does not expose any headers and is linked to
+		# single 'mc' binary. Thus there is no advantage of having
+		# a library. Let's avoid shared library altogether
+		# as it also conflicts with sci-libs/mc: bug #685938
+		--disable-mclib
+		--enable-nls
+		$(use_enable sftp vfs-sftp)
+		$(use_enable spell aspell)
+		$(use_enable test tests)
+		$(use_with gpm gpm-mouse)
+		$(use_with X x)
+		$(use_with edit internal-edit)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Bug #759466
+	if [[ ${EUID} == 0 ]] ; then
+		ewarn "You are emerging ${PN} as root with 'userpriv' disabled."
+		ewarn "Expect some test failures, or emerge with 'FEATURES=userpriv'!"
+	fi
+
+	# CK_FORK=no to avoid using fork() in check library
+	# as mc mocks fork() itself: bug #644462.
+	#
+	# VERBOSE=1 to make test failures contain detailed
+	# information.
+	CK_FORK=no emake check VERBOSE=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS doc/{NEWS,README,TODO,FAQ}
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
+	fi
+}
+
+pkg_postinst() {
+	elog "${PN} extension scripts depend on many external tools, install them as needed"
+	elog
+	if use spell && ! has_version app-dicts/aspell-en ; then
+		elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed."
+		elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini"
+		elog "It has to be set to one of your installed aspell dictionaries or 'NONE'"
+		elog
+	fi
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/openhab-bin/Manifest b/app-misc/openhab-bin/Manifest
index 3bbe609dc183..3fca0720576d 100644
--- a/app-misc/openhab-bin/Manifest
+++ b/app-misc/openhab-bin/Manifest
@@ -1,5 +1,5 @@
-DIST openhab-4.2.1.tar.gz 110592664 BLAKE2B 6c1ef4ff6a25904a6bd56c5bbb5d6c08163e14723a61966930ffb96183a5890f86ddc73d316d8b48712b262eae80b7e086cdf53510d5a1a09a596b591fe3d037 SHA512 1d8b4b6b7ef4f76ecaee0355842b5bbfce9c422915bdc345e974bfe7d1c275dc4f8bc317f3e53ed6778d7875c7e7757bb3d26e68e016c1d3fbf1009a6a1e070d
-DIST openhab-4.2.2.tar.gz 110594562 BLAKE2B de7f67f8891ede0eb197188740d1b8b040a8adcbcd8b505518aef9290debfa7f97a5a894fd22072fa46dbaae7e9286da2fa41afa56b54c1011f9640db171535b SHA512 0c9367780e34f8a59f74d8edf18e2a503c71cc3af0f17aaca75888243b02393eb2c6188b84e5a04c3ca63b88e80cc0eb5a6db3603e348e10ab09e9b922ac2a64
 DIST openhab-4.2.3.tar.gz 110593514 BLAKE2B bcfc73b377d82e1c747623711328e67d736408662323034f24c6143f6eb1be107ed987a766d39fb53a0f7f540e4666558356c723b31f8c0b51e082df77a680d9 SHA512 5156e9d6d73424083c83551e426b8290cb595659d955ddee3e19c61be4e3caecb9f5a4556e5aaf40f608765f814d34ff7be3d649c850c55dac862d5e1dc649af
 DIST openhab-4.3.0.tar.gz 111158533 BLAKE2B d270e0c4b1c9035ccfef2d6742e5cfdacda40c29bf4285437653f6b4870ec3567473752a426a4ab2a4fe5d87e240265009292dd9ebe0cd656a4c7cd1995ef286 SHA512 2701c987ff3020699de4d6feb16aeded53d71b31e93428cc7ca1aea6b8c442f4ed810c4785eb2c8e5f3fa10c511eeb7ab43cddd10d9d4b0afe3c1157e7af4b06
+DIST openhab-4.3.1.tar.gz 111159001 BLAKE2B 5832cf26f5578361ce83c57a2ef28fffd948b5814abcfed460825c31474b35df3b5561b128f853f56087e94f75ab1d2d00ab5be40bdc6c19f0a1741e12f1cdbe SHA512 4bd38a8a4a8c1f6b3e201c0dd67ec5e85a6dea4c5bb77e0c4f92953f338604af9eb157ebd26fdddf06366dc299bdd7a0b5471bcc2d9153ad7d6fe2d1a4bb2c14
+DIST openhab-4.3.2.tar.gz 111159370 BLAKE2B 9a95a0049e2afb9fedbd14300803f024a0a2849cee1dc9a7a39c015799b8f9b8ece9485d107f6e130c0678e568313f212a4a1601f7b159a9ff96d7f28cd166d7 SHA512 67804aad7cbfee516d6913a9dbc18d77dd826e46b62515406bd2b6177cefd46476a093512b90cce6fbb668e2c36ca9c8718245cf6686008183b1d6e3361f37e3
 DIST openhab-cli-2024-01-14 8633 BLAKE2B 0b0999abcb884b779087b92f9f3e08fee3662753692392fbb30d218d0fc25fd1fca613c32b8193a3365764c55ac3525f8369aeea4edbf61223cd0219209c4cbf SHA512 bf24ae776d4362e8a60a0c71cb025834e5f645a24377a87484477f544026f2fdd996a1781f1082e62197fce33a9dadb5972df22ce3e4cd9f73d3088ec5bc0a98
diff --git a/app-misc/openhab-bin/openhab-bin-4.2.1.ebuild b/app-misc/openhab-bin/openhab-bin-4.2.1.ebuild
deleted file mode 100644
index 683f79d8f3fa..000000000000
--- a/app-misc/openhab-bin/openhab-bin-4.2.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo systemd tmpfiles
-
-MY_PN=${PN%-bin}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="An open-source automation software for your home"
-HOMEPAGE="https://www.openhab.org/"
-SRC_URI="
-	https://github.com/openhab/openhab-distro/releases/download/${PV}/${MY_P}.tar.gz
-	https://raw.githubusercontent.com/openhab/openhab-linuxpkg/10061acd36524afb12a033fea6dcf142b399bf56/resources/usr/bin/openhab-cli
-		 -> openhab-cli-2024-01-14
-"
-
-S="${WORKDIR}"
-LICENSE="EPL-2.0"
-SLOT="0"
-
-KEYWORDS="amd64 arm64"
-
-MY_JAVA_DEPEND=">=virtual/jre-17"
-
-# app-arch/zip: used by "openhab-cli backup"
-RDEPEND="
-	${MY_JAVA_DEPEND}
-	acct-user/openhab
-	app-arch/zip
-	dev-java/java-config
-"
-
-BDEPEND="app-arch/unzip"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	# We use move here to preserve the executable bit on the files under
-	# openhab/runtime/bin.
-	domove() {
-		local source="${1}"
-		local target="${2}"
-
-		local dest="${ED}/${target}"
-
-		mkdir -p "${dest}" || die "Failed to create ${dest}"
-		mv "${source}"/* "${dest}" || die "Failed to move"
-	}
-
-	domove runtime /usr/share/openhab/runtime
-	domove conf /etc/openhab
-
-	domove userdata /var/lib/openhab
-	fowners -R openhab:openhab /var/lib/openhab
-
-	local dirs=(
-		/usr/share/openhab/addons
-		/var/log/openhab
-	)
-	local d
-	for d in "${dirs[@]}"; do
-		keepdir "${d}"
-		fowners openhab:openhab "${d}"
-	done
-
-	newenvd "${FILESDIR}"/openhab.env 50openhab
-
-	systemd_dounit "${FILESDIR}"/openhab.service
-	newtmpfiles "${FILESDIR}"/openhab.tmpfiles openhab.conf
-
-	newbin - openhab <<EOF
-#!/usr/bin/env bash
-set -eu
-
-if [[ -v JAVA_HOME_OVERRIDE ]]; then
-	JAVA_HOME="\${JAVA_HOME_OVERRIDE}"
-else
-	if ! GENTOO_JAVA_VM="\$(depend-java-query --get-vm '${MY_JAVA_DEPEND}')"; then
-		>&2 echo "Could not find Java VM for ${MY_JAVA_DEPEND}"
-	exit 1
-	fi
-
-	if ! JAVA_HOME_ASSIGNMENT=\$(java-config -P \${GENTOO_JAVA_VM} | grep JAVA_HOME); then
-		>&2 echo "Could not retrieve JAVA_HOME of \${GENTOO_JAVA_VM}"
-		exit 1
-	fi
-
-	eval \${JAVA_HOME_ASSIGNMENT}
-fi
-
-export JAVA_HOME
-exec /usr/share/openhab/runtime/bin/karaf "\$@"
-EOF
-	newbin "${DISTDIR}"/openhab-cli-2024-01-14 openhab-cli
-
-	newinitd "${FILESDIR}"/openhab.initd openhab
-}
-
-pkg_postinst() {
-	tmpfiles_process openhab.conf
-
-	if [[ -z ${REPLACING_VERSIONS} && -z ${OPENHAB_POSTINST_UPDATE} ]]; then
-	   return
-	fi
-
-	if [[ -d "${EROOT}"/run/systemd/system ]]; then
-		if systemctl is-active --quiet openhab; then
-			local openhab_service_active=1
-			einfo "Restarting OpenHAB service due to version update"
-			edob systemctl daemon-reload
-			edob systemctl stop openhab
-		fi
-
-		echo y | edob -m "Cleaning OpenHAB cache" \
-					  openhab-cli clean-cache
-		assert "Failed to clean OpenHAB cache"
-
-		if [[ -v openhab_service_active ]]; then
-			edob systemctl start openhab
-		fi
-	elif [[ -d /run/openrc ]]; then
-		einfo "Follow these steps to complete the update of OpenHAB:"
-		einfo
-		einfo "1. Stop the OpenHAB's service"
-		einfo "$ rc-service openhab stop"
-		einfo "2. Clean OpenHAB's cache"
-		einfo "$ openahb-cli clean-cache"
-		einfo "3. Restart OpenHAB's service"
-		einfo "$ rc-service openhab start"
-	fi
-}
diff --git a/app-misc/openhab-bin/openhab-bin-4.2.2.ebuild b/app-misc/openhab-bin/openhab-bin-4.2.2.ebuild
deleted file mode 100644
index 6d3cd9cf94c1..000000000000
--- a/app-misc/openhab-bin/openhab-bin-4.2.2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo systemd tmpfiles
-
-MY_PN=${PN%-bin}
-MY_P=${MY_PN}-${PV}
-MY_CLI_VER=2024-01-14
-
-DESCRIPTION="An open-source automation software for your home"
-HOMEPAGE="https://www.openhab.org/"
-SRC_URI="
-	https://github.com/openhab/openhab-distro/releases/download/${PV}/${MY_P}.tar.gz
-	https://raw.githubusercontent.com/openhab/openhab-linuxpkg/10061acd36524afb12a033fea6dcf142b399bf56/resources/usr/bin/openhab-cli
-		 -> openhab-cli-${MY_CLI_VER}
-"
-
-S="${WORKDIR}"
-LICENSE="EPL-2.0"
-SLOT="0"
-
-KEYWORDS="amd64 arm64"
-
-MY_JAVA_DEPEND=">=virtual/jre-17"
-
-# app-arch/zip: used by "openhab-cli backup"
-RDEPEND="
-	${MY_JAVA_DEPEND}
-	acct-user/openhab
-	app-arch/zip
-	dev-java/java-config
-"
-
-BDEPEND="app-arch/unzip"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	# We use move here to preserve the executable bit on the files under
-	# openhab/runtime/bin.
-	domove() {
-		local source="${1}"
-		local target="${2}"
-
-		local dest="${ED}/${target}"
-
-		mkdir -p "${dest}" || die "Failed to create ${dest}"
-		mv "${source}"/* "${dest}" || die "Failed to move"
-	}
-
-	domove runtime /usr/share/openhab/runtime
-	domove conf /etc/openhab
-
-	domove userdata /var/lib/openhab
-	fowners -R openhab:openhab /var/lib/openhab
-
-	local dirs=(
-		/usr/share/openhab/addons
-		/var/log/openhab
-	)
-	local d
-	for d in "${dirs[@]}"; do
-		keepdir "${d}"
-		fowners openhab:openhab "${d}"
-	done
-
-	newenvd "${FILESDIR}"/openhab.env 50openhab
-
-	systemd_dounit "${FILESDIR}"/openhab.service
-	newtmpfiles "${FILESDIR}"/openhab.tmpfiles openhab.conf
-
-	newbin - openhab <<EOF
-#!/usr/bin/env bash
-set -eu
-
-if [[ -v JAVA_HOME_OVERRIDE ]]; then
-	JAVA_HOME="\${JAVA_HOME_OVERRIDE}"
-else
-	if ! GENTOO_JAVA_VM="\$(depend-java-query --get-vm '${MY_JAVA_DEPEND}')"; then
-		>&2 echo "Could not find Java VM for ${MY_JAVA_DEPEND}"
-	exit 1
-	fi
-
-	if ! JAVA_HOME_ASSIGNMENT=\$(java-config -P \${GENTOO_JAVA_VM} | grep JAVA_HOME); then
-		>&2 echo "Could not retrieve JAVA_HOME of \${GENTOO_JAVA_VM}"
-		exit 1
-	fi
-
-	eval \${JAVA_HOME_ASSIGNMENT}
-fi
-
-export JAVA_HOME
-exec /usr/share/openhab/runtime/bin/karaf "\$@"
-EOF
-	newbin "${DISTDIR}"/openhab-cli-${MY_CLI_VER} openhab-cli
-
-	newinitd "${FILESDIR}"/openhab.initd openhab
-}
-
-pkg_postinst() {
-	tmpfiles_process openhab.conf
-
-	if [[ -z ${REPLACING_VERSIONS} && -z ${OPENHAB_POSTINST_UPDATE} ]]; then
-	   return
-	fi
-
-	if [[ -d "${EROOT}"/run/systemd/system ]]; then
-		if systemctl is-active --quiet openhab; then
-			local openhab_service_active=1
-			einfo "Restarting OpenHAB service due to version update"
-			edob systemctl daemon-reload
-			edob systemctl stop openhab
-		fi
-
-		echo y | edob -m "Cleaning OpenHAB cache" \
-					  openhab-cli clean-cache
-		assert "Failed to clean OpenHAB cache"
-
-		if [[ -v openhab_service_active ]]; then
-			edob systemctl start openhab
-		fi
-	elif [[ -d /run/openrc ]]; then
-		einfo "Follow these steps to complete the update of OpenHAB:"
-		einfo
-		einfo "1. Stop the OpenHAB's service"
-		einfo "$ rc-service openhab stop"
-		einfo "2. Clean OpenHAB's cache"
-		einfo "$ openahb-cli clean-cache"
-		einfo "3. Restart OpenHAB's service"
-		einfo "$ rc-service openhab start"
-	fi
-}
diff --git a/app-misc/openhab-bin/openhab-bin-4.2.3.ebuild b/app-misc/openhab-bin/openhab-bin-4.2.3.ebuild
index 751af46f93e1..ea77f87155c8 100644
--- a/app-misc/openhab-bin/openhab-bin-4.2.3.ebuild
+++ b/app-misc/openhab-bin/openhab-bin-4.2.3.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
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 LICENSE="EPL-2.0"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 MY_JAVA_DEPEND=">=virtual/jre-17"
 
diff --git a/app-misc/openhab-bin/openhab-bin-4.3.1.ebuild b/app-misc/openhab-bin/openhab-bin-4.3.1.ebuild
new file mode 100644
index 000000000000..d03408ef3a29
--- /dev/null
+++ b/app-misc/openhab-bin/openhab-bin-4.3.1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo systemd tmpfiles
+
+MY_PN=${PN%-bin}
+MY_P=${MY_PN}-${PV}
+MY_CLI_VER=2024-01-14
+
+DESCRIPTION="An open-source automation software for your home"
+HOMEPAGE="https://www.openhab.org/"
+SRC_URI="
+	https://github.com/openhab/openhab-distro/releases/download/${PV}/${MY_P}.tar.gz
+	https://raw.githubusercontent.com/openhab/openhab-linuxpkg/10061acd36524afb12a033fea6dcf142b399bf56/resources/usr/bin/openhab-cli
+		 -> openhab-cli-${MY_CLI_VER}
+"
+
+S="${WORKDIR}"
+LICENSE="EPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64"
+
+MY_JAVA_DEPEND=">=virtual/jre-17"
+
+# app-arch/zip: used by "openhab-cli backup"
+RDEPEND="
+	${MY_JAVA_DEPEND}
+	acct-user/openhab
+	app-arch/zip
+	dev-java/java-config
+"
+
+BDEPEND="app-arch/unzip"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	# We use move here to preserve the executable bit on the files under
+	# openhab/runtime/bin.
+	domove() {
+		local source="${1}"
+		local target="${2}"
+
+		local dest="${ED}/${target}"
+
+		mkdir -p "${dest}" || die "Failed to create ${dest}"
+		mv "${source}"/* "${dest}" || die "Failed to move"
+	}
+
+	domove runtime /usr/share/openhab/runtime
+	domove conf /etc/openhab
+
+	domove userdata /var/lib/openhab
+	fowners -R openhab:openhab /var/lib/openhab
+
+	local dirs=(
+		/usr/share/openhab/addons
+		/var/log/openhab
+	)
+	local d
+	for d in "${dirs[@]}"; do
+		keepdir "${d}"
+		fowners openhab:openhab "${d}"
+	done
+
+	newenvd "${FILESDIR}"/openhab.env 50openhab
+
+	systemd_dounit "${FILESDIR}"/openhab.service
+	newtmpfiles "${FILESDIR}"/openhab.tmpfiles openhab.conf
+
+	newbin - openhab <<EOF
+#!/usr/bin/env bash
+set -eu
+
+if [[ -v JAVA_HOME_OVERRIDE ]]; then
+	JAVA_HOME="\${JAVA_HOME_OVERRIDE}"
+else
+	if ! GENTOO_JAVA_VM="\$(depend-java-query --get-vm '${MY_JAVA_DEPEND}')"; then
+		>&2 echo "Could not find Java VM for ${MY_JAVA_DEPEND}"
+	exit 1
+	fi
+
+	if ! JAVA_HOME_ASSIGNMENT=\$(java-config -P \${GENTOO_JAVA_VM} | grep JAVA_HOME); then
+		>&2 echo "Could not retrieve JAVA_HOME of \${GENTOO_JAVA_VM}"
+		exit 1
+	fi
+
+	eval \${JAVA_HOME_ASSIGNMENT}
+fi
+
+export JAVA_HOME
+exec /usr/share/openhab/runtime/bin/karaf "\$@"
+EOF
+	newbin "${DISTDIR}"/openhab-cli-${MY_CLI_VER} openhab-cli
+
+	newinitd "${FILESDIR}"/openhab.initd openhab
+}
+
+pkg_postinst() {
+	tmpfiles_process openhab.conf
+
+	if [[ -z ${REPLACING_VERSIONS} && -z ${OPENHAB_POSTINST_UPDATE} ]]; then
+	   return
+	fi
+
+	if [[ -d "${EROOT}"/run/systemd/system ]]; then
+		if systemctl is-active --quiet openhab; then
+			local openhab_service_active=1
+			einfo "Restarting OpenHAB service due to version update"
+			edob systemctl daemon-reload
+			edob systemctl stop openhab
+		fi
+
+		echo y | edob -m "Cleaning OpenHAB cache" \
+					  openhab-cli clean-cache
+		assert "Failed to clean OpenHAB cache"
+
+		if [[ -v openhab_service_active ]]; then
+			edob systemctl start openhab
+		fi
+	elif [[ -d /run/openrc ]]; then
+		einfo "Follow these steps to complete the update of OpenHAB:"
+		einfo
+		einfo "1. Stop the OpenHAB's service"
+		einfo "$ rc-service openhab stop"
+		einfo "2. Clean OpenHAB's cache"
+		einfo "$ openahb-cli clean-cache"
+		einfo "3. Restart OpenHAB's service"
+		einfo "$ rc-service openhab start"
+	fi
+}
diff --git a/app-misc/openhab-bin/openhab-bin-4.3.2.ebuild b/app-misc/openhab-bin/openhab-bin-4.3.2.ebuild
new file mode 100644
index 000000000000..d03408ef3a29
--- /dev/null
+++ b/app-misc/openhab-bin/openhab-bin-4.3.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo systemd tmpfiles
+
+MY_PN=${PN%-bin}
+MY_P=${MY_PN}-${PV}
+MY_CLI_VER=2024-01-14
+
+DESCRIPTION="An open-source automation software for your home"
+HOMEPAGE="https://www.openhab.org/"
+SRC_URI="
+	https://github.com/openhab/openhab-distro/releases/download/${PV}/${MY_P}.tar.gz
+	https://raw.githubusercontent.com/openhab/openhab-linuxpkg/10061acd36524afb12a033fea6dcf142b399bf56/resources/usr/bin/openhab-cli
+		 -> openhab-cli-${MY_CLI_VER}
+"
+
+S="${WORKDIR}"
+LICENSE="EPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64"
+
+MY_JAVA_DEPEND=">=virtual/jre-17"
+
+# app-arch/zip: used by "openhab-cli backup"
+RDEPEND="
+	${MY_JAVA_DEPEND}
+	acct-user/openhab
+	app-arch/zip
+	dev-java/java-config
+"
+
+BDEPEND="app-arch/unzip"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	# We use move here to preserve the executable bit on the files under
+	# openhab/runtime/bin.
+	domove() {
+		local source="${1}"
+		local target="${2}"
+
+		local dest="${ED}/${target}"
+
+		mkdir -p "${dest}" || die "Failed to create ${dest}"
+		mv "${source}"/* "${dest}" || die "Failed to move"
+	}
+
+	domove runtime /usr/share/openhab/runtime
+	domove conf /etc/openhab
+
+	domove userdata /var/lib/openhab
+	fowners -R openhab:openhab /var/lib/openhab
+
+	local dirs=(
+		/usr/share/openhab/addons
+		/var/log/openhab
+	)
+	local d
+	for d in "${dirs[@]}"; do
+		keepdir "${d}"
+		fowners openhab:openhab "${d}"
+	done
+
+	newenvd "${FILESDIR}"/openhab.env 50openhab
+
+	systemd_dounit "${FILESDIR}"/openhab.service
+	newtmpfiles "${FILESDIR}"/openhab.tmpfiles openhab.conf
+
+	newbin - openhab <<EOF
+#!/usr/bin/env bash
+set -eu
+
+if [[ -v JAVA_HOME_OVERRIDE ]]; then
+	JAVA_HOME="\${JAVA_HOME_OVERRIDE}"
+else
+	if ! GENTOO_JAVA_VM="\$(depend-java-query --get-vm '${MY_JAVA_DEPEND}')"; then
+		>&2 echo "Could not find Java VM for ${MY_JAVA_DEPEND}"
+	exit 1
+	fi
+
+	if ! JAVA_HOME_ASSIGNMENT=\$(java-config -P \${GENTOO_JAVA_VM} | grep JAVA_HOME); then
+		>&2 echo "Could not retrieve JAVA_HOME of \${GENTOO_JAVA_VM}"
+		exit 1
+	fi
+
+	eval \${JAVA_HOME_ASSIGNMENT}
+fi
+
+export JAVA_HOME
+exec /usr/share/openhab/runtime/bin/karaf "\$@"
+EOF
+	newbin "${DISTDIR}"/openhab-cli-${MY_CLI_VER} openhab-cli
+
+	newinitd "${FILESDIR}"/openhab.initd openhab
+}
+
+pkg_postinst() {
+	tmpfiles_process openhab.conf
+
+	if [[ -z ${REPLACING_VERSIONS} && -z ${OPENHAB_POSTINST_UPDATE} ]]; then
+	   return
+	fi
+
+	if [[ -d "${EROOT}"/run/systemd/system ]]; then
+		if systemctl is-active --quiet openhab; then
+			local openhab_service_active=1
+			einfo "Restarting OpenHAB service due to version update"
+			edob systemctl daemon-reload
+			edob systemctl stop openhab
+		fi
+
+		echo y | edob -m "Cleaning OpenHAB cache" \
+					  openhab-cli clean-cache
+		assert "Failed to clean OpenHAB cache"
+
+		if [[ -v openhab_service_active ]]; then
+			edob systemctl start openhab
+		fi
+	elif [[ -d /run/openrc ]]; then
+		einfo "Follow these steps to complete the update of OpenHAB:"
+		einfo
+		einfo "1. Stop the OpenHAB's service"
+		einfo "$ rc-service openhab stop"
+		einfo "2. Clean OpenHAB's cache"
+		einfo "$ openahb-cli clean-cache"
+		einfo "3. Restart OpenHAB's service"
+		einfo "$ rc-service openhab start"
+	fi
+}
diff --git a/app-misc/openrgb-plugin-effects/Manifest b/app-misc/openrgb-plugin-effects/Manifest
index 46446811aea3..3ea0ccd6c3a7 100644
--- a/app-misc/openrgb-plugin-effects/Manifest
+++ b/app-misc/openrgb-plugin-effects/Manifest
@@ -1,4 +1,3 @@
-DIST OpenRGBEffectsPlugin-release_0.8.tar.bz2 232858 BLAKE2B 71851eaa40719d8b04a91577756e76b248d261c344e461a00f2c60d26fe37b2a1a2d563a67f620a4c6887d21d4505cb715850f6f0eb4f133894833a72f22e8e4 SHA512 c1ad3f460a9cb4788e9eae3f6df1f0b60a838205a0655c1a639f1bcd04c00f99d55d9a51161267e543bbd961883d4ae0751babe7c98d9be395f104ac9d40e8e3
 DIST OpenRGBEffectsPlugin-release_0.9.tar.bz2 254816 BLAKE2B e406cb70c1a64f2572d075b5d6ca6fa3499060ec33b49264b63d4f43c989adb8f2022b3b7d79a59bd5c82187b29331555385712a6fbcb25b01e5341c23cbd922 SHA512 d20f4890889768857219b79db245804b720b1710483c3ea3f1f6b462c4a172f521c727ad1fd3127fed9724be56dc45232c3a6d23772ec8c9d7e203bb6a6ad8c8
 DIST QCodeEditor-2021-08-17.tar.gz 95099 BLAKE2B d9eab343c956288b098c9fad4b523615beb7c1a860a00b8c84a2a71f40398fd2e82c335c5d82bb5bc2d15d35bad698a780ff4d1d3202f7555a93120e8a2d906a SHA512 4f8af3a45d3b16d06bc6e4b795f005cf917a80add8f738454751a47d40747df1215ba9b4e05a0f654251bc006521151f8a256c2e41be05c72abae4e55f383b54
 DIST SimplexNoise-2019-12-03.tar.gz 781353 BLAKE2B ce05f78b58439d57e369b8b3944b8d392bec80d579767cb1683befe5c56b90dcf40d405ff75d4541e6c17659f6e1abc83f5d3444fbe641724d21ed509e439854 SHA512 b1e27d6630a902006636ec31c3b1cead1857b255edc8ae8db74cdfee25300337200be48264c6adc0e2c0e39a3693e361d448e61ae62d2f0b700374b264d5e5cd
diff --git a/app-misc/openrgb-plugin-effects/files/openrgb-plugin-effects-0.8-dep.patch b/app-misc/openrgb-plugin-effects/files/openrgb-plugin-effects-0.8-dep.patch
deleted file mode 100644
index b01adb4ac7d1..000000000000
--- a/app-misc/openrgb-plugin-effects/files/openrgb-plugin-effects-0.8-dep.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix dependency on app-misc/openrgb
-
---- a/OpenRGBEffectsPlugin.pro
-+++ b/OpenRGBEffectsPlugin.pro
-@@ -60,10 +60,6 @@ HEADERS +=
-     OpenRGB/qt/hsv.h                                                                            \
- 
- 
--SOURCES +=                                                                                      \
--    OpenRGB/RGBController/RGBController.cpp                                                     \
--    OpenRGB/dependencies/ColorWheel/ColorWheel.cpp                                              \
--    OpenRGB/qt/hsv.cpp                                                                          \
- 
- 
- #-----------------------------------------------------------------------------------------------#
diff --git a/app-misc/openrgb-plugin-effects/files/openrgb-plugin-effects-0.8-qrc.patch b/app-misc/openrgb-plugin-effects/files/openrgb-plugin-effects-0.8-qrc.patch
deleted file mode 100644
index 87919c542d7f..000000000000
--- a/app-misc/openrgb-plugin-effects/files/openrgb-plugin-effects-0.8-qrc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Because of -Wl,--export-dynamic in app-misc/openrgb, this resources.qrc
-conflicts with the openrgb's one. So rename it.
-
---- a/OpenRGBEffectsPlugin.pro
-+++ b/OpenRGBEffectsPlugin.pro
-@@ -472,4 +472,4 @@ macx: {
- }
- 
- RESOURCES += \
--    resources.qrc
-+    resources_effects_plugin.qrc
diff --git a/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0.8.ebuild b/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0.8.ebuild
deleted file mode 100644
index 6b51e61c8507..000000000000
--- a/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0.8.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils
-
-DESCRIPTION="Plugin for OpenRGB with various Effects that can be synced across devices"
-HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin"
-
-MY_NOISE_COMMIT="97e62c5b5e26c8edabdc29a6b0a277192be3746c"
-MY_QCODEEDITOR_COMMIT="a9aab24c7970a38d14bc79939306d9d3ba78cf61"
-SRC_URI="
-	https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/archive/release_${PV}/OpenRGBEffectsPlugin-release_${PV}.tar.bz2
-	https://github.com/SRombauts/SimplexNoise/archive/${MY_NOISE_COMMIT}.tar.gz -> SimplexNoise-2019-12-03.tar.gz
-	https://github.com/justxi/QCodeEditor/archive/${MY_QCODEEDITOR_COMMIT}.tar.gz -> QCodeEditor-2021-08-17.tar.gz
-"
-S="${WORKDIR}/OpenRGBEffectsPlugin-release_${PV}"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=app-misc/openrgb-0.7:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtwidgets:5[-gles2-only]
-	media-libs/openal
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-"
-
-PATCHES=(
-	"${FILESDIR}/openrgb-plugin-effects-0.8-dep.patch"
-	"${FILESDIR}/openrgb-plugin-effects-0.8-qrc.patch"
-)
-
-src_prepare() {
-	default
-	rm -r OpenRGB || die
-	ln -s "${ESYSROOT}/usr/include/OpenRGB" . || die
-	sed -e '/^GIT_/d' -i *.pro || die
-
-	rmdir Dependencies/SimplexNoise || die
-	ln -s "${WORKDIR}/SimplexNoise-${MY_NOISE_COMMIT}" Dependencies/SimplexNoise || die
-
-	rmdir Dependencies/QCodeEditor || die
-	ln -s "${WORKDIR}/QCodeEditor-${MY_QCODEEDITOR_COMMIT}" Dependencies/QCodeEditor || die
-
-	# Because of -Wl,--export-dynamic in app-misc/openrgb, this resources.qrc
-	# conflicts with the openrgb's one. So rename it.
-	mv --no-clobber resources.qrc resources_effects_plugin.qrc || die
-}
-
-src_configure() {
-	eqmake5 \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/OpenRGB/plugins
-	doexe libOpenRGBEffectsPlugin.so.1.0
-}
diff --git a/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0.9.ebuild b/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0.9.ebuild
index 099f9d14d9a4..ca4fcc15524a 100644
--- a/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0.9.ebuild
+++ b/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS="amd64"
 
 RDEPEND="
-	>=app-misc/openrgb-0.9:=
+	>=app-misc/openrgb-0.9:=[-qt6(-)]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5[-gles2-only]
 	dev-qt/qtwidgets:5[-gles2-only]
diff --git a/app-misc/openrgb-plugin-skin/Manifest b/app-misc/openrgb-plugin-skin/Manifest
index 5aa5302a16fd..a5059b959638 100644
--- a/app-misc/openrgb-plugin-skin/Manifest
+++ b/app-misc/openrgb-plugin-skin/Manifest
@@ -1,2 +1 @@
-DIST OpenRGBSkinPlugin-release_0.8.tar.bz2 22711 BLAKE2B 25325c6be5cf619940e79e4f431871478e3026188d7aba4b8220a99afda8f75d18ffeafa0f905110d4ce44f5d7e28208f3d7b358cfadfcd4719a22f1ef5cf70d SHA512 89b9a4bcda4600ea7dbd05972bba7c5f8d917606b3def4971e6ccff84d8510ca420747dd85d3395bfea29e62adc775b592f9cbe20a6966776a46e15593f2cf59
 DIST OpenRGBSkinPlugin-release_0.9.tar.bz2 22781 BLAKE2B 46a342927f589c1b9bdbdfc094d8f85007897c5cfac9265d6a8efbafdd5bdb8f3f92927b052e4a52310cf5e2a7404590c16964c0c041ab6035dff24ee41b8e33 SHA512 51a6b11ca95679d9abbb600e77c50eac59138b2f9e080e5eba1606405f95446da0582327e2d071740e1cb1845604e895286cc06512b0769ae1d57937e2df818c
diff --git a/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0.8.ebuild b/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0.8.ebuild
deleted file mode 100644
index b611a886e87b..000000000000
--- a/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils
-
-SRC_URI="https://gitlab.com/OpenRGBDevelopers/OpenRGBSkinPlugin/-/archive/release_${PV}/OpenRGBSkinPlugin-release_${PV}.tar.bz2"
-S="${WORKDIR}/OpenRGBSkinPlugin-release_${PV}"
-KEYWORDS="amd64"
-
-DESCRIPTION="Plugin for OpenRGB that allows you to customize the look and feel of OpenRGB"
-HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBSkinPlugin"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=app-misc/openrgb-0.8:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-"
-
-src_prepare() {
-	default
-	rm -r OpenRGB || die
-	ln -s "${ESYSROOT}/usr/include/OpenRGB" . || die
-	sed -e '/^GIT_/d' -i *.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/OpenRGB/plugins
-	doexe libOpenRGBSkinPlugin.so.1.0.0
-}
diff --git a/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0.9.ebuild b/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0.9.ebuild
index 86c340899dde..f040e847341e 100644
--- a/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0.9.ebuild
+++ b/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0.9.ebuild
@@ -1,21 +1,22 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit qmake-utils
 
+DESCRIPTION="Plugin for OpenRGB that allows you to customize the look and feel of OpenRGB"
+HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBSkinPlugin"
+
 SRC_URI="https://gitlab.com/OpenRGBDevelopers/OpenRGBSkinPlugin/-/archive/release_${PV}/OpenRGBSkinPlugin-release_${PV}.tar.bz2"
 S="${WORKDIR}/OpenRGBSkinPlugin-release_${PV}"
-KEYWORDS="amd64"
 
-DESCRIPTION="Plugin for OpenRGB that allows you to customize the look and feel of OpenRGB"
-HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBSkinPlugin"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64"
 
 RDEPEND="
-	>=app-misc/openrgb-0.9:=
+	>=app-misc/openrgb-0.9:=[-qt6(-)]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
diff --git a/app-misc/openrgb-plugin-visualmap/Manifest b/app-misc/openrgb-plugin-visualmap/Manifest
index 3c2953eba128..0346585038d9 100644
--- a/app-misc/openrgb-plugin-visualmap/Manifest
+++ b/app-misc/openrgb-plugin-visualmap/Manifest
@@ -1,2 +1 @@
-DIST OpenRGBVisualMapPlugin-release_0.8.tar.bz2 51680 BLAKE2B c3423779f7a2082c8f682b519be2e1128b30dafbc4400414bd664f98de5c58701fbdbe9287a44951e8cf6ac4ee7c940a841f499ee1afce107e17537ad9df076b SHA512 7bf0393bc00bb69545ed02f6505f366aa90bb87350de6319977d02ba0afd38ccb895aa14edf02a42242b0a12f76ea2b135d8de5b3df10469c760b6f3d9dd2b61
 DIST OpenRGBVisualMapPlugin-release_0.9.tar.bz2 69646 BLAKE2B 2ae3c190c7b7347fadf62b4a133626da09e9ad90c1dc5c99decf960b115bff587e5d14d8e45ab65781171ebefdd29825422b9b709795d3d2cc735e8d0e061a69 SHA512 ef99263cbed900c1f541982e7349bda03212dfbb8873eb52db00f81cbe5823b7c4e2193de664dd7930da73e11a601b1b595b214629a813e1efda6e7184599521
diff --git a/app-misc/openrgb-plugin-visualmap/files/openrgb-plugin-visualmap-0.8-dep.patch b/app-misc/openrgb-plugin-visualmap/files/openrgb-plugin-visualmap-0.8-dep.patch
deleted file mode 100644
index b2023fa1df3a..000000000000
--- a/app-misc/openrgb-plugin-visualmap/files/openrgb-plugin-visualmap-0.8-dep.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/OpenRGBVisualMapPlugin.pro
-+++ b/OpenRGBVisualMapPlugin.pro
-@@ -96,7 +96,6 @@ HEADERS +=
-     OpenRGB/qt/hsv.h                                                                            \
- 
- SOURCES +=                                                                                      \
--    OpenRGB/RGBController/RGBController.cpp                                                     \
-     OpenRGBVisualMapPlugin.cpp                                                                  \
-     VirtualController.cpp                                                                       \
-     VisualMapSettingsManager.cpp                                                                \
-@@ -120,7 +119,6 @@ SOURCES +=
-     ui/widget-editor/EditorGrid.cpp                                                             \
-     ui/widget-editor/LedItem.cpp                                                                \
-     ui/widget-editor/WidgetEditor.cpp                                                           \
--    OpenRGB/qt/hsv.cpp                                                                          \
- 
- FORMS +=                                                                                        \
-     ui/BackgroundApplier.ui                                                                     \
diff --git a/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0.8.ebuild b/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0.8.ebuild
deleted file mode 100644
index 29925e2a50ea..000000000000
--- a/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils
-
-SRC_URI="https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin/-/archive/release_${PV}/OpenRGBVisualMapPlugin-release_${PV}.tar.bz2"
-S="${WORKDIR}/OpenRGBVisualMapPlugin-release_${PV}"
-KEYWORDS="amd64"
-
-DESCRIPTION="Plugin for OpenRGB to create virtual devices out of multiple real ones"
-HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=app-misc/openrgb-0.8:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-dep.patch"
-)
-
-src_prepare() {
-	default
-	rm -r OpenRGB || die
-	ln -s "${ESYSROOT}/usr/include/OpenRGB" . || die
-	sed -e '/^GIT_/d' -i *.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/OpenRGB/plugins
-	doexe libOpenRGBVisualMapPlugin.so.1.0.0
-}
diff --git a/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0.9.ebuild b/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0.9.ebuild
index ded1d8f52689..e36c3b8465d8 100644
--- a/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0.9.ebuild
+++ b/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0.9.ebuild
@@ -1,21 +1,22 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit qmake-utils
 
+DESCRIPTION="Plugin for OpenRGB to create virtual devices out of multiple real ones"
+HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin"
+
 SRC_URI="https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin/-/archive/release_${PV}/OpenRGBVisualMapPlugin-release_${PV}.tar.bz2"
 S="${WORKDIR}/OpenRGBVisualMapPlugin-release_${PV}"
-KEYWORDS="amd64"
 
-DESCRIPTION="Plugin for OpenRGB to create virtual devices out of multiple real ones"
-HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64"
 
 RDEPEND="
-	>=app-misc/openrgb-0.9:=
+	>=app-misc/openrgb-0.9:=[-qt6(-)]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
diff --git a/app-misc/openrgb/Manifest b/app-misc/openrgb/Manifest
index f543fecc55fd..ef601d6236e9 100644
--- a/app-misc/openrgb/Manifest
+++ b/app-misc/openrgb/Manifest
@@ -1 +1,2 @@
+DIST OpenRGB-0.9-odr.patch 90600 BLAKE2B 1cb0aaab997da90b5cf6fbf1e971cef6848d4372ba021d27efed070ff2c398074d7b79623a1669995bbdaaacae1c5a9ff09344ef0cab7098e9354f95d005b856 SHA512 5f2a5194419d14b97dc2e8ca47a2b9914c01148cfb24d61266a8a9615f6d09509906d7e69d8264ddbde71474955f789925b400f29682d12779c2a3d38a4bd6eb
 DIST OpenRGB-release_0.9.tar.bz2 28689813 BLAKE2B 9fcf08d5e4d07ffc0f7867516f09044e18ce488bcdd99c8b44e0afe291b8a21a7ba92d6e7fd683ef22462a262004a992621efb59a5df6ed7551f4e9f75843241 SHA512 fb1bdbc7bcbd3bac888be313cfb6403a13d39de659ac6993858f9c1b17ad40e9c4a7d4c7c90682181841db1659a0ee298363c442a7120d43347aaf4485e7dccf
diff --git a/app-misc/openrgb/openrgb-0.9-r1.ebuild b/app-misc/openrgb/openrgb-0.9-r1.ebuild
new file mode 100644
index 000000000000..dd1f5caab7df
--- /dev/null
+++ b/app-misc/openrgb/openrgb-0.9-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs flag-o-matic qmake-utils udev xdg-utils
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
+else
+	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
+	S="${WORKDIR}/OpenRGB-release_${PV}"
+	KEYWORDS="amd64 ~loong ~x86"
+	PATCHES=( "${FILESDIR}"/OpenRGB-0.9-build-system.patch )
+fi
+
+DESCRIPTION="Open source RGB lighting control"
+HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
+LICENSE="GPL-2"
+# subslot is OPENRGB_PLUGIN_API_VERSION from
+# https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
+SLOT="0/3"
+
+RDEPEND="
+	dev-cpp/cpp-httplib:=
+	dev-libs/hidapi
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	net-libs/mbedtls:0=
+	virtual/libusb:1
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+	dev-libs/mdns
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES+=(
+	"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
+	"${FILESDIR}"/OpenRGB-0.9-udev-check.patch
+)
+
+CHECKREQS_DISK_BUILD="2G"
+
+src_prepare() {
+	default
+	rm -r dependencies/{httplib,hidapi,libusb,mdns,json,mbedtls}* \
+		|| die "Failed to remove unneded deps"
+}
+
+src_configure() {
+	# Some plugins require symbols defined in the main binary.
+	# The upstream build system of plugins bundles OpenRGB as a submodule
+	# instead, and compiles the .cpp file again.
+	append-ldflags -Wl,--export-dynamic
+
+	# > warning: �-pipe’ ignored because �-save-temps’ specified
+	filter-flags -pipe
+
+	# cpp-httplib >=0.16.0 changed the library name from "httplib" to "cpp-httplib".
+	# See bug: https://bugs.gentoo.org/934576
+	local -a libs=()
+	if has_version "<dev-cpp/cpp-httplib-0.16.0" ; then
+		libs+=( -lhttplib )
+	else
+		libs+=( -lcpp-httplib )
+	fi
+
+	eqmake5 \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
+		DEFINES+="OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\"" \
+		LIBS+="${libs[@]}"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+
+	dodoc README.md OpenRGB.patch
+
+	rm -r "${ED}"/usr/lib/udev/ || die
+	udev_dorules 60-openrgb.rules
+
+	# This is for plugins. Upstream doesn't install any headers at all.
+	insinto /usr/include/OpenRGB
+	find . -name '*.h' -exec cp --parents '{}' "${ED}/usr/include/OpenRGB/" ';' || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	udev_reload
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	udev_reload
+}
diff --git a/app-misc/openrgb/openrgb-0.9-r2.ebuild b/app-misc/openrgb/openrgb-0.9-r2.ebuild
new file mode 100644
index 000000000000..2ecef34bd7de
--- /dev/null
+++ b/app-misc/openrgb/openrgb-0.9-r2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs flag-o-matic qmake-utils udev xdg-utils
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
+else
+	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2
+		https://files.asokolov.org/gentoo/OpenRGB-0.9-odr.patch"
+	S="${WORKDIR}/OpenRGB-release_${PV}"
+	KEYWORDS="~amd64 ~loong ~x86"
+	PATCHES=( "${FILESDIR}"/OpenRGB-0.9-build-system.patch )
+fi
+
+DESCRIPTION="Open source RGB lighting control"
+HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
+LICENSE="GPL-2"
+# subslot is OPENRGB_PLUGIN_API_VERSION from
+# https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
+SLOT="0/3"
+
+RDEPEND="
+	dev-cpp/cpp-httplib:=
+	dev-libs/hidapi
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	net-libs/mbedtls:0=
+	virtual/libusb:1
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+	dev-libs/mdns
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES+=(
+	"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
+	"${FILESDIR}"/OpenRGB-0.9-udev-check.patch
+	"${DISTDIR}"/OpenRGB-0.9-odr.patch
+)
+
+CHECKREQS_DISK_BUILD="2G"
+
+src_prepare() {
+	default
+	rm -r dependencies/{httplib,hidapi,libusb,mdns,json,mbedtls}* \
+		|| die "Failed to remove unneded deps"
+
+	rm dependencies/hueplusplus-1.0.0/include/json/json.hpp || die
+	echo "#include <nlohmann/json.hpp>" > dependencies/hueplusplus-1.0.0/include/json/json.hpp || die
+}
+
+src_configure() {
+	# Some plugins require symbols defined in the main binary.
+	# The upstream build system of plugins bundles OpenRGB as a submodule
+	# instead, and compiles the .cpp file again.
+	append-ldflags -Wl,--export-dynamic
+
+	# > warning: �-pipe’ ignored because �-save-temps’ specified
+	filter-flags -pipe
+
+	# cpp-httplib >=0.16.0 changed the library name from "httplib" to "cpp-httplib".
+	# See bug: https://bugs.gentoo.org/934576
+	local -a libs=()
+	if has_version "<dev-cpp/cpp-httplib-0.16.0" ; then
+		libs+=( -lhttplib )
+	else
+		libs+=( -lcpp-httplib )
+	fi
+
+	eqmake5 \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
+		DEFINES+="OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\"" \
+		LIBS+="${libs[@]}"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+
+	dodoc README.md OpenRGB.patch
+
+	rm -r "${ED}"/usr/lib/udev/ || die
+	udev_dorules 60-openrgb.rules
+
+	# This is for plugins. Upstream doesn't install any headers at all.
+	insinto /usr/include/OpenRGB
+	find . -name '*.h' -exec cp --parents '{}' "${ED}/usr/include/OpenRGB/" ';' || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	udev_reload
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	udev_reload
+}
diff --git a/app-misc/openrgb/openrgb-0.9.ebuild b/app-misc/openrgb/openrgb-0.9.ebuild
deleted file mode 100644
index 72260835c3d0..000000000000
--- a/app-misc/openrgb/openrgb-0.9.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs flag-o-matic qmake-utils udev xdg-utils
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
-else
-	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
-	S="${WORKDIR}/OpenRGB-release_${PV}"
-	KEYWORDS="amd64 ~loong ~x86"
-	PATCHES=( "${FILESDIR}"/OpenRGB-0.9-build-system.patch )
-fi
-
-DESCRIPTION="Open source RGB lighting control"
-HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
-LICENSE="GPL-2"
-# subslot is OPENRGB_PLUGIN_API_VERSION from
-# https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
-SLOT="0/3"
-
-RDEPEND="
-	dev-cpp/cpp-httplib:=
-	dev-libs/hidapi
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	net-libs/mbedtls:=
-	virtual/libusb:1
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-	dev-libs/mdns
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES+=(
-	"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
-	"${FILESDIR}"/OpenRGB-0.9-udev-check.patch
-)
-
-CHECKREQS_DISK_BUILD="2G"
-
-src_prepare() {
-	default
-	rm -r dependencies/{httplib,hidapi,libusb,mdns,json,mbedtls}* \
-		|| die "Failed to remove unneded deps"
-}
-
-src_configure() {
-	# Some plugins require symbols defined in the main binary.
-	# The upstream build system of plugins bundles OpenRGB as a submodule
-	# instead, and compiles the .cpp file again.
-	append-ldflags -Wl,--export-dynamic
-
-	# > warning: �-pipe’ ignored because �-save-temps’ specified
-	filter-flags -pipe
-
-	# cpp-httplib >=0.16.0 changed the library name from "httplib" to "cpp-httplib".
-	# See bug: https://bugs.gentoo.org/934576
-	local -a libs=()
-	if has_version "<dev-cpp/cpp-httplib-0.16.0" ; then
-		libs+=( -lhttplib )
-	else
-		libs+=( -lcpp-httplib )
-	fi
-
-	eqmake5 \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
-		DEFINES+="OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\"" \
-		LIBS+="${libs[@]}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install
-
-	dodoc README.md OpenRGB.patch
-
-	rm -r "${ED}"/usr/lib/udev/ || die
-	udev_dorules 60-openrgb.rules
-
-	# This is for plugins. Upstream doesn't install any headers at all.
-	insinto /usr/include/OpenRGB
-	find . -name '*.h' -exec cp --parents '{}' "${ED}/usr/include/OpenRGB/" ';' || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	udev_reload
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	udev_reload
-}
diff --git a/app-misc/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild
index 961ed38ac207..1d00eb21c792 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,7 +28,7 @@ RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
-	net-libs/mbedtls:=
+	net-libs/mbedtls:0=
 	virtual/libusb:1
 "
 DEPEND="
@@ -52,6 +52,9 @@ src_prepare() {
 	default
 	rm -r dependencies/{httplib,hidapi,libusb,mdns,json,mbedtls}* \
 		|| die "Failed to remove unneded deps"
+
+	rm dependencies/hueplusplus-1.1.0/include/json/json.hpp || die
+	echo "#include <nlohmann/json.hpp>" > dependencies/hueplusplus-1.1.0/include/json/json.hpp || die
 }
 
 src_configure() {
diff --git a/app-misc/piper/Manifest b/app-misc/piper/Manifest
index c049b2ea7d14..9a615d205b3c 100644
--- a/app-misc/piper/Manifest
+++ b/app-misc/piper/Manifest
@@ -1 +1,2 @@
 DIST piper-0.7.tar.gz 271658 BLAKE2B 8d3d411cc771a286ae0d7654b6d70f394e11edb182924619195b947d0d54df4db308e94aceebe0754ddd446538f1dce2ccb88dbf1cd44595b614d852e7394698 SHA512 fcbc30a4954ea6b0aa67c66052eab1e6b2d3039c927eeddcfc8b03d00f1c91e8f0ae80788ba0e4f053a612b03f594e74fd119dd11f52dd47608c99602e7e4940
+DIST piper-0.8.tar.gz 318558 BLAKE2B 170426c35899841a3317d0cd37d253fab524848fbe5ebf1c2e670c56c962bf9f7a39bccd1dea43bbf0d5c6a158e795df63e84ddb0422fec4fd92142d70fccbc8 SHA512 c0a05262262a1284911c976ab934653f8a3699066ef1d791669169c1e6c5db62dba0fcccc32d6bc68b996a2c2b8e96a6567761d01417a03d7dbb41010dd95cd8
diff --git a/app-misc/piper/piper-0.7-r1.ebuild b/app-misc/piper/piper-0.7-r1.ebuild
index ec2d208c5f69..9fec0194967c 100644
--- a/app-misc/piper/piper-0.7-r1.ebuild
+++ b/app-misc/piper/piper-0.7-r1.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
@@ -41,6 +41,7 @@ RDEPEND="
 	${PYTHON_DEPS}
 	dev-libs/gobject-introspection
 	>=dev-libs/libratbag-0.14
+	<dev-libs/libratbag-0.18
 	gnome-base/librsvg[introspection]
 	x11-libs/gdk-pixbuf[introspection]
 	x11-libs/gtk+:3[introspection]
diff --git a/app-misc/piper/piper-0.8.ebuild b/app-misc/piper/piper-0.8.ebuild
new file mode 100644
index 000000000000..82febf98c57d
--- /dev/null
+++ b/app-misc/piper/piper-0.8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit meson python-single-r1 xdg
+
+DESCRIPTION="GTK application to configure gaming devices"
+HOMEPAGE="https://github.com/libratbag/piper"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/libratbag/piper.git"
+else
+	SRC_URI="https://github.com/libratbag/piper/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_USEDEP}]
+	')
+	virtual/pkgconfig
+	test? ( dev-libs/appstream )
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/gobject-introspection
+	>=dev-libs/libratbag-0.18
+	gnome-base/librsvg[introspection]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	$(python_gen_cond_dep '
+		dev-python/evdev[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/libevdev
+	virtual/libudev
+"
+
+src_configure() {
+	python_setup
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/
+}
diff --git a/app-misc/piper/piper-9999.ebuild b/app-misc/piper/piper-9999.ebuild
index 0631b1a08ae6..82febf98c57d 100644
--- a/app-misc/piper/piper-9999.ebuild
+++ b/app-misc/piper/piper-9999.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 meson python-single-r1 xdg
 
@@ -30,17 +30,12 @@ BDEPEND="
 		dev-python/lxml[${PYTHON_USEDEP}]
 	')
 	virtual/pkgconfig
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/flake8[${PYTHON_USEDEP}]
-		')
-		dev-libs/appstream
-	)
+	test? ( dev-libs/appstream )
 "
 RDEPEND="
 	${PYTHON_DEPS}
 	dev-libs/gobject-introspection
-	>=dev-libs/libratbag-0.14
+	>=dev-libs/libratbag-0.18
 	gnome-base/librsvg[introspection]
 	x11-libs/gdk-pixbuf[introspection]
 	x11-libs/gtk+:3[introspection]
diff --git a/app-misc/radeontop/radeontop-1.4.ebuild b/app-misc/radeontop/radeontop-1.4.ebuild
index 6aad6527b642..1eeba9b4c3c1 100644
--- a/app-misc/radeontop/radeontop-1.4.ebuild
+++ b/app-misc/radeontop/radeontop-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 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="https://github.com/clbr/radeontop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~x86"
 IUSE="nls video_cards_amdgpu video_cards_radeon"
 REQUIRED_USE="
 	|| ( video_cards_amdgpu video_cards_radeon )
diff --git a/app-misc/ranger/files/ranger-1.9.4-ncurses-bulkrename.patch b/app-misc/ranger/files/ranger-1.9.4-ncurses-bulkrename.patch
new file mode 100644
index 000000000000..39dddf8480ac
--- /dev/null
+++ b/app-misc/ranger/files/ranger-1.9.4-ncurses-bulkrename.patch
@@ -0,0 +1,27 @@
+:bulkrename is broken[1] when using >=ncurses-6.4_p20231209 or so.
+
+Backport of [2].
+
+[1] https://github.com/ranger/ranger/issues/2934
+[2] https://github.com/ranger/ranger/pull/3039
+--- a/ranger/gui/ui.py
++++ b/ranger/gui/ui.py
+@@ -119,7 +119,8 @@
+             self.setup()
+             self.win.addstr("loading...")
+-            self.win.refresh()
+             self._draw_title = curses.tigetflag('hs')  # has_status_line
+ 
++        self.win.refresh()
++
+         self.update_size()
+         self.is_on = True
+@@ -142,8 +143,4 @@
+         curses.nocbreak()
+         curses.echo()
+-        try:
+-            curses.curs_set(1)
+-        except curses.error:
+-            pass
+         if self.settings.mouse_enabled:
+             _setup_mouse(dict(value=False))
diff --git a/app-misc/ranger/ranger-1.9.4-r1.ebuild b/app-misc/ranger/ranger-1.9.4-r1.ebuild
new file mode 100644
index 000000000000..5ce66e164e46
--- /dev/null
+++ b/app-misc/ranger/ranger-1.9.4-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ranger/ranger.git"
+else
+	SRC_URI="
+		https://github.com/ranger/ranger/archive/v${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+fi
+
+DESCRIPTION="Vim-inspired file manager for the console"
+HOMEPAGE="https://ranger.github.io/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.3-color-crash-fix.patch
+	"${FILESDIR}"/${PN}-1.9.4-ncurses-bulkrename.patch
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	sed -i "s|share/doc/ranger|share/doc/${PF}|" setup.py doc/ranger.1 || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "${PN^} has many optional dependencies to support enhanced file previews."
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for more details."
+	fi
+}
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index 585ba35e0779..71302ff6497f 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -1,3 +1 @@
-DIST recoll-1.37.4.tar.gz 3135691 BLAKE2B 1c9113cbccb812e522addbc7fec0aa0b958d8616aa1b753aa866e9bb96f78dc0a40bb79a4a8ad016286f2508f1d8dea172d308917a430fa4c98822feaba0d309 SHA512 9e5af5d00191658f23e6a5916718014827f12f4553d9429fe385c0bd1c72f2f49ae97e7d7b8121cb174b299ffe482aa547e4a3aabf2da92e9773bf9eb0f57814
-DIST recoll-1.40.1.tar.gz 3034050 BLAKE2B f3a863ccb0a0c1b17fd9eb3093de472cec47b6375683e38e1b462584b26570f3d995531314a9c5f2dd193dca62efa150c699705a23e96419787000d3c4694510 SHA512 7590f1d17f9d8fc7930044d43d92be47158cbd2c830d8723a1604b672d3d8df22e507d7208525e1bfdc169b5151f5b6a3f96bbfefb5bededd0e2dae7bdeb2359
 DIST recoll-1.40.3.tar.gz 3217280 BLAKE2B e1e8cd0bae67087b6b34b79b9be2dde1db388740f8c2e8a222b07081ac275859780ba72a03dd319c759eae0209542ebe720f859a8a440e6d54b089858cb07257 SHA512 1f374e2f3ff721cdacd146d96e404d59554587ec30da63ffda8c9075a0b4407f70714e96a2ab3d7963f5d848096e5f295dc80bd7254ad8109e1e93732a8556a2
diff --git a/app-misc/recoll/recoll-1.37.4-r1.ebuild b/app-misc/recoll/recoll-1.37.4-r1.ebuild
deleted file mode 100644
index 23842e87356d..000000000000
--- a/app-misc/recoll/recoll-1.37.4-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit linux-info optfeature python-single-r1 qmake-utils systemd
-
-DESCRIPTION="Personal full text search package"
-HOMEPAGE="https://www.lesbonscomptes.com/recoll/"
-SRC_URI="https://www.lesbonscomptes.com/recoll/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-IUSE="camelcase chm +inotify qt5 session +spell systemd webengine"
-REQUIRED_USE="
-	session? ( inotify )
-	webengine? ( qt5 )
-	${PYTHON_REQUIRED_USE}
-"
-
-DEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/xapian:=
-	sys-libs/zlib
-	virtual/libiconv
-	chm? (
-		dev-libs/chmlib
-		dev-python/pychm
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		webengine? ( dev-qt/qtwebengine:5[widgets] )
-	)
-	session? (
-		inotify? (
-			x11-libs/libSM
-			x11-libs/libICE
-			x11-libs/libX11
-		)
-	)
-	spell? ( app-text/aspell )
-	systemd? ( sys-apps/systemd )
-	${PYTHON_DEPS}
-"
-
-BDEPEND="
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-
-RDEPEND="
-	${DEPEND}
-	app-arch/unzip
-"
-
-pkg_setup() {
-	if use inotify; then
-		local CONFIG_CHECK="~INOTIFY_USER"
-		check_extra_config
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	python_fix_shebang filters
-}
-
-src_configure() {
-	use qt5 && export QMAKE="$(qt5_get_bindir)/qmake"
-
-	local myeconfargs=(
-		$(use_enable camelcase)
-		$(use_enable chm python-chm)
-		$(use_enable session x11mon)
-		$(use_enable qt5 qtgui)
-		$(use_enable spell python-aspell)
-		$(use_enable webengine)
-		$(use_with inotify)
-		$(use_with spell aspell)
-		$(use_with systemd)
-		--with-system-unit-dir="$(systemd_get_systemunitdir)"
-		--with-user-unit-dir="$(systemd_get_userunitdir)"
-		--disable-webkit
-		--without-fam
-		--enable-recollq
-	)
-	use qt5 && myeconfargs+=( $(usex webengine "--disable-webpreview" "--enable-webpreview" ) )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake STRIP="$(type -P true || die)" DESTDIR="${D}" install
-	rm -rf "${D}/$(python_get_sitedir)"/*.egg-info || die
-	python_optimize
-
-	# html docs should be placed in /usr/share/doc/${PN}/html
-	dodoc -r "${ED}"/usr/share/recoll/doc/.
-	rm -r "${ED}/usr/share/recoll/doc" || die
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	optfeature "XML based documents support" "dev-libs/libxslt[python] dev-libs/libxml2[python]"
-	optfeature "PDF files support" app-text/poppler
-	optfeature "PDF files with OCR support" app-text/tesseract
-	optfeature "MS Word files support" app-text/antiword
-	optfeature "Wordperfect files support" "app-text/libwpd[tools]"
-	optfeature "Lyx files support" app-office/lyx
-	optfeature "GNU Info files support" sys-apps/texinfo
-	optfeature "RAR archives support" dev-python/rarfile
-	optfeature "7zip archives support" dev-python/pylzma
-	optfeature "iCalendar files support" dev-python/icalendar
-	optfeature "Postscript files support" app-text/pstotext
-	optfeature "RTF files support" app-text/unrtf
-	optfeature "TeX files support" virtual/tex-base
-	optfeature "DVI files support" virtual/tex-base
-	optfeature "DJVU files support" app-text/djvu
-	optfeature "tags in audio files support" media-libs/mutagen
-	optfeature "tags in image files support" media-libs/exiftool
-	optfeature "Midi karaoke files support" dev-python/chardet
-}
diff --git a/app-misc/recoll/recoll-1.40.1.ebuild b/app-misc/recoll/recoll-1.40.1.ebuild
deleted file mode 100644
index ae27da1acd9b..000000000000
--- a/app-misc/recoll/recoll-1.40.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit linux-info optfeature python-single-r1 qmake-utils meson systemd
-
-DESCRIPTION="Personal full text search package"
-HOMEPAGE="https://www.recoll.org"
-SRC_URI="https://www.recoll.org/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="camelcase chm +inotify qt6 session +spell systemd webengine"
-REQUIRED_USE="
-	session? ( inotify )
-	webengine? ( qt6 )
-	${PYTHON_REQUIRED_USE}
-"
-
-DEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/xapian:=
-	sys-libs/zlib
-	virtual/libiconv
-	chm? (
-		dev-libs/chmlib
-		dev-python/pychm
-	)
-	qt6? (
-		dev-qt/qtbase:6[gui,network,widgets]
-		webengine? ( dev-qt/qtwebengine:6[widgets] )
-	)
-	session? (
-		inotify? (
-			x11-libs/libSM
-			x11-libs/libICE
-			x11-libs/libX11
-		)
-	)
-	spell? ( app-text/aspell )
-	systemd? ( sys-apps/systemd )
-	${PYTHON_DEPS}
-"
-
-BDEPEND="
-	qt6? ( dev-qt/qttools:6[linguist] )
-"
-
-RDEPEND="
-	${DEPEND}
-	app-arch/unzip
-"
-
-pkg_setup() {
-	if use inotify; then
-		local CONFIG_CHECK="~INOTIFY_USER"
-		check_extra_config
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	python_fix_shebang filters
-}
-
-src_configure() {
-	use qt6 && export QMAKE="$(qt6_get_bindir)/qmake"
-
-	local emesonargs=(
-		$(meson_use camelcase)
-		$(meson_use chm python-chm)
-		$(meson_use inotify)
-		$(meson_use qt6 qtgui)
-		$(meson_use session x11mon)
-		$(meson_use spell aspell)
-		$(meson_use spell python-aspell)
-		$(meson_use systemd)
-		$(meson_use webengine)
-		-Dfam=false
-		-Drecollq=true
-		-Dwebkit=false
-		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
-		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
-	)
-
-	use qt6 && emesonargs+=( $(usex webengine "-Dwebpreview=true" "-Dwebpreview=false") )
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_install --strip
-	rm -rf "${D}/$(python_get_sitedir)"/*.egg-info || die
-	python_optimize
-
-	# html docs should be placed in /usr/share/doc/${PN}/html
-	rm -r "${ED}/usr/share/${PN}/doc" || die
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	optfeature "XML based documents support" "dev-libs/libxslt[python] dev-libs/libxml2[python]"
-	optfeature "PDF files support" app-text/poppler
-	optfeature "PDF files with OCR support" app-text/tesseract
-	optfeature "MS Word files support" app-text/antiword
-	optfeature "Wordperfect files support" "app-text/libwpd[tools]"
-	optfeature "Lyx files support" app-office/lyx
-	optfeature "GNU Info files support" sys-apps/texinfo
-	optfeature "RAR archives support" dev-python/rarfile
-	optfeature "7zip archives support" dev-python/pylzma
-	optfeature "iCalendar files support" dev-python/icalendar
-	optfeature "Postscript files support" app-text/pstotext
-	optfeature "RTF files support" app-text/unrtf
-	optfeature "TeX files support" virtual/tex-base
-	optfeature "DVI files support" virtual/tex-base
-	optfeature "DJVU files support" app-text/djvu
-	optfeature "tags in audio files support" media-libs/mutagen
-	optfeature "tags in image files support" media-libs/exiftool
-	optfeature "Midi karaoke files support" dev-python/chardet
-}
diff --git a/app-misc/resolve-march-native/Manifest b/app-misc/resolve-march-native/Manifest
index 59fe6d92000a..987145ec4764 100644
--- a/app-misc/resolve-march-native/Manifest
+++ b/app-misc/resolve-march-native/Manifest
@@ -3,3 +3,4 @@ DIST resolve-march-native-3.0.0.tar.gz 15866 BLAKE2B fcfcac3cb1219d332c8db6a5b44
 DIST resolve-march-native-4.1.0.tar.gz 20309 BLAKE2B e702d974db69d3e1e06d66d3f7a8aacd2d68077c105bf0b5147f5e3ab647d95009e96de5551f1ba9740872a2bbb08cffd65b6e3da495fbafafb2fa6312bf8551 SHA512 11ca0d982aad183687ce8a52f407cef73a2e843c1b227ba4fed72bae7927b8bc342d6a8adcc7da20a5ebc9c85a79f598cd2e0b603206b0b5c7f070e4b71c09a7
 DIST resolve-march-native-5.0.2.tar.gz 44486 BLAKE2B 2b6554cefabb17d9d931d2e1316d52203630971958091ba721ebeef77411c1c19385a7e4bc8c31bd9c781459f041aeb9a301b796be634f2a77a1418cf2a76d8a SHA512 272841289ab3695e9407beb289e42b56b67ddde594ee6b794ebb9cf2915a97f595f056985f62febcfeea3137e62400b389c586e849c4871b65d559130021633e
 DIST resolve-march-native-5.1.0.tar.gz 45734 BLAKE2B 88409980f64e92ad090104756ace2d05716eb5b6eb2f72c7e88e7c9d30aa4b8912aee2501b732857ac22fd16958d99ccafa7dd8d43d250da2849dcc8a7a0877f SHA512 b532011d2b524cc280c79c1e8d1f2d9036a3fd000ff92a22c363d416a7e86379c397a7404a329b950d2ea08c69ca1b78542fdd969f4fe8631eba1ad619af54d9
+DIST resolve-march-native-6.0.1.tar.gz 55615 BLAKE2B 58a7a029c2cad270e393b6837227301b3d9a0d7f6defc27e9a96ce74835855371dd0850235c4b6e7a97793178917aca8fe1127d000efba37d6cfb638899c0b6a SHA512 cb2020dd38cd4a27f0da4e04a6a9258738ea7024698f293bfdc75970ce2daf0ae7da814135b338bc9cdae4b91244310f03729f4a8df964dac8c9958bf92e086d
diff --git a/app-misc/resolve-march-native/resolve-march-native-6.0.1.ebuild b/app-misc/resolve-march-native/resolve-march-native-6.0.1.ebuild
new file mode 100644
index 000000000000..d97239732498
--- /dev/null
+++ b/app-misc/resolve-march-native/resolve-march-native-6.0.1.ebuild
@@ -0,0 +1,21 @@
+# 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..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Resolve GCC flag -march=native"
+HOMEPAGE="https://github.com/hartwork/resolve-march-native"
+SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~x86"
+
+RDEPEND="|| ( >=sys-devel/gcc-4.2 llvm-core/clang )"
+
+distutils_enable_tests pytest
diff --git a/app-misc/socnetv/Manifest b/app-misc/socnetv/Manifest
index 197a7fe7f8b2..13b4cb7a5df9 100644
--- a/app-misc/socnetv/Manifest
+++ b/app-misc/socnetv/Manifest
@@ -1 +1,2 @@
 DIST SocNetV-2.2.tar.gz 745086 BLAKE2B 3b520df2bb29f1989f744ec7e424caecd722cf3f903cf494e0fba9c0e5c1def413411768f593a3f8c0eb3cc20d1071d54babbd76eb24aac9f6670b4f2623ceb7 SHA512 12f490fd1f7fc1a6b45f77d23d8825117def0b7720595cd203d171fd88c41d5a0194a70359f55cbe2dab9e545f300156b31bb0680e46d7ab584e070e128e457b
+DIST socnetv-3.1.tar.gz 808640 BLAKE2B 377b42cb7420b60f1dc0edc4e000f2d5a5cc230170f7fe39f64c7a6a6147ea5f9797e59c57a3b43abbc4fd7e2bddd7338c87a0e954154d20eb87a70dcc5b2141 SHA512 2d18e3262dba71b7bdb4cbe3f453b931923a1b132a98c08046d91b6c535a5f137aedbf581043cb0c8640bbd276aa32801661b443d15fac8e03ab481fbcf9dc5e
diff --git a/app-misc/socnetv/files/socnetv-3.1-deps.patch b/app-misc/socnetv/files/socnetv-3.1-deps.patch
new file mode 100644
index 000000000000..89c40f5d8a45
--- /dev/null
+++ b/app-misc/socnetv/files/socnetv-3.1-deps.patch
@@ -0,0 +1,13 @@
+src/parser.h calls two classes provided by dev-qt/qtbase[-xml] :
+QXmlStreamReader
+QXmlStreamAttributes
+--- a/socnetv.pro
++++ b/socnetv.pro
+@@ -16,7 +16,6 @@
+ 
+ # add Qt module support
+ QT += core
+-QT += xml 
+ QT += network
+ QT += widgets
+ QT += printsupport 
diff --git a/app-misc/socnetv/socnetv-3.1.ebuild b/app-misc/socnetv/socnetv-3.1.ebuild
new file mode 100644
index 000000000000..8cfbefd25164
--- /dev/null
+++ b/app-misc/socnetv/socnetv-3.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+DESCRIPTION="Qt Social Network Visualizer"
+HOMEPAGE="https://socnetv.org/"
+SRC_URI="https://github.com/socnetv/app/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/app-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qt5compat:6
+	dev-qt/qtbase:6[gui,network,opengl,widgets]
+	dev-qt/qtcharts:6
+	dev-qt/qtsvg:6
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.1-deps.patch )
+
+src_configure() {
+	$(qt6_get_bindir)/lrelease socnetv.pro || die "lrelease failed"
+	eqmake6 socnetv.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index 1101a7a1f551..826817b8cfb9 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,3 +1,4 @@
 DIST solaar-1.1.13.tar.gz 1779788 BLAKE2B fd138c3c9faa467e356240e8cfc73f420776228f407092cc2f8bca3a9443e4820dad923c8d997d41934fbf7fd728b17a9674c7f9affaf4cd8616c779f6141ff1 SHA512 4557c82bddf88a604e9316806b8d37296acc4b4486a64605199f85949f6b5d5fd5dd94b25742e5b41d01fba4da40dd5ab2e354d536856ecf3310557b4a7d23a0
+DIST solaar-1.1.14.tar.gz 1790657 BLAKE2B bc2d2d42e4af02f72ecf9fb25152605582ada758b30c4019d7579a81f082bb121b18369ba349ae9c73401548d41cb321ed43415cd9dbad65d3919f58d1e93470 SHA512 2af8785a36b085e42ba885d8380fe9a967eb864a7443e4a96e6ab04cd3e2128ce6c0540c74d327953cc446f463bcc1d5d20c303ef14196b70e7e552e0caceaf9
 DIST solaar-1.1.8.tar.gz 1550947 BLAKE2B a33879e3c1b161d86c4c8a2c8edcc79eff285cb8937bf1e6621f3595ba5cf420e75fe700902b9f375698085bb929401154fa2bd25ae9663265e38c8406205bf6 SHA512 543c6257b36181813c9ed36747e53a15403da251fdd431c32525cada3ac88611da2c5f2a8212767ba3c7bb0071a3c2024f114805d9a33c761701bf958df29d85
 DIST solaar-1.1.9.tar.gz 1564119 BLAKE2B 67161bdd2a59ff17cafcdc5399f9f0c072985df85b2d0408e54c8f4e4966c3602a2b62f93b90e56e80fb3c4cbd285de2bbcc87a7709bea06ee4394f42a16f52e SHA512 42ea592aa8c4020be5e2ffd096de0bf6a7e6fdfac7eb2acd069c80084f88979398f779db6507b8b2cc4fd44c8a2ffce89024a42c161f130b4e1bd2c53e4e73a9
diff --git a/app-misc/solaar/solaar-1.1.14-r1.ebuild b/app-misc/solaar/solaar-1.1.14-r1.ebuild
new file mode 100644
index 000000000000..36377ed0edd4
--- /dev/null
+++ b/app-misc/solaar/solaar-1.1.14-r1.ebuild
@@ -0,0 +1,108 @@
+# 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 linux-info udev xdg distutils-r1
+
+DESCRIPTION="Linux Device Manager for Logitech Unifying Receivers and Paired Devices"
+HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
+if [[ ${PV} =~ 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pwr-Solaar/Solaar"
+else
+	SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P/_rc/rc}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}"/Solaar-${PV/_rc/rc}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="appindicator dbus doc libnotify test wayland"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/plugdev
+	dev-python/evdev[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]
+	>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	appindicator? ( dev-libs/libayatana-appindicator )
+	libnotify? ( x11-libs/libnotify[introspection] )
+	dbus? ( dev-python/dbus-python )
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+# libayatana-appindicator & libnotify are entirely optional and detected at runtime
+
+CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't autostart (bug #494608)
+	sed -r \
+		-e '/yield autostart_path/d' \
+		-e '/yield.*udev.*rules.d/{s,/etc,/lib,g}' \
+		-i setup.py || die
+
+	# grant plugdev group rw access
+	sed 's/#MODE=/MODE=/' \
+		-i rules.d/42-logitech-unify-permissions.rules || die
+	# and the same for wayland (bug #933418)
+	sed 's/#MODE=/MODE=/' \
+		-i rules.d-uinput/42-logitech-unify-permissions.rules || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc docs/devices.md CHANGELOG.md
+	if use doc; then
+		dodoc -r docs/*
+	else
+		newdoc docs/index.md README.md
+	fi
+
+	# bug #933418
+	if use wayland; then
+		udev_dorules "${S}"/rules.d-uinput/42-logitech-unify-permissions.rules
+	else
+		udev_dorules "${S}"/rules.d/42-logitech-unify-permissions.rules
+	fi
+}
+
+python_test() {
+	local -a EPYTEST_DESELECT=(
+		# don't like sandbox
+		tests/logitech_receiver/test_desktop_notifications.py::test_notifications_available
+		tests/logitech_receiver/test_desktop_notifications.py::test_init
+		tests/logitech_receiver/test_desktop_notifications.py::test_show
+		tests/solaar/ui/test_desktop_notifications.py::test_notifications_available
+		tests/solaar/ui/test_desktop_notifications.py::test_init
+	)
+
+	distutils-r1_python_test
+}
+
+pkg_postinst() {
+	udev_reload
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	udev_reload
+	xdg_pkg_postrm
+}
diff --git a/app-misc/symlinks/Manifest b/app-misc/symlinks/Manifest
index 29c4d4b49c92..cdb93ec0ffa4 100644
--- a/app-misc/symlinks/Manifest
+++ b/app-misc/symlinks/Manifest
@@ -1 +1,2 @@
+DIST symlinks-1.4.3.tar.gz 5888 BLAKE2B 9a75c4f82d93abe2b996fe75c265885a40d8a2966b77659a09e9beb0eeb703b01e0c0dcb1bfc802457f1a1b6e8b681b2e987b10349b2fd48203ea07ea03e79ce SHA512 90437e9114ad18b4137a490111be672d613c141ea8ee43cbf3c3a4ee3f80c620150926a91ec3f52467ed8efce989b1035f72d02a013d335cca5a052b6c0733f8
 DIST symlinks-1.4.tar.gz 4942 BLAKE2B 983c16bd5dedbca3f3544756a1e5de4939eb31e871c72110224f7e63821cec69289d9a1e152081d9895230670b96ed813ef0692ea0922d9a52d5050ade723893 SHA512 d1efb1ca553cc9eb95f1d113e453acd22c9f0964eacec985c85c125de23ae9d636b9ced182c2673f455e5d897ad15a978a424170fce767ccc492443eac7f972f
diff --git a/app-misc/symlinks/metadata.xml b/app-misc/symlinks/metadata.xml
index aaacc80666ac..73cfa7004817 100644
--- a/app-misc/symlinks/metadata.xml
+++ b/app-misc/symlinks/metadata.xml
@@ -10,6 +10,9 @@
 		Each link is prefixed with a classification of relative, absolute,
 		dangling, messy, lengthy or other_fs. Symlinks can also convert
 		absolute links (within the same filesystem) to relative links and can
-		delete messy and dangling links. 
+		delete messy and dangling links.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">brandt/symlinks</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/symlinks/symlinks-1.4.3.ebuild b/app-misc/symlinks/symlinks-1.4.3.ebuild
new file mode 100644
index 000000000000..2d47820dd803
--- /dev/null
+++ b/app-misc/symlinks/symlinks-1.4.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Scans for and fixes broken or messy symlinks"
+HOMEPAGE="https://github.com/brandt/symlinks"
+SRC_URI="https://github.com/brandt/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="symlinks"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+DOCS=( Readme.md )
+
+src_prepare() {
+	default
+	# could be useful if being used to repair
+	# symlinks that are preventing shared libraries from
+	# functioning.
+	use static && append-flags -static
+	append-lfs-flags
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.8"
+	einstalldocs
+}
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index eda17f564458..30a0079f17a9 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -1,2 +1,3 @@
 DIST tmuxp-1.46.0.tar.gz 870062 BLAKE2B b8c450e186097584e4f67de6375acd898b02826ad2a7c758cf0a502c7b60c5dad7ae537df8bcc18310ec6c20cd52700d5d87d336e23de4a786c607eb57ffe5f3 SHA512 1e2fa9b20ade766c7bcbec5b3b430c118cfa27b00e808241d0daf6720351d35863000f22ff052bf0f9f38a63e21813814591312ab0c5af14488a6546af5440ed
 DIST tmuxp-1.49.0.tar.gz 903826 BLAKE2B d756a7b67ac5c55ef178eea0ff7bf7f2ebe760022eb50d8877971d058d803762fb105389b757d2f4c26b2c5cb87b48ab3641253bf110bd5cb33a0993f7b5fa5f SHA512 76f7bbe908fc513214f4f5b528be3a14f55e10b48399886213db18e48da02fcca9f65893a61f1a7dd153d7eb6ad85d133e82a881916b0388a01b768867477d10
+DIST tmuxp-1.50.1.tar.gz 908321 BLAKE2B 3d459fda22f9f1ec21b894262869e3ebe1aebb7353ee5529fa2f05ca9754b5db3e0bcbc72688745b82c81f54cb5aacdb6d539024d86aa39bcbed156f18616737 SHA512 0668e83ef8d933eb154093c0bf6a6d1a115c308083c9786aa2642f616c862b8db1490bc480f1a5fbd73f4fd555cb0593be933e4dae23ec4b5919a617383533f8
diff --git a/app-misc/tmuxp/tmuxp-1.50.1.ebuild b/app-misc/tmuxp/tmuxp-1.50.1.ebuild
new file mode 100644
index 000000000000..677fd5e0fcb7
--- /dev/null
+++ b/app-misc/tmuxp/tmuxp-1.50.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2019-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_USE_PEP517=hatchling
+inherit distutils-r1
+
+DESCRIPTION="tmux session manager. built on libtmux"
+HOMEPAGE="https://tmuxp.git-pull.com"
+SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=app-misc/tmux-3.0a
+	=dev-python/libtmux-0.40.1*[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-6.2.5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.14.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
+		!dev-python/flaky
+	)
+"
+
+EPYTEST_DESELECT=(
+	# test doesn't get along with sandbox
+	"tests/cli/test_load.py::test_load_zsh_autotitle_warning"
+)
+
+EPYTEST_IGNORE=(
+	# not actually tests, but throws off test collection
+	"tests/fixtures/"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -r -e 's:libtmux = "~[0-9.]+":libtmux = "~0.30":' \
+		-i pyproject.toml || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	SHELL="/bin/bash" epytest tests
+}
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index f21db907eb57..d3fe08a1ece1 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -1 +1,2 @@
 DIST uptimed-0.4.6.tar.gz 56796 BLAKE2B 9ea2e5f9e045f11f29232e51746bd4984fb93a8b9c36b652c4b247ab0923c1b162067aa20cb5bf0d8d2dee8e927aecea33b7be488b51f573ba525b6234b78e86 SHA512 035caba32182a807312b587b3cb3b6322027b7c8f3e69a3f0b52ea4f44ecfc40505fe58b6a1b56a87a967f1f8b1fbc075414a04b60717577e32972feadb9bc2d
+DIST uptimed-0.4.7.tar.gz 56796 BLAKE2B 2ebc8229bded21cfd6f5ae644515b79606eddf931e976747560c684e9e651e910fa3d9623fd8245e4d4abf4d764446170c5b27f6e538966c8f9d5be3d1c657ce SHA512 857357d3f21770ea04710eae7775dad562b1112c3d17e3d771d67d80fc11d1e5aeb8a869a70cdb76c103e0fd6384273c4498a3d5cbd33035b3b72dcce65ea211
diff --git a/app-misc/uptimed/uptimed-0.4.7.ebuild b/app-misc/uptimed/uptimed-0.4.7.ebuild
new file mode 100644
index 000000000000..152b3c8d1c6e
--- /dev/null
+++ b/app-misc/uptimed/uptimed-0.4.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
+HOMEPAGE="https://github.com/rpodgorny/uptimed/"
+SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="selinux"
+
+RDEPEND="
+	acct-group/uptimed
+	acct-user/uptimed
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+RDEPEND+=" selinux? ( sec-policy/selinux-uptime )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	local spooldir="/var/spool/${PN}"
+	keepdir ${spooldir}
+	fowners uptimed:uptimed ${spooldir}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
+	elog "or systemctl start uptimed (for systemd)"
+	elog "To view your uptime records, use the command 'uprecords'."
+}
diff --git a/app-misc/when/Manifest b/app-misc/when/Manifest
index 5b6b6bf20a05..1dacaf1e3366 100644
--- a/app-misc/when/Manifest
+++ b/app-misc/when/Manifest
@@ -1,2 +1 @@
-DIST when-1.1.40.tar.gz 55306 BLAKE2B 3d4bdc962ccff64b09f5dda7a2c7be1daa0fd5fed2039f784ea6279e9aac495823159098f6a05c281de40d7964cc244a76c6b3bda1c4227748c04c98effac54d SHA512 0d70f2c9c4d44bbd922dc0d6b1a4e1eb90561a81add3ad4f1e1fc467a6331ca856d66725361d4e5ea3f1ce9ea1ed59d91ad18178e022b029c04c0c15747ecbcd
 DIST when-1.1.45.tar.gz 46424 BLAKE2B 5c4d7036d2b5e5db6af3fa611411d11a1952eb8316861a9da90edc75d08e439349a46c4b86ec2c5a43276eb04240c03f59a80224ece8def7b84fee6e0c84ef95 SHA512 918265ae64d06f02dd358c48596e9fab422c5de884f9bf12684d857c50790c5e4977d68040e51c0dfc39c7a4d66b76ba2fa88b620bc96024f89c5be2ab4846fd
diff --git a/app-misc/when/when-1.1.40.ebuild b/app-misc/when/when-1.1.40.ebuild
deleted file mode 100644
index 51356f2b9c61..000000000000
--- a/app-misc/when/when-1.1.40.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Minimalistic personal calendar program"
-HOMEPAGE="http://www.lightandmatter.com/when/when.html"
-SRC_URI="http://www.lightandmatter.com/when/when.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/when_dist"
-
-DOCS=( README )
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	# Fix path for tests
-	sed -i 's,^	when,	./when,' Makefile || die 'sed failed'
-}
-
-src_compile() { :; }
-
-src_test() {
-	# The when command requires these files, or attempts to run setup function.
-	mkdir "${HOME}"/.when || die 'mkdir failed'
-	touch "${HOME}"/.when/{calendar,preferences} || die 'touch failed'
-	emake test
-}
-
-src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/app-misc/yq-go/Manifest b/app-misc/yq-go/Manifest
index 017acf599a04..0913502a5523 100644
--- a/app-misc/yq-go/Manifest
+++ b/app-misc/yq-go/Manifest
@@ -2,3 +2,5 @@ DIST yq-4.44.3-deps.tar.xz 1376444 BLAKE2B dbccf16fa939991f01762efec5f14f86394a9
 DIST yq-4.44.3.tar.gz 297938 BLAKE2B 9a4e382e2fb5862302aafca2268d8551232b0636adae560151acca1060d8e09c46dc36eee8597d7763d50fc53f36fdc8c1ff3df81f88f637f6b4ad5714c6e116 SHA512 ad4971d7a2f3a4355a696027a178d05b7388b26241a097fc8d222f81fb8ed18b908d0e2cefe0210f70bf4e5ee2becef61206def40e908be20e60d5a074c38bb5
 DIST yq-4.44.5-deps.tar.xz 1385000 BLAKE2B efb55351a560d011d96498c7c515270c9e85ea4088a498970f1f88e0e882cca3c9cff4939b434cb0d5fa25a2f2829370d675f4743e935697a13e3bfb11c0cdea SHA512 4e2b8034e7b244ac4c612d09e7ca2c6ea6b2359a2bab01b58920e221f542a66631f7ae5f5c686d0587a6e6bf7b283b688ece2d11a0c6babf2b4023b9c13dcf3b
 DIST yq-4.44.5.tar.gz 298784 BLAKE2B 1a99bbde07eaf385c93ca199f2bf8aeeab77af8e8f4e1f306fe986fcedb8432f9a6ffba2619bf39519c4707d53c3b4e289669724982b8d3a3b512a40c1a57f06 SHA512 a03da38d6847ab712d50a62800c80daa3e49b7fcb64dc96afcf1b52406824e19315c41a1401de54a148bafad3632ea70ccc3e9f654836bde236c0a221768fc6f
+DIST yq-4.45.1-deps.tar.xz 1386140 BLAKE2B b52de4d96e84d50bbf06c666afed80c66148aeef7fbb8d2d726f234870413da32e0c6a2bb396632af2118398304f7acd5b156d5e4fe9a359e33d87ef588ca707 SHA512 8524e63ce611ce59d6611b42f06985f7d5cccf0969a5bb5c73aaf75ed613581b42a0743c9dd8fbd503e9b8f407343a5d0241e6370c6b6562947634c5ad19b2b3
+DIST yq-4.45.1.tar.gz 299351 BLAKE2B fb1510a3e592c64550f60f35862aa3acf1eddb78bed2d9b564bd5c38cd93fdde24e0e772f5b7e858d96fb6bbaf3a48fb872edc6d32dc6b2271bb85ac365b2214 SHA512 c6da3b529c5c2e54d3a36ba290923454dc9daba68f8181d2e0e381498ee6951164fb958ded7741bad9d83bb235fb51ac0d9c312a89c95af64ec7118a72224104
diff --git a/app-misc/yq-go/yq-go-4.45.1.ebuild b/app-misc/yq-go/yq-go-4.45.1.ebuild
new file mode 100644
index 000000000000..29f6b3d36415
--- /dev/null
+++ b/app-misc/yq-go/yq-go-4.45.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="yq is a lightweight and portable command-line YAML, JSON and XML processor"
+HOMEPAGE="https://github.com/mikefarah/yq"
+SRC_URI="https://github.com/mikefarah/yq/archive/refs/tags/v${PV}.tar.gz -> ${P/-go/}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/${P/-go/}-deps.tar.xz"
+
+S=${WORKDIR}/${P/-go/}
+LICENSE+=" Apache-2.0 BSD BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~loong"
+IUSE="+yq-symlink"
+DOCS=(README.md)
+RDEPEND="yq-symlink? ( !app-misc/yq[yq-symlink(+)] )"
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	ln -sv ../vendor ./ || die
+	default
+}
+
+src_compile() {
+	CGO_ENABLED=0 ego build -ldflags "-X main.GitDescribe=v${PV} -s -w"
+}
+
+src_install() {
+	einstalldocs
+	newbin yq yq-go
+	if use yq-symlink; then
+		dosym yq-go /usr/bin/yq
+	fi
+}
+
+src_test() {
+	./scripts/test.sh || die
+}
diff --git a/app-office/joplin-desktop/Manifest b/app-office/joplin-desktop/Manifest
index c36783524ad5..550684e6b475 100644
--- a/app-office/joplin-desktop/Manifest
+++ b/app-office/joplin-desktop/Manifest
@@ -1,4 +1,4 @@
-DIST Joplin-3.1.23.AppImage 244602125 BLAKE2B b344accd0fa80240c11074acab90c46b91d4e9c294087663d8cd0f4353649cf1631828cf2ba7d89b5156cfdc80bbee3e37d4dc988359ff3c4f2ea6cbc52f607e SHA512 ec917be832a7c0c33033a4ee1a7f85cefdaa6f07ab735af54689fd4ffc70477c6b4a8e31add3b1c85ccff6df7e613b338bf1d67c395dfd113948f594b2da34fe
 DIST Joplin-3.1.24.AppImage 244603841 BLAKE2B 2175019cbcca58473fb9b7f6157f001ca3c36ede16cc62191c165c3852496dfabb811fc3507ab2e0c5981959e9be50bc8836d0108cc9c80969f6ce0f511f130a SHA512 e286186c07f64ca70f13a95584fa49b7c8ac97bb025c288ca5b15b8334f9ea52ed758cc272c3e6c277544785b02f24423f8af9191973245faef1974791a7366c
 DIST Joplin-3.2.3.AppImage 386823720 BLAKE2B f75938fbe5a8a4de995966b5bbbd6bbb38a2581cf211b29e87a38587573ac49486957455a49a676c0a26a1c531bea48e09905caecd3c437bbda85cc0f1cd550a SHA512 b7019bf7a16edc4dbfbee9b9e76f0ef792267c044b4bd7c35aec1befdcb41b698640f5e2ba167883f4132da98db19b0c53c0e0757f4ce81683d0f410952fc43d
 DIST Joplin-3.2.4.AppImage 282754638 BLAKE2B 612bbe8d3a972d63afc67a399ccd5cd8dd114e1338406203be8e9092340a794e7579ae318d0c7210584169328487b0674ed8bb6f0a3372459e93a25464f5ff31 SHA512 4e3273ccf10cfdc731e4c616bf72bd6827a48934938b2ad7dc2c7750cf66c2b0ed23b4bd4825b1fd561ca5115ec1bb5f13a1ecb54a90e260b48999b9e70e498d
+DIST Joplin-3.2.7.AppImage 226047655 BLAKE2B 407aaddb916b5082b6c040dfa4510d03564612634eb236f2f58fe6217ec57319393073762633eb20988e48bd89eebb3233c068cb812e5e341229e2ee5520f08f SHA512 211aff435bb9d493087eb0906d50424d4a4ab740b4ef0a054a34949eb65a49adf45ba4efc1b738fd4d81fc0012d7c7ba1293b36ff3fd213ab64dc6b1323f34dc
diff --git a/app-office/joplin-desktop/joplin-desktop-3.1.23.ebuild b/app-office/joplin-desktop/joplin-desktop-3.1.23.ebuild
deleted file mode 100644
index f35b526ca3f5..000000000000
--- a/app-office/joplin-desktop/joplin-desktop-3.1.23.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NOTICE: This is a Electron app (oh my) and the upstream only provides AppImages.
-
-EAPI=8
-
-APPIMAGE="Joplin-${PV}.AppImage"
-
-inherit desktop xdg
-
-DESCRIPTION="Secure note taking and to-do app with synchronization capabilities"
-HOMEPAGE="https://joplinapp.org/
-	https://github.com/laurent22/joplin/"
-SRC_URI="https://github.com/laurent22/joplin/releases/download/v${PV}/${APPIMAGE}"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="-* amd64"
-RESTRICT="bindist"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret[crypt]
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	|| (
-		media-libs/libcanberra-gtk3
-		media-libs/libcanberra[gtk3(-)]
-	)
-	media-libs/libglvnd
-	media-libs/mesa
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/zlib
-	sys-process/lsof
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libnotify
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-
-src_unpack() {
-	mkdir -p "${S}" || die
-	cp "${DISTDIR}/${APPIMAGE}" "${S}" || die
-
-	cd "${S}" || die         # "appimage-extract" unpacks to current directory.
-	chmod +x "${S}/${APPIMAGE}" || die
-	"${S}/${APPIMAGE}" --appimage-extract || die
-}
-
-src_prepare() {
-	# Fix permissions.
-	find "${S}" -type d -exec chmod a+rx {} + || die
-	find "${S}" -type f -exec chmod a+r {} + || die
-
-	default
-}
-
-src_install() {
-	cd "${S}/squashfs-root" || die
-
-	insinto /usr/share
-	doins -r ./usr/share/icons
-
-	local apphome="/opt/${PN}"
-	local toremove=(
-		.DirIcon
-		@joplinapp-desktop.desktop
-		@joplinapp-desktop.png
-		AppRun
-		LICENSE.electron.txt
-		LICENSES.chromium.html
-		resources/app.asar.unpacked/node_modules/7zip-bin-linux/arm
-		resources/app.asar.unpacked/node_modules/7zip-bin-linux/arm64
-		resources/app.asar.unpacked/node_modules/node-notifier
-		usr
-	)
-	rm -f -r "${toremove[@]}" || die
-
-	mkdir -p "${ED}/${apphome}" || die
-	cp -r . "${ED}/${apphome}" || die
-
-	dosym -r "${apphome}/@joplinapp-desktop" "/usr/bin/${PN}"
-	make_desktop_entry "${PN}" Joplin @joplinapp-desktop "Office;" \
-		"StartupWMClass=Joplin\nMimeType=x-scheme-handler/joplin;"
-}
diff --git a/app-office/joplin-desktop/joplin-desktop-3.2.7.ebuild b/app-office/joplin-desktop/joplin-desktop-3.2.7.ebuild
new file mode 100644
index 000000000000..e512dc366a9a
--- /dev/null
+++ b/app-office/joplin-desktop/joplin-desktop-3.2.7.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTICE: This is a Electron app (oh my) and the upstream only provides AppImages.
+
+EAPI=8
+
+APPIMAGE="Joplin-${PV}.AppImage"
+
+inherit desktop xdg
+
+DESCRIPTION="Secure note taking and to-do app with synchronization capabilities"
+HOMEPAGE="https://joplinapp.org/
+	https://github.com/laurent22/joplin/"
+SRC_URI="https://github.com/laurent22/joplin/releases/download/v${PV}/${APPIMAGE}"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret[crypt]
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	|| (
+		media-libs/libcanberra-gtk3
+		media-libs/libcanberra[gtk3(-)]
+	)
+	media-libs/libglvnd
+	media-libs/mesa
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/zlib
+	sys-process/lsof
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libnotify
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+
+src_unpack() {
+	mkdir -p "${S}" || die
+	cp "${DISTDIR}/${APPIMAGE}" "${S}" || die
+
+	cd "${S}" || die         # "appimage-extract" unpacks to current directory.
+	chmod +x "${S}/${APPIMAGE}" || die
+	"${S}/${APPIMAGE}" --appimage-extract || die
+}
+
+src_prepare() {
+	# Fix permissions.
+	find "${S}" -type d -exec chmod a+rx {} + || die
+	find "${S}" -type f -exec chmod a+r {} + || die
+
+	default
+}
+
+src_install() {
+	cd "${S}/squashfs-root" || die
+
+	insinto /usr/share
+	doins -r ./usr/share/icons
+
+	local apphome="/opt/${PN}"
+	local -a toremove=(
+		.DirIcon
+		AppRun
+		LICENSE.electron.txt
+		LICENSES.chromium.html
+		joplin.png
+		resources/app.asar.unpacked/node_modules/7zip-bin-linux/arm
+		resources/app.asar.unpacked/node_modules/7zip-bin-linux/arm64
+		resources/app.asar.unpacked/node_modules/node-notifier
+		usr
+	)
+	rm -f -r "${toremove[@]}" || die
+
+	mkdir -p "${ED}/${apphome}" || die
+	cp -r . "${ED}/${apphome}" || die
+
+	dosym -r "${apphome}/joplin" "/usr/bin/${PN}"
+	make_desktop_entry "${PN}" Joplin joplin "Office;" \
+		"StartupWMClass=Joplin\nMimeType=x-scheme-handler/joplin;"
+}
diff --git a/app-office/ktimetracker/Manifest b/app-office/ktimetracker/Manifest
index 66674bb57015..fbd917e4370d 100644
--- a/app-office/ktimetracker/Manifest
+++ b/app-office/ktimetracker/Manifest
@@ -1 +1,2 @@
 DIST ktimetracker-5.0.1.tar.xz 422820 BLAKE2B 4aa4aba97f612b4ea426ed13cb0f830f646311254e75ab8ddef5f6edc62bbf2acb85d85d8031bae969f3dde411e649f645bb1fbd2a52b95eb831a530fa4e80ba SHA512 78de8651efd72fa9fd5c7f06992ab8970e1d763c6f30f5eba52ec93bb6a2bb19ae777bc90809ef5198bc3b6a5f9f5ee78e240eadcacd8ce8489bdb28cd62431e
+DIST ktimetracker-6.0.0_pre20250109-72017cd5.tar.gz 1030979 BLAKE2B 60dc94c25c28bf3b72a5c9fb3fc47e6dce57d49d95bb6562b13ceb6d21c1eaaac7ecc9e40cc23c9850aa35f5b29d52caa5af9a0972286202e1de0bc5b8b1abc8 SHA512 a4ad27fb420fdb7a23cc0a1a2973965d7e35d40cd714e9618a06c849417a2b006531c44918861f8c810f6a21553a2e4a20c45469d770b9d84549842676ba1e15
diff --git a/app-office/ktimetracker/ktimetracker-6.0.0_pre20250109.ebuild b/app-office/ktimetracker/ktimetracker-6.0.0_pre20250109.ebuild
new file mode 100644
index 000000000000..2e5ad6873aa5
--- /dev/null
+++ b/app-office/ktimetracker/ktimetracker-6.0.0_pre20250109.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=72017cd540ed4e7a5a443a493962f6e612cafde9
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="pim"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm kde.org
+
+DESCRIPTION="Todo management and time tracker"
+HOMEPAGE="https://userbase.kde.org/KTimeTracker"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kidletime-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5
+"
diff --git a/app-office/libreoffice/files/libreoffice-24.2.7.2-poppler-24.12.patch b/app-office/libreoffice/files/libreoffice-24.2.7.2-poppler-24.12.patch
new file mode 100644
index 000000000000..d829ad76d0f7
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-24.2.7.2-poppler-24.12.patch
@@ -0,0 +1,38 @@
+From db12ee77c17ea9ed477c310bd1e58f00d519f653 Mon Sep 17 00:00:00 2001
+From: Michael Stahl <michael.stahl@allotropia.de>
+Date: Tue, 7 Jan 2025 18:42:29 +0100
+Subject: sdext: adapt xpdfwrapper to poppler 24.12
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: Ia47edf2ac821e3ef5c40f7582253f894eac74060
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179902
+Tested-by: Jenkins
+Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
+(cherry picked from commit aa94faf493945e854a888e809a9c5cc8d6d0b978)
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179945
+Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
+---
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index 57164f27cb42..6748431e53d2 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -1090,7 +1090,12 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
+ 
+     int bitsPerComponent = 1;
+     StreamColorSpaceMode csMode = streamCSNone;
++#if POPPLER_CHECK_VERSION(24, 12, 0)
++    bool hasAlpha;
++    str->getImageParams( &bitsPerComponent, &csMode, &hasAlpha );
++#else
+     str->getImageParams( &bitsPerComponent, &csMode );
++#endif
+     if( bitsPerComponent == 1 && (csMode == streamCSNone || csMode == streamCSDeviceGray) )
+     {
+         GfxRGB oneColor = { dblToCol( 1.0 ), dblToCol( 1.0 ), dblToCol( 1.0 ) };
+-- 
+cgit v1.2.3
diff --git a/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch b/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch
deleted file mode 100644
index a6e732f7f379..000000000000
--- a/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/shell/source/unix/misc/senddoc.sh	2017-06-15 15:44:22.000000000 +0200
-+++ b/shell/source/unix/misc/senddoc.sh	2017-06-25 01:00:08.525435930 +0200
-@@ -389,6 +389,8 @@
-         elif [ -n "$DESKTOP_LAUNCH" ]; then
-             # http://lists.freedesktop.org/pipermail/xdg/2004-August/002873.html
-             MAILER=${DESKTOP_LAUNCH}
-+        elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open5 ] ; then
-+            MAILER=/usr/bin/kde-open5
-         elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open ] ; then
-             MAILER=/usr/bin/kde-open
-         elif [ -x /usr/bin/xdg-open ] ; then
diff --git a/app-office/libreoffice/libreoffice-24.2.7.2.ebuild b/app-office/libreoffice/libreoffice-24.2.7.2.ebuild
index 294217f3d6a8..1d23a5c8bf96 100644
--- a/app-office/libreoffice/libreoffice-24.2.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.7.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
@@ -322,6 +322,7 @@ PATCHES=(
 
 	# 24.8 branch
 	"${FILESDIR}/${P}-no-std-basic_string-int.patch" # bug #923950
+	"${FILESDIR}/${P}-poppler-24.12.patch" # bug #943695
 
 	# git master
 	# bug #917618, thx to Debian:
diff --git a/app-office/libreoffice/libreoffice-24.2.9999.ebuild b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
deleted file mode 100644
index e46df39e2516..000000000000
--- a/app-office/libreoffice/libreoffice-24.2.9999.ebuild
+++ /dev/null
@@ -1,693 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
-	https://dev-builds.libreoffice.org/pre-releases/src
-	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
-	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
-	# not packaged in Gentoo
-	"${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
-	# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
-	"${ADDONS_URI}/dtoa-20180411.tgz"
-	# not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
-	"${ADDONS_URI}/frozen-1.1.1.tar.gz"
-	# not packaged in Gentoo, https://skia.org/
-	"${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"
-	# not packaged in Gentoo, https://github.com/tsyrogit/zxcvbn-c
-	"${ADDONS_URI}/zxcvbn-c-2.5.tar.gz"
-	"base? (
-		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
-		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-		${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-		${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-		${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-		${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-		${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-		${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-		${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-		${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-		${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-		${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	)"
-	# Java-WebSocket: not packaged in Gentoo, https://github.com/TooTallNate/Java-WebSocket
-	"java? (
-		${ADDONS_URI}/Java-WebSocket-1.5.4.tar.gz
-		${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-	)"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt5 qt6 test valgrind vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	base? ( java )
-	bluetooth? ( dbus )
-	kde? ( || ( qt5 qt6 ) )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/argon2:=
-	app-crypt/gpgme:=[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.21
-	>=app-text/libnumbertext-1.0.6
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	>=dev-cpp/libcmis-0.6.2:0=
-	dev-db/unixODBC
-	dev-lang/perl
-	dev-libs/boost:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error
-	>=dev-libs/liborcus-0.18.0:0/0.18
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.35:=[nss]
-	>=games-engines/box2d-2.4.1:0
-	media-gfx/fontforge
-	media-gfx/graphite2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.11.0-r1:2
-	>=media-libs/harfbuzz-5.1.0:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libjpeg-turbo:=
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libwebp:=
-	media-libs/libzmf
-	media-libs/openjpeg:=
-	media-libs/tiff:=
-	media-libs/zxing-cpp:=
-	net-misc/curl
-	sci-mathematics/lpsolve:=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	accessibility? (
-		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-	)
-	bluetooth? (
-		dev-libs/glib:2
-		net-wireless/bluez
-	)
-	coinmp? ( sci-libs/coinor-mp )
-	cups? ( net-print/cups )
-	dbus? ( sys-apps/dbus )
-	eds? (
-		dev-libs/glib:2
-		>=gnome-base/dconf-0.40.0
-		gnome-extra/evolution-data-server
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		app-accessibility/at-spi2-core:2
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl(+)]
-		x11-libs/gtk+:3[X]
-		x11-libs/pango
-	)
-	kde? (
-		qt5? (
-			kde-frameworks/kconfig:5
-			kde-frameworks/kcoreaddons:5
-			kde-frameworks/ki18n:5
-			kde-frameworks/kio:5
-			kde-frameworks/kwindowsystem:5
-		)
-		qt6? (
-			kde-frameworks/kconfig:6
-			kde-frameworks/kcoreaddons:6
-			kde-frameworks/ki18n:6
-			kde-frameworks/kio:6
-			kde-frameworks/kwindowsystem:6
-		)
-	)
-	ldap? ( net-nds/openldap:= )
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	!mariadb? ( dev-db/mysql-connector-c:= )
-	pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-#        tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libatomic_ops-7.2d
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3.1
-	dev-util/mdds:1/2.1
-	media-libs/glm
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libXtst
-	java? (
-		dev-java/ant:0
-		>=virtual/jdk-17
-	)
-	test? (
-		app-crypt/gnupg
-		dev-util/cppunit
-		media-fonts/dejavu
-		media-fonts/liberation-fonts
-	)
-	valgrind? ( dev-debug/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/libreoffice
-	acct-user/libreoffice
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )
-	java? ( >=virtual/jre-11 )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
-	dev-util/intltool
-	sys-apps/which
-	app-alternatives/yacc
-	app-alternatives/lex
-	sys-devel/gettext
-	virtual/pkgconfig
-	clang? (
-		|| (
-			(	llvm-core/clang:18
-				llvm-core/llvm:18
-				=llvm-core/lld-18*	)
-			(	llvm-core/clang:17
-				llvm-core/llvm:17
-				=llvm-core/lld-17*	)
-			(	llvm-core/clang:16
-				llvm-core/llvm:16
-				=llvm-core/lld-16*	)
-			(	llvm-core/clang:15
-				llvm-core/llvm:15
-				=llvm-core/lld-15*	)
-		)
-	)
-	odk? ( >=app-text/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
-	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-	"${FILESDIR}/${PN}-24.2-qtdetect.patch"
-
-	# TODO: upstream
-	"${FILESDIR}/${PN}-7.6-unused-qt5network.patch"
-	"${FILESDIR}/${PN}-24.2-unused-qt6network.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
-	CHECKREQS_MEMORY="512M"
-	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		CHECKREQS_DISK_BUILD="22G"
-	else
-		CHECKREQS_DISK_BUILD="6G"
-	fi
-	check-reqs_$1
-}
-
-pkg_pretend() {
-	use base ||
-		ewarn "If you plan to use Base application you must enable USE base."
-	use java ||
-		ewarn "Without USE java, several wizards are not going to be available."
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-	xdg_environment_reset
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${MY_PV} = *9999* ]]; then
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${MY_PV/.9999}
-		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-		LOCOREGIT_VERSION=${EGIT_VERSION}
-
-		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
-		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
-	fi
-}
-
-src_prepare() {
-	default
-
-	# sandbox violations on many systems, we don't need it. Bug #646406
-	sed -i \
-		-e "/KF5_CONFIG/s/kf5-config/no/" \
-		configure.ac || die "Failed to disable kf5-config"
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# sed in the tests
-	sed -i \
-		-e "s#all : build unitcheck#all : build#g" \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
-		bin/distro-install-desktop-integration || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
-	fi
-
-	# Don't list pdfimport support in desktop when built with none, bug # 605464
-	if ! use pdfimport; then
-		sed -i \
-			-e ":MimeType: s:application/pdf;::" \
-			-e ":Keywords: s:pdf;::" \
-			sysui/desktop/menus/draw.desktop || die
-	fi
-}
-
-src_configure() {
-	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
-	# Note: these are for Gentoo use ONLY. For your own distribution, please get
-	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	# Show flags set at the beginning
-	einfo "Preset CFLAGS:    ${CFLAGS}"
-	einfo "Preset LDFLAGS:   ${LDFLAGS}"
-
-	# Workaround for bug #915067
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	if use clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-		LDFLAGS+=" -fuse-ld=lld"
-
-		# Workaround for bug #907905
-		filter-lto
-
-		# Not implemented by Clang, bug #903889
-		filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
-	else
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-
-		# Apparently the Clang flags get used even for GCC builds sometimes.
-		# bug #838115
-		sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
-	fi
-
-	if use custom-cflags ; then
-		elog "USE=custom-cflags has been selected. You are on your own to make sure that"
-		elog "the build succeeds. Good luck!"
-	else
-		strip-flags
-	fi
-
-	export LO_CLANG_CC=${CC}
-	export LO_CLANG_CXX=${CXX}
-
-	# Show flags set at the end
-	einfo "  Used CFLAGS:    ${CFLAGS}"
-	einfo "  Used LDFLAGS:   ${LDFLAGS}"
-
-	# Ensure we use correct toolchain
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use qt5; then
-		export QT5DIR="$(qt5_get_bindir)/.."
-	fi
-	if use qt6; then
-		export QT6DIR="$(qt6_get_bindir)/.."
-	fi
-
-	local gentoo_buildid="Gentoo official package"
-	if [[ -n ${LOCOREGIT_VERSION} ]]; then
-		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	# --without-system-sane: just sane.h header that is used for scan in writer,
-	#   not linked or anything else, worthless to depend on
-	# --disable-pdfium: not yet packaged
-	local myeconfargs=(
-		--with-system-dicts
-		--with-system-epoxy
-		--with-system-headers
-		--with-system-jars
-		--with-system-libs
-		--enable-build-opensymbol
-		--enable-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs=more
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-atspi-tests # bug 933257
-		--disable-breakpad
-		--disable-bundle-mariadb
-		--disable-ccache
-		--disable-epm
-		--disable-fetch-external
-		--disable-firebird-sdbc
-		--disable-gtk3-kde5
-		--disable-online-update
-		--disable-openssl
-		--disable-pdfium
-		--with-extra-buildid="${gentoo_buildid}"
-		--enable-extension-integration
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-tar="${DISTDIR}"
-		--with-lang=""
-		--with-parallelism=$(makeopts_jobs)
-		--with-system-openjpeg
-		--with-tls=nss
-		--with-vendor="Gentoo Foundation"
-		--with-x
-		--without-fonts
-		--without-myspell-dicts
-		--with-help="html"
-		--without-helppack-integration
-		--with-system-gpgmepp
-		--without-system-abseil
-		--without-system-dragonbox
-		--without-system-frozen
-		--without-system-jfreereport
-		--without-system-libfixmath
-		--without-system-sane
-		--without-system-zxcvbn
-		$(use_enable base report-builder)
-		$(use_enable bluetooth sdremote-bluetooth)
-		$(use_enable coinmp)
-		$(use_enable cups)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable eds evolution2)
-		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk gtk3)
-		$(use_enable ldap)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(use_enable qt5)
-		$(use_enable qt6)
-		$(use_enable vulkan skia)
-		$(use_with accessibility lxml)
-		$(use_with coinmp system-coinmp)
-		$(use_with googledrive gdrive-client-id ${google_default_client_id})
-		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
-		$(use_with java)
-		$(use_with odk doxygen)
-		$(use_with valgrind)
-	)
-
-	use qt5 && myeconfargs+=( $(use_enable kde kf5) )
-	use qt6 && myeconfargs+=( $(use_enable kde kf6) )
-
-	if use eds || use gtk; then
-		myeconfargs+=( --enable-dconf --enable-gio )
-	else
-		myeconfargs+=( --disable-dconf --disable-gio )
-	fi
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
-		else
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		myeconfargs+=(
-			--without-junit
-			--without-system-hsqldb
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home="${JAVA_HOME}"
-		)
-
-		use libreoffice_extensions_scripting-beanshell && \
-			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
-		use libreoffice_extensions_scripting-javascript && \
-			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
-	fi
-
-	tc-is-lto && myeconfargs+=( --enable-lto )
-
-	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	default
-}
-
-src_test() {
-	emake unitcheck
-	emake slowcheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" distro-pack-install -o build -o check
-
-	# bug 593514
-	if use gtk; then
-		dosym libreoffice/program/liblibreofficekitgtk.so \
-			/usr/$(get_libdir)/liblibreofficekitgtk.so
-	fi
-
-	# bash completion aliases
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
-	fi
-
-	# bug 703474
-	insinto /usr/include
-	doins -r include/LibreOfficeKit
-
-	local lodir=/usr/$(get_libdir)/libreoffice
-	# patching this would break tests
-	cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
-	sed -e "/^import sys/d" -e "/^import os/d" \
-		-i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
-	cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
-	cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
-	# more system pyuno mess
-	sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
-		-i "${D}"${lodir}/program/officehelper.py || die
-
-	python_optimize "${D}"${lodir}/program
-	# link python bridge in site-packages, bug 667802
-	local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
-	for py in uno.py unohelper.py officehelper.py; do
-		dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
-		while IFS="" read -d $'\0' -r pyc; do
-			pyc=${pyc//*\/}
-			dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
-		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
-	done
-
-	newinitd "${FILESDIR}/libreoffice.initd" libreoffice
-	newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 758283572aa3..7c7ca008ddbf 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,2 +1,2 @@
-DIST lyx-2.4.1.tar.xz 17848700 BLAKE2B 5e9d9530610149a1b0f6a7d536068ff0da97e261a6069a9efc3c45a892c653e7accadcd0bde96bf3ffad9d936fef4a4b88ee7b5233f875bbc568044376a5b37e SHA512 80d57d46dab61ecb655c9d54ba1d20203ad943db5249ed16dbeb5b78b7845896a79224c8032213cc861fd943629fbe87ef8ac9155cc9b34da9be2f59eb087071
 DIST lyx-2.4.2.1.tar.xz 17876336 BLAKE2B 451aa44c34d763f7e2c4bd0bd4980859728781e74e40075d1e660edd08b9f8103c338ebcaea12c4249a1026fccbd99ad6c0449a2f89e13b229a75f9b2a60ee95 SHA512 2cb9773971b466be32333305e36a28ec4efd31ffa7d9f8ec0a2fe670296f428c260d6839b34cebfd7cda4b78bdd43a47e30cc1f2d64e2c836262661032c107db
+DIST lyx-2.4.3.tar.xz 17843424 BLAKE2B 50be5159eacda2ed8227b8c314a73fb9e15f1a1b54f16ba7fbfd9352d828e659358aee537c6e3611bc5094b1971672e09999a59b21f229fbe810397da7db07c4 SHA512 5dc8637ca174a3967df4afaa7ea1f9ab7a2b8fe6700328c7a016e915a10028ecc7f52493e9e0dc7ea678c2c4a4247c6aa3c78cccf1933ad04fd973c379f4c8ad
diff --git a/app-office/lyx/lyx-2.4.1.ebuild b/app-office/lyx/lyx-2.4.1.ebuild
deleted file mode 100644
index dc7b64d683df..000000000000
--- a/app-office/lyx/lyx-2.4.1.ebuild
+++ /dev/null
@@ -1,180 +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} )
-
-inherit desktop font optfeature python-single-r1 cmake xdg
-
-DESCRIPTION="WYSIWYM (What You See Is What You Mean) document processor based on LaTeX"
-HOMEPAGE="https://www.lyx.org/"
-SRC_URI="http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="aspell cups dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	app-text/mythes
-	dev-libs/boost:=
-	sys-apps/file
-	sys-libs/zlib:=
-	virtual/imagemagick-tools[png,svg?]
-	x11-misc/xdg-utils
-
-	dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
-	dev-qt/qt5compat:6
-	dev-qt/qtsvg:6
-
-	aspell? ( app-text/aspell )
-	cups? ( net-print/cups )
-	dia? ( app-office/dia )
-	dot? ( media-gfx/graphviz )
-	enchant? ( app-text/enchant:2 )
-	gnumeric? ( app-office/gnumeric )
-	html? ( dev-tex/html2latex )
-	hunspell? ( app-text/hunspell )
-	l10n_he? (
-		dev-tex/culmus-latex
-		dev-texlive/texlive-langarabic
-	)
-	latex? (
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/ps2eps
-		app-text/texlive
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-mathscience
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-plaingeneric
-		|| (
-			dev-tex/latex2html
-			dev-tex/hevea
-			dev-tex/tex4ht[java]
-			dev-tex/tth
-		)
-	)
-	rcs? ( dev-vcs/rcs )
-	rtf? (
-		app-text/unrtf
-		dev-tex/html2latex
-		dev-tex/latex2rtf
-	)
-	svg? ( || (
-		gnome-base/librsvg
-		media-gfx/inkscape
-	) )
-"
-DEPEND="${RDEPEND}"
-# bc needed http://comments.gmane.org/gmane.editors.lyx.devel/137498 and bug #787839
-BDEPEND="
-	app-alternatives/bc
-	virtual/pkgconfig
-	dev-qt/qttools[linguist]
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-
-FONT_S="${S}/lib/fonts"
-FONT_SUFFIX="ttf"
-
-PATCHES=(
-	"${FILESDIR}"/lyx-2.4.0-fix-hunspell.patch
-	# Try first with xdg-open before hardcoded commands
-	# Patch from Debian using a similar approach to Fedora
-	"${FILESDIR}"/lyx-2.4.0-prefer-xdg-open.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	font_pkg_setup
-}
-
-src_prepare() {
-	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	#bug 221921
-	export VARTEXFONTS="${T}"/fonts
-
-	local mycmakeargs=(
-		-DLYX_INSTALL=ON
-		-DLYX_USE_QT=QT6
-		-DLYX_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DLYX_CXX_FLAGS_EXTRA="${CXXFLAGS}"
-
-		-DLYX_NLS=$(usex nls)
-		-DLYX_ASPELL=$(usex aspell)
-		-DLYX_ENCHANT=$(usex enchant)
-		-DLYX_HUNSPELL=$(usex hunspell)
-
-		# external dependencies
-		-DLYX_EXTERNAL_Z=ON
-		-DLYX_EXTERNAL_ICONV=ON
-		-DLYX_EXTERNAL_HUNSPELL=ON
-		-DLYX_EXTERNAL_MYTHES=ON
-		-DLYX_EXTERNAL_BOOST=ON
-		-DLYX_PROGRAM_SUFFIX=OFF
-
-		# debug control
-		-DLYX_NO_OPTIMIZE=OFF
-		-DLYX_RELEASE=ON
-		-DLYX_DEBUG=OFF
-		-DLYX_DEBUG_GLIBC=OFF
-		-DLYX_STDLIB_DEBUG=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newicon -s 32 "development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
-	doicon -s 48 "lib/images/lyx.png"
-	doicon -s scalable "lib/images/lyx.svg"
-
-	# fix for bug 91108
-	if use latex; then
-		dosym -r /usr/share/lyx/tex /usr/share/texmf-site/tex/latex/lyx
-	fi
-
-	# fonts needed for proper math display, see also bug #15629
-	font_src_install
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-
-	if use hunspell; then
-		dosym ../myspell /usr/share/lyx/dicts
-		dosym ../myspell /usr/share/lyx/thes
-	fi
-}
-
-pkg_postinst() {
-	font_pkg_postinst
-	xdg_pkg_postinst
-
-	# fix for bug 91108
-	if use latex ; then
-		texhash || die
-	fi
-
-	optfeature "handling more fonts" dev-texlive/texlive-fontsextra
-}
-
-pkg_postrm() {
-	font_pkg_postrm
-	xdg_pkg_postrm
-
-	if use latex ; then
-		texhash || die
-	fi
-}
diff --git a/app-office/lyx/lyx-2.4.2.1.ebuild b/app-office/lyx/lyx-2.4.2.1.ebuild
index 95aafec18c05..84dc15f7a88f 100644
--- a/app-office/lyx/lyx-2.4.2.1.ebuild
+++ b/app-office/lyx/lyx-2.4.2.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
@@ -9,7 +9,10 @@ inherit desktop font optfeature python-single-r1 cmake xdg
 
 DESCRIPTION="WYSIWYM (What You See Is What You Mean) document processor based on LaTeX"
 HOMEPAGE="https://www.lyx.org/"
-SRC_URI="http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P}.tar.xz"
+SRC_URI="
+	http://ftp.lyx.org/pub/lyx/stable/$(ver_cut 1-2).x/${P}.tar.xz
+	http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P}.tar.xz
+"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/app-office/lyx/lyx-2.4.3.ebuild b/app-office/lyx/lyx-2.4.3.ebuild
new file mode 100644
index 000000000000..735d0fd1fa3f
--- /dev/null
+++ b/app-office/lyx/lyx-2.4.3.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit desktop font optfeature python-single-r1 cmake xdg
+
+DESCRIPTION="WYSIWYM (What You See Is What You Mean) document processor based on LaTeX"
+HOMEPAGE="https://www.lyx.org/"
+SRC_URI="
+	http://ftp.lyx.org/pub/lyx/stable/$(ver_cut 1-2).x/${P}.tar.xz
+	http://ftp.lyx.org/pub/lyx/devel/lyx-$(ver_cut 1-2)/${P}.tar.xz
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="aspell cups dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	app-text/mythes
+	dev-libs/boost:=
+	sys-apps/file
+	sys-libs/zlib:=
+	virtual/imagemagick-tools[png,svg?]
+	x11-libs/libxcb
+	x11-misc/xdg-utils
+
+	dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
+	dev-qt/qt5compat:6
+	dev-qt/qtsvg:6
+
+	aspell? ( app-text/aspell )
+	cups? ( net-print/cups )
+	dia? ( app-office/dia )
+	dot? ( media-gfx/graphviz )
+	enchant? ( app-text/enchant:2 )
+	gnumeric? ( app-office/gnumeric )
+	html? ( dev-tex/html2latex )
+	hunspell? ( app-text/hunspell )
+	l10n_he? (
+		dev-tex/culmus-latex
+		dev-texlive/texlive-langarabic
+	)
+	latex? (
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/ps2eps
+		app-text/texlive
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-mathscience
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-plaingeneric
+		|| (
+			dev-tex/latex2html
+			dev-tex/hevea
+			dev-tex/tex4ht[java]
+			dev-tex/tth
+		)
+	)
+	rcs? ( dev-vcs/rcs )
+	rtf? (
+		app-text/unrtf
+		dev-tex/html2latex
+		dev-tex/latex2rtf
+	)
+	svg? ( || (
+		gnome-base/librsvg
+		media-gfx/inkscape
+	) )
+"
+DEPEND="${RDEPEND}"
+# bc needed http://comments.gmane.org/gmane.editors.lyx.devel/137498 and bug #787839
+BDEPEND="
+	app-alternatives/bc
+	virtual/pkgconfig
+	dev-qt/qttools[linguist]
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
+
+FONT_S="${S}/lib/fonts"
+FONT_SUFFIX="ttf"
+
+PATCHES=(
+	"${FILESDIR}"/lyx-2.4.0-fix-hunspell.patch
+	# Try first with xdg-open before hardcoded commands
+	# Patch from Debian using a similar approach to Fedora
+	"${FILESDIR}"/lyx-2.4.0-prefer-xdg-open.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	font_pkg_setup
+}
+
+src_prepare() {
+	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	#bug 221921
+	export VARTEXFONTS="${T}"/fonts
+
+	local mycmakeargs=(
+		-DLYX_INSTALL=ON
+		-DLYX_USE_QT=QT6
+		-DLYX_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DLYX_CXX_FLAGS_EXTRA="${CXXFLAGS}"
+
+		-DLYX_NLS=$(usex nls)
+		-DLYX_ASPELL=$(usex aspell)
+		-DLYX_ENCHANT=$(usex enchant)
+		-DLYX_HUNSPELL=$(usex hunspell)
+
+		# external dependencies
+		-DLYX_EXTERNAL_Z=ON
+		-DLYX_EXTERNAL_ICONV=ON
+		-DLYX_EXTERNAL_HUNSPELL=ON
+		-DLYX_EXTERNAL_MYTHES=ON
+		-DLYX_EXTERNAL_BOOST=ON
+		-DLYX_PROGRAM_SUFFIX=OFF
+
+		# debug control
+		-DLYX_NO_OPTIMIZE=OFF
+		-DLYX_RELEASE=ON
+		-DLYX_DEBUG=OFF
+		-DLYX_DEBUG_GLIBC=OFF
+		-DLYX_STDLIB_DEBUG=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newicon -s 32 "development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
+	doicon -s 48 "lib/images/lyx.png"
+	doicon -s scalable "lib/images/lyx.svg"
+
+	# fix for bug 91108
+	if use latex; then
+		dosym -r /usr/share/lyx/tex /usr/share/texmf-site/tex/latex/lyx
+	fi
+
+	# fonts needed for proper math display, see also bug #15629
+	font_src_install
+
+	python_fix_shebang "${ED}"/usr/share/${PN}
+
+	if use hunspell; then
+		dosym ../myspell /usr/share/lyx/dicts
+		dosym ../myspell /usr/share/lyx/thes
+	fi
+}
+
+pkg_postinst() {
+	font_pkg_postinst
+	xdg_pkg_postinst
+
+	# fix for bug 91108
+	if use latex ; then
+		texhash || die
+	fi
+
+	optfeature "handling more fonts" dev-texlive/texlive-fontsextra
+}
+
+pkg_postrm() {
+	font_pkg_postrm
+	xdg_pkg_postrm
+
+	if use latex ; then
+		texhash || die
+	fi
+}
diff --git a/app-office/merkuro/Manifest b/app-office/merkuro/Manifest
index af8bb0ce1627..f8c41e4eb2f4 100644
--- a/app-office/merkuro/Manifest
+++ b/app-office/merkuro/Manifest
@@ -1,2 +1,2 @@
 DIST merkuro-24.08.3.tar.xz 774932 BLAKE2B 9e8a302762c4e777c85e7c511233f0b8f6db4e9c6b63488953ccf6db21da766ac31a5fb1d4211d455db19a2e5eba1cd0b4fd06adc06dcb42e665536a263fab86 SHA512 935e91fc731a5bf1dc68fa005b6c7043008ef662d06c7de8ae088dd5885e9bba5f4417c7570cc21cd3dbf9c514008ff9a4def21d421caefc27f17d622b6c8361
-DIST merkuro-24.12.0.tar.xz 792316 BLAKE2B 55db585397223c8f5b885737b30b91696743e18e6233b860036403e64b3424544eb042a9f960675db859f6e3155d268bff33da261dff5ab3ee83f6d588eee40c SHA512 9a4197a7b0b32470a5ac8146e45d2ee4b35861bebfeb1e131337fd3ea9df20925c424bb727ae4826bda9141cbc15ed37b69709a55ab7111c32b4d5e991f9d5e6
+DIST merkuro-24.12.1.tar.xz 793160 BLAKE2B f1717145aacb71b676afe8d83e7060eed2dd9070c0e2a62936398f43dd8f63d8d0cbbbf3057a97e5f7aba8168294828a6add8a64044ea33fee3079575c3393f9 SHA512 8a62440021b0dfa2d5b3193f777a8543e6f930c4ae79909b69a5555225172e3b3394eb8e0fbe2d683745aac39b55ce8ef56f41d117ce3268d90a34041d6beb7a
diff --git a/app-office/merkuro/merkuro-24.12.0-r1.ebuild b/app-office/merkuro/merkuro-24.12.0-r1.ebuild
deleted file mode 100644
index bcdf0f7dbf27..000000000000
--- a/app-office/merkuro/merkuro-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="pim"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Calendar application using Akonadi"
-HOMEPAGE="https://apps.kde.org/merkuro.calendar/"
-
-LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-# All of the tests involve interacting with akonadi right now (as of 22.04)
-RESTRICT="test"
-
-DEPEND="
-	app-crypt/gpgme:=[cxx]
-	>=dev-libs/kirigami-addons-1.4.0:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtlocation-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmbox-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/libkleo-${PVCUT}:6
-	>=kde-apps/mailcommon-${PVCUT}:6
-	>=kde-apps/messagelib-${PVCUT}:6
-	>=kde-apps/mimetreeparser-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-# Qt5Compat.GraphicalEffects usage in multiple QML files
-# qtlocation is needed at runtime only or fails to start
-RDEPEND="${DEPEND}
-	>=dev-qt/qt5compat-${QTMIN}:6[qml]
-	>=dev-qt/qtlocation-${QTMIN}:6
-	>=dev-qt/qtwebengine-${QTMIN}:6
-	>=kde-apps/kdepim-runtime-${PVCUT}:6
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
-"
diff --git a/app-office/merkuro/merkuro-24.12.1.ebuild b/app-office/merkuro/merkuro-24.12.1.ebuild
new file mode 100644
index 000000000000..35779b72d340
--- /dev/null
+++ b/app-office/merkuro/merkuro-24.12.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="pim"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Calendar application using Akonadi"
+HOMEPAGE="https://apps.kde.org/merkuro.calendar/"
+
+LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+# All of the tests involve interacting with akonadi right now (as of 22.04)
+RESTRICT="test"
+
+DEPEND="
+	app-crypt/gpgme:=[cxx]
+	>=dev-libs/kirigami-addons-1.4.0:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtlocation-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmbox-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/libkleo-${PVCUT}:6
+	>=kde-apps/mailcommon-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-apps/mimetreeparser-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+# Qt5Compat.GraphicalEffects usage in multiple QML files
+# qtlocation is needed at runtime only or fails to start
+RDEPEND="${DEPEND}
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtlocation-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6
+	>=kde-apps/kdepim-runtime-${PVCUT}:6
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+"
diff --git a/app-office/naps2/Manifest b/app-office/naps2/Manifest
index a2a7c6bdc873..eedef6217782 100644
--- a/app-office/naps2/Manifest
+++ b/app-office/naps2/Manifest
@@ -69,6 +69,7 @@ DIST microsoft.windowsdesktop.app.ref.6.0.32.nupkg 3854138 BLAKE2B b36cf8f3165db
 DIST microsoft.windowsdesktop.app.ref.8.0.7.nupkg 4466896 BLAKE2B 25772a98070145ec2567f703514cf2f7d6b01af5d531af90670d51fe818c7e5c2a36d16b603840725ad631e97c4f29589703f8a262aa70dbd28965e4f205edd0 SHA512 eb4abc341ba790836c744acce8d9c422d5b544f385bf4d28eecca8573831563ba723bf4bcddcd0e06cb05690d45c15f846ceaad2889bb3316c77b3ba8ff5ade2
 DIST mimekitlite.4.7.1.nupkg 4782334 BLAKE2B dd066cde8b8f09a9aa0c44881a703d2e96b569d313cd6803be4ed568fc30360e7556c1e01baf61ab497880a46ba9304c3d9152787e3e460c273b2d92e801c23a SHA512 cfc5608a058c98f5e5771554f6b46dba0a77265137cdd82549d733e2efc54ac0dfdb24d578243cc4024b3bf272d4cf2ed6b589df88786f7c68a38e73a7569ba0
 DIST naps2-7.5.2.tar.gz 41100551 BLAKE2B 7baea6b8bfdcbe0d4b4fdec4488f6df2d7d10e86af680060b4fd3fd13dd9693a0a01a0ab225c34f1675988681179c96807def9291d6c1fb68bd0eb745b134910 SHA512 748c1f454d9984426509e1cfcf7b2fdc23792236b9b8844b4c9972c61055219921fd4f97fb71eb6b2b9347ae510a9bc83eaaebf283a72f80ed8f224efb3b1c18
+DIST naps2-7.5.3.tar.gz 41114628 BLAKE2B d3c6d50415345fd34a953742852e4f62a8ed8093b9036a0f221a9d3c92dbf05df14156d1067695765e3a50d703340f7e12eddd91b6799a70997213806c4426a1 SHA512 33ac3d7fbd394f8cab0b594928320b3c1b16cd6453d1b4446de85aef7f211e95587a3d05ccfa878adbebd8ae72a008dc3a0ac2b96102bd3cc8b2d7bbe01a2033
 DIST naps2.mdns.1.0.1.nupkg 86085 BLAKE2B 85c41ed205c155ebf618b09ab09fa6c405a528dafa5f435e55a7a59a4d8831ab8efd68c2e08ab2eb61c79869ce6dab8a72b9d3851285a57488043c3876b97cd4 SHA512 0415de3d8758b301df93f89019ea096f554c7e4760658f387da5c2e25c895fcbb1d905ecdb89ee894cbac19580bb7948b0be57174f9823c338d57243d8fcf650
 DIST naps2.ntwain.1.0.0.nupkg 490706 BLAKE2B 8208a15d6c9ec65eda196cff2141d9349c1278d6536dbb02552462e1c53fdebb68ecabd84c73150e4848ab80a537e25db15c6fca27d264f7dbfd904f65eb0560 SHA512 83ae07decef61c55fb3dc11212f335264288881be2014e194e104da1892c0d58ab71c1e32832d219cf9618b4f9485d2ad79668bcd0cffdbad9790f6d0798c6d2
 DIST naps2.pdfium.binaries.1.1.0.nupkg 15878385 BLAKE2B 891bca3725934a7e0f86165f3f8665a24d552682c0dae726d75954008c850fdad22f9c388d956de8af7b85ef01ca3baed5aacaea13e3d8e502bddac3c055ad53 SHA512 b2b747628a2dd9fb9626c1ce977622b2a40079ddd506a845e39bff4264ac06406234b6a4b4b16c5c394dc5487b7a3b414b86370844c94a5245b594eaa1b5a761
diff --git a/app-office/naps2/naps2-7.5.3.ebuild b/app-office/naps2/naps2-7.5.3.ebuild
new file mode 100644
index 000000000000..0f2ce5fac092
--- /dev/null
+++ b/app-office/naps2/naps2-7.5.3.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOTNET_PKG_COMPAT="8.0"
+
+# Generated via gdmt, but the *.Mac projects had to be removed from the sln
+# manually first. Later they are removed via "DOTNET_PKG_BAD_PROJECTS".
+NUGETS="
+appium.webdriver@4.4.5
+atksharp@3.24.24.95
+autofac@8.0.0
+ben.demystifier@0.4.1
+cairosharp@3.24.24.95
+castle.core@4.3.1
+castle.core@5.0.0
+castle.core@5.1.1
+commandlineparser@2.9.1
+dotnetseleniumextras.pageobjects@3.11.0
+embedio@3.5.2
+eto.forms@2.8.3
+eto.platform.gtk@2.8.3
+eto.platform.windows@2.8.3
+gdksharp@3.24.24.95
+giosharp@3.24.24.95
+glibsharp@3.24.24.95
+google.protobuf@3.25.1
+grpc.core.api@2.59.0
+grpc.tools@2.65.0
+grpcdotnetnamedpipes@3.0.0
+gtksharp@3.24.24.95
+isexternalinit@1.0.3
+largeaddressaware@1.0.6
+libusbdotnet@3.0.102-alpha
+makaretu.dns@2.0.1
+microsoft-windowsapicodepack-core@1.1.4
+microsoft-windowsapicodepack-shell@1.1.4
+microsoft.bcl.asyncinterfaces@6.0.0
+microsoft.bcl.asyncinterfaces@7.0.0
+microsoft.bcl.asyncinterfaces@8.0.0
+microsoft.codecoverage@17.10.0
+microsoft.extensions.configuration.abstractions@2.1.0
+microsoft.extensions.configuration.abstractions@8.0.0
+microsoft.extensions.configuration.binder@2.1.0
+microsoft.extensions.configuration@2.1.0
+microsoft.extensions.dependencyinjection.abstractions@2.1.0
+microsoft.extensions.dependencyinjection.abstractions@8.0.0
+microsoft.extensions.dependencyinjection.abstractions@8.0.1
+microsoft.extensions.dependencyinjection@8.0.0
+microsoft.extensions.logging.abstractions@2.1.0
+microsoft.extensions.logging.abstractions@8.0.0
+microsoft.extensions.logging.abstractions@8.0.1
+microsoft.extensions.logging@2.1.0
+microsoft.extensions.logging@8.0.0
+microsoft.extensions.options@2.1.0
+microsoft.extensions.options@8.0.0
+microsoft.extensions.primitives@2.1.0
+microsoft.extensions.primitives@8.0.0
+microsoft.net.test.sdk@17.10.0
+microsoft.netcore.app@2.1.30
+microsoft.netcore.dotnetapphost@2.1.30
+microsoft.netcore.dotnethostpolicy@2.1.30
+microsoft.netcore.dotnethostresolver@2.1.30
+microsoft.netcore.platforms@1.1.0
+microsoft.netcore.platforms@1.1.1
+microsoft.netcore.platforms@2.1.14
+microsoft.netcore.platforms@3.1.4
+microsoft.netcore.targets@1.1.0
+microsoft.netcore.targets@2.0.0
+microsoft.netframework.referenceassemblies.net462@1.0.3
+microsoft.netframework.referenceassemblies@1.0.3
+microsoft.testplatform.objectmodel@17.10.0
+microsoft.testplatform.testhost@17.10.0
+microsoft.win32.primitives@4.3.0
+microsoft.win32.systemevents@4.7.0
+microsoft.win32.systemevents@8.0.0
+microsoft.windowsdesktop.app.ref@6.0.32
+microsoft.windowsdesktop.app.ref@8.0.7
+mimekitlite@4.7.1
+naps2.mdns@1.0.1
+naps2.ntwain@1.0.0
+naps2.pdfium.binaries@1.1.0
+naps2.pdfsharp@1.0.1
+naps2.sane.binaries@1.1.0
+naps2.tesseract.binaries@1.2.0
+naps2.wia@2.0.3
+netstandard.library@1.6.1
+netstandard.library@2.0.3
+newtonsoft.json@13.0.1
+newtonsoft.json@13.0.3
+nlog.extensions.logging@5.3.11
+nlog@5.3.2
+nsubstitute@5.0.0
+nsubstitute@5.1.0
+pangosharp@3.24.24.95
+pdfavalidator@2.1.109
+polyfill@4.9.0
+richardszalay.mockhttp@7.0.0
+runtime.any.system.collections@4.3.0
+runtime.any.system.diagnostics.tools@4.3.0
+runtime.any.system.diagnostics.tracing@4.3.0
+runtime.any.system.globalization.calendars@4.3.0
+runtime.any.system.globalization@4.3.0
+runtime.any.system.io@4.3.0
+runtime.any.system.reflection.extensions@4.3.0
+runtime.any.system.reflection.primitives@4.3.0
+runtime.any.system.reflection@4.3.0
+runtime.any.system.resources.resourcemanager@4.3.0
+runtime.any.system.runtime.handles@4.3.0
+runtime.any.system.runtime.interopservices@4.3.0
+runtime.any.system.runtime@4.3.0
+runtime.any.system.text.encoding.extensions@4.3.0
+runtime.any.system.text.encoding@4.3.0
+runtime.any.system.threading.tasks@4.3.0
+runtime.any.system.threading.timer@4.3.0
+runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.linux-arm.microsoft.netcore.app@2.1.30
+runtime.linux-arm.microsoft.netcore.dotnetapphost@2.1.30
+runtime.linux-arm.microsoft.netcore.dotnethostpolicy@2.1.30
+runtime.linux-arm.microsoft.netcore.dotnethostresolver@2.1.30
+runtime.linux-arm64.microsoft.netcore.app@2.1.30
+runtime.linux-arm64.microsoft.netcore.dotnetapphost@2.1.30
+runtime.linux-arm64.microsoft.netcore.dotnethostpolicy@2.1.30
+runtime.linux-arm64.microsoft.netcore.dotnethostresolver@2.1.30
+runtime.linux-musl-x64.microsoft.netcore.app@2.1.30
+runtime.linux-musl-x64.microsoft.netcore.dotnetapphost@2.1.30
+runtime.linux-musl-x64.microsoft.netcore.dotnethostpolicy@2.1.30
+runtime.linux-musl-x64.microsoft.netcore.dotnethostresolver@2.1.30
+runtime.linux-x64.microsoft.netcore.app@2.1.30
+runtime.linux-x64.microsoft.netcore.dotnetapphost@2.1.30
+runtime.linux-x64.microsoft.netcore.dotnethostpolicy@2.1.30
+runtime.linux-x64.microsoft.netcore.dotnethostresolver@2.1.30
+runtime.native.system.io.compression@4.3.0
+runtime.native.system.net.http@4.3.0
+runtime.native.system.security.cryptography.apple@4.3.0
+runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.native.system@4.3.0
+runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple@4.3.0
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.unix.microsoft.win32.primitives@4.3.0
+runtime.unix.system.console@4.3.0
+runtime.unix.system.diagnostics.debug@4.3.0
+runtime.unix.system.io.filesystem@4.3.0
+runtime.unix.system.net.primitives@4.3.0
+runtime.unix.system.net.sockets@4.3.0
+runtime.unix.system.private.uri@4.3.0
+runtime.unix.system.runtime.extensions@4.3.0
+selenium.support@3.141.0
+selenium.webdriver@3.141.0
+sharpziplib@1.4.2
+simplebase@1.3.1
+sixlabors.fonts@1.0.1
+sixlabors.imagesharp@3.1.5
+standardsocketshttphandler@2.2.0.8
+system.appcontext@4.3.0
+system.buffers@4.3.0
+system.buffers@4.4.0
+system.buffers@4.5.1
+system.collections.concurrent@4.3.0
+system.collections.immutable@1.5.0
+system.collections.immutable@5.0.0
+system.collections.immutable@8.0.0
+system.collections.nongeneric@4.3.0
+system.collections.specialized@4.3.0
+system.collections@4.3.0
+system.componentmodel.annotations@5.0.0
+system.componentmodel.primitives@4.3.0
+system.componentmodel.typeconverter@4.3.0
+system.componentmodel@4.3.0
+system.console@4.3.0
+system.diagnostics.debug@4.3.0
+system.diagnostics.diagnosticsource@4.3.0
+system.diagnostics.diagnosticsource@7.0.2
+system.diagnostics.eventlog@6.0.0
+system.diagnostics.tools@4.3.0
+system.diagnostics.tracesource@4.3.0
+system.diagnostics.tracing@4.3.0
+system.drawing.common@4.7.2
+system.drawing.common@8.0.7
+system.dynamic.runtime@4.3.0
+system.globalization.calendars@4.3.0
+system.globalization.extensions@4.3.0
+system.globalization@4.3.0
+system.io.compression.zipfile@4.3.0
+system.io.compression@4.3.0
+system.io.filesystem.primitives@4.3.0
+system.io.filesystem@4.3.0
+system.io@4.3.0
+system.linq.async@6.0.1
+system.linq.expressions@4.3.0
+system.linq@4.3.0
+system.memory@4.5.0
+system.memory@4.5.1
+system.memory@4.5.4
+system.memory@4.5.5
+system.net.http@4.3.0
+system.net.http@4.3.4
+system.net.nameresolution@4.3.0
+system.net.primitives@4.3.0
+system.net.sockets@4.3.0
+system.numerics.vectors@4.4.0
+system.numerics.vectors@4.5.0
+system.objectmodel@4.3.0
+system.private.uri@4.3.0
+system.reflection.emit.ilgeneration@4.3.0
+system.reflection.emit.lightweight@4.3.0
+system.reflection.emit@4.3.0
+system.reflection.extensions@4.3.0
+system.reflection.metadata@1.6.0
+system.reflection.metadata@5.0.0
+system.reflection.primitives@4.3.0
+system.reflection.typeextensions@4.3.0
+system.reflection@4.3.0
+system.resources.extensions@7.0.0
+system.resources.extensions@8.0.0
+system.resources.resourcemanager@4.3.0
+system.runtime.compilerservices.unsafe@4.5.0
+system.runtime.compilerservices.unsafe@4.5.2
+system.runtime.compilerservices.unsafe@4.5.3
+system.runtime.compilerservices.unsafe@4.7.0
+system.runtime.compilerservices.unsafe@6.0.0
+system.runtime.extensions@4.3.0
+system.runtime.handles@4.3.0
+system.runtime.interopservices.runtimeinformation@4.3.0
+system.runtime.interopservices@4.3.0
+system.runtime.numerics@4.3.0
+system.runtime@4.3.0
+system.security.claims@4.3.0
+system.security.cryptography.algorithms@4.3.0
+system.security.cryptography.cng@4.3.0
+system.security.cryptography.csp@4.3.0
+system.security.cryptography.encoding@4.3.0
+system.security.cryptography.openssl@4.3.0
+system.security.cryptography.primitives@4.3.0
+system.security.cryptography.protecteddata@8.0.0
+system.security.cryptography.x509certificates@4.3.0
+system.security.principal.windows@4.3.0
+system.security.principal@4.3.0
+system.text.encoding.extensions@4.3.0
+system.text.encoding@4.3.0
+system.text.regularexpressions@4.3.0
+system.threading.tasks.dataflow@8.0.1
+system.threading.tasks.extensions@4.3.0
+system.threading.tasks.extensions@4.5.2
+system.threading.tasks.extensions@4.5.4
+system.threading.tasks@4.3.0
+system.threading.threadpool@4.3.0
+system.threading.timer@4.3.0
+system.threading@4.3.0
+system.valuetuple@4.5.0
+system.xml.readerwriter@4.3.0
+system.xml.xdocument@4.3.0
+system.xml.xmldocument@4.3.0
+unosquare.swan.lite@3.1.0
+xunit.abstractions@2.0.3
+xunit.analyzers@1.15.0
+xunit.assert@2.9.0
+xunit.core@2.9.0
+xunit.extensibility.core@2.9.0
+xunit.extensibility.execution@2.9.0
+xunit.runner.visualstudio@2.8.2
+xunit@2.9.0
+zxing.net@0.16.9
+"
+
+inherit dotnet-pkg desktop xdg
+
+DESCRIPTION="Document scanning application with a focus on simplicity and ease of use"
+HOMEPAGE="https://www.naps2.com/
+	https://github.com/cyanfish/naps2/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/cyanfish/${PN}.git"
+else
+	SRC_URI="https://github.com/cyanfish/${PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+SRC_URI+=" ${NUGET_URIS} "
+
+LICENSE="AGPL-3+ Apache-2.0 BSD BSD-2 GPL-2+ LGPL-3+ MIT"
+SLOT="0"
+
+RDEPEND="
+	media-fonts/liberation-fonts
+	media-fonts/noto
+	media-fonts/noto-cjk
+	media-gfx/sane-backends
+	x11-libs/gtk+:3
+"
+
+DOTNET_PKG_PROJECTS=( NAPS2.App.Gtk )
+DOTNET_PKG_BAD_PROJECTS=(
+	# For MacOS.
+	NAPS2.App.Mac
+	NAPS2.Images.Mac
+	NAPS2.Lib.Mac
+
+	# For Windows.
+	NAPS2.App.Console
+	NAPS2.App.WinForms
+	NAPS2.App.Worker
+	NAPS2.Images.Wpf
+	NAPS2.Lib.WinForms
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+src_unpack() {
+	dotnet-pkg_src_unpack
+
+	if [[ -n "${EGIT_REPO_URI}" ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	dotnet-pkg_src_prepare
+
+	# Having this package reference in a proj file will make dotnet copy
+	# the host's libhostpolicy.so and break the Gentoo's mechanism of handling
+	# dotnet executables.
+	sed -e "/.*NETCore.App.*/d" -i NAPS2.App.Gtk/NAPS2.App.Gtk.csproj || die
+}
+
+src_test() {
+	dotnet-pkg-base_test NAPS2.Lib.Tests
+}
+
+src_install() {
+	dotnet-pkg_src_install
+	find "${ED}/usr/share/${P}/_linux" -type f -exec chmod a+x {} + || die
+
+	newicon --size 128 ./NAPS2.Lib/Icons/scanner-128.png com.naps2.Naps2.png
+	domenu ./NAPS2.Setup/config/linux/com.naps2.Naps2.desktop
+
+	insinto /usr/share/metainfo
+	doins ./NAPS2.Setup/config/linux/com.naps2.Naps2.metainfo.xml
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/app-office/orage/Manifest b/app-office/orage/Manifest
index 2b18381ef034..d1611fd0a015 100644
--- a/app-office/orage/Manifest
+++ b/app-office/orage/Manifest
@@ -1 +1,2 @@
 DIST orage-4.18.0.tar.bz2 1418645 BLAKE2B 533f55d4a6e69c0458fb01a8b3fd6a20f30b409ddd1d2eb65f00c321daa441d7e99e154ee4558160fc3e387e2ddb45a2ee0c37e6814a74f40e724fd748cd2fa5 SHA512 7760219f64ac3e2ba6d73541a626a0c9411b93268c007f2af5d8080a3a3c0b2a08e00dd96b7794b688aa83c567150c02033b9ba46bf38cd71d3d890e8d1e45ad
+DIST orage-4.20.0.tar.bz2 2326936 BLAKE2B 7729605ea09ef29f020564826729303c8f717acc4229d8a99347a2b112e1c3ab62e6b061ea58e82881e4aee3b5af61b9757bf229e8219c2b79c47427a55150bb SHA512 f1e66e048cdc817b2bc07585a3d28e4e8c3b58fa8b1b74bea4c3d72715ac90d66a4bf1532e726123c31ac8511888559b7c980dc3cbed099759e3cf17887fb7cd
diff --git a/app-office/orage/orage-4.20.0.ebuild b/app-office/orage/orage-4.20.0.ebuild
new file mode 100644
index 000000000000..fe6ed3aabf0e
--- /dev/null
+++ b/app-office/orage/orage-4.20.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A calendar application for Xfce"
+HOMEPAGE="
+	https://docs.xfce.org/apps/orage/start
+	https://gitlab.xfce.org/apps/orage/
+"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="libnotify"
+
+DEPEND="
+	>=dev-libs/glib-2.58.0
+	>=dev-libs/libical-3.0.16:=
+	>=x11-libs/gtk+-3.24.0:3=
+	x11-libs/libX11
+	>=xfce-base/libxfce4ui-4.16.0:=
+	>=xfce-base/libxfce4util-4.16.0:=
+	libnotify? ( >=x11-libs/libnotify-0.7.0:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	sys-devel/gettext
+	>=dev-build/libtool-2.2.6
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable libnotify)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index ac8f96b07636..20385817d76c 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1 +1,2 @@
 DIST scribus-1.6.2.tar.xz 73129400 BLAKE2B 2da98dc322319db18a157f66aef024b7392dbbfaf22adba14f719b48c644d1cc1546cc4d0cccf6dfe479571cf84de6f5645e5d452154f96ddc886e390702d547 SHA512 2f691c1f6b7beada89be410a2936b23641913bf26bd2152974bbaa747aeafb05aa797356a85bd55c14f60f0031ce1addedc9a3ce3e92546ebbb45f96a5ff3e62
+DIST scribus-1.6.3.tar.xz 74909384 BLAKE2B b208270fce3e013692e90ec354849f99440efc97bda0e15c0baea16a5fd039b7435498c4d2669bd5c3caaca9c7d1125f78ea6fde483bf81449a451f9f54bf26d SHA512 b408ed862285d06d0f79a646ac2b43b0eb0b241c23dc276544e94a72e4fc3a0bf4efd500c5893c295886b11490115cdbe5f34ce7de51da30d31099831ba25d87
diff --git a/app-office/scribus/scribus-1.6.3.ebuild b/app-office/scribus/scribus-1.6.3.ebuild
new file mode 100644
index 000000000000..909c74802d90
--- /dev/null
+++ b/app-office/scribus/scribus-1.6.3.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="tk?"
+inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="https://www.scribus.net/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/scribusproject/scribus"
+	EGIT_BRANCH="Version16x"
+	inherit git-r3
+else
+	SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz"
+	S="${WORKDIR}/${P}"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	tk? ( scripts )"
+
+# osg
+# couple of third_party libs bundled
+DEPEND="${PYTHON_DEPS}
+	app-text/libmspub
+	app-text/libqxp
+	app-text/poppler:=
+	dev-libs/hyphen
+	dev-libs/icu:0=
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[-gles2-only,X]
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/harfbuzz:0=[icu]
+	media-libs/lcms:2
+	media-libs/libcdr
+	media-libs/libfreehand
+	media-libs/libjpeg-turbo:=
+	media-libs/libpagemaker
+	media-libs/libpng:0=
+	media-libs/libvisio
+	media-libs/libzmf
+	media-libs/tiff:=
+	net-print/cups
+	sys-libs/zlib[minizip]
+	x11-libs/cairo[X,svg(+)]
+	boost? ( dev-libs/boost:= )
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	hunspell? ( app-text/hunspell:= )
+	osg? ( dev-games/openscenegraph:= )
+	pdf? ( app-text/podofo:0= )
+	scripts? (
+		$(python_gen_cond_dep '
+			dev-python/pillow[tk?,${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	app-text/ghostscript-gpl
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251
+	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
+	"${FILESDIR}"/${PN}-1.6.1-findhyphen.patch
+	"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_run_in scribus cmake_comment_add_subdirectory ui/qml
+
+	# for safety remove files that we patched out
+	rm -r scribus/third_party/hyphen || die
+}
+
+src_configure() {
+	# bug #550818
+	append-cppflags -DHAVE_MEMRCHR
+
+	local mycmakeargs=(
+		-DTAG_VERSION="-${SLOT}"
+		-DHAVE_PYTHON=ON
+		-DWANT_DISTROBUILD=ON
+		-DWANT_CPP17=ON
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DWITH_BOOST=$(usex boost)
+		-DWANT_DEBUG=$(usex debug)
+		-DWANT_NOEXAMPLES=$(usex !examples)
+		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DWANT_HUNSPELL=$(usex hunspell)
+		-DWANT_HEADERINSTALL=$(usex !minimal)
+		-DWANT_NOOSG=$(usex !osg)
+		-DWITH_PODOFO=$(usex pdf)
+		-DWANT_NOTEMPLATES=$(usex !templates)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use tk; then
+		rm "${ED}"/usr/share/scribus-${SLOT}/scripts/{FontSample,CalendarWizard}.py || die
+	fi
+	if use scripts; then
+		python_fix_shebang "${ED}"/usr/share/scribus-${SLOT}/scripts
+		python_optimize "${ED}"/usr/share/scribus-${SLOT}/scripts
+	else
+		rm "${ED}"/usr/share/scribus-${SLOT}/scripts/*.py || die
+	fi
+
+	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
+	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
+
+	# These files are parsed to populate the help/about window.
+	cat >> "${T}"/COPYING <<- EOF || die
+	${PN} is licensed under the "${LICENSE}".
+	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
+	EOF
+	dodoc "${T}"/COPYING
+	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
+
+	local size
+	for size in 16 32 128 256 512; do
+		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus-${SLOT}.png
+	done
+	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus-${SLOT}.png
+	newicon resources/iconsets/1_5_1/scribus.png scribus-${SLOT}.png
+	newmenu scribus.desktop scribus-${SLOT}.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "MS Word .doc file import filter support" app-text/antiword
+}
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 5130645e1db1..c14e22b1123f 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,2 +1,3 @@
 DIST skrooge-2.33.0-cmake.patch.xz 9372 BLAKE2B ac2e5decc491eecb3adce61b36ace144c01a20ff74d3e7044351dc605d88b8ef3528a762d043d66776c6d37690e736b942e940110f600f013a6ea1592e65e164 SHA512 0561decdbe2ad5b8dbf8f91dee568f3448ac4e53e2ffaac3081ed1cf17cc001bfe417807876a5f3c0d379e025385caa705e52037edbfb31e68f9e9769eafef85
 DIST skrooge-2.33.0.tar.xz 23005952 BLAKE2B 081230d6db4768cc928844ef0559537bf5e260b922c61e5aab98f2b76f820a943f35c07655fb30fa6fe8e617c9321ba117ef67a083817e607330adcb93a1c10f SHA512 910417988cc3bad7eb733a1276677f9e7b38d8ea3652394efa79969772c377bef25a44ead1330d98c34505556ce79dc62c4adc52778796e46890ce985d6ad608
+DIST skrooge-25.1.0.tar.xz 23301568 BLAKE2B eefa4ee32e90852010f21bffd4a3f272a277878c539230f4c871105e57d45c6469cf7d1c9821075435b3680146cd1ec795dc2fc547b5fade1d10bc326a5a1b36 SHA512 7711f9b27c39623589f4d0bd74469031adcfbc0ea31069bbeea7a202ee6615ac050e9ca97b417fba0980c2a5a008893677716e093a4b71e444a654ad588e89c0
diff --git a/app-office/skrooge/metadata.xml b/app-office/skrooge/metadata.xml
index 8581d37e84e1..175beeb07efc 100644
--- a/app-office/skrooge/metadata.xml
+++ b/app-office/skrooge/metadata.xml
@@ -6,7 +6,8 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=skrooge</bugs-to>
+		<remote-id type="kde-invent">office/kmymoney</remote-id>
 	</upstream>
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
diff --git a/app-office/skrooge/skrooge-25.1.0.ebuild b/app-office/skrooge/skrooge-25.1.0.ebuild
new file mode 100644
index 000000000000..daf8a80a98e3
--- /dev/null
+++ b/app-office/skrooge/skrooge-25.1.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm kde.org
+
+DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
+HOMEPAGE="https://skrooge.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="activities kde ofx"
+
+# hangs + installs files (also requires KF5DesignerPlugin)
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=app-crypt/qca-2.3.9:2[qt6(-)]
+	dev-db/sqlcipher
+	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6 )
+	kde? ( >=kde-frameworks/krunner-${KFMIN}:6 )
+	ofx? ( dev-libs/libofx:= )
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5
+"
+BDEPEND="
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSKG_WEBENGINE=ON
+		-DSKG_DESIGNER=OFF
+		$(cmake_use_find_package activities PlasmaActivities)
+		$(cmake_use_find_package kde KF6Runner)
+		$(cmake_use_find_package ofx LibOfx)
+		-DSKG_BUILD_TEST=$(usex test)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=ON
+	)
+	ecm_src_test
+}
diff --git a/app-officeext/barcode/Manifest b/app-officeext/barcode/Manifest
index b62c32cb15d6..0bd57fb27623 100644
--- a/app-officeext/barcode/Manifest
+++ b/app-officeext/barcode/Manifest
@@ -1,2 +1 @@
-DIST barcode_1.3.5.0.oxt 263583 BLAKE2B eafc3897af7c4d0a6cd025945a4f5c8b9e5e27ed5aa82f9e6933dba0cd46ad748b47d98d81da031a7e6e841853686cdd43a47104c5a93fef6cdef9be040ddcd2 SHA512 45133fc58ac211033c199411820029d921dcf1ba714652093b6647861b611eed39bb5b69c8ceef866e80b716da04c92eca0b3f9c990e799ed25cbb2ad8999732
 DIST barcode_2.4.0.oxt 126271 BLAKE2B b78a5fe24c38a2de97db9f378348c96f301fc1f73f9a510717c804a3a10308234ba7fdd777f648e7105660ca507d52ea9ecb7755a81ca08515353de7d4ae3d3a SHA512 64529b74c15d40bb8203efe28f0a1729799dcf6ccdd9ec1d85fcc6fe79a29bb0b4efc8ab4a6ca41c8459cfbf2de692711bdca7ec9fc799cff5cde955145e542d
diff --git a/app-officeext/barcode/barcode-1.3.5.0-r1.ebuild b/app-officeext/barcode/barcode-1.3.5.0-r1.ebuild
deleted file mode 100644
index 00630fcd40dc..000000000000
--- a/app-officeext/barcode/barcode-1.3.5.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-OFFICE_EXTENSIONS=(
-	"${PN}_${PV}.oxt"
-)
-inherit office-ext-r1
-
-DESCRIPTION="Extension for reading barcodes"
-HOMEPAGE="https://extensions.libreoffice.org/extension-center/barcode"
-SRC_URI="https://extensions.libreoffice.org/extension-center/${PN}/releases/${PV}/${PN}_${PV}.oxt"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
diff --git a/app-officeext/barcode/barcode-2.4.0.ebuild b/app-officeext/barcode/barcode-2.4.0.ebuild
index 4eaa3c4c7e07..582b08361d89 100644
--- a/app-officeext/barcode/barcode-2.4.0.ebuild
+++ b/app-officeext/barcode/barcode-2.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
@@ -14,4 +14,4 @@ SRC_URI="https://github.com/LibreOffice/${PN}/releases/download/v${PV}/${PN}_${P
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
diff --git a/app-officeext/ooofbtools/Manifest b/app-officeext/ooofbtools/Manifest
index 4c103a3c5ba9..b0574c662198 100644
--- a/app-officeext/ooofbtools/Manifest
+++ b/app-officeext/ooofbtools/Manifest
@@ -1,2 +1 @@
-DIST OOoFBTools-3.4.1.zip 5279862 BLAKE2B 9a95ed4956a5deb58e53202b587b573579b966e43c052164d3a4b20cc2ee7fd1532bb9dab9ab2c486629000a212de752d75fb4f1d77afece1bd130b079be7beb SHA512 1ec04cbf32824d884fed7ff12a59b43486c96a1b4580a0a24fcc73ebbe7d565ae87e8f7600eb19846f34b1a4c94dacf7ebe755e70692501cd87d12ea470ca8d8
 DIST OOoFBTools-3.5.2_r2.zip 5297046 BLAKE2B 8489adbb3e0e74af45eca7267d3595f23e3e8e286d6583be75e80501adc61360c7713c86c66552018eec858f6f3143896ad6d99f69266c3eaa51507458bb9abe SHA512 8d5c95c51afc6a72de61ee81b6253f9295e3dcb0ad78e1e6d18e1d40ffa72aa1edd4850a797291d18cc3d8dd2c2d3c51644c1a6423746b0dbd0905a4c7b14f22
diff --git a/app-officeext/ooofbtools/ooofbtools-3.4.1.ebuild b/app-officeext/ooofbtools/ooofbtools-3.4.1.ebuild
deleted file mode 100644
index 39d662ce0976..000000000000
--- a/app-officeext/ooofbtools/ooofbtools-3.4.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="OOoFBTools"
-OFFICE_EXTENSIONS=( "${MY_PN}.oxt" )
-inherit office-ext-r1
-
-DESCRIPTION="Open/LibreOffice extension for the FictionBook2 format with validation"
-HOMEPAGE="https://sourceforge.net/projects/fbtools/"
-SRC_URI="https://downloads.sourceforge.net/fbtools/files/release/${MY_PN}-${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	app-arch/zip
-	dev-libs/libxml2
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-OFFICE_EXTENSIONS_LOCATION="${S}"
-
-src_prepare() {
-	default
-
-	# Remove Windows cruft
-	pushd "${WORKDIR}/${MY_PN}.oxt" &>/dev/null || die
-	rm -r win32 || die
-	popd &>/dev/null || die
-}
-
-src_install() {
-	office-ext-r1_src_install
-	dodoc ChangeLog*
-}
diff --git a/app-officeext/ooofbtools/ooofbtools-3.5.2.ebuild b/app-officeext/ooofbtools/ooofbtools-3.5.2.ebuild
index c34a92f27263..91e05b57ee5f 100644
--- a/app-officeext/ooofbtools/ooofbtools-3.5.2.ebuild
+++ b/app-officeext/ooofbtools/ooofbtools-3.5.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
@@ -16,7 +16,7 @@ OFFICE_EXTENSIONS_LOCATION="${S}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	app-arch/zip
diff --git a/app-portage/command-not-found/command-not-found-0.0.7.ebuild b/app-portage/command-not-found/command-not-found-0.0.7.ebuild
index 5f87050719cf..2e30b0f6f585 100644
--- a/app-portage/command-not-found/command-not-found-0.0.7.ebuild
+++ b/app-portage/command-not-found/command-not-found-0.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-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 optfeature python-r1
 
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 75578f26a4ae..68f025f31ed7 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,2 +1 @@
-DIST eix-0.36.7.tar.xz 639832 BLAKE2B 37202ae78378688ede95b410fe2e6325d63a9553dc082e4e09dc5bcd261f4e7bf49f349a92c286743c30a54cdc5bc1733fedebae33c37d601e6f5db1faf499e7 SHA512 5f5d059b502633be22c8a18fca410e2319061989bbc65b23592c87a9a109b93e615a5b5a7ca92a500999e3cc791e331b12e32a10700cc104040b1980f7f7a0f9
 DIST eix-0.36.9.tar.xz 642764 BLAKE2B 08f3a76283e540d57d667123f3787a57f08d746b5e8d9c24d541c72dd3c3b225cbfe9130764b5b6457735907b05ba37d415a807cbe37986fa78a366632ecf934 SHA512 7d9a1f7513678a64103e38340e456168d1530edb1fbb2c3379362f79f74737d2fac03340801c67cf186505c2d569e1337cedfe186b22f5ad546ac9bcc542d32c
diff --git a/app-portage/eix/eix-0.36.7-r1.ebuild b/app-portage/eix/eix-0.36.7-r1.ebuild
deleted file mode 100644
index 9d9433e632c7..000000000000
--- a/app-portage/eix/eix-0.36.7-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools bash-completion-r1 tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="debug doc nls sqlite"
-
-DEPEND="
-	nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${DEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-		--without-protobuf
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-		--with-sh-shebang="${EPREFIX}/bin/sh"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
-}
-
-pkg_postinst() {
-	tmpfiles_process eix.conf
-
-	local obs=${EROOT}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.36.9.ebuild b/app-portage/eix/eix-0.36.9.ebuild
index 978c40486c52..108404c84091 100644
--- a/app-portage/eix/eix-0.36.9.ebuild
+++ b/app-portage/eix/eix-0.36.9.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="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="debug doc nls sqlite"
 
 DEPEND="
diff --git a/app-portage/elt-patches/elt-patches-20240721.ebuild b/app-portage/elt-patches/elt-patches-20240721.ebuild
index 2d805a5f0bdc..c423ad469020 100644
--- a/app-portage/elt-patches/elt-patches-20240721.ebuild
+++ b/app-portage/elt-patches/elt-patches-20240721.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
@@ -19,7 +19,7 @@ else
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 	"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-linux ~ppc64-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 ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-portage/elt-patches/elt-patches-20241121.ebuild b/app-portage/elt-patches/elt-patches-20241121.ebuild
index 3f398a3135ba..93f524f5c4af 100644
--- a/app-portage/elt-patches/elt-patches-20241121.ebuild
+++ b/app-portage/elt-patches/elt-patches-20241121.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
@@ -19,7 +19,7 @@ else
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 	"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-linux ~ppc64-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 ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r4.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r4.ebuild
deleted file mode 100644
index 788a228fffb1..000000000000
--- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND"
-HOMEPAGE="https://github.com/hartwork/fetchcommandwrapper"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND=">=net-misc/aria2-1.10.2[metalink,xmlrpc]"
-
-pkg_postinst() {
-	ewarn 'You need to append'
-	ewarn '   source /usr/share/fetchcommandwrapper/make.conf'
-	ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.'
-}
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r5.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r5.ebuild
new file mode 100644
index 000000000000..34cb4e8e010b
--- /dev/null
+++ b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r5.ebuild
@@ -0,0 +1,24 @@
+# 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..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Wrapper integrating aria2 into portage's FETCHCOMMAND"
+HOMEPAGE="https://github.com/hartwork/fetchcommandwrapper"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">=net-misc/aria2-1.10.2[metalink,xmlrpc]"
+
+pkg_postinst() {
+	ewarn 'You need to append'
+	ewarn '   source /usr/share/fetchcommandwrapper/make.conf'
+	ewarn 'to /etc/portage/make.conf in order to integrate fetchcommandwrapper.'
+}
diff --git a/app-portage/kuroo/kuroo-9999.ebuild b/app-portage/kuroo/kuroo-9999.ebuild
index 2e6c55447465..6e7198c1e81c 100644
--- a/app-portage/kuroo/kuroo-9999.ebuild
+++ b/app-portage/kuroo/kuroo-9999.ebuild
@@ -1,19 +1,26 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+ECM_TEST="true"
 KFMIN=6.6.0
 QTMIN=6.7.2
-ESVN_REPO_URI="https://svn.code.sf.net/p/kuroo/code/kuroo4/trunk"
-inherit ecm subversion
+inherit ecm optfeature
+
+if [[ ${PV} == *9999* ]] ; then
+	ESVN_REPO_URI="https://svn.code.sf.net/p/kuroo/code/kuroo4/trunk"
+	inherit subversion
+else
+	SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="Graphical Portage frontend based on KDE Frameworks"
 HOMEPAGE="https://sourceforge.net/projects/kuroo/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE=""
 
 DEPEND="
@@ -28,7 +35,6 @@ DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:6
 	>=kde-frameworks/kio-${KFMIN}:6
 	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
 	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
 	>=kde-frameworks/ktextwidgets-${KFMIN}:6
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
@@ -37,15 +43,15 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	app-portage/gentoolkit
-	kde-misc/kdiff3
 "
-BEDEPEND=">=dev-build/cmake-3.30.2"
+BDEPEND=">=dev-build/cmake-3.30.2"
 
 pkg_postinst() {
 	if ! has_version app-admin/logrotate ; then
 		elog "Installing app-admin/logrotate is recommended to keep"
 		elog "portage's summary.log size reasonable to view in the history page."
 	fi
+	optfeature "graphical configuration merging (when run as root)" "kde-misc/kdiff3"
 
 	ecm_pkg_postinst
 }
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-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 8ddb8ff2dac1..9b6bc5bd0521 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,2 +1 @@
-DIST mgorny-dev-scripts-56.tar.gz 19629 BLAKE2B 11f066437f8e666def01bd818aea22c8c6ff39285dba5702279c63e42715141e27e65d2b1e819d35bf2f062521f87833e0f6373aade46db6e25728f4a017bb9d SHA512 3f320296a46f923ef9900c638ad939488da2ae1f3b12d85b6c73f5dd046dc8637394a2e238b0f8746d6eac30d8fe158f854c16b5b7322e62790a5007ef76e8a3
 DIST mgorny-dev-scripts-57.tar.gz 19364 BLAKE2B 6e53eee063781f8edcb48ec6f72e0d727f7eac4c85edc784bc67cbda4a9eeffffc17031d95ffde1aadd593f9b6eb30973c0387d6cc4270608a704585e185d1b6 SHA512 b989631f6bc5840b8c01b3a3998b980a6702fab64c8f66c131bc3fe5835fef973ae26fd0012310bff6781f116fce23c3a990d11d7de05016a1c5ad355e83190c
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-56.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-56.ebuild
deleted file mode 100644
index 5dbebceb9a95..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-56.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
-SRC_URI="
-	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
-
-RDEPEND="
-	app-portage/gentoolkit
-	>=app-portage/gpyutils-0.12
-	dev-perl/URI
-	dev-util/pkgcheck
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-57.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-57.ebuild
index 0b89f83d564d..9c56d30ba01a 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-57.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-57.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	app-portage/gentoolkit
diff --git a/app-portage/pfl/pfl-3.5.3.ebuild b/app-portage/pfl/pfl-3.5.3.ebuild
index a3a178118186..b7891d567d48 100644
--- a/app-portage/pfl/pfl-3.5.3.ebuild
+++ b/app-portage/pfl/pfl-3.5.3.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..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 systemd
diff --git a/app-portage/prefix-toolkit/Manifest b/app-portage/prefix-toolkit/Manifest
index ebd30aa764bd..d9e1c7f95653 100644
--- a/app-portage/prefix-toolkit/Manifest
+++ b/app-portage/prefix-toolkit/Manifest
@@ -1 +1,2 @@
 DIST prefix-toolkit-10.tar.bz2 5715 BLAKE2B fe8b4642fc4f8fa97bd8c9dc4f9e907dd0ca464ddc20e28d2888354f766fce04dd6ebc3bfae23bc776c59986c8167cc94510fb950124917874c5dde4f68cddfe SHA512 58f7fabab8ce5e2c3b2f0725733d02e340efb714ecf3556c27dbe95e7cf9c4b2f4ae658c44749cf2c62111d1135c60c333bbf93ee1c7b79ea11b908cc923c730
+DIST prefix-toolkit-11.tar.bz2 5733 BLAKE2B 8077fb9c5a669d45ebec6e088d7770e149d1816db779828155857b5c5f3f90cfcc049194b683753feec997121409513a16b7f9f0b1757eabf1c011386145c018 SHA512 50e509f2c5a8cf6764820baa4d649cdb4f8a45529b116a508520cb9244f4fd6dbb728216ba853b15d118b7c7171f8913cdf7b05f84263b433f128f1f76758c3a
diff --git a/app-portage/prefix-toolkit/prefix-toolkit-11.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-11.ebuild
new file mode 100644
index 000000000000..1a2fcf041b1b
--- /dev/null
+++ b/app-portage/prefix-toolkit/prefix-toolkit-11.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Utilities for users of Gentoo Prefix"
+HOMEPAGE="https://prefix.gentoo.org/"
+SRC_URI="https://gitweb.gentoo.org/proj/prefix/prefix-toolkit.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+[[ ${PV} == 9999 ]] ||
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+DEPEND=""
+BDEPEND="${DEPEND}
+	>sys-apps/portage-2.3.62
+"
+# In prefix-stack, these dependencies actually are the @system set,
+# as we rely on the base prefix anyway for package management,
+# which should have a proper @system set.
+# Strictly speaking, only baselayout and gcc-config are necessary, but
+# it is easier for now to install elt-patches, gentoo-functions and
+# gnuconfig as well, instead of fixing all uses that expect them in
+# EPREFIX rather than BROOT.
+# See also: pkg_preinst
+RDEPEND="${DEPEND}
+	prefix-stack? (
+		sys-devel/gcc-config
+		app-portage/elt-patches
+		sys-apps/gentoo-functions
+		sys-devel/gnuconfig
+	)
+"
+
+src_unpack() {
+	default
+
+	if use prefix-stack ; then
+		local editor pager
+		for editor in "${EDITOR}" {"${EPREFIX}","${BROOT}"}/bin/nano
+		do
+			[[ -x ${editor} ]] || continue
+		done
+		for pager in "${PAGER}" {"${EPREFIX}","${BROOT}"}/usr/bin/less
+		do
+			[[ -x ${pager} ]] || continue
+		done
+		printf '%s\n' "EDITOR=\"${editor}\"" "PAGER=\"${pager}\"" > 000fallback
+	fi
+}
+
+my_prefixify() {
+	local ebash eenv
+	if use prefix-stack ; then
+		ebash="${BROOT}/bin/bash"
+		eenv="${BROOT}/usr/bin/env"
+	else
+		ebash="${EPREFIX}/bin/bash"
+		eenv="${EPREFIX}/usr/bin/env"
+	fi
+
+	# the @=@ prevents repoman from believing we set readonly vars
+	sed -e "s,@GENTOO_PORTAGE_BPREFIX@,${BROOT},g" \
+		-e "s,@GENTOO_PORTAGE_EPREFIX@,${EPREFIX},g" \
+		-e "s,@GENTOO_PORTAGE_CHOST@,${CHOST},g" \
+		-e "s,@GENTOO_PORTAGE_EBASH@,${ebash},g" \
+		-e "s,@GENTOO_PORTAGE_EENV@,${eenv},g" \
+		-e "s,@=@,=,g" \
+		-i "$@" || die
+}
+
+src_configure() {
+	# do not eprefixify during unpack, to allow userpatches to apply
+	my_prefixify *
+}
+
+src_install-prefix-stack-ccwrap() {
+	# install toolchain wrapper.
+	local wrapperdir=/usr/${CHOST}/gcc-bin/${CHOST}-${PN}/${PV}
+	local wrappercfg=${CHOST}-${P}
+
+	exeinto $wrapperdir
+	doexe prefix-stack-ccwrap
+
+	local cc
+	for cc in \
+		gcc \
+		g++ \
+		cpp \
+		c++ \
+		windres \
+	; do
+		dosym prefix-stack-ccwrap $wrapperdir/${CHOST}-${cc}
+		dosym ${CHOST}-${cc} $wrapperdir/${cc}
+	done
+
+	# LDPATH is required to keep gcc-config happy :(
+	cat > ./${wrappercfg} <<-EOF
+		GCC_PATH="${EPREFIX}$wrapperdir"
+		LDPATH="${EPREFIX}$wrapperdir"
+		EOF
+
+	insinto /etc/env.d/gcc
+	doins ./${wrappercfg}
+}
+
+src_install() {
+	if use prefix-stack; then
+		src_install-prefix-stack-ccwrap
+		insinto /etc
+		doins prefix-stack.bash_login
+		insinto /etc/bash
+		newins prefix-stack.bashrc bashrc
+		newenvd prefix-stack.envd.99stack 99stack
+		doenvd 000fallback
+		keepdir /usr/share/aclocal
+	else
+		dobin prefix-stack-setup
+	fi
+	if use prefix; then
+		exeinto /
+		doexe startprefix
+	fi
+}
+
+pkg_preinst() {
+	use prefix-stack || return 0
+	ebegin "Purging @system package set for prefix stack"
+	# In prefix stack we empty out the @system set defined via make.profile,
+	# as we may be using some normal profile, but that @system set applies
+	# to the base prefix only.
+	# Instead, we only put ourselve into the @system set, and have additional
+	# @system packages in our RDEPEND.
+	my_lsprofile() {
+		(
+			cd -P "${1:-.}" || exit 1
+			[[ -r ./parent ]] &&
+				for p in $(<parent)
+				do
+					my_lsprofile "${p}" || exit 1
+				done
+			pwd -P
+		)
+	}
+	local systemset="/etc/portage/profile/packages"
+	dodir "${systemset%/*}"
+	[[ -s ${EROOT}${systemset} ]] &&
+		grep -v "# maintained by ${PN}" \
+			"${EROOT}${systemset}" \
+			> "${ED}${systemset}"
+	local p
+	for p in $(my_lsprofile "${EPREFIX}"/etc/portage/make.profile)
+	do
+		[[ -s ${p}/${systemset##*/} ]] || continue
+		awk '/^[ \t]*[^-#]/{print "-" $1 " # maintained by '"${PN}-${PVR}"'"}' \
+			< "${p}"/packages || die
+	done | sort -u >> "${ED}${systemset}"
+	[[ ${PIPESTATUS[@]} == "0 0" ]] || die "failed to collect for ${systemset}"
+	echo "*${CATEGORY}/${PN} # maintained by ${PN}-${PVR}" >> "${ED}${systemset}" || die
+	eend $?
+}
+
+pkg_postinst() {
+	use prefix-stack || return 0
+	[[ -x ${EROOT}/usr/bin/gcc-config ]] || return 0
+	"${EROOT}"/usr/bin/gcc-config ${CHOST}-${P}
+}
diff --git a/app-shells/bash-completion/bash-completion-2.15.0.ebuild b/app-shells/bash-completion/bash-completion-2.15.0.ebuild
index 2f0621239eec..ab76f23fc0e2 100644
--- a/app-shells/bash-completion/bash-completion-2.15.0.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.15.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
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 8693db039f9d..3d5f41fc0722 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -24,7 +24,7 @@ DIST bash-5.2.tar.gz 10950833 BLAKE2B 51b196e710794ebad8eac28c31c93eb99ac1a7db30
 DIST bash-5.2.tar.gz.sig 95 BLAKE2B 2991b7c46ef1cdca08062f419be47fca7551f4c5d9aad8a5c1da74974f5e7707d23914b4cecf9b6c9610471146b2c49b611bb62a5d974f1c37cceb77b719851c SHA512 a161664f124f906be32709f66702f8f780e6d52e558ea45e71ec60a959c9435ff68477ee65a0a9f6c0051d5592f5044fb3b410cf3cd3ae5a8a323789b01be258
 DIST bash-5.3-beta.tar.gz 10667630 BLAKE2B d6d3a1efd5ed69b131e2831e35c4a620968132e7d9da079de155decb4d3c736cd6c9f1180523e85dd41aeecdb9b380e4768bc551afafaee478168c462ce90929 SHA512 f8f02b4a90312c8e7c589efd1a0a43a4db3bcb47d19cb95190961e4ae254b2d6d26472197ce216868d914fe1adf62741f927552239559a1c3b2c64dfcfaa8cb0
 DIST bash-5.3-beta.tar.gz.sig 94 BLAKE2B a4b85d5755e200abddd5669c3d21b1ee6be8036b27934e25473c14b15ffc1bc7cbbd5a94f39a0dc6bf6050908590509f0ba39d28c33947154cc966e11d454c8c SHA512 72184ca2afe3d0c8c2165516499a61da2aecc0c8c83661cab0038c3d849623115729d2ade73c4b5973ea9b5e8169af4bc2aea51f0b70356af26342285adab2f5
-DIST bash-5.3_beta_p20241230-5114e17172276cf5a2f889f8037ae58c4cb05bb9.tar.gz 15703629 BLAKE2B 331a0c1ce3cc423d0e55500c4b04caa8086b195a49554a01f3db766773778ac58f5749cb167a298fc77d7841da79a3d007c2bf826f74c52d4659147c55cc3bd6 SHA512 2ea7ddceb243e2baa3a5b45a86882b2cd476fadeaaac943a108de61a57b13e65e2789bb72345850e8fb4e6adafa0b706a273fcc5bdbaf76fcf897501b67ddc23
+DIST bash-5.3_beta_p20250109-2ea356081dbfbac2c791f9b8072ed4b824e3d9df.tar.gz 15708913 BLAKE2B 0fcfb544b4c167ddb6e6bebde283519d4dd0ea95d531c6d499b5bbbc073ec355955a6f0fcaf9efe6de57fc8395f72636ebb077c4bc2506e58b30c2c98429e528 SHA512 7200a9e2bedbcb2b6ffabf32f324df33e6d9f8a12155f9112a22588d313c197202e3ae96930a7ab2d454e45b7ef708afabb371bb7ba13c1ee0d1b9ad58b77cac
 DIST bash205b-001 1132 BLAKE2B 0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6 SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
 DIST bash205b-002 755 BLAKE2B 6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d SHA512 46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883
 DIST bash205b-003 2356 BLAKE2B b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7 SHA512 74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399
diff --git a/app-shells/bash/bash-5.0_p18-r2.ebuild b/app-shells/bash/bash-5.0_p18-r2.ebuild
deleted file mode 100644
index 8b51f3570ada..000000000000
--- a/app-shells/bash/bash-5.0_p18-r2.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs prefix
-
-# Uncomment if we have a patchset
-GENTOO_PATCH_DEV="sam"
-GENTOO_PATCH_VER="${PV}"
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-is_release() {
-	case ${PV} in
-	*_alpha*|*_beta*|*_rc*) return 1 ;;
-	*) return 0 ;;
-	esac
-}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-	[[ ${plevel} -eq 0 ]] && return 1
-	eval set -- {1..${plevel}}
-	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
-			printf "${u}/${pn}-${pv}-patches/%s " "$@"
-		done
-	fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="8.0"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
-if is_release ; then
-	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-else
-	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-fi
-
-if [[ -n ${GENTOO_PATCH_VER} ]] ; then
-	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
-
-DEPEND="
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
-"
-RDEPEND="
-	${DEPEND}
-"
-# We only need bison (yacc) when the .y files get patched (bash42-005)
-BDEPEND="sys-devel/bison"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# Patches from Chet sent to bashbug ml
-	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-5.0-history-append.patch
-	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-5.0-syslog-history-extern.patch
-)
-
-pkg_setup() {
-	# bug #7332
-	if is-flag -malign-double ; then
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-
-	if use bashlogger ; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	if [[ -n ${GENTOO_PATCH_VER} ]] ; then
-		unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
-	fi
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if is_release ; then
-		rm -rf lib/{readline,termcap}/* || die
-		touch lib/{readline,termcap}/Makefile.in || die # for config.status
-		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
-	fi
-
-	# Prefixify hardcoded path names. No-op for non-prefix.
-	hprefixify pathnames.h.in
-
-	# Avoid regenerating docs after patches, bug #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/* || die
-
-	eapply -p0 "${PATCHES[@]}"
-	eapply_user
-}
-
-src_configure() {
-	# Upstream only test with Bison and require GNUisms like YYEOF and
-	# YYERRCODE. The former at least may be in POSIX soon:
-	# https://www.austingroupbugs.net/view.php?id=1269.
-	# configure warns on use of non-Bison but doesn't abort. The result
-	# may misbehave at runtime.
-	unset YACC
-
-	# bash 5.3 drops unprototyped functions, earlier versions are
-	# incompatible with C23.
-	append-cflags $(test-flags-CC -std=gnu17)
-
-	local myconf=(
-		--disable-profiling
-
-		# Force linking with system curses ... the bundled termcap lib
-		# sucks bad compared to ncurses.  For the most part, ncurses
-		# is here because readline needs it.  But bash itself calls
-		# ncurses in one or two small places :(.
-		--with-curses
-
-		$(use_enable mem-scramble)
-		$(use_enable net net-redirections)
-		$(use_enable readline)
-		$(use_enable readline bang-history)
-		$(use_enable readline history)
-		$(use_with afs)
-		$(use_with mem-scramble bash-malloc)
-	)
-
-	# For descriptions of these, see config-top.h
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	# Don't even think about building this statically without
-	# reading bug #7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf+=( --disable-nls )
-
-	# Historically, we always used the builtin readline, but since
-	# our handling of SONAME upgrades has gotten much more stable
-	# in the PM (and the readline ebuild itself preserves the old
-	# libs during upgrades), linking against the system copy should
-	# be safe.
-	# Exact cached version here doesn't really matter as long as it
-	# is at least what's in the DEPEND up above.
-	export ac_cv_rl_version=${READLINE_VER%%_*}
-
-	if is_release ; then
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins ; then
-		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
-	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
-	fi
-
-	# bug #444070
-	tc-export AR
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use plugins ; then
-		emake -C examples/loadables all others
-	fi
-}
-
-src_install() {
-	local d f
-
-	default
-
-	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
-
-	keepdir /etc/bash/bashrc.d
-
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
-
-	local sed_args=(
-		-e 's:#GNU#@::'
-		-e '/#@/d'
-	)
-
-	if ! use readline ; then
-		# bug #432338
-		sed_args+=(
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			docinto ${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
-				else
-					dodoc ${f}
-				fi
-			done
-		done
-	fi
-
-	doman doc/*.1
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
-}
diff --git a/app-shells/bash/bash-5.0_p18-r3.ebuild b/app-shells/bash/bash-5.0_p18-r3.ebuild
new file mode 100644
index 000000000000..2fa356b7fac0
--- /dev/null
+++ b/app-shells/bash/bash-5.0_p18-r3.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs prefix
+
+# Uncomment if we have a patchset
+GENTOO_PATCH_DEV="sam"
+GENTOO_PATCH_VER="${PV}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+is_release() {
+	case ${PV} in
+	*_alpha*|*_beta*|*_rc*) return 1 ;;
+	*) return 0 ;;
+	esac
+}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	[[ ${plevel} -eq 0 ]] && return 1
+	eval set -- {1..${plevel}}
+	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+			printf "${u}/${pn}-${pv}-patches/%s " "$@"
+		done
+	fi
+}
+
+# The version of readline this bash normally ships with.
+READLINE_VER="8.0"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
+if is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+else
+	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+fi
+
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
+LICENSE="GPL-3"
+SLOT="${MY_PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+"
+RDEPEND="
+	${DEPEND}
+"
+# We only need bison (yacc) when the .y files get patched (bash42-005)
+BDEPEND="sys-devel/bison"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# Patches from Chet sent to bashbug ml
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-5.0-history-append.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-5.0-syslog-history-extern.patch
+)
+
+pkg_setup() {
+	# bug #7332
+	if is-flag -malign-double ; then
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+
+	if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+		unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+	fi
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/* || die
+		touch lib/{readline,termcap}/Makefile.in || die # for config.status
+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches, bug #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/* || die
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	# Upstream only test with Bison and require GNUisms like YYEOF and
+	# YYERRCODE. The former at least may be in POSIX soon:
+	# https://www.austingroupbugs.net/view.php?id=1269.
+	# configure warns on use of non-Bison but doesn't abort. The result
+	# may misbehave at runtime.
+	unset YACC
+
+	# bash 5.3 drops unprototyped functions, earlier versions are
+	# incompatible with C23.
+	append-cflags $(test-flags-CC -std=gnu89)
+
+	local myconf=(
+		--disable-profiling
+
+		# Force linking with system curses ... the bundled termcap lib
+		# sucks bad compared to ncurses.  For the most part, ncurses
+		# is here because readline needs it.  But bash itself calls
+		# ncurses in one or two small places :(.
+		--with-curses
+
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading bug #7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=${READLINE_VER%%_*}
+
+	if is_release ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins ; then
+		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+
+	# bug #444070
+	tc-export AR
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	into /
+	newbin bash bash-${SLOT}
+
+	newman doc/bash.1 bash-${SLOT}.1
+	newman doc/builtins.1 builtins-${SLOT}.1
+
+	insinto /usr/share/info
+	newins doc/bashref.info bash-${SLOT}.info
+	dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info
+
+	dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
+}
diff --git a/app-shells/bash/bash-5.1_p16-r13.ebuild b/app-shells/bash/bash-5.1_p16-r13.ebuild
deleted file mode 100644
index c760b90a57da..000000000000
--- a/app-shells/bash/bash-5.1_p16-r13.ebuild
+++ /dev/null
@@ -1,362 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
-inherit flag-o-matic toolchain-funcs prefix verify-sig
-
-# Uncomment if we have a patchset.
-#GENTOO_PATCH_DEV="sam"
-#GENTOO_PATCH_VER="${PV}"
-
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-MY_PATCHES=()
-
-# Determine the patchlevel. See ftp://ftp.gnu.org/gnu/bash/bash-5.1-patches/.
-case ${PV} in
-	*_p*)
-		PLEVEL=${PV##*_p}
-		;;
-	9999|*_alpha*|*_beta*|*_rc*)
-		# Set a negative patchlevel to indicate that it's a pre-release.
-		PLEVEL=-1
-		;;
-	*)
-		PLEVEL=0
-esac
-
-# The version of readline this bash normally ships with. Note that we only use
-# the bundled copy of readline for pre-releases.
-READLINE_VER="8.1"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
-	EGIT_BRANCH=devel
-	inherit git-r3
-else
-	my_urls=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
-
-	# bash-5.1 -> bash51
-	my_p=${PN}$(ver_cut 1-2) my_p=${my_p/.}
-
-	for (( my_patch_idx = 1; my_patch_idx <= PLEVEL; my_patch_idx++ )); do
-		printf -v my_patch_ver %s-%03d "${my_p}" "${my_patch_idx}"
-		my_urls+=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}-patches/${my_patch_ver}" )
-		MY_PATCHES+=( "${DISTDIR}/${my_patch_ver}" )
-	done
-
-	SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
-
-	unset -v my_urls my_p my_patch_idx my_patch_ver
-fi
-
-if [[ ${GENTOO_PATCH_VER} ]]; then
-	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz"
-fi
-
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3+"
-SLOT="0"
-if (( PLEVEL >= 0 )); 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
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
-
-DEPEND="
-	>=sys-libs/ncurses-5.2-r2:=
-	nls? ( virtual/libintl )
-"
-if (( PLEVEL >= 0 )); then
-	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
-fi
-RDEPEND="
-	${DEPEND}
-"
-# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011).
-BDEPEND="
-	sys-devel/bison
-	verify-sig? ( sec-keys/openpgp-keys-chetramey )
-"
-
-# EAPI 8 tries to append it but it doesn't exist here.
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-QA_CONFIG_IMPL_DECL_SKIP+=(
-	# this is fixed in autoconf 2.71, used in bash 5.2. The check fails
-	# regardless of GCC version. bug #916480
-	makedev
-)
-
-PATCHES=(
-	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
-
-	# Patches to or from Chet, posted to the bug-bash mailing list.
-	"${FILESDIR}/${PN}-5.0-syslog-history-extern.patch"
-	"${FILESDIR}/${PN}-5.1_p16-configure-clang16.patch"
-)
-
-pkg_setup() {
-	# bug #7332
-	if is-flag -malign-double; then
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-
-	if use bashlogger; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	local patch
-
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		if use verify-sig; then
-			verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig}
-
-			for patch in "${MY_PATCHES[@]}"; do
-				verify-sig_verify_detached "${patch}"{,.sig}
-			done
-		fi
-
-		unpack "${MY_P}.tar.gz"
-
-		if [[ ${GENTOO_PATCH_VER} ]]; then
-			unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Include official patches.
-	(( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}"
-
-	# Clean out local libs so we know we use system ones w/releases. The
-	# touch utility is invoked for the benefit of config.status.
-	if (( PLEVEL >= 0 )); then
-		rm -rf lib/{readline,termcap}/* \
-		&& touch lib/{readline,termcap}/Makefile.in \
-		&& sed -i -E 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \
-		|| die
-	fi
-
-	# Prefixify hardcoded path names. No-op for non-prefix.
-	hprefixify pathnames.h.in
-
-	# Avoid regenerating docs after patches, bug #407985.
-	sed -i -E '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in \
-	&& touch -r . doc/* \
-	|| die
-
-	eapply -p0 "${PATCHES[@]}"
-	eapply_user
-}
-
-src_configure() {
-	local -a myconf
-
-	# Upstream only test with Bison and require GNUisms like YYEOF and
-	# YYERRCODE. The former at least may be in POSIX soon:
-	# https://www.austingroupbugs.net/view.php?id=1269.
-	# configure warns on use of non-Bison but doesn't abort. The result
-	# may misbehave at runtime.
-	unset -v YACC
-
-	# bash 5.3 drops unprototyped functions, earlier versions are
-	# incompatible with C23.
-	append-cflags $(test-flags-CC -std=gnu17)
-
-	myconf=(
-		--disable-profiling
-
-		# Force linking with system curses ... the bundled termcap lib
-		# sucks bad compared to ncurses.  For the most part, ncurses
-		# is here because readline needs it.  But bash itself calls
-		# ncurses in one or two small places :(.
-		--with-curses
-
-		$(use_enable mem-scramble)
-		$(use_enable net net-redirections)
-		$(use_enable readline)
-		$(use_enable readline bang-history)
-		$(use_enable readline history)
-		$(use_with afs)
-		$(use_with mem-scramble bash-malloc)
-	)
-
-	# For descriptions of these, see config-top.h.
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	use nls || myconf+=( --disable-nls )
-
-	if (( PLEVEL >= 0 )); then
-		# Historically, we always used the builtin readline, but since
-		# our handling of SONAME upgrades has gotten much more stable
-		# in the PM (and the readline ebuild itself preserves the old
-		# libs during upgrades), linking against the system copy should
-		# be safe.
-		# Exact cached version here doesn't really matter as long as it
-		# is at least what's in the DEPEND up above.
-		export ac_cv_rl_version=${READLINE_VER%%_*}
-
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins; then
-		append-ldflags "-Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/bash"
-	else
-		# Disable the plugins logic by hand since bash doesn't provide
-		# a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-
-		sed -i -e '/LOCAL_LDFLAGS=/s:-rdynamic::' configure || die
-	fi
-
-	# bug #444070
-	tc-export AR
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use plugins; then
-		emake -C examples/loadables all others
-	fi
-}
-
-src_install() {
-	local d f
-
-	default
-
-	my_prefixify() {
-		while read -r; do
-			if [[ $REPLY == *$1* ]]; then
-				REPLY=${REPLY/"/etc/"/"${EPREFIX}/etc/"}
-			fi
-			printf '%s\n' "${REPLY}" || ! break
-		done < "$2" || die
-	}
-
-	dodir /bin
-	mv -- "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	my_prefixify bashrc.d "${FILESDIR}"/bashrc-r1 | newins - bashrc
-
-	insinto /etc/bash/bashrc.d
-	my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color.bash | newins - 10-gentoo-color.bash
-	doins "${FILESDIR}"/bashrc.d/10-gentoo-title.bash
-	if [[ ! ${EPREFIX} ]]; then
-		doins "${FILESDIR}"/bashrc.d/15-gentoo-bashrc-check.bash
-	fi
-
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc}; do
-		newins "${FILESDIR}/dot-${f}" ".${f}"
-	done
-
-	if use plugins; then
-		exeinto "/usr/$(get_libdir)/bash"
-		set -- examples/loadables/*.o
-		doexe "${@%.o}"
-
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples; then
-		for d in examples/{functions,misc,scripts,startup-files}; do
-			exeinto "/usr/share/doc/${PF}/${d}"
-			docinto "${d}"
-			for f in "${d}"/*; do
-				if [[ ${f##*/} != @(PERMISSION|*README) ]]; then
-					doexe "${f}"
-				else
-					dodoc "${f}"
-				fi
-			done
-		done
-	fi
-
-	# Install bash_builtins.1 and rbash.1.
-	emake -C doc DESTDIR="${D}" install_builtins
-	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
-	doman "${T}"/rbash.1
-
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]]; then
-		mkdir -p -- "${EROOT}"/etc/bash \
-		&& mv -f -- "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ \
-		|| die
-	fi
-}
-
-pkg_postinst() {
-	local old_ver
-
-	# If /bin/sh does not exist, provide it.
-	if [[ ! -e ${EROOT}/bin/sh ]]; then
-		ln -sf -- bash "${EROOT}"/bin/sh || die
-	fi
-
-	read -r old_ver <<<"${REPLACING_VERSIONS}"
-	if [[ ! $old_ver ]]; then
-		:
-	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r6"; then
-		return
-	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r13"; then
-		return
-	fi
-
-	while read -r; do ewarn "${REPLY}"; done <<'EOF'
-Files situated under /etc/bash/bashrc.d must now have a suffix of .sh or .bash.
-
-Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the
-characteristics of the operating environment, this array may contain a command
-to set the terminal's window title. Those already choosing to customise the
-PROMPT_COMMAND variable are now advised to append their commands like so:
-
-PROMPT_COMMAND+=('custom command goes here')
-
-Gentoo no longer defaults to having bash manipulate the window title in the case
-that the terminal is controlled by sshd(8), unless screen or tmux are in use.
-Those wanting to set the title unconditionally may adjust ~/.bashrc - or create
-a custom /etc/bash/bashrc.d drop-in - to set PROMPT_COMMMAND like so:
-
-PROMPT_COMMAND=(genfun_set_win_title)
-
-Those who would prefer for bash never to interfere with the window title may
-now opt out of the default title setting behaviour, either with the "unset -v
-PROMPT_COMMAND" command or by re-defining PROMPT_COMMAND as desired.
-EOF
-}
diff --git a/app-shells/bash/bash-5.1_p16-r14.ebuild b/app-shells/bash/bash-5.1_p16-r14.ebuild
new file mode 100644
index 000000000000..0a1dbe4b63a9
--- /dev/null
+++ b/app-shells/bash/bash-5.1_p16-r14.ebuild
@@ -0,0 +1,262 @@
+# 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/chetramey.asc
+inherit flag-o-matic toolchain-funcs prefix verify-sig
+
+# Uncomment if we have a patchset.
+#GENTOO_PATCH_DEV="sam"
+#GENTOO_PATCH_VER="${PV}"
+
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+MY_PATCHES=()
+
+# Determine the patchlevel. See ftp://ftp.gnu.org/gnu/bash/bash-5.1-patches/.
+case ${PV} in
+	*_p*)
+		PLEVEL=${PV##*_p}
+		;;
+	9999|*_alpha*|*_beta*|*_rc*)
+		# Set a negative patchlevel to indicate that it's a pre-release.
+		PLEVEL=-1
+		;;
+	*)
+		PLEVEL=0
+esac
+
+# The version of readline this bash normally ships with. Note that we only use
+# the bundled copy of readline for pre-releases.
+READLINE_VER="8.1"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
+	EGIT_BRANCH=devel
+	inherit git-r3
+else
+	my_urls=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
+
+	# bash-5.1 -> bash51
+	my_p=${PN}$(ver_cut 1-2) my_p=${my_p/.}
+
+	for (( my_patch_idx = 1; my_patch_idx <= PLEVEL; my_patch_idx++ )); do
+		printf -v my_patch_ver %s-%03d "${my_p}" "${my_patch_idx}"
+		my_urls+=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}-patches/${my_patch_ver}" )
+		MY_PATCHES+=( "${DISTDIR}/${my_patch_ver}" )
+	done
+
+	SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
+
+	unset -v my_urls my_p my_patch_idx my_patch_ver
+fi
+
+if [[ ${GENTOO_PATCH_VER} ]]; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz"
+fi
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3+"
+SLOT="${MY_PV}"
+if (( PLEVEL >= 0 )); 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
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:=
+	nls? ( virtual/libintl )
+"
+if (( PLEVEL >= 0 )); then
+	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
+RDEPEND="
+	${DEPEND}
+"
+# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011).
+BDEPEND="
+	sys-devel/bison
+	verify-sig? ( sec-keys/openpgp-keys-chetramey )
+"
+
+# EAPI 8 tries to append it but it doesn't exist here.
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+QA_CONFIG_IMPL_DECL_SKIP+=(
+	# this is fixed in autoconf 2.71, used in bash 5.2. The check fails
+	# regardless of GCC version. bug #916480
+	makedev
+)
+
+PATCHES=(
+	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
+
+	# Patches to or from Chet, posted to the bug-bash mailing list.
+	"${FILESDIR}/${PN}-5.0-syslog-history-extern.patch"
+	"${FILESDIR}/${PN}-5.1_p16-configure-clang16.patch"
+)
+
+pkg_setup() {
+	# bug #7332
+	if is-flag -malign-double; then
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+
+	if use bashlogger; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	local patch
+
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		if use verify-sig; then
+			verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig}
+
+			for patch in "${MY_PATCHES[@]}"; do
+				verify-sig_verify_detached "${patch}"{,.sig}
+			done
+		fi
+
+		unpack "${MY_P}.tar.gz"
+
+		if [[ ${GENTOO_PATCH_VER} ]]; then
+			unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Include official patches.
+	(( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}"
+
+	# Clean out local libs so we know we use system ones w/releases. The
+	# touch utility is invoked for the benefit of config.status.
+	if (( PLEVEL >= 0 )); then
+		rm -rf lib/{readline,termcap}/* \
+		&& touch lib/{readline,termcap}/Makefile.in \
+		&& sed -i -E 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \
+		|| die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches, bug #407985.
+	sed -i -E '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in \
+	&& touch -r . doc/* \
+	|| die
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	local -a myconf
+
+	# Upstream only test with Bison and require GNUisms like YYEOF and
+	# YYERRCODE. The former at least may be in POSIX soon:
+	# https://www.austingroupbugs.net/view.php?id=1269.
+	# configure warns on use of non-Bison but doesn't abort. The result
+	# may misbehave at runtime.
+	unset -v YACC
+
+	# bash 5.3 drops unprototyped functions, earlier versions are
+	# incompatible with C23.
+	append-cflags $(test-flags-CC -std=gnu17)
+
+	myconf=(
+		--disable-profiling
+
+		# Force linking with system curses ... the bundled termcap lib
+		# sucks bad compared to ncurses.  For the most part, ncurses
+		# is here because readline needs it.  But bash itself calls
+		# ncurses in one or two small places :(.
+		--with-curses
+
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h.
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	use nls || myconf+=( --disable-nls )
+
+	if (( PLEVEL >= 0 )); then
+		# Historically, we always used the builtin readline, but since
+		# our handling of SONAME upgrades has gotten much more stable
+		# in the PM (and the readline ebuild itself preserves the old
+		# libs during upgrades), linking against the system copy should
+		# be safe.
+		# Exact cached version here doesn't really matter as long as it
+		# is at least what's in the DEPEND up above.
+		export ac_cv_rl_version=${READLINE_VER%%_*}
+
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins; then
+		append-ldflags "-Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/bash"
+	else
+		# Disable the plugins logic by hand since bash doesn't provide
+		# a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+
+		sed -i -e '/LOCAL_LDFLAGS=/s:-rdynamic::' configure || die
+	fi
+
+	# bug #444070
+	tc-export AR
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	into /
+	newbin bash bash-${SLOT}
+
+	newman doc/bash.1 bash-${SLOT}.1
+	newman doc/builtins.1 builtins-${SLOT}.1
+
+	insinto /usr/share/info
+	newins doc/bashref.info bash-${SLOT}.info
+	dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info
+
+	dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
+}
diff --git a/app-shells/bash/bash-5.3_beta_p20241230.ebuild b/app-shells/bash/bash-5.3_beta_p20241230.ebuild
deleted file mode 100644
index 09125ca4f28e..000000000000
--- a/app-shells/bash/bash-5.3_beta_p20241230.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
-inherit flag-o-matic toolchain-funcs prefix verify-sig
-
-# Uncomment if we have a patchset.
-#GENTOO_PATCH_DEV="sam"
-#GENTOO_PATCH_VER="${PV}"
-
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-MY_PATCHES=()
-
-# Determine the patchlevel.
-case ${PV} in
-	9999|*_alpha*|*_beta*|*_rc*)
-		# Set a negative patchlevel to indicate that it's a pre-release.
-		PLEVEL=-1
-		;;
-	*_p*)
-		PLEVEL=${PV##*_p}
-		;;
-	*)
-		PLEVEL=0
-esac
-
-# The version of readline this bash normally ships with. Note that we only use
-# the bundled copy of readline for pre-releases.
-READLINE_VER="8.3_alpha"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
-	EGIT_BRANCH=devel
-	inherit git-r3
-elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
-	# It can be useful to have snapshots in the pre-release period once
-	# the first alpha is out, as various bugs get reported and fixed from
-	# the alpha, and the next pre-release is usually quite far away.
-	#
-	# i.e. if it's worth packaging the alpha, it's worth packaging a followup.
-	BASH_COMMIT="5114e17172276cf5a2f889f8037ae58c4cb05bb9"
-	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.gz -> ${P}-${BASH_COMMIT}.tar.gz"
-	S=${WORKDIR}/${PN}-${BASH_COMMIT}
-else
-	my_urls=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
-
-	# bash-5.1 -> bash51
-	my_p=${PN}$(ver_cut 1-2) my_p=${my_p/.}
-
-	for (( my_patch_idx = 1; my_patch_idx <= PLEVEL; my_patch_idx++ )); do
-		printf -v my_patch_ver %s-%03d "${my_p}" "${my_patch_idx}"
-		my_urls+=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}-patches/${my_patch_ver}" )
-		MY_PATCHES+=( "${DISTDIR}/${my_patch_ver}" )
-	done
-
-	SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
-	S=${WORKDIR}/${MY_P}
-
-	unset -v my_urls my_p my_patch_idx my_patch_ver
-fi
-
-if [[ ${GENTOO_PATCH_VER} ]]; then
-	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-if (( PLEVEL >= 0 )); 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
-IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
-
-DEPEND="
-	>=sys-libs/ncurses-5.2-r2:=
-	nls? ( virtual/libintl )
-"
-if (( PLEVEL >= 0 )); then
-	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
-fi
-RDEPEND="
-	${DEPEND}
-"
-# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011).
-BDEPEND="
-	pgo? ( dev-util/gperf )
-	verify-sig? ( sec-keys/openpgp-keys-chetramey )
-"
-
-# EAPI 8 tries to append it but it doesn't exist here.
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-PATCHES=(
-	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
-
-	# Patches to or from Chet, posted to the bug-bash mailing list.
-	"${FILESDIR}/${PN}-5.0-syslog-history-extern.patch"
-)
-
-pkg_setup() {
-	# bug #7332
-	if is-flag -malign-double; then
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-
-	if use bashlogger; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	local patch
-
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
-		default
-	else
-		if use verify-sig; then
-			verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig}
-
-			for patch in "${MY_PATCHES[@]}"; do
-				verify-sig_verify_detached "${patch}"{,.sig}
-			done
-		fi
-
-		unpack "${MY_P}.tar.gz"
-
-		if [[ ${GENTOO_PATCH_VER} ]]; then
-			unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Include official patches.
-	(( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}"
-
-	# Clean out local libs so we know we use system ones w/releases. The
-	# touch utility is invoked for the benefit of config.status.
-	if (( PLEVEL >= 0 )); then
-		rm -rf lib/{readline,termcap}/* \
-		&& touch lib/{readline,termcap}/Makefile.in \
-		&& sed -i -E 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \
-		|| die
-	fi
-
-	# Prefixify hardcoded path names. No-op for non-prefix.
-	hprefixify pathnames.h.in
-
-	# Avoid regenerating docs after patches, bug #407985.
-	sed -i -E '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in \
-	&& touch -r . doc/* \
-	|| die
-
-	# Sometimes hangs (more noticeable w/ pgo), bug #907403.
-	rm tests/run-jobs || die
-
-	eapply -p0 "${PATCHES[@]}"
-	eapply_user
-}
-
-src_configure() {
-	local -a myconf
-
-	# Upstream only test with Bison and require GNUisms like YYEOF and
-	# YYERRCODE. The former at least may be in POSIX soon:
-	# https://www.austingroupbugs.net/view.php?id=1269.
-	# configure warns on use of non-Bison but doesn't abort. The result
-	# may misbehave at runtime.
-	unset -v YACC
-
-	# wcsnwidth(), substring() issues with -Wlto-type-mismatch, reported
-	# upstream to Chet by email.
-	filter-lto
-
-	myconf=(
-		--disable-profiling
-
-		# Force linking with system curses ... the bundled termcap lib
-		# sucks bad compared to ncurses.  For the most part, ncurses
-		# is here because readline needs it.  But bash itself calls
-		# ncurses in one or two small places :(.
-		--with-curses
-
-		$(use_enable mem-scramble)
-		$(use_enable net net-redirections)
-		$(use_enable readline)
-		$(use_enable readline bang-history)
-		$(use_enable readline history)
-		$(use_with afs)
-		$(use_with mem-scramble bash-malloc)
-	)
-
-	# For descriptions of these, see config-top.h.
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	use nls || myconf+=( --disable-nls )
-
-	if (( PLEVEL >= 0 )); then
-		# Historically, we always used the builtin readline, but since
-		# our handling of SONAME upgrades has gotten much more stable
-		# in the PM (and the readline ebuild itself preserves the old
-		# libs during upgrades), linking against the system copy should
-		# be safe.
-		# Exact cached version here doesn't really matter as long as it
-		# is at least what's in the DEPEND up above.
-		export ac_cv_rl_version=${READLINE_VER%%_*}
-
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins; then
-		append-ldflags "-Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/bash"
-	else
-		# Disable the plugins logic by hand since bash doesn't provide
-		# a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-
-		sed -i -e '/LOCAL_LDFLAGS=/s:-rdynamic::' configure || die
-	fi
-
-	# bug #444070
-	tc-export AR
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	local -a pgo_generate_flags pgo_use_flags
-	local flag
-
-	# -fprofile-partial-training because upstream notes the test suite isn't
-	# super comprehensive.
-	# https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
-	if use pgo; then
-		pgo_generate_flags=(
-			-fprofile-update=atomic
-			-fprofile-dir="${T}"/pgo
-			-fprofile-generate="${T}"/pgo
-		)
-		pgo_use_flags=(
-			-fprofile-use="${T}"/pgo
-			-fprofile-dir="${T}"/pgo
-		)
-		if flag=$(test-flags-CC -fprofile-partial-training); then
-			pgo_generate_flags+=( "${flag}" )
-			pgo_use_flags+=( "${flag}" )
-		fi
-	fi
-
-	emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}"
-	use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" all others
-
-	# Build Bash and run its tests to generate profiles.
-	if (( ${#pgo_generate_flags[@]} )); then
-		# Used in test suite.
-		unset -v A
-
-		emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" -k check
-
-		if tc-is-clang; then
-			llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die
-		fi
-
-		# Rebuild Bash using the profiling data we just generated.
-		emake clean
-		emake CFLAGS="${CFLAGS} ${pgo_use_flags[*]}"
-		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags[*]}" all others
-	fi
-}
-
-src_test() {
-	# Used in test suite.
-	unset -v A
-
-	default
-}
-
-src_install() {
-	local d f
-
-	default
-
-	my_prefixify() {
-		while read -r; do
-			if [[ $REPLY == *$1* ]]; then
-				REPLY=${REPLY/"/etc/"/"${EPREFIX}/etc/"}
-			fi
-			printf '%s\n' "${REPLY}" || ! break
-		done < "$2" || die
-	}
-
-	dodir /bin
-	mv -- "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	my_prefixify bashrc.d "${FILESDIR}"/bashrc-r1 | newins - bashrc
-
-	insinto /etc/bash/bashrc.d
-	my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color.bash | newins - 10-gentoo-color.bash
-	newins "${FILESDIR}"/bashrc.d/10-gentoo-title-r1.bash 10-gentoo-title.bash
-	if [[ ! ${EPREFIX} ]]; then
-		doins "${FILESDIR}"/bashrc.d/15-gentoo-bashrc-check.bash
-	fi
-
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc}; do
-		newins "${FILESDIR}/dot-${f}" ".${f}"
-	done
-
-	if use plugins; then
-		exeinto "/usr/$(get_libdir)/bash"
-		set -- examples/loadables/*.o
-		doexe "${@%.o}"
-
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples; then
-		for d in examples/{functions,misc,scripts,startup-files}; do
-			exeinto "/usr/share/doc/${PF}/${d}"
-			docinto "${d}"
-			for f in "${d}"/*; do
-				if [[ ${f##*/} != @(PERMISSION|*README) ]]; then
-					doexe "${f}"
-				else
-					dodoc "${f}"
-				fi
-			done
-		done
-	fi
-
-	# Install bash_builtins.1 and rbash.1.
-	emake -C doc DESTDIR="${D}" install_builtins
-	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
-	doman "${T}"/rbash.1
-
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]]; then
-		mkdir -p -- "${EROOT}"/etc/bash \
-		&& mv -f -- "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ \
-		|| die
-	fi
-}
-
-pkg_postinst() {
-	local old_ver
-
-	# If /bin/sh does not exist, provide it.
-	if [[ ! -e ${EROOT}/bin/sh ]]; then
-		ln -sf -- bash "${EROOT}"/bin/sh || die
-	fi
-
-	read -r old_ver <<<"${REPLACING_VERSIONS}"
-	if [[ ! $old_ver ]]; then
-		:
-	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r8"; then
-		return
-	fi
-
-	while read -r; do ewarn "${REPLY}"; done <<'EOF'
-Files under /etc/bash/bashrc.d must now have a suffix of .sh or .bash.
-
-Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the
-characteristics of the operating environment, it may contain a command to set
-the terminal's window title. Those who were already choosing to customise the
-PROMPT_COMMAND variable are now advised to append their commands like so:
-
-PROMPT_COMMAND+=('custom command goes here')
-
-Gentoo no longer defaults to having bash set the window title in the case
-that the terminal is controlled by sshd(8), unless screen is launched on the
-remote side or the terminal reliably supports saving and restoring the title
-(as alacritty, foot and tmux do). Those wanting for the title to be set
-regardless may adjust ~/.bashrc - or create a custom /etc/bash/bashrc.d
-drop-in - to set PROMPT_COMMMAND like so:
-
-PROMPT_COMMAND=(genfun_set_win_title)
-
-Those who would prefer for bash never to interfere with the window title may
-now opt out of the default title setting behaviour, either with the "unset -v
-PROMPT_COMMAND" command or by re-defining PROMPT_COMMAND as desired.
-EOF
-}
diff --git a/app-shells/bash/bash-5.3_beta_p20250109.ebuild b/app-shells/bash/bash-5.3_beta_p20250109.ebuild
new file mode 100644
index 000000000000..b7349ed9f90e
--- /dev/null
+++ b/app-shells/bash/bash-5.3_beta_p20250109.ebuild
@@ -0,0 +1,411 @@
+# 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/chetramey.asc
+inherit flag-o-matic toolchain-funcs prefix verify-sig
+
+# Uncomment if we have a patchset.
+#GENTOO_PATCH_DEV="sam"
+#GENTOO_PATCH_VER="${PV}"
+
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+MY_PATCHES=()
+
+# Determine the patchlevel.
+case ${PV} in
+	9999|*_alpha*|*_beta*|*_rc*)
+		# Set a negative patchlevel to indicate that it's a pre-release.
+		PLEVEL=-1
+		;;
+	*_p*)
+		PLEVEL=${PV##*_p}
+		;;
+	*)
+		PLEVEL=0
+esac
+
+# The version of readline this bash normally ships with. Note that we only use
+# the bundled copy of readline for pre-releases.
+READLINE_VER="8.3_alpha"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
+	EGIT_BRANCH=devel
+	inherit git-r3
+elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
+	# It can be useful to have snapshots in the pre-release period once
+	# the first alpha is out, as various bugs get reported and fixed from
+	# the alpha, and the next pre-release is usually quite far away.
+	#
+	# i.e. if it's worth packaging the alpha, it's worth packaging a followup.
+	BASH_COMMIT="2ea356081dbfbac2c791f9b8072ed4b824e3d9df"
+	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.gz -> ${P}-${BASH_COMMIT}.tar.gz"
+	S=${WORKDIR}/${PN}-${BASH_COMMIT}
+else
+	my_urls=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" )
+
+	# bash-5.1 -> bash51
+	my_p=${PN}$(ver_cut 1-2) my_p=${my_p/.}
+
+	for (( my_patch_idx = 1; my_patch_idx <= PLEVEL; my_patch_idx++ )); do
+		printf -v my_patch_ver %s-%03d "${my_p}" "${my_patch_idx}"
+		my_urls+=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}-patches/${my_patch_ver}" )
+		MY_PATCHES+=( "${DISTDIR}/${my_patch_ver}" )
+	done
+
+	SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
+	S=${WORKDIR}/${MY_P}
+
+	unset -v my_urls my_p my_patch_idx my_patch_ver
+fi
+
+if [[ ${GENTOO_PATCH_VER} ]]; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+if (( PLEVEL >= 0 )); 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
+IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:=
+	nls? ( virtual/libintl )
+"
+if (( PLEVEL >= 0 )); then
+	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
+RDEPEND="
+	${DEPEND}
+"
+# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011).
+BDEPEND="
+	pgo? ( dev-util/gperf )
+	verify-sig? ( sec-keys/openpgp-keys-chetramey )
+"
+
+# EAPI 8 tries to append it but it doesn't exist here.
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+PATCHES=(
+	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
+
+	# Patches to or from Chet, posted to the bug-bash mailing list.
+	"${FILESDIR}/${PN}-5.0-syslog-history-extern.patch"
+)
+
+pkg_setup() {
+	# bug #7332
+	if is-flag -malign-double; then
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+
+	if use bashlogger; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	local patch
+
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
+		default
+	else
+		if use verify-sig; then
+			verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig}
+
+			for patch in "${MY_PATCHES[@]}"; do
+				verify-sig_verify_detached "${patch}"{,.sig}
+			done
+		fi
+
+		unpack "${MY_P}.tar.gz"
+
+		if [[ ${GENTOO_PATCH_VER} ]]; then
+			unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Include official patches.
+	(( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}"
+
+	# Clean out local libs so we know we use system ones w/releases. The
+	# touch utility is invoked for the benefit of config.status.
+	if (( PLEVEL >= 0 )); then
+		rm -rf lib/{readline,termcap}/* \
+		&& touch lib/{readline,termcap}/Makefile.in \
+		&& sed -i -E 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \
+		|| die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches, bug #407985.
+	sed -i -E '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in \
+	&& touch -r . doc/* \
+	|| die
+
+	# Sometimes hangs (more noticeable w/ pgo), bug #907403.
+	rm tests/run-jobs || die
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	local -a myconf
+
+	# Upstream only test with Bison and require GNUisms like YYEOF and
+	# YYERRCODE. The former at least may be in POSIX soon:
+	# https://www.austingroupbugs.net/view.php?id=1269.
+	# configure warns on use of non-Bison but doesn't abort. The result
+	# may misbehave at runtime.
+	unset -v YACC
+
+	# wcsnwidth(), substring() issues with -Wlto-type-mismatch, reported
+	# upstream to Chet by email.
+	filter-lto
+
+	myconf=(
+		--disable-profiling
+
+		# Force linking with system curses ... the bundled termcap lib
+		# sucks bad compared to ncurses.  For the most part, ncurses
+		# is here because readline needs it.  But bash itself calls
+		# ncurses in one or two small places :(.
+		--with-curses
+
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h.
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	use nls || myconf+=( --disable-nls )
+
+	if (( PLEVEL >= 0 )); then
+		# Historically, we always used the builtin readline, but since
+		# our handling of SONAME upgrades has gotten much more stable
+		# in the PM (and the readline ebuild itself preserves the old
+		# libs during upgrades), linking against the system copy should
+		# be safe.
+		# Exact cached version here doesn't really matter as long as it
+		# is at least what's in the DEPEND up above.
+		export ac_cv_rl_version=${READLINE_VER%%_*}
+
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins; then
+		append-ldflags "-Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/bash"
+	else
+		# Disable the plugins logic by hand since bash doesn't provide
+		# a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+
+		sed -i -e '/LOCAL_LDFLAGS=/s:-rdynamic::' configure || die
+	fi
+
+	# bug #444070
+	tc-export AR
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	local -a pgo_generate_flags pgo_use_flags
+	local flag
+
+	# -fprofile-partial-training because upstream notes the test suite isn't
+	# super comprehensive.
+	# https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
+	if use pgo; then
+		pgo_generate_flags=(
+			-fprofile-update=atomic
+			-fprofile-dir="${T}"/pgo
+			-fprofile-generate="${T}"/pgo
+		)
+		pgo_use_flags=(
+			-fprofile-use="${T}"/pgo
+			-fprofile-dir="${T}"/pgo
+		)
+		if flag=$(test-flags-CC -fprofile-partial-training); then
+			pgo_generate_flags+=( "${flag}" )
+			pgo_use_flags+=( "${flag}" )
+		fi
+	fi
+
+	emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}"
+	use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" all others
+
+	# Build Bash and run its tests to generate profiles.
+	if (( ${#pgo_generate_flags[@]} )); then
+		# Used in test suite.
+		unset -v A
+
+		emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" -k check
+
+		if tc-is-clang; then
+			llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die
+		fi
+
+		# Rebuild Bash using the profiling data we just generated.
+		emake clean
+		emake CFLAGS="${CFLAGS} ${pgo_use_flags[*]}"
+		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags[*]}" all others
+	fi
+}
+
+src_test() {
+	# Used in test suite.
+	unset -v A
+
+	default
+}
+
+src_install() {
+	local d f
+
+	default
+
+	my_prefixify() {
+		while read -r; do
+			if [[ $REPLY == *$1* ]]; then
+				REPLY=${REPLY/"/etc/"/"${EPREFIX}/etc/"}
+			fi
+			printf '%s\n' "${REPLY}" || ! break
+		done < "$2" || die
+	}
+
+	dodir /bin
+	mv -- "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	my_prefixify bashrc.d "${FILESDIR}"/bashrc-r1 | newins - bashrc
+
+	insinto /etc/bash/bashrc.d
+	my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color.bash | newins - 10-gentoo-color.bash
+	newins "${FILESDIR}"/bashrc.d/10-gentoo-title-r1.bash 10-gentoo-title.bash
+	if [[ ! ${EPREFIX} ]]; then
+		doins "${FILESDIR}"/bashrc.d/15-gentoo-bashrc-check.bash
+	fi
+
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc}; do
+		newins "${FILESDIR}/dot-${f}" ".${f}"
+	done
+
+	if use plugins; then
+		exeinto "/usr/$(get_libdir)/bash"
+		set -- examples/loadables/*.o
+		doexe "${@%.o}"
+
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples; then
+		for d in examples/{functions,misc,scripts,startup-files}; do
+			exeinto "/usr/share/doc/${PF}/${d}"
+			docinto "${d}"
+			for f in "${d}"/*; do
+				if [[ ${f##*/} != @(PERMISSION|*README) ]]; then
+					doexe "${f}"
+				else
+					dodoc "${f}"
+				fi
+			done
+		done
+	fi
+
+	# Install bash_builtins.1 and rbash.1.
+	emake -C doc DESTDIR="${D}" install_builtins
+	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
+	doman "${T}"/rbash.1
+
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]]; then
+		mkdir -p -- "${EROOT}"/etc/bash \
+		&& mv -f -- "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ \
+		|| die
+	fi
+}
+
+pkg_postinst() {
+	local old_ver
+
+	# If /bin/sh does not exist, provide it.
+	if [[ ! -e ${EROOT}/bin/sh ]]; then
+		ln -sf -- bash "${EROOT}"/bin/sh || die
+	fi
+
+	read -r old_ver <<<"${REPLACING_VERSIONS}"
+	if [[ ! $old_ver ]]; then
+		:
+	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r8"; then
+		return
+	fi
+
+	while read -r; do ewarn "${REPLY}"; done <<'EOF'
+Files under /etc/bash/bashrc.d must now have a suffix of .sh or .bash.
+
+Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the
+characteristics of the operating environment, it may contain a command to set
+the terminal's window title. Those who were already choosing to customise the
+PROMPT_COMMAND variable are now advised to append their commands like so:
+
+PROMPT_COMMAND+=('custom command goes here')
+
+Gentoo no longer defaults to having bash set the window title in the case
+that the terminal is controlled by sshd(8), unless screen is launched on the
+remote side or the terminal reliably supports saving and restoring the title
+(as alacritty, foot and tmux do). Those wanting for the title to be set
+regardless may adjust ~/.bashrc - or create a custom /etc/bash/bashrc.d
+drop-in - to set PROMPT_COMMMAND like so:
+
+PROMPT_COMMAND=(genfun_set_win_title)
+
+Those who would prefer for bash never to interfere with the window title may
+now opt out of the default title setting behaviour, either with the "unset -v
+PROMPT_COMMAND" command or by re-defining PROMPT_COMMAND as desired.
+EOF
+}
diff --git a/app-shells/bash/files/bash-5.2_p21-configure-strtold.patch b/app-shells/bash/files/bash-5.2_p21-configure-strtold.patch
deleted file mode 100644
index 51e9a19daebb..000000000000
--- a/app-shells/bash/files/bash-5.2_p21-configure-strtold.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://src.fedoraproject.org/rpms/bash/blob/bd5ac20b134f2936c54245fc83a8e70207d3e07e/f/bash-configure-c99-2.patch
-
-Another C compatibility issue: char ** and char * are distinct types,
-and strtold expects the former for its second argument.
-
-Submitted upstream:
-
-  <https://lists.gnu.org/archive/html/bug-bash/2023-11/msg00104.html>
-
---- configure.ac
-+++ configure.ac
-@@ -885,7 +885,7 @@ AC_CHECK_DECLS([strtold], [
- 	[AC_COMPILE_IFELSE(
- 		[AC_LANG_PROGRAM(
- 		[[#include <stdlib.h>]],
--		[[long double r; char *foo, bar; r = strtold(foo, &bar);]]
-+		[[long double r; char *foo, *bar; r = strtold(foo, &bar);]]
- 	)],
- 	[bash_cv_strtold_broken=no],[bash_cv_strtold_broken=yes])
-         ]
-
---- configure
-+++ configure
-@@ -15676,7 +15676,7 @@ else $as_nop
- int
- main (void)
- {
--long double r; char *foo, bar; r = strtold(foo, &bar);
-+long double r; char *foo, *bar; r = strtold(foo, &bar);
- 
-   ;
-   return 0;
diff --git a/app-shells/bashdb/Manifest b/app-shells/bashdb/Manifest
index 591e254211b6..0e3336423438 100644
--- a/app-shells/bashdb/Manifest
+++ b/app-shells/bashdb/Manifest
@@ -1,2 +1,3 @@
 DIST bashdb-4.4-1.0.0-missing-test-files.tar.xz 996 BLAKE2B 7ea67884cceda11559cf49355645cad2cfd485537643ad2fa05398518f498163596b6f591756bedd0e7b7e013fed3c6a031e245d15cd0cf316d42ef4f5c8b3e6 SHA512 e19d41569c2001ce026e4c5f80cc21c81651ff9980be059236c45e215162769ceda266eb46aa4199000e377c0bb53dec98fa1b7c5290459c412f21329b3589a5
 DIST bashdb-5.0-1.1.2.tar.bz2 574210 BLAKE2B 6de1cac2cb66022f60ab7f0385361762fedee56c26729f22acb070e24a7bcf317700fb5db314c1592b8f9ccf9f7d07bfc80afd5fc88a753d0ad2954325a7f078 SHA512 32ff6d315e8cf9d59485802d5284fde53fa2d9f40ec238428a479f8a1ed1359e9bea2946b192b78534e7ac835491d5d64d73f536c8dfa93583b4c6d55d4d4545
+DIST bashdb-5.1_pre20240617.gh.tar.gz 690536 BLAKE2B b8c736ea16f90c14ebcbe06ae6dcdcc8187161e94ca5672f9078366161afec77bd54e95f0782ec4204f6997b173844f288d9cd39a03539e83447fcdc33cc6545 SHA512 748de6d3a7a30ce59269ec953f3d2ee71d50a92038001f3a74ef758225d77de6db906945936a20439869442ac995001ef26c394050d6e73f5a1c288022faaaec
diff --git a/app-shells/bashdb/bashdb-5.0.1.1.2-r1.ebuild b/app-shells/bashdb/bashdb-5.0.1.1.2-r1.ebuild
new file mode 100644
index 000000000000..f4018c58806a
--- /dev/null
+++ b/app-shells/bashdb/bashdb-5.0.1.1.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-${PV:0:3}-${PV:4}"
+DESCRIPTION="bash source code debugging"
+HOMEPAGE="http://bashdb.sourceforge.net/"
+SRC_URI="
+	https://downloads.sourceforge.net/bashdb/${MY_P}.tar.bz2
+	test? ( mirror://gentoo/30/bashdb-4.4-1.0.0-missing-test-files.tar.xz )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-shells/bash:${PV:0:3}"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if use test ; then
+		einfo "Copying missing files ..."
+		# https://sourceforge.net/p/bashdb/bugs/52/
+		cp -vafn "${WORKDIR}"/missing-files/* "${S}"/test || die
+	fi
+
+	default
+
+	# We don't install this, so don't bother building it. #468044
+	sed -i 's:texi2html:true:' doc/Makefile.in || die
+}
+
+src_configure() {
+	# This path matches the bash sources.  If we ever change bash,
+	# we'll probably have to change this to match (bug #591994).
+	CONFIG_SHELL="${BROOT}"/bin/bash econf \
+		--with-bash="${EPREFIX}"/bin/bash-${PV:0:3} \
+		--with-dbg-main='$(PKGDATADIR)/bashdb-main.inc'
+}
diff --git a/app-shells/bashdb/bashdb-5.0.1.1.2.ebuild b/app-shells/bashdb/bashdb-5.0.1.1.2.ebuild
deleted file mode 100644
index d73f4c54fbbd..000000000000
--- a/app-shells/bashdb/bashdb-5.0.1.1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-${PV:0:3}-${PV:4}"
-DESCRIPTION="bash source code debugging"
-HOMEPAGE="http://bashdb.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/bashdb/${MY_P}.tar.bz2
-	test? ( mirror://gentoo/30/bashdb-4.4-1.0.0-missing-test-files.tar.xz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=app-shells/bash-5
-	!>=app-shells/bash-${PV:0:1}.$((${PV:2:1}+1))"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if use test ; then
-		einfo "Copying missing files ..."
-		# https://sourceforge.net/p/bashdb/bugs/52/
-		cp -vafn "${WORKDIR}"/missing-files/* "${S}"/test || die
-	fi
-
-	default
-
-	# We don't install this, so don't bother building it. #468044
-	sed -i 's:texi2html:true:' doc/Makefile.in || die
-}
-
-src_configure() {
-	# This path matches the bash sources.  If we ever change bash,
-	# we'll probably have to change this to match.  #591994
-	econf --with-dbg-main='$(PKGDATADIR)/bashdb-main.inc'
-}
diff --git a/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild b/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild
new file mode 100644
index 000000000000..299fe8ca9828
--- /dev/null
+++ b/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Set to 1 for older versions of bash (that are hence slotted)
+SLOTTED_BASH=1
+
+if [[ ${SLOTTED_BASH} == 1 ]] ; then
+	MANGLED_PV="${PV:0:3}"
+else
+	MANGLED_PV="0"
+fi
+MY_P="${PN}-${PV:0:3}-${PV:4}"
+DESCRIPTION="bash source code debugging"
+HOMEPAGE="http://bashdb.sourceforge.net/"
+
+if [[ ${PV} == *_pre* ]] ; then
+	inherit autotools
+
+	# bashdb for newer bash versions doesn't (yet?) have tags, so we
+	# take snapshots. Make sure to pick the right branch.
+	BASHDB_COMMIT="11150b3bee22215632143942ade99b5f2441c4ca"
+	SRC_URI="
+		https://github.com/Trepan-Debuggers/bashdb/archive/${BASHDB_COMMIT}.tar.gz -> ${P}.gh.tar.gz
+	"
+	S="${WORKDIR}"/${PN}-${BASHDB_COMMIT}
+else
+	SRC_URI="
+		https://downloads.sourceforge.net/bashdb/${MY_P}.tar.bz2
+	"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND=">=app-shells/bash-${MANGLED_PV}:${MANGLED_PV}"
+RDEPEND="${DEPEND}"
+
+# test-bug-loc fails with formatting differences
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *_pre* ]] && eautoreconf
+
+	# We don't install this, so don't bother building it. #468044
+	sed -i 's:texi2html:true:' doc/Makefile.in || die
+}
+
+src_configure() {
+	local bash_suffix
+	if [[ ${SLOTTED_BASH} == 1 ]] ; then
+		bash_suffix="-${MANGLED_PV}"
+	fi
+
+	# This path matches the bash sources.  If we ever change bash,
+	# we'll probably have to change this to match (bug #591994).
+	CONFIG_SHELL="${BROOT}"/bin/bash econf \
+		--with-bash="${EPREFIX}"/bin/bash${bash_suffix} \
+		--with-dbg-main='$(PKGDATADIR)/bashdb-main.inc'
+}
diff --git a/app-shells/bashdb/metadata.xml b/app-shells/bashdb/metadata.xml
index c410fc64f546..97949e8bc810 100644
--- a/app-shells/bashdb/metadata.xml
+++ b/app-shells/bashdb/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">bashdb</remote-id>
+		<remote-id type="github">Trepan-Debuggers/bashdb</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-shells/dash/dash-0.5.12-r1.ebuild b/app-shells/dash/dash-0.5.12-r1.ebuild
index 7695ee2933c2..2cab5275b769 100644
--- a/app-shells/dash/dash-0.5.12-r1.ebuild
+++ b/app-shells/dash/dash-0.5.12-r1.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 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="BSD"
diff --git a/app-shells/nushell/Manifest b/app-shells/nushell/Manifest
index b264294b3373..2c85cebd612b 100644
--- a/app-shells/nushell/Manifest
+++ b/app-shells/nushell/Manifest
@@ -1,1047 +1,6 @@
-DIST addr2line-0.22.0.crate 39156 BLAKE2B 3fbb55f6cacbb177d06359bcd39885247a9eeef96d95ffac0dfd1d45ed394dcd1e9e069c02c71a9ffca0b69e3a974e4d96bc3385470ee39c87d7a30ea7914303 SHA512 b334f51bd369348b4446805b4f624ec9b4cc8eefcc53ceb57b523ff55bf018d1dfe23259daf48d1878170ad4fcb44181d4738456eb5e35ede6932ff29686268e
-DIST addr2line-0.24.2.crate 39015 BLAKE2B 57186d6b957542cd71a0aa19f1355dfaabe6efa19b853c42f306494728b03d1e3183efdb2d2c7734a3e2347cd83a985d004f50c097e06b7520bd152310532e9b SHA512 39cbec3c920ffc0f37584afb55e1cfe4f182e4415319a4e9bfe842360f102f7b9315f6171c0cf71ba0337123903e604096cd573fe98698a26c8eebc2376d965b
-DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
-DIST adler2-2.0.0.crate 13529 BLAKE2B ec575b0bf12e321399ac3a1d59fce4ddbeabcc60cb3d7c2f362cce23eb29b4ea836451372d6d88552a4435ae29bb41d6230d55f625a4359eace680b9b771d0ad SHA512 12d12579ad617cf1a94cf95ab9d3f5db566c3b2de4bd5735eccd83c668fdad0eff134c996b73c46cbb9f932837682043878b8cc4764191625e9f93ccffcce423
-DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
-DIST ahash-0.7.8.crate 38550 BLAKE2B 0fd5f220c15bc0a1aa2e95d13477bcc832d992c6406f9da0994ae32419e440a6f7ef84c1a7a1242d5904dca5d91206602d943ca81b444f46d2eb91d55844baea SHA512 63677b2001d633ecabb36c08bd92e00b5fa71f24aed1c4601d12d846ea06aeaf093c37cfe1f6642147800caa6c749e9a202aa21f9ab4799efa379ad0d952a2ee
-DIST ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d
-DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
-DIST alloc-no-stdlib-2.0.4.crate 10105 BLAKE2B afa0bfeb7df1d742edb412dca4c22957fc21c2a1be21c64c58503d4b943c06e3163d0f3c90525b25323b8dc38e6c64136ec4f9608758c5c6f3bd07c2c033ee74 SHA512 6518856fa524ee0fe8e04cf133c11028efcf2f6a28f3a70e401566a4eb343c954dba34aec2a02c0d0359757dfb5dcf48279610646215eea190d699708d838904
-DIST alloc-stdlib-0.2.2.crate 6693 BLAKE2B a22faf3482e416664f2e104f5f45c4e6d116a42b890216b80102e266f7a3a3accd2933aeca71650a4c4626e3d9da76b6488ffc9ea2ae4229cdfbf1ce9ca6c7cf SHA512 9c4169052ad460af2be6f2a128056661b2f26da0122877f13fcd4f4f3e2e9537783cb2b2bec47af43569629639aa8ad507ab010833982e5d942f5b26cfd46c14
-DIST alloca-0.4.0.crate 4257 BLAKE2B 25626c5d57cd93c84cf601d1f57f977370c686860cb69379758800655ca4a1cd6fc4d183ab24610bd7e1155b73ca110681da7192534b29de4b70f4f90b4f680b SHA512 337191b32f84d3fa673d242a043df51717134ff22ef0d29d6122382a889b6a41d167d45f7136eccaa35fbb7e30207a481e8802faf2781bdf250d6a99973bbc0e
-DIST allocator-api2-0.2.18.crate 62504 BLAKE2B 8152c5a611be91ba23b1e8647511e21f48e7d4f1a7b9a828083f5bb8747cdc92aee66f73251b19195bbdc1f65aad992632e820d86cbeff287d598257ae3628a6 SHA512 5e5b0e23e1f5b259e5d3746e3e05817af8dee95af7105ea775a5c1d69b4e537a4d6a25e2c1d46ab83e2385217b158f7940dc1315ae581c35ee23289647105e73
-DIST allocator-api2-0.2.21.crate 63622 BLAKE2B 983897fc977118f220dc4af7e801ac08eba77bfde2a25d756bad3e77f849418e74e7c67eaed68e2d719ca7fc6e1e9ce151dd7dbe8707dc43d4a6400294c8fc8e SHA512 1bb5711ed6041b0d7eae2ec784b8aa9d215db0f49cf79c692946eeb0db545d358cbcaa8156ae34e51d05287c08574f1da251ee574f2392949e4ed26d04770d03
-DIST alphanumeric-sort-1.5.3.crate 6318 BLAKE2B b2b489205bda0e792c5fbaf3256012a66b1d8ae548ff2780ebe6d9136d6c989c8223f186f90618d40633e7a0cfd957b4fa7df00e0ea8f7b5cda8e3eb73ce2321 SHA512 a315ce41906e1e3d90ac1ce8bf8fe35fbe24388d861ff84b85c89a40b0e45f26fbebc07a43b871c6f6e117a7b17e5d5e9c7fa5e2c1dc0fe7d069a2576ec0c1b3
-DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
-DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
-DIST ansi-str-0.8.0.crate 19427 BLAKE2B 29ca9a477f981e1904ac5857749810c1ac17f7e590bd77694b7f479e2fb250ff6feb5ea264736695e0ba4c7dd79871420ea8748dfdbabe1b1ba51edff4e83f8b SHA512 e76b39e757f6b2244e087a214b8646f8110ae6ed537b083f05d978616c063d207c8e50c38212283b27a5959e956eb4187c5679c72326fc5ee6f64f4bee06325d
-DIST ansitok-0.2.0.crate 18021 BLAKE2B 2058e46f13be980908e3f31b9b6665a65714f786042c7230874c2cd2b9825e919e3a66c10cb7a500fbec0f97e4be85669df9a91e6cbec82e19a518866baa7156 SHA512 7619a51777ee642d3f96f8e47cce96f677085d57600875893779a12affd92915d6db9dd767814f6fab81713200d371d0579ba16cd004d3d5238ed067e5e77c19
-DIST anstream-0.6.15.crate 29231 BLAKE2B cc4cf0f381c210fecc20b5796fe872b533419e5f957021b0c3be3cdc23fb84ce029fbef6f9b6f174a76ad713c07f0811145a70572de7c24cfab060fdd990f49a SHA512 1cb01a0293b4c9bcc010909707e71c464416d3ec6fc9789060b7aa9fe4cc04424fefa8013cc8765ccdae6dfd9a1c50a11f7b30b39a32c4aeaf525f28167ddb92
-DIST anstream-0.6.18.crate 29681 BLAKE2B b6f72cda084b38f1e1cfe60de2562e8d62ebbc352176bdf668a2d6be09349bec46d291cd475e8af814ce66def44d95cb98c325761150130752284a82d8a84f21 SHA512 5149977d6f7b5e9cf6350f1ef130caa3ff46c7e78976358452a185ce196cdd77fee48a3a9838f434ae6ea9c15b19f6bfbab156edf819f81179d6774318f08963
-DIST anstyle-1.0.10.crate 15725 BLAKE2B 36e656bd8f9c584f11fda5cfe0c2e24e8426b9e1b602aad34ed118ae6950a55440e292d2e0ff7615f5e4f466fd06f07536be198a59506a587d40cb0c4ede4f80 SHA512 621e7a89fad13db985f07375d316cf8efba57fd44ae18628a8049a65aefbaef27949f99317872e91e0922bb089a00234055199ea3167f80ae03d00ada4f75dea
-DIST anstyle-1.0.8.crate 15771 BLAKE2B c039613e7de27cc990e5764810f9351754b160928a8954dc19041354cf9fef1422ed964237a5d39d16e4e9f8592ed52c523ccf36b0b5506f464d4f818f3332ff SHA512 3b867f73df0b2f69a0c7d5d6e62c7515045e053656afaa303e5aade8012e838cdf5d15d2c3d7c297db9e297d08ea69a9c8eed04b97922a83f56c58962c1c0b69
-DIST anstyle-parse-0.2.5.crate 22680 BLAKE2B 7473651b1eee08857a6ed1419d3d62ba4b9a9aa0d6657965ad9c67bddd793d825737d3804961716a89bdebed9879ac43b42c897cd229c6e7bd780859e1e3c247 SHA512 cd94ad0e88ad4547a660da1473bf4e6dfed805a066782124204143c7f754c12db719bd3a1774c299f1a035740bfc4830919da191bd14e0acede410f6dbd1e2ef
-DIST anstyle-parse-0.2.6.crate 22343 BLAKE2B 85eba405dc5cf806283cf442984e86583dfe6c681f849eb7a347b7b67bd2b6f692e84fc9b5bd86486633cb2f05960ec16e8778300df114ae6676da43442db9bb SHA512 e28c9818afcda0e9b84c205d9c6697ce64cb06c21df2c3666869c07d66893105d9c5e96a27fcf2410a09f6af00735252e22b5c7d8c6cb3f68c4a8f376c49d396
-DIST anstyle-query-1.1.1.crate 9891 BLAKE2B c298114c1864a5233fb39c365e079a7f1f4ef23499dc330e5deb06f83f27bc727015befef79075c7e39952547f799b4135d7db287cf72dfc914191df784a4989 SHA512 1b2e888f025142a0d9b01314cf083831a2a45d8da737c1be3a6a9aa177e73e0d2ae7999fe7610dd450b7096115e8cf38c5da23723cebf1deaa7d3501d3dbd5ce
-DIST anstyle-query-1.1.2.crate 9969 BLAKE2B 179b8dd6dd709c2ca67f4eb5c9a502b2867cb6744a39f824c4fdebedc67c6c3e07d107c7d817e2ffb589d13b7ed4900cf9653ddc0a43663217042ee92ce8c9da SHA512 26069d936c4b1fb09bc65cda0253fe9be8fa4e96c0821f980c772602b4e9230035ec8c9d092ef95e0a0354ac559f8d25f57a14c34086d4d241b5fba688951837
-DIST anstyle-wincon-3.0.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c57b22b57e32a5c75847f2e2bd68a52b33c24797db662aa5fd7e799b9644075c8c939d93b0cf8598b16ee80fc817b77f SHA512 24b3a9a44382609ad449425a657d4b42a792d4703c36e0953f09a03817759c266a2f0ff4ecc9e8b93ea8403df2badef1f1af6a6e50af56205176c41b13501ae6
-DIST anstyle-wincon-3.0.6.crate 12271 BLAKE2B d9f4d9d46fa93a1168ca340562681718be852ffa94e30c9ea208af53af9d6697ca84921837a325ddc36681caab2b866b7f574901c80b5c0d862dcb765b81b68b SHA512 59ec6f5a53bd68b6344d82e923eb8c45ddac481dd0d270a7b452dc5b0540ee1656705697c1508942ecc131e7c075248c85d8f4159f27d97ea94f22469ce2eeb5
-DIST anyhow-1.0.86.crate 46741 BLAKE2B 21b1f3acd1c1b659e6e9a53693178de67c806d7dbad30dedea0fb7078b2388baa196d1e7240a7dc88ed9dc93ee4c00bca8e608dad1b6bfb5bfa4f4c5ab51f0d3 SHA512 3853da32a2c53d73969bb29a1e622f3a6d5832d8888dc6bc8eedb76394b392f983aa3fcb1f542933e238841486106f0f38e9a2400c12c7699baba0ebe1d8193a
-DIST anyhow-1.0.94.crate 51731 BLAKE2B 2b8b7ed7506f31a434ff8af198256816bb196f3434925ad688820237893b54b14f3731d34a3968277f532a3b67c39e3c4aaffef43b42b13bb1c6d3cae50e9ae8 SHA512 61209bb1a81104ea86375bff12e6654047a596fd5282fdaa590301c4bcdafcdd8bc83201811063d565bbfab6be42544e43047ec88d2b0b41f7c5f2712f3a3b90
-DIST arbitrary-1.4.1.crate 36816 BLAKE2B 86adbf1a2522e972bf4a7fc26e4d88ec45298dc2ce716a1fe30cd49bebf4d5a65af1f097f83be6ee8c554d4b392657efd32ffa1cb35704585a9816b6e234c067 SHA512 a3507aa0ab684464c3559376beabc0992bbb589ddc85d2426b26238d7c5d1d856df5d9226603fe7ad2b17ac6570d62e86ba4f5a2e65f3cbc9ad52bbe294f8123
-DIST arboard-3.4.0.crate 46785 BLAKE2B e866343f8d7d40ece483dac28600d931d76b0c138772c0f39e9a9eb65fecb72f24e3898f0af3082d8a71162950c905c23a55ad21bb112e8de923d5d4cadb6fbe SHA512 1950b99a90f6b7447aec97d395b221bc0a68613df87087aa3f9c59a2d97a38be24270f4c10bbbd98407eb66508055203f9988984a90e739305049653324e0576
-DIST arboard-3.4.1.crate 47070 BLAKE2B 9c034437b52be62b89e1d73ada43d2d1e6a635efa908dd935344cc582bdcb92f2ab196c40c82869e514bd7cff5b76bd452caefd4dee68f4c4160260c06e79ae5 SHA512 47021c793d3101ffa211d081fa4c63ce7bbd8a2f803ed0a8312bc9bc9ed4d8afb898c7333c79b6f667206b3a58899564d8d4044a8945a5dffedc5045d968211a
-DIST argminmax-0.6.2.crate 55956 BLAKE2B fdcc12c4d48db8d2b888cc28180eed87c8695fb442d74fc8c7f72bfb97296d9af5667d9dfa2354ebd1bd981f82a9981b6a9bdc4fbb60c17336e1803d6a7869b3 SHA512 479b16ab706a4d905207e923c3fdb232d429756ccfc0f60355a764a75b1e0fc42c8f1b473e22b2e5b8ef2ce793ee1ac61004a401a4ba520b124c0a86af9e4934
-DIST array-init-cursor-0.2.0.crate 2590 BLAKE2B 18edba438963c13054dd29878754de1b0c46d7a6d2e666d535cac9b2ff90997e7c593c0c63f38ffa5de1edb1b6c54ee918719d82a4953f317fe30d8ba7854174 SHA512 f4698cbf9ab3011ef8a0f9fc29d9d58d2572df0db336ad4ee6e72dec0bf4be89d06e2693d7037082788b6d120cb2ad5f1223932c185e25258a1594c60d429eba
-DIST arrayref-0.3.9.crate 9186 BLAKE2B 8d7443944c81bf849fbb8a4e09ee379134c173decc712c6fafe483fb1545fba1f7f735979e5e26976502284502b5c7046f0b6aad59f8731a4ac8e1a51929c979 SHA512 f97e33e7fd65a8e908c21ab918350f71f12d49783162b90c5618660217b36516c39750b292a1248125f12429e4e00af9ff20c3846be81175946b8541d96ee606
-DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
-DIST arrayvec-0.7.6.crate 31237 BLAKE2B b9d1df7e3ec47d434a2606fe9540e37e02351873b376a4e113b54461288e9ab20e02285eed5c4bc0f052ec4d6b3c804044413490ea706c31a852624b03bde7bb SHA512 b1f320746018a7f32340a833420089446ec5cefb7f299b4506eab7423d5db49f00b72d8aa8c6600f9159b9480d5eb3ce69407d93f5c9934147860c83e4d6eca8
-DIST assert-json-diff-2.0.2.crate 10874 BLAKE2B 41ad996270b425f6dfec41bbf538e6e235fede9bd65a1c54908013e0a2eea8a5fcbb692842dd62f02cc94c6f907ba41cb14c0ef6ce793cedc441753d5d179634 SHA512 73aaf6411a552b24ab69d2f13e1c5880a96f84cb1b62dcf67a15f4889f80947c085826e4ed2fffd5cc28351842538d0de91ede45397d349099602c4719f559e8
-DIST assert_cmd-2.0.16.crate 26554 BLAKE2B fc803af7ca45de94e120c560efb7e1e39ecb706738d292695680f9fe14b2d570f7214dcda37122dbc1227228ba265c6dac7d7afa4fb22178c38b015bc8745828 SHA512 0b9167282d75169b0b1fad0b1401b42884185976ae0dd690851671aedbc1a9af26dd33f3047400eb4a1b5070216acc293aade149aded7e4f86dd5c0ef0e9a6a9
-DIST async-stream-0.3.5.crate 11916 BLAKE2B d79804d7310d1f47d7848007518e0b0e0f0724f2589a20478eda3ab1a1db8775c5aea494688c69437046accd10eaec789b244451e84a19e489f071519b50d2fa SHA512 d34ab46a9e18bdf35fe0e58808fadf422dd50246cedf48110b3273be17939678d2cb5b61fae9da176bc2c2b373933821e912fc395627f7a6fed1d2c43bc66c9d
-DIST async-stream-0.3.6.crate 13823 BLAKE2B 122da4244c16c1e3e4c4f3e1a72dc8896e0205f40149c8c1a0016ba0823680e2461dc4adfa89dea912c2dbe7948b0ca3726afa84c630669210c1c98106a62f57 SHA512 6b0a6065b385f2f2de56bee2647c664c6f1168f061f59847a85df19d684a92b1585a37ab7f59c36a30a31d8252a13c3921794d93c4b5eae0e199bf4fda46732f
-DIST async-stream-impl-0.3.5.crate 4173 BLAKE2B e7c0d2371299af6fe9983adf4f8cbb6402ceaa5f9d286f124362332a4016404069c362176dd3b71061027b0768ac1f772b3e5e38809b870411f4590126a74ca6 SHA512 3725216119cf4cc78d433e2f8a8df9bfb7a3f046e4a8346bbe76e91b23686dfcbdb7cd182765e12d606ed0e3391477c43652a025597de9120170fd0b1151d204
-DIST async-stream-impl-0.3.6.crate 4312 BLAKE2B ca2b41ff4279ee86db08f6e9954a80587a90e9aa6cdb7292e7e889141d2c0c3df8634b83ee5d15a0b2148294c0e5076a800cbc7986075464b8a5a6175f09dc45 SHA512 c4242f477da405d6b4ecf397a2f1b29cf71968670ac204e2c8a4206a95e7cbdd4525ddd3990d7d135bf1f985c7aeefe2532d066b8a36b1f951e8ef01f974e54c
-DIST async-trait-0.1.81.crate 28896 BLAKE2B 154e6b8da082193832bca7bbc097eb5ee25ed8365d1cb8dedf27f62fbffc710cfbfd0094a200a10399e942014083b74f521dae01cc4601e0f6b9d7364761fce0 SHA512 1fabbaa813ba320012c0bad54d27232eebca4d3fff1cc5ed771df9f90d9e9bfaca4f7b018358dc599fd30c5974d00b34ffc05ce6e9151a57ba572543bff83fd0
-DIST async-trait-0.1.83.crate 29054 BLAKE2B 4991f79abd8b9260b9541e754c30d3e0731ff786fcf65cc3f3eb75a5fcedcb37be147222778e1a0fa6c68d8fb872144b2b55b43cf6f8f4de371f24175cef405d SHA512 15969eafbdbe51e80433b53196962293daed2a70d3d9bac91c58e5e7359f60fc99ef519ceb1fd54e34d627c94f821329474a602f25f85179318d10c3147b5649
-DIST atoi-2.0.0.crate 7785 BLAKE2B 406b5d14541bbd1428171874c549cfbfa1b80b8317a03b1b0e2795da7d2d54e94b30fbac05fcced9b1ecdb6e15709985cf84490af9e57fc16697bd581fe48554 SHA512 089959e903a17c5550f90fa1be67fb937120f693a924800d4443c49caee6516f2537c57b29ecd9136020d7644281457f75654315e9c5a211b2e4b57e77076024
-DIST atoi_simd-0.15.6.crate 22341 BLAKE2B 66b1a626823998c7fbd2b0501d0aa302378b208f9577f8f3981c7218663dd91d3491e767967a5e58255940c7bc80b5cdc048abe23791b8f29a1e9ecdf4080774 SHA512 633d318de71f43b3ef9a5cb1593214949ccd99ca858e508aa2ef59fe5df23d4b37d4b49b003d5eeff139e05ccaf9b513e79247c7f94c2313f960d54770d349f0
-DIST atomic-waker-1.1.2.crate 12422 BLAKE2B fc6632f3c9d719b1d24a1c8e05947d94028909d1c629b80576e176e567636dd4cca699c7e91cae2df63541da574146b3ce766374e93f0ee429bb5bc89a4d3cae SHA512 e07e58db7955791259d0ec00fc4d53318aefb4506e062914819c4220c6dc75fa11a7af0289b4653aa1f9041eb975a025635190de68b4800a0e91e33cdb0ba11c
-DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
-DIST autocfg-1.4.0.crate 17712 BLAKE2B 7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6 SHA512 3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c
-DIST avro-schema-0.3.0.crate 19318 BLAKE2B 3b0e19d37ed3351ee19e61398f5b3ac6021aa7f0d9804d488800a831cffddca8aa158ec7801c5dd507fc4bc0b29315a14393ced88a889946d58e2859c72835a1 SHA512 b5e80204d0910b67ec4706a96b138f5ac21865a1422c5deb1c6d1c537416fb04459e4979dc90de91e8014462fe857dabc57a46358afe114cf7c0d776e48352f3
-DIST backtrace-0.3.73.crate 87617 BLAKE2B 585eebbb44671dfb3ff088092f62c7b25118ffc34e148b9b6ac67707923254ea43056861e2658c5fac7b9ed16fa56c30e7734e976fc3178f1fc03912d1d44c40 SHA512 dacedfd32cb91fe408e4f395441baf09c0a4b3bc4ba8f79d088359455cc903c93d24969567c7c5b2feb806433ffbb63a526d73f53caa4bee9c51961b61f831d9
-DIST backtrace-0.3.74.crate 88516 BLAKE2B 594b537f3860560bc790d04d72a91ea25bbf5f2494b9c43377129a8021c02d9c16471a223e518889775a816c45513b14bf097c453846b62302a58b59753a5fcb SHA512 00cb2be0626f0bf6ec8b8f525bb129d3ac74c386c5e46ee0f343edb78c863222521f8132876057a5a1facacf40792dea51f2f20e986b35f3a85bca3dcf5c1520
-DIST backtrace-ext-0.2.1.crate 11401 BLAKE2B fcb46f96043ce67b65b8eafdcbad380af376fed730dda81193f3f0024f13caf596f7192c34b6b333d0bd12a5918bfa6b551281d13f8a4c9dc51e3850068577cb SHA512 717f43b1912a4f038b58b585683160fe33dc6117a7c65b02dad6996c359e245536c3c0784719e1781b8dba515e8fe756e810a379cddb796634845dce0b704931
-DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9
-DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9763070e269b56a14b150cbfc4b7f599d4c2a0a5f783638170ee132f0796fefb14fcac7fd73c58db0791007a SHA512 91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20
-DIST bindgen-0.69.4.crate 221092 BLAKE2B 69ed55a5827bfe850f589e39bc6e2f4445e20363002c765c5475007b75e4d81cac3d9df358505c63bd6a48300ae4988507abf78dd734bb98b33525bf9212237b SHA512 99530060708690f2ce0b87b97c9ce2998ee968df193137f3c9bf4fa66836814e2ae74c7e0b3057dcff1da7d2c4ea38157e21143c5117be35e94b878c0a427a34
-DIST bindgen-0.70.1.crate 226363 BLAKE2B 4c5b9d70d0aa95ec3dc4cc956b3b101043132054ef47017f1e7b51072dec1ad87885caaaa91ce5353f88332a6412c0377cf9490822357e78b5124ae9b3e9a6e5 SHA512 cf1c87ea7ab9ed4df953795f1aa77e6ae6d72e768de3b517300074501ce49db6a3def1f58b9d824b5727974cab84a48461e7d98086fc440dc73ad9cf173ad5ed
-DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
-DIST bit-set-0.8.0.crate 16289 BLAKE2B b27bd0a273d7e45e2fbdf46d4c5df4d82f710071cee82b19e95204cecfb13dda26aa346696f489a52f66347e7123a67cd0d05f7c2a4d7164d671f712fba1b9da SHA512 eb06e6b9285f33fb0dca69ce189838138f679e97e72538d09923e29348cb25ff1043cf4ef4ef4b74644de9a601859159d9d9d74354def92eb10b86e6067047fa
-DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
-DIST bit-vec-0.8.0.crate 24132 BLAKE2B e9bb9e1b7aba90337e546e9cf6aced966ddea82e825c76c34806604746b774ab03b19756a24084f6df35bb64c21600ba4cd1c477196b34dfe4bf56efa6e4a23d SHA512 20d55f09994bff368381d2da5e0aa4ec3d336361d0e0111d72d147fa0e44cdafe3df62c3dc30d42d745dbf42dfc0b75037f046e5335085f3fb88f586e52fa571
-DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf
-DIST bitvec-1.0.1.crate 224375 BLAKE2B 9f109db6888cf73d69646911cc1c9e90535e54a7afc436d878bbc63ca20a30cc6e5b5b5cd42aa78c38df5a4012454769c126f9072f39d58bdd09e54887ba6d9f SHA512 83d643c5aca020ebbe9094b5aaba6a796e7c3c509228a4348444e57a06bc3a5dd042eed57a2254d91661e73bdab2bc0d1bd02be376906acc6b6d75b5354a8d8e
-DIST blake3-1.5.5.crate 181134 BLAKE2B 0195efa92e121dfa22abf56e72daef664f00c36eac9839543a4ea27351be6393d2edae6cfa2f9442a7b6e268bd2fbc76ea718d5d939940097b0e0f9e0c29405c SHA512 93dcfbb3e1236534beaeeedfde2aac7a13c83bdf9f0e85352e8920706df41fbf042fcfafd3726f2a23450d4ac77caa3fc7da3d26abb1477137dc00ad35f543c5
-DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb
-DIST block2-0.5.1.crate 24191 BLAKE2B 6fb5505091c5f06524f20250d3c649bec46a93e96ea08227ed91163bcfd0c64fdfebbe86e77a4e64d0d049036e14d5d28ff1c85c4707d4791651616cd6c7ed6a SHA512 084b15f06d005c9d4b78b20a85ed804ca10143e3bfc6b52c4c90f72b4b3455fd27bb02577a01f7c21e58a60d174c1b5d29b662da05b9e35688dcd266a988e045
-DIST borsh-1.5.1.crate 60666 BLAKE2B a0791c455e4ba288b5c31b5cbf1048ea5b97fe7641b76bca8e95c713cd399dfe94d8f5b68dff27484bd8295ed7e160f274c6393a5c50ab814bdf7edc7d838db6 SHA512 5e5399176012f8be0f49009a43b644e6ce4c89c3777f9d5bbb299a9fbf2b497e68c52097d299886643a8d38a43698e731dd2426b64b94a21d37749187ed497ff
-DIST borsh-1.5.3.crate 63733 BLAKE2B 70de963b8fae272eee797218075f8b5a5c732ba7b7f5f3cf23937e0847412aec86bb1b3af412232cf9bd6cc80dc036b7c976373162fc2a9b25cf47fcc689c1ca SHA512 7e113980ab70d672b5fdffd6b72c845156069f2f9ca348fcf50ee787223e7414dc941d2970dca62b928992c4dced939a5da83ed44e2ccf7dedfce4e289d00ba1
-DIST borsh-derive-1.5.1.crate 29193 BLAKE2B f489392356344118c8bc915e5a960fb141b414fa647f95d1b6f2b4020b4d94d6047c98d7f7c5ff4548f9c00b51041e97a3ac869064d4adef48a005a66e84e33d SHA512 1499bd17589ff84fe6594cc06f5152eaf49282bd0adef74996053cf7d008c7239c71c32b5a2d778e5f6d712a0c132e12ed513abba9c3f3ae709b8e6a4775c837
-DIST borsh-derive-1.5.3.crate 29532 BLAKE2B 8ecabc2f3eb94a8766a5fd719f925d768e8443bf98872ffb5c06dfe5c14bce348fef2d9ed2e30bfbf35a8b735371a5535c7d4c92a5dff6836412737e96963438 SHA512 9f958776953543fa7dce1b36435bb331c31644e78b19bb12549ab9c0df945c6439e019384f218648c45112d1be379b67b3cff47c4cf3ed5ce6e29081dd71b47c
-DIST bracoxide-0.1.3.crate 15496 BLAKE2B ae5c01ecdc1d29065da0d40328e527421188ff91f2c061cbfa9cd0c95af61bb2f9c30c4da2f6765ac809b2f54afc201be7e3949273ae382e125a26bcc6c12cfd SHA512 482893d41608057dd70b514d9fc531a5ddbcb44febe056658651cd8fecad8b0874f6a41f465564e225d2ae8d329855399025d38de2decbcbbaba932bd7aefd5b
-DIST bracoxide-0.1.4.crate 15750 BLAKE2B 8b4616d84e9204f7f525e432543b589845fdfd910a5daaa8f7e4d02e4aa6acb4e84349e1819baa03ad81ab6dd3feb84a54829b4470ea1c32f9214f3688a7a601 SHA512 2d847faf844ead45c7a10aa7180b19beb395630592478623fa11ea3e239213cd8515941f76de06abb843b7b225a8387422e963a000c55b2c152594a853ae6afa
-DIST brotli-5.0.0.crate 1388774 BLAKE2B c2fc79cae57e358fef31a3c3948c34956c086e614ad75b22f4f09feaebcf7cd5e0f8998abc537d1587635937763aedac5ca54244870e374ea69d14e52e60f7db SHA512 4c4a397b774b59c9d1b25a576d6df0c7633404ff6601eff40b2321652e6cdb9682b1f5c9a0a241f5696a2d41d4299ea6715f1d38b1423aaab237cb4182a14011
-DIST brotli-6.0.0.crate 1359183 BLAKE2B 3f9eba23fd47322ac21b880181da1a60533e3f0244d9d59beb6904affafcbfe59ee8c8f24c27f56aa60201713b3321d2d7d6b8eba710fbf70942a0b2a0226061 SHA512 6d53d3ab653aa3545f0da397796efa1110d445ab8f46456c7501f84ce1c48c99235ae05857f6e91b138521158268691b3a97524f2d3622d69986837dcb64c19d
-DIST brotli-decompressor-4.0.1.crate 193357 BLAKE2B 9ead4abc2fc4f159d3e0925fe4a949b92a04c2937fdc342318e3ebf10dc38fbb03af3ff3e4e748b870d06b59b691972ca8393baf09bdff937a7d820fae0d0e6f SHA512 2d2064bef32b07a9f7d0565fee36af01cc2b509fb8e7db6d5dfe8cea07f08ccf156011e832e8349577115cb926ba60498f150c3d2d357f9f0033000965fb93d0
-DIST bstr-1.10.0.crate 380426 BLAKE2B 19330a5a293430c09908d2174ff814351b16419f60de6463abf9b8a9dff06a4e6845e889d8047a710cef54842f2790d9cd5080b92cdcb113d89742b869979c74 SHA512 823abdbda9b13802facc7d6b1ed9ad809ed3b0b827d26e418348ffb8481b5f5735f129c5a9a8c7b2ab010d7f32ca57cba69a1ee10a64225c54c6ceacd22c05d2
-DIST bstr-1.11.1.crate 351485 BLAKE2B 639c2e610e088120674a70dc5dac0b9c437f7454fdcb385b7ec9e66184b8d016f7190c864f7c8e25fdbfe5f884a9b4cf8815c1a0bb94efb03028fa966b4207cb SHA512 04c28eab447ee13e8d3af12fd165947c26086e8cb990840226197c16b4716bc018a48c6dbdd055f837a7d64eeb3c594b0b3629103ce7f910af0c3c7d3cc79edb
-DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
-DIST byte-unit-5.1.4.crate 26354 BLAKE2B 0e6c3efe2f54c4855960d8fd5f5922323ab64cf96038dac60677bff869315f256ab60fc7a4618d4b62f466b3c3330a98797b65e703cc71fd872af487ff84a490 SHA512 0542864c639214fbe8003910f7d0d95f222382b820f1b685f9564b38eab1c261b2f98e75af75575c2a43127cfff60efb226c220da30c32d637dd99146be60ea7
-DIST byte-unit-5.1.6.crate 26471 BLAKE2B d79f64fd8a5573d5acef4a8318cb017053bbc31c07de160f570bf04792c84cf12c04c77c12be0edca3607c8c3dc21e5f1f1b5b77c8b1f7d33d84a06ffe38275d SHA512 c42523d7d47b3274936b2e355bd0a7815f1914c82fe5028d2312ae5bbc4ddd659e82a024c5653d3089562cef1a84c43418470b55c9821781b98c1e1083504505
-DIST bytecheck-0.6.12.crate 8202 BLAKE2B 2ea8db419348ad79af1e7e61b5278ebf0e0b77ed1416c2ea409d6d00f1eb991358b8d3798717121ab23fd66a4d0ff6b97515551d5f7774f5ca2933eccdee6c1e SHA512 49a85f9bbfe8bccceffcd94e3eac1f4407d93159358428ea07652714e06e97fbcb41f22f72d9d10318bc9a019be8afc99727764162f18e8de01ea4069f44dda6
-DIST bytecheck_derive-0.6.12.crate 5415 BLAKE2B c578c268d1aa62ff4f5bb7b6207ae94f42a14cfe4e16dc59a69418fc8cbc4ad3a9e18854507456111dfbfe4f720ad8cca0fab23720889b070e837196d5846476 SHA512 57f8480ddb76d8620095962acd203231fb7938c0caf9c216d89466f22464a6970f13adca5f4d5b10c9e1ec99d6e0b260ba7586c2bb895fad0380f8f9ac9a4fc8
-DIST bytecount-0.6.8.crate 14694 BLAKE2B f534fadb45ce25036313c0c4d54ecfd2091069d5402e02606da36d73696c74e3162990dfdbc95dca4424b498983bf04019234af6eb71e38ca28fb7da61d181fb SHA512 5984dbb71fe22371db00ca56675f409cefcf7c093f406ce1abc330a0b1535f30a43a520fb64d66c04a181a4f05d956300e35f77b43aceeb161eaf8a2c64df614
-DIST bytemuck-1.17.0.crate 49872 BLAKE2B 69a108d2c43cc127fb614ae27a25f9bb93b77b68eaff59ceca7f8c702e6165b3226bbdbe677b6e379f52ebf82fb5a05fa7b0ba918e0ad20a6bb3fe92ce1327e0 SHA512 89e280a6498850cd60c1585d3e41fd390d6592f0b06596caadefd87f3fee484e8c121021afa822adbae9e40fab2e949e1842bb3b2438f240339bdc5f70e559a1
-DIST bytemuck-1.20.0.crate 50943 BLAKE2B 5a2f373961718e994650c5f4c02a3f0e41bc7382a5b05a4488474e2ea6b077db7f773a02b77bf9b9d5b5a6da53ea79e87861ea57d944735efd225d1ee8c08425 SHA512 5ab5917e650184720a751f310d8cd7502d183a0942d97922e0bac25f257762bbe07c09b1f8427e04669f0fe449d07bd66893593cf11846cb8ec6632cb7eb271f
-DIST bytemuck_derive-1.7.1.crate 21712 BLAKE2B 25d23aaabbdc5eb40ba2593c8a90e61e4a2377ceb93cda0fbb7d9a3e034db59a446e6c6a7e841187c895181d6f14ed24f512bce79a0a80996e92c1825602ff34 SHA512 82f1c61cffbffb1d270cd395572d3cb216f71e2bf03c08aac1e4f9a0059367d0a234843c0ade0fe276fc9e4f6153564501bb38ac4315983b4c2c02f8e687d488
-DIST bytemuck_derive-1.8.0.crate 23029 BLAKE2B b405528730a325c8808508670d16c63ad59d12e709f5c5bac490338ce6f5bfc1187de5878619c679ff61c75d7c236e7cc44ec75ced30963e37add9c277c03c39 SHA512 25f2015a2e501e082cc9abc7f4b90a3615019413fe532d12acd8174dba5cf5d1c236153a1cbd9c3c8ea30f46e900acf95e2b1c10b1c11c58e87ccfd5fed954c6
-DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
-DIST bytes-1.7.1.crate 63623 BLAKE2B c399f7f25b85ac284bd2f139d895838eeba7deb56d109c8579966be4b8a7a56bbc26f9387bd0bef9fe5449d5e2ae8d11b254a7ef93048a4827d945ddddb5ce09 SHA512 04cb5bb1718ee378be1d9d56aef2d117ed561935ddadd78139ef2839f998e92c88369c79560bce9d23246a3ebda1dc888af373f9ad4827a0b9a249379bc71e81
-DIST bytes-1.8.0.crate 64824 BLAKE2B 9af490b43146b04704e8bf0f7df1f251d7db414b68aa614d47daebcb374a7e18908192cf0a2ecc80f40e70379395b88f60f85fa80f66e3be5661752c4ac560f2 SHA512 a721724e5cbfc73b79102a9c4a00fc9da520417819ca5c82b798c8cfb45af3d77b33f7035ad33d6187399c613cc2e83644236ac772aec934f521f87d4680059a
-DIST bytes-1.9.0.crate 67320 BLAKE2B d5a89fc1dced217bd78c6c50d0494308b69b0841506c4663b6df3755b91a9eedbd242ce1322a71b8a96847db7920b2b15744fb060aa2d69f5c8d9bcbf2745b9a SHA512 e6c0681c535db6035c1fb1c0481725bb8ab341b6324acde07ac4b60cc4f490ec6ff01478bc00fae00ade2bc5420f9d14cc44438e5d156bcce91cc0f06118296b
-DIST bytesize-1.3.0.crate 10164 BLAKE2B 049f292705082dbd3b2f0abb6f153023613107949f4849154aadce2181f4568ea1b3c12f00b6ad56146f8a4f3b07b7025498e0c989ac6561ac7255720b85ffab SHA512 c718af51b0da2979b70142012544fde6bbf8639cd4fde66a8066b138f7f58dce019209e27566027dc0ec5a7fc1d2ee17b9b6366cc7a5f95a6419e29a0ffedab5
-DIST calamine-0.24.0.crate 81546 BLAKE2B 55a4bb85f95c905b0c699984fcf8e491714d000628e036d50dadf88a0d261b7b9e2497a107665c2e6b9feb60dbf35eca9f00dc7425f2fb0ba2e915ac36e046d1 SHA512 242ec9a0fdcd6d5b5f6d6a3e2de0ea15b620bce054166d2c32e7913d6400fbb25b5976c920b398160fc28f8018b54593f3e3a440fe42027bca3d6435fa86e6e6
-DIST calamine-0.26.1.crate 89109 BLAKE2B 06ce970b14b8f94a0de28f5a985139ca87cae8bb2b323d0afe70ecea36abfcfd7384c0a3d4500044c47f1b8170b41b7993a1ff171d3c509c9acdd7ab43e51839 SHA512 8707468984bfde9c4e604252106eb7ae1947c533d293a71bacd89f582d63a3d64771fb80463e2696c50e68ccc37b8b46dc21460ff73ba3ba3abdc3e68c14cb67
-DIST cassowary-0.3.0.crate 22876 BLAKE2B 7e74a08e02050548ade7dd1ebba7ce4e4360d258ea6acf126453889dbf16df433bed7b68789736881c957f4c09eead1f763a0c02f2474157b1650a1e77e6eca9 SHA512 0838c0b79ed31f0c514fe4ac82633976e34b0d6cb08616313cda0e00623514fc6498c6c308cfef54ea029f1fdbaafe2991ca8ac3c38437a113ac62e37f9397f8
-DIST castaway-0.2.3.crate 11509 BLAKE2B bbecba400bf98ef4158581f3b1673ca77dbec3ad754d3749f0e9342a47d1fa9f638c1388f0762413277b73251854ade26e08dd85b7d7133c73a5750d4dbf7d92 SHA512 2565a4e5709a25118462ac25b9f741e92456c81ddbf7c4e791d8c647f2ca5227b2f59ffac108f9d32c77cedc12219c517218c51a78b1d22a1baef1bf2c16e0a9
-DIST cc-1.1.14.crate 83005 BLAKE2B 777ebbe65b71b62e435b03e1749ebf6ce4664b07dda1635c454a59d3308fca0b27937b53227010ed1a7120ae7b21336e9481a4a08942e5a27e3a74bfbc8380ef SHA512 acc5b071c7be4ea1e70609574582686363f9811e03029857cddb7c6a6d4e01c32fc71bf50ee3d7da8ba88c0ed2ac4da7f66963dde69ee3ecffbf52ae1ba88c4a
-DIST cc-1.2.3.crate 99421 BLAKE2B b5702d1dcd0d90d1fe27f6ac8e7c04f30ea8edcccd1bad4bd31f12ce4d0b1de70cddb2d6e71ed3c3f984ab76b9af47059ba9639af26f84631eaaf1435d6d6fcb SHA512 b3f3e8bcb7daa2b09da4bc6c35279e020d8e1b506adf322ba37d2b0e875d22dfa9c662406223db6e465c70ac816956e5820f162bdcaeabcf38e54c84ed158efc
-DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
-DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST cfg_aliases-0.1.1.crate 6009 BLAKE2B 6acfae9a89d3479f7ce1f0b5dbb13bfe27c006b936a96685606a61a06f69d17ab754a8a0d96c54213f758281c2fb32ac74d03a34e0f836dc7e438387955aac37 SHA512 238828445c5b48ca41ff88825af0a1ad30494e423bb6f89b6d5e4d26042afaa1ceb0e32041f7cddd79c3e15c6c82a1ddb9469c4b63a1ac52d4bcc1174900f880
-DIST cfg_aliases-0.2.1.crate 6355 BLAKE2B a758d9c88527f0e6e7cfd6d4c83eda1bcb4d6e2438189fe08e8ecbcaa78d56afc5a4873f3b82bf7da96afd690b44cdf1e44466b6da0f37c358b340481017103e SHA512 74969d12d5d24002a29e08d52e30fbce014dd481a7c35ee0162e69333c5f2d7755f3b02439b31522e12444cf1ac8e65880ce33fe6778dac03757e362cbf8a72c
-DIST chardetng-0.1.17.crate 56362 BLAKE2B c99d2f1044fc652858e6de0f2be9a24bec68550bc79fc8a7424c3a97a8cc5e28e859c2577d7969bad744dd8adc640c5f79a0fb8ba6043975f048f305f8745df6 SHA512 0b537b68e6da14e4a8b63cd069b3e9d6b09a4df5e473157f3ddce91d7a01f755c7b5278bfc9dc09ded92f660535c5944712f0ffa2737fbfaafbf5b95e29c7aa7
-DIST charset-0.1.5.crate 15918 BLAKE2B f79d3bb1c8e78598b6084761913dcc5e32b7c0825218845a5619a71987d005fe0c976f7f35064c4795205ac2339b92a58a3bc79b7554558ab7bd7c55ba81e2b6 SHA512 707e1b190cd98917d5f8a1b90c4375980a15afa3da6d7658ba76dff9c63e6a43666224555ba67da9b260619f70f2501ace4aec4490d5f12b1fdd912d033ff91c
-DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
-DIST chrono-0.4.39.crate 222248 BLAKE2B eeff1694a98e8775524c261c5c46ebf09bf1ffc6222a945576960e8153af99e4549d8c988bd086507fa430f9cb15a3159be85300247ab3c6f5e77ab515f0988b SHA512 5b258f76bea58ab9baa0fe8fb32c41928b8b655c76bb2fbaae9300ef8380cbb881296cee6b9e9886dce62b0759c73e84f6409e374a86cf0c80e3383512f98571
-DIST chrono-humanize-0.2.3.crate 15411 BLAKE2B d271f5f34e27edd1ffc10d655f50c47ed1871c3553dd40dc10c5de6fba8fdd2186fc65bf4d229c558314e330bdfada73c663f01e0fe1a9c73fab964f60aff919 SHA512 cb379e678b97749cb6fb5d6aaa1878ae2b106cfd6850ba5ff909b4f22dec67c70d3f738c05980ac3ab691fb959541ceb6f43068f0786c21b2ad1933e5047469b
-DIST chrono-tz-0.10.0.crate 373596 BLAKE2B 6b0b4bd0cfc4243cb82306b147cf1650135449962c77b48b2a3dbff73b3a87bcf42d0d8de7c42dded3a803106111c057d956a481c787b15c414eb41061b0ebd4 SHA512 4a0f7154a61fad696511cf88bc1321be94ab3d3eb7a16dc3637d63c0b13397cd0b4dc28c49b78251ad749f66e134ac8077bb7e8ffab8d65dfa1aa08cf9d94908
-DIST chrono-tz-0.8.6.crate 624830 BLAKE2B 9e81589c0ae960172407cd770554c2c8117db0cf3374ef458a3a501ef952b964975550959aab367f93a4c4e56e5a239923d0af500beb3baab693e0f7c1abe5c5 SHA512 a73dfb706513398562af86be2d14cfdba82a5ced46655b1c4f1ad177e432b06d9a6e50add6b0eb6631d6bee0cb86978faa9e77d7ec1efc89ab56f5a380eeecd6
-DIST chrono-tz-0.9.0.crate 361570 BLAKE2B f8178a0117f84c519d8b26d016878cd663294578b77d9fed1027d208a2b3b43176632b27c390f929d48af3f1991ff726adbca311363feacd44333cfc4e20a9c7 SHA512 a0c281985ec81d722583e412d5d9c4235e550ce01b9bf36cb9d6a2a37370d0c0a194a1818e6779fde1bd0107c06dceca624cdbca2aa094821b80ed91f53fb5c6
-DIST chrono-tz-build-0.2.1.crate 10421 BLAKE2B 21a1a7b9b8ef707f986cabd7cae83e15d74d0cad0ec883c5a463f2eca9d9fdcf441dac9a0e24c4046c88f875302ff3076f1bd3727625b53ebf7b7c4ade27f402 SHA512 bfdaf9255d6402c8c257bbca8e21de20c002362e60c7b73c59c29775076468a0223b5701d1f8273bb0ec61a31dccd7909d1ad8241001c8da2d65960fbe2d6241
-DIST chrono-tz-build-0.3.0.crate 6139 BLAKE2B 157b1008045e2bbbf5b6ff3aeac3594ca970899482a16372cd731e144d2af0006b448c04828a1f4540ee7474b80e35417ce9e71f6f86835c558c37748f9a5552 SHA512 4aab68db4cfe816c8de21165858b969cdf8ede3c6f19be5150ebcc3237e40d052716650bb0cded7867e8e6d78e5fcf37e274b961108e3a025dc312078edcb0ba
-DIST chrono-tz-build-0.4.0.crate 10660 BLAKE2B 5a20ca9fbfb041279779cf758d4d0ee84519065f728ed61313e611aaa3b6add04825af325c5632301faa2064a75e7abc5ea279cf0245f49339401780d3d0fd37 SHA512 27c3a93acfa71dfab4fb56a6f9206e530253564fc2246ca8927364f60dccf9623b1a8f2c636708e01a7669f03c8a1b9548fb936bfdb4c61bc1ae4a70dc598ce6
-DIST chumsky-0.9.3.crate 75112 BLAKE2B e74663dcf524513bf54494c62ad154fc3c3560910c429b91644f35327569df835c13645b148ec1b1339f78e9fe6ab3d5b83f10d53235a8e137756a548a9e6abc SHA512 f304bafa831c47fff4ede3b2e67628d7cf33d267559ff0f3eebba9355439f8bfbf08ed576aaaa1d51462114113ec1dc5d3593fa5a1510f6e2032da88d021423a
-DIST ciborium-0.2.2.crate 35611 BLAKE2B 7bb34ed2b16f55af2d762bbc83263bba901a0f05bc7677a370460549297839c4d6e913622e8a6cb3a5c2447b94b0bd17b7d5007228ea8881193d08e5b8deb072 SHA512 8d1af6a09f116e42f0098d7d0e34dd906dc3e718b257ff1a1fde655a235d40619f61f18917c0cf35c55de9160c255a9795d5e7525989037e3512807cc6a900b1
-DIST ciborium-io-0.2.2.crate 6697 BLAKE2B 07636da78f59859515af0075cb36d9ca969113ac327ff727953c73b64b60ddae22e5b1b65d8be5aa401f8b13d34074cbc8b47f23abd7a13d551f0b1c78f23575 SHA512 641b8592f9699d5e6c607815c8e6dfc82b2bd01897015e04ef8853420a7d90c2ec5c1140e39eb7623ce05587bea52ef63659eae76baee5b6592d2ac5298ce106
-DIST ciborium-ll-0.2.2.crate 14695 BLAKE2B 3c9ab0b338070359f9565706a504e4f6c65560072380af6e0a57068ae6716773d40e75dee84ded5e1d32f93445a07a0965759bedace58291b68b94479fb16488 SHA512 2f7ef6ad8bf5a862e8b9daa64bc6d8184c87a22c264b10dbb35c00c9effcd5712f354b4ca6c2eb8e6795d4b99d7cb88fa2acf01f3ad6fb28caf81708a500549a
-DIST clang-sys-1.8.1.crate 44009 BLAKE2B 9173de6dfbd3ef9d5d1fdc559700cd3a52f95cd77302063a97e8cf311a35825825e030b47f252c857853663ae8a16709e1f7bd0c608d67c2a74eb36ed588e778 SHA512 a68c426c20110fddb8bba07d6631517b0528fad45802e5a34a22561d7e6dad82dc5001387019a03f275e9a671b09ee0a06b6e86793c4fb4ec655700bb0f5e125
-DIST clap-4.5.16.crate 56627 BLAKE2B 83a6a9ad12b826affa68df179dc1cb534f58b6ae505f4794ca6dfaa8f8a9e33d93b9babd7931bf48bc13da31cb3078b442c4a2a2e84a8f2e675b5d620100c50d SHA512 d13bfda2c3f77cf194acd87763d5f2fea83ec2135504b173af2941547a7d3dcf75c3757532c60b53c57600bf4859395ddc94a7dd92b17f44c60d3e781741f928
-DIST clap-4.5.23.crate 56460 BLAKE2B 5c0ff6ecc072368022b8dc08703d87802160817e40228fccbf9cbdc15d86dfaf0eec141dec4e8f1327e5a6d1622df9b334e94797027372dbe8765a12b918961e SHA512 4a8ef8731c9768844debcd1ba83a79a607fd32d9fbfe7411abefb8939c5c442e8a206738bb54dddd136117d3992f519ffd1640694ad7796c4e0aae3f95502c7c
-DIST clap_builder-4.5.15.crate 163717 BLAKE2B 795fa9c6de6a3f4d9a1288c3340613c14b11a5346e314f5f486bee76346f5f88396e54d95d051bd84184a91bb1f2d3575f870fca56a4b9b590ea2d9939beb415 SHA512 52efd99bce20bb8ff2187c4cef8bc27bef6cdc52598f00b47639b797683f18c76a79a6ebf34d1d250621a49cab0e9ec9e7824d323516f1ed3fa721cfd34cd713
-DIST clap_builder-4.5.23.crate 164180 BLAKE2B 90948ac5e8ea620be3e1ec1334677b0ae9dc227a00354fcd3d78e2cf23a1c101e009e6cc96fc19c0a2395e1b9ac6272fd9615abc1acf1a5d60392e337cfc961b SHA512 0889876990f0a361cc6b6d41f2a8f4b1decd376987a02fe69888455c92f3e583d6ff70880c6f0ea154ba62f4be7d2e7b18cdc4e0e2f243e6b17f250c3e8d1c2a
-DIST clap_derive-4.5.13.crate 30132 BLAKE2B d5fcd2c5a213817165c61ba2071fc6424ce822e4881686556b8379fc71188f60d8c6712f6f4a8e5c8b125b58d7454aa9846214caf324fbc93300abba240bea17 SHA512 2dae32bffd91de9311d94e2be0d990074cb2e2edc832f422cd5e7c5177f5daafc0c335e74f865024c77cae5fff631ddaba58028fcfc24b203467478fd473bbf5
-DIST clap_derive-4.5.18.crate 30131 BLAKE2B ff962e52d8d8afcc9639365e27753c6c6943fd809ef89d9e555e8be5b2f13efa650bf1f9ae451f4c127c1529a0af1d892c3b02153b46deb912029b45983e01cb SHA512 035bb918bc7e9badd59341560f23e3a8a2e7cf945b6d8183f74052c4edfcbecf07c9ea6fce0ceef0b84c89a99d62b11760af39398897e4ee7dad0170a96cfefa
-DIST clap_lex-0.7.2.crate 12805 BLAKE2B 952bf3f3885ae7bedd0e8add236590da5fce72a7ccd88ebda063410aef337ce7ccdb5e5e929cb870bc993891610edc0197150a3aa82a62fadc4bbfd96324fcdf SHA512 a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380
-DIST clap_lex-0.7.4.crate 12858 BLAKE2B a5ecd50cc503157dd69746f3b6e9c288e0fe4f6d5d82271499f657134fd401fbe076255e2be6a23ed0b69daf3941c6429dad8b288223b0ad390a2c435575cdd1 SHA512 a2566868f4619679d3b74b70592ffa6a04b13e38e3196c56bb1dae8bea0c711bddbccd778d2aba3cc0ee074c9b1cc0335222818f0d47fb3cc8109cbc35bb992e
-DIST clipboard-win-5.4.0.crate 20559 BLAKE2B b4c795cf707500b429322dfd0c593188b63f9330c916f2559953e5bb4192599fbc2337280940ff287b9691683ebc421ed56aa5adf64fd09fe1c560fa88df2d45 SHA512 1e5bb8dcc860f989a46183a748a47fb18aa66a164df1fe366081fd620ffba9a858f8e87ca19783c37b93cdaafa11029170d149ee30422b1c9b98020784055503
-DIST codepage-0.1.2.crate 8663 BLAKE2B 609a173c7d68c4a592176e7ac6b043b4e434d2741945521df58148c1aa5b7a1eada7f180c8ef2c8a891fba5450d91d678ba377f28b86dad7d332c583738d83a2 SHA512 1555834a7141e9131b7eaea44063fb5cf2f1c2e357ec00b0119c352fa090ee8b96eb257ae893d05256a685faa940ecd942778285a3bd7cbaf44457ccdb0ade4e
-DIST colorchoice-1.0.2.crate 7924 BLAKE2B a4027d5f870b4d9a718ac3f9d89ce04e2ed38406658c4a55ffaf39ed0cb1ce7e1c691eb56c66596b519ca82309e8ec7eebac65e69394cdd277f44f9b6280d560 SHA512 f34d5f66f84e90f473b6b9a62a61a59575e712d3e9b140324683f80af42d40c1d079701aa2ed651d0dd95a5ac8838e1f6f6c034e2adef79509d32357b8093117
-DIST colorchoice-1.0.3.crate 7923 BLAKE2B 7055fe61677143f0d4445ed5f6be2cbc284c155aa6ceac04df6f3fa2563a225e440ba708bf40e298ad09775ab7c7e1842b5f6dd78422b06dbd1250908e3227ee SHA512 fc26696189d3935d5510a1237504339c1f354d03ffd3b4e830b7080335aa778bc72787ac5fa9a67a731b9bde2788da778d497f2ef97ec68bdec5145fedf4cd14
-DIST colorz-1.1.2.crate 31860 BLAKE2B 5cb6e35278ece244939d87d36b837d212f956cfcaeb6261c13678b46e277262f48dbda1b6a50cd718cd978868f568b0f59cfde5ae63d55d5a2f2f9b8bebfaa6e SHA512 974f6d1115a4c3ec61550cae64d22d042ecf90cd222b0ec444fae6ecfd6acf9dc06e0fdc2f7f45926134ebeee7583818213e292c489635cfdd97a176c3e89d20
-DIST colorz-1.1.4.crate 33160 BLAKE2B 042618e8c29bc7f5797e5e9544a8f3b5e04699f99cf9273de764a7ff621556b518d9198e99560bd87c772f69d7a8c21778a8afff1cbbb050010bcd0c517e39f6 SHA512 f2cb4d86c2bb45f6c6ec2ceffafe8c26bce6833f480cf5a702cc5579e310d0344e1d8046dc0be7d6a1fcdb1097f4922e297d96d8278c7b01cac095d0dce5f970
-DIST comfy-table-7.1.1.crate 73573 BLAKE2B 70b17e571ea64037e017dfedf1b509d3f5f9ea87d3703a9d7b6c8c5a8909db25cbd75c254efdccc5b0fe3e10d1d4a829591fc7adf348e5f02c00ddb63e852bc9 SHA512 981726ee9154e8833a2d6de86ad500d30991249e682bc8dcc9666c3338e84e2b926f801a8bef2794dd7994b45fd9a9551bf10953d5b79120c23591870aa0b483
-DIST comfy-table-7.1.3.crate 73951 BLAKE2B cb38f0c8893c728766f9b92949235d477e70e7a0b34cb674c068ca5d4ad9d2cb64785c7f412f1053216dd27dcdcce49ffc884062f8217bdcc9d627f31de0f361 SHA512 4d2a7337c11bdb35ce7f173a52e43c6749f0cd7233a69bf17fdad68de9825a4d5643682d4a97ba53ede5561972062b37ec237c923b6d16246e9ba9874b45c2c7
-DIST compact_str-0.7.1.crate 57246 BLAKE2B 2da5cfdc91d417294ca87ce834e8006d3426aff4cb22945e6744ace7d22c940f0181a75f25e6acc41efb5d83bf6ba4ee0876db3ce5cc05b9524a9868dcb8c7c9 SHA512 29ed591024f8f1b478722384664f5700fbde97b44af82fa32a8d1ccdedca9dc425555f9e5a4431a6c954d58cd90d60a25a9ed7f18773ede13edfc68094a23275
-DIST compact_str-0.8.0.crate 70994 BLAKE2B 27ab4163d71915f9cfc160fdfa4ed049c98b06d0060def8c4bdd29e8ca37716a1c53877f70d1eb38260d44003e833c538b20bb4960f0b28a7becca5c9b29984e SHA512 5a236c501222b577fef7d7190882e20e85cc6deacf9d1f6a1d710893654b53a91c7d47373f0d10e9bfe138dbb2f4e99802deb2a92001bae7e130f6558ed9d1fd
-DIST console-0.15.8.crate 36364 BLAKE2B 467de2c2fbfe31688cea20b338558ae9671e50ba1fd07983d21f32d7eacb73e565ebdd6ec5e78b2ae04446f09615c70983c0ee534e25ca5a28fd1b408acfdf34 SHA512 b05e49ed145785e29631d481885788f0cc5574d4d7c4d90280dfedaee7f8c1515072c9c4cfe6bd2e017230cd228157222af7e7d41a9fce697cd1888095df4de9
-DIST const-random-0.1.18.crate 6646 BLAKE2B 20e71fd7e2b0b9af663073a45d0224a4cf9a6a6bdab5c3565de88b4a66ff24a1b0f8c01bdbb86f5192b723c03030ae02fb86722be7cc41c3154cdc81f843f013 SHA512 e250227850001a3ac6abdda6e7bb88efeaec1504a54348a5ea71ff66c984455eb9181b2acfdc0b6c08ef6f51beb34b7ae7836e370d84d75731a2482226c5ed26
-DIST const-random-macro-0.1.16.crate 6657 BLAKE2B 44a3508e2158b79042cab698b1f31c50fa356098bb5f4537f82fe1b9e893d3e8eab59612a8957e524294ca0a035046468d799e4a0e9253c1464b68ef682f84e2 SHA512 8478bc65b0845e765a69e09fe4152e89f3e3970d2d92e4b32bb0abb7b918c725f325d4b19a45d2a462905bedf837b3a23f31b1ed9dc8655ca502de72616b074d
-DIST const_format-0.2.32.crate 77317 BLAKE2B 69b87c1d9dd81f5f92fe7cbc09dea126d386adb2cfb359ed9a906af554fe9b4083d49b87558e019777aff4d93e52babbf39e5d9934ce7163435168656ddb11a1 SHA512 05f883696902f13bb78278e0c202c092fe232cfab7a33c078a16b5f67825a85dede0b6bbb2969dad685977f67098c468916c7fb1d9c5c65bf7fee0a5f8329091
-DIST const_format-0.2.34.crate 78068 BLAKE2B f077577c32c62727ab2a3754719926728cf1b63712f0e18971bf7946912d165fee6dab05aa70c335caf39e9cf21929bc3bb6f1ff977123dec11080ce6ff91e32 SHA512 4482e1262dc47460aed17cc3475ec198a875202e5719d3554b69631029e4045d0ee0588a973fc4929f4798ecb92d1763c4bb9d1be09b5f99642eb9a6451586af
-DIST const_format_proc_macros-0.2.32.crate 24389 BLAKE2B fdb8dad234c45a2fb179c41573765dc0495ffd7268e325403ee9e56b80e68999bd886e22c414c6591ff6be798ae1c172b671d167a7e3ceb853185613f1e4c1c1 SHA512 01b4fb82eb8e3c59a80bb4a819db9218c25d57e947eee6e8a7e4bcc9339c423a2f028fac0959f3781da5e20d7012d2264f05751661b0df7f7011701da124ad0e
-DIST const_format_proc_macros-0.2.34.crate 24396 BLAKE2B b7826f28e02937dfc13a80e6790b0f7e00f6c2be02d4cfd6c0a34ec2a42217189f4a9f0feea1927a135ba5f07c6e11eaf71d402ad25d976a5106f4f1cee7dd93 SHA512 f42887fba0d5ce2e15b18381cceb711a661e8da6267ef7dd0ee636135daf14759f04b32d9b8628c5ec63acb3acdc5a2c101c34039147d55ec90fa5c956ed807f
-DIST constant_time_eq-0.3.1.crate 11561 BLAKE2B 9ac06a1b13da2aacfaa20d60e48df4f32f6462e4036fd9ec116c45a9bbe142a18b82cf18d762989876f31b745d98d52ce7e3d32f6c9700a500f16f00649b5699 SHA512 2b6b0d7572c02606b7c3780013fb1d1773b999a0d9934e4b140dd82f94e6c91d2ef82f6daaa1bda94f95bdf6b5997b2f0ea0c8eba8ca7e28a07d1e06b1071b50
-DIST core-foundation-0.10.0.crate 27023 BLAKE2B ba4b8e42aca4df30627eae9e8ce8ee9f4b512d51141338d284f9b897ee944619d7f63b0bd9318263eb5f5c1436ca0fad8a208c8005620779865c4f4e653d1fbd SHA512 771a34b79519c5a51e3490589672ecf3eb019d4eb28db9d19c88bc116632dea96ebb2cd04e251e94dddd0876cb8a7f07ec65aa5143f7f8aaf1661caae052a94f
-DIST core-foundation-0.9.4.crate 27743 BLAKE2B 5b695e671cc833170bc6bad436b2d0d8d386ffb8181bfcf2e92a1d93cee67c3ba1768cf57064fb91b0897c6aec1be7db40b5bd256a052c1bdaf872ec19f6e15e SHA512 82d0878a1b9e3d56b3666fb5a78f92c6f7806d01665c242c06a640bd6b1fd36260211e92dc05e1a16d1430622bfdd650aabb0b5bd8e5592f74abdcf412448e33
-DIST core-foundation-sys-0.8.7.crate 37712 BLAKE2B 0e1dd99a5bbb0fe92f55181a37426f6e86445cb20e355f553b3162c88ccc075644461731a0cdcd93dcca65b6cef1de62b409afbd73ba3070a199ab8e7422dcfa SHA512 17492d5314db03abdb3b1998bf0c396ec8ed0f83bc978ae22d6026afdc86c50b58cbac073b3a0d97b92da7e98be11302faf1249d24313494bc058add4f4cb63a
-DIST cpufeatures-0.2.13.crate 12999 BLAKE2B 4c49e01e91fff33c61bfae48a07a9d76a69565840f5a12399a3515f6e6808743dda0d4c6877feabfd276bdeb05c285daa3bce6062a87cc3da50bbe3b6c0fe1e3 SHA512 e961ccd9fc001cce661b6360b18abc4ce2daa4080eb5fd84dc5704d8d5ddb6ce6cc66b5d42440bffdda03137af9c5ba20b6793130692168e7e28729841c3f352
-DIST cpufeatures-0.2.16.crate 13405 BLAKE2B 06d061cb2577057bd2afbc8cd6783488595701dbc46772533645d86aed71ba8b20905625b897840c90aaebb41360a286935824ca49bdebc0763a81df4bd64402 SHA512 97707ae1b533ecd3a6fe412a22fb70cf4ac278c2d7dba407fa7dbebd110d06f88a7b3aee3fb7cf4b0b5ca88f6fecf390c4d3e5ccbd4d18a75fc2f93a647e7074
-DIST crc-2.1.0.crate 8683 BLAKE2B 1a1617598215752861e5da56549dc9d403267a5bc20e1c0d51e57b94b9bbdaaf4f24b1b075c3e0a6d200e209413e07a11141b6d9323f04df9602c0454a5c61fc SHA512 45109925b4da84c9c60f0b6c2f79bde09a0dcdb4b901e3e0856a763b779ea02d251a1b150d6e588848ee517d8b63e16ee3b93522a0ccf8c10e4fd1f71345bca5
-DIST crc-catalog-1.1.1.crate 8698 BLAKE2B 7c118c7fa1833b23b86cbb33318d43882106f3a1c49059939cd23431b82c39712db5d2304499d56be9cf98fc445dadb1ae01c2f862a2698d66a03d43e17f4dce SHA512 8785fedc82721901c39ad858a4c92b8d6246ecc496bf0c755386c4d8577ce7e6fe8b2f815bde7d892505e1f8125bc028864951f00c76faca2f58f9129986a7f8
-DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd SHA512 c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266
-DIST crossbeam-channel-0.5.13.crate 91174 BLAKE2B 7a9aed6f4922c1d10e4ae12508a03dc7daca773adad6a317c4ea38e544d7c28c56a06623d958aec540fcaa86fa9051a1aaa2c859dadff72873f18f2f3a951449 SHA512 0f31223a7099f84e39e6b76b19cf26736e0c3907fffc2ed3eb0012c7984b1993570bf6d155eba5bfb82897ef0e4fc93b89096071410bbac256ca6be9a9568ff8
-DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864
-DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2
-DIST crossbeam-queue-0.3.11.crate 15581 BLAKE2B 91b9797f985af06c854c38b8124cb67864bdb47979d2e253928678118515fbc1257108c7102bad66e1f65fd6f324a93749dde86b4ea28f3bb5a16491f3f56ed2 SHA512 c6007307ef9d219889e6244805ae759998396e1d0548e3664ce9ab366ea78917dee75251c4265b0e3ef4ab15b5c6d42d6a5e9b286d17ad42ec169e7fcddb8ffe
-DIST crossbeam-utils-0.8.20.crate 42487 BLAKE2B b50da06721cfbfff07825574feada8a28d3814edb218434288683eec31bddabe2ffbf7e5ef1281ee14a8a77c56db3b66f3c5ceabaea9c72317c1bd2cecda0c26 SHA512 7175eadf9fa7c526fa11ff87e40ff203f0e7a4bcec15cb972f924f3c7ff7cc20b6e2e8dbbc1ede142a0207cd2baa4f446deb25d825d28a54cbd25c263701bfaa
-DIST crossterm-0.27.0.crate 125311 BLAKE2B 93724dddcfcce9249db721213985fbd9b30eeabf0e8c1c8626744eae3a15f181cc2bb871a77fdefdb2b1a7139453b1c81081c6d82a62233f3574ccadcef18686 SHA512 b7b2b7d8affd845902e0dfa06edbcba9c7794e0839895998f39ea1b118de5251fb87c6b5de27e85c490a436b04943ff51d609cecb780674c3768c12ec401d2eb
-DIST crossterm-0.28.1.crate 132275 BLAKE2B 30a5bf5b48a4bddbfb53726b675adfdf6d64cc387e027a69d6ab721f5ebe574abed3a862504f0db723a733662fbf0ed13163730a7ab49ac9c7fc05681a3545dd SHA512 0d53e328eb606cabc3e309cc6193b34a14c8746081a7b2c9645c1c03d66dbcda99656d629c0dcfcd43bada7a863df3e83fded6b642b2474035165ed7b16f7931
-DIST crossterm_winapi-0.9.1.crate 16027 BLAKE2B ea63abf751aeab203f326e77260cfbd1de286be26acf714a083ae1262b0cc2a35b5cb6d0bd54f45b33c1942eb22f916141c5870aab34149fdb30faccf4d4642e SHA512 48eee242f477f43b69c00e3a5d4d255de2ce1774f6e73d869c5472b35d85af0b63f3a607097da8ace437b1e52a524ded4106767b83d4ec53c30c2e37ac4b46a7
-DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
-DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
-DIST cssparser-0.31.2.crate 60602 BLAKE2B fd919c3691b47bc05e19f83ffa5fd195c68ee0c374522744fad0500b3d17b0dc04a6ff16a5dee8e5afd3316e19d73886ba7c2fd1a0042bad8f25352ba4b27752 SHA512 e1547bd14aa1febb23f03fa6c1ab711bb8483c6a212952d5a129a85aadbcce8c0069b7025fb294c889cc42b3e5e7c6882ab918b6d55fef9b788b63663f5b086c
-DIST cssparser-0.34.0.crate 53857 BLAKE2B 22d5bfcec1a5980abafaf589109b34f3caf7d2e23fe03b4639d7af70cd319fcc3a6b2e4c00ecb2cdf6a58fa194f77ed3af08f8261fdc0a7e14eaa3d073246775 SHA512 14897d6890d0c1cd2b26287d7e1457547a31e3740fbe5117746e4f2f8dbbda264fa6654fabe3f20218f7841ba9b063d70d543c9cc1aebe54b5ab281f845b88a5
-DIST cssparser-macros-0.6.1.crate 7914 BLAKE2B e754cdabbf678d3f9efab469e72cacd05e2635352c4a3f4c40971772550c3bd48315a65cd121a79542ffcea642cc0868c41cef1c7ad5a31da92ba21a02c41530 SHA512 21d2f8bcaad0a8fff865b23bb2b59dcc5165f8861c4b9d7d70e9f302b58e2cc5ef8555bcab97889bfe81889a2b27863c755494baa64a52c65cd74687fe58b124
-DIST csv-1.3.0.crate 888212 BLAKE2B df05956223c50cde32f4ae6df922fbdedd8b50008a8898dd49bcc8bb7430d25727a03430c32ec23cc44ced043709de1f80f4d750e335bd12b22d0b06050881c6 SHA512 1b9e870c433e4d37e61cd604d2712c59ccd392cab55b8c88596a7094245072dcae02ecc80d3ee7cdaaa083ec2c2865b71712330c55e93715917a86106a2230ed
-DIST csv-1.3.1.crate 888542 BLAKE2B cbb2a64cbde9c315bfdf2ddc3c14b2cf650595dda8fe233d8b84ceacf4756e72dd9b5a932e4c27b496c70ea5cb8fa1d29abea3d833b8169b6f271bc3834ed2aa SHA512 6b0be5e017b2b2cb926d11d7a36cdae1bf0ddb56165127f25f6fd55956f95a572ed7e054f863610e91c9c2329f5af0eee9678f9020644800587d6daa5a94755b
-DIST csv-core-0.1.11.crate 25852 BLAKE2B 9f56cea786b5b35f6fd5c4f41fc3cc06d777f6d643d939ca7d57b1f1a24d4ee16ae3a4de629e484b0e4cf87009abf4911dc4d1bc199968ef5c7f4100cd238d1a SHA512 0445c8a4d4d0f90f03e5d6507c26454aaeac0b355fb39d19e1676a7cb27b4372db3541367ce838d38151862b7bfbf19750cb550e24e74ab5e07ae9bb4edeedee
-DIST ctrlc-3.4.5.crate 14592 BLAKE2B 189b026f4061b68848851dc694c71c6ecf87d6c6cdb4518a3aa215ac3d77739db43aa68e3c628e51dad99d7ad089ae6c66a6d03bd912ab9748a0793d09c2333b SHA512 3fca36deead46f3ca586f0a07ace804251d3c3e49a9a63e8c34546e2305d08158770304ebd0c9ad6ed499f811cbbee0b76ffee1858aae60852a61a19024db3e6
-DIST curl-0.4.46.crate 94864 BLAKE2B bcfc97c19ce299abd3e8a9769a30c0ec5dc6692b5c1d81423f47aeea39066d1840ca7ec1d4713132519f3bea94d43aebd8d733a19028280e2e6c2a8e91eb1948 SHA512 c08f857b385582ba635a76744c940017b74c3f241d28cc7c8c6eeff958c76c01a1a51df41b3a7a6a9a38a31f8cf5b9b3b639eaa163c441fdec29d0b3f14c8336
-DIST curl-0.4.47.crate 97185 BLAKE2B 5dc909fa872bb1b7f94ec965491cb0229039b5d196cb16e7b3e88438a53371ad8fc93b4a3a116248f8776ec726946f7e5ce551da4f45375017c9898f636e5b0f SHA512 d74601c1dd34d4846e1d275c0b72b0a8a72505b97eec9d721288b47dc65f0533e57fc36113815edb7cbc8c0e7c909ddfacb9607004a7f3167adacc06237e1d84
-DIST curl-sys-0.4.74+curl-8.9.0.crate 1786932 BLAKE2B 47244310d60a9e8ed51ce7acddfa6f3895e199277a3400211b77088382804255a7858b4a4b3d30dc3c54622f514cdff76b539f11dd07d26fbbc8829c1a279266 SHA512 125e01702a85f33a9157d67930c92cd8af619d098c5ca98d820ed308d7931f851c395a278f54f57a243b8ae33305292c15ce9d6397b7e3726c6eefe90d3577f6
-DIST curl-sys-0.4.78+curl-8.11.0.crate 1821558 BLAKE2B 74f02c4371127f1cf4baf1bb9ea1eeaf0b2a4d70b63e70ef99aa8451c4aac6401929242c95277fca5c052c3fd177918fa07ade184cb80933d9dc867c0e4a0a54 SHA512 dbf9d7950af4c5aff5bd43b3a7f410ac464114c022c1364da3c6f80c2b126fae84c53bdd580e3e4007cb0e893c95dfb51db67e20caa35d5196a2308000b42dd2
-DIST data-encoding-2.6.0.crate 20769 BLAKE2B 9d5713e63f6f6a4d6e5324fb0be9308a231ccefa20d69cda9e19609a2250e2cd72030ec28309068f71c932327a3ef680b749125658e27d35273354c3465f9931 SHA512 a685c7bbd251a5738b27ac3ac8121a0db049221510c99e0ada6f245ed7499d04ec29d725ad01c688ad283e3d2d5aae0751685c804f6d95cae84e63a160d04c9c
-DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43
-DIST derive-new-0.6.0.crate 7694 BLAKE2B 8c7f33653f01961eb8df131e9f61422a54b3fed986a4116b7174693649e8762ec60e5251e9a34713a8e0126e4e2fb2fefe1d6e8c5591d806b1dcd480512cb153 SHA512 2f603df3765657e1dc857012610d849705002c8f710136ddf4717cde5d7f827d7d886074a08ec75d4678601c17b8cac83961db25bd10e49840777a4e89c4f7cd
-DIST derive_arbitrary-1.4.1.crate 11521 BLAKE2B 47ab73cc942314a65574d2ef8395dda33361fcd1e33ccdf37843a92b0a5de62540277e6791991ae54835ba4235a9fa504cc8f6d43cbfde20f18f14b70f84defd SHA512 0d499a368f9f97b0a1a52f17fd111109b071c25c2732c206c96485a7a753520ad706320e5a817e1a10e5f8cf154afc6afe0ce09f9187d23b4e2c2ed4961afeb8
-DIST derive_more-0.99.18.crate 55013 BLAKE2B 989e22daa6592dc38667d9a9b6edf73c6772d57e2e925d3f86cb079e4107f88871133f47c2aca06f61ebdc510f916d396b14c72678340ce50db9a9f28cfed252 SHA512 e4d157525c408d32f62b11085f0c49c213c41df58b28bfd59605b86172c00b258f477c811dbbe141a5c12224ba2e9f4c696800000d8ad2e330b1a8d86122d5f3
-DIST dialoguer-0.11.0.crate 31286 BLAKE2B 612c7b9de482b48df6404ce31b3d9a8afbd1c8c42807f2c3bc343bd3aa16c359abc95bc879304f29c6861c93101833bf5da036eb0fe85f21be50fdc3a771f447 SHA512 7124e9943dd4fd4403200357b7d26683e7ea709ad9b0251af5d6db4dc8da2a476c6b89e7413df3a90e4279498bd54b67d8d0b161b0e5ae8ebd0bb5b5276cd612
-DIST diff-0.1.13.crate 46216 BLAKE2B 27ceeafb7afd45eabbbe22d1f05667f513a6062762e6b77122e267282a8f2a0bf96384989508bf10c9e13af4856bc9f58f09b10055d6fc2c32681e288ffa9f9e SHA512 45e259c9fe7c23bd9e9454891b42d4aef6d681d35ee039d21fdb05ae9ed5856161a40f29889e7880ac2a2daf85f1b7d752d213b4a99a1a74ed2682c18a3ae7fb
-DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
-DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c
-DIST dirs-5.0.1.crate 12255 BLAKE2B eadd38e85211ed5aee7fab964e90342273320644c36262aa7b436e493512851a4751a09d22aa8bae0495f4b22df6e7395d13715ca8b8c6196107b1be03af9328 SHA512 cfc329518e85a25c296521b9aeb6e5d5f60b4525aa786ebfa8b9f198446a1ff5892160d1bb4790d7f3fc4a0abdb5921b2e4896e271a3fc3a3225897313b77bd1
-DIST dirs-sys-0.4.1.crate 10719 BLAKE2B 30334f2192698d7d03bd4e8bc8a682482da7d13baacb8547a132f55019d3727ac35579926ba4367fe0a5b7fa917945abc03e010cb7363683753c87440581df42 SHA512 53c7c8bc76d7211d08a0e6b25caaed12eeb7283cb4b352c12311db3c796794330943259a08e48ff9d3a280917920a088e5aede32677a4b2f9f819c2dca6adb9a
-DIST displaydoc-0.2.5.crate 24219 BLAKE2B ba3396c93d27a99a92ff4a0f01a8d192b419bad25e48d9427b76260ebf2f9982291d77f2eb24d239c0b1fbb097e866a20bc46dc1879fdfc6637ea49928444a92 SHA512 5ca35fa59f263162389c1180331e9df607d9374bcb056cb04bc46c98e4d87277162ddb2335ffa8a8c5f69218abc3eabccdcaa71c21b8dd9081cc4146f266b948
-DIST dlib-0.5.2.crate 5806 BLAKE2B 2a8be2d76c44c95d5b1b9a5439a99a75daa703a341980d8af1c050d6096d45fb748f0acee7f7de2f9433f97ec19faec9e028f57c8149229eecb1827a1ef8eb60 SHA512 4a8f1c09007ecce1d7c829899aafb90081fe4fd89cfac3550638018760e24f63985e3060c4056b55bf58cf4622b1b31595e1c524a75b1b4354b8f3c35fc267ae
-DIST dlv-list-0.5.2.crate 22373 BLAKE2B 9edcbd42af8665750bf633dfea9543db4e5f37208523ee05300a599d7107a57e35e9eee2c60ab9cc1c5dc5d7408187dbf846fb0019a1e7ea7de905e08f018453 SHA512 f2fe69a3a5d319ea963c53e6a410f3a5553d6f6b5708e6318b450ae3b5319a19f9d492bcddd233d7a5a65355ca378bc41232c335deb9c4987dd9350a37afbca3
-DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
-DIST doctest-file-1.0.0.crate 5703 BLAKE2B eafa2ab1455e07bf20006d8a254c1dc15ee6ecd94e2d0f78c2500490419d18a4ec8abb0615b8b444797efd1c1be6c9a8cfab2e8849425868b447a253a265939a SHA512 a02e3071c51a7cf9de9551c84054c3e7ded8823bfeef8ca5a9c7fa0c7e0c49a7221908039ab19541728e0591c5b8261227cde10ccaacde6857c00097f203f3ef
-DIST downcast-rs-1.2.1.crate 11821 BLAKE2B e8a78afcd8d2f17c9505973359e2151d59b233e1757b4c7019047f148b1c8a4f28dc3a0d6eff6cc7f4a7ed986bf592ccf0481dc112768a9751475e1b0dbe27f2 SHA512 f37804c1b1e2cb0ecf2460fd6ab274c843c43e94aa7dfbf4e3c53529cca9b5624c4ea5ab5ceaafd72481165c7335f3cd1f846ae43deaabd18f363572825a5f86
-DIST dtoa-1.0.9.crate 17002 BLAKE2B 0b658c6af9a82f7b6ddfeec4f7c2fe21b8ae65e25674c4bb15d5c39c62a0afd9461e37d01074a0e3cef9085732c95cc1c12a09e2f91e508be80f2b22743413a2 SHA512 996814e68f67c77d68a0e3195241f7034575453401370a1842c94232a35aa41c832f788720ee68947662ae0e8c7595df736810a2b392871f57e6ccb47f55a4b9
-DIST dtoa-short-0.3.5.crate 8287 BLAKE2B 9a8e6625b2358d8f5c1346f2ec7fad73dc566b13f4c354b69a7004b43fdefd8118e76233ca55d8a572a13315504c4ce426b11745242ab713e24bfb774881d4d0 SHA512 da4d7c318b7146775260de71be363fa257ce9b1f7fcee8f5213cf905211379c5f58496d2070a001fd74fd4570a7de2a1ddf4d02e617dae6977e7a1e29b8817f2
-DIST dtparse-2.0.1.crate 31740 BLAKE2B 9e1a7c6278e7029ff1f8fb553e33ac7a56d72e4bf6c013d5f56973a54049411e68edb956b47896ca3d2679e1218a94c9d6180ffecaae4c904056758eed95ef15 SHA512 fcc11c7614b79bb7f5244c2dc26ff6ed7ff69296044a166235c2344e681af425eb44a02ef3b814c5e134f7fc83b910e1576de7ec7281a52ad64a6111928a2b0c
-DIST dunce-1.0.5.crate 8244 BLAKE2B 1499ae0bb3d34e8d42e97eaf551308efc95697366b804dc83c51171a939d45bad46fce9f82a39e17b6b92fc833aecc85eabd2104823c7db30396833388125728 SHA512 36d7d75217d629185a9a9187f7d2e2dc346a28be0ad1c21b1b6bcbe3991e9cd11797e53d745c0b3b5ae94cf1e4cf141cdb2322bab86d97cc258b4145e3b97a56
-DIST dyn-clone-1.0.17.crate 11848 BLAKE2B 1f90492639630036e1e877537328e46ee3fa697d85b2f87c45990d4a51cc900a6f604d077b16575015bbf0a970c26f898226e87e6e2af82d624f5fa565036617 SHA512 b51fee8c4fa3c6b0bc677e9997d4b6921bfee9a11e369eedc649d19eb5d95d7872b533b37fb1ca842c75e714b46afb1231369341c45071db94f09b53e37e03f6
-DIST ego-tree-0.10.0.crate 17436 BLAKE2B 97f3e2b1651b97d22509bd5e23fb0bcf95eafce61e850b929e73044a078294a3be1a82fb97f6d7ee7124eb1a495d0eeb61ef33f9c13481dc2ab986e1a76b605f SHA512 18f8944ac77c40eb173cd04997054f5aba13ac419eabb91e4796fc926b7fb81fedcb0f02d6b57cd019d695fbbbe8b9e301fc3407f68b0a514db03ae5a54e54ab
-DIST ego-tree-0.6.3.crate 10005 BLAKE2B a6f9ba11df3e1468034edc87f97b73805d09c82bccd6769b7aff3391dc5902848702b1af893798c28dcb71efce282e019f39a1488d3d8bd85076fbfc87342a9d SHA512 9ee32ad2d10a0a7d9bd112ae2f3dc4cf803377af87ad65b80aa872f212507b324e525ff331b9eaa2aa958a3b5348de81baf3ce576dc3a2b102f4a0745a51a013
-DIST ego-tree-0.9.0.crate 14873 BLAKE2B 0c71982e000ae2e9d60f19d5f6425fb702678e2b760d04f0fec43683e173986cad0da916473d8da510ede6e026ea3dbe132524871f622558e79ce2dd02ce59cb SHA512 3b84f05d4e257298c95a143b89e2c33ea1c9dd088968ca6f6b7d90e844f4d41caf9dd61d9d539b2a850e7e18d177db3016a849709eafb36cccaf5d45a4a7dc7e
-DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
-DIST eml-parser-0.1.4.crate 14868 BLAKE2B 2be4f508981e6b401114eab278ad2679f961b7c978771dd5c588b6970b2eabe4d6d107318eda67f697402ec6a91d787254e036e46b24e22b51e36bfc06d25c0d SHA512 08d509248f26d4015a5574dd284aa081776530643e26adff73d87ed74b61c7994be5e1d9015e9aa8573dfc268e5bab2479bbc8395d3edba138415212a537462c
-DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
-DIST encoding_rs-0.8.34.crate 1378166 BLAKE2B 528692170cdb1d74ffb0b122a5aee61f50a2a7e4ce6db049ebea4a185e5c43d4ed99e515f08524053a110e061f788f861e62e0b04eb016e7a9e2678235a04577 SHA512 e23b87003814dd6e7e17924bd1f53989a5008dd1da07baa23c40d2a18dc1ab2d786d61e2c304b3f60e73be5f180ae2deea3b4499c0157b6afe3c9273d2f739f6
-DIST encoding_rs-0.8.35.crate 1381050 BLAKE2B 2db6797e4f226b3836c18496ed77f3fb113fbc075864fd264f23c4fec8396eb3a01c439985ba0586a4464ac4043ddd3acac80e0ecf897cb59569e5065ce2137c SHA512 4b55b53553c5cb6fe05ae81d1c6f3b0bab73ecd3d426b15c58b9de9ea8dd61617bf0bb2e6d3ae2514c7cb6e73019b1a083173d1423b3ece2d190770c597114c4
-DIST enum_dispatch-0.3.13.crate 29876 BLAKE2B 8fa66a72b1f35e174abcc8266e8a36e835923a1b31aa2fbbbbefe3bcf1287bb01b456597915c0a36a9ab7e6a6cd0ce7ebae38c09028ceb9109b7d18f26f023df SHA512 9ff73db5852d8c515f8f3beae0e62ac3845b42fb39a2ecdcda50e44535e9183790406652024e3f968ecbf4413488a02344831c45498294ba97c345b31e1d0782
-DIST env_filter-0.1.2.crate 13327 BLAKE2B 96f888b30ec8b40032e588f8ac73e9fe23340af71d5ec69cd8b4dc2bcc272ecd64d1d3ab54bc57e7a71a44cbac497ee7ad3df52930dfe3c7ba7dd129df290b73 SHA512 b1f21a5d4aadfd940bde3e53935c04da48e48cd4f825cedaa83968a08244722aa4e92afb9fd2fdd228412754f040f7bb68f24e05c0bf9bf57783aec042808606
-DIST env_logger-0.11.5.crate 30683 BLAKE2B 9dd2b461be5c5cb3411ebba8bcdb53a78fff28c54fafd21a0f8c3fe578ebc3882ed5df63a5ef9adf62bce00fb6360de895457baf75fd2ed1a6730429478c32cc SHA512 e2ab1f117227ebf8840daaff971c2533830c0e481797cdcaa055a4506ffef78fc0830bfa13295275c604273d494278d43440b987132f97ed6bc1cf705e05cd8a
-DIST env_logger-0.8.4.crate 33342 BLAKE2B b1bb359be2f34ca6f93f72154c86920b8254f574b48f693b2ae7296cd1ff25d34dea61e95fb2954569fdebb6c522c851ef7499c107005528aa2226df13b0de33 SHA512 9e4478ff609a2e1e1a902a55b221af43a52622fdb5668dc33fb0be354b964708b7b6d13b7f1ef11982f45fa7e71f0712a2ab3fd4ea98155a5115e5a7c3d33049
-DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
-DIST erased-serde-0.4.5.crate 25459 BLAKE2B 0745866c0780b8635861ac9c6bc545742d5b1abbc7a42e299ee5fc7092803e709892987b2a82b293eea5a610b410602c5f4f27be3503b7467ea71eac01bcb028 SHA512 56ecd1be8f756a852102eea15d6e79b6c1c5d39c87cac0a5595d050fd3a62fda6b2bd81b9370dbde806b3b1b1c664a994f968b418212d0453b47a458313968c8
-DIST errno-0.3.10.crate 11824 BLAKE2B f9976b538868daba3cd2d47ff2fdcda16b4a436ca767f865f23d1139e7f232aba263dd4aa38d573442c762999c8a8beab8a4a8c10649d21b49090fa65ced1ec7 SHA512 fa4b9a368f254cd90c6f69f6883af4c579829a6da6f31481a1b527ac9602c8ffcb5e9518cdc32c39b5589c151a20e75a7300c8a907d178346185ecc6e8749f3f
-DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
-DIST error-code-3.2.0.crate 7569 BLAKE2B 815e83d67a1f257b4e9b3058ff849b3c37a44a0339b8a3ba175b7c3cf4794ffbc76369ddb433ec278002200702b83e32042d62e5603af5010ad4df4c9364c501 SHA512 d3a6dbfdbc1626d9502964dd4615fa5d39f8507996fe6e727bc694c1da54c1760b000d4827bca7a2190db5f04b8549c6345f262702eaca88d8b83a43649c37e2
-DIST error-code-3.3.1.crate 7646 BLAKE2B 7b81bfe1fd4bb73a696672424b293f1ab60e9c2cc2d91b1af6eb226b611f577a42512de4ada24aae41524b115039b5abe0639e63af94a5c20da59a9a5c282a02 SHA512 33611da20f014cf833e9eb1d966482fc000760e6e6d66cd06ce26b2e343039f7b7831fc15eb8fc029d6303e6b8e3884b2906194d6c8af68b18d9c5ca286fb1ff
-DIST ethnum-1.5.0.crate 58370 BLAKE2B 0b68da1c41746f0bb96e3e92b67aba676eb3ebbf11197497fa1b0c1e84d3673ce078c5955f0506f2b4cf06071a6f37b2ff8dbe5db388f03eac7f9500436ea44e SHA512 7444a4bf004bb60dfdb7515fc8b8a1f56d123495a45e5d0581fd64849d5eb983a465353c439642ce0bd10679a33b8fcd148655397528f65f0a4f6c1adaea05b5
-DIST fallible-iterator-0.3.0.crate 19639 BLAKE2B 58b8fe842fd6514fa4327eacc81b157a4a9bec4ad9b8e69248c0f0aa5610dbddb9c8a72e6e6ef9fb8216e8f79e6aab439e90d4d527e35634ab222347cbe39974 SHA512 c655918fcda5deb8ce792708509e4959139f113c1006dd41b94d7073ffc204512a22cdeeee05c87534db9c414da3f4eb716e1a26970646fcb1c139a14eb8a2fa
-DIST fallible-streaming-iterator-0.1.9.crate 9249 BLAKE2B cc4459b34a9ad00552a5248d090d1f25804b92838f41131e475abb83ae0b89401248feeb52a49dbffd499ccc0ba0f2f1d044f2f3e9b06662be01fe2257a4e885 SHA512 34824e2007cb944eaf54b10d6d3885bb17ef2a2976c6dd7695ff82a937cc95eb65d343dd7a5cd2fab5aa5859faae3352a9e1c78f239ff736900c1dbc3f5ef7dc
-DIST fancy-regex-0.13.0.crate 85930 BLAKE2B dee797093765f8f1ea6b8896cd832983fdbeafb23828b896811f2657e135b71e374a713fc37f68ff128068d04ae140bb2864415db1edfa2e300aea04ef597474 SHA512 0e7ad0ea46ecaf9eefbeb696bc99aa725022d92f0f11b9f3efb8e81a80a058fed08816d3f9efb4c5fa0176aa1b649e13f5ea18d3352f75a7d2be772fd531f744
-DIST fancy-regex-0.14.0.crate 86969 BLAKE2B ceb9428b0a599d7b1a1e5f8aeb383fa56d4ac147fb19a7ed05415ea2f580df47de7331eb0139017941416ffb56dc0ac7575e018c0a406ccfcba50db2e42f94a7 SHA512 7de6eeaedeca5242538c4fe3455bae061f11a79c5c115813f153ccd5adf2cb731ed13396330107d7aef149bac1de483a044b0c9dd6c4baed454bb6c87ddb3af3
-DIST fast-float-0.2.0.crate 41609 BLAKE2B 3e594ea36ad8af7188cbf4bf95dce08a21e88cf5eab5ab88df59935964d3fc8b3aa4d20c94a5cff0864b989375e065a4598c5a7db136103a2cc85aa316175ac0 SHA512 cc7c494ccce35c4e10664a6e58ccdaebdb60c40f1f5372b89de7691140adefeaeb81cd7e7b61d4615bee2e5b322481192f54eaa394258405364787b0f16e9285
-DIST fastrand-2.1.1.crate 14983 BLAKE2B a4535b1612b103376fe64d71a393f7bfc37668c574d9122ca90a631aeb91cf0895bb030e597b79a80a4a37ea4d514c4c0836332030bb10a60bd971573a6d6ee0 SHA512 9a51185132c1c89fc31af463c664e996f431e607ce96676b8301f28ff11a99661d18025dd460e3332e373af68d20017d96481719746fc3c5de742d08d63aba3e
-DIST fastrand-2.3.0.crate 15076 BLAKE2B 15c9a1c4f64d94c4bfd38ae139c6fe19b6b621a495c1b57209edd6d76d978eaf018ba77f356b5086c3f462a6de044fb5e3b172fc288309569911a17ec39951bc SHA512 267fecbb7459c8840f03425733d278dd6c4e7637b85b99552877117ed5e8015e094d86aa95841f77064136b7f382276c3cb2c2bef7b2881d272f4aa57c5cf947
-DIST fd-lock-4.0.2.crate 13675 BLAKE2B 055e7254c6ea0185a099cba229c15a1044a6c0826eb6151e990134c816be4dd26bb8ab41631be8650340bacc16324a706656d2901c3969354a854216ad3cb306 SHA512 acc5aaf6e89169062c1c59d5258b590d4bde21a35f0acb7da2e3167d0668fa678d1febc305e32d95329a7e5bdb784fadb9b85417a5e4e5deea53d59f05bea74e
-DIST file-id-0.2.1.crate 10240 BLAKE2B b23e372541724e1b6be58c50afecac994b4a2180cef45c8ee0ab86c2039f5676f996d0420c88deb05859bf4dfb2366e58a4dfff16c2ce5ec3d2d0e740bc661b4 SHA512 f6d77d9cbee1d95415ce64caebc4c6e662a8ef05a72b59e4daf941f9f0746706156372dd2d9702ca0bf6de800bec05f9b35d81b573965583df5aa35f86d768c6
-DIST file-id-0.2.2.crate 9531 BLAKE2B 18e2bd5398fa720725068be894bddab49f48c61586a782e753781877911f7819c8aa38cb237c3eb7f95d659f11a85c0dc851d7ed04ae7ffb51b75fba027b7e3b SHA512 612d1fe28142c8675387fe24c5f6ddea7b46d9fb63d447a863b61f7fca30f5aebaa70d9a75183355c706d267c4f0bf67d4877a62d16de2d97d6e943b8e9f71d4
-DIST filesize-0.2.0.crate 5066 BLAKE2B c43cc098a2b4ec4f9a2990ccfb17a6379e7eaa01686cf9d077ae4b3f80f517f5abdae2eb3244989f0fc4e9a1c6c9b6ed1f43921d3067d474211d74fe31cb75ac SHA512 d80ca58ed1c2c9959cb98033c270ebc520ab050b812c17e22cb1bda3cfd44d35542e56c45da36765873e9ef18f21a01b8d615bafc6bdfc9cf555d9175b47bdce
-DIST filetime-0.2.24.crate 14938 BLAKE2B 85e05026b35ba195637dec12d2f47cc30a189db0c565c2aae22ab1bf407e910874abebf401167b0c330c790f3e014c37108610063b5428031d28452eb78009d2 SHA512 b371bcdbd0e41b875de623c7b7f122e8f0e421382e741084645372b774cf09614eec9fe74514c90199b7110e8af27c62625e92281f3544afc9374889372c27f8
-DIST filetime-0.2.25.crate 14940 BLAKE2B 1ffcbad3b2023ba5e9b2d71e279fd8c3564458b28290f3e19bf43b87083e1e3c0e18f191f6dc67540baccb83075df453950230089f243e6276e413321cceedc7 SHA512 90b4f3c4df29a3456c393f78f636d70f2615cba748a972dc9b937c2fcbbf4544f5b0d28c6c8fcfed5d5eda026ac670afffec18ab7d7127cee9afa2717146ccf2
-DIST fixedbitset-0.4.2.crate 15954 BLAKE2B 91270883db5ad0e999ebbca1123d8729d3040eb936034ab8da3cda72a830e45fcb977b3fe3c2b94e870c1fbc366ee8602357bb77e8b9a40cc41a04afad1b266b SHA512 57c5d756b0a202b2506270f0d5e890f7617a1e0c015b6059ea23fab49cf7af47fd06927eb56feb03b37cb2b6c467e326b3f0da1e32cfcb6339cf11a130a3ccab
-DIST flate2-1.0.32.crate 108760 BLAKE2B 93caa44a44945461e5b9ef1d8385e61579e92224c18c43ea232d5902340caec9939f450df659a105135bfadbdc19c380242241a3accc2194217ed0f3730aaf17 SHA512 b1682f105180c6950c91ee44b68da2c759ebf6c19ff6ca36d2cf5012cd2a314f2df3ab8460e54619298ce9e7299d8ab01fbc58609690d5f2db8a3c0abb6ab5c8
-DIST flate2-1.0.35.crate 109188 BLAKE2B 8bd6e51c3bcc06044e5b8d7ead950c3beab6c6337052fd48e86175f0fc98c8d12804274308ee515dc6156bbedb2277dfa2706cdcd7baaf2a789122473248486e SHA512 aa2c4f0ad46cfbc7d2bfbdffd226eaa37f5223a34d132d8fb2dfd04c20d15a96c4882cc377fd72afbc7d13e512f5e9934386b0390a0ab2b171d081335c58fad4
-DIST float-cmp-0.10.0.crate 10702 BLAKE2B e1285cdaa5abc561cea8916bb89cb022da8574faa0070d05cd4ab7537b6e429220ae9a11db2ee24551a52eda5b541c157b8d18f00f27458bf380b45df6f20f00 SHA512 024d6cce0c16f56e4f42381fecff1f3c6b9f960d62e81cdd78b1c77103dc4bbac11c5d656d44ec5fcb644edcd7b9c1a905533df3d758470137e48e3dde4633c7
-DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
-DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
-DIST foldhash-0.1.3.crate 13712 BLAKE2B e5913d3aa493d0176af9650354d98870b7e97523ca743a7d9605da3f559463654f391e42438d96fc797397ced449f13ce499c20ed5db7aec772aae97c5f29175 SHA512 844d5b699db632254dfc378d46e34909637118647250e2382cbb88855f6739fb9b5f1b840bb8e250dc8fbd2a97c9155e5d8fd0c5c760b8e02dd0aecd96818a5b
-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 foreign_vec-0.1.0.crate 5198 BLAKE2B b06371724a4db1b9a1da25881ac965552e9d84a8219f80c3023878348ee7f61be8d4910312f21c7577f4c3b2dd8ecb50bd9882986732f18788c793434a1a724f SHA512 9155f500825ba553e574f4c83cd39c6a96fa7a9b3df328fa04e5a16aa1df8f38db140bba29b5e24262dd01030b9272dc245e59030ae4c07f07945683846bcfd9
-DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
-DIST fs4-0.9.1.crate 19021 BLAKE2B 74114c31527fa373df12809317718f631af3effb120be681a7958cea3652db07d934bb776458f00ce92e661b21ce51cdf8a223c76164cd4e6f280013bd93806f SHA512 bb7cd4c94686f79b7a52174449ba6748c48e260e82ccd860b1a528dae77e9533a8d96416b6d00042f98433018d78486cf7eceeb4267732b6e79f46c6d5db4134
-DIST fs_extra-1.3.0.crate 31298 BLAKE2B 96dfb4e886767d3d3850d94cc789867c3ed461feb9da0ba90c600b2b41c3119067953ba795cea5e6c8c338adb6fe6426769a6e6894ea3e02eb1ab11794eb8d5f SHA512 090d2ace0517b86dd2f54c5491366cbb6e1677f64cf64f024f7dc6a3c42c4f8c54b215e954572e2df10ae7f0e956890ecf7ccbeebf66b645c7647409484c845d
-DIST fsevent-sys-4.1.0.crate 4620 BLAKE2B c203c774d5038d4c4abdd7bb9407a6b5f2b203a609bd92a7fde38afaa71248f4610e89c73eaf982a5d76560f9503081b7b10573046b1a91f09de4b642709417a SHA512 e702686629557b879efaccd37b03a7ec515eeea29d8f8ba46f82b8b68ad157ef9d6b188be031f806d8fd27d4e9d2689cdd6bfa14e4ff77493a7d0be3ef1238a7
-DIST funty-2.0.0.crate 13160 BLAKE2B db6315d63fffe9f70698da0b1b0e4aea4b509242c60e6639f00303dad8d2ba60c6c1c04fe9289695b7aa2d7a0c90c31fba72656afa7ad111b77358772b14a9f5 SHA512 691e1c275b648110ef42c4adece8178cf037bad40d469780280eb2ebe07aa4b0406737c5ba02c9f9f63ee57a99fec27e5e51712e2113655f7522c8678f689155
-DIST futf-0.1.5.crate 11344 BLAKE2B 2cc5e5f5d4ace47e9273546e46c500432da47f246cee18f24607432305dec9481ec3d02b8a9bff4724efe05ea1d235294c52ee4eeb2f5f285ce56c2987b62d24 SHA512 4cee071c067c879742839d3d32192ca94ee2f9241468656357c3aed116cb7c656bf81722f32b67d60214b7db66858dca6443f0d52f0ff2114fc70971bdddd2d3
-DIST futures-0.3.30.crate 53828 BLAKE2B 4e595639500f7147ceb994359ef1656ed096ea679409a5721c05ff84ba439fe4e82563a7cf8dca9aed4cd16b03e89ba1385b0a34feed9d4923871225e131b91e SHA512 98fc67bf1047609c8bb0763c00ab9cb39b6a6d0cb7d993bce4966ddc2492a6578b789e98095981b207ddd73ac4b1dfcd5224b352a0e970eed347537c6fbea43e
-DIST futures-0.3.31.crate 54953 BLAKE2B 4b91470d3c85b9260c734dc6be8c985f78491b599d2a6ec0d1e824b82f684cd030be6f64179f7aa7c1d1fbc7cf0c5a1bc5bd045123b73461f490d7c2b9011f9a SHA512 a08d23cdac9e162d0e6ae72bd792201ff4e13d7ade6b498cc597149b3df2062b06814804c0750d941d8b5be5d2ab4cfebbe2d08a98d875d2092bf25e6e71a51d
-DIST futures-channel-0.3.30.crate 31736 BLAKE2B 57461dbb723fd53daa07b2fe6164125508cc3901e0138d2a60da5c814ade415a3611baa45c71487f1853812282ef358c132785ff40c630408e8544d57eee3483 SHA512 689531748821529c528772a6dd0f27362078ff5803d2e0b431ee5a0ecf8787b5a15262d65d52f48486ded46b88f7a9c477ad95cc2c5a3e8f5f9b9f53f367832c
-DIST futures-channel-0.3.31.crate 31971 BLAKE2B 2a59ebb73f998ec307bef01e997bf2922556d6dea10e2e6e8da9e1b4cd05a8bcfeef01bc1cc57d79c39bbd98b8a0d26871dca5c7641a9d4e9c2bacbb3feb4eeb SHA512 87e49e661cb12c1e03a07d3c94ca9bf5954344a51fa11639a118f5a49877c883387343af54639ad80e7196062a77fa7c9b9aff9804fb1e6ea3d0eb09efc53c69
-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-executor-0.3.31.crate 17965 BLAKE2B e111467391cc99d1b6a1f5fd3aafdb86922a2d2d9e360112402d68489577527aa35f4f65e6c0dc8f48372927e6d7a6a4a97c7b9525c369cb14e34ca2dafbe64c SHA512 337e70bd3a3bd3075b51e2afe8f157902ebe486696587cc2706b6a5770478ee2ee4216aa9e155e9821ed1d02ba437cdd3abd0c05aa960378ea192e2ed39af564
-DIST futures-io-0.3.30.crate 8910 BLAKE2B c9af4290f45a9fd0839e107fbdfa4abff4f9077ff45b61054670419076f1c4508d7d560d4d86f8cd7ce146e436e531b9f5e0abfed2c4f2406c57be209cfdd498 SHA512 077acf5eab1101917b5b4b4b83347d30d533110d9a34c2de6db1411ffae0f0530f457033c5a5c14249119e89375c9f12127790b46e486dcd003a12a6fad48bc2
-DIST futures-io-0.3.31.crate 9047 BLAKE2B 667e62b50be304b68b8437d93b734a0e2433d88a3b410010ed0b04eb2bbfbc9984454c3f0a591f720c9983582c6421d7f870f0733c31337c4c518112f52aea54 SHA512 16d21388f7ca083d2c618ec140cb2c0807ca621b8c338698c367d862b99133ec9edda828f051f3f666472c929e7bf7a5cb334fcf167109c7c392c5cc60b54fdf
-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.30.crate 7852 BLAKE2B dc768e4ec4c9f9dfb22a20c1c977401d859072b9222e6f77978332f495cbd0f764b175a679c9d7c77028d7b56cda5e2d86188ee979c7f323187defa6a0485ce3 SHA512 1c198da8f4118d9a9ab2b597e3f7b4e1ac7094dfa547bb81f3c4148c45216ef55b309255849174a517ebddba6c874283425f1df6e56e2ba5150af091bacf46a3
-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 fuzzy-matcher-0.3.7.crate 18047 BLAKE2B 934b90a74826393ceccc3e433df7cbc056a10744077e7a2178df9d9edc9db5d4cbc86d006c0ef1f7d82f4fb8ea0d52df71be1c7cc9ee39b433207d7f2126404e SHA512 ebcb6de06dd66da952183c75e4a44988bc60df17f035fe541c134f1c4e3c33d18a7385a9867fc23a99c07cef2b2737edd6128dea6546e243985da2f3a55dd8e3
-DIST fxhash-0.2.1.crate 4102 BLAKE2B efade6722efed1cff0bcf307ababd9c9031af297baf410367212758411a21d61a473456c7f9b5cb15e444d115a62120f140c082e70dd360a3ae83f2f71bec9e6 SHA512 638e1c0a4e7f365483a329e715afbc2e57e47c03b32e0e1818c879baa96996e81dce8ab39320e24a3e1633f73dec1e5f18a06c37f3ad38043002fc99b55efc38
-DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d
-DIST gethostname-0.4.3.crate 9336 BLAKE2B 12be5fdca0b6e3788cf3d67a4a80f283d240611b4fd37b6d1c37eb2503e4a7025b17bbb70adf421ac840d8f952434bdedf4691f31362780a267e21e8c4d3a006 SHA512 8c5dc404132f2ecf9bf82d8b89cbd698b4cb6d43141c47a60b95401da2e8c314347ab0a0ad5fba50cf98f01a621faa68293cb78f48977d3ddfe6e6f21926abf7
-DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb
-DIST gimli-0.29.0.crate 275756 BLAKE2B 092e5bce9503a337451f63706e7ae7d12a4228db6a43d2c14fa6af74640a790ec70ea2055ac84db3919d19612ee6ee0453f64981390667abec97637679ff06d3 SHA512 a6b591d48dbe93a1fa6b814759a5cb61fba0838288840667aaecf01346a3ab862fbfe1cab51b057a425ba9a0ce35c8421b28cd5195464be881f38905062f1446
-DIST gimli-0.31.1.crate 279515 BLAKE2B c8924ce351af5b8f96ef757a189f7a9be14533c024d496c62037cd4eda790b3f6282cd3013ba82ecc83082acab1b60ea80b83e0fd5f8eeb381fd7f9df88ce0ee SHA512 b9c8c11547dc7420fe936b9f32a4f5ccf3bb68d1d9f39dedffd40d631360f6e032e719d858668826f1099b8a262e8096aa7ae1f6d7d3d7aaf47934d832715949
-DIST git2-0.19.0.crate 215910 BLAKE2B e6dfbc292dd580dfe2b5964745d73c29ab4e43d91af37893eb2b915c7967d557940284c388b5693c8f366d98979cfb43f184627319799a359b2ec40c6d875a83 SHA512 9d868ba1594ace291002c4a10dcd43f192dbb8c2070abd74883e57a7f53825c7a29080ecbe4279f6c7ee845c261bcbc93b10004b99df27de41cd29bd48e137e8
-DIST gjson-0.8.1.crate 2975684 BLAKE2B a6488541edef2a5d84f04d0b3b7f1be30bb8c3b192f406d1b128b3dbdf36a74da0deea1beb0d0845f3db58642b9c949151a5cf7098573ab8a2e67e1c7a29e16f SHA512 37f1a06d7002873991c67dc551c6db83dd2f6d6702eb4b3656b10a79a4310ef8dad01a51650b601413d96cc5fa7a5bd1dbaabfdc406942fdd35c4ff99d9e55ed
-DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
-DIST glob-match-0.2.1.crate 13599 BLAKE2B d92aab7dfe3cf3c05a3f05cf1b246aa88b118b404e681584aa4111a75dc953998fde38a1daf68ebbf9234061d9a66ade04bbf3852f7202196951af5b42a4916c SHA512 fb64321ef2196b9c047d6cbbb74e59a304532dad68bb9feeb446c7c1998bc7ba962f3c32d33414b945d276e1c9854d42ee4076c177a793cf1804c67e0c1d85f0
-DIST goblin-0.7.1.crate 163953 BLAKE2B 5b32de08d90b01413f80c419cdc85a005c826d5430d38807678045c7467a026bead4bed253b5ffca8dfd7eee4d62c010970e5f7746f6f2216ef57af6a9aef740 SHA512 4505573c29ee5775b2904b79c63a79cae7c6e3120dad68319152636fcbcd4b3d58a5a0a6d639bc34a43cd12e0e46a986086c88dcd59c2a743b2ea2bee0f16e91
-DIST h2-0.4.6.crate 173912 BLAKE2B b6d7c0d9f52ef65c779b5c17c0f7ede4ea8f20bb31aec3b7d4c95297db4e642286f5e5dc7c463c36876ca75e6b855e683688b0c299750baad68bbe981c2b9e4d SHA512 d583b9bc2ddd3599cdf8d9ccfebc4c433bedbdbc39c562207946f04947ebcec0df075706b31ab903ddbbf3b8199d84abcc143ce8823c68643271078177abdbdf
-DIST h2-0.4.7.crate 174114 BLAKE2B bf146baa6f998b6d95bfee77f190be7f85af5304a8b8b9931674a35a0ba0a1262d26ba097149327482dd988f8900e996086a820fd828fb023e52adb104e21bce SHA512 0d56fd3a67473d98199e0d944d2bc094c36638f3a2d986942e6bb2e1c8022e7a53f184d5ac5e8d435ae97da481ddb8d5b2a039c70180345c8006290fef39a59e
-DIST half-2.4.1.crate 50892 BLAKE2B c275a9ec70d2fc0c50cb63421399202d31252b0dbf463798ed0a12a17493817c66b8933811d483b348f8f945cb05aab7cc2a4d952bd16009c3da4860202e28dc SHA512 0bce235583ca128723186e1fb50f636b519bf826c942f02c5b969db4117baa87c644665c541991c16d1f1dd97c7233c017a513d45075fc72c5d99ccc7c1ac193
-DIST halfbrown-0.2.5.crate 29010 BLAKE2B ce570bafa1d3172b31c99b5b75f6769dafb7ae8017bb83cfc652b1e71ff9a5de2623bbae3939819892fa9f58ed1de5670dbd199b42f6c7ef2478261929561162 SHA512 baf98eb6d4c906a227bd9ad7a8601973c63d792c10bbf8cac6ea66848d3e2a91c1d9cf1020c709bf8a26bfec50fd43fc9f01146f6286cf88df9f2c5474a81e60
-DIST hash32-0.3.1.crate 10273 BLAKE2B 0e619f4020f86fd357156014e5b78018827e7508dd69022d3d008caba3e1dfb96502ae00847bac3724cb7184791ed8a56a46479d61b36ffa14fa5c32a2bf56f7 SHA512 e6f7c1be545ab27c0859ee51509fecae749a97f79f91f6742fa66533064fc1c327587e3fe875965c513824e64c9b58bb6e212bfead636ca3a2aef066311e740f
-DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
-DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
-DIST hashbrown-0.15.0.crate 136460 BLAKE2B a2bc34b9d2eb7ca52dad7bc59e9bbb38ff9f79925495e1645eda7c0587e86e0a3d0675f8c7f159c5a83dfb2832fee9788a7ba6914168b51c26f762e140bd05b2 SHA512 497310e0f8e256e931ae0e752f66eb3811d5d3b9254dacfe2a1227e8532dc23eac8cce7a3f0758fbe0e0fd8f08b7bb18b5f118dbbf4fdf575a31666283583111
-DIST hashbrown-0.15.2.crate 138478 BLAKE2B 453888ce68b10cd6e93d787986603fceb29b83fe2dc417e7e57316b9e0060d0bba51ec7fb71d46a038662c99f60deac8237a8f349297208d1d223bcc13f0d0ea SHA512 d6fc0613623f9313533dfcab1240e97f652f78f05baa21419f7edb2eff030c4a2c5f426d3eaae747923cffdd8aa9cc2648340e5fc229395b5eacc6fae087c8cd
-DIST hashlink-0.9.1.crate 28928 BLAKE2B 14276fe00fb8aa7a8183b5cedc99eb403c0a68cb662555cd51efbe55a46c864f68f3d421395f56defcd1a87576c5a38509581adb5d02b831d9aab2efdd376f9f SHA512 16189f332b9e2a71f8cf4c8b72485eb107c4a84d4bfe3c739ecea8fe5dec33ad3c796d57830b12c176bc65a2066913c809a0f7c8db83e9da1bb0c555de8d3717
-DIST heapless-0.8.0.crate 77802 BLAKE2B 8ba81c82440701c3fc8e5f8282e71aeb485a78a1c724334f25534ea3bf30c3ab78d95facf3585aa6597c24ee121f2779378a8364cdd94f756b461842b5858dc8 SHA512 9cbcc4b5b763b9478d0070823aa0412805e4b08f28cdb92b3ad6c6add997d0abac13f25cd6a1dc05136d2100304e8617af55f165a4acad3499c15407d7b3aab3
-DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
-DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
-DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
-DIST hermit-abi-0.4.0.crate 16310 BLAKE2B efcd1dee7bcd6d185cbe0051c7bc7e2776857ffcfd2adc3fb101febd7c1bd75994b7e4a4a0a59c5b4628cc2521b4c1f043e98a0c44935d0180e7499667690ab8 SHA512 b1a21f6d54598185a8e8c29565ffc2e1bc5da57cf1c9d87ba643d23d7c23d53e8ad36ee2f5c1ec8a504334b6f98b0f17a832ff37877c7b7f9238b196f4034e6f
-DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
-DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
-DIST html5ever-0.27.0.crate 72913 BLAKE2B 0a3dc8b19ec74ac5b5c1728f9112ed7513285ec47f4e3a3623b995eb9ed0aaf2c83899126268cd2b3e7388a3209952213d4fe0ea0d297e3c0f7b16aa1b5b9d4f SHA512 8d736fc122da78e9ba8b546868d0770837ea0b4951ff027f1b5593dedeb9831c082dad1868659422fab5527711ffed18d4428d519a830a3434d4594a1af6c868
-DIST html5ever-0.29.0.crate 76773 BLAKE2B 074f49c764ee38eb0b1651d9cab5b20074cdce6fc6d70129404c20788743557595f1715d215cf6d202bc9f4fb47695c55b0deccc04cb0eb8a1fefc4f3fce9c42 SHA512 d2f0bd4fa627438c4024a254b87681f42af86c0122ef9c099a7f21cb0912c9503a1bb750b7290bb5621c916613898e58d8c3cfb99cbae4c0be176423dffeea18
-DIST http-1.1.0.crate 103144 BLAKE2B 7a8c4ffd3ce664e1f575bf4042ac0f15ff42b200fa8c6aa27a6686d77be2de7cd3df242e36f8cb45cdb822bfa96011d5d5dd7bb03122ae5bdcaa15bbf9d40051 SHA512 1c29f25a8895a69d815e21df427dfff7924e9040d01c55cc3256dd0b5e72b670fe75b1414223fb971c16082e4b26217142628be5e0905994da4f08b52e7f4a33
-DIST http-1.2.0.crate 105932 BLAKE2B efc9fc4ccc4a622781ed895f77c1752baf34e82d249acf97687ac8d4260aeafb333040833d9f8df5916cb105cc8217c8f27ddd021636b9248ad551ebfe4d83a6 SHA512 2c8e7234ec3aa720c9dd762c0bb06367fbc39ea89446fc9d8d2e55052a4ac461559a20a8294c877879f3e94d5db06fe41e2cdbb9664ea7ab1bc8003abb038bb5
-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.9.4.crate 38555 BLAKE2B 24949d12a08fad7c90f57de628fed1cf9d0a726ddf1b1f66def1d7037f509406911e6a54067eb299436d865881fcb5b4dcd54bc9a7fd166f9ab6f562ca29a3c7 SHA512 7a6c34cd0e60aea6a4e747b1e0711c7227f0cb6f332ed34b8b5424ab2d21772a77e60295e4df6421e921f6f9afe1e9955db1be5bf1dbc065200d4aa7d23a4aef
-DIST httparse-1.9.5.crate 39029 BLAKE2B 3318ed1d82f1cc52cf3596a133b59b9613fd09b6e50e4cc0073fbd37275fe53ae6dc23c322569d06272068cc196aa253527d45a939361797f6c77a488ebda874 SHA512 88f4489610c6d3338353731c38cd368a565f362bba1e9b0e1e9cffc1ad9fb871ec2282ab1e3956947e41e0087d1170d35a0e2b71b9e823c1acbb7ee4c6c8f48d
-DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a
-DIST human-date-parser-0.2.0.crate 11931 BLAKE2B 8aab9be4734a3ed6aa7cfc7e6844f26e2de8abdc3f2bc16b372eda3c725bfc60aa6fb2e0016389aa514a801775a4e5fb7981b897c4a9f80fd389f493a4c8e7e7 SHA512 46d825fd75e23bcffa05261e52569cde2dd63521ef97effa46ad4b6b33e0e580e5cbe8160dc2279c61abe9c7569683eee1888afeb65abdd1bf4fcdb78e466062
-DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
-DIST hyper-1.4.1.crate 151849 BLAKE2B aa5f48c38ed54de8d1b8ca0236acbae6bc30d530156c3f4f429f89e48148dcfd0580478041549a3f43faf38b30f36bc41276a272463c42c80c1b45a7b24a236b SHA512 0fcaaabfbb606020534aaf0cf68c9f1be3480f2d1b126deec30ba2879cdc3c7c7a24bdc5a2ed81aabe8be4df36b146ac1585ed8d07181dcb743852ff3fc0878b
-DIST hyper-1.5.1.crate 152653 BLAKE2B be470a4a902b464d95f30e656f0f54c8a426308f03f118aecf583a1994fb12ec8229e09b43168d856adf6d3dd39d8dd0f97945d4202f4badf4a3076eab1e4dfb SHA512 ec90992a7569e8e7fb3e4a9250131a272851ec0938da48730198ac41347f82e7a308b1c4ba8b864de58ac849367d4360dd2d8a03cde58b330329949e87ff85d4
-DIST hyper-rustls-0.27.3.crate 34834 BLAKE2B 904bf8cd3150b29f59ce29224f39d74d41c940d0588847e0e16cdb84b12f941abc1d504c3d2f51729fad38a93a69125406e14c05488b06982a371f2333f78c02 SHA512 1a9a9501f11d826ee5960deb1a4a572c724ab6563220bcc6544215de04ce189649a79bf18fe8299bb9cc30e925de52318533a9dde4d4aaca402088da18080295
-DIST hyper-util-0.1.10.crate 72887 BLAKE2B 9d8ae7445ea56505e19f57ad680020b748e943a5cc3eca7292c06d93be1b58499db5769b214687aba53a0e9aa6fff3b3f63d1623157350ea826cd2decaf8d0aa SHA512 0a16c5d8857cf522bd53017dac50e530ae685c512eb55221fd6808299c7d716815f7b8192f8a9a504421b938cc0536bd497c7388d2f70ebbd91c46b644496b2a
-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-0.1.61.crate 27685 BLAKE2B 2091f0bdbfae3f63ff846e27136d9779a2d65f85cef899ea3ab0ff7c987329e6a584cf49c57de566f08e0277bd4981ac3db30ea0cec6a6757ed50d96e2c6583f SHA512 d16c67f435606334042c3a286350db46ff3409f142c0782509b136150b4069aafff0dc5c2ecfb7519dd8d105b9a2e6649df2a7bec33ee3966dc94034c9d5a1c4
-DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2
-DIST ical-0.11.0.crate 29407 BLAKE2B 354f92830a2c3b2c16e514bac4f37470d93d71e98dbae388d5e8b46cb7db93a148e98b73b4db90e625ede326ee7ea980526bbfc5714c10928c89d2adc44c792e SHA512 5cb914cdcad0f3fd54f3ed7fc9addc2bd1d9e570c4e3878f35ec09e81e19717ee76f771eef71602a69d70744966cb3bf930e346002b4b4bf9240f738b0988575
-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.6.0.crate 85204 BLAKE2B 420a3cceedab93e5023b476f9b6b93e57057238425d4095de59eb9490c2a088193873e643dcad2f739e34e5798baa9a18939424cac1afc5fc7b93ae496ba188c SHA512 c870348691f5acf97e7bff25c805e60f2e9db9e3ee7b3b939b7be45b6bcfaadee9880e6ad27adbbe2545865193655b5fa9de18487b7a1d030017b2fca48616ca
-DIST indexmap-2.7.0.crate 85335 BLAKE2B c7430ef510738ac5fc4658f3e4d927ca5cde780774a07848791ea87503be09fb4677c52803f6cdaaed73eee600f47e0595ac3db74a498947d0e180cbd10fb7aa SHA512 efac370b9f365a49489aa2c5406eb503044a4df7d6ceb772e0191b02244b6c2c1bf6c43ad4c8924160c1a2bd76d46c630b500a1c4252fc52366295d1cb04b48d
-DIST indicatif-0.17.8.crate 64869 BLAKE2B c534020b2c7b25bb07cdd0fd4414fc817506647cf5b8e2081c22be58857d5adb170082a3756004c69187619fc5625f8b9a1904566dc51c621838e09ecda5b43e SHA512 487e73445c5c7d3c16d6f93a3d9767f41b37d2832e56851154f8b69e678ab7d9ab04eba225a6bcf8b48842ae0db0249b060e998e29a252dedf8afacdc88b1aaf
-DIST indicatif-0.17.9.crate 65246 BLAKE2B 9ce758e7dbafb3394d632a6fca910ea3d1237309ac9bad0ca1236cca9563abfc442509ca96fda1cc7be6916875416cf2b85390c53266f59bc18c6589addbeef1 SHA512 a0d798fa86cc4b75d080bd233e274d6554d82e1532b3590d27b9fcdfdfde4da2717afa16ef42b180ca0ad43ad151db8b0963890de106e36b6bdf07f87a519bdf
-DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f
-DIST inotify-0.9.6.crate 22971 BLAKE2B 7a6cedd29b2503911fb42324fe3b4f4f20abb62a6b4370f8a7f634d9988f1b3053a70d69d6bbd7b850aae2590ded7548b73326a598d31e5b579e19ac3cc781d8 SHA512 39c3db1b6da620df9eaaa41cc20c2f22b9a372e181ed7d8ba0c7ad4e711ba4486bcec7ff86bb4d814d9c53e071cc4e43845567069e45b897c562cb677fc872b2
-DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
-DIST instant-0.1.13.crate 6305 BLAKE2B 83a2c479e21e789ca9795f66116ebc55481a42afb21f4c0ec0551edf07781901a28978667e92b01355b43e0e1a7ffcd3cc37b5501a7521da78f4f352e586c9fd SHA512 b7839431e8920c4c0841d0974eede75fc50f2bb7a9475664bd2c4ff6c558a10084e1c025e5be977c3364ae9112c365c0a6f480cb9b35ee4130ca2beebcf650a9
-DIST interprocess-2.2.1.crate 114797 BLAKE2B aef6c8f39e82db5e6569a552d8bdbb52fa888845bbc40fe1a0cfc7919a2445c9c51d9e97c5ab54748c13ae7f87eeaaac4c572ff68069052717c965b038f48e8b SHA512 c2bf9467d7ca0aebaf2c9efcdd19dec4169c70bcd3eadd402b49c048e1203dec4cafac2f36d38e26f9c66a42b36368bdbf51474af378783da5e94f829a961c22
-DIST interprocess-2.2.2.crate 114885 BLAKE2B ceaedb535854391a0352d4694792df887768bc91d7fbf8a48e5f1a52954718273e421af350cb981f1eb95deb810ef9712a6a192a4eb18529f2afe0b0968f9f00 SHA512 a8b23503e1bb7baf55df45a966856b31e5daf868e0db7c903d7dd7d2972882d3e7f8345e51905d937283c9d0397eb16ab3de0313ac125e3b56f4dae066f6d2eb
-DIST inventory-0.3.15.crate 13967 BLAKE2B 213ed4450412fd25bd74328389727e7b0c40363f677a156f6d4c1158958c1d000c8fa27b800a517b830f17579e3fe1905fa96cf8de6d384ce8592837923005c1 SHA512 1b7e229e5555e9b08edf1c1658e11831e591fe1f7c10e6160162fad076e89e4ca401b58ac59a76ce8ed4e1f9cd759a073d8d1f937f0190e2892804ce4e0c1f72
-DIST ipnet-2.10.1.crate 28407 BLAKE2B 50c27384d58bf57ad2c3dd0ffe44f1ceb1ae302dd40e451b0c0d69f227050fae17c368c417666c1ec9d087caf775132db7387d5a6c919a0863c78a151912ea64 SHA512 7f55f23b2b0936e3a7dafa2db0447dcf1b63a092df4af8f6fd88a02ecc8f0a290b0d21b18fe777eb573201bf82f56ae475a447650ed0803af676b1e0c0970cb4
-DIST is-docker-0.2.0.crate 2664 BLAKE2B 6c3b10a805bb077b9d0c54155fb9e72a15304fb3d6f0ebfc3efea8b42e02b99737d22c16a5352ee0c1f820699f765673bf0ca8f46c6a49b45796796c01015b84 SHA512 759e00292710b685954df031ef96bb650993cc3384cf03760ebaec377524cadc929c6561dde5fd3e14d71f9f122c86495dcf9893d1216d99055048542123ff06
-DIST is-terminal-0.4.13.crate 7665 BLAKE2B 47a024e135ca4931a04a8dc8151f999f816ab50c924f17321af4295dd84fd51bf98ff057de967e646a461c1cc9ffbfd7ae245a9021b3a77f3812f43707b44aa2 SHA512 ea5b18dbfc965b96a27086eabc070747fdc557a6a9acd06203164e846c2f390c4bebedb29211ec008e060dc80b10f53de6d6cdc822d4f51a543057736fe33448
-DIST is-wsl-0.4.0.crate 3264 BLAKE2B bb9842ea007d5ff132c77b719c877c370eb5cdf63aebea8f3165ab49fbf6c68d624a3809de2b374cc4c6c86dfd0fb23b9dc32c2e7cc5f2378b2efc918dd710c5 SHA512 69ffd419eb4de2e50ef4e61efca76ec4547216957d5422ac7b2bde85264080c2f522714aa40b5a6566c25eaf791d12ec0df09afe3060cc43087d18510f33d049
-DIST is_ci-1.2.0.crate 4521 BLAKE2B 59591545c2da2052629c97e345b1ed1f0f621d5a3a158e0456b0a8711011160f01b01f4ca91e12f807d2e74dc127dd2a9be7ba9b1c9ee458ceea590cf8feec2e SHA512 0479117be842723810ae7f641e5e4b5daaa5543655de50c8e465ee600803be78901f0c0893a4953b5ff0b438216aecb479b9e40aa2c78da0655249f127edf2eb
-DIST is_debug-1.0.1.crate 1897 BLAKE2B 870200e87f264b1e3b886b9a103853de480ec6d5fb4f7bfe4943f06d445d7c7c5725cdbb230acdc62c8520834c4fbba2145c7589a63443c56a11d7d9d2504ff4 SHA512 08eac6f8ae7eb63a9c90430572c3e76159bce772d78eb892bd93cc53fe05d4706a72fc9408c72daf6f0a0287cc100dc201b1a197de4d7b66ef4e8e42f43ef594
-DIST is_debug-1.0.2.crate 2640 BLAKE2B 5145c3d0d771a53befb95486ca8f2bc61ae7c0c5c2a68f3d5a5bf2bd4dd6e364dafe5d2bbab7ef620528241b02a1d6a3fb670ee81c4ed37e4b30fa88a7853f23 SHA512 3d9303c552d6e814e61fb93c1abc9856b3397a38b3f50a72c37a6f61260da54dbe49e67bce2167a32eacdf9e0c94c21002dcdc394e79e0862183e675ca774cae
-DIST is_executable-1.0.1.crate 9550 BLAKE2B 64fbfd2805b9e7a2498a59bd1ff924f84a42c5f1061ba59e7d3cd72cbecb394272c3f9af101f838c7a6a636746d8ed3b7f698c5720857675c58127cec9846d81 SHA512 677980983db2c8ed72e87a2f2df3bac328dc6ba6dba6c3e8c4e4eaa7b8fee160ef4e81d105f65ed718fb7263137ffdb21d86b148f614f04fb9e24201417c8a29
-DIST is_executable-1.0.4.crate 8263 BLAKE2B b6871fd2bf99883a64b35c3839ad499bcb11ec33d8e3fcef95d7cd17d3dfdc7a8b1ecff579ce191f7b09b32a6257904ee2825d606b959f813b1f7a18c453c42c SHA512 a4cea8ac0dc1d08187d210c7864136e4900e3fa1516ce69bbc870c184e3ee66906ebd841ec5eba228a71acaf0080469b4446716043fab8b1a0ab2bf16d85afb3
-DIST is_terminal_polyfill-1.70.1.crate 7492 BLAKE2B fa663f858ab8e5fd56202d731b572bfdd4ab0e8262100424e27360a9ffd2820182bc57d6718a305ef82d04c3798111841c0d9f9dcfe219765c0f63edb560dc1e SHA512 4730fa09401cb4e69c92b38b2b43afd74699c61f5bd7b37605efbc0c08ca7a1318d43e4a844e46e0f84f83f42432f01e33771be2b18eb5977702ab9f894837e1
-DIST itertools-0.11.0.crate 125074 BLAKE2B 8e686f176764e92e4da3697eb781e1bc30d6c57ac61d97343b4fc3a48e4febf669d5771fa8620005c620cce52c236760ee2e1bc344cf602e878bc168a2e69cab SHA512 8ece00ba0a7cf481ad4586da24385a6f0b1719b9c3f0c25b9b5b373dd1a0ca7b9687a77cd179853392890b7bf4d31e0356a4e5fd540465b4ac62bd74ef717fd8
-DIST itertools-0.12.1.crate 137761 BLAKE2B d7db67feb7418d6a779dc17d8a2f33481114cd81a4d53a10cffe08e13f0d3cf4525a5ef43368fe979d5a3ce230872eaf993f7065885531aeb5a6479351857708 SHA512 0d9c1849dcc0ddf7555b0aeb7e4f2ef3b101cfc6f03310ce1b6072d70ac8c8d3387ef4c726146102012e75171e0b0bf13465704b6edfc02752e349dc6af7cf68
-DIST itertools-0.13.0.crate 146261 BLAKE2B b23d59a87f80d24925bc868c0ac7abb6b9d05aad5ca08833634ef760ce228a1b753062ec4bd22237d0e74727edecd7ba3df9789cee896345b69780d7de66866c SHA512 c6cb8f93a93b6ac1a2cbb3033e66fc81a39f83be773b734bea3311332b96bc71bbb518aae3e6b40cb537590c23de1ca4964361c336795c3985bde63232d410c4
-DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
-DIST itoa-1.0.14.crate 11210 BLAKE2B b2d33dc384757963eab3ae7d80bb672d828a549967986e3af8c70fe71a0ad46c4a278da2db4dfccef99e804e6cd4934067e97c0697a33ac3302cafbc46eeb416 SHA512 ea2d38df373652ddacccd11e610dfdad4e3ae7f0d476514e6ac58092733c817bd834e8cd88c3bc4178dd5a646ba628ae626195e0aa407e8534ae3c2a7b049987
-DIST itoap-1.0.1.crate 83316 BLAKE2B db0d9f712155bfe4285c3d3debf314da2d64ffd127d6b9dd471074eb7e5dcda41f1e5b04bdad63e0fbd695043eff21956709ffdf2cdd7fc5b329d1d79ee69fc6 SHA512 ed15ba3e1ee1ef5f1658fbb47e8cba66e62acf05d8ac45340e15ace24c86e5adf072b52bfb90ebc5e90f31a9a8e91ada23d4322db9a87bb966922afdd4775840
-DIST jobserver-0.1.32.crate 27549 BLAKE2B 5f6556788d10af992fafcb578ecfd2c81698eea31b636d3adb7544e12155796082623735c8b10ac4c04d891d1acc307fb4e4ac3f88b2006e181013006f51c8cb SHA512 d4528113dd5a5d4a3765d55599a07e0998c69c7d21a90d2872679755ec4bd7726e9721af9220c36e1179b153ad8a39214a422af63aea15eaafd7cefc828ddff4
-DIST joinery-2.1.0.crate 14163 BLAKE2B 0a51050953baabac243f747ba6f4395c52688657567e1ee58ae639a141b069ca75de8fc664f857d058341d0be1f111c7d301e20bb0afd66c1c603387a8fc9347 SHA512 13b510a6f9f3369ffb1b9bd32b2ee1b66d9cfae064e919e40b2308e03df801a6e33c999ed3c37beee2fb8140156655008dde83063515781ec12f78fab997493d
-DIST js-sys-0.3.70.crate 53863 BLAKE2B 15e75a94a2b7c77ff18847f98f76a1442b6e5f66960f3375534440c382a255e6b16ba3cb8c5345365d2195f7598564bf856755988f1288eb1b0b964e26446e21 SHA512 5dff8e790447a475b3c0a7068f0bdf1cced5fb8be2d66c92cb6f6c799f9d807f9d3c498e4f42c67e16d83dd4bb3be70472ece20fc42c3a8c8d57615ac8d398d7
-DIST js-sys-0.3.76.crate 54420 BLAKE2B 8d211aee6d8af87c339250e06e321bf02d2ff313b80505f696f66c43298e2aee8286076f2b291aa853730f8e1b9940f09c56535d3534fc7990aeb16653844250 SHA512 54e9a6be3f5a19021351d22d655a3aa55579c80f1453a99aba5989fafc7429078dea57ffebada4240b9185d3260d02f30da250fa539ac12c4bdda975adfe0dad
-DIST jsonpath_lib_polars_vendor-0.0.1.crate 299067 BLAKE2B 5bb1809762381a5d1bbf3ac1f7d820fd8696d4fe8b0b260e39b43a8fff550c31c79e6caace6cabc55e9d1d063ffb56a4eee9a31d9b26c12e5f6c54d83adafce7 SHA512 fae5a0702a44ae1489065004e5e5d53e1b3b7a108a69dd2155353e371991e6aeb32d42c8623cd1ca7aaf1b5ec40ad9efdae96ecfe87f07d200864814313f7a8b
-DIST kqueue-1.0.8.crate 12642 BLAKE2B 93a0ee7484655045986d6d5ca800ca001d68bb327f841bff3e54b38beff09ff10c099b2432ebf90cf8213153370e4c4aeab9bb0eb3bb02b1bb494b461dfd2fa0 SHA512 c8734fa2cfbf8b8f173604acf5d13ad4cc2739c879387b548a1200f8383b81a1b72315449eb73844e4b82280a4c29901d20c12cdc746d48f9047db89849985f3
-DIST kqueue-sys-1.0.4.crate 7160 BLAKE2B d75e152cfccbdf7ae000be14e0f84c6d1fd07290fe498349a8715061a83d8c02011b59578db2c451de011ac3eb4b218aeea73963a2a5cd82e7f5f49de0779632 SHA512 6650aef7efd7fbf4f9b6c8c6e4c1a91b79636423d46a0173dcb99de74e6f277cb02ada01cb62aa71c3f174a2c28db62a708b0aada9480fc5bde613204acb30a5
-DIST lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f
-DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
-DIST lexical-core-0.8.5.crate 26680 BLAKE2B 71f3cc95f47fa636f68d6d25612a47d4a178e2ffe484aa66760e78fb71e55633c055892647decaac08120d1b8b3b79d80d1a23d46a74d13b5e52d6b912839ea0 SHA512 f98d2b5afd331c6f4f599d24599ed8791ee3628a2fa2b8172b698cfe9a180e1ccd2da4dca4dd33fc76ef3417114c580399106d01a8d6153b45b38bceacee1018
-DIST lexical-parse-float-0.8.5.crate 180161 BLAKE2B 881e4db32a21c26a1919fd1373aef1ea16a6fca3d799edb18ff0c9e4a79d481f8ade7a93f9ded2a660ad10cf815eb757f6eec7887945f8203c467e700af7a9a3 SHA512 ef012cbf18f2e306724dd700ac259aaa73b44f6c4531377deb9979c80d31ae66fc1a8b2671bd677e0ebfad8f77e9a5cf25707c67a1c5b1f554953c036cb39d46
-DIST lexical-parse-integer-0.8.6.crate 33647 BLAKE2B a0ebd7a51c271a163796b0f55bb85e16830bf06e26e3f10d9b13dc5b65af590c77f47fb64360a8738c5ad4be6e6932d58e83e1594a80c067859645c35b907c53 SHA512 e9a814d2928bf5bb2d9dce53e26c65356191c9e21c3aa0e674d58ed879aa52293272f3897f64372d996a3f8c471b0f59348ad48f15a21c2f35ed15f522ac2daa
-DIST lexical-util-0.8.5.crate 85152 BLAKE2B 42a968c6f9d20cb4cb10906399d37d6581b425eadb31439fec4a71395819133249c4fb75b1d962100e77ba35b6f6b4cd428d5b5c161b405b22333ee390e671a6 SHA512 449c7f2a22c109cd179937c36e14d91c742e1a837a85fcf4fb58c21f05317511d1281b564d216a34760ae54a0df2d0ff5caf49da4aa9d43a8d87fcec0033cc39
-DIST lexical-write-float-0.8.5.crate 100281 BLAKE2B d5885d793ddcb8414fc9cd3085f0a0360b683df093b458f09fa4cf1dd670fbca7d9f86a19eca3082b32c4eb224cc9ab24a526350af0f894907391833888ca56f SHA512 35afe75db2fb4664e335349978fb8376a2b6cad48000e06652a3d3ce0b5fdbc422679821389856729724babc6cfe08ac8a1511c06bb743709787a4a47f956fd4
-DIST lexical-write-integer-0.8.5.crate 55427 BLAKE2B 54bb11be6c9377518384ad843d90d3bd344edadb889e1049ca8b58e34862e6d2a6730cd772c38859372d1068e110fd67db147c2d4c90bdd9bdb232ced7be4710 SHA512 a749846f8beb9b01ce61473f6ce123afb1b9f6efd91428cfff1fbbdd77422867e6eed4cd04c3ef25cd2d5be59864fa0e213ce296735e4021ac4632634b345838
-DIST libc-0.2.158.crate 751340 BLAKE2B a67318ab24bb86c4df682cdf846d51f5f0a69504567acff43cc6e724f2641521945dc75dddc10c1c265fda960cb28b528575b5d39ce321073844dbddbc77bdb8 SHA512 c2d90d58480cca3464db475d7c70cd66bc1492239d8183038b48def8f5d8a437a1e2a2f084cb2bd9456889221b10aa07981cd5e9bcbb6bea28a2bde3c76f1105
-DIST libc-0.2.168.crate 757025 BLAKE2B 2597fdf5a77345754b8c9168d9f07f83ebaa0413262b94ebb19f976f49cc2c47893e788ee2abb3d00a995bc8f99b6ebcf24abbdb320e18037e779e1241599b44 SHA512 499f7273ab5eac0961fd927d5204ff4d5b3b290c20d00ac99054ee596b6d3ec4d6712772c52b09c84554f0514a8f66b41995ceb5b0ec38a7295a4fccf0e94349
-DIST libflate-1.4.0.crate 42600 BLAKE2B 3780d05f7ecb251576e19118c5d7166b389c262aba2b58d53d7aa48b3fc2d94e3a360eaa5ca8ae1cc5c462b6cb23ab1f653985fcd30e28443dd6f8c177569a38 SHA512 ebdfdad0b67e835218a269a2b00389b86afbb95cb4bdf9accd4ea3c866917dbdd756a91c38ca34695ebbb80b02055eac738fa4144f86a61116cf477af52e3838
-DIST libflate_lz77-1.2.0.crate 5964 BLAKE2B 9dc410c3e8d3b7d16a9cb7e16ac925b2d7a3ba97a4214380de5f9e99e35a5415b82ad961d41221abdaa8a0a6102ce0ed9def57ff89822ca714cccac0ec4b4308 SHA512 5aeb0d1ab0bef43a87552f93dca760450e6fcb0213c9dfdc0ed2f72fcb6ee1b26add02705f7c5a8552c975c9673b1a147fa036b6f4c42c07675a11b3cb1929d0
-DIST libgit2-sys-0.17.0+1.8.1.crate 1812997 BLAKE2B 91f61437450398c24a7dbb85803665a0cba268615a0e9d8176e094a192b9e8441d5d985a430722ebdf8c003acd47d40dc5b9e464fb7dae8d9c12b3adbad796fe SHA512 4c37c30426dbba1d9981d65ee42210ec07e2dae73ce2d18beee17b161eb96de0c7b1696cc8b97fa514eb9fdcb8b853713cd19174fc55f033b6a9c1e25520f75b
-DIST libloading-0.8.5.crate 28902 BLAKE2B a0fca8f8876092e874964b3dcbaacd417451704fc1d687669a95a0b9df22ccda73a754118ac0bd706a7c7d86e4eceb2ad012e20e341d71548b34ea8d629bbfdf SHA512 f332884fa75cf210460f4678d45091345b23469c09301614c476e95bc54163afd6d4f098a34f9e0d529fa1ec63892395b50957598070ff327743e4c3b0871074
-DIST libloading-0.8.6.crate 28922 BLAKE2B cd9d7c2652bc4b0220e1c29cbfbca41f44d12d76c4dab3d025c21e5d317407ab656a88add0db95f1086934a424f55b4b413f33cb2a52cdcadde7641f9c5b3fc3 SHA512 f49ab79244d4b54c2f181bd9d7506fe5df9824a09446924dc429636e08ed7bcd6f5d2afaf8a0c862982e2c2c5832370b118266d36f36bc7b7522668bd598fc81
-DIST libm-0.2.11.crate 111477 BLAKE2B b1247b197dc66a38b9a1f9db0e32655c9ee09575347895bb1e3f22e6953c334d74574a7015f214b0af0eed564ff2ee4576d07d0db5421aae917a7aa1e10ea142 SHA512 86742b5d97dc976cec5bbf75f565b40c7058e74cf840cbc7baf4d84823318040ac692b5796a407bd44caac553dda3f5a087d3bf8d6099cf26305123ce106c7bb
-DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
-DIST libmimalloc-sys-0.1.39.crate 198523 BLAKE2B 371751d8eabd682d879a4d85b163d3c2f3dc3968232241cd2d7b573a5b78164efa6cd90c2b81d350c69354fee5676edb3e37f75f676731fccc913a83878c7358 SHA512 db578da8722b82eafac3b587b2db24cbf95fbd85a25b7ce30286deb9eda6820b5d452ece7c3126a2d8c96400941dc3946b4cb2f46172241861405aa09a3a2451
-DIST libproc-0.14.10.crate 75452 BLAKE2B 3abd30e7c41c292f47ad76985e98dc72eeb0065673b88f36d22550b108fee58f1232835e23d413488516df99d1ec8d9105e029c34e5366b66de62dbe71b69a12 SHA512 ca0bfd7b6ea838c8ea268e0da84ecfaaede40e4fbc4b15174c0cce2fd8e80a4c72b487ab0f6b11948a959822c475e67532560b21a52d34af3ed15c2f594ebf0a
-DIST libproc-0.14.8.crate 33851 BLAKE2B bf461108e625edab14019dd0ec42eec9e751cc4035ef66f0153af87e01c79efeae63d625ec2ae6057d1190199c8859fee549ccbff6d7155299de15991da95eb7 SHA512 69cea19ae4f5a3357cabc470e287ef2b179119611682f32de0e3c2680ffb83f43f246a336b12453afced791f37d6f516e2e892d1a9e99bb4aba70a042245f013
-DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
-DIST libsqlite3-sys-0.28.0.crate 4975624 BLAKE2B e8d9e637a9ed616372e6e9496a9a7095eea281e1496ffa5b312f632958c751d50d9051f5ad09777e23a18dec08821cf9c43a405c4ac64fbb8719820c12886b54 SHA512 4a3d16eec47c6e3e53e00232501fd50fa77f1ee1370f4ab6c984496f2f897b4acd1c15c697caa8babd635d31a946e147d5d090378615676a3b5c4a9656355016
-DIST libssh2-sys-0.3.0.crate 514550 BLAKE2B 55a24d513420e0222c342d252b1699cd583dadb37099082e0ea068fe064e80f6d82470a08d03654c17f50139993f07e20dddac4d11f0574c79040aee08f512d6 SHA512 cb8dfeade699d97fa5fa393bd87315f44810731f78458267ab098a08d949fde47fd57b64ed3e882c10a83ffff8f869de13eda50c72e140f57d802fa07650403d
-DIST libz-sys-1.1.19.crate 830335 BLAKE2B f17c18cc4e18387e539cb227adf5b4c41bc799954cfa9a1d8d113d5fe1f80f249a6fb4ff51db286852495b029da6972ff60da538594d8b334d91df9acedab44b SHA512 1a8c3848ea4ed78e35dba29299aca69dd1886e6a81abea21854cca9177722ab926cb11240a19efcc93a9583925435179bcb73b9bbdc62c8d32aead2e572b44e3
-DIST libz-sys-1.1.20.crate 830422 BLAKE2B 26265b1faf04f7d0cfd751ddf003585b1be59fcf8fde3ddfd86f18cc3e2d5c3b62a808f47c01329a57759d14fe6283cd94a72eda46d5c5031249df0f1696ab03 SHA512 9b537e7c01553e782be145223c6d174601ade3a950bfd0eb4ea09658da5b8910cf0d0c5984672f9d198f73d5aa63d21e0c20c4c44ff7d0a017ee11ae4ecf4859
-DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
-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 lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe884dd69c61c54dec978733b95a853c3e5af26f237e48ebb4ee9dbebfce0f6c06067f74a3d122e92f5ace40e22d7 SHA512 525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7
-DIST lockfree-object-pool-0.1.6.crate 12309 BLAKE2B 47c4b3ade2102e8c5154404d6eb8bab943f0173bab01764192a2ba76e4dc454a7763a7e2c6a3df6a72f2d0971c419bf69af4f81a50636c75cac2dd4c692a7962 SHA512 d4a51c7e92184ded686ebeb06467e26905b12dfda6b4da28f230e73901d7406d611798d823c0e1fb5e2c9efec5ab3eabfcd8aadbfe9e319046b3cd0d31008e90
-DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
-DIST lru-0.12.4.crate 16032 BLAKE2B 7255bf86fcc001ef8f94c9d7578993e67517145d0e83adecfb1b5095faca200493a22361bfc8b9827bee07a4e5e150958d4a54ca3fde0f06bf733dd4749d861f SHA512 1d5becbb538f90414d320fe14d0d6fa8bb14bdce69b2e1855b360287e3dfefabc1f62685190730d11a4ddb843c2180dca964ea4a79606950f087c404cc3798f8
-DIST lru-0.12.5.crate 16047 BLAKE2B b5d7d77b4b29973fde0854f55c395edb6ea6e3a309fd33f0c43a6680955bdeb60fab624f02135b637d95e5a0e9da79890a71290c19d797f758c73d16c3d44a27 SHA512 a77230403b1ccb5aa3ed1ed89e7e6af53b3b34d4373e663c1a9789dada12c252e2b5d8b7ac78717c4c4909203c7ea2ce5743ee6cb414aa268c329b889d66a982
-DIST lscolors-0.17.0.crate 23535 BLAKE2B 63f13223914618e1694a409ea60fb888c61dffca356e73cf773a62304a299f253a6b6661a8cd6d60ad8588e98cf0881e9e264d785808e94449b04b04ab8b5828 SHA512 a90ddbcd8163bc48cd65be76f353c2128d704d1d34a16c38e15baf591c74984041ba92654b4d51b00758fc47c84e30d3e427fb654f5bb1b907b50b5608572a05
-DIST lsp-server-0.7.6.crate 12133 BLAKE2B 1858cfa3525d0d0f61c1a988c38a1d02afa593bef53608c9f033861e0df91d833569563acf3266958807e8daadb80f9367f4435fa3f05ae40e362626ccf9c722 SHA512 d9b35963ae171505413f1879879e3d5bec2c36cc50dd2e796f8e209768608b36a7d77ae441128f939f15f743f994c2fa479c7ec1a53296d3b65d44e969bebffd
-DIST lsp-server-0.7.7.crate 16815 BLAKE2B 9aef875617f871b2bd32ab0ce9634426e53153980a4b8d0dbf490cd799d849c12bf5eae7c4ce4595aa601b36986a7af4f4c728e8036032b6c968a325214f4b9f SHA512 c7e6d08cc34c26b26c4f092d96dbba78baa1e310de1c29a4d780767942788094837ae795494741a1708a3a315f71d9233b6ad6ee9669d11fafb2ae8ff39de094
-DIST lsp-types-0.95.1.crate 68324 BLAKE2B 3275136692d7d722d1adfaf7f051534ffc04a10d70cef470820cf15bbb6c6feb56636ae536ef28b0997611efc235c345004752bbbf10f1bbbc57d61642cd3adb SHA512 5358645b22a4e43cfd227c2266333a019bf9ac4b4e3d42d0bbdfbeaa25a6f02c405cae89a0caed719103ed87c4e68ee270f13a43f614008e753ad69ad6f34414
-DIST lz4-1.26.0.crate 13582 BLAKE2B fcd08f9c45d28b74b133ea75e401002d0293607097301b4c1904563d32fd28809ac8b897d541412b24ad5047fdb46a4d2058946595976cee97bae8c9eaf69fc5 SHA512 d7df36012fb69198c80bd914fd6bfd7469e35cded512efbc0406361a427b3f107cc5bda830f68f5a9d7ef8d1026017b55723f9f5644cdd3170227d4e8463eb9d
-DIST lz4-1.28.0.crate 13471 BLAKE2B 3cda2626cc669333fe28801c59f108948ffca8e2448d89759b384906090ef256e01ae2a4c725cfdcd5abd12f0d863c5778bc71979595af0042cda0f89bc1e3c0 SHA512 51dacb8ee35030edaad93d4893e3caaea8a0c30546a264a03ccd5d79e9ece778163e1b13cea2fcb9c23caee69c2bb78f389528878308fecf8616d99c4fe81dc6
-DIST lz4-sys-1.10.0.crate 355645 BLAKE2B 1921d745a93b0f5236fbf5d6bf6da3aae9874fa33a2e5f3020560fba3a5490c33ba1a81bf59902b1e52b26d1d5a1c3032a849b5bf1fdc7ecb45ebdf782cca365 SHA512 9e65fa47b8740dcdc3956f92f8056997a1e37a4bd80a50e60a9d33883a910d31d7e31c7c43e50e09bc191f6f669a0dfe621dc5866d8cf93cbd4d88a2ee23f0ca
-DIST lz4-sys-1.11.1+lz4-1.10.0.crate 391317 BLAKE2B e79aac475b62f16adc7a33e37fa973a0d4594574a2c397489d5401d902aae6b48b56e8c2f1c97fe1e7618bd8ea51c06a68326d37aab0f08953f0421b817cf4d6 SHA512 ec902a0acfe5847587fabbd95dd2489eea2746a7214f55e0a6bf64e07aa5246707ce645a4fddc845a85aed01d1168f73750cff5b0e5d1a345d73c5df7255d168
-DIST mac-0.1.1.crate 4838 BLAKE2B c87e9f9283f179acd28c189d02d9d3de0ec99f9cfbefa590daa2880c275894951c5b0b935b652ab6c8c0172ac59e87f52fd49b787b230e6730365dc076d17578 SHA512 dbc6def04c482911ace311f34be79992fa04042c7ce36b71459b5af5c1c43e9fa66b6b40f63f8c3647daba287bf1c1be9b1a8031ead1d855f99a988898c96f1a
-DIST mach2-0.4.2.crate 21889 BLAKE2B 137db92691ea6647ca19257abf90402344cc3a8508fe6f8760a02fbe6f56d5341a025fd9e5ef92ea355feff9f36ed6926bf70c79edc17977b65e935ad5f36959 SHA512 5338254f5b9833d41957715898ab4bc52585f99bc8f8fef3ebe526ea36d8a5cbd191aa07a218ebb6f71b7487418223e4279977294b4a6494aee8d01f34cf447b
-DIST malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad965c3681f244161deaee76282fa09b9af0d0642cd39ef35689f85f5bd7c2efb7ba8119a58e86c7cd12d81b2c6b SHA512 463b3d7666cdd7de618abf0cc4e488060c84d6d93c56d4e922169511a0b03de380ea988cd998f5a162b244088902198763351ac16dea3762f0fa0840fc29d6ed
-DIST markup5ever-0.12.1.crate 34763 BLAKE2B 8057bde6b03d3e80c920b9007462b134937c80393f7422b4182823676069c4934d0c2806007e0c42b958b2c9f1b73679f62ed1e38b5c872b917937562b9ec7bc SHA512 5063b6591c63897017d79f64d11cc13edce2e8e21462df8a00166d582e83af3132ea7f4e50af4f248b56b75cbd12c6f89b7433da14147c76004fb2ffeda02b92
-DIST markup5ever-0.14.0.crate 35059 BLAKE2B c1559e42bb7310de59bed42d9fe3ea31f80a01cc7897c74cc6cd087cc4aeb5c56b063cff471a679875c778c2b78c7deaf014fb93e70ab8d58ab41f35431411df SHA512 61e549635e753f8e1b2b073200b0ee0fdae182d46d987162659c5f366c19fdc38cd37c2d258696e875b9a98b62864cffdfac194bf090fe519b0a24bdb8bcde98
-DIST markup5ever_rcdom-0.3.0.crate 18284 BLAKE2B 7eed0326ec2eb1f0834841279b90a1c9f84cc95fcde5cf9ff22e08621a0bb8dd7323bbbc2a7e2979f0ae2c6f459447c5468e18595c55efc060bcaacc72fe0207 SHA512 2fc20392a4e3f7ab59826d0a03536fbad5507d3a31aaac42dd11646053acc6d3789aff43b63b9d4f3b535898640f5f10489d31fbe20b875efe68b3f08431a9a4
-DIST md-5-0.10.6.crate 16161 BLAKE2B bdd43889aed114cfa97ed0c70bc97b89fda28b14033a0a26bc7309ed744ee907d59151ab92e9cb95f0ff0ca1cfe2af360c48f1b99fc8a246a25c803a4b444a0f SHA512 024a9e14aaf860e748f64dddbb8aec01bb9f40d702d8de31497fde1d66a663e97ca1b06b600d8a818a0c707d1ef02eb0f210befaeacada458acba69ccbf476ca
-DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
-DIST memmap2-0.7.1.crate 30741 BLAKE2B bbeb8199ad5f004837c9fbd7b0984010ef73b6959dac537a5b0265b6e16720a220bbd37b39cbae3c576a39bb2fd4b43bccaf7eb59203eb304e29e7e2b25d0a30 SHA512 a264ee152bca45af4ebe22fe30330c1984a65b064dbad2bd14c66eaac5053f35cd7569cf10517d9ba98fda64e468e3a8e599cebb107a627975417283e3530e17
-DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
-DIST miette-7.2.0.crate 102081 BLAKE2B d85b4afec9c9af137e8362f74b3f03ba2b88847c32ee18b460898362f4e0ce5be5a37502975e8bcf3881e17109665abc5f43b0195bd11e6940ec80dec048cd41 SHA512 a1e61f3092533f0a501be79b1314e619a72605e77bcbaf67d9fc3dab5452b351c3fc3ffa1cc02dfee849a91a9f1e76e3cdf3aa7fccb4b26067ea62975f3c6802
-DIST miette-7.4.0.crate 111822 BLAKE2B 6a6c1f4303c3d6f1993965fd8b6c9a49bf31c8d35240d997a94015abb5f969fac34491d8c336d7039f86766c7040981e2cc365b7478876092176caa75524d263 SHA512 eaa2c40cdbaa641cb245673610e358d0b33368ab20738eef560429264475798608a3cf6208eb8625f2fb1eb747ab6967cdbff70a847de5c053a3ac3af8e1e2e5
-DIST miette-derive-7.2.0.crate 16766 BLAKE2B 34769b0889f2e122c107c73c593ca67566e9e2644a77ae998f6681c13b6adb60f1b98854ae3130f86cdfb8629bbb9988dd9f79426ebd9dc1d0c9d98029817717 SHA512 aa0cef9be965c8eff61ba20f1632387c906843a594b5da72fc4f1d3bb6cf26ed2c515043c76179481e6a25e10d151c9153b0733d809923edc8561c24ce73bbf3
-DIST miette-derive-7.4.0.crate 16821 BLAKE2B e68521cb6fd22cbf4b1385cc228cacd7aa2e756d83b75584a6e0d51330e52fdee38b443717e95a1e782da2fb9aa002ea083756f7cc31bc998d969a3c3300c04f SHA512 5455d892e91960454c43c67935a87626529868369482dc2733415620cbfcf31b4406a22385c3d350fc08986c8dd55ee5d8f18804907078a8b9ba27d774c93084
-DIST mimalloc-0.1.43.crate 4075 BLAKE2B f22e0d10c34319125ffbac904894e0e9623d56a1fe488c95d76a706bab047aadd8c511419ebb20136ede67bf6297019b3ec7f263a324f1dabb45aa4f257a6cca SHA512 f018df422932d5eb0bcc4c0bd91318a86ea09d6e3de51e76d8a65eb833f9f5185c759c1d734e78d3f46d9043d3642882ed3398354fe4b79a5fef05d346c002b9
-DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1
-DIST mime_guess-2.0.5.crate 27166 BLAKE2B a8ec67e16a336e7d07c9aaa55025c24c3d4a62aae25213ce768786d9f292b76930132a880d662cd9a5d63aa899e9d488ab76fa9d99350e9f448ef484705ba4d9 SHA512 433c876e28394282cfbe14bb9543616cd296879f253ed331c15ace8a7d9f3629f5b596c2d5a64823a97ca9b774acc711b65006c46d54d1e9ee0553cbf1f13b7c
-DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
-DIST miniz_oxide-0.7.4.crate 56119 BLAKE2B 68facfec9ff405bebe99f52bcf3aac6788f1b5eef313ca393e2a15e1158bf294003cbe31efea4c793e644e8ab4e00ef67d38f7d32849ab6f01a8e19d31c30221 SHA512 482bf02d7bfd25bd8abe5e5959132677202d8c5dc014b9b0b64fbdc204be1b8431867095c140a1183dd1ca59f6ba871a355422fbd148ce34d62960cad2b7a978
-DIST miniz_oxide-0.8.0.crate 56343 BLAKE2B e4abcacab4c8698d0489faca8556faa7bff53d272ea0c80e2e7843dc0f6f9229b7d5b0a17ae210344722a379853e7f14212505ee05da4e60549081cf77717c1b SHA512 044b641ce6d98d1968c1ee0906f91963f9f524d6f3fdf3059708177a759e1d498c63e595d3a3f0f9f3210c45c828b9b70274134ba078b899d7fefc2bbddbeee6
-DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
-DIST mio-1.0.2.crate 102777 BLAKE2B 9b87abd99269c62e48c6be4fa197d2b12527b672c435d5f1f623f986c60ed391597dbde7d5b73a624a4df0eeaf9c9cedcd56cfd7ce4239757d59e67e9892c59f SHA512 77eae1170a318d4a53550dda3462ae070d25656cda51db4cb2dbcb28210802f9b7e279900e6d6eba68314a0c814c90eb4af7acc561f611535cb364f75ad4e317
-DIST mio-1.0.3.crate 103703 BLAKE2B 0d2360e4ef45f37104208a31e9aa467d6db041dfeb97403a010a36e1e1427f51d97f8408948c75c0084e6c118f058267bfe87d36e7911cb37366f2b1ac6eb693 SHA512 2142edc7e9378fc3437110c85ba2cee9c9683e87034cd44275d2c389645979db53fbbc29fec304f1d8c8f0464ae17d2a5db1aa9215d696fa0282f5069700b1e2
-DIST mockito-1.5.0.crate 41020 BLAKE2B 3c19b3a538f17c4d16d5c13f1c9099e4aee2c3adfcfafa41026b54d4e3af3f2de762f4561f1a5f5ecf395d7a00a4b19f4241b9ceda7d9e6d5e2d81e08fd3f157 SHA512 7db5e3d91fb8e7c6777d74a7064b54cc0e32c29383a20c7a0e03db3d6164df1d6ec771fadf8132b9b5529ff863cf0a6edff39762b5ba62a3851f720986cff091
-DIST mockito-1.6.1.crate 42149 BLAKE2B 242a13b308944f99c21d28accd0079e9682eb4906fce194d353371933469882b360466cd12c9099af593d3a66125d9ce812b8d62ce3293d9daad0490fbc189b9 SHA512 f2c9d9279d7008f3cc4aa5fc3aa213197efbb7e128f0c8da0ce9b3f70b6c80e3415b615d0e0752694bfa727103ddb0e2c2f1163256537ff9d20259abee66e937
-DIST multipart-rs-0.1.11.crate 4905 BLAKE2B 5c8655f1733dbabcddb84b4cab3194c986190425bedca90de3be63196bcacb2c38e4d01087beca1a2110796cb2d27330737e23b1efb9db97a34fe4fabe6034d2 SHA512 5fff1a03750b09b9318ac3796cfc9e06aeb948ae82701e2f8f13de43123bfae710320e89cffb7062bff81d09b5d65f559aa6319645136b7d9931e87cf60552bb
-DIST multipart-rs-0.1.13.crate 5624 BLAKE2B 6dafb5d304be7918a22c015fe610e350039169b488a5dc77da329778a976c95e4eef9253e851cebc97c8f89d5f88299113cadfe175aa3dabc53f4041988a3d61 SHA512 373e32f7c329e7ea2c20a4e3e15d7e2a2c6c233176cf29e8a23640f68b2d60638c306fe4117b4b1bfab4da8dc43f2138a1ce10d8b5a97c2c78d9d5344f6dd7f0
-DIST multiversion-0.7.4.crate 11294 BLAKE2B bd83a96882c9aa6c97f154bfac2bcccf2c385e57976950ff39a1f613f6b460704c249573ba7dc60e9ff7dc0e837e864aedfc4da5fe935c0720e1517bf7bda790 SHA512 d9e125b65177f5f8df05db1174299d04b84b534f218eed365f3945b3e7a950cda51488207143d4064df24594c50e5fb591d4a74dd07389623faf28fce64ec3c5
-DIST multiversion-macros-0.7.4.crate 14952 BLAKE2B 0cb267b901a068a2532298281b646bc1d56fcc615d700a4f748eae27b85e10a8027be44377ce555a12493eaca089c0f6d53e7d0d720e57944de0afc9de12ea64 SHA512 be711b52ffec0eb7be936f6da6e3bddf98b3bc90727bd1d553a8261d5b5876ac2b527dbc764248b6d9e5474693b1bfef27ab5ca0ba2c0238f9794199c959e278
-DIST native-tls-0.2.12.crate 29517 BLAKE2B 76f4bb2aa8fefc306a04ff50a62d6617f71c3c34aa83ed35f11714ef2306fd82f76c7e26ab7ce50f8eabed40602ba02589dde2d98b55ea6113b45cc539c84bb6 SHA512 15fbc9d02134d3d55334d2f02fe4f64be50db991d75720b38d802088f06cf5f844cba6b25dfd7beb92f2cd367ba477ec2098e3c7336c4e5a5a7fd39c753fc723
-DIST new_debug_unreachable-1.0.6.crate 2582 BLAKE2B 2ac3dd86f1a532832a40ccfda95654e43709a62faebb8182c87309827afdd23e6d3f250f2345f044cb789015c30b7907be63253b487d368e68c4fdbc7de20492 SHA512 73a61acbc9b20b3595925360827ba8798f3338471b291fa37c72a1c9505b3ec9f688808fcaac9a2eb494e5f3ea5331d30545d5f21f89559111bec6126ac90b48
-DIST nix-0.28.0.crate 311086 BLAKE2B a07023566f04896fdb3ef8b2a1ae8dd64adaa5eb48217c58588e1b41733642e03e0637350c0ee83ac47e663c02b24d5668be751f8d199aa773de6df8b2213894 SHA512 73c0c94b360f4fc81ff07a13692b2a5b5ceda3a7203bdf1e526facabd36cdf160f0ae8fa479e31a4e4237c09bde11e9bf821aa496311cac8614f9c5626f8d69a
-DIST nix-0.29.0.crate 318248 BLAKE2B 3a13a88375a359cf77b28d7f77f47f178bd31ef74b7627b6701bc6fc601024706be4e9ac1a076c7cba26b64d3bac4de17aab45fe3c045aa7a36e2d9232e872ca SHA512 86c05084aa0e6238f8d48df0f5ce6e6d7661b589f4f3fbdad43387c59c0d6afafea4badf25d31db1611615de19a0b9ef18ce614846b79a47cad4e2c9367dbe7f
-DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
-DIST notify-6.1.1.crate 40117 BLAKE2B e8f2626841903b7cb261ece9ff7d42aa6655b439a2d613f43a0d518355af2842e8731a6a2a92fdb84d82f0f7cf7423f051ab529cd22248944a19b3338e5b0f29 SHA512 58a44759d96c3ec7c431a37d92e1c1a0f112d75fac9651e9fead7a3a1de46074d79a251320b0522891711879da4ab42dd008c5a28a994039890f8d434d215e69
-DIST notify-debouncer-full-0.3.1.crate 18278 BLAKE2B ebace871c0d9591a5928330a58e1b79454847777bdcf26945ae9074193580399627dbb8cbe2559027ff7d53168d2a820c101a2a1f795d605be02bb8cdb04007c SHA512 2dfa90add844b25f2c111f086748b29388a58904d1dd46773d6c4c3cf9613b181def28b24ea974739234ff60d2423c965f98e4be8b330bc075153a870d2b0f1d
-DIST notify-debouncer-full-0.3.2.crate 18627 BLAKE2B 43a76643aa23e0fcc97b361d9c520b821a1208f306e38ccb81d9c9ed3d387c920cd91dbc9421d18664611cfe73c5ca465d036fdc5cb1d9fdc53721cc7b22e48f SHA512 b2af384abfd9cec2d5d323fe7838090381624cd6f248e12b399ca06eddacf0658574b30bbcc3459fbfdb90da01ab0ce7160038c8250761f60535404dc390613a
-DIST now-0.1.3.crate 5086 BLAKE2B 10b4937ee6bffe83c66b261e6c238d38ebe1f31b6ef758ebf2993e2e17694a0e9ea08b5628bcebe753b7f2e251c35a52a204b35fcad6c95168251038ea248dda SHA512 fe214c761b5cc3f68d1092e91fd83172abbe8f689f3fd7dd79bde01f37ebba14b2bb66d60a0db62d185f5fb8c21b255580efd759ea15c13374578b0498a85c0b
-DIST ntapi-0.4.1.crate 126552 BLAKE2B ef5291a32f5edab4b29648fcc73df30f993558e45ed862a62a4d7e85f963f195f0a74c9e61eecf928c8966799da45a23694d0c6a1ad5f7d9ab3a8bce86d6d2eb SHA512 8e32d45a508d20f0d3537e056f363270120980dc23564713306e36acbc12a6d379eb3857026fecc16ca75080431e06742e3806801d3e0a848a01f64a8dd4f2d7
-DIST nu-ansi-term-0.50.1.crate 28536 BLAKE2B fc259654aca2119c1d913e101b0fe7a561b44ba4a6145d309bec23d82ba5e4db916852acafecb727efc92b5dea1641304b26c383ac07a8796e296bb179eaa669 SHA512 c29735a5e1562776251dbd7337a3e4b68eeb299e86c534feab6478512ca5e167b42ebd32c6c461b71187cd375b8a2f587feb962f1501a656543f1429731a95a2
-DIST num-0.4.3.crate 9575 BLAKE2B ccf8b2bc0fb93ad75353ab93839344f1621e79a916b2cfee42e1332808608a5cc0552066c46c0608364c22df09b69651fce911448085782bab2ba08c90e4781e SHA512 766ba6b7a012f7272979ed02942acdabf9c5a97f553732e241c05a1075f4367651ac0bca58a512c22857f5df20dd9060a7829715e45e3b16de650d4fe4818c81
-DIST num-bigint-0.4.6.crate 102801 BLAKE2B 0460e7dfdbd44b6c68fc8ead6bff4353e549127158dab8bb5d217ee33104fe9ad5f58b63a01d56fffa8d7c4df1a87dcf5b536e436a0ef98dc4418a4690c4cc15 SHA512 19d14a7755de2b559026547d9e3e1775e636781bdfdd418f2e1d962c51411a0973a46d84d0356e30c0f708a7c7b2097926611960043f71391919cab1aeb6aa04
-DIST num-complex-0.4.6.crate 30352 BLAKE2B b9f0465d53e8e16edc44187f8efa40681377e75fc4bbaec2c9fd8b8f5384044c3a989106ed3cdb740cb86e19659b34e4b38e7cfd7bb01904e137ddeda3d0b6b5 SHA512 11ca2c28ffbd15aacb7e184b7f3e09cbec9c955738568c1e0760c256c72b230cae7152403d834c8ed9358e42b724269e99313dde9a23027a6963ca176ca45615
-DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100
-DIST num-format-0.4.4.crate 61509 BLAKE2B 6d00df67a83adfb39a1068ed49e03daa9dd9cee6adab714ca0971c520f90a31ea8ebc736c0123b3bec9a84857454ab6f2b281f9da773a40068c252f224e65212 SHA512 4bfffce4b0b24a49cf3b8617bba0213769c9bbbdf111801915c2c6b524a8c54ae728b2e8f0901d367ec1d5a4129e9d76597f5df1c3bfd65459a02b0dcc84eedc
-DIST num-integer-0.1.46.crate 22331 BLAKE2B d88c9f84e5d803a3aa8f44dfc1bd6d9b5e336e7cbf47231cb3a7de30dfe263c41c62c586d31f0029459c8c240475cd329b3fce79f355be7643bdccf8d56dcbba SHA512 e27986d91f6c6dc3d5a0900defe28ab5f47905cde3f84d0914b7acee076dca8fec6fdb7b631ac94d3a31eb01ecbc5854e51afc3187cd1abfa21e1bfafdc700ae
-DIST num-iter-0.1.45.crate 10320 BLAKE2B 9f2a60a819e31a6e7e048ae86f7fa029015a73888348676e54ec6fdfe76abe94b632a49a82b53b86488ea5af1031f677b0eed8ba7c5e843ce804c6d6af123622 SHA512 6195c7bd5f904e9f0aeee3ce17b42c0383d053f9d37954a9ce3b4ff0a048afa121c9a37aa9c74b9ace7353d7fd9f57a7d04c7a18e1456fc2c4c298d8ecfd0172
-DIST num-rational-0.4.2.crate 28159 BLAKE2B 653e05b9ea621a92dbac090339d9e0ae0b3f952b332e3a54f27ba8f5209a4e9957b014ef18355555cea0caa63432de0ec0be7ea6798389aae46402f789432554 SHA512 0999130db45e5d877d1e2232c8900cc633bd39e749186b2ef4ac4343b958dcc80edcc2247df5f229546dcb3537fd45984a7a459a9bd8f62aee69a0239fce0b62
-DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956
-DIST num_threads-0.1.7.crate 7455 BLAKE2B 282514d1c6ebe67ab2c30f91efd5b6c8880baa078265e22d5d7200eca4f96702aad8b537ba772e5d4e680a6e90fa6919fecfcf37a060668b2a618bb01bbabf2a SHA512 60eecfe49c1afca8efa320c5f4d0cd794f6adf8924193682c903307f484ca0a1ddb56102a772232aca040f29651bbe26ddc1c4939e1f030e229d179837e06bda
-DIST number_prefix-0.4.0.crate 6922 BLAKE2B 81bd3b588c788e6865104e5ce87119b5e0c5a526042963d52cd582ff23c2f8c9f32b4c445ef0397fc402b6d047e031d8e2c67ac97e191bde22e17662eec3a554 SHA512 a43b668d7314218b86ca7451daa9dfef71f6c9f6616bc34c12d94ae6030f182bcca9da83905cb46f3d49d0aa81385a787e92e4f3ae239658067adc249f8174df
+DIST nushell-0.100.0-deps.tar.xz 70214972 BLAKE2B e20e9136332e67f674d8e61bcd043664abd257747e032b94abdcbbd6686540aa750cda777056eefeb518fb7264d8566be8ad1e83347d28b37f92e3fc77a929cb SHA512 c48fb50632dd60daaf2d18b1bad2636f429d80b51c8bf27ac35239828f6a7a8de96ac84bba8601819a870c0cc004499cc2d62dacde51675d918779b9455e8260
 DIST nushell-0.100.0.tar.gz 3218072 BLAKE2B 85dbe1f77585dde0e0613d5fa23c70b67c4b7be94f982ce3954e644a1b75f37501e5c22ffd1e4a16d2d36ca9ce8711223a6414c69e5e9178383b86e394bb7a64 SHA512 7b7e65952a957755fc43fad958669d7e4609045e17ae1a05bc5fb27273e828ff2bc7fad4b72f58a3d068899c97992bb8bf6e992000cf1a454848036e27a9d425
+DIST nushell-0.101.0-deps.tar.xz 79707276 BLAKE2B 0981fa6cd3a3703ed746a5900af93fc9bbfb526fa364e584593bba1c85a5de983184f006cf322f1db7e3ea08598ce3d2e476f13d9836e7008326c9cba98b55eb SHA512 294c35c2ed1d449878cfa843de16c0766d9032670515186b755655818e9a0f59fd1fdc8b77fe981233af881453ba6fd9097dfdc88def8f2ba292e86c49f111e5
 DIST nushell-0.101.0.tar.gz 3326793 BLAKE2B 23a2504806bea8dde38b2d3af4599b73d326f2334e588aacfefdef6bf0f2a3fd299e57d02c935ce0e3ca56408ce9b09c219c0bf8630be8f50222cb6edc522679 SHA512 ba5c406720e0ac7dff22fc59a0ae3542cfa9640b6c7169a3537d8be59c2bdb31830f117a59a5c91dcdd7ed7a2ca8fbff1fae7f09ce01a60bd27833cfbc44e05a
+DIST nushell-0.99.1-deps.tar.xz 89213172 BLAKE2B 4480710ae19c9711da06b45f9b247c05930cd30868a5d537eb7f7bdd2b0c9765314b5a02925fd4e4cfecd7cbc0eea22741342eeaa7b7234730b7417161133a9f SHA512 7576b1befa3758298793b80aabf9fa165b65a2af2e595dabc3873e8212b063e86294d80268094b7ff19b079c44fe296fd7e7bbf8df1b3aca4f028e3d9cb147cf
 DIST nushell-0.99.1.tar.gz 3195166 BLAKE2B 211fc7d0780e58ab328d0afefa41bc6886c4aa7548bdf05b50ade4635355adc6695697ed23959327bbf974a8d48b5a2964896a5a6052ff90d052d3ad9d6dff51 SHA512 9ea4982aba8dab3cb086af0c27c167b5796bec0edfe8d542e8ddaa4b1d934c53b6524ee2d63ac52ac57241f5baecfbd8f038fa8d0544ee6e5a7c7bbdcc117f27
-DIST objc-0.2.7.crate 22036 BLAKE2B 14a41a5ed6beb100d68601af12914dfef67a9f580f80d70c4578ad9df98a6b4496bc3a1003dec762a27f0ae71afe2c9e8fd41ad715bdb310722c8fc092563599 SHA512 7178870c8e4e9154b4c7b4953b3164946b7ce72c956a02b9ba18889353c72be735824bd73e44a485e42ad5f97994820d9153ac684629342755a6a63711ab5988
-DIST objc-sys-0.3.5.crate 20560 BLAKE2B 448be3afd2fb1c4ec3059138329f325dee87a394f2d22a121292d24d55709497789eda356bc5498871660764d455320e30a0e2732c5b5e3f93a22647c8798130 SHA512 caf19594c04d666f24c791b941346d31cc6fc03adedd6d0ff393910e9489d974afccb155400b618e2d62cd13885cc85b16a3c33e4e72409e3cebb0760ae34b99
-DIST objc2-0.5.2.crate 199204 BLAKE2B 439eb3b4883f09e523cf43727eebb1008e1a444a2395fed87d55ed1b5d6bb31d4ac405076143920fb3eb1e9ade6a7b17d2431c50b77b030fe98249ce59ca67e5 SHA512 2375d4e7633ce8a14c8229e5da54694419e8516be3bc80083d0be4d80b786dd07d7e152b044fe058946a96c41346b119b7725d9a05038f12074d95c15c9d9aaa
-DIST objc2-app-kit-0.2.2.crate 337435 BLAKE2B 470a0f4e1766e24db45ffe8fd1366cdcc187db1174d8a59d5971b9956ecc4f405649b65a0ffe5495e7d6c76148dddbdc17e1196719c1e2b582459756b6a10a4f SHA512 23b865fe8d27ba34c71863d73fb4f6164cc88900baa7d1419f1671fc72cf2f759fb99321abd09af7b2976ee8cba2f0711c68f9a2302827f5f61134b9006e18d2
-DIST objc2-core-data-0.2.2.crate 30575 BLAKE2B ad42cc40d212a97372833e3c9d4b3d79972dfec4f527b1cff2752cc77ca845b558ca02cb550bc51f498b276e99efc7408a038028bcf20d1244f73f9dbe599764 SHA512 f63a8098d8a29752433611acce935f34bd58dbe559002ef49397a08794998e6817229aca0a230d00f08c23c86424f1cfd1eef3a8cb01d3c3cecbaacbc8fbe6e9
-DIST objc2-core-image-0.2.2.crate 20050 BLAKE2B e1cdacdc0c90bd277b281085fc5c3baa61b64da921a82157b38e2cd258cd8c8aae04d649c4a99dc8174ac9d27cb3534beb824a03c20a137b46de00146eb770e7 SHA512 65f61850be62ae0d8d01ff5ba1b948ca95672367ba32dcea4fa59288fbde38fdbd9bd49dd8bcb4aa58cfb37856c2eb16355aa4626a9fd1278177cc6a73c94fe8
-DIST objc2-encode-4.0.3.crate 19478 BLAKE2B 370a5d799d90a9f2ff85763d1e1a6301541a815b40e27eb9d49a18ccbadecf8b65b59e5ed8a16f2d7b824a41ab200f24b8bbca5208c8f05fb4e91512179276ee SHA512 ecf8eb91c2817f2ea9e84f9ffc44150192d05096c1a3e2b575e6dc8eedc28c1c3f5559286bd2f4fccf39a02a156b0ea4d4396a8eed4313d11835c122a9bc29a3
-DIST objc2-foundation-0.2.2.crate 249330 BLAKE2B d0780c549cbafcfeb6e52839960b92229425991f9c6eaf54d9b5db5cf3fd4a49b2c0b982a443801009be2c43fe75d509043323e98e75235b99273e6c9c0a6482 SHA512 888fe08f4b0061c73a24eb7632a25259753ff00a30a32f40aff4526885e1490d09dcfe38ca50ad12877d0eeb5e97d65f9d9e7bad953c890c278899c4dd79b113
-DIST objc2-metal-0.2.2.crate 75276 BLAKE2B 018445d05ee53871b998a7870cd9ee48bc5d85c5aa20c20203d023273ee68d0d9411bfdcc7f7f42ed03001773e11d527f7eac1546b57990451d3928f8716f2a3 SHA512 104df0fb4a68875918d45b6b86bbe378d3735a0fb83de531ef6fea9f608afb250e8bfdeb29d051d6b1f76946d7398c277552e1e58dd80d952f4f4c5b6cfa4b82
-DIST objc2-quartz-core-0.2.2.crate 21306 BLAKE2B fbbe6388d29766895e2037fc82ae4dc3ce40ef9fbef635b73b5b8931e624ee706ecf296102ab9c68cd88c0add354c884d15adc4cd479924f6f902ed407463689 SHA512 bf8b8e9dd17081162d048fefee3200c58041a31319f8e5516bec218e09e7221bdb3f8c3f9cc95e322772dc030e5f3d64be84f129e657eced4e037a00ef63275e
-DIST object-0.36.3.crate 325288 BLAKE2B 0701822a51a82a1674514d7572c5f91bb40834e23d40b0fb440d933221e8256b7eb36711e8b8870d866384774c7c1e36b89363d7f6bb94af92f9f567f7aca211 SHA512 2f8175d757a66658bf91234d6a58905ef9a410bb19973e81bdd8b28322f6865e32f5b9cfd0ad38195cb07b2721ababf240876270f39a6c7ab8a36a127dc18f0e
-DIST object-0.36.5.crate 327435 BLAKE2B 1ffbb8ba57024a7273217edb1db76eff03e0689f81ba27b0aef0a622972e7f6acdbdc480384b50d603dee6c38c960fd25125a313264187aa0e429aa839198dd4 SHA512 b85375ab3660a8a0c57833c28c4dc665dc0664857e1eb3cd472a61b9ec8c16c470b16475545c2c311fc23cb3c43755967f93feac12c7bfad013cfed5f879e355
-DIST object_store-0.10.2.crate 200631 BLAKE2B 956f8e1010036745e8d2b424ab20604f6497750bdfb693648640471626c7c1db188f5dd9def9a0e751222e8207c38067d93cbe22efa3f5fc328c8a7aa67a7f0e SHA512 7ebc95ea5bcd3740c8ceacf421bb5719bb126f78ce65e13b2b8910e5c8b60bb67f1560e7c1fcc4e1e71ccc59a0bc88d24f46af5193c18575be1fedc539c6bc39
-DIST oem_cp-2.0.0.crate 16260 BLAKE2B 6ce8e153696d2021142a39d18540d0976118f0b9e66b53679e34555c9046bee762532201af53c325b76598a6f6711980faf4487e21b86986cf04254a60ccee75 SHA512 f5bb53747bc8fc911ee049cc8c59aa06a45c3a350deef5d55940c5959c0a916e042a1a29fd5cf25a03b8a04fd205bc258fcbf40f30f2f5196c71d772749d562f
-DIST omnipath-0.1.6.crate 11082 BLAKE2B 8bec8df7f4ddae2fe3d7d128f425b9103ae1a047d0f5a82457a7aaf93f233f7d805833a5c958675854c50cc818c2835124721fadb043437dd30e8e0e58d38ec0 SHA512 e7fa490f95fa8bc3f541d277abe912858989da6434b37bae1fb7da837951f95f2977fc10e08b0a4e026769f6dc8798a7107458b68014a080c4d9e3fdebb75456
-DIST once_cell-1.20.1.crate 33345 BLAKE2B 7e56d7dd48120ebe15ede12456197ce82bb2794df5aef1ec7319b2e11ef8f601d8d99c8f5b22aa906c7af23b0119ad17b3a8b4bcbdc3e38a4d78504aaefd5a77 SHA512 6fc961fb053777c584fa7895e20d260803059d67fe172e75355376ce1ab2f8ad3be5158ad58ba1a31b9a33ebc180e00f07f7c24ae319830e101059c5d2377925
-DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
-DIST open-5.3.0.crate 24718 BLAKE2B d6e72d020cb8fdc6c81cd37548723f46bcb411733d4873cbd6735f9c18c52bb262439bb8d329b9534e99716e66b0a5c352c8be192f24e7b54b19053b5ed3f25c SHA512 00d149ae8b56e5f03c16099ec3b663afb64187b1f81840324e02d46ccdf25736415c3da9759996c06afe420f26dca78606eb193ff31797d950e7cca505753a8e
-DIST open-5.3.1.crate 25229 BLAKE2B 243687469294fcc62cedde17b3d07f727a77c57342f30696e8b042976a5e656aab06ef7270094d0c4bd1dbbc55ab48564f2ed0a09680a6b210ec4013575615f9 SHA512 29dfc068f51f3742e1424400a22c234402267f321876d8f34a5942da767e6e119e6e64d5a0001ff012d03bb5ed4dc369dc7e64ebca800200ab9fcb368061b08e
-DIST openssl-0.10.66.crate 273705 BLAKE2B 7892e96dac3b24ad5622833b4061bd82028210f9f26ec9772cebb65905ff6e45da8b21ad1aabfb87bb5610f534018da6bd20c10eaee8c189dd08a7ebfbf12b4b SHA512 2f4dd6e40dd8aff8c04563517fabeecd5ac0d986764649cc9af9bf4ce25757a67f75655eee207703b46fe57661a216ff00144358ffcbc70525447a063fa086c1
-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-src-300.3.1+3.3.1.crate 9783559 BLAKE2B d6717a6d1b09cc277138eb9b9d035cbbe584ef1c6f51c488063ed73f9d8bc20fc15eeab2ed5d5713c6d040f2e2d6f5c31f233b56259ef3b7c4d15b446cc5af32 SHA512 4f90b906dca08664bcf5784c8e4d7111e9f61029f7b9ffc512f3904900d4a29918d14cb6f57845f0c7029ee31e551bd58048c3cdfc8ae5b4c0f2c637075bdc40
-DIST openssl-src-300.4.1+3.4.0.crate 9945831 BLAKE2B 5ea47b7a9d934bc25999bdbf38e35b6d860c02444367277744c2ce4b43e1ee127f6662076ad1c3e80aa538c957c3e0028df6828c0a01df19cb5e9fa03779a770 SHA512 f0d5ba6af60cdbe7fa926412e1da9cef57c83fd41d9e451a9ed3e69d294e233823bc23ba1b897c40dbaa833274b5b8e2ff30ad6e801e51f26a93cb1594695480
-DIST openssl-sys-0.9.103.crate 71552 BLAKE2B 4cc1ab93f5a444b4b985c84f6ae90f345da4639e4ff7c5502dc1ae59f842d46e3855057a7c05855f7cd739b5311f330dff361480ef2a0102fe46471506956148 SHA512 61b802f6baf918ec055be90ee47c69fe0184f6d9a1d29c748386192a11d4df115758961ec9b636126a6b42d7d8f7509248c59f7c035905558c4cc35b804a8eaf
-DIST openssl-sys-0.9.104.crate 72287 BLAKE2B d9af8f2ae8a8dfd53b3bb68433a4dd2a4b30038858ac58aa98d7a23b2d23e0b7c7d8fc36c1733d0330bcb9f51284667b2c32fc5a5bd4d9e1a5df7b98d610a997 SHA512 e812d5323bc0ec7376f176a980dd9856dad6d36513e854d333b93ce8a14c20a9ca61be88db82ba2a8ae4e086df5c3fe6965ed10ac155eb7b502e0225c0124278
-DIST option-ext-0.2.0.crate 7345 BLAKE2B cbfc03e7c960fe3023512a4ad816d657b4f54f8ecbde9f9c4df4c5fee3b36b68ab463c67ad650778279e01c7ffaa63a0dacbd0c080c8c3d15b1611de0e71f92d SHA512 f8539f97b01af97e0b80fc96556002251befa60f8ddd19613311e62f9dc9834d71c22f5d8e7c53c4925046e38cdcf834c3c28042a4da862d6f6a21ddff8d8e56
-DIST ordered-multimap-0.7.3.crate 23265 BLAKE2B f894c3384d447e4ea0a58dc912e4e5bc6e72ac108365458195ac6af8c0f3b5e1f58941bdb7d9c323c67cd23001cdd5c340e35705a5f017c3f789d0dc777ab043 SHA512 4a0c8e2352037d91428cc54014c2c20385a76500faf345170e15d9354c180a7fd719d361822626842d01c4b19d44ee291bb3ccc07ea934fecdf52e28a5e4e354
-DIST os_display-0.1.3.crate 16800 BLAKE2B 2d3a46bee2aade195bad0080178cfba0c5a5eb178211bceebc6e3c894ba1644667fb1713a6df9b0dbc2e34810bc6c9140641f4f2dad784845e7d1ad38a74b4a9 SHA512 2a413edc3237743a3dbca9645a8f813992ebbd57a9e7b1209a121d6914756bc0ddd4f3e11a1a5e55fb861f44deed4462a1e52dfe96e9f2f1d612c18b1062a165
-DIST os_pipe-1.2.1.crate 10691 BLAKE2B 563b108a8ce21dc4406a35bd2776b156ec77053f9449ba92acb81b9194a6df58a72a1fbbcbfe0b8d88c3fd3b4f8b1244a4d6737916f8e4050c6cd3eff7a8b130 SHA512 3a184359185495e8a931d3e875c5ebdc822e6fc76ecb9fb4264409f68d8a145406001339bdc00585f3ed7d9ecc74fc89f662fa8e08f4ed764a258302a198d4ff
-DIST owo-colors-4.0.0.crate 30984 BLAKE2B fa64a9097745eff2b00d8587ca119a3f4163c43265dcfe75162be09ffd556b132c24aa5217b99c3b10feddb365e71b01006a62a664ad8968d4bf6a716291148f SHA512 25a606e9e6a17a4ec21b9298707478d904ba1f30862ce855f4223b3273fb3d0323540b6b628c067edc0c9291cd7c370beb298ec000cd679068624031ac9e66ce
-DIST owo-colors-4.1.0.crate 31414 BLAKE2B 4c936531a6eca2c77bf54e77b1bfbf63bd957299e6b604f97de59bd8e06aee90187045197fe2a5ba607548245035e644b40981e5020113b7122f5a36785f4cbb SHA512 e514520ebd86f92be6f893727a71b68faddbda77763a4f5d5a907c2becbf032c629362cb4c27c184a98aad27963449da8dae38d1fe35741b0fef11ce61235fd0
-DIST papergrid-0.12.0.crate 57121 BLAKE2B 5838c4dcda4b114d7a0cc85c873d0448f81eae41be9d560c7199992f64fcb965d27d96c3a3d4c61298fdf96151ab7a5916dfc72568ab7515c1a79a77033abc0a SHA512 ca59b2a20e1c58133f2ef6f901cc51d7c1b5897736e38bc0ffb153029c09954a7e3770695584028e432985758bd51a44fa94395379a979c98a2169db7a45c8ec
-DIST parking_lot-0.12.3.crate 41860 BLAKE2B d1899a1132035aaea3a784290cf4951ea3b36b2018d407e27d333b2a2ce3820e040d635009c44cb6e58ad07cec6565c0347af6f6fb02954eac2d4c348bb036f0 SHA512 368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703
-DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389
-DIST parquet-format-safe-0.2.4.crate 62904 BLAKE2B 3c2ead76696ac233405f7842e8dc2181d71d100453abd2bbd24c063510c77f3f13bfa01556799a0412876dcb79ad2e86ac8b49d0d5d7c0e715c0364cfc514e9a SHA512 e31b80f93cca7672c2dd9dc022a4a8bab50d15a65b4bc9b048a63eb7447eadaf6d8212fc58368666fb2c2b4b29715c9c5282478ef418af9cd1bed89133a7048e
-DIST parse-zoneinfo-0.3.1.crate 97290 BLAKE2B ef2d8128be452c96d9c13e8ac3cfdbfd86753a0578a9a782d0059467f9212cd02ab97893f0f9f73fbcb3393d6049dfedd0a437ffeada1c7672564ce63f4a1bbf SHA512 88f581dadc306585addac8a16fd3bf56f13f6b933689dc6bea36a07d9b283f9c77ed68f4175d676574062b911e3b1220bc82a79fe59ea551a7dcfee91ac74ecf
-DIST parse_datetime-0.6.0.crate 12822 BLAKE2B 016e9c21fdd6af26827ae0cf7fbdbd4f161ca17138018160133efe92ed2c4f5f0d607f5ed4ed1d56059a20582f4df4122fdff0a21c715c411d0dc3e285320106 SHA512 9d1c23241c4668d5ac2332aee1b4f9e42faee923c9f501c69071692e3c7ae4b23c030473013e00c3ed98a7a031e55c1a53110777a41cccdf08d623edeb5aeed8
-DIST paste-1.0.15.crate 18374 BLAKE2B 69ee7def55e658a9aa72405bad62325e8d6021a4989fbf11c88d1bf05fbac520f7b04d467bc3c6eb45043a41119f65aceecc4a6a1418a9192d73f33134545062 SHA512 5026d3ec7141ec4e2517a0b1283912d0801e9356f77b703d954b379439b8d85e3886d42fb28f7835edaeeac465582da14233564fb010c71425a59c9e1cbd46b4
-DIST pathdiff-0.2.1.crate 7142 BLAKE2B 7f9a162c2add4acd69a81171fdb31aa9a67beb4e1be0fe93d76dc46b320729257240fca5d65dee38901f6b6ed1e536e3fff09c93cf3482859e6ba27e7206fc5b SHA512 a646f271ce81d5f6d4a8e0d98a2c802a8796a961cf8fe8177911e7757bdaecd8b156ff22046f1663a9efcd5fef1e6f000e5509d3949dbaeb494126b7e8a546b7
-DIST pathdiff-0.2.3.crate 7495 BLAKE2B 4fd2dc1beb3385b86603404a344d992ec8454addc580384df4004df1e83bc326283081f591b8b1d87d99a4c9f08a3a68159776c0c57a64f7299c1845961ccf73 SHA512 54938b311d4eeb49d1d7418d2ab7ffd19bd308c36419cf3ad3ae58785b971fbb2fd2d8f5907e0c47be7bf74ded98c62deeb90f509e6cb0edc6d3c1a69dce3bf7
-DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
-DIST peresil-0.3.0.crate 13573 BLAKE2B 6a5af428257c66db670a78bebf22b667b68633fd17e883ba288e089663a80c594dfe3e4b55043af3070deda8d1643e724743f5e840f7c7b7d0fa26409e00d589 SHA512 874580a62add05677f2573b7668612caee7e1653ae6263652fd495e5c871b8e71c66e20938a12348cb63450b3c88fbbe49d67b71868a8f970d82d94bd4425961
-DIST pest-2.7.11.crate 123779 BLAKE2B 23bb1f3453d5d839dba7b3292806eb2d327ccafb1b1472fd970262a44c0abbabfbf3316ca16dd5526177bcb67a701cf79fa86b68fd1e57a3d875cb4b7ff89ad9 SHA512 daf92b28d8757d0c41e347668e54b90522d654a451ba03d01d9aff9b22d6c57b6a264237c5c8b1340e45605626fe848dad84672ae2e83604ce22b2c89cbd08ac
-DIST pest-2.7.15.crate 127895 BLAKE2B 6a0161a85c35e533f1c4992b842d6d1e8b83a0f39365280f6e156dacaf5a313c8a4dd24c241788200282fe0df8ab3372dbffe648b6326b3917dabff7b0ce7945 SHA512 a044c8e92bf63dca6522da1aecf714329278def96b037ebb38dd485d6063bb7b15ecf762fdfdecd2026136c42b6edd89702f624cde14b437161c372d6c3d87c3
-DIST pest_derive-2.7.11.crate 36320 BLAKE2B e81ed8b60492da9612d2208c6cfa712ebf8c6ed7993642bfc4fadeaba10a0bc16700bce012d34d955104041ed8bbf659d16d9b86eab52342875d4c6148e7f60d SHA512 96f6b44ac09785ce5981f082ddf283a178c676a0b436f9b0cf7afddc8be38583f0512adce83363f0ee8ec4f26bbfba01e30dcb17d9420adc00b0a82c10349b86
-DIST pest_derive-2.7.15.crate 40745 BLAKE2B 6d1b81bc50a6a70e88cf5ef2f40adecbfd65702dacb7c8ae64f3d77bcb6c632f4cb17b0facd72e3bc60a12d758461acbbdc6d81b110faf8df6c764904bce970b SHA512 22cd53c1c9062db988dcf8645a6320f96219777fe35f9d8fe05f69df445d58a39157c029a93d5fc26781c5c44961afffb9bd959b3d4ecba2d4e17b23cc422250
-DIST pest_generator-2.7.11.crate 18415 BLAKE2B dd65c69d8d0ff343d36e31e6a4f4e11aeb01b1fd23d0db06d90f506ec2f2bb2c50422f6a73b48780e16e07c8d0addb374dd09cfabaf6230d5b2ba409dd3fa6cd SHA512 14fb3bcc44ea6253cca86c78166f3f424a312e864294d0f1aa12029641c5255c106d69b1712aae37cab443ab32077b1033b97c0d7650a7496c191748d28707eb
-DIST pest_generator-2.7.15.crate 18417 BLAKE2B 258d73a82601722a791801b2b0b8c676b9c793cf5e3f74bb39fc7cbbf3b2be247b839eef01ac4aebe98363a865bc19235c9b13cb06b3d1f383bf7b7a15c64b96 SHA512 98e0101900cb4fd0e22af2a214f380269de10b590078a7a9f03154ead159912abfec664e1f89c57aae38ca8b54a163da4302d2954713711bb133a9c2ced32f48
-DIST pest_meta-2.7.11.crate 41551 BLAKE2B 9c34f1ab14ad5ae124882513e0f14b1d731d06a43203bdc37fa3b202dd3ce93dbe8ebb554d01bab475689fe6ffd3ec0cbc0d5365c9b984cb83fb34ea3e9e732e SHA512 a9edfaf3fbaa8cab0615b16c631895f1442d3e64561bb9b356b5a2150c1dc3db269375740a898d986fea399d8f7c8f50d01325ead8d976d6d165d6a104e281b6
-DIST pest_meta-2.7.15.crate 42121 BLAKE2B 7211276778d6f6017cf9273a5c181740808fb67782b59993158641a67a670d496d59f5702486d07fbdfb15eda225dff9ba7fa35c2235eba8e60d7111aee39b5b SHA512 dac3e599b280f2ad9d3d6c1362ca18e27929f15047ed9195a3cea1e1ecc03bab98355cb39de1c793764affe41b24f0efcb6660ad0c81f7a6c5201f402e4c6a64
-DIST petgraph-0.6.5.crate 710970 BLAKE2B 7f590e93fb44f1bfb8920e512402edc1cb087ff9d5dac7bc4be965f64ffacf9c1c503eab4156cd2005f41099f6b34f51e49b21dfa217271fcc0d4ee16ae85366 SHA512 454e9805731374abf1085f1a8a72aaed85e83cd30ab9601bcfe0e46882ba6656242284bdf32b6e75c2f5ebdd1325d5f8873d5f720aabf297822ca97311afb677
-DIST phf-0.10.1.crate 5406 BLAKE2B 70532bb97a0089ef2a57a1bd43b4dd30f0289ffc1a15357ffd8a372d82374bd505f4e39d3bfd6bc2d3c2afca39703c89e3ed37ac41c364cee3759bf0cb609f82 SHA512 84568d6d1baa7c4e6faf5f3ee09133e736977286d7cb7630a59a53fc8ea15d0d41b9242f8929184667ce576cc9946da55d1e8bc06e98824f163c91c6aa05e073
-DIST phf-0.11.2.crate 21569 BLAKE2B c809201298f1c5046874b3bbdd30e33f2bee2e4b977152a2c5faa91019ee5a1c8fe1d42cf91f6d0b0dd52015fc66f0a84c1b3ae014291ad7d5ba647a78debded SHA512 97752bfb44f3d1f9347b4ccfb6fa2fb80b3263d6f67aa703c52ae90d693c537a0db878acef828c79bd4c41e8f7ca0ea45588dee073d12c9bb0f2980c511b65b4
-DIST phf_codegen-0.10.0.crate 3402 BLAKE2B 2d0a3d8f5fd0f8e577f6d4a5d0cf87bd5e4c0d5690d3aa331ba252351b59c478e42212cd66f167a2a88c2b9111ae7aca2c9fff3740dcba1b77d2beedc1d44483 SHA512 dab91b53c72a5b9b6c4773b9f16d2cd58f65bdd9fb975257b8d107d4509b44f5ce8b92ab59a60171207e025688cde54ef97c9973c4226a8765f10f35c4f6f1b1
-DIST phf_codegen-0.11.2.crate 12977 BLAKE2B 5ceceead850a45fb0f6ad706ca26e79267bba0ffc0870b8a31ee8a586b37dc421d31e5af3453d62eb85efada260a2eb9ceb12d2f76434dcbaaee2f71cd43d38d SHA512 0a11be13927f6d4303a2f10bc3a0c986dfcc4bc91c9e885e8912d077e434098f75ff4ed9633085ccfbeb052d573721750fb80c7a19ee1e75fc09660aac2a6c5d
-DIST phf_generator-0.10.0.crate 7525 BLAKE2B 1219f37d5699896f9dcdd367cfcbeb4ba19d3498c2e52acd02975b236ec3802f6ee57eaca40393a9742b5397809ef548923410768a727108c83139fc70562a43 SHA512 b6542d816b2e963c169df695d332f92237ba380f49bf919021514a16aef71de8f4f70b9612356db9f345f3f0d3656b2b39a4f34f8ffa8515510b81f1b19cb9f7
-DIST phf_generator-0.11.2.crate 14190 BLAKE2B a20d6d3d815ca0eb5ef18780587b9963459887a3ddfe3408c99f5ad7c382da014cc0bbbdca24fe13c780460f3e4ec4580665004afbd300fa470a91d3becf1a5f SHA512 122ee5ddb1f65f386d35e438396eafb7c9f2b1254daa11aefe0a6a45aa0662190c0b7fce32b6e003b04d022e60c2af4e355f995d5ddbd1b58df93eedacb809b3
-DIST phf_macros-0.11.2.crate 4748 BLAKE2B 643942f8e83dcf5623f3479d677ee11c7e25a87e9e90f2aa3b43a75398e6d956613257046f5b307476f605b433c5ae443832223ff1319a918fcf3f9602ce291d SHA512 ea6acfc43491af1330d32860103ad60f29566f6c32d43bbef254f23da0f17cc3723b1d04153fa41f82c01d3865e0e16156b9d2dcbe6a52532b8f268f3a55df7c
-DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b127f4af79b2b5855cb014a0080bec1ec45be466513bd57faa39c77cfde0d6ca02b6bb77d37a23d697603227da37 SHA512 f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5
-DIST phf_shared-0.11.2.crate 14284 BLAKE2B 3c3bbd24de77b032d194d0b0679a84a4e2848d41ceea5552f73e51e3ebddd5e61188393f126f668689dccbbfa92a8accd9c09a77de39eeaf72b8993dae280dcf SHA512 f2cf9e8ceabde75bb7548e5a47dece9a8fb7eea4a6c5568675e7bd735860c3e51181d749a26cd3dcad1476ec22d524ccb77a956dd267cd0f2b7dfb81db9abcbe
-DIST pin-project-lite-0.2.14.crate 28817 BLAKE2B 8e9875967059faff399fbffff82cf8835982c46ea8df942acf50b038e3f500e04d3d8cde39da5a71ebcc38b869553f8c49830e484d1109b353247a4cfdeda89e SHA512 f90a6b9f5ab8701718f72677a4f3597c1b9f32e5fa53198b47a94696227ea37815997599abaa6058b217c5b32a94602582c6b13fdb66e2d683bc98921de95293
-DIST pin-project-lite-0.2.15.crate 29683 BLAKE2B da9dd581eca047f089c2a069a355caf66a631b3ff81fc07220a3c378dc77ea2c399b165ff8a1d2f6556595ec52dc1bbdcbbdea5ad9e5e317281650c9158b3669 SHA512 ba3c22c70f98ee0d0e78fb8a25bdc3100b26c3f03f3e4c6c0c238fde75774c5634d6014660c39406a828d1c28f17f44f20fe19dacd331c4da2f4961a7f7c124c
-DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
-DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
-DIST pkg-config-0.3.31.crate 20880 BLAKE2B ab7676e810751f89639b60ae70bdebe1d57edc76319f83077c3680049a701a26e72e8cc485fe77cdc4346fe3571d32c59e7384c8c86fef17e00d7d81df5daf43 SHA512 ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4
-DIST plain-0.2.3.crate 10664 BLAKE2B b0ea38fcf6d4f4e3ff91d572b5639f01eac4f19b2c451d27bca49d994a07c6f46118cd58a1b86b3d2a61b7ac9e17e8236f1cc98414738d8c86086d37e0fe4d35 SHA512 6909e4b4b4a0a49e6a226d7393b121ec04beb8a13b1652c23337eb09b3c2e5f202b53a7663dfe7828dcb32c3d18135b514e9a982967c188e127a63b6cbeda252
-DIST planus-0.3.1.crate 17324 BLAKE2B 280288b40333ef0328c75145f15919cee1b14b1506fa8d3b3fa541a3644ee25031dd61e15187c7d75553a659d937f059007796fec502c67c5aaa7f2cab33ddf3 SHA512 a0dc1cbb4096cd4e096346f2a7bbd9cf698ceebacb622950f016e886309d835dba1ce9e6d8c42e423c03b765d8778307f5aeed1eb993dc0d600a9929a032f186
-DIST platform-info-2.0.3.crate 28454 BLAKE2B 22c60f2db10908c9dd0e07e74ea40823156e2d795bd6e3c279585a424c692762c0d18885c0c5782c3e6caa9a91ee6f3adba2279bb6cd0448041a667a82404fc2 SHA512 305699107d21673ab22e56dc42752f85dae93922dcef93233f355b73838e54c2d157e89db60ffdcfd38f105ca6804f76c524ebb75c4f94845ee0320c46c69d03
-DIST platform-info-2.0.4.crate 28476 BLAKE2B ef2019f0fc3ee02e03f870338bb7eff243ce125653f42d83aaa2c87a5eae9dc3c58299f989663cbb81ae7aef7cbf7025592ee9c85a90f790cd233232501d457d SHA512 a05bec3651c81026e0200ddeb616d801f43e7ae57921729d440669abca609a8f421bcfc8e2e6fe4f860dc133c724916cd9b5f81ed2f7d77468e9be9bbf7a49ac
-DIST plist-1.7.0.crate 101068 BLAKE2B d94c0c9abe1b39d747259fa56decdbbd4679b606f7753ad11dafa43aaf8e8673903c70e5e6c994a6bbc404993bd77b70b119ffc998fa1b05049c5c9768d75983 SHA512 68298950e1e0a3d5228348dfce7f0796a72f75f43f0e6b93647d460eaecb826b2a3fa1f4023bdb84a1544a4ccfc7abfb39f9aa7550d9b2199878064e1a76b69b
-DIST polars-0.41.3.crate 121151 BLAKE2B dcddfe1fa0e54a5c4c1a9b1ec8b0e6d7b51ad88ba85f8abab8e53764857a3d3a240410981f7f70f087ec2c70f83e56b70cd3bf6d49f664be68dbac0f49576cfa SHA512 713da73639c503ca8bd84c6a4e1a40994379816372b053cba30762f698dbe7ebcc69d2ffb72aad1d57ca2bb796d9fe9fd2899b2e1cd3bd10a35acb6ce24843dc
-DIST polars-0.43.1.crate 119047 BLAKE2B 5e3c33b9ec52293920d52faac6f3379f4aa6bfe59fe2159e52e197c2ee6b038ddd68169ebee5333b0fddaa26a206d1a535df032ea32427a91c47930331e30724 SHA512 93ede1fae0942e050248026e289c47ab2e64b627ce3c09b0b07d671caa8a085fe274ecf9a9f37626a863ebc7f759858b6fb312de39a5866ca888993597834112
-DIST polars-0.44.2.crate 118945 BLAKE2B d67d3e2be34f634940fae03eba009bed435560007919ccc64f5d40f75fb6c7be74245be461bf86757702627d811796e382fddbf9970188228944f47b4065746d SHA512 025e28eedeea5abd1f7ec16222adfe171aabf086b6f70b10c96f941f5f09d1559eaaea0bff3afc8d3a4f711b8400b1e31a553f0662ad732513e84f8bd3db84ed
-DIST polars-arrow-0.41.3.crate 315173 BLAKE2B 1b9b9bca7439a743f4ea2467d75abdc32c5f4d86f27f9e5d09ae5430c54b39b61e280a6b14b25961dc2a7dfffe9c243a9d14f2a113d8259d04cf6d2f6892a6c2 SHA512 5b9cd4c0c5e33dc0254cbb008029932e89d850e178fed9d6e925cddf88a18ab8200acf7f11150e6dee5d9b82d26f54f705bf8da4290e5b1c320604eaf274c72a
-DIST polars-arrow-0.43.1.crate 323265 BLAKE2B 57f74a6780aac62a594da1731e4499e7be471f785e86649455bf05e42003114ffe82274da8716af0b75bd5c2f3bac2b7c2f975fc722cca9093327addfc538f4a SHA512 16dc703abe2a944591a2c0f3d47f0e79f60cea3c8cd6b78b5faf2bec79f551541c274832d1a224a14fd727ca67da436d05db21b5d2c5ea3d5e2d55e560a08432
-DIST polars-arrow-0.44.2.crate 318642 BLAKE2B 43f06993192cadfa369af7a02fa6e95a3b965b52318d87935279ed0b383e5a2b94fefd4f18e412269fe8f4fcd282d8cb3cebf2b51e35df30970443a1b9319e06 SHA512 900d558fd4abfc71597dc40afd1d0bcc7f0fc4e56f53b7fd5b3899dd2e45b8a743f3fb0a2d5efeb9931d6c0e2507da538bd7b24109d88e9e2e10b9edc86e74db
-DIST polars-arrow-format-0.1.0.crate 41001 BLAKE2B 519ed6b74f35668ec7930672a8396c01b7f1ac8ee316cf125f5862e80b098468e74b9c678de429bd8427875b45a2a90ad7e56ccfdf534e9a3fc1f501f55c37ad SHA512 c8c2e0475107ecc4a29a4f11397f2037d37cc0c7477c68372537b6858029ea8609434a6d8386359239f02e9145e88d07d4221a32e526f0a17879e2e275e16b3c
-DIST polars-compute-0.41.3.crate 30637 BLAKE2B 8559c9cceccd4463a50626c1d00dae774bd9f0981944d9c595ad5a2286a0483317813b068d95052efc21a3cc5d9de1ed1bc5067cf173e541a4074c03b0610f56 SHA512 7d3077d5087890d108bcc087e0efa2ddf59b424139ca2616132f1ca6f266311b6294cef8b6a1e244f47e81150bab5fec08506ac3670a13b6d0f7f05bfead46a7
-DIST polars-compute-0.43.1.crate 31860 BLAKE2B 11d7ad91c38d6df7729ed900ac5242330a39cedcd090fe5b04aac6ebf1105be0ee217718944b28bc6d8b647e9dd4f19b8f410fd434767bc0d9ac73092ade681c SHA512 defe466d0f3913d94951abc944e6f06e274a70a05a86ec0da7117d5b9760002ad07a2b340df6f953d8d3aec21484e8538621f504ac697587c52291d8fb242774
-DIST polars-compute-0.44.2.crate 39799 BLAKE2B bdca3915b4545a362a97f3db369211f4ba7a3d97595e0e526b6d48bb02c9f290ec698f389e920a1fa5a9ad45ae5686e1a00ea9ef2bc8d89dfcb33bfb2339d2a4 SHA512 2e47c2f2105f3aaf6087301ccbda96f5501f055878f315ffcfffdda3eea4f5942f43dd1b602d5e34ea9cd589ef9cc1e29b65b9e0c1de7661f496ac429ece0dca
-DIST polars-core-0.41.3.crate 341576 BLAKE2B 39540fb873df3c286d4539e97d0e71c1ee3338d4fc227f44109073c2a99c02e5109412a8dc000bb7df0da89b9b4538fc122aa94e2ee19bc69afd141eeffa3aec SHA512 0fa23a39aaed006500bd63dd5629517afc4d4ee741b6b20185551131c350f13e4bdc6049cf7cd3905e78e7ce925d850ee8861649f48b4febb9f39d059b4cc5ab
-DIST polars-core-0.43.1.crate 341960 BLAKE2B 8c6fa19db65d2e7fb5bbb427e0e3b69b6e500d1bb9c5971fa4497ddda1ac04d0634f4ca6f024efdd59b69841c4a486c767a37beb365fe374141a3850c945008f SHA512 32e52ab858c10c446e75cfec4a10ccdf044d71d83e95f1f4703c17f7574fa778f3720a75d046ee225421e2f309708a28274bf5a1fcddf59267d566bda2d40483
-DIST polars-core-0.44.2.crate 372350 BLAKE2B 2c98cbd4fa368c85c3ea234999f1198dee66feb5c41dc8862e4e200b47db4682e4e460b40af24fbeb59c3c351c3edf6569d8b973dc3381c832684b0e329dbb1c SHA512 6db2912ef43c1783b4326e2189f8dbf02e15d1e4f66f1632391174dbb3d8f3ac99cea28b0746cef32929ae593b692bb8ce2838a20114bdeb675a717490911bc5
-DIST polars-error-0.41.3.crate 5535 BLAKE2B ebadeb7df4fef59bbd4998ad634fdc2fd711214a4825d5e3d7e577b6fee568156407f922a78951ca1b8cb5c8b5395e31ed830ee22be3252342df7c09eda2b0ad SHA512 e4f3565e07bf23ff2df322dcbe3a7e921dad10ba841e063b9fde42188cd955e951f924bdec3898ddc051660b5e23c5f516fc79ea4c1cec25bd6ce77222a30060
-DIST polars-error-0.43.1.crate 5893 BLAKE2B 43c766b261024b66366ae623f95086fbb4d9cad9b1f606f020f98d5a4f8cb1a98114cf800c31dd3edaf65d4f5b9f7a6ecd03ef29dbc80e632a4431fff36a61aa SHA512 63126a05d905894123aad67241fd1eef37bdef848cec30473610eb4e357f113be8eff6a526be8ca5d1ec29d660c48ebcb1a357988fa5114a57fba8dde2caa1ce
-DIST polars-error-0.44.2.crate 5914 BLAKE2B d95812bb78efca12776a514ae8718d7961d206a6414a61240167fd306ad892c90dc8472d68fc31f839ac167155aba97f5d5db74bafdf1feb8e077c17864c4936 SHA512 c7a458d7fc2ff48a8a9675651f2f1c32e9927909289aebef2b0e9a958a04191d7d44372d981b8bf82a15254abec529cc10fa5ebd1a3b2271e96ae9306b16c376
-DIST polars-expr-0.41.3.crate 48349 BLAKE2B 805435a9cbb4071c4e1e1b851450f7d832da5fa48e9da9abe77774a70bb2d40371f4ca668f8cc800b2e5174fc7d404b8f8aee768dac8558809f47453be1acfb3 SHA512 da8813c3f0aaba49933505f3c515cbba75f5c7ea07b3f65128cd0a19871547e811249059b9d684e0e560a0e78f0fbdfc91dcb045bacfd0ee7189fb8f283e4a88
-DIST polars-expr-0.43.1.crate 51480 BLAKE2B b66d80252c6702d230ea10521dc4bcae74e8b36b52942929fc6d1a6afc9f769019edb93ad6f4676f5aa72546b26c77790ea45bfb45f7142420400853503f4e54 SHA512 9d63a47239ba03b4f5a757a009cfd8f09546c2920e57dd233d457e30e906d4c035a6f42a4e47dcff100dac4c4f621f742c4b7dcfe69a0c43f1f25f71bf97f2c7
-DIST polars-expr-0.44.2.crate 59840 BLAKE2B 5fc97cd820991ca2f2377d4d9d2d7de44dd522b6a8ee7762005d1ae13681e90155b8ef670db00e7501453c7053c9b126397007047b37730cb86b82207728c411 SHA512 041e09c229788de13bbf7200cc44b60eddf6f8f67ee0929d0766d2c19767f58be8f0b4ae30eb8c5f9d67d3413ccb5a66883692e4990f34015a6b7f5ed64d36c2
-DIST polars-io-0.41.3.crate 111585 BLAKE2B 7333df40414b6d1eeb3fb56dd020692759876f9d4393423fe68ef23108011fa49063041957d9ac371539455a2e69acf3429367eb03a1e49c56368bd5256eb59c SHA512 0169d958919107cf5d4892bacfe6913f979da50c0d41fbe875d1187083e24749cbe563a30a84b65962d7123c2b7fd7f846d50ee3bd57f88821b5b60579c2f0a9
-DIST polars-io-0.43.1.crate 127555 BLAKE2B 514b06b861bde3ded82886bb85d3349d7bccf9953963d06857629cbdde5283a03c3d37f8d5c23d9cd3b07b0364fbd50ecceb95b5b086cb4195c1b8b246296dba SHA512 3fdd9a5cb9f797ac4f858ef1515d9d54a40e1309e0ae7208e234d8b02ce1483bc8df20538a44a905d4cd80387b95d8a2a62bf4a26fb9a505a5d76bdfbe0db91d
-DIST polars-io-0.44.2.crate 135736 BLAKE2B 654e4db49aa4a784bf39b81ebc9cf48a56e4c77cf2900baa1f2908073f5dbc5fbd63b2f62275284f9f67ef97dcbc8db10cec7740c5655577b833bb37d192ce93 SHA512 0728c93e7c60e9fc4b1e53b9f0f9bb1e28dc621d1ebdcc77172c3bcff953f02482055d39024cd278143c7ee9fa75e9adbbf3e72d5927f1f8e623466be81d2e02
-DIST polars-json-0.41.3.crate 13957 BLAKE2B 2824f90daa78868e12ea37cd2068a81f8d140c4f9a807dd419009a1ded7e17dc81c9b48c9b21e6496e18f7aa495d9005bb7c3b97e0ac36f9f0fcd4753c94acd4 SHA512 ac6449271124e8b6808e99890561ae1b9e4ac1d8b842b088008ff0b4b706dd49f2aabbd5949a6e92dced134304cd896e08aebbc6c18c090cbfee20db0174af31
-DIST polars-json-0.43.1.crate 14040 BLAKE2B f117046e37d917f7c39f1da10e214f66eb8b25b39e15371e9a9f4ee273b5d5ca680aeb17eb6d2db714c470007c3401c0825dc5f8476555f8b3114a0c129a9214 SHA512 9bab4c4e779b4ee97ecc86a26207b36fd994df0b12d534e3551491e416434f8da23e7c25942182e3794f903c54d82191c7a84111b13c29ab84b649a9d27e0efa
-DIST polars-json-0.44.2.crate 14718 BLAKE2B b26fac99e2b7bc079ae459c005e7aecc54a60677221093ace8c74c9e0ba27b23eecc86168044c2f402da74104f7305db4c905ec7e2b3165506ef8900a04e7801 SHA512 701907bc23eabe86068ec3673f2788a62fdecce5f9865aa23a945c6973bf9a41e16089b7e706e0617b1f0a9889d8ee067cf6fcc47a556cf4afad0af692596560
-DIST polars-lazy-0.41.3.crate 71085 BLAKE2B d76b91db53e82012a8cccbd39221af667ce1608ef487a06a8e7223cc5af287f86f30419b9441aa97399ad4ca7054aed41fe470a2b72c26dab672304330a8ca30 SHA512 ea01ad742096043eaf24b766072a6b3294b19511af1f8dd676eca114a1fb57356db8e358350022ad7dfac8367235d118f998bbde9046405a4bf31a60b093dbe4
-DIST polars-lazy-0.43.1.crate 70964 BLAKE2B ead4045147030d1c7a906bbeccb7adde04ec9b410fb83dc169f66f79c9214a1bdc4d3c77b276d6134b8a7641771ce3f44ab85b998c3b45e7f1251e33b5228eba SHA512 4ee3e05ac23fe4c07d2abae9bc67a7dd0afe542077d69659e26ca52cd4602a96e942887c33566879b54e9cad7f16a81d824067ef750cf2d7ff93cdf21784106a
-DIST polars-lazy-0.44.2.crate 71985 BLAKE2B a7ea51dabc1196cfb2f23e7f275b8d23b3f4a8d7381185d7d58d6c3bd101c5896b3af7c882cc0a066a5337ae2d9e1e88c3ba68b66c99ac41854510e3b0e51179 SHA512 0e922f134838b1ed12985a8d11f6d762b116cd396450c66973a192e061d60f50eaf74e8e26feee369591f6795b3f835d9dcb25a004353f3af7319d577e06545f
-DIST polars-mem-engine-0.41.3.crate 28914 BLAKE2B facffc84de3a5f40b39740e6b92f01cfc0aca91619294fff6621a6e2daf354061f005c0e6d3c01ee4cf26c1f29321dd5d75cd30aef987f5ee7d976bea6c08888 SHA512 1179d29a655d8312149a7931e2aca845a679c55d853fce802af7f2e0924dbf07060cc9cde0098112048a7517e85cefc86d89e332e56119aac8992b072ea05983
-DIST polars-mem-engine-0.43.1.crate 30688 BLAKE2B 0ebe106894f69493ca07c74fdb7c97012e3c30a25ef1ddef02f8bbedf347cb2c3e8927e6aa25d11855f93b968dc19642da6b60e87f3ac64277900fefb59b6581 SHA512 00dcdfe7ce20a4b6dfa464aa79d42753d7843fa587a516902cde4b264f8e81520340f00284e418b356ff72be64914a92c9cec8c74a9ec0919f6c8b659818ab92
-DIST polars-mem-engine-0.44.2.crate 31151 BLAKE2B 6af05eb61f15e3c7a33b12a2c8c92d87443ad21568e4d49b361e96abdb04ddf4b806ac4e006c6f14238c7b49569ddc5c43c5daf3015f1fe1c821711641b9d39f SHA512 790cf42b923a4713330ed8202114329e00946637d1d4bed1885f86f266b01c893778a905496f3518d626e50fa9c0883687030e530aefac8440c4eed4406f8617
-DIST polars-ops-0.41.3.crate 133126 BLAKE2B 25245214678dbb592d1e9b3875f544c4350151c0c88dbda859708e650621bace7bf3fa42fa72d9a0d3c7de5d9aed7337d2b9361a3046caf717b815179cee482a SHA512 bf32ea40aa0715a878696ef74c7cd59bcb39abdc14a3f8c9aed8f9e6a8a2155bea22f8610afb38dcd5f030370fc8dfc4593995c78802e8d3baa492d9011819a3
-DIST polars-ops-0.43.1.crate 143819 BLAKE2B f00053def566464ce25b41947ed69c3dacf6f966abd66d882df4d9a22b8ca159575a48be09038d2200354eb3cd6814d890b2128ffa0a558070282765060a2e2c SHA512 58d8d87605c9a1bbbab3c2284f0e01876b6cbdee46b18f9d9ec09ce3a8501a5e954b50b6b0f5165dce22c07becb75e61bed293d1d3c5273b29bded1649e65861
-DIST polars-ops-0.44.2.crate 142304 BLAKE2B 970e69e82c7164b07ddeefae294637dd034d70c371d24d300c77615c659fa208d0f3e96b5ce26afa19300a791a80d6d5437ece15c3bac800d8463d7dd42cab5c SHA512 2037f774bab8197e58c25f45ba42f8f63aedafae76f0b70d8a83707340f546d75e24ea0a8156babe2d5d2082c3f66b29c7620500ce4c9243c2654ba984f5d188
-DIST polars-parquet-0.41.3.crate 175836 BLAKE2B c67ee6d4bc8d17f9634690cbc025457c5e95095c2660dabad8b140f67e15d917687378bb024014e651252c879e65689a62933ca2807a4989837ac450d5e5a38d SHA512 e4e62ab714733f0087597db552c2c0d0d9985d08bef954827331ec071d03eb7254c20e915a7e59d89ef6b8478d95246d8346a14a8c0b784ed71c7df90c69c572
-DIST polars-parquet-0.43.1.crate 175676 BLAKE2B 924700775b772073d4497280c8ae3f4b82cc33122926f81d9f309a53db281fdc61b2469b75d71a9f36fdf63f244df530d3f2eda7ff0fb35378ccd925d84314e8 SHA512 888b782cb59a0687a69ab7bb0177db85d7b6254fcd918d7b72bc146b12e84203a59fee5b933337915f7a94f48029264056c934d2a98a88a14845e7672630d0d3
-DIST polars-parquet-0.44.2.crate 178080 BLAKE2B 311eab90dcbfed0e0b1f0201726a16e484e93cebcb36903e343e60e145abfe573a1dae2d7ceb41b40bb2b170e87d15114004858602ad1f510939f0575f74255e SHA512 7dbd8ccad615fae2da529701bedd998a51016e58fc62bf5001e7a851e131184f0535f2091857f5c0b3339878f69e89be559c05be642c836dea279ca2e329a5b3
-DIST polars-parquet-format-0.1.0.crate 55634 BLAKE2B 3a5b178820fb5562821ac81a80ff198342105f8b1b1ffafb221750b2ca5d4db149071b71960c8ba05bcb98a848ad0930c39c143f008e72b0189a7e3bc606be02 SHA512 45437c7e2d85347011c73ebd8d6da2224c253426ce1ab00114e0e99780436c48602635a387cdd2867b2decb2bf5690d8341c3a1ae6bbf1daa74c3e95c6c38e0a
-DIST polars-pipe-0.41.3.crate 75767 BLAKE2B 4ff46c2503da7a27e83ffed6d0cea7bc03dd0f1c5f67859572e90d286bb52b4ed05feb481d20cb6174c86cfc7bc187c0619aa7ee5b7ffaaa36788b37acbd338d SHA512 a220d7b8a8c4eb8aa376d42aa9352cf1b41a1bdaaf84389d9fdc929cdd7a682cd79eb15e11fe15d473149bbf392d03f5ca972f98b1dd2c876740cc34557352f4
-DIST polars-pipe-0.43.1.crate 77002 BLAKE2B 4a850e055c3f6207eace2888156ae1d0ba0c201745102be410d37ce6195c8a4645202c6e1e758b4e23f5e1486d173cfe126859afb643d94a88e197b3a6127db1 SHA512 3bf55e94c4dd39328d3c807e0a5cc9b5d7f4c7298e222f7eebf80da8eefc4b2ad6d9cf1801a9e000ac12b93455a1bf76cb35fb30d62b2e7d1f3ebdd48762d41e
-DIST polars-pipe-0.44.2.crate 77253 BLAKE2B 4042216428507620ccb266a994f945766c33563c0a52765b90a380ddb5f871a8273f9f034496ef28103511b26c5b73e1eb4e8ed3f8adb6a057f9c84c8926236f SHA512 6ae545ac53caeb80f82e55c3e600cff2daf6ece669d2f8d87f2b741df62c4020612dde892c4c9e83821f939de7c6648db3e77e843e2810e1acbf967593b7127e
-DIST polars-plan-0.41.3.crate 243254 BLAKE2B 0b94a9b5c8d2cede1f8949320219a61aef869d1663ddf39459c77114ad95ab1c2a0c8bd16a5d71075709feb9bd6b4d977d3c0c7d90ccf2d574dbeafbcf2731d8 SHA512 c38acab5d7f34ecabcc1672fe6c466ecc7900b8cc34a0f19f3cdc6956875a75cf8c350e7119b9b3b31bc10a3fe6773d6acf6e2a6493eba401b005c389404c99c
-DIST polars-plan-0.43.1.crate 259923 BLAKE2B 21654c398609cb39536e2a571846e66a90e8de71f47300c91270fb4d4b24d76d9a7b1ad8f3741bbcda6c565e65d15ae92f9a535f6c2a2cce1f89fa08a31b8b93 SHA512 d6a599b23cff2d361687df218e77601e7d716b2e4474b1fcdde50dc2308c5ba913b0705a2f3a646f642a2029a43118fa51990a1e588d60aebfafd574e418af3d
-DIST polars-plan-0.44.2.crate 269594 BLAKE2B 1f63288ab0f79f877c1d00082e1dc50085812c7beffa4dbb2e1aae4afc97c73f1e08b1500894a344f976c71328d309cd95b9da43771aafc128dccb9e35559ee5 SHA512 18d6c3abe7cd12a729ca286fd95dfdeab5fac49e02027569f7a8ca59b99725458e4512e7299c275cd7a88f3e9ecb4e1e23bc1e8f1214a96f658f530101a01b7c
-DIST polars-row-0.41.3.crate 16062 BLAKE2B b8a9b08ac8ae37e628956512f8b9f5f7331b2edbb2294bcb37db144f3b6b1471940323d61ad92489810fa1954f477f0e7fa8445454ac4f474f7050cece04f846 SHA512 25e92d2e913473de61311a8be23e4cd7726ebf78f28690f1537b0b311ff2c649d12afde5c34b4da851420d16cb9001e5247131cef9dc2dd848cc690fc19866fb
-DIST polars-row-0.43.1.crate 16272 BLAKE2B 31ed64d29a96ab3ee857c619d68d85610c544f135b0ab132f02ed46fba0477c4ffd8ed6d21ac578025673e7d086794976de0655f06cea10e5fdeeb5cadd13b7c SHA512 b24393c4e7f8fb944538a86baca7e06bd395576cc432b44eca39181a8526ff1867ad659762d7dbcd696364428a291e6a4f21a1e8db47a73b45790078d6b91b22
-DIST polars-row-0.44.2.crate 16737 BLAKE2B d63f3408793c5ff42501c27baa847104fa811581ef93216b07c1de0d42debf577b783e33fc3739b185cc5f00ef354f0725190c40a866178cb14b8ab4996aaaaf SHA512 0347c55d9099220cf7759f915203a00b4e9fb217f80d4bdf2e41e077a7289e0c9795242f61cbd294857cfea4fea9e2900bd084fa425a13385f5cf20cd7834747
-DIST polars-schema-0.43.1.crate 6384 BLAKE2B 6238d68d282918ea58b2b9eab4248513afd7f8cfd9e6dc3a4d22f973b60228df407b7e591b36a4e33939516a68921f14b4feec03f50756fdec54e9d1f47be02b SHA512 d8bbb7452d7e585746b7eb50607e8ed242cf100a5cde5a8569479e07a1316d76950c437a3f420a76bc77337e0f88b4e3d5c04526cd7edd734aabfced74b7e2ea
-DIST polars-schema-0.44.2.crate 6383 BLAKE2B 45d8e346822a3edfecf6290ee35105774742843f9817a24fba24c25a88c21398cee8ca76f59fce6d86ca626dc1ca97ce6657f15f1151eabf5ba11e69d4429776 SHA512 0f57ce2f94e3f2700c4aa54a5b290ddd27460c1b9ed1bc3946a8dcbd0ec9cb6f0b03ab025c9cf1ed816389133c22e7a27e4af0896411ebe64fc788c8f9fc4591
-DIST polars-sql-0.41.3.crate 50377 BLAKE2B 6b4f6799362376171c1824dd83203bfa05ca67b1b06abf4956d089916fc52930c4cb984293bd4438e6512e6176f3f2de542f36f7332b6ec8a0edf45b25df83a9 SHA512 516795d8525d194ad939619b790d7d2ffddb48dd93a878eb6bd4e3b3d30929d555f696e1b18e2b7b2973318b673c4a3d6b769bb093cfc166b84412380b0d3e3b
-DIST polars-sql-0.43.1.crate 51351 BLAKE2B 1b09c3bce7f081121a43e4eec205198ba64cfcd365f118a97d521b9a5de273907f12fb3e2221058cb97a3e9fdcb4c320d67e0df5eb5f7fc8168da5b7e2014eec SHA512 d366c5240479264bb7ce11b3e6be9b456318f1bdb9516042b1bbf836165e711a1d8940e64ad56566748d94d0b6fae3f9865467e68c76b0cf31e50ed11ad42f0b
-DIST polars-sql-0.44.2.crate 52838 BLAKE2B e2023b37e806429103f9f3471d2ed6fe754b36ee06828ddb69d97111b129403c5e232f92820b301a8192c0874040c2cd5482ff5cd6c9924b9b441e9548567814 SHA512 79f2ca283f5dfda7136c723c9e8b52976bc34922a5f4620fc75950a56b310abb2f52c669e7775d3515101a92814ab64c6b60f40804b65055214905045cdfe11e
-DIST polars-stream-0.44.2.crate 71714 BLAKE2B f527e8a0e76037704dace9fff3494a7654a8dd372dcf47ae6191e7d0396b5fda31b0d2d7e2371233ce3d83408d01894558f34e630e23de5cf84f9f1c8d718157 SHA512 787a57f8ec1f950099025dd722e3a26ae9b483caa925cf99c5b917dec09aca49c8597f683fe40ed98aba95a64572220f77ca0a715769faf364155f08afb5b7c8
-DIST polars-time-0.41.3.crate 49879 BLAKE2B bd14398d102b66c7c906ce9db7342079146458f0eddaffc837834eb1856b7999acfb9eca23e30db931d76af3ed54536dffc65a933a5b082a0c2e651637f7adf0 SHA512 32d4d6cc7e44b2174d380efd1234e5816571f37fbab93d9fbdcf95bd2762a1138439f2e2430e7fc6aa20b070624c70619846850abc01dccbc851bfa40506b1c8
-DIST polars-time-0.43.1.crate 50516 BLAKE2B 5b636dc48c99e5435c7e97e970bead7c5f5f549be8f71a368844f4382e5a69649bf99f16ddf452e6356b7999578a92dfb0e1037a2243bd3811edbc19a38bb43c SHA512 898069867f519ee5187bb251aad92f2a2450f75eafb626684a2350c1c6a1f12661f5fdf1e4172f6472e3521483a922f50a9c5ba8ba5f695641af66029a8df7ee
-DIST polars-time-0.44.2.crate 50806 BLAKE2B 51ae2eb3f060c8380c2f032ed2088da5c22d82cb159bf3dd7eb9959b0004debcffdae8a0441cd59bab5611b42982dc8280cf3a3a49f79719438a7fe12b8e0687 SHA512 d66ae38d7c57c11e750787d47edb5b3e775d18c46362b011c54aa76e6116bbbbfaeae6800acc756b80e3d01197b1c8113fd909105334ed89c97671f45dfe6c24
-DIST polars-utils-0.41.3.crate 27910 BLAKE2B ba5ea608d3eeee46ef07667f8b6bdadf4ec342fbce40973e0a929341a6be8f8b5784a382151e0ec4ec14f9f092e6d906a26cf8c297e4e0eb9cbd305353e4b939 SHA512 18f8ec71e74976e896521a054cec8800851ba27501e54b32fe7ea6b85d5e7d653e2026d7162292a92eaf5e9faf087019f84d6cc934dd35b037b03b7cbfcfc366
-DIST polars-utils-0.43.1.crate 34742 BLAKE2B 224906df0d7ee703bed9592b74819a25ec137058a1e13645b477313159ea63c9fd275a5f7d64f76f48a1f857ab70a08a9832042816ba1971a29e3cf5df4adb24 SHA512 bacb3f2b0f5d86b15d33fe68e4432fa29567ee830c15103ffc5376424ee9f2679b8b00426dde876a65f668351bd8ae6b21f62527e987696422ae2b8903f26e18
-DIST polars-utils-0.44.2.crate 37123 BLAKE2B f858953c6b34f1d3eab7a09f0386e32c88baf7483630df15969b5764644502eedbb7e9ee68242fc8a9bb5236fd85a8cd122bfcd06f9236ef890dc583fc47b3b8 SHA512 3c7e4640fd6d3efb7d6003e11720a1236615604d1d133e427c02f1fcc661a2db14cb57427663c36564380d93c95bb9d5660f33bacef0c808eb453c07b339dc8f
-DIST pori-0.0.0.crate 4839 BLAKE2B 5889cd5b51dae18b5159637bd95ad205aa5fa3e40dd1542a4bdd90a0b3bbd5584f6c019b9b22f2fbe3cb30d87725fcc3cc09962fa8a76ded464937b5a5e06ba8 SHA512 6fbc9e74fde5229f57a91ca48799cc0de8febb47a5c636ed54ddb64c71d793518692a664ace776f9407004809e69c11fe2f5fa68aa98332885febb715b34a5a3
-DIST portable-atomic-1.10.0.crate 174760 BLAKE2B 9a05d6162c95f5140709cbd005c1997449fb6373700e8ed3966e3379898e95f3cbdb90b387f1c7deb3f1eb33125378852a7168d0d22b433813f6c082112b0365 SHA512 fb47ab53fe240d5b0824dd068c6dda473d3e71ae6f5dfccaa17262a8b6de0e1dde05d83975e53bbfcf43f10ef5c634fc024f94613937927ae93f1adad1dadb19
-DIST portable-atomic-1.7.0.crate 145385 BLAKE2B 7d9622d636677e3adae0f909405090318a9d6189fc18683ed21074e9360f213b44c5213f3561e3dd1f642547c2c2e6682b9e1efa63243c1f12636bb11bd15dbe SHA512 0849edaa7a1f9ea66182443e31691e7839c857240916521bbd6009b5e692b13f5b315df36e656134651386bc50d895ecf6155a906750009514cad8bfc7e57fe2
-DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029
-DIST ppv-lite86-0.2.20.crate 22478 BLAKE2B 9d68dc36d8148047d571c0147ed29f586f3c6ac9394b56bd955c8ae5bb18f5a8da5369809f7b8c3199074e23660325158c32c62e1bf69a16cb1f5da2a01f5df0 SHA512 6d171f63b42296f7765732fce3af7ea05d0d81f1541ffb3ad86e81210715ef4afe5bc9e58926e97e757aea6ff96a8012c8411eac78be0fd080898318ed21d7d1
-DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05
-DIST predicates-3.1.2.crate 23986 BLAKE2B db4209b491f82a1ef6147158fdf86c0bd8a059e61c4a1922dccba257e461be36e31d4a03440c2b80b3c7c49d612dec81fb76f648bd5837c481d93cc9ac5ede65 SHA512 50896189f39842ef424aebc12c2633112fda83eba1bdeaa3e6f398db1e28dca0cc7838948f25e67f6fceede1a91a1b0ede5d4dc4edac6da752e48c7a07bbe3ae
-DIST predicates-core-1.0.8.crate 8552 BLAKE2B 774ed04fea09335ae9b4e87a237871f954b85e54df369c5be60977381e8cb50f11aa869e5ee41e57e4f3283003a9da67bdbe3460420ac8620f18fd81e33f0597 SHA512 8cfd010b70aa694620d6c573bd8ddc50ea16ba08f6c737902ba6697307af4510b9298ffcc3068b45bdc6430103db6fb4499783c64044d87d023bea46d45d0f7c
-DIST predicates-tree-1.0.11.crate 8393 BLAKE2B a8ed762ab18f3cd72ed749cb3db3d756dfd2d3875b0f1c68a99e39ed4ac5c7000086606c21a834ea0a81db961ceab659a4648435d9eaf1bf3d7f29d92410efb6 SHA512 e1b08010f9cab65c75d82cc44cfdf64d92127acf6a72ee0ce1533e5d7d8027ccab912e1c499b7b78508b5e3cb20dc03df94de3dd520ae13736906a5f374b10cd
-DIST pretty_assertions-1.4.0.crate 78846 BLAKE2B 68583c49f81ab0cf5b90f6de10ef3aae9b525288fec25f9d006f2eed0877c0fa742dad5f878fc78233b54c0cd32dda7ac1f7161bfb475288d8858e8e40aa9e1f SHA512 f76d38c787e91b3739272e3bebeb9763d312b85a43cda5e1311ba8d6b0e4da1ef25bd66208e772b1cf56a34553ee560482b5ad19c5290608b2aaf9c0d0f0e995
-DIST pretty_assertions-1.4.1.crate 78952 BLAKE2B 016df9fb2f24304b68a6bf4fc8e144387f07a5a15fc8d92757cffad11b4a00e74559abf597d4ac8619a3dfea705c82df1b8c8620c5f32c61ea8f212fd9cbf9f5 SHA512 474f77c61cc17bbe9914c56b98a80e5918450205827cd059d693c2d603ff61a0897cad25dde645cb495200e61ddc14333d15eb8bf2de090a2eb68deeb9aec8b0
-DIST print-positions-0.6.1.crate 13435 BLAKE2B 627054d8ca6cf2c81fe20449f0807b888adb1d5721fee392e64194642a3eab5ee8a03c749ba21b48f696e6a5a3463b2a6c360e88c48dcdb395f06c51b2194a6d SHA512 c6f3cf45093da391bd02ef312ea03f33fe04aeb001cf827e0c410924ad121e389f6664359a239ebe2ad2e65127b797f506ac017698e389c34085f0afe39ea66c
-DIST proc-macro-crate-3.1.0.crate 11084 BLAKE2B 9a9d02f0f34a30668ba94e34d51199c332209c47fd8bef28c452924f75984dcf3aef2c92c4ab3fb03205d589e4f773d960064b4d08fdb2480168f10b84fafe98 SHA512 eb5ad763aa700f2cb1604c32a4bf2fad499a03ad868a22d06b0697b77875b1cc13c739fcf165b2bd547207ef6dc3bd13ceb75e1a59c596daf916f356ed27d8e2
-DIST proc-macro-crate-3.2.0.crate 11164 BLAKE2B dba3e1f4e38f427df72794ad891746fbb8c24239cf06b076e75ab6795a7e8c9abf25ae0f40379e07a696827156e7a3780ae242da7e5442cf1224d058f54b83a6 SHA512 41479ec5e414a8b05dffaa0ece21122387d5165a54e60d8ee3502f8a3c0a2ac0247f56996f933d5d77f1efe41a56bffe16874e8c6a34b66100cf047e4b760863
-DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
-DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
-DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
-DIST proc-macro2-1.0.92.crate 52353 BLAKE2B 9aa29fa6f1c56c0392a94a81b4c61953f4d185012cdca37e356817845535da79d7094bf43472ce63109ce479a2fd0cbef4d802afd61daf92c4db303bcac60e7e SHA512 e614f08acc0a7e97ef580479cf5b682378df1ca16f09bfb2296ebb3490a435229dea9d682c621c54ce57e8e1d3b7803eb8ff83c88bd02e07228dba6d02f14aee
-DIST procfs-0.16.0.crate 60581 BLAKE2B 0df34ca82fe08930d123d7487394dd31a233addcc5ea540952b246b0b036f110242f757a3211e2010fa1e5fba4c53f253ad8d5dbb565491fe502f5d2332d6122 SHA512 bcc08d05a536f34272a0beae3e0fa55360de1aab6942d3b20e95a577bcaa4def8f5ecc96e9432871efb13a8d298b2b0fe61c7188c9d2ee5deed2544371aab707
-DIST procfs-0.17.0.crate 73252 BLAKE2B eb205ec08019da77522599f192dde47d733fd68c08eb68611cf2ece6de93708cc1f2a3e0e941abb48b5d6c2f64da9e2ba158c1dc8f3570ea086b43f3e7ec8030 SHA512 76950134beb05f3df3dd0ba32488e1661a8e90fe5ac59a9227b4a5d2413e4ffc9772c9f79d37fc882fa9ef6b2c2c8c96f00458181926b0a1655500da56183a3e
-DIST procfs-core-0.16.0.crate 68279 BLAKE2B 257abf95553979dcd0b0e9f86bde831382486ddd13691c59f1d0bc36f9c604ef0ecb06461ee7530a2d455181bf588add9fef8022ceea3fa3f939159001a2690d SHA512 aa21eb08ff57b7e86dd4073837bf408ed6e89e46add614c7faa04882d131241c0b01d0267de39aa86f85ba9e60a326de48c7959d878a6b75058cb7d82a31175a
-DIST procfs-core-0.17.0.crate 87533 BLAKE2B 8774dfbc5cd2cfd12c1424de79d6be403c9d3e3a04a0437ec4f4dcbb4535495faf7e6cb30d268bd16c053ec8cd72cfe9a6b2d2e577c6519d15553c9f7e0fa7d5 SHA512 392a6c6702333eca25f4bfbbf10ad0c300d8b1c3f1ffa51151495509b45c0e094e8a8d43a18a9490dbf5910fbffb9fc2669b39b989c8d10bc5aa080377978ef4
-DIST psm-0.1.21.crate 23126 BLAKE2B 5972b4bad729d3c8842d4d616b1a469fd59ac7cecac5dc5754f084b7f2c623f715f302a9132cd146f48f323982c837a63cddbabfdc97c73ba88ee60df3d036da SHA512 33e34bb30efa5ec700c135e11fe03447d56e6f0dbca5536fa8bf9ca2c605c65e2dfe0a2a79a0bbe08eb2d2a37e569e31def340e1187bc25060c2f0e6537e3e5b
-DIST psm-0.1.24.crate 23294 BLAKE2B edaf78d39a2cf425ba49ad298b9496d505540a50550d64b4c97f3b8df54e693a01071a09bdd1e676bb13758ad598b24a41ad60586c5ac495e5b07a4d97419420 SHA512 c26f1f561336c6a2a245cff2c5b0af68497e978c65ce1407b4a5e9a0fda3547a57f5de70b0f9099e0a6ae7e68fb8c1f3b33638d39e2f1339f0b175df441880ed
-DIST ptr_meta-0.1.4.crate 5754 BLAKE2B 89e312313d343177c6fd20637da6fcb720027064038cd362f41104dd753e6ac949582297f91da6a088fa408816af75f1ea9030634ab3291afccbb598b001de1c SHA512 9936264dd52ae40e6afc8cef8914dbdc5767f397b91ea965d65275fe547a2d9cde7ccdcf908f787e25f84fbc23a2e30df895793fca308e09f48f2adf2e30d2bf
-DIST ptr_meta_derive-0.1.4.crate 2302 BLAKE2B 14210f93fdf3460feb53963e88001b468d0305395fff7b082f079eead29723d09b7986277c760ad4f6b906e5373e4307dc81dd0e8d37d4dcc3e61c4458b76fdc SHA512 15a72b2c36e9d1761c4dd42cee1623c2d85c52eadc3c3102c8334c14c9c5db9a43d74dbbab1d14a2600d789917fcb5bc2652877b172aaa02c37a6868462ff20e
-DIST pure-rust-locales-0.8.1.crate 178758 BLAKE2B bb2fe00e5e6b67ed4e5b5b99d6786772b84997ec788e720470ae960b1c99637cce8f82792305aa5a873ea59d9a375434035d983aba26fc26fde5750817856449 SHA512 cddd35f6d288c863a0790a1e0213004d93b0c2dfdc5cccb22fbdb726b0853f776d3c6b03e2082d76f827c41f9831fed762a6804d186447e18e61f903f827c51c
-DIST pwd-1.4.0.crate 4145 BLAKE2B 65644be9a061d26ecc4d52eb945a10e19a4bd5db8ce561a78ea877305f66e5989edbdf5f08caf31f69a361651345f338d341e57e2557e5a38744e391f320235a SHA512 ca0839275c086f69c4f8de54176f5134efc38c6dc82e2b27e783cc7d2ac6dcfd280310d5353ff8489f3641c9f9770a504e6087a4d5e9dc669902aa7580d54d9f
-DIST pyo3-0.21.2.crate 504574 BLAKE2B 1b8bf374d1b61e3e4bedce6344338126051a6d951ea87d258e5ed92d4c0e13b0202f2e7e56500277c54743dd16c9b4587f436cf2058567501c8a9ac7c6b6c17a SHA512 5f88cda423e82b62698a74ceaa31fc27e5c1f1d417928accddb2e00337d163fda622f774ae6e24c1cb73c467d6b01e9a2ba866e4454338b1fbfc892ae14ffc53
-DIST pyo3-build-config-0.21.2.crate 30581 BLAKE2B 993c1f7f15124336b70570ed3949cc0873c2b883e81dd3a350f347cf014fb9a82d487197fdaf475989b727b7ee8d9a5511a72422f76126b8788c4f40831baed8 SHA512 8b6bedb31235de3dd95bca6e19ea4eb7752227ceb9f1c928c4df2b277df5ee443e5c262e448012e4e54e3104213db4d745c9c42f79ab3029dee68f48ec3a2795
-DIST pyo3-ffi-0.21.2.crate 66160 BLAKE2B 759622fa3a41bcdb48170983c4e194898415f8db16a7c57ace89a7945bd47374d9a14e5ecf24e80a178bde597cfa30d41f9e6617b458d365640bdbda048e6f6e SHA512 5cbc9dfb14569210776fd66341e77e61642a9920354251a65b91aa13a0fb1c373258d1a6b4f8feacdc4266d472193d8f20a6dd2cc180ccc3d43fb66237ae6d0d
-DIST pyo3-macros-0.21.2.crate 7920 BLAKE2B 60ceb626fd1ffeca7e81ebc721bb4cfebd99bb708d48bbfdd296b250ed41471f82e8657715e1f58840423ac11d8c5a84a6107a7037affdea4e0c2cc561514ed7 SHA512 95335a55d57346107fdc7591d51e36aa0a985d6c44a875475a0ed52df25d33b21a7b922fdab0eed190da9708968e79f7cd50bc683b6d210eb068713a915ac7f4
-DIST pyo3-macros-backend-0.21.2.crate 58088 BLAKE2B 05dd49983c8aeddc47cd94f6cd58f10e41ad6f4ec57006908cde4fe3edbcf6814058d7843a88c9dbeb0824f840ad3509414c52e47fffe5ad4b730f791c9a3f19 SHA512 f8488ba0a68f1ae20d053e2323d065f03b40c24231a50b05205b100e973ae50bc7bb9c25e4d37df56f4cfa73d2001655ce9685078d1017a4a90bd7945c01b833
-DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
-DIST quick-error-2.0.1.crate 14265 BLAKE2B 3815c89e960923bfe0abc962c38714b953fa1d5af991f3de22d1d084a8cd1ba1761fc961ba97e06ead3992ed1b61f525d04bcce459599e5546315932281c1dfd SHA512 e028deb598466ae91663e5d090606be4f117662d0fa6e0c0b0043c7261f26787057e84e644cae72a45b1a0a7b1fb03fc9712faa3abee94b97ce2c8d25c365c32
-DIST quick-xml-0.31.0.crate 172236 BLAKE2B b83c7f485a30576027a4ae77aa23cd6284942d786f0f0a14faafdfecff646371ba15133b3ba90f820183c8537c8ac47ad3e1e7deaad65e56761bc662be406026 SHA512 9b1f4f9c32694ccb244938a9a4e9373c3902314afb6af5d2f6b1be55e5ec63fee5cf1085f8f32161570cc10fdd96f3375c7564b1d884bb152542b86593f175de
-DIST quick-xml-0.32.0.crate 184149 BLAKE2B 35a28dda8dab04a933c4e5d40f22dec6f9c5bc75e9319bf2711daad869301a90aceea9aeccdce5763d5fb513548b7c1f030b6216ca1454e8f56bd6e5a5fb6ba7 SHA512 288232de1583d8c7387716900be1fc513b2161123182e4812bde9851f4bd31c1a67417afdc16e8a55c028747d0a1147d2dbae6f0e8885e946829a379563507d2
-DIST quick-xml-0.34.0.crate 184595 BLAKE2B 5e51d79b64aadbbf23269b7a0a344e2c70465a74107bf633b258e2cc0165745d2b43132392fe97792ff15a3cd641be404c420680290fed4c1843747f77f9c2fa SHA512 d7c9e0ba651da1cdb322c10d575d9a650767c1694bea7df50b49dc98f0296a671bea2a3700ea3099dd708f0ed3f480fc921c90e86796f36afff42edafbc76a86
-DIST quick-xml-0.36.2.crate 185201 BLAKE2B 4541812a73fd95bedf21f90f07f27b31eea6c514ae17818ba957dd83ed176b0f17bcf3860fdbda07f0fedfdd7ac660bdde5e8ae2aa9903bf7a7c8ad2d4770470 SHA512 7cd4778dbb1f50fdfd7290241fbb42c8529f7d44c2633cac017657010d0d443024f049287e1a1806f5bebe46465549973cccc660959c587fe383490a150ddcdc
-DIST quick-xml-0.37.1.crate 187839 BLAKE2B 1d2a47f497bfbd7d32216527804731f7183e55a661991db7d76480442021f945dcbcc219b12db80e2ebafed5e08160e39a42d2225a1d47f02b7e45671308f5a1 SHA512 dd6f61ef1810481ce0f994f19027cd68620e546f10cdd9160880ac25cf91a0f6e642c0e6d88d81952a3af58fda81e5c93f761c8598432610540876f33e4f3159
-DIST quickcheck-1.0.3.crate 28069 BLAKE2B 5f0ddc8e22fec55e879745a95024abaa03d7bcfc6453286eec072663b36a5d6ae247b3c1622c4743e1ca9b7c4bb21da0d095aa5247f32b0bedc393f92cda6bc0 SHA512 07dd707c9d3fd0b9cedbba545bc8b4fc1ca2770d169e444f8c96f8306d3161a6a3e9189cc5d0d6b3dc4221f7dbc05887dfe2dedc914f88d5e69ab2b94179185a
-DIST quickcheck_macros-1.0.0.crate 5275 BLAKE2B 1681fbc5a476c627da442d601d9f24dfeaa147dbad7c8d6989ad73cf5a204963c29b2b5bf68513ba74c322f74ef5ceea92594953e9034921a2c8132150252779 SHA512 f7de86f76a53fc36063f10f5405979677a2e48a96d13c439a4aa98e89ec7f3c3cae324b8dd789a5236630110ac9a1763f28361442cca08d1a1ef458c7bfadd55
-DIST quinn-0.11.6.crate 78222 BLAKE2B 75a5531450e8990a610967b40d31ef5409a4b9b99d965b3b31c35276a788731473ebbb26fa465aab621923cf52236a0560df8abb87a02d0e911021509cf1a1b5 SHA512 f8d4359df3698442181843a5c49d688502046d60394d0954cd5a6336aa16ae9960f8906c152ccd966f5ff24225a6c4851f1f0b3153528bbb3d58e2b549096ca9
-DIST quinn-proto-0.11.9.crate 209286 BLAKE2B 4d512dc74943dbd19fe406a7dcb40288b78aed8086b81a49daf12da808eed35ce0546842b840aa460afac9a8187e47da0628cc2d4cfe8ba6eb1ddfd2c0c528aa SHA512 a0e37817d91ca1dcd780d2ca1c01b30d59716ad94dfc313f9232dff708cd8f64c7dd3da91026c8fc1fa9e81d918ffc354092ab1b8841d521eda5ab93153c2616
-DIST quinn-udp-0.5.8.crate 25336 BLAKE2B cfcdaa795e8449fdd9323be5e2a06c53b17ac50d2bc619e5e809fe790f4147c988c0ba273f4b0839859bb33d41c7edb126dc2a5931a67381360ebefa357e5698 SHA512 dfa04b1e1dce5c84ae156cd2fa3ebfd4047a12866c5fed79c44f080e65149ee14d84a0dabd96fd9740c2e4f532b3b97ae95347a39300651f25c5c969c06d9d6d
-DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
-DIST quoted_printable-0.5.1.crate 8322 BLAKE2B 39b0c0e4af6e3be3ab4e82e687e61693edb05a6aa8b8e4ac879da840cd435306688070e3c01dd57d44230c8a5045b54f284676151321140f9bf594e1428902d0 SHA512 a10db1011bb443ebc25dfeb62befe171c49d84901c2eb40b9816be9799d2ba5ff102781aad370dd907383aa197c0c9e2ddedd05d3444b175d7063dd34b9bba49
-DIST radium-0.7.0.crate 10906 BLAKE2B d576e0ea5c5287bcb6740cee3a3838b6ae4dfdef0ef05d34634b96dba5159e48260233db57a767c9e032fa5d9a5798361335cb19f7844f450113ece30ffbc51d SHA512 51e23cf52997b46c0018a94b0259b29d7bf33ddba19f6db406ca57ee5b1417d7e5f27dda3bb487d0099886011a97f238e8b3dd4d6c86e8464c0b471c1a7622a0
-DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
-DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
-DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
-DIST rand_distr-0.4.3.crate 58255 BLAKE2B c93a4db62e1c27bde51c77423e15674c4bafd04a63424ee8b8863e4eb27e56f774136949edc8b05ff4189dfab1f0dffc92855706f4a612be897523e7712ee830 SHA512 e5209a78b8ca1af97ac6c6add858ee6d91e67c1edd124bb297f787d37218a5f1afd570252da2eb25738b8d77482df4e93aa1eb3c4a8165f90219410dba495cda
-DIST ratatui-0.26.3.crate 465596 BLAKE2B 2f5bfb577a5ae720e75b89292f2cf814688c449b3d0dc47a8d313b6a3fd3f5525f19afbd07e49cdacb5ef2b7acf5257ad4f1b2ecab008b0f9b1fce6f8417e00c SHA512 fe4c296fa44478e09b31bf3b0b3f186044dd3d29f145314839a283769d76b1bf148b5ec9c6e35d4b34f1dacc127fbe50e8489bb65fcb65ef94959aa30ac41e5e
-DIST raw-cpuid-11.1.0.crate 109361 BLAKE2B 2555ab107b42e2e6985d1900d339b5d93da41c66a80be46c739c09ca0c27fd943a6a397d265bbec05c3e326b8a18e76006ebedeab3ff72ff9ab09afa05ffaba6 SHA512 777152aade1de9941e1244e5523bf4179692457483e194edf513aa0df18b15738d36be2a009306b0b3b366004388c9b73a6efb1449352008af2c957ff0cec7b2
-DIST raw-cpuid-11.2.0.crate 110290 BLAKE2B 8de2303fda6a215ab4e5c49d73355a1eadb789fded959fd3b2698997ba5bf5e1121b9c00987b38a04e0406290ee0982e00df3c899b977fcf0d8e5ad66ae81a3f SHA512 8b095175a9f94796656fd8f7480fc863cf95fb047aa729e57a7e8a86eca8a1d79a5ff3ef1b18c7de72b2fae2a45401223fe60885c509b49413817154ec41ca61
-DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2a0a0dc24f0282fa7eb01fd1351a7dc8b5af3a55ea321e6526fbe037fec3cf8b32463166a082a6e417a51fca SHA512 3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3
-DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
-DIST recursive-0.1.1.crate 3642 BLAKE2B fb0c3ea974e48e9a46ea90818eaeb47357fee0a18cee5feabb80f3053ad4e5a6183125e7809c492ec8c028d8c85ac9185b96e03d08b8492eef714478d1dccd5a SHA512 0ad079622a862925831dfcb680bf7b6466e74f01ed3ff5e1c92fd523bf6f312155a443324c2a2a677cfeea4ef4011b8854f942f21ac3993ef77d4535699ceeb3
-DIST recursive-proc-macro-impl-0.1.1.crate 2213 BLAKE2B d8141f66021b1074ddb78a498c33a6a70a71fcd8f94c51b8d1b6631e4a7eff0f6ec176e7a3b8e556aec94dff3ec22c10d189968b36a8caf09ded14b41248b4a6 SHA512 9306daced75c70f5d91442c57ce7f5f989cfeca5d66c7cda30ca294457b9480f0df77bcd4707d1d8e98c3162db14e0819cef302fb3da9efedd97cf84e713593a
-DIST recvmsg-1.0.0.crate 29694 BLAKE2B 1b0818bd937541220d8a1a7245ac981270588a7ec6fb1121aca1da845c22736e4f98a08e0824d993cd9a6aac03898b7b849c3fd47fcb2e691ad84fa2d5492a48 SHA512 1d6f4fd71b767e7db83cf52fbdfd903e208189bc9d4edd5d502cf30f63a5dd5552420573fd644cfe8a7313b6f82728d76d5c6d4fa910f3312f061ff565f3c024
-DIST redox_syscall-0.5.3.crate 23830 BLAKE2B 0a38235ec277144f0c3e7bcb1d273c7f357d85aef33dbd06328ef16bab7df0a07b523431590899ea58d55e8e1d84c32392478530200cca3a9483e8a47b29e233 SHA512 777d1208004b7756887d6c5745ea408972670e59430e1d299d01a463ae41b98e0920ee77aefef8755fc949d4799dca679afaaae9c1a7d060f76f69af5b90427e
-DIST redox_syscall-0.5.8.crate 26319 BLAKE2B bd69a69e2a0f3d84843a8f76199ef6b3991698ebac58b23f69c26d02f5f3e24e77a9d5e8259e9fbff3887f06d15ced94ff23b5a3272ab475918e6e3e753dcde6 SHA512 5f9632f1f89f4963c36ede4da9b955c3474b673c3414d81cdbb61f46c08eff67167f703a0b06b239beeb2d720f8fa592a5493c0f7e872728b5b95f561ff11348
-DIST redox_users-0.4.6.crate 15585 BLAKE2B 1d60d0b7781395ff271d79264910d24fb021cd8ef612714265abae25b26ac158d48f542f1e73701bf5b99bd67546a7b878e4a14e40cdbd478b35bcc8b4778f5f SHA512 719d63fec42bad3cbed39deb9242ce1daf3f391bccafa8121f63198120371f112d78b0da8d66458519e946581511004983f04b0a697071f22294ac7c831120c9
-DIST reedline-0.36.0.crate 139146 BLAKE2B f73b31f7bbd6a2712e809f72bca62ff09580f181b4a6791673f9715739c3562f7ab5c303d7eb8820bc8a49fa1cd218b9b685d9ccc5af33eab937cab5370b2e58 SHA512 e1e71cd4aa3a51c739a5a67cdf1b247c2ec1aa63670fb246f55d6ade3d38ab753b20e49b7a5131f03e633a53075b8018b6b70561486b678d6839721a6f30e925
-DIST reedline-0.37.0.crate 140338 BLAKE2B 2704d1e2c5ac75598499cef53714e2b6fb1c2199a2e0b1af653ea19be010ee217c54afc2765b832ff9af2463602f725b2ff7ab3e45a8ab03e8323f20fbd6c0d9 SHA512 6223d991e3ff0a636676ab22a4f7f1a4df797bd76990811d6652d0a46f86bd9a5db9a1fe7fd008dad58b7fdf53c51a93eb6ea113c34a00315a9fd3de128745c4
-DIST reedline-0.38.0.crate 140359 BLAKE2B d4b13ea8cd8dff2c71814e6f092deaaa1cd4ca64657285f573d0db233c160a95c3c5ee073cfaefa8ec3c1068a52d7d145a2092be7f8892cd710557dc6f0fc663 SHA512 c7b5da454d8e7dce7f8b1932f44c7ea0d13560d31da9913a7c402a753d72eea2031ba89b3c9e060d69136e1d3e93d005c356a1aba01694f6492979e20593b08d
-DIST ref-cast-1.0.23.crate 12795 BLAKE2B 53e8fae33d98527c24616a90d8644292a77ab528a1976d30b6bf0f187300f78e507af89cf81ed748314829dd6008d3a6a3e32eb9c9a2db8470409ac6283b104a SHA512 9120eebe9499d74bc4501f37c9a42eab2dd5f345b8587cef513dceca468267de2537fa9f0e0c5c5d63922151199571522f26869f87e27b774b4781fd2fe7e3c0
-DIST ref-cast-impl-1.0.23.crate 9360 BLAKE2B 733dc597212703a249aac67f310096ca712783544ff8fe1f7efcecddd11cda1ff9b08e265747c9693b935d4ff6fdb4facbf5a265238bd9f41edafe44ca06d87d SHA512 c9a4350beca6b4430b1f956fd497ac1d1401c6848ca6f81d4e322cbf1692e94760c630c4c41de0a2029784fda50c8a76320b86a44cab7a921af381f638de1b24
-DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
-DIST regex-1.11.1.crate 254170 BLAKE2B 5cf41012fc2ba8a006c0eb4a922cbbf1614bf300be361c9e2d98956a9a5e9b140e37bea09132fab7bfb633d4439158723624bcf45e8c619c4061b399253c1b82 SHA512 d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8
-DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3
-DIST regex-automata-0.4.9.crate 618525 BLAKE2B ee3fc41c8c445be4c1aa3e5b19a3e61efd641b1a24e7a1ed55f837c1fba9c816272cb4645c13232b66b170bc7c413802928beb22e3891500141ad4ede65b60b0 SHA512 40bde0ec91cc27bc0c3fa237a37ecee5a1f023dbe006a999c5888f8f578ee2c4c64d9edfe1827546cea8e92ca3c10f8b4d494d81f3d0422b40d90bca9cf598d2
-DIST regex-syntax-0.8.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed
-DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff736f2d9991b19814ffc1a414ebc5b76e84fb8fd36c983b38e8e391d165cdd9047832b0d9100f0e1ba7085484b7db5 SHA512 549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8
-DIST relative-path-1.9.3.crate 22400 BLAKE2B c6bd04b060013de042079a741a864150632c02cdc493ca1cfd746bcc12f6ad903f8f0748ec68261c979d833089c0fc091f7c9da2b2936e8f75dad8d4638a7b10 SHA512 fd5c88d370865870570859a110245e009eba557225e4297783a606227b13b42abf0c7e69a4beb5093a5a9dabac1545afd988f4c831abe912c21ccd8013c30382
-DIST rend-0.4.2.crate 9324 BLAKE2B f62ec0741ea1de92fe9a92afb9a8ac348a92663ec1d8fb165b7eb60b8f5ed9e58c5f1c8c789ef5e37ad03c473b3452e75a56118516e9cacef13743789664077b SHA512 2df17191ce710e09927f6d17fa5e3432a154d605cf3b58bdd6a3037d69cc0b017007e23c16526a8879a89cc49e3a47d38ae5f6aca8b42cd05624fd15c9dc3529
-DIST reqwest-0.12.9.crate 179807 BLAKE2B 47937d038ece053f8b0c6f6ea1865e74a4243b7adeb209c8c876da9557ddd096ec00bd44c1d61f23e883a526ee10824294057076adb8542ac36759224ca3755f SHA512 027a31a57822a347fcc73101c602a5ec68dcb92f472d85dd76fe3465e45eb1e7ba07477700cb6a55ca77d926f9bc69b56a65499fc4dfebc5fe14732f56fa6441
-DIST rfc2047-decoder-1.0.5.crate 14393 BLAKE2B 530a3921f2c4ea59485e30665170c946da5869af50c4de5ca072980e98dc58e6e6a8077a037b99b91fe8bf8c21311cd8c0719a8b3aa22ceb4fddadc6292fd936 SHA512 9cb031b9edcd47ca5dd6154afc99a8050768f98fb915a540b2d3c1aca28894bec8e92044f335ebf1c2fd439cf9c384700037d76d21cc04b5d0a1ac3a3988fa7b
-DIST rfc2047-decoder-1.0.6.crate 14674 BLAKE2B d50da7093fa0da2ea9fc3dedab266e976cabfb79431a8272f838d38fbfc28a269cabe09075cc4eb29956c8debe529c1a2d05a272c251432deb28a05c13e4d8cb SHA512 77912c6fe0784e38595538798cc9dcfc9202c24a1fa0f5dd05eb4d78ee788067450c902d52ecc3122e158ea09537229a8e6e96578e694ea334d240f1700d7d3e
-DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd026027ef2c42f2d8bdba0eb1665621fc98db618252f6a131bd54b1493987a0285bf2b9a22eba4c9409ee1cab SHA512 e4966409a4078ee43bfc9cc659d08ad28419effe2a729c8c275361a7fe0620a3c727009bcfb1d0bab265af2bc107b50c19d868a4e80da7a8bb55f97e8b214358
-DIST rkyv-0.7.45.crate 115753 BLAKE2B 61ffe5c7a819a99e59a06a0259e758467affbebc86ad291db05e1899cf3928c163272beb72e69d564a761102db8a712f0eda273023ca08d15f1d2b60c24e8743 SHA512 bac10c6e7e7f797e505cc8103c55ae2fd4b04a76631e085fcf1c8f2b05e52c064cb14145479dadc292995b7ca5bbab5235d54d8e651bf47623a0228f936f73c9
-DIST rkyv_derive-0.7.45.crate 18972 BLAKE2B 65ab35abb4724021529cd730f41809a2cf4aac06e8ef542961a8d80f636e0244bf9d08dd2e577f2f383e2b52e5694d2dfcc00cb34028d46cc85cadc999bf7e07 SHA512 ec48c62251a8c2b97de67da56cf6abff15cff1a329d7f8dd3e45e1175616f0dd1b32c2a9c0998086fc57d0084e7908cfd6000fff3eaa30a1776f8abd9cb00564
-DIST rle-decode-fast-1.0.3.crate 62086 BLAKE2B 402d56595936734f36597c18e816a798ade6a8636b27e79acdedd4069da38e22e6ded5f2358ef0f0d509ea752e828fa294a4a9ac6d99cf26472fe21a505302c9 SHA512 f647cfd9ae0bbaca4a189cd1f8d1f8531f6dc0ffa1fd296c75cfe405fc9060e25be74581558a9195364ea90e32c7ccd60e066d21704cae836d41606b5799301a
-DIST rmp-0.8.14.crate 29687 BLAKE2B 8467f30a5c015798bcd984297c9af33b5cea52b775e21d79322021c1232efadf3fcf9db86310a66a22cc84dcec2450da410d7308be6e723279279df98e922a4b SHA512 f83634cf6a9eb9a905b55039b59efea72b0f5fb88aa92fa008d9a867812d06d9dfeab8b4ced5047eec66568742e3d873ea35e57e66da36f67cd266be6b64e00e
-DIST rmp-serde-1.3.0.crate 33025 BLAKE2B c726f5555cc4d3a08d45e6229d6541fecd78022b79a844c28a16ee9ac60ea5b08efc4059394f2f3911c1ca699c3420a8e8fc40abce60a402d7a43248d63b8fd9 SHA512 d4ab14e7cd4e6a3628d6795d45112504ce6e571038b08fa92b70ad5deed143d2e4a89927c206eb1fc06b3d5fcf4dc6d4357572f8393e766c958b50f0076b436f
-DIST ropey-1.6.1.crate 119463 BLAKE2B a0d02ada75d96381b02715ddf28ceff9dc6ce718054d11eef5710d0b044d42c4d324cb136e69719806b0441be47c2d94f67eb5668aad344806f31a9f96c36974 SHA512 2c7d4379fd3c8058d25e746a830357f1e0740bcab99da58274b2ac54c17999d166768f4c366c85fbf56507841a2526c5a0a69290ccf3f9879c0df39204b094b3
-DIST roxmltree-0.19.0.crate 53547 BLAKE2B 0bf23bb050dec29cdfcd66bb231ea81caab40aa54b015c5480fde7dac899128438ecfb10d818dde456db8ec4cbeebc7f32f3c8ff17594b6a78c0f04f0361555f SHA512 c8eeb974d797316a8dc332c4068b2850eee124a13b0792cdc8acaefe521d8b40161f9159bbfee2866ab2c4f6133ceaaa1b5ed704a5f0db5ae3819d76042cbf36
-DIST roxmltree-0.20.0.crate 54594 BLAKE2B 9605ca407af248c71e0d2bc24d213aa6ff08a14eb548b85de16de7e172a617cdf12c2e4c686f6dd1c80455448a313f6e7d760885f189ae726934efbe06fb5603 SHA512 f8a934d3809e417c43bca53478cef0a7a18d908620175c84cfa2cdb8c85775b52cc641fb7eb12c80c483e0c17eb500dd3358ace858aceaa810d3ddbdef902d91
-DIST rstest-0.18.2.crate 28868 BLAKE2B 44368c85da79308277d9cad96659520ecdddd767e55acc5a4f35e246af64a29112867c4ed40bded5dc0f9d3230d828f6ca98a73adbc1067b60a9119b3cbdf369 SHA512 b73b902c761717acf5848adf888c27e5c58fe304f235e91e1e543cdcfb4e678472b8fe9930cb559be525c0f1a037bdfb2d77b7a0632b021d51976b85288f459a
-DIST rstest-0.23.0.crate 45414 BLAKE2B 6e31af0811504c2d644963d14c0ba07cc67506363a7d93c85e1ee06616d14f3382765aef635b68dafac531b58c7a4bc41f3ef82580c065d6f002b7b8670ac988 SHA512 5bedc6c08a003189280efbc0c3fc30d5faac227a93fa34083200601f4d8e2ddd337e36026ef2c1c93bad436c761d9969756cf289b5994dea854f06f2a881ecd7
-DIST rstest_macros-0.18.2.crate 57534 BLAKE2B d06bb6453eefa572cd784e38ecf9361873a5f3ddd5dc4926728183bc303e28a304030d45304bb287019b42337d78f294d9ae350d4204fee027b68c264272d86a SHA512 614944fbd51de32b5e7ec1b485c12cd68ed9fae6ef296f9a9811de2495bc27887fa5ff8695c619255ac18da5af2b6ef8a557753d96b4c1ec3d711a9036bc7392
-DIST rstest_macros-0.23.0.crate 61327 BLAKE2B c522dc07e4544dd1694f02f7ad707b8fdcb315afc735e031abab6c4e90b49a3987856241bc3ec445ccbfdb2cbc6e6568d61724dc2a17ca603e4d6068301f784f SHA512 5b404d73088bcf248e66bd58caee3c25a94fc614975996f52bc58e8be771e0152d093174e9c06440a73937bc682d896a0ec089b2a8cef8b6c8f5c6cd58e639b9
-DIST rusqlite-0.31.0.crate 152252 BLAKE2B 5ef8396ab6ee9f6887466e7ff856c6260f40ef85361ca451e230d8590019d6ffa4952df15abd21cf300cf51da4a6ea4e82f5dc88dfba474f2f62036cee76caa3 SHA512 6d20b015ab72d3d75c363111c0cb41feae8bff83104ebdfcb8e5efc1bfb63eb48a17f6de2e6c96cb1e916b4795fea6d58466ab0820b151b12d1dc4c29800ba66
-DIST rust-embed-8.5.0.crate 904054 BLAKE2B e6938fa16d5e7701721dd4f31278a6a1034fc6326176c85c8abb07f3a82d23fc07cd683799224ce20f44c1d3521cce474a7b74fa48e90f75b43213bd9645e9e3 SHA512 1d9bef2a6197a8fa7a598d84d0b1956d82a630247ab2bf90cb469f06beae05ed9c6f7dd8552a2839d4e0843a13e17f2dbf52ff6644fc7a861335d291c0594ffb
-DIST rust-embed-impl-8.5.0.crate 6004 BLAKE2B be17e9a5b12b2818380079afcf6a2d4bf1e3599d3f4abb3d36573e227113ed5623f7c6e7708155f8a122e8bdda432bef22523e79a7294161627609c241648e19 SHA512 ae750de993736ed914bfd4f04ca6dbb82b1b0b5dfa0e7b3a8665c62403e9e34884d96b38114d033315fe2656455b7224b6808f909e1e6836d666bdbf66b854f0
-DIST rust-embed-utils-8.5.0.crate 3445 BLAKE2B 1491570e8e75d40851e3c571050e65c41347cd436f11d7bb404315dd2b7397983a26b12ab0be73d5b1af7072af4649a7a867fd7208360b2f275231f5f44ac8b5 SHA512 44083ab5831a197dbfe22d070d6c5cc03da429023f81ce457e7d3c70e20f22e663eadd46a3200759610b0b2a531dabe340e0d76a305231b2d077e1f32bb3679f
-DIST rust-ini-0.21.1.crate 19496 BLAKE2B 022b67b09cde779b917a8519f33214f883bb2968b0affb68069096ed79090671d038a09a92e9f449440724e6d5c8adcac421a2141225274e466c2a128a3f85b4 SHA512 8461ea14058014dbd8d059916c4f5f0046fae62da85d81219b7ea0629468c7e6822c4e9194a1b4c3e1bd81493bd78a724bbd9f6663ddf26fe803d06ff612edba
-DIST rust_decimal-1.36.0.crate 129249 BLAKE2B e48f78222503528cec94e34780c67f0016014a9bd51514bfa62c59e53316ce9d8686b2c6c2292bad054a5deb9e4afd193c7d110a9f19d21ef23fb22bb4a92e4b SHA512 9dc8dbca6249991e4b8b2179f41bb51f2513bcf6f29490351989f04aeb7f1d15b88a8f13f7cdb666761c585d5e86397150c660883a334b9d4fdd96a08fdb5526
-DIST rustc-demangle-0.1.24.crate 29047 BLAKE2B 8248b014eedb26cdc0b748544ba91b9aae9c992a6f93b4d3ac256b78f691d572f8885a3575492ea556698a241d2759743968293079ca02bb6a5f318b0ed66dd4 SHA512 eb897c35300b87766e6105917a907fca1c5b1f7691fc03c6c1aaf38075ac883a73d1eb54a245d13ba59c7b0f0333d6543e23fc1b1c542fbbd5c750a84660b9e8
-DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
-DIST rustc-hash-2.1.0.crate 13316 BLAKE2B 3e93739234cd36f3cda5d71522e3d2204e98b1d134cf01cae5a93a93e6c4340a7b1b0485c339f312145c723185fb83f6aa87ae2a0b9b726a34cd29c19d3ede56 SHA512 6f6a40586fd7a99016efd53888970c745888a06bb6b9d32eeb4936bcd16906c90ba22fad82a4a6b547df4b6c9cf6d73eaa8d36af097d65d3d6de18a0669d5ad2
-DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
-DIST rustc_version-0.4.1.crate 12245 BLAKE2B 0ed627c560d88e5ade830cc5f72c62f6ba88be3e30d0f8db34761fcd0b284e5b2fc063c240149aabdfb12c8410ecdbe50cb10a3544500b5a020f95a31cd6709c SHA512 7aa8a487ca7411b6d23cae62f7568fa3474a7b1fd1589621071be3428a550ed3b7c4ad68277a8f86849e5900397d7d0e9d678f5d423742a045dc7c660fa6c598
-DIST rustix-0.38.37.crate 371243 BLAKE2B bceaa4861747208f1f2b68f8924c7247648d88deb200e97d8ed17c5cbf9c934488065f0ee7e4406bc96e8709b292ee1fe15beb346bff57b5f05af36174420a0c SHA512 6c0ad1be1fcf1b74f670b2c7599ba68c2ce834c760ff7486674d190ae0d552165b0c2abdc35b13eee8c0333a904c67f5dd1efa742c20fd3735c7ccdf2a439619
-DIST rustix-0.38.42.crate 378683 BLAKE2B 4071e1118ab8111bab9efef39c6e35f8a3030cb230cb3643df7ae09ffc750b18becf1f069c2714b0b6d13e334c12446433057fd015c9dec04d7a1372a354ae05 SHA512 438bf1e4663cacbc7c0af23b10ecc11c8b01c53e18c2e82a740c46b4a61f06cdd25d926aff27a9c39084c39d9c950c222a1a3a6d5878dd240554fa593fa762a5
-DIST rustls-0.23.20.crate 335933 BLAKE2B 754a580f74b16ebb8f0f3dea9f3730fdd0ab9c4d04b0abb5741ecb69548cc32c54713636922031ac1acf2019df602db101da2dc363e50f224c815f1f8edca37e SHA512 3778f649026b59c4698bca9207ecb516a237e3d782d7727bcd93a2a20f0ed7b02e3931cf956b75cbec8fd806b54a9b231e3b663d0123f9894b54283e34e78dfd
-DIST rustls-native-certs-0.8.1.crate 31129 BLAKE2B 1148d6095c4fb23e72dd96c7c4daae603be17e79954dc56a01099ec950a4f17d7059773169409f6c54c9eb9493841df4c069ba7b69aa097eee9f34c8fa6a780c SHA512 52cfb6d34394b155afe8528e6031da161e060ea529a57fdc27a574c2fb48b517a8832eab0f60a7e1a9fbea5459e356450ecc7d24ecd461b847ca58c8d82492e4
-DIST rustls-pemfile-2.2.0.crate 25849 BLAKE2B dfb94a77fe9d86b17b0c6badc6b715f247e9aaf0b312bc9698dbe8d38fff281428ceaec2ec73bef8009667dd93536dda2bc7e7c49d194b36244dca38dd86d577 SHA512 1e69f0b72c6060eb0a54ec8a1cb51809525b053771a1d417892205f8f5dbcf4ba45250fc0d6a836e0cc8fede06d934f0a90c47d475cd8e066dcb3f7504ddaf17
-DIST rustls-pki-types-1.10.0.crate 55134 BLAKE2B e61e78231bb48b6b249e3b1fa6a6edde4479c4b263ad78f78fcb78982d4fadae7c67ac08077b9b0ec32d0f0d527e12f3ecf456ba11f9740854f0cedeeb881d82 SHA512 8a5c51acfb97cef6e9aa2516b3a2a07f6fd37884b7597bdf81e16bd6ad7512fe45f0b95f4635963fd6e74c0aa79fefed1c3f1a9e1fbf7ab78477302fc333743c
-DIST rustls-webpki-0.102.8.crate 204327 BLAKE2B 8db832f181b46bdecc419e1433dd5550bc181cbffa1961aa90b2533f92696ebe15d71d742225bf806e2dc3a4ebb110d48bf62b0677089df1eede6d5a072c0a28 SHA512 8cdd5d07bb8d6c3f0d1d6663babc3b7ccbe8c9b1463870a3dd095c67f46addf4097a715da796c70f1891ebc1d045ae7d7c3a352400e8bfd6687e6cddfd33b1ba
-DIST rustversion-1.0.17.crate 17621 BLAKE2B 1f077ca6fd90333724d1ea9df7f5b178f37f895b71a7b2814e9ba8618bffcd2307f9cb4ac2eea25d461a6686a4b5b51eebb80f1b1ccc773d4da1948c47fe8abe SHA512 0565cddecaedae17e7cd99bc34f54cda242d4c29cd4269f8e3b178ff91d49f3682e7ffe66e436bbb138299736c8e55cc143fefb74c076911fefcc41ba98064f3
-DIST rustversion-1.0.18.crate 17794 BLAKE2B fa35445404b836214bdbaa3de8e43312b6d8f50eea32540f808a6255908d756bb1a5dcf49ca6268a1d214c535c2ee770e295c0e7d6430268142a190b31032421 SHA512 263d2cef02b6df4d38b35af7a9ee3a6a044f160f3cf7c6771528f23dea342232087f73f89e419ef7869db771e73c273c05b3dccfe9e29f707586b2059e820645
-DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
-DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
-DIST scc-2.1.16.crate 127936 BLAKE2B 989a56b9d8063a36bb6a6b78f3a835ec29a14974402211ee0e49a917aaa530208817b85eca43e8b350656b96231a4a1f0e1a8ef43d9b199463384a8184785c15 SHA512 4b88cccd98dbc38ace6b8217dd358172786a810d4a1c18cc4da1d539350badb4502ac5a9113ad956f91ddfef11ef2b2ec4774039dc4f8bbc904d0174021285a2
-DIST scc-2.2.5.crate 130745 BLAKE2B e00226c3118a84d7f2f1a7bbc1c104db8199368dc5376f116caf77c986195394b8fb9cdd1eb7a399ce18f699fd22d185763acda0fd211065806ffa0bbec8fca5 SHA512 e2ad4cfd2201b9cf35ecb3397d29c0469c8a3f8366bf85d270341b1936c36f6eb4bc38e7eb5407b7287b38f6bd786665b486b54972c3b394634256ec1e06b5ad
-DIST schannel-0.1.23.crate 41667 BLAKE2B 3f34ecf4cc519f5302f0ab5207907a275c68e6fcbb47630aec4ed5d5f1a1cc7475f6d7a8c22361e9878002f9f54314c1f630ab0c1f77ea309714bdb7ada6c9af SHA512 dfce25e3b8bc09d8dd1fce2783fe02ec83f74697cb24aa212ef9369a628685ba488f821cb3e5f863798e0e59995038c8d748f74b89f7929eb8cfd804d5066b84
-DIST schannel-0.1.27.crate 42772 BLAKE2B 55b3cdf596d6d490fdbc10298eed7cb1b1bb8d6349ac8700ac2e7db66e1d75f0a5bea5b1b322bf30cc0f982262e96aa421998151a8ee1e620b5a09d25ad4263f SHA512 f469d03c2be014c248e7b6408f541584f250a9d58bc8dd8ff4d1e63f5720cadba1c0579b1e5d97b58844fadaeff10e9cfae6d5cd33c5de0fa4ebe699a8ead4a8
-DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25
-DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
-DIST scraper-0.20.0.crate 25031 BLAKE2B f821faaa0c0c599ac30c5e1c4515cf82758cd5748f0bd2a3927d37bed5aea1d02528ab73fee51997aca8a56ffa9d32298e95bfcbab8955b131408fbce9686b7e SHA512 4cde617eb22ef96e7b7d163d294425f1bd5db9a1f40f42741d58d42418d3435bfaf80ed29295188a1c12baff702ef0749d00b483eaa59505fc15379ab9173725
-DIST scraper-0.21.0.crate 22940 BLAKE2B 49438a0803e961c803e67a700fa2018476e184fd213b53581d65bcc0c48266ad9c84c0e35a8bb6e1aeaf740a79f2cbbb5b47bddc24b97db3130fcea1c2f5236a SHA512 a4dce62211b85e3d4674c43e8c0735b5c178a9cd0bf6ce9e55b22f85a9f8f3ad4441a95de7f7ab65eaee532cb2d0a8bc603d3ecbee37c51f7ada70c89a9829e4
-DIST scraper-0.22.0.crate 22906 BLAKE2B acc7dac6d824f71f057082b2d34a67bf8656a4dc5e2c41fcd39889e1872da12e57ac7767e7d9d25b3a6e48ad1dfcb2e98f63635ce1e18a582236c3775ca25850 SHA512 c1a6346bfbdc1dc8835bce2ae18b8cc4bd31586972d6292647bd6cb8a5cc048fc07cfa1ebdf5a86a004093d101e5d1af4b9e23d14c9d7c5244b9393c6008601f
-DIST scroll-0.11.0.crate 27354 BLAKE2B 21c885468642a77d6871ccf2bb748972f33c8abd504b2c0232bad9ec21228c3ecc9bc267b44898fc1dc5ab3ec494a8c6e01dfc5bee0dbe93117231de9f056b37 SHA512 84a9b1eb8a10c2bb14b718984ebdbac4a02620a65d6ced24f5346a762d92cc22a69fd204de1ed97044076d098a5ff9b7e20f7f00deca2b1302eb0910934265af
-DIST scroll_derive-0.11.1.crate 4802 BLAKE2B 0d0a7cd3e76bd86c192578091a7d04f0871eda73ffacabc73a45132d49cf4f6de3e4f0a384910ba9b7fe10d26efe40243db1fd03ddb10229e9d3c8114d027e43 SHA512 731bc93c5dd10b9a40d0f5cce5233ed7df3cba386b5d6f769a63abafbb4a856a9222b60f44a5c8a3565711ccf0240710a64a620f257ec836516f8c65583ffae9
-DIST sdd-3.0.2.crate 25156 BLAKE2B 948657f67a15a5d137ec18faa2ffd3ea59c5b7b9261dfa27fde27933ade3aab3c8427ff137e9c4a6e6035eb7d5f60f185a792c3b528e113ab76c195225c58e30 SHA512 d78dab38883a67b4199ce6df90eebafa910a01bfc370ffe2c6cb5d3e0a502cde1acca96bb0497f91b62b541e62ca67efde3ec4525127b43c9ddca39404fa01b8
-DIST sdd-3.0.4.crate 25303 BLAKE2B 9047388b3d0d9a136a8a6c75c74488eca6d5a9302299eafca9e97c5cfabc2a7eb3f76035c21f081d6f3f9cc104fb56458a1b48252c23adfaf74e31cd9dcc8560 SHA512 e7ab851cfedb69596c5497295d0d66367e3e9e6fda5879fabe131ef653574fbb1dc53f0454eac12417d0f776381319f6b218a6a2a27c6a0f55108aa9ee2b5188
-DIST seahash-4.1.0.crate 31976 BLAKE2B f553bcff7af9da9b024efd8db4ec8cbe4100dcf4ccd8f627c724fe4a34b678ef0be8da44e92ea55c4622b9f9f37228792a22c8bcdd54e652ca926eb3c7d37655 SHA512 4d9111dd2e491c7f6d49e0b79a3c23628c02d6603ac46e88ed137ca737830003b549ccb38087679de2cf0b02a53065b89f8d79e0ac9ddb66844d970cc6383f8b
-DIST security-framework-2.11.1.crate 80188 BLAKE2B 844d36d2b2216cc7055687110d54ea783a7ed9bfe6375fd4dcbea267ec85531e666fe002648110315f42c3364ff5ff5aeba711cf8d1f5358ba65c8393e96f55c SHA512 02786d62fd9dded80bae3942896bc8fea2a90763427f582bf5d9f127ca5682097b59b5dbff2cde373198ba659316ab5906a68d3141ba00c7408b73ebe353fac1
-DIST security-framework-3.0.1.crate 84749 BLAKE2B 3b5b2b1ae98656c6dac007d021ff6b0a6663e9f1205413f737e09822d5d0741828487969f2306423b95f24f9b31e1af66da37591c4dd025292749f1cb0273170 SHA512 a25e55589604a55adcb582fc6a46468be42db570a9d337b676ca077bf8be2fbd4184a7ab50bddae1a7ad817e438c0bf604cb9304dd85147e6a1ffb4ad9500230
-DIST security-framework-sys-2.11.1.crate 18755 BLAKE2B 6e4f8617ab92304a435489492f1126eff2913f5332dacb8b48704b5f051e87893e5f4239ee5d6a8e5c350d14cf5226fe57a36d8119b1e150407e9b157e74232d SHA512 8565d7ca296995c2bba78a328758c84c500e95cbafc988cb595e040ce95d4114c1de46fa30224a310981c3dd2a9b7d1d98c87f129d98a0b2fbc44c72f9085d23
-DIST security-framework-sys-2.12.1.crate 20112 BLAKE2B c03abcc08f068e8cd4dbfb4d5054b4c0a75cc68f0dcc955ea5f5f958db9c28588841723bd7047207dc51bba46868fc1b8d3367b612c7f4a07984d94fc8710cd9 SHA512 5ecae3e1280d99e3730ca3be3dfdebd16971d54b8fe167d29cb07f7b3837a2bb9db2d8131bab679c395e329b10ed28ad9ad8d6764048f6019587d5e2b52c7eef
-DIST selectors-0.25.0.crate 53052 BLAKE2B ad08dac9deb6d99c96d9057cf0f4bb995aacc4623e7fa1b2e93094e6553f68544c67fc4444a0ae2bd8fa325519ee62fec2a063dce6c52077d3f88fb2794c918d SHA512 cdab3c87fed0ca7f20ebadc48cd495c5c9494a65e5b849bdc533ca2eb77d3a380e84cae68f04a1df81e0729779fcdb98a8f2300cfcb28338c9b3016e18f3feb3
-DIST selectors-0.26.0.crate 64329 BLAKE2B 1f6f009c6ae12ae09b7a47ee123990e7a476a525033f3e7c39d728277a85ca1e2898879e87408f3468e54cbc5f4bb9f0486d5f29f8772e2357ad7b7a9cec9e19 SHA512 328b72bbf38e170b2cc1cd7c84fd59957b5a4272247af9f7e47cb1c13a1bd961edf110146664a9e66c6e9c4c5cc470ace04594c2e2f6c1becb60679a995d8d28
-DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743ad0feca0929bf2409eb81e03637ec5f92ba9f38ea386c4ee5cde72bd3d2042083e2fb0d6fa0b839b1c5093a SHA512 5ea1fa17c08d1280c3a4bc8d28494e88ee05acd5dc969ef6f0c6f91fd3b5a8fbe999c9e8bbd2da383413038b8d29fabf02b87bd5265bbb8333f3fcbe409103ec
-DIST serde-1.0.208.crate 78232 BLAKE2B 238de7207416756fd241568e47866716da33a6d4d0a72f47362e8d878fd87ec6a237c58ec3a79e7e87a64f2dd59a18970334c8f2db85fb841d16802e8ea9c695 SHA512 13468e827875d3ee8c8848ea3e71dc2e1087f9f434ce947d344208b112f4acb853eeee132a0da61166fd040a423fc8996c58c919ea795c23a09a4ed5e3ced288
-DIST serde-1.0.216.crate 79000 BLAKE2B 98c0f5cee2f9212c6b7620d2068665379471ceb7557d1454cab9b1c2120b526ef597fbb642f65440e70f92a4764cad33613b478bacf99138dd5bd51fdbdbee6b SHA512 baabf4c7aac4a540c9ed18b336662087258b71c9cb0e547c8d83a2734818ab2cbbe62f910d812eb61d3d46e653c41a3eebc99b1d679bfc51f95710c71a8ecc20
-DIST serde_derive-1.0.208.crate 56019 BLAKE2B 68812664bf69f8a65e2be984257975b765f183bdd07b2fd376a7a400e083f610b600855c93703e53a2d334e77e9064b52018c74eddcc953ad0aa9555cf1350c3 SHA512 4f7f1da39ca952ec8b40efe6bdf69bb7a7620f7ab7b344ada26e304622aee5c13fda301c89a6b360c2c1f9284c87918e340edd47186a7e1ed54ba8b2fa0f294b
-DIST serde_derive-1.0.216.crate 57674 BLAKE2B 12a9228679c16288c08c8b256707e276aec79f84ac7af0c4cfd1f109500dfea80438df17d798acdd30a9743c753e70093b22bd324217529bac483f257682a3e2 SHA512 80fcb552279ac7562297df878f2f5e9ac09241701f5cf1088fcbf473b638f58cd3092a7930d8937ca0df9a47b9ae1a42d490cd46a275259cd8089fe8f5426469
-DIST serde_json-1.0.127.crate 149465 BLAKE2B da5048f70a0b7594be0112efbfccf8d6575a77b324d59321cbd34d355978aadb2ceea1bbcb182412547587235f58873ddd2232822f020e2db85c1599cb0bca8b SHA512 f14f5eeebe07261daded47c3cbb6d511da4633bfcc46ea1b0600063730dd4211a0c310959e4f8731a688d18d60a46f6dc1c1a1f052f170b6207877b93742a88b
-DIST serde_json-1.0.133.crate 150739 BLAKE2B 7891eb5b8edcc7fd09ab1e15d3881ffdcb629aa39f2bd758c0505700a5f2dfabd85b1b66c3b094268bc1627b346e204c792f4ca61efa76c54ab9cd5744fb0ee2 SHA512 20e65ec87bff319897a141960d13deb5cadcf821209c1ee8799f1dc7f458ce432bc62c16df5bdada1c8d3cc01ff23b8125e8fa0a03545d4614f32efd687dc69f
-DIST serde_repr-0.1.19.crate 9997 BLAKE2B 1bfc8e94b8c3cf897813f4749d6a1112c1097c2c257821eb366073a41ac46084a21bdc0ee4e3b99d82444619a894472e24fccb60cbd8a41ab7d5b0469cad7c41 SHA512 678216a62702b3300fef850f10ee60d88f31de1fbeb7300e3fbbdc4e4a9cbc95c6890c8e7b9385223ec837d9504edd53e69b620f80609e54579c0994ed1ab0a1
-DIST serde_spanned-0.6.7.crate 9164 BLAKE2B 559a62c0ac00a1559947224bd268842f35c52f65d0d52102c98b5e683dfe4c36acb015edf97c5f79ff818dc575b3ae43c3f100d18eb7afc3ab9c96e348ba6794 SHA512 d0ef413867a705080fa68f84a059b4d04b604bec59323329ded7ae03e0caec49c89fc53640c1e58c27bb23b5c9f260ed176ac52f3a93d25d8d7643252dba037f
-DIST serde_spanned-0.6.8.crate 9330 BLAKE2B 630bb2cabd74e8d9736e315ac57c4d2c5c4f72264aab35ecc8e0040cb4186885722051a9f7b8a9006fd121fe58428cbb151e5cf541e7de30b6528c84e968f7ac SHA512 2343a2fda35ff57ed8ff7d8eeadd651821fce7e22f91c2d5797c6af7db9e009b7d637382f6f390c17911912865a5aea1ce87a86fbe36f4b6aeccb065a4c8942d
-DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
-DIST serde_yaml-0.9.34+deprecated.crate 65290 BLAKE2B 1c1f8c7dd1a7952948596d8c727fb6fd36426c7b80ddaba2e6065db7551757e6fb170c77373ba9784f6b32de9f8aec94f90e1c85df98b9ac1f75a7cc8e5da174 SHA512 64329436d18bc3b1a0737afff7c8727f7e04c71b2bf6022f597a45f0860fa3a678eac688f61f0bf7a7846f98809f427c9907625e1d00c8691c383043c1cffaca
-DIST serial_test-3.1.1.crate 8660 BLAKE2B c53e2253af200a40abeba2e9ceffe24b12abb128a123370eff1deb0f430c2ba511e0f59d0d22e541e7993e0e5751665be6457de025fb39b43edb72db4cac963e SHA512 6c339aa658625ecb561f000247df185ff98eb3d9d117fc32c3c57f83fb5d02c4e45fba53d9f53457f87f2e7e635f581d5c4fde48cff6971fe17619307b487aea
-DIST serial_test-3.2.0.crate 9232 BLAKE2B a58cf0bf9d7cf378d8de5c923cd653f9dbb54b4ae32e039c6f57e939e0ec9eb3f26e7af78569da18cc4f63e9c05e881eadf37df2d7c2f8c22359124ab2201a68 SHA512 5cc1cba910b3e04f8bd0a9dde696bce6df6d36d2d2782e81f2cf78ab55972cf981c44c497484dde6fc249766b41f1d6ddff6beddf70406b2cc4130a9ebef728b
-DIST serial_test_derive-3.1.1.crate 6881 BLAKE2B 8dcadae7d44ecb2f4ca7290d5e1749e0ea2b21462b0020fc7d751f7d254a18afdb99456b4d5cdc35c73c9f5f5112654ecd7e06cb3afdf384d93e48430d11dcbc SHA512 7ea928622fd1c8b0e9103815e181ef179a4bac91b1b7de8937b4c97d7f552b22615129df29598d7415e6d735ac08f5fdd7d09f4393861714354bf47bcd6dba09
-DIST serial_test_derive-3.2.0.crate 6992 BLAKE2B 5f1e40295e4dee1abdeecb9608a07cffab2ad3a4a53c36b841c4196c60a8a574a1c112c0077e9ddddeeb6f665b526e7ea7287d6c8481e2b80cffdf069ba2281c SHA512 b3f03f51e1bc880c0b3f1ae5ad5be18dbbb708c43ddba1aa14a29f62d712da031dba7223eab850289464862f1b575d77d00501bf00668d83443cbc385aec11b8
-DIST servo_arc-0.3.0.crate 12738 BLAKE2B 974c29c80428d423ae2c660d58eaee5a03ee7b03c0d2a4fcb1beefdd2bbb8304049d494f2b8b87558ec3f9e2971d802b88c14f88e365b88a77d6ef4e6130a70f SHA512 2027b01976566873dde77759f4d1d4fc89400536454cff7fb0c35b908384e8ed14252a17d87f6e21c06f03948901b963b32b0e965c99affe7e3a761ca34295e1
-DIST servo_arc-0.4.0.crate 15813 BLAKE2B 9b53309e4c143b193bc708283b52cad1000156ab6390bc413c898469d1a8cdab963245ece44a758d0157603675309c0cb14845f7805fa0eeb69ca471f86eee28 SHA512 3d1b2673f07efa73ba56cfe3accbe8b0e684a9a7524fee989f839d03c8c70539d9a844c512e97d4352ef183d97ce23319b9dc7ec407a47c8d2807abcc0e30884
-DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785
-DIST shadow-rs-0.35.0.crate 29263 BLAKE2B 5fd57a2a866ee8fbd76b0166eb223b1f4b7f15f9d2382220a4cbef34af9661a2be10a78e5234107f96f0e471e9f10368f3d3cf948a38eeb1c52df19a3b113eb4 SHA512 1489b394ed3264dd155c311fd148d0d7c94a1f61c34ff4589a1b4c0ad83f8b103d182da503002dfde781c890c9e2a8eed0c53bd68102d601565432a1637162a2
-DIST shadow-rs-0.37.0.crate 34292 BLAKE2B 19fef9844e9d3caa58d3afc49c88aae66027aa3ab7f7c2f0739ceb600781a214317baf77eeebad5c9b1930d3c36119f82645337f155291af7564eca94846ff05 SHA512 5206ccfc360d2520f0d3888d24b83540aebfcc41f3fd3c82c66331fd31a5dc1223085da2d95233580b77fd4b87ab8821a50d134706375ae266b08302f37d5ab6
-DIST shell-words-1.1.0.crate 9871 BLAKE2B 7923b36f0ba50c17ac4eebfdda34566b615291253b7b41879b3f64b3fc1325e63948d3d44801e40748b11ddd2ab201b81d238af2a2007c7a57d71f5dcd0667f6 SHA512 05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00
-DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
-DIST signal-hook-0.3.17.crate 50296 BLAKE2B 5469a11485362b4a76f99c06071c69f6cc083bf4cceea93fce0b43385163ac3621b7a3c98d18ea1fb9e1439460ea37f470a29bfde9dea199e60a12b248be5d25 SHA512 045ac6268e504c5561d3884610a48c930dfd936086f793839f42602e92e4a8cef289955776e8eba8a5ca1a91b5f27ccb3724f49b32091f8f06c8bde984d82298
-DIST signal-hook-mio-0.2.4.crate 9314 BLAKE2B 018d406ae25802cb376c1f02241ae8e7018f2f7837127a9db40fd17df1cb3e13299c2c372257b0e82aeac1a77b75c732c7344e50e969180e696bf3f8e4836f62 SHA512 1ce372f4550c046f1420b8f4a29cc4c8e904c08fd089cf973f26aa25b39cc6199db56d2ee3bb34684732b79237648e904389eebbc32b5e108f7d6a2d22b1cf3f
-DIST signal-hook-registry-1.4.2.crate 18064 BLAKE2B 7274d4c115678eae2640a709bf9d682ce867c1f6295a0c5f49e492f95dd1c457f20b56207a74221df1fd9d744b24c6260e28f705777e3c7d47b7bdd36f1d57fb SHA512 16362d232b1d301007c069198d7716848aa73d898ef92e050422b36c09001b4334390dc95a6650e5315377fd8960d4336e5ae869b0a305e8525e977b8327c508
-DIST simd-adler32-0.3.7.crate 12086 BLAKE2B 8e0ae18603b344fd8a6573cc3fe1f8594ad542619a6e0d6e8f62e356a3a97409f4de3a215d561b8ed0e063ab431d81b63967a5a0b6561c45537a27ee84eaa362 SHA512 2976bb7fa153854ecd0d68ccdc108bf81d5da374839d53ce9dfb27e80d8db258bb817ea3dac73921e408541d75e2797b6d20fa63c42c1e8a935b6d75dee14bac
-DIST simd-json-0.13.10.crate 157556 BLAKE2B d3a0e0becbd68a7a082a025bf88c3627cfad80f0970b8c6f93818db8ee27697c7848c2091e491b2c911e8b8de673a1e1e7d64cea6d64e153fd5e0c4229b58e9d SHA512 cc7992c46910814db85be7a2d41a113d32cf6581b28f16b48b67d083b2b4da341af916533a6b582c744771d4edb40af5e420d63e54cc2892c5cb75780b09d7db
-DIST simd-json-0.14.3.crate 169109 BLAKE2B 5c21f52e95ca2592ede02507c16051ed10f85acd3ee390394aa0646809d986be3f7019be892e1e97957e12c6dac20918f6ca0ce207b74625162d088c866c8b62 SHA512 8f12b4380be506e59dffda9d28aa52475b4d52e149bdb4e7e1dbff05a320d27bad014707b8966c0f74f74e297506edf8b2d9f1ffaf86efa1104ecc27376f6d28
-DIST simdutf8-0.1.4.crate 28621 BLAKE2B 94ab48bc899e603acf3805dd45ae8489d565aa39ff79606e80a1731b59d11f429d71bb6c65becf3ceab123767f2d20612cb9f86410fd1aad00d0a796091ad045 SHA512 9f821035e147c035707910227b51e01d3f761ab8b578d95a86a776b2a4da01bc4d8ef28df7ea2c16ca125a2699d8903b826ad07a5937728e33dd58753ebd704c
-DIST simdutf8-0.1.5.crate 28488 BLAKE2B 1e0ac310d874a3c279c4d2d5369de12c2ec20050455b2102c0a10325383c0d2ebcf262ffa1bc1eabda14ca62508d4120538d7b353200122168a659ad4791d162 SHA512 139668c7232f533d3439986474da5036efa32d4e0d21fa72e1283e27dbd0670984283d91c238e445be61317426f67cdb8d3f13738b2fb657563f866c8b6d89d6
-DIST similar-2.6.0.crate 51659 BLAKE2B cfd3fd530a1bb99d63a071f34b7db55210edc3a4568b45a39ad67a0f9c1ba7fe7619a5c78f452732f698cc2f4df8e2e90d174c469e103338a70af016c030499d SHA512 cad3a5fafe3ab0c8eb08d87f982d7d93b9e65a714e3a313db92eb4e3b2c539657bdb7df4bb71597300b690248f45013401ab83f949fa8410606648e2ccb87e0e
-DIST simplelog-0.12.2.crate 21548 BLAKE2B 34f2221981fb5148e9f2b87e3f0c7d2d81c9bbab65f19a952a14d055aee9a6361308e953a8a21a190a10429354b44fef1205f095aae42ea7c1f7da9257fd9ef6 SHA512 d1ac5ae3df161ad76a71d5c56b9e0d4a36ea2be5889fb1a3e457cbc587ea87e742ab7ad4b315305227296fb63a897c675a5f3cb8c8fee96ef1e387fda2e0d715
-DIST siphasher-0.3.11.crate 10442 BLAKE2B 771221614bbd56f609b9743da4352dc7a2cbd0f6257952fab0cd052e5e5b258a4c95a0461d6d1b579dec90b72d66a0e58e036899b3db8341ae753a421a4cd4d5 SHA512 601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b
-DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
-DIST slotmap-1.0.7.crate 61390 BLAKE2B 56f7ee840f848f2331bee7d7e31aa66f2185db5b57fc72694e1514b462dab8f673442c36f7b9260d5db7b68a522ca76f7748aab774246bb12c2ecfbfd3e7bb8f SHA512 f130275c506a3d648b5d66acddf7ed88274fc381d8d0101ea5b3ad931069d4ca46b856d75311e95e09a23c009af343c7a4321023bd1d065d3d516a0b4b8a3080
-DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
-DIST smartstring-1.0.1.crate 29555 BLAKE2B e6706bff07889a39e40c764c51f0f3271570e2ddeaa2d11c510ffc9a07dc34005b62078abb7dc6f0bec5439f0bfb26d7b20be48a5189f6a468e4977352bcc941 SHA512 18e359d869bf006d49d6981c26a31ed73424c2734d8225c235b5f3c65124e5ca9d5f5bc95f4b190dc65746b73f31e2588bf9f50eb2b30535e5d05ebcd23ad760
-DIST smawk-0.3.2.crate 13831 BLAKE2B 551ed3406db797765034e2ba53d5aa75eec57cce608097eaf0f1a94fd1df8aa8bd248087a8a3b037d844fc91773f74501686180802a6d75165f771ea1f20ba96 SHA512 39f3cab5a6eaaef6f4e7703a6840ce7a805f6175e02968090a58a12d3420f0a144533e5d6542f1e9ec0e36902046a180386548713ef6148064922ff837fa1602
-DIST snafu-0.7.5.crate 65229 BLAKE2B 7ab41547d6775fe92a0be3810847a00567cd3c82fe12b7f6f5170f1c5ede011b763fcc8f470c7d4dad9369956e9ce6d5e66edd4d66f4bb6c8a260dbd1deaea2e SHA512 50a10d3d1c13a28136227219da1e43c8655309bd1ca44e81a76516ce7661ba3cda8ba2f4e0ad16b3b1e7d5e07b2dcf50e158bbd6ff54077709a105633e6bcb50
-DIST snafu-derive-0.7.5.crate 28208 BLAKE2B aee0f63ef6fa1c414a42d6bd625067d5c1065ef6df4178ace3c5b2bed733f719126ac428b723d77522cf5b1a384382aaa03c0acfb32a7b5a7703b3212c2c9d9d SHA512 6e07fae7d75ca975bf2b90ba10e2bd7368a0bee7670e1d9f4cc90512d9290c9d131b4fa6accbf6e177cb23a17072e029e879a55c5b1bb595b3e4ab447ce445c4
-DIST snap-1.1.1.crate 33763 BLAKE2B 97e8dfffd23684539e4788740a5cbe35ed8808886087188106c2c9f0d5ffd45057dc5c5a1f1664c2b654bd2924580cd8880a09706813afd4b00d916463f17095 SHA512 8bdd04c555ff3b60ffed9fc6e0ea38168e60d0d340f488950d25164c69e274bcfe832d2db1142ee8c4758e6e2a0b72b5f4b89a267ec9778a64ae8366a2cd472f
-DIST socket2-0.5.7.crate 55758 BLAKE2B 148d2e2b6610895ec555b1357b340576984eb76cb3ea719f85af50cc4215b2ea2db739e2a61434c09360a0c1ff8e05911764e18dc4a59451c0aeb0eb60b8403f SHA512 ca37157bfa970cf3cee8b45c7fe64930becf2ffbbc309ea4613be968400279b70edd084d159f65b76fe1130917312d81455023c0d7c1bab7a59c79542aef9dcd
-DIST socket2-0.5.8.crate 56309 BLAKE2B 309e5a0e46d0b9debbbd6049a138e56b82df4fc0e9d1115745ed935eb40c81b004ad748844f641934e13b5b88773db5cc4a57fc9e61dc82b5322fa0232110864 SHA512 b7d03608a3d4cf3e2d1539b5a375412effcc96279e8f57668fa8cf67b3f0a3a6b611ea5e2e72f282460582954acbb5364320611f7798a11ec9e4833e53830b60
-DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee
-DIST sqlparser-0.47.0.crate 201617 BLAKE2B a9c8d21ae9129a06f1e93cdec4d146f825a772ad4b3ab3cbc6d947fd3b9ccf7023c1e9f6c7d840c65916366f7aa52801c955faaa4144b6daa1bf6616b0dab42c SHA512 587bf350898f75ede7b75905f19587c11973388991077912ef1d0484ad4e81e9d872806a46c63b59a31193066fbab5f93ba768a6094ace5bb4518d7794f35c40
-DIST sqlparser-0.49.0.crate 213201 BLAKE2B b6c9c73311ebd6897dfa5f82c6d03534db1020840579cf7ff48458bacb502995b5d31d524bae2b695352d6aef5b8c49d7956dc22bfdbe4b9eb54af20ca69fc6a SHA512 ca6cc55a9c8ea1111ab87da53c7b5605cdbd36f1e87c984fd5afe3a23d72fb25a8788a17a1a9fcdf98c8eaa86c0289751e002615a6dc2b1c7e3c575e3e07fffb
-DIST stability-0.2.1.crate 5381 BLAKE2B a2be82ec96a5347f7a7757b2f1e9e518c1573650da2631b16936102bceaab9b41b996fb25f8d1db33e66d24a3963e89c55942e20855a527c9e1bcf60f23af707 SHA512 e71607a72b240bbc2bb2011ccfdb6bba5ccd0c03b60a0ee1a9a8390075895b7d2e7c805456805232f2647aa65b2d7a3fc194619696447df33debb074bb8c9693
-DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
-DIST stacker-0.1.16.crate 14663 BLAKE2B 6bf380354a322deef15c68cc17a0a789988c9e262adec94ff2b159ea12ee0fd2b18adca148f2268bd777d3f6664cd1aee72878f31abe335128e172465b561cd3 SHA512 803d0e3a5394ec0f9074c0484f2ac457eda14bc70393c1fe1865cb76a2f4d21b858823dc9b614213953d9f4295ae12610d4744a6bd975fb576f5e9254b4499c7
-DIST stacker-0.1.17.crate 14699 BLAKE2B 7c87dd6b239a74db0db155c65e26844d0378d8a2bf41eac393b5df2632e1a3b0a7b479ac77335dcaf0719af86332ab314e8f0c4a52e6014cf285cc32a491275a SHA512 0786c374f941267b6ed1c36cc92df2a18364f7688c0610c9030d9c0ed98f6913764d7864725791be267186d0a26a9e1ef6c9803ccc119a399e8e979c14fa5490
-DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
-DIST str_indices-0.4.3.crate 19096 BLAKE2B e1a1a93a80041a935495c21140862f415c53818adaae9e507fcc56a81994ae8823483145f20a4ef389becca1f5de52387f06f0c33a1f14e713153059e5b998bf SHA512 5db263130eb605f4a2ee9bbb34ea21e0989d87ab2d6b7cf1a3ae6e756956970b0cb6e8f45d2e935e81c3abe7172e93ac682f4aaad464d171263aa306235033cd
-DIST str_indices-0.4.4.crate 19480 BLAKE2B 23657f3b9dde27948aa6450c374a4da00d6da449cc66df88438e56013b2a085e9099dff51e100dcc9aec2c4eb61356b7296636954afbd801842c20b0bbc2bb5b SHA512 8f7882a38c443a4f319aa2b009d32160ae2b7488cae1beb50ee5106ccf584c9f4a3cbba0829a1bcaea6d707bfd6986d99decd21bbd4fe89e8dc15412cfa4879e
-DIST streaming-decompression-0.1.2.crate 7641 BLAKE2B 28ef7a68462b1f9c39eb41673a6a51506fa6f4fba34227c3cd97871a3108cce90b685d3ab6c408851cf186fc8f04018d855694f82e71e557ad1662fe9f80ed98 SHA512 3cfe6c5513c0406cbad203c37b0d212c0bd9849c7dcebaadee8a122673f60dd38721aa0903537089eca7b1a2436335f59568edf4d0febe3306db35f4e0ebf2bc
-DIST streaming-iterator-0.1.9.crate 18482 BLAKE2B 017631b8186dc934fdc2e1979d3baf670bec6af4478bd44fa4a334d489c75495b0fc5fd46ba0363d547727526f1d7cfb8a02d152aafd8ab749ecae696534dd6f SHA512 312855b37fcaf766fc6627b3ff2c07f8a021c494476e4d64bae878670f1811231638f10dd390e2ea49aa166b7561b0fc0a463c87c36393a6f657c5970f7887f3
-DIST strength_reduce-0.2.4.crate 17859 BLAKE2B 63ad1af9698ed3ced72f7c0e6d8c62ec35fd564d179286d6cde8975280dbc901303a3be5664b1902c135924dde8a03447a8e837ff0cc8037db50b053ad3c2c9b SHA512 2d44e54e4cf78f718faf482ade6c33fd42e73187a7e4fbbe41fa0905e6bf1ad5f5241c3d8ddfd7b18d9bbfa3f331c54ef2d817b254e1200b50b146f04327f157
-DIST string_cache-0.8.7.crate 16655 BLAKE2B 9a017f3248a3d5e7b8c1a05462a882862b20174c7ce5dda1568c3d3f61c422e84ba2ccd5d6dbd726d1c752f1eaa8062a179470927a80d5bdda0ce530d1ae2c17 SHA512 03f9cdd2c01c0f233284851f17eaefebd68a91ae2ed2b231fab2d6d6476bd19e0696d7d3a74fb6ecb2ec36b89e79ad966ab73051255c9e194bcf9c5029fb8479
-DIST string_cache_codegen-0.5.2.crate 8156 BLAKE2B b1cd91e22937622ce51152957ed45ee88dba9756449f3ef4c4884e491b7810e1c9f10b58012244dafa4422d5589502876f30a43940ee9754ef7b9952ebe4bb41 SHA512 01b9b1a865878537f657adf908159fd04f3f2ba4e70f8c632b73d0ed5a8a09fe2bb9ac8ac4397dec1f50d771dec33fc5d3f9e68dbf80cc177118665b2c67e864
-DIST strip-ansi-escapes-0.2.0.crate 8625 BLAKE2B bd552ec4587369b1295f7e9619c23b741d4405b68ec924916aa39b65ab2c3e9b8b49c898daf58a40e76a859c7a75ef78a527ae28cf5781556b83194dfda450d9 SHA512 726b91683746a0bb928673c95f12f22d58d142638f7f44634db72a6c4275c6e3d78183f1dc47f046ac0400706e3a33d0c15bc84a66ace4432dd4f189d49557b8
-DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c
-DIST strum-0.26.3.crate 7237 BLAKE2B bdc348c718c39609c00b9fa7d47b7090b1467022b7a8a28cc7c8a72a0aef20569c6ab22a8a8d26c2d9272f18d000e4ce94858a6647194f0a7b86d812d52b05a9 SHA512 62f116d5bbc6167a6ac68b049f8045bc660901f1ce1252f8bdcd91cb28bef821aad8098905369db6c2fe74c134a5d549e55ddd28e383d7d78f7175258924b268
-DIST strum_macros-0.26.4.crate 27531 BLAKE2B 7f7d57c957a1591054288fcae6590a5e669fba1b47d8f1a52371ce60fd84f91fdb430e48cc7edbb5fc72914be5ce12af29758b653680da3f4177339b31206750 SHA512 77a17ce47d5e8fe8a89cb6aa6c3ca5d5c2625aea0f93456f05a9994238cd3b08b3f7c6a45e9b3db21bca8fb5759f505f15cc111ac84acbbb34d59cdae8307b0b
-DIST subtle-2.6.1.crate 14562 BLAKE2B 3cf4940b7a01f04715da1057f6a92b1043a6b86ab2ee7f9fee0337b680ff781201d330409460f6f90b3f81bb5fd4b563e17c762c6e824ba3b0af99e4ae7d66bd SHA512 f5946ebd9bcb8776ee3446abcbf4afb3cca5d8bd847cadda87e864333ac7ded537a3efa773e9648adf20ce4add2c1da85172cff88c1e1a3a6cb051401b00c6bd
-DIST supports-color-2.1.0.crate 10030 BLAKE2B 51b3a6711844497cacd88e270025de26ae065fcbc51047be2211a53b4c5ad3e30d7b0c8ce9dc61e181ad811888b268b344a5f282af36a04010bf179994224241 SHA512 29438ef0cd6705b9bc4b5bd1a04383266eaf18d41d2328c35da63d12bafc7150ba01b37253f51fa9ca356279e8bdb8c381843801500ea4e58fce9fef119ca2be
-DIST supports-color-3.0.0.crate 10123 BLAKE2B 9f0aac61c0f9f8d4f770767539e54995402645e6915b08ae80510f3716bc33d9ca4dd4ee6166e6ac423c342f88173d30f99d63a47a26a80315239d81c37751a8 SHA512 0d878b7fe60844d28896fb82423eb61d1f070f204042db0c04cb65ff7e1b918588cdd87a98c24b480d4e72ab52d9528fdc8d28ec193768087742deb827ef5142
-DIST supports-color-3.0.2.crate 10445 BLAKE2B 6cf96065ace2386abeecdc4d74b354e1028aa8ae8625d1d3511291058543c769b1fbbb7682e36221227f3b2a8e623371d2f4a6a5fbdeb64df79ae7b4e124502e SHA512 51c4711af667a3d68cc7e2250ebb218b9844168365e64f7811eb8b8f55e1c3460f0acb8287ad2327146e139ef22ccd6fc2bad0e589e4e2f569031661c8e448de
-DIST supports-hyperlinks-3.0.0.crate 8067 BLAKE2B 5fc8fa7f02fe3ba37efe9dd5ea7712ac294cc29d102eebedfcdf3f8c7d50c10a8c308a4858c5f1aecb7047ddff010b240351832a839c67ac66be2ec7d7e66eac SHA512 a64e441dd48a03324fcd159a16d59d1a65bf4745d15e251e315c43a4fe7f27fa15414dfc61616d915e33b1168da304e9163b249d92d2b109bf4f4b0d7ebe48be
-DIST supports-hyperlinks-3.1.0.crate 8235 BLAKE2B 587f336f430a404a17674438127a4b928adcfe3e11b54b3c1f4e8ae55af8447ad8eebbadeb0313672ef4668d0c9af62b44da94a64270919961d59b55a1aeb62b SHA512 6bffa1255e4b7d7556bd228208ed52a8892e1888aa1ba85288d2d8df2aff5eeb1cd30ba228a200cee87660f1b254ed7d5b6958a8396fd1a8d79375ff7c4874be
-DIST supports-unicode-3.0.0.crate 7825 BLAKE2B db1793dc8b669f0cbfdeb39032ae35abf337f4904a741eb9bf28735ddd53b81747aad8e629af99539fd655dd6f4ef8cbff136fd8bbd77e242951421f040ad02f SHA512 61fc1b6c827cf7a9b6ba7d077fb4bc72fd613742e711b84895251885594bd323298e77cc25b331be73ea41bf975ff913dcce0ba5b19c0b8c6d486074036701b0
-DIST sxd-document-0.3.2.crate 42711 BLAKE2B a02dee2c0c7fd41410fbf329dca47b85efbd605372245e18172192840626317229718e790b084cc87f9abfe124835abc6f48a1f1945e451d83130b0ddcf4c94a SHA512 8c2c70e978bbb5ac77c11f0c8a21259bb41aeba40f76ec31772a173b5a898092eebf951c855b8f068516c8caeeb2ebd5b6d4799b0cb3ede10d8001f36631936c
-DIST sxd-xpath-0.4.2.crate 45058 BLAKE2B 93890044d12b545ba3a76ff4bcbeb20bbb56b3627efa4d127e955c1e2c6b2654820d6151b3b94f4369fe87dbe46003766b95f438cc650575a6496fefa97efdef SHA512 81ff0329b6a3057cbd4db3234c12e91c8aded671588588b6a8e9897801a591877e7663d40414c0e61519fffa83f39e4fe8c1a2c5408fe6dae1a841a48dd462ab
-DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
-DIST syn-2.0.75.crate 268805 BLAKE2B 936688757ef1b39df0ac34fb2b98e14d15ea5d500b7db7d0c6358c495a385686287f5220b1427c0f086c56fab9caa0eb1f4b1c8cc6e6079f5b9cd24332ce7626 SHA512 f200b5fc6656912471a976e81f460713e9194a962441eb984e26320fc9f197a1d09c6a0a6bba4ab9bd153720ff5b48758f4bac617735ca455c37cc3041f84e38
-DIST syn-2.0.90.crate 290584 BLAKE2B 9f469001c1439ffe57c578119653d3021c2709767e8e881441459a190402679f4fb78aa65e7822ff20913801c3be00d9b8f115189ea8e63ed94ed359b40fc9e1 SHA512 44606124f113c259c19edcb2adc1378d8292b422d800604c0e0d1ba89bd2d13d518cf4a6afa58daded54da9cb285464aadb113815406a0f09c5e18f865789ae0
-DIST syn_derive-0.1.8.crate 5173 BLAKE2B f02ea2a6fcecd4132fe3495c6d63c05f0da94297c8a68ba631d19c503fb7383d7ef52d3f5c2bab1f30c43e461e15cd957cb9e1d689486d886fffe0bfa6f23b53 SHA512 180aacee10370b6e0c8f581a74dde2c05204cdf8a4d9423a23afae0d3b803d55fe01ea32d2e9bdef4cf6c4af7b096182cff060ae2d28723b966f4e4b3cb37c2e
-DIST sync_wrapper-1.0.2.crate 6958 BLAKE2B b2e162f982ea827229dcff468bcf31c6286c57ea3491a909784cdb50b0ba36c3a1a6fbdc7b34fc2aa9a7df1d174393d61ea9dc7ab3439a5e1a1884e2473a70f8 SHA512 aa314a6ab3ba028d2a169ea55a50eecf3b73b475a81c91330430ece9f1734296562627a8c32fad51b5a26796931f364e2803b3a13075ccd9a0aa614d5220903c
-DIST synstructure-0.13.1.crate 18327 BLAKE2B b29ee88c559a2d58fa46b7af155b448f001649ea79a1898f0ac87e69108b87c65cbd287d8f9001f360df7fef06ff39c937b48d33e487a30c8eec6a46c639c0c2 SHA512 09024193b44fc9a8901bda845b9f86c57dad65d0f53e309b2e7e968538fab6f67db1c86e5e52a2eb8fd116dc073e3ad10983bd60764662ec6ba94fee22a958aa
-DIST sys-locale-0.3.1.crate 15681 BLAKE2B c60d11812280b8e0c1e5a753c7867351deaa43d26bb3ce0b381f56c2f375ec8db2755636131a13fadd79aa6d90b75c5834dbf52848b9ca50c1ecc5b627fc640a SHA512 c06ff352d5beb9d214f08e82b8d49acd8b83114e6b88c9685f0694d42bba079215e6afd1c5c75a8e8bfbcc72d99cb01de7a3d8f160196adb6db9c34bcf1a1ebd
-DIST sys-locale-0.3.2.crate 15072 BLAKE2B d79acea3a652a46e04836735b1719a717fc904665f5c3fab0f71d53b09a0edaba6be2229c8439ec2e8f06c8fdc3de35f404c57e5467d02346b6dfc84ef495379 SHA512 9f05bf61cea92dde582f05f483fdcb9930612548c1bb790328dbbd38ffe798a89300ade79e56f7454c655b64e027fe08452c1e1c2831cd8e065e3662e8d253f5
-DIST sysinfo-0.30.13.crate 173400 BLAKE2B da65e5f5d2aa20e1effa45a77ae97bf47790d10ffb54315c6327813657c1d28f47d745c5c34e966795d4d1ad10431659ed079ae893d96aa20a18c68220cd6ec8 SHA512 44d64b162ca0a02289b615322c8faaa3f2ca9fc052d89224a245938d075373f801f2346d514f52cdf2da439f0f1fb0e526a0856c6a4509bc83f4e108d319c538
-DIST sysinfo-0.31.4.crate 182989 BLAKE2B 311ddd7c5e13e4e69406282ee50ad88aae4979f3ede53c764a12226f4b78984fc8736ccd76923679f6d3bd82921336e686d9d3c02a7fefce56a19cfd33f4daed SHA512 9c40515b892c16687c942e5184b019784f81c92e693ff59c26001b39e464ccba85fdceb4994a91f79fba22e9e8c769b14aa89972c572fd26797e0e71243bc579
-DIST sysinfo-0.32.0.crate 183594 BLAKE2B a25da49d5b40bc78ba37960b4aea326e5e0995d3409422331baaa9dc7a439e4a5f97aace5206f53a10c499008ef7030721150a23f89de3217d9fde12a191d647 SHA512 befa9d6c3ad98ad7c5dfb17bc0fafbddf167844d6088286a67f3d58701467819458513f7c9a3637d5dc81e8e390309603a48a805b60bb6ca498be9803d1edadf
-DIST sysinfo-0.32.1.crate 183832 BLAKE2B e3ef524881396cac6cef18b7f67749cc0c6ecdf3410ccc1efcdacf3944256b6768d1e482ca2b989007be1cc261f5813f64dd2efba283f3c72cf127816fb1124f SHA512 dc7219f30b7e2d2c65e015fdf1576dd38113305a1c3e8809cbb3f2d4785f89964e7c752eb65a3503a66f9d7522172b462286f118da8b11bf41f07a6ecd7ae5cb
-DIST tabled-0.16.0.crate 214711 BLAKE2B 937936bb4e6a11b09717dfcd520151e147845a9edace09312e355d8da6ca3c98ff30b1716f62021743e841f41deaa2845725ee85b11362172e00f1e775e79958 SHA512 41034dd651426e9d2671ae1834cff6902ed20492c5c36f1f2c7ca9da0b76038013c539af8daf0fce93fd4284af949478343d5412e6d7d3febf0c0d7e244a4b66
-DIST tango-bench-0.6.0.crate 26306 BLAKE2B 0fd7a22b5cee7cf75928562e350d1a1e2a2013d764ef7ae6d9ad60c8b44c7c0c4c68d0188fe41c26d2eda82b112f927c9f1e3636da0f51b68a4ea149b0432e89 SHA512 541b2e625ea2b3e0cde07638719dce9338265a9b4fbb958cdbf1521af87713034f2c40f2016ab396af3ec206f7b2792a853f6f4c3f6121be5cebfda85d2c70b7
-DIST tap-1.0.1.crate 11316 BLAKE2B 60786fd5f12c2f06097330c26809fdcfce62716586d2e1985f8c01406d356ed0ab730a04dfe72ee3e1d6208a53c76c66883d45a76130750b41ba5b82aa721b83 SHA512 d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995
-DIST target-features-0.1.6.crate 18915 BLAKE2B e1381b9b3488b7d06059261385ce8d9651955a26500a81ddb06f3ce551651e96af4b060ed853889241c368fad9d2a9aeb8e5df222684269c706e17818c680ca2 SHA512 fc8aa1338752886462bfbefd51cc1039835eb47a1419edc3c89ef14adeec6cd94f6b06be3cb211a311dc2f72e08e76571509b5268f41aeae098441aef7fcc18f
-DIST target-lexicon-0.12.16.crate 26488 BLAKE2B e7950e4a302059a1bfc9bc15618a3c1b971a17cffae117a6e8f5f63a0d82fd2bd02680301d15338612d5426d349dd24cfee30ee787a15a7d3187f2a6825e69ce SHA512 092639957c4a0391560b6442b31c47159c04d12e971010f730a6ec9cb5389e4be903ef3d7daa06db95e64dc78b6970731fb647179ebaad2b12e9ed5e9b24da27
-DIST tempfile-3.13.0.crate 34910 BLAKE2B 736378935088ccd8b540997c0554444c3752a74c9a4bd82cfcb700a9b22f572d0f2b3e61252064d4a631b57783199cfb42309e518826346a83fb5adb44843c49 SHA512 68701bee80309cd8dfa96c237b2344f26bd03702d2fc2e1a253820c98654c85d802aee1e0fc856f6372159a92ecbf624f78c8146f34a0cf924f5b56284915f85
-DIST tempfile-3.14.0.crate 35065 BLAKE2B d155a39f6ed6e846bfd572ffdc73f306d30942642e07f2b497963ae150b8ef774dd046bfb3ce410fa326c8e1df27b0cada804100215e01d02272d6059d5294e3 SHA512 98c1ab70eb3efd2d8b16ed58c8c83f8599663af7ef269304e908a04c38334f659a4d0b1647a13dc0d1eb90a293f1b37ec8ff0b9b45ef5b7ff1b4452bbfcdcb15
-DIST tendril-0.4.3.crate 37210 BLAKE2B 0a70926644e8dc492247d49b8939169702903c2458d7b2c0fea2e6ed54166909f484e8e876eddc8ff7491642ec24a200c5d1e51412c6a7c26ee60f1f4164e98c SHA512 53f074aec6e59717fca280b1764f6c2e0a1c073336f48d012ff268a7189697d42d24a91a6a549c7d9e1fe8b0006e34c219f4dba3cc95247d3905c6f8a6a8186f
-DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a
-DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
-DIST terminal_size-0.4.1.crate 10037 BLAKE2B 1d99577917b88498902d85718b4ba71ddcd7a1daca4f1b38f4b5ea4c34533eab9cda2cc344cdec5a31ffe0152fbcc5d499ccb40dc73f985f083a3ea21b0b1226 SHA512 e07bdbdf695bf9a607ea7c7c4c5b22a8637b0871877114aa305717a04d31a6b7670e2a79435810aefefe25db8c9a655e4c4ba6075d4ec76322a30cdf71ff03be
-DIST termtree-0.4.1.crate 4557 BLAKE2B d4300b0e6e908c519a0a76f5e08167f4467f428b2926e7739614cef5d3e294dfac15ae8576f7011a852745713c16da93346660ff96520a2bb90a4dd4c23d889c SHA512 ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062
-DIST textwrap-0.16.1.crate 56012 BLAKE2B 9b5a7c76eca64d089f4fab7095f2d35624527ca223e53b03cc807c6bfe913a99b55197b973a3102e3e5c4055bcd6ab580a0c9d67657180b61435bd6eb7631211 SHA512 3a8d2036c8e4b88866d68b8066a2991756f6bd4ac5c726e63fdffbc894fbdc03bf8b6e0ece4b96684c8e1facb6413190768d51a8539094efe47977c120d31f1b
-DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
-DIST thiserror-1.0.69.crate 22198 BLAKE2B fdd8ca8c8ca78702377d0bf7b253440519018275b105db980d63229d0d44aa5c39a703e14aa6fe453c779b3c864d8044009dfef893d2a5294950f067656d7a80 SHA512 ef50d2867d965da1dfb29d26faf6de273b5fadf78f95313f6caf44d68bfc610b9bd4b7544200b05bb0861231cfc84e961007f8db83c7905244c492037fd31899
-DIST thiserror-2.0.6.crate 28433 BLAKE2B 11f70af76b17ff3b48f27b47031f2f976b9939372a145bb9261236acf316a7230ab1bcf51e85b66bbca3a12a4a9eef404f1fb24e8588979b8cb707f374514140 SHA512 95c436442e3a6e3c841583669e5504c009522d23e124a9d5b7ac4a91346040baa294ca810ac035155189283f7d82c54ea2ed9392619821f6d2e3cdc439d48772
-DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102
-DIST thiserror-impl-1.0.69.crate 18365 BLAKE2B 51663251ea6ec99c59aec35fe73c5f9760809d6b6b7eaa8ecbc8f6939acdc4d0ebc11f9034d9204dde7bd689d5e8303ae0be86e298745e9ef96825bf73453a08 SHA512 579eb796c8885feb01d27638862823acd96c79440655bb444c3445ac00121852603396ce7439aed617c0a0ac69f62102167fde5845411c906997574a46d6d9e3
-DIST thiserror-impl-2.0.6.crate 20946 BLAKE2B 44d9530c7477e26628cc668ec5d74dbe3e27e9f69ee2d2a5c9694875570abd5dbb73f4b6c45bad311254c3fa21d3a7511006b8d8db4ce15355f1ab1d68f51316 SHA512 73c5e180d087c6cecf3421d3c56a8d13b4a908fa9dec02a028f30adeaebbfc6ad7748837f08c5286007f09b7430df8677eadc50527d6f17e2341341441ed6059
-DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492
-DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
-DIST time-0.3.37.crate 123257 BLAKE2B 5968d85182e3a945c194c0e405a3c771698472f4b4028a01870e8dedcfc5c10a32e167715c7c12626b46b9ddd758c72e0188b55e45c0396cbaa42a65920ae28e SHA512 6d007507f79c45a7408675b3223bbf83a133bbaf96429ae6a02b5db09acccf884bb8323dc6f3dd05e7ce87a78366a55bafa6c6ba31b04198a31026df4ef425e2
-DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
-DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
-DIST time-macros-0.2.19.crate 24268 BLAKE2B 18f0601f5307d310010bea20dc7171adc8600c5b2e6303dc9b38ebfbaa7fb59a029dddb627cf5a5b7fd2f7ed66186dbb5321cad0f90f3f85b6edcc901a8c2855 SHA512 c58aa596247a4cab720bef74ff43be44686db2da2978826a1f9b58c640113b5696efc2ae1746bf84042fdbb94bec42c7fc34f7ae6812478f55849a12a90dff5e
-DIST tiny-keccak-2.0.2.crate 20129 BLAKE2B 105a2d2af36cc053cd95721ea563108f33b8a3feb2ae84c75a04a65ed5d548dfe35d8b2e48977a82f725c0ebcf914f21157c547f4a74bb4d98c2e894385139be SHA512 c0219f23361eb07e0a68575c461a36b7286d9bdebae89080d9e259178d402b0c7762ccf33e65a16951ea168392322c44a24eb55189cf143e22d09d6dfc4acec1
-DIST tinystr-0.7.6.crate 16971 BLAKE2B 33a248261c4cded41a81f0d6e6c8df55437f042b37f235c39787986ec562f0dbff50b282ad0f1483daaf49c4b33e6618e139a6677d1238c21f4e12082562b4ae SHA512 a33051848de248cac0a2d151760a78cb3aa62c787d84ff7aac38b11c0660e9188e4d43d43a77fb8676e49ac6102015e9c3db057848d809e71981851875d0fb25
-DIST tinyvec-1.8.0.crate 46796 BLAKE2B 720d0e6d881855a36779e12f5ffa708d3a8b96e6d0de9056cb33c9b8ce0d408f99b22f5b2bb9d64bee72a011fef846dbebbea2ccd238d7b951eb5ef0c4866e05 SHA512 b7b32e38229645965900f80f298685f13e6d13e58cfd6945409a6643ca9c9adc2621456956d5998ab9dd91c2db4ae79638b156ca0d9c7c5505023fd9b28414df
-DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
-DIST titlecase-2.2.1.crate 7840 BLAKE2B 65738ca6d7b7c29e139190282c54d32f06f8794c5d6b702adbd85b9902e18856ded426675aca34ea81e11186e1fcb13b2fd2287c56c64dbe6fa9d80364bec210 SHA512 c421bb39fdb10d0eb2b81274413ebc46975bdee14fae94fa22dc9db608862080c8b1e62af64d89c1dd3809e1fae083d700f1d984edb268e4c4a6054dac070b93
-DIST titlecase-3.3.0.crate 11246 BLAKE2B 49a3b24e5636b8549aa5091daf6b8dca12624689c98c2f898fc7bc3c8ec8cd52ad56586626a54ed55ba76a6e6a79f76c0a62f7c218cafe6993c31d422573414f SHA512 13c0b5e38545bc6b21637e70b5bea761a4a5f525dea22b5614932df1d1dfa5328d48cb802b629c910200f791d1ddfcbe72ad53592368f8715e2ba31310858c75
-DIST tokio-1.39.3.crate 782858 BLAKE2B f7612d99dd400d6bf28a7da8fd392bcfcc99b84c1c97bea9282cde86e655c48e9c5257271157e6d463af2ca8a479753fafab005531451e550d3c3c45d0a9c693 SHA512 cd3c4ec1a3a7ffb9a7c9b0e320d7b9dba3258fa0feebc0ab38b50ee2a34314632c4f62347089197e23eed7c76700bd12a73f9caba56dea51077ad1de56063567
-DIST tokio-1.42.0.crate 806998 BLAKE2B 9d33a892eb8de63a65218da70f29f21b75b5b9635cbde0ae0667f6de117a4c6660cb2bbc1316b76e9e796960b7dc6c2b31c146f016cc147a2f11333b26391a5d SHA512 3cdc72f3209057cd0f954913f3d26d275246e0a2d63171f84449257de55d1a416c65b340d38a0d0c7fa33bde36bb612f550cbd43a49df22781c84f8ab2bdad9f
-DIST tokio-macros-2.4.0.crate 12501 BLAKE2B 9b358adb86e828faeb956d24a1ebf68b51a69bce519ad9760ec3d3b8eb1cf4435afd4edc5ddbf634fe152bc77b8675182dda3f076f1011c5b5b97850c1fa1689 SHA512 f4a445f6c2cc7c1cfb5825919cd3dea3af52720c7793c20601d05870e7efbcfe0c6231fba7ada49b5ce46757f0e1475b3667914ff33c2fcb25e9a40151bd2501
-DIST tokio-rustls-0.26.1.crate 31214 BLAKE2B c5829570c90b5d4dffe73c8b3a5bcba799bc48e8b742ff10030805067201848c362fad9f4ff319b003eb734b078389a35420186e90a434464f45dc1b6b3391ad SHA512 0cee6b356ebc4be05c484d459ac457280f41401093ca942cc61a6e6514dd4a48b1cc921f7dc02f9c8bc34b751d4d40d6d4768b21193d5a12c38ebd140bad4896
-DIST tokio-util-0.7.11.crate 113421 BLAKE2B 2bb1c64e4698b99a149ac3db137d9f80a691199397f98f1e6fbba14f411e849859d061e7052cd3955f000b31d97d594a4bab7928fcbfefcc9723980d3a1c80f5 SHA512 09956fc3eac8587f48cc739370883b96d19eb3de19293d240396b64b187178adc081248a5ed3d15accf97c27f9aabd0e6a1e3e2a194f330a0efcbebcd5055360
-DIST tokio-util-0.7.13.crate 115191 BLAKE2B f4acc65d0fd14a88d46545bec2313cb1f25e1cb76014d09c34f8a8be62c6901ab09b18d7b32fdab58f6594fb861bfcb8bfdc8825871347d7eabe2bd8117768bf SHA512 2a1e8fbdd094f81e00ee87eb5ebc4c62825945048105970e52d6d0a872769d268a41ddf91c60158c02a303ecbaa1b19795948b5416f9bbfcb079c5b27d39d51f
-DIST toml-0.7.8.crate 49671 BLAKE2B 47988292efa682f34b5295ee15524d9603d7884a0ebdc50aff93823bc9bb565569097b6aa0c622976cb23688aff73e41c0a19b0ab72ca55676cc86d7ae3db693 SHA512 84479acfa305aa682ed6ba655208c245d442d61028c422fefd6174371ec214e88912c257a3e2527e14646b655b18d55ac2d5482b0b4fd8cc2a9f66575ff1c84b
-DIST toml-0.8.19.crate 50974 BLAKE2B f68987353837b74421256fd9a76134bfbfe93887cfb25145b65b7e6b31ad2c3a3384829a06f50c771a2a0be0c5467c856cc631af69f586ea056c4f15af9e3b7c SHA512 16fdc58d14516e81badbe8c9a4506db75b559b377c9c4fecee79e76007b31a4abfc8c8868bf9159f79c6f7c0218f93bdcfb92b669b0917db7da42b51ec155751
-DIST toml_datetime-0.6.8.crate 12028 BLAKE2B 62113366771f22b437b2ed0d3bb2489ae9078cb589cfad2ad2e92c81ddbda48f689e5a573366eea4f54c2b3cbc6b37eaa8b442b6d935b631a992de4917268757 SHA512 d38b98db3b2d4eebd3001d88e2135b6fdbae63b200f7e900c6bb9c121dd3f170e557332bd26f237312c1cbef61666716b0cf550c2d730f86fa7cd9eb5f64a16f
-DIST toml_edit-0.19.15.crate 95324 BLAKE2B f989f96d571693ff81572af6c05a6f51b673e478f22d20a6b166c45909902ac80280ea92ec5c3567327df90100a47fb7504845fc39bbcff6756af6c1a89e2221 SHA512 46d6bd2fea957392ae0ad7e687dad7743b76ee8e8ec76c80d6374ea294d3d09b6f73df0a82c821b9ee3b5268987a4136aa825034309f3cbc1947dbd1af1505dc
-DIST toml_edit-0.21.1.crate 101661 BLAKE2B e794b6121ba7e2b1b3f50966cd40eebacee6968b6b28986cfe4cb7312b51ffff19f74826910d8e4ce307f74940f11e71e6afdd768ac196427bddf44595bbc797 SHA512 10cd3b16f763f55294923ce8f166f96fbd67a0acc4a93a46fb3044d8a38148097c592ebb405ced87030d35154abfcc971eacf0172b624ab477a11e616efbaa07
-DIST toml_edit-0.22.20.crate 106726 BLAKE2B c545e7460ffcff1404dcb77e577121f6ef332645cc0566b2e23af72743cd40e571a74660e8034ddfe75c4ae5b0bac8d9cf2915e8c62c283eb977ed3a43449410 SHA512 f1514cb1c89fd0d89bcf13a448cd8f0a0a31e05b9c483d9167e6890d70594175dab570c267cbc6596382c2300299c8d1677a5a331bc407e80832da5b7a580294
-DIST toml_edit-0.22.22.crate 106387 BLAKE2B c658eef2dc8420266a6928d7ef46340372af2593e4db0d3a67ec88aaf8f601d37d1e9b5bac231a799be8a2ee68a7d98b5f651e9c109d23d8b19b60cf75debddb SHA512 0f98b371f7e27ae7f435a207c0915f942af145cc5dfabfe6d57f2b797efa3e706025401e501fccc6df70c001ce27051381556b8e7824447edd23ea25d047da4d
-DIST tower-service-0.3.3.crate 6950 BLAKE2B 32ca66bff783eeb015af982b539acb63c9d426b931832b27aa45088382712df3894132a9e6e96fe1ed9d0f9e582b7a25b33e0ab73711acb06b4e134e69158452 SHA512 770cbca46d8500ff36fe84a9a420beb84a0e893dbeaccdd93a3970e746c893b5d32580182ef3017662f421e4b2d71f079ed2cf1727dcd5fc3443a4484f9b43fd
-DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275
-DIST tracing-0.1.41.crate 82448 BLAKE2B c056d938e001654e03efaec7a11eb8ecfbdfe9af2099271fcefa43f4f4683b40c59f7111fdf7f27df4da38bcbe94f1b2ac0abb6ec3d6e6a0d165b9fbb14da3a3 SHA512 dffb8d3a1375f1b9d5418550a46cb7b1d92b2cc8ffbccb430a38f7731547960775bb42798074186711847d256eee30fb3e74078b69cb36f28c07d9f231dbf96c
-DIST tracing-attributes-0.1.28.crate 33280 BLAKE2B 4f4bfab16ad8a296c9399125edfd4314d55ef58977d8a1f3e867618617feed898cd14766527c9b788d5fe3d3f8ee5bcca0e26dae79a2e6cf05366991ac23dc10 SHA512 4a3d5fd76efc414c86af0721aab9e9aa70fcd6b08eed4acee8c2af5af56fd665197aea612187c7f6022d1acf5567d5b9e72a7dcdcf25cc401135d875d95a99ed
-DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521
-DIST tracing-core-0.1.33.crate 63434 BLAKE2B bc36332ffe5f4c95ae2d12df43944bcf589746cdb923a39098e5f4007fd1f19d7c3bb115011ddc40c13e3ae0e5cfc9a59c49861824e99fed7430fd29479abacf SHA512 1c6f0cf3b7bd6c8f6316ed9ea0b315a619308de6cbf7e50e665a193cf8c3399b5227d4f145d83b10c7e01a2f9fbc83d16e108cf09b7fd6cef413aa5c1acf89ef
-DIST trash-3.3.1.crate 49531 BLAKE2B 587089c9705a458f891c4f3103cd95efb2cc7edc10b8f26a7258190a93f54b49e41370155b928b3698824f4c413cd6a2824d72d2a845415a8a658c267f9b41ba SHA512 c7380aaedc125a111398a4f1c0f0c3e5c5fed07c655d8a3b7e248b6ba06c82d01f068cb891512e031ca3fc37386fe9e5ca95552972ed15d4caa4fc19ec432ee8
-DIST trash-5.2.0.crate 52306 BLAKE2B c0d855b01ce05e2d90eecf99586e4ee5234893f69b73bad837a89b06cb5ffb4534cceeab974ce05c0981cacf57dd8c5c7ea8baa971eef75914834a8982199020 SHA512 866fcd43ba51aa7a84f2aaa86d6cc278e709b4e6cde36e29fd11a8f64010dd51efb10ac5437429d4757ed8fee50a04d69a883afd6d4f3f8070eb1693b5d43417
-DIST trash-5.2.1.crate 55549 BLAKE2B 1f6adb3e29b4c921ebe4eb8422bec1598b1288eb540bfe09a35eeac3a975c7880de1f69ae02f33f3279d17f9c32e794a0e2d8b561fa4b6b11094b4a5dfd104a0 SHA512 44462cd9e8ab7508d2bd6801e8b73f235fdd3fc7e1689f7cf0640a5b793f833d8ccf3a0c34e383ce850707f49cdc7c451389c48b45f1aadd088619e6be41b4ec
-DIST tree_magic_mini-3.1.5.crate 14557 BLAKE2B 1b6e18c69cc192ed318bdb830e501e594e9f9af3d8282c19c23d38572d8326e157b13bf04bedc75f83a5cd067489834660b0d26af97a49e08ddc5de03c65c69b SHA512 7d811a04b3d3e9c80e2ecd99ce1a164c142f3824d936425797ccf62a281568263df9d12bd43b3a93846b1f8221906d7fcebd4f14d1163be4eac3681db6023274
-DIST tree_magic_mini-3.1.6.crate 14869 BLAKE2B 4ae1d7ebbb427c0ab45e6147d752d4a700269aa421270f47dba6a753d2b895a3e36bc38bf0853f32ded35e62ed51f7925aa27aec23c483bb777c914c61e98427 SHA512 015d91f180e529b797b665b34288c86e292545450d935d3608964cd2c3d1674310473248fb0c7f9284cea186e2c5adfdb9f0a568741e0a1f73cd187e9ef5ed9a
-DIST trim-in-place-0.1.7.crate 2485 BLAKE2B b6a3b845d379c09c3d36658925ececed94e4b8a1cebff0e3333a372efca42899800cdba5642ad72c36266ca5d24dec45f5be8f50b946f9a67ccbfc7bd6e81877 SHA512 9885e2cf7098e5eba7ff2a481e9de189dc509adffc32307e7c6a4a9aaab05a512ae914959cc53d572d86f64a79950fc9b444da5d3a3b703a6f437355c5dba5ef
-DIST try-lock-0.2.5.crate 4314 BLAKE2B e75c6c0d7c975e294e3d723e2fb023067530ad6db3c7bdbe89b9558764606fd1a74f0d1ba787d85266db1912dbeda85408e85646d0f7cb24496d743b7a18c705 SHA512 433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08
-DIST typed-arena-1.7.0.crate 9927 BLAKE2B ff8fd0f87e69634d53b87b070499d3d119d9f153e0f06e27afbd3f96da6918136a83162f4e9374061ddd215845f75844251e3fb079d57266ea8502cf321eaf9e SHA512 506a90a11576e5a4135b46c5c4705db461a8ec1bba980c9ea65e8c4399bcc85898b7f81312acf4bc0b24a29d1b940d8dfe0352ad59985153743948616da5ed8e
-DIST typeid-1.0.2.crate 8844 BLAKE2B ec74d365b11f17f63f938bfd8819a29d94eee8a3d938d8e5f6c797c0fc4696c1016e5c900f5874e3df05f6d5650f1b05da9446e240afea6185d16ec958beaa37 SHA512 a056d99db3bc648ea260157335045dba1df96e70cefe65dbeac80d517cf630cf398f86da692180592e99f27ae14eec1d3f658c0d2d039ae353ce56463f7cee40
-DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
-DIST typetag-0.2.18.crate 30145 BLAKE2B 0f336e7d7d6aa1d65bb49df6ecee7118028c3d1347ba1d56bd54e91a253e3c1b61196563de9af5db436d3adbe79dba2c8ad5d179386cf0091cbdc998b65aff71 SHA512 13aca22dbeb231c1349f84a4e95047bfa9036c67dfc1cb235db19100bf25a60987073c1a5ed9a0c0dd95cb71ca57187976867bcbc3060e0058045d0ade680fd9
-DIST typetag-impl-0.2.18.crate 9137 BLAKE2B 13f51d00cf4f437a2d52283f02a5b63ea7ede213b4c88b46f98faf7b4a5507f734c65b97d61b834234e1f31e6efa901604d04bd22ed1cd0880d268d0746ede0d SHA512 34575c2ee41005870c13e9bdcef49022d938e37e8908fa148bceff0b1d0976b52f5622c97ee7d85d1f8f90bbe04a1ce874396eba2d6d83ed6ae937ec9ee15fc7
-DIST ucd-trie-0.1.6.crate 45790 BLAKE2B a6d47c903be6094423d89b8ec3ca899d0a84df6dbd6e76632bb6c9b9f40ad9c216f8fa400310753d392f85072756b43ac3892e0a2c4d55f87ab6463002554823 SHA512 00d9732797029c16d84fe518b2d90de841b87b5ed6c3628b9f097f5340f1e50778749db18f22e4ecc513f53624806ddc3484e5cc9ebffdbb6c0c800bef817e95
-DIST ucd-trie-0.1.7.crate 46795 BLAKE2B 1901b49ae246f0d9628b675d4320c1005707bf97d4c8b0ff99e916d198e31698fddfdb0551222f36b73b9ec7d9e648d679848841d81e975bb9ea69bd1e30aea7 SHA512 382a832e38654a9159ebb40a8e8bf6e7f2f3108940e5b9c388f3a1441848a241201e7e5cfb125e098f04f0b2893da231b8a0e5124270e774215374bff3c5445f
-DIST umask-2.1.0.crate 6817 BLAKE2B 0e33659d5caca980a2154cf9ad381e33977cb19a1b9d8a421ac9c55f0428fbbe7985ba62012acf568a4bfe1c08a8c289b4665155ddc59aee781ad10449cb7297 SHA512 aa2db7f62a4be2dade1dbba574b14ba2af42c9f3fcce10b27b250cbed69f8e44129bbe3f9da061fa1031d3a256553540ab97ec0f13f6fb8b6747fd97ce87ca82
-DIST unicase-2.7.0.crate 23783 BLAKE2B 2b74b932b45c9d5b984b57bfe8249496c192944e2e66916919177eac81c509e2d7a5d30a85ea58e8cd5a0b47fec746bdb18723f3f14002fc64af3a0d320a9e7d SHA512 c2b05a3bbd8996e1cf65d7458f5ad95de9797c8349484f8db04967bde15c1f057f62b2f7a60e7367871512071ed5076c0da042169dbbdcaf4d6c16cae62da828
-DIST unicase-2.8.0.crate 23843 BLAKE2B 5e479780dd3a690a98e612454761f0248d8106b8efa45964059a04eabadb78f0a6c598115e4b74d38a96c231272e1bde2b8f4edb328069ee6dd0874358613d50 SHA512 2c86abf8c87b87fbcff4ea9a6093d86b876e2e619120c6a9b055712a271f8bf165eb533ab9d523af2b516843a39b5bd549d9251f9b079748176451c9c820c0ed
-DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8
-DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
-DIST unicode-ident-1.0.14.crate 47547 BLAKE2B 30e0b6d7f3a967aaf5b9d91237008a60c3a8ded53bda901696e23cea3931dd71b01ddab866dca9e31e17c395d5f5a68f2a938655b693e894962568c2cff5ca15 SHA512 7c6dcd1724e8cfedc37546d1abd49088b633dad228097acc73d7b6cab255b223e830c541144e05a00388fd8ca8066f27c18792419cfa58ee9da4460a38d0bc0a
-DIST unicode-linebreak-0.1.5.crate 15324 BLAKE2B dc560d5b36ed01357c22750feb7f09fd0f57fb0ea543180f6e31c0b71b51df4faaa70ac8482f9cd60e5d1faa5bfd4bebfbfd628dd5913c2c4a858ec04beeca3f SHA512 f37be2f7b04b886e95bb7d0f33bd392b78bb940ef9a01cec487062cf31ec0367306650fad7004df556887a324c714eeb28f697044aad9a429ce07b7b7344af60
-DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c8782321b1bbbee724db1e4d8c1d43af4e6bd8044b99307c227d93631d178d10fda445a941a485882ae0015a6e3d3c347e4bd465bbe1d9 SHA512 539f04010810d73fde7b0ab314faf813f3e7ecd2e51d7975281554b7cba4a8706e2b5523c4b7840568593652360ca59e9db0e1ce342e71c28db635ff55ffb0f5
-DIST unicode-reverse-1.0.9.crate 7739 BLAKE2B b6fa9a416dddaefaf0e8e92ae65cc8e53745338ae75315a917830e96219820a655c7ee38f58a7c5192b9c7e99a546aba5fcd2a2c295a0c34d33cca5dfa664ab8 SHA512 9a7743c8faf61e3ba43f4d9d343019fcef894ea9792e6d37e21b5a41965748423fa105a190a16614a1411773004656ffa69aefaa09a435e7a5bf27995b58c4af
-DIST unicode-segmentation-1.12.0.crate 106323 BLAKE2B 268b60aff6694434f05afb7e2b8187eeccdceb77460f8ce2ac0f84d470f8a4e03182ce3f7906177cd2f00f989273a7e69061a763006245f0876bf21b15076804 SHA512 55eebfe5e9972b39d7c0011d80eb5f517d636de37870999119a3d8f064f21f67b66a5ba9761d562738b05f220e21d56b5be7bbd9cc51662994e40dd67c38f946
-DIST unicode-truncate-1.1.0.crate 12529 BLAKE2B 908c794c44d4928bcb73e3cb7f89a5f57ec39bb0a2931db282849d547fee1e228f0ae01d50421b86a5d08c4860c4960d96909f1444e00179ee7309e25e1a7fd6 SHA512 090050af06ec187902102b07b2caa4f5c4d1a046d013aa1fabef9d18fd3679a6dc4dde6b55b9f606dfb057349fb5c10e2c229d3577116c9fcff07f1099fdf4f2
-DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe
-DIST unicode-width-0.2.0.crate 271509 BLAKE2B 53015f24c57ba65d7ffc6e15e947f5ab96fa272996fe5a4d2f9203051972238ea7591c99f1d8ae5d2610c7b83c215b6912eff7aaae034237aec8d79620bfb843 SHA512 38149ad512a44fc79b2c991c6b5667da2e8f8b442ab6bb7e4f404e7fbb034f7540c7e0e8b9e72a1ff6117b899d6034862239f43b6423fa89d55dcf489caff37d
-DIST unicode-xid-0.2.5.crate 15530 BLAKE2B 99dc8a0f9727c86fe3ec1ee119487ba4cae579d009720556ed598b58c0ec593f32b4f7459df81d4e4d06db351d368d2c565af7b03e15d4e5c984fd50f133cbe4 SHA512 ad8a23407aaf16eae14a44de201c4a0152bb07584bd36a5c460fb744859978cae131424c32033be4ebacc9f9a1dcd611f9ff4a98b84f560109d0c313585ce5ce
-DIST unicode-xid-0.2.6.crate 15744 BLAKE2B b1bad25897717f6346f988d5a7c90c51fb842da113f19aa434a64add8f2e637258d9fab0f7b871fd2aac02e83c68359fc679b326232793cbc804523e2bff5056 SHA512 f68e78484479a5341b14d7e3391e691265851fa00feeca53af745479af6aa9b4ce3570456df785c8362043db9b04e2e57f9bad05d8305946f16af405bc611764
-DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505
-DIST unsafe-libyaml-0.2.11.crate 62101 BLAKE2B 7ba17f2c19d96fc8999448594ba67bfc0eceaff47a39e560f856d13229ad5e69a9c8ba8794ec814e6b7c3cb7d597b7c7a366c8e880f17c0efc6a03a5677d82bf SHA512 a42c95eaed1ae2e438d3ba19ccd92337327c34f6174a43db80e1f37c507154249c7510e93f81726890c6032c89fe21b1876582afb7fbb811e3931480c4727712
-DIST untrusted-0.9.0.crate 14447 BLAKE2B 8e9c3ae09435af0885bc4a6e3c8943805b48cfc00bdae228c7c43093254e1be15d7005d1026561ff369ec37865d8458203f421a9c89ae3db077f655449621aed SHA512 5929e4079c1c2ff933ae8d8f59a2ecc7a424e71a20d1b8821f75925af68bdf82604b024c008e5464b02e25ff093e561a352b685e755b3d0b27e4c30254689416
-DIST ureq-2.10.1.crate 113163 BLAKE2B aece4293775ee9bed49dfd7c1761fdee20c92322dedf70431b6214e8a40fd9f63e43d2846c1929135005c5260ffba4a388d779a2cb2808eb892b6b869f65fa08 SHA512 9944f0790b9c342a3584bb9217d0546dc4272b011bdaa47d22b42684dd7f655aad22750d395875c63e7c92d8d44ddf1ef610061b485f9600dfd79b4db5743656
-DIST ureq-2.12.1.crate 115366 BLAKE2B 8e349c5dbd4c1c6180fa018523db67dd694c0f7ef0ae4323592c1051fef473bfd6a8bf80d91fa4047547fa5e908ec5f362cf0697168385e2968ce67f8474c59b SHA512 30fb75e097b9cfb34ebd056c0936d1b5ce16f4a613e963c5179046eb48a0165da6cb2e4a5d612b03d6b0daf736f5353159a92ab69e68b643b923fd551f0c3e7c
-DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d9183478cf501c26fb5f22d7704ef1313ba6d355e849cbf8ab7980310c1aae85e253a2b28d59099e23af29 SHA512 2515903e41c0659cb226f9bb049ef80f2a49d1b609b6ac480e570a84e899088ffe3be4fb58f41a1fa7f5288eb5f97ab513f331aeb6d56979df783d48e2ace28a
-DIST url-2.5.4.crate 81097 BLAKE2B 74943c63809ca41a526a146bedae66f91f390fbd2ccbd90f9397d8074ee7ec26535f0f67170eb1d7232e139d8d795fde99be37f53f1bc32c6a6a4d46aad1369f SHA512 8f1d62bfdd45f52fa12ad657a521a3478d0ab54d187346a29dd59cc66a0f140ca96d850948e09f6316f08b44b3fc68526c58bd620fed5d065b7e8528df3cd46d
-DIST urlencoding-2.1.3.crate 6538 BLAKE2B 65777b0990aa6b3d27a47f36114da8622026ac8946b5ffb6e04172b666ec7244a55c250a7fb626472bb2b636eb32ee945599cee5ce7351c3cef2322366db15ff SHA512 035848d9243ed6a4528377b56edd7f8bcb5f824381b420dc8f5c4bfc3f1246655c54eaa7de0e4aaa7138e0b08fd796b9ace140ab919aed2d94f6952b577386ac
-DIST utf-8-0.7.6.crate 10422 BLAKE2B 296690040895ba9da9e69d527aea415f4bd6bd3c010e67a08f9cffd2f4cd92a99f9ddde77512f9ef5a0db069ac9ac3cd6fd91aa18f0bcadf870ed212fdd76f2b SHA512 6bf0787cc297a1ac4e47389464d05ef6850602f549621687e776618bec96c1f7bacbb1ac8faaa63e5d28d975b850db8d6c784eb66e2466128f0521b91c14015b
-DIST utf16_iter-1.0.5.crate 9736 BLAKE2B edcd9776113d4d2b267a9cbd58cab11c5497ff1a8252c4e695de619fc8e5eee1595343c857651774b3670d13392144e9d7df579f2e226842aa7e4e023a76fb65 SHA512 44dcbc5a7db149392fdaa31862be240f78fc5d7616f54be32cfc8f3adbee310e8681ae1bbe6edaad8a7fe6e7759dbac8ae4f69d0dbdbe5350c21dccdbbe975fa
-DIST utf8-width-0.1.7.crate 2977 BLAKE2B 319871431fd21dc30f812460ca69bf0f3b1f6f9bdf749e4ab650eee1597e3a86afebeb646f4abf4b32ab661142433eb9bd2b0917d0f5c0a93d154168c2ea3278 SHA512 ae870bc338bc74f9e214acbb31155ed37e3c686abcda81e7a3f9b8440d2782e4b29efa6d1a52afb22da390f3e64f012380f18ba1e3c1a37bde927812c361909e
-DIST utf8_iter-1.0.4.crate 10437 BLAKE2B 1e7a8b9241ebbb62cb497542b970473780f735010a0af900771a43abceae4e7f362d21d4f79f7c00630e4549400875ea17574b2cbe4f5ea19e8ed428e3b5577d SHA512 a72671995b3eb295581c60dc632e4a25ba257227fb5d58a8bec322428b6d69529bba79a6f02b8e7ee6698b7779d9d6695f5badad73e07c254b00c9d6256c9090
-DIST utf8parse-0.2.2.crate 13499 BLAKE2B 095b5d219ab8ff04c06fd6303e03d913ae36a57845f0b2ca3217a40e31a54cb0fb5ecedbde165d28f5f60f1553d8252986d7098fa83befc84a7cb20bf3b76144 SHA512 f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266
-DIST uu_cp-0.0.27.crate 39108 BLAKE2B 4747b6e870c057af504805ef4501f48915ab8a0b8db299224ecae6348d09a64bf4bdc1470497acca2b90e1f41e4a19263f4aac3733b2ccd44bb2d040bb2e9b77 SHA512 66d7bfe519317b41bda91ecf53f0f44b63a203ab75b35cfacdb135afd0859fe3e5581a1209aa73045d266ab5537ef287780bcd1e473a048759a28b56bf869c67
-DIST uu_cp-0.0.28.crate 41715 BLAKE2B e1700a9546bda26659eddb0c821fa9565a0705cc6ccae1cc0591f864ec923e792ee27b82f458aacca23f400fb84f294b97bd7dbe4ab545c4212d717630db05f9 SHA512 f0d5492c19c6ad093c5eb74849adef393cd3a745e17c2bb94c52e20c24e51f669799a3625fc8de4d1652926f62324911e5d5e6ca11d2026ce3b765907d43a582
-DIST uu_mkdir-0.0.27.crate 7910 BLAKE2B e158021c4e4a068d273fcb43dde3b5186d6d93e4d921c2b9c25fd60feb82cd8f1b2b4d1597fbd36d776be2833f5b18cd80390d004358514a572c1a7216b6c369 SHA512 b5b743c0862a388c49e845e2a225ba684157183cbbc433deeeaa30777c13f1cdf788eb5efd16224273a8086af759094fc596a6c85c0270eb80ce2666c0b14561
-DIST uu_mkdir-0.0.28.crate 9062 BLAKE2B d32b994b54389eab39d66eff2e5f17052d81dfce387b32dec6b3060f664079f2edb5c2329b3b689ad94267b1de767ae3db812f4cd4d0ac7ebee7dab49791bf30 SHA512 1859321572edd89eb954205ba0d80fec391e13320a8b72a842d232bf6e358b5513c46dbfc0858a477a88fc6e5b7b368ca4ccbd234eab6cabd00766285fef373c
-DIST uu_mktemp-0.0.27.crate 11626 BLAKE2B bf2216f626c5e622b6be4d8a2e16431120bab0cad763b2dc5fc5124cb562476e5de4b128cfb9cc32445b07a9733b8803c0c2e61b5e1053929bf05c3e1c853b0f SHA512 ba1cc16b2aabd6d10e8c2c1c11f796bde53172a23acae3f24ae2724fffcc442775251d4dbaa65ee89a46fd3ddea0564adebe07afedd16e02717aa674c8ae484e
-DIST uu_mktemp-0.0.28.crate 12341 BLAKE2B a7a5f998c62b57a95c07840d78b0d810482d1f3ce3d56ce27db7d940b25d39b78896b08295b2a52c9326ade1b6f19baa982d23b11d90f235d66b8c89e5c738b5 SHA512 02cd02e99b311a75bfb1e229c8c3d0d66eb51b5d10366256ffe68bb2ca696f721a5cee3f4d103202a34f59b8f3725545cbfb44f93576f6b55c7d7546af2025bf
-DIST uu_mv-0.0.27.crate 13663 BLAKE2B e71e58e000585a393ecfd7c115ebdb1ffddbc4412bbcec7cc5ad40507aff7bfc9564eb6a174a311b047d7e9017015fd5b12d3ce84d9e09a6a6589757e99cdb64 SHA512 42b0ae9c785e442aa52a22b71877172449222dcbd893284af9633fc21e42058815ab18a5b95e7b5c8e7b5ab62af440cc6c278131c1cad4ca39e0d7aa7356de17
-DIST uu_mv-0.0.28.crate 15228 BLAKE2B d2ef466e2debc7f4ed0146930db2ef38358a4b8a66d63905b10509c074465b2b876031f3e99127acb58a949d99ccef2bb89f8a26f72e34b00c15e9c2444def80 SHA512 81d7ef00668a79b69a80d66a82ca1e315d9da4fdabc72945fbbcf2ce6d76d95967fdda97ed0d0dd6bca7cb13265e19b9d0cfdfb420246870966d2839d00a5516
-DIST uu_touch-0.0.28.crate 16692 BLAKE2B c276403559f8c7626e85e8861612fc17fab96cfedac9057b739230b182deb7831a1c907ca47b7c883278bcef843efea5e654dd8c1ae46e40eedff6bd1b1b587f SHA512 fac89e68de81d96d8e434fbb66b184149b6f581767563c26393a9b1a3198c61cdb213e260db0e1986445c74cf605fdccaffef19c2f8d79891b95ba10351fc647
-DIST uu_uname-0.0.27.crate 7149 BLAKE2B 7c750cc75762c36c192d1c603256fba1bdb3fdceacd241fef14044190191fb02d1c5ba2b78c751a6885555fc0d847c49843959284a4b97b3c30868a41f80cd82 SHA512 be411a871d2efbc155ae2ca280b436277c133b819552ded5793f2846d8a12cbf943014fc79e8718db5b808606feebb726f1ff4a13316a7ddae6ac0314b096ec8
-DIST uu_uname-0.0.28.crate 7806 BLAKE2B 1e623bb8e75a1a49629be921fb5b2594edff6099175a4ad08d2742b2b50895a452cdb3d021133bce558000f176388a67c8befd313a8319434c5f61aac6739208 SHA512 6515c3b54c4e7d0d9d2d6eb4259a32bf1f24ab1e9e981153774e35690824b8fb473e5b286f2104445b9424fee6b92a3e1f598312fe8d410fcc90981fdd5cd603
-DIST uu_whoami-0.0.27.crate 6215 BLAKE2B 76f0dfa0d1bc2c905b5e0e35d5377866a6f9420fe17c740575ff322f96223137ca49756696782c0a5642176008e6389b2ea4894f3b5186d67335f5eea011de14 SHA512 6a1a4872899567fb1e7d8522a115f8b2a788143531c25fd999d2c07500854a709fc43d2c85fa95a01de30e9f163ba8dc165a324ff45dc8ad953cba8cc9a45ba1
-DIST uu_whoami-0.0.28.crate 6932 BLAKE2B f9aca4881f37a578087b5a4bb73a28ae455737245f7a8fcf23d3724c0f78e39cb0ee44bf16c6731b5a878d6b2cf9f1c4a88d2c6e1fdefe8c43b6888f6eadb4dc SHA512 d38e284183ca592c7e02e9ebb6f3babdcb6f0f2246215f389eb297e63547e4fc9ea5cad50412b710b0b84a1d715d5fcc89351a46c0988a1ae14a09fd3189e334
-DIST uucore-0.0.27.crate 107517 BLAKE2B ef4e6c1377021507090df456a9c946b84f28afac4d209aaefae6a6e00281a3fe9115caa2ad335f490ebd99d78d4a6edf654579729ea5ef2c8da9f34a56f1e063 SHA512 2f4366b9f7be62e22872c81e56682c1fa420fbef7091c92acc70bf57d12d328345e0cc5a77c0e96a222f3cd2a357d427f41ba412ad7bca43f0f374a70abaeca4
-DIST uucore-0.0.28.crate 118746 BLAKE2B 43f6953c672ebfc7427163aa0c20c134112b5b52569a09ffca54f70e7995f07813a7ed655845114ba424cb7921bc0ac765ae306ed5a08dfa66f9d9f6f816f297 SHA512 6cc635727a0ebe39f4994b27a369876399eb6fcbb4cc1663a362876222d136aa9bd860f3da80891ffa875dfe729f14971a26d7cf225ccbabcd7deea601f65589
-DIST uucore_procs-0.0.27.crate 3758 BLAKE2B 4c268e519e4f1284a34decbce0d0f36df270979e72b52141bcef3fd7a934c71ce9b608b3e0911bd78b123a53f4bc054d35afb8c400fec7d15777b415d3862b03 SHA512 159dae3bfd1897e086608eb129d27bf56acf4bd4ce759fc032048793aa26e53bda046301b8808b9ec9ccf65ae216360191e4a1628e1135214fc7180cded47148
-DIST uucore_procs-0.0.28.crate 3992 BLAKE2B a7ad7d222e12b51a45df886de62797b632f470ec41536305979e0ba5a4352b77d3ab3b51d3503faf1a055395c05632173b1921d9366daac813e53497606256ac SHA512 bd1edb01a60c1b1b7e212f7701197a2d5bad83d3b02dcb55ba3c1035d7ec7664880ae84816e906b28042b696df43df1f49d8ab0ab071268a3423c6c2b5122545
-DIST uuhelp_parser-0.0.27.crate 2830 BLAKE2B 44041be3ac37e338588ccb5f81d31be65760d97a508bb9ec56cfbffc422d0f69f7d6c49f5f22cc51374474775c7fecf44c4a07833bf45fb12d761d8b526cbe76 SHA512 4a6fa46dd0c1d3f93b2185fa1fe56c69591575c285f6e861d822d6f2a86cc6a2491785cfe89cd31f299e417b5b888b115c315f466b365ff367a2ad7193ab3e4e
-DIST uuhelp_parser-0.0.28.crate 2902 BLAKE2B c262d1da25d2b7776d5c01b80c352f87be9cd53749e2730f2a688c168036ace9bc5fce1a1a08e26673f267ed6ba143c96a84ecc2a7b247c9b9a065584f3f09c1 SHA512 73cf1d9e12c9d50c86f022414771d3a48e2098d27c592ecc733d6b19a4b10f2e7528de6f88b04d64ca6ef9c149bd513bf5ea161b8245f77846f0e96a6193bb54
-DIST uuid-1.10.0.crate 47648 BLAKE2B 370f56b5057fc43ed6645ca4a032737230242c88f3c6945248585054a0d1de0c85cb2eb21bd4c759c1ca73df1b5005652f74b474537116c4fd6642cb60d274ff SHA512 e17db9433d919b51468acaebd240a2cb218d07f099fade49118ca9313f8cdf6aa3103e7aa24440be65a4f25a25f8f511e36dba08cbef27747f9e43b849cd612b
-DIST uuid-1.11.0.crate 47683 BLAKE2B 37a601b0fe7ec57333613f8c18ada76bd784c43c8af7c252200a7c9c76b445b179931cdf727b5ddae3ffa3fa29c5a13507fb0f2bd604d306982843e042038314 SHA512 0cd1b95fc2247bf4e627de6abb41e332ebaf39e5720640e52b9f235f7a0e2d451e7a486efdabb616ce00e47832d21919611683d0e6a71c86a86f290940cfda32
-DIST v_htmlescape-0.15.8.crate 10878 BLAKE2B bfd3f3224a8b207f76c79212a770a8e735943a140b5d7cfa030ec7d0fa30a85e569d4242903d466294df6284b71afd4c9e00990de6ee9a0e39f60991ee0b8ac9 SHA512 367778a5aff590c108efad0b958d37cdbeb049b79a0c4734bbce49eabf003c4d2d9e3cd0aaa9f5d62a002c5cd4c4a928191de000656024ab159f719865f79a34
-DIST value-trait-0.10.1.crate 25645 BLAKE2B 2b82e640bcd2534dbdb00931bc388e5da05ac62a679cdf3c6f94bba0a05babafd83472a67047cdc930542dae59f7dd1ef9f047399c487e8e056405104118f00e SHA512 d174673fb8e8b75f90c7d67e9ef225e7ab48b6c76342071be9b4227963c48260922af5298cb37139f788cc21d14e95ff2b36a1771ef82c41bd8a37b61db479f6
-DIST value-trait-0.8.1.crate 24610 BLAKE2B fd9a80d3a9316ee79702997f06c31fee10df62bbe8d0f6730a10a7877b4a2026e081f42ef567e49f2a94768808f9e9679ce5c8cd6c94ecd3bcd48ebd454880e5 SHA512 b2fa16a642c6bdcdb41d2b5145bc38a0a838014c599b4e7679df520ee0fe11030b8a8eae23cdb9ed136c770c2992e1411d1f949fed3b258bb689256c51757dec
-DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
-DIST version_check-0.9.5.crate 15554 BLAKE2B 131e75cc287518831e142430e2a39b48e4275874f4473780d47a27552294097aa1cddb65c385583e1022478f940b495eb43c24a8b1617b8ac5a24af3340c0d72 SHA512 d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db
-DIST vte-0.10.1.crate 24947 BLAKE2B c7e94b7bba2423d14e5aa85f94dba856a6c984261551f204f029c55ef923c0012b259e5b229974b54b4eb5da1e85bae3c8cdb680372b5f9dc6caf51d1075b0ba SHA512 0c8fed2cfca5ad07d2a146e1e26979d390347a409cdc2b960246fc2fadd85019b9febf2dfd618f7a144493084b55f285c58ef5204e613bd9013af26faa9f2033
-DIST vte-0.11.1.crate 40455 BLAKE2B 7a24759e15a87ec17c9869c02b4875f67651b2b50431d71acb60b4e16874240be691ad33d3336d7ad6b9f39d79fc7aa33e6c6604e616f904d8ec48538851f679 SHA512 43dbad0fe71305159736c5578f015a4cb2668922263f43cf09019efb40b09e5bfff13816ffa9aa1cd8d3a20dcbbc9ea12f223edaee1b44ed8e3f112f97020a5b
-DIST vte_generate_state_changes-0.1.2.crate 6503 BLAKE2B c7ebe8ce8014bd9dfe6f2daa61ef7913c60fdbf7f3e3c205c0543894e5d56117d4536b13a931555043355cd043d279776e820c481337f71edf6f62a8c75723af SHA512 343f639b9393569378fa9353f1a37c7a355cfd56948568ed49828308a1100dc3a6cc0a8253f8f8a82d6246eaed31bfdc206762a62a6ab9a862e4ed11a9e3bd14
-DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
-DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf3ab82536295019268b3125084da5dbcad818070bfdcb6a5de08da4eb483475bc225a829f58a1e3e040b5fba SHA512 da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad
-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.93.crate 43769 BLAKE2B e1abf981a042ebbc5c506975d5c2258942278fc000ac62aafe4221725fc52003c4032dc04a396e8fc8ec6712155e056ea9381a72070ee7c45b348ce470f52c7c SHA512 0c0a63b04b02b57fca78d2c0b885ea752ef1e8e4317c27dc84fd35843c9c396ae20557a1321c03a405b050f21895e6f25e95ddb56f3a3e8cec13928858ae8422
-DIST wasm-bindgen-0.2.99.crate 46136 BLAKE2B 04e69294da3dc4feff9001185bcc5b864d1f14a1ead6b9a31c830b2043dde191f9f7c65755d607365a3b8885bd340bbd266e26cfa74c48464933c8d7a1164f94 SHA512 184aec11998b99a730ea5b63d6141260cd0b7cdc29b02696f533b3e75ec79f7c17c6aac892e7a7b24036c6e73592d01df638ca31b54bda11d3bdbf857b1489c2
-DIST wasm-bindgen-backend-0.2.93.crate 30344 BLAKE2B d0b9f0cd0e6191dc3f57869023450952f2d73c0432fd4516522df5f63090de021f44f11ce7676fd2f87b31f6b236eb155b22b36eb80c3ccf3880f55ca23d4b0b SHA512 c67dad5fa26f78b233612cb6ebd44f48edd84253e46a2f5094e95da935185cf2a7be14d49247e8b8cd1d916721ed82ea44046080a40b2fe37ad88175a5f96597
-DIST wasm-bindgen-backend-0.2.99.crate 30928 BLAKE2B ecfa94a461df79a33fd2bb9807374a2a0c7ac370b443e5a1103ba73a29c9d337ed3feb427c80571ccc15599f81135987742e698199528a9c1bb570baef3e9d09 SHA512 8369a5e618223f09fff7cdc35662a930b3eb11024af51bf5fb9e70c45dfa22452a518d723f3d912c0c970fc4bf748ef2d83d48756483174993f7d04c92d9621f
-DIST wasm-bindgen-futures-0.4.49.crate 14838 BLAKE2B a549a84dae70f480e387e01b4366994404370ae8f0989146d8548106267884096442d2fd6bca0a8cd22e21a3eff6b16aca1edcbc23c73af757a043311aa49081 SHA512 e141d6a97d2bbd6c54bc23d4857124d6e43ca1ab51c37e867287d771fcc0d8b7a2488acc56d46202c2e9b2380684ebeed688e7322175dae67475b77fb307ebda
-DIST wasm-bindgen-macro-0.2.93.crate 6822 BLAKE2B 3704c01b90ae900032e455a265b614d1057a7ed7b7eef1ebfdce75a7b0f0b97083211db562d1602160cf9e70843a1949be836465398787315d66ccf85fbe0801 SHA512 8b1a690bf4fc344728bae21a11c8ce4641d81b02e215d88a489f8155433d8e579ed367c96bc19a345b561f2ddb42afa44056b71e15dc935a4fe38fd7f937a632
-DIST wasm-bindgen-macro-0.2.99.crate 7011 BLAKE2B 07182a9fb98f519d1e5c934e609d7a42cf2409319f59dd901e2a5bec77972b4d16fc6f67cf40ade58af874b05faa981c894443d3950616e2aad117ac7355ac6f SHA512 344bf5192e43582246efad257c600003c41b589234c1900f6ed201f96b6f7665eb55226da15d612060042f89c6214e452489cf3aabc61645843be9c27f9cca0b
-DIST wasm-bindgen-macro-support-0.2.93.crate 20642 BLAKE2B 3fef9d35c09e97317e8531f11c3cfcafc5cb58126ab7a96374cd5e2e3f8736ef016b4c0b3b16bcdc0bef686e9f07439f263c54dc980649e9963b12d0a6814ddc SHA512 9fe590636e229184a944acbb8472c03db0a48a9094cd9ee204c09cee6c5241194a9757f06b09e7c30ba9db1a2feca616cd1e7dc0e52c7f1c1560c50c9d3adbb8
-DIST wasm-bindgen-macro-support-0.2.99.crate 22800 BLAKE2B 9772cc94a64f768eecae12072e6d700bf95fded306297b84e235f3450f7c5630cb1985def3eaef05aee193c693f92c6fa61d7a6ca18e84a2b73aa38f070d47e7 SHA512 936ab8211a13fbe8b8f21a870a78c03e24219d0872731561353cfcae245e9f632246f179b67f2b13e106c799e68c5c39f9e388370a8ad3f93f299c4804f5907e
-DIST wasm-bindgen-shared-0.2.93.crate 7527 BLAKE2B a2df995ba72d83beb3f347909c004d9693ee06cec62de248a1f96b0244c05dd8b62d46356f1b7eb0a29122517bc23270eb4eaf045e6cdbb7122089dc84829d9f SHA512 4e9271a746d3b3ea44bae472b7d9722edbcf262fdec2e03c18788d95b923c71c26f309e316ad3c621d5773311d6b1d5ad468cd7bdff015d162193b6effaf8420
-DIST wasm-bindgen-shared-0.2.99.crate 7773 BLAKE2B 73489af59d16f4d0a1ea51b535cd02d2759b5b7b07873d8a71fa6bd6b6ce1cfc6e8139e6a79346abec13665ed9aeadd0b5b6aed28ae008f9dcb3d5da9fce665a SHA512 8da0f107be99b6666cf1859d68ac0a7295fc03e7b494fce1df9dbe57d21807de8e2bc95f5b974562303923ca4646f38c5297588ad7c97bd59ef236218b2a64f9
-DIST wasm-streams-0.4.2.crate 36773 BLAKE2B 601f8bc4bf872943de47903de57c9e833afa2500d7e30205046ee02a8a2a8d6486b546117009e81f399f9ece69de89145fff85557ae87d37f989095bbe2046c0 SHA512 f93693b41220e819c4efce0fe756633f1aaffbb57b8a9c028031a6b02a7a221ff4d5bacf162a0b301b55794745ad1f4c97a7bbd46ac396e1518689c0639ecd65
-DIST wax-0.6.0.crate 60628 BLAKE2B efb9d890f433b5c6c364b621fa74d27e0065f076c85c2ab56490e6c19433924a46aee4e6841a54a6587eb4fb1d4452a448a4c3dd9b001b0844ad9d6d7e8de71c SHA512 3e77f67c9d10f9f21613b68e196f8e41431583838040f1f251c852bcfb7177d493f200eb0432e580d3aa796ee8d90789dcb18d80b938f30f942d6229dbbfcd2f
-DIST wayland-backend-0.3.6.crate 71562 BLAKE2B 33a91c4fdab42e7fc18100ba124905172c1cc3fc4aafa250c3b55b69dfe230eb39015c64d9ea8461cb57ac6b1665dfdab1c61db5186eaaa0be0988879e8ab2a1 SHA512 afe17c8855eeef89afc91b52ce1c0b0a4a7f6e3ebc72892693601033626038b1ebabdbae883336ae30ef9ac49b9e444831c6a5c2249fd167f45772d127395476
-DIST wayland-backend-0.3.7.crate 71771 BLAKE2B c01c0112f3cb48fa99863186efb144564edbbb0dee07b1f96f0a433c7d843a15d15504b58941cd325401a025803256c9fa14a979bdacdb0728042bc29edc6ca8 SHA512 a8542609c5745138dbb0eb88cdadfb53d29e85b6646f418c06b572cc336b27e44051041e5d86b1276b5925a58ef3e0a9fb9e10c9776093c3e765c095d0d1c23e
-DIST wayland-client-0.31.5.crate 63042 BLAKE2B 9efa3be373b5bd938eef796faa0c7647844f7e222e8e1c8e8f69cd0100122a2c4191ba70baff4a17f78e3d99c7270e523b3030327cc670f820afd4a7341ff586 SHA512 bc49d4c9d4f923ecb4416afb279f45da88742d372e716aa7299fb7b8778268e81e43298fbca122148ddc995fc7350a9bc80c27672603c2bcea834535c6827037
-DIST wayland-client-0.31.7.crate 64486 BLAKE2B 8705a1d5ba33c51a1e7be6eb9c942090ff7d519771d3fb32fda1069be2da4d0aa3393e00a5a8c8a03e5e1231d3343d2a8ce6b2d9df3517dba647e3d4a182ed0d SHA512 205a8e84af4ed9092d0980eac3374feb06c4c2ff82f70c4ca51b44a4db272881096e72062515f0432719dbb3717589237c1bff3bab3a1f0c96e2910d053f50e7
-DIST wayland-protocols-0.31.2.crate 147062 BLAKE2B 62d5ea52833d9edc661d405c83159f97c5bdbc41bdefbc9418a08971236cb74d317efe11e2e23ed6d96f0be27e4a830b4d47bf27d5b269e30e5a4cb97c469c8b SHA512 8f295413b20f308fbf337d8d6e2b6905061d32baa0aeea2aac55edeceadc754a121c56b8b96ca218aa902cfb26fa168c84334ef5033f8cc72e1505f1cfba06fa
-DIST wayland-protocols-wlr-0.2.0.crate 25804 BLAKE2B 226af653146d7eef2ee0a7b6d1484048c5f8b1d2618d3bb9d33eca7e019579c9868d42e5488ba8dc830457ca186a0aa07599accef22902b982d653e381b2f4ef SHA512 b1e5025dbe50a9b90bfd7a38d7564ea8a02c84c8c802d2200864dc604847a4b0979f8a0e05d8d76c2b7c1e198c7847e4d59ad49311b00ab2d4d36eceb776a16a
-DIST wayland-scanner-0.31.4.crate 35691 BLAKE2B e9c2cbf97719e7729892a777c37e865f22d22a6e1138d189a512c938e24ac710b6f431f7808c656facfb189a47a27564ccb6b687dcf3dc794b1ea87dfc8a6fc4 SHA512 44c41437a20e2f895e3330b4fe72eb6b7846a2287ce5f7e1f2aec1407cc324dc43549cbfc82aeaa23c69709e2c5c339b32aaf298b63ee675b8dded175ec7d0cc
-DIST wayland-scanner-0.31.5.crate 35779 BLAKE2B 904a811f9903805a00c2e55a7c7a5eba2b3e0b10a04275fbd42a9630d828ccd3031c13f65f2b421fd6879916d8b22e8b6963681eae1d0aae5e10b9c8c21e7a71 SHA512 50c269c98cf2e6cb8e68e32894d3f499d12bbb208471ef05c29da97f5c6d1dc682813daef56d6e2635360ef1a9e80bade832bb0ac65cd6ca473c087278b73994
-DIST wayland-sys-0.31.4.crate 8571 BLAKE2B 4a29e3250be6e9058e6c8a50b7146b37a77addbf434a926bda422f269d353cc0b97d33b8dbe39ed88a626374ee2346ae04693df9aee1142f22a6035abbbcb1e6 SHA512 fc33c5364501aed5145c95b095955fc71599fb626d30a3e33b58750e67cff7d3a9a765124e5c45e436ac0fdfcd416c825a63af6fb6500627fe28fab14cc1401d
-DIST wayland-sys-0.31.5.crate 8630 BLAKE2B 82662fb5dfddb9650e4b6ec3031859d8840add7084c6d10a6e43e6aa5aa59c53c85124bb2e9858b430c5560b34b74d67f4259b24d7ebeaaae1fa92a7d72dbb96 SHA512 bf9237dbce8f55cb5176d2cab1769beff95f9a984eb607b5460673d69631b3346564024cc8f78f0af130cdd0f070d66518a903adf8d63bef8afa2aee06569715
-DIST web-sys-0.3.76.crate 635842 BLAKE2B ecd166e739e4ae4ebccc51fe0d429723ed7e4209bc9bd4658b5447486d7d58d8f2d2a6186e433e8ff11e7b52fe159d842a28de6251d61cd5f5876a92a7d945fe SHA512 370fb49edffd9ce125f77a9451389dd23ab5b70fd49263248d5794310ed757c28839a29436111df2fe6369ae8d6af56a64ac59af5258743cccfd9d18cd07dbd1
-DIST web-time-1.1.0.crate 18026 BLAKE2B cd72e384aca90c79e587448160587531c417f31a32e9ded23e6b78d492d0e517520170fd03177f28870c313b9302b28c32069a2408acccc076a1e4939a2c8f8d SHA512 73e4ef9851de089fde9381a595cb9e37a434f563f1fd350e345f2617b701caf57a9aef739b922b5b10cda131cdf2fd0af42c55603f8973a623a8b6ae70f6cc9f
-DIST webpage-2.0.1.crate 9760 BLAKE2B e29e6bbbd12e46cc2dc12ce6b5ce8fd838d6854b8aedb6720d7c86346d631a67adea1fd80a7b42ef6af2ac54d4d390d38dc563d0be5cf5709c3eb9d49e0bd4c9 SHA512 d76e7534ba775d1947c559c0bcada7a27a6b5dd5484c861abb0adb0abd393044cc7d6807d6191b692ebbfdf75cc3d47ff409b09c2830dc3435be9c62b3353269
-DIST which-6.0.3.crate 16937 BLAKE2B c4916ce80625b8b869cbf43844d689c62545964cb60f9741851393540a241d1d440dd64517949f3a64a4e9256584393fff84e3cea5f75773c9afd8b7ef580333 SHA512 82048af7dee4bd274f977530a19c2e2c86ac12936b7d814b2a86f13b2063e1a3d7092846d1ab66e3f653bf7ebbf5eae8bbce061a970c5ddb30b151234dd0593d
-DIST which-7.0.0.crate 18462 BLAKE2B 7464414a502b73bce88def7cfc256b0bb128273b2fef3e1ec1455af96a7e9257f16544d97c536858939f4208aa167ed5fadeca727585f4e0224afdfb6d12d23d SHA512 9f536f602a6a9e264cdfc5f08bde541b6458e8ecfb6ecdf673401a6976a3d9beda7d2d96e1445097d2098fca6a5ff17b8a67c0f1e3e823fe53701ed759ad5d46
-DIST widestring-1.1.0.crate 85046 BLAKE2B 591f8ba6c3c45721d342fd4668805c19915d500b2b46b8e1e75a485ebc772db187acec791205415e5cbf288ee70299a5813a3185d933443d426eb61d7fc6003f SHA512 a4feb959e19d5238e89b0973f040b26849f896e7e9fd567d0e74fbb4972958a4dd76e74de5ea8d407b74cff28f20f9c80446488da6abdbee38aa87a94d683435
-DIST wild-2.2.1.crate 8080 BLAKE2B 489a2a625aa8091fdef9f4d49747db7816d82c01384672bd12ff9e4c906f3418fa5a5fa8951b625f6d22a9c1977c523f1b54d7c4252c241413ef6f63d327cb29 SHA512 8f92b83cb2568fed7841ad372111138d9ea5806c21a0affaecc639f0556ab879ca42fe205fe3c1e55a1b5c1c4fb0b705a5566b06bad5c119a1d41df9c01ed2c9
-DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
-DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.9.crate 12464 BLAKE2B 7fb9dd803fc2608c4e5bc75674472992d82da364f24c22072d5624d6ae6abc44abd3e3ea3c45a7558e045331f3d87572b306b4ab5de52c07ff3706e7f13c2a38 SHA512 c46b893f67ec6e36499b00736bb6b9421e0e2611e76784afa6da01d7ebd033df82f1be7cf8d871d541125d290983f98f26f759488ba9aface49efce8edd682e9
-DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST windows-0.44.0.crate 11502336 BLAKE2B 4b0ea7db7cf38938edbbd7597b5f355a94ce1a39f58c9d51f280628b787b4f6da98fc6d14379b6cf6ce735e88704b0ee4b78b5e5f7ee90d3ba47fe58980f8e72 SHA512 846d870eafb43997bcc546eeb2859d1a53eb3a2e3b0a5bd21f33e9880a786fc6790912cc0eb0d121e18a8f80fc90b8670f022d18aca47b3407377a4bcccfbd2b
-DIST windows-0.52.0.crate 11843715 BLAKE2B 0d35225f5d61f71b0cb768f03825031101e05c83d7f12e05cb17b14ba28e6bc6a3d5aaee5ba07e54c1a773b6eadde4ce3523ab87e8e313e5578e2de01a3dcdc7 SHA512 8a9d443cfae3b44ab50bdffd70b70ea3b3d536f464e4beb7cfa9e15eb4e4505cbac20266b44d589bb7231790a87f473ead6d2160b8cd18d62f31b78bf61417da
-DIST windows-0.54.0.crate 11096265 BLAKE2B d9e2741577ef5a8cdd66ff0dc3de16d92b5005a43c4d521f9c9670ec15fdf0ef5f9656219695d80e2f9bc2ed51e31b5e3b867c484a00dae1a388b647f2eca6b9 SHA512 703d9de3d8624b9179e3b4aae24c8ba384c823d54e9f55133c9ae8bec8090019280674aa6c8e47872d91fb0f194c692ef5cbaff710714bddef12cf3fe98552db
-DIST windows-0.56.0.crate 10807828 BLAKE2B 8c4f9b1698852d375891e9e7728f899281be518fdf10353f7d1c1f3de12db706c10b97f64177765105fd25d2b0a13003a5da1722b2158a1ddfcb8ab7482314e7 SHA512 ad5a1cd4705e295fa3fbc63bd9661dde28b4bc718fed4ef7b12f33d233c364aadb790d7409988e0173548f1f1b1d6bfc3e6c5999a44613913d4b848027430333
-DIST windows-0.57.0.crate 9694564 BLAKE2B f506c91f909e82f0ba7653351bbd9b455a4a028cac24ed0cf7bedf07e3670f3b804391ef65fd21a8a66c554c1089c48244ff1e30530bbe40bb94ea240454778b SHA512 df59ddcb41a6a4e4598b06e66856bc7bc01162e0fd1f109fcfd24e1c6c835475241746fb6a9abe458cff55a7c524837ffc48c6a3e0fc0b4f5edb614cc1d1062c
-DIST windows-core-0.52.0.crate 42154 BLAKE2B 9670bf02261b4ab2a24eff97dad11e305deac823cacfae286965b62b11bc035f19a55ca710eaa4359c8a4905433a94fe62a836b77ddd68f244ad6ac2c9657f58 SHA512 0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36
-DIST windows-core-0.54.0.crate 44015 BLAKE2B 2ec7bdc09eef66ca4360dbe6b6c75548b91abc6cbc7272818108d3f37b97141bf4ee57e1b70cd33a5ee9d637be9f3674067ab26cdd204d97aa195e4f59b98935 SHA512 eb83e67ea04b7fc6cb33fa470e43683588a26c842f6949abd3b5ef26753dab3f8ce6924872a3dfae4b497f7980921027162c6d364a02430d3af7d2f63fa9f45f
-DIST windows-core-0.56.0.crate 45084 BLAKE2B 757a386d54b805de2f28979561536473d21e057f676d47d4b9068210cf0b3833956c65ddd5291d6852ad3c7af5a048c0d70896816678f11077b794cd8689b0bd SHA512 db6edbd14ef477d71a56869ac4d5eeeeef5a991a336c30c6da9960f1c9eca067c06f597dbc58f3e21c40cf19e2a28dc45ed09826c8fc17cdb57f35b0f3492793
-DIST windows-core-0.57.0.crate 53695 BLAKE2B b986279aacd34409286ab5761ed38cea9218a2c9b4c5463ba662033b08a167cb65870aae17273e7a0977315ff6a6ad7593011d559fe51d8d8ca157184a1b2542 SHA512 db7dcdfe0f464206b15fbd262539386f67102f2c54c1ff7fe2e6a2e2b28e8d5e4ee0312b787ea55632ecf83260552dc2ba0349933b2d5ada4527b95d196c62fa
-DIST windows-implement-0.56.0.crate 9157 BLAKE2B bde09ed367b9d31d5c392f78cf6d9d98afe343bde120b38ae412969e5fa9141ad3f478d05556d27b41a0feccfe1ddeccb9f7136defd14f12d07c22e719957518 SHA512 e472fce92d6eca17f75c075f87aa52c9b985febd83986ff811f0dc615f75cbe5fcaa13b2d2c96720211314549f0f76fabd2197119bbfd1b28d60823a889a5ef1
-DIST windows-implement-0.57.0.crate 10470 BLAKE2B 62bf0f37b73ba8d02dc316015deb7c47c9ef82e0d64cb7d1e624b320cabb37961a8ffe94132b97abafe1d1792bfd58b79d83b0ac3fb14e917f9ed6d9d5f7d362 SHA512 a78d37c8af8b163fb475f02ba667fdc6242bfd7b647061de2156aa94853ad793db112f0fb69549ed171119d654a4ccff0435c73664d5faaf3a32454054e1f12c
-DIST windows-interface-0.56.0.crate 9834 BLAKE2B d7cbec43c154ec5d8d91e02bbdad8bcc821537b303893244c819e2ace4b0d05d155d1b41fba8cc16566d5b2ad97da71177796f460e45367b53aa39d71e43ff65 SHA512 0ceb89df6d0a45281a5dd77c25efbd1bdb72f0965a4b6cc11f5f8249400297effb77e42a1ec2613fe7ce82a831559a5d1c8c6ebc45b419aa0aa96e84f01c8184
-DIST windows-interface-0.57.0.crate 10931 BLAKE2B deaaf2adfffff0c0ecaea0f43bfa772871e5f0894ddc6cd8a3bbf211c341bd04db653d4c164bb29a779665972d605439a3a79d5d8072ca78a3a228c1969c4fa9 SHA512 5c5814f81f819e9d220e8b16342f7ffc051cd920b466d8213144298e038b9c92e8ebea8e130c5357e5c6e9b04f1b1db125acedfac2d189658d12183f637248aa
-DIST windows-registry-0.2.0.crate 10470 BLAKE2B 65deb9af12935a537d3334c026b6a6430c9ba5d14152bcd5da03fe6732cc3df60567c8b6f61af844e2c202337eaf5ccdfc74abd498c126c3d9328666b727d61e SHA512 bc952f9cc8dfb90481a7d7951b8b08eb64e049cb99239a506319fa4ef332563b8064926218195b2062413671e35a13ba642bb3144bbf8436eca8c8fcbaaf7669
-DIST windows-result-0.1.2.crate 10601 BLAKE2B 75db56ada75b59fbc450ea39d73c7ea2ca05239c7a1973bbbcef2445f5fe009e32eb0b1df15ab8b44802cebdb71671ad5e741019beea2d49eb59c37534b63197 SHA512 435649961752a345aa3bf5234f88c87248768ce0ee099f6836e889406941069fbbbb17b4c6cea981fe0aa30bcb8839dba88731fbb023265a14b6232c03fcf7df
-DIST windows-result-0.2.0.crate 12756 BLAKE2B bd61fda1930933bfc9c55981b399c1f9d6d674b47ac194f413de8b4e69e476d9db7da2edd2990ce7918dd5ae28d42927bde1c8858a8f8dcab1ce9d5871d9e3dd SHA512 a8e52682e8b22f6a3d9b6fc759b69a7e1a093c777303b7fced725023b4e91dab4c5a07f8415222428e04fcaaffdc49d2b2738bac5f6a0db374cfc3ff9c540b55
-DIST windows-strings-0.1.0.crate 13832 BLAKE2B cf824e6587238df812470695dc623dbf8bed115f985ef62cda86f7a3836fca47fe0360b5bfcef81494617ad418588775673fbb8037746c75315ab6824bd3ac18 SHA512 f932d81985d7ad7598006e1271ebf2e7275b20a46cca421697f4a8517a2878264b6ece79dd684c6ecfecac0a61311d99137aa2d5c5944bc419a66749c4b99604
-DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
-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-sys-0.59.0.crate 2387323 BLAKE2B 3110c8cd2bc005f8c95cd038a8d574af648dc19788fe4485f977376f92e36b911b1a542d669a07ae9cd4ea72a884ab01ec78b8a2b5587456eb202452d1d8fa0d SHA512 d35e009e979633a1f3c8468cd038bd5c8c0381405165ce03497decd7d9edaaac485d704487e4a61d9aaf4e4d011b4248408912df6a0044d50e8457259867e061
-DIST windows-targets-0.42.2.crate 5492 BLAKE2B 42fc4a7d3e287fe2a70637e890304b49737776596f4a94a6d216668247092135e84322bd04caddd19c83b7700b0f27278e600ce8ed326957fabc21bffcae89b0 SHA512 84fbaffcad9a80beca77506aac26d0c5cb75aa0f21a5a70bcd3f6a16e71e8753ae00d3b89da9262c99756624163dcc0d6074fa9f99dfaae0dc098018209025f9
-DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709
-DIST windows-targets-0.52.6.crate 6403 BLAKE2B eb98d0a8daeed5fe76e7fa8edb2743e2a3e77dfb9c4ea68605a6ab10532cb7cfc43bc1cea0180869445bd940be762a40136500e26b84ca88b5e0c502004c7a4c SHA512 d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f
-DIST windows_aarch64_gnullvm-0.42.2.crate 364071 BLAKE2B 97c4e3b2a2dd3f936f9bfcdad23639c9c4c499eed220aec361d26d6013d798efa118e6b298f9cf841ac149d2ae5d58ca653731718450fcf2910bb5f6fa39159f SHA512 75cd7eb1def8ce9d0ff3d7468d2b1cc31cc76c08f981a2460c3d1eb09cff7100d7442863a3591621c1f5f3b3f4badf0b5c95285b6ed583e37283a8403f1095f1
-DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996
-DIST windows_aarch64_gnullvm-0.52.6.crate 435718 BLAKE2B 8b12ae02892cb69401329034bbca671d13bd268a112120b56b90504707cef89decfbd2560492844a9f0588fab62dc1476ab7e931126b939015d25a8cc91ca334 SHA512 f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5
-DIST windows_aarch64_msvc-0.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf
-DIST windows_aarch64_msvc-0.42.2.crate 666981 BLAKE2B 9f3cc5592cdede08bcdc1e7c455325279e3b763d96942695e10dccf1dfc37a81c749b69a7d6de883d4c0fa6e8a0d2f578fe2a8d6c42ad8ef6282590bf8fc87b7 SHA512 d2dafa8c94d01c1b65ca1bd631d31f2ef842f1db7accb132ff78c3f8483221b991afd3391563e03dcec42bbc9cbdc0ebdab47b991d25af85b5ba2ac1bbf8db63
-DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff
-DIST windows_aarch64_msvc-0.52.6.crate 832615 BLAKE2B adc8ff61b6dc96d39c92c7d4221ae6aa0575edfc016cfcd046067ca5d8fcfd56d10e8e227be1c038ce34684be22c7ccaf5f18cd5a7638d28fbff4ba15b48b90b SHA512 a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b
-DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5
-DIST windows_i686_gnu-0.42.2.crate 736236 BLAKE2B 4ef0496462afc73d9d72af7e5da1e6d3506a92f8172930e88ae64ab97596ffd31c4f97fb969e9b677e30159c27f00a8e756deb006b630fb98ce83f03c8b762e2 SHA512 ad09d650a05cb91cb6b40f59025c023a4c286bc1194586697c506016df2b9b0d5b02606b81687bc634795a0d9a9b8a73e486599328ae09c853e8e5ba662fc59c
-DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a
-DIST windows_i686_gnu-0.52.6.crate 880402 BLAKE2B 5aab8ee07132eccb7695807eb44811beeb0657aadfb672c54e99b6ae39c067ba9b93e38fc69bb5b9b14a9759f263ccd5e301597d2727d83b31b49a409b6bd405 SHA512 a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822
-DIST windows_i686_gnullvm-0.52.6.crate 475940 BLAKE2B fec4fda8bb2bf319a501a22372fa642ae682e4dee3235b258a028190ee73220bfc55b3142f06249bb4579b17e5fde662bb2b121aefe18544653350d7d0fe7d8e SHA512 95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f
-DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
-DIST windows_i686_msvc-0.42.2.crate 724951 BLAKE2B b084286cd4927efd2889b149abf8a9fe9d3d777130db9e592982660dbf9a96a0f5e723ca121465787aa11877d2d29a5a7d7cf066cdc8fa7e90d7ca7dcb7677f1 SHA512 c1706fc36d4b157c020744a11b3eb5d7dfbf05a0b56775bc717e94b7fd725816b20154fdbcd69ac08dbfb8b8bbfa74fab72d7a9c10399aad6a1cc54cf597e804
-DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e
-DIST windows_i686_msvc-0.52.6.crate 901163 BLAKE2B 99ed34e052db5ba77bab240ed5d38ce450be347a794d63ec39b719304c32722c9999b540ab40abe0216318900b7412970df99dfb36d1516a9517cae0c77d1bdc SHA512 ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96
-DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
-DIST windows_x86_64_gnu-0.42.2.crate 699373 BLAKE2B 01c70809d564b16b268656e47295e99c992d8f9839fac8a51338a0e7c3b9cdcd0429c456ca8c1c139a8c687ed7ed6c43a82250889d881aadaa65bd037223e0a6 SHA512 5767af3c86e717f93137a89d442230e6b60a649057edb3ab104b1f82c0bcd64fe089dcdf2f4fd486a799bece1ddb5f0449641536b678211945e749ae24f35c1f
-DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
-DIST windows_x86_64_gnu-0.52.6.crate 836363 BLAKE2B e2335829155cdbd4a55cc9f9babc237e14e32aab97f6f91afabcdf80d2aee37d6fb4b8669aaf433ff532c85dba59b3d366c7d41b61a2f29b96f960169c900687 SHA512 c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb
-DIST windows_x86_64_gnullvm-0.42.2.crate 364068 BLAKE2B 64bc53e98eb3fc649c9b43a6e734de4e65088e41edacabd49f7afcc5dc6e1065c563ecfc682747dda05978dea2dba4f45c16fcc18c3b00684c3d93681e5a7deb SHA512 d39a8bc948110fe612d3f8d6628b3f0d56620df11d8a49e0fabb6c90389ad407582b3af10e4eab46c79b3d11d2e10753d73d9e55963fbeac085f41e9749bdba3
-DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
-DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd
-DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
-DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788
-DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
-DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
-DIST winnow-0.5.40.crate 159316 BLAKE2B aae5076d59b3459c901d918d8aaa97ba8bfcc993b8484344f52e45f1f37deb96d6cd3a1663a67f3c367be2b05d633286f270274c621bda9f3ab72b98bb652cc2 SHA512 525156f08514b0110697360be6e331a68d08f0cb65ee4ba3ac9d101dd2d42a8c89601e7409bdb5652c5b05145626506651010f58a854c47712065334c61ff39c
-DIST winnow-0.6.18.crate 163357 BLAKE2B 7a43eba294c43b187211c6eabc449775081f44405045ec4786c5f10290639e18d002e872f9db14caa94e26fd99079c7ce2f99e70dcb20d842c0886ac203d8ca8 SHA512 3a146d9dc8fe3fcc855f7766852cd69c49a28f9048d553d3952d7722d49216cb44652d98b15ae1ddee99b2bbc3caefb107a9b85c309242dac943deeca65a81dc
-DIST winnow-0.6.20.crate 163617 BLAKE2B b47ba6cd94ec80a72b51ad09c5cb9de350d2243295d3997732d5d3d9f8d08bd83e3129150fb24992243949120da1bd6091d580db5ff10258fd745afaa944c791 SHA512 3347fdfb5b15ec73a40614ecd0cce60f41d3f2d083f49aaafceeaf5db52d5c677dc3eb39fcc2595999fc9f864d1fde81e180e09dc86a6f6124878e16e86e8bc8
-DIST winreg-0.52.0.crate 30148 BLAKE2B 7b458d356ed1385b23ace88d8a7e2a4e2e3211ba4bd22e6488b60fe508ab2b5f6d93c7547e45e0564f512391a8fbc2af1bbd3e3e3a773865d87adff67b5b2fb5 SHA512 50659afe4fa9671696bb5c6a50d62e493ef5359a324a71f7877e2ff0b522560ad65196ac6d2f7f4117edb2e47e84adce7d1de5ed2ce273f132cb2d5006472e25
-DIST winresource-0.1.17.crate 94561 BLAKE2B 153968ab26cbc5f0de8de4bab0f94f0096d24038145988b9f9d421c2e170307dfb9da59e4dd0a73e519c8cf38934a89ccdb2792f765b9adf9a7bf99de5ff961a SHA512 e0fad3351939bc1734490ee11f25014a831110d810e83faf815e6ab2bfdb9a1317e0a0e486f19c3607e20b4cfd9e09e5a9f2941080c61a37b61ec74d7fb837d8
-DIST winresource-0.1.19.crate 75529 BLAKE2B ee8d01eea5248fd0d234f2d62a503d44d1b00094d117217e1924615aa846ab04aee294b18ce660d5590860d6b6cc96b50ec1c1b35dabaeb7b15fe275d41b1e96 SHA512 0bd39c28a18d22a71dc482a33e054934d394a9b2bef8eceb87847eeb133800c21b3551dc404f842ff3b3cfb53654cb8862a359889ad6c43767b1be0dac45ca29
-DIST winsafe-0.0.19.crate 492820 BLAKE2B 4eba26861f85f668e134b08c60e9522b698aed61eaa5e6d4e89ef31c1b97953fa08a5157add52d9a306075df4ad97e9aaf1767eea4208b72401ec0bc1c3eb0e9 SHA512 0555ec74c5acbb69ab08e54d920094e806258079bffaff3f90297bb94a000c7da36d6eba0eae445d425c781465235dd70a198437cf83a1f113438bfd9baf4c21
-DIST wl-clipboard-rs-0.8.1.crate 32835 BLAKE2B 3b542e5f7fba1ce659d94a682ec3b46ff9def98ac34563b7e3021987c6792e993b1f2f96421a58293270a68d10e64b57d856648a3ee796f7ff16e0621d8c3d9e SHA512 3113f079064eb0a23b3c8d02561b2d7ca0111b0c02e3f45819dcd4feac8342004860d8e936cb0bde9dcaaff897a2531213d3e4ed7b28731592a9bcffd7574fab
-DIST write16-1.0.0.crate 7218 BLAKE2B 548796314339463e4b71f8af3d344e45dc89480e103180b6d56c90fcb816ad1a37ab2ba20766c4b9754f2cc686752eb1f3a5a12ec1ed4369a9cef749ad4f3e97 SHA512 655a207b8082bb88e462f992ecb4833cef9d590da06d6356b41d109df2862b49ee5705189c78a607b549e7343035119d158020d58fcad49608e51659357a83c1
-DIST writeable-0.5.5.crate 22354 BLAKE2B e4ff9862c070b413568ce0c75d1eccafcf1db8578eee4795ea9046dadd643f8a77258b437be288b93af247199d63455298ac2cff909226bc432f91c0aa863921 SHA512 818b2546c8ec25816aeaf5e31a1ded927d197bf7256e7c5073738c2709bc58a95d382a0256eb38a99235ae83729b578701261866d42ea3357a26024906e196c1
-DIST wyz-0.5.1.crate 18790 BLAKE2B 07ac1435a812d2f50309348ef8378ea4955c001f01edaf2ffab108f7d524ee731f06b22fd42c043349a4a2271ec47ea203e89562076e8c7c1719112b0214c89a SHA512 15d86c167145c90e3fbabcefd11754fb1cb835896e32d1bb7f4b027e5b2092f5fdbdca4062c129bc38e655cb87c6a3f4e181747ee25d89db5e01fb1fcac18fe9
-DIST x11rb-0.13.1.crate 223916 BLAKE2B 1663b0d4eb059924f9c2dbfa2fff01ee9c7a90bb6652d6e6a1519676e36ef7cca5fd079e39f45137350f595bca592ae9098b93877cdad9540131063379fad2ed SHA512 652f499857aff45053e2ffe1a2e3463323bcf3cf546482dcef4d2805e90a898a12f647da9181fcf02d7234bebdfc424f8a4e0e256dfd49aba4b643284308404f
-DIST x11rb-protocol-0.13.1.crate 508522 BLAKE2B abd88b4175e2fadebc44f232262b71261fac9b1289ee749d31fbd4a9d9c8ff426ccf9edef8eced4b41e4fba3401cd81d109fbf8aef1c99b4529f57910d000a8d SHA512 5c1a40fcbc77aa6e3357ac64af37958ac54aa3a78af354c1ea5f8e8b28f352c6e5d8b4762d8c4eb93fa8a1a122184b89c9b1c95a53d35b08819654dbd4cc4db0
-DIST xattr-1.3.1.crate 12580 BLAKE2B 25c414d761a7fcd23bbe057add62c6da971cf33149066aa024320ab80e0ec8e8e8d5d3d0506e8de954b8f8c178d34c52a00a5fa9aa109510678098a3e3564b7f SHA512 4047abda42b949cf58f820e15ee99850de483857bbaaef737eeee48e1a2132972470f15bb2ddda56438f6a934918be96607a8de518a5a3dcec7c8ee6c00ad280
-DIST xml5ever-0.18.1.crate 40190 BLAKE2B e8ec128f4a3593c74ab6004922aeaab47be88338c445315b83f2e77f32a5a8a391b3081aef9012d201b6d304bdc6ca8a5496ace1d7cebb7eee840f67a4007433 SHA512 e577ea667e782df0280919e9fe970e5f1808aa58db8aed6fc814cae22a7b9d74caa95fc5326e28e6d7a946c33991fccc61e9a7b6ff9f3d6bc5b4a2140b2c41ca
-DIST xxhash-rust-0.8.12.crate 21329 BLAKE2B e9596bb83cd0f0465c279deecaf4dd87aac05db1c8c7d3aed4f0689022c5a0522d976379fb3dcf6cfe1c18452c87890e95f3d17998c777d92f5cbe58119a20a9 SHA512 6fd17ec65be94b58f109b6aa9bb283e51092621e8af624f8c2c2c95558a3d0461d743cb8a65a0da5853ff7fd98273daec0dcc5b632440868524f99894beeff3d
-DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
-DIST yansi-1.0.1.crate 75497 BLAKE2B c0d396c93a733ed6ec12aca3385d816f39b1f1fbed75da460f491f0cbfc30ba462842ebd1627fa8e5d2b7c0f37913a23747e5f5e23df1cb7c85d965e6c37159b SHA512 182c8c6c60a30a727d8f8b90bbf0527d91fa8ae9d8eb20e5414614b43ee6dc532f4b19241adbfb9299cb0004b39fe627036269b60b0c3860d9e1ea4413aca541
-DIST yoke-0.7.5.crate 29673 BLAKE2B cd2e42103140e080a29bf579fe5176b36a192f9b1309c1f2fd7557fe93b2f6eadbf6fca4a6a3b1a7b6288403d2f643841dfc7a5b6a4476776943950abe5c1613 SHA512 6bbd99671d1a5a5217890eaa267113d193b3636b265393afb6e72a313f01704d462fe017264f061405e8e84c188b590094c29e3fcf19a63c375ae165d1a0bbef
-DIST yoke-derive-0.7.5.crate 7525 BLAKE2B 9b6b97eaf3c50f0f5ce8cebf685a1a17d4c21eb9b26d38eac99e0a4c0f9d592e95a7843b7a0b897945a14c4eb78ffdf2c0972b448d31d7bc7b077f27aad81d9a SHA512 e30b06b020aa283080905004295fb643c539b130d0d53bda51927b95e79ba562336aad30d8a6202d9a0c62d5b64559a01218c6f02f3faada6003d4b03c205cd6
-DIST zerocopy-0.7.35.crate 152645 BLAKE2B 8f13123c9d9257ac5a5c6954d38c3510fa658624442f7e03cdcc6db5a0977d9f26bb4e277be172b7872ec365cf6e58ac742e5578636f7698f9f37093e9249d9a SHA512 17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c
-DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb
-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
-DIST zip-0.6.6.crate 65789 BLAKE2B acefc076297468d72cb20d8c6234fe5406875056fbf78fc0eac3ac430af78f320ed839f8683bd96fa1a03c457d6ac568d42bd703a902bc37bd126791d8b4c709 SHA512 affd46c17ceaa0545a155250dfd16756f8706dda43bae8a322ec0481dbfb41e4cf3166bf9662fc139ef9d0ab3b0f9f158535b21d2a61b21d38b8b2407813eeef
-DIST zip-2.2.1.crate 107205 BLAKE2B 7685d4cf3d8d644a4f6f395f9c0a6be1db8d0b3a6d30ca9edcb7663b66587f29293741b4cf4352690798727806978bc30eee1a432d83cb054d209088ce1d0bbb SHA512 2e38cfa4298fac678f3654c5c23c9807630778e4a95a294c3b936d9222638c95f189e829c363f0a7f873afd84f9cae37858e9eb7547d4985070f01a2e0e3940a
-DIST zopfli-0.8.1.crate 50972 BLAKE2B 27cde48858dc65ec8082d4e0d81e2758f92d3dcc7a1c1f08aa6448e99f2995a865ac3259353b26e787f108c2f88ce3c7610413ea9d3daae6f864900d74565de6 SHA512 799e25c0cc9f0bf2119a7c03225b11ed94e7c3ac83f872a27da8ae15c90206245121c38f5e2b78fece131f5bb428f01fabbfd1b1e18ea456957940042d38f38d
-DIST zstd-0.13.2.crate 30251 BLAKE2B 7a13a094791b13b9215cce3aae5f99b86dc76ff271324a67170747f56b97df514762a0c097e6376752d2a5b35f9ef03d76e0c362e34e15ca02fa3644cc933131 SHA512 9cc3584f74da6da6920b74a7125b4eee9133ae00776aff3c77404fb438e05831f654fce46f7ebab442b04f20f84c11ca58f7ebfe7ff506833c38e919ee3f8572
-DIST zstd-safe-7.2.1.crate 21122 BLAKE2B 49df1ae857449393e6a09293b8963702fecb375622a5cda96d51c3ae96b67044aa40dbc043b96a16ea3b66dac47287dc58007a825c025c3d9b7aac31b441ab9a SHA512 95d0a1d4bb307f64de40f4bad5b400e5a592c901e133a88d8344c46ba3dd51465a8284fa2e3aca74f531c21e7bc3eead112f3797abaea7e439e3f407401b947b
-DIST zstd-sys-2.0.13+zstd.1.5.6.crate 749090 BLAKE2B b5714217ca68255d0881adcaf282a6309de322c481fe4cf8c10d9b68748008a9ca0287e8323f5a118d3b052b7dfb257182555718599da843e09068a1e8df8c5f SHA512 c1f0176ebd0914879d0060796776c7fe376293ce9bc9f8f07ee3b809932a75aa033881d59a1bc99b6cd9af85b8e225fc09bcfc96013e556d7c11f155b759ecbf
diff --git a/app-shells/nushell/nushell-0.100.0.ebuild b/app-shells/nushell/nushell-0.100.0.ebuild
index 3466d8a5dc79..d6b651cc7225 100644
--- a/app-shells/nushell/nushell-0.100.0.ebuild
+++ b/app-shells/nushell/nushell-0.100.0.ebuild
@@ -1,694 +1,9 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-CRATES="
-	addr2line@0.22.0
-	adler2@2.0.0
-	adler32@1.2.0
-	adler@1.0.2
-	ahash@0.7.8
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	alloc-no-stdlib@2.0.4
-	alloc-stdlib@0.2.2
-	alloca@0.4.0
-	allocator-api2@0.2.18
-	alphanumeric-sort@1.5.3
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	ansi-str@0.8.0
-	ansitok@0.2.0
-	anstream@0.6.15
-	anstyle-parse@0.2.5
-	anstyle-query@1.1.1
-	anstyle-wincon@3.0.4
-	anstyle@1.0.8
-	anyhow@1.0.86
-	arboard@3.4.0
-	argminmax@0.6.2
-	array-init-cursor@0.2.0
-	arrayvec@0.5.2
-	arrayvec@0.7.6
-	assert-json-diff@2.0.2
-	assert_cmd@2.0.16
-	async-stream-impl@0.3.5
-	async-stream@0.3.5
-	async-trait@0.1.81
-	atoi@2.0.0
-	atoi_simd@0.15.6
-	atomic-waker@1.1.2
-	autocfg@1.3.0
-	avro-schema@0.3.0
-	backtrace-ext@0.2.1
-	backtrace@0.3.73
-	base64@0.21.7
-	base64@0.22.1
-	bindgen@0.69.4
-	bit-set@0.8.0
-	bit-vec@0.8.0
-	bitflags@1.3.2
-	bitflags@2.6.0
-	bitvec@1.0.1
-	block-buffer@0.10.4
-	block2@0.5.1
-	borsh-derive@1.5.1
-	borsh@1.5.1
-	bracoxide@0.1.4
-	brotli-decompressor@4.0.1
-	brotli@6.0.0
-	bstr@1.10.0
-	bumpalo@3.16.0
-	byte-unit@5.1.4
-	bytecheck@0.6.12
-	bytecheck_derive@0.6.12
-	bytecount@0.6.8
-	bytemuck@1.17.0
-	bytemuck_derive@1.7.1
-	byteorder@1.5.0
-	bytes@1.8.0
-	bytesize@1.3.0
-	calamine@0.24.0
-	cassowary@0.3.0
-	castaway@0.2.3
-	cc@1.1.14
-	cexpr@0.6.0
-	cfg-if@1.0.0
-	cfg_aliases@0.1.1
-	cfg_aliases@0.2.1
-	chardetng@0.1.17
-	charset@0.1.5
-	chrono-humanize@0.2.3
-	chrono-tz-build@0.2.1
-	chrono-tz-build@0.4.0
-	chrono-tz@0.10.0
-	chrono-tz@0.8.6
-	chrono@0.4.38
-	chumsky@0.9.3
-	clang-sys@1.8.1
-	clap@4.5.16
-	clap_builder@4.5.15
-	clap_derive@4.5.13
-	clap_lex@0.7.2
-	clipboard-win@5.4.0
-	codepage@0.1.2
-	colorchoice@1.0.2
-	colorz@1.1.2
-	comfy-table@7.1.1
-	compact_str@0.7.1
-	compact_str@0.8.0
-	console@0.15.8
-	const-random-macro@0.1.16
-	const-random@0.1.18
-	const_format@0.2.32
-	const_format_proc_macros@0.2.32
-	core-foundation-sys@0.8.7
-	core-foundation@0.9.4
-	cpufeatures@0.2.13
-	crc-catalog@1.1.1
-	crc32fast@1.4.2
-	crc@2.1.0
-	crossbeam-channel@0.5.13
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-queue@0.3.11
-	crossbeam-utils@0.8.20
-	crossterm@0.27.0
-	crossterm@0.28.1
-	crossterm_winapi@0.9.1
-	crunchy@0.2.2
-	crypto-common@0.1.6
-	cssparser-macros@0.6.1
-	cssparser@0.34.0
-	csv-core@0.1.11
-	csv@1.3.0
-	ctrlc@3.4.5
-	curl-sys@0.4.74+curl-8.9.0
-	curl@0.4.46
-	data-encoding@2.6.0
-	deranged@0.3.11
-	derive-new@0.6.0
-	derive_more@0.99.18
-	dialoguer@0.11.0
-	diff@0.1.13
-	difflib@0.4.0
-	digest@0.10.7
-	dirs-sys@0.4.1
-	dirs@5.0.1
-	dlib@0.5.2
-	dlv-list@0.5.2
-	doc-comment@0.3.3
-	doctest-file@1.0.0
-	downcast-rs@1.2.1
-	dtoa-short@0.3.5
-	dtoa@1.0.9
-	dtparse@2.0.1
-	dunce@1.0.5
-	dyn-clone@1.0.17
-	ego-tree@0.9.0
-	either@1.13.0
-	eml-parser@0.1.4
-	encode_unicode@0.3.6
-	encoding_rs@0.8.34
-	enum_dispatch@0.3.13
-	env_filter@0.1.2
-	env_logger@0.11.5
-	env_logger@0.8.4
-	equivalent@1.0.1
-	erased-serde@0.4.5
-	errno@0.3.9
-	error-code@3.2.0
-	ethnum@1.5.0
-	fallible-iterator@0.3.0
-	fallible-streaming-iterator@0.1.9
-	fancy-regex@0.14.0
-	fast-float@0.2.0
-	fastrand@2.1.1
-	fd-lock@4.0.2
-	file-id@0.2.1
-	filesize@0.2.0
-	filetime@0.2.24
-	fixedbitset@0.4.2
-	flate2@1.0.32
-	float-cmp@0.9.0
-	fnv@1.0.7
-	foreign-types-shared@0.1.1
-	foreign-types@0.3.2
-	form_urlencoded@1.2.1
-	fs_extra@1.3.0
-	fsevent-sys@4.1.0
-	funty@2.0.0
-	futf@0.1.5
-	futures-channel@0.3.30
-	futures-core@0.3.30
-	futures-executor@0.3.30
-	futures-io@0.3.30
-	futures-macro@0.3.30
-	futures-sink@0.3.30
-	futures-task@0.3.30
-	futures-util@0.3.30
-	futures@0.3.30
-	fuzzy-matcher@0.3.7
-	fxhash@0.2.1
-	generic-array@0.14.7
-	gethostname@0.4.3
-	getrandom@0.2.15
-	gimli@0.29.0
-	git2@0.19.0
-	gjson@0.8.1
-	glob-match@0.2.1
-	glob@0.3.1
-	goblin@0.7.1
-	h2@0.4.6
-	halfbrown@0.2.5
-	hash32@0.3.1
-	hashbrown@0.12.3
-	hashbrown@0.14.5
-	hashbrown@0.15.0
-	hashlink@0.9.1
-	heapless@0.8.0
-	heck@0.5.0
-	hermit-abi@0.3.9
-	hermit-abi@0.4.0
-	hex@0.4.3
-	home@0.5.9
-	html5ever@0.27.0
-	html5ever@0.29.0
-	http-body-util@0.1.2
-	http-body@1.0.1
-	http@1.1.0
-	httparse@1.9.4
-	httpdate@1.0.3
-	human-date-parser@0.2.0
-	humantime@2.1.0
-	hyper-util@0.1.7
-	hyper@1.4.1
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.60
-	ical@0.11.0
-	idna@0.5.0
-	indexmap@2.6.0
-	indicatif@0.17.8
-	inotify-sys@0.1.5
-	inotify@0.9.6
-	instant@0.1.13
-	interprocess@2.2.1
-	inventory@0.3.15
-	is-docker@0.2.0
-	is-terminal@0.4.13
-	is-wsl@0.4.0
-	is_ci@1.2.0
-	is_debug@1.0.1
-	is_executable@1.0.1
-	is_terminal_polyfill@1.70.1
-	itertools@0.11.0
-	itertools@0.12.1
-	itertools@0.13.0
-	itoa@1.0.11
-	itoap@1.0.1
-	jobserver@0.1.32
-	joinery@2.1.0
-	js-sys@0.3.70
-	jsonpath_lib_polars_vendor@0.0.1
-	kqueue-sys@1.0.4
-	kqueue@1.0.8
-	lazy_static@1.5.0
-	lazycell@1.3.0
-	lexical-core@0.8.5
-	lexical-parse-float@0.8.5
-	lexical-parse-integer@0.8.6
-	lexical-util@0.8.5
-	lexical-write-float@0.8.5
-	lexical-write-integer@0.8.5
-	libc@0.2.158
-	libflate@1.4.0
-	libflate_lz77@1.2.0
-	libgit2-sys@0.17.0+1.8.1
-	libloading@0.8.5
-	libm@0.2.8
-	libmimalloc-sys@0.1.39
-	libproc@0.14.8
-	libredox@0.1.3
-	libsqlite3-sys@0.28.0
-	libssh2-sys@0.3.0
-	libz-sys@1.1.19
-	linked-hash-map@0.5.6
-	linux-raw-sys@0.4.14
-	lock_api@0.4.12
-	log@0.4.22
-	lru@0.12.4
-	lscolors@0.17.0
-	lsp-server@0.7.6
-	lsp-types@0.95.1
-	lz4-sys@1.10.0
-	lz4@1.26.0
-	mac@0.1.1
-	mach2@0.4.2
-	markup5ever@0.12.1
-	markup5ever@0.14.0
-	markup5ever_rcdom@0.3.0
-	md-5@0.10.6
-	memchr@2.7.4
-	memmap2@0.7.1
-	miette-derive@7.2.0
-	miette@7.2.0
-	mimalloc@0.1.43
-	mime@0.3.17
-	mime_guess@2.0.5
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.4
-	miniz_oxide@0.8.0
-	mio@0.8.11
-	mio@1.0.2
-	mockito@1.5.0
-	multipart-rs@0.1.11
-	multiversion-macros@0.7.4
-	multiversion@0.7.4
-	native-tls@0.2.12
-	new_debug_unreachable@1.0.6
-	nix@0.28.0
-	nix@0.29.0
-	nom@7.1.3
-	notify-debouncer-full@0.3.2
-	notify@6.1.1
-	now@0.1.3
-	ntapi@0.4.1
-	nu-ansi-term@0.50.1
-	num-bigint@0.4.6
-	num-complex@0.4.6
-	num-conv@0.1.0
-	num-format@0.4.4
-	num-integer@0.1.46
-	num-iter@0.1.45
-	num-rational@0.4.2
-	num-traits@0.2.19
-	num@0.4.3
-	num_threads@0.1.7
-	number_prefix@0.4.0
-	objc-sys@0.3.5
-	objc2-app-kit@0.2.2
-	objc2-core-data@0.2.2
-	objc2-core-image@0.2.2
-	objc2-encode@4.0.3
-	objc2-foundation@0.2.2
-	objc2-metal@0.2.2
-	objc2-quartz-core@0.2.2
-	objc2@0.5.2
-	object@0.36.3
-	oem_cp@2.0.0
-	omnipath@0.1.6
-	once_cell@1.20.1
-	open@5.3.0
-	openssl-macros@0.1.1
-	openssl-probe@0.1.5
-	openssl-src@300.3.1+3.3.1
-	openssl-sys@0.9.103
-	openssl@0.10.66
-	option-ext@0.2.0
-	ordered-multimap@0.7.3
-	os_display@0.1.3
-	os_pipe@1.2.1
-	owo-colors@4.0.0
-	papergrid@0.12.0
-	parking_lot@0.12.3
-	parking_lot_core@0.9.10
-	parquet-format-safe@0.2.4
-	parse-zoneinfo@0.3.1
-	paste@1.0.15
-	pathdiff@0.2.1
-	percent-encoding@2.3.1
-	peresil@0.3.0
-	pest@2.7.11
-	pest_derive@2.7.11
-	pest_generator@2.7.11
-	pest_meta@2.7.11
-	petgraph@0.6.5
-	phf@0.11.2
-	phf_codegen@0.11.2
-	phf_generator@0.10.0
-	phf_generator@0.11.2
-	phf_macros@0.11.2
-	phf_shared@0.10.0
-	phf_shared@0.11.2
-	pin-project-lite@0.2.14
-	pin-utils@0.1.0
-	pkg-config@0.3.30
-	plain@0.2.3
-	planus@0.3.1
-	platform-info@2.0.3
-	plist@1.7.0
-	polars-arrow-format@0.1.0
-	polars-arrow@0.43.1
-	polars-compute@0.43.1
-	polars-core@0.43.1
-	polars-error@0.43.1
-	polars-expr@0.43.1
-	polars-io@0.43.1
-	polars-json@0.43.1
-	polars-lazy@0.43.1
-	polars-mem-engine@0.43.1
-	polars-ops@0.43.1
-	polars-parquet@0.43.1
-	polars-pipe@0.43.1
-	polars-plan@0.43.1
-	polars-row@0.43.1
-	polars-schema@0.43.1
-	polars-sql@0.43.1
-	polars-time@0.43.1
-	polars-utils@0.43.1
-	polars@0.43.1
-	pori@0.0.0
-	portable-atomic@1.7.0
-	powerfmt@0.2.0
-	ppv-lite86@0.2.20
-	precomputed-hash@0.1.1
-	predicates-core@1.0.8
-	predicates-tree@1.0.11
-	predicates@3.1.2
-	pretty_assertions@1.4.0
-	print-positions@0.6.1
-	proc-macro-crate@3.1.0
-	proc-macro-error-attr@1.0.4
-	proc-macro-error@1.0.4
-	proc-macro2@1.0.86
-	procfs-core@0.16.0
-	procfs@0.16.0
-	psm@0.1.21
-	ptr_meta@0.1.4
-	ptr_meta_derive@0.1.4
-	pure-rust-locales@0.8.1
-	pwd@1.4.0
-	quick-error@1.2.3
-	quick-error@2.0.1
-	quick-xml@0.31.0
-	quick-xml@0.32.0
-	quick-xml@0.34.0
-	quickcheck@1.0.3
-	quickcheck_macros@1.0.0
-	quote@1.0.37
-	quoted_printable@0.5.1
-	radium@0.7.0
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rand_distr@0.4.3
-	ratatui@0.26.3
-	raw-cpuid@11.1.0
-	rayon-core@1.12.1
-	rayon@1.10.0
-	recursive-proc-macro-impl@0.1.1
-	recursive@0.1.1
-	recvmsg@1.0.0
-	redox_syscall@0.5.3
-	redox_users@0.4.6
-	reedline@0.37.0
-	ref-cast-impl@1.0.23
-	ref-cast@1.0.23
-	regex-automata@0.4.7
-	regex-syntax@0.8.4
-	regex@1.10.6
-	relative-path@1.9.3
-	rend@0.4.2
-	rfc2047-decoder@1.0.5
-	rkyv@0.7.45
-	rkyv_derive@0.7.45
-	rle-decode-fast@1.0.3
-	rmp-serde@1.3.0
-	rmp@0.8.14
-	ropey@1.6.1
-	roxmltree@0.19.0
-	rstest@0.18.2
-	rstest_macros@0.18.2
-	rusqlite@0.31.0
-	rust-embed-impl@8.5.0
-	rust-embed-utils@8.5.0
-	rust-embed@8.5.0
-	rust-ini@0.21.1
-	rust_decimal@1.36.0
-	rustc-demangle@0.1.24
-	rustc-hash@1.1.0
-	rustc_version@0.4.0
-	rustix@0.38.37
-	rustversion@1.0.17
-	ryu@1.0.18
-	same-file@1.0.6
-	scc@2.1.16
-	schannel@0.1.23
-	scoped-tls@1.0.1
-	scopeguard@1.2.0
-	scraper@0.21.0
-	scroll@0.11.0
-	scroll_derive@0.11.1
-	sdd@3.0.2
-	seahash@4.1.0
-	security-framework-sys@2.11.1
-	security-framework@2.11.1
-	selectors@0.26.0
-	semver@1.0.23
-	serde@1.0.208
-	serde_derive@1.0.208
-	serde_json@1.0.127
-	serde_repr@0.1.19
-	serde_spanned@0.6.7
-	serde_urlencoded@0.7.1
-	serde_yaml@0.9.34+deprecated
-	serial_test@3.1.1
-	serial_test_derive@3.1.1
-	servo_arc@0.4.0
-	sha2@0.10.8
-	shadow-rs@0.35.0
-	shell-words@1.1.0
-	shlex@1.3.0
-	signal-hook-mio@0.2.4
-	signal-hook-registry@1.4.2
-	signal-hook@0.3.17
-	simd-json@0.13.10
-	simdutf8@0.1.4
-	similar@2.6.0
-	simplelog@0.12.2
-	siphasher@0.3.11
-	slab@0.4.9
-	smallvec@1.13.2
-	smawk@0.3.2
-	snap@1.1.1
-	socket2@0.5.7
-	sqlparser@0.49.0
-	stability@0.2.1
-	stable_deref_trait@1.2.0
-	stacker@0.1.16
-	static_assertions@1.1.0
-	str_indices@0.4.3
-	streaming-decompression@0.1.2
-	streaming-iterator@0.1.9
-	strength_reduce@0.2.4
-	string_cache@0.8.7
-	string_cache_codegen@0.5.2
-	strip-ansi-escapes@0.2.0
-	strsim@0.11.1
-	strum@0.26.3
-	strum_macros@0.26.4
-	supports-color@2.1.0
-	supports-color@3.0.0
-	supports-hyperlinks@3.0.0
-	supports-unicode@3.0.0
-	sxd-document@0.3.2
-	sxd-xpath@0.4.2
-	syn@1.0.109
-	syn@2.0.75
-	syn_derive@0.1.8
-	sys-locale@0.3.1
-	sysinfo@0.31.4
-	sysinfo@0.32.0
-	tabled@0.16.0
-	tango-bench@0.6.0
-	tap@1.0.1
-	target-features@0.1.6
-	tempfile@3.13.0
-	tendril@0.4.3
-	termcolor@1.4.1
-	terminal_size@0.3.0
-	termtree@0.4.1
-	textwrap@0.16.1
-	thiserror-impl@1.0.63
-	thiserror@1.0.63
-	thread_local@1.1.8
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tiny-keccak@2.0.2
-	tinyvec@1.8.0
-	tinyvec_macros@0.1.1
-	titlecase@2.2.1
-	tokio-util@0.7.11
-	tokio@1.39.3
-	toml@0.7.8
-	toml@0.8.19
-	toml_datetime@0.6.8
-	toml_edit@0.19.15
-	toml_edit@0.21.1
-	toml_edit@0.22.20
-	tracing-core@0.1.32
-	tracing@0.1.40
-	trash@5.2.0
-	tree_magic_mini@3.1.5
-	trim-in-place@0.1.7
-	typed-arena@1.7.0
-	typeid@1.0.2
-	typenum@1.17.0
-	typetag-impl@0.2.18
-	typetag@0.2.18
-	ucd-trie@0.1.6
-	umask@2.1.0
-	unicase@2.8.0
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-linebreak@0.1.5
-	unicode-normalization@0.1.23
-	unicode-reverse@1.0.9
-	unicode-segmentation@1.12.0
-	unicode-truncate@1.1.0
-	unicode-width@0.1.11
-	unicode-xid@0.2.5
-	unsafe-libyaml@0.2.11
-	ureq@2.10.1
-	url@2.5.2
-	urlencoding@2.1.3
-	utf-8@0.7.6
-	utf8-width@0.1.7
-	utf8parse@0.2.2
-	uu_cp@0.0.27
-	uu_mkdir@0.0.27
-	uu_mktemp@0.0.27
-	uu_mv@0.0.27
-	uu_uname@0.0.27
-	uu_whoami@0.0.27
-	uucore@0.0.27
-	uucore_procs@0.0.27
-	uuhelp_parser@0.0.27
-	uuid@1.11.0
-	v_htmlescape@0.15.8
-	value-trait@0.8.1
-	vcpkg@0.2.15
-	version_check@0.9.5
-	vte@0.10.1
-	vte@0.11.1
-	vte_generate_state_changes@0.1.2
-	wait-timeout@0.2.0
-	walkdir@2.5.0
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-backend@0.2.93
-	wasm-bindgen-macro-support@0.2.93
-	wasm-bindgen-macro@0.2.93
-	wasm-bindgen-shared@0.2.93
-	wasm-bindgen@0.2.93
-	wax@0.6.0
-	wayland-backend@0.3.6
-	wayland-client@0.31.5
-	wayland-protocols-wlr@0.2.0
-	wayland-protocols@0.31.2
-	wayland-scanner@0.31.4
-	wayland-sys@0.31.4
-	webpage@2.0.1
-	which@6.0.3
-	widestring@1.1.0
-	wild@2.2.1
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.9
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-core@0.52.0
-	windows-core@0.56.0
-	windows-implement@0.56.0
-	windows-interface@0.56.0
-	windows-result@0.1.2
-	windows-sys@0.36.1
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-sys@0.59.0
-	windows-targets@0.48.5
-	windows-targets@0.52.6
-	windows@0.56.0
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.6
-	windows_aarch64_msvc@0.36.1
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.6
-	windows_i686_gnu@0.36.1
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.6
-	windows_i686_gnullvm@0.52.6
-	windows_i686_msvc@0.36.1
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.6
-	windows_x86_64_gnu@0.36.1
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.6
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.6
-	windows_x86_64_msvc@0.36.1
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.6
-	winnow@0.5.40
-	winnow@0.6.18
-	winreg@0.52.0
-	winresource@0.1.17
-	winsafe@0.0.19
-	wl-clipboard-rs@0.8.1
-	wyz@0.5.1
-	x11rb-protocol@0.13.1
-	x11rb@0.13.1
-	xattr@1.3.1
-	xml5ever@0.18.1
-	xxhash-rust@0.8.12
-	yansi@0.5.1
-	zerocopy-derive@0.7.35
-	zerocopy@0.7.35
-	zip@0.6.6
-	zstd-safe@7.2.1
-	zstd-sys@2.0.13+zstd.1.5.6
-	zstd@0.13.2
-"
+CRATES=" "
 
 RUST_MIN_VER="1.80.1"
 
@@ -698,8 +13,9 @@ DESCRIPTION="A new type of shell, written in Rust"
 HOMEPAGE="https://www.nushell.sh"
 SRC_URI="
 	https://github.com/nushell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${CARGO_CRATE_URIS}
 "
+DEPS_URI="https://github.com/freijon/${PN}/releases/download/${PV}/vendor.tar.xz -> ${P}-deps.tar.xz"
+SRC_URI+=" ${DEPS_URI}"
 
 LICENSE="MIT"
 # Dependent crate licenses
@@ -735,6 +51,8 @@ RESTRICT+=" test"
 
 QA_FLAGS_IGNORED="usr/bin/nu.*"
 
+ECARGO_VENDOR="${WORKDIR}/vendor"
+
 src_prepare() {
 	use plugins || eapply "${FILESDIR/${PN}-dont-build-plugins.patch}"
 	default
diff --git a/app-shells/nushell/nushell-0.101.0.ebuild b/app-shells/nushell/nushell-0.101.0.ebuild
index 7395ebe21a7f..e441d248cc17 100644
--- a/app-shells/nushell/nushell-0.101.0.ebuild
+++ b/app-shells/nushell/nushell-0.101.0.ebuild
@@ -1,761 +1,9 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-CRATES="
-	addr2line@0.24.2
-	adler2@2.0.0
-	adler32@1.2.0
-	ahash@0.7.8
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	alloc-no-stdlib@2.0.4
-	alloc-stdlib@0.2.2
-	alloca@0.4.0
-	allocator-api2@0.2.21
-	alphanumeric-sort@1.5.3
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	ansi-str@0.8.0
-	ansitok@0.2.0
-	anstream@0.6.18
-	anstyle-parse@0.2.6
-	anstyle-query@1.1.2
-	anstyle-wincon@3.0.6
-	anstyle@1.0.10
-	anyhow@1.0.94
-	arbitrary@1.4.1
-	arboard@3.4.1
-	argminmax@0.6.2
-	array-init-cursor@0.2.0
-	arrayref@0.3.9
-	arrayvec@0.5.2
-	arrayvec@0.7.6
-	assert-json-diff@2.0.2
-	assert_cmd@2.0.16
-	async-stream-impl@0.3.6
-	async-stream@0.3.6
-	async-trait@0.1.83
-	atoi@2.0.0
-	atoi_simd@0.15.6
-	atomic-waker@1.1.2
-	autocfg@1.4.0
-	avro-schema@0.3.0
-	backtrace-ext@0.2.1
-	backtrace@0.3.74
-	base64@0.22.1
-	bindgen@0.70.1
-	bit-set@0.8.0
-	bit-vec@0.8.0
-	bitflags@1.3.2
-	bitflags@2.6.0
-	bitvec@1.0.1
-	blake3@1.5.5
-	block-buffer@0.10.4
-	block2@0.5.1
-	borsh-derive@1.5.3
-	borsh@1.5.3
-	bracoxide@0.1.4
-	brotli-decompressor@4.0.1
-	brotli@6.0.0
-	bstr@1.11.1
-	bumpalo@3.16.0
-	byte-unit@5.1.6
-	bytecheck@0.6.12
-	bytecheck_derive@0.6.12
-	bytecount@0.6.8
-	bytemuck@1.20.0
-	bytemuck_derive@1.8.0
-	byteorder@1.5.0
-	bytes@1.9.0
-	bytesize@1.3.0
-	calamine@0.26.1
-	cassowary@0.3.0
-	castaway@0.2.3
-	cc@1.2.3
-	cexpr@0.6.0
-	cfg-if@1.0.0
-	cfg_aliases@0.1.1
-	cfg_aliases@0.2.1
-	chardetng@0.1.17
-	charset@0.1.5
-	chrono-humanize@0.2.3
-	chrono-tz-build@0.2.1
-	chrono-tz-build@0.4.0
-	chrono-tz@0.10.0
-	chrono-tz@0.8.6
-	chrono@0.4.39
-	chumsky@0.9.3
-	ciborium-io@0.2.2
-	ciborium-ll@0.2.2
-	ciborium@0.2.2
-	clang-sys@1.8.1
-	clap@4.5.23
-	clap_builder@4.5.23
-	clap_derive@4.5.18
-	clap_lex@0.7.4
-	clipboard-win@5.4.0
-	codepage@0.1.2
-	colorchoice@1.0.3
-	colorz@1.1.4
-	comfy-table@7.1.3
-	compact_str@0.7.1
-	compact_str@0.8.0
-	console@0.15.8
-	const-random-macro@0.1.16
-	const-random@0.1.18
-	const_format@0.2.34
-	const_format_proc_macros@0.2.34
-	constant_time_eq@0.3.1
-	core-foundation-sys@0.8.7
-	core-foundation@0.10.0
-	core-foundation@0.9.4
-	cpufeatures@0.2.16
-	crc-catalog@1.1.1
-	crc32fast@1.4.2
-	crc@2.1.0
-	crossbeam-channel@0.5.13
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-queue@0.3.11
-	crossbeam-utils@0.8.20
-	crossterm@0.27.0
-	crossterm@0.28.1
-	crossterm_winapi@0.9.1
-	crunchy@0.2.2
-	crypto-common@0.1.6
-	cssparser-macros@0.6.1
-	cssparser@0.34.0
-	csv-core@0.1.11
-	csv@1.3.1
-	ctrlc@3.4.5
-	curl-sys@0.4.78+curl-8.11.0
-	curl@0.4.47
-	data-encoding@2.6.0
-	deranged@0.3.11
-	derive-new@0.6.0
-	derive_arbitrary@1.4.1
-	derive_more@0.99.18
-	dialoguer@0.11.0
-	diff@0.1.13
-	difflib@0.4.0
-	digest@0.10.7
-	dirs-sys@0.4.1
-	dirs@5.0.1
-	displaydoc@0.2.5
-	dlib@0.5.2
-	dlv-list@0.5.2
-	doc-comment@0.3.3
-	doctest-file@1.0.0
-	downcast-rs@1.2.1
-	dtoa-short@0.3.5
-	dtoa@1.0.9
-	dtparse@2.0.1
-	dunce@1.0.5
-	dyn-clone@1.0.17
-	ego-tree@0.10.0
-	either@1.13.0
-	eml-parser@0.1.4
-	encode_unicode@0.3.6
-	encoding_rs@0.8.35
-	enum_dispatch@0.3.13
-	env_filter@0.1.2
-	env_logger@0.11.5
-	env_logger@0.8.4
-	equivalent@1.0.1
-	erased-serde@0.4.5
-	errno@0.3.10
-	error-code@3.3.1
-	ethnum@1.5.0
-	fallible-iterator@0.3.0
-	fallible-streaming-iterator@0.1.9
-	fancy-regex@0.14.0
-	fast-float@0.2.0
-	fastrand@2.3.0
-	fd-lock@4.0.2
-	file-id@0.2.2
-	filesize@0.2.0
-	filetime@0.2.25
-	fixedbitset@0.4.2
-	flate2@1.0.35
-	float-cmp@0.10.0
-	fnv@1.0.7
-	foldhash@0.1.3
-	foreign-types-shared@0.1.1
-	foreign-types@0.3.2
-	form_urlencoded@1.2.1
-	fs4@0.9.1
-	fs_extra@1.3.0
-	fsevent-sys@4.1.0
-	funty@2.0.0
-	futf@0.1.5
-	futures-channel@0.3.31
-	futures-core@0.3.31
-	futures-executor@0.3.31
-	futures-io@0.3.31
-	futures-macro@0.3.31
-	futures-sink@0.3.31
-	futures-task@0.3.31
-	futures-util@0.3.31
-	futures@0.3.31
-	fuzzy-matcher@0.3.7
-	fxhash@0.2.1
-	generic-array@0.14.7
-	gethostname@0.4.3
-	getrandom@0.2.15
-	gimli@0.31.1
-	git2@0.19.0
-	gjson@0.8.1
-	glob-match@0.2.1
-	glob@0.3.1
-	goblin@0.7.1
-	h2@0.4.7
-	half@2.4.1
-	halfbrown@0.2.5
-	hash32@0.3.1
-	hashbrown@0.12.3
-	hashbrown@0.14.5
-	hashbrown@0.15.2
-	hashlink@0.9.1
-	heapless@0.8.0
-	heck@0.4.1
-	heck@0.5.0
-	hex@0.4.3
-	home@0.5.9
-	html5ever@0.27.0
-	html5ever@0.29.0
-	http-body-util@0.1.2
-	http-body@1.0.1
-	http@1.2.0
-	httparse@1.9.5
-	httpdate@1.0.3
-	human-date-parser@0.2.0
-	humantime@2.1.0
-	hyper-rustls@0.27.3
-	hyper-util@0.1.10
-	hyper@1.5.1
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.61
-	ical@0.11.0
-	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.7.0
-	indicatif@0.17.9
-	indoc@2.0.5
-	inotify-sys@0.1.5
-	inotify@0.9.6
-	interprocess@2.2.2
-	inventory@0.3.15
-	ipnet@2.10.1
-	is-docker@0.2.0
-	is-wsl@0.4.0
-	is_ci@1.2.0
-	is_debug@1.0.2
-	is_executable@1.0.4
-	is_terminal_polyfill@1.70.1
-	itertools@0.11.0
-	itertools@0.12.1
-	itertools@0.13.0
-	itoa@1.0.14
-	itoap@1.0.1
-	jobserver@0.1.32
-	js-sys@0.3.76
-	jsonpath_lib_polars_vendor@0.0.1
-	kqueue-sys@1.0.4
-	kqueue@1.0.8
-	lazy_static@1.5.0
-	libc@0.2.168
-	libflate@1.4.0
-	libflate_lz77@1.2.0
-	libgit2-sys@0.17.0+1.8.1
-	libloading@0.8.6
-	libm@0.2.11
-	libmimalloc-sys@0.1.39
-	libproc@0.14.10
-	libredox@0.1.3
-	libsqlite3-sys@0.28.0
-	libssh2-sys@0.3.0
-	libz-sys@1.1.20
-	linked-hash-map@0.5.6
-	linux-raw-sys@0.4.14
-	litemap@0.7.4
-	lock_api@0.4.12
-	lockfree-object-pool@0.1.6
-	log@0.4.22
-	lru@0.12.5
-	lscolors@0.17.0
-	lsp-server@0.7.7
-	lsp-types@0.95.1
-	lz4-sys@1.11.1+lz4-1.10.0
-	lz4@1.28.0
-	mac@0.1.1
-	mach2@0.4.2
-	markup5ever@0.12.1
-	markup5ever@0.14.0
-	markup5ever_rcdom@0.3.0
-	md-5@0.10.6
-	memchr@2.7.4
-	memmap2@0.7.1
-	memoffset@0.9.1
-	miette-derive@7.4.0
-	miette@7.4.0
-	mimalloc@0.1.43
-	mime@0.3.17
-	mime_guess@2.0.5
-	minimal-lexical@0.2.1
-	miniz_oxide@0.8.0
-	mio@0.8.11
-	mio@1.0.3
-	mockito@1.6.1
-	multipart-rs@0.1.13
-	multiversion-macros@0.7.4
-	multiversion@0.7.4
-	native-tls@0.2.12
-	new_debug_unreachable@1.0.6
-	nix@0.28.0
-	nix@0.29.0
-	nom@7.1.3
-	notify-debouncer-full@0.3.2
-	notify@6.1.1
-	now@0.1.3
-	ntapi@0.4.1
-	nu-ansi-term@0.50.1
-	num-bigint@0.4.6
-	num-complex@0.4.6
-	num-conv@0.1.0
-	num-format@0.4.4
-	num-integer@0.1.46
-	num-iter@0.1.45
-	num-rational@0.4.2
-	num-traits@0.2.19
-	num@0.4.3
-	num_threads@0.1.7
-	number_prefix@0.4.0
-	objc-sys@0.3.5
-	objc2-app-kit@0.2.2
-	objc2-core-data@0.2.2
-	objc2-core-image@0.2.2
-	objc2-encode@4.0.3
-	objc2-foundation@0.2.2
-	objc2-metal@0.2.2
-	objc2-quartz-core@0.2.2
-	objc2@0.5.2
-	object@0.36.5
-	object_store@0.10.2
-	oem_cp@2.0.0
-	omnipath@0.1.6
-	once_cell@1.20.2
-	open@5.3.1
-	openssl-macros@0.1.1
-	openssl-probe@0.1.5
-	openssl-src@300.4.1+3.4.0
-	openssl-sys@0.9.104
-	openssl@0.10.68
-	option-ext@0.2.0
-	ordered-multimap@0.7.3
-	os_display@0.1.3
-	os_pipe@1.2.1
-	owo-colors@4.1.0
-	papergrid@0.12.0
-	parking_lot@0.12.3
-	parking_lot_core@0.9.10
-	parse-zoneinfo@0.3.1
-	parse_datetime@0.6.0
-	paste@1.0.15
-	pathdiff@0.2.3
-	percent-encoding@2.3.1
-	peresil@0.3.0
-	pest@2.7.15
-	pest_derive@2.7.15
-	pest_generator@2.7.15
-	pest_meta@2.7.15
-	petgraph@0.6.5
-	phf@0.11.2
-	phf_codegen@0.11.2
-	phf_generator@0.10.0
-	phf_generator@0.11.2
-	phf_macros@0.11.2
-	phf_shared@0.10.0
-	phf_shared@0.11.2
-	pin-project-lite@0.2.15
-	pin-utils@0.1.0
-	pkg-config@0.3.31
-	plain@0.2.3
-	planus@0.3.1
-	platform-info@2.0.4
-	plist@1.7.0
-	polars-arrow-format@0.1.0
-	polars-arrow@0.44.2
-	polars-compute@0.44.2
-	polars-core@0.44.2
-	polars-error@0.44.2
-	polars-expr@0.44.2
-	polars-io@0.44.2
-	polars-json@0.44.2
-	polars-lazy@0.44.2
-	polars-mem-engine@0.44.2
-	polars-ops@0.44.2
-	polars-parquet-format@0.1.0
-	polars-parquet@0.44.2
-	polars-pipe@0.44.2
-	polars-plan@0.44.2
-	polars-row@0.44.2
-	polars-schema@0.44.2
-	polars-sql@0.44.2
-	polars-stream@0.44.2
-	polars-time@0.44.2
-	polars-utils@0.44.2
-	polars@0.44.2
-	pori@0.0.0
-	portable-atomic@1.10.0
-	powerfmt@0.2.0
-	ppv-lite86@0.2.20
-	precomputed-hash@0.1.1
-	predicates-core@1.0.8
-	predicates-tree@1.0.11
-	predicates@3.1.2
-	pretty_assertions@1.4.1
-	print-positions@0.6.1
-	proc-macro-crate@3.2.0
-	proc-macro-error-attr@1.0.4
-	proc-macro-error@1.0.4
-	proc-macro2@1.0.92
-	procfs-core@0.17.0
-	procfs@0.17.0
-	psm@0.1.24
-	ptr_meta@0.1.4
-	ptr_meta_derive@0.1.4
-	pure-rust-locales@0.8.1
-	pwd@1.4.0
-	pyo3-build-config@0.21.2
-	pyo3-ffi@0.21.2
-	pyo3-macros-backend@0.21.2
-	pyo3-macros@0.21.2
-	pyo3@0.21.2
-	quick-error@1.2.3
-	quick-error@2.0.1
-	quick-xml@0.31.0
-	quick-xml@0.32.0
-	quick-xml@0.36.2
-	quick-xml@0.37.1
-	quickcheck@1.0.3
-	quickcheck_macros@1.0.0
-	quinn-proto@0.11.9
-	quinn-udp@0.5.8
-	quinn@0.11.6
-	quote@1.0.37
-	quoted_printable@0.5.1
-	radium@0.7.0
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rand_distr@0.4.3
-	ratatui@0.26.3
-	raw-cpuid@11.2.0
-	rayon-core@1.12.1
-	rayon@1.10.0
-	recursive-proc-macro-impl@0.1.1
-	recursive@0.1.1
-	recvmsg@1.0.0
-	redox_syscall@0.5.8
-	redox_users@0.4.6
-	reedline@0.38.0
-	ref-cast-impl@1.0.23
-	ref-cast@1.0.23
-	regex-automata@0.4.9
-	regex-syntax@0.8.5
-	regex@1.11.1
-	relative-path@1.9.3
-	rend@0.4.2
-	reqwest@0.12.9
-	rfc2047-decoder@1.0.6
-	ring@0.17.8
-	rkyv@0.7.45
-	rkyv_derive@0.7.45
-	rle-decode-fast@1.0.3
-	rmp-serde@1.3.0
-	rmp@0.8.14
-	ropey@1.6.1
-	roxmltree@0.20.0
-	rstest@0.23.0
-	rstest_macros@0.23.0
-	rusqlite@0.31.0
-	rust-embed-impl@8.5.0
-	rust-embed-utils@8.5.0
-	rust-embed@8.5.0
-	rust-ini@0.21.1
-	rust_decimal@1.36.0
-	rustc-demangle@0.1.24
-	rustc-hash@1.1.0
-	rustc-hash@2.1.0
-	rustc_version@0.4.1
-	rustix@0.38.42
-	rustls-native-certs@0.8.1
-	rustls-pemfile@2.2.0
-	rustls-pki-types@1.10.0
-	rustls-webpki@0.102.8
-	rustls@0.23.20
-	rustversion@1.0.18
-	ryu@1.0.18
-	same-file@1.0.6
-	scc@2.2.5
-	schannel@0.1.27
-	scoped-tls@1.0.1
-	scopeguard@1.2.0
-	scraper@0.22.0
-	scroll@0.11.0
-	scroll_derive@0.11.1
-	sdd@3.0.4
-	seahash@4.1.0
-	security-framework-sys@2.12.1
-	security-framework@2.11.1
-	security-framework@3.0.1
-	selectors@0.26.0
-	semver@1.0.23
-	serde@1.0.216
-	serde_derive@1.0.216
-	serde_json@1.0.133
-	serde_repr@0.1.19
-	serde_spanned@0.6.8
-	serde_urlencoded@0.7.1
-	serde_yaml@0.9.34+deprecated
-	serial_test@3.2.0
-	serial_test_derive@3.2.0
-	servo_arc@0.4.0
-	sha2@0.10.8
-	shadow-rs@0.37.0
-	shell-words@1.1.0
-	shlex@1.3.0
-	signal-hook-mio@0.2.4
-	signal-hook-registry@1.4.2
-	signal-hook@0.3.17
-	simd-adler32@0.3.7
-	simd-json@0.14.3
-	simdutf8@0.1.5
-	similar@2.6.0
-	simplelog@0.12.2
-	siphasher@0.3.11
-	slab@0.4.9
-	slotmap@1.0.7
-	smallvec@1.13.2
-	snafu-derive@0.7.5
-	snafu@0.7.5
-	snap@1.1.1
-	socket2@0.5.8
-	spin@0.9.8
-	sqlparser@0.49.0
-	stability@0.2.1
-	stable_deref_trait@1.2.0
-	stacker@0.1.17
-	static_assertions@1.1.0
-	str_indices@0.4.4
-	streaming-decompression@0.1.2
-	streaming-iterator@0.1.9
-	strength_reduce@0.2.4
-	string_cache@0.8.7
-	string_cache_codegen@0.5.2
-	strip-ansi-escapes@0.2.0
-	strsim@0.11.1
-	strum@0.26.3
-	strum_macros@0.26.4
-	subtle@2.6.1
-	supports-color@3.0.2
-	supports-hyperlinks@3.1.0
-	supports-unicode@3.0.0
-	sxd-document@0.3.2
-	sxd-xpath@0.4.2
-	syn@1.0.109
-	syn@2.0.90
-	sync_wrapper@1.0.2
-	synstructure@0.13.1
-	sys-locale@0.3.2
-	sysinfo@0.31.4
-	sysinfo@0.32.1
-	tabled@0.16.0
-	tango-bench@0.6.0
-	tap@1.0.1
-	target-features@0.1.6
-	target-lexicon@0.12.16
-	tempfile@3.14.0
-	tendril@0.4.3
-	termcolor@1.4.1
-	terminal_size@0.4.1
-	termtree@0.4.1
-	textwrap@0.16.1
-	thiserror-impl@1.0.69
-	thiserror-impl@2.0.6
-	thiserror@1.0.69
-	thiserror@2.0.6
-	thread_local@1.1.8
-	time-core@0.1.2
-	time-macros@0.2.19
-	time@0.3.37
-	tiny-keccak@2.0.2
-	tinystr@0.7.6
-	tinyvec@1.8.0
-	tinyvec_macros@0.1.1
-	titlecase@3.3.0
-	tokio-macros@2.4.0
-	tokio-rustls@0.26.1
-	tokio-util@0.7.13
-	tokio@1.42.0
-	toml@0.8.19
-	toml_datetime@0.6.8
-	toml_edit@0.22.22
-	tower-service@0.3.3
-	tracing-attributes@0.1.28
-	tracing-core@0.1.33
-	tracing@0.1.41
-	trash@5.2.1
-	tree_magic_mini@3.1.6
-	trim-in-place@0.1.7
-	try-lock@0.2.5
-	typed-arena@1.7.0
-	typeid@1.0.2
-	typenum@1.17.0
-	typetag-impl@0.2.18
-	typetag@0.2.18
-	ucd-trie@0.1.7
-	umask@2.1.0
-	unicase@2.8.0
-	unicode-ident@1.0.14
-	unicode-linebreak@0.1.5
-	unicode-reverse@1.0.9
-	unicode-segmentation@1.12.0
-	unicode-truncate@1.1.0
-	unicode-width@0.1.11
-	unicode-width@0.2.0
-	unicode-xid@0.2.6
-	unindent@0.2.3
-	unsafe-libyaml@0.2.11
-	untrusted@0.9.0
-	ureq@2.12.1
-	url@2.5.4
-	urlencoding@2.1.3
-	utf-8@0.7.6
-	utf16_iter@1.0.5
-	utf8-width@0.1.7
-	utf8_iter@1.0.4
-	utf8parse@0.2.2
-	uu_cp@0.0.28
-	uu_mkdir@0.0.28
-	uu_mktemp@0.0.28
-	uu_mv@0.0.28
-	uu_touch@0.0.28
-	uu_uname@0.0.28
-	uu_whoami@0.0.28
-	uucore@0.0.28
-	uucore_procs@0.0.28
-	uuhelp_parser@0.0.28
-	uuid@1.11.0
-	v_htmlescape@0.15.8
-	value-trait@0.10.1
-	vcpkg@0.2.15
-	version_check@0.9.5
-	vte@0.10.1
-	vte@0.11.1
-	vte_generate_state_changes@0.1.2
-	wait-timeout@0.2.0
-	walkdir@2.5.0
-	want@0.3.1
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-backend@0.2.99
-	wasm-bindgen-futures@0.4.49
-	wasm-bindgen-macro-support@0.2.99
-	wasm-bindgen-macro@0.2.99
-	wasm-bindgen-shared@0.2.99
-	wasm-bindgen@0.2.99
-	wasm-streams@0.4.2
-	wax@0.6.0
-	wayland-backend@0.3.7
-	wayland-client@0.31.7
-	wayland-protocols-wlr@0.2.0
-	wayland-protocols@0.31.2
-	wayland-scanner@0.31.5
-	wayland-sys@0.31.5
-	web-sys@0.3.76
-	web-time@1.1.0
-	webpage@2.0.1
-	which@7.0.0
-	widestring@1.1.0
-	wild@2.2.1
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.9
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-core@0.52.0
-	windows-core@0.56.0
-	windows-core@0.57.0
-	windows-implement@0.56.0
-	windows-implement@0.57.0
-	windows-interface@0.56.0
-	windows-interface@0.57.0
-	windows-registry@0.2.0
-	windows-result@0.1.2
-	windows-result@0.2.0
-	windows-strings@0.1.0
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-sys@0.59.0
-	windows-targets@0.48.5
-	windows-targets@0.52.6
-	windows@0.56.0
-	windows@0.57.0
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.6
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.6
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.6
-	windows_i686_gnullvm@0.52.6
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.6
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.6
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.6
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.6
-	winnow@0.6.20
-	winreg@0.52.0
-	winresource@0.1.19
-	winsafe@0.0.19
-	wl-clipboard-rs@0.8.1
-	write16@1.0.0
-	writeable@0.5.5
-	wyz@0.5.1
-	x11rb-protocol@0.13.1
-	x11rb@0.13.1
-	xattr@1.3.1
-	xml5ever@0.18.1
-	xxhash-rust@0.8.12
-	yansi@1.0.1
-	yoke-derive@0.7.5
-	yoke@0.7.5
-	zerocopy-derive@0.7.35
-	zerocopy@0.7.35
-	zerofrom-derive@0.1.5
-	zerofrom@0.1.5
-	zeroize@1.8.1
-	zerovec-derive@0.10.3
-	zerovec@0.10.4
-	zip@2.2.1
-	zopfli@0.8.1
-	zstd-safe@7.2.1
-	zstd-sys@2.0.13+zstd.1.5.6
-	zstd@0.13.2
-"
+CRATES=" "
 
 RUST_MIN_VER="1.81.0"
 
@@ -765,8 +13,9 @@ DESCRIPTION="A new type of shell, written in Rust"
 HOMEPAGE="https://www.nushell.sh"
 SRC_URI="
 	https://github.com/nushell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${CARGO_CRATE_URIS}
 "
+DEPS_URI="https://github.com/freijon/${PN}/releases/download/${PV}/vendor.tar.xz -> ${P}-deps.tar.xz"
+SRC_URI+=" ${DEPS_URI}"
 
 LICENSE="MIT"
 # Dependent crate licenses
@@ -802,6 +51,8 @@ RESTRICT+=" test"
 
 QA_FLAGS_IGNORED="usr/bin/nu.*"
 
+ECARGO_VENDOR="${WORKDIR}/vendor"
+
 src_prepare() {
 	use plugins || eapply "${FILESDIR/${PN}-dont-build-plugins.patch}"
 	default
diff --git a/app-shells/nushell/nushell-0.99.1.ebuild b/app-shells/nushell/nushell-0.99.1.ebuild
index c4e3778926b5..ad8c74c2f6eb 100644
--- a/app-shells/nushell/nushell-0.99.1.ebuild
+++ b/app-shells/nushell/nushell-0.99.1.ebuild
@@ -1,701 +1,9 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-CRATES="
-	addr2line@0.22.0
-	adler2@2.0.0
-	adler32@1.2.0
-	adler@1.0.2
-	ahash@0.7.8
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	alloc-no-stdlib@2.0.4
-	alloc-stdlib@0.2.2
-	alloca@0.4.0
-	allocator-api2@0.2.18
-	alphanumeric-sort@1.5.3
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	ansi-str@0.8.0
-	ansitok@0.2.0
-	anstream@0.6.15
-	anstyle-parse@0.2.5
-	anstyle-query@1.1.1
-	anstyle-wincon@3.0.4
-	anstyle@1.0.8
-	anyhow@1.0.86
-	arboard@3.4.0
-	argminmax@0.6.2
-	array-init-cursor@0.2.0
-	arrayvec@0.5.2
-	arrayvec@0.7.6
-	assert-json-diff@2.0.2
-	assert_cmd@2.0.16
-	async-stream-impl@0.3.5
-	async-stream@0.3.5
-	async-trait@0.1.81
-	atoi@2.0.0
-	atoi_simd@0.15.6
-	atomic-waker@1.1.2
-	autocfg@1.3.0
-	avro-schema@0.3.0
-	backtrace-ext@0.2.1
-	backtrace@0.3.73
-	base64@0.21.7
-	base64@0.22.1
-	bindgen@0.69.4
-	bit-set@0.5.3
-	bit-vec@0.6.3
-	bitflags@1.3.2
-	bitflags@2.6.0
-	bitvec@1.0.1
-	block-buffer@0.10.4
-	block2@0.5.1
-	borsh-derive@1.5.1
-	borsh@1.5.1
-	bracoxide@0.1.3
-	brotli-decompressor@4.0.1
-	brotli@5.0.0
-	bstr@1.10.0
-	bumpalo@3.16.0
-	byte-unit@5.1.4
-	bytecheck@0.6.12
-	bytecheck_derive@0.6.12
-	bytecount@0.6.8
-	bytemuck@1.17.0
-	bytemuck_derive@1.7.1
-	byteorder@1.5.0
-	bytes@1.7.1
-	bytesize@1.3.0
-	calamine@0.24.0
-	cassowary@0.3.0
-	castaway@0.2.3
-	cc@1.1.14
-	cexpr@0.6.0
-	cfg-if@1.0.0
-	cfg_aliases@0.1.1
-	cfg_aliases@0.2.1
-	chardetng@0.1.17
-	charset@0.1.5
-	chrono-humanize@0.2.3
-	chrono-tz-build@0.2.1
-	chrono-tz-build@0.3.0
-	chrono-tz@0.8.6
-	chrono-tz@0.9.0
-	chrono@0.4.38
-	chumsky@0.9.3
-	clang-sys@1.8.1
-	clap@4.5.16
-	clap_builder@4.5.15
-	clap_derive@4.5.13
-	clap_lex@0.7.2
-	clipboard-win@5.4.0
-	codepage@0.1.2
-	colorchoice@1.0.2
-	colorz@1.1.2
-	comfy-table@7.1.1
-	compact_str@0.7.1
-	console@0.15.8
-	const-random-macro@0.1.16
-	const-random@0.1.18
-	const_format@0.2.32
-	const_format_proc_macros@0.2.32
-	core-foundation-sys@0.8.7
-	core-foundation@0.9.4
-	cpufeatures@0.2.13
-	crc-catalog@1.1.1
-	crc32fast@1.4.2
-	crc@2.1.0
-	crossbeam-channel@0.5.13
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-queue@0.3.11
-	crossbeam-utils@0.8.20
-	crossterm@0.27.0
-	crossterm@0.28.1
-	crossterm_winapi@0.9.1
-	crunchy@0.2.2
-	crypto-common@0.1.6
-	cssparser-macros@0.6.1
-	cssparser@0.31.2
-	csv-core@0.1.11
-	csv@1.3.0
-	ctrlc@3.4.5
-	curl-sys@0.4.74+curl-8.9.0
-	curl@0.4.46
-	data-encoding@2.6.0
-	deranged@0.3.11
-	derive-new@0.6.0
-	derive_more@0.99.18
-	dialoguer@0.11.0
-	diff@0.1.13
-	difflib@0.4.0
-	digest@0.10.7
-	dirs-sys@0.4.1
-	dirs@5.0.1
-	dlib@0.5.2
-	dlv-list@0.5.2
-	doc-comment@0.3.3
-	doctest-file@1.0.0
-	downcast-rs@1.2.1
-	dtoa-short@0.3.5
-	dtoa@1.0.9
-	dtparse@2.0.1
-	dunce@1.0.5
-	dyn-clone@1.0.17
-	ego-tree@0.6.3
-	either@1.13.0
-	eml-parser@0.1.4
-	encode_unicode@0.3.6
-	encoding_rs@0.8.34
-	enum_dispatch@0.3.13
-	env_filter@0.1.2
-	env_logger@0.11.5
-	env_logger@0.8.4
-	equivalent@1.0.1
-	erased-serde@0.4.5
-	errno@0.3.9
-	error-code@3.2.0
-	ethnum@1.5.0
-	fallible-iterator@0.3.0
-	fallible-streaming-iterator@0.1.9
-	fancy-regex@0.13.0
-	fast-float@0.2.0
-	fastrand@2.1.1
-	fd-lock@4.0.2
-	file-id@0.2.1
-	filesize@0.2.0
-	filetime@0.2.24
-	fixedbitset@0.4.2
-	flate2@1.0.32
-	float-cmp@0.9.0
-	fnv@1.0.7
-	foreign-types-shared@0.1.1
-	foreign-types@0.3.2
-	foreign_vec@0.1.0
-	form_urlencoded@1.2.1
-	fs_extra@1.3.0
-	fsevent-sys@4.1.0
-	funty@2.0.0
-	futf@0.1.5
-	futures-channel@0.3.30
-	futures-core@0.3.30
-	futures-executor@0.3.30
-	futures-io@0.3.30
-	futures-macro@0.3.30
-	futures-sink@0.3.30
-	futures-task@0.3.30
-	futures-util@0.3.30
-	futures@0.3.30
-	fuzzy-matcher@0.3.7
-	fxhash@0.2.1
-	generic-array@0.14.7
-	gethostname@0.4.3
-	getrandom@0.2.15
-	gimli@0.29.0
-	git2@0.19.0
-	gjson@0.8.1
-	glob-match@0.2.1
-	glob@0.3.1
-	goblin@0.7.1
-	h2@0.4.6
-	halfbrown@0.2.5
-	hash32@0.3.1
-	hashbrown@0.12.3
-	hashbrown@0.14.5
-	hashbrown@0.15.0
-	hashlink@0.9.1
-	heapless@0.8.0
-	heck@0.5.0
-	hermit-abi@0.3.9
-	hermit-abi@0.4.0
-	hex@0.4.3
-	home@0.5.9
-	html5ever@0.27.0
-	http-body-util@0.1.2
-	http-body@1.0.1
-	http@1.1.0
-	httparse@1.9.4
-	httpdate@1.0.3
-	human-date-parser@0.2.0
-	humantime@2.1.0
-	hyper-util@0.1.7
-	hyper@1.4.1
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.60
-	ical@0.11.0
-	idna@0.5.0
-	indexmap@2.6.0
-	indicatif@0.17.8
-	inotify-sys@0.1.5
-	inotify@0.9.6
-	instant@0.1.13
-	interprocess@2.2.1
-	inventory@0.3.15
-	is-docker@0.2.0
-	is-terminal@0.4.13
-	is-wsl@0.4.0
-	is_ci@1.2.0
-	is_debug@1.0.1
-	is_executable@1.0.1
-	is_terminal_polyfill@1.70.1
-	itertools@0.11.0
-	itertools@0.12.1
-	itertools@0.13.0
-	itoa@1.0.11
-	itoap@1.0.1
-	jobserver@0.1.32
-	joinery@2.1.0
-	js-sys@0.3.70
-	jsonpath_lib_polars_vendor@0.0.1
-	kqueue-sys@1.0.4
-	kqueue@1.0.8
-	lazy_static@1.5.0
-	lazycell@1.3.0
-	lexical-core@0.8.5
-	lexical-parse-float@0.8.5
-	lexical-parse-integer@0.8.6
-	lexical-util@0.8.5
-	lexical-write-float@0.8.5
-	lexical-write-integer@0.8.5
-	libc@0.2.158
-	libflate@1.4.0
-	libflate_lz77@1.2.0
-	libgit2-sys@0.17.0+1.8.1
-	libloading@0.8.5
-	libm@0.2.8
-	libmimalloc-sys@0.1.39
-	libproc@0.14.8
-	libredox@0.1.3
-	libsqlite3-sys@0.28.0
-	libssh2-sys@0.3.0
-	libz-sys@1.1.19
-	linked-hash-map@0.5.6
-	linux-raw-sys@0.4.14
-	lock_api@0.4.12
-	log@0.4.22
-	lru@0.12.4
-	lscolors@0.17.0
-	lsp-server@0.7.6
-	lsp-types@0.95.1
-	lz4-sys@1.10.0
-	lz4@1.26.0
-	mac@0.1.1
-	mach2@0.4.2
-	malloc_buf@0.0.6
-	markup5ever@0.12.1
-	markup5ever_rcdom@0.3.0
-	md-5@0.10.6
-	memchr@2.7.4
-	memmap2@0.7.1
-	miette-derive@7.2.0
-	miette@7.2.0
-	mimalloc@0.1.43
-	mime@0.3.17
-	mime_guess@2.0.5
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.4
-	miniz_oxide@0.8.0
-	mio@0.8.11
-	mio@1.0.2
-	mockito@1.5.0
-	multipart-rs@0.1.11
-	multiversion-macros@0.7.4
-	multiversion@0.7.4
-	native-tls@0.2.12
-	new_debug_unreachable@1.0.6
-	nix@0.28.0
-	nix@0.29.0
-	nom@7.1.3
-	notify-debouncer-full@0.3.1
-	notify@6.1.1
-	now@0.1.3
-	ntapi@0.4.1
-	nu-ansi-term@0.50.1
-	num-bigint@0.4.6
-	num-complex@0.4.6
-	num-conv@0.1.0
-	num-format@0.4.4
-	num-integer@0.1.46
-	num-iter@0.1.45
-	num-rational@0.4.2
-	num-traits@0.2.19
-	num@0.4.3
-	num_threads@0.1.7
-	number_prefix@0.4.0
-	objc-sys@0.3.5
-	objc2-app-kit@0.2.2
-	objc2-core-data@0.2.2
-	objc2-core-image@0.2.2
-	objc2-encode@4.0.3
-	objc2-foundation@0.2.2
-	objc2-metal@0.2.2
-	objc2-quartz-core@0.2.2
-	objc2@0.5.2
-	objc@0.2.7
-	object@0.36.3
-	omnipath@0.1.6
-	once_cell@1.20.1
-	open@5.3.0
-	openssl-macros@0.1.1
-	openssl-probe@0.1.5
-	openssl-src@300.3.1+3.3.1
-	openssl-sys@0.9.103
-	openssl@0.10.66
-	option-ext@0.2.0
-	ordered-multimap@0.7.3
-	os_display@0.1.3
-	os_pipe@1.2.1
-	owo-colors@4.0.0
-	papergrid@0.12.0
-	parking_lot@0.12.3
-	parking_lot_core@0.9.10
-	parquet-format-safe@0.2.4
-	parse-zoneinfo@0.3.1
-	paste@1.0.15
-	pathdiff@0.2.1
-	percent-encoding@2.3.1
-	peresil@0.3.0
-	pest@2.7.11
-	pest_derive@2.7.11
-	pest_generator@2.7.11
-	pest_meta@2.7.11
-	petgraph@0.6.5
-	phf@0.10.1
-	phf@0.11.2
-	phf_codegen@0.10.0
-	phf_codegen@0.11.2
-	phf_generator@0.10.0
-	phf_generator@0.11.2
-	phf_macros@0.11.2
-	phf_shared@0.10.0
-	phf_shared@0.11.2
-	pin-project-lite@0.2.14
-	pin-utils@0.1.0
-	pkg-config@0.3.30
-	plain@0.2.3
-	planus@0.3.1
-	platform-info@2.0.3
-	plist@1.7.0
-	polars-arrow-format@0.1.0
-	polars-arrow@0.41.3
-	polars-compute@0.41.3
-	polars-core@0.41.3
-	polars-error@0.41.3
-	polars-expr@0.41.3
-	polars-io@0.41.3
-	polars-json@0.41.3
-	polars-lazy@0.41.3
-	polars-mem-engine@0.41.3
-	polars-ops@0.41.3
-	polars-parquet@0.41.3
-	polars-pipe@0.41.3
-	polars-plan@0.41.3
-	polars-row@0.41.3
-	polars-sql@0.41.3
-	polars-time@0.41.3
-	polars-utils@0.41.3
-	polars@0.41.3
-	pori@0.0.0
-	portable-atomic@1.7.0
-	powerfmt@0.2.0
-	ppv-lite86@0.2.20
-	precomputed-hash@0.1.1
-	predicates-core@1.0.8
-	predicates-tree@1.0.11
-	predicates@3.1.2
-	pretty_assertions@1.4.0
-	print-positions@0.6.1
-	proc-macro-crate@3.1.0
-	proc-macro-error-attr@1.0.4
-	proc-macro-error@1.0.4
-	proc-macro2@1.0.86
-	procfs-core@0.16.0
-	procfs@0.16.0
-	psm@0.1.21
-	ptr_meta@0.1.4
-	ptr_meta_derive@0.1.4
-	pure-rust-locales@0.8.1
-	pwd@1.4.0
-	quick-error@1.2.3
-	quick-error@2.0.1
-	quick-xml@0.31.0
-	quick-xml@0.32.0
-	quick-xml@0.34.0
-	quickcheck@1.0.3
-	quickcheck_macros@1.0.0
-	quote@1.0.37
-	quoted_printable@0.5.1
-	radium@0.7.0
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rand_distr@0.4.3
-	ratatui@0.26.3
-	raw-cpuid@11.1.0
-	rayon-core@1.12.1
-	rayon@1.10.0
-	recursive-proc-macro-impl@0.1.1
-	recursive@0.1.1
-	recvmsg@1.0.0
-	redox_syscall@0.5.3
-	redox_users@0.4.6
-	reedline@0.36.0
-	ref-cast-impl@1.0.23
-	ref-cast@1.0.23
-	regex-automata@0.4.7
-	regex-syntax@0.8.4
-	regex@1.10.6
-	relative-path@1.9.3
-	rend@0.4.2
-	rfc2047-decoder@1.0.5
-	rkyv@0.7.45
-	rkyv_derive@0.7.45
-	rle-decode-fast@1.0.3
-	rmp-serde@1.3.0
-	rmp@0.8.14
-	ropey@1.6.1
-	roxmltree@0.19.0
-	rstest@0.18.2
-	rstest_macros@0.18.2
-	rusqlite@0.31.0
-	rust-embed-impl@8.5.0
-	rust-embed-utils@8.5.0
-	rust-embed@8.5.0
-	rust-ini@0.21.1
-	rust_decimal@1.36.0
-	rustc-demangle@0.1.24
-	rustc-hash@1.1.0
-	rustc_version@0.4.0
-	rustix@0.38.37
-	rustversion@1.0.17
-	ryu@1.0.18
-	same-file@1.0.6
-	scc@2.1.16
-	schannel@0.1.23
-	scoped-tls@1.0.1
-	scopeguard@1.2.0
-	scraper@0.20.0
-	scroll@0.11.0
-	scroll_derive@0.11.1
-	sdd@3.0.2
-	seahash@4.1.0
-	security-framework-sys@2.11.1
-	security-framework@2.11.1
-	selectors@0.25.0
-	semver@1.0.23
-	serde@1.0.208
-	serde_derive@1.0.208
-	serde_json@1.0.127
-	serde_repr@0.1.19
-	serde_spanned@0.6.7
-	serde_urlencoded@0.7.1
-	serde_yaml@0.9.34+deprecated
-	serial_test@3.1.1
-	serial_test_derive@3.1.1
-	servo_arc@0.3.0
-	sha2@0.10.8
-	shadow-rs@0.35.0
-	shell-words@1.1.0
-	shlex@1.3.0
-	signal-hook-mio@0.2.4
-	signal-hook-registry@1.4.2
-	signal-hook@0.3.17
-	simd-json@0.13.10
-	simdutf8@0.1.4
-	similar@2.6.0
-	simplelog@0.12.2
-	siphasher@0.3.11
-	slab@0.4.9
-	smallvec@1.13.2
-	smartstring@1.0.1
-	smawk@0.3.2
-	snap@1.1.1
-	socket2@0.5.7
-	sqlparser@0.47.0
-	stability@0.2.1
-	stable_deref_trait@1.2.0
-	stacker@0.1.16
-	static_assertions@1.1.0
-	str_indices@0.4.3
-	streaming-decompression@0.1.2
-	streaming-iterator@0.1.9
-	strength_reduce@0.2.4
-	string_cache@0.8.7
-	string_cache_codegen@0.5.2
-	strip-ansi-escapes@0.2.0
-	strsim@0.11.1
-	strum@0.26.3
-	strum_macros@0.26.4
-	supports-color@2.1.0
-	supports-color@3.0.0
-	supports-hyperlinks@3.0.0
-	supports-unicode@3.0.0
-	sxd-document@0.3.2
-	sxd-xpath@0.4.2
-	syn@1.0.109
-	syn@2.0.75
-	syn_derive@0.1.8
-	sys-locale@0.3.1
-	sysinfo@0.30.13
-	tabled@0.16.0
-	tango-bench@0.6.0
-	tap@1.0.1
-	target-features@0.1.6
-	tempfile@3.13.0
-	tendril@0.4.3
-	termcolor@1.4.1
-	terminal_size@0.3.0
-	termtree@0.4.1
-	textwrap@0.16.1
-	thiserror-impl@1.0.63
-	thiserror@1.0.63
-	thread_local@1.1.8
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tiny-keccak@2.0.2
-	tinyvec@1.8.0
-	tinyvec_macros@0.1.1
-	titlecase@2.2.1
-	tokio-util@0.7.11
-	tokio@1.39.3
-	toml@0.7.8
-	toml@0.8.19
-	toml_datetime@0.6.8
-	toml_edit@0.19.15
-	toml_edit@0.21.1
-	toml_edit@0.22.20
-	tracing-core@0.1.32
-	tracing@0.1.40
-	trash@3.3.1
-	tree_magic_mini@3.1.5
-	trim-in-place@0.1.7
-	typed-arena@1.7.0
-	typeid@1.0.2
-	typenum@1.17.0
-	typetag-impl@0.2.18
-	typetag@0.2.18
-	ucd-trie@0.1.6
-	umask@2.1.0
-	unicase@2.7.0
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-linebreak@0.1.5
-	unicode-normalization@0.1.23
-	unicode-reverse@1.0.9
-	unicode-segmentation@1.12.0
-	unicode-truncate@1.1.0
-	unicode-width@0.1.11
-	unicode-xid@0.2.5
-	unsafe-libyaml@0.2.11
-	ureq@2.10.1
-	url@2.5.2
-	utf-8@0.7.6
-	utf8-width@0.1.7
-	utf8parse@0.2.2
-	uu_cp@0.0.27
-	uu_mkdir@0.0.27
-	uu_mktemp@0.0.27
-	uu_mv@0.0.27
-	uu_uname@0.0.27
-	uu_whoami@0.0.27
-	uucore@0.0.27
-	uucore_procs@0.0.27
-	uuhelp_parser@0.0.27
-	uuid@1.10.0
-	v_htmlescape@0.15.8
-	value-trait@0.8.1
-	vcpkg@0.2.15
-	version_check@0.9.5
-	vte@0.10.1
-	vte@0.11.1
-	vte_generate_state_changes@0.1.2
-	wait-timeout@0.2.0
-	walkdir@2.5.0
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-backend@0.2.93
-	wasm-bindgen-macro-support@0.2.93
-	wasm-bindgen-macro@0.2.93
-	wasm-bindgen-shared@0.2.93
-	wasm-bindgen@0.2.93
-	wax@0.6.0
-	wayland-backend@0.3.6
-	wayland-client@0.31.5
-	wayland-protocols-wlr@0.2.0
-	wayland-protocols@0.31.2
-	wayland-scanner@0.31.4
-	wayland-sys@0.31.4
-	webpage@2.0.1
-	which@6.0.3
-	widestring@1.1.0
-	wild@2.2.1
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.9
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-core@0.52.0
-	windows-core@0.54.0
-	windows-result@0.1.2
-	windows-sys@0.36.1
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-sys@0.59.0
-	windows-targets@0.42.2
-	windows-targets@0.48.5
-	windows-targets@0.52.6
-	windows@0.44.0
-	windows@0.52.0
-	windows@0.54.0
-	windows_aarch64_gnullvm@0.42.2
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.6
-	windows_aarch64_msvc@0.36.1
-	windows_aarch64_msvc@0.42.2
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.6
-	windows_i686_gnu@0.36.1
-	windows_i686_gnu@0.42.2
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.6
-	windows_i686_gnullvm@0.52.6
-	windows_i686_msvc@0.36.1
-	windows_i686_msvc@0.42.2
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.6
-	windows_x86_64_gnu@0.36.1
-	windows_x86_64_gnu@0.42.2
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.6
-	windows_x86_64_gnullvm@0.42.2
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.6
-	windows_x86_64_msvc@0.36.1
-	windows_x86_64_msvc@0.42.2
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.6
-	winnow@0.5.40
-	winnow@0.6.18
-	winreg@0.52.0
-	winresource@0.1.17
-	winsafe@0.0.19
-	wl-clipboard-rs@0.8.1
-	wyz@0.5.1
-	x11rb-protocol@0.13.1
-	x11rb@0.13.1
-	xattr@1.3.1
-	xml5ever@0.18.1
-	xxhash-rust@0.8.12
-	yansi@0.5.1
-	zerocopy-derive@0.7.35
-	zerocopy@0.7.35
-	zip@0.6.6
-	zstd-safe@7.2.1
-	zstd-sys@2.0.13+zstd.1.5.6
-	zstd@0.13.2
-"
+CRATES=" "
 
 RUST_MIN_VER="1.79.0"
 
@@ -705,8 +13,9 @@ DESCRIPTION="A new type of shell, written in Rust"
 HOMEPAGE="https://www.nushell.sh"
 SRC_URI="
 	https://github.com/nushell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${CARGO_CRATE_URIS}
 "
+DEPS_URI="https://github.com/freijon/${PN}/releases/download/${PV}/vendor.tar.xz -> ${P}-deps.tar.xz"
+SRC_URI+=" ${DEPS_URI}"
 
 LICENSE="MIT"
 # Dependent crate licenses
@@ -742,6 +51,8 @@ RESTRICT+=" test"
 
 QA_FLAGS_IGNORED="usr/bin/nu.*"
 
+ECARGO_VENDOR="${WORKDIR}/vendor"
+
 src_prepare() {
 	use plugins || eapply "${FILESDIR/${PN}-dont-build-plugins.patch}"
 	default
diff --git a/app-shells/pwsh-bin/pwsh-bin-7.4.6.ebuild b/app-shells/pwsh-bin/pwsh-bin-7.4.6.ebuild
index e09b2d5daf99..f5757d9331bb 100644
--- a/app-shells/pwsh-bin/pwsh-bin-7.4.6.ebuild
+++ b/app-shells/pwsh-bin/pwsh-bin-7.4.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
@@ -19,7 +19,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 arm arm64"
 REQUIRED_USE="elibc_glibc"
 
 RDEPEND="
diff --git a/app-shells/starship/Manifest b/app-shells/starship/Manifest
index f12fd44248d1..f774c51ba891 100644
--- a/app-shells/starship/Manifest
+++ b/app-shells/starship/Manifest
@@ -1,44 +1,30 @@
-DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST adler2-2.0.0.crate 13529 BLAKE2B ec575b0bf12e321399ac3a1d59fce4ddbeabcc60cb3d7c2f362cce23eb29b4ea836451372d6d88552a4435ae29bb41d6230d55f625a4359eace680b9b771d0ad SHA512 12d12579ad617cf1a94cf95ab9d3f5db566c3b2de4bd5735eccd83c668fdad0eff134c996b73c46cbb9f932837682043878b8cc4764191625e9f93ccffcce423
 DIST ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d
 DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
 DIST allocator-api2-0.2.18.crate 62504 BLAKE2B 8152c5a611be91ba23b1e8647511e21f48e7d4f1a7b9a828083f5bb8747cdc92aee66f73251b19195bbdc1f65aad992632e820d86cbeff287d598257ae3628a6 SHA512 5e5b0e23e1f5b259e5d3746e3e05817af8dee95af7105ea775a5c1d69b4e537a4d6a25e2c1d46ab83e2385217b158f7940dc1315ae581c35ee23289647105e73
 DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
-DIST anstream-0.6.14.crate 29160 BLAKE2B 1120895a51ed7a285c5d5a03d2f7e26dc956d95f39cf500ba9f547d71a62ed0326f519860ddcf8db77cb09e9119e914a62693369eca51cbf9c01ef874ade9112 SHA512 65ece20958e3fb1ed4a5ff1d45f5bfdcb942c64994a3d14eefb0dfd5b04f433f6e1b06ebff240c67ed8ff7cc01d93ca0acf8c8ea29cb41309c6c882e7c192b34
 DIST anstream-0.6.15.crate 29231 BLAKE2B cc4cf0f381c210fecc20b5796fe872b533419e5f957021b0c3be3cdc23fb84ce029fbef6f9b6f174a76ad713c07f0811145a70572de7c24cfab060fdd990f49a SHA512 1cb01a0293b4c9bcc010909707e71c464416d3ec6fc9789060b7aa9fe4cc04424fefa8013cc8765ccdae6dfd9a1c50a11f7b30b39a32c4aeaf525f28167ddb92
-DIST anstyle-1.0.7.crate 15709 BLAKE2B 872e0ed09e7e94c6f6b812349e39f949aff4d7cbb87744ab26fe49f57a7d330e0f79447213374f7f862ea276aab2dd1077dc8df3f7c5f34079ef30c4d17eeeba SHA512 e20d49f7d148e03f7b127be7802e0b6b7a2b05720614d46c2ade5e440ce322b44ddd3a9239b897886faa03ed1cb30f947ee27d3811fa83dffba10b3975eba7ed
 DIST anstyle-1.0.8.crate 15771 BLAKE2B c039613e7de27cc990e5764810f9351754b160928a8954dc19041354cf9fef1422ed964237a5d39d16e4e9f8592ed52c523ccf36b0b5506f464d4f818f3332ff SHA512 3b867f73df0b2f69a0c7d5d6e62c7515045e053656afaa303e5aade8012e838cdf5d15d2c3d7c297db9e297d08ea69a9c8eed04b97922a83f56c58962c1c0b69
-DIST anstyle-parse-0.2.4.crate 23069 BLAKE2B e80bd81e351326a222238b3f559020a2430ac37293e61b6b6309b37bbb8bdb78ec11ca9c0fd270098af5e5ffb2f5660cfbfda949d20fd2efd336ed1c143215b2 SHA512 c1dac475df77d090a4d2041ba40ff418abe66e93e4ddda54653bf024fb4995e431166684343509a2337bc813fe06f362d3df8a1d7d05d177cec1a488bcb9942a
 DIST anstyle-parse-0.2.5.crate 22680 BLAKE2B 7473651b1eee08857a6ed1419d3d62ba4b9a9aa0d6657965ad9c67bddd793d825737d3804961716a89bdebed9879ac43b42c897cd229c6e7bd780859e1e3c247 SHA512 cd94ad0e88ad4547a660da1473bf4e6dfed805a066782124204143c7f754c12db719bd3a1774c299f1a035740bfc4830919da191bd14e0acede410f6dbd1e2ef
-DIST anstyle-query-1.1.0.crate 9832 BLAKE2B de106e289c874bca806214e275647415bdd02e2878f3a80e7d337cfbcdb755d8c182b2879371f00f5cad97cdf68224ac11ca41cc89ad7ab3929f854a9f9e76a6 SHA512 321ddfa7b090142116c96bc8c70d81cec3e816922249ae0f07389e2d1b62c8b40636675ccfdfd23d52e29c162ae7d929637dfc7d697dafb79e596d04eb8cd90b
 DIST anstyle-query-1.1.1.crate 9891 BLAKE2B c298114c1864a5233fb39c365e079a7f1f4ef23499dc330e5deb06f83f27bc727015befef79075c7e39952547f799b4135d7db287cf72dfc914191df784a4989 SHA512 1b2e888f025142a0d9b01314cf083831a2a45d8da737c1be3a6a9aa177e73e0d2ae7999fe7610dd450b7096115e8cf38c5da23723cebf1deaa7d3501d3dbd5ce
-DIST anstyle-wincon-3.0.3.crate 12179 BLAKE2B 37793975a05ad60bb2b670c208db11c5cda8a2a456242cd118748709d0a220b541b6f088676eccd19870cfb8f910d4aa1e7764393785a6db0531af4a3ffc8047 SHA512 55217c65fc9ec674e5b4dd70716a221bd108b507dce9baaeb542f0e0a47027ec7fe61f9cd3cccfda43e4a4cd785b42f13400daf89884c32d3768e48bdff2d179
 DIST anstyle-wincon-3.0.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c57b22b57e32a5c75847f2e2bd68a52b33c24797db662aa5fd7e799b9644075c8c939d93b0cf8598b16ee80fc817b77f SHA512 24b3a9a44382609ad449425a657d4b42a792d4703c36e0953f09a03817759c266a2f0ff4ecc9e8b93ea8403df2badef1f1af6a6e50af56205176c41b13501ae6
-DIST anyhow-1.0.86.crate 46741 BLAKE2B 21b1f3acd1c1b659e6e9a53693178de67c806d7dbad30dedea0fb7078b2388baa196d1e7240a7dc88ed9dc93ee4c00bca8e608dad1b6bfb5bfa4f4c5ab51f0d3 SHA512 3853da32a2c53d73969bb29a1e622f3a6d5832d8888dc6bc8eedb76394b392f983aa3fcb1f542933e238841486106f0f38e9a2400c12c7699baba0ebe1d8193a
 DIST anyhow-1.0.89.crate 47078 BLAKE2B fc824e72891bff0cc7aa3b538adfb9af7dc843ab6ed12b8b04eb70e62d32aae1decb9090621d3245dbe89841e73080d2d86973b4aee50873e798956da9b3faa6 SHA512 3c09317089ed78601a56c626700d12c0b49396e25fed9a9f05a2dbfbd6f91ad426c430633006a4043decd1f70a85c161c4f8dd7de0e4c00b82a169b89dda8da0
 DIST arc-swap-1.7.1.crate 68512 BLAKE2B 5ddeffd2ae8af4125a5b43d4a0a1afc7948533bf037d8cd3e47603c13b57b156618280d99b840bf318b25b6eb29400ad68499695e182acdc05bc5f621c42ee16 SHA512 070fa8dd17b380b6d7d72f6f45c84e591de9a9770b9662351e7a41af03798bf5e34d185a5fcb948f4d8ac5e210a33acd465c39eff6097662c2442b34ee3dbdff
 DIST arraydeque-0.5.1.crate 17671 BLAKE2B 0dfd28da55d17c68795220a17a1c6ecc42380a853c96b80c8a5395eb8859706b5c573e54ea0ed71257b7668662bdd67363e3fa0531b99792511e4d41c03d364d SHA512 11d9af9882072d3f4d662789f13653481d7d3539bf9b8db74257cff25977e6419535f092683f7c5384a0ed3cf05cfcb568c1292b413f5f46580370775bf3e232
-DIST arrayvec-0.7.4.crate 29856 BLAKE2B 81ffac1db340e919618351819def3880ab1ef70d0acc47d680f15298eb749bcbc3bf7944ba14159be46b1e734c91b4c0f8cbaf774fd864c17caa3c9fb1fc2e9b SHA512 91e8f70330c515c966d78ae235e890594f9607381ac738a2c3586b53f01411e98d1687494f39ccc365948ae60497df3dfb2be18e26ab7e69bc0966b6c250e1ac
 DIST arrayvec-0.7.6.crate 31237 BLAKE2B b9d1df7e3ec47d434a2606fe9540e37e02351873b376a4e113b54461288e9ab20e02285eed5c4bc0f052ec4d6b3c804044413490ea706c31a852624b03bde7bb SHA512 b1f320746018a7f32340a833420089446ec5cefb7f299b4506eab7423d5db49f00b72d8aa8c6600f9159b9480d5eb3ce69407d93f5c9934147860c83e4d6eca8
 DIST async-broadcast-0.7.1.crate 21867 BLAKE2B 9c430a70bbd2b15ecc88afee064bcb04a665c0421d6c239de611d86ff3fe56fafc083ebc172c5d41c9f72a40080d87a75dae8e9b1e85249202dd844b8360735b SHA512 82b90a41ade624631dd5a03226921ed58835ddf1bcde271ff0c0e14905fb069847bbacee5592978c5389cbf366d77a7cab244ca92871949f3f4872d6da10755c
 DIST async-channel-2.3.1.crate 14576 BLAKE2B 09ea03c9758805c90be9aba222e1d74f3166ab492e533597647d1b4f08bf1dda79d73b21de791b9802e19c225cb94b7cb25550bba61488c7b61fa87f88eb29dd SHA512 94c999912bdf681dcb686292645bc8c340c2687bc9544f317e0123e672752c6b31e9d784e488e7d0bab79b5f207da8904a7f1fe140397513b47c292a6508a7e5
-DIST async-executor-1.13.0.crate 27974 BLAKE2B f12f77471a843fa44dbe5281159d47c0e41b53672dbb1f91519e9e6f302024b905e8415027c0d740bc33db43267db94da907251af8ebbe677ce6ded59078e92f SHA512 618d771243c1ec31496cc228f3e6bdd3d5cdd479eb94e30810c87241e38a5fa652b59d61ec55cefbd120f0ea1d557a683c8a42a3e82344b7813d172d25b6ddec
 DIST async-executor-1.13.1.crate 27991 BLAKE2B 856bd4f42a0d8d35bfb8b8525f626e0b52fd6704810f8bc964cebc47aa0c7a4450f16e5df307f4fc613da81fb3207f4671543f48710177931d6f70dc40c9f95d SHA512 27357b3dc28ad5512b46306ab7d959b2e68b4b5ed0d42fc8cd12fd265a1931a4d8c8c328911eca97227b12d861c9658c14afea6336f999436671d6ef351f3820
 DIST async-fs-2.1.2.crate 17071 BLAKE2B 7b8a67fdab5d9d964af7d45a03a3ef405f9590b556249a35897f14a231f2b781d90df48c8296965e941f8c259c4c13a57691c81f09c20ce81406d5d2e7962731 SHA512 a671374a59c7804d26bf22d9617fc329cfa0cb38413ac05cb2f6ff192c5275a8ba41f1a088fb1978e61a66693c85f9c6b08486d44e30b7fa158568e41dc005a1
-DIST async-io-2.3.3.crate 49746 BLAKE2B 312d71f8670f720947ae5e78e6bd0251534d5a872164845f8606951ef88009e54684019831f55f27322e6e5d7d3f6f4a8157032fb6387ae6859be0d0dab74689 SHA512 5709064176812556a567cd558161a5e1a014b989e6835de5b77f387bcda8f148d03e5ac79a5dde56977bd3f2d38644593aa99ed28a4d646d3535332eae4b09c9
 DIST async-io-2.3.4.crate 49145 BLAKE2B 0530cfcd440e09f0132d2f078b9dbece4a0ed6c1eae668072d29042f41c2855c06a28a9a5420778f9b35150aafc3f0833789091f4779663cb838d44b07feb114 SHA512 30ff1355bcf0d93857604b93d22532040cf50195b6337bbab2cc734e8b81c485a4ac1e575c7c00495519afd0cf406cde9e49f044b183f29ce7b9a1f44edb2760
 DIST async-lock-3.4.0.crate 34446 BLAKE2B e113033a86101bd93543d287379ba354b4bd61ce87786719f05f8a990c177a885eb50a19eb71fcd5cafa01308cb45b7872be65cd7e975cde03b0555a691a4bd7 SHA512 83731067a3302d3266848b0f65ea6564dad60188472c80e78a7d4cd93804f830332aa01b404b60a8f91cc1c6c7170020ebdfe4b5bae14fef6d3bddcc5f1ed9a5
-DIST async-process-2.2.3.crate 28954 BLAKE2B da54aed4f017c9b8ee499a6813ac861ea2cc41b73d3aeede3528885bf0a010926926d23a6c6dd0429b563fffbeb63d3f0c8e625cd04faabfed92059052323e24 SHA512 201f87823617f1126f8dfb230c95aa248986258ccf95e5d0e9f475f160a9e64ec1642897fb2f8ffde3d748b29ed7185349b10ad5cc0f504cf45c302dc0de52a7
 DIST async-process-2.3.0.crate 26766 BLAKE2B 346eca5d8bd2e0a58039c9772413a0d0174dac49e31c7256927c9bd03b7c9f07ccbec6115792478b87123fff1516972eabdec6d54e5c070e0dcf00f3b1d6a43d SHA512 48c1decd4ed3e65d0feb9381533e1274b98b9ba16318f1caa35729078e707dbb2a5a0b52822873d5cc91fc5a51b725c33b784ef8a91aa6cc2cf357ae87c5e2fa
 DIST async-recursion-1.1.1.crate 14874 BLAKE2B 6260dffdfa9fe00cc1a63c8cb103a3f210611627bbc75c2658e7cd732c504791c6577d7033af3c5afa875f90cb370b7f216979e0bdb62dab4acd61786cb5239e SHA512 e3acd07a35be546ead68c7792963c7bf1876b3e5d6a20c2be73d2f030d26d68e2a318999937d4fe253e39d8254e12e42c66314f40a3b230c5d258f34dc0d9027
 DIST async-signal-0.2.10.crate 16970 BLAKE2B 4364a566ca828387f4e1d7689b1ec7d6327bf35a56eacff013f81ec6f438d9ba02a59a8a5c457f1806dbefa23649ee289a8d5ccc7257e2c54f99de45cc4e35d6 SHA512 10d58c9aa3ef6ea4bddd4fa86afd342c6d5097764736294b7fa3b26596301f98827172cc9ed9bdecf8dcb313d2fa0222fb6aaae04f7ffd73ce89cd4b0374ba8b
-DIST async-signal-0.2.9.crate 16796 BLAKE2B 2f2215ae925053868b0e5e85cb8481880d3eb69ff140cac7fd3c4e8d2b828f7e0d75bdb0690aec88068659febb56bd057479489b1b4544e5db4a87b71b53a582 SHA512 b522953ba98960fe1074a673b6b89c794e72d26c4c11f3c0155520edf1dffce3a2324a418147177e87342c6590b8dfa89606f77e9bbb88f866f967e8c79e5a13
 DIST async-task-4.7.1.crate 38077 BLAKE2B 200f3c2eff92afeffb34404bd9b02af39226024d309137c3835342ab6631c09f14f47abc5d25d77e73cbd133274e731fc88e7e94d8456f690b0f1056bae8dd95 SHA512 8495436d0739a2ce83b372ae13ff24ca1487c92e032948d5830af19c3ba411d7cd004634fa10bc2f748f8a82de27c12cbfacaac92cd0012e1fae024eca9e78ca
-DIST async-trait-0.1.81.crate 28896 BLAKE2B 154e6b8da082193832bca7bbc097eb5ee25ed8365d1cb8dedf27f62fbffc710cfbfd0094a200a10399e942014083b74f521dae01cc4601e0f6b9d7364761fce0 SHA512 1fabbaa813ba320012c0bad54d27232eebca4d3fff1cc5ed771df9f90d9e9bfaca4f7b018358dc599fd30c5974d00b34ffc05ce6e9151a57ba572543bff83fd0
 DIST async-trait-0.1.83.crate 29054 BLAKE2B 4991f79abd8b9260b9541e754c30d3e0731ff786fcf65cc3f3eb75a5fcedcb37be147222778e1a0fa6c68d8fb872144b2b55b43cf6f8f4de371f24175cef405d SHA512 15969eafbdbe51e80433b53196962293daed2a70d3d9bac91c58e5e7359f60fc99ef519ceb1fd54e34d627c94f821329474a602f25f85179318d10c3147b5649
 DIST atomic-waker-1.1.2.crate 12422 BLAKE2B fc6632f3c9d719b1d24a1c8e05947d94028909d1c629b80576e176e567636dd4cca699c7e91cae2df63541da574146b3ce766374e93f0ee429bb5bc89a4d3cae SHA512 e07e58db7955791259d0ec00fc4d53318aefb4506e062914819c4220c6dc75fa11a7af0289b4653aa1f9041eb975a025635190de68b4800a0e91e33cdb0ba11c
-DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST autocfg-1.4.0.crate 17712 BLAKE2B 7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6 SHA512 3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c
 DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
 DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9763070e269b56a14b150cbfc4b7f599d4c2a0a5f783638170ee132f0796fefb14fcac7fd73c58db0791007a SHA512 91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20
@@ -49,49 +35,33 @@ DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58
 DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c97828758c93e55505c0e18e2646ae77bf264076041bf682532e28268a4978dd9c822c0475347ee3d29c5df2601fb SHA512 2d0f8908f59d4b1cccd1fbca0c1fa3cc4b224f09549669b28a16af5acfd4369b66851e9be8d65e1df71be998fbc42fc130ad32b71e035d6055724e8fa31fbf98
 DIST blocking-1.6.1.crate 17788 BLAKE2B d07246809d8b80f1fdbdc678b2877f349b748f2dd0f8543e91fde4aec7aea0b45e145a44f07cdbf26934d20269af01844e1cf7d9dd8b9588d129da7f929d9c95 SHA512 1879bf31c18d5cc4653f794dd4109769ae32071564d3a0d63896162fe160bb5ed3d7d8de59ab34363f8192871122099bb8564ffa93de5a5b75ffd93c0d424ed6
 DIST bstr-1.10.0.crate 380426 BLAKE2B 19330a5a293430c09908d2174ff814351b16419f60de6463abf9b8a9dff06a4e6845e889d8047a710cef54842f2790d9cd5080b92cdcb113d89742b869979c74 SHA512 823abdbda9b13802facc7d6b1ed9ad809ed3b0b827d26e418348ffb8481b5f5735f129c5a9a8c7b2ab010d7f32ca57cba69a1ee10a64225c54c6ceacd22c05d2
-DIST bstr-1.9.1.crate 380305 BLAKE2B 52b45bd48874d052636c6b451cc36d8b012808ea5193e0188e5edd09f81d21b8306926cfebb405ad0650ec9aa710f609bacaa773bf854b21f4803dc38bb2eca7 SHA512 67e9f76719310de60f46adf3c39768b4dc078d4c32dc6bdcec1a94cd9f630c5238e427ed84cd6ec25a44f54e84adeb795a0e92060a5372d9fb9ad9f0914e3172
 DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
 DIST bytesize-1.3.0.crate 10164 BLAKE2B 049f292705082dbd3b2f0abb6f153023613107949f4849154aadce2181f4568ea1b3c12f00b6ad56146f8a4f3b07b7025498e0c989ac6561ac7255720b85ffab SHA512 c718af51b0da2979b70142012544fde6bbf8639cd4fde66a8066b138f7f58dce019209e27566027dc0ec5a7fc1d2ee17b9b6366cc7a5f95a6419e29a0ffedab5
 DIST cc-1.1.30.crate 84509 BLAKE2B 59d2fcc0d6bb9d7c97e4f27b49e88b3260f6b166804ac25f3b49eb368e6442193a36869d305554494357f206e3d1f70454a3b740e6b6a5b043c5cc0c82c0c57c SHA512 0a74e4753afd84883bec7a402fa6c3e80bee18f496fa0168fec96e1e468d2e873c54f2f536a013c83eceaf75b9fb6896810ffd0a738d9f94358fc5165d6f4394
-DIST cc-1.1.6.crate 81585 BLAKE2B 412ef9d62c32a42164f8c2b827c10f0d41e75faa77e6d1dd8515ff5ec43abd1da75bbb400460a43a252c93dd0a597c2e44c8e899a376d963f0d3727db7ca2c24 SHA512 ea8bd8150042268092360e6396226ee5e83ba154eae99d299c897ed16e8543fcfe3179e22b50b0497bcf065a16933f4ebf7edcae7e6fc8be3788f0ae7f61c000
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cfg_aliases-0.2.1.crate 6355 BLAKE2B a758d9c88527f0e6e7cfd6d4c83eda1bcb4d6e2438189fe08e8ecbcaa78d56afc5a4873f3b82bf7da96afd690b44cdf1e44466b6da0f37c358b340481017103e SHA512 74969d12d5d24002a29e08d52e30fbce014dd481a7c35ee0162e69333c5f2d7755f3b02439b31522e12444cf1ac8e65880ce33fe6778dac03757e362cbf8a72c
 DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
-DIST clap-4.5.11.crate 56252 BLAKE2B 0d3d7e008e0848cbd66bd1fe347cbbccc77c44db49e1e4179eb0f2c292c87e178424ec82c2becf2e99162f2a199c31c31b54487c7dbfa700feeb082dee15c711 SHA512 96bb7871ef3eb167bf8869e3713d861754cf4716dcff8afe54b3d73ddeb862c75e110e1b759c72edec7cc0e274df5af881aaa8bd275978c55ec8a225c333b098
 DIST clap-4.5.20.crate 56376 BLAKE2B 8efa9c3e171ef38c98a25c526f528629e7e72850c6ec27e7e89a212403ee90d7d005b00750769e4335423ecec1d86abb35c19b0bf7f2c063bc7c6a8bd59d6804 SHA512 e432a118a2ec15b273a404c3cb75bbe579b11034ba55def1823d4670c6553e3d8611074a24f50a0f4adc8bda184213b06106c44c68a19d267342c53e345351d4
-DIST clap_builder-4.5.11.crate 164100 BLAKE2B 07cadc052133a905e2f16bfdf3c1a0d66a283df5e7bb16eeb40bf1a8a489c24758309039d8a07a0b02cf7702a3a2ba6319115940193e58306df20f53851ec537 SHA512 e647761130263d45d55c507e15893b73f70ff402185cd2ef174f7c4f67cef96c713fa4d4d60244393b9e7628667b79e56dabac0196d014740d81e5b7083ab780
 DIST clap_builder-4.5.20.crate 163812 BLAKE2B 689110f2e4f46e8c4c779b6c39cb5f5758c3a32ea5bbfa1faaa6642da7d650cac0827a3e5b503c5054a85e0e7dbf04e7c53d65991a45f3be90c75070cc9c200a SHA512 e914c8b6592f9d230b4f4290cf4b4d73d0160c12a1fa3976c74bad21ff16da532d6af792f0a33fa472166f1cd551291b5d1d71fe8b359040040418694ec52000
-DIST clap_complete-4.5.11.crate 42426 BLAKE2B 3836b28f9886efa7f4e27013548ff8c5273729d8aa1889c0cbef16d8154c9f71a0369dfc3b6b9deb0aecf5f736eb433d7c0538e360e3c7a89bfd39639f04ad7c SHA512 7963343371d245cff507468dcca77528ebe5e2dc634c698c0f122de9bd36e118fc9a30e55754b79a110548afd2e63964b8a0631763e290d1574f0bfb38e7c81b
 DIST clap_complete-4.5.33.crate 47470 BLAKE2B 7d97949397aab211f786a0141c6d6f40268c03c2ecea5032522aff980c217224a25c0139e1345e6b3dc67670fc090d7ddf7a53129b06d281ee6fb144ec8ff43c SHA512 71aab57a9c80ab6169250d056cc2177e2392d2caab1cf123eb36faa39d83656f306c43afdd00b95f6ea39a1d471549d1422be51694fcbe3cb9bb1e77e4d6308d
-DIST clap_derive-4.5.11.crate 30061 BLAKE2B 3a1dab450ba83b8bf1b4ca79266911c39d8153b56f203b28a9a47eb12dacdacde228b080927321f77155cd942169edde9c92be8245ba6b72fd4d3e500aee7037 SHA512 c1c83ddbd16b1e719fd2cdf933186343d3ed4b434b7b45f74dec340eabd49c77da2e40e462349625260104cfb6a8c70d5757c054ed1461235fed7e913100860b
 DIST clap_derive-4.5.18.crate 30131 BLAKE2B ff962e52d8d8afcc9639365e27753c6c6943fd809ef89d9e555e8be5b2f13efa650bf1f9ae451f4c127c1529a0af1d892c3b02153b46deb912029b45983e01cb SHA512 035bb918bc7e9badd59341560f23e3a8a2e7cf945b6d8183f74052c4edfcbecf07c9ea6fce0ceef0b84c89a99d62b11760af39398897e4ee7dad0170a96cfefa
-DIST clap_lex-0.7.1.crate 12766 BLAKE2B e0e3a1a4a65bf9df3c21753f9298a7461046e6b34c7a8d26521efc551ef3511a7d202f25ebdddf285ff68c4073364f48cf739ff0bda32f41d4fd0c87c4cf02fb SHA512 4cdede5eb9fa527567e9f3f94fd8fe7e1022d9e9236e78d30b3068befbaadedd778b5464f800e74bf187c44af9df582365f4d41a0113f8ab0fe9abc936171fc2
 DIST clap_lex-0.7.2.crate 12805 BLAKE2B 952bf3f3885ae7bedd0e8add236590da5fce72a7ccd88ebda063410aef337ce7ccdb5e5e929cb870bc993891610edc0197150a3aa82a62fadc4bbfd96324fcdf SHA512 a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380
 DIST clru-0.6.2.crate 16497 BLAKE2B f77d90984f8b030c43380cc8fd80cfde916f8f9fc4b288a340e9c00f0fe177b2918734c7948ab4bc8fd01abf7864488c76e7744c5974ba23f79fcd1b23b6814c SHA512 6dabdbc4b956fffed9c362b6f33b71625ba62651b0820dcc78b61319d981513d479b453906604de173110bcd9a7441451ef10cb0978e5e587cd0df23fec2c4bc
-DIST cmake-0.1.50.crate 16748 BLAKE2B cd3b131fbc27764e15fcefdac31f97a9d12f82ac9758b2aad256ccb371ce3e2db8aed3c76fbf4816df3483dad9fffe9973940ced65be6d31463d8c059c543646 SHA512 868d5cece75d79382ac6176aabde1723bb7e26dc745383a636516ff45856dc9187fe5a83e139f17e3bb0c114624e9e71b93c8a460b89b8facbafbca50d1d0923
 DIST cmake-0.1.51.crate 17566 BLAKE2B cf16dd1356ac8253bd2cdc40f9c622cb011bc24090dbd8c41e881814c982cabad67d60650b3e35e8efe1278b6323336181a32829c4692a1fe5eae8cc888c802e SHA512 fe3bfc37b704eeda8ecd3d220cd8bba8d2a79d6358bdb06da0f5f3317d6e34b3ea66989c86e1b79820e046449a4f715cfa65b7d57299cf5aff2326569d5d3726
-DIST colorchoice-1.0.1.crate 7895 BLAKE2B f1c841e74f01f33fa83cf41c5f0a1286ca3899239d9a188a838550abde507af374a4fe3e85934d10d28bd5eae2c7fa1f662307bd46d5dd4daa52249cb64ebb5b SHA512 3d216ba46cfcca5c52a56884ed09fe7d6d350ccb44144a60c75006582f7f9a28df21d44375a8cb304c721b9de615875675b3a03c485eb209b2a12d745fa609cd
 DIST colorchoice-1.0.2.crate 7924 BLAKE2B a4027d5f870b4d9a718ac3f9d89ce04e2ed38406658c4a55ffaf39ed0cb1ce7e1c691eb56c66596b519ca82309e8ec7eebac65e69394cdd277f44f9b6280d560 SHA512 f34d5f66f84e90f473b6b9a62a61a59575e712d3e9b140324683f80af42d40c1d079701aa2ed651d0dd95a5ac8838e1f6f6c034e2adef79509d32357b8093117
 DIST concurrent-queue-2.5.0.crate 22654 BLAKE2B b490e76804e45d6a7af6bb4ec074fb370d9ec7cd67c7ecfb55d5ed53b9b437c174e678add915303559e902ac81c8751dccb2c5ef0543d5961713372fd2b08d3c SHA512 235704f9161dfac60d2a6d2cf96425e39c097dcde2f005187c1f044704eec66d8303d59352cd414a81a3ed0eed60421054b0070a9b8f69065a79a2519e913e5a
 DIST const-random-0.1.18.crate 6646 BLAKE2B 20e71fd7e2b0b9af663073a45d0224a4cf9a6a6bdab5c3565de88b4a66ff24a1b0f8c01bdbb86f5192b723c03030ae02fb86722be7cc41c3154cdc81f843f013 SHA512 e250227850001a3ac6abdda6e7bb88efeaec1504a54348a5ea71ff66c984455eb9181b2acfdc0b6c08ef6f51beb34b7ae7836e370d84d75731a2482226c5ed26
 DIST const-random-macro-0.1.16.crate 6657 BLAKE2B 44a3508e2158b79042cab698b1f31c50fa356098bb5f4537f82fe1b9e893d3e8eab59612a8957e524294ca0a035046468d799e4a0e9253c1464b68ef682f84e2 SHA512 8478bc65b0845e765a69e09fe4152e89f3e3970d2d92e4b32bb0abb7b918c725f325d4b19a45d2a462905bedf837b3a23f31b1ed9dc8655ca502de72616b074d
-DIST const_format-0.2.32.crate 77317 BLAKE2B 69b87c1d9dd81f5f92fe7cbc09dea126d386adb2cfb359ed9a906af554fe9b4083d49b87558e019777aff4d93e52babbf39e5d9934ce7163435168656ddb11a1 SHA512 05f883696902f13bb78278e0c202c092fe232cfab7a33c078a16b5f67825a85dede0b6bbb2969dad685977f67098c468916c7fb1d9c5c65bf7fee0a5f8329091
 DIST const_format-0.2.33.crate 77369 BLAKE2B 2f09d634a9816303db3ee1168f1421b3b1ee8c855a9ebb466eaa57323b1df21c22fc5cf2f5661e70d74c6e4262436ae1512e7f327823b940d88bda25f73bce58 SHA512 81f913cabc424e806dde5f4b20fa96bb5f6d35322ec559afe655f121952f35987f9bb9248660a2e721f0bc4ad57ee208336fbb7403198835d946887b6b2596b8
-DIST const_format_proc_macros-0.2.32.crate 24389 BLAKE2B fdb8dad234c45a2fb179c41573765dc0495ffd7268e325403ee9e56b80e68999bd886e22c414c6591ff6be798ae1c172b671d167a7e3ceb853185613f1e4c1c1 SHA512 01b4fb82eb8e3c59a80bb4a819db9218c25d57e947eee6e8a7e4bcc9339c423a2f028fac0959f3781da5e20d7012d2264f05751661b0df7f7011701da124ad0e
 DIST const_format_proc_macros-0.2.33.crate 24455 BLAKE2B 01c38224a8eb8358de8d42b751c500b52722d0cbcb6b3a0f6ec07f1a6ff7b40a61f4d94a1e0f71a39c242961e7392ea6b13ef77f5603936d97434c3a70141f4e SHA512 5b4a485979ca319940b4adc2b3951994c60a2d2671895adc34155b564ccd96688946afdf61df8c28962c31b43b0881672e0749d3b647f92d90419006178ba5da
 DIST core-foundation-0.10.0.crate 27023 BLAKE2B ba4b8e42aca4df30627eae9e8ce8ee9f4b512d51141338d284f9b897ee944619d7f63b0bd9318263eb5f5c1436ca0fad8a208c8005620779865c4f4e653d1fbd SHA512 771a34b79519c5a51e3490589672ecf3eb019d4eb28db9d19c88bc116632dea96ebb2cd04e251e94dddd0876cb8a7f07ec65aa5143f7f8aaf1661caae052a94f
-DIST core-foundation-0.9.4.crate 27743 BLAKE2B 5b695e671cc833170bc6bad436b2d0d8d386ffb8181bfcf2e92a1d93cee67c3ba1768cf57064fb91b0897c6aec1be7db40b5bd256a052c1bdaf872ec19f6e15e SHA512 82d0878a1b9e3d56b3666fb5a78f92c6f7806d01665c242c06a640bd6b1fd36260211e92dc05e1a16d1430622bfdd650aabb0b5bd8e5592f74abdcf412448e33
-DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100
 DIST core-foundation-sys-0.8.7.crate 37712 BLAKE2B 0e1dd99a5bbb0fe92f55181a37426f6e86445cb20e355f553b3162c88ccc075644461731a0cdcd93dcca65b6cef1de62b409afbd73ba3070a199ab8e7422dcfa SHA512 17492d5314db03abdb3b1998bf0c396ec8ed0f83bc978ae22d6026afdc86c50b58cbac073b3a0d97b92da7e98be11302faf1249d24313494bc058add4f4cb63a
-DIST cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6
 DIST cpufeatures-0.2.14.crate 13165 BLAKE2B 45521d1a4bf2ddc03c6cdb9ceacb900806a03748fd122dd4431f6927d06cbf8608f9830e312b5728dd55b5084476280669129ea80477432fd04fdd68a0e50fb0 SHA512 402c0d6497c65882415841b9eb5953b1dcc1cb35b9fb4512801f3d0e2a056ca95bd32fdf70b6e65a18b048d7df8892c95fef1de975b56b63cfe45460783d5867
 DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd SHA512 c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266
-DIST crossbeam-0.8.4.crate 10500 BLAKE2B 03212d9789a66c1eee7d1f4c7883eec1267089ab9d652ba5d7d59a22e04ab878e5defeccf8cff4587a34d976488ffa689bffde596588057d814b633ab3d67d1d SHA512 63650fe2d46ff2e593342b398c153facd3cb7cd72dac9b057ee0aac5ef5e9dd9df0e71536d66879676c0edaa89787d1f365eea35c82604ca46090e527749f994
 DIST crossbeam-channel-0.5.13.crate 91174 BLAKE2B 7a9aed6f4922c1d10e4ae12508a03dc7daca773adad6a317c4ea38e544d7c28c56a06623d958aec540fcaa86fa9051a1aaa2c859dadff72873f18f2f3a951449 SHA512 0f31223a7099f84e39e6b76b19cf26736e0c3907fffc2ed3eb0012c7984b1993570bf6d155eba5bfb82897ef0e4fc93b89096071410bbac256ca6be9a9568ff8
 DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864
 DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2
-DIST crossbeam-queue-0.3.11.crate 15581 BLAKE2B 91b9797f985af06c854c38b8124cb67864bdb47979d2e253928678118515fbc1257108c7102bad66e1f65fd6f324a93749dde86b4ea28f3bb5a16491f3f56ed2 SHA512 c6007307ef9d219889e6244805ae759998396e1d0548e3664ce9ab366ea78917dee75251c4265b0e3ef4ab15b5c6d42d6a5e9b286d17ad42ec169e7fcddb8ffe
 DIST crossbeam-utils-0.8.20.crate 42487 BLAKE2B b50da06721cfbfff07825574feada8a28d3814edb218434288683eec31bddabe2ffbf7e5ef1281ee14a8a77c56db3b66f3c5ceabaea9c72317c1bd2cecda0c26 SHA512 7175eadf9fa7c526fa11ff87e40ff203f0e7a4bcec15cb972f924f3c7ff7cc20b6e2e8dbbc1ede142a0207cd2baa4f446deb25d825d28a54cbd25c263701bfaa
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
@@ -107,7 +77,6 @@ DIST dirs-sys-0.4.1.crate 10719 BLAKE2B 30334f2192698d7d03bd4e8bc8a682482da7d13b
 DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
 DIST dlv-list-0.5.2.crate 22373 BLAKE2B 9edcbd42af8665750bf633dfea9543db4e5f37208523ee05300a599d7107a57e35e9eee2c60ab9cc1c5dc5d7408187dbf846fb0019a1e7ea7de905e08f018453 SHA512 f2fe69a3a5d319ea963c53e6a410f3a5553d6f6b5708e6318b450ae3b5319a19f9d492bcddd233d7a5a65355ca378bc41232c335deb9c4987dd9350a37afbca3
 DIST downcast-0.11.0.crate 5976 BLAKE2B 4ca0e66dbd8dbc86920d4184de8b37ab41954cb1560c7727334c990b97ad9544b098f7ce50759d10cac8b9cb955893805aed3bac5849c8b44a965e24d2ac7653 SHA512 11b037a09829e3e93eabff69f02b608725e6e348a191b1b6c8bb044b8d820a6ebf46eaea2f8bf5eb1c156f20d3e97be9b581e1b5fccebbfe76d94157d6bccd53
-DIST dunce-1.0.4.crate 8034 BLAKE2B e1e7ffbcf1e3632036c03303ab46fc37b2b0a991598790b2dc65d7a61341a78bf555230ccded8fbb87d6288282af3ed2a8641212a0f1fab929bf99298e878b6b SHA512 f57d9c53c177bac8e10a4b56ae421c604085aef0f264b8d6871abb7e1ff713b55f396c5c5f24422763319c504c6ea6a774416af1c2ba23ba7b67b2282f6731f8
 DIST dunce-1.0.5.crate 8244 BLAKE2B 1499ae0bb3d34e8d42e97eaf551308efc95697366b804dc83c51171a939d45bad46fce9f82a39e17b6b92fc833aecc85eabd2104823c7db30396833388125728 SHA512 36d7d75217d629185a9a9187f7d2e2dc346a28be0ad1c21b1b6bcbe3991e9cd11797e53d745c0b3b5ae94cf1e4cf141cdb2322bab86d97cc258b4145e3b97a56
 DIST dyn-clone-1.0.17.crate 11848 BLAKE2B 1f90492639630036e1e877537328e46ee3fa697d85b2f87c45990d4a51cc900a6f604d077b16575015bbf0a970c26f898226e87e6e2af82d624f5fa565036617 SHA512 b51fee8c4fa3c6b0bc677e9997d4b6921bfee9a11e369eedc649d19eb5d95d7872b533b37fb1ca842c75e714b46afb1231369341c45071db94f09b53e37e03f6
 DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
@@ -122,149 +91,101 @@ DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac
 DIST event-listener-5.3.1.crate 42576 BLAKE2B dfd8020527c06adae338e9bcf19076e70ae745facd7b49e8d6604e8508436b70b48fb1f4479214998f288055447186d4ef4969630af90e301103bc5faf6492e5 SHA512 98b7219a3959d6225ee5fb68e8b9d284ab03334d895f52a71f673e59cabab1d06a0abb9eab905e8d38d5f9589725c7c598355ae3c909044a23bc5830b761f5c0
 DIST event-listener-strategy-0.5.2.crate 10697 BLAKE2B f49faa8a2cda551b65e29b9dc98e4e55dabff7f2b330097bf5f6a5a5927804a99cb699d1f693db9c7cbd92ecb44f6c1b51be2b86810d3e3fbfd5eebcfad1a241 SHA512 7b3759d07c7936b53351172e38623658cbe642f079426c99e7f9187ba1d7f8cbbe7530c056cc760909cda4e70281a50577caa41426164b4c8d6c3f4cbddb2626
 DIST faster-hex-0.9.0.crate 13053 BLAKE2B 36e07a1b08544f273b30b6c8b79eb97bb0e97efc29c570f59fbe9fb4c818dfc0cbd9f42ccd4e196845c5d1f39db1a49cf61d1931ea5c1f761da2b0da49b03430 SHA512 7713b0929ffe5596823d001a83a40fe1c4c500b7cc4218921ebb65f69826a9a9fd6e7b948fbd093cb921bea52e9f2cf3285c9d1d11f2a321dcfba0fb3c9aa5d9
-DIST fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104
 DIST fastrand-2.1.1.crate 14983 BLAKE2B a4535b1612b103376fe64d71a393f7bfc37668c574d9122ca90a631aeb91cf0895bb030e597b79a80a4a37ea4d514c4c0836332030bb10a60bd971573a6d6ee0 SHA512 9a51185132c1c89fc31af463c664e996f431e607ce96676b8301f28ff11a99661d18025dd460e3332e373af68d20017d96481719746fc3c5de742d08d63aba3e
 DIST filedescriptor-0.8.2.crate 10830 BLAKE2B 964470acbd1f36487755a74666a46649d6012c0782b3622652bd41b086e5d804298d6126c980ecce5a2ce91994d3a006288739b472ecc518099d4e690c89f402 SHA512 dd808b8f26bff4d8b37826241f30c9396bb0f731a0fc3ef53ecb3bd0c0fb7adec6bfe5ff6ecebb6e02c9de6fc5f2f6c0fc361e9c6ba564708dd1c29ab2662f65
-DIST filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3
 DIST filetime-0.2.25.crate 14940 BLAKE2B 1ffcbad3b2023ba5e9b2d71e279fd8c3564458b28290f3e19bf43b87083e1e3c0e18f191f6dc67540baccb83075df453950230089f243e6276e413321cceedc7 SHA512 90b4f3c4df29a3456c393f78f636d70f2615cba748a972dc9b937c2fcbbf4544f5b0d28c6c8fcfed5d5eda026ac670afffec18ab7d7127cee9afa2717146ccf2
-DIST flate2-1.0.30.crate 75511 BLAKE2B c25d9ab787ef60312523d80cf277bcaae16c7e54b1deb0fc8723a3b22c2586092343db1c538d96a37690d21e52ff822a38c90e10bc554fedb75671fdff6df309 SHA512 21528f80c1709cfa764723dce012903581dbc2b63ecad194ec601fc75103307e1b2ef17479186ad895ad957c9a33c6fd666b2981382a8a68ca78dfac7cb5d578
 DIST flate2-1.0.34.crate 109174 BLAKE2B 70fb087904e1e29243facbb9a01f05770581d91d49935290943797cf84c3d2b416a8f78b2c4f9277d86053f1bb79e858ab1d5bac427bacea9771fe1998ea498b SHA512 0526f2c7c061d57f5a39fec9726c547848f6bb36dfc977497c15fd42da6c300bcd332278c31e3acc0a72e897a7161f03deef61e95e072bf3cfe5b0302b5f98f9
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
 DIST fragile-2.0.0.crate 14668 BLAKE2B 2e589b312d7409a1a550a676303b9b2adf2e28b0d4cd02c7fb22b48a88d1f88a04e55c4405078e2c43b13ccada890a33bcacfe179abd12236c23f219d275c4df SHA512 a48fee7c13ad800142a9ef1f355b2200b904ad9bf97b3601e310bad2b6ad90ea235b9704964c54be1d9c415c9c95fbc5f49e8ba5d7c6ee3488573f3404912608
-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-io-0.3.30.crate 8910 BLAKE2B c9af4290f45a9fd0839e107fbdfa4abff4f9077ff45b61054670419076f1c4508d7d560d4d86f8cd7ce146e436e531b9f5e0abfed2c4f2406c57be209cfdd498 SHA512 077acf5eab1101917b5b4b4b83347d30d533110d9a34c2de6db1411ffae0f0530f457033c5a5c14249119e89375c9f12127790b46e486dcd003a12a6fad48bc2
 DIST futures-io-0.3.31.crate 9047 BLAKE2B 667e62b50be304b68b8437d93b734a0e2433d88a3b410010ed0b04eb2bbfbc9984454c3f0a591f720c9983582c6421d7f870f0733c31337c4c518112f52aea54 SHA512 16d21388f7ca083d2c618ec140cb2c0807ca621b8c338698c367d862b99133ec9edda828f051f3f666472c929e7bf7a5cb334fcf167109c7c392c5cc60b54fdf
 DIST futures-lite-2.3.0.crate 39181 BLAKE2B 0e4c510d7b640efc6ca8e8b00f4cd51b05b727ce5d25d76e317fd5aec2f515d3b1dac57e4058c323fdd0c5d125ebc4073a9ab1f2ee21aee0e5aa0f9bf2e049ac SHA512 057de40b58d5ae06104c480a0e20a0ee4a962a93af615b04a9a34cd08135359c1f49f1b61577f15277fa73e9b7a93d2a659d3203b490ca4295b88fde2316bc7f
-DIST futures-sink-0.3.30.crate 7852 BLAKE2B dc768e4ec4c9f9dfb22a20c1c977401d859072b9222e6f77978332f495cbd0f764b175a679c9d7c77028d7b56cda5e2d86188ee979c7f323187defa6a0485ce3 SHA512 1c198da8f4118d9a9ab2b597e3f7b4e1ac7094dfa547bb81f3c4148c45216ef55b309255849174a517ebddba6c874283425f1df6e56e2ba5150af091bacf46a3
 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 generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d
-DIST gethostname-0.5.0.crate 8772 BLAKE2B 00617e07f5a96a5c67b33e614b1cf92864e8ed48d4dd882ab952821379f03cf88c21a979a8d7ed9c5a32b3c0eeae671a1a5bc6b5ee3a9b1841bc22d5d450f88d SHA512 67a7341724fd7a67c4d9bfbf809cd39d0149a669ce65679db91c70869624f3ec397953494e03c03804827fea269ec961f678076627b1a9c25369a871305a6294
 DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb
-DIST gix-0.64.0.crate 273610 BLAKE2B 0f9f006a8874cc1f8c04f538b9ab1ca8304e9f5c2a66e9708523ab00b0cf3969d345d9320e1bfea26709edb754f0820e1f971674952a3eef4f8714dc4e89fa1c SHA512 3a49ef2004c0ef9dc18ffc25cbb57d343ec1adf088b27f42a81e98ff3d29974aa5024adc324c591174a7fffb425479e1a37e193347748bec1a0f246d3b340836
 DIST gix-0.66.0.crate 276687 BLAKE2B 2b2c0b64448fc03bad28dca4ed492aaaa9518458c739083de88775de68ec4d7886adcbcf95ff61ad1a24d15413e7d886e3a39108423e76e794f439a2740b470d SHA512 3f898bec95bd37551bd471c982abe8450377e43421bfc23b6064e884b0f137e85ce270fb416e66aaf0303c0ad9c6cb16e13204849856f1718787f24fa3566b22
-DIST gix-actor-0.31.5.crate 9335 BLAKE2B 9ee5d90bfbeb465aa42862f4b4badb3e562d5eb8fa464f129f769f2e53fca06585cb8c510fdc438bad12c05e8c30bed3a471bf1b5ee41144055b979b6ae5936e SHA512 ac1a24e789896d573c217ccadbaa8117bccd22961ad4abe598e5b1acc3aa5bea350a0b6def7f3bcd11ca6550a67f82906c854adad058dd584807b7758f7b837f
 DIST gix-actor-0.32.0.crate 9327 BLAKE2B 7e407e0863659070529ba67320f4fc3c6f6b27f761f35f7364cccc06dddd0eba77a349a60dcf39d7038a84f15da22679ee17a85282d97b06f296a73315347216 SHA512 e3b06012b97fb6551f6382b027769767db739a063bca2f442f7acadbc82148427e7a053da32141f10cd21e82116c6f5424a319ad7d56b8b69b02949c6f9e84fa
 DIST gix-bitmap-0.2.11.crate 6920 BLAKE2B eebacb07d6150bc16d4068fb0d5d1646f78cac93ab6cc82b64f3fd9d4ec928f5e904a3ab2bb66f697df2ca51c17eb586d873bec73380e894b66f05b94b7ed690 SHA512 889e0195b9c16f6cafe6d66a7d18da1dcc5f3aaebeb63415665102d838bf702eabe142fcbbebc28f3b69372eec5f51a9dace3d333caa6f5fe8158df89eddc40b
 DIST gix-chunk-0.4.8.crate 9358 BLAKE2B 6034c836716906e7b8cf490c9f066ea6a995d384be6b931df3db96c6e71ee53dc4e2efc065d1eaae130528f23ebbddda27608f0d08afb9a8cabb106bf053dd5b SHA512 3c0bf0b9aa998907f1f2c3e610f86f250c4f9bcc9384f4c636d3c8d637e9011b48f7ee33f21dd8b91fa66c01209410886ac68c2f04fcd4262c37fca0ff9ea6cf
 DIST gix-commitgraph-0.24.3.crate 18242 BLAKE2B ef37235c7258ef6603b122f9ac9bb527be29f1b4cf7dfb02a484ad77986220499633789466bef94508949ebfae50568493f216d532fdbbb84861e9f04aefc38f SHA512 270edf30cdd8ff90bab02d941d741ab6cf6a85d6c2adc25b41298637153e641307e15db9ad54fbf0ac4008497c77980202b067f48c2eef88a7fc1673e022ae47
-DIST gix-config-0.38.0.crate 63374 BLAKE2B cfe0a813c9900439e2e3e599e289651e94de664ce745ab70e7ffbce1d34a3446f31a674cf15f1044440e64ff490c8d3d696c31f71ba9c44ce2f6646ca995c55a SHA512 0158572e9fff19570e29e209a290b32bc11ca3314b060406c38e4ff126ee9af302bfa454aeb4ebf88779fb090f33bebf34ed279b7d446494c3ede726c74dde46
 DIST gix-config-0.40.0.crate 63360 BLAKE2B 5206d0d761cd0f23170c16ee5ca41ac876a0d8dbe1b0d9b1d230441ad2845e5c2b4bffda9d4e6b77acc552771616e4337d4e9916216459658614b3fc42eff892 SHA512 c124f4e460f1288b3d374903acafbb212e5dcf7a15bf8af326ccfe8ed54aeaabc4debd709e94ced4a2d23f207af40d237e67efd894c3872830a931327cc5a7c5
-DIST gix-config-value-0.14.7.crate 12835 BLAKE2B f1d9ec7e8ccf0a70f6d5d875f64c45f6de72674f30a641675ec3e8785095c791995cf39bfa50e84c945d9c917bf5ed480aeab8b1eb4db0b811fb6384f7914212 SHA512 c0ac9f9af699fd6120b1ea03dfe298b11927e15136287c983648565f4dabf336eeb8cc0ca76cae4b4e00ab85629e8855c57b7e3354c35ef8b5e1db330ac4f61c
 DIST gix-config-value-0.14.8.crate 12828 BLAKE2B 3d08b92b6a5b9468ed5f6bec47a9a7d968cc0727ea7819e1059d518943ac91c2dd34c9c1cec0f520b6dd2c4dab8d0a5db1683bf0a215dd4c9d6965c6e6c83a2b SHA512 2bc52ecb47aee3178f6ca0d02ab325afe6080fc80f85eb2d7150e72b8b46dc4396ec8a9c70e7dd7bcd901357663962888941de382740313eaf82daaf159c5303
-DIST gix-date-0.8.7.crate 10349 BLAKE2B 8a08d243bfd1bd11d4adcee0fd4a0cd89f94df03887eb56bccdf4279b5bac7ba0ddcc43ce490911d2588a9a399bf6ecaa149804c437aa1a29e94574916bd79de SHA512 04b9b41dc5e42b3aee063fbcad1dc5d0fd6d842fa6a1aeef08635fae579db8b13530ae518ea93dccc2fda3de691869a82f315fd9afb3cdfb96496e9bb8db0687
 DIST gix-date-0.9.0.crate 10501 BLAKE2B 70ff61b0177f442e3d262008f65529c28a58ca5fd7ee2ba1a7a02f7861e1ae11efb9ed29f6e396885b9c7c21ebb23f574c22c6f5668d7dc1b8f3d766b368b6f3 SHA512 bf620acf06ca58b7990dba33f61ebf8df9e64cbc7ce82ed8b0aa61b495e8e0ed3d4d6b013118aea8b6f8c3890e58c04756e2878072516b4bc4838f90dcd5d0ce
-DIST gix-diff-0.44.1.crate 32197 BLAKE2B 4677617e405c22c4756f993674841838b769ae89f9b6109bf9e34b00001115cb1d8b97fc9b22467d6d0399fbdfa884d6e4e5434f15eb52c461c65d4d1a988407 SHA512 90fc23f9ec343864f51c7c18ed0b2a27445d7eb5473fa64635bab3b307413dd44e861e0ba083456ff05e67911b718320ef497d0faf7a6349b4317f433febf400
 DIST gix-diff-0.46.0.crate 32657 BLAKE2B b7030adb15068c4e4ad86588dedbe1ffb8bf5fdbdf5a3a79188a41051053cccd7105b74a274ac3a8262e3effd5e5509bec50d8148616b6eedddbd51877d67394 SHA512 0a243466cfe64f07ed389fb1215e67e636c9c96503ca0680a88c54ad5daea74ea2616ce606d09d0b8367987faca9fa1d3b91278cf7ce8524649bfd0a9760ddef
-DIST gix-discover-0.33.0.crate 16632 BLAKE2B 0f416b93a145ed053e5435b53197815f381da3e1f56734471a434b3ded2cd98e455e29edad52586b9d2629e209c668d215bd642d4fa8390d90edba77cd9d9073 SHA512 aa76b2427366c406294740bb6c5ad93d8c52c3e1aa54a5a48a940e96879741503cbac597ef5888e7812727cabefadc8cfb7b49d917571dcda1977438a9dbbebb
 DIST gix-discover-0.35.0.crate 16625 BLAKE2B a9b46b89f35f7f16d2388a15bcfd7de95f07667e9b08f5285c47f0f176b7aaf7d59c0815b461ab82a47acd7858538497f2c61722c9d893e70607efe986615770 SHA512 dceac4c190ce9cc4fdf4b66a36489185ced44782c9c1abafe5aa52f8a1d18ca90b63bccc79a5191703015ea9d582180813a47472bedb79aadbe6f165e11d7e85
 DIST gix-features-0.38.2.crate 30604 BLAKE2B 68bb0154bc444a84dd20bdd1a56d770a8c68a816389dc8ba0a94ae71da9c9955974cf7a154de5548f65e547a5e25303efc19b5e225664ce8f827cdb661bb17d8 SHA512 d82f70bd8831701b2c17a761b306e4b630fd5b558e4b936aa8b2f87440e53127b48f024c392b487af23e0c541de4b064c27c35ee57005a81352eba0e6bcf79a1
-DIST gix-fs-0.11.2.crate 14873 BLAKE2B 8557656c68235649116172d1f2494bb6cbf1084b0399d6b4ae89860deb374b51f1c5cb9d389e3c8da7f41b5b298b94a07c66f0c61b741f5854ea423870dbd6a7 SHA512 eb828a7b2099286a62547eeddd76e350a2f4a20635a6975a16b9e18e7a56c06d0bfef1c469b0d82ba81b158386a3590fbc004906fe57da8c5c548990f7481760
 DIST gix-fs-0.11.3.crate 14867 BLAKE2B 71495a8f84c1dddef477ff6bb19343e58e8f0b0e3786d327750bcec04a1971237ba328061505810943e0c8a864ebfb36fd47c01dd51fc48b9d18e0a0ac329070 SHA512 7d420a8cd322561808f84913c5c6880031a07005f535bf4e379673707feaeb8fcff4c2a41b455fe76ab7af6fdf0a934c471290d828e8416c26ad49cbda1f235f
-DIST gix-glob-0.16.4.crate 13429 BLAKE2B d740860b35d5feb90efc5e1dc8bc89b89455896ec617d5d161dc4326a47eaaf18ec7632d6d2d73c5c0c34c1b5793917129a147dff02e2f5b9a3d3d357b82cc46 SHA512 72d3233913fed5f45f4fac17a9a8bf0b1abf16cc678412c9325624394f7040d4d3042f5e3ee877bf19f95046a08eadeb58fcf9bf01178c270e024c392561faeb
 DIST gix-glob-0.16.5.crate 13425 BLAKE2B 233ebbd4e1993f5139478b1d482f54b47992686ab175bbb01fb95591934735d93681d8b888e85e7e2b6c256afeaedb7f6cd4fd666bb2a3c8f3e206b34e50a29a SHA512 6b8a22c5225a18645ef673fe73f7da73fc519650d03990f7fa43bf8f0df58d4c1a39a0da297ff5e76557b07f89f1aba5955a82a997bc29e52ca9dad808858b2b
 DIST gix-hash-0.14.2.crate 12759 BLAKE2B 033f46ba342fea5e2a7b5b91eeeac06aabaae527d10ed665ef1d2d7f34362ae7ea27df652012c5ae25872ab18175aefe15de3e981647086d8008a32bdffb2d0e SHA512 32ba5cc7805146fa858501bdf0cd75bd000550aacee258fdd63572323cdd06e54c78b4a71761d410c46471dc1bcf856e5564586f24ca2cca03c60b9e08b4386d
 DIST gix-hashtable-0.5.2.crate 6421 BLAKE2B 483871bb398815c4be337e494244a9f9f6bfcf2788bcc975c96a5095f213f6b70a19902bf00987d3f16316625617727cb84408431398d32e5bc1fffdeeb84340 SHA512 d3b963cf2e82dd034bfa5912bdd0fa384cdd501efa6a0dacc70838245ad072daaf49e2f7a84d2d41360c0677af9c0162831423b4a903a77f5f7f8027034bc36a
-DIST gix-index-0.33.1.crate 45861 BLAKE2B fa994405d178307645a3c14858a64a58af340593484221bfb2bb7195752962024de2e2543a615647de3c32dd9370e4197845a2045a78e3386361f3a0f4cdc0a5 SHA512 2713b4b1a02a0f6bfe227dd875903278ce8d7c66fd4ba2bf8dbb8b4d8485c32b6bacddd35544eeee9ac3f7a89a4a2ad91a0cee081d9dacb4d5f02a8ae5e098c3
 DIST gix-index-0.35.0.crate 45850 BLAKE2B 6add13aed7d9004f0d3916d37c693502e934462acaf5b155df086b70cf7309787a19a2161515493532adc1ff861c7c949260c6edcb391e64a691f5501dbac010 SHA512 53bdf43577880fe060bf36fe0c89cec28125b3c1368ce7769a6860855a5f095ffa4bcaeadd907aa6ee3fc2eab0bfb213d8042b7394a434e8e24a5f25b686f7ac
 DIST gix-lock-14.0.0.crate 9795 BLAKE2B fd6c378bdf904be22182ae48e7898e9b8d5ee5e3248545ebdc7dc21195e7da0c5977717104102b050af35a7152829987383c0e8973da18c1620dac1f637b0aa6 SHA512 46228f8ae0d931c6594f2ce08eb8aebcf77901dd9664d134ba5e5583855e40460f08061ab5d9287bdf17e452b821f0c336d49b7aa181b44dc091925d6982205e
-DIST gix-macros-0.1.5.crate 8627 BLAKE2B f685187e5c6dcd91012b0d3030121fb2f913efa12dcdfa080b936812f9acfb36fe282b8fd6fcc3f41c5eb78f6aac82792bb38a22db851ce06ead2031112a705e SHA512 61f21cfb309da85c5ec00e3023e79ca40af23597e676ffa2875bfc46ab531fa49d5843a25aa7d9293151c6d321ce82b3339bbb1a6bf83721f1fd145b3c77c471
-DIST gix-object-0.42.3.crate 32497 BLAKE2B 72eee3970d4520f3f317330d797671014fe5c768f99d16002e45242ef447e4334b8aa6baef4a2665a2927208b29d8ed896427757ea694b68b5f3aed57f3894aa SHA512 6b890445cf64c1b49ecde30be32d1028b087980567b86bc445426b10d2e4e7a2dbee4464aa601d085827db85a313947cda72ddac8cfbe6959aa4b7a100746bd2
 DIST gix-object-0.44.0.crate 32479 BLAKE2B e7656eb7b44a4f555541cabd19b0a04a9f2ac4f0e48ee41dfb49941133c2deec9e6a5682c410b29eb991e12d2480ff3927796391f8eb0c0d83c52b74ec36cfc0 SHA512 8971f0949fad9eae9285e2216b84d90014de55d3459cd0cf0adb5db5019d8b151842efec0499a44e3bee5cd53fb4ed48d742903ce2417da2021bd3bfb7875b36
-DIST gix-odb-0.61.1.crate 54308 BLAKE2B 42f77b7ac0f18f4248fb92cfa198eb49e44c9473159ec2d84c08e7e8770739b072b61976746ed20d78cc14e4ff5d16366c74e1282cf962f4d2cf39f370dd3795 SHA512 54046bcfe9c919ded11c3286e5b588ea507b3f028598ec13f18f5d076d454b521a26458c245ab81f81699d223abebcd7ca5318c21f8737309314aed0e472e05e
 DIST gix-odb-0.63.0.crate 54304 BLAKE2B 71ff5e546632a7ce7e4b9ae28ec96c9c22028e756a6aa48694ffaed4c3269d52e47959e3eebbd19c72b4a4675704b11b42c2f643843835b203359f34bc268e78 SHA512 6f17d5d12095b51071ce83f4fbcf6d5cacb567b77ae870e38e5d3cfd8a9f00507c6d0136374b6b7b4dbcd2810b1b1f58b077b98feff893db403ebc525491d1b5
-DIST gix-pack-0.51.1.crate 96737 BLAKE2B ba82d85871651e60884f8a37b34764935ef10e1730079b7ec9ef017b5df2beb3b2f245ef05e4d97b848a7c40e9e92605141b1f677c501d03d4eaaf3a17d36279 SHA512 bad1e67e628100a7511320a3f4118e4f3e7802354fa5f1d6afc6cdace360bd486883f48b61f1aff1b56b55d399811186b0eec0b1f13b761fbe1075d18a90c143
 DIST gix-pack-0.53.0.crate 96726 BLAKE2B be3846b23a12622ee4e2d47abc11b061fa4681134fefcdfdefc40581da2bee60feee695fcd96dce64ef8c27cc7d0da6b5f99b270de94540ab839596a1f140c8a SHA512 d7297d16b3a1aa5754a998f8c98733ef0bc498b76c2093585c6447b979bf63c343454e4dc9f37bc3afdaf8a1b5173cf16d60854c7f56fc382f27fe95d735ac2d
 DIST gix-path-0.10.11.crate 22554 BLAKE2B 8b16554acbedff39d7dc83ab0b15c5162377af41ad27a612f1fcc4d55ed5dde5a7c018609c922ff6b928c9c259b29090ec13a8f37ed39dc0207d6ebc6c8b798d SHA512 de21b58ab2a5a0b22175776ae9bc5b313e3fdb4194df74d21bb95f4af68b2df279fccbd6df640fea95d631cf349f8b717afd9056852ab92bf28d6f82153ca191
-DIST gix-path-0.10.9.crate 19601 BLAKE2B 60d378bb16a89b58f208151d09e76b461e22c8be0d0157f8104b4ec03dbba71d5ddc9c11d4f5d2ec7ecb4e3484fa9e4c6b415a745dab9e5d658a058dc3c250a6 SHA512 51010e988cac47a5be7fc0b98a7f62a7873cdabfb849c51883f5ba45e590ebe26b8a8d8c0380c3e4a5eef1f5c2cb39bf596bd4f0ff65c729684ab11584e8d7d7
 DIST gix-quote-0.4.12.crate 7055 BLAKE2B e3bbcc1bc1ec169a4d9b36b1fa23caf559bf70bef14a485c2652d59b4562c514457c14ee4d2178e0f564560c310e5d304af993c587d6d352d0d6906dde4e4bbf SHA512 904da737aca01dfda12453b3593410e9aa49b852b91a7d25298ca885be0922d9498fd622e36f0601de0fbc7b2706e73e79f8281e74417b3b7084dbcefaa3cbec
-DIST gix-ref-0.45.0.crate 56670 BLAKE2B a56c2b33a19f1332178edb59b4960c86ae2a913deafff7122c45fa1fe80751e70aa64bb63eb51036904f65e2d83af784756035df0117a1246ae7e90742ad7d98 SHA512 27394a20b41d27d958487f122a8553432c061ab4d70c05e659472968294dea8c5bc5db554957b121f4ff196ed911cc9e9e3a9ec590014eb5c1ac029a1a60ea0a
 DIST gix-ref-0.47.0.crate 56887 BLAKE2B fdde0491933bdafb55d5fd4286437ba5b2ffeb2a367612941c999a9e6c89ae2ba86a3e715107729ab421fe1088cf97243e087cd99c56de74ed6bd1d19029a762 SHA512 cad699ff3dc647ab3d9766ba6cccd2b041d1b889955f22eee12e49bb2cfdb28be423646c93fb5b4717280e4655274f3308805c9cf96c46ccc67249f3f57ddebc
-DIST gix-refspec-0.23.1.crate 16175 BLAKE2B eb54f73575dcd51d522fb4c288749caf612ea1a362d1edf7cac385d47ae3245c1de0d7042cedaac0d8923cb0bfc51cea920dbafdf5f3cb4d40e2e26e51d26af9 SHA512 f6d9ddd0c7040bd0674d21f66c4459dbde678e89feef0338b5fb30099164acf3f75dfa66ec6777bd503b4bde7ef8425ab4932ad963761926c775416415407381
 DIST gix-refspec-0.25.0.crate 16162 BLAKE2B e59fcd54c754b7a480a82906f88ed3a7a3c7a94e9905f78b17bacda98843df8512183773f148cc2d43615ea19d68de1648bd8f76aacdc491cf1526873d86f3ba SHA512 01e05e76304dab410633853462b533ebb3db768267eba3649c417c3f0e512c315433981973a613f38c172f024f1c2517a8a842aaabe6e7258af0b7bf916e5f97
-DIST gix-revision-0.27.2.crate 19204 BLAKE2B 5eac4e2e661df52884038e147d36afd379c4557823f013ba34c8ca69a6272b3c8e42da4bdc35c367d605630239d3fdce95ba538a3e95ab98436a8f45c742ed53 SHA512 21ce7c3c6a060f4632078aa3be87261fe5992f257179bc3c0e8b68e30d6bd18a8163263b0023832f09477f9400ba450447b0735ee8e8faa50ba91c570cede00d
 DIST gix-revision-0.29.0.crate 19189 BLAKE2B ba34323b5f2d465a791ae1135ed9ce1b2801b60e93b4757a1a5b407062326640eb44bb79324053f62c3f6c84ac5dda7cb9f54c50cbacd368a13ce6ae0ce76919 SHA512 85d87440b8028ce17125b3dd30ded2785fb3d810c58ddec727c72fe5270248d7b9f321ccf46d274bdd05e2d238084c6b6e54ca7e3e2a7d9e44e091a05c961f24
-DIST gix-revwalk-0.13.2.crate 11854 BLAKE2B ed441e03cf1bdd3239fbbb63665b41d25e7f8556b569bee0123bd6500007ec398d43d80d3886331d60d35790dfc1b0411501591f496b0f7e78d561b67c0566a8 SHA512 aa545ae7130b0d52d93e976620ac8d8bab1e347e0ce6c46cb2b1c91b3eda2814ae4fd21ce8850a85f61d2b3ce5d8759a29bd8e52017f325782f8c14e17c7cb58
 DIST gix-revwalk-0.15.0.crate 11849 BLAKE2B 341884c206f5e1674d5b07411369cbea74c154e5b98bd26395a1986e6cfb84c9b361504b1bb52fb8d43176df98af91e5165810ed88d4e451c90a0d779b021178 SHA512 c9fc3a3c16892743ed7b65c35f3f22150f7b5c6cc2c77d92a7c1ff25c8cf3a0d6236f0462de5c2122fd1db7d92914a5841ac56b7090ea3629632e3c1e7f76b00
-DIST gix-sec-0.10.7.crate 9406 BLAKE2B 54253ac21397b6327ab4dd05983792eea41c9b96b743584e4c8b165e642a36889871ac804f524db1be0727405611d7cd31181715cdbe99481ed769d4fab75366 SHA512 1747cdd259b982f2644ddc65d670ce039148bc998b53fe98f93858a24c0bebab3d504beab989c4575417a72b23f48d28d9e2b775d055f4210e08ffda26ca9d85
 DIST gix-sec-0.10.8.crate 9400 BLAKE2B 1d7be29c2a510c6c5cad62f54ff1b53fd3f9df5c0075a86cb9e7ad578e8962a9ce6e5ad138873605fe80ef42349ad2cf087988b621bf96dbcbcc63a1f2fe713e SHA512 21d244b71abc5ca3b61b05b60aba61e86d5f674fa738f82ea34e0f04c21462683a505e3d692eb323c60a8c532bc639798b1b1cd7fbbf9cba2636c2efdd40abba
-DIST gix-tempfile-14.0.1.crate 17934 BLAKE2B d428c08dd1a2fbdf7035d8770370c55c026887b2951ba833b1120d07da47cf455673cceb777ccb86b3ee261315ced2c3099c7b3b889cb3d659240cc6b767025c SHA512 78c0b5daa4d39822dd75208895f6893df60e99c235cae6de00dc3dc4ab673b4e26c90cb4b203d7481b52f6923ce10d4de1eeadde71d5998702a3783d866c93ea
 DIST gix-tempfile-14.0.2.crate 17489 BLAKE2B eb333777a1389e189b1951fdbab987e4e39c44428fdb5a4cf6bd75e1e963ebb9fe47143be4cb4892ae6524c269e58105bed6463f9dd28d8fdfa57ac7e938f38a SHA512 1baf8a34eacf5df9125dcf0a03b804c5d44f12bbaa93498478bec2a99a7fd64d052a69ecd5e568fb88ca0113c3b8c72e1e5cd8ad062acad94e97ee122898c3c8
 DIST gix-trace-0.1.10.crate 10403 BLAKE2B cb0e81e52e4711d77e1f0a2e1df5053fef8e1a520a38d5b929e28f0c9410212d67e169f007426434b63728a0165c0a67fbddfe934c0c867c147f8213f6fc2a79 SHA512 2ae0c76e563976d491a4ed7ec198e06559d68fe8d4b5e6ffb1381931aa0a8ffd3752249f9c030f13be0587324ee5e4d6ed09f9090d8161b24c15fb2a4b3bacb7
-DIST gix-trace-0.1.9.crate 9659 BLAKE2B ce18f59e91f4fb33346869beb2b6f69721d8b374a3a6f583ff77f27b21126f359c812449ea5fff9da00f688bc59e1f32004564a49c2a179a33d4fc184b8ebd22 SHA512 bbff4a4ec60e639238ab0f2623bca6c56914eefa321c8f45ca37507faa431f15d743832facd026dd3a9e3d9aeaf21aa3dd6987284a1876e20000888243cfc0a9
-DIST gix-traverse-0.39.2.crate 17291 BLAKE2B 7d543fa1f438071841597abddcb0944ee912e5ea02390b1c61abb42062315591470d01f80ae9309d15b3512ae6c9ab1e38a47a76b36570d17703c5c24a4c88da SHA512 8e03d9bbf9ab88d2bf1e4a4cd70790811d02f6a347f1781e3bc99e58786b8976ab1a5dfdc2379a0674e97fac0f4e70ae1ff1c348b78577eaf6f7225119bf8dd1
 DIST gix-traverse-0.41.0.crate 17286 BLAKE2B 539dbac0c545a85123356627d0e3a43c65e8d9bb5efd06b631c84e8efb611f8221b4701562806df00e1276d3c85566c975209e3f2d190f04ffbe65aa4dbc0422 SHA512 1f817abce2b390a517f9ed192ee94c15f11bee56cd0409a911eb0fea1c1ba97af475d308fa15f4b07a0ad3f3f8ccfa54fb67d29e1780b67d3386df3dd7edc627
-DIST gix-url-0.27.4.crate 14373 BLAKE2B 6546f815c9bd803f82a8744a83bc190022d9ba8681bac71ba5eab66e351d46c8e0624a7f4df02f1915a4acc7b1c2211502e85ba8b83e2ef455fefcbeaed26552 SHA512 bbc98678d2b46419fc829595893bed393b52d669312dc70ea72e0edd2a4da3b71d042ad5f68f5ad4bae2fcebd2806e39c9c65beee77a61af3d4ee4ab4e5d5794
 DIST gix-url-0.27.5.crate 14367 BLAKE2B bb66a9e9cb4ac227f52aeae0cadc01d53de785fc75b618ef6639ca9cfbacd13a9dd63a8eed8152c4b75bdbb6f9760285b157bd4984ea7e995e3177806177695f SHA512 a007a074ca98dec95ed88e19414e55dbfaf7aa5c7b219af2d54785061c761642a3f88dddc52eed85d2a32e2eb36b371ffc6df16e12de2159c5ef2f20ffb4e85c
 DIST gix-utils-0.1.12.crate 9418 BLAKE2B bb51d3d56670350b9512f7ab8e0646a9390fe2da4b4e2888e312c4ee0a5c935d8e2540dab2883159d5bf164276cf29505914451b5761777fc5e770ff2fe403bf SHA512 5cd4a93a6080eca6e84a13f9e2d63c7c6215cc86c6662f1204fb8d6feafd94cdc6b0bb3b6343e24157b10edb9504d89fd479e707a4c7a017372f1f1530e6d672
-DIST gix-validate-0.8.5.crate 10408 BLAKE2B 673f056b674e93fac90e996b7f0e63c419d18eb345587b3f1cb1c1744ee9596e4e6b0540db980f55dff6519fdb94f21d67b4ae6c579159893dc672cc9d500219 SHA512 4e9bc069785d23612b93dadd6a39cf29344ab9526bb31fcd980a6b52a85288cdbeae47adbb8a52bc1615073f696512d5faea9ed7512ddf6345c5fa0aa21913b4
 DIST gix-validate-0.9.0.crate 11204 BLAKE2B 5e6090fde2f6c60233b51f40458a06c8c62eee55d0ad9cd1da5d27ab71959a9b243eab8bc21f02c34c764255094f87b8d3c496231e8405ac8805e6eb19bb9903 SHA512 4f8eb8bd2c08c7ff07f523930f37c29d47be24d921da2d9cbf78364478d2044ff0fde1233d0c5b881a6a2018fb1270121707351f2ba4f630932bac08b596b822
-DIST guess_host_triple-0.1.3.crate 13984 BLAKE2B 27ff34cbf44172f606bf8cd9ed614e60fd018fb7cbe0a1b3cb2ef93f311049dda88d5190f6b39c05575ae40145477dcbed7c878a23bd15c291a92017653c6623 SHA512 6cfba546aef4d2ef4f3da9097e11085cc48d92a80b5d76990a20f794613281d766c6cf37c3b845f71653342b6d6a0873cdba9d2dffad806185e911360488bc6e
 DIST guess_host_triple-0.1.4.crate 14029 BLAKE2B ee76a48b46368a8653f72497cbe92f6726f682b31f594938989a6cbbf489085c09efeca86620e10a7c83f56a51b444b702b1b6335a9a55e44bb091df4eff2abf SHA512 dbd617a498e7c43bce1d946b68944ee349a5c6e0c98a181054311c0e4f93e6cf6313cdcff4f342e0d45c94d7d82cefc2b304726e5e317d7ea91f63e55a68941c
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
 DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
 DIST hashbrown-0.15.0.crate 136460 BLAKE2B a2bc34b9d2eb7ca52dad7bc59e9bbb38ff9f79925495e1645eda7c0587e86e0a3d0675f8c7f159c5a83dfb2832fee9788a7ba6914168b51c26f762e140bd05b2 SHA512 497310e0f8e256e931ae0e752f66eb3811d5d3b9254dacfe2a1227e8532dc23eac8cce7a3f0758fbe0e0fd8f08b7bb18b5f118dbbf4fdf575a31666283583111
-DIST hashlink-0.8.4.crate 26514 BLAKE2B b4f0e4c964a7a3f7bb31f5b04c34598372fa867fca4550c3e170a1eb31d58cff44314448a467d4b8d6748aa7a7bea4ed422bff76e9e0a5018f29b85a6c51f3f0 SHA512 4b21564c26673458668da18fd95246514e90cad603ada7875466bb056fe461ab31c1db77fc2ebfe207a1bcff06df2b0b29c258f7fa9e5c19cb4e4b2388d53ff7
 DIST hashlink-0.9.1.crate 28928 BLAKE2B 14276fe00fb8aa7a8183b5cedc99eb403c0a68cb662555cd51efbe55a46c864f68f3d421395f56defcd1a87576c5a38509581adb5d02b831d9aab2efdd376f9f SHA512 16189f332b9e2a71f8cf4c8b72485eb107c4a84d4bfe3c739ecea8fe5dec33ad3c796d57830b12c176bc65a2066913c809a0f7c8db83e9da1bb0c555de8d3717
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST hermit-abi-0.4.0.crate 16310 BLAKE2B efcd1dee7bcd6d185cbe0051c7bc7e2776857ffcfd2adc3fb101febd7c1bd75994b7e4a4a0a59c5b4628cc2521b4c1f043e98a0c44935d0180e7499667690ab8 SHA512 b1a21f6d54598185a8e8c29565ffc2e1bc5da57cf1c9d87ba643d23d7c23d53e8ad36ee2f5c1ec8a504334b6f98b0f17a832ff37877c7b7f9238b196f4034e6f
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
-DIST iana-time-zone-0.1.60.crate 27074 BLAKE2B 6f534056e220e2f721fc7c7f3ed24152eea7f07d1f4cb3609ca734ade32a2d6b18fd0164ed831170cdff192cbe48653b2c4eb0903fb6f157292b3b5bf47299bb SHA512 5619b994d3277f56e65322a7903e4c5e03928a87bdb72831cbef88788aaf5573b8460abc0a4d5488c5df7052bb978531d973dd66002b0ec4a3af468928c9b722
 DIST iana-time-zone-0.1.61.crate 27685 BLAKE2B 2091f0bdbfae3f63ff846e27136d9779a2d65f85cef899ea3ab0ff7c987329e6a584cf49c57de566f08e0277bd4981ac3db30ea0cec6a6757ed50d96e2c6583f SHA512 d16c67f435606334042c3a286350db46ff3409f142c0782509b136150b4069aafff0dc5c2ecfb7519dd8d105b9a2e6649df2a7bec33ee3966dc94034c9d5a1c4
 DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2
 DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c
 DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
-DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea
 DIST indexmap-2.6.0.crate 85204 BLAKE2B 420a3cceedab93e5023b476f9b6b93e57057238425d4095de59eb9490c2a088193873e643dcad2f739e34e5798baa9a18939424cac1afc5fc7b93ae496ba188c SHA512 c870348691f5acf97e7bff25c805e60f2e9db9e3ee7b3b939b7be45b6bcfaadee9880e6ad27adbbe2545865193655b5fa9de18487b7a1d030017b2fca48616ca
 DIST is-docker-0.2.0.crate 2664 BLAKE2B 6c3b10a805bb077b9d0c54155fb9e72a15304fb3d6f0ebfc3efea8b42e02b99737d22c16a5352ee0c1f820699f765673bf0ca8f46c6a49b45796796c01015b84 SHA512 759e00292710b685954df031ef96bb650993cc3384cf03760ebaec377524cadc929c6561dde5fd3e14d71f9f122c86495dcf9893d1216d99055048542123ff06
 DIST is-wsl-0.4.0.crate 3264 BLAKE2B bb9842ea007d5ff132c77b719c877c370eb5cdf63aebea8f3165ab49fbf6c68d624a3809de2b374cc4c6c86dfd0fb23b9dc32c2e7cc5f2378b2efc918dd710c5 SHA512 69ffd419eb4de2e50ef4e61efca76ec4547216957d5422ac7b2bde85264080c2f522714aa40b5a6566c25eaf791d12ec0df09afe3060cc43087d18510f33d049
 DIST is_debug-1.0.1.crate 1897 BLAKE2B 870200e87f264b1e3b886b9a103853de480ec6d5fb4f7bfe4943f06d445d7c7c5725cdbb230acdc62c8520834c4fbba2145c7589a63443c56a11d7d9d2504ff4 SHA512 08eac6f8ae7eb63a9c90430572c3e76159bce772d78eb892bd93cc53fe05d4706a72fc9408c72daf6f0a0287cc100dc201b1a197de4d7b66ef4e8e42f43ef594
-DIST is_terminal_polyfill-1.70.0.crate 7451 BLAKE2B 9efe76f14d61a5af6d3cd30d5e64209971d4292d8d2c12f4a621ef65324a5bccbb7e1d79d5efa75ea7456431241d6325cdeaa0af802b1480c6cd9c1bc5a35994 SHA512 c07d5076978e4c5d8d6a191d8880fb62643161979c473564881feb17726cd9ac8da25c40094ff12727dbdb064fe88fbda1867120a2c3fda1051bcc39380645d6
 DIST is_terminal_polyfill-1.70.1.crate 7492 BLAKE2B fa663f858ab8e5fd56202d731b572bfdd4ab0e8262100424e27360a9ffd2820182bc57d6718a305ef82d04c3798111841c0d9f9dcfe219765c0f63edb560dc1e SHA512 4730fa09401cb4e69c92b38b2b43afd74699c61f5bd7b37605efbc0c08ca7a1318d43e4a844e46e0f84f83f42432f01e33771be2b18eb5977702ab9f894837e1
 DIST itertools-0.13.0.crate 146261 BLAKE2B b23d59a87f80d24925bc868c0ac7abb6b9d05aad5ca08833634ef760ce228a1b753062ec4bd22237d0e74727edecd7ba3df9789cee896345b69780d7de66866c SHA512 c6cb8f93a93b6ac1a2cbb3033e66fc81a39f83be773b734bea3311332b96bc71bbb518aae3e6b40cb537590c23de1ca4964361c336795c3985bde63232d410c4
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST jiff-0.1.13.crate 604330 BLAKE2B b49600f8fde014e6705cb792075b1492c816107161af5d74577de5c9f95db4362d2e8e4493969852c665da5dd72de9c05d42e81cd5ed2869a7245997b14a827b SHA512 70025484872505d2ea50e59c463343280cf2ef5041a1a166f499802022d8ebd1f7ad2fc6ed569688a7bea097988941f21ccb1bae690c3924a6828381fe05c35d
 DIST jiff-tzdb-0.1.1.crate 82030 BLAKE2B 2d1b7931608ceb547962987f7f7abbe4d0eb90bc1c3d62c8dabe7f0836126ca58044a459d55e5dc51899f118b4c17cb08b8dc48f49b6a95c468446918c941fad SHA512 97717db33d0a1399e69077ff4c41af06abeeadbd3dde60ba8dbd649413f6f14c35248cb93ed166a4d5ce7c5133c6ae9aaec9d9ec19d7b25f3272c76c6f1596cf
 DIST jiff-tzdb-platform-0.1.1.crate 2945 BLAKE2B 848926e0a950c7667779242e31773a8972643999a12576cb7debea7bf7f08860a3df1d77f800ad074f32308ab8a3382d402f330551f27acd90c70c7c68785cae SHA512 2a9f58e5318665cfb9864232dc9dd28bc816a27e48d06578bf44e41ee99524efde6471ef6268b99383caeabb2c8bf37f69f6c6b126d35fbc3ba9944aa6777f2d
-DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9
 DIST js-sys-0.3.72.crate 54096 BLAKE2B 76c1044b7684ccfbc06c6d43541fc39552c058fda5ccdcb7154c930d03f5260706ed42b36b305e56c5a0eb0dcee27180d3df3fbde92f3b7ba5104b0709f5714e SHA512 5a83d711a02bead2d9c05aaf8a7e3f351307b3219f4f6697bf190d9a9b36bcc10fd33ce0a334e4f3e251d52fc7411020a3631d0874097e9b519e839b713e1c42
-DIST jwalk-0.8.1.crate 39882 BLAKE2B 0e71d2e1eb938c8e42074760c55702da9f0124851299e6bc80959eaa6b446023db646f371fb618d7e072b12152e1cae1e04653201bfec382b534d453d632070a SHA512 a9ebc9543ad153a83e58ac0a7826cb083c70201c7b5794caf1104eb48fbfd37861ae5dcf6966b9212ab8ca4888f00e0a37297c75b196e4f56be9d6200c96611d
 DIST lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
-DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
 DIST libc-0.2.159.crate 755366 BLAKE2B 70f46eb6228b4a8958dfbee00cdfa3c7d218f30d66c8591f4ccc9c5d8eda411d83ce9450552384ac4bc29deb2869561a2111dd157c9f228f617baf8f6b537bc4 SHA512 c803939ceea5ad9bdfdd122726c7a5f12ffd8b0cb66cf0bc62c9670e1e5904a504def388c1e043c520f4ece484addf6dac465aebd58578aa6b79995077bbdf9f
 DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
-DIST libz-ng-sys-1.1.15.crate 2386853 BLAKE2B 6f560cd4092b909a7166fc8a4e933e34e8c30ccb71ec31b4e6d8d21ce504c9f02c41bcac71ea5207afeb13a549044cc9398e042ed15b421e89e41c9157b69968 SHA512 e3a573b63612c88ae9a3dc26e3959793e0e76dcac3a14c4bdeff9ff15b3598bb20adfdf492c06b7b324a7977db82e9d82533b644fa1f18f5f1a5eb49ff059d89
 DIST libz-ng-sys-1.1.16.crate 478122 BLAKE2B 7c1be97251029732cd3a8c77dad8a492193282b5fddf40df480ef3a35a49f5d25c7dc183d81aa267722276156c8b97243742117686d078f2d3a566546fa83d58 SHA512 c7d1b062a06b283ee2d398ff456f13634ed1d2d436ea2b8a55f19fbbad47bc419e068b0f9e805221321062b8c5ad309dd3e5d466741780549ae3e5299eee06e1
-DIST libz-sys-1.1.18.crate 817891 BLAKE2B c05a758eeeb1063fb369c0e9de6956d398ea4755a59bb9be889a672676510ae9a8cb5f1cd5c07b45d50397bd392704f4486930433247771eed6232464ca30db1 SHA512 af7f037a4fed00ef58d49db444e4bb3dcc8e979deadd0fce8ec2120aa2da74f3ea1fff5a372fd771b037e3814fd73ea2f193606d3fb37afa9087edac5a3c1237
 DIST libz-sys-1.1.20.crate 830422 BLAKE2B 26265b1faf04f7d0cfd751ddf003585b1be59fcf8fde3ddfd86f18cc3e2d5c3b62a808f47c01329a57759d14fe6283cd94a72eda46d5c5031249df0f1696ab03 SHA512 9b537e7c01553e782be145223c6d174601ade3a950bfd0eb4ea09658da5b8910cf0d0c5984672f9d198f73d5aa63d21e0c20c4c44ff7d0a017ee11ae4ecf4859
 DIST linux-raw-sys-0.4.14.crate 1826665 BLAKE2B 804af73daf396bb20da14f831f26ce06325181de14f0c277350bd22d21789f2bdd663a964cc0e7c5cbd2e084285d02a401a6bfbb3e8a8f079c120f9488b56f99 SHA512 28149660bd975ede05624af3582d5c78f498239f5d89713c2c32f5372fc16f4ca024dec35f81ea973a2cf986098890395dbda06ac6cf4ee29df3f9a0e11eaea7
 DIST lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe884dd69c61c54dec978733b95a853c3e5af26f237e48ebb4ee9dbebfce0f6c06067f74a3d122e92f5ace40e22d7 SHA512 525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7
 DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
-DIST mac-notification-sys-0.6.1.crate 12242 BLAKE2B 473afa3ec0349f967b92b38d4fc1431d9b9b45ba23fd22aea6386de3ddcabc161adc672dbe6b394a5a11f9f012f3be1c84a48ff59c336c49221b5ae6dcf1e314 SHA512 76c202a10e1ad5ca7c892885048f07cf83c8acc45adc297d622c1f51fa706193bdb7a901ac127b0b96d97c03955feb3715ff83e08bd292e477124f4793488cf1
 DIST mac-notification-sys-0.6.2.crate 12581 BLAKE2B 7739da99d8dc1d69578739ffc75278f52b2bed65cae4f4db515286370d54c90d1d1025ed2b694e15b63608cfae899b55f2729653ddd58ea4c837e501c4bcbacc SHA512 f97f7beae6423a0f4897ddc9f2d3aa363ee6ab6c946b7ae1b73ba76354f9baceb01713f0d10340889ba87f66faa81eb609d8f5c2fad9221ebf8df94c484fdba6
 DIST mach2-0.4.2.crate 21889 BLAKE2B 137db92691ea6647ca19257abf90402344cc3a8508fe6f8760a02fbe6f56d5341a025fd9e5ef92ea355feff9f36ed6926bf70c79edc17977b65e935ad5f36959 SHA512 5338254f5b9833d41957715898ab4bc52585f99bc8f8fef3ebe526ea36d8a5cbd191aa07a218ebb6f71b7487418223e4279977294b4a6494aee8d01f34cf447b
 DIST malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad965c3681f244161deaee76282fa09b9af0d0642cd39ef35689f85f5bd7c2efb7ba8119a58e86c7cd12d81b2c6b SHA512 463b3d7666cdd7de618abf0cc4e488060c84d6d93c56d4e922169511a0b03de380ea988cd998f5a162b244088902198763351ac16dea3762f0fa0840fc29d6ed
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
-DIST memmap2-0.9.4.crate 32752 BLAKE2B 1b21af908061e6fe09484ce5f84d31ed1751301dffb6439512b38c53f9f090cef7541b591b968d0207c6d8351ee4d5949007caef7832ce130ffda1b3716b5454 SHA512 8bba078dba73253e8ee88f0bd2202dcd2afd0b7b800d08af8af593b882cb4acff7e297a3f299e253f5adf103893fc390dcd73e882a2e7d93ca96099fc2eace4a
 DIST memmap2-0.9.5.crate 33280 BLAKE2B cffb232e313c40c6a698ad6c9e6bf140193cf1cd4dc003ea6da08d748f11001c5426786f741dfe23490841350363db3b9adea927f3e40138b36f2f4558c7a113 SHA512 947eeaf7ded7241a256fc2b288013585f5034a77a18c8621ab01a4b47c0ae6e9b9414c5e9e2f2d47b661f8c6966b1ed0d159342cae80cf45e51629949c3b1337
 DIST memmem-0.1.1.crate 10665 BLAKE2B 430da33ee602a8aefb0a827afd288cbf0ec16f1d5377f38d17e44dd1d4cf5847b2123f50385c911423ad4b72721fa5b244e4bf093fb2fb1d3ceb53a3782a6152 SHA512 f4ee8123e0263c30898ff1e397bb3daf4e027aadf520977ccaf5bfc4ec8158b398a19bae6d48a85a084e43d80d5ddcbb3cbfdf986080041ce958d2c8f5eb897a
 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
-DIST miniz_oxide-0.7.4.crate 56119 BLAKE2B 68facfec9ff405bebe99f52bcf3aac6788f1b5eef313ca393e2a15e1158bf294003cbe31efea4c793e644e8ab4e00ef67d38f7d32849ab6f01a8e19d31c30221 SHA512 482bf02d7bfd25bd8abe5e5959132677202d8c5dc014b9b0b64fbdc204be1b8431867095c140a1183dd1ca59f6ba871a355422fbd148ce34d62960cad2b7a978
 DIST miniz_oxide-0.8.0.crate 56343 BLAKE2B e4abcacab4c8698d0489faca8556faa7bff53d272ea0c80e2e7843dc0f6f9229b7d5b0a17ae210344722a379853e7f14212505ee05da4e60549081cf77717c1b SHA512 044b641ce6d98d1968c1ee0906f91963f9f524d6f3fdf3059708177a759e1d498c63e595d3a3f0f9f3210c45c828b9b70274134ba078b899d7fefc2bbddbeee6
 DIST mockall-0.13.0.crate 22819 BLAKE2B 1589e2daf2be54c92b5b5a907c713b30f15b56befe9fb7420536c5c1ec705fbb795f24ea64f7abe465f3ff2cff586850ca30879af76331d9948eab4e57121326 SHA512 cafd57bc600896be2f0c414ed5ce874a33fe9cf4e13dd08196455f67c6f37e6b6a7ae716abc72088f55c0dd4b8454cc8e086f8a5e5ce087f0084edaad592f44c
 DIST mockall_derive-0.13.0.crate 47268 BLAKE2B f6f5d9eeb7e8e4c88d47747f35ebf15e1dd85b0db86e91cdc14890ccc50ab6d38cfd6df951860cd740fbe5790830505fbd388a1b4e4a6e2554b591f073e2dbef SHA512 611002863080a137e0966d5be2dbd347ca2b1143d504e971a65c3a6c8120fc2d5eada3fee1e27a34055a0298a263c9c29918c1e14b7300a1bf50271b00bd68cb
 DIST nix-0.29.0.crate 318248 BLAKE2B 3a13a88375a359cf77b28d7f77f47f178bd31ef74b7627b6701bc6fc601024706be4e9ac1a076c7cba26b64d3bac4de17aab45fe3c045aa7a36e2d9232e872ca SHA512 86c05084aa0e6238f8d48df0f5ce6e6d7661b589f4f3fbdad43387c59c0d6afafea4badf25d31db1611615de19a0b9ef18ce614846b79a47cad4e2c9367dbe7f
 DIST nom-5.1.3.crate 135018 BLAKE2B dffb33fc85029809be6dbbf1945b996b2cb68d01b61e13b3c45c4de4fd5a61d66723a51988d281b0d066b5452979327e1ff4249596bd5fa914257e1b2155a467 SHA512 a0ecedc809a64c22280ca305b9dfdd54d06e8f080cbf443ccaa2e688666a1b2bddf7e9f8057e7f6f02cdb69ca478829d9fe4d6d0cb916903d050af3a7a0c911b
 DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
-DIST notify-rust-4.11.0.crate 59658 BLAKE2B 7f014935db7c8561ad4671bd399960ff34854abba599711720f7afc79a2de7ed0eea5f82d7c812206be03d96300b59673abca69b4288a6f0d5ff40b45e5e25a7 SHA512 c13474ed7992c9b3870aa618e0bf43d8625ba2dd3f7c9d184998ba2bcdff9d7b7c0c50229af59e19026ed927688c23596724bc67b77aa040cc23a06fe8d74295
 DIST notify-rust-4.11.3.crate 58956 BLAKE2B da53d503f1772dfa850cf8c993b25e65406e01264d68b38ae5492ab405921688b8af7e327e6e7afeab27c0c861280d5c991bfd76c38e3f604596aecb0e03cb16 SHA512 b1310ae38f1c0e388b1bd18211c80fd5ca1213fd2913971546363767b25008660fa193587bafda2f7ecc0745b3a3c745aebb9a19eb1a466940a0435f44f81d4e
 DIST nu-ansi-term-0.50.1.crate 28536 BLAKE2B fc259654aca2119c1d913e101b0fe7a561b44ba4a6145d309bec23d82ba5e4db916852acafecb727efc92b5dea1641304b26c383ac07a8796e296bb179eaa669 SHA512 c29735a5e1562776251dbd7337a3e4b68eeb299e86c534feab6478512ca5e167b42ebd32c6c461b71187cd375b8a2f587feb962f1501a656543f1429731a95a2
 DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100
@@ -274,7 +195,6 @@ DIST num_threads-0.1.7.crate 7455 BLAKE2B 282514d1c6ebe67ab2c30f91efd5b6c8880baa
 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 once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
 DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
 DIST opaque-debug-0.3.1.crate 7066 BLAKE2B dc1dcadbb5654a5f69c59b84faeb3095f008a6eb4f63e3cff95bd4e97f803201e2f16f59a65f8ea21b662e77e3fed0d0870eb1db7f5a4f95cc02422907732951 SHA512 f325214d604e74197ddd9209a596851c5bf0c0f3299b79b6267c35e0ff6351205b628fb5086279684fbb29fd07746c91ede4f45019657e761d8400fef2b3d8bf
 DIST open-5.3.0.crate 24718 BLAKE2B d6e72d020cb8fdc6c81cd37548723f46bcb411733d4873cbd6735f9c18c52bb262439bb8d329b9534e99716e66b0a5c352c8be192f24e7b54b19053b5ed3f25c SHA512 00d149ae8b56e5f03c16099ec3b663afb64187b1f81840324e02d46ccdf25736415c3da9759996c06afe420f26dca78606eb193ff31797d950e7cca505753a8e
@@ -283,22 +203,16 @@ DIST ordered-float-2.10.1.crate 16029 BLAKE2B 7c6920160e52e377ba44ff63ac679208dc
 DIST ordered-multimap-0.7.3.crate 23265 BLAKE2B f894c3384d447e4ea0a58dc912e4e5bc6e72ac108365458195ac6af8c0f3b5e1f58941bdb7d9c323c67cd23001cdd5c340e35705a5f017c3f789d0dc777ab043 SHA512 4a0c8e2352037d91428cc54014c2c20385a76500faf345170e15d9354c180a7fd719d361822626842d01c4b19d44ee291bb3ccc07ea934fecdf52e28a5e4e354
 DIST ordered-stream-0.2.0.crate 19077 BLAKE2B 581285d32136bb9c2134f405c5a2d67c952a36eb3613912be029f2826b847919188e1b479506b46f20e0b63d371f476b99d9e7e1ee8d47ddef7b4f48451b0e3e SHA512 99976f90637f0daedeae05d4270d33bc03fad1c06a85bcf2cd7140b149f76c7560d5e60becf05a633a62dc82f7f65900eb8f510c62aea4e630b78c45dc76d83e
 DIST os_info-3.8.2.crate 26400 BLAKE2B d685f62f4273a75a5820d5445892fa5878cfcf3763730c2eecdf15fee12331884d04906b7c105f437299ee01f2999f77b6a4034e94f781bf694cbad8aab82b10 SHA512 4454fb13dbec94aea5849427742856619abe77b2209dfd0a60a8f446ce5f843b423831632786eb850d0493e023977fae705d0fabff90798774d1c32366984916
-DIST parking-2.2.0.crate 9730 BLAKE2B c6da9ea4d8c0a488a64510781b025ce07f283814a09703c58e8d46c625cd74e2c55d7e28a4c09b0886fe4ab415b128bd3114f8283d4c903398e12a11d65489b6 SHA512 184a4514322279ed093a27a9bcad5fce808900a9ebbfb624216dfcb90a5483e8bcc054d82a0bba4da3809364ad1ed0a623328cf983bec3751e4503c9670a3f9a
 DIST parking-2.2.1.crate 10685 BLAKE2B 3af8020bc27ea921d6023c14f20545f70a5a5a5a216d5f97458d76d3bfc8d9de937f3c92668d31a79de85ce08ed0236d440c64ca1e4fe0a7748f412b941c052b SHA512 2e49137b59000f0467aa9ee0648d53e06cd2b8319d6ea28bf04c621b873469739a34186840b02f08d770d109cca26e161b3de3e4341dd729701885307a6a8177
 DIST parking_lot-0.12.3.crate 41860 BLAKE2B d1899a1132035aaea3a784290cf4951ea3b36b2018d407e27d333b2a2ce3820e040d635009c44cb6e58ad07cec6565c0347af6f6fb02954eac2d4c348bb036f0 SHA512 368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703
 DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389
 DIST path-slash-0.2.1.crate 8821 BLAKE2B b3564d0f689ad1b943d132fd95adf2ff654b61f182082bd22f7b8f11dc9024cae8e1b9f3551c4424509db17aef899efd3df96a67e1cd588ffe0fe385c957b361 SHA512 c046707586f25f13d2f9fa452ea340198f6d2e6333ca3af806b9d2d1a61d46b033fffad60d1632ec16062fa79a3710d695b923b831a7db52602b728ed31fc3ab
-DIST pathdiff-0.2.1.crate 7142 BLAKE2B 7f9a162c2add4acd69a81171fdb31aa9a67beb4e1be0fe93d76dc46b320729257240fca5d65dee38901f6b6ed1e536e3fff09c93cf3482859e6ba27e7206fc5b SHA512 a646f271ce81d5f6d4a8e0d98a2c802a8796a961cf8fe8177911e7757bdaecd8b156ff22046f1663a9efcd5fef1e6f000e5509d3949dbaeb494126b7e8a546b7
 DIST pathdiff-0.2.2.crate 7481 BLAKE2B 9d445504153ebefbdd9656d95ad0b98372f69aa7871ae1ce43408872e55e43556c63bb4b99486b63007658b105d37672511d48f928bb0be753e2d0fdba818bb0 SHA512 0047a505d09fa01770dca12a795ff86c285e60c2072fb6b0c802c6b0b64f60e608f3df5aeefa7d0b266b01c551dbf5ffb39133faa7fd809a82c673a62b92dc02
 DIST pathsearch-0.2.0.crate 3463 BLAKE2B 6e1ce6e06e12249be3e03096aea7adbe27ad1b34a1f8921da9b287cd5a64d092dd8347fa582da05f069191e1c370d28ebbf875be7d44f5e544f1be8da75c1de0 SHA512 22b0da34d88d264cd920959202053fcb9384160d7ac241c2bfa27386fe5827889a0daca06b8883fb0d6ea38caffe5192f482c1521b4002d09d8e719a3ce4574f
 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
-DIST pest-2.7.11.crate 123779 BLAKE2B 23bb1f3453d5d839dba7b3292806eb2d327ccafb1b1472fd970262a44c0abbabfbf3316ca16dd5526177bcb67a701cf79fa86b68fd1e57a3d875cb4b7ff89ad9 SHA512 daf92b28d8757d0c41e347668e54b90522d654a451ba03d01d9aff9b22d6c57b6a264237c5c8b1340e45605626fe848dad84672ae2e83604ce22b2c89cbd08ac
 DIST pest-2.7.14.crate 128275 BLAKE2B e9c98901c2237d94f9d5fa742674e5eb71c5257cec89a3ea6a16ad7488ec77a21bfe4078c34e890f55393ff6d3223ec86868304df86884fd40b955984fadc998 SHA512 3662eb93631aa6821f1ef98350c7569afbdff82edd764697b170ebeaa75e92d7b301bac4722ba14175d0f0432b39bc891617413393569cfbf17e21b25fd6afee
-DIST pest_derive-2.7.11.crate 36320 BLAKE2B e81ed8b60492da9612d2208c6cfa712ebf8c6ed7993642bfc4fadeaba10a0bc16700bce012d34d955104041ed8bbf659d16d9b86eab52342875d4c6148e7f60d SHA512 96f6b44ac09785ce5981f082ddf283a178c676a0b436f9b0cf7afddc8be38583f0512adce83363f0ee8ec4f26bbfba01e30dcb17d9420adc00b0a82c10349b86
 DIST pest_derive-2.7.14.crate 38801 BLAKE2B e36399e55739b65e1056c82fda128e3eefc746cfdee523f174f3986a48f0442f802f35660ac889e7b96e1e1b6eeb5c9251403994a78e2f21b8c9630de181037e SHA512 df44b21a3c32209a2f0ab121a60a8442272a54bcc53a414ebf54de8721d09cbd6790737d5fa2ae4acf3d4aa9affb4df6f0570459ab8c48ed7634663469b17a7d
-DIST pest_generator-2.7.11.crate 18415 BLAKE2B dd65c69d8d0ff343d36e31e6a4f4e11aeb01b1fd23d0db06d90f506ec2f2bb2c50422f6a73b48780e16e07c8d0addb374dd09cfabaf6230d5b2ba409dd3fa6cd SHA512 14fb3bcc44ea6253cca86c78166f3f424a312e864294d0f1aa12029641c5255c106d69b1712aae37cab443ab32077b1033b97c0d7650a7496c191748d28707eb
 DIST pest_generator-2.7.14.crate 18413 BLAKE2B 9ed53ed9c60151ab86ba8a23f863f57bb6aea3f2d400fd1bbd1dd12e6fa6d903c594d0dcc9f940b4211046c86079df2f0fe12233a26ac54fed5d848063f90838 SHA512 2fdedd51d09b5349e18edeb021ae1f137ce3a46dcf536708a455aa5ab23bc108f00d08a89c2313d5220cd9fa2e6d96cc4a5d22e43e61250c5970a8ea941a27d9
-DIST pest_meta-2.7.11.crate 41551 BLAKE2B 9c34f1ab14ad5ae124882513e0f14b1d731d06a43203bdc37fa3b202dd3ce93dbe8ebb554d01bab475689fe6ffd3ec0cbc0d5365c9b984cb83fb34ea3e9e732e SHA512 a9edfaf3fbaa8cab0615b16c631895f1442d3e64561bb9b356b5a2150c1dc3db269375740a898d986fea399d8f7c8f50d01325ead8d976d6d165d6a104e281b6
 DIST pest_meta-2.7.14.crate 42079 BLAKE2B dd4ee146631601a64b33632702b0b54754a31d325e44faefd94a1de4acbf599a64ce7fba6465bdc82be1e5d6a08d9184d3779c0ef11d971a8c781b7b855056c1 SHA512 9de54eb0442091745ed494fca85b6d86401b942cde5793ba405939ab83334ea71434675cb3c12db6222f188924753309a3f7a3464e32a445d6037369590c5c87
 DIST phf-0.11.2.crate 21569 BLAKE2B c809201298f1c5046874b3bbdd30e33f2bee2e4b977152a2c5faa91019ee5a1c8fe1d42cf91f6d0b0dd52015fc66f0a84c1b3ae014291ad7d5ba647a78debded SHA512 97752bfb44f3d1f9347b4ccfb6fa2fb80b3263d6f67aa703c52ae90d693c537a0db878acef828c79bd4c41e8f7ca0ea45588dee073d12c9bb0f2980c511b65b4
 DIST phf_codegen-0.11.2.crate 12977 BLAKE2B 5ceceead850a45fb0f6ad706ca26e79267bba0ffc0870b8a31ee8a586b37dc421d31e5af3453d62eb85efada260a2eb9ceb12d2f76434dcbaaee2f71cd43d38d SHA512 0a11be13927f6d4303a2f10bc3a0c986dfcc4bc91c9e885e8912d077e434098f75ff4ed9633085ccfbeb052d573721750fb80c7a19ee1e75fc09660aac2a6c5d
@@ -306,54 +220,34 @@ DIST phf_generator-0.11.2.crate 14190 BLAKE2B a20d6d3d815ca0eb5ef18780587b996345
 DIST phf_shared-0.11.2.crate 14284 BLAKE2B 3c3bbd24de77b032d194d0b0679a84a4e2848d41ceea5552f73e51e3ebddd5e61188393f126f668689dccbbfa92a8accd9c09a77de39eeaf72b8993dae280dcf SHA512 f2cf9e8ceabde75bb7548e5a47dece9a8fb7eea4a6c5568675e7bd735860c3e51181d749a26cd3dcad1476ec22d524ccb77a956dd267cd0f2b7dfb81db9abcbe
 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 piper-0.2.3.crate 15924 BLAKE2B 13263d38692f954b321568d999c92640040b4a411ceb82fa68ad84e32c40f56d62db49a0611f4afc24825fd8aa7252422120581e173d9adc236e0294cd11e759 SHA512 18867a2ca43c3224c3c749debdcfb65c07e0fe28759973140320712ec0d6a86125635665aceb4feae0c3aca9667048b6754121b7667a2c8caa1ecd2e3b3af7c9
 DIST piper-0.2.4.crate 15950 BLAKE2B 265ee8a57029e6ffa6532dda8e4da94a288504b658fceca9426d2c13086255cfe5a1013b58dd02e029ac658b6bfc8ff59b88458fa620a41e0203413b78b7ce1b SHA512 88c6fd8d1118b37b77217fae004e47c01db8f95b9b925f1302c0577971a8a9f239b4ac07ccbec924d8912cc47ccfd88eb2045cc607b5fef3fbaf496d24ef7df4
-DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
 DIST pkg-config-0.3.31.crate 20880 BLAKE2B ab7676e810751f89639b60ae70bdebe1d57edc76319f83077c3680049a701a26e72e8cc485fe77cdc4346fe3571d32c59e7384c8c86fef17e00d7d81df5daf43 SHA512 ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4
 DIST plist-1.7.0.crate 101068 BLAKE2B d94c0c9abe1b39d747259fa56decdbbd4679b606f7753ad11dafa43aaf8e8673903c70e5e6c994a6bbc404993bd77b70b119ffc998fa1b05049c5c9768d75983 SHA512 68298950e1e0a3d5228348dfce7f0796a72f75f43f0e6b93647d460eaecb826b2a3fa1f4023bdb84a1544a4ccfc7abfb39f9aa7550d9b2199878064e1a76b69b
-DIST polling-3.7.2.crate 57988 BLAKE2B 4a957ac93d2d4b1d1cda0525b42b6f5b9a3a93b115fd107339e7cdadeb7344833749467ee99cd7c77de0a065378faf89dbf85520fa1a71b67f71e7f9dd5eaa53 SHA512 d98ead0c929458f65ff75b9712ef9665878ad2656c729333eaea4340a236f67876b1c665eb683f695c9f12a89420401e1461c39ae8297081f4789dd5d2a7562b
 DIST polling-3.7.3.crate 58276 BLAKE2B 907f5cec860d5c631b7cb7ea9fc919df1a1b77dfe3ed4ca94f717316b78d73e9ae0f34391476a057d82d7376f819625ca1ca594ebbfb33bce7557db6663b7f2d SHA512 a2db17dcf623b77c8b94e36ea5f55059a35a70aba80f261428bc5b8df175dd1a95e302912bdf55dd1a6a3282fe4920054bd1cf6d7bc6eb52a70556d220e05429
 DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029
-DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
 DIST ppv-lite86-0.2.20.crate 22478 BLAKE2B 9d68dc36d8148047d571c0147ed29f586f3c6ac9394b56bd955c8ae5bb18f5a8da5369809f7b8c3199074e23660325158c32c62e1bf69a16cb1f5da2a01f5df0 SHA512 6d171f63b42296f7765732fce3af7ea05d0d81f1541ffb3ad86e81210715ef4afe5bc9e58926e97e757aea6ff96a8012c8411eac78be0fd080898318ed21d7d1
-DIST predicates-3.1.0.crate 23090 BLAKE2B 6c51fa390f3335501df604afda47ff1d2a69322d928a1412bcc4829f16c3ff5d345ae52f54d797c9698b0eb7b26495e594d8c21f04fdd77c8119ad4635184adb SHA512 1ee38c715b4b55038497a4a4996e12de91d356d53173d3a034d6a1f56859cb3a4a61a82d016fbefdd6ff291519097ce9cef950547d3d437035cd7093d965dbf0
 DIST predicates-3.1.2.crate 23986 BLAKE2B db4209b491f82a1ef6147158fdf86c0bd8a059e61c4a1922dccba257e461be36e31d4a03440c2b80b3c7c49d612dec81fb76f648bd5837c481d93cc9ac5ede65 SHA512 50896189f39842ef424aebc12c2633112fda83eba1bdeaa3e6f398db1e28dca0cc7838948f25e67f6fceede1a91a1b0ede5d4dc4edac6da752e48c7a07bbe3ae
-DIST predicates-core-1.0.6.crate 8084 BLAKE2B 337cbb155bc2859c5a8b891c21d352e998cd1eaaf606cf46c003c9c499a42f12268b071e7a4cca65d50cdfdfd4267f023076e078a0a3eb401ad836755d65298e SHA512 afeb1de4275c76bb1c5950f42bce2f83a21ab217ec60130336286cb48b15f36bf2a1ca346bd652c10a65a1f9e3310d16b23b8333a3e0f7e20fe874c3f728e702
 DIST predicates-core-1.0.8.crate 8552 BLAKE2B 774ed04fea09335ae9b4e87a237871f954b85e54df369c5be60977381e8cb50f11aa869e5ee41e57e4f3283003a9da67bdbe3460420ac8620f18fd81e33f0597 SHA512 8cfd010b70aa694620d6c573bd8ddc50ea16ba08f6c737902ba6697307af4510b9298ffcc3068b45bdc6430103db6fb4499783c64044d87d023bea46d45d0f7c
 DIST predicates-tree-1.0.11.crate 8393 BLAKE2B a8ed762ab18f3cd72ed749cb3db3d756dfd2d3875b0f1c68a99e39ed4ac5c7000086606c21a834ea0a81db961ceab659a4648435d9eaf1bf3d7f29d92410efb6 SHA512 e1b08010f9cab65c75d82cc44cfdf64d92127acf6a72ee0ce1533e5d7d8027ccab912e1c499b7b78508b5e3cb20dc03df94de3dd520ae13736906a5f374b10cd
-DIST predicates-tree-1.0.9.crate 7960 BLAKE2B b758c52dcdd0ea237ce25f0a092200604765bc83c5edcaea646c6b1db49431296b61aebddea3b325e62f0ba9bbd5edba7ec92fd031cb597e7e8d642b966b401a SHA512 1fd5d9a84ca8fdd1b3c4759d5e6fb16e3d8fe8b0dfe5afbd16bb509c8558b0750705fff47701c95f7a8df1a222f639116a1b9ba4d89775bf03b06daf34f249a3
-DIST proc-macro-crate-3.1.0.crate 11084 BLAKE2B 9a9d02f0f34a30668ba94e34d51199c332209c47fd8bef28c452924f75984dcf3aef2c92c4ab3fb03205d589e4f773d960064b4d08fdb2480168f10b84fafe98 SHA512 eb5ad763aa700f2cb1604c32a4bf2fad499a03ad868a22d06b0697b77875b1cc13c739fcf165b2bd547207ef6dc3bd13ceb75e1a59c596daf916f356ed27d8e2
 DIST proc-macro-crate-3.2.0.crate 11164 BLAKE2B dba3e1f4e38f427df72794ad891746fbb8c24239cf06b076e75ab6795a7e8c9abf25ae0f40379e07a696827156e7a3780ae242da7e5442cf1224d058f54b83a6 SHA512 41479ec5e414a8b05dffaa0ece21122387d5165a54e60d8ee3502f8a3c0a2ac0247f56996f933d5d77f1efe41a56bffe16874e8c6a34b66100cf047e4b760863
-DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST proc-macro2-1.0.87.crate 49121 BLAKE2B 4a5136e28b5174c1382037d294dfec51cd7211eb7876c06a98600768d071915e76c81a7958a780cb7b843b98d9df4bd4e01d4f280db226d241bf84de348593f2 SHA512 32ce9c8b5bad55cfae537882c3fffc4d56824f6214ea97aede89ad460e3f66956b52af4a268496fc95c2c0eda0baeaaed4b12cd98df2efab24837e23b48b1f0e
-DIST process_control-4.1.0.crate 17119 BLAKE2B 62e20a1cde9bca76ecbfcc4434c379df3ba0cd703d7e1302c01f960815eccffdbe4a4520c6a4266d8b03b6378802a26a0506b8ee0c2611e8cbaa014d3e54335a SHA512 b6ef80335936d8c4719a39f31ab6f7d69cb9b87d039ead6d08fa3b9753bc5c0ca4546f646c949e1124d4f17a1444718792251eee1568630981d0c99ba23d5650
 DIST process_control-5.0.0.crate 21724 BLAKE2B 095583ca9410bfa10a5d00e80fc891d87d5162b854796c509de1c6d22780ab1528eccb0c720f827b9ac175b0165a1230bc1f2b2b556a1f716f43282697401e31 SHA512 0604c561a17780fa3c12eb1cf1763f55041921ab6cc9fb3eb6fe644a2359da8ebe5fccd1c449779e6222e7277339b910fd383654555c80e05ad98d72da492452
 DIST prodash-28.0.0.crate 90695 BLAKE2B c4a78e86174003e2aa18899fc9214acfeb04637d2b90d64eed17d5dd2569fdb4a58991c23f6e6fc21549e4412eacfab9dccc50a8e62683e8d91a922075968f4a SHA512 36a9099fdb61f604d902d28f7082195891056af916727f7d7b78986dca35539238de0c4816c96ca2c3e74fd04f503c59599988e95be46f0ed87af70ae8ef3c70
 DIST quick-xml-0.31.0.crate 172236 BLAKE2B b83c7f485a30576027a4ae77aa23cd6284942d786f0f0a14faafdfecff646371ba15133b3ba90f820183c8537c8ac47ad3e1e7deaad65e56761bc662be406026 SHA512 9b1f4f9c32694ccb244938a9a4e9373c3902314afb6af5d2f6b1be55e5ec63fee5cf1085f8f32161570cc10fdd96f3375c7564b1d884bb152542b86593f175de
 DIST quick-xml-0.32.0.crate 184149 BLAKE2B 35a28dda8dab04a933c4e5d40f22dec6f9c5bc75e9319bf2711daad869301a90aceea9aeccdce5763d5fb513548b7c1f030b6216ca1454e8f56bd6e5a5fb6ba7 SHA512 288232de1583d8c7387716900be1fc513b2161123182e4812bde9851f4bd31c1a67417afdc16e8a55c028747d0a1147d2dbae6f0e8885e946829a379563507d2
-DIST quick-xml-0.36.1.crate 185352 BLAKE2B 0ad31fb7210bb9c71ee480d400d10c01e02fdc509ccc275305cdabe29aa7d3816ffc7854371e493d3b4b28d43452bf7ef393f7ba4ca556d311cc83f7887ee802 SHA512 21233a50b5ec45db623d4043e03962a19f10cae36fcf3074c32eec3c007a59310ab884352b6c880632535164745fbbf2985d27cd549d50b509f97395a0d48248
 DIST quick-xml-0.36.2.crate 185201 BLAKE2B 4541812a73fd95bedf21f90f07f27b31eea6c514ae17818ba957dd83ed176b0f17bcf3860fdbda07f0fedfdd7ac660bdde5e8ae2aa9903bf7a7c8ad2d4770470 SHA512 7cd4778dbb1f50fdfd7290241fbb42c8529f7d44c2633cac017657010d0d443024f049287e1a1806f5bebe46465549973cccc660959c587fe383490a150ddcdc
-DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
 DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2a0a0dc24f0282fa7eb01fd1351a7dc8b5af3a55ea321e6526fbe037fec3cf8b32463166a082a6e417a51fca SHA512 3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3
 DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
-DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
-DIST redox_syscall-0.5.3.crate 23830 BLAKE2B 0a38235ec277144f0c3e7bcb1d273c7f357d85aef33dbd06328ef16bab7df0a07b523431590899ea58d55e8e1d84c32392478530200cca3a9483e8a47b29e233 SHA512 777d1208004b7756887d6c5745ea408972670e59430e1d299d01a463ae41b98e0920ee77aefef8755fc949d4799dca679afaaae9c1a7d060f76f69af5b90427e
 DIST redox_syscall-0.5.7.crate 26249 BLAKE2B 97f848b130403686404dc193415e5060c32585aa3638b825b4775e54d9a058695b86457ae9e3cc0240bcac27ab4c05dd6b488bdc1c797faecd236c6e477fbc3f SHA512 e9f2d254279a4063089436b699ecca766a997a72718d132a9b35f7c8c8fc82c4b5e25fd8f3e6cbd17920fec484140db520c262376ed1c74f847929b7f43fb97e
-DIST redox_users-0.4.5.crate 15514 BLAKE2B 9fc9d9c4875ed711efb75fb08f345b5f4f0667717d37710143742e48251a709c53760bcbc31ce13e6432672f9417be429c38c2e77a6b786887841714290a1194 SHA512 7a25cc91c9d1bfe537f20b83255990681d136ced5aaa7aa0cdb1b1fc024ba36aa1fb75c335c768a85ee078019a9ca2460efd911cad8ae6fe8b0385fb171aa4b4
 DIST redox_users-0.4.6.crate 15585 BLAKE2B 1d60d0b7781395ff271d79264910d24fb021cd8ef612714265abae25b26ac158d48f542f1e73701bf5b99bd67546a7b878e4a14e40cdbd478b35bcc8b4778f5f SHA512 719d63fec42bad3cbed39deb9242ce1daf3f391bccafa8121f63198120371f112d78b0da8d66458519e946581511004983f04b0a697071f22294ac7c831120c9
-DIST regex-1.10.5.crate 253805 BLAKE2B 9f5418b577209051640c3614a98b15604a1e71144763a6f00caa7757f0ff67fd833a7d14fe9d6acef96386a2a4eb60cf5d490472e73fd62ca8bb0e78d4f9f125 SHA512 177fddb001e14281510e34070f88f8e5167278a46f1d93d9286d9606b7673346f504e4064d7ad53558e6988a400c728e33b663ab398fee12ae23fba7158da5fb
 DIST regex-1.11.0.crate 254059 BLAKE2B 9450e54b522c3f12e4f1d814025c3037f8373b9e1feaf2028756b573335cb7f22400b0925e3ceb0716d72aeb19b02b4bcf70b0b435a0252d0d52a7028d95308c SHA512 16c066664ae87497f9880a52222301fb0d44053ae2d6861ea21dc59cab82bd1ab8ac407f9e77228a21a586ee745b02f9eb10e7b9b30df2f3aad73633270bf73d
-DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3
 DIST regex-automata-0.4.8.crate 617784 BLAKE2B 7535c79f6ddf1b1225e21171921594dcf32fc3afd47519d2067b2047b19070cb7e6fdfd1563b884fec6f91dd568522fc95d85bf095c11f8c02daeac128c45020 SHA512 278e3e2ab230ed5fa7d4837e8ea879fae68ebf35c2da5cc3a67f46b7d593abbcf71e6326a0cf34e38edc0f3f2166ff42a4fcc17a400d9604429aa5b4be075a3f
-DIST regex-syntax-0.8.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed
 DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff736f2d9991b19814ffc1a414ebc5b76e84fb8fd36c983b38e8e391d165cdd9047832b0d9100f0e1ba7085484b7db5 SHA512 549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8
-DIST rust-ini-0.21.0.crate 18998 BLAKE2B 75f77baaf63a40fec0e1ae31a36581aa2b3deced5ee0e20c367bf6e519298bd8c0f79adedfb055a8207b866e7cf6f2ed8523bf8b43e4085afb20de1ed1e1341b SHA512 b6ae89cfb2217049b8517954262a853c9e5fd446e769d61d2b078ae4af65031bf276ba186ff9bff1fb7e2c2e48ed5963309c8b4e6b7630783e2ceb713ac1a7a5
 DIST rust-ini-0.21.1.crate 19496 BLAKE2B 022b67b09cde779b917a8519f33214f883bb2968b0affb68069096ed79090671d038a09a92e9f449440724e6d5c8adcac421a2141225274e466c2a128a3f85b4 SHA512 8461ea14058014dbd8d059916c4f5f0046fae62da85d81219b7ea0629468c7e6822c4e9194a1b4c3e1bd81493bd78a724bbd9f6663ddf26fe803d06ff612edba
-DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
 DIST rustix-0.38.37.crate 371243 BLAKE2B bceaa4861747208f1f2b68f8924c7247648d88deb200e97d8ed17c5cbf9c934488065f0ee7e4406bc96e8709b292ee1fe15beb346bff57b5f05af36174420a0c SHA512 6c0ad1be1fcf1b74f670b2c7599ba68c2ce834c760ff7486674d190ae0d552165b0c2abdc35b13eee8c0333a904c67f5dd1efa742c20fd3735c7ccdf2a439619
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
@@ -363,22 +257,17 @@ DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb9
 DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
 DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743ad0feca0929bf2409eb81e03637ec5f92ba9f38ea386c4ee5cde72bd3d2042083e2fb0d6fa0b839b1c5093a SHA512 5ea1fa17c08d1280c3a4bc8d28494e88ee05acd5dc969ef6f0c6f91fd3b5a8fbe999c9e8bbd2da383413038b8d29fabf02b87bd5265bbb8333f3fcbe409103ec
 DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
-DIST serde-1.0.204.crate 78253 BLAKE2B 6fdebf3cbcc0327b404caaae43c87ba2b6105374a5ee3eaa34d44866e782132cff535da4c069c007783b7b6468d55cb1ceb6a41da74b9eab03ace7cf4811e09e SHA512 2fefbeed0117bd791fd25dd5ad0c99ed4f60aac5919605b6f642050f748dd472bf9d4d121b78b0cfe8719db30a675559d097bcc7542cb57451d1779dfd8d294f
 DIST serde-1.0.210.crate 78338 BLAKE2B b3621d1313312177a346313e6e384fe9660f74eefb18e6cffa39fc2aadc0ab73be84b9037c59b716e5feafcd73f4f054f83e6d17d82746984b3064bf8d3ed338 SHA512 0d853ca51543ae8b4a0c70204ff4e559a4eec77af3d3bdcfc75c5905c80d4ffd1bd9eb8258ea4f6ecfbdd26477ecac7dd698d84d86759fa32e03a9cce02fa4ae
-DIST serde_derive-1.0.204.crate 55871 BLAKE2B 8f0cdb244a820712d557a3273e505c4461f4d7db89e8394040b4c66ede787b6b38b4c9923b38959ab4042c9076b8af72008c0dd15ac93a0ecdeb99da8fb526ae SHA512 bbb2b5e60e2af5bc7528b937ffaf0d3ffd433dbd9cb2592c1e07090620309057e4f11cbd6112fc1d2c5557e1bb3c0f4d59eb06ff06fa021ec683ab880997140e
 DIST serde_derive-1.0.210.crate 56020 BLAKE2B b346e574c99b6a8b12dfc29b20a4fd2daf8abfabd3714ccfde059a3a1f14a5628d4acf6a03f8076174fd28adfdb7cb9bbdb8ac0d4403aa2f43e917eed4b08028 SHA512 1c54d70a55007c00d3ff3d8c2096f4f9966431ba7bfd9195bcf41932de71b71c4ab934f9a8c5067cb56a042742cf0efab07377dbabf12feb1af6d20399de00b5
 DIST serde_derive_internals-0.29.1.crate 26189 BLAKE2B 09d2fd10c73ab114efe244749678c166afcc3e6217f2a4c08c01a44e546471c5f7cbb7e79ef908fb306975852fe1ae32b7988e04df3741ca82db1e3a3d6979f8 SHA512 ee7c8a35094b8ee1d8958f4aa177e5c536c6c7706d446e875f1ae1b5249738ecee053a0239e1508114b747797fcd080ee33ed88929ff1f4903988f64f038b771
-DIST serde_json-1.0.120.crate 147062 BLAKE2B 54f93ef2b0f1c9e7c5a8e8797fd298c96513913a20c3e08a21aea39a15ffb5ad0269d5daab10fceea7164ba432e355b89d89dea2985f86bd0e73ac3920f827c5 SHA512 dab44850326f9020d6f6dd3fc8147e22eed693527fe9cac2c6bc8f6a030f461061e8e54d2780382ce32cced63b5a016372a4f9938effdd1631d8f3dc96014e3e
 DIST serde_json-1.0.129.crate 150181 BLAKE2B 905e51817c84b54403a63029e22359050a6a2ff32d3b6f8a7e2f8599126c198bca2019925259e55e8e0a28c17adc0fdbc81dcb7775193abf5b88a62a2b4daeda SHA512 7f1f58573c37f35231fee01b500e096a145a7e51745d003451a06e5ebef228fd971b13c79fe6c9c5fa4cf5c891ae7a3a18b6b5479b06ffb12c3f20c65d674cca
 DIST serde_repr-0.1.19.crate 9997 BLAKE2B 1bfc8e94b8c3cf897813f4749d6a1112c1097c2c257821eb366073a41ac46084a21bdc0ee4e3b99d82444619a894472e24fccb60cbd8a41ab7d5b0469cad7c41 SHA512 678216a62702b3300fef850f10ee60d88f31de1fbeb7300e3fbbdc4e4a9cbc95c6890c8e7b9385223ec837d9504edd53e69b620f80609e54579c0994ed1ab0a1
-DIST serde_spanned-0.6.7.crate 9164 BLAKE2B 559a62c0ac00a1559947224bd268842f35c52f65d0d52102c98b5e683dfe4c36acb015edf97c5f79ff818dc575b3ae43c3f100d18eb7afc3ab9c96e348ba6794 SHA512 d0ef413867a705080fa68f84a059b4d04b604bec59323329ded7ae03e0caec49c89fc53640c1e58c27bb23b5c9f260ed176ac52f3a93d25d8d7643252dba037f
 DIST serde_spanned-0.6.8.crate 9330 BLAKE2B 630bb2cabd74e8d9736e315ac57c4d2c5c4f72264aab35ecc8e0040cb4186885722051a9f7b8a9006fd121fe58428cbb151e5cf541e7de30b6528c84e968f7ac SHA512 2343a2fda35ff57ed8ff7d8eeadd651821fce7e22f91c2d5797c6af7db9e009b7d637382f6f390c17911912865a5aea1ce87a86fbe36f4b6aeccb065a4c8942d
 DIST sha1-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f
 DIST sha1-asm-0.5.3.crate 5830 BLAKE2B f0bdd5f39644f59ecb8e163f797f2398afe3735adcf67b86340028c422479a13d3d6ab89c13044cd05ad52cd56ee170253a384e719b85d1851b4ac4a4501ae62 SHA512 dd8658dda1b44120b4475e09c51137b9a83a9c55f3d141db8fc170990fa1dcca351194b8bfeb610e8a6bc8846a1edee05e3ae9bdaf986c0a0da0e8d52c34a7b9
 DIST sha1_smol-1.0.1.crate 9809 BLAKE2B 954039c19b4c9faad6cd9f3f83edce220afb6970cb6628e69a1dd914a945a7b9466a8d46c41a650d505a3c01f406210ad59ed56504db18aa45125df3f2369cce SHA512 d0a67ca75b0617a39d28fdd73ae9aae3d3bf01ba24f6cc579b26da6f06125a304be90d446d17775959ab96ab165145657a54173679e6c0f42562a61c0e932b79
 DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785
 DIST sha2-0.9.9.crate 22247 BLAKE2B 4ac2c92325ad92881f41e777010516870fd001617c2dc1d20495318219167e2622309831ecb9509d7a4b87f936c9e5b2d335bfc1842876a8b2aecedada367421 SHA512 bc267467089ed546edc1caaa7a00f3f769fd1d5deeb655c1968985d284bd32e4fcee4e721cf89c30e8c3cadd2f88ac557b91f90183cab112702c587f753e5877
-DIST shadow-rs-0.30.0.crate 28917 BLAKE2B d42fb93a2dd88db179d6775257dfb567a09d368872a963ce7e7ea11ef45f26f50fb72f1276d8050a35862eeee11f3960f688904e098c6bdb7111302a572789ce SHA512 fe4b0837748d8ef815fd0a473efe5e833ec8c01e8ad7d2cfe776dd1ae568de6f6de72e3bfe0bfad8ef5f49be8dc4264dd47a458b20ce2a25ccb48fc77ba0a75d
 DIST shadow-rs-0.35.1.crate 29585 BLAKE2B 6e39c9d5a88d4b61537fc2e853e790f40f5335b7f2a784cd3b3608fa8bb7cf3b34a179fc912ba1608cdfac76022b583ae1eaeb0f9259bca20b3be8c2c7e4760e SHA512 e74a7c6b22ef30e26eb156142d33cde76de7bf56d59c72ff579f6c434c8dd4f2667d0ef80107d4dd5db77ad5f3bd92978b2446b84bea83ea909528b897abce59
 DIST shared_library-0.1.9.crate 10566 BLAKE2B be5497dd6ed880d33f7b4d3721d3747794e29715fae352fdcc5d153cc9512da2c2f4b21804ce68077654eb3ce989dbd1fb688120516783dd78db7f48afc8ea0e SHA512 8696f5d9ae976b04ac3f559ff1c4945c5554fc741bd9e62207a475a331f8c90fa8c2d583ac9cf96dd18fd543b65fc469aa76dad2f526c00c68182130d4396462
 DIST shell-words-1.1.0.crate 9871 BLAKE2B 7923b36f0ba50c17ac4eebfdda34566b615291253b7b41879b3f64b3fc1325e63948d3d44801e40748b11ddd2ab201b81d238af2a2007c7a57d71f5dcd0667f6 SHA512 05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00
@@ -389,28 +278,23 @@ DIST signal-hook-registry-1.4.2.crate 18064 BLAKE2B 7274d4c115678eae2640a709bf9d
 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 starship-1.20.1.crate 349540 BLAKE2B 1961b68596bbf5bb25ca36ef882382724c1e34d93671ace290f8f4bea54cf3e6f59dde6b84a8c4e55707a0d39f9826ff19d31990b5e4fdab11720c8a5dc8b165 SHA512 8e26455d90e92c1dd2f759d94c08c04c0f4e4ec1dbe07c39d273074e2d713128fec435740810eaf86a552b61faa90077b3e0cec75d6e8e3049e5a0e125ad63d8
 DIST starship-1.21.1.crate 351548 BLAKE2B 6f4681bef17557ab88fd7fa780317ae7e907fde7fe6b0e547af30423e447d90af0a038c30f9e99beff182470dec8388cdfbf804a192d719a50d15557549e3dfb SHA512 bea60890fb384fe3a32518122422675271e6c316f5eb2d75c00e0d5bc70a9a1a1dc2eff774eb2b4036ca15687af7ea46c320c499b5d7d81f43e3fd02dea330ca
+DIST starship-1.22.1-crates.tar.xz 35080388 BLAKE2B 041bb5c5375084546a33998583eea2e4ddb5c4abd2a1d7e95ce1601cbaf61204be3281b2f035402af01909d5766611a25a35b7d85f33c7dea4a411a5bf5c5e84 SHA512 dd34614c1bee2fbb5053b2b8320a450749a04f941766e834eb7fbd4b856d1aa4d744046c10ba9149aad19d11ef446497c7c0b63b44abb3cf5569a0c700ed6982
+DIST starship-1.22.1.tar.gz 9444990 BLAKE2B fd062b3cdf08fde07fd8fd67112ae9f5330c8a96a55f7c69b1a616e113580bbf3e7dd484a1e0ffd3d7bafab8a1a0618dc12bff7ddacb9d310e9287b89ceee3fd SHA512 97377922ae0b4e702ddf36534abc9b2fdfbfac50c5f0d4a483a06135f5efef6585abd1fd335ed28f9b0e43b5a0197b724ab1385d3adeef2c75046f5a29fe4ff6
 DIST starship-battery-0.10.0.crate 46077 BLAKE2B 72577108688df58be583ae4f81b197cdc796fc14a0bce21eb95e3142b19cabee3a0cc12b4ade6fe368ee3789034bfb3294159e2ebbf875d8917b767df83e7090 SHA512 dd271d64afaa785f74bf530c93e50a01e907f6de39fede07101f2ccd013ca8d4ba4d67ea8b10014b3ba7fb5895a702ebc2a4bfdc55a3c0e425a32976d148bb1f
-DIST starship-battery-0.9.1.crate 47052 BLAKE2B 3eed951f93008986cd4829dc78d7f379d1360714e9dbbe4063df221cf0009f0933ca67a6cc03c50590222df43cfc085517abc1e219935bfb1c190739719986ca SHA512 247474425d9456f7b43016ab69983ba3d1ba319689127476250fcb120005354c04068940e39fadc281956dae1fae992425154edcd693748d86555058435cf121
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
-DIST syn-2.0.72.crate 267069 BLAKE2B b0b979f78937a10a6db45f96d5d93c595427a4e158d658a2186419d89b219a4a405ade488d88d9ebdbd605ce4b706aba7088ab39a77294f3cf9847bf032d8f91 SHA512 c3d26bf9787555bc6fd8bd789855d252e80ad28a413593e13bad174adf86087ff195a6b4227bdeb6d1a1c87b0af8e965d6f2d04b8d45e7383b6de49990b92e89
 DIST syn-2.0.79.crate 268981 BLAKE2B 2bf4bde1890ce4ee91fbacca81bd298d15f0111fedb27b9cf8d675dc2489f46026c1804f9e4e24afbd0718539820096cd5c4ed2c2da02e598370dbfd2b18c293 SHA512 1ee073fa3428c031e53bff8ff305bcd6b37ac142bee3955dcdb44fec1c77c733eb78760c8bfb30b83fc3dacdad8a384e2b6f9f31a89c4cc300359e33457fd433
 DIST systemstat-0.2.3.crate 34237 BLAKE2B eb9b7fc1c57305a8e23f707c8301ad1051a7e379c7cbb45d277c45357cf5fec31802185e51b20bc5d2075286277be69a9695fa3f04225b4b62742c43b8cae6b6 SHA512 1044d3ef615c6ff03cfc138e65899d336b9d67f1bd3a0bfaef796c88ff8b424b2dbbeb0de0d046febadf8f667a7de268bb8c538be94a0afdf2826e2641c85f60
 DIST tauri-winrt-notification-0.2.1.crate 42232 BLAKE2B e85297cd712f8eb45494430005885bacea72f31c711f24ab733d2e624b3bb1a38ffa8faba9590438f12530162f34397943420a0392fc24ce7ad0f0a408e2a895 SHA512 1d5ffa9815a7b886122b7998039b191002f729f903684cde5e3ef821e5f64e69315c8ccbf4d6085fb546dd56a80050dc56cad427b2a657b72734639c9b659f1d
-DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
 DIST tempfile-3.13.0.crate 34910 BLAKE2B 736378935088ccd8b540997c0554444c3752a74c9a4bd82cfcb700a9b22f572d0f2b3e61252064d4a631b57783199cfb42309e518826346a83fb5adb44843c49 SHA512 68701bee80309cd8dfa96c237b2344f26bd03702d2fc2e1a253820c98654c85d802aee1e0fc856f6372159a92ecbf624f78c8146f34a0cf924f5b56284915f85
-DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
 DIST terminal_size-0.4.0.crate 10036 BLAKE2B 2f910a6ecd80a3fba12811eff425fe2d1a7c474d8db7f673037c1088ef468e96d41fd13fd3175c84c20da12195a07bbd4354767bdbc64d757feef86f86e384ec SHA512 b1a66cdf4e94997b5291f3becfac1e2a838f6c3f6c068faa1ff1aa775b2a97d41be2aff5460d88928786cfd7dc8dac5e2d46a62b475d40343e1fd517c6299897
 DIST terminfo-0.7.5.crate 46243 BLAKE2B 6e953dd5009747a8e7cb421deb1b100b9a4c90a793a828a7831365406234c44d6ae40c0a30c41e6966c66d4511c7620a0b86a29dbed0133a1793ae57a05a7510 SHA512 2a763411edacf5ec55ae6193a31386647402d4fdb39fa58c9e2bc5a28eb3f14fce316ed5ab3481f6a36c35fdd7ca468449f0cc22fb75262a2db6cda47a75f398
 DIST termios-0.3.3.crate 17103 BLAKE2B 855b1115d02dcb275ea772dec3db383f9a6f84c14876ac037a5e3bbd1e71e26d3adc64e41521145093256acbea56c28b6c14f7e3e2bc9fda37e7cea113abe214 SHA512 3d4cacdaa8bbbd9083a050e723c93510829210f5ca8eb806e661a3a1e3c8aee33565142c5df34fca74aad0d26319525ee70ca6faf3f55a29427423d37fda43ff
 DIST termtree-0.4.1.crate 4557 BLAKE2B d4300b0e6e908c519a0a76f5e08167f4467f428b2926e7739614cef5d3e294dfac15ae8576f7011a852745713c16da93346660ff96520a2bb90a4dd4c23d889c SHA512 ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062
 DIST termwiz-0.15.0.crate 213726 BLAKE2B 72b9e8574b4f2fb9e4aa7f6a9ae203dd024ac11d25f4410dbf7a1911a09982623a5ba267f8602a3dd682f9fb9e5b4d3cc8c7ec39d43949d1748c84aabbb65fc7 SHA512 aba6349089143efaef27548bdb110ca89209bdfc4281994c2033d583b6c4cf8693c0815d1bccd85e1dc119711ebc2183e97bd85b978e787be4db9ebaa4614176
-DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
 DIST thiserror-1.0.64.crate 21574 BLAKE2B d2c7cd7c1a8850dcd3f188aa1af61d4727c4bfc27a069f0e743adf86b7934e6db85d9ee9af14e78c7391e99f4ac828c00277a1354bfe1a47ddf5964211bb2037 SHA512 cff21ebd9d5d37e548c35dd1dc0e6e885a47363cbd8ce3cc8508e8e9b5f844c168b9f3d9ab12ca8d5910a53a9e09b4ddc75a0c32f983e27727fc104e4ff77618
-DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102
 DIST thiserror-impl-1.0.64.crate 16073 BLAKE2B 8b0eee3d70f926c2719d084676cd14674dc5cf7c474c72e3e628a3cdda7afadd67a78f76224d2a05f1fe04ac59a178b879e467bac1981fc56c5904073153c88e SHA512 75e55f204a290eb38b2215fcdfa91f9f1cb002b121ffdf56bd5f6d75476614e3ce06360da7d74b870c45f6b107fa9e61f85ce39c0e65e713f8c191d79f96f443
 DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
 DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
@@ -419,65 +303,45 @@ DIST tiny-keccak-2.0.2.crate 20129 BLAKE2B 105a2d2af36cc053cd95721ea563108f33b8a
 DIST tinyvec-1.8.0.crate 46796 BLAKE2B 720d0e6d881855a36779e12f5ffa708d3a8b96e6d0de9056cb33c9b8ce0d408f99b22f5b2bb9d64bee72a011fef846dbebbea2ccd238d7b951eb5ef0c4866e05 SHA512 b7b32e38229645965900f80f298685f13e6d13e58cfd6945409a6643ca9c9adc2621456956d5998ab9dd91c2db4ae79638b156ca0d9c7c5505023fd9b28414df
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST toml-0.5.11.crate 54910 BLAKE2B 9ecd5103b33ab47d4be23c897c7095ca381cb79bedcaac4918cddc36fc7cf5d34ab664da52c2273d935f04486e9325241d6b66785d50aac78453c219aab49e1e SHA512 eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317
-DIST toml-0.8.16.crate 50742 BLAKE2B 8a21a8048fa67e58e441ad92dab1301661c0a60bbacb2ee3e5caad8808af69eb781895658e309eef4f6405a71e71605adb0e0d1a09b638cd41fdf1e8fee47a6c SHA512 7e602741d838254eaebeb94a37e21bd4b5d89ae69d56bfba4560e8b405ea809661b6183f5e343d871f07e09eb5967d996bd69511aae9c079666aacfefc2236f4
 DIST toml-0.8.19.crate 50974 BLAKE2B f68987353837b74421256fd9a76134bfbfe93887cfb25145b65b7e6b31ad2c3a3384829a06f50c771a2a0be0c5467c856cc631af69f586ea056c4f15af9e3b7c SHA512 16fdc58d14516e81badbe8c9a4506db75b559b377c9c4fecee79e76007b31a4abfc8c8868bf9159f79c6f7c0218f93bdcfb92b669b0917db7da42b51ec155751
-DIST toml_datetime-0.6.7.crate 11750 BLAKE2B 2c756bfd70e15309fb0045679a68a2f1cd625db285dce70a7e4e33950d34ed11d4424b8108ed4526e30c817aedde62caa947941e3809d2db29dfe64a60909343 SHA512 69c9aca8731d790ee90b3b73fdf9003558869312ca876bf6e8f19d331c35d8f804acccf2e635d7129f26a5d329df4c08844bd06532a4b529d932e07e13af621b
 DIST toml_datetime-0.6.8.crate 12028 BLAKE2B 62113366771f22b437b2ed0d3bb2489ae9078cb589cfad2ad2e92c81ddbda48f689e5a573366eea4f54c2b3cbc6b37eaa8b442b6d935b631a992de4917268757 SHA512 d38b98db3b2d4eebd3001d88e2135b6fdbae63b200f7e900c6bb9c121dd3f170e557332bd26f237312c1cbef61666716b0cf550c2d730f86fa7cd9eb5f64a16f
-DIST toml_edit-0.21.1.crate 101661 BLAKE2B e794b6121ba7e2b1b3f50966cd40eebacee6968b6b28986cfe4cb7312b51ffff19f74826910d8e4ce307f74940f11e71e6afdd768ac196427bddf44595bbc797 SHA512 10cd3b16f763f55294923ce8f166f96fbd67a0acc4a93a46fb3044d8a38148097c592ebb405ced87030d35154abfcc971eacf0172b624ab477a11e616efbaa07
-DIST toml_edit-0.22.17.crate 106686 BLAKE2B a022613923becdc631b046e43129c11a5c49b5c366f142edb32920ae96a58f3bc3bf9f872464c60e647b70935e83a1007abf4fd6c1e5108965cc9976b5ccd20b SHA512 a2925b2e68360ba7fece244924aff9bc41b675ee17045a3a8b5a91e3a6c0a4ee82261e78570c97f3947eae5415ff44c2947831729c8d140c946d956a1cd9b94b
 DIST toml_edit-0.22.22.crate 106387 BLAKE2B c658eef2dc8420266a6928d7ef46340372af2593e4db0d3a67ec88aaf8f601d37d1e9b5bac231a799be8a2ee68a7d98b5f651e9c109d23d8b19b60cf75debddb SHA512 0f98b371f7e27ae7f435a207c0915f942af145cc5dfabfe6d57f2b797efa3e706025401e501fccc6df70c001ce27051381556b8e7824447edd23ea25d047da4d
 DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275
 DIST tracing-attributes-0.1.27.crate 32241 BLAKE2B a20af0f50a90dcd64e5318e55779142da294ba18d1cd40059a8aa964fd3c92834e03ee563e41caaeef71a30e3f027e5c8d167d90e2844da79e0774b267e179b4 SHA512 7dc59f4234c3bf3434fb352baed2b81db4e931eeb3ed207c4a204e480da734be40847b167b808058d2807b5583815625bcd5153e2bbe79804cfa6f069a74ffa0
 DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521
 DIST trim-in-place-0.1.7.crate 2485 BLAKE2B b6a3b845d379c09c3d36658925ececed94e4b8a1cebff0e3333a372efca42899800cdba5642ad72c36266ca5d24dec45f5be8f50b946f9a67ccbfc7bd6e81877 SHA512 9885e2cf7098e5eba7ff2a481e9de189dc509adffc32307e7c6a4a9aaab05a512ae914959cc53d572d86f64a79950fc9b444da5d3a3b703a6f437355c5dba5ef
 DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
-DIST ucd-trie-0.1.6.crate 45790 BLAKE2B a6d47c903be6094423d89b8ec3ca899d0a84df6dbd6e76632bb6c9b9f40ad9c216f8fa400310753d392f85072756b43ac3892e0a2c4d55f87ab6463002554823 SHA512 00d9732797029c16d84fe518b2d90de841b87b5ed6c3628b9f097f5340f1e50778749db18f22e4ecc513f53624806ddc3484e5cc9ebffdbb6c0c800bef817e95
 DIST ucd-trie-0.1.7.crate 46795 BLAKE2B 1901b49ae246f0d9628b675d4320c1005707bf97d4c8b0ff99e916d198e31698fddfdb0551222f36b73b9ec7d9e648d679848841d81e975bb9ea69bd1e30aea7 SHA512 382a832e38654a9159ebb40a8e8bf6e7f2f3108940e5b9c388f3a1441848a241201e7e5cfb125e098f04f0b2893da231b8a0e5124270e774215374bff3c5445f
 DIST uds_windows-1.1.0.crate 17040 BLAKE2B c77914e150d2f0afc5c55680e28ba242238f4f1291948ae492fe63c16791e443ef33bafa6686cb753e53361ce452f2df27d2bf4088fb1ae203a47df3c55856bf SHA512 092c41f6fac2aacd5b83009b4aabe2cfc487cc1ad5ebc8237d9804aff0c5c823d3c079d99748e9ec3bb1c02b8a51f6a22e41441ec9a72c50600c08b1efdeb0ca
 DIST uluru-3.1.0.crate 9664 BLAKE2B a1d05132e4940be5fc130038f910666d2b2df46486f986b855d7ce6ca07c95b96d0ea71f51ecbfd469adea74eb71f5c441fa57fa60bd67cc751a05744cb1e243 SHA512 cafa7798ceab468a46a4b61c7e0ce0ebc03114464c91667cb224e9692353c175430718632645443675cf942c9096c68998a8de315596f52d0a7d14d1976948ea
 DIST unicase-2.7.0.crate 23783 BLAKE2B 2b74b932b45c9d5b984b57bfe8249496c192944e2e66916919177eac81c509e2d7a5d30a85ea58e8cd5a0b47fec746bdb18723f3f14002fc64af3a0d320a9e7d SHA512 c2b05a3bbd8996e1cf65d7458f5ad95de9797c8349484f8db04967bde15c1f057f62b2f7a60e7367871512071ed5076c0da042169dbbdcaf4d6c16cae62da828
-DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8
 DIST unicode-bidi-0.3.17.crate 58120 BLAKE2B 9d7759554e265136ab9d95dda90bab84763189d3613522a5cb966ad6417ac0ee726d79e296c8821ccca589ef09a999701149c88a9189cabe0ed7d32902040832 SHA512 cf523ff9a2e1face42da035f81bba2476e80d1154f73f3e34cbaf5ce322504e93a520114a54e0a4b2e5d6b930e508ce31b5d8b4f4ed4d39159a8c9a9c7b94d91
 DIST unicode-bom-2.0.3.crate 10773 BLAKE2B 0c47796f83faa4eb5c4405fa385c245fe7b8b6d9eb6ce422738f7aa1788604ed3df22810afc6ce6da78c1592f7f68b41311914ff04d5e49ba4f719310ffa9afd SHA512 3a756761198be468776511ff7b899ee7adf214a678b13b31f42ef3cb3e0320894d8ff0df23bfa02a057727d83082f16b465ff25efa8dbef362977bf308bccffd
-DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 DIST unicode-ident-1.0.13.crate 43279 BLAKE2B b5e935020d1c9f3aa24f7d382f6b73d6510d654a61ce1c9c024e2e365bb817182e076139f370e822573531356fb78ff7499049b1f29aa1e2f4a2cc74a955b47b SHA512 5ba884f39debe9c8eb0b1d251ca713f7e2bc191d211707ed10cd81465487dbdca53914c19e131edfa1da15af132dc2c346260c3969c61e3747b63399ccb1cc51
-DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c8782321b1bbbee724db1e4d8c1d43af4e6bd8044b99307c227d93631d178d10fda445a941a485882ae0015a6e3d3c347e4bd465bbe1d9 SHA512 539f04010810d73fde7b0ab314faf813f3e7ecd2e51d7975281554b7cba4a8706e2b5523c4b7840568593652360ca59e9db0e1ce342e71c28db635ff55ffb0f5
 DIST unicode-normalization-0.1.24.crate 126536 BLAKE2B 1d6d535a1236562918d2625172d38c261854cd8c45cccc81c5d5aefb052db5d0e33981d95f5c87e8760cf77b3651c60b7ec1762421a7a9caa72fe7eac3f562a0 SHA512 f7af59688773319b9d1523955ce9b82e6735bd72358715ba5c056f41956ca050b6a612cae1b39199cc089674b3c71e4016d85d48167277c794c5cef3df881754
-DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef
 DIST unicode-segmentation-1.12.0.crate 106323 BLAKE2B 268b60aff6694434f05afb7e2b8187eeccdceb77460f8ce2ac0f84d470f8a4e03182ce3f7906177cd2f00f989273a7e69061a763006245f0876bf21b15076804 SHA512 55eebfe5e9972b39d7c0011d80eb5f517d636de37870999119a3d8f064f21f67b66a5ba9761d562738b05f220e21d56b5be7bbd9cc51662994e40dd67c38f946
-DIST unicode-width-0.1.13.crate 457228 BLAKE2B 757c4da5fa090369a26130b08440c2348f1cd1c0dfbb6770dd75b65eba797eaa65f5d683f0c2862cced06124d46a89b4825af0d990f6adc2df8709b8ef291665 SHA512 9781d6dab2c6343e8c28ec66b50cb4293261bb2114e122fa80ad2facdb23020f5b621c38030193b918669e58adf143808e5ab4c507c18beb6dc61e97b2e296f4
 DIST unicode-width-0.2.0.crate 271509 BLAKE2B 53015f24c57ba65d7ffc6e15e947f5ab96fa272996fe5a4d2f9203051972238ea7591c99f1d8ae5d2610c7b83c215b6912eff7aaae034237aec8d79620bfb843 SHA512 38149ad512a44fc79b2c991c6b5667da2e8f8b442ab6bb7e4f404e7fbb034f7540c7e0e8b9e72a1ff6117b899d6034862239f43b6423fa89d55dcf489caff37d
-DIST unicode-xid-0.2.4.crate 15352 BLAKE2B 80c327b39f3b8f2cdb5747cde968cfa1efe7b65b6bee9136adc881fa19f66aa5b1010d9d08de55a61b322d665b5b0cb0395e9ac471f6333c40d8dca5d97e123c SHA512 e67bd1258e1961807d9d5fe583a89ab5b82b2a529ecd32cadfc79aa5331380eb4a2db9fd96b74c8eace47f2f29021587d69bcdbf79f7e2650e92a25f7839d03c
 DIST unicode-xid-0.2.6.crate 15744 BLAKE2B b1bad25897717f6346f988d5a7c90c51fb842da113f19aa434a64add8f2e637258d9fab0f7b871fd2aac02e83c68359fc679b326232793cbc804523e2bff5056 SHA512 f68e78484479a5341b14d7e3391e691265851fa00feeca53af745479af6aa9b4ce3570456df785c8362043db9b04e2e57f9bad05d8305946f16af405bc611764
 DIST uom-0.36.0.crate 151847 BLAKE2B 851ececbf79cd07405f647809d4368fbe43f00d244a1d08102b540a582dee07b8e55360e9250c0b42f1cc198f203b0694355669dc436d03418860659d6654816 SHA512 9cfcc5a9eb9dab80e7a1c61330bfe4956f062d16f5a0058fb3f2ab0f689ec23bf1f6efdce0f7c411ab557856601ca9e0768bb3cc7b8314d63c211057809558c9
 DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d9183478cf501c26fb5f22d7704ef1313ba6d355e849cbf8ab7980310c1aae85e253a2b28d59099e23af29 SHA512 2515903e41c0659cb226f9bb049ef80f2a49d1b609b6ac480e570a84e899088ffe3be4fb58f41a1fa7f5288eb5f97ab513f331aeb6d56979df783d48e2ace28a
 DIST urlencoding-2.1.3.crate 6538 BLAKE2B 65777b0990aa6b3d27a47f36114da8622026ac8946b5ffb6e04172b666ec7244a55c250a7fb626472bb2b636eb32ee945599cee5ce7351c3cef2322366db15ff SHA512 035848d9243ed6a4528377b56edd7f8bcb5f824381b420dc8f5c4bfc3f1246655c54eaa7de0e4aaa7138e0b08fd796b9ace140ab919aed2d94f6952b577386ac
 DIST utf8parse-0.2.2.crate 13499 BLAKE2B 095b5d219ab8ff04c06fd6303e03d913ae36a57845f0b2ca3217a40e31a54cb0fb5ecedbde165d28f5f60f1553d8252986d7098fa83befc84a7cb20bf3b76144 SHA512 f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
-DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST version_check-0.9.5.crate 15554 BLAKE2B 131e75cc287518831e142430e2a39b48e4275874f4473780d47a27552294097aa1cddb65c385583e1022478f940b495eb43c24a8b1617b8ac5a24af3340c0d72 SHA512 d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db
-DIST versions-6.3.0.crate 20058 BLAKE2B 28a7d0867ce817e38d96e35ead4518e6a0a8bde3a853fcaf63651cf9d3afbdfbad2c4a0cc198c7ac7291c11ae5a16748c6986f27e3e27b0922cb53acbc6de4df SHA512 5d4b31fa7cd3e0e71b27521649ce85d5ec9ce8b413d4b4201522d1777bd6376d8339767f9adaf31b1300a261a29e4e3b4a001b2ede0f093be9e874eafe9548be
 DIST versions-6.3.2.crate 21553 BLAKE2B 7c3274a3c143528afc5871a267528e0abb59f2c61a4e362b305e86d418b493dbed6508918d34e417564ba0ce4bc0a9c64bcf02aa6878993ef1988a826f7c359b SHA512 bba748425a1530c732bf326f98210b4f525fab740929612efbade8b1edb22d08dc94e0d27096d31e0c0b5878364e49bed181a08acfc1f426940b20dc41df91c5
 DIST vtparse-0.6.2.crate 11448 BLAKE2B fe3422789dbda377be9cded973323149b296785adf184357ff3d134b4c39ba364cedf0fe1260f077a4e4f807ab4589cb1a5b886768e503a73285b24ecf89c62b SHA512 32214ee2d8216b8e7e7a329ba98805e9c6c78102e0bfb6ab34a7b2947cae0329f706862b349600088b6255b0440bc1e5fb818e477b126a569a0f9ad94222b3a3
 DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf3ab82536295019268b3125084da5dbcad818070bfdcb6a5de08da4eb483475bc225a829f58a1e3e040b5fba SHA512 da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST wasite-0.1.0.crate 2346 BLAKE2B a5a03d04135e3e32354d298386f132f9aa3b5c3806186f0c1eb75138038001d07f3bb5a3c6f8f938c9bba7c84b97b06b5304be3c9f86255d2d00f46a134ccd3e SHA512 06be2f7a2d289136740cc7b9ef9c4addbbf85210312759a7c99f977aa52285e2c3e4e3dade82d454a266ae42aaeeda7e767140b0bcdc1208ecc86aa18afc1384
-DIST wasm-bindgen-0.2.92.crate 184119 BLAKE2B ca256c686bb3854492bad6afe3cd27dab314561a1ea2e0205579820066b462bacdb2cc01075fb420bd20eb33b03a648ce1ff46feee04d8759ea8aa990ff8232a SHA512 6e46501276c0d4befbf930c816d6ae6c3764e3b5ce0ef4aafa627a6ea371f1a056ecc15970a817e9e9bf51c0a2ffa57df427d758b2d367beb6a474d75b8939a5
 DIST wasm-bindgen-0.2.95.crate 43894 BLAKE2B f14fa63110c62d3bd51c947f31ee96b11812fa60d6adb9cf1907f99c011bd43ab8e14b437fe8b6357cde37124769080b3bd20a2a947fafe3bfd6cccdb875b5a2 SHA512 5a303a6e9bc71030371d6a60a04064b148423d89b6d5de4232b24ff5205175c5236812209eccfc60d8f82a876d3b745ae76ebcb30811eaa6f39701c9a84e1251
-DIST wasm-bindgen-backend-0.2.92.crate 28348 BLAKE2B 425497aa7a023b70549c55d5a15dfed80877c5503863b186c0a9d11b29551c4606c1cd5961c7dfdeee2eab5662952ad7ad215513e93abe727a33f84b30bd181e SHA512 22e4f5848d62bd1fd55f4f054ea1293e223b3cd6f916bde2523eec10388e733623492c3a3246d61831e696dffdec5d000b95e9aa1217be6e38dd6459872166aa
 DIST wasm-bindgen-backend-0.2.95.crate 30487 BLAKE2B f199e3392e964c4b0e6a7b2e3ccbbdc458973b4aae4193ce36ee0ac18d595230be9ea6708caa439d70aa92a7b924f51928059984f560e5dad20d41eaf06616dd SHA512 1bea648ca248cf13383b297917a5c315da9e4830a8c49cd3ba23392566725cceae818b4e7e60ad85360c9073c2e557fa36452a2cbc8e05b60318feda7404026e
-DIST wasm-bindgen-macro-0.2.92.crate 13835 BLAKE2B 1f2202fdaeb78c32813eaf08b2fbd7aa9c469228386df71b8ffd81a46374e39a7104b79991f702505f9b7e97957fda8574517fbb03e3f9e93098c4d6e1e46be3 SHA512 78d2ddac88a9ca3ca5eef8a7af81cdf2366187a67d844e69f65f6893d1949f9723ab5f2be762c2217a5c21aee2f3dbc2d5d55ef0c9cbf0dec0d52d67a6ba7462
 DIST wasm-bindgen-macro-0.2.95.crate 6938 BLAKE2B 672509ff595fae86492dad98a4480f28d74a51fc8156ce7f96928b148f3af7f0f45ca9560b72148c6ad2d45ddfbbf3dbe39e2c94603ef92a925ac5503d939d2f SHA512 1f52188932e20145cb23d527a733fb5fe211813826c6b5ec04277e376127b700aea181efa5f60e34d120f10652066fbdf001952024017cccc7af728a3c8e41d9
-DIST wasm-bindgen-macro-support-0.2.92.crate 20092 BLAKE2B 8e274a4053e7afc680740e811c3941478caf5342e2206e3d28cdea9f9514bedbfa4f2b6bc608817306a1c455dd7134b7e17f0f04499f6bfb5302f29b041ac7ae SHA512 92543d2aad0b25798ec20e68832b823610c2c01401088cd9cac1684a86ddd1b567b3e2712acb862060f9c645a0df509b01d9834fd3e13cdaab97960f66d8daa7
 DIST wasm-bindgen-macro-support-0.2.95.crate 21331 BLAKE2B a1f71b727736b7166af5a9ad739da33f07ac3d7a190a27621f8a9821530f9bed78a6c437d194f9609bef91ebea0ed9ce1738eea0a9800344b8af9ce7df868da0 SHA512 f45d78831c37401a417c837281d1705b84eae5db430630a9caf544ce5d92f1ddd945baa3bccf26f4c58170e3cbea035174d8b60f906d2757b152e1d090baea58
-DIST wasm-bindgen-shared-0.2.92.crate 7263 BLAKE2B e54895486b9a31cc4651b7bb042059cc84421708346c06a9764315ebd4f440a1077520c7d325d6889a690b2c06aa185d40cede2dc4d061b363594cbde20fac31 SHA512 70e3a22731ed8aec428433bf30500eb3f62e3b7f4f1be34d8bb3b6f34f99690fc85d49eb413caecab807064494cfec64242c6a42709dffd638046e370bf86e07
 DIST wasm-bindgen-shared-0.2.95.crate 7649 BLAKE2B c18f531c6094b49af3b2beea93914d16b0054a707011890f9054f4cb313ed6b433e3f73c7b42accbd1fa59d1f14c2db5ab0f0a82cde107b9cf437fad8b4cd7bd SHA512 3ce689a4c845765bd6e1f84b94948df3ef84560d98d830a15c1932a2ab1942ec91465db65cbf14a045526cf003218aa5c3209dd06e8ee8a39815757f56356099
-DIST which-6.0.1.crate 16542 BLAKE2B 20fc6e56405a9774569f315703b2d8f20029c225e7839ad620121aca7e1e0ee3a0295e402b6a0f504d18774f3266b98b56ffcafbda153321b1947f44205ae51e SHA512 6a80b7bf46a7fde1fd4ec6cddb7bafdf9b9878a493fc5fb6ed425827206100bb45850541b42113be43aa7b336a30f98e14a5fa20d09a6411e3f420b96f7273af
 DIST which-6.0.3.crate 16937 BLAKE2B c4916ce80625b8b869cbf43844d689c62545964cb60f9741851393540a241d1d440dd64517949f3a64a4e9256584393fff84e3cea5f75773c9afd8b7ef580333 SHA512 82048af7dee4bd274f977530a19c2e2c86ac12936b7d814b2a86f13b2063e1a3d7092846d1ab66e3f653bf7ebbf5eae8bbce061a970c5ddb30b151234dd0593d
 DIST whoami-1.5.2.crate 24204 BLAKE2B 29ca6ac8b280d10882d39fe8f15850e2e6035c1e72445c7fb541acdd8784ee756f0a412daf3ea48f7f7755fd5ed68bdd309e85e9380bb9c5af7b05c197b46b14 SHA512 5ecb06b352528e3320cc71c6700f72a79a04791c33f08fde172762f6f2dde25218aa0d405604d0a18a741dba7c370c26cb63b471f09c7b2a6303cdf849606398
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.8.crate 12416 BLAKE2B 5b48c27dfbb5db5c332f7e248138327b35ceec0909788b940168e7f6fe1402800da5e7690b2b1654da6c510b5c720330a92da16dff53ef15821f37fef6f335e3 SHA512 e186111398f9f0f0686e791ad0d72c39205e5f246b6e020df413e477ee07f32e91d09405c61dc92752f061f54fd7533435545c1a151477b40e2d68acc94a57fd
 DIST winapi-util-0.1.9.crate 12464 BLAKE2B 7fb9dd803fc2608c4e5bc75674472992d82da364f24c22072d5624d6ae6abc44abd3e3ea3c45a7558e045331f3d87572b306b4ab5de52c07ff3706e7f13c2a38 SHA512 c46b893f67ec6e36499b00736bb6b9421e0e2611e76784afa6da01d7ebd033df82f1be7cf8d871d541125d290983f98f26f759488ba9aface49efce8edd682e9
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST windows-0.56.0.crate 10807828 BLAKE2B 8c4f9b1698852d375891e9e7728f899281be518fdf10353f7d1c1f3de12db706c10b97f64177765105fd25d2b0a13003a5da1722b2158a1ddfcb8ab7482314e7 SHA512 ad5a1cd4705e295fa3fbc63bd9661dde28b4bc718fed4ef7b12f33d233c364aadb790d7409988e0173548f1f1b1d6bfc3e6c5999a44613913d4b848027430333
@@ -513,14 +377,10 @@ DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e
 DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
-DIST winnow-0.5.40.crate 159316 BLAKE2B aae5076d59b3459c901d918d8aaa97ba8bfcc993b8484344f52e45f1f37deb96d6cd3a1663a67f3c367be2b05d633286f270274c621bda9f3ab72b98bb652cc2 SHA512 525156f08514b0110697360be6e331a68d08f0cb65ee4ba3ac9d101dd2d42a8c89601e7409bdb5652c5b05145626506651010f58a854c47712065334c61ff39c
-DIST winnow-0.6.15.crate 163033 BLAKE2B 36e0f384de487bdd955da479ccc39fa6ac86988c4674ecbccab93db9ebd4cdea7fdd3815036e8a07a230c137146f0b48cc5627fedea8f8c1f960b925724c76ee SHA512 a00119db840003b3d34d4f539339ba0f6b51dcb15d08a8f3970f6b332ad5f53d73601f9abd6009df895aee7ff6e26df85a5784d0ac158ea5acb956adc9eebdad
 DIST winnow-0.6.20.crate 163617 BLAKE2B b47ba6cd94ec80a72b51ad09c5cb9de350d2243295d3997732d5d3d9f8d08bd83e3129150fb24992243949120da1bd6091d580db5ff10258fd745afaa944c791 SHA512 3347fdfb5b15ec73a40614ecd0cce60f41d3f2d083f49aaafceeaf5db52d5c677dc3eb39fcc2595999fc9f864d1fde81e180e09dc86a6f6124878e16e86e8bc8
 DIST winres-0.1.12.crate 19772 BLAKE2B 645fc16e49061cd98c77217b991cb774151f7f8bd6df44cee622bcba121d2645aaf775d56c3e85de6278b193ea6a36256821799c33ba081f931d87ffa0e038f1 SHA512 9f61edafb4a262b56d130e48ac6bba94f5a432bf0a8c20243e6c8fa98c3f9e0d2ab00a77b35a2e49dd63585a272af597e236e089641b5f488760ac42d22f5a67
 DIST winsafe-0.0.19.crate 492820 BLAKE2B 4eba26861f85f668e134b08c60e9522b698aed61eaa5e6d4e89ef31c1b97953fa08a5157add52d9a306075df4ad97e9aaf1767eea4208b72401ec0bc1c3eb0e9 SHA512 0555ec74c5acbb69ab08e54d920094e806258079bffaff3f90297bb94a000c7da36d6eba0eae445d425c781465235dd70a198437cf83a1f113438bfd9baf4c21
-DIST xdg-home-1.2.0.crate 3881 BLAKE2B 97e8869b2c2c72e8613a09049c7ad55dcd48ab124a713747d76c2106932152ce254ae19ab64a1d44959899334359ba1fd0f5b03ba3b9a7c797bd7158eaba55a1 SHA512 50b4ebf67b56e6880bb1340e6268aeac65f0ea38fcd3669becb77d356758434ef569c81844b9bfd17245f9d19f77cd7670388211ed5209052974c023d6151eab
 DIST xdg-home-1.3.0.crate 4000 BLAKE2B 0da36aadfa518f1ecb3fe9067eb4c014689af1f76c71c592184aa4c4fe457883faf1dad757344b375a92c484bcb3d7a408f8759c24b2e7738ef4997c870fdb85 SHA512 4d090f18ea4a37199d2c1760faca11e16ba9069086245543b3390c53e74a84145144a94863c7d8c3155a9d616732a3cd8caaa1a416c43dc4d107ce045727279d
-DIST yaml-rust2-0.8.1.crate 138875 BLAKE2B 319048c48b2cb13e625548014779daf6a36057e20e0ee3bf9ca72d709a5d06efdc05bcaee4d8f30db0a23dbc01e34eec5b4d7d82e020552cce78b351a5f432ad SHA512 8298e58ee5240f19ecfbd07ff46d4da928c5a832fa940b5474edae92ad917c737327ca3d023b1cad1343860cd5930aeb24a19b89fb8ab3cc7603f0b63bf4709e
 DIST yaml-rust2-0.9.0.crate 136382 BLAKE2B b3da4b67ac428aa6875bcedfb9ace38150b2ccb2e438ea5a175d292593ecfafa54139655e047406301ea2f449ef86fc664fb52638e88f9e85ee999d52f64c5a7 SHA512 7dfb211232c469621f842eb1a90343485ccfc46612dbb85b65892cfd3d326b6d53abd12bb10da2545e33ff8cb67289c3a1fb2943eefeef428d7c715fbc4494a2
 DIST zbus-4.4.0.crate 158301 BLAKE2B 7a9a3f8712d99285955020ec60c128289578824061964ae0c26d7f6b284f0ea393087dcf40ae15d13bf87977ba61acab71460120256a5f16b9e5f713fe0a9cad SHA512 2522cf51b6eeeb06b350a0fcacd7cb768459a55a524c8c379da8d0c6f1b7b946f352fe95f993b0af8297de4eb9e63e2f009888465a2b554cfd904d4ca3717699
 DIST zbus_macros-4.4.0.crate 31183 BLAKE2B 9448845e1cfa58d51688b74ddf0aa3e65d1621db3c636809426e67433074dcbce36cbe595dbdaca895650775e7971d9e1fd1e9feb7cad42ba6521839459b6780 SHA512 7fa5d4baa95f440be12d74d4c855f16f60803690020a6af1d28d1ba04d792ff763df3c2c3e4d275e0753a6effeaf597ad8cdedd4a34d4b93f8e69a34b31fa1dd
diff --git a/app-shells/starship/metadata.xml b/app-shells/starship/metadata.xml
index a677bf0ad8da..cddca8abc3af 100644
--- a/app-shells/starship/metadata.xml
+++ b/app-shells/starship/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>arthurzam@gentoo.org</email>
+		<name>Arthur Zamarin</name>
+	</maintainer>
 	<longdescription lang="en">
 		Starship is a customizable shell prompt. It's fast, supports many shells
 		on a variety of operating systems, displays useful information based on
diff --git a/app-shells/starship/starship-1.20.1-r1.ebuild b/app-shells/starship/starship-1.20.1-r1.ebuild
deleted file mode 100644
index 6080429d8bc4..000000000000
--- a/app-shells/starship/starship-1.20.1-r1.ebuild
+++ /dev/null
@@ -1,446 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	adler@1.0.2
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	allocator-api2@0.2.18
-	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
-	anyhow@1.0.86
-	arc-swap@1.7.1
-	arraydeque@0.5.1
-	arrayvec@0.7.4
-	async-broadcast@0.7.1
-	async-channel@2.3.1
-	async-executor@1.13.0
-	async-fs@2.1.2
-	async-io@2.3.3
-	async-lock@3.4.0
-	async-process@2.2.3
-	async-recursion@1.1.1
-	async-signal@0.2.9
-	async-task@4.7.1
-	async-trait@0.1.81
-	atomic-waker@1.1.2
-	autocfg@1.3.0
-	base64@0.13.1
-	base64@0.22.1
-	bitflags@1.3.2
-	bitflags@2.6.0
-	block-buffer@0.10.4
-	block-buffer@0.9.0
-	block@0.1.6
-	blocking@1.6.1
-	bstr@1.9.1
-	bumpalo@3.16.0
-	bytesize@1.3.0
-	cc@1.1.6
-	cfg-if@1.0.0
-	cfg_aliases@0.2.1
-	chrono@0.4.38
-	clap@4.5.11
-	clap_builder@4.5.11
-	clap_complete@4.5.11
-	clap_derive@4.5.11
-	clap_lex@0.7.1
-	clru@0.6.2
-	cmake@0.1.50
-	colorchoice@1.0.1
-	concurrent-queue@2.5.0
-	const-random-macro@0.1.16
-	const-random@0.1.18
-	const_format@0.2.32
-	const_format_proc_macros@0.2.32
-	core-foundation-sys@0.8.6
-	core-foundation@0.9.4
-	cpufeatures@0.2.12
-	crc32fast@1.4.2
-	crossbeam-channel@0.5.13
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-queue@0.3.11
-	crossbeam-utils@0.8.20
-	crossbeam@0.8.4
-	crunchy@0.2.2
-	crypto-common@0.1.6
-	deelevate@0.2.0
-	deranged@0.3.11
-	digest@0.10.7
-	digest@0.9.0
-	dirs-next@2.0.0
-	dirs-sys-next@0.1.2
-	dirs-sys@0.3.7
-	dirs-sys@0.4.1
-	dirs@4.0.0
-	dirs@5.0.1
-	dlv-list@0.5.2
-	downcast@0.11.0
-	dunce@1.0.4
-	dyn-clone@1.0.17
-	either@1.13.0
-	encoding_rs@0.8.34
-	endi@1.1.0
-	enumflags2@0.7.10
-	enumflags2_derive@0.7.10
-	equivalent@1.0.1
-	errno-dragonfly@0.1.2
-	errno@0.2.8
-	errno@0.3.9
-	event-listener-strategy@0.5.2
-	event-listener@5.3.1
-	faster-hex@0.9.0
-	fastrand@2.1.0
-	filedescriptor@0.8.2
-	filetime@0.2.23
-	flate2@1.0.30
-	fnv@1.0.7
-	form_urlencoded@1.2.1
-	fragile@2.0.0
-	futures-core@0.3.30
-	futures-io@0.3.30
-	futures-lite@2.3.0
-	futures-sink@0.3.30
-	futures-task@0.3.30
-	futures-util@0.3.30
-	generic-array@0.14.7
-	gethostname@0.5.0
-	getrandom@0.2.15
-	gix-actor@0.31.5
-	gix-bitmap@0.2.11
-	gix-chunk@0.4.8
-	gix-commitgraph@0.24.3
-	gix-config-value@0.14.7
-	gix-config@0.38.0
-	gix-date@0.8.7
-	gix-diff@0.44.1
-	gix-discover@0.33.0
-	gix-features@0.38.2
-	gix-fs@0.11.2
-	gix-glob@0.16.4
-	gix-hash@0.14.2
-	gix-hashtable@0.5.2
-	gix-index@0.33.1
-	gix-lock@14.0.0
-	gix-macros@0.1.5
-	gix-object@0.42.3
-	gix-odb@0.61.1
-	gix-pack@0.51.1
-	gix-path@0.10.9
-	gix-quote@0.4.12
-	gix-ref@0.45.0
-	gix-refspec@0.23.1
-	gix-revision@0.27.2
-	gix-revwalk@0.13.2
-	gix-sec@0.10.7
-	gix-tempfile@14.0.1
-	gix-trace@0.1.9
-	gix-traverse@0.39.2
-	gix-url@0.27.4
-	gix-utils@0.1.12
-	gix-validate@0.8.5
-	gix@0.64.0
-	guess_host_triple@0.1.3
-	hashbrown@0.12.3
-	hashbrown@0.14.5
-	hashlink@0.8.4
-	heck@0.5.0
-	hermit-abi@0.4.0
-	hex@0.4.3
-	home@0.5.9
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.60
-	idna@0.5.0
-	indexmap@1.9.3
-	indexmap@2.2.6
-	is-docker@0.2.0
-	is-wsl@0.4.0
-	is_debug@1.0.1
-	is_terminal_polyfill@1.70.0
-	itertools@0.13.0
-	itoa@1.0.11
-	js-sys@0.3.69
-	jwalk@0.8.1
-	lazy_static@1.5.0
-	lazycell@1.3.0
-	libc@0.2.155
-	libredox@0.1.3
-	libz-ng-sys@1.1.15
-	libz-sys@1.1.18
-	linux-raw-sys@0.4.14
-	lock_api@0.4.12
-	log@0.4.22
-	mac-notification-sys@0.6.1
-	mach2@0.4.2
-	malloc_buf@0.0.6
-	memchr@2.7.4
-	memmap2@0.9.4
-	memmem@0.1.1
-	memoffset@0.9.1
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.4
-	mockall@0.13.0
-	mockall_derive@0.13.0
-	nix@0.29.0
-	nom@5.1.3
-	nom@7.1.3
-	notify-rust@4.11.0
-	nu-ansi-term@0.50.1
-	num-conv@0.1.0
-	num-derive@0.3.3
-	num-traits@0.2.19
-	num_threads@0.1.7
-	objc-foundation@0.1.1
-	objc@0.2.7
-	objc_id@0.1.1
-	once_cell@1.19.0
-	opaque-debug@0.3.1
-	open@5.3.0
-	option-ext@0.2.0
-	ordered-float@2.10.1
-	ordered-multimap@0.7.3
-	ordered-stream@0.2.0
-	os_info@3.8.2
-	parking@2.2.0
-	parking_lot@0.12.3
-	parking_lot_core@0.9.10
-	path-slash@0.2.1
-	pathdiff@0.2.1
-	pathsearch@0.2.0
-	percent-encoding@2.3.1
-	pest@2.7.11
-	pest_derive@2.7.11
-	pest_generator@2.7.11
-	pest_meta@2.7.11
-	phf@0.11.2
-	phf_codegen@0.11.2
-	phf_generator@0.11.2
-	phf_shared@0.11.2
-	pin-project-lite@0.2.14
-	pin-utils@0.1.0
-	piper@0.2.3
-	pkg-config@0.3.30
-	plist@1.7.0
-	polling@3.7.2
-	powerfmt@0.2.0
-	ppv-lite86@0.2.17
-	predicates-core@1.0.6
-	predicates-tree@1.0.9
-	predicates@3.1.0
-	proc-macro-crate@3.1.0
-	proc-macro2@1.0.86
-	process_control@4.1.0
-	prodash@28.0.0
-	quick-xml@0.31.0
-	quick-xml@0.32.0
-	quick-xml@0.36.1
-	quote@1.0.36
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rayon-core@1.12.1
-	rayon@1.10.0
-	redox_syscall@0.4.1
-	redox_syscall@0.5.3
-	redox_users@0.4.5
-	regex-automata@0.4.7
-	regex-syntax@0.8.4
-	regex@1.10.5
-	rust-ini@0.21.0
-	rustix@0.38.34
-	ryu@1.0.18
-	same-file@1.0.6
-	schemars@0.8.21
-	schemars_derive@0.8.21
-	scopeguard@1.2.0
-	semver-parser@0.10.2
-	semver@0.11.0
-	semver@1.0.23
-	serde@1.0.204
-	serde_derive@1.0.204
-	serde_derive_internals@0.29.1
-	serde_json@1.0.120
-	serde_repr@0.1.19
-	serde_spanned@0.6.7
-	sha1-asm@0.5.3
-	sha1@0.10.6
-	sha1_smol@1.0.1
-	sha2@0.10.8
-	sha2@0.9.9
-	shadow-rs@0.30.0
-	shared_library@0.1.9
-	shell-words@1.1.0
-	signal-hook-registry@1.4.2
-	signal-hook@0.1.17
-	signal-hook@0.3.17
-	siphasher@0.3.11
-	slab@0.4.9
-	smallvec@1.13.2
-	starship@1.20.1
-	starship-battery@0.9.1
-	static_assertions@1.1.0
-	strsim@0.11.1
-	syn@1.0.109
-	syn@2.0.72
-	systemstat@0.2.3
-	tauri-winrt-notification@0.2.1
-	tempfile@3.10.1
-	terminal_size@0.3.0
-	terminfo@0.7.5
-	termios@0.3.3
-	termtree@0.4.1
-	termwiz@0.15.0
-	thiserror-impl@1.0.63
-	thiserror@1.0.63
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tiny-keccak@2.0.2
-	tinyvec@1.8.0
-	tinyvec_macros@0.1.1
-	toml@0.5.11
-	toml@0.8.16
-	toml_datetime@0.6.7
-	toml_edit@0.21.1
-	toml_edit@0.22.17
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing@0.1.40
-	trim-in-place@0.1.7
-	typenum@1.17.0
-	ucd-trie@0.1.6
-	uds_windows@1.1.0
-	uluru@3.1.0
-	unicase@2.7.0
-	unicode-bidi@0.3.15
-	unicode-bom@2.0.3
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	unicode-segmentation@1.11.0
-	unicode-width@0.1.13
-	unicode-xid@0.2.4
-	uom@0.36.0
-	url@2.5.2
-	urlencoding@2.1.3
-	utf8parse@0.2.2
-	vcpkg@0.2.15
-	version_check@0.9.4
-	versions@6.3.0
-	vtparse@0.6.2
-	walkdir@2.5.0
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-backend@0.2.92
-	wasm-bindgen-macro-support@0.2.92
-	wasm-bindgen-macro@0.2.92
-	wasm-bindgen-shared@0.2.92
-	wasm-bindgen@0.2.92
-	which@6.0.1
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.8
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-core@0.52.0
-	windows-core@0.56.0
-	windows-core@0.58.0
-	windows-implement@0.56.0
-	windows-implement@0.58.0
-	windows-interface@0.56.0
-	windows-interface@0.58.0
-	windows-result@0.1.2
-	windows-result@0.2.0
-	windows-strings@0.1.0
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-targets@0.48.5
-	windows-targets@0.52.6
-	windows-version@0.1.1
-	windows@0.56.0
-	windows@0.58.0
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.6
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.6
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.6
-	windows_i686_gnullvm@0.52.6
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.6
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.6
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.6
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.6
-	winnow@0.5.40
-	winnow@0.6.15
-	winres@0.1.12
-	winsafe@0.0.19
-	xdg-home@1.2.0
-	yaml-rust2@0.8.1
-	zbus@4.4.0
-	zbus_macros@4.4.0
-	zbus_names@3.0.0
-	zerocopy-derive@0.7.35
-	zerocopy@0.7.35
-	zvariant@4.2.0
-	zvariant_derive@4.2.0
-	zvariant_utils@2.1.0
-"
-
-RUST_MIN_VER="1.74.1"
-inherit cargo
-
-DESCRIPTION="The minimal, blazing-fast, and infinitely customizable prompt for any shell"
-HOMEPAGE="https://starship.rs/"
-SRC_URI="
-	${CARGO_CRATE_URIS}"
-
-LICENSE="ISC"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense
-	WTFPL-2 ZLIB
-"
-
-SLOT="0"
-KEYWORDS="amd64 arm64"
-
-BDEPEND="
-	dev-build/cmake
-"
-
-QA_FLAGS_IGNORED="usr/bin/starship"
-
-src_prepare() {
-	sed -e '/strip/s/true/false/' -i Cargo.toml || die # bug 866133
-	default
-}
-
-src_configure() {
-	export PKG_CONFIG_ALLOW_CROSS=1
-	export OPENSSL_NO_VENDOR=true
-
-	cargo_src_configure
-}
-
-src_install() {
-	cargo_src_install
-	dodoc README.md
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt "1.9.0"; then
-			einfo "Note that vicmd_symbol config option was renamed to vimcmd_symbol in version 1.9"
-		fi
-	done
-}
diff --git a/app-shells/starship/starship-1.21.1-r1.ebuild b/app-shells/starship/starship-1.21.1-r1.ebuild
index d090c5a8c639..295100ff6b15 100644
--- a/app-shells/starship/starship-1.21.1-r1.ebuild
+++ b/app-shells/starship/starship-1.21.1-r1.ebuild
@@ -412,7 +412,7 @@ LICENSE+="
 "
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 BDEPEND="
 	dev-build/cmake
diff --git a/app-shells/starship/starship-1.22.1.ebuild b/app-shells/starship/starship-1.22.1.ebuild
new file mode 100644
index 000000000000..366397127267
--- /dev/null
+++ b/app-shells/starship/starship-1.22.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=""
+RUST_MIN_VER="1.80.0"
+inherit cargo optfeature shell-completion
+
+DESCRIPTION="The minimal, blazing-fast, and infinitely customizable prompt for any shell"
+HOMEPAGE="https://starship.rs/"
+SRC_URI="
+	https://github.com/starship/starship/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}"
+SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/app-shells/${PN}/${P}-crates.tar.xz"
+
+LICENSE="ISC"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD CC0-1.0 ISC MIT MPL-2.0 Unicode-3.0 Unlicense WTFPL-2
+	ZLIB
+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="
+	dev-build/cmake
+"
+
+QA_FLAGS_IGNORED="usr/bin/starship"
+
+src_prepare() {
+	sed -e '/strip/s/true/false/' -i Cargo.toml || die # bug 866133
+	default
+}
+
+src_configure() {
+	export PKG_CONFIG_ALLOW_CROSS=1
+	export OPENSSL_NO_VENDOR=true
+
+	cargo_src_configure
+}
+
+src_compile() {
+	cargo_src_compile
+
+	local STARSHIP_BIN="$(cargo_target_dir)/${PN}"
+
+	# Prepare shell completion generation
+	mkdir "${T}/completions" || die
+	local shell
+	for shell in bash fish zsh; do
+		"${STARSHIP_BIN}" completions ${shell} > "${T}/completions/${shell}" || die
+	done
+}
+
+src_install() {
+	dobin "$(cargo_target_dir)/${PN}"
+	dodoc README.md
+
+	newbashcomp "${T}/completions/bash" "${PN}"
+	newzshcomp "${T}/completions/zsh" "${PN}"
+	newfishcomp "${T}/completions/fish" "${PN}.fish"
+}
+
+pkg_postinst() {
+	optfeature "font support" media-fonts/iosevka media-fonts/noto-emoji
+}
diff --git a/app-text/apvlv/apvlv-0.4.0-r1.ebuild b/app-text/apvlv/apvlv-0.4.0-r1.ebuild
deleted file mode 100644
index 24ab3cda2530..000000000000
--- a/app-text/apvlv/apvlv-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg cmake desktop
-
-DESCRIPTION="Alf's PDF/DJVU/EPUB Viewer like Vim"
-HOMEPAGE="https://github.com/naihe2010/apvlv/"
-SRC_URI="https://github.com/naihe2010/apvlv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug djvu"
-
-RDEPEND="
-	app-text/ebook-tools
-	>=app-text/poppler-0.5.0:=[cairo,xpdf-headers(+)]
-	dev-libs/glib:2
-	dev-libs/libxml2
-	net-libs/webkit-gtk:4=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango
-	djvu? ( app-text/djvu )
-"
-
-DEPEND="${RDEPEND}
-	app-text/ghostscript-gpl
-	media-libs/freetype
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake-cxxflags.patch
-	"${FILESDIR}"/${P}-icon.patch
-)
-src_prepare() {
-	cmake_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DAPVLV_WITH_DJVU=$(usex djvu)
-		-DAPVLV_ENABLE_DEBUG=$(usex debug)
-		-DAPVLV_WITH_TXT=ON
-		-DDOCDIR="/usr/share/doc/${PF}"
-	)
-	cmake_src_configure
-}
-src_install() {
-	cmake_src_install
-	newicon -s 32 icons/pdf.png ${PN}.png
-}
diff --git a/app-text/apvlv/files/apvlv-0.4.0-icon.patch b/app-text/apvlv/files/apvlv-0.4.0-icon.patch
deleted file mode 100644
index f5e8ad370877..000000000000
--- a/app-text/apvlv/files/apvlv-0.4.0-icon.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/apvlv.desktop
-+++ b/apvlv.desktop
-@@ -2,6 +2,7 @@
- Version=1.0
- Type=Application
- Name=apvlv
-+Icon=apvlv
- Comment=A minimalistic document viewer
- Comment[de]=Ein minimalistischer Dokumenten-Betrachter
- Comment[fr]=Un visionneur de document minimaliste
diff --git a/app-text/crengine-ng/crengine-ng-0.9.12-r1.ebuild b/app-text/crengine-ng/crengine-ng-0.9.12-r1.ebuild
new file mode 100644
index 000000000000..daacf8bc7e24
--- /dev/null
+++ b/app-text/crengine-ng/crengine-ng-0.9.12-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="Cross-platform library designed to implement e-book readers"
+HOMEPAGE="https://gitlab.com/coolreader-ng/crengine-ng"
+SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2
+	test? ( mirror://gnu/freefont/freefont-otf-20120503.tar.gz )"
+
+LICENSE="GPL-2+"
+SLOT="0/7"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc static-libs test"
+
+RESTRICT="!test? ( test )"
+
+CDEPEND="sys-libs/zlib
+	png? ( media-libs/libpng:0 )
+	jpeg? ( media-libs/libjpeg-turbo )
+	>=media-libs/freetype-2.10.0
+	harfbuzz? ( media-libs/harfbuzz:=[truetype] )
+	libunibreak? ( dev-libs/libunibreak:= )
+	fribidi? ( dev-libs/fribidi )
+	zstd? ( app-arch/zstd:= )
+	libutf8proc? ( dev-libs/libutf8proc:= )
+	fontconfig? ( media-libs/fontconfig )"
+
+RDEPEND="${CDEPEND}"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest
+		app-arch/zip )
+"
+BDEPEND="virtual/pkgconfig
+	${CDEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+	if use test; then
+		mkdir -p "${BUILD_DIR}/crengine/tests/fonts/"
+		cp -p "${WORKDIR}/freefont-20120503/"*.otf "${BUILD_DIR}/crengine/tests/fonts/"
+	fi
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE="Release"
+	local mycmakeargs=(
+		-DCRE_BUILD_SHARED=ON
+		-DCRE_BUILD_STATIC=$(usex static-libs)
+		-DUSE_COLOR_BACKBUFFER=ON
+		-DWITH_LIBPNG=$(usex png)
+		-DWITH_LIBJPEG=$(usex jpeg)
+		-DWITH_FREETYPE=ON
+		-DWITH_HARFBUZZ=$(usex harfbuzz)
+		-DWITH_LIBUNIBREAK=$(usex libunibreak)
+		-DWITH_FRIBIDI=$(usex fribidi)
+		-DWITH_ZSTD=$(usex zstd)
+		-DWITH_UTF8PROC=$(usex libutf8proc)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_NANOSVG=$(usex svg)
+		-DUSE_CHM=$(usex chm)
+		-DUSE_ANTIWORD=ON
+		-DUSE_FONTCONFIG=$(usex fontconfig)
+		-DUSE_SHASUM=OFF
+		-DUSE_MD4C=ON
+		-DBUILD_TOOLS=OFF
+		-DENABLE_UNITTESTING=$(usex test)
+		-DOFFLINE_BUILD_MODE=ON
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}/crengine/tests"
+	./unittests
+}
diff --git a/app-text/crengine-ng/crengine-ng-0.9.12.ebuild b/app-text/crengine-ng/crengine-ng-0.9.12.ebuild
deleted file mode 100644
index a7dcaebd4596..000000000000
--- a/app-text/crengine-ng/crengine-ng-0.9.12.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 cmake
-
-DESCRIPTION="Cross-platform library designed to implement e-book readers"
-HOMEPAGE="https://gitlab.com/coolreader-ng/crengine-ng"
-SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2
-	test? ( mirror://gnu/freefont/freefont-otf-20120503.tar.gz )"
-
-LICENSE="GPL-2+"
-SLOT="0/6"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc static-libs test"
-
-RESTRICT="!test? ( test )"
-
-CDEPEND="sys-libs/zlib
-	png? ( media-libs/libpng:0 )
-	jpeg? ( media-libs/libjpeg-turbo )
-	>=media-libs/freetype-2.10.0
-	harfbuzz? ( media-libs/harfbuzz:=[truetype] )
-	libunibreak? ( dev-libs/libunibreak:= )
-	fribidi? ( dev-libs/fribidi )
-	zstd? ( app-arch/zstd:= )
-	libutf8proc? ( dev-libs/libutf8proc:= )
-	fontconfig? ( media-libs/fontconfig )"
-
-RDEPEND="${CDEPEND}"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-cpp/gtest
-		app-arch/zip )
-"
-BDEPEND="virtual/pkgconfig
-	${CDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-	if use test; then
-		mkdir -p "${BUILD_DIR}/crengine/tests/fonts/"
-		cp -p "${WORKDIR}/freefont-20120503/"*.otf "${BUILD_DIR}/crengine/tests/fonts/"
-	fi
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE="Release"
-	local mycmakeargs=(
-		-DCRE_BUILD_SHARED=ON
-		-DCRE_BUILD_STATIC=$(usex static-libs)
-		-DUSE_COLOR_BACKBUFFER=ON
-		-DWITH_LIBPNG=$(usex png)
-		-DWITH_LIBJPEG=$(usex jpeg)
-		-DWITH_FREETYPE=ON
-		-DWITH_HARFBUZZ=$(usex harfbuzz)
-		-DWITH_LIBUNIBREAK=$(usex libunibreak)
-		-DWITH_FRIBIDI=$(usex fribidi)
-		-DWITH_ZSTD=$(usex zstd)
-		-DWITH_UTF8PROC=$(usex libutf8proc)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_NANOSVG=$(usex svg)
-		-DUSE_CHM=$(usex chm)
-		-DUSE_ANTIWORD=ON
-		-DUSE_FONTCONFIG=$(usex fontconfig)
-		-DUSE_SHASUM=OFF
-		-DUSE_MD4C=ON
-		-DBUILD_TOOLS=OFF
-		-DENABLE_UNITTESTING=$(usex test)
-		-DOFFLINE_BUILD_MODE=ON
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}/crengine/tests"
-	./unittests
-}
diff --git a/app-text/discount/discount-2.2.7c-r1.ebuild b/app-text/discount/discount-2.2.7c-r1.ebuild
index 4c9026ea0c79..0342dd5102c4 100644
--- a/app-text/discount/discount-2.2.7c-r1.ebuild
+++ b/app-text/discount/discount-2.2.7c-r1.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="https://github.com/Orc/discount/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/2.2.7"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/doxygen/Manifest b/app-text/doxygen/Manifest
index 1d4029dfe185..06b634e3966f 100644
--- a/app-text/doxygen/Manifest
+++ b/app-text/doxygen/Manifest
@@ -1,4 +1,5 @@
 DIST doxygen-1.10.0.src.tar.gz 8400410 BLAKE2B dc7882dfb8b023e9250592375105cc79d4744362d96f4518b931ac264259257d27e0f2c5456580f3676bb54cc29fbc2ab3b2ffc37da6441297091c60a38dc13b SHA512 885de36fa0b4364cdd1eddd5e02517e08da7a52274c6fda2c22cbe85f0840e2ddf7358f613c018dc39b4a6dfce2ddd627e9318e73b903f954bbad1a39d03a416
 DIST doxygen-1.11.0.src.tar.gz 8447729 BLAKE2B e4825494099850b648df570a1ae53b858d196f7c6ada4565eae1e04ac119f4f9b1ed9d6e07dc26a5e50d41b74299720d7cde4ff43a7350b083d74eabce7624e3 SHA512 54f4a15e459d1d9cc3b4f021b5264191146bd8e0e780b57c4c31f4f9dcbfc7fe7a9db58e8cda4c6df1b4b354dd432dac0b3089fd547afe7cbe313771b2c6aaa4
 DIST doxygen-1.12.0.src.tar.gz 8472577 BLAKE2B de823aa8dee0e22ec49bbb97cf5b53272cdaea249250556b07602d501d45774be19dbd40ecc4324942840d3fe90b0224aa5c61ec7d42098f1797d75f3795268d SHA512 e407e29c5e232e1f8dca291dd2d00b1dd400be709400225339408fad2cd758563b69f290cbd7c0efeb76b1335c4672fb1d6d580b9e6ed570708cf9b7d78951b1
+DIST doxygen-1.13.0.src.tar.gz 8502031 BLAKE2B 8a12ed632772b48d07ea4edf16032f491e05b4718d38160ebc1f3d8de1cdf96bca827da28048907cf538a286757ddf56c503fbe08dcfc5a17cc72fea7233a466 SHA512 f6cae74bd8df9c6c2ba3fa21fc33926e6d5eba65101776f84c1fa056d9231d69e232a30d7702b53a284543fc4765edadb10f4d4b4a46314fa08580963d9226fb
 DIST doxygen-1.9.8.src.tar.gz 8087770 BLAKE2B 9b93bd394e9fdafef1c274596f790db0956028332a945e0359b7b24440aefa5362b2126649c529e71341bba172cd1fa514455567ffffd37243a740a1ffbc1944 SHA512 edcd382538ecf0afd9d1c891afe302092cd541a30840dda6b00dc0f1d6c5b39a696ab98042c5bb4012c1c051609bfdbfa7d29e3098a72f6cb504d90097767ebb
diff --git a/app-text/doxygen/doxygen-1.13.0.ebuild b/app-text/doxygen/doxygen-1.13.0.ebuild
new file mode 100644
index 000000000000..880199c26358
--- /dev/null
+++ b/app-text/doxygen/doxygen-1.13.0.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 19 )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit cmake flag-o-matic llvm-r1 python-any-r1
+
+DESCRIPTION="Documentation system for most programming languages"
+HOMEPAGE="https://www.doxygen.nl/"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
+else
+	SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz"
+	SRC_URI+=" https://downloads.sourceforge.net/doxygen/rel-${PV}/${P}.src.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+# GPL-2 also for bundled libmscgen
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clang debug doc dot doxysearch gui test"
+# - We need TeX for tests, bug #765472
+# - We keep the odd construct of noop USE=test because of
+#   the special relationship b/t RESTRICT & USE for tests.
+#   Also, it's a hint which avoids tests being silently skipped during arch testing.
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} ) test? ( doc )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-alternatives/yacc
+	app-alternatives/lex
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	app-text/ghostscript-gpl
+	dev-db/sqlite:3
+	dev-lang/perl
+	dev-libs/libfmt:=
+	dev-libs/spdlog:=
+	virtual/libiconv
+	clang? (
+		$(llvm_gen_dep '
+			llvm-core/clang:${LLVM_SLOT}=
+			llvm-core/llvm:${LLVM_SLOT}=
+		')
+	)
+	dot? (
+		media-gfx/graphviz[freetype(+)]
+	)
+	doc? (
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-plaingeneric
+	)
+	doxysearch? ( dev-libs/xapian:= )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch"
+	"${FILESDIR}/${PN}-1.9.8-suppress-unused-option-libcxx.patch"
+)
+
+DOCS=( LANGUAGE.HOWTO README.md )
+
+pkg_setup() {
+	use clang && llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
+	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
+
+	# fix pdf doc
+	sed -i.orig -e "s:g_kowal:g kowal:" \
+		doc/maintainers.txt || die
+
+	if is-flagq "-O3" ; then
+		# TODO: Investigate this and report a bug accordingly...
+		ewarn "Compiling with -O3 is known to produce incorrectly"
+		ewarn "optimized code which breaks doxygen. Using -O2 instead."
+		replace-flags "-O3" "-O2"
+	fi
+}
+
+src_configure() {
+	# Very slow to compile, bug #920092
+	filter-flags -fipa-pta
+	# -Wodr warnings, see bug #854357 and https://github.com/doxygen/doxygen/issues/9287
+	filter-lto
+
+	local mycmakeargs=(
+		-Duse_libclang=$(usex clang)
+		# Let the user choose instead, see also bug #822615
+		-Duse_libc++=OFF
+		-Dbuild_doc=$(usex doc)
+		-Dbuild_search=$(usex doxysearch)
+		-Dbuild_wizard=$(usex gui)
+		-Duse_sys_spdlog=ON
+		-Duse_sys_sqlite3=ON
+		-DBUILD_SHARED_LIBS=OFF
+		-DGIT_EXECUTABLE="false"
+
+		# Noisy and irrelevant downstream
+		-Wno-dev
+	)
+
+	use doc && mycmakeargs+=(
+		-DDOC_INSTALL_DIR="share/doc/${P}"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		export VARTEXFONTS="${T}/fonts" # bug #564944
+
+		if ! use dot; then
+			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
+				{testing/Doxyfile,doc/Doxyfile} \
+				|| die "disabling dot failed"
+		fi
+
+		# -j1 for bug #770070
+		cmake_src_compile docs -j1
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	# manpages are only automatically installed when docs are
+	# https://github.com/doxygen/doxygen/pull/10647
+	doman doc/doxygen.1
+	use gui && doman doc/doxywizard.1
+	use doxysearch && {
+		doman doc/doxyindexer.1
+		doman doc/doxysearch.1
+	}
+}
diff --git a/app-text/dvipsk/dvipsk-2024.03.11_p70015.ebuild b/app-text/dvipsk/dvipsk-2024.03.11_p70015.ebuild
index 311f71307846..b3eb2bcd6023 100644
--- a/app-text/dvipsk/dvipsk-2024.03.11_p70015.ebuild
+++ b/app-text/dvipsk/dvipsk-2024.03.11_p70015.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
@@ -24,7 +24,7 @@ SRC_URI+=" ) "
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc source"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1:="
diff --git a/app-text/dvisvgm/dvisvgm-3.4.ebuild b/app-text/dvisvgm/dvisvgm-3.4.ebuild
index 6e02cca0c003..a7fabcc1b015 100644
--- a/app-text/dvisvgm/dvisvgm-3.4.ebuild
+++ b/app-text/dvisvgm/dvisvgm-3.4.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
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 # variant: Boost-1.0
 LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/feathernotes/Manifest b/app-text/feathernotes/Manifest
index 853797035663..1f7a86f23be7 100644
--- a/app-text/feathernotes/Manifest
+++ b/app-text/feathernotes/Manifest
@@ -1,2 +1 @@
-DIST feathernotes-1.2.0.tar.gz 926273 BLAKE2B ae945ae6adb95d3cd8ef42becfcd68a591ef62f97f05d514f19a9c07e6900b2230e89361b65abfc2082797755bcb8b6c521b72a6406a21886ba6ab386f23295f SHA512 f6aabc0d4bee5f3af20a86035befbc27eddedc5ec37c9a353723a80fb0f691af6ad57d5f50a0e8504336c141822227f8287ed61e52d084b34e3b8ab5246315c0
 DIST feathernotes-1.3.0.tar.gz 926547 BLAKE2B 5fe3475793a28a8e4c41c669c7fdde5785abdc4b93b14ca47bf531d5bf246c7ec064c3d5f756b184a45a39d5f02047cca90ad0c37c050c7a1ef363148705c592 SHA512 1036a4ed37e90cbf7e2e7839abcbe5d544a3e162839b05461ec0cea475a4cb3cce44941246e30f3aed6839e4fe9832392f33bfe87b19588d822ce19983dacc2e
diff --git a/app-text/feathernotes/feathernotes-1.2.0.ebuild b/app-text/feathernotes/feathernotes-1.2.0.ebuild
deleted file mode 100644
index 3f3075fd6e7a..000000000000
--- a/app-text/feathernotes/feathernotes-1.2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION=" Lightweight Qt Notes-Manager for Linux"
-HOMEPAGE="https://github.com/tsujan/FeatherNotes"
-SRC_URI="https://github.com/tsujan/FeatherNotes/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/FeatherNotes-${PV}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="spell X"
-
-RDEPEND="
-	dev-qt/qtbase:6[dbus,gui,network,widgets,xml,X?]
-	dev-qt/qtsvg:6
-	spell? ( app-text/hunspell:= )
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="dev-qt/qttools:6[linguist]"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITHOUT_X11=$(usex !X)
-		-DWITH_HUNSPELL=$(usex spell)
-	)
-	cmake_src_configure
-}
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
index 62412ab7f869..46e51f45f758 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -1,2 +1,2 @@
-DIST gtranslator-45.3.tar.xz 1524700 BLAKE2B 5437f479d5276ef405cbd82c37aaa34b1cc4fe1ffa01d32e1e946adb65da0668ac6eb7359cb374a968367a16564959efb6d260dbeb148d34aca3c69cd545926e SHA512 6b4db2f12ec57db6b0ee7ae0030f2fe5bc748e0b501e3ea6f529e47e5e77196a47cf5bf6333fe84c314eaec20d353e7a2bf9a8bea75bbbcd7da438c2dc5e22c9
 DIST gtranslator-46.1.tar.xz 1511200 BLAKE2B 81e625564f17d9ef3202644c527b0e0cd12812e2d16f655e9063708de593062c771e78cbe59f1176e56900ac9332b9efe04e151910b629ef8fbc2e0d9b4be827 SHA512 e035be70ce5c4ba0bbad35d908e805d5de05172bea4101d8f9dcecd122fcc0c89b06b99de9965e7413a8a949d7bc60eb95f157d416de020d3dd46dc5f0c9b909
+DIST gtranslator-47.1.tar.xz 1251964 BLAKE2B abfc76c1bb08ce103fb97f13bc2d08f6798b4d23b0c236f9e937feef6c0b3151971c1e27f5faada59ebf70f07258f69de7700432c5b4dfb1056879f8887e315f SHA512 3b26a90cc4a7c25a32fa2158b016fda39577aacc303f63432c6fc87d0ed4aea11200308f9bc502d14b60119d5ebd2d23572050dfcab4a82208f7d1801386fe79
diff --git a/app-text/gtranslator/gtranslator-45.3.ebuild b/app-text/gtranslator/gtranslator-45.3.ebuild
deleted file mode 100644
index ef91db5918ed..000000000000
--- a/app-text/gtranslator/gtranslator-45.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="GNOME Translation Editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="gtk-doc"
-
-DEPEND="
-	>=dev-libs/glib-2.71.3:2
-	>=gui-libs/gtk-4.6.0:4
-	>=gui-libs/libadwaita-1.1.0
-	gnome-extra/libgda:5=
-	gnome-base/gsettings-desktop-schemas
-	>=gui-libs/gtksourceview-5.4.0:5
-	>=dev-libs/libxml2-2.4.12:2
-	net-libs/libsoup:3.0
-	>=dev-libs/json-glib-1.2.0
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.28
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-45.2-Revert-Add-GDA-6-compatibility.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-		-Dprofile=default
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-text/gtranslator/gtranslator-47.1.ebuild b/app-text/gtranslator/gtranslator-47.1.ebuild
new file mode 100644
index 000000000000..142d4bce1a1a
--- /dev/null
+++ b/app-text/gtranslator/gtranslator-47.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="GNOME Translation Editor"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gtranslator/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.71.3:2
+	>=gui-libs/gtk-4.12.0:4
+	>=gui-libs/libadwaita-1.6_alpha
+	gnome-extra/libgda:5=
+	gnome-base/gsettings-desktop-schemas
+	>=gui-libs/gtksourceview-5.4.0:5
+	>=dev-libs/libxml2-2.4.12:2
+	net-libs/libsoup:3.0
+	>=dev-libs/json-glib-1.2.0
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-45.2-Revert-Add-GDA-6-compatibility.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Dprofile=default
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 2eddbab4fa37..7e7114a642ed 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,3 +1,5 @@
+DIST highlight-4.12.tar.bz2 1501961 BLAKE2B 39b8ded3588a65e3a570a11c007ecbaf3ec61bf79bd412f1c29a5d130007a1b9fe8ab0d6b32876891f55cf5ec5d69448632c1b4ed38dd127b6cbbda7850d0b92 SHA512 6174f00adb28182b2eddf087458c04e0914f74d515615f36f11181225ab4d964bc7c9d08145f58f285fbd3c30759248f99df1274f80cfda8c53a1f3f0016cb0f
+DIST highlight-4.12.tar.bz2.asc 488 BLAKE2B 7a63fcee8093c5cd9d2d1da26f4c6f20e7319ab6ea2b2fb7d56e8c0a72165495a823f7d767e65261179393cf9b67452c8cc1b1f84bf80cabccb5c67b0f3cd90f SHA512 c14ee33b4ded0fd1a0d936c839ca87152660d1f8ad3c32b0c693bb845b510e482cba745149d1df1f8ce526fa009db4031b3843aa30ac30c7a0bf3a7f0fdb6438
 DIST highlight-4.9.tar.bz2 1498248 BLAKE2B 09ff0a5cc81da45270a8382dc6b2a2d3b44d1f084e661fae4a3d39d2ded9af6c77b1fb0d51d32c59f22ccba1612ab7faf68b5e918dda70c9f2e25b29b5c44ecd SHA512 280abd98182c5b95f629ca126e8a59ca6bf6f9e301fc7678aa3e4cb37b714827dfdfab1e008c798e203c7408355be63e01e88f93eacfcf2c5fad95afc6e22112
 DIST highlight-4.9.tar.bz2.asc 488 BLAKE2B cbd3541f65ec714ff1fda17fb141aa19f53952634a2027819fdbf50f7cf781f875b76ebd9a82119347f17940d8200f856082dfff51ff994a71a2ece04d654764 SHA512 04c2aca4050cae0dde97340a1ebafd968526e2d811e4551e8895acca50613f7e5902e31d735a0da1427d69e85e152530776fa1b9f5896efe410d8f9437768298
 DIST highlight-test-suite-a3479468672cdbc570a17ae84e047fe8f0b88798.tar.bz2 33310 BLAKE2B a06f2503fc571f5978f648fdc677f58f3fdfa759f9b5cf31a85d03589bbbfd2b56c7055517c59292369653503047af63d9c3bfbbe541a50bd2ea2adede28f60c SHA512 9583fe0af315e0dd1e37e137adf5c97a83832885a5a8a12b91790d7d7b0758c03fd76c02fbda368a2481eaec98f7b010a530bc31da98337d6fa7201aadb023ce
diff --git a/app-text/highlight/highlight-4.12.ebuild b/app-text/highlight/highlight-4.12.ebuild
new file mode 100644
index 000000000000..1dfabf98e87b
--- /dev/null
+++ b/app-text/highlight/highlight-4.12.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andresimon.asc
+inherit lua-single qmake-utils toolchain-funcs verify-sig xdg
+
+DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
+HOMEPAGE="http://andre-simon.de/"
+# This is arbitrary; upstream uses master.  Update when possible.
+TESTSUITE_COMMIT="a3479468672cdbc570a17ae84e047fe8f0b88798"
+SRC_URI="
+	http://andre-simon.de/zip/${P}.tar.bz2
+	test? ( https://gitlab.com/tajmone/${PN}-test-suite/-/archive/${TESTSUITE_COMMIT}/${PN}-test-suite-${TESTSUITE_COMMIT}.tar.bz2 )
+	verify-sig? ( http://www.andre-simon.de/zip/${P}.tar.bz2.asc )
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples gui test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}
+	gui? ( dev-qt/qtbase:6[gui,widgets] )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	virtual/pkgconfig
+	gui? ( dev-qt/qttools:6[linguist] )
+	verify-sig? ( sec-keys/openpgp-keys-andresimon )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch )
+
+myhlopts=(
+	CXX="$(tc-getCXX)"
+	AR="$(tc-getAR)"
+	LDFLAGS="${LDFLAGS}"
+	CFLAGS="${CXXFLAGS} -DNDEBUG"
+	DESTDIR="${D}"
+	PREFIX="${EPREFIX}/usr"
+	HL_CONFIG_DIR="${EPREFIX}/etc/highlight/"
+	HL_DATA_DIR="${EPREFIX}/usr/share/highlight/"
+	doc_dir="${EPREFIX}/usr/share/doc/${PF}/"
+	conf_dir="${EPREFIX}/etc/highlight/"
+	examples_dir="${EPREFIX}/usr/share/doc/${PF}/extras"
+)
+
+src_prepare() {
+	default
+
+	# Disable man page compression
+	sed \
+		-e "/GZIP/d" \
+		-e "/COPYING/d" \
+		-i makefile || die
+
+	sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		-i src/core/datadir.cpp || die
+
+	sed -r -i \
+		-e "/^LUA_.*pkg-config/s,\<lua\>,${ELUA},g" \
+		"${S}"/extras/tcl/makefile \
+		"${S}"/extras/swig/makefile \
+		|| die "Failed to set Lua implementation"
+
+	# We set it via eqmake6, otherwise it forces clang...
+	sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
+		-e "s/QMAKE_CXX /#QMAKE_CXX /g" \
+		-i src/gui-qt/highlight.pro || die
+}
+
+src_configure() {
+	if use gui ; then
+		pushd src/gui-qt > /dev/null || die
+		eqmake6 \
+			'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}"
+	if use gui ; then
+		emake -C src/gui-qt
+	fi
+}
+
+src_test() {
+	find "../${PN}-test-suite-${TESTSUITE_COMMIT}" -mindepth 1 -maxdepth 1 -type d | sort | while read line
+	do
+		"${SHELL}" "${line}/regression.sh" || die "Regression tests failed for language $(basename "${line}")"
+	done
+}
+
+src_install() {
+	emake -f makefile "${myhlopts[@]}" install
+
+	if use gui; then
+		emake -f makefile "${myhlopts[@]}" install-gui
+		docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
+	fi
+
+	if ! use examples ; then
+		rm -r "${ED}"/usr/share/doc/${PF}/extras || die
+	fi
+}
diff --git a/app-text/htmlmin/Manifest b/app-text/htmlmin/Manifest
index 7776b73b67a8..d8ba5b2ec493 100644
--- a/app-text/htmlmin/Manifest
+++ b/app-text/htmlmin/Manifest
@@ -1 +1,2 @@
 DIST htmlmin-0.1.12.gh.tar.gz 134130 BLAKE2B 5a9996bfea469f273c37bd0bd72c0e27b8636cb4552681de1b7e9a4849ab215815f7fc8ce430392b8ca3a849b3e51d8188ca248a8ce23242905799258ceeae29 SHA512 6d9db4b6bcdd6d223be8b4e3830da4d63ac6d7d28ee83abd97809b0b901968c994c8434c992fbdd148101ba25d8d786c93657cb5f82881af44dadbba40bf3252
+DIST htmlmin-0.1.13.gh.tar.gz 134136 BLAKE2B a8ee4fc7ce8dba5225f912550a6d6d397e9152d742acc931d7a62855bc064d8546f24f3f779261174160a46d28da3e2a057ae0cf4f2d812dcec9f12552e95857 SHA512 f4b066bcd874ec8dbc65ba2b92bd33c4122376d124d93eb46e2c7aae960bc7d8860faa3247775aea9e7cbea81b5f58a435112ee328eb4e6fef3285173352c73f
diff --git a/app-text/htmlmin/htmlmin-0.1.13.ebuild b/app-text/htmlmin/htmlmin-0.1.13.ebuild
new file mode 100644
index 000000000000..600725d5de7d
--- /dev/null
+++ b/app-text/htmlmin/htmlmin-0.1.13.ebuild
@@ -0,0 +1,25 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable HTML Minifier with safety features (htmlmin2 fork)"
+HOMEPAGE="
+	https://github.com/wilhelmer/htmlmin/
+	https://pypi.org/project/htmlmin2/
+"
+SRC_URI="
+	https://github.com/wilhelmer/htmlmin/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+distutils_enable_tests unittest
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/kbibtex/Manifest b/app-text/kbibtex/Manifest
index c44092fd5cf1..79e591e2d74e 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1 +1,2 @@
 DIST kbibtex-0.10.0.tar.xz 3885328 BLAKE2B c417cc3628739e1f3ed3231e9ba5387834a65b4ef78517273b53876ecc89e72194cdbbe14a5a479c5948beb5219d0345b1c22daa6f394b6ad7d664e260c8124d SHA512 37f4e9eb0bd7be8a64bae4076be20a6e59b33f17d59de35dec8833bce027172388aa3a49a8cbdac84c56686ad287a39e0c6f13665ed9e9b696c9ce3a6ec7de1d
+DIST kbibtex-0.10.50_pre20250113-3b5dcb59.tar.gz 5612866 BLAKE2B 1e338432fdc0ee9119127bd73df14e45d77a07d259c81802d614e8e42785fa4dd91676708bd8178f9833cf848149acf07d2997485afb71821b9966e98f663f30 SHA512 9981cd4af9a89c5b500bf30b30f0d54e18fbe2822cd90aee4191872874370b1d0823d8753419b89b3287923f449d942ed21e2a60f8d8bf0fdd97fa25e8840e08
diff --git a/app-text/kbibtex/kbibtex-0.10.50_pre20250113.ebuild b/app-text/kbibtex/kbibtex-0.10.50_pre20250113.ebuild
new file mode 100644
index 000000000000..96dabb1e1157
--- /dev/null
+++ b/app-text/kbibtex/kbibtex-0.10.50_pre20250113.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=3b5dcb59ca4b7a27b4549e37f951e8a358f8d89f
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm kde.org optfeature
+
+DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
+HOMEPAGE="https://apps.kde.org/kbibtex/ https://userbase.kde.org/KBibTeX"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="webengine"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-text/poppler[qt6]
+	dev-libs/icu:=
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=dev-qt/qtnetworkauth-${QTMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	virtual/tex-base
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5
+	dev-tex/bibtex2html
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT_MAJOR_VERSION=6 # TODO: re-add KDocTools search to this awful piece of cmake...
+		$(cmake_use_find_package webengine Qt6WebEngineWidgets)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "PDF or PostScript document previews" "kde-apps/okular:6"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/app-text/kjots/Manifest b/app-text/kjots/Manifest
deleted file mode 100644
index d6817555a471..000000000000
--- a/app-text/kjots/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kjots-6.0.0.tar.xz 235912 BLAKE2B 14121519f4c0771a13e20f2dcaa9f2c556b090cf9d61d2a88259eba108365a63667cf1b4795d344e02bb3eec3115de98850b8da46a00f395d97845ab9f2ef8ee SHA512 b2aea7fc198a58858ef567dea556874173de169aff43ee19f869aec15fa8f8b77cbf8975a0e37f3d9234d369d0978827df8c6d3f285e10583e0915e67a61d830
diff --git a/app-text/kjots/kjots-6.0.0.ebuild b/app-text/kjots/kjots-6.0.0.ebuild
deleted file mode 100644
index ec95e143119e..000000000000
--- a/app-text/kjots/kjots-6.0.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="pim"
-KFMIN=6.0.0
-QTMIN=6.6.2
-inherit ecm kde.org
-
-DESCRIPTION="Note taking utility by KDE"
-HOMEPAGE="https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="speech"
-
-DEPEND="
-	>=dev-libs/ktextaddons-1.5.0:6[speech?]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-apps/akonadi-24.02.0:6
-	>=kde-apps/akonadi-notes-24.02.0:6
-	>=kde-apps/kmime-24.02.0:6
-	>=kde-apps/kontactinterface-24.02.0:6
-	>=kde-apps/kpimtextedit-24.02.0:6
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/ktexttemplate-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:5
-	>=kde-apps/kdepim-runtime-24.02.0:6
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
-	)
-
-	ecm_src_configure
-}
diff --git a/app-text/kjots/metadata.xml b/app-text/kjots/metadata.xml
deleted file mode 100644
index 8e5041d0d9ff..000000000000
--- a/app-text/kjots/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
-		<remote-id type="kde-invent">pim/kjots</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/libetonyek/libetonyek-0.1.12.ebuild b/app-text/libetonyek/libetonyek-0.1.12.ebuild
index 535cecb7dd54..bb5f6c689b9c 100644
--- a/app-text/libetonyek/libetonyek-0.1.12.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.12.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,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Library parsing Apple Keynote presentations"
diff --git a/app-text/libspelling/Manifest b/app-text/libspelling/Manifest
new file mode 100644
index 000000000000..df185d271015
--- /dev/null
+++ b/app-text/libspelling/Manifest
@@ -0,0 +1 @@
+DIST libspelling-0.4.5.tar.bz2 71413 BLAKE2B 5e6c00d9cd521f560082d76da75fd070a59f3b8dec269db95ffa88f9c216557587e180fcbc7399ea0dbcfe605de024344a4b17af60d4d31b1686f64b5df6fca9 SHA512 ab8fd439855d84c4e681fba0b5030bdcf34d0f4940a3b818aab4d297975acf37e437b141d678a482ebda240d23ecd7875e6c8656be6e1bb3c9c129f2169a8ced
diff --git a/app-text/libspelling/libspelling-0.4.5-r1.ebuild b/app-text/libspelling/libspelling-0.4.5-r1.ebuild
new file mode 100644
index 000000000000..b413a80c57ec
--- /dev/null
+++ b/app-text/libspelling/libspelling-0.4.5-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson vala
+
+DESCRIPTION="A GNOME library for spellchecking"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libspelling"
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+KEYWORDS="~amd64 ~riscv"
+IUSE="gtk-doc sysprof vala"
+
+RDEPEND="
+	dev-libs/glib:2
+	>=gui-libs/gtk-4.8:4
+	>=gui-libs/gtksourceview-5.6:5
+	app-text/enchant:2
+	dev-libs/icu:=
+"
+DEPEND="${RDEPEND}
+	sysprof? ( dev-util/sysprof-capture:4 )
+	vala? (
+		$(vala_depend)
+		>=gui-libs/gtksourceview-5.6:5[vala]
+	)
+"
+BDEPEND="
+	dev-libs/gobject-introspection
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gi-docgen )
+"
+
+src_prepare() {
+	use vala && vala_setup
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denchant=enabled
+		-Dinstall-static=false
+		$(meson_use gtk-doc docs)
+		$(meson_use sysprof)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/${PN}-${SLOT} "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
diff --git a/app-text/libspelling/metadata.xml b/app-text/libspelling/metadata.xml
new file mode 100644
index 000000000000..5b9ced8effed
--- /dev/null
+++ b/app-text/libspelling/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/libspelling</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/lowdown/Manifest b/app-text/lowdown/Manifest
index 5cfe0176e42b..212ef7893275 100644
--- a/app-text/lowdown/Manifest
+++ b/app-text/lowdown/Manifest
@@ -1,4 +1,3 @@
 DIST lowdown-1.1.1.tar.gz 600635 BLAKE2B 39c0a2472ff6b9b3fa2b6d72c1f2d482592976f7b50c1bbaf1965bfbb6d28f22e0a7498bb54087bb83070bd74ea673409be97815f51a0a5a67e980bbfc4e01b2 SHA512 2a69da945a83696480651e8221d73bcb18bac9bc38bb88126ddf73520d2a4ff396dde08a7abf6f550669ec9ba34abdaa186b0980f312fa157371ee754576bb6a
-DIST lowdown-1.3.0.tar.gz 666560 BLAKE2B 8bf9da6163a65bff7ac5774d0d31a0dc1438832944b2560a9f725bf9c83c359575fdb828d5065a0138e84466c9a95ca514c72cba6c457a0bb02f9e4558cce017 SHA512 ac51e8ff74450bf02d3c8e41f129f15f2ac92d47a07c020f10eea143b506fd113afac0e9bec447c336cf70176ebc886a8933fa38f5779931c9dfd9c06421fcda
-DIST lowdown-1.3.1.tar.gz 668638 BLAKE2B 5d3541e104a25519a580d6b0e8fdfdb03642dcefcdab016f8d1744f5dcd704611d792ca79b988962a014cbcfb20d05e8a8be62eb50708e4c85c5a3d1fe512df1 SHA512 b530bd0ad050a1197e04de971bb10e63c185736f487bcf91467f53d9c63b698aa40d364f8a0d340e3bbf929a9318050c68fdc8127c5ddf526bded327f57419df
 DIST lowdown-1.3.2.tar.gz 670610 BLAKE2B 80238e7c6a27c45d6b3f65fbb9435639db5f424aad28c05a94093c5fab3982b1b05b5c3d779e5f74d8b2e71046301c2e3c0ee83496f44f6b8597cd0b3797eb14 SHA512 9592fd270c61d7e827a0e7885ce5faef545a33e61afa0d4cf4549cf5866d82873b042a9cb4465d7b504c686a7b89c748257c470c3b3ccb1ec6f1203a7e6bf392
+DIST lowdown-1.4.0.tar.gz 675327 BLAKE2B 1e734acefe3d293dd6e60f27ff943b484ac99a9e393fd118df09be6dd9671294a91de306393817af9422fec67ed9eda22e2515538b490ac07bdd93ac2e5617e4 SHA512 61b88fc24c9c69a324536bc5cc3edbd453f59945cda264df8751cf361992487081911d3ba6cb04346d5ef451d96a4b56e69a76985849349ef049eca0a098b7ee
diff --git a/app-text/lowdown/lowdown-1.3.0.ebuild b/app-text/lowdown/lowdown-1.3.0.ebuild
deleted file mode 100644
index 3857bd5c0a85..000000000000
--- a/app-text/lowdown/lowdown-1.3.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs flag-o-matic
-
-MY_PV="VERSION_${PV//./_}"
-DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats"
-HOMEPAGE="https://kristaps.bsd.lv/lowdown/"
-SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="ISC"
-SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	virtual/libcrypt:=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-# configure tests for a bunch of BSD functions on Linux
-QA_CONFIG_IMPL_DECL_SKIP=(
-	crypt_newhash
-	crypt_checkpass
-	warnc
-	errc
-	getexecname
-	getprogname
-	memset_s
-	pledge
-	recallocarray
-	strlcat
-	strlcpy
-	strtonum
-	TAILQ_FOREACH_SAFE
-	unveil
-)
-
-PATCHES=(
-	"${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch"
-	"${FILESDIR}/lowdown-1.3.0-shared-linking.patch"
-)
-
-src_configure() {
-	append-flags -fPIC
-	tc-export CC AR
-
-	./configure \
-		PREFIX="/usr" \
-		MANDIR="/usr/share/man" \
-		LDFLAGS="${LDFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LIBDIR="/usr/$(get_libdir)" \
-		|| die "./configure failed"
-}
-
-src_compile() {
-	emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" emake regress
-}
diff --git a/app-text/lowdown/lowdown-1.3.1.ebuild b/app-text/lowdown/lowdown-1.3.1.ebuild
deleted file mode 100644
index 3857bd5c0a85..000000000000
--- a/app-text/lowdown/lowdown-1.3.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs flag-o-matic
-
-MY_PV="VERSION_${PV//./_}"
-DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats"
-HOMEPAGE="https://kristaps.bsd.lv/lowdown/"
-SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="ISC"
-SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	virtual/libcrypt:=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-# configure tests for a bunch of BSD functions on Linux
-QA_CONFIG_IMPL_DECL_SKIP=(
-	crypt_newhash
-	crypt_checkpass
-	warnc
-	errc
-	getexecname
-	getprogname
-	memset_s
-	pledge
-	recallocarray
-	strlcat
-	strlcpy
-	strtonum
-	TAILQ_FOREACH_SAFE
-	unveil
-)
-
-PATCHES=(
-	"${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch"
-	"${FILESDIR}/lowdown-1.3.0-shared-linking.patch"
-)
-
-src_configure() {
-	append-flags -fPIC
-	tc-export CC AR
-
-	./configure \
-		PREFIX="/usr" \
-		MANDIR="/usr/share/man" \
-		LDFLAGS="${LDFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LIBDIR="/usr/$(get_libdir)" \
-		|| die "./configure failed"
-}
-
-src_compile() {
-	emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" emake regress
-}
diff --git a/app-text/lowdown/lowdown-1.3.2.ebuild b/app-text/lowdown/lowdown-1.3.2.ebuild
index 3857bd5c0a85..87a527ff5117 100644
--- a/app-text/lowdown/lowdown-1.3.2.ebuild
+++ b/app-text/lowdown/lowdown-1.3.2.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
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="ISC"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	virtual/libcrypt:=
diff --git a/app-text/lowdown/lowdown-1.4.0.ebuild b/app-text/lowdown/lowdown-1.4.0.ebuild
new file mode 100644
index 000000000000..87a527ff5117
--- /dev/null
+++ b/app-text/lowdown/lowdown-1.4.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+MY_PV="VERSION_${PV//./_}"
+DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats"
+HOMEPAGE="https://kristaps.bsd.lv/lowdown/"
+SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="ISC"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	virtual/libcrypt:=
+"
+RDEPEND="
+	${DEPEND}
+"
+
+# configure tests for a bunch of BSD functions on Linux
+QA_CONFIG_IMPL_DECL_SKIP=(
+	crypt_newhash
+	crypt_checkpass
+	warnc
+	errc
+	getexecname
+	getprogname
+	memset_s
+	pledge
+	recallocarray
+	strlcat
+	strlcpy
+	strtonum
+	TAILQ_FOREACH_SAFE
+	unveil
+)
+
+PATCHES=(
+	"${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch"
+	"${FILESDIR}/lowdown-1.3.0-shared-linking.patch"
+)
+
+src_configure() {
+	append-flags -fPIC
+	tc-export CC AR
+
+	./configure \
+		PREFIX="/usr" \
+		MANDIR="/usr/share/man" \
+		LDFLAGS="${LDFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LIBDIR="/usr/$(get_libdir)" \
+		|| die "./configure failed"
+}
+
+src_compile() {
+	emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" emake regress
+}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index c1805aa70fe3..a72a7385383b 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,2 +1,2 @@
-DIST mupdf-1.24.1-source.tar.gz 55310618 BLAKE2B 33396b0cca6e2beb1b2bc70c606917c8d9b30b6a277645849ef7ba1e7efbf909c21196acdd5d94d964dd20d3ba746c45cab3c899dfbee1b2138de12e32375a4e SHA512 9d6fbd3388173f06c5db4a27753e69afd21ed32d93f263d4448c3be60a3be747b61102edd5430459f0dbe7ae4df2019689a2f3a582acec77ff322b6d41066fba
 DIST mupdf-1.24.8-source.tar.gz 54039703 BLAKE2B 0fe25d9f0f01a1e387da590c28abac66309247c46c05c7c9b36c4bc911fc16adab681243c2c1d2c50ec91bb76b737022bd3faf06b0b3a803e9120829d9cae5b4 SHA512 17d8fd9fd0e176c8abd1ebc594259a0f7cf822338085ea4574451ba8ec1ac72ba8bd2d5388a1421bbfd4e91257a48d0e0766213ace0933c39d3cb8d774a3860e
+DIST mupdf-1.25.2-source.tar.gz 54635699 BLAKE2B 08e4c1bd4d8f9a731b10e1368c3f4a62a9b949c4a1842f2ce297ef3a595107f63e184230c31149a6a5db9038838d891fdeb0330323afcdc0b6966bee06046288 SHA512 089bcf228a28e5f47e793d66f6355b22b531c031a6d1feb0dd07a5fee55780fda92d6cde646336ca0200869c32d523be23a8fe2232fad010b38673419c7859f2
diff --git a/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch b/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch
deleted file mode 100644
index 4d449a2fec15..000000000000
--- a/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- /dev/null
-+++ ./platform/debian/mupdf.desktop
-@@ -0,0 +1,15 @@
-+[Desktop Entry]
-+Name=MuPDF
-+GenericName=PDF file viewer
-+Exec=mupdf %f
-+TryExec=mupdf
-+Icon=new-mupdf-icon
-+Terminal=false
-+Type=Application
-+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff;
-+Categories=Viewer;Graphics;
-+Actions=View;
-+
-+[Desktop Action View]
-+Name=View with mupdf
-+Exec=mupdf %f
---- /dev/null
-+++ ./platform/debian/mupdf.pc
-@@ -0,0 +1,12 @@
-+prefix=/usr
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: mupdf
-+Description: Library for rendering PDF documents
-+Requires: freetype2 libopenjp2 libcrypto
-+Version: 0.5.0
-+Libs: -L${libdir} -lmupdf
-+Libs.private: -lmupdf-js-none
-+Cflags: -I${includedir}
diff --git a/app-text/mupdf/mupdf-1.24.1.ebuild b/app-text/mupdf/mupdf-1.24.1.ebuild
deleted file mode 100644
index 5f43ffbabd57..000000000000
--- a/app-text/mupdf/mupdf-1.24.1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please check upstream git regularly for relevant security-related commits
-# to backport.
-
-inherit desktop flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz"
-S="${WORKDIR}"/${P}-source
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="archive +javascript opengl ssl X"
-REQUIRED_USE="opengl? ( javascript )"
-
-# Although we use the bundled, patched version of freeglut in mupdf (because of
-# bug #653298), the best way to ensure that its dependencies are present is to
-# install system's freeglut.
-RDEPEND="
-	archive? ( app-arch/libarchive )
-	dev-libs/gumbo:=
-	media-libs/freetype:2
-	media-libs/harfbuzz:=[truetype]
-	media-libs/jbig2dec:=
-	media-libs/libpng:0=
-	>=media-libs/openjpeg-2.1:2=
-	>=media-libs/libjpeg-turbo-1.5.3-r2:0=
-	net-misc/curl
-	javascript? ( >=dev-lang/mujs-1.2.0:= )
-	opengl? ( >=media-libs/freeglut-3.0.0 )
-	ssl? ( >=dev-libs/openssl-1.1:0= )
-	sys-libs/zlib
-	X? (
-		media-libs/libglvnd[X]
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
-	"${FILESDIR}"/${PN}-1.19.0-Makefile.patch
-	"${FILESDIR}"/${PN}-1.21.0-add-desktop-pc-files.patch
-	"${FILESDIR}"/${P}-cross-fixes.patch
-	"${FILESDIR}"/${P}-darwin.patch
-	# See bugs #662352
-	"${FILESDIR}"/${P}-openssl-x11.patch
-	# General cross fixes from Debian (refreshed)
-	"${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.patch
-)
-
-src_prepare() {
-	default
-
-	use hppa && append-cflags -ffunction-sections
-
-	append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
-
-	sed -e "1iOS = Linux" \
-		-e "1iCC = $(tc-getCC)" \
-		-e "1iCXX = $(tc-getCXX)" \
-		-e "1iLD = $(tc-getLD)" \
-		-e "1iAR = $(tc-getAR)" \
-		-e "1iverbose = yes" \
-		-e "1ibuild = debug" \
-		-i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
-
-	# Adjust MuPDF version in .pc file created by the
-	# mupdf-1.21.0-add-desktop-pc-files.patch file
-	sed -e "s/Version: \(.*\)/Version: ${PV}/" \
-		-i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc"
-}
-
-_emake() {
-	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
-	#
-	# Bundled libs
-	# * General
-	# Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
-	# recommendations. It does not mean "always use system libs".
-	# See [0] below for what it means in a specific version.
-	#
-	# * freeglut
-	# We don't use system's freeglut because upstream has a special modified
-	# version of it that gives mupdf clipboard support. See bug #653298
-	#
-	# * mujs
-	# As of v1.15.0, mupdf started using symbols in mujs that were not part
-	# of any release. We then went back to using the bundled version of it.
-	# But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
-	# when bumping and check!
-	# See bug #685244
-	#
-	# * lmms2
-	# mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
-	# It is therefore not appropriate for us to unbundle it at this time.
-	#
-	# [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
-	# [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
-	local myemakeargs=(
-		GENTOO_PV=${PV}
-		HAVE_GLUT=$(usex opengl)
-		HAVE_LIBCRYPTO=$(usex ssl)
-		HAVE_X11=$(usex X)
-		USE_SYSTEM_LIBS=yes
-		USE_SYSTEM_MUJS=$(usex javascript)
-		USE_SYSTEM_GLUT=no
-		HAVE_OBJCOPY=no
-		"$@"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_compile() {
-	tc-export PKG_CONFIG
-
-	_emake XCFLAGS="-fPIC"
-}
-
-src_install() {
-	if use opengl || use X ; then
-		domenu platform/debian/${PN}.desktop
-		doicon -s scalable docs/logo/new-${PN}-icon.svg
-	else
-		rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
-	fi
-
-	sed -i \
-		-e "1iprefix = ${ED}/usr" \
-		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
-		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
-		-i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
-
-	_emake install
-
-	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-
-	if use opengl ; then
-		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
-		dosym ${PN}-gl /usr/bin/${PN}
-	elif use X ; then
-		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
-		dosym ${PN}-x11 /usr/bin/${PN}
-	fi
-
-	# Respect libdir and EPREFIX (bugs #734898, #911965)
-	sed -i -e "s:/lib:/$(get_libdir):" \
-		-e "s:/usr:${EPREFIX}/usr:" platform/debian/${PN}.pc \
-		|| die "Failed to sed pkgconfig file to respect libdir and EPREFIX in src_install()"
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/${PN}.pc
-
-	dodoc README CHANGES CONTRIBUTORS
-}
diff --git a/app-text/mupdf/mupdf-1.25.2.ebuild b/app-text/mupdf/mupdf-1.25.2.ebuild
new file mode 100644
index 000000000000..f35a2e91fa71
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.25.2.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please check upstream git regularly for relevant security-related commits
+# to backport.
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz"
+S="${WORKDIR}"/${P}-source
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="archive +javascript opengl ssl X"
+REQUIRED_USE="opengl? ( javascript )"
+
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
+RDEPEND="
+	archive? ( app-arch/libarchive )
+	dev-libs/gumbo:=
+	media-libs/freetype:2
+	media-libs/harfbuzz:=[truetype]
+	media-libs/jbig2dec:=
+	media-libs/libpng:0=
+	>=media-libs/openjpeg-2.1:2=
+	>=media-libs/libjpeg-turbo-1.5.3-r2:0=
+	net-misc/curl
+	javascript? ( >=dev-lang/mujs-1.2.0:= )
+	opengl? ( >=media-libs/freeglut-3.0.0 )
+	ssl? ( >=dev-libs/openssl-1.1:0= )
+	sys-libs/zlib
+	X? (
+		media-libs/libglvnd[X]
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.19.0-Makefile.patch
+	"${FILESDIR}"/${PN}-1.24.8-add-desktop-pc-files.patch
+	"${FILESDIR}"/${PN}-1.24.1-cross-fixes.patch
+	"${FILESDIR}"/${PN}-1.24.1-darwin.patch
+	# See bugs #662352
+	"${FILESDIR}"/${PN}-1.24.1-openssl-x11.patch
+	# General cross fixes from Debian (refreshed)
+	"${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.patch
+	"${FILESDIR}"/${PN}-1.24.8-c23.patch
+)
+
+src_prepare() {
+	default
+
+	use hppa && append-cflags -ffunction-sections
+
+	append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iCXX = $(tc-getCXX)" \
+		-e "1iLD = $(tc-getLD)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
+
+	# Adjust MuPDF version in .pc file created by the
+	# [...]-add-desktop-pc-files.patch file
+	sed -e "s/Version: \(.*\)/Version: ${PV}/" \
+		-i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc"
+}
+
+_emake() {
+	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+	#
+	# Bundled libs
+	# * General
+	# Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
+	# recommendations. It does not mean "always use system libs".
+	# See [0] below for what it means in a specific version.
+	#
+	# * freeglut
+	# We don't use system's freeglut because upstream has a special modified
+	# version of it that gives mupdf clipboard support. See bug #653298
+	#
+	# * mujs
+	# As of v1.15.0, mupdf started using symbols in mujs that were not part
+	# of any release. We then went back to using the bundled version of it.
+	# But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
+	# when bumping and check!
+	# See bug #685244
+	#
+	# * lmms2
+	# mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
+	# It is therefore not appropriate for us to unbundle it at this time.
+	#
+	# [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
+	# [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
+	local myemakeargs=(
+		GENTOO_PV=${PV}
+		HAVE_GLUT=$(usex opengl)
+		HAVE_LIBCRYPTO=$(usex ssl)
+		HAVE_X11=$(usex X)
+		USE_SYSTEM_LIBS=yes
+		USE_SYSTEM_MUJS=$(usex javascript)
+		USE_SYSTEM_GLUT=no
+		HAVE_OBJCOPY=no
+		"$@"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+
+	_emake XCFLAGS="-fPIC"
+}
+
+src_install() {
+	if use opengl || use X ; then
+		domenu platform/debian/${PN}.desktop
+		doicon -s scalable docs/logo/${PN}-icon.svg
+	else
+		rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
+	fi
+
+	sed -i \
+		-e "1iprefix = ${ED}/usr" \
+		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+		-i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
+
+	_emake install
+
+	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+	if use opengl ; then
+		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+		dosym ${PN}-gl /usr/bin/${PN}
+	elif use X ; then
+		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+		dosym ${PN}-x11 /usr/bin/${PN}
+	fi
+
+	# Respect libdir and EPREFIX (bugs #734898, #911965)
+	sed -i -e "s:/lib:/$(get_libdir):" \
+		-e "s:/usr:${EPREFIX}/usr:" platform/debian/${PN}.pc \
+		|| die "Failed to sed pkgconfig file to respect libdir and EPREFIX in src_install()"
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/pdfpc/Manifest b/app-text/pdfpc/Manifest
index 37d8526ade6b..71ac0ca4b176 100644
--- a/app-text/pdfpc/Manifest
+++ b/app-text/pdfpc/Manifest
@@ -1 +1,2 @@
 DIST pdfpc-4.6.0.tar.gz 7766521 BLAKE2B 3e8914333a0781d3d750ab71d58c8af1451ce5ab321ecc0639ddcf377cae9a0c62290696455516ce1d70f4ae3ffc5889fe910ced0399787e6a40c8ae76e1f75e SHA512 4ec69cbe21fb8bbb3e381229c391133f92e76b610e1fdf1cffa2c9fa9997ccc879eaef2a6837b34d1e635cdd07c4d0ce98de03fd7ece431a8f35493f0f7d7651
+DIST pdfpc-4.7.0.tar.gz 7768713 BLAKE2B 7c4a0c318a191125fcc9e9b13c25265e8018e76eb72186bc079b10eb50f3c29ed4f364d65ae09059b757e221ddbb8865a4a5a15e38f476d66b5fd41b85a392d0 SHA512 2ee0bec8ed1d6c330042a0fd296511e73d88bd1bba153fd3f19ca43135662c8d93670e503c1db1822f927c67097a5c5112f783545063f47c29f3c7160d07be49
diff --git a/app-text/pdfpc/pdfpc-4.7.0.ebuild b/app-text/pdfpc/pdfpc-4.7.0.ebuild
new file mode 100644
index 000000000000..a2692e0c9585
--- /dev/null
+++ b/app-text/pdfpc/pdfpc-4.7.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VALA_MAX_API_VERSION="0.56" # append versions in sed line if increased
+
+#COMMIT_ID=""
+
+inherit cmake vala
+
+DESCRIPTION="Presenter console with multi-monitor support for PDF files"
+HOMEPAGE="https://pdfpc.github.io https://github.com/pdfpc/pdfpc"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]]; then
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT_ID}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gstreamer soup webkit"
+
+RDEPEND="
+	app-text/discount:=
+	app-text/poppler:=[cairo]
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8=
+	gnome-base/librsvg
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/pango
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-plugins/gst-plugins-gtk:1.0=
+		media-plugins/gst-plugins-cairo:1.0=
+	)
+	soup? (
+		media-gfx/qrencode
+		net-libs/libsoup:3.0
+	)
+	webkit? ( net-libs/webkit-gtk:4.1= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="$(vala_depend)"
+
+DOCS=(
+	CHANGELOG.rst
+	FAQ.rst
+	README.rst
+	SUPPORT.rst
+)
+
+src_prepare() {
+	cmake_src_prepare
+	vala_setup
+	sed -i -e "/find_program/s/valac/& &-0.56 &-0.54 &-0.52 &-0.50/" \
+		cmake/vala/FindVala.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMOVIES=$(usex gstreamer on off)
+		-DREST=$(usex soup on off)
+		-DMDVIEW=$(usex webkit on off)
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+	)
+	cmake_src_configure
+}
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index d88275566f6e..2f0a93a55f45 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,4 +1 @@
-DIST po4a-0.69.tar.gz 4665710 BLAKE2B 2fc1b6cd53f1b282f20cd4932de7f5d6d9882de9f50181f0de89995c9d9b79b5fd2bc53d3757c56c519478e67ac636deb5a011cc8810a002b6bb6dabdb44442b SHA512 9cb5eec547ab18d1c3ebdda212b909fc4f5489a74641ba2d7e0a3a1d060f245d23667c16e687c678c5ccc3809c9315d20673266dcc3764172a899caa397238e3
-DIST po4a-0.71.tar.gz 4860322 BLAKE2B 8a5d1f8dd17b435bf1ada91b4c49862eed97775c574d2972d749f6126eb5f654cc4f8a1def3d4b9ddf50f86c8d02e4f328cbb0406eb91e5224e9373c2063441e SHA512 67ba925433d95ebd6675ce2e58b2664a07a00016ca4b5029845e485dfad1804737a00935e2da162e2488e4c21b947e7fa32b40ac3d9b28d4729d8f93c3f2040b
-DIST po4a-0.72.tar.gz 4888348 BLAKE2B f97b14a3c686bdb0cab0088375dd6d190582df57bd36cb4c44b436fd1618d88cbe7551484d453596669e16920ceac459efc085fd50a2b25cc6c9dd5f62213f9e SHA512 f47f7cf2718ff0690c82202e1a5eff3dedd0b35c4f139658c600c307c8f073689fa50ec4ad4b948881863631be6f8d1944b56b13ba2b63ec5323368724286859
 DIST po4a-0.73.tar.gz 5117198 BLAKE2B 3072c3a55751610e565b71a754d79b20529d8d6f1cfd2e1c691b6de77c3a13b8a5f1c3306be4574627a0078b27f32fe38864faca5c6c03da6a92049387476f72 SHA512 5860af1da2a0ab1875a994b09ae2da481c12a6777655610e8c8ded4a6132048a33aeea10eaa756a73af1a7bf1e3e65f7ab5ded9d799904ae3240c6ec3b0a31d2
diff --git a/app-text/po4a/files/po4a-0.69-invalid-byte.patch b/app-text/po4a/files/po4a-0.69-invalid-byte.patch
deleted file mode 100644
index f1f230a95b48..000000000000
--- a/app-text/po4a/files/po4a-0.69-invalid-byte.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/938967
-https://github.com/mquinson/po4a/commit/7cf7b79ee28de7e58378b225570d49fd114ff75e.patch
-
-From 7cf7b79ee28de7e58378b225570d49fd114ff75e Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpalus@fastmail.com>
-Date: Mon, 3 Jul 2023 14:56:04 +0200
-Subject: [PATCH] SGML: replace invalid byte (0xa0) in comment with space
- (0x20)
-
-Fixes #428
----
- lib/Locale/Po4a/Sgml.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/Locale/Po4a/Sgml.pm b/lib/Locale/Po4a/Sgml.pm
-index 39dd66f2..d02f269d 100644
---- a/lib/Locale/Po4a/Sgml.pm
-+++ b/lib/Locale/Po4a/Sgml.pm
-@@ -773,7 +773,7 @@ sub parse_file {
-             while ( $origfile =~ /^(.*?)&$key(;.*$|[^-_:.A-Za-z0-9].*$|$)/s ) {
- 
-                 # Since we will include a new file, we
--                # must do a new round of substitutions.
-+                # must do a new round of substitutions.
-                 $dosubstitution = 1;
-                 my ( $begin, $end ) = ( $1, $2 );
-                 $end = "" unless ( defined $end );
diff --git a/app-text/po4a/files/po4a-0.69-man.patch b/app-text/po4a/files/po4a-0.69-man.patch
deleted file mode 100644
index 02cedf7f1ade..000000000000
--- a/app-text/po4a/files/po4a-0.69-man.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Po4aBuilder.pm
-+++ b/Po4aBuilder.pm
-@@ -234,7 +234,6 @@
-         }
-         $parser->parse_from_file ($file, $out);
- 
--        system("gzip -9 -n -f $out") and die;
-         unlink "$file" || die;
-     }
- 
-@@ -253,7 +252,6 @@
-             print "Convert $outdir/$outfile.$section (online docbook.xsl file). ";
-             system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
-             }
--                system ("gzip -9 -n -f $outdir/$outfile.$section") and die;
-             }
-             unlink "$file" || die;
-         }
diff --git a/app-text/po4a/files/po4a-0.69-perl5.40.patch b/app-text/po4a/files/po4a-0.69-perl5.40.patch
deleted file mode 100644
index 8c7d7d8573e8..000000000000
--- a/app-text/po4a/files/po4a-0.69-perl5.40.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.gentoo.org/938967
-https://github.com/mquinson/po4a/commit/28fe52651eb8096d97d6bd3a97b3168522ba5306 (backport)
-
-From 45c835a04a388940c627f0c6b8c26554c0ee2b14 Mon Sep 17 00:00:00 2001
-From: Martin Quinson <martin.quinson@ens-rennes.fr>
-Date: Fri, 12 Jul 2024 10:21:34 +0200
-Subject: [PATCH] Fix failures with DynaLoader on Perl 5.40
-
-Thanks to dstoecker for the patch provided in the OpenSuse package,
-and to ana for pointing me to it.
-
-Fixes https://github.com/mquinson/po4a/issues/508
-
-(cherry picked from commit 28fe52651eb8096d97d6bd3a97b3168522ba5306)
----
- lib/Locale/Po4a/TransTractor.pm | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/Locale/Po4a/TransTractor.pm b/lib/Locale/Po4a/TransTractor.pm
-index b83dd25b..68296cb1 100644
---- a/lib/Locale/Po4a/TransTractor.pm
-+++ b/lib/Locale/Po4a/TransTractor.pm
-@@ -5,6 +5,8 @@ require Exporter;
- package Locale::Po4a::TransTractor;
- use DynaLoader;
- 
-+sub import { }
-+
- use 5.006;
- use strict;
- use warnings;
diff --git a/app-text/po4a/files/po4a-0.69-xmlcatalog.patch b/app-text/po4a/files/po4a-0.69-xmlcatalog.patch
deleted file mode 100644
index 2d05a5b2ac75..000000000000
--- a/app-text/po4a/files/po4a-0.69-xmlcatalog.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/Po4aBuilder.pm	2024-09-14 15:48:58.642546000 +0800
-+++ b/Po4aBuilder.pm	2024-09-14 15:50:38.415546000 +0800
-@@ -242,15 +242,17 @@ sub ACTION_man {
-         foreach $file (qw(po4a-display-man.xml po4a-display-pod.xml)) {
-             copy ( File::Spec->catdir("share", "doc", $file), $man1path) or die;
-         }
-+	my $docbook_xsl_url   = "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl";
-+	my $local_docbook_xsl = `xmlcatalog --noout "" "$docbook_xsl_url"` =~ m,file://(.+\.xsl), && $1;
-         foreach $file (@{$self->rscan_dir($manpath, qr{\.xml$})}) {
-             if ($file =~ m,(.*/man(.))/([^/]*)\.xml$,) {
-                 my ($outdir, $section, $outfile) = ($1, $2, $3);
--            if (-e "/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl") { # Location on Debian at least
-+            if ($local_docbook_xsl) {
-             print "Convert $outdir/$outfile.$section (local docbook.xsl file). ";
--            system("xsltproc -o $outdir/$outfile.$section --nonet /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl $file") and die;
-+            system("xsltproc -o $outdir/$outfile.$section --nonet $local_docbook_xsl $file") and die;
-             } else { # Not found locally, use the XSL file online
-             print "Convert $outdir/$outfile.$section (online docbook.xsl file). ";
--            system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
-+            system("xsltproc -o $outdir/$outfile.$section --nonet $docbook_xsl_url $file") and die;
-             }
-             }
-             unlink "$file" || die;
diff --git a/app-text/po4a/po4a-0.69-r1.ebuild b/app-text/po4a/po4a-0.69-r1.ebuild
deleted file mode 100644
index cf6b84cfb464..000000000000
--- a/app-text/po4a/po4a-0.69-r1.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"
-PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja ka kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK zh_Hant"
-
-inherit perl-module plocale
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/opensp
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/Pod-Parser
-	dev-perl/SGMLSpm
-	dev-perl/Syntax-Keyword-Try
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	dev-perl/Unicode-LineBreak
-	dev-perl/YAML-Tiny
-	sys-devel/gettext"
-DEPEND="${RDEPEND}"
-BDEPEND="app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-perl/Module-Build
-	sys-devel/gettext
-	test? (
-		app-text/docbook-sgml-dtd:4.1
-		dev-perl/Test-Pod
-		virtual/latex-base
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-man.patch
-	"${FILESDIR}"/${P}-xmlcatalog.patch
-)
-
-DIST_TEST="do"
-
-src_prepare() {
-	plocale_find_changes "${S}/po/bin" '' '.po'
-
-	rm_locale() {
-		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
-	}
-	plocale_for_each_disabled_locale rm_locale
-
-	perl-module_src_prepare
-}
diff --git a/app-text/po4a/po4a-0.69-r2.ebuild b/app-text/po4a/po4a-0.69-r2.ebuild
deleted file mode 100644
index 836210177e04..000000000000
--- a/app-text/po4a/po4a-0.69-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja ka kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK zh_Hant"
-
-inherit perl-module plocale
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/opensp
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/Pod-Parser
-	dev-perl/SGMLSpm
-	dev-perl/Syntax-Keyword-Try
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	dev-perl/Unicode-LineBreak
-	dev-perl/YAML-Tiny
-	sys-devel/gettext"
-DEPEND="${RDEPEND}"
-BDEPEND="app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-perl/Module-Build
-	sys-devel/gettext
-	test? (
-		app-text/docbook-sgml-dtd:4.1
-		dev-perl/Test-Pod
-		virtual/latex-base
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-man.patch
-	"${FILESDIR}"/${P}-xmlcatalog.patch
-	"${FILESDIR}"/${P}-perl5.40.patch # bug #938967
-	# The perl5.40 patch triggers:
-	# XX Update po/bin/po4a.pot
-	# xgettext: Comment at or before ../../lib/Locale/Po4a/Sgml.pm:776 is not UTF-8 encoded.
-	"${FILESDIR}"/${P}-invalid-byte.patch
-)
-
-DIST_TEST="do"
-
-src_prepare() {
-	plocale_find_changes "${S}/po/bin" '' '.po'
-
-	rm_locale() {
-		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
-	}
-	plocale_for_each_disabled_locale rm_locale
-
-	perl-module_src_prepare
-}
diff --git a/app-text/po4a/po4a-0.71-r1.ebuild b/app-text/po4a/po4a-0.71-r1.ebuild
deleted file mode 100644
index 0d85bd31b9c0..000000000000
--- a/app-text/po4a/po4a-0.71-r1.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"
-PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja ka kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_Hans zh_Hant"
-
-inherit perl-module plocale
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/opensp
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/Pod-Parser
-	dev-perl/SGMLSpm
-	dev-perl/Syntax-Keyword-Try
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	dev-perl/Unicode-LineBreak
-	dev-perl/YAML-Tiny
-	sys-devel/gettext"
-DEPEND="${RDEPEND}"
-BDEPEND="app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-perl/Module-Build
-	sys-devel/gettext
-	test? (
-		app-text/docbook-sgml-dtd:4.1
-		dev-perl/Test-Pod
-		virtual/latex-base
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-man.patch
-	"${FILESDIR}"/${PN}-perl5.40.patch # bug #938967
-)
-
-DIST_TEST="do"
-
-src_prepare() {
-	plocale_find_changes "${S}/po/bin" '' '.po'
-
-	rm_locale() {
-		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
-	}
-	plocale_for_each_disabled_locale rm_locale
-
-	perl-module_src_prepare
-}
diff --git a/app-text/po4a/po4a-0.72-r1.ebuild b/app-text/po4a/po4a-0.72-r1.ebuild
deleted file mode 100644
index 0d85bd31b9c0..000000000000
--- a/app-text/po4a/po4a-0.72-r1.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"
-PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja ka kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_Hans zh_Hant"
-
-inherit perl-module plocale
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/opensp
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/Pod-Parser
-	dev-perl/SGMLSpm
-	dev-perl/Syntax-Keyword-Try
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	dev-perl/Unicode-LineBreak
-	dev-perl/YAML-Tiny
-	sys-devel/gettext"
-DEPEND="${RDEPEND}"
-BDEPEND="app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-perl/Module-Build
-	sys-devel/gettext
-	test? (
-		app-text/docbook-sgml-dtd:4.1
-		dev-perl/Test-Pod
-		virtual/latex-base
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-man.patch
-	"${FILESDIR}"/${PN}-perl5.40.patch # bug #938967
-)
-
-DIST_TEST="do"
-
-src_prepare() {
-	plocale_find_changes "${S}/po/bin" '' '.po'
-
-	rm_locale() {
-		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
-	}
-	plocale_for_each_disabled_locale rm_locale
-
-	perl-module_src_prepare
-}
diff --git a/app-text/po4a/po4a-0.73-r1.ebuild b/app-text/po4a/po4a-0.73-r1.ebuild
index 63e8819d32c6..beb4264beb6a 100644
--- a/app-text/po4a/po4a-0.73-r1.ebuild
+++ b/app-text/po4a/po4a-0.73-r1.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://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/po4a/po4a-0.73.ebuild b/app-text/po4a/po4a-0.73.ebuild
deleted file mode 100644
index 8fa5377602d5..000000000000
--- a/app-text/po4a/po4a-0.73.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"
-PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja ka kn ko nb nl pl pt pt_BR ru sl sr sr_Cyrl sv uk vi zh_Hans zh_Hant"
-
-inherit perl-module plocale
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/opensp
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/Pod-Parser
-	dev-perl/SGMLSpm
-	dev-perl/Syntax-Keyword-Try
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	dev-perl/Unicode-LineBreak
-	dev-perl/YAML-Tiny
-	sys-devel/gettext"
-DEPEND="${RDEPEND}"
-BDEPEND="app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-perl/Module-Build
-	sys-devel/gettext
-	test? (
-		app-text/docbook-sgml-dtd:4.1
-		dev-perl/Test-Pod
-		virtual/latex-base
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-man.patch )
-
-DIST_TEST="do"
-
-src_prepare() {
-	plocale_find_changes "${S}/po/bin" '' '.po'
-
-	rm_locale() {
-		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
-	}
-	plocale_for_each_disabled_locale rm_locale
-
-	perl-module_src_prepare
-}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index ab17daebdeac..f5c3b10b0789 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,5 +1,5 @@
 DIST poppler-24.11.0.tar.xz 1922804 BLAKE2B 2ee77ddfd49ab4b3f486fcd160be21fdf2d474e44b6cdfd40a7f927cbe253d407a6f75b66de83ab541288a54558445e409b283a81c7a8ff20f9a6d0d4f33adf7 SHA512 3823c024d9b1cab7c4ee8a99d5209722296cce8894e3f4ba8d5a84ab6bba430fa0c1078bfcddcdbc1c30bd98832e269df2aef1d5af20c1985b9f903cb70a24e7
 DIST poppler-24.11.0.tar.xz.sig 833 BLAKE2B 7ef6e5bd5659c91dc5924367b7875a3946116a71b0cc02d98a1cccd51d4a46b8d8b219681e576ba7ea27f736c8a5220ae98acb0f454ac4785c03d1c66d104046 SHA512 7b935eaa99c4c3e8706bfcb010245babf5a4f08f6809a340239a0c40eed0a79472c34e4722d4b480e20fa6618106cc5e9583e209e025689f1fae06c5c499f95f
-DIST poppler-24.12.0.tar.xz 1934024 BLAKE2B c1148608430c466ffa61ae420a287642b1b147efec59fee664f446b2f283b3f24841cee5d1ab1dbb5df9db12724e92137e8eb7e559fbd6f6d0941f6b194b2ed0 SHA512 23abac84fe1074eb8fb01ca94d4c1a3397c20fb9f1505993bc4c8286ce6a0d664cbc8770b912d1fb5d3621a801746d1e9353ca45ee4666958c6226a6512bd444
-DIST poppler-24.12.0.tar.xz.sig 833 BLAKE2B 48969ab45646935594286ae75205b3f36972d4e360ecb7b60538ddb9b6d329e1ecb59ba10b18f0d191891be78f24cfe0f14c4e6ffbf2f0f453889416cc22c393 SHA512 708186f11d84666e6ffaf090f5181855d54e78dc606451890268246e0ae1791ce4616ce069cde902ee80dddae9542ebf78ca66bd9dcc6833b75529b20ffd9657
+DIST poppler-25.01.0.tar.xz 1942508 BLAKE2B e6d7711ac09abb981cca915999bfaeb16032989a8b1fed9eba06e4d5cb3bfd6bb76496243fb77fb05a9fe9b6a327571adffea4d943877b1f2693014bc2aeec52 SHA512 9791e32099a13a8e80c87f7be874da0fee21f84246c0d9e37ad0e902189e9bf027a35757e26a1b2bf161a098d0bed29abc1550301767d686928ed77c37977b93
+DIST poppler-25.01.0.tar.xz.sig 833 BLAKE2B 4b24055737c95e50d18a490809e4f24e14c730c474a623d507c6b6a1a38c0521becc42e7a3fb0e35a2697110a534a66611b77c98ab71ebfbfb6dfd674725723d SHA512 42600fc952416dc7b5f36c9696de5ee356d6eb50980fd06d3409923bfdd66d83e594b3a1eb6a499f6d51e516477a39d60f289d35789f53c2edb590c09d7c83b0
 DIST poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 5207226 BLAKE2B 15153457989a53301bcdc3468ab2b06b637457199004651b39ea848f488f8a2ba594ce2e36091de4fd06fc0a52b783c6b2ee243ac5d95ce1e9db7483ea880829 SHA512 335cd3d55fc6e28331e791e5b63a08d293abc70764a9f314b2c590c26a5a78b38243c74f988bb95afffe0bdcc54dee1e633dbf1672b19a290be40a298e16995f
diff --git a/app-text/poppler/poppler-24.12.0.ebuild b/app-text/poppler/poppler-24.12.0.ebuild
deleted file mode 100644
index d019d06962cd..000000000000
--- a/app-text/poppler/poppler-24.12.0.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 2005-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/poppler/poppler"
-	SLOT="0/9999"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
-	inherit verify-sig
-
-	TEST_COMMIT="ff3133cdb6cb496ee1d2c3231bfa35006a5e8410"
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
-	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	SLOT="0/144"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.13
-	>=media-libs/freetype-2.10
-	sys-libs/zlib
-	cairo? (
-		>=dev-libs/glib-2.64:2
-		>=x11-libs/cairo-1.16
-		introspection? ( >=dev-libs/gobject-introspection-1.72:= )
-	)
-	curl? ( net-misc/curl )
-	gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
-	jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.49 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		>=dev-qt/qtcore-5.15.2:5
-		>=dev-qt/qtgui-5.15.2:5
-		>=dev-qt/qtxml-5.15.2:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,xml] )
-	tiff? ( media-libs/tiff:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-DEPEND="${COMMON_DEPEND}
-	boost? ( >=dev-libs/boost-1.74 )
-	test? (
-		qt5? (
-			>=dev-qt/qttest-5.15.2:5
-			>=dev-qt/qtwidgets-5.15.2:5
-		)
-		qt6? ( dev-qt/qtbase:6[widgets] )
-	)
-"
-BDEPEND="
-	>=dev-util/glib-utils-2.64
-	virtual/pkgconfig
-"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )"
-fi
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-23.10.0-qt-deps.patch"
-	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		git-r3_src_unpack
-	elif use verify-sig ; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
-	fi
-
-	default
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if tc-is-clang ; then
-		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-	append-lfs-flags # bug #898506
-
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=$(usex test $(usex qt5))
-		-DBUILD_QT6_TESTS=$(usex test $(usex qt6))
-		-DBUILD_CPP_TESTS=$(usex test)
-		-DBUILD_MANUAL_TESTS=$(usex test)
-		-DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT}
-		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_BOOST="$(usex boost)"
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DENABLE_GPGME=$(usex gpgme)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_LCMS=$(usex lcms)
-		-DENABLE_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		-DENABLE_QT5=$(usex qt5)
-		-DENABLE_QT6=$(usex qt6)
-		-DENABLE_LIBTIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-25.01.0.ebuild b/app-text/poppler/poppler-25.01.0.ebuild
new file mode 100644
index 000000000000..623628e1947e
--- /dev/null
+++ b/app-text/poppler/poppler-25.01.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 2005-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/poppler/poppler"
+	SLOT="0/9999"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
+	inherit verify-sig
+
+	TEST_COMMIT="ff3133cdb6cb496ee1d2c3231bfa35006a5e8410"
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
+	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	SLOT="0/145"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.13
+	>=media-libs/freetype-2.10
+	sys-libs/zlib
+	cairo? (
+		>=dev-libs/glib-2.64:2
+		>=x11-libs/cairo-1.16
+		introspection? ( >=dev-libs/gobject-introspection-1.72:= )
+	)
+	curl? ( net-misc/curl )
+	gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
+	jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.49 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		>=dev-qt/qtcore-5.15.2:5
+		>=dev-qt/qtgui-5.15.2:5
+		>=dev-qt/qtxml-5.15.2:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,xml] )
+	tiff? ( media-libs/tiff:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+DEPEND="${COMMON_DEPEND}
+	boost? ( >=dev-libs/boost-1.74 )
+	test? (
+		qt5? (
+			>=dev-qt/qttest-5.15.2:5
+			>=dev-qt/qtwidgets-5.15.2:5
+		)
+		qt6? ( dev-qt/qtbase:6[widgets] )
+	)
+"
+BDEPEND="
+	>=dev-util/glib-utils-2.64
+	virtual/pkgconfig
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )"
+fi
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-23.10.0-qt-deps.patch"
+	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
+	elif use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+	fi
+
+	default
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if tc-is-clang ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	append-lfs-flags # bug #898506
+
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=$(usex test $(usex qt5))
+		-DBUILD_QT6_TESTS=$(usex test $(usex qt6))
+		-DBUILD_CPP_TESTS=$(usex test)
+		-DBUILD_MANUAL_TESTS=$(usex test)
+		-DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT}
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_BOOST="$(usex boost)"
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DENABLE_GPGME=$(usex gpgme)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_LCMS=$(usex lcms)
+		-DENABLE_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		-DENABLE_QT5=$(usex qt5)
+		-DENABLE_QT6=$(usex qt6)
+		-DENABLE_LIBTIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 60012e10a50d..623628e1947e 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2005-2024 Gentoo Authors
+# Copyright 2005-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ else
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	SLOT="0/144"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/145"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20240311.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20240311.ebuild
index be4b632992a2..1e592d4762f8 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20240311.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20240311.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 @@ S="${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1:="
 RDEPEND="${DEPEND}"
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 06132754c925..1b0c869912e1 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,2 +1,3 @@
 DIST Sigil_User_Guide_2024.08.15.epub 12641984 BLAKE2B feaa8a4f6b64786d5cbf494a61c8726a5dd3e169ca8902348e2fee9f890ab7496b5ad018d49d6cecd65cb3d3d4a9b4a6bda019ac52c324fa92fad3e7b5dbc680 SHA512 10199c037a57f4b9ed913a8c726a58e376dcd34300a98cdd4cf934fd3a2f9a26d2f92bd85131af7ee1084824d7b082f7becdec9b0731a62f9cde712bfada5a09
 DIST sigil-2.3.1.tar.gz 17475697 BLAKE2B 668d02f941c900921224977bc2d8edeb6a21cf7985d1f7980ffc6b8ecc6627fe5a29f71ea75e12d1f54c2b1959afa7323dda807b1189e4189a996e98c90bdea2 SHA512 da0433882040212a8385c1b872b568ef39660b6c0127d64d9fc4cdd4f3939c2e14f3d08056ab1b405142e012caf363ebfe170761a74e684590c1a358e1115d09
+DIST sigil-2.4.0.tar.gz 19135045 BLAKE2B 311fe0894818c08fc5ecee8b29b04e24aa8f13d4f28b1011f455fcf7944561e68832ddd36885f69f794333bb790b7b84c49bc6d3d2367772150e936708916d0c SHA512 1c5687f31494ea5f1c8e3ac5fe3c3892ee68a0645795c57f10802d4e579c95a4ef5e3cb0fedc598f647282b3fe7b56e1a3efd547e08a44fea4619ae5b9581c20
diff --git a/app-text/sigil/sigil-2.4.0.ebuild b/app-text/sigil/sigil-2.4.0.ebuild
new file mode 100644
index 000000000000..c8972858090d
--- /dev/null
+++ b/app-text/sigil/sigil-2.4.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit xdg cmake python-single-r1
+
+DOC_VERSION="2024.08.15"
+DOC_FILE="Sigil_User_Guide_${DOC_VERSION}.epub"
+
+DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
+SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( https://github.com/Sigil-Ebook/sigil-user-guide/releases/download/${DOC_VERSION}/${DOC_FILE} )"
+S=${WORKDIR}/${P^}
+
+LICENSE="GPL-3+ Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="doc +plugins +system-mathjax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	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_gen_cond_dep '
+		dev-python/css-parser[${PYTHON_USEDEP}]
+		dev-python/dulwich[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	')
+	plugins? (
+		$(python_gen_cond_dep '
+			dev-python/chardet[${PYTHON_USEDEP}]
+			dev-python/cssselect[${PYTHON_USEDEP}]
+			dev-python/html5lib[${PYTHON_USEDEP}]
+			dev-python/pillow[${PYTHON_USEDEP}]
+			dev-python/regex[${PYTHON_USEDEP}]
+			dev-python/pyqt6[${PYTHON_USEDEP}]
+			dev-python/pyqt6-webengine[${PYTHON_USEDEP}]
+		')
+		$(python_gen_impl_dep 'tk')
+	)
+	system-mathjax? ( >=dev-libs/mathjax-3 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	dev-qt/qttools:6[linguist]
+"
+
+DOCS=( ChangeLog.txt README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DTRY_NEWER_FINDPYTHON3=1
+		-DPython3_INCLUDE_DIR="$(python_get_includedir)"
+		-DPython3_LIBRARY="$(python_get_library_path)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		-DUSE_VIRT_PY=0
+		-DINSTALL_BUNDLED_DICTS=0
+		-DSYSTEM_LIBS_REQUIRED=1
+		-DUSE_SYSTEM_LIBS=1
+	)
+	use system-mathjax && mycmakeargs+=( -DMATHJAX3_DIR="${EPREFIX}"/usr/share/mathjax )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_fix_shebang "${ED}"/usr/share/sigil/
+	python_optimize "${ED}"/usr/share/sigil/
+
+	if use doc; then
+		dodoc "${DISTDIR}/${DOC_FILE}"
+		docompress -x /usr/share/doc/${PF}/${DOC_FILE}
+	fi
+}
diff --git a/app-text/texlive-core/texlive-core-2024-r1.ebuild b/app-text/texlive-core/texlive-core-2024-r1.ebuild
index c8152c2d8d28..1f5461b8df3b 100644
--- a/app-text/texlive-core/texlive-core-2024-r1.ebuild
+++ b/app-text/texlive-core/texlive-core-2024-r1.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
@@ -133,7 +133,7 @@ SRC_URI+=" )"
 S="${WORKDIR}/${MY_P}"
 LICENSE="BSD CC-BY-SA-4.0 GPL-1+ GPL-2 GPL-2+ GPL-3+ MIT TeX-other-free"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="cjk X doc source tk +luajittex xetex xindy"
 
 TEXMF_PATH=/usr/share/texmf-dist
@@ -246,7 +246,7 @@ src_configure() {
 	filter-lto
 
 	# bug #946142
-	append-flags -std=gnu17
+	append-cflags -std=gnu17
 
 	# Needed for 32bit architectures, bug 928096
 	# This is upstream recommendation for the moment, see also
diff --git a/app-text/texlive/texlive-2024.ebuild b/app-text/texlive/texlive-2024.ebuild
index af5a7f286c47..c059fe255eac 100644
--- a/app-text/texlive/texlive-2024.ebuild
+++ b/app-text/texlive/texlive-2024.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,7 +8,7 @@ HOMEPAGE="https://tug.org/texlive/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="cjk context extra games graphics humanities luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xml X"
 
 LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
diff --git a/app-text/trang/Manifest b/app-text/trang/Manifest
index 8a48fdadff4c..4c93e5b233ad 100644
--- a/app-text/trang/Manifest
+++ b/app-text/trang/Manifest
@@ -1 +1,2 @@
 DIST trang-20220510.tar.gz 14317698 BLAKE2B b7337e9555094989955e33f711db9981521c31a3708dd6a862f36cecae0496d8c86fdf09b2d60b8646d8e35e214f57ba7bcd49773fe002eef26ed6b81b4101c1 SHA512 51c44817b396ec45bb82987e0aee8e8d2e5f3f6a1e2f967bae717a31b1bd49c5fc7015466104b19ac62de6ee0270c018dcf19b467763ad1aaa92800bd4edd7a0
+DIST trang-20241231.tar.gz 14317272 BLAKE2B 420bd2148f90bbda03d91c0e748fb785e89286e5b9b565cc31e81306e5c832a6b683b51bd132b7f16e7cbce798eaf1b13d23a4b035ef77a1b13bb25366866523 SHA512 6e0d9c69b5fe663b2e014e0a30b6d92018a349b982698631f346a1fe7657e8a8c5b785df1c1188f4caf61acfccbaf9fc2f6478f2dfb425ef6ef510a865bdaaa3
diff --git a/app-text/trang/trang-20241231.ebuild b/app-text/trang/trang-20241231.ebuild
new file mode 100644
index 000000000000..343ab8e4a119
--- /dev/null
+++ b/app-text/trang/trang-20241231.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc test"
+JAVA_TESTING_FRAMEWORKS="testng"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DESCRIPTION="Multi-format schema converter based on RELAX NG"
+HOMEPAGE="http://thaiopensource.com/relaxng/trang.html"
+SRC_URI="https://github.com/relaxng/jing-trang/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/jing-${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	app-i18n/unicode-data
+	dev-java/saxon:9
+"
+
+CP_DEPEND="
+	dev-java/xerces:2
+	dev-java/xml-commons-resolver:0
+"
+
+JAVACC_SLOT="7.0.13"
+
+DEPEND="
+	${CP_DEPEND}
+	dev-java/javacc:${JAVACC_SLOT}
+	dev-java/testng:0
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+JAVA_CLASSPATH_EXTRA="testng"
+JAVA_GENTOO_CLASSPATH_EXTRA="util:helper"
+JAVA_JAR_FILENAME="trang.jar"
+JAVA_MAIN_CLASS="com.thaiopensource.relaxng.translate.Driver"
+JAVA_RESOURCE_DIRS=( meta resources/src/main )
+JAVA_SRC_DIR=( {gen,}src/main )
+JAVA_TEST_RESOURCE_DIRS="src/test"
+JAVA_TEST_SRC_DIR="src/test"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-pkg_clean
+
+	eprefixify mod/regex/mod.xml	# Do we still need this?
+
+	# javac of old openjdk:8 does not create its output directory, see bug #934306
+	# separating some sources which are needed only for compilation
+	mkdir helper util || die
+	cp -r mod/{catalog,datatype,jaxp,pattern,resolver,rng-parse}/src helper || die
+
+	# most of the mods are not needed for the final trang.jar
+	rm -r mod/{dtdinst,nvdl,picl,rng-jarv,rng-validate,schematron,validate,xerces} || die
+	rm -r mod/{jaxp,pattern,rng-jaxp} || die
+
+	# move all remainig stuff to "src/main" resp. "src/test"
+	mkdir -p resources src meta/META-INF/services || die
+	mv {mod/,}regex-gen || die	# but not this one which is needed in two JAVA_SRC_DIRs
+	cp -r mod/*/src/{main,test} src || die
+
+	# populate META-INF/services
+	echo com.thaiopensource.datatype.xsd.DatatypeLibraryFactoryImpl \
+		> meta/META-INF/services/org.relaxng.datatype.DatatypeLibraryFactory || die
+	echo com.thaiopensource.datatype.xsd.regex.xerces2.RegexEngineImpl \
+		> meta/META-INF/services/com.thaiopensource.datatype.xsd.regex.RegexEngine || die
+
+	echo "version=${PV}" \
+		> src/main/com/thaiopensource/relaxng/translate/resources/Version.properties || die
+
+	# java-pkg-simple expects resources in JAVA_RESOURCE_DIRS
+	find src -type f ! -name '*.java' ! -name 'CompactSyntax.jj' ! -name 'package.html' \
+		| xargs cp --parent -t resources || die
+
+	# code generation according to mod/rng-parse/mod.xml
+	local OUT_DIR="gensrc/main/com/thaiopensource/relaxng/parse/compact"
+	mkdir -p "${OUT_DIR}"
+	"javacc-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \
+		-JDK_VERSION=1.8 \
+		-OUTPUT_DIRECTORY="${OUT_DIR}" \
+		helper/src/main/com/thaiopensource/relaxng/parse/compact/CompactSyntax.jj \
+		|| die "Code generation with java.jj failed"
+	rm "${OUT_DIR}/JavaCharStream.java" || die
+
+	# mod/rng-parse/mod.xml lines 16-17 - 's/java.io.IOException/EOFException/'
+	eapply "${FILESDIR}/trang-20220510-CompactSyntaxTokenManager.patch" || die
+}
+
+src_compile() {
+	einfo "Compiling some classes needed for code generation"
+	ejavac -d util \
+		$(find regex-gen/src/main mod/util/src/main -name "*.java") || die
+
+	einfo "Code generation"
+	"$(java-config -J)" -cp "util" \
+		com.thaiopensource.datatype.xsd.regex.java.gen.NamingExceptionsGen \
+		"com.thaiopensource.datatype.xsd.regex.java.NamingExceptions" \
+		"src/main" || die
+
+	"$(java-config -J)" -cp "util" \
+		com.thaiopensource.datatype.xsd.regex.java.gen.CategoriesGen \
+		"com.thaiopensource.datatype.xsd.regex.java.Categories" \
+		"src/main" \
+		"/usr/share/unicode-data/UnicodeData.txt" || die
+
+	einfo "Compiling classes which are not needed for the final trang.jar"
+	ejavac -d helper \
+		-cp "util:$(java-pkg_getjars --build-only xml-commons-resolver)" \
+		$(find gensrc/main helper/src/main -name "*.java") || die
+
+	einfo "Compiling trang.jar"
+	java-pkg-simple_src_compile
+}
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20240311.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20240311.ebuild
index aa4e458ba384..9ea0fdccd79a 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20240311.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20240311.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
@@ -10,7 +10,7 @@ S="${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
 # ttf2tfm from freetype1, so block freetype1.
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index 925b44be4da5..9522f2826868 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -1 +1,2 @@
 DIST xchm-1.36.tar.gz 882212 BLAKE2B 8f11457664748fa3effb23102b23ee59c3184a408f6defa3bc7d7bf90c97357a74d33f5da6b7098011a1c23a9f3dd9a523076e367aa9547c9d72f25296b6c787 SHA512 0b7397cd188e47cf9e39c21081428356d858d7ff7e82dd928ef728f32d962ecd485ef2b44ff0c063bde67a605d7a4610f1f5100d1c30d691e6546434c615da65
+DIST xchm-1.37.tar.gz 893765 BLAKE2B 2dcfde8af982ad6ed65cd46f0897264785d5515ab8a9d1c898b9e8b794076a5be4c270da7c70f51919230881c8102bcd39054bd147e0c5e796f6f031f452d831 SHA512 284cdd92788aaa11be3cfbfb10c6537d465625bf9acfb40a0a8859f2c9b5fefc1f454a81046c86638d7dbad31a2bba7d859c34b945d9e8557287279c9572c0ac
diff --git a/app-text/xchm/xchm-1.36.ebuild b/app-text/xchm/xchm-1.36.ebuild
index 4abfca557e5d..96d2b5563bf2 100644
--- a/app-text/xchm/xchm-1.36.ebuild
+++ b/app-text/xchm/xchm-1.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
 HOMEPAGE="https://github.com/rzvncj/xCHM/"
 SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc ~riscv x86"
 IUSE="nls"
diff --git a/app-text/xchm/xchm-1.37.ebuild b/app-text/xchm/xchm-1.37.ebuild
new file mode 100644
index 000000000000..4dfc4de5e884
--- /dev/null
+++ b/app-text/xchm/xchm-1.37.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit desktop wxwidgets xdg-utils
+
+DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
+HOMEPAGE="https://github.com/rzvncj/xCHM/"
+SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/chmlib-0.36
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_configure() {
+	setup-wxwidgets
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+
+	domenu "${FILESDIR}"/xchm.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/xchm.xml
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-text/xdvik/xdvik-22.87.06-r1.ebuild b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
index e40aeb4ffa5f..e2c86e06de43 100644
--- a/app-text/xdvik/xdvik-22.87.06-r1.ebuild
+++ b/app-text/xdvik/xdvik-22.87.06-r1.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
@@ -43,6 +43,10 @@ BDEPEND="app-alternatives/lex
 	app-alternatives/yacc
 	virtual/pkgconfig"
 
+# https://bugs.gentoo.org/900537
+# Windows-exclusive function
+QA_CONFIG_IMPL_DECL_SKIP=(memicmp)
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-22.87.06-configure-clang16.patch
 	"${FILESDIR}"/${PN}-22.87.06-squeeze-c23.patch
diff --git a/app-text/xml2rfc/xml2rfc-3.24.0.ebuild b/app-text/xml2rfc/xml2rfc-3.24.0.ebuild
index 787096e25de2..55fbc0e9f2e3 100644
--- a/app-text/xml2rfc/xml2rfc-3.24.0.ebuild
+++ b/app-text/xml2rfc/xml2rfc-3.24.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
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=dev-python/platformdirs-3.6.0[${PYTHON_USEDEP}]
diff --git a/app-text/yamlfmt/Manifest b/app-text/yamlfmt/Manifest
index f9567531c7d7..bdb87d6aa912 100644
--- a/app-text/yamlfmt/Manifest
+++ b/app-text/yamlfmt/Manifest
@@ -2,3 +2,5 @@ DIST yamlfmt-0.13.0-deps.tar.xz 128464 BLAKE2B c51a77b6fa84e88239fe5185761bac4ab
 DIST yamlfmt-0.13.0.tar.gz 43334 BLAKE2B da1828f6f8ab24236173fd5621781468e123ed4c9521ab2233b6185ab61a2e6744593f280dd786bbe3e0f38fd692b307dcde0cdce4944c9b6468425b9f7898d3 SHA512 28cf1d04690ce72a1330c0d93b148516e80b33306067f4dbe1b5056e243202d93ed09293b6fe5c958a341dd590edd61e6c1fdb278b28c88b421fb7364cff10b8
 DIST yamlfmt-0.14.0-deps.tar.xz 145900 BLAKE2B a58b00c7efc0a0d3c72a3482576f88458f46a984c7f7b11dbaa235c65d18982bb6aba95169e379b809dfc3349eeac4155493a6085dfe6a326a92d0d4beed848b SHA512 42d3ef9a91571eb9712cbd6bf7e7ffeb657a9ae424991b8837897a01eeed5c40ac926e399d8b0644553f878b7024ab3d8ad2aa90c8019153e9c5b7092b56b771
 DIST yamlfmt-0.14.0.tar.gz 47247 BLAKE2B 05583fbaeeb70cabaff6a8f602d455c743300d08e5a422d531ca277d6b1b8c49ce7a8c44c9cde16ac56d2623af90becf4cdb1d213b3c26e6838c7839f02463c6 SHA512 81afcd2e5d454a8069d7cedbdc56c0f25c5cb71a217206d0fb3d5aa1f9714794f4749582c231b99fd34dcb975be73d518b204346994dae27d4a75fba81303cf8
+DIST yamlfmt-0.15.0-deps.tar.xz 266288 BLAKE2B ded6aed21162b7974884440542fb16cb8480000027b3221e38d314bff62a6c22e271444a0b9c2000c221587bd36ae620492477436a9371868457fb2586cd177b SHA512 902b3180d03f6f71859140fd3ebd9810dbe85094d042786a45206d658dfa2a972b6350a92ab6bc66a2953e8dad0d4351401e926b0b4249eb52c2baf69cb07f45
+DIST yamlfmt-0.15.0.tar.gz 55482 BLAKE2B 5a6cc56c070d174eac9bc5e29467b72c8d33abf5ad0f764bf5fbc3e37013aa0243643052c07cec1b4219e142b25ea439a48e0d1e40f32793233010d821a5a774 SHA512 6ca1f766eeac10a9d322a6bf15474ed0f6441a9ab04462183ddd4696448fcb888c7cad2c6fe8af890095960dd7e4b59dbacc7778935d57c43e0c8930835cfb4a
diff --git a/app-text/yamlfmt/yamlfmt-0.15.0.ebuild b/app-text/yamlfmt/yamlfmt-0.15.0.ebuild
new file mode 100644
index 000000000000..5dab64b5cf67
--- /dev/null
+++ b/app-text/yamlfmt/yamlfmt-0.15.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+EGIT_COMMIT=81ffee4
+DESCRIPTION="An extensible command line tool or library to format yaml files"
+HOMEPAGE="https://github.com/google/yamlfmt"
+SRC_URI="https://github.com/google/yamlfmt/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+LICENSE+=" BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	ln -sv ../vendor ./ || die
+	default
+}
+
+src_compile() {
+	CGO_ENABLED=0 ego build -ldflags "-X main.version=${PV} -X main.commit=${EGIT_COMMIT} -s -w" \
+		-o yamlfmt ./cmd/yamlfmt
+}
+
+src_install() {
+	dodoc -r README.md docs
+	dobin yamlfmt
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.4.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.4.ebuild
index 70c7609cebde..d706b26829a2 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.4.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.4.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
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/pwmt/zathura-pdf-mupdf.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 	SRC_URI="https://github.com/pwmt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-text/zeal/Manifest b/app-text/zeal/Manifest
index e5dc5034586b..a009b7855811 100644
--- a/app-text/zeal/Manifest
+++ b/app-text/zeal/Manifest
@@ -1,2 +1 @@
-DIST zeal-0.7.1.tar.gz 1195333 BLAKE2B 56e6d56e152ed94559d15ba4a5dd7972466db75a4d760640b55b532ba3ed325a429e8e03f450efaa3e24f09af68ff5b43463d9b8f21b8a9bd11e23a3841780c4 SHA512 bf2b5e2878b349ec4e5e74377a2a74e263d5f20649f152f194375547c5e69b3e6115c9d0f103acad7f087b20456d888a3be9f7ce1aa232206bba7e0ed38d252b
 DIST zeal-0.7.2.tar.gz 1217853 BLAKE2B e82c3a977375317cfb4d5ad32f577f668f38cfc1d3a2685d44c96814817623001a8fff848a04acf07d3ab942bee9a0c6801dfadad3fceaf24d55beb5a78a9522 SHA512 41f79f4c441938a60f80796376de31643ad1b80d989c6452653647be533b6e4e23d96b556895c457d574e00d75a57e4b2ef2a77096fa1d120e0c2e5b511366fb
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/app-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
index 1f37c71aff64..a8d2ea10d9b4 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -1,3 +1,2 @@
-DIST ebuild-mode-1.75.tar.xz 48592 BLAKE2B 2273357c2736e0952637bb00754f0eff8379b5bd27793dac43d4d17e12affb8e88925ef321bd74709bc1054953f3fe3263b676c9faab93434558f45f55a70b28 SHA512 c00835513db517f07361ffa9fc86e8b268c89126fb1a0c88950e8566fcae296f115e29e6fa371bd93be34d6938e2a828e3382ea0b489a3e72af972b4f7b22e2e
 DIST ebuild-mode-1.76.tar.xz 50404 BLAKE2B 9aeda48858155286c9df2075b61f596723d457ac1592ab581e1589d291db2f54d3c5d81dd610a41506d43d5d90943404a8f74fc4b742d7ed33f4e623930d1fc7 SHA512 e9659878109de92789204d6bd9493465b1d078a5ac5a10937397478a20766bab453bdfc8d3352625570b37b8bf8aadc28369652979032427a1c8d6d13242aa64
 DIST ebuild-mode-1.77.tar.xz 50840 BLAKE2B 29ecc60dc232def8ef811da88efd68b6ffe66fa5df6a53390e6d01b858160f16f3f5f1f481f3d34628ccbd7228113867df3f81b0587d1f5ced721d129111f3a9 SHA512 f40f294158a36783f6d08297d51f0a0931209368449a6edeb50235568c4347b27070d20227c0d6d32d3581609dc288effefb8dda982d2e45b046243ce0e3495d
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.75-r2.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.75-r2.ebuild
deleted file mode 100644
index 2ddee443a60e..000000000000
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.75-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit optfeature
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-
-RDEPEND=">=app-editors/xemacs-21.5.35
-	app-xemacs/sh-script"
-BDEPEND="${RDEPEND}"
-
-EMACS="${EPREFIX}/usr/bin/xemacs"
-EMACSFLAGS="-batch -q -no-site-file"
-
-src_compile() {
-	${EMACS} ${EMACSFLAGS} \
-		-eval "(add-to-list 'load-path nil)" \
-		-f batch-byte-compile \
-		ebuild-mode.el gentoo-newsitem-mode.el || die
-
-	${EMACS} ${EMACSFLAGS} \
-		-eval "(setq autoload-package-name \"${PN}\")" \
-		-eval "(setq generated-autoload-file \"${S}/auto-autoloads.el\")" \
-		-l autoload -f batch-update-autoloads \
-		ebuild-mode.el gentoo-newsitem-mode.el || die
-}
-
-src_test() {
-	emake check EMACS="${EMACS}" EMACSFLAGS="${EMACSFLAGS}"
-}
-
-src_install() {
-	insinto /usr/lib/xemacs/site-packages/lisp/${PN}
-	doins ebuild-mode.{el,elc} ebuild-mode-keywords.el \
-		gentoo-newsitem-mode.{el,elc}
-	doins auto-autoloads.el
-}
-
-pkg_postinst() {
-	optfeature "ebuild commands support" sys-apps/portage
-	optfeature "additional development tools" dev-util/pkgdev
-	optfeature "ebuild QA utilities" dev-util/pkgcheck
-}
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.77.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.77.ebuild
index 84218b83bbb1..67ffead8cd81 100644
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.77.ebuild
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.77.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="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 
 RDEPEND=">=app-editors/xemacs-21.5.35
 	app-xemacs/sh-script"
diff --git a/app-xemacs/tramp/Manifest b/app-xemacs/tramp/Manifest
index 612970d071dc..08bf9637e682 100644
--- a/app-xemacs/tramp/Manifest
+++ b/app-xemacs/tramp/Manifest
@@ -1,2 +1 @@
-DIST tramp-1.58-pkg.tar.gz 399622 BLAKE2B cf307079b5c0d38e6c9c4f7b003df3e793369c431c837e597842f7f3c020a8682f13e6cfec3619f614a30d456ca5d93789ea3cf38d8bc47edb1099cfcbf1680d SHA512 7dafae85389b7a5ad7f5943dbd0343281956407aedc636e7bdffb544d4d0322fda0abb7b9990765f78a2eff5c789efe2f253cad2d1dfc64c2f9e9e41decd9b44
 DIST tramp-1.58-repackaged-pkg.tar.gz 413690 BLAKE2B 7ff0dda2d2cbbc6a756960570592c41495c1491b0672e3d959da03612707e90e705ad5f960f535c52d3d0d46dade7aa37ee19fed285ff89b606c8a22aa5cd17b SHA512 e57bdbddccee60348e01d382369ef513c37f97b0f0d288077ca4e9658a9cd90782f59e9ee68987d26fba8018f1cffd34d3b86307cda515151266c7765261a963
diff --git a/app-xemacs/tramp/tramp-1.58-r1.ebuild b/app-xemacs/tramp/tramp-1.58-r1.ebuild
index 5921af7adcbc..9e6ced6bcfe0 100644
--- a/app-xemacs/tramp/tramp-1.58-r1.ebuild
+++ b/app-xemacs/tramp/tramp-1.58-r1.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
@@ -20,6 +20,6 @@ app-xemacs/ediff
 app-xemacs/sh-script
 app-xemacs/edebug
 "
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/tramp/tramp-1.58.ebuild b/app-xemacs/tramp/tramp-1.58.ebuild
deleted file mode 100644
index 1fae71730fa0..000000000000
--- a/app-xemacs/tramp/tramp-1.58.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SLOT="0"
-DESCRIPTION="Remote shell-based file editing"
-XEMACS_PKG_CAT="standard"
-
-XEMACS_EXPERIMENTAL="true"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/vc
-app-xemacs/efs
-app-xemacs/dired
-app-xemacs/mail-lib
-app-xemacs/gnus
-app-xemacs/ediff
-app-xemacs/sh-script
-app-xemacs/edebug
-"
-KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
-
-inherit xemacs-packages
diff --git a/dev-ada/VSS/VSS-25.0.0.ebuild b/dev-ada/VSS/VSS-25.0.0.ebuild
index 1e9ac750fbce..45d50bffa242 100644
--- a/dev-ada/VSS/VSS-25.0.0.ebuild
+++ b/dev-ada/VSS/VSS-25.0.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
@@ -13,10 +13,11 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+shared static-libs static-pic test"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="${ADA_REQUIRED_USE}"
+REQUIRED_USE="${ADA_REQUIRED_USE}
+	test? ( static-libs )"
 
 RDEPEND="${ADA_DEPS}
 	dev-ada/xmlada:=[shared?,static-libs?,static-pic?,${ADA_USEDEP}]"
diff --git a/dev-ada/ada_libfswatch/Manifest b/dev-ada/ada_libfswatch/Manifest
index 5849eb7dfa77..bff07bde27ed 100644
--- a/dev-ada/ada_libfswatch/Manifest
+++ b/dev-ada/ada_libfswatch/Manifest
@@ -1 +1,2 @@
 DIST ada_libfswatch-20201105.tar.gz 20473 BLAKE2B cfa200f3276da5372df83038fe7a11224a4938d750207f17769ff21ce2c0780e5ef3111a5564cdabde2155fb7579c437e34061cd8654358d04f55bd0af1f1b02 SHA512 71ec7584ad4c9d06939d4cde858c40016b629a76edf6392287140aaabbc588b82c7abf980ab75888763ebaf721b51e1163cf362512788b7559e20d11051a95ed
+DIST ada_libfswatch-20240709.tar.gz 20469 BLAKE2B 81d183e556ed69b3c78b7606f10aaddcbf0b01bc667a732b13f609304f787099804dc751171496355f387b000fa290fe6af3f37c3cbedfe063fca7c1ffb30cdd SHA512 af58ae9bf892053f530731d3c7e38fba56d09cbe5fa991d108c95d74581352a28cc2bc6ce6a3064f758ac56bdb425a6aad867210c4209e74ac78fc22c2897efe
diff --git a/dev-ada/ada_libfswatch/ada_libfswatch-20240709.ebuild b/dev-ada/ada_libfswatch/ada_libfswatch-20240709.ebuild
new file mode 100644
index 000000000000..22befe07efbb
--- /dev/null
+++ b/dev-ada/ada_libfswatch/ada_libfswatch-20240709.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gcc_13 gcc_14 )
+inherit ada
+
+commitId=838480d8fca344d9f8a78341113ceb4ed5cf2222
+
+DESCRIPTION="Ada binding to the libfswatch library"
+HOMEPAGE="https://github.com/AdaCore/ada_libfswatch"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/${commitId}.tar.gz
+	-> ${P}.tar.gz"
+
+S="${WORKDIR}"/${PN}-${commitId}
+
+LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="${ADA_DEPS}
+	>=dev-ada/gnatcoll-core-25[${ADA_USEDEP},shared]
+	sys-fs/fswatch"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20201105-link.patch
+)
+
+src_prepare() {
+	default
+	mkdir -p generated || die
+	cp /usr/include/libfswatch/c/* generated || die
+	(cd generated && gcc -C -fdump-ada-spec libfswatch.h -D_TIMEZONE_DEFINED) \
+		|| die
+	rm generated/*h || die
+	sed -i \
+		-e "1d" \
+		ada_libfswatch.gpr || die
+}
+
+src_compile() {
+	gprbuild -p -v -P ada_libfswatch -XLIBRARY_TYPE=relocatable \
+		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
+		|| die
+}
+
+src_install() {
+	gprinstall -v -r -p -P ada_libfswatch -XLIBRARY_TYPE=relocatable \
+		--prefix="${D}"/usr || die
+	einstalldocs
+	rm -r "${D}"/usr/share/gpr/manifests
+}
diff --git a/dev-ada/aunit/aunit-25.0.0-r1.ebuild b/dev-ada/aunit/aunit-25.0.0-r1.ebuild
new file mode 100644
index 000000000000..b65aa93e36db
--- /dev/null
+++ b/dev-ada/aunit/aunit-25.0.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 gcc_14 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+inherit ada python-any-r1 multiprocessing
+
+DESCRIPTION="Ada unit testing framework"
+HOMEPAGE="https://github.com/AdaCore/aunit"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc"
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+BDEPEND="doc? (
+	$(python_gen_any_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+	')
+)"
+
+python_check_deps() {
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s|@PF@|${PF}|g" \
+		lib/gnat/aunit.gpr \
+		|| die
+}
+
+src_compile() {
+	emake GPROPTS_EXTRA="-j$(makeopts_jobs) -v -cargs ${ADAFLAGS}"
+	use doc && emake -C doc aunit_cb.html
+}
+
+src_install() {
+	emake INSTALL="${D}"/usr install
+	DOCS="README"
+	use doc && HTML_DOCS="doc/build/aunit_cb/html/*"
+	einstalldocs
+	mv "${D}"/usr/share/examples "${D}"/usr/share/doc/${PF}/
+	rm -r "${D}"/usr/share/gpr/manifests || die
+}
+
+src_test() {
+	emake PROJECT_PATH_ARG="ADA_PROJECT_PATH=$(pwd)/lib/gnat" -C test
+}
diff --git a/dev-ada/aunit/aunit-25.0.0.ebuild b/dev-ada/aunit/aunit-25.0.0.ebuild
deleted file mode 100644
index 9d721fb12fb2..000000000000
--- a/dev-ada/aunit/aunit-25.0.0.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
-
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 )
-inherit ada multiprocessing
-
-DESCRIPTION="Ada unit testing framework"
-HOMEPAGE="https://github.com/AdaCore/aunit"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-BDEPEND="doc? (
-	dev-tex/latexmk
-	dev-texlive/texlive-latexextra
-	dev-python/sphinx
-	dev-python/sphinx-rtd-theme
-)"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s|@PF@|${PF}|g" \
-		lib/gnat/aunit.gpr \
-		|| die
-}
-
-src_compile() {
-	emake GPROPTS_EXTRA="-j$(makeopts_jobs) -v -cargs ${ADAFLAGS}"
-	use doc && emake -C doc all
-}
-
-src_install() {
-	emake INSTALL="${D}"/usr install
-	DOCS="README"
-	if use doc; then
-		DOCS+=" doc/build/aunit_cb/pdf/aunit_cb.pdf"
-		DOCS+=" doc/build/aunit_cb/txt/aunit_cb.txt"
-		HTML_DOCS="doc/build/aunit_cb/html"
-	fi
-	einstalldocs
-	if use doc; then
-		insinto /usr/share/info
-		doins doc/build/aunit_cb/info/aunit_cb.info
-		docompress -x /usr/share/info
-	fi
-	mv "${D}"/usr/share/examples "${D}"/usr/share/doc/${PF}/
-	rm -r "${D}"/usr/share/gpr/manifests || die
-}
-
-src_test() {
-	emake PROJECT_PATH_ARG="ADA_PROJECT_PATH=$(pwd)/lib/gnat" -C test
-}
diff --git a/dev-ada/e3-core/Manifest b/dev-ada/e3-core/Manifest
index 54af3d9817a5..9e1ac50840ad 100644
--- a/dev-ada/e3-core/Manifest
+++ b/dev-ada/e3-core/Manifest
@@ -1,2 +1,2 @@
-DIST e3-core-22.2.0.tar.gz 383417 BLAKE2B ef595dc785b0073a53ddb06ab1ab7b1a0e9eea0131d2a15318f6355a581f83d14f61f6b0f23d4e3df4afe31e0c03a6b1b4ca8b5aefdb3f982ccaa3454f127f0d SHA512 a2bc2a183b3fed9ad2f0119406dc26857254e4a68014f618a75c062518b990e5f1f3af72e9dc321dea3f9248bd97bded87a20b5389a3e03f2d3b76bb83f56216
 DIST e3-core-22.4.0.tar.gz 484431 BLAKE2B fb0d12ea30544a33b1bd3c9e3c7571defb5226faa94fc54e5f25b8b9613a586d9e9a84f973903e150f2dff81b4806afb95df31611ced4452f2d3f892db4f6e3b SHA512 afa99afb16ec8498be62b1ed49ebd2ba057b75fa1d5b37ab5cebd40bc0f70704883211bb37be34a3be98079b7e056963f9d35c338fb20525fa009b968dd83909
+DIST e3-core-22.6.0.tar.gz 558104 BLAKE2B 95cc2a6d1c8570a3a0efa91676b4b1c2eac17b58e570084218e264ce36eb9662b0d7ef713afe01d4081db84d7416af608434be23179af6b7953b13400a9225ad SHA512 66707dc2d6d38f32e511587053b9c2f2457e0516ee4c98e06077abe596b77bb7c20a3a43c966f22e7f0339c6d15905649e237035e1abb012b4d5eb533f852f88
diff --git a/dev-ada/e3-core/e3-core-22.2.0.ebuild b/dev-ada/e3-core/e3-core-22.2.0.ebuild
deleted file mode 100644
index f205b8d8327d..000000000000
--- a/dev-ada/e3-core/e3-core-22.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Ease the development of portable automated build systems"
-HOMEPAGE="https://www.adacore.com/"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="test"
-
-RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	!app-editors/e3"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-python/httpretty[${PYTHON_USEDEP}]
-		dev-vcs/subversion
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-22.1.0-distro.patch
-	"${FILESDIR}"/${PN}-22.1.0-test.patch
-)
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-src_compile() {
-	local PLATFORM=x86_64-linux
-	rm src/e3/os/data/rlimit* || die
-	$(tc-getCC) ${CFLAGS} -o src/e3/os/data/rlimit-${PLATFORM} tools/rlimit/rlimit.c ${LDFLAGS}
-	distutils-r1_src_compile
-}
diff --git a/dev-ada/e3-core/e3-core-22.6.0-r2.ebuild b/dev-ada/e3-core/e3-core-22.6.0-r2.ebuild
new file mode 100644
index 000000000000..afa7b1118ebb
--- /dev/null
+++ b/dev-ada/e3-core/e3-core-22.6.0-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Ease the development of portable automated build systems"
+HOMEPAGE="https://www.adacore.com/"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="test" #require pytest-socket
+
+RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+	!app-editors/e3"
+DEPEND="${RDEPEND}"
+BDEPEND="test? (
+	dev-python/httpretty[${PYTHON_USEDEP}]
+	dev-vcs/subversion
+	dev-python/mock[${PYTHON_USEDEP}]
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-22.1.0-test.patch
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/sphinx-autoapi
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+src_compile() {
+	local PLATFORM
+	if use amd64; then
+		PLATFORM=x86_64
+	elif use x86; then
+		PLATFORM=x86
+	elif use arm64; then
+		PLATFORM=aarch64
+	else
+		die "Not a recognized platform"
+	fi
+	PLATFORM+="-linux"
+	rm src/e3/os/data/rlimit* || die
+	$(tc-getCC) ${CFLAGS} -o src/e3/os/data/rlimit-${PLATFORM} \
+		tools/rlimit/rlimit.c ${LDFLAGS}
+	distutils-r1_src_compile
+}
diff --git a/dev-ada/e3-testsuite/Manifest b/dev-ada/e3-testsuite/Manifest
index a3a28562eb9c..8f5502bf983c 100644
--- a/dev-ada/e3-testsuite/Manifest
+++ b/dev-ada/e3-testsuite/Manifest
@@ -1,2 +1 @@
-DIST e3-testsuite-25.0.tar.gz 138004 BLAKE2B 5a1b5bd7e51bae030867034ab48b4dbf38813a52c9d72f76dfac6018faf37ec69e3967a94f371fcc395df01e82a80426ecad274cfb5999c893c2559289421a0b SHA512 3aef1fae5204991f7f8c2c0456b46c9c1535c59c55c4840184f986ff2444de518a2f165f052dfd0412f25824ab26bea6a6317b20f194f459d30a17580cdea8c6
 DIST e3-testsuite-26.0.tar.gz 159252 BLAKE2B cf57fce6e65914373f6ada298704343a190ba69d0c70832a8c520a1d6efdfd81e163850e605ece46ae4d6406e2a7a163a45bc7de8d7b43f0ea9d21327a1a4699 SHA512 40dc8b86aa77a676cd728e8708607543c445ab97452a385df944f9ab172448c7ecc31a72282e185754c86da1ffd052b149bdf4d88247b114fe1563396320f664
diff --git a/dev-ada/e3-testsuite/e3-testsuite-25.0.ebuild b/dev-ada/e3-testsuite/e3-testsuite-25.0.ebuild
deleted file mode 100644
index c18985825446..000000000000
--- a/dev-ada/e3-testsuite/e3-testsuite-25.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Generic testsuite framework in Python"
-HOMEPAGE="https://www.adacore.com/"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-ada/e3-core[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-ada/e3-testsuite/e3-testsuite-26.0-r2.ebuild b/dev-ada/e3-testsuite/e3-testsuite-26.0-r2.ebuild
new file mode 100644
index 000000000000..587aa0690806
--- /dev/null
+++ b/dev-ada/e3-testsuite/e3-testsuite-26.0-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Generic testsuite framework in Python"
+HOMEPAGE="https://www.adacore.com/"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ada/e3-core[${PYTHON_USEDEP}]
+	test? ( dev-python/coverage[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx-rtd-theme dev-python/sphinx-autoapi
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-ada/e3-testsuite/e3-testsuite-26.0.ebuild b/dev-ada/e3-testsuite/e3-testsuite-26.0.ebuild
deleted file mode 100644
index 6ec48955bd6b..000000000000
--- a/dev-ada/e3-testsuite/e3-testsuite-26.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Generic testsuite framework in Python"
-HOMEPAGE="https://www.adacore.com/"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-ada/e3-core[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 5d56bc4e9496..eb2ea67853aa 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,2 +1,2 @@
-DIST gnatcoll-bindings-23.0.0.tar.gz 251006 BLAKE2B 8cc5ada5c76d146d80c1b83bfbcfea28b9951339eb5dcdca40a4b40fdeb2ed2ad1971deea60b6fdc7cc2565745958d13fcc1acbd012465dea4cb2535e947af34 SHA512 3f92d3c95ffbcf96df53a1db39c9b829ae3d0a9ee3695d3d7726168bd6744ca4d4dfe4b224b50b50603c6295e1c0c6dd3d9940cf9e20c147a3bed8e6cc39c1ce
 DIST gnatcoll-bindings-24.0.0.tar.gz 253286 BLAKE2B 6f9ee60a298f98921df3f8bfd3c6e21a3b54412dfea3d67cb6fe0e85d7ba90f17f83d564d9853e989cd60b0d9d9052694a14a70d10a4f70d161878501edd036b SHA512 d82f593cd0a2822d0007ba768a05e9870aa80b47232154008ea91af4ec758df1b23b92eb5264a58f2b4bedf775d143ce7119046a9ba8f7d5496ed89f3a4a2118
+DIST gnatcoll-bindings-25.0.0.tar.gz 299443 BLAKE2B 8feee477728f036d32b4957ffde309d529eb5ccead784dd1bfaf7a3b945046672467ed3eac49336369bda473f317d30ce73f2d6a8afcbb289da4a4f7496f523a SHA512 0cc5b4a1e966b6e05dcfa15e60cb3960894ffe73b9348f0642a972f4d517e535c617893a4080d33095ee62779b14aeb6cdd8a8f0a8b5a6c8e81c94df132420b2
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0-r2.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0-r2.ebuild
deleted file mode 100644
index 1ef0b150ddc0..000000000000
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 )
-inherit ada multiprocessing python-single-r1
-
-DESCRIPTION="GNAT Component Collection"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="gmp iconv lzma openmp python readline +shared static-libs static-pic syslog"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	|| ( gmp iconv lzma openmp python readline syslog )
-	${PYTHON_REQUIRED_USE}
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	${ADA_DEPS}
-	dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	gmp? ( dev-libs/gmp:* )
-	lzma? ( app-arch/xz-utils )
-	openmp? ( dev-lang/gnat-gpl:=[openmp] )
-	"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-QA_EXECSTACK=usr/lib/gnatcoll_readline.*/libgnatcoll_readline.*
-
-PATCHES=( "${FILESDIR}"/${P}-py_3_11.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ada_pkg_setup
-}
-
-src_prepare() {
-	rm -r python || die
-	mv python3 python || die
-	default
-}
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
-			-XGNATCOLL_VERSION=${PV} \
-			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv lzma python readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-			if use openmp; then
-				build omp $lib
-			fi
-		fi
-	done
-}
-
-src_install() {
-	build () {
-		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XGNATCOLL_VERSION=${PV} --build-var=LIBRARY_TYPE \
-			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv lzma python readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-			if use openmp; then
-				build omp $lib
-			fi
-		fi
-	done
-	rm -rf "${D}"/usr/share/gpr/manifests
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-25.0.0.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-25.0.0.ebuild
new file mode 100644
index 000000000000..f3bc30e005e7
--- /dev/null
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-25.0.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+ADA_COMPAT=( gcc_13 gcc_14 )
+inherit ada multiprocessing python-single-r1
+
+DESCRIPTION="GNAT Component Collection"
+HOMEPAGE="https://github.com/AdaCore/gnatcoll-bindings/"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc gmp lzma openmp +shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${PYTHON_REQUIRED_USE}
+	${ADA_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	${ADA_DEPS}
+	dev-ada/gnatcoll-core:${SLOT}[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	gmp? ( dev-libs/gmp:* )
+	lzma? ( app-arch/xz-utils )
+	openmp? ( sys-devel/gcc:=[openmp] )
+	$(python_gen_cond_dep '
+		doc? (
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+		)
+	')"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+QA_EXECSTACK=usr/lib/gnatcoll_readline.*/libgnatcoll_readline.*
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_prepare() {
+	rm -r python || die
+	mv python3 python || die
+	default
+}
+
+src_compile() {
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v \
+			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
+			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
+			-XGNATCOLL_VERSION=${PV} \
+			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
+			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
+			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
+	}
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			build cpp $lib
+			build iconv $lib
+			use gmp && build gmp $lib
+			use lzma && build lzma $lib
+			use openmp && build omp $lib
+			build python $lib
+			build syslog $lib
+			build readline $lib
+			build zlib $lib
+		fi
+	done
+	if use doc; then
+		emake -C iconv/docs html
+		emake -C readline/docs html
+		emake -C syslog/docs html
+		mkdir html
+		mv iconv/docs/_build/html html/iconv || die
+		mv readline/docs/_build/html html/readline || die
+		mv syslog/docs/_build/html html/syslog || die
+	fi
+}
+
+src_install() {
+	build () {
+		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
+			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
+			-XGNATCOLL_VERSION=${PV} --build-var=LIBRARY_TYPE \
+			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
+	}
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			build cpp $lib
+			use gmp && build gmp $lib
+			build iconv $lib
+			use lzma && build lzma $lib
+			use openmp && build omp $lib
+			build python $lib
+			build syslog $lib
+			build readline $lib
+			use lzma && build lzma $lib
+			build zlib $lib
+		fi
+	done
+	rm -rf "${D}"/usr/share/gpr/manifests
+	use doc && HTML_DOCS=( html/* )
+	einstalldocs
+}
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index 0960d18c2e8b..4833ab1a8218 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1 +1,2 @@
 DIST gnatcoll-core-24.0.0.tar.gz 764526 BLAKE2B f96b24dcac2af84802244ed93570f0a922ab0901ecf871fa4995f4c24607cdbd8d91fc760acf35024fe41a066fb307442396cb8c125c74363e0c9276d114ab5a SHA512 1f1d470e7b74f238682f0938efe04c303c6bfca5a6b723eb789f5cb4bd33a199a9f2323626b8887758f01709ab1ba4d8045c56ce45f02e535babca4025662d9f
+DIST gnatcoll-core-25.0.0.tar.gz 7492612 BLAKE2B 6c9653b74d575b24a5433dc56214f9fd55d8dfce65921d2f3172521d3f2c542e34e09df99c224634bf87da6068cffd4f47fdf6ed68f2b913d355a9f6ebff1624 SHA512 efa19b9760bd16b402445d4932dfd28f087f9a09b91ec688c6976b7b83fe5986580b1871378ac024e9a712df8ee75963e5dc88629a72ee1ce76f1d1403b8e122
diff --git a/dev-ada/gnatcoll-core/files/gnatcoll-core-25.0.0-gentoo.patch b/dev-ada/gnatcoll-core/files/gnatcoll-core-25.0.0-gentoo.patch
new file mode 100644
index 000000000000..66862c6b600a
--- /dev/null
+++ b/dev-ada/gnatcoll-core/files/gnatcoll-core-25.0.0-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/projects/src/gnatcoll-projects.ads	2025-01-04 15:16:43.534598733 +0100
++++ b/projects/src/gnatcoll-projects.ads	2025-01-04 15:17:23.548103890 +0100
+@@ -2093,7 +2093,7 @@
+       Predefined_Source_Files : GNATCOLL.VFS.File_Array_Access;
+       --  The list of source files in Predefined_Source_Path
+ 
+-      Default_Gnatls : GNAT.Strings.String_Access := new String'("gnatls");
++      Default_Gnatls : GNAT.Strings.String_Access := new String'("@GNATLS@");
+       --  The default gnatls command to run.
+ 
+       Xrefs_Subdir : GNAT.Strings.String_Access;
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-25.0.0.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-25.0.0.ebuild
new file mode 100644
index 000000000000..0694b04c8e71
--- /dev/null
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-25.0.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+ADA_COMPAT=( gcc_13 gcc_14 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+inherit ada python-any-r1 multiprocessing
+
+DESCRIPTION="GNAT Component Collection Core packages"
+HOMEPAGE="https://github.com/AdaCore/gnatcoll-core/"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc minimal +projects +shared static-libs static-pic test"
+RESTRICT="test"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}
+	projects? ( !minimal )"
+
+RDEPEND="
+	projects? ( ~dev-ada/libgpr-${PV}:=[${ADA_USEDEP},shared?,static-libs?,static-pic?] )
+"
+BDEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]
+	$(python_gen_any_dep '
+		test? ( dev-ada/e3-testsuite[${PYTHON_USEDEP}] )
+		doc? (
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+		)
+	')"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+python_check_deps() {
+	if use test; then
+		python_has_version "dev-ada/e3-testsuite[${PYTHON_USEDEP}]" || return 1
+	fi;
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	if use doc || use test; then
+		python-any-r1_pkg_setup
+	fi
+	ada_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:@GNATLS@:${GNATLS}:g" \
+		projects/src/gnatcoll-projects.ads \
+		|| die
+	rm -r testsuite/tests/file_indexes || die
+	rm -r testsuite/tests/vfs/basic || die
+	rm -r testsuite/tests/os/fsutil/sync_trees/error || die
+	rm -r testsuite/tests/os/process/priority_unix || die
+}
+
+src_compile() {
+	export GPR_PROJECT_PATH=minimal:core
+	build() {
+		gprbuild -v -p -m -P$2/gnatcoll_$2.gpr -j$(makeopts_jobs) \
+			-XGNATCOLL_VERSION=$(ver_cut 1-2) -XLIBRARY_TYPE=$1 \
+			-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
+	}
+	buildAll () {
+		build $1 minimal
+		use minimal && return
+		build $1 core
+		use projects && build $1 projects
+	}
+	if use shared; then
+		buildAll relocatable
+	fi
+	if use static-libs; then
+		buildAll static
+	fi
+	if use static-pic; then
+		buildAll static-pic
+	fi
+	use doc && emake -C docs html
+}
+
+src_test() {
+	#To be run after installation
+	cd testsuite
+	./run-tests || die
+}
+
+src_install() {
+	export GPR_PROJECT_PATH=minimal:core
+	build() {
+		gprinstall -v -P$2/gnatcoll_$2.gpr -XGNATCOLL_VERSION=$(ver_cut 1-2) \
+			-p -f --prefix="${D}"/usr --sources-subdir=include/gnatcoll_$2 \
+			-XLIBRARY_TYPE=$1 --build-name=$1 --build-var=LIBRARY_TYPE || die
+	}
+	buildAll () {
+		build $1 minimal
+		use minimal && return
+		build $1 core
+		use projects && build $1 projects
+	}
+	if use shared; then
+		buildAll relocatable
+	fi
+	if use static-libs; then
+		buildAll static
+	fi
+	if use static-pic; then
+		buildAll static-pic
+	fi
+	insinto /usr/share/gpr
+	doins gnatcoll.gpr
+	use doc && HTML_DOCS=( docs/_build/html/* )
+	einstalldocs
+	rm -r "${D}"/usr/share/gpr/manifests
+}
diff --git a/dev-ada/gnatcoll-core/metadata.xml b/dev-ada/gnatcoll-core/metadata.xml
index 5cad23aa44ea..5cf893d36197 100644
--- a/dev-ada/gnatcoll-core/metadata.xml
+++ b/dev-ada/gnatcoll-core/metadata.xml
@@ -5,6 +5,7 @@
 		<email>ada@gentoo.org</email>
 	</maintainer>
 	<use>
+		<flag name="projects">Build gnatcoll_projects</flag>
 		<flag name="shared">Build shared library</flag>
 		<flag name="static-pic">Build static library with pic code</flag>
 	</use>
diff --git a/dev-ada/gnatmem/gnatmem-2021-r2.ebuild b/dev-ada/gnatmem/gnatmem-2021-r2.ebuild
deleted file mode 100644
index af90fdecbf3d..000000000000
--- a/dev-ada/gnatmem/gnatmem-2021-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 )
-inherit ada multiprocessing autotools
-
-MYP=${P}-${PV}0518-19F7B-src
-ID=3ddb98c0c8854dc7631bebd673ac7bc53038d4b7
-ADAMIRROR=https://community.download.adacore.com/v1
-
-DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
-
-S="${WORKDIR}"/${MYP}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]
-	sys-libs/binutils-libs:="
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2018-gentoo.patch
-)
-
-src_prepare() {
-	default
-	mv configure.in configure.ac
-	eautoreconf
-}
-
-src_compile() {
-	gprbuild -v -p -Pgnatmem.gpr -j$(makeopts_jobs) \
-		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
-		-largs ${LDFLAGS} \
-		|| die
-}
-
-src_install() {
-	dobin obj/gnatmem
-}
diff --git a/dev-ada/gnatmem/gnatmem-2021-r3.ebuild b/dev-ada/gnatmem/gnatmem-2021-r3.ebuild
new file mode 100644
index 000000000000..ea3255deeec0
--- /dev/null
+++ b/dev-ada/gnatmem/gnatmem-2021-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 gcc_14 )
+inherit ada multiprocessing autotools
+
+MYP=${P}-${PV}0518-19F7B-src
+ID=3ddb98c0c8854dc7631bebd673ac7bc53038d4b7
+ADAMIRROR=https://community.download.adacore.com/v1
+
+DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
+
+S="${WORKDIR}"/${MYP}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]
+	sys-libs/binutils-libs:="
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2018-gentoo.patch
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac
+	eautoreconf
+}
+
+src_compile() {
+	gprbuild -v -p -Pgnatmem.gpr -j$(makeopts_jobs) \
+		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
+		-largs ${LDFLAGS} \
+		|| die
+}
+
+src_install() {
+	dobin obj/gnatmem
+}
diff --git a/dev-ada/gpr/Manifest b/dev-ada/gpr/Manifest
index 426813aba4d8..de96638cdfc9 100644
--- a/dev-ada/gpr/Manifest
+++ b/dev-ada/gpr/Manifest
@@ -1,2 +1,2 @@
-DIST gpr-23.0.0.tar.gz 1005298 BLAKE2B 475ac5ad89a4d038dc8cdb953826f46e0f8f2bbf09a858366a634b5bacfc4b0282db4206cf5d113900dffd3c2ad9423b6c6e56de8058215a7946020c30dacc8b SHA512 f1cfd2c2162ffa984c62238a472438919c22a83b61e03c9234f6bc601c1d1e50981f52d024106ad5196dd83ee7686e864c8728c56d451be06baf96161afd8bcc
+DIST gpr2-with-gprconfig_kb-25.0.tgz 1772855 BLAKE2B f4bcde7f2ad951d00b7b03b2d49120c301836a2bc676de0c0f7c493573a03b15bc20a6fd7f8d3034a063f6227b47f54468efe14260de1bb52a1da6bc4d5b87d6 SHA512 70fe0fcf541f6d3d90a34cab1638bbc0283dcd765c000406e0cfb73bae1817b30ddfe73f3672247a97c6b6bfc41900bc96a4440ca0c660f9c2f7b9d3cc8f8dcf
 DIST gpr2-with-lkparser-24.0.tgz 2030278 BLAKE2B ae42fd876a08a654db2db919e6d777ba603d54d6db618e8b8dbdfcfd9313decad092e0a9feae09ca46ec324cd860eaffbb6fa670290d454414677ad7e4a61dc7 SHA512 eda3c693393763da31312733e2bc06e852b867a32b42da6afdddd623051a1d29f7243aabaef3ae50052b22686dce6db62d9823652ce516d79822e4215f4d87b1
diff --git a/dev-ada/gpr/gpr-23.0.0-r6.ebuild b/dev-ada/gpr/gpr-23.0.0-r6.ebuild
deleted file mode 100644
index d103fba9e4f2..000000000000
--- a/dev-ada/gpr/gpr-23.0.0-r6.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 )
-PYTHON_COMPAT=( python3_{9,10,11} )
-
-inherit python-any-r1 ada multiprocessing
-
-DESCRIPTION="LibGPR2 - Parser for GPR Project files"
-HOMEPAGE="https://github.com/AdaCore/gpr"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="${ADA_DEPS}
-	dev-ada/xmlada[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	dev-ada/gnatcoll-bindings[${ADA_USEDEP},shared?,static-libs?,static-pic?,iconv,gmp]
-"
-
-DEPEND="${RDEPEND}
-	dev-ada/gprconfig_kb[${ADA_USEDEP}]
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-ada/langkit[${PYTHON_USEDEP}]
-	')
-	dev-ada/libadalang
-"
-
-python_check_deps() {
-	python_has_version "dev-ada/langkit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	ada_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	emake ENABLE_SHARED=$(usex shared) setup
-}
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
-			-XGPR2_BUILD=release -XXMLADA_BUILD=$1 gpr2.gpr \
-			-largs ${LDFLAGS} \
-			-cargs ${ADAFLAGS} || die "gprbuild failed"
-	}
-	mkdir -p .build/kb || die
-	gprbuild -p -v -P src/kb/collect_kb.gpr -XKB_BUILD_DIR=.build/kb \
-		--relocate-build-tree -largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
-	.build/kb/collect_kb -o .build/kb/config.kb /usr/share/gprconfig || die
-	emake -C langkit setup DEST="${S}/.build/lkparser" PYTHONEXE=${PYTHON}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	if use static-libs; then
-		libtype='static'
-	elif use static-pic; then
-		libtype='static-pic'
-	elif use shared; then
-		libtype='relocatable'
-	fi
-
-	gprbuild -p -m -v -j$(makeopts_jobs) -XGPR2_BUILD=release \
-		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} gpr2-tools.gpr \
-		-largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
-	gprbuild -p -m -v -j$(makeopts_jobs) -XGPR2_BUILD=release \
-		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \
-		-XLANGKIT_SUPPORT_BUILD=${libtype} gpr2-name.gpr \
-		-largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
-}
-
-src_install() {
-	build () {
-		gprinstall -XLIBRARY_TYPE=$1 -f -p -v -XGPR2_BUILD=release \
-			--prefix="${D}/usr" -XXMLADA_BUILD=$1 \
-			--build-name=$1 --build-var=LIBRARY_TYPE \
-			--build-var=GPR2_LIBRARY_TYPE gpr2.gpr || die
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	gprinstall -p -f -v -XGPR2_BUILD=release --prefix="${D}/usr" \
-		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \
-		--build-name=${libtype} --mode=usage gpr2-tools.gpr || die
-	gprinstall -p -f -v -XGPR2_BUILD=release --prefix='${D}/usr' \
-		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \
-		-XLANGKIT_SUPPORT_BUILD=${libtype} --build-name=${libtype} \
-		--mode=usage gpr2-name.gpr || die
-
-	einstalldocs
-
-	rm "${D}"/usr/bin/gprclean || die
-	rm "${D}"/usr/bin/gprconfig || die
-	rm "${D}"/usr/bin/gprinstall || die
-	rm "${D}"/usr/bin/gprls || die
-}
diff --git a/dev-ada/gpr/gpr-24.0.0-r1.ebuild b/dev-ada/gpr/gpr-24.0.0-r1.ebuild
index a79a69b27ec9..07b25b79493f 100644
--- a/dev-ada/gpr/gpr-24.0.0-r1.ebuild
+++ b/dev-ada/gpr/gpr-24.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ REQUIRED_USE="|| ( shared static-libs static-pic )
 RDEPEND="${ADA_DEPS}
 	dev-ada/xmlada[${ADA_USEDEP},shared?,static-libs?,static-pic?]
 	dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	dev-ada/gnatcoll-bindings[${ADA_USEDEP},shared?,static-libs?,static-pic?,iconv,gmp]
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},shared?,static-libs?,static-pic?,iconv(+),gmp]
 "
 
 DEPEND="${RDEPEND}
diff --git a/dev-ada/gpr/gpr-25.0.0.ebuild b/dev-ada/gpr/gpr-25.0.0.ebuild
new file mode 100644
index 000000000000..c0d84d4ddf85
--- /dev/null
+++ b/dev-ada/gpr/gpr-25.0.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gcc_14 )
+
+inherit ada multiprocessing
+
+DESCRIPTION="LibGPR2 - Parser for GPR Project files"
+HOMEPAGE="https://github.com/AdaCore/gpr"
+SRC_URI="https://github.com/AdaCore/${PN}/releases/download/v${PV}/gpr2-with-gprconfig_kb-$(ver_cut 1-2).tgz"
+
+S="${WORKDIR}"/${PN}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}
+	dev-ada/xmlada[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	>=dev-ada/gnatcoll-core-25[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},shared?,static-libs?,static-pic?,iconv(+),gmp]
+"
+
+DEPEND="${RDEPEND}
+	dev-ada/gprconfig_kb[${ADA_USEDEP}]
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+src_prepare() {
+	default
+	cd testsuite/tests
+	rm -r \
+		autoconf callgraph-install c-closure check-has-value \
+		check-shared-lib-import configuration-file-error-handling \
+		custom_attr_no_pack disable_warnings display-version \
+		extending-add-body extending-interface-in-extended-project \
+		externals-in-configuration-project installed_asm_object \
+		invalid-project-2 kb-validation invalid-trace-file library-interfaces \
+		multi-unit-3 nested-case nested-externals no-naming-package-in-config \
+		parent-var-visible runtime-user-project self-project-attribute \
+		source_subdirs subdirs types-import unknown-var-config view_builder \
+		build_db_dag/actions_signature tooling/source_dirs || die
+	rm -r ali_parser/dependencies || die
+	cd tools
+	rm -r gprls/closure/base || die
+	rm -r gprls/closure/sal || dir
+	rm -r gprls/closure/short-subunit-names || die
+	rm -r gprls/closure/subunits || die
+	rm -r gprclean/remove-empty-build-directories || die
+	rm -r gprclean/no_build_dir_recursive || die
+	rm -r gprclean/output-dir-not-found-warnings-not-printed || die
+	rm -r gprinspect/text || die
+}
+
+src_compile() {
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
+			-XGPR2_BUILD=release -XXMLADA_BUILD=$1 gpr2.gpr \
+			-largs ${LDFLAGS} \
+			-cargs ${ADAFLAGS} || die "gprbuild failed"
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	if use static-libs; then
+		libtype='static'
+	elif use static-pic; then
+		libtype='static-pic'
+	elif use shared; then
+		libtype='relocatable'
+	fi
+
+	gprbuild -p -m -v -j$(makeopts_jobs) -aP . -XGPR2_BUILD=release \
+		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} tools/gpr2-tools.gpr \
+		-largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
+}
+
+src_test() {
+	cd testsuite
+	./testsuite.py |& grep -w FAIL && die
+}
+
+src_install() {
+	build () {
+		gprinstall -XLIBRARY_TYPE=$1 -f -p -v -XGPR2_BUILD=release \
+			--prefix="${D}/usr" -XXMLADA_BUILD=$1 \
+			--build-name=$1 --build-var=LIBRARY_TYPE \
+			--build-var=GPR2_LIBRARY_TYPE gpr2.gpr || die
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	gprinstall -p -f -v -aP . -XGPR2_BUILD=release --prefix="${D}/usr" \
+		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \
+		--build-name=${libtype} --mode=usage tools/gpr2-tools.gpr || die
+
+	einstalldocs
+
+	rm "${D}"/usr/bin/gprconfig || die
+	rm -r "${D}"/usr/share/gpr/manifests
+}
diff --git a/dev-ada/gprbuild/gprbuild-25.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-25.0.0-r1.ebuild
deleted file mode 100644
index 3c89c2ea8b48..000000000000
--- a/dev-ada/gprbuild/gprbuild-25.0.0-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 gcc_14 )
-
-inherit ada multiprocessing
-
-XMLADA=xmlada-${PV}
-
-DESCRIPTION="Multi-Language Management"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="
-	https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/AdaCore/xmlada/archive/refs/tags/v${PV}.tar.gz
-		-> ${XMLADA}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="${ADA_DEPS}
-	dev-ada/gprconfig_kb[${ADA_USEDEP}]"
-RDEPEND="${DEPEND}"
-BDEPEND="doc? ( dev-python/sphinx )"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-PATCHES=( "${FILESDIR}"/${PN}-22.0.0-gentoo.patch )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:@GNATBIND@:${GNATBIND}:g" \
-		src/gprlib.adb \
-		|| die
-	cd gpr/src || die
-	ln -s gpr-util-put_resource_usage__unix.adb \
-		gpr-util-put_resource_usage.adb
-}
-
-bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
-lib_progs="gprlib gprbind"
-
-src_compile() {
-	local xmlada_src="../${XMLADA}"
-	inc_flags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
-		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
-		-I${xmlada_src}/input_sources"
-
-	gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
-	for bin in ${bin_progs}; do
-		gnatmake -j$(makeopts_jobs) ${inc_flags} $ADAFLAGS ${bin}-main \
-			-o ${bin} -largs ${LDFLAGS} gpr_imports.o || die
-	done
-	for lib in $lib_progs; do
-		gnatmake -j$(makeopts_jobs) ${inc_flags} ${lib} $ADAFLAGS \
-			-largs ${LDFLAGS} gpr_imports.o || die
-	done
-	if use doc; then
-		emake -C doc txt
-		emake -C doc info
-		emake -C doc html
-		emake -C doc pdf
-	fi
-}
-
-src_install() {
-	dobin ${bin_progs}
-	exeinto /usr/libexec/gprbuild
-	doexe ${lib_progs}
-	insinto /usr/share/gpr
-	doins share/_default.gpr
-	local HTML_DOCS=
-	local DOCS=README.md
-	if use doc; then
-		DOCS+=" examples doc/txt/gprbuild_ug.txt doc/pdf/gprbuild_ug.pdf"
-		HTML_DOCS+="doc/html/*"
-		doinfo doc/info/gprbuild_ug.info
-	fi
-	einstalldocs
-}
diff --git a/dev-ada/gprbuild/gprbuild-25.0.0-r2.ebuild b/dev-ada/gprbuild/gprbuild-25.0.0-r2.ebuild
new file mode 100644
index 000000000000..e4b4ece9db50
--- /dev/null
+++ b/dev-ada/gprbuild/gprbuild-25.0.0-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 gcc_14 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+inherit ada python-any-r1 multiprocessing
+
+XMLADA=xmlada-${PV}
+
+DESCRIPTION="Multi-Language Management"
+HOMEPAGE="https://github.com/AdaCore/gprbuild"
+SRC_URI="
+	https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/AdaCore/xmlada/archive/refs/tags/v${PV}.tar.gz
+		-> ${XMLADA}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc"
+
+DEPEND="${ADA_DEPS}
+	dev-ada/gprconfig_kb[${ADA_USEDEP}]"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? (
+	$(python_gen_any_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	')
+)"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+PATCHES=( "${FILESDIR}"/${PN}-22.0.0-gentoo.patch )
+
+python_check_deps() {
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:@GNATBIND@:${GNATBIND}:g" \
+		src/gprlib.adb \
+		|| die
+	sed -i \
+		-e "s|\"gnatbind\"|\"gnatbind-${GCC_PV}\"|" \
+		src/gprbind.adb \
+		|| die
+	cd gpr/src || die
+	ln -s gpr-util-put_resource_usage__unix.adb \
+		gpr-util-put_resource_usage.adb
+}
+
+bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
+lib_progs="gprlib gprbind"
+
+src_compile() {
+	local xmlada_src="../${XMLADA}"
+	inc_flags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
+		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
+		-I${xmlada_src}/input_sources"
+
+	gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
+	for bin in ${bin_progs}; do
+		gnatmake -j$(makeopts_jobs) ${inc_flags} $ADAFLAGS ${bin}-main \
+			-o ${bin} -largs ${LDFLAGS} gpr_imports.o || die
+	done
+	for lib in $lib_progs; do
+		gnatmake -j$(makeopts_jobs) ${inc_flags} ${lib} $ADAFLAGS \
+			-largs ${LDFLAGS} gpr_imports.o || die
+	done
+	use doc && emake -C doc html
+}
+
+src_install() {
+	dobin ${bin_progs}
+	exeinto /usr/libexec/gprbuild
+	doexe ${lib_progs}
+	insinto /usr/share/gpr
+	doins share/_default.gpr
+	local DOCS=README.md
+	use doc && HTML_DOCS="doc/html/*"
+	einstalldocs
+}
diff --git a/dev-ada/gprconfig_kb/Manifest b/dev-ada/gprconfig_kb/Manifest
index a43f6babeb46..983450cc1dff 100644
--- a/dev-ada/gprconfig_kb/Manifest
+++ b/dev-ada/gprconfig_kb/Manifest
@@ -1,3 +1,2 @@
-DIST gprconfig_kb-23.0.0.tar.gz 42132 BLAKE2B ed39c8f199e0cd31dbd3b587bcf589d62befc29ab907c54d9bcbc08887239a5ce12bc22428631e32d8c69c0c6bdd01e4591d050f480ea461f4d8af0f1cc05288 SHA512 505b632ff744c8fbb75b72d0f406a88a2c675d5afead9f0f8ca282ae79ca4e38c174dfe424c4c4a55835a9ebdbc6d0a2f329592bd6dfb87d5493e8473a0b2376
 DIST gprconfig_kb-24.0.0.tar.gz 43010 BLAKE2B af246be2c5683655bf023e07b08539647d8a351f8f5d8eace77665980fca80855262028667a94b5d9ed9ebf2af16d061968822ef923505c7a4de6497baefa3d7 SHA512 1bd28b7eba57a8952635f3fb61e06278935c31ed196182e19e9e8c2ffa3edbccea5a9b97b3f5a3c820e7c3f5b6878d87f7b42d66a7f57e083d0b56cb91a6eb84
 DIST gprconfig_kb-25.0.0.tar.gz 44165 BLAKE2B e026f7f644dfd8ba4665fd22ef6cb5abcdb1013779a8119e1be3dc3313cca37af138e1a351f2fc8dd10780009d0d98e0ab60e73293ea508acbe4cd5a836bdb16 SHA512 afc1754efdf6e3cbff9752a182cd063f83965c6a13e53930a14f806a46e3cbfb0afed8f8e11b098986227f27a1a67b45d22369adaa39a5dc1f2a8cc494f789e8
diff --git a/dev-ada/gprconfig_kb/files/gprconfig_kb-23.0.0-gentoo.patch b/dev-ada/gprconfig_kb/files/gprconfig_kb-23.0.0-gentoo.patch
deleted file mode 100644
index 6808542199fa..000000000000
--- a/dev-ada/gprconfig_kb/files/gprconfig_kb-23.0.0-gentoo.patch
+++ /dev/null
@@ -1,138 +0,0 @@
---- a/db/compilers.xml	2019-06-01 21:29:57.611722804 +0200
-+++ b/db/compilers.xml	2019-06-01 21:42:56.000608601 +0200
-@@ -20,7 +20,7 @@
-   <!--    GCC 3.x & 4.x (not for GNAT Pro)-->
-   <compiler_description>
-     <name>GCC</name>
--    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-)?gcc(-\d+)?</executable>
-+    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-)?gcc-@VER@</executable>
-     <version>
-       <external>$EXEC -v</external>
-       <nogrep regexp="for GNAT Pro"></nogrep>
-@@ -173,18 +173,18 @@
-    -->
-   <compiler_description>
-     <name>GNAT</name>
--    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-qnx.*|.*-rtems.*)?gnatls</executable>
-+    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-qnx.*|.*-rtems.*)?gnatls-@VER@</executable>
-     <version>
--      <external>${PREFIX}gnatls -v --version</external>
-+      <external>${EXEC} -v --version</external>
-       <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
-     </version>
-     <languages>Ada</languages>
-     <variable name="gcc_version">
--      <external>${PREFIX}gcc -v</external>
-+      <external>${PREFIX}gcc-@VER@ -v</external>
-       <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
-     </variable>
-     <variable name="gcc_version_major">
--      <external>${PREFIX}gcc -v</external>
-+      <external>${PREFIX}gcc-@VER@ -v</external>
-       <grep regexp="^[-\w]*gcc \S+ (\d+)\.\d+\.\d+" group="1"></grep>
-     </variable>
-     <runtimes default="default,kernel,native">
-@@ -194,7 +194,7 @@
-        <directory group="2" >\.\./$TARGET/lib(32|64)?/gnat/(.*)/adalib/</directory>
-     </runtimes>
-     <target>
--      <external>${PREFIX}gcc -dumpmachine</external>
-+      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
-       <grep regexp="[^\r\n]+"></grep>
-     </target>
-   </compiler_description>
-@@ -245,7 +245,7 @@
-   <!--  Generic C compiler for LLVM  -->
-   <compiler_description>
-     <name>C_LLVM</name>
--    <executable>clang</executable>
-+    <executable>fake-clang</executable>
-     <version>
-       <external>clang --version</external>
- 
-@@ -475,7 +475,7 @@
-   <!-- LLVM Compiler -->
-   <compiler_description>
-     <name>LLVM</name>
--    <executable>clang</executable>
-+    <executable>fake-clang</executable>
-     <version>
-       <external>clang -v</external>
-       <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep>
---- a/db/gnat.xml	2019-06-01 21:53:53.383281607 +0200
-+++ b/db/gnat.xml	2019-06-01 21:57:08.414196529 +0200
-@@ -10,7 +10,7 @@
-    &filter_gnat;
-    <config>
-    package Compiler is
--      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc";
-+      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@";
-       for Language_Kind            ("Ada") use "unit_based";
-       for Dependency_Kind          ("Ada") use "ALI_File";
-       for Leading_Required_Switches        ("Ada") use
-@@ -27,6 +27,9 @@
-       for Objects_Path_File     ("Ada") use "ADA_PRJ_OBJECTS_FILE";
-       for Driver         ("Ada") use
-           "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
-+      for Switches ("Ada") use ("--gnatbind_path=${PREFIX(ada)}gnatbind-@VER@");
-+      for Required_Switches ("Ada") use
-+        Binder'Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
-    end Binder;
- 
-    for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
---- a/db/c.xml	2019-06-01 21:57:36.244755708 +0200
-+++ b/db/c.xml	2019-06-01 21:59:14.919191663 +0200
-@@ -25,7 +25,7 @@
-      </compilers>
-      <config>
-    package Compiler is
--      for Driver              ("C") use "${PATH(c)}${PREFIX(c)}gcc";
-+      for Driver              ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@";
-    end Compiler;
-      </config>
-    </configuration>
---- a/db/linker.xml	2021-12-21 22:36:01.054738486 +0100
-+++ b/db/linker.xml	2021-12-21 22:36:59.973738600 +0100
-@@ -128,9 +128,13 @@
-       <host name="^i686.*-linux.*$" />
-     </hosts>
-     <config>
--   for Object_Lister use ("nm", "-g");
-+   NM := External("NM", "nm");
-+   for Object_Lister use (NM, "-g");
-    for Object_Lister_Matcher use " [TDRB] (.*)";
- 
-+   LDFLAGS := External_As_List ("LDFLAGS", " ");
-+   for Leading_Library_Options use LDFLAGS;
-+
-    package Linker is
-       for Export_File_Format use "GNU";
-       for Export_File_Switch use "-Wl,--version-script=";
-@@ -917,7 +921,8 @@
-       <host name="^x86_64-.*linux.*" />
-     </hosts>
-     <config>
--   for Archive_Builder  use ("ar", "cr");
-+   AR := External("AR", "ar");
-+   for Archive_Builder  use (AR, "cr");
-    for Archive_Builder_Append_Option use ("q");
-    for Archive_Indexer  use ("ranlib");
-    for Archive_Suffix   use ".a";
-@@ -1274,7 +1279,7 @@
-     </targets>
-     <config>
-    for Library_Partial_Linker use
--     ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib")
-+     ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib")
-       &amp; GCC_No_Pie
-       &amp; ("-Wl,-r", "-o");
-     </config>
-@@ -1295,7 +1300,7 @@
-     </targets>
-     <config>
-    for Library_Partial_Linker use
--     ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib")
-+     ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib")
-       &amp; GCC_No_Pie
-       &amp; ("-Wl,-r", "-o");
-     </config>
diff --git a/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch b/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch
index be64afb433ef..c65cc6e1eab1 100644
--- a/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch
+++ b/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch
@@ -99,6 +99,45 @@
     package Linker is
        for Export_File_Format use "GNU";
        for Export_File_Switch use "-Wl,--version-script=";
+@@ -696,34 +696,19 @@
+   <configuration>
+     <!-- aarch64-linux - native compiler. -->
+     <targets>
+-      <target name="^aarch64-linux-gnu$" />
++      <target name="^aarch64(-unknown)-linux-gnu$" />
+     </targets>
+     <hosts>
+-      <host name="^aarch64-linux-gnu$" />
++      <host name="^aarch64(-unknown)-linux-gnu$" />
+     </hosts>
+     <config>
+-   for Archive_Builder  use ("ar", "cr");
++   AR := External("AR", "ar");
++   for Archive_Builder  use (AR, "cr");
+    for Archive_Builder_Append_Option use ("q");
+    for Archive_Indexer  use ("ranlib");
+    for Archive_Suffix   use ".a";
+     </config>
+   </configuration>
+-
+-  <configuration>
+-    <!-- aarch64-linux - cross compiler. -->
+-    <targets>
+-      <target name="^aarch64-.*linux-gnu$" />
+-    </targets>
+-    <hosts negate="true">
+-      <host name="^aarch64-linux-gnu$" />
+-    </hosts>
+-    <config>
+-   for Archive_Builder  use ("aarch64-linux-gnu-ar", "cr");
+-   for Archive_Builder_Append_Option use ("q");
+-   for Archive_Indexer  use ("aarch64-linux-gnu-ranlib");
+-   for Archive_Suffix   use ".a";
+-    </config>
+-  </configuration>
+ 
+   <configuration>
+     <targets>
 @@ -1022,7 +1026,8 @@
        <host name="^x86_64-.*linux.*" />
      </hosts>
@@ -127,3 +166,5 @@
        &amp; GCC_No_Pie
        &amp; ("-Wl,-r", "-o");
      </config>
+--- db/linker.xml.old	2025-01-04 23:22:02.343268592 +0100
++++ db/linker.xml	2025-01-04 23:24:11.562660779 +0100
diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r3.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r3.ebuild
deleted file mode 100644
index 5438b3d85e97..000000000000
--- a/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gnat_2021 gcc_12 )
-
-inherit ada
-
-DESCRIPTION="GPR configuration knowledge base"
-HOMEPAGE="https://www.adacore.com/"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:@VER@:${GCCPV}:g" \
-		db/compilers.xml \
-		db/gnat.xml \
-		db/c.xml \
-		db/linker.xml \
-		|| die
-}
-
-src_install() {
-	insinto /usr/share/gprconfig
-	doins db/*.xml
-	doins db/*.ent
-	einstalldocs
-}
diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild
index 1f327d97a90c..a7e89934ab37 100644
--- a/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild
+++ b/dev-ada/gprconfig_kb/gprconfig_kb-25.0.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 	-> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 REQUIRED_USE="${ADA_REQUIRED_USE}"
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
diff --git a/dev-ada/libgpr/libgpr-25.0.0.ebuild b/dev-ada/libgpr/libgpr-25.0.0.ebuild
index 84f50cfa36ba..d9cd45761682 100644
--- a/dev-ada/libgpr/libgpr-25.0.0.ebuild
+++ b/dev-ada/libgpr/libgpr-25.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 )
+ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 gcc_14 )
 inherit ada multiprocessing
 
 MYPN=gprbuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MYP}
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+shared static-libs static-pic"
 
 RDEPEND="dev-ada/xmlada:=[shared?,static-libs?,static-pic?,${ADA_USEDEP}]"
diff --git a/dev-ada/markdown/markdown-25.0.0.ebuild b/dev-ada/markdown/markdown-25.0.0.ebuild
index 74154640a54e..b65f0331dd69 100644
--- a/dev-ada/markdown/markdown-25.0.0.ebuild
+++ b/dev-ada/markdown/markdown-25.0.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ada/spawn/spawn-25.0.0.ebuild b/dev-ada/spawn/spawn-25.0.0.ebuild
index 023d363a4087..2d9d0e516a91 100644
--- a/dev-ada/spawn/spawn-25.0.0.ebuild
+++ b/dev-ada/spawn/spawn-25.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 )
+ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 gcc_14 )
 inherit ada multiprocessing
 
 DESCRIPTION="Simple API to spawn processes"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	${ADA_REQUIRED_USE}"
diff --git a/dev-ada/templates-parser/templates-parser-25.0.0-r1.ebuild b/dev-ada/templates-parser/templates-parser-25.0.0-r1.ebuild
deleted file mode 100644
index 1d01279f3846..000000000000
--- a/dev-ada/templates-parser/templates-parser-25.0.0-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gcc_12 gcc_13 )
-PYTHON_COMPAT=( python3_{10..13} python3_13t )
-inherit ada python-any-r1 multiprocessing
-
-DESCRIPTION="A template engine"
-HOMEPAGE="https://github.com/AdaCore/templates-parser"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc man +shared static-libs static-pic test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${ADA_DEPS}
-	dev-ada/xmlada[${ADA_USEDEP},shared?,static-libs?]
-	shared? ( dev-ada/xmlada[static-pic] )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-BDEPEND="doc? (
-	dev-tex/latexmk
-	dev-texlive/texlive-latexextra
-)
-man? (
-	dev-python/sphinx
-	dev-python/sphinx-rtd-theme
-)
-test? (
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-ada/e3-testsuite[${PYTHON_USEDEP}]
-	')
-	dev-ada/gnatmem
-)"
-
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}
-	doc? ( man )
-	test? ( static-libs )
-"
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-ada/e3-testsuite[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Drop tests that require TP_XMLADA
-	rm -r regtests/tests/010{7,9}* || die
-	default
-}
-
-src_configure() {
-	emake PROCESSORS=$(makeopts_jobs) \
-		ENABLE_STATIC=$(usex static-libs true false) \
-		ENABLE_SHARED=$(usex shared true false) \
-		prefix=/usr \
-		setup
-}
-
-src_compile() {
-	build() {
-		gprbuild -p -v -XPRJ_BUILD=Release -XPRJ_TARGET=Linux \
-			-XTP_XMLADA=Disabled -XPROCESSORS=$(makeopts_jobs) \
-			-XVERSION=$(ver_cut 1-2) -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
-			--subdirs=${CHOST}/release/$1 \
-			-Ptemplates_parser -largs ${LDFLAGS} -cargs ${ADAFLAGS} \
-			|| die "gprbuild failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	local lib
-	if use shared; then
-		lib=relocatable
-	elif use static-libs; then
-		lib=static
-	else
-		lib=static-pic
-	fi
-	gprbuild -p -v -XPRJ_BUILD=Release -XPRJ_TARGET=Linux \
-		-XTP_XMLADA=Disabled -XPROCESSORS=$(makeopts_jobs) \
-		-XVERSION=$(ver_cut 1-2) -XLIBRARY_TYPE=${lib} -XXMLADA_BUILD=${lib} \
-		--subdirs=${CHOST}/release/${lib} -Ptools/tools -largs ${LDFLAGS} \
-		-cargs ${ADAFLAGS} \
-		|| die "gprbuild failed"
-	if use man; then
-		emake -C docs man GPROPTS=-v
-	fi
-	if use doc; then
-		emake -C docs html epub latexpdf GPROPTS=-v
-	fi
-}
-
-src_install() {
-	build() {
-		gprinstall -XPRJ_BUILD=Release -XPRJ_TARGET=Linux \
-			-XTP_XMLADA=Disabled -XPROCESSORS=$(makeopts_jobs) \
-			-XVERSION=$(ver_cut 1-2) -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
-			-p -f --prefix="${D}"/usr --build-var=LIBRARY_TYPE \
-			--build-var=TEMPLATES_PARSER_BUILD --subdirs=${CHOST}/release/$1 \
-			--build-name=$1 -Ptemplates_parser \
-			|| die "gprinstall failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	local lib
-	if use shared; then
-		lib=relocatable
-	elif use static-libs; then
-		lib=static
-	else
-		lib=static-pic
-	fi
-	gprinstall -XPRJ_BUILD=Release -XPRJ_TARGET=Linux -XTP_XMLADA=Disabled \
-		-XPROCESSORS=$(makeopts_jobs) -XVERSION=$(ver_cut 1-2) \
-		-XLIBRARY_TYPE=${lib} -XXMLADA_BUILD=${lib} -p -f --prefix="${D}"/usr \
-		--build-var=LIBRARY_TYPE --build-var=TEMPLATES_PARSER_BUILD \
-		--mode=usage --subdirs=${CHOST}/release/${lib} \
-		--install-name=templates_parser -Ptools/tools \
-		|| die "gprinstall failed"
-	DOCS="README.md"
-	if use doc; then
-		mv "${D}"/usr/share/doc/templates_parser "${D}"/usr/share/doc/"${PF}" || die
-		DOCS+=" docs/build/epub/Templates_ParserTemplatesEngine.epub"
-	fi
-	einstalldocs
-	use man && doman docs/build/man/templates_parser.1
-	rm -r "${D}"/usr/share/gpr/manifests
-}
-
-src_test() {
-	emake -j1 test
-}
diff --git a/dev-ada/templates-parser/templates-parser-25.0.0-r2.ebuild b/dev-ada/templates-parser/templates-parser-25.0.0-r2.ebuild
new file mode 100644
index 000000000000..6fd9775b8876
--- /dev/null
+++ b/dev-ada/templates-parser/templates-parser-25.0.0-r2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gcc_12 gcc_13 gcc_14 )
+PYTHON_COMPAT=( python3_{10..13} python3_13t )
+inherit ada python-any-r1 multiprocessing
+
+DESCRIPTION="A template engine"
+HOMEPAGE="https://github.com/AdaCore/templates-parser"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc man +shared static-libs static-pic test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${ADA_DEPS}
+	dev-ada/xmlada[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+BDEPEND="doc? (
+	dev-tex/latexmk
+	dev-texlive/texlive-latexextra
+)
+man? (
+	dev-python/sphinx
+	dev-python/sphinx-rtd-theme
+)
+test? (
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-ada/e3-testsuite[${PYTHON_USEDEP}]
+	')
+	dev-ada/gnatmem
+)"
+
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}
+	doc? ( man )
+	test? ( static-libs )
+"
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-ada/e3-testsuite[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Drop tests that require TP_XMLADA
+	rm -r regtests/tests/010{7,9}* || die
+	default
+}
+
+src_configure() {
+	cp config/tp_xmlada_dummy.gpr tp_xmlada.gpr
+	echo "PRJ_TARGET = Linux" > makefile.setup
+	echo "VERSION = $(ver_cut 1-2)" >> makefile.setup
+}
+
+src_compile() {
+	build() {
+		gprbuild -p -v -XPRJ_BUILD=Release -XPRJ_TARGET=Linux \
+			-XTP_XMLADA=Disabled -XPROCESSORS=$(makeopts_jobs) \
+			-XVERSION=$(ver_cut 1-2) -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
+			--subdirs=${CHOST}/release/$1 \
+			-Ptemplates_parser -largs ${LDFLAGS} -cargs ${ADAFLAGS} \
+			|| die "gprbuild failed"
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	local lib
+	if use shared; then
+		lib=relocatable
+	elif use static-libs; then
+		lib=static
+	else
+		lib=static-pic
+	fi
+	gprbuild -p -v -XPRJ_BUILD=Release -XPRJ_TARGET=Linux \
+		-XTP_XMLADA=Disabled -XPROCESSORS=$(makeopts_jobs) \
+		-XVERSION=$(ver_cut 1-2) -XLIBRARY_TYPE=${lib} -XXMLADA_BUILD=${lib} \
+		--subdirs=${CHOST}/release/${lib} -Ptools/tools -largs ${LDFLAGS} \
+		-cargs ${ADAFLAGS} \
+		|| die "gprbuild failed"
+	if use man; then
+		emake -C docs man GPROPTS=-v
+	fi
+	if use doc; then
+		emake -C docs html epub latexpdf GPROPTS=-v
+	fi
+}
+
+src_install() {
+	build() {
+		gprinstall -XPRJ_BUILD=Release -XPRJ_TARGET=Linux \
+			-XTP_XMLADA=Disabled -XPROCESSORS=$(makeopts_jobs) \
+			-XVERSION=$(ver_cut 1-2) -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
+			-p -f --prefix="${D}"/usr --build-var=LIBRARY_TYPE \
+			--build-var=TEMPLATES_PARSER_BUILD --subdirs=${CHOST}/release/$1 \
+			--build-name=$1 -Ptemplates_parser \
+			|| die "gprinstall failed"
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	local lib
+	if use shared; then
+		lib=relocatable
+	elif use static-libs; then
+		lib=static
+	else
+		lib=static-pic
+	fi
+	gprinstall -XPRJ_BUILD=Release -XPRJ_TARGET=Linux -XTP_XMLADA=Disabled \
+		-XPROCESSORS=$(makeopts_jobs) -XVERSION=$(ver_cut 1-2) \
+		-XLIBRARY_TYPE=${lib} -XXMLADA_BUILD=${lib} -p -f --prefix="${D}"/usr \
+		--build-var=LIBRARY_TYPE --build-var=TEMPLATES_PARSER_BUILD \
+		--mode=usage --subdirs=${CHOST}/release/${lib} \
+		--install-name=templates_parser -Ptools/tools \
+		|| die "gprinstall failed"
+	DOCS="README.md"
+	if use doc; then
+		mv "${D}"/usr/share/doc/templates_parser "${D}"/usr/share/doc/"${PF}" || die
+		DOCS+=" docs/build/epub/Templates_ParserTemplatesEngine.epub"
+	fi
+	einstalldocs
+	use man && doman docs/build/man/templates_parser.1
+	rm -r "${D}"/usr/share/gpr/manifests
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/dev-ada/xmlada/xmlada-25.0.0-r1.ebuild b/dev-ada/xmlada/xmlada-25.0.0-r1.ebuild
deleted file mode 100644
index 814d5b7e55ea..000000000000
--- a/dev-ada/xmlada/xmlada-25.0.0-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 gcc_14 )
-inherit ada multiprocessing
-
-DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc man +shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}
-	doc? ( man )"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-BDEPEND="doc? (
-	dev-tex/latexmk
-	dev-texlive/texlive-latexextra
-)
-man? (
-	dev-python/sphinx
-	dev-python/sphinx-rtd-theme
-)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-23.0.0-gentoo.patch
-	"${FILESDIR}"/${PN}-24.0.0-gentoo.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s|@PF@|${PF}|g" \
-		input_sources/xmlada_input.gpr \
-		|| die
-}
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
-			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-			-largs ${LDFLAGS} \
-			-cargs ${ADAFLAGS} || die "gprbuild failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	if use doc; then
-		emake -C docs html
-		emake -C docs epub
-		emake -C docs latexpdf
-	fi
-	use man && emake -C docs man
-}
-
-src_test() {
-	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
-	gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=static \
-		-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-		-XTESTS_ACTIVATED=Only \
-		-largs ${LDFLAGS} \
-		-cargs ${ADAFLAGS} || die "gprbuild failed"
-	emake --no-print-directory -C tests tests | tee xmlada.testLog
-	grep -q DIFF xmlada.testLog && die
-	rm docs/*/b__* || die
-	rm docs/*/*ali || die
-	rm docs/*/*std* || die
-	rm docs/*/*bexch || die
-	rm docs/*/*.o || die
-	rm docs/*/*example || die
-	rm docs/dom/domexample2 || die
-	rm docs/sax/saxexample_main || die
-}
-
-src_install() {
-	build () {
-		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
-			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"/usr \
-			--install-name=xmlada --build-var=LIBRARY_TYPE \
-			--build-var=XMLADA_BUILD \
-			--build-name=$1 xmlada.gpr || die "gprinstall failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	DOCS="AUTHORS README.md TODO xmlada-roadmap.txt"
-	if use doc; then
-		DOCS+=" docs/_build/epub/XMLAdatheXMLLibraryforAda.epub"
-	fi
-	einstalldocs
-	use man && doman docs/_build/man/xmlada.1
-	rm -r "${D}"/usr/share/gpr/manifests
-}
diff --git a/dev-ada/xmlada/xmlada-25.0.0-r2.ebuild b/dev-ada/xmlada/xmlada-25.0.0-r2.ebuild
new file mode 100644
index 000000000000..7aae56bdf915
--- /dev/null
+++ b/dev-ada/xmlada/xmlada-25.0.0-r2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 gcc_14 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+inherit ada python-any-r1 multiprocessing
+
+DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
+HOMEPAGE="https://github.com/AdaCore/xmlada"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc +shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+BDEPEND="doc? (
+	$(python_gen_any_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+	')
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.0.0-gentoo.patch
+	"${FILESDIR}"/${PN}-24.0.0-gentoo.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s|@PF@|${PF}|g" \
+		input_sources/xmlada_input.gpr \
+		|| die
+}
+
+src_compile() {
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
+			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
+			-largs ${LDFLAGS} \
+			-cargs ${ADAFLAGS} || die "gprbuild failed"
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	use doc && emake -C docs html
+}
+
+src_test() {
+	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
+	gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=static \
+		-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
+		-XTESTS_ACTIVATED=Only \
+		-largs ${LDFLAGS} \
+		-cargs ${ADAFLAGS} || die "gprbuild failed"
+	emake --no-print-directory -C tests tests | tee xmlada.testLog
+	grep -q DIFF xmlada.testLog && die
+	rm docs/*/b__* || die
+	rm docs/*/*ali || die
+	rm docs/*/*std* || die
+	rm docs/*/*bexch || die
+	rm docs/*/*.o || die
+	rm docs/*/*example || die
+	rm docs/dom/domexample2 || die
+	rm docs/sax/saxexample_main || die
+}
+
+src_install() {
+	build () {
+		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
+			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"/usr \
+			--install-name=xmlada --build-var=LIBRARY_TYPE \
+			--build-var=XMLADA_BUILD \
+			--build-name=$1 xmlada.gpr || die "gprinstall failed"
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	einstalldocs
+	rm -r "${D}"/usr/share/gpr/manifests
+}
diff --git a/dev-build/bazel-buildtools/Manifest b/dev-build/bazel-buildtools/Manifest
index baea0fd76a00..5be018f4df64 100644
--- a/dev-build/bazel-buildtools/Manifest
+++ b/dev-build/bazel-buildtools/Manifest
@@ -1,2 +1,4 @@
 DIST bazel-buildtools-7.3.1-deps.tar.xz 3588840 BLAKE2B 9b0766803201b9bee5329865714b9ed798b06b32b77f3b80efbd31fe9cbe8f6397f9a29c9e0947b1609ae20a697bddb8c2db934c28609aa58bfd9cf343dab923 SHA512 136c1493f688b4b90d31a7f90c3c8e3e62cc26824dcf679d321a649c99638780fcd27771c31e21d6afc0272b249cbfdaf78a07fa2335c904c1f966da1ca0b561
 DIST bazel-buildtools-7.3.1.tar.gz 330909 BLAKE2B 15d3ce94411bbc33f166b15f94699ac4fee373ff29f7f8226800776845611f29b1e0557bb62441fa62540792b63f634062de376ba1587e7c91d0504d6a66424f SHA512 3c06bdf7b6bb7cbe9a9f455e31be16bf36b97769515c761bda2e11a39d4eb12d8e65e7ea051e58ad26b782a93fadb5dd8221c30f75cc96d5ddd3abadce7fdbe2
+DIST bazel-buildtools-8.0.0-deps.tar.xz 3587652 BLAKE2B d33d6136591c1e1835cb2de4b707e324a53034284fa54ff4beaddad90f2cc23b2f6d6a1cca9c856d0de38b32efd03a34affafaf7c1e4f97c6c6e23b44febab28 SHA512 d2ab670cd16667e4034ae3342aec00b1916739debaa9280f8efb4d7c8c482366014c7055201e96b4cb1a327b9d8141613ecb13bf44d5ed73f9002433b784febe
+DIST bazel-buildtools-8.0.0.tar.gz 332898 BLAKE2B 45a94e3bba1f0a4cc810f2e7f9b65cd11307e37f29b633936fc0f8661cf3439e8c25b79c011547e7f0394b141b21f7e565de1cd1d4b465fb901894238e701325 SHA512 3ff66b64001979e2b5fbb85dbb64b6452b1a0138ececcce0d3e3a29b9bf932346180fdff2f5f809073386d545721fc3a5b53e6bd106a05da2c1ab844e2daa436
diff --git a/dev-build/bazel-buildtools/bazel-buildtools-7.3.1.ebuild b/dev-build/bazel-buildtools/bazel-buildtools-7.3.1.ebuild
index 2231211bcc90..0cef290300be 100644
--- a/dev-build/bazel-buildtools/bazel-buildtools-7.3.1.ebuild
+++ b/dev-build/bazel-buildtools/bazel-buildtools-7.3.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
@@ -19,7 +19,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${APP_PN}-${PV}"
 
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 ~x86"
 fi
 
 SRC_URI+="
diff --git a/dev-build/bazel-buildtools/bazel-buildtools-8.0.0.ebuild b/dev-build/bazel-buildtools/bazel-buildtools-8.0.0.ebuild
new file mode 100644
index 000000000000..1f295e34f2cb
--- /dev/null
+++ b/dev-build/bazel-buildtools/bazel-buildtools-8.0.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+APP_PN="buildtools"
+
+inherit go-module
+
+DESCRIPTION="Tools for working with Google's Bazel BUILD files."
+HOMEPAGE="https://github.com/bazelbuild/buildtools/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/bazelbuild/${APP_PN}.git"
+else
+	SRC_URI="https://github.com/bazelbuild/${APP_PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${APP_PN}-${PV}"
+
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+SRC_URI+="
+	https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DOCS=( README.md WARNINGS.md )
+
+src_prepare() {
+	default
+
+	rm ./warn/docs/docs.go || die
+}
+
+src_compile() {
+	local -r go_ldopts="
+		-X main.buildScmRevision=v${PV}
+		-X main.buildVersion=${PV}
+	"
+	local -a -r go_buildopts=(
+		-ldflags "${go_ldopts}"
+		-o ./bin/
+	)
+	ego build "${go_buildopts[@]}" ./...
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe ./bin/{buildifier{,2},buildozer}
+	newexe ./bin/generatetables bazel-generatetables
+	newexe ./bin/unused_deps bazel-unused_deps
+
+	local app=""
+	for app in buildifier buildozer unused_deps ; do
+		newdoc "${S}/${app}/README.md" "${app}.md"
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	einfo 'The "generatetables" binary is installed as "bazel-generatetables"'
+	einfo 'and the "unused_deps" binary is installed as "bazel-unused_deps"'.
+}
diff --git a/dev-build/bmake/bmake-20241124.ebuild b/dev-build/bmake/bmake-20241124.ebuild
index 0c029b23710f..058ab1b7064a 100644
--- a/dev-build/bmake/bmake-20241124.ebuild
+++ b/dev-build/bmake/bmake-20241124.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 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
 
 # Skip failing test (sandbox and csh)
 PATCHES=(
diff --git a/dev-build/cmake/Manifest b/dev-build/cmake/Manifest
index 75afba869899..2c6be7db8d3a 100644
--- a/dev-build/cmake/Manifest
+++ b/dev-build/cmake/Manifest
@@ -13,3 +13,6 @@ DIST cmake-3.31.0-docs.tar.xz 562756 BLAKE2B ef1d145658fd197ea515f05fbbad54b213b
 DIST cmake-3.31.3-SHA-256.txt 1646 BLAKE2B ad01a76e00bb35a48b617ae343bf10ea4f64e5057c595715d22c086cd371775f6bebc70c763049d426dc85073c966b41a3fbc05155c912835d97252371c7efc4 SHA512 cd5b8c8ea2bdfcc19a0d34b8f2051f932fde931f89cb40b3111badc476e92def3724ac6867e90bba070ad288ef8f73da1eb00c76bd32509027b4cfa0c6c03e01
 DIST cmake-3.31.3-SHA-256.txt.asc 833 BLAKE2B 03b24dd074e8f518713b58d44394bff7b4d3c2150bb1204ae5ca37b2e06031b60a96e1494bc19d100e4da9be78f71b093f6e66ddd5190d30528a09b87084a4c6 SHA512 e4549a1680b7ecfb1801b3f09d1504df07f2d3d383f021e1ea007f3ec23e35eeb3494d05eff6bf100ef165ad0267a05595dcc550e85879d2dd2f17b5fbb59d9a
 DIST cmake-3.31.3.tar.gz 11708383 BLAKE2B ab2114133bb0821c236c5e742f5af6abce81b7efd4ab16cca74af9030aa0439f545a06d5fd407794733bff3728ed0419e81168382f43caa5abd4ca2bdba68cde SHA512 d7209c023ce7d45aa3fe4aee78271b89b3c4b1b71b183e978ba0b709255c8db0530d565e083e2dd881df3a18274d901930f70827614ee4df7bb6f4c7d50eae7e
+DIST cmake-3.31.4-SHA-256.txt 1646 BLAKE2B d9bcb6f0c0e47e9ae1e82082371fdc9d78c4207b0e85c465ff7c843fb6fd09072fbb36e0232d3bdae4238a33df6ef384c77077b7e5244dca15bdb4a8ad8c1d30 SHA512 cbaa3a5b48139d44c09e97f4c540e69988beab4fe0b9d70e0129e61ca9c42906a647fee48c703a0e066286b4afa99b98981922344250542b59c0510279b9a200
+DIST cmake-3.31.4-SHA-256.txt.asc 833 BLAKE2B 934ed510e0c8e5b49d5ae57bae1bc32cda5425b0d9a4f516fd452b9550b2b9ba43d5ac0dc09ad4ca6752cbbc88843965c19e3f12c461f3d4d2f5700e7d80fd0c SHA512 6d7e3f520828cadeb8d458f78cf317f3ee0106e46102d02dc31bcaa4d45a974f7a6447826856f5e60ad8d60f8b453c6f923e5b99f2ca72125aa722c741f305c5
+DIST cmake-3.31.4.tar.gz 11708192 BLAKE2B 7b51c138fdabec174de74319fa9cc5920973e96f46b8fa9859c95763180c3f29c8ba9401936afd23ccf72790bd0fa12c4236eff1c487e78898442c7dd0a295d6 SHA512 86fef54e3c60a2d050bad97968a76f9c2a663fbd0be433fe3ecbb3268e3ef8243dfcb52f0d7ba9d8b03341c142ee02b33d367dd56597e1af79f6efb553b9eb82
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/cmake/cmake-3.31.4-r1.ebuild b/dev-build/cmake/cmake-3.31.4-r1.ebuild
new file mode 100644
index 000000000000..ad9d99bf2b8b
--- /dev/null
+++ b/dev-build/cmake/cmake-3.31.4-r1.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${CMAKE_DOCS_PREBUILT:=1}
+
+CMAKE_DOCS_PREBUILT_DEV=sam
+CMAKE_DOCS_VERSION=$(ver_cut 1-2).0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+CMAKE_DOCS_USEFLAG="+doc"
+
+# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+# ... but seems fine as of 3.22.3?
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake flag-o-matic multiprocessing \
+	toolchain-funcs xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+if [[ ${PV} == *9999* ]] ; then
+	CMAKE_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
+	inherit git-r3
+else
+	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
+	fi
+
+	if [[ ${PV} != *_rc* ]] ; then
+		VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc
+		inherit verify-sig
+
+		SRC_URI+=" verify-sig? (
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
+			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"
+
+		BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20240902 )"
+	fi
+fi
+
+[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses test"
+RESTRICT="!test? ( test )"
+
+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? ( dev-qt/qtbase:6[gui,widgets] )
+	ncurses? ( sys-libs/ncurses:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND+="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+	test? ( app-arch/libarchive[zstd] )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# Prefix
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch
+	# Misc
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch
+	# Cuda
+	"${FILESDIR}/${PN}-3.30.3-cudahostld.patch"
+
+	# Upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+pkg_pretend() {
+	if [[ -z ${EPREFIX} ]] ; then
+		local file
+		local errant_files=()
+
+		# See bug #599684 and  bug #753581 (at least)
+		for file in /etc/arch-release /etc/redhat-release /etc/debian_version ; do
+			if [[ -e ${file} ]]; then
+				errant_files+=( "${file}" )
+			fi
+		done
+
+		# If errant files exist
+		if [[ ${#errant_files[@]} -gt 0 ]]; then
+			eerror "Errant files found!"
+			eerror "The presence of these files is known to confuse CMake's"
+			eerror "library path logic. Please (re)move these files:"
+
+			for file in "${errant_files[@]}"; do
+				eerror " mv ${file} ${file}.bak"
+			done
+
+			die "Stray files found in /etc/, see above message"
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then
+		default
+	else
+		cd "${DISTDIR}" || die
+
+		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
+		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
+		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
+
+		cd "${WORKDIR}" || die
+
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Disable Xcode hooks, bug #652134
+		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+			Source/CMakeLists.txt || die
+		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+			-e '/cmGlobalXCodeGenerator.h/d' \
+			Source/cmake.cxx || die
+		# Disable system integration, bug #933744
+		sed -i -e 's/__APPLE__/__DISABLED__/' \
+			Source/cmFindProgramCommand.cxx \
+			Source/CPack/cmCPackGeneratorFactory.cxx || die
+		sed -i -e 's/__MAC_OS_X_VERSION_MIN_REQUIRED/__DISABLED__/' \
+			Source/cmMachO.cxx || die
+		sed -i -e 's:CPack/cmCPack\(Bundle\|DragNDrop\|PKG\|ProductBuild\)Generator.cxx::' \
+			Source/CMakeLists.txt || die
+
+		# Disable isysroot usage with GCC, we've properly instructed
+		# where things are via GCC configuration and ldwrapper
+		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+			Modules/Platform/Apple-GNU-*.cmake || die
+		# Disable isysroot usage with clang as well
+		sed -i -e '/_SYSROOT_FLAG/d' \
+			Modules/Platform/Apple-Clang.cmake || die
+		# Don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
+		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmStandardLexer.h
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	## in theory we could handle these flags in src_configure, as we do in many other packages. But we *must*
+	## handle them as part of bootstrapping, sadly.
+
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	# ODR warnings, bug #858335
+	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
+	filter-lto
+
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMake_ENABLE_DEBUGGER=$(usex dap)
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+		-DBUILD_QtDialog=$(usex gui)
+	)
+
+	use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=6 )
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	# Excluded tests:
+	#    BootstrapTest: we actually bootstrap it every time so why test it?
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
+	local myctestargs=(
+		--output-on-failure
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
+	)
+
+	local -x QT_QPA_PLATFORM=offscreen
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	if use gui; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use gui; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-build/dolphin-plugins-makefileactions/Manifest b/dev-build/dolphin-plugins-makefileactions/Manifest
index 9f9e5c795e45..774bb947d928 100644
--- a/dev-build/dolphin-plugins-makefileactions/Manifest
+++ b/dev-build/dolphin-plugins-makefileactions/Manifest
@@ -1,2 +1,2 @@
 DIST dolphin-plugins-24.08.3.tar.xz 317540 BLAKE2B 54fa2e13be2cceb53b12b1edb2d6d7c1793f6ba2bbec67e9e00121b33683aa6bd4895392cbdf5aa7627958c6323984ae3db8b5bbf6b14faba86b13181e0a2614 SHA512 05da7ac7b3ebe085cf0808d8e1eba49372bfeb1488800f40c1d0b9025e743efede1200095a1e660c1d538b2cc1b19f0f717f3d0723043517859f5c2015f961ce
-DIST dolphin-plugins-24.12.0.tar.xz 319128 BLAKE2B c793b10b882029eb7b2b681f15220fa065c2f59e4a1aa35ecf6ebfee253c4bd68aaf32c6555a8e03dad0ec8de7fba824834f1c0cbcb88c0c702b731b3d9b78d8 SHA512 94b4f8cd785c380b915da0e4a8efb9521d3a8440246466e4903746a2eb44188f1ae8cf3b483ec901f70c49c60a391de7c09d567e9a1a905b4229378c2623ee42
+DIST dolphin-plugins-24.12.1.tar.xz 319152 BLAKE2B afb5d587e38d1fc24117a083eedc5d970ceeed93e0bbfe13fb991a85046224730c5a1490337ac82a04b613c216f1dd6be07de514c664c80e2e5a0f70bd7615cc SHA512 ebae4d9d363f6928eb89ceede74ca0cc3e0707f81fe782b07fb4d4e3c06bcb266f4981bc5f0374b76bf55b8e86d427bbab0a0fbf82552a288ab8ddb9916f5df9
diff --git a/dev-build/dolphin-plugins-makefileactions/dolphin-plugins-makefileactions-24.12.0.ebuild b/dev-build/dolphin-plugins-makefileactions/dolphin-plugins-makefileactions-24.12.0.ebuild
deleted file mode 100644
index f3c4f87c8cdd..000000000000
--- a/dev-build/dolphin-plugins-makefileactions/dolphin-plugins-makefileactions-24.12.0.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
-
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="makefileactions"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Dolphin plugin for Makefile targets integration"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent,gui,widgets]
-	>=kde-apps/dolphin-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/dolphin-plugins-subversion-24.08.2-r1
-	>=kde-apps/dolphin-plugins-common-${PV}
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-	# solid, qtdbus only required by mountiso
-	ecm_punt_qt_module DBus
-	ecm_punt_kf_module Solid
-	# kxmlgui, qtnetwork only required by dropbox
-	ecm_punt_qt_module Network
-	ecm_punt_kf_module XmlGui
-	# kcompletion, ktextwidgets only required by other plugins
-	ecm_punt_kf_module Completion
-	ecm_punt_kf_module TextWidgets
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_mountiso=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
diff --git a/dev-build/dolphin-plugins-makefileactions/dolphin-plugins-makefileactions-24.12.1.ebuild b/dev-build/dolphin-plugins-makefileactions/dolphin-plugins-makefileactions-24.12.1.ebuild
new file mode 100644
index 000000000000..c56c72b8f9ba
--- /dev/null
+++ b/dev-build/dolphin-plugins-makefileactions/dolphin-plugins-makefileactions-24.12.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="dolphin-plugins"
+MY_PLUGIN_NAME="makefileactions"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Dolphin plugin for Makefile targets integration"
+HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,gui,widgets]
+	>=kde-apps/dolphin-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/dolphin-plugins-subversion-24.08.2-r1
+	>=kde-apps/dolphin-plugins-common-${PV}
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+	# solid, qtdbus only required by mountiso
+	ecm_punt_qt_module DBus
+	ecm_punt_kf_module Solid
+	# kxmlgui, qtnetwork only required by dropbox
+	ecm_punt_qt_module Network
+	ecm_punt_kf_module XmlGui
+	# kcompletion, ktextwidgets only required by other plugins
+	ecm_punt_kf_module Completion
+	ecm_punt_kf_module TextWidgets
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_bazaar=OFF
+		-DBUILD_dropbox=OFF
+		-DBUILD_git=OFF
+		-DBUILD_hg=OFF
+		-DBUILD_mountiso=OFF
+		-DBUILD_svn=OFF
+	)
+	ecm_src_configure
+}
diff --git a/dev-build/gn/Manifest b/dev-build/gn/Manifest
index d5f7e87682bf..c9bdcd5d07e9 100644
--- a/dev-build/gn/Manifest
+++ b/dev-build/gn/Manifest
@@ -4,3 +4,4 @@ DIST gn-0.2154.tar.xz 746968 BLAKE2B 2d1b29e183d7ebb37bee322b3dff367a019c03ef9a7
 DIST gn-0.2157.tar.xz 747636 BLAKE2B 85080f87ef42416d242034ae68276263d9a0d5020fd78471fe1f8c41fd092cb66df23725062465fa54de019acf846660a4527a0e3759b55136450d1de8a2f65d SHA512 f51621dff061c5c265c997d4326d6429f3a5763ffa50f4644fb7b9e1fa9b787497f21209449413b97fe589ee3e5a90253938ed63a987c311028666ce89500fdc
 DIST gn-0.2165.tar.xz 748624 BLAKE2B 6c966fa5791c069bfd790926db7c986a8831f29819e8d7121fe9a30d4f870897064900479ecd620134f2549f30d888efc748da87b7246f12905c3c53ac4a0b7a SHA512 6d99c92e951595f6e0168fea20765d31605485dea4aeec1a0c5d225223f809da2b025f8e09523d5f4a607ffb9f30118503ee4d990cc31d174c6edf6bce384f87
 DIST gn-0.2200.tar.xz 753048 BLAKE2B 9c57e21a5cab2a5df92aee78baacb8260de0793689a3ac743428d16e5b48cdd48de0a81fa137947ed1be0b54e1751748777488d2ca68377baa1a0d02f27e9819 SHA512 bef69e706078617a4ec45cba978a4ba01a2a9b6ddc0bd91697fca2712529f030febf2d12dbb26a432c6ec43af249b708ec0800d01e059bc6ebc26069e0ef8a56
+DIST gn-0.2207.tar.xz 753460 BLAKE2B 2c3cbaf9fb80c1bef15601d7ef0470446e7343b3037bd43a1ae205fe99183664a5ea45585b3591d5fb16f42ba85b922219da1949cc5663f1862341833d6b4216 SHA512 fc45508f6f6a50f21951b107177b284859dccc846a57bb40a54da0039ca2698dc30bf3d36d8d6de57755c3e38d970a8acbefef8c09dd118d1172d62feb1d3673
diff --git a/dev-build/gn/gn-0.2207.ebuild b/dev-build/gn/gn-0.2207.ebuild
new file mode 100644
index 000000000000..bfa62d9e4b6e
--- /dev/null
+++ b/dev-build/gn/gn-0.2207.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2018-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit edo ninja-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
+HOMEPAGE="https://gn.googlesource.com/"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gn.googlesource.com/gn"
+else
+	# The version number is derived from `git describe HEAD --abbrev=12`
+	SRC_URI="https://deps.gentoo.zip/dev-build/gn/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	app-alternatives/ninja
+"
+
+PATCHES=(
+	"${FILESDIR}"/gn-gen-r7.patch
+)
+
+pkg_setup() {
+	:
+}
+
+src_configure() {
+	python_setup
+	tc-export AR CC CXX
+	unset CFLAGS
+	set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++ --allow-warnings
+	edo "$@"
+	cat >out/last_commit_position.h <<-EOF || die
+	#ifndef OUT_LAST_COMMIT_POSITION_H_
+	#define OUT_LAST_COMMIT_POSITION_H_
+	#define LAST_COMMIT_POSITION_NUM ${PV##0.}
+	#define LAST_COMMIT_POSITION "${PV}"
+	#endif  // OUT_LAST_COMMIT_POSITION_H_
+	EOF
+}
+
+src_compile() {
+	eninja -C out gn
+}
+
+src_test() {
+	eninja -C out gn_unittests
+	out/gn_unittests || die
+}
+
+src_install() {
+	dobin out/gn
+	einstalldocs
+
+	insinto /usr/share/vim/vimfiles
+	doins -r misc/vim/{autoload,ftdetect,ftplugin,syntax}
+}
diff --git a/dev-build/gtk-doc-am/Manifest b/dev-build/gtk-doc-am/Manifest
index a2c2e5e9f33e..0bd282af0262 100644
--- a/dev-build/gtk-doc-am/Manifest
+++ b/dev-build/gtk-doc-am/Manifest
@@ -1 +1,2 @@
 DIST gtk-doc-1.33.2.tar.xz 507852 BLAKE2B dea3030060ecec89433fe3783dfacc2f58373780c49560a48ab1a32bedfe888692183de8396c92414255e4c8f537358cbc373fd307638ab8e7dbfd9ae44de58f SHA512 f50f68ab6b4bc59f55e84b49c1481f05700171cbf79eca9ba8f3a142a30a4ba88fe096983ebb8d117a9ef8bcea40934674096683d956f5c54cae457d31f651ab
+DIST gtk-doc-1.34.0.tar.xz 494116 BLAKE2B cb8550debed9f32b967de9d4ebdde8dbe83551eb8527221d2d788355431f34e62a4beedda3e7f5722516ae8e23794a56b97a4f761ede0f7f2c0ef288624b5f7a SHA512 d962fe31949b5f7c70122c7ebbd98f4d21725697804bf5dd75fd7a6662753a91c9350fd1e8bed22a58a957b173f35e200fcbb4c7c2ebc45ccbc0db2e916b27ea
diff --git a/dev-build/gtk-doc-am/gtk-doc-am-1.34.0.ebuild b/dev-build/gtk-doc-am/gtk-doc-am-1.34.0.ebuild
new file mode 100644
index 000000000000..71fcc524406f
--- /dev/null
+++ b/dev-build/gtk-doc-am/gtk-doc-am-1.34.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="gtk-doc"
+
+inherit gnome.org
+
+DESCRIPTION="Automake files from gtk-doc"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gtk-doc"
+
+LICENSE="GPL-2+ FDL-1.1"
+SLOT="0"
+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"
+
+RDEPEND="!<dev-util/gtk-doc-${PV}"
+PDEPEND="virtual/pkgconfig"
+
+# This ebuild doesn't even compile anything, causing tests to fail when updating (bug #316071)
+RESTRICT="test"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins buildsystems/autotools/gtk-doc.m4
+}
diff --git a/dev-build/libtool/libtool-2.5.4.ebuild b/dev-build/libtool/libtool-2.5.4.ebuild
index 3924768b1ef6..b961823abd1d 100644
--- a/dev-build/libtool/libtool-2.5.4.ebuild
+++ b/dev-build/libtool/libtool-2.5.4.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
@@ -17,7 +17,7 @@ elif false && ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
 	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	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
 
 DESCRIPTION="A shared library tool for developers"
@@ -48,6 +48,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
 )
 
+# In 2.5.3/2.5.4, the only difference is something harmless in Makefile.in (bug #940302)
+QA_AM_MAINTAINER_MODE=".*libltdl.*autoconf"
+
 src_prepare() {
 	if [[ ${PV} == *9999 ]] ; then
 		eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch # bug #650876
diff --git a/dev-build/libtool/libtool-9999.ebuild b/dev-build/libtool/libtool-9999.ebuild
index fdaf9612ff8f..5d64db38aec6 100644
--- a/dev-build/libtool/libtool-9999.ebuild
+++ b/dev-build/libtool/libtool-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
@@ -48,6 +48,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
 )
 
+# In 2.5.3/2.5.4, the only difference is something harmless in Makefile.in (bug #940302)
+QA_AM_MAINTAINER_MODE=".*libltdl.*autoconf"
+
 src_prepare() {
 	if [[ ${PV} == *9999 ]] ; then
 		eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch # bug #650876
diff --git a/dev-build/melange/Manifest b/dev-build/melange/Manifest
index 4d87ed2c4d85..3b42f5ce4695 100644
--- a/dev-build/melange/Manifest
+++ b/dev-build/melange/Manifest
@@ -1,2 +1,2 @@
-DIST melange-0.8.1-deps.tar.xz 239749504 BLAKE2B feb4958b1c01226cefece8e746e8e83e5507bc7cc1feae8be0837971357993645fafffab505a249c96f01079a36cc5bd735d79a459fd81ebb88efb3cf3f85ffb SHA512 6df1448ad16995f31349a4a5c77d459501b99ec590483fab38ed08fd8aa6a425ef68ddddb5ddd8ff261ca37e2e41e40b63243806bd8d9d934d1bbded4cc0b35d
-DIST melange-0.8.1.tar.gz 1139855 BLAKE2B 46b18ddbff4044712db6df2c3d8195bc1cb714d686f0af4f3ad92907942e14296e01dad2b9a70bc9870ac727463faea779eb9d40b78923f93d7c1d653f85cd64 SHA512 55d4f94197b9b772daf629c6c24969ddb306e67ac4c0f07017e7d5a466863129ec984a8291c6fb33aded706f4deaa5c5432e1de81e67527ec8ce0f4e070a3218
+DIST melange-0.18.3-deps.tar.xz 424648416 BLAKE2B 2cf7e24f009e80bc774f70a99cd34776c0ab800d92434df3f555fc066603ae2fd2e83af9a0e6410d6c6bc6e509378285401b3d160295609de9c0af76dc91e8b8 SHA512 49d006dd4c8cd47a9e32e3be73270757f730878f2eabf64cdd71fec7cdb924daba73dcd3816760ed079de9bf91e444be04bdb6b4f287b74c1389df4e909c13d5
+DIST melange-0.18.3.tar.gz 1970781 BLAKE2B f646a0c0fe255ced2c2104b458a6b6983b0ea7c8b83f2a6fb65870d0104c91e7f9a8b37f1a0c85facdb8c292ea904a299e61fd4f699af474bdf534df44efbf6e SHA512 13f6e6bc86d49460572745506794abbe0a8ed071258c94e30f84c7b3739fbd6873a566871c28a503ef06593ebd6f2a7d7e1e82adafc0dea68f7ab2f40756e841
diff --git a/dev-build/melange/melange-0.18.3.ebuild b/dev-build/melange/melange-0.18.3.ebuild
new file mode 100644
index 000000000000..2656728e1d1f
--- /dev/null
+++ b/dev-build/melange/melange-0.18.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs go-module edo unpacker
+
+DESCRIPTION="Build APK packages from source code using declarative pipelines"
+HOMEPAGE="https://github.com/chainguard-dev/melange/"
+SRC_URI="
+	https://github.com/chainguard-dev/${PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"  # Does not work inside Portage sandbox.
+
+CHECKREQS_DISK_BUILD="1800M"
+
+DOCS=( NEWS.md README.md examples )
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_compile() {
+	local -a -r go_buildopts=(
+		-o ./
+	)
+	ego build "${go_buildopts[@]}"
+}
+
+src_test() {
+	local -a -r melange_opts=(
+		./pkg/sca/testdata/go-fips-bin/go-fips-bin.yaml
+		--arch="$(uname -m)"
+		--generate-index=false
+		--out-dir=pkg/sca/testdata/go-fips-bin/packages/
+		--source-dir=pkg/sca/testdata/go-fips-bin/
+	)
+	edo ./melange build "${melange_opts[@]}"
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe melange
+
+	einstalldocs
+	docompress -x "/usr/share/doc/${PF}/examples"
+}
diff --git a/dev-build/melange/melange-0.8.1.ebuild b/dev-build/melange/melange-0.8.1.ebuild
deleted file mode 100644
index 9f156703c547..000000000000
--- a/dev-build/melange/melange-0.8.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs go-module edo unpacker
-
-DESCRIPTION="Build APK packages from source code using declarative pipelines"
-HOMEPAGE="https://github.com/chainguard-dev/melange/"
-SRC_URI="
-	https://github.com/chainguard-dev/${PN}/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"                         # Does not work inside Portage sandbox.
-
-CHECKREQS_DISK_BUILD="1800M"
-
-DOCS=( NEWS.md README.md examples )
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_compile() {
-	local -a -r go_buildopts=(
-		-o ./
-	)
-	ego build "${go_buildopts[@]}"
-}
-
-src_test() {
-	local -a -r melange_opts=(
-		./pkg/sca/testdata/go-fips-bin/go-fips-bin.yaml
-		--arch="$(uname -m)"
-		--generate-index=false
-		--out-dir=pkg/sca/testdata/go-fips-bin/packages/
-		--source-dir=pkg/sca/testdata/go-fips-bin/
-	)
-	edo ./melange build "${melange_opts[@]}"
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe melange
-
-	einstalldocs
-	docompress -x "/usr/share/doc/${PF}/examples"
-}
diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index b7f37eb31478..507be16d5049 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -14,8 +14,11 @@ DIST meson-1.6.0.tar.gz 2277602 BLAKE2B c1d8f143b17fab90c6128a721ac45b9ed6b85d67
 DIST meson-1.6.0.tar.gz.asc 833 BLAKE2B 4cb8483a0b40330f71c86b9ede2dbccf2eb430138508983232924d70512100a36094974048783d814b9d83c11719f4be5a6541dc0eeaee3044048c38f28106c4 SHA512 4f1f47a5aafc8de8180a47303f2ea2d7dff1b792ee3e1dbf64bd96ea64b2a1696b664fb3ea4169b73c7a950f4371481c083f18ab11fdaf3bccf2b8671e40cd7d
 DIST meson-1.6.1.tar.gz 2276144 BLAKE2B 7ccdb3bf3f701fc787fabf91413db8301a8658b89e08c1d712711bd35845dc2468211e4b666cf46ad68ad9462e62b12b62d60c3767a2804f9b695b4390bb8235 SHA512 b4ca7a3b667db0ad370110abd8b20467b1c74ae7777a068db33f8974602c123881a7130b2340664abb52e36fe5195989a5cc8fa7de6212c37abf5b0900554425
 DIST meson-1.6.1.tar.gz.asc 833 BLAKE2B 6666eca8e5506b8692fc29ba66dc3ee9d725a7d720a7b43db720098f7e00671e71993586606c187d8314e3919474f5733d64a8d052be6552cbcf013a872905ab SHA512 543cf396de0a58998c3587aa05580fa9a56734db40b74fc5fbb22cd56124531804a5360d6b9acb9baa71753ac04c343364da4d78a0d366d8e8bc760030ebf8d3
+DIST meson-1.7.0rc1.tar.gz 2294319 BLAKE2B eb17bc0bd1bf5ba48ab973c3d093184524f3d0afdb14ed403026dc9dfef956abf1b1a8a434071ad4db02b1bcc0f636ffb504aed68e61f95fad7e92496d337504 SHA512 a4a410718fdb98452539b6ce6e6a8c5c5e96d8eaf08ab658ff5697f7ec70f5892da833562355d3e0f9975cfc13bb53153a4e75ff1ff31077439b4d522fce7197
+DIST meson-1.7.0rc1.tar.gz.asc 833 BLAKE2B 70b268d247a5340a94259ab6ab85f2f763c4668d585f220249d248108db7322ff01920ef855e8684271b0e41696df5245d0060f722b7bfae938ed96bcccc2c25 SHA512 e4bc1139a4d3895fe0f5d89ab95ff08428a054cb7e40c9209c323bc4e4017e13888c4eb52b8dfc60db3ffd1f9512fab78443a2821d3c96f1b81a4da06e7798af
 DIST meson-reference-1.4.2.3 339324 BLAKE2B 1a4fbd8c27a8cfba773777eabd2ebaa0f76ec0c61dcfe1c7b4483737b348ff9528d68f26e68d7d40b2e1875611eed5b9a31c1cf55fed8eabb42fc1e31d9ef14b SHA512 8b8ec43e812599203ec44c08805eb6818485805c45b9c69802261eaa35efc97846a96f6472c6b1ef5f6c703e7153fd957df7b805f173ca3400a2030dfbe002ca
 DIST meson-reference-1.5.1.3 341110 BLAKE2B 5267c2eea1b1281f87e63eb08aa928257dd98088b4d5c27c2785d2d8066c2c28536f7f56bf804ffe37d2f51552c91f31ff7e2729f3b2485d594a9e44a0df9ab1 SHA512 2d36e87e9bc2de0b958f4b20544b0bd9f2b0ffb646768e68fefcd5dfb8f09c24db40f27208b5f2d1f6ba02e7465f68a538ea72be118670c76e0959e090a42cf3
 DIST meson-reference-1.5.2.3 341110 BLAKE2B 0d588b796f7f2da2dcb0e7822acde6a9a461930da4bfead3cf9148fa0fac18cd0ccbc6e891f555c973836f1c16b4eae299908a838a0b6843293de8815d30fc23 SHA512 64715ce2113e362e7d67179fe13566bc8f84ce7f4e6d795b836f42455a871173fee06e3e969e2996022d7e6c9b4b5379587a4c0c3d97b4bca527fb8902d3547f
 DIST meson-reference-1.6.0.3 343730 BLAKE2B 18704b557298da2ea1f3edb4ed6c421bff3f973a215e56b340de2e78b1330e13eb00830cf44c3a8d04fd685ec6f8e6d078a4b9f03cf5b9e5413cbbfce55a22dd SHA512 2752b51dfa404ebae107f6579acca4268140aba8b1a672762fa4fa66819dc4449560313c5eb6c17433cc2cf273ce57d3d04b846bddf74902825b530de777f4ea
 DIST meson-reference-1.6.1.3 343730 BLAKE2B 55df822192781a70e4bc44cfe14fb363e3f820406260ca9705d7fdb5fad1bf0117e3f1325d37e58e23477bc075ab6bd84056409355ec694f72eeaa5bf982ecc7 SHA512 553cdcd86a7a600cda05ac970cc285c4c50017d1e7d2925645d7f19a62b34c2f079673cafecf4111aa102afbe9d8e4d56f166d1d9940b740eeec0bb99d6cbc0d
+DIST meson-reference-1.7.0rc1.3 344643 BLAKE2B a2615149175714f74d7ea1be426ce23475fa479d4f3ed4e9000b7bee46e15e7f1592d777334385d8858dedf3aa4256bcfaabf5f60150aa0854be6f67ad99ed59 SHA512 9834bbd7b35b1c3c2bfff7c46009f1e2dc6045c35ef07a3e105ad51c2fd48049f44cbbd48be6d68932cb66ee929a3ec6db7afec863720bd78da279b23ac457be
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-build/meson/meson-1.7.0_rc1.ebuild b/dev-build/meson/meson-1.7.0_rc1.ebuild
new file mode 100644
index 000000000000..7c4c5f96b87d
--- /dev/null
+++ b/dev-build/meson/meson-1.7.0_rc1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 2016-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit ninja-utils git-r3
+
+	BDEPEND="
+		${NINJA_DEPEND}
+		$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	"
+
+else
+	inherit verify-sig
+
+	MY_PV=${PV/_/}
+	MY_P=${P/_/}
+	S=${WORKDIR}/${MY_P}
+
+	SRC_URI="
+		https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz
+		verify-sig? ( https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc )
+		https://github.com/mesonbuild/meson/releases/download/${MY_PV}/meson-reference.3 -> meson-reference-${MY_PV}.3
+	"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )"
+	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"
+	fi
+fi
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		app-alternatives/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+RDEPEND="
+	!<dev-build/muon-0.2.0-r2[man(-)]
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
+)
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+}
+
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# clippy-driver fails, but only when run via portage.
+		#
+		#   error[E0463]: can't find crate for `std`
+		#   error: requires `sized` lang_item
+		-e 's/test_rust_clippy/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" unittests/*.py || die
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+	# nvcc breaks on essentially any LDFLAGS
+	# https://bugs.gentoo.org/936757
+	# https://github.com/mesonbuild/meson/issues/11234
+	rm -r "test cases/cuda"/* || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_check_deps() {
+	if [[ ${PV} = *9999* ]]; then
+		python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	fi
+}
+
+python_configure_all() {
+	if [[ ${PV} = *9999* ]]; then
+		# We use the unsafe_yaml loader because strictyaml is not packaged. In
+		# theory they produce the same results, but pyyaml is faster and
+		# without safety checks.
+		edo ./meson.py setup \
+			--prefix "${EPREFIX}/usr" \
+			-Dhtml=false \
+			-Dunsafe_yaml=true \
+			docs/ docs/builddir
+	fi
+}
+
+python_compile_all() {
+	if [[ ${PV} = *9999* ]]; then
+		eninja -C docs/builddir
+	fi
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# meson has its own tests for LTO support. We don't need to verify that
+		# all tests work when they happen to use it. And in particular, this
+		# breaks rust.
+		filter-lto
+
+		# remove unwanted python_wrapper_setup contents
+		# We actually do want to non-error if python2 is installed and tested.
+		remove="${T}/${EPYTHON}/bin:"
+		PATH=${PATH/${remove}/}
+
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		# 'test cases/unit/73 summary' expects 80 columns
+		export COLUMNS=80
+
+		# If JAVA_HOME is not set, meson looks for javac in PATH.
+		# If javac is in /usr/bin, meson assumes /usr/include is a valid
+		# JDK include path. Setting JAVA_HOME works around this broken
+		# autodetection. If no JDK is installed, we should end up with an empty
+		# value in JAVA_HOME, and the tests should get skipped.
+		export JAVA_HOME=$(java-config -O 2>/dev/null)
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+
+	dobashcomp data/shell-completions/bash/meson
+
+	if [[ ${PV} = *9999* ]]; then
+		DESTDIR="${ED}" eninja -C docs/builddir install
+	else
+		newman "${DISTDIR}"/meson-reference-${MY_PV}.3 meson-reference.3
+	fi
+}
diff --git a/dev-build/rocm-cmake/Manifest b/dev-build/rocm-cmake/Manifest
index 59bb1b627c2e..eee99317fcbc 100644
--- a/dev-build/rocm-cmake/Manifest
+++ b/dev-build/rocm-cmake/Manifest
@@ -1 +1,2 @@
 DIST rocm-cmake-6.1.2.tar.gz 86889 BLAKE2B 66e31b629171a5746eefd83e1ff14826a02f5d20a7b3125e20177bf801fa48526f541fcf9be0c832041a237799cd3d38a3daaec8f4dc17a5c048f7d603b7ef30 SHA512 9c83bd0b69a8bf040ddf9508df4ea8fb5daaaf8720f4b60ba3d6e4cc62b00a7dcfeead40cd37a6343b2173f9cf5db2e21f054661dcc2ac0591426e37ba61d3ba
+DIST rocm-cmake-6.3.0.tar.gz 88330 BLAKE2B f1b9f6d74dbaa237613bb69270da107a9c6fef72450f69a9f11c25e4912735b54a65c101131230a0d05edb5fd08c4a229b9701a1bbb5c5a53f516660d7710757 SHA512 051b4b2144df8c686c3c47cdba620d43cbc4aeda7b942ee82bb3dfa356f9a540f816cf41f6b8bfeb8004b4dc38cd60fddf1c566942eed63c25f29d5cf4751304
diff --git a/dev-build/rocm-cmake/rocm-cmake-6.3.0.ebuild b/dev-build/rocm-cmake/rocm-cmake-6.3.0.ebuild
new file mode 100644
index 000000000000..7d097ae7d18f
--- /dev/null
+++ b/dev-build/rocm-cmake/rocm-cmake-6.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/rocm-cmake.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ROCm/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm-cmake-rocm-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/ROCm/rocm-cmake"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+RESTRICT="test"
+
+DOCS=( CHANGELOG.md LICENSE README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-license.patch
+	"${FILESDIR}"/${PN}-6.1.1-no-rocmchecks-warnings.patch
+)
+
+src_prepare() {
+	sed -e "/CMAKE_INSTALL_LIBDIR/s:lib:$(get_libdir):" \
+		-i "share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake" \
+		-i "share/rocmcmakebuildtools/cmake/ROCMInstallTargets.cmake" || die
+	cmake_src_prepare
+}
diff --git a/dev-build/slibtool/Manifest b/dev-build/slibtool/Manifest
index ab8aee040fff..6294067e238d 100644
--- a/dev-build/slibtool/Manifest
+++ b/dev-build/slibtool/Manifest
@@ -1,2 +1,4 @@
 DIST slibtool-0.6.0.tar.xz 128216 BLAKE2B 9b21b73c1d911b11e280040fb8af076a80548b7361e11332b2e13a566e24b641b9a1ab4234b7addfa7405a560697eec39a4f7be4df073dba834223133b01628e SHA512 4615b139bd0f9c4735b7c6082e32e7954c96881f06960cd1aa375820fa0f07f720a43e667228a10b3af88db149a1a03f4e91a5a8ac08b16e3e5564709eec8f7d
 DIST slibtool-0.6.0.tar.xz.sig 833 BLAKE2B 7996dc6162d007036ce3a351dfd356dcd0202739448f6d3f9994e193dcd5d1889ef98df60c5a04650d00363741f7cd22f680f91aae9dca46e906d12bb7936dcd SHA512 f4c49d97ccc931ab20b1f51c914155ae7386c72e471329eaa4d544425e683febf78de2772544bbc55f21cdafc16f0ce226df7d47abe87ac5101525b306665a29
+DIST slibtool-0.6.1.tar.xz 129584 BLAKE2B 99c90f580a45d450c9c213519c761dbdca1dcac916cc85782e71f7214584c1232f8d183f8ebb8afe91e39b5244a9bf7386eb93082044297c07320dbca3ec5f11 SHA512 71c36243c3a8c3dc63304b07a64ba8c948b8ec463783a63426c74ea6a51702ddd9a52c2397948300db4ddaa0851ef8c7cca3cef6b4d185d2cbc47a45212bcfe8
+DIST slibtool-0.6.1.tar.xz.sig 833 BLAKE2B 135a34d295b2b8ceef3e41edfa0901b99026a503c025859d1364108bb8e12fe378d24bc77ae5c85f831c69c69cf005f1ea880e27d53538fc7cd5dd13641ba526 SHA512 82318cdfd15c8f103255b086921902ff3fcf01e4273fffeddf0515292644f0b677d4580be9810ffce85447b7a069a4c936e4bc42b346bd56f2bd755b38355ea6
diff --git a/dev-build/slibtool/slibtool-0.6.1.ebuild b/dev-build/slibtool/slibtool-0.6.1.ebuild
new file mode 100644
index 000000000000..ae8125471700
--- /dev/null
+++ b/dev-build/slibtool/slibtool-0.6.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+# git.foss21.org is the official repository per upstream
+DESCRIPTION="A strong libtool implementation, written in C"
+HOMEPAGE="https://git.foss21.org/slibtool"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.foss21.org/slibtool"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/midipix.asc
+	inherit verify-sig
+
+	SRC_URI="https://dl.midipix.org/slibtool/${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://dl.midipix.org/slibtool/${P}.tar.xz.sig )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+fi
+
+BDEPEND="sys-devel/m4"
+
+if [[ ${PV} != *9999 ]] ; then
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-midipix-20240315 )"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+	# Custom configure script (not generated by autoconf)
+	./configure \
+		--compiler="$(tc-getCC)" \
+		--host=${CHOST} \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+			|| die
+}
diff --git a/dev-cpp/asio/asio-1.30.2.ebuild b/dev-cpp/asio/asio-1.30.2.ebuild
index dcfb5fbe38d4..37a8be940612 100644
--- a/dev-cpp/asio/asio-1.30.2.ebuild
+++ b/dev-cpp/asio/asio-1.30.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
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/asio/asio/${P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index 9fa403401fa5..07551f9ed37d 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,2 +1,3 @@
 DIST benchmark-1.8.4.tar.gz 253916 BLAKE2B 78a290a5013d8371e87b7c918e518e3ec0e8247e25e211d160ab8dea51d8871d8dac54ee91ee0c512af86a60d1f4e9baedadc20d4a7fa28ef790411fda0399c8 SHA512 835d12b88fe52309ce6b2ffbc8b3c178ac594be7d249b5daca0373d1d03ec83ea3c7b94224f67f22d21919376985867eeff0d1c0721501cfd8a9e9b8a9c48882
 DIST benchmark-1.9.0.tar.gz 253961 BLAKE2B fdac0018435622e3ee2c1cde02c8140a15f2579b9059d1592b588033e6935bd8d54c874f4ea912696e8e1d5f7eebae30ba849f77cc3f74f006b4b03c712685ed SHA512 0e91e0e5a2222d7650fd8bd9cafb2f0e7c1689cd1b87b2cc529c738db12bfef31162aa5a4da78f7b0aa7f0101dc08b626802c58d39862458f82f9fea9316ca25
+DIST benchmark-1.9.1.tar.gz 255148 BLAKE2B 39b78afcb333c750960f476476b625d7f72b7cb787176deda1bd939d030e39b16fd008816c64447f7bb224983f2e80b047636f727a3d6d938f1b44dc25bddb55 SHA512 fc787d3d60a55abb3edaa575bf947c72e1ad1404a35bfddf585299411bcd04d32503bba563f9a36dccf128fce6261b97d460d6c293ed2c2d0807cf0154c86aa7
diff --git a/dev-cpp/benchmark/benchmark-1.8.4.ebuild b/dev-cpp/benchmark/benchmark-1.8.4.ebuild
index 3ba3a6651fab..b800d96f5d0f 100644
--- a/dev-cpp/benchmark/benchmark-1.8.4.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.8.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="debug doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/benchmark/benchmark-1.9.0.ebuild b/dev-cpp/benchmark/benchmark-1.9.0.ebuild
index 8340d18d7710..b20f08d030a7 100644
--- a/dev-cpp/benchmark/benchmark-1.9.0.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.9.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/google/benchmark/"
 SRC_URI="https://github.com/google/benchmark/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 IUSE="doc +exceptions libcxx libpfm lto test +tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-cpp/benchmark/benchmark-1.9.1.ebuild b/dev-cpp/benchmark/benchmark-1.9.1.ebuild
new file mode 100644
index 000000000000..267541f48e8b
--- /dev/null
+++ b/dev-cpp/benchmark/benchmark-1.9.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..12} )
+
+inherit cmake-multilib flag-o-matic python-single-r1
+
+DESCRIPTION="A microbenchmark support library"
+HOMEPAGE="https://github.com/google/benchmark/"
+SRC_URI="https://github.com/google/benchmark/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc debug libpfm test +tools"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	libpfm? ( dev-libs/libpfm:= )
+"
+RDEPEND="
+	${DEPEND}
+	tools? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+			>=dev-python/scipy-1.10.0[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+"
+BDEPEND="
+	doc? ( app-text/doxygen )
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.9.0-fix-documentation-installation.patch"
+	"${FILESDIR}/${P}-clock-detection-portability.patch"
+)
+
+pkg_setup() {
+	use tools && python-single-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# bug #943629
+	use debug || append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DBENCHMARK_ENABLE_DOXYGEN="$(usex doc)"
+		-DBENCHMARK_ENABLE_GTEST_TESTS="$(usex test)"
+		# Users should control this via *FLAGS
+		-DBENCHMARK_ENABLE_LTO=OFF
+		-DBENCHMARK_ENABLE_LIBPFM="$(multilib_native_usex libpfm)"
+		-DBENCHMARK_ENABLE_TESTING="$(usex test)"
+		-DBENCHMARK_ENABLE_WERROR=OFF
+		-DBENCHMARK_INSTALL_DOCS="$(usex doc)"
+		-DBENCHMARK_USE_BUNDLED_GTEST=OFF
+		# This is determined by profile.
+		-DBENCHMARK_USE_LIBCXX=OFF
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	CMAKE_SKIP_TESTS=(
+		# CMake already warns on these being brittle w/ diff
+		# compiler versions. Could do with investigation if bored
+		# but not critical. See bug #941538.
+		run_donotoptimize_assembly_test_CHECK
+		run_state_assembly_test_CHECK
+		run_clobber_memory_assembly_test_CHECK
+	)
+
+	cmake_src_test
+}
+
+multilib_src_install_all() {
+	dodoc CONTRIBUTING.md
+	dodoc CONTRIBUTORS
+
+	if use tools; then
+		python_domodule tools/gbench
+		python_doscript tools/compare.py
+		python_doscript tools/strip_asm.py
+	fi
+}
diff --git a/dev-cpp/benchmark/files/benchmark-1.9.1-clock-detection-portability.patch b/dev-cpp/benchmark/files/benchmark-1.9.1-clock-detection-portability.patch
new file mode 100644
index 000000000000..d9ecd9db56d2
--- /dev/null
+++ b/dev-cpp/benchmark/files/benchmark-1.9.1-clock-detection-portability.patch
@@ -0,0 +1,205 @@
+https://github.com/google/benchmark/commit/f65741b2bd92461dc2c816056eb9c996ae48ad62
+https://github.com/google/benchmark/commit/077db43001b42af3ad23e993b2bdcb4fadb7bcf8
+https://github.com/google/benchmark/commit/39be87d3004ff9ff4cdf736651af80c3d15e2497
+https://github.com/google/benchmark/commit/c24774dc4f4402c3ad150363321cc972ed2669e7
+
+From f65741b2bd92461dc2c816056eb9c996ae48ad62 Mon Sep 17 00:00:00 2001
+From: Helge Deller <deller@gmx.de>
+Date: Wed, 8 Jan 2025 13:03:53 +0100
+Subject: [PATCH] cycleclock: Support for PA-RISC (hppa) architecture (#1894)
+
+Co-authored-by: dominic <510002+dmah42@users.noreply.github.com>
+---
+ src/cycleclock.h | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/cycleclock.h b/src/cycleclock.h
+index bd62f5d7e7..7852f3df52 100644
+--- a/src/cycleclock.h
++++ b/src/cycleclock.h
+@@ -229,6 +229,16 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() {
+   struct timeval tv;
+   gettimeofday(&tv, nullptr);
+   return static_cast<int64_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
++#elif defined(__hppa__)
++  // HP PA-RISC provides a user-readable clock counter (cr16), but
++  // it's not syncronized across CPUs and only 32-bit wide when programs
++  // are built as 32-bit binaries.
++  // Use clock_gettime(CLOCK_MONOTONIC, ...) instead of gettimeofday
++  // because is provides nanosecond resolution.
++  // Initialize to always return 0 if clock_gettime fails.
++  struct timespec ts = {0, 0};
++  clock_gettime(CLOCK_MONOTONIC, &ts);
++  return static_cast<int64_t>(ts.tv_sec) * 1000000000 + ts.tv_nsec;
+ #else
+   // The soft failover to a generic implementation is automatic only for ARM.
+   // For other platforms the developer is expected to make an attempt to create
+
+From 077db43001b42af3ad23e993b2bdcb4fadb7bcf8 Mon Sep 17 00:00:00 2001
+From: Helge Deller <deller@gmx.de>
+Date: Wed, 8 Jan 2025 17:54:08 +0100
+Subject: [PATCH] cycleclock: Use cock_gettime() as fallback for any Linux
+ architecture (#1899)
+
+The Linux kernel provides the clock_gettime() functions since a long
+time already, so it's possible to use it as a generic fallback option
+for any architecture if no other (better) possibility has been provided
+instead.
+
+I noticed the benchmark package failed to build on debian on the SH-4
+architecture, so with this change SH-4 is now the first user of this
+fallback option.
+---
+ src/cycleclock.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/cycleclock.h b/src/cycleclock.h
+index 7852f3df5..03e02f805 100644
+--- a/src/cycleclock.h
++++ b/src/cycleclock.h
+@@ -229,10 +229,12 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() {
+   struct timeval tv;
+   gettimeofday(&tv, nullptr);
+   return static_cast<int64_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
+-#elif defined(__hppa__)
++#elif defined(__hppa__) || defined(__linux__)
++  // Fallback for all other architectures with a recent Linux kernel, e.g.:
+   // HP PA-RISC provides a user-readable clock counter (cr16), but
+   // it's not syncronized across CPUs and only 32-bit wide when programs
+   // are built as 32-bit binaries.
++  // Same for SH-4 and possibly others.
+   // Use clock_gettime(CLOCK_MONOTONIC, ...) instead of gettimeofday
+   // because is provides nanosecond resolution.
+   // Initialize to always return 0 if clock_gettime fails.
+From 39be87d3004ff9ff4cdf736651af80c3d15e2497 Mon Sep 17 00:00:00 2001
+From: Helge Deller <deller@gmx.de>
+Date: Thu, 9 Jan 2025 11:47:29 +0100
+Subject: [PATCH] Fix runtime crash when parsing /proc/cpuinfo fails (#1900)
+
+The testcase fails on sparc64, because the parsing of /proc/cpuinfo
+fails and thus currently returns "0" CPUs which finally leads
+to division-by-zero faults in the tests.
+
+Fix the issue by returning at least "1" CPU which allows the
+tests to run. A error message will be printed in any case.
+
+Long-term the code should be fixed to parse the cpuinfo output
+on sparch which looks like this:
+...
+type            : sun4v
+ncpus probed    : 48
+ncpus active    : 48
+---
+ src/sysinfo.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/sysinfo.cc b/src/sysinfo.cc
+index 49bff75e5..ce14b8d8e 100644
+--- a/src/sysinfo.cc
++++ b/src/sysinfo.cc
+@@ -561,10 +561,12 @@ int GetNumCPUsImpl() {
+ }
+ 
+ int GetNumCPUs() {
+-  const int num_cpus = GetNumCPUsImpl();
++  int num_cpus = GetNumCPUsImpl();
+   if (num_cpus < 1) {
+     std::cerr << "Unable to extract number of CPUs.  If your platform uses "
+                  "/proc/cpuinfo, custom support may need to be added.\n";
++    /* There is at least one CPU which we run on. */
++    num_cpus = 1;
+   }
+   return num_cpus;
+ }
+From c24774dc4f4402c3ad150363321cc972ed2669e7 Mon Sep 17 00:00:00 2001
+From: Helge Deller <deller@gmx.de>
+Date: Thu, 9 Jan 2025 17:07:43 +0100
+Subject: [PATCH] Get number of CPUs with sysconf() on Linux (#1901)
+
+* Get number of CPUs with sysconf() on Linux
+
+Avoid parsing the /proc/cpuinfo just to get number of CPUs.
+Instead use the portable function provided by glibc.
+
+* Update sysinfo.cc
+---
+ src/sysinfo.cc | 54 +++-----------------------------------------------
+ 1 file changed, 3 insertions(+), 51 deletions(-)
+
+diff --git a/src/sysinfo.cc b/src/sysinfo.cc
+index ce14b8d8e..eddd430e6 100644
+--- a/src/sysinfo.cc
++++ b/src/sysinfo.cc
+@@ -492,14 +492,14 @@ int GetNumCPUsImpl() {
+   GetSystemInfo(&sysinfo);
+   // number of logical processors in the current group
+   return static_cast<int>(sysinfo.dwNumberOfProcessors);
+-#elif defined(BENCHMARK_OS_SOLARIS)
++#elif defined(__linux__) || defined(BENCHMARK_OS_SOLARIS)
+   // Returns -1 in case of a failure.
+-  long num_cpu = sysconf(_SC_NPROCESSORS_ONLN);
++  int num_cpu = static_cast<int>(sysconf(_SC_NPROCESSORS_ONLN));
+   if (num_cpu < 0) {
+     PrintErrorAndDie("sysconf(_SC_NPROCESSORS_ONLN) failed with error: ",
+                      strerror(errno));
+   }
+-  return (int)num_cpu;
++  return num_cpu;
+ #elif defined(BENCHMARK_OS_QNX)
+   return static_cast<int>(_syspage_ptr->num_cpu);
+ #elif defined(BENCHMARK_OS_QURT)
+@@ -508,54 +508,6 @@ int GetNumCPUsImpl() {
+     hardware_threads.max_hthreads = 1;
+   }
+   return hardware_threads.max_hthreads;
+-#else
+-  int num_cpus = 0;
+-  int max_id = -1;
+-  std::ifstream f("/proc/cpuinfo");
+-  if (!f.is_open()) {
+-    std::cerr << "Failed to open /proc/cpuinfo\n";
+-    return -1;
+-  }
+-#if defined(__alpha__)
+-  const std::string Key = "cpus detected";
+-#else
+-  const std::string Key = "processor";
+-#endif
+-  std::string ln;
+-  while (std::getline(f, ln)) {
+-    if (ln.empty()) continue;
+-    std::size_t split_idx = ln.find(':');
+-    std::string value;
+-#if defined(__s390__)
+-    // s390 has another format in /proc/cpuinfo
+-    // it needs to be parsed differently
+-    if (split_idx != std::string::npos)
+-      value = ln.substr(Key.size() + 1, split_idx - Key.size() - 1);
+-#else
+-    if (split_idx != std::string::npos) value = ln.substr(split_idx + 1);
+-#endif
+-    if (ln.size() >= Key.size() && ln.compare(0, Key.size(), Key) == 0) {
+-      num_cpus++;
+-      if (!value.empty()) {
+-        const int cur_id = benchmark::stoi(value);
+-        max_id = std::max(cur_id, max_id);
+-      }
+-    }
+-  }
+-  if (f.bad()) {
+-    PrintErrorAndDie("Failure reading /proc/cpuinfo");
+-  }
+-  if (!f.eof()) {
+-    PrintErrorAndDie("Failed to read to end of /proc/cpuinfo");
+-  }
+-  f.close();
+-
+-  if ((max_id + 1) != num_cpus) {
+-    fprintf(stderr,
+-            "CPU ID assignments in /proc/cpuinfo seem messed up."
+-            " This is usually caused by a bad BIOS.\n");
+-  }
+-  return num_cpus;
+ #endif
+   BENCHMARK_UNREACHABLE();
+ }
diff --git a/dev-cpp/clhpp/Manifest b/dev-cpp/clhpp/Manifest
index 7aa4a2629a49..7d2c3b85e8e5 100644
--- a/dev-cpp/clhpp/Manifest
+++ b/dev-cpp/clhpp/Manifest
@@ -1 +1,2 @@
 DIST clhpp-2024.05.08.tar.gz 124818 BLAKE2B 57b22e1911d8e21b4f7bef1f39f9910dd80eb50844dc7c18b3c75e311991a37577a0671d9e1b10ff3fb3302568118e3fb69987beec6fbe8fc8da85fcd7addda0 SHA512 6396cd67a2edef6a76695857e3e45f7eeb8cdaa8c729197357c6374ac58b41caa37bbe8c3b7a1724d43d3805f8cd5edd53a8ed833d6415bf072745800b744572
+DIST clhpp-2024.10.24.tar.gz 132695 BLAKE2B 8f608db559771814b058d97f8cbbba8e89053ae062bd9ba228fbe0614a9ad56dd25a92acfcf2cb3f5dd5a3ae0800ff8526618aaa2842038c1eeafd9c452c0942 SHA512 7cdadc8ef182d1556346bd34b5a9ffe6e239ab61ec527e5609d69e1bcaf81a88f3fc534f5bdeed037236e1b0e61f1544d2a95c06df55f9cd8e03e13baf4143ba
diff --git a/dev-cpp/clhpp/clhpp-2024.10.24.ebuild b/dev-cpp/clhpp/clhpp-2024.10.24.ebuild
new file mode 100644
index 000000000000..459c14c9ca7d
--- /dev/null
+++ b/dev-cpp/clhpp/clhpp-2024.10.24.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="OpenCL-CLHPP"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Khronos OpenCL C++ bindings"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-CLHPP/"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Khronos-CLHPP"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Tests require CMock (NOT cmocka), which is currently not in Gentoo
+# and has been found to be extremely awkward to package.
+# Should it ever get packaged, consult git history for how to set things up
+# for the clhpp test suite.
+RESTRICT="test"
+
+RDEPEND="virtual/opencl"
+DEPEND="${RDEPEND}
+	>=dev-util/opencl-headers-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCS=OFF
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_TESTING=OFF
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/cppgir/Manifest b/dev-cpp/cppgir/Manifest
index e90bfe4fa86e..49a377a5abab 100644
--- a/dev-cpp/cppgir/Manifest
+++ b/dev-cpp/cppgir/Manifest
@@ -1,4 +1 @@
-DIST cppgir-0_p20230926.tar.bz2 102421 BLAKE2B f0b1ac871e7fc662c5c2aeb24cb8cb4f8570ae832f4ac6afdadb3c811f4ebc91862f8571133dfb9314fa994449b4d7cc4344f7a8a2aabcaa395d793bc4ca3655 SHA512 67778c6dec24a9afd848241c768af9fd3c9098e00ba168ebe5d776f3b5086b2489c38247a6441c99f7971dd53315e2758fe38c21fced44d857dc064e66f50731
-DIST cppgir-0_p20240110.tar.bz2 130503 BLAKE2B 8bfca0abb6c17101dff4993f19b422454a90fa1e5211beaebf4084885339d96e383efa3573ff5acf484d868ddfbf9b03210a1e15e2631f550662aa07c715c791 SHA512 3c8ca818094693c72d9f38c715b2392a4491abd4692bc2ba77e4c37ba12b0596a74d8c918c8139e2a97e42fa2af92dbe9207dea3bccef19822caf4b164e60334
-DIST cppgir-2.0_p20240315.tar.bz2 135008 BLAKE2B ebd304fe08ec9c203b9bfad1e63f3c0878ea9894487d10b0f5f47dfd41c826c5231cb91c1026b2a203e94bb3b017055c42264623ea6534e7eb78c99357308323 SHA512 e2fe3a042189e190a84c9c62ae5f44f2495a61e77e776b7862d8d673c2d94fe6968fa7f03f68291475cc1f00c46dd6f58d10fd2e6e2fdfab96479ef528937775
 DIST cppgir-2.0_p20240928.tar.bz2 137200 BLAKE2B 8841b721120add8f75516d63217ffa1c293d7ffba7599353f8cb34400ebb0984224e49f434498bbe879a9864697b5e85fc7908a7977fd6c4874111daec5af72c SHA512 b2e0cf180b9ebe527d90c81cb4587282c71848fe6e54dee24d5fc88643adfd9915f63fa43f45f45177459d05a1f7deaa414caf0d41378849db968c8bfbd4e24c
diff --git a/dev-cpp/cppgir/cppgir-0_p20230926.ebuild b/dev-cpp/cppgir/cppgir-0_p20230926.ebuild
deleted file mode 100644
index 4dad70fb4990..000000000000
--- a/dev-cpp/cppgir/cppgir-0_p20230926.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="GObject-Introspection C++ binding wrapper generator"
-HOMEPAGE="https://gitlab.com/mnauw/cppgir"
-
-MY_PV="4c16bffe646af52b7112785cda8112d761f95860"
-SRC_URI="https://gitlab.com/mnauw/cppgir/-/archive/${MY_PV}/cppgir-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/libfmt:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/expected-lite
-"
-BDEPEND="
-	doc? ( app-text/ronn-ng )
-	test? ( dev-libs/glib )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOC=$(usex doc)
-		-DBUILD_TESTING=$(usex test)
-		-DBUILD_EXAMPLES=no
-		-DINTERNAL_EXPECTED=no
-	)
-
-	append-cppflags \
-		-UDEFAULT_GIRPATH \
-		-DDEFAULT_GIRPATH="${EPREFIX}/usr/share:${EPREFIX}/usr/local/share"
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/cppgir/cppgir-0_p20240110.ebuild b/dev-cpp/cppgir/cppgir-0_p20240110.ebuild
deleted file mode 100644
index a7d27caf2086..000000000000
--- a/dev-cpp/cppgir/cppgir-0_p20240110.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="GObject-Introspection C++ binding wrapper generator"
-HOMEPAGE="https://gitlab.com/mnauw/cppgir"
-
-MY_PV="8ab6357089759d20140942de0d6d15739fface04"
-SRC_URI="https://gitlab.com/mnauw/cppgir/-/archive/${MY_PV}/cppgir-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/libfmt:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/expected-lite
-"
-BDEPEND="
-	doc? ( app-text/ronn-ng )
-	test? ( dev-libs/glib )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOC=$(usex doc)
-		-DBUILD_TESTING=$(usex test)
-		-DBUILD_EXAMPLES=no
-		-DINTERNAL_EXPECTED=no
-	)
-
-	append-cppflags \
-		-UDEFAULT_GIRPATH \
-		-DDEFAULT_GIRPATH="${EPREFIX}/usr/share:${EPREFIX}/usr/local/share"
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/cppgir/cppgir-2.0_p20240315.ebuild b/dev-cpp/cppgir/cppgir-2.0_p20240315.ebuild
deleted file mode 100644
index b8b203459ce3..000000000000
--- a/dev-cpp/cppgir/cppgir-2.0_p20240315.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="GObject-Introspection C++ binding wrapper generator"
-HOMEPAGE="https://gitlab.com/mnauw/cppgir"
-
-MY_PV="1cde1aaa0696ab7989f512abdb0694614ffe8d87"
-SRC_URI="https://gitlab.com/mnauw/cppgir/-/archive/${MY_PV}/cppgir-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/libfmt:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/expected-lite
-"
-BDEPEND="
-	doc? ( app-text/ronn-ng )
-	test? ( dev-libs/glib )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOC=$(usex doc)
-		-DBUILD_TESTING=$(usex test)
-		-DBUILD_EXAMPLES=no
-		-DINTERNAL_EXPECTED=no
-	)
-
-	append-cppflags \
-		-UDEFAULT_GIRPATH \
-		-DDEFAULT_GIRPATH="${EPREFIX}/usr/share:${EPREFIX}/usr/local/share"
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/cppgir/cppgir-2.0_p20240928.ebuild b/dev-cpp/cppgir/cppgir-2.0_p20240928.ebuild
index e8ce39f8308d..a155a15ef8f3 100644
--- a/dev-cpp/cppgir/cppgir-2.0_p20240928.ebuild
+++ b/dev-cpp/cppgir/cppgir-2.0_p20240928.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 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 02571f1672eb..1f60bcb2825e 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,3 +1,2 @@
 DIST eigen-3.4.0.tar.bz2 2143091 BLAKE2B a32aac13cbab68cfaaa252d8a406e6a36ecfd1239361412b1f9baa08284a94467479c08ffae10cb847e9916472b46b1c1af4efbf81f957c8200a4379acd42c42 SHA512 cc488eb111e0e248744d2bc4475b345b5fb82361dff226a5b73a33bd0388de8c219cff8cffcf8f476b672fc0e223f339e8c6a1cfb6293840a4a6abf232438a89
-DIST eigen-3.4.0.tar.gz 2705005 BLAKE2B ae5f774a6ed36f52cf9fc3206e50796abacbba69fd0f67cd5759b4e04d847aa656861d5e06e6cd0d798a17f2b06abdb70b16f795a626bdd29edcc872c33821f8 SHA512 ba75ecb760e32acf4ceaf27115468e65d4f77c44f8d519b5a13e7940af2c03a304ad433368cb6d55431f307c5c39e2666ab41d34442db3cf441638e51f5c3b6a
 DIST eigen-lapack_addons-3.4.1.tgz 6215074 BLAKE2B 564c3398de1f4ea249b58957a482cda0b5eb99e5021e1f18abf3b4d2893fed48912bfa8386681fcae03dd933eea91644f7429d47a53684d64462209a6ae76f30 SHA512 5a827d0befb521cb430f0d63f5000e7955359bc637cdb7292d942712e98c0702570a5b650a72fc609bf5b43633661c0e51de7761ae892df6ff0aab667f436edf
diff --git a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild b/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
deleted file mode 100644
index 708a6acc8779..000000000000
--- a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED="test"
-inherit cmake cuda fortran-2
-
-DESCRIPTION="C++ template library for linear algebra"
-HOMEPAGE="https://eigen.tuxfamily.org/index.php?title=Main_Page"
-SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
-
-# Tests failing again because of compiler issues
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="
-	doc? (
-		app-text/doxygen[dot]
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	test? ( virtual/pkgconfig )
-"
-DEPEND="
-	cuda? ( dev-util/nvidia-cuda-toolkit )
-	test? (
-		dev-libs/gmp:0
-		dev-libs/mpfr:0
-		media-libs/freeglut
-		media-libs/glew
-		sci-libs/adolc[sparse]
-		sci-libs/cholmod
-		sci-libs/fftw:3.0
-		sci-libs/pastix
-		sci-libs/scotch
-		sci-libs/spqr
-		sci-libs/superlu
-		sci-libs/umfpack
-		virtual/opengl
-	)
-"
-# Missing:
-# METIS-5
-# GOOGLEHASH
-
-PATCHES=(
-	#"${FILESDIR}"/${PN}-3.3.7-gentoo-cmake.patch
-	"${FILESDIR}"/${PN}-3.3.9-max-macro.patch
-	"${FILESDIR}"/${P}-doc-nocompress.patch # bug 830064
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	cmake_comment_add_subdirectory demos
-
-	if ! use test; then
-		sed -e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \
-			-e "/add_subdirectory(blas/s/^/#DONOTCOMPILE /g" \
-			-e "/add_subdirectory(lapack/s/^/#DONOTCOMPILE /g" \
-			-i CMakeLists.txt || die
-	fi
-
-	use cuda && cuda_src_prepare
-}
-
-src_configure() {
-	use test && mycmakeargs+=(
-		# the OpenGL testsuite is extremely brittle, bug #712808
-		-DEIGEN_TEST_NO_OPENGL=ON
-		# the cholmod tests are broken and always fail
-		-DCMAKE_DISABLE_FIND_PACKAGE_Cholmod=ON
-		-DEIGEN_TEST_CXX11=ON
-		-DEIGEN_TEST_NOQT=ON
-		-DEIGEN_TEST_ALTIVEC=$(usex cpu_flags_ppc_altivec)
-		-DEIGEN_TEST_CUDA=$(usex cuda)
-		-DEIGEN_TEST_OPENMP=$(usex openmp)
-		-DEIGEN_TEST_NEON64=$(usex cpu_flags_arm_neon)
-		-DEIGEN_TEST_VSX=$(usex cpu_flags_ppc_vsx)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_src_compile doc
-		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	fi
-	if use test; then
-		cmake_src_compile blas
-		cmake_src_compile buildtests
-
-		# tests generate random data, which
-		# obviously fails for some seeds
-		export EIGEN_SEED=712808
-	fi
-}
diff --git a/dev-cpp/eigen/eigen-3.4.0-r3.ebuild b/dev-cpp/eigen/eigen-3.4.0-r3.ebuild
index 738b1ad71e3e..71c4ef902341 100644
--- a/dev-cpp/eigen/eigen-3.4.0-r3.ebuild
+++ b/dev-cpp/eigen/eigen-3.4.0-r3.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
@@ -20,7 +20,7 @@ else
 		https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2
 		test? ( lapack? ( https://downloads.tuxfamily.org/${PN}/lapack_addons_3.4.1.tgz -> ${PN}-lapack_addons-3.4.1.tgz ) )
 	"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 fi
 
 LICENSE="MPL-2.0"
diff --git a/dev-cpp/eigen/files/eigen-3.3.7-gentoo-cmake.patch b/dev-cpp/eigen/files/eigen-3.3.7-gentoo-cmake.patch
deleted file mode 100644
index 0389cd3b9333..000000000000
--- a/dev-cpp/eigen/files/eigen-3.3.7-gentoo-cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Let us properly override with CMAKE_BUILD_TYPE=Gentoo
-
---- a/CMakeLists.txt	2018-12-11 18:57:55.000000000 +0100
-+++ b/CMakeLists.txt	2020-07-21 16:43:33.467680534 +0200
-@@ -14,18 +14,7 @@
- set(Eigen_BINARY_DIR ${Eigen3_BINARY_DIR})
- 
- # guard against bad build-type strings
--
--if (NOT CMAKE_BUILD_TYPE)
--  set(CMAKE_BUILD_TYPE "Release")
--endif()
--
--string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower)
--if(    NOT cmake_build_type_tolower STREQUAL "debug"
--   AND NOT cmake_build_type_tolower STREQUAL "release"
--   AND NOT cmake_build_type_tolower STREQUAL "relwithdebinfo")
--  message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive).")
--endif()
--
-+# yeah no.
- 
- #############################################################################
- # retrieve version infomation                                               #
diff --git a/dev-cpp/ms-gsl/ms-gsl-4.1.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-4.1.0.ebuild
index 4a89ea6109b0..4a8b60ab6fbe 100644
--- a/dev-cpp/ms-gsl/ms-gsl-4.1.0.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-4.1.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/GSL-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/rapidfuzz-cpp/Manifest b/dev-cpp/rapidfuzz-cpp/Manifest
index b96ceee8a7c1..0ef2bf06ac88 100644
--- a/dev-cpp/rapidfuzz-cpp/Manifest
+++ b/dev-cpp/rapidfuzz-cpp/Manifest
@@ -1,3 +1,2 @@
-DIST rapidfuzz-cpp-3.0.5.gh.tar.gz 309782 BLAKE2B fd7547e5c40696c217c8ea2aa98fb83b98606cde7439a5d51c80b4de30002896d9e95365d3c6ac56c32d8a8432c94ce2050b856a7e850a3f37035c5d0ece795f SHA512 4e0a7e28a54612fb11eb331449aa4fdfde1fbd2bf59b295f9eb68903cd647a639fa04d71aa7a8c88ddb7be6646cd3d0f1f5400eb53644b0ae96590037e74f771
-DIST rapidfuzz-cpp-3.1.1.gh.tar.gz 310477 BLAKE2B 2227b61c56a37854336698e0649e8db6f0c5432f60f4501805cd16add3c6324f203788006d92e0271ec67a74916c5ac5a6290edbc7437ba2014fd25e6a0e415f SHA512 204ee06c1e51b786f0a2efd32a1c2467c3bff2738e8258e6e8fe44b5569afe7c665af1051fdd05dcc98704f3045f5bd2afcba5dba3fc0b34e2facf8944478b48
 DIST rapidfuzz-cpp-3.2.0.gh.tar.gz 311140 BLAKE2B 334626f70a94d81168f24f64c2cf1fb0062581478cbc9b7506cf289c1f4a4007a0129918eb588584c4bf6ec33580ca7e85fe91725f9ddc8cd54f4e874551b381 SHA512 cf306fc4a6c0b6fc1a1c3b0b235aa54588bd87a5d07f96c1bc9711a08159ca71580b5958e66e8b4358d34e522041934903079aabe6e5a450cece7d6db6edcbe0
+DIST rapidfuzz-cpp-3.3.0.gh.tar.gz 314124 BLAKE2B 6a8d10dbd627adce2c00e02394265ec6001f5f16ee11a8948972f42e85f5ae2f2ebc50a11338659f29dd826f6988577bc4bcbd1e69e3b54545263e7c715db970 SHA512 acc61e294e3aa60f6076e0795622d0cff095bf3f141954587a7934f63a85f3ea08ba8af1accea445d3a990f9214ebd50f8f12a4d0ada88f1cc4b620c374ce153
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.5.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.5.ebuild
deleted file mode 100644
index 09332916ea08..000000000000
--- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Rapid fuzzy string matching in C++"
-HOMEPAGE="https://github.com/rapidfuzz/rapidfuzz-cpp/"
-SRC_URI="
-	https://github.com/rapidfuzz/rapidfuzz-cpp/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		>=dev-cpp/catch-3
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DRAPIDFUZZ_BUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.1.1.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.1.1.ebuild
deleted file mode 100644
index 09332916ea08..000000000000
--- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Rapid fuzzy string matching in C++"
-HOMEPAGE="https://github.com/rapidfuzz/rapidfuzz-cpp/"
-SRC_URI="
-	https://github.com/rapidfuzz/rapidfuzz-cpp/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		>=dev-cpp/catch-3
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DRAPIDFUZZ_BUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.2.0.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.2.0.ebuild
index b5e48d9aebfb..baef94a1dc31 100644
--- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.2.0.ebuild
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.3.0.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.3.0.ebuild
new file mode 100644
index 000000000000..3ac79374f16d
--- /dev/null
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-3.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Rapid fuzzy string matching in C++"
+HOMEPAGE="https://github.com/rapidfuzz/rapidfuzz-cpp/"
+SRC_URI="
+	https://github.com/rapidfuzz/rapidfuzz-cpp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		<dev-cpp/catch-3:0
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DRAPIDFUZZ_BUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-db/dbeaver-bin/Manifest b/dev-db/dbeaver-bin/Manifest
new file mode 100644
index 000000000000..421d32459584
--- /dev/null
+++ b/dev-db/dbeaver-bin/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-db/dbeaver-bin/dbeaver-bin-24.3.2.ebuild b/dev-db/dbeaver-bin/dbeaver-bin-24.3.2.ebuild
new file mode 100644
index 000000000000..6884c8f5a48a
--- /dev/null
+++ b/dev-db/dbeaver-bin/dbeaver-bin-24.3.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper xdg
+
+MY_PN=${PN%-*}
+
+DESCRIPTION="Free universal database tool (community edition)"
+HOMEPAGE="https://dbeaver.io/"
+SRC_URI="
+	amd64? ( https://dbeaver.io/files/${PV}/dbeaver-ce-${PV}-linux.gtk.x86_64-nojdk.tar.gz )
+	arm64? ( https://dbeaver.io/files/${PV}/dbeaver-ce-${PV}-linux.gtk.aarch64-nojdk.tar.gz )
+"
+S=${WORKDIR}/${MY_PN}
+
+LICENSE="Apache-2.0 EPL-1.0 BSD"
+SLOT="0"
+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' \
+		-e "s:^Exec=.*:Exec=${EPREFIX}/usr/bin/${MY_PN}:" \
+		-i "${MY_PN}-ce.desktop" || die
+	default
+}
+
+src_install() {
+	doicon -s 128 "${MY_PN}.png"
+	newicon icon.xpm "${MY_PN}.xpm"
+	domenu "${MY_PN}-ce.desktop"
+
+	local DOCS=( readme.txt )
+	einstalldocs
+
+	# Remove unused plugins for other platforms
+	rm -rv plugins/com.sun.jna_5.15.0.v20240915-2000/com/sun/jna/{openbsd,dragonflybsd,freebsd,sunos,win32,darwin,aix}-* || die
+
+	rm "${MY_PN}-ce.desktop" "${MY_PN}.png" icon.xpm readme.txt || die
+	insinto "/opt/${MY_PN}-ce"
+	doins -r ./*
+	fperms 755 "/opt/${MY_PN}-ce/${MY_PN}"
+
+	make_wrapper "${MY_PN}" "/opt/${MY_PN}-ce/${MY_PN}" "/opt/${MY_PN}-ce"
+}
diff --git a/dev-db/dbeaver-bin/metadata.xml b/dev-db/dbeaver-bin/metadata.xml
new file mode 100644
index 000000000000..740b8e8ff15e
--- /dev/null
+++ b/dev-db/dbeaver-bin/metadata.xml
@@ -0,0 +1,13 @@
+<?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">dbeaver/dbeaver</remote-id>
+		<bugs-to>https://github.com/dbeaver/dbeaver/issues</bugs-to>
+		<changelog>https://dbeaver.io/news/</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
deleted file mode 100644
index ea49b543f4f7..000000000000
--- a/dev-db/firebird/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST Firebird-3.0.10.33601-0.tar.bz2 13270269 BLAKE2B 1c30b002525287b239a6e24e59f146fdb61e1a9880cf66f2c59605b9f2a28c42603e21b2c5275e03a319af24c18f8fa5a7fa73f34c9a0d6c19e36e69864ad122 SHA512 0297a191ea1d0eda9557519d8ce6b7686cc3698a98b9c6c00547c2d36bf098083ae9d34b61614a7232b6195344bea1d66d2cbd3b092844b11f5b139162f8f886
-DIST firebird-3-quickstartguide.pdf 392796 BLAKE2B ef867664d107a9ee6dba3d724a5696fafe07a84305f1827dbeb5acf33d54aada45fad4e37971419fc7c26dba9b99577844a33c6e566485059329a8717fa79c1d SHA512 480ed2e79f83741c5b0b268f07e1ac1e317fbd9572a6e646411dc7fb94e5f44187e90d50b6ce761fc5e562e5ad2abafe89b2766e651eb7a36dbcb9ed49c3289f
-DIST firebird-30-developers-guide.pdf 1747057 BLAKE2B 9bde38dd5e997fec7fe69ada2ab1d74b0d59c440dd7a67d49e87a9464d7955f3766dde63aa60caf3e320759c934ec9f4088deed06cfae1b98e4d7ae6de364f02 SHA512 6a2a5ba1334e4a45839a950dd7b9c0a136b71a7626212b8aad5d173e8afd9a89c20ae51bdc5d309ebc206e0ac5af79138c28a10c64585d6f51c497e784445760
-DIST firebird-30-language-reference.pdf 3130464 BLAKE2B 975550c77e1b9cfcd53eef023781f1a1bc2282b7ba7bcedd57027399cbd44ad06c35d3f58bdcb2bdb953abe8ab948149ea9c284bc37eb35770dd57369f6838cd SHA512 9f17737733e2dd6e3a3f367c97c7053508621bc97b37b16ba36e6fe3554bf60363e3c06bf55ac6703d65e66039da7c16b71b70187c45b2206f6191c543cc1e95
-DIST firebird-fbmgr.pdf 151933 BLAKE2B b57394745a90732ee74f86d903690e0906be4bd5da5663ef28bd6959eb96f2d0f712cc06079a9730d9efa58e75258673b77b7b72db7897928632d315ffe1b5e1 SHA512 68b255d0de427df071400097f95205b8417c358e66a80c91d068b5e567f0a210c5494598cce871c83564cfbcd04b2f805cb53074a933ef963e94f1d1552ea2c9
-DIST firebird-gbak.pdf 196327 BLAKE2B c79e360a58c79c39e87b84b2653bd5fad1b1d45df8f02c8b6279277ea32b191533be52146ce8c03c3858ea86d23300c00d6eb31c30f0d6b466b5131aac4a7d54 SHA512 8a58adf94ea93bf51e55c7a0fd3adb7b6fc1f5fcaf71e29934f7bc192b5cac7dbd97113acf2ecda36df5470de5ee20f0100b65ab2b260a2194b846c52e0d816f
-DIST firebird-generator-guide.pdf 172298 BLAKE2B a923cc6aa5bab82b40d49b255d5ed2482e30f390ae76bffcd51294f9ee2000b827696bcb15b5bc5d9224a5650faf195daf89938c73ebce22d1e31411522c5800 SHA512 a043b84a1e7dff6b240b4786de7155fce266091d11f2a088e6864087e7d24c42cc70e44816d6abebf003feccf2676f9f8bbbb612b00db00366aead01f7e08c00
-DIST firebird-gfix.pdf 250034 BLAKE2B 2073f5348d6bd5989ba2496aa59865bf107e08c7a8a4058866a53b482f5f8012d9f6877e7ceb5cbe42d1587d8d29f1fa6622f3e5842d241eeca8da1ae5afcb4b SHA512 2f8de1fe4b45012c0d08e9e5d85d9ed1269629ac95c1ede5a9c8ae69aa69570ebfebe0f313ba54d6f00e785818f8801831c581be8b5ab427b189d3857a2b73fc
-DIST firebird-gsec.pdf 146403 BLAKE2B f20ddaee95c968df7b348ef5516ea53e3e6e866fdb2848951bd3ae5ed68e491360a24b6fbd71e2cf8fd03555284bf60bf0623db11d7b2569050fd022716eea55 SHA512 e930da593a9c0a8cdc0a669012c73b05e5844fe946807308bbe5e7a8ccd9a98261c7f4690fa7e07cfb39930359e30fdbfbe9c012565bf279a3471badf5eb46fa
-DIST firebird-gsplit.pdf 106100 BLAKE2B fd1e7edf7e6ea9556594395602739daa51253becf61db011548d763782ae57c5a2618ed79b91faf94264c1c0faff643f3941b6be0912c57e5d4b75d22ad5defa SHA512 70dafc072a1265ee9db63902b58e52833ea2c7482a12030ac13c35e51e3b94dde746090a7a02060475bf85d5170348207816e3997102fd4e33820c695d7d3e57
-DIST firebird-gstat.pdf 162939 BLAKE2B c63825c52f85020c095b90e8482a6e5f38c752178b135331268b5c2800fcfe3a035ccc68c14b83219bff1cb864c9f405e851e64f44919854e7e8e7290f4ad94d SHA512 c711122d9d020505f8475cda5b3621361a4d48cc39545a5e840430f43cb4dd7c97280a91085499547c95ce4cf9229b4ffec0f68c008fc04d7918b14fb7b8ec8a
-DIST firebird-isql.pdf 369327 BLAKE2B 3ea02b7a7b97bf231d43906f2fc8feb79aba525f1cb642da834c68c436d81d2f4408bcfe287d4ace089d6f37d9b3c8dc002fa98121fe2819c27c7840482ca91c SHA512 5f85a7ef98ab68df08c1225efab5859e988e63c3c3083e2320966cc4bf0976f9bbb4bea43906752f1710c860b33dae92c118ce13217ba61ee3ee9b0052204a3c
-DIST firebird-metadata-security.pdf 117765 BLAKE2B 67075db42cca196f019eef15fd2474be6d92353f0697b134ee5d3bb1e4cc6cd5c38cd978236f289d6c9cc300d9ebc5ee856ad871f1bd1816b7d92d46ee0cffe3 SHA512 8f24ff48ff177fdd98dfc1272f43de979fc405139475bd630a8f1c10feaf773425c85704194b8245235c2c61c0f7ebaf9d0d1741b68323146630a1361ed478a4
-DIST firebird-nbackup.pdf 202108 BLAKE2B 5ee794890f69935ec238d946649d05a72c3108674781af546e279e3d6cbbb82bbf81789270ad284a365f05cc6fdbca108baf86c5cb4eeacd242960e12e54d6b2 SHA512 c8e83a8e2bf23f3bcb17277b07eb822d1ae2ed412d6d1881f60c7c3003f60f1b6fe09e5dd52367c62a9311f9a7057fe4c85dd0c64a93554556f31cefc45e18c1
-DIST firebird-null-guide.pdf 487359 BLAKE2B 346d942b7d4780496c2c212433660415437f6b17a42bb109aaf1cd8a8de31a394a1d2a3b52bb6dc1c3830bc839a692b611c7fe3289243e86ab874a84d989a7b8 SHA512 b5b9981a3f15fe933a44deb001d1d85b0dc340ae0ff55e79d160da8590406515f0ba73360a3904556aa36d94cdafb17fe2452b5f63138cb1f585d70842511cd3
-DIST using-firebird.pdf 236646 BLAKE2B 54b296ac8c6281ff501678a24dac76e203a66e569b1cda7dc475a7fe9bbed9fc03923377c320a621a225d0277fc68cfb9820514d3f12191902cdeb18ccb87270 SHA512 ec16c33082524aa5df8907c1143a8707f1193c42882956c220e6c95442d43751ec3e2ba77ded004866f7dab7f58ecf4fac3a0027cf89ec7536c0771260f09cc4
diff --git a/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-autoconf2.72.patch b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-autoconf2.72.patch
deleted file mode 100644
index 29cca62fc790..000000000000
--- a/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-autoconf2.72.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/FirebirdSQL/firebird/commit/3fe8f6510de79689a26868e244840b24dcb19567
-
-From 3fe8f6510de79689a26868e244840b24dcb19567 Mon Sep 17 00:00:00 2001
-From: AlexPeshkoff <alexander.peshkoff@gmail.com>
-Date: Wed, 23 Nov 2022 20:30:03 +0300
-Subject: [PATCH] Fixed #7394: autoconf 2.72 support
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -696,8 +696,9 @@ if test "$STD_EDITLINE" = "true"; then
-       AC_CHECK_LIB(readline, readline, [READLINE=readline EDITLINE_FLG=Y],
-         [STD_EDITLINE=false
-          if test "$EDITLINE_FLG" = "Y"; then
--           AC_MSG_WARN([[[--with-system-editline specified, not found. Using bundled editline]]])])))
-+           AC_MSG_WARN([[[--with-system-editline specified, not found. Using bundled editline]]])
- 		 fi
-+           ])))
- fi
- XE_RESTORE_ENV()
- 
-
diff --git a/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-clang16.patch b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-clang16.patch
deleted file mode 100644
index 06d6907369ca..000000000000
--- a/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-clang16.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://github.com/FirebirdSQL/firebird/pull/7407
-
-From a39cde31c4c78866c8f8ee0285fc4bcb81496d81 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Thu, 1 Dec 2022 18:26:06 +0100
-Subject: [PATCH] configure.ac: Add missing int return types to main
-
-Implicit ints are a language feature that was removed in C99 and
-future compilers may require declaration of all return types.
---- a/configure.ac
-+++ b/configure.ac
-@@ -1118,7 +1118,7 @@ AC_CHECK_FUNCS(sem_init)
- if test "$ac_cv_func_sem_init" = "yes"; then
- AC_MSG_CHECKING(for working sem_init())
- AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <semaphore.h>
--	main () {
-+	int main () {
- 		sem_t s;
- 		return sem_init(&s,0,0);
- 		}
-@@ -1159,7 +1159,7 @@ AC_SYS_LARGEFILE
- if test "$ac_cv_sys_file_offset_bits" = "no"; then
-   AC_MSG_CHECKING(for native large file support)
-   AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <unistd.h>
--    main () {
-+    int main () {
-     return !(sizeof(off_t) == 8);
-   }]])],[ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
-    AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[])
-@@ -1206,7 +1206,7 @@ dnl EKU: try to determine the alignment of long and double
- dnl      replaces FB_ALIGNMENT and FB_DOUBLE_ALIGN in src/jrd/common.h
- AC_MSG_CHECKING(alignment of long)
- AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <semaphore.h>
--main () {
-+int main () {
-   struct s {
-     char a;
-     union { long long x; sem_t y; } b;
-@@ -1217,7 +1217,7 @@ AC_MSG_RESULT($ac_cv_c_alignment)
- AC_DEFINE_UNQUOTED(FB_ALIGNMENT, $ac_cv_c_alignment, [Alignment of long])
- 
- AC_MSG_CHECKING(alignment of double)
--AC_RUN_IFELSE([AC_LANG_SOURCE([[main () {
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[int main () {
-   struct s {
-     char a;
-     double b;
-
diff --git a/dev-db/firebird/files/firebird-3.0.10.33601.0-flags.patch b/dev-db/firebird/files/firebird-3.0.10.33601.0-flags.patch
deleted file mode 100644
index a0ecef4693c4..000000000000
--- a/dev-db/firebird/files/firebird-3.0.10.33601.0-flags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# Compile externs with same CXX/CC/CFLAGS/CXXFLAGS/LDFLAGS as main
---- a/builds/posix/Makefile.in
-+++ b/builds/posix/Makefile.in
-@@ -127,8 +127,8 @@
- endif
- 
- extern:
--	$(MAKE) -C $(ROOT)/extern/btyacc
--	$(MAKE) -C $(ROOT)/extern/cloop TARGET=release WITH_FPC=0 BUILD_DIR=$(TMP_ROOT)/cloop OUT_DIR=$(GEN_ROOT)/$(TARGET)/cloop
-+	$(MAKE) -C $(ROOT)/extern/btyacc CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
-+	$(MAKE) -C $(ROOT)/extern/cloop TARGET=release WITH_FPC=0 BUILD_DIR=$(TMP_ROOT)/cloop OUT_DIR=$(GEN_ROOT)/$(TARGET)/cloop CXX="$(CXX)" CXXFLAGS="$(OPTIMIZE_FLAGS)" CFLAGS="${CFLAGS}" CC="${CC}" LDFLAGS="$(LDDFLAGS)"
- 
- ifeq ($(TOMBUILD_FLG),Y)
- 	$(MAKE) -C $(ROOT)/extern/libtommath -f makefile.shared LIBTOOL=$(LIBTOOL)
-@@ -592,8 +592,8 @@
- 	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
- 
- examples: include_generic
--	$(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/
--	$(MAKE) -f Makefile.plugins_examples
-+	$(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/ CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
-+	$(MAKE) -f Makefile.plugins_examples CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
- 
- message_file:	$(FIREBIRD_MSG)
- 
diff --git a/dev-db/firebird/files/firebird-3.0.10.33601.0-unbundle.patch b/dev-db/firebird/files/firebird-3.0.10.33601.0-unbundle.patch
deleted file mode 100644
index 4e5399f198b6..000000000000
--- a/dev-db/firebird/files/firebird-3.0.10.33601.0-unbundle.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Partly based on:
-- https://github.com/freebsd/freebsd-ports/blob/main/databases/firebird30-server/files/patch-builds-posix_Makefile.in.plugins_examples
-- https://github.com/freebsd/freebsd-ports/blob/main/databases/firebird30-server/files/patch-extern_btyacc_Makefile
-- https://github.com/freebsd/freebsd-ports/blob/main/databases/firebird30-server/files/patch-extern_cloop_Makefile
-- https://github.com/freebsd/freebsd-ports/blob/main/databases/firebird30-server/files/patch-builds_posix_make.defaults
---- a/builds/posix/Makefile.in
-+++ b/builds/posix/Makefile.in
-@@ -688,8 +688,8 @@ install install-embedded silent_install package packages dist:
- # various cleaning
- #
- .PHONY: clean clean_objects clean_dependancies clean_extern_objects clean_build \
--		clean_gpre_gen clean_icu clean_dbs clean_examples clean_makefiles \
--		clean_editline clean_all
-+		clean_gpre_gen clean_dbs clean_examples clean_makefiles \
-+		clean_all
- 
- 
- clean: clean_objects clean_dependancies clean_extern_objects clean_build \
-@@ -708,8 +708,6 @@ clean_config clean_all: clean clean_makefiles
- 	$(RM) $(ROOT)/config.status
- 	$(RM) $(ROOT)/libtool
- 	$(RM_R) $(ROOT)/autom4te.cache
--	-$(MAKE) -C $(ROOT)/extern/editline distclean
--#	-$(MAKE) -C $(ROOT)/extern/icu/source distclean
- 	-$(MAKE) -C $(ROOT)/extern/btyacc distclean
- 
- clean_dbs:
-@@ -724,12 +722,6 @@ clean_dbs:
- clean_examples:
- 	$(RM) `find $(GEN_ROOT)/examples/ -type f ! -name 'Make*'`
- 
--clean_editline:
--	-$(MAKE) -C $(ROOT)/extern/editline clean
--
--#clean_icu:
--#	-$(MAKE) -C $(ROOT)/extern/icu/source clean
--
- clean_tommath:
- 	-$(MAKE) -C $(ROOT)/extern/libtommath clean
- 
---- a/builds/posix/Makefile.in.plugins_examples
-+++ b/builds/posix/Makefile.in.plugins_examples
-@@ -99,7 +99,7 @@ AllObjects += $(CA_Objects)
- crypt_app: $(CRYPT_APP)
- 
- $(CRYPT_APP):	$(CA_Objects)
--	$(EXE_LINK) $^ -o $@ $(FIREBIRD_LIBRARY_LINK)
-+	$(EXE_LINK) $(LDFLAGS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK)
- 
- 
- include $(ROOT)/gen/make.shared.targets
---- a/builds/posix/make.defaults
-+++ b/builds/posix/make.defaults
-@@ -240,7 +240,7 @@ LIBFBINTL_SO = $(FB_BUILD)/intl/$(LIB_PREFIX)fbintl.$(SHRLIB_EXT)
- 
- ifeq ($(EDITLINE_FLG),Y)
-   ifeq ($(STD_EDITLINE), true)
--	LIBEDITLINE := -l$(READLINE)
-+	LIBEDITLINE := $(shell ${PKG_CONFIG} libedit --libs)
-   else
- 	LIBEDITLINE := $(LIB)/libedit.a
-   endif
---- a/extern/btyacc/Makefile
-+++ b/extern/btyacc/Makefile
-@@ -42,7 +42,7 @@ OTHERS	      = README README.BYACC \
- all:		$(PROGRAM)
- 
- $(PROGRAM):     $(OBJS) $(LIBS)
--		$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
- 
- clean:;		rm -f $(OBJS)
- 
---- a/extern/cloop/Makefile
-+++ b/extern/cloop/Makefile
-@@ -6,7 +6,7 @@ TARGET	:= release
- 
- CC	:= $(CC)
- CXX	:= $(CXX)
--LD	:= $(CXX)
-+LD	:= $(CXX) $(LDFLAGS)
- 
- SRC_DIR		:= src
- BUILD_DIR	:= build
-@@ -27,8 +27,10 @@ SRCS_CPP := $(foreach sdir,$(SRC_DIRS),$(wildcard $(sdir)/*.cpp))
- OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C))
- OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP))
- 
--C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
--CXX_FLAGS := $(C_FLAGS)
-+
-+COMMON_C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
-+C_FLAGS := $(COMMON_C_FLAGS) $(CFLAGS) $(CPPFLAGS)
-+CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS)
- FPC_FLAGS := -Mdelphi
- 
- ifeq ($(TARGET),release)
diff --git a/dev-db/firebird/files/firebird.init.d.3.0-r1 b/dev-db/firebird/files/firebird.init.d.3.0-r1
deleted file mode 100644
index c49ea97f9203..000000000000
--- a/dev-db/firebird/files/firebird.init.d.3.0-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-name=${RC_SVCNAME}
-
-fbhomedir="/var/run/firebird"
-fblogdir="/var/log/firebird"
-pidfile="${fbhomedir}/firebird.pid"
-command="/usr/sbin/fbguard"
-command_args="-forever"
-command_args_background="-daemon -pidfile $pidfile"
-command_user="${FBUSER:-firebird}:${FBGROUP:-firebird}"
-
-depend() {
-	need net
-}
-
-start_pre() {
-	checkpath -q -d -m 0770 -o ${FBUSER:-firebird}:${FBGROUP:-firebird} ${fbhomedir} || return 1
-	checkpath -q -d -m 0770 -o ${FBUSER:-firebird}:${FBGROUP:-firebird} ${fblogdir} || return 1
-}
diff --git a/dev-db/firebird/files/firebird.logrotate b/dev-db/firebird/files/firebird.logrotate
deleted file mode 100644
index ac4a74b26041..000000000000
--- a/dev-db/firebird/files/firebird.logrotate
+++ /dev/null
@@ -1,10 +0,0 @@
-/var/log/firebird/firebird.log {
-     compress
-     weekly
-     missingok
-     rotate 52
-     size +1024k
-     delaycompress
-     notifempty
-     create 644 firebird firebird
- }
diff --git a/dev-db/firebird/files/firebird.xinetd.3.0 b/dev-db/firebird/files/firebird.xinetd.3.0
deleted file mode 100644
index 4e094bdf0627..000000000000
--- a/dev-db/firebird/files/firebird.xinetd.3.0
+++ /dev/null
@@ -1,11 +0,0 @@
-service gds_db
-{
-	flags			= REUSE
-	socket_type		= stream
-	wait			= no
-	user			= firebird
-	log_on_success		+= USERID
-	log_on_failure 		+= USERID
-	server			= /usr/bin/firebird
-	disable			= yes
-}
diff --git a/dev-db/firebird/firebird-3.0.10.33601.0-r2.ebuild b/dev-db/firebird/firebird-3.0.10.33601.0-r2.ebuild
deleted file mode 100644
index 5fd90979b8e5..000000000000
--- a/dev-db/firebird/firebird-3.0.10.33601.0-r2.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P=${PN/f/F}-$(ver_rs 4 '-')
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 features"
-HOMEPAGE="https://www.firebirdsql.org/"
-
-SRC_URI="
-	https://github.com/FirebirdSQL/firebird/releases/download/v$(ver_cut 1-3)/${MY_P}.tar.bz2
-	doc? (
-		https://firebirdsql.org/file/documentation/pdf/en/refdocs/fblangref30/firebird-30-language-reference.pdf
-		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/qsg3/firebird-3-quickstartguide.pdf
-		https://firebirdsql.org/file/documentation/pdf/en/refdocs/fbdevgd30/firebird-30-developers-guide.pdf
-		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/isql/firebird-isql.pdf
-		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/gsec/firebird-gsec.pdf
-		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/gbak/firebird-gbak.pdf
-		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/nbackup/firebird-nbackup.pdf
-		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/gstat/firebird-gstat.pdf
-		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/gfix/firebird-gfix.pdf
-		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/fbmgr/firebird-fbmgr.pdf
-		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/gsplit/firebird-gsplit.pdf
-		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/generatorguide/firebird-generator-guide.pdf
-		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/nullguide/firebird-null-guide.pdf
-		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/fbmetasecur/firebird-metadata-security.pdf
-		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/ufb/using-firebird.pdf
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="IDPL Interbase-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples +server xinetd"
-
-BDEPEND="
-	doc? ( app-arch/unzip )
-"
-# FIXME: cloop?
-DEPEND="
-	dev-libs/icu:=
-	dev-libs/libedit
-	dev-libs/libtommath
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/firebird
-	acct-user/firebird
-	xinetd? ( virtual/inetd )
-	!sys-cluster/ganglia
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.10.33601.0-unbundle.patch
-	"${FILESDIR}"/${PN}-3.0.10.33601.0-flags.patch
-	"${FILESDIR}"/${P}-configure-autoconf2.72.patch
-	"${FILESDIR}"/${P}-configure-clang16.patch
-)
-
-pkg_pretend() {
-	if [[ -e /var/run/${PN}/${PN}.pid ]] ; then
-		ewarn
-		ewarn "The presence of server connections may prevent isql or gsec"
-		ewarn "from establishing an embedded connection. Accordingly,"
-		ewarn "creating employee.fdb or security3.fdb could fail."
-		ewarn "It is more secure to stop the firebird daemon before running emerge."
-		ewarn
-	fi
-}
-
-check_sed() {
-	MSG="sed of $3, required $2 line(s) modified $1"
-	einfo "${MSG}"
-	[[ $1 -ge $2 ]] || die "${MSG}"
-}
-
-src_prepare() {
-	default
-
-	# Rename references to isql to fbsql
-	# sed vs patch for portability and addtional location changes
-	check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
-		src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
-	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
-		src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
-	check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
-		-e 's:isql :fbsql :w /dev/stdout' \
-		-e 's:ISQL :FBSQL :w /dev/stdout' \
-		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
-
-	# bug #917662, bug #924659
-	filter-lto
-	append-flags -fno-strict-aliasing $(test-flags-CXX -fno-lifetime-dse)
-
-	# use gentoo's CXXFLAGS instead of whatever firebird decided on
-	# doesn't replace all firebird's CXXFLAGS, but at least this is last,
-	# so it can do some overrides
-	sed -i -e "/OPTIMIZE_FLAGS=/s/=.*/=${CXXFLAGS}/" builds/posix/prefix.*
-
-	find . -name \*.sh -exec chmod +x {} + || die
-	# firebird's patched btyacc is needed now as of
-	# https://github.com/FirebirdSQL/firebird/commit/9aab6ed8cc6872e2ebc6bfa2531e089cb96e8305#diff-a01303d63fcb967bea34359c3c7f79e4356d6549ab22a1a9190e8020c0b33a3d
-	rm -r extern/{editline,icu} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-
-	local myeconfargs=(
-		--prefix=/usr/$(get_libdir)/firebird
-		--with-editline
-		--with-system-editline
-		--with-fbbin=/usr/bin
-		--with-fbsbin=/usr/sbin
-		--with-fbconf=/etc/${PN}
-		--with-fblib=/usr/$(get_libdir)
-		--with-fbinclude=/usr/include
-		--with-fbdoc=/usr/share/doc/${PF}
-		--with-fbudf=/usr/$(get_libdir)/${PN}/UDF
-		--with-fbsample=/usr/share/${PN}/examples
-		--with-fbsample-db=/usr/share/${PN}/examples/empbuild
-		--with-fbhelp=/usr/share/${PN}/help
-		--with-fbintl=/usr/$(get_libdir)/${PN}/intl
-		--with-fbmisc=/usr/share/${PN}
-		--with-fbsecure-db=/etc/${PN}
-		--with-fbmsg=/usr/share/${PN}/msg
-		--with-fblog=/var/log/${PN}/
-		--with-fbglock=/var/run/${PN}
-		--with-fbplugins=/usr/$(get_libdir)/${PN}/plugins
-		--with-gnu-ld
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-# from linux underground, merging into this here
-src_install() {
-	if use doc; then
-		dodoc -r doc
-
-		local x
-		for x in ${A}; do
-			if [[ ${x} == *.pdf ]] ; then
-				dodoc "${DISTDIR}"/${x}
-			fi
-		done
-	fi
-
-	cd "${S}/gen/Release/${PN}" || die
-
-	doheader include/*
-	dolib.so lib/*.so*
-
-	# links for backwards compatibility
-	insinto /usr/$(get_libdir)
-	dosym libfbclient.so /usr/$(get_libdir)/libgds.so
-	dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
-	dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
-
-	insinto /usr/share/${PN}/msg
-	doins *.msg
-
-	use server || return
-
-	einfo "Renaming isql -> fbsql"
-	mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql"
-
-	dobin bin/{fb_config,fbsql,fbsvcmgr,fbtracemgr,gbak,gfix,gpre,gsec,gsplit,gstat,nbackup,qli}
-	dosbin bin/{firebird,fbguard,fb_lock_print}
-
-	insinto /usr/share/${PN}/help
-	# why???
-	insopts -m0660 -o firebird -g firebird
-	doins help/help.fdb
-
-	exeinto /usr/$(get_libdir)/${PN}/intl
-	doexe intl/libfbintl.so
-	dosym libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl.so
-
-	insinto /usr/$(get_libdir)/${PN}/intl
-	insopts -m0644 -o root -g root
-	doins intl/fbintl.conf
-
-	# plugins
-	exeinto /usr/$(get_libdir)/${PN}/plugins
-	doexe plugins/*.so
-	exeinto /usr/$(get_libdir)/${PN}/plugins/udr
-	doexe plugins/udr/*.so
-
-	exeinto /usr/$(get_libdir)/${PN}/UDF
-	doexe UDF/*.so
-
-	# logging (do we really need the perms?)
-	diropts -m 755 -o firebird -g firebird
-	dodir /var/log/${PN}
-	keepdir /var/log/${PN}
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# configuration files
-	insinto /etc/${PN}/plugins
-	doins plugins/udr_engine.conf
-	insinto /etc/${PN}
-	doins {databases,fbtrace,firebird,plugins}.conf
-
-	# install secutity3.fdb
-	insopts -m0660 -o firebird -g firebird
-	doins security3.fdb
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/${PN}.xinetd.3.0" ${PN}
-	else
-		newinitd "${FILESDIR}/${PN}.init.d.3.0-r1" ${PN}
-	fi
-
-	if use examples; then
-		cd examples || die
-		insinto /usr/share/${PN}/examples
-		insopts -m0644 -o root -g root
-		doins -r api
-		doins -r dbcrypt
-		doins -r include
-		doins -r interfaces
-		doins -r package
-		doins -r stat
-		doins -r udf
-		doins -r udr
-		doins CMakeLists.txt
-		doins functions.c
-		doins README
-		insinto /usr/share/${PN}/examples/empbuild
-		insopts -m0660 -o firebird -g firebird
-		doins empbuild/employee.fdb
-	fi
-
-	elog "Starting with version 3, server mode is set in firebird.conf"
-	elog "The default setting is superserver."
-	elog
-	elog "If you're using UDFs, please remember to move them to ${EPREFIX}/usr/$(get_libdir)/firebird/UDF"
-}
diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
deleted file mode 100644
index 9839f3286b10..000000000000
--- a/dev-db/firebird/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-	Firebird is a relational database offering many ANSI SQL standard 
-	features that runs on Linux, Windows, and a variety of Unix platforms.
-	Firebird offers excellent concurrency, high performance, and powerful
-	language support for stored procedures and triggers. It has been used
-	in production systems, under a variety of names, since 1981.
-	</longdescription>
-	<use>
-		<flag name="server">Install the server components of Firebird, not just the client</flag>
-		<flag name="xinetd">Install ClassicServer</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">firebird</remote-id>
-		<remote-id type="github">FirebirdSQL/firebird</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-db/futuresql/futuresql-0.1.1.ebuild b/dev-db/futuresql/futuresql-0.1.1.ebuild
index 21dc63b8d983..f744f70a95da 100644
--- a/dev-db/futuresql/futuresql-0.1.1.ebuild
+++ b/dev-db/futuresql/futuresql-0.1.1.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
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/futuresql/html/index.html https://invent.kde.org/l
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 6333e56ae7a2..e7b829264f20 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,3 +1 @@
-DIST mariadb-connector-c-3.2.7-src.tar.gz 1212691 BLAKE2B ae2d1317fdc087c6d64b7cf11f4343bf35662d04da5c693f6f3b45ec405ff0f3d5d03157eb56a9c05cf4e16b9980baffec8800b886ae3d962d22a828a6938671 SHA512 3f0c67c5fd12e889a3704e0a638b64a784f05d12c7c424f7ce64e78a3eb17e2ad588e0e23f0ce037cd49efb695294ab69277da78f02940c2a7ea0676886b9c36
-DIST mariadb-connector-c-3.3.4-src.tar.gz 1389030 BLAKE2B 4bee45ee4f76979d36072ab2119042b4de1127a42e99510bd0c1bc5e163fdb4e9b7ca4cce9381ed89e0c733158293d0641c7b7cbd14feaf3257a442c62083e23 SHA512 3a3f20efe58f8458a426501248b154107b76bd2001a43e41923e31568c8419cd88f2379e3636a54118ee64ac160a1c6f68dd79c0ac053fa273d9b6b127410ef6
 DIST mariadb-connector-c-3.3.8-src.tar.gz 1393368 BLAKE2B 09a8a310f97809f0b0396770a77d4512fe1124de263e2077e5a14a2fa1fbc59d7e35a09d97b0471b687943fc9ce06925507e4b950fdacfdc7ca04ea5ee56bf9e SHA512 d2630bda8deb28696842a6b5dd308060a8b9a83a04dfb3ed908387f53af4108510c6f536aaecc4a3c9a035c7be91b98229d6c480366a3579b6be2c5a8d85ff56
diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.3.4-fix-building-without-gssapi.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.3.4-fix-building-without-gssapi.patch
deleted file mode 100644
index a76af28aabd4..000000000000
--- a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.3.4-fix-building-without-gssapi.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# https://jira.mariadb.org/browse/CONC-637
-# https://github.com/mariadb-corporation/mariadb-connector-c/commit/4e2408c1cc298ada91b30683501c0c94a6621562
-diff --git a/plugins/auth/CMakeLists.txt b/plugins/auth/CMakeLists.txt
-index ed9be6f3..da0b58e4 100644
---- a/plugins/auth/CMakeLists.txt
-+++ b/plugins/auth/CMakeLists.txt
-@@ -120,7 +120,7 @@ IF(GSSAPI_SOURCES)
-   IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
-     SET_SOURCE_FILES_PROPERTIES(${GSSAPI_SOURCES} PROPERTY COMPILE_FLAGS "-Wno-deprecated-declarations")
-   ENDIF()
--  IF(have__Wl___as_needed)
-+  IF(have__Wl___as_needed AND TARGET auth_gssapi_client)
-     SET_TARGET_PROPERTIES(auth_gssapi_client PROPERTIES LINK_FLAGS "-Wl,--as-needed")
-   ENDIF()
- ENDIF()
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
deleted file mode 100644
index edcdefb279d3..000000000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
-else
-	MY_PN=${PN#mariadb-}
-	MY_PV=${PV/_b/-b}
-	SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz"
-	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 x86"
-fi
-
-inherit cmake-multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://mariadb.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0/3"
-IUSE="+curl gnutls kerberos +ssl static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/libiconv:=[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
-	kerberos? (
-		|| (
-			app-crypt/mit-krb5[${MULTILIB_USEDEP}]
-			app-crypt/heimdal[${MULTILIB_USEDEP}]
-		)
-	)
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.24:=[${MULTILIB_USEDEP}] )
-		!gnutls? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-	)
-"
-BDEPEND="test? ( dev-db/mariadb[server] )"
-RDEPEND="${DEPEND}"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mariadb/mariadb_version.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
-)
-
-src_prepare() {
-	# These tests the remote_io plugin which requires network access
-	sed -i 's/{"test_remote1", test_remote1, TEST_CONNECTION_NEW, 0, NULL, NULL},//g' "unittest/libmariadb/misc.c" || die
-
-	# These tests don't work with --skip-grant-tables
-	sed -i 's/{"test_conc366", test_conc366, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || die
-	sed -i 's/{"test_conc66", test_conc66, TEST_CONNECTION_DEFAULT, 0, NULL,  NULL},//g' "unittest/libmariadb/connection.c" || die
-
-	# [Warning] Aborted connection 2078 to db: 'test' user: 'root' host: '' (Got an error reading communication packets)
-	# Not sure about this one - might also require network access
-	sed -i 's/{"test_default_auth", test_default_auth, TEST_CONNECTION_NONE, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# mariadb cannot use ld.gold, bug #508724
-	tc-ld-disable-gold
-
-	# bug #855233 (MDEV-11914, MDEV-25633) at least
-	filter-lto
-
-	# bug #943757
-	append-cflags -std=gnu17
-
-	cmake-multilib_src_configure
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_EXTERNAL_ZLIB=ON
-		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-		-DWITH_CURL=$(usex curl)
-		-DWITH_ICONV=ON
-		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
-		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_LIBDIR="$(get_libdir)"
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-		-DINSTALL_BINDIR=bin
-		-DWITH_UNIT_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	mkdir -vp "${T}/mysql/data" || die
-
-	mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die
-	mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking &
-
-	while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do
-		sleep 1
-	done
-
-	cd unittest/libmariadb || die
-	MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest --verbose || die
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.4.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.4.ebuild
deleted file mode 100644
index 0965ba371186..000000000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
-else
-	MY_PN=${PN#mariadb-}
-	MY_PV=${PV/_b/-b}
-	SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz"
-	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
-fi
-
-inherit cmake-multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://mariadb.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0/3"
-IUSE="+curl gnutls kerberos +ssl static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/libiconv:=[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
-	kerberos? (
-		|| (
-			app-crypt/mit-krb5[${MULTILIB_USEDEP}]
-			app-crypt/heimdal[${MULTILIB_USEDEP}]
-		)
-	)
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.24:=[${MULTILIB_USEDEP}] )
-		!gnutls? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-	)
-"
-BDEPEND="test? ( dev-db/mariadb[server] )"
-RDEPEND="${DEPEND}"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mariadb/mariadb_version.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
-	"${FILESDIR}"/${PN}-3.3.4-fix-building-without-gssapi.patch
-	"${FILESDIR}"/${PN}-3.3.4-remove-zstd.patch
-)
-
-src_prepare() {
-	# These tests the remote_io plugin which requires network access
-	sed -i 's/{"test_remote1", test_remote1, TEST_CONNECTION_NEW, 0, NULL, NULL},//g' "unittest/libmariadb/misc.c" || die
-
-	# These tests don't work with --skip-grant-tables
-	sed -i 's/{"test_conc366", test_conc366, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || die
-	sed -i 's/{"test_conc66", test_conc66, TEST_CONNECTION_DEFAULT, 0, NULL,  NULL},//g' "unittest/libmariadb/connection.c" || die
-
-	# [Warning] Aborted connection 2078 to db: 'test' user: 'root' host: '' (Got an error reading communication packets)
-	# Not sure about this one - might also require network access
-	sed -i 's/{"test_default_auth", test_default_auth, TEST_CONNECTION_NONE, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# mariadb cannot use ld.gold, bug #508724
-	tc-ld-disable-gold
-
-	# bug #855233 (MDEV-11914, MDEV-25633) at least
-	filter-lto
-
-	# bug #943757
-	append-cflags -std=gnu17
-
-	cmake-multilib_src_configure
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_EXTERNAL_ZLIB=ON
-		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-		-DWITH_CURL=$(usex curl)
-		-DWITH_ICONV=ON
-		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
-		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_LIBDIR="$(get_libdir)"
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-		-DINSTALL_BINDIR=bin
-		-DWITH_UNIT_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	mkdir -vp "${T}/mysql/data" || die
-
-	mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die
-	mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking &
-
-	while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do
-		sleep 1
-	done
-
-	cd unittest/libmariadb || die
-	MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest --verbose || die
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild
index 45553edc1b5e..eb4f7ef8cec1 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.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 @@ else
 	MY_PV=${PV/_b/-b}
 	SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz"
 	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86"
 fi
 
 inherit cmake-multilib flag-o-matic toolchain-funcs
@@ -108,8 +108,15 @@ multilib_src_test() {
 	mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die
 	mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking &
 
+	local attempts=0
 	while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do
+		# 5 minutes should be more than enough
+		if [[ ${attempts} -gt 300 ]] ; then
+			die "mysqld not found after 300 seconds, aborting"
+		fi
+
 		sleep 1
+		attempts=$((attempts + 1))
 	done
 
 	cd unittest/libmariadb || die
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
index 45553edc1b5e..eb4f7ef8cec1 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-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
@@ -11,7 +11,7 @@ else
 	MY_PV=${PV/_b/-b}
 	SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz"
 	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86"
 fi
 
 inherit cmake-multilib flag-o-matic toolchain-funcs
@@ -108,8 +108,15 @@ multilib_src_test() {
 	mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die
 	mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking &
 
+	local attempts=0
 	while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do
+		# 5 minutes should be more than enough
+		if [[ ${attempts} -gt 300 ]] ; then
+			die "mysqld not found after 300 seconds, aborting"
+		fi
+
 		sleep 1
+		attempts=$((attempts + 1))
 	done
 
 	cd unittest/libmariadb || die
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 8bdaad7cdd86..1ad87fd18063 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,9 +1,6 @@
 DIST mariadb-10.11.10-patches-01.tar.xz 5300 BLAKE2B 842dd7002220ab6c164e50adcb2c0184752c1080e4c2c2609c431d8867b2ccf5b910b61d3f9a5f1e9b979d34423a5dbab1c3bced1e5d8b2af780addc9baddff5 SHA512 23a8e6d58927cadd39c84653069880039c4cbe6226d920550f3abdd995c0656013fef994cf4d23d34902c3cce7aa92a2819d5ef7f7c23ee9eca8a2720f4f6afa
 DIST mariadb-10.11.10.tar.gz 104463642 BLAKE2B c6101ea5094c5bb78cf55ba37026d2e18f48e59a54eef1849051acc2c64111b82b9eba73b909fe0f07d111521433b42d84f6d155bcdf6e4ed50c186767b078db SHA512 3a8655384813ba515ce185e8a03427785fbea75b3226e2a1db02839dd66c22622ba27eeb2ca7b3d840bba43720a4393bbf71eb4b2b9e41ab837629e89a8b5976
-DIST mariadb-10.11.3-patches-01.tar.xz 4984 BLAKE2B abc78c83505c745ab7320b99dcda8c667fed8332dede466142027b24957fa9ff3d03f8402679ce6cffdc89bc9f0559f8c717b7ec9df52a2c5db39195f096d731 SHA512 127386c9dc8ce242d9d309e31b9357a928ba816d24d94d60cbc8723fb3bd0fb136c7d049bfb37aac057f9ebcc73c155ac20b8bcf2542f89401140728c2dcf29a
-DIST mariadb-10.11.5.tar.gz 99709948 BLAKE2B 97429df4f0a10eb72c74dd0e951954b7c096a6b42fdaa97c682d1409e2a21716171a2b66aae6ec8ab3f4371bed57aff1f054554d398242e413d5c8e7ad988da4 SHA512 851e6508c1e495afa608a8bcd5c62faa5800e69cc1ba81b9366bf250e07ce8a9801a4ee07ecbaec4b57180c9b3bf2ed8acb7f5f03dd37a87a53928bfd4dfe559
 DIST mariadb-10.6.13-patches-01.tar.xz 4984 BLAKE2B 625d04310b02aad4fec4b633e9fab06636364f3c5ed3cb88e89acd4224786c3c9ed478b636ac699e77a888b73dab12cb279df41d6095e93e9c4ae3a159570286 SHA512 1e6ac167bfd77570e8ff5955aaa9a101d9387ac4857d856f1fb8c9a489c4c2a154481b9385584435e8dc95baef0dd3ef6831c7de2d6f004401cc338edcaa9d12
-DIST mariadb-10.6.14.tar.gz 95286643 BLAKE2B 4a186f3f52b63ab7321aa7556776ff8a986bd602d78dc6a143cc3bfdfd8cc09b0a22688cba02b8907f4b3f0d1e7c640f5caad768c1e89486d6af24e6cf3168a8 SHA512 11b88480ac61303172e98ed3271c8172e840cded5175caba1469d6ec063df647b536ee6e95f110abd8d95d95c9b8d7edf1cb611113be225d5e8eeb2041f86438
 DIST mariadb-10.6.15.tar.gz 98204031 BLAKE2B 4534b82f1c1e16ce2c7c21879714e24b20fada36ef10a8a0dbe770c1d99055822fcaf146646b19b459cfd948bff0662d23f1f661a843919f90a354838bda7ee6 SHA512 61b5af8c2f8bd2f641aaa708941563d5f6ecc118acc9a154c009c3ae1d50e7360ae59241f87e5c2111775a3ffeb42a64f4853e9c7096b58d68a3695b5d0ef97c
 DIST mariadb-10.6.16-patches-01.tar.xz 4956 BLAKE2B a178930f7abe474e1419509c0bbabf783e1b931cfc3f4b4bddf426d9671d4e69e62a800d759f424f957562091c634049e594332ab15dc758e98d26c48ba69d1d SHA512 42969e6881cf2548c48fcce7f8439c9d56596ef038d55affcada45f4cd42a3666617f5786b69fe9ba42f11b06e85f43b722f2190aa7ed5badb461c48282751e5
 DIST mariadb-10.6.17.tar.gz 99067793 BLAKE2B 9df7592eb11a92fc4cbf4f1913e11f7ae652effde44358ee930726473a40fc26e46e02dc79e8b16068df37c82afe6b3141305624174d2e44c53107065c57b1ee SHA512 e07cf3e90d93d6139969875b11d6df3210b2c9f69257688b392843a7caed0dc3b75ba8904384fd0a55c24ece624e04b68c005a3731ee68f3957787a27b52ad56
diff --git a/dev-db/mariadb/mariadb-10.11.10.ebuild b/dev-db/mariadb/mariadb-10.11.10.ebuild
index e414f8b901bc..e6a6d95ff35f 100644
--- a/dev-db/mariadb/mariadb-10.11.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.11.10.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
@@ -21,7 +21,7 @@ S="${WORKDIR}/mysql"
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
 	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
diff --git a/dev-db/mariadb/mariadb-10.11.5-r1.ebuild b/dev-db/mariadb/mariadb-10.11.5-r1.ebuild
deleted file mode 100644
index 935d3e35a064..000000000000
--- a/dev-db/mariadb/mariadb-10.11.5-r1.ebuild
+++ /dev/null
@@ -1,1326 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-SUBSLOT="18"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-inherit systemd flag-o-matic prefix toolchain-funcs \
-	multiprocessing java-pkg-opt-2 cmake
-
-HOMEPAGE="https://mariadb.org/"
-SRC_URI="mirror://mariadb/${PN}-${PV}/source/${P}.tar.gz
-	https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.11.3-patches-01.tar.xz"
-
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
-IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
-	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
-	sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
-	test xml yassl"
-
-RESTRICT="!bindist? ( bindist ) !test? ( test )"
-
-REQUIRED_USE="jdbc? ( extraengine server !static )
-	?? ( tcmalloc jemalloc )
-	static? ( yassl !pam )
-	test? ( extraengine )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-# <libfmt-10 bugs #938106 #935299
-COMMON_DEPEND="
-	<dev-libs/libfmt-10:=
-	>=dev-libs/libpcre2-10.34:=
-	>=sys-apps/texinfo-4.7-r1
-	sys-libs/ncurses:0=
-	>=sys-libs/zlib-1.2.3:0=
-	virtual/libcrypt:=
-	!bindist? (
-		sys-libs/binutils-libs:0=
-		>=sys-libs/readline-4.1:0=
-	)
-	jemalloc? ( dev-libs/jemalloc:0= )
-	kerberos? ( virtual/krb5 )
-	kernel_linux? (
-		dev-libs/libaio:0=
-		sys-libs/liburing:=
-		sys-process/procps:0=
-	)
-	server? (
-		app-arch/bzip2
-		app-arch/xz-utils
-		backup? ( app-arch/libarchive:0= )
-		columnstore? (
-			app-arch/snappy:=
-			dev-libs/boost:=
-			dev-libs/libxml2:2=
-		)
-		cracklib? ( sys-libs/cracklib:0= )
-		extraengine? (
-			odbc? ( dev-db/unixODBC:0= )
-			xml? ( dev-libs/libxml2:2= )
-		)
-		innodb-lz4? ( app-arch/lz4 )
-		innodb-lzo? ( dev-libs/lzo )
-		innodb-snappy? ( app-arch/snappy:= )
-		mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
-		numa? ( sys-process/numactl )
-		oqgraph? (
-			dev-libs/boost:=
-			dev-libs/judy:0=
-		)
-		pam? ( sys-libs/pam:0= )
-		s3? ( net-misc/curl )
-		systemd? ( sys-apps/systemd:= )
-	)
-	systemtap? ( >=dev-debug/systemtap-1.3:0= )
-	tcmalloc? ( dev-util/google-perftools:0= )
-	yassl? ( net-libs/gnutls:0= )
-	!yassl? (
-		>=dev-libs/openssl-1.0.0:0=
-	)
-"
-BDEPEND="app-alternatives/yacc"
-DEPEND="${COMMON_DEPEND}
-	server? (
-		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
-		test? ( acct-group/mysql acct-user/mysql )
-	)
-	static? ( sys-libs/ncurses[static-libs] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-db/mysql !dev-db/percona-server
-	!dev-db/mariadb:10.3
-	!dev-db/mariadb:10.4
-	!dev-db/mariadb:10.5
-	!dev-db/mariadb:10.6
-	!dev-db/mariadb:10.7
-	!dev-db/mariadb:10.8
-	!dev-db/mariadb:10.9
-	!dev-db/mariadb:10.10
-	!dev-db/mariadb:11.0
-	selinux? ( sec-policy/selinux-mysql )
-	server? (
-		columnstore? ( dev-db/mariadb-connector-c )
-		extraengine? ( jdbc? ( >=virtual/jre-1.8 ) )
-		galera? (
-			sys-apps/iproute2
-			=sys-cluster/galera-26*
-			sst-rsync? ( sys-process/lsof )
-			sst-mariabackup? ( net-misc/socat[ssl] )
-		)
-		!prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
-	)
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		MY_DATADIR=""
-		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-			MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1)
-			if [[ -z "${MY_DATADIR}" ]] ; then
-				MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
-				| sed -e 's/.*=\s*//' \
-				| tail -n1)
-			fi
-		fi
-		if [[ -z "${MY_DATADIR}" ]] ; then
-			MY_DATADIR="${MY_LOCALSTATEDIR}"
-			einfo "Using default MY_DATADIR"
-		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
-				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
-				elog "A new one will not be created."
-				PREVIOUS_DATADIR="yes"
-			else
-				PREVIOUS_DATADIR="no"
-			fi
-			export PREVIOUS_DATADIR
-		fi
-	else
-		if [[ ${EBUILD_PHASE} == "config" ]]; then
-			local new_MY_DATADIR
-			new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1)
-
-			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-				ewarn "MySQL MY_DATADIR has changed"
-				ewarn "from ${MY_DATADIR}"
-				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
-			fi
-		fi
-	fi
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if has test ${FEATURES} ; then
-			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
-			# localhost. Also causes weird failures.
-			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-			if ! has userpriv ${FEATURES} ; then
-				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-			fi
-		fi
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
-}
-
-src_prepare() {
-	eapply "${WORKDIR}"/mariadb-patches
-	eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch
-	eapply "${FILESDIR}"/${PN}-10.6.11-include.patch
-	eapply "${FILESDIR}"/${PN}-10.6.12-gcc-13.patch
-
-	eapply_user
-
-	_disable_plugin() {
-		echo > "${S}/plugin/${1}/CMakeLists.txt" || die
-	}
-	_disable_engine() {
-		echo > "${S}/storage/${1}/CMakeLists.txt" || die
-	}
-
-	if use jemalloc; then
-		echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
-	elif use tcmalloc; then
-		echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
-	fi
-
-	local plugin
-	local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
-				locale_info qc_info server_audit sql_errlog auth_ed25519 )
-	local test_plugins=( audit_null auth_examples daemon_example fulltext
-				debug_key_management example_key_management versioning )
-	if ! use server; then # These plugins are for the server
-		for plugin in "${server_plugins[@]}" ; do
-			_disable_plugin "${plugin}"
-		done
-	fi
-
-	if ! use test; then # These plugins are only used during testing
-		for plugin in "${test_plugins[@]}" ; do
-			_disable_plugin "${plugin}"
-		done
-		_disable_engine test_sql_discovery
-		echo > "${S}/plugin/auth_pam/testing/CMakeLists.txt" || die
-	fi
-
-	_disable_engine example
-
-	if ! use oqgraph ; then # avoids extra library checks
-		_disable_engine oqgraph
-	fi
-
-	if use mroonga ; then
-		# Remove the bundled groonga
-		# There is no CMake flag, it simply checks for existance
-		rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
-	else
-		_disable_engine mroonga
-	fi
-
-	# Fix static bindings in galera replication
-	sed -i -e 's~add_library(wsrep_api_v26$~add_library(wsrep_api_v26 STATIC~' \
-		"${S}"/wsrep-lib/wsrep-API/CMakeLists.txt || die
-	sed -i -e 's~add_library(wsrep-lib$~add_library(wsrep-lib STATIC~' \
-		"${S}"/wsrep-lib/src/CMakeLists.txt || die
-
-	# Fix galera_recovery.sh script
-	sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
-		scripts/galera_recovery.sh || die
-
-	sed -i -e 's~ \$basedir/lib/\*/mariadb19/plugin~~' \
-		"${S}"/scripts/mysql_install_db.sh || die
-
-	cmake_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	# bug #855233 (MDEV-11914, MDEV-25633) at least
-	filter-lto
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# bug #945352
-	append-cflags -std=gnu17
-
-	append-cxxflags -felide-constructors
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mariadb
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
-		-DINSTALL_SCRIPTDIR=bin
-		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
-		-DWITH_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-		-DWITH_LIBEDIT=0
-		-DWITH_LIBFMT=system
-		-DWITH_ZLIB=system
-		-DWITHOUT_LIBWRAP=1
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		-DWITH_DEFAULT_FEATURE_SET=0
-		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
-		# The build forces this to be defined when cross-compiling.  We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
-		-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-		-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
-		-DCONC_WITH_EXTERNAL_ZLIB=YES
-		-DWITH_EXTERNAL_ZLIB=YES
-		-DSUFFIX_INSTALL_DIR=""
-		-DWITH_UNITTEST=OFF
-		-DWITHOUT_CLIENTLIBS=YES
-		-DCLIENT_PLUGIN_DIALOG=OFF
-		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
-		-DCLIENT_PLUGIN_CLIENT_ED25519=OFF
-		-DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
-		-DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
-	)
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	if ! use yassl ; then
-		mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
-	else
-		mycmakeargs+=( -DWITH_SSL=bundled )
-	fi
-
-	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
-	mycmakeargs+=(
-		-DWITH_READLINE=$(usex bindist 1 0)
-		-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
-		-DENABLE_DTRACE=$(usex systemtap)
-	)
-
-	if use server ; then
-		# Connect and Federated{,X} must be treated special
-		# otherwise they will not be built as plugins
-		if ! use extraengine ; then
-			mycmakeargs+=(
-				-DPLUGIN_CONNECT=NO
-				-DPLUGIN_FEDERATED=NO
-				-DPLUGIN_FEDERATEDX=NO
-			)
-		fi
-
-		mycmakeargs+=(
-			-DWITH_PCRE=system
-			-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
-			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
-			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
-			-DPLUGIN_AWS_KEY_MANAGEMENT=NO
-			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
-			-DPLUGIN_S3=$(usex s3 YES NO)
-			-DPLUGIN_COLUMNSTORE=$(usex columnstore YES NO)
-			-DCONNECT_WITH_MYSQL=1
-			-DCONNECT_WITH_LIBXML2=$(usex xml)
-			-DCONNECT_WITH_ODBC=$(usex odbc)
-			-DCONNECT_WITH_JDBC=$(usex jdbc)
-			# Build failure and autodep wrt bug 639144
-			-DCONNECT_WITH_MONGO=OFF
-			-DWITH_WSREP=$(usex galera)
-			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
-			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
-			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
-			-DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
-			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-			-DWITH_MARIABACKUP=$(usex backup ON OFF)
-			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
-			-DINSTALL_SQLBENCHDIR=""
-			-DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
-			# systemd is only linked to for server notification
-			-DWITH_SYSTEMD=$(usex systemd yes no)
-			-DWITH_NUMA=$(usex numa ON OFF)
-		)
-
-		if use test ; then
-			# This is needed for the new client lib which tests a real, open server
-			mycmakeargs+=( -DSKIP_TESTS=ON )
-		fi
-
-		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
-			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-			ewarn "You MUST file bugs without these variables set."
-
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-			)
-
-		elif ! use latin1 ; then
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=utf8mb4
-				-DDEFAULT_COLLATION=utf8mb4_unicode_520_ci
-			)
-		else
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=latin1
-				-DDEFAULT_COLLATION=latin1_swedish_ci
-			)
-		fi
-		mycmakeargs+=(
-			-DEXTRA_CHARSETS=all
-			-DMYSQL_USER=mysql
-			-DDISABLE_SHARED=$(usex static YES NO)
-			-DWITH_DEBUG=$(usex debug)
-			-DWITH_EMBEDDED_SERVER=OFF
-			-DWITH_PROFILING=$(usex profiling)
-		)
-
-		if use static; then
-			mycmakeargs+=( -DWITH_PIC=1 )
-		fi
-
-		if use jemalloc || use tcmalloc ; then
-			mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-			-DWITH_PARTITION_STORAGE_ENGINE=1
-		)
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DWITH_EMBEDDED_SERVER=OFF
-			-DEXTRA_CHARSETS=none
-			-DINSTALL_SQLBENCHDIR=
-			-DWITH_SYSTEMD=no
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-# Official test instructions:
-# USE='extraengine perl server' \
-# FEATURES='test userpriv' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	_disable_test() {
-		local rawtestname bug reason
-		rawtestname="${1}" ; shift
-		bug="${1}" ; shift
-		reason="${@}"
-		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
-		echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_tests
-
-	if ! use server ; then
-		einfo "Skipping server tests due to minimal build."
-		return 0
-	fi
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-	if [[ -z "${MTR_PARALLEL}" ]] ; then
-		local -x MTR_PARALLEL=$(makeopts_jobs)
-
-		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
-			# Running multiple tests in parallel usually require higher ulimit
-			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
-			# are known to hit timeout when system is busy.
-			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
-			# using "auto".
-			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
-			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
-			einfo "${info_msg}"
-			unset info_msg
-			MTR_PARALLEL=4
-		fi
-	else
-		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
-	fi
-
-	# Try to increase file limits to increase test coverage
-	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
-		# Upper limit comes from parts.partition_* tests
-		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
-
-		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
-			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
-			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
-
-			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
-				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
-			else
-				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
-			fi
-		else
-			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
-		fi
-	else
-		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
-	fi
-
-	# create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	if [[ ! -f "${S}/mysql-test/unstable-tests" ]] ; then
-		touch "${S}"/mysql-test/unstable-tests || die
-	fi
-
-	cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
-
-	local -a disabled_tests
-	disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
-	disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
-	disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
-	disabled_tests+=( "main.gis;25095;Known rounding error with latest AMD processors" )
-	disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
-	disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
-	disabled_tests+=( "main.mysql_upgrade;27044;Sporadically failing test" )
-	disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
-	disabled_tests+=( "main.selectivity_no_engine;26320;Sporadically failing test" )
-	disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
-	disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
-	disabled_tests+=( "main.upgrade_MDEV-19650;25096;Known to be broken" )
-	disabled_tests+=( "mariabackup.*;0;Broken test suite" )
-	disabled_tests+=( "perfschema.nesting;23458;Known to be broken" )
-	disabled_tests+=( "perfschema.prepared_statements;0;Broken test suite" )
-	disabled_tests+=( "perfschema.privilege_table_io;27045;Sporadically failing test" )
-	disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
-	disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
-	disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
-	disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
-	disabled_tests+=( "spider.*;0;Fails with network sandbox" )
-	disabled_tests+=( "sys_vars.wsrep_on_without_provider;25625;Known to be broken" )
-
-	if ! use latin1 ; then
-		disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
-		disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
-		disabled_tests+=( "main.sp2;24177;Requires USE=latin1" )
-		disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
-		disabled_tests+=( "main.upgrade_MDEV-19650;24178;Requires USE=latin1" )
-	fi
-
-	local test_infos_str test_infos_arr
-	for test_infos_str in "${disabled_tests[@]}" ; do
-		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
-
-		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
-			die "Invalid test data set, not matching format: ${test_infos_str}"
-		fi
-
-		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
-	done
-	unset test_infos_str test_infos_arr
-
-	# run mysql-test tests
-	pushd "${TESTDIR}" &>/dev/null || die
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd &>/dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "${failures}" ]] || die "Test failures: ${failures}"
-	einfo "Tests successfully completed"
-}
-
-src_install() {
-	cmake_src_install
-
-	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
-	if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
-		rm "${ED}/usr/include/mysql/server/private/config.h" || die
-	fi
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED}/usr/data" ]] ; then
-		rm -Rf "${ED}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
-	cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
-	eprefixify "${TMPDIR}/my.cnf"
-	doins "${TMPDIR}/my.cnf"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
-	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
-	eprefixify "${TMPDIR}/50-distro-client.cnf"
-	doins "${TMPDIR}/50-distro-client.cnf"
-
-	if use server ; then
-		mycnf_src="my.cnf.distro-server"
-		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-			"${FILESDIR}/${mycnf_src}" \
-			> "${TMPDIR}/my.cnf.ok" || die
-		if use prefix ; then
-			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
-				"${TMPDIR}/my.cnf.ok" || die
-		fi
-		if use latin1 ; then
-			sed -i \
-				-e "/character-set/s|utf8|latin1|g" \
-				"${TMPDIR}/my.cnf.ok" || die
-		fi
-		eprefixify "${TMPDIR}/my.cnf.ok"
-		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
-		einfo "Including support files and sample configurations"
-		docinto "support-files"
-		local script
-		for script in \
-			"${S}"/support-files/magic
-		do
-			[[ -f "$script" ]] && dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in "${S}"/scripts/mysql* ; do
-			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
-		done
-		# Manually install supporting files that conflict with other packages
-		# but are needed for galera and initial installation
-		exeinto /usr/libexec/mariadb
-		doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
-
-		if use pam ; then
-			keepdir /usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir
-		fi
-	fi
-
-	# Conflicting files
-	conflicting_files=()
-
-	# We prefer my_print_defaults from dev-db/mysql-connector-c
-	conflicting_files=( "${ED}/usr/share/man/man1/my_print_defaults.1" )
-
-	# Remove bundled mytop in favor of dev-db/mytop
-	conflicting_files+=( "${ED}/usr/bin/mytop" )
-	conflicting_files+=( "${ED}/usr/share/man/man1/mytop.1" )
-
-	local conflicting_file
-	for conflicting_file in "${conflicting_files[@]}" ; do
-		if [[ -e "${conflicting_file}" ]] ; then
-			rm -v "${conflicting_file}" || die
-		fi
-	done
-
-	# Fix a dangling symlink when galera is not built
-	if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
-		rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
-	fi
-
-	# Remove dangling symlink
-	rm "${ED}/usr/$(get_libdir)/libmariadb.a" || die
-
-	# Remove broken SST scripts that are incompatible
-	local scriptremove
-	for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
-		if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
-			rm "${ED}/usr/bin/${scriptremove}" || die
-		fi
-	done
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	[[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}"
-
-	if use server ; then
-		if use pam; then
-			einfo
-			elog "This install includes the PAM authentication plugin."
-			elog "To activate and configure the PAM plugin, please read:"
-			elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
-			einfo
-			chown mysql:mysql "${EROOT}/usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir" || die
-		fi
-
-		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-			einfo
-			elog "You might want to run:"
-			elog "\"emerge --config =${CATEGORY}/${PF}\""
-			elog "if this is a new install."
-			elog
-			elog "If you are switching server implentations, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		else
-			einfo
-			elog "If you are upgrading major versions, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		fi
-
-		if use galera ; then
-			einfo
-			elog "Be sure to edit the my.cnf file to activate your cluster settings."
-			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
-			elog "The first time the cluster is activated, you should add"
-			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
-			elog "This option should then be removed for subsequent starts."
-			einfo
-			if [[ -n "${REPLACING_VERSIONS}" ]] ; then
-				local rver
-				for rver in ${REPLACING_VERSIONS} ; do
-					if ver_test "${rver}" -lt "10.4.0" ; then
-						ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster."
-						ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"
-						ewarn "for more information"
-					fi
-				done
-			fi
-		fi
-	fi
-
-	# Note about configuration change
-	einfo
-	elog "This version of mariadb reorganizes the configuration from a single my.cnf"
-	elog "to several files in /etc/mysql/${PN}.d."
-	elog "Please backup any changes you made to /etc/mysql/my.cnf"
-	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
-	elog "You may have as many files as needed and they are read alphabetically."
-	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
-	einfo
-}
-
-pkg_config() {
-	_getoptval() {
-		local section="${1}"
-		local option="--${2}"
-		local extra_options="${3}"
-		local cmd=(
-			"${my_print_defaults_binary}"
-			"${extra_options}"
-			"${section}"
-		)
-
-		local values=()
-		local parameters=( $(eval "${cmd[@]}" 2>/dev/null) )
-		for parameter in "${parameters[@]}"
-		do
-			# my_print_defaults guarantees output of options, one per line,
-			# in the form that they would be specified on the command line.
-			# So checking for --option=* should be safe.
-			case ${parameter} in
-				${option}=*)
-					values+=( "${parameter#*=}" )
-					;;
-			esac
-		done
-
-		if [[ ${#values[@]} -gt 0 ]] ; then
-			# Option could have been set multiple times
-			# in which case only the last occurrence
-			# contains the current value
-			echo "${values[-1]}"
-		fi
-	}
-
-	_mktemp_dry() {
-		# emktemp has no --dry-run option
-		local template="${1}"
-
-		if [[ -z "${template}" ]] ; then
-			if [[ -z "${T}" ]] ; then
-				template="/tmp/XXXXXXX"
-			else
-				template="${T}/XXXXXXX"
-			fi
-		fi
-
-		local template_wo_X=${template//X/}
-		local n_X
-		let n_X=${#template}-${#template_wo_X}
-		if [[ ${n_X} -lt 3 ]] ; then
-			echo "${FUNCNAME[0]}: too few X's in template '${template}'" >&2
-			return
-		fi
-
-		local attempts=0
-		local character tmpfile
-		while [[ true ]] ; do
-			let attempts=attempts+1
-
-			new_file=
-			while read -n1 character ; do
-				if [[ "${character}" == "X" ]] ; then
-					tmpfile+="${RANDOM:0:1}"
-				else
-					tmpfile+="${character}"
-				fi
-			done < <(echo -n "${template}")
-
-			if [[ ! -f "${tmpfile}" ]]
-			then
-				echo "${tmpfile}"
-				return
-			fi
-
-			if [[ ${attempts} -ge 100 ]] ; then
-				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
-				return
-			fi
-		done
-	}
-
-	local mysql_binary="${EROOT}/usr/bin/mysql"
-	if [[ ! -x "${mysql_binary}" ]] ; then
-		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
-	if [[ ! -x "${mysqld_binary}" ]] ; then
-		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
-	if [[ ! -x "${mysql_install_db_binary}" ]] ; then
-		die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
-	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
-		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
-	fi
-
-	if [[ -z "${MYSQL_USER}" ]] ; then
-		MYSQL_USER=mysql
-		if use prefix ; then
-			MYSQL_USER=$(id -u -n 2>/dev/null)
-			if [[ -z "${MYSQL_USER}" ]] ; then
-				die "Failed to determine current username!"
-			fi
-		fi
-	fi
-
-	if [[ -z "${MYSQL_GROUP}" ]] ; then
-		MYSQL_GROUP=mysql
-		if use prefix ; then
-			MYSQL_GROUP=$(id -g -n 2>/dev/null)
-			if [[ -z "${MYSQL_GROUP}" ]] ; then
-				die "Failed to determine current user groupname!"
-			fi
-		fi
-	fi
-
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	local -x HOME="${EROOT}/root"
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Read currently set data directory
-	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		die "Sorry, unable to find MY_DATADIR!"
-	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
-		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
-		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
-		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
-	fi
-
-	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
-	# These are dir+prefix
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-
-	# Create missing directories.
-	# Always check if mysql user can write to directory even if we just
-	# created directory because a parent directory might be not
-	# accessible for that user.
-	PID_DIR="${EROOT}/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]] ; then
-		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
-		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
-			|| die "Failed to create PID directory '${PID_DIR}'!"
-	fi
-
-	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_pid_dir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_pid_dir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
-	else
-		rm "${_pid_dir_testfile}" || die
-		unset _pid_dir_testfile
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]] ; then
-		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
-			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
-	fi
-
-	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_datadir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_datadir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
-	else
-		rm "${_my_datadir_testfile}" || die
-		unset _my_datadir_testfile
-	fi
-
-	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
-		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
-			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
-	fi
-
-	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
-		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
-		[[ -z "${MYSQL_TMPDIR}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
-
-		mkdir "${MYSQL_TMPDIR}" || die
-		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
-	fi
-
-	# Now we need to test MYSQL_TMPDIR...
-	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_tmpdir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_tmpdir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
-	else
-		rm "${_my_tmpdir_testfile}" || die
-		unset _my_tmpdir_testfile
-	fi
-
-	if [[ "${MYSQL_LOG_BIN}" == /* && ! -d "${MYSQL_LOG_BIN}" ]] ; then
-		# Only create directory when MYSQL_LOG_BIN is an absolute path
-		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
-			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
-	fi
-
-	if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
-		# Only test when MYSQL_LOG_BIN is an absolute path
-		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_logbin_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_logbin_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
-		else
-			rm "${_my_logbin_testfile}" || die
-			unset _my_logbin_testfile
-		fi
-	fi
-
-	if [[ "${MYSQL_RELAY_LOG}" == /* && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
-		# Only create directory when MYSQL_RELAY_LOG is an absolute path
-		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
-			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
-	fi
-
-	if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
-		# Only test when MYSQL_RELAY_LOG is an absolute path
-		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_relaylog_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_relaylog_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
-		else
-			rm "${_my_relaylog_testfile}" || die
-			unset _my_relaylog_testfile
-		fi
-	fi
-
-	local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
-	[[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
-
-	# Limit access
-	chmod 0770 "${SETUP_TMPDIR}" || die
-	chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
-
-	local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
-	local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
-
-	echo ""
-	einfo "Detected settings:"
-	einfo "=================="
-	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
-	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
-	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
-	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
-
-	if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
-		# Absolute path for binary log files specified
-		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
-	fi
-
-	if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
-		# Absolute path for relay log files specified
-		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
-	fi
-
-	einfo "PID DIR:\t\t\t\t${PID_DIR}"
-	einfo "Install db log:\t\t\t${mysql_install_log}"
-	einfo "Install server log:\t\t\t${mysqld_logfile}"
-
-	echo
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client ; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local pwd1="a"
-		local pwd2="b"
-
-		echo
-		einfo "No password for mysql 'root' user was specified via environment"
-		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
-		einfo "file like '${HOME}/.my.cnf'."
-		einfo "To continue please provide a password for the mysql 'root' user"
-		einfo "now on console:"
-		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
-			die "Passwords are not the same!"
-		fi
-
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-
-		echo
-	fi
-
-	local -a mysqld_options
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR}/mysqld-help"
-	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-
-	local opt optexp optfull
-	for opt in host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-	; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
-	done
-
-	# Prepare timezones, see
-	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	local tz_sql="${SETUP_TMPDIR}/tz.sql"
-
-	echo "USE mysql;" >"${tz_sql}"
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
-	if [[ $? -ne 0 ]] ; then
-		die "mysql_tzinfo_to_sql failed!"
-	fi
-
-	local cmd=(
-		"${mysql_install_db_binary}"
-		"${mysqld_options[@]}"
-		"--init-file='${tz_sql}'"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		"--log-error='${mysql_install_log}'"
-		"--rpm"
-		"--cross-bootstrap"
-		"--skip-test-db"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Initializing ${PN} data directory: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
-
-	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
-		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
-	fi
-
-	local x=${RANDOM}
-	local socket="${PID_DIR}/mysqld.${x}.sock"
-	[[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
-	local pidfile="${PID_DIR}/mysqld.${x}.pid"
-	[[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
-	unset x
-
-	cmd=(
-		"${mysqld_binary}"
-		"${mysqld_options[@]}"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		--max_allowed_packet=8M
-		--net_buffer_length=16K
-		"--socket='${socket}'"
-		"--pid-file='${pidfile}'"
-		"--log-error='${mysqld_logfile}'"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
-
-	echo -n "Waiting for mysqld to accept connections "
-	local maxtry=15
-	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-
-	if [[ -S "${socket}" ]] ; then
-		# Even with a socket we don't know if mysqld will abort
-		# start due to an error so just wait a little bit more...
-		maxtry=5
-		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-	fi
-
-	echo
-
-	if [[ ! -S "${socket}" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
-		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
-	fi
-
-	local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
-	touch "${mysql_logfile}" || die
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
-	cmd=(
-		"${mysql_binary}"
-		--no-defaults
-		"--socket='${socket}'"
-		-hlocalhost
-		"-e \"${sql}\""
-	)
-	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
-	local rc=$?
-	eend ${rc}
-
-	if [[ ${rc} -ne 0 ]] ; then
-		# Poor man's solution which tries to avoid having password
-		# in log.  NOTE: sed can fail if user didn't follow advice
-		# and included character which will require escaping...
-		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
-
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
-		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
-	fi
-
-	# Stop the server
-	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-		echo -n "Stopping the server "
-		pkill -F "${pidfile}" &>/dev/null
-
-		maxtry=10
-		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-
-		echo
-
-		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-			# We somehow failed to stop server.
-			# However, not a fatal error. Just warn the user.
-			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
-		fi
-	fi
-
-	rm -r "${SETUP_TMPDIR}" || die
-
-	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
-}
diff --git a/dev-db/mariadb/mariadb-10.6.14.ebuild b/dev-db/mariadb/mariadb-10.6.14.ebuild
deleted file mode 100644
index 9255fba16887..000000000000
--- a/dev-db/mariadb/mariadb-10.6.14.ebuild
+++ /dev/null
@@ -1,1342 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-SUBSLOT="18"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-inherit systemd flag-o-matic prefix toolchain-funcs \
-	multiprocessing java-pkg-opt-2 cmake
-
-HOMEPAGE="https://mariadb.org/"
-SRC_URI="mirror://mariadb/${PN}-${PV}/source/${P}.tar.gz
-	https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.13-patches-01.tar.xz"
-
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
-IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
-	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
-	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
-	sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
-	test xml yassl"
-
-RESTRICT="!bindist? ( bindist ) !test? ( test )"
-
-REQUIRED_USE="jdbc? ( extraengine server !static )
-	?? ( tcmalloc jemalloc )
-	static? ( yassl !pam )
-	test? ( extraengine )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
-	>=dev-libs/libpcre2-10.34:=
-	>=sys-apps/texinfo-4.7-r1
-	sys-libs/ncurses:0=
-	>=sys-libs/zlib-1.2.3:0=
-	virtual/libcrypt:=
-	!bindist? (
-		sys-libs/binutils-libs:0=
-		>=sys-libs/readline-4.1:0=
-	)
-	jemalloc? ( dev-libs/jemalloc:0= )
-	kerberos? ( virtual/krb5 )
-	kernel_linux? (
-		dev-libs/libaio:0=
-		sys-libs/liburing:=
-		sys-process/procps:0=
-	)
-	server? (
-		app-arch/bzip2
-		app-arch/xz-utils
-		backup? ( app-arch/libarchive:0= )
-		columnstore? (
-			app-arch/snappy:=
-			dev-libs/boost:=
-			dev-libs/libxml2:2=
-		)
-		cracklib? ( sys-libs/cracklib:0= )
-		extraengine? (
-			odbc? ( dev-db/unixODBC:0= )
-			xml? ( dev-libs/libxml2:2= )
-		)
-		innodb-lz4? ( app-arch/lz4 )
-		innodb-lzo? ( dev-libs/lzo )
-		innodb-snappy? ( app-arch/snappy:= )
-		mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
-		numa? ( sys-process/numactl )
-		oqgraph? (
-			dev-libs/boost:=
-			dev-libs/judy:0=
-		)
-		pam? ( sys-libs/pam:0= )
-		s3? ( net-misc/curl )
-		systemd? ( sys-apps/systemd:= )
-	)
-	systemtap? ( >=dev-debug/systemtap-1.3:0= )
-	tcmalloc? ( dev-util/google-perftools:0= )
-	yassl? ( net-libs/gnutls:0= )
-	!yassl? (
-		>=dev-libs/openssl-1.0.0:0=
-	)
-"
-BDEPEND="app-alternatives/yacc"
-DEPEND="${COMMON_DEPEND}
-	server? (
-		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
-		test? ( acct-group/mysql acct-user/mysql )
-	)
-	static? ( sys-libs/ncurses[static-libs] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
-	!dev-db/mariadb:0
-	!dev-db/mariadb:5.5
-	!dev-db/mariadb:10.1
-	!dev-db/mariadb:10.2
-	!dev-db/mariadb:10.3
-	!dev-db/mariadb:10.4
-	!dev-db/mariadb:10.5
-	!dev-db/mariadb:10.7
-	!dev-db/mariadb:10.8
-	!dev-db/mariadb:10.9
-	!dev-db/mariadb:10.10
-	!dev-db/mariadb:10.11
-	!dev-db/mariadb:11.0
-	!<virtual/mysql-5.6-r11
-	!<virtual/libmysqlclient-18-r1
-	selinux? ( sec-policy/selinux-mysql )
-	server? (
-		columnstore? ( dev-db/mariadb-connector-c )
-		extraengine? ( jdbc? ( >=virtual/jre-1.8 ) )
-		galera? (
-			sys-apps/iproute2
-			=sys-cluster/galera-26*
-			sst-rsync? ( sys-process/lsof )
-			sst-mariabackup? ( net-misc/socat[ssl] )
-		)
-		!prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
-	)
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# These don't exist on Linux
-	pthread_threadid_np
-	getthrid
-)
-
-mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		MY_DATADIR=""
-		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-			MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1)
-			if [[ -z "${MY_DATADIR}" ]] ; then
-				MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
-				| sed -e 's/.*=\s*//' \
-				| tail -n1)
-			fi
-		fi
-		if [[ -z "${MY_DATADIR}" ]] ; then
-			MY_DATADIR="${MY_LOCALSTATEDIR}"
-			einfo "Using default MY_DATADIR"
-		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
-				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
-				elog "A new one will not be created."
-				PREVIOUS_DATADIR="yes"
-			else
-				PREVIOUS_DATADIR="no"
-			fi
-			export PREVIOUS_DATADIR
-		fi
-	else
-		if [[ ${EBUILD_PHASE} == "config" ]]; then
-			local new_MY_DATADIR
-			new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1)
-
-			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-				ewarn "MySQL MY_DATADIR has changed"
-				ewarn "from ${MY_DATADIR}"
-				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
-			fi
-		fi
-	fi
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if has test ${FEATURES} ; then
-			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
-			# localhost. Also causes weird failures.
-			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-			if ! has userpriv ${FEATURES} ; then
-				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-			fi
-		fi
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
-}
-
-src_prepare() {
-	eapply "${WORKDIR}"/mariadb-patches
-	eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch
-	eapply "${FILESDIR}"/${PN}-10.6.11-include.patch
-	eapply "${FILESDIR}"/${PN}-10.6.12-gcc-13.patch
-	eapply "${FILESDIR}"/${PN}-10.6.17-libxml-2.12.patch
-
-	eapply_user
-
-	_disable_plugin() {
-		echo > "${S}/plugin/${1}/CMakeLists.txt" || die
-	}
-	_disable_engine() {
-		echo > "${S}/storage/${1}/CMakeLists.txt" || die
-	}
-
-	if use jemalloc; then
-		echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
-	elif use tcmalloc; then
-		echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
-	fi
-
-	local plugin
-	local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
-				locale_info qc_info server_audit sql_errlog auth_ed25519 )
-	local test_plugins=( audit_null auth_examples daemon_example fulltext
-				debug_key_management example_key_management versioning )
-	if ! use server; then # These plugins are for the server
-		for plugin in "${server_plugins[@]}" ; do
-			_disable_plugin "${plugin}"
-		done
-	fi
-
-	if ! use test; then # These plugins are only used during testing
-		for plugin in "${test_plugins[@]}" ; do
-			_disable_plugin "${plugin}"
-		done
-		_disable_engine test_sql_discovery
-		echo > "${S}/plugin/auth_pam/testing/CMakeLists.txt" || die
-	fi
-
-	_disable_engine example
-
-	if ! use oqgraph ; then # avoids extra library checks
-		_disable_engine oqgraph
-	fi
-
-	if use mroonga ; then
-		# Remove the bundled groonga
-		# There is no CMake flag, it simply checks for existance
-		rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
-	else
-		_disable_engine mroonga
-	fi
-
-	# Fix static bindings in galera replication
-	sed -i -e 's~add_library(wsrep_api_v26$~add_library(wsrep_api_v26 STATIC~' \
-		"${S}"/wsrep-lib/wsrep-API/CMakeLists.txt || die
-	sed -i -e 's~add_library(wsrep-lib$~add_library(wsrep-lib STATIC~' \
-		"${S}"/wsrep-lib/src/CMakeLists.txt || die
-
-	# Fix galera_recovery.sh script
-	sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
-		scripts/galera_recovery.sh || die
-
-	sed -i -e 's~ \$basedir/lib/\*/mariadb19/plugin~~' \
-		"${S}"/scripts/mysql_install_db.sh || die
-
-	cmake_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	# bug #855233 (MDEV-11914, MDEV-25633) at least
-	filter-lto
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# bug #945352
-	append-cflags -std=gnu17
-
-	append-cxxflags -felide-constructors
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mariadb
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
-		-DINSTALL_SCRIPTDIR=bin
-		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
-		-DWITH_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-		-DWITH_LIBEDIT=0
-		-DWITH_ZLIB=system
-		-DWITHOUT_LIBWRAP=1
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		-DWITH_DEFAULT_FEATURE_SET=0
-		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
-		# The build forces this to be defined when cross-compiling.  We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
-		-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-		-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
-		-DCONC_WITH_EXTERNAL_ZLIB=YES
-		-DWITH_EXTERNAL_ZLIB=YES
-		-DSUFFIX_INSTALL_DIR=""
-		-DWITH_UNITTEST=OFF
-		-DWITHOUT_CLIENTLIBS=YES
-		-DCLIENT_PLUGIN_DIALOG=OFF
-		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
-		-DCLIENT_PLUGIN_CLIENT_ED25519=OFF
-		-DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
-		-DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
-	)
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	if ! use yassl ; then
-		mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
-	else
-		mycmakeargs+=( -DWITH_SSL=bundled )
-	fi
-
-	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
-		mycmakeargs+=(
-			-DDTRACE="${BROOT}"/usr/bin/stap-dtrace
-		)
-	fi
-
-	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
-	mycmakeargs+=(
-		-DWITH_READLINE=$(usex bindist 1 0)
-		-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
-		-DENABLE_DTRACE=$(usex systemtap)
-	)
-
-	if use server ; then
-		# Connect and Federated{,X} must be treated special
-		# otherwise they will not be built as plugins
-		if ! use extraengine ; then
-			mycmakeargs+=(
-				-DPLUGIN_CONNECT=NO
-				-DPLUGIN_FEDERATED=NO
-				-DPLUGIN_FEDERATEDX=NO
-			)
-		fi
-
-		mycmakeargs+=(
-			-DWITH_PCRE=system
-			-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
-			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
-			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
-			-DPLUGIN_AWS_KEY_MANAGEMENT=NO
-			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
-			-DPLUGIN_S3=$(usex s3 YES NO)
-			-DPLUGIN_COLUMNSTORE=$(usex columnstore YES NO)
-			-DCONNECT_WITH_MYSQL=1
-			-DCONNECT_WITH_LIBXML2=$(usex xml)
-			-DCONNECT_WITH_ODBC=$(usex odbc)
-			-DCONNECT_WITH_JDBC=$(usex jdbc)
-			# Build failure and autodep wrt bug 639144
-			-DCONNECT_WITH_MONGO=OFF
-			-DWITH_WSREP=$(usex galera)
-			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
-			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
-			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
-			-DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
-			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-			-DWITH_MARIABACKUP=$(usex backup ON OFF)
-			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
-			-DINSTALL_SQLBENCHDIR=""
-			-DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
-			# systemd is only linked to for server notification
-			-DWITH_SYSTEMD=$(usex systemd yes no)
-			-DWITH_NUMA=$(usex numa ON OFF)
-		)
-
-		if use test ; then
-			# This is needed for the new client lib which tests a real, open server
-			mycmakeargs+=( -DSKIP_TESTS=ON )
-		fi
-
-		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
-			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-			ewarn "You MUST file bugs without these variables set."
-
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-			)
-
-		elif ! use latin1 ; then
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=utf8mb4
-				-DDEFAULT_COLLATION=utf8mb4_unicode_520_ci
-			)
-		else
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=latin1
-				-DDEFAULT_COLLATION=latin1_swedish_ci
-			)
-		fi
-		mycmakeargs+=(
-			-DEXTRA_CHARSETS=all
-			-DMYSQL_USER=mysql
-			-DDISABLE_SHARED=$(usex static YES NO)
-			-DWITH_DEBUG=$(usex debug)
-			-DWITH_EMBEDDED_SERVER=OFF
-			-DWITH_PROFILING=$(usex profiling)
-		)
-
-		if use static; then
-			mycmakeargs+=( -DWITH_PIC=1 )
-		fi
-
-		if use jemalloc || use tcmalloc ; then
-			mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-			-DWITH_PARTITION_STORAGE_ENGINE=1
-		)
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DWITH_EMBEDDED_SERVER=OFF
-			-DEXTRA_CHARSETS=none
-			-DINSTALL_SQLBENCHDIR=
-			-DWITH_SYSTEMD=no
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-# Official test instructions:
-# USE='extraengine perl server' \
-# FEATURES='test userpriv' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	_disable_test() {
-		local rawtestname bug reason
-		rawtestname="${1}" ; shift
-		bug="${1}" ; shift
-		reason="${@}"
-		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
-		echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_tests
-
-	if ! use server ; then
-		einfo "Skipping server tests due to minimal build."
-		return 0
-	fi
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-	if [[ -z "${MTR_PARALLEL}" ]] ; then
-		local -x MTR_PARALLEL=$(makeopts_jobs)
-
-		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
-			# Running multiple tests in parallel usually require higher ulimit
-			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
-			# are known to hit timeout when system is busy.
-			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
-			# using "auto".
-			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
-			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
-			einfo "${info_msg}"
-			unset info_msg
-			MTR_PARALLEL=4
-		fi
-	else
-		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
-	fi
-
-	# Try to increase file limits to increase test coverage
-	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
-		# Upper limit comes from parts.partition_* tests
-		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
-
-		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
-			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
-			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
-
-			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
-				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
-			else
-				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
-			fi
-		else
-			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
-		fi
-	else
-		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
-	fi
-
-	# create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	if [[ ! -f "${S}/mysql-test/unstable-tests" ]] ; then
-		touch "${S}"/mysql-test/unstable-tests || die
-	fi
-
-	cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
-
-	local -a disabled_tests
-	disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
-	disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
-	disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
-	disabled_tests+=( "main.gis;25095;Known rounding error with latest AMD processors" )
-	disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
-	disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
-	disabled_tests+=( "main.mysql_upgrade;27044;Sporadically failing test" )
-	disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
-	disabled_tests+=( "main.selectivity_no_engine;26320;Sporadically failing test" )
-	disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
-	disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
-	disabled_tests+=( "main.upgrade_MDEV-19650;25096;Known to be broken" )
-	disabled_tests+=( "mariabackup.*;0;Broken test suite" )
-	disabled_tests+=( "perfschema.nesting;23458;Known to be broken" )
-	disabled_tests+=( "perfschema.prepared_statements;0;Broken test suite" )
-	disabled_tests+=( "perfschema.privilege_table_io;27045;Sporadically failing test" )
-	disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
-	disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
-	disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
-	disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
-	disabled_tests+=( "spider.*;0;Fails with network sandbox" )
-	disabled_tests+=( "sys_vars.wsrep_on_without_provider;25625;Known to be broken" )
-
-	if ! use latin1 ; then
-		disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
-		disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
-		disabled_tests+=( "main.sp2;24177;Requires USE=latin1" )
-		disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
-		disabled_tests+=( "main.upgrade_MDEV-19650;24178;Requires USE=latin1" )
-	fi
-
-	local test_infos_str test_infos_arr
-	for test_infos_str in "${disabled_tests[@]}" ; do
-		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
-
-		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
-			die "Invalid test data set, not matching format: ${test_infos_str}"
-		fi
-
-		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
-	done
-	unset test_infos_str test_infos_arr
-
-	# run mysql-test tests
-	pushd "${TESTDIR}" &>/dev/null || die
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd &>/dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "${failures}" ]] || die "Test failures: ${failures}"
-	einfo "Tests successfully completed"
-}
-
-src_install() {
-	cmake_src_install
-
-	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
-	if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
-		rm "${ED}/usr/include/mysql/server/private/config.h" || die
-	fi
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED}/usr/data" ]] ; then
-		rm -Rf "${ED}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
-	cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
-	eprefixify "${TMPDIR}/my.cnf"
-	doins "${TMPDIR}/my.cnf"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
-	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
-	eprefixify "${TMPDIR}/50-distro-client.cnf"
-	doins "${TMPDIR}/50-distro-client.cnf"
-
-	if use server ; then
-		mycnf_src="my.cnf.distro-server"
-		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-			"${FILESDIR}/${mycnf_src}" \
-			> "${TMPDIR}/my.cnf.ok" || die
-		if use prefix ; then
-			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
-				"${TMPDIR}/my.cnf.ok" || die
-		fi
-		if use latin1 ; then
-			sed -i \
-				-e "/character-set/s|utf8|latin1|g" \
-				"${TMPDIR}/my.cnf.ok" || die
-		fi
-		eprefixify "${TMPDIR}/my.cnf.ok"
-		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
-		einfo "Including support files and sample configurations"
-		docinto "support-files"
-		local script
-		for script in \
-			"${S}"/support-files/magic
-		do
-			[[ -f "$script" ]] && dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in "${S}"/scripts/mysql* ; do
-			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
-		done
-		# Manually install supporting files that conflict with other packages
-		# but are needed for galera and initial installation
-		exeinto /usr/libexec/mariadb
-		doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
-
-		if use pam ; then
-			keepdir /usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir
-		fi
-	fi
-
-	# Conflicting files
-	conflicting_files=()
-
-	# We prefer my_print_defaults from dev-db/mysql-connector-c
-	conflicting_files=( "${ED}/usr/share/man/man1/my_print_defaults.1" )
-
-	# Remove bundled mytop in favor of dev-db/mytop
-	conflicting_files+=( "${ED}/usr/bin/mytop" )
-	conflicting_files+=( "${ED}/usr/share/man/man1/mytop.1" )
-
-	local conflicting_file
-	for conflicting_file in "${conflicting_files[@]}" ; do
-		if [[ -e "${conflicting_file}" ]] ; then
-			rm -v "${conflicting_file}" || die
-		fi
-	done
-
-	# Fix a dangling symlink when galera is not built
-	if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
-		rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
-	fi
-
-	# Remove dangling symlink
-	rm "${ED}/usr/$(get_libdir)/libmariadb.a" || die
-
-	# Remove broken SST scripts that are incompatible
-	local scriptremove
-	for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
-		if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
-			rm "${ED}/usr/bin/${scriptremove}" || die
-		fi
-	done
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	[[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}"
-
-	if use server ; then
-		if use pam; then
-			einfo
-			elog "This install includes the PAM authentication plugin."
-			elog "To activate and configure the PAM plugin, please read:"
-			elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
-			einfo
-			chown mysql:mysql "${EROOT}/usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir" || die
-		fi
-
-		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-			einfo
-			elog "You might want to run:"
-			elog "\"emerge --config =${CATEGORY}/${PF}\""
-			elog "if this is a new install."
-			elog
-			elog "If you are switching server implentations, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		else
-			einfo
-			elog "If you are upgrading major versions, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		fi
-
-		if use galera ; then
-			einfo
-			elog "Be sure to edit the my.cnf file to activate your cluster settings."
-			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
-			elog "The first time the cluster is activated, you should add"
-			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
-			elog "This option should then be removed for subsequent starts."
-			einfo
-			if [[ -n "${REPLACING_VERSIONS}" ]] ; then
-				local rver
-				for rver in ${REPLACING_VERSIONS} ; do
-					if ver_test "${rver}" -lt "10.4.0" ; then
-						ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster."
-						ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"
-						ewarn "for more information"
-					fi
-				done
-			fi
-		fi
-	fi
-
-	# Note about configuration change
-	einfo
-	elog "This version of mariadb reorganizes the configuration from a single my.cnf"
-	elog "to several files in /etc/mysql/${PN}.d."
-	elog "Please backup any changes you made to /etc/mysql/my.cnf"
-	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
-	elog "You may have as many files as needed and they are read alphabetically."
-	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
-	einfo
-}
-
-pkg_config() {
-	_getoptval() {
-		local section="${1}"
-		local option="--${2}"
-		local extra_options="${3}"
-		local cmd=(
-			"${my_print_defaults_binary}"
-			"${extra_options}"
-			"${section}"
-		)
-
-		local values=()
-		local parameters=( $(eval "${cmd[@]}" 2>/dev/null) )
-		for parameter in "${parameters[@]}"
-		do
-			# my_print_defaults guarantees output of options, one per line,
-			# in the form that they would be specified on the command line.
-			# So checking for --option=* should be safe.
-			case ${parameter} in
-				${option}=*)
-					values+=( "${parameter#*=}" )
-					;;
-			esac
-		done
-
-		if [[ ${#values[@]} -gt 0 ]] ; then
-			# Option could have been set multiple times
-			# in which case only the last occurrence
-			# contains the current value
-			echo "${values[-1]}"
-		fi
-	}
-
-	_mktemp_dry() {
-		# emktemp has no --dry-run option
-		local template="${1}"
-
-		if [[ -z "${template}" ]] ; then
-			if [[ -z "${T}" ]] ; then
-				template="/tmp/XXXXXXX"
-			else
-				template="${T}/XXXXXXX"
-			fi
-		fi
-
-		local template_wo_X=${template//X/}
-		local n_X
-		let n_X=${#template}-${#template_wo_X}
-		if [[ ${n_X} -lt 3 ]] ; then
-			echo "${FUNCNAME[0]}: too few X's in template '${template}'" >&2
-			return
-		fi
-
-		local attempts=0
-		local character tmpfile
-		while [[ true ]] ; do
-			let attempts=attempts+1
-
-			new_file=
-			while read -n1 character ; do
-				if [[ "${character}" == "X" ]] ; then
-					tmpfile+="${RANDOM:0:1}"
-				else
-					tmpfile+="${character}"
-				fi
-			done < <(echo -n "${template}")
-
-			if [[ ! -f "${tmpfile}" ]]
-			then
-				echo "${tmpfile}"
-				return
-			fi
-
-			if [[ ${attempts} -ge 100 ]] ; then
-				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
-				return
-			fi
-		done
-	}
-
-	local mysql_binary="${EROOT}/usr/bin/mysql"
-	if [[ ! -x "${mysql_binary}" ]] ; then
-		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
-	if [[ ! -x "${mysqld_binary}" ]] ; then
-		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
-	if [[ ! -x "${mysql_install_db_binary}" ]] ; then
-		die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
-	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
-		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
-	fi
-
-	if [[ -z "${MYSQL_USER}" ]] ; then
-		MYSQL_USER=mysql
-		if use prefix ; then
-			MYSQL_USER=$(id -u -n 2>/dev/null)
-			if [[ -z "${MYSQL_USER}" ]] ; then
-				die "Failed to determine current username!"
-			fi
-		fi
-	fi
-
-	if [[ -z "${MYSQL_GROUP}" ]] ; then
-		MYSQL_GROUP=mysql
-		if use prefix ; then
-			MYSQL_GROUP=$(id -g -n 2>/dev/null)
-			if [[ -z "${MYSQL_GROUP}" ]] ; then
-				die "Failed to determine current user groupname!"
-			fi
-		fi
-	fi
-
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	local -x HOME="${EROOT}/root"
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Read currently set data directory
-	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		die "Sorry, unable to find MY_DATADIR!"
-	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
-		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
-		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
-		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
-	fi
-
-	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
-	# These are dir+prefix
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-
-	# Create missing directories.
-	# Always check if mysql user can write to directory even if we just
-	# created directory because a parent directory might be not
-	# accessible for that user.
-	PID_DIR="${EROOT}/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]] ; then
-		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
-		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
-			|| die "Failed to create PID directory '${PID_DIR}'!"
-	fi
-
-	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_pid_dir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_pid_dir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
-	else
-		rm "${_pid_dir_testfile}" || die
-		unset _pid_dir_testfile
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]] ; then
-		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
-			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
-	fi
-
-	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_datadir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_datadir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
-	else
-		rm "${_my_datadir_testfile}" || die
-		unset _my_datadir_testfile
-	fi
-
-	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
-		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
-			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
-	fi
-
-	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
-		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
-		[[ -z "${MYSQL_TMPDIR}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
-
-		mkdir "${MYSQL_TMPDIR}" || die
-		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
-	fi
-
-	# Now we need to test MYSQL_TMPDIR...
-	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_tmpdir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_tmpdir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
-	else
-		rm "${_my_tmpdir_testfile}" || die
-		unset _my_tmpdir_testfile
-	fi
-
-	if [[ "${MYSQL_LOG_BIN}" == /* && ! -d "${MYSQL_LOG_BIN}" ]] ; then
-		# Only create directory when MYSQL_LOG_BIN is an absolute path
-		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
-			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
-	fi
-
-	if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
-		# Only test when MYSQL_LOG_BIN is an absolute path
-		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_logbin_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_logbin_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
-		else
-			rm "${_my_logbin_testfile}" || die
-			unset _my_logbin_testfile
-		fi
-	fi
-
-	if [[ "${MYSQL_RELAY_LOG}" == /* && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
-		# Only create directory when MYSQL_RELAY_LOG is an absolute path
-		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
-			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
-	fi
-
-	if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
-		# Only test when MYSQL_RELAY_LOG is an absolute path
-		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_relaylog_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_relaylog_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
-		else
-			rm "${_my_relaylog_testfile}" || die
-			unset _my_relaylog_testfile
-		fi
-	fi
-
-	local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
-	[[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
-
-	# Limit access
-	chmod 0770 "${SETUP_TMPDIR}" || die
-	chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
-
-	local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
-	local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
-
-	echo ""
-	einfo "Detected settings:"
-	einfo "=================="
-	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
-	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
-	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
-	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
-
-	if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
-		# Absolute path for binary log files specified
-		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
-	fi
-
-	if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
-		# Absolute path for relay log files specified
-		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
-	fi
-
-	einfo "PID DIR:\t\t\t\t${PID_DIR}"
-	einfo "Install db log:\t\t\t${mysql_install_log}"
-	einfo "Install server log:\t\t\t${mysqld_logfile}"
-
-	echo
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client ; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local pwd1="a"
-		local pwd2="b"
-
-		echo
-		einfo "No password for mysql 'root' user was specified via environment"
-		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
-		einfo "file like '${HOME}/.my.cnf'."
-		einfo "To continue please provide a password for the mysql 'root' user"
-		einfo "now on console:"
-		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
-			die "Passwords are not the same!"
-		fi
-
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-
-		echo
-	fi
-
-	local -a mysqld_options
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR}/mysqld-help"
-	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-
-	local opt optexp optfull
-	for opt in host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-	; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
-	done
-
-	# Prepare timezones, see
-	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	local tz_sql="${SETUP_TMPDIR}/tz.sql"
-
-	echo "USE mysql;" >"${tz_sql}"
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
-	if [[ $? -ne 0 ]] ; then
-		die "mysql_tzinfo_to_sql failed!"
-	fi
-
-	local cmd=(
-		"${mysql_install_db_binary}"
-		"${mysqld_options[@]}"
-		"--init-file='${tz_sql}'"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		"--log-error='${mysql_install_log}'"
-		"--rpm"
-		"--cross-bootstrap"
-		"--skip-test-db"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Initializing ${PN} data directory: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
-
-	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
-		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
-	fi
-
-	local x=${RANDOM}
-	local socket="${PID_DIR}/mysqld.${x}.sock"
-	[[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
-	local pidfile="${PID_DIR}/mysqld.${x}.pid"
-	[[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
-	unset x
-
-	cmd=(
-		"${mysqld_binary}"
-		"${mysqld_options[@]}"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		--max_allowed_packet=8M
-		--net_buffer_length=16K
-		"--socket='${socket}'"
-		"--pid-file='${pidfile}'"
-		"--log-error='${mysqld_logfile}'"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
-
-	echo -n "Waiting for mysqld to accept connections "
-	local maxtry=15
-	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-
-	if [[ -S "${socket}" ]] ; then
-		# Even with a socket we don't know if mysqld will abort
-		# start due to an error so just wait a little bit more...
-		maxtry=5
-		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-	fi
-
-	echo
-
-	if [[ ! -S "${socket}" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
-		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
-	fi
-
-	local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
-	touch "${mysql_logfile}" || die
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
-	cmd=(
-		"${mysql_binary}"
-		--no-defaults
-		"--socket='${socket}'"
-		-hlocalhost
-		"-e \"${sql}\""
-	)
-	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
-	local rc=$?
-	eend ${rc}
-
-	if [[ ${rc} -ne 0 ]] ; then
-		# Poor man's solution which tries to avoid having password
-		# in log.  NOTE: sed can fail if user didn't follow advice
-		# and included character which will require escaping...
-		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
-
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
-		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
-	fi
-
-	# Stop the server
-	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-		echo -n "Stopping the server "
-		pkill -F "${pidfile}" &>/dev/null
-
-		maxtry=10
-		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-
-		echo
-
-		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-			# We somehow failed to stop server.
-			# However, not a fatal error. Just warn the user.
-			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
-		fi
-	fi
-
-	rm -r "${SETUP_TMPDIR}" || die
-
-	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
-}
diff --git a/dev-db/mariadb/mariadb-10.6.17.ebuild b/dev-db/mariadb/mariadb-10.6.17.ebuild
index acf533c2cb8c..d790e913d96a 100644
--- a/dev-db/mariadb/mariadb-10.6.17.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.17.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"
@@ -29,7 +29,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	static? ( yassl !pam )
 	test? ( extraengine )"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.6.20.ebuild b/dev-db/mariadb/mariadb-10.6.20.ebuild
index d802e68212fd..b2c78c893b35 100644
--- a/dev-db/mariadb/mariadb-10.6.20.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.20.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
@@ -21,7 +21,7 @@ S="${WORKDIR}/mysql"
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
 	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
diff --git a/dev-db/mongodb-compass-bin/Manifest b/dev-db/mongodb-compass-bin/Manifest
new file mode 100644
index 000000000000..3ca491646c8e
--- /dev/null
+++ b/dev-db/mongodb-compass-bin/Manifest
@@ -0,0 +1 @@
+DIST mongodb-compass_1.45.1_amd64.deb 114196516 BLAKE2B ce79b13a9e590cb305e8bbc88d5838b67805d207d09f1bf6ac99cde96f5b7c3549c8d53d0cb7fee082878e2ef0d12da5cadaf6c238eebd2f3c48ad7f963b5d82 SHA512 98989fdebee1e526276d7b35c3fac4d541c740c3beb3e71321672a225a0881465a15f1c179b7546f46a75f06fd7d739e19f849d2b5d5b661298258f1543d8074
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/mycli/Manifest b/dev-db/mycli/Manifest
index ffedc59bb7eb..cb9f4835a906 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1 +1,2 @@
 DIST mycli-1.27.2.gh.tar.gz 286537 BLAKE2B 7bff978f9a08561c33f5327f13b8b69226e5c735527a607190a3c5d75f091b9f76b8d432e7a3e315ff250995e0baea7f7e0bede17e0b1cc6654939b7ec82b0ae SHA512 fdf0342b0e850b5232c815e73f44f22c7ea162201588681ccf2f4107b84b87f01fff3999a9720fef454239192356f074f47642ddc760af18973a2aaaac4676cd
+DIST mycli-1.29.2.tar.gz 293270 BLAKE2B c50b45f217f9b358334cd28a975e5de7b1f70903bf32ee719e03e067b13df13b856a24b9631d2b37a7ad668a82307b030cce1111f0a2ffe625cf9756680eee31 SHA512 13279ec14a0310323f1e407147749e8c628d9cc60688080e691ccfd9cdffd4d8d840a18b6a81075e08247b8a64a19808fbedf2898ab0b2e80ec2906182f23f28
diff --git a/dev-db/mycli/mycli-1.29.2.ebuild b/dev-db/mycli/mycli-1.29.2.ebuild
new file mode 100644
index 000000000000..dc64bce44339
--- /dev/null
+++ b/dev-db/mycli/mycli-1.29.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
+HOMEPAGE="
+	https://www.mycli.net/
+	https://github.com/dbcli/mycli/
+	https://pypi.org/project/mycli/
+"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ssh"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cli-helpers-2.2.1[${PYTHON_USEDEP}]
+		>=dev-python/click-7.0[${PYTHON_USEDEP}]
+		>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/prompt-toolkit-3.0.6[${PYTHON_USEDEP}]
+		<dev-python/prompt-toolkit-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyaes-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pyfzf-0.3.1[${PYTHON_USEDEP}]
+		>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
+		>=dev-python/pyperclip-1.8.1[${PYTHON_USEDEP}]
+		>=dev-python/sqlglot-5.1.3[${PYTHON_USEDEP}]
+		>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+		ssh? (
+			dev-python/paramiko[${PYTHON_USEDEP}]
+			dev-python/sshtunnel[${PYTHON_USEDEP}]
+		)
+	')
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools-scm[${PYTHON_USEDEP}]
+		test? (
+			dev-python/paramiko[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+EPYTEST_DESELECT=(
+	# Requires a running mysql daemon
+	"test/test_main.py::test_batch"
+	"test/test_main.py::test_execute"
+	"test/test_main.py::test_init"
+	"test/test_special_iocommands.py::test_favorite_query"
+	"test/test_special_iocommands.py::test_watch"
+	"test/test_tabular_output.py::test_sql_output"
+)
+
+EPYTEST_IGNORE=(
+	# Requires a running mysql daemon
+	"test/test_sqlexecute.py"
+)
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+	default
+
+	# Relax sqlparse requirement, 0.5.0 didn't have major API changes that would necessitate this restriction.
+	# bug #930690
+	sed -i -e '/sqlparse/ s/,<0.5.0//' pyproject.toml || die
+}
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index b1933a7ac25c..4df88f2a9a68 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,2 +1 @@
-DIST mysql-boost-8.0.32.tar.gz 436207624 BLAKE2B 8a75fd6fe12d4f870622b3386118737b8f17d116df625ef6187647c870d456823543e0a1e9aa05fff53313c3872df1df23add2508ec735bb7972718fc1e90539 SHA512 937e0d0350cb583bb4de15b080f08ed92b253a6d7c09f13a028855dae154fc84f0c95fb082b818b2fa6fa792cd2d9db8d7dc7a20a2a0d3d2b6839fbd2c821b44
 DIST mysql-boost-8.0.36.tar.gz 438154682 BLAKE2B 066c9dd7f2804ad29808c3bfcf5eae53466f7c40cf1386a9c1f26a0b45dcc3eda8d9618de36e8008e5e4d58b726d6c8ca85aec8d1eda8981f5a49e495b32f046 SHA512 a6c1c009a322b7e7aa2aa607573060414c847c77d48f44a24058ffb89673621f2ebbcc1a4448fa841a87ff721159cc8eaf44a57721c7dc233c130691c16a9d4a
diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.22-always-build-decompress-utilities.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.22-always-build-decompress-utilities.patch
deleted file mode 100644
index b0046fd8b224..000000000000
--- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.22-always-build-decompress-utilities.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/utilities/CMakeLists.txt
-+++ b/utilities/CMakeLists.txt
-@@ -123,14 +123,11 @@ MYSQL_ADD_EXECUTABLE(perror
-   DEPENDENCIES GenError
-   LINK_LIBRARIES mysys
-   )
--IF(BUILD_BUNDLED_LZ4)
--  MYSQL_ADD_EXECUTABLE(lz4_decompress
--    lz4_decompress.cc
--    COMPONENT Server
--    LINK_LIBRARIES ${LZ4_LIBRARY} mysys
--    )
--ENDIF()
--
-+MYSQL_ADD_EXECUTABLE(lz4_decompress
-+  lz4_decompress.cc
-+  COMPONENT Server
-+  LINK_LIBRARIES ${LZ4_LIBRARY} mysys
-+  )
- MYSQL_ADD_EXECUTABLE(zlib_decompress
-   zlib_decompress.cc
-   COMPONENT Server
diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.32-musl.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.32-musl.patch
deleted file mode 100644
index 252c5eeda32e..000000000000
--- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.32-musl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/mysql/mysql-server/pull/454
-
-From c875f049cb3571da1b9b5bcae50caccc5ee47cfb Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Fri, 7 Apr 2023 12:47:51 -0700
-Subject: [PATCH] sql/memory: Fix the musl build
-
-_SC_LEVEL1_DCACHE_LINESIZE is not specific to linux, but to glibc.
----
- sql/memory/aligned_atomic.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sql/memory/aligned_atomic.h b/sql/memory/aligned_atomic.h
-index d13d45b9deea..bd19c0cf4d6f 100644
---- a/sql/memory/aligned_atomic.h
-+++ b/sql/memory/aligned_atomic.h
-@@ -76,7 +76,7 @@ static inline size_t _cache_line_size() {
-   return line_size;
- }
- 
--#elif defined(__linux__)
-+#elif defined(__GLIBC__)
- static inline size_t _cache_line_size() {
-   long size = sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
-   if (size == -1) return 64;
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.32-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.32-r1.ebuild
deleted file mode 100644
index 439f779c8568..000000000000
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.32-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/mysql/mysql-server.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-	S="${WORKDIR}/mysql-${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/21"
-IUSE="ldap static-libs"
-
-RDEPEND="
-	>=app-arch/lz4-1.9.4:=[${MULTILIB_USEDEP}]
-	app-arch/zstd:=[${MULTILIB_USEDEP}]
-	dev-libs/openssl:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.13:=[${MULTILIB_USEDEP}]
-	ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# Avoid file collisions, #692580
-RDEPEND+="
-	!<dev-db/mysql-5.6.45-r1
-	!=dev-db/mysql-5.7.23*
-	!=dev-db/mysql-5.7.24*
-	!=dev-db/mysql-5.7.25*
-	!=dev-db/mysql-5.7.26-r0
-	!=dev-db/mysql-5.7.27-r0
-	!<dev-db/percona-server-5.7.26.29-r1
-"
-
-DOCS=( README )
-
-# Wrap the config script
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch
-	"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
-	"${FILESDIR}"/${PN}-8.0.27-res_n.patch
-	"${FILESDIR}"/${PN}-8.0.32-musl.patch
-)
-
-src_prepare() {
-	sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "scripts/CMakeLists.txt" || die
-
-	# All these are for the server only.
-	# Disable rpm call which would trigger sandbox, #692368
-	sed -i \
-		-e '/MYSQL_CHECK_LIBEVENT/d' \
-		-e '/MYSQL_CHECK_RAPIDJSON/d' \
-		-e '/MYSQL_CHECK_ICU/d' \
-		-e '/MYSQL_CHECK_EDITLINE/d' \
-		-e '/MYSQL_CHECK_CURL/d' \
-		-e '/ADD_SUBDIRECTORY(man)/d' \
-		-e '/ADD_SUBDIRECTORY(share)/d' \
-		-e '/INCLUDE(cmake\/boost/d' \
-		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
-		CMakeLists.txt || die
-
-	# Skip building clients
-	echo > client/CMakeLists.txt || die
-
-	# Forcefully disable auth plugin
-	if ! use ldap ; then
-		sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die
-		echo > libmysql/authentication_ldap/CMakeLists.txt || die
-	fi
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	# Code is now requiring C++17 due to https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08
-	append-cxxflags -std=c++17
-
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
-		-DINSTALL_LAYOUT=RPM
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
-		-DENABLED_LOCAL_INFILE=ON
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock"
-		# Automagically uses LLD with not using LTO (bug #710272, #775845)
-		-DUSE_LD_LLD=OFF
-		-DWITH_LZ4=system
-		-DWITH_NUMA=OFF
-		-DWITH_SSL=system
-		-DWITH_ZLIB=system
-		-DWITH_ZSTD=system
-		-DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient
-		-DSHARED_LIB_PATCH_VERSION="0"
-		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-		-DWITHOUT_SERVER=ON
-		-DWITH_BUILD_ID=OFF
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	# Not a GNU info file, more like a tiny README.
-	rm "${ED}"/usr/share/info/mysql.info || die
-
-	doman \
-		man/my_print_defaults.1 \
-		man/perror.1 \
-		man/zlib_decompress.1
-
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 83b7c67873ba..89f9454ace42 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,12 +1,6 @@
 DIST mysql-5.7.36-patches-01.tar.xz 6396 BLAKE2B ed9783f207d40fc220992c4193bdd8e96523f69414daa756f1f30306c1aedff9e96216ba2294a4c41eefbaf39c8bb37784bf1e7cce656c93f829c9cf0682fa6d SHA512 b0fbd41ebb2d32067e6c81707dffa91fece2d368f4b2fa47951492936509972d425b64d7613748c42b31cf9ba9dab697efeff70debe7268855a90d322d3f3158
-DIST mysql-8.0.27-patches-03.tar.xz 9864 BLAKE2B 03136477a97a5bff0c5f1cbc7921a77d9b36e148e94f80463f00f0efd1a6859af4595f9cf15aa492bce043fdc9d6c6328bd64102f8b0127eacbc7795b1785ecb SHA512 8c00c8fef2b01389f59138eaa29399d8a9ce7930b6bdfb7689d1d7bf14a32fbb10a2b8dbe91933b805899ef3af0cf0bda704d4be14249991b381054bcc496058
-DIST mysql-8.0.31-patches-01.tar.xz 5464 BLAKE2B c067bf311c83d4aa0f48d56621997bc58820fa0b41bd708eae04b0b54b89d549c5c1b84ca93adcbbdcb008199510ea667a12b1bcd44bf6b6df02062b4551d0a2 SHA512 95af6bb5aa0c407f0a1014f33523608b0df0797fd7fbdbba8a19985258a7c04788d7587c8f67cd1745284522c58297931c8827e31f77e8c89baaeff71a5e0ddc
-DIST mysql-8.0.34-patches-01.tar.xz 9304 BLAKE2B e80dd1fab00fb183e0b980763a9b6c3b879357b776b2acc9709527e5d6e2549f801835936433e55fcde2820201edb3dead5d95f31ef617ef9542d2a0bd95efca SHA512 1ac196d609fabd9c978bc8dd3564a45f0d681c292215d8979604d7e402c622d70a1c66ed191ded081c597042298c43154a9bb09bb4566e7fe97991f67d91d999
 DIST mysql-8.0.36-patches-01.tar.xz 10768 BLAKE2B d9b9c6f170e08eee249bbef77713116ad2f1bd05d638f908011c8be406548b9a87a5189d440147c76ac8aef8058d3fdf25d754191a52fef786812ddd6a2409dd SHA512 3f6af0f17e2ded2ec5cc9b0001062bda061e51a17f4f2d1f1fb604590de026a70bd21cecdff28e05adb1b89356fec1c1b33bc9c848e8a20186412d8547452305
+DIST mysql-8.0.40-patches-01.tar.xz 8356 BLAKE2B ee67f391d7d76e2a49d772a946a09849a4240bd31eacba9dde525d6a7c33e596667505e6f3c8757bf82f15194ce725587036c035d75a8d8baa7b37932148c29c SHA512 aacd9185fd911a2a33e7d81ba15ff5ca1a527738d59ef2b0c7ef94ef4b2798caeef6635bbe9618ca7c0517a7578fad159a6b7d04d3fcd69af0e3404456469fb4
 DIST mysql-boost-5.7.41.tar.gz 53266489 BLAKE2B 7201d6c53cf711bd121464fc85260e1799f7195f45706b91f3cb8d605fe2bd2639d532b4045a336645a553d9b0b1131cc45140a19483902e5dc37d3e2479b6f5 SHA512 88e1cc4864616ed92880a3f02285763aac2ddfc1cdeeff07e1502c97bbdfd31c9ed9d02f8f6381a352857a85241e4e4eb6bc0d978e3928a68ef49362f670482a
-DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e SHA512 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891
-DIST mysql-boost-8.0.31.tar.gz 334504577 BLAKE2B 0506472c732351a1055be9bbd81212e95280ae464af95cb5b579777dd8fad4634b099fa2830c3095066daf8c586f1d8cd2316e7268fb0d2577dd706c595c9102 SHA512 87b1678de8c2fd640fd6f3ae58266ea63fe240578330e3296d0e5fc209bbe9b0c22996214b6ca4cce8c0d9cc2f9897f4e6723d835b33fc4342983c82929c3d96
-DIST mysql-boost-8.0.32.tar.gz 436207624 BLAKE2B 8a75fd6fe12d4f870622b3386118737b8f17d116df625ef6187647c870d456823543e0a1e9aa05fff53313c3872df1df23add2508ec735bb7972718fc1e90539 SHA512 937e0d0350cb583bb4de15b080f08ed92b253a6d7c09f13a028855dae154fc84f0c95fb082b818b2fa6fa792cd2d9db8d7dc7a20a2a0d3d2b6839fbd2c821b44
-DIST mysql-boost-8.0.34.tar.gz 439550780 BLAKE2B f50701b7e97e6cec21d6ce0f80f07a8df68a14c637a67841c06f578be8ed01d216dcb3b859a29f1befd4223b99e60675d6fa70f4b227bf6af81804e2c43161d4 SHA512 e5e79ac6870c214cf62c8e2830106d60e09d2e6df30654b84bb5d26864b4eabe777468a223e6ee4c1e22b7f6ec086c73e85e3f4c1fa66912b0e59b606ab46cd6
-DIST mysql-boost-8.0.36.tar.gz 438154682 BLAKE2B 066c9dd7f2804ad29808c3bfcf5eae53466f7c40cf1386a9c1f26a0b45dcc3eda8d9618de36e8008e5e4d58b726d6c8ca85aec8d1eda8981f5a49e495b32f046 SHA512 a6c1c009a322b7e7aa2aa607573060414c847c77d48f44a24058ffb89673621f2ebbcc1a4448fa841a87ff721159cc8eaf44a57721c7dc233c130691c16a9d4a
 DIST mysql-boost-8.0.37.tar.gz 445594692 BLAKE2B 105521985ec8c622a28b5e0f7f13e519b2d91af6ce7c2b483cf1c096aa79f156cc59eabb6281b485d6f558eb6e20a95d5edc349bbd72d1c4a2591eef59270f4c SHA512 4c6033d4f96990d3f324f0d5733273425ddf7cc11660e110e0dc848da6cfa47b7565c1eb0b5d1e08878a0ea2c7d1eb85b400ccca28e5b4383f7e9216ba3e1660
+DIST mysql-boost-8.0.40.tar.gz 490502884 BLAKE2B 137a2060ede74449caf6a18dd1b54093668591a592eb0191b436aa289f2faae546eb9d4eaeeef17861a85f3eb34459997fe45c82b21ae07716913e2980c49e4b SHA512 fcece6e3c09dc4733767effb5c22a55e4add1c9f6b6b911e1eccdd0444f08dc5714b3c8b2a40c85a75a63ff117b6c9881904b6b4732b5ca9bef96de1cb2e284a
diff --git a/dev-db/mysql/files/mysql-8.0.27-gcc12.patch b/dev-db/mysql/files/mysql-8.0.27-gcc12.patch
deleted file mode 100644
index f4ecb59273a6..000000000000
--- a/dev-db/mysql/files/mysql-8.0.27-gcc12.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/840990
-https://bugs.gentoo.org/852737
---- a/client/logger.cc
-+++ b/client/logger.cc
-@@ -27,6 +27,7 @@
- #include <time.h>
- #include <iostream>
- #include <locale>
-+#include <memory>
- 
- using namespace std;
- 
---- a/components/keyrings/common/component_helpers/src/keyring_log_builtins_definition.cc
-+++ b/components/keyrings/common/component_helpers/src/keyring_log_builtins_definition.cc
-@@ -25,6 +25,7 @@
- #include <cstring>
- #include <iostream>
- #include <locale>
-+#include <memory>
- #include <sstream>
- 
- #include <m_string.h>
-
---- a/router/src/harness/include/mysql/harness/net_ts/executor.h
-+++ b/router/src/harness/include/mysql/harness/net_ts/executor.h
-@@ -35,6 +35,7 @@
- #include <stdexcept>  // logic_error
- #include <thread>
- #include <type_traits>  // decay_t, enable_if
-+#include <utility>
- #include <unordered_map>
- 
- #include "my_compiler.h"
diff --git a/dev-db/mysql/files/mysql-8.0.31-build-tmpdir-nodefault.patch b/dev-db/mysql/files/mysql-8.0.31-build-tmpdir-nodefault.patch
deleted file mode 100644
index f0f4a392b44d..000000000000
--- a/dev-db/mysql/files/mysql-8.0.31-build-tmpdir-nodefault.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/878951
---- a/cmake/info_macros.cmake.in	2022-09-13 12:15:16.000000000 -0400
-+++ b/cmake/info_macros.cmake.in	2022-11-01 00:12:06.270464679 -0400
-@@ -175,7 +175,7 @@
-   IF(HAVE_BUILD_ID_SUPPORT AND NOT WITHOUT_SERVER)
-     FILE(APPEND ${INFO_BIN} "\n===== BUILD ID =====\n")
-     EXECUTE_PROCESS(COMMAND
--      ${MYSQLD_EXECUTABLE} --help
-+      ${MYSQLD_EXECUTABLE} --no-defaults --help
-       OUTPUT_VARIABLE mysqld_help
-       RESULT_VARIABLE mysqld_help_result
-       ERROR_VARIABLE mysqld_help_error
diff --git a/dev-db/mysql/files/mysql-8.0.32-gcc13.patch b/dev-db/mysql/files/mysql-8.0.32-gcc13.patch
deleted file mode 100644
index e7ec0603bbea..000000000000
--- a/dev-db/mysql/files/mysql-8.0.32-gcc13.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/895818
-https://github.com/mysql/mysql-server/pull/456
-
-From 2e5614c4ec50c60fbadbd57f213c1c7d6b959be9 Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Wed, 12 Apr 2023 16:16:13 +0300
-Subject: [PATCH] sql/binlog/group_commit: include header for std::uint64_t
-
-GCC 13 changed default header dependencies for C++ necessitating
-including cstdint explicitly.
---- a/sql/binlog/group_commit/bgc_ticket.h
-+++ b/sql/binlog/group_commit/bgc_ticket.h
-@@ -23,6 +23,7 @@
- #ifndef BINLOG_BCG_TICKET_H
- #define BINLOG_BCG_TICKET_H
- 
-+#include <cstdint>
- #include <functional>
- #include <limits>
- #include <memory>
-
diff --git a/dev-db/mysql/files/mysql-8.0.37-fix-bundled-abseil.patch b/dev-db/mysql/files/mysql-8.0.37-fix-bundled-abseil.patch
new file mode 100644
index 000000000000..654b2bc21be6
--- /dev/null
+++ b/dev-db/mysql/files/mysql-8.0.37-fix-bundled-abseil.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/935508
+
+Context:
+https://bugs.gentoo.org/934337
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=112789
+
+--- mysql/extra/abseil/abseil-cpp-20230802.1/absl/numeric/internal/bits.h.bak
++++ mysql/extra/abseil/abseil-cpp-20230802.1/absl/numeric/internal/bits.h
+@@ -167,7 +167,9 @@ CountLeadingZeroes32(uint32_t x) {
+ 
+ ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CLZ inline int
+ CountLeadingZeroes16(uint16_t x) {
+-#if ABSL_HAVE_BUILTIN(__builtin_clzs)
++#if ABSL_HAVE_BUILTIN(__builtin_clzg)
++  return x == 0 ? 16 : __builtin_clzg(x);
++#elif ABSL_HAVE_BUILTIN(__builtin_clzs)
+   static_assert(sizeof(unsigned short) == sizeof(x),  // NOLINT(runtime/int)
+                 "__builtin_clzs does not take 16-bit arg");
+   return x == 0 ? 16 : __builtin_clzs(x);
+@@ -303,7 +305,9 @@ CountTrailingZeroesNonzero64(uint64_t x) {
+ 
+ ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CTZ inline int
+ CountTrailingZeroesNonzero16(uint16_t x) {
+-#if ABSL_HAVE_BUILTIN(__builtin_ctzs)
++#if ABSL_HAVE_BUILTIN(__builtin_ctzg)
++  return __builtin_ctzg(x);
++#elif ABSL_HAVE_BUILTIN(__builtin_ctzs)
+   static_assert(sizeof(unsigned short) == sizeof(x),  // NOLINT(runtime/int)
+                 "__builtin_ctzs does not take 16-bit arg");
+   return __builtin_ctzs(x);
diff --git a/dev-db/mysql/files/mysql-8.0.37-fix-bundled-boost.patch b/dev-db/mysql/files/mysql-8.0.37-fix-bundled-boost.patch
new file mode 100644
index 000000000000..58cf72f778fa
--- /dev/null
+++ b/dev-db/mysql/files/mysql-8.0.37-fix-bundled-boost.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/947784
+https://github.com/boostorg/multiprecision/issues/419
+https://github.com/boostorg/multiprecision/commit/d1343f28dcbe25b100b082b34775bd92ead4602c
+
+The old version of Boost that MySQL vendors tries to use x86 intrinsics
+on PowerPC. Backport this patch for it to not do that.
+
+--- a/boost/boost_1_77_0/boost/multiprecision/cpp_int/intel_intrinsics.hpp
++++ b/boost/boost_1_77_0/boost/multiprecision/cpp_int/intel_intrinsics.hpp
+@@ -19,7 +19,11 @@
+ // If this is GCC/clang, then check that the actual intrinsic exists:
+ //
+ #if defined(__has_builtin) && defined(__GNUC__)
+-#if !__has_builtin(__builtin_ia32_addcarryx_u64) && defined(BOOST_MP_HAS_IMMINTRIN_H) && !(defined(BOOST_GCC) && (__GNUC__ >= 9))
++#if !__has_builtin(__builtin_ia32_addcarryx_u64) && defined(BOOST_MP_HAS_IMMINTRIN_H) \
++   && !(defined(BOOST_GCC) && (__GNUC__ >= 9) \
++      && (defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)\
++          || defined(i386) || defined(__i386) || defined(__i386__) || defined(_M_AMD64) \
++          || defined(_M_X64) || defined(__amd64__) || defined(_M_X64)))
+ #undef BOOST_MP_HAS_IMMINTRIN_H
+ #endif
+ #elif defined(BOOST_MP_HAS_IMMINTRIN_H) && defined(__GNUC__) && !(defined(BOOST_GCC) && (__GNUC__ >= 9))
diff --git a/dev-db/mysql/files/mysql-8.0.40-fix-bundled-abseil-gcc15.patch b/dev-db/mysql/files/mysql-8.0.40-fix-bundled-abseil-gcc15.patch
new file mode 100644
index 000000000000..b8b0138f1808
--- /dev/null
+++ b/dev-db/mysql/files/mysql-8.0.40-fix-bundled-abseil-gcc15.patch
@@ -0,0 +1,19 @@
+https://github.com/abseil/abseil-cpp/pull/1739
+
+From https://github.com/abseil/abseil-cpp/commit/809e5de7b92950849289236a5a09e9cb4f32c7b9 Mon Sep 17 00:00:00 2001
+From: Christopher Fore <csfore@posteo.net>
+Date: Mon, 5 Aug 2024 12:09:18 -0700
+Subject: [PATCH] PR #1739: container/internal: Explicitly include <cstdint>
+
+GCC 15 will no longer include <cstdint> by default, resulting in build failures in projects that do not explicitly include it.
+
+--- a/extra/abseil/abseil-cpp-20230802.1/absl/container/internal/container_memory.h
++++ b/extra/abseil/abseil-cpp-20230802.1/absl/container/internal/container_memory.h
+@@ -17,6 +17,7 @@
+ 
+ #include <cassert>
+ #include <cstddef>
++#include <cstdint>
+ #include <cstring>
+ #include <memory>
+ #include <new>
diff --git a/dev-db/mysql/mysql-5.7.41.ebuild b/dev-db/mysql/mysql-5.7.41.ebuild
index 1e3a9dce41a2..51a92cbfc9de 100644
--- a/dev-db/mysql/mysql-5.7.41.ebuild
+++ b/dev-db/mysql/mysql-5.7.41.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="7"
@@ -814,7 +814,7 @@ pkg_config() {
 		local n_X
 		let n_X=${#template}-${#template_wo_X}
 		if [[ ${n_X} -lt 3 ]] ; then
-			echo "${FUNCNAME[0]}: too few X's in template �${template}’" >&2
+			echo "${FUNCNAME[0]}: too few X's in template '${template}'" >&2
 			return
 		fi
 
diff --git a/dev-db/mysql/mysql-8.0.27-r1.ebuild b/dev-db/mysql/mysql-8.0.27-r1.ebuild
deleted file mode 100644
index 3e1f2bf8e459..000000000000
--- a/dev-db/mysql/mysql-8.0.27-r1.ebuild
+++ /dev/null
@@ -1,1219 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit check-reqs cmake flag-o-matic linux-info \
-	multiprocessing prefix toolchain-funcs
-
-MY_PV="${PV//_pre*}"
-MY_P="${PN}-${MY_PV}"
-
-# Patch version
-PATCH_SET=( https://dev.gentoo.org/~{whissi,dlan}/dist/mysql/${P}-patches-03.tar.xz )
-
-SRC_URI="https://cdn.mysql.com/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${MY_PV}.tar.gz
-	https://cdn.mysql.com/archives/mysql-$(ver_cut 1-2)/mysql-boost-${MY_PV}.tar.gz
-	http://downloads.mysql.com/archives/MySQL-$(ver_cut 1-2)/${PN}-boost-${MY_PV}.tar.gz
-	${PATCH_SET[@]}"
-
-HOMEPAGE="https://www.mysql.com/"
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-LICENSE="GPL-2"
-SLOT="8.0"
-IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling
-	router selinux +server tcmalloc test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc )
-	cjk? ( server )
-	jemalloc? ( server )
-	numa? ( server )
-	profiling? ( server )
-	router? ( server )
-	tcmalloc? ( server )"
-
-# -ppc, -riscv for bug #761715
-KEYWORDS="amd64 arm arm64 ~hppa ~mips -ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
-	>=app-arch/lz4-0_p131:=
-	app-arch/zstd:=
-	sys-libs/ncurses:0=
-	>=sys-libs/zlib-1.2.3:0=
-	>=dev-libs/openssl-1.0.0:0=
-	server? (
-		dev-libs/icu:=
-		dev-libs/libevent:=[ssl,threads(+)]
-		>=dev-libs/protobuf-3.8:=
-		net-libs/libtirpc:=
-		cjk? ( app-text/mecab:= )
-		jemalloc? ( dev-libs/jemalloc:0= )
-		kernel_linux? (
-			dev-libs/libaio:0=
-			sys-process/procps:0=
-		)
-		numa? ( sys-process/numactl )
-		tcmalloc? ( dev-util/google-perftools:0= )
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	app-alternatives/yacc
-	server? ( net-libs/rpcsvc-proto )
-	test? (
-		acct-group/mysql acct-user/mysql
-		dev-perl/JSON
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
-	!dev-db/mysql:0
-	!dev-db/mysql:5.7
-	selinux? ( sec-policy/selinux-mysql )
-	!prefix? (
-		acct-group/mysql acct-user/mysql
-		dev-db/mysql-init-scripts
-	)
-"
-
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-mysql_init_vars() {
-	: ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-	: ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	: ${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	: ${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-	MY_DATADIR="${MY_LOCALSTATEDIR}"
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use server ; then
-			CHECKREQS_DISK_BUILD="3G"
-
-			if has test $FEATURES ; then
-				CHECKREQS_DISK_BUILD="9G"
-			fi
-
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		CHECKREQS_DISK_BUILD="3G"
-
-		if has test ${FEATURES} ; then
-			CHECKREQS_DISK_BUILD="9G"
-
-			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
-			# localhost. Also causes weird failures.
-			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-			if ! has userpriv ${FEATURES} ; then
-				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-			fi
-
-			local aio_max_nr=$(sysctl -n fs.aio-max-nr 2>/dev/null)
-			[[ -z "${aio_max_nr}" || ${aio_max_nr} -lt 250000 ]] \
-				&& die "FEATURES=test will require fs.aio-max-nr=250000 at minimum!"
-
-			if use latin1 ; then
-				# Upstream only supports tests with default charset
-				die "Testing with USE=latin1 is not supported."
-			fi
-		fi
-
-		if use kernel_linux ; then
-			if use numa ; then
-				linux-info_get_any_version
-
-				local CONFIG_CHECK="~NUMA"
-
-				local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
-				WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
-
-				check_extra_config
-			fi
-		fi
-
-		use server && check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	mv -f "${WORKDIR}/${MY_P}" "${S}" || die
-}
-
-src_prepare() {
-	eapply "${WORKDIR}"/mysql-patches
-	eapply "${FILESDIR}"/${PN}-8.0.27-gcc12.patch
-
-	# Avoid rpm call which would trigger sandbox, #692368
-	sed -i \
-		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
-		CMakeLists.txt || die
-
-	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
-	if [[ -d "${S}/support-files/SELinux" ]] ; then
-		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
-	fi
-
-	# Remove man pages for client-lib tools we don't install
-	rm \
-		man/my_print_defaults.1 \
-		man/perror.1 \
-		man/zlib_decompress.1 \
-		|| die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	# Code is now requiring C++17 due to https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08
-	append-cxxflags -std=c++17
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-		# Using bundled editline to get CTRL+C working
-		-DWITH_EDITLINE=bundled
-		-DWITH_ZLIB=system
-		-DWITH_SSL=system
-		-DWITH_LIBWRAP=0
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		# The build forces this to be defined when cross-compiling. We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-		-DWITH_CURL=system
-		-DWITH_BOOST="${S}/boost"
-		-DWITH_ROUTER=$(usex router ON OFF)
-	)
-
-	if tc-is-lto ; then
-		mycmakeargs+=( -DWITH_LTO=ON )
-	else
-		mycmakeargs+=( -DWITH_LTO=OFF )
-	fi
-
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
-
-	mycmakeargs+=(
-		-DWITH_ICU=system
-		-DWITH_LZ4=system
-		# Our dev-libs/rapidjson doesn't carry necessary fixes for std::regex
-		-DWITH_RAPIDJSON=bundled
-		-DWITH_ZSTD=system
-	)
-
-	if [[ -n "${MYSQL_DEFAULT_CHARSET}" && -n "${MYSQL_DEFAULT_COLLATION}" ]] ; then
-		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-		ewarn "You MUST file bugs without these variables set."
-		ewarn "Tests will probably fail!"
-
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-			-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-		)
-	elif use latin1 ; then
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=latin1
-			-DDEFAULT_COLLATION=latin1_swedish_ci
-		)
-	else
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=utf8mb4
-			-DDEFAULT_COLLATION=utf8mb4_0900_ai_ci
-		)
-	fi
-
-	if use server ; then
-		mycmakeargs+=(
-			-DWITH_EXTRA_CHARSETS=all
-			-DWITH_DEBUG=$(usex debug)
-			-DWITH_MECAB=$(usex cjk system OFF)
-			-DWITH_LIBEVENT=system
-			-DWITH_PROTOBUF=system
-			-DWITH_NUMA=$(usex numa ON OFF)
-		)
-
-		if use jemalloc ; then
-			mycmakeargs+=( -DWITH_JEMALLOC=ON )
-		elif use tcmalloc ; then
-			mycmakeargs+=( -DWITH_TCMALLOC=ON )
-		fi
-
-		if use profiling ; then
-			# Setting to OFF doesn't work: Once set, profiling options will be added
-			# to `mysqld --help` output via sql/sys_vars.cc causing
-			# "main.mysqld--help-notwin" test to fail
-			mycmakeargs+=( -DENABLED_PROFILING=ON )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_EXAMPLE_STORAGE_ENGINE=0
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_FEDERATED_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_INNODB_MEMCACHED=0
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-		)
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DWITH_SYSTEMD=no
-		)
-	fi
-
-	cmake_src_configure
-}
-
-# Official test instructions:
-# ulimit -n 16500 && \
-# USE='perl server' \
-# FEATURES='test userpriv' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	_disable_test() {
-		local rawtestname bug reason
-		rawtestname="${1}" ; shift
-		bug="${1}" ; shift
-		reason="${@}"
-		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
-		echo ${rawtestname} : BUG#${bug} ${reason} >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_tests
-
-	if ! use server ; then
-		einfo "Skipping server tests due to minimal build."
-		return 0
-	fi
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-	if [[ -z "${MTR_PARALLEL}" ]] ; then
-		local -x MTR_PARALLEL=$(makeopts_jobs)
-
-		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
-			# Running multiple tests in parallel usually require higher ulimit
-			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
-			# are known to hit timeout when system is busy.
-			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
-			# using "auto".
-			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
-			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
-			einfo "${info_msg}"
-			unset info_msg
-			MTR_PARALLEL=4
-		fi
-	else
-		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
-	fi
-
-	# create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	# Run mysql tests
-	pushd "${TESTDIR}" &>/dev/null || die
-
-	touch "${T}/disabled.def"
-
-	local -a disabled_tests
-	disabled_tests+=( "auth_sec.atomic_rename_user;103512;Depends on user running test" )
-	disabled_tests+=( "auth_sec.keyring_file_data_qa;0;Won't work with user privileges" )
-	disabled_tests+=( "auth_sec.openssl_without_fips;94718;Known test failure" )
-	disabled_tests+=( "gis.geometry_class_attri_prop;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.geometry_property_function_issimple;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.gis_bugs_crashes;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_analysis_functions_buffer;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_analysis_functions_centroid;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_analysis_functions_distance;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_op_testingfunc_mix;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_operators_intersection;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_utility_function_distance_sphere;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_utility_function_simplify;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.st_symdifference;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "innodb.alter_kill;0;Known test failure -- no upstream bug yet" )
-	disabled_tests+=( "main.derived_limit;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.explain_tree;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.gis-precise;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.mysql_load_data_local_dir;0;Known test failure -- no upstream bug yet" )
-	disabled_tests+=( "main.select_icp_mrr;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.subquery_bugs;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.subquery_sj_dupsweed;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.subquery_sj_dupsweed_bka;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.subquery_sj_dupsweed_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.subquery_sj_firstmatch;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.subquery_sj_firstmatch_bka;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.subquery_sj_firstmatch_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.subquery_sj_mat_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.window_std_var;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.window_std_var_optimized;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.with_recursive;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "perfschema.statement_digest_query_sample;0;Test will fail on slow hardware")
-	disabled_tests+=( "rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch;0;Unstable test" )
-	disabled_tests+=( "rpl_gtid.rpl_gtid_stm_drop_table;90612;Known test failure" )
-	disabled_tests+=( "rpl_gtid.rpl_multi_source_mtr_includes;0;Known failure - no upstream bug yet" )
-	disabled_tests+=( "sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware")
-	disabled_tests+=( "x.connection;0;Known failure - no upstream bug yet" )
-	disabled_tests+=( "x.message_compressed_payload;0;False positive caused by protobuff-3.11+" )
-	disabled_tests+=( "x.message_protobuf_nested;0;False positive caused by protobuff-3.11+" )
-
-	if ! hash zip 1>/dev/null 2>&1 ; then
-		# no need to force dep app-arch/zip for one test
-		disabled_tests+=( "innodb.discarded_partition_create;0;Requires app-arch/zip" )
-		disabled_tests+=( "innodb.partition_upgrade_create;0;Requires app-arch/zip" )
-	fi
-
-	if has_version ">=dev-libs/openssl-3" ; then
-		# >=dev-libs/openssl-3 defaults to security level 1 which disallow
-		# TLSv1/1.1 but tests will require TLSv1/1.1.
-		einfo "Set OpenSSL configuration for test suite ..."
-		cat > "${T}/openssl_tlsv1.cnf" <<- EOF || die
-		openssl_conf = default_conf
-
-		[ req ]
-		default_bits			= 2048
-		default_keyfile 		= privkey.pem
-		distinguished_name		= req_distinguished_name
-
-		[ req_distinguished_name ]
-		countryName			= Country Name (2 letter code)
-		countryName_default		= AU
-		countryName_min			= 2
-		countryName_max			= 2
-
-		stateOrProvinceName		= State or Province Name (full name)
-		stateOrProvinceName_default	= Some-State
-
-		localityName			= Locality Name (eg, city)
-
-		0.organizationName		= Organization Name (eg, company)
-		0.organizationName_default	= Internet Widgits Pty Ltd
-
-		organizationalUnitName		= Organizational Unit Name (eg, section)
-
-		commonName			= Common Name (e.g. server FQDN or YOUR name)
-		commonName_max			= 64
-
-		emailAddress			= Email Address
-		emailAddress_max		= 64
-
-		[default_conf]
-		ssl_conf = ssl_sect
-
-		[ssl_sect]
-		system_default = system_default_sect
-
-		[system_default_sect]
-		CipherString = DEFAULT@SECLEVEL=0
-		EOF
-
-		local -x OPENSSL_CONF="${T}/openssl_tlsv1.cnf"
-
-		disabled_tests+=( "x.connection_tls_version;0;Not compatible with OpenSSL 3.x error messages" )
-	fi
-
-	local test_infos_str test_infos_arr
-	for test_infos_str in "${disabled_tests[@]}" ; do
-		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
-
-		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
-			die "Invalid test data set, not matching format: ${test_infos_str}"
-		fi
-
-		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
-	done
-	unset test_infos_str test_infos_arr
-
-	# Try to increase file limits to increase test coverage
-	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
-		# Upper limit comes from parts.partition_* tests
-		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
-
-		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
-			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
-			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
-
-			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
-				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
-			else
-				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
-			fi
-		else
-			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
-		fi
-	else
-		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
-	fi
-
-	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd &>/dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "${failures}" ]] || die "Test failures: ${failures}"
-	einfo "Tests successfully completed"
-}
-
-src_install() {
-	cmake_src_install
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED}/usr/data" ]] ; then
-		rm -Rf "${ED}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${ED}/${MY_SHAREDSTATEDIR#${EPREFIX}}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
-	cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
-	eprefixify "${TMPDIR}/my.cnf"
-	doins "${TMPDIR}/my.cnf"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
-	cp "${FILESDIR}/my.cnf-8.0.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
-	eprefixify "${TMPDIR}/50-distro-client.cnf"
-	doins "${TMPDIR}/50-distro-client.cnf"
-
-	mycnf_src="my.cnf-8.0.distro-server"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		"${FILESDIR}/${mycnf_src}" \
-		> "${TMPDIR}/my.cnf.ok" || die
-
-	if use prefix ; then
-		sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
-			"${TMPDIR}/my.cnf.ok" || die
-	fi
-
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8mb4|latin1|g" \
-			"${TMPDIR}/my.cnf.ok" || die
-	fi
-
-	eprefixify "${TMPDIR}/my.cnf.ok"
-
-	newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
-	#Remove mytop if perl is not selected
-	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-
-	if use router ; then
-		rm -rf \
-			"${ED}/usr/LICENSE.router" \
-			"${ED}/usr/README.router" \
-			"${ED}/usr/run" \
-			"${ED}/usr/var" \
-			|| die
-	fi
-
-	# Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
-	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	# NOTE: $MY_LOGDIR contains $EPREFIX by default
-	[[ -d "${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${MY_LOGDIR}"
-
-	# Note about configuration change
-	einfo
-	elog "This version of ${PN} reorganizes the configuration from a single my.cnf"
-	elog "to several files in /etc/mysql/mysql.d."
-	elog "Please backup any changes you made to /etc/mysql/my.cnf"
-	elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension."
-	elog "You may have as many files as needed and they are read alphabetically."
-	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
-	einfo
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		einfo
-		elog "You might want to run:"
-		elog "  \"emerge --config =${CATEGORY}/${PF}\""
-		elog "if this is a new install."
-		einfo
-	else
-		einfo
-		elog "Upgrade process for ${PN}-8.x has changed. Please read"
-		elog "https://dev.mysql.com/doc/refman/8.0/en/upgrade-binary-package.html"
-		einfo
-	fi
-}
-
-pkg_config() {
-	_getoptval() {
-		local section="$1"
-		local flag="--${2}="
-		local extra_options="${3}"
-		local cmd=(
-			"${my_print_defaults_binary}"
-			"${extra_options}"
-			"${section}"
-		)
-		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
-
-		if [[ ${#results[@]} -gt 0 ]] ; then
-			# When option is set multiple times only return last value
-			echo "${results[-1]}"
-		fi
-	}
-
-	_mktemp_dry() {
-		# emktemp has no --dry-run option
-		local template="${1}"
-
-		if [[ -z "${template}" ]] ; then
-			if [[ -z "${T}" ]] ; then
-				template="/tmp/XXXXXXX"
-			else
-				template="${T}/XXXXXXX"
-			fi
-		fi
-
-		local template_wo_X=${template//X/}
-		local n_X
-		let n_X=${#template}-${#template_wo_X}
-		if [[ ${n_X} -lt 3 ]] ; then
-			echo "${FUNCNAME[0]}: too few X's in template �${template}’" >&2
-			return
-		fi
-
-		local attempts=0
-		local character tmpfile
-		while [[ true ]] ; do
-			let attempts=attempts+1
-
-			new_file=
-			while read -n1 character ; do
-				if [[ "${character}" == "X" ]] ; then
-					tmpfile+="${RANDOM:0:1}"
-				else
-					tmpfile+="${character}"
-				fi
-			done < <(echo -n "${template}")
-
-			if [[ ! -f "${tmpfile}" ]]
-			then
-				echo "${tmpfile}"
-				return
-			fi
-
-			if [[ ${attempts} -ge 100 ]] ; then
-				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
-				return
-			fi
-		done
-	}
-
-	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
-	if [[ ! -x "${mysqld_binary}" ]] ; then
-		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local mysql_binary="${EROOT}/usr/bin/mysql"
-	if [[ ! -x "${mysql_binary}" ]] ; then
-		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
-	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
-		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
-	fi
-
-	if [[ -z "${MYSQL_USER}" ]] ; then
-		MYSQL_USER=mysql
-		if use prefix ; then
-			MYSQL_USER=$(id -u -n 2>/dev/null)
-			if [[ -z "${MYSQL_USER}" ]] ; then
-				die "Failed to determine current username!"
-			fi
-		fi
-	fi
-
-	if [[ -z "${MYSQL_GROUP}" ]] ; then
-		MYSQL_GROUP=mysql
-		if use prefix ; then
-			MYSQL_GROUP=$(id -g -n 2>/dev/null)
-			if [[ -z "${MYSQL_GROUP}" ]] ; then
-				die "Failed to determine current user groupname!"
-			fi
-		fi
-	fi
-
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	local -x HOME="${EROOT}/root"
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Read currently set data directory
-	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		die "Sorry, unable to find MY_DATADIR!"
-	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
-		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
-		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
-		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
-	fi
-
-	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
-	# These are dir+prefix
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-
-	# Create missing directories.
-	# Always check if mysql user can write to directory even if we just
-	# created directory because a parent directory might be not
-	# accessible for that user.
-	PID_DIR="${EROOT}/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]] ; then
-		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
-		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
-			|| die "Failed to create PID directory '${PID_DIR}'!"
-	fi
-
-	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_pid_dir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_pid_dir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
-	else
-		rm "${_pid_dir_testfile}" || die
-		unset _pid_dir_testfile
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]] ; then
-		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
-			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
-	fi
-
-	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_datadir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_datadir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
-	else
-		rm "${_my_datadir_testfile}" || die
-		unset _my_datadir_testfile
-	fi
-
-	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
-		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
-			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
-	fi
-
-	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
-		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
-		[[ -z "${MYSQL_TMPDIR}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
-
-		mkdir "${MYSQL_TMPDIR}" || die
-		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
-	fi
-
-	# Now we need to test MYSQL_TMPDIR...
-	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_tmpdir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_tmpdir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
-	else
-		rm "${_my_tmpdir_testfile}" || die
-		unset _my_tmpdir_testfile
-	fi
-
-	if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
-		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
-			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
-	fi
-
-	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
-		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_logbin_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_logbin_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
-		else
-			rm "${_my_logbin_testfile}" || die
-			unset _my_logbin_testfile
-		fi
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
-		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
-			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
-		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_relaylog_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_relaylog_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
-		else
-			rm "${_my_relaylog_testfile}" || die
-			unset _my_relaylog_testfile
-		fi
-	fi
-
-	local mysql_install_log="$(_mktemp_dry "${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log")"
-	if [[ -z "${mysql_install_log}" ]] ; then
-		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log' failed!"
-	else
-		# make sure file is writable for MYSQL_USER...
-		touch "${mysql_install_log}" || die
-		chown ${MYSQL_USER} "${mysql_install_log}" || die
-	fi
-
-	local mysqld_logfile="$(_mktemp_dry "${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log")"
-	if [[ -z "${mysqld_logfile}" ]] ; then
-		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log' failed!"
-	else
-		# make sure file is writable for MYSQL_USER...
-		touch "${mysqld_logfile}" || die
-		chown ${MYSQL_USER} "${mysqld_logfile}" || die
-	fi
-
-	echo ""
-	einfo "Detected settings:"
-	einfo "=================="
-	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
-	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
-	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
-	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
-
-	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
-		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
-		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
-	fi
-
-	einfo "PID DIR:\t\t\t\t${PID_DIR}"
-	einfo "Install db log:\t\t\t${mysql_install_log}"
-	einfo "Install server log:\t\t\t${mysqld_logfile}"
-
-	local -a config_files
-
-	local config_file="${EROOT}/etc/mysql/mysql.d/50-distro-client.cnf"
-	if [[ -f "${config_file}" ]] ; then
-		config_files+=( "${config_file}" )
-	else
-		ewarn "Client configuration '${config_file}' not found; Skipping configuration of default authentication plugin for client ..."
-	fi
-
-	config_file="${EROOT}/etc/mysql/mysql.d/50-distro-server.cnf"
-	if [[ -f "${config_file}" ]] ; then
-		config_files+=( "${config_file}" )
-	else
-		ewarn "Server configuration '${config_file}' not found; Skipping configuration of default authentication plugin for mysqld ..."
-	fi
-
-	if [[ ${#config_files[@]} -gt 0 ]] ; then
-		if [[ -z "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" ]] ; then
-			local user_answer
-
-			echo
-			einfo "Please select default authentication plugin (enter number or plugin name):"
-			einfo "1) caching_sha2_password [MySQL 8.0 default]"
-			einfo "2) mysql_native_password [MySQL 5.7 default]"
-			einfo
-			einfo "For details see:"
-			einfo "https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html#upgrade-caching-sha2-password"
-			read -p "    >" user_answer
-			echo
-
-			case "${user_answer}" in
-				1|caching_sha2_password)
-					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=caching_sha2_password
-					;;
-				2|mysql_native_password)
-					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=mysql_native_password
-					;;
-				'')
-					die "No authentication plugin selected!"
-					;;
-				*)
-					die "Authentication plugin '${user_answer}' is unknown/unsupported!"
-					;;
-			esac
-
-			echo "Selected authentication plugin: ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" >> "${mysql_install_log}"
-
-			unset user_answer
-		fi
-
-		local cfg_option cfg_option_tabs cfg_section
-		for config_file in "${config_files[@]}" ; do
-			cfg_option="default-authentication-plugin"
-			cfg_section="mysqld"
-			cfg_option_tabs="\t\t"
-			if [[ "${config_file}" == *client.cnf ]] ; then
-				cfg_option="default-auth"
-				cfg_section="client"
-				cfg_option_tabs="\t\t\t\t"
-			fi
-
-			if grep -qE "^(loose-)?${cfg_option}\b.*=" "${config_file}" 2>/dev/null ; then
-				einfo "Ensuring that ${cfg_option} is set to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
-				sed -i \
-					-e "s/^\(loose-\)\?${cfg_option}\b.*=.*/loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}/" \
-					"${config_file}" || die "Failed to change ${cfg_option} in '${config_file}'!"
-			else
-				einfo "Setting ${cfg_option} to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
-				sed -i \
-					-e "/^\[${cfg_section}\]$/a loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" \
-					"${config_file}" || die "Failed to add ${cfg_option} to '${config_file}'!"
-			fi
-		done
-		unset cfg_option cfg_option_tabs cfg_section
-	fi
-	unset config_files config_file
-
-	echo
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client ; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local pwd1="a"
-		local pwd2="b"
-
-		echo
-		einfo "No password for mysql 'root' user was specified via environment"
-		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
-		einfo "file like '${HOME}/.my.cnf'."
-		einfo "To continue please provide a password for the mysql 'root' user"
-		einfo "now on console:"
-		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same!"
-		fi
-
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-
-		echo
-	fi
-
-	local -a mysqld_options
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR}/mysqld-help"
-	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-
-	local opt optexp optfull
-	for opt in host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-	; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
-	done
-
-	# Prepare timezones, see
-	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	local tz_sql="$(_mktemp_dry "${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql")"
-	[[ -z "${tz_sql}" ]] \
-		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql' failed!"
-
-	echo "USE mysql;" >"${tz_sql}"
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
-	if [[ $? -ne 0 ]] ; then
-		die "mysql_tzinfo_to_sql failed!"
-	fi
-
-	# --initialize-insecure will not set root password
-	# --initialize would set a random one in the log which we don't need as we set it ourselves
-	local cmd=(
-		"${mysqld_binary}"
-		"${mysqld_options[@]}"
-		"--initialize-insecure"
-		"--init-file='${tz_sql}'"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		"--log-error='${mysql_install_log}'"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Initializing ${PN} data directory: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
-
-	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql.ibd" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
-		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
-	fi
-
-	rm "${tz_sql}" || die
-
-	local x=${RANDOM}
-	local socket="${EROOT}${PID_DIR}/mysqld${x}.sock"
-	local pidfile="${EROOT}${PID_DIR}/mysqld${x}.pid"
-	unset x
-
-	cmd=(
-		"${mysqld_binary}"
-		"${mysqld_options[@]}"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		--max_allowed_packet=8M
-		--net_buffer_length=16K
-		"--socket='${socket}'"
-		"--pid-file='${pidfile}'"
-		"--log-error='${mysqld_logfile}'"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
-
-	echo -n "Waiting for mysqld to accept connections "
-	local maxtry=15
-	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-
-	if [[ -S "${socket}" ]] ; then
-		# Even with a socket we don't know if mysqld will abort
-		# start due to an error so just wait a little bit more...
-		maxtry=5
-		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-	fi
-
-	echo
-
-	if [[ ! -S "${socket}" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
-		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
-	fi
-
-	local mysql_logfile="${TMPDIR}/set_root_pw.log"
-	touch "${mysql_logfile}" || die
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
-	cmd=(
-		"${mysql_binary}"
-		--no-defaults
-		"--socket='${socket}'"
-		-hlocalhost
-		"-e \"${sql}\""
-	)
-	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
-	local rc=$?
-	eend ${rc}
-
-	if [[ ${rc} -ne 0 ]] ; then
-		# Poor man's solution which tries to avoid having password
-		# in log.  NOTE: sed can fail if user didn't follow advice
-		# and included character which will require escaping...
-		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
-
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
-		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
-	fi
-
-	# Stop the server
-	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-		echo -n "Stopping the server "
-		pkill -F "${pidfile}" &>/dev/null
-
-		maxtry=10
-		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-
-		echo
-
-		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-			# We somehow failed to stop server.
-			# However, not a fatal error. Just warn the user.
-			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
-		fi
-	fi
-
-	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
-}
diff --git a/dev-db/mysql/mysql-8.0.31-r2.ebuild b/dev-db/mysql/mysql-8.0.31-r2.ebuild
deleted file mode 100644
index 3b9b79fb88df..000000000000
--- a/dev-db/mysql/mysql-8.0.31-r2.ebuild
+++ /dev/null
@@ -1,1219 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit check-reqs cmake flag-o-matic linux-info multiprocessing prefix toolchain-funcs
-
-MY_PV="${PV//_pre*}"
-MY_P="${PN}-${MY_PV}"
-
-# Patch version
-PATCH_SET=( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches-01.tar.xz )
-
-HOMEPAGE="https://www.mysql.com/"
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-SRC_URI="https://cdn.mysql.com/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${MY_PV}.tar.gz"
-SRC_URI+=" https://cdn.mysql.com/archives/mysql-$(ver_cut 1-2)/mysql-boost-${MY_PV}.tar.gz"
-SRC_URI+=" https://downloads.mysql.com/archives/MySQL-$(ver_cut 1-2)/${PN}-boost-${MY_PV}.tar.gz"
-SRC_URI+=" ${PATCH_SET[@]}"
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-LICENSE="GPL-2"
-SLOT="8.0"
-# -ppc, -riscv for bug #761715
-KEYWORDS="amd64 arm arm64 ~hppa ~mips -ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="?? ( tcmalloc jemalloc )
-	cjk? ( server )
-	jemalloc? ( server )
-	numa? ( server )
-	profiling? ( server )
-	router? ( server )
-	tcmalloc? ( server )"
-
-# Be warned, *DEPEND are version-dependent
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
-	>=app-arch/lz4-0_p131:=
-	app-arch/zstd:=
-	sys-libs/ncurses:0=
-	>=sys-libs/zlib-1.2.3:0=
-	>=dev-libs/openssl-1.0.0:0=
-	server? (
-		dev-libs/icu:=
-		dev-libs/libevent:=[ssl,threads(+)]
-		>=dev-libs/protobuf-3.8:=
-		net-libs/libtirpc:=
-		cjk? ( app-text/mecab:= )
-		jemalloc? ( dev-libs/jemalloc:0= )
-		kernel_linux? (
-			dev-libs/libaio:0=
-			sys-process/procps:0=
-		)
-		numa? ( sys-process/numactl )
-		tcmalloc? ( dev-util/google-perftools:0= )
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	app-alternatives/yacc
-	server? ( net-libs/rpcsvc-proto )
-	test? (
-		acct-group/mysql acct-user/mysql
-		dev-perl/JSON
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
-	!dev-db/mysql:0
-	!dev-db/mysql:5.7
-	selinux? ( sec-policy/selinux-mysql )
-	!prefix? (
-		acct-group/mysql acct-user/mysql
-		dev-db/mysql-init-scripts
-	)
-"
-
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-PATCHES=(
-	"${WORKDIR}"/mysql-patches
-	"${FILESDIR}"/mysql-8.0.31-build-tmpdir-nodefault.patch
-)
-
-mysql_init_vars() {
-	: ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-	: ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	: ${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	: ${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-	MY_DATADIR="${MY_LOCALSTATEDIR}"
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use server ; then
-			CHECKREQS_DISK_BUILD="3G"
-
-			if has test $FEATURES ; then
-				CHECKREQS_DISK_BUILD="9G"
-			fi
-
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		CHECKREQS_DISK_BUILD="3G"
-
-		if has test ${FEATURES} ; then
-			CHECKREQS_DISK_BUILD="9G"
-
-			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
-			# localhost. Also causes weird failures.
-			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-			if ! has userpriv ${FEATURES} ; then
-				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-			fi
-
-			local aio_max_nr=$(sysctl -n fs.aio-max-nr 2>/dev/null)
-			[[ -z "${aio_max_nr}" || ${aio_max_nr} -lt 250000 ]] \
-				&& die "FEATURES=test will require fs.aio-max-nr=250000 at minimum!"
-
-			if use latin1 ; then
-				# Upstream only supports tests with default charset
-				die "Testing with USE=latin1 is not supported."
-			fi
-		fi
-
-		if use kernel_linux ; then
-			if use numa ; then
-				linux-info_get_any_version
-
-				local CONFIG_CHECK="~NUMA"
-
-				local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
-				WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
-
-				check_extra_config
-			fi
-		fi
-
-		use server && check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	mv -f "${WORKDIR}/${MY_P}" "${S}" || die
-}
-
-src_prepare() {
-	# Avoid rpm call which would trigger sandbox, #692368
-	sed -i \
-		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
-		CMakeLists.txt || die
-
-	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
-	if [[ -d "${S}/support-files/SELinux" ]] ; then
-		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
-	fi
-
-	# Remove man pages for client-lib tools we don't install
-	rm \
-		man/my_print_defaults.1 \
-		man/perror.1 \
-		man/zlib_decompress.1 \
-		|| die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	# Code is now requiring C++17 due to https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08
-	append-cxxflags -std=c++17
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usev !debug '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usev !debug '-DNDEBUG')"
-
-		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-
-		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-
-		# Using bundled editline to get CTRL+C working
-		-DWITH_EDITLINE=bundled
-		-DWITH_ZLIB=system
-		-DWITH_SSL=system
-		-DWITH_LIBWRAP=0
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		# The build forces this to be defined when cross-compiling. We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-
-		-DWITH_CURL=system
-		-DWITH_BOOST="${S}/boost"
-		-DWITH_ROUTER=$(usex router ON OFF)
-	)
-
-	if tc-is-lto ; then
-		mycmakeargs+=( -DWITH_LTO=ON )
-	else
-		mycmakeargs+=( -DWITH_LTO=OFF )
-	fi
-
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
-
-	mycmakeargs+=(
-		-DWITH_ICU=system
-		-DWITH_LZ4=system
-		# Our dev-libs/rapidjson doesn't carry necessary fixes for std::regex
-		-DWITH_RAPIDJSON=bundled
-		-DWITH_ZSTD=system
-	)
-
-	if [[ -n "${MYSQL_DEFAULT_CHARSET}" && -n "${MYSQL_DEFAULT_COLLATION}" ]] ; then
-		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-		ewarn "You MUST file bugs without these variables set."
-		ewarn "Tests will probably fail!"
-
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-			-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-		)
-	elif use latin1 ; then
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=latin1
-			-DDEFAULT_COLLATION=latin1_swedish_ci
-		)
-	else
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=utf8mb4
-			-DDEFAULT_COLLATION=utf8mb4_0900_ai_ci
-		)
-	fi
-
-	if use server ; then
-		mycmakeargs+=(
-			-DWITH_EXTRA_CHARSETS=all
-			-DWITH_DEBUG=$(usex debug)
-			-DWITH_MECAB=$(usex cjk system OFF)
-			-DWITH_LIBEVENT=system
-			-DWITH_PROTOBUF=system
-			-DWITH_NUMA=$(usex numa ON OFF)
-		)
-
-		if use jemalloc ; then
-			mycmakeargs+=( -DWITH_JEMALLOC=ON )
-		elif use tcmalloc ; then
-			mycmakeargs+=( -DWITH_TCMALLOC=ON )
-		fi
-
-		if use profiling ; then
-			# Setting to OFF doesn't work: Once set, profiling options will be added
-			# to `mysqld --help` output via sql/sys_vars.cc causing
-			# "main.mysqld--help-notwin" test to fail
-			mycmakeargs+=( -DENABLED_PROFILING=ON )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_EXAMPLE_STORAGE_ENGINE=0
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_FEDERATED_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_INNODB_MEMCACHED=0
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-		)
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DWITH_SYSTEMD=no
-		)
-	fi
-
-	cmake_src_configure
-}
-
-# Official test instructions:
-# ulimit -n 16500 && \
-# USE='perl server' \
-# FEATURES='test userpriv' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	_disable_test() {
-		local rawtestname bug reason
-		rawtestname="${1}" ; shift
-		bug="${1}" ; shift
-		reason="${@}"
-		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
-		echo ${rawtestname} : BUG#${bug} ${reason} >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_tests
-
-	if ! use server ; then
-		einfo "Skipping server tests due to minimal build."
-		return 0
-	fi
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-	if [[ -z "${MTR_PARALLEL}" ]] ; then
-		local -x MTR_PARALLEL=$(makeopts_jobs)
-
-		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
-			# Running multiple tests in parallel usually require higher ulimit
-			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
-			# are known to hit timeout when system is busy.
-			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
-			# using "auto".
-			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
-			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
-			einfo "${info_msg}"
-			unset info_msg
-			MTR_PARALLEL=4
-		fi
-	else
-		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
-	fi
-
-	# create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	# Run mysql tests
-	pushd "${TESTDIR}" &>/dev/null || die
-
-	touch "${T}/disabled.def"
-
-	local -a disabled_tests
-	disabled_tests+=( "auth_sec.atomic_rename_user;103512;Depends on user running test" )
-	disabled_tests+=( "auth_sec.keyring_file_data_qa;0;Won't work with user privileges" )
-	disabled_tests+=( "auth_sec.openssl_without_fips;94718;Known test failure" )
-	disabled_tests+=( "gis.geometry_class_attri_prop;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.geometry_property_function_issimple;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.gis_bugs_crashes;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_analysis_functions_buffer;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_analysis_functions_centroid;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_analysis_functions_distance;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_op_testingfunc_mix;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_operators_intersection;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_utility_function_distance_sphere;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_utility_function_simplify;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.st_symdifference;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "innodb.alter_kill;0;Known test failure -- no upstream bug yet" )
-	disabled_tests+=( "main.derived_limit;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.explain_tree;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.gis-precise;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.mysql_load_data_local_dir;0;Known test failure -- no upstream bug yet" )
-	disabled_tests+=( "main.select_icp_mrr;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.subquery_bugs;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.subquery_sj_dupsweed;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.subquery_sj_dupsweed_bka;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.subquery_sj_dupsweed_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.subquery_sj_firstmatch;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.subquery_sj_firstmatch_bka;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.subquery_sj_firstmatch_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.subquery_sj_mat_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.window_std_var;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.window_std_var_optimized;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.with_recursive;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "perfschema.statement_digest_query_sample;0;Test will fail on slow hardware")
-	disabled_tests+=( "rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch;0;Unstable test" )
-	disabled_tests+=( "rpl_gtid.rpl_gtid_stm_drop_table;90612;Known test failure" )
-	disabled_tests+=( "rpl_gtid.rpl_multi_source_mtr_includes;0;Known failure - no upstream bug yet" )
-	disabled_tests+=( "sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware")
-	disabled_tests+=( "x.connection;0;Known failure - no upstream bug yet" )
-	disabled_tests+=( "x.message_compressed_payload;0;False positive caused by protobuff-3.11+" )
-	disabled_tests+=( "x.message_protobuf_nested;0;False positive caused by protobuff-3.11+" )
-
-	if ! hash zip 1>/dev/null 2>&1 ; then
-		# no need to force dep app-arch/zip for one test
-		disabled_tests+=( "innodb.discarded_partition_create;0;Requires app-arch/zip" )
-		disabled_tests+=( "innodb.partition_upgrade_create;0;Requires app-arch/zip" )
-	fi
-
-	if has_version ">=dev-libs/openssl-3" ; then
-		# >=dev-libs/openssl-3 defaults to security level 1 which disallow
-		# TLSv1/1.1 but tests will require TLSv1/1.1.
-		einfo "Set OpenSSL configuration for test suite ..."
-		cat > "${T}/openssl_tlsv1.cnf" <<- EOF || die
-		openssl_conf = default_conf
-
-		[ req ]
-		default_bits			= 2048
-		default_keyfile 		= privkey.pem
-		distinguished_name		= req_distinguished_name
-
-		[ req_distinguished_name ]
-		countryName			= Country Name (2 letter code)
-		countryName_default		= AU
-		countryName_min			= 2
-		countryName_max			= 2
-
-		stateOrProvinceName		= State or Province Name (full name)
-		stateOrProvinceName_default	= Some-State
-
-		localityName			= Locality Name (eg, city)
-
-		0.organizationName		= Organization Name (eg, company)
-		0.organizationName_default	= Internet Widgits Pty Ltd
-
-		organizationalUnitName		= Organizational Unit Name (eg, section)
-
-		commonName			= Common Name (e.g. server FQDN or YOUR name)
-		commonName_max			= 64
-
-		emailAddress			= Email Address
-		emailAddress_max		= 64
-
-		[default_conf]
-		ssl_conf = ssl_sect
-
-		[ssl_sect]
-		system_default = system_default_sect
-
-		[system_default_sect]
-		CipherString = DEFAULT@SECLEVEL=0
-		EOF
-
-		local -x OPENSSL_CONF="${T}/openssl_tlsv1.cnf"
-
-		disabled_tests+=( "x.connection_tls_version;0;Not compatible with OpenSSL 3.x error messages" )
-	fi
-
-	local test_infos_str test_infos_arr
-	for test_infos_str in "${disabled_tests[@]}" ; do
-		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
-
-		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
-			die "Invalid test data set, not matching format: ${test_infos_str}"
-		fi
-
-		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
-	done
-	unset test_infos_str test_infos_arr
-
-	# Try to increase file limits to increase test coverage
-	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
-		# Upper limit comes from parts.partition_* tests
-		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
-
-		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
-			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
-			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
-
-			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
-				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
-			else
-				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
-			fi
-		else
-			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
-		fi
-	else
-		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
-	fi
-
-	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd &>/dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "${failures}" ]] || die "Test failures: ${failures}"
-	einfo "Tests successfully completed"
-}
-
-src_install() {
-	cmake_src_install
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED}/usr/data" ]] ; then
-		rm -Rf "${ED}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${ED}/${MY_SHAREDSTATEDIR#${EPREFIX}}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
-	cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
-	eprefixify "${TMPDIR}/my.cnf"
-	doins "${TMPDIR}/my.cnf"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
-	cp "${FILESDIR}/my.cnf-8.0.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
-	eprefixify "${TMPDIR}/50-distro-client.cnf"
-	doins "${TMPDIR}/50-distro-client.cnf"
-
-	mycnf_src="my.cnf-8.0.distro-server"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		"${FILESDIR}/${mycnf_src}" \
-		> "${TMPDIR}/my.cnf.ok" || die
-
-	if use prefix ; then
-		sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
-			"${TMPDIR}/my.cnf.ok" || die
-	fi
-
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8mb4|latin1|g" \
-			"${TMPDIR}/my.cnf.ok" || die
-	fi
-
-	eprefixify "${TMPDIR}/my.cnf.ok"
-
-	newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
-	#Remove mytop if perl is not selected
-	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-
-	if use router ; then
-		rm -rf \
-			"${ED}/usr/LICENSE.router" \
-			"${ED}/usr/README.router" \
-			"${ED}/usr/run" \
-			"${ED}/usr/var" \
-			|| die
-	fi
-
-	# Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
-	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	# NOTE: $MY_LOGDIR contains $EPREFIX by default
-	[[ -d "${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${MY_LOGDIR}"
-
-	# Note about configuration change
-	einfo
-	elog "This version of ${PN} reorganizes the configuration from a single my.cnf"
-	elog "to several files in /etc/mysql/mysql.d."
-	elog "Please backup any changes you made to /etc/mysql/my.cnf"
-	elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension."
-	elog "You may have as many files as needed and they are read alphabetically."
-	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
-	einfo
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		einfo
-		elog "You might want to run:"
-		elog "  \"emerge --config =${CATEGORY}/${PF}\""
-		elog "if this is a new install."
-		einfo
-	else
-		einfo
-		elog "Upgrade process for ${PN}-8.x has changed. Please read"
-		elog "https://dev.mysql.com/doc/refman/8.0/en/upgrade-binary-package.html"
-		einfo
-	fi
-}
-
-pkg_config() {
-	_getoptval() {
-		local section="$1"
-		local flag="--${2}="
-		local extra_options="${3}"
-		local cmd=(
-			"${my_print_defaults_binary}"
-			"${extra_options}"
-			"${section}"
-		)
-		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
-
-		if [[ ${#results[@]} -gt 0 ]] ; then
-			# When option is set multiple times only return last value
-			echo "${results[-1]}"
-		fi
-	}
-
-	_mktemp_dry() {
-		# emktemp has no --dry-run option
-		local template="${1}"
-
-		if [[ -z "${template}" ]] ; then
-			if [[ -z "${T}" ]] ; then
-				template="/tmp/XXXXXXX"
-			else
-				template="${T}/XXXXXXX"
-			fi
-		fi
-
-		local template_wo_X=${template//X/}
-		local n_X
-		let n_X=${#template}-${#template_wo_X}
-		if [[ ${n_X} -lt 3 ]] ; then
-			echo "${FUNCNAME[0]}: too few X's in template �${template}’" >&2
-			return
-		fi
-
-		local attempts=0
-		local character tmpfile
-		while [[ true ]] ; do
-			let attempts=attempts+1
-
-			new_file=
-			while read -n1 character ; do
-				if [[ "${character}" == "X" ]] ; then
-					tmpfile+="${RANDOM:0:1}"
-				else
-					tmpfile+="${character}"
-				fi
-			done < <(echo -n "${template}")
-
-			if [[ ! -f "${tmpfile}" ]]
-			then
-				echo "${tmpfile}"
-				return
-			fi
-
-			if [[ ${attempts} -ge 100 ]] ; then
-				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
-				return
-			fi
-		done
-	}
-
-	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
-	if [[ ! -x "${mysqld_binary}" ]] ; then
-		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local mysql_binary="${EROOT}/usr/bin/mysql"
-	if [[ ! -x "${mysql_binary}" ]] ; then
-		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
-	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
-		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
-	fi
-
-	if [[ -z "${MYSQL_USER}" ]] ; then
-		MYSQL_USER=mysql
-		if use prefix ; then
-			MYSQL_USER=$(id -u -n 2>/dev/null)
-			if [[ -z "${MYSQL_USER}" ]] ; then
-				die "Failed to determine current username!"
-			fi
-		fi
-	fi
-
-	if [[ -z "${MYSQL_GROUP}" ]] ; then
-		MYSQL_GROUP=mysql
-		if use prefix ; then
-			MYSQL_GROUP=$(id -g -n 2>/dev/null)
-			if [[ -z "${MYSQL_GROUP}" ]] ; then
-				die "Failed to determine current user groupname!"
-			fi
-		fi
-	fi
-
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	local -x HOME="${EROOT}/root"
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Read currently set data directory
-	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		die "Sorry, unable to find MY_DATADIR!"
-	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
-		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
-		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
-		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
-	fi
-
-	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
-	# These are dir+prefix
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-
-	# Create missing directories.
-	# Always check if mysql user can write to directory even if we just
-	# created directory because a parent directory might be not
-	# accessible for that user.
-	PID_DIR="${EROOT}/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]] ; then
-		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
-		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
-			|| die "Failed to create PID directory '${PID_DIR}'!"
-	fi
-
-	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_pid_dir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_pid_dir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
-	else
-		rm "${_pid_dir_testfile}" || die
-		unset _pid_dir_testfile
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]] ; then
-		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
-			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
-	fi
-
-	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_datadir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_datadir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
-	else
-		rm "${_my_datadir_testfile}" || die
-		unset _my_datadir_testfile
-	fi
-
-	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
-		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
-			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
-	fi
-
-	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
-		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
-		[[ -z "${MYSQL_TMPDIR}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
-
-		mkdir "${MYSQL_TMPDIR}" || die
-		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
-	fi
-
-	# Now we need to test MYSQL_TMPDIR...
-	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_tmpdir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_tmpdir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
-	else
-		rm "${_my_tmpdir_testfile}" || die
-		unset _my_tmpdir_testfile
-	fi
-
-	if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
-		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
-			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
-	fi
-
-	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
-		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_logbin_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_logbin_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
-		else
-			rm "${_my_logbin_testfile}" || die
-			unset _my_logbin_testfile
-		fi
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
-		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
-			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
-		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_relaylog_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_relaylog_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
-		else
-			rm "${_my_relaylog_testfile}" || die
-			unset _my_relaylog_testfile
-		fi
-	fi
-
-	local mysql_install_log="$(_mktemp_dry "${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log")"
-	if [[ -z "${mysql_install_log}" ]] ; then
-		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log' failed!"
-	else
-		# make sure file is writable for MYSQL_USER...
-		touch "${mysql_install_log}" || die
-		chown ${MYSQL_USER} "${mysql_install_log}" || die
-	fi
-
-	local mysqld_logfile="$(_mktemp_dry "${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log")"
-	if [[ -z "${mysqld_logfile}" ]] ; then
-		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log' failed!"
-	else
-		# make sure file is writable for MYSQL_USER...
-		touch "${mysqld_logfile}" || die
-		chown ${MYSQL_USER} "${mysqld_logfile}" || die
-	fi
-
-	echo ""
-	einfo "Detected settings:"
-	einfo "=================="
-	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
-	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
-	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
-	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
-
-	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
-		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
-		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
-	fi
-
-	einfo "PID DIR:\t\t\t\t${PID_DIR}"
-	einfo "Install db log:\t\t\t${mysql_install_log}"
-	einfo "Install server log:\t\t\t${mysqld_logfile}"
-
-	local -a config_files
-
-	local config_file="${EROOT}/etc/mysql/mysql.d/50-distro-client.cnf"
-	if [[ -f "${config_file}" ]] ; then
-		config_files+=( "${config_file}" )
-	else
-		ewarn "Client configuration '${config_file}' not found; Skipping configuration of default authentication plugin for client ..."
-	fi
-
-	config_file="${EROOT}/etc/mysql/mysql.d/50-distro-server.cnf"
-	if [[ -f "${config_file}" ]] ; then
-		config_files+=( "${config_file}" )
-	else
-		ewarn "Server configuration '${config_file}' not found; Skipping configuration of default authentication plugin for mysqld ..."
-	fi
-
-	if [[ ${#config_files[@]} -gt 0 ]] ; then
-		if [[ -z "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" ]] ; then
-			local user_answer
-
-			echo
-			einfo "Please select default authentication plugin (enter number or plugin name):"
-			einfo "1) caching_sha2_password [MySQL 8.0 default]"
-			einfo "2) mysql_native_password [MySQL 5.7 default]"
-			einfo
-			einfo "For details see:"
-			einfo "https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html#upgrade-caching-sha2-password"
-			read -p "    >" user_answer
-			echo
-
-			case "${user_answer}" in
-				1|caching_sha2_password)
-					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=caching_sha2_password
-					;;
-				2|mysql_native_password)
-					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=mysql_native_password
-					;;
-				'')
-					die "No authentication plugin selected!"
-					;;
-				*)
-					die "Authentication plugin '${user_answer}' is unknown/unsupported!"
-					;;
-			esac
-
-			echo "Selected authentication plugin: ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" >> "${mysql_install_log}"
-
-			unset user_answer
-		fi
-
-		local cfg_option cfg_option_tabs cfg_section
-		for config_file in "${config_files[@]}" ; do
-			cfg_option="default-authentication-plugin"
-			cfg_section="mysqld"
-			cfg_option_tabs="\t\t"
-			if [[ "${config_file}" == *client.cnf ]] ; then
-				cfg_option="default-auth"
-				cfg_section="client"
-				cfg_option_tabs="\t\t\t\t"
-			fi
-
-			if grep -qE "^(loose-)?${cfg_option}\b.*=" "${config_file}" 2>/dev/null ; then
-				einfo "Ensuring that ${cfg_option} is set to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
-				sed -i \
-					-e "s/^\(loose-\)\?${cfg_option}\b.*=.*/loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}/" \
-					"${config_file}" || die "Failed to change ${cfg_option} in '${config_file}'!"
-			else
-				einfo "Setting ${cfg_option} to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
-				sed -i \
-					-e "/^\[${cfg_section}\]$/a loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" \
-					"${config_file}" || die "Failed to add ${cfg_option} to '${config_file}'!"
-			fi
-		done
-		unset cfg_option cfg_option_tabs cfg_section
-	fi
-	unset config_files config_file
-
-	echo
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client ; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local pwd1="a"
-		local pwd2="b"
-
-		echo
-		einfo "No password for mysql 'root' user was specified via environment"
-		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
-		einfo "file like '${HOME}/.my.cnf'."
-		einfo "To continue please provide a password for the mysql 'root' user"
-		einfo "now on console:"
-		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same!"
-		fi
-
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-
-		echo
-	fi
-
-	local -a mysqld_options
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR}/mysqld-help"
-	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-
-	local opt optexp optfull
-	for opt in host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-	; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
-	done
-
-	# Prepare timezones, see
-	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	local tz_sql="$(_mktemp_dry "${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql")"
-	[[ -z "${tz_sql}" ]] \
-		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql' failed!"
-
-	echo "USE mysql;" >"${tz_sql}"
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
-	if [[ $? -ne 0 ]] ; then
-		die "mysql_tzinfo_to_sql failed!"
-	fi
-
-	# --initialize-insecure will not set root password
-	# --initialize would set a random one in the log which we don't need as we set it ourselves
-	local cmd=(
-		"${mysqld_binary}"
-		"${mysqld_options[@]}"
-		"--initialize-insecure"
-		"--init-file='${tz_sql}'"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		"--log-error='${mysql_install_log}'"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Initializing ${PN} data directory: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
-
-	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql.ibd" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
-		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
-	fi
-
-	rm "${tz_sql}" || die
-
-	local x=${RANDOM}
-	local socket="${EROOT}${PID_DIR}/mysqld${x}.sock"
-	local pidfile="${EROOT}${PID_DIR}/mysqld${x}.pid"
-	unset x
-
-	cmd=(
-		"${mysqld_binary}"
-		"${mysqld_options[@]}"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		--max_allowed_packet=8M
-		--net_buffer_length=16K
-		"--socket='${socket}'"
-		"--pid-file='${pidfile}'"
-		"--log-error='${mysqld_logfile}'"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
-
-	echo -n "Waiting for mysqld to accept connections "
-	local maxtry=15
-	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-
-	if [[ -S "${socket}" ]] ; then
-		# Even with a socket we don't know if mysqld will abort
-		# start due to an error so just wait a little bit more...
-		maxtry=5
-		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-	fi
-
-	echo
-
-	if [[ ! -S "${socket}" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
-		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
-	fi
-
-	local mysql_logfile="${TMPDIR}/set_root_pw.log"
-	touch "${mysql_logfile}" || die
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
-	cmd=(
-		"${mysql_binary}"
-		--no-defaults
-		"--socket='${socket}'"
-		-hlocalhost
-		"-e \"${sql}\""
-	)
-	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
-	local rc=$?
-	eend ${rc}
-
-	if [[ ${rc} -ne 0 ]] ; then
-		# Poor man's solution which tries to avoid having password
-		# in log.  NOTE: sed can fail if user didn't follow advice
-		# and included character which will require escaping...
-		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
-
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
-		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
-	fi
-
-	# Stop the server
-	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-		echo -n "Stopping the server "
-		pkill -F "${pidfile}" &>/dev/null
-
-		maxtry=10
-		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-
-		echo
-
-		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-			# We somehow failed to stop server.
-			# However, not a fatal error. Just warn the user.
-			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
-		fi
-	fi
-
-	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
-}
diff --git a/dev-db/mysql/mysql-8.0.32-r2.ebuild b/dev-db/mysql/mysql-8.0.32-r2.ebuild
deleted file mode 100644
index bf84e493abbe..000000000000
--- a/dev-db/mysql/mysql-8.0.32-r2.ebuild
+++ /dev/null
@@ -1,1240 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit check-reqs cmake edo flag-o-matic linux-info multiprocessing prefix toolchain-funcs
-
-MY_PV="${PV//_pre*}"
-MY_P="${PN}-${MY_PV}"
-
-# Patch version
-PATCH_SET=( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-8.0.31-patches-01.tar.xz )
-
-HOMEPAGE="https://www.mysql.com/"
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-SRC_URI="https://cdn.mysql.com/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${MY_PV}.tar.gz"
-SRC_URI+=" https://cdn.mysql.com/archives/mysql-$(ver_cut 1-2)/mysql-boost-${MY_PV}.tar.gz"
-SRC_URI+=" https://downloads.mysql.com/archives/MySQL-$(ver_cut 1-2)/${PN}-boost-${MY_PV}.tar.gz"
-SRC_URI+=" ${PATCH_SET[@]}"
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-LICENSE="GPL-2"
-SLOT="8.0"
-# -ppc, -riscv for bug #761715
-KEYWORDS="amd64 arm arm64 ~hppa ~mips -ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="?? ( tcmalloc jemalloc )
-	cjk? ( server )
-	jemalloc? ( server )
-	numa? ( server )
-	profiling? ( server )
-	router? ( server )
-	tcmalloc? ( server )"
-
-# Be warned, *DEPEND are version-dependent
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
-	>=app-arch/lz4-1.9.4:=
-	app-arch/zstd:=
-	>=dev-libs/openssl-1.0.0:=
-	sys-libs/ncurses:=
-	>=sys-libs/zlib-1.2.13:=
-	server? (
-		dev-libs/icu:=
-		dev-libs/libevent:=[ssl,threads(+)]
-		>=dev-libs/protobuf-3.8:=
-		net-libs/libtirpc:=
-		cjk? ( app-text/mecab:= )
-		jemalloc? ( dev-libs/jemalloc:= )
-		kernel_linux? (
-			dev-libs/libaio:=
-			sys-process/procps:=
-		)
-		numa? ( sys-process/numactl )
-		tcmalloc? ( dev-util/google-perftools:= )
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	app-alternatives/yacc
-	server? ( net-libs/rpcsvc-proto )
-	test? (
-		acct-group/mysql acct-user/mysql
-		dev-perl/JSON
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	!dev-db/mariadb
-	!dev-db/mariadb-galera
-	!dev-db/percona-server
-	!dev-db/mysql-cluster
-	!dev-db/mysql:0
-	!dev-db/mysql:5.7
-	selinux? ( sec-policy/selinux-mysql )
-	!prefix? (
-		acct-group/mysql acct-user/mysql
-		dev-db/mysql-init-scripts
-	)
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-PATCHES=(
-	"${WORKDIR}"/mysql-patches
-	"${FILESDIR}"/${PN}-8.0.32-gcc13.patch
-)
-
-mysql_init_vars() {
-	: ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-	: ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	: ${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	: ${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-	MY_DATADIR="${MY_LOCALSTATEDIR}"
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use server ; then
-			CHECKREQS_DISK_BUILD="3G"
-
-			if has test ${FEATURES} ; then
-				CHECKREQS_DISK_BUILD="9G"
-			fi
-
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		CHECKREQS_DISK_BUILD="3G"
-
-		if has test ${FEATURES} ; then
-			CHECKREQS_DISK_BUILD="9G"
-
-			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
-			# localhost. Also causes weird failures.
-			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-			if ! has userpriv ${FEATURES} ; then
-				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-			fi
-
-			local aio_max_nr=$(sysctl -n fs.aio-max-nr 2>/dev/null)
-			if [[ -z "${aio_max_nr}" || ${aio_max_nr} -lt 250000 ]] ; then
-				die "FEATURES=test will require fs.aio-max-nr=250000 at minimum!"
-			fi
-
-			if use latin1 ; then
-				# Upstream only supports tests with default charset
-				die "Testing with USE=latin1 is not supported."
-			fi
-		fi
-
-		if use kernel_linux && use numa ; then
-			linux-info_get_any_version
-
-			local CONFIG_CHECK="~NUMA"
-
-			local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
-			WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
-
-			check_extra_config
-		fi
-
-		use server && check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	mv -f "${WORKDIR}/${MY_P}" "${S}" || die
-}
-
-src_prepare() {
-	# Avoid rpm call which would trigger sandbox, #692368
-	sed -i \
-		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
-		CMakeLists.txt || die
-
-	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
-	if [[ -d "${S}/support-files/SELinux" ]] ; then
-		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
-	fi
-
-	# Remove man pages for client-lib tools we don't install
-	rm \
-		man/my_print_defaults.1 \
-		man/perror.1 \
-		man/zlib_decompress.1 \
-		|| die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	# Code is now requiring C++17 due to https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08
-	append-cxxflags -std=c++17
-
-	# Broken with FORTIFY_SOURCE=3
-	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-	# to unset F_S first, then explicitly set 2, to negate any default
-	# and anything set by the user if they're choosing 3 (or if they've
-	# modified GCC to set 3).
-	#
-	# bug #891259
-	if tc-enables-fortify-source ; then
-		filter-flags -D_FORTIFY_SOURCE=3
-		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
-	# debug hack wrt #497532
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usev !debug '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usev !debug '-DNDEBUG')"
-
-		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-
-		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-
-		# Using bundled editline to get CTRL+C working
-		-DWITH_EDITLINE=bundled
-		-DWITH_ZLIB=system
-		-DWITH_SSL=system
-		-DWITH_LIBWRAP=0
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		# The build forces this to be defined when cross-compiling. We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-
-		-DWITH_CURL=system
-		-DWITH_BOOST="${S}/boost"
-		-DWITH_ROUTER=$(usex router ON OFF)
-	)
-
-	if tc-is-lto ; then
-		mycmakeargs+=( -DWITH_LTO=ON )
-	else
-		mycmakeargs+=( -DWITH_LTO=OFF )
-	fi
-
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
-
-	mycmakeargs+=(
-		-DWITH_ICU=system
-		-DWITH_LZ4=system
-		# Our dev-libs/rapidjson doesn't carry necessary fixes for std::regex
-		-DWITH_RAPIDJSON=bundled
-		-DWITH_ZSTD=system
-	)
-
-	if [[ -n "${MYSQL_DEFAULT_CHARSET}" && -n "${MYSQL_DEFAULT_COLLATION}" ]] ; then
-		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-		ewarn "You MUST file bugs without these variables set."
-		ewarn "Tests will probably fail!"
-
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-			-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-		)
-	elif use latin1 ; then
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=latin1
-			-DDEFAULT_COLLATION=latin1_swedish_ci
-		)
-	else
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=utf8mb4
-			-DDEFAULT_COLLATION=utf8mb4_0900_ai_ci
-		)
-	fi
-
-	if use server ; then
-		mycmakeargs+=(
-			-DWITH_EXTRA_CHARSETS=all
-			-DWITH_DEBUG=$(usex debug)
-			-DWITH_MECAB=$(usex cjk system OFF)
-			-DWITH_LIBEVENT=system
-			-DWITH_PROTOBUF=system
-			-DWITH_NUMA=$(usex numa ON OFF)
-		)
-
-		if use jemalloc ; then
-			mycmakeargs+=( -DWITH_JEMALLOC=ON )
-		elif use tcmalloc ; then
-			mycmakeargs+=( -DWITH_TCMALLOC=ON )
-		fi
-
-		if use profiling ; then
-			# Setting to OFF doesn't work: Once set, profiling options will be added
-			# to `mysqld --help` output via sql/sys_vars.cc causing
-			# "main.mysqld--help-notwin" test to fail
-			mycmakeargs+=( -DENABLED_PROFILING=ON )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_EXAMPLE_STORAGE_ENGINE=0
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_FEDERATED_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_INNODB_MEMCACHED=0
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-		)
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DWITH_SYSTEMD=no
-		)
-	fi
-
-	cmake_src_configure
-}
-
-# Official test instructions:
-# ulimit -n 16500 && USE='perl server' FEATURES='test userpriv' \
-# ebuild mysql-X.X.XX.ebuild digest clean test install
-src_test() {
-	_disable_test() {
-		local rawtestname bug reason
-		rawtestname="${1}" ; shift
-		bug="${1}" ; shift
-		reason="${@}"
-
-		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
-		echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_tests
-
-	einfo "Official test instructions:"
-	einfo "ulimit -n 16500 && USE='perl server' FEATURES='test userpriv' ebuild ..."
-
-	if ! use server ; then
-		ewarn "Skipping server tests due to minimal build!"
-		return 0
-	fi
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-	if [[ -z "${MTR_PARALLEL}" ]] ; then
-		local -x MTR_PARALLEL=$(makeopts_jobs)
-
-		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
-			# Running multiple tests in parallel usually require higher ulimit
-			# and fs.aio-max-nr settings. In addition, tests like main.multi_update
-			# are known to hit timeouts when the system is busy.
-			#
-			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
-			# using "auto".
-			einfo "Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
-			einfo "to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
-			MTR_PARALLEL=4
-		fi
-	else
-		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
-	fi
-
-	# Create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	# Run mysql tests
-	pushd "${TESTDIR}" &>/dev/null || die
-
-	touch "${T}/disabled.def" || die
-
-	local -a disabled_tests=(
-		"auth_sec.atomic_rename_user;103512;Depends on user running test"
-		"auth_sec.keyring_file_data_qa;0;Won't work with user privileges"
-		"auth_sec.openssl_without_fips;94718;Known test failure"
-
-		"gis.geometry_class_attri_prop;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.geometry_property_function_issimple;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.gis_bugs_crashes;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_analysis_functions_buffer;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_analysis_functions_centroid;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_analysis_functions_distance;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_op_testingfunc_mix;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_operators_intersection;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_utility_function_distance_sphere;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_utility_function_simplify;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.st_symdifference;5452;Known rounding error with latest AMD processors (PS)"
-
-		"innodb.alter_kill;0;Known test failure -- no upstream bug yet"
-
-		"main.derived_limit;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.explain_tree;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.gis-precise;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.mysql_load_data_local_dir;0;Known test failure -- no upstream bug yet"
-		"main.select_icp_mrr;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_bugs;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_dupsweed;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_dupsweed_bka;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_dupsweed_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_firstmatch;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_firstmatch_bka;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_firstmatch_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_mat_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.window_std_var;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.window_std_var_optimized;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.with_recursive;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"perfschema.statement_digest_query_sample;0;Test will fail on slow hardware"
-
-		"rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch;0;Unstable test"
-		"rpl_gtid.rpl_gtid_stm_drop_table;90612;Known test failure"
-		"rpl_gtid.rpl_multi_source_mtr_includes;0;Known failure - no upstream bug yet"
-
-		"sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware"
-
-		"x.connection;0;Known failure - no upstream bug yet"
-		"x.message_compressed_payload;0;False positive caused by protobuff-3.11+"
-		"x.message_protobuf_nested;0;False positive caused by protobuff-3.11+"
-	)
-
-	if ! hash zip 1>/dev/null 2>&1 ; then
-		# No need to force dep app-arch/zip for one test
-		disabled_tests+=(
-			"innodb.discarded_partition_create;0;Requires app-arch/zip"
-			"innodb.partition_upgrade_create;0;Requires app-arch/zip"
-		)
-	fi
-
-	if has_version ">=dev-libs/openssl-3" ; then
-		# >=dev-libs/openssl-3 defaults to security level 1 which disallow
-		# TLSv1/1.1 but tests will require TLSv1/1.1.
-		einfo "Set OpenSSL configuration for test suite ..."
-
-		cat > "${T}/openssl_tlsv1.cnf" <<- EOF || die
-		openssl_conf = default_conf
-
-		[ req ]
-		default_bits			= 2048
-		default_keyfile 		= privkey.pem
-		distinguished_name		= req_distinguished_name
-
-		[ req_distinguished_name ]
-		countryName			= Country Name (2 letter code)
-		countryName_default		= AU
-		countryName_min			= 2
-		countryName_max			= 2
-
-		stateOrProvinceName		= State or Province Name (full name)
-		stateOrProvinceName_default	= Some-State
-
-		localityName			= Locality Name (eg, city)
-
-		0.organizationName		= Organization Name (eg, company)
-		0.organizationName_default	= Internet Widgits Pty Ltd
-
-		organizationalUnitName		= Organizational Unit Name (eg, section)
-
-		commonName			= Common Name (e.g. server FQDN or YOUR name)
-		commonName_max			= 64
-
-		emailAddress			= Email Address
-		emailAddress_max		= 64
-
-		[default_conf]
-		ssl_conf = ssl_sect
-
-		[ssl_sect]
-		system_default = system_default_sect
-
-		[system_default_sect]
-		CipherString = DEFAULT@SECLEVEL=0
-		EOF
-
-		local -x OPENSSL_CONF="${T}/openssl_tlsv1.cnf"
-
-		disabled_tests+=( "x.connection_tls_version;0;Not compatible with OpenSSL 3.x error messages" )
-	fi
-
-	local test_infos_str test_infos_arr
-	for test_infos_str in "${disabled_tests[@]}" ; do
-		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
-
-		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
-			die "Invalid test data set, not matching format: ${test_infos_str}"
-		fi
-
-		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
-	done
-	unset test_infos_str test_infos_arr
-
-	# Try to increase file limits to increase test coverage
-	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
-		# Upper limit comes from parts.partition_* tests
-		ewarn "For maximum test coverage, please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
-
-		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
-			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
-			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
-
-			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
-				ewarn "For minimum test coverage, please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
-			else
-				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
-			fi
-		else
-			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
-		fi
-	else
-		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
-	fi
-
-	# run mysql-test tests
-	nonfatal edo perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd &>/dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "${failures}" ]] || die "Test failures: ${failures}"
-	einfo "Tests successfully completed"
-}
-
-src_install() {
-	cmake_src_install
-
-	# Not a GNU info file, more like a tiny README.
-	rm "${ED}"/usr/share/info/mysql.info || die
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED}/usr/data" ]] ; then
-		rm -Rf "${ED}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${ED}/${MY_SHAREDSTATEDIR#${EPREFIX}}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
-	cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
-	eprefixify "${TMPDIR}/my.cnf"
-	doins "${TMPDIR}/my.cnf"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
-	cp "${FILESDIR}/my.cnf-8.0.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
-	eprefixify "${TMPDIR}/50-distro-client.cnf"
-	doins "${TMPDIR}/50-distro-client.cnf"
-
-	mycnf_src="my.cnf-8.0.distro-server"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		"${FILESDIR}/${mycnf_src}" \
-		> "${TMPDIR}/my.cnf.ok" || die
-
-	if use prefix ; then
-		sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
-			"${TMPDIR}/my.cnf.ok" || die
-	fi
-
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8mb4|latin1|g" \
-			"${TMPDIR}/my.cnf.ok" || die
-	fi
-
-	eprefixify "${TMPDIR}/my.cnf.ok"
-
-	newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
-	#Remove mytop if perl is not selected
-	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-
-	if use router ; then
-		rm -rf \
-			"${ED}/usr/LICENSE.router" \
-			"${ED}/usr/README.router" \
-			"${ED}/usr/run" \
-			"${ED}/usr/var" \
-			|| die
-	fi
-
-	# Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
-	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	# NOTE: $MY_LOGDIR contains $EPREFIX by default
-	[[ -d "${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${MY_LOGDIR}"
-
-	# Note about configuration change
-	einfo
-	elog "This version of ${PN} reorganizes the configuration from a single my.cnf"
-	elog "to several files in /etc/mysql/mysql.d."
-	elog "Please backup any changes you made to /etc/mysql/my.cnf"
-	elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension."
-	elog "You may have as many files as needed and they are read alphabetically."
-	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
-	einfo
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		einfo
-		elog "You might want to run:"
-		elog "  \"emerge --config =${CATEGORY}/${PF}\""
-		elog "if this is a new install."
-		einfo
-	else
-		einfo
-		elog "Upgrade process for ${PN}-8.x has changed. Please read"
-		elog "https://dev.mysql.com/doc/refman/8.0/en/upgrade-binary-package.html"
-		einfo
-	fi
-}
-
-pkg_config() {
-	_getoptval() {
-		local section="$1"
-		local flag="--${2}="
-		local extra_options="${3}"
-		local cmd=(
-			"${my_print_defaults_binary}"
-			"${extra_options}"
-			"${section}"
-		)
-		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
-
-		if [[ ${#results[@]} -gt 0 ]] ; then
-			# When option is set multiple times only return last value
-			echo "${results[-1]}"
-		fi
-	}
-
-	_mktemp_dry() {
-		# emktemp has no --dry-run option
-		local template="${1}"
-
-		if [[ -z "${template}" ]] ; then
-			if [[ -z "${T}" ]] ; then
-				template="/tmp/XXXXXXX"
-			else
-				template="${T}/XXXXXXX"
-			fi
-		fi
-
-		local template_wo_X=${template//X/}
-		local n_X
-		let n_X=${#template}-${#template_wo_X}
-		if [[ ${n_X} -lt 3 ]] ; then
-			echo "${FUNCNAME[0]}: too few X's in template �${template}’" >&2
-			return
-		fi
-
-		local attempts=0
-		local character tmpfile
-		while [[ true ]] ; do
-			let attempts=attempts+1
-
-			new_file=
-			while read -n1 character ; do
-				if [[ "${character}" == "X" ]] ; then
-					tmpfile+="${RANDOM:0:1}"
-				else
-					tmpfile+="${character}"
-				fi
-			done < <(echo -n "${template}")
-
-			if [[ ! -f "${tmpfile}" ]]
-			then
-				echo "${tmpfile}"
-				return
-			fi
-
-			if [[ ${attempts} -ge 100 ]] ; then
-				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
-				return
-			fi
-		done
-	}
-
-	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
-	if [[ ! -x "${mysqld_binary}" ]] ; then
-		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local mysql_binary="${EROOT}/usr/bin/mysql"
-	if [[ ! -x "${mysql_binary}" ]] ; then
-		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
-	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
-		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
-	fi
-
-	if [[ -z "${MYSQL_USER}" ]] ; then
-		MYSQL_USER=mysql
-		if use prefix ; then
-			MYSQL_USER=$(id -u -n 2>/dev/null)
-			if [[ -z "${MYSQL_USER}" ]] ; then
-				die "Failed to determine current username!"
-			fi
-		fi
-	fi
-
-	if [[ -z "${MYSQL_GROUP}" ]] ; then
-		MYSQL_GROUP=mysql
-		if use prefix ; then
-			MYSQL_GROUP=$(id -g -n 2>/dev/null)
-			if [[ -z "${MYSQL_GROUP}" ]] ; then
-				die "Failed to determine current user groupname!"
-			fi
-		fi
-	fi
-
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	local -x HOME="${EROOT}/root"
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Read currently set data directory
-	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		die "Sorry, unable to find MY_DATADIR!"
-	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
-		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
-		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
-		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
-	fi
-
-	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
-	# These are dir+prefix
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-
-	# Create missing directories.
-	# Always check if mysql user can write to directory even if we just
-	# created directory because a parent directory might be not
-	# accessible for that user.
-	PID_DIR="${EROOT}/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]] ; then
-		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
-		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
-			|| die "Failed to create PID directory '${PID_DIR}'!"
-	fi
-
-	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_pid_dir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_pid_dir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
-	else
-		rm "${_pid_dir_testfile}" || die
-		unset _pid_dir_testfile
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]] ; then
-		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
-			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
-	fi
-
-	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_datadir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_datadir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
-	else
-		rm "${_my_datadir_testfile}" || die
-		unset _my_datadir_testfile
-	fi
-
-	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
-		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
-			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
-	fi
-
-	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
-		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
-		[[ -z "${MYSQL_TMPDIR}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
-
-		mkdir "${MYSQL_TMPDIR}" || die
-		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
-	fi
-
-	# Now we need to test MYSQL_TMPDIR...
-	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_tmpdir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_tmpdir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
-	else
-		rm "${_my_tmpdir_testfile}" || die
-		unset _my_tmpdir_testfile
-	fi
-
-	if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
-		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
-			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
-	fi
-
-	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
-		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_logbin_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_logbin_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
-		else
-			rm "${_my_logbin_testfile}" || die
-			unset _my_logbin_testfile
-		fi
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
-		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
-			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
-		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_relaylog_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_relaylog_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
-		else
-			rm "${_my_relaylog_testfile}" || die
-			unset _my_relaylog_testfile
-		fi
-	fi
-
-	local mysql_install_log="$(_mktemp_dry "${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log")"
-	if [[ -z "${mysql_install_log}" ]] ; then
-		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log' failed!"
-	else
-		# make sure file is writable for MYSQL_USER...
-		touch "${mysql_install_log}" || die
-		chown ${MYSQL_USER} "${mysql_install_log}" || die
-	fi
-
-	local mysqld_logfile="$(_mktemp_dry "${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log")"
-	if [[ -z "${mysqld_logfile}" ]] ; then
-		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log' failed!"
-	else
-		# make sure file is writable for MYSQL_USER...
-		touch "${mysqld_logfile}" || die
-		chown ${MYSQL_USER} "${mysqld_logfile}" || die
-	fi
-
-	echo ""
-	einfo "Detected settings:"
-	einfo "=================="
-	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
-	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
-	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
-	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
-
-	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
-		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
-		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
-	fi
-
-	einfo "PID DIR:\t\t\t\t${PID_DIR}"
-	einfo "Install db log:\t\t\t${mysql_install_log}"
-	einfo "Install server log:\t\t\t${mysqld_logfile}"
-
-	local -a config_files
-
-	local config_file="${EROOT}/etc/mysql/mysql.d/50-distro-client.cnf"
-	if [[ -f "${config_file}" ]] ; then
-		config_files+=( "${config_file}" )
-	else
-		ewarn "Client configuration '${config_file}' not found; Skipping configuration of default authentication plugin for client ..."
-	fi
-
-	config_file="${EROOT}/etc/mysql/mysql.d/50-distro-server.cnf"
-	if [[ -f "${config_file}" ]] ; then
-		config_files+=( "${config_file}" )
-	else
-		ewarn "Server configuration '${config_file}' not found; Skipping configuration of default authentication plugin for mysqld ..."
-	fi
-
-	if [[ ${#config_files[@]} -gt 0 ]] ; then
-		if [[ -z "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" ]] ; then
-			local user_answer
-
-			echo
-			einfo "Please select default authentication plugin (enter number or plugin name):"
-			einfo "1) caching_sha2_password [MySQL 8.0 default]"
-			einfo "2) mysql_native_password [MySQL 5.7 default]"
-			einfo
-			einfo "For details see:"
-			einfo "https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html#upgrade-caching-sha2-password"
-			read -p "    >" user_answer
-			echo
-
-			case "${user_answer}" in
-				1|caching_sha2_password)
-					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=caching_sha2_password
-					;;
-				2|mysql_native_password)
-					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=mysql_native_password
-					;;
-				'')
-					die "No authentication plugin selected!"
-					;;
-				*)
-					die "Authentication plugin '${user_answer}' is unknown/unsupported!"
-					;;
-			esac
-
-			echo "Selected authentication plugin: ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" >> "${mysql_install_log}"
-
-			unset user_answer
-		fi
-
-		local cfg_option cfg_option_tabs cfg_section
-		for config_file in "${config_files[@]}" ; do
-			cfg_option="default-authentication-plugin"
-			cfg_section="mysqld"
-			cfg_option_tabs="\t\t"
-			if [[ "${config_file}" == *client.cnf ]] ; then
-				cfg_option="default-auth"
-				cfg_section="client"
-				cfg_option_tabs="\t\t\t\t"
-			fi
-
-			if grep -qE "^(loose-)?${cfg_option}\b.*=" "${config_file}" 2>/dev/null ; then
-				einfo "Ensuring that ${cfg_option} is set to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
-				sed -i \
-					-e "s/^\(loose-\)\?${cfg_option}\b.*=.*/loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}/" \
-					"${config_file}" || die "Failed to change ${cfg_option} in '${config_file}'!"
-			else
-				einfo "Setting ${cfg_option} to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
-				sed -i \
-					-e "/^\[${cfg_section}\]$/a loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" \
-					"${config_file}" || die "Failed to add ${cfg_option} to '${config_file}'!"
-			fi
-		done
-		unset cfg_option cfg_option_tabs cfg_section
-	fi
-	unset config_files config_file
-
-	echo
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client ; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local pwd1="a"
-		local pwd2="b"
-
-		echo
-		einfo "No password for mysql 'root' user was specified via environment"
-		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
-		einfo "file like '${HOME}/.my.cnf'."
-		einfo "To continue please provide a password for the mysql 'root' user"
-		einfo "now on console:"
-		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same!"
-		fi
-
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-
-		echo
-	fi
-
-	local -a mysqld_options
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR}/mysqld-help"
-	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-
-	local opt optexp optfull
-	for opt in host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-	; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
-	done
-
-	# Prepare timezones, see
-	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	local tz_sql="$(_mktemp_dry "${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql")"
-	[[ -z "${tz_sql}" ]] \
-		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql' failed!"
-
-	echo "USE mysql;" >"${tz_sql}"
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
-	if [[ $? -ne 0 ]] ; then
-		die "mysql_tzinfo_to_sql failed!"
-	fi
-
-	# --initialize-insecure will not set root password
-	# --initialize would set a random one in the log which we don't need as we set it ourselves
-	local cmd=(
-		"${mysqld_binary}"
-		"${mysqld_options[@]}"
-		"--initialize-insecure"
-		"--init-file='${tz_sql}'"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		"--log-error='${mysql_install_log}'"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Initializing ${PN} data directory: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
-
-	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql.ibd" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
-		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
-	fi
-
-	rm "${tz_sql}" || die
-
-	local x=${RANDOM}
-	local socket="${EROOT}${PID_DIR}/mysqld${x}.sock"
-	local pidfile="${EROOT}${PID_DIR}/mysqld${x}.pid"
-	unset x
-
-	cmd=(
-		"${mysqld_binary}"
-		"${mysqld_options[@]}"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		--max_allowed_packet=8M
-		--net_buffer_length=16K
-		"--socket='${socket}'"
-		"--pid-file='${pidfile}'"
-		"--log-error='${mysqld_logfile}'"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
-
-	echo -n "Waiting for mysqld to accept connections "
-	local maxtry=15
-	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-
-	if [[ -S "${socket}" ]] ; then
-		# Even with a socket we don't know if mysqld will abort
-		# start due to an error so just wait a little bit more...
-		maxtry=5
-		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-	fi
-
-	echo
-
-	if [[ ! -S "${socket}" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
-		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
-	fi
-
-	local mysql_logfile="${TMPDIR}/set_root_pw.log"
-	touch "${mysql_logfile}" || die
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
-	cmd=(
-		"${mysql_binary}"
-		--no-defaults
-		"--socket='${socket}'"
-		-hlocalhost
-		"-e \"${sql}\""
-	)
-	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
-	local rc=$?
-	eend ${rc}
-
-	if [[ ${rc} -ne 0 ]] ; then
-		# Poor man's solution which tries to avoid having password
-		# in log.  NOTE: sed can fail if user didn't follow advice
-		# and included character which will require escaping...
-		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
-
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
-		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
-	fi
-
-	# Stop the server
-	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-		echo -n "Stopping the server "
-		pkill -F "${pidfile}" &>/dev/null
-
-		maxtry=10
-		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-
-		echo
-
-		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-			# We somehow failed to stop server.
-			# However, not a fatal error. Just warn the user.
-			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
-		fi
-	fi
-
-	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
-}
diff --git a/dev-db/mysql/mysql-8.0.34.ebuild b/dev-db/mysql/mysql-8.0.34.ebuild
deleted file mode 100644
index f7feb0d829ce..000000000000
--- a/dev-db/mysql/mysql-8.0.34.ebuild
+++ /dev/null
@@ -1,1223 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs cmake edo flag-o-matic linux-info multiprocessing prefix toolchain-funcs
-
-MY_PV="${PV//_pre*}"
-MY_P="${PN}-${MY_PV}"
-
-# Patch version
-PATCH_SET=( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-8.0.34-patches-01.tar.xz )
-
-HOMEPAGE="https://www.mysql.com/"
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-SRC_URI="https://cdn.mysql.com/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${MY_PV}.tar.gz"
-SRC_URI+=" https://cdn.mysql.com/archives/mysql-$(ver_cut 1-2)/mysql-boost-${MY_PV}.tar.gz"
-SRC_URI+=" https://downloads.mysql.com/archives/MySQL-$(ver_cut 1-2)/${PN}-boost-${MY_PV}.tar.gz"
-SRC_URI+=" ${PATCH_SET[@]}"
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-LICENSE="GPL-2"
-SLOT="8.0"
-# -ppc for bug #761715
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips -ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc )
-	cjk? ( server )
-	jemalloc? ( server )
-	numa? ( server )
-	profiling? ( server )
-	router? ( server )
-	tcmalloc? ( server )"
-
-# Be warned, *DEPEND are version-dependent
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
-	>=app-arch/lz4-1.9.4:=
-	>=app-arch/zstd-1.2.0:=
-	>=dev-libs/openssl-1.0.0:=
-	sys-libs/ncurses:=
-	>=sys-libs/zlib-1.2.13:=
-	server? (
-		dev-libs/icu:=
-		dev-libs/libevent:=[ssl,threads(+)]
-		net-libs/libtirpc:=
-		cjk? ( app-text/mecab:= )
-		jemalloc? ( dev-libs/jemalloc:= )
-		kernel_linux? (
-			dev-libs/libaio:=
-			sys-process/procps:=
-		)
-		numa? ( sys-process/numactl )
-		tcmalloc? ( dev-util/google-perftools:= )
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	app-alternatives/yacc
-	server? ( net-libs/rpcsvc-proto )
-	test? (
-		acct-group/mysql acct-user/mysql
-		dev-perl/Expect
-		dev-perl/JSON
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	!dev-db/mariadb
-	!dev-db/mariadb-galera
-	!dev-db/percona-server
-	!dev-db/mysql-cluster
-	!dev-db/mysql:0
-	!dev-db/mysql:5.7
-	selinux? ( sec-policy/selinux-mysql )
-	!prefix? (
-		acct-group/mysql acct-user/mysql
-		dev-db/mysql-init-scripts
-	)
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-PATCHES=(
-	"${WORKDIR}"/mysql-patches
-)
-
-mysql_init_vars() {
-	: ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-	: ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	: ${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	: ${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-	MY_DATADIR="${MY_LOCALSTATEDIR}"
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use server ; then
-			CHECKREQS_DISK_BUILD="3G"
-
-			if has test ${FEATURES} ; then
-				CHECKREQS_DISK_BUILD="9G"
-			fi
-
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		CHECKREQS_DISK_BUILD="3G"
-
-		if has test ${FEATURES} ; then
-			CHECKREQS_DISK_BUILD="9G"
-
-			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
-			# localhost. Also causes weird failures.
-			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-			if ! has userpriv ${FEATURES} ; then
-				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-			fi
-
-			local aio_max_nr=$(sysctl -n fs.aio-max-nr 2>/dev/null)
-			if [[ -z "${aio_max_nr}" || ${aio_max_nr} -lt 250000 ]] ; then
-				die "FEATURES=test will require fs.aio-max-nr=250000 at minimum!"
-			fi
-
-			if use latin1 ; then
-				# Upstream only supports tests with default charset
-				die "Testing with USE=latin1 is not supported."
-			fi
-		fi
-
-		if use kernel_linux && use numa ; then
-			linux-info_get_any_version
-
-			local CONFIG_CHECK="~NUMA"
-
-			local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
-			WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
-
-			check_extra_config
-		fi
-
-		use server && check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	mv -f "${WORKDIR}/${MY_P}" "${S}" || die
-}
-
-src_prepare() {
-	# Avoid rpm call which would trigger sandbox, #692368
-	sed -i \
-		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
-		CMakeLists.txt || die
-
-	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
-	if [[ -d "${S}/support-files/SELinux" ]] ; then
-		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
-	fi
-
-	# Remove man pages for client-lib tools we don't install
-	rm \
-		man/my_print_defaults.1 \
-		man/perror.1 \
-		man/zlib_decompress.1 \
-		|| die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	# Code is now requiring C++17 due to https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08
-	append-cxxflags -std=c++17
-
-	# Broken with FORTIFY_SOURCE=3
-	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-	# to unset F_S first, then explicitly set 2, to negate any default
-	# and anything set by the user if they're choosing 3 (or if they've
-	# modified GCC to set 3).
-	#
-	# bug #891259
-	if tc-enables-fortify-source ; then
-		filter-flags -D_FORTIFY_SOURCE=3
-		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
-	if has sandbox ${FEATURES} ; then
-		# bug #823656
-		append-cppflags -DGTEST_NO_DEATH_TEST=1
-	fi
-
-	local mycmakeargs=(
-		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-
-		-DROUTER_INSTALL_LOGROTATEDIR="${EPREFIX}/etc/logrotate.d"
-		-DROUTER_INSTALL_DOCDIR="share/doc/${PF}"
-
-		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-
-		# Using bundled editline to get CTRL+C working
-		-DWITH_EDITLINE=bundled
-		-DWITH_ZLIB=system
-		-DWITH_SSL=system
-		-DWITH_LIBWRAP=0
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-
-		-DWITH_CURL=system
-		-DWITH_BOOST="${S}/boost"
-		-DWITH_ROUTER=$(usex router ON OFF)
-	)
-
-	if use debug; then
-		# Debug build type used extensively to add preprocessor definitions
-		local -x CMAKE_BUILD_TYPE="Debug"
-	else
-		# debug hack wrt #497532
-		mycmakeargs+=(
-			-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usev !debug '-DNDEBUG' )"
-			-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usev !debug '-DNDEBUG' )"
-		)
-	fi
-
-	if tc-is-lto ; then
-		mycmakeargs+=( -DWITH_LTO=ON )
-	else
-		mycmakeargs+=( -DWITH_LTO=OFF )
-	fi
-
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
-
-	mycmakeargs+=(
-		-DWITH_ICU=system
-		-DWITH_LZ4=system
-		# Our dev-libs/rapidjson doesn't carry necessary fixes for std::regex
-		-DWITH_RAPIDJSON=bundled
-		-DWITH_ZSTD=system
-	)
-
-	if [[ -n "${MYSQL_DEFAULT_CHARSET}" && -n "${MYSQL_DEFAULT_COLLATION}" ]] ; then
-		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-		ewarn "You MUST file bugs without these variables set."
-		ewarn "Tests will probably fail!"
-
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-			-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-		)
-	elif use latin1 ; then
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=latin1
-			-DDEFAULT_COLLATION=latin1_swedish_ci
-		)
-	else
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=utf8mb4
-			-DDEFAULT_COLLATION=utf8mb4_0900_ai_ci
-		)
-	fi
-
-	if use server ; then
-		mycmakeargs+=(
-			-DWITH_EXTRA_CHARSETS=all
-			-DWITH_DEBUG=$(usex debug)
-			-DWITH_MECAB=$(usex cjk system OFF)
-			-DWITH_LIBEVENT=system
-			# Cannot handle protobuf >23 bug #912797
-			-DWITH_PROTOBUF=bundled
-			-DWITH_NUMA=$(usex numa ON OFF)
-		)
-
-		if use jemalloc ; then
-			mycmakeargs+=( -DWITH_JEMALLOC=ON )
-		elif use tcmalloc ; then
-			mycmakeargs+=( -DWITH_TCMALLOC=ON )
-		fi
-
-		if use profiling ; then
-			# Setting to OFF doesn't work: Once set, profiling options will be added
-			# to `mysqld --help` output via sql/sys_vars.cc causing
-			# "main.mysqld--help-notwin" test to fail
-			mycmakeargs+=( -DENABLED_PROFILING=ON )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_EXAMPLE_STORAGE_ENGINE=0
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_FEDERATED_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_INNODB_MEMCACHED=0
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-		)
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DWITH_SYSTEMD=no
-		)
-	fi
-
-	cmake_src_configure
-}
-
-# Official test instructions:
-# ulimit -n 16500 && USE='perl server' FEATURES='test userpriv' \
-# ebuild mysql-X.X.XX.ebuild digest clean test install
-src_test() {
-	_disable_test() {
-		local rawtestname bug reason
-		rawtestname="${1}" ; shift
-		bug="${1}" ; shift
-		reason="${@}"
-
-		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
-		echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_tests
-
-	einfo "Official test instructions:"
-	einfo "ulimit -n 16500 && USE='perl server' FEATURES='test userpriv' ebuild ..."
-
-	if ! use server ; then
-		ewarn "Skipping server tests due to minimal build!"
-		return 0
-	fi
-
-	# Ensure that parallel runs don't die
-	local -x MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-	local -x MTR_PARALLEL=${MTR_PARALLEL:-$(makeopts_jobs)}
-	einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
-
-	# Disable unit tests, run them separately with eclass defaults
-	local -x MTR_UNIT_TESTS=0
-
-	# Create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	# Run mysql tests
-	pushd "${TESTDIR}" &>/dev/null || die
-
-	touch "${T}/disabled.def" || die
-
-	local -a disabled_tests=(
-		"auth_sec.atomic_rename_user;103512;Depends on user running test"
-		"auth_sec.keyring_file_data_qa;0;Won't work with user privileges"
-		"auth_sec.openssl_without_fips;94718;Known test failure"
-
-		"gis.geometry_class_attri_prop;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.geometry_property_function_issimple;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.gis_bugs_crashes;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_analysis_functions_buffer;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_analysis_functions_centroid;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_analysis_functions_distance;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_op_testingfunc_mix;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_operators_intersection;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_utility_function_distance_sphere;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_utility_function_simplify;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.st_symdifference;5452;Known rounding error with latest AMD processors (PS)"
-
-		"innodb.alter_kill;0;Known test failure -- no upstream bug yet"
-
-		"main.derived_limit;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.explain_tree;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.gis-precise;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.mysql_load_data_local_dir;0;Known test failure -- no upstream bug yet"
-		"main.select_icp_mrr;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_bugs;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_dupsweed;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_dupsweed_bka;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_dupsweed_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_firstmatch;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_firstmatch_bka;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_firstmatch_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_mat_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_all_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.window_std_var;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.window_std_var_optimized;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.with_recursive;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"perfschema.statement_digest_query_sample;0;Test will fail on slow hardware"
-
-		"rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch;0;Unstable test"
-		"rpl_gtid.rpl_multi_source_mtr_includes;97844;Unstable test"
-		"main.partition_datatype;0;Unstable test"
-
-		"sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware"
-
-		"x.connection;0;Known failure - no upstream bug yet"
-		"main.slow_log;0;Known failure - no upstream bug yet"
-	)
-
-	if ! hash zip 1>/dev/null 2>&1 ; then
-		# No need to force dep app-arch/zip for one test
-		disabled_tests+=(
-			"innodb.discarded_partition_create;0;Requires app-arch/zip"
-			"innodb.partition_upgrade_create;0;Requires app-arch/zip"
-		)
-	fi
-
-	local test_infos_str test_infos_arr
-	for test_infos_str in "${disabled_tests[@]}" ; do
-		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
-
-		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
-			die "Invalid test data set, not matching format: ${test_infos_str}"
-		fi
-
-		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
-	done
-	unset test_infos_str test_infos_arr
-
-	local -a CMAKE_SKIP_TESTS=(
-		# timing test, can be unreliable
-		"routertest_harness_net_ts_timer"
-
-		# Could not get local host address: Name or service not known(errno: -2)
-		"routertest_component_bootstrap"
-		"routertest_component_bootstrap_account"
-		"routertest_component_bootstrap_clusterset"
-		"routertest_component_config_overwrites"
-		"routertest_component_rest_api_enable"
-		"routertest_component_routing"
-		"routertest_component_sd_notify"
-		"routertest_component_state_file"
-		"routertest_integration_routing_direct"
-		"routertest_integration_routing_reuse"
-		"routertest_integration_routing_sharing"
-		"routertest_integration_routing_sharing_constrained_pools"
-		"routertest_integration_routing_sharing_restart"
-
-		# FIXME: suffers from broken DEATH_TESTS's
-		"routertest_router_certificate_generator"
-
-		# TODO: ???
-		"pfs_host-oom"
-		"pfs_user-oom"
-		"pfs"
-	)
-
-	# Try to increase file limits to increase test coverage
-	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
-		# Upper limit comes from parts.partition_* tests
-		ewarn "For maximum test coverage, please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
-
-		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
-			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
-			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
-
-			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
-				ewarn "For minimum test coverage, please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
-			else
-				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
-			fi
-		else
-			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
-		fi
-	else
-		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
-	fi
-
-	# run mysql-test tests
-	# Enable force restart to ensure success when tests don't cleanup sufficiently.
-	# Anything touching gtid_executed is negatively affected if you have unlucky ordering
-	nonfatal edo perl mysql-test-run.pl \
-		--force --force-restart \
-		--vardir="${T}/var-tests" --tmpdir="${T}/tmp-tests" \
-		--skip-test=tokudb --skip-test-list="${T}/disabled.def" \
-		--retry-failure=0
-	retstatus_tests=$?
-
-	popd &>/dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
-
-	cmake_src_test
-
-	[[ -z "${failures}" ]] || die "Test failures: ${failures}"
-	einfo "Tests successfully completed"
-}
-
-src_install() {
-	cmake_src_install
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED}/usr/data" ]] ; then
-		rm -Rf "${ED}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${ED}/${MY_SHAREDSTATEDIR#${EPREFIX}}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
-	cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
-	eprefixify "${TMPDIR}/my.cnf"
-	doins "${TMPDIR}/my.cnf"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
-	cp "${FILESDIR}/my.cnf-8.0.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
-	eprefixify "${TMPDIR}/50-distro-client.cnf"
-	doins "${TMPDIR}/50-distro-client.cnf"
-
-	mycnf_src="my.cnf-8.0.distro-server"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		"${FILESDIR}/${mycnf_src}" \
-		> "${TMPDIR}/my.cnf.ok" || die
-
-	if use prefix ; then
-		sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
-			"${TMPDIR}/my.cnf.ok" || die
-	fi
-
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8mb4|latin1|g" \
-			"${TMPDIR}/my.cnf.ok" || die
-	fi
-
-	eprefixify "${TMPDIR}/my.cnf.ok"
-
-	newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
-	#Remove mytop if perl is not selected
-	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-
-	if use router ; then
-		rm -rf \
-			"${ED}/usr/LICENSE.router" \
-			"${ED}/usr/README.router" \
-			"${ED}/usr/run" \
-			"${ED}/usr/var" \
-			|| die
-	fi
-
-	# Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
-	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	# NOTE: $MY_LOGDIR contains $EPREFIX by default
-	[[ -d "${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${MY_LOGDIR}"
-
-	# Note about configuration change
-	einfo
-	elog "This version of ${PN} reorganizes the configuration from a single my.cnf"
-	elog "to several files in /etc/mysql/mysql.d."
-	elog "Please backup any changes you made to /etc/mysql/my.cnf"
-	elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension."
-	elog "You may have as many files as needed and they are read alphabetically."
-	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
-	einfo
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		einfo
-		elog "You might want to run:"
-		elog "  \"emerge --config =${CATEGORY}/${PF}\""
-		elog "if this is a new install."
-		einfo
-	else
-		einfo
-		elog "Upgrade process for ${PN}-8.x has changed. Please read"
-		elog "https://dev.mysql.com/doc/refman/8.0/en/upgrade-binary-package.html"
-		einfo
-	fi
-}
-
-pkg_config() {
-	_getoptval() {
-		local section="$1"
-		local flag="--${2}="
-		local extra_options="${3}"
-		local cmd=(
-			"${my_print_defaults_binary}"
-			"${extra_options}"
-			"${section}"
-		)
-		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
-
-		if [[ ${#results[@]} -gt 0 ]] ; then
-			# When option is set multiple times only return last value
-			echo "${results[-1]}"
-		fi
-	}
-
-	_mktemp_dry() {
-		# emktemp has no --dry-run option
-		local template="${1}"
-
-		if [[ -z "${template}" ]] ; then
-			if [[ -z "${T}" ]] ; then
-				template="/tmp/XXXXXXX"
-			else
-				template="${T}/XXXXXXX"
-			fi
-		fi
-
-		local template_wo_X=${template//X/}
-		local n_X
-		let n_X=${#template}-${#template_wo_X}
-		if [[ ${n_X} -lt 3 ]] ; then
-			echo "${FUNCNAME[0]}: too few X's in template �${template}’" >&2
-			return
-		fi
-
-		local attempts=0
-		local character tmpfile
-		while [[ true ]] ; do
-			let attempts=attempts+1
-
-			new_file=
-			while read -n1 character ; do
-				if [[ "${character}" == "X" ]] ; then
-					tmpfile+="${RANDOM:0:1}"
-				else
-					tmpfile+="${character}"
-				fi
-			done < <(echo -n "${template}")
-
-			if [[ ! -f "${tmpfile}" ]]
-			then
-				echo "${tmpfile}"
-				return
-			fi
-
-			if [[ ${attempts} -ge 100 ]] ; then
-				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
-				return
-			fi
-		done
-	}
-
-	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
-	if [[ ! -x "${mysqld_binary}" ]] ; then
-		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local mysql_binary="${EROOT}/usr/bin/mysql"
-	if [[ ! -x "${mysql_binary}" ]] ; then
-		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
-	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
-		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
-	fi
-
-	if [[ -z "${MYSQL_USER}" ]] ; then
-		MYSQL_USER=mysql
-		if use prefix ; then
-			MYSQL_USER=$(id -u -n 2>/dev/null)
-			if [[ -z "${MYSQL_USER}" ]] ; then
-				die "Failed to determine current username!"
-			fi
-		fi
-	fi
-
-	if [[ -z "${MYSQL_GROUP}" ]] ; then
-		MYSQL_GROUP=mysql
-		if use prefix ; then
-			MYSQL_GROUP=$(id -g -n 2>/dev/null)
-			if [[ -z "${MYSQL_GROUP}" ]] ; then
-				die "Failed to determine current user groupname!"
-			fi
-		fi
-	fi
-
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	local -x HOME="${EROOT}/root"
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Read currently set data directory
-	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		die "Sorry, unable to find MY_DATADIR!"
-	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
-		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
-		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
-		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
-	fi
-
-	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
-	# These are dir+prefix
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-
-	# Create missing directories.
-	# Always check if mysql user can write to directory even if we just
-	# created directory because a parent directory might be not
-	# accessible for that user.
-	PID_DIR="${EROOT}/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]] ; then
-		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
-		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
-			|| die "Failed to create PID directory '${PID_DIR}'!"
-	fi
-
-	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_pid_dir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_pid_dir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
-	else
-		rm "${_pid_dir_testfile}" || die
-		unset _pid_dir_testfile
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]] ; then
-		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
-			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
-	fi
-
-	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_datadir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_datadir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
-	else
-		rm "${_my_datadir_testfile}" || die
-		unset _my_datadir_testfile
-	fi
-
-	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
-		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
-			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
-	fi
-
-	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
-		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
-		[[ -z "${MYSQL_TMPDIR}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
-
-		mkdir "${MYSQL_TMPDIR}" || die
-		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
-	fi
-
-	# Now we need to test MYSQL_TMPDIR...
-	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_tmpdir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_tmpdir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
-	else
-		rm "${_my_tmpdir_testfile}" || die
-		unset _my_tmpdir_testfile
-	fi
-
-	if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
-		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
-			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
-	fi
-
-	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
-		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_logbin_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_logbin_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
-		else
-			rm "${_my_logbin_testfile}" || die
-			unset _my_logbin_testfile
-		fi
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
-		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
-			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
-		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_relaylog_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_relaylog_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
-		else
-			rm "${_my_relaylog_testfile}" || die
-			unset _my_relaylog_testfile
-		fi
-	fi
-
-	local mysql_install_log="$(_mktemp_dry "${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log")"
-	if [[ -z "${mysql_install_log}" ]] ; then
-		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log' failed!"
-	else
-		# make sure file is writable for MYSQL_USER...
-		touch "${mysql_install_log}" || die
-		chown ${MYSQL_USER} "${mysql_install_log}" || die
-	fi
-
-	local mysqld_logfile="$(_mktemp_dry "${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log")"
-	if [[ -z "${mysqld_logfile}" ]] ; then
-		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log' failed!"
-	else
-		# make sure file is writable for MYSQL_USER...
-		touch "${mysqld_logfile}" || die
-		chown ${MYSQL_USER} "${mysqld_logfile}" || die
-	fi
-
-	echo ""
-	einfo "Detected settings:"
-	einfo "=================="
-	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
-	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
-	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
-	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
-
-	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
-		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
-		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
-	fi
-
-	einfo "PID DIR:\t\t\t\t${PID_DIR}"
-	einfo "Install db log:\t\t\t${mysql_install_log}"
-	einfo "Install server log:\t\t\t${mysqld_logfile}"
-
-	local -a config_files
-
-	local config_file="${EROOT}/etc/mysql/mysql.d/50-distro-client.cnf"
-	if [[ -f "${config_file}" ]] ; then
-		config_files+=( "${config_file}" )
-	else
-		ewarn "Client configuration '${config_file}' not found; Skipping configuration of default authentication plugin for client ..."
-	fi
-
-	config_file="${EROOT}/etc/mysql/mysql.d/50-distro-server.cnf"
-	if [[ -f "${config_file}" ]] ; then
-		config_files+=( "${config_file}" )
-	else
-		ewarn "Server configuration '${config_file}' not found; Skipping configuration of default authentication plugin for mysqld ..."
-	fi
-
-	if [[ ${#config_files[@]} -gt 0 ]] ; then
-		if [[ -z "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" ]] ; then
-			local user_answer
-
-			echo
-			einfo "Please select default authentication plugin (enter number or plugin name):"
-			einfo "1) caching_sha2_password [MySQL 8.0 default]"
-			einfo "2) mysql_native_password [MySQL 5.7 default]"
-			einfo
-			einfo "For details see:"
-			einfo "https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html#upgrade-caching-sha2-password"
-			read -p "    >" user_answer
-			echo
-
-			case "${user_answer}" in
-				1|caching_sha2_password)
-					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=caching_sha2_password
-					;;
-				2|mysql_native_password)
-					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=mysql_native_password
-					;;
-				'')
-					die "No authentication plugin selected!"
-					;;
-				*)
-					die "Authentication plugin '${user_answer}' is unknown/unsupported!"
-					;;
-			esac
-
-			echo "Selected authentication plugin: ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" >> "${mysql_install_log}"
-
-			unset user_answer
-		fi
-
-		local cfg_option cfg_option_tabs cfg_section
-		for config_file in "${config_files[@]}" ; do
-			cfg_option="default-authentication-plugin"
-			cfg_section="mysqld"
-			cfg_option_tabs="\t\t"
-			if [[ "${config_file}" == *client.cnf ]] ; then
-				cfg_option="default-auth"
-				cfg_section="client"
-				cfg_option_tabs="\t\t\t\t"
-			fi
-
-			if grep -qE "^(loose-)?${cfg_option}\b.*=" "${config_file}" 2>/dev/null ; then
-				einfo "Ensuring that ${cfg_option} is set to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
-				sed -i \
-					-e "s/^\(loose-\)\?${cfg_option}\b.*=.*/loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}/" \
-					"${config_file}" || die "Failed to change ${cfg_option} in '${config_file}'!"
-			else
-				einfo "Setting ${cfg_option} to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
-				sed -i \
-					-e "/^\[${cfg_section}\]$/a loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" \
-					"${config_file}" || die "Failed to add ${cfg_option} to '${config_file}'!"
-			fi
-		done
-		unset cfg_option cfg_option_tabs cfg_section
-	fi
-	unset config_files config_file
-
-	echo
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client ; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local pwd1="a"
-		local pwd2="b"
-
-		echo
-		einfo "No password for mysql 'root' user was specified via environment"
-		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
-		einfo "file like '${HOME}/.my.cnf'."
-		einfo "To continue please provide a password for the mysql 'root' user"
-		einfo "now on console:"
-		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same!"
-		fi
-
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-
-		echo
-	fi
-
-	local -a mysqld_options
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR}/mysqld-help"
-	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-
-	local opt optexp optfull
-	for opt in host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-	; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
-	done
-
-	# Prepare timezones, see
-	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	local tz_sql="$(_mktemp_dry "${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql")"
-	[[ -z "${tz_sql}" ]] \
-		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql' failed!"
-
-	echo "USE mysql;" >"${tz_sql}"
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
-	if [[ $? -ne 0 ]] ; then
-		die "mysql_tzinfo_to_sql failed!"
-	fi
-
-	# --initialize-insecure will not set root password
-	# --initialize would set a random one in the log which we don't need as we set it ourselves
-	local cmd=(
-		"${mysqld_binary}"
-		"${mysqld_options[@]}"
-		"--initialize-insecure"
-		"--init-file='${tz_sql}'"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		"--log-error='${mysql_install_log}'"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Initializing ${PN} data directory: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
-
-	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql.ibd" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
-		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
-	fi
-
-	rm "${tz_sql}" || die
-
-	local x=${RANDOM}
-	local socket="${EROOT}${PID_DIR}/mysqld${x}.sock"
-	local pidfile="${EROOT}${PID_DIR}/mysqld${x}.pid"
-	unset x
-
-	cmd=(
-		"${mysqld_binary}"
-		"${mysqld_options[@]}"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		--max_allowed_packet=8M
-		--net_buffer_length=16K
-		"--socket='${socket}'"
-		"--pid-file='${pidfile}'"
-		"--log-error='${mysqld_logfile}'"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
-
-	echo -n "Waiting for mysqld to accept connections "
-	local maxtry=15
-	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-
-	if [[ -S "${socket}" ]] ; then
-		# Even with a socket we don't know if mysqld will abort
-		# start due to an error so just wait a little bit more...
-		maxtry=5
-		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-	fi
-
-	echo
-
-	if [[ ! -S "${socket}" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
-		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
-	fi
-
-	local mysql_logfile="${TMPDIR}/set_root_pw.log"
-	touch "${mysql_logfile}" || die
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
-	cmd=(
-		"${mysql_binary}"
-		--no-defaults
-		"--socket='${socket}'"
-		-hlocalhost
-		"-e \"${sql}\""
-	)
-	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
-	local rc=$?
-	eend ${rc}
-
-	if [[ ${rc} -ne 0 ]] ; then
-		# Poor man's solution which tries to avoid having password
-		# in log.  NOTE: sed can fail if user didn't follow advice
-		# and included character which will require escaping...
-		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
-
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
-		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
-	fi
-
-	# Stop the server
-	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-		echo -n "Stopping the server "
-		pkill -F "${pidfile}" &>/dev/null
-
-		maxtry=10
-		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-
-		echo
-
-		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-			# We somehow failed to stop server.
-			# However, not a fatal error. Just warn the user.
-			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
-		fi
-	fi
-
-	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
-}
diff --git a/dev-db/mysql/mysql-8.0.36.ebuild b/dev-db/mysql/mysql-8.0.36.ebuild
deleted file mode 100644
index 0c85a6c2b3cd..000000000000
--- a/dev-db/mysql/mysql-8.0.36.ebuild
+++ /dev/null
@@ -1,1271 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs cmake edo flag-o-matic linux-info multiprocessing prefix
-
-MY_PV="${PV//_pre*}"
-MY_P="${PN}-${MY_PV}"
-
-# Patch version
-PATCH_SET=( https://github.com/parona-source/mysql-server/releases/download/mysql-8.0.36-patches-01/mysql-8.0.36-patches-01.tar.xz )
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="https://www.mysql.com/"
-SRC_URI="https://cdn.mysql.com/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${MY_PV}.tar.gz"
-SRC_URI+=" https://cdn.mysql.com/archives/mysql-$(ver_cut 1-2)/mysql-boost-${MY_PV}.tar.gz"
-SRC_URI+=" https://downloads.mysql.com/archives/MySQL-$(ver_cut 1-2)/${PN}-boost-${MY_PV}.tar.gz"
-SRC_URI+=" ${PATCH_SET[@]}"
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-LICENSE="GPL-2"
-SLOT="8.0"
-# -ppc for bug #761715
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips -ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc )
-	cjk? ( server )
-	jemalloc? ( server )
-	numa? ( server )
-	profiling? ( server )
-	router? ( server )
-	tcmalloc? ( server )"
-
-# Be warned, *DEPEND are version-dependent
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
-	>=app-arch/lz4-1.9.4:=
-	>=app-arch/zstd-1.2.0:=
-	>=dev-libs/openssl-1.0.0:=
-	sys-libs/ncurses:=
-	>=sys-libs/zlib-1.2.13:=
-	server? (
-		dev-libs/icu:=
-		dev-libs/libevent:=[ssl,threads(+)]
-		net-libs/libtirpc:=
-		cjk? ( app-text/mecab:= )
-		jemalloc? ( dev-libs/jemalloc:= )
-		kernel_linux? (
-			dev-libs/libaio:=
-			sys-process/procps
-		)
-		numa? ( sys-process/numactl )
-		tcmalloc? ( dev-util/google-perftools:= )
-	)
-"
-
-# https://bugs.gentoo.org/623962
-# tests set TZ for tests leading to failures on musl if sys-libs/timezone-data isnt installed
-DEPEND="
-	${COMMON_DEPEND}
-	app-alternatives/yacc
-	server? ( net-libs/rpcsvc-proto )
-	test? (
-		acct-group/mysql acct-user/mysql
-		dev-perl/Expect
-		dev-perl/JSON
-		sys-libs/timezone-data
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	!dev-db/mariadb
-	!dev-db/mariadb-galera
-	!dev-db/percona-server
-	!dev-db/mysql-cluster
-	!dev-db/mysql:0
-	!dev-db/mysql:5.7
-	selinux? ( sec-policy/selinux-mysql )
-	!prefix? (
-		acct-group/mysql acct-user/mysql
-		dev-db/mysql-init-scripts
-	)
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-PATCHES=(
-	"${WORKDIR}"/mysql-patches
-	# Needed due to bundled boost-1.77, this fix is included in boost-1.81
-	"${FILESDIR}"/mysql-8.0.36-boost-clang-fix.patch
-)
-
-mysql_init_vars() {
-	: ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-	: ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	: ${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	: ${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-	MY_DATADIR="${MY_LOCALSTATEDIR}"
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use server ; then
-			CHECKREQS_DISK_BUILD="3G"
-
-			if has test ${FEATURES} ; then
-				CHECKREQS_DISK_BUILD="10G"
-
-				if use elibc_musl; then
-					# <parona@protonmail.com> i've seen it take 17GB on musl with FEATURES="test" USE="perl server"
-					CHECKREQS_DISK_BUILD="18G"
-				fi
-			fi
-
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		CHECKREQS_DISK_BUILD="3G"
-
-		if has test ${FEATURES} ; then
-			CHECKREQS_DISK_BUILD="10G"
-
-			if use elibc_musl; then
-				# <parona@protonmail.com> i've seen it take 17GB on musl with FEATURES="test" USE="perl server"
-				CHECKREQS_DISK_BUILD="18G"
-			fi
-
-			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
-			# localhost. Also causes weird failures.
-			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-			if ! has userpriv ${FEATURES} ; then
-				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-			fi
-
-			local aio_max_nr=$(sysctl -n fs.aio-max-nr 2>/dev/null)
-			if [[ -z "${aio_max_nr}" || ${aio_max_nr} -lt 250000 ]] ; then
-				die "FEATURES=test will require fs.aio-max-nr=250000 at minimum!"
-			fi
-
-			if use latin1 ; then
-				# Upstream only supports tests with default charset
-				die "Testing with USE=latin1 is not supported."
-			fi
-		fi
-
-		if use kernel_linux && use numa ; then
-			linux-info_get_any_version
-
-			local CONFIG_CHECK="~NUMA"
-
-			local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
-			WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
-
-			check_extra_config
-		fi
-
-		use server && check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	mv -f "${WORKDIR}/${MY_P}" "${S}" || die
-}
-
-src_prepare() {
-	# Avoid rpm call which would trigger sandbox, #692368
-	sed -i \
-		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
-		CMakeLists.txt || die
-
-	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
-	if [[ -d "${S}/support-files/SELinux" ]] ; then
-		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
-	fi
-
-	# Remove man pages for client-lib tools we don't install
-	rm \
-		man/my_print_defaults.1 \
-		man/perror.1 \
-		man/zlib_decompress.1 \
-		|| die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	# Code is now requiring C++17 due to https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08
-	append-cxxflags -std=c++17
-
-	if has sandbox ${FEATURES} ; then
-		# bug #823656
-		append-cppflags -DGTEST_NO_DEATH_TEST=1
-	fi
-
-	local mycmakeargs=(
-		-Wno-dev # less noise
-
-		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-
-		-DROUTER_INSTALL_LOGROTATEDIR="${EPREFIX}/etc/logrotate.d"
-		-DROUTER_INSTALL_DOCDIR="share/doc/${PF}"
-
-		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-
-		# Enables -Werror
-		-DMYSQL_MAINTAINER_MODE=OFF
-
-		# Causes issues on musl bug #922808
-		-DWITH_BUILD_ID=OFF
-
-		# Using bundled editline to get CTRL+C working
-		-DWITH_EDITLINE=bundled
-		-DWITH_ZLIB=system
-		-DWITH_SSL=system
-		-DWITH_LIBWRAP=0
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-
-		-DWITH_CURL=system
-		-DWITH_BOOST="${S}/boost"
-		-DWITH_ROUTER=$(usex router ON OFF)
-	)
-
-	if use debug; then
-		# Debug build type used extensively to add preprocessor definitions
-		local -x CMAKE_BUILD_TYPE="Debug"
-	else
-		# debug hack wrt #497532
-		mycmakeargs+=(
-			-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usev !debug '-DNDEBUG' )"
-			-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usev !debug '-DNDEBUG' )"
-		)
-	fi
-
-	if tc-is-lto ; then
-		mycmakeargs+=( -DWITH_LTO=ON )
-	else
-		mycmakeargs+=( -DWITH_LTO=OFF )
-	fi
-
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
-
-	mycmakeargs+=(
-		-DWITH_ICU=system
-		-DWITH_LZ4=system
-		# Our dev-libs/rapidjson doesn't carry necessary fixes for std::regex
-		-DWITH_RAPIDJSON=bundled
-		-DWITH_ZSTD=system
-	)
-
-	if [[ -n "${MYSQL_DEFAULT_CHARSET}" && -n "${MYSQL_DEFAULT_COLLATION}" ]] ; then
-		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-		ewarn "You MUST file bugs without these variables set."
-		ewarn "Tests will probably fail!"
-
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-			-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-		)
-	elif use latin1 ; then
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=latin1
-			-DDEFAULT_COLLATION=latin1_swedish_ci
-		)
-	else
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=utf8mb4
-			-DDEFAULT_COLLATION=utf8mb4_0900_ai_ci
-		)
-	fi
-
-	if use server ; then
-		mycmakeargs+=(
-			-DWITH_EXTRA_CHARSETS=all
-			-DWITH_DEBUG=$(usex debug)
-			-DWITH_MECAB=$(usex cjk system OFF)
-			-DWITH_LIBEVENT=system
-			# Cannot handle protobuf >23 bug #912797
-			-DWITH_PROTOBUF=bundled
-			-DWITH_NUMA=$(usex numa ON OFF)
-		)
-
-		if use jemalloc ; then
-			mycmakeargs+=( -DWITH_JEMALLOC=ON )
-		elif use tcmalloc ; then
-			mycmakeargs+=( -DWITH_TCMALLOC=ON )
-		fi
-
-		if use profiling ; then
-			# Setting to OFF doesn't work: Once set, profiling options will be added
-			# to `mysqld --help` output via sql/sys_vars.cc causing
-			# "main.mysqld--help-notwin" test to fail
-			mycmakeargs+=( -DENABLED_PROFILING=ON )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_EXAMPLE_STORAGE_ENGINE=0
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_FEDERATED_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_INNODB_MEMCACHED=0
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-		)
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DWITH_SYSTEMD=no
-		)
-	fi
-
-	cmake_src_configure
-}
-
-# Official test instructions:
-# ulimit -n 16500 && USE='perl server' FEATURES='test userpriv' \
-# ebuild mysql-X.X.XX.ebuild digest clean test install
-src_test() {
-	_disable_test() {
-		local rawtestname bug reason
-		rawtestname="${1}" ; shift
-		bug="${1}" ; shift
-		reason="${@}"
-
-		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
-		echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_tests
-
-	einfo "Official test instructions:"
-	einfo "ulimit -n 16500 && USE='perl server' FEATURES='test userpriv' ebuild ..."
-
-	if ! use server ; then
-		ewarn "Skipping server tests due to minimal build!"
-		return 0
-	fi
-
-	# Ensure that parallel runs don't die
-	local -x MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-	local -x MTR_PARALLEL=${MTR_PARALLEL:-$(makeopts_jobs)}
-	einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
-
-	# Disable unit tests, run them separately with eclass defaults
-	local -x MTR_UNIT_TESTS=0
-
-	# Increase test timeouts
-	# bug #923649
-	# https://github.com/gentoo/gentoo/pull/35002#issuecomment-1926101030
-	local -x MTR_SUITE_TIMEOUT=$(( 60 * 40 )) # minutes
-	local -x MTR_TESTCASE_TIMEOUT=60 # minutes
-
-	# Include config for tests, this is for scenarios where mysql wasn't installed previously or if the
-	# configuration was from an older version.
-	sed \
-		-e "s/@GENTOO_PORTAGE_EPREFIX@/${EPREFIX}/" \
-		-e "s/@DATADIR@/${MY_DATADIR}/" \
-		"${FILESDIR}"/my.cnf-8.0.distro-client \
-		"${FILESDIR}"/my.cnf-8.0.distro-server \
-			> "${T}"/my.cnf || die
-	local -X PATH_CONFIG_FILE="${T}/my.cnf"
-
-	# Create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	# Run mysql tests
-	pushd "${TESTDIR}" &>/dev/null || die
-
-	touch "${T}/disabled.def" || die
-
-	local -a disabled_tests=(
-		"auth_sec.atomic_rename_user;103512;Depends on user running test"
-		"auth_sec.keyring_file_data_qa;0;Won't work with user privileges"
-		"auth_sec.openssl_without_fips;94718;Known test failure"
-
-		"gis.geometry_class_attri_prop;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.geometry_property_function_issimple;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.gis_bugs_crashes;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_analysis_functions_buffer;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_analysis_functions_centroid;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_analysis_functions_distance;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_op_testingfunc_mix;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_operators_intersection;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_utility_function_distance_sphere;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.spatial_utility_function_simplify;5452;Known rounding error with latest AMD processors (PS)"
-		"gis.st_symdifference;5452;Known rounding error with latest AMD processors (PS)"
-
-		"innodb.alter_kill;0;Known test failure -- no upstream bug yet"
-
-		"main.derived_limit;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.explain_tree;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.gis-precise;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.mysql_load_data_local_dir;0;Known test failure -- no upstream bug yet"
-		"main.select_icp_mrr;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_bugs;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_dupsweed;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_dupsweed_bka;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_dupsweed_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_firstmatch;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_firstmatch_bka;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_firstmatch_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_mat_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.subquery_sj_all_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.window_std_var;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.window_std_var_optimized;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"main.with_recursive;0;Known rounding error with latest AMD processors -- no upstream bug yet"
-		"perfschema.statement_digest_query_sample;0;Test will fail on slow hardware"
-
-		"rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch;0;Unstable test"
-		"rpl_gtid.rpl_multi_source_mtr_includes;97844;Unstable test"
-		"main.partition_datatype;0;Unstable test"
-
-		"sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware"
-
-		"x.connection;0;Known failure - no upstream bug yet"
-		"main.slow_log;0;Known failure - no upstream bug yet"
-
-		"sys_vars.build_id_basic;0;Requires -DWITH_BUILD_ID=ON"
-	)
-
-	if ! hash zip 1>/dev/null 2>&1 ; then
-		# No need to force dep app-arch/zip for one test
-		disabled_tests+=(
-			"innodb.discarded_partition_create;0;Requires app-arch/zip"
-			"innodb.partition_upgrade_create;0;Requires app-arch/zip"
-		)
-	fi
-
-	if has_version ">=dev-libs/openssl-3.2" ; then
-		# https://bugs.mysql.com/bug.php?id=113258
-		disabled_tests+=(
-			"rpl.rpl_tlsv13;0;CCM8 ciphers have a lower security level with OpenSSL 3.2"
-			"auth_sec.wl15800_ciphers_tlsv13;0;CCM8 ciphers have a lower security level with OpenSSL 3.2"
-		)
-	fi
-
-	if use debug; then
-		disabled_tests+=(
-			"innodb.dblwr_unencrypt;0;Known test failure -- no upstream bug yet"
-		)
-	fi
-
-	local test_infos_str test_infos_arr
-	for test_infos_str in "${disabled_tests[@]}" ; do
-		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
-
-		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
-			die "Invalid test data set, not matching format: ${test_infos_str}"
-		fi
-
-		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
-	done
-	unset test_infos_str test_infos_arr
-
-	local -a CMAKE_SKIP_TESTS=(
-		# timing test, can be unreliable
-		"routertest_harness_net_ts_timer"
-
-		# Could not get local host address: Name or service not known(errno: -2)
-		"routertest_component_bootstrap"
-		"routertest_component_bootstrap_account"
-		"routertest_component_bootstrap_clusterset"
-		"routertest_component_config_overwrites"
-		"routertest_component_rest_api_enable"
-		"routertest_component_routing"
-		"routertest_component_sd_notify"
-		"routertest_component_state_file"
-		"routertest_integration_routing_direct"
-		"routertest_integration_routing_reuse"
-		"routertest_integration_routing_sharing"
-		"routertest_integration_routing_sharing_constrained_pools"
-		"routertest_integration_routing_sharing_restart"
-
-		# TODO: ???
-		"pfs_host-oom"
-		"pfs_user-oom"
-		"pfs"
-	)
-
-	if use debug; then
-		CMAKE_SKIP_TESTS+=(
-			# binary_log::transaction::compression::Payload_event_buffer_istream::~Payload_event_buffer_istream(): Assertion `!m_outstanding_error' failed.
-			"payload_event_buffer_istream"
-		)
-	fi
-
-	# Try to increase file limits to increase test coverage
-	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
-		# Upper limit comes from parts.partition_* tests
-		ewarn "For maximum test coverage, please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
-
-		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
-			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
-			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
-
-			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
-				ewarn "For minimum test coverage, please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
-			else
-				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
-			fi
-		else
-			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
-		fi
-	else
-		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
-	fi
-
-	# run mysql-test tests
-	# Enable force restart to ensure success when tests don't cleanup sufficiently.
-	# Anything touching gtid_executed is negatively affected if you have unlucky ordering
-	nonfatal edo perl mysql-test-run.pl \
-		--force --force-restart \
-		--vardir="${T}/var-tests" --tmpdir="${T}/tmp-tests" \
-		--skip-test=tokudb --skip-test-list="${T}/disabled.def" \
-		--retry-failure=0 --max-test-fail=0
-	retstatus_tests=$?
-
-	popd &>/dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
-
-	cmake_src_test
-
-	[[ -z "${failures}" ]] || die "Test failures: ${failures}"
-	einfo "Tests successfully completed"
-}
-
-src_install() {
-	cmake_src_install
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED}/usr/data" ]] ; then
-		rm -Rf "${ED}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${ED}/${MY_SHAREDSTATEDIR#${EPREFIX}}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
-	cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
-	eprefixify "${TMPDIR}/my.cnf"
-	doins "${TMPDIR}/my.cnf"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
-	cp "${FILESDIR}/my.cnf-8.0.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
-	eprefixify "${TMPDIR}/50-distro-client.cnf"
-	doins "${TMPDIR}/50-distro-client.cnf"
-
-	mycnf_src="my.cnf-8.0.distro-server"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		"${FILESDIR}/${mycnf_src}" \
-		> "${TMPDIR}/my.cnf.ok" || die
-
-	if use prefix ; then
-		sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
-			"${TMPDIR}/my.cnf.ok" || die
-	fi
-
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8mb4|latin1|g" \
-			"${TMPDIR}/my.cnf.ok" || die
-	fi
-
-	eprefixify "${TMPDIR}/my.cnf.ok"
-
-	newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
-	#Remove mytop if perl is not selected
-	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-
-	if use router ; then
-		rm -rf \
-			"${ED}/usr/LICENSE.router" \
-			"${ED}/usr/README.router" \
-			"${ED}/usr/run" \
-			"${ED}/usr/var" \
-			|| die
-	fi
-
-	# Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
-	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	# NOTE: $MY_LOGDIR contains $EPREFIX by default
-	[[ -d "${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${MY_LOGDIR}"
-
-	# Note about configuration change
-	einfo
-	elog "This version of ${PN} reorganizes the configuration from a single my.cnf"
-	elog "to several files in /etc/mysql/mysql.d."
-	elog "Please backup any changes you made to /etc/mysql/my.cnf"
-	elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension."
-	elog "You may have as many files as needed and they are read alphabetically."
-	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
-	einfo
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		einfo
-		elog "You might want to run:"
-		elog "  \"emerge --config =${CATEGORY}/${PF}\""
-		elog "if this is a new install."
-		einfo
-	else
-		einfo
-		elog "Upgrade process for ${PN}-8.x has changed. Please read"
-		elog "https://dev.mysql.com/doc/refman/8.0/en/upgrade-binary-package.html"
-		einfo
-	fi
-}
-
-pkg_config() {
-	_getoptval() {
-		local section="$1"
-		local flag="--${2}="
-		local extra_options="${3}"
-		local cmd=(
-			"${my_print_defaults_binary}"
-			"${extra_options}"
-			"${section}"
-		)
-		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
-
-		if [[ ${#results[@]} -gt 0 ]] ; then
-			# When option is set multiple times only return last value
-			echo "${results[-1]}"
-		fi
-	}
-
-	_mktemp_dry() {
-		# emktemp has no --dry-run option
-		local template="${1}"
-
-		if [[ -z "${template}" ]] ; then
-			if [[ -z "${T}" ]] ; then
-				template="/tmp/XXXXXXX"
-			else
-				template="${T}/XXXXXXX"
-			fi
-		fi
-
-		local template_wo_X=${template//X/}
-		local n_X
-		let n_X=${#template}-${#template_wo_X}
-		if [[ ${n_X} -lt 3 ]] ; then
-			echo "${FUNCNAME[0]}: too few X's in template �${template}’" >&2
-			return
-		fi
-
-		local attempts=0
-		local character tmpfile
-		while [[ true ]] ; do
-			let attempts=attempts+1
-
-			new_file=
-			while read -n1 character ; do
-				if [[ "${character}" == "X" ]] ; then
-					tmpfile+="${RANDOM:0:1}"
-				else
-					tmpfile+="${character}"
-				fi
-			done < <(echo -n "${template}")
-
-			if [[ ! -f "${tmpfile}" ]]
-			then
-				echo "${tmpfile}"
-				return
-			fi
-
-			if [[ ${attempts} -ge 100 ]] ; then
-				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
-				return
-			fi
-		done
-	}
-
-	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
-	if [[ ! -x "${mysqld_binary}" ]] ; then
-		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local mysql_binary="${EROOT}/usr/bin/mysql"
-	if [[ ! -x "${mysql_binary}" ]] ; then
-		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
-	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
-		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
-	fi
-
-	if [[ -z "${MYSQL_USER}" ]] ; then
-		MYSQL_USER=mysql
-		if use prefix ; then
-			MYSQL_USER=$(id -u -n 2>/dev/null)
-			if [[ -z "${MYSQL_USER}" ]] ; then
-				die "Failed to determine current username!"
-			fi
-		fi
-	fi
-
-	if [[ -z "${MYSQL_GROUP}" ]] ; then
-		MYSQL_GROUP=mysql
-		if use prefix ; then
-			MYSQL_GROUP=$(id -g -n 2>/dev/null)
-			if [[ -z "${MYSQL_GROUP}" ]] ; then
-				die "Failed to determine current user groupname!"
-			fi
-		fi
-	fi
-
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	local -x HOME="${EROOT}/root"
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Read currently set data directory
-	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		die "Sorry, unable to find MY_DATADIR!"
-	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
-		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
-		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
-		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
-	fi
-
-	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
-	# These are dir+prefix
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-
-	# Create missing directories.
-	# Always check if mysql user can write to directory even if we just
-	# created directory because a parent directory might be not
-	# accessible for that user.
-	PID_DIR="${EROOT}/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]] ; then
-		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
-		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
-			|| die "Failed to create PID directory '${PID_DIR}'!"
-	fi
-
-	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_pid_dir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_pid_dir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
-	else
-		rm "${_pid_dir_testfile}" || die
-		unset _pid_dir_testfile
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]] ; then
-		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
-			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
-	fi
-
-	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_datadir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_datadir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
-	else
-		rm "${_my_datadir_testfile}" || die
-		unset _my_datadir_testfile
-	fi
-
-	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
-		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
-			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
-	fi
-
-	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
-		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
-		[[ -z "${MYSQL_TMPDIR}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
-
-		mkdir "${MYSQL_TMPDIR}" || die
-		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
-	fi
-
-	# Now we need to test MYSQL_TMPDIR...
-	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_tmpdir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_tmpdir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
-	else
-		rm "${_my_tmpdir_testfile}" || die
-		unset _my_tmpdir_testfile
-	fi
-
-	if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
-		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
-			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
-	fi
-
-	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
-		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_logbin_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_logbin_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
-		else
-			rm "${_my_logbin_testfile}" || die
-			unset _my_logbin_testfile
-		fi
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
-		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
-			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
-		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_relaylog_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_relaylog_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
-		else
-			rm "${_my_relaylog_testfile}" || die
-			unset _my_relaylog_testfile
-		fi
-	fi
-
-	local mysql_install_log="$(_mktemp_dry "${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log")"
-	if [[ -z "${mysql_install_log}" ]] ; then
-		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log' failed!"
-	else
-		# make sure file is writable for MYSQL_USER...
-		touch "${mysql_install_log}" || die
-		chown ${MYSQL_USER} "${mysql_install_log}" || die
-	fi
-
-	local mysqld_logfile="$(_mktemp_dry "${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log")"
-	if [[ -z "${mysqld_logfile}" ]] ; then
-		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log' failed!"
-	else
-		# make sure file is writable for MYSQL_USER...
-		touch "${mysqld_logfile}" || die
-		chown ${MYSQL_USER} "${mysqld_logfile}" || die
-	fi
-
-	echo ""
-	einfo "Detected settings:"
-	einfo "=================="
-	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
-	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
-	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
-	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
-
-	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
-		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
-		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
-	fi
-
-	einfo "PID DIR:\t\t\t\t${PID_DIR}"
-	einfo "Install db log:\t\t\t${mysql_install_log}"
-	einfo "Install server log:\t\t\t${mysqld_logfile}"
-
-	local -a config_files
-
-	local config_file="${EROOT}/etc/mysql/mysql.d/50-distro-client.cnf"
-	if [[ -f "${config_file}" ]] ; then
-		config_files+=( "${config_file}" )
-	else
-		ewarn "Client configuration '${config_file}' not found; Skipping configuration of default authentication plugin for client ..."
-	fi
-
-	config_file="${EROOT}/etc/mysql/mysql.d/50-distro-server.cnf"
-	if [[ -f "${config_file}" ]] ; then
-		config_files+=( "${config_file}" )
-	else
-		ewarn "Server configuration '${config_file}' not found; Skipping configuration of default authentication plugin for mysqld ..."
-	fi
-
-	if [[ ${#config_files[@]} -gt 0 ]] ; then
-		if [[ -z "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" ]] ; then
-			local user_answer
-
-			echo
-			einfo "Please select default authentication plugin (enter number or plugin name):"
-			einfo "1) caching_sha2_password [MySQL 8.0 default]"
-			einfo "2) mysql_native_password [MySQL 5.7 default]"
-			einfo
-			einfo "For details see:"
-			einfo "https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html#upgrade-caching-sha2-password"
-			read -p "    >" user_answer
-			echo
-
-			case "${user_answer}" in
-				1|caching_sha2_password)
-					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=caching_sha2_password
-					;;
-				2|mysql_native_password)
-					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=mysql_native_password
-					;;
-				'')
-					die "No authentication plugin selected!"
-					;;
-				*)
-					die "Authentication plugin '${user_answer}' is unknown/unsupported!"
-					;;
-			esac
-
-			echo "Selected authentication plugin: ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" >> "${mysql_install_log}"
-
-			unset user_answer
-		fi
-
-		local cfg_option cfg_option_tabs cfg_section
-		for config_file in "${config_files[@]}" ; do
-			cfg_option="default-authentication-plugin"
-			cfg_section="mysqld"
-			cfg_option_tabs="\t\t"
-			if [[ "${config_file}" == *client.cnf ]] ; then
-				cfg_option="default-auth"
-				cfg_section="client"
-				cfg_option_tabs="\t\t\t\t"
-			fi
-
-			if grep -qE "^(loose-)?${cfg_option}\b.*=" "${config_file}" 2>/dev/null ; then
-				einfo "Ensuring that ${cfg_option} is set to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
-				sed -i \
-					-e "s/^\(loose-\)\?${cfg_option}\b.*=.*/loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}/" \
-					"${config_file}" || die "Failed to change ${cfg_option} in '${config_file}'!"
-			else
-				einfo "Setting ${cfg_option} to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
-				sed -i \
-					-e "/^\[${cfg_section}\]$/a loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" \
-					"${config_file}" || die "Failed to add ${cfg_option} to '${config_file}'!"
-			fi
-		done
-		unset cfg_option cfg_option_tabs cfg_section
-	fi
-	unset config_files config_file
-
-	echo
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client ; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local pwd1="a"
-		local pwd2="b"
-
-		echo
-		einfo "No password for mysql 'root' user was specified via environment"
-		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
-		einfo "file like '${HOME}/.my.cnf'."
-		einfo "To continue please provide a password for the mysql 'root' user"
-		einfo "now on console:"
-		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same!"
-		fi
-
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-
-		echo
-	fi
-
-	local -a mysqld_options
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR}/mysqld-help"
-	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-
-	local opt optexp optfull
-	for opt in host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-	; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
-	done
-
-	# Prepare timezones, see
-	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	local tz_sql="$(_mktemp_dry "${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql")"
-	[[ -z "${tz_sql}" ]] \
-		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql' failed!"
-
-	echo "USE mysql;" >"${tz_sql}"
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
-	if [[ $? -ne 0 ]] ; then
-		die "mysql_tzinfo_to_sql failed!"
-	fi
-
-	# --initialize-insecure will not set root password
-	# --initialize would set a random one in the log which we don't need as we set it ourselves
-	local cmd=(
-		"${mysqld_binary}"
-		"${mysqld_options[@]}"
-		"--initialize-insecure"
-		"--init-file='${tz_sql}'"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		"--log-error='${mysql_install_log}'"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Initializing ${PN} data directory: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
-
-	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql.ibd" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
-		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
-	fi
-
-	rm "${tz_sql}" || die
-
-	local x=${RANDOM}
-	local socket="${EROOT}${PID_DIR}/mysqld${x}.sock"
-	local pidfile="${EROOT}${PID_DIR}/mysqld${x}.pid"
-	unset x
-
-	cmd=(
-		"${mysqld_binary}"
-		"${mysqld_options[@]}"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		--max_allowed_packet=8M
-		--net_buffer_length=16K
-		"--socket='${socket}'"
-		"--pid-file='${pidfile}'"
-		"--log-error='${mysqld_logfile}'"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
-
-	echo -n "Waiting for mysqld to accept connections "
-	local maxtry=15
-	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-
-	if [[ -S "${socket}" ]] ; then
-		# Even with a socket we don't know if mysqld will abort
-		# start due to an error so just wait a little bit more...
-		maxtry=5
-		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-	fi
-
-	echo
-
-	if [[ ! -S "${socket}" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
-		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
-	fi
-
-	local mysql_logfile="${TMPDIR}/set_root_pw.log"
-	touch "${mysql_logfile}" || die
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
-	cmd=(
-		"${mysql_binary}"
-		--no-defaults
-		"--socket='${socket}'"
-		-hlocalhost
-		"-e \"${sql}\""
-	)
-	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
-	local rc=$?
-	eend ${rc}
-
-	if [[ ${rc} -ne 0 ]] ; then
-		# Poor man's solution which tries to avoid having password
-		# in log.  NOTE: sed can fail if user didn't follow advice
-		# and included character which will require escaping...
-		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
-
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
-		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
-	fi
-
-	# Stop the server
-	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-		echo -n "Stopping the server "
-		pkill -F "${pidfile}" &>/dev/null
-
-		maxtry=10
-		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-
-		echo
-
-		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-			# We somehow failed to stop server.
-			# However, not a fatal error. Just warn the user.
-			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
-		fi
-	fi
-
-	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
-}
diff --git a/dev-db/mysql/mysql-8.0.37.ebuild b/dev-db/mysql/mysql-8.0.37.ebuild
index 7cfb7a41bb10..8964ad335136 100644
--- a/dev-db/mysql/mysql-8.0.37.ebuild
+++ b/dev-db/mysql/mysql-8.0.37.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
@@ -24,7 +24,7 @@ S="${WORKDIR}/mysql"
 LICENSE="GPL-2"
 SLOT="8.0"
 # -ppc for bug #761715
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips -ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips -ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test"
 RESTRICT="!test? ( test )"
 
@@ -94,6 +94,10 @@ PATCHES=(
 	"${WORKDIR}"/mysql-patches
 	# Needed due to bundled boost-1.77, this fix is included in boost-1.81
 	"${FILESDIR}"/mysql-8.0.36-boost-clang-fix.patch
+	# Needed due to bundled boost-1.77, this fix is included in boost-1.79
+	"${FILESDIR}"/mysql-8.0.37-fix-bundled-boost.patch
+	# Needed due to bundled abseil-cpp-20230802, this fix is included in abseil-cpp-20240722
+	"${FILESDIR}"/mysql-8.0.37-fix-bundled-abseil.patch
 )
 
 mysql_init_vars() {
@@ -728,7 +732,7 @@ pkg_config() {
 		local n_X
 		let n_X=${#template}-${#template_wo_X}
 		if [[ ${n_X} -lt 3 ]] ; then
-			echo "${FUNCNAME[0]}: too few X's in template �${template}’" >&2
+			echo "${FUNCNAME[0]}: too few X's in template '${template}'" >&2
 			return
 		fi
 
diff --git a/dev-db/mysql/mysql-8.0.40.ebuild b/dev-db/mysql/mysql-8.0.40.ebuild
new file mode 100644
index 000000000000..eeffe2b39ec6
--- /dev/null
+++ b/dev-db/mysql/mysql-8.0.40.ebuild
@@ -0,0 +1,1284 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs cmake edo flag-o-matic linux-info multiprocessing prefix toolchain-funcs
+
+MY_PV="${PV//_pre*}"
+MY_P="${PN}-${MY_PV}"
+
+# Patch version
+PATCH_SET=( https://github.com/parona-source/mysql-server/releases/download/mysql-8.0.40-patches-01/mysql-8.0.40-patches-01.tar.xz )
+
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
+HOMEPAGE="https://www.mysql.com/"
+# https://dev.mysql.com/downloads/mysql/
+SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${MY_PV}.tar.gz"
+# https://downloads.mysql.com/archives/community/
+SRC_URI+=" https://cdn.mysql.com/archives/mysql-$(ver_cut 1-2)/mysql-boost-${MY_PV}.tar.gz"
+SRC_URI+=" ${PATCH_SET[@]}"
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+LICENSE="GPL-2"
+SLOT="8.0"
+# -ppc for bug #761715
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips -ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc )
+	cjk? ( server )
+	jemalloc? ( server )
+	numa? ( server )
+	profiling? ( server )
+	router? ( server )
+	tcmalloc? ( server )"
+
+# Be warned, *DEPEND are version-dependent
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	>=app-arch/lz4-1.9.4:=
+	>=app-arch/zstd-1.2.0:=
+	>=dev-libs/openssl-1.0.0:=
+	sys-libs/ncurses:=
+	>=sys-libs/zlib-1.2.13:=
+	server? (
+		dev-libs/icu:=
+		dev-libs/libevent:=[ssl,threads(+)]
+		net-libs/libtirpc:=
+		cjk? ( app-text/mecab )
+		jemalloc? ( dev-libs/jemalloc:= )
+		kernel_linux? (
+			dev-libs/libaio
+			sys-process/procps
+		)
+		numa? ( sys-process/numactl )
+		tcmalloc? ( dev-util/google-perftools:= )
+	)
+"
+
+# https://bugs.gentoo.org/623962
+# tests set TZ for tests leading to failures on musl if sys-libs/timezone-data isnt installed
+DEPEND="
+	${COMMON_DEPEND}
+	app-alternatives/yacc
+	server? ( net-libs/rpcsvc-proto )
+	test? (
+		acct-group/mysql acct-user/mysql
+		dev-perl/Expect
+		dev-perl/JSON
+		sys-libs/timezone-data
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	!dev-db/mariadb
+	!dev-db/mariadb-galera
+	!dev-db/percona-server
+	!dev-db/mysql-cluster
+	!dev-db/mysql:0
+	!dev-db/mysql:5.7
+	selinux? ( sec-policy/selinux-mysql )
+	!prefix? (
+		acct-group/mysql acct-user/mysql
+		dev-db/mysql-init-scripts
+	)
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+PATCHES=(
+	"${WORKDIR}"/mysql-patches
+	# Needed due to bundled boost-1.77, this fix is included in boost-1.81
+	"${FILESDIR}"/mysql-8.0.36-boost-clang-fix.patch
+	# Needed due to bundled boost-1.77, this fix is included in boost-1.79
+	"${FILESDIR}"/mysql-8.0.37-fix-bundled-boost.patch
+	# Needed due to bundled abseil-cpp-20230802, this fix is included in abseil-cpp-20240722
+	"${FILESDIR}"/mysql-8.0.37-fix-bundled-abseil.patch
+	# Needed due to bundled abseil-cpp-20230802, this fix is in no release as of 2025-01-09
+	"${FILESDIR}"/mysql-8.0.40-fix-bundled-abseil-gcc15.patch
+)
+
+mysql_init_vars() {
+	: ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	: ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	: ${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	: ${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+	MY_DATADIR="${MY_LOCALSTATEDIR}"
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use server ; then
+			CHECKREQS_DISK_BUILD="3G"
+
+			if has test ${FEATURES} ; then
+				CHECKREQS_DISK_BUILD="10G"
+
+				if use elibc_musl; then
+					# <parona@protonmail.com> i've seen it take 17GB on musl with FEATURES="test" USE="perl server"
+					CHECKREQS_DISK_BUILD="18G"
+				fi
+			fi
+
+			check-reqs_pkg_pretend
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		CHECKREQS_DISK_BUILD="3G"
+
+		if has test ${FEATURES} ; then
+			CHECKREQS_DISK_BUILD="10G"
+
+			if use elibc_musl; then
+				# <parona@protonmail.com> i've seen it take 17GB on musl with FEATURES="test" USE="perl server"
+				CHECKREQS_DISK_BUILD="18G"
+			fi
+
+			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
+			# localhost. Also causes weird failures.
+			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+			if ! has userpriv ${FEATURES} ; then
+				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+			fi
+
+			local aio_max_nr=$(sysctl -n fs.aio-max-nr 2>/dev/null)
+			if [[ -z "${aio_max_nr}" || ${aio_max_nr} -lt 250000 ]] ; then
+				die "FEATURES=test will require fs.aio-max-nr=250000 at minimum!"
+			fi
+
+			if use latin1 ; then
+				# Upstream only supports tests with default charset
+				die "Testing with USE=latin1 is not supported."
+			fi
+		fi
+
+		if use kernel_linux && use numa ; then
+			linux-info_get_any_version
+
+			local CONFIG_CHECK="~NUMA"
+
+			local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
+			WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
+
+			check_extra_config
+		fi
+
+		use server && check-reqs_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	mv -f "${WORKDIR}/${MY_P}" "${S}" || die
+}
+
+src_prepare() {
+	# Avoid rpm call which would trigger sandbox, #692368
+	sed -i \
+		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
+		CMakeLists.txt || die
+
+	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
+	if [[ -d "${S}/support-files/SELinux" ]] ; then
+		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
+	fi
+
+	# Remove man pages for client-lib tools we don't install
+	rm \
+		man/my_print_defaults.1 \
+		man/perror.1 \
+		man/zlib_decompress.1 \
+		|| die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	# Code requires C++17 due to https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08
+	append-cxxflags -std=c++17
+
+	local mycmakeargs=(
+		-Wno-dev # less noise
+
+		# Building everything as shared breaks upstream assumptions.
+		# For example bundled abseil is excpected to be static and is therefore not installed.
+		# Breaking the assumption leading the mysql to being built against bundled abseil,
+		# but then dynamically linked against system abseil once installed.
+		-DBUILD_SHARED_LIBS=OFF
+
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mysql
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
+
+		-DROUTER_INSTALL_LOGROTATEDIR="${EPREFIX}/etc/logrotate.d"
+		-DROUTER_INSTALL_DOCDIR="share/doc/${PF}"
+
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+
+		# Enables -Werror
+		-DMYSQL_MAINTAINER_MODE=OFF
+
+		# Causes issues on musl bug #922808
+		-DWITH_BUILD_ID=OFF
+
+		# Using bundled editline to get CTRL+C working
+		-DWITH_EDITLINE=bundled
+		-DWITH_ZLIB=system
+		-DWITH_SSL=system
+		-DWITH_LIBWRAP=0
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
+
+		-DWITH_CURL=system
+		-DWITH_BOOST="${S}/boost"
+		-DWITH_ROUTER=$(usex router ON OFF)
+	)
+
+	if use debug; then
+		# Debug build type used extensively to add preprocessor definitions
+		local -x CMAKE_BUILD_TYPE="Debug"
+	else
+		# debug hack wrt #497532
+		mycmakeargs+=(
+			-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usev !debug '-DNDEBUG' )"
+			-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usev !debug '-DNDEBUG' )"
+		)
+	fi
+
+	if tc-is-lto ; then
+		mycmakeargs+=( -DWITH_LTO=ON )
+	else
+		mycmakeargs+=( -DWITH_LTO=OFF )
+	fi
+
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
+
+	mycmakeargs+=(
+		-DWITH_ICU=system
+		-DWITH_LZ4=system
+		# Our dev-libs/rapidjson doesn't carry necessary fixes for std::regex
+		-DWITH_RAPIDJSON=bundled
+		-DWITH_ZSTD=system
+	)
+
+	if [[ -n "${MYSQL_DEFAULT_CHARSET}" && -n "${MYSQL_DEFAULT_COLLATION}" ]] ; then
+		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+		ewarn "You MUST file bugs without these variables set."
+		ewarn "Tests will probably fail!"
+
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+			-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+		)
+	elif use latin1 ; then
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=latin1
+			-DDEFAULT_COLLATION=latin1_swedish_ci
+		)
+	else
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=utf8mb4
+			-DDEFAULT_COLLATION=utf8mb4_0900_ai_ci
+		)
+	fi
+
+	if use server ; then
+		mycmakeargs+=(
+			-DWITH_EXTRA_CHARSETS=all
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_MECAB=$(usex cjk system OFF)
+			-DWITH_LIBEVENT=system
+			# Cannot handle protobuf >23 bug #912797
+			# 05/06/2024: protobuf has been updated,
+			# but it cannot handle abseil when building against system
+			# Currently bundles protobuf-25.1
+			-DWITH_PROTOBUF=bundled
+			-DWITH_NUMA=$(usex numa ON OFF)
+		)
+
+		if use jemalloc ; then
+			mycmakeargs+=( -DWITH_JEMALLOC=ON )
+		elif use tcmalloc ; then
+			mycmakeargs+=( -DWITH_TCMALLOC=ON )
+		fi
+
+		if use profiling ; then
+			# Setting to OFF doesn't work: Once set, profiling options will be added
+			# to `mysqld --help` output via sql/sys_vars.cc causing
+			# "main.mysqld--help-notwin" test to fail
+			mycmakeargs+=( -DENABLED_PROFILING=ON )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_EXAMPLE_STORAGE_ENGINE=0
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_FEDERATED_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_INNODB_MEMCACHED=0
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+		)
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_SYSTEMD=no
+		)
+	fi
+
+	cmake_src_configure
+}
+
+# Official test instructions:
+# ulimit -n 16500 && USE='perl server' FEATURES='test userpriv' \
+# ebuild mysql-X.X.XX.ebuild digest clean test install
+src_test() {
+	_disable_test() {
+		local rawtestname bug reason
+		rawtestname="${1}" ; shift
+		bug="${1}" ; shift
+		reason="${@}"
+
+		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
+		echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_tests
+
+	einfo "Official test instructions:"
+	einfo "ulimit -n 16500 && USE='perl server' FEATURES='test userpriv' ebuild ..."
+
+	if ! use server ; then
+		ewarn "Skipping server tests due to minimal build!"
+		return 0
+	fi
+
+	# Ensure that parallel runs don't die
+	local -x MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+	local -x MTR_PARALLEL=${MTR_PARALLEL:-$(makeopts_jobs)}
+	einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+
+	# Disable unit tests, run them separately with eclass defaults
+	local -x MTR_UNIT_TESTS=0
+
+	# Increase test timeouts
+	# bug #923649
+	# https://github.com/gentoo/gentoo/pull/35002#issuecomment-1926101030
+	local -x MTR_SUITE_TIMEOUT=$(( 60 * 40 )) # minutes
+	local -x MTR_TESTCASE_TIMEOUT=60 # minutes
+
+	# Include config for tests, this is for scenarios where mysql wasn't installed previously or if the
+	# configuration was from an older version.
+	sed \
+		-e "s/@GENTOO_PORTAGE_EPREFIX@/${EPREFIX}/" \
+		-e "s/@DATADIR@/${MY_DATADIR}/" \
+		"${FILESDIR}"/my.cnf-8.0.distro-client \
+		"${FILESDIR}"/my.cnf-8.0.distro-server \
+			> "${T}"/my.cnf || die
+	local -X PATH_CONFIG_FILE="${T}/my.cnf"
+
+	# Create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	# Run mysql tests
+	pushd "${TESTDIR}" &>/dev/null || die
+
+	touch "${T}/disabled.def" || die
+
+	local -a disabled_tests=(
+		"auth_sec.atomic_rename_user;103512;Depends on user running test"
+		"auth_sec.keyring_file_data_qa;0;Won't work with user privileges"
+		"auth_sec.openssl_without_fips;94718;Known test failure"
+
+		"gis.geometry_class_attri_prop;5452;Known rounding error with latest AMD processors (PS)"
+		"gis.geometry_property_function_issimple;5452;Known rounding error with latest AMD processors (PS)"
+		"gis.gis_bugs_crashes;5452;Known rounding error with latest AMD processors (PS)"
+		"gis.spatial_analysis_functions_buffer;5452;Known rounding error with latest AMD processors (PS)"
+		"gis.spatial_analysis_functions_centroid;5452;Known rounding error with latest AMD processors (PS)"
+		"gis.spatial_analysis_functions_distance;5452;Known rounding error with latest AMD processors (PS)"
+		"gis.spatial_op_testingfunc_mix;5452;Known rounding error with latest AMD processors (PS)"
+		"gis.spatial_operators_intersection;5452;Known rounding error with latest AMD processors (PS)"
+		"gis.spatial_utility_function_distance_sphere;5452;Known rounding error with latest AMD processors (PS)"
+		"gis.spatial_utility_function_simplify;5452;Known rounding error with latest AMD processors (PS)"
+		"gis.st_symdifference;5452;Known rounding error with latest AMD processors (PS)"
+
+		"innodb.alter_kill;0;Known test failure -- no upstream bug yet"
+
+		"main.derived_limit;0;Known rounding error with latest AMD processors -- no upstream bug yet"
+		"main.explain_tree;0;Known rounding error with latest AMD processors -- no upstream bug yet"
+		"main.gis-precise;0;Known rounding error with latest AMD processors -- no upstream bug yet"
+		"main.mysql_load_data_local_dir;0;Known test failure -- no upstream bug yet"
+		"main.select_icp_mrr;0;Known rounding error with latest AMD processors -- no upstream bug yet"
+		"main.subquery_bugs;0;Known rounding error with latest AMD processors -- no upstream bug yet"
+		"main.subquery_sj_dupsweed;0;Known rounding error with latest AMD processors -- no upstream bug yet"
+		"main.subquery_sj_dupsweed_bka;0;Known rounding error with latest AMD processors -- no upstream bug yet"
+		"main.subquery_sj_dupsweed_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet"
+		"main.subquery_sj_firstmatch;0;Known rounding error with latest AMD processors -- no upstream bug yet"
+		"main.subquery_sj_firstmatch_bka;0;Known rounding error with latest AMD processors -- no upstream bug yet"
+		"main.subquery_sj_firstmatch_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet"
+		"main.subquery_sj_mat_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet"
+		"main.subquery_sj_all_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet"
+		"main.window_std_var;0;Known rounding error with latest AMD processors -- no upstream bug yet"
+		"main.window_std_var_optimized;0;Known rounding error with latest AMD processors -- no upstream bug yet"
+		"main.with_recursive;0;Known rounding error with latest AMD processors -- no upstream bug yet"
+		"perfschema.statement_digest_query_sample;0;Test will fail on slow hardware"
+
+		"rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch;0;Unstable test"
+		"rpl_gtid.rpl_multi_source_mtr_includes;97844;Unstable test"
+		"main.partition_datatype;0;Unstable test"
+
+		"sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware"
+
+		"x.connection;0;Known failure - no upstream bug yet"
+		"main.slow_log;0;Known failure - no upstream bug yet"
+
+		"sys_vars.build_id_basic;0;Requires -DWITH_BUILD_ID=ON"
+	)
+
+	if ! hash zip 1>/dev/null 2>&1 ; then
+		# No need to force dep app-arch/zip for one test
+		disabled_tests+=(
+			"innodb.discarded_partition_create;0;Requires app-arch/zip"
+			"innodb.partition_upgrade_create;0;Requires app-arch/zip"
+		)
+	fi
+
+	if has_version ">=dev-libs/openssl-3.2" ; then
+		# https://bugs.mysql.com/bug.php?id=113258
+		# Fails still with 8.0.37
+		disabled_tests+=(
+			"rpl.rpl_tlsv13;0;CCM8 ciphers have a lower security level with OpenSSL 3.2"
+			"auth_sec.wl15800_ciphers_tlsv13;0;CCM8 ciphers have a lower security level with OpenSSL 3.2"
+		)
+	fi
+
+	if use debug; then
+		disabled_tests+=(
+			"innodb.dblwr_unencrypt;0;Known test failure -- no upstream bug yet"
+		)
+	fi
+
+	local test_infos_str test_infos_arr
+	for test_infos_str in "${disabled_tests[@]}" ; do
+		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
+
+		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
+			die "Invalid test data set, not matching format: ${test_infos_str}"
+		fi
+
+		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
+	done
+	unset test_infos_str test_infos_arr
+
+	local -a CMAKE_SKIP_TESTS=(
+		# timing test, can be unreliable
+		"routertest_harness_net_ts_timer"
+
+		# Could not get local host address: Name or service not known(errno: -2)
+		"routertest_component_bootstrap"
+		"routertest_component_bootstrap_account"
+		"routertest_component_bootstrap_clusterset"
+		"routertest_component_config_overwrites"
+		"routertest_component_rest_api_enable"
+		"routertest_component_routing"
+		"routertest_component_sd_notify"
+		"routertest_component_state_file"
+		"routertest_integration_routing_direct"
+		"routertest_integration_routing_reuse"
+		"routertest_integration_routing_sharing"
+		"routertest_integration_routing_sharing_constrained_pools"
+		"routertest_integration_routing_sharing_restart"
+
+		# TODO: ???
+		"pfs_host-oom"
+		"pfs_user-oom"
+		"pfs"
+	)
+
+	if use debug; then
+		CMAKE_SKIP_TESTS+=(
+			# binary_log::transaction::compression::Payload_event_buffer_istream::~Payload_event_buffer_istream(): Assertion `!m_outstanding_error' failed.
+			"payload_event_buffer_istream"
+		)
+	fi
+
+	# Try to increase file limits to increase test coverage
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage, please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage, please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	fi
+
+	# run mysql-test tests
+	# Enable force restart to ensure success when tests don't cleanup sufficiently.
+	# Anything touching gtid_executed is negatively affected if you have unlucky ordering
+	nonfatal edo perl mysql-test-run.pl \
+		--force --force-restart \
+		--vardir="${T}/var-tests" --tmpdir="${T}/tmp-tests" \
+		--skip-test=tokudb --skip-test-list="${T}/disabled.def" \
+		--retry-failure=2 --max-test-fail=0
+	retstatus_tests=$?
+
+	popd &>/dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
+
+	# bug #823656
+	cmake_src_test --test-command "--gtest_death_test_style=threadsafe"
+
+	[[ -z "${failures}" ]] || die "Test failures: ${failures}"
+	einfo "Tests successfully completed"
+}
+
+src_install() {
+	cmake_src_install
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${ED}/${MY_SHAREDSTATEDIR#${EPREFIX}}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
+	cp "${FILESDIR}/my.cnf-8.0.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	mycnf_src="my.cnf-8.0.distro-server"
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		"${FILESDIR}/${mycnf_src}" \
+		> "${TMPDIR}/my.cnf.ok" || die
+
+	if use prefix ; then
+		sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+			"${TMPDIR}/my.cnf.ok" || die
+	fi
+
+	if use latin1 ; then
+		sed -i \
+			-e "/character-set/s|utf8mb4|latin1|g" \
+			"${TMPDIR}/my.cnf.ok" || die
+	fi
+
+	eprefixify "${TMPDIR}/my.cnf.ok"
+
+	newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+	#Remove mytop if perl is not selected
+	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+
+	if use router ; then
+		rm -rf \
+			"${ED}/usr/LICENSE.router" \
+			"${ED}/usr/README.router" \
+			"${ED}/usr/run" \
+			"${ED}/usr/var" \
+			|| die
+	fi
+
+	# Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
+	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	# NOTE: $MY_LOGDIR contains $EPREFIX by default
+	[[ -d "${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${MY_LOGDIR}"
+
+	# Note about configuration change
+	einfo
+	elog "This version of ${PN} reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/mysql.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+	einfo
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		einfo
+		elog "You might want to run:"
+		elog "  \"emerge --config =${CATEGORY}/${PF}\""
+		elog "if this is a new install."
+		einfo
+	else
+		einfo
+		elog "Upgrade process for ${PN}-8.x has changed. Please read"
+		elog "https://dev.mysql.com/doc/refman/8.0/en/upgrade-binary-package.html"
+		einfo
+	fi
+}
+
+pkg_config() {
+	_getoptval() {
+		local section="$1"
+		local flag="--${2}="
+		local extra_options="${3}"
+		local cmd=(
+			"${my_print_defaults_binary}"
+			"${extra_options}"
+			"${section}"
+		)
+		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
+
+		if [[ ${#results[@]} -gt 0 ]] ; then
+			# When option is set multiple times only return last value
+			echo "${results[-1]}"
+		fi
+	}
+
+	_mktemp_dry() {
+		# emktemp has no --dry-run option
+		local template="${1}"
+
+		if [[ -z "${template}" ]] ; then
+			if [[ -z "${T}" ]] ; then
+				template="/tmp/XXXXXXX"
+			else
+				template="${T}/XXXXXXX"
+			fi
+		fi
+
+		local template_wo_X=${template//X/}
+		local n_X
+		let n_X=${#template}-${#template_wo_X}
+		if [[ ${n_X} -lt 3 ]] ; then
+			echo "${FUNCNAME[0]}: too few X's in template '${template}'" >&2
+			return
+		fi
+
+		local attempts=0
+		local character tmpfile
+		while [[ true ]] ; do
+			let attempts=attempts+1
+
+			new_file=
+			while read -n1 character ; do
+				if [[ "${character}" == "X" ]] ; then
+					tmpfile+="${RANDOM:0:1}"
+				else
+					tmpfile+="${character}"
+				fi
+			done < <(echo -n "${template}")
+
+			if [[ ! -f "${tmpfile}" ]]
+			then
+				echo "${tmpfile}"
+				return
+			fi
+
+			if [[ ${attempts} -ge 100 ]] ; then
+				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+				return
+			fi
+		done
+	}
+
+	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+	if [[ ! -x "${mysqld_binary}" ]] ; then
+		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysql_binary="${EROOT}/usr/bin/mysql"
+	if [[ ! -x "${mysql_binary}" ]] ; then
+		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+	fi
+
+	if [[ -z "${MYSQL_USER}" ]] ; then
+		MYSQL_USER=mysql
+		if use prefix ; then
+			MYSQL_USER=$(id -u -n 2>/dev/null)
+			if [[ -z "${MYSQL_USER}" ]] ; then
+				die "Failed to determine current username!"
+			fi
+		fi
+	fi
+
+	if [[ -z "${MYSQL_GROUP}" ]] ; then
+		MYSQL_GROUP=mysql
+		if use prefix ; then
+			MYSQL_GROUP=$(id -g -n 2>/dev/null)
+			if [[ -z "${MYSQL_GROUP}" ]] ; then
+				die "Failed to determine current user groupname!"
+			fi
+		fi
+	fi
+
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	local -x HOME="${EROOT}/root"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Read currently set data directory
+	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		die "Sorry, unable to find MY_DATADIR!"
+	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+	fi
+
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+	# These are dir+prefix
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+	# Create missing directories.
+	# Always check if mysql user can write to directory even if we just
+	# created directory because a parent directory might be not
+	# accessible for that user.
+	PID_DIR="${EROOT}/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]] ; then
+		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+			|| die "Failed to create PID directory '${PID_DIR}'!"
+	fi
+
+	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_pid_dir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_pid_dir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+	else
+		rm "${_pid_dir_testfile}" || die
+		unset _pid_dir_testfile
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]] ; then
+		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+	fi
+
+	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_datadir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_datadir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+	else
+		rm "${_my_datadir_testfile}" || die
+		unset _my_datadir_testfile
+	fi
+
+	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+	fi
+
+	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+		[[ -z "${MYSQL_TMPDIR}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+		mkdir "${MYSQL_TMPDIR}" || die
+		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+	fi
+
+	# Now we need to test MYSQL_TMPDIR...
+	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_tmpdir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_tmpdir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+	else
+		rm "${_my_tmpdir_testfile}" || die
+		unset _my_tmpdir_testfile
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_logbin_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_logbin_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+		else
+			rm "${_my_logbin_testfile}" || die
+			unset _my_logbin_testfile
+		fi
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_relaylog_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_relaylog_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+		else
+			rm "${_my_relaylog_testfile}" || die
+			unset _my_relaylog_testfile
+		fi
+	fi
+
+	local mysql_install_log="$(_mktemp_dry "${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log")"
+	if [[ -z "${mysql_install_log}" ]] ; then
+		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log' failed!"
+	else
+		# make sure file is writable for MYSQL_USER...
+		touch "${mysql_install_log}" || die
+		chown ${MYSQL_USER} "${mysql_install_log}" || die
+	fi
+
+	local mysqld_logfile="$(_mktemp_dry "${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log")"
+	if [[ -z "${mysqld_logfile}" ]] ; then
+		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log' failed!"
+	else
+		# make sure file is writable for MYSQL_USER...
+		touch "${mysqld_logfile}" || die
+		chown ${MYSQL_USER} "${mysqld_logfile}" || die
+	fi
+
+	echo ""
+	einfo "Detected settings:"
+	einfo "=================="
+	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+	fi
+
+	einfo "PID DIR:\t\t\t\t${PID_DIR}"
+	einfo "Install db log:\t\t\t${mysql_install_log}"
+	einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+	local -a config_files
+
+	local config_file="${EROOT}/etc/mysql/mysql.d/50-distro-client.cnf"
+	if [[ -f "${config_file}" ]] ; then
+		config_files+=( "${config_file}" )
+	else
+		ewarn "Client configuration '${config_file}' not found; Skipping configuration of default authentication plugin for client ..."
+	fi
+
+	config_file="${EROOT}/etc/mysql/mysql.d/50-distro-server.cnf"
+	if [[ -f "${config_file}" ]] ; then
+		config_files+=( "${config_file}" )
+	else
+		ewarn "Server configuration '${config_file}' not found; Skipping configuration of default authentication plugin for mysqld ..."
+	fi
+
+	if [[ ${#config_files[@]} -gt 0 ]] ; then
+		if [[ -z "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" ]] ; then
+			local user_answer
+
+			echo
+			einfo "Please select default authentication plugin (enter number or plugin name):"
+			einfo "1) caching_sha2_password [MySQL 8.0 default]"
+			einfo "2) mysql_native_password [MySQL 5.7 default]"
+			einfo
+			einfo "For details see:"
+			einfo "https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html#upgrade-caching-sha2-password"
+			read -p "    >" user_answer
+			echo
+
+			case "${user_answer}" in
+				1|caching_sha2_password)
+					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=caching_sha2_password
+					;;
+				2|mysql_native_password)
+					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=mysql_native_password
+					;;
+				'')
+					die "No authentication plugin selected!"
+					;;
+				*)
+					die "Authentication plugin '${user_answer}' is unknown/unsupported!"
+					;;
+			esac
+
+			echo "Selected authentication plugin: ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" >> "${mysql_install_log}"
+
+			unset user_answer
+		fi
+
+		local cfg_option cfg_option_tabs cfg_section
+		for config_file in "${config_files[@]}" ; do
+			cfg_option="default-authentication-plugin"
+			cfg_section="mysqld"
+			cfg_option_tabs="\t\t"
+			if [[ "${config_file}" == *client.cnf ]] ; then
+				cfg_option="default-auth"
+				cfg_section="client"
+				cfg_option_tabs="\t\t\t\t"
+			fi
+
+			if grep -qE "^(loose-)?${cfg_option}\b.*=" "${config_file}" 2>/dev/null ; then
+				einfo "Ensuring that ${cfg_option} is set to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
+				sed -i \
+					-e "s/^\(loose-\)\?${cfg_option}\b.*=.*/loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}/" \
+					"${config_file}" || die "Failed to change ${cfg_option} in '${config_file}'!"
+			else
+				einfo "Setting ${cfg_option} to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
+				sed -i \
+					-e "/^\[${cfg_section}\]$/a loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" \
+					"${config_file}" || die "Failed to add ${cfg_option} to '${config_file}'!"
+			fi
+		done
+		unset cfg_option cfg_option_tabs cfg_section
+	fi
+	unset config_files config_file
+
+	echo
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client ; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local pwd1="a"
+		local pwd2="b"
+
+		echo
+		einfo "No password for mysql 'root' user was specified via environment"
+		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+		einfo "file like '${HOME}/.my.cnf'."
+		einfo "To continue please provide a password for the mysql 'root' user"
+		einfo "now on console:"
+		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same!"
+		fi
+
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+
+		echo
+	fi
+
+	local -a mysqld_options
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+	local opt optexp optfull
+	for opt in host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+	; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+	done
+
+	# Prepare timezones, see
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	local tz_sql="$(_mktemp_dry "${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql")"
+	[[ -z "${tz_sql}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql' failed!"
+
+	echo "USE mysql;" >"${tz_sql}"
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+	if [[ $? -ne 0 ]] ; then
+		die "mysql_tzinfo_to_sql failed!"
+	fi
+
+	# --initialize-insecure will not set root password
+	# --initialize would set a random one in the log which we don't need as we set it ourselves
+	local cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--initialize-insecure"
+		"--init-file='${tz_sql}'"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		"--log-error='${mysql_install_log}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Initializing ${PN} data directory: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql.ibd" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+	fi
+
+	rm "${tz_sql}" || die
+
+	local x=${RANDOM}
+	local socket="${EROOT}${PID_DIR}/mysqld${x}.sock"
+	local pidfile="${EROOT}${PID_DIR}/mysqld${x}.pid"
+	unset x
+
+	cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		--max_allowed_packet=8M
+		--net_buffer_length=16K
+		"--socket='${socket}'"
+		"--pid-file='${pidfile}'"
+		"--log-error='${mysqld_logfile}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+	echo -n "Waiting for mysqld to accept connections "
+	local maxtry=15
+	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+
+	if [[ -S "${socket}" ]] ; then
+		# Even with a socket we don't know if mysqld will abort
+		# start due to an error so just wait a little bit more...
+		maxtry=5
+		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+	fi
+
+	echo
+
+	if [[ ! -S "${socket}" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+	fi
+
+	local mysql_logfile="${TMPDIR}/set_root_pw.log"
+	touch "${mysql_logfile}" || die
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+	cmd=(
+		"${mysql_binary}"
+		--no-defaults
+		"--socket='${socket}'"
+		-hlocalhost
+		"-e \"${sql}\""
+	)
+	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+	local rc=$?
+	eend ${rc}
+
+	if [[ ${rc} -ne 0 ]] ; then
+		# Poor man's solution which tries to avoid having password
+		# in log.  NOTE: sed can fail if user didn't follow advice
+		# and included character which will require escaping...
+		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+	fi
+
+	# Stop the server
+	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+		echo -n "Stopping the server "
+		pkill -F "${pidfile}" &>/dev/null
+
+		maxtry=10
+		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+
+		echo
+
+		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+			# We somehow failed to stop server.
+			# However, not a fatal error. Just warn the user.
+			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+		fi
+	fi
+
+	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index 0763ab04a97d..33e044e3ac95 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -1,4 +1,2 @@
-DIST pgbouncer-1.16.1.tar.gz 591450 BLAKE2B 137193ad614586d708598fd7003af4dee69f03f88a7235ba4074b63d57ffc3ee1c41fbccb49c5df7c23a2272b33810f8c2a9084d98e2e695a3b5f5ec317e0227 SHA512 9ecb7c7ae136d85e3da434094909df3a6ff06ce8586a1848c0c00914d87a877aecbb26ea30ad8230062160f3177621cc16deb4a490e9a2a649c8032dacb86341
-DIST pgbouncer-1.22.0.tar.gz 670589 BLAKE2B feb0138c09eb2e3f865f9c372d1924f9fbe67785a52534f8b99783c0bc2d5a54a6fd8b0554ea8ac7d4e8e108fd2296a3a9ae19cb75d628052c45e4a57fd037cd SHA512 1d8f4b352103e17a3905ec0677362954f4b9f606f6dc00011514c2ec46d8c4e8d17b24e9ca92794ccaf4c86c9c77ac062e6be92be7856192b7c534b5a4911163
-DIST pgbouncer-1.22.1.tar.gz 677351 BLAKE2B c67eba10b51ae74fb77ad61f7c597b687769e75b687ff9682c16d0ac0b32c0e9d20d4c90cd5803331d128f3f388800faa38dd9965b86c5a75688455db1a06d6b SHA512 ac63fe877f68745f1faab096ee9d9e185de9cab97d4fef121c2c551fa0e69ea22342dc8b5ce75cadff755314e5493a5440f0748b5ee9f524f71d871ec1861530
 DIST pgbouncer-1.23.1.tar.gz 700025 BLAKE2B 60fd69362fe6c4bacdda33064cb0b871ceabe086b22b6fff8762a129e0d1d8332fba1b0abf6dac1ac4426654d84cb283bd86b02fde5229e6c97a7a310c6bf0f1 SHA512 efcd4efa3871a43f2498e4cbbae0c85b98bb7eefa46b6081ceeafd652179e215fcaa74de63941c7e14a919e41f550aff182e2b940c9f8bb0fbf5fffb6440e99b
+DIST pgbouncer-1.24.0.tar.gz 706573 BLAKE2B 6f81a2d4d063142c74eb14af81dd9a53c2eec89bebb87706f4af1a98e9087e2cf01e779f9e0905eeffcf4bdd4d35ee15b77c4e44108a01cc0940bf1d0f99c950 SHA512 3b2eccc6efb32e2a430f5b2598e35f2b9220c5129941f1717faa913cc8e6041478142d8954e9d8ade460dc4a7e2d212cba2511a8c914056e6fe470a68e697204
diff --git a/dev-db/pgbouncer/metadata.xml b/dev-db/pgbouncer/metadata.xml
index 676b6d9eeab9..b56048ae635f 100644
--- a/dev-db/pgbouncer/metadata.xml
+++ b/dev-db/pgbouncer/metadata.xml
@@ -9,9 +9,5 @@
 		<flag name="c-ares">
 			Use c-ares as the DNS backend instead of evdns (libevent).
 		</flag>
-		<flag name="udns">
-			Use udns as the DNS backend instead of evdns (libevent). Supports
-			IPv4 only.
-		</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-db/pgbouncer/pgbouncer-1.16.1.ebuild b/dev-db/pgbouncer/pgbouncer-1.16.1.ebuild
deleted file mode 100644
index bd386524fe68..000000000000
--- a/dev-db/pgbouncer/pgbouncer-1.16.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Lightweight connection pooler for PostgreSQL"
-HOMEPAGE="https://www.pgbouncer.org/"
-SRC_URI="https://www.pgbouncer.org/downloads/files/${PV}/pgbouncer-${PV}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+c-ares debug doc pam ssl systemd udns"
-
-# At-most-one-of, one can be enabled but not both
-REQUIRED_USE="?? ( c-ares udns )"
-
-RDEPEND="
-	>=dev-libs/libevent-2.0:=
-	acct-user/pgbouncer
-	c-ares? ( >=net-dns/c-ares-1.10 )
-	ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist(-)] )
-	systemd? ( sys-apps/systemd )
-	udns? ( >=net-libs/udns-0.1 )
-"
-
-DEPEND="${RDEPEND}"
-
-# Tests require a local database server, wants to fiddle with iptables,
-# and doesn't support overriding.
-RESTRICT="test"
-
-src_prepare() {
-	eapply "${FILESDIR}"/pgbouncer-1.12-dirs.patch
-
-	default
-}
-
-src_configure() {
-	# --enable-debug is only used to disable stripping
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-debug \
-		$(use_with c-ares cares) \
-		$(use_enable debug cassert) \
-		$(use_with pam) \
-		$(use_with ssl openssl) \
-		$(use_with systemd) \
-		$(use_with udns)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS
-	use doc && dodoc doc/*.md
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}"
-
-	insinto /etc
-	doins etc/pgbouncer.ini
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" pgbouncer
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		einfo "Please read the config.txt for Configuration Directives"
-		einfo
-		einfo "For Administration Commands, see:"
-		einfo "    man pgbouncer"
-		einfo
-		einfo "By default, PgBouncer does not have access to any database."
-		einfo "GRANT the permissions needed for your application and make sure that it"
-		einfo "exists in PgBouncer's auth_file."
-	fi
-}
diff --git a/dev-db/pgbouncer/pgbouncer-1.22.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.22.0.ebuild
deleted file mode 100644
index 1647a74fb4c5..000000000000
--- a/dev-db/pgbouncer/pgbouncer-1.22.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Lightweight connection pooler for PostgreSQL"
-HOMEPAGE="https://www.pgbouncer.org/"
-SRC_URI="https://www.pgbouncer.org/downloads/files/${PV}/pgbouncer-${PV}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+c-ares debug doc pam ssl systemd"
-
-RDEPEND="
-	>=dev-libs/libevent-2.0:=
-	acct-user/pgbouncer
-	c-ares? ( >=net-dns/c-ares-1.10 )
-	ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist(-)] )
-	systemd? ( sys-apps/systemd )
-"
-
-DEPEND="${RDEPEND}"
-
-# Tests require a local database server, wants to fiddle with iptables,
-# and doesn't support overriding.
-RESTRICT="test"
-
-src_prepare() {
-	eapply "${FILESDIR}"/pgbouncer-1.12-dirs.patch
-
-	default
-}
-
-src_configure() {
-	# --enable-debug is only used to disable stripping
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-debug \
-		$(use_with c-ares cares) \
-		$(use_enable debug cassert) \
-		$(use_with pam) \
-		$(use_with ssl openssl) \
-		$(use_with systemd)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS
-	use doc && dodoc doc/*.md
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}"
-
-	insinto /etc
-	doins etc/pgbouncer.ini
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" pgbouncer
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		einfo "Please read the config.txt for Configuration Directives"
-		einfo
-		einfo "For Administration Commands, see:"
-		einfo "    man pgbouncer"
-		einfo
-		einfo "By default, PgBouncer does not have access to any database."
-		einfo "GRANT the permissions needed for your application and make sure that it"
-		einfo "exists in PgBouncer's auth_file."
-	fi
-}
diff --git a/dev-db/pgbouncer/pgbouncer-1.22.1.ebuild b/dev-db/pgbouncer/pgbouncer-1.22.1.ebuild
deleted file mode 100644
index 39495217565b..000000000000
--- a/dev-db/pgbouncer/pgbouncer-1.22.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Lightweight connection pooler for PostgreSQL"
-HOMEPAGE="https://www.pgbouncer.org/"
-SRC_URI="https://www.pgbouncer.org/downloads/files/${PV}/pgbouncer-${PV}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+c-ares debug doc pam ssl systemd"
-
-RDEPEND="
-	>=dev-libs/libevent-2.0:=
-	acct-user/pgbouncer
-	c-ares? ( >=net-dns/c-ares-1.10 )
-	ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist(-)] )
-	systemd? ( sys-apps/systemd )
-"
-
-DEPEND="${RDEPEND}"
-
-# Tests require a local database server, wants to fiddle with iptables,
-# and doesn't support overriding.
-RESTRICT="test"
-
-src_prepare() {
-	eapply "${FILESDIR}"/pgbouncer-1.12-dirs.patch
-
-	default
-}
-
-src_configure() {
-	# --enable-debug is only used to disable stripping
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-debug \
-		$(use_with c-ares cares) \
-		$(use_enable debug cassert) \
-		$(use_with pam) \
-		$(use_with ssl openssl) \
-		$(use_with systemd)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS
-	use doc && dodoc doc/*.md
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}"
-
-	insinto /etc
-	doins etc/pgbouncer.ini
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" pgbouncer
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		einfo "Please read the config.txt for Configuration Directives"
-		einfo
-		einfo "For Administration Commands, see:"
-		einfo "    man pgbouncer"
-		einfo
-		einfo "By default, PgBouncer does not have access to any database."
-		einfo "GRANT the permissions needed for your application and make sure that it"
-		einfo "exists in PgBouncer's auth_file."
-	fi
-}
diff --git a/dev-db/pgbouncer/pgbouncer-1.23.1.ebuild b/dev-db/pgbouncer/pgbouncer-1.23.1.ebuild
index 1647a74fb4c5..e93aaae652e9 100644
--- a/dev-db/pgbouncer/pgbouncer-1.23.1.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.23.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
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.pgbouncer.org/"
 SRC_URI="https://www.pgbouncer.org/downloads/files/${PV}/pgbouncer-${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+c-ares debug doc pam ssl systemd"
 
 RDEPEND="
diff --git a/dev-db/pgbouncer/pgbouncer-1.24.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.24.0.ebuild
new file mode 100644
index 000000000000..6b7542a7420c
--- /dev/null
+++ b/dev-db/pgbouncer/pgbouncer-1.24.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Lightweight connection pooler for PostgreSQL"
+HOMEPAGE="https://www.pgbouncer.org/"
+SRC_URI="https://www.pgbouncer.org/downloads/files/${PV}/pgbouncer-${PV}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+c-ares debug doc pam ssl systemd"
+
+RDEPEND="
+	>=dev-libs/libevent-2.0:=
+	acct-user/pgbouncer
+	c-ares? ( >=net-dns/c-ares-1.10 )
+	ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist(-)] )
+	systemd? ( sys-apps/systemd )
+"
+
+DEPEND="${RDEPEND}"
+
+# Tests require a local database server, wants to fiddle with iptables,
+# and doesn't support overriding.
+RESTRICT="test"
+
+src_prepare() {
+	eapply "${FILESDIR}"/pgbouncer-1.12-dirs.patch
+
+	default
+}
+
+src_configure() {
+	# --enable-debug is only used to disable stripping
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--enable-debug \
+		$(use_with c-ares cares) \
+		$(use_enable debug cassert) \
+		$(use_with pam) \
+		$(use_with ssl openssl) \
+		$(use_with systemd)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS
+	use doc && dodoc doc/*.md
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}"
+
+	insinto /etc
+	doins etc/pgbouncer.ini
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" pgbouncer
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		einfo "Please read the config.txt for Configuration Directives"
+		einfo
+		einfo "For Administration Commands, see:"
+		einfo "    man pgbouncer"
+		einfo
+		einfo "By default, PgBouncer does not have access to any database."
+		einfo "GRANT the permissions needed for your application and make sure that it"
+		einfo "exists in PgBouncer's auth_file."
+	fi
+}
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 5aed08024cec..f3f1325e486b 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -4,3 +4,4 @@ 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
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/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-db/qt5-sqlcipher/files/qt5-sqlcipher-1.0.11-qt-5.15.16.patch b/dev-db/qt5-sqlcipher/files/qt5-sqlcipher-1.0.11-qt-5.15.16.patch
new file mode 100644
index 000000000000..24277405fdbb
--- /dev/null
+++ b/dev-db/qt5-sqlcipher/files/qt5-sqlcipher-1.0.11-qt-5.15.16.patch
@@ -0,0 +1,92 @@
+--- qt5-sqlcipher-1.0.11/qt-file-cache/5.15.16/qsql_sqlite.cpp
++++ qt5-sqlcipher-1.0.11/qt-file-cache/5.15.16/qsql_sqlite.cpp
+@@ -74,13 +74,18 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
+-static QString _q_escapeIdentifier(const QString &identifier)
++static QString _q_escapeIdentifier(const QString &identifier, QSqlDriver::IdentifierType type)
+ {
+     QString res = identifier;
++    // If it contains [ and ] then we assume it to be escaped properly already as this indicates
++    // the syntax is exactly how it should be
++    if (identifier.contains(QLatin1Char('[')) && identifier.contains(QLatin1Char(']')))
++        return res;
+     if (!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) && !identifier.endsWith(QLatin1Char('"'))) {
+         res.replace(QLatin1Char('"'), QLatin1String("\"\""));
+         res.prepend(QLatin1Char('"')).append(QLatin1Char('"'));
+-        res.replace(QLatin1Char('.'), QLatin1String("\".\""));
++        if (type == QSqlDriver::TableName)
++            res.replace(QLatin1Char('.'), QLatin1String("\".\""));
+     }
+     return res;
+ }
+@@ -478,7 +483,12 @@
+         for (int i = 0, currentIndex = 0; i < values.size(); ++i) {
+             if (handledIndexes.contains(i))
+                 continue;
+-            const auto placeHolder = QString::fromUtf8(sqlite3_bind_parameter_name(d->stmt, currentIndex + 1));
++            const char *parameterName = sqlite3_bind_parameter_name(d->stmt, currentIndex + 1);
++            if (!parameterName) {
++                paramCountIsValid = false;
++                continue;
++            }
++            const auto placeHolder = QString::fromUtf8(parameterName);
+             const auto &indexes = d->indexes.value(placeHolder);
+             handledIndexes << indexes;
+             prunedValues << values.at(indexes.first());
+@@ -491,7 +501,7 @@
+     if (paramCountIsValid) {
+         for (int i = 0; i < paramCount; ++i) {
+             res = SQLITE_OK;
+-            const QVariant value = values.at(i);
++            const QVariant &value = values.at(i);
+ 
+             if (value.isNull()) {
+                 res = sqlite3_bind_null(d->stmt, i + 1);
+@@ -900,13 +910,24 @@
+ {
+     QString schema;
+     QString table(tableName);
+-    int indexOfSeparator = tableName.indexOf(QLatin1Char('.'));
++    const int indexOfSeparator = tableName.indexOf(QLatin1Char('.'));
+     if (indexOfSeparator > -1) {
+-        schema = tableName.left(indexOfSeparator).append(QLatin1Char('.'));
+-        table = tableName.mid(indexOfSeparator + 1);
++        const int indexOfCloseBracket = tableName.indexOf(QLatin1Char(']'));
++        if (indexOfCloseBracket != tableName.size() - 1) {
++            // Handles a case like databaseName.tableName
++            schema = tableName.left(indexOfSeparator + 1);
++            table = tableName.mid(indexOfSeparator + 1);
++        } else {
++            const int indexOfOpenBracket = tableName.lastIndexOf(QLatin1Char('['), indexOfCloseBracket);
++            if (indexOfOpenBracket > 0) {
++                // Handles a case like databaseName.[tableName]
++                schema = tableName.left(indexOfOpenBracket);
++                table = tableName.mid(indexOfOpenBracket);
++            }
++        }
+     }
+-    q.exec(QLatin1String("PRAGMA ") + schema + QLatin1String("table_info (") + _q_escapeIdentifier(table) + QLatin1Char(')'));
+-
++    q.exec(QLatin1String("PRAGMA ") + schema + QLatin1String("table_info (") +
++           _q_escapeIdentifier(table, QSqlDriver::TableName) + QLatin1Char(')'));
+     QSqlIndex ind;
+     while (q.next()) {
+         bool isPk = q.value(5).toInt();
+@@ -968,8 +989,7 @@
+ 
+ QString QSQLiteDriver::escapeIdentifier(const QString &identifier, IdentifierType type) const
+ {
+-    Q_UNUSED(type);
+-    return _q_escapeIdentifier(identifier);
++    return _q_escapeIdentifier(identifier, type);
+ }
+ 
+ static void handle_sqlite_callback(void *qobj,int aoperation, char const *adbname, char const *atablename,
+@@ -1046,3 +1066,5 @@
+ }
+ 
+ QT_END_NAMESPACE
++
++#include "moc_qsql_sqlite_p.cpp"
diff --git a/dev-db/qt5-sqlcipher/metadata.xml b/dev-db/qt5-sqlcipher/metadata.xml
index 10e4ea021b98..86d30c454fbf 100644
--- a/dev-db/qt5-sqlcipher/metadata.xml
+++ b/dev-db/qt5-sqlcipher/metadata.xml
@@ -4,4 +4,7 @@
 <maintainer type="person">
   <email>ulm@gentoo.org</email>
 </maintainer>
+<upstream>
+  <remote-id type="github">blizzard4591/qt5-sqlcipher</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11-r1.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11-r1.ebuild
deleted file mode 100644
index 57ef6aa14443..000000000000
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Qt SQL driver plugin for SQLCipher"
-HOMEPAGE="https://github.com/blizzard4591/qt5-sqlcipher"
-SRC_URI="https://github.com/blizzard4591/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1" # version 2.1 only
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-db/sqlcipher-3.4.1
-	>=dev-qt/qtcore-5.12.3:5=
-	>=dev-qt/qtsql-5.12.3:5=[sqlite] <dev-qt/qtsql-5.16:5=[sqlite]"
-DEPEND="${RDEPEND}"
-
-DOCS=(README.md)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-1.0.10-install-path.patch
-	sed -i -e "s/@LIBDIR@/$(get_libdir)/" CMakeLists.txt || die
-
-	local v=$(best_version dev-qt/qtsql:5)
-	v=$(ver_cut 1-3 ${v#*/qtsql-})
-	[[ -n ${v} ]] || die "could not determine qtsql version"
-	if ! [[ -d qt-file-cache/${v} ]]; then
-		local vc
-		case $(ver_cut 1-2 ${v}) in
-			5.12) vc=5.12.5 ;;
-			5.13) vc=5.13.2 ;;
-			5.14) vc=5.14.2 ;;
-			5.15) vc=5.15.0 ;;
-			*) die "qtsql-${v} not supported" ;;
-		esac
-		elog "qtsql-${v} not in cache, using ${vc} instead"
-		cp -R qt-file-cache/${vc} qt-file-cache/${v} || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	./qsqlcipher-test || die
-}
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11-r2.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11-r2.ebuild
new file mode 100644
index 000000000000..60da9b9a752b
--- /dev/null
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Qt SQL driver plugin for SQLCipher"
+HOMEPAGE="https://github.com/blizzard4591/qt5-sqlcipher"
+SRC_URI="https://github.com/blizzard4591/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1" # version 2.1 only
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-db/sqlcipher-3.4.1
+	>=dev-qt/qtcore-5.15.16:5=
+	>=dev-qt/qtsql-5.15.16:5=[sqlite] <dev-qt/qtsql-5.16:5=[sqlite]"
+DEPEND="${RDEPEND}"
+
+DOCS=(README.md)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-1.0.10-install-path.patch
+	cp -a "${S}"/qt-file-cache/5.15.{0,16} || die
+	eapply "${FILESDIR}"/${P}-qt-5.15.16.patch
+	sed -i -e "s/@LIBDIR@/$(get_libdir)/" CMakeLists.txt || die
+
+	local v=$(best_version dev-qt/qtsql:5)
+	v=$(ver_cut 1-3 ${v#*/qtsql-})
+	[[ -n ${v} ]] || die "could not determine qtsql version"
+	if ! [[ -d qt-file-cache/${v} ]]; then
+		local vc
+		case $(ver_cut 1-2 ${v}) in
+			5.15) vc=5.15.16 ;;
+			*) die "qtsql-${v} not supported" ;;
+		esac
+		elog "qtsql-${v} not in cache, using ${vc} instead"
+		cp -R qt-file-cache/${vc} qt-file-cache/${v} || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	./qsqlcipher-test || die
+}
diff --git a/dev-db/redict/Manifest b/dev-db/redict/Manifest
index 28d0ef0bccc9..b821e86d08b9 100644
--- a/dev-db/redict/Manifest
+++ b/dev-db/redict/Manifest
@@ -1 +1 @@
-DIST redict-7.3.1.tar.gz 3414766 BLAKE2B ff4a4078683ec6e4f236e605e29711d1033c8632cd6c12035d7fdf1566d75d375daa61383fd8a6c098444e1cf382f5934f961e67a2041351fb4c9aaa6a7635c0 SHA512 79d174c0f58c73a52f3b0225280f69f92790f8d43cdf70a2353cefd06d73030ffb5e3eb30e06dcd9c47161f2d43a09cca6dc815e9dd83b620716c2ae3243d3bc
+DIST redict-7.3.2.tar.gz 3415089 BLAKE2B 3507586d4e752e1f98755e8f0e2291ea37a27af84b7980ecde0342826dd41b46eb2f3a9ca3f0231bc49771829b7584b6f2f529ab11cb5af39ecdb3cde4f6416a SHA512 fb14f9c1bb43e69f5479fd9944b2865d0696330d244b8eb88865370756f580a9e5826f9041cd91478ccfeb22ec1304ab9cdff6736e2a623e71c58e785db9eb4a
diff --git a/dev-db/redict/redict-7.3.1.ebuild b/dev-db/redict/redict-7.3.1.ebuild
deleted file mode 100644
index 8218bbe76716..000000000000
--- a/dev-db/redict/redict-7.3.1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# N.B.: It is no clue in porting to Lua eclasses, as upstream have deviated
-# too far from vanilla Lua, adding their own APIs like lua_enablereadonlytable
-
-inherit edo multiprocessing systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="A persistent caching system, key-value, and data structures database"
-HOMEPAGE="https://redict.io"
-
-SRC_URI="https://codeberg.org/redict/redict/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-S=${WORKDIR}/${PN}
-
-LICENSE="BSD Boost-1.0 LGPL-3"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-IUSE="+jemalloc ssl systemd tcmalloc test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( jemalloc tcmalloc )"
-
-RDEPEND="
-	acct-group/redict
-	acct-user/redict
-	dev-libs/hiredict:0=[ssl?]
-	jemalloc? ( >=dev-libs/jemalloc-5.1:=[stats] )
-	ssl? ( dev-libs/openssl:0= )
-	systemd? ( sys-apps/systemd:= )
-	tcmalloc? ( dev-util/google-perftools )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-lang/tcl:0=
-		ssl? ( dev-tcltk/tls )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/redict-7.3.0-config.patch
-	"${FILESDIR}"/redict-sentinel-7.3.0-config.patch
-	"${FILESDIR}"/redict-7.3.0-system-jemalloc.patch
-	"${FILESDIR}"/redict-7.3.0-system-hiredict.patch
-)
-
-src_prepare() {
-	default
-
-	# Respect user CFLAGS in bundled lua
-	sed -i '/LUA_CFLAGS/s: -O2::g' deps/Makefile || die
-}
-
-_build() {
-	tc-export AR CC RANLIB
-	local myconf=(
-		AR="${AR}"
-		CC="${CC}"
-		RANLIB="${RANLIB}"
-		CFLAGS="${CFLAGS}"
-		LDFLAGS="${LDFLAGS}"
-		V=1 # verbose
-		OPTIMIZATION=
-		DEBUG=
-		DEBUG_FLAGS=
-		BUILD_TLS=$(usex ssl)
-		USE_SYSTEMD=$(usex systemd)
-		USE_SYSTEM_HIREDICT=yes
-	)
-
-	if use jemalloc; then
-		myconf+=(
-			MALLOC=jemalloc
-			USE_SYSTEM_JEMALLOC=yes
-		)
-	elif use tcmalloc; then
-		myconf+=( MALLOC=tcmalloc )
-	else
-		myconf+=( MALLOC=libc )
-	fi
-
-	emake -C src "${myconf[@]}" "$@"
-}
-
-src_compile() {
-	_build
-}
-
-src_test() {
-	local runtestargs=(
-		--clients "$(makeopts_jobs)" # see bug #649868
-
-		--skiptest "Active defrag eval scripts" # see bug #851654
-		--skiptest "FUNCTION - redict version api" # test fails due to release mishap on 7.3.1, remove on bump
-	)
-
-	if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then
-		ewarn "oom-score-adj related tests will be skipped." \
-			"They are known to fail with FEATURES usersandbox or -userpriv. See bug #756382."
-
-		runtestargs+=(
-			# unit/oom-score-adj was introduced in version 6.2.0
-			--skipunit unit/oom-score-adj # see bug #756382
-
-			# Following test was added in version 7.0.0 to unit/introspection.
-			# It also tries to adjust OOM score.
-			--skiptest "CONFIG SET rollback on apply error"
-		)
-	fi
-
-	if use ssl; then
-		edo ./utils/gen-test-certs.sh
-		runtestargs+=( --tls )
-	fi
-
-	edo ./runtest "${runtestargs[@]}"
-}
-
-src_install() {
-	insinto /etc/redict
-	doins redict.conf sentinel.conf
-	use prefix || fowners -R redict:redict /etc/redict /etc/redict/{redict,sentinel}.conf
-
-	newconfd "${FILESDIR}/redict.confd" redict
-	newinitd "${FILESDIR}/redict.initd" redict
-
-	systemd_newunit "${FILESDIR}/redict.service" redict.service
-	newtmpfiles "${FILESDIR}/redict.tmpfiles" redict.conf
-
-	newconfd "${FILESDIR}/redict-sentinel.confd" redict-sentinel
-	newinitd "${FILESDIR}/redict-sentinel.initd" redict-sentinel
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/redict.logrotate" "${PN}"
-
-	_build DESTDIR="${ED}" PREFIX="/usr" install
-
-	if use prefix; then
-		diropts -m0750
-	else
-		diropts -m0750 -o redict -g redict
-	fi
-	keepdir /var/{log,lib}/redict
-}
-
-pkg_postinst() {
-	tmpfiles_process redict.conf
-
-	if has_version dev-db/redis && [[ -z "${REPLACING_VERSIONS}" ]]; then
-		ewarn "Redict uses different configuration files than redis:"
-		ewarn "/etc/redict/{redict,sentinel}.conf"
-		ewarn "Please apply your changes to the new configuration files."
-	fi
-}
diff --git a/dev-db/redict/redict-7.3.2.ebuild b/dev-db/redict/redict-7.3.2.ebuild
new file mode 100644
index 000000000000..002e106a3641
--- /dev/null
+++ b/dev-db/redict/redict-7.3.2.ebuild
@@ -0,0 +1,160 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# N.B.: It is no clue in porting to Lua eclasses, as upstream have deviated
+# too far from vanilla Lua, adding their own APIs like lua_enablereadonlytable
+
+inherit edo multiprocessing systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="A persistent caching system, key-value, and data structures database"
+HOMEPAGE="https://redict.io"
+
+SRC_URI="https://codeberg.org/redict/redict/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+S=${WORKDIR}/${PN}
+
+LICENSE="BSD Boost-1.0 LGPL-3"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="+jemalloc ssl systemd tcmalloc test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( jemalloc tcmalloc )"
+
+RDEPEND="
+	acct-group/redict
+	acct-user/redict
+	dev-libs/hiredict:0=[ssl?]
+	jemalloc? ( >=dev-libs/jemalloc-5.1:=[stats] )
+	ssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd:= )
+	tcmalloc? ( dev-util/google-perftools )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-lang/tcl:0=
+		ssl? ( dev-tcltk/tls )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/redict-7.3.0-config.patch
+	"${FILESDIR}"/redict-sentinel-7.3.0-config.patch
+	"${FILESDIR}"/redict-7.3.0-system-jemalloc.patch
+	"${FILESDIR}"/redict-7.3.0-system-hiredict.patch
+)
+
+src_prepare() {
+	default
+
+	# Respect user CFLAGS in bundled lua
+	sed -i '/LUA_CFLAGS/s: -O2::g' deps/Makefile || die
+}
+
+_build() {
+	tc-export AR CC RANLIB
+	local myconf=(
+		AR="${AR}"
+		CC="${CC}"
+		RANLIB="${RANLIB}"
+		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+		V=1 # verbose
+		OPTIMIZATION=
+		DEBUG=
+		DEBUG_FLAGS=
+		BUILD_TLS=$(usex ssl)
+		USE_SYSTEMD=$(usex systemd)
+		USE_SYSTEM_HIREDICT=yes
+	)
+
+	if use jemalloc; then
+		myconf+=(
+			MALLOC=jemalloc
+			USE_SYSTEM_JEMALLOC=yes
+		)
+	elif use tcmalloc; then
+		myconf+=( MALLOC=tcmalloc )
+	else
+		myconf+=( MALLOC=libc )
+	fi
+
+	emake -C src "${myconf[@]}" "$@"
+}
+
+src_compile() {
+	_build
+}
+
+src_test() {
+	local runtestargs=(
+		--clients "$(makeopts_jobs)" # see bug #649868
+
+		--skiptest "Active defrag eval scripts" # see bug #851654
+		--skiptest "FUNCTION - redict version api" # test fails due to release mishap on 7.3.1, remove on bump
+	)
+
+	if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then
+		ewarn "oom-score-adj related tests will be skipped." \
+			"They are known to fail with FEATURES usersandbox or -userpriv. See bug #756382."
+
+		runtestargs+=(
+			# unit/oom-score-adj was introduced in version 6.2.0
+			--skipunit unit/oom-score-adj # see bug #756382
+
+			# Following test was added in version 7.0.0 to unit/introspection.
+			# It also tries to adjust OOM score.
+			--skiptest "CONFIG SET rollback on apply error"
+		)
+	fi
+
+	if use ssl; then
+		edo ./utils/gen-test-certs.sh
+		runtestargs+=( --tls )
+	fi
+
+	edo ./runtest "${runtestargs[@]}"
+}
+
+src_install() {
+	insinto /etc/redict
+	doins redict.conf sentinel.conf
+	use prefix || fowners -R redict:redict /etc/redict /etc/redict/{redict,sentinel}.conf
+
+	newconfd "${FILESDIR}/redict.confd" redict
+	newinitd "${FILESDIR}/redict.initd" redict
+
+	systemd_newunit "${FILESDIR}/redict.service" redict.service
+	newtmpfiles "${FILESDIR}/redict.tmpfiles" redict.conf
+
+	newconfd "${FILESDIR}/redict-sentinel.confd" redict-sentinel
+	newinitd "${FILESDIR}/redict-sentinel.initd" redict-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/redict.logrotate" "${PN}"
+
+	_build DESTDIR="${ED}" PREFIX="/usr" install
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redict -g redict
+	fi
+	keepdir /var/{log,lib}/redict
+}
+
+pkg_postinst() {
+	tmpfiles_process redict.conf
+
+	if has_version dev-db/redis && [[ -z "${REPLACING_VERSIONS}" ]]; then
+		ewarn "Redict uses different configuration files than redis:"
+		ewarn "/etc/redict/{redict,sentinel}.conf"
+		ewarn "Please apply your changes to the new configuration files."
+	fi
+}
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 28d06c2e8832..c7b78d2d5530 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -1,3 +1,6 @@
 DIST redis-6.2.16.tar.gz 2496391 BLAKE2B e00eac16fbebc54bbd24dc6622cb1add7c0511df419a84d5f9a4aae28b2a5ec4d9a4b865999fe4ab1bfeff582dce8f7c01c5352c7389c3a2ebbffc728246033b SHA512 486bb949c5adce9d2ad176c2638d2425a6a03910098e6adf1bdaecd3459d148c2899e4827ed39cbe8d7300ffcffe99b475575bb87ab93a330549077284fd8fd7
+DIST redis-6.2.17.tar.gz 2492457 BLAKE2B 4ed7555df5e8c67a5e6f14e133e7052cabc7f71d6ba12c0e6c4cf9d1eded06b97362b6998c8e15765dd6ee87e3636d4f6b280b53cf47c7eea1f2f8e27ab907f1 SHA512 77ed577022edc617c576b3ac8728014b2041d431295dc97d6b879c6f97e692db6958561e9e8b45c209136f9447c80bca527a5d6b2becc94738bc35ed25a5a9bb
 DIST redis-7.2.6.tar.gz 3391023 BLAKE2B 8dae8c370a905ff8622f1458387eea4cc61e451d827de8a4b61a65aff0517ff2ec714eadcd03e1b683c0940cc98390ce7c2eb451bd25c3ecaeaf21ac1fb2230a SHA512 758a1cbf77eee6222b3490757c58b9a1065b727b65d9bd6332cb41a816b6ab2827924eaca003fb5b818f847f7a00d9ce2f46365969ce946110119872368cc938
+DIST redis-7.2.7.tar.gz 3394075 BLAKE2B 624cc033bbebd660853c42427f4e1430c4dfa8489696438ec7cc775584b65dd7293f4bfb424465daab59a6a8a4b893814beb1ddffe5ef61c567b674e3b52e6c1 SHA512 daac985fe987ae5bf0067288b45767dded259e6872a307ed3ee12a45e58470d24485cadc270cd46ebe1009d312a8d8b799c19b14c8db246839a2a66285001b17
 DIST redis-7.4.1.tar.gz 3529512 BLAKE2B 097c9ff0356a86909898e8defe9394c88bc2de7194477905c12c08cc5ffabd2180ffefd5b17d9454af1b7ef8ab059cbcb61bd42b86ee50d98e73208fa1da796d SHA512 d764b5c3a4a6fb73192b92e92e90abedf46c2dee6e0840326c95b848910186e52f973020563fc89781c144340f652b5d39c997acff7c9d4b751ddc3300140e45
+DIST redis-7.4.2.tar.gz 3533864 BLAKE2B 62fb8a4d46e9f887e86c8e1d590d2315068196c33b9aa3669f29074392931fc254a16e30de065a0fd7de50fd2b434394fbf2889d08479af579588eed17f033a4 SHA512 cdb5e97e56c2666512fb09f51a0d97e1dabefd28a3b4cd91b6301df798f9e77ff8ead60f1a4dd6628ee17634807272fd75f5609be5247505c4a8e062f1dea0b3
diff --git a/dev-db/redis/redis-6.2.17.ebuild b/dev-db/redis/redis-6.2.17.ebuild
new file mode 100644
index 000000000000..239d54943153
--- /dev/null
+++ b/dev-db/redis/redis-6.2.17.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Redis does NOT build with Lua 5.2 or newer at this time:
+#  - 5.3 and 5.4 give:
+# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
+#  - 5.2 fails with:
+# scripting.c:(.text+0x1f9b): undefined reference to `lua_open'
+#    because lua_open became lua_newstate in 5.2
+LUA_COMPAT=( lua5-1 luajit )
+
+# Upstream have deviated too far from vanilla Lua, adding their own APIs
+# like lua_enablereadonlytable, but we still need the eclass and such
+# for bug #841422.
+inherit autotools edo flag-o-matic lua-single multiprocessing systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="A persistent caching system, key-value, and data structures database"
+HOMEPAGE="https://redis.io"
+SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+jemalloc selinux ssl systemd tcmalloc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	${LUA_DEPS}
+	jemalloc? ( >=dev-libs/jemalloc-5.1:= )
+	ssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd:= )
+	tcmalloc? ( dev-util/google-perftools )
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/redis
+	acct-user/redis
+	selinux? ( sec-policy/selinux-redis )
+"
+
+BDEPEND="
+	acct-group/redis
+	acct-user/redis
+	virtual/pkgconfig
+	test? (
+		dev-lang/tcl:0=
+		ssl? ( dev-tcltk/tls )
+	)
+"
+
+REQUIRED_USE="?? ( jemalloc tcmalloc )
+	${LUA_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.1-config.patch
+	"${FILESDIR}"/${PN}-5.0-shared.patch
+	"${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch
+	"${FILESDIR}"/${PN}-sentinel-5.0-config.patch
+)
+
+src_prepare() {
+	default
+
+	# Copy lua modules into build dir
+	#cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
+	#cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
+	# Append cflag for lua_cjson
+	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+	append-cflags "-DENABLE_CJSON_GLOBAL"
+
+	# now we will rewrite present Makefiles
+	local makefiles="" MKF
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i	-e 's:$(CC):@CC@:g' \
+			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+			-e 's: $(DEBUG)::g' \
+			-e 's:$(OBJARCH)::g' \
+			-e 's:ARCH:TARCH:g' \
+			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+			"${MKF}.in" \
+		|| die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
+
+	# Use the correct pkgconfig name for Lua.
+	# The upstream configure script handles luajit specially, and is not
+	# affected by these changes.
+	sed -i	\
+		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
+		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoreconf
+}
+
+src_configure() {
+	econf #$(use_with lua_single_target_luajit luajit)
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	local myconf=""
+
+	if use jemalloc; then
+		myconf+="MALLOC=jemalloc"
+	elif use tcmalloc; then
+		myconf+="MALLOC=tcmalloc"
+	else
+		myconf+="MALLOC=libc"
+	fi
+
+	if use ssl; then
+		myconf+=" BUILD_TLS=yes"
+	fi
+
+	export USE_SYSTEMD=$(usex systemd)
+
+	tc-export AR CC RANLIB
+	emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
+}
+
+src_test() {
+	local runtestargs=(
+		--clients "$(makeopts_jobs)" # see bug #649868
+	)
+
+	if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then
+		ewarn "unit/oom-score-adj test will be skipped." \
+			"It is known to fail with FEATURES usersandbox or -userpriv. See bug #756382."
+
+		# unit/oom-score-adj was introduced in version 6.2.0
+		runtestargs+=( --skipunit unit/oom-score-adj ) # see bug #756382
+	fi
+
+	if use ssl; then
+		edo ./utils/gen-test-certs.sh
+		runtestargs+=( --tls )
+	fi
+
+	edo ./runtest "${runtestargs[@]}"
+}
+
+src_install() {
+	insinto /etc/redis
+	doins redis.conf sentinel.conf
+	use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf
+	fperms 0750 /etc/redis
+	fperms 0644 /etc/redis/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd-r2" redis
+	newinitd "${FILESDIR}/redis.initd-6" redis
+
+	systemd_newunit "${FILESDIR}/redis.service-4" redis.service
+	newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf
+
+	newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel
+	newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}
+
+pkg_postinst() {
+	tmpfiles_process redis.conf
+
+	ewarn "The default redis configuration file location changed to:"
+	ewarn "  /etc/redis/{redis,sentinel}.conf"
+	ewarn "Please apply your changes to the new configuration files."
+}
diff --git a/dev-db/redis/redis-7.2.7.ebuild b/dev-db/redis/redis-7.2.7.ebuild
new file mode 100644
index 000000000000..27296763a284
--- /dev/null
+++ b/dev-db/redis/redis-7.2.7.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# N.B.: It is no clue in porting to Lua eclasses, as upstream have deviated
+# too far from vanilla Lua, adding their own APIs like lua_enablereadonlytable
+
+inherit autotools edo multiprocessing systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="A persistent caching system, key-value, and data structures database"
+HOMEPAGE="
+	https://redis.io
+	https://github.com/redis/redis
+"
+SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD Boost-1.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+jemalloc selinux ssl systemd tcmalloc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	jemalloc? ( >=dev-libs/jemalloc-5.1:= )
+	ssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd:= )
+	tcmalloc? ( dev-util/google-perftools )
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/redis
+	acct-user/redis
+	selinux? ( sec-policy/selinux-redis )
+"
+
+BDEPEND="
+	acct-group/redis
+	acct-user/redis
+	virtual/pkgconfig
+	test? (
+		dev-lang/tcl:0=
+		ssl? ( dev-tcltk/tls )
+	)
+"
+
+REQUIRED_USE="?? ( jemalloc tcmalloc )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.1-config.patch
+	"${FILESDIR}"/${PN}-7.2.0-system-jemalloc.patch
+	"${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch
+	"${FILESDIR}"/${PN}-sentinel-7.2.0-config.patch
+	"${FILESDIR}"/${PN}-7.0.4-no-which.patch
+)
+
+src_prepare() {
+	default
+
+	# Respect user CFLAGS in bundled lua
+	sed -i '/LUA_CFLAGS/s: -O2::g' deps/Makefile || die
+
+	# now we will rewrite present Makefiles
+	local makefiles="" MKF
+	local mysedconf=(
+		-e 's:$(CC):@CC@:g'
+		-e 's:$(CFLAGS):@AM_CFLAGS@:g'
+		-e 's: $(DEBUG)::g'
+
+		-e 's:-Werror ::g'
+		-e 's:-Werror=deprecated-declarations ::g'
+	)
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i "${mysedconf[@]}" "${MKF}.in" || die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-7.0 configure.ac || die
+
+	sed -i \
+		-e "/^AC_INIT/s|, __PV__, |, $PV, |" \
+		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoreconf
+}
+
+src_configure() {
+	econf
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		AR="${AR}"
+		CC="${CC}"
+		RANLIB="${RANLIB}"
+
+		V=1 # verbose
+
+		# OPTIMIZATION defaults to -O3. Let's respect user CFLAGS by setting it
+		# to empty value.
+		OPTIMIZATION=''
+		# Disable debug flags in bundled hiredis
+		DEBUG_FLAGS=''
+
+		BUILD_TLS=$(usex ssl)
+		USE_SYSTEMD=$(usex systemd)
+	)
+
+	if use jemalloc; then
+		myconf+=( MALLOC=jemalloc )
+	elif use tcmalloc; then
+		myconf+=( MALLOC=tcmalloc )
+	else
+		myconf+=( MALLOC=libc )
+	fi
+
+	emake "${myconf[@]}"
+}
+
+src_test() {
+	local runtestargs=(
+		--clients "$(makeopts_jobs)" # see bug #649868
+
+		--skiptest "Active defrag eval scripts" # see bug #851654
+	)
+
+	if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then
+		ewarn "oom-score-adj related tests will be skipped." \
+			"They are known to fail with FEATURES usersandbox or -userpriv. See bug #756382."
+
+		runtestargs+=(
+			# unit/oom-score-adj was introduced in version 6.2.0
+			--skipunit unit/oom-score-adj # see bug #756382
+
+			# Following test was added in version 7.0.0 to unit/introspection.
+			# It also tries to adjust OOM score.
+			--skiptest "CONFIG SET rollback on apply error"
+		)
+	fi
+
+	if use ssl; then
+		edo ./utils/gen-test-certs.sh
+		runtestargs+=( --tls )
+	fi
+
+	edo ./runtest "${runtestargs[@]}"
+}
+
+src_install() {
+	insinto /etc/redis
+	doins redis.conf sentinel.conf
+	use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf
+	fperms 0750 /etc/redis
+	fperms 0644 /etc/redis/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd-r2" redis
+	newinitd "${FILESDIR}/redis.initd-6" redis
+
+	systemd_newunit "${FILESDIR}/redis.service-4" redis.service
+	newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf
+
+	newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel
+	newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodoc 00-RELEASENOTES BUGS CONTRIBUTING.md MANIFESTO README.md
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}
+
+pkg_postinst() {
+	tmpfiles_process redis.conf
+
+	ewarn "The default redis configuration file location changed to:"
+	ewarn "  /etc/redis/{redis,sentinel}.conf"
+	ewarn "Please apply your changes to the new configuration files."
+}
diff --git a/dev-db/redis/redis-7.4.2.ebuild b/dev-db/redis/redis-7.4.2.ebuild
new file mode 100644
index 000000000000..97ac6ba95ff1
--- /dev/null
+++ b/dev-db/redis/redis-7.4.2.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# N.B.: It is no clue in porting to Lua eclasses, as upstream have deviated
+# too far from vanilla Lua, adding their own APIs like lua_enablereadonlytable
+
+inherit autotools edo multiprocessing systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="A persistent caching system, key-value, and data structures database"
+HOMEPAGE="
+	https://redis.io
+	https://github.com/redis/redis
+"
+SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="Boost-1.0 SSPL-1"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+jemalloc selinux ssl systemd tcmalloc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	jemalloc? ( >=dev-libs/jemalloc-5.1:=[stats] )
+	ssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd:= )
+	tcmalloc? ( dev-util/google-perftools )
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/redis
+	acct-user/redis
+	selinux? ( sec-policy/selinux-redis )
+"
+
+BDEPEND="
+	acct-group/redis
+	acct-user/redis
+	virtual/pkgconfig
+	test? (
+		dev-lang/tcl:0=
+		ssl? ( dev-tcltk/tls )
+	)
+"
+
+REQUIRED_USE="?? ( jemalloc tcmalloc )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.1-config.patch
+	"${FILESDIR}"/${PN}-7.2.0-system-jemalloc.patch
+	"${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch
+	"${FILESDIR}"/${PN}-sentinel-7.2.0-config.patch
+	"${FILESDIR}"/${PN}-7.0.4-no-which.patch
+)
+
+src_prepare() {
+	default
+
+	# Respect user CFLAGS in bundled lua
+	sed -i '/LUA_CFLAGS/s: -O2::g' deps/Makefile || die
+
+	# now we will rewrite present Makefiles
+	local makefiles="" MKF
+	local mysedconf=(
+		-e 's:$(CC):@CC@:g'
+		-e 's:$(CFLAGS):@AM_CFLAGS@:g'
+		-e 's: $(DEBUG)::g'
+
+		-e 's:-Werror ::g'
+		-e 's:-Werror=deprecated-declarations ::g'
+	)
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i "${mysedconf[@]}" "${MKF}.in" || die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-7.0 configure.ac || die
+
+	sed -i \
+		-e "/^AC_INIT/s|, __PV__, |, $PV, |" \
+		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoreconf
+}
+
+src_configure() {
+	econf
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		AR="${AR}"
+		CC="${CC}"
+		RANLIB="${RANLIB}"
+
+		V=1 # verbose
+
+		# OPTIMIZATION defaults to -O3. Let's respect user CFLAGS by setting it
+		# to empty value.
+		OPTIMIZATION=''
+		# Disable debug flags in bundled hiredis
+		DEBUG_FLAGS=''
+
+		BUILD_TLS=$(usex ssl)
+		USE_SYSTEMD=$(usex systemd)
+	)
+
+	if use jemalloc; then
+		myconf+=( MALLOC=jemalloc )
+	elif use tcmalloc; then
+		myconf+=( MALLOC=tcmalloc )
+	else
+		myconf+=( MALLOC=libc )
+	fi
+
+	emake "${myconf[@]}"
+}
+
+src_test() {
+	local runtestargs=(
+		--clients "$(makeopts_jobs)" # see bug #649868
+
+		--skiptest "Active defrag eval scripts" # see bug #851654
+	)
+
+	if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then
+		ewarn "oom-score-adj related tests will be skipped." \
+			"They are known to fail with FEATURES usersandbox or -userpriv. See bug #756382."
+
+		runtestargs+=(
+			# unit/oom-score-adj was introduced in version 6.2.0
+			--skipunit unit/oom-score-adj # see bug #756382
+
+			# Following test was added in version 7.0.0 to unit/introspection.
+			# It also tries to adjust OOM score.
+			--skiptest "CONFIG SET rollback on apply error"
+		)
+	fi
+
+	if use ssl; then
+		edo ./utils/gen-test-certs.sh
+		runtestargs+=( --tls )
+	fi
+
+	edo ./runtest "${runtestargs[@]}"
+}
+
+src_install() {
+	insinto /etc/redis
+	doins redis.conf sentinel.conf
+	use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf
+	fperms 0750 /etc/redis
+	fperms 0644 /etc/redis/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd-r2" redis
+	newinitd "${FILESDIR}/redis.initd-6" redis
+
+	systemd_newunit "${FILESDIR}/redis.service-4" redis.service
+	newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf
+
+	newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel
+	newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodoc 00-RELEASENOTES BUGS CONTRIBUTING.md MANIFESTO README.md
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}
+
+pkg_postinst() {
+	tmpfiles_process redis.conf
+}
diff --git a/dev-db/rqlite/Manifest b/dev-db/rqlite/Manifest
index ad8624e910be..3a1a085e0465 100644
--- a/dev-db/rqlite/Manifest
+++ b/dev-db/rqlite/Manifest
@@ -2,3 +2,5 @@ DIST rqlite-8.36.2-deps.tar.xz 4080944 BLAKE2B a3de4bc297a7bb9a842cf08e4571c6173
 DIST rqlite-8.36.2.tar.gz 744888 BLAKE2B 7b4ca9905c6f3b7de3deeadeeaddf69756fa2d044fca9a640d19a47b79975427ccb12ab97d9ec6d0033f62bdd26b17778608296e697f813bc0508f9efaa95c1d SHA512 efd4fc2ab90f339e8ef209e373c5b251bcac61797cc8b5a1784657cb297ac39fb26ef3e96be921953284ff076ff67279cdb93f9fef454149059bf8ae60d73019
 DIST rqlite-8.36.3-deps.tar.xz 4078736 BLAKE2B 7bfd590b33e14431831d1acd5b078030a3e94a845180c1144f48d429e26c0a5d5cf98585868fb5d88c96efd430bc833543f87b6a870d1a63550f728a2b7bec42 SHA512 e723a23392f12baa4fcd399f00417f57e142254511f74df027e9a8246c334ec53391d81e9bb3d9dc3a79304ae0ed45badf7563782f30423b093b976020ee359e
 DIST rqlite-8.36.3.tar.gz 745738 BLAKE2B fe082b63e232d8e18d0fab70d5abb18611ffce520fcdcef78a7fca0608985e7f3b41a9d73a277ed97fab768d8303b0374c81e1e1c8accfab7aa89086f501a7f8 SHA512 a8bb01da799d0026251f0be84472f338c8a2e2c202a758ad451cb2c685aa8664ee4a45887a641aabca59abbf4cd7c5d292e7dcc2ce8687af311cc61daf6914a5
+DIST rqlite-8.36.5-deps.tar.xz 4081984 BLAKE2B a607643062279a256729687b1bbc821b20872453472a864fca26d6c49bff68c6f107965f80d932ef2ff122f11a0bcdd915d3b1cc47ffc5e104c0fb83512c1580 SHA512 b455f3fdc949ec59ff389cedb05468b8a38d1499cd08fd8f138c0c77d43b4fdd40e16194e1808729b4c287721d9a3dae7b8cd008ccb43039c9787d6109d4d2a9
+DIST rqlite-8.36.5.tar.gz 749309 BLAKE2B 43bb5740cb153c6971d9a8dee598078969aa93bcd5d81d06baa8ddd83ab0c28737056d7442689c8907e288bdcb0d34475a6e7db96ca2d45d4b41d6e719a97487 SHA512 07eff0135ca8685fd6d48b13ba991232b515f0eaa9aa61b3f5d4ba6e38252f2430342cdbe89ecc96a09abf36c1f85511fcb08a34c0adf75f7f292c023e3d9927
diff --git a/dev-db/rqlite/rqlite-8.36.5.ebuild b/dev-db/rqlite/rqlite-8.36.5.ebuild
new file mode 100644
index 000000000000..aa2a8696a9ae
--- /dev/null
+++ b/dev-db/rqlite/rqlite-8.36.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+EGIT_COMMIT=5bd095af56c904ea270315f3d0d9b182516db5f0
+
+DESCRIPTION="Replicated SQLite using the Raft consensus protocol"
+HOMEPAGE="https://github.com/rqlite/rqlite https://www.philipotoole.com/tag/rqlite/"
+SRC_URI="https://github.com/rqlite/rqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT"
+LICENSE+=" Apache-2.0 BSD CC0-1.0 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	ln -sv ../vendor ./ || die
+	default
+}
+
+src_compile() {
+	GOBIN="${S}/bin" \
+		ego install \
+			-ldflags="-X main.version=v${PV}
+				-X main.branch=master
+				-X main.commit=${EGIT_COMMIT}
+				-X main.buildtime=$(date +%Y-%m-%dT%T%z)" \
+			./cmd/... || die
+}
+
+src_test() {
+	GOBIN="${S}/bin" \
+		ego test ./... || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r *.md DOC
+}
diff --git a/dev-db/spatialite/Manifest b/dev-db/spatialite/Manifest
index e8acae8fd106..d0a6259ca668 100644
--- a/dev-db/spatialite/Manifest
+++ b/dev-db/spatialite/Manifest
@@ -1,2 +1 @@
-DIST libspatialite-5.0.1.tar.gz 6372753 BLAKE2B 0fe5b37efac134e3796c96ed012b434ce99547037a44df69d3e98c7ac586c1173faa1fe93c4578e7cc0f47a9f1c539710661bad57f8012c3bdabde427221a842 SHA512 c2552994bc30d69d1e80aa274760f048cd384f71e8350a1e48a47cb8222ba71a1554a69c6534eedde9a09dc582c39c089967bcc1c57bf158cc91a3e7b1840ddf
 DIST libspatialite-5.1.0.tar.gz 6517377 BLAKE2B 871e2be82dd1f02de76f0755b6ea7a53797dd9905fe481d6f56dcf8a87278f0a9326a3e0662620cbf6bfe53f932dab199602885c7efcbc5a5e56781a7599d226 SHA512 2745b373e31cea58623224def6090c491b58409803bb71231450dfa2cfdf3aafc3fc6f680585d55d085008f8cf362c3062ae67ffc7d80257775a22eb81ef1e57
diff --git a/dev-db/spatialite/spatialite-5.0.1-r1.ebuild b/dev-db/spatialite/spatialite-5.0.1-r1.ebuild
deleted file mode 100644
index 59c694433372..000000000000
--- a/dev-db/spatialite/spatialite-5.0.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_PN="lib${PN}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A complete Spatial DBMS in a nutshell built upon sqlite"
-HOMEPAGE="https://www.gaia-gis.it/gaia-sins/"
-SRC_URI="https://www.gaia-gis.it/gaia-sins/${MY_PN}-sources/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="+geos iconv +proj test +xls +xml"
-# Further poking required
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-db/sqlite-3.7.5:3[extensions(+)]
-	sys-libs/zlib[minizip]
-	geos? ( >=sci-libs/geos-3.4 )
-	proj? ( sci-libs/proj:= )
-	xls? ( dev-libs/freexl )
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="test? ( iconv )"
-
-src_configure() {
-	# 1) rttopo not yet packaged
-	# 2) gcp disabled for now to preserve MPL licence
-	econf \
-		--disable-rttopo \
-		--disable-gcp \
-		--disable-examples \
-		--disable-static \
-		--enable-epsg \
-		--enable-geocallbacks \
-		$(use_enable geos) \
-		$(use_enable geos geosadvanced) \
-		$(use_enable iconv) \
-		$(use_enable proj) \
-		$(use_enable xls freexl) \
-		$(use_enable xml libxml2)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-db/spatialite/spatialite-5.0.1-r2.ebuild b/dev-db/spatialite/spatialite-5.0.1-r2.ebuild
deleted file mode 100644
index f9cff2e33cca..000000000000
--- a/dev-db/spatialite/spatialite-5.0.1-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit libtool
-
-MY_PN="lib${PN}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A complete Spatial DBMS in a nutshell built upon sqlite"
-HOMEPAGE="https://www.gaia-gis.it/gaia-sins/"
-SRC_URI="https://www.gaia-gis.it/gaia-sins/${MY_PN}-sources/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="+geos iconv +proj rttopo test +xls +xml"
-# Further poking required
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-db/sqlite-3.7.5:3[extensions(+)]
-	sys-libs/zlib[minizip]
-	geos? ( >=sci-libs/geos-3.4 )
-	proj? ( sci-libs/proj:= )
-	xls? ( dev-libs/freexl )
-	xml? ( dev-libs/libxml2 )
-	rttopo? ( sci-geosciences/librttopo )
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="test? ( iconv )"
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-src_configure() {
-	# 1) gcp disabled for now to preserve MPL licence
-	econf \
-		--disable-gcp \
-		--disable-examples \
-		--disable-static \
-		--enable-epsg \
-		--enable-geocallbacks \
-		$(use_enable rttopo) \
-		$(use_enable geos) \
-		$(use_enable geos geosadvanced) \
-		$(use_enable iconv) \
-		$(use_enable proj) \
-		$(use_enable xls freexl) \
-		$(use_enable xml libxml2)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-db/sqlite/sqlite-3.47.2.ebuild b/dev-db/sqlite/sqlite-3.47.2.ebuild
index a5d7c70c508f..ca490c5917e3 100644
--- a/dev-db/sqlite/sqlite-3.47.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.47.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
@@ -24,7 +24,7 @@ else
 	"
 	S="${WORKDIR}/${PN}-src-${SRC_PV}"
 
-	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
 
 LICENSE="public-domain"
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 431993362e98..1b9ca6c3f8d6 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,2 +1 @@
-DIST sqlitebrowser-3.13.0.tar.gz 4901507 BLAKE2B 4430944fb6f02a3e33aa6d3e5720faa8e43351314a0c21803fe8bed6d2241ca92830de7be33deb18294f0cad808c96d6c913bd9ddcd64d41a34db32349d44d88 SHA512 6261043cee7bc5c525b162e0b5d1ac38d380228ffd752e086fecb49c7f50b463a993a6128547d99addb0480ba71e4f6dd3a0c1e412a692ae86b0b183b7379610
 DIST sqlitebrowser-3.13.1.tar.gz 4923092 BLAKE2B 894790cc30b802b4aab19a8e7834aef1bf68b027bcd66b63901269d6d44b706ce5ddca1ae4ca4743d14f9a8d2a5cc6005711b6ee25cef068c55e0b01c56f8b5c SHA512 7482094823293a216e4df20105d1351a23fcc706fd9e64bca58cd1c6a46dcf639a945f919613f1a9550d0a15e60a4c2827ee5eee4f89a7b11046d8eefbf375ee
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.13.0.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.13.0.ebuild
deleted file mode 100644
index 294a79b3f045..000000000000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.13.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="A light GUI editor for SQLite databases"
-HOMEPAGE="https://sqlitebrowser.org/"
-
-if [[ "${PV}" = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/sqlitebrowser/sqlitebrowser.git"
-else
-	SRC_URI="https://github.com/sqlitebrowser/sqlitebrowser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3+ MPL-2.0"
-SLOT="0"
-IUSE="sqlcipher test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-editors/qhexedit2
-	dev-db/sqlite:3
-	dev-libs/double-conversion:=
-	dev-libs/icu:=
-	dev-libs/libpcre2:=
-	dev-libs/openssl:=
-	dev-libs/qcustomplot
-	>=dev-qt/qtconcurrent-5.15.9:5
-	>=dev-qt/qtcore-5.15.9:5
-	>=dev-qt/qtgui-5.15.9:5
-	>=dev-qt/qtnetwork-5.15.9:5[ssl]
-	>=dev-qt/qtprintsupport-5.15.9:5
-	>=dev-qt/qtwidgets-5.15.9:5
-	>=dev-qt/qtxml-5.15.9:5
-	media-gfx/graphite2
-	media-libs/freetype:2
-	media-libs/harfbuzz:=
-	media-libs/libglvnd
-	media-libs/libpng:=
-	sys-libs/zlib:=
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb:=
-	x11-libs/libXdmcp
-	>=x11-libs/qscintilla-2.8.10:=[qt5(+)]
-	sqlcipher? ( dev-db/sqlcipher )
-"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-5.15.9:5
-	test? ( >=dev-qt/qttest-5.15.9:5 )
-"
-
-RDEPEND="${DEPEND}"
-
-DOCS=(
-	images/
-	BUILDING.md
-	CHANGELOG.md
-	README.md
-	SECURITY.md
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use test; then
-		sed -i CMakeLists.txt \
-			-e "/find_package/ s/ Test//" \
-			-e "/set/ s/ Qt5::Test//" \
-			|| die "Cannot remove Qt Test from CMake dependencies"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TESTING=$(usex test)
-		-DFORCE_INTERNAL_QSCINTILLA=OFF
-		-DFORCE_INTERNAL_QCUSTOMPLOT=OFF
-		-DFORCE_INTERNAL_QHEXEDIT=OFF
-		-Dsqlcipher=$(usex sqlcipher)
-	)
-
-	# https://bugs.gentoo.org/855254
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	cmake_src_configure
-}
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild
index f8729348579f..14bd66fc1cf2 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.13.1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/sqlitebrowser/sqlitebrowser.git"
 else
 	SRC_URI="https://github.com/sqlitebrowser/sqlitebrowser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3+ MPL-2.0"
diff --git a/dev-debug/bpftrace/Manifest b/dev-debug/bpftrace/Manifest
index 62c16a37134b..05f6fece327d 100644
--- a/dev-debug/bpftrace/Manifest
+++ b/dev-debug/bpftrace/Manifest
@@ -2,3 +2,7 @@ DIST bpftrace-0.21.2-man.gh.tar.xz 73044 BLAKE2B 3adcd021ae6849933d488ab140cc060
 DIST bpftrace-0.21.2.gh.tar.gz 1299415 BLAKE2B 5a5d00c94c188ea4bc5008a88c9c244b0da4ac6f74c2b7083e13b8da9b0c566efc30fd9c7164f562505a4c72e6def1f2be4e360e3cd4556366e9a0aa3e1d3cf8 SHA512 8c64de94da29030dcde0680be90e3c16a5cd965a0066b1abe3c0740f11a78d70f383bf2e0bbe2fce639eddc7d45cb44508cc8a78743c205d7efa45734151e743
 DIST bpftrace-0.21.3-man.gh.tar.xz 73044 BLAKE2B 3adcd021ae6849933d488ab140cc0608cd9d1aa9df125f180a67bc85965105ae07f645ecf885ce8b6ac3a340c5f73761e0fab14309f3654b52c9deaeacf521fc SHA512 95b05a04dec92a9c24f84a2603436e0c2f5fc7b08aafa69a2cf0843497f9100a7a104f8d3b4e654e5eb0640f272756d8d86ed4563d40ea592edbcad34af2dfa7
 DIST bpftrace-0.21.3.gh.tar.gz 1299643 BLAKE2B 138e767fd074911e643ed7582ed5666736fff6df58162a458d942220594e9e47b5817e999ef91a967c31ae2f84d8dae4499524eba87fa835da0ef539f92b98bd SHA512 8c76b20601f49b08dcbcd947b3da0dcaf59c9e8beb7c56961c7f57bb05aa6130e83b0a664f654978305fa6ceb0507d24a0d446ff1420a1447db5bd52a36fbb75
+DIST bpftrace-0.22.0-man.gh.tar.xz 76028 BLAKE2B ac061b0b380aada39d4cddf442daf1c390d176e81cc5c108033a57e6df83dc08bfb941268b24e8c8fcb8eb45b3c00adffb29966b27897663c1dddd9d554d25a2 SHA512 8e7aa3541b903db4056502d3f2c7b18d80a8212b17b048339d61bcfaddd006599d9e7cfeb65e450487fd15850dd36ed204c00d40dbf476efd2add25863d52ea2
+DIST bpftrace-0.22.0.gh.tar.gz 1125284 BLAKE2B 03e15555e405b2367e96553d975405ab5c25db28aa1685fb05cecd101995ee7b90801baee4a58c462093293c239b8e76dbd0e7a0abbe714a3fa123d30021264e SHA512 fd566191c0d1e2e7e9ebf08c9b983a6db41ab230e2a99bc14b1af5afe2ace3172f8d60bd158d288ac52a254158f8535cd2296d36107d8f2b7149b6045f8f2984
+DIST bpftrace-0.22.1-man.gh.tar.xz 76024 BLAKE2B 8e3764b38b62dac271a941fd224155b72eb32872415734d734e36a77f709ea190639d009280f5bc671ba527981b1a735dd511ad9cb3e3e83869b74303df5b684 SHA512 165486401e985edbffd2c424093c067c5ef2930faadaead6ca26e090650724ea501494de7a6f6e4f55869dafc18ea0b0f3ecb8f434b299beee400a022f21dd31
+DIST bpftrace-0.22.1.gh.tar.gz 1125892 BLAKE2B e694f3da7947458ffc1db755e18dfd6be7664fae5573c04cddbc8db802391e834f241827f2be93a981055b26fb13128f88878d1aa17f50420227c7e8b93bd59d SHA512 3bf00f97750092e66bd94b20b3889f29e932f45ae7f75966f1f364013fb9aeaad837617c0a28402fd9323d62773dd3dab0e9749d8dcb9da9c77093f17fce4d91
diff --git a/dev-debug/bpftrace/bpftrace-0.21.3.ebuild b/dev-debug/bpftrace/bpftrace-0.21.3.ebuild
index 0c97af5ec0f6..960285d197e3 100644
--- a/dev-debug/bpftrace/bpftrace-0.21.3.ebuild
+++ b/dev-debug/bpftrace/bpftrace-0.21.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="lldb test"
 
 # lots of fixing needed
diff --git a/dev-debug/bpftrace/bpftrace-0.22.0.ebuild b/dev-debug/bpftrace/bpftrace-0.22.0.ebuild
new file mode 100644
index 000000000000..ec70ac09d7ec
--- /dev/null
+++ b/dev-debug/bpftrace/bpftrace-0.22.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2019-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..19} )
+
+inherit cmake linux-info llvm-r1
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/bpftrace/bpftrace"
+MY_PV="${PV//_/}"
+# the man page version may trail the release
+#MAN_V="0.22.0"
+SRC_URI="
+	https://github.com/bpftrace/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz
+	https://github.com/bpftrace/${PN}/releases/download/v${MAN_V:-${PV}}/man.tar.xz -> ${PN}-${MAN_V:-${PV}}-man.gh.tar.xz
+"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="lldb pcap test systemd"
+
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/libbpf-1.5:=
+	>=dev-util/bcc-0.25.0:=
+	$(llvm_gen_dep '
+		lldb? ( =llvm-core/lldb-${LLVM_SLOT}* )
+		llvm-core/clang:${LLVM_SLOT}=
+		llvm-core/llvm:${LLVM_SLOT}=[llvm_targets_BPF(+)]
+	')
+	sys-process/procps
+	sys-libs/binutils-libs:=
+	virtual/libelf:=
+	systemd? ( sys-apps/systemd:= )
+	pcap? ( net-libs/libpcap:= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/cereal:=
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	app-arch/xz-utils
+	app-alternatives/lex
+	app-alternatives/yacc
+	test? (
+		app-editors/vim-core
+		dev-util/pahole
+	)
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+	"${FILESDIR}/bpftrace-0.21.0-dont-compress-man.patch"
+	"${FILESDIR}/bpftrace-0.21.3-odr.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="
+		~BPF
+		~BPF_EVENTS
+		~BPF_JIT
+		~BPF_SYSCALL
+		~FTRACE_SYSCALLS
+		~HAVE_EBPF_JIT
+	"
+
+	check_extra_config
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# prevent automagic lldb use
+		$(cmake_use_find_package lldb LLDB)
+		# DO NOT build the internal libs as shared
+		-DBUILD_SHARED_LIBS=OFF
+		# DO dynamically link the bpftrace executable
+		-DSTATIC_LINKING:BOOL=OFF
+		# bug 809362, 754648
+		-DBUILD_TESTING:BOOL=$(usex test)
+		-DBUILD_FUZZ:BOOL=OFF
+		-DENABLE_MAN:BOOL=OFF
+		-DENABLE_SYSTEMD:BOOL=$(usex systemd)
+		-DENABLE_SKB_OUTPUT:BOOL=$(usex pcap)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	doman man/man8/*.?
+	gunzip "${WORKDIR}/man/man8/bpftrace.8.gz" || die
+	doman "${WORKDIR}/man/man8/bpftrace.8"
+}
diff --git a/dev-debug/bpftrace/bpftrace-0.22.1.ebuild b/dev-debug/bpftrace/bpftrace-0.22.1.ebuild
new file mode 100644
index 000000000000..ec70ac09d7ec
--- /dev/null
+++ b/dev-debug/bpftrace/bpftrace-0.22.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2019-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..19} )
+
+inherit cmake linux-info llvm-r1
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/bpftrace/bpftrace"
+MY_PV="${PV//_/}"
+# the man page version may trail the release
+#MAN_V="0.22.0"
+SRC_URI="
+	https://github.com/bpftrace/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz
+	https://github.com/bpftrace/${PN}/releases/download/v${MAN_V:-${PV}}/man.tar.xz -> ${PN}-${MAN_V:-${PV}}-man.gh.tar.xz
+"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="lldb pcap test systemd"
+
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/libbpf-1.5:=
+	>=dev-util/bcc-0.25.0:=
+	$(llvm_gen_dep '
+		lldb? ( =llvm-core/lldb-${LLVM_SLOT}* )
+		llvm-core/clang:${LLVM_SLOT}=
+		llvm-core/llvm:${LLVM_SLOT}=[llvm_targets_BPF(+)]
+	')
+	sys-process/procps
+	sys-libs/binutils-libs:=
+	virtual/libelf:=
+	systemd? ( sys-apps/systemd:= )
+	pcap? ( net-libs/libpcap:= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/cereal:=
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	app-arch/xz-utils
+	app-alternatives/lex
+	app-alternatives/yacc
+	test? (
+		app-editors/vim-core
+		dev-util/pahole
+	)
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+	"${FILESDIR}/bpftrace-0.21.0-dont-compress-man.patch"
+	"${FILESDIR}/bpftrace-0.21.3-odr.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="
+		~BPF
+		~BPF_EVENTS
+		~BPF_JIT
+		~BPF_SYSCALL
+		~FTRACE_SYSCALLS
+		~HAVE_EBPF_JIT
+	"
+
+	check_extra_config
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# prevent automagic lldb use
+		$(cmake_use_find_package lldb LLDB)
+		# DO NOT build the internal libs as shared
+		-DBUILD_SHARED_LIBS=OFF
+		# DO dynamically link the bpftrace executable
+		-DSTATIC_LINKING:BOOL=OFF
+		# bug 809362, 754648
+		-DBUILD_TESTING:BOOL=$(usex test)
+		-DBUILD_FUZZ:BOOL=OFF
+		-DENABLE_MAN:BOOL=OFF
+		-DENABLE_SYSTEMD:BOOL=$(usex systemd)
+		-DENABLE_SKB_OUTPUT:BOOL=$(usex pcap)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	doman man/man8/*.?
+	gunzip "${WORKDIR}/man/man8/bpftrace.8.gz" || die
+	doman "${WORKDIR}/man/man8/bpftrace.8"
+}
diff --git a/dev-debug/bpftrace/metadata.xml b/dev-debug/bpftrace/metadata.xml
index 3c97cc2de533..9e59e7b00694 100644
--- a/dev-debug/bpftrace/metadata.xml
+++ b/dev-debug/bpftrace/metadata.xml
@@ -19,6 +19,7 @@
   </maintainer>
   <use>
     <flag name="lldb">Parse debug info using<pkg>llvm-core/lldb</pkg></flag>
+    <flag name="pcap">Enable skb_output using <pkg>net-libs/libpcap</pkg></flag>
   </use>
   <upstream>
     <remote-id type="github">bpftrace/bpftrace</remote-id>
diff --git a/dev-debug/d-spy/Manifest b/dev-debug/d-spy/Manifest
index ecd9544cef2a..dfea14de8e28 100644
--- a/dev-debug/d-spy/Manifest
+++ b/dev-debug/d-spy/Manifest
@@ -1,2 +1,2 @@
 DIST d-spy-1.10.0.tar.xz 213044 BLAKE2B acb4d99e6f9be8ed86685c9deeb705727ac2b9522e701daa38e7baa84d37a585effda9c871d2cce814fff4dc240c585b6679d95a56b457434d0ce9e721ce3e29 SHA512 89f28ac2cc1799f7ad053da0c3995627c567ec224dc2267aac2fe6a2305d8580712c2ae3b4a86f86547f4bd7ac0462d2c6768bee3049cb449c4b6b00ce216cd6
-DIST d-spy-1.8.0.tar.xz 232944 BLAKE2B cb6f90e9b3d779aa5a76bc93f16e9ae677af029b72451bbb983ffeb06b99a92aa2402ef8b6f6a6c6b4ad4f6ba49a924db37d7e9fc9cb98157a6475a0ec234267 SHA512 49c0ff250a91110014f98453ed6958cf4b5191cc0c8d31c5e63b1408864eaf0906ab3860b0479400a04a8614ee36fe5b9527b179e6346bdb5616cb188d2648f0
+DIST d-spy-47.0.tar.xz 219464 BLAKE2B 4bdb51df9ecb051408ce265a41ccdd3d74afbebb57e09d12a50cd525084b2446a09dd668b4440e5bfae64ca1044b6c331ccc8163100fa026bb1b697bfa5074ed SHA512 da5275691ab29ced7a125bf9411a8bae4388ea6f940c8e4f5a0764e18e9d1909abfe4d5c13e4cbd3405d106929bbbf6ba15f45c509d3396906311f5d453b2df2
diff --git a/dev-debug/d-spy/d-spy-1.8.0.ebuild b/dev-debug/d-spy/d-spy-1.8.0.ebuild
deleted file mode 100644
index c36184bcabce..000000000000
--- a/dev-debug/d-spy/d-spy-1.8.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson xdg
-
-DESCRIPTION="D-spy is a blisteringly fast D-Bus debugger"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/d-spy"
-
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="1"
-KEYWORDS="amd64 ~arm64"
-
-DEPEND="
-	>=dev-libs/glib-2.68:2
-	>=gui-libs/gtk-4.6:4
-	>=gui-libs/libadwaita-1.0:1
-"
-RDEPEND="
-	${DEPEND}
-	>=sys-apps/dbus-1
-"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_install() {
-	meson_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-debug/d-spy/d-spy-47.0.ebuild b/dev-debug/d-spy/d-spy-47.0.ebuild
new file mode 100644
index 000000000000..425b6b73f136
--- /dev/null
+++ b/dev-debug/d-spy/d-spy-47.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson xdg
+
+DESCRIPTION="D-Spy is a simple tool to explore D-Bus connections"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/d-spy"
+
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64"
+
+DEPEND="
+	>=dev-libs/glib-2.76:2
+	>=gui-libs/gtk-4.12:4
+	>=gui-libs/libadwaita-1.4:1
+"
+RDEPEND="
+	${DEPEND}
+	>=sys-apps/dbus-1
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dbuilder=false
+	)
+	meson_src_configure
+}
diff --git a/dev-debug/gdb/Manifest b/dev-debug/gdb/Manifest
index 061ea86e1af6..b71c33b6be91 100644
--- a/dev-debug/gdb/Manifest
+++ b/dev-debug/gdb/Manifest
@@ -1 +1,2 @@
 DIST gdb-15.2.tar.xz 24332820 BLAKE2B 073668c21b41f12bf40160c6d3df808056453cc9df3b5b86374abe38e955d208f86467458b7e64b3c3e93d70b7f87425619778173fdb375256cd85be15419f14 SHA512 624007deceb5b15ba89c0725883d1a699fa46714ef30887f3d0165e17c5d65d634671740a135aa69e437d916218abb08cfa2a38ed309ff19d48f51da56b2a8ba
+DIST gdb-16.1.tar.xz 24427088 BLAKE2B d1907a4abffda663e3d383959ee18e1ef91fe913c378cf9681bdf5810bf7e7f065236f722564fd77eebf15700751fed1cef58c25cd0c0c44d1d9a416809f6a66 SHA512 17b322fde0655a849506851c879aba9ad1f8bfee804b900efc718806091bec75511383bd4d632b8b32a32ef207233331581501157df18a8df528abe6ff667577
diff --git a/dev-debug/gdb/gdb-16.1.ebuild b/dev-debug/gdb/gdb-16.1.ebuild
new file mode 100644
index 000000000000..991cd5491c92
--- /dev/null
+++ b/dev-debug/gdb/gdb-16.1.ebuild
@@ -0,0 +1,354 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# See https://sourceware.org/gdb/wiki/DistroAdvice for general packaging
+# tips & notes.
+
+GUILE_COMPAT=( 2-2 3-0 )
+PYTHON_COMPAT=( python3_{10..13} )
+inherit flag-o-matic guile-single linux-info python-single-r1 strip-linguas toolchain-funcs
+
+export CTARGET=${CTARGET:-${CHOST}}
+
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+case ${PV} in
+	9999*)
+		# live git tree
+		EGIT_REPO_URI="
+			https://sourceware.org/git/binutils-gdb.git
+			https://git.sr.ht/~sourceware/binutils-gdb
+			https://gitlab.com/x86-binutils/binutils-gdb.git
+		"
+		inherit git-r3
+		SRC_URI=""
+		;;
+	*.*.50_p2???????|*.*.90_p2???????)
+		# Weekly snapshots
+		MY_PV="${PV/_p/.}"
+		SRC_URI="
+			https://sourceware.org/pub/gdb/snapshots/branch/gdb-weekly-${MY_PV}.tar.xz
+			https://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${MY_PV}.tar.xz
+			https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/gdb-weekly-${MY_PV}.tar.xz
+		"
+		S="${WORKDIR}/${PN}-${MY_PV}"
+
+		# e.g. 13.1.90_p20230325 is a snapshot on the stable branch, so it's fine
+		if [[ ${PV} == *.[123456789].9?_p2??????? ]] ; then
+			REGULAR_RELEASE=1
+		fi
+		;;
+	*.*.9?)
+		# Prereleases
+		MY_PV="${PV/_p/.}"
+		SRC_URI="
+			https://sourceware.org/pub/gdb/snapshots/branch/gdb-${MY_PV}.tar.xz
+			https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/gdb-${MY_PV}.tar.xz
+		"
+		S="${WORKDIR}/${PN}-${MY_PV}"
+		;;
+	*)
+		# Normal upstream release
+		SRC_URI="
+			mirror://gnu/gdb/${P}.tar.xz
+			https://sourceware.org/pub/gdb/releases/${P}.tar.xz
+		"
+
+		REGULAR_RELEASE=1
+esac
+
+PATCH_DEV=""
+PATCH_VER=""
+DESCRIPTION="GNU debugger"
+HOMEPAGE="https://sourceware.org/gdb/"
+SRC_URI="
+	${SRC_URI}
+	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${P}-patches-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
+"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="cet debuginfod guile lzma multitarget nls +python rocm +server sim source-highlight test vanilla xml xxhash zstd"
+if [[ -n ${REGULAR_RELEASE} ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+fi
+REQUIRED_USE="
+	guile? ( ${GUILE_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rocm? ( multitarget )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/mpfr:=
+	dev-libs/gmp:=
+	>=sys-libs/ncurses-5.2-r2:=
+	>=sys-libs/readline-7:=
+	sys-libs/zlib
+	elibc_glibc? ( net-libs/libnsl:= )
+	debuginfod? (
+		dev-libs/elfutils[debuginfod(-)]
+	)
+	lzma? ( app-arch/xz-utils )
+	python? ( ${PYTHON_DEPS} )
+	guile? ( ${GUILE_DEPS} )
+	xml? ( dev-libs/expat )
+	rocm? ( dev-libs/rocdbgapi )
+	source-highlight? (
+		dev-util/source-highlight
+	)
+	xxhash? (
+		dev-libs/xxhash
+	)
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-apps/texinfo
+	app-alternatives/yacc
+	nls? ( sys-devel/gettext )
+	source-highlight? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	MIN # gnulib FP (bug #898688)
+)
+
+QA_PREBUILT="usr/share/gdb/guile/*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
+)
+
+pkg_setup() {
+	local CONFIG_CHECK
+
+	if kernel_is -ge 6.11.3 ; then
+		# https://forums.gentoo.org/viewtopic-p-8846891.html
+		#
+		# Either CONFIG_PROC_MEM_ALWAYS_FORCE or CONFIG_PROC_MEM_FORCE_PTRACE
+		# should be okay, but not CONFIG_PROC_MEM_NO_FORCE.
+		CONFIG_CHECK+="
+			~!PROC_MEM_NO_FORCE
+		"
+	fi
+
+	linux-info_pkg_setup
+
+	use guile && guile-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	use guile && guile_bump_sources
+
+	strip-linguas -u bfd/po opcodes/po
+
+	# Avoid using ancient termcap from host on Prefix systems
+	sed -i -e 's/termcap tinfow/tinfow/g' \
+		gdb/configure{.ac,} || die
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# code relies on C++11, so make sure we get that selected
+		# due to Python 3.11 pymacro.h doing stuff to work around
+		# versioning mess based on the C version, while we're compiling
+		# C++ here, so we need to make it clear we're doing C++11/C11
+		# because Solaris system headers act on these
+		sed -i -e 's/-x c++/-std=c++11/' gdb/Makefile.in || die
+	fi
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+
+	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	local myconf=(
+		# portage's econf() does not detect presence of --d-d-t
+		# because it greps only top-level ./configure. But not
+		# libiberty's or gdb's configure.
+		--disable-dependency-tracking
+		--disable-silent-rules
+
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='https://bugs.gentoo.org/'
+		--disable-werror
+		# Disable modules that are in a combined binutils/gdb tree. bug #490566
+		--disable-{binutils,etc,gas,gold,gprof,gprofng,ld}
+
+		$(use_with debuginfod)
+
+		$(use_enable test unit-tests)
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+
+		# Helps when cross-compiling. Not to be confused with --with-sysroot.
+		--with-build-sysroot="${ESYSROOT}"
+	)
+
+	is_cross && myconf+=(
+		--with-sysroot="\${prefix}/${CTARGET}"
+		--includedir="\${prefix}/include/${CTARGET}"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
+	)
+
+	# gdbserver only works for native targets (CHOST==CTARGET).
+	# it also doesn't support all targets, so rather than duplicate
+	# the target list (which changes between versions), use the
+	# "auto" value when things are turned on, which is triggered
+	# whenever no --enable or --disable is given
+	if is_cross || use !server ; then
+		myconf+=( --disable-gdbserver )
+	fi
+
+	myconf+=(
+		--enable-64-bit-bfd
+		--disable-install-libbfd
+		--disable-install-libiberty
+		--enable-obsolete
+		# This only disables building in the readline subdir.
+		# For gdb itself, it'll use the system version.
+		--disable-readline
+		--with-system-readline
+		# This only disables building in the zlib subdir.
+		# For gdb itself, it'll use the system version.
+		--without-zlib
+		--with-system-zlib
+		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+		--with-amd-dbgapi=$(usex rocm)
+		$(use_with xml expat)
+		$(use_with lzma)
+		$(use_enable nls)
+		$(use_enable sim)
+		$(use_enable source-highlight)
+		$(use multitarget && echo --enable-targets=all)
+		$(use_with python python "${EPYTHON}")
+		$(use_with xxhash)
+		$(use_with guile)
+		$(use_with zstd)
+
+		# Find libraries using the toolchain sysroot rather than the configured
+		# prefix. Needed when cross-compiling.
+		#
+		# Check which libraries to apply this to with:
+		# "${S}"/gdb/configure --help | grep without-lib | sort
+		--without-lib{babeltrace,expat,gmp,iconv,ipt,lzma,mpfr,xxhash}-prefix
+	)
+
+	# source-highlight is detected with pkg-config: bug #716558
+	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+	# ensure proper compiler is detected for Clang builds: bug #831202
+	export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# Run the unittests (nabbed invocation from Fedora's spec file) at least
+	emake -k -C gdb run GDBFLAGS='-batch -ex "maintenance selftest"'
+
+	# Too many failures
+	# In fact, gdb's test suite needs some work to get passing.
+	# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
+	# As of 11.2, on amd64: "# of unexpected failures    8600"
+	# Also, ia64 kernel crashes when gdb testsuite is running.
+	#emake -k check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	find "${ED}"/usr -name libiberty.a -delete || die
+
+	# Delete translations that conflict with binutils-libs. bug #528088
+	# Note: Should figure out how to store these in an internal gdb dir.
+	if use nls ; then
+		find "${ED}" \
+			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
+			-delete || die
+	fi
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
+		return 0
+	fi
+
+	# Install it by hand for now:
+	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
+
+	docinto gdb
+	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+		gdb/NEWS gdb/PROBLEMS
+	docinto sim
+	dodoc sim/{MAINTAINERS,README-HACKING}
+
+	if use server ; then
+		docinto gdbserver
+		dodoc gdbserver/README
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info*
+
+	use guile && guile_unstrip_ccache
+
+	if use python ; then
+		python_optimize "${ED}"/usr/share/gdb/python/gdb
+	fi
+}
+
+pkg_postinst() {
+	# Portage doesn't unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/dev-debug/gfxreconstruct/Manifest b/dev-debug/gfxreconstruct/Manifest
new file mode 100644
index 000000000000..e4409f0a5268
--- /dev/null
+++ b/dev-debug/gfxreconstruct/Manifest
@@ -0,0 +1,4 @@
+DIST SPIRV-Reflect-1.3.296.0.tar.gz 306294 BLAKE2B d87677fc67dc55cf10e55f4286300fea5664e870c4d3365246f407514ec682087399c9a06aaa81a88a2f57f6b198de7265ee17dd88215e16e71bb90d32468a4e SHA512 770d46172fed140816dcecc3155bce62ce319f5cbe99bb58e81994e07aed14ebc8f65675c6e47dde2148e2706603ba470f364ab41bcbfbc05c69e25be7c5a898
+DIST SPIRV-Reflect-1.4.304.0.tar.gz 307488 BLAKE2B f2268287c6ca70dc8e51898b541bea51dad406715de0e3c8c9467c964f48085332d274ce3086824a6c13369f37c79467930d425ae958eecbaa1fb5cf1514243a SHA512 19eade2f661e3bd58665167265dc79e3c94690910d28089ac1d1acfb1771e010a75a23b85555dd494020d0e9584d68f2a97f33ab2f8271f90ea2295bcc484150
+DIST gfxreconstruct-1.3.296.0.tar.gz 41585326 BLAKE2B 0b89b4e3be47adbdda45a0e7f14a2176d1ba79980f0c0998c318d1f62c1d4792ddf0db64c125016d531163d8af08d470b9973fc7477ed2a3c05639fe1f1ead2c SHA512 911d2914bbbed24451c1950ac49213cb056db663a6d00557135aec1301ee179ff9c7883b6074db8227cd59100949656e15e53f6b8513cb5d25af4a1fa2ea1f99
+DIST gfxreconstruct-1.4.304.0.tar.gz 40390002 BLAKE2B 5e99d6685648617c8ef35a0f9199f5ef75aa8b670e0a4e2a75c8dae68620ab39ca7fcc9c3804b1f30f196d71b1b4aa061c9dc0532004dfec0598c25206868d41 SHA512 5a08e8565218119c980f6511dc9dc26660f5eb86307d47feeb220efb9ec817827b02d2da10da68b5beaf71f7ce2d56b381201d98be220229fa6a22a2b6560441
diff --git a/dev-debug/gfxreconstruct/files/1.3.296.0-use-system-vulkan.patch b/dev-debug/gfxreconstruct/files/1.3.296.0-use-system-vulkan.patch
new file mode 100644
index 000000000000..27e0fe65e200
--- /dev/null
+++ b/dev-debug/gfxreconstruct/files/1.3.296.0-use-system-vulkan.patch
@@ -0,0 +1,27 @@
+Author: Dylan AĂŻssi <daissi@debian.org>
+Description: Use system Vulkan Headers instead of embedded ones.
+Last-Update: 2021-06-04
+Forwarded: not-needed
+
+--- a/cmake/FindVulkanVersion.cmake
++++ b/cmake/FindVulkanVersion.cmake
+@@ -9,8 +9,7 @@
+ find_file (VULKAN_HEADER
+             vulkan_core.h
+             HINTS
+-                external/Vulkan-Headers/include/vulkan
+-                ../external/Vulkan-Headers/include/vulkan)
++                /usr/include/vulkan/)
+ 
+ MESSAGE(STATUS "Vulkan Header = ${VULKAN_HEADER}")
+ 
+@@ -20,8 +19,7 @@
+     find_file(VULKAN_HEADER
+                 vulkan.h
+                 HINTS
+-                    external/Vulkan-Headers/include/vulkan
+-                    ../external/Vulkan-Headers/include/vulkan)
++                    /usr/include/vulkan/)
+     set(VulkanHeaders_main_header ${VULKAN_HEADER})
+ endif()
+ 
diff --git a/dev-debug/gfxreconstruct/files/1.4.304.0-fix-build.patch b/dev-debug/gfxreconstruct/files/1.4.304.0-fix-build.patch
new file mode 100644
index 000000000000..296609ec5982
--- /dev/null
+++ b/dev-debug/gfxreconstruct/files/1.4.304.0-fix-build.patch
@@ -0,0 +1,33 @@
+From 60d2ac8fe2a2cbabbb53bda679e3a5a0fa3363a3 Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <sarnex@gentoo.org>
+Date: Sun, 19 Jan 2025 04:17:16 +0900
+Subject: [PATCH] Fix build with spirv-headers-1.4.304
+
+---
+ framework/util/spirv_helper.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/framework/util/spirv_helper.h b/framework/util/spirv_helper.h
+index 062fbbc5..e31ab7c4 100644
+--- a/framework/util/spirv_helper.h
++++ b/framework/util/spirv_helper.h
+@@ -1402,12 +1402,12 @@ const char* string_SpvOpcode(uint32_t opcode)
+             return "OpFragmentFetchAMD";
+         case spv::OpReadClockKHR:
+             return "OpReadClockKHR";
+-        case spv::OpFinalizeNodePayloadsAMDX:
+-            return "OpFinalizeNodePayloadsAMDX";
++        case spv::OpEnqueueNodePayloadsAMDX:
++            return "OpEnqueueNodePayloadsAMDX";
+         case spv::OpFinishWritingNodePayloadAMDX:
+             return "OpFinishWritingNodePayloadAMDX";
+-        case spv::OpInitializeNodePayloadsAMDX:
+-            return "OpInitializeNodePayloadsAMDX";
++        case spv::OpAllocateNodePayloadsAMDX:
++            return "OpAllocateNodePayloadsAMDX";
+         case spv::OpGroupNonUniformQuadAllKHR:
+             return "OpGroupNonUniformQuadAllKHR";
+         case spv::OpGroupNonUniformQuadAnyKHR:
+-- 
+2.45.2
+
diff --git a/dev-debug/gfxreconstruct/gfxreconstruct-1.3.296.0.ebuild b/dev-debug/gfxreconstruct/gfxreconstruct-1.3.296.0.ebuild
new file mode 100644
index 000000000000..89faea5c0da3
--- /dev/null
+++ b/dev-debug/gfxreconstruct/gfxreconstruct-1.3.296.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/LunarG/gfxreconstruct.git"
+	EGIT_SUBMODULES=( external/{Vulkan-Headers,SPIRV-Headers,SPIRV-Reflect} )
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/LunarG/${PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Reflect/archive/vulkan-sdk-${PV}.tar.gz -> SPIRV-Reflect-${PV}.tar.gz
+	"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}"/${PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Graphics API Capture and Replay Tools"
+HOMEPAGE="https://github.com/LunarG/gfxreconstruct"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="wayland X"
+
+RDEPEND="
+	app-arch/lz4:=
+	app-arch/zstd:=
+	sys-libs/zlib:=
+
+	media-libs/vulkan-loader[wayland?,X?]
+	wayland? ( dev-libs/wayland )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-libs/libXrandr )
+"
+if [[ ${PV} != 9999* ]]; then
+	DEPEND+="
+		~dev-util/spirv-headers-${PV}
+		~dev-util/vulkan-headers-${PV}
+	"
+	PATCHES=(
+		"${FILESDIR}"/1.3.296.0-use-system-vulkan.patch
+	)
+fi
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		rmdir "${S}"/external/SPIRV-Reflect || die
+		mv "${WORKDIR}"/SPIRV-Reflect-vulkan-sdk-${PV} "${S}"/external/SPIRV-Reflect || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_WERROR=OFF
+		-DBUILD_WSI_DISPLAY_SUPPORT=ON
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+	)
+	cmake_src_configure
+}
diff --git a/dev-debug/gfxreconstruct/gfxreconstruct-1.4.304.0.ebuild b/dev-debug/gfxreconstruct/gfxreconstruct-1.4.304.0.ebuild
new file mode 100644
index 000000000000..50b18f8b85b7
--- /dev/null
+++ b/dev-debug/gfxreconstruct/gfxreconstruct-1.4.304.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/LunarG/gfxreconstruct.git"
+	EGIT_SUBMODULES=( external/{Vulkan-Headers,SPIRV-Headers,SPIRV-Reflect} )
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/LunarG/${PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Reflect/archive/vulkan-sdk-${PV}.tar.gz -> SPIRV-Reflect-${PV}.tar.gz
+	"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}"/${PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Graphics API Capture and Replay Tools"
+HOMEPAGE="https://github.com/LunarG/gfxreconstruct"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="wayland X"
+
+RDEPEND="
+	app-arch/lz4:=
+	app-arch/zstd:=
+	sys-libs/zlib:=
+
+	media-libs/vulkan-loader[wayland?,X?]
+	wayland? ( dev-libs/wayland )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-libs/libXrandr )
+"
+if [[ ${PV} != 9999* ]]; then
+	DEPEND+="
+		~dev-util/spirv-headers-${PV}
+		~dev-util/vulkan-headers-${PV}
+	"
+	PATCHES=(
+		"${FILESDIR}"/1.3.296.0-use-system-vulkan.patch
+		"${FILESDIR}"/1.4.304.0-fix-build.patch
+	)
+fi
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		rmdir "${S}"/external/SPIRV-Reflect || die
+		mv "${WORKDIR}"/SPIRV-Reflect-vulkan-sdk-${PV} "${S}"/external/SPIRV-Reflect || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_WERROR=OFF
+		-DBUILD_WSI_DISPLAY_SUPPORT=ON
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+	)
+	cmake_src_configure
+}
diff --git a/dev-debug/gfxreconstruct/gfxreconstruct-9999.ebuild b/dev-debug/gfxreconstruct/gfxreconstruct-9999.ebuild
new file mode 100644
index 000000000000..50b18f8b85b7
--- /dev/null
+++ b/dev-debug/gfxreconstruct/gfxreconstruct-9999.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/LunarG/gfxreconstruct.git"
+	EGIT_SUBMODULES=( external/{Vulkan-Headers,SPIRV-Headers,SPIRV-Reflect} )
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/LunarG/${PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Reflect/archive/vulkan-sdk-${PV}.tar.gz -> SPIRV-Reflect-${PV}.tar.gz
+	"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}"/${PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Graphics API Capture and Replay Tools"
+HOMEPAGE="https://github.com/LunarG/gfxreconstruct"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="wayland X"
+
+RDEPEND="
+	app-arch/lz4:=
+	app-arch/zstd:=
+	sys-libs/zlib:=
+
+	media-libs/vulkan-loader[wayland?,X?]
+	wayland? ( dev-libs/wayland )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-libs/libXrandr )
+"
+if [[ ${PV} != 9999* ]]; then
+	DEPEND+="
+		~dev-util/spirv-headers-${PV}
+		~dev-util/vulkan-headers-${PV}
+	"
+	PATCHES=(
+		"${FILESDIR}"/1.3.296.0-use-system-vulkan.patch
+		"${FILESDIR}"/1.4.304.0-fix-build.patch
+	)
+fi
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		rmdir "${S}"/external/SPIRV-Reflect || die
+		mv "${WORKDIR}"/SPIRV-Reflect-vulkan-sdk-${PV} "${S}"/external/SPIRV-Reflect || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_WERROR=OFF
+		-DBUILD_WSI_DISPLAY_SUPPORT=ON
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+	)
+	cmake_src_configure
+}
diff --git a/dev-debug/gfxreconstruct/metadata.xml b/dev-debug/gfxreconstruct/metadata.xml
new file mode 100644
index 000000000000..9b533f1ce767
--- /dev/null
+++ b/dev-debug/gfxreconstruct/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="project">
+		<email>vulkan@gentoo.org</email>
+		<name>Vulkan Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">LunarG/gfxreconstruct</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-debug/scap-driver/scap-driver-0.19.0.ebuild b/dev-debug/scap-driver/scap-driver-0.19.0.ebuild
index 7ae508a24631..8651a29ab1a5 100644
--- a/dev-debug/scap-driver/scap-driver-0.19.0.ebuild
+++ b/dev-debug/scap-driver/scap-driver-0.19.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
@@ -12,7 +12,7 @@ S="${WORKDIR}/libs-${PV}"
 
 LICENSE="Apache-2.0 GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
 
diff --git a/dev-debug/strace/strace-6.12.ebuild b/dev-debug/strace/strace-6.12.ebuild
index 3b7b64121199..75849b6af2fb 100644
--- a/dev-debug/strace/strace-6.12.ebuild
+++ b/dev-debug/strace/strace-6.12.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
@@ -16,7 +16,7 @@ else
 		https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz
 		verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz.asc )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/strace.asc
diff --git a/dev-debug/strace/strace-6.9.ebuild b/dev-debug/strace/strace-6.9.ebuild
index f6f02d671260..b1c0ddf9a697 100644
--- a/dev-debug/strace/strace-6.9.ebuild
+++ b/dev-debug/strace/strace-6.9.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
@@ -16,7 +16,7 @@ else
 		https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz
 		verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz.asc )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/strace.asc
diff --git a/dev-debug/sysdig/sysdig-0.39.0-r1.ebuild b/dev-debug/sysdig/sysdig-0.39.0-r1.ebuild
index af5c6dd314c8..8eee2040822c 100644
--- a/dev-debug/sysdig/sysdig-0.39.0-r1.ebuild
+++ b/dev-debug/sysdig/sysdig-0.39.0-r1.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
@@ -26,7 +26,7 @@ DRIVER_VERSION="7.3.0+driver"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="bpf +modules"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.107-r2.ebuild b/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.107-r2.ebuild
index e275af4d57a6..6cb26506cedd 100644
--- a/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.107-r2.ebuild
+++ b/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.107-r2.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
 
 # Pre-build (and distribution preparation)
@@ -15,7 +15,7 @@
 # Build ("src_compile")
 # To learn about arguments that are passed to the "build.sh" script see:
 # https://github.com/dotnet/source-build/discussions/4082
-# User variable: GENTOO_DOTNET_BUILD_VERBOSITY - set other verbosity log level.
+# User variable: DOTNET_VERBOSITY - set other verbosity log level.
 
 EAPI=8
 
@@ -199,7 +199,7 @@ src_compile() {
 
 	# The "source_repository" should always be the same.
 	local source_repository="https://github.com/dotnet/dotnet"
-	local verbosity="${GENTOO_DOTNET_BUILD_VERBOSITY:-minimal}"
+	local verbosity="${DOTNET_VERBOSITY:-minimal}"
 
 	ebegin "Building the .NET SDK ${SDK_SLOT}"
 	local -a buildopts=(
diff --git a/dev-dotnet/dotnet-sdk/dotnet-sdk-9.0.101.ebuild b/dev-dotnet/dotnet-sdk/dotnet-sdk-9.0.101.ebuild
index d5bce67a8124..5067599f96d7 100644
--- a/dev-dotnet/dotnet-sdk/dotnet-sdk-9.0.101.ebuild
+++ b/dev-dotnet/dotnet-sdk/dotnet-sdk-9.0.101.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
 
 # Pre-build (and distribution preparation)
@@ -15,7 +15,7 @@
 # Build ("src_compile")
 # To learn about arguments that are passed to the "build.sh" script see:
 # https://github.com/dotnet/source-build/discussions/4082
-# User variable: GENTOO_DOTNET_BUILD_VERBOSITY - set other verbosity log level.
+# User variable: DOTNET_VERBOSITY - set other verbosity log level.
 
 EAPI=8
 
@@ -245,7 +245,7 @@ src_compile() {
 
 	# The "source_repository" should always be the same.
 	local source_repository="https://github.com/dotnet/dotnet"
-	local verbosity="${GENTOO_DOTNET_BUILD_VERBOSITY:-minimal}"
+	local verbosity="${DOTNET_VERBOSITY:-minimal}"
 
 	ebegin "Building the .NET SDK ${SDK_SLOT}"
 	local -a buildopts=(
diff --git a/dev-dotnet/fable/Manifest b/dev-dotnet/fable/Manifest
index 3156d44e5002..49a065ef320a 100644
--- a/dev-dotnet/fable/Manifest
+++ b/dev-dotnet/fable/Manifest
@@ -5,6 +5,7 @@ DIST buildalyzer.logger.5.0.1.nupkg 52516 BLAKE2B b5074c9b55f9725a0d01e8ed8e1573
 DIST eluciusftw.spectrecoff.0.47.28.nupkg 166228 BLAKE2B 31ceb47b7f07bea7209e4391999fd1861a5190e918b21ed73504d53ffdf191cf04885328992050cae4dad754a52db2038aad6703219f8750549adc8b027eed42 SHA512 545d0c1261e17cfb5e68e4b854ff56a5e8e83d70ec6760f90d397b440094b3c8c31735cd415231b362dd33352ca54f0ad2d42ff2cc0fb3f4bb430976cee3ec76
 DIST expecto.10.1.0.nupkg 373200 BLAKE2B c532c91f49625fe7edf2550194f5f3ae34b0f3c246242418ad43fe346a4cdf22e38a38bb7b3f0f981f4ea8e668a7f63f4f7e337411dd339426a5372be7b9c795 SHA512 cac251c942624de51d8fa2b521fdbbc89122db9ca3a0f433bec773ac2265cb0fae077690170887282570a79e470ab94fc515db0b24e64e0fc11713aa27c8a2e4
 DIST fable-4.20.0.tar.gz 16402998 BLAKE2B f308eed51e8116e7fc06249af24ac4b377592051a591292f9a9343374e041bc542ca85904f710a55a3dfeaa9dbd876d99a345debbeb8a933a2bfd7ad97ac5646 SHA512 4e350d0f90ee630f2a853c875bebad10a3b3e73616b1c06ac7544aec47c2ab472f4ecf0f27947bab7feb992342d05474842c38e48efd0203390d118e5069e997
+DIST fable-4.24.0.tar.gz 16422991 BLAKE2B 7b7b6f7e0e7c5cc310f232f6361c88ce301cb497ff976b80b9489f73409868f8574dd0dd3008df7b31b3f8f19cd2f5c5cbe7fc58d24858d4c31981ef2e8cc2a6 SHA512 19357bdd91efa27f5f72d197c2a3f7a1a03556c4678a844794242d6ee03e117b405c136ac5b3531938cdcf1f6ae30df37aed20292ab3964ba3e024387ac7d9a7
 DIST fable.ast.4.0.0.nupkg 284338 BLAKE2B df49779c1736b318027e1e66d05811490e1547ec3a733cb9ab70777f405b4eb331db86bf26b132ed4755cc32edc10cea3f98accb6931d02dc69e8e90097c705b SHA512 3d22ffdcfb766e42c752f6a6577d3329bd109537e9b6393e6efd320c5de68e933f1e9bdd447958ea954b2ce9b948656bcd9244f059b3738a5d986790981b7f7c
 DIST fable.browser.blob.1.1.4.nupkg 178971 BLAKE2B be393c5adeeac208d0802c366d52feb7189d464ef1c080202789775c7203ef184bc9d45b960bda602a92d3084d5fe1cbc90013286d8a7ac4cb9de58c2f1ba758 SHA512 264ae090c8d8c4a1fb610e4a8fa461c9799bdfe193ec9604d5aaa0f674c9c30c29f45a7bf8a42d3ac2d0710d68b46bd582759a125f78f1e5acdb6f1ee5553710
 DIST fable.browser.dom.2.4.4.nupkg 363007 BLAKE2B 97c84959e7e14070361b3fe1d6f90b6e06bcba5d7ce439eecbba997027352318143fcfdf7e83dc5fe6e5e19de5f3eae32a5e141f64bf49ef27fcd46dca718d71 SHA512 f82a9d80eb6d9a6c5d7fe79848dd922fb2f314448e004d33c9e3aa244b8bcaa44765bddb548e3842c8f2fee64aeb9dd303ecf08ec25fb685b9f44b2c6795522e
@@ -144,6 +145,7 @@ DIST system.collections.4.3.0.nupkg 810001 BLAKE2B 0079d5834bb3857c002cc68631364
 DIST system.collections.immutable.5.0.0.nupkg 623075 BLAKE2B 14724fcb8654455184f8f16f8ac56b7b3c995e632af36e91f307331620b4e9f515a13bc4625d898fbb4b57ff9f017b43cb91ab40b0cebcd7d5eefe32979afa4a SHA512 726f8db7d179714cf0efeb0fc02fcebe7b4755762902e391e77cf78671dd5d5f364c7cf4ce3545b51cc7f37327d12d1500ba19f4b934f0e8bb69a6a347c0bbfd
 DIST system.collections.immutable.8.0.0.nupkg 787241 BLAKE2B c46f56d995ac2cb0e4eb7b6bd2b62e80f522af8b7c1e59e4b52dbd9aa3113f3653913c9aa77c9d72655588807dbc6d17322833c768d8b8626ad231f49fba09f8 SHA512 057a9591c22b8629afbde9baab60a15a4b96e976188abbdbe85961beec1a32806a05da5caf89de84904a3fae53c38d14a9c50cea80e8383b1e70cd328d9e8053
 DIST system.diagnostics.debug.4.0.11.nupkg 149779 BLAKE2B 337beed5f06441a09fb704ffdcc3c277e2f99d7b4931e86419e4d4d0925ad44c86276aae0ee1e29f94ecd37257953731e9607bd00de716d3195dc994dbe189c2 SHA512 02f4d0bf969eb1a876def21c1ffd75f8ed5f979aed9a1169f409e60a6e07016854e2154da5c0164fabaeaf6527a18d8e67282db1b69327a1b3581e9c0c742f58
+DIST system.diagnostics.debug.4.3.0.nupkg 149774 BLAKE2B bdb6d5ee3b8ca4f28b241b098281b7d2957d0996f9345aa086a54b1a981822962e5cc319687849ee52445db47b439b6cd4e99a4c71595f6227f78160aa31724b SHA512 6c58fe1e3618e7f87684c1cea7efc7d3b19bd7df8d2535f9e27b62c52f441f11b67b21225d6bcd62f409e02c2a16231c4db19be33b8fab5b9b0a5c8660ddab24
 DIST system.diagnostics.diagnosticsource.8.0.0.nupkg 516197 BLAKE2B 58ac0227689ab648e6cc9f01a63bb163a3f8c19a9d69fa534cab3045fbdec895dedf9b33d35641457eae96fe9304f1b96ae75a02c83783c991fc6968fc4604a4 SHA512 86e32c62e9773dba192a63bff0e2ffcd57826ed1123c9261fa8c9229f9d1dc26962b3740fb025f6ad5c139162575a6c493b213a9ef3fc1747d15ca0edd0c5878
 DIST system.diagnostics.tools.4.0.1.nupkg 67228 BLAKE2B b2b74a8c3164181513c960e79bb2cfd9673af3d864c681d379051361743459ee0604806c09e9154913d016963f20a59aa8b45b4b3c30275709878405085ca690 SHA512 a812ccbbdd0a66eb57075121ea6332a526803ef883ca9f8b06431d6668ad50efd13624fa87dfaf6aed03c652f795c2ffb9fa9d9895a2fafa96eca614cbf86cdb
 DIST system.diagnostics.tracing.4.3.0.nupkg 581864 BLAKE2B e09e616dff7879932b358746a62b530499aa61726c4490c56d2d7a0bf888db5b42d75d89cc5befc9fdb6af231beff998b6b243c2b2a08084da089709e0c82a75 SHA512 d0a5d30e261cd45b7dfab02b7ffbd76b64e0c9b892ed826ea61481c983c0208b05b69981cd79e91cd4e5811e1cd4c3cea06a1afce05811ece58be5e4c20169ea
@@ -155,6 +157,7 @@ DIST system.io.4.1.0.nupkg 703645 BLAKE2B b0df16bf1368571d6755f88cc8fcce330d1dd5
 DIST system.io.4.3.0.nupkg 703652 BLAKE2B b5b2627ace4cc49f35a0caf5c064c4c8262ff0fe3df79bb1bd3529b3e306c8b1e77ea9e5948de343ee786a50e12be822ca89b5ea3f16347b9c0bce6bd8071127 SHA512 bfca5a21e3e1986b9765b13dc6fbcd6f8b89e4c1383855d1d7ef256bf1bf2f51889769db5365859dd7606fbf6454add4daeb3bab56994ffb98fd1d03fe8bc1e6
 DIST system.io.filesystem.4.0.1.nupkg 274255 BLAKE2B e5beb1350bea00cf6d533de221129bc3bb799f4e041b23e45304ea39000d9b70cc63fafcbd302046793bac360d431e3dde5c432fb19b0e1af7a1e1bf8e9fb0d1 SHA512 a6478b17f5d52fc5b9517458e93e1a69b92575c170f44046b3f4e25c7e67c9d4126ab486f5a3c51abcb279d05a057bd53aa8f49a1e51eae69563ae39214b72d3
 DIST system.io.filesystem.primitives.4.0.1.nupkg 94921 BLAKE2B 32311ebb93e758016ba0971c99f5010080597b630bd6b1aacef03e39d7693c66b7d2531a6af05c7b14cd2dad34b1cd485aa19d77ccbe53e512c4e021e3291f9a SHA512 dce1c4074938391ea4ea01226812982a893bfc910e66ac99ecfe31c9b6fe635f3fbff11dcab222ed5036eb21c4f49cd3f121c310adbf87d22cf3d512bf6a9d73
+DIST system.io.filesystem.primitives.4.3.0.nupkg 94996 BLAKE2B 95fa6178164a7cc6a29c5a3fc55e415419c433b3b74abbcfa4fa5ae1bef40141b9515076b6869e8ed771b0ba6800bdb2fe6fa5d1f773ce52c40753efc0a82be9 SHA512 5885953d09582cffd973d23a21a929064d72f2bc9518af3732d671fffcc628a8b686f1d058a001ee6a114023b3e48b3fc0d0e4b22629a1c7f715e03795ee9ee5
 DIST system.linq.4.1.0.nupkg 511874 BLAKE2B 3f5941e6fdc731ab7acb58aaad0340695ba2c1ad285ee5eefd9c4ad3972e278d74cabb0d5480f29697b8c9ebf839c3c8064436be4c508ad406f0b3ab2b6366fc SHA512 53e53220e5fdd6ad44f498e4657503780bca1f73be646009134150f06a76b0873753db3aae97398054bd1e8cc0c1c4cdd2db773f65a26874ab94110edb0cddb1
 DIST system.linq.expressions.4.1.0.nupkg 1929236 BLAKE2B a804c6741afed5fdc918c046092f8a526668fdeca8712f750efade8f1f272fcd2c58b1d1493f20528ff7006e189fddd21f8a2220c15d689c8de2ad2bea21b1d6 SHA512 04605a091d3aea404bc97cb7ffc154708b3bec886562d9e36aecd4d2ed130afbb45f54cd16a3f714f0ccb3f27c5bc7707e55fbc3e81681a783e9396930058acc
 DIST system.memory.4.5.1.nupkg 195808 BLAKE2B 15be57951bb2031a33315090878122d12add7d3eaabf2f3e7965dbd9d859df6030e36b87f70f1c7435e6404a908039c26d3baead8e4dfb064f5ac023c141f5dd SHA512 a289e72d03d90060f6d6ab4d306e04b5599b60e2279368d5eccfa0d74f01e8e1ce6faed939a5a703f2bc3f9a10eae2bdc312b30758845d20a140e8b6b1c28ea8
diff --git a/dev-dotnet/fable/fable-4.24.0.ebuild b/dev-dotnet/fable/fable-4.24.0.ebuild
new file mode 100644
index 000000000000..6f4e24a47ff6
--- /dev/null
+++ b/dev-dotnet/fable/fable-4.24.0.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOTNET_PKG_COMPAT="9.0"
+NUGETS="
+altcover@5.3.675
+blackfox.commandline@1.0.0
+buildalyzer.logger@5.0.1
+buildalyzer@5.0.1
+eluciusftw.spectrecoff@0.47.28
+expecto@10.1.0
+fable.ast@4.0.0
+fable.browser.blob@1.1.4
+fable.browser.dom@2.4.4
+fable.browser.event@1.4.4
+fable.browser.event@1.4.5
+fable.browser.gamepad@1.0.3
+fable.browser.webstorage@1.0.4
+fable.core@3.1.6
+fable.core@4.2.0
+fable.fluentui@0.7.0
+fable.jester@0.33.0
+fable.jsonprovider@1.1.1
+fable.node@1.0.2
+fable.promise@2.2.2
+fable.react@8.0.1
+fable.reacttestinglibrary@0.33.0
+fake.core.context@6.1.0
+fake.core.environment@6.1.0
+fake.core.fakevar@6.1.0
+fake.core.string@6.1.0
+fake.core.trace@6.1.0
+fake.io.filesystem@6.1.0
+feliz.compilerplugins@2.0.0-prerelease-002
+feliz@2.0.0-prerelease-002
+fsharp.analyzers.build@0.3.0
+fsharp.analyzers.sdk@0.27.0
+fsharp.compiler.service@43.8.400
+fsharp.core@4.7.0
+fsharp.core@6.0.2
+fsharp.core@7.0.200
+fsharp.core@8.0.102
+fsharp.core@8.0.400
+fsharp.data.adaptive@1.2.14
+fsharp.systemtextjson@1.2.42
+fsharp.umx@1.1.0
+g-research.fsharp.analyzers@0.8.0
+ionide.analyzers@0.8.0
+mcmaster.netcore.plugins@1.4.0
+microsoft.build.framework@16.9.0
+microsoft.build.tasks.core@16.9.0
+microsoft.build.tasks.git@8.0.0
+microsoft.build.utilities.core@16.9.0
+microsoft.build@16.9.0
+microsoft.codecoverage@17.10.0
+microsoft.csharp@4.0.1
+microsoft.dotnet.platformabstractions@2.1.0
+microsoft.dotnet.platformabstractions@3.1.6
+microsoft.extensions.configuration.abstractions@2.1.1
+microsoft.extensions.configuration.abstractions@8.0.0
+microsoft.extensions.configuration.binder@2.1.1
+microsoft.extensions.configuration.binder@8.0.0
+microsoft.extensions.configuration@2.1.1
+microsoft.extensions.configuration@8.0.0
+microsoft.extensions.dependencyinjection.abstractions@2.1.1
+microsoft.extensions.dependencyinjection.abstractions@8.0.0
+microsoft.extensions.dependencyinjection@8.0.0
+microsoft.extensions.dependencymodel@2.1.0
+microsoft.extensions.dependencymodel@5.0.0
+microsoft.extensions.logging.abstractions@2.1.1
+microsoft.extensions.logging.abstractions@6.0.0
+microsoft.extensions.logging.abstractions@8.0.0
+microsoft.extensions.logging.configuration@8.0.0
+microsoft.extensions.logging.console@8.0.0
+microsoft.extensions.logging@2.1.1
+microsoft.extensions.logging@8.0.0
+microsoft.extensions.options.configurationextensions@8.0.0
+microsoft.extensions.options@2.1.1
+microsoft.extensions.options@8.0.0
+microsoft.extensions.primitives@2.1.1
+microsoft.extensions.primitives@8.0.0
+microsoft.net.test.sdk@17.10.0
+microsoft.netcore.platforms@1.0.1
+microsoft.netcore.platforms@1.1.0
+microsoft.netcore.platforms@3.1.0
+microsoft.netcore.platforms@5.0.0
+microsoft.netcore.targets@1.0.1
+microsoft.netcore.targets@1.1.0
+microsoft.sourcelink.common@8.0.0
+microsoft.sourcelink.github@8.0.0
+microsoft.testplatform.objectmodel@17.10.0
+microsoft.testplatform.testhost@17.10.0
+microsoft.win32.registry@4.3.0
+microsoft.win32.systemevents@4.7.0
+mono.cecil@0.11.4
+msbuild.structuredlogger@2.1.507
+msbuildpipelogger.server@1.1.6
+netstandard.library@2.0.3
+newtonsoft.json@13.0.1
+newtonsoft.json@9.0.1
+nuget.frameworks@6.0.0
+octokit@8.0.0
+runtime.any.system.collections@4.3.0
+runtime.any.system.diagnostics.tools@4.3.0
+runtime.any.system.diagnostics.tracing@4.3.0
+runtime.any.system.globalization@4.3.0
+runtime.any.system.io@4.3.0
+runtime.any.system.reflection.extensions@4.3.0
+runtime.any.system.reflection.primitives@4.3.0
+runtime.any.system.reflection@4.3.0
+runtime.any.system.resources.resourcemanager@4.3.0
+runtime.any.system.runtime.handles@4.3.0
+runtime.any.system.runtime.interopservices@4.3.0
+runtime.any.system.runtime@4.3.0
+runtime.any.system.text.encoding.extensions@4.3.0
+runtime.any.system.text.encoding@4.3.0
+runtime.any.system.threading.tasks@4.3.0
+runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.native.system@4.0.0
+runtime.native.system@4.3.0
+runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.unix.system.diagnostics.debug@4.3.0
+runtime.unix.system.io.filesystem@4.3.0
+runtime.unix.system.private.uri@4.3.0
+runtime.unix.system.runtime.extensions@4.3.0
+semver@2.3.0
+simpleexec@12.0.0
+sixlabors.imagesharp@2.1.3
+source-map-sharp@1.0.9
+spectre.console.imagesharp@0.47.0
+spectre.console.json@0.47.0
+spectre.console@0.47.0
+system.appcontext@4.1.0
+system.buffers@4.3.0
+system.buffers@4.5.1
+system.codedom@4.4.0
+system.collections.immutable@5.0.0
+system.collections.immutable@8.0.0
+system.collections@4.0.11
+system.collections@4.3.0
+system.diagnostics.debug@4.3.0
+system.diagnostics.diagnosticsource@8.0.0
+system.diagnostics.tools@4.0.1
+system.diagnostics.tracing@4.3.0
+system.drawing.common@4.7.0
+system.dynamic.runtime@4.0.11
+system.globalization@4.0.11
+system.globalization@4.3.0
+system.io.filesystem.primitives@4.3.0
+system.io.filesystem@4.0.1
+system.io@4.1.0
+system.io@4.3.0
+system.linq.expressions@4.1.0
+system.linq@4.1.0
+system.memory@4.5.1
+system.memory@4.5.4
+system.memory@4.5.5
+system.objectmodel@4.0.12
+system.private.uri@4.3.0
+system.reflection.emit.ilgeneration@4.0.1
+system.reflection.emit.lightweight@4.0.1
+system.reflection.emit.lightweight@4.6.0
+system.reflection.emit@4.0.1
+system.reflection.emit@4.7.0
+system.reflection.extensions@4.0.1
+system.reflection.metadata@1.6.0
+system.reflection.metadata@8.0.0
+system.reflection.primitives@4.0.1
+system.reflection.primitives@4.3.0
+system.reflection.typeextensions@4.7.0
+system.reflection@4.1.0
+system.reflection@4.3.0
+system.resources.extensions@4.6.0
+system.resources.resourcemanager@4.0.1
+system.resources.resourcemanager@4.3.0
+system.runtime.compilerservices.unsafe@4.5.1
+system.runtime.compilerservices.unsafe@5.0.0
+system.runtime.compilerservices.unsafe@6.0.0
+system.runtime.extensions@4.1.0
+system.runtime.extensions@4.3.0
+system.runtime.handles@4.0.1
+system.runtime.handles@4.3.0
+system.runtime.interopservices.runtimeinformation@4.0.0
+system.runtime.interopservices@4.1.0
+system.runtime.interopservices@4.3.0
+system.runtime.serialization.primitives@4.1.1
+system.runtime@4.1.0
+system.runtime@4.3.0
+system.security.accesscontrol@4.7.0
+system.security.cryptography.cng@4.7.0
+system.security.cryptography.pkcs@4.7.0
+system.security.cryptography.xml@4.7.0
+system.security.permissions@4.7.0
+system.security.principal.windows@4.7.0
+system.text.encoding.codepages@4.0.1
+system.text.encoding.codepages@5.0.0
+system.text.encoding.extensions@4.0.11
+system.text.encoding.extensions@4.3.0
+system.text.encoding@4.0.11
+system.text.encoding@4.3.0
+system.text.encodings.web@6.0.0
+system.text.encodings.web@8.0.0
+system.text.json@4.7.0
+system.text.json@6.0.0
+system.text.json@6.0.2
+system.text.json@8.0.0
+system.text.regularexpressions@4.1.0
+system.threading.tasks.dataflow@4.9.0
+system.threading.tasks.extensions@4.0.0
+system.threading.tasks@4.0.11
+system.threading.tasks@4.3.0
+system.threading@4.0.11
+system.threading@4.3.0
+system.windows.extensions@4.7.0
+system.xml.readerwriter@4.0.11
+system.xml.xdocument@4.0.11
+thoth.json.net@12.0.0
+xunit.abstractions@2.0.3
+xunit.analyzers@1.15.0
+xunit.assert@2.9.0
+xunit.core@2.9.0
+xunit.extensibility.core@2.9.0
+xunit.extensibility.execution@2.9.0
+xunit.runner.visualstudio@2.8.2
+xunit@2.9.0
+"
+
+inherit check-reqs dotnet-pkg
+
+DESCRIPTION="F# to JavaScript, TypeScript, Python, Rust and Dart Compiler"
+HOMEPAGE="http://fable.io/
+	https://github.com/fable-compiler/fable/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fable-compiler/${PN}.git"
+else
+	SRC_URI="https://github.com/fable-compiler/${PN}/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${P^}"
+
+	KEYWORDS="~amd64"
+fi
+
+SRC_URI+=" ${NUGET_URIS} "
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+
+CHECKREQS_DISK_BUILD="2G"
+DOTNET_PKG_PROJECTS=(
+	src/Fable.Cli/Fable.Cli.fsproj
+)
+DOTNET_PKG_BAD_PROJECTS=(
+	src/quicktest/QuickTest.fsproj
+	tests/Js/Main/Fable.Tests.fsproj
+	tests/Rust/Fable.Tests.Rust.fsproj
+)
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	dotnet-pkg_pkg_setup
+}
+
+src_unpack() {
+	dotnet-pkg_src_unpack
+
+	if [[ -n "${EGIT_REPO_URI}" ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	rm ./Fable.Standalone.sln || die
+
+	if use debug ; then
+		DOTNET_PKG_BAD_PROJECTS+=(
+			# Seems to hang but in reality it fails with USE="debug", bug #922684
+			tests/Python/Fable.Tests.Python.fsproj
+		)
+	fi
+
+	dotnet-pkg_src_prepare
+}
diff --git a/dev-dotnet/fantomas/Manifest b/dev-dotnet/fantomas/Manifest
index ac9653d114e5..88c851df2346 100644
--- a/dev-dotnet/fantomas/Manifest
+++ b/dev-dotnet/fantomas/Manifest
@@ -1,21 +1,32 @@
 DIST argu.6.2.4.nupkg 185561 BLAKE2B 3fd4501ceb4a95ed9bf4452638f04b12164e0af62f8c1b4b6e53f47b213409b051409c57372f9d7d6f35792fb1ad883514c8eefb68e53650bbd61eee34f08418 SHA512 39bd4b2ef19cde810738d914d48fb38d900e8047dffcef908368f2ac38c350c3d8b685e9645a5f58c1e427e30a410e6836826025ca3dafa65fb9252f43add568
+DIST benchmarkdotnet.0.14.0.nupkg 1412387 BLAKE2B 85c9bd75d4f14043b68ac2e6efe558f9bef490bb1838dfc361decd807deded29a40015277836d182f4fa30783654d1539c3bb4d1a7bd96325bd60b19ef30d39e SHA512 14baa1188a311697847a738cdc331dad8365f40b46e950d683335e730a8ec685ff7d2a4d8e7f4eed19adfe08d7b86a50e9b4ed4498f64886fe6aac0d551a7e12
+DIST benchmarkdotnet.annotations.0.14.0.nupkg 78771 BLAKE2B ca809577e17b10e7b17de1f01c0e887a33bd5433b65ae391040a00054fe57fdc9cda72800e5c8ed27d442c77404f23c1bebd7e13a8e4379e12dc91665a09a9bd SHA512 7739666d7aaa281756ab9d9510971aee45d711d4b8c276b50f7a98c5239d9ae1befbf0da58d0f3a260093b9e78d714e535787311e688c3beab58d32a9e03d135
 DIST cliwrap.3.6.4.nupkg 488300 BLAKE2B 969c38c6bb345217893d0f712004484e772ab527ea3557682fd3f847b0b18ddf3725586e26f7495b0ce15f4b94d280cce48b30bf1502ce0732311e94b98d70dd SHA512 41b90ac6840fc0c03269c7cc729cf7203573cfa038dd818a0e43d865fdd828e83e815a765303124154f6dc91904e23a9b9774e7a28fac694978414c35f0735ec
+DIST cliwrap.3.6.7.nupkg 670999 BLAKE2B 80dd21f72e892d470a9db55e63c382b10c6da05cbc7fc47b5cf5929662b09df14bc35cdb5b8e87733e4aef986823c75e45a5e052edd9029c1bf529e4c8bf52c7 SHA512 6f61cfb16a310e8ec701930850314aa1879883abd75c8af05f1bab4535a96ae7687455d2097b541c222e879f93a1c9ff96e8d2b709f5ca9c2f0c7ed11c46b98d
 DIST commandlineparser.2.9.1.nupkg 496069 BLAKE2B e2c4b38841f83d6bc10432b8055af90369f1fe0a10105a58b51b44cd48e5d84cb0b5e4b19f444d8c81b38646a62c7c4d11cbd710e92fea68be3ebea6ab98e3f1 SHA512 4f364e45c9668c7e7cc6a922b488f3fa523033c20d7a432694f0a6af05ce528ea0481d8375e2f4f1032c6990347b4803ce9a0e48068c6fe15ec46fb1254f085d
 DIST dotnet-fsharplint.0.19.2.nupkg 10590252 BLAKE2B 203441a4b2b39310c7925c56b3dceb6d8926f868a89f9fe6453addaff7595e80358eefb28cccc165bcbb002cb114adc6ff1010ee51e9e3ec936fe46aa36ecee2 SHA512 c6d861002ab925b45feb5a61c756d5585187f9a2ae8eb90611721d3ad65bae68f8ee3a74b9fdb8978fecbd40fa39f06e013f3f99459de582c140160211000a5f
 DIST dotnet.reproduciblebuilds.1.1.1.nupkg 24193 BLAKE2B 7fa2efe9549ec3f7242ceff1566e3e1a11c5fe51091a1ed6faa7fc39ed7feb40c1e6f0b24a0cbc024e157905215e5be1fe776df0f647acbfbb3ac60c9b654756 SHA512 03dabc14d61db33723dd02d11613848125a36ecbafaad95fba1727f909f92777d6ee963394d00a6eb4e9383e636cbe46b54516abe2c6ea2baffdb76a2617b332
 DIST editorconfig.0.15.0.nupkg 110720 BLAKE2B 68a997f808b18a05aece36cf3f6f37c817a6c4bd9dc6288ecf132b13ebc52ad5e23d9476cf34bb3c3c68c702bd278cf86c08c597ad031ea9966284f8a725f0b8 SHA512 7e2d5406867195bf705ef5ddc4683771ccf6a2269240914fddf6c4eeff1bd312bdadc433258d6b5e50fa65271969c9c95c2c10d489970b03edb65dad14d0f8be
 DIST fable.core.3.0.0.nupkg 88115 BLAKE2B 5c5a18b6aa818db35b9ee8502f109477a7c86a12efcae9359f1d70aaa7e33ddcef32daf6c33d7b1c71aa83984bc3c110dbae0bad11edf3049503ee602b405175 SHA512 705f01b68ac1c03d71d03e3a7183e032ba45033da49942a98614d515d6ab7d4d308dff84eaf941625bbf44fbac496e1a28510d81a3e802713c3e92079aed2023
+DIST fable.core.3.1.6.nupkg 98023 BLAKE2B 9d9db7ea2a951f79985a90e308fd75fbb827a7a215b130a98fbd511a8ee7f6179cba5bbf0f9eed51d414ebb8aed95c745ff52f8cfc9d806b1e6ab0c2ed49a87e SHA512 b00bbd05680a760a2101a9878847bd139b16149964ae0b1e36f12ae044eec82afdd580242efccdf3ed1d7505ce9237e62705393b6097c98c1605da20b2969d5b
 DIST fantomas-6.3.16.tar.gz 50378072 BLAKE2B d053f320770ebf0477590b3500964d6a259d32061d2c80c2da09cbac9c4ea25f6333abe7a7f0d61813eea9dcea7fd8964591bb2f4b1453be61a775fa2bac89d4 SHA512 bd67aaf31ee8db5d4aa5f95606012bca6f9c232bf29fdd79b5decf9a658e8ae993d2031461bba70b893e754c78457bb5d8efcfbf87d4c1b4e6b7e5dd99bdc53f
+DIST fantomas-7.0.0.gh.tar.gz 50358818 BLAKE2B 5462de311705130240b29b60534a0c4424ebbd55dab5c469e0731328d0f612149351f1188d486872ce7900d08eee93fdd5b917d25788cc3bf682f3568fba0096 SHA512 63d6d7be93c20459aa7065be66b999a2e1d34bbdfc78fa004ef8a4e70438a39c077b1de7e9f5a5b5862258ae06acd256f4871d53500d54cbb6d6bff3d92bd4b7
 DIST fantomas.6.3.9.nupkg 5937066 BLAKE2B 04db0dda7bea16a55caeeb53e936b90d1d8000ed490f8178e5eea5fe2aea194b5259cc559389d5bcf5f18a7ab432cca31ee5bb8db181cee1c92c3183556818be SHA512 555580cac2748278c99f5188e1c246a5cf6dbd865b257a1d9f75e09f30dbde599b401f6b4a56f0e62734a4206a00af871a048b35a6e8e8b2ba3c881d4527173e
 DIST fparsec.1.1.1.nupkg 353063 BLAKE2B 47e93d6ed373bcf3fd5c26ace2d60a1e6701b14bb4cbca1650bc15bfd0dce402ea8c8ad471004dfe618f0e9507ec60c53d7e01ead2e7480ececfc4a0395552ff SHA512 b28a1cc8a4fd2d4b000adf68b0a9ffb6aa72ec2cdd5157beb47635346122ac61f6dac0e0b06de8528ed7336e21e9881918fd18d36585507ebefb3336c57b6c76
 DIST fscheck.2.16.5.nupkg 1202407 BLAKE2B 0da4c276a6e0a1c68f0513a2e1c65291adfe527d89eb005a684937f895d9040d0bfcf5e8c657c6fc112fbfb9b889e4a6c010a0f92789796d0166d93d624a147a SHA512 a1bcecd7c86bd5598d585071c54b404fa8db4d9ed744562dbd83023a6b28b27eaff703353370f127f28bd8dcc6bfd6689640bdd177f5e947a9fbe5353e454367
 DIST fsdocs-tool.21.0.0-beta-002.nupkg 11766459 BLAKE2B 6f4d9bb96004f0b6426066b320d14ae4fa2bb9f7cc7863ab90b77875d7f598ed0c2a063ae625d808de1733a5b50fe1478f505c5ad50c8eb26d4a63e7cab6c4d7 SHA512 7d875cb19fa5dd291024f3b2f723ef9a7199c7f819fa0b3d095c892f1f576179b34856be7b9a0d2865b2fefc067c991cf7c6a6ca3c5d4c06da025ebb6232fd60
 DIST fsharp-836d4e0603442d6053c8d439993a022501cae494.tar.gz 17221818 BLAKE2B 972c42f0d095a65c953cca77aaf92ae6a25967d73597715668c8d6da58dc4b25cf450ec8e5569a02567e568fc176ff732c14d9d24df3b10c752956b96cd56c01 SHA512 ed0cfd605911e5d9ddbaff19c3604811bac155c727e2c2d1bceab21fe9ceec5b9e8b746e9394171bfa6d0fba539fd4acf60a867130b3cf9572d478f1887d0d9c
 DIST fsharp-analyzers.0.25.0.nupkg 17775447 BLAKE2B 71c843ccc197310dcf847527acca3b7fa9ef5af1912bcafa31c0f76f8f2af91728547fbf8e5ab870f9bb2881e4e34bd35356183804f7cd7e0ea70a3c261425dd SHA512 2aa601f7d02aa1943751ed89477f9a52fe267f1a8f53002b976dce434b55fbc0e2228283b51640c767522d9b6dd7f89554d5addee4c3696add0c845a8b95f138
+DIST fsharp-e668b90e3c087e5fba8a855e502af60bf35be45e.gh.tar.gz 17396692 BLAKE2B fbcad17ba2b6dd22049fad87bbff09bb8466bf7b7f0d82f53e07fd26404e5c6f16f68eb5efa0d437cb3768c683fd46cdc5fdc5808a0be5021ee25cc75da330cb SHA512 f5459fd9fcc5501c0a6b8037c3f04a8eb928f16973bce9a497a25769285db058f0aabdd7a47167816d8ca31eac5654bb326980596fca0ddeab760ebbf035e87c
 DIST fsharp.analyzers.build.0.3.0.nupkg 15911 BLAKE2B 64d63679503b16b541537fd4482c47cd384628bd7ca70f6ad771b93bb11554b82605c2827a0facc8dc5917b196548bc739f989d5ae7899e3b0673df5da50620f SHA512 f07cbbcfaca9ae92285d143ae303adbb95fedd15cca256f278fe4adefb7c8c7e810f74d7ff53bb50dcffbd3408f9350baddb925c6b39ff1a10814eddda7045fd
+DIST fsharp.core.4.3.4.nupkg 2859435 BLAKE2B 6118e3d2a37adf3d11fed38324ae14eb6f6043b525c73f28b7afd1c45da72441e9cc0d67c4e90b1e9d6a38a555097819aabf4a4f20cb803861ceb685147fbd45 SHA512 3fbf9aa42143151e015e2af49863c5a7a07ae365c1ae34bc233202b41cc76e26cbbcc7afd2f51d08e35ae2c5b1eb5218cff34a5676ca1920c9256525c4f60283
 DIST fsharp.core.5.0.1.nupkg 1327145 BLAKE2B 59030ab01c542beab3fd7b4bea7ff2ad125fd7e5343395c4d9754010372a31894b50a7046a821a8485e0890f29b1e0781e96250f62dfc9b3baa260229489f75c SHA512 94d2a60b6765163e583c1816d633b806a06c19c2f2fd1bbcbed52beb726a8a6d604e325a4b73b159a437abc306598140f0f4768deb4f38c2687b1e0329972c67
+DIST fsharp.core.6.0.0.nupkg 2784605 BLAKE2B ea2881ba6b42ee5afc4bc98a764f12be34bf21b1c5ef03c3d3614c6864bbabd3d0223029a14c5d33d2efa0bc66d72d8287d5b57818535db15212e959ea0ffb53 SHA512 51cb44f575ae87baa8174b79855d8e1b0349158f4d3f0fb5e2ed529b8a11c9143dfdf0bfe354c5170eb9910a020df6351853bfbd4ddfd412edec8f3ee002f6f5
 DIST fsharp.core.6.0.1.nupkg 2787770 BLAKE2B 9d26c9b261991dfcd92b68b88553021652866378e14ab2c9be7bbb854369aae9eaa2a08f3ef60c9a1fe3427150d39892caf00b9e64d255f558098df5c21659b5 SHA512 906ef89a64493324500c2586d9658b0ca12512e434c7f5e7c1bf5a4c8f3f37fd3fc180e3b32597309f8a44ac4d554d9c785b6f936cff192407766916d3123edd
+DIST fsharp.core.6.0.2.nupkg 2955637 BLAKE2B c9a6e087e90ea02d9e3af02ce7a74d4be93d84eb8bf6fec8736d963b81883b3fe66177ac502235046ddd260a34f5a16a1d8c446384fd209deb8a3dc5bacd57dc SHA512 016049d4a35cdb3b26a8000cc61701fbff9cf5dc4294210ed308d57c7c5fba4fd7f951cc74917b5b260b4baf90610f61f05ca11048f531702c7ea0bcd94b02f4
+DIST fsharp.core.8.0.100.nupkg 2816556 BLAKE2B 6662024bfcf3cd2cb14a33bf073a6df55fac12c6691e820f5aa4a57aa222f32add0518c9c9789e7f28441b901556b677f7e77237683aa9cf91cec502a8cb61ed SHA512 855cb118dfa043642fa1c86cdd80107864ed5c5d8aa7f3997a6de1a7014b6c23076f62584ab5ff489ac2ad6f86bcd2555a3b62252f2c78cdb8d37d4ab13bd021
 DIST fsharp.core.8.0.102.nupkg 2818627 BLAKE2B dde51615fefcef7b6c57135035eb6fbc5832a2a0bd4e4b2587aa8c347743c379c62e695a903bc8a3b599e6ef6cd501b84bc5f43980705055d8a46b8ded99c6fa SHA512 b7840eda7bb6745b8af9c6cdcf3a0e23cb64ad4691bc81a388895c48fb641b0d2cdcf0fa37fea2ea63069763bc3a45316cb91be9be7d92cd15819afa54fc02a4
+DIST fsharp.core.9.0.100.nupkg 2920413 BLAKE2B 8621b7e76a83826585dc2ce6f3b8d4ed4a97bfecc80901d9c442dd61c6699d95ab5dc407b1061b9bce74aba5f074a3d8a0fd78d94f188e3cf6d61d1d348d5ddf SHA512 937e5d444418e048567a0de6a242132717240c275d1953121bea9b4b93b06d6509baa89a5c401881ce6b2ee66a373d490c58f591322ec9d040cea0ae7d9237a7
 DIST fsharp.data.6.3.0.nupkg 1111473 BLAKE2B 5b276c2941775d473378d41ca0b6703bf2935ad5e7b05cfbf426040d08746d27ed91ee3b0a4705004ffe32f21b8f29251c6ac2e2c5e535fcab9959d527801919 SHA512 36c68ee32d04a827f1cc20b791610f57bfe11b759ba360086e67ba853fd6d58c41442e7b809f8b86228a190c971af124888e81762acdeb5a3ec5800885a96c59
 DIST fsharp.data.csv.core.6.3.0.nupkg 67178 BLAKE2B 102790a41ad996233bf68127358f67e4e4dddc172a9aa11e8a6e9d727645c5ccabc0a79c963b09b129330cb6b020425d6f29b359029c7d6b03c21cb798377f38 SHA512 c1774dbcfad0e85a3b5e62d21e87069a870db0a18443f0449dda769b0e0cf4349df2a3443d4e3cad76f7e86b2ac67f4510969938d15d0683e44dd5d669db4f9f
 DIST fsharp.data.html.core.6.3.0.nupkg 174715 BLAKE2B 7ef9f8360e0a4a1891501e6a040462bbf0e665960cd5d76247f2b3867b6af9082aafd80cdcd08d30902bfb94b5e26222d40af0a1eb9bfd9c73e6dc4b73b62644 SHA512 4b8139c63cfdd23ba73fc57f333dee373f40108387d9794872e97bc75d38fe23aa9e7dc792d2e42240d832d067dbd94d10ad07473edaac79ffe06e6efa779d34
@@ -25,8 +36,11 @@ DIST fsharp.data.runtime.utilities.6.3.0.nupkg 104522 BLAKE2B 62ca50953fd504d097
 DIST fsharp.data.worldbank.core.6.3.0.nupkg 56347 BLAKE2B 5dc760236e85ef1755a2e10e3060f46dd32260bd0b7545bdda37b49ae313ed4e33b3e91cd84c749249bcf89ecddd02d82d96539e3bfd0f9271a35491e6ea3685 SHA512 cdcbc0373689808fba68c8cbaf91511a16fc75332f68ff2ca981854a35b1127c55bf8266c436d4f477819db92f97c497c9939ef6bed0f4c0033b5db958496faf
 DIST fsharp.data.xml.core.6.3.0.nupkg 64478 BLAKE2B eaeeaf5d0f31a9a7694bd02732e748be62f717e5cdda2f9f02370c0b394dc0dd47e75058887d90c44ace7e9117393667f3a8a31b00035903b9ed0aab7b7cbb43 SHA512 2ceb6130b8c3fe5f18a3a732876508c00c27468b48cff740143754bf894b8827bf3e48d905a4956201d95d328f64106950c4b18aed77a09ccc23db0ab63cdbb8
 DIST fslexyacc.11.2.0.nupkg 2595191 BLAKE2B 6db23a2028ae6b6b3c143a4fdf1fda0bee7cf4cc50ff55457dcbe8387c403fdaf0610f8f3bc9c29db31425a712b1c073ef767aeaae1db65b4b9ba69477fcba7e SHA512 cdd9306ea85cc79e0541f637fb1ea017aadbd79aff5172b6dd36b174434af0c99e566089daf50133ca7f63f9deda353026d0a7aa48ccf1fe07b1db46dccd8968
+DIST fslexyacc.11.3.0.nupkg 2595923 BLAKE2B db892342c124f0fb3fb7c8b2eaa9caf004c4b80045419a881c4749a19d9e7dc96ca71d254ab8942a3969a934b6fd831e42299dc2ff719d5eacfc4a879bd172fb SHA512 8bc5e1ea0d26f1e747913f05fbb1a22085e8ea6a79deaa67d9bec8e493abbcb7d8356b2308852af5d6f3b285fd077a9232c35bbee711e837b72805a169dedb26
 DIST fslexyacc.runtime.11.2.0.nupkg 66073 BLAKE2B f0cd02ff5fe9b460a4e1be893b622c7ccdd93f3844341d4aff249d81debd7dc32fa010914dc31e6c8ff42039264e6892f0f1cde2d8deb3584d6dbef162d6ddc0 SHA512 807024ed5d4194d4bd4a7d42ac1c0a772cc808037ea7dd0827d47c01158fc107e9c493b78946e180783df36803698ed11972f8430928eaea36493d67c72b4223
+DIST fslexyacc.runtime.11.3.0.nupkg 80747 BLAKE2B 958e99ad3afabc8d8c233e43344debea855d4c98ab8d2932d91a337bad1a5714db7e8fc9e8981f27e2648562783ca616861315773d916a55b5120042abbe1b36 SHA512 c887624399ff2a4dbf711cc2aad003a6d42bf3daf80b8aea03e601bf67c1065efb8cdd3909dcf3a1588f73ade26efe50b07956b7b9b85d4f25d194eab64aa40a
 DIST fsunit.6.0.0.nupkg 40911 BLAKE2B f63ceebf26e6fd5c4c33484002c067826219530d4024d9c7c56ed320e5cd61c546449c8d08ce9202f31adc02f349631204d26b97d857f3b1a15f71a560cd0d71 SHA512 3a64294aa16e96cd578b14e7439434df922f4585ebf46e41812a2331e31498654c4dc2338eddcaa0aa128b16d70c99aac47285c177ceb78cd2c8f7798efd8797
+DIST fsunit.6.0.1.nupkg 42237 BLAKE2B 46c83abfb79d1e524f489671d77899cb8270be10643c4fa485a16c48d1f35ff7f575d9e8c792c5be06a0f42d26be9897aa9d811d8e48246cc82cf2325fb54e08 SHA512 6439268a3f8c27960facbf3ec4923000329256aa473be3b266032dcf98f220c101a2a082b2d53a3350a03988cdccab3f0b58d677dbdb682e96873442e0ec13cb
 DIST fun.build.1.0.3.nupkg 136660 BLAKE2B 04d372582837cc5b7c96e4960cb56f8aa1fcc0fd4852b71ad1daa30508a60ea9d5e322e845f4c3fe2a4e4810386dce79f037e78f4a62ebdf003c8b3b4a8e96ff SHA512 7566fbdc10569f98d6decd7068742e82e8b2c6319c55b3df33415e7685cebc3b1f0f24f3f6cfa2e6fab7e02caade512b4899ba1dc5b1bffa19b08d83c8295540
 DIST fun.result.2.0.9.nupkg 89042 BLAKE2B 2e884fc25dff5edaa6658e6967aa1a542c9d947021d99c0666d7d8cff792fcc2d44e7555f22ef7db090c71294afccf04a817d7c37a97c8120a3d830ec6fc37b0 SHA512 429bd89baa3629b71cf8da075c5fbabef7c25995603057c376c0380d47e9d00401a7dea651d40410e70005e36b58618ce3d53f8a2fd7c4a9ea26089d1bb96bd5
 DIST g-research.fsharp.analyzers.0.9.3.nupkg 57580 BLAKE2B c586664ab3e070e470e45c4d1b9f1a275d95a5c411145f616de2729f46e84845143833e6925913d52d12c9334492fc6103d2ba6d5b83dae5a30302330d594f96 SHA512 3e63fa7ced996671132a8962ae8775b5a8d866be90e5c27765b7f4952b18bc8a78b37c58e2bca2b3ec45412f0eed9dce9de2ec821beda1c0c40198f3dea1e52b
@@ -34,21 +48,27 @@ DIST gee.external.capstone.2.3.0.nupkg 8145352 BLAKE2B 1e1cfa75c9d8fcff0e905e7d8
 DIST humanizer.core.2.14.1.nupkg 538179 BLAKE2B c3e3c3c7d3fb3484dc85f5eaf25ff4f4428cd36b3458c5664fa7c29cb62ea291aded48a369823459d684ff79ce63a16650dcd37e8cd123c23ab943faea92cfd7 SHA512 cb3a8653f1ca34b67d52fafa92f49cdf0615fd2e4efc8be4948516e5617b32e8af18b63cc12e486672cf92dec3d4a5bc12dd849e5d08dcbce0daf196336e17b3
 DIST iced.1.17.0.nupkg 2106811 BLAKE2B c7042f76781d7a536a8169c861fdbd36d8761e0e89faccf1251506bc6304ad5719da9c62a1f07a43952c1bc1baab2e5ece7e78304b0cdb9eaf3f72d899622661 SHA512 6404bf5518b3d7a7c74478edd56c2c2f194ccadd1cfde3ae7c13c332e442779b817b99744aae19dd4c6400a205055eee7dfc16b43a2f97d0f5200a9bc6c97549
 DIST ignore.0.1.50.nupkg 18805 BLAKE2B c0e693534c1f6efc13704cc08e88d99348f3e7f5b0d9abbf0bf41f423fe33d905c0eedbfc1055c2878bef82b328d5ee41f2a419df08177eebc76a715b09e853d SHA512 cc5ef3c3aaa0691c603ed55415aa8163484f4ce0f99e45bc65a3ae1e089e81010ae1e0a7c2846a22d0c7bc597993b258a2e8d553589c2fa9f88c5f28447032fe
+DIST ignore.0.2.1.nupkg 31406 BLAKE2B afdd23552944353a04a0008754fe8ad8a870bc2ea8deb2c5aa6c05786b852a1186cc23795f9bb28e939bd663aaac4ae4a634d731e95f99bcd6127cfa691de077 SHA512 8cc783d899640b33d115e4c6f972792c0bd54a1ab213d2065fef290718f675ef3154eac178311c75973d0f0b9f761998468c017167fb62dfd9a0e7b174e37b4a
 DIST ionide.analyzers.0.9.0.nupkg 29804 BLAKE2B 14b152e807e57f02626e712e9f95e7d9db61dea412fc5eab896c994b9a6aae9367d1086f8d2d67717f2e7cb0f9bc78189be480880490705ac5bab8f3c3d676cf SHA512 61a533e805ec9f6214dfb6fc663a1a0ac1859b640e063481eb06fae0ad891fb9f322e9a1687638fe3ab73995ee2c034deccb157d1816b887d6622a9fd0428ba0
 DIST ionide.keepachangelog.0.1.8.nupkg 32646 BLAKE2B f4da627aeecba553fbc95e634a38e8ff2fe32da7434775f583db6372a508f2185deb3e9c72f3ddd9cb41fbdae5b6e010a07187ab51b7a435eabb668c898cc738 SHA512 461a235c87853b67d816f8e23038baa89051e8930a13b7da9d96b35ea5657379d6cd5e9cc4aa419a10669e6b53f6095d9d276b31b7216cc54669232783b531e4
 DIST ionide.keepachangelog.tasks.0.1.8.nupkg 2755127 BLAKE2B 077c51696c5948ce974bd5d745f6cc2b0da726dc5d473381d019469eceb6a9662fbe28946824bd193104cf7d1968a2ec866776218738c2771885dd9f79239137 SHA512 53844192a5979ca195eb97b2559c875bebdb3986c8607a62a4a89fdd529c31409f6b7abe8dfd101f995cc98b4577f64f30c74efb12f412beabeee8198881b043
 DIST messagepack.2.2.85.nupkg 291578 BLAKE2B 6a886bb2ccd027ed475907fba1b57b42173536bb5e96832f5910b855695db0bdc8a77a0d0b12c7f047c959755509fdf984fadfeb83918e865579ba3ec67d8776 SHA512 e767bd8bfd236611a6a8139039b91e73b131d573d923804a8c0eeeb5db4a624bcd8b11d41dcfa7d25d2cee58c199d743d9f51981ec4045706a16fe8aefc6cf90
+DIST messagepack.2.5.187.nupkg 493345 BLAKE2B 194c1a4541e2798c99676cc6e2ebd5596289c3b93a9bb9d7e8e5a32e82bfe3c7ec5b38b93dcb05a42da5661c410283bc92bec693d1a8f5eeb323043be2aca6aa SHA512 819e902f28a99e01ebfa7fd75969bb4ccdba8fdbe433af81e915c1baffa26bf0e326c1baa496906d5bb3ffe441149ad277df1e4e4f82a87c2b1350ed1724756f
 DIST messagepack.annotations.2.2.85.nupkg 17530 BLAKE2B 956ae004abac78c52c276e92119b2f0e104e1264061bcd80c288cbd3cb6b021d17fbd6e33538179ffeee63918aedc0cffffcf9441ac16bf3b04741c266bb8705 SHA512 280cb3b37ab8a0ed7e5d99d285bed29f66273e3912cdd1ec9724b5e9360a0b840305e954ad41303fea89ad81849186a67c4d0e60311f4965e3a06da530f7932d
+DIST messagepack.annotations.2.5.187.nupkg 20904 BLAKE2B ab0c7118597f7fcc0b91eb86c1d5be6ece59ea0c191ee4e78aed9301df1d7f1f1819527012a994612589fde63988ac90b04956e70c0ad13ea425d43125f872ef SHA512 d484e11e76ccc3a021f4c6ff6d97d6130643a3765bb14f6eb0600e782b3fa0f5ac925addc550cd6478c883a9b2be3950bcbee83216a011e6fed3b9232f8d7469
 DIST microsoft.bcl.asyncinterfaces.1.1.0.nupkg 92985 BLAKE2B 3de4d3c85a43d9c81b24419919e82a590615de75dadfc5bc156777938c1ee30ba9602719614223be3a4aedfd589bf4f02e78b576f80926bb29d8e0a742c692d6 SHA512 4277ce265233e5ebf15370e7d42cf8574c1fce715a892eadbeba136136dbc36ba4d78b4090e55217293f8421f2eb84bcfdc9343de42a2d5e06b8ff5b00d0723d
 DIST microsoft.bcl.asyncinterfaces.5.0.0.nupkg 74074 BLAKE2B 8e27e56988f0120d2b8e17e05dc6b801bfcb237b700dab5054049473db34d6a2fa4f59eeef7c857c31002488a882910ea7f44be2187b85dd5d1a96edcaddd234 SHA512 cea6febc03e3ddd6fc8ad31ebe92fc3f7134f81cc1fef8fb079ec3cd72f8a31120e836c8c39bf16109abd2253919371e2462b9570a2fd6525ad9dfd1f9929a28
+DIST microsoft.bcl.asyncinterfaces.8.0.0.nupkg 99740 BLAKE2B 010d05e4adb8b42dd2e4464063b4601750ee30e377a1aec3e1f9b833d4c599b3e3e01832779fd52a56c77572175df2f8bc3d08c134d99f62f58767a588b8ad13 SHA512 79cb0773d94465924cee4e471d90353d5d8df842c46ab2c572cb15d9b9fb5d0209a1a88d64392995335c5fe54a00d7c3194440b84c95142711bbb685cb5e9552
 DIST microsoft.build.tasks.git.1.1.1.nupkg 479497 BLAKE2B 053ad5b3b88194d12e9e784c8a91d33deb8a2abc48cf3179990fdd2f576168b19a757b3a3915309fb040a1441bd5102bca333383d757f828c029846e3feef88f SHA512 1961b5ba2ce215f6cd0943948e66462b7388b612708c58a5e03ab1e041ac77f1582f9ed9134136fce0d5345d1d46a1537ff728f542e6dd4ea2c11eac9d3f8d46
 DIST microsoft.codeanalysis.analyzers.3.3.3.nupkg 1111022 BLAKE2B 8704bf2c8a57bdca4ad3d5a2531ff47b0b44d2461ce3c8eec4b58f5cb38f9371fe5aaeb8026a3abbf6299fe30b3f059c892ee6dd239a03eb8b36462f132a2b4b SHA512 0d4896db8aff9d731c5b1c8f73a4b37460c3f08080fbeac0ecf169abf5bdff9c9a994778f453816b888e939d9d0d615245c91a2e4ba31f85d2ea8de222767104
 DIST microsoft.codeanalysis.common.4.1.0.nupkg 4561936 BLAKE2B a3f1d1e9d8e10cd2b6ecb87f1dfbeff158bf488a63e56ff78c7c96107ad65b17e3f2296da21a1dba183b8dbe0d9fc3b2b5778e8a14481866c2b8aa5a63b2d937 SHA512 006f100f9f2b1ce676ba8ffec6eee5019ceba0ecd0fdc109fe92584a0697ebad58e75ba3c96ade6298487588c5d66aa24ae6195118f48bb9f16e27e42c3dd299
 DIST microsoft.codeanalysis.csharp.4.1.0.nupkg 10405400 BLAKE2B c287af3ff6dce7c3aacae3d7295236dbde32852683c5f0c74bf14cf8499de219eaf2131ff6943cb2876ff99c77913986ed89b6dcc1ff6b27324900bfc0f1bb5b SHA512 fcf8a01dcb5097390d4d75405de3f637356ba9acb4bd208ac2bf28e01c14feed09a1d2b84c801a59df6b94cf0e386fba2865729b1c339bc29381e1ef1f06d8ea
+DIST microsoft.codecoverage.17.12.0.nupkg 9421347 BLAKE2B 46afd5c4c8352005700e0541dc87c2ac76d8726f60589ec9a84d6fdd52eb28bf7d4e33b032daddecd0dca9bf6854efe958dc903ef2af8be63eddc08db301e60d SHA512 3ce06a83bf3caeb2c0a6f9dccbcaefb72277ca7b01754d3f4865170febcfab244333f69425b3d95b1d35a9a9462512b519c02b4a4bbc40377d01531ad1390290
 DIST microsoft.codecoverage.17.8.0.nupkg 9139132 BLAKE2B b9a9e71595742023f43a50e159ae6c0ec61858b0f786a394eb24438a28708a4583e7cb1914ca5e0a717738452aa01c816258eb032736fd3ee404ffb1994d2988 SHA512 bbfb44e01038c77dc33c175478c5f1107bda23536cfc212c14060385c5e41145411550462f6665924883788fbf66477d2f517acb28c51fad53c0f895ceec288c
 DIST microsoft.diagnostics.netcore.client.0.2.251802.nupkg 146459 BLAKE2B 5f3c1b217602aac357b529e8d48943c2aaf90973ccb86b577748d3eb11899e9a43f5370c3be77531d15550792f5f966fc694c72d8e3abe83fea1a0d6fcd11f9b SHA512 553336be495e4d899318256fdf085e7800e6cd01a50ba561a3fb879d12f75bd42d58383bdb7b0e679d6f9ba7414b9b5b9d07ded6150a57651e16d1e95cd804a4
 DIST microsoft.diagnostics.runtime.2.2.332302.nupkg 747281 BLAKE2B bb3335a3490ecfd1b4ee5c6d83e136c0a0411b599fdbc5a63f18fe8740f63c6d4e313c6c8346bc890ab95ed007c6ac31513b0351e90766a241f56397abc06cfc SHA512 7b682033f65f6ae06f8c63d6d607551861e1f36045cd670f8b39e28786958c5e7da10426f9ce13762a9a88edb8aa2e730c0a7d04455a61e3e014327ab06dde18
 DIST microsoft.diagnostics.tracing.traceevent.3.0.2.nupkg 7528517 BLAKE2B 911f3cb4337c3eb9f9d3fe414691b4a3b1df3bf3ea1294c3053ee82cbf820d76e2d9afc8f7eeef295b1e34dece1757206b8aed102ddc89146757953e9878e1b6 SHA512 31fe5d47f445629e350a27b981f2eb97a9a9842746f8beaec553eb5832b8cb8362ada825d73cdafc02736a92836a16a1f21fe6b375f918241d553a9ae47d8ce0
+DIST microsoft.diagnostics.tracing.traceevent.3.1.8.nupkg 4400682 BLAKE2B 1fbabc63db466f4f0e08b08f1f391f45ae6ce83171dca01d65fa59878d2113f2e7455a231c5ceb6cfc26bfdb6cfd66ee25684ecec657c7f3c394afdf5364c477 SHA512 39a908456e95e262606c33cc132c0c090571dd89521c25a01f11c657f25a2d27aebfa5ce1315ab359cbfc77e2c760db2213f4c8ea0f2d48d70090cc657b9cef3
 DIST microsoft.dotnet.platformabstractions.3.1.6.nupkg 72146 BLAKE2B 08d852b5e6558b499f2d780284aa747e5cf39886d86fa378128fae9f71741bd57c5bc75c0077948f193b7e8ea03a520d8ef3bd3b4fc80779adb4a84a4b44fe8c SHA512 55b87f544874686bed96889953b7e99e43426b79b0fac31cc452e0f4a27ca5cc08522c0ac967bf9df649f7c04137a5e2553d134ad79d5c1e69578367c2b4b4c6
 DIST microsoft.extensions.configuration.2.1.1.nupkg 41878 BLAKE2B 1571b590ea054c01f74685e18cd1f7e53a0c65fb7285a61e2414916aacff951af43c9f75b998b61261bac0abdda2f5058697dc2a7476ace47878619aeb933223 SHA512 ede33ede2f538757a8ad6c607e374080d510010e5e1c716cc11980b32fda72c5f9b6e9a505cdb4ea082256c95662854604972a33e5b82e5e63f30b67fd3f04c5
 DIST microsoft.extensions.configuration.abstractions.2.1.1.nupkg 37935 BLAKE2B fe8d4556fa1b7c7fef2cf9cc0364304006a130af6b08f92d83fda2afec103fcb9576cf4f68f0fd660aa1552ec5ed977f55e882d1145d7e867f4e003f46d8384a SHA512 ee6acc03f6f030f0f1df7f515a83aa43f18b50355d7951324566a0eb22cec06aec67a1291d268b8a0f9d2201f5b455b33abaad516393e6dd11e9939dd801ff82
@@ -58,9 +78,12 @@ DIST microsoft.extensions.logging.2.1.1.nupkg 42526 BLAKE2B b4c303cc0f0a277e58a3
 DIST microsoft.extensions.logging.abstractions.2.1.1.nupkg 51616 BLAKE2B 9ad56ee27a9e669866ba2eb312df5ca8a8f28470a352dca45a4aefbb8a8edcd6db592a63459e2be295c5cb16ac574907b7792a90f8e180c42d2e12217cfe4cbb SHA512 7eb031114a70af9f9fe82d84935cadedeb3bd9a9c60e00c914d741cf0d52b9f854cb82abbf294b2494e46603b14deca2c4b5e2cb39591df990e7f79b3a327091
 DIST microsoft.extensions.options.2.1.1.nupkg 47762 BLAKE2B 130745fed8c4d5b47ef496744045ec3183ea8ab199a2516009d0ae563aa2683758ae6c10d1ccfe8b2b9dc9d5f881d2553b9d90c0918dd6fdd82c135010bf5ba7 SHA512 55c72f83c97892406b5c00da965b84198373f475d23188a52a849a2dd69600deb48029b2488072cf987857cd8627afb353065c3a8c81ae38a7af4baf4f897ee5
 DIST microsoft.extensions.primitives.2.1.1.nupkg 46663 BLAKE2B 50c71f1af3f8019a42f2ab930e1e9c3e8992c532fe27320e98b6ca794473c067c538f8ad7db0f7dce4bf52e3b49b0037106a98bd6ec01303cdc4c9911abbdfb1 SHA512 4c24e6b4cdedd5e7928bebd95c82ea4fdbcd068a0e7ae07d54284445f78ff973e2ec108957af1e0f51090c2fcba579006fedd92b615df27a3b53790797aa3391
+DIST microsoft.net.stringtools.17.6.3.nupkg 172754 BLAKE2B 6283bf695f9d1123b89a435361d139d4fb5f1c6e907fe41c532a2d290468657c82d3a7ac6c783b4be57ecc3101941cee3d4c206efa2acbf5a08bffd07f073827 SHA512 87935c5de9971a39e62e39f09655cf1e8b0b7e90b9f8fcb8241369417083329fb3f265a71823dd3cae6982a33516c84fa123d5a4dcdd0cf93f30cbaaa825c56b
+DIST microsoft.net.test.sdk.17.12.0.nupkg 34293 BLAKE2B 30424196c85fb2d0fe44d013e21df5e94d7314148d54e626930c0a177c4002cffc5186bd1c477023e9c9d4371f19be1aeb20ea93779b5217314eba29b8f3d8b1 SHA512 8467fc23cfb2a35e5eb5abe831dfbb39770e1bafc6ec760f0c4260e5a42784ccecc5a529abeb9d359cd2c6610df6b19358c64e01515cc8d5cd2fb601b0de9c87
 DIST microsoft.net.test.sdk.17.8.0.nupkg 37824 BLAKE2B 3ef98fbed1b0fb6e6734939601744c4047ea701681fc7eb5cd13ed33d3a317379aad946d931410492b9efed3543bd50213bb1def3fc465d812ff3ddab0f940cb SHA512 f211f2610137cd114621bd6c8418e52a64149af37c176a79f418892fadb6d5dba31ea4622a95c67e50b32a92fb1b1d5d7fb980502c5c9570dcc4c3258c6787e9
 DIST microsoft.netcore.platforms.1.1.0.nupkg 17960 BLAKE2B 6a9fa22d75f5a1c65746dd71a63c3d4e37c393e99c23007c10f5ecce248a04863bf26e7562c7751177a6985eaac266c29cc6a5443a4a853e773f88994ad2a3fd SHA512 6bf892c274596fe2c7164e3d8503b24e187f64d0b7bec6d9b05eb95f04086fceb7a85ea6b2685d42dc465c52f6f0e6f636c0b3fddac48f6f0125dfd83e92d106
 DIST microsoft.netcore.platforms.1.1.1.nupkg 31072 BLAKE2B 095f6e8b48a99353061a021ac9a07ec161e28602338d7fa3624891696e9b91642034f968d9e1b77c74ced46628cad45f47cc24189dc12479d1bee92c93eb4cec SHA512 9835090f578b5c8ce6527582cd69663506460e9fdc5464fc2b287331c24d9369e57dd1543a865a8bd89d4fcfc569c26bf0dbfcce102675fdfd1479b9a9652819
+DIST microsoft.netcore.platforms.2.0.0.nupkg 19181 BLAKE2B c784d2315e721a847facc7ce095baf628fe0e0afc626ada488a246a6b49f0f990f9ed3c4a9ff05654d8d8fe05bf80860970a5d3c999a03a63773e48f065bdb89 SHA512 0827f83639833a88ac7bb1408a3d953ee1c880a2acbbaf7abe44f084e90f5507cbb13981d962c57d0e3278ee5476d93c143eb7e9404cc7a63d7a8bf324a4fbe8
 DIST microsoft.netcore.platforms.2.1.2.nupkg 31064 BLAKE2B 6b28f015a1c3c2dbad93fac315a896c4ad116befd618f28b89d451b92f2ab642e414bdd372f46858daa52e72978ad6e4862b6a431d121e331296b0f6a08a1c02 SHA512 ec9eef7881fb32eeb37389655a733b611813bfdf84c3e2569240e3d0aedc11ef30b8503a1d1b7a493b70bb1da0faa8e90d7798796b0ad14437b8881189360722
 DIST microsoft.netcore.platforms.5.0.0.nupkg 39826 BLAKE2B a122f0d2afb77455c005740fe5096c055f72eb658b0d1f10e6a17f9d07c3bf91ad0010ff472ee1d05b84bfbb75c9de3c46d2a2d33fdcaa245d64d6c3a956f233 SHA512 8493fe11648c7ecc20b6530490d30fd63744961345c0501a7a10b11046661da09b783ddceb8b3208ae52a72a8a94cafdce8dc1bd6073c32081e30d0e7407f174
 DIST microsoft.netcore.targets.1.1.0.nupkg 18162 BLAKE2B 419d19e0da934ab4b9db75dd66cc22b83a003f34e93cf7a92feccf4f32d3d695e18b826b1aba13073dd4ec53aa7905a67346921d1055516647ddcde0d79009f1 SHA512 1ef033a68688aab9997ec1c0378acb1638b4afb618e533fcaf749d93389737ba94f4a0a94481becdf701c7e988ae2fe390136a8eae225887ee60db45063490fe
@@ -70,23 +93,34 @@ DIST microsoft.sourcelink.bitbucket.git.1.1.1.nupkg 287971 BLAKE2B 7148dcfd7d5f7
 DIST microsoft.sourcelink.common.1.1.1.nupkg 271934 BLAKE2B 6678fa357eba30a58cd1b457bfe8423a2c0e1359c9088cab364707c0061a7e11035094a00a75528a290b1c9415062ce47a17600bd010f769b3d7e2501456e911 SHA512 bf2241eeeb82876f7612d525064aa90f9bb56610260d44a2fc5b75b63b45a652444c25451f7daacbe97cb2c5a6e72180805f894054f7176cc290d147a2753ef4
 DIST microsoft.sourcelink.github.1.1.1.nupkg 285433 BLAKE2B 986ee1aa2bd39c577c0ffc71e27d5ed5128dc5b2df9dcdc29f0b62cae31de120253cea0afeb583ab1a3fc5e5b50766a608f2f8ec749224436a031092fb14b553 SHA512 54c7ff8d0cafd654a115d5755710ec89534399a605949ffd43778290796022092679a43e1a129250ff9a03e61417c43dc2fc1362a9019dee88a7e048c1be953c
 DIST microsoft.sourcelink.gitlab.1.1.1.nupkg 285076 BLAKE2B 1b89d37e0986caa44c768801d9e044647fdad11efdc21068170b25189767d798bd6832bc789a7496d9e17ef35a2ad662e0a4612c0a99b5385d6482a717809c46 SHA512 54d3f60dbf9ab80e86a9752308d393db67ee97a59792e5ec1e41bf911ec5da5caab4e2ec034aeee9ca46c4da40219280f2851a2b5c9b75714faa2722670a4f4e
+DIST microsoft.testplatform.objectmodel.17.12.0.nupkg 1660190 BLAKE2B d38c48a3b28a4eef0e11d0724904c35bb0bf5ca48bed4d69666c743afb2ea522adb577709d7f12a16f02208be173dc5a260e0f1b67f7a1dc5a4d375cc1ffebe5 SHA512 925b1732000f356628ddc79a90b928778c18ae4e25015d84862ebbeb350a822569439623eaadefb0c864ff7a66f7b2ed93f85d7125b4ac9289bdc42f4f33e060
 DIST microsoft.testplatform.objectmodel.17.8.0.nupkg 1492114 BLAKE2B 32a3a7f4e4cb9af1d330fcb2588ee9602414760eb4f2bda49888372b3ed64e8c47347dbdeda11259134e37b717ad5c23b06ffeda9a1a1772e1afe299429e828d SHA512 17119c472fd87ff721677f92a801693eab53a1897582150c26a60429c99eb1764628e7ba895b40e3b10b9edc00f803b18316a6fdc906ffe54dbd2d04ac63db33
+DIST microsoft.testplatform.testhost.17.12.0.nupkg 2882125 BLAKE2B 3e8d45c7f955cb051dfd569bd3e754cf016691a78ea4f52c07febf733094e823eb0c63f3e2230a81901bb1fa9c78b538ece61a3a2fb06e098381f6a54c5c42bb SHA512 81833604e190bc510fd9f66deb57f77f91aefa298bd46d5bbc652b6c98e961c97ae91eaecece721128345cc9fc22052095dcfc46574e39a6268e4d8a712786d5
 DIST microsoft.testplatform.testhost.17.8.0.nupkg 2806274 BLAKE2B dff54d1c59a6873793bbe2d6fc9ed75c2d610a8dc41f4f9349228b690db3beb7845660c7d90a5d2588443c13aff4d97b6e0a1df58e88a398b3631a344609060c SHA512 39fb1549fd23fc2c7b4f5525043fc1152b8c62cc813a88c9701f33a666041c6690dadd455899d247fef5e6df372d17f081d6098839086007b2c10618e187ac7a
 DIST microsoft.visualstudio.threading.16.9.60.nupkg 949836 BLAKE2B 404f8ffcffc1f8ade9af0f5800d57e92c5944f0172673bf26c7c65bf81340c785a41c1eb47327beefce902d649d606dca6024502459b9ff8a75609d0abce0989 SHA512 f31127b9fcca1db2a3b6ed3b64e6fa58f3ff34c501e536cff3c7046c508fd77618fd6dbe3a716f25780f08904b4ecc02799f33d4876d2e2f0535d997abb50ca3
+DIST microsoft.visualstudio.threading.17.10.48.nupkg 1646854 BLAKE2B d44750ac7f6fd274fb408ad7f462014099e53ddeda249a1fed7c0225b76427af9516b4f627a4011b051aaf6f639b0dc0babec764ab8cb9c4c3751242a4a20efc SHA512 39d77b2864fe0e31a5870644e1d9460a9e6a55d77d0cb4a21de29945652e585cf31729fbf96b2490cb57f7af57a5ae7a252688d587c41ec6b3952cf3d35e2617
 DIST microsoft.visualstudio.threading.analyzers.16.9.60.nupkg 503263 BLAKE2B c8e1b6c90a98d9424e5fe4c9776b6d42109ae5aae8ad686f9fbd967a907fec232fc565b69c7dad291aaa5f04da833a00bedb3c29e21bc327f92e856d4697f2f7 SHA512 a163640e1ea0c72d488e2f63ed3592fabdd97398b6720ac3874b28355f2c63e35edb14d55fc32142c57b98a91efc4b1b12e2e31805ea23562b12e5b5c5921d3c
+DIST microsoft.visualstudio.threading.analyzers.17.10.48.nupkg 488754 BLAKE2B 6d248242e209524e1e9413200b4573ac73e1fe193a3e4eae5b8dbf0065efac39812138c284c9f2e4eb8d6507dfe06efbc39d10a787bf9a6490ac73fdc9314f40 SHA512 f9df8ab8e534514edb3a409c9add1fea5eff33ed43e2c20cc8e75fe91b75b47c4479becb096a50685bcbf7b389954828b2286e1db7dacedda7c29e688b977d8d
 DIST microsoft.visualstudio.validation.15.5.31.nupkg 262234 BLAKE2B 8f4714d3daf386a2b40a04d48077b09a4e0c071f4af3c33ceefb3806d6cef3e068a55e9ae092bf6ca345b6e84d57ea9827cad11b16f6ca58c21d0ea324f71a5b SHA512 2e777e6fa306b87c21efe604a6a7e6911299803895ba7f503e3870a58898ee511a32402d38190f6a971053227904f0e97d994c12687f927b77b26bac536da042
 DIST microsoft.visualstudio.validation.16.8.33.nupkg 285008 BLAKE2B d4050031874511e468714786550afcfe598f76526b006a9c84cfc9efbd761f25a3f6ddbb2178f7a69cea3dbd77f73b8f8beec5c8dbb156d708d9883efdf862de SHA512 0eb7b819a5c3496b7dedde87475d04ab93eec09a5709e5e93e70195c2dff83d6d09c58e33a05d9b24400b3b16196f0555fe9ed763a788cc17853b8a1c8ea4f87
+DIST microsoft.visualstudio.validation.17.8.8.nupkg 334546 BLAKE2B c0f0459d4f3004180bd4477d59e9c11813c62d54038d1a0aff2065bfd221fe12fc3021e376c6d9c6fdfa11776bed1941e98a570ddc048bbf67e1ae8106a7d165 SHA512 55ac16e290efdac4c1f44c450378a136240f91d7212bf9ba5e004f151e86bca72ef906a51acca9bba6d018bede1456e26296d0168b421303ca31def52c52154e
 DIST microsoft.win32.primitives.4.3.0.nupkg 63333 BLAKE2B 132ec29940d4b716110980c4f9a06ba15183d29de638379d09998124605165e51652b2727e3892b57dbc7cacfdc71f9e1b59c9dd5463a524657351f5385d896d SHA512 366f07a79d72f6d61c2b7c43eaa938dd68dfb6b83599d1f6e02089b136fa82bec74b6d54d6e03e08a3c612d51c5596e3535cbc2b29f39b97a827b3e7c79826f0
+DIST microsoft.win32.registry.4.4.0.nupkg 334410 BLAKE2B cbc3fa83efda4dbb301e1272c1f66557f76caede6b7f92dd659e4227c2b3534715f46405527a8de190106942c56a8e6d5302c6267e1d9cabc1fa1582bda9b0af SHA512 2c98753d2a2a76e82b0afeedfa4d81f75f4619dab83f2ae7b4f56530232b733e7d9ec8ceb2d626b465920a2159dd4369c6fd9d96c65d70bcc9f38eeec8e95a10
 DIST microsoft.win32.registry.5.0.0.nupkg 354731 BLAKE2B 3e98fbda73990aa8d4a8fe584d317ae59804c3ac40fb42194e332826b5be57ab78e563111dd3278a8099b9cd890d4e37f1bb74e6ec4a443edf7c783ea0cceb0b SHA512 471e66567ce59cc86475aece7815d05261264ce114e0c1688ba2551dd51494901fa72dd7a8f74f8e8f0f3dba74af8595f177552f3c06abb4bfce76692197076e
+DIST nerdbank.streams.2.11.74.nupkg 426815 BLAKE2B d2cc625db6b03e3202297f9623be3c7378e74004fc47bb906f1f91df203af12924f348e37efc0a78ed2dbf7fa882b0da2c292b372ef9b2a68a78790b9214f413 SHA512 d5c4ef4db235ae59ec4a310c531b36672c8ae13b73559f79f0fcf6bd34fd8aab94daf9a40047406990908cbbd32401696b65d8df1b1e0f1278b0e5d9b9af2f29
 DIST nerdbank.streams.2.6.81.nupkg 438160 BLAKE2B 6a7de1956b5dee56275279cd20e5fad851b9a617e516da56f96b6d09246272a1b85f4073f2b4795a318c4013ccd656fe619e28c937318be15368a3a9fc8fa737 SHA512 b957bcea9bef4d4f9f4c5ada9220fbb3b0d67d149b8776150749dfa80bd3e41974eae57831f700b7a68e882aace06bbb4bb84341fab20602183b19499432205e
 DIST netstandard.library.2.0.3.nupkg 3146139 BLAKE2B 311e5367398f76c74e78930bc2cd39e450a86bd8626311ded8d58bd84c94a8a84db3c11b2bc10f3eeba20a9d081fe7827981f702ad746b49ae3108c949ba1022 SHA512 e78f0cea69c14895b1b089644077dbce8631a626055d96522f4d29e061d8bfc3e48aa1419e74faf265b998612c03f721f5f0cef4690f824150a5689764dee601
 DIST newtonsoft.json.11.0.2.nupkg 2409669 BLAKE2B b7dd7722f7f62eadf7443ca5a54ce67f5369b557e2e1802e77a288a941dfa21310f6b54bd07d9bf107ed6daaa69abd660a3c9e9cebf4dee8b6461eecfae36833 SHA512 ce76466f0b3b138040f63c4d67b16e888448dc2f61ae06ad5504932a121865834eb9de0ce557c6953622e917583b9b10ade6c5b85fe0f54115de13b10cc5c5e9
 DIST newtonsoft.json.12.0.2.nupkg 2521025 BLAKE2B 2d6a40a97fedde8a83cef9d4ea9f5635efc83f4f7f6a8d38633e1d2011c9e9a1120979db181396c894f38c4fe0515b86781407fa607bd402dbad80f41d6cfd51 SHA512 9adc1e0573d6869d42310013b414fb65f319adb6414ca7e31b0cfa63be4dc068f1fc6ced0da5277f0f062bd299d93e1f0c8a8a2720e373d471970e7e1b615c54
 DIST newtonsoft.json.13.0.1.nupkg 2065787 BLAKE2B 000c38ce26a2a00bb25a9c1d6fb069ada521ff089bb624a5c1255b25767c10616cc51821524e7bc3d8b45eb8f8ee54c97454db1db9ae5e5c78eb6300a99f979d SHA512 83731b662eaf05379a23f8446ef47bbc111349dd4358b7bd8b51383fe9cf637e2fe62f78cea52a0d7bdd582dc6fbbb5837d4a7b1d53dcf37a0ae7473e21ee7b1
+DIST newtonsoft.json.13.0.3.nupkg 2441966 BLAKE2B 0c83cd81b9eb647fd9106c5b8b7af4ff6b35eae4fa24712f16cef1db070857b072b9e40a52ed006a82125c860dc48b89ac54224baa24bfdedfa573183e19d169 SHA512 99b252bc77d1c5f5f7b51fd4ea7d5653e9961d7b3061cf9207f8643a9c7cc9965eebc84d6467f2989bb4723b1a244915cc232a78f894e8b748ca882a7c89fb92
 DIST nuget.frameworks.6.5.0.nupkg 131644 BLAKE2B d8fbfaeb2ec4c269ecad319478b64da5ad9e44d9d82fab8b42400a15ea7d31627bcdb9f1af0f18b15dd8455ac4e92df1b25bc47808f465cd2e972ffa40333f1c SHA512 3f97626af018fa9b03f06751054be2c4e8dbd0d5329de21662b36f3336849838bf5af7d3721643faa6ea90935f836cf502661573953176cff33d4d829d953d56
 DIST nunit.4.0.1.nupkg 723573 BLAKE2B 56e92e384b92126fc1fd6889794ab0cc30707c1718c5bcd9fa62b14243a2014c3b6a628b29ea347e9fce906ff440d3b28ed857f58ba579d719e02d71075ea239 SHA512 674603ee7c4024dd83b8ba4a7180ab653404a9acaa691e58cfbf9ea58669950581d9cef51012f80d13dff43442bb648269fac0822c53400c02009fc17fcc1561
+DIST nunit.4.2.2.nupkg 702845 BLAKE2B b289c1a8d598eb24251a072aed9325a0f5bca528eb8b39a8099952ee72de6f68dc4f97723aa602b2272300b86f91e43e4a7450bdc572831aca044616bf11fadb SHA512 9056ad5b6e459a7d3b80c51556ecaa086b0e5d28133a3031d23546aab9247375d283244e68a75f5f301c74ed1fb3e0ddb12644de41022e78867be293fe846620
 DIST nunit3testadapter.4.5.0.nupkg 504560 BLAKE2B 8fb18358909ef9b5828b2b6c2a5bb1c234b2041cef7d57f22319a287bb187621c6e8e40e33b7e1e23f17b9e5ff01a2cc41f932d54e7affc935edf275f0d397d6 SHA512 be32fd672c3ab18bc948f7a6d9c41f79bdabc1fd8d2b6ad9106c14499b35a613ebf05a720959aae4507c2cc10adab45e79f48aa731c6506c716d300193d69154
+DIST nunit3testadapter.4.6.0.nupkg 512620 BLAKE2B ab251ac7d56407d35cfb352956ae153f4052a4e6c014a50becdc31ed9b2c325d0b6fcb61752e3b11e435b61c86b1f7ea51415e72f1ae894dd35acb17410fb23b SHA512 4e489dea089cbf32e01b74105003eaf64a11e11a488aefba50553f856afde2940a2659d0017055b8a86a7aa79247d5572bee41b497ceb0efe7074e8b9c86294a
 DIST perfolizer.0.2.1.nupkg 51987 BLAKE2B 2e01e7673ae420136e6194d89c406fca31af85b7f90b460a53ebbe0fef82c38ba3be3821d9e1a7b9b2bf5d117bb9f2f4f91767796bffb51ac14e5cb9f472d873 SHA512 9db50cdcf13a85737c275a0aa3dc4a98b97e7d23e7aca1c9b27df28e454b0d4587315bd62f7181dc03e0257a83d79c7af2e90733eafda70afe5a956c92c20a9a
+DIST perfolizer.0.3.17.nupkg 194402 BLAKE2B cce0ab2c908ceca70336319dc20629c694855a9b834b06cc0669fc75dff4817f90514e6a7c39346ca2e732b4f92a4aff64a199c57dd7a1edef1ab9640cb868a5 SHA512 c66ef81a4cedbee659ee54fec138b4af50c1b53171195773d39c0a3f0cbb48afe415e8577e271d7be76262bebe530ad907e8d2e20a6e3e97176ed5b5e034bd86
 DIST runtime.any.system.collections.4.3.0.nupkg 107990 BLAKE2B 802e2ae919a4834150d825ac086d8f47e2185e31b60b45f3dbe5f63b1d714953d9faaa7d8fe4cc25a1ea8495c4f8fd925bb198eea0b67e594a8558238b18196c SHA512 9f8833176c139b71a58694ae401c5aec209a63227be07c7ab559bef772082bd1f6cc38ba2949cb1c8e5c5514ad9f4ff51859838dc2f28191f8bb7ae611a50239
 DIST runtime.any.system.diagnostics.tracing.4.3.0.nupkg 49844 BLAKE2B e35998e1369bacc9fa90f74825e021c62b9c671ac9b7cfad4e9b455656bd40e968f348ba8943ed670c74c22bddb1c94ccf5058885233607e3c73a5c7d2a56688 SHA512 0b480d21e23c38965222be7fa1e1a0c7e444cebdf400d1db8d3ac609f893b82d78c5d8b271da61808b7b179dd6466a0090bd807fc2d35020f93a00f0213bb436
 DIST runtime.any.system.globalization.4.3.0.nupkg 43718 BLAKE2B d6f90f72f080afc0dbaaf487e2966d2569ec8dd51d573ba2afd1d705cc8c1f5d47ea77beb63ffe4fbc75dd6aae869a9b52e9e293b737ab32321420f635113d80 SHA512 3aac1a076212fae7d0ac81d2b5fdf216b064a1d890577307f89c9a4984c239838c3bdfac4dea052027de090704839319231eef49ce542f3e8bb2f85ba23d28dc
@@ -125,48 +159,61 @@ DIST runtime.unix.system.runtime.extensions.4.3.0.nupkg 54075 BLAKE2B f81d86cc15
 DIST semanticversion.2.1.0.nupkg 100558 BLAKE2B da51892db1453dbe2f486d8c09558ef3772851b8f877e6c67878112e64a4dd02887a31e7a5ec369e85a2d9827406be97615e35d2a11ddc2d612c60c8fef67973 SHA512 bce7655b8a53c81c8e10cb62f8eca521719a9638527ae45404cca83ceccad2fc759f3aeeb28355976691a8d74cfe5ebac1f52539c5780c765f91dd516d77c7e3
 DIST semanticversioning.2.0.2.nupkg 70096 BLAKE2B 9887b25ece5223b9b8459a397431ed7a64ed438911c4958d3619b822fb84212395e08856aed4cfeee2a9b6031acbc0610e137b0081da27a741bc1478d77e9272 SHA512 f6fc0c72931b83c31ab940aba719e2b861bf0013de93343315323617d01ce78070fddf7701e6649d30d322d5488a812f515aec4a48c92d99640e4fcb32cd1a6a
 DIST serilog.3.1.1.nupkg 663302 BLAKE2B 616f621bfa29cb8cc1844ac683b5d5ac4c859b978983637cb89d57ce2fcd28bbdfaa5a0fe213e111bd9258faf0221e854f99019184e24b6ca0976c00509f9f8b SHA512 02985d43db0efd5e56b086e0a29af986de381a163a8633ab81a88b6620a3df380afc4506366beba0f214ac8ec37c8d435bdf130285dcde331b14733e62fab8c7
+DIST serilog.4.1.0.nupkg 557817 BLAKE2B c88f4ec735c130f19db6303265e4595ff69986eda0924d421142f14cdc598b9d38b6b97d39387ec3cd65b2cdcda581945ea2b4052985ae812eaec9efecd17959 SHA512 4b0bcbc6ef35b4d1914dc870f3ecafc4a7e320b66842f8fce03d733874fd4d171885343c91e43dd1d5e49f55c50f948cf6c681c64819a8632187309ff82be15a
 DIST serilog.sinks.console.5.0.1.nupkg 176335 BLAKE2B 30933c362b84cff5e04dec4bfeb8ef0161490b229d1b12a4deab7bc05832c65b5e8f8a1e99629aaaf3f8e996ec8af40d769c658f994cfa956537e3beacc03a81 SHA512 8f7ab152456edd504e8fce061be144c0c8694f76eb6f61a0284541f23e88a8c292cab487496bb64ce4faec926b53d3923a31cf3ddc874fd9b26f02089a53bb5b
+DIST serilog.sinks.console.6.0.0.nupkg 138337 BLAKE2B 2cb29f761056154a7cda20eba369ce04ef0537fc87abff1eb92eff037eab5777f79c5e3d915984669ca2c249e88e711c411770e87c26de8db608dbb71e19df69 SHA512 49c6a20f42a9b46d8cccd76d287e92210aeb967d8f8daf93be82561fa050d91f927d0bb5ea81a147caa899b9abf47b616e5d74a8cfcffeadc1545da0b73a979c
 DIST serilogtracelistener.3.2.1-dev-00011.nupkg 31744 BLAKE2B f206fdfc6c070bbca149d3ba6c0866c8e32e37f69c2e28c26e2a311bf71a7e96dbdbbb7a3a1fd22e3eba065a8d4e51c3be9ed832b407e6c02723510ffe10dea9 SHA512 aafd5aaa93a94966774ade80562a4708fde31f56f3ee9ddcada24997984fde1bceea1508878c2c9f37c3ec6b7892a33544b23b66211c2dcf5afa08f8a09d38ed
 DIST spectre.console.0.46.0.nupkg 1132321 BLAKE2B 5b0c0620e6adea69ef2b678dc8015d54f07b06f02cd3a9b6b5f475069886067b6784892c82dc4cdf7fbfb237d6622944269e8c248a09eb2cf5328023b701ed2b SHA512 e02bd9917d0c8c16657f51a0b945833ab0ebe0b6c69d4c272dae1e0970a507eb827ccc51ec2c3e54b76d98fad8837a6168977c3da3c8fc9ea57d93f5511699cc
 DIST spectre.console.0.48.0.nupkg 1505618 BLAKE2B a5e273f563524004495a7ebda94585bc6b8d7a0051a27563119695d6907674a3071f2e9ecde1880948c2c89a8efd414b99b7f2bb0e4d84e72f7fba3edcdb775b SHA512 b3cb158f0f0cd120db79b88293eca0505a3f4573078a6c274af00380a52d83666c1494c13ca924de1f1f30ab422ed3bf33779c66b615e6850aa3031037caae33
+DIST spectre.console.0.49.1.nupkg 1525116 BLAKE2B 8d89967c2843f554c96ae5319b55c47db4df2ae67328b857076eb5ef4b03418943684c5819519d443217953cb8f7a71ff03896eb8766e59b95784f0d85d2527b SHA512 4b1576e351bc3f5fd672950fe90263e725349daa56a764a6f6840c1d0a5969a59c216309290735dbaf4e40939d6192b39d3a8a6489688637bef36d2467a910b2
+DIST streamjsonrpc.2.20.20.nupkg 1651660 BLAKE2B 03bf89747d80ab25d355646ad8e09fde4c43af2a921b37beba1fb11f9e72cb6dd7099e648a59576da89e33cdab6682917eaaceb2b4562a59965562a365d81068 SHA512 402947af9db3bcb2b360ed8ca38e2abc3de7b9900cebfcf59a3302b605230b1eb53b187baff3606e54e9d88adf37d4cb92392b15db0259c143e7b0fc89521ddf
 DIST streamjsonrpc.2.8.28.nupkg 735337 BLAKE2B 957513b3c4bc5d49e22d724e8ff63a61bacfdfa224dcc545dcd1c4a2078ec4de8a189e4087928f6ccca30ea8f0c8143414d763f670c29d5642e3d0a6ab38754b SHA512 f3311fe24a3771d7b0dfb38ff8910ece5ec5c276e468944e789cd7534bd4ceec739008d623f1b9e91b7904ea8211c7969ebd3b6dffc2e9de408da89ccbe34a3e
 DIST system.buffers.4.3.0.nupkg 35171 BLAKE2B 3b274a048ce14845ca957019b3670db00338972f6e11279e47f59ca6b4326aaecab1d11317694ed98e8a27f3de7ef6f90de94d4711ab224f805388d468728392 SHA512 3dcbf66f6edf7e9bb4f698cddcf81b9d059811d84e05c7ac618b2640efed642f089b0ef84c927c5f58feffe43bb96a6bcf4fec422529b82998b18d70e4648cbe
 DIST system.buffers.4.5.1.nupkg 93737 BLAKE2B e846885f9ace79f30bf7698a96ff3277a45fc2988a48cddba1862e23650ce55b06dcc6c1bcc29e08cf5380c9700dfcc15964f7263aeb11c737306d27963b34da SHA512 80da6158e55b9bcf7e0b5e6379b9cf45a632914f037b53c5bf5609576e3cd7821f7861956b73d74470d2d0c2e56dd235a5ef4ca6ffe7e192b820dc2d023aaff2
+DIST system.buffers.4.6.0.nupkg 67596 BLAKE2B 4f442603347f6ec2c99f724bd6024e8db224eff17e5b02a74640795aea0ee78a0cd171e07472c0c7c165d10d84c43042f01285f8fb700114dc00ebd82f4a6067 SHA512 8916c9c93497f5b255a5444b18b896f05824e557e6e62182cedc38206e08258731272f815d3084804585789b4ee9cfa43e752642ef3b28ae66d7cf3ea9b12b71
 DIST system.codedom.5.0.0.nupkg 281008 BLAKE2B ba44d0ee1856cde7487caef684e007ba48be61d4e061b0d3e1a524127823bce1e54e3d4a539f66964edbc93efdf9f5be8a46cbff7ee0868dc64333a2aa72e248 SHA512 150a20dd314a4cf96ac538a48e67b529a8453d17164646bcce9dc04a46d923e12eebea9583746ad66d0f400705118383992ac9cf7ba31563b886180913527438
 DIST system.collections.4.3.0.nupkg 810001 BLAKE2B 0079d5834bb3857c002cc686313646895b47be1079e10cf365ce9e67c05f14c2e70e782b122b07a7cd9d5090b57334d0cb2336503cf5059cdbafeb3ef3cc8220 SHA512 ca7b952d30da1487ca4e43aa522817b5ee26e7e10537062810112fc67a7512766c39d402f394bb0426d1108bbcf9bbb64e9ce1f5af736ef215a51a35e55f051b
 DIST system.collections.concurrent.4.3.0.nupkg 502676 BLAKE2B 0d98ffad345254596133bad8a487bb91bd235f2a757573c3ab7999184fac6685b4ec33316bee9b4a4e588ba96aa745a681077cb2e2d2b0a7f5cc113aa75efc2c SHA512 35c1aa3e636216fe5dc2ebeb504293e69ad6355d26e22453af060af94d8279faa93bdcfe127aecb0b316c7e7d9185bcac72e994984efdb7f2d8515f1f55cf682
 DIST system.collections.immutable.5.0.0.nupkg 623075 BLAKE2B 14724fcb8654455184f8f16f8ac56b7b3c995e632af36e91f307331620b4e9f515a13bc4625d898fbb4b57ff9f017b43cb91ab40b0cebcd7d5eefe32979afa4a SHA512 726f8db7d179714cf0efeb0fc02fcebe7b4755762902e391e77cf78671dd5d5f364c7cf4ce3545b51cc7f37327d12d1500ba19f4b934f0e8bb69a6a347c0bbfd
 DIST system.collections.immutable.7.0.0.nupkg 538962 BLAKE2B 865b39a568c4c1643efbeba07b37a9b43adab688cee8174b4875b575c8e02f3a6ebd90ebc20ffcfc096c6a2017089b8e029345cf4eb24f3ccf9b911e57df0be6 SHA512 f084afc9395d74b4f252c47b7d0e378e676d6b8b6033a68636b648b58805e3772dd22ff1ded05d3c8c8553d2e7685b29b753fe1cbb5a333f018abe6422a3ebfa
+DIST system.collections.immutable.8.0.0.nupkg 787241 BLAKE2B c46f56d995ac2cb0e4eb7b6bd2b62e80f522af8b7c1e59e4b52dbd9aa3113f3653913c9aa77c9d72655588807dbc6d17322833c768d8b8626ad231f49fba09f8 SHA512 057a9591c22b8629afbde9baab60a15a4b96e976188abbdbe85961beec1a32806a05da5caf89de84904a3fae53c38d14a9c50cea80e8383b1e70cd328d9e8053
 DIST system.configuration.configurationmanager.4.4.0.nupkg 341985 BLAKE2B 94c73192226761051208f23f1d40c7a3afdc97026e565c7ef0889883196667c3337fffb8a41367d806eeb368c59ead06460447a0982f8b1a36a366a360554e1a SHA512 44b601dd83a6773f5d137ccc841146bf7185ef8ba91a31f49c5d06f6514544b34bb0210c2298ae42c306bf6a84d2a769d4976179534ef11211a5429da2488afa
 DIST system.diagnostics.debug.4.3.0.nupkg 149774 BLAKE2B bdb6d5ee3b8ca4f28b241b098281b7d2957d0996f9345aa086a54b1a981822962e5cc319687849ee52445db47b439b6cd4e99a4c71595f6227f78160aa31724b SHA512 6c58fe1e3618e7f87684c1cea7efc7d3b19bd7df8d2535f9e27b62c52f441f11b67b21225d6bcd62f409e02c2a16231c4db19be33b8fab5b9b0a5c8660ddab24
 DIST system.diagnostics.diagnosticsource.5.0.1.nupkg 306876 BLAKE2B c2d0319fb2c0f00473e8763a416708153e54d9e879ace4cb3889fdf3daab890e5be8c801d4064e7528c2bb4979d6a116e8f8c5dd3802d9f23b702d722960b2cc SHA512 59b230e54b7344e8f037b85d4938a73f5f84a766bea6ed08e895ab88aa9f64dbfb0d8beffe3c93938f20a80ac8dc312253ad37363eab1518bcdb7f3d517c3bf2
 DIST system.diagnostics.diagnosticsource.7.0.0.nupkg 397186 BLAKE2B 686c2659094af61861182b51bdb1dda92f7573dd464842acbd113e3b26e5bedbc3a0f5538ff88ed3b45a2d67134c4ad68c22f5fb988f1f7544e480493bd8ac4e SHA512 7b711a54e1018066962c8a5d6ea0c1a6d22de56d02db5f262171ad333b4028b5fa5954af4066e40b74a9ac5931aac722de4a6ab997249d0b65697c088f9b6df8
+DIST system.diagnostics.diagnosticsource.8.0.1.nupkg 517990 BLAKE2B 380c30a5f17fcb1747acecf72477fa3e46feefbf9fa43ca73330262a6ef916d1850cdb63c2554bcb0b52e0bb11b3bd7853a1035202eb6b6454929747d7447741 SHA512 0437300281f6df9a9fb414058be81b953193c59ac35d8f3321ea1230bd3e323657bea4bff1747e68e71d271b5ee758c8e599c25ed246eb09e6537e1c1e3cb8e4
 DIST system.diagnostics.tracing.4.3.0.nupkg 581864 BLAKE2B e09e616dff7879932b358746a62b530499aa61726c4490c56d2d7a0bf888db5b42d75d89cc5befc9fdb6af231beff998b6b243c2b2a08084da089709e0c82a75 SHA512 d0a5d30e261cd45b7dfab02b7ffbd76b64e0c9b892ed826ea61481c983c0208b05b69981cd79e91cd4e5811e1cd4c3cea06a1afce05811ece58be5e4c20169ea
 DIST system.globalization.4.3.0.nupkg 589136 BLAKE2B 7b07f9b68f0744ddcfa3f0db6190c1a0696c2f89f8c5e92922ac20fc4155e22d97e7191bf7866c9b58acec056bff08531b0adacccaec7d4301e1d4b149fa511f SHA512 823d2ba308cb073b40a3146ecccd0d9fd7b1615ac3fbefb16f73d873e411fd81c3bdc87df206d3dc7e2f14c9cd53aafca684a3570c25471280aada8de805ece2
 DIST system.globalization.calendars.4.3.0.nupkg 177689 BLAKE2B b70b5d9e545835e5a3fe4c703b2bd7c857968ba1fcae5299c9c41d550338914f2ad9d168948018fa7da7271d62a3b9d2ad1e696d334ee7d3fdaefd25395aa64c SHA512 e97190231402b393774b925efc02a2bfa41d1d117a17fb87da6e399f5234546962767e9cd8f39970efa408e4f453cd1e6751a2a61e366bc97406e1b0b8a4be86
 DIST system.globalization.extensions.4.3.0.nupkg 142949 BLAKE2B 4eb77d4ce5af01136145ea867e9d6cc81181b36a178ff487905dd7d7c6a4986c518675af68eac0e854347503e11513056173a93e6803683f3fddee7677b88e05 SHA512 a4d360003f95e0c31edf39c0b91e1c73850a60ac5d0032b17db888a3c7d7134cef9acd97219d14174ad213b7c044f49b364cc5720073ebfcb6e1bf6e4ec24ce5
 DIST system.io.4.3.0.nupkg 703652 BLAKE2B b5b2627ace4cc49f35a0caf5c064c4c8262ff0fe3df79bb1bd3529b3e306c8b1e77ea9e5948de343ee786a50e12be822ca89b5ea3f16347b9c0bce6bd8071127 SHA512 bfca5a21e3e1986b9765b13dc6fbcd6f8b89e4c1383855d1d7ef256bf1bf2f51889769db5365859dd7606fbf6454add4daeb3bab56994ffb98fd1d03fe8bc1e6
 DIST system.io.abstractions.20.0.4.nupkg 43874 BLAKE2B d1442e864e1019d01b30f18b7aa6df76e6d6e7075391ce2e7cc7256bc083e473d0bb3037714d19376dfcc475f99b45915a353f0c633c17b620b4d19a53908396 SHA512 3d3ffcd84e9b0754b12a5da94eb420e789966eb5232f8aa1e72186e29974f808c822c3129646b4ad945a3d286b62521c5ba7bea4eb27fda32fc8b799dfe5046d
+DIST system.io.abstractions.21.1.3.nupkg 45211 BLAKE2B 6b82daef4cc38da83e641a94da671e1dd76325db18ec77d408a1ea5ca244566a50fdeceb97e19b6e42994fc49cc5be29045c71f080cd57184e75836b5c1048d1 SHA512 ad9a5a9c97ca1c78030ca007fb3e0b2ab09f7c084849b58653b224b492c00a21f05d3964a399b3f5c767816689859795b3351bd0d82aba9d8028fe0dd31e00d6
 DIST system.io.abstractions.testinghelpers.20.0.4.nupkg 44708 BLAKE2B 391d74bc5ac63f2352df718c10ad15c501f568fecfb6c65cebc7da96f67b2ea7572cdf004b376393c82f0beb1dd26dc87834990393bd3c8f23018013ed66f67c SHA512 fe9604f14e5d698c66ef4f4d5bb90f4f41ab0d988d36c26f5cfa968fa9084a0af4cd02c2389f82bcf8cae749826e53b5ecb61894974e23db3e025f8d855aae1e
+DIST system.io.abstractions.testinghelpers.21.1.3.nupkg 46039 BLAKE2B 9ffce1a6c0a20cc4073d06b59d0f0df9bc0fa7484de240befc9151d701eab436c6bb6eb0663f2d852172f84539498d3e099bfb0b6024aab97706ee7e43c59b96 SHA512 d5a351187f2322b8e380b8e85ae6936155560ea483ea855a47fbb98733f7717bc478b58811f7428cc35ca5c961b5e9000ffe21a2fd17c71492ff3b8438c941e2
 DIST system.io.filesystem.4.3.0.nupkg 274316 BLAKE2B 4ba513b503cfcad068c23a82423f9900c648fa2bc4fc16555bec717b6c5cfeac6c7708b28009c7a089f80c77ff744f573d72e4dcbeaa14acafb9fd3e8b5100d5 SHA512 4fb581d6f85b9529a091a0e974633752aa39e50b2be6c8a9e5eca8c2bc225cea07064ccec7778f77df9987deebf4dccec050b1a97edac0ee9107142e6a8ee7ee
 DIST system.io.filesystem.primitives.4.3.0.nupkg 94996 BLAKE2B 95fa6178164a7cc6a29c5a3fc55e415419c433b3b74abbcfa4fa5ae1bef40141b9515076b6869e8ed771b0ba6800bdb2fe6fa5d1f773ce52c40753efc0a82be9 SHA512 5885953d09582cffd973d23a21a929064d72f2bc9518af3732d671fffcc628a8b686f1d058a001ee6a114023b3e48b3fc0d0e4b22629a1c7f715e03795ee9ee5
 DIST system.io.pipelines.5.0.1.nupkg 193681 BLAKE2B 81e6ad837943179a46790282e63e3fd97ceb64389f6d9a1af1f21bad6a32e426bbab291da6c3a12d5f4503a3926ad999d335ab1b5da877a1d8321ac6e7dacfca SHA512 b5960f39e3a05e0738ca9cff49f2883fe59cc97d0f2f75f1bb8b37a5c96de0ac3631393f2b6a176895bc903bcd58581ca6e9e107de65afaa4b8a4d4875d61c40
+DIST system.io.pipelines.8.0.0.nupkg 267394 BLAKE2B 612570554ee41ae37c8987df6ec797583c95b38160aa70b1c2fba9af23f4bd85ac0ba5b7036abfc1ee3cecdbfbdaa83b861e9c017e5fdf3e726478b24e83d957 SHA512 57eb6a11e84f40a48b57b1dc5786a01aa9852122b7d15363490d8a12c9a458bf99a8ddf4c0c0247be98559c2b42e769a10bda2c5a9817735484d960dc652eb12
 DIST system.linq.4.3.0.nupkg 512550 BLAKE2B cc6cbb532575bfcfde7ac897970dcd49067186547108f46449f9f819e7910ad32496df3663d4db8eff48224b8ee95b27f7bb442bb477ad47f44da2f6fa893078 SHA512 eacc7fe1ec526f405f5ba0e671f616d0e5be9c1828d543a9e2f8c65df4099d6b2ea4a9fa2cdae4f34b170dc37142f60e267e137ca39f350281ed70d2dc620458
 DIST system.management.5.0.0.nupkg 265788 BLAKE2B 9080ac288d0b9591b0799f54b56becd9c3394e6911fda39283764db911ad302f9b6f2c9bfb49de2d8e1cd057e3bc58c08fe2979982a1446f9810c6518b0f6500 SHA512 6bf4b8e2e0836b03f5ff9fa8f2bb1bb9b1d1d46985c8b0bfeda05fa87e030f7a3c2c064dba317a1e280a57fe729739d2a674a62c73dad2e2cc0daf3e8775fd02
 DIST system.memory.4.5.1.nupkg 195808 BLAKE2B 15be57951bb2031a33315090878122d12add7d3eaabf2f3e7965dbd9d859df6030e36b87f70f1c7435e6404a908039c26d3baead8e4dfb064f5ac023c141f5dd SHA512 a289e72d03d90060f6d6ab4d306e04b5599b60e2279368d5eccfa0d74f01e8e1ce6faed939a5a703f2bc3f9a10eae2bdc312b30758845d20a140e8b6b1c28ea8
 DIST system.memory.4.5.3.nupkg 154054 BLAKE2B 0f75d5365d96b42949e53ae9498affce97ba074d6f404d30bec043e5def8cc39af05ccedffc7e9b13af4200336a9737cf44c85aa2d58069a64b1dc80537a6eac SHA512 70fce15a52cc76aacbae05c8e89e2e398d1d32903f63f640a7dd4a3e5747f2c7a887d4bfd22f2a2e40274906cf91648dfd169734fb7c74eb9b4f72614084e1db
 DIST system.memory.4.5.4.nupkg 205467 BLAKE2B c5b66e68917fc14d5b94aef9aef53087756c59473a2580448f20233e559b3ac9d691b2c063d129083593a1b610252acb01016ef078ed21b390615bf5a6e04dc0 SHA512 8ece5491eb0fe332bc190f40cf76b3beee0c5f996325034861be221fdb0ff02fd59e4f7020b3c4a1f29a457f76ff76c4c95d46d38555e4f48c7a3bf172d87966
 DIST system.memory.4.5.5.nupkg 208978 BLAKE2B 487049b1ffd622868d4aa84cc14f13127641c56937826c11d83851b7032ea248ccf8555f48aca93acc4891ac99ce2178ede50bf13ccbd70ba6004226fb583275 SHA512 e8c8e536c97b94ac3443c940b30dad43cf6e97dc7a8c3d989371048fe74e168606384f5e0143bdc0d86f7783bf9fdee8417964cb3a8a5d752713e90b125172dc
+DIST system.memory.4.6.0.nupkg 192800 BLAKE2B 33cf410dbd0ca42711f3e2aa50ee71b5b2f5f7c6f2344dcd18e17e5d4ed0a26b70cc318ed40b34741ff33a88b79ffa54efb34cba237d01da9d385ccc2819ccbc SHA512 4d8ecda55e15bf4bf06a767a27cbeb2c67f26db3ca840bcbde84f1ec49ddb19fc9ffbd6c9b4d493c21c89adbd8b70875be615ab7f18f4bf89df61b6a20f2beea
 DIST system.net.http.4.3.4.nupkg 620644 BLAKE2B b3d038bfcc0232f449e9dba14ad885cd29a5df759520d0c6ca12333d8fcf052e2a3b25347df376604442e3bf10b5a2072b6c0dd66ae41bc7c9bf4e17908a8bf5 SHA512 163edeef734d1f0a1ff7b8053d326eabc82fe86f3de72c6466dd780d59d974487882f2a5f16ae4b02c0d8c8a7f25e617ff2bbfab133f88ebfd6a2f99637169ed
 DIST system.net.primitives.4.3.0.nupkg 769347 BLAKE2B 070d9aaecf9c4ec485850954c425d6d6af23fdb8a50fe40c305657654fcaf58d366f29f62bca6ae32c8604dfd7f5217f822ebe03c68446d4fbc4ee7e44b07852 SHA512 9f7fdece330a81f3312ea7c804927852413bee2c929f3066b736993803df47cc0692fbca236c222bf19dc8f59b42f54f2a4c00da9a4d624e458da5874d127ce6
 DIST system.net.websockets.4.3.0.nupkg 105598 BLAKE2B 900ff40ebdb1238ca959457e5f7f391ab07c411745eb3a53a756bcb8bbb22a4ebceb294339cff25e7cf828c6542d2c721a524fe5b2409509ab4fab33004554af SHA512 2bdda352b9ea21fcc1afc22cb1bba541eb73f1fda002cd970b68f25566d4bebfbcd38616bfa2c892c048cfce1657b1d2b6996ec374504dc1f1777f82e7321ec0
 DIST system.numerics.vectors.4.4.0.nupkg 337043 BLAKE2B 94cca7283873edd9199d843db78e23bc5815de039c2aaeb67ba3cbe4cb5e161eab27b89cfbeeb437f0a9d235b48e86a5b31f53306a7e7a2a38feb28d6e5e523c SHA512 81d46b509b3546b8d6dc9079a7cda162303aef1a1e14bbe1d127522168d388df2a13195b16dfd1b57c1560d73906e909fdff4e2b34104ba81a9336c97874ea1e
+DIST system.numerics.vectors.4.6.0.nupkg 136752 BLAKE2B e59029c092d623cfc8cbc8a5d64c8d4ebbfe9aadb736c6188442a3e3f3ff08d0458987ad6ef126b8d481323c5f7c07dd88a2932a7b040eb4e11de41d261e8770 SHA512 7716566e79dbdb5fb942e280894127b498ab8792a25359ea94b5ad06ee2ff7f171d519ec80d9fc4f85db99086f0aafd3f78db4d4fe84b061b6cf663975e775c8
 DIST system.private.uri.4.3.0.nupkg 16869 BLAKE2B 7a407e16b35e4a5f405029e80749f7ae1c907707d9f72657016667ccf1255463011497b09b7d9e23fb3ccfd4de508dea48b33b13267775619f63134897e54c61 SHA512 5989a57ef273b689a663e961a0fe09d9b1d88438e5478358efc4b165de3b2674fa9579c301ce12d2d2fa5f33295f2acb42eceea2ebebf70c733da6364ceaf94d
 DIST system.reflection.4.3.0.nupkg 700821 BLAKE2B a6aaf054f27be81f1a8251241deaddd6d35aa9ff1cd1b35a65c75201c3305ca0481d8f7a6de52a85736b0477332c404573db300f324e6301365f14fd59784225 SHA512 2325b67ed60dce0302807064f25422cbe1b7fb275b539b44fba3c4a8ce4926f21d78529a5c34b31c03d80d110f7bace9af9589d457266beac014220057af8333
 DIST system.reflection.emit.4.7.0.nupkg 406832 BLAKE2B 7c523b9105ba23b7ae5cebe4661641a79000981b7530f05664d1e0b87195d3eb6c119d2850b2e416de97ccb1a678dc151e5df7e7665f293a7389422efead6f94 SHA512 10c0325b993a31d993c58adeee5f1c6fd7ff66173bf22bf0d295d29bfb30f0e01ec3042aceac5e245bb62d8fbfed63ce02adf74e04cf55811e0cf3d541b897a9
 DIST system.reflection.emit.ilgeneration.4.6.0.nupkg 203555 BLAKE2B 40fcaed8c200851d3ddab722d172996bf716797755abe83b7443c172974043b5c182f962284379704475be2820fb76c25d7e14ac7583049e4935cf27b1c4d95a SHA512 ebc749f2fbf95d2fffca55a0d1333226c3110d30b9d582919b09e5753c089df6412cf5b568f0b1a4b62128948cf92cb8a2cd6f9e60b60ab73b054243198bac20
 DIST system.reflection.emit.ilgeneration.4.7.0.nupkg 204011 BLAKE2B 07db40691e6669baa6f54778623b6881c1cd248dda3dcd589a9af0ec297c810f2c978eb633c5a682d559bf02dd1d5d418d621bb461611d22e23d25ee9a5ac223 SHA512 890d97c3ca82f180ac877f8e50032d0f883c2e2039afd671561943667dc3a24ec2dfcd896cb94f372c975c25b72918afd046efc2dedbd5962a988a027abac8d9
 DIST system.reflection.emit.lightweight.4.6.0.nupkg 155214 BLAKE2B 4e89298905e3a87780ffc89310f6e66df164f85fd0b4088426f539b99aa9ca3c37f80c9d891439589455df64177ebf2fd65b432237bcfe81791fc7e8c9541f81 SHA512 d8a7f429cee710a91ffbb63a45d81be85771f71a9da136810df154748214aaeb912a26976500d86d8910c48e2a7bdd02160c6451e45601d42f54ba94182ecc62
+DIST system.reflection.emit.lightweight.4.7.0.nupkg 155693 BLAKE2B 86a72eb6666223b2753d6193f0c5a46d227ab6e305d917492b4153f886dd27742d5127dcb7723bbef9384260813e63b8c17264fe4301aaa25d66e924322331e0 SHA512 065af503d56a93e654927964eac16b84e729baac786e9ee4ab065f8709269a1cfef5d80e97c719f429d25db6a56cbf6b7c79a2e470c5c9dc50b1fa339763ef8d
 DIST system.reflection.metadata.1.6.0.nupkg 852113 BLAKE2B 4d15704a1fe00501c1bd8c945d02cd2e2d77c12ce86aa628edd18383838c9dbbfc449b8026707bb1ac570e55369e988aa6068f57acdea28f519bd3bdfd5b9304 SHA512 f5227666edc6bb1da78b8a8e86a68e9bd647caa2ec6a1580c14a4a5e1fe5cfde3bdaf0d8c23dc210c405a55f83ceb6add1a9adab149dc065b38cfddc9b01ba20
 DIST system.reflection.metadata.5.0.0.nupkg 1006081 BLAKE2B 2b10bc13e07d904270e3661435d372008ab9aee0c0dfd409251867273c3e9541392413018306900b0d9c114843756828c946801f65912e27f7a3d351c9061c52 SHA512 3b74e3e491eee87a8410f5b9a2e556233d9919267f6a054da7a4c9c34b6916b07c77ea9ef8cceb5b7c3361e7394e502cc3c9a09247c6a06bb58509e82554e527
 DIST system.reflection.primitives.4.3.0.nupkg 281679 BLAKE2B 36dc0fb5e7a6927ab2f54bc9ccb2e032cce0284c3aa9b83cf2ded8bab5fc7918553b06b16bef69161a7d9a0548b3e9159ab582533578cd28a661225559bd2b1d SHA512 d4b9cc905f5a5cab900206338e889068bf66c18ee863a29d68eff3cde2ccca734112a2a851f2e2e5388a21ec28005fa19317c64d9b23923b05d6344be2e49eaa
@@ -178,10 +225,12 @@ DIST system.runtime.compilerservices.unsafe.4.5.3.nupkg 102160 BLAKE2B a86cea101
 DIST system.runtime.compilerservices.unsafe.4.7.1.nupkg 106815 BLAKE2B 75dc584026b4bc589ec1bdaeb7ee8933a147391f7ecb71e69c9397d517368f5c1acb22d1a1a2f10a853baaf9fb659b59d5827baf70ce882792ce93cc3be09b13 SHA512 c8d781feacf79f3effc1c231a84beb0fa1e869fbeaa1d94ba3e84db75afe915e045c39ce059331fe48956534dcebdcd54fd97ab199e6a090bddc5250e208ee52
 DIST system.runtime.compilerservices.unsafe.5.0.0.nupkg 130329 BLAKE2B 661dc87cbbfceb67d13b0bdbcf3a035609213e4b99afac13ac773128b4a4428272e84f17e70fc84218fe1569f9ea9f28152c239713580ef5a75d4fbd6a87f08c SHA512 23226c503b06abecee5a9604a6e4dd3dabcdf921f55d6aa6dad2bab1ca12a001c7866af5a6de01cc9b4ace54e5c8ee1d5c2fd29dd9dfd7eda3ed86f9b35fa59f
 DIST system.runtime.compilerservices.unsafe.6.0.0.nupkg 84343 BLAKE2B aea2f833d6da80dbc275c47bfb207d77a1f2dd203a29352ff5a6e96d8b52752ee3c5bde38117c5ecc5dfbad66d8b47b2001efa1e2d564e14cbbf58d0d1fe208e SHA512 d4057301be4ec4936f24b9ce003b5ec4d99681ab6d9b65d5393dd38d04cdec37784aaa12c1a8b50ac3767ed878dae425749490773fec01e734f93cf1045822b3
+DIST system.runtime.compilerservices.unsafe.6.1.0.nupkg 62013 BLAKE2B 338e41314bb5ca92ff51de48fd052613685877af5e829c2588fbb926d8f509344910d24e4311ad3247c9752899f850f022d7a2674aa2e91ba0fad282dd652044 SHA512 898d2ea5f7507a26827e8c53fa6e172726f4209364e01f532d015a9ce08ead4f57e71d71d938cac743856cb9a0d551b674ec8be671cc9f5f7c48143dd58cb591
 DIST system.runtime.extensions.4.3.0.nupkg 1060357 BLAKE2B e58c5c36d42228a507fba876d43f064b872c93dc4a48e9a7475a77c27e00f2added1dbb8dd5d6516a4c5652ef2b01f5fa31aa611360b38a0b66a0b1a2e479699 SHA512 680a32b19c2bd5026f8687aa5382aea4f432b4f032f8bde299facb618c56d57369adef7f7cc8e60ad82ae3c12e5dd50772491363bf8044c778778628a6605bbc
 DIST system.runtime.handles.4.3.0.nupkg 54854 BLAKE2B e68360382f2c625e3b1526dddb1d49c6bddc9b78d38041801f0df876f1b06d429c608ff3b28a0c1415495eb38fcd70aafa9fe8dc0bb323790e8a85718a9f93f9 SHA512 0a5baf1dd554bf9e01bcb4ce082cb26ee82b783364feb47cba730faeecd70edc528efad0394dcce11f37d7f9507f8608f15629ebaf051906bfd3513e46af0f11
 DIST system.runtime.interopservices.4.3.0.nupkg 2597020 BLAKE2B 4753b772f9d3596eae34b10497af40bc6e7cd63e9319e5789378cd148b009ae9fd5bde5e5757954ef06826bd4f4b79a3f8d8ea07766238407f26f3e222cdb2cf SHA512 650799c3e654efbb9ad67157c9c60ce46f288a81597be37ce2a0bf5d4835044065ef3f65b997328cbbbbfb81f4c89b8d7e7d61380880019deee6eb3f963f70d9
 DIST system.runtime.numerics.4.3.0.nupkg 283763 BLAKE2B b9e2ffc7e974fb4824ed174be43e664d0fcbe1e996640b8f66a17503c8af24d106e883092fd61b2990c32472423bcad943e07b7e25d126563a219e1b617446ee SHA512 3e347faa8e7ec484d481e53b1c219fe1ce346ae8278a214b4508cf0e233c1627bd9c6c6c7c654e8c1f4143271838ddd9593f63a1043577ad87c40e392af7fd34
+DIST system.security.accesscontrol.4.4.0.nupkg 562260 BLAKE2B 6d0a2b0d4b986a08882ac88ca96a36f3126cccff87db0bb87733f84f031908ef888554d2ff55cf0cf1cd37e0230d035033c8460d3fc18aae45c7fffe1e439249 SHA512 50f17eb3829cb4e0a993b76905edd0b59d40cc510729d84eb623432f11a70ff9f12ac55bb28c39382953cbc73bc8e39bc3f12f6eff79c51c197d8678c0b5787c
 DIST system.security.accesscontrol.5.0.0.nupkg 621573 BLAKE2B 617baef046a8bdb637db288425206cb95e6be55c53c3829690253fd76987b0fdebb1cd79db556c437ff5d9a0f4940e7d747e3e7b611e941f5f54248b6adfa32e SHA512 ae6b03ad029d3eb6818a6c8bb56cf4904013fa535a67b8e621b783a029dd88aa2e471e002cbc7d720381ad8bc8c6b93111a08f6ce2d271af6d974bf4d02b6c81
 DIST system.security.cryptography.algorithms.4.3.0.nupkg 402204 BLAKE2B 3bed21fdd12f005b6a7eb225623e71880a37c79cfdaa770971b6563d8e7f613a64617c73deedc2c6c31fd8e908f9ac95903a1004f1376bd914431f89c9dcc8f0 SHA512 7641d70c2ba6f37bf429d5d949bda427f078098c2dcb8924fd79b23bb22c4b956ef14235422d8b1cc5720cbbcc6cfee8943d5ff87ce7abf0d54c5e8bce2aa5e2
 DIST system.security.cryptography.cng.4.3.0.nupkg 290620 BLAKE2B aaa7b495dd7a8884b125f05b62d3e641cfb04e82f8f376f1e1839cdf124de4643dcf1e6de02e0296768db5f430a33d75cd2003261a815059055ffd5f050c65c4 SHA512 6272273414eaa777e78dca1b5ecbbdf65e9659908082aea924df0975e71f4c1b47f85617edf90ead57078c29513a160ca62f123be9f9f339dfb9c9386844f5ea
@@ -191,15 +240,23 @@ DIST system.security.cryptography.openssl.4.3.0.nupkg 71949 BLAKE2B ec1654bbd09e
 DIST system.security.cryptography.primitives.4.3.0.nupkg 81382 BLAKE2B 55bcbe3143e85d24f47c72ec5e1f0ad38a1f931932b3a8a03dc00028668fc085d070dfcded55654e09328a745b208b9f15928aaff1087d8906bad41d7cfb23e0 SHA512 5ad8273f998ebb9cca2f7bd03143d3f6d57b5d560657b26d6f4e78d038010fb30c379a23a27c08730f15c9b66f4ba565a06984ec246dfc79acf1a741b0dd4347
 DIST system.security.cryptography.protecteddata.4.4.0.nupkg 185701 BLAKE2B 8133633dc020cba0b552b7e1e498cda3b4f8578132e83a9fe38bb6f79a5b5ceaa76089440de2f6c7a948e160e9aebed1fca467cd02a9ca09b5e5cdcbf5c8f1c7 SHA512 5b011ec6f05dfb5ef27d8edf712f9f04697e1c00c47c226e29e0c9a814fb0fa8fabcac18bdf2f21aeab6cbf326aca3910ba99b630b61ee48e29ced663e14cbde
 DIST system.security.cryptography.x509certificates.4.3.0.nupkg 706727 BLAKE2B 67c777394c982267c08dba232dd75aba6e924784d14388f7f8e347293c8f3a67ef9490a078b3f56f649a1ab352a4c924630f384850e3d5f1510dceae45fd0af1 SHA512 318d86ab5528e2b444ec3e4b9824c1be82bb93db513eab34b238e486f886c4d74310ed82c2110401fe5cd790e4d97f4a023a0b2d5c2e29952d3fd02e42734d00
+DIST system.security.principal.windows.4.4.0.nupkg 372259 BLAKE2B 3d1d5283919899df29c3718cb4a537b89638754c36d7c86981e9da7934aafb02915fda7d670ae132f73beec94bee88c5816dba4062088d73e30d7b72329f54ba SHA512 ca70b904a63086038de961ffc8f33964b29cd7dc2a0b5dc0e5f9788596b92dff29430bf56266c23ca1ae6a5592461128395587d85cd984e5dab8447a6a5e14a6
 DIST system.security.principal.windows.5.0.0.nupkg 535022 BLAKE2B 4b20ab3cc0b4bc820df360df57b2eb0e2059de677c432af31e73acdf600a417685900aed2cee8e33ba9020d02ae688096cd9c3a77da441ed33cf968c90124bd5 SHA512 44a920aaaf22b2172d41319bb57ab2b8e1a4531d5f02192a6f53a81d875125195b60ba0b5a44a45981d137fd7b0f3a65b12959b5fd97afc0578cd84ef27467cd
 DIST system.text.encoding.4.3.0.nupkg 327281 BLAKE2B e153609b257919932499a013337b8b2a4087ebff7e8ffe6854ad1c70fbd058aaabc4e974313dfb3cf1a9355b0ced87bd97cd39f6a4962b8a4a87003d3a66c53c SHA512 6ff7feec7313a7121f795ec7d376e4b8728c17294219fafdfd4ea078f9df1455b4685f0b3962c3810098e95d68594a8392c0b799d36ec8284cd6fcbd4cfe2c67
 DIST system.text.encoding.codepages.4.5.1.nupkg 4234891 BLAKE2B d06be022d76a5793999248baa82db37adc262da2e74531d75f5f5e1a6c29b0ca702694b19c3254ab2e955f5b70959ff22f35d43593a2072af6ba5b7952155dc2 SHA512 12edddc9452a0c592eb24aeb2b9e152d60b8d44540349368e6fce3a239c6029847f8557adcd260df3b39c744ef45a6034d9db2fbce9e20e2b8dc78363578b0ef
 DIST system.text.encoding.extensions.4.3.0.nupkg 244195 BLAKE2B 9dc2fbf672e07c5302bbb8435e8c09bc91febb96f22b85b57b09b2046fca224c786f8710b634559de2722f3dbece7b30e6a3c6a78e98e77f955d550e440beb60 SHA512 e648c5dc781e35cf00c5cc8e7e42e815b963cf8fb788e8a817f9b53e318b2b42e2f7a556e9c3c64bf2f6a2fd4615f26ab4f0d4eb713a0151e71e0af3fe9c3eed
+DIST system.text.encodings.web.8.0.0.nupkg 374440 BLAKE2B 97211e710df3dcd17932f168e254806d7c8692ac01d667a2e89a5ddc956b24fba8467fbc2d451057757b5c502442d2c91bcaf0f867da7e95456b2aa18136b354 SHA512 ba0822c38c3b658aba9495642d269e882b827e3be4ad2dc1426d8a97d3cbc5a2277c5f80847d0cb9381078af01523328c4992caa058146d5d8ee6b8a08609c32
+DIST system.text.json.8.0.5.nupkg 1986315 BLAKE2B bc96765a19fd097c5aed6605f83f5236adbf75204a9da6a9ee2ce28372ca84abe87c8e0e0885d0b4d66e7937a14c582752ea353b7d53c5817e2738d1c2e5f8ae SHA512 13589021ae3e81f54c877abf613ce931cc24ca57bf127af1063ccc1eb4dc57a6cc223a61e6452207f5d0dce453b6627430e31e4143c78e71e9b5dd647f680abf
 DIST system.threading.4.3.0.nupkg 708088 BLAKE2B 004d01762fad35a4607522d974a0cdc3d0049c82fe704f2f86fb98ee81059ebb56d13c290fcd273d1067a1a7c7f17bf3259d4d7e802c1d09a95e3c5fa29ef3f3 SHA512 97a2751bdce69faaf9c54f834a9fd5c60c7a786faa52f420769828dbc9b5804c1f3721ba1ea945ea1d844835d909810f9e782c9a44d0faaecccb230c4cd95a88
 DIST system.threading.tasks.4.3.0.nupkg 840017 BLAKE2B 1cf4a8cc833da0a38304757db3808df5c217518c817d5807bf6f35393725a31223129fd1c4c964a36a60c65b686d24fc25d1777fa12ee622bddbb0f7c1772bec SHA512 7d488ff82cb20a3b3cef6380f2dae5ea9f7baa66bf75ad711aade1e3301b25993ccf2694e33c847ea5b9bdb90ff34c46fcd8a6ba7d6f95605ba0c124ed7c5d13
 DIST system.threading.tasks.dataflow.5.0.0.nupkg 485792 BLAKE2B 925015fbba2ed7621ba4298615d6eaf11f6447d0b4cb8957dab04dcf88cb6972a91ef6c586deb189e348a9efc3c10cbf97c2b2a1c91f9852a8e506e79ed05823 SHA512 38b572abad0babfab4c7ba2bdaf0ff7b917cb3abe7052377258c8ab1376c2ee871df9ebc131ca7100666bdb941f7341b331dda73100b3bc88e80c737e1951763
+DIST system.threading.tasks.dataflow.6.0.0.nupkg 403433 BLAKE2B 9e20d3ef669b977daf30a0b6a21f9faa7aa8c25ae42597499b262188283aec4eaef1b64be994ef308e52778e895e5ee8baf6d744831997179c4a3d7800efde7c SHA512 b4139fbffcb66b9824a960f6fb62639ac7d34cbe2c2d0e2331a975b4585618b4f21370409c3349ab1830e7b944f205f52af2685f102b771a312e553dc8d45112
 DIST system.threading.tasks.extensions.4.5.4.nupkg 89582 BLAKE2B 728fc5794745b706a7e3a7d05186f34e2a8c1837cafdc7fc9a1bd8fc6fd42025448cbdfa53415a05d872aa08db1deb31d104054630c9ac7ecd29a2ddd973fd5c SHA512 68052086e77d3c7198737a3da163d67740b7c44f93250c39659b3bf21b6547a9abf64cbf40481f5c78f24361af3aaf47d52d188b371554a0928a7f7665c1fc14
 DIST testableio.system.io.abstractions.20.0.4.nupkg 254255 BLAKE2B c611f74a2744aa022eb57f6fdb83aac5f2eb2a1342b895bee580c236eebcf0303b2bc3678ba4c3264fc5a9301ea84f76279bca31f3a5f76b67a377561e87d910 SHA512 ff2667d486fc6e0762c52cbbd15b0665cc06c652098acb2171319f0a14f508477c7c4e35832dd4a2b5dce178230d19d3ead0a3973d4a0fe8471e3ddfaea91c16
+DIST testableio.system.io.abstractions.21.1.3.nupkg 246748 BLAKE2B 93d5aec92b0c77b44769a8ac6b5eec58fc98396a7cd5f035fd7c628267f1f5a28a6be8869554861c409c990def60e6f4f283173280b4740448ee8390af7f48ee SHA512 23bc00135f1c848d1ca158a8066e265d6c66e0f0992f5996129b5315f7dc38719cbf7ebfa856c0291e42f90e6bd4ca2db152812490362941902fe0f305b548ae
 DIST testableio.system.io.abstractions.testinghelpers.20.0.4.nupkg 376702 BLAKE2B 30f3b5f00ec04e7f75372c977b847adeb1230df72657c7483687577214087243d2ec7c6b61ce8385ff9d34c7e9d87d79f75a9c5d582893c809745a254216a03f SHA512 135c39478794c093e7d0059a4293837598d152ec7425b562316a7f68fd3437fa52478a44d779fb3d92167f056448dce25a3307c483c2bf5cf6c0185e1255c685
+DIST testableio.system.io.abstractions.testinghelpers.21.1.3.nupkg 372704 BLAKE2B 8cf17160385391eb27befbba38ea777340528ec3f64f0fa1bc48bced642e16b226eec7ba08a6079b359a0238941abf92b0c8539daa91bf023274746d8caede09 SHA512 cac0f9b2e105399465925ae486e3d25a3028c4bbe86fe4d093d1e9bafe25d7b90f7deecc395a18a78106163fcb66202e364274d1f0901bec04324e45a13801c8
 DIST testableio.system.io.abstractions.wrappers.20.0.4.nupkg 382173 BLAKE2B 7d545e1bba287b43e74c77f8b2066444347a5438c1fb6e43ca292df52ecd44c45f17315bd7b26165826052ae5cf50b407875d56a218d5b3ca01249e73c98c696 SHA512 8bcce95a7c61dcc60c9e1a8d1b58b146baaaf0fa74b6fd9e599c5b5712ca4717a8f64e0d6946dadd1ab70461446b7c95a4ad8dc0939b7f67a3828e2c3c2e46a7
+DIST testableio.system.io.abstractions.wrappers.21.1.3.nupkg 375720 BLAKE2B aefa46238261a615146801aafbb17f3abe545d5e7d00e1b9f69290b63d52f60da4a4b5f805d7b0d190499148f5ea060b0186e2b6af114b7486e54cf0b04de8e1 SHA512 8fdf7c7c2cbfe50bc37b5e3e9879f1bfbe31aa3ff97e665d0ceb0133c110f342b9868b41aeaca84525c638dc77786f7f92de8b75e0c29313f801a739c716b8c5
+DIST thoth.json.net.12.0.0.nupkg 187213 BLAKE2B b3958b1efef45a2027da7319852c651e23404a95d48a7317f2da77fb7afc4003161b2c6b89189df40b0884a0c88ff5af7db204c1beff30a222932e230566ef9e SHA512 18c14c20170ea2bc091929ae841248e0ba39ef3f71049469ccbe3fe4a42cfeddf7173edd48ba3df6a5cc0bccb673f3b94df9531fce7de03b5ec6876fe0a7c845
 DIST thoth.json.net.8.0.0.nupkg 172424 BLAKE2B 4c8e822c24add902b9ff56709a6e81c73bc70726ebb652a59276afed68c8ea06271c0c477631feb7c87f4959584098fbbbec5d4f805476ccaa9640587ac8d977 SHA512 159c93fcfbfd1f9a9dae976c2373dcd7fd64a9e332b8b8ea8ad32b6b5b43ccae94fc81fc6fa1fd006d8ff969e909b29492b35878780443b729214f367521e001
diff --git a/dev-dotnet/fantomas/fantomas-7.0.0.ebuild b/dev-dotnet/fantomas/fantomas-7.0.0.ebuild
new file mode 100644
index 000000000000..97fa1065b4be
--- /dev/null
+++ b/dev-dotnet/fantomas/fantomas-7.0.0.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOTNET_PKG_COMPAT="8.0"
+
+# Required tools are on top, they are listed in ".config/dotnet-tools.json".
+NUGETS="
+dotnet-fsharplint@0.19.2
+fantomas@6.3.9
+fsdocs-tool@21.0.0-beta-002
+fsharp-analyzers@0.25.0
+
+argu@6.2.4
+benchmarkdotnet.annotations@0.14.0
+benchmarkdotnet@0.14.0
+cliwrap@3.6.4
+cliwrap@3.6.7
+commandlineparser@2.9.1
+dotnet.reproduciblebuilds@1.1.1
+editorconfig@0.15.0
+fable.core@3.1.6
+fparsec@1.1.1
+fscheck@2.16.5
+fsharp.analyzers.build@0.3.0
+fsharp.core@4.3.4
+fsharp.core@5.0.1
+fsharp.core@6.0.0
+fsharp.core@6.0.2
+fsharp.core@8.0.100
+fsharp.core@9.0.100
+fsharp.data.csv.core@6.3.0
+fsharp.data.html.core@6.3.0
+fsharp.data.http@6.3.0
+fsharp.data.json.core@6.3.0
+fsharp.data.runtime.utilities@6.3.0
+fsharp.data.worldbank.core@6.3.0
+fsharp.data.xml.core@6.3.0
+fsharp.data@6.3.0
+fslexyacc.runtime@11.3.0
+fslexyacc@11.3.0
+fsunit@6.0.1
+fun.build@1.0.3
+fun.result@2.0.9
+g-research.fsharp.analyzers@0.9.3
+gee.external.capstone@2.3.0
+humanizer.core@2.14.1
+iced@1.17.0
+ignore@0.2.1
+ionide.analyzers@0.9.0
+ionide.keepachangelog.tasks@0.1.8
+ionide.keepachangelog@0.1.8
+messagepack.annotations@2.5.187
+messagepack@2.5.187
+microsoft.bcl.asyncinterfaces@1.1.0
+microsoft.bcl.asyncinterfaces@8.0.0
+microsoft.build.tasks.git@1.1.1
+microsoft.codeanalysis.analyzers@3.3.3
+microsoft.codeanalysis.common@4.1.0
+microsoft.codeanalysis.csharp@4.1.0
+microsoft.codecoverage@17.12.0
+microsoft.diagnostics.netcore.client@0.2.251802
+microsoft.diagnostics.runtime@2.2.332302
+microsoft.diagnostics.tracing.traceevent@3.1.8
+microsoft.dotnet.platformabstractions@3.1.6
+microsoft.extensions.configuration.abstractions@2.1.1
+microsoft.extensions.configuration.binder@2.1.1
+microsoft.extensions.configuration@2.1.1
+microsoft.extensions.dependencyinjection.abstractions@2.1.1
+microsoft.extensions.logging.abstractions@2.1.1
+microsoft.extensions.logging@2.1.1
+microsoft.extensions.options@2.1.1
+microsoft.extensions.primitives@2.1.1
+microsoft.net.stringtools@17.6.3
+microsoft.net.test.sdk@17.12.0
+microsoft.netcore.platforms@1.1.0
+microsoft.netcore.platforms@1.1.1
+microsoft.netcore.platforms@2.0.0
+microsoft.netcore.platforms@2.1.2
+microsoft.netcore.platforms@5.0.0
+microsoft.netcore.targets@1.1.3
+microsoft.sourcelink.azurerepos.git@1.1.1
+microsoft.sourcelink.bitbucket.git@1.1.1
+microsoft.sourcelink.common@1.1.1
+microsoft.sourcelink.github@1.1.1
+microsoft.sourcelink.gitlab@1.1.1
+microsoft.testplatform.objectmodel@17.12.0
+microsoft.testplatform.testhost@17.12.0
+microsoft.visualstudio.threading.analyzers@17.10.48
+microsoft.visualstudio.threading@17.10.48
+microsoft.visualstudio.validation@17.8.8
+microsoft.win32.registry@4.4.0
+microsoft.win32.registry@5.0.0
+nerdbank.streams@2.11.74
+netstandard.library@2.0.3
+newtonsoft.json@13.0.3
+nunit3testadapter@4.6.0
+nunit@4.2.2
+perfolizer@0.3.17
+runtime.any.system.runtime@4.3.0
+runtime.native.system@4.3.0
+runtime.unix.system.private.uri@4.3.0
+semanticversion@2.1.0
+semanticversioning@2.0.2
+serilog.sinks.console@6.0.0
+serilog@4.1.0
+serilogtracelistener@3.2.1-dev-00011
+spectre.console@0.46.0
+spectre.console@0.49.1
+streamjsonrpc@2.20.20
+system.buffers@4.5.1
+system.buffers@4.6.0
+system.codedom@5.0.0
+system.collections.immutable@8.0.0
+system.configuration.configurationmanager@4.4.0
+system.diagnostics.diagnosticsource@8.0.1
+system.io.abstractions.testinghelpers@21.1.3
+system.io.abstractions@21.1.3
+system.io.pipelines@8.0.0
+system.management@5.0.0
+system.memory@4.5.5
+system.memory@4.6.0
+system.numerics.vectors@4.6.0
+system.private.uri@4.3.0
+system.reflection.emit.ilgeneration@4.7.0
+system.reflection.emit.lightweight@4.7.0
+system.reflection.emit@4.7.0
+system.reflection.metadata@1.6.0
+system.reflection.metadata@5.0.0
+system.runtime.compilerservices.unsafe@4.5.3
+system.runtime.compilerservices.unsafe@5.0.0
+system.runtime.compilerservices.unsafe@6.0.0
+system.runtime.compilerservices.unsafe@6.1.0
+system.runtime@4.3.1
+system.security.accesscontrol@4.4.0
+system.security.accesscontrol@5.0.0
+system.security.cryptography.protecteddata@4.4.0
+system.security.principal.windows@4.4.0
+system.security.principal.windows@5.0.0
+system.text.encoding.codepages@4.5.1
+system.text.encodings.web@8.0.0
+system.text.json@8.0.5
+system.threading.tasks.dataflow@6.0.0
+system.threading.tasks.extensions@4.5.4
+testableio.system.io.abstractions.testinghelpers@21.1.3
+testableio.system.io.abstractions.wrappers@21.1.3
+testableio.system.io.abstractions@21.1.3
+thoth.json.net@12.0.0
+"
+
+inherit check-reqs dotnet-pkg
+
+DESCRIPTION="FSharp source code formatter"
+HOMEPAGE="https://fsprojects.github.io/fantomas/
+	https://github.com/fsprojects/fantomas/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fsprojects/${PN}"
+else
+	SRC_URI="https://github.com/fsprojects/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+SRC_URI+=" ${NUGET_URIS} "
+
+# See file "Directory.Build.props" -> tag "FCSCommitHash".
+FCS_COMMIT="e668b90e3c087e5fba8a855e502af60bf35be45e"
+SRC_URI+="
+	https://github.com/dotnet/fsharp/archive/${FCS_COMMIT}.tar.gz
+		-> fsharp-${FCS_COMMIT}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}/fantomas-7.0.0-directory-build-props.patch" )
+
+CHECKREQS_DISK_BUILD="2G"
+DOTNET_PKG_PROJECTS=(
+	src/Fantomas/Fantomas.fsproj
+)
+DOTNET_PKG_BAD_PROJECTS=(
+	src/Fantomas.Benchmarks/Fantomas.Benchmarks.fsproj
+)
+DOTNET_PKG_RESTORE_EXTRA_ARGS=(
+	--force-evaluate
+)
+
+DOCS=( CHANGELOG.md README.md docs/docs/{contributors,end-users} )
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	dotnet-pkg_pkg_setup
+}
+
+src_unpack() {
+	dotnet-pkg_src_unpack
+
+	if [[ -n "${EGIT_REPO_URI}" ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	dotnet-pkg_src_prepare
+
+	# Reimplementing "dotnet build.fsx -p Init" in shell.
+	mkdir -p "${S}/.deps" || die
+	ln -s "${WORKDIR}/fsharp-${FCS_COMMIT}" "${S}/.deps/${FCS_COMMIT}" || die
+	find "${S}/.deps/${FCS_COMMIT}/src" -type f \
+		 -exec sed -e "s|FSharp.Compiler|Fantomas.FCS|g" -i {} + || die
+}
+
+src_configure() {
+	dotnet-pkg-base_restore_tools
+	dotnet-pkg_src_configure
+}
+
+src_test() {
+	local -a test_projects=(
+		Fantomas.Core.Tests
+		Fantomas.Tests
+	)
+	local test_project
+	for test_project in "${test_projects[@]}" ; do
+		dotnet-pkg-base_test "${S}/src/${test_project}" -p:RollForward=Major
+	done
+}
diff --git a/dev-dotnet/fantomas/files/fantomas-7.0.0-directory-build-props.patch b/dev-dotnet/fantomas/files/fantomas-7.0.0-directory-build-props.patch
new file mode 100644
index 000000000000..ff59717a5259
--- /dev/null
+++ b/dev-dotnet/fantomas/files/fantomas-7.0.0-directory-build-props.patch
@@ -0,0 +1,11 @@
+--- a/Directory.Build.props
++++ b/Directory.Build.props
+@@ -40,7 +40,7 @@ Some common use cases include:
+         <!-- https://www.gresearch.co.uk/blog/article/improve-nuget-restores-with-static-graph-evaluation/ -->
+         <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
+         <ServerGarbageCollection>true</ServerGarbageCollection>
+-        <OtherFlags>$(OtherFlags) --test:GraphBasedChecking --test:ParallelOptimization --test:ParallelIlxGen --strict-indentation+ --realsig+</OtherFlags>
++        <OtherFlags>$(OtherFlags) --test:GraphBasedChecking --test:ParallelOptimization --test:ParallelIlxGen --strict-indentation+ </OtherFlags>
+     </PropertyGroup>
+     
+     <!-- Versions -->
diff --git a/dev-dotnet/fsautocomplete/Manifest b/dev-dotnet/fsautocomplete/Manifest
index 59e64597a18f..156f4e164e24 100644
--- a/dev-dotnet/fsautocomplete/Manifest
+++ b/dev-dotnet/fsautocomplete/Manifest
@@ -1,180 +1,113 @@
 DIST System.Security.Cryptography.OpenSsl.5.0.0.nupkg 350364 BLAKE2B bb8a0171160d496e1520298639412ac74c7f54427865349726e46845b622a4b44f125f1ec69213e709d9c43f1afc4c800413d356b57d12d4e190d7d86f073a8c SHA512 fbc3f8128f4731c91ed55e1b3cae898c16878a523930060b72a3ca5477296c9996dceeaa382c6eb419848ae4f77ba099be4f1c138bf6c2a0b9277c28c6a105fd
-DIST altcover.8.9.3.nupkg 6437229 BLAKE2B be3b8e7cd60954727e3b2425ab080b71559e3a2576daeca038d41cc15de9d4f0e3610d621c9cf639460ff793bafb82c73ecb78e6ecb16a100d75d27e880ab773 SHA512 99242cf45280a369a6506379a8054e58c554f3cdb24ddeb304fcf49f75044ba94271b0783c16c6339a2773be31e11435c52cae65a2771b63b33ae57629f9e13c
 DIST altcover.9.0.1.nupkg 5246186 BLAKE2B 27eda6057dfaf08370a37ce642a107ce1baf7d11fea409555eea611c43f71f484af3317d5695ead7e97703561ea9b3ca2cd5566fac191c0a3bf6ad9038d4f20b SHA512 d24fe0a83fc0665c4366dd1804dfb4e806d8cb3548b6f2202314359c8bcf9d9b9655b72f32ee3edc72c3180f6ee2372746c84744ee4f34790a375a1ce7d3c34c
 DIST benchmarkdotnet.0.14.0.nupkg 1412387 BLAKE2B 85c9bd75d4f14043b68ac2e6efe558f9bef490bb1838dfc361decd807deded29a40015277836d182f4fa30783654d1539c3bb4d1a7bd96325bd60b19ef30d39e SHA512 14baa1188a311697847a738cdc331dad8365f40b46e950d683335e730a8ec685ff7d2a4d8e7f4eed19adfe08d7b86a50e9b4ed4498f64886fe6aac0d551a7e12
 DIST benchmarkdotnet.annotations.0.14.0.nupkg 78771 BLAKE2B ca809577e17b10e7b17de1f01c0e887a33bd5433b65ae391040a00054fe57fdc9cda72800e5c8ed27d442c77404f23c1bebd7e13a8e4379e12dc91665a09a9bd SHA512 7739666d7aaa281756ab9d9510971aee45d711d4b8c276b50f7a98c5239d9ae1befbf0da58d0f3a260093b9e78d714e535787311e688c3beab58d32a9e03d135
-DIST cliwrap.3.6.6.nupkg 514243 BLAKE2B 953c97ef948384d0e62da226d912fb894c9d1bb0308a3c93a2eb9ce06b7e3850c677a332a7c615a39b5b7c4dc6a5e49eaf6731ddda1084c06c66dcb56415d159 SHA512 998cc053615921d5c511fcaedfe5309474087a53354340cf36bad75541433dd257d9da96f45c6aa614eb5b5edc63d38d97a9574985971bdda2eb88ff1db999f2
 DIST cliwrap.3.6.7.nupkg 670999 BLAKE2B 80dd21f72e892d470a9db55e63c382b10c6da05cbc7fc47b5cf5929662b09df14bc35cdb5b8e87733e4aef986823c75e45a5e052edd9029c1bf529e4c8bf52c7 SHA512 6f61cfb16a310e8ec701930850314aa1879883abd75c8af05f1bab4535a96ae7687455d2097b541c222e879f93a1c9ff96e8d2b709f5ca9c2f0c7ed11c46b98d
 DIST commandlineparser.2.9.1.nupkg 496069 BLAKE2B e2c4b38841f83d6bc10432b8055af90369f1fe0a10105a58b51b44cd48e5d84cb0b5e4b19f444d8c81b38646a62c7c4d11cbd710e92fea68be3ebea6ab98e3f1 SHA512 4f364e45c9668c7e7cc6a922b488f3fa523033c20d7a432694f0a6af05ce528ea0481d8375e2f4f1032c6990347b4803ce9a0e48068c6fe15ec46fb1254f085d
-DIST communitytoolkit.highperformance.8.2.2.nupkg 518641 BLAKE2B c043770539516369876f6ffcd82b1426cbb57b8a91146c81ce2c0c208e6f27b5c5c8d2e175a367100ef8b64ad3b0d36169c70db257dea88f49f7e639d909d986 SHA512 e8391b19e81f66095fc27af46667d83b504b68ab9f6391dd8984735050a3cc33672dd508c7e268af8a2f88519a663f8931bd4d58d0f03e81b34c2046b84d5022
 DIST communitytoolkit.highperformance.8.3.2.nupkg 645247 BLAKE2B 985f3521106094d716f42368e3bf4361da2f7deca10862c740edad4215d92ba2836a9ff285655d75b6c05dc9103306cfa2e32aa0c3ccf6fbddaf18804c6495bf SHA512 a5742e767af32910f50c2682e56d206bfff43f57b52ee7f8db5fcfe483a038956e62687376bd18bd09e71240abbadd763496756d930b4a8f843c88cae0ed414b
 DIST destructurama.fsharp.2.0.0.nupkg 32019 BLAKE2B f5a6980e18705ac54740e3eb160fcbe7695e11fe7bb06532b73bc9b4ddf2e35f891fd0a1b5c012ec1db8fa9b1481d193dc464aaf5967944c97a83aaee9946333 SHA512 3ffa375072db76cafbbcdfdeceb905ae1f626f253f9c93c892c1a780a336f416e8f3e25250f295abba5a85c250c206ac115728b3dc4acf6d602444b913c6bc0e
 DIST diffplex.1.7.2.nupkg 92255 BLAKE2B dc735fc95dad6a62d97e0aacf27f3b6cf2c094cfa8d490c125f67f93fc7ef416665033bbdcc778109a08b7cf2adc9440e314235796c290e3d156e1a75ee27348 SHA512 24fb44832dc3c975afa54eee2558a43a1c14e5ae0dfdbde80a155f61efe8f25a9cc8a290a8c24916a8db648afb90a91ceec800ea24edb0a9af0c37074c864d99
 DIST dotnet-reportgenerator-globaltool.5.3.8.nupkg 3733403 BLAKE2B 596f2429a2bb995ebd84c53f374cb53bbac68b89ae10f1b0b7b98f516225d088a76588afd6637edd33d91b1e3cb75dd2b68f83cbaa8622f6b0a717b350c85327 SHA512 8b0bf0e020aacaa4b1df8906e130e9bb8cfb6fb58260ee977c91ee478393fab95e74ae4ec51d1e3a57f1d7c32076e5eedfc4e2ab70cbd77bc277176776861dd2
 DIST dotnet.reproduciblebuilds.1.2.25.nupkg 33929 BLAKE2B cd2552306f976a4cc933b0ee6d06cf7a29f808acd55367c87d8a18ff2e5fd499e077b73b28940beddf7b7a3f2dc3636ec9112e7c9e0ba205a344e56ac1cb2c0f SHA512 70569b6b64ad93b0a078263ab4b40769e7358814bff3516738518f1ed91effdfc24ab26ad25ad39e69a598092ef069bf7ad71bd585b432b758d0b552521ca680
-DIST dotnet.reproduciblebuilds.1.2.4.nupkg 33126 BLAKE2B 9a42f4977e7cb41e4825030d4e60c299fb7d97bdf891342787e02b2528f7484c39f22f74cd1282fc2fbdfc4a333a65d4e0e103e57c2553296b64e86996d0ea9b SHA512 766093b839626f909c9d8d6f62ead7e5d9bd2429f692fdebe8a24fdc4840f70fe15947eec3d45aad69ba63bd951a98ccd83d7350b7dbecf2a6d198c034962864
 DIST expecto.10.2.1.nupkg 385191 BLAKE2B f2fdb659d69a821ab0d5447c35daff492ee524ead1513f72e704ccfa247dac8d9c86bcae00763b0d2479c04ba051a32ef033fabea8e69511d7fd360eb070b689 SHA512 658c2c523d1b0cbb907622148c5417e9d7d3745d97aa9a9895ab6c7fc8f7a7b7aa975966dba3cafce4c0b867499f75554564550600b0c93fd590822b4057c151
 DIST expecto.diff.10.2.1.nupkg 35154 BLAKE2B 0b12a4c6804cf974b6380f888706376750eca4b9465863b6342ebfc5d5d9018096786ce1554dd8783bdeadd3baec54f55d73e10be5ab3bc70114915617288d51 SHA512 18fb5382f14ebae878d2c44844f3d8472714e6186e92359e7e038c321ddf645e1b2a21cb664bfade1c1b0211056ae6d5a409955b4be9f046157417ac8393f3fa
-DIST fantomas.6.3.11.nupkg 5862245 BLAKE2B 6496df2948579821224bda850dc5e6e9d2e4fe7bb48cf6f6f518813fc22b163f57756cc8df3de4d93e4ab6583bea829fafb08882f188baee1823bb7b9ef4ae39 SHA512 4f31fd9689ada9648f40b355b1b10dd2da2c203019198f480a120ef5052b41c62f2281a6457baee5b05275a2e99dc43b01d585a4f51a0457ef3da84d96d166f6
-DIST fantomas.client.0.9.0.nupkg 67725 BLAKE2B 05f14e6d121d07563bb110f98ec1ef4be906d15efc035109237fe2788e9a5f5b27887307fc9295244ef9e3b6741199ccc01680c0ca5a180f723df1c0a882a896 SHA512 949e732a2415f1f262ddf6fca3051c55405d7937931c6d9bb500ed0ef645f1a67e26fbf333ebe811a56782b001aa1417744e41a26bddeb2606706d8465cabe9d
 DIST fantomas.client.0.9.1.nupkg 70020 BLAKE2B acda9a809cc8e122fe37e6a1c9e7d749f911c6ad5d41b007e48d005d354e6d58c2859fdeb18e5f715a4a4844ce3f54ed08f434285565e73a740a5b51a104960a SHA512 3c2988b1d0ac73deb209737fcbc9178a4eb052242f89f50062f43b25b94dcb244d0d4165ae3fd1a182e3aaeb39cce6de9517b2b36d3766c1df66176b94cb35e1
 DIST fparsec.1.1.1.nupkg 353063 BLAKE2B 47e93d6ed373bcf3fd5c26ace2d60a1e6701b14bb4cbca1650bc15bfd0dce402ea8c8ad471004dfe618f0e9507ec60c53d7e01ead2e7480ececfc4a0395552ff SHA512 b28a1cc8a4fd2d4b000adf68b0a9ffb6aa72ec2cdd5157beb47635346122ac61f6dac0e0b06de8528ed7336e21e9881918fd18d36585507ebefb3336c57b6c76
-DIST fsautocomplete-0.74.1.tar.gz 1278665 BLAKE2B 7be1426aec07d01e9819eb7d34ceefd545950fc9cd5078dbe723cccb66435ce24221a9f1dd13063856e80a8c708def4fb32ca4af6514fbcdee2741395dad257a SHA512 53bbf6230da167e4d81ea54a2118fa26ec3b720ce9e674564c4438cc30de43d843377efaf12e91686934fe4b6bdf0eb76df23693dfab8749ab20817096d37b46
 DIST fsautocomplete-0.75.0.tar.gz 1279202 BLAKE2B 9fb4db6655192db5b856fa7eff2fd6f938e4de9ea5b58db35346a22910786caa09df5f53ae2e7c551707201b702254c28efafcc195e8a25942bc38512191c660 SHA512 1848cc836797da572bdc97039de0bf5c29a1fe803f6c516af10f8f1c3c5e4204157fbbf841a365137282ff03987cdbcc8511ceeaa8f1451922bc166d1c992400
-DIST fsharp-analyzers.0.27.0.nupkg 18438776 BLAKE2B a2db76a375e94b325436e058eda3f152cefb36c63c7eec81714724589c7f400cec1042e74e87d538c3e43754c72343cffa54ac6943bb0ac2db97daa7bfa8f88c SHA512 d000f2246f514762376ed45e30502ed6947d0e71011e15f2b16271a863d5b051b506a2884a0cee54e5b762c40ebf69cb3f983b5e2c6ecb19446f00555b84cd1a
 DIST fsharp-analyzers.0.28.0.nupkg 18692464 BLAKE2B 42fe8ec5b7b8b1691c6ca9afe9402884d0ed55bdf94a6dc7bc5ecee06af5116177a9ac07427dcac7866ef93140d3e89628b3c109ebe1e736c7389bdb91a8c1f3 SHA512 47259eb94d816e95250d02f80a76d28d7e77468cadfc5d4138296b94e9fe60a2116c6bb5c4866db6e031bff8c7fb726e2d04f8e46f894505425c076edce224e1
 DIST fsharp.analyzers.build.0.3.0.nupkg 15911 BLAKE2B 64d63679503b16b541537fd4482c47cd384628bd7ca70f6ad771b93bb11554b82605c2827a0facc8dc5917b196548bc739f989d5ae7899e3b0673df5da50620f SHA512 f07cbbcfaca9ae92285d143ae303adbb95fedd15cca256f278fe4adefb7c8c7e810f74d7ff53bb50dcffbd3408f9350baddb925c6b39ff1a10814eddda7045fd
-DIST fsharp.analyzers.sdk.0.27.0.nupkg 98956 BLAKE2B 98468e8afe646116a9fd72a9db4cbb06909ed197d919e504605d6defdf31cdbb14ecbcb10245729c0629f6b9943557ab2a07afef1cb93eb4425387260b8dbd85 SHA512 13edd6ab56ab13ec0cb0caeb35e673692553b4eb61bc6c63f1812eda42d86eaaedba503015e62a414f2f65e205cf862b44bf172e123951f3d40c9467041c3834
 DIST fsharp.analyzers.sdk.0.28.0.nupkg 102872 BLAKE2B 7e4f74bd5d77c6918c06836afaaf43308d55778738ea9905a57bfd893592e9a701f1d9c70082d046aeacea5594c408a4fd470d707987d08f96138fe9eca9ffb3 SHA512 6d8c2532f52f03d50e7ab5304aecab63aa861c6c6884888349361d8ecb30d9de6ef3a3bd3686ec8682cdae613726eb8efc36e2584562b59179d9c8ed9c6e20ee
-DIST fsharp.compiler.service.43.8.400.nupkg 9320503 BLAKE2B ffe616d687832f548fd551dc5ec6979a21df9ad97f4298be19b2ce7ae763cfc68ec761b3b041c4604d4c4146f63af6778e53fe7c9e323fc70aff7133970579e5 SHA512 a3cd2bc742e7ac88ca394abe3340def4044086f32b40f41bcc1955240b9122da0661fe82e7a24d5b9477f01460801a669bac054aaea390f1f1df774e320b400d
 DIST fsharp.compiler.service.43.9.100.nupkg 9433626 BLAKE2B 8e7bc9006bb8a0c9761ed61c4da7d5bff05cb268bee8e42f97777c9ede00f67c08aa0e0fb83786491b09c2f066f3f7dd5bf5322dc142e33ad41b1a5115e19e74 SHA512 d514cad3f0f23c1c2117a2980d942c09b0977f04a441d1bd3cf512db1cede878f974efc2afb54f4b53514515da2bd6c63e262c0f1f127a3afccf2036e10bfc60
 DIST fsharp.control.asyncseq.3.2.1.nupkg 283335 BLAKE2B 0e776883ca9e1001c02a221a2be0864d2d0021d4300e4b18d2dc43091dd507b43a0b5c5ecf9b244c4abf0d0806f9749c4659219f6596bf269b5bc38de533797f SHA512 a15e17c7530c3aaa67640a27d746e137f252523c2e73f1f8857ab648cec85a299f821939c8af396a5662a951f89a899f1812a9aff46c0557e00aba9b9a46b126
 DIST fsharp.control.reactive.5.0.5.nupkg 686542 BLAKE2B bee4cc8f0fc39cbd1408b3c5e3122cc7a0a02d1dd131eda0c3580102cfd75daeddfb388714735e6ff9fd1c3449d6398edcc4940dfea6d65ae9b23b03bcc6043e SHA512 cbf78333e48864cba2e05129604b0f196f916fbb43294c41f189d155c7941d12be07900f797acf28316903887be50738b10d0b6ff8c116a70d64358f75ce1162
-DIST fsharp.core.5.0.1.nupkg 1327145 BLAKE2B 59030ab01c542beab3fd7b4bea7ff2ad125fd7e5343395c4d9754010372a31894b50a7046a821a8485e0890f29b1e0781e96250f62dfc9b3baa260229489f75c SHA512 94d2a60b6765163e583c1816d633b806a06c19c2f2fd1bbcbed52beb726a8a6d604e325a4b73b159a437abc306598140f0f4768deb4f38c2687b1e0329972c67
-DIST fsharp.core.8.0.400.nupkg 2854967 BLAKE2B ef7316b2bfb70eec428cc5695b67d8631e588cc01e6ad90782777e8cacb3564cbbacf0bdd597473617a225d0d04d0eaeb75b2b6d1dd2d5969f5bf2f696bb971c SHA512 72ad8a4231b0a7e4ac8a4520e6968080dc0ada977ae378a07f0fa0dedd86506e432af705671f039fb3088d78b61d81b3b36003f4fdd678f622742def5ec98d1c
 DIST fsharp.core.9.0.100.nupkg 2920413 BLAKE2B 8621b7e76a83826585dc2ce6f3b8d4ed4a97bfecc80901d9c442dd61c6699d95ab5dc407b1061b9bce74aba5f074a3d8a0fd78d94f188e3cf6d61d1d348d5ddf SHA512 937e5d444418e048567a0de6a242132717240c275d1953121bea9b4b93b06d6509baa89a5c401881ce6b2ee66a373d490c58f591322ec9d040cea0ae7d9237a7
-DIST fsharp.data.adaptive.1.2.15.nupkg 2273922 BLAKE2B 245ca44df68b223a949312e67d36bd4c2b93ec6e88ff570e0d7b06407310e6ad3f6dc1bb0fa3d0df454278266635d5e704f578dfdb6407c1c1b9ab38da5d95aa SHA512 9490449ca5bde587357f74171b9ea5d30a55d77f942c19aa5d1c7dfca8eb4a61d46319baa92c95d5056ca9669023c28817e14eb2df5cc9877fe340ca4e47f571
 DIST fsharp.data.adaptive.1.2.16.nupkg 2275486 BLAKE2B ac04267abc5cb290487e8b9b2a64f1e15d1ec075771b9c260e7e3e2edbc63218eb559663521635f7804eeb61d2f0bae2ce8939a5a0155907fc5415261c78261f SHA512 d12d16406d52d35243a9e2ad9ff668e4edb283575995a835fd353260aea3407355f82afe7677d53c08f836d44ed5161e53d15fb5db3f576ea8d6f9001b753666
 DIST fsharp.formatting.14.0.1.nupkg 770582 BLAKE2B 107b00b686b992ec8274050f06a85aa67341913faf2d8337224dbae664187f15e254adbc6ada92a623e7d7d9a5a2ab044f56f62db5b2bf015c180ab6a53f43fc SHA512 8bbed7d1a969f4a47575a6325b6886de65e3b355b4a651e99b838411c5d4929fab276cff359ed89ec393729a7f1840480305f38dab38c7c98a88fde16188e9c3
 DIST fsharp.umx.1.1.0.nupkg 22036 BLAKE2B 254f304e05dcdf72b0d565b035988fad54ec83369fe69d21fbbe3b5d95b7c0ae8026b65e358bcd1f47300b548498b30104af45158dc5d63ac5d1ce64fd2c8c1b SHA512 4bca5743af2d3b1bf6c6832a7cd088e0eeed5dd82e395ba7f120d037582f2b379de458c0bf4ecd9ee4fe8fbfbd51a7949740864e19b63747942e78bb297ce7a2
 DIST fsharplint.core.0.23.0.nupkg 416223 BLAKE2B ddb1a9d4c8d8c63ea7dbafeee24b52e338cb9d1ca9fad5ce4f032b9ea6ddb54cb4bb6cf822bee80e8f2e7f509c4752fe95a2dd97d3e20fe34e5bec6dfc336840 SHA512 c60ca607d8aba07595ae216ebc58ece1837d5adb4a2d1bcd08297a3f0365040801ab83890404c23de8b3e26d599f74469803d301fb47a1e10e621f4952f75dc4
 DIST fsharpx.async.1.14.1.nupkg 268142 BLAKE2B b56b9663ca9147295285cfa6efb4ed94be5e5d616930a5d080b421d3f705372a6926f147399c805a443dc1dc2007783b7334383494691f32cacf74a99925a9ab SHA512 f187bf860347b271d616d6a77c40feb60249ccfab8404b7e2d443cec87b624e8aa6fa5943febed17759104ed8d203a864298af876d3b9f0982a0574af93ea3c1
-DIST fstoolkit.errorhandling.4.16.0.nupkg 603314 BLAKE2B 2a7bd5e6f2661388b1f86893838912d336bb7bbd7503cda81bcb6e130460b34568d92a72b4efb507412b1a0273161993d83617f801b23d1d789bfb35ae351d99 SHA512 2c2d0173cf72ef4971a73bbaeb513bcd576d5d92ebfd215e6bcea5935317c7e4d635a4cf04b06c99ea302696180deed4c9a59cc19508f1d405de25050b097a1e
 DIST fstoolkit.errorhandling.4.18.0.nupkg 669586 BLAKE2B bb3991f6d1a3308e786f41a1568ff193684fd2dbf9664919cb34eaec2c49ba6e026b6d39a55b4c3fe93287aed0327d51289ee25a35098e2e234ac40e4366aa35 SHA512 2907427fb31b5c5e2c1023e7de809a38d3b6930cf2a8825783a9832a0cd98802d9537e1b144d072107d9b019dd24ccdddcb8e0bef71ce2a541c8dc5f0f8b1a84
-DIST fstoolkit.errorhandling.taskresult.4.16.0.nupkg 616782 BLAKE2B 02594b37a551757603e0ca33032778e331403e220b66995bee6a908565084d52e4acdda8fe3f87cc643c518c34916153d0b05edb0fe254b267d4c04241138bee SHA512 e66a4e50b9e06b14363a322935c0acf01ec0b1739d62eed874c071a893a9928455a33e2b8fa8933b0d45a62c39e86954e455d195f4039c715e33c199c936d890
 DIST fstoolkit.errorhandling.taskresult.4.18.0.nupkg 616793 BLAKE2B c0ee44ac1057100a1b5ee56785a40c4aa39d36bf15c4eacd7a209fc4335762ad168879b4195f79dfc7549c2fad334ee553adb06673691529bfa152e7626f7292 SHA512 6de6b00c12b510e1804a7205cb4c06b749a31c516bc57eb0d812cd31215c9b59f8e2464e4681647e03c98b2d77d020dd8b7f16cd8e9f08e75aaf444cc571c1cb
 DIST gee.external.capstone.2.3.0.nupkg 8145352 BLAKE2B 1e1cfa75c9d8fcff0e905e7d8d5fdd3415daec907f97ee4eb810630d1df26397a5a2a80cdb1fa5fee6268599bc49dd8ee41366867aa16ca689c97db78b4be135 SHA512 9079d5705d591c3b819127b2e0b763dacabb212314e9f96b2f632f62b45a9f3e1c208f136df91a4834dd1838a38ac2fd2161ce8b545fe70f8078b66fc66c4aa8
 DIST githubactionstestlogger.2.4.1.nupkg 484899 BLAKE2B 51cee9927b13b8a9db1df14882cd2e395305a849fc59ab28a9054128bd5dde05b918a984c6718630840c78daa82a615ee0319a65af5b169d69d4e2a74ae795c9 SHA512 cc89ed7ccae61e4f4b5b859825b6f730e3d5619de6820e5df5b0929bbc93bdb98ef5d4f7cd3287dd3123313c939270958e4724f863c3473506d0839cd9021f95
-DIST google.protobuf.3.27.3.nupkg 1382224 BLAKE2B c85c9fbd9e18d53465d2a9d02cde254541e414b6f4a89c72bfd5a13b06f43a216c7f992f151a2138b51cba436d0716a0c7d9fa96bbcb81bddd5e2bbfec893c1a SHA512 2852cbd140c0788548bb20da72ee12a18a4e4e9486cc9b45a1b084358185506eab86a97be5d9406001f2b8b7a59489fcca8bebb4c697e2a05d6f7c7e8815c7e3
 DIST google.protobuf.3.28.3.nupkg 1382381 BLAKE2B 6e5b90a2d66dbff9064350315ba6546c4b1911dfbd3b7d5b81855ff92338a37df1be0e32e1eca95b0ffb29af215de6c8bb772dec115716e58cb338955685a072 SHA512 ebdecf0d4c09c74991d3846ce7e703fb17643b55681863e01a8debccb31c9fda628c99137b79556a61e6d1806dd42560a5a232f9a940c4646e8fd8459e21e4f2
 DIST grpc.2.46.6.nupkg 48346 BLAKE2B bf1ba4de85f26131087127d094a86dc442d14dff89949ac06a14d91a30f706dba3e14d94a4f22a9b11d92406a5c8ce097756b94eeb91990e21bac458ba93ed2e SHA512 07a744a2c4a0c9266f15805439f83d2e014e697574774d63df78e848df4d18dc70aaa81804951e5a577e2571fceffedf0e1deaf4f6845dbb223778067619a566
 DIST grpc.core.2.46.6.nupkg 17751214 BLAKE2B 006f574a083595c3befbd91282e505b5909099fcee514e88a54c70b8e1afbf03f4ae5c24ec6df4129b8d97b3b0dc9dd1b1060f38bbda00f2adbe9527a1d78d19 SHA512 112b86358d372b03d5c954f4356dcc3ba3c66f0334b91ffddc0d8abdf21cf1b7fee35e83c435fe8b84d4d6a9c2e5cd4715da5e8d398cd05da5142e05adbc20ae
-DIST grpc.core.api.2.65.0.nupkg 253423 BLAKE2B 8791b0cebc63d83f8fbebc92451c8af4c07749353246387a4ba0b0318415657ba4589efe2679fdce649791297a8cbf347c7b81a6d38ee5c04794454952d01891 SHA512 7daff35147ec2326f52467c768a5409c145d6697f26b99998bf53f5b9f9aeea170ad04b23b5ed7b10d6d2be879b0b9c57c2f7389963822feffed74fac7190cb3
 DIST grpc.core.api.2.67.0.nupkg 253413 BLAKE2B 360a5326c8b88d930fba7956e070dde0f864854a2cf3be0239178aa5987c44505c03ae54968b446f19ab7589ebfd691c7380a97b3c400b3a8b5ad949a1f2c107 SHA512 3bf6725a037f0d648cb99c4f59e1918a9e0138b964a7fd1013c17e5e3bb38a2fcc30625f723574e85968934d233ae954591b69f3af46d14967b06144f206200f
-DIST grpc.net.client.2.65.0.nupkg 975893 BLAKE2B 0915150569465de48d8e6b719a1cfdc233a63636fb986752065e51b21a65d2fa50758f8c9861e625430dbd8d620a1db0bb018f9900e95658b05d6e5181e7ca6d SHA512 e03ef499035d6c66ec1c34b8a1c1cbbc5cfcaa20ad34436d1fbf70003216c064bf35de34ca3b4d7cb4d7a18c0d2e69db2912ed2b36dcd3a13bd093e4238d23fe
 DIST grpc.net.client.2.67.0.nupkg 1045858 BLAKE2B 01a5006867488525f333a8d8811c0362f4f1311ea9c3cd45ad8f08743fa3c4f3039249ef681321f0c6def9b5d5b0833826e4cdbde00a0089e79eb704b6476569 SHA512 07d3b4ffebfc06cae3c0ca2fdebc51bd2104c5d87612f15d757d54e0bc3facc140c36cc5c65dcc4789079869e590291061b34cf66dff91ded814468aa82ebaad
-DIST grpc.net.common.2.65.0.nupkg 163104 BLAKE2B d875e391ed462a8cae6d2c3e0f3f68f14d16cf06954a8f52c7646b5cfb5660bd754eb8adbcbeb8dbac74268c7646742d0b3abc9fbfe32dff15ecdfbfeb4f15ea SHA512 4cab81007b4a0545f8303555778d417bd4e23883b8782d1cc00dd20e1c20ed35ccb9f68c0f5761e388c12a78da494da5f88f09a9465789815164b2839cbe84e7
 DIST grpc.net.common.2.67.0.nupkg 163041 BLAKE2B 877b56a79e0c7d2084d55222a3937640bebfc4b043a7cb76ba13791311510018bc7babaf9cdc48d143ef063d258e01b609ced5f5cf8771184ec2cc725e20fa11 SHA512 15da87ce26f1f73f9012cd6958bf0d7132c74fa95e1827efcf5918389bf6ea039cecbd4818def59ff7fc421e227f050e030dfaf0157f19aa51f4c3b4b93dd10a
 DIST humanizer.core.2.14.1.nupkg 538179 BLAKE2B c3e3c3c7d3fb3484dc85f5eaf25ff4f4428cd36b3458c5664fa7c29cb62ea291aded48a369823459d684ff79ce63a16650dcd37e8cd123c23ab943faea92cfd7 SHA512 cb3a8653f1ca34b67d52fafa92f49cdf0615fd2e4efc8be4948516e5617b32e8af18b63cc12e486672cf92dec3d4a5bc12dd849e5d08dcbce0daf196336e17b3
 DIST iced.1.21.0.nupkg 2127279 BLAKE2B 4eaeefb18fddae4dac7c967043b26bfdbaa2a51cace0fe127556d975b95b47c0dd26b7db1916d3484d0e5827fe2116be5389cd5c9ccccbc2c58c8e5997fafddc SHA512 960bdc10717639bca88f9ad48d4a5f50040dc74263c28109e4d4ddbdd8174b250957d5fcc23537310431b916ae1fd1adc706f45adf6ab9bb801d532914591164
 DIST icedtasks.0.11.7.nupkg 1153927 BLAKE2B f0cacf2b4228732ea39a35b33a6021e02677262a63d224d957d3237cc029e95f61bc905d115fd9d3dced8013f828c9d98fd8f1e3e50ec41974fa4229b0f429a9 SHA512 788a3ead2aabc8babf312cade3973418fc6870c96fecc8baa23b1b92dbb1b9da41f7966856abfd4db41d0e3def64b8a6bc85c2870951bcb371327d8a905d539a
 DIST icsharpcode.decompiler.8.2.0.7535.nupkg 1325466 BLAKE2B 2d674e38ef18a3f67a8d45e1513e52d11cb6a8b1f234b09d63687df9446d6c63b02bd6dade1e9595d11b0cf6c4a956f62b6a7841617632a1a89e492c4899e415 SHA512 ed0f8f96704b9c603748a464c30bfb16e3d3be9b59e3f656017d7a4b897820ea660e69824c8ebcf67cb479938c2163106b6f8cd9a53c5a1ad7771fbad7249528
-DIST ionide.analyzers.0.12.0.nupkg 61422 BLAKE2B ef091680b7cd4a7f587111e40ecd6bbb3551a94d1276e0d88a4cc199cbc358beeab7c4cd962f199fc63e08dae557fcf483852211e674dca30b8576ee8e5ae5c0 SHA512 0c9d7432151569879fdb86ce1375a8034a80934af03035ab7ca63c0c0576b0faebfecf714561b213dfcd5915ae51cff105b3d621c2ce7610e4a3a41bc3f36135
 DIST ionide.analyzers.0.13.0.nupkg 61504 BLAKE2B a446699ceb2fe4042eb4e2ba2380db2b3b2f1c52d7a53542a38e8d5bc6bc3e325984bd44d1586d10414bd5a3114d36ed3dbbeecf93d841ac7ab1d3377d055bd4 SHA512 3e1d4721572d4d5573fe1a1581bda015eea9b1be03817856676fe87b7193498c969ad21d8da768781a500911b0ba05b8b9a98f0fffcf4a8fed0203fc1318bc26
 DIST ionide.keepachangelog.tasks.0.1.8.nupkg 2755127 BLAKE2B 077c51696c5948ce974bd5d745f6cc2b0da726dc5d473381d019469eceb6a9662fbe28946824bd193104cf7d1968a2ec866776218738c2771885dd9f79239137 SHA512 53844192a5979ca195eb97b2559c875bebdb3986c8607a62a4a89fdd529c31409f6b7abe8dfd101f995cc98b4577f64f30c74efb12f412beabeee8198881b043
 DIST ionide.languageserverprotocol.0.6.0.nupkg 555479 BLAKE2B 440510fdc1b0fc114dab23dbf2b7c0a23f703bbe5fd14e1210c74b6f397bb0f2bdba6b979752c53b3dd78a8ac759c64a37f14b4fdd673007203cb8f21ad835ac SHA512 1899f8b09f2e8e675241fc2378bc5d8c6060af875b40db81faa804adc4264f167ca04fe9f9762b1ca013dff4cce39a2a92c4ea5f11bf4ea60be025bf019ab098
-DIST ionide.projinfo.0.66.0.nupkg 271049 BLAKE2B aa85fc6999a8be05adf5542b95868b4f969d216aac82586bddd576ac72546dedc0c82df52fea467ece52b1d8be3f2291dbfb0b3d73e957ef04aef0ebaed26289 SHA512 5f40e424bcbfd1332bacb8d4a1c5a1a49e9703d1b375ac2db0eda89aee83f305d959f02006c2f4a483338a3150873601aff244ce51f0d9cf54c5c09a183d4457
 DIST ionide.projinfo.0.68.0.nupkg 288227 BLAKE2B 0eb56b7eaae414f2227f8f71868b861003de51e9d04bbfc5c4a944d871bd5ad9ead858a0fed175dbbdb23cd24dcd6d0c4f24b75914b94f5824fc9a271ba714c3 SHA512 0d49d3b261dff0e34a21c3f0df4067a6c3ab65feb7f90e620fdff62e79cb67b8ad2d1b324792ca154dbdb725a941e395d5c93a5001a347ac661b50e51be6d421
-DIST ionide.projinfo.fcs.0.66.0.nupkg 31564 BLAKE2B 714a40dde798812d0fb084e14a41bce0101cc82d71c4cc89878fc2d0d8fa1ee0bd626c971148c63776bfabdeb0bf2cd815f3fbb2f1f90630eb07a095a5e106dd SHA512 3f43e12f89921a224f4652aff14e8ea8e1959d2986e62fb9ff584873ff5c3e1d2710eb5327d9a34caa5089d869200296f8261dc737c726660c3e1016db39dcad
 DIST ionide.projinfo.fcs.0.68.0.nupkg 34240 BLAKE2B bf70bf0020bf144d7642136fccacaa40b2047b84f55539db25533a1f985c46d2ca6abe3b046bab0a5e032c3c7907db0188fc95476590376ddf72c840f82dfee5 SHA512 72cbd2c969d8ee6a170250d73eaa3b19144939faba5258188e1a2eaaf77ef638b0f7fbc6f7378e00a6d146aab08f276e8613e13b853223af61198a6d0d898c17
-DIST ionide.projinfo.projectsystem.0.66.0.nupkg 151133 BLAKE2B 0597aa48da12d6b1f6dd66a8d39a92aaf29aea7a21f892f3f5bbecad83294f4c3f9319235590edee13f624880ae9566a851b16f636df5e7360d7fa3d128a7d87 SHA512 f3e543888eeab56594893e6152712f2b903f4a4b68109f31d733354e1ea4f0f5887eb74280b58f79c70ba620465c07e459f7b746d5a8a20fe529f45c9117f2be
 DIST ionide.projinfo.projectsystem.0.68.0.nupkg 160564 BLAKE2B 2b35ddff88e5217d54525f648185a22881fc8a5cd387e0a8ea61afb6dbeb0d716416391a03ed376e32541eb14ec45a8af71dbf706f1165babb8d2e4e40f1edfe SHA512 5b21ed39d2ea39b1f6a8776136f31c08451c3d8a6c30a3323b40475d99cffa57718e55736faa612214bec767afd5a2bffc49c5c90ea2dda8c12a9dee636aa61d
-DIST ionide.projinfo.sln.0.66.0.nupkg 100797 BLAKE2B afcf8f86171d14ca379a56d98b8b584d9fd884558fdd5cb07b4fd81aa3482a1eb267153d9a6eb5bc11bf3988a1fd7d40d0fd02045d04c08ddcd74e8421772bb1 SHA512 acd27e955ae99ca7f4f18503aaf6ba0e2699e68942693b83a1e742bb74f8ed660db9c4d5e9d63ca312921eada40bb34a6d0be762c458c9dcb4b976aea4abffeb
 DIST ionide.projinfo.sln.0.68.0.nupkg 189446 BLAKE2B e8e98184b1ffddceff7f3a64034f6fb796a8d8566c2ba05eca09fa93c2c2b9c3fe3fd3a3d33acb2978e5ee0a457c0c1cd1e53c447e0b6f01ffcc0fd25e46be97 SHA512 9762c7a93f6cca60eba8cc2caf6d8550d8e42a0a96d1915984ec15205b11de7433c25f45c1418c11411156498865964bf0bfe8f879bd6c8b60938d3ce80ec3b8
 DIST linkdotnet.stringbuilder.1.18.0.nupkg 47682 BLAKE2B 21ace37baf627372bb113c941dcce0f92bfe4c8c1aad631e373c125435df33c83feca5fdc68935e3be37036fa36b17a1c12f098211f6cba18cad6eeb688f21b7 SHA512 e7249682ca23659941b7f457113ab1eb13815e0a256a8e5df09193b444678a6113373825598bd49541833120edab5649120eb33c4d59c6bdf9383c61b67bf5de
 DIST mcmaster.netcore.plugins.1.4.0.nupkg 51655 BLAKE2B b0ee8301859fcddb58c5f4a55518da52b762362e7a485d74550714be34a0a883025794b5c82bb412fdeb2128b3fa99d8e5de36ac671e2f646c0ac54a0c23b30a SHA512 9a50f79de3c7a2c0388c17a0eb93e55a4e941ea01eaeb97bc6c01a077e1d6151d720605f57be9b450f70b66410d985235aaba892b549d2034c09e16c2e5ccf57
-DIST messagepack.2.5.172.nupkg 488887 BLAKE2B 69207775db51c6b58f1fa21668221d4f10c0cb8f400e453b63360a0135752ab103306eec832dfbc244c087c52a85adc527a5e8f7664421f2e7fc3541b79a28f6 SHA512 87208635b978c7c77da50f9f170d8229c92a1975b622378fd0cd19c030e0d93f50f29b97a5d7f2b006c0e3d99a1bad0d44323fe0211c1253c4f94e5dfca957cc
 DIST messagepack.2.5.192.nupkg 493411 BLAKE2B 52e6cde37a2f46d4a7bebdc8c5116af38f8a5e65e029425236ad818b354f3bbe694fc9f82fbcf7d857a3da42b8189fd40fa5a2415bf89f9c25bf4ceaecd4f92c SHA512 4a7af049020a59fc5c42fcc4d530943ef27b03fe3828504372609cf9850322af106a509fd1b1808e20680057b0849f3542e4b916c08d08e70a9fe21445895b01
-DIST messagepack.annotations.2.5.172.nupkg 20910 BLAKE2B 333628581722e7d97e602295f4bf12f5f097302974a1678750b40544622b6b0c2b40041c9d2297e5c9136bf05f7b9144426ca33d24774633073313e3803ef1f2 SHA512 04ca3d3e083a18e1fcc65df7a97e605aeaa4b098acf26c03c2b9e2aeeb20f823c6b76c3dbdfd336eb0c1d5c4ed582b045c0f587522f9e568165f72947c140d8f
 DIST messagepack.annotations.2.5.192.nupkg 20900 BLAKE2B a1dc7c60bf04e5bcfc7dcf3f37e7c49834bd4737e171430a131e590fa7884792412492defdbf0c56f648911e2240fda77b922a073c3599a3ee1e14fbd787332d SHA512 a44fd20f6374fa70c053c06d4c7aa3c8884b3362f931bd0d88ee215b4c9b8afd88f816cad0911a1ad6caa5e1263af293fb9b3685db3482f93f1ab00786072977
-DIST microsoft.bcl.asyncinterfaces.8.0.0.nupkg 99740 BLAKE2B 010d05e4adb8b42dd2e4464063b4601750ee30e377a1aec3e1f9b833d4c599b3e3e01832779fd52a56c77572175df2f8bc3d08c134d99f62f58767a588b8ad13 SHA512 79cb0773d94465924cee4e471d90353d5d8df842c46ab2c572cb15d9b9fb5d0209a1a88d64392995335c5fe54a00d7c3194440b84c95142711bbb685cb5e9552
 DIST microsoft.bcl.asyncinterfaces.9.0.0.nupkg 97963 BLAKE2B f53e2bc3dff42db5b7f6ee1b81eb5f211ecee015e8d27faf9c8ff914a9e1d32505a9f9f47b7323d5ccb4b5e4c80d483002a210ac8f87655621bf4c35b4a1933f SHA512 6d8a7692c491e6e07ac6a39ae0dc83da004e785adcda7f05016a21efcd4c34c0dc3e3935cac0fb0cda6feebeec40e5df745253e85fecc97edf37896652c9fe45
 DIST microsoft.bcl.cryptography.9.0.0.nupkg 231614 BLAKE2B fb28e545ce585ed03289aa40e0b0754190235d4e5c20973d1258c2faed8ee1378eb943ea1e531656b791d2e2a7ed7557874fd3eccfc319d6e72fe74fb05f23a2 SHA512 3d76e5a10810b6fc34b630205f51378a0640f869465c74b67cd2513d904bd98a858d631cd0575d3e7e2d7916c476e8b6dcf1e4d99b9b7ce143444a3d4b45ec99
-DIST microsoft.bcl.hashcode.1.1.1.nupkg 104231 BLAKE2B 0764224e6b3f27297118b298f107f9d8a1d25b97745dddc60ea05378412b3902beffe6410af54f25636d6c8d934525fbc8ef4206206e051a640acba560d48e93 SHA512 50c11207f3131c6499d6573d33c0951edecdba944bcd08762b5a912b9a4c9cd3844d4c7fe19686c219623365d6f7740818a825200ce4575b14c079b1f7fc6f3e
 DIST microsoft.bcl.hashcode.6.0.0.nupkg 91879 BLAKE2B 39c67e967a677994d680d40d49868b3f40ecd3a98455310fd378fdddd319769464bc65d0f211bfd42bfac5ddb8f3087599a7dec4bb7c15083614c11d9371f3c9 SHA512 9349972fd40c0bb20de2746e007b8b5b2907f07fe7834e085a61928fbd9aaa5687cedbf203a34d73dd0d8a9b9abf2d62a81c95c22255a080e4347fc895c9df2d
-DIST microsoft.build.17.11.4.nupkg 4514090 BLAKE2B b94371d15ce98d25f6e6bf3588853a906d9d4adec211c8eb080a9d5394fcc503f1a6dd3d687f8ab349c3feed105e6bbdd11e7dfa32065acb1e6b270bfc3d68b4 SHA512 8df18985c86357dc046a2b1aa50b3615ff5bdaa5df9e29aec9b28db8701ba2434a2efcc0c991670a2da57202b0bd884848200a2af37dd10f37e348a612f1098c
 DIST microsoft.build.17.12.6.nupkg 4613585 BLAKE2B aa4a823ea972cf97c3b487bab01025b8c555355c6eeb5501cfada8d8301890d6bf1d9ca4a08dd5cd383b90fcd069260db6ec8a6e066cdcb78b87fcb8f8200ebd SHA512 60488be712a8c1bc27af9d98ae800b34783c62eae32f2153961bf7512aecc21b9bbb137695d6354e642904a4382b6f14816255f41c5355763dfc279c30d0de38
-DIST microsoft.build.framework.17.11.4.nupkg 1094566 BLAKE2B f3f6f3c2240f98c4bb95872c49f30baffd1d6e9ae870f62275d9adf867724cfea30d4dd836ad9825bde13f5d55b58352fa0b612a72a74a94c638422d78d4b000 SHA512 24c5852991509358598d5223b494b48eb6199800b20e792e4f077e56481bb717d16291c8e59a9e879217d985fa21fb9cc8492ba9d09a93fbabdb8bbbd81a6db4
 DIST microsoft.build.framework.17.12.6.nupkg 1141361 BLAKE2B 9d7a7e0dc937a4a0b4f4f62250667f21b3f058f6fb03b07768089178a81c2a218a32333dd87b08c4c403290dddb64afc3b0246e18f1340bdfa3653774bb889eb SHA512 5237f19eb40df413d5b4ed0abefd85079769376097e6c9dcedca2ae6f55075b095ea4752a48febf866532ef53fe414d3f32f1bbc852aa28731451ebbe0de9b5a
 DIST microsoft.build.locator.1.7.8.nupkg 80701 BLAKE2B cc39538564b37e3240acc15e032fb6f10400ed2ec34317be5eae1809c6df65eabf459f98889b3c580bbd0075d2da01fe24c12ab23b402fc3ae30ec0c755e163b SHA512 65fdb0d29466054eb10733cd1c28b8107c2030f8e6a2b0dcbf07be842407a17c7233643d51138ab0fb6d6d05d1e13b06a5553e9b418bc79dba667ce6f3b150d4
-DIST microsoft.build.tasks.core.17.11.4.nupkg 2380846 BLAKE2B 20990a2ab0839e74d08cee998346e975b28730ad1c656f9de7ced5f053be7f1a4b6e87596568727d551bb63590cff1dc0772bcc9c9c77990081635b992854ac3 SHA512 162c4609562651c22f081c367b82655c2e0a59d3551f37c83e2e85c32b387b2a7840a4a7792ecfe4e1edaf544fab18e7820c77ebd723289e9e32004af9536b9b
 DIST microsoft.build.tasks.core.17.12.6.nupkg 2376569 BLAKE2B cfd2021e27494e9080b184e3518c583292125ebd6005455bb597a5cc08ef9680f7a6895f97fe7972f7cf418976080e241c6746a32d45f9dbf80d994df6600e9d SHA512 828e7dd5998cb3d727031b4af2d3a3b965dba89a27460fe012ff795dbf505755d1bf019eca3e12204178af4a5ddca06e6803565a69428df7f79c5ca8e5546b73
-DIST microsoft.build.utilities.core.17.11.4.nupkg 917815 BLAKE2B 9561d38f0a10a29848a3016ec6454e43798698613f84f6a6bfee64e7534bbccc28e738ba81e5a0af43753f7010a1cae2f0713649de261ee370952105b0ec7b08 SHA512 1fe36d4ef72e0e09e79200dd73464704bb36743df62ac0c9b7ec71515bded2b5559f5281f8d838c7e93840f4d9f2cab061d8d29a37b016a8e24bc91daf045ae0
 DIST microsoft.build.utilities.core.17.12.6.nupkg 914389 BLAKE2B 0927a037269db5f881114bb2497e2acf2345eb5247e56e413bbca74d4dd298547f5355b8166d296b7ddbffc0bf334c6e2fff0d55f8fba16d9474d90cab3e5a5a SHA512 60fb4db222c43e7de0dc470ef8acabedf21db9f83ac1dce26f3b9f7254186632034bcd24ac5b188b6ad3a5e4e61ed9422b43e1c8bbf1240419dcd79c8091d392
 DIST microsoft.codeanalysis.4.11.0.nupkg 31564 BLAKE2B 42446ffca87ab64ea05c9bd4c5e861934046f7868b60cf7bb6e9080cb70b7e35e11465343c31ffed0a6da535f24f2b6edb0054459483f186cf3b77e2c5749951 SHA512 264c433ef1bffea499d9096a5aebfcc079542d2c563824bb0a45472238305aec592de0ff0010fc1e0589714bd1ab61c90d463b57dcf9cf4616f9b6d89157f3e4
 DIST microsoft.codeanalysis.analyzers.3.11.0.nupkg 1605871 BLAKE2B 741db7af552609b6edf19b6045cdee0a011ebedf82a887af6df6b8b6168d61821304e04daa8d2a1367a41a59553f9ad88d9ca3448163b7bf7cd3388a928c6591 SHA512 b4ff522f32caef65c2131961f0a5dfaca6d4eb272664bdc4c4697f6b7325ecb372d9469a9bb8058e3526773c936243174f27240871e9cf1edb0fa04cba687c06
-DIST microsoft.codeanalysis.analyzers.3.3.4.nupkg 1461577 BLAKE2B 43f2f6df0bfded6ad334f5be4627657f1d013b73a13eeef28c5da5c134f43c1880313711a7dfa577b4dea5ced0df6df6acc4236fc8371c1f7288b96cb34997d9 SHA512 23e462c3affa5a33480b276888da438cdfc618feeee17b0be95b08f651bf3a316e7c7ddf96f484cbf7f1361183546c195b0abfe41967a97f8b1f676685e68f7e
 DIST microsoft.codeanalysis.common.4.11.0.nupkg 7082945 BLAKE2B e84f169f9f91a4746b5518b7e56ab32d68056f20356e25a749d146722a47c667e5f0a83416b7803f0149abd3b85c5dede1ce64a42dfd34768a3c3442a3160119 SHA512 2117173565f5886ac65312ba1d804fa633e684c296d2922ca764ca52dadb06389c6da632077c775ec878db642a9e6f6117851a6122af03254854137db81b52f1
 DIST microsoft.codeanalysis.csharp.4.11.0.nupkg 16919271 BLAKE2B 20b1513d767922518fbf99f873be955aa35056403f92c15105dac78cbd3b429e5a4aeb72760d0958b42d35dfe59aa956445add9ad5a8ea4b2ec1713027d21c38 SHA512 23ba156592e8ca19ca6d286c11183883eb8967393a3e8d51ec959cd7e06f7b4081c768d44e0921da4e3016289b9a8408871e6d2f1f305e3fafde13e748e850f3
 DIST microsoft.codeanalysis.csharp.workspaces.4.11.0.nupkg 2067586 BLAKE2B 3192cd1a6cacb19224b21dfaa3d20904a0b0d26f45c4805cbe0f70b94cae9726d5e47e9552d3795523985f05636bf192bbc329874079f1da4ba280d8d7f96ae7 SHA512 2cb5d8fee79f526a11043e52d341c4f5cfd5f9f931ef549762dde559615c8191327991bc9c495669d3eb599a0af5a95204442773f6baa0d77102b94a605f0c22
 DIST microsoft.codeanalysis.visualbasic.4.11.0.nupkg 12834142 BLAKE2B f54cc0b8eabe7b6ec55f8fd2087e874a56acf6e38299f890ee8ce44466dade7c1d6a83cad30f7d2899e9f62dbf8536cc182cd9ec6526dc5b046f84dd55dbd156 SHA512 2c56e2ba1eaa69f41c28a1a1583e3d67f00b556cd3761ecbb9bde7175ed21b1eff22f71ea98e8204f0eaec030baa774e43eeb672c3a4459a367b75a8cb083abc
 DIST microsoft.codeanalysis.visualbasic.workspaces.4.11.0.nupkg 1945546 BLAKE2B cf0bdccd761c56efd35019004aa4feaaf2e71c2b804e64490fad3d44d377847f2cdc4a4dd24ab42137a5296d5ff140d262a8bad48b6d5c1802fe550b64844ef4 SHA512 140870a2360f181e991bb36bf5c6b18c1a92cc7b22789d22319ba35f49131efdcff4c8594c1c944b392315636d79a663c3e864d98b1cbb5d23873435fa8089b9
 DIST microsoft.codeanalysis.workspaces.common.4.11.0.nupkg 8333461 BLAKE2B 94c8f50086a5a5bfa846542e26cf4c1b8a5f0b19b11c66f06f2695c9adc0d27dbf4958314592395db185e138504bd5226c019aab27a66fb61ecbcb2f9b290603 SHA512 a5461b6ef454328e2413e82326756c93cc056cc5b8f4af8570cf3efa1d2cc06dc22bba966cffd31ba5ce223b48651203d06addf46c90ec7be21d2f2e201bde16
-DIST microsoft.codecoverage.17.10.0.nupkg 8906478 BLAKE2B 73d760059dd1b7b96856021aec53b0d65692710d80bd4f1b0f77754c3cc6f143978af25b37d26d994e5562254afe51c85ef377a6637b47319474ae5c674f3945 SHA512 479dd9d459c4a7b62a20943afd29e982800cf61e21220bb2d1acda4ccad7239e613450ade8819b6b06fb8f3f33fb51decb27ce68dcf3bc5b61fb70d7e480a25a
 DIST microsoft.codecoverage.17.12.0.nupkg 9421347 BLAKE2B 46afd5c4c8352005700e0541dc87c2ac76d8726f60589ec9a84d6fdd52eb28bf7d4e33b032daddecd0dca9bf6854efe958dc903ef2af8be63eddc08db301e60d SHA512 3ce06a83bf3caeb2c0a6f9dccbcaefb72277ca7b01754d3f4865170febcfab244333f69425b3d95b1d35a9a9462512b519c02b4a4bbc40377d01531ad1390290
-DIST microsoft.diagnostics.netcore.client.0.2.532401.nupkg 165935 BLAKE2B 492564840f6a14976b217a6fcb038bb890b0f19e28776d1bcd77a0eb4f89b3c7bb1f77b076a4c23f3a1d43153ea2cc471ec0b84b6ea8f86ae709d98b4a678c3f SHA512 d89a0cc4dccf46eafd9b15b87e7aaf3d2a52bb60503ab0bfbfc23a65245380fd885c12f5e9a9aa780b7b2531b2870e1ea6eb349a221c9ae588aae69b036d0c9b
 DIST microsoft.diagnostics.netcore.client.0.2.553101.nupkg 166985 BLAKE2B f29237ce319497e971eb622518378222f9611fc32715624412f9f6d2d1b856937097026dab91578d4063d4630056cd353146ec303f54f200252de4ceb308d1ed SHA512 6e01a8b42cd12b926a391174482cb9f190b4b1eeac9e2039013fe9893d9675ccb724e0790bed06f4a14e47d77892b4cf52bc0312e29063877c3e67f087ae9ec7
 DIST microsoft.diagnostics.runtime.3.1.512801.nupkg 882239 BLAKE2B 30f97229d2e6987045fb43284c16d7809b4d256689aa2384acda62e5c1d27a91d2ecbcb3369522dea8931081317ab473cf82f923ec7e7cd8abd25a22c695ce86 SHA512 842c30eafad766a014a0593514887a1b4aec84cca814ec0cf0ba83d3bf3f9abe6e9480c45cc054d6fa631cd8d66cc53aba434ae2293a2116e294be71a712ed31
-DIST microsoft.diagnostics.tracing.traceevent.3.1.13.nupkg 4405603 BLAKE2B f7d7a12946f8866629fdd84185dcf5d22f483f1c4b4d963f20e3d5a528bcd8aea9145508525545ebd4188997d07f1cf61a2475f97837b26bac306735d067f5e6 SHA512 d0a9fe7a4ab17e2963e173a7e5eb2d5644f66f8f113ecaa83d02348b42ecfb1f3a47b2414bf17688e26fa2e492ed9223b1a4eb881220b0710ad0ffe2a11a5343
 DIST microsoft.diagnostics.tracing.traceevent.3.1.17.nupkg 4406076 BLAKE2B edcedc66234efb60f17d751d36a9ae1df653b406e2fd20528d6b826bc993a4334a6505d7f06ff97e75d406990a54557915ea00496d99c47207d7178924488b25 SHA512 2c0b1e6d1d27a98798cc7217825d43062a2c7202721807cef914ddd2279e11855000876c8a8056a287e6b4fd1e6dfdb31bb9ce6bfde1c23dd743aad2971162d7
 DIST microsoft.dotnet.platformabstractions.3.1.6.nupkg 72146 BLAKE2B 08d852b5e6558b499f2d780284aa747e5cf39886d86fa378128fae9f71741bd57c5bc75c0077948f193b7e8ea03a520d8ef3bd3b4fc80779adb4a84a4b44fe8c SHA512 55b87f544874686bed96889953b7e99e43426b79b0fac31cc452e0f4a27ca5cc08522c0ac967bf9df649f7c04137a5e2553d134ad79d5c1e69578367c2b4b4c6
-DIST microsoft.extensions.caching.abstractions.8.0.0.nupkg 160393 BLAKE2B fbdc0d02131ec3601e5f08abacad1916bbe03e390643c5bf40840707642371c2eae26a2b6abfc65bd24a89101f0787bd5681e679c5933048123f53dc301dacd8 SHA512 1fdc30912cc1ead9362f70853de219a9dc7070bc28f621e387185670e605746ee2f13b0df9db03d0b1f8919d4bdaad40ebe9f8203e3a0cbb61145aa8848be136
 DIST microsoft.extensions.caching.abstractions.9.0.0.nupkg 152429 BLAKE2B e5d017bb8ca65fd13b6295220d41b5a59c1daac4004cf6dc2852562ebdfd65510ee35b7cae51babd11745f1e7c5e5932be97222acc16a202b1d614723cf0b635 SHA512 e2ba465cae7c26418ae1d5204b70281090820442f0ffd83cd14772e6d7c917a759f4fc13561707b17ab00ab8bdb649925f4c88b948dbae4785646a4360f81dac
-DIST microsoft.extensions.caching.memory.8.0.0.nupkg 187247 BLAKE2B 3297ed8515ac9d3c8ed0cc96892355e064b94ad137e60d0e2a3394ec054e03610b87483e0db651ff8f91e410e46aa7e8fbb060f2fe00fd4e02b86ea037266098 SHA512 b9ea36c2da4c47edecf336fd3c7f5bf2cce343b333a7c6a98e6415dd26b4f8574c937e3ccbb19556e16d3de22e9564beaabdbfa94fe323992cbc7b47f90559f9
 DIST microsoft.extensions.caching.memory.9.0.0.nupkg 167328 BLAKE2B c2409287e80c59429bc8eb0fe0d80d5367b5781dd4a42609a2ae69adc029429498ad6639e27d37ec7a2df0249442f389c986149814423c6aef4cfab1b22441e7 SHA512 871a9af786778a764db0f89dd9cc2dd24c41fcfe8402dc888bca5b0e3a0fcd05f5dc1a2c995417107c6d2b3cc61d4c43c34310781cb6756dfeb4d435e0ee8ba3
-DIST microsoft.extensions.configuration.8.0.0.nupkg 191129 BLAKE2B 907151c54380b8cb10312a5dfe876512912eacd7471c91c0c4972a375c4e91b0b00e5a295cac19523d3e8443b9232aa06e949e071bc4a83ea3b45c7debe44437 SHA512 da48a8ef3b4cd2a6beb78008382d9fccdcdd42ff3a71d9efc5ac69d4020421294ac95b07cf11520341a69ee241925cd040d49a382df243e2fa194f6896ef9734
 DIST microsoft.extensions.configuration.9.0.0.nupkg 159967 BLAKE2B e4da882d8b7fb90c88a2a44843f40f6b307c3f163a48b96793d61730fc4264df51fbf88d9c2bcc37a763d6779194abdaa9d1e7f169c138c1337b6f03880a73b4 SHA512 534f843342f2ca2bc09663fd37fdd3d8acd50c9904fc8f1f3fa14498bf4b9fe91329a1a9bfc012d17fd1358d894c15efdbd026ebfaecea48fa0bb59e79b8ee71
-DIST microsoft.extensions.configuration.abstractions.8.0.0.nupkg 149230 BLAKE2B e3d49a61ded7a88e0ffeccf5901f1fb021d66ef9914a5e5e7e43e69a193253f1009a55cfb2199579e017dc547050b77f7e777f5fe944dde609def9f66be3217c SHA512 3316170910a94290c8df4fed26fa884a47dd9bf974eb7ad22368d5a63308660a01d2dab4a44662061dacaeccf4ba09cdabfccd4636f76ab3178becec5ad31a2f
 DIST microsoft.extensions.configuration.abstractions.9.0.0.nupkg 127574 BLAKE2B 7ff83f49a240aeb81153583b649622126bf12678dc37592bd4b98372e38aa45f8897543755426a337e35f941e095196d35db43b519ec9dfed8055fccd37d5534 SHA512 3282710ed202a188cf30d23fe4d9831c4111752907d00b963294fd71917633bbf0f45e2b4b7fb9fde1c3a52710bcc122d06a7ace70b836b0d4b5576656dcc3b9
-DIST microsoft.extensions.configuration.binder.8.0.2.nupkg 389312 BLAKE2B be1a477073ba8270e3419cd7df4b76852ea18039eca4678d5ad7d7183b6cfebf08c0e0bd219fdc8620b7f35a621d564000e4f85092333fee431b0e22ca3a4568 SHA512 63f5d5d0f5df1c7f90a138c75e14d81f3598af78c2c736a7aef5035ffcf9d40ac5a133571935a08290ceb92db72357c8203261165f8f7f057c450b2c611f6c2a
 DIST microsoft.extensions.configuration.binder.9.0.0.nupkg 366133 BLAKE2B e395eed4c00a6630bf993d9979244b2855f650256ec63e57fb0fb47caf92fc1a34567ff26220a4871da9c2a22ea9debb9bb8277ed92437c396c0295e87bab6c5 SHA512 43666627d5d88a031f8f48a06d1317fb6b3752786c15a20b9f96fe59ef2348462b134e5d4beb9a2e313def38df27d2fcb3f797baf24b5c5187d0e86102153926
-DIST microsoft.extensions.dependencyinjection.8.0.0.nupkg 341717 BLAKE2B 4c6e981247ce8ca11783d442e658f69edfc307020adacdb58c28ad93e7d75b7d4b89001cc34787041e44eb6efd2310e4bc8ae25f31d5a2688f4d363f9756d9dc SHA512 96391af4ae0542f4ae96c8009c9ffbf304acadf476cda262a8ea73e33b172529541044186c59d656377bb2de42c9f5925e0632a81f6e7516f2a646e8916f16ec
 DIST microsoft.extensions.dependencyinjection.9.0.0.nupkg 291528 BLAKE2B 9333025f70b6cd60402d71bd9de798ed27ac044beedb168d5c72380b08c6233349c58a2098a22fa84fd0a9972d341104629dd4c10a0867a55840b39754e05e8b SHA512 3cd3f939c041941c3d6f185e0b0e29a519c9a561d61716c4574d8ef447bed0a9f787508f88780c53ba9e9142aaf926147024500784da88f3955a041a5350f8cf
-DIST microsoft.extensions.dependencyinjection.abstractions.8.0.1.nupkg 276691 BLAKE2B 60d1edbfed31aa8198a6e07e1d66e228357c2df2955b74250b4fe0c9124728fbe342b9d0b64c7e053e37ac018f5439082e1c925aeed309da050ad0fd490b06b0 SHA512 8118da9932da382b1c22379f9169bea93cabcf17f5d56c1b6616fae23b1bf14b4a38539b7f8417f63f161b14021f2634df9e4f9fa62f5fc84667018a1d92c967
 DIST microsoft.extensions.dependencyinjection.abstractions.9.0.0.nupkg 241242 BLAKE2B 082150d37c98451fc9bf2b8477c858d59b4c7f9ca7392166a77c588f152506705cd53a91ed2ff5f5f1f3e7443faa5f6eea38113e8cce6e86fccf698755f74a71 SHA512 62d69c591f1f533930baceef96d13562c46f3a254edda207aede39df86aa344c0ca13389b72adbc03f943b120db945c04944551d9a17165f820ab0bfec9b7e2b
-DIST microsoft.extensions.dependencymodel.8.0.1.nupkg 262218 BLAKE2B 2aca6db81decd062175b1e8f8cad27b3bc3c1ab2f7d94cb0db3d7bed48bef38c90a872f4f8e9b958dbd91cc0ad8baafb16896fb70f2686d61be9172f61711560 SHA512 2ace6161b1549e64c9b3176eaa2007a76dfa8d6b4c2134a8ed4063e68457246a285abf4292b6b2a76a05b59c6f6ca7df13eed2591019a7f68369857b539fa277
 DIST microsoft.extensions.dependencymodel.9.0.0.nupkg 224467 BLAKE2B a2750198d4bc1167a45eb618baa4917249b12f7c21f361fda6d0eedbff6eafa42d7cb16fb8c08fb67cec5c486d7577b59e47e240dcad66bd4c540de22ba9362a SHA512 99fd298636f8bc5fb10908eb35729fd3cba4683e5a5525ba511de07e6533c944a8e4a0583bb21aefaf4fd79fee9d4c356d2a2e5375293f5d44dd9607452b68e4
-DIST microsoft.extensions.diagnostics.abstractions.8.0.0.nupkg 152735 BLAKE2B eabf9e321a5cd02f10595cc2ebb23d910780ea879dfc8f81fb2a9baa45c8d424361384aa853ceff40a078bab0d43185208c2bcf23f5f926ad39b57ad0d7f3686 SHA512 a75dd040e3e03e90c8baa006bd569db9fd09983cf9c27bfcb246d96a73e2595cea7aee6116438989f8df31b56bc7fe6adaa7a7fcb6ab95ec5b1d64d0b17ff617
 DIST microsoft.extensions.diagnostics.abstractions.9.0.0.nupkg 130830 BLAKE2B ccc3acbc96827d832e6afc0c6a1de170060cb2fa951093e0cb7a9dc3e294ae81f2f4173501a7cedd58942df35c09aa1fff41f4871bbdcab4c20a6629ca49f981 SHA512 a5598c2bb424e046e2032c3c9fd2494fe378d5a9ec782a584d7502f3f92f684ffdc78f541953533ca04f69f5e9e1391959a32591f9cae549292515aac51d7e78
-DIST microsoft.extensions.logging.8.0.0.nupkg 232520 BLAKE2B 79e950dbc495ab3078fe05219ac5afd79051fb841ccc47c919958ffdc94b1077eacd6038a8cb70cb27404295161c75fdd7e19dcaa006bc0f237781c3e4a434d7 SHA512 aa30576c428dff69bac5f5d71721af6c4ef583bc524edbd0a94b49cbd80f698905021260e1a432c32e6d48ce5a30f6822c209f11dcf7c819aba1fa8347925b06
 DIST microsoft.extensions.logging.9.0.0.nupkg 200977 BLAKE2B d97201cf54f1ff1b465ee8caedabc02d410ea334c9ff1c9a468770428f7a9f4d7a1167afa8c20fd8b6669787ab1a599972fc44d1a3496a5956d8faf27e3c0b92 SHA512 38b8e95ad6133abc93b207b5f4ca8fcc582d7b8b137a9af060939f78ef4f8247b3e595b4caef7133928174d571a7c0d31ce3b3ad31e8188fa3472cdc37c8e7e9
-DIST microsoft.extensions.logging.abstractions.8.0.1.nupkg 800001 BLAKE2B 1064221148535eae51278549a244a50ca303d9e1a841a29bf3c47b388af3bb1dec81328f09249c3049e76e941e595d0d6f54a79cc66c232b0afad2891ddef91d SHA512 c8e0fdb230e0133f2e3e2f84f300258f4348fc34af23ce597cf12446e0e91711cb4d4d0fef3333de3ac23a49e006a9eef36baf95d2b5b7449c3d755a6d55c045
 DIST microsoft.extensions.logging.abstractions.9.0.0.nupkg 777117 BLAKE2B 2bb6c90c849bcdc7fa4be543c47cb80a99d8d926236359b49732b2d7b60574a4d41dda803fb8c18e31e15f48b09a616260ba2e809eaedd77d33e65b6f671eb3d SHA512 fcaed8b683033737a9ccfb361a41569663c045c63997887f376726748c58c92d79c28796f132ef7e561c9cd9602c7011e1fb112a9d30bf9973626587b0ae5d74
-DIST microsoft.extensions.logging.configuration.8.0.0.nupkg 143523 BLAKE2B 80c5daa2ccccad222ee087d67e5f0bfa274801c64706ff288e0fe5179f859cbda26015681eacc65ec2d6a25cc855c2dea907eaf825dee2d3808c8ef0b111b0ee SHA512 a6c7487b0daabbf7987496ece736b3a2c504298da762c30093982850fc3786d7df6efd92da5fe78d7ef194ad7d3e2632c8f5398ca70ea6c9ebcc1fc1c7bca41b
 DIST microsoft.extensions.logging.configuration.9.0.0.nupkg 122529 BLAKE2B 9a8ab18fd8ec8350860a737e1ab3b5a3dbb20424174585088f4144b8e2b94fc759488247648b662d1375131b39d7d91ebbcb876e054f1c6bb8ec04182450d079 SHA512 634f023d4206cfc269574a2faa7dcb5aed637a192aa50a16277c8461848aa84f503f6ee540e0a68fa6acc652074bd12c5dd45be4deacd59ac75ecd9267b73591
-DIST microsoft.extensions.options.8.0.2.nupkg 494417 BLAKE2B 05ba97879b2bb3c5a8c9296da11f6ea1ca365fe9856574f03b1c76e775510c25602ebbead9c8109de70fd3b3c65fc5794e90440698c311d17a2bc1de5db384b8 SHA512 cc0c10336580c9519740a042b1e42d391bcb32b63732163ae1161e1c5b55a4cd4a736e1902eb2a4dbb89d784b0acf584b5042b4f3481a61dd30a4e229fb523c5
 DIST microsoft.extensions.options.9.0.0.nupkg 453683 BLAKE2B 387624e2658964908fa88a06e43e922bad04a7e818138d59a175cd44feaf473f0192e2581e838748c0a2e3abeb6fef1a475cbc0cc91cc5fa2ca89a95622766c8 SHA512 05e7c9042523094fca2fc81345b157f5e78e42f03917b22458528dcb9fad77215f0f6fb078eabd3032022c9d66d7fffaf7f32437e29fecc613cc597ac0770b9d
-DIST microsoft.extensions.options.configurationextensions.8.0.0.nupkg 135412 BLAKE2B 049e740a869f8affe84b1b25572ae18e84879afee17bc0bd2fd5b629246dccbaa50463c41dc21e9cfe453190872eb69cf34e1951134c72a572b266830ee7af96 SHA512 5c32ae67ae4e873216bbbec15554778e0acbebc283862a2debcb11a995c42a5fd75f9436c8da421aa51bc5c12db4e6c4e82f12da1ff942bc5a6e1a8cf3c77a7d
 DIST microsoft.extensions.options.configurationextensions.9.0.0.nupkg 117122 BLAKE2B 9488f3b8e0a94683daf7e0bee86380aaac0a0054a93362f766cfea4448a9223152a90964952e5c782caf138563dd06eaa74d02df13ddecacbaf52526c9d243e9 SHA512 f5002a5028cf6c3cc7dd415ec765bc3bd256577e13f4e651def19be2db6f84b11251a7003540dc0fbe59ae741427e64ee4f86588281f1b0963a237e8cb22d26e
-DIST microsoft.extensions.primitives.8.0.0.nupkg 209772 BLAKE2B 46a3392933c0b901d1c535d534f0f9501b63659fee1f83bed47e48b49aa0162da5af1b3190af401d709fa0d4b8bcde3f17f7e4e28f0141328a1a7446e4f81b45 SHA512 1f5475ca3d3ce18463456dd135afac502d6f82fea6e4e4814a61f86616c348decf28b73d15c2bb276d1a3c039ea6064f75e1329f6f3a64caa3520d70ab92c32d
 DIST microsoft.extensions.primitives.9.0.0.nupkg 176058 BLAKE2B 43d97af832bee26615ab93948e5e77e3006ee43ceba5107fa0f880d38565237aea6990daadb2d36f4bed9c3b13e07ba47452bb79aaffb756e55b00774bac4394 SHA512 679d7986b0dc51b41addcb0bb0de1c6d8bb80f6f4c6bf19e929afdca8784fa8cfa3e0e9a8ca634bd3acee4cdeea83a43a3290f60e871e609502eaeeec1aa945b
-DIST microsoft.io.redist.6.0.0.nupkg 115293 BLAKE2B b1c67d6d6da9b9779d46037e280f25869d69707cc2a5d9215405c3dc2998f1f3ae87641a0f6c1eb3e4613ef9c6cccad057447411e3614ca92f77f7253f0549fd SHA512 e6033eeb469b1e4801b6c267b37f6196f5298314a983d04df04c3306f2094516a36b655bed6c86ef55f6f30293fb0f0cb1da34d6c60a0519f31ccd2919646296
-DIST microsoft.net.stringtools.17.11.4.nupkg 180598 BLAKE2B 9e93cbd320c6bffa9fbadf83f3540d0a5e2aa85117a85c0a88e9ffe88bb560d725613e62ca918fda1f70e4265d0741d43be39b33e8592d0398f8db7a228ab0f4 SHA512 5b57e6df5a0e5b0b2fd5e6c06da0a5061e1f3612546e744f6786006ea286f322c9f7c9651331d79db45a40a7ab22e8fdb71ce22a7758b66fbf252135a4b99892
 DIST microsoft.net.stringtools.17.12.6.nupkg 176985 BLAKE2B df4b8036eecd0342bf9d655fbfc8359bc2c96de10b19fa37cd5c2d53d009eab8fc2daa8bb0374e7d32cc310f1e48cbd53f48c60689b724ea8a8b7d6eb520a68f SHA512 b824ff1b45b5c14b5ea9faeb8961df2df16602b91af084a8ea75240b9810cd86589b63d24eea9f4b5e0312c63482a0ee42970b2cb6984c3704334480d996b9bc
-DIST microsoft.net.test.sdk.17.10.0.nupkg 34302 BLAKE2B 24d0b42d462d7dcb43472307cb5863df86a0ca4dea0d3d0bd182a917d467951b261d9ec1cf5ec944762fcc9afc503aebcd1b592d0dc74cd31c0d02aac5f9ff8e SHA512 63933dce26e5e3e7d59133f4b4eef9b28ab618f6186bc69d46ae3c2af6078c840b80d9000530ae8bff2245852e79b8a05e1914a123fb2c7d35ea99d190d10d70
 DIST microsoft.net.test.sdk.17.12.0.nupkg 34293 BLAKE2B 30424196c85fb2d0fe44d013e21df5e94d7314148d54e626930c0a177c4002cffc5186bd1c477023e9c9d4371f19be1aeb20ea93779b5217314eba29b8f3d8b1 SHA512 8467fc23cfb2a35e5eb5abe831dfbb39770e1bafc6ec760f0c4260e5a42784ccecc5a529abeb9d359cd2c6610df6b19358c64e01515cc8d5cd2fb601b0de9c87
 DIST microsoft.netcore.platforms.1.1.0.nupkg 17960 BLAKE2B 6a9fa22d75f5a1c65746dd71a63c3d4e37c393e99c23007c10f5ecce248a04863bf26e7562c7751177a6985eaac266c29cc6a5443a4a853e773f88994ad2a3fd SHA512 6bf892c274596fe2c7164e3d8503b24e187f64d0b7bec6d9b05eb95f04086fceb7a85ea6b2685d42dc465c52f6f0e6f636c0b3fddac48f6f0125dfd83e92d106
-DIST microsoft.netcore.platforms.5.0.0.nupkg 39826 BLAKE2B a122f0d2afb77455c005740fe5096c055f72eb658b0d1f10e6a17f9d07c3bf91ad0010ff472ee1d05b84bfbb75c9de3c46d2a2d33fdcaa245d64d6c3a956f233 SHA512 8493fe11648c7ecc20b6530490d30fd63744961345c0501a7a10b11046661da09b783ddceb8b3208ae52a72a8a94cafdce8dc1bd6073c32081e30d0e7407f174
 DIST microsoft.netcore.platforms.7.0.4.nupkg 49157 BLAKE2B 8bf1b46e6f56269e7b6ddcccb236bf3afe2112a219fe3261d38eb166a18310670717141ae40509d48f21d538dd5398422b31f9a344a80dcce636e3c647da6748 SHA512 99c4168ee0c1878587186e16701234934db9580740d9a7cc9ba7ece36b26d5ffb7811c8d4148ae3154f980058d5064879a5bbaaa7fd30a7010a5f9781a6e9c07
 DIST microsoft.netcore.targets.5.0.0.nupkg 35893 BLAKE2B 35374033d2637ceedfa9ec41bb48ee777d29ccf5c9ad5a0c85d082f757422a3d3fd3252830e0c817eb01e0299f3b0a9f77b85ee81b968a8000d145992cbb94b2 SHA512 8581e6dc902340efe7c92c5c9751296616045bed8fdc7d5e2d936bf90c603b94e72d2ea1aad7e2e567218d0ce389de393189a1cb65fb20e99c5ad0cfe1fa4c1b
-DIST microsoft.testplatform.objectmodel.17.10.0.nupkg 1654989 BLAKE2B 86644813b79206d2c660a15ce5be29b1684a4dd335f8e6b5913251a0a8a8f61b52c528fe0f1895951b529014b1344df59ab9555ade3aec7d2bc52d9c59b93012 SHA512 3b7f8038f6cd77389b1923f1b19936aeaaa8226e784228686ece42b16c4f77fb23b523bb7acfb085c32ed8492b0880c798a1ba980e20c9ed23ceffcca35359dd
 DIST microsoft.testplatform.objectmodel.17.12.0.nupkg 1660190 BLAKE2B d38c48a3b28a4eef0e11d0724904c35bb0bf5ca48bed4d69666c743afb2ea522adb577709d7f12a16f02208be173dc5a260e0f1b67f7a1dc5a4d375cc1ffebe5 SHA512 925b1732000f356628ddc79a90b928778c18ae4e25015d84862ebbeb350a822569439623eaadefb0c864ff7a66f7b2ed93f85d7125b4ac9289bdc42f4f33e060
-DIST microsoft.testplatform.testhost.17.10.0.nupkg 2879677 BLAKE2B 5828346a430b8e9e2ce8a4669c3132316b2ad38c1ba623ca892eea27de510be75a0e6aca41717e19d41e0b53d64b43ef677f4341e000e2d5696187cbf7040cbf SHA512 b400651bdb20d38fff63c381328801363df1b8ff9f26e3564bbe39c37251818beb96f0c2c19b4ff7586383fa84ffb05fc3cd755859b755380cd2a2e4fb04da53
 DIST microsoft.testplatform.testhost.17.12.0.nupkg 2882125 BLAKE2B 3e8d45c7f955cb051dfd569bd3e754cf016691a78ea4f52c07febf733094e823eb0c63f3e2230a81901bb1fa9c78b538ece61a3a2fb06e098381f6a54c5c42bb SHA512 81833604e190bc510fd9f66deb57f77f91aefa298bd46d5bbc652b6c98e961c97ae91eaecece721128345cc9fc22052095dcfc46574e39a6268e4d8a712786d5
-DIST microsoft.visualstudio.threading.17.11.20.nupkg 1656800 BLAKE2B 4ccabc1ed7bdf2efaa724be47e65d31001f500d585888e2dc0716a2313e5240c510ed84ad71a558712531740c6b272dbd7b0f480ef82cad7965094a6f89ba5c0 SHA512 5977c40d86c71884c2ef7df072e1fea8012a4cc18421e8ae9b0ebca09b508798a788de699e46bdc9b44ab0ef95951433669595288f0adc7131d4d1e68d9ad06e
 DIST microsoft.visualstudio.threading.17.12.19.nupkg 1662424 BLAKE2B bb0dfb20a0db6fce58703d636f5256b1ed3bd14852034717ad254880a5c27a407357495360b8aa8156fffe298ab22835b92da543c5ccb26961d81bf393b09ede SHA512 89343d78efbd6644acc3654c4546016dfd4353a25c45ea1b9ceae6e5ea2583732c048faab8010ce8b91882b4ffb978e29721c819ab88a32a07d9c811ffc2032f
-DIST microsoft.visualstudio.threading.analyzers.17.11.20.nupkg 488903 BLAKE2B b43d07657761c4b68a1b3bff7455fdb7a00a27d9ff3ecae36a389fb19e0021232547f9991ae98477e40340f21539221c4ca68b81ddaaa533a3e75bf18840faa0 SHA512 34f92b8a66b2d9461902ff1a3adc18562937d0889b893ea74b963f35d0da24fe0c2494c9d635c60dc6c1fd4158dbfd28f8a4296a8d0d24911c67d5c0409e07fd
 DIST microsoft.visualstudio.threading.analyzers.17.12.19.nupkg 497164 BLAKE2B fae4a989ae0753b6a92353aa143bbde3794c980153e7fb2b8f4163eb3f2c74445e87bba92f20682a66f610ada3f23a90cb3f71d026e0329e351cc6cf81b2c702 SHA512 a697d930cb1936e065e4e02e165442bd7631a3f3b27832b994e844fefe2c0b103d46271834466e39ffd6a57e4d91c577f8a869099a05f48be89f58efbfdb5f17
 DIST microsoft.visualstudio.validation.17.8.8.nupkg 334546 BLAKE2B c0f0459d4f3004180bd4477d59e9c11813c62d54038d1a0aff2065bfd221fe12fc3021e376c6d9c6fdfa11776bed1941e98a570ddc048bbf67e1ae8106a7d165 SHA512 55ac16e290efdac4c1f44c450378a136240f91d7212bf9ba5e004f151e86bca72ef906a51acca9bba6d018bede1456e26296d0168b421303ca31def52c52154e
 DIST microsoft.win32.registry.5.0.0.nupkg 354731 BLAKE2B 3e98fbda73990aa8d4a8fe584d317ae59804c3ac40fb42194e332826b5be57ab78e563111dd3278a8099b9cd890d4e37f1bb74e6ec4a443edf7c783ea0cceb0b SHA512 471e66567ce59cc86475aece7815d05261264ce114e0c1688ba2551dd51494901fa72dd7a8f74f8e8f0f3dba74af8595f177552f3c06abb4bfce76692197076e
-DIST mono.cecil.0.11.5.nupkg 702442 BLAKE2B b7f0914eb81bbb39462f2c6304807ba06ad3ba074026a2dd2a79c6803a9ca3eaf7605dd7e8552f285e97ad308617dd7c1660bd86c92c15c78b6824234158a42c SHA512 a03f273cdbf9da73b119a9381519a5e12c2fc96aa89c39da88fc1d6afe6d326e959e2ab7703f6668215db170989b9dbcad4036ebc5fb7470ee5964c0739e0caa
 DIST mono.cecil.0.11.6.nupkg 707868 BLAKE2B 98493e7561271ef44e48b7541e52f8ad505e28e609ef52ecfa6c3b795ec1a0b4bec5c1c084702f517491a65fe20e0bba56664c2ca704cbed5ca2feccf0d0fe41 SHA512 1c5932246b23c9f317690a25ce3e1416d168d885871063d2f604cf997ed9e99d41bccdd0e22d4be6e4a5ea729d06bd92cc543686dbbd75ab0199db60e0912fb4
-DIST nerdbank.streams.2.11.74.nupkg 426815 BLAKE2B d2cc625db6b03e3202297f9623be3c7378e74004fc47bb906f1f91df203af12924f348e37efc0a78ed2dbf7fa882b0da2c292b372ef9b2a68a78790b9214f413 SHA512 d5c4ef4db235ae59ec4a310c531b36672c8ae13b73559f79f0fcf6bd34fd8aab94daf9a40047406990908cbbd32401696b65d8df1b1e0f1278b0e5d9b9af2f29
 DIST nerdbank.streams.2.11.79.nupkg 426744 BLAKE2B 8d2fb34a896a7a8fd2d74528ac78fc310d8b78c66d8fef59e0330a9ff0b44123befeaf0349123f8edcf85e5e4ae6c72e2aee65e864e712ad36fdd8433e9ade43 SHA512 555718d1581063d9d30512073a8397cf73fb448e250495df6952651dba715be679f2d1b15ef650cd7d3e23803279c467562a2ed10231018243a8a39a3a009e58
 DIST netstandard.library.2.0.3.nupkg 3146139 BLAKE2B 311e5367398f76c74e78930bc2cd39e450a86bd8626311ded8d58bd84c94a8a84db3c11b2bc10f3eeba20a9d081fe7827981f702ad746b49ae3108c949ba1022 SHA512 e78f0cea69c14895b1b089644077dbce8631a626055d96522f4d29e061d8bfc3e48aa1419e74faf265b998612c03f721f5f0cef4690f824150a5689764dee601
 DIST newtonsoft.json.13.0.3.nupkg 2441966 BLAKE2B 0c83cd81b9eb647fd9106c5b8b7af4ff6b35eae4fa24712f16cef1db070857b072b9e40a52ed006a82125c860dc48b89ac54224baa24bfdedfa573183e19d169 SHA512 99b252bc77d1c5f5f7b51fd4ea7d5653e9961d7b3061cf9207f8643a9c7cc9965eebc84d6467f2989bb4723b1a244915cc232a78f894e8b748ca882a7c89fb92
-DIST nuget.frameworks.6.11.0.nupkg 149563 BLAKE2B 671623f5a1280a777a48a9330e22443805e4e33cb93fe78bc24a345e8e6c8f9d5b0e11472d84491a9d1cb440874a5ff656abfc5fd6302a5635b8fae942b261d6 SHA512 7126215767dcfa1111d5f29ae1907cfec8d0816eea8d93ac482ed6cc7dcbcd6997ea0c31cc6247a3b1337d51903004832a4558982060db2e72abc223536cb943
 DIST nuget.frameworks.6.12.1.nupkg 187332 BLAKE2B 74330beab5229c66495e0faba5dbd024272acfed531c0df3339e4f5b2843eb097df5b4ff8c4e0e4c70e7e838560ca599abcf7bf331624e895a76760969ca5db3 SHA512 0654d8e212d581092b71d053b4260f2fb8f3a201924a9d3b484b3ce1efe3efe1e6801738ede39d4d4dd601007568ca9fc227dc580727f2ce7474e48ae005028b
 DIST opentelemetry.1.10.0.nupkg 631589 BLAKE2B ae3166dbe3b0cf11a6e4ca1656f25b5981111c10a21635b175342656266c51d05f14ef0d75435dacbbebe77253ddcd0b87f249dc4491b4f9dbdb370dc96da7b2 SHA512 c899741ac25ccd1bc64ada3025cf2b0cd30d23996aba9caa5f2156e552a58527adb1fdd3fb68cecbcc376ac9429a82c439ef116710a01509a9fcecd147ed01fe
-DIST opentelemetry.1.9.0.nupkg 603458 BLAKE2B 9aad6c2391713eb06e215ea63c1108e13f702915afb61258cefef9bc395bb0e41a93a8d6498e5a35d08c74ab15571e52fe2bfe49ce7ba8d2d740723b2bf94ab8 SHA512 cc743fce9599d59eedfb5fcaaff4b369290108be40e2560473ccf575aae0a5b55aaf4850f4fa73a4ca77a9385f8fdb01686106b5f81f23644c4d625d22029bfa
 DIST opentelemetry.api.1.10.0.nupkg 193144 BLAKE2B fc0dfc12ad26247ea2878cee5de8cb737a1734c68b3fdf2d0fdc3281cc675bcb065569fd891a0ed8cc1877631f3558de4049e563bd254c39623b1244ce2fbbd1 SHA512 0be259c9613763dfcbcd49f1ff7d48bfa73805bf552a8a8368c0b0663ff491b316bfd147a7a2cf52499efbfbbd071e2615ae3ae2e0f411cc4a68b24e5b7b2d81
-DIST opentelemetry.api.1.9.0.nupkg 169471 BLAKE2B 01a7541315a09f922f30c66194baa90c8ae5e233ca534be7fab8d0ab3da1a46c023c63c33882d2522bfdd601b6a746a78557da5ac120a9dcd2b57f3115056545 SHA512 de882979582f68e63e58771c2c2d288299ff1b46db1800315f54fa030438768a3d4529bab4e3c7cadeffa22d5c7ce153116c5106783e9f9ea95c46da50be057f
 DIST opentelemetry.api.providerbuilderextensions.1.10.0.nupkg 83893 BLAKE2B fd34c62df7c29dd4d98c6223399e7bb73d25a5c301faddd48f74e30e9da58c2f19c5749b862512b8b5dfa1cb5f81b5ca93f754d64aef8cb2a59802b1c397a0e9 SHA512 f8c1bb4256ee96b162b7232fb7a49ebfd68ed1b2d9e40d55a0381f040976e701e7054431275d4d6330108ac925b0275731d98c9b652f9299eeaaee11bcab36f8
-DIST opentelemetry.api.providerbuilderextensions.1.9.0.nupkg 72961 BLAKE2B de76e86116c0745c07f031fd891fbcaf3468f102719921be1373e1bad808bfe75c1746a61beecb485fe481a9d519d8c84c633aee25278c9293d0d82b3e8fdedf SHA512 04d4fa13a7d7a80ec1b55ff993d2e8e6193f48edc38f342f675e71f1f2756f6e1c51fda80aaed72b80450e5d87a8cae84bfa2934cd24f6db3e3877594ffef14c
 DIST opentelemetry.exporter.opentelemetryprotocol.1.10.0.nupkg 908138 BLAKE2B cff6e2235a7bfb5c6fd37f5d184c21bedcce673059eafdd05881028eeb69335ce3645e70b1d85b0e0f608c29c07509fcd55533a984e6f80d4ed7c7acfd0c7acd SHA512 211f05e19f721f1c788aaebefe4bcb7fd1d35e057cb303af8914f3068978b46e3e6d422b8b69ecc1ec2578c4bfc768768c2d327643389f205f1e3f0750705abc
-DIST opentelemetry.exporter.opentelemetryprotocol.1.9.0.nupkg 824320 BLAKE2B 414627e398b1872f2f18147215d98c323ff8693f14d8cfba156444842f992ac469e3bfaa1cc9db7b6a57219229c937c1aad74c76f69acc37a044d78eb58b6345 SHA512 d41b83d70249bc57870b7da2b55954cdb7ed5c149906e943bd12a4c064fa0e133047b765861c23d52a7705e69900cd584406edbf2f1bce453d1b25c5dea215a7
 DIST opentelemetry.instrumentation.runtime.1.9.0.nupkg 44942 BLAKE2B 14a061d2b53b8d8de6a967f4609edd1cc7e0950286cea51e4da93d2c58840b0ba45d6cfb6d1756d5684b4f97ffd60b2495c67da344fdaec7422b86d8aefcb0b6 SHA512 cb4dd49ceab81d128852a6081ffa1b45feddbf42587d8a1ae70308f57fc6cea7f24a1a28da4a688145cfee9b31e8ec001e27f355673d47fe8eef2fc9af85f7dd
-DIST paket.8.0.3.nupkg 8342921 BLAKE2B 45c09edbdd4532fe08169685316a07de494d378d1cf7784cb01d40282f44ddaf77f4ae0fc84183463e3386db6ff782eddded4f565bb081518a612abfc19079a6 SHA512 5cb80138cbf0cc86fd21ee66fd9b17beddc2ffdccbb56bb290dafdfdbfc5935746e9d94a88b67c5f94bdbb16929eedd3ffc75542a46bfb292556cb0a5294f181
 DIST paket.9.0.2.nupkg 8908378 BLAKE2B 157ebe310000fd98998593ca8942068b12dd6ac112bba4790976e376d4b767f84dc6dc0a941f817eb7c212a70fb41e75c85344dc17d9a47e1b1e08938fec0428 SHA512 54f321f85d48beb68a94a5099558c8fe7cabe5ec8a40c34b29b19c168fa92a972f3766c09eb165e5669f199e00fd94f32e5d1eca36f701570bc7c67f4bc0c5d2
 DIST perfolizer.0.3.17.nupkg 194402 BLAKE2B cce0ab2c908ceca70336319dc20629c694855a9b834b06cc0669fc75dff4817f90514e6a7c39346ca2e732b4f92a4aff64a199c57dd7a1edef1ab9640cb868a5 SHA512 c66ef81a4cedbee659ee54fec138b4af50c1b53171195773d39c0a3f0cbb48afe415e8577e271d7be76262bebe530ad907e8d2e20a6e3e97176ed5b5e034bd86
 DIST runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.3.nupkg 53676 BLAKE2B c13ea0ccf4ffe84466aaa6c4478b0825c170ef8a4a19ea11f5865c4ef41971df4a7c0b27c740bdb277893760b7f495385d3015556842b750a1ae5a75d86a6be9 SHA512 b3d00c7a56219a27eb26a1a391192aca83fb34cb9d932d2f24f758ce318aaf25988687d1130cc2e047aca989be768a0c401fbebdb82f1abb6b719a54dfa43eb0
@@ -198,45 +131,29 @@ DIST runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSs
 DIST runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.3.nupkg 52228 BLAKE2B 652bc9566fb99ce6f8603adb1be39950102b44d57b8e3334c78070c77cc7e8782491f842a322ac7891ccfc92bb912c89baffe0165a0a8934e618ccdca8d20134 SHA512 b8ea6ae8c2f75c2f908a8174d660e983acee24466cdb7faf8e96e738a424671c8c48e18d6a7ca57808cd8172d9c94a3434f6b973c408301f3bf12bf12d2c6384
 DIST runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.3.nupkg 53653 BLAKE2B f31572029ba4e2bd67dac5aaed0c4af9c8dc8371493f82c349387c1a5ea9079d4c91ff7fb6652db12f146cfc4af9034e87797bce7fac48c0d6ce066a33f8e3a4 SHA512 7de7e0f03c6ebfb04aca915b7751ca21d3bfc79d65f8d37858fe4622a7be1b1e8497502eb7bcd90396bd07c58fa300e2182c0f22a10968885dc028e66c7aac71
 DIST semanticversioning.2.0.2.nupkg 70096 BLAKE2B 9887b25ece5223b9b8459a397431ed7a64ed438911c4958d3619b822fb84212395e08856aed4cfeee2a9b6031acbc0610e137b0081da27a741bc1478d77e9272 SHA512 f6fc0c72931b83c31ab940aba719e2b861bf0013de93343315323617d01ce78070fddf7701e6649d30d322d5488a812f515aec4a48c92d99640e4fcb32cd1a6a
-DIST serilog.4.0.1.nupkg 532585 BLAKE2B 742ed64df6d64df336bcc60312bb0539dcbe397689a26a644b7644064e78809673f9288c982514afbe69763796759991275626025e577e4982e419c7ab4ae302 SHA512 c1f2b058790256af7458f327082b774368197255a9e6f05dbe87008956d082d5f32ca5cff19e39f6f1e21aceda1b49425df4f1d011486165e3788da922ac2c9c
 DIST serilog.4.1.0.nupkg 557817 BLAKE2B c88f4ec735c130f19db6303265e4595ff69986eda0924d421142f14cdc598b9d38b6b97d39387ec3cd65b2cdcda581945ea2b4052985ae812eaec9efecd17959 SHA512 4b0bcbc6ef35b4d1914dc870f3ecafc4a7e320b66842f8fce03d733874fd4d171885343c91e43dd1d5e49f55c50f948cf6c681c64819a8632187309ff82be15a
-DIST serilog.sinks.async.2.0.0.nupkg 69897 BLAKE2B a56650106418f6e1b34ac9636d76f0b4d0ac4023f1b5519dc449646f287d93742e876a3484be6323c932c6f3943ccb3dabd9961ff6121c5fd7eca59143bfe85a SHA512 0ae4823f9363de874bc5725fa9abb2008cc18429d07caf6ba7fdd83b01d64d845e20a823e9e663ff176f18035bb3dfc4c87293c774adcfdd606b3f910d33fd17
 DIST serilog.sinks.async.2.1.0.nupkg 79141 BLAKE2B 11ad62b5a645668811c17a56f1ca5e4ba585b7734c3b287e0b400e824e83c7419e132fdcd30e9cad26676a64bc8f5d8e8cd272edf28917fe92636f5ca60586e4 SHA512 04c6181f987cf459d96ffafca2a7cb7d5bef0f5b079277deb5ac009d238929ff8b075b2e73504330505462d76652ce106966dd3a0407c8799bfe5d0bec7f0fdd
 DIST serilog.sinks.console.6.0.0.nupkg 138337 BLAKE2B 2cb29f761056154a7cda20eba369ce04ef0537fc87abff1eb92eff037eab5777f79c5e3d915984669ca2c249e88e711c411770e87c26de8db608dbb71e19df69 SHA512 49c6a20f42a9b46d8cccd76d287e92210aeb967d8f8daf93be82561fa050d91f927d0bb5ea81a147caa899b9abf47b616e5d74a8cfcffeadc1545da0b73a979c
 DIST serilog.sinks.file.6.0.0.nupkg 133748 BLAKE2B 0a2bf6a4f779fa06be6144114e34cd8c8b28715a06ebc6a52114ffb15ca8e2cd1d8d557d383f7df64f6feec65dd14d2496a17f2c3d43935dae2ba3191cc68ee6 SHA512 90daa5403374597318b8973f4a7725dd14d44425a75793c82baa4143aeb3b4aeb8423636edd2b3b82a9df367d4e42339e73baaf62d42c87e7d4a958fa4394609
-DIST streamjsonrpc.2.19.27.nupkg 1642404 BLAKE2B 56a6a4a44abc39a1aaab1206da469528ae746d31c695acf59a3a3a83f9731455a08f1a35a698ae2c61981f732570db19ac73fdc5bbf4bd1e818ad0a56eab6ec1 SHA512 8798c9be81006e710e79cf33ba0931da9fcbc017da3274278c75f0e88403b68052c2180769e5b978436bfa9d107e526d71c08c71a925393fb47360d811c4b926
 DIST streamjsonrpc.2.20.17.nupkg 1646148 BLAKE2B 3f34ecf5d969c28a2eab03dcc3070a1a5d2df21bc74ced53948456ee586c980c27d1930dbaf679c88db5f27efd6edc0e4fed165666d716f0cf0251b3827533bc SHA512 a0b47477b616e99cfe96d0f4fe244c507827743971b33ceface1578c2c7df872ae1cec53ee0f03eaa858381ef37f106d9f7acc2d89cf37e183e09a37d2a2a789
-DIST system.buffers.4.5.1.nupkg 93737 BLAKE2B e846885f9ace79f30bf7698a96ff3277a45fc2988a48cddba1862e23650ce55b06dcc6c1bcc29e08cf5380c9700dfcc15964f7263aeb11c737306d27963b34da SHA512 80da6158e55b9bcf7e0b5e6379b9cf45a632914f037b53c5bf5609576e3cd7821f7861956b73d74470d2d0c2e56dd235a5ef4ca6ffe7e192b820dc2d023aaff2
 DIST system.buffers.4.6.0.nupkg 67596 BLAKE2B 4f442603347f6ec2c99f724bd6024e8db224eff17e5b02a74640795aea0ee78a0cd171e07472c0c7c165d10d84c43042f01285f8fb700114dc00ebd82f4a6067 SHA512 8916c9c93497f5b255a5444b18b896f05824e557e6e62182cedc38206e08258731272f815d3084804585789b4ee9cfa43e752642ef3b28ae66d7cf3ea9b12b71
-DIST system.codedom.8.0.0.nupkg 510041 BLAKE2B b2a564366ec48d84e9622ba0a3d10d9f3c52bdfbdc2884509b2bcda06bdc8018f22b9422f61b59f495d4c09da70d194c7ce0ceac8a80c084a5a460bdd969d305 SHA512 b86322c231f30477fb09f67314b0e4a03fd0efb6b5e242a68b6870ab0da5d8cb2d8c5a9f05740f317f37dbfd8d471d2afd1864d400d4105c2b331761c75d7593
 DIST system.codedom.9.0.0.nupkg 405105 BLAKE2B ddc5797934233c75630de2f61f8d6448403f30f32e88afcab47f90bcaecb30258e0e6bd2755bdacd502c65f1e74f324c74b33e19a6df450a2c7f999774c4744a SHA512 fc470605c33789909d2b7a624274ce90f9f79be19d6f82ab766518a4b8f8e503da03b9529ef30c5a21e2aded2095fb0449b866fad034d74d578c8bc5edee099a
 DIST system.collections.4.3.0.nupkg 810001 BLAKE2B 0079d5834bb3857c002cc686313646895b47be1079e10cf365ce9e67c05f14c2e70e782b122b07a7cd9d5090b57334d0cb2336503cf5059cdbafeb3ef3cc8220 SHA512 ca7b952d30da1487ca4e43aa522817b5ee26e7e10537062810112fc67a7512766c39d402f394bb0426d1108bbcf9bbb64e9ce1f5af736ef215a51a35e55f051b
 DIST system.collections.concurrent.4.3.0.nupkg 502676 BLAKE2B 0d98ffad345254596133bad8a487bb91bd235f2a757573c3ab7999184fac6685b4ec33316bee9b4a4e588ba96aa745a681077cb2e2d2b0a7f5cc113aa75efc2c SHA512 35c1aa3e636216fe5dc2ebeb504293e69ad6355d26e22453af060af94d8279faa93bdcfe127aecb0b316c7e7d9185bcac72e994984efdb7f2d8515f1f55cf682
-DIST system.collections.immutable.8.0.0.nupkg 787241 BLAKE2B c46f56d995ac2cb0e4eb7b6bd2b62e80f522af8b7c1e59e4b52dbd9aa3113f3653913c9aa77c9d72655588807dbc6d17322833c768d8b8626ad231f49fba09f8 SHA512 057a9591c22b8629afbde9baab60a15a4b96e976188abbdbe85961beec1a32806a05da5caf89de84904a3fae53c38d14a9c50cea80e8383b1e70cd328d9e8053
 DIST system.collections.immutable.9.0.0.nupkg 651019 BLAKE2B d3e5fe18efe37507300325e48715773b48293710278ba53399b73887f74c985860a21d8cbc28afaee3add7746e72236beccf2c02548cf89f3fbcaab64a2093af SHA512 cff3a8ee7c56999d18e7bf2f8fc11456b1496770d7e8e32e50696079881e79464e1464fcf577da33c7c314cbc9cbafa6388a96eaec7935d3731279539d0189ec
 DIST system.commandline.2.0.0-beta4.22272.1.nupkg 616636 BLAKE2B 5252560598c4cd67348520cea086c37b4151b984a61238de1984838975340247b16050113422b1765931bdfc1dee38e226789b6427e56ab7c3a36bf07d0bcc20 SHA512 979a7e66ba29e17bc5bec42e926ed15362e23ae403e498c955e09dffc4d3baa14777a06f95e25d591fc9757a0eaa18deb9e4662a1ca1663fa300f509a4a0383c
 DIST system.componentmodel.annotations.5.0.0.nupkg 771145 BLAKE2B eaba2dca2356dbf4c1af4bd03d1b8bfcb55dc4f7e449e61e25dace119b35aa6308810fac7860b5d64d5e9569d27da693b3983a1427179e2d26b66a7df48d3904 SHA512 589aac4c669701ce7910f1a327294f15788d3ecff1d6df5d9255651e5201c5411c2312286fab111a6f549fb4de864c8414cfaf2a365deeb6f068c1ffce7c353c
-DIST system.composition.8.0.0.nupkg 47465 BLAKE2B 0995116ccbeb4c01ad0383f5e18443a36c9100a702408cded3d60c5837b662f04db3e7e732ffd3bdb84936353a22a3bc7cba57c9db36eb43968c94d0f9e70a38 SHA512 fc067f4beb17e9ac2249e4af3afefdf7b6a2c1b53a1c270e0490cb79c7584098c3a3ee27602ad6c16290408677f1567a04b875a4399c6053d9a1c908ba844863
 DIST system.composition.9.0.0.nupkg 46104 BLAKE2B 615db638dc015d3b816dd7d88dce0522721d04c40886ed7ec82df57bcd717be74cda73eee61e33809cbc4f66f2f20c9a9782c71a2da28c4d7d945846336c29a1 SHA512 6967322bdd27202847cb1abbae943cdc16efb7fb7d9755fac90b64bce0da67eac99581d4315a528e2d185c86535f956571644255115d78463bebb0423b3b9e6b
-DIST system.composition.attributedmodel.8.0.0.nupkg 116337 BLAKE2B bd6b10dad7dee4f7db32922fe3ea79a7795e08d3758414c743fb12c6df97528b167689c7e80a270d054f25b058110b5fed0d0f73eadc476a675347cec4419445 SHA512 826130a705f3f8238fb6e00048afa2721020f3ed2840068f395e7d83a7c3767b752966ebca6762c409f4e9b35b91d09419c0576fc457e64efd72a8341ea96fd6
 DIST system.composition.attributedmodel.9.0.0.nupkg 102149 BLAKE2B 63c2a339cc7eaf75e22e2d9a2f426dbbf15ad5ff61f6204aa2c734c11d9155bbd4802e593e996e0ce0306e9e9f53d02f4aa400aad81ffaafadd1532c443ea6f9 SHA512 a18b90ce522f3b7d46c52953a3a34253e4672bd7556f59b5e7804d13b5469bd3d4c8933e46b390b2cf1c35b323fa221655ca7a5519f2265049dcc7f3628d7800
-DIST system.composition.convention.8.0.0.nupkg 189393 BLAKE2B 75921181fb3515162d5e52846be9d21cc4f395ec4ca2d27daf79c735426896c0b5a9acea6daede8a8e665164c12d817442787692f838bb604df9e7f46d13aa4e SHA512 30feea31a75019470c384c8638de5d9b2f53f8e5ee6ef231d389051ef4d53df67ff7e9ecf1daa6153a31a05ec80f32554969ad3901c350fd9f2f5c7c17ab254c
 DIST system.composition.convention.9.0.0.nupkg 159143 BLAKE2B 889b9be2e23adf0ced423fec0ed137ac11592a8258fffde02697ee8e472d73527e3cb3717e30bbcd375b3da01837c26c5d315817983a5ec0658d9bc6a6d60a24 SHA512 dde7e1c67ffb85023d90dcba33a514c16acc242cdd059678864612dcc531a97c86750dac2c2593a17d672e79eb45869f71d45230e6369da30f36544010a0c018
-DIST system.composition.hosting.8.0.0.nupkg 203349 BLAKE2B 9db0c048bbda215d2c34b0d9d85303b0a0e43117f57f841510c59819b98ffdffb2703bd60496fe7afdbeba42172fffd791c842c6e33f32230ab967e79f04f07a SHA512 1caea658ddfc4cb5e8d2340ecd1eaca3c707d49f3fe8ccc27d2b104b5e5b59b14460a7a89ca44064ac930b613dda8fb007528292870da4ecb4d62c7ad499d68d
 DIST system.composition.hosting.9.0.0.nupkg 170564 BLAKE2B 58449cb40d2ae3e891aafb3c677d0449944d61108c01e766e00f594223be2352f2ee95b331ccdbf57bf6faaeb088ad639fbeea5897ed6d1c4429195459c2a155 SHA512 ccb3c66cc630eb2d86a0d0637283e7bd7b7bc1224cfea206d5f5360e8f240ce6c34d85871ba7c53a1ba5495897d08a768fea867ae0844aa12cc02446fb10efc0
-DIST system.composition.runtime.8.0.0.nupkg 135019 BLAKE2B 71faba970e77051648b4e0e8415f2f5caac167046c3e546ae41cdcb0945459dc84fd7b8690f68554dd231cdd74e01406974f9fa89c309f9961d56b3441a0ded1 SHA512 860180dca0c8c7d14ddd6624a4cbf2d2952a580ba5f414de866aaae3d76a3f1bb913e31b50aaa092c5395d13fc33d2e804f6456bc16a05b29e160099deb8dadb
 DIST system.composition.runtime.9.0.0.nupkg 116629 BLAKE2B 0b6532717423124a5d6fe01ee953337c8529c34bd50af2d4549d0e8374c129b2683d87a708589b8e54eba13a98956c2d7bbc8e94ac17c8b191959612fb0b6fd7 SHA512 3fbefb6813c8c262ef2f443c98f03b4628a899f8ea2d36e95ffc732a993b61324b72f3c3313bd121f345a209c4a5f25844b69d07299a04853cd6f5b73336589c
-DIST system.composition.typedparts.8.0.0.nupkg 212884 BLAKE2B 450fb729c58fd0584cbd8432ddabd954d5007b58170de7931d4f1b9760623a4d240a038bd7ffed4d6fec8387ef4f902d2710af1e348aed4ace1dd7416c62d688 SHA512 acabb419d678258396505edbaf55bb510148fd4833593534dc21d8ead9d32d95c232d87a612003189451418acbce9c21dbe36e35c048bafedaef1f09d71b1f77
 DIST system.composition.typedparts.9.0.0.nupkg 179565 BLAKE2B 1b1b0a56b2e04e100c74e9c98a63e97b7b242bd558cd3c346e3c65dd33a758f525d4cb0f6a3a388dd42ec57c17914a83becf6c0fc8937dc1c1b8ee2d219fb131 SHA512 edbee6927e07d35e3d8cd283d6d651506da09a4b333733ba600195fb112cc5d7c853ee522e1c56458269aa6d732b328d773a4a516f77a3210519c4eea0dbea1a
-DIST system.configuration.configurationmanager.8.0.0.nupkg 977652 BLAKE2B 375325623d3d6c8b4579f8613b33dd506f0485211bb98f4fed25f3851f520689ab22a45f3d0a15f6dd6f697ea5e3446839efc8c300469f5e154d251702bb25f9 SHA512 58b9fb5b134c1acf3ea5ba288c7a6277c08988d85caf68fb900d20988f1f814e4b174246286a8785248773c596d21efbb2f4124b6f4a3be86bfb129eb92d89f4
 DIST system.configuration.configurationmanager.9.0.0.nupkg 766370 BLAKE2B a2b81006d316ad8ba9b5e71e3274e7f07c65385d2f8e1002d07234bd8a64f88ee21bace5ff8924554a6033f453f4cd8ea9ee52368f5719b6b560b4b23f5af941 SHA512 44c01259771db3eb0a025fd6ea2b4533c86fabd6a16bc091a92bf69eb8dbf1351348c2e38e7f348752eba1bee49bebffd547e9514fcdafaede8008d98ec0a023
 DIST system.diagnostics.debug.4.3.0.nupkg 149774 BLAKE2B bdb6d5ee3b8ca4f28b241b098281b7d2957d0996f9345aa086a54b1a981822962e5cc319687849ee52445db47b439b6cd4e99a4c71595f6227f78160aa31724b SHA512 6c58fe1e3618e7f87684c1cea7efc7d3b19bd7df8d2535f9e27b62c52f441f11b67b21225d6bcd62f409e02c2a16231c4db19be33b8fab5b9b0a5c8660ddab24
-DIST system.diagnostics.diagnosticsource.8.0.1.nupkg 517990 BLAKE2B 380c30a5f17fcb1747acecf72477fa3e46feefbf9fa43ca73330262a6ef916d1850cdb63c2554bcb0b52e0bb11b3bd7853a1035202eb6b6454929747d7447741 SHA512 0437300281f6df9a9fb414058be81b953193c59ac35d8f3321ea1230bd3e323657bea4bff1747e68e71d271b5ee758c8e599c25ed246eb09e6537e1c1e3cb8e4
 DIST system.diagnostics.diagnosticsource.9.0.0.nupkg 454971 BLAKE2B d2474c25a87e86fa2b3c1e5c3405ac3d3278a48440970954ed310069615d7fdd1cb4ed3fa5e2e13218ddf3ae058f49e9cb0f84f29cac581a18d1d47bb472ebf1 SHA512 4d29e662e8dc19032cefb7017af7548623bfd5939af76fadb5441628ecfd73a223ebe2668d580c441586819f179714e5ca30819aaea89bcfd131a7adda9ed87a
-DIST system.diagnostics.eventlog.8.0.0.nupkg 535543 BLAKE2B 413083dc5795fcc436dabc463a936413445f9486c1ade6b48845af9532df5a95e9a8159e47706abcb0011289d6e8bde38c165817d99becb1010e1f07502667d4 SHA512 ba6e7f27323a92a50a768457e2ab48accaa5dfa0ba19082ca71da7b473b71cd3b6dd036e442e109fc15efbb4c267881a9844097ae4eddc3cb887152c8c9511a5
 DIST system.diagnostics.eventlog.9.0.0.nupkg 400651 BLAKE2B 4c629ec1d72c16090e4c114c09e27691a2b32affbdd667bb2578fb3c30a8cc7fd51af810c594d04d7bc2fa4252d01f5b2931d87b86b65b61eb0efec43b38d321 SHA512 a2ec8352d6453a09003d89985338a82233319a0748fc4de3d6c22e01b917bf871314e8ac7f916f42b6f08b4282f3819424c8e42265db699aa54c7f4ce5d273d9
 DIST system.diagnostics.tracing.4.3.0.nupkg 581864 BLAKE2B e09e616dff7879932b358746a62b530499aa61726c4490c56d2d7a0bf888db5b42d75d89cc5befc9fdb6af231beff998b6b243c2b2a08084da089709e0c82a75 SHA512 d0a5d30e261cd45b7dfab02b7ffbd76b64e0c9b892ed826ea61481c983c0208b05b69981cd79e91cd4e5811e1cd4c3cea06a1afce05811ece58be5e4c20169ea
-DIST system.formats.asn1.8.0.1.nupkg 328435 BLAKE2B 7e88affd2ce8dfa727ca4fb682d5bc72b9b36eeaf6ade8916142408abcf462eca777e6ea318a3c0952ea322c1c88ec3dc936c39ff56f7926f6eb6946b50fc4d8 SHA512 066308a53e92126161627b52c968c4575e2e4dd3e3d757323f36aa9f79ebfafe267114ada51439837b227a776f00369f80e19ebc07482820e6c28a89eb3910ee
 DIST system.formats.asn1.9.0.0.nupkg 297211 BLAKE2B 020b084bc2dc5dab4ce19c891ba1b4e0e57d46f3c44e354c7c82a0061337a3096df4bc632a4968d94a455d9a657881878873d1cfe723b58950d6978b0bfb8612 SHA512 9fba083162b1423a58df3d8bd8b4a9921bb633437af10ed090f8a757a9be5be22cd1e398552f3acc1793fd158cff8e5df8b093b58665afd16738d51f0837a757
 DIST system.formats.nrbf.9.0.0.nupkg 218708 BLAKE2B 7f3d3cd773eea6e23a39ea5796d101503b93f04f53b0f2e34d56b7b1fc58de2a111a96c1f3be1bec6445f58c89ee9b65322eb8389b4e9d9e96fed2aa20bbbf43 SHA512 c78935d32d6dd37d4a7ef5ebc2d21c967be90b93c6d2ea4217a54baf0152e852c80335d805337aeacc0f521c2be9cecc55d4708608b98f64b2e0fa62fd37651e
 DIST system.globalization.4.3.0.nupkg 589136 BLAKE2B 7b07f9b68f0744ddcfa3f0db6190c1a0696c2f89f8c5e92922ac20fc4155e22d97e7191bf7866c9b58acec056bff08531b0adacccaec7d4301e1d4b149fa511f SHA512 823d2ba308cb073b40a3146ecccd0d9fd7b1615ac3fbefb16f73d873e411fd81c3bdc87df206d3dc7e2f14c9cd53aafca684a3570c25471280aada8de805ece2
@@ -245,69 +162,50 @@ DIST system.globalization.extensions.4.3.0.nupkg 142949 BLAKE2B 4eb77d4ce5af0113
 DIST system.io.4.3.0.nupkg 703652 BLAKE2B b5b2627ace4cc49f35a0caf5c064c4c8262ff0fe3df79bb1bd3529b3e306c8b1e77ea9e5948de343ee786a50e12be822ca89b5ea3f16347b9c0bce6bd8071127 SHA512 bfca5a21e3e1986b9765b13dc6fbcd6f8b89e4c1383855d1d7ef256bf1bf2f51889769db5365859dd7606fbf6454add4daeb3bab56994ffb98fd1d03fe8bc1e6
 DIST system.io.filesystem.4.3.0.nupkg 274316 BLAKE2B 4ba513b503cfcad068c23a82423f9900c648fa2bc4fc16555bec717b6c5cfeac6c7708b28009c7a089f80c77ff744f573d72e4dcbeaa14acafb9fd3e8b5100d5 SHA512 4fb581d6f85b9529a091a0e974633752aa39e50b2be6c8a9e5eca8c2bc225cea07064ccec7778f77df9987deebf4dccec050b1a97edac0ee9107142e6a8ee7ee
 DIST system.io.filesystem.primitives.4.3.0.nupkg 94996 BLAKE2B 95fa6178164a7cc6a29c5a3fc55e415419c433b3b74abbcfa4fa5ae1bef40141b9515076b6869e8ed771b0ba6800bdb2fe6fa5d1f773ce52c40753efc0a82be9 SHA512 5885953d09582cffd973d23a21a929064d72f2bc9518af3732d671fffcc628a8b686f1d058a001ee6a114023b3e48b3fc0d0e4b22629a1c7f715e03795ee9ee5
-DIST system.io.pipelines.8.0.0.nupkg 267394 BLAKE2B 612570554ee41ae37c8987df6ec797583c95b38160aa70b1c2fba9af23f4bd85ac0ba5b7036abfc1ee3cecdbfbdaa83b861e9c017e5fdf3e726478b24e83d957 SHA512 57eb6a11e84f40a48b57b1dc5786a01aa9852122b7d15363490d8a12c9a458bf99a8ddf4c0c0247be98559c2b42e769a10bda2c5a9817735484d960dc652eb12
 DIST system.io.pipelines.9.0.0.nupkg 223524 BLAKE2B a629daf4ca511a691d3ea82bfb51cb8b64f6dfcd8b7c824d141eff0f293f3d72162888c3190243432336332b4e89b609d359833f082454a7d04add24b628a877 SHA512 5c8795291f34c2e0e5d390c8e07b9fc9eed34f80f509ad419b8cc93dcee6827a1dac2cb439f710d42d3403bb1ee7a74cbe0e3c708eb84cc0fe60a71997ea8e68
 DIST system.linq.4.3.0.nupkg 512550 BLAKE2B cc6cbb532575bfcfde7ac897970dcd49067186547108f46449f9f819e7910ad32496df3663d4db8eff48224b8ee95b27f7bb442bb477ad47f44da2f6fa893078 SHA512 eacc7fe1ec526f405f5ba0e671f616d0e5be9c1828d543a9e2f8c65df4099d6b2ea4a9fa2cdae4f34b170dc37142f60e267e137ca39f350281ed70d2dc620458
-DIST system.management.8.0.0.nupkg 791455 BLAKE2B 6490ed07f522d23340857ecf6eecf46ee60158bc443ee66e20585c3d22f20aff95dda0ed43fbb916e2691591fa1fc4314cb4306ba1af2196f951f3664ffb1ed0 SHA512 a0491f0b442496e4274e6c18da87c8e31f471f4af908b45fd000fb9b58e1760c49b4232b0df9f0ce9e569fea2de968f0b2cc54cf7c53d6e67b46156fb100e9df
 DIST system.management.9.0.0.nupkg 565537 BLAKE2B f4cd6eef3c54e746a378a477a832bd6baf0a1bbac881df0115d259f4cc9d481b444927d54d73b4b95082d9d6ca48af064191db9938138148c8256d63e7a1c497 SHA512 71fb65f87fef7d8cb1a51fc05eba6feeb3101dafd35304a00a280f7927e16d801f01dc683f54a11cb929be3e78b8db7f3e16eed4e9a9ec47567752f9bcfd6fbf
-DIST system.memory.4.5.5.nupkg 208978 BLAKE2B 487049b1ffd622868d4aa84cc14f13127641c56937826c11d83851b7032ea248ccf8555f48aca93acc4891ac99ce2178ede50bf13ccbd70ba6004226fb583275 SHA512 e8c8e536c97b94ac3443c940b30dad43cf6e97dc7a8c3d989371048fe74e168606384f5e0143bdc0d86f7783bf9fdee8417964cb3a8a5d752713e90b125172dc
 DIST system.memory.4.6.0.nupkg 192800 BLAKE2B 33cf410dbd0ca42711f3e2aa50ee71b5b2f5f7c6f2344dcd18e17e5d4ed0a26b70cc318ed40b34741ff33a88b79ffa54efb34cba237d01da9d385ccc2819ccbc SHA512 4d8ecda55e15bf4bf06a767a27cbeb2c67f26db3ca840bcbde84f1ec49ddb19fc9ffbd6c9b4d493c21c89adbd8b70875be615ab7f18f4bf89df61b6a20f2beea
 DIST system.net.http.4.3.4.nupkg 620644 BLAKE2B b3d038bfcc0232f449e9dba14ad885cd29a5df759520d0c6ca12333d8fcf052e2a3b25347df376604442e3bf10b5a2072b6c0dd66ae41bc7c9bf4e17908a8bf5 SHA512 163edeef734d1f0a1ff7b8053d326eabc82fe86f3de72c6466dd780d59d974487882f2a5f16ae4b02c0d8c8a7f25e617ff2bbfab133f88ebfd6a2f99637169ed
 DIST system.net.primitives.4.3.1.nupkg 778577 BLAKE2B 87c46ee382d0af38da5e3de609698308c7350b7e2efe67454d90c2f113c631be3dcc7c23801e3ea0428607379f57a9581ffa69547a8657cf08c2d9e56cd55fe0 SHA512 060765c98088eebadd877ea9de5313a9b92f69a7cf113a41d5b93d890945750c5813af769225ef9ac797b3c8212fe804810176c600dcf061f840b91281452cf9
-DIST system.numerics.vectors.4.5.0.nupkg 382792 BLAKE2B a97284a76a6729052d3a127e1875e2012ae5b90a40533783dc799b543d44cc084035374799e9e1b894083cb61f2639711f18b76ff31145140519a9674dd9d2aa SHA512 9c04ec0530f608aaf801837a791b33857e2ca6d2265a6049c01fd4e972825967e709cad3070f174829b7400f608e9a641d3afc3a45d4636d4c47dd43dd0657b3
 DIST system.numerics.vectors.4.6.0.nupkg 136752 BLAKE2B e59029c092d623cfc8cbc8a5d64c8d4ebbfe9aadb736c6188442a3e3f3ff08d0458987ad6ef126b8d481323c5f7c07dd88a2932a7b040eb4e11de41d261e8770 SHA512 7716566e79dbdb5fb942e280894127b498ab8792a25359ea94b5ad06ee2ff7f171d519ec80d9fc4f85db99086f0aafd3f78db4d4fe84b061b6cf663975e775c8
 DIST system.reactive.5.0.0.nupkg 3929643 BLAKE2B a0804fbdbaa1db017fb93e3b283403c9f22dde1fd94f1ef680ccb35b2b355c41ce1344850055318fc342be022b019ce2bf1e3bd1ccd82f1c513df755c0aad9e9 SHA512 23156e017b081b88aba7d9462438e09024003c61874e9798d389841a0f215cab63bdc69ab25d0ad3f1bf75d65d76771810f9d0184c338fd96c0b5c1e21df9590
 DIST system.reflection.4.3.0.nupkg 700821 BLAKE2B a6aaf054f27be81f1a8251241deaddd6d35aa9ff1cd1b35a65c75201c3305ca0481d8f7a6de52a85736b0477332c404573db300f324e6301365f14fd59784225 SHA512 2325b67ed60dce0302807064f25422cbe1b7fb275b539b44fba3c4a8ce4926f21d78529a5c34b31c03d80d110f7bace9af9589d457266beac014220057af8333
 DIST system.reflection.emit.4.7.0.nupkg 406832 BLAKE2B 7c523b9105ba23b7ae5cebe4661641a79000981b7530f05664d1e0b87195d3eb6c119d2850b2e416de97ccb1a678dc151e5df7e7665f293a7389422efead6f94 SHA512 10c0325b993a31d993c58adeee5f1c6fd7ff66173bf22bf0d295d29bfb30f0e01ec3042aceac5e245bb62d8fbfed63ce02adf74e04cf55811e0cf3d541b897a9
 DIST system.reflection.emit.ilgeneration.4.7.0.nupkg 204011 BLAKE2B 07db40691e6669baa6f54778623b6881c1cd248dda3dcd589a9af0ec297c810f2c978eb633c5a682d559bf02dd1d5d418d621bb461611d22e23d25ee9a5ac223 SHA512 890d97c3ca82f180ac877f8e50032d0f883c2e2039afd671561943667dc3a24ec2dfcd896cb94f372c975c25b72918afd046efc2dedbd5962a988a027abac8d9
 DIST system.reflection.emit.lightweight.4.7.0.nupkg 155693 BLAKE2B 86a72eb6666223b2753d6193f0c5a46d227ab6e305d917492b4153f886dd27742d5127dcb7723bbef9384260813e63b8c17264fe4301aaa25d66e924322331e0 SHA512 065af503d56a93e654927964eac16b84e729baac786e9ee4ab065f8709269a1cfef5d80e97c719f429d25db6a56cbf6b7c79a2e470c5c9dc50b1fa339763ef8d
-DIST system.reflection.metadata.8.0.0.nupkg 1307788 BLAKE2B 45e8712d7cb14ce712722aa4871c6ee6a346ff05f7269f96858a47fb53e4e977473d47f20097f349f3ad1aae517f372006a172654df433aa7d309a4ddec172c5 SHA512 fbab0c76426379ed01ea79b702504197b710688d283e788bbef92b90586610dddfa3f84638d685770a4068ef8645395b65ee24459cc5c14ee4497416d11c89c6
 DIST system.reflection.metadata.9.0.0.nupkg 1114539 BLAKE2B 5891cdf578f2c0f976fec7fc22619036e721953150e24aa5038023685f1f1a902622f043308d6b44f44ed6f5f9b40a25705ab653cce1f0b3456c041d8ecefc1c SHA512 8f3f98da6fc2a5d3ef76308d46282258960a16eb1d91f265c43c785797165f64ee6c031acf9099a4e0c10ff3f6fb6d12a56be6646e89dd462397e476620ef217
-DIST system.reflection.metadataloadcontext.8.0.0.nupkg 610364 BLAKE2B ea9a83f50c6187141d856082d9b62364171c82df52dcac58c6dfc96456ab108cbf985b923f6ede3f6d8ad4d4b78652e6dc71ca15e94a1d94e9b86b38653683e9 SHA512 bdf47905f5175f2dda9a9e5a0e8393c0eb7d049f02b6995a02710a1db7936e6316d5224cad276f89355544da83074781f68d63ff6e960f5540f091857ebf2df9
 DIST system.reflection.metadataloadcontext.9.0.0.nupkg 502774 BLAKE2B cadf7b01e4e28c06add47602c42255fbc4e6e239372fa2842682537139f5aaee2c58c7378a6c8b8c2c09397f94cda3f1cdbe6b41de049e1e80d6daf684ade072 SHA512 a2bd43027d9d9764a3c4f038b6e0c6f51c53c5e111747214ee05098cd7fc5a14fa0f4f19b076e6499a4fdab2a98063971cc8665dfdc24c33667dae1c483d83b4
 DIST system.reflection.primitives.4.3.0.nupkg 281679 BLAKE2B 36dc0fb5e7a6927ab2f54bc9ccb2e032cce0284c3aa9b83cf2ded8bab5fc7918553b06b16bef69161a7d9a0548b3e9159ab582533578cd28a661225559bd2b1d SHA512 d4b9cc905f5a5cab900206338e889068bf66c18ee863a29d68eff3cde2ccca734112a2a851f2e2e5388a21ec28005fa19317c64d9b23923b05d6344be2e49eaa
 DIST system.reflection.typeextensions.4.7.0.nupkg 249287 BLAKE2B e51f85e7cd77a42adbc362dbbdfbc6abc6cb85ccfc77d2acdd169c40c04854e6d2f113e5964de9267f8d6a0b7e5d5c7a71d2873d146198193740d70d7a4272eb SHA512 43f7dccc73b7e7b7ea4e7b503d9052c21b2d1c271916f82a3b006790efa584cc92da96010ed5f27d141b94add261737c1971ce109ce334ce53af5db3a7bddce8
-DIST system.resources.extensions.8.0.0.nupkg 220921 BLAKE2B 38a37efba1124e20633784acadfe96d9c68b27d7ef30bfe9b0f7f619bbf983f1df4d125a0dcff9ad54dbd63b8dae9de1542b2b1c836ffafa9718278fbaaf6d02 SHA512 a02ad3031183b161e37d2e6a25d73437b0fa42ac04cb198ae3277797f33be69600bea8921f70b1c93d398857dc3ae862dbe46bb09aab712989c1099996f11651
 DIST system.resources.extensions.9.0.0.nupkg 237188 BLAKE2B c7e898edc1af56df920b3f666847f088ce17db1ca4e97e0cf7676b5397db16c7be1a75ff324de1128ad18d9e2c03c9c9329c44e169214011c54b8e8189fbef74 SHA512 d2c31fad6ddc489606a3396d79b127c31a125b05e3be938a149a64cd850c98c5d71e04f5576774d42118b0a3731d3d5f099944e9f74a35cb9cae081d8186aabe
 DIST system.resources.resourcemanager.4.3.0.nupkg 85908 BLAKE2B 002ba25bb953e5a9162214338b50abcecfd8183c68c7b5de8bbc1780e57322b6aa225e13436ffda54b4013fb77540df7428d8c3c89c1a21622ab124d8ca174cd SHA512 9067db28f1c48d08fc52ad40a608f88c14ad9112646741ddaf426fdfe68bed61ab01954b179461e61d187371600c1e6e5c36c788993f5a105a64f5702a6b81d4
 DIST system.runtime.4.3.1.nupkg 7272877 BLAKE2B 79c5ea342983b39bf810e499755724089453ac86ae2485757ba1a2a2e96e864ebb5e2ee8c39999263ff7149ba93ff7a212d892c35cc2623f971916be007cf7ff SHA512 025ebd98f0dfcdd0fe6ca18ad8701f07e94d14e1c5aa792accd9d42669af51ed7fa843caf4cec48934f8ceec9c2833f2edebf5d71cfc5d580958a3f4866ecd20
-DIST system.runtime.compilerservices.unsafe.6.0.0.nupkg 84343 BLAKE2B aea2f833d6da80dbc275c47bfb207d77a1f2dd203a29352ff5a6e96d8b52752ee3c5bde38117c5ecc5dfbad66d8b47b2001efa1e2d564e14cbbf58d0d1fe208e SHA512 d4057301be4ec4936f24b9ce003b5ec4d99681ab6d9b65d5393dd38d04cdec37784aaa12c1a8b50ac3767ed878dae425749490773fec01e734f93cf1045822b3
 DIST system.runtime.compilerservices.unsafe.6.1.0.nupkg 62013 BLAKE2B 338e41314bb5ca92ff51de48fd052613685877af5e829c2588fbb926d8f509344910d24e4311ad3247c9752899f850f022d7a2674aa2e91ba0fad282dd652044 SHA512 898d2ea5f7507a26827e8c53fa6e172726f4209364e01f532d015a9ce08ead4f57e71d71d938cac743856cb9a0d551b674ec8be671cc9f5f7c48143dd58cb591
 DIST system.runtime.extensions.4.3.1.nupkg 1069513 BLAKE2B 47ad5789e8c7b92bce76704a270d12f82fad46af390e54416e62b3b3143a4dcf0e2730f5b8fdc70b152d6d91d28a3b810fc278417df61d40594a425eef4b2e5a SHA512 5526c1370dd4431b879386802cfb18a35e7897e4ca511e088fe363f463e7c8993302631ec18d40c875ee684f8a089e89063d92a0ee2ec0ba98e0e44a5bd2514f
 DIST system.runtime.handles.4.3.0.nupkg 54854 BLAKE2B e68360382f2c625e3b1526dddb1d49c6bddc9b78d38041801f0df876f1b06d429c608ff3b28a0c1415495eb38fcd70aafa9fe8dc0bb323790e8a85718a9f93f9 SHA512 0a5baf1dd554bf9e01bcb4ce082cb26ee82b783364feb47cba730faeecd70edc528efad0394dcce11f37d7f9507f8608f15629ebaf051906bfd3513e46af0f11
 DIST system.runtime.interopservices.4.3.0.nupkg 2597020 BLAKE2B 4753b772f9d3596eae34b10497af40bc6e7cd63e9319e5789378cd148b009ae9fd5bde5e5757954ef06826bd4f4b79a3f8d8ea07766238407f26f3e222cdb2cf SHA512 650799c3e654efbb9ad67157c9c60ce46f288a81597be37ce2a0bf5d4835044065ef3f65b997328cbbbbfb81f4c89b8d7e7d61380880019deee6eb3f963f70d9
 DIST system.runtime.numerics.4.3.0.nupkg 283763 BLAKE2B b9e2ffc7e974fb4824ed174be43e664d0fcbe1e996640b8f66a17503c8af24d106e883092fd61b2990c32472423bcad943e07b7e25d126563a219e1b617446ee SHA512 3e347faa8e7ec484d481e53b1c219fe1ce346ae8278a214b4508cf0e233c1627bd9c6c6c7c654e8c1f4143271838ddd9593f63a1043577ad87c40e392af7fd34
-DIST system.security.accesscontrol.5.0.0.nupkg 621573 BLAKE2B 617baef046a8bdb637db288425206cb95e6be55c53c3829690253fd76987b0fdebb1cd79db556c437ff5d9a0f4940e7d747e3e7b611e941f5f54248b6adfa32e SHA512 ae6b03ad029d3eb6818a6c8bb56cf4904013fa535a67b8e621b783a029dd88aa2e471e002cbc7d720381ad8bc8c6b93111a08f6ce2d271af6d974bf4d02b6c81
 DIST system.security.accesscontrol.6.0.1.nupkg 235270 BLAKE2B 8a328939b21aa92654796bf83e83753ce26f1938bbe9c9c0dcd19028647d8c5dfd3a837a941379f23f4ac6962e100d787083072d5e9ecff2e779f51b8d123c68 SHA512 e1beba70b45f8cc5ae06fdecf365f0bb5b58b9af6d7c79accfef15b5a7c7bbef65e10cf9f299418eb413aac86ffefaa0eab9d91650ce77cc398d390f0597ed42
 DIST system.security.cryptography.algorithms.4.3.1.nupkg 403068 BLAKE2B 7a432ab9765c767dc3ccd6d4c84f30efa5d76420f3244e1c6915183d2ef0f4629a55f1f0d9f007bae454bac637b6a705caadde1725db1c567ae532c5629daa5c SHA512 34b02b60b69a54e1310b511512e3210a49bfb0584c50f80b59c586d7180ad973e3b5419f7a55783837884395460db3e0db13c8fb27de6d170b8d2dab1c90adcf
 DIST system.security.cryptography.cng.5.0.0.nupkg 957764 BLAKE2B 01f2072c00590027149390ee18b855d742c05cd66f0bbd2433ed52236954f6a3baae64291795303139cdc1ee1185116cfaac4ce20bfcb8f8712625e07e2e2632 SHA512 b6bbe402495487333eff3f5b3e71a60cbce66ef0f49752250ba829151a738c62f295382d4cfaa6f14bfbb670c14ee05039b8c4641c4d4b46c28488bacd0095f7
 DIST system.security.cryptography.csp.4.3.0.nupkg 117553 BLAKE2B 93f32c719f999c566ac7ebc486854778051ca885632a3ecf5b50af05a700df092a0e13ce08f16c854aee3ef06bc27fc61e6b03f79f3170eeb2bcce7e22d9728f SHA512 43317591747a18f52f683187e09adfe0e03573e6dac430bf3ba13f440cdb1c7bb1f9205369d5f3b2a0f3fdf9604d5ba1e6d94a899a25d2c533e453338578f351
 DIST system.security.cryptography.encoding.4.3.0.nupkg 144382 BLAKE2B 9f8e6a4ce5fe2a4de2be0c827e914a02a257011b508e97e289b9de4657b598fdbba4e64dcf23a29af6e4910af41e62f3b3f0d6a2156ab691e2e00ad76c6499ef SHA512 5c26add23e63542f37506f5fa1f72e8980f03743d529cd8e583d1054b8d8a579fb773fa035a00d9073db84db6be4f47cac340d1ebc6d23dd761dbdbd600075e0
-DIST system.security.cryptography.pkcs.8.0.0.nupkg 1076987 BLAKE2B 0ec7a2080779ddfbb44bf13fdee79b3999c0a502439808ed35680f795c64c5238e2e56f611aa3720a83c493980798846efdf15afc3c7151a939546763291a683 SHA512 cd693d830f8a49762705fae6fa7505eeed7b81ec6b36624ec23d1670bc3b931241f5501a6cf4ec8fd3f03e877c408912a74ab833fe034c72a131b73ba29d8695
 DIST system.security.cryptography.pkcs.9.0.0.nupkg 820996 BLAKE2B cd6a9809a9c57504d468edb0a5587ebdd2d02eaef5aa39cbc43f97b4b23a0743ea6cd83d23125446ef4a8d3b5d6d17f27e92ef0213eaab7aa6b23809715f3226 SHA512 cc8abec70442f575c99d404c9dfdeb6676864082496a0a460e1b4ef6f15b162e82977275e8b8a3220be38565f306f1f8c80a91c8b00f52a040fa39083dc47bfd
 DIST system.security.cryptography.primitives.4.3.0.nupkg 81382 BLAKE2B 55bcbe3143e85d24f47c72ec5e1f0ad38a1f931932b3a8a03dc00028668fc085d070dfcded55654e09328a745b208b9f15928aaff1087d8906bad41d7cfb23e0 SHA512 5ad8273f998ebb9cca2f7bd03143d3f6d57b5d560657b26d6f4e78d038010fb30c379a23a27c08730f15c9b66f4ba565a06984ec246dfc79acf1a741b0dd4347
-DIST system.security.cryptography.protecteddata.8.0.0.nupkg 148572 BLAKE2B a27acdaa82dd87d5f0ff41f1f662f8720f1af597fcd8e8618fe72225981b5fdcdafb325177cbca966746ee8eb2cb956ad52cb04300f5870cd359b0b624001bf2 SHA512 86f71767f211f8a5f163d942f52da2cf0e7f7c6628383251dabf64412bece6ffc75009c146e61864f26b1f3693d02783449cc89bc04725bd59af01d0e7d8f7b9
 DIST system.security.cryptography.protecteddata.9.0.0.nupkg 127120 BLAKE2B 12639eeb6ac5893ed593fa08b3e41872b79a46b8c3384307294c89b67213afac9c88ce32be68f08389ebcf5b8ef91868d5feb3b6e050bf8930c7052f321dbb8b SHA512 31b739b355c12e37b437589da882d052a5a71bc4558fda7bb8ad75d32c595d3cd9ab708dee3682144c922b9da403e74f62d072cdc46d03f1549cae28fec8a74b
 DIST system.security.cryptography.x509certificates.4.3.2.nupkg 362871 BLAKE2B 06217ec336ddd020cc833acd3fd08dedd03e1339141c0d36ee2bc957da1c62c95ff154ed438cc0865ea1bd3a8f88a6c9198aae50cbd20314a7a89f2068b1293f SHA512 031f1236cc3d3427b9a41132b158eb3e21a099cc3d4e850c43234eb1b28bd010063b7550f868acd9e95e27b295989e63da015d821e36c9cf54da16e85ddcbedc
-DIST system.security.cryptography.xml.8.0.1.nupkg 465318 BLAKE2B f1dfc4c3a6e54d8e6d72ffe52b46a139976226700cad4dfae88b3fb8e53982b5dbd650b59192f620675e7a66ec7947045476c2e98f487c7aac3cdf8afe8977ec SHA512 7fe9ff91bb48e42810ad5e7512357460a20f08689a090942953fe2bd83347865f3eb530b293da23eabfc0926de7b6b1f2c358451c4f344ce45aefb2562269d0c
 DIST system.security.cryptography.xml.9.0.0.nupkg 370076 BLAKE2B 6a65e549e6a870809f76242d6bf67dd5bec57ef9f6eafc23e0bb1d5daa700b56a8acc50bc32613638afecec69b000a272fbedb57625d5d7e3652edf3fd317a28 SHA512 9b056654247467edd6431fc8c3d3e12b237f8a778d264c7bca934cee3f0440a001672571a1b752fcc7e2dd6c200b2d067d9a632cca2e96c5b74831da186f5730
 DIST system.security.principal.windows.5.0.0.nupkg 535022 BLAKE2B 4b20ab3cc0b4bc820df360df57b2eb0e2059de677c432af31e73acdf600a417685900aed2cee8e33ba9020d02ae688096cd9c3a77da441ed33cf968c90124bd5 SHA512 44a920aaaf22b2172d41319bb57ab2b8e1a4531d5f02192a6f53a81d875125195b60ba0b5a44a45981d137fd7b0f3a65b12959b5fd97afc0578cd84ef27467cd
 DIST system.text.encoding.4.3.0.nupkg 327281 BLAKE2B e153609b257919932499a013337b8b2a4087ebff7e8ffe6854ad1c70fbd058aaabc4e974313dfb3cf1a9355b0ced87bd97cd39f6a4962b8a4a87003d3a66c53c SHA512 6ff7feec7313a7121f795ec7d376e4b8728c17294219fafdfd4ea078f9df1455b4685f0b3962c3810098e95d68594a8392c0b799d36ec8284cd6fcbd4cfe2c67
-DIST system.text.encoding.codepages.8.0.0.nupkg 4260927 BLAKE2B a31aecd7246d821bec0b0f793c7076210132c2f9433265ec2059b8059d574a89e6167dc1154c645559ab0115e4abc43305518e0d62868640d8651009c84fec24 SHA512 77dadf6b1a73eeefb50507a6d76f5e3a20e0ae7d3f550c349265ae4e0d55f0ae4f0ef1b41be08dd810798a8e01dbba74e2caac746b5158b8e23d722523d473ed
 DIST system.text.encoding.codepages.9.0.0.nupkg 3219386 BLAKE2B 4714b4054cd3b4077f3ef826e2a4d19451aaa1523177866c8ba3be921fee1f4d42fad96e54ffa3c354df12b9e7261f515c584caf20eab92148ef21fecff5ebf2 SHA512 acc01c1367294bc46f3d1e622ba5a461d64a24bb14c39051a86dddfcb474765f31d7b7b33a3e37016461a782d12058327568ce3a7fd9e30fff97cc1ca309e0bd
-DIST system.text.encodings.web.8.0.0.nupkg 374440 BLAKE2B 97211e710df3dcd17932f168e254806d7c8692ac01d667a2e89a5ddc956b24fba8467fbc2d451057757b5c502442d2c91bcaf0f867da7e95456b2aa18136b354 SHA512 ba0822c38c3b658aba9495642d269e882b827e3be4ad2dc1426d8a97d3cbc5a2277c5f80847d0cb9381078af01523328c4992caa058146d5d8ee6b8a08609c32
 DIST system.text.encodings.web.9.0.0.nupkg 293374 BLAKE2B b908dcf507fb560b7fbbd47c20d7f0bbaeb66da76ea83c37c9abec224ccfee45ff5e70e2f6dc18d463369039b259de8dc202ceda20246971e1b78976eb1d6883 SHA512 560331b9b46a9c25be6ff5b2bda0d77156a696d671283e7b1e7740612ad1c63bbf6b7f910a3334ff2eae672cc9241c0f5c64156376d057d03ed1952262246497
-DIST system.text.json.8.0.3.nupkg 1980649 BLAKE2B 33ae24de89869995df21d89f156222d55cf7b369644d54dddbb62bca75674c6ace6dd1af97e7e39722d9c1e4c2800bd71a91f14b42c6b64a300a260ce2e2ec1f SHA512 b5f39d6e82b35046ea48fae5db39695e3bf65a7ad02bf68bfe44487a8f69b6400d1862cbe48a1967ec83601a85f1aff1e6d1f2f65cbabf9139f24fcbd8e0a0a8
-DIST system.text.json.8.0.4.nupkg 1981785 BLAKE2B 32eaece9756c948453589d13f596d2481e8d7150f1c970f2cbc04aa9ab8ab399795e6ead5c16b47198113f10f43ef4407e613286fd55538de3f172885dd6be93 SHA512 9f87ee2a39ba4f602a2b3ec7584b8aa2c03a7f6db1e303f48224dbc139ddbf3cb10190be04efe1d1592b0bf5b2fd97f6d8f88fd492a45f778b84fd3e613acb00
 DIST system.text.json.9.0.0.nupkg 1876744 BLAKE2B ed875167053b9d62b79e8f91c638e16a57a908dba108dcf990816460112b8bd6b829506ec17dbf6fce27cb97d8e2250132573f92d672537ab2bafc1ecfbd2f3d SHA512 e8b783221e66105d12cb0049a07abb4ede34e4829bedd3a7d7b09eefea2ee4ab7284450770c569ac5cc185aeff36b47518fe57d376cd5c32b68dca7c3d031345
 DIST system.text.regularexpressions.4.3.1.nupkg 539599 BLAKE2B 0c912f303e62cae8e955ef3bbcc14d5f138888b7931fabcc046616e012ae2284fbb99edcd2f1283bdcee3dc252fa85430c244d17576f1801d5d09f5b0bec194c SHA512 e7f74d9a0c111aa789d559a57c2a24ad44bb1988969c095280e7a2f6bf5dd10d873d283e32266d245523e10ca6e980a213129c09b39c03e624a625f32616acb1
 DIST system.threading.4.3.0.nupkg 708088 BLAKE2B 004d01762fad35a4607522d974a0cdc3d0049c82fe704f2f86fb98ee81059ebb56d13c290fcd273d1067a1a7c7f17bf3259d4d7e802c1d09a95e3c5fa29ef3f3 SHA512 97a2751bdce69faaf9c54f834a9fd5c60c7a786faa52f420769828dbc9b5804c1f3721ba1ea945ea1d844835d909810f9e782c9a44d0faaecccb230c4cd95a88
-DIST system.threading.channels.8.0.0.nupkg 245743 BLAKE2B 1c7af0153bc68398a9e8c4daf142e41904c952e18c575d851d12217e11d1e308ceab8e15eb29db3533556b0e14545ce2996838ab830a3528be6a3d35ce0ffae3 SHA512 335b37eb97f594e73ab36e7ce7f0135be291445167688e89bd249d135e27f592a0bd69d91e8246a1c72a578d57bed443ac7302311365c16160b7dc974eedf141
 DIST system.threading.channels.9.0.0.nupkg 222863 BLAKE2B 366198a8c000a2d73140035235b35bdb99f4186d456cfd28e4d50a0c2c321418faee03e9490b3246396f66d99ed3e9ac7e85a8fa0c025cb9de3adff1f72a2e10 SHA512 eaaf920bfa8be5e797f6ddf35239adb1c712b55bac52f61774915819fde284cffc4e2a2757e899c62de6c433cf1573a27a945eed682b20eba86828b8f9bc19d2
 DIST system.threading.tasks.4.3.0.nupkg 840017 BLAKE2B 1cf4a8cc833da0a38304757db3808df5c217518c817d5807bf6f35393725a31223129fd1c4c964a36a60c65b686d24fc25d1777fa12ee622bddbb0f7c1772bec SHA512 7d488ff82cb20a3b3cef6380f2dae5ea9f7baa66bf75ad711aade1e3301b25993ccf2694e33c847ea5b9bdb90ff34c46fcd8a6ba7d6f95605ba0c124ed7c5d13
-DIST system.threading.tasks.dataflow.8.0.1.nupkg 624009 BLAKE2B 7cd898761633b4c920d270323c4e1c5d543e5194dd49f3ed43eff39e322e96f56e51f01d0c3968f5cb4aa609b287b8af904a98d41a17e7e8b96330f735bcc3f4 SHA512 24622fd7d5e33cb55309d0dd35616aa3d6e7aa0c66e1e597c0ca6106cb26cc4248349815139c8f00a51e062506f5fa5f6cffeaa6fe8cb030c64b1d6952224ab1
 DIST system.threading.tasks.dataflow.9.0.0.nupkg 524421 BLAKE2B bdd79e2b081492d90e9cbc6eba00a9f0731e02c3f4e4c55fd61274f5de97f5d762fde100173fdfeb8b98c610def277a6b5c6d9ed69b12ab971e98daacd29820b SHA512 d1301c0048e071a87edb5ff7c5d055bf9902fc8dba58c219d1f1a05682b6678458641930adb669abac9eb088ad2533ea7bc98ee7b3ac2ffd12cf11b9d138eb00
-DIST system.threading.tasks.extensions.4.5.4.nupkg 89582 BLAKE2B 728fc5794745b706a7e3a7d05186f34e2a8c1837cafdc7fc9a1bd8fc6fd42025448cbdfa53415a05d872aa08db1deb31d104054630c9ac7ecd29a2ddd973fd5c SHA512 68052086e77d3c7198737a3da163d67740b7c44f93250c39659b3bf21b6547a9abf64cbf40481f5c78f24361af3aaf47d52d188b371554a0928a7f7665c1fc14
 DIST system.threading.tasks.extensions.4.6.0.nupkg 74469 BLAKE2B 3b8cb2461066dcb98fcd28df8a2cc84df280b4f4747bf0f5b3146c5988bb70b23527a45efd40638e58fff856b25d0638f9b8332c207eb2d08091a16ddd654857 SHA512 a61f1e3f680a840ea63618ffb5e6309fdc42ac731cefe9c132548c297ec15177199f7dd154b7b8e53580064720c92e93256631d6fd56c2dca51e617716f834a9
 DIST telplin.0.9.6.nupkg 10998854 BLAKE2B 0c263b0e2cfb397b02bc2d29d2ded13a536e5e97313f15dafd9cbf6f666bd007d056f0e4ffaead499b871b1c89c4e9a31478048c6affa7e8ba42473f277fe205 SHA512 22c286d6abe32d5ece411ecc4907446b92837a5f03618c31b87e9b77ce890484c678ca40258ad71b8aa6a6f3f517d568852ef3e4ea7032adf1695e76da5765d6
 DIST yolodev.expecto.testsdk.0.14.3.nupkg 50335 BLAKE2B 19215ee33440f70b055e43d38281799a0d737c5ea10a671cd005dce0fd0099d6dec33d31d6503884020d8dac7ed1313b547993b4a9dc61167c50a0bedc10e7ba SHA512 96fd564905a8ca630481f9acc437684ad0389232ef9f281cfdb1ca6a6de284b28ff8898240cec4b39556afd10b57d2c7c8ba862248637cdd1c480750cfcc8d7f
diff --git a/dev-dotnet/fsautocomplete/fsautocomplete-0.74.1.ebuild b/dev-dotnet/fsautocomplete/fsautocomplete-0.74.1.ebuild
deleted file mode 100644
index b5b5ce59b1b5..000000000000
--- a/dev-dotnet/fsautocomplete/fsautocomplete-0.74.1.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-REAL_PN="FsAutoComplete"
-
-DOTNET_PKG_COMPAT="8.0"
-NUGETS="
-System.Security.Cryptography.OpenSsl@5.0.0
-altcover@8.9.3
-benchmarkdotnet.annotations@0.14.0
-benchmarkdotnet@0.14.0
-cliwrap@3.6.6
-commandlineparser@2.9.1
-communitytoolkit.highperformance@8.2.2
-destructurama.fsharp@2.0.0
-diffplex@1.7.2
-dotnet-reportgenerator-globaltool@5.3.8
-dotnet.reproduciblebuilds@1.2.4
-expecto.diff@10.2.1
-expecto@10.2.1
-fantomas.client@0.9.0
-fantomas@6.3.11
-fparsec@1.1.1
-fsharp-analyzers@0.27.0
-fsharp.analyzers.build@0.3.0
-fsharp.analyzers.sdk@0.27.0
-fsharp.compiler.service@43.8.400
-fsharp.control.asyncseq@3.2.1
-fsharp.control.reactive@5.0.5
-fsharp.core@5.0.1
-fsharp.core@8.0.400
-fsharp.data.adaptive@1.2.15
-fsharp.formatting@14.0.1
-fsharp.umx@1.1.0
-fsharplint.core@0.23.0
-fsharpx.async@1.14.1
-fstoolkit.errorhandling.taskresult@4.16.0
-fstoolkit.errorhandling@4.16.0
-gee.external.capstone@2.3.0
-githubactionstestlogger@2.4.1
-google.protobuf@3.27.3
-grpc.core.api@2.65.0
-grpc.core@2.46.6
-grpc.net.client@2.65.0
-grpc.net.common@2.65.0
-grpc@2.46.6
-humanizer.core@2.14.1
-iced@1.21.0
-icedtasks@0.11.7
-icsharpcode.decompiler@8.2.0.7535
-ionide.analyzers@0.12.0
-ionide.keepachangelog.tasks@0.1.8
-ionide.languageserverprotocol@0.6.0
-ionide.projinfo.fcs@0.66.0
-ionide.projinfo.projectsystem@0.66.0
-ionide.projinfo.sln@0.66.0
-ionide.projinfo@0.66.0
-linkdotnet.stringbuilder@1.18.0
-mcmaster.netcore.plugins@1.4.0
-messagepack.annotations@2.5.172
-messagepack@2.5.172
-microsoft.bcl.asyncinterfaces@8.0.0
-microsoft.bcl.hashcode@1.1.1
-microsoft.build.framework@17.11.4
-microsoft.build.locator@1.7.8
-microsoft.build.tasks.core@17.11.4
-microsoft.build.utilities.core@17.11.4
-microsoft.build@17.11.4
-microsoft.codeanalysis.analyzers@3.3.4
-microsoft.codeanalysis.common@4.11.0
-microsoft.codeanalysis.csharp.workspaces@4.11.0
-microsoft.codeanalysis.csharp@4.11.0
-microsoft.codeanalysis.visualbasic.workspaces@4.11.0
-microsoft.codeanalysis.visualbasic@4.11.0
-microsoft.codeanalysis.workspaces.common@4.11.0
-microsoft.codeanalysis@4.11.0
-microsoft.codecoverage@17.10.0
-microsoft.diagnostics.netcore.client@0.2.532401
-microsoft.diagnostics.runtime@3.1.512801
-microsoft.diagnostics.tracing.traceevent@3.1.13
-microsoft.dotnet.platformabstractions@3.1.6
-microsoft.extensions.caching.abstractions@8.0.0
-microsoft.extensions.caching.memory@8.0.0
-microsoft.extensions.configuration.abstractions@8.0.0
-microsoft.extensions.configuration.binder@8.0.2
-microsoft.extensions.configuration@8.0.0
-microsoft.extensions.dependencyinjection.abstractions@8.0.1
-microsoft.extensions.dependencyinjection@8.0.0
-microsoft.extensions.dependencymodel@8.0.1
-microsoft.extensions.diagnostics.abstractions@8.0.0
-microsoft.extensions.logging.abstractions@8.0.1
-microsoft.extensions.logging.configuration@8.0.0
-microsoft.extensions.logging@8.0.0
-microsoft.extensions.options.configurationextensions@8.0.0
-microsoft.extensions.options@8.0.2
-microsoft.extensions.primitives@8.0.0
-microsoft.io.redist@6.0.0
-microsoft.net.stringtools@17.11.4
-microsoft.net.test.sdk@17.10.0
-microsoft.netcore.platforms@1.1.0
-microsoft.netcore.platforms@5.0.0
-microsoft.netcore.platforms@7.0.4
-microsoft.netcore.targets@5.0.0
-microsoft.testplatform.objectmodel@17.10.0
-microsoft.testplatform.testhost@17.10.0
-microsoft.visualstudio.threading.analyzers@17.11.20
-microsoft.visualstudio.threading@17.11.20
-microsoft.visualstudio.validation@17.8.8
-microsoft.win32.registry@5.0.0
-mono.cecil@0.11.5
-nerdbank.streams@2.11.74
-netstandard.library@2.0.3
-newtonsoft.json@13.0.3
-nuget.frameworks@6.11.0
-opentelemetry.api.providerbuilderextensions@1.9.0
-opentelemetry.api@1.9.0
-opentelemetry.exporter.opentelemetryprotocol@1.9.0
-opentelemetry.instrumentation.runtime@1.9.0
-opentelemetry@1.9.0
-paket@8.0.3
-perfolizer@0.3.17
-runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl@4.3.3
-runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl@4.3.3
-runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl@4.3.3
-runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl@4.3.3
-runtime.fedora.27-x64.runtime.native.System.Security.Cryptography.OpenSsl@4.3.3
-runtime.fedora.28-x64.runtime.native.System.Security.Cryptography.OpenSsl@4.3.3
-runtime.native.System.Security.Cryptography.Apple@4.3.1
-runtime.native.System.Security.Cryptography.OpenSsl@4.3.3
-runtime.native.system.net.http@4.3.1
-runtime.native.system@4.3.1
-runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl@4.3.3
-runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl@4.3.3
-runtime.opensuse.42.3-x64.runtime.native.System.Security.Cryptography.OpenSsl@4.3.3
-runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple@4.3.1
-runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl@4.3.3
-runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl@4.3.3
-runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl@4.3.3
-runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl@4.3.3
-runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl@4.3.3
-runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl@4.3.3
-semanticversioning@2.0.2
-serilog.sinks.async@2.0.0
-serilog.sinks.console@6.0.0
-serilog.sinks.file@6.0.0
-serilog@4.0.1
-streamjsonrpc@2.19.27
-system.buffers@4.5.1
-system.codedom@8.0.0
-system.collections.concurrent@4.3.0
-system.collections.immutable@8.0.0
-system.collections@4.3.0
-system.commandline@2.0.0-beta4.22272.1
-system.componentmodel.annotations@5.0.0
-system.composition.attributedmodel@8.0.0
-system.composition.convention@8.0.0
-system.composition.hosting@8.0.0
-system.composition.runtime@8.0.0
-system.composition.typedparts@8.0.0
-system.composition@8.0.0
-system.configuration.configurationmanager@8.0.0
-system.diagnostics.debug@4.3.0
-system.diagnostics.diagnosticsource@8.0.1
-system.diagnostics.eventlog@8.0.0
-system.diagnostics.tracing@4.3.0
-system.formats.asn1@8.0.1
-system.globalization.calendars@4.3.0
-system.globalization.extensions@4.3.0
-system.globalization@4.3.0
-system.io.filesystem.primitives@4.3.0
-system.io.filesystem@4.3.0
-system.io.pipelines@8.0.0
-system.io@4.3.0
-system.linq@4.3.0
-system.management@8.0.0
-system.memory@4.5.5
-system.net.http@4.3.4
-system.net.primitives@4.3.1
-system.numerics.vectors@4.5.0
-system.reactive@5.0.0
-system.reflection.emit.ilgeneration@4.7.0
-system.reflection.emit.lightweight@4.7.0
-system.reflection.emit@4.7.0
-system.reflection.metadata@8.0.0
-system.reflection.metadataloadcontext@8.0.0
-system.reflection.primitives@4.3.0
-system.reflection.typeextensions@4.7.0
-system.reflection@4.3.0
-system.resources.extensions@8.0.0
-system.resources.resourcemanager@4.3.0
-system.runtime.compilerservices.unsafe@6.0.0
-system.runtime.extensions@4.3.1
-system.runtime.handles@4.3.0
-system.runtime.interopservices@4.3.0
-system.runtime.numerics@4.3.0
-system.runtime@4.3.1
-system.security.accesscontrol@5.0.0
-system.security.accesscontrol@6.0.1
-system.security.cryptography.algorithms@4.3.1
-system.security.cryptography.cng@5.0.0
-system.security.cryptography.csp@4.3.0
-system.security.cryptography.encoding@4.3.0
-system.security.cryptography.pkcs@8.0.0
-system.security.cryptography.primitives@4.3.0
-system.security.cryptography.protecteddata@8.0.0
-system.security.cryptography.x509certificates@4.3.2
-system.security.cryptography.xml@8.0.1
-system.security.principal.windows@5.0.0
-system.text.encoding.codepages@8.0.0
-system.text.encoding@4.3.0
-system.text.encodings.web@8.0.0
-system.text.json@8.0.3
-system.text.json@8.0.4
-system.text.regularexpressions@4.3.1
-system.threading.channels@8.0.0
-system.threading.tasks.dataflow@8.0.1
-system.threading.tasks.extensions@4.5.4
-system.threading.tasks@4.3.0
-system.threading@4.3.0
-telplin@0.9.6
-yolodev.expecto.testsdk@0.14.3
-"
-
-inherit check-reqs dotnet-pkg
-
-DESCRIPTION="F# language server using the Language Server Protocol"
-HOMEPAGE="https://github.com/ionide/FsAutoComplete/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/ionide/${REAL_PN}.git"
-else
-	SRC_URI="https://github.com/ionide/${REAL_PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}/${REAL_PN}-${PV}"
-
-	KEYWORDS="amd64"
-fi
-
-SRC_URI+=" ${NUGET_URIS} "
-
-LICENSE="Apache-2.0 BSD MIT"
-SLOT="0"
-RESTRICT="test"                        # Has >=19 failing tests (uses expecto).
-
-CHECKREQS_DISK_BUILD="2G"
-DOTNET_PKG_PROJECTS=( src/FsAutoComplete/FsAutoComplete.fsproj )
-PATCHES=( "${FILESDIR}/${PN}-0.73.0-paket-dependencies.patch" )
-
-DOCS=( CHANGELOG.md README.md )
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	dotnet-pkg_pkg_setup
-}
-
-src_unpack() {
-	dotnet-pkg_src_unpack
-
-	if [[ -n "${EGIT_REPO_URI}" ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	dotnet-pkg_src_prepare
-
-	rm paket.lock || die
-	sed -i paket.dependencies -e "s|@NUGET_PACKAGES@|${NUGET_PACKAGES}|g" || die
-}
-
-src_configure() {
-	dotnet-pkg-base_restore_tools
-	edotnet paket install
-
-	dotnet-pkg_src_configure
-}
diff --git a/dev-dotnet/omnisharp-roslyn/Manifest b/dev-dotnet/omnisharp-roslyn/Manifest
index 439a49692297..edb2ff125125 100644
--- a/dev-dotnet/omnisharp-roslyn/Manifest
+++ b/dev-dotnet/omnisharp-roslyn/Manifest
@@ -2,9 +2,12 @@ DIST benchmarkdotnet.0.13.10.nupkg 937313 BLAKE2B bc4511ce277e0cbc54c7097d2d1aac
 DIST benchmarkdotnet.annotations.0.13.10.nupkg 77111 BLAKE2B ad0e46e276ad033abbb25b904812d71b1557bdbe374b4c998e8cf65cd3d4bf044d224510178955be81c50e5cbb333709ec768d4492ca8b71655bd6b50b075e29 SHA512 a09b47079dd0db2d65a416740d19f6a538a8a30f9cd9f784c94a8e0bd76a767d40ea2c645055f3e15529cd686fc8c1398aa82b130e76a6c7ebf2ba1d6a1139a0
 DIST benchmarkdotnet.diagnostics.windows.0.13.10.nupkg 58322 BLAKE2B 6a49296373c1fd91bfe1e519661965b35fdab1d58478407f471f10b07c28e108da66f393ab8160a2e5631fa0c17098f8fe3dbce91d56a6a606d3be47d95d4966 SHA512 9eb69267fcd0a0078ae5c38f465f016d529519a974c29e4a0f45a0793df48034b07fe1d3e73f90c16e325c3283c689e9915b2f01769810d48106d15b38de3a7c
 DIST cake.scripting.abstractions.0.15.0.nupkg 77478 BLAKE2B 2a562642f205d4039688267078d14c622adf5d7a4418797fbe2b228aa6171bdbdb85a1b7133ce95bf6dac24e75f3e1d68957a08bd51e5fb1e5fd99fc688b0202 SHA512 1c3e101d0e5da1cca9df5d8f846970ec11df961d809b06d56c110c21f15170112b81de4eb2892ec0beb08efeeef1495de82d1b47cde4d7ac5c397f0ef600b084
+DIST cake.scripting.abstractions.0.16.0.nupkg 76584 BLAKE2B b5c118862e5af6470caa21c66b2491891e4aa656076fc7b2391206beb95821462e68dd351558199f17d60b83037fe12b53fb799a8e999962159baab7f9d09902 SHA512 29559d85d4e4afa4cb8cc661823af0a0a9693bc053d5dd43df28e56518a45755213fe8932ee5a983c1062bb779b880938296e694cf5e6cf12e138830dda7d4fe
 DIST cake.scripting.transport.0.15.0.nupkg 80872 BLAKE2B 785672009774fa28980aae7476c098e3ca4c3ac1b1a566a7fbe944f68e96ebd7b3af7533993c4baececc85d9171529b7e3b43e10b58a614e60f389c9f2942b2c SHA512 35bd1c0ee3e4018d3a67f7e38fc38fd64e9c9ac3e906d3298828f4c43bc8a066b0806cea8c456479879c69ce1d4897eb5eb6196e31f64eb28f68815dd21ea621
+DIST cake.scripting.transport.0.16.0.nupkg 81026 BLAKE2B eea87facf569d6ce058398e1ff2207c263fb8174d2c3e2ae07246fec5f3659df5259bf459dda0d56c70eef108a78513231aac05953ae5cc4d87a50aa1b144562 SHA512 eac639a591ed1be0d1a9afc010b7c11f5b51e2cbf4588abb703225be77412e462b7228b3c5179456a13c21b7a587879d45dde8aefdfc624cbd262f667b86aeea
 DIST commandlineparser.2.9.1.nupkg 496069 BLAKE2B e2c4b38841f83d6bc10432b8055af90369f1fe0a10105a58b51b44cd48e5d84cb0b5e4b19f444d8c81b38646a62c7c4d11cbd710e92fea68be3ebea6ab98e3f1 SHA512 4f364e45c9668c7e7cc6a922b488f3fa523033c20d7a432694f0a6af05ce528ea0481d8375e2f4f1032c6990347b4803ce9a0e48068c6fe15ec46fb1254f085d
 DIST diffplex.1.7.1.nupkg 84087 BLAKE2B 39bc921b480f9d1e1175c876647a8f3a5f178b3275a1320b55370d51b76bf317b6106b06ec2aa5414c237201811191a859960b2fe63d5fda3be35846e5ae1372 SHA512 ef67b73e3835513e1b932e478299462830d54b49a18fd5b08c3bd5e18faa04ccb78839e884c4af2fbc4e2bb3009784746985cf73d10e37051f32dc14be731e9b
+DIST diffplex.1.7.2.nupkg 92255 BLAKE2B dc735fc95dad6a62d97e0aacf27f3b6cf2c094cfa8d490c125f67f93fc7ef416665033bbdcc778109a08b7cf2adc9440e314235796c290e3d156e1a75ee27348 SHA512 24fb44832dc3c975afa54eee2558a43a1c14e5ae0dfdbde80a155f61efe8f25a9cc8a290a8c24916a8db648afb90a91ceec800ea24edb0a9af0c37074c864d99
 DIST dotnet.script.dependencymodel.1.5.0.nupkg 37193 BLAKE2B de5ffab4277a70ce8f8c08293656aebf2ff8931445f52eccabab860b21cc512ae3492158ccdcfdb4f09df24f0b1b4a05c1ec1e82886164adb0f13964fb4d53a8 SHA512 8f860945c5549092e2759560823c3fbd3898cb8ba77e7c2068b1c2612b838e4575fd6a9821a636ee81f5c7ea4565ac84439b898383a881968d0ce68d81b2a110
 DIST dotnet.script.dependencymodel.nuget.1.5.0.nupkg 18348 BLAKE2B 1e97aae679adedb8e1939c800dfa7638099381d88348afd1afbabbce4578ecd6d6c5c652e8f36dc6f55720e36ad28dc72135713006401dd2db43fc4be5a0e9be SHA512 6ae55c3669a16a62a863e043ffbb84f73a5473eec2a9ed5738c93d47c48489d1b2f733962638ce736b2206611f1be8a59805a137ebf14360a96e03f57ee05f6e
 DIST gee.external.capstone.2.3.0.nupkg 8145352 BLAKE2B 1e1cfa75c9d8fcff0e905e7d8d5fdd3415daec907f97ee4eb810630d1df26397a5a2a80cdb1fa5fee6268599bc49dd8ee41366867aa16ca689c97db78b4be135 SHA512 9079d5705d591c3b819127b2e0b763dacabb212314e9f96b2f632f62b45a9f3e1c208f136df91a4834dd1838a38ac2fd2161ce8b545fe70f8078b66fc66c4aa8
@@ -37,20 +40,32 @@ DIST microsoft.build.framework.17.3.2.nupkg 929350 BLAKE2B f8b46592625f4444c71af
 DIST microsoft.build.locator.1.6.10.nupkg 80341 BLAKE2B 4bfd5b6c0a6e46e3f43c8af02ee755e792da3c8eca2e7eac531bd36b95ea4c3cdc0bb2b2f5bc024f78abde81191336d36ca10cedf6ec6d3dc44530d37ad19ac9 SHA512 370f97db9200614240a2d230416f6f351635c5c28d5d97a6d7aab9e2d050fecd8f3686d849ead98efa8ad56cf97f25c0e84033030b7584034f0b86b9f0d6cb0c
 DIST microsoft.build.tasks.core.17.3.2.nupkg 2354556 BLAKE2B 91cff6d7cdfe394fa7de3558dfa19f3fc3f120489d1b39cb13160a5e4f16db597cdcc5eda8cdbfeca6acb9d4335e942d871515707989b8df48513fb6789b0e3d SHA512 95c5926497a2915c9b1c9e8ba67c21c7dbccb67a93bdc1840aae1a98363088a24fa2393b3f3d4bbfad17b1d05de89606ae57ab06de1b9ecfb120e0d9f9d61ced
 DIST microsoft.build.utilities.core.17.3.2.nupkg 891521 BLAKE2B 113cf481440a4dc25705d1da32d136a628b255c1b089d3ad4e1430760e51b4f5088f696d474bd58d3089c669488ffd5b79ebfdfb191de601d2aa3406c91c40f8 SHA512 292652879b65f4cbcb9618e359bd2ef6f67ce060ee761a4f8bcc23377d1da2fb52a098d1f2a156ab3c901218a9291e1d422cbc8e7531ee24b319f0325a693385
+DIST microsoft.codeanalysis.analyzers.3.11.0.nupkg 1605871 BLAKE2B 741db7af552609b6edf19b6045cdee0a011ebedf82a887af6df6b8b6168d61821304e04daa8d2a1367a41a59553f9ad88d9ca3448163b7bf7cd3388a928c6591 SHA512 b4ff522f32caef65c2131961f0a5dfaca6d4eb272664bdc4c4697f6b7325ecb372d9469a9bb8058e3526773c936243174f27240871e9cf1edb0fa04cba687c06
 DIST microsoft.codeanalysis.analyzers.3.3.4.nupkg 1461577 BLAKE2B 43f2f6df0bfded6ad334f5be4627657f1d013b73a13eeef28c5da5c134f43c1880313711a7dfa577b4dea5ced0df6df6acc4236fc8371c1f7288b96cb34997d9 SHA512 23e462c3affa5a33480b276888da438cdfc618feeee17b0be95b08f651bf3a316e7c7ddf96f484cbf7f1361183546c195b0abfe41967a97f8b1f676685e68f7e
 DIST microsoft.codeanalysis.analyzerutilities.3.3.0.nupkg 292854 BLAKE2B 79da2175045559a3bb291e0692373c2400913ac07e8815dae9b20d9bd06a39ad7e90dca073379ebffba6863e96aff38da5532fb2b7a7641902f492cca4d39f1f SHA512 2719c5208a6013ebb2fbc500e187446f44312db017dcbc036618ec354b04b9c35db9f85a21af5fea8c394583f6483c085444e2acac4cd8e4e79582160e95cadb
 DIST microsoft.codeanalysis.common.4.12.0-1.24358.3.nupkg 7073581 BLAKE2B 7efafcda44567b6cb11b82fd71956812243023e22bd999833e05562167fbe11bbfeff513576100e5597f1226897480dfdeee9998d2fd8007d0d4436d0b3c02fd SHA512 8382dd9eef9497bec7750d8efe37a7f21f975295cbdf8fc5cd5d127b6b470d61b0ea5a8e906b32f7c617d2dff46612fd3dd859401f2c43c2d100c08094e09e3b
+DIST microsoft.codeanalysis.common.4.13.0-3.24620.4.nupkg 7140972 BLAKE2B 730da509bf346a9d7472c05d005b18c19246e658cd7013d76775ff8c52fab246d05ee9da444b571de59e7d4bb236080a378571af3ca03d83533c2dad50d8659a SHA512 b41edecdb5f183c2a496edfd36029969101204925b6cba414c6c34ed876bacbccf551291acc8a09ef20e5486cac5ac4c1cf7647df940783be4bb4124b99b26dd
 DIST microsoft.codeanalysis.csharp.4.12.0-1.24358.3.nupkg 16906374 BLAKE2B d3582c694eb7376e2062c393288d3192280d6974815bbe2e619f6c0faa8011bbb214c2475c7e315e6cfcbaf47e4e5a01eeb8cbdb438b84f9b48ba4b14775e7a9 SHA512 7875f93cbf0bccf51adba667d2421138153d71274d4d874b3737a8352272305f113636367c4f8a281c88f48cdf5e35adce6905919f1090b6cbe8094a5a1fdfee
+DIST microsoft.codeanalysis.csharp.4.13.0-3.24620.4.nupkg 17091606 BLAKE2B 434b0a2448937f14cd6b89c5e38f885672787f03b8cf60133cb08a95f8cbd669a1511108daecaea03fcc78155f2f05ac2af567cd841fb6d82406e97952dee851 SHA512 ef5ebc3b2165846941037f06c2af8374082dc389e2347db7d2d4c407198a297ad0989d74e22c8cbde410227504b12a24a667f636f98ea47ea258baebe4c5ac53
 DIST microsoft.codeanalysis.csharp.features.4.12.0-1.24358.3.nupkg 4322543 BLAKE2B efe6555606e6bafef2706249d10981a64ad3569d95e7b07cf0a07f6b04d71bbda13db21e29241ed30666f6ac052ed84a2e40fb3e9cfeb10d173f38c267a0032d SHA512 157ad40edc23e171b584a26a8959a4cfbcb074c6c79f42b150986866a818486a75f8f4523c96355e1368b45614c398d0a1c1c29343efe96c19cd9362a4e7cfc6
+DIST microsoft.codeanalysis.csharp.features.4.13.0-3.24620.4.nupkg 4349349 BLAKE2B d484bbe3f6227b331642f1c4e50f1b19c704ee8e696673f32d657105a815e1689cb4fe9f5120f7afdf6027ae5fd73f661a8b1c277e24a77609820859eb539feb SHA512 3bc0c607943e79289c7629daa5c4645e27a451af24398cfa404fee3a8bbe7f9687e9ab4fec367218706b64ce16b003f49914b66f395469e800c25cbab967a181
 DIST microsoft.codeanalysis.csharp.scripting.4.12.0-1.24358.3.nupkg 510134 BLAKE2B cf2fc27c8b106debce2a71ee3f25c6539ef68aae736cffaa77dfd0e15937c1827abaa8f608ec488f26efd73d60e0ea942c7b53bc60286ad03dc1a70fffca2651 SHA512 e284132f2b22394f51456203abdc95b64dc492dad23560464599bf40237b6df63e072062a290417eb0fbc9d04744f88b00704401c17d0a156265a6126e777b45
+DIST microsoft.codeanalysis.csharp.scripting.4.13.0-3.24620.4.nupkg 511330 BLAKE2B ae3fe9e4ed2e49ee70b1af73bb88c0024bb89bc982f7e797b76c242c73ccdbe13d16524487b4704589a3a2f1b6e42305d6bd4afda93c6069dee58ed709470bc5 SHA512 db5712b739fdec52bcac9a27a25467641a03d44e502d5b5045cce4fe5c68b2204fa2efbdc8db468bb5bc1be4bdae2a9d6de350f59d042cbb7bd09ba2df75b1f2
 DIST microsoft.codeanalysis.csharp.workspaces.4.12.0-1.24358.3.nupkg 2017617 BLAKE2B 1fcbb506209b467372ab03df49f1ef9a27986e97e06e838fe4a88642bd272b191d434767ae9cf080c854ccb437635a464b34338708636fcc131358987cbe8f3a SHA512 aacf8860d26f6cad6545cea708d18dc9257c071c4e100c334e3810cce24fc99afaee51a804a1d666a9db63b93156ea37b4794bcf52acf8c28c9ca133b1d80a31
+DIST microsoft.codeanalysis.csharp.workspaces.4.13.0-3.24620.4.nupkg 2051460 BLAKE2B c8c153f690db95095f0c0427585aff5ae17414c22ddb12aaf8ddf541482166732b755124be29d34f08efdfc1fa935d40956c7856d072a17986771ef1ff6986b3 SHA512 eb7e644bd4c9f395bba4dc1f717243e59718a4c9f8002f4d2cb9c67d1fd8161a9694144c9a46b283aebc03b850932968450d75f8fe2e20f3a7e5c6f95e17c8e4
 DIST microsoft.codeanalysis.elfie.1.0.0.nupkg 155504 BLAKE2B 6f816ce2fbe46940ba361970104cdff65f225b245a2fcfdd98b00e51005aeaf0246c050e99061896af311ca01cb89145519634113c3b9c20f4dcfe583bedf389 SHA512 391444d600aa3613a24f142e26160e179ff0a2cee18cdb9e0c7a0d9a78fddce06abaca3e038b85b04a4268ff60f21258a66b2988622dab3c49febff64db9d0f0
 DIST microsoft.codeanalysis.externalaccess.aspnetcore.4.12.0-1.24358.3.nupkg 174794 BLAKE2B 259598a5f848aa5bc2106f71b5864ed6f29d668e7f5959008d9005604f1c21f5d44634df4c8bb7399b69860a44a3310e2e5e53a69437a87a59290bca13445455 SHA512 9781a49ac0b43c6b037723b0a6e442c87d1c71cc8a72818583242792ff1e61474c30170d0dbee009ebe7514ad1e12a5daf25f776b89b5301066eb2afa24a8bef
+DIST microsoft.codeanalysis.externalaccess.aspnetcore.4.13.0-3.24620.4.nupkg 174669 BLAKE2B 3d042325dd5399f2451917236f0fab5b8f5a90b21185b5ecd77a272fde6e0dbc2e1a390153300e7c69b8b0e7947db9217a06fa6175525eb775b755d07bff3706 SHA512 aef5a0481b16bdc26ed83185ba5f16a478282fb0ce8e490261f136311839c28c43861e3285ae1bd32890548f251e0e8cf83d1981208d3a20d4946471fafbd156
 DIST microsoft.codeanalysis.externalaccess.omnisharp.4.12.0-1.24358.3.nupkg 71740 BLAKE2B 1a0ee51af30f4f7d3d771801edb96aaa1136a50eb8ca6f21f58a815528b4ad55d11939b34715c7e858f95c7d81a5dacc5bc8b7ed31948a44c6d74fa9d4e5071d SHA512 75ddc51718c77d7b724fc992a6bee4c9a11751d834fe288dc9e4ad8cb8d833b8477a34e3452b8726619e79bdd94333793d1c67ad51d57c608299ff3bfaa33fc9
+DIST microsoft.codeanalysis.externalaccess.omnisharp.4.13.0-3.24620.4.nupkg 72157 BLAKE2B aa9b1e894b784cd688248aad1d06365ecb17b5febc3277d402061ade56fb2a3fab49f301ce41f18cdd540acb138b7b968efbd88573c1348f00473d0edfcbcc29 SHA512 a4aae9f4a2c8a0edc24db61a343c63b74fb6013f22c8f21ada04d617a8f94868698555a91bcb110182da99ee68540b64175b7713c1de1dcf9de7ab99553f102e
 DIST microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.12.0-1.24358.3.nupkg 39994 BLAKE2B 1e288ae1ae6401efdb9967cbb2d356a89ee3dbaf9a95d8dffdfbe530506db3163cc406760773c89830887b42b6408df62aec254f9e6c627921033a48364df376 SHA512 dbdc4d0c707a32f56a83c298a081862b9b8fa816fa21ce2220a2c33727ebddd1c695915b1cad9724056b55f954ffbd35ea45713f23a24784eef73c727bcb7821
+DIST microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.13.0-3.24620.4.nupkg 39993 BLAKE2B 34eb73eea64a1d72163b6794e24c49c55a629ad16b36849bc6e5570b01a8760e01c054c3b874b41da966aaea77c347d305fd964cedb1f4a23533274c5e986f86 SHA512 1fe6e95393f610d871a0d7a46b6cf6e6658e3ae35b9945053a64ee9ba092dda6615a9e451e4601cb7427a347cbe2f89a89101f69f1b8158cb1bef1ae14cf5ca8
 DIST microsoft.codeanalysis.features.4.12.0-1.24358.3.nupkg 10426918 BLAKE2B 34e9a975d80d897b190e941dab4ea9393f5470c6637b3e5158efbeaa2ff18f343649f6a0cdee6754e165d3ba9192c47c9297a9952bbdd911f45a123a9609f99f SHA512 cbed70c1a112608d5d28945a1f130e7970780bf413b79313b89c173781387f755cfabb662ad0ce759c65abc3d4dc09c7abbe6d936aa05bfe67df86880facdfc0
+DIST microsoft.codeanalysis.features.4.13.0-3.24620.4.nupkg 10593288 BLAKE2B 9e48d6d8a6c3f3263904684062afa12ac5f5668b4c3563f2b619e0f3821a27f2fe43688d348f4390806138732c2983faa9a8d07794173ad92b347fb767c6d9f2 SHA512 a532f55c9b0ca7f93c797071a196b18a0f17490ddfe68e7dba2e634e6809ac81d0565460f5a1ca65e9afc9d53f5f238bd86041958579a7f3c02681785139d9dd
 DIST microsoft.codeanalysis.scripting.common.4.12.0-1.24358.3.nupkg 770926 BLAKE2B 9bbbf9a2511594a44739be0163a1d0ff69bbc9aba6405e5edfa13db54b3a12f76373f4a06e46355c04d7c1da1f945e6f3a35e7e64e6574493cb2511c986cb47c SHA512 96f7078967759208e3019be7f67a86d0fa319a9b21fa44e95825961b99e98639a0eb3445319e1b7fceab89d6d7bff971926d5b6a28b361868dd900fff1efe84e
+DIST microsoft.codeanalysis.scripting.common.4.13.0-3.24620.4.nupkg 770692 BLAKE2B 692f2c98ec59edbd1bf648ba6cb5cb6e4d5d73b9ecb7dc1f48db30807ca21915c5d2dfcfa9c24efadce0fe54ea0d15fa5136abec54421af97eed58b02fd978fa SHA512 e513895d621cb1ac9a263ac104dca19be3a1478a5b9580f2b759b746f39ab94e8c271dd42d00769f39cd2033be60ef77969ef8394e67c0c25f7c76b73d1d3cb0
 DIST microsoft.codeanalysis.workspaces.common.4.12.0-1.24358.3.nupkg 8471653 BLAKE2B 04b38cd0a7bb5f31bbc1dc60b771dfca20602229b993fedfeaa716eb0d47b1aa9baddff007be056a3ba21a26156f6cf055700718b036b264a0f43b2fe3d1f9f4 SHA512 4e9d9d7382b7af9bf8a2663f7319dbb12ee2235e325a7119d3c1b08cd715e3464cfa994acc8f5b47b947937586122b2054557e1ff4fb1c7537fd8b8ade896739
+DIST microsoft.codeanalysis.workspaces.common.4.13.0-3.24620.4.nupkg 8546257 BLAKE2B 10e156b03f94a953c4042dba5a75d6870b83b133fc5b30c642500d5b0a5810093ec141fea14d8bec976d90648c2a460b5403fc913eb3002c08dc202a088aac8b SHA512 07d92f61b16758611a3f7f6e6f35ad39184c030a308030a55a1370544f3b1f6e64146f5a9d99330c3ee80445fd8f1df7d763175198f783e0b9a7e60c67e1572a
 DIST microsoft.codecoverage.17.8.0.nupkg 9139132 BLAKE2B b9a9e71595742023f43a50e159ae6c0ec61858b0f786a394eb24438a28708a4583e7cb1914ca5e0a717738452aa01c816258eb032736fd3ee404ffb1994d2988 SHA512 bbfb44e01038c77dc33c175478c5f1107bda23536cfc212c14060385c5e41145411550462f6665924883788fbf66477d2f517acb28c51fad53c0f895ceec288c
 DIST microsoft.csharp.4.7.0.nupkg 627100 BLAKE2B 114a5af7151feb80785619d54caf5f928558a034254b5c2e185820a441f017705c933b0d66a31d395ce516a81f97655cfeca46e37397082b1b5d6ac6f507301a SHA512 2c96988515f95714d4b83f5650f183dc6a564e0b3cf5255fa0e3ef48476debab4bde542f9f2f6c47f6620b7a71d6a515e4415e6d2e388b60817a29621d5690df
 DIST microsoft.diagnostics.netcore.client.0.2.251802.nupkg 146459 BLAKE2B 5f3c1b217602aac357b529e8d48943c2aaf90973ccb86b577748d3eb11899e9a43f5370c3be77531d15550792f5f966fc694c72d8e3abe83fea1a0d6fcd11f9b SHA512 553336be495e4d899318256fdf085e7800e6cd01a50ba561a3fb879d12f75bd42d58383bdb7b0e679d6f9ba7414b9b5b9d07ded6150a57651e16d1e95cd804a4
@@ -60,6 +75,7 @@ DIST microsoft.diasymreader.2.0.0.nupkg 93176 BLAKE2B e014a4e37ebcd914a0671705cc
 DIST microsoft.dotnet.platformabstractions.3.1.6.nupkg 72146 BLAKE2B 08d852b5e6558b499f2d780284aa747e5cf39886d86fa378128fae9f71741bd57c5bc75c0077948f193b7e8ea03a520d8ef3bd3b4fc80779adb4a84a4b44fe8c SHA512 55b87f544874686bed96889953b7e99e43426b79b0fac31cc452e0f4a27ca5cc08522c0ac967bf9df649f7c04137a5e2553d134ad79d5c1e69578367c2b4b4c6
 DIST microsoft.extensions.caching.abstractions.8.0.0.nupkg 160393 BLAKE2B fbdc0d02131ec3601e5f08abacad1916bbe03e390643c5bf40840707642371c2eae26a2b6abfc65bd24a89101f0787bd5681e679c5933048123f53dc301dacd8 SHA512 1fdc30912cc1ead9362f70853de219a9dc7070bc28f621e387185670e605746ee2f13b0df9db03d0b1f8919d4bdaad40ebe9f8203e3a0cbb61145aa8848be136
 DIST microsoft.extensions.caching.memory.8.0.0.nupkg 187247 BLAKE2B 3297ed8515ac9d3c8ed0cc96892355e064b94ad137e60d0e2a3394ec054e03610b87483e0db651ff8f91e410e46aa7e8fbb060f2fe00fd4e02b86ea037266098 SHA512 b9ea36c2da4c47edecf336fd3c7f5bf2cce343b333a7c6a98e6415dd26b4f8574c937e3ccbb19556e16d3de22e9564beaabdbfa94fe323992cbc7b47f90559f9
+DIST microsoft.extensions.caching.memory.8.0.1.nupkg 197330 BLAKE2B e24c377fb6465c3e4a3f9efb8e5ed6ad00ce265692ccf9e37ded6f913e5dfed8e0916a39432c3008514b73409c8d03b5dda725ca792a48e08b9121d83d466339 SHA512 39d053a5a92f413d012f910df6716cdac2f1cacfd234531b956dfcd10f1a83ea8cb84d017d4c72e011f87c53db27e33e9dc7c86f842eacdb1907cb895b448817
 DIST microsoft.extensions.configuration.8.0.0.nupkg 191129 BLAKE2B 907151c54380b8cb10312a5dfe876512912eacd7471c91c0c4972a375c4e91b0b00e5a295cac19523d3e8443b9232aa06e949e071bc4a83ea3b45c7debe44437 SHA512 da48a8ef3b4cd2a6beb78008382d9fccdcdd42ff3a71d9efc5ac69d4020421294ac95b07cf11520341a69ee241925cd040d49a382df243e2fa194f6896ef9734
 DIST microsoft.extensions.configuration.abstractions.2.2.0.nupkg 34534 BLAKE2B d032a2e7c9e26d11d7c2e68720a36d7decbdc29eecde4c8c5f2189aeed3644b3a20b6d0eb9e7f4e920da01b1dd9f3a674e32513a15fc685afe3f0561110eed86 SHA512 33abb870c597c4fb6ac89274de87b3caa4ce4664a04cfa5ada06512a41060975c78721a73357078cf4f3ab9b1ebd84b554910c6f64d98fad2601cfa10e83cf71
 DIST microsoft.extensions.configuration.abstractions.8.0.0.nupkg 149230 BLAKE2B e3d49a61ded7a88e0ffeccf5901f1fb021d66ef9914a5e5e7e43e69a193253f1009a55cfb2199579e017dc547050b77f7e777f5fe944dde609def9f66be3217c SHA512 3316170910a94290c8df4fed26fa884a47dd9bf974eb7ad22368d5a63308660a01d2dab4a44662061dacaeccf4ba09cdabfccd4636f76ab3178becec5ad31a2f
@@ -72,6 +88,7 @@ DIST microsoft.extensions.configuration.json.8.0.0.nupkg 158841 BLAKE2B 68036337
 DIST microsoft.extensions.dependencyinjection.8.0.0.nupkg 341717 BLAKE2B 4c6e981247ce8ca11783d442e658f69edfc307020adacdb58c28ad93e7d75b7d4b89001cc34787041e44eb6efd2310e4bc8ae25f31d5a2688f4d363f9756d9dc SHA512 96391af4ae0542f4ae96c8009c9ffbf304acadf476cda262a8ea73e33b172529541044186c59d656377bb2de42c9f5925e0632a81f6e7516f2a646e8916f16ec
 DIST microsoft.extensions.dependencyinjection.abstractions.2.2.0.nupkg 43877 BLAKE2B 07cf19b4d3d9f6639edef692964fa0049c4caf8a14b4a7229a9428a058304754ed7defed7e24fea66dfb9ccfbe98ea5cd958e39093a4bd0c94c6939df2582467 SHA512 db1324f4b1f3d4463eee0546d251b8a81be452256383c40d3ea7761d89843f9f8f2fb032a3de8484189e02177ef86c78c8cfb137c90daa68597453011de1b41d
 DIST microsoft.extensions.dependencyinjection.abstractions.8.0.0.nupkg 276886 BLAKE2B af87cb01e181a5f75df78f59639d4b7dae4fc0b930c7ace4a3ed506c43a98edd447f7359ae964aea1824cfce9213b8f225fd67e9240205a1630d67cd0a274415 SHA512 94bc05ed29755109565d9cdfc901087ee1fa08302dda393106bc9a0bd7384f0dc2b6c2f123c1bd53fce06babdbfa845dc6d22a163c4b0646c5251dcc5aeac282
+DIST microsoft.extensions.dependencyinjection.abstractions.8.0.2.nupkg 278862 BLAKE2B 695bd3aeb51ce3b5caf2132882e6dea3be6bc2d150cc9a6ffb46b5ea5261f4deaf46d1c0f0d1749c2c04bdab246afd79b65944fb7da7910bcae1d86a3e46a7ef SHA512 ba1960ef110ac7387a2a06eefc02c59ce57b0fe58b3e0cccb79b1c8f2150105c5d1f4b65e0ed95ff50d70f28142917c6a735b83f4e5406bb1d8f9dd1f9635d7d
 DIST microsoft.extensions.dependencymodel.8.0.0.nupkg 260512 BLAKE2B 9adefb89f67e0005d87ede2dcf6e2f07c42e6f59db5dda66177f0267c873cd918886b7c67fc7bac59211fbc665f9ce737bbc555a4901be5b74a4e783e263cca4 SHA512 4aa0b36bca0fe3ccea6e1ff4cfb3b6cf9287ba0e1da6f5e6e40ff64adb7df2c09aaad3ffbb1fcc3331b3c295591e3e1713b0dfbc6216ab07b78e22edc3ba46f6
 DIST microsoft.extensions.fileproviders.abstractions.2.2.0.nupkg 32978 BLAKE2B 5ff7c04655686584350ef05c0d0003555dd8f4d84c5d7d26ce5db041957ba5a83a6bbcab69a11f031139fa880886ebf21aaf474a8f3aeabc181ea181df45e85b SHA512 df7bd3ca28f301511f6ee345b6cebc47b6d6d36709322c36d4c16030193e5cbfad85c6efdf7e4f543d7e0dd312bcde9ee437804783a63d246c288afce98938aa
 DIST microsoft.extensions.fileproviders.abstractions.8.0.0.nupkg 113833 BLAKE2B 04ccc5c3d9c969379c95701e1eccfc5087420f11becfb39f6a2d20b6cffce9ab34fe705391e6b211dc18a1d62b36f7565dbf5dc8682a8e43019bda147f41018f SHA512 fe9aa18f2e819694f20e322c93e075e27bee2d57ddd5380624fc48a95669c526c270ab5c74f58c6a4721d18ecdb5b2febf0315f8794585ae65617831459e2a0b
@@ -82,10 +99,12 @@ DIST microsoft.extensions.logging.8.0.0.nupkg 232520 BLAKE2B 79e950dbc495ab3078f
 DIST microsoft.extensions.logging.abstractions.2.2.0.nupkg 48208 BLAKE2B e062804bc8d13083659e052931323f07ba393c9d252149835024a566bf9e60f957bee363d2e8bfc80b697f2908f24fdf9ff5be10bda1715963b385b9d006ae77 SHA512 d62613e8102725919e6df72541788cfddacaf89533b528a49294f7c5c0120505b8a20f3bedbb17b63aab30ce0423bd677fc515b6f1ede8ef2931d603104f3f2f
 DIST microsoft.extensions.logging.abstractions.7.0.1.nupkg 720591 BLAKE2B 3d9f635b40362091c43ce612c642f27769f7dcf1e5cfdb446d3f2f48bd0cce3acaad9206f0aedccb990410a402b41b388c88e03374c8f1075b333fbe9e7bb344 SHA512 a8cc3d2377f31d75ae973c3eaa385251e51d3bd70eec80003d7860527098b0b77200046c7b1af8882aeea8ccbfab401c8bf5391afe615cb15d95bbd304f2bbf0
 DIST microsoft.extensions.logging.abstractions.8.0.0.nupkg 795935 BLAKE2B c27db06351766972dd55b3ebf927ba7594aefaa0239fd00e0a8ea9ba6b8acc3c1e040512cd07a9849af5ed066c69450d1ab4d7fc231103db2981d2264f515dcf SHA512 50a0add96d30d90580fb8e02a25cea0aa15f4d22744279b5acfe18cc8568b74402aa062d5db13cc5887a08bfd24e07cbc88b2fc10ee8eec2c37edf3bcda7f8a7
+DIST microsoft.extensions.logging.abstractions.8.0.2.nupkg 801164 BLAKE2B a445b6fdbb3aa92e63c8a4efc1fe39b3f0c0328bd297af67e306d5aa2fa346b79a76741f190db3a3f2fe83efa58a529810b3aa3baff9bdfd4e2b0a0131fa1e69 SHA512 f8b9df3fa7b837cb5f2fa53a86bfd47279f81bc332db55b8bb7ea14f55dfe2158f351d35199c0cc0e01c735f394ded2a3a8f1c85c3ff6ea1c3ab785bfbf362fd
 DIST microsoft.extensions.logging.configuration.8.0.0.nupkg 143523 BLAKE2B 80c5daa2ccccad222ee087d67e5f0bfa274801c64706ff288e0fe5179f859cbda26015681eacc65ec2d6a25cc855c2dea907eaf825dee2d3808c8ef0b111b0ee SHA512 a6c7487b0daabbf7987496ece736b3a2c504298da762c30093982850fc3786d7df6efd92da5fe78d7ef194ad7d3e2632c8f5398ca70ea6c9ebcc1fc1c7bca41b
 DIST microsoft.extensions.logging.console.8.0.0.nupkg 264682 BLAKE2B ce0308c6758b7086aea9d9dc50f0e36d40c4e0601c0f6e66af517276d93d4fcf0d80e4753c4d3739efb1354be47c76e2abfa7bafb9ba9ab0d55b0de171896674 SHA512 e6cfb240e76517fc09edd22036e472ef04681eed3cfe6f768c9afe8fd795e69ae24c3e5f009683834b34ee788d89cac4570c0d09fbb7205cb4c2bcb745def5e1
 DIST microsoft.extensions.objectpool.2.2.0.nupkg 32201 BLAKE2B ef4a3f19e6d6a5c8abc1e0eed91db937ea98b615605d05db8a2678063cbc1686fa057d96b28de732b6d185d9817f3839fb09f902ce3296c2b898a48a7ab98f9d SHA512 c954c18d32b3d4b2be3ae89e9b4dc498c35f78e1d9db3028a6d29e634418dcd00877c96e5938ff589a8692aaa27c3a54a420ea7f79bd44917e65fed40e72cd92
 DIST microsoft.extensions.options.8.0.0.nupkg 492963 BLAKE2B 7724b16d3cbcf0149a9a5a194254ca12103c9162b71f0e07994aeb22ba23a6f3119030d720f79b43dc1d96011ae3156dd003778aaadec4bcbc7526d46095f25b SHA512 1c004082a132e7b75a0c95acef3578a4d5db42c55e0996e40b95b663e9a83c5a20ed481a85db7567fff7e3de3dbba6a7d4fe5c825dc7ce95de956689afa16c5a
+DIST microsoft.extensions.options.8.0.2.nupkg 494417 BLAKE2B 05ba97879b2bb3c5a8c9296da11f6ea1ca365fe9856574f03b1c76e775510c25602ebbead9c8109de70fd3b3c65fc5794e90440698c311d17a2bc1de5db384b8 SHA512 cc0c10336580c9519740a042b1e42d391bcb32b63732163ae1161e1c5b55a4cd4a736e1902eb2a4dbb89d784b0acf584b5042b4f3481a61dd30a4e229fb523c5
 DIST microsoft.extensions.options.configurationextensions.8.0.0.nupkg 135412 BLAKE2B 049e740a869f8affe84b1b25572ae18e84879afee17bc0bd2fd5b629246dccbaa50463c41dc21e9cfe453190872eb69cf34e1951134c72a572b266830ee7af96 SHA512 5c32ae67ae4e873216bbbec15554778e0acbebc283862a2debcb11a995c42a5fd75f9436c8da421aa51bc5c12db4e6c4e82f12da1ff942bc5a6e1a8cf3c77a7d
 DIST microsoft.extensions.primitives.2.2.0.nupkg 43640 BLAKE2B 0ae9e474428dcd1b415baf799af9aba2de6b93c86322403732b4e14cd3323a7705746665459c9ed402535f42a167181dfce767d6fc1a3cdf95836ff27309aba5 SHA512 be91fea3b7fca1b571eb93e212d057c53c0be51a2c2bad1f348332ff2f16184e3faf822f02a406ba43b3321c6ca7ffc071cbddee49ae932413564a9561d683c8
 DIST microsoft.extensions.primitives.8.0.0.nupkg 209772 BLAKE2B 46a3392933c0b901d1c535d534f0f9501b63659fee1f83bed47e48b49aa0162da5af1b3190af401d709fa0d4b8bcde3f17f7e4e28f0141328a1a7446e4f81b45 SHA512 1f5475ca3d3ce18463456dd135afac502d6f82fea6e4e4814a61f86616c348decf28b73d15c2bb276d1a3c039ea6064f75e1329f6f3a64caa3520d70ab92c32d
@@ -103,6 +122,7 @@ DIST microsoft.testplatform.testhost.17.8.0.nupkg 2806274 BLAKE2B dff54d1c59a687
 DIST microsoft.testplatform.translationlayer.17.8.0.nupkg 1757887 BLAKE2B 166df9f44ef3b9cf3501d03df8d4b3c859cafed1bd3e9c624f25a414e10ce78d747da8a4902f03a8f4f5611a6da6393a2ebadcabcd2dc65f7db95e1427b228f7 SHA512 6ea234150a684841fb44550d08e3e62484416d1ca07b01e02af04aee141b41a0975f4af0fe661f15c844b1dc320196147d031082328b94c9174773bb5e804d3b
 DIST microsoft.visualstudio.threading.17.6.40.nupkg 1615534 BLAKE2B a3c8e442e218f6b855299270ff9143d10e9fe7ede6b12b1534d562de7cb64cfcfcf3855f639b2abefe8ff48a5497192ee504e911abe207a39716c97fba75413c SHA512 eae7c4297da137ebaffed98c41e62b99db1cf60a8e6fa11c5e1eadbb789c66864f407e96a4f305efca1c02f8dfd8f7e9bfdf316c92e0187207df8766bcdb047a
 DIST microsoft.visualstudio.threading.analyzers.17.6.40.nupkg 481311 BLAKE2B 739e3903c08d57ffe214715c8e1dedba8cb7a8f226d36837f6a7ea16cd623f372d0a1365a6100b6f660a133a21396314899dc5e16d3935e2e1b25cebeb14c887 SHA512 04f0e018feeaf4d8d925820c6cde2436510200f38332283bbfcb585abcd6d9595f5d6a543f75da751366aeb7507a6ad12006afd5b27f6b82336f82a0d9714926
+DIST microsoft.visualstudio.validation.17.0.71.nupkg 181438 BLAKE2B 78ad3030c308c210d569efdc948c9262e7f57b45383faefe2a42b8dbd9c5e7bad83b831257596047aab1e1de0ca440cb0b8dc13d2a67081836536319f66ae0f1 SHA512 02f78d7e561d7201378c69b9d6e04ae232727e7a51ccbf619b2fdad6447aa4b39baca8fa1245f85588297e5f8414998419ad13f4137eb97adecd9f112635b510
 DIST microsoft.visualstudio.validation.17.6.11.nupkg 329244 BLAKE2B c9f844f2ac036ab8bd3756cc06f374e15b529d00744dcbd78051a39a4c0876436caa67ea9f93308cb1cfdc806bb5be3c361909f515d837926d94df549ded2e46 SHA512 4e25ceca6eac1d8b6f311e5872f61dff6cb15b4dbc338cfc1e8076e6c7c949138d13627a111e246a2559d38001da785844a81174af63e7bee82b142243e82415
 DIST microsoft.win32.primitives.4.3.0.nupkg 63333 BLAKE2B 132ec29940d4b716110980c4f9a06ba15183d29de638379d09998124605165e51652b2727e3892b57dbc7cacfdc71f9e1b59c9dd5463a524657351f5385d896d SHA512 366f07a79d72f6d61c2b7c43eaa938dd68dfb6b83599d1f6e02089b136fa82bec74b6d54d6e03e08a3c612d51c5596e3535cbc2b29f39b97a827b3e7c79826f0
 DIST microsoft.win32.registry.5.0.0.nupkg 354731 BLAKE2B 3e98fbda73990aa8d4a8fe584d317ae59804c3ac40fb42194e332826b5be57ab78e563111dd3278a8099b9cd890d4e37f1bb74e6ec4a443edf7c783ea0cceb0b SHA512 471e66567ce59cc86475aece7815d05261264ce114e0c1688ba2551dd51494901fa72dd7a8f74f8e8f0f3dba74af8595f177552f3c06abb4bfce76692197076e
@@ -113,15 +133,25 @@ DIST netstandard.library.2.0.0.nupkg 3143842 BLAKE2B 7e3fc865e7893fb531b21e2ca79
 DIST netstandard.library.2.0.3.nupkg 3146139 BLAKE2B 311e5367398f76c74e78930bc2cd39e450a86bd8626311ded8d58bd84c94a8a84db3c11b2bc10f3eeba20a9d081fe7827981f702ad746b49ae3108c949ba1022 SHA512 e78f0cea69c14895b1b089644077dbce8631a626055d96522f4d29e061d8bfc3e48aa1419e74faf265b998612c03f721f5f0cef4690f824150a5689764dee601
 DIST newtonsoft.json.13.0.3.nupkg 2441966 BLAKE2B 0c83cd81b9eb647fd9106c5b8b7af4ff6b35eae4fa24712f16cef1db070857b072b9e40a52ed006a82125c860dc48b89ac54224baa24bfdedfa573183e19d169 SHA512 99b252bc77d1c5f5f7b51fd4ea7d5653e9961d7b3061cf9207f8643a9c7cc9965eebc84d6467f2989bb4723b1a244915cc232a78f894e8b748ca882a7c89fb92
 DIST nuget.common.6.11.0-rc.110.nupkg 158895 BLAKE2B 4524a74b374f4e72663a21fb41754f41c8eb989211ae3b9fb9950102cde1f74e24295227f20ddf67d97a35e800943ec141b58970665f0025906ef8d88308d604 SHA512 e04b9beb406f8ab6efb1fbf05969e09988b2053606fff5a422b0658e8f26158875c520207ebf389b69e3fedc3d37678013d761b113f717c8fe0e39e778822474
+DIST nuget.common.6.13.0-rc.95.nupkg 207564 BLAKE2B 80de6d6fb60911d6f9da99c941be7b7aa2811136defdc68aa88bc750b6f5084ac8692f74b3abe93323a6b5fdc5edd4c048b1236a4b6e84355ce502b941d6eb57 SHA512 be0c0ad64f5c9e9db79a37cb3b52110e965e35ab3cf87a490ee5bd343663f9aeb75a0ad51c3a5310c4a198a2981b2a398ee1dd56f1a6a0158a379e620752847b
 DIST nuget.configuration.6.11.0-rc.110.nupkg 191428 BLAKE2B b40dd939314df4b94783fac9ea261ca8a46d6cc2f2daf0515ca990ad7f1b394738f3a8f1454c0f25a25b16dca4402c5e89f401bec51b2cd8890c0701a87b5515 SHA512 f580fcc85f83adc3b19228046ce11032219c00dbade8b6278575d68de6f19c05275bba9e6bb73a4a7dfadb9d3df3bedb020feb1e2cd0ee2b4668521ac6bdd42e
+DIST nuget.configuration.6.13.0-rc.95.nupkg 236833 BLAKE2B 5d8f0ec024d4c5c160c9decfbb138531973a85da53f79927036d1f619586c2c1d5454e00d94166d476aacef017d9093dfccf48a04129e365bb36ae245f6dbb5e SHA512 8f75ade1e10d7cbf99ac47e777fbb24b172cf5f181c96cac242fbd0955f614c943f487f46f2e52de4244f955ebc6e5a0476d07f26c230d6eea2d5c934097c259
 DIST nuget.dependencyresolver.core.6.11.0-rc.110.nupkg 183318 BLAKE2B de18788b8b1f5302a93b7528e14906be55bcf4fe9fc77baff5daffdbde4742f6beb1e55ddcbc24892b7f553c597351eab4d8475b150ad0229e69368a3cdd11c9 SHA512 3934da237e3138b537466cf8a18163d241e8ea3d8aeb9f8db8d905128892c23b98c502342bb02edbfddbe97859d07e91b1cddba153eafd8f2a9f1f843782f8aa
+DIST nuget.dependencyresolver.core.6.13.0-rc.95.nupkg 221472 BLAKE2B 64a87e7109077a67d822b3301c5f509910aeae9f3730c1b324ace0c54d46a76aa8bb7e70c692742e8ccfca2f5e4eab1a448a891f9eb8f4eb362f83fb8c06984b SHA512 93880a9266384bbd17efb427340e89d24b1bf85f6bb91c91f452f8c5174afccb18b907ee29600cdbe24a61c982f5d69293967e3dfbe02b38902bc4eb85a73e5a
 DIST nuget.frameworks.6.11.0-rc.110.nupkg 157454 BLAKE2B 7520d897033731d9a00399490d0acd6cf122b5cca0fbe2752f3829578ae269ce66645826539a4ba20ba69ad4d9493625d5e031313048694a91023d7c148919ed SHA512 5cbe7004af3386c944ba8b76130c3bd93b08bee832a07741315307653cc94a6788fda2c67c56946b5f2aac0b6f71a070f0b5796da0ac05292ff5268cb832096a
+DIST nuget.frameworks.6.13.0-rc.95.nupkg 190126 BLAKE2B 5eca8445987d7a18f3dcec75bbe067295d434ae74f61125d1597f411e0f8f50495b2bab0958a911ff12d3c76ff798337f200fbfc1daeba1d37033303138bbf8e SHA512 da25d3439068f1100507bd13aaa8260c1e24985760713ea7c1bd7d9412bdbc8994e6d2461a3eeaaebaf2530497e89a862d042d5e79d545de7ce05843650a7a9a
 DIST nuget.librarymodel.6.11.0-rc.110.nupkg 90393 BLAKE2B 001b28160743205087911a2c1a56e443a92108c9b36b6022ee4610763e3e14e80684a985a9ee19abe3b1a105a9427e52bcb5603fc34f80dd220e8f837d8fb85b SHA512 9ab3e4d49e4f229dceef2f59e8820d369ba06efc3dbb7cdf4a7e0711aa377240123c2b49217d8c3bf6d7fb1a9fa2e08f56fef32b3ea04a799001888779280590
+DIST nuget.librarymodel.6.13.0-rc.95.nupkg 121806 BLAKE2B 4d9c9f06351cf1d0bc4733d883421f92058421d04b32e83e85d80e0165285de5e88ba000237e3c6a4ab4ddb589ac185c64fa1856ef2576cd2b2314720f627d6c SHA512 ad022237f546dd069e171526579ce5b9c06734f92ed355b2fe1fda92deac9db0451d04405985cd037aa5f3a391cb1c867996043ba47a4d791db899855ae5ce5f
 DIST nuget.packaging.6.11.0-rc.110.nupkg 833267 BLAKE2B 495ed68dfadb6974db3371df00bccb03de20758921c944f2ea61389276dc2d1ade683bba25ea2825adc85398bfb44c0d512acee8dcd8199a83a7df750c8abce0 SHA512 e2546e5456beefdcb0e7041103583157525e9987600eef0e313110dd4eac412965353066d919ac6ada32162d19c2f59ca7997b47252f23284667061b5395aa4d
+DIST nuget.packaging.6.13.0-rc.95.nupkg 1029613 BLAKE2B 0cb6c0ffae5971f54fac858ab23a5c62c4537f74bde3e967d93f7ff0f40b5da268b2960ab80f0f81deb48b72dadfb9de7fce410eaed322bb64cd1b5fa588a0fc SHA512 7606bb5957452af9a91bf3abb14a49feb021ab1f0d6ff2d98286ccd147c0ea30bac5bc2e842aef1c457472a7f631cf6bab4650f6c7cb44a080800c5a2e7d46d9
 DIST nuget.projectmodel.6.11.0-rc.110.nupkg 386746 BLAKE2B cd9283015510c32c447474a5c29655cc2fc2dfdc10da624e406c381cd635ebd2ba7e38a97b7d606ff8d3388bc4115dc7e790d377c2bcb4c26bf1a3e8bdf44950 SHA512 16426c3dcc46dfe7662d2b4060369cd559a102190bd8ad5cfb8687006cffcdd5e51596e6a84992ebbace0edc1d1da5190b17fe78cfac542615cf10e41ff49dfd
+DIST nuget.projectmodel.6.13.0-rc.95.nupkg 454438 BLAKE2B 666310d6d69fd8cea7d18bcfbc4199db4815e0f5ccef3f8d6d4eae87e3d9327a6478d6755dc653bc0cba2da2b892ab1b829ec26f760e68eaed2f4dfe021a70af SHA512 0f1e00697f78caa1ced6afff08ddd82a80f36c2ad9ae3e348f9153d7d55237cd303aca1fa381546ec12ce35d37763b1c92d47912cad726a8b259558503b56440
 DIST nuget.protocol.6.11.0-rc.110.nupkg 964864 BLAKE2B 6a6be8ee2555ce9f1d376c0a204e905ad2c7c1923354b70c8d2a4aeb6c0bf6543848d356d6dbadc3b72e7fe75c63cda84c0ef4aaa592984b0bfa08f43da5959f SHA512 49414ce90ce493b25cc4fde203ed340c2f1195c11cf9499199c1072fe6f5613250f1326b8f793a8933b56bb9452beec23bb7170d1cdeebce10849fc03630a207
+DIST nuget.protocol.6.13.0-rc.95.nupkg 1156386 BLAKE2B 31bfe5b0cd7ec3d85d905b01f1d375d0586b2fceeec046a8cb43e9afe7f5b279a5d686de6c080100239831c50aec287411020877e7dffeacaa6d2a310e68e4d9 SHA512 87c3088de135e3be85fefbbbbf290a39ed938d00f7c44f2615e873769ba123312e7cf1c54f2ae61c0772bcedd418f0381a7a00989b13c744a49b219893009e45
 DIST nuget.versioning.6.11.0-rc.110.nupkg 97131 BLAKE2B 8815f886d91ffd0e0e2ef15937cc9667b6d7adc2bb13c5253309fe8a56053acc8d2d24b5b5473174c8dd2ab214521bda812779135078d35f6a0833c0cde593a5 SHA512 7e41ee665455aed8ade67380b0dbd8eb93bad85a975630ecb27697e7f5995fa5fb60fb7ae1385f873092a5b224078732c4519d326e28b55692dac3f32c979645
+DIST nuget.versioning.6.13.0-rc.95.nupkg 136106 BLAKE2B 4b9ee6d746fd06841bcb375979608ab13748041652bc2250225602a496edc5970ff99c1135b2da28038275e766b9a64c6637cd0da9c078d01a0961e1ff540f4a SHA512 37713837bbc70bc3a54daaf6899f4c5b6d871789aec938fc216ded798835bf2179fc7c547c5f33b6077207f9728567e4db12415e128ed2e1c298fce69733af81
 DIST omnisharp-roslyn-1.39.12.tar.gz 605459 BLAKE2B 8ed65fcfa918d52fc56310f5c5ada594cae497d89026746608d69ecbc8187c7345b8e7f1dad847e9ea60fd829893cbe1113079f4c2d33ea44e3497bec7aa5828 SHA512 8d17dc4294e202dd42904621408075ed15ba10f4aaa157fe4f215fffc93e5bfbd672f3850f5aa77b5b5328ad98bfd6744d34d008a40746e9181e7f0a77219d2b
+DIST omnisharp-roslyn-1.39.13.tar.gz 605129 BLAKE2B 6e8ed42f5a1b8c97346b3c73d486fec53e0224dc21adbe2c80d1f5e7fa4a0b72a3efa2b75ff51a6057c111634c765b587b598aa21b36932d00211695687fe3d6 SHA512 a5415c79ad203facf166df4e88bb143d2fb94ddc187f62023c9db79a26280d794e2d2887cc95f10d79c3fcaed48b6fe8f4e70bf60c20c5990ecc171f2b575dc9
 DIST omnisharp.extensions.jsonrpc.0.19.9.nupkg 2141635 BLAKE2B 052c5d1faee44844b2f182acbcbd1e08f5620aab6aa59b87b9585c80bc290e6de3888d5ebd0cb67fe8a6803f4d7dee6e1f61d4c9ca331d33d758d6106e9b20fe SHA512 c03f3b91e188a80d2877a599bfa387d9b72469d8ab32c8e46db5373419143764142929b96d0d0cbe37c3e22a9947ae222a91a3ecd68c9bd9dbd2f6637c608332
 DIST omnisharp.extensions.jsonrpc.generators.0.19.9.nupkg 213898 BLAKE2B 48844276787e6a59181501b809215c98d1de9d987095a2287b70fa022d6a9c1a625caef1c6de390ba957a7c4c420826f10e0aec8e30318fbf95ffcf54444cb24 SHA512 f44fe80538df1c4059d440b171e02214e294e1ffb34f90a6d6c5724c5739c2bfa5e48b81210f4f122b47760b52e8eda396f25b8f49a9e74573d855b154dba0c9
 DIST omnisharp.extensions.jsonrpc.testing.0.19.9.nupkg 97740 BLAKE2B e3308f337a10f08149cc0021811a18707706abb69e1fd6afda525b6fa0281da7897f67811c46ced802c256d851378f1e5f35a79723adb480c25cf5b9271a2835 SHA512 7d518ae21b8acf3b392077c1af9d85e5ed5de9d004391646c560836e8dcc53b9e5a5a58e3eb57544927a36c3cdae12216901a5e4e46dfbaafde8d2a8e05796c5
@@ -176,11 +206,13 @@ DIST system.diagnostics.debug.4.3.0.nupkg 149774 BLAKE2B bdb6d5ee3b8ca4f28b241b0
 DIST system.diagnostics.diagnosticsource.4.3.0.nupkg 120125 BLAKE2B 33f203d8ffc39e0c38599eee625053beae160a0aebe6fbfaaafdc85b570c7b82e3aae281092014e90d10fad7083f37afbb546ad5a0c74a94843ae9b1e9fe85f1 SHA512 8f54df5ff382b6650e2e10d1043863a24bf49ff0714e779e837cd7073e46fb2635bcfcdcf99d7c4a9d95f35ebffd86ab0ca068305f4b245072e08303b917b34d
 DIST system.diagnostics.diagnosticsource.4.5.0.nupkg 154861 BLAKE2B 1f47e575abbc06b911b6e336acc00d2b34c02cdaf767e803381cb46bcdb37ce71e3079ebed612abab8e4c3b29bb580dd69bffdc8d665636cd2df15507fdb3fc4 SHA512 ce0c1ba14980f9b8537be4a4f9c2daaaa1c70ef74cdafd116bffd2b7ca48cf1f3e449795ff517548d1a42c27fe9a8f9e66ffbe1c9fd11ba1d628d822ac937634
 DIST system.diagnostics.diagnosticsource.8.0.0.nupkg 516197 BLAKE2B 58ac0227689ab648e6cc9f01a63bb163a3f8c19a9d69fa534cab3045fbdec895dedf9b33d35641457eae96fe9304f1b96ae75a02c83783c991fc6968fc4604a4 SHA512 86e32c62e9773dba192a63bff0e2ffcd57826ed1123c9261fa8c9229f9d1dc26962b3740fb025f6ad5c139162575a6c493b213a9ef3fc1747d15ca0edd0c5878
+DIST system.diagnostics.diagnosticsource.8.0.1.nupkg 517990 BLAKE2B 380c30a5f17fcb1747acecf72477fa3e46feefbf9fa43ca73330262a6ef916d1850cdb63c2554bcb0b52e0bb11b3bd7853a1035202eb6b6454929747d7447741 SHA512 0437300281f6df9a9fb414058be81b953193c59ac35d8f3321ea1230bd3e323657bea4bff1747e68e71d271b5ee758c8e599c25ed246eb09e6537e1c1e3cb8e4
 DIST system.diagnostics.eventlog.8.0.0.nupkg 535543 BLAKE2B 413083dc5795fcc436dabc463a936413445f9486c1ade6b48845af9532df5a95e9a8159e47706abcb0011289d6e8bde38c165817d99becb1010e1f07502667d4 SHA512 ba6e7f27323a92a50a768457e2ab48accaa5dfa0ba19082ca71da7b473b71cd3b6dd036e442e109fc15efbb4c267881a9844097ae4eddc3cb887152c8c9511a5
 DIST system.diagnostics.tools.4.3.0.nupkg 67227 BLAKE2B f03928755ec84fd360b2a8a0de3f39e57322cafc4be9e7fa6b7a67d606de9c0869688f62f6b7c9a2ee2915c424ab20779ac87ff510637a9bba740ba0361e6041 SHA512 164d6977e721cbceb44ede7bfd75b03b8d9771e0426aefa5d40c71867e964092fdc6a6808bcbc5559ed73ec2c532ca657d6476af79a49ca3ad879b8366f13d90
 DIST system.diagnostics.tracing.4.3.0.nupkg 581864 BLAKE2B e09e616dff7879932b358746a62b530499aa61726c4490c56d2d7a0bf888db5b42d75d89cc5befc9fdb6af231beff998b6b243c2b2a08084da089709e0c82a75 SHA512 d0a5d30e261cd45b7dfab02b7ffbd76b64e0c9b892ed826ea61481c983c0208b05b69981cd79e91cd4e5811e1cd4c3cea06a1afce05811ece58be5e4c20169ea
 DIST system.drawing.common.6.0.0.nupkg 1114589 BLAKE2B bc4dac5dbd2504c355cd745a5559d3b5f2d1c59a9e0535c60ba97e12e84845541c8b606e15db6aa99052329950c0f58604779e5535251f20e960bf7c939ace43 SHA512 d61f0a3e01c3eac15f13fc1ba04a2c7ce4eac956400b2faa361fecabd3836d49d5bd344f3985ee3d94cdc3f6a72b8e07e423cdb2965b4f5ca2222b5de32988e4
 DIST system.formats.asn1.6.0.0.nupkg 182980 BLAKE2B dc3180f322e0c7992a3b951d7f08b631b8d3a14abe1aef2f7b8efebc4da32161760ace9189a2df2e41d2fb2d98844ae9ce3df5cbabd3e7e0f6341625f2ebca27 SHA512 eb660feb32e7be616d148deb8f26dbae749e2ba8474026857c925fa0d850aab1132413de852b9c43123242ce56f861815bfae94970ffd0da8d5bb9adb4859784
+DIST system.formats.asn1.8.0.1.nupkg 328435 BLAKE2B 7e88affd2ce8dfa727ca4fb682d5bc72b9b36eeaf6ade8916142408abcf462eca777e6ea318a3c0952ea322c1c88ec3dc936c39ff56f7926f6eb6946b50fc4d8 SHA512 066308a53e92126161627b52c968c4575e2e4dd3e3d757323f36aa9f79ebfafe267114ada51439837b227a776f00369f80e19ebc07482820e6c28a89eb3910ee
 DIST system.globalization.4.3.0.nupkg 589136 BLAKE2B 7b07f9b68f0744ddcfa3f0db6190c1a0696c2f89f8c5e92922ac20fc4155e22d97e7191bf7866c9b58acec056bff08531b0adacccaec7d4301e1d4b149fa511f SHA512 823d2ba308cb073b40a3146ecccd0d9fd7b1615ac3fbefb16f73d873e411fd81c3bdc87df206d3dc7e2f14c9cd53aafca684a3570c25471280aada8de805ece2
 DIST system.globalization.calendars.4.3.0.nupkg 177689 BLAKE2B b70b5d9e545835e5a3fe4c703b2bd7c857968ba1fcae5299c9c41d550338914f2ad9d168948018fa7da7271d62a3b9d2ad1e696d334ee7d3fdaefd25395aa64c SHA512 e97190231402b393774b925efc02a2bfa41d1d117a17fb87da6e399f5234546962767e9cd8f39970efa408e4f453cd1e6751a2a61e366bc97406e1b0b8a4be86
 DIST system.globalization.extensions.4.3.0.nupkg 142949 BLAKE2B 4eb77d4ce5af01136145ea867e9d6cc81181b36a178ff487905dd7d7c6a4986c518675af68eac0e854347503e11513056173a93e6803683f3fddee7677b88e05 SHA512 a4d360003f95e0c31edf39c0b91e1c73850a60ac5d0032b17db888a3c7d7134cef9acd97219d14174ad213b7c044f49b364cc5720073ebfcb6e1bf6e4ec24ce5
@@ -236,6 +268,7 @@ DIST system.security.cryptography.cng.4.5.0.nupkg 650063 BLAKE2B 2c091cf9c838546
 DIST system.security.cryptography.csp.4.3.0.nupkg 117553 BLAKE2B 93f32c719f999c566ac7ebc486854778051ca885632a3ecf5b50af05a700df092a0e13ce08f16c854aee3ef06bc27fc61e6b03f79f3170eeb2bcce7e22d9728f SHA512 43317591747a18f52f683187e09adfe0e03573e6dac430bf3ba13f440cdb1c7bb1f9205369d5f3b2a0f3fdf9604d5ba1e6d94a899a25d2c533e453338578f351
 DIST system.security.cryptography.encoding.4.3.0.nupkg 144382 BLAKE2B 9f8e6a4ce5fe2a4de2be0c827e914a02a257011b508e97e289b9de4657b598fdbba4e64dcf23a29af6e4910af41e62f3b3f0d6a2156ab691e2e00ad76c6499ef SHA512 5c26add23e63542f37506f5fa1f72e8980f03743d529cd8e583d1054b8d8a579fb773fa035a00d9073db84db6be4f47cac340d1ebc6d23dd761dbdbd600075e0
 DIST system.security.cryptography.openssl.4.3.0.nupkg 71949 BLAKE2B ec1654bbd09e1244d260d1ddbefcbdeed207816a2719f3bb0f055a7a140d466f186667b1f202e0d1a3eda97f247d2c1776ad6f38f50de58960da5f0dfd2a2d08 SHA512 64530a19489730f873f8c68e6b245135ea260c02d68591880261768358d0145795132ba5ee877741822ff05dcd0c61edca27696ef99e8f9302a21cadf3b1329f
+DIST system.security.cryptography.pkcs.6.0.0.nupkg 929575 BLAKE2B 42f2f37976fa17b2c9983f8dda35d6df1429f3fd2a2cf3c77b3057e26009473fd5f5120ef647efc0d53bd4f9e6c6b3b55ed2cc8823a374d3a695c42038730852 SHA512 e86310994a8bfd6eb113d7dab4ff60e3d19ac4d7064f59c2f93bcac5265dafb580341818c649a09f643ee022b1fc6728fef05015c60ebe0055f87f365c27b34d
 DIST system.security.cryptography.pkcs.6.0.1.nupkg 944296 BLAKE2B 5768e704e1b3a23f6e3859cc3249a0fb66af79e00c8c4eb18c54ec6d7fa899f7113953340ea23aef3bf967029521adbdd68def3079baf15f428c0711c85a269d SHA512 b9bc7166dd27f6df177bf36d379dd731fe9949f44ab24fd3fa685e0eea196d8ac12512d5c90e2979c5e844e8a197f0f20bdb953ade90ade8f02c0c7545a8f5c2
 DIST system.security.cryptography.pkcs.6.0.4.nupkg 1093766 BLAKE2B 9801c9b4355aae21c932163ae77963a97cb9cc52fee7d4e3a8bcf572032c0dbc9b9954cd2c1050c6ee353e4b1e51a6e441d350bba45ff456098b1096d12655d9 SHA512 db8bba63d2ff4b9bd7a35abaa754296000efd9de8ac6585564c5a1241ec782fa193f12e56807e717e62522bb77f127c6034b43af28fa62e599149d49290979a2
 DIST system.security.cryptography.primitives.4.3.0.nupkg 81382 BLAKE2B 55bcbe3143e85d24f47c72ec5e1f0ad38a1f931932b3a8a03dc00028668fc085d070dfcded55654e09328a745b208b9f15928aaff1087d8906bad41d7cfb23e0 SHA512 5ad8273f998ebb9cca2f7bd03143d3f6d57b5d560657b26d6f4e78d038010fb30c379a23a27c08730f15c9b66f4ba565a06984ec246dfc79acf1a741b0dd4347
@@ -252,6 +285,7 @@ DIST system.text.encoding.extensions.4.3.0.nupkg 244195 BLAKE2B 9dc2fbf672e07c53
 DIST system.text.encodings.web.4.5.0.nupkg 97043 BLAKE2B ba7b2b2acfb793c7df1645cc03440d5aeb70b44766d286c092aa94f7fc36a69ed318c29c6258f895816ef482f9d5627c04c0d476d37fc13278d511a9125d8503 SHA512 f802fbbcfe00a5f552092c6987033f7cd794a7b8a3ed6fc6b9b7378c12bdc081b94a7ced869447a4a79322eb47457973ba497daa07c6a94ca64388cf9282a279
 DIST system.text.encodings.web.8.0.0.nupkg 374440 BLAKE2B 97211e710df3dcd17932f168e254806d7c8692ac01d667a2e89a5ddc956b24fba8467fbc2d451057757b5c502442d2c91bcaf0f867da7e95456b2aa18136b354 SHA512 ba0822c38c3b658aba9495642d269e882b827e3be4ad2dc1426d8a97d3cbc5a2277c5f80847d0cb9381078af01523328c4992caa058146d5d8ee6b8a08609c32
 DIST system.text.json.8.0.4.nupkg 1981785 BLAKE2B 32eaece9756c948453589d13f596d2481e8d7150f1c970f2cbc04aa9ab8ab399795e6ead5c16b47198113f10f43ef4407e613286fd55538de3f172885dd6be93 SHA512 9f87ee2a39ba4f602a2b3ec7584b8aa2c03a7f6db1e303f48224dbc139ddbf3cb10190be04efe1d1592b0bf5b2fd97f6d8f88fd492a45f778b84fd3e613acb00
+DIST system.text.json.8.0.5.nupkg 1986315 BLAKE2B bc96765a19fd097c5aed6605f83f5236adbf75204a9da6a9ee2ce28372ca84abe87c8e0e0885d0b4d66e7937a14c582752ea353b7d53c5817e2738d1c2e5f8ae SHA512 13589021ae3e81f54c877abf613ce931cc24ca57bf127af1063ccc1eb4dc57a6cc223a61e6452207f5d0dce453b6627430e31e4143c78e71e9b5dd647f680abf
 DIST system.text.regularexpressions.4.3.0.nupkg 530523 BLAKE2B fc77aa0a92658cfac1b3fc00b87fabbec1be5c79776b0b2680775615b273a5a49ff8d5000f97415b85fc0283ff95569ba9a5a72917828455646053033088b49b SHA512 80353c148df30d9a2c03ee10a624d91b64d7ccc3218cb966344cfa70657f0b59c867fed2ab94057f64ab281ad9318353f25c23375c00e1376b6589ae0a70aad3
 DIST system.threading.4.3.0.nupkg 708088 BLAKE2B 004d01762fad35a4607522d974a0cdc3d0049c82fe704f2f86fb98ee81059ebb56d13c290fcd273d1067a1a7c7f17bf3259d4d7e802c1d09a95e3c5fa29ef3f3 SHA512 97a2751bdce69faaf9c54f834a9fd5c60c7a786faa52f420769828dbc9b5804c1f3721ba1ea945ea1d844835d909810f9e782c9a44d0faaecccb230c4cd95a88
 DIST system.threading.channels.6.0.0.nupkg 181030 BLAKE2B 39e46b792436d972c61fe0e35d0375622488290de97ec9f7b905349faa5152d38f6104eab5f16511fc51bbe50164f42d3cd1ce073ba024e25859b19f114424be SHA512 32adff895c57ab9ef864cf89660403f041b07841be7c44a0c3c2c8451a1da076a8c1b4dcf1c993b585304ad7549afa408a0f797ad6814d0f14eb748a1fc9ce03
diff --git a/dev-dotnet/omnisharp-roslyn/omnisharp-roslyn-1.39.13.ebuild b/dev-dotnet/omnisharp-roslyn/omnisharp-roslyn-1.39.13.ebuild
new file mode 100644
index 000000000000..827fb6319bdb
--- /dev/null
+++ b/dev-dotnet/omnisharp-roslyn/omnisharp-roslyn-1.39.13.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOTNET_PKG_COMPAT="9.0"
+NUGET_APIS=(
+	"https://api.nuget.org/v3-flatcontainer"
+	"https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/flat2"
+)
+NUGETS="
+benchmarkdotnet.annotations@0.13.10
+benchmarkdotnet.diagnostics.windows@0.13.10
+benchmarkdotnet@0.13.10
+cake.scripting.abstractions@0.16.0
+cake.scripting.transport@0.16.0
+commandlineparser@2.9.1
+diffplex@1.7.2
+dotnet.script.dependencymodel.nuget@1.5.0
+dotnet.script.dependencymodel@1.5.0
+gee.external.capstone@2.3.0
+humanizer.core@2.14.1
+iced@1.17.0
+icsharpcode.decompiler@8.2.0.7535
+mcmaster.extensions.commandlineutils@4.1.0
+mediatr@8.1.0
+microsoft.aspnetcore.connections.abstractions@2.2.0
+microsoft.aspnetcore.diagnostics.abstractions@2.2.0
+microsoft.aspnetcore.diagnostics@2.2.0
+microsoft.aspnetcore.hosting.abstractions@2.2.0
+microsoft.aspnetcore.hosting.server.abstractions@2.2.0
+microsoft.aspnetcore.hosting@2.2.0
+microsoft.aspnetcore.http.abstractions@2.2.0
+microsoft.aspnetcore.http.extensions@2.2.0
+microsoft.aspnetcore.http.features@2.2.0
+microsoft.aspnetcore.http@2.2.0
+microsoft.aspnetcore.server.kestrel.core@2.2.0
+microsoft.aspnetcore.server.kestrel.https@2.2.0
+microsoft.aspnetcore.server.kestrel.transport.abstractions@2.2.0
+microsoft.aspnetcore.server.kestrel.transport.sockets@2.2.0
+microsoft.aspnetcore.server.kestrel@2.2.0
+microsoft.aspnetcore.webutilities@2.2.0
+microsoft.bcl.asyncinterfaces@1.1.0
+microsoft.bcl.asyncinterfaces@7.0.0
+microsoft.bcl.asyncinterfaces@8.0.0
+microsoft.build.framework@17.3.2
+microsoft.build.locator@1.6.10
+microsoft.build.tasks.core@17.3.2
+microsoft.build.utilities.core@17.3.2
+microsoft.build@17.3.2
+microsoft.codeanalysis.analyzers@3.11.0
+microsoft.codeanalysis.analyzerutilities@3.3.0
+microsoft.codeanalysis.common@4.13.0-3.24620.4
+microsoft.codeanalysis.csharp.features@4.13.0-3.24620.4
+microsoft.codeanalysis.csharp.scripting@4.13.0-3.24620.4
+microsoft.codeanalysis.csharp.workspaces@4.13.0-3.24620.4
+microsoft.codeanalysis.csharp@4.13.0-3.24620.4
+microsoft.codeanalysis.elfie@1.0.0
+microsoft.codeanalysis.externalaccess.aspnetcore@4.13.0-3.24620.4
+microsoft.codeanalysis.externalaccess.omnisharp.csharp@4.13.0-3.24620.4
+microsoft.codeanalysis.externalaccess.omnisharp@4.13.0-3.24620.4
+microsoft.codeanalysis.features@4.13.0-3.24620.4
+microsoft.codeanalysis.scripting.common@4.13.0-3.24620.4
+microsoft.codeanalysis.workspaces.common@4.13.0-3.24620.4
+microsoft.codecoverage@17.8.0
+microsoft.csharp@4.7.0
+microsoft.diagnostics.netcore.client@0.2.251802
+microsoft.diagnostics.runtime@2.2.332302
+microsoft.diagnostics.tracing.traceevent@3.0.2
+microsoft.diasymreader@2.0.0
+microsoft.dotnet.platformabstractions@3.1.6
+microsoft.extensions.caching.abstractions@8.0.0
+microsoft.extensions.caching.memory@8.0.1
+microsoft.extensions.configuration.abstractions@2.2.0
+microsoft.extensions.configuration.abstractions@8.0.0
+microsoft.extensions.configuration.binder@8.0.0
+microsoft.extensions.configuration.commandline@8.0.0
+microsoft.extensions.configuration.environmentvariables@8.0.0
+microsoft.extensions.configuration.fileextensions@2.2.0
+microsoft.extensions.configuration.fileextensions@8.0.0
+microsoft.extensions.configuration.json@8.0.0
+microsoft.extensions.configuration@8.0.0
+microsoft.extensions.dependencyinjection.abstractions@2.2.0
+microsoft.extensions.dependencyinjection.abstractions@8.0.0
+microsoft.extensions.dependencyinjection.abstractions@8.0.2
+microsoft.extensions.dependencyinjection@8.0.0
+microsoft.extensions.dependencymodel@8.0.0
+microsoft.extensions.fileproviders.abstractions@2.2.0
+microsoft.extensions.fileproviders.abstractions@8.0.0
+microsoft.extensions.fileproviders.physical@8.0.0
+microsoft.extensions.filesystemglobbing@8.0.0
+microsoft.extensions.hosting.abstractions@2.2.0
+microsoft.extensions.logging.abstractions@2.2.0
+microsoft.extensions.logging.abstractions@8.0.0
+microsoft.extensions.logging.abstractions@8.0.2
+microsoft.extensions.logging.configuration@8.0.0
+microsoft.extensions.logging.console@8.0.0
+microsoft.extensions.logging@8.0.0
+microsoft.extensions.objectpool@2.2.0
+microsoft.extensions.options.configurationextensions@8.0.0
+microsoft.extensions.options@8.0.2
+microsoft.extensions.primitives@2.2.0
+microsoft.extensions.primitives@8.0.0
+microsoft.io.redist@6.0.0
+microsoft.net.http.headers@2.2.0
+microsoft.net.stringtools@17.3.2
+microsoft.net.test.sdk@17.8.0
+microsoft.netcore.platforms@1.1.0
+microsoft.netcore.platforms@5.0.0
+microsoft.netframework.referenceassemblies.net472@1.0.3
+microsoft.netframework.referenceassemblies@1.0.3
+microsoft.testplatform.objectmodel@17.8.0
+microsoft.testplatform.testhost@17.8.0
+microsoft.testplatform.translationlayer@17.8.0
+microsoft.visualstudio.threading.analyzers@17.6.40
+microsoft.visualstudio.threading@17.6.40
+microsoft.visualstudio.validation@17.0.71
+microsoft.visualstudio.validation@17.6.11
+microsoft.win32.primitives@4.3.0
+microsoft.win32.registry@5.0.0
+microsoft.win32.systemevents@6.0.0
+nerdbank.streams@2.10.69
+netstandard.library@1.6.1
+netstandard.library@2.0.0
+netstandard.library@2.0.3
+newtonsoft.json@13.0.3
+nuget.common@6.13.0-rc.95
+nuget.configuration@6.13.0-rc.95
+nuget.dependencyresolver.core@6.13.0-rc.95
+nuget.frameworks@6.13.0-rc.95
+nuget.librarymodel@6.13.0-rc.95
+nuget.packaging@6.13.0-rc.95
+nuget.projectmodel@6.13.0-rc.95
+nuget.protocol@6.13.0-rc.95
+nuget.versioning@6.13.0-rc.95
+omnisharp.extensions.jsonrpc.generators@0.19.9
+omnisharp.extensions.jsonrpc.testing@0.19.9
+omnisharp.extensions.jsonrpc@0.19.9
+omnisharp.extensions.languageclient@0.19.9
+omnisharp.extensions.languageprotocol.testing@0.19.9
+omnisharp.extensions.languageprotocol@0.19.9
+omnisharp.extensions.languageserver.shared@0.19.9
+omnisharp.extensions.languageserver@0.19.9
+perfolizer@0.2.1
+sqlitepclraw.bundle_green@2.1.8
+sqlitepclraw.core@2.1.8
+sqlitepclraw.lib.e_sqlite3@2.1.8
+sqlitepclraw.provider.dynamic_cdecl@2.1.8
+sqlitepclraw.provider.e_sqlite3@2.1.8
+system.appcontext@4.3.0
+system.buffers@4.5.0
+system.buffers@4.5.1
+system.codedom@6.0.0
+system.collections.concurrent@4.3.0
+system.collections.immutable@8.0.0
+system.collections@4.3.0
+system.componentmodel.annotations@5.0.0
+system.componentmodel.composition@8.0.0
+system.composition.attributedmodel@8.0.0
+system.composition.convention@8.0.0
+system.composition.hosting@8.0.0
+system.composition.runtime@8.0.0
+system.composition.typedparts@8.0.0
+system.composition@8.0.0
+system.configuration.configurationmanager@8.0.0
+system.console@4.3.0
+system.data.datasetextensions@4.5.0
+system.diagnostics.debug@4.3.0
+system.diagnostics.diagnosticsource@4.5.0
+system.diagnostics.diagnosticsource@8.0.0
+system.diagnostics.diagnosticsource@8.0.1
+system.diagnostics.eventlog@8.0.0
+system.diagnostics.tools@4.3.0
+system.diagnostics.tracing@4.3.0
+system.drawing.common@6.0.0
+system.formats.asn1@6.0.0
+system.formats.asn1@8.0.1
+system.globalization.calendars@4.3.0
+system.globalization@4.3.0
+system.io.compression.zipfile@4.3.0
+system.io.compression@4.3.0
+system.io.filesystem.primitives@4.3.0
+system.io.filesystem@4.3.0
+system.io.pipelines@4.5.2
+system.io.pipelines@7.0.0
+system.io.pipelines@8.0.0
+system.io@4.3.0
+system.linq.expressions@4.3.0
+system.linq@4.3.0
+system.management@5.0.0
+system.memory@4.5.5
+system.net.http@4.3.0
+system.net.primitives@4.3.0
+system.net.sockets@4.3.0
+system.numerics.vectors@4.4.0
+system.numerics.vectors@4.5.0
+system.objectmodel@4.3.0
+system.reactive@6.0.0
+system.reflection.emit.lightweight@4.7.0
+system.reflection.emit@4.7.0
+system.reflection.extensions@4.3.0
+system.reflection.metadata@8.0.0
+system.reflection.metadataloadcontext@6.0.0
+system.reflection.primitives@4.3.0
+system.reflection@4.3.0
+system.resources.extensions@6.0.0
+system.resources.resourcemanager@4.3.0
+system.runtime.compilerservices.unsafe@4.5.0
+system.runtime.compilerservices.unsafe@4.5.1
+system.runtime.compilerservices.unsafe@4.5.3
+system.runtime.compilerservices.unsafe@5.0.0
+system.runtime.compilerservices.unsafe@6.0.0
+system.runtime.extensions@4.3.0
+system.runtime.handles@4.3.0
+system.runtime.interopservices.runtimeinformation@4.0.0
+system.runtime.interopservices.runtimeinformation@4.3.0
+system.runtime.interopservices@4.3.0
+system.runtime.numerics@4.3.0
+system.runtime@4.3.0
+system.security.accesscontrol@5.0.0
+system.security.accesscontrol@6.0.0
+system.security.cryptography.algorithms@4.3.0
+system.security.cryptography.cng@4.5.0
+system.security.cryptography.encoding@4.3.0
+system.security.cryptography.pkcs@6.0.0
+system.security.cryptography.pkcs@6.0.1
+system.security.cryptography.pkcs@6.0.4
+system.security.cryptography.primitives@4.3.0
+system.security.cryptography.protecteddata@4.4.0
+system.security.cryptography.protecteddata@8.0.0
+system.security.cryptography.x509certificates@4.3.0
+system.security.cryptography.xml@6.0.0
+system.security.permissions@6.0.0
+system.security.principal.windows@5.0.0
+system.text.encoding.codepages@6.0.0
+system.text.encoding.codepages@7.0.0
+system.text.encoding.extensions@4.3.0
+system.text.encoding@4.3.0
+system.text.encodings.web@4.5.0
+system.text.encodings.web@8.0.0
+system.text.json@8.0.5
+system.text.regularexpressions@4.3.0
+system.threading.channels@6.0.0
+system.threading.channels@7.0.0
+system.threading.tasks.dataflow@8.0.0
+system.threading.tasks.extensions@4.5.1
+system.threading.tasks.extensions@4.5.4
+system.threading.tasks@4.3.0
+system.threading.timer@4.3.0
+system.threading@4.3.0
+system.valuetuple@4.5.0
+system.windows.extensions@6.0.0
+system.xml.readerwriter@4.3.0
+system.xml.xdocument@4.3.0
+xunit.abstractions@2.0.3
+xunit.analyzers@1.4.0
+xunit.assert@2.6.1
+xunit.core@2.6.1
+xunit.extensibility.core@2.6.1
+xunit.extensibility.execution@2.6.1
+xunit.runner.visualstudio@2.5.4
+xunit@2.6.1
+"
+
+inherit check-reqs dotnet-pkg
+
+DESCRIPTION="OmniSharp server (HTTP, STDIO) based on Roslyn workspaces"
+HOMEPAGE="https://www.omnisharp.net/
+	https://github.com/OmniSharp/omnisharp-roslyn/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/OmniSharp/${PN}.git"
+else
+	SRC_URI="https://github.com/OmniSharp/${PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+SRC_URI+=" ${NUGET_URIS} "
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="test"  # Tests fail.
+
+CHECKREQS_DISK_BUILD="2G"
+DOTNET_PKG_PROJECTS=( src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj )
+
+# These flags are set by Cake build script, except the removed below.
+DOTNET_PKG_RESTORE_EXTRA_ARGS=(
+	-p:AssemblyVersion="${PV}.0"
+	-p:FileVersion="${PV}.0"
+	-p:InformationalVersion="${PV}"
+	-p:PackageVersion="${PV}"
+	-p:RollForward="Major"
+)
+DOTNET_PKG_BUILD_EXTRA_ARGS=(
+	"${DOTNET_PKG_RESTORE_EXTRA_ARGS[@]}"
+	--framework net6.0
+)
+DOTNET_PKG_TEST_EXTRA_ARGS=( "${DOTNET_PKG_RESTORE_EXTRA_ARGS[@]}" )
+
+DOCS=( CHANGELOG.md README.md )
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	dotnet-pkg_pkg_setup
+}
+
+src_unpack() {
+	dotnet-pkg_src_unpack
+
+	if [[ -n "${EGIT_REPO_URI}" ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	sed -i ./*/*/*.csproj \
+		-e "/.*<RuntimeIdentifiers>.*/d" \
+		-e "/.*<RuntimeFrameworkVersion>.*/d" \
+		|| die
+	find "${S}" -type f -iname "nuget.config" -exec rm -v {} + || die
+
+	dotnet-pkg_src_prepare
+}
+
+src_install() {
+	dotnet-pkg-base_install
+	dotnet-pkg-base_dolauncher "/usr/share/${P}/OmniSharp" OmniSharp
+
+	einstalldocs
+}
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index 558ae5bb4b79..ad5c0cfa2e83 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,2 +1,3 @@
 DIST esptool-4.6.2.tar.gz 7003860 BLAKE2B 051689dbc2194e1ed08467f9ec82e3a48e31cf62c25b83f97e3b05a1d203c9dda120cbb11a40bb61efe076ae8449d0b9b4742b19d59efef205132f05d16130a5 SHA512 97cc9f4d92b479351089fac59aed08f9519ff76d994ddae601da8e39b988f4bb90dc3885bf30b7998e2575a0365a5f0eef85f16a28b12eb944eec1e9f5265c6c
 DIST esptool-4.7.0.tar.gz 7045501 BLAKE2B 468d83db541e632296e9b465d54764dc5e966f54709b66b0af2675d8fbd6d0bcd70fb18584887f3dc4d45bd0550b65a0da58d0c6bc318962b8798017b4ab0b63 SHA512 dda2af5d9b2f8a4ec5706eaf58021e95094c152380c732074809c370a5d1bfaeb424cb27f69a3b980dec83ae9c4c9ee1eddfeb0a7990c3b1f1494160a2d369cc
+DIST esptool-4.8.1.tar.gz 6933695 BLAKE2B ffd8e6aa4c8460765b21c3542b9e953a4e0810e88e1771f02c80ed7145b20623d4b3922268680cc250c64422ab8b90920261af5ef56b9abc14b60b6a10cb6c59 SHA512 21fe654826a38ba40fe128eadde1ad92c22e5a011651ce0f8eb5806358c9f0b33f185fe760c1a3eee19cb59b894531ebea8213498841f0a1c0724048ec88d213
diff --git a/dev-embedded/esptool/esptool-4.8.1.ebuild b/dev-embedded/esptool/esptool-4.8.1.ebuild
new file mode 100644
index 000000000000..8036d355abd6
--- /dev/null
+++ b/dev-embedded/esptool/esptool-4.8.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
+HOMEPAGE="https://github.com/espressif/esptool"
+SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/bitstring[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/ecdsa-0.16.0[${PYTHON_USEDEP}]
+		dev-python/intelhex[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/reedsolo[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/wheel[${PYTHON_USEDEP}]
+	')
+	test? ( $(python_gen_cond_dep '
+		dev-python/cffi[${PYTHON_USEDEP}]
+		dev-python/pyelftools[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	') )
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# need real hardware connected
+	test/test_esptool.py
+	test/test_espefuse.py
+	test/test_esptool_sdm.py
+	# need network
+	test/test_uf2_ids.py
+)
+
+src_prepare() {
+	default
+
+	# test_espsecure_hsm.py needs setup of a "Soft HSM" or real hardware. remove.
+	rm test/test_espsecure_hsm.py || die
+}
+
+pkg_postinst() {
+	if ver_test ${REPLACING_VERSIONS} -lt 4; then
+		ewarn "${P} - new 4.x release with breaking changes:"
+		ewarn "  - Public API has been defined by limiting access to internals that have been refactored into multiple source files"
+		ewarn "  - If active security features are detected, the default behavior changes to prevent unintentional bricking"
+		ewarn "  - Flash parameters in an image header can now be changed only when no SHA256 digest is appended"
+		ewarn "  - The ESP8684 alias has been removed, ESP32-C2 has to be used"
+		ewarn "  - Megabit flash sizes have been deprecated, use megabyte units from now on"
+	fi
+}
diff --git a/dev-embedded/rpi-eeprom/metadata.xml b/dev-embedded/rpi-eeprom/metadata.xml
index 074fc1d440e5..7ffabcf964cd 100644
--- a/dev-embedded/rpi-eeprom/metadata.xml
+++ b/dev-embedded/rpi-eeprom/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sam@gentoo.org</email>
-		<name>Sam James</name>
-	</maintainer>
 	<maintainer type="person" proxied="yes">
 		<email>crabbedhaloablution@icloud.com</email>
 		<name>Peter Alfredsen</name>
diff --git a/dev-games/godot/godot-4.3-r1.ebuild b/dev-games/godot/godot-4.3-r1.ebuild
index 0bf48fbd9cbf..d9431e841a81 100644
--- a/dev-games/godot/godot-4.3-r1.ebuild
+++ b/dev-games/godot/godot-4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -37,6 +37,7 @@ RESTRICT="test"
 # builds it #undef MBEDTLS_SSL_PROTO_TLS1_3 + a patch or else will get
 # "ERROR: TLS handshake error: -27648" with system's on startup
 # https://github.com/godotengine/godot/commit/40fa684c181d
+# (detect.py also needs to use mbedtls3.pc to find slotted mbedtls:3)
 # dlopen: libglvnd
 RDEPEND="
 	app-arch/brotli:=
@@ -49,7 +50,7 @@ RDEPEND="
 	media-libs/libogg
 	media-libs/libpng:=
 	media-libs/libvorbis
-	<net-libs/mbedtls-3:=
+	net-libs/mbedtls:0=
 	net-libs/wslay
 	sys-libs/zlib:=
 	alsa? ( media-libs/alsa-lib )
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.6.5-boost-1.87.0.patch b/dev-games/openscenegraph/files/openscenegraph-3.6.5-boost-1.87.0.patch
new file mode 100644
index 000000000000..22e54593b981
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.6.5-boost-1.87.0.patch
@@ -0,0 +1,301 @@
+diff '--color=auto' -urNp openscenegraph-3.6.5-orig/src/osgPlugins/RestHttpDevice/connection.cpp openscenegraph-3.6.5-dwok/src/osgPlugins/RestHttpDevice/connection.cpp
+--- openscenegraph-3.6.5-orig/src/osgPlugins/RestHttpDevice/connection.cpp	2024-12-27 12:34:55.469783593 +0100
++++ openscenegraph-3.6.5-dwok/src/osgPlugins/RestHttpDevice/connection.cpp	2024-12-27 12:45:50.072697619 +0100
+@@ -10,16 +10,17 @@
+ 
+ #include "connection.hpp"
+ #include <vector>
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
++using namespace boost::placeholders;
+ #include "request_handler.hpp"
+ #include <osg/Notify>
+ 
+ namespace http {
+ namespace server {
+ 
+-connection::connection(asio::io_service& io_service,
++connection::connection(boost::asio::io_context& io_context,
+     request_handler& handler)
+-  : socket_(io_service),
++  : socket_(io_context),
+     request_handler_(handler)
+ {
+     OSG_DEBUG << "RestHttpDevice :: connection::connection" << std::endl;
+@@ -29,7 +30,7 @@ connection::~connection()
+ {
+     OSG_DEBUG << "RestHttpDevice :: connection::~connection" << std::endl;
+ }
+-asio::ip::tcp::socket& connection::socket()
++boost::asio::ip::tcp::socket& connection::socket()
+ {
+   return socket_;
+ }
+@@ -38,10 +39,8 @@ void connection::start()
+ {
+   OSG_DEBUG << "RestHttpDevice :: connection::start" << std::endl;
+ 
+-  socket_.async_read_some(asio::buffer(buffer_),
+-      boost::bind(&connection::handle_read, shared_from_this(),
+-        asio::placeholders::error,
+-        asio::placeholders::bytes_transferred));
++  socket_.async_read_some(boost::asio::buffer(buffer_),
++      boost::bind(&connection::handle_read, shared_from_this(), _1, _2));
+ }
+ 
+ void connection::handle_read(const boost::system::error_code& e,
+@@ -56,23 +55,19 @@ void connection::handle_read(const boost
+     if (result)
+     {
+       request_handler_.handle_request(request_, reply_);
+-      asio::async_write(socket_, reply_.to_buffers(),
+-          boost::bind(&connection::handle_write, shared_from_this(),
+-            asio::placeholders::error));
++      boost::asio::async_write(socket_, reply_.to_buffers(),
++          boost::bind(&connection::handle_write, shared_from_this(), _1));
+     }
+     else if (!result)
+     {
+       reply_ = reply::stock_reply(reply::bad_request);
+-      asio::async_write(socket_, reply_.to_buffers(),
+-          boost::bind(&connection::handle_write, shared_from_this(),
+-            asio::placeholders::error));
++      boost::asio::async_write(socket_, reply_.to_buffers(),
++          boost::bind(&connection::handle_write, shared_from_this(), _1));
+     }
+     else
+     {
+-      socket_.async_read_some(asio::buffer(buffer_),
+-          boost::bind(&connection::handle_read, shared_from_this(),
+-            asio::placeholders::error,
+-            asio::placeholders::bytes_transferred));
++      socket_.async_read_some(boost::asio::buffer(buffer_),
++          boost::bind(&connection::handle_read, shared_from_this(), _1, _2));
+     }
+   }
+ 
+@@ -88,7 +83,7 @@ void connection::handle_write(const boos
+   {
+     // Initiate graceful connection closure.
+     boost::system::error_code ignored_ec;
+-    socket_.shutdown(asio::ip::tcp::socket::shutdown_both, ignored_ec);
++    socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored_ec);
+   }
+ 
+   // No new asynchronous operations are started. This means that all shared_ptr
+diff '--color=auto' -urNp openscenegraph-3.6.5-orig/src/osgPlugins/RestHttpDevice/connection.hpp openscenegraph-3.6.5-dwok/src/osgPlugins/RestHttpDevice/connection.hpp
+--- openscenegraph-3.6.5-orig/src/osgPlugins/RestHttpDevice/connection.hpp	2024-12-27 12:34:55.469783593 +0100
++++ openscenegraph-3.6.5-dwok/src/osgPlugins/RestHttpDevice/connection.hpp	2024-12-27 12:40:08.523007514 +0100
+@@ -33,7 +33,7 @@ class connection
+ {
+ public:
+   /// Construct a connection with the given io_service.
+-  explicit connection(asio::io_service& io_service,
++  explicit connection(boost::asio::io_context& io_context,
+       request_handler& handler);
+ 
+   /// Get the socket associated with the connection.
+diff '--color=auto' -urNp openscenegraph-3.6.5-orig/src/osgPlugins/RestHttpDevice/io_service_pool.cpp openscenegraph-3.6.5-dwok/src/osgPlugins/RestHttpDevice/io_service_pool.cpp
+--- openscenegraph-3.6.5-orig/src/osgPlugins/RestHttpDevice/io_service_pool.cpp	2024-12-27 12:34:55.469783593 +0100
++++ openscenegraph-3.6.5-dwok/src/osgPlugins/RestHttpDevice/io_service_pool.cpp	2024-12-27 12:48:08.654997383 +0100
+@@ -8,16 +8,18 @@
+ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ //
+ 
+-#include "server.hpp"
++#include "io_service_pool.hpp"
+ #include <stdexcept>
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
++using namespace boost::placeholders;
++#include <boost/shared_ptr.hpp>
+ #include <boost/thread.hpp>
+ 
+ namespace http {
+ namespace server {
+ 
+ io_service_pool::io_service_pool(std::size_t pool_size)
+-  : next_io_service_(0)
++  : next_io_context_(0)
+ {
+   if (pool_size == 0)
+     throw std::runtime_error("io_service_pool size is 0");
+@@ -26,9 +28,9 @@ io_service_pool::io_service_pool(std::si
+   // exit until they are explicitly stopped.
+   for (std::size_t i = 0; i < pool_size; ++i)
+   {
+-    io_service_ptr io_service(new asio::io_service);
+-    work_ptr work(new asio::io_service::work(*io_service));
+-    io_services_.push_back(io_service);
++    io_context_ptr io_context(new boost::asio::io_context);
++    work_ptr work(new boost::asio::executor_work_guard<boost::asio::io_context::executor_type>(boost::asio::make_work_guard(*io_context)));
++    io_contexts_.push_back(io_context);
+     work_.push_back(work);
+   }
+ }
+@@ -36,31 +38,34 @@ io_service_pool::io_service_pool(std::si
+ void io_service_pool::run()
+ {
+   // Create a pool of threads to run all of the io_services.
+-  std::vector<thread> threads;
+-  for (std::size_t i = 0; i < io_services_.size(); ++i)
+-    threads.emplace_back(thread(boost::bind(&asio::io_service::run,
+-                                            io_services_[i])));
++  std::vector<boost::shared_ptr<boost::thread>> threads;
++  for (std::size_t i = 0; i < io_contexts_.size(); ++i)
++  {
++    boost::shared_ptr<boost::thread> thread(new boost::thread(
++      boost::bind(&boost::asio::io_context::run, io_contexts_[i])));
++    threads.push_back(thread);
++  }
+ 
+   // Wait for all threads in the pool to exit.
+   for (std::size_t i = 0; i < threads.size(); ++i)
+-    threads[i].join();
++    threads[i]->join();
+ }
+ 
+ void io_service_pool::stop()
+ {
+   // Explicitly stop all io_services.
+-  for (std::size_t i = 0; i < io_services_.size(); ++i)
+-    io_services_[i]->stop();
++  for (std::size_t i = 0; i < io_contexts_.size(); ++i)
++    io_contexts_[i]->stop();
+ }
+ 
+-asio::io_service& io_service_pool::get_io_service()
++boost::asio::io_context& io_service_pool::get_io_context()
+ {
+   // Use a round-robin scheme to choose the next io_service to use.
+-  asio::io_service& io_service = *io_services_[next_io_service_];
+-  ++next_io_service_;
+-  if (next_io_service_ == io_services_.size())
+-    next_io_service_ = 0;
+-  return io_service;
++  boost::asio::io_context& io_context = *io_contexts_[next_io_context_];
++  ++next_io_context_;
++  if (next_io_context_ == io_contexts_.size())
++    next_io_context_ = 0;
++  return io_context;
+ }
+ 
+ } // namespace server
+diff '--color=auto' -urNp openscenegraph-3.6.5-orig/src/osgPlugins/RestHttpDevice/io_service_pool.hpp openscenegraph-3.6.5-dwok/src/osgPlugins/RestHttpDevice/io_service_pool.hpp
+--- openscenegraph-3.6.5-orig/src/osgPlugins/RestHttpDevice/io_service_pool.hpp	2024-12-27 12:34:55.469783593 +0100
++++ openscenegraph-3.6.5-dwok/src/osgPlugins/RestHttpDevice/io_service_pool.hpp	2024-12-27 12:40:08.523007514 +0100
+@@ -16,8 +16,6 @@
+ #include <boost/noncopyable.hpp>
+ #include <boost/shared_ptr.hpp>
+ 
+-using namespace boost;
+-
+ namespace http {
+ namespace server {
+ 
+@@ -36,20 +34,20 @@ public:
+   void stop();
+ 
+   /// Get an io_service to use.
+-  asio::io_service& get_io_service();
++  boost::asio::io_context& get_io_context();
+ 
+ private:
+-  typedef boost::shared_ptr<asio::io_service> io_service_ptr;
+-  typedef boost::shared_ptr<asio::io_service::work> work_ptr;
++  typedef boost::shared_ptr<boost::asio::io_context> io_context_ptr;
++  typedef boost::shared_ptr<boost::asio::executor_work_guard<boost::asio::io_context::executor_type>> work_ptr;
+ 
+   /// The pool of io_services.
+-  std::vector<io_service_ptr> io_services_;
++  std::vector<io_context_ptr> io_contexts_;
+ 
+   /// The work that keeps the io_services running.
+   std::vector<work_ptr> work_;
+ 
+   /// The next io_service to use for a connection.
+-  std::size_t next_io_service_;
++  std::size_t next_io_context_;
+ };
+ 
+ } // namespace server
+diff '--color=auto' -urNp openscenegraph-3.6.5-orig/src/osgPlugins/RestHttpDevice/ReaderWriterRestHttpDevice.cpp openscenegraph-3.6.5-dwok/src/osgPlugins/RestHttpDevice/ReaderWriterRestHttpDevice.cpp
+--- openscenegraph-3.6.5-orig/src/osgPlugins/RestHttpDevice/ReaderWriterRestHttpDevice.cpp	2024-12-27 12:34:55.469783593 +0100
++++ openscenegraph-3.6.5-dwok/src/osgPlugins/RestHttpDevice/ReaderWriterRestHttpDevice.cpp	2024-12-27 12:49:01.143868489 +0100
+@@ -35,6 +35,8 @@
+ #include <osgDB/FileNameUtils>
+ #include <osgDB/FileUtils>
+ #include "RestHttpDevice.hpp"
++#include <boost/bind/bind.hpp>
++using namespace boost::placeholders;
+ 
+ 
+ 
+diff '--color=auto' -urNp openscenegraph-3.6.5-orig/src/osgPlugins/RestHttpDevice/RestHttpDevice.cpp openscenegraph-3.6.5-dwok/src/osgPlugins/RestHttpDevice/RestHttpDevice.cpp
+--- openscenegraph-3.6.5-orig/src/osgPlugins/RestHttpDevice/RestHttpDevice.cpp	2024-12-27 12:34:55.469783593 +0100
++++ openscenegraph-3.6.5-dwok/src/osgPlugins/RestHttpDevice/RestHttpDevice.cpp	2024-12-27 12:48:44.131586152 +0100
+@@ -16,6 +16,8 @@
+ #include <osg/ValueObject>
+ #include <osgDB/FileUtils>
+ #include "request_handler.hpp"
++#include <boost/bind/bind.hpp>
++using namespace boost::placeholders;
+ 
+ namespace RestHttp {
+ 
+diff '--color=auto' -urNp openscenegraph-3.6.5-orig/src/osgPlugins/RestHttpDevice/server.cpp openscenegraph-3.6.5-dwok/src/osgPlugins/RestHttpDevice/server.cpp
+--- openscenegraph-3.6.5-orig/src/osgPlugins/RestHttpDevice/server.cpp	2024-12-27 12:34:55.469783593 +0100
++++ openscenegraph-3.6.5-dwok/src/osgPlugins/RestHttpDevice/server.cpp	2024-12-27 12:47:11.326045994 +0100
+@@ -9,7 +9,8 @@
+ //
+ 
+ #include "server.hpp"
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
++using namespace boost::placeholders;
+ 
+ namespace http {
+ namespace server {
+@@ -17,22 +18,21 @@ namespace server {
+ server::server(const std::string& address, const std::string& port,
+     const std::string& doc_root, std::size_t io_service_pool_size)
+   : io_service_pool_(io_service_pool_size),
+-    acceptor_(io_service_pool_.get_io_service()),
++    acceptor_(io_service_pool_.get_io_context()),
+     new_connection_(new connection(
+-          io_service_pool_.get_io_service(), request_handler_)),
++          io_service_pool_.get_io_context(), request_handler_)),
+     request_handler_(doc_root)
+ {
+   // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR).
+-  asio::ip::tcp::resolver resolver(io_service_pool_.get_io_service());
+-  asio::ip::tcp::resolver::query query(address, port);
+-  asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
++  boost::asio::ip::tcp::resolver resolver(io_service_pool_.get_io_context());
++  boost::asio::ip::tcp::resolver::results_type endpoints = resolver.resolve(address, port);
++  boost::asio::ip::tcp::endpoint endpoint = *endpoints.begin();
+   acceptor_.open(endpoint.protocol());
+-  acceptor_.set_option(asio::ip::tcp::acceptor::reuse_address(true));
++  acceptor_.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
+   acceptor_.bind(endpoint);
+   acceptor_.listen();
+   acceptor_.async_accept(new_connection_->socket(),
+-      boost::bind(&server::handle_accept, this,
+-        asio::placeholders::error));
++      boost::bind(&server::handle_accept, this, _1));
+ }
+ 
+ void server::run()
+@@ -54,10 +54,9 @@ void server::handle_accept(const boost::
+     OSG_DEBUG << "RestHttpDevice :: server::handle_accept" << std::endl;
+     new_connection_->start();
+     new_connection_.reset(new connection(
+-          io_service_pool_.get_io_service(), request_handler_));
++          io_service_pool_.get_io_context(), request_handler_));
+     acceptor_.async_accept(new_connection_->socket(),
+-        boost::bind(&server::handle_accept, this,
+-          asio::placeholders::error));
++        boost::bind(&server::handle_accept, this, _1));
+   }
+   else
+   {
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r116.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r116.ebuild
new file mode 100644
index 000000000000..6c16da00e7b7
--- /dev/null
+++ b/dev-games/openscenegraph/openscenegraph-3.6.5-r116.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+WX_GTK_VER="3.2-gtk3"
+inherit cmake flag-o-matic lua-single wxwidgets
+
+MY_PN="OpenSceneGraph"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Open source high performance 3D graphics toolkit"
+HOMEPAGE="https://www.openscenegraph.com/"
+SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+SLOT="0/161" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 x86"
+IUSE="
+	collada curl dicom debug doc egl examples ffmpeg fltk fox gdal
+	gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png
+	sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib
+"
+
+REQUIRED_USE="
+	dicom? ( zlib )
+	lua? ( ${LUA_REQUIRED_USE} )
+	openexr? ( zlib )
+	sdl2? ( sdl )
+"
+
+# TODO: FBX, GTA, NVTT, OpenVRML, Performer
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+	doc? ( app-text/doxygen[dot] )
+"
+# <ffmpeg-5 for bug #831486 / bug #834425 and
+# https://github.com/openscenegraph/OpenSceneGraph/issues/1111
+RDEPEND="
+	media-libs/mesa[egl(+)?]
+	virtual/glu
+	virtual/opengl
+	x11-libs/libSM
+	x11-libs/libXext
+	collada? ( dev-libs/collada-dom:= )
+	curl? ( net-misc/curl )
+	examples? (
+		fltk? ( x11-libs/fltk:1[opengl] )
+		fox? ( x11-libs/fox:1.6[opengl] )
+		glut? ( media-libs/freeglut )
+		sdl2? ( media-libs/libsdl2 )
+		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
+	)
+	ffmpeg? ( <media-video/ffmpeg-5:= )
+	gdal? ( sci-libs/gdal:= )
+	gif? ( media-libs/giflib:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	las? ( >=sci-geosciences/liblas-1.8.0 )
+	lua? ( ${LUA_DEPS} )
+	openexr? (
+		dev-libs/imath:=
+		>=media-libs/openexr-3:=
+	)
+	openinventor? ( media-libs/coin )
+	pdf? ( app-text/poppler[cairo] )
+	png? ( media-libs/libpng:0= )
+	sdl? ( media-libs/libsdl )
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	tiff? ( media-libs/tiff:= )
+	truetype? ( media-libs/freetype:2 )
+	vnc? ( net-libs/libvncserver )
+	xrandr? ( x11-libs/libXrandr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.3-cmake.patch
+	"${FILESDIR}"/${PN}-3.6.3-docdir.patch
+	"${FILESDIR}"/${PN}-3.6.5-use_boost_asio.patch
+	"${FILESDIR}"/${PN}-3.6.5-cmake_lua_version.patch
+	"${FILESDIR}"/${PN}-3.6.5-openexr3.patch
+	"${FILESDIR}"/${PN}-3.6.5-remove-register-keyword.patch
+	"${FILESDIR}"/${PN}-3.6.5-boost-1.87.0.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+	if use examples && use wxwidgets; then
+		setup-wxwidgets unicode
+	fi
+
+	# Needed by FFmpeg
+	append-cppflags -D__STDC_CONSTANT_MACROS
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDYNAMIC_OPENSCENEGRAPH=ON
+		-DLIB_POSTFIX=${libdir/lib}
+		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
+		$(cmake_use_find_package collada COLLADA)
+		$(cmake_use_find_package curl CURL)
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		$(cmake_use_find_package dicom DCMTK)
+		$(cmake_use_find_package egl EGL)
+		-DBUILD_OSG_EXAMPLES=$(usex examples)
+		$(cmake_use_find_package ffmpeg FFmpeg)
+		$(cmake_use_find_package gdal GDAL)
+		$(cmake_use_find_package gif GIFLIB)
+		$(cmake_use_find_package gstreamer GLIB)
+		$(cmake_use_find_package gstreamer GStreamer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=ON
+		$(cmake_use_find_package jpeg JPEG)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+		$(cmake_use_find_package las LIBLAS)
+		$(cmake_use_find_package lua Lua)
+		-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package openinventor Inventor)
+		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
+		$(cmake_use_find_package pdf Poppler-glib)
+		$(cmake_use_find_package png PNG)
+		$(cmake_use_find_package sdl SDL)
+		$(cmake_use_find_package sdl2 SDL2)
+		$(cmake_use_find_package svg RSVG)
+		$(cmake_use_find_package tiff TIFF)
+		$(cmake_use_find_package truetype Freetype)
+		$(cmake_use_find_package vnc LibVNCServer)
+		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
+		$(cmake_use_find_package zlib ZLIB)
+		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
+	)
+
+	if use examples; then
+		mycmakeargs+=(
+			$(cmake_use_find_package fltk FLTK)
+			$(cmake_use_find_package fox FOX)
+			$(cmake_use_find_package glut GLUT)
+			$(cmake_use_find_package wxwidgets wxWidgets)
+		)
+	fi
+
+	if use lua; then
+		mycmakeargs+=(
+			-DLUA_VERSION="$(lua_get_version)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
+}
diff --git a/dev-games/physfs/files/GNUInstallDirs.patch b/dev-games/physfs/files/GNUInstallDirs.patch
deleted file mode 100644
index ef7bb5d1f147..000000000000
--- a/dev-games/physfs/files/GNUInstallDirs.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 727d7a5265ad856fd473ad1c621d6c03dd306d6d Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sat, 10 Jul 2021 22:55:53 +0100
-Subject: [PATCH] Use the GNUInstallDirs CMake module to respect installation
- locations
-
-Apparently use of LIB_SUFFIX is now discouraged. GNUInstallDirs does a
-better job of setting a default.
-
-The libdir of ${prefix}/lib in the pkg-config file caused warnings,
-and possibly even failures, when linking on multilib systems where
-/usr/lib is for 32-bit libraries rather than 64-bit libraries.
----
- CMakeLists.txt      | 15 ++++++++-------
- extras/physfs.pc.in |  6 +++---
- 2 files changed, 11 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4a67c27..6c26cb1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,6 +14,8 @@ cmake_minimum_required(VERSION 2.8.4)
- project(PhysicsFS)
- set(PHYSFS_VERSION 3.0.2)
- 
-+include(GNUInstallDirs)
-+
- # Increment this if/when we break backwards compatibility.
- set(PHYSFS_SOVERSION 1)
- 
-@@ -213,11 +215,11 @@ if(PHYSFS_BUILD_TEST)
-     set(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";test_physfs")
- endif()
- 
--install(TARGETS ${PHYSFS_INSTALL_TARGETS}
--        RUNTIME DESTINATION bin
--        LIBRARY DESTINATION lib${LIB_SUFFIX}
--        ARCHIVE DESTINATION lib${LIB_SUFFIX})
--install(FILES src/physfs.h DESTINATION include)
-+install(TARGETS ${PHYSFS_INSTALL_TARGETS} EXPORT PhysFSExport
-+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(FILES src/physfs.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 
- find_package(Doxygen)
- if(DOXYGEN_FOUND)
-@@ -271,7 +273,7 @@ if(NOT MSVC)
-     )
-     install(
-         FILES "${CMAKE_CURRENT_BINARY_DIR}/extras/physfs.pc"
--        DESTINATION "lib${LIB_SUFFIX}/pkgconfig"
-+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
-     )
- endif()
- 
-diff --git a/extras/physfs.pc.in b/extras/physfs.pc.in
-index 6cd0972..f7e0307 100644
---- a/extras/physfs.pc.in
-+++ b/extras/physfs.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
--includedir=${prefix}/include
-+exec_prefix=@CMAKE_INSTALL_PREFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: PhysicsFS
- Description: PhysicsFS is a library to provide abstract access to various archives.
--- 
-2.31.1
-
diff --git a/dev-gap/cvec/Manifest b/dev-gap/cvec/Manifest
index f8dc9e8d47a1..db616b609fbc 100644
--- a/dev-gap/cvec/Manifest
+++ b/dev-gap/cvec/Manifest
@@ -1 +1 @@
-DIST cvec-2.8.2.tar.gz 647016 BLAKE2B 0289cd8f889ec11e781bb82a9efc27aa4c23c6f0c68686bf95a8bf6a815934fbd9f43155a223f375f0aa545a1a70b6bd683ae0cb9c44d76ce8a6610a07ed47de SHA512 f339c5bd239032235a2aadbeb5c99da4b29bd21ab97df6f72113c90da697ab9b98e03b0256b00acd57264bade9d316f0669c45590839996abda29dee3c1d547f
+DIST cvec-2.8.3.tar.gz 646360 BLAKE2B 2dafda78df946190cf350461591f1497cd2b6f5dad547055eafe2927abb24ea494d818287788579d7a82bf999bec3027bec8cadc7983aa943ae62aa47be4e826 SHA512 a6ba1e3794920b9196639ac07feee9afc9bdb5d244bf5566ace620ce7038ccc20f65ea4d19ff3959040537f5c18fe85dad98c95047944c4838c94e5084555777
diff --git a/dev-gap/cvec/cvec-2.8.2.ebuild b/dev-gap/cvec/cvec-2.8.2.ebuild
deleted file mode 100644
index cf6de1e9e8aa..000000000000
--- a/dev-gap/cvec/cvec-2.8.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gap-pkg
-
-DESCRIPTION="Compact vectors over finite fields in GAP"
-SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE="examples"
-
-DEPEND="sci-mathematics/gap:="
-RDEPEND="${DEPEND}
-	dev-gap/io
-	dev-gap/orb"
-
-gap-pkg_enable_tests
-
-src_install() {
-	gap-pkg_src_install
-
-	if use examples; then
-		docinto examples
-		dodoc example/*
-	fi
-}
diff --git a/dev-gap/cvec/cvec-2.8.3.ebuild b/dev-gap/cvec/cvec-2.8.3.ebuild
new file mode 100644
index 000000000000..65663d70371a
--- /dev/null
+++ b/dev-gap/cvec/cvec-2.8.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gap-pkg
+
+DESCRIPTION="Compact vectors over finite fields in GAP"
+SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="examples"
+
+DEPEND="sci-mathematics/gap:="
+RDEPEND="${DEPEND}
+	dev-gap/io
+	dev-gap/orb"
+
+gap-pkg_enable_tests
+
+src_install() {
+	gap-pkg_src_install
+
+	if use examples; then
+		docinto examples
+		dodoc example/*
+	fi
+}
diff --git a/dev-gap/guava/files/guava-3.19-C23.patch b/dev-gap/guava/files/guava-3.19-C23.patch
new file mode 100644
index 000000000000..e9e6520d70aa
--- /dev/null
+++ b/dev-gap/guava/files/guava-3.19-C23.patch
@@ -0,0 +1,25 @@
+From 3dc3b1a2e1f5935fa105531ad9f4cf604aeefcb1 Mon Sep 17 00:00:00 2001
+From: Joe Fields <fieldsj1@southernct.edu>
+Date: Sat, 4 Jan 2025 15:45:01 -0500
+Subject: [PATCH] Put def of bool type in #ifdef for C23 compatability
+
+---
+ src/ctjhai/types.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/ctjhai/types.h b/src/ctjhai/types.h
+index d805dae..c295752 100644
+--- a/src/ctjhai/types.h
++++ b/src/ctjhai/types.h
+@@ -24,7 +24,10 @@ typedef struct {
+ 	unsigned int **m;
+ } MATRIX;
+ 
+-typedef enum { false = 0, true = 1 } bool;
++#if __STDC_VERSION__ <= 201710L
++    typedef enum { false = 0, true = 1 } bool;
++#endif
++
+ typedef enum { C_0MOD2 = 1, C_1MOD2, C_3MOD4, C_0MOD4, C_0MOD3 } mod_t;
+ 
+ typedef struct {
diff --git a/dev-gap/guava/guava-3.19-r1.ebuild b/dev-gap/guava/guava-3.19-r1.ebuild
deleted file mode 100644
index 9084820391cc..000000000000
--- a/dev-gap/guava/guava-3.19-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gap-pkg flag-o-matic toolchain-funcs
-
-DESCRIPTION="GAP package for computing with error-correcting codes"
-SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-DEPEND="sci-mathematics/gap"
-
-PATCHES=( "${FILESDIR}/${PN}-3.15-makefile.patch" )
-
-GAP_PKG_EXTRA_INSTALL=( tbl )
-gap-pkg_enable_tests
-
-src_prepare() {
-	# remove temporary files in src/leon
-	rm src/leon/src/stamp-h1 || die
-	default
-}
-
-src_configure() {
-	# "false" conflicts with c23 bool type
-	append-cflags -std=c17
-
-	# This will run the top-level fake ./configure...
-	gap-pkg_src_configure
-
-	# Now run the real one in src/leon
-	cd src/leon || die
-	econf
-}
-
-src_compile() {
-	# COMPILE, COMPOPT, LINKOPT are needed to compile the code in src/leon.
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		COMPILE="$(tc-getCC)" \
-		COMPOPT="${CFLAGS} -c" \
-		LINKOPT="${LDFLAGS}"
-}
diff --git a/dev-gap/guava/guava-3.19-r2.ebuild b/dev-gap/guava/guava-3.19-r2.ebuild
new file mode 100644
index 000000000000..9320927bd826
--- /dev/null
+++ b/dev-gap/guava/guava-3.19-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gap-pkg flag-o-matic toolchain-funcs
+
+DESCRIPTION="GAP package for computing with error-correcting codes"
+SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+DEPEND="sci-mathematics/gap"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.15-makefile.patch"
+	"${FILESDIR}/${PN}-3.19-C23.patch"
+)
+
+GAP_PKG_EXTRA_INSTALL=( tbl )
+gap-pkg_enable_tests
+
+src_prepare() {
+	# remove temporary files in src/leon
+	rm src/leon/src/stamp-h1 || die
+	default
+}
+
+src_configure() {
+	# "false" conflicts with c23 bool type
+	append-cflags -std=c17
+
+	# This will run the top-level fake ./configure...
+	gap-pkg_src_configure
+
+	# Now run the real one in src/leon
+	cd src/leon || die
+	econf
+}
+
+src_compile() {
+	# COMPILE, COMPOPT, LINKOPT are needed to compile the code in src/leon.
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		COMPILE="$(tc-getCC)" \
+		COMPOPT="${CFLAGS} -c" \
+		LINKOPT="${LDFLAGS}"
+}
diff --git a/dev-go/delve/Manifest b/dev-go/delve/Manifest
index 2f1a29bd8706..8f27d0c3a9c0 100644
--- a/dev-go/delve/Manifest
+++ b/dev-go/delve/Manifest
@@ -2,3 +2,4 @@ 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
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/asm/Manifest b/dev-java/asm/Manifest
index 1e9b4964dedf..dcec05010889 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1 +1,2 @@
 DIST asm-ASM_9_7_1.tar.bz2 1378103 BLAKE2B f7da3a9c1bcf76398c9e9b9b86d60f8854e5248632a8b2d76605851e29ee1807713fb28c9e76012ec8f9444c44e3a151ed409cd120c34ab8d3495fdc9c84edcb SHA512 77ae76464eec97dbc8129c4a746d13f0d286d2033f909b65e0e34858e1785616b7bee22faa92128b91eb39cbd849e262efe574b73ed2859920add457d6422dd0
+DIST asm-cc341b5f0c24ea6688f615faff597612f0d596fb.tar.bz2 1380914 BLAKE2B f60f866ea14d63ae763212aebed715294eef3019f9878ebbbc80a63283e5176a446a90419c09e8a9210359e481a7aabb1977716d6467b77af0d3166c669c3676 SHA512 ce9adbf3e9c4d7f947e7ca63f51983c6d9bb4d4af73934c6779802caa242bc4d7f552069a8b835c16d8d32027fb4e634236adfd10f27a5563ed80fdc81b1a53d
diff --git a/dev-java/asm/asm-9.7.1_p20241213.ebuild b/dev-java/asm/asm-9.7.1_p20241213.ebuild
new file mode 100644
index 000000000000..4e3aa23b078d
--- /dev/null
+++ b/dev-java/asm/asm-9.7.1_p20241213.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# tests not enabled because of missing eclass support of junit-jupiter
+JAVA_PKG_IUSE="doc source"
+MAVEN_PROVIDES="
+	org.ow2.asm:asm-bom:${PV}
+	org.ow2.asm:asm:${PV}
+	org.ow2.asm:asm-analysis:${PV}
+	org.ow2.asm:asm-commons:${PV}
+	org.ow2.asm:asm-tree:${PV}
+	org.ow2.asm:asm-util:${PV}
+"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+HOMEPAGE="https://asm.ow2.io"
+MY_P="ASM_${PV//./_}"
+MY_COMMIT="cc341b5f0c24ea6688f615faff597612f0d596fb"
+SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_COMMIT}/asm-${MY_COMMIT}.tar.bz2"
+S="${WORKDIR}/asm-${MY_COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x64-macos"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+ASM_MODULES=( "asm" "asm-tree" "asm-analysis" "asm-commons" "asm-util" )
+JAVADOC_SRC_DIRS=(
+	asm/src/main/java
+	asm-tree/src/main/java
+	asm-analysis/src/main/java
+	asm-commons/src/main/java
+	asm-util/src/main/java
+)
+
+src_prepare() {
+	default
+	local module
+	touch asm.module || die
+	for module in "${ASM_MODULES[@]}"; do
+		module=${module/-/.}
+		cat > ${module/./-}/src/main/java/module-info.java <<-EOF || die
+			open module org.objectweb.${module/analysis/tree.analysis} {
+				$(cat asm.module)
+				requires java.base;
+				exports org.objectweb.${module/analysis/tree.analysis};
+			}
+		EOF
+		echo "requires transitive org.objectweb.${module/analysis/tree.analysis};" \
+			>> asm.module || die
+	done
+	sed -e '/^$/d' \
+		-e '/asm;/p;s:\(asm\)\(;\):\1.signature\2:' \
+		-i  asm/src/main/java/module-info.java || die
+	sed -e '/analysis/d' \
+		-i  asm-commons/src/main/java/module-info.java || die
+	sed -e '/commons/d' \
+		-i  asm-util/src/main/java/module-info.java || die
+}
+
+src_compile() {
+	local module
+	for module in "${ASM_MODULES[@]}"; do
+		einfo "Compiling ${module}"
+		JAVA_JAR_FILENAME="${module}.jar"
+		JAVA_SRC_DIR="${module}/src/main/java"
+		java-pkg-simple_src_compile
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar"
+		rm -r target || die
+	done
+
+	if use doc; then
+		einfo "Compiling javadocs"
+		for module in "${ASM_MODULES[@]}"; do
+			rm "${module}/src/main/java/module-info.java" || die
+			JAVA_SRC_DIR+=("${module}/src/main/java")
+		done
+		ejavadoc
+	fi
+}
+
+src_install() {
+	JAVA_JAR_FILENAME="asm.jar"
+	java-pkg-simple_src_install
+	local module
+	for module in asm-{analysis,commons,tree,util}; do
+		java-pkg_dojar ${module}.jar
+		if use source; then
+			java-pkg_dosrc "${module}/src/main/java/*"
+		fi
+	done
+}
diff --git a/dev-java/bnd-annotation/bnd-annotation-7.1.0.ebuild b/dev-java/bnd-annotation/bnd-annotation-7.1.0.ebuild
index 939ae99fc8ea..7b8979c026db 100644
--- a/dev-java/bnd-annotation/bnd-annotation-7.1.0.ebuild
+++ b/dev-java/bnd-annotation/bnd-annotation-7.1.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}/bnd-${PV/_rc/.RC}"
 
 LICENSE="Apache-2.0 EPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 
 DEPEND="
 	dev-java/osgi-cmpn:8
diff --git a/dev-java/bnd-ant/Manifest b/dev-java/bnd-ant/Manifest
index efb6528140b2..f909d128d99e 100644
--- a/dev-java/bnd-ant/Manifest
+++ b/dev-java/bnd-ant/Manifest
@@ -1,2 +1 @@
-DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
 DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
diff --git a/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild b/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild
deleted file mode 100644
index 5a039feb28ae..000000000000
--- a/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd.ant:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bnd Ant Tasks"
-HOMEPAGE="https://bnd.bndtools.org/"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz"
-S="${WORKDIR}/bnd-${PV}"
-
-LICENSE="Apache-2.0 EPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-DEPEND="
-	dev-java/ant:0
-	~dev-java/bnd-${PV}:0
-	>=virtual/jdk-17:*"
-RDEPEND=">=virtual/jre-17:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.ant"
-JAVA_CLASSPATH_EXTRA="
-	ant
-	bnd
-"
-
-JAVA_RESOURCE_DIRS="res"
-JAVA_SRC_DIR="biz.aQute.bnd.ant/src"
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-	mkdir res || die
-
-	# java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
-	pushd biz.aQute.bnd.ant/src > /dev/null || die
-		find -type f \
-			! -name '*.java' \
-			| xargs cp --parent -t ../../res || die
-	popd > /dev/null || die
-}
diff --git a/dev-java/bnd-ant/bnd-ant-7.1.0.ebuild b/dev-java/bnd-ant/bnd-ant-7.1.0.ebuild
index 4dac2056cc13..4cf40c036d62 100644
--- a/dev-java/bnd-ant/bnd-ant-7.1.0.ebuild
+++ b/dev-java/bnd-ant/bnd-ant-7.1.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}/bnd-${PV/_rc/.RC}"
 
 LICENSE="Apache-2.0 EPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 DEPEND="
 	dev-java/ant:0
diff --git a/dev-java/bnd-util/bnd-util-7.1.0.ebuild b/dev-java/bnd-util/bnd-util-7.1.0.ebuild
index 2ba4cf1dd138..a77c7edbcdca 100644
--- a/dev-java/bnd-util/bnd-util-7.1.0.ebuild
+++ b/dev-java/bnd-util/bnd-util-7.1.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}/bnd-${PV/_rc/.RC}"
 
 LICENSE="Apache-2.0 EPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 CP_DEPEND="dev-java/osgi-annotation:0"
 
diff --git a/dev-java/bnd/Manifest b/dev-java/bnd/Manifest
index efb6528140b2..f909d128d99e 100644
--- a/dev-java/bnd/Manifest
+++ b/dev-java/bnd/Manifest
@@ -1,2 +1 @@
-DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
 DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
diff --git a/dev-java/bnd/bnd-7.0.0.ebuild b/dev-java/bnd/bnd-7.0.0.ebuild
deleted file mode 100644
index fa2a82a1e3f0..000000000000
--- a/dev-java/bnd/bnd-7.0.0.ebuild
+++ /dev/null
@@ -1,100 +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="biz.aQute.bnd:biz.aQute.bnd:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="bndlib: A Swiss Army Knife for OSGi"
-HOMEPAGE="https://bnd.bndtools.org/"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="Apache-2.0 EPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-BDEPEND="app-arch/zip"
-
-CP_DEPEND="
-	~dev-java/bndlib-${PV}:0
-	dev-java/felix-resolver:0
-	dev-java/guava:0
-	dev-java/javaparser-core:0
-	dev-java/jline:2
-	dev-java/jtwig-core:0
-	dev-java/osgi-annotation:0
-	dev-java/osgi-cmpn:8
-	dev-java/osgi-core:0
-	dev-java/slf4j-simple:0
-	dev-java/snakeyaml:0
-	dev-java/xz-java:0
-"
-
-DEPEND="${CP_DEPEND}
-	dev-java/commons-lang:3.6
-	dev-java/eclipse-jdt-annotation:0
-	dev-java/felix-gogo-runtime:0
-	dev-java/slf4j-api:0
-	dev-java/jtwig-reflection:0
-	dev-java/osgi-service-log:0
-	dev-java/osgi-service-subsystem:0
-	>=virtual/jdk-17:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-17:*"
-
-PATCHES=(
-	"${FILESDIR}/bnd-7.0.0-aQute.bnd.main.bnd.patch"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd"
-JAVA_CLASSPATH_EXTRA="
-	commons-lang-3.6
-	eclipse-jdt-annotation
-	jtwig-reflection
-	felix-gogo-runtime
-	osgi-service-subsystem
-	slf4j-api
-"
-JAVA_MAIN_CLASS="aQute.bnd.main.bnd"
-JAVA_RESOURCE_DIRS="res"
-JAVA_SRC_DIR=(
-	"biz.aQute.bnd.exporters/src"
-	"biz.aQute.bnd.reporter/src"
-	"biz.aQute.bnd/src"
-	"biz.aQute.remote/src"
-	"biz.aQute.repository/src"
-	"biz.aQute.resolve/src"
-)
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-	mkdir res || die
-
-	# java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
-	pushd biz.aQute.bnd/src > /dev/null || die
-		find -type f \
-			! -name '*.java' \
-			| xargs cp --parent -t ../../res || die
-	popd > /dev/null || die
-}
-
-src_compile() {
-	# There is another version of osgi-service-log in osgi-core-0
-	JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjars --build-only osgi-service-log)"
-	java-pkg-simple_src_compile
-
-	# remove classes which are not in upstream's jar file
-	zip -d ${PN}.jar \
-		"*/remote/agent/*" \
-		"*/remote/embedded/*" \
-		"*/remote/main/*" \
-		"*/remote/plugin/*" \
-		"*/remote/test/*" \
-		|| die
-}
diff --git a/dev-java/bnd/bnd-7.1.0-r1.ebuild b/dev-java/bnd/bnd-7.1.0-r1.ebuild
new file mode 100644
index 000000000000..b7a5ea224d45
--- /dev/null
+++ b/dev-java/bnd/bnd-7.1.0-r1.ebuild
@@ -0,0 +1,100 @@
+# 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="biz.aQute.bnd:biz.aQute.bnd:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="bndlib: A Swiss Army Knife for OSGi"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV/_rc/.RC}.tar.gz -> aQute.bnd-${PV}.tar.gz"
+S="${WORKDIR}/${P/_rc/.RC}"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64"
+
+BDEPEND="app-arch/zip"
+
+CP_DEPEND="
+	~dev-java/bndlib-${PV}:0
+	dev-java/felix-resolver:0
+	dev-java/guava:0
+	<=dev-java/javaparser-core-3.13.10:0
+	dev-java/jline:2
+	dev-java/jtwig-core:0
+	dev-java/osgi-annotation:0
+	dev-java/osgi-cmpn:8
+	dev-java/osgi-core:0
+	dev-java/slf4j-simple:0
+	dev-java/snakeyaml:0
+	dev-java/xz-java:0
+"
+
+DEPEND="${CP_DEPEND}
+	dev-java/commons-lang:3.6
+	dev-java/eclipse-jdt-annotation:0
+	dev-java/felix-gogo-runtime:0
+	dev-java/slf4j-api:0
+	dev-java/jtwig-reflection:0
+	dev-java/osgi-service-log:0
+	dev-java/osgi-service-subsystem:0
+	>=virtual/jdk-17:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-17:*"
+
+PATCHES=(
+	"${FILESDIR}/bnd-7.0.0-aQute.bnd.main.bnd.patch"
+)
+
+JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd"
+JAVA_CLASSPATH_EXTRA="
+	commons-lang-3.6
+	eclipse-jdt-annotation
+	jtwig-reflection
+	felix-gogo-runtime
+	osgi-service-subsystem
+	slf4j-api
+"
+JAVA_MAIN_CLASS="aQute.bnd.main.bnd"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR=(
+	"biz.aQute.bnd.exporters/src"
+	"biz.aQute.bnd.reporter/src"
+	"biz.aQute.bnd/src"
+	"biz.aQute.remote/src"
+	"biz.aQute.repository/src"
+	"biz.aQute.resolve/src"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	mkdir res || die
+
+	# java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
+	pushd biz.aQute.bnd/src > /dev/null || die
+		find -type f \
+			! -name '*.java' \
+			| xargs cp --parent -t ../../res || die
+	popd > /dev/null || die
+}
+
+src_compile() {
+	# There is another version of osgi-service-log in osgi-core-0
+	JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjars --build-only osgi-service-log)"
+	java-pkg-simple_src_compile
+
+	# remove classes which are not in upstream's jar file
+	zip -d ${PN}.jar \
+		"*/remote/agent/*" \
+		"*/remote/embedded/*" \
+		"*/remote/main/*" \
+		"*/remote/plugin/*" \
+		"*/remote/test/*" \
+		|| die
+}
diff --git a/dev-java/bnd/bnd-7.1.0.ebuild b/dev-java/bnd/bnd-7.1.0.ebuild
deleted file mode 100644
index 8a0cc65df29a..000000000000
--- a/dev-java/bnd/bnd-7.1.0.ebuild
+++ /dev/null
@@ -1,100 +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="biz.aQute.bnd:biz.aQute.bnd:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="bndlib: A Swiss Army Knife for OSGi"
-HOMEPAGE="https://bnd.bndtools.org/"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV/_rc/.RC}.tar.gz -> aQute.bnd-${PV}.tar.gz"
-S="${WORKDIR}/${P/_rc/.RC}"
-
-LICENSE="Apache-2.0 EPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-BDEPEND="app-arch/zip"
-
-CP_DEPEND="
-	~dev-java/bndlib-${PV}:0
-	dev-java/felix-resolver:0
-	dev-java/guava:0
-	dev-java/javaparser-core:0
-	dev-java/jline:2
-	dev-java/jtwig-core:0
-	dev-java/osgi-annotation:0
-	dev-java/osgi-cmpn:8
-	dev-java/osgi-core:0
-	dev-java/slf4j-simple:0
-	dev-java/snakeyaml:0
-	dev-java/xz-java:0
-"
-
-DEPEND="${CP_DEPEND}
-	dev-java/commons-lang:3.6
-	dev-java/eclipse-jdt-annotation:0
-	dev-java/felix-gogo-runtime:0
-	dev-java/slf4j-api:0
-	dev-java/jtwig-reflection:0
-	dev-java/osgi-service-log:0
-	dev-java/osgi-service-subsystem:0
-	>=virtual/jdk-17:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-17:*"
-
-PATCHES=(
-	"${FILESDIR}/bnd-7.0.0-aQute.bnd.main.bnd.patch"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd"
-JAVA_CLASSPATH_EXTRA="
-	commons-lang-3.6
-	eclipse-jdt-annotation
-	jtwig-reflection
-	felix-gogo-runtime
-	osgi-service-subsystem
-	slf4j-api
-"
-JAVA_MAIN_CLASS="aQute.bnd.main.bnd"
-JAVA_RESOURCE_DIRS="res"
-JAVA_SRC_DIR=(
-	"biz.aQute.bnd.exporters/src"
-	"biz.aQute.bnd.reporter/src"
-	"biz.aQute.bnd/src"
-	"biz.aQute.remote/src"
-	"biz.aQute.repository/src"
-	"biz.aQute.resolve/src"
-)
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-	mkdir res || die
-
-	# java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
-	pushd biz.aQute.bnd/src > /dev/null || die
-		find -type f \
-			! -name '*.java' \
-			| xargs cp --parent -t ../../res || die
-	popd > /dev/null || die
-}
-
-src_compile() {
-	# There is another version of osgi-service-log in osgi-core-0
-	JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjars --build-only osgi-service-log)"
-	java-pkg-simple_src_compile
-
-	# remove classes which are not in upstream's jar file
-	zip -d ${PN}.jar \
-		"*/remote/agent/*" \
-		"*/remote/embedded/*" \
-		"*/remote/main/*" \
-		"*/remote/plugin/*" \
-		"*/remote/test/*" \
-		|| die
-}
diff --git a/dev-java/bndlib/bndlib-7.0.0.ebuild b/dev-java/bndlib/bndlib-7.0.0.ebuild
index e699671229c9..621bb7bd3c4c 100644
--- a/dev-java/bndlib/bndlib-7.0.0.ebuild
+++ b/dev-java/bndlib/bndlib-7.0.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}/bnd-${PV}"
 
 LICENSE="Apache-2.0 EPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
+KEYWORDS="amd64 ppc64"
 
 CP_DEPEND="
 	~dev-java/bnd-annotation-${PV}:0
diff --git a/dev-java/bndlib/bndlib-7.1.0.ebuild b/dev-java/bndlib/bndlib-7.1.0.ebuild
index 532ebab39fd4..fca4c94c6ffb 100644
--- a/dev-java/bndlib/bndlib-7.1.0.ebuild
+++ b/dev-java/bndlib/bndlib-7.1.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}/bnd-${PV/_rc/.RC}"
 
 LICENSE="Apache-2.0 EPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 CP_DEPEND="
 	~dev-java/bnd-annotation-${PV}:0
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index 9fc8709af89a..450d00e8c659 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,3 +1 @@
-DIST byte-buddy-1.14.0.tar.gz 1989303 BLAKE2B c284f54ebc6bf67e4706380f0876f403fcf5ae172a690888d13d6b3399cf41bf1fd8890bf15059f71a9457ec6343254ad1f421f8e4975aa70dd9a2103ab59610 SHA512 e6ccda287935b5ff7104d5c0e4904b0595918a21bcc90c6ac5b2358cc0371b22a4fcac2a95dde9e377c5d1e43077c8b57ea9520a9093b2380ab53c830f107ced
-DIST byte-buddy-1.15.10.tar.gz 2057524 BLAKE2B 7f5e178b3ea31fb30379e49d69f34ba1b9953d705a54c3609bb771f66962af776dee95ea10ab7049e50351362ff87c164782bc4b1b782985ac8f122e5833cb4e SHA512 3b7a02475433193efe8a8e20378369ec18f10c81dd90b428d5393c45fe261f678b1707c92923381b8a3030f8a2e8525fe95e3337ca7e5455cdc5fc2647416d2a
 DIST byte-buddy-1.15.11.tar.gz 2059994 BLAKE2B b5b11de938d2b96518c01cf1bcebb0f34ca6ccdb81e519e0177fa371f438da9ca5aba5749d1a7af0f42a2359c55228f3cbfbfe32f158d4a18fe7f02a5d5bf4f2 SHA512 9e663dfee80e6ae9e4983a39177a94f160e52e3ef1dec54b8f6a90e32c18ae5b36c9e791fd605b43754b2667f6efd7e15a1f7b0ce6c5034945567aef8a6b8aa8
diff --git a/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild b/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
deleted file mode 100644
index 13232b00c524..000000000000
--- a/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.23.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.23.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_PROVIDES="net.bytebuddy:byte-buddy-agent:1.12.23 net.bytebuddy:byte-buddy:1.12.23"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
-HOMEPAGE="https://bytebuddy.net"
-SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND="
-	>=virtual/jdk-11:*
-	dev-java/asm:9
-	dev-java/findbugs-annotations:0
-	dev-java/jna:4
-	dev-java/jsr305:0
-	test? (
-		dev-java/mockito:4
-	)
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/byte-buddy-${P}"
-
-JAVA_CLASSPATH_EXTRA="
-	asm-9
-	findbugs-annotations
-	jsr305
-	jna-4
-"
-
-src_prepare() {
-	default
-	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy-agent/pom.xml#L142-L176
-	cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF || die
-		module net.bytebuddy.agent {
-			requires java.instrument;
-			requires static jdk.attach;
-			requires static com.sun.jna;
-			requires static com.sun.jna.platform;
-			requires java.base;
-			exports net.bytebuddy.agent;
-			exports net.bytebuddy.agent.utility.nullability;
-		}
-	EOF
-
-	# instead of shading byte-buddy-dep we move it into byte-buddy.
-	mv byte-buddy{-dep,}/src/main/java || die "cannot move sources"
-
-	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy/pom.xml#L159-L195
-	local exports="$( \
-		sed -n '/<packages.list.external>/,/<\/packages.list.external/p' \
-		byte-buddy/pom.xml \
-		| sed -e 's:^:exports :' -e 's:,:;:' \
-		| grep -v 'packages.list.external\|shade' | tr -s '[:space:]' \
-		)" || die
-	cat > byte-buddy/src/main/java/module-info.java <<-EOF || die
-		module net.bytebuddy {
-			requires static java.instrument;
-			requires static java.management;
-			requires static jdk.unsupported;
-			requires static net.bytebuddy.agent;
-			requires static com.sun.jna;
-			requires static com.sun.jna.platform;
-			requires java.base;
-			${exports}
-		}
-	EOF
-}
-
-src_compile() {
-	einfo "Compiling byte-buddy-agent.jar"
-	JAVA_JAR_FILENAME="byte-buddy-agent.jar"
-	JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
-	JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
-	rm -r target || die
-
-	einfo "Compiling byte-buddy.jar"
-	JAVA_JAR_FILENAME="byte-buddy.jar"
-	JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default"
-	JAVA_RESOURCE_DIRS=()
-	JAVA_SRC_DIR="byte-buddy/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar"
-	rm -r target || die
-
-	if use doc; then
-		einfo "Compiling javadocs"
-		rm byte-buddy-agent/src/main/java/module-info.java || die
-		JAVA_SRC_DIR=(
-			"byte-buddy-agent/src/main/java"
-			"byte-buddy/src/main/java"
-		)
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_test() {
-	# instead of shading byte-buddy-dep we move it into byte-buddy.
-	mv byte-buddy{-dep,}/src/test || die "cannot move tests"
-
-	# @Ignore one of 4 tests, https://bugs.gentoo.org/863386
-	sed \
-		-e '/import org.junit.Test/a import org.junit.Ignore;' \
-		-e '/testIgnoreExistingField()/i @Ignore' \
-		-i byte-buddy/src/test/java/net/bytebuddy/build/CachedReturnPluginOtherTest.java || die
-
-	# @Ignore one of 39 tests, https://bugs.gentoo.org/863386
-	sed \
-		-e '/import org.junit.Test/a import org.junit.Ignore;' \
-		-e '/testNoParameterNameAndModifiers()/i @Ignore' \
-		-i byte-buddy/src/test/java/net/bytebuddy/description/method/AbstractMethodDescriptionTest.java || die
-
-	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
-
-	einfo "Testing byte-buddy-agent"
-	# https://github.com/raphw/byte-buddy/issues/1321#issuecomment-1252776459
-	JAVA_TEST_EXTRA_ARGS=( -Dnet.bytebuddy.test.jnapath="${EPREFIX}/usr/$(get_libdir)/jna-4/" )
-	JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
-	java-pkg-simple_src_test
-
-	einfo "Testing byte-buddy"
-	JAVA_TEST_RESOURCE_DIRS=( byte-buddy/src/test/{resources,precompiled*} )
-	JAVA_TEST_SRC_DIR="byte-buddy/src/test/java"
-
-	JAVA_TEST_EXCLUDES=(
-		# all tests in this class fail, https://bugs.gentoo.org/863386
-		net.bytebuddy.build.CachedReturnPluginTest
-	)
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg_dojar "byte-buddy-agent.jar"
-	java-pkg_dojar "byte-buddy.jar"
-
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-
-	if use source; then
-		java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
-		java-pkg_dosrc "byte-buddy/src/main/java/*"
-	fi
-}
diff --git a/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild b/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild
deleted file mode 100644
index f406feeebe76..000000000000
--- a/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild
+++ /dev/null
@@ -1,144 +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_PROVIDES="net.bytebuddy:byte-buddy-agent:${PV} net.bytebuddy:byte-buddy:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
-HOMEPAGE="https://bytebuddy.net"
-SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz"
-S="${WORKDIR}/byte-buddy-${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64"
-
-DEPEND="
-	>=dev-java/asm-9.7.1:9
-	dev-java/findbugs-annotations:0
-	dev-java/jna:4
-	dev-java/jsr305:0
-	>=virtual/jdk-11:*
-	test? (
-		>=dev-java/mockito-2.28.2-r1:2
-	)
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-PATCHES=( "${FILESDIR}/byte-buddy-1.15.10-Skip-testIgnoreExistingField.patch" )
-
-JAVA_CLASSPATH_EXTRA="
-	asm-9
-	findbugs-annotations
-	jna-4
-	jsr305
-"
-JAVADOC_CLASSPATH="${JAVA_CLASSPATH_EXTRA}"
-JAVADOC_SRC_DIRS=(
-	"byte-buddy-agent/src/main/java"
-	"byte-buddy/src/main/java"
-)
-
-src_prepare() {
-	default #780585
-	java-pkg_clean ! -path "./byte-buddy-dep/src/test/*"	# Keep test-classes
-	java-pkg-2_src_prepare
-	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy-agent/pom.xml#L142-L176
-	cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF || die
-		module net.bytebuddy.agent {
-			requires java.instrument;
-			requires static jdk.attach;
-			requires static com.sun.jna;
-			requires static com.sun.jna.platform;
-			requires java.base;
-			exports net.bytebuddy.agent;
-			exports net.bytebuddy.agent.utility.nullability;
-		}
-	EOF
-
-	# instead of shading byte-buddy-dep we move it into byte-buddy.
-	mv byte-buddy{-dep,}/src/main/java || die "cannot move sources"
-
-	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy/pom.xml#L159-L195
-	local exports="$( \
-		sed -n '/<packages.list.external>/,/<\/packages.list.external/p' \
-		byte-buddy/pom.xml \
-		| sed -e 's:^:exports :' -e 's:,:;:' \
-		| grep -v 'packages.list.external\|shade' | tr -s '[:space:]' \
-		)" || die
-	cat > byte-buddy/src/main/java/module-info.java <<-EOF || die
-		module net.bytebuddy {
-			requires static java.instrument;
-			requires static java.management;
-			requires static jdk.unsupported;
-			requires static net.bytebuddy.agent;
-			requires static com.sun.jna;
-			requires static com.sun.jna.platform;
-			requires java.base;
-			${exports}
-		}
-	EOF
-}
-
-src_compile() {
-	einfo "Compiling byte-buddy-agent.jar"
-	JAVA_JAR_FILENAME="byte-buddy-agent.jar"
-	JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
-	JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
-	rm -r target || die
-
-	einfo "Compiling byte-buddy.jar"
-	JAVA_JAR_FILENAME="byte-buddy.jar"
-	JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default"
-	JAVA_RESOURCE_DIRS=()
-	JAVA_SRC_DIR="byte-buddy/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar"
-	rm -r target || die
-
-	einfo "Building javadocs"
-	rm byte-buddy{,-agent}/src/main/java/module-info.java || die
-	use doc && ejavadoc
-}
-
-src_test() {
-	# instead of shading byte-buddy-dep we move it into byte-buddy.
-	mv byte-buddy{-dep,}/src/test || die "cannot move tests"
-
-	JAVAC_ARGS="-g"
-	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-2"
-
-	einfo "Testing byte-buddy-agent"
-	# https://github.com/raphw/byte-buddy/issues/1321#issuecomment-1252776459
-	JAVA_TEST_EXTRA_ARGS=( -Dnet.bytebuddy.test.jnapath="${EPREFIX}/usr/$(get_libdir)/jna-4/" )
-	JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
-	java-pkg-simple_src_test
-
-	einfo "Testing byte-buddy"
-	JAVA_TEST_RESOURCE_DIRS=( byte-buddy/src/test/{resources,precompiled*} )
-	JAVA_TEST_SRC_DIR="byte-buddy/src/test/java"
-
-	JAVA_TEST_EXCLUDES=(
-		# all tests in this class fail, https://bugs.gentoo.org/863386
-		net.bytebuddy.build.CachedReturnPluginTest
-	)
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg_dojar "byte-buddy-agent.jar"
-	java-pkg-simple_src_install
-
-	if use source; then
-		java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
-		java-pkg_dosrc "byte-buddy/src/main/java/*"
-	fi
-}
diff --git a/dev-java/byte-buddy/byte-buddy-1.15.11.ebuild b/dev-java/byte-buddy/byte-buddy-1.15.11.ebuild
index a1021afe6a00..f082462e97d5 100644
--- a/dev-java/byte-buddy/byte-buddy-1.15.11.ebuild
+++ b/dev-java/byte-buddy/byte-buddy-1.15.11.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/byte-buddy-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND="
 	>=dev-java/asm-9.7.1:9
diff --git a/dev-java/caffeine/Manifest b/dev-java/caffeine/Manifest
index 2602d39646eb..4448aeb74435 100644
--- a/dev-java/caffeine/Manifest
+++ b/dev-java/caffeine/Manifest
@@ -1,2 +1 @@
-DIST caffeine-2.6.2-sources.jar 715580 BLAKE2B 882cac33d205c8186232c64010b4e25e805d3d188d6a9e6ca151187b55d5ee3a3d5641566f5e8d32de596fab3dae8967c74f3d60e2321b34374ce996382322fe SHA512 52a8c67648e2a6bb1c600d99712473a64911f2b6c8fe6c924ba98e72b4b040a1094fa5c93ae2bae8734d352634bc72960711afd152566ef02f6bad4c84e510c8
 DIST caffeine-2.9.3-sources.jar 730835 BLAKE2B 5864ead593cb46caa23aac18fb424429009dbe5f9a70bb95bd16d73181f57ec5cd8ce1110af6e8766e757e5ea8a546c8eef4d4c26dced12722ff05f7278e0939 SHA512 e9b479ce30d4fc6337fef3a03a149c5fb2bfa48dbe0845374baf62e9b91049b8badbc5543d135b3473cf0c7bfd2b3717254376b55005ca301ce804537f879c48
diff --git a/dev-java/caffeine/caffeine-2.6.2-r1.ebuild b/dev-java/caffeine/caffeine-2.6.2-r1.ebuild
deleted file mode 100644
index 600b25a150e4..000000000000
--- a/dev-java/caffeine/caffeine-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.github.ben-manes.caffeine:caffeine:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A high performance caching library"
-HOMEPAGE="https://github.com/ben-manes/caffeine"
-SRC_URI="https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/${PV}/caffeine-${PV}-sources.jar"
-# Compiling from Github tarball would require to be packaged at least
-# package com.squareup.javapoet
-# package MethodSpec
-# package TypeSpec
-# SRC_URI="https://github.com/ben-manes/caffeine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-# S="${WORKDIR}/${P}/caffeine"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64"
-
-BDEPEND="app-arch/unzip"
-CP_DEPEND="dev-java/jsr305:0"
-# min java 11 for bug #919464
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-11:*"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="com.github.benmanes.caffeine"
diff --git a/dev-java/caffeine/caffeine-2.9.3.ebuild b/dev-java/caffeine/caffeine-2.9.3.ebuild
index 12549520678d..6a37ed9e67ab 100644
--- a/dev-java/caffeine/caffeine-2.9.3.ebuild
+++ b/dev-java/caffeine/caffeine-2.9.3.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
@@ -20,7 +20,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/$
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ppc64"
 
 BDEPEND="app-arch/unzip"
 CP_DEPEND="
diff --git a/dev-java/cglib/cglib-3.3.0-r3.ebuild b/dev-java/cglib/cglib-3.3.0-r3.ebuild
new file mode 100644
index 000000000000..32dcc2c635c1
--- /dev/null
+++ b/dev-java/cglib/cglib-3.3.0-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# doc USE flag is not in IUSE as the docs does not compile because of errors
+JAVA_PKG_IUSE="examples source test"
+MAVEN_ID="cglib:cglib:3.3.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PV=RELEASE_${PV//./_}
+MY_P=cglib-${MY_PV}
+
+DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library"
+HOMEPAGE="https://github.com/cglib/cglib"
+SRC_URI="https://github.com/cglib/cglib/archive//${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+CP_DEPEND="
+	>=dev-java/ant-1.10.14-r3:0
+	>=dev-java/asm-9.7.1_p20241213:0
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+JAVA_SRC_DIR="${MY_P}/${PN}/src/main/java"
+JAVA_RESOURCE_DIRS="${MY_P}/${PN}/src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${MY_P}/${PN}/src/test/java"
+JAVA_TEST_EXCLUDES=(
+	"net.sf.cglib.CodeGenTestCase"		# not a test class
+	"net.sf.cglib.TestAll"
+	"net.sf.cglib.TestGenerator"		# not a test class
+	"net.sf.cglib.proxy.TestEnhancer"	# broken tests
+	"net.sf.cglib.proxy.TestInterceptor"	# not a test class
+	"net.sf.cglib.reflect.TestFastClass"	# broken tests
+)
+
+src_test() {
+	# Caused by: net.sf.cglib.core.CodeGenerationException:
+	# java.lang.reflect.InaccessibleObjectException-->Unable to make protected final java.lang.Class
+	# java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain)
+	# throws java.lang.ClassFormatError accessible: \
+	# module java.base does not "opens java.lang" to unnamed module @42bb2aee
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge "17" ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+	fi
+
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	use examples && java-pkg_doexamples --subdir samples ${MY_P}/cglib-sample/src/main/java
+}
diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest
index 4db3e92f52fb..8d686638a43b 100644
--- a/dev-java/checker-framework-qual/Manifest
+++ b/dev-java/checker-framework-qual/Manifest
@@ -1,2 +1,2 @@
-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
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 5444f35ed4dc..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
@@ -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}/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/checker-framework-qual/checker-framework-qual-3.48.4.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.48.4.ebuild
new file mode 100644
index 000000000000..435d4b3f0da2
--- /dev/null
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.48.4.ebuild
@@ -0,0 +1,23 @@
+# 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="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/commons-vfs/commons-vfs-2.0-r4.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
index a0badac9a380..f83938ac5b4d 100644
--- a/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r4.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 @@ S="${WORKDIR}/${P}/core"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64 ~amd64-linux ~x86-linux"
 
 CP_DEPEND="
 	>=dev-java/ant-1.10.14-r3:0
diff --git a/dev-java/coursier-bin/Manifest b/dev-java/coursier-bin/Manifest
index 27571551b666..77982a873c4d 100644
--- a/dev-java/coursier-bin/Manifest
+++ b/dev-java/coursier-bin/Manifest
@@ -1,3 +1,2 @@
-DIST coursier-bin-2.1.13.gz 20930103 BLAKE2B 0f0281917061b7684dc5728217c240515ed82ad28c502f8a8ed13e6b8e79b4d1f41e958f788bb1e3aa54ebc9c36268282a1034829bc31b2501d52741d4b7cd3b SHA512 df3fe0b552525d4c1dcd50e4e31d3c9686d9bea6d75721ff4c30c93209a1ded5521f9f8ec9746260c0c75fd50c24bbcd5f5a163c4c3f8fbef72de8be20a9d266
 DIST coursier-bin-2.1.14.gz 20928552 BLAKE2B 80bb17f45d70bf213f2df42bde77214616e69c4d2fe7a2c8dbb89b8b19da18ef6c7397658b5cc46b63b469cdc4f0b4fcafed5540fcfa5e176a3d96dffc9c6758 SHA512 6545d50aebbefa3a21f6cc74ccda6f595593e5007832c7964dfe59f188848dbb72f177f9fa706ff2c6fe217701a816a8e7b4ee7f1e86a469d9363617a18232ba
-DIST coursier-bin-2.1.9.gz 20870390 BLAKE2B 720698e6c55a8c070d02f01ec528bab06f397b3c580fa3e533a45cf0073d8b9caf506cfff10d1b68eb9348c8b0da9abab9e7fb183f0561b62a82a96d21d35f5e SHA512 102c351aa0647fe5cd9d00ee164c1cebbcd6bd133a11bdfd653f70a5347da02e32ba74d5b51ea425e9189bb7113ef16c3902219bfa1ef0172bac7955712031c6
+DIST coursier-bin-2.1.24.gz 23366878 BLAKE2B ec9965aa41184625b9561f134c62378c76b85071f9c89fdf4e55114e92baef39e1a7604289bb0527e9a9bae3547fa6fce085fe9d8b7c57336d7f41a0ae198166 SHA512 aaa298873605570c4ddf9c6dedfbf77f724ed635f1b1850b09813057df130ebd15e6990d251c53cfc3e3c7cf186486cb88904b29211375c98b150757044d3c88
diff --git a/dev-java/coursier-bin/coursier-bin-2.1.13.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.13.ebuild
deleted file mode 100644
index 9d486aade5e9..000000000000
--- a/dev-java/coursier-bin/coursier-bin-2.1.13.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-get_orig_coursier_pv() {
-	local orig_pv=$(ver_rs 3 -)
-	orig_pv=${orig_pv/rc/RC}
-	orig_pv=${orig_pv/pre/M}
-	echo "${orig_pv}"
-}
-
-DESCRIPTION="Java/Scala artifact fetching, bundling and deploying"
-HOMEPAGE="https://get-coursier.io/"
-SRC_URI="https://github.com/coursier/coursier/releases/download/v$(get_orig_coursier_pv)/cs-x86_64-pc-linux.gz -> ${P}.gz"
-
-S="${WORKDIR}"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-RDEPEND="
-	sys-libs/zlib
-	>=virtual/jre-8
-"
-
-QA_FLAGS_IGNORED="usr/bin/coursier"
-QA_TEXTRELS="usr/bin/coursier"
-
-src_install() {
-	newbin "${P}" coursier
-}
diff --git a/dev-java/coursier-bin/coursier-bin-2.1.24.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.24.ebuild
new file mode 100644
index 000000000000..33f4e3506ae8
--- /dev/null
+++ b/dev-java/coursier-bin/coursier-bin-2.1.24.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+get_orig_coursier_pv() {
+	local orig_pv=$(ver_rs 3 -)
+	orig_pv=${orig_pv/rc/RC}
+	orig_pv=${orig_pv/pre/M}
+	echo "${orig_pv}"
+}
+
+DESCRIPTION="Java/Scala artifact fetching, bundling and deploying"
+HOMEPAGE="https://get-coursier.io/"
+SRC_URI="https://github.com/coursier/coursier/releases/download/v$(get_orig_coursier_pv)/cs-x86_64-pc-linux.gz -> ${P}.gz"
+
+S="${WORKDIR}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+RDEPEND="
+	sys-libs/zlib
+	>=virtual/jre-8
+"
+
+QA_FLAGS_IGNORED="usr/bin/coursier"
+QA_TEXTRELS="usr/bin/coursier"
+
+src_install() {
+	newbin "${P}" coursier
+}
diff --git a/dev-java/coursier-bin/coursier-bin-2.1.9.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.9.ebuild
deleted file mode 100644
index 536fb0da7de1..000000000000
--- a/dev-java/coursier-bin/coursier-bin-2.1.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-get_orig_coursier_pv() {
-	local orig_pv=$(ver_rs 3 -)
-	orig_pv=${orig_pv/rc/RC}
-	orig_pv=${orig_pv/pre/M}
-	echo "${orig_pv}"
-}
-
-DESCRIPTION="Java/Scala artifact fetching, bundling and deploying"
-HOMEPAGE="https://get-coursier.io/"
-SRC_URI="https://github.com/coursier/coursier/releases/download/v$(get_orig_coursier_pv)/cs-x86_64-pc-linux.gz -> ${P}.gz"
-
-KEYWORDS="amd64"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S="${WORKDIR}"
-
-RDEPEND=">=virtual/jre-8"
-
-QA_FLAGS_IGNORED="usr/bin/coursier"
-QA_TEXTRELS="usr/bin/coursier"
-
-src_install() {
-	newbin "${P}" coursier
-}
diff --git a/dev-java/easymock/easymock-3.3.1-r2.ebuild b/dev-java/easymock/easymock-3.3.1-r2.ebuild
new file mode 100644
index 000000000000..721625b7729b
--- /dev/null
+++ b/dev-java/easymock/easymock-3.3.1-r2.ebuild
@@ -0,0 +1,70 @@
+# 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="org.easymock:easymock:3.3.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Mock Objects for interfaces in JUnit tests by generating them on the fly"
+HOMEPAGE="https://easymock.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+CDEPEND="
+	>=dev-java/cglib-3.3.0-r3:0
+	dev-java/junit:4
+	dev-java/objenesis:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+JAVA_ENCODING="ISO-8859-1"
+
+JAVA_GENTOO_CLASSPATH="cglib,junit-4,objenesis"
+JAVA_SRC_DIR=(
+	"${PN}/src/main/java"
+	"${PN}/src/samples/java"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${PN}/src/test/java"
+JAVA_TEST_EXCLUDES=(
+	"org.easymock.tests2.EasyMockAnnotationsTest" # "java.lang.InstantiationException" (12 x)
+	"org.easymock.tests.BaseEasyMockRunnerTest" # No runnable methods
+)
+
+src_prepare() {
+	default
+	# error: package com.google.dexmaker.stock does not exist
+	eapply "${FILESDIR}"/3.3.1-r1-no-android.patch
+	rm easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java || die
+	# cannot find symbol   o = ProxyBuilder.forClass(ArrayList.class)
+	rm easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java || die
+}
+
+src_test() {
+	# ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain) throws
+	# java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @66da75e4
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+	fi
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild
index 9c70b5f1d581..a29983fb49d8 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.33.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
@@ -19,7 +19,7 @@ S="${WORKDIR}"
 
 LICENSE="EPL-1.0"
 SLOT="4.33"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 
 BDEPEND="app-arch/unzip"
 COMMON_DEP="app-eselect/eselect-java"
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index b9dff69f0689..edf2c4e3c1a2 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1,2 +1 @@
-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
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 6f831c3b913f..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
@@ -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}/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 5d2bb63cd36b..22494f7a30f9 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,4 +1,2 @@
-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
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 d62428453c97..000000000000
--- a/dev-java/guava-testlib/guava-testlib-33.3.1.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.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 3de8ae4f5545..ec6ae1cf83ba 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,3 +1 @@
-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
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 5d43bdc9619a..000000000000
--- a/dev-java/guava/guava-33.3.1.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.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/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild
index 278fab98fadf..9f1c6c912f8a 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.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
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
+KEYWORDS="amd64 ppc64"
 
 S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
 
diff --git a/dev-java/jakarta-annotation-api/Manifest b/dev-java/jakarta-annotation-api/Manifest
index a858d613fbba..0751b5eede46 100644
--- a/dev-java/jakarta-annotation-api/Manifest
+++ b/dev-java/jakarta-annotation-api/Manifest
@@ -1,2 +1 @@
-DIST jakarta-annotation-api-2.1.1.tar.gz 83788 BLAKE2B be9904337199bd8cf9e5748d53b4536b3562446d499992b97c7e413e2e2d9ae0c8ba50d601950a0feec8bce4c4c35093b7b8f87ad60ea407452f502996045e54 SHA512 8a61cb8a9da55efd7c5172aa9a134eae7d94489a66ef749c619a7fc596122fd50f3dda7a954d78f664132c72ce999d2d3ad01b70e1d2cb2072c881327de11d82
 DIST jakarta-annotation-api-3.0.0.tar.gz 86848 BLAKE2B 3eab46e3840bb121d1abeb1d839d00cab1db881e444613b60fa62e8412587c6a8e6a16ae89483698887631d7121f71104611dd052fd1ce6606fa2e708a4f0cc2 SHA512 9cbd14df082b2fd51e5ab92b72fad0a8f2db16e72d89f5942663dacc38ba5118ec1199a07756b9507f51ba143b9869bad32b8b8e41c9ddbef7c7c080557cb340
diff --git a/dev-java/jakarta-annotation-api/jakarta-annotation-api-2.1.1.ebuild b/dev-java/jakarta-annotation-api/jakarta-annotation-api-2.1.1.ebuild
deleted file mode 100644
index 8de7b9bc5d1c..000000000000
--- a/dev-java/jakarta-annotation-api/jakarta-annotation-api-2.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="jakarta.annotation:jakarta.annotation-api:2.1.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Jakarta Annotations API"
-HOMEPAGE="https://projects.eclipse.org/projects/ee4j.ca"
-SRC_URI="https://github.com/eclipse-ee4j/common-annotations-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/common-annotations-api-${PV}"
-
-LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND="
-	>=virtual/jdk-11:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-DOCS=( {CONTRIBUTING,NOTICE,README}.md )
-
-JAVA_SRC_DIR="api/src/main/java"
diff --git a/dev-java/jakarta-annotation-api/jakarta-annotation-api-3.0.0.ebuild b/dev-java/jakarta-annotation-api/jakarta-annotation-api-3.0.0.ebuild
index 7d5404665521..1003626c65b7 100644
--- a/dev-java/jakarta-annotation-api/jakarta-annotation-api-3.0.0.ebuild
+++ b/dev-java/jakarta-annotation-api/jakarta-annotation-api-3.0.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}/common-annotations-api-${PV}"
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
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 f121bb744078..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
@@ -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
@@ -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/javaparser-core/Manifest b/dev-java/javaparser-core/Manifest
index 44d5620a8988..6fb603dab526 100644
--- a/dev-java/javaparser-core/Manifest
+++ b/dev-java/javaparser-core/Manifest
@@ -1 +1,2 @@
 DIST javaparser-3.13.10.tar.gz 7043664 BLAKE2B 5d2e35cfa22dbcb425365e2e7806c46b989b92a84472fbd80d42716fbb2a5ddcad2daec6214be689b1dcc6541890527e422953c083e713e9f1d22ce5b3035e90 SHA512 b90a6b7b2fbb6a13cc36cdd17acd09a22adb9e62311862c2a67a9ea339b98e245c93ba371645e3c695e76966b21e3bc01accf040482e30b2b6882a5569db5806
+DIST javaparser-3.26.3.tar.gz 18493336 BLAKE2B a3a01239caf9f215bb470c060eff82b8db607fab6cffa637b06937f4e80f1fd530f1991e750aa5c91b9b0b5a173e77eb84c104a14d1353b7de233a56cd8284dc SHA512 8e109eec868e5aeceb2c91e09f04286f4e9944601359febe80bc29074b6eb306fd058a93e41cf7824ce88a392026321cca637a8cf601e6100b74b06a4fe39b80
diff --git a/dev-java/javaparser-core/javaparser-core-3.26.3.ebuild b/dev-java/javaparser-core/javaparser-core-3.26.3.ebuild
new file mode 100644
index 000000000000..d623f5d390b8
--- /dev/null
+++ b/dev-java/javaparser-core/javaparser-core-3.26.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.github.javaparser:javaparser-core:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java 1-21 Parser and Abstract Syntax Tree for Java"
+HOMEPAGE="https://javaparser.org/"
+SRC_URI="https://github.com/javaparser/javaparser/archive/${P/core/parent}.tar.gz -> javaparser-${PV}.tar.gz"
+S="${WORKDIR}/javaparser-${P/core/parent}"
+
+LICENSE="Apache-2.0 LGPL-3"
+# dev-java/bnd-7.1.0 seems not to like this version.
+# biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/codesnippet/JavaSnippetReader.java:20: error: cannot find symbol
+# import com.github.javaparser.printer.PrettyPrinterConfiguration;
+#                                     ^
+#   symbol:   class PrettyPrinterConfiguration
+#   location: package com.github.javaparser.printer
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+JAVACC_SLOT="7.0.13"
+BDEPEND="dev-java/javacc:${JAVACC_SLOT}"
+
+# Does not compile with >=jdk:21 (not even with 'mvn clean compile'):
+# javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java:243:
+# error: getLast() in NodeList cannot implement getLast() in List
+#     public Optional<N> getLast() {
+#                        ^
+#   return type Optional<N> is not compatible with N
+#   where N,E are type-variables:
+#     N extends Node declared in class NodeList
+#     E extends Object declared in interface List
+DEPEND="<virtual/jdk-21:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( CONTRIBUTING.md changelog.md readme.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="com.github.javaparser.core"
+JAVA_SRC_DIR=(
+	"${PN}/src/main/java"
+	"${PN}/src/main/java-templates"
+	"${PN}/src/main/javacc-support"
+)
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	mkdir -p "${PN}/src/main/java/com/github/javaparser"
+	javacc-${JAVACC_SLOT} -GRAMMAR_ENCODING=UTF-8 \
+		-JDK_VERSION=1.8 \
+		-OUTPUT_DIRECTORY="${PN}/src/main/java/com/github/javaparser" \
+		"javaparser-core/src/main/javacc/java.jj" \
+		|| die "Code generation with java.jj failed"
+}
diff --git a/dev-java/javassist/metadata.xml b/dev-java/javassist/metadata.xml
index ff67a27c5ef0..b3e39e79bd5e 100644
--- a/dev-java/javassist/metadata.xml
+++ b/dev-java/javassist/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">jboss</remote-id>
 		<remote-id type="github">jboss-javassist/javassist</remote-id>
 	</upstream>
 	<longdescription>
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild
index f4388dd69826..912d0a1f42af 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/postgresql-${PV}-jdbc-src"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64"
+KEYWORDS="amd64 ~ppc64"
 # package se.jiderhamn.classloader does not exist
 # package se.jiderhamn.classloader.leak does not exist
 # package uk.org.webcompere.systemstubs.environment does not exist
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.4.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.4.ebuild
index a7d3d95b2a68..28bc03928685 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.4.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.4.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/postgresql-${PV}-jdbc-src"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 # package se.jiderhamn.classloader does not exist
 # package se.jiderhamn.classloader.leak does not exist
 # package uk.org.webcompere.systemstubs.environment does not exist
diff --git a/dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild b/dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild
index 596a02691f70..df72f7386058 100644
--- a/dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild
+++ b/dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/jetbrains/java}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND=">=virtual/jdk-11:*"	# module-info
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 1d5142066df4..bcd19accdf80 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,2 +1 @@
-DIST jffi-1.3.10.tar.gz 3304571 BLAKE2B a2ce4901d05b31cffcbe750e9a9294413057ae26426ae381f08ab07a085507afe38d447a60d4698d0878760ba1fe18bfdc31ce9b737676a70c93689d2e4533a7 SHA512 9e7d9aa1c16d7fa2486c75b71fd23465a3069ea3f314bc1b536115c982333d7cffa93f75a06ec86b740b83f4fca3be0c32cf99222d90bf1e6b45a9744ead1268
 DIST jffi-1.3.13.tar.gz 3345405 BLAKE2B ebbab23ae220c9178f93ee668be70b5f18aa62258773d07e0b5f2c0da83fad59e4641d0b70aef417bcd5566c8a1cc1258db28c5e2883691e89104e18611ba6a9 SHA512 81f598e14d303c89bb35d0edba5ae0a17f8920bfbbded9583987ba58b22713681cf00965bc75a7d19597f9697fd20a08607801b9c677024bfc112080955f6443
diff --git a/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch b/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch
deleted file mode 100644
index 3153ff08d307..000000000000
--- a/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Bug: #898142
---- a/jni/GNUmakefile
-+++ b/jni/GNUmakefile
-@@ -67,9 +67,11 @@ OFLAGS = -O2 $(JFLAGS)
- WERROR = -Werror
- ifneq ($(OS),darwin)
- ifneq ($(OS),aix)
-+ifneq ($(OS),linux)
-   WFLAGS += -Wundef $(WERROR)
- endif
- endif
-+endif
- WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter
- PICFLAGS = -fPIC
- SOFLAGS = # Filled in for each OS specifically
-@@ -278,7 +280,7 @@ debug:
- 	@echo "OBJS=$(OBJS)"
- 
- $(LIBJFFI):  $(OBJS) $(LIBFFI_LIBS)
--	$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS)
-+	$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS) $(LIBFFI_LIBS)
- 	$(STRIP) $@
- ifeq ($(OS), darwin)
- 	codesign -s - $@
-@@ -287,10 +289,14 @@ endif
- $(BUILD_DIR)/%.o : $(SRC_DIR)/%.c $(wildcard $(JFFI_SRC_DIR)/*.h)
- 	@mkdir -p $(@D)
- 	@$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@
-+	mkdir -p $(@D)
-+	$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@
- 
- $(BUILD_DIR)/%.o : $(SRC_DIR)/%.S $(wildcard $(JFFI_SRC_DIR)/*.h)
- 	@mkdir -p $(@D)
- 	@$(CC) $(CFLAGS) -o $@ -c $<
-+	mkdir -p $(@D)
-+	$(CC) $(CFLAGS) -o $@ -c $<
- 
- $(OBJS) : $(LIBFFI)
- 
diff --git a/dev-java/jffi/jffi-1.3.10-r1.ebuild b/dev-java/jffi/jffi-1.3.10-r1.ebuild
deleted file mode 100644
index 5090e03de74f..000000000000
--- a/dev-java/jffi/jffi-1.3.10-r1.ebuild
+++ /dev/null
@@ -1,118 +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.github.jnr:jffi:1.3.10"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java Foreign Function Interface"
-HOMEPAGE="https://github.com/jnr/jffi"
-SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND=">=virtual/jdk-1.8:*
-	>=dev-libs/libffi-3.4.2-r2:="
-RDEPEND=">=virtual/jre-1.8:*
-	>=dev-libs/libffi-3.4.2-r2:="
-
-PATCHES=( "${FILESDIR}"/jffi-1.3.8-GNUmakefile.patch )
-
-JAVA_AUTOMATIC_MODULE_NAME="org.jnrproject.jffi"
-JAVA_SRC_DIR="src/main/java"
-
-# https://github.com/jnr/jffi/blob/b6ad5c066a6346072ea04f8ffa8177204aadcb13/build.xml#L26
-JAVA_TEST_EXTRA_ARGS="-Djffi.library.path=${S}/build/jni -Djffi.boot.library.path=${S}/build/jni"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	default
-	cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
-		package com.kenai.jffi;
-		import java.lang.annotation.Native;
-		public final class Version {
-			private Version() {}
-			@Native
-			public static final int MAJOR = $(ver_cut 1);
-			@Native
-			public static final int MINOR = $(ver_cut 2);
-			@Native
-			public static final int MICRO = $(ver_cut 3);
-		}
-	EOF
-
-	# https://bugs.gentoo.org/829820
-	if use arm; then
-		sed \
-			-e '/import org.junit.Test/a import org.junit.Ignore;' \
-			-e '/invokeHeapDO()/i @Ignore' \
-			-e '/invokeHeapNO()/i @Ignore' \
-			-e '/invokeHeapOD()/i @Ignore' \
-			-e '/invokeHeapON()/i @Ignore' \
-			-e '/invokeHeapOO()/i @Ignore' \
-			-e '/invokeHeapO()/i @Ignore' \
-			-e '/invokeNativeDO()/i @Ignore' \
-			-e '/invokeNativeNO()/i @Ignore' \
-			-e '/invokeNativeOD()/i @Ignore' \
-			-e '/invokeNativeON()/i @Ignore' \
-			-e '/invokeNativeOO()/i @Ignore' \
-			-e '/invokeNativeO()/i @Ignore' \
-			-i src/test/java/com/kenai/jffi/InvokerTest.java || die
-		sed \
-			-e '/import org.junit.Test/a import org.junit.Ignore;' \
-			-e '/returnDefaultF128HighPrecision/i @Ignore' \
-			-i src/test/java/com/kenai/jffi/NumberTest.java || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	# generate headers
-	mkdir -p build/jni
-	javac -h build/jni -classpath target/classes \
-		${JAVA_SRC_DIR}/com/kenai/jffi/{Foreign,ObjectBuffer,Version}.java \
-		|| die
-
-	#build native library.
-	local args=(
-		SRC_DIR=jni
-		JNI_DIR=jni
-		BUILD_DIR=build/jni
-		VERSION=$(ver_cut 1-2)
-		USE_SYSTEM_LIBFFI=1
-		CCACHE=
-		-f jni/GNUmakefile
-	)
-	emake "${args[@]}"
-}
-
-src_test() {
-	# build native test library
-	emake BUILD_DIR=build -f libtest/GNUmakefile
-
-	# https://github.com/jnr/jffi/issues/60
-	LC_ALL=C java-pkg-simple_src_test
-}
-
-src_install() {
-	local libname=".so"
-	java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname}
-
-	# must be after _doso to have JAVA_PKG_LIBDEST set
-	cat > boot.properties <<-EOF
-		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
-	EOF
-	jar -uf ${PN}.jar boot.properties || die
-
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jffi/jffi-1.3.13.ebuild b/dev-java/jffi/jffi-1.3.13.ebuild
index e9553b95cccf..2e0d24562020 100644
--- a/dev-java/jffi/jffi-1.3.13.ebuild
+++ b/dev-java/jffi/jffi-1.3.13.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
index 3e7ad60f60a4..dff00c2b47b9 100644
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@@ -1,2 +1 @@
-DIST jnr-ffi-2.2.12.tar.gz 285324 BLAKE2B 32e866654b901ded7cdc82999d79873d49bd9d3599d265e9d029e7cf8ce1895f9e830a1af75b8c149c3debc5f3d256f6241d706ecbd94277ce1fa49a2868885c SHA512 420adb647c5d0547f0b18e4f8a21096da9aaebbdf0e50761ec1fd6be64ad29649c7af4d6daf0a8c4c38e02a05e0df836de6fdb7776f10c02d8bfd447a11882b3
 DIST jnr-ffi-2.2.17.tar.gz 286018 BLAKE2B cf0aad44e61ee07128e1baf78567cf99893a149489c13cde42f0b54bba2b804a97ec40144e36663fc217427c2a0aacdbd736854d7b058020beebdbd45643a7bf SHA512 a53de8029b25d5d2dc4e304145070ec292af666b6ae8ac6f88f955a49bca01c1294d9330390916c92c4a1b9116ef29340ed3854983811149c4a0962d0f43504c
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.2.12-r1.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.2.12-r1.ebuild
deleted file mode 100644
index 08f94f164b1c..000000000000
--- a/dev-java/jnr-ffi/jnr-ffi-2.2.12-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jnr/jnr-ffi/archive/jnr-ffi-2.2.12.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jnr-ffi-2.2.12.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.github.jnr:jnr-ffi:2.2.12"
-# We don't have junit-jupiter yet
-# JAVA_TESTING_FRAMEWORKS="junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A library for invoking native functions from java"
-HOMEPAGE="https://github.com/jnr/jnr-ffi"
-SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-CP_DEPEND="
-	dev-java/asm:9
-	>=dev-java/jffi-1.3.10-r1:0
-	dev-java/jnr-a64asm:2
-	dev-java/jnr-x86asm:1.0
-"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!"
-# JAVA_TEST_SRC_DIR="src/test/java"
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.2.17.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.2.17.ebuild
index 4e5829ed8171..3768005266ee 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.2.17.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.2.17.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
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 CP_DEPEND="
 	dev-java/asm:9
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index e31c342fd2c6..db78d254c04e 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -1,2 +1 @@
-DIST jnr-posix-3.1.16.tar.gz 120553 BLAKE2B b430d4699b84e9c4139291c34c328ade600adade68081167d3b47ce52caa6f96a818702dcb26652d186d7de825b32b00f2f1329b79f9c459cbbb6f6a4260d9f3 SHA512 988221a9a499db64c2bc3fe4e798fb77ce1bce44a31b51ace4f1e52b9a76a3af9a1521477a64413b44f36da9ab5446feb1b2ffd4e7dc50be055f6092d9e1f977
 DIST jnr-posix-3.1.20.tar.gz 121435 BLAKE2B 46e7bc5de4eef1473fb26805a3a0120d5138f0945cbbc9b9e5328859e5b73ee94dd8c5db6159a921ec33852ab0fcf218d584b57712797ab52048d8b88a7ba71c SHA512 7f64250a60f5f9d9c6331c44dc7933755f45482b6fd03f6154a38433e1706bc7cd69a3302c64b61c2209f8c129cc5d46a7a75ceba3d8e0dcdeb5eca1c935e765
diff --git a/dev-java/jnr-posix/jnr-posix-3.1.16-r1.ebuild b/dev-java/jnr-posix/jnr-posix-3.1.16-r1.ebuild
deleted file mode 100644
index 87431a445012..000000000000
--- a/dev-java/jnr-posix/jnr-posix-3.1.16-r1.ebuild
+++ /dev/null
@@ -1,95 +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.github.jnr:jnr-posix:3.1.16"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Common cross-project/cross-platform POSIX APIs"
-HOMEPAGE="https://github.com/jnr/jnr-posix"
-SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="EPL-2.0 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-CP_DEPEND="
-	>=dev-java/jnr-ffi-2.2.12-r1:0
-	dev-java/jnr-constants:0
-"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-11:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.jnrproject.posix"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_test() {
-	sed \
-		-e '/import org.junit.Test/a import org.junit.Ignore;' \
-		-i src/test/java/jnr/posix/FileTest.java || die
-
-	if use ppc64; then
-		# Ignore testMessageHdrMultipleControl
-		# https://bugs.gentoo.org/866199
-		# https://github.com/jnr/jnr-posix/issues/178
-		sed \
-			-e '/testMessageHdrMultipleControl/i @Ignore' \
-			-e '/import org.junit.Test/a import org.junit.Ignore;' \
-			-i src/test/java/jnr/posix/LinuxPOSIXTest.java || die
-	fi
-
-	if use arm; then
-		# https://bugs.gentoo.org/866692
-		sed \
-			-e '/utimensatRelativePath()/i @Ignore' \
-			-e '/utimesDefaultValuesTest()/i @Ignore' \
-			-e '/futimeTest()/i @Ignore' \
-			-e '/utimesTest()/i @Ignore' \
-			-e '/utimesPointerTest()/i @Ignore' \
-			-e '/utimensatAbsolutePath()/i @Ignore' \
-			-e '/futimens()/i @Ignore' \
-			-i src/test/java/jnr/posix/FileTest.java || die
-		sed \
-			-e '/import org.junit.Test/a import org.junit.Ignore;' \
-			-e '/ioprioThreadedTest()/i @Ignore' \
-			-e '/testPosixFadvise()/i @Ignore' \
-			-i src/test/java/jnr/posix/LinuxPOSIXTest.java || die
-		sed \
-			-e '/import org.junit.Test/a import org.junit.Ignore;' \
-			-e '/testSetRlimitPointerLinux()/i @Ignore' \
-			-e '/testGetRLimitPointer()/i @Ignore' \
-			-i src/test/java/jnr/posix/ProcessTest.java || die
-	fi
-
-	JAVA_TEST_EXCLUDES=(
-		# https://github.com/jnr/jnr-posix/blob/jnr-posix-3.1.16/pom.xml#L185
-		# <exclude>**/windows/*Test.java</exclude>
-		"jnr.posix.windows.WindowsFileTest"
-		"jnr.posix.windows.WindowsHelpersTest"
-	)
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if [[ "${vm_version}" -ge "17" ]] ; then
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
-		# Some tests in jnr.posix.FileTest fail with jdk-17
-		sed \
-			-e '/flockTest()/i @Ignore' \
-			-e '/dupTest()/i @Ignore' \
-			-e '/closeTest()/i @Ignore' \
-			-e '/fcntlDupfdWithArgTest()/i @Ignore' \
-			-i src/test/java/jnr/posix/FileTest.java || die
-	fi
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/jnr-posix/jnr-posix-3.1.20.ebuild b/dev-java/jnr-posix/jnr-posix-3.1.20.ebuild
index ac22e303e9dc..0711adc36de4 100644
--- a/dev-java/jnr-posix/jnr-posix-3.1.20.ebuild
+++ b/dev-java/jnr-posix/jnr-posix-3.1.20.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="EPL-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 CP_DEPEND="
 	>=dev-java/jnr-ffi-2.2.17:0
diff --git a/dev-java/jol-core/Manifest b/dev-java/jol-core/Manifest
index f47b3094ce86..4307276fc4a7 100644
--- a/dev-java/jol-core/Manifest
+++ b/dev-java/jol-core/Manifest
@@ -1 +1,2 @@
 DIST jol-0.16.tar.gz 120373 BLAKE2B 06301e1802c89c76038aec2247cbb45d96cc74afa9f099500f8e5f33b919117e85744bc2b8214b6c9e765a2579a43f256eecc2ba8537e76c81aceaa8694f49dc SHA512 d9abf579d0230f2b6d0e0a33ee11c9599b4f36d945239dd8670bbd00591137c2229e5251b32dd5405fd4b08e0070af70e6b04e4ea4be0c28c4d5bc94874858de
+DIST jol-0.17.tar.gz 121365 BLAKE2B 3bacae2bba0f76799b0d9700201d908e1e04bad5276139b9661e969a0818e526eae1d6a0b0adf38501ef974dd18016710365f9fd578ecf4116896bb1dd44b51a SHA512 ea9424b43779a535a5463bdb11fc760f5fd5ee99ec9fb2706ddff48136739b488d9cebb690cd1d6fd30e5b4e66a2aa024bc878ffad0e56807aa499000d96b239
diff --git a/dev-java/jol-core/jol-core-0.17.ebuild b/dev-java/jol-core/jol-core-0.17.ebuild
new file mode 100644
index 000000000000..ef35447f37fe
--- /dev/null
+++ b/dev-java/jol-core/jol-core-0.17.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.openjdk.jol:jol-core:0.17"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN%-core}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Java Object Layout: Core"
+HOMEPAGE="https://openjdk.org/projects/code-tools/jol/"
+SRC_URI="https://github.com/openjdk/jol/archive/${PV}.tar.gz -> jol-${PV}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/asm:0
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
+JAVA_SRC_DIR="${PN}/src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,asm"
+JAVA_TEST_SRC_DIR="${PN}/src/test/java"
diff --git a/dev-java/json-simple/Manifest b/dev-java/json-simple/Manifest
index ca0205d6e68a..62ded9a54c51 100644
--- a/dev-java/json-simple/Manifest
+++ b/dev-java/json-simple/Manifest
@@ -1 +1,2 @@
 DIST json-simple-2.3.1.tar.gz 56230 BLAKE2B c4a196ffa67a729a1964db8c30b95ccb0bef0c213a76e37e463153a895a5fdb8c6f02f6d188d28f0b56665bf24c75dbdeeb42d88297c8df5e1b409606b0f04f2 SHA512 b80ea33480f8b32511ee2db5cfacc9c02cb5dbf0765b41fb76e099f41ac6c0ea69d75fdf0a5f783e3bfb7b4f200c49ca192a3321e0d8480b3a8b67ada469dbb1
+DIST json-simple-4.0.1.tar.gz 47731 BLAKE2B 59092065dcad7488e61e19f5af0ff823b76099d035dace4e0a41d7002fff0e35541956b137c84b68e8bf8d116fd997a6384b7397bce99eb0fe23f4cbec4b351c SHA512 a55919c90589276fcf6105f782faef42b08770e831f404f6e58450e3b24b6dfaeb9165abdd5323e64eb9d28c5e2c2e61de8fb2aa51d184f58b0362a240f4c19a
diff --git a/dev-java/json-simple/json-simple-4.0.1.ebuild b/dev-java/json-simple/json-simple-4.0.1.ebuild
new file mode 100644
index 000000000000..71a9c542fde0
--- /dev/null
+++ b/dev-java/json-simple/json-simple-4.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="source doc test"
+MAVEN_ID="com.github.cliftonlabs:json-simple:4.0.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java 7+ toolkit to quickly develop RFC 4627 JSON compatible applications"
+HOMEPAGE="https://www.json.org"
+SRC_URI="https://github.com/cliftonlabs/json-simple/archive/json-simple-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/json-smart/Manifest b/dev-java/json-smart/Manifest
index 08a0756cd16f..f45dcc2bb20b 100644
--- a/dev-java/json-smart/Manifest
+++ b/dev-java/json-smart/Manifest
@@ -1,2 +1,3 @@
 DIST json-smart-1.3.3.tar.gz 49430 BLAKE2B 805e16e0de5321a2e8164468757e9b722849f0fe90fd6822cc99f7afffd9f4e480fc4e14c2bbd12b325a27abc8ca7e93b4a17ce56ac352117cef336e1ebb3fe9 SHA512 c6006c6a00a085ea8810e18889450d11240dc3671351f20602214db418107808df1f413fe67c199d6529e4c0087f2533601826666ac4fa493bcaf72d2c18ed83
 DIST json-smart-2.5.0.tar.gz 88839 BLAKE2B 25760bd9c9ddecfef2fc3e60fc28b83def2223c7fc1e52ef39b3e6d01e5f2f29f36a35bfd43fc4d6ce6d5df5fcb25f59b1c86e1864a3044c69a6d0010335280b SHA512 4bffadf68998da4b63b34bcc9dbf804fd2b21b8d9514de4e155127d5a2eb3db74c7e396959b54c61c08e169eeed85dff3ad2f1d899cfddca53e501c45cebae21
+DIST json-smart-2.5.1.tar.gz 91171 BLAKE2B 21e83eadb15dbaa43ebe1fc9a5fd9500d4d233571dc4b65f417d7179630fde8a47e44cb652b2f598a2a6f46569876e8cac4769752dd4db179dc01b274514ef02 SHA512 00454e1debcebe009300a8f5d53b24b5c1917d173c9f3b98278236b52584631ab0e8bbf18c193f181e77537fb335b5bb31c1978918dc4f6e0ca82c44adb6797b
diff --git a/dev-java/json-smart/json-smart-2.5.1.ebuild b/dev-java/json-smart/json-smart-2.5.1.ebuild
new file mode 100644
index 000000000000..cb994b59522c
--- /dev/null
+++ b/dev-java/json-smart/json-smart-2.5.1.ebuild
@@ -0,0 +1,70 @@
+# 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_PROVIDES="
+	net.minidev:accessors-smart:${PV}
+	net.minidev:json-smart:${PV}
+"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JSON Small and Fast Parser"
+HOMEPAGE="https://urielch.github.io"
+SRC_URI="https://github.com/netplex/json-smart-v2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-v2-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+RESTRICT="test" #839681
+
+DEPEND="
+	dev-java/asm:0
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVADOC_CLASSPATH="asm"
+JAVADOC_SRC_DIRS=(
+	accessors-smart/src/main/java
+	json-smart/src/main/java
+)
+
+src_compile() {
+	einfo "Compiling accessors-smart.jar"
+	JAVA_CLASSPATH_EXTRA="asm"
+	JAVA_JAR_FILENAME="accessors-smart.jar"
+	JAVA_SRC_DIR="accessors-smart/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":accessors-smart.jar"
+	rm -r target || die
+
+	einfo "Compiling json-smart.jar"
+	JAVA_JAR_FILENAME="json-smart.jar"
+	JAVA_SRC_DIR="json-smart/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":json-smart.jar"
+	rm -r target || die
+
+	use doc && ejavadoc
+}
+
+src_install() {
+	einstalldocs
+	java-pkg_dojar "accessors-smart.jar"
+	java-pkg_dojar "json-smart.jar"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+
+	if use source; then
+		java-pkg_dosrc "accessors-smart/src/main/java/*"
+		java-pkg_dosrc "json-smart/src/main/java/*"
+	fi
+}
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index b2d756b94a7f..49cfea20357d 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,2 +1,3 @@
 DIST json-20240303.tar.gz 245665 BLAKE2B 3462398895ab6da9610dac8851f2aa4528359e255015fd59a160fe99443819fa5bb57eb30ce177238d06abe95aaae9847cc85e4eee59c90edf7732bd823d9b89 SHA512 22465216eca7e4721aacca7b519d0bf1b0fe20b2de68ef0b6c62feae811e11203bfc733d8e9c97e2aa5b6ed30c74eefc601025b31807e51d496666412516afc9
+DIST json-20241224.tar.gz 260438 BLAKE2B a531f8009cada5bbb9cd7207ce20ed1b1d358bc6533b9678a7845c31714351bac3406fd85663bf7e3fcc9cf4249221a6a5599b1d841a82e924f594ae6a46e848 SHA512 d487201c20c4c36714a944297fd0a175006ddc742e077bbb2a0e541c8b52fafc0169bc984e5a5f085e580e5a770fa30f0588c2f15ad761f6afae22134b544797
 DIST json-path-2.9.0.jar 276633 BLAKE2B bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862 SHA512 9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a
diff --git a/dev-java/json/json-20241224.ebuild b/dev-java/json/json-20241224.ebuild
new file mode 100644
index 000000000000..f8e8b002e74a
--- /dev/null
+++ b/dev-java/json/json-20241224.ebuild
@@ -0,0 +1,81 @@
+# 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="org.json:json:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple check-reqs
+
+DESCRIPTION="A reference implementation of a JSON package in Java"
+HOMEPAGE="https://github.com/stleary/JSON-java"
+JPV="2.9.0"
+SRC_URI="https://github.com/stleary/JSON-java/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar
+	)"
+S="${WORKDIR}/JSON-java-${PV}"
+
+LICENSE="JSON"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/asm:0
+		dev-java/json-smart:0
+		dev-java/mockito:4
+		dev-java/slf4j-api:0
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README,SECURITY}.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.json"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+	asm
+	json-smart
+	junit-4
+	mockito-4
+	slf4j-api
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+check_env() {
+	if use test; then
+		# this is needed only for tests
+		CHECKREQS_MEMORY="2048M"
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_env
+}
+
+pkg_setup() {
+	check_env
+	java-pkg-2_pkg_setup
+}
+
+src_test() {
+	# setting Xms for bug #930723
+	# gradlew: DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"
+	JAVA_TEST_EXTRA_ARGS=" -Xmx${CHECKREQS_MEMORY}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test compile dependency
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+	fi
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/junit/junit-5.10.3-r1.ebuild b/dev-java/junit/junit-5.10.3-r1.ebuild
new file mode 100644
index 000000000000..ecdba73eeb83
--- /dev/null
+++ b/dev-java/junit/junit-5.10.3-r1.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Declare the 'doc' USE flag in IUSE -- not JAVA_PKG_IUSE -- to
+# prevent java-pkg-simple.eclass from handling Javadoc; instead,
+# let this ebuild handle Javadoc generation and installation itself.
+# This ebuild invokes java-pkg-simple.eclass's phase functions
+# multiple times to build multiple modules, but the eclass always
+# installs each module's Javadoc to the same directory, which would
+# trigger an error when the second module's Javadoc is installed.
+JAVA_PKG_IUSE="source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Simple framework to write repeatable tests"
+HOMEPAGE="https://junit.org/junit5/"
+DEB="5.10.1-1"
+SRC_URI="https://github.com/junit-team/junit5/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/junit5-r${PV}"
+
+LICENSE="EPL-2.0"
+SLOT="5"
+KEYWORDS="amd64 arm64 ppc64"
+IUSE="doc migration-support suite vintage"
+
+CP_DEPEND="
+	dev-java/apiguardian-api:0
+	dev-java/opentest4j:0
+	<=dev-java/open-test-reporting-events-0.1.0_pre1:0
+	dev-java/picocli:0
+	dev-java/univocity-parsers:0
+"
+
+# java-utils-2.eclass does not support
+# USE-conditional dependencies in CP_DEPEND
+COND_DEPEND="
+	migration-support? ( dev-java/junit:4 )
+	vintage? ( dev-java/junit:4 )
+"
+
+# Limiting JDK version to >=11 for module-info.java in this package
+# https://bugs.gentoo.org/796875#c3
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}
+	${COND_DEPEND}
+	test? ( dev-java/jimfs:0 )
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+	${COND_DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/junit5-java18-compatibility.patch"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+}
+
+src_configure() {
+	# Please make sure to declare a module's dependencies before the module itself.
+	# Useful upstream documentation regarding modules and dependencies:
+	# https://junit.org/junit5/docs/current/user-guide/index.html#dependency-metadata
+	# https://junit.org/junit5/docs/current/user-guide/index.html#dependency-diagram
+	JUNIT5_MODULES=(
+		junit-platform-commons
+		junit-platform-engine
+		junit-platform-launcher
+		junit-platform-reporting
+		junit-platform-console # For launching tests from CLI;
+		# an eclass would need it to support running tests using JUnit 5
+
+		$(use suite && echo \
+			junit-platform-suite-api \
+			junit-platform-suite-commons \
+			junit-platform-suite-engine \
+		)
+
+		junit-jupiter-api
+		junit-jupiter-engine # For JUnit Jupiter tests -- the so-called
+		# "JUnit 5 tests", which cannot run on earlier JUnit versions
+		junit-jupiter-params # For parameterized tests; the junit-jupiter
+		# aggregator module includes it, so building it unconditionally
+		$(usev migration-support junit-jupiter-migrationsupport)
+
+		$(usev vintage junit-vintage-engine)
+
+		# Modules not included:
+		# - junit-bom: Has no sources; solely for helping Maven and Gradle
+		#   projects that use JUnit 5 manage dependencies easier
+		# - junit-jupiter: Aggregator; does not have 'src/main/java'
+		# - junit-platform-console-standalone: Has no sources; solely used
+		#   by the upstream to build a fat JAR that bundles everything, so
+		#   users can use just this single JAR to run JUnit 5
+		# - junit-platform-jfr: For an experimental feature
+		# - junit-platform-runner: Deprecated
+		# - junit-platform-suite: Aggregator; does not have 'src/main/java'
+		# - junit-platform-testkit: Requires >=dev-java/assertj-core-3.14.0
+	)
+	local cp_packages=()
+	(use migration-support || use vintage) && cp_packages+=( junit-4 )
+	local save_IFS="${IFS}"
+	IFS=',' JAVA_GENTOO_CLASSPATH="${cp_packages[*]}"
+	IFS="${save_IFS}"
+
+	JUNIT5_VM_VERSION="$(java-config --get-env PROVIDES_VERSION)"
+}
+
+junit5_foreach_module() {
+	local module
+	for module in "${JUNIT5_MODULES[@]}"; do
+		junit5_module_do "${module}" "${@}"
+	done
+}
+
+junit5_module_do() {
+	local module="${1}"
+	# Invocation of the passed function will not be guarded by '|| die'.
+	# Like the case for multibuild_foreach_variant(), it is recommended
+	# that the passed function itself calls 'die'.
+	local func=( "${@:2}" )
+
+	einfo "Running '${func[@]}' for ${module} ..."
+	pushd "${module}" > /dev/null || die "Failed to enter directory '${module}'"
+
+	# Set up Java eclass variables that are
+	# supposed to be set in the ebuild global scope
+
+	local JAVA_JAR_FILENAME="${module}.jar"
+
+	local JAVA_SRC_DIR=(
+		src/main/java
+		src/module
+	)
+
+	local JAVA_RESOURCE_DIRS=()
+	local default_resource_dir="src/main/resources"
+	[[ -d "${default_resource_dir}" ]] &&
+		JAVA_RESOURCE_DIRS+=( "${default_resource_dir}" )
+
+	if [[ "${module}" == junit-platform-console ]]; then
+		local JAVA_MAIN_CLASS="org.junit.platform.console.ConsoleLauncher"
+		local JAVA_LAUNCHER_FILENAME="${module}"
+	fi
+
+	# Invoke the passed function
+	"${func[@]}"
+	local ret="${?}"
+
+	popd > /dev/null || die "Failed to leave directory '${module}'"
+	return "${ret}"
+}
+
+junit5_gen_cp() {
+	echo "$(java-pkg_getjars --build-only --with-dependencies \
+		"${JAVA_GENTOO_CLASSPATH}"):${JAVA_GENTOO_CLASSPATH_EXTRA}"
+}
+
+junit5_module_compile() {
+	if [[ "${module}" == junit-platform-console ]]; then
+		# Unlike other modules that have a src/main/java9 directory, for this
+		# module, the upstream puts the class files built from src/main/java9
+		# in their JAR's top-level directory instead of META-INF/versions/9
+		cp -rv src/main/java9/* src/main/java/ ||
+			die "Failed to merge ${module}'s sources for Java 9+"
+		# Remove for the [[ -d src/main/java9 ]] test
+		# during versioned directory handling
+		rm -rv src/main/java9 ||
+			die "Failed to remove ${module}'s Java 9+ source directory"
+	fi
+
+	java-pkg-simple_src_compile
+	local sources="sources.lst"
+	local classes="target/classes"
+
+	# Collect a list of all compiler input files for building Javadoc
+	local source
+	while read source; do
+		echo "${module}/${source}" >> "${all_sources}"
+	done < "${sources}" ||
+		die "Failed to add ${module}'s sources to Javadoc input list"
+
+	# Handle classes that will go into versioned directories.  This will be
+	# no longer needed after https://bugs.gentoo.org/900433 is implemented.
+	local vm_ver
+	for vm_ver in 9 17; do
+		local versioned_src="src/main/java${vm_ver}"
+		if [[ -d "${versioned_src}" ]]; then
+			if ver_test "${JUNIT5_VM_VERSION}" -ge "${vm_ver}"; then
+				local versioned_classes="target/${vm_ver}/classes"
+				mkdir -p "${versioned_classes}" ||
+					die "Failed to create directory for ${module}'s Java ${vm_ver}+ classes"
+				ejavac -d "${versioned_classes}" -encoding "${JAVA_ENCODING}" \
+					-classpath "${classes}:$(junit5_gen_cp)" ${JAVAC_ARGS} \
+					$(find "${versioned_src}" -type f -name '*.java')
+				"$(java-config --jar)" -uvf "${JAVA_JAR_FILENAME}" \
+					--release "${vm_ver}" -C "${versioned_classes}" . ||
+					die "Failed to add ${module}'s Java ${vm_ver}+ classes to JAR"
+			else
+				# Modules that may hit this branch as of 5.9.2:
+				# - junit-platform-console:
+				#   src/main/java17/.../ConsoleUtils.java tries to use
+				#   java.io.Console.charset() (available since Java 17) to get
+				#   the default output charset.  It is fine to not use this
+				#   file, even if the built artifacts will be used on JRE 17+,
+				#   as src/main/java/.../ConsoleUtils.java still gets the
+				#   default from java.nio.charset.Charset.defaultCharset().
+				elog "JDK ${JUNIT5_VM_VERSION} used; skipping Java ${vm_ver}-dependent parts in ${module}"
+			fi
+		fi
+	done
+
+	# Add the current module's JAR to classpath
+	# for the module's reverse dependencies in this package
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":${S}/${module}/${JAVA_JAR_FILENAME}"
+}
+
+src_compile() {
+	local all_sources="${S}/all-sources.lst"
+	junit5_foreach_module junit5_module_compile
+
+	if use doc; then
+		einfo "Generating Javadoc for all modules ..."
+		local apidoc="target/api"
+		mkdir -p "${apidoc}" || die "Failed to create Javadoc directory"
+		ejavadoc -d "${apidoc}" \
+			-encoding "${JAVA_ENCODING}" -docencoding UTF-8 -charset UTF-8 \
+			-classpath "$(junit5_gen_cp)" ${JAVADOC_ARGS:- -quiet} \
+			-windowtitle "JUnit ${PV} API" \
+			"@${all_sources}"
+	fi
+}
+
+src_test() {
+	# Running the JUnit 5 modules' tests (located in each module's
+	# 'src/test/java') has a few obstacles:
+	# - Some test sources use text blocks -- a feature introduced in Java 15.
+	#   A JDK at a lower version, e.g. 11, cannot compile them.
+	# - Some test classes depend on JUnit 5 modules that this ebuild does not
+	#   include, like junit-platform-runner and junit-platform-testkit.
+	#
+	# Therefore, this ebuild uses a simpler approach to test the artifacts just
+	# built: it uses the artifacts to run tests in examples under the
+	# 'documentation/src' directory.  The test coverage will not be impressive,
+	# but at least this approach verifies that the copy of JUnit 5 just built
+	# is capable of running some simple tests launched from CLI.
+
+	local JUNIT5_TEST_SRC_DIR="documentation/src/test/java"
+	local JUNIT5_TEST_RESOURCE_DIR="documentation/src/test/resources"
+	local JUNIT5_TEST_RM=(
+		$(usev !migration-support example/IgnoredTestsDemo.java)
+		$(use !suite && echo \
+			example/DocumentationTestSuite.java \
+			example/SuiteDemo.java \
+		)
+		$(usev !vintage example/JUnit4Tests.java)
+
+		# Need excluded module junit-platform-runner
+		example/JUnitPlatformClassDemo.java
+		example/JUnitPlatformSuiteDemo.java
+
+		# Need excluded module junit-platform-testkit
+		example/testkit/
+
+		# Not necessary for the tests; some files even require extra dependency
+		org/junit/api/tools/
+
+		# Needs dev-java/hamcrest; no need to pull in extra dependency
+		# as the examples already provide ample tests to run
+		example/HamcrestAssertionsDemo.java
+
+		# Makes an HTTP request and expects a certain response
+		example/session/HttpTests.java
+	)
+
+	pushd "${JUNIT5_TEST_SRC_DIR}" > /dev/null ||
+		die "Failed to enter test source directory"
+	rm -rv "${JUNIT5_TEST_RM[@]}" ||
+		die "Failed to remove unneeded test sources"
+	# Test sources expect the working directory to be 'documentation'
+	sed -i -e "s|src/test/resources|${JUNIT5_TEST_RESOURCE_DIR}|g" \
+		example/ParameterizedTestDemo.java ||
+		die "Failed to update file paths in test sources"
+	popd > /dev/null || die "Failed to leave test source directory"
+
+	local test_dir="${T}/junit5_src_test"
+	local example_classes="${test_dir}/classes"
+	local test_classes="${test_dir}/test-classes"
+	mkdir -p "${example_classes}" "${test_classes}" ||
+		die "Failed to create test directories"
+
+	local example_sources="${test_dir}/sources.lst"
+	local test_sources="${test_dir}/test-sources.lst"
+	find documentation/src/main/java -type f -name '*.java' > "${example_sources}" ||
+		die "Failed to get a list of example sources"
+	find documentation/src/test/java -type f -name '*.java' > "${test_sources}" ||
+		die "Failed to get a list of test sources"
+
+	ejavac -d "${example_classes}" -encoding "${JAVA_ENCODING}" \
+		-classpath "$(junit5_gen_cp)" ${JAVAC_ARGS} \
+		"@${example_sources}"
+
+	local test_cp="${example_classes}:${JUNIT5_TEST_RESOURCE_DIR}:$(junit5_gen_cp)"
+	test_cp="${test_cp}:$(java-pkg_getjars --build-only --with-dependencies jimfs)"
+	ejavac -d "${test_classes}" -encoding "${JAVA_ENCODING}" \
+		-classpath "${test_cp}" ${JAVAC_ARGS} \
+		"@${test_sources}"
+
+	set -- "$(java-config --java)" -classpath "${test_classes}:${test_cp}" \
+		org.junit.platform.console.ConsoleLauncher \
+		--disable-ansi-colors --fail-if-no-tests --scan-classpath \
+		--include-classname='^(Test.*|.+[.$]Test.*|.*Tests?|.*Demo)$' \
+		--exclude-tag="exclude"
+	echo "${@}" >&2
+	"${@}"
+	local status="${?}"
+	[[ "${status}" -eq 2 ]] && die "JUnit did not discover any tests"
+	[[ "${status}" -eq 0 ]] || die "ConsoleLauncher failed"
+}
+
+junit5_module_install() {
+	# It is OK to let java-pkg-simple_src_install call einstalldocs for
+	# each module as long as each documentation file being installed
+	# has a unique filename among _all_ modules; otherwise, some files
+	# would overwrite other ones.
+	if [[ -f README.md ]]; then
+		mv -v README.md "README-${module}.md" ||
+			die "Failed to rename ${module}'s README.md"
+	fi
+	java-pkg-simple_src_install
+}
+
+src_install() {
+	junit5_foreach_module junit5_module_install
+	einstalldocs # For project-global documentation
+
+	if use doc; then
+		einfo "Installing Javadoc for all modules ..."
+		local apidoc="target/api"
+		java-pkg_dojavadoc "${apidoc}"
+	fi
+}
diff --git a/dev-java/junit/junit-5.10.3.ebuild b/dev-java/junit/junit-5.10.3.ebuild
deleted file mode 100644
index 81a4571700d9..000000000000
--- a/dev-java/junit/junit-5.10.3.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Declare the 'doc' USE flag in IUSE -- not JAVA_PKG_IUSE -- to
-# prevent java-pkg-simple.eclass from handling Javadoc; instead,
-# let this ebuild handle Javadoc generation and installation itself.
-# This ebuild invokes java-pkg-simple.eclass's phase functions
-# multiple times to build multiple modules, but the eclass always
-# installs each module's Javadoc to the same directory, which would
-# trigger an error when the second module's Javadoc is installed.
-JAVA_PKG_IUSE="source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Simple framework to write repeatable tests"
-HOMEPAGE="https://junit.org/junit5/"
-DEB="5.10.1-1"
-SRC_URI="https://github.com/junit-team/junit5/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/junit5-r${PV}"
-
-LICENSE="EPL-2.0"
-SLOT="5"
-KEYWORDS="amd64 arm64 ppc64"
-IUSE="doc migration-support suite vintage"
-
-CP_DEPEND="
-	dev-java/apiguardian-api:0
-	dev-java/opentest4j:0
-	dev-java/open-test-reporting-events:0
-	dev-java/picocli:0
-	dev-java/univocity-parsers:0
-"
-
-# java-utils-2.eclass does not support
-# USE-conditional dependencies in CP_DEPEND
-COND_DEPEND="
-	migration-support? ( dev-java/junit:4 )
-	vintage? ( dev-java/junit:4 )
-"
-
-# Limiting JDK version to >=11 for module-info.java in this package
-# https://bugs.gentoo.org/796875#c3
-DEPEND="
-	>=virtual/jdk-11:*
-	${CP_DEPEND}
-	${COND_DEPEND}
-	test? ( dev-java/jimfs:0 )
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-	${COND_DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/junit5-java18-compatibility.patch"
-)
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-}
-
-src_configure() {
-	# Please make sure to declare a module's dependencies before the module itself.
-	# Useful upstream documentation regarding modules and dependencies:
-	# https://junit.org/junit5/docs/current/user-guide/index.html#dependency-metadata
-	# https://junit.org/junit5/docs/current/user-guide/index.html#dependency-diagram
-	JUNIT5_MODULES=(
-		junit-platform-commons
-		junit-platform-engine
-		junit-platform-launcher
-		junit-platform-reporting
-		junit-platform-console # For launching tests from CLI;
-		# an eclass would need it to support running tests using JUnit 5
-
-		$(use suite && echo \
-			junit-platform-suite-api \
-			junit-platform-suite-commons \
-			junit-platform-suite-engine \
-		)
-
-		junit-jupiter-api
-		junit-jupiter-engine # For JUnit Jupiter tests -- the so-called
-		# "JUnit 5 tests", which cannot run on earlier JUnit versions
-		junit-jupiter-params # For parameterized tests; the junit-jupiter
-		# aggregator module includes it, so building it unconditionally
-		$(usev migration-support junit-jupiter-migrationsupport)
-
-		$(usev vintage junit-vintage-engine)
-
-		# Modules not included:
-		# - junit-bom: Has no sources; solely for helping Maven and Gradle
-		#   projects that use JUnit 5 manage dependencies easier
-		# - junit-jupiter: Aggregator; does not have 'src/main/java'
-		# - junit-platform-console-standalone: Has no sources; solely used
-		#   by the upstream to build a fat JAR that bundles everything, so
-		#   users can use just this single JAR to run JUnit 5
-		# - junit-platform-jfr: For an experimental feature
-		# - junit-platform-runner: Deprecated
-		# - junit-platform-suite: Aggregator; does not have 'src/main/java'
-		# - junit-platform-testkit: Requires >=dev-java/assertj-core-3.14.0
-	)
-	local cp_packages=()
-	(use migration-support || use vintage) && cp_packages+=( junit-4 )
-	local save_IFS="${IFS}"
-	IFS=',' JAVA_GENTOO_CLASSPATH="${cp_packages[*]}"
-	IFS="${save_IFS}"
-
-	JUNIT5_VM_VERSION="$(java-config --get-env PROVIDES_VERSION)"
-}
-
-junit5_foreach_module() {
-	local module
-	for module in "${JUNIT5_MODULES[@]}"; do
-		junit5_module_do "${module}" "${@}"
-	done
-}
-
-junit5_module_do() {
-	local module="${1}"
-	# Invocation of the passed function will not be guarded by '|| die'.
-	# Like the case for multibuild_foreach_variant(), it is recommended
-	# that the passed function itself calls 'die'.
-	local func=( "${@:2}" )
-
-	einfo "Running '${func[@]}' for ${module} ..."
-	pushd "${module}" > /dev/null || die "Failed to enter directory '${module}'"
-
-	# Set up Java eclass variables that are
-	# supposed to be set in the ebuild global scope
-
-	local JAVA_JAR_FILENAME="${module}.jar"
-
-	local JAVA_SRC_DIR=(
-		src/main/java
-		src/module
-	)
-
-	local JAVA_RESOURCE_DIRS=()
-	local default_resource_dir="src/main/resources"
-	[[ -d "${default_resource_dir}" ]] &&
-		JAVA_RESOURCE_DIRS+=( "${default_resource_dir}" )
-
-	if [[ "${module}" == junit-platform-console ]]; then
-		local JAVA_MAIN_CLASS="org.junit.platform.console.ConsoleLauncher"
-		local JAVA_LAUNCHER_FILENAME="${module}"
-	fi
-
-	# Invoke the passed function
-	"${func[@]}"
-	local ret="${?}"
-
-	popd > /dev/null || die "Failed to leave directory '${module}'"
-	return "${ret}"
-}
-
-junit5_gen_cp() {
-	echo "$(java-pkg_getjars --build-only --with-dependencies \
-		"${JAVA_GENTOO_CLASSPATH}"):${JAVA_GENTOO_CLASSPATH_EXTRA}"
-}
-
-junit5_module_compile() {
-	if [[ "${module}" == junit-platform-console ]]; then
-		# Unlike other modules that have a src/main/java9 directory, for this
-		# module, the upstream puts the class files built from src/main/java9
-		# in their JAR's top-level directory instead of META-INF/versions/9
-		cp -rv src/main/java9/* src/main/java/ ||
-			die "Failed to merge ${module}'s sources for Java 9+"
-		# Remove for the [[ -d src/main/java9 ]] test
-		# during versioned directory handling
-		rm -rv src/main/java9 ||
-			die "Failed to remove ${module}'s Java 9+ source directory"
-	fi
-
-	java-pkg-simple_src_compile
-	local sources="sources.lst"
-	local classes="target/classes"
-
-	# Collect a list of all compiler input files for building Javadoc
-	local source
-	while read source; do
-		echo "${module}/${source}" >> "${all_sources}"
-	done < "${sources}" ||
-		die "Failed to add ${module}'s sources to Javadoc input list"
-
-	# Handle classes that will go into versioned directories.  This will be
-	# no longer needed after https://bugs.gentoo.org/900433 is implemented.
-	local vm_ver
-	for vm_ver in 9 17; do
-		local versioned_src="src/main/java${vm_ver}"
-		if [[ -d "${versioned_src}" ]]; then
-			if ver_test "${JUNIT5_VM_VERSION}" -ge "${vm_ver}"; then
-				local versioned_classes="target/${vm_ver}/classes"
-				mkdir -p "${versioned_classes}" ||
-					die "Failed to create directory for ${module}'s Java ${vm_ver}+ classes"
-				ejavac -d "${versioned_classes}" -encoding "${JAVA_ENCODING}" \
-					-classpath "${classes}:$(junit5_gen_cp)" ${JAVAC_ARGS} \
-					$(find "${versioned_src}" -type f -name '*.java')
-				"$(java-config --jar)" -uvf "${JAVA_JAR_FILENAME}" \
-					--release "${vm_ver}" -C "${versioned_classes}" . ||
-					die "Failed to add ${module}'s Java ${vm_ver}+ classes to JAR"
-			else
-				# Modules that may hit this branch as of 5.9.2:
-				# - junit-platform-console:
-				#   src/main/java17/.../ConsoleUtils.java tries to use
-				#   java.io.Console.charset() (available since Java 17) to get
-				#   the default output charset.  It is fine to not use this
-				#   file, even if the built artifacts will be used on JRE 17+,
-				#   as src/main/java/.../ConsoleUtils.java still gets the
-				#   default from java.nio.charset.Charset.defaultCharset().
-				elog "JDK ${JUNIT5_VM_VERSION} used; skipping Java ${vm_ver}-dependent parts in ${module}"
-			fi
-		fi
-	done
-
-	# Add the current module's JAR to classpath
-	# for the module's reverse dependencies in this package
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":${S}/${module}/${JAVA_JAR_FILENAME}"
-}
-
-src_compile() {
-	local all_sources="${S}/all-sources.lst"
-	junit5_foreach_module junit5_module_compile
-
-	if use doc; then
-		einfo "Generating Javadoc for all modules ..."
-		local apidoc="target/api"
-		mkdir -p "${apidoc}" || die "Failed to create Javadoc directory"
-		ejavadoc -d "${apidoc}" \
-			-encoding "${JAVA_ENCODING}" -docencoding UTF-8 -charset UTF-8 \
-			-classpath "$(junit5_gen_cp)" ${JAVADOC_ARGS:- -quiet} \
-			-windowtitle "JUnit ${PV} API" \
-			"@${all_sources}"
-	fi
-}
-
-src_test() {
-	# Running the JUnit 5 modules' tests (located in each module's
-	# 'src/test/java') has a few obstacles:
-	# - Some test sources use text blocks -- a feature introduced in Java 15.
-	#   A JDK at a lower version, e.g. 11, cannot compile them.
-	# - Some test classes depend on JUnit 5 modules that this ebuild does not
-	#   include, like junit-platform-runner and junit-platform-testkit.
-	#
-	# Therefore, this ebuild uses a simpler approach to test the artifacts just
-	# built: it uses the artifacts to run tests in examples under the
-	# 'documentation/src' directory.  The test coverage will not be impressive,
-	# but at least this approach verifies that the copy of JUnit 5 just built
-	# is capable of running some simple tests launched from CLI.
-
-	local JUNIT5_TEST_SRC_DIR="documentation/src/test/java"
-	local JUNIT5_TEST_RESOURCE_DIR="documentation/src/test/resources"
-	local JUNIT5_TEST_RM=(
-		$(usev !migration-support example/IgnoredTestsDemo.java)
-		$(use !suite && echo \
-			example/DocumentationTestSuite.java \
-			example/SuiteDemo.java \
-		)
-		$(usev !vintage example/JUnit4Tests.java)
-
-		# Need excluded module junit-platform-runner
-		example/JUnitPlatformClassDemo.java
-		example/JUnitPlatformSuiteDemo.java
-
-		# Need excluded module junit-platform-testkit
-		example/testkit/
-
-		# Not necessary for the tests; some files even require extra dependency
-		org/junit/api/tools/
-
-		# Needs dev-java/hamcrest; no need to pull in extra dependency
-		# as the examples already provide ample tests to run
-		example/HamcrestAssertionsDemo.java
-
-		# Makes an HTTP request and expects a certain response
-		example/session/HttpTests.java
-	)
-
-	pushd "${JUNIT5_TEST_SRC_DIR}" > /dev/null ||
-		die "Failed to enter test source directory"
-	rm -rv "${JUNIT5_TEST_RM[@]}" ||
-		die "Failed to remove unneeded test sources"
-	# Test sources expect the working directory to be 'documentation'
-	sed -i -e "s|src/test/resources|${JUNIT5_TEST_RESOURCE_DIR}|g" \
-		example/ParameterizedTestDemo.java ||
-		die "Failed to update file paths in test sources"
-	popd > /dev/null || die "Failed to leave test source directory"
-
-	local test_dir="${T}/junit5_src_test"
-	local example_classes="${test_dir}/classes"
-	local test_classes="${test_dir}/test-classes"
-	mkdir -p "${example_classes}" "${test_classes}" ||
-		die "Failed to create test directories"
-
-	local example_sources="${test_dir}/sources.lst"
-	local test_sources="${test_dir}/test-sources.lst"
-	find documentation/src/main/java -type f -name '*.java' > "${example_sources}" ||
-		die "Failed to get a list of example sources"
-	find documentation/src/test/java -type f -name '*.java' > "${test_sources}" ||
-		die "Failed to get a list of test sources"
-
-	ejavac -d "${example_classes}" -encoding "${JAVA_ENCODING}" \
-		-classpath "$(junit5_gen_cp)" ${JAVAC_ARGS} \
-		"@${example_sources}"
-
-	local test_cp="${example_classes}:${JUNIT5_TEST_RESOURCE_DIR}:$(junit5_gen_cp)"
-	test_cp="${test_cp}:$(java-pkg_getjars --build-only --with-dependencies jimfs)"
-	ejavac -d "${test_classes}" -encoding "${JAVA_ENCODING}" \
-		-classpath "${test_cp}" ${JAVAC_ARGS} \
-		"@${test_sources}"
-
-	set -- "$(java-config --java)" -classpath "${test_classes}:${test_cp}" \
-		org.junit.platform.console.ConsoleLauncher \
-		--disable-ansi-colors --fail-if-no-tests --scan-classpath \
-		--include-classname='^(Test.*|.+[.$]Test.*|.*Tests?|.*Demo)$' \
-		--exclude-tag="exclude"
-	echo "${@}" >&2
-	"${@}"
-	local status="${?}"
-	[[ "${status}" -eq 2 ]] && die "JUnit did not discover any tests"
-	[[ "${status}" -eq 0 ]] || die "ConsoleLauncher failed"
-}
-
-junit5_module_install() {
-	# It is OK to let java-pkg-simple_src_install call einstalldocs for
-	# each module as long as each documentation file being installed
-	# has a unique filename among _all_ modules; otherwise, some files
-	# would overwrite other ones.
-	if [[ -f README.md ]]; then
-		mv -v README.md "README-${module}.md" ||
-			die "Failed to rename ${module}'s README.md"
-	fi
-	java-pkg-simple_src_install
-}
-
-src_install() {
-	junit5_foreach_module junit5_module_install
-	einstalldocs # For project-global documentation
-
-	if use doc; then
-		einfo "Installing Javadoc for all modules ..."
-		local apidoc="target/api"
-		java-pkg_dojavadoc "${apidoc}"
-	fi
-}
diff --git a/dev-java/libg/libg-7.1.0.ebuild b/dev-java/libg/libg-7.1.0.ebuild
index 4aeca1dfcea8..4085cb221b2f 100644
--- a/dev-java/libg/libg-7.1.0.ebuild
+++ b/dev-java/libg/libg-7.1.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}/bnd-${PV/_rc/.RC}"
 
 LICENSE="Apache-2.0 EPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 # aQute.bnd.test.jupiter does not exist
 # org.assertj.core.api.junit.jupiter does not exist
 RESTRICT="test" #839681
diff --git a/dev-java/lzma/Manifest b/dev-java/lzma/Manifest
index 137ca4fe1303..869d92c4ff91 100644
--- a/dev-java/lzma/Manifest
+++ b/dev-java/lzma/Manifest
@@ -1,2 +1 @@
-DIST lzma-22.01.7z 1261282 BLAKE2B 31bfa505626c6d22f84562d927cb8b7f0c6f9d7cfe9e38f49b33866957ad81f7bd1e6fb7b02a3e001edf9d64fc499b396e73738585e7d3a29fcd7d41dc65d1d7 SHA512 83e320242a51cb37caefd386a5768e64c6872101fd3c3cf4d3318bf834d27e84d8a92e3252987520a578b19ce3e2cddcbf9e10b909f5263c5cdc0710c2f26797
 DIST lzma-24.09.7z 1747679 BLAKE2B defb6e47a7f29a132ebed4bd71c00695708532670ef31de0917438b1b7a53e45144fa94f89e980af741d3c26862255a3d99c9b51cb06186bac20c5cdc272df97 SHA512 7d111668695da24061103f9287cd29f8f5dceca77d043a63ac1621d9f1c82e4e012efdcaa61ab24e56db33c5a70f04b426b71b3f224570a27b4e875fa38fdb0b
diff --git a/dev-java/lzma/lzma-22.01.ebuild b/dev-java/lzma/lzma-22.01.ebuild
deleted file mode 100644
index ecadcae4135f..000000000000
--- a/dev-java/lzma/lzma-22.01.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"
-
-inherit java-pkg-2 java-pkg-simple unpacker
-
-DESCRIPTION="Java code for LZMA compression and decompression"
-HOMEPAGE="https://7-zip.org/"
-SRC_URI="https://7-zip.org/a/lzma${PV/./}.7z -> ${P}.7z"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-BDEPEND="$(unpacker_src_uri_depends)"
-
-S="${WORKDIR}/Java"
-
-JAVA_SRC_DIR="SevenZip"
diff --git a/dev-java/lzma/lzma-24.09.ebuild b/dev-java/lzma/lzma-24.09.ebuild
index c5971d682334..15522a55a69d 100644
--- a/dev-java/lzma/lzma-24.09.ebuild
+++ b/dev-java/lzma/lzma-24.09.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 @@ S="${WORKDIR}/Java"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 BDEPEND="$(unpacker_src_uri_depends)"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index 0e24df463690..f5c5d9557d4b 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,6 +1,6 @@
 DIST mill-bin-0.11.12 62116087 BLAKE2B e64e2ec1a2c89e780ada3b779104826398e9ab12801aea937302d71be190dd6caea6c64045e878f202b631c7647d8897054fd120c11f576ed301ffc02e8f7c8e SHA512 920de40ca5d8178d33ce439cc6a48ad4ec5665fa248af24122f7869ef5ddfa21f643fbf9a4bfa0dda40b8c994e088b7e4089c534d809a7a31cd6ca764fb5e741
-DIST mill-bin-0.11.7 59806165 BLAKE2B bc97d64a692a33a482752828a703cb22d44bafeeb3aa329136d601058b56bf94703f97047be416bcbcfeb9633288f31e5715646aad359be59deffc957fc15b7c SHA512 c7c2cecd5cec6aab735e36182fade4e7360684795af42b528c1a7e5b0a0dc89dc4c68d47400d46121854c455f72e47f51c73ac4f8e70339ce5a7d18ae8b088de
 DIST mill-bin-0.12.0 67781970 BLAKE2B f705100c1b6a847cfbd9ccb8f170f9ec376a0d88c282741b20433f36377fc8cf132dbde3d1f6554799fc6fca4e7611b713a8fb1463a65791fcfe8c2924e2fe2a SHA512 9ed44a2438513ec77edf1d5d13dfa3c4a3156abf8fcc3e179572a81b3d62247109e2a48b947dfacf7ecfd335e564b30872e3dc1079890cb9d312da379c707764
 DIST mill-bin-0.12.1 67788135 BLAKE2B cfd10c21342159ebca4363c26df36bdb6512901112a419ad014ae3ae2f513d291f9e2d47293224d99eb7edc631e07dae846ad5f81ac53177f96ca16f1d2a7667 SHA512 9fe8d6dc01085503733ab5dc9af11f31da1859d67129ba300f9731eea1304545b4784bc0fb72694b7b74413987a91ce15ad8edf5812867ea2450c1a218761977
 DIST mill-bin-0.12.3 65455398 BLAKE2B 522a7c14b2408a73b471aa9fc677106c3b485ae127c912625bc65a0ff8e3fb71d73b5e98a623d01b7db5c9586f0cca227c2ec448f03f158430310befe97aedd3 SHA512 a6bef9a14a9bed714f53af9d2ef5a3513b76556a625126612b6112b75070e6aa2b420ba8c89f47c176e3c76209614124f52b42f9b7e17a44099fa6e236bdbe7b
 DIST mill-bin-0.12.4 65746110 BLAKE2B 8e2ca4b04eb1eb7ca3ab1ac239465b423fdc9c81d4708f91249cb8e243a9210bcc346a2f90310f88387868e6f5ee4cd6b79d399129c5d4f8639094acb8bc427b SHA512 3890b9c06e662e35a1bde9cb89efbc709a7fb64328eab7b9aeabe6bc946edd82a157f6d57cd2e6e8265a040f2342b27b9e714402adfbbf951587eb5ca4ec3a4b
+DIST mill-bin-0.12.5 65797309 BLAKE2B 8b31ac28b4a78bcd1f10a42d4669f9a582e5f0698a697621a45b371025bb98a26fd92e4bf01edb4ef95373761c96954101c5ad13c1773fac649340816d2959b7 SHA512 0248b457f01687bf9dc5e248ec61aa16a2a08abf28ce22170defadb4be34ff69919a95a2f599b5ae4acc41caace2386e2a033b0858e73676b3f7049d47b232d4
diff --git a/dev-java/mill-bin/mill-bin-0.11.7.ebuild b/dev-java/mill-bin/mill-bin-0.11.7.ebuild
deleted file mode 100644
index ffb3d77a5ada..000000000000
--- a/dev-java/mill-bin/mill-bin-0.11.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN%-bin}
-
-DESCRIPTION="A Java/Scala build tool"
-HOMEPAGE="https://com-lihaoyi.github.io/mill/"
-SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
-KEYWORDS="amd64"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	newbin "${DISTDIR}"/${P} ${MY_PN}
-}
diff --git a/dev-java/mill-bin/mill-bin-0.12.3.ebuild b/dev-java/mill-bin/mill-bin-0.12.3.ebuild
index e33ff36d8393..b2b4d7d3939e 100644
--- a/dev-java/mill-bin/mill-bin-0.12.3.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.12.3.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 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND=">=virtual/jre-1.8:*"
 
diff --git a/dev-java/mill-bin/mill-bin-0.12.5.ebuild b/dev-java/mill-bin/mill-bin-0.12.5.ebuild
new file mode 100644
index 000000000000..74207d3f4661
--- /dev/null
+++ b/dev-java/mill-bin/mill-bin-0.12.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN%-bin}
+
+DESCRIPTION="A Java/Scala build tool"
+HOMEPAGE="https://mill-build.org/"
+SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	newbin "${DISTDIR}"/${P} ${MY_PN}
+}
diff --git a/dev-java/mockito/mockito-2.28.2-r1.ebuild b/dev-java/mockito/mockito-2.28.2-r1.ebuild
index d691c2ee07e7..3bbd8b65d910 100644
--- a/dev-java/mockito/mockito-2.28.2-r1.ebuild
+++ b/dev-java/mockito/mockito-2.28.2-r1.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 ~arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 # Tests need a version of byte-buddy supporting Java 21. #930103
 CP_DEPEND="
diff --git a/dev-java/mockito/mockito-2.28.2.ebuild b/dev-java/mockito/mockito-2.28.2.ebuild
deleted file mode 100644
index 92706ad5b55e..000000000000
--- a/dev-java/mockito/mockito-2.28.2.ebuild
+++ /dev/null
@@ -1,106 +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="org.mockito:mockito-core:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Mockito mock objects library core API and implementation"
-HOMEPAGE="https://github.com/mockito/mockito"
-SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 ~arm64 ppc64"
-
-CP_DEPEND="
-	dev-java/asm:9
-	dev-java/byte-buddy:0
-	dev-java/objenesis:0
-"
-
-DEPEND="
-	dev-java/junit:4
-	dev-java/opentest4j:0
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-	test? ( dev-java/assertj-core:3 )
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-# see https://bugs.gentoo.org/903897
-PATCHES=(
-	"${FILESDIR}/mockito-2.28.2-skip-failing-tests.patch"
-	"${FILESDIR}/mockito-2.28.2-fix-unused-stubbings-test.patch"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="org.mockito"
-JAVA_CLASSPATH_EXTRA="junit-4 opentest4j"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_EXCLUDES=(
-	org.mockito.internal.junit.JUnitRuleTest # We run it in JAVA_TEST_RUN_ONLY
-	org.mockito.internal.util.reflection.DummyClassForTests # No runnable methods
-	org.mockito.internal.util.reflection.DummyParentClassForTests # No runnable methods
-	org.mockito.junit.TestableJUnitRunner # No runnable methods
-	org.mockitoutil.TestBase #  No runnable methods
-)
-JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3,junit-4"
-JAVA_TEST_RUN_ONLY=(
-	# This needs to run separately, otherwise one of its 4 tests would fail.
-	org.mockito.internal.junit.JUnitRuleTest
-)
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	default
-	# dev-java/byte-buddy is built from byte-buddy-dep without shaded stuff.
-	sed \
-		-e 's:net.bytebuddy.jar.asm:org.objectweb.asm:' \
-		-i src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java \
-		-i src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	mv target/classes/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.{class,raw} || die
-	jar ufv mockito.jar -C target/classes org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.raw || die
-}
-
-src_test() {
-	# Increasing number of test failures with higher Java versions
-	# Test failures are documented in https://bugs.gentoo.org/903897
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge 11; then
-		JAVA_TEST_EXCLUDES+=(
-			org.mockito.internal.stubbing.defaultanswers.ReturnsMocksTest
-			org.mockitousage.bugs.GenericsMockitoAnnotationsTest
-		)
-	fi
-	if ver_test "${vm_version}" -ge 17; then
-		JAVA_TEST_EXCLUDES+=(
-			org.concurrentmockito.ThreadsRunAllTestsHalfManualTest
-			org.mockitousage.matchers.InvalidUseOfMatchersTest
-			org.mockitousage.serialization.DeepStubsSerializableTest
-			org.mockitousage.stubbing.StubbingWithDelegateTest
-		)
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED )
-	fi
-	# First run what needs to run separately
-	java-pkg-simple_src_test
-	# And then the other tests
-	JAVA_TEST_RUN_ONLY=""
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/open-test-reporting-events/Manifest b/dev-java/open-test-reporting-events/Manifest
index 9ca788989fa9..32e628468570 100644
--- a/dev-java/open-test-reporting-events/Manifest
+++ b/dev-java/open-test-reporting-events/Manifest
@@ -1 +1,2 @@
 DIST open-test-reporting-0.1.0-M1.tar.gz 98076 BLAKE2B 1780f24776ddbb31752044c7ebee85cd852425b295b2c61d25e36856123e0d9cd4420ecb4f88e17bba52746dd209a5160bfe3bf0c05ac544a0a94e74c49ce1b2 SHA512 75523de2342b1b1027e68eb738ffef8571d6bb81b2cb0d87c26b097d8aac98f52728a6a5f46420ce8bb051d60b226646aef47ec00eee5876b833ba4e1121f5c7
+DIST open-test-reporting-0.2.0-M1.tar.gz 1055220 BLAKE2B 9e0431e607ec9e4b4584d0a4508f4522724df851c3fcda4ddfbdd3b7202569c414de19bd45cb1093fd38dc7d4c7c982ee38b20cbec5d61b5e7d7baf5869f7efe SHA512 89ea03cf4e4b46a781d081cf7191f82f89c32c33f79bdc9b16f6f9046dc6913621d4a67885932f6dba4915a4357d0e77fd9f6b48f81d13aa601d75faeef9f77c
diff --git a/dev-java/open-test-reporting-events/open-test-reporting-events-0.2.0_pre1.ebuild b/dev-java/open-test-reporting-events/open-test-reporting-events-0.2.0_pre1.ebuild
new file mode 100644
index 000000000000..730a117287bf
--- /dev/null
+++ b/dev-java/open-test-reporting-events/open-test-reporting-events-0.2.0_pre1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_PROVIDES=(
+	"org.opentest4j.reporting:open-test-reporting-schema:${PV}-M1"
+	"org.opentest4j.reporting:open-test-reporting-events:${PV}-M1"
+)
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Language-agnostic test reporting format and tooling"
+HOMEPAGE="https://github.com/ota4j-team/open-test-reporting"
+MY_PV="${PV/_pre/-M}"
+SRC_URI="https://github.com/ota4j-team/open-test-reporting/archive/r${MY_PV}.tar.gz -> open-test-reporting-${MY_PV}.tar.gz"
+S="${WORKDIR}/open-test-reporting-r${MY_PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND="
+	dev-java/apiguardian-api:0
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_CLASSPATH_EXTRA="apiguardian-api"
+JAVADOC_CLASSPATH="${JAVA_CLASSPATH_EXTRA}"
+JAVADOC_SRC_DIRS=(
+	"schema/src/main/java"
+	"events/src/main/java"
+)
+
+src_compile() {
+	einfo "open-test-reporting-schema.jar"
+	JAVA_AUTOMATIC_MODULE_NAME="org.opentest4j.reporting.schema"
+	JAVA_JAR_FILENAME="open-test-reporting-schema.jar"
+	JAVA_RESOURCE_DIRS="schema/src/main/resources"
+	JAVA_SRC_DIR="schema/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":open-test-reporting-schema.jar"
+	rm -r target || die
+
+	einfo "open-test-reporting-events.jar"
+	JAVA_AUTOMATIC_MODULE_NAME="org.opentest4j.reporting.events"
+	JAVA_JAR_FILENAME="open-test-reporting-events.jar"
+	JAVA_RESOURCE_DIRS=()
+	JAVA_SRC_DIR="events/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":open-test-reporting-events.jar"
+	rm -r target || die
+
+	use doc && ejavadoc
+}
+
+src_install() {
+	java-pkg_dojar "open-test-reporting-schema.jar"
+	java-pkg-simple_src_install
+
+	if use source; then
+		java-pkg_dosrc "schema/src/main/java/*"
+		java-pkg_dosrc "events/src/main/java/*"
+	fi
+}
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 3db04f596a46..7405b9ad4680 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,15 +1,9 @@
-DIST OpenJDK-jdk_aarch64_alpine-linux_hotspot_24_20-ea.tar.gz 213486173 BLAKE2B 429486689b28a436462d20691919ff90f242ea0d7f9e2f35c10596cb21780c14cfc8434531e2c75af0a486cec9004a815815ce0ac759a99612c8d325fd925230 SHA512 e003b0f91325560891c831e4e37a641699685b8e32f032040c65bf75c7557f89673976bd87ece4ad31a8e5b46f7854a830d553f91804379661319da087d9a9f1
-DIST OpenJDK-jdk_aarch64_alpine-linux_hotspot_25_2-ea.tar.gz 138188020 BLAKE2B 5565338caf2b16e8ae91ab78709314b3a1540f24d38230f547113edaa24ce375f2decd19bc17126e48c823342775c6d4747c99167a58d5e15adebb896c99392f SHA512 e1470842b0f023d92a6e228f7ca9a1edd9d27d4ae5850a935ed862176289dfccfac8c9037db38af5cfd70378d4526aa4e46cd3875779b2aabfe60f2394529087
-DIST OpenJDK-jdk_aarch64_linux_hotspot_24_20-ea.tar.gz 213435180 BLAKE2B 0163fbc674b7f04dc69bf2d57444e2f9625f22050a6ae09bd976d9d393d69c3b557332302a6ff0cc58e04ea910bb4f2bc5fda677024c06ac568df6cc57698d11 SHA512 b6fd2b0750e22dd986314314e126932dc95475314636733083d1d0f50c1e298371d418cad098e0062f6e4a3b3d4a2f50e3cf2e7954db407b01ea5f3432e606d2
-DIST OpenJDK-jdk_aarch64_linux_hotspot_25_2-ea.tar.gz 138225211 BLAKE2B b6d029aa8870eeb1600e626567bc96c5e9b8a648a984d3e92c18a90f0276c72b6baa5c587842522f5fdf70e47822d1ef79a343869a3d90ebeeee235d728419f3 SHA512 dbda88f277a6e915f8866fe408612188e4e0dd9b76acee25707cbbf979eae8fe21b2739a048a1f57039a585c06cd4c710f774732624d238e6c76b1e232dc5ac1
-DIST OpenJDK-jdk_ppc64le_linux_hotspot_24_20-ea.tar.gz 214984344 BLAKE2B c6582a845579246f920b0ab94657870650669a30e45f0435a4ad8b63657771b5a708cf5aa417f87d9e2a7dde7fae0603864e21558e022fd39cfa818d1d5bd20b SHA512 f5e8644094b737a3eb8b1d40b2140fbc283e9c397c0dd23bc53c4678430abf84dc8f2e264ac4aee824b135e30dd3df390d8a38af5b7e7ac74e945ce081984f91
-DIST OpenJDK-jdk_ppc64le_linux_hotspot_25_2-ea.tar.gz 138760006 BLAKE2B 0526ed58a4068f876422d0a99f832a79c8e298e8152ebc29ec2fd281895d87f529c7cff404fff20273bc990cabef337e708a107da4d77686660c9ad796db8d28 SHA512 d1ef8bdc32adb89be2c37c8a34d7547705c886ed7fd7b80a65a52b9e7ea1afb86d483edc5b2ead891a1860aad6aebb2f497fc5c11bdad9bc7a6b21f3f49aa31b
-DIST OpenJDK-jdk_riscv64_linux_hotspot_24_20-ea.tar.gz 211454913 BLAKE2B c5aec2757115c71abf2a3d711c5cc8074661ba558d7657ceb1774e2a59681a58a08e167eb17aeae7140a61aa8f32cab891c56130ea74db490a51795d81a148c6 SHA512 78e601771ce3b22c3ec361aceac53184524eccb6ae0e0434be415a7af4cd528253facaf8d161bdec691946394f8fdc47a0b37d8fd3cffae0627dbcbd347ccf98
-DIST OpenJDK-jdk_riscv64_linux_hotspot_25_2-ea.tar.gz 137068288 BLAKE2B ca30c5dc1240edb1c8f580df359937cd25528fa9f11b29f6c6a92aaa668c359c6e0522c886a405e53868c56c769c2ad7cc164837cdea25db8e802946377da5be SHA512 1b1cbb7ee68a4e7de47017be23d3ac66f010e99175ed7d9ef66c216ae2bce6c8eb94629633cfa4ddd4a7d27deb359289bce48d54eec203d0be343c47bc93c318
-DIST OpenJDK-jdk_x64_alpine-linux_hotspot_24_20-ea.tar.gz 215768214 BLAKE2B 32dc974b0e13a14c79c77333bc2208b29455f5c1f2818bc2480b09ae7ff1f48e2ea9c03ae80264a4bf389bdf3df9f17157456576e943fd71713fae97110404d9 SHA512 62f1776e1b34fd5950450745e1de81ade2f882037b8bb707926c9deec19101d3623e1c9d76702d577458cbaf0d1239be5674d3752e8d58eb0200e4b446464fe1
-DIST OpenJDK-jdk_x64_alpine-linux_hotspot_25_2-ea.tar.gz 139310462 BLAKE2B e6e7f2fc5390b74a2206beda0a40bb83f41c7ae576957499912bb4c56dc64e61af8bf791436d43d433f2ea2249cf77af09e1e0a8960597c3bbc8fd669fd6703a SHA512 a97f506056ea8d97f450e1aa7e4f6f6be39c4d7f006877d40aaef30bce745cab06a80bb53c078973280024c0b84452d2768b03b20eaa6cdfbf9e1ad5d1acdd6d
-DIST OpenJDK-jdk_x64_linux_hotspot_24_20-ea.tar.gz 215528275 BLAKE2B abfe4b018d32fcd8c814033bfea181300b3c166694e2e3e58dbba53bf7d2b6236294e619837474cefdea972d229588e41b488d7043aca9533bc14376dcf79da9 SHA512 b7ccdb432f7f837acfbe6e617486d032bf6da191ab767e2a607ca4cea0e46b58ebc4d91b9e8611771ae0814ed60db4f9c9def3d1987b85c9f2c31bb43d6bbabc
-DIST OpenJDK-jdk_x64_linux_hotspot_25_2-ea.tar.gz 139202344 BLAKE2B e86a13c0a8dcfadbad2142d195afa56658569230fa0df823932be3b961564fa497a3ace37dbea8a98097b6be6fa0aa8ae8756a5e130d4483427a000929ae4ce5 SHA512 75cbc70ab4780c201b5158b268808408bcfc383f80deb14a98187439255a2116f7d115028386c35ee7961a0ea43ee2c7db3eebb2d8aeb396a59d0081dfebf428
+DIST OpenJDK-jdk_aarch64_alpine-linux_hotspot_25_5-ea.tar.gz 138225970 BLAKE2B 1430c5c54bec1b31659a67ca8d93868fab07b27d761898917520219e6fe8f21d8b36fb959ce9c9b2e545b2c2f5c4be1caf27b4b8757a426dbd5397de464d3fc6 SHA512 d71003a807cb861bcf12bd9fdf4076807c9864f240f8a5e919b0607bc10277b73be2f3e0a2656adfd606894ba373aac2f44ce376811a1dbe84c083e5cd0c56db
+DIST OpenJDK-jdk_aarch64_linux_hotspot_25_5-ea.tar.gz 138260372 BLAKE2B 31d457073e4ca76f4cfcbf1322d58663cf0b357f109f07d64f5edf81e3b7d3e6476f7c22295e3cf0f1cc9c4b8548fcd39cf31868bdbd527d9a1140ce2aa4a74a SHA512 ead72403cfed5f7ad5be68e8312d92edb599d5efdee9dfab4c5daee6a25dc1b928d47027488278b58deb32002157a7eeb95b36f918fe2941924cd9c7d15483fc
+DIST OpenJDK-jdk_ppc64le_linux_hotspot_25_5-ea.tar.gz 138780103 BLAKE2B 9d5a3a41df35dd57cc1588abbd834b4a22a4a764320e5e9a46a8c33a89ad2e9a49d0651271d39527501fb9dbb62fbf8797f1193ec06eeb142662dec7f7e652ae SHA512 ea32bf9b1bc049af7c602eaafd5c078318b8c76528ccf0c24cf3e74539a067bc778d328355e8d79473160d2e9fdcedc733faa903bbc860cdf4718a8a66267d42
+DIST OpenJDK-jdk_riscv64_linux_hotspot_25_5-ea.tar.gz 137101096 BLAKE2B d133722c75705d5d3088e83520bc6378e5d72f41f2d9d9fd985feeca6df21f1e0cde4c366dba735aa32f9cc3cf538796f319b3d9d6a57acf6c3f0d867401552f SHA512 3beac34cf232e8f6ba33f32eaefb52640b67cf293865f340dc84793e5df39f634c422726fea23ba0d8bd5594c1595e20ef086f317ed81da01918846b0411bf42
+DIST OpenJDK-jdk_x64_alpine-linux_hotspot_25_5-ea.tar.gz 139323498 BLAKE2B eeac12f73abd0430802cf2ff84dd9858a8448b1ebb657cc059164dc228f614e4ec9ef1796f0b7e5e1728af3bb6ed03ff8a89624366b4a964cd54f91dd1ab2b00 SHA512 3de24f9eaf8941147fc149dca82deaa18061218054617ab0cad4b4de7f1258899762e321e9f33a969301ae40c487e0eec81abd973b515a55271c7d4ee8a44ed0
+DIST OpenJDK-jdk_x64_linux_hotspot_25_5-ea.tar.gz 139223383 BLAKE2B 88c909e9afd9a9646246e8708a5f98dbbfe9846b4081608c185a0715452ab663ae24a0d3c7817b49e01899054ba8d1a5f9968e1e0e8fae737304e21dc8674c4d SHA512 2f30cead9be2ffad5f475fe547dd5a113e61c5c2108e49b58da10ecbef7dd97b4e4148d0684ad9f3561ad64963c4be78cb822e985712b818329ec003946fd75c
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.25_9.tar.gz 192125336 BLAKE2B e083ce8691f8462310eeaa7495d26519754f5bfadc8a786dd188f1dad4dc36164eea9220125340b43c9e6b4321be6e26d66a9c18247a6462e4cae9f453fe1171 SHA512 860fff5eff6ef2a29062aac0ee7f90d80dca417fb58ccbf9a9f2ca96a8dc4798a00dab42deedbc64a371d0356b17e6cd12cdc2b2879edfcec9463ffc004ce5fb
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.25_9.tar.gz 182871332 BLAKE2B ac6ba9e02fcec38dbb685cdebf379ecdcb5041bc53a71a0896baf7f2628faaa0dd1402b045a57010e2495c16e48116fd1216fe6d4b6cf35cbc996dafe8516e0a SHA512 db0761f8b0baa82c61567a869f2c23da61470d055ecbd73c7693a7be37167282af7387006f22a0c7a46e1e71591615fac0431925987af8fb8e36d77207669856
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.25_9.tar.gz 177532830 BLAKE2B 5a2e15a9cd601dfbc6749875ee53de1ca5d41c41335e52588c778412499c4825b9108bcf8dacbe250814ff5664d8b8fceefceb738dc24c3ab3d13d292fa3d027 SHA512 8ba8c210717046ab167eeccfc8a3b18e34e77262a0aef866b6268cbd5b91bfd6ed90003ce7de852d6e24f923e044839092e5faac2f3df6273b8b3868eb7e7398
diff --git a/dev-java/openjdk-bin/openjdk-bin-21.0.5_p11.ebuild b/dev-java/openjdk-bin/openjdk-bin-21.0.5_p11.ebuild
index 7fc34d184029..a4636d98d3cc 100644
--- a/dev-java/openjdk-bin/openjdk-bin-21.0.5_p11.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-21.0.5_p11.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
@@ -42,7 +42,7 @@ S="${WORKDIR}/jdk-${MY_PV}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT=$(ver_cut 1)
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
 IUSE="alsa cups headless-awt selinux source"
 
 RDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-24_p20_beta.ebuild b/dev-java/openjdk-bin/openjdk-bin-24_p20_beta.ebuild
deleted file mode 100644
index 0d6bc9a78d7a..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-24_p20_beta.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-vm-2 toolchain-funcs
-
-abi_uri() {
-	local baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV1}/"
-	local musl=
-	local os=linux
-
-	case ${2} in
-		*-macos)    os=mac      ;;
-		*-solaris)  os=solaris  ;;
-	esac
-
-	if [[ ${3} == musl ]]; then
-		os=alpine-linux
-		musl=true
-	fi
-
-	echo "${2-$1}? (
-		${musl:+ elibc_musl? ( }
-			${baseuri}/OpenJDK-jdk_${1}_${os}_hotspot_${MY_PV2//+/_}.tar.gz
-		${musl:+ ) } )"
-}
-
-MY_PV=${PV/_p/+}
-MY_PV1=${MY_PV/_beta/-ea-beta}
-MY_PV2=${MY_PV1/-beta/}
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
-SRC_URI="
-	$(abi_uri aarch64 arm64)
-	$(abi_uri aarch64 arm64 musl)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 amd64)
-	$(abi_uri x64 amd64 musl)
-	$(abi_uri riscv64 riscv)
-"
-S="${WORKDIR}/jdk-${MY_PV%_beta}"
-
-LICENSE="GPL-2-with-classpath-exception"
-SLOT=$(ver_cut 1)
-#	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="alsa cups headless-awt selinux source"
-
-RDEPEND="
-	>=sys-apps/baselayout-java-0.1.0-r1
-	kernel_linux? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-		media-libs/harfbuzz
-		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
-		elibc_musl? ( sys-libs/musl )
-		sys-libs/zlib
-		alsa? ( media-libs/alsa-lib )
-		cups? ( net-print/cups )
-		selinux? ( sec-policy/selinux-java )
-		!headless-awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			x11-libs/libXtst
-		)
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_unpack() {
-	default
-	if [[ ${A} == *_mac_* ]] ; then
-		mv -v "${S}/Contents/Home/"* "${S}" || die
-		rm -Rf "${S}/Contents"  # drop macOS executable
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}/${dest#/}"
-
-	# on macOS if they would exist they would be called .dylib, but most
-	# importantly, there are no different providers, so everything
-	# that's shipped works.
-	if [[ ${A} != *_mac_* ]] ; then
-		# Not sure why they bundle this as it's commonly available and they
-		# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-		# also has an explicit dependency while Oracle seemingly dlopens it.
-		rm -vf lib/libfreetype.so || die
-
-		# prefer system copy # https://bugs.gentoo.org/776676
-		rm -vf lib/libharfbuzz.so || die
-
-		# Oracle and IcedTea have libjsoundalsa.so depending on
-		# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-		if ! use alsa ; then
-			rm -v lib/libjsound.* || die
-		fi
-
-		if use headless-awt ; then
-			rm -v lib/lib*{[jx]awt,splashscreen}* || die
-		fi
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-25_p2_beta.ebuild b/dev-java/openjdk-bin/openjdk-bin-25_p2_beta.ebuild
deleted file mode 100644
index 0d6bc9a78d7a..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-25_p2_beta.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-vm-2 toolchain-funcs
-
-abi_uri() {
-	local baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV1}/"
-	local musl=
-	local os=linux
-
-	case ${2} in
-		*-macos)    os=mac      ;;
-		*-solaris)  os=solaris  ;;
-	esac
-
-	if [[ ${3} == musl ]]; then
-		os=alpine-linux
-		musl=true
-	fi
-
-	echo "${2-$1}? (
-		${musl:+ elibc_musl? ( }
-			${baseuri}/OpenJDK-jdk_${1}_${os}_hotspot_${MY_PV2//+/_}.tar.gz
-		${musl:+ ) } )"
-}
-
-MY_PV=${PV/_p/+}
-MY_PV1=${MY_PV/_beta/-ea-beta}
-MY_PV2=${MY_PV1/-beta/}
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
-SRC_URI="
-	$(abi_uri aarch64 arm64)
-	$(abi_uri aarch64 arm64 musl)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 amd64)
-	$(abi_uri x64 amd64 musl)
-	$(abi_uri riscv64 riscv)
-"
-S="${WORKDIR}/jdk-${MY_PV%_beta}"
-
-LICENSE="GPL-2-with-classpath-exception"
-SLOT=$(ver_cut 1)
-#	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="alsa cups headless-awt selinux source"
-
-RDEPEND="
-	>=sys-apps/baselayout-java-0.1.0-r1
-	kernel_linux? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-		media-libs/harfbuzz
-		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
-		elibc_musl? ( sys-libs/musl )
-		sys-libs/zlib
-		alsa? ( media-libs/alsa-lib )
-		cups? ( net-print/cups )
-		selinux? ( sec-policy/selinux-java )
-		!headless-awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			x11-libs/libXtst
-		)
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_unpack() {
-	default
-	if [[ ${A} == *_mac_* ]] ; then
-		mv -v "${S}/Contents/Home/"* "${S}" || die
-		rm -Rf "${S}/Contents"  # drop macOS executable
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}/${dest#/}"
-
-	# on macOS if they would exist they would be called .dylib, but most
-	# importantly, there are no different providers, so everything
-	# that's shipped works.
-	if [[ ${A} != *_mac_* ]] ; then
-		# Not sure why they bundle this as it's commonly available and they
-		# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-		# also has an explicit dependency while Oracle seemingly dlopens it.
-		rm -vf lib/libfreetype.so || die
-
-		# prefer system copy # https://bugs.gentoo.org/776676
-		rm -vf lib/libharfbuzz.so || die
-
-		# Oracle and IcedTea have libjsoundalsa.so depending on
-		# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-		if ! use alsa ; then
-			rm -v lib/libjsound.* || die
-		fi
-
-		if use headless-awt ; then
-			rm -v lib/lib*{[jx]awt,splashscreen}* || die
-		fi
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-25_p5_beta.ebuild b/dev-java/openjdk-bin/openjdk-bin-25_p5_beta.ebuild
new file mode 100644
index 000000000000..1df73d6d9ac5
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-25_p5_beta.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2 toolchain-funcs
+
+abi_uri() {
+	local baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV1}/"
+	local musl=
+	local os=linux
+
+	case ${2} in
+		*-macos)    os=mac      ;;
+		*-solaris)  os=solaris  ;;
+	esac
+
+	if [[ ${3} == musl ]]; then
+		os=alpine-linux
+		musl=true
+	fi
+
+	echo "${2-$1}? (
+		${musl:+ elibc_musl? ( }
+			${baseuri}/OpenJDK-jdk_${1}_${os}_hotspot_${MY_PV2//+/_}.tar.gz
+		${musl:+ ) } )"
+}
+
+MY_PV=${PV/_p/+}
+MY_PV1=${MY_PV/_beta/-ea-beta}
+MY_PV2=${MY_PV1/-beta/}
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+SRC_URI="
+	$(abi_uri aarch64 arm64)
+	$(abi_uri aarch64 arm64 musl)
+	$(abi_uri ppc64le ppc64)
+	$(abi_uri x64 amd64)
+	$(abi_uri x64 amd64 musl)
+	$(abi_uri riscv64 riscv)
+"
+S="${WORKDIR}/jdk-${MY_PV%_beta}"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT=$(ver_cut 1)
+#	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="alsa cups headless-awt selinux source"
+
+RDEPEND="
+	>=sys-apps/baselayout-java-0.1.0-r1
+	kernel_linux? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+		media-libs/harfbuzz
+		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
+		elibc_musl? ( sys-libs/musl )
+		sys-libs/zlib
+		alsa? ( media-libs/alsa-lib )
+		cups? ( net-print/cups )
+		selinux? ( sec-policy/selinux-java )
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_unpack() {
+	default
+	if [[ ${A} == *_mac_* ]] ; then
+		mv -v "${S}/Contents/Home/"* "${S}" || die
+		rm -Rf "${S}/Contents"  # drop macOS executable
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest#/}"
+
+	# on macOS if they would exist they would be called .dylib, but most
+	# importantly, there are no different providers, so everything
+	# that's shipped works.
+	if [[ ${A} != *_mac_* ]] ; then
+		# Not sure why they bundle this as it's commonly available and they
+		# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+		# also has an explicit dependency while Oracle seemingly dlopens it.
+		rm -vf lib/libfreetype.so || die
+
+		# prefer system copy # https://bugs.gentoo.org/776676
+		rm -vf lib/libharfbuzz.so || die
+
+		# Oracle and IcedTea have libjsoundalsa.so depending on
+		# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+		if ! use alsa ; then
+			rm -v lib/libjsound.* || die
+		fi
+
+		if use headless-awt ; then
+			rm -v lib/lib*{[jx]awt,splashscreen}* || die
+		fi
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.5_p11.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.5_p11.ebuild
index 9fe0d3158b43..31c5f7330c8f 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.5_p11.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.5_p11.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
@@ -21,7 +21,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net/"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="-* amd64"
 IUSE="alsa cups headless-awt selinux"
 
 RDEPEND="
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 906b71ad6e36..fa6af5a7e9ba 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -2,7 +2,7 @@ DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f
 DIST openjdk-11.0.25_p9.tar.gz 116541441 BLAKE2B 5be0d6e1996860f0d8f36732758207044668fdbd6e9c9b21b96c897d526f2d86a931f2b8d732ebe4b668679c0e48cb49a472baf29d4ea5785dc4edb0d8a5de2f SHA512 25971b26d04dd111a21c112f694968c8d56c3692a62eb1366a1f49617a308a3a0cb37ab92ff02cff727041d6e32cbbc345f313db46df58f9e933a801a1588e8b
 DIST openjdk-17.0.13_p11.tar.gz 107315661 BLAKE2B e403a8f33d4e79dd5c77a5dbfc991b443e15bddefe7cfde6cbd6f8df29f1cf499d0bd467d23f0c1b89b92b1dca16ebfb398a5c64b8787f787465a8a5f50bdfce SHA512 6f2220b3b0b9ab4441968d487858449f0e58400bfbbf8cc322b6c9393ab44869ea27285bed1022ac531f0a9eec5b7d6a07db4f7e78b094bb5ca8cedd5f40711a
 DIST openjdk-21.0.5_p11.tar.gz 112679148 BLAKE2B 6cfb2ab73e1bcc5d74c28f56e163778ca42fa1b9eda5367f2198827eae04d5a269926c97b326d1e71b2a57f2780588f538db8d3a81f367903fd967534747d3af SHA512 2fdfdb7e21fcaf97590fa54317f87169d5fdabf38027f4f6570942b2af637fc9ace3d35c3bbb0df29720e7a0f6d6a4087253a713389743ed7947e433d7b8103b
-DIST openjdk-24.0.1_p0.tar.gz 122453193 BLAKE2B 660539336f68d7ad850e8d9f2e8ad68fe4ef4a8c936c5c2f255b6651d9cd8464cc0c2abebfbdb933d934c44906b3d9bbf3e0321ae1a224ab8a00eea95a827b10 SHA512 db75846a92bb3c8edfcfcc3b35cefd3d80c03c9fd05bf994983174b0696a14e75130283407371eb765d16f5820d5ca4744c94332c8ed5a33560b343effedb37d
+DIST openjdk-25_p5.tar.gz 122561864 BLAKE2B 70c6d9d46a964338c35e0980ca29bf1e27aefe904108c198520c312a291b6e88eacd94694e37a81402428074421defa3748435393ce3aa9a2f6587fdb99281eb SHA512 b975d7aa3497df85c4b9028353f0a8d0f008948e4e1ea64c3828008e96282dd27c2c0862d73e059944db022dbcfabe567f0f40850339e86a7d936086e6b6e77e
 DIST openjdk-8.432_p06.tar.gz 92765730 BLAKE2B 9c3823ed0394730cdbf306a92062656a793dd7b57a333319282a6aa01a8150927227d3e91ee2ee975108b8c3aa2b0b87669af2971dfc27a6400fb7c4ef22d246 SHA512 263642d56915e0533c154ab51148b0f6a9860b243dddf5bbb70f49174d07dd505393fa6e257bfa34eca6e95ecd4f271737fa48fee8db93e624e8336fe488eb83
 DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
 DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f
diff --git a/dev-java/openjdk/openjdk-21.0.5_p11-r1.ebuild b/dev-java/openjdk/openjdk-21.0.5_p11-r1.ebuild
index 7949cd6b67aa..258d469289b7 100644
--- a/dev-java/openjdk/openjdk-21.0.5_p11-r1.ebuild
+++ b/dev-java/openjdk/openjdk-21.0.5_p11-r1.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
@@ -46,7 +46,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 
 # lto temporarily disabled due to https://bugs.gentoo.org/916735
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source +system-bootstrap systemtap"
diff --git a/dev-java/openjdk/openjdk-24.0.1_p0.ebuild b/dev-java/openjdk/openjdk-24.0.1_p0.ebuild
deleted file mode 100644
index 24341f94692b..000000000000
--- a/dev-java/openjdk/openjdk-24.0.1_p0.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-PPC64_XPAK="21.0.0_p35" # big-endian bootstrap tarball
-X86_XPAK="21.0.0_p35"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
-# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
-bootstrap_uri() {
-	local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
-	local suff="tar.xz"
-	local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
-	local ver="${2:?${FUNCNAME[0]}: version not specified}"
-	local cond="${3-}"
-	[[ ${cond} == elibc_musl* ]] && local musl=yes
-
-	# here be dragons
-	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
-}
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release tag.
-#	MY_PV="${PV%_p*}-ga" # '-ga' isn't available
-MY_PV="${PV/_p/+}"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org"
-SRC_URI="
-	https://github.com/${PN}/jdk24u/archive/jdk-${MY_PV}.tar.gz
-
-		-> ${P}.tar.gz
-	!system-bootstrap? (
-		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-		$(bootstrap_uri x86 ${X86_XPAK})
-	)
-"
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
-
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="${MY_PV%%[.+]*}"
-#	KEYWORDS="" # not LTS
-
-# lto temporarily disabled due to https://bugs.gentoo.org/916735
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source +system-bootstrap systemtap"
-
-REQUIRED_USE="
-	javafx? ( alsa !headless-awt )
-	!system-bootstrap? ( jbootstrap )
-	!system-bootstrap? ( || ( ppc64 x86 ) )
-"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	media-libs/lcms:2=
-	sys-libs/zlib
-	media-libs/libjpeg-turbo:0=
-	systemtap? ( dev-debug/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	javafx? ( dev-java/openjfx:${SLOT}= )
-	system-bootstrap? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}
-			dev-java/openjdk:${SLOT}
-		)
-	)
-"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	[[ ${MERGE_TYPE} == "binary" ]] && return
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-}
-
-src_prepare() {
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	if has_version dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT}
-	elif use !system-bootstrap ; then
-		local xpakvar="${ARCH^^}_XPAK"
-		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-	else
-		JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
-		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-		JDK_HOME=${JDK_HOME#*/}
-		JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*}
-		export JDK_HOME
-	fi
-
-	# Work around stack alignment issue, bug #647954. in case we ever have x86
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# bug 906987; append-cppflags doesnt work
-	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	# Strip lto related flags, we rely on USE=lto and --with-jvm-features=link-time-opt
-	# https://bugs.gentoo.org/833097
-	# https://bugs.gentoo.org/833098
-	filter-lto
-	filter-flags -fdevirtualize-at-ltrans
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-
-	local myconf=(
-		--disable-ccache
-		--disable-precompiled-headers
-		--disable-warnings-as-errors
-		--enable-full-docs=no
-		--with-boot-jdk="${JDK_HOME}"
-		--with-extra-cflags="${CFLAGS}"
-		--with-extra-cxxflags="${CXXFLAGS}"
-		--with-extra-ldflags="${LDFLAGS}"
-		--with-freetype="${XPAK_BOOTSTRAP:-system}"
-		--with-giflib="${XPAK_BOOTSTRAP:-system}"
-		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
-		--with-lcms="${XPAK_BOOTSTRAP:-system}"
-		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
-		--with-libpng="${XPAK_BOOTSTRAP:-system}"
-		--with-native-debug-symbols=$(usex debug internal none)
-		--with-vendor-name="Gentoo"
-		--with-vendor-url="https://gentoo.org"
-		--with-vendor-bug-url="https://bugs.gentoo.org"
-		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-		--with-vendor-version-string="${PVR}"
-		--with-version-pre=""
-		--with-version-string="${PV%_p*}"
-		--with-version-build="${PV#*_p}"
-		--with-zlib="${XPAK_BOOTSTRAP:-system}"
-		--enable-jvm-feature-dtrace=$(usex systemtap yes no)
-		--enable-headless-only=$(usex headless-awt yes no)
-		$(tc-is-clang && echo "--with-toolchain-type=clang")
-	)
-
-	use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
-
-	# Werror=odr
-	# https://bugs.gentoo.org/916735
-	#
-	# Disable it for now.
-	#use lto && myconf+=( --with-jvm-features=link-time-opt )
-
-	if use javafx; then
-		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-		if [[ -r ${zip} ]]; then
-			myconf+=( --with-import-modules="${zip}" )
-		else
-			die "${zip} not found or not readable"
-		fi
-	fi
-
-	# Workaround for bug #938302
-	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
-		myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
-	fi
-
-	if use !system-bootstrap ; then
-		addpredict /dev/random
-		addpredict /proc/self/coredump_filter
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	# Too brittle - gets confused by e.g. -Oline
-	export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
-	unset GNUMAKEFLAGS MAKEFLAGS
-
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-		NICE= # Use PORTAGE_NICENESS, don't adjust further down
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images product-images)
-	)
-	emake "${myemakeargs[@]}" -j1
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	# must be done before running itself
-	java-vm_set-pax-markings "${ddest}"
-
-	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
-	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-25_p5.ebuild b/dev-java/openjdk/openjdk-25_p5.ebuild
new file mode 100644
index 000000000000..8d8d8b9b9b4f
--- /dev/null
+++ b/dev-java/openjdk/openjdk-25_p5.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+
+# variable name format: <UPPERCASE_KEYWORD>_XPAK
+PPC64_XPAK="21.0.0_p35" # big-endian bootstrap tarball
+
+# Usage: bootstrap_uri <keyword> <version> [extracond]
+# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
+# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
+bootstrap_uri() {
+	local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
+	local suff="tar.xz"
+	local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
+	local ver="${2:?${FUNCNAME[0]}: version not specified}"
+	local cond="${3-}"
+	[[ ${cond} == elibc_musl* ]] && local musl=yes
+
+	# here be dragons
+	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
+}
+
+# don't change versioning scheme
+# to find correct _p number, look at
+# https://github.com/openjdk/jdk${SLOT}u/tags
+# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
+# to exact same commit sha. we should always use the full version.
+# -ga tag is just for humans to easily identify General Availability release tag.
+#	MY_PV="${PV%_p*}-ga" # '-ga' isn't available
+MY_PV="${PV/_p/+}"
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.org"
+SRC_URI="
+	https://github.com/${PN}/jdk/archive/jdk-${MY_PV}.tar.gz
+
+		-> ${P}.tar.gz
+	!system-bootstrap? (
+		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
+	)
+"
+# S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
+S="${WORKDIR}/jdk-jdk-${MY_PV//+/-}"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="${MY_PV%%[.+]*}"
+#	KEYWORDS="" # LTS but not yet released
+
+# lto temporarily disabled due to https://bugs.gentoo.org/916735
+IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source +system-bootstrap systemtap"
+
+REQUIRED_USE="
+	javafx? ( alsa !headless-awt )
+	!system-bootstrap? ( jbootstrap )
+	!system-bootstrap? ( ppc64 )
+"
+
+COMMON_DEPEND="
+	media-libs/freetype:2=
+	media-libs/giflib:0/7
+	media-libs/harfbuzz:=
+	media-libs/libpng:0=
+	media-libs/lcms:2=
+	sys-libs/zlib
+	media-libs/libjpeg-turbo:0=
+	systemtap? ( dev-debug/systemtap )
+"
+
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+	${COMMON_DEPEND}
+	>=sys-apps/baselayout-java-0.1.0-r1
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	app-arch/zip
+	media-libs/alsa-lib
+	net-print/cups
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst
+	javafx? ( dev-java/openjfx:${SLOT}= )
+	system-bootstrap? (
+		|| (
+			dev-java/openjdk-bin:${SLOT}
+			dev-java/openjdk:${SLOT}
+		)
+	)
+"
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+	local M
+	M=2048
+	M=$(( $(usex jbootstrap 2 1) * $M ))
+	M=$(( $(usex debug 3 1) * $M ))
+	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	openjdk_check_requirements
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+	fi
+}
+
+pkg_setup() {
+	openjdk_check_requirements
+	java-vm-2_pkg_setup
+
+	[[ ${MERGE_TYPE} == "binary" ]] && return
+
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	# The nastiness below is necessary while the gentoo-vm USE flag is
+	# masked. First we call java-pkg-2_pkg_setup if it looks like the
+	# flag was unmasked against one of the possible build VMs. If not,
+	# we try finding one of them in their expected locations. This would
+	# have been slightly less messy if openjdk-bin had been installed to
+	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
+	# file but disable it so that it would not normally be selectable.
+
+	local vm
+	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+		if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
+			java-pkg-2_pkg_setup
+			return
+		fi
+	done
+}
+
+src_prepare() {
+	default
+	chmod +x configure || die
+}
+
+src_configure() {
+	if has_version dev-java/openjdk:${SLOT}; then
+		export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT}
+	elif use !system-bootstrap ; then
+		local xpakvar="${ARCH^^}_XPAK"
+		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
+	else
+		JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
+		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+		JDK_HOME=${JDK_HOME#*/}
+		JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*}
+		export JDK_HOME
+	fi
+
+	# bug 906987; append-cppflags doesnt work
+	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
+	# Strip some flags users may set, but should not. #818502
+	filter-flags -fexceptions
+
+	# Strip lto related flags, we rely on USE=lto and --with-jvm-features=link-time-opt
+	# https://bugs.gentoo.org/833097
+	# https://bugs.gentoo.org/833098
+	filter-lto
+	filter-flags -fdevirtualize-at-ltrans
+
+	# Enabling full docs appears to break doc building. If not
+	# explicitly disabled, the flag will get auto-enabled if pandoc and
+	# graphviz are detected. pandoc has loads of dependencies anyway.
+
+	local myconf=(
+		--disable-ccache
+		--disable-precompiled-headers
+		--disable-warnings-as-errors
+		--enable-full-docs=no
+		--with-boot-jdk="${JDK_HOME}"
+		--with-extra-cflags="${CFLAGS}"
+		--with-extra-cxxflags="${CXXFLAGS}"
+		--with-extra-ldflags="${LDFLAGS}"
+		--with-freetype="${XPAK_BOOTSTRAP:-system}"
+		--with-giflib="${XPAK_BOOTSTRAP:-system}"
+		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
+		--with-lcms="${XPAK_BOOTSTRAP:-system}"
+		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
+		--with-libpng="${XPAK_BOOTSTRAP:-system}"
+		--with-stdc++lib=dynamic
+		--with-native-debug-symbols=$(usex debug internal none)
+		--with-vendor-name="Gentoo"
+		--with-vendor-url="https://gentoo.org"
+		--with-vendor-bug-url="https://bugs.gentoo.org"
+		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+		--with-vendor-version-string="${PVR}"
+		--with-version-pre=""
+		--with-version-string="${PV%_p*}"
+		--with-version-build="${PV#*_p}"
+		--with-zlib="${XPAK_BOOTSTRAP:-system}"
+		--enable-jvm-feature-dtrace=$(usex systemtap yes no)
+		--enable-headless-only=$(usex headless-awt yes no)
+		$(tc-is-clang && echo "--with-toolchain-type=clang")
+	)
+
+	use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
+
+	# Werror=odr
+	# https://bugs.gentoo.org/916735
+	#
+	# Disable it for now.
+	#use lto && myconf+=( --with-jvm-features=link-time-opt )
+
+	if use javafx; then
+		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+		if [[ -r ${zip} ]]; then
+			myconf+=( --with-import-modules="${zip}" )
+		else
+			die "${zip} not found or not readable"
+		fi
+	fi
+
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
+	fi
+
+	if use !system-bootstrap ; then
+		addpredict /dev/random
+		addpredict /proc/self/coredump_filter
+	fi
+
+	(
+		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
+		CFLAGS= CXXFLAGS= LDFLAGS= \
+		CONFIG_SITE=/dev/null \
+		econf "${myconf[@]}"
+	)
+}
+
+src_compile() {
+	# Too brittle - gets confused by e.g. -Oline
+	export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+	unset GNUMAKEFLAGS MAKEFLAGS
+
+	local myemakeargs=(
+		JOBS=$(makeopts_jobs)
+		LOG=debug
+		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+		NICE= # Use PORTAGE_NICENESS, don't adjust further down
+		$(usex doc docs '')
+		$(usex jbootstrap bootcycle-images product-images)
+	)
+	emake "${myemakeargs[@]}" -j1
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+	local ddest="${ED}/${dest#/}"
+
+	cd "${S}"/build/*-release/images/jdk || die
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	rm -v lib/security/cacerts || die
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	# must be done before running itself
+	java-vm_set-pax-markings "${ddest}"
+
+	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
+	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+	if use doc ; then
+		docinto html
+		dodoc -r "${S}"/build/*-release/images/docs/*
+		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+	fi
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 3303f6dde642..148dbf790736 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,4 +1,4 @@
 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
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 d8c59df716a3..000000000000
--- a/dev-java/protobuf-java/protobuf-java-4.29.1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 2008-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.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/protobuf-java/protobuf-java-4.29.3.ebuild b/dev-java/protobuf-java/protobuf-java-4.29.3.ebuild
new file mode 100644
index 000000000000..11ee57d92df5
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-4.29.3.ebuild
@@ -0,0 +1,152 @@
+# 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.3 from the 29.3 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/randomized-runner/Manifest b/dev-java/randomized-runner/Manifest
index fb49dab86549..b384b1faa896 100644
--- a/dev-java/randomized-runner/Manifest
+++ b/dev-java/randomized-runner/Manifest
@@ -1,2 +1 @@
-DIST randomized-runner-2.8.0.tar.gz 1506178 BLAKE2B 0f142b5f90ea0aaf0934415ad772bf1363c75d371fb964398259e46af1879f2cd3520c9d3eff60b1614bef7fd64003d3ff868302cdc5421197085133dd856ba4 SHA512 e7fba917bf30a7ae4ea68301ec26bfa1b5659ea6124417ef494cc915b26bb07343ce8784dfd718032410ae750601f73ad56cd0a1bab3b2013559fc020694fb7f
 DIST randomized-runner-2.8.2.tar.gz 1508257 BLAKE2B 5b590ef8c19e7e928b3e8bfdd95bc20019922419e464da6e2189a37db3239d3e6beb7b2712c3e9d50ba16d758ad51dfcb17d91912163054a3b0697fdd2dded31 SHA512 e180b32f5bdad1028cade2e0e4daad9211b9ff2556bd80b27e062a0f2292d9cbc215154ba8a629429c0e477f979f7a2f29c675c9bfed16286fb9ab4367e59555
diff --git a/dev-java/randomized-runner/randomized-runner-2.8.0.ebuild b/dev-java/randomized-runner/randomized-runner-2.8.0.ebuild
deleted file mode 100644
index 3bbf53b90023..000000000000
--- a/dev-java/randomized-runner/randomized-runner-2.8.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/randomizedtesting/randomizedtesting/archive/release/2.8.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild randomized-runner-2.8.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JUnit test runner and plugins for running JUnit tests with pseudo-randomness"
-HOMEPAGE="https://labs.carrotsearch.com/randomizedtesting.html"
-SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/release/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-CP_DEPEND="
-	dev-java/junit:4
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-	test? (
-		dev-java/assertj-core:3
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( ../{CHANGES,CONTRIBUTING,README}.txt )
-
-S="${WORKDIR}/randomizedtesting-release-${PV}/${PN}"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3,junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_test() {
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if [[ "${vm_version}" -ge "17" ]] ; then
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/sun.nio.fs=ALL-UNNAMED )
-	fi
-
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/randomized-runner/randomized-runner-2.8.2.ebuild b/dev-java/randomized-runner/randomized-runner-2.8.2.ebuild
index 4ad376fc8c6a..cf6edd323b25 100644
--- a/dev-java/randomized-runner/randomized-runner-2.8.2.ebuild
+++ b/dev-java/randomized-runner/randomized-runner-2.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/randomizedtesting-release-${PV}/${PN}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 CP_DEPEND="dev-java/junit:4"
 
diff --git a/dev-java/saslprep/saslprep-1.1-r2.ebuild b/dev-java/saslprep/saslprep-1.1-r2.ebuild
index 71127be41c2e..adebf53a875d 100644
--- a/dev-java/saslprep/saslprep-1.1-r2.ebuild
+++ b/dev-java/saslprep/saslprep-1.1-r2.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 @@ SRC_URI="https://repo1.maven.org/maven2/com/ongres/stringprep/saslprep/${PV}/sas
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 CP_DEPEND="~dev-java/stringprep-${PV}:0"
 DEPEND=">=virtual/jdk-1.8:*
diff --git a/dev-java/scram/scram-2.1.ebuild b/dev-java/scram/scram-2.1.ebuild
index 44dc7af7a78c..fc3c8a03ce1a 100644
--- a/dev-java/scram/scram-2.1.ebuild
+++ b/dev-java/scram/scram-2.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 CP_DEPEND="dev-java/saslprep:0"
 
diff --git a/dev-java/scram/scram-3.1.ebuild b/dev-java/scram/scram-3.1.ebuild
index 5d9dc470f1fa..4169595b9bc8 100644
--- a/dev-java/scram/scram-3.1.ebuild
+++ b/dev-java/scram/scram-3.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 RESTRICT="test" #839681
 
 CP_DEPEND="
diff --git a/dev-java/stringprep/stringprep-1.1.ebuild b/dev-java/stringprep/stringprep-1.1.ebuild
index 2ef732f9f9f5..142c8b3c1a14 100644
--- a/dev-java/stringprep/stringprep-1.1.ebuild
+++ b/dev-java/stringprep/stringprep-1.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
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/ongres/stringprep/stringprep/${PV}/s
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/stringprep/stringprep-2.2.ebuild b/dev-java/stringprep/stringprep-2.2.ebuild
index f62f4268663d..115283bc012c 100644
--- a/dev-java/stringprep/stringprep-2.2.ebuild
+++ b/dev-java/stringprep/stringprep-2.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 DEPEND=">=virtual/jdk-11:*"	# module-info
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index dce80bbee78d..0580293991bf 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,6 +1,3 @@
-DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 BLAKE2B bb102da40a3f63d63ca6a56d4c57ade55d7fe8d6206acf9e60caa0a8600b5c2cec6c0304cd2ab532948f03ff0706e8b2928ae9e93ef0019051044dad3fe7b1c0 SHA512 750aaa43560bbf6f82f7f8cd9338abc88578f4f0b9aadaec9bc8a5c3d1ad593619cdf01d202cbf06766090ee977989ea7904643669c61971973951d8428b57d0
-DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6968bb41c44cee403f063c159962d9d43a5c9529026819ddb1c8eea98cd11ed818075c37f4e9851d2e95532dc166e570ce SHA512 9f58864d05eba2648e4b5d5c958172f5c0c7c730209525b3d6f607586daaefea4d5ba1013e80c0c11948f01c553044b0a98c81688b33c14114ba79c7ce620426
-DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7
 DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a
 DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0
 DIST swt-4.29-gtk-linux-aarch64.zip 3836724 BLAKE2B 8c905df298688686ee22c9f2021560856f7ac7b6a92dad744b27cd30530c6ff76470fdcbb79b91ada01f28c43b8f694c334ff1337d692366ae9dc0319f7e46e2 SHA512 44ff572b57631b1b6a98192f60624758d90f54a2b2272c6bbb140ece39e65bb4086cf08fbc50c5f2e388e7b410b28fc014b87a8560062053b4c131970fa38b17
diff --git a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
deleted file mode 100644
index d6cc763ea968..000000000000
--- a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
+++ /dev/null
@@ -1,243 +0,0 @@
---- a/make_linux.mak
-+++ b/make_linux.mak
-@@ -66,7 +66,7 @@
- # Uncomment for Native Stats tool
- #NATIVE_STATS = -DNATIVE_STATS
- 
--MOZILLACFLAGS = -O \
-+MOZILLACFLAGS = $(CXXFLAGS) \
- 	-DSWT_VERSION=$(SWT_VERSION) \
- 	$(NATIVE_STATS) \
- 	-DMOZILLA_STRICT_API=1 \
-@@ -107,7 +107,7 @@
- WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
- GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
- 
--CFLAGS = -O -Wall \
-+CFLAGS += \
- 		-DSWT_VERSION=$(SWT_VERSION) \
- 		$(NATIVE_STATS) \
- 		-DLINUX -DGTK \
-@@ -131,13 +131,13 @@
- make_swt: $(SWT_LIB) $(SWTPI_LIB)
- 
- $(SWT_LIB): $(SWT_OBJECTS)
--	$(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
- 
- callback.o: callback.c callback.h
- 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
- 
- $(SWTPI_LIB): $(SWTPI_OBJECTS)
--	$(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
- 
- swt.o: swt.c swt.h
- 	$(CC) $(CFLAGS) -c swt.c
-@@ -156,7 +156,7 @@
- make_cairo: $(CAIRO_LIB)
- 
- $(CAIRO_LIB): $(CAIRO_OBJECTS)
--	$(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
- 
- cairo.o: cairo.c cairo.h swt.h
- 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
-@@ -172,7 +172,7 @@
- make_cde: $(CDE_LIB)
- 
- $(CDE_LIB): $(CDE_OBJECTS)
--	$(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
- 
- #
- # AWT lib
-@@ -180,7 +180,7 @@
- make_awt:$(AWT_LIB)
- 
- $(AWT_LIB): $(AWT_OBJECTS)
--	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
-+	$(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
- 
- #
- # Atk lib
-@@ -188,7 +188,7 @@
- make_atk: $(ATK_LIB)
- 
- $(ATK_LIB): $(ATK_OBJECTS)
--	$(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
- 
- atk.o: atk.c atk.h
- 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
-@@ -205,7 +205,7 @@
- make_gnome: $(GNOME_LIB)
- 
- $(GNOME_LIB): $(GNOME_OBJECTS)
--	$(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
- 
- gnome.o: gnome.c 
- 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
-@@ -222,7 +222,7 @@
- make_mozilla:$(MOZILLA_LIB)
- 
- $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
--	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
- 
- xpcom.o: xpcom.cpp
- 	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
-@@ -242,7 +242,7 @@
- make_xulrunner:$(XULRUNNER_LIB)
- 
- $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
--	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
- 
- xpcomxul.o: xpcom.cpp
- 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-@@ -262,7 +262,7 @@
- make_xpcominit:$(XPCOMINIT_LIB)
- 
- $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
--	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
- 
- xpcominit.o: xpcominit.cpp
- 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-@@ -279,7 +279,7 @@
- make_webkit: $(WEBKIT_LIB)
- 
- $(WEBKIT_LIB): $(WEBKIT_OBJECTS)
--	$(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS)
- 
- webkit.o: webkitgtk.c 
- 	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o
-@@ -296,7 +296,7 @@
- make_glx: $(GLX_LIB)
- 
- $(GLX_LIB): $(GLX_OBJECTS)
--	$(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
- 
- glx.o: glx.c 
- 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
---- a/make_freebsd.mak
-+++ b/make_freebsd.mak
-@@ -64,7 +64,7 @@
- # Uncomment for Native Stats tool
- #NATIVE_STATS = -DNATIVE_STATS
- 
--MOZILLACFLAGS = -O \
-+MOZILLACFLAGS += \
- 	-DSWT_VERSION=$(SWT_VERSION) \
- 	$(NATIVE_STATS) \
- 	-DMOZILLA_STRICT_API=1 \
-@@ -91,7 +91,7 @@
- XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
- GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
- 
--CFLAGS = -O -Wall \
-+CFLAGS += \
- 		-DSWT_VERSION=$(SWT_VERSION) \
- 		$(NATIVE_STATS) \
- 		-DFREEBSD -DGTK \
-@@ -115,13 +115,13 @@
- make_swt: $(SWT_LIB) $(SWTPI_LIB)
- 
- $(SWT_LIB): $(SWT_OBJECTS)
--	$(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
- 
- callback.o: callback.c callback.h
- 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
- 
- $(SWTPI_LIB): $(SWTPI_OBJECTS)
--	$(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
- 
- swt.o: swt.c swt.h
- 	$(CC) $(CFLAGS) -c swt.c
-@@ -140,7 +140,7 @@
- make_cairo: $(CAIRO_LIB)
- 
- $(CAIRO_LIB): $(CAIRO_OBJECTS)
--	$(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
- 
- cairo.o: cairo.c cairo.h swt.h
- 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
-@@ -156,7 +156,7 @@
- make_cde: $(CDE_LIB)
- 
- $(CDE_LIB): $(CDE_OBJECTS)
--	$(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
- 
- #
- # AWT lib
-@@ -164,7 +164,7 @@
- make_awt:$(AWT_LIB)
- 
- $(AWT_LIB): $(AWT_OBJECTS)
--	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
-+	$(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
- 
- #
- # Atk lib
-@@ -172,7 +172,7 @@
- make_atk: $(ATK_LIB)
- 
- $(ATK_LIB): $(ATK_OBJECTS)
--	$(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
- 
- atk.o: atk.c atk.h
- 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
-@@ -189,7 +189,7 @@
- make_gnome: $(GNOME_LIB)
- 
- $(GNOME_LIB): $(GNOME_OBJECTS)
--	$(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
- 
- gnome.o: gnome.c 
- 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
-@@ -206,7 +206,7 @@
- make_mozilla:$(MOZILLA_LIB)
- 
- $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
--	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
- 
- xpcom.o: xpcom.cpp
- 	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
-@@ -226,7 +226,7 @@
- make_xulrunner:$(XULRUNNER_LIB)
- 
- $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
--	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
- 
- xpcomxul.o: xpcom.cpp
- 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-@@ -252,7 +252,7 @@
- make_xpcominit:$(XPCOMINIT_LIB)
- 
- $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
--	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
- 
- xpcominit.o: xpcominit.cpp
- 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-@@ -269,7 +269,7 @@
- make_glx: $(GLX_LIB)
- 
- $(GLX_LIB): $(GLX_OBJECTS)
--	$(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
- 
- glx.o: glx.c 
- 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
diff --git a/dev-java/swt/files/swt-3.7-manifest b/dev-java/swt/files/swt-3.7-manifest
deleted file mode 100644
index bddcbb48b041..000000000000
--- a/dev-java/swt/files/swt-3.7-manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
-Bundle-Version: 3.7
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
-Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
- org.eclipse.swt.internal.cairo; x-internal:=true,
- org.eclipse.swt.internal.cde; x-internal:=true,
- org.eclipse.swt.internal.gnome; x-internal:=true,
- org.eclipse.swt.internal.gtk; x-internal:=true,
- org.eclipse.swt.internal.opengl.glx; x-internal:=true
- org.eclipse.swt.internal.webkit; x-internal:=true
-
diff --git a/dev-java/swt/files/swt-3.7.2-gio_launch-URI-x86.patch b/dev-java/swt/files/swt-3.7.2-gio_launch-URI-x86.patch
deleted file mode 100644
index cab0e0cdb573..000000000000
--- a/dev-java/swt/files/swt-3.7.2-gio_launch-URI-x86.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Program.launch will first attempt to open files using libgio and then fallback
-to gnome-vfs.  gio_launch uses g_file_new_for_path which fails when passed a
-URI.  If swt was built with USE="-gnome" then the fallback fails as well,
-making it appear that a package has a dependency on swt[gnome] when it does
-not.
-
-Caused by: java.lang.UnsatisfiedLinkError: Could not load SWT library. Reasons: 
-        no swt-gnome-gtk-3740 in java.library.path
-        no swt-gnome-gtk in java.library.path
-        Can't load library: /home/xxx/.swt/lib/linux/x86_64/libswt-gnome-gtk-3740.so
-        Can't load library: /home/xxx/.swt/lib/linux/x86_64/libswt-gnome-gtk.so
-
-Use g_file_new_for_commandline_arg instead.
-
-https://bugs.gentoo.org/424151
-
-
---- a/os.c
-+++ b/os.c
-@@ -3059,6 +3059,30 @@ fail:
- }
- #endif
- 
-+#ifndef NO__1g_1file_1new_1for_1commandline_1arg
-+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1commandline_1arg)
-+	(JNIEnv *env, jclass that, jbyteArray arg0)
-+{
-+	jbyte *lparg0=NULL;
-+	jintLong rc = 0;
-+	OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
-+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-+/*
-+	rc = (jintLong)g_file_new_for_commandline_arg(lparg0);
-+*/
-+	{
-+		LOAD_FUNCTION(fp, g_file_new_for_commandline_arg)
-+		if (fp) {
-+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0);
-+		}
-+	}
-+fail:
-+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-+	OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
-+	return rc;
-+}
-+#endif
-+
- #ifndef NO__1g_1file_1new_1for_1path
- JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1path)
- 	(JNIEnv *env, jclass that, jbyteArray arg0)
---- a/os_custom.h
-+++ b/os_custom.h
-@@ -280,6 +280,7 @@
- #define g_file_icon_get_file_LIB LIB_GIO
- #define g_file_info_get_content_type_LIB LIB_GIO
- #define g_file_info_get_modification_time_LIB LIB_GIO
-+#define g_file_new_for_commandline_arg_LIB LIB_GIO
- #define g_file_new_for_path_LIB LIB_GIO
- #define g_file_new_for_uri_LIB LIB_GIO
- #define g_file_read_LIB LIB_GIO
---- a/os_stats.c
-+++ b/os_stats.c
-@@ -18,8 +18,8 @@
- 
- #ifdef NATIVE_STATS
- 
--int OS_nativeFunctionCount = 1396;
--int OS_nativeFunctionCallCount[1396];
-+int OS_nativeFunctionCount = 1397;
-+int OS_nativeFunctionCallCount[1397];
- char * OS_nativeFunctionNames[] = {
- #ifndef JNI64
- 	"Call__IIII",
-@@ -250,6 +250,7 @@ char * OS_nativeFunctionNames[] = {
- 	"_1g_1file_1icon_1get_1file",
- 	"_1g_1file_1info_1get_1content_1type",
- 	"_1g_1file_1info_1get_1modification_1time",
-+	"_1g_1file_1new_1for_1commandline_1arg",
- 	"_1g_1file_1new_1for_1path",
- 	"_1g_1file_1new_1for_1uri",
- 	"_1g_1file_1query_1info",
---- a/os_stats.h
-+++ b/os_stats.h
-@@ -258,6 +258,7 @@ typedef enum {
- 	_1g_1file_1icon_1get_1file_FUNC,
- 	_1g_1file_1info_1get_1content_1type_FUNC,
- 	_1g_1file_1info_1get_1modification_1time_FUNC,
-+	_1g_1file_1new_1for_1commandline_1arg_FUNC,
- 	_1g_1file_1new_1for_1path_FUNC,
- 	_1g_1file_1new_1for_1uri_FUNC,
- 	_1g_1file_1query_1info_FUNC,
---- a/src/org/eclipse/swt/internal/gtk/OS.java
-+++ b/src/org/eclipse/swt/internal/gtk/OS.java
-@@ -2113,6 +2113,16 @@ public static final int /*long*/ g_file_new_for_path(byte[] fileName) {
- 	}
- }
- /** @method flags=dynamic */
-+public static final native int /*long*/ _g_file_new_for_commandline_arg(byte[] fileName);
-+public static final int /*long*/ g_file_new_for_commandline_arg(byte[] fileName) {
-+	lock.lock();
-+	try {
-+		return _g_file_new_for_commandline_arg(fileName);
-+	} finally {
-+		lock.unlock();
-+	}
-+}
-+/** @method flags=dynamic */
- public static final native int /*long*/ _g_file_new_for_uri(byte[] fileName);
- public static final int /*long*/ g_file_new_for_uri(byte[] fileName) {
- 	lock.lock();
---- a/src/org/eclipse/swt/program/Program.java
-+++ b/src/org/eclipse/swt/program/Program.java
-@@ -954,7 +954,7 @@ static boolean gio_isExecutable(String fileName) {
- static boolean gio_launch(String fileName) {
- 	boolean result = false;
- 	byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true);
--	int /*long*/ file = OS.g_file_new_for_path (fileNameBuffer);
-+	int /*long*/ file = OS.g_file_new_for_commandline_arg (fileNameBuffer);
- 	if (file != 0) {
- 		int /*long*/ uri = OS.g_file_get_uri (file);
- 		if (uri != 0) {
diff --git a/dev-java/swt/files/swt-3.7.2-gio_launch-URI.patch b/dev-java/swt/files/swt-3.7.2-gio_launch-URI.patch
deleted file mode 100644
index bbb28573072b..000000000000
--- a/dev-java/swt/files/swt-3.7.2-gio_launch-URI.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Program.launch will first attempt to open files using libgio and then fallback
-to gnome-vfs.  gio_launch uses g_file_new_for_path which fails when passed a
-URI.  If swt was built with USE="-gnome" then the fallback fails as well,
-making it appear that a package has a dependency on swt[gnome] when it does
-not.
-
-Caused by: java.lang.UnsatisfiedLinkError: Could not load SWT library. Reasons: 
-        no swt-gnome-gtk-3740 in java.library.path
-        no swt-gnome-gtk in java.library.path
-        Can't load library: /home/xxx/.swt/lib/linux/x86_64/libswt-gnome-gtk-3740.so
-        Can't load library: /home/xxx/.swt/lib/linux/x86_64/libswt-gnome-gtk.so
-
-Use g_file_new_for_commandline_arg instead.
-
-https://bugs.gentoo.org/424151
-
-
---- a/os.c
-+++ b/os.c
-@@ -3059,6 +3059,30 @@ fail:
- }
- #endif
- 
-+#ifndef NO__1g_1file_1new_1for_1commandline_1arg
-+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1commandline_1arg)
-+	(JNIEnv *env, jclass that, jbyteArray arg0)
-+{
-+	jbyte *lparg0=NULL;
-+	jintLong rc = 0;
-+	OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
-+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-+/*
-+	rc = (jintLong)g_file_new_for_commandline_arg(lparg0);
-+*/
-+	{
-+		LOAD_FUNCTION(fp, g_file_new_for_commandline_arg)
-+		if (fp) {
-+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0);
-+		}
-+	}
-+fail:
-+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-+	OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
-+	return rc;
-+}
-+#endif
-+
- #ifndef NO__1g_1file_1new_1for_1path
- JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1path)
- 	(JNIEnv *env, jclass that, jbyteArray arg0)
---- a/os_custom.h
-+++ b/os_custom.h
-@@ -280,6 +280,7 @@
- #define g_file_icon_get_file_LIB LIB_GIO
- #define g_file_info_get_content_type_LIB LIB_GIO
- #define g_file_info_get_modification_time_LIB LIB_GIO
-+#define g_file_new_for_commandline_arg_LIB LIB_GIO
- #define g_file_new_for_path_LIB LIB_GIO
- #define g_file_new_for_uri_LIB LIB_GIO
- #define g_file_read_LIB LIB_GIO
---- a/os_stats.c
-+++ b/os_stats.c
-@@ -18,8 +18,8 @@
- 
- #ifdef NATIVE_STATS
- 
--int OS_nativeFunctionCount = 1396;
--int OS_nativeFunctionCallCount[1396];
-+int OS_nativeFunctionCount = 1397;
-+int OS_nativeFunctionCallCount[1397];
- char * OS_nativeFunctionNames[] = {
- #ifndef JNI64
- 	"Call__IIII",
-@@ -250,6 +250,7 @@ char * OS_nativeFunctionNames[] = {
- 	"_1g_1file_1icon_1get_1file",
- 	"_1g_1file_1info_1get_1content_1type",
- 	"_1g_1file_1info_1get_1modification_1time",
-+	"_1g_1file_1new_1for_1commandline_1arg",
- 	"_1g_1file_1new_1for_1path",
- 	"_1g_1file_1new_1for_1uri",
- 	"_1g_1file_1query_1info",
---- a/os_stats.h
-+++ b/os_stats.h
-@@ -258,6 +258,7 @@ typedef enum {
- 	_1g_1file_1icon_1get_1file_FUNC,
- 	_1g_1file_1info_1get_1content_1type_FUNC,
- 	_1g_1file_1info_1get_1modification_1time_FUNC,
-+	_1g_1file_1new_1for_1commandline_1arg_FUNC,
- 	_1g_1file_1new_1for_1path_FUNC,
- 	_1g_1file_1new_1for_1uri_FUNC,
- 	_1g_1file_1query_1info_FUNC,
---- a/src/org/eclipse/swt/internal/gtk/OS.java
-+++ b/src/org/eclipse/swt/internal/gtk/OS.java
-@@ -2113,6 +2113,16 @@ public static final long /*int*/ g_file_new_for_path(byte[] fileName) {
- 	}
- }
- /** @method flags=dynamic */
-+public static final native long /*int*/ _g_file_new_for_commandline_arg(byte[] fileName);
-+public static final long /*int*/ g_file_new_for_commandline_arg(byte[] fileName) {
-+	lock.lock();
-+	try {
-+		return _g_file_new_for_commandline_arg(fileName);
-+	} finally {
-+		lock.unlock();
-+	}
-+}
-+/** @method flags=dynamic */
- public static final native long /*int*/ _g_file_new_for_uri(byte[] fileName);
- public static final long /*int*/ g_file_new_for_uri(byte[] fileName) {
- 	lock.lock();
---- a/src/org/eclipse/swt/program/Program.java
-+++ b/src/org/eclipse/swt/program/Program.java
-@@ -954,7 +954,7 @@ static boolean gio_isExecutable(String fileName) {
- static boolean gio_launch(String fileName) {
- 	boolean result = false;
- 	byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true);
--	long /*int*/ file = OS.g_file_new_for_path (fileNameBuffer);
-+	long /*int*/ file = OS.g_file_new_for_commandline_arg (fileNameBuffer);
- 	if (file != 0) {
- 		long /*int*/ uri = OS.g_file_get_uri (file);
- 		if (uri != 0) {
diff --git a/dev-java/swt/swt-3.7.2-r4.ebuild b/dev-java/swt/swt-3.7.2-r4.ebuild
deleted file mode 100644
index 2fc62ad8c429..000000000000
--- a/dev-java/swt/swt-3.7.2-r4.ebuild
+++ /dev/null
@@ -1,169 +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"
-
-inherit java-pkg-2 java-pkg-simple java-osgi toolchain-funcs
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="https://www.eclipse.org/swt/"
-SRC_URI="
-	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
-	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
-	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
-	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
-
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="3.7"
-KEYWORDS="amd64 ppc64"
-IUSE="cairo opengl"
-
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	app-accessibility/at-spi2-core:2
-	dev-libs/glib
-	>=x11-libs/gtk+-2.6.8:2
-	x11-libs/libXtst
-	cairo? ( x11-libs/cairo )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/jdk-1.8:*[-headless-awt]
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst"
-RDEPEND="${COMMON_DEPEND}
-	>=virtual/jre-1.8:*"
-
-# JNI libraries don't need SONAME, bug #253756
-QA_SONAME="usr/lib.*/libswt-.*.so"
-
-JAVA_RESOURCE_DIRS="resources"
-JAVA_SRC_DIR="src"
-
-PATCHES=(
-	# Fix Makefiles to respect flags and work with --as-needed
-	"${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
-)
-
-src_unpack() {
-	default
-	unpack "./src.zip"
-}
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-	java-pkg_clean
-
-	mkdir resources src || die "mkdir failed"
-	mv org src || die "moving java sources failed"
-
-	case ${ARCH} in
-		ppc|x86) eapply "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;;
-		*)       eapply "${FILESDIR}"/${P}-gio_launch-URI.patch ;;
-	esac
-
-	pushd src > /dev/null || die
-		find -type f ! -name '*.java' \
-			| xargs \
-			cp --parent -t ../resources -v \
-			|| die "copying resources failed"
-	popd > /dev/null || die
-	cp version.txt resources || die "adding version.txt failed"
-}
-
-src_compile() {
-	local AWT_ARCH
-	local JAWTSO="libjawt.so"
-#	if [[ $(tc-arch) == 'x86' ]] ; then
-#		AWT_ARCH="i386"
-#	elif [[ $(tc-arch) == 'ppc' ]] ; then
-#		AWT_ARCH="ppc"
-#	elif [[ $(tc-arch) == 'ppc64' ]] ; then
-#		AWT_ARCH="ppc64"
-#	else
-#		AWT_ARCH="amd64"
-#	fi
-#	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
-#		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
-#	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
-#		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
-#	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
-#		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
-#	else
-	IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH)
-
-	for libpath in "${ldpaths[@]}"; do
-		if [[ -f "${libpath}/${JAWTSO}" ]]; then
-			export AWT_LIB_PATH="${libpath}"
-			break
-		# this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10
-		elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then
-			export AWT_LIB_PATH="${libpath}/$(tc-arch)"
-			break
-		fi
-	done
-
-	if [[ -z "${AWT_LIB_PATH}" ]]; then
-		eerror "${JAWTSO} not found in the JDK being used for compilation!"
-		die "cannot build AWT library"
-	fi
-
-	# Fix the pointer size for AMD64
-	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
-
-	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
-
-	einfo "Building AWT library"
-	${make} make_awt
-
-	einfo "Building SWT library"
-	${make} make_swt
-
-	einfo "Building JAVA-AT-SPI bridge"
-	${make} make_atk
-
-	if use cairo ; then
-		einfo "Building CAIRO support"
-		${make} make_cairo
-	fi
-
-	if use opengl ; then
-		einfo "Building OpenGL component"
-		${make} make_glx
-	fi
-
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	swtArch=${ARCH}
-	use amd64 && swtArch=x86_64
-
-	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
-	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
-	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
-	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
-
-	java-pkg_sointo /usr/$(get_libdir)
-	java-pkg_doso *.so
-
-	docinto html
-	dodoc about.html
-}
diff --git a/dev-java/swt/swt-4.34.ebuild b/dev-java/swt/swt-4.34.ebuild
index 78532d57cbf3..c76cb74b5474 100644
--- a/dev-java/swt/swt-4.34.ebuild
+++ b/dev-java/swt/swt-4.34.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
@@ -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/ada-bootstrap/ada-bootstrap-0_p2021-r1.ebuild b/dev-lang/ada-bootstrap/ada-bootstrap-0_p2021-r1.ebuild
index ba0c3562a2e9..37edbd655a03 100644
--- a/dev-lang/ada-bootstrap/ada-bootstrap-0_p2021-r1.ebuild
+++ b/dev-lang/ada-bootstrap/ada-bootstrap-0_p2021-r1.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
@@ -140,8 +140,8 @@ src_configure() {
 	# conservative, we just want it to build for bootstrapping proper
 	# sys-devel/gcc[ada]. We don't need it to be fast.
 	strip-flags
-	CC="${WORKDIR}"/${BTSTRP}/bin/gcc strip-unsupported-flags
-	CC="${WORKDIR}"/${GNATDIR}/bin/gcc strip-unsupported-flags
+	CC="${WORKDIR}"/${BTSTRP}/bin/gcc CXX="${WORKDIR}"/${BTSTRP}/bin/g++ strip-unsupported-flags
+	CC="${WORKDIR}"/${GNATDIR}/bin/gcc CXX="${WORKDIR}"/${GNATDIR}/bin/g++ strip-unsupported-flags
 	strip-unsupported-flags
 	filter-lto
 	append-flags -O2
diff --git a/dev-lang/ada-bootstrap/ada-bootstrap-14.ebuild b/dev-lang/ada-bootstrap/ada-bootstrap-14.ebuild
index 3f4b75b39591..172f527ea631 100644
--- a/dev-lang/ada-bootstrap/ada-bootstrap-14.ebuild
+++ b/dev-lang/ada-bootstrap/ada-bootstrap-14.ebuild
@@ -67,7 +67,7 @@ S=${WORKDIR}
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="-* amd64 arm arm64 hppa ppc ppc64 ~riscv sparc"
+KEYWORDS="-* amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc"
 
 RDEPEND="
 	>=dev-libs/gmp-4.3.2:=
diff --git a/dev-lang/algol68g/Manifest b/dev-lang/algol68g/Manifest
index 55ac05febbb0..e66ce7199ffe 100644
--- a/dev-lang/algol68g/Manifest
+++ b/dev-lang/algol68g/Manifest
@@ -1,2 +1,3 @@
 DIST algol68g-3.5.10.tar.gz 662366 BLAKE2B 74adac724abb49dd2a418687b428d945741c9ec3ae47f742f9f2baafcbc9545226ceb18963a2fd65c8dd1496ab6ae935ef398cadfb119a58c89785c7d905301c SHA512 d0103e0c5bcb1723ac8a4d4550d1257c352feeba6f8e9717f6119df31f51769ff983198955dd84fb14fb114cdfd93f8c258f4a7e19d17f2766f9fc0f8940e83b
+DIST algol68g-3.5.11.tar.gz 662345 BLAKE2B 67eca74972539071eda7e8dc5d3667b64d2ff6b7f37f03db4b28d5f38b968461babf6e8e4fb770c63f7faab219bf38275ba09dcc9b931863a77d3cdf3113caa5 SHA512 63c539b4003b893166f70fa59787c6c899402e0d2387bc1a8c206097011d6e38130f1273f1a0344dcbf67bd0a87594ab654ae00756ae7f0b1903f239e783f5ce
 DIST algol68g-3.5.9.tar.gz 664322 BLAKE2B 6c97863239caf5c8e1d5c0281340b1ad82a6b31e32cb428ef3bab4a1b0d22193876b9f422e53448e99323f39c7dede6149595a2cc4557d741ea6e19c24d7dbf6 SHA512 516470b8a14c1d237396855a04fc6a7af4dd676b721c644f9ba9f66e74de903d83fc18a24eb674203392ccc9464ee17a85ef4bb750df948d9be7805666350c9f
diff --git a/dev-lang/algol68g/algol68g-3.5.10.ebuild b/dev-lang/algol68g/algol68g-3.5.10.ebuild
index 6689c5616025..baaebe185afe 100644
--- a/dev-lang/algol68g/algol68g-3.5.10.ebuild
+++ b/dev-lang/algol68g/algol68g-3.5.10.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
@@ -9,7 +9,7 @@ SRC_URI="https://jmvdveer.home.xs4all.nl/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+curl +gsl +mpfr +ncurses plotutils postgres +readline"
 
 RDEPEND="
diff --git a/dev-lang/algol68g/algol68g-3.5.11.ebuild b/dev-lang/algol68g/algol68g-3.5.11.ebuild
new file mode 100644
index 000000000000..703e6c6c442f
--- /dev/null
+++ b/dev-lang/algol68g/algol68g-3.5.11.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Algol 68 Genie compiler-interpreter"
+HOMEPAGE="https://jmvdveer.home.xs4all.nl/en.algol-68-genie.html"
+SRC_URI="https://jmvdveer.home.xs4all.nl/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+curl +gsl +mpfr +ncurses plotutils postgres +readline"
+
+RDEPEND="
+	curl? ( net-misc/curl )
+	gsl? ( sci-libs/gsl:= )
+	mpfr? ( dev-libs/mpfr:= )
+	plotutils? ( media-libs/plotutils )
+	postgres? ( dev-db/postgresql:* )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.3.21-configure-implicit.patch" )
+
+src_configure() {
+	local -a myconf=(
+		$(use_enable curl)
+		$(use_enable gsl)
+		$(use_enable mpfr)
+		$(use_enable ncurses curses)
+		$(use_enable plotutils)
+		$(use_enable postgres postgresql)
+		$(use_enable readline)
+		$(use_with ncurses)
+	)
+	econf "${myconf[@]}"
+}
diff --git a/dev-lang/cfortran/cfortran-20110621.ebuild b/dev-lang/cfortran/cfortran-20110621.ebuild
index 7ec165a031ed..4774eb5dd3a3 100644
--- a/dev-lang/cfortran/cfortran-20110621.ebuild
+++ b/dev-lang/cfortran/cfortran-20110621.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-lang/cfortran/cfortran-20210827.ebuild b/dev-lang/cfortran/cfortran-20210827.ebuild
index 0b4b0e9900cc..cc6099c44284 100644
--- a/dev-lang/cfortran/cfortran-20210827.ebuild
+++ b/dev-lang/cfortran/cfortran-20210827.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
@@ -17,7 +17,7 @@ SRC_URI+=" mirror://debian/pool/main/c/${PN}/${PN}_${PV}-${DEB_PR}.debian.tar.xz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/cfortran/cfortran-4.4-r4.ebuild b/dev-lang/cfortran/cfortran-4.4-r4.ebuild
index 3c3b13155554..bc51deb4d962 100644
--- a/dev-lang/cfortran/cfortran-4.4-r4.ebuild
+++ b/dev-lang/cfortran/cfortran-4.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 PATCHES=( "${WORKDIR}"/${PN}_${PV}-${DEB_PR}.diff )
diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index 22423990d014..cf86a9044dbe 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -1,2 +1,6 @@
 DIST crystal-1.14.0-1-linux-x86_64.tar.gz 51712092 BLAKE2B 25281d0488ce84b278005e918fd7ae893ec690d50b01c65f06370e24d3ef6548a3ff823c0ce1903fc3d6d0c4108ab8c72365ce51f1ebb64519e0076cc5df9dff SHA512 ff7839166ebe0217149d0185c27fa0d48cd7322ddca3492e3bbbfaf505696994ce04a86eb1f51f6c0633892ebc4b82bac53ec9cb26c0a9c588c5002a984f0038
 DIST crystal-1.14.0.tar.gz 3726474 BLAKE2B 97efe777790b4d2330f6891bbe91a709fb0aacf7989a60b70c3d22c2735e83b9315899ad529f4605eed7dc4b4eed14f4d51ccd8a47dfc55057f15acd62c8c10d SHA512 561e14212b8f3e2841739408870e70a79cbc11097070760e75e4013a030082db050f6615453da54adceae3f0de12af43498f33fab9b7f4ecfa6860d582dec095
+DIST crystal-1.14.1-3-linux-x86_64.tar.gz 51717984 BLAKE2B da2f977d8a81abb6085ea7d43dff4f3f9120d7e54bf374157e742e8516ff067db95b8f8578d31c6f57ac9116553a945b9e78a9ceefbc66157f321cfab29b96d7 SHA512 9b2fb8cab095041938f5088f9b136cda66b978e3f5c1245cff2d3966faaf18b5b899461cef60723c860afeb7ec5710880cc675d483a92db7b238b286bf9ad69d
+DIST crystal-1.14.1.tar.gz 3726868 BLAKE2B add2e478c3dbb5f8fce77c8dfb781858a1074e411f6899997052fd5f037fc6dcb86dd4f2aba432301912cac645dfaad4e916112c4d47c8247a9ea681270f945d SHA512 f16ba4e2b41ee9c1a4ef98bd026d843e7c8f831c592a919d79b3addea4647eea0eefefc8e964e1e187b8bfb0aed0829e2f5f5b120e3116a359616c0c043f9d3c
+DIST crystal-1.15.0-1-linux-x86_64.tar.gz 51497623 BLAKE2B 03059b38b1df3a035c82472f0691c3b37d9b82ae90e0cae922a36c069750e5d00444dc5759fd5cefee294fbde20b17aac233323067256caf161ef542d27e51d5 SHA512 ee0a85d98fd1170c97380184bd845cafd426765bf633d0d26885e970a5e15241d76a93a11c1a207ddedef9a1d76978e5f32be17b074cd3c03c3f5cc5b7e064b9
+DIST crystal-1.15.0.gh.tar.gz 3812860 BLAKE2B a6b52007d6a4975d2011104f65cec932300bb6f84f497bfda138d987e844cb025d4690b0f74335aff42295c5d355ac73371cab86db87ca9819c1885d98f76bd8 SHA512 ea07de4b9c6c46e96f05d816d0504f8b0206e89fe7e4236038dc3b0875e52e89c711cc798b8fc30f66b02dd48cec70e0ea76160f14447577761411a41f1b28fa
diff --git a/dev-lang/crystal/crystal-1.14.1.ebuild b/dev-lang/crystal/crystal-1.14.1.ebuild
new file mode 100644
index 000000000000..3d3cb3b00293
--- /dev/null
+++ b/dev-lang/crystal/crystal-1.14.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+BV="${PV}-3"
+BV_AMD64="${BV}-linux-x86_64"
+
+LLVM_COMPAT=( {18..19} )
+
+inherit bash-completion-r1 llvm-r1 multiprocessing toolchain-funcs
+
+DESCRIPTION="The Crystal Programming Language"
+HOMEPAGE="https://crystal-lang.org/
+	https://github.com/crystal-lang/crystal/"
+SRC_URI="
+	https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+	amd64? (
+		https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz
+	)
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc debug llvm-libunwind"
+RESTRICT="test"  # Upstream test suite not reliable
+
+DEPEND="
+	dev-libs/boehm-gc:=[threads]
+	dev-libs/gmp:=
+	dev-libs/libatomic_ops:=
+	dev-libs/libevent:=
+	dev-libs/libpcre2:=[unicode]
+	dev-libs/pcl:=
+	$(llvm_gen_dep '
+		llvm-core/llvm:${LLVM_SLOT}=
+	')
+	llvm-libunwind? (
+		llvm-runtimes/libunwind:=
+	)
+	!llvm-libunwind? (
+		sys-libs/libunwind:=
+	)
+"
+RDEPEND="
+	${DEPEND}
+	dev-libs/libxml2
+	dev-libs/libyaml
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.2-extra-spec-flags.patch"
+	"${FILESDIR}/${PN}-0.27.0-gentoo-tests-long-unix.patch"
+	"${FILESDIR}/${PN}-0.27.0-gentoo-tests-long-unix-2.patch"
+)
+
+src_configure() {
+	local bootstrap_path="${WORKDIR}/${PN}-${BV}/bin"
+	if [[ ! -d "${bootstrap_path}" ]] ; then
+		eerror "Binary tarball does not contain expected directory:"
+		die "'${bootstrap_path}' path does not exist."
+	fi
+
+	# crystal uses 'LLVM_TARGETS' to override default list of targets
+	unset LLVM_TARGETS
+
+	MY_EMAKE_COMMON_ARGS=(
+		PATH="${bootstrap_path}:${PATH}"
+
+		CRYSTAL_CONFIG_VERSION="${PV}"
+		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
+
+		$(usex debug "" release=1)
+		progress=true
+		stats=1
+		threads="$(makeopts_jobs)"
+		verbose=1
+
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		LLVM_CONFIG="$(get_llvm_prefix -d)/bin/llvm-config"
+	)
+}
+
+src_compile() {
+	emake "${MY_EMAKE_COMMON_ARGS[@]}"
+
+	use doc && emake docs "${MY_EMAKE_COMMON_ARGS[@]}"
+}
+
+src_test() {
+	# EXTRA_SPEC_FLAGS is useful to debug individual tests
+	# as part of full build:
+	#    USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal
+	emake std_spec \
+		"${MY_EMAKE_COMMON_ARGS[@]}" "EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}"
+}
+
+src_install() {
+	insinto "/usr/$(get_libdir)/crystal"
+	doins -r src/.
+
+	exeinto /usr/bin
+	doexe .build/crystal
+
+	insinto /usr/share/zsh/site-functions
+	newins etc/completion.zsh _crystal
+
+	dodoc -r samples
+	doman "man/${PN}.1"
+	newbashcomp etc/completion.bash "${PN}"
+
+	if use doc ; then
+		docinto api
+		dodoc -r docs/.
+	fi
+}
diff --git a/dev-lang/crystal/crystal-1.15.0.ebuild b/dev-lang/crystal/crystal-1.15.0.ebuild
new file mode 100644
index 000000000000..4ceb85f7e207
--- /dev/null
+++ b/dev-lang/crystal/crystal-1.15.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+BV="${PV}-1"
+BV_AMD64="${BV}-linux-x86_64"
+
+LLVM_COMPAT=( {18..19} )
+
+inherit bash-completion-r1 llvm-r1 multiprocessing toolchain-funcs
+
+DESCRIPTION="The Crystal Programming Language"
+HOMEPAGE="https://crystal-lang.org/
+	https://github.com/crystal-lang/crystal/"
+SRC_URI="
+	https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	amd64? (
+		https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz
+	)
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc debug llvm-libunwind"
+RESTRICT="test"  # Upstream test suite not reliable.
+
+DEPEND="
+	dev-libs/boehm-gc:=[threads]
+	dev-libs/gmp:=
+	dev-libs/libatomic_ops:=
+	dev-libs/libevent:=
+	dev-libs/libpcre2:=[unicode]
+	dev-libs/pcl:=
+	$(llvm_gen_dep '
+		llvm-core/llvm:${LLVM_SLOT}=
+	')
+	llvm-libunwind? (
+		llvm-runtimes/libunwind:=
+	)
+	!llvm-libunwind? (
+		sys-libs/libunwind:=
+	)
+"
+RDEPEND="
+	${DEPEND}
+	dev-libs/libxml2
+	dev-libs/libyaml
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.27.0-gentoo-tests-long-unix.patch"
+	"${FILESDIR}/${PN}-0.27.0-gentoo-tests-long-unix-2.patch"
+)
+
+src_configure() {
+	local bootstrap_path="${WORKDIR}/${PN}-${BV}/bin"
+	if [[ ! -d "${bootstrap_path}" ]] ; then
+		eerror "Binary tarball does not contain expected directory:"
+		die "'${bootstrap_path}' path does not exist."
+	fi
+
+	# crystal uses 'LLVM_TARGETS' to override default list of targets
+	unset LLVM_TARGETS
+
+	MY_EMAKE_COMMON_ARGS=(
+		PATH="${bootstrap_path}:${PATH}"
+
+		CRYSTAL_CONFIG_VERSION="${PV}"
+		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
+
+		$(usex debug "" release=1)
+		progress=true
+		stats=1
+		threads="$(makeopts_jobs)"
+		verbose=1
+
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		LLVM_CONFIG="$(get_llvm_prefix -d)/bin/llvm-config"
+	)
+}
+
+src_compile() {
+	emake "${MY_EMAKE_COMMON_ARGS[@]}"
+
+	use doc && emake docs "${MY_EMAKE_COMMON_ARGS[@]}"
+}
+
+src_test() {
+	emake std_spec "${MY_EMAKE_COMMON_ARGS[@]}"
+}
+
+src_install() {
+	insinto "/usr/$(get_libdir)/crystal"
+	doins -r src/.
+
+	exeinto /usr/bin
+	doexe .build/crystal
+
+	insinto /usr/share/zsh/site-functions
+	newins etc/completion.zsh _crystal
+
+	dodoc -r samples
+	doman "man/${PN}.1"
+	newbashcomp etc/completion.bash "${PN}"
+
+	if use doc ; then
+		docinto api
+		dodoc -r docs/.
+	fi
+}
diff --git a/dev-lang/eisl/Manifest b/dev-lang/eisl/Manifest
index c560010515d6..628e5197844d 100644
--- a/dev-lang/eisl/Manifest
+++ b/dev-lang/eisl/Manifest
@@ -1,5 +1,4 @@
-DIST eisl-5.36.tar.gz 3136331 BLAKE2B 84f3b6917d2d4c2319e3322a9c80bfd4ebebcf9731c7625f1be8f619edc60c1c005db407b09c3f1158e5d7c739244e975513f75bb16913b9cc8162b0fafeb8fd SHA512 6f7d8629a74513ed0d6f3eab7aa9f6af1ec706ebe64c48543ead70fb4825d6e090b4cc1399353b07ed107b78c589f1398c7169ba9799be132de4da5552d95846
-DIST eisl-5.37.tar.gz 3136844 BLAKE2B 43a326e4367b9ba01ef57194ffb9c9f9a9cf322de3055d340263075d2fdd5d06bc0abb3ccacf41018227e1a13e71dd91cd77e42001a58ef8121f8910a03bcb13 SHA512 5f3c88d16f8febb88767d31de193e90da27357132cb46e11ae526ec7d048a8f392b688d2eb815bc297bab3c2ead5ba497bc0dba48a1b65754a6ef499259fddab
 DIST eisl-5.38.tar.gz 3136867 BLAKE2B cfe62da4882a8f687c683345c3518a7245bdfc87b17dd6b956cc3b5db494631c6cb3a2ca24ecfe1454671e8d1e14c9052ae4c119b4855c585fbb93c99af0ddba SHA512 4bed412660700ddba7a8015b1488adcaf9ff89aed5ac5af0a51c65af76ec78fa4dab04b092c4ad7404ce3fb071dff7d219810c4422a983375e5634861de81698
 DIST eisl-5.39.tar.gz 3137025 BLAKE2B 1aca7df4b629b9e9b71fa8355654d65a84cf3f08a59111a978f6d3868377f2fb857041a83f2044dc3d367624b910aaee701d5a4b0dea2d4aa94c49f0aaa60ef4 SHA512 976f5ae8eab96be135ab52b2abdac36ebeef6987ff4091639f29105d9b81f2f4f092a38d60e8ad0f746a42dedc362f95e4a26a8e375bff2f3fc7f7215243dd2b
 DIST eisl-5.40.tar.gz 3140344 BLAKE2B aa00ff32302a6a9f1d9772f8e9c2690e47f1d466ec433c2f4519434a599d8b6bdb923e3bbdb1a278b3aaa1274ea139ff46e1bb736f972ab495f0dfc031de1916 SHA512 44e2ca7a35c3e200e7d8b0bd948427e0bfa81e678269df81d3e36e601123c1528c25a4b2d13b5d92956378b27c5211caa5e51113763099af4b9b65bf369382fd
+DIST eisl-5.41.tar.gz 3140179 BLAKE2B b60ec0209313973af31b0940317fdecd8e87c9de46093830d7e3c3924bbab9ef5da638a67b43b91a3c351d3d357817fcf26a56aeb2203e3f2a1865c797c743b1 SHA512 1b87a4c16b75289a95ffee20b7182151701736c96f3ddcdf1e00ef51356b668059b43cab39e9dd3b1f193b102f1f7cd32e435c0d212342e2544fff9507dfb99a
diff --git a/dev-lang/eisl/eisl-5.36.ebuild b/dev-lang/eisl/eisl-5.36.ebuild
deleted file mode 100644
index 1e6288f65690..000000000000
--- a/dev-lang/eisl/eisl-5.36.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Interpreter and compiler compatible with the ISLisp standard"
-HOMEPAGE="https://github.com/sasagawa888/eisl/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/sasagawa888/${PN}.git"
-else
-	SRC_URI="https://github.com/sasagawa888/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-RESTRICT="test"  # Tests run cppcheck (and fail)
-
-DOCS=( README{,-ja}.md documents )
-
-RDEPEND="
-	sys-libs/ncurses:=
-"
-DEPEND="
-	${RDEPEND}
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.60-Makefile.patch" )
-
-src_compile() {
-	emake CC="$(tc-getCC)" clean edlis eisl
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe edlis eisl
-
-	# Compilation of ISLisp files on installation fails.
-	# Do not compile them and mimic "make install".
-	insinto "/usr/share/${PN}"
-	doins -r library
-	doins fast.h ffi.h
-
-	einstalldocs
-}
diff --git a/dev-lang/eisl/eisl-5.37.ebuild b/dev-lang/eisl/eisl-5.37.ebuild
deleted file mode 100644
index 0ef48728bee1..000000000000
--- a/dev-lang/eisl/eisl-5.37.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Interpreter and compiler compatible with the ISLisp standard"
-HOMEPAGE="https://github.com/sasagawa888/eisl/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/sasagawa888/${PN}.git"
-else
-	SRC_URI="https://github.com/sasagawa888/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-RESTRICT="test"  # Tests run cppcheck (and fail)
-
-DOCS=( README{,-ja}.md documents )
-
-RDEPEND="
-	sys-libs/ncurses:=
-"
-DEPEND="
-	${RDEPEND}
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.60-Makefile.patch" )
-
-src_compile() {
-	emake CC="$(tc-getCC)" clean edlis eisl
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe edlis eisl
-
-	# Compilation of ISLisp files on installation fails.
-	# Do not compile them and mimic "make install".
-	insinto "/usr/share/${PN}"
-	doins -r library
-	doins fast.h ffi.h
-
-	einstalldocs
-}
diff --git a/dev-lang/eisl/eisl-5.38.ebuild b/dev-lang/eisl/eisl-5.38.ebuild
index 1e6288f65690..fa1972eec46a 100644
--- a/dev-lang/eisl/eisl-5.38.ebuild
+++ b/dev-lang/eisl/eisl-5.38.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
@@ -35,7 +35,10 @@ DEPEND="
 PATCHES=( "${FILESDIR}/${PN}-3.60-Makefile.patch" )
 
 src_compile() {
-	emake CC="$(tc-getCC)" clean edlis eisl
+	# bug https://bugs.gentoo.org/939771
+	# don't clean and compile in one invocation with --shuffle possible
+	emake CC="$(tc-getCC)" clean
+	emake CC="$(tc-getCC)" edlis eisl
 }
 
 src_install() {
diff --git a/dev-lang/eisl/eisl-5.39.ebuild b/dev-lang/eisl/eisl-5.39.ebuild
index 0ef48728bee1..b73ff04a67d4 100644
--- a/dev-lang/eisl/eisl-5.39.ebuild
+++ b/dev-lang/eisl/eisl-5.39.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
@@ -35,7 +35,10 @@ DEPEND="
 PATCHES=( "${FILESDIR}/${PN}-3.60-Makefile.patch" )
 
 src_compile() {
-	emake CC="$(tc-getCC)" clean edlis eisl
+	# bug https://bugs.gentoo.org/939771
+	# don't clean and compile in one invocation with --shuffle possible
+	emake CC="$(tc-getCC)" clean
+	emake CC="$(tc-getCC)" edlis eisl
 }
 
 src_install() {
diff --git a/dev-lang/eisl/eisl-5.40.ebuild b/dev-lang/eisl/eisl-5.40.ebuild
index 0ef48728bee1..b73ff04a67d4 100644
--- a/dev-lang/eisl/eisl-5.40.ebuild
+++ b/dev-lang/eisl/eisl-5.40.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
@@ -35,7 +35,10 @@ DEPEND="
 PATCHES=( "${FILESDIR}/${PN}-3.60-Makefile.patch" )
 
 src_compile() {
-	emake CC="$(tc-getCC)" clean edlis eisl
+	# bug https://bugs.gentoo.org/939771
+	# don't clean and compile in one invocation with --shuffle possible
+	emake CC="$(tc-getCC)" clean
+	emake CC="$(tc-getCC)" edlis eisl
 }
 
 src_install() {
diff --git a/dev-lang/eisl/eisl-5.41.ebuild b/dev-lang/eisl/eisl-5.41.ebuild
new file mode 100644
index 000000000000..0cbe742c8a06
--- /dev/null
+++ b/dev-lang/eisl/eisl-5.41.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Interpreter and compiler compatible with the ISLisp standard"
+HOMEPAGE="https://github.com/sasagawa888/eisl/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/sasagawa888/${PN}.git"
+else
+	SRC_URI="https://github.com/sasagawa888/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+RESTRICT="test"  # Tests run cppcheck (and fail)
+
+DOCS=( README{,-ja}.md documents )
+
+RDEPEND="
+	sys-libs/ncurses:=
+"
+DEPEND="
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.60-Makefile.patch"
+	"${FILESDIR}/${PN}-5.41-makefile.patch" )
+
+src_compile() {
+	# bug https://bugs.gentoo.org/939771
+	# don't clean and compile in one invocation with --shuffle possible
+	emake CC="$(tc-getCC)" clean
+	emake CC="$(tc-getCC)" edlis eisl
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe edlis eisl
+
+	# Compilation of ISLisp files on installation fails.
+	# Do not compile them and mimic "make install".
+	insinto "/usr/share/${PN}"
+	doins -r library
+	doins fast.h ffi.h
+
+	einstalldocs
+}
diff --git a/dev-lang/eisl/eisl-9999.ebuild b/dev-lang/eisl/eisl-9999.ebuild
index 866b41aa1866..e12350f772db 100644
--- a/dev-lang/eisl/eisl-9999.ebuild
+++ b/dev-lang/eisl/eisl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,7 +31,10 @@ DEPEND="${RDEPEND}"
 PATCHES=( "${FILESDIR}/${PN}-3.60-Makefile.patch" )
 
 src_compile() {
-	emake CC="$(tc-getCC)" clean edlis eisl
+	# bug https://bugs.gentoo.org/939771
+	# don't clean and compile in one invocation with --shuffle possible
+	emake CC="$(tc-getCC)" clean
+	emake CC="$(tc-getCC)" edlis eisl
 }
 
 src_install() {
diff --git a/dev-lang/eisl/files/eisl-5.41-makefile.patch b/dev-lang/eisl/files/eisl-5.41-makefile.patch
new file mode 100644
index 000000000000..eff42346b85d
--- /dev/null
+++ b/dev-lang/eisl/files/eisl-5.41-makefile.patch
@@ -0,0 +1,52 @@
+Upstream commit https://github.com/sasagawa888/eisl/commit/5bd9332998e23298a3d0a3fb7066bdf98dbe5b0b
+Fixes for https://github.com/sasagawa888/eisl/issues/335 https://github.com/sasagawa888/eisl/issues/334
+Edited to accomodate our makefile patch
+Bug https://bugs.gentoo.org/939771
+Bug https://bugs.gentoo.org/942206
+should be fropped from 5.42
+
+From 5bd9332998e23298a3d0a3fb7066bdf98dbe5b0b Mon Sep 17 00:00:00 2001
+From: sasagawa888 <ken-s@tkcnf.or.jp>
+Date: Sun, 12 Jan 2025 09:08:47 +0900
+Subject: [PATCH] Modify makefile
+
+---
+ makefile | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/makefile b/makefile
+index 2755d0c8..b666f95d 100644
+--- a/makefile
++++ b/makefile
+@@ -42,7 +42,7 @@ else
+ 		endif
+ 	endif
+ endif
+-CFLAGS += $(INCS) -g $(CURSES_CFLAGS) -U_XOPEN_SOURCE -Inana/src
++CFLAGS += $(INCS) -g $(CURSES_CFLAGS) -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -Inana/src
+ DFLAGS := --preview=all --de -w --O3 --release --betterC
+ SRC_CII := cii/src/except.c cii/src/fmt.c cii/src/str.c cii/src/text.c
+ SRC_D := dextension.d disl.d
+@@ -1545,6 +155,22 @@ ifeq ($(DEBUG),1)
+ main.o: nana/src/nana-config.h
+ endif
+ 
++main.o: function.o extension.o syntax.o data.o gbc.o cell.o error.o bignum.o compute.o edit.o syn_highlight.o long.o link.o
++function.o: function.c eisl.h 
++extension.o: extension.c eisl.h 
++syntax.o: syntax.c eisl.h 
++data.o: data.c eisl.h 
++gbc.o: gbc.c eisl.h 
++cell.o: cell.c eisl.h 
++error.o: error.c eisl.h 
++bignum.o: bignum.c eisl.h 
++compute.o: compute.c eisl.h 
++edit.o: edit.c eisl.h 
++syntax_highlight.o: syntax_highlight.c eisl.h 
++long.o: long.c eisl.h 
++link.o: link.c eisl.h 
++
++
+ nana/src/nana-config.h:
+ 	-cd nana; autoreconf -fi; ./configure
+ 
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 59b7db6ea606..03f98d281ca2 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -5,3 +5,4 @@ DIST elixir-1.16.2.tar.gz 3357093 BLAKE2B 61ba738542d33e827f7352b7f0a27aa76fc06f
 DIST elixir-1.16.3.tar.gz 3360376 BLAKE2B ac6cdc16f193560e18338bd3e45a4f88c7d4398969336062551477dfdafaab8ada60ae64c856647b36967205849427413938da87f746bd52d03d78e141ba5a03 SHA512 1511fb78bdcc50850cbf91007ed11c6a89e947d0a743c1e9ed30e1c93c1b47b5377fced17eeb66ac511d4f151d2e00ef2ecc6fb425d0d4afe2451be41a6ba6ee
 DIST elixir-1.17.2.tar.gz 3255067 BLAKE2B b2902c41262303fe33efeb22f8fe6cf76596f7d9894b018c0d45eaf1858f7d2ffaa1481659ff290c71807b03c5f2ebb17160d7420133d440957f344df6d01126 SHA512 f9d4983c3e7bd054a76bfe0dfa4aea483a4dd84ada432ae5a144167ff8d268499077704214eaaecfda84469c2f747a3594258ca95a7955bffde0c7b0f65985f2
 DIST elixir-1.17.3.tar.gz 3256595 BLAKE2B c016857f74d65de5afcef6d1284b76fc529a542e5cd0dded73701cbdad93f281529a545af1c5a905cb116a3028472703acfdc21ae070f9255bdfd6d5c09bf7a0 SHA512 084514d1362b52e85c0b4d92b8d18c6d2e9fddb4e4eaf4467f8b1c0985f9ceca1b74a0478581d91164935ae0f49610771860c674e080137e52aadc65b666911b
+DIST elixir-1.18.1.tar.gz 3356562 BLAKE2B bd710e847b2b52255bdcae76793f7f4570a101bd05aec89a4a5ad639febd008309d644db6799e899f46e3a7ba7d9b42e943ec7db04bf983d2c236ccb78292ecb SHA512 ea17f4cb96cab4c4302a304fa8119952ee96b85494f76a6df4e5806f72fa169a2139753600aacd1341f500587d51fabee25a1bf3deb5d838d5ef0d50f0654f76
diff --git a/dev-lang/elixir/elixir-1.18.1.ebuild b/dev-lang/elixir/elixir-1.18.1.ebuild
new file mode 100644
index 000000000000..46bdb92ad285
--- /dev/null
+++ b/dev-lang/elixir/elixir-1.18.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Elixir programming language"
+HOMEPAGE="https://elixir-lang.org"
+SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+# https://hexdocs.pm/elixir/compatibility-and-deprecations.html#between-elixir-and-erlang-otp
+DEPEND="
+	>=dev-lang/erlang-25:0=[ssl]
+	<dev-lang/erlang-28
+"
+# 'mix' tool collides with sci-biology/phylip, bug #537514
+RDEPEND="${DEPEND}
+	!!sci-biology/phylip
+"
+DEPEND+="
+	test? ( dev-vcs/git )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch
+	"${FILESDIR}"/${PN}-1.10.3-no-Q.patch
+	"${FILESDIR}"/${PN}-1.10.3-epmd-daemon.patch
+)
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
+	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
+}
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 0f4bdd61283b..4ef2ebeda763 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -3,7 +3,10 @@ DIST erlang-26.2.2.tar.gz 62440930 BLAKE2B c2746b3eb4ffcd3643803745df3e6474291ed
 DIST erlang-26.2.4.tar.gz 62476971 BLAKE2B f3acfb05a569ce0b4cfd9d9a30ac4840845cc285691294c2ff2776c45812b9046d3453700150912128c385458a3afba7dc54ab773611d46de31b4d2744fcdaf6 SHA512 2fa385b5ec93810c984f31e22757fe8614087191adf0f99376702bd15a316237f8abc1b65d40a302d3919cd28afe65fb4086e39638c6c39af165c0c1ee6fb51d
 DIST erlang-27.0.1.tar.gz 62055749 BLAKE2B 2cbf74efb6e2bd821b30e9b39d13b5b16899a49eedcbedd171068cb4da5d2f5cd98697a4234387d194aeace3ec1c168d752a2afd5bc52c4c6799dfd68ade6916 SHA512 03bba7f7d8226474b4dba9855e78b59c7cf78973fbb2ed48893a26879dc0dce579336e9cae6870f154bdd48cf3be6398cc1ec4ff52f252017d84edb20d565e71
 DIST erlang-27.0.tar.gz 62019520 BLAKE2B 9c683e4de7a1b98579e572667746461b9cba0b54d572cde75e3484003548fea2f657292b7f6bfcb4e765d74d744276ddf5ee3f7f615b29cc4b3e563a8cc00944 SHA512 16945c50c09caad9aac6808470ea2a0e282713f23e54cd4ad60510b114811b5deac427acb36cc8049443b4e3c3302c40b02c696cf3f2028f8bd3e836c8c48ea9
+DIST erlang-27.2.tar.gz 62210841 BLAKE2B 2f5d664eadb1866f6b2c5874704a3e6ab8181f2f465805f710c2643acb09b94cfaf8aa679df60be2ef048f54f8485c3e552fcc12b7f5d2cf4a87a72edb5bc47c SHA512 dd64bf6c997cd2c201afdc693b3766468d9dad86ced46d3701da3858cac57e056148f5e45bfbccf8a92d3a55640a7f46ea4f5184ffc3b9f227bec3c3dfb41ab0
 DIST erlang_doc_html_26.2.tar.gz 37572819 BLAKE2B c9e5dcaf4a282063a58883fc63adb14e4448333e07994542fdf6dfb29cf4c782f3b7a33b4b6543ffa64b2ce9f40fa9482ca798181bd84e00ebaf5a3223d300d4 SHA512 846f42666d190c9c2b4c11048e842f921d2bc9767483b6f54095c3aba0cbea9a0fbe06daac4c4837b371f9653346660704ea957fd9fbb6606e4274897042abaa
 DIST erlang_doc_html_27.0.tar.gz 29506649 BLAKE2B bae1425e3b43608c59975c7936e3e250ae9606acce34a7168c2ef1aba60a2956858e3a5cb4412f8ff937c93821110eae5f0d71b9378cce86d9ad9810f70510dc SHA512 a86497709bb0571b261f520f3e875d51628bc741affa8aded941fd9f66a7a6c821dbf415554cd7be6f91ebedd0d6ca7e6dde2f072bbffdf307bc127f17423536
+DIST erlang_doc_html_27.2.tar.gz 29949824 BLAKE2B f8c32698ff446095742ada9b4a67ce3fe5009bfa99973f7c2826e421f9228544e94493dc3b9f661a2288b8e347329efedfa8b1a113085a4db28ba23c73648bd1 SHA512 51f5b33ffe7abc3cca7cde8170cdd6257c628c9d733b0c3fc6a2fecc9515ee39e618f1925e4300de7f055de73665a43d1953225a90504ed732b5b22df3237b53
 DIST erlang_doc_man_26.2.tar.gz 1746046 BLAKE2B 20f3c5203313bc40595f9a0996c1a31c76d9b1da1ba90fd99b8946b23425c13ce11d27fb9b042911a39297c5bceeff098b44082a007cb2373cac253321f4435c SHA512 bdde6687b449391af5144de54e6d4edbaa75065e9f9cf1ec3878a034968785c2b35eb95331cad329fae6656461f1bc9475b68d1ee05af48166aa9c1083f841a0
 DIST erlang_doc_man_27.0.tar.gz 1764909 BLAKE2B b55614bc3c795813eb2d73dc990f740efc8408a3639d98569adb9718ee140eb04ac2289ca3cd764d2610ac2138dfd6173b50bcae58b3971b51f4819cc33420e3 SHA512 f37fca2943f1c607da5d9cddfa3949b0f43e2cff1049eb9dea60a9833a607a0d1ff8bd835204d0dce20865c326dd4da149a6047a084e95ad9719e84817fd8f46
+DIST erlang_doc_man_27.2.tar.gz 44960 BLAKE2B 6a6814d393a55b8161372d84f09e09e5a0eddcfc235ca8bae547d545b267c30d11ef641c413b20fd938a8d0ee1d8c11bd6450881a42cad69b035416a190fae99 SHA512 b338d9fef4446fc3f15a6f43d4adb952f6af9630f5b309ac1b6148482bc59e907cc68d6c803f029d8309e59962fde236fc7f2c0f41b0061d05f5f7b38f93de27
diff --git a/dev-lang/erlang/erlang-27.2.ebuild b/dev-lang/erlang/erlang-27.2.ebuild
new file mode 100644
index 000000000000..532207e1f846
--- /dev/null
+++ b/dev-lang/erlang/erlang-27.2.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+WX_GTK_VER="3.2-gtk3"
+
+inherit autotools flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets
+
+UPSTREAM_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="https://www.erlang.org/ https://github.com/erlang/otp"
+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/${PN}/otp/releases/download/OTP-${UPSTREAM_V}/otp_doc_man_${UPSTREAM_V}.tar.gz
+		-> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
+	doc? ( https://github.com/${PN}/otp/releases/download/OTP-${UPSTREAM_V}/otp_doc_html_${UPSTREAM_V}.tar.gz
+		 -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
+S="${WORKDIR}"/otp-OTP-${PV}
+
+LICENSE="Apache-2.0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc java +kpoll odbc sctp ssl systemd tk wxwidgets"
+
+RDEPEND="
+	acct-group/epmd
+	acct-user/epmd
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	java? ( >=virtual/jdk-1.8:* )
+	odbc? ( dev-db/unixODBC )
+	sctp? ( net-misc/lksctp-tools )
+	ssl? ( >=dev-libs/openssl-0.9.7d:0= )
+	systemd? ( sys-apps/systemd )
+	wxwidgets? (
+		dev-libs/glib:2
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+		virtual/glu
+	)
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-27.0-dont-ignore-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-24.0.2-serial-configure.patch
+	"${FILESDIR}"/${PN}-25.1.2-c99.patch # Bug #882887
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# FreeBSD & OpenBSD
+	pthread_set_name_np
+)
+
+src_prepare() {
+	default
+
+	tc-export AR CPP CXX LD
+
+	# bug #797886: erlang's VM does unsafe casts for ints
+	# to pointers and back. This breaks on gcc-11 -flto.
+	append-flags -fno-strict-aliasing
+
+	# Ensure that we use erl_interface's libei.a, and not the system
+	# libei.so from dev-libs/libei. Bug #912888.
+	sed -i 's/-lei$/-l:libei.a/' \
+		"${S}"/lib/odbc/c_src/Makefile.in || die
+	(cd "${S}"/lib/odbc &&
+		 eautoconf -B "${S}"/make/autoconf &&
+		 eautoheader -B "${S}"/make/autoconf) || die
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local myconf=(
+		--disable-builtin-zlib
+
+		# don't search for static zlib
+		--with-ssl-zlib=no
+
+		$(use_enable kpoll kernel-poll)
+		$(use_with java javac)
+		$(use_with odbc)
+		$(use_enable sctp)
+		$(use_with ssl ssl)
+		$(use_enable ssl dynamic-ssl-lib)
+		$(use_enable systemd)
+		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+	use doc && emake docs DOC_TARGETS=chunks
+}
+
+extract_version() {
+	local path="$1"
+	local var_name="$2"
+	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
+}
+
+src_install() {
+	local erl_libdir_rel="$(get_libdir)/erlang"
+	local erl_libdir="/usr/${erl_libdir_rel}"
+	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
+	local erl_erts_ver="$(extract_version erts VSN)"
+	local my_manpath="/usr/share/${PN}/man"
+
+	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
+	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
+
+	emake INSTALL_PREFIX="${D}" install
+
+	if use doc ; then
+		emake INSTALL_PREFIX="${D}" install-docs DOC_TARGETS=chunks
+
+		# Note: we explicitly install docs into:
+		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
+		# To maintain that layout we gather everything in 'html-docs'.
+		# See bug #684376.
+		mkdir html-docs || die
+		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
+		docompress -x /usr/share/doc/${PF}
+	else
+		local DOCS=("README.md")
+	fi
+
+	einstalldocs
+
+	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
+	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
+	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
+	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
+	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Clean up the no longer needed files
+	rm "${ED}/${erl_libdir}/Install" || die
+
+	# Bug #922743
+	docompress "${my_manpath}"
+
+	insinto "${my_manpath}"
+	doins -r "${WORKDIR}"/man/*
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	newenvd - "90erlang" <<-_EOF_
+		MANPATH="${my_manpath}"
+	_EOF_
+
+	newinitd "${FILESDIR}"/epmd.init-r3 epmd
+	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
+}
+
+src_test() {
+	# Only run a subset of tests to test that everything was built
+	# successfully, otherwise we will be here for a long time.
+	emake kernel_test ARGS="-suite os_SUITE"
+}
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r5.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r5.ebuild
index 0b3ec6d0b5d2..9cd6e5595182 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2021-r5.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r5.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
@@ -149,8 +149,12 @@ src_configure() {
 	# conservative, we just want it to build for bootstrapping proper
 	# sys-devel/gcc[ada]. We don't need it to be fast.
 	strip-flags
+	CC="${WORKDIR}"/${BTSTRP}/bin/gcc CXX="${WORKDIR}"/${BTSTRP}/bin/g++ strip-unsupported-flags
+	CC="${WORKDIR}"/${GNATDIR}/bin/gcc CXX="${WORKDIR}"/${GNATDIR}/bin/g++ strip-unsupported-flags
 	strip-unsupported-flags
 	filter-lto
+	append-flags -O2
+	append-flags -fno-strict-aliasing
 	downgrade_arch_flags "$(gcc-version)"
 
 	toolchain_src_configure
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 1e7ae9832827..12725ac71cd5 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,7 +1,9 @@
 DIST go1.22.10.src.tar.gz 27565306 BLAKE2B e2dd36c28c0e9cea1239afc139ef79d9b1a4a0f631d5e53b88518e36f0f669433edc1546c6a47f5d790b56da3be093aee7affa125c291f793e1a4bf0ad1cf827 SHA512 0ccf4a42a8bf40c94f21b014fea3ea002d46e8ecb1142be7444148c4937b3d10ce863fb5556f2c1a8f4b51d34d85efe16efa892255eeb4447108c44ac080ce13
+DIST go1.22.11.src.tar.gz 27565913 BLAKE2B d4b8f746846f0ba45307ecf732e035c2628483d59402f0868bc42a2fd1ae3447f61d9c3a6eacbc28b1f25e0b35b99ccf8831baeba4203601810b09267d8743f6 SHA512 40c133d6008df7c7cc3bb95a41c29f7442a6af2dd78b807007daf732471c88e2c641aed32878414d57be3904e5efa580d2ecd13fff5412ee668e753e50f1356e
 DIST go1.22.6.src.tar.gz 27561569 BLAKE2B 55ce88dc2039d68f14aea0792ed6a1b45c8e262aa73f76f852941aed12019318b3be7938c954fb7c03d7583f930f7a0e5164effc1ec10fc6d0fc282484390e49 SHA512 59f84ba390203271d9fe2d3f04624449d54d3bb73c2b6e54b5f7dc9e9e2dce2192bae07ef56a2afee871cff84d457b90f8a00f4433e072028b97af987f3799e1
 DIST go1.22.7.src.tar.gz 27562038 BLAKE2B c4dd868ac6966029fd72e61d9c82ac26162f4eb26f77a3a6a7e8bc609223069c004786066ca66f24f4d595de1da4f4ee18b368f80ac94e832c8bd9edde407094 SHA512 60b37916e31c3482e8395580a29757971df5e1783dc13a9914261007e07aa8b1b9c1a0b874883e297903e16c7831117b8f814aeff0a0d4398948c97c9d73b73a
 DIST go1.22.9.src.tar.gz 27565135 BLAKE2B 14de2374ff196d19bc5c38852ee01813ef0a6d5178ada1cf58bd14822968fbc10ec98914402fa29eee95ae9cc408f66ad67cc60c3c97a9567776e612ae614202 SHA512 d9237212e82f6acb40685fdbe75f3e5c6a6340329c31a885e7f241a5868b5835052e90063db849a5960c8242da2971c55a3a3cab2c0e0e62754b8c33344887cf
 DIST go1.23.1.src.tar.gz 28164249 BLAKE2B cabe5c50f2f674b53114e5bd692b6482143cda42fc36076b37b4644be0769c8325fe400d1646478d360697a3fba5f6e086b181eb68dfecbc325675be0af2f5ee SHA512 c1db053bab03c33b4ec4cbef6c8dfae279542cde433fdb787b564ccf797bb9ac6d191aae3152a860a9539956502f31003f746e924287040849afce5ccaaf0988
 DIST go1.23.3.src.tar.gz 28173788 BLAKE2B 70b228c2163eb054186daff96ca017243f2b16a61f1117fe3dc3ca89bda65c626c5721bc213c377c58e4af2c631634f236211f0e80663bb218d8498563b188bd SHA512 b9b0d36aa1c42f45434b839037f95201f20a1ac8e1c4a1ee4a646f49c85273038854540d36fca0ea3a9edc314431b410717331397d20a8d20c4bead78c060bbb
 DIST go1.23.4.src.tar.gz 28177188 BLAKE2B 4702befb8bbf2d06ac2d10245420b01d77339d135eff62e2952e4bb160ed15d0d08c50c3049dbf080bc4bdc31a62d94f9808ee38779a2644499977cd6e659662 SHA512 5d1cce76b2cbdf628f86a1a8185a07f362becee053cb4270281520e77b36e3908faeaf5b2a6266e61dec9866dc1f3791f77e8dc1bf5f8beaf858c138d0e18c22
+DIST go1.23.5.src.tar.gz 28179014 BLAKE2B 6fe6101054a0c10ce415aea65367a48ef8397c88d66bad01b7c72107a6c60daf0b9a47f7c1cd6c8da9855ab04309f25941cc867e6a9f90ac51d1ab0c54662313 SHA512 b04317afeab2d0ced7c36b8682dd32ac085d95d874cf3f614daa34859d7f7f2b75138132e7a64e237c6b4d711d5b03a4d20533f92a44840915630f4ea7cfafa2
diff --git a/dev-lang/go/go-1.22.11.ebuild b/dev-lang/go/go-1.22.11.ebuild
new file mode 100644
index 000000000000..be6e281250fd
--- /dev/null
+++ b/dev-lang/go/go-1.22.11.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+# See "Bootstrap" in release notes
+GO_BOOTSTRAP_MIN=1.20.14
+MY_PV=${PV/_/}
+
+inherit go-env toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* amd64 ~arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://go.dev"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="cpu_flags_x86_sse2"
+
+RDEPEND="
+arm? ( sys-devel/binutils[gold] )
+arm64? ( sys-devel/binutils[gold] )"
+BDEPEND="|| (
+		>=dev-lang/go-${GO_BOOTSTRAP_MIN}
+		>=dev-lang/go-bootstrap-${GO_BOOTSTRAP_MIN} )"
+
+# the *.syso files have writable/executable stacks
+QA_EXECSTACK='*.syso'
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# This package triggers "unrecognized elf file(s)" notices on riscv.
+# https://bugs.gentoo.org/794046
+QA_PREBUILT='.*'
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT=" strip"
+
+DOCS=(
+	CONTRIBUTING.md
+	PATENTS
+	README.md
+	SECURITY.md
+)
+
+go_tuple() {
+	echo "$(go-env_goos $@)_$(go-env_goarch $@)"
+}
+
+go_cross_compile() {
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+PATCHES=(
+	"${FILESDIR}"/go-never-download-newer-toolchains.patch
+)
+
+src_compile() {
+	if has_version -b ">=dev-lang/go-${GO_BOOTSTRAP_MIN}"; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b ">=dev-lang/go-bootstrap-${GO_BOOTSTRAP_MIN}"; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="${PWD}"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go-env_goarch ${CBUILD})
+	export GOHOSTOS=$(go-env_goos ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go-env_goarch)
+	export GOOS=$(go-env_goos)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	use arm && export GOARM=$(go-env_goarm)
+	use x86 && export GO386=$(go-env_go386)
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test() {
+	go_cross_compile && return 0
+
+	cd src
+
+	# https://github.com/golang/go/issues/42005
+	rm cmd/link/internal/ld/fallocate_test.go || die
+
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild -k || die "tests failed"
+	cd ..
+	rm -fr pkg/*_race || die
+	rm -fr pkg/obj/go-build || die
+}
+
+src_install() {
+	dodir /usr/lib/go
+	# The use of cp is deliberate in order to retain permissions
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
+	insinto /usr/lib/go
+	doins go.env VERSION*
+
+	# testdata directories are not needed on the installed system
+	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	local f x
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
+}
+
+pkg_postinst() {
+	[[ -z ${REPLACING_VERSIONS} ]] && return
+	elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
+	elog "all packages compiled with previous versions of ${CATEGORY}/${PN}"
+	elog "due to the static linking nature of go."
+	elog "If this is not done, the packages compiled with the older"
+	elog "version of the compiler will not be updated until they are"
+	elog "updated individually, which could mean they will have"
+	elog "vulnerabilities."
+	elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
+	elog "See https://bugs.gentoo.org/752153 for more info"
+}
diff --git a/dev-lang/go/go-1.23.5.ebuild b/dev-lang/go/go-1.23.5.ebuild
new file mode 100644
index 000000000000..c613a8bf2214
--- /dev/null
+++ b/dev-lang/go/go-1.23.5.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+# See "Bootstrap" in release notes
+GO_BOOTSTRAP_MIN=1.20.14
+MY_PV=${PV/_/}
+
+inherit go-env toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* amd64 ~arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://go.dev"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="cpu_flags_x86_sse2"
+
+RDEPEND="
+arm? ( sys-devel/binutils[gold] )
+arm64? ( sys-devel/binutils[gold] )"
+BDEPEND="|| (
+		>=dev-lang/go-${GO_BOOTSTRAP_MIN}
+		>=dev-lang/go-bootstrap-${GO_BOOTSTRAP_MIN} )"
+
+# the *.syso files have writable/executable stacks
+QA_EXECSTACK='*.syso'
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# This package triggers "unrecognized elf file(s)" notices on riscv.
+# https://bugs.gentoo.org/794046
+QA_PREBUILT='.*'
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT=" strip"
+
+DOCS=(
+	CONTRIBUTING.md
+	PATENTS
+	README.md
+	SECURITY.md
+)
+
+go_tuple() {
+	echo "$(go-env_goos $@)_$(go-env_goarch $@)"
+}
+
+go_cross_compile() {
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+PATCHES=(
+	"${FILESDIR}"/go-never-download-newer-toolchains.patch
+)
+
+src_compile() {
+	if has_version -b ">=dev-lang/go-${GO_BOOTSTRAP_MIN}"; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b ">=dev-lang/go-bootstrap-${GO_BOOTSTRAP_MIN}"; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go-env_goarch ${CBUILD})
+	export GOHOSTOS=$(go-env_goos ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go-env_goarch)
+	export GOOS=$(go-env_goos)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	use arm && export GOARM=$(go-env_goarm)
+	use x86 && export GO386=$(go-env_go386)
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test() {
+	go_cross_compile && return 0
+
+	cd src
+
+	# https://github.com/golang/go/issues/42005
+	rm cmd/link/internal/ld/fallocate_test.go || die
+
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild -k || die "tests failed"
+	cd ..
+	rm -fr pkg/*_race || die
+	rm -fr pkg/obj/go-build || die
+}
+
+src_install() {
+	dodir /usr/lib/go
+	# The use of cp is deliberate in order to retain permissions
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
+	insinto /usr/lib/go
+	doins go.env VERSION*
+
+	# testdata directories are not needed on the installed system
+	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	local f x
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
+}
+
+pkg_postinst() {
+	[[ -z ${REPLACING_VERSIONS} ]] && return
+	elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
+	elog "all packages compiled with previous versions of ${CATEGORY}/${PN}"
+	elog "due to the static linking nature of go."
+	elog "If this is not done, the packages compiled with the older"
+	elog "version of the compiler will not be updated until they are"
+	elog "updated individually, which could mean they will have"
+	elog "vulnerabilities."
+	elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
+	elog "See https://bugs.gentoo.org/752153 for more info"
+}
diff --git a/dev-lang/grass/Manifest b/dev-lang/grass/Manifest
new file mode 100644
index 000000000000..d1d136a8a47c
--- /dev/null
+++ b/dev-lang/grass/Manifest
@@ -0,0 +1,64 @@
+DIST ahash-0.8.7.crate 42894 BLAKE2B 56f4b2f577eb2752e675fa2b3191c65e0bb88575f92e8d906714296fca1daace46e93256672fce08cc5b4ac11d40a690a06b32a99fb50fd0df4f042773c33b6c SHA512 2c9eaa22f7bda47a781994c769d4a2ef15ba0f511fdd4ec4680c13d4c1809f1ce01adecc3b3776793158062d28ad9e5f0b1d1c0a9429e43dd07cd99540eae7a6
+DIST anstream-0.6.11.crate 30239 BLAKE2B 4ac585ec56a804239d32ad3e64d93936ef9d5c8e0f0e2df17f7b081b6a3b2c4c32ff4ebc09ec02507bbed22b025628029d859610aed90c024e19a3216de73c8b SHA512 f8dd65cc116a1495782a3bfc98edfdd0973ab22ea2fafd292fb4bd3495af7b5ea410f320d3fa05f7f812fa96c2a20f4cd2af9fc58869a1a306f32714cbe45163
+DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa
+DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399
+DIST anstyle-query-1.0.2.crate 8739 BLAKE2B c06643e8616f1f4469a32f9c0512941ce53ac5db9ebfa7a5b2f19233040cd4438dd2ee69ab89ecbc1c239e92b674dea9df15ed673408c6f3fe21787cc17d76f3 SHA512 f409b624cbeecf58fd87c47f85be28cae1fe48f65d692195fb80854c514e38c40d0e0ffad3a5b388a3929c47bd2060302ebb635aa98dc57329f3a5ed7be3e2dc
+DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931
+DIST bitflags-2.4.2.crate 42602 BLAKE2B 768d4ca52aca73d8acf2f494a66957ed2603eefd5a04332ed0880d230c2cc6ef3bfdc0792fa6f288a0eb132913dbb256793e580bc34f4a40e8200e1fbafe97a9 SHA512 ef4c20e6e78a2ecee97e17189b7100a504d8176c7c15d7f17d62157a116d66f83f8b2bba472a4acf02cd3edbd94b20a7047af918c3f3b371e2e04f7474be0214
+DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST clap-4.4.18.crate 55269 BLAKE2B cb5d4b093bb7958d013b28ee25f9cbf0479ada392b81265834d75a5fa2e6a4a687f8d4a71520d5bdce05785a874ffaa09beb5707766d59e70928dab00bc122ad SHA512 1f151864b92dcfcc69a66c2a8aa8310ce28171895698d82e2e69e19a6b51ed8780e5eaa77410df9aae2d17c9b45117b913a4c23ef879106c1b7a96182656ebb9
+DIST clap_builder-4.4.18.crate 163538 BLAKE2B 9991c1a8aba5feda466fc878f9415ad9b5922ea1835c17e1dd6c640234ee85e623bc556ba0e4edd84100a0879ae462028c74304465310d69f9d58e333c2ba8a3 SHA512 ff04ce8e700d8df4a0ae94e8341c3bcc1ebd415312e3b21d56e6beadf604aa5576641861506fa1c901a615a013e4f30bf8e6467889d637b34fa37ef22e2a15c2
+DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e
+DIST codemap-0.1.3.crate 9483 BLAKE2B 457832f1df7ef1385daf677ad7e398408ba1022d9288b788783561b4ecd51f40ce1b7aa2cc0ac212933a525b2d305cdacf7aa360443ec84f1bddc24acebc9bba SHA512 58cf60c2161f4c208bc98e8377104be4ca4b2827444a8c1310f2d60cb13775d7158a6d30a88321b308938d635ae92c5a41c5d4fb73a3d86499c29ddf6f86eebb
+DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
+DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
+DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
+DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9
+DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee
+DIST grass-0.13.4.gh.tar.gz 278287 BLAKE2B d637645e4a6479c0cf0bc062ff0d9f092bde0e5f6fd353c4729c892a7cbb1a4b61d78db6ccbbb6dbe15cca8114f81b2949e2dec22fb4b21ba3f508bab59c353e SHA512 7d914987bffca3bde4b11e1b8b98ab50c9a0ffe6085eb14f8574c025120b89a50303dd075e01d91f0d11a94d15c0edabd186c12212bc6ed1527b219381a1cd75
+DIST hashbrown-0.13.2.crate 105265 BLAKE2B e9ff7e6e753166ab3051a834df6f2da81a19ac6997ba269ab13a65e0abb9ce00839311785aefb451553284ad5ef3a0cda925dc2bc188d2a138a78578e530969c SHA512 21dae7a283326d21e16bb32ae0dd1481c4936939a32a06478a3351c2dec97941be532437b808e99ac40e7900a75433fe0efbd852158659a682461245e19d0e70
+DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356
+DIST indexmap-2.2.2.crate 76160 BLAKE2B 1b020e3e33204e9e0cf15e0b91a600296147432002e94ae1061f1d7511e3435a29c1c0c438933eb6a56c7c522cbdfff29a106622041815cbd706b9515e2ab82d SHA512 814cffe0e586940c82c152536a970917ec8702a9b946151ccc8574188fa2cb0fab094888c0e910917c99e37f5f53723ab799999fab4bee395bca7d45adeed40c
+DIST js-sys-0.3.68.crate 80764 BLAKE2B 961f58c181f060af37c00e99f55906140a4c8f1729847d6dd7da7e29b715d69ff822853dc6affb185195347e3d3bfeed392b8969c9d15a5ee28e9f01febbc148 SHA512 9b1b59f1688f95f9bd5031f68c18c0bbb8c16519c7b09aa3042e08e57921a3807d86f15407bb4d9d63c49747ac4847aa963f83373fd0d778a7e7962ea6551b6b
+DIST lasso-0.7.2.crate 78691 BLAKE2B c19fc977b2dc609477f1bd0ac1960f920cf64c4cc550a66020a436e38658af727aac2e920030787ae6b524fd7a4a50098356187e9c531db93be847afe252c034 SHA512 c3a14f9b65c3add25398eb69f6162e349866cf13bea0eb3fd85abe1d4f159d5ffe26b7890964dae696a9f7e1872b09085e8f7a57db2fef87418bade94188bd03
+DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
+DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62
+DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
+DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
+DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee
+DIST phf-0.11.2.crate 21569 BLAKE2B c809201298f1c5046874b3bbdd30e33f2bee2e4b977152a2c5faa91019ee5a1c8fe1d42cf91f6d0b0dd52015fc66f0a84c1b3ae014291ad7d5ba647a78debded SHA512 97752bfb44f3d1f9347b4ccfb6fa2fb80b3263d6f67aa703c52ae90d693c537a0db878acef828c79bd4c41e8f7ca0ea45588dee073d12c9bb0f2980c511b65b4
+DIST phf_generator-0.11.2.crate 14190 BLAKE2B a20d6d3d815ca0eb5ef18780587b9963459887a3ddfe3408c99f5ad7c382da014cc0bbbdca24fe13c780460f3e4ec4580665004afbd300fa470a91d3becf1a5f SHA512 122ee5ddb1f65f386d35e438396eafb7c9f2b1254daa11aefe0a6a45aa0662190c0b7fce32b6e003b04d022e60c2af4e355f995d5ddbd1b58df93eedacb809b3
+DIST phf_macros-0.11.2.crate 4748 BLAKE2B 643942f8e83dcf5623f3479d677ee11c7e25a87e9e90f2aa3b43a75398e6d956613257046f5b307476f605b433c5ae443832223ff1319a918fcf3f9602ce291d SHA512 ea6acfc43491af1330d32860103ad60f29566f6c32d43bbef254f23da0f17cc3723b1d04153fa41f82c01d3865e0e16156b9d2dcbe6a52532b8f268f3a55df7c
+DIST phf_shared-0.11.2.crate 14284 BLAKE2B 3c3bbd24de77b032d194d0b0679a84a4e2848d41ceea5552f73e51e3ebddd5e61188393f126f668689dccbbfa92a8accd9c09a77de39eeaf72b8993dae280dcf SHA512 f2cf9e8ceabde75bb7548e5a47dece9a8fb7eea4a6c5568675e7bd735860c3e51181d749a26cd3dcad1476ec22d524ccb77a956dd267cd0f2b7dfb81db9abcbe
+DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
+DIST proc-macro2-1.0.78.crate 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769
+DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
+DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
+DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
+DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960
+DIST siphasher-0.3.11.crate 10442 BLAKE2B 771221614bbd56f609b9743da4352dc7a2cbd0f6257952fab0cd052e5e5b258a4c95a0461d6d1b579dec90b72d66a0e58e036899b3db8341ae753a421a4cd4d5 SHA512 601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
+DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325
+DIST tempfile-3.10.0.crate 33376 BLAKE2B 303e3bbc2492fd965c5e5ca02229868e94de1b1286175a07b3f9767a174c5a83bb6f6ab59d582f963f9cc4f92362be6a8e898e140397e4314bc18bd8d4e13249 SHA512 0f9bb6420105badfaf7e59f9679b53c6e3f875208ad8b08b9bf38cf67a1512742f1e3dc586136ec9cb760d127da6be69e9f9ed55f18722edf1af3a452e7d93fa
+DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
+DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
+DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
+DIST wasm-bindgen-0.2.91.crate 182689 BLAKE2B 4ee85709546462be3da2a6f1caa02448fa903c7411eb264894aac402979afae4a0d7f3dbb486266b05d8caa911893ae9bfe9921cd36e03eb5147a8d75d6c17d2 SHA512 80e91e5b6094eddadbafd842a4a1b3284de7bb51bbd795e8716a0adac354dc14ceee0593d7c33090de06aadc8bc61b8eeab8851d066cc4ef4661e64adff1988a
+DIST wasm-bindgen-backend-0.2.91.crate 28345 BLAKE2B 912a0471ac64d61f18d1c1749a3614ab70d08f330fd90b903ce5ef51f18288c7d4ef153f1d8100671c02de8fc499928cf925bdab4da4f0352789268dfae87457 SHA512 7d3c8db4503982fae9c86620c964e8f9a4ce542a79c56f21d9f82d26bb9418e78b7fa9922901663bf78516d58652dc3255ef48d1e1f042d8a3c69210f5804204
+DIST wasm-bindgen-macro-0.2.91.crate 13898 BLAKE2B dda8dd5d77dc57324b633f056805bf7892c39c5e70257b6d048c2f8cf885f7306f91f3f17de1b63dc740db66d52fe2250ba981077e03dcc731dcf7c80c047c9d SHA512 6b05e0a2657e7e4f313089787b52cc7f59f5a94be6f716ba007fcbc3bf7c38561225ba3f39245d779e28dd30630b2d4c6be12baa6ea1e6cb47e562ccff48372f
+DIST wasm-bindgen-macro-support-0.2.91.crate 20091 BLAKE2B 337b1b2a9e9e9c1350267df0d9f041291a847cf4faa3bcd6fcc8a96e66fda54685da72f6e64e57cde0d4609409ebdc7851e96781f599470f8b0545018bdc2166 SHA512 1277682520d88cb9529adbc054590a732a8890debe33d1d64ebce332c66c02f84065c0f643fa45c01de8b80534b2daf8333979601323b3ed50dc49553233c39c
+DIST wasm-bindgen-shared-0.2.91.crate 7267 BLAKE2B a9dca2db84a33c650a7abbb6dc552bc4bab1446e66aace751d3709d2c63b878b127748a83cb174aae3ff8c5f5ec017b97623e5e9294e6ebf92d669efc618c357 SHA512 97072a8bdfadde104f6e9e760e1ac5ec665fdaff38a93a0bf601c95e652b35403e58a99fa8c0fefea6e47b38fb97f2e1ffcf52736f9ab890b0b9632efb26cb4b
+DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03
+DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e
+DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f
+DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1
+DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e
+DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671
+DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7
+DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0
+DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7
+DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82
+DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d
diff --git a/dev-lang/grass/grass-0.13.4.ebuild b/dev-lang/grass/grass-0.13.4.ebuild
new file mode 100644
index 000000000000..bd64cb1b32ee
--- /dev/null
+++ b/dev-lang/grass/grass-0.13.4.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	ahash@0.8.7
+	anstream@0.6.11
+	anstyle-parse@0.2.3
+	anstyle-query@1.0.2
+	anstyle-wincon@3.0.2
+	anstyle@1.0.6
+	bitflags@2.4.2
+	bumpalo@3.14.0
+	cfg-if@1.0.0
+	clap@4.4.18
+	clap_builder@4.4.18
+	clap_lex@0.6.0
+	codemap@0.1.3
+	colorchoice@1.0.0
+	equivalent@1.0.1
+	errno@0.3.8
+	fastrand@2.0.1
+	getrandom@0.2.12
+	hashbrown@0.13.2
+	hashbrown@0.14.3
+	indexmap@2.2.2
+	js-sys@0.3.68
+	lasso@0.7.2
+	libc@0.2.153
+	linux-raw-sys@0.4.13
+	log@0.4.20
+	once_cell@1.19.0
+	paste@1.0.14
+	phf@0.11.2
+	phf_generator@0.11.2
+	phf_macros@0.11.2
+	phf_shared@0.11.2
+	ppv-lite86@0.2.17
+	proc-macro2@1.0.78
+	quote@1.0.35
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rustix@0.38.31
+	siphasher@0.3.11
+	strsim@0.10.0
+	syn@2.0.48
+	tempfile@3.10.0
+	unicode-ident@1.0.12
+	utf8parse@0.2.1
+	version_check@0.9.4
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.91
+	wasm-bindgen-macro-support@0.2.91
+	wasm-bindgen-macro@0.2.91
+	wasm-bindgen-shared@0.2.91
+	wasm-bindgen@0.2.91
+	windows-sys@0.52.0
+	windows-targets@0.52.0
+	windows_aarch64_gnullvm@0.52.0
+	windows_aarch64_msvc@0.52.0
+	windows_i686_gnu@0.52.0
+	windows_i686_msvc@0.52.0
+	windows_x86_64_gnu@0.52.0
+	windows_x86_64_gnullvm@0.52.0
+	windows_x86_64_msvc@0.52.0
+	zerocopy-derive@0.7.32
+	zerocopy@0.7.32
+"
+
+inherit cargo
+
+DESCRIPTION="A Sass compiler written purely in Rust"
+HOMEPAGE="https://github.com/connorskees/grass"
+SRC_URI="
+	https://github.com/connorskees/grass/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+S=${WORKDIR}/${P}/crates/lib
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+=" MIT Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_FLAGS_IGNORED="/usr/bin/grass"
+
+src_install() {
+	cargo_src_install
+	dodoc ../../{CHANGELOG.md,README.md}
+}
diff --git a/dev-lang/grass/metadata.xml b/dev-lang/grass/metadata.xml
new file mode 100644
index 000000000000..b8bb9653ffc1
--- /dev/null
+++ b/dev-lang/grass/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>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">connorskees/grass</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lang/haxe/haxe-4.3.6-r1.ebuild b/dev-lang/haxe/haxe-4.3.6-r1.ebuild
deleted file mode 100644
index e9be60dc63a5..000000000000
--- a/dev-lang/haxe/haxe-4.3.6-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Multi-target universal programming language"
-HOMEPAGE="https://haxe.org/
-	https://github.com/HaxeFoundation/haxe/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/HaxeFoundation/haxe.git"
-else
-	# Haxe-debian is a distribution variant that contains the required git modules.
-	SRC_URI="https://github.com/HaxeFoundation/haxe-debian/archive/upstream/${PV}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}/haxe-debian-upstream"
-
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2+ MIT"
-SLOT="0/${PV}"
-IUSE="+ocamlopt"
-RESTRICT="strip"
-
-RDEPEND="
-	<=dev-ml/extlib-1.7.9:=
-	>=dev-lang/ocaml-4:=[ocamlopt?]
-	~dev-ml/luv-0.5.12:=
-
-	dev-ml/ocaml-sha:=
-	dev-ml/ptmap:=
-	dev-ml/sedlex:=
-	dev-ml/xml-light:=
-
-	dev-lang/neko:=
-	dev-libs/boehm-gc:=
-	dev-libs/libpcre:=
-	net-libs/mbedtls:=
-	sys-libs/zlib:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-ml/camlp5
-	dev-ml/dune
-	dev-ml/findlib
-"
-
-QA_FLAGS_IGNORED="usr/bin/haxelib"
-QA_PRESTRIPPED="usr/bin/haxelib"
-
-src_configure() {
-	export OCAMLOPT="$(usex ocamlopt ocamlopt.opt ocamlopt)"
-}
-
-src_compile() {
-	emake -j1 BRANCH="" COMMIT_DATE="" COMMIT_SHA="" \
-		OCAMLOPT="${OCAMLOPT}" INSTALL_DIR="/usr"
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_DIR="/usr" install
-	dodoc *.md
-}
diff --git a/dev-lang/haxe/haxe-4.3.6-r2.ebuild b/dev-lang/haxe/haxe-4.3.6-r2.ebuild
new file mode 100644
index 000000000000..491ce6f87e76
--- /dev/null
+++ b/dev-lang/haxe/haxe-4.3.6-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Multi-target universal programming language"
+HOMEPAGE="https://haxe.org/
+	https://github.com/HaxeFoundation/haxe/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/HaxeFoundation/haxe.git"
+else
+	# Haxe-debian is a distribution variant that contains the required git modules.
+	SRC_URI="https://github.com/HaxeFoundation/haxe-debian/archive/upstream/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/haxe-debian-upstream"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2+ MIT"
+SLOT="0/${PV}"
+IUSE="+ocamlopt"
+RESTRICT="strip"
+
+RDEPEND="
+	<=dev-ml/extlib-1.7.9:=
+	>=dev-lang/ocaml-4:=[ocamlopt?]
+	~dev-ml/luv-0.5.12:=
+
+	dev-ml/ocaml-sha:=
+	dev-ml/ptmap:=
+	dev-ml/sedlex:=
+	dev-ml/xml-light:=
+
+	dev-lang/neko:=
+	dev-libs/boehm-gc:=
+	dev-libs/libpcre:=
+	net-libs/mbedtls:0=
+	sys-libs/zlib:=
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-ml/camlp5
+	dev-ml/dune
+	dev-ml/findlib
+"
+
+QA_FLAGS_IGNORED="usr/bin/haxelib"
+QA_PRESTRIPPED="usr/bin/haxelib"
+
+src_configure() {
+	export OCAMLOPT="$(usex ocamlopt ocamlopt.opt ocamlopt)"
+}
+
+src_compile() {
+	emake -j1 BRANCH="" COMMIT_DATE="" COMMIT_SHA="" \
+		OCAMLOPT="${OCAMLOPT}" INSTALL_DIR="/usr"
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_DIR="/usr" install
+	dodoc *.md
+}
diff --git a/dev-lang/julia/julia-1.8.3-r4.ebuild b/dev-lang/julia/julia-1.8.3-r4.ebuild
deleted file mode 100644
index 997f4870446f..000000000000
--- a/dev-lang/julia/julia-1.8.3-r4.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# correct versions for stdlibs are in deps/checksums
-# for everything else, run with network-sandbox and wait for the crash
-
-EAPI=8
-
-# >=1.8.2 still sits on LLVM 13, bug: https://bugs.gentoo.org/876184
-MY_LLVM_V=13.0.1
-
-inherit flag-o-matic pax-utils toolchain-funcs optfeature
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/
-	https://github.com/JuliaLang/julia/"
-SRC_URI="https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-arch/p7zip
-	app-misc/ca-certificates
-	dev-libs/gmp:0=
-	dev-libs/libgit2:0
-	dev-libs/mpfr:0=
-	>=dev-libs/libutf8proc-2.6.1:0=[-cjk]
-	>=dev-util/patchelf-0.13
-	>=net-libs/mbedtls-2.2
-	net-misc/curl[http2,ssh]
-	sci-libs/amd:0=
-	sci-libs/arpack:0=
-	sci-libs/camd:0=
-	sci-libs/ccolamd:0=
-	sci-libs/cholmod:0=
-	sci-libs/colamd:0=
-	sci-libs/fftw:3.0=[threads]
-	sci-libs/openlibm:0=
-	sci-libs/spqr:0=
-	sci-libs/umfpack:0=
-	>=sci-mathematics/dsfmt-2.2.4
-	>=sys-libs/libunwind-1.1:0=
-	sys-libs/zlib:0=
-	>=virtual/blas-3.6
-	virtual/lapack
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-build/cmake
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.8.0-llvm-no-bindings.patch )
-
-# Huge thanks to Arch Linux developers for the patches.
-archlinux_uri="https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/"
-archlinux_patches=(
-	074d761f.patch
-	ed9851b0.patch
-	julia-hardcoded-libs.patch
-	julia-libunwind-1.6.patch
-	julia-llvm-14.patch
-	julia-system-cblas.patch
-	make-install-no-build.patch
-)
-for archlinux_patch in ${archlinux_patches[@]} ; do
-	archlinux_patch_name="${PN}-1.8.0-${archlinux_patch}"
-	SRC_URI+="
-		${archlinux_uri}/${archlinux_patch}
-			-> ${archlinux_patch_name}
-	"
-	PATCHES+=( "${DISTDIR}/${archlinux_patch_name}" )
-done
-
-src_unpack() {
-	local tounpack=( ${A} )
-	# the main source tree, followed by deps
-	unpack "${tounpack[0]}"
-
-	mkdir -p "${S}/deps/srccache/"
-	for i in "${tounpack[@]:1}"; do
-		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
-	done
-}
-
-src_prepare() {
-	default
-
-	# Various LTO issues.
-	# https://bugs.gentoo.org/855602
-	filter-lto
-
-	# Sledgehammer:
-	# - prevent fetching of bundled stuff in compile and install phase
-	# - respect CFLAGS
-	# - respect EPREFIX and Gentoo specific paths
-
-	sed -i \
-		-e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
-		Make.inc || die
-
-	sed -i \
-		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
-		src/Makefile || die
-
-	# disable doc install starting	git fetching
-	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
-}
-
-src_configure() {
-	# julia does not play well with the system versions of libuv
-	# Fails to compile with libpcre2 on split-usr, bug #893336
-	# USE_SYSTEM_LIBM=0 implies using external openlibm
-	cat <<-EOF > Make.user
-		LOCALBASE:="${EPREFIX}/usr"
-		override prefix:="${EPREFIX}/usr"
-		override libdir:="\$(prefix)/$(get_libdir)"
-		override CC:=$(tc-getCC)
-		override CXX:=$(tc-getCXX)
-		override AR:=$(tc-getAR)
-
-		BUNDLE_DEBUG_LIBS:=0
-		USE_BINARYBUILDER:=0
-		USE_SYSTEM_CSL:=1
-		USE_SYSTEM_LLVM:=0
-		USE_SYSTEM_LIBUNWIND:=1
-		USE_SYSTEM_PCRE:=0
-		USE_SYSTEM_LIBM:=0
-		USE_SYSTEM_OPENLIBM:=1
-		USE_SYSTEM_DSFMT:=1
-		USE_SYSTEM_BLAS:=1
-		USE_SYSTEM_LAPACK:=1
-		USE_SYSTEM_LIBBLASTRAMPOLINE:=0
-		USE_SYSTEM_GMP:=1
-		USE_SYSTEM_MPFR:=1
-		USE_SYSTEM_LIBSUITESPARSE:=1
-		USE_SYSTEM_LIBUV:=0
-		USE_SYSTEM_UTF8PROC:=1
-		USE_SYSTEM_MBEDTLS:=1
-		USE_SYSTEM_LIBSSH2:=1
-		USE_SYSTEM_NGHTTP2:=1
-		USE_SYSTEM_CURL:=1
-		USE_SYSTEM_LIBGIT2:=1
-		USE_SYSTEM_PATCHELF:=1
-		USE_SYSTEM_ZLIB:=1
-		USE_SYSTEM_P7ZIP:=1
-		VERBOSE:=1
-	EOF
-}
-
-src_compile() {
-	# Julia accesses /proc/self/mem on Linux
-	addpredict /proc/self/mem
-
-	emake
-	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
-}
-
-src_install() {
-	emake -j1 install DESTDIR="${D}"
-	dodoc CONTRIBUTING.md HISTORY.md NEWS.md README.md THIRDPARTY.md
-
-	local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
-	cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
-	cp "${S}/usr/lib/libLLVM-${MY_LLVM_V}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
-
-	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
-	rmdir "${ED}"/usr/etc || die
-	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die
-	rmdir "${ED}"/usr/share/doc/julia || die
-
-	# The appdata directory is deprecated.
-	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
-
-	# Link ca-certificates.crt, bug: https://bugs.gentoo.org/888978
-	dosym -r /etc/ssl/certs/ca-certificates.crt /usr/share/julia/cert.pem
-}
-
-pkg_postinst() {
-	optfeature "Julia Plots" sci-visualization/gr
-}
diff --git a/dev-lang/julia/julia-1.8.3-r5.ebuild b/dev-lang/julia/julia-1.8.3-r5.ebuild
new file mode 100644
index 000000000000..7ae8ecc12cb4
--- /dev/null
+++ b/dev-lang/julia/julia-1.8.3-r5.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# correct versions for stdlibs are in deps/checksums
+# for everything else, run with network-sandbox and wait for the crash
+
+EAPI=8
+
+# >=1.8.2 still sits on LLVM 13, bug: https://bugs.gentoo.org/876184
+MY_LLVM_V=13.0.1
+
+inherit flag-o-matic pax-utils toolchain-funcs optfeature
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/
+	https://github.com/JuliaLang/julia/"
+SRC_URI="https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-arch/p7zip
+	app-misc/ca-certificates
+	dev-libs/gmp:0=
+	dev-libs/libgit2:0
+	dev-libs/mpfr:0=
+	>=dev-libs/libutf8proc-2.6.1:0=[-cjk]
+	>=dev-util/patchelf-0.13
+	>=net-libs/mbedtls-2.2:0=
+	net-misc/curl[http2,ssh]
+	sci-libs/amd:0=
+	sci-libs/arpack:0=
+	sci-libs/camd:0=
+	sci-libs/ccolamd:0=
+	sci-libs/cholmod:0=
+	sci-libs/colamd:0=
+	sci-libs/fftw:3.0=[threads]
+	sci-libs/openlibm:0=
+	sci-libs/spqr:0=
+	sci-libs/umfpack:0=
+	>=sci-mathematics/dsfmt-2.2.4
+	>=sys-libs/libunwind-1.1:0=
+	sys-libs/zlib:0=
+	>=virtual/blas-3.6
+	virtual/lapack
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-build/cmake
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.8.0-llvm-no-bindings.patch )
+
+# Huge thanks to Arch Linux developers for the patches.
+archlinux_uri="https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/"
+archlinux_patches=(
+	074d761f.patch
+	ed9851b0.patch
+	julia-hardcoded-libs.patch
+	julia-libunwind-1.6.patch
+	julia-llvm-14.patch
+	julia-system-cblas.patch
+	make-install-no-build.patch
+)
+for archlinux_patch in ${archlinux_patches[@]} ; do
+	archlinux_patch_name="${PN}-1.8.0-${archlinux_patch}"
+	SRC_URI+="
+		${archlinux_uri}/${archlinux_patch}
+			-> ${archlinux_patch_name}
+	"
+	PATCHES+=( "${DISTDIR}/${archlinux_patch_name}" )
+done
+
+src_unpack() {
+	local tounpack=( ${A} )
+	# the main source tree, followed by deps
+	unpack "${tounpack[0]}"
+
+	mkdir -p "${S}/deps/srccache/"
+	for i in "${tounpack[@]:1}"; do
+		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
+	done
+}
+
+src_prepare() {
+	default
+
+	# Various LTO issues.
+	# https://bugs.gentoo.org/855602
+	filter-lto
+
+	# Sledgehammer:
+	# - prevent fetching of bundled stuff in compile and install phase
+	# - respect CFLAGS
+	# - respect EPREFIX and Gentoo specific paths
+
+	sed -i \
+		-e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
+		Make.inc || die
+
+	sed -i \
+		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
+		src/Makefile || die
+
+	# disable doc install starting	git fetching
+	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
+}
+
+src_configure() {
+	# julia does not play well with the system versions of libuv
+	# Fails to compile with libpcre2 on split-usr, bug #893336
+	# USE_SYSTEM_LIBM=0 implies using external openlibm
+	cat <<-EOF > Make.user
+		LOCALBASE:="${EPREFIX}/usr"
+		override prefix:="${EPREFIX}/usr"
+		override libdir:="\$(prefix)/$(get_libdir)"
+		override CC:=$(tc-getCC)
+		override CXX:=$(tc-getCXX)
+		override AR:=$(tc-getAR)
+
+		BUNDLE_DEBUG_LIBS:=0
+		USE_BINARYBUILDER:=0
+		USE_SYSTEM_CSL:=1
+		USE_SYSTEM_LLVM:=0
+		USE_SYSTEM_LIBUNWIND:=1
+		USE_SYSTEM_PCRE:=0
+		USE_SYSTEM_LIBM:=0
+		USE_SYSTEM_OPENLIBM:=1
+		USE_SYSTEM_DSFMT:=1
+		USE_SYSTEM_BLAS:=1
+		USE_SYSTEM_LAPACK:=1
+		USE_SYSTEM_LIBBLASTRAMPOLINE:=0
+		USE_SYSTEM_GMP:=1
+		USE_SYSTEM_MPFR:=1
+		USE_SYSTEM_LIBSUITESPARSE:=1
+		USE_SYSTEM_LIBUV:=0
+		USE_SYSTEM_UTF8PROC:=1
+		USE_SYSTEM_MBEDTLS:=1
+		USE_SYSTEM_LIBSSH2:=1
+		USE_SYSTEM_NGHTTP2:=1
+		USE_SYSTEM_CURL:=1
+		USE_SYSTEM_LIBGIT2:=1
+		USE_SYSTEM_PATCHELF:=1
+		USE_SYSTEM_ZLIB:=1
+		USE_SYSTEM_P7ZIP:=1
+		VERBOSE:=1
+	EOF
+}
+
+src_compile() {
+	# Julia accesses /proc/self/mem on Linux
+	addpredict /proc/self/mem
+
+	emake
+	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
+}
+
+src_install() {
+	emake -j1 install DESTDIR="${D}"
+	dodoc CONTRIBUTING.md HISTORY.md NEWS.md README.md THIRDPARTY.md
+
+	local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
+	cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
+	cp "${S}/usr/lib/libLLVM-${MY_LLVM_V}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
+
+	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
+	rmdir "${ED}"/usr/etc || die
+	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die
+	rmdir "${ED}"/usr/share/doc/julia || die
+
+	# The appdata directory is deprecated.
+	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
+
+	# Link ca-certificates.crt, bug: https://bugs.gentoo.org/888978
+	dosym -r /etc/ssl/certs/ca-certificates.crt /usr/share/julia/cert.pem
+}
+
+pkg_postinst() {
+	optfeature "Julia Plots" sci-visualization/gr
+}
diff --git a/dev-lang/julia/julia-1.8.5-r1.ebuild b/dev-lang/julia/julia-1.8.5-r1.ebuild
deleted file mode 100644
index 555a81908e12..000000000000
--- a/dev-lang/julia/julia-1.8.5-r1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# correct versions for stdlibs are in deps/checksums
-# for everything else, run with network-sandbox and wait for the crash
-
-EAPI=8
-
-# >=1.8.2 still sits on LLVM 13, bug: https://bugs.gentoo.org/876184
-MY_LLVM_V=13.0.1
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit check-reqs flag-o-matic optfeature pax-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/
-	https://github.com/JuliaLang/julia/"
-SRC_URI="
-	https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz
-	https://github.com/JuliaLang/julia/commit/0b211609.patch
-		-> ${PN}-0b211609.patch
-	https://github.com/JuliaLang/julia/commit/a48ad530.patch
-		-> ${PN}-a48ad530.patch
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/libutf8proc-2.6.1:0=[-cjk]
-	>=dev-util/patchelf-0.13
-	>=net-libs/mbedtls-2.2
-	>=sci-mathematics/dsfmt-2.2.4
-	>=sys-libs/libunwind-1.1:0=
-	>=virtual/blas-3.6
-	app-arch/p7zip
-	app-misc/ca-certificates
-	dev-libs/gmp:0=
-	dev-libs/libgit2:0
-	dev-libs/mpfr:0=
-	net-misc/curl[http2,ssh]
-	sci-libs/amd:0=
-	sci-libs/arpack:0=
-	sci-libs/camd:0=
-	sci-libs/ccolamd:0=
-	sci-libs/cholmod:0=
-	sci-libs/colamd:0=
-	sci-libs/fftw:3.0=[threads]
-	sci-libs/openlibm:0=
-	sci-libs/spqr:0=
-	sci-libs/umfpack:0=
-	sys-libs/zlib:0=
-	virtual/lapack
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-build/cmake
-	virtual/pkgconfig
-"
-
-CHECKREQS_DISK_BUILD="4G"
-PATCHES=(
-	"${DISTDIR}"/${PN}-0b211609.patch
-	"${DISTDIR}"/${PN}-a48ad530.patch
-	"${FILESDIR}"/${PN}-1.8.5-cstdint-includes.patch
-	"${FILESDIR}"/${PN}-1.8.0-llvm-no-bindings.patch
-	"${FILESDIR}"/${PN}-1.8.3-gcc13.patch
-)
-QA_FLAGS_IGNORED+='usr/.*/julia/sys.so'  # Julia sysimage generated by bootstrapping.
-
-# Huge thanks to Arch Linux developers for the patches.
-archlinux_uri="https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/"
-archlinux_patches=(
-	074d761f.patch              # wanted
-	0db596e6.patch              # secondary
-	190565c2.patch              # secondary
-	23f39f83.patch              # secondary
-	3423639d.patch              # secondary
-	68adc00e.patch              # secondary
-	700c69b1.patch              # secondary
-	ed9851b0.patch              # wanted
-	julia-hardcoded-libs.patch  # wanted
-	julia-libunwind-1.6.patch   # wanted
-	julia-mpfr-4.2.patch        # secondary
-	julia-system-cblas.patch    # wanted
-)
-for archlinux_patch in ${archlinux_patches[@]} ; do
-	archlinux_patch_name="${PN}-1.8.0-${archlinux_patch}"
-	SRC_URI+="
-		${archlinux_uri}/${archlinux_patch}
-			-> ${archlinux_patch_name}
-	"
-	PATCHES+=( "${DISTDIR}/${archlinux_patch_name}" )
-done
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	local -a tounpack=( ${A} )
-	# the main source tree, followed by deps
-	unpack "${tounpack[0]}"
-
-	mkdir -p "${S}/deps/srccache/"
-	local i
-	for i in "${tounpack[@]:1}"; do
-		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
-	done
-
-	# Extract tarballs for patching.
-	cd "${S}/deps/srccache/" || die
-	tar xf llvm-julia-13.0.1-3.tar.gz || die
-}
-
-src_prepare() {
-	default
-
-	# Various LTO issues.
-	# https://bugs.gentoo.org/855602
-	filter-lto
-
-	# Sledgehammer:
-	# - prevent fetching of bundled stuff in compile and install phase
-	# - respect CFLAGS
-	# - respect EPREFIX and Gentoo specific paths
-
-	sed -i \
-		-e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
-		Make.inc || die
-
-	sed -i \
-		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
-		src/Makefile || die
-
-	# disable doc install starting	git fetching
-	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
-
-	# Blank the tarball checksum check script.
-	echo "#!/bin/sh" > deps/tools/jlchecksum || die
-
-	# Repack tarballs.
-	cd "${S}/deps/srccache/" || die
-	tar czf llvm-julia-13.0.1-3.tar.gz JuliaLang-llvm-project-8a2ae8c || die
-}
-
-src_configure() {
-	# julia does not play well with the system versions of libuv
-	# Fails to compile with libpcre2 on split-usr, bug #893336
-	# USE_SYSTEM_LIBM=0 implies using external openlibm
-	cat <<-EOF > Make.user
-		LOCALBASE:=${EPREFIX}/usr
-		override prefix:=${EPREFIX}/usr
-		override libdir:=\$(prefix)/$(get_libdir)
-		override CC:=$(tc-getCC)
-		override CXX:=$(tc-getCXX)
-		override AR:=$(tc-getAR)
-
-		BUNDLE_DEBUG_LIBS:=0
-		USE_BINARYBUILDER:=0
-		USE_INTEL_JITEVENTS=0
-		USE_SYSTEM_CSL:=1
-		USE_SYSTEM_LLVM:=0
-		USE_SYSTEM_LIBUNWIND:=1
-		USE_SYSTEM_PCRE:=0
-		USE_SYSTEM_LIBM:=0
-		USE_SYSTEM_OPENLIBM:=1
-		USE_SYSTEM_DSFMT:=1
-		USE_SYSTEM_BLAS:=1
-		USE_SYSTEM_LAPACK:=1
-		USE_SYSTEM_LIBBLASTRAMPOLINE:=0
-		USE_SYSTEM_GMP:=1
-		USE_SYSTEM_MPFR:=1
-		USE_SYSTEM_LIBSUITESPARSE:=1
-		USE_SYSTEM_LIBUV:=0
-		USE_SYSTEM_UTF8PROC:=1
-		USE_SYSTEM_MBEDTLS:=1
-		USE_SYSTEM_LIBSSH2:=1
-		USE_SYSTEM_NGHTTP2:=1
-		USE_SYSTEM_CURL:=1
-		USE_SYSTEM_LIBGIT2:=1
-		USE_SYSTEM_PATCHELF:=1
-		USE_SYSTEM_ZLIB:=1
-		USE_SYSTEM_P7ZIP:=1
-		VERBOSE:=1
-	EOF
-}
-
-src_compile() {
-	# Julia accesses /proc/self/mem on Linux.
-	addpredict /proc/self/mem
-
-	emake
-	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
-}
-
-src_install() {
-	emake -j1 install DESTDIR="${D}"
-	dodoc CONTRIBUTING.md HISTORY.md NEWS.md README.md THIRDPARTY.md
-
-	local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
-	cp "${S}"/usr/lib/libLLVM-${llvmslot}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die
-	cp "${S}"/usr/lib/libLLVM-${MY_LLVM_V}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die
-
-	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
-	rmdir "${ED}"/usr/etc || die
-	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die
-	rmdir "${ED}"/usr/share/doc/julia || die
-
-	# The appdata directory is deprecated.
-	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
-
-	# Link ca-certificates.crt, bug: https://bugs.gentoo.org/888978
-	dosym -r /etc/ssl/certs/ca-certificates.crt /usr/share/julia/cert.pem
-
-	# Julia always searches for "sys.so" inside "/usr/lib/julia",
-	# bug: https://github.com/JuliaLang/julia/issues/49574
-	if [[ $(get_libdir) == "lib64" ]] ; then
-		insinto /usr/lib/julia
-		doins "${ED}"/usr/$(get_libdir)/julia/sys.so
-	fi
-}
-
-pkg_postinst() {
-	optfeature "Julia Plots" sci-visualization/gr
-}
diff --git a/dev-lang/julia/julia-1.8.5-r2.ebuild b/dev-lang/julia/julia-1.8.5-r2.ebuild
new file mode 100644
index 000000000000..405c44c053f9
--- /dev/null
+++ b/dev-lang/julia/julia-1.8.5-r2.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# correct versions for stdlibs are in deps/checksums
+# for everything else, run with network-sandbox and wait for the crash
+
+EAPI=8
+
+# >=1.8.2 still sits on LLVM 13, bug: https://bugs.gentoo.org/876184
+MY_LLVM_V=13.0.1
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit check-reqs flag-o-matic optfeature pax-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/
+	https://github.com/JuliaLang/julia/"
+SRC_URI="
+	https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz
+	https://github.com/JuliaLang/julia/commit/0b211609.patch
+		-> ${PN}-0b211609.patch
+	https://github.com/JuliaLang/julia/commit/a48ad530.patch
+		-> ${PN}-a48ad530.patch
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/libutf8proc-2.6.1:0=[-cjk]
+	>=dev-util/patchelf-0.13
+	>=net-libs/mbedtls-2.2:0=
+	>=sci-mathematics/dsfmt-2.2.4
+	>=sys-libs/libunwind-1.1:0=
+	>=virtual/blas-3.6
+	app-arch/p7zip
+	app-misc/ca-certificates
+	dev-libs/gmp:0=
+	dev-libs/libgit2:0
+	dev-libs/mpfr:0=
+	net-misc/curl[http2,ssh]
+	sci-libs/amd:0=
+	sci-libs/arpack:0=
+	sci-libs/camd:0=
+	sci-libs/ccolamd:0=
+	sci-libs/cholmod:0=
+	sci-libs/colamd:0=
+	sci-libs/fftw:3.0=[threads]
+	sci-libs/openlibm:0=
+	sci-libs/spqr:0=
+	sci-libs/umfpack:0=
+	sys-libs/zlib:0=
+	virtual/lapack
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-build/cmake
+	virtual/pkgconfig
+"
+
+CHECKREQS_DISK_BUILD="4G"
+PATCHES=(
+	"${DISTDIR}"/${PN}-0b211609.patch
+	"${DISTDIR}"/${PN}-a48ad530.patch
+	"${FILESDIR}"/${PN}-1.8.5-cstdint-includes.patch
+	"${FILESDIR}"/${PN}-1.8.0-llvm-no-bindings.patch
+	"${FILESDIR}"/${PN}-1.8.3-gcc13.patch
+)
+QA_FLAGS_IGNORED+='usr/.*/julia/sys.so'  # Julia sysimage generated by bootstrapping.
+
+# Huge thanks to Arch Linux developers for the patches.
+archlinux_uri="https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/"
+archlinux_patches=(
+	074d761f.patch              # wanted
+	0db596e6.patch              # secondary
+	190565c2.patch              # secondary
+	23f39f83.patch              # secondary
+	3423639d.patch              # secondary
+	68adc00e.patch              # secondary
+	700c69b1.patch              # secondary
+	ed9851b0.patch              # wanted
+	julia-hardcoded-libs.patch  # wanted
+	julia-libunwind-1.6.patch   # wanted
+	julia-mpfr-4.2.patch        # secondary
+	julia-system-cblas.patch    # wanted
+)
+for archlinux_patch in ${archlinux_patches[@]} ; do
+	archlinux_patch_name="${PN}-1.8.0-${archlinux_patch}"
+	SRC_URI+="
+		${archlinux_uri}/${archlinux_patch}
+			-> ${archlinux_patch_name}
+	"
+	PATCHES+=( "${DISTDIR}/${archlinux_patch_name}" )
+done
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	local -a tounpack=( ${A} )
+	# the main source tree, followed by deps
+	unpack "${tounpack[0]}"
+
+	mkdir -p "${S}/deps/srccache/"
+	local i
+	for i in "${tounpack[@]:1}"; do
+		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
+	done
+
+	# Extract tarballs for patching.
+	cd "${S}/deps/srccache/" || die
+	tar xf llvm-julia-13.0.1-3.tar.gz || die
+}
+
+src_prepare() {
+	default
+
+	# Various LTO issues.
+	# https://bugs.gentoo.org/855602
+	filter-lto
+
+	# Sledgehammer:
+	# - prevent fetching of bundled stuff in compile and install phase
+	# - respect CFLAGS
+	# - respect EPREFIX and Gentoo specific paths
+
+	sed -i \
+		-e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
+		Make.inc || die
+
+	sed -i \
+		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
+		src/Makefile || die
+
+	# disable doc install starting	git fetching
+	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
+
+	# Blank the tarball checksum check script.
+	echo "#!/bin/sh" > deps/tools/jlchecksum || die
+
+	# Repack tarballs.
+	cd "${S}/deps/srccache/" || die
+	tar czf llvm-julia-13.0.1-3.tar.gz JuliaLang-llvm-project-8a2ae8c || die
+}
+
+src_configure() {
+	# julia does not play well with the system versions of libuv
+	# Fails to compile with libpcre2 on split-usr, bug #893336
+	# USE_SYSTEM_LIBM=0 implies using external openlibm
+	cat <<-EOF > Make.user
+		LOCALBASE:=${EPREFIX}/usr
+		override prefix:=${EPREFIX}/usr
+		override libdir:=\$(prefix)/$(get_libdir)
+		override CC:=$(tc-getCC)
+		override CXX:=$(tc-getCXX)
+		override AR:=$(tc-getAR)
+
+		BUNDLE_DEBUG_LIBS:=0
+		USE_BINARYBUILDER:=0
+		USE_INTEL_JITEVENTS=0
+		USE_SYSTEM_CSL:=1
+		USE_SYSTEM_LLVM:=0
+		USE_SYSTEM_LIBUNWIND:=1
+		USE_SYSTEM_PCRE:=0
+		USE_SYSTEM_LIBM:=0
+		USE_SYSTEM_OPENLIBM:=1
+		USE_SYSTEM_DSFMT:=1
+		USE_SYSTEM_BLAS:=1
+		USE_SYSTEM_LAPACK:=1
+		USE_SYSTEM_LIBBLASTRAMPOLINE:=0
+		USE_SYSTEM_GMP:=1
+		USE_SYSTEM_MPFR:=1
+		USE_SYSTEM_LIBSUITESPARSE:=1
+		USE_SYSTEM_LIBUV:=0
+		USE_SYSTEM_UTF8PROC:=1
+		USE_SYSTEM_MBEDTLS:=1
+		USE_SYSTEM_LIBSSH2:=1
+		USE_SYSTEM_NGHTTP2:=1
+		USE_SYSTEM_CURL:=1
+		USE_SYSTEM_LIBGIT2:=1
+		USE_SYSTEM_PATCHELF:=1
+		USE_SYSTEM_ZLIB:=1
+		USE_SYSTEM_P7ZIP:=1
+		VERBOSE:=1
+	EOF
+}
+
+src_compile() {
+	# Julia accesses /proc/self/mem on Linux.
+	addpredict /proc/self/mem
+
+	emake
+	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
+}
+
+src_install() {
+	emake -j1 install DESTDIR="${D}"
+	dodoc CONTRIBUTING.md HISTORY.md NEWS.md README.md THIRDPARTY.md
+
+	local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
+	cp "${S}"/usr/lib/libLLVM-${llvmslot}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die
+	cp "${S}"/usr/lib/libLLVM-${MY_LLVM_V}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die
+
+	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
+	rmdir "${ED}"/usr/etc || die
+	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die
+	rmdir "${ED}"/usr/share/doc/julia || die
+
+	# The appdata directory is deprecated.
+	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
+
+	# Link ca-certificates.crt, bug: https://bugs.gentoo.org/888978
+	dosym -r /etc/ssl/certs/ca-certificates.crt /usr/share/julia/cert.pem
+
+	# Julia always searches for "sys.so" inside "/usr/lib/julia",
+	# bug: https://github.com/JuliaLang/julia/issues/49574
+	if [[ $(get_libdir) == "lib64" ]] ; then
+		insinto /usr/lib/julia
+		doins "${ED}"/usr/$(get_libdir)/julia/sys.so
+	fi
+}
+
+pkg_postinst() {
+	optfeature "Julia Plots" sci-visualization/gr
+}
diff --git a/dev-lang/julia/julia-1.9.0-r1.ebuild b/dev-lang/julia/julia-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..46bd0cf4dd10
--- /dev/null
+++ b/dev-lang/julia/julia-1.9.0-r1.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# correct versions for stdlibs are in deps/checksums
+# for everything else, run with network-sandbox and wait for the crash
+
+EAPI=8
+
+MY_LLVM_V=14.0.6
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit check-reqs flag-o-matic optfeature pax-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/
+	https://github.com/JuliaLang/julia/"
+SRC_URI="
+	https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+#KEYWORDS="~amd64 ~x86"
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/libutf8proc-2.6.1:0=[-cjk]
+	>=dev-util/patchelf-0.13
+	>=net-libs/mbedtls-2.2:0=
+	>=sci-mathematics/dsfmt-2.2.4
+	>=sys-libs/libunwind-1.1:0=
+	>=virtual/blas-3.6
+	app-arch/p7zip
+	app-misc/ca-certificates
+	dev-libs/gmp:0=
+	dev-libs/libgit2:0
+	dev-libs/mpfr:0=
+	net-misc/curl[http2,ssh]
+	sci-libs/amd:0=
+	sci-libs/arpack:0=
+	sci-libs/camd:0=
+	sci-libs/ccolamd:0=
+	sci-libs/cholmod:0=
+	sci-libs/colamd:0=
+	sci-libs/fftw:3.0=[threads]
+	sci-libs/openlibm:0=
+	sci-libs/spqr:0=
+	sci-libs/umfpack:0=
+	sys-libs/zlib:0=
+	virtual/lapack
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-build/cmake
+	virtual/pkgconfig
+"
+
+CHECKREQS_DISK_BUILD="4G"
+PATCHES=(
+)
+QA_FLAGS_IGNORED+='usr/.*/julia/sys.so'  # Julia sysimage generated by bootstrapping.
+
+# Huge thanks to Arch Linux developers for the patches.
+archlinux_uri="https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/"
+archlinux_patches=(
+)
+for archlinux_patch in ${archlinux_patches[@]} ; do
+	archlinux_patch_name="${PN}-1.8.0-${archlinux_patch}"
+	SRC_URI+="
+		${archlinux_uri}/${archlinux_patch}
+			-> ${archlinux_patch_name}
+	"
+	PATCHES+=( "${DISTDIR}/${archlinux_patch_name}" )
+done
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	local -a tounpack=( ${A} )
+	# the main source tree, followed by deps
+	unpack "${tounpack[0]}"
+
+	mkdir -p "${S}/deps/srccache/"
+	local i
+	for i in "${tounpack[@]:1}"; do
+		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
+	done
+
+	# Extract tarballs for patching.
+	# cd "${S}/deps/srccache/" || die
+	# tar xf llvm-julia-${MY_LLVM_V}-3.tar.gz || die
+}
+
+src_prepare() {
+	default
+
+	# Various LTO issues.
+	# https://bugs.gentoo.org/855602
+	filter-lto
+
+	# Sledgehammer:
+	# - prevent fetching of bundled stuff in compile and install phase
+	# - respect CFLAGS
+	# - respect EPREFIX and Gentoo specific paths
+
+	sed -i \
+		-e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
+		Make.inc || die
+
+	sed -i \
+		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
+		src/Makefile || die
+
+	# disable doc install starting	git fetching
+	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
+
+	# Blank the tarball checksum check script.
+	echo "#!/bin/sh" > deps/tools/jlchecksum || die
+
+	# Repack tarballs.
+	# cd "${S}/deps/srccache/" || die
+	# tar czf llvm-julia-${MY_LLVM_V}-3.tar.gz JuliaLang-llvm-project-* || die
+}
+
+src_configure() {
+	# julia does not play well with the system versions of libuv
+	# Fails to compile with libpcre2 on split-usr, bug #893336
+	# USE_SYSTEM_LIBM=0 implies using external openlibm
+	cat <<-EOF > Make.user
+		LOCALBASE:=${EPREFIX}/usr
+		override prefix:=${EPREFIX}/usr
+		override libdir:=\$(prefix)/$(get_libdir)
+		override CC:=$(tc-getCC)
+		override CXX:=$(tc-getCXX)
+		override AR:=$(tc-getAR)
+
+		BUNDLE_DEBUG_LIBS:=0
+		USE_BINARYBUILDER:=0
+		USE_INTEL_JITEVENTS=0
+		USE_SYSTEM_CSL:=1
+		USE_SYSTEM_LLVM:=0
+		USE_SYSTEM_LIBUNWIND:=1
+		USE_SYSTEM_PCRE:=0
+		USE_SYSTEM_LIBM:=0
+		USE_SYSTEM_OPENLIBM:=1
+		USE_SYSTEM_DSFMT:=1
+		USE_SYSTEM_BLAS:=1
+		USE_SYSTEM_LAPACK:=1
+		USE_SYSTEM_LIBBLASTRAMPOLINE:=0
+		USE_SYSTEM_GMP:=1
+		USE_SYSTEM_MPFR:=1
+		USE_SYSTEM_LIBSUITESPARSE:=1
+		USE_SYSTEM_LIBUV:=0
+		USE_SYSTEM_UTF8PROC:=1
+		USE_SYSTEM_MBEDTLS:=1
+		USE_SYSTEM_LIBSSH2:=1
+		USE_SYSTEM_NGHTTP2:=1
+		USE_SYSTEM_CURL:=1
+		USE_SYSTEM_LIBGIT2:=1
+		USE_SYSTEM_PATCHELF:=1
+		USE_SYSTEM_ZLIB:=1
+		USE_SYSTEM_P7ZIP:=1
+		VERBOSE:=1
+	EOF
+}
+
+src_compile() {
+	# Julia accesses /proc/self/mem on Linux.
+	addpredict /proc/self/mem
+
+	emake
+	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
+}
+
+src_install() {
+	emake -j1 install DESTDIR="${D}"
+	dodoc CONTRIBUTING.md HISTORY.md NEWS.md README.md THIRDPARTY.md
+
+	local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
+	cp "${S}"/usr/lib/libLLVM-${llvmslot}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die
+	cp "${S}"/usr/lib/libLLVM-${MY_LLVM_V}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die
+
+	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
+	rmdir "${ED}"/usr/etc || die
+	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die
+	rmdir "${ED}"/usr/share/doc/julia || die
+
+	# The appdata directory is deprecated.
+	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
+
+	# Link ca-certificates.crt, bug: https://bugs.gentoo.org/888978
+	dosym -r /etc/ssl/certs/ca-certificates.crt /usr/share/julia/cert.pem
+
+	# Julia always searches for "sys.so" inside "/usr/lib/julia",
+	# bug: https://github.com/JuliaLang/julia/issues/49574
+	if [[ $(get_libdir) == "lib64" ]] ; then
+		insinto /usr/lib/julia
+		doins "${ED}"/usr/$(get_libdir)/julia/sys.so
+	fi
+}
+
+pkg_postinst() {
+	optfeature "Julia Plots" sci-visualization/gr
+}
diff --git a/dev-lang/julia/julia-1.9.0.ebuild b/dev-lang/julia/julia-1.9.0.ebuild
deleted file mode 100644
index d1c6e722a101..000000000000
--- a/dev-lang/julia/julia-1.9.0.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# correct versions for stdlibs are in deps/checksums
-# for everything else, run with network-sandbox and wait for the crash
-
-EAPI=8
-
-MY_LLVM_V=14.0.6
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit check-reqs flag-o-matic optfeature pax-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/
-	https://github.com/JuliaLang/julia/"
-SRC_URI="
-	https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-#KEYWORDS="~amd64 ~x86"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/libutf8proc-2.6.1:0=[-cjk]
-	>=dev-util/patchelf-0.13
-	>=net-libs/mbedtls-2.2
-	>=sci-mathematics/dsfmt-2.2.4
-	>=sys-libs/libunwind-1.1:0=
-	>=virtual/blas-3.6
-	app-arch/p7zip
-	app-misc/ca-certificates
-	dev-libs/gmp:0=
-	dev-libs/libgit2:0
-	dev-libs/mpfr:0=
-	net-misc/curl[http2,ssh]
-	sci-libs/amd:0=
-	sci-libs/arpack:0=
-	sci-libs/camd:0=
-	sci-libs/ccolamd:0=
-	sci-libs/cholmod:0=
-	sci-libs/colamd:0=
-	sci-libs/fftw:3.0=[threads]
-	sci-libs/openlibm:0=
-	sci-libs/spqr:0=
-	sci-libs/umfpack:0=
-	sys-libs/zlib:0=
-	virtual/lapack
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-build/cmake
-	virtual/pkgconfig
-"
-
-CHECKREQS_DISK_BUILD="4G"
-PATCHES=(
-)
-QA_FLAGS_IGNORED+='usr/.*/julia/sys.so'  # Julia sysimage generated by bootstrapping.
-
-# Huge thanks to Arch Linux developers for the patches.
-archlinux_uri="https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/"
-archlinux_patches=(
-)
-for archlinux_patch in ${archlinux_patches[@]} ; do
-	archlinux_patch_name="${PN}-1.8.0-${archlinux_patch}"
-	SRC_URI+="
-		${archlinux_uri}/${archlinux_patch}
-			-> ${archlinux_patch_name}
-	"
-	PATCHES+=( "${DISTDIR}/${archlinux_patch_name}" )
-done
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	local -a tounpack=( ${A} )
-	# the main source tree, followed by deps
-	unpack "${tounpack[0]}"
-
-	mkdir -p "${S}/deps/srccache/"
-	local i
-	for i in "${tounpack[@]:1}"; do
-		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
-	done
-
-	# Extract tarballs for patching.
-	# cd "${S}/deps/srccache/" || die
-	# tar xf llvm-julia-${MY_LLVM_V}-3.tar.gz || die
-}
-
-src_prepare() {
-	default
-
-	# Various LTO issues.
-	# https://bugs.gentoo.org/855602
-	filter-lto
-
-	# Sledgehammer:
-	# - prevent fetching of bundled stuff in compile and install phase
-	# - respect CFLAGS
-	# - respect EPREFIX and Gentoo specific paths
-
-	sed -i \
-		-e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
-		Make.inc || die
-
-	sed -i \
-		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
-		src/Makefile || die
-
-	# disable doc install starting	git fetching
-	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
-
-	# Blank the tarball checksum check script.
-	echo "#!/bin/sh" > deps/tools/jlchecksum || die
-
-	# Repack tarballs.
-	# cd "${S}/deps/srccache/" || die
-	# tar czf llvm-julia-${MY_LLVM_V}-3.tar.gz JuliaLang-llvm-project-* || die
-}
-
-src_configure() {
-	# julia does not play well with the system versions of libuv
-	# Fails to compile with libpcre2 on split-usr, bug #893336
-	# USE_SYSTEM_LIBM=0 implies using external openlibm
-	cat <<-EOF > Make.user
-		LOCALBASE:=${EPREFIX}/usr
-		override prefix:=${EPREFIX}/usr
-		override libdir:=\$(prefix)/$(get_libdir)
-		override CC:=$(tc-getCC)
-		override CXX:=$(tc-getCXX)
-		override AR:=$(tc-getAR)
-
-		BUNDLE_DEBUG_LIBS:=0
-		USE_BINARYBUILDER:=0
-		USE_INTEL_JITEVENTS=0
-		USE_SYSTEM_CSL:=1
-		USE_SYSTEM_LLVM:=0
-		USE_SYSTEM_LIBUNWIND:=1
-		USE_SYSTEM_PCRE:=0
-		USE_SYSTEM_LIBM:=0
-		USE_SYSTEM_OPENLIBM:=1
-		USE_SYSTEM_DSFMT:=1
-		USE_SYSTEM_BLAS:=1
-		USE_SYSTEM_LAPACK:=1
-		USE_SYSTEM_LIBBLASTRAMPOLINE:=0
-		USE_SYSTEM_GMP:=1
-		USE_SYSTEM_MPFR:=1
-		USE_SYSTEM_LIBSUITESPARSE:=1
-		USE_SYSTEM_LIBUV:=0
-		USE_SYSTEM_UTF8PROC:=1
-		USE_SYSTEM_MBEDTLS:=1
-		USE_SYSTEM_LIBSSH2:=1
-		USE_SYSTEM_NGHTTP2:=1
-		USE_SYSTEM_CURL:=1
-		USE_SYSTEM_LIBGIT2:=1
-		USE_SYSTEM_PATCHELF:=1
-		USE_SYSTEM_ZLIB:=1
-		USE_SYSTEM_P7ZIP:=1
-		VERBOSE:=1
-	EOF
-}
-
-src_compile() {
-	# Julia accesses /proc/self/mem on Linux.
-	addpredict /proc/self/mem
-
-	emake
-	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
-}
-
-src_install() {
-	emake -j1 install DESTDIR="${D}"
-	dodoc CONTRIBUTING.md HISTORY.md NEWS.md README.md THIRDPARTY.md
-
-	local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
-	cp "${S}"/usr/lib/libLLVM-${llvmslot}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die
-	cp "${S}"/usr/lib/libLLVM-${MY_LLVM_V}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die
-
-	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
-	rmdir "${ED}"/usr/etc || die
-	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die
-	rmdir "${ED}"/usr/share/doc/julia || die
-
-	# The appdata directory is deprecated.
-	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
-
-	# Link ca-certificates.crt, bug: https://bugs.gentoo.org/888978
-	dosym -r /etc/ssl/certs/ca-certificates.crt /usr/share/julia/cert.pem
-
-	# Julia always searches for "sys.so" inside "/usr/lib/julia",
-	# bug: https://github.com/JuliaLang/julia/issues/49574
-	if [[ $(get_libdir) == "lib64" ]] ; then
-		insinto /usr/lib/julia
-		doins "${ED}"/usr/$(get_libdir)/julia/sys.so
-	fi
-}
-
-pkg_postinst() {
-	optfeature "Julia Plots" sci-visualization/gr
-}
diff --git a/dev-lang/julia/julia-1.9.4-r1.ebuild b/dev-lang/julia/julia-1.9.4-r1.ebuild
new file mode 100644
index 000000000000..a7a7d1a0cbea
--- /dev/null
+++ b/dev-lang/julia/julia-1.9.4-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# correct versions for stdlibs are in deps/checksums
+# for everything else, run with network-sandbox and wait for the crash
+
+EAPI=8
+
+MY_LLVM_V=14.0.6
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit check-reqs flag-o-matic optfeature pax-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/
+	https://github.com/JuliaLang/julia/"
+SRC_URI="
+	https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/libutf8proc-2.6.1:0=[-cjk]
+	>=dev-util/patchelf-0.13
+	>=net-libs/mbedtls-2.2:0=
+	>=sci-mathematics/dsfmt-2.2.4
+	>=sys-libs/libunwind-1.1:0=
+	>=virtual/blas-3.6
+	app-arch/p7zip
+	app-misc/ca-certificates
+	dev-libs/gmp:0=
+	dev-libs/libgit2:0
+	dev-libs/mpfr:0=
+	net-misc/curl[http2,ssh]
+	sci-libs/amd:0=
+	sci-libs/arpack:0=
+	sci-libs/camd:0=
+	sci-libs/ccolamd:0=
+	sci-libs/cholmod:0=
+	sci-libs/colamd:0=
+	sci-libs/fftw:3.0=[threads]
+	sci-libs/openlibm:0=
+	sci-libs/openblas:0=
+	sci-libs/spqr:0=
+	sci-libs/umfpack:0=
+	sys-libs/zlib:0=
+	virtual/lapack
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-build/cmake
+	virtual/pkgconfig
+"
+
+CHECKREQS_DISK_BUILD="4G"
+# Avoid building ocaml binding with LLVM_ENABLE_BINDINGS=OFF #47862 (merged upstream but not yet for 1.9.4)
+PATCHES=(
+	"${FILESDIR}"/julia-1.8.0-llvm-no-bindings.patch
+	"${FILESDIR}"/julia-1.9.4-no-doc-install.patch
+	"${FILESDIR}"/julia-1.9.4-string-replace.patch
+	)
+QA_FLAGS_IGNORED+='usr/.*/julia/sys.so'  # Julia sysimage generated by bootstrapping.
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	local -a tounpack=( ${A} )
+	# the main source tree, followed by deps
+	unpack "${tounpack[0]}"
+
+	mkdir -p "${S}/deps/srccache/"
+	local i
+	for i in "${tounpack[@]:1}"; do
+		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
+	done
+
+	# Extract tarballs for patching.
+	# cd "${S}/deps/srccache/" || die
+	# tar xf llvm-julia-${MY_LLVM_V}-3.tar.gz || die
+}
+
+src_prepare() {
+	default
+
+	# Various LTO issues.
+	# https://bugs.gentoo.org/855602
+	filter-lto
+
+	# Sledgehammer:
+	# - prevent fetching of bundled stuff in compile and install phase
+	# - respect CFLAGS
+	# - respect EPREFIX and Gentoo specific paths
+
+	sed -i \
+		-e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
+		Make.inc || die
+
+	sed -i \
+		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
+		src/Makefile || die
+
+	# Blank the tarball checksum check script.
+	echo "#!/bin/sh" > deps/tools/jlchecksum || die
+}
+
+src_configure() {
+	# julia does not play well with the system versions of libuv
+	# Fails to compile with libpcre2 on split-usr, bug #893336
+	# USE_SYSTEM_LIBM=0 implies using external openlibm
+	cat <<-EOF > Make.user
+		LOCALBASE:=${EPREFIX}/usr
+		override prefix:=${EPREFIX}/usr
+		override libdir:=\$(prefix)/$(get_libdir)
+		override CC:=$(tc-getCC)
+		override CXX:=$(tc-getCXX)
+		override AR:=$(tc-getAR)
+
+		BUNDLE_DEBUG_LIBS:=0
+		USE_BINARYBUILDER:=0
+		USE_INTEL_JITEVENTS=0
+		USE_SYSTEM_CSL:=1
+		USE_SYSTEM_LLVM:=0
+		USE_SYSTEM_LIBUNWIND:=1
+		USE_SYSTEM_PCRE:=0
+		USE_SYSTEM_LIBM:=0
+		USE_SYSTEM_OPENLIBM:=1
+		USE_SYSTEM_DSFMT:=1
+		USE_SYSTEM_BLAS:=1
+		USE_SYSTEM_LAPACK:=1
+		USE_SYSTEM_LIBBLASTRAMPOLINE:=0
+		USE_SYSTEM_GMP:=1
+		USE_SYSTEM_MPFR:=1
+		USE_SYSTEM_LIBSUITESPARSE:=1
+		USE_SYSTEM_LIBUV:=0
+		USE_SYSTEM_UTF8PROC:=1
+		USE_SYSTEM_MBEDTLS:=1
+		USE_SYSTEM_LIBSSH2:=1
+		USE_SYSTEM_NGHTTP2:=1
+		USE_SYSTEM_CURL:=1
+		USE_SYSTEM_LIBGIT2:=1
+		USE_SYSTEM_PATCHELF:=1
+		USE_SYSTEM_ZLIB:=1
+		USE_SYSTEM_P7ZIP:=1
+		VERBOSE:=1
+	EOF
+}
+
+src_compile() {
+	# Julia accesses /proc/self/mem on Linux.
+	addpredict /proc/self/mem
+
+	# Julia expects .so files to be in  lib64 during compilation
+	mkdir -p "${S}"/usr/lib
+	ln -s lib "${S}"/usr/lib64
+
+	emake
+	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
+}
+
+src_install() {
+	emake -j1 install DESTDIR="${D}"
+	dodoc CONTRIBUTING.md HISTORY.md NEWS.md README.md THIRDPARTY.md
+
+	local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
+	cp "${S}"/usr/lib/libLLVM-${llvmslot}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die
+	cp "${S}"/usr/lib/libLLVM-${MY_LLVM_V}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die
+
+	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
+	rmdir "${ED}"/usr/etc || die
+	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die
+	rmdir "${ED}"/usr/share/doc/julia || die
+
+	# The appdata directory is deprecated.
+	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
+
+	# Link ca-certificates.crt, bug: https://bugs.gentoo.org/888978
+	dosym -r /etc/ssl/certs/ca-certificates.crt /usr/share/julia/cert.pem
+
+	# Julia always searches for "sys.so" inside "/usr/lib/julia",
+	# bug: https://github.com/JuliaLang/julia/issues/49574
+	if [[ $(get_libdir) == "lib64" ]] ; then
+		insinto /usr/lib/julia
+		doins "${ED}"/usr/$(get_libdir)/julia/sys.so
+	fi
+}
+
+pkg_postinst() {
+	optfeature "Julia Plots" sci-visualization/gr
+}
diff --git a/dev-lang/julia/julia-1.9.4.ebuild b/dev-lang/julia/julia-1.9.4.ebuild
deleted file mode 100644
index 9a747305e8d0..000000000000
--- a/dev-lang/julia/julia-1.9.4.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# correct versions for stdlibs are in deps/checksums
-# for everything else, run with network-sandbox and wait for the crash
-
-EAPI=8
-
-MY_LLVM_V=14.0.6
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit check-reqs flag-o-matic optfeature pax-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/
-	https://github.com/JuliaLang/julia/"
-SRC_URI="
-	https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/libutf8proc-2.6.1:0=[-cjk]
-	>=dev-util/patchelf-0.13
-	>=net-libs/mbedtls-2.2
-	>=sci-mathematics/dsfmt-2.2.4
-	>=sys-libs/libunwind-1.1:0=
-	>=virtual/blas-3.6
-	app-arch/p7zip
-	app-misc/ca-certificates
-	dev-libs/gmp:0=
-	dev-libs/libgit2:0
-	dev-libs/mpfr:0=
-	net-misc/curl[http2,ssh]
-	sci-libs/amd:0=
-	sci-libs/arpack:0=
-	sci-libs/camd:0=
-	sci-libs/ccolamd:0=
-	sci-libs/cholmod:0=
-	sci-libs/colamd:0=
-	sci-libs/fftw:3.0=[threads]
-	sci-libs/openlibm:0=
-	sci-libs/openblas:0=
-	sci-libs/spqr:0=
-	sci-libs/umfpack:0=
-	sys-libs/zlib:0=
-	virtual/lapack
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-build/cmake
-	virtual/pkgconfig
-"
-
-CHECKREQS_DISK_BUILD="4G"
-# Avoid building ocaml binding with LLVM_ENABLE_BINDINGS=OFF #47862 (merged upstream but not yet for 1.9.4)
-PATCHES=(
-	"${FILESDIR}"/julia-1.8.0-llvm-no-bindings.patch
-	"${FILESDIR}"/julia-1.9.4-no-doc-install.patch
-	"${FILESDIR}"/julia-1.9.4-string-replace.patch
-	)
-QA_FLAGS_IGNORED+='usr/.*/julia/sys.so'  # Julia sysimage generated by bootstrapping.
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	local -a tounpack=( ${A} )
-	# the main source tree, followed by deps
-	unpack "${tounpack[0]}"
-
-	mkdir -p "${S}/deps/srccache/"
-	local i
-	for i in "${tounpack[@]:1}"; do
-		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
-	done
-
-	# Extract tarballs for patching.
-	# cd "${S}/deps/srccache/" || die
-	# tar xf llvm-julia-${MY_LLVM_V}-3.tar.gz || die
-}
-
-src_prepare() {
-	default
-
-	# Various LTO issues.
-	# https://bugs.gentoo.org/855602
-	filter-lto
-
-	# Sledgehammer:
-	# - prevent fetching of bundled stuff in compile and install phase
-	# - respect CFLAGS
-	# - respect EPREFIX and Gentoo specific paths
-
-	sed -i \
-		-e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
-		Make.inc || die
-
-	sed -i \
-		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
-		src/Makefile || die
-
-	# Blank the tarball checksum check script.
-	echo "#!/bin/sh" > deps/tools/jlchecksum || die
-}
-
-src_configure() {
-	# julia does not play well with the system versions of libuv
-	# Fails to compile with libpcre2 on split-usr, bug #893336
-	# USE_SYSTEM_LIBM=0 implies using external openlibm
-	cat <<-EOF > Make.user
-		LOCALBASE:=${EPREFIX}/usr
-		override prefix:=${EPREFIX}/usr
-		override libdir:=\$(prefix)/$(get_libdir)
-		override CC:=$(tc-getCC)
-		override CXX:=$(tc-getCXX)
-		override AR:=$(tc-getAR)
-
-		BUNDLE_DEBUG_LIBS:=0
-		USE_BINARYBUILDER:=0
-		USE_INTEL_JITEVENTS=0
-		USE_SYSTEM_CSL:=1
-		USE_SYSTEM_LLVM:=0
-		USE_SYSTEM_LIBUNWIND:=1
-		USE_SYSTEM_PCRE:=0
-		USE_SYSTEM_LIBM:=0
-		USE_SYSTEM_OPENLIBM:=1
-		USE_SYSTEM_DSFMT:=1
-		USE_SYSTEM_BLAS:=1
-		USE_SYSTEM_LAPACK:=1
-		USE_SYSTEM_LIBBLASTRAMPOLINE:=0
-		USE_SYSTEM_GMP:=1
-		USE_SYSTEM_MPFR:=1
-		USE_SYSTEM_LIBSUITESPARSE:=1
-		USE_SYSTEM_LIBUV:=0
-		USE_SYSTEM_UTF8PROC:=1
-		USE_SYSTEM_MBEDTLS:=1
-		USE_SYSTEM_LIBSSH2:=1
-		USE_SYSTEM_NGHTTP2:=1
-		USE_SYSTEM_CURL:=1
-		USE_SYSTEM_LIBGIT2:=1
-		USE_SYSTEM_PATCHELF:=1
-		USE_SYSTEM_ZLIB:=1
-		USE_SYSTEM_P7ZIP:=1
-		VERBOSE:=1
-	EOF
-}
-
-src_compile() {
-	# Julia accesses /proc/self/mem on Linux.
-	addpredict /proc/self/mem
-
-	# Julia expects .so files to be in  lib64 during compilation
-	mkdir -p "${S}"/usr/lib
-	ln -s lib "${S}"/usr/lib64
-
-	emake
-	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
-}
-
-src_install() {
-	emake -j1 install DESTDIR="${D}"
-	dodoc CONTRIBUTING.md HISTORY.md NEWS.md README.md THIRDPARTY.md
-
-	local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
-	cp "${S}"/usr/lib/libLLVM-${llvmslot}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die
-	cp "${S}"/usr/lib/libLLVM-${MY_LLVM_V}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die
-
-	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
-	rmdir "${ED}"/usr/etc || die
-	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die
-	rmdir "${ED}"/usr/share/doc/julia || die
-
-	# The appdata directory is deprecated.
-	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
-
-	# Link ca-certificates.crt, bug: https://bugs.gentoo.org/888978
-	dosym -r /etc/ssl/certs/ca-certificates.crt /usr/share/julia/cert.pem
-
-	# Julia always searches for "sys.so" inside "/usr/lib/julia",
-	# bug: https://github.com/JuliaLang/julia/issues/49574
-	if [[ $(get_libdir) == "lib64" ]] ; then
-		insinto /usr/lib/julia
-		doins "${ED}"/usr/$(get_libdir)/julia/sys.so
-	fi
-}
-
-pkg_postinst() {
-	optfeature "Julia Plots" sci-visualization/gr
-}
diff --git a/dev-lang/luau/luau-0.653.ebuild b/dev-lang/luau/luau-0.653.ebuild
index d99c1ac2849f..dc166cc33eba 100644
--- a/dev-lang/luau/luau-0.653.ebuild
+++ b/dev-lang/luau/luau-0.653.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
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/luau-lang/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-lang/mrustc/Manifest b/dev-lang/mrustc/Manifest
new file mode 100644
index 000000000000..b10690c71040
--- /dev/null
+++ b/dev-lang/mrustc/Manifest
@@ -0,0 +1,2 @@
+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
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/neko/neko-2.3.0-r2.ebuild b/dev-lang/neko/neko-2.3.0-r2.ebuild
deleted file mode 100644
index f51030b4e47b..000000000000
--- a/dev-lang/neko/neko-2.3.0-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic cmake
-
-DESCRIPTION="Neko is a high-level dynamically typed programming language"
-HOMEPAGE="https://nekovm.org/
-	https://github.com/HaxeFoundation/neko/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/HaxeFoundation/${PN}.git"
-else
-	# 2.3.0 -> 2-3-0
-	MY_PV="${PV//./-}"
-	SRC_URI="https://github.com/HaxeFoundation/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-IUSE="apache mysql sqlite ssl"
-
-RDEPEND="
-	dev-libs/boehm-gc:=[threads]
-	dev-libs/libpcre:=
-	sys-libs/zlib:=
-	apache? ( www-servers/apache:2= )
-	mysql? ( dev-db/mysql:= )
-	sqlite? ( dev-db/sqlite:3= )
-	ssl? (
-		dev-libs/openssl:=
-		net-libs/mbedtls:=
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	# -Werror=strict-aliasing warnings, bug #855641
-	filter-lto
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		-DRUN_LDCONFIG=OFF
-		-DWITH_NEKOML=ON
-		-DWITH_REGEXP=ON
-		-DWITH_UI=OFF
-		-DWITH_APACHE=$(usex apache)
-		-DWITH_MYSQL=$(usex mysql)
-		-DWITH_SQLITE=$(usex sqlite)
-		-DWITH_SSL=$(usex ssl)
-	)
-	cmake_src_configure
-}
diff --git a/dev-lang/neko/neko-2.3.0-r3.ebuild b/dev-lang/neko/neko-2.3.0-r3.ebuild
new file mode 100644
index 000000000000..2191b6d96b38
--- /dev/null
+++ b/dev-lang/neko/neko-2.3.0-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic cmake
+
+DESCRIPTION="Neko is a high-level dynamically typed programming language"
+HOMEPAGE="https://nekovm.org/
+	https://github.com/HaxeFoundation/neko/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/HaxeFoundation/${PN}.git"
+else
+	# 2.3.0 -> 2-3-0
+	MY_PV="${PV//./-}"
+	SRC_URI="https://github.com/HaxeFoundation/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE="apache mysql sqlite ssl"
+
+RDEPEND="
+	dev-libs/boehm-gc:=[threads]
+	dev-libs/libpcre:=
+	sys-libs/zlib:=
+	apache? ( www-servers/apache:2= )
+	mysql? ( dev-db/mysql:= )
+	sqlite? ( dev-db/sqlite:3= )
+	ssl? (
+		dev-libs/openssl:=
+		net-libs/mbedtls:0=
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	# -Werror=strict-aliasing warnings, bug #855641
+	filter-lto
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DRUN_LDCONFIG=OFF
+		-DWITH_NEKOML=ON
+		-DWITH_REGEXP=ON
+		-DWITH_UI=OFF
+		-DWITH_APACHE=$(usex apache)
+		-DWITH_MYSQL=$(usex mysql)
+		-DWITH_SQLITE=$(usex sqlite)
+		-DWITH_SSL=$(usex ssl)
+	)
+	cmake_src_configure
+}
diff --git a/dev-lang/neko/neko-2.4.0-r1.ebuild b/dev-lang/neko/neko-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..2191b6d96b38
--- /dev/null
+++ b/dev-lang/neko/neko-2.4.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic cmake
+
+DESCRIPTION="Neko is a high-level dynamically typed programming language"
+HOMEPAGE="https://nekovm.org/
+	https://github.com/HaxeFoundation/neko/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/HaxeFoundation/${PN}.git"
+else
+	# 2.3.0 -> 2-3-0
+	MY_PV="${PV//./-}"
+	SRC_URI="https://github.com/HaxeFoundation/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE="apache mysql sqlite ssl"
+
+RDEPEND="
+	dev-libs/boehm-gc:=[threads]
+	dev-libs/libpcre:=
+	sys-libs/zlib:=
+	apache? ( www-servers/apache:2= )
+	mysql? ( dev-db/mysql:= )
+	sqlite? ( dev-db/sqlite:3= )
+	ssl? (
+		dev-libs/openssl:=
+		net-libs/mbedtls:0=
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	# -Werror=strict-aliasing warnings, bug #855641
+	filter-lto
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DRUN_LDCONFIG=OFF
+		-DWITH_NEKOML=ON
+		-DWITH_REGEXP=ON
+		-DWITH_UI=OFF
+		-DWITH_APACHE=$(usex apache)
+		-DWITH_MYSQL=$(usex mysql)
+		-DWITH_SQLITE=$(usex sqlite)
+		-DWITH_SSL=$(usex ssl)
+	)
+	cmake_src_configure
+}
diff --git a/dev-lang/neko/neko-2.4.0.ebuild b/dev-lang/neko/neko-2.4.0.ebuild
deleted file mode 100644
index f51030b4e47b..000000000000
--- a/dev-lang/neko/neko-2.4.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic cmake
-
-DESCRIPTION="Neko is a high-level dynamically typed programming language"
-HOMEPAGE="https://nekovm.org/
-	https://github.com/HaxeFoundation/neko/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/HaxeFoundation/${PN}.git"
-else
-	# 2.3.0 -> 2-3-0
-	MY_PV="${PV//./-}"
-	SRC_URI="https://github.com/HaxeFoundation/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-IUSE="apache mysql sqlite ssl"
-
-RDEPEND="
-	dev-libs/boehm-gc:=[threads]
-	dev-libs/libpcre:=
-	sys-libs/zlib:=
-	apache? ( www-servers/apache:2= )
-	mysql? ( dev-db/mysql:= )
-	sqlite? ( dev-db/sqlite:3= )
-	ssl? (
-		dev-libs/openssl:=
-		net-libs/mbedtls:=
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	# -Werror=strict-aliasing warnings, bug #855641
-	filter-lto
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		-DRUN_LDCONFIG=OFF
-		-DWITH_NEKOML=ON
-		-DWITH_REGEXP=ON
-		-DWITH_UI=OFF
-		-DWITH_APACHE=$(usex apache)
-		-DWITH_MYSQL=$(usex mysql)
-		-DWITH_SQLITE=$(usex sqlite)
-		-DWITH_SSL=$(usex ssl)
-	)
-	cmake_src_configure
-}
diff --git a/dev-lang/nprolog/nprolog-3.53.ebuild b/dev-lang/nprolog/nprolog-3.53.ebuild
index 39a1d076726e..ccaea1f0a765 100644
--- a/dev-lang/nprolog/nprolog-3.53.ebuild
+++ b/dev-lang/nprolog/nprolog-3.53.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
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/sasagawa888/nprolog/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="BSD-2"
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/orc/Manifest b/dev-lang/orc/Manifest
index 1c4abf5d2b4e..f229467c33d0 100644
--- a/dev-lang/orc/Manifest
+++ b/dev-lang/orc/Manifest
@@ -1 +1,2 @@
 DIST orc-0.4.38.tar.xz 227152 BLAKE2B f7babfec5f4d792fb52eb0ca23743b6c06a12625edcf0cecbf8e3cb88c13171a760c6874061a3e55a43df5389346b3c3d0ba3463d6e1ef32f685162f7478e631 SHA512 49f34be85f6980e4b5e94f848016f5788b658323f3a120110bc237722ac99938c02976efbe96022d148054330432899533305d4dd21be8fab76fd1995179339a
+DIST orc-0.4.40.tar.xz 233276 BLAKE2B 2f2be5b7eaf5ea8c2fc55ff3938b5a9e9ef25a1ff3c5de4c02f9847b2df9039c8f412b9d780a172e78838c22f5006544a8181d7aaa22c47be98e6f050c04435e SHA512 2cbc0b8b9f5f429e0c4b24b7b9a8bc5d249c013470d8a595fdb3969a68a90c95c3b1e79063851f2d0ca7f7888d33901f227d2e04f919df00caf37eca6270c0e3
diff --git a/dev-lang/orc/files/orc-0.4.40-avx.patch b/dev-lang/orc/files/orc-0.4.40-avx.patch
new file mode 100644
index 000000000000..41dddd0c7248
--- /dev/null
+++ b/dev-lang/orc/files/orc-0.4.40-avx.patch
@@ -0,0 +1,77 @@
+https://bugs.gentoo.org/948164
+https://gitlab.freedesktop.org/gstreamer/orc/-/issues/82
+https://gitlab.freedesktop.org/gstreamer/orc/-/commit/8e48a61e27f4d3e60bf2e3e7873fd61363db6ff8
+
+From 8e48a61e27f4d3e60bf2e3e7873fd61363db6ff8 Mon Sep 17 00:00:00 2001
+From: "L. E. Segovia" <amy@centricular.com>
+Date: Wed, 15 Jan 2025 22:20:14 +0000
+Subject: [PATCH] avx: Fix sqrtps encoding, it's an unary operator
+
+Fixes #82
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/orc/-/merge_requests/213>
+---
+ orc/orcavx.h       | 4 ++--
+ orc/orcprogram-c.c | 1 +
+ orc/orcrules-avx.c | 2 +-
+ testsuite/test.orc | 8 ++++++++
+ 4 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/orc/orcavx.h b/orc/orcavx.h
+index f564b63f..ca95bd02 100644
+--- a/orc/orcavx.h
++++ b/orc/orcavx.h
+@@ -224,8 +224,8 @@ ORC_API void orc_avx_restore_mxcsr (OrcCompiler *compiler);
+ #define orc_avx_emit_mulps(p,s1,s2,d) orc_vex_emit_cpuinsn_size(p, ORC_X86_mulps, 32, s1, s2, d, ORC_X86_AVX_VEX256_PREFIX)
+ #define orc_avx_sse_emit_divps(p,s1,s2,d) orc_vex_emit_cpuinsn_size(p, ORC_X86_divps, 32, s1, s2, d, ORC_X86_AVX_VEX128_PREFIX)
+ #define orc_avx_emit_divps(p,s1,s2,d) orc_vex_emit_cpuinsn_size(p, ORC_X86_divps, 32, s1, s2, d, ORC_X86_AVX_VEX256_PREFIX)
+-#define orc_avx_sse_emit_sqrtps(p,s1,s2,d) orc_vex_emit_cpuinsn_size(p, ORC_X86_sqrtps, 32, s1, s2, d, ORC_X86_AVX_VEX128_PREFIX)
+-#define orc_avx_emit_sqrtps(p,s1,s2,d) orc_vex_emit_cpuinsn_size(p, ORC_X86_sqrtps, 32, s1, s2, d, ORC_X86_AVX_VEX256_PREFIX)
++#define orc_avx_sse_emit_sqrtps(p,s1,d) orc_vex_emit_cpuinsn_size(p, ORC_X86_sqrtps, 32, s1, 0, d, ORC_X86_AVX_VEX128_PREFIX)
++#define orc_avx_emit_sqrtps(p,s1,d) orc_vex_emit_cpuinsn_size(p, ORC_X86_sqrtps, 32, s1, 0, d, ORC_X86_AVX_VEX256_PREFIX)
+ #define orc_avx_sse_emit_andps(p,s1,s2,d) orc_vex_emit_cpuinsn_size(p, ORC_X86_andps, 32, s1, s2, d, ORC_X86_AVX_VEX128_PREFIX)
+ #define orc_avx_emit_andps(p,s1,s2,d) orc_vex_emit_cpuinsn_size(p, ORC_X86_andps, 32, s1, s2, d, ORC_X86_AVX_VEX256_PREFIX)
+ #define orc_avx_sse_emit_orps(p,s1,s2,d) orc_vex_emit_cpuinsn_size(p, ORC_X86_orps, 32, s1, s2, d, ORC_X86_AVX_VEX128_PREFIX)
+diff --git a/orc/orcprogram-c.c b/orc/orcprogram-c.c
+index 49e0b73b..1c9ff7cf 100644
+--- a/orc/orcprogram-c.c
++++ b/orc/orcprogram-c.c
+@@ -106,6 +106,7 @@ orc_target_c_get_asm_preamble (void)
+ {
+   return "\n"
+     "/* begin Orc C target preamble */\n"
++    "#include <math.h>\n"
+     "#define ORC_CLAMP(x,a,b) ((x)<(a) ? (a) : ((x)>(b) ? (b) : (x)))\n"
+     "#define ORC_ABS(a) ((a)<0 ? -(a) : (a))\n"
+     "#define ORC_MIN(a,b) ((a)<(b) ? (a) : (b))\n"
+diff --git a/orc/orcrules-avx.c b/orc/orcrules-avx.c
+index 66925982..5cffe145 100644
+--- a/orc/orcrules-avx.c
++++ b/orc/orcrules-avx.c
+@@ -2678,7 +2678,7 @@ BINARY (addf, addps)
+ BINARY (subf, subps)
+ BINARY (mulf, mulps)
+ BINARY (divf, divps)
+-BINARY (sqrtf, sqrtps)
++UNARY (sqrtf, sqrtps)
+ BINARY (orf, orps)
+ BINARY (andf, andps)
+ 
+diff --git a/testsuite/test.orc b/testsuite/test.orc
+index 3e9c5790..9ff53236 100644
+--- a/testsuite/test.orc
++++ b/testsuite/test.orc
+@@ -2806,3 +2806,11 @@ x4 addb argb, x, c128
+ mulslq t1, d1, p1
+ shrsq t1, t1, 27
+ convql d1, t1
++
++.function sqrt_nx
++.dest 4 dst float
++.source 4 src float
++.floatparam 4 k
++.temp 4 tmp
++sqrtf tmp, src
++mulf dst, tmp, k
+-- 
+GitLab
diff --git a/dev-lang/orc/orc-0.4.40-r1.ebuild b/dev-lang/orc/orc-0.4.40-r1.ebuild
new file mode 100644
index 000000000000..669a5abca44d
--- /dev/null
+++ b/dev-lang/orc/orc-0.4.40-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+DESCRIPTION="The Oil Runtime Compiler, a just-in-time compiler for array operations"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="BSD BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+RESTRICT="!test? ( test )"
+IUSE="gtk-doc static-libs test"
+
+BDEPEND="
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.3
+	)
+"
+
+DOCS=( CONTRIBUTING.md README RELEASE )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-avx.patch
+)
+
+multilib_src_configure() {
+	# FIXME: handle backends per arch? What about cross-compiling for the other arches?
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		-Dorc-backend=all
+		-Dorc-test=enabled
+		-Dbenchmarks=disabled
+		-Dexamples=disabled
+		$(meson_native_use_feature gtk-doc gtk_doc)
+		$(meson_feature test tests)
+		-Dtools=enabled # requires orc-test
+	)
+	meson_src_configure
+}
diff --git a/dev-lang/orc/orc-0.4.40.ebuild b/dev-lang/orc/orc-0.4.40.ebuild
new file mode 100644
index 000000000000..2574f0c5dd08
--- /dev/null
+++ b/dev-lang/orc/orc-0.4.40.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+DESCRIPTION="The Oil Runtime Compiler, a just-in-time compiler for array operations"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="BSD BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+RESTRICT="!test? ( test )"
+IUSE="gtk-doc static-libs test"
+
+BDEPEND="
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.3
+	)
+"
+
+DOCS=( CONTRIBUTING.md README RELEASE )
+
+multilib_src_configure() {
+	# FIXME: handle backends per arch? What about cross-compiling for the other arches?
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		-Dorc-backend=all
+		-Dorc-test=enabled
+		-Dbenchmarks=disabled
+		-Dexamples=disabled
+		$(meson_native_use_feature gtk-doc gtk_doc)
+		$(meson_feature test tests)
+		-Dtools=enabled # requires orc-test
+	)
+	meson_src_configure
+}
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index e2626249b0c5..80fd869511d7 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,3 +1,4 @@
 DIST perl-5.40.0-patches-2.tar.xz 17072 BLAKE2B 7cc1085a0a701f72cf1fce2b7f18ac949eb03a9e40716c37082396483045df577ef13bbca58ef06f20868e52e9c78e18fa5b8a3434ceea272ff49832a086a1f5 SHA512 d31a25894e3b34c8e80f439ebd423dd8f28eac056ce42d69376882c1655b1f7289ef22f8aa8d30147eaebbe6693f4d86d1570e153b55d58d7b30e5832e7bea60
 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
diff --git a/dev-lang/perl/files/perl-5.36.0-fix-configure-for-clang.patch b/dev-lang/perl/files/perl-5.36.0-fix-configure-for-clang.patch
deleted file mode 100644
index 3ad508c95f7e..000000000000
--- a/dev-lang/perl/files/perl-5.36.0-fix-configure-for-clang.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 40db21129c0ba08ea457b6e40e7357e86ea1404b Mon Sep 17 00:00:00 2001
-From: Raul E Rangel <rrangel@chromium.org>
-Date: Fri, 28 Jul 2023 15:50:49 -0600
-Subject: [PATCH] hints/linux: Add additional expression when matching clang
-
-Newer versions of clang actually print the distro before `clang` when
-calling `$CC --version`. This changes fixes the regex so it can match
-this new pattern.
-
-i.e.,
-
-	$ clang --version
-	Debian clang version 14.0.6
-
-	$ x86_64-pc-linux-gnu-clang --version
-	Chromium OS 17.0_pre496208_p20230501-r1 clang version 17.0.0
-
-Fixes #21099
-
-BUG=b:283275881
-See: https://github.com/Perl/perl5/issues/21099
----
- hints/linux.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hints/linux.sh b/hints/linux.sh
-index e1508c7509..5202b28b09 100644
---- a/hints/linux.sh
-+++ b/hints/linux.sh
-@@ -166,7 +166,7 @@ esac
- if [ -x /usr/bin/gcc ] ; then
-     gcc=/usr/bin/gcc
- # clang also provides -print-search-dirs
--elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
-+elif ${cc:-cc} --version 2>/dev/null | grep -q -e '^clang version' -e ' clang version'; then
-     gcc=${cc:-cc}
- else
-     gcc=gcc
--- 
-2.41.0.585.gd2178a4bd4-goog
-
diff --git a/dev-lang/perl/perl-5.40.0-r1.ebuild b/dev-lang/perl/perl-5.40.0-r1.ebuild
index c5ab653cceb9..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/perl/perl-5.40.1_rc1.ebuild b/dev-lang/perl/perl-5.40.1_rc1.ebuild
new file mode 100644
index 000000000000..49d74632e547
--- /dev/null
+++ b/dev-lang/perl/perl-5.40.1_rc1.ebuild
@@ -0,0 +1,865 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
+
+PATCH_VER=2
+CROSS_VER=1.6
+PATCH_BASE="perl-5.40.0-patches-${PATCH_VER}"
+PATCH_DEV=dilfridge
+
+DIST_AUTHOR=SHAY
+
+# Greatest first, don't include yourself
+# Devel point-releases are not ABI-intercompatible, but stable point releases are
+# BIN_OLDVERSEN contains only C-ABI-intercompatible versions
+PERL_BIN_OLDVERSEN=""
+
+if [[ "${PV##*.}" == "9999" ]]; then
+	DIST_VERSION=5.40.0
+else
+	DIST_VERSION="${PV/_rc/-RC}"
+fi
+SHORT_PV="${DIST_VERSION%.*}"
+
+# Even numbered major versions are ABI intercompatible
+# Odd numbered major versions are not
+if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
+	SUBSLOT="${DIST_VERSION%-RC*}"
+else
+	SUBSLOT="${DIST_VERSION%.*}"
+fi
+
+# Used only in tar paths
+MY_P="perl-${DIST_VERSION}"
+# Used in library paths
+MY_PV="${DIST_VERSION%-RC*}"
+
+DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+
+HOMEPAGE="https://www.perl.org/"
+
+SRC_URI="
+	mirror://cpan/src/5.0/${MY_P}.tar.xz
+	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
+	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
+"
+
+S="${WORKDIR}/${MY_P}"
+
+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"
+fi
+
+IUSE="berkdb perl_features_debug doc gdbm perl_features_ithreads minimal perl_features_quadmath"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
+	app-arch/bzip2
+	>=sys-libs/zlib-1.2.12
+	virtual/libcrypt:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+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
+	)
+"
+
+# bug 390719, bug 523624
+# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
+
+dual_scripts() {
+	src_remove_dual      perl-core/Archive-Tar        3.20.10_rc    ptar ptardiff ptargrep
+	src_remove_dual      perl-core/CPAN               2.360.0       cpan
+	src_remove_dual      perl-core/Digest-SHA         6.40.0        shasum
+	src_remove_dual      perl-core/Encode             3.210.0       enc2xs piconv
+	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.700.0       instmodsh
+	src_remove_dual      perl-core/ExtUtils-ParseXS   3.510.0       xsubpp
+	src_remove_dual      perl-core/IO-Compress        2.212.0       zipdetails
+	src_remove_dual      perl-core/JSON-PP            4.160.0       json_pp
+	src_remove_dual      perl-core/Module-CoreList    5.202.501.184_rc  corelist
+	src_remove_dual      perl-core/Pod-Checker        1.770.0       podchecker
+	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
+	src_remove_dual      perl-core/Pod-Usage          2.30.0        pod2usage
+	src_remove_dual      perl-core/Test-Harness       3.480.0       prove
+	src_remove_dual      perl-core/podlators          5.10.200_rc   pod2man pod2text
+	src_remove_dual_man  perl-core/podlators          5.10.200_rc   /usr/share/man/man1/perlpodstyle.1
+}
+
+check_rebuild() {
+	# Fresh install
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		return 0;
+	# Major Upgrade
+	# doesn't matter if there's multiple copies, it still needs a rebuild
+	# if the string is anything other than "5.CURRENTMAJOR"
+	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
+		echo ""
+		ewarn "UPDATE THE PERL MODULES:"
+		ewarn "After updating dev-lang/perl the installed Perl modules"
+		ewarn "have to be re-installed. In most cases, this is done automatically"
+		ewarn "by the package manager, but subsequent steps are still recommended"
+		ewarn "to ensure system consistency."
+		ewarn
+		ewarn "You should start with a depclean to remove any unused perl dependencies"
+		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
+		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
+		ewarn "Recommended: emerge --depclean -va"
+		ewarn
+		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
+		ewarn "remaining rebuilds portage may have missed."
+		ewarn "Use: perl-cleaner --all"
+		return 0;
+
+	# Reinstall w/ USE Change
+	elif
+		 (   use perl_features_ithreads && ( has_version '<dev-lang/perl-5.38.2-r3[-ithreads]' || has_version '>=dev-lang/perl-5.38.2-r3[-perl_features_ithreads]' ) ) || \
+		 ( ! use perl_features_ithreads && ( has_version '<dev-lang/perl-5.38.2-r3[ithreads]'  || has_version '>=dev-lang/perl-5.38.2-r3[perl_features_ithreads]'  ) ) || \
+		 (   use perl_features_quadmath && ( has_version '<dev-lang/perl-5.38.2-r3[-quadmath]' || has_version '>=dev-lang/perl-5.38.2-r3[-perl_features_quadmath]' ) ) || \
+		 ( ! use perl_features_quadmath && ( has_version '<dev-lang/perl-5.38.2-r3[quadmath]'  || has_version '>=dev-lang/perl-5.38.2-r3[perl_features_quadmath]'  ) ) || \
+		 (   use perl_features_debug    && ( has_version '<dev-lang/perl-5.38.2-r3[-debug]'    || has_version '>=dev-lang/perl-5.38.2-r3[-perl_features_debug]'    ) ) || \
+		 ( ! use perl_features_debug    && ( has_version '<dev-lang/perl-5.38.2-r3[debug]'     || has_version '>=dev-lang/perl-5.38.2-r3[perl_features_debug]'     ) ) ; then
+		echo ""
+		ewarn "TOGGLED PERL FEATURES WARNING:"
+		ewarn "You changed one of the PERL_FEATURES flags ithreads, quadmath, or debug."
+		ewarn "You must rebuild all perl-modules installed. Mostly this should be done automatically"
+		ewarn "via the flag changes of the packages. If the rebuild fails, use perl-cleaner."
+		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
+		ewarn
+		ewarn "NOTE: Previous to perl-5.38.2-r3, these flags were useflags for dev-lang/perl."
+		ewarn "If you just upgraded and do not intend to change anything, carry the same settings over"
+		ewarn "into a global PERL_FEATURES variable set in make.conf. E.g., "
+		ewarn "dev-lang/perl[ithreads,quadmath] becomes PERL_FEATURES=\"ithreads quadmath\""
+	fi
+}
+
+pkg_pretend() {
+	if \
+		 (   use perl_features_ithreads && has_version '<dev-lang/perl-5.38.2-r3[-ithreads]' ) || \
+		 ( ! use perl_features_ithreads && has_version '<dev-lang/perl-5.38.2-r3[ithreads]'  ) || \
+		 (   use perl_features_quadmath && has_version '<dev-lang/perl-5.38.2-r3[-quadmath]' ) || \
+		 ( ! use perl_features_quadmath && has_version '<dev-lang/perl-5.38.2-r3[quadmath]'  ) || \
+		 (   use perl_features_debug    && has_version '<dev-lang/perl-5.38.2-r3[-debug]'    ) || \
+		 ( ! use perl_features_debug    && has_version '<dev-lang/perl-5.38.2-r3[debug]'     ) ;  \
+	then
+		echo ""
+		ewarn "As of dev-lang/perl-5.38.2-r3, the useflags debug, ithreads, quadmath move into"
+		ewarn "a use-expand variable PERL_FEATURES, which should be set globally in make.conf."
+		ewarn "It appears that you have not set this variable properly yet."
+		ewarn ""
+		ewarn "Giving you a chance to abort and read the corresponding news item now..."
+		for n in 10 9 8 7 6 5 4 3 2 1 ; do
+			echo -n "${n} "
+			sleep 2
+		done;
+		echo "continuing."
+	fi
+}
+
+pkg_setup() {
+	case ${CHOST} in
+		*-darwin*)    osname="darwin" ;;
+		*-solaris*)   osname="solaris" ;;
+		*)            osname="linux" ;;
+	esac
+
+	myarch="${CHOST%%-*}-${osname}"
+	if use perl_features_debug ; then
+		myarch+="-debug"
+	fi
+	if use perl_features_quadmath ; then
+		myarch+="-quadmath"
+	fi
+	if use perl_features_ithreads ; then
+		mythreading="-multi"
+		myarch+="-thread"
+	fi
+
+	PRIV_BASE="/usr/$(get_libdir)/perl5"
+	SITE_BASE="/usr/local/$(get_libdir)/perl5"
+	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
+
+	LIBPERL="libperl$(get_libname ${MY_PV} )"
+
+	PRIV_LIB="${PRIV_BASE}/${SUBSLOT}"
+	ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+	SITE_LIB="${SITE_BASE}/${SUBSLOT}"
+	SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+	VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}"
+	VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+
+	dual_scripts
+}
+
+src_remove_dual_file() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
+			done
+			;;
+		setup)
+			for i in "$@" ; do
+				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
+					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
+					break
+				fi
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i}{,-${ver}-${P}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual_man() {
+	local i pkg ver ff
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
+				ff=${ff##*${i#${i%.[0-9]}}}
+				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	for i in "$@" ; do
+		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
+		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
+	done
+}
+
+src_prepare_perlcross() {
+	cp -a ../perl-cross-${CROSS_VER}/* . || die
+
+	# bug 794463, needs further analysis what is exactly wrong here
+	eapply "${FILESDIR}/perl-5.34.0-crossfit.patch"
+
+	# bug 604072
+	MAKEOPTS+=" -j1"
+	export MAKEOPTS
+}
+
+src_prepare_dynamic() {
+	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
+	ln -s ${LIBPERL} libperl$(get_libname ) || die
+}
+
+# Copy a patch into the patch series
+# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug']
+# - description is optional, but recommended
+# - all arguments after descriptions are bug URLs
+add_patch() {
+	local patchdir="${WORKDIR}/patches"
+	local infodir="${WORKDIR}/patch-info"
+	local src_name dest_name desc
+	src_name="$1"
+	dest_name="$2"
+	desc="$3"
+	shift; shift; shift;
+	einfo "Adding ${dest_name} to patch bundle"
+	cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}"
+	if [[ -n "${desc}" ]]; then
+		printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc"
+	fi
+	if [[ $# -gt 0 ]]; then
+		# Note: when $@ is more than one element, this emits a
+		# line for each element
+		printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs"
+	fi
+}
+
+# Remove a patch using a glob expr
+# eg:
+#	 rm_patch *-darwin-Use-CC*
+#
+rm_patch() {
+	local patchdir="${WORKDIR}/patches"
+	local expr="$1"
+	local patch="$( cd "${patchdir}"; echo $expr )"
+	einfo "Removing $patch ($expr) from patch bundle"
+	if [[ -e "${patchdir}/${patch}" ]]; then
+		rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )"
+	else
+		ewarn "No ${expr} found in ${patchdir} to remove"
+	fi
+}
+
+# Yes, this is a reasonable amount of code for something seemingly simple
+# but this is far easier to debug when things go wrong, and things went wrong
+# multiple times while I was getting the exact number of slashes right, which
+# requires circumnavigating both bash and sed escape mechanisms.
+c_escape_string() {
+	local slash dquote
+	slash='\'
+	dquote='"'
+	re_slash="${slash}${slash}"
+	re_dquote="${slash}${dquote}"
+
+	# Convert \ to \\,
+	#         " to \"
+	echo "$1" |\
+		sed "s|${re_slash}|${re_slash}${re_slash}|g" |\
+		sed "s|${re_dquote}|${re_slash}${re_dquote}|g"
+}
+c_escape_file() {
+	c_escape_string "$(cat "$1")"
+}
+
+apply_patchdir() {
+	local patchdir="${WORKDIR}/patches"
+	local infodir="${WORKDIR}/patch-info"
+	local patchoutput="patchlevel-gentoo.h"
+
+	# Inject Patch-Level info into description for patchlevel.h patch
+	# to show in -V
+	local patch_expr="*List-packaged-patches*"
+	local patch="$( cd "${patchdir}"; echo $patch_expr )";
+	einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )"
+
+	if [[ -e "${patchdir}/${patch}" ]]; then
+		printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\
+			>"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc"
+	else
+		eerror "No $patch_expr found in ${patchdir}"
+	fi
+
+	# Compute patch list to apply
+	# different name other than PATCHES to stop default
+	# reapplying it
+	# Single depth is currently only supported, as artifacts can reside
+	# from the old layout being multiple-directories, as well as it grossly
+	# simplifying the patchlevel_gentoo.h generation.
+	local PERL_PATCHES=($(
+		find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\
+			grep -E '[.](diff|patch)$' |\
+			sort -n
+	))
+
+	for patch in "${PERL_PATCHES[@]}"; do
+		eapply "${WORKDIR}"/patches/${patch}
+	done
+
+	einfo "Generating $patchoutput"
+
+	# This code creates a header file, each iteration
+	# creates one-or-more-lines for each entry found in PERL_PATCHES
+	# and STDOUT is redirected to the .h file
+	for patch in "${PERL_PATCHES[@]}"; do
+		local desc_f="${infodir}/${patch}.desc"
+		local bugs_f="${infodir}/${patch}.bugs"
+
+		printf ',"%s"\n' "${patch}"
+		if [[ ! -e "${desc_f}" ]]; then
+			ewarn "No description provided for ${patch} (expected: ${desc_f} )"
+		else
+			local desc="$(c_escape_file "${desc_f}")"
+			printf ',"- %s"\n' "${desc}"
+		fi
+		if [[ -e "${bugs_f}" ]]; then
+			while read -d $'\n' -r line; do
+				local esc_line="$(c_escape_string "${line}")"
+				printf ',"- Bug: %s"\n' "${esc_line}"
+			done <"${bugs_f}"
+		fi
+	done > "${S}/${patchoutput}"
+	printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST"
+
+}
+
+src_prepare() {
+
+	local patchdir="${WORKDIR}/patches"
+
+	# mv -v "${WORKDIR}/perl-patchset-${PATCH_BASE}/patches" "${WORKDIR}/patches" || die
+	# mv -v "${WORKDIR}/perl-patchset-${PATCH_BASE}/patch-info" "${WORKDIR}/patch-info" || die
+
+	# Prepare Patch dir with additional patches / remove unwanted patches
+	# Inject bug/desc entries for perl -V
+	# Old example:
+	# add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\
+	#		"Fix broken miniperl on hppa"\
+	#		"https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162"
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# do NOT mess with nsl, on Solaris this is always necessary,
+		# when -lsocket is used e.g. to get h_errno
+		rm_patch "*-nsl-and-cl*"
+	fi
+
+	apply_patchdir
+
+	tc-is-cross-compiler && src_prepare_perlcross
+
+	tc-is-static-only || src_prepare_dynamic
+
+	if use gdbm; then
+		sed -i "s:INC => .*:INC => \"-I${ESYSROOT}/usr/include/gdbm\":g" \
+			ext/NDBM_File/Makefile.PL || die
+	fi
+
+	# Use errno.h from prefix rather than from host system, bug #645804
+	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
+		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# set a soname, fix linking against just built libperl
+		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_name (soname) not to reference $D
+		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
+
+		# fix environ linkage absence (only a real issue on Darwin9)
+		if [[ ${CHOST##*-darwin} -le 9 ]] ; then
+			sed -i -e '/^PLDLFLAGS =/s/=/= -include crt_externs.h -Denviron="(*_NSGetEnviron())"/' \
+				Makefile.SH || die
+		fi
+	fi
+
+	default
+}
+
+myconf() {
+	# the myconf array is declared in src_configure
+	myconf=( "${myconf[@]}" "$@" )
+}
+
+# Outputs a list of versions which have been seen in any of the
+# primary perl @INC prefix paths, such as:
+#  /usr/lib64/perl5/<NUMBER>
+#  /usr/local/lib64/perl5/<NUMBER>
+#  /usr/lib64/perl5/vendor_perl/<NUMBER>
+#
+# All values of NUMBER must be like "5.x.y" or like "5.x"
+#
+find_candidate_inc_versions() {
+	local regex='.*/5[.][0-9]+\([.][0-9]+\|\)$'
+	local dirs=(
+		"${EROOT}${PRIV_BASE}"
+		"${EROOT}${SITE_BASE}"
+		"${EROOT}${VENDOR_BASE}"
+	)
+	for dir in "${dirs[@]}"; do
+		if [[ ! -e "${dir}" ]]; then
+			continue
+		fi
+		# Without access to readdir() on these dirs, find will not be able
+		# to reveal any @INC directories inside them, and will subsequently prune
+		# them from the built perl's @INC support, breaking our compatiblity options
+		# entirely.
+		if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then
+			eerror "Bad permissions on ${dir}, this will probably break things"
+			eerror "Ensure ${dir} is +rx for at least uid=$EUID"
+			eerror "Recommended permission is +rx for all"
+			eerror "> chmod o+rx ${dir}"
+		fi
+	done
+	einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}"
+	find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f "  2>/dev/null
+}
+
+# Sort versions passed versiony-ly, remove self-version if present
+# dedup. Takes each version as an argument
+sanitize_inc_versions() {
+	local vexclude="${SUBSLOT}"
+	einfo "Normalizing/Sorting candidate list: $*"
+	einfo " to remove '${vexclude}'"
+	# Note, general numeric sort has to be used
+	# for the last component, or unique will convert
+	#  5.30.0 + 5.30 into just 5.30
+	printf "%s\n" "$@" |\
+		grep -vxF "${vexclude}" |\
+		sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg
+}
+
+versions_to_inclist() {
+	local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
+
+	for v;	do
+			has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ ";
+			echo -n "${v}/ ";
+	done
+}
+
+versions_to_gentoolibdirs() {
+	local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
+	local root
+	local v
+	for v;	do
+		for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do
+			local fullpath="${EROOT}${root}/${v}"
+			if [[ -e "${fullpath}" ]]; then
+				has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}";
+				printf "%s:" "${fullpath}"
+			fi
+		done
+	done
+}
+
+src_configure() {
+	declare -a myconf
+
+	export LC_ALL="C"
+	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
+
+	# Perl has problems compiling with -Os in your flags with glibc
+	replace-flags "-Os" "-O2"
+
+	# xlocale.h is going away in glibc-2.26, so it's counterproductive
+	# if we use it and include it in CORE/perl.h ... Perl builds just
+	# fine with glibc and locale.h only.
+	# However, the darwin prefix people have no locale.h ...
+	use elibc_glibc && myconf -Ui_xlocale
+
+	# Perl relies on -fwrapv semantics
+	filter-flags -ftrapv
+
+	# This flag makes compiling crash in interesting ways
+	filter-flags "-malign-double"
+
+	# On musl we dont want to use largefile *64 types, since 1) normal
+	# types are 64bit / largefile anyway and 2) the *64 types are going
+	# away in 1.2.4... bug #911233
+	use elibc_musl && myconf -Ud_off64_t
+
+	use sparc && myconf -Ud_longdbl
+
+	# This urgently needs debugging - on m68k, miniperl crashes during
+	# build otherwise..
+	use m68k && append-ldflags -Wl,-z,norelro
+
+	export BUILD_BZIP2=0
+	export BZIP2_INCLUDE=${ESYSROOT}/usr/include
+	export BZIP2_LIB=${ESYSROOT}/usr/$(get_libdir)
+
+	export BUILD_ZLIB=False
+	export ZLIB_INCLUDE=${ESYSROOT}/usr/include
+	export ZLIB_LIB=${ESYSROOT}/usr/$(get_libdir)
+
+	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
+	myndbm='U'
+	mygdbm='U'
+	mydb='U'
+	if use gdbm ; then
+		mygdbm='D'
+		if use berkdb ; then
+			myndbm='D'
+		fi
+	fi
+	if use berkdb ; then
+		mydb='D'
+		has_version '=sys-libs/db-1*' && myndbm='D'
+	fi
+
+	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
+
+	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
+		ewarn "Perl will not be built with berkdb support, use gcc if you need it..."
+		myconf -Ui_db -Ui_ndbm
+	fi
+
+	use perl_features_ithreads && myconf -Dusethreads
+
+	use perl_features_quadmath && myconf -Dusequadmath
+
+	if use perl_features_debug ; then
+		append-cflags "-g"
+		myconf -DDEBUGGING
+	elif [[ ${CFLAGS} == *-g* ]] ; then
+		myconf -DDEBUGGING=-g
+	else
+		myconf -DDEBUGGING=none
+	fi
+
+	# modifying 'optimize' prevents cross configure script from appending required flags
+	if tc-is-cross-compiler; then
+		append-cflags "-fwrapv"
+		tc-export_build_env
+
+		# Needed for the CHOST build too (bug #932385)
+		export CFLAGS="${CFLAGS} -D_GNU_SOURCE"
+
+		# bug #913171
+		export \
+			HOSTCC=$(tc-getBUILD_CC) \
+			HOSTCFLAGS="${CFLAGS_FOR_BUILD} -D_GNU_SOURCE" \
+			HOSTLDFLAGS="${LDFLAGS_FOR_BUILD}"
+	fi
+
+	# bug #877659, bug #821577
+	append-cflags -fno-strict-aliasing
+
+	# Autodiscover all old version directories, some of them will even be newer
+	# if you downgrade
+	if [[ -z ${PERL_OLDVERSEN} ]]; then
+		PERL_OLDVERSEN="$( find_candidate_inc_versions )"
+	fi
+
+	# Fixup versions, removing self match, fixing order and dupes
+	PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )"
+
+	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
+	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
+		local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )"
+		einfo "This version of perl may partially support modules previously"
+		einfo "installed in any of the following paths:"
+		for incpath in ${inclist}; do
+			[[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}"
+			[[ -e "${EROOT}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}"
+			[[ -e "${EROOT}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}"
+		done
+		einfo "This is a temporary measure and you should aim to cleanup these paths"
+		einfo "via world updates and perl-cleaner"
+		# myconf -Dinc_version_list="${inclist}"
+		myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )"
+	fi
+
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
+
+	# Make sure we can do the final link #523730, need to set deployment
+	# target to override hardcoded 10.3 which breaks on modern OSX
+	[[ ${CHOST} == *-darwin* ]] && \
+		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
+
+	# Older macOS with non-Apple GCC chokes on inline in system headers
+	# using c89 mode as injected by cflags.SH, in addition, we override
+	# cflags, so we loose PERL_DARWIN which enables compat code that
+	# apparently on more recent macOS releases is no longer necessary
+	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
+		append-cflags -Dinline=__inline__ -DPERL_DARWIN
+
+	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
+	# Prefix itself we don't do multilib either, so make sure perl can find
+	# something compatible.
+	if use prefix ; then
+		# Set a hook to check for each detected library whether it actually works.
+		export libscheck="
+			( echo 'int main(){}' > '${T}'/conftest.c &&
+				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
+			) || xxx=/dev/null"
+
+		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
+		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
+		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
+	elif [[ $(get_libdir) != "lib" ]] ; then
+		# We need to use " and not ', as the written config.sh use ' ...
+		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
+	fi
+
+	# don't try building ODBM, bug #354453
+	disabled_extensions="ODBM_File"
+
+	if ! use gdbm ; then
+		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
+		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
+	fi
+
+	myconf -Dnoextensions="${disabled_extensions}"
+
+	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
+
+	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
+	# allow fiddling via EXTRA_ECONF, bug 558070
+	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
+
+	myconf \
+		-Duseshrplib \
+		-Darchname="${myarch}" \
+		-Dar="$(tc-getAR)" \
+		-Dcc="$(tc-getCC)" \
+		-Dcpp="$(tc-getCPP)" \
+		-Dld="$(tc-getCC)" \
+		-Dnm="$(tc-getNM)" \
+		-Dranlib="$(tc-getRANLIB)" \
+		-Accflags="${CFLAGS} -DNO_PERL_RAND_SEED" \
+		-Doptimize="${CFLAGS}" \
+		-Dldflags="${LDFLAGS}" \
+		-Dprefix="${EPREFIX}"'/usr' \
+		-Dsiteprefix="${EPREFIX}"'/usr/local' \
+		-Dvendorprefix="${EPREFIX}"'/usr' \
+		-Dscriptdir="${EPREFIX}"'/usr/bin' \
+		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
+		-Darchlib="${EPREFIX}${ARCH_LIB}" \
+		-Dsitelib="${EPREFIX}${SITE_LIB}" \
+		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
+		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
+		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
+		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
+		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
+		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dman1ext='1' \
+		-Dman3ext='3pm' \
+		-Dlibperl="${LIBPERL}" \
+		-Dlocincpth="${EPREFIX}"'/usr/include ' \
+		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
+		-Duselargefiles \
+		-Dd_semctl_semun \
+		-Dcf_by='Gentoo' \
+		-Dmyhostname='localhost' \
+		-Dperladmin='root@localhost' \
+		-Ud_csh \
+		-Dsh="${BROOT}"/bin/sh \
+		-Dtargetsh="${EPREFIX}"/bin/sh \
+		-Uusenm \
+		"${EXTRA_ECONF[@]}"
+
+	if tc-is-cross-compiler; then
+		./configure \
+			--target="${CHOST}" \
+			--build="${CBUILD}" \
+			-Dinstallprefix='' \
+			-Dinstallusrbinperl='undef' \
+			-Dusevendorprefix='define' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	else
+		sh Configure \
+			-des \
+			-Dinstallprefix="${EPREFIX}"'/usr' \
+			-Dinstallusrbinperl='n' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	fi
+}
+
+src_test() {
+	export NO_GENTOO_NETWORK_TESTS=1;
+	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
+	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
+	if [[ ${EUID} == 0 ]] ; then
+		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
+		return 0
+	fi
+	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
+}
+
+src_install() {
+	local i
+	local coredir="${ARCH_LIB}/CORE"
+
+	emake DESTDIR="${D}" install
+
+	rm -f "${ED}/usr/bin/perl${MY_PV}"
+	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
+
+	if ! tc-is-static-only ; then
+		dolib.so "${ED}"${coredir}/${LIBPERL}
+		rm -f "${ED}"${coredir}/${LIBPERL}
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
+
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
+	fi
+
+	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
+
+	# This removes ${D} from Config.pm
+	for i in $(find "${D}" -iname "Config.pm" ) ; do
+		einfo "Removing ${D} from ${i}..."
+		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
+	done
+
+	dodoc Changes* README AUTHORS
+
+	if use doc ; then
+		# HTML Documentation
+		# We expect errors, warnings, and such with the following.
+
+		dodir /usr/share/doc/${PF}/html
+		LD_LIBRARY_PATH=. ./perl installhtml \
+			--podroot='.' \
+			--podpath='lib:ext:pod:vms' \
+			--recurse \
+			--htmldir="${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
+
+	dual_scripts
+}
+
+pkg_preinst() {
+	check_rebuild
+}
+
+pkg_postinst() {
+	dual_scripts
+
+	if [[ -z "${ROOT}" ]] ; then
+		local INC DIR file
+		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
+		einfo "Removing old .ph files"
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
+					rm -f "${file}"
+					einfo "<< ${file}"
+				done
+			fi
+		done
+		# Silently remove the now empty dirs
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
+			fi
+		done
+
+	fi
+}
+
+pkg_postrm() {
+	dual_scripts
+}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 9386f88f4728..7110d35ba441 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,4 @@
 DIST php-8.1.30.tar.xz 11850340 BLAKE2B 9053c57814f53ff694ea6cf1a87253e4f8f7c5af6965a85109eca143abd8dd6c733c7f70d1c6cdc34db8932dd7e9e8289cebce37eef385ea51dc0cd8a71267ef SHA512 cdca1c1671362272bf6c2abf45d097b42ca06c0abf962ee814bf478f8b346f274f42a1b1aa6603cdd59a1978a8b9d1971b589706f2909b6ea34594de0edaee1e
 DIST php-8.2.24.tar.xz 12110000 BLAKE2B 0f5c47350b8914f87cfbee932ea2e24d29635a0bdfed111b02e81d05574ff973f657d077858c20497bdc380285305d6c0f632eee1bbc9358f84004019108e368 SHA512 19016bfb955892a9999f01a619ab26035afe1cfb6488c7d1774d6745b703afb99e59032728ab811024413757e50163cdc32b0e95fda7e1d4243deb96568c7e79
 DIST php-8.2.27.tar.xz 12150992 BLAKE2B 220b71c04db5654b16f46f831776741f653d77d4363ae1279e5f7eb745aa862087cd89f63740a6584fb4925bf5cb9f72a267cf85ea5e0828f35975a08a011861 SHA512 c368d90d833e25d2b2e3a667010f1c5b37df772e2200855d38e4bcb3344585e0783ae53fadae499fe98abab95372adf787ba2413e9b6bc818628bc29a11ed453
-DIST php-8.3.15.tar.xz 12525028 BLAKE2B 630045fd371ccf80f3c8849d52c61915459a03a5170b4ccea83881a0d3ccd31c67f157f78876c213f370983952fb91515d0bb456529a91726f20c918dcc78841 SHA512 43057cca0a6c2187f7991dfbf9743495784f0fa4d0336f08392036ecc2b6f83c7155737ebef3af6144a79eca557bf84cba4aedd34e0d19c701249ca4e8fa86d0
+DIST php-8.3.16.tar.xz 12544360 BLAKE2B 27b03081ce10e0c9f5d95dcf75db3c9e872131514021d8ad83df7f6d6abec2ad31ce6d24e2a5c6c8d7c9d6eaa065f9a07bd40cb6e0f1f83074caf087fa49a874 SHA512 2caa5c4e1b1b719a67dfefc976d47d289ba6f9b6a527181f2961fff481b258c2e038d6993df7507f4977c5fce59df38d9738cd4186a4602e39bbcbd5c1e2dbf4
diff --git a/dev-lang/php/php-8.2.27-r1.ebuild b/dev-lang/php/php-8.2.27-r1.ebuild
new file mode 100644
index 000000000000..48520240c2fd
--- /dev/null
+++ b/dev-lang/php/php-8.2.27-r1.ebuild
@@ -0,0 +1,894 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic multilib systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
+	cdb cjk +ctype curl debug
+	enchant exif ffi +fileinfo +filter
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache +opcache-jit pcntl pdo +phar +posix
+	postgres qdbm readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode
+	valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	avif? ( gd zlib )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	mssql? ( pdo )
+	test? ( cli )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	virtual/libcrypt:=
+	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	avif? ( media-libs/libavif:= )
+	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	curl? ( >=net-misc/curl-7.29.0 )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( >=dev-libs/libffi-3.0.11:= )
+	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( net-libs/c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11:= )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( >=dev-db/postgresql-9.1:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:=[-minimal(-)] )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.2:0= )
+	tidy? ( app-text/htmltidy )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	valgrind? ( dev-debug/valgrind )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.9.0 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}/php-iodbc-header-location.patch"
+	"${FILESDIR}/php-capstone-optional.patch"
+	"${FILESDIR}/php-8.2.8-openssl-tests.patch"
+	"${FILESDIR}/php-8.2.20-implicit-printf.patch"
+	"${FILESDIR}/php-8.2.23-fix-ub.patch"
+)
+
+# ARM/Windows functions (bug 923335)
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__crc32d
+	_controlfp
+	_controlfp_s
+)
+
+# Functions from alternate iconv implementations (bug 925268)
+QA_CONFIG_IMPL_DECL_SKIP+=(
+	iconv_ccs_init
+	cstoccsid
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+
+	# missing skipif; fixed upstream already
+	rm sapi/cgi/tests/005.phpt || die
+
+	# These three get BORKED on no-ipv6 systems,
+	#
+	#   https://github.com/php/php-src/pull/11651
+	#
+	rm ext/sockets/tests/mcast_ipv6_recv.phpt \
+	   ext/sockets/tests/mcast_ipv6_recv_limited.phpt \
+	   ext/sockets/tests/mcast_ipv6_send.phpt \
+	   || die
+
+	# fails in a network sandbox,
+	#
+	#   https://github.com/php/php-src/issues/11662
+	#
+	rm ext/sockets/tests/bug63000.phpt || die
+
+	# expected output needs to be updated,
+	#
+	#   https://github.com/php/php-src/pull/11648
+	#
+	rm ext/dba/tests/dba_tcadb.phpt || die
+
+	# Two IMAP tests missing SKIPIFs,
+	#
+	#   https://github.com/php/php-src/pull/11654
+	#
+	rm ext/imap/tests/imap_mutf7_to_utf8.phpt \
+	   ext/imap/tests/imap_utf8_to_mutf7_basic.phpt \
+	   || die
+
+	# broken upstream with icu-73.x,
+	#
+	#   https://github.com/php/php-src/issues/11128
+	#
+	rm ext/intl/tests/calendar_clear_variation1.phpt || die
+
+	# overly sensitive to INI values; fixes sent upstream:
+	#
+	#  https://github.com/php/php-src/pull/11631
+	#
+	rm ext/session/tests/{bug74514,bug74936,gh7787}.phpt || die
+
+	# This is sensitive to the current "nice" level:
+	#
+	#   https://github.com/php/php-src/issues/11630
+	#
+	rm ext/standard/tests/general_functions/proc_nice_basic.phpt || die
+
+	# Tests ignoring the "-n" flag we pass to run-tests.php,
+	#
+	#   https://github.com/php/php-src/pull/11669
+	#
+	rm ext/standard/tests/file/bug60120.phpt \
+	   ext/standard/tests/general_functions/proc_open_null.phpt \
+	   ext/standard/tests/general_functions/proc_open_redirect.phpt \
+	   ext/standard/tests/general_functions/proc_open_sockets1.phpt \
+	   ext/standard/tests/general_functions/proc_open_sockets2.phpt \
+	   ext/standard/tests/general_functions/proc_open_sockets3.phpt \
+	   ext/standard/tests/ini_info/php_ini_loaded_file.phpt \
+	   sapi/cli/tests/016.phpt \
+	   sapi/cli/tests/023.phpt \
+	   sapi/cli/tests/bug65275.phpt \
+	   sapi/cli/tests/bug74600.phpt \
+	   sapi/cli/tests/bug78323.phpt \
+	   || die
+
+	# Same TEST_PHP_EXTRA_ARGS (-n) issue with this one, but it's
+	# already been fixed upstream.
+	rm sapi/cli/tests/017.phpt || die
+
+	# Most Oracle tests are borked,
+	#
+	#  * https://github.com/php/php-src/issues/11804
+	#  * https://github.com/php/php-src/pull/11820
+	#  * https://github.com/php/php-src/issues/11819
+	#
+	rm ext/oci8/tests/*.phpt || die
+
+	# https://github.com/php/php-src/issues/12801
+	rm ext/pcre/tests/gh11374.phpt || die
+
+	# This is a memory usage test with hard-coded limits. Whenever the
+	# limits are surpassed... they get increased... but in the meantime,
+	# the tests fail. This is not really a test that end users should
+	# be running pre-install, in my opinion. Bug 927461.
+	rm ext/fileinfo/tests/bug78987.phpt || die
+
+	# glibc-2.39 compatibility, fixed upstream in
+	# https://github.com/php/php-src/pull/14097
+	rm ext/standard/tests/strings/setlocale_variation3.phpt || die
+
+	# The expected warnings aren't triggered in this test because we
+	# define session.save_path on the CLI:
+	#
+	#   https://github.com/php/php-src/issues/14368
+	#
+	rm ext/session/tests/gh13856.phpt || die
+
+	# Bug 935382, fixed eventually by
+	#
+	# - https://github.com/php/php-src/pull/14788
+	# - https://github.com/php/php-src/pull/14814
+	#
+	rm ext/standard/tests/strings/chunk_split_variation1_32bit.phpt || die
+	rm ext/standard/tests/strings/wordwrap_memory_limit.phpt || die
+
+	# Bug 935379, not yet fixed upstream but looks harmless (ordering
+	# of keys isn't guaranteed AFAICS):
+	#
+	# - https://github.com/php/php-src/issues/14786
+	#
+	rm ext/dba/tests/dba_gdbm.phpt || die
+
+	# https://github.com/php/php-src/pull/14439
+	rm ext/openssl/tests/bug74341.phpt || die
+
+	# Test for https://github.com/php/php-src/issues/16390 relies
+	# on the inifile handler to be present, so we have to skip
+	# this test in case the inifile USE flag is _not_ set.
+	if ! use inifile ; then
+		rm ext/dba/tests/gh16390.phpt || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	# https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527
+	filter-lto
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# Don't allow ./configure to detect and use an existing version
+	# of PHP; this can lead to all sorts of weird unpredictability
+	# as in bug 900210.
+	export ac_cv_prog_PHP=""
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		--without-valgrind
+		--with-external-libcrypt
+		$(use_enable threads zts)
+	)
+
+	# The slotted man/info pages will be missed by the default list of
+	# docompress paths.
+	docompress "${PHP_DESTDIR}/man" "${PHP_DESTDIR}/info"
+
+	our_conf+=(
+		$(use_with apparmor fpm-apparmor)
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_with avif)
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_enable opcache-jit)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with selinux fpm-selinux)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+		$(use_with valgrind)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	our_conf+=( $(use_with mysqli) )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "mysqlnd")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	# Create separate build trees for each enabled SAPI. The upstream
+	# build system doesn't do this, but we have to do it to use a
+	# different php.ini for each SAPI (see --with-config-file-path and
+	# --with-config-file-scan-dir below). The path winds up define'd
+	# in main/build-defs.h which is included in main/php.h which is
+	# included by basically everything; so, avoiding a rebuild after
+	# changing it is not an easy job.
+	local one_sapi
+	local sapi
+	mkdir "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		einfo "Running econf in ${BUILD_DIR}"
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	if use oci8-instant-client && use kerberos && use imap && use phar; then
+		# A conspiracy takes place when the first three of these flags
+		# are set together, causing the newly-built "php" to open
+		# /dev/urandom with mode rw when it starts. That's not actually
+		# a problem... unless you also have USE=phar, which runs that
+		# "php" to build some phar thingy in src_compile(). Later in
+		# src_test(), portage (at least) sets "addpredict /" so the
+		# problem does not repeat.
+		addpredict /dev/urandom #nowarn
+	fi
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		use "${sapi}" && emake -C "${WORKDIR}/sapis-build/${sapi}"
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	export TEST_PHP_EXECUTABLE="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+
+	# Sometimes when the sub-php launches a sub-sub-php, it uses these.
+	# Without an "-n" in all instances, the *live* php.ini can be loaded,
+	# pulling in *live* zend extensions. And those can be incompatible
+	# with the thing we just built.
+	export TEST_PHP_EXTRA_ARGS="-n"
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	# The sendmail override prevents ext/imap/tests/bug77020.phpt from
+	# actually trying to send mail, and will be fixed upstream soon:
+	#
+	#   https://github.com/php/php-src/issues/11629
+	#
+	# The IO capture tests need to be disabled because they fail when
+	# std{in,out,err} are redirected (as they are within portage).
+	#
+	# One -n applies to the top-level "php", while the other applies
+	# to any sub-php that get invoked by the test runner.
+	SKIP_IO_CAPTURE_TESTS=1 SKIP_PERF_SENSITIVE=1 REPORT_EXIT_STATUS=1 \
+		"${TEST_PHP_EXECUTABLE}" -n \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" --offline -n -q \
+		-d "session.save_path=${T}" \
+		-d "sendmail_path=echo >/dev/null" \
+		|| die "tests failed"
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-8.2.27.ebuild b/dev-lang/php/php-8.2.27.ebuild
deleted file mode 100644
index a0a30a60f6a4..000000000000
--- a/dev-lang/php/php-8.2.27.ebuild
+++ /dev/null
@@ -1,897 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic multilib systemd autotools
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
-	cdb cjk +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache +opcache-jit pcntl pdo +phar +posix
-	postgres qdbm readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode
-	valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	avif? ( gd zlib )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	oci8-instant-client? ( !ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-	test? ( cli )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	virtual/libcrypt:=
-	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	avif? ( media-libs/libavif:= )
-	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	curl? ( >=net-misc/curl-7.29.0 )
-	enchant? ( app-text/enchant:2 )
-	ffi? ( >=dev-libs/libffi-3.0.11:= )
-	firebird? ( dev-db/firebird )
-	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( net-libs/c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	sodium? ( dev-libs/libsodium:=[-minimal(-)] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-1.0.2:0= )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	valgrind? ( dev-debug/valgrind )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.9.0 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt )
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=(
-	"${FILESDIR}/php-iodbc-header-location.patch"
-	"${FILESDIR}/php-capstone-optional.patch"
-	"${FILESDIR}/php-8.2.8-openssl-tests.patch"
-	"${FILESDIR}/php-8.2.20-implicit-printf.patch"
-	"${FILESDIR}/php-8.2.23-fix-ub.patch"
-)
-
-# ARM/Windows functions (bug 923335)
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__crc32d
-	_controlfp
-	_controlfp_s
-)
-
-# Functions from alternate iconv implementations (bug 925268)
-QA_CONFIG_IMPL_DECL_SKIP+=(
-	iconv_ccs_init
-	cstoccsid
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Emulate buildconf to support cross-compilation
-	rm -fr aclocal.m4 autom4te.cache config.cache \
-		configure main/php_config.h.in || die
-	eautoconf --force
-	eautoheader
-
-	# missing skipif; fixed upstream already
-	rm sapi/cgi/tests/005.phpt || die
-
-	# These three get BORKED on no-ipv6 systems,
-	#
-	#   https://github.com/php/php-src/pull/11651
-	#
-	rm ext/sockets/tests/mcast_ipv6_recv.phpt \
-	   ext/sockets/tests/mcast_ipv6_recv_limited.phpt \
-	   ext/sockets/tests/mcast_ipv6_send.phpt \
-	   || die
-
-	# fails in a network sandbox,
-	#
-	#   https://github.com/php/php-src/issues/11662
-	#
-	rm ext/sockets/tests/bug63000.phpt || die
-
-	# expected output needs to be updated,
-	#
-	#   https://github.com/php/php-src/pull/11648
-	#
-	rm ext/dba/tests/dba_tcadb.phpt || die
-
-	# Two IMAP tests missing SKIPIFs,
-	#
-	#   https://github.com/php/php-src/pull/11654
-	#
-	rm ext/imap/tests/imap_mutf7_to_utf8.phpt \
-	   ext/imap/tests/imap_utf8_to_mutf7_basic.phpt \
-	   || die
-
-	# broken upstream with icu-73.x,
-	#
-	#   https://github.com/php/php-src/issues/11128
-	#
-	rm ext/intl/tests/calendar_clear_variation1.phpt || die
-
-	# overly sensitive to INI values; fixes sent upstream:
-	#
-	#  https://github.com/php/php-src/pull/11631
-	#
-	rm ext/session/tests/{bug74514,bug74936,gh7787}.phpt || die
-
-	# This is sensitive to the current "nice" level:
-	#
-	#   https://github.com/php/php-src/issues/11630
-	#
-	rm ext/standard/tests/general_functions/proc_nice_basic.phpt || die
-
-	# Tests ignoring the "-n" flag we pass to run-tests.php,
-	#
-	#   https://github.com/php/php-src/pull/11669
-	#
-	rm ext/standard/tests/file/bug60120.phpt \
-	   ext/standard/tests/general_functions/proc_open_null.phpt \
-	   ext/standard/tests/general_functions/proc_open_redirect.phpt \
-	   ext/standard/tests/general_functions/proc_open_sockets1.phpt \
-	   ext/standard/tests/general_functions/proc_open_sockets2.phpt \
-	   ext/standard/tests/general_functions/proc_open_sockets3.phpt \
-	   ext/standard/tests/ini_info/php_ini_loaded_file.phpt \
-	   sapi/cli/tests/016.phpt \
-	   sapi/cli/tests/023.phpt \
-	   sapi/cli/tests/bug65275.phpt \
-	   sapi/cli/tests/bug74600.phpt \
-	   sapi/cli/tests/bug78323.phpt \
-	   || die
-
-	# Same TEST_PHP_EXTRA_ARGS (-n) issue with this one, but it's
-	# already been fixed upstream.
-	rm sapi/cli/tests/017.phpt || die
-
-	# Most Oracle tests are borked,
-	#
-	#  * https://github.com/php/php-src/issues/11804
-	#  * https://github.com/php/php-src/pull/11820
-	#  * https://github.com/php/php-src/issues/11819
-	#
-	rm ext/oci8/tests/*.phpt || die
-
-	# https://github.com/php/php-src/issues/12801
-	rm ext/pcre/tests/gh11374.phpt || die
-
-	# This is a memory usage test with hard-coded limits. Whenever the
-	# limits are surpassed... they get increased... but in the meantime,
-	# the tests fail. This is not really a test that end users should
-	# be running pre-install, in my opinion. Bug 927461.
-	rm ext/fileinfo/tests/bug78987.phpt || die
-
-	# glibc-2.39 compatibility, fixed upstream in
-	# https://github.com/php/php-src/pull/14097
-	rm ext/standard/tests/strings/setlocale_variation3.phpt || die
-
-	# The expected warnings aren't triggered in this test because we
-	# define session.save_path on the CLI:
-	#
-	#   https://github.com/php/php-src/issues/14368
-	#
-	rm ext/session/tests/gh13856.phpt || die
-
-	# Bug 935382, fixed eventually by
-	#
-	# - https://github.com/php/php-src/pull/14788
-	# - https://github.com/php/php-src/pull/14814
-	#
-	rm ext/standard/tests/strings/chunk_split_variation1_32bit.phpt || die
-	rm ext/standard/tests/strings/wordwrap_memory_limit.phpt || die
-
-	# Bug 935379, not yet fixed upstream but looks harmless (ordering
-	# of keys isn't guaranteed AFAICS):
-	#
-	# - https://github.com/php/php-src/issues/14786
-	#
-	rm ext/dba/tests/dba_gdbm.phpt || die
-
-	# https://github.com/php/php-src/pull/14439
-	rm ext/openssl/tests/bug74341.phpt || die
-
-	# Test for https://github.com/php/php-src/issues/16390 relies
-	# on the inifile handler to be present, so we have to skip
-	# this test in case the inifile USE flag is _not_ set.
-	if ! use inifile ; then
-		rm ext/dba/tests/gh16390.phpt || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	# https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527
-	filter-lto
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# Don't allow ./configure to detect and use an existing version
-	# of PHP; this can lead to all sorts of weird unpredictability
-	# as in bug 900210.
-	export ac_cv_prog_PHP=""
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		--without-valgrind
-		--with-external-libcrypt
-		$(use_enable threads zts)
-	)
-
-	# The slotted man/info pages will be missed by the default list of
-	# docompress paths.
-	docompress "${PHP_DESTDIR}/man" "${PHP_DESTDIR}/info"
-
-	our_conf+=(
-		$(use_with apparmor fpm-apparmor)
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_with avif)
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_enable ipv6)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_enable opcache-jit)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix)
-		$(use_with selinux fpm-selinux)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-		$(use_with valgrind)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype)
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg)
-		$(use_with xpm)
-		$(use_with webp)
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_enable gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	our_conf+=( $(use_with mysqli) )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		our_conf+=(
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "mysqlnd")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	# Create separate build trees for each enabled SAPI. The upstream
-	# build system doesn't do this, but we have to do it to use a
-	# different php.ini for each SAPI (see --with-config-file-path and
-	# --with-config-file-scan-dir below). The path winds up define'd
-	# in main/build-defs.h which is included in main/php.h which is
-	# included by basically everything; so, avoiding a rebuild after
-	# changing it is not an easy job.
-	local one_sapi
-	local sapi
-	mkdir "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		einfo "Running econf in ${BUILD_DIR}"
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	if use oci8-instant-client && use kerberos && use imap && use phar; then
-		# A conspiracy takes place when the first three of these flags
-		# are set together, causing the newly-built "php" to open
-		# /dev/urandom with mode rw when it starts. That's not actually
-		# a problem... unless you also have USE=phar, which runs that
-		# "php" to build some phar thingy in src_compile(). Later in
-		# src_test(), portage (at least) sets "addpredict /" so the
-		# problem does not repeat.
-		addpredict /dev/urandom #nowarn
-	fi
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		use "${sapi}" && emake -C "${WORKDIR}/sapis-build/${sapi}"
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	export TEST_PHP_EXECUTABLE="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-
-	# Sometimes when the sub-php launches a sub-sub-php, it uses these.
-	# Without an "-n" in all instances, the *live* php.ini can be loaded,
-	# pulling in *live* zend extensions. And those can be incompatible
-	# with the thing we just built.
-	export TEST_PHP_EXTRA_ARGS="-n"
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	# The sendmail override prevents ext/imap/tests/bug77020.phpt from
-	# actually trying to send mail, and will be fixed upstream soon:
-	#
-	#   https://github.com/php/php-src/issues/11629
-	#
-	# The IO capture tests need to be disabled because they fail when
-	# std{in,out,err} are redirected (as they are within portage).
-	#
-	# One -n applies to the top-level "php", while the other applies
-	# to any sub-php that get invoked by the test runner.
-	SKIP_IO_CAPTURE_TESTS=1 SKIP_PERF_SENSITIVE=1 REPORT_EXIT_STATUS=1 \
-		"${TEST_PHP_EXECUTABLE}" -n \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" --offline -n -q \
-		-d "session.save_path=${T}" \
-		-d "sendmail_path=echo >/dev/null" \
-		|| die "tests failed"
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-8.3.15.ebuild b/dev-lang/php/php-8.3.15.ebuild
deleted file mode 100644
index 25b030fbad28..000000000000
--- a/dev-lang/php/php-8.3.15.ebuild
+++ /dev/null
@@ -1,828 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WANT_AUTOMAKE="none"
-POSTGRES_COMPAT=( {15..17} )
-inherit autotools flag-o-matic multilib postgres systemd
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
-	capstone cdb +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit jpeg kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	odbc +opcache +opcache-jit pcntl pdo +phar +posix postgres png
-	qdbm readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode
-	valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-	test? ( cli )
-	postgres? ( ${POSTGRES_REQ_USE} )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	app-eselect/eselect-php[apache2?,fpm?]
-	dev-libs/libpcre2[jit?,unicode]
-	virtual/libcrypt:=
-	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	capstone? ( dev-libs/capstone )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	curl? ( net-misc/curl )
-	enchant? ( app-text/enchant:2 )
-	ffi? ( dev-libs/libffi:= )
-	firebird? ( dev-db/firebird )
-	gd? (
-		>=media-libs/gd-2.3.3-r4[avif?,jpeg?,png?,truetype?,webp?,xpm?]
-	)
-	gdbm? ( sys-libs/gdbm:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( net-libs/c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) )
-	postgres? ( ${POSTGRES_DEP} )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:=[-minimal(-)] )
-	spell? ( app-text/aspell )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl:0= )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( media-libs/freetype )
-	unicode? ( dev-libs/oniguruma:= )
-	valgrind? ( dev-debug/valgrind )
-	xml? ( >=dev-libs/libxml2-2.12.5 )
-	xslt? ( dev-libs/libxslt )
-	zip? ( dev-libs/libzip:= )
-	zlib? ( sys-libs/zlib:0= )
-"
-
-IDEPEND="app-eselect/eselect-php[apache2?,fpm?]"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	sys-devel/bison"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/php-8.3.10-optional-png-testfixen.patch"
-	"${FILESDIR}/php-8.3.9-gd-cachevars.patch"
-)
-
-PHP_MV="$(ver_cut 1)"
-
-# ARM/Windows functions (bug 923335)
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__crc32d
-	_controlfp
-	_controlfp_s
-)
-
-# Functions from alternate iconv implementations (bug 925268)
-QA_CONFIG_IMPL_DECL_SKIP+=(
-	iconv_ccs_init
-	cstoccsid
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR
-	# packages
-	local sed_src='^;include_path = ".:/php.*'
-	local include_path="."
-	include_path+=":${EPREFIX}/usr/share/php${PHP_MV}"
-	include_path+=":${EPREFIX}/usr/share/php"
-	local sed_dst="include_path = \"${include_path}\""
-	sed -e "s|${sed_src}|${sed_dst}|" -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension = opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-pkg_setup() {
-	use postgres && postgres_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# fails in a network sandbox,
-	#
-	#   https://github.com/php/php-src/issues/11662
-	#
-	rm ext/sockets/tests/bug63000.phpt || die
-
-	# Tests ignoring the "-n" flag we pass to run-tests.php,
-	#
-	#   https://github.com/php/php-src/pull/11669
-	#
-	rm ext/standard/tests/file/bug60120.phpt \
-	   ext/standard/tests/general_functions/proc_open_null.phpt \
-	   ext/standard/tests/general_functions/proc_open_redirect.phpt \
-	   ext/standard/tests/general_functions/proc_open_sockets1.phpt \
-	   ext/standard/tests/general_functions/proc_open_sockets2.phpt \
-	   ext/standard/tests/general_functions/proc_open_sockets3.phpt \
-	   ext/standard/tests/ini_info/php_ini_loaded_file.phpt \
-	   sapi/cli/tests/016.phpt \
-	   sapi/cli/tests/023.phpt \
-	   sapi/cli/tests/bug65275.phpt \
-	   sapi/cli/tests/bug74600.phpt \
-	   sapi/cli/tests/bug78323.phpt \
-	   || die
-
-	# This is a memory usage test with hard-coded limits. Whenever the
-	# limits are surpassed... they get increased... but in the meantime,
-	# the tests fail. This is not really a test that end users should
-	# be running pre-install, in my opinion. Bug 927461.
-	rm ext/fileinfo/tests/bug78987.phpt || die
-
-	# Bug 935382, fixed eventually by
-	#
-	# - https://github.com/php/php-src/pull/14788
-	# - https://github.com/php/php-src/pull/14814
-	#
-	rm ext/standard/tests/strings/chunk_split_variation1_32bit.phpt || die
-	rm ext/standard/tests/strings/wordwrap_memory_limit.phpt || die
-
-	# Bug 935379, not yet fixed upstream but looks harmless (ordering
-	# of keys isn't guaranteed AFAICS):
-	#
-	# - https://github.com/php/php-src/issues/14786
-	#
-	rm ext/dba/tests/dba_gdbm.phpt || die
-
-	# Most tests failing with an external libgd have been fixed,
-	# but there are a few stragglers:
-	#
-	#  * https://github.com/php/php-src/issues/11252
-	#
-	rm ext/gd/tests/bug43073.phpt \
-	   ext/gd/tests/bug48732.phpt \
-	   ext/gd/tests/bug48732-mb.phpt \
-	   ext/gd/tests/bug48801.phpt \
-	   ext/gd/tests/bug48801-mb.phpt \
-	   ext/gd/tests/bug53504.phpt \
-	   ext/gd/tests/bug65148.phpt \
-	   ext/gd/tests/bug73272.phpt \
-	   || die
-
-	# Test for https://github.com/php/php-src/issues/16390 relies
-	# on the inifile handler to be present, so we have to skip
-	# this test in case the inifile USE flag is _not_ set.
-	if ! use inifile ; then
-		rm ext/dba/tests/gh16390.phpt || die
-	fi
-
-	# One-off, somebody forgot to update a version constant
-	rm ext/reflection/tests/ReflectionZendExtension.phpt || die
-
-	eautoconf --force
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	# https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527
-	filter-lto
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# Don't allow ./configure to detect and use an existing version
-	# of PHP; this can lead to all sorts of weird unpredictability
-	# as in bug 900210.
-	export ac_cv_prog_PHP=""
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		--without-valgrind
-		--with-external-libcrypt
-		$(use_enable threads zts)
-	)
-
-	# The slotted man/info pages will be missed by the default list of
-	# docompress paths.
-	docompress "${PHP_DESTDIR}/man" "${PHP_DESTDIR}/info"
-
-	our_conf+=(
-		$(use_with apparmor fpm-apparmor)
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_with capstone)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_enable ipv6)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_enable opcache-jit)
-		$(use_with postgres pgsql "$("${PG_CONFIG:-true}" --bindir)/..")
-		$(use_enable posix)
-		$(use_with selinux fpm-selinux)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-		$(use_with valgrind)
-	)
-
-	# Override autoconf cache variables for libcrypt algorithms.These
-	# otherwise cannot be detected when cross-compiling. Bug 931884.
-	our_conf+=(
-		ac_cv_crypt_blowfish=yes
-		ac_cv_crypt_des=yes
-		ac_cv_crypt_ext_des=yes
-		ac_cv_crypt_md5=yes
-		ac_cv_crypt_sha512=yes
-		ac_cv_crypt_sha256=yes
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Use the system copy of GD. The autoconf cache variable overrides
-	# allow cross-compilation to proceed since the corresponding
-	# features cannot be detected by running a program.
-	our_conf+=(
-		$(use_enable gd gd)
-		$(use_with gd external-gd)
-		php_cv_lib_gd_gdImageCreateFromAvif=$(usex avif)
-		php_cv_lib_gd_gdImageCreateFromBmp=yes
-		php_cv_lib_gd_gdImageCreateFromJpeg=$(usex jpeg)
-		php_cv_lib_gd_gdImageCreateFromPng=$(usex png)
-		php_cv_lib_gd_gdImageCreateFromTga=yes
-		php_cv_lib_gd_gdImageCreateFromWebp=$(usex webp)
-		php_cv_lib_gd_gdImageCreateFromXpm=$(usex xpm)
-	)
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	our_conf+=( $(use_with mysqli) )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		# Obtain the correct -l and -I flags for the actual build from
-		# pkg-config. We use the "generic" library type to avoid the
-		# (wrong) hard-coded include dir for iodbc.
-		#
-		# We set the pdo_odbc_def_incdir variable because the
-		# ./configure script checks for the headers using "test -f" and
-		# ignores your CFLAGS... and pdo_odbc_def_libdir prevents the
-		# build system from appending a nonsense -L flag.
-		local iodbc_ldflags=$(pkg-config --libs libiodbc)
-		local iodbc_cflags=$(pkg-config --cflags libiodbc)
-		our_conf+=(
-			pdo_odbc_def_libdir="${EPREFIX}/usr/$(get_libdir)"
-			pdo_odbc_def_incdir="${EPREFIX}/usr/include/iodbc"
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "generic,,iodbc,${iodbc_ldlags},${iodbc_cflags}")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "mysqlnd")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	# Create separate build trees for each enabled SAPI. The upstream
-	# build system doesn't do this, but we have to do it to use a
-	# different php.ini for each SAPI (see --with-config-file-path and
-	# --with-config-file-scan-dir below). The path winds up define'd
-	# in main/build-defs.h which is included in main/php.h which is
-	# included by basically everything; so, avoiding a rebuild after
-	# changing it is not an easy job.
-	#
-	# The upstream build system also does not support building the
-	# apache2 and embed SAPIs at the same time, presumably because they
-	# both produce a libphp.so.
-	local one_sapi
-	local sapi
-	mkdir "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		einfo "Running econf in ${BUILD_DIR}"
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		use "${sapi}" && emake -C "${WORKDIR}/sapis-build/${sapi}"
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Install SAPI-independent targets
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-	use opcache && emake INSTALL_ROOT="${D}" install-modules
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	export TEST_PHP_EXECUTABLE="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-
-	# Sometimes when the sub-php launches a sub-sub-php, it uses these.
-	# Without an "-n" in all instances, the *live* php.ini can be loaded,
-	# pulling in *live* zend extensions. And those can be incompatible
-	# with the thing we just built.
-	export TEST_PHP_EXTRA_ARGS="-n"
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	# The IO capture tests need to be disabled because they fail when
-	# std{in,out,err} are redirected (as they are within portage).
-	#
-	# One -n applies to the top-level "php", while the other applies
-	# to any sub-php that get invoked by the test runner.
-	SKIP_IO_CAPTURE_TESTS=1 SKIP_PERF_SENSITIVE=1 REPORT_EXIT_STATUS=1 \
-		"${TEST_PHP_EXECUTABLE}" -n \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" --offline -n -q \
-		-d "session.save_path=${T}" \
-		|| die "tests failed"
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-8.3.16.ebuild b/dev-lang/php/php-8.3.16.ebuild
new file mode 100644
index 000000000000..afb477c73b90
--- /dev/null
+++ b/dev-lang/php/php-8.3.16.ebuild
@@ -0,0 +1,825 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE="none"
+POSTGRES_COMPAT=( {15..17} )
+inherit autotools flag-o-matic multilib postgres systemd
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
+	capstone cdb +ctype curl debug
+	enchant exif ffi +fileinfo +filter
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit jpeg kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	odbc +opcache +opcache-jit pcntl pdo +phar +posix postgres png
+	qdbm readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode
+	valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	mssql? ( pdo )
+	test? ( cli )
+	postgres? ( ${POSTGRES_REQ_USE} )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	app-eselect/eselect-php[apache2?,fpm?]
+	dev-libs/libpcre2[jit?,unicode]
+	virtual/libcrypt:=
+	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	capstone? ( dev-libs/capstone )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	curl? ( net-misc/curl )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( dev-libs/libffi:= )
+	gd? (
+		>=media-libs/gd-2.3.3-r4[avif?,jpeg?,png?,truetype?,webp?,xpm?]
+	)
+	gdbm? ( sys-libs/gdbm:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( net-libs/c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) )
+	postgres? ( ${POSTGRES_DEP} )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:=[-minimal(-)] )
+	spell? ( app-text/aspell )
+	sqlite? ( dev-db/sqlite )
+	ssl? ( dev-libs/openssl:0= )
+	tidy? ( app-text/htmltidy )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( media-libs/freetype )
+	unicode? ( dev-libs/oniguruma:= )
+	valgrind? ( dev-debug/valgrind )
+	xml? ( >=dev-libs/libxml2-2.12.5 )
+	xslt? ( dev-libs/libxslt )
+	zip? ( dev-libs/libzip:= )
+	zlib? ( sys-libs/zlib:0= )
+"
+
+IDEPEND="app-eselect/eselect-php[apache2?,fpm?]"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	sys-devel/bison"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/php-8.3.10-optional-png-testfixen.patch"
+	"${FILESDIR}/php-8.3.9-gd-cachevars.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+# ARM/Windows functions (bug 923335)
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__crc32d
+	_controlfp
+	_controlfp_s
+)
+
+# Functions from alternate iconv implementations (bug 925268)
+QA_CONFIG_IMPL_DECL_SKIP+=(
+	iconv_ccs_init
+	cstoccsid
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR
+	# packages
+	local sed_src='^;include_path = ".:/php.*'
+	local include_path="."
+	include_path+=":${EPREFIX}/usr/share/php${PHP_MV}"
+	include_path+=":${EPREFIX}/usr/share/php"
+	local sed_dst="include_path = \"${include_path}\""
+	sed -e "s|${sed_src}|${sed_dst}|" -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension = opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+pkg_setup() {
+	use postgres && postgres_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# fails in a network sandbox,
+	#
+	#   https://github.com/php/php-src/issues/11662
+	#
+	rm ext/sockets/tests/bug63000.phpt || die
+
+	# fails in a network sandbox,
+	# fixed upstream but not yet included in the stable releases.
+	#
+	# 	https://github.com/php/php-src/pull/17314
+	#
+	rm ext/standard/tests/http/gh16810.phpt || die
+
+	# Tests ignoring the "-n" flag we pass to run-tests.php,
+	#
+	#   https://github.com/php/php-src/pull/11669
+	#
+	rm ext/standard/tests/file/bug60120.phpt \
+	   ext/standard/tests/general_functions/proc_open_null.phpt \
+	   ext/standard/tests/general_functions/proc_open_redirect.phpt \
+	   ext/standard/tests/general_functions/proc_open_sockets1.phpt \
+	   ext/standard/tests/general_functions/proc_open_sockets2.phpt \
+	   ext/standard/tests/general_functions/proc_open_sockets3.phpt \
+	   ext/standard/tests/ini_info/php_ini_loaded_file.phpt \
+	   sapi/cli/tests/016.phpt \
+	   sapi/cli/tests/023.phpt \
+	   sapi/cli/tests/bug65275.phpt \
+	   sapi/cli/tests/bug74600.phpt \
+	   sapi/cli/tests/bug78323.phpt \
+	   || die
+
+	# This is a memory usage test with hard-coded limits. Whenever the
+	# limits are surpassed... they get increased... but in the meantime,
+	# the tests fail. This is not really a test that end users should
+	# be running pre-install, in my opinion. Bug 927461.
+	rm ext/fileinfo/tests/bug78987.phpt || die
+
+	# Bug 935382, fixed eventually by
+	#
+	# - https://github.com/php/php-src/pull/14788
+	# - https://github.com/php/php-src/pull/14814
+	#
+	rm ext/standard/tests/strings/chunk_split_variation1_32bit.phpt || die
+	rm ext/standard/tests/strings/wordwrap_memory_limit.phpt || die
+
+	# Bug 935379, not yet fixed upstream but looks harmless (ordering
+	# of keys isn't guaranteed AFAICS):
+	#
+	# - https://github.com/php/php-src/issues/14786
+	#
+	rm ext/dba/tests/dba_gdbm.phpt || die
+
+	# Most tests failing with an external libgd have been fixed,
+	# but there are a few stragglers:
+	#
+	#  * https://github.com/php/php-src/issues/11252
+	#
+	rm ext/gd/tests/bug43073.phpt \
+	   ext/gd/tests/bug48732.phpt \
+	   ext/gd/tests/bug48732-mb.phpt \
+	   ext/gd/tests/bug48801.phpt \
+	   ext/gd/tests/bug48801-mb.phpt \
+	   ext/gd/tests/bug53504.phpt \
+	   ext/gd/tests/bug65148.phpt \
+	   ext/gd/tests/bug73272.phpt \
+	   || die
+
+	# One-off, somebody forgot to update a version constant
+	rm ext/reflection/tests/ReflectionZendExtension.phpt || die
+
+	eautoconf --force
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	# https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527
+	filter-lto
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# Don't allow ./configure to detect and use an existing version
+	# of PHP; this can lead to all sorts of weird unpredictability
+	# as in bug 900210.
+	export ac_cv_prog_PHP=""
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		--without-valgrind
+		--with-external-libcrypt
+		$(use_enable threads zts)
+	)
+
+	# The slotted man/info pages will be missed by the default list of
+	# docompress paths.
+	docompress "${PHP_DESTDIR}/man" "${PHP_DESTDIR}/info"
+
+	our_conf+=(
+		$(use_with apparmor fpm-apparmor)
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_with capstone)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_enable opcache-jit)
+		$(use_with postgres pgsql "$("${PG_CONFIG:-true}" --bindir)/..")
+		$(use_enable posix)
+		$(use_with selinux fpm-selinux)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+		$(use_with valgrind)
+	)
+
+	# Override autoconf cache variables for libcrypt algorithms.These
+	# otherwise cannot be detected when cross-compiling. Bug 931884.
+	our_conf+=(
+		ac_cv_crypt_blowfish=yes
+		ac_cv_crypt_des=yes
+		ac_cv_crypt_ext_des=yes
+		ac_cv_crypt_md5=yes
+		ac_cv_crypt_sha512=yes
+		ac_cv_crypt_sha256=yes
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Use the system copy of GD. The autoconf cache variable overrides
+	# allow cross-compilation to proceed since the corresponding
+	# features cannot be detected by running a program.
+	our_conf+=(
+		$(use_enable gd gd)
+		$(use_with gd external-gd)
+		php_cv_lib_gd_gdImageCreateFromAvif=$(usex avif)
+		php_cv_lib_gd_gdImageCreateFromBmp=yes
+		php_cv_lib_gd_gdImageCreateFromJpeg=$(usex jpeg)
+		php_cv_lib_gd_gdImageCreateFromPng=$(usex png)
+		php_cv_lib_gd_gdImageCreateFromTga=yes
+		php_cv_lib_gd_gdImageCreateFromWebp=$(usex webp)
+		php_cv_lib_gd_gdImageCreateFromXpm=$(usex xpm)
+	)
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	our_conf+=( $(use_with mysqli) )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		# Obtain the correct -l and -I flags for the actual build from
+		# pkg-config. We use the "generic" library type to avoid the
+		# (wrong) hard-coded include dir for iodbc.
+		#
+		# We set the pdo_odbc_def_incdir variable because the
+		# ./configure script checks for the headers using "test -f" and
+		# ignores your CFLAGS... and pdo_odbc_def_libdir prevents the
+		# build system from appending a nonsense -L flag.
+		local iodbc_ldflags=$(pkg-config --libs libiodbc)
+		local iodbc_cflags=$(pkg-config --cflags libiodbc)
+		our_conf+=(
+			pdo_odbc_def_libdir="${EPREFIX}/usr/$(get_libdir)"
+			pdo_odbc_def_incdir="${EPREFIX}/usr/include/iodbc"
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "generic,,iodbc,${iodbc_ldlags},${iodbc_cflags}")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "mysqlnd")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	# Create separate build trees for each enabled SAPI. The upstream
+	# build system doesn't do this, but we have to do it to use a
+	# different php.ini for each SAPI (see --with-config-file-path and
+	# --with-config-file-scan-dir below). The path winds up define'd
+	# in main/build-defs.h which is included in main/php.h which is
+	# included by basically everything; so, avoiding a rebuild after
+	# changing it is not an easy job.
+	#
+	# The upstream build system also does not support building the
+	# apache2 and embed SAPIs at the same time, presumably because they
+	# both produce a libphp.so.
+	local one_sapi
+	local sapi
+	mkdir "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		einfo "Running econf in ${BUILD_DIR}"
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		use "${sapi}" && emake -C "${WORKDIR}/sapis-build/${sapi}"
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Install SAPI-independent targets
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+	use opcache && emake INSTALL_ROOT="${D}" install-modules
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	export TEST_PHP_EXECUTABLE="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+
+	# Sometimes when the sub-php launches a sub-sub-php, it uses these.
+	# Without an "-n" in all instances, the *live* php.ini can be loaded,
+	# pulling in *live* zend extensions. And those can be incompatible
+	# with the thing we just built.
+	export TEST_PHP_EXTRA_ARGS="-n"
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	# The IO capture tests need to be disabled because they fail when
+	# std{in,out,err} are redirected (as they are within portage).
+	#
+	# One -n applies to the top-level "php", while the other applies
+	# to any sub-php that get invoked by the test runner.
+	SKIP_IO_CAPTURE_TESTS=1 SKIP_PERF_SENSITIVE=1 REPORT_EXIT_STATUS=1 \
+		"${TEST_PHP_EXECUTABLE}" -n \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" --offline -n -q \
+		-d "session.save_path=${T}" \
+		|| die "tests failed"
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index e011c14023be..076e86ad56ce 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,29 +1,19 @@
 DIST Python-2.7.18.tar.xz 12854736 BLAKE2B 060a621c91dd8e3d321aec99d44c17aa67381998256a1a002d316b38288349884d5960de35c49352d03129ed0bae599e641ec2225898158ebce50a7a2fd74d2c SHA512 a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c
 DIST Python-2.7.18.tar.xz.asc 833 BLAKE2B 1d98770e46171971fb99994508d238c01d2755281d2f94353314014d9e83e0ec5f0b3e3950ea1fdf5fce9ba6b8f55312355845c2a3fc4291c27ee56fe6215448 SHA512 c2a5f5a52f47dec52460ad3275758d4e5de6e7075c3def4353c988d74d563a39b42cae2d5eb24e2a23a6247cef69100f91620b11a49c2359fbf99b203c9cbda8
-DIST Python-3.10.15.tar.xz 19596540 BLAKE2B fe62f7c7377136576e73a59b5f0b3c9729f9c958da5c8dd1771e88121fdd1928686166066351fc8ae98c9f97295a85feb7ec44c39317f93ae414244aed8a8f66 SHA512 3c0396b2dae1521315a9b5ce9ad4ab6ede385447922fceb00ea3df75bfd79cb547b9380e936d83c9c1b964e38e16d70e34aec39f4c292853a032407bb6a58063
-DIST Python-3.10.15.tar.xz.asc 833 BLAKE2B 31858fe2d3c8d868417eea66de1cf0b2fc7880e73ea7770b50191b8088bbd1c78485c64d94f6f005d18cef559d7e8e0906cb2a30aa1472d90f5af4cca045970b SHA512 0cac9b78649330a2a35a835d45e4a8a111db45943cc0ae0d24f5d9e03a058b4b739fe43d6cd1aee481dcd415a57820bf875996fa60b81d4d5911588db5adad70
 DIST Python-3.10.16.tar.xz 19610392 BLAKE2B bcc5ff71904b8a936363c6b07b8ffbcb981640c29c1e537a90f838c0a7fa45c1bdd764eae48bcb6d16d7260a44c235e9f5538ada45903b1627527e24c49212a5 SHA512 a6b004974db93f21590f00b9b1a569dfd8c3e334f8c6a8eb8997dec5646fa4515cfc02a7dabea9e4f75f908938dc64333ce4899b9a26aff97f9ffcb027fa2bca
 DIST Python-3.10.16.tar.xz.asc 833 BLAKE2B 4fd4ce76ade6d64539e5eb641c64b0d99ade71a8514f97594097207e78412bd2d09afeab6788598a3159f045b98ccd5537c6771e59eeba52d4820c0c0a6c0dcb SHA512 18032fdb60a022d6381b1137789ada1c4bb198049616ed158fb548e728dd1fb95d116a86c41c852ca2acc9127baf3cdd9644a1e2df90ae9c3ffcd66eabf454d6
-DIST Python-3.11.10.tar.xz 20067656 BLAKE2B aba211a09e4c083d71574c7537ba98474476ebf7092ddda815f8d355d01605456868a89f0bcc6a9e747f71f914fa0129547de2ae70d8b579c6458fdeeafd23f0 SHA512 6ce77cced1ce90bb5eea38504dfc1bc19c872149a5a63fdd8353ac8c772c54ab7a42176e141c7f6f898d31761bf93e1739b238920fbeefbedd6016ad033c1de0
-DIST Python-3.11.10.tar.xz.asc 833 BLAKE2B a1cbe57e568367fbc5817c983696619f515263a9b37662ca536c4d1132ad336959285bbe3076a251778016966f030d1e259f48accdb0df67c116af0e335acb8f SHA512 3a9efe1dd39fd6883ae3fc8dd7f6e25af7e06c6e6049cf9a31a1a82e6d7c84f85ac838d2a71127977d93ce77233a8bbff86a10a80d24fcee85a4e70fcbd1db19
 DIST Python-3.11.11.tar.xz 20085792 BLAKE2B a9a778eff94529e1029ae252ef28ecdc2f0673a4406d831865e12de3cba21ea48905542d0e806e428802b05947239ca6a44eff3573bd541469b01644790c7377 SHA512 3ff90f15f725fa8d06686158aaddb887a247b03ca4dc1fdfd81a8efb53373db3e8673bd0b3de30bb7669f3f07d9854e9d8a2dbcd49b18d15b8172787a53a0a9e
 DIST Python-3.11.11.tar.xz.asc 833 BLAKE2B 6a9d873e181d636712567ea46823ad7f972f872d038092506e67bada24187441188b8fde4672c205ce6d37e60c4e0c69a8f3cc5d1915fd8f5dd8743292a16d1b SHA512 d71b0b42537fb636e8c469d62d13ff020149e4fb9d87eb17f8c999301195e418d134dbdb7e4ab49b06de16e96f8ef6bbcf2a749956fffca2ce03185f191c181d
-DIST Python-3.12.6.tar.xz 20434028 BLAKE2B 527fafdbfd0c1784ff72a93cdeb3f49666bae7d9343b6d1e4ef773fc52bd397081b41bec3ee9ed5b7652f28f09f29a1b553424cef26aebfa6c2e13499870bf2b SHA512 e658b0d59b5cfdc591d626e8282b9945759f27ee6fbc8bcb8670737db32ffc11fb832dfed9b0e80188fb5f7f3f39fe6dd6191ab7736376453c9e248321e9b063
-DIST Python-3.12.6.tar.xz.asc 963 BLAKE2B d5f9e4c5053610a1a53769278e69d8a25e2fb047afb2a55dfee67917d8d200ebc159e614327ac87f34a4a9718cb3436b55190322ee231116b26074a78bb72642 SHA512 91a15bb7e8dd26616a2cdabe69c3ee81668cc67cb55a88b2be20433d24c9f8ae41c8f93f67aff2fa5858cd5b94600409cd472bd437a2fd33153483734ecd863f
-DIST Python-3.12.7.tar.xz 20444032 BLAKE2B eed8744261cab3b401963ec5187a8b814adb9a18f8d0a6a3d59c027a83cf8408524af9b20204b0a0861d173cc33c45ae37bb1542a1ace3344dc59c649087ff1f SHA512 4a363d3f852ad8f4fd1484aa4cec35494a3811be48ef67fadb2bdf2e2489ed07dc78fad6ab475257db503ddd64d39f9800f23a1c94b6bbd15b7f632cff0c90ae
-DIST Python-3.12.7.tar.xz.asc 963 BLAKE2B 8c7db3d1971d93a10c611a2e6dd3679d0b331b48df87b5fe410b089061e48753d98af67084d4f051a31ae803fce3aa3c7af7cba9c692640f50068bd1e46f40e6 SHA512 4d0a7a0da2c81888e93d8ff89ca2ed4bb85a7b0bd00f0d54a14e2c201affac2677ef3984d2b5aea253e624f6465548d9032eefdd9033c1eb3864d82cfd8d3df0
 DIST Python-3.12.8.tar.xz 20489808 BLAKE2B 24b9a5abafdb9fedfc371e7acf0efce50bdc6702050c4f5f0b9e97916a899e3462f928cb217c48e6ffae6fdd4d2cd7c05c5f1d73eaa9ef646f4b3281db5ca977 SHA512 406ce1146c4c2c70d252df56bbe9e5970ef469395cbaa211a96af71f32de2cf7abd944906920cc18b4a470027e63a3f64bf7679fb4954b31bf4ca4baf24fa370
 DIST Python-3.12.8.tar.xz.asc 963 BLAKE2B 5aeacf16d337949a66bb56e346447e7bbcd9166b60fc512c98bcff6862976732ef2e3ac59869cd9df29a653c2bafd4af63b1e6c14f4c6603efb85d5c3dd88357 SHA512 19493499ddb80764aa105e100585d2ef872798dc30fdff2e31d158cd7fd65b69ca133c6d9d16eb974660eed6ba474a26a2af3acd13a90522cf50e142492bd9a6
 DIST Python-3.13.0.tar.xz 22532980 BLAKE2B 4a4e397199402de8c9fe8e4d63443ed972cbe8a4f541743908d699c7987127d159d600fd14145b6a946e8671426279d230c9155fdc5863c1e49a945eedcbf21b SHA512 44a143c9b96b55b01885ec020c3364265bda55289615cd7d5071915b0d0178a6f35e7551a89090001fcb7f3172d38177a56bf8b8532b15c9dbc50295c9210152
 DIST Python-3.13.0.tar.xz.asc 963 BLAKE2B d05f02692a9fea42b73dbfe5dc42bd6533555e5ecb848510d2b94bb7f0e55d4a0f89bcd20b073ed2c7f7a68be35b12cb6dbff6bc16fc9a4592ded2c339ada7fd SHA512 1b8bb0fe4eb93e31ec1770e90b94d44b5864c0391aad5dcba3a30d8e505d9b17107385414353c0060007f8a536254f49b8e919f36ddf6421a6e4330f817f1a3e
 DIST Python-3.13.1.tar.xz 22589692 BLAKE2B 161d5c0a7b4cacc4ce9983f9540a7e01662a7b76cbb34c5f3681582b0e7207574bdec5ad7bf79d820d8744b69bc2fb7196cf07a2ecadbfab6a158872f562741d SHA512 056c9b5fc0a6b540f41513d045f43c1ed463d15e0f345cecec703ec9c2335e53b4beb19de9c74ab2b236b023f934d5fd9ae7727a808634eaa01cfe66018a9a35
 DIST Python-3.13.1.tar.xz.asc 963 BLAKE2B 47cbfb6bceb92716181a0ed8f41742958568e62609fa4996d341e465bd6be0ebcab586ba1ebe275aa3a99108221be047fab66ec4b7e90af27d9db7524b6b4951 SHA512 1b56b7c2f547aa39c75c18978e174debb113444ce3f9da3829ba6842e3160051e0de70bd49d306b8014299aa8aa911d7c67efe71dd648c3528cf8d7535a01599
-DIST Python-3.14.0a1.tar.xz 22613224 BLAKE2B 1427d8a8e500bceb667852dd227bf00d1dc77cde6513e3202d5e0fb8e0019b4f214ac1ee1686e833d52f4200c667da573e84bea6eb19f463d018d484b82cfa9f SHA512 f96e8923662c1ba5ffb99673e59f5ce2366b13ea853e21e5a5c74efcf0a36f20d00612a9b882caf6482d2179b7315ae0331dcb45be19b7b9676f0ed4bf2256b8
-DIST Python-3.14.0a1.tar.xz.sigstore 4799 BLAKE2B 79c271a133e49f46aa478f9645a9c6998081538a05bd20395155c9b490cf13e11c47bb72a60f82b8297fb870af1c67922af648c9ba8fab6e3b31f7040991c39f SHA512 5115325d0a2f43bd0cc3d0888cad78deb90dfb36976c3341f0c237b15334883d1df3fee1dce53af7fe70ff9d630a98c9df4c2524f36183f61a74dd69f69e6257
-DIST Python-3.14.0a2.tar.xz 22696948 BLAKE2B e639838b44c0bc58522cc5344004ea6b1c6fc020eed48165a59693e34b0d5328fb861fb97b05008f04131335c138ee2dd569036b628b933deaf08e005e8e5259 SHA512 face78a7ef5d1a14b7e8c478125c660fe9745e793a5443932684c8426f0023324236c67ad73198e4286ba8793628452ae4d4d6332f007c009b285ba83ca1fc48
-DIST Python-3.14.0a2.tar.xz.sigstore 5035 BLAKE2B b97954a40f640170e049a62082be0cf77dc38ceb6bb2f0c8a122592b5bab4b71b17ad42496538d90703e81127d26e41f2f2522cef745837751fb62fa3590fd56 SHA512 1f5eba0cb8dffb73b351c91072dc91cfdb55f9c833c431b484f8f443a4913d94813e04f81f1dded4df989673dbd91abda8e8ebd6f4f00464725a634477452770
 DIST Python-3.14.0a3.tar.xz 22749680 BLAKE2B 4a0457a98fe1a35c01a4607c11eefeb7ef4f4a3bc7bd8b04e129137c1f7f7ee8806fe5561e88dbf8866f461f2d7d3577618b7918fb85a0e99f7c225fd4593778 SHA512 e26c9736f00af680b5f1ff1ba0f06562c48550836088d79dd8b4c97016d52f9f76979de32fa8556e9d750a5dad488643e897807ab6cb0c1424882151fe5f3337
 DIST Python-3.14.0a3.tar.xz.sigstore 4891 BLAKE2B c251bfc3e332174c5050c2d8524aea4865e28e73c39288ac151bea10e0039c3af545a26acc48b9ae8deed9befddb11e810103620be6a7934ea79e7b1f3182eb2 SHA512 dd7d6c543ba2ba8dc8d2a6c891adcf85de7eb857ceb3ffb33f5f06fbcf0a6bcd6517502cfd35acb86ec13d85d487313eb9a396d78c42d1c506d2261e1c4b861d
+DIST Python-3.14.0a4.tar.xz 22798932 BLAKE2B 4dd8632503e142456deefa749aa8d7a93b98c988bdfe905ae650e8e72b2a22de9e88b6d7ba65ec277748b4c8b919a176ca22552e9482f4883b96bf9129dd15c2 SHA512 b70671ebbd9f777fdcb661405c538c733600470ac34992a5b3df99d2f5afecc22cd8325eeec50eeef043181e634da91e535c166b9b5ed421d4e6aa41b79da3ab
+DIST Python-3.14.0a4.tar.xz.sigstore 4895 BLAKE2B 9a1c9ef623a0b8a7469d3fb56e0f73bf28947cb04ab797086962886d6e816e90c2df59e26af952e251c69e8e42c8888aa74bf866aebd7ff1a09526f3bd0d9472 SHA512 117dee2563607e4bc4190742d341f5b088e3feb205d59144b4a50bec1ec1c6df5f0118fbf88c8e78327f59d222ca7d98f31f1e5ff1d9488c0bbf01cd95df22ac
 DIST Python-3.8.20.tar.xz 18962788 BLAKE2B 715c75e0c0a3d3b77af7f07478311bb0554b80aac72915be703aa2d0dd6459a972e5669808e64da14a0b91bb183e00655055c1726f302dc3ccd8721e3b4ae3e6 SHA512 3c9341ee1fd33cb687958dcf2b7c0c7700489726c4d530c3e9d9537d46a6ab534541a4b312232d8505bea395a07e4518c42d75fb7571103e6b266f8f44115c61
 DIST Python-3.8.20.tar.xz.asc 833 BLAKE2B 5c86c15a1090b42e42bb7512565b1a7ad9d2137d59e9fd1ab0f83fdfc37dfcf184389418d6703db809e9c8c04a169af292665a2b58bf5dc61b7724ecbb4132d9 SHA512 a751ae0407a593d97acac4d5f8a0456580c753efa12a7d960125c219b4897fdb26fc1ffd43d8ea33ad1449162dd3b2904c16b6c51c57561ba73de3ffa62e0eed
 DIST Python-3.9.20.tar.xz 19648968 BLAKE2B 80a337ff406130599b8320068d11bc275d23473cedd7c85fcb9e40134f0f2d533be6e712139e788a6423cdc74cea938f306aa37c2a5099e3051f3e390159279c SHA512 c828f33edf1704e3149499d6d34e89264cb5cdb2b09ff05561641b359716d7996f0fe928629e09f006b1fd7850fdaf937275919c7fdd83f5efc32707c64d814b
@@ -31,25 +21,15 @@ DIST Python-3.9.20.tar.xz.asc 833 BLAKE2B bcd5a612281bf8e057e19db9105b199cb7e440
 DIST Python-3.9.21.tar.xz 19647056 BLAKE2B 7f77a7fb38d9a9f4fda7007587f744ade5f32b7bcd911dd72ab82b00d324173f28ddfbe492c71bf0f71edb8494e61314b4bf6f70298289b0e5796c6d002ff738 SHA512 cc84c967cd7a05361ec144d87ca044bd416032ee92dfb78658758d4e1274971f5fb288876d9c599a729bb21258974a786089341bce6bdcffd9c30ebd69b7ca58
 DIST Python-3.9.21.tar.xz.asc 833 BLAKE2B f6e666179d745638a38ace35e13c26cc3e07c116a8c8362cc260a74113cd29a5c1909d2091f2eed4bb088bc71b79ed18c5503739d1cc3cb7ff95d625f4311421 SHA512 1e5e5a5db8074a7ee5eb51e6c789d6e46467165d72d2d636d1fc0d3e15d4355051f9f7ad3063ba43b37b611095765c9d654ed890067c201c087da1eecb620ef9
 DIST python-gentoo-patches-2.7.18_p16.tar.xz 35448 BLAKE2B 0139c0944f62f9cdd236f6a8557e0ed19704c7d72869af1cb7d8bd3e646a746cd4a0201e1b44232a5e78ef49f254db20b0d0271bf744fbfd4fe0f1e99b8f3e6c SHA512 810be590d0e06fab4b2165e6852ca49662f09dcd7e20b47a29f613ad7653252c8dfac3f0eb228d77c8a914efa7c08788b2fbd552a4b47504f5fd0ec17450c48f
-DIST python-gentoo-patches-3.10.15_p1.tar.xz 24048 BLAKE2B 191c28ad9bc781d6f3077870e8d40ff98a47a64009ecfbbd10fe2b3c5330692181837fd3e9b336fd01f936a39160fc12761b2ef9bc00843248ab978cda2e2767 SHA512 4461e351c991694415e2812e558d6c3d3f79295358623dc955bc0839691a170d95a3efd31c0bf9f0d6191e4184d7b55fdb485b948d591782fef5b060d7660cce
-DIST python-gentoo-patches-3.10.15_p2.tar.xz 25284 BLAKE2B 24ecd523dba88915db130b174a5d692b9218decf81db7617ba016d4e21555cefa807e344a490110bcd3992637a95d0ce3179b219911417d29d008b4e2b5d7b33 SHA512 e1017b80272c57c18dbf7e1515d50fe13ead8de028d1ccaf1339a93ad4b0286f758979ee6f27011fa12350855cefdbdf049927bf2dd185905d4f3fe146c5bd68
 DIST python-gentoo-patches-3.10.16_p1.tar.xz 24964 BLAKE2B 93cf5d208f80f1017e4afdcf7d3551d150a1d68c378312af43c668156d98f10087d2b6f315f717823a9aae1114e2baa999f61ce179639e5511d30ed9620c9570 SHA512 74ad92d3256d744e3572c0d858b4ba4d5f0f6fda84d8f3c1a1fb675376c2d525e2d9fd636a65c8a859a0a312eda00877b13ba311f620b6a51e47dfb082843333
-DIST python-gentoo-patches-3.11.10_p1.tar.xz 10592 BLAKE2B 1cc02d22b55cb76beba133c37e6db3b9ba12b11cd8776acb064f14431842405cbc9efb5a06319cff1c73d9178ddbbe2e340829d4628c88a9589aa2fc1d308f80 SHA512 7ddb08e4d8a9173a26fa18de687a4c85c3d460e2bc595da6f4b15cfe3be264ccdc7d61d5fed1e7a82f256d21caf3ea7de87f774fde61a9d37bed15f86f546adb
 DIST python-gentoo-patches-3.11.11_p1.tar.xz 11644 BLAKE2B d080e1b987ea0e1b397113f20a5c84f6a34d6619a3ed9f7389fd10d95636169563fba97d212477ca7f9b93d2bd0b66c9521fc61963bb468805a661ca3ab287a7 SHA512 f6045adf25923053fc9a60506b9164c9c062580d6886f1a3dcaca00dc4affe69aa9e138f8ce93f093798ccf33322ccca2aca674ab87457df98a93dcaca234b44
-DIST python-gentoo-patches-3.12.6_p2.tar.xz 8144 BLAKE2B 2f36ce972e0b3e2884c9df629e3aeb1af05e4c77dffb866ff28e08a0a7df3c7cf36a9de250d148d909c07fd5bad483c95b3267818657c04e7d0d6fe512e21f9a SHA512 caa86c6cf693f9293b3aa8944452d117b78c1c3f8d6a6aa658cb5c2d2ffb0cecc6cf14b293872bd2101766ee7167ba88183904b2814090f8cbc64c1fa3b771be
-DIST python-gentoo-patches-3.12.6_p4-r1.tar.xz 9072 BLAKE2B 831f6c4284035832e0536ad3211d10c078e6c356e1fa593dd45984b29253deaf703bcb71e1b488508992dd37d5a140591c9193f1620bb966e39b048e4d5c6746 SHA512 9c61e0396c98fb45f3dccad9165e3f2b7bbeabd4a6fe88cc6e05a9d3012e39068571e63527dc831efaf24cb0e8fee75f60454481b2d1a0a44bedba69a7ed5c95
-DIST python-gentoo-patches-3.12.7_p1-r3.tar.xz 11416 BLAKE2B e12c2e626986fcedc03ee9826419f831d3e2e4eace58b53184b3f0faa53c09e57e22bfe894e2eda305c7f931f7a497c0bc4db0a249079599a4a76d63cdd0a8a5 SHA512 d3f56e8971d7da4d39726934ab4396382610b6620983657a84e29cf98b10c489408b8465a89db6d4a5664a89b3c58544fba946e011dc059a43e9c86cbb13a6eb
 DIST python-gentoo-patches-3.12.8.tar.xz 10772 BLAKE2B 9833b5ee6c307a4aa1335fd966fcd64a0f3732a97a190abdd3121b3496ea68ead9436af4ec5e3e8c0e781fd68df41403a1b2e5f29f264fc8569a883141e5f7f9 SHA512 d5906845a6259f7349a0299e185f569750b493c64ea1f6537dc8bfc0babc9b54de7db1c4f1b5b6ec2f7076937ad07ca0ca9c4941bbb8d542da6c687957bdbd5e
 DIST python-gentoo-patches-3.12.8_p1.tar.xz 11088 BLAKE2B 4d7ccf4759b624aafde1ef2a0a341cda8f4d3e7c4d86586201a910d77327219e61b134985f2fe85e83892ad4ba607b4e661aed675cc038e4cc193efe9fbe6f6e SHA512 6f1d6ab2b9e958ae7d2ca3f204b7c7eb1435998919cf5a577a82bbf1339232f92a2f517c248afb9e1802850acd2b59b84c41e87f4b8582e19ec88155743cdaae
 DIST python-gentoo-patches-3.13.0.tar.xz 8316 BLAKE2B 8fb8ba8f41f310140ad7066b614952023112d5043e5d82058364125611785144c1843e87eecb7669bcbab51c40d0694069526219f7419a7009517ce0821b74ba SHA512 0eb31ebfa3411020aa70b3b66fd7eec98b4b7a686b0e8f1f7ed76a8186a7c1ee85ccd9565a86a1d7ec13b975855eeb7303036af05e2dfdce3d64e4ad99299df4
 DIST python-gentoo-patches-3.13.1.tar.xz 8320 BLAKE2B 2fef9c501df7ed7603eabb3e01a8c3bde5bcfae3a8ac9bbe772b458cb04ffa9598cf38f3a74f6dcbcda29e7bd294d664b8fb12f7ddd9e0e42ed6268300947bb0 SHA512 419e1f12daaf19ed2d2195699b5e8c2c604779562d84d6a68adb4016dcb13fc3e0383ccc4b01eb153930600e6c9cdcc518929ffce3d6343019226a6111e9d617
 DIST python-gentoo-patches-3.13.1_p1.tar.xz 8672 BLAKE2B d35b8b47c6d549753d9a764fbc3538cb6517c809e69901f3221110ccbb0ea9eed10ba1f1637a5ffe4f90d8c3932f53815c7dcf844a7350ad89458763bf0aeea1 SHA512 0505bc1f7c8e264fdcad5459900e37d12ed9bea57e615ea42492fa211d3f0641e79c3e711a6970cd34a3a6275f36a22ed7ba64fd71c988bcdaebfcefc7b6a1d2
-DIST python-gentoo-patches-3.14.0a1-r2.tar.xz 6008 BLAKE2B bb833fb522e008eb79355fd13952c4fc3efc4684e9a2f26680d57b2bb137d25b461ce34ac7cbf0a7c64a558fa2cd63ad393f23cb90f620395efefd1c01bf01f5 SHA512 60568f83765f8045c789391b1f44ab6ac633a00ca84a6c93afb6067294093dd87a262feb6ea1d0879ed90bcdfa7d02054da5974cb9218686fbe629bdf11d0792
-DIST python-gentoo-patches-3.14.0a2.tar.xz 6032 BLAKE2B 60f5b702feca8c967b0baff906d31b8d2e9788fed0a717292d73d7c2497972d785257ba58248815af10608ef4f5491f11e42715e84885c1548e7744cba4d2bee SHA512 306fd779e139994a3bd64d4ac638f5473b8998739363b5fc2ea2e89caef5b02192226a53c8ea9a03438657733db81c87d31ee4ecb3b3c2f86a9643a3f64b498c
 DIST python-gentoo-patches-3.14.0a3.tar.xz 6036 BLAKE2B bbcb3f31acb533b8291f4cedcb89c0501a7054bbf1f98ea000c43e5a99e3b8bd160c6fb81e28bad90c85dd0256d523f72b9e25f30c30b5b5e9d60a9055a612d1 SHA512 9f87b3f1f326f88c924c49e37f39f63314199cfc354d452fef860ab36e143145a2c1d832c1b7d4357ade1c1090de00086bc5d6a9d7981bad210a99ffcfa2a858
-DIST python-gentoo-patches-3.8.20_p2.tar.xz 42296 BLAKE2B c0f2c4d0adcb6c10eb68342b911016666cb68308717a5ca1369100a39229ce16c6e9dfdf9e1b4cffe0191d03ca5ee7d9568cd24885fd0f4f32f14e2e8c0a96a3 SHA512 cb9e98c0dd823b6e4f8a60e9095ab58e596cd9411b675678a0d4adefc92b37e14cecc7cecb82e287ac34a9ce1d4595f261b0736bcc9fc62c43c7d8c0b3be70e7
-DIST python-gentoo-patches-3.8.20_p4.tar.xz 43816 BLAKE2B 9bbc86a49816b79e52cfa90e0a136faead48ad0c8017858fb380da752d6e801e18fe08a0c4c492560c79c1e70778daed2fa5bba8dd92f2b23bd45acd518e5c84 SHA512 59bcfc8c98fe9c5740d031697a04dcee6994e7dfbc9d1920bc4782b539525bcd8b006e971fc1e473ffc2dc0aba12564dc6240048dd64ab244c5c8d11ce42f946
+DIST python-gentoo-patches-3.14.0a4.tar.xz 7452 BLAKE2B 5d3b0dc6f9c2f0ffeac50e4af1915a8d8ec29350c56203ec66d6580ae705a23316f4c85f28908000c50c58eb3400e63ff379ba26d219f48ca7f559633ba4c153 SHA512 0e571f6693e44f439c7ac499216f4cf70e487768116290c24ee66323c9113fc91d0b4b68c79d1d549d0a14fcee4f79ddc377dfd87932dfcf00c5c11d3784bedc
 DIST python-gentoo-patches-3.8.20_p6.tar.xz 50876 BLAKE2B df0df21c75972fb73e36f66f0c90d3f953b14d7a59bf97ce4214dce6e6d937ed52fbf3db8f3eaf42cde141bfe4d7a731b06e41723285517461c790912706be9e SHA512 48ef567f6972e7975cb61d34a876d8c0db42f1a3c0b832f9366091dd5f2ca854c02887808843d314816c8cf6d7b0738c40e7835fedbba7b84e57f2515dde45e2
-DIST python-gentoo-patches-3.9.20_p1.tar.xz 34944 BLAKE2B 332454661adc03033c7e8a5fcc91081b7d405826e9bf89bb2c2e178a0795e4415c9e87ae923756470ee973441f242e194b397354964b8f43dadd4965d210a4f4 SHA512 19bf7227535526a733633723b75d49786dfd8738595c1115b4e05665bc13a1ea70cbf0cc62cb27e81c75f5db2aa56ab985eaa5abde6243697caccb2cb5288005
 DIST python-gentoo-patches-3.9.20_p2.tar.xz 36140 BLAKE2B af0a9e08f3bfd8eb631760d100ec8f54db968a6bd201820192c4ea63ec88e0f83ffe77c709fcf4da43ad8d44eeb239ca1984561c3e7846e3fe4edd757d2321a4 SHA512 d451b41401de631eed996c34f40f2146d4d2f11bfa04fffa762c9b654e690d0ef95be0f51224a964a7c33784bb9b21e58434f6fee17cf39c20b5af34200569d5
 DIST python-gentoo-patches-3.9.21_p1.tar.xz 35404 BLAKE2B 7b5ac27e814b06791fa5f0566763711c1b65a7c82ba66f97e237eebc6076f0bfdad3d8269ece6c4d4c238b62cc75b01f68ea3a5d7c4fffc46e88f79b2ba3e7fc SHA512 92c8548b31100a921378c72cc94a81062c96fd795fa2cd001c57a71e4af39e91b21b99e9e84db12adb142d9c4bda809445519c5c8a35545bd10230926bd7eded
diff --git a/dev-lang/python/python-3.10.15_p1.ebuild b/dev-lang/python/python-3.10.15_p1.ebuild
deleted file mode 100644
index c1e3463af7a9..000000000000
--- a/dev-lang/python/python-3.10.15_p1.ebuild
+++ /dev/null
@@ -1,595 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit prefix python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm libedit
-	+ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-libs/mpdecimal:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	valgrind? ( dev-debug/valgrind )
-	test? ( app-arch/xz-utils )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	dev-build/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# https://bugs.gentoo.org/850151
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs)
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-build_cbuild_python() {
-	# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-	local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	#
-	# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
-	local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
-	local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-	local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
-	local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
-
-	# We need to build our own Python on CBUILD first, and feed it in.
-	# bug #847910 and bug #864911.
-	local myeconfargs_cbuild=(
-		"${myeconfargs[@]}"
-
-		--prefix="${BROOT}"/usr
-		--libdir="${cbuild_libdir:2}"
-
-		# Avoid needing to load the right libpython.so.
-		--disable-shared
-
-		# As minimal as possible for the mini CBUILD Python
-		# we build just for cross.
-		--without-lto
-		--disable-optimizations
-	)
-
-	mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-	pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-	# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
-	# libdir correctly for cross.
-	PYTHON_DISABLE_MODULES+=" _ctypes _crypt" \
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-	# Avoid as many dependencies as possible for the cross build.
-	cat >> Makefile <<-EOF || die
-		MODULE_NIS=disabled
-		MODULE__DBM=disabled
-		MODULE__GDBM=disabled
-		MODULE__DBM=disabled
-		MODULE__SQLITE3=disabled
-		MODULE__HASHLIB=disabled
-		MODULE__SSL=disabled
-		MODULE__CURSES=disabled
-		MODULE__CURSES_PANEL=disabled
-		MODULE_READLINE=disabled
-		MODULE__TKINTER=disabled
-		MODULE_PYEXPAT=disabled
-		MODULE_ZLIB=disabled
-	EOF
-
-	# Unfortunately, we do have to build this immediately, and
-	# not in src_compile, because CHOST configure for Python
-	# will check the existence of the Python it was pointed to
-	# immediately.
-	PYTHON_DISABLE_MODULES+=" _ctypes _crypt" emake
-	popd &> /dev/null || die
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-	local disable
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	# Set baseline test skip flags.
-	COMMON_TEST_SKIPS=(
-		-x test_gdb
-	)
-
-	# Arch-specific skips.  See #931888 for a collection of these.
-	case ${CHOST} in
-		alpha*)
-			COMMON_TEST_SKIPS+=(
-				-x test_builtin
-				-x test_capi
-				-x test_cmath
-				-x test_float
-				# timeout
-				-x test_free_threading
-				-x test_math
-				-x test_numeric_tower
-				-x test_random
-				-x test_statistics
-				# bug 653850
-				-x test_resource
-				-x test_strtod
-			)
-			;;
-		mips*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-				-x test_statistics
-			)
-			;;
-		powerpc64-*) # big endian
-			COMMON_TEST_SKIPS+=(
-				-x test_descr
-			)
-			;;
-		riscv*)
-			COMMON_TEST_SKIPS+=(
-				-x test_urllib2
-			)
-			;;
-		sparc*)
-			COMMON_TEST_SKIPS+=(
-				# bug 788022
-				-x test_multiprocessing_fork
-				-x test_multiprocessing_forkserver
-				-x test_multiprocessing_spawn
-
-				-x test_ctypes
-				-x test_descr
-				# bug 931908
-				-x test_exceptions
-			)
-			;;
-	esac
-
-	# musl-specific skips
-	use elibc_musl && COMMON_TEST_SKIPS+=(
-		# various musl locale deficiencies
-		-x test__locale
-		-x test_c_locale_coercion
-		-x test_locale
-		-x test_re
-
-		# known issues with find_library on musl
-		# https://bugs.python.org/issue21622
-		-x test_ctypes
-
-		# fpathconf, ttyname errno values
-		-x test_os
-	)
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			"${COMMON_TEST_SKIPS[@]}"
-
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_concurrent_futures
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-		)
-
-		# Arch-specific skips.  See #931888 for a collection of these.
-		case ${CHOST} in
-			alpha*)
-				profile_task_flags+=(
-					-x test_os
-				)
-				;;
-			hppa*)
-				profile_task_flags+=(
-					-x test_descr
-					# bug 931908
-					-x test_exceptions
-					-x test_os
-				)
-				;;
-			powerpc64-*) # big endian
-				profile_task_flags+=(
-					# bug 931908
-					-x test_exceptions
-				)
-				;;
-			riscv*)
-				profile_task_flags+=(
-					-x test_statistics
-				)
-				;;
-		esac
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--without-lto
-		--with-system-expat
-		--with-system-ffi
-		--with-system-libmpdec
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	# https://bugs.gentoo.org/700012
-	if tc-is-lto; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-		myeconfargs+=(
-			--with-lto
-		)
-	fi
-
-	if tc-is-cross-compiler ; then
-		build_cbuild_python
-		# Point the imminent CHOST build to the Python we just
-		# built for CBUILD.
-		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	hprefixify setup.py
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	# Gentoo hack to disable accessing system site-packages
-	export GENTOO_CPYTHON_BUILD=1
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-		local -x TMPDIR=/tmp
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	local test_opts=(
-		--verbose3
-		-u-network
-		-j "$(makeopts_jobs)"
-		"${COMMON_TEST_SKIPS[@]}"
-	)
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x TMPDIR=/tmp
-
-	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" TEST_MODULES=no altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.10.15_p2.ebuild b/dev-lang/python/python-3.10.15_p2.ebuild
deleted file mode 100644
index c1e3463af7a9..000000000000
--- a/dev-lang/python/python-3.10.15_p2.ebuild
+++ /dev/null
@@ -1,595 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit prefix python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm libedit
-	+ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-libs/mpdecimal:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	valgrind? ( dev-debug/valgrind )
-	test? ( app-arch/xz-utils )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	dev-build/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# https://bugs.gentoo.org/850151
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs)
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-build_cbuild_python() {
-	# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-	local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	#
-	# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
-	local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
-	local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-	local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
-	local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
-
-	# We need to build our own Python on CBUILD first, and feed it in.
-	# bug #847910 and bug #864911.
-	local myeconfargs_cbuild=(
-		"${myeconfargs[@]}"
-
-		--prefix="${BROOT}"/usr
-		--libdir="${cbuild_libdir:2}"
-
-		# Avoid needing to load the right libpython.so.
-		--disable-shared
-
-		# As minimal as possible for the mini CBUILD Python
-		# we build just for cross.
-		--without-lto
-		--disable-optimizations
-	)
-
-	mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-	pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-	# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
-	# libdir correctly for cross.
-	PYTHON_DISABLE_MODULES+=" _ctypes _crypt" \
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-	# Avoid as many dependencies as possible for the cross build.
-	cat >> Makefile <<-EOF || die
-		MODULE_NIS=disabled
-		MODULE__DBM=disabled
-		MODULE__GDBM=disabled
-		MODULE__DBM=disabled
-		MODULE__SQLITE3=disabled
-		MODULE__HASHLIB=disabled
-		MODULE__SSL=disabled
-		MODULE__CURSES=disabled
-		MODULE__CURSES_PANEL=disabled
-		MODULE_READLINE=disabled
-		MODULE__TKINTER=disabled
-		MODULE_PYEXPAT=disabled
-		MODULE_ZLIB=disabled
-	EOF
-
-	# Unfortunately, we do have to build this immediately, and
-	# not in src_compile, because CHOST configure for Python
-	# will check the existence of the Python it was pointed to
-	# immediately.
-	PYTHON_DISABLE_MODULES+=" _ctypes _crypt" emake
-	popd &> /dev/null || die
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-	local disable
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	# Set baseline test skip flags.
-	COMMON_TEST_SKIPS=(
-		-x test_gdb
-	)
-
-	# Arch-specific skips.  See #931888 for a collection of these.
-	case ${CHOST} in
-		alpha*)
-			COMMON_TEST_SKIPS+=(
-				-x test_builtin
-				-x test_capi
-				-x test_cmath
-				-x test_float
-				# timeout
-				-x test_free_threading
-				-x test_math
-				-x test_numeric_tower
-				-x test_random
-				-x test_statistics
-				# bug 653850
-				-x test_resource
-				-x test_strtod
-			)
-			;;
-		mips*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-				-x test_statistics
-			)
-			;;
-		powerpc64-*) # big endian
-			COMMON_TEST_SKIPS+=(
-				-x test_descr
-			)
-			;;
-		riscv*)
-			COMMON_TEST_SKIPS+=(
-				-x test_urllib2
-			)
-			;;
-		sparc*)
-			COMMON_TEST_SKIPS+=(
-				# bug 788022
-				-x test_multiprocessing_fork
-				-x test_multiprocessing_forkserver
-				-x test_multiprocessing_spawn
-
-				-x test_ctypes
-				-x test_descr
-				# bug 931908
-				-x test_exceptions
-			)
-			;;
-	esac
-
-	# musl-specific skips
-	use elibc_musl && COMMON_TEST_SKIPS+=(
-		# various musl locale deficiencies
-		-x test__locale
-		-x test_c_locale_coercion
-		-x test_locale
-		-x test_re
-
-		# known issues with find_library on musl
-		# https://bugs.python.org/issue21622
-		-x test_ctypes
-
-		# fpathconf, ttyname errno values
-		-x test_os
-	)
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			"${COMMON_TEST_SKIPS[@]}"
-
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_concurrent_futures
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-		)
-
-		# Arch-specific skips.  See #931888 for a collection of these.
-		case ${CHOST} in
-			alpha*)
-				profile_task_flags+=(
-					-x test_os
-				)
-				;;
-			hppa*)
-				profile_task_flags+=(
-					-x test_descr
-					# bug 931908
-					-x test_exceptions
-					-x test_os
-				)
-				;;
-			powerpc64-*) # big endian
-				profile_task_flags+=(
-					# bug 931908
-					-x test_exceptions
-				)
-				;;
-			riscv*)
-				profile_task_flags+=(
-					-x test_statistics
-				)
-				;;
-		esac
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--without-lto
-		--with-system-expat
-		--with-system-ffi
-		--with-system-libmpdec
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	# https://bugs.gentoo.org/700012
-	if tc-is-lto; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-		myeconfargs+=(
-			--with-lto
-		)
-	fi
-
-	if tc-is-cross-compiler ; then
-		build_cbuild_python
-		# Point the imminent CHOST build to the Python we just
-		# built for CBUILD.
-		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	hprefixify setup.py
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	# Gentoo hack to disable accessing system site-packages
-	export GENTOO_CPYTHON_BUILD=1
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-		local -x TMPDIR=/tmp
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	local test_opts=(
-		--verbose3
-		-u-network
-		-j "$(makeopts_jobs)"
-		"${COMMON_TEST_SKIPS[@]}"
-	)
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x TMPDIR=/tmp
-
-	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" TEST_MODULES=no altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.10.16_p1.ebuild b/dev-lang/python/python-3.10.16_p1.ebuild
index e517b6f34685..2e9d941cb3d9 100644
--- a/dev-lang/python/python-3.10.16_p1.ebuild
+++ b/dev-lang/python/python-3.10.16_p1.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"
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm libedit
 	+ncurses pgo +readline +sqlite +ssl test tk valgrind
@@ -460,7 +460,7 @@ src_compile() {
 		# bug 660358
 		local -x COLUMNS=80
 		local -x PYTHONDONTWRITEBYTECODE=
-		local -x TMPDIR=/tmp
+		local -x TMPDIR=/var/tmp
 	fi
 
 	# also need to clear the flags explicitly here or they end up
@@ -495,7 +495,7 @@ src_test() {
 	# bug 660358
 	local -x COLUMNS=80
 	local -x PYTHONDONTWRITEBYTECODE=
-	local -x TMPDIR=/tmp
+	local -x TMPDIR=/var/tmp
 
 	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
 		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
diff --git a/dev-lang/python/python-3.11.10_p1.ebuild b/dev-lang/python/python-3.11.10_p1.ebuild
deleted file mode 100644
index 01efe0b7c609..000000000000
--- a/dev-lang/python/python-3.11.10_p1.ebuild
+++ /dev/null
@@ -1,629 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit prefix python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm libedit
-	+ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-crypt/libb2
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-libs/mpdecimal:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils )
-	valgrind? ( dev-debug/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	dev-build/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# https://bugs.gentoo.org/850151
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs)
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-build_cbuild_python() {
-	# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-	local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	#
-	# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
-	local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
-	local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-	local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
-	local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
-
-	# We need to build our own Python on CBUILD first, and feed it in.
-	# bug #847910
-	local myeconfargs_cbuild=(
-		"${myeconfargs[@]}"
-
-		--prefix="${BROOT}"/usr
-		--libdir="${cbuild_libdir:2}"
-
-		# Avoid needing to load the right libpython.so.
-		--disable-shared
-
-		# As minimal as possible for the mini CBUILD Python
-		# we build just for cross to satisfy --with-build-python.
-		--without-lto
-		--without-readline
-		--disable-optimizations
-	)
-
-	mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-	pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-	# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
-	# libdir correctly for cross.
-	PYTHON_DISABLE_MODULES+=" _ctypes _crypt" \
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-	# Avoid as many dependencies as possible for the cross build.
-	cat >> Makefile <<-EOF || die
-		MODULE_NIS_STATE=disabled
-		MODULE__DBM_STATE=disabled
-		MODULE__GDBM_STATE=disabled
-		MODULE__DBM_STATE=disabled
-		MODULE__SQLITE3_STATE=disabled
-		MODULE__HASHLIB_STATE=disabled
-		MODULE__SSL_STATE=disabled
-		MODULE__CURSES_STATE=disabled
-		MODULE__CURSES_PANEL_STATE=disabled
-		MODULE_READLINE_STATE=disabled
-		MODULE__TKINTER_STATE=disabled
-		MODULE_PYEXPAT_STATE=disabled
-		MODULE_ZLIB_STATE=disabled
-	EOF
-
-	# Unfortunately, we do have to build this immediately, and
-	# not in src_compile, because CHOST configure for Python
-	# will check the existence of the --with-build-python value
-	# immediately.
-	PYTHON_DISABLE_MODULES+=" _ctypes _crypt" emake
-	popd &> /dev/null || die
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	# Set baseline test skip flags.
-	COMMON_TEST_SKIPS=(
-		# this is actually test_gdb.test_pretty_print
-		-x test_pretty_print
-	)
-
-	# Arch-specific skips.  See #931888 for a collection of these.
-	case ${CHOST} in
-		alpha*)
-			COMMON_TEST_SKIPS+=(
-				-x test_builtin
-				-x test_capi
-				-x test_cmath
-				-x test_float
-				# timeout
-				-x test_free_threading
-				-x test_math
-				-x test_numeric_tower
-				-x test_random
-				-x test_statistics
-				# bug 653850
-				-x test_resource
-				-x test_strtod
-			)
-			;;
-		mips*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-				-x test_statistics
-			)
-			;;
-		powerpc64-*) # big endian
-			COMMON_TEST_SKIPS+=(
-				-x test_descr
-				-x test_gdb
-			)
-			;;
-		riscv*)
-			COMMON_TEST_SKIPS+=(
-				-x test_urllib2
-			)
-			;;
-		sparc*)
-			COMMON_TEST_SKIPS+=(
-				# bug 788022
-				-x test_multiprocessing_fork
-				-x test_multiprocessing_forkserver
-				-x test_multiprocessing_spawn
-
-				-x test_ctypes
-				-x test_descr
-				-x test_gdb
-				# bug 931908
-				-x test_exceptions
-			)
-			;;
-	esac
-
-	# musl-specific skips
-	use elibc_musl && COMMON_TEST_SKIPS+=(
-		# various musl locale deficiencies
-		-x test__locale
-		-x test_c_locale_coercion
-		-x test_locale
-		-x test_re
-
-		# known issues with find_library on musl
-		# https://bugs.python.org/issue21622
-		-x test_ctypes
-
-		# fpathconf, ttyname errno values
-		-x test_os
-	)
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			"${COMMON_TEST_SKIPS[@]}"
-
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_concurrent_futures
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-		)
-
-		# Arch-specific skips.  See #931888 for a collection of these.
-		case ${CHOST} in
-			alpha*)
-				profile_task_flags+=(
-					-x test_os
-				)
-				;;
-			hppa*)
-				profile_task_flags+=(
-					-x test_descr
-					# bug 931908
-					-x test_exceptions
-					-x test_os
-				)
-				;;
-			powerpc64-*) # big endian
-				profile_task_flags+=(
-					# bug 931908
-					-x test_exceptions
-				)
-				;;
-			riscv*)
-				profile_task_flags+=(
-					-x test_statistics
-				)
-				;;
-		esac
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--without-lto
-		--with-system-expat
-		--with-system-ffi
-		--with-system-libmpdec
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	# https://bugs.gentoo.org/700012
-	if tc-is-lto; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-		myeconfargs+=(
-			--with-lto
-		)
-	fi
-
-	if tc-is-cross-compiler ; then
-		build_cbuild_python
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	hprefixify setup.py
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# force-disable modules we don't want built
-	local disable_modules=( NIS )
-	use gdbm || disable_modules+=( _GDBM _DBM )
-	use sqlite || disable_modules+=( _SQLITE3 )
-	use ssl || disable_modules+=( _HASHLIB _SSL )
-	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
-	use readline || disable_modules+=( READLINE )
-	use tk || disable_modules+=( _TKINTER )
-
-	local mod
-	for mod in "${disable_modules[@]}"; do
-		echo "MODULE_${mod}_STATE=disabled"
-	done >> Makefile || die
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	# Gentoo hack to disable accessing system site-packages
-	export GENTOO_CPYTHON_BUILD=1
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-		local -x TMPDIR=/tmp
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		--verbose3
-		-u-network
-		-j "$(makeopts_jobs)"
-		"${COMMON_TEST_SKIPS[@]}"
-	)
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x TMPDIR=/tmp
-
-	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" TEST_MODULES=no altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
-			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
-			ewarn "installed previously are no longer valid and will be regenerated"
-			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
-			ewarn "when installing some packages and checksum mismatches when removing"
-			ewarn "old versions.  To actively prevent this, rebuild all packages"
-			ewarn "installing Python 3.11 modules, e.g. using:"
-			ewarn
-			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
-		fi
-	done
-}
diff --git a/dev-lang/python/python-3.11.11_p1.ebuild b/dev-lang/python/python-3.11.11_p1.ebuild
index 7b0a45c83096..2c83f81efcfa 100644
--- a/dev-lang/python/python-3.11.11_p1.ebuild
+++ b/dev-lang/python/python-3.11.11_p1.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"
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm libedit
 	+ncurses pgo +readline +sqlite +ssl test tk valgrind
diff --git a/dev-lang/python/python-3.12.6_p2.ebuild b/dev-lang/python/python-3.12.6_p2.ebuild
deleted file mode 100644
index 2785f6584a3f..000000000000
--- a/dev-lang/python/python-3.12.6_p2.ebuild
+++ /dev/null
@@ -1,610 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm libedit
-	+ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-crypt/libb2
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-libs/mpdecimal:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-pip )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? (
-		app-arch/xz-utils
-		dev-python/ensurepip-pip
-		dev-python/ensurepip-setuptools
-		dev-python/ensurepip-wheel
-	)
-	valgrind? ( dev-debug/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	dev-build/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	# TODO: Makefile has annoying deps on expat headers
-	#rm -r Modules/expat || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
-
-	# breaks tests when using --with-wheel-pkg-dir
-	rm -r Lib/test/wheeldata || die
-
-	eautoreconf
-}
-
-build_cbuild_python() {
-	# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-	local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	#
-	# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
-	local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
-	local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-	local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
-	local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
-
-	# We need to build our own Python on CBUILD first, and feed it in.
-	# bug #847910
-	local myeconfargs_cbuild=(
-		"${myeconfargs[@]}"
-
-		--prefix="${BROOT}"/usr
-		--libdir="${cbuild_libdir:2}"
-
-		# Avoid needing to load the right libpython.so.
-		--disable-shared
-
-		# As minimal as possible for the mini CBUILD Python
-		# we build just for cross to satisfy --with-build-python.
-		--without-lto
-		--without-readline
-		--disable-optimizations
-	)
-
-	mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-	pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-
-	# Avoid as many dependencies as possible for the cross build.
-	mkdir Modules || die
-	cat > Modules/Setup.local <<-EOF || die
-		*disabled*
-		nis
-		_dbm _gdbm
-		_sqlite3
-		_hashlib _ssl
-		_curses _curses_panel
-		readline
-		_tkinter
-		pyexpat
-		zlib
-		# We disabled these for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross. This should be rechecked for the pure Makefile approach,
-		# and uncommented if needed.
-		#_ctypes _crypt
-	EOF
-
-	ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-	# Unfortunately, we do have to build this immediately, and
-	# not in src_compile, because CHOST configure for Python
-	# will check the existence of the --with-build-python value
-	# immediately.
-	emake
-	popd &> /dev/null || die
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	# Set baseline test skip flags.
-	COMMON_TEST_SKIPS=(
-		# this is actually test_gdb.test_pretty_print
-		-x test_pretty_print
-	)
-
-	# Arch-specific skips.  See #931888 for a collection of these.
-	case ${CHOST} in
-		alpha*)
-			COMMON_TEST_SKIPS+=(
-				-x test_builtin
-				-x test_capi
-				-x test_cmath
-				-x test_float
-				# timeout
-				-x test_free_threading
-				-x test_math
-				-x test_numeric_tower
-				-x test_random
-				-x test_statistics
-				# bug 653850
-				-x test_resource
-				-x test_strtod
-			)
-			;;
-		mips*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-				-x test_statistics
-			)
-			;;
-		powerpc64-*) # big endian
-			COMMON_TEST_SKIPS+=(
-				-x test_descr
-			)
-			;;
-		riscv*)
-			COMMON_TEST_SKIPS+=(
-				-x test_urllib2
-			)
-			;;
-		sparc*)
-			COMMON_TEST_SKIPS+=(
-				# bug 788022
-				-x test_multiprocessing_fork
-				-x test_multiprocessing_forkserver
-				-x test_multiprocessing_spawn
-
-				-x test_ctypes
-				-x test_descr
-				# bug 931908
-				-x test_exceptions
-			)
-			;;
-	esac
-
-	# musl-specific skips
-	use elibc_musl && COMMON_TEST_SKIPS+=(
-		# various musl locale deficiencies
-		-x test__locale
-		-x test_c_locale_coercion
-		-x test_locale
-		-x test_re
-
-		# known issues with find_library on musl
-		# https://bugs.python.org/issue21622
-		-x test_ctypes
-
-		# fpathconf, ttyname errno values
-		-x test_os
-	)
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			"${COMMON_TEST_SKIPS[@]}"
-
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_concurrent_futures
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-		)
-
-		# Arch-specific skips.  See #931888 for a collection of these.
-		case ${CHOST} in
-			alpha*)
-				profile_task_flags+=(
-					-x test_os
-				)
-				;;
-			hppa*)
-				profile_task_flags+=(
-					-x test_descr
-					# bug 931908
-					-x test_exceptions
-					-x test_os
-				)
-				;;
-			powerpc64-*) # big endian
-				profile_task_flags+=(
-					# bug 931908
-					-x test_exceptions
-				)
-				;;
-			riscv*)
-				profile_task_flags+=(
-					-x test_statistics
-				)
-				;;
-		esac
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--without-lto
-		--with-system-expat
-		--with-system-libmpdec
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# https://bugs.gentoo.org/700012
-	if tc-is-lto; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-		myeconfargs+=(
-			--with-lto
-		)
-	fi
-
-	# Force-disable modules we don't want built.
-	# See Modules/Setup for docs on how this works. Setup.local contains our local deviations.
-	cat > Modules/Setup.local <<-EOF || die
-		*disabled*
-		nis
-		$(usev !gdbm '_gdbm _dbm')
-		$(usev !sqlite '_sqlite3')
-		$(usev !ssl '_hashlib _ssl')
-		$(usev !ncurses '_curses _curses_panel')
-		$(usev !readline 'readline')
-		$(usev !tk '_tkinter')
-	EOF
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		build_cbuild_python
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	# Gentoo hack to disable accessing system site-packages
-	export GENTOO_CPYTHON_BUILD=1
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		--verbose3
-		-u-network
-		-j "$(makeopts_jobs)"
-		"${COMMON_TEST_SKIPS[@]}"
-	)
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# the Makefile rules are broken
-	# https://github.com/python/cpython/issues/100221
-	mkdir -p "${libdir}"/lib-dynload || die
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" TEST_MODULES=no altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.12.6_p4.ebuild b/dev-lang/python/python-3.12.6_p4.ebuild
deleted file mode 100644
index 60ec13d3da2e..000000000000
--- a/dev-lang/python/python-3.12.6_p4.ebuild
+++ /dev/null
@@ -1,607 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}-r1"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm libedit
-	+ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-crypt/libb2
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-libs/mpdecimal:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-pip )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? (
-		app-arch/xz-utils
-		dev-python/ensurepip-pip
-		dev-python/ensurepip-setuptools
-		dev-python/ensurepip-wheel
-	)
-	valgrind? ( dev-debug/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	dev-build/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	# TODO: Makefile has annoying deps on expat headers
-	#rm -r Modules/expat || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
-
-	# breaks tests when using --with-wheel-pkg-dir
-	rm -r Lib/test/wheeldata || die
-
-	eautoreconf
-}
-
-build_cbuild_python() {
-	# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-	local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	#
-	# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
-	local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
-	local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-	local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
-	local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
-
-	# We need to build our own Python on CBUILD first, and feed it in.
-	# bug #847910
-	local myeconfargs_cbuild=(
-		"${myeconfargs[@]}"
-
-		--prefix="${BROOT}"/usr
-		--libdir="${cbuild_libdir:2}"
-
-		# Avoid needing to load the right libpython.so.
-		--disable-shared
-
-		# As minimal as possible for the mini CBUILD Python
-		# we build just for cross to satisfy --with-build-python.
-		--without-lto
-		--without-readline
-		--disable-optimizations
-	)
-
-	mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-	pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-
-	# Avoid as many dependencies as possible for the cross build.
-	mkdir Modules || die
-	cat > Modules/Setup.local <<-EOF || die
-		*disabled*
-		nis
-		_dbm _gdbm
-		_sqlite3
-		_hashlib _ssl
-		_curses _curses_panel
-		readline
-		_tkinter
-		pyexpat
-		zlib
-		# We disabled these for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross. This should be rechecked for the pure Makefile approach,
-		# and uncommented if needed.
-		#_ctypes _crypt
-	EOF
-
-	ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-	# Unfortunately, we do have to build this immediately, and
-	# not in src_compile, because CHOST configure for Python
-	# will check the existence of the --with-build-python value
-	# immediately.
-	emake
-	popd &> /dev/null || die
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	# Set baseline test skip flags.
-	COMMON_TEST_SKIPS=(
-		# this is actually test_gdb.test_pretty_print
-		-x test_pretty_print
-	)
-
-	# Arch-specific skips.  See #931888 for a collection of these.
-	case ${CHOST} in
-		alpha*)
-			COMMON_TEST_SKIPS+=(
-				-x test_builtin
-				-x test_capi
-				-x test_cmath
-				-x test_float
-				# timeout
-				-x test_free_threading
-				-x test_math
-				-x test_numeric_tower
-				-x test_random
-				-x test_statistics
-				# bug 653850
-				-x test_resource
-				-x test_strtod
-			)
-			;;
-		mips*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-				-x test_statistics
-			)
-			;;
-		powerpc64-*) # big endian
-			COMMON_TEST_SKIPS+=(
-				-x test_descr
-			)
-			;;
-		riscv*)
-			COMMON_TEST_SKIPS+=(
-				-x test_urllib2
-			)
-			;;
-		sparc*)
-			COMMON_TEST_SKIPS+=(
-				# bug 788022
-				-x test_multiprocessing_fork
-				-x test_multiprocessing_forkserver
-				-x test_multiprocessing_spawn
-
-				-x test_ctypes
-				-x test_descr
-				# bug 931908
-				-x test_exceptions
-			)
-			;;
-	esac
-
-	# musl-specific skips
-	use elibc_musl && COMMON_TEST_SKIPS+=(
-		# various musl locale deficiencies
-		-x test__locale
-		-x test_c_locale_coercion
-		-x test_locale
-		-x test_re
-
-		# known issues with find_library on musl
-		# https://bugs.python.org/issue21622
-		-x test_ctypes
-
-		# fpathconf, ttyname errno values
-		-x test_os
-	)
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			"${COMMON_TEST_SKIPS[@]}"
-
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_concurrent_futures
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-		)
-
-		# Arch-specific skips.  See #931888 for a collection of these.
-		case ${CHOST} in
-			alpha*)
-				profile_task_flags+=(
-					-x test_os
-				)
-				;;
-			hppa*)
-				profile_task_flags+=(
-					-x test_descr
-					# bug 931908
-					-x test_exceptions
-					-x test_os
-				)
-				;;
-			powerpc64-*) # big endian
-				profile_task_flags+=(
-					# bug 931908
-					-x test_exceptions
-				)
-				;;
-			riscv*)
-				profile_task_flags+=(
-					-x test_statistics
-				)
-				;;
-		esac
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--without-lto
-		--with-system-expat
-		--with-system-libmpdec
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# https://bugs.gentoo.org/700012
-	if tc-is-lto; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-		myeconfargs+=(
-			--with-lto
-		)
-	fi
-
-	# Force-disable modules we don't want built.
-	# See Modules/Setup for docs on how this works. Setup.local contains our local deviations.
-	cat > Modules/Setup.local <<-EOF || die
-		*disabled*
-		nis
-		$(usev !gdbm '_gdbm _dbm')
-		$(usev !sqlite '_sqlite3')
-		$(usev !ssl '_hashlib _ssl')
-		$(usev !ncurses '_curses _curses_panel')
-		$(usev !readline 'readline')
-		$(usev !tk '_tkinter')
-	EOF
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		build_cbuild_python
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	# Gentoo hack to disable accessing system site-packages
-	export GENTOO_CPYTHON_BUILD=1
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		--verbose3
-		-u-network
-		-j "$(makeopts_jobs)"
-		"${COMMON_TEST_SKIPS[@]}"
-	)
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# the Makefile rules are broken
-	# https://github.com/python/cpython/issues/100221
-	mkdir -p "${libdir}"/lib-dynload || die
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" TEST_MODULES=no altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.12.7_p1.ebuild b/dev-lang/python/python-3.12.7_p1.ebuild
deleted file mode 100644
index 34a0b49d3a3d..000000000000
--- a/dev-lang/python/python-3.12.7_p1.ebuild
+++ /dev/null
@@ -1,609 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}-r3"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm libedit
-	+ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-crypt/libb2
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-libs/mpdecimal:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-pip )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? (
-		app-arch/xz-utils
-		dev-python/ensurepip-pip
-		dev-python/ensurepip-setuptools
-		dev-python/ensurepip-wheel
-	)
-	valgrind? ( dev-debug/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	dev-build/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	# TODO: Makefile has annoying deps on expat headers
-	#rm -r Modules/expat || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
-
-	# breaks tests when using --with-wheel-pkg-dir
-	rm -r Lib/test/wheeldata || die
-
-	eautoreconf
-}
-
-build_cbuild_python() {
-	# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-	local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	#
-	# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
-	local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
-	local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-	local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
-	local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
-
-	# We need to build our own Python on CBUILD first, and feed it in.
-	# bug #847910
-	local myeconfargs_cbuild=(
-		"${myeconfargs[@]}"
-
-		--prefix="${BROOT}"/usr
-		--libdir="${cbuild_libdir:2}"
-
-		# Avoid needing to load the right libpython.so.
-		--disable-shared
-
-		# As minimal as possible for the mini CBUILD Python
-		# we build just for cross to satisfy --with-build-python.
-		--without-lto
-		--without-readline
-		--disable-optimizations
-	)
-
-	mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-	pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-
-	# Avoid as many dependencies as possible for the cross build.
-	mkdir Modules || die
-	cat > Modules/Setup.local <<-EOF || die
-		*disabled*
-		nis
-		_dbm _gdbm
-		_sqlite3
-		_hashlib _ssl
-		_curses _curses_panel
-		readline
-		_tkinter
-		pyexpat
-		zlib
-		# We disabled these for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross. This should be rechecked for the pure Makefile approach,
-		# and uncommented if needed.
-		#_ctypes _crypt
-	EOF
-
-	ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-	# Unfortunately, we do have to build this immediately, and
-	# not in src_compile, because CHOST configure for Python
-	# will check the existence of the --with-build-python value
-	# immediately.
-	emake
-	popd &> /dev/null || die
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	# Set baseline test skip flags.
-	COMMON_TEST_SKIPS=(
-		# this is actually test_gdb.test_pretty_print
-		-x test_pretty_print
-	)
-
-	# Arch-specific skips.  See #931888 for a collection of these.
-	case ${CHOST} in
-		alpha*)
-			COMMON_TEST_SKIPS+=(
-				-x test_builtin
-				-x test_capi
-				-x test_cmath
-				-x test_float
-				# timeout
-				-x test_free_threading
-				-x test_math
-				-x test_numeric_tower
-				-x test_random
-				-x test_statistics
-				# bug 653850
-				-x test_resource
-				-x test_strtod
-			)
-			;;
-		mips*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-				-x test_statistics
-			)
-			;;
-		powerpc64-*) # big endian
-			COMMON_TEST_SKIPS+=(
-				-x test_gdb
-			)
-			;;
-		riscv*)
-			COMMON_TEST_SKIPS+=(
-				-x test_urllib2
-			)
-			;;
-		sparc*)
-			COMMON_TEST_SKIPS+=(
-				# bug 788022
-				-x test_multiprocessing_fork
-				-x test_multiprocessing_forkserver
-				-x test_multiprocessing_spawn
-
-				-x test_ctypes
-				-x test_gdb
-				# bug 931908
-				-x test_exceptions
-			)
-			;;
-	esac
-
-	# musl-specific skips
-	use elibc_musl && COMMON_TEST_SKIPS+=(
-		# various musl locale deficiencies
-		-x test__locale
-		-x test_c_locale_coercion
-		-x test_locale
-		-x test_re
-
-		# known issues with find_library on musl
-		# https://bugs.python.org/issue21622
-		-x test_ctypes
-
-		# fpathconf, ttyname errno values
-		-x test_os
-	)
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			"${COMMON_TEST_SKIPS[@]}"
-
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_concurrent_futures
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-		)
-
-		# Arch-specific skips.  See #931888 for a collection of these.
-		case ${CHOST} in
-			alpha*)
-				profile_task_flags+=(
-					-x test_os
-				)
-				;;
-			hppa*)
-				profile_task_flags+=(
-					-x test_descr
-					# bug 931908
-					-x test_exceptions
-					-x test_os
-				)
-				;;
-			powerpc64-*) # big endian
-				profile_task_flags+=(
-					# bug 931908
-					-x test_exceptions
-				)
-				;;
-			riscv*)
-				profile_task_flags+=(
-					-x test_statistics
-				)
-				;;
-		esac
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--without-lto
-		--with-system-expat
-		--with-system-libmpdec
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# https://bugs.gentoo.org/700012
-	if tc-is-lto; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-		myeconfargs+=(
-			--with-lto
-		)
-	fi
-
-	# Force-disable modules we don't want built.
-	# See Modules/Setup for docs on how this works. Setup.local contains our local deviations.
-	cat > Modules/Setup.local <<-EOF || die
-		*disabled*
-		nis
-		$(usev !gdbm '_gdbm _dbm')
-		$(usev !sqlite '_sqlite3')
-		$(usev !ssl '_hashlib _ssl')
-		$(usev !ncurses '_curses _curses_panel')
-		$(usev !readline 'readline')
-		$(usev !tk '_tkinter')
-	EOF
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		build_cbuild_python
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	# Gentoo hack to disable accessing system site-packages
-	export GENTOO_CPYTHON_BUILD=1
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-		local -x TMPDIR=/tmp
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		--verbose3
-		-u-network
-		-j "$(makeopts_jobs)"
-		"${COMMON_TEST_SKIPS[@]}"
-	)
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x TMPDIR=/tmp
-
-	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# the Makefile rules are broken
-	# https://github.com/python/cpython/issues/100221
-	mkdir -p "${libdir}"/lib-dynload || die
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" TEST_MODULES=no altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.12.8.ebuild b/dev-lang/python/python-3.12.8.ebuild
index b732934b3362..7264acf4ca7a 100644
--- a/dev-lang/python/python-3.12.8.ebuild
+++ b/dev-lang/python/python-3.12.8.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"
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm libedit
 	+ncurses pgo +readline +sqlite +ssl test tk valgrind
diff --git a/dev-lang/python/python-3.12.8_p1.ebuild b/dev-lang/python/python-3.12.8_p1.ebuild
index 34d02eeb6167..67bd154d442b 100644
--- a/dev-lang/python/python-3.12.8_p1.ebuild
+++ b/dev-lang/python/python-3.12.8_p1.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm libedit
 	+ncurses pgo +readline +sqlite +ssl test tk valgrind
diff --git a/dev-lang/python/python-3.13.1.ebuild b/dev-lang/python/python-3.13.1.ebuild
index 2ab44f362b70..6afffb716bcc 100644
--- a/dev-lang/python/python-3.13.1.ebuild
+++ b/dev-lang/python/python-3.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"
@@ -32,7 +32,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm jit
 	libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind
diff --git a/dev-lang/python/python-3.13.1_p1-r100.ebuild b/dev-lang/python/python-3.13.1_p1-r100.ebuild
new file mode 100644
index 000000000000..f2f4b2b6ff30
--- /dev/null
+++ b/dev-lang/python/python-3.13.1_p1-r100.ebuild
@@ -0,0 +1,634 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+LLVM_COMPAT=( 18 )
+LLVM_OPTIONAL=1
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic linux-info llvm-r1
+inherit multiprocessing pax-utils python-utils-r1 toolchain-funcs
+inherit verify-sig
+
+MY_PV=${PV}
+MY_P="Python-${MY_PV%_p*}"
+PYVER="$(ver_cut 1-2)t"
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="Freethreading (no-GIL) version of Python programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="
+	bluetooth build debug +ensurepip examples gdbm jit
+	libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind
+"
+REQUIRED_USE="jit? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-crypt/libb2
+	>=dev-libs/expat-2.1:=
+	dev-libs/libffi:=
+	dev-libs/mpdecimal:=
+	dev-python/gentoo-common
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-pip )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	kernel_linux? ( sys-apps/util-linux:= )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? (
+		!libedit? ( >=sys-libs/readline-4.1:= )
+		libedit? ( dev-libs/libedit:= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? (
+		dev-python/ensurepip-pip
+		dev-python/ensurepip-setuptools
+		dev-python/ensurepip-wheel
+	)
+	valgrind? ( dev-debug/valgrind )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	dev-build/autoconf-archive
+	app-alternatives/awk
+	virtual/pkgconfig
+	jit? (
+		$(llvm_gen_dep '
+			llvm-core/clang:${LLVM_SLOT}
+			llvm-core/llvm:${LLVM_SLOT}
+		')
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+if [[ ${PV} != *_alpha* ]]; then
+	RDEPEND+="
+		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
+	"
+fi
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER%t}
+# false positives -- functions specific to *BSD
+QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
+
+declare -rgA PYTHON_KERNEL_CHECKS=(
+	["CROSS_MEMORY_ATTACH"]="test_external_inspection" #bug 938589
+	["DNOTIFY"]="test_fcntl" # bug 938662
+)
+
+pkg_pretend() {
+	if use pgo || use test; then
+		check-reqs_pkg_pretend
+	fi
+
+	ewarn "Freethreading build is considered experimental upstream.  Using it"
+	ewarn "could lead to unexpected breakage, including race conditions"
+	ewarn "and crashes, respectively.  Please do not file Gentoo bugs, unless"
+	ewarn "you can reproduce the problem with dev-lang/python.  Instead,"
+	ewarn "please consider reporting freethreading problems upstream."
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		use jit && llvm-r1_pkg_setup
+		if use test || use pgo; then
+			check-reqs_pkg_setup
+
+			local CONFIG_CHECK
+			for f in "${!PYTHON_KERNEL_CHECKS[@]}"; do
+				CONFIG_CHECK+="~${f} "
+			done
+			linux-info_pkg_setup
+		fi
+	fi
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	# TODO: Makefile has annoying deps on expat headers
+	#rm -r Modules/expat || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
+
+	# breaks tests when using --with-wheel-pkg-dir
+	rm -r Lib/test/wheeldata || die
+
+	eautoreconf
+}
+
+build_cbuild_python() {
+	# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+	local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	#
+	# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
+	local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
+	local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+	local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
+	local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
+
+	# We need to build our own Python on CBUILD first, and feed it in.
+	# bug #847910
+	local myeconfargs_cbuild=(
+		"${myeconfargs[@]}"
+
+		--prefix="${BROOT}"/usr
+		--libdir="${cbuild_libdir:2}"
+
+		# Avoid needing to load the right libpython.so.
+		--disable-shared
+
+		# As minimal as possible for the mini CBUILD Python
+		# we build just for cross to satisfy --with-build-python.
+		--without-lto
+		--without-readline
+		--disable-optimizations
+	)
+
+	mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+	pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+
+	# Avoid as many dependencies as possible for the cross build.
+	mkdir Modules || die
+	cat > Modules/Setup.local <<-EOF || die
+		*disabled*
+		nis
+		_dbm _gdbm
+		_sqlite3
+		_hashlib _ssl
+		_curses _curses_panel
+		readline
+		_tkinter
+		pyexpat
+		zlib
+		# We disabled these for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross. This should be rechecked for the pure Makefile approach,
+		# and uncommented if needed.
+		#_ctypes
+	EOF
+
+	ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+	# Unfortunately, we do have to build this immediately, and
+	# not in src_compile, because CHOST configure for Python
+	# will check the existence of the --with-build-python value
+	# immediately.
+	emake
+	popd &> /dev/null || die
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	# Set baseline test skip flags.
+	COMMON_TEST_SKIPS=(
+		# this is actually test_gdb.test_pretty_print
+		-x test_pretty_print
+		# https://bugs.gentoo.org/933840
+		-x test_perf_profiler
+	)
+
+	# Arch-specific skips.  See #931888 for a collection of these.
+	case ${CHOST} in
+		alpha*)
+			COMMON_TEST_SKIPS+=(
+				-x test_builtin
+				-x test_capi
+				-x test_cmath
+				-x test_float
+				# timeout
+				-x test_free_threading
+				-x test_math
+				-x test_numeric_tower
+				-x test_random
+				-x test_statistics
+				# bug 653850
+				-x test_resource
+				-x test_strtod
+			)
+			;;
+		hppa*)
+			COMMON_TEST_SKIPS+=(
+				-x test_gdb
+			)
+			;;
+		mips*)
+			COMMON_TEST_SKIPS+=(
+				-x test_ctypes
+				-x test_external_inspection
+				-x test_statistics
+			)
+			;;
+		powerpc64-*) # big endian
+			COMMON_TEST_SKIPS+=(
+				-x test_gdb
+			)
+			;;
+		riscv*)
+			COMMON_TEST_SKIPS+=(
+				-x test_urllib2
+			)
+			;;
+		sparc*)
+			COMMON_TEST_SKIPS+=(
+				# bug 788022
+				-x test_multiprocessing_fork
+				-x test_multiprocessing_forkserver
+				-x test_multiprocessing_spawn
+
+				-x test_ctypes
+				-x test_gdb
+				# bug 931908
+				-x test_exceptions
+			)
+			;;
+	esac
+
+	# Kernel-config specific skips
+	for option in "${!PYTHON_KERNEL_CHECKS[@]}"; do
+		if ! linux_config_exists || ! linux_chkconfig_present "${option}"
+		then
+			COMMON_TEST_SKIPS+=( -x "${PYTHON_KERNEL_CHECKS[${option}]}" )
+		fi
+	done
+
+	# musl-specific skips
+	use elibc_musl && COMMON_TEST_SKIPS+=(
+		# various musl locale deficiencies
+		-x test__locale
+		-x test_c_locale_coercion
+		-x test_locale
+		-x test_re
+
+		# known issues with find_library on musl
+		# https://bugs.python.org/issue21622
+		-x test_ctypes
+
+		# fpathconf, ttyname errno values
+		-x test_os
+	)
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			--verbose3
+			-u-network
+
+			# We use a timeout because of how often we've had hang issues
+			# here. It also matches the default upstream PROFILE_TASK.
+			--timeout 1200
+
+			"${COMMON_TEST_SKIPS[@]}"
+
+			-x test_dtrace
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+
+			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
+			# bug #900429
+			-x test_tools
+		)
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		# PGO sometimes fails randomly
+		local -x PROFILE_TASK="${profile_task_flags[*]} || true"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--without-lto
+		--with-system-expat
+		--with-system-libmpdec
+		--with-platlibdir=lib
+		--with-pkg-config=yes
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+		--disable-gil
+
+		$(use_with debug assertions)
+		$(use_enable jit experimental-jit)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+		$(use_with valgrind)
+	)
+
+	# https://bugs.gentoo.org/700012
+	if tc-is-lto; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+		myeconfargs+=(
+			--with-lto
+		)
+	fi
+
+	# Force-disable modules we don't want built.
+	# See Modules/Setup for docs on how this works. Setup.local contains our local deviations.
+	cat > Modules/Setup.local <<-EOF || die
+		*disabled*
+		nis
+		$(usev !gdbm '_gdbm _dbm')
+		$(usev !sqlite '_sqlite3')
+		$(usev !ssl '_hashlib _ssl')
+		$(usev !ncurses '_curses _curses_panel')
+		$(usev !readline 'readline')
+		$(usev !tk '_tkinter')
+	EOF
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+
+	if tc-is-cross-compiler ; then
+		build_cbuild_python
+		myeconfargs+=(
+			# Point the imminent CHOST build to the Python we just
+			# built for CBUILD.
+			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
+		)
+	fi
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	export PYTHONSTRICTEXTENSIONBUILD=1
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	# Gentoo hack to disable accessing system site-packages
+	export GENTOO_CPYTHON_BUILD=1
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+		local -x TMPDIR=/var/tmp
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# this just happens to skip test_support.test_freeze that is broken
+	# without bundled expat
+	# TODO: get a proper skip for it upstream
+	local -x LOGNAME=buildbot
+
+	local test_opts=(
+		--verbose3
+		-u-network
+		-j "$(makeopts_jobs)"
+		"${COMMON_TEST_SKIPS[@]}"
+	)
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x TMPDIR=/var/tmp
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	[[ ${ret} -eq 0 ]] || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	# -j1 hack for now for bug #843458
+	emake -j1 DESTDIR="${D}" TEST_MODULES=no altinstall
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+	# Fix collision with GIL-enabled build.
+	rm "${ED}/usr/bin/python${PYVER%t}" || die
+	mv "${ED}"/usr/bin/pydoc{${PYVER%t},${PYVER}} || die
+	mv "${ED}"/usr/share/man/man1/python{${PYVER%t},${PYVER}}.1 || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use sqlite; then
+		rm -r "${libdir}/"sqlite3 || die
+	fi
+	if use tk; then
+		# rename to avoid collision with dev-lang/python
+		mv "${ED}"/usr/bin/idle{${PYVER%t},${PYVER}} || die
+	else
+		rm -r "${ED}/usr/bin/idle${PYVER%t}" || die
+		rm -r "${libdir}/"{idlelib,tkinter} || die
+	fi
+
+	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# pydoc
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.13.1_p1.ebuild b/dev-lang/python/python-3.13.1_p1.ebuild
index c9c07e844e9b..77efc9e367d4 100644
--- a/dev-lang/python/python-3.13.1_p1.ebuild
+++ b/dev-lang/python/python-3.13.1_p1.ebuild
@@ -32,7 +32,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm jit
 	libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind
@@ -375,46 +375,16 @@ src_configure() {
 			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
 			# bug #900429
 			-x test_tools
-
-			# Fails in profiling run, passes in src_test().
-			-x test_capi
 		)
 
-		# Arch-specific skips.  See #931888 for a collection of these.
-		case ${CHOST} in
-			alpha*)
-				profile_task_flags+=(
-					-x test_os
-				)
-				;;
-			hppa*)
-				profile_task_flags+=(
-					-x test_descr
-					# bug 931908
-					-x test_exceptions
-					-x test_os
-				)
-				;;
-			powerpc64-*) # big endian
-				profile_task_flags+=(
-					# bug 931908
-					-x test_exceptions
-				)
-				;;
-			riscv*)
-				profile_task_flags+=(
-					-x test_statistics
-				)
-				;;
-		esac
-
 		if has_version "app-arch/rpm" ; then
 			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
 			profile_task_flags+=(
 				-x test_distutils
 			)
 		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
+		# PGO sometimes fails randomly
+		local -x PROFILE_TASK="${profile_task_flags[*]} || true"
 	fi
 
 	local myeconfargs=(
diff --git a/dev-lang/python/python-3.14.0_alpha1-r100.ebuild b/dev-lang/python/python-3.14.0_alpha1-r100.ebuild
deleted file mode 100644
index 383489c196ee..000000000000
--- a/dev-lang/python/python-3.14.0_alpha1-r100.ebuild
+++ /dev/null
@@ -1,667 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-LLVM_COMPAT=( 18 )
-LLVM_OPTIONAL=1
-VERIFY_SIG_METHOD=sigstore
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic linux-info llvm-r1
-inherit multiprocessing pax-utils python-utils-r1 toolchain-funcs
-inherit verify-sig
-
-MY_PV=${PV/_alpha/a}
-MY_P="Python-${MY_PV%_p*}"
-PYVER="$(ver_cut 1-2)t"
-PATCHSET="python-gentoo-patches-${MY_PV}-r2"
-
-DESCRIPTION="Freethreading (no-GIL) version of Python programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.sigstore
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm jit
-	libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-REQUIRED_USE="jit? ( ${LLVM_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-libs/mpdecimal:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-pip )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? (
-		dev-python/ensurepip-pip
-		dev-python/ensurepip-setuptools
-		dev-python/ensurepip-wheel
-	)
-	valgrind? ( dev-debug/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	dev-build/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	jit? (
-		$(llvm_gen_dep '
-			llvm-core/clang:${LLVM_SLOT}
-			llvm-core/llvm:${LLVM_SLOT}
-		')
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-# https://www.python.org/downloads/metadata/sigstore/
-VERIFY_SIG_CERT_IDENTITY=hugo@python.org
-VERIFY_SIG_CERT_OIDC_ISSUER=https://github.com/login/oauth
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER%t}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-declare -rgA PYTHON_KERNEL_CHECKS=(
-	["CROSS_MEMORY_ATTACH"]="test_external_inspection" #bug 938589
-	["DNOTIFY"]="test_fcntl" # bug 938662
-)
-
-pkg_pretend() {
-	if use pgo || use test; then
-		check-reqs_pkg_pretend
-	fi
-
-	ewarn "Freethreading build is considered experimental upstream.  Using it"
-	ewarn "could lead to unexpected breakage, including race conditions"
-	ewarn "and crashes, respectively.  Please do not file Gentoo bugs, unless"
-	ewarn "you can reproduce the problem with dev-lang/python.  Instead,"
-	ewarn "please consider reporting freethreading problems upstream."
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		use jit && llvm-r1_pkg_setup
-		if use test || use pgo; then
-			check-reqs_pkg_setup
-
-			local CONFIG_CHECK
-			for f in "${!PYTHON_KERNEL_CHECKS[@]}"; do
-				CONFIG_CHECK+="~${f} "
-			done
-			linux-info_pkg_setup
-		fi
-	fi
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sigstore}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	# TODO: Makefile has annoying deps on expat headers
-	#rm -r Modules/expat || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
-
-	# breaks tests when using --with-wheel-pkg-dir
-	rm -r Lib/test/wheeldata || die
-
-	eautoreconf
-}
-
-build_cbuild_python() {
-	# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-	local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	#
-	# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
-	local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
-	local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-	local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
-	local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
-
-	# We need to build our own Python on CBUILD first, and feed it in.
-	# bug #847910
-	local myeconfargs_cbuild=(
-		"${myeconfargs[@]}"
-
-		--prefix="${BROOT}"/usr
-		--libdir="${cbuild_libdir:2}"
-
-		# Avoid needing to load the right libpython.so.
-		--disable-shared
-
-		# As minimal as possible for the mini CBUILD Python
-		# we build just for cross to satisfy --with-build-python.
-		--without-lto
-		--without-readline
-		--disable-optimizations
-	)
-
-	mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-	pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-
-	# Avoid as many dependencies as possible for the cross build.
-	mkdir Modules || die
-	cat > Modules/Setup.local <<-EOF || die
-		*disabled*
-		nis
-		_dbm _gdbm
-		_sqlite3
-		_hashlib _ssl
-		_curses _curses_panel
-		readline
-		_tkinter
-		pyexpat
-		zlib
-		# We disabled these for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross. This should be rechecked for the pure Makefile approach,
-		# and uncommented if needed.
-		#_ctypes
-	EOF
-
-	ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-	# Unfortunately, we do have to build this immediately, and
-	# not in src_compile, because CHOST configure for Python
-	# will check the existence of the --with-build-python value
-	# immediately.
-	emake
-	popd &> /dev/null || die
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	# Set baseline test skip flags.
-	COMMON_TEST_SKIPS=(
-		# this is actually test_gdb.test_pretty_print
-		-x test_pretty_print
-		# https://bugs.gentoo.org/933840
-		-x test_perf_profiler
-	)
-
-	# Arch-specific skips.  See #931888 for a collection of these.
-	case ${CHOST} in
-		alpha*)
-			COMMON_TEST_SKIPS+=(
-				-x test_builtin
-				-x test_capi
-				-x test_cmath
-				-x test_float
-				# timeout
-				-x test_free_threading
-				-x test_math
-				-x test_numeric_tower
-				-x test_random
-				-x test_statistics
-				# bug 653850
-				-x test_resource
-				-x test_strtod
-			)
-			;;
-		hppa*)
-			COMMON_TEST_SKIPS+=(
-				-x test_gdb
-			)
-			;;
-		mips*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-				-x test_statistics
-			)
-			;;
-		powerpc64-*) # big endian
-			COMMON_TEST_SKIPS+=(
-				-x test_gdb
-			)
-			;;
-		riscv*)
-			COMMON_TEST_SKIPS+=(
-				-x test_urllib2
-			)
-			;;
-		sparc*)
-			COMMON_TEST_SKIPS+=(
-				# bug 788022
-				-x test_multiprocessing_fork
-				-x test_multiprocessing_forkserver
-				-x test_multiprocessing_spawn
-
-				-x test_ctypes
-				-x test_gdb
-				# bug 931908
-				-x test_exceptions
-			)
-			;;
-	esac
-
-	# Kernel-config specific skips
-	for option in "${!PYTHON_KERNEL_CHECKS[@]}"; do
-		if ! linux_config_exists || ! linux_chkconfig_present "${option}"
-		then
-			COMMON_TEST_SKIPS+=( -x "${PYTHON_KERNEL_CHECKS[${option}]}" )
-		fi
-	done
-
-	# musl-specific skips
-	use elibc_musl && COMMON_TEST_SKIPS+=(
-		# various musl locale deficiencies
-		-x test__locale
-		-x test_c_locale_coercion
-		-x test_locale
-		-x test_re
-
-		# known issues with find_library on musl
-		# https://bugs.python.org/issue21622
-		-x test_ctypes
-
-		# fpathconf, ttyname errno values
-		-x test_os
-	)
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			--verbose3
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			"${COMMON_TEST_SKIPS[@]}"
-
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-
-			# Fails in profiling run, passes in src_test().
-			-x test_capi
-			-x test_embed
-			-x test_external_inspection
-		)
-
-		# Arch-specific skips.  See #931888 for a collection of these.
-		case ${CHOST} in
-			alpha*)
-				profile_task_flags+=(
-					-x test_os
-				)
-				;;
-			hppa*)
-				profile_task_flags+=(
-					-x test_descr
-					# bug 931908
-					-x test_exceptions
-					-x test_os
-				)
-				;;
-			powerpc64-*) # big endian
-				profile_task_flags+=(
-					# bug 931908
-					-x test_exceptions
-				)
-				;;
-			riscv*)
-				profile_task_flags+=(
-					-x test_statistics
-				)
-				;;
-		esac
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--without-lto
-		--with-system-expat
-		--with-system-libmpdec
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-		--disable-gil
-
-		$(use_with debug assertions)
-		$(use_enable jit experimental-jit)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# https://bugs.gentoo.org/700012
-	if tc-is-lto; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-		myeconfargs+=(
-			--with-lto
-		)
-	fi
-
-	# Force-disable modules we don't want built.
-	# See Modules/Setup for docs on how this works. Setup.local contains our local deviations.
-	cat > Modules/Setup.local <<-EOF || die
-		*disabled*
-		nis
-		$(usev !gdbm '_gdbm _dbm')
-		$(usev !sqlite '_sqlite3')
-		$(usev !ssl '_hashlib _ssl')
-		$(usev !ncurses '_curses _curses_panel')
-		$(usev !readline 'readline')
-		$(usev !tk '_tkinter')
-	EOF
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		build_cbuild_python
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	# Gentoo hack to disable accessing system site-packages
-	export GENTOO_CPYTHON_BUILD=1
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-		local -x TMPDIR=/tmp
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		--verbose3
-		-u-network
-		-j "$(makeopts_jobs)"
-		"${COMMON_TEST_SKIPS[@]}"
-	)
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x TMPDIR=/tmp
-
-	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" TEST_MODULES=no altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-	# Fix collision with GIL-enabled build.
-	rm "${ED}/usr/bin/python${PYVER%t}" || die
-	mv "${ED}"/usr/bin/pydoc{${PYVER%t},${PYVER}} || die
-	mv "${ED}"/usr/share/man/man1/python{${PYVER%t},${PYVER}}.1 || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if use tk; then
-		# rename to avoid collision with dev-lang/python
-		mv "${ED}"/usr/bin/idle{${PYVER%t},${PYVER}} || die
-	else
-		rm -r "${ED}/usr/bin/idle${PYVER%t}" || die
-		rm -r "${libdir}/"{idlelib,tkinter} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# pydoc
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.14.0_alpha1.ebuild b/dev-lang/python/python-3.14.0_alpha1.ebuild
deleted file mode 100644
index 5e250f38aca1..000000000000
--- a/dev-lang/python/python-3.14.0_alpha1.ebuild
+++ /dev/null
@@ -1,659 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-LLVM_COMPAT=( 18 )
-LLVM_OPTIONAL=1
-VERIFY_SIG_METHOD=sigstore
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic linux-info llvm-r1
-inherit multiprocessing pax-utils python-utils-r1 toolchain-funcs
-inherit verify-sig
-
-MY_PV=${PV/_alpha/a}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}-r2"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.sigstore
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm jit
-	libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-REQUIRED_USE="jit? ( ${LLVM_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-libs/mpdecimal:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-pip )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? (
-		dev-python/ensurepip-pip
-		dev-python/ensurepip-setuptools
-		dev-python/ensurepip-wheel
-	)
-	valgrind? ( dev-debug/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	dev-build/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	jit? (
-		$(llvm_gen_dep '
-			llvm-core/clang:${LLVM_SLOT}
-			llvm-core/llvm:${LLVM_SLOT}
-		')
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-# https://www.python.org/downloads/metadata/sigstore/
-VERIFY_SIG_CERT_IDENTITY=hugo@python.org
-VERIFY_SIG_CERT_OIDC_ISSUER=https://github.com/login/oauth
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER%t}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-declare -rgA PYTHON_KERNEL_CHECKS=(
-	["CROSS_MEMORY_ATTACH"]="test_external_inspection" #bug 938589
-	["DNOTIFY"]="test_fcntl" # bug 938662
-)
-
-pkg_pretend() {
-	if use pgo || use test; then
-		check-reqs_pkg_pretend
-	fi
-
-	if use jit; then
-		ewarn "USE=jit is considered experimental upstream.  Using it"
-		ewarn "could lead to unexpected breakage, including race conditions"
-		ewarn "and crashes, respectively.  Please do not file Gentoo bugs, unless"
-		ewarn "you can reproduce the problem with dev-lang/python[-jit].  Instead,"
-		ewarn "please consider reporting JIT problems upstream."
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		use jit && llvm-r1_pkg_setup
-		if use test || use pgo; then
-			check-reqs_pkg_setup
-
-			local CONFIG_CHECK
-			for f in "${!PYTHON_KERNEL_CHECKS[@]}"; do
-				CONFIG_CHECK+="~${f} "
-			done
-			linux-info_pkg_setup
-		fi
-	fi
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sigstore}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	# TODO: Makefile has annoying deps on expat headers
-	#rm -r Modules/expat || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
-
-	# breaks tests when using --with-wheel-pkg-dir
-	rm -r Lib/test/wheeldata || die
-
-	eautoreconf
-}
-
-build_cbuild_python() {
-	# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-	local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	#
-	# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
-	local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
-	local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-	local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
-	local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
-
-	# We need to build our own Python on CBUILD first, and feed it in.
-	# bug #847910
-	local myeconfargs_cbuild=(
-		"${myeconfargs[@]}"
-
-		--prefix="${BROOT}"/usr
-		--libdir="${cbuild_libdir:2}"
-
-		# Avoid needing to load the right libpython.so.
-		--disable-shared
-
-		# As minimal as possible for the mini CBUILD Python
-		# we build just for cross to satisfy --with-build-python.
-		--without-lto
-		--without-readline
-		--disable-optimizations
-	)
-
-	mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-	pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-
-	# Avoid as many dependencies as possible for the cross build.
-	mkdir Modules || die
-	cat > Modules/Setup.local <<-EOF || die
-		*disabled*
-		nis
-		_dbm _gdbm
-		_sqlite3
-		_hashlib _ssl
-		_curses _curses_panel
-		readline
-		_tkinter
-		pyexpat
-		zlib
-		# We disabled these for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross. This should be rechecked for the pure Makefile approach,
-		# and uncommented if needed.
-		#_ctypes
-	EOF
-
-	ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-	# Unfortunately, we do have to build this immediately, and
-	# not in src_compile, because CHOST configure for Python
-	# will check the existence of the --with-build-python value
-	# immediately.
-	emake
-	popd &> /dev/null || die
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	# Set baseline test skip flags.
-	COMMON_TEST_SKIPS=(
-		# this is actually test_gdb.test_pretty_print
-		-x test_pretty_print
-		# https://bugs.gentoo.org/933840
-		-x test_perf_profiler
-	)
-
-	# Arch-specific skips.  See #931888 for a collection of these.
-	case ${CHOST} in
-		alpha*)
-			COMMON_TEST_SKIPS+=(
-				-x test_builtin
-				-x test_capi
-				-x test_cmath
-				-x test_float
-				# timeout
-				-x test_free_threading
-				-x test_math
-				-x test_numeric_tower
-				-x test_random
-				-x test_statistics
-				# bug 653850
-				-x test_resource
-				-x test_strtod
-			)
-			;;
-		hppa*)
-			COMMON_TEST_SKIPS+=(
-				-x test_gdb
-			)
-			;;
-		mips*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-				-x test_statistics
-			)
-			;;
-		powerpc64-*) # big endian
-			COMMON_TEST_SKIPS+=(
-				-x test_gdb
-			)
-			;;
-		riscv*)
-			COMMON_TEST_SKIPS+=(
-				-x test_urllib2
-			)
-			;;
-		sparc*)
-			COMMON_TEST_SKIPS+=(
-				# bug 788022
-				-x test_multiprocessing_fork
-				-x test_multiprocessing_forkserver
-				-x test_multiprocessing_spawn
-
-				-x test_ctypes
-				-x test_gdb
-				# bug 931908
-				-x test_exceptions
-			)
-			;;
-	esac
-
-	# Kernel-config specific skips
-	for option in "${!PYTHON_KERNEL_CHECKS[@]}"; do
-		if ! linux_config_exists || ! linux_chkconfig_present "${option}"
-		then
-			COMMON_TEST_SKIPS+=( -x "${PYTHON_KERNEL_CHECKS[${option}]}" )
-		fi
-	done
-
-	# musl-specific skips
-	use elibc_musl && COMMON_TEST_SKIPS+=(
-		# various musl locale deficiencies
-		-x test__locale
-		-x test_c_locale_coercion
-		-x test_locale
-		-x test_re
-
-		# known issues with find_library on musl
-		# https://bugs.python.org/issue21622
-		-x test_ctypes
-
-		# fpathconf, ttyname errno values
-		-x test_os
-	)
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			--verbose3
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			"${COMMON_TEST_SKIPS[@]}"
-
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-
-			# Fails in profiling run, passes in src_test().
-			-x test_capi
-			-x test_embed
-		)
-
-		# Arch-specific skips.  See #931888 for a collection of these.
-		case ${CHOST} in
-			alpha*)
-				profile_task_flags+=(
-					-x test_os
-				)
-				;;
-			hppa*)
-				profile_task_flags+=(
-					-x test_descr
-					# bug 931908
-					-x test_exceptions
-					-x test_os
-				)
-				;;
-			powerpc64-*) # big endian
-				profile_task_flags+=(
-					# bug 931908
-					-x test_exceptions
-				)
-				;;
-			riscv*)
-				profile_task_flags+=(
-					-x test_statistics
-				)
-				;;
-		esac
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--without-lto
-		--with-system-expat
-		--with-system-libmpdec
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-		--enable-gil
-
-		$(use_with debug assertions)
-		$(use_enable jit experimental-jit)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# https://bugs.gentoo.org/700012
-	if tc-is-lto; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-		myeconfargs+=(
-			--with-lto
-		)
-	fi
-
-	# Force-disable modules we don't want built.
-	# See Modules/Setup for docs on how this works. Setup.local contains our local deviations.
-	cat > Modules/Setup.local <<-EOF || die
-		*disabled*
-		nis
-		$(usev !gdbm '_gdbm _dbm')
-		$(usev !sqlite '_sqlite3')
-		$(usev !ssl '_hashlib _ssl')
-		$(usev !ncurses '_curses _curses_panel')
-		$(usev !readline 'readline')
-		$(usev !tk '_tkinter')
-	EOF
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		build_cbuild_python
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	# Gentoo hack to disable accessing system site-packages
-	export GENTOO_CPYTHON_BUILD=1
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		--verbose3
-		-u-network
-		-j "$(makeopts_jobs)"
-		"${COMMON_TEST_SKIPS[@]}"
-	)
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" TEST_MODULES=no altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# pydoc
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.14.0_alpha2-r100.ebuild b/dev-lang/python/python-3.14.0_alpha2-r100.ebuild
deleted file mode 100644
index eb87a6ac8197..000000000000
--- a/dev-lang/python/python-3.14.0_alpha2-r100.ebuild
+++ /dev/null
@@ -1,667 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-LLVM_COMPAT=( 19 )
-LLVM_OPTIONAL=1
-VERIFY_SIG_METHOD=sigstore
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic linux-info llvm-r1
-inherit multiprocessing pax-utils python-utils-r1 toolchain-funcs
-inherit verify-sig
-
-MY_PV=${PV/_alpha/a}
-MY_P="Python-${MY_PV%_p*}"
-PYVER="$(ver_cut 1-2)t"
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Freethreading (no-GIL) version of Python programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.sigstore
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm jit
-	libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-REQUIRED_USE="jit? ( ${LLVM_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-libs/mpdecimal:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-pip )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? (
-		dev-python/ensurepip-pip
-		dev-python/ensurepip-setuptools
-		dev-python/ensurepip-wheel
-	)
-	valgrind? ( dev-debug/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	dev-build/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	jit? (
-		$(llvm_gen_dep '
-			llvm-core/clang:${LLVM_SLOT}
-			llvm-core/llvm:${LLVM_SLOT}
-		')
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-# https://www.python.org/downloads/metadata/sigstore/
-VERIFY_SIG_CERT_IDENTITY=hugo@python.org
-VERIFY_SIG_CERT_OIDC_ISSUER=https://github.com/login/oauth
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER%t}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-declare -rgA PYTHON_KERNEL_CHECKS=(
-	["CROSS_MEMORY_ATTACH"]="test_external_inspection" #bug 938589
-	["DNOTIFY"]="test_fcntl" # bug 938662
-)
-
-pkg_pretend() {
-	if use pgo || use test; then
-		check-reqs_pkg_pretend
-	fi
-
-	ewarn "Freethreading build is considered experimental upstream.  Using it"
-	ewarn "could lead to unexpected breakage, including race conditions"
-	ewarn "and crashes, respectively.  Please do not file Gentoo bugs, unless"
-	ewarn "you can reproduce the problem with dev-lang/python.  Instead,"
-	ewarn "please consider reporting freethreading problems upstream."
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		use jit && llvm-r1_pkg_setup
-		if use test || use pgo; then
-			check-reqs_pkg_setup
-
-			local CONFIG_CHECK
-			for f in "${!PYTHON_KERNEL_CHECKS[@]}"; do
-				CONFIG_CHECK+="~${f} "
-			done
-			linux-info_pkg_setup
-		fi
-	fi
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sigstore}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	# TODO: Makefile has annoying deps on expat headers
-	#rm -r Modules/expat || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
-
-	# breaks tests when using --with-wheel-pkg-dir
-	rm -r Lib/test/wheeldata || die
-
-	eautoreconf
-}
-
-build_cbuild_python() {
-	# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-	local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	#
-	# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
-	local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
-	local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-	local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
-	local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
-
-	# We need to build our own Python on CBUILD first, and feed it in.
-	# bug #847910
-	local myeconfargs_cbuild=(
-		"${myeconfargs[@]}"
-
-		--prefix="${BROOT}"/usr
-		--libdir="${cbuild_libdir:2}"
-
-		# Avoid needing to load the right libpython.so.
-		--disable-shared
-
-		# As minimal as possible for the mini CBUILD Python
-		# we build just for cross to satisfy --with-build-python.
-		--without-lto
-		--without-readline
-		--disable-optimizations
-	)
-
-	mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-	pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-
-	# Avoid as many dependencies as possible for the cross build.
-	mkdir Modules || die
-	cat > Modules/Setup.local <<-EOF || die
-		*disabled*
-		nis
-		_dbm _gdbm
-		_sqlite3
-		_hashlib _ssl
-		_curses _curses_panel
-		readline
-		_tkinter
-		pyexpat
-		zlib
-		# We disabled these for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross. This should be rechecked for the pure Makefile approach,
-		# and uncommented if needed.
-		#_ctypes
-	EOF
-
-	ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-	# Unfortunately, we do have to build this immediately, and
-	# not in src_compile, because CHOST configure for Python
-	# will check the existence of the --with-build-python value
-	# immediately.
-	emake
-	popd &> /dev/null || die
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	# Set baseline test skip flags.
-	COMMON_TEST_SKIPS=(
-		# this is actually test_gdb.test_pretty_print
-		-x test_pretty_print
-		# https://bugs.gentoo.org/933840
-		-x test_perf_profiler
-	)
-
-	# Arch-specific skips.  See #931888 for a collection of these.
-	case ${CHOST} in
-		alpha*)
-			COMMON_TEST_SKIPS+=(
-				-x test_builtin
-				-x test_capi
-				-x test_cmath
-				-x test_float
-				# timeout
-				-x test_free_threading
-				-x test_math
-				-x test_numeric_tower
-				-x test_random
-				-x test_statistics
-				# bug 653850
-				-x test_resource
-				-x test_strtod
-			)
-			;;
-		hppa*)
-			COMMON_TEST_SKIPS+=(
-				-x test_gdb
-			)
-			;;
-		mips*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-				-x test_statistics
-			)
-			;;
-		powerpc64-*) # big endian
-			COMMON_TEST_SKIPS+=(
-				-x test_gdb
-			)
-			;;
-		riscv*)
-			COMMON_TEST_SKIPS+=(
-				-x test_urllib2
-			)
-			;;
-		sparc*)
-			COMMON_TEST_SKIPS+=(
-				# bug 788022
-				-x test_multiprocessing_fork
-				-x test_multiprocessing_forkserver
-				-x test_multiprocessing_spawn
-
-				-x test_ctypes
-				-x test_gdb
-				# bug 931908
-				-x test_exceptions
-			)
-			;;
-	esac
-
-	# Kernel-config specific skips
-	for option in "${!PYTHON_KERNEL_CHECKS[@]}"; do
-		if ! linux_config_exists || ! linux_chkconfig_present "${option}"
-		then
-			COMMON_TEST_SKIPS+=( -x "${PYTHON_KERNEL_CHECKS[${option}]}" )
-		fi
-	done
-
-	# musl-specific skips
-	use elibc_musl && COMMON_TEST_SKIPS+=(
-		# various musl locale deficiencies
-		-x test__locale
-		-x test_c_locale_coercion
-		-x test_locale
-		-x test_re
-
-		# known issues with find_library on musl
-		# https://bugs.python.org/issue21622
-		-x test_ctypes
-
-		# fpathconf, ttyname errno values
-		-x test_os
-	)
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			--verbose3
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			"${COMMON_TEST_SKIPS[@]}"
-
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-
-			# Fails in profiling run, passes in src_test().
-			-x test_capi
-			-x test_embed
-			-x test_external_inspection
-		)
-
-		# Arch-specific skips.  See #931888 for a collection of these.
-		case ${CHOST} in
-			alpha*)
-				profile_task_flags+=(
-					-x test_os
-				)
-				;;
-			hppa*)
-				profile_task_flags+=(
-					-x test_descr
-					# bug 931908
-					-x test_exceptions
-					-x test_os
-				)
-				;;
-			powerpc64-*) # big endian
-				profile_task_flags+=(
-					# bug 931908
-					-x test_exceptions
-				)
-				;;
-			riscv*)
-				profile_task_flags+=(
-					-x test_statistics
-				)
-				;;
-		esac
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--without-lto
-		--with-system-expat
-		--with-system-libmpdec
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-		--disable-gil
-
-		$(use_with debug assertions)
-		$(use_enable jit experimental-jit)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# https://bugs.gentoo.org/700012
-	if tc-is-lto; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-		myeconfargs+=(
-			--with-lto
-		)
-	fi
-
-	# Force-disable modules we don't want built.
-	# See Modules/Setup for docs on how this works. Setup.local contains our local deviations.
-	cat > Modules/Setup.local <<-EOF || die
-		*disabled*
-		nis
-		$(usev !gdbm '_gdbm _dbm')
-		$(usev !sqlite '_sqlite3')
-		$(usev !ssl '_hashlib _ssl')
-		$(usev !ncurses '_curses _curses_panel')
-		$(usev !readline 'readline')
-		$(usev !tk '_tkinter')
-	EOF
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		build_cbuild_python
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	# Gentoo hack to disable accessing system site-packages
-	export GENTOO_CPYTHON_BUILD=1
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-		local -x TMPDIR=/tmp
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		--verbose3
-		-u-network
-		-j "$(makeopts_jobs)"
-		"${COMMON_TEST_SKIPS[@]}"
-	)
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x TMPDIR=/tmp
-
-	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" TEST_MODULES=no altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-	# Fix collision with GIL-enabled build.
-	rm "${ED}/usr/bin/python${PYVER%t}" || die
-	mv "${ED}"/usr/bin/pydoc{${PYVER%t},${PYVER}} || die
-	mv "${ED}"/usr/share/man/man1/python{${PYVER%t},${PYVER}}.1 || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if use tk; then
-		# rename to avoid collision with dev-lang/python
-		mv "${ED}"/usr/bin/idle{${PYVER%t},${PYVER}} || die
-	else
-		rm -r "${ED}/usr/bin/idle${PYVER%t}" || die
-		rm -r "${libdir}/"{idlelib,tkinter} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# pydoc
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.14.0_alpha2.ebuild b/dev-lang/python/python-3.14.0_alpha2.ebuild
deleted file mode 100644
index 3f87b266c470..000000000000
--- a/dev-lang/python/python-3.14.0_alpha2.ebuild
+++ /dev/null
@@ -1,659 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-LLVM_COMPAT=( 19 )
-LLVM_OPTIONAL=1
-VERIFY_SIG_METHOD=sigstore
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic linux-info llvm-r1
-inherit multiprocessing pax-utils python-utils-r1 toolchain-funcs
-inherit verify-sig
-
-MY_PV=${PV/_alpha/a}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.sigstore
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm jit
-	libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind
-"
-REQUIRED_USE="jit? ( ${LLVM_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-libs/mpdecimal:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-pip )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? (
-		dev-python/ensurepip-pip
-		dev-python/ensurepip-setuptools
-		dev-python/ensurepip-wheel
-	)
-	valgrind? ( dev-debug/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	dev-build/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	jit? (
-		$(llvm_gen_dep '
-			llvm-core/clang:${LLVM_SLOT}
-			llvm-core/llvm:${LLVM_SLOT}
-		')
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-# https://www.python.org/downloads/metadata/sigstore/
-VERIFY_SIG_CERT_IDENTITY=hugo@python.org
-VERIFY_SIG_CERT_OIDC_ISSUER=https://github.com/login/oauth
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER%t}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-declare -rgA PYTHON_KERNEL_CHECKS=(
-	["CROSS_MEMORY_ATTACH"]="test_external_inspection" #bug 938589
-	["DNOTIFY"]="test_fcntl" # bug 938662
-)
-
-pkg_pretend() {
-	if use pgo || use test; then
-		check-reqs_pkg_pretend
-	fi
-
-	if use jit; then
-		ewarn "USE=jit is considered experimental upstream.  Using it"
-		ewarn "could lead to unexpected breakage, including race conditions"
-		ewarn "and crashes, respectively.  Please do not file Gentoo bugs, unless"
-		ewarn "you can reproduce the problem with dev-lang/python[-jit].  Instead,"
-		ewarn "please consider reporting JIT problems upstream."
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		use jit && llvm-r1_pkg_setup
-		if use test || use pgo; then
-			check-reqs_pkg_setup
-
-			local CONFIG_CHECK
-			for f in "${!PYTHON_KERNEL_CHECKS[@]}"; do
-				CONFIG_CHECK+="~${f} "
-			done
-			linux-info_pkg_setup
-		fi
-	fi
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sigstore}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	# TODO: Makefile has annoying deps on expat headers
-	#rm -r Modules/expat || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
-
-	# breaks tests when using --with-wheel-pkg-dir
-	rm -r Lib/test/wheeldata || die
-
-	eautoreconf
-}
-
-build_cbuild_python() {
-	# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-	local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	#
-	# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
-	local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
-	local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-	local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
-	local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
-
-	# We need to build our own Python on CBUILD first, and feed it in.
-	# bug #847910
-	local myeconfargs_cbuild=(
-		"${myeconfargs[@]}"
-
-		--prefix="${BROOT}"/usr
-		--libdir="${cbuild_libdir:2}"
-
-		# Avoid needing to load the right libpython.so.
-		--disable-shared
-
-		# As minimal as possible for the mini CBUILD Python
-		# we build just for cross to satisfy --with-build-python.
-		--without-lto
-		--without-readline
-		--disable-optimizations
-	)
-
-	mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-	pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-
-	# Avoid as many dependencies as possible for the cross build.
-	mkdir Modules || die
-	cat > Modules/Setup.local <<-EOF || die
-		*disabled*
-		nis
-		_dbm _gdbm
-		_sqlite3
-		_hashlib _ssl
-		_curses _curses_panel
-		readline
-		_tkinter
-		pyexpat
-		zlib
-		# We disabled these for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross. This should be rechecked for the pure Makefile approach,
-		# and uncommented if needed.
-		#_ctypes
-	EOF
-
-	ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-	# Unfortunately, we do have to build this immediately, and
-	# not in src_compile, because CHOST configure for Python
-	# will check the existence of the --with-build-python value
-	# immediately.
-	emake
-	popd &> /dev/null || die
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	# Set baseline test skip flags.
-	COMMON_TEST_SKIPS=(
-		# this is actually test_gdb.test_pretty_print
-		-x test_pretty_print
-		# https://bugs.gentoo.org/933840
-		-x test_perf_profiler
-	)
-
-	# Arch-specific skips.  See #931888 for a collection of these.
-	case ${CHOST} in
-		alpha*)
-			COMMON_TEST_SKIPS+=(
-				-x test_builtin
-				-x test_capi
-				-x test_cmath
-				-x test_float
-				# timeout
-				-x test_free_threading
-				-x test_math
-				-x test_numeric_tower
-				-x test_random
-				-x test_statistics
-				# bug 653850
-				-x test_resource
-				-x test_strtod
-			)
-			;;
-		hppa*)
-			COMMON_TEST_SKIPS+=(
-				-x test_gdb
-			)
-			;;
-		mips*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-				-x test_statistics
-			)
-			;;
-		powerpc64-*) # big endian
-			COMMON_TEST_SKIPS+=(
-				-x test_gdb
-			)
-			;;
-		riscv*)
-			COMMON_TEST_SKIPS+=(
-				-x test_urllib2
-			)
-			;;
-		sparc*)
-			COMMON_TEST_SKIPS+=(
-				# bug 788022
-				-x test_multiprocessing_fork
-				-x test_multiprocessing_forkserver
-				-x test_multiprocessing_spawn
-
-				-x test_ctypes
-				-x test_gdb
-				# bug 931908
-				-x test_exceptions
-			)
-			;;
-	esac
-
-	# Kernel-config specific skips
-	for option in "${!PYTHON_KERNEL_CHECKS[@]}"; do
-		if ! linux_config_exists || ! linux_chkconfig_present "${option}"
-		then
-			COMMON_TEST_SKIPS+=( -x "${PYTHON_KERNEL_CHECKS[${option}]}" )
-		fi
-	done
-
-	# musl-specific skips
-	use elibc_musl && COMMON_TEST_SKIPS+=(
-		# various musl locale deficiencies
-		-x test__locale
-		-x test_c_locale_coercion
-		-x test_locale
-		-x test_re
-
-		# known issues with find_library on musl
-		# https://bugs.python.org/issue21622
-		-x test_ctypes
-
-		# fpathconf, ttyname errno values
-		-x test_os
-	)
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			--verbose3
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			"${COMMON_TEST_SKIPS[@]}"
-
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-
-			# Fails in profiling run, passes in src_test().
-			-x test_capi
-			-x test_embed
-		)
-
-		# Arch-specific skips.  See #931888 for a collection of these.
-		case ${CHOST} in
-			alpha*)
-				profile_task_flags+=(
-					-x test_os
-				)
-				;;
-			hppa*)
-				profile_task_flags+=(
-					-x test_descr
-					# bug 931908
-					-x test_exceptions
-					-x test_os
-				)
-				;;
-			powerpc64-*) # big endian
-				profile_task_flags+=(
-					# bug 931908
-					-x test_exceptions
-				)
-				;;
-			riscv*)
-				profile_task_flags+=(
-					-x test_statistics
-				)
-				;;
-		esac
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--without-lto
-		--with-system-expat
-		--with-system-libmpdec
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-		--enable-gil
-
-		$(use_with debug assertions)
-		$(use_enable jit experimental-jit)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-		$(use_with valgrind)
-	)
-
-	# https://bugs.gentoo.org/700012
-	if tc-is-lto; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-		myeconfargs+=(
-			--with-lto
-		)
-	fi
-
-	# Force-disable modules we don't want built.
-	# See Modules/Setup for docs on how this works. Setup.local contains our local deviations.
-	cat > Modules/Setup.local <<-EOF || die
-		*disabled*
-		nis
-		$(usev !gdbm '_gdbm _dbm')
-		$(usev !sqlite '_sqlite3')
-		$(usev !ssl '_hashlib _ssl')
-		$(usev !ncurses '_curses _curses_panel')
-		$(usev !readline 'readline')
-		$(usev !tk '_tkinter')
-	EOF
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		build_cbuild_python
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	# Gentoo hack to disable accessing system site-packages
-	export GENTOO_CPYTHON_BUILD=1
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		--verbose3
-		-u-network
-		-j "$(makeopts_jobs)"
-		"${COMMON_TEST_SKIPS[@]}"
-	)
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" TEST_MODULES=no altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# pydoc
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.14.0_alpha3-r100.ebuild b/dev-lang/python/python-3.14.0_alpha3-r100.ebuild
index eb87a6ac8197..2abe01749d3a 100644
--- a/dev-lang/python/python-3.14.0_alpha3-r100.ebuild
+++ b/dev-lang/python/python-3.14.0_alpha3-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"
@@ -374,48 +374,16 @@ src_configure() {
 			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
 			# bug #900429
 			-x test_tools
-
-			# Fails in profiling run, passes in src_test().
-			-x test_capi
-			-x test_embed
-			-x test_external_inspection
 		)
 
-		# Arch-specific skips.  See #931888 for a collection of these.
-		case ${CHOST} in
-			alpha*)
-				profile_task_flags+=(
-					-x test_os
-				)
-				;;
-			hppa*)
-				profile_task_flags+=(
-					-x test_descr
-					# bug 931908
-					-x test_exceptions
-					-x test_os
-				)
-				;;
-			powerpc64-*) # big endian
-				profile_task_flags+=(
-					# bug 931908
-					-x test_exceptions
-				)
-				;;
-			riscv*)
-				profile_task_flags+=(
-					-x test_statistics
-				)
-				;;
-		esac
-
 		if has_version "app-arch/rpm" ; then
 			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
 			profile_task_flags+=(
 				-x test_distutils
 			)
 		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
+		# PGO sometimes fails randomly
+		local -x PROFILE_TASK="${profile_task_flags[*]} || true"
 	fi
 
 	local myeconfargs=(
@@ -523,7 +491,7 @@ src_compile() {
 		# bug 660358
 		local -x COLUMNS=80
 		local -x PYTHONDONTWRITEBYTECODE=
-		local -x TMPDIR=/tmp
+		local -x TMPDIR=/var/tmp
 	fi
 
 	# also need to clear the flags explicitly here or they end up
@@ -563,7 +531,7 @@ src_test() {
 	# bug 660358
 	local -x COLUMNS=80
 	local -x PYTHONDONTWRITEBYTECODE=
-	local -x TMPDIR=/tmp
+	local -x TMPDIR=/var/tmp
 
 	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
 		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
diff --git a/dev-lang/python/python-3.14.0_alpha3.ebuild b/dev-lang/python/python-3.14.0_alpha3.ebuild
index 3f87b266c470..f4da576cf95f 100644
--- a/dev-lang/python/python-3.14.0_alpha3.ebuild
+++ b/dev-lang/python/python-3.14.0_alpha3.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"
@@ -376,47 +376,16 @@ src_configure() {
 			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
 			# bug #900429
 			-x test_tools
-
-			# Fails in profiling run, passes in src_test().
-			-x test_capi
-			-x test_embed
 		)
 
-		# Arch-specific skips.  See #931888 for a collection of these.
-		case ${CHOST} in
-			alpha*)
-				profile_task_flags+=(
-					-x test_os
-				)
-				;;
-			hppa*)
-				profile_task_flags+=(
-					-x test_descr
-					# bug 931908
-					-x test_exceptions
-					-x test_os
-				)
-				;;
-			powerpc64-*) # big endian
-				profile_task_flags+=(
-					# bug 931908
-					-x test_exceptions
-				)
-				;;
-			riscv*)
-				profile_task_flags+=(
-					-x test_statistics
-				)
-				;;
-		esac
-
 		if has_version "app-arch/rpm" ; then
 			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
 			profile_task_flags+=(
 				-x test_distutils
 			)
 		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
+		# PGO sometimes fails randomly
+		local -x PROFILE_TASK="${profile_task_flags[*]} || true"
 	fi
 
 	local myeconfargs=(
@@ -524,6 +493,7 @@ src_compile() {
 		# bug 660358
 		local -x COLUMNS=80
 		local -x PYTHONDONTWRITEBYTECODE=
+		local -x TMPDIR=/var/tmp
 	fi
 
 	# also need to clear the flags explicitly here or they end up
@@ -563,6 +533,7 @@ src_test() {
 	# bug 660358
 	local -x COLUMNS=80
 	local -x PYTHONDONTWRITEBYTECODE=
+	local -x TMPDIR=/var/tmp
 
 	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
 		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
diff --git a/dev-lang/python/python-3.14.0_alpha4-r100.ebuild b/dev-lang/python/python-3.14.0_alpha4-r100.ebuild
new file mode 100644
index 000000000000..2abe01749d3a
--- /dev/null
+++ b/dev-lang/python/python-3.14.0_alpha4-r100.ebuild
@@ -0,0 +1,635 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+LLVM_COMPAT=( 19 )
+LLVM_OPTIONAL=1
+VERIFY_SIG_METHOD=sigstore
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic linux-info llvm-r1
+inherit multiprocessing pax-utils python-utils-r1 toolchain-funcs
+inherit verify-sig
+
+MY_PV=${PV/_alpha/a}
+MY_P="Python-${MY_PV%_p*}"
+PYVER="$(ver_cut 1-2)t"
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="Freethreading (no-GIL) version of Python programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.sigstore
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+IUSE="
+	bluetooth build debug +ensurepip examples gdbm jit
+	libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind
+"
+REQUIRED_USE="jit? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	>=dev-libs/expat-2.1:=
+	dev-libs/libffi:=
+	dev-libs/mpdecimal:=
+	dev-python/gentoo-common
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-pip )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	kernel_linux? ( sys-apps/util-linux:= )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? (
+		!libedit? ( >=sys-libs/readline-4.1:= )
+		libedit? ( dev-libs/libedit:= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? (
+		dev-python/ensurepip-pip
+		dev-python/ensurepip-setuptools
+		dev-python/ensurepip-wheel
+	)
+	valgrind? ( dev-debug/valgrind )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	dev-build/autoconf-archive
+	app-alternatives/awk
+	virtual/pkgconfig
+	jit? (
+		$(llvm_gen_dep '
+			llvm-core/clang:${LLVM_SLOT}
+			llvm-core/llvm:${LLVM_SLOT}
+		')
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+if [[ ${PV} != *_alpha* ]]; then
+	RDEPEND+="
+		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
+	"
+fi
+
+# https://www.python.org/downloads/metadata/sigstore/
+VERIFY_SIG_CERT_IDENTITY=hugo@python.org
+VERIFY_SIG_CERT_OIDC_ISSUER=https://github.com/login/oauth
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER%t}
+# false positives -- functions specific to *BSD
+QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
+
+declare -rgA PYTHON_KERNEL_CHECKS=(
+	["CROSS_MEMORY_ATTACH"]="test_external_inspection" #bug 938589
+	["DNOTIFY"]="test_fcntl" # bug 938662
+)
+
+pkg_pretend() {
+	if use pgo || use test; then
+		check-reqs_pkg_pretend
+	fi
+
+	ewarn "Freethreading build is considered experimental upstream.  Using it"
+	ewarn "could lead to unexpected breakage, including race conditions"
+	ewarn "and crashes, respectively.  Please do not file Gentoo bugs, unless"
+	ewarn "you can reproduce the problem with dev-lang/python.  Instead,"
+	ewarn "please consider reporting freethreading problems upstream."
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		use jit && llvm-r1_pkg_setup
+		if use test || use pgo; then
+			check-reqs_pkg_setup
+
+			local CONFIG_CHECK
+			for f in "${!PYTHON_KERNEL_CHECKS[@]}"; do
+				CONFIG_CHECK+="~${f} "
+			done
+			linux-info_pkg_setup
+		fi
+	fi
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sigstore}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	# TODO: Makefile has annoying deps on expat headers
+	#rm -r Modules/expat || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
+
+	# breaks tests when using --with-wheel-pkg-dir
+	rm -r Lib/test/wheeldata || die
+
+	eautoreconf
+}
+
+build_cbuild_python() {
+	# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+	local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	#
+	# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
+	local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
+	local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+	local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
+	local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
+
+	# We need to build our own Python on CBUILD first, and feed it in.
+	# bug #847910
+	local myeconfargs_cbuild=(
+		"${myeconfargs[@]}"
+
+		--prefix="${BROOT}"/usr
+		--libdir="${cbuild_libdir:2}"
+
+		# Avoid needing to load the right libpython.so.
+		--disable-shared
+
+		# As minimal as possible for the mini CBUILD Python
+		# we build just for cross to satisfy --with-build-python.
+		--without-lto
+		--without-readline
+		--disable-optimizations
+	)
+
+	mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+	pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+
+	# Avoid as many dependencies as possible for the cross build.
+	mkdir Modules || die
+	cat > Modules/Setup.local <<-EOF || die
+		*disabled*
+		nis
+		_dbm _gdbm
+		_sqlite3
+		_hashlib _ssl
+		_curses _curses_panel
+		readline
+		_tkinter
+		pyexpat
+		zlib
+		# We disabled these for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross. This should be rechecked for the pure Makefile approach,
+		# and uncommented if needed.
+		#_ctypes
+	EOF
+
+	ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+	# Unfortunately, we do have to build this immediately, and
+	# not in src_compile, because CHOST configure for Python
+	# will check the existence of the --with-build-python value
+	# immediately.
+	emake
+	popd &> /dev/null || die
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	# Set baseline test skip flags.
+	COMMON_TEST_SKIPS=(
+		# this is actually test_gdb.test_pretty_print
+		-x test_pretty_print
+		# https://bugs.gentoo.org/933840
+		-x test_perf_profiler
+	)
+
+	# Arch-specific skips.  See #931888 for a collection of these.
+	case ${CHOST} in
+		alpha*)
+			COMMON_TEST_SKIPS+=(
+				-x test_builtin
+				-x test_capi
+				-x test_cmath
+				-x test_float
+				# timeout
+				-x test_free_threading
+				-x test_math
+				-x test_numeric_tower
+				-x test_random
+				-x test_statistics
+				# bug 653850
+				-x test_resource
+				-x test_strtod
+			)
+			;;
+		hppa*)
+			COMMON_TEST_SKIPS+=(
+				-x test_gdb
+			)
+			;;
+		mips*)
+			COMMON_TEST_SKIPS+=(
+				-x test_ctypes
+				-x test_external_inspection
+				-x test_statistics
+			)
+			;;
+		powerpc64-*) # big endian
+			COMMON_TEST_SKIPS+=(
+				-x test_gdb
+			)
+			;;
+		riscv*)
+			COMMON_TEST_SKIPS+=(
+				-x test_urllib2
+			)
+			;;
+		sparc*)
+			COMMON_TEST_SKIPS+=(
+				# bug 788022
+				-x test_multiprocessing_fork
+				-x test_multiprocessing_forkserver
+				-x test_multiprocessing_spawn
+
+				-x test_ctypes
+				-x test_gdb
+				# bug 931908
+				-x test_exceptions
+			)
+			;;
+	esac
+
+	# Kernel-config specific skips
+	for option in "${!PYTHON_KERNEL_CHECKS[@]}"; do
+		if ! linux_config_exists || ! linux_chkconfig_present "${option}"
+		then
+			COMMON_TEST_SKIPS+=( -x "${PYTHON_KERNEL_CHECKS[${option}]}" )
+		fi
+	done
+
+	# musl-specific skips
+	use elibc_musl && COMMON_TEST_SKIPS+=(
+		# various musl locale deficiencies
+		-x test__locale
+		-x test_c_locale_coercion
+		-x test_locale
+		-x test_re
+
+		# known issues with find_library on musl
+		# https://bugs.python.org/issue21622
+		-x test_ctypes
+
+		# fpathconf, ttyname errno values
+		-x test_os
+	)
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			--verbose3
+			-u-network
+
+			# We use a timeout because of how often we've had hang issues
+			# here. It also matches the default upstream PROFILE_TASK.
+			--timeout 1200
+
+			"${COMMON_TEST_SKIPS[@]}"
+
+			-x test_dtrace
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+
+			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
+			# bug #900429
+			-x test_tools
+		)
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		# PGO sometimes fails randomly
+		local -x PROFILE_TASK="${profile_task_flags[*]} || true"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--without-lto
+		--with-system-expat
+		--with-system-libmpdec
+		--with-platlibdir=lib
+		--with-pkg-config=yes
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+		--disable-gil
+
+		$(use_with debug assertions)
+		$(use_enable jit experimental-jit)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+		$(use_with valgrind)
+	)
+
+	# https://bugs.gentoo.org/700012
+	if tc-is-lto; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+		myeconfargs+=(
+			--with-lto
+		)
+	fi
+
+	# Force-disable modules we don't want built.
+	# See Modules/Setup for docs on how this works. Setup.local contains our local deviations.
+	cat > Modules/Setup.local <<-EOF || die
+		*disabled*
+		nis
+		$(usev !gdbm '_gdbm _dbm')
+		$(usev !sqlite '_sqlite3')
+		$(usev !ssl '_hashlib _ssl')
+		$(usev !ncurses '_curses _curses_panel')
+		$(usev !readline 'readline')
+		$(usev !tk '_tkinter')
+	EOF
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+
+	if tc-is-cross-compiler ; then
+		build_cbuild_python
+		myeconfargs+=(
+			# Point the imminent CHOST build to the Python we just
+			# built for CBUILD.
+			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
+		)
+	fi
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	export PYTHONSTRICTEXTENSIONBUILD=1
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	# Gentoo hack to disable accessing system site-packages
+	export GENTOO_CPYTHON_BUILD=1
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+		local -x TMPDIR=/var/tmp
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# this just happens to skip test_support.test_freeze that is broken
+	# without bundled expat
+	# TODO: get a proper skip for it upstream
+	local -x LOGNAME=buildbot
+
+	local test_opts=(
+		--verbose3
+		-u-network
+		-j "$(makeopts_jobs)"
+		"${COMMON_TEST_SKIPS[@]}"
+	)
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x TMPDIR=/var/tmp
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	[[ ${ret} -eq 0 ]] || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	# -j1 hack for now for bug #843458
+	emake -j1 DESTDIR="${D}" TEST_MODULES=no altinstall
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+	# Fix collision with GIL-enabled build.
+	rm "${ED}/usr/bin/python${PYVER%t}" || die
+	mv "${ED}"/usr/bin/pydoc{${PYVER%t},${PYVER}} || die
+	mv "${ED}"/usr/share/man/man1/python{${PYVER%t},${PYVER}}.1 || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use sqlite; then
+		rm -r "${libdir}/"sqlite3 || die
+	fi
+	if use tk; then
+		# rename to avoid collision with dev-lang/python
+		mv "${ED}"/usr/bin/idle{${PYVER%t},${PYVER}} || die
+	else
+		rm -r "${ED}/usr/bin/idle${PYVER%t}" || die
+		rm -r "${libdir}/"{idlelib,tkinter} || die
+	fi
+
+	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# pydoc
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.14.0_alpha4.ebuild b/dev-lang/python/python-3.14.0_alpha4.ebuild
new file mode 100644
index 000000000000..f4da576cf95f
--- /dev/null
+++ b/dev-lang/python/python-3.14.0_alpha4.ebuild
@@ -0,0 +1,630 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+LLVM_COMPAT=( 19 )
+LLVM_OPTIONAL=1
+VERIFY_SIG_METHOD=sigstore
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic linux-info llvm-r1
+inherit multiprocessing pax-utils python-utils-r1 toolchain-funcs
+inherit verify-sig
+
+MY_PV=${PV/_alpha/a}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.sigstore
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+IUSE="
+	bluetooth build debug +ensurepip examples gdbm jit
+	libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind
+"
+REQUIRED_USE="jit? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	>=dev-libs/expat-2.1:=
+	dev-libs/libffi:=
+	dev-libs/mpdecimal:=
+	dev-python/gentoo-common
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-pip )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	kernel_linux? ( sys-apps/util-linux:= )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? (
+		!libedit? ( >=sys-libs/readline-4.1:= )
+		libedit? ( dev-libs/libedit:= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? (
+		dev-python/ensurepip-pip
+		dev-python/ensurepip-setuptools
+		dev-python/ensurepip-wheel
+	)
+	valgrind? ( dev-debug/valgrind )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	dev-build/autoconf-archive
+	app-alternatives/awk
+	virtual/pkgconfig
+	jit? (
+		$(llvm_gen_dep '
+			llvm-core/clang:${LLVM_SLOT}
+			llvm-core/llvm:${LLVM_SLOT}
+		')
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+if [[ ${PV} != *_alpha* ]]; then
+	RDEPEND+="
+		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
+	"
+fi
+
+# https://www.python.org/downloads/metadata/sigstore/
+VERIFY_SIG_CERT_IDENTITY=hugo@python.org
+VERIFY_SIG_CERT_OIDC_ISSUER=https://github.com/login/oauth
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER%t}
+# false positives -- functions specific to *BSD
+QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
+
+declare -rgA PYTHON_KERNEL_CHECKS=(
+	["CROSS_MEMORY_ATTACH"]="test_external_inspection" #bug 938589
+	["DNOTIFY"]="test_fcntl" # bug 938662
+)
+
+pkg_pretend() {
+	if use pgo || use test; then
+		check-reqs_pkg_pretend
+	fi
+
+	if use jit; then
+		ewarn "USE=jit is considered experimental upstream.  Using it"
+		ewarn "could lead to unexpected breakage, including race conditions"
+		ewarn "and crashes, respectively.  Please do not file Gentoo bugs, unless"
+		ewarn "you can reproduce the problem with dev-lang/python[-jit].  Instead,"
+		ewarn "please consider reporting JIT problems upstream."
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		use jit && llvm-r1_pkg_setup
+		if use test || use pgo; then
+			check-reqs_pkg_setup
+
+			local CONFIG_CHECK
+			for f in "${!PYTHON_KERNEL_CHECKS[@]}"; do
+				CONFIG_CHECK+="~${f} "
+			done
+			linux-info_pkg_setup
+		fi
+	fi
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sigstore}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	# TODO: Makefile has annoying deps on expat headers
+	#rm -r Modules/expat || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
+
+	# breaks tests when using --with-wheel-pkg-dir
+	rm -r Lib/test/wheeldata || die
+
+	eautoreconf
+}
+
+build_cbuild_python() {
+	# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+	local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	#
+	# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
+	local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
+	local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+	local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
+	local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
+
+	# We need to build our own Python on CBUILD first, and feed it in.
+	# bug #847910
+	local myeconfargs_cbuild=(
+		"${myeconfargs[@]}"
+
+		--prefix="${BROOT}"/usr
+		--libdir="${cbuild_libdir:2}"
+
+		# Avoid needing to load the right libpython.so.
+		--disable-shared
+
+		# As minimal as possible for the mini CBUILD Python
+		# we build just for cross to satisfy --with-build-python.
+		--without-lto
+		--without-readline
+		--disable-optimizations
+	)
+
+	mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+	pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+
+	# Avoid as many dependencies as possible for the cross build.
+	mkdir Modules || die
+	cat > Modules/Setup.local <<-EOF || die
+		*disabled*
+		nis
+		_dbm _gdbm
+		_sqlite3
+		_hashlib _ssl
+		_curses _curses_panel
+		readline
+		_tkinter
+		pyexpat
+		zlib
+		# We disabled these for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross. This should be rechecked for the pure Makefile approach,
+		# and uncommented if needed.
+		#_ctypes
+	EOF
+
+	ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+	# Unfortunately, we do have to build this immediately, and
+	# not in src_compile, because CHOST configure for Python
+	# will check the existence of the --with-build-python value
+	# immediately.
+	emake
+	popd &> /dev/null || die
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	# Set baseline test skip flags.
+	COMMON_TEST_SKIPS=(
+		# this is actually test_gdb.test_pretty_print
+		-x test_pretty_print
+		# https://bugs.gentoo.org/933840
+		-x test_perf_profiler
+	)
+
+	# Arch-specific skips.  See #931888 for a collection of these.
+	case ${CHOST} in
+		alpha*)
+			COMMON_TEST_SKIPS+=(
+				-x test_builtin
+				-x test_capi
+				-x test_cmath
+				-x test_float
+				# timeout
+				-x test_free_threading
+				-x test_math
+				-x test_numeric_tower
+				-x test_random
+				-x test_statistics
+				# bug 653850
+				-x test_resource
+				-x test_strtod
+			)
+			;;
+		hppa*)
+			COMMON_TEST_SKIPS+=(
+				-x test_gdb
+			)
+			;;
+		mips*)
+			COMMON_TEST_SKIPS+=(
+				-x test_ctypes
+				-x test_external_inspection
+				-x test_statistics
+			)
+			;;
+		powerpc64-*) # big endian
+			COMMON_TEST_SKIPS+=(
+				-x test_gdb
+			)
+			;;
+		riscv*)
+			COMMON_TEST_SKIPS+=(
+				-x test_urllib2
+			)
+			;;
+		sparc*)
+			COMMON_TEST_SKIPS+=(
+				# bug 788022
+				-x test_multiprocessing_fork
+				-x test_multiprocessing_forkserver
+				-x test_multiprocessing_spawn
+
+				-x test_ctypes
+				-x test_gdb
+				# bug 931908
+				-x test_exceptions
+			)
+			;;
+	esac
+
+	# Kernel-config specific skips
+	for option in "${!PYTHON_KERNEL_CHECKS[@]}"; do
+		if ! linux_config_exists || ! linux_chkconfig_present "${option}"
+		then
+			COMMON_TEST_SKIPS+=( -x "${PYTHON_KERNEL_CHECKS[${option}]}" )
+		fi
+	done
+
+	# musl-specific skips
+	use elibc_musl && COMMON_TEST_SKIPS+=(
+		# various musl locale deficiencies
+		-x test__locale
+		-x test_c_locale_coercion
+		-x test_locale
+		-x test_re
+
+		# known issues with find_library on musl
+		# https://bugs.python.org/issue21622
+		-x test_ctypes
+
+		# fpathconf, ttyname errno values
+		-x test_os
+	)
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			--verbose3
+			-u-network
+
+			# We use a timeout because of how often we've had hang issues
+			# here. It also matches the default upstream PROFILE_TASK.
+			--timeout 1200
+
+			"${COMMON_TEST_SKIPS[@]}"
+
+			-x test_dtrace
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+
+			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
+			# bug #900429
+			-x test_tools
+		)
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		# PGO sometimes fails randomly
+		local -x PROFILE_TASK="${profile_task_flags[*]} || true"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--without-lto
+		--with-system-expat
+		--with-system-libmpdec
+		--with-platlibdir=lib
+		--with-pkg-config=yes
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+		--enable-gil
+
+		$(use_with debug assertions)
+		$(use_enable jit experimental-jit)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+		$(use_with valgrind)
+	)
+
+	# https://bugs.gentoo.org/700012
+	if tc-is-lto; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+		myeconfargs+=(
+			--with-lto
+		)
+	fi
+
+	# Force-disable modules we don't want built.
+	# See Modules/Setup for docs on how this works. Setup.local contains our local deviations.
+	cat > Modules/Setup.local <<-EOF || die
+		*disabled*
+		nis
+		$(usev !gdbm '_gdbm _dbm')
+		$(usev !sqlite '_sqlite3')
+		$(usev !ssl '_hashlib _ssl')
+		$(usev !ncurses '_curses _curses_panel')
+		$(usev !readline 'readline')
+		$(usev !tk '_tkinter')
+	EOF
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+
+	if tc-is-cross-compiler ; then
+		build_cbuild_python
+		myeconfargs+=(
+			# Point the imminent CHOST build to the Python we just
+			# built for CBUILD.
+			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
+		)
+	fi
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	export PYTHONSTRICTEXTENSIONBUILD=1
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	# Gentoo hack to disable accessing system site-packages
+	export GENTOO_CPYTHON_BUILD=1
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+		local -x TMPDIR=/var/tmp
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# this just happens to skip test_support.test_freeze that is broken
+	# without bundled expat
+	# TODO: get a proper skip for it upstream
+	local -x LOGNAME=buildbot
+
+	local test_opts=(
+		--verbose3
+		-u-network
+		-j "$(makeopts_jobs)"
+		"${COMMON_TEST_SKIPS[@]}"
+	)
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x TMPDIR=/var/tmp
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	[[ ${ret} -eq 0 ]] || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	# -j1 hack for now for bug #843458
+	emake -j1 DESTDIR="${D}" TEST_MODULES=no altinstall
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use sqlite; then
+		rm -r "${libdir}/"sqlite3 || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter} || die
+	fi
+
+	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# pydoc
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.8.20_p2.ebuild b/dev-lang/python/python-3.8.20_p2.ebuild
deleted file mode 100644
index 6cf801146df0..000000000000
--- a/dev-lang/python/python-3.8.20_p2.ebuild
+++ /dev/null
@@ -1,491 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic multiprocessing pax-utils
-inherit prefix python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm +ncurses pgo
-	+readline +sqlite +ssl test tk valgrind
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-libs/mpdecimal:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils )
-	valgrind? ( dev-debug/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	dev-build/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# https://bugs.gentoo.org/850151
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs)
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	rm Lib/distutils/command/wininst*.exe || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-	local disable
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	# Set baseline test skip flags.
-	COMMON_TEST_SKIPS=(
-		-x test_gdb
-	)
-
-	# Arch-specific skips.  See #931888 for a collection of these.
-	case ${CHOST} in
-		alpha*)
-			COMMON_TEST_SKIPS+=(
-				-x test_builtin
-				-x test_capi
-				-x test_cmath
-				-x test_float
-				# timeout
-				-x test_free_threading
-				-x test_math
-				-x test_numeric_tower
-				-x test_random
-				-x test_statistics
-				# bug 653850
-				-x test_resource
-				-x test_strtod
-			)
-			;;
-		mips*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-				-x test_statistics
-			)
-			;;
-		powerpc64-*) # big endian
-			COMMON_TEST_SKIPS+=(
-				-x test_descr
-			)
-			;;
-		riscv*)
-			COMMON_TEST_SKIPS+=(
-				-x test_urllib2
-			)
-			;;
-		sparc*)
-			COMMON_TEST_SKIPS+=(
-				# bug 788022
-				-x test_multiprocessing_fork
-				-x test_multiprocessing_forkserver
-				-x test_multiprocessing_spawn
-
-				-x test_ctypes
-				-x test_descr
-				# bug 931908
-				-x test_exceptions
-			)
-			;;
-	esac
-
-	# musl-specific skips
-	use elibc_musl && COMMON_TEST_SKIPS+=(
-		# various musl locale deficiencies
-		-x test__locale
-		-x test_c_locale_coercion
-		-x test_locale
-		-x test_re
-
-		# known issues with find_library on musl
-		# https://bugs.python.org/issue21622
-		-x test_ctypes
-
-		# fpathconf, ttyname errno values
-		-x test_os
-	)
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--without-lto
-		--with-system-expat
-		--with-system-ffi
-		--with-system-libmpdec
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_with valgrind)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	# https://bugs.gentoo.org/700012
-	if tc-is-lto; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-		myeconfargs+=(
-			--with-lto
-		)
-	fi
-
-	if tc-is-cross-compiler ; then
-		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		#
-		# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
-		local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
-		local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
-		local -x CFLAGS= LDFLAGS=
-		local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
-		local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910 and bug #864911.
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			--libdir="${cbuild_libdir:2}"
-
-			# Avoid needing to load the right libpython.so.
-			--disable-shared
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross.
-			--without-lto
-			--disable-optimizations
-		)
-
-		# Point the imminent CHOST build to the Python we just
-		# built for CBUILD.
-		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
-			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS=disabled
-			MODULE__DBM=disabled
-			MODULE__GDBM=disabled
-			MODULE__DBM=disabled
-			MODULE__SQLITE3=disabled
-			MODULE__HASHLIB=disabled
-			MODULE__SSL=disabled
-			MODULE__CURSES=disabled
-			MODULE__CURSES_PANEL=disabled
-			MODULE_READLINE=disabled
-			MODULE__TKINTER=disabled
-			MODULE_PYEXPAT=disabled
-			MODULE_ZLIB=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the Python it was pointed to
-		# immediately.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	hprefixify setup.py
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# Gentoo hack to disable accessing system site-packages
-	export GENTOO_CPYTHON_BUILD=1
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	local test_opts=(
-		--verbose3
-		-u-network
-		-j "$(makeopts_jobs)"
-		"${COMMON_TEST_SKIPS[@]}"
-	)
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x TMPDIR=/tmp
-
-	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.8.20_p4.ebuild b/dev-lang/python/python-3.8.20_p4.ebuild
deleted file mode 100644
index 6cf801146df0..000000000000
--- a/dev-lang/python/python-3.8.20_p4.ebuild
+++ /dev/null
@@ -1,491 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic multiprocessing pax-utils
-inherit prefix python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm +ncurses pgo
-	+readline +sqlite +ssl test tk valgrind
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-libs/mpdecimal:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils )
-	valgrind? ( dev-debug/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	dev-build/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# https://bugs.gentoo.org/850151
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs)
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	rm Lib/distutils/command/wininst*.exe || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-	local disable
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	# Set baseline test skip flags.
-	COMMON_TEST_SKIPS=(
-		-x test_gdb
-	)
-
-	# Arch-specific skips.  See #931888 for a collection of these.
-	case ${CHOST} in
-		alpha*)
-			COMMON_TEST_SKIPS+=(
-				-x test_builtin
-				-x test_capi
-				-x test_cmath
-				-x test_float
-				# timeout
-				-x test_free_threading
-				-x test_math
-				-x test_numeric_tower
-				-x test_random
-				-x test_statistics
-				# bug 653850
-				-x test_resource
-				-x test_strtod
-			)
-			;;
-		mips*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-				-x test_statistics
-			)
-			;;
-		powerpc64-*) # big endian
-			COMMON_TEST_SKIPS+=(
-				-x test_descr
-			)
-			;;
-		riscv*)
-			COMMON_TEST_SKIPS+=(
-				-x test_urllib2
-			)
-			;;
-		sparc*)
-			COMMON_TEST_SKIPS+=(
-				# bug 788022
-				-x test_multiprocessing_fork
-				-x test_multiprocessing_forkserver
-				-x test_multiprocessing_spawn
-
-				-x test_ctypes
-				-x test_descr
-				# bug 931908
-				-x test_exceptions
-			)
-			;;
-	esac
-
-	# musl-specific skips
-	use elibc_musl && COMMON_TEST_SKIPS+=(
-		# various musl locale deficiencies
-		-x test__locale
-		-x test_c_locale_coercion
-		-x test_locale
-		-x test_re
-
-		# known issues with find_library on musl
-		# https://bugs.python.org/issue21622
-		-x test_ctypes
-
-		# fpathconf, ttyname errno values
-		-x test_os
-	)
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--without-lto
-		--with-system-expat
-		--with-system-ffi
-		--with-system-libmpdec
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_with valgrind)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	# https://bugs.gentoo.org/700012
-	if tc-is-lto; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-		myeconfargs+=(
-			--with-lto
-		)
-	fi
-
-	if tc-is-cross-compiler ; then
-		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		#
-		# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
-		local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
-		local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
-		local -x CFLAGS= LDFLAGS=
-		local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
-		local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910 and bug #864911.
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			--libdir="${cbuild_libdir:2}"
-
-			# Avoid needing to load the right libpython.so.
-			--disable-shared
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross.
-			--without-lto
-			--disable-optimizations
-		)
-
-		# Point the imminent CHOST build to the Python we just
-		# built for CBUILD.
-		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
-			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS=disabled
-			MODULE__DBM=disabled
-			MODULE__GDBM=disabled
-			MODULE__DBM=disabled
-			MODULE__SQLITE3=disabled
-			MODULE__HASHLIB=disabled
-			MODULE__SSL=disabled
-			MODULE__CURSES=disabled
-			MODULE__CURSES_PANEL=disabled
-			MODULE_READLINE=disabled
-			MODULE__TKINTER=disabled
-			MODULE_PYEXPAT=disabled
-			MODULE_ZLIB=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the Python it was pointed to
-		# immediately.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	hprefixify setup.py
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# Gentoo hack to disable accessing system site-packages
-	export GENTOO_CPYTHON_BUILD=1
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	local test_opts=(
-		--verbose3
-		-u-network
-		-j "$(makeopts_jobs)"
-		"${COMMON_TEST_SKIPS[@]}"
-	)
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x TMPDIR=/tmp
-
-	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.8.20_p6.ebuild b/dev-lang/python/python-3.8.20_p6.ebuild
index 30902688c76f..c6e038ea7cda 100644
--- a/dev-lang/python/python-3.8.20_p6.ebuild
+++ b/dev-lang/python/python-3.8.20_p6.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"
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm +ncurses pgo
 	+readline +sqlite +ssl test tk valgrind
@@ -388,7 +388,7 @@ src_test() {
 	# bug 660358
 	local -x COLUMNS=80
 	local -x PYTHONDONTWRITEBYTECODE=
-	local -x TMPDIR=/tmp
+	local -x TMPDIR=/var/tmp
 
 	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
 		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
diff --git a/dev-lang/python/python-3.9.20_p1.ebuild b/dev-lang/python/python-3.9.20_p1.ebuild
deleted file mode 100644
index b224ecf70da0..000000000000
--- a/dev-lang/python/python-3.9.20_p1.ebuild
+++ /dev/null
@@ -1,584 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit prefix python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="
-	bluetooth build debug +ensurepip examples gdbm +ncurses pgo
-	+readline +sqlite +ssl test tk valgrind
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	dev-libs/mpdecimal:=
-	dev-python/gentoo-common
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	kernel_linux? ( sys-apps/util-linux:= )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils )
-	valgrind? ( dev-debug/valgrind )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	dev-build/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# https://bugs.gentoo.org/850151
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs)
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-	local disable
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	# Set baseline test skip flags.
-	COMMON_TEST_SKIPS=(
-		-x test_gdb
-	)
-
-	# Arch-specific skips.  See #931888 for a collection of these.
-	case ${CHOST} in
-		alpha*)
-			COMMON_TEST_SKIPS+=(
-				-x test_builtin
-				-x test_capi
-				-x test_cmath
-				-x test_float
-				# timeout
-				-x test_free_threading
-				-x test_math
-				-x test_numeric_tower
-				-x test_random
-				-x test_statistics
-				# bug 653850
-				-x test_resource
-				-x test_strtod
-			)
-			;;
-		mips*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-				-x test_statistics
-			)
-			;;
-		powerpc64-*) # big endian
-			COMMON_TEST_SKIPS+=(
-				-x test_descr
-			)
-			;;
-		riscv*)
-			COMMON_TEST_SKIPS+=(
-				-x test_urllib2
-			)
-			;;
-		sparc*)
-			COMMON_TEST_SKIPS+=(
-				# bug 788022
-				-x test_multiprocessing_fork
-				-x test_multiprocessing_forkserver
-				-x test_multiprocessing_spawn
-
-				-x test_ctypes
-				-x test_descr
-				# bug 931908
-				-x test_exceptions
-			)
-			;;
-	esac
-
-	# musl-specific skips
-	use elibc_musl && COMMON_TEST_SKIPS+=(
-		# various musl locale deficiencies
-		-x test__locale
-		-x test_c_locale_coercion
-		-x test_locale
-		-x test_re
-
-		# known issues with find_library on musl
-		# https://bugs.python.org/issue21622
-		-x test_ctypes
-
-		# fpathconf, ttyname errno values
-		-x test_os
-	)
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-u-network
-
-			# We use a timeout because of how often we've had hang issues
-			# here. It also matches the default upstream PROFILE_TASK.
-			--timeout 1200
-
-			"${COMMON_TEST_SKIPS[@]}"
-
-			-x test_dtrace
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_concurrent_futures
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-
-			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
-			# bug #900429
-			-x test_tools
-		)
-
-		# Arch-specific skips.  See #931888 for a collection of these.
-		case ${CHOST} in
-			alpha*)
-				profile_task_flags+=(
-					-x test_os
-				)
-				;;
-			hppa*)
-				profile_task_flags+=(
-					-x test_descr
-					# bug 931908
-					-x test_exceptions
-					-x test_os
-				)
-				;;
-			powerpc64-*) # big endian
-				profile_task_flags+=(
-					# bug 931908
-					-x test_exceptions
-				)
-				;;
-			riscv*)
-				profile_task_flags+=(
-					-x test_statistics
-				)
-				;;
-		esac
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--without-lto
-		--with-system-expat
-		--with-system-ffi
-		--with-system-libmpdec
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with debug assertions)
-		$(use_enable pgo optimizations)
-		$(use_with valgrind)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	# https://bugs.gentoo.org/700012
-	if tc-is-lto; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-		myeconfargs+=(
-			--with-lto
-		)
-	fi
-
-	if tc-is-cross-compiler ; then
-		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
-
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		#
-		# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
-		local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
-		local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
-		local -x CFLAGS= LDFLAGS=
-		local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
-		local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910 and bug #864911.
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			--libdir="${cbuild_libdir:2}"
-
-			# Avoid needing to load the right libpython.so.
-			--disable-shared
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross.
-			--without-lto
-			--disable-optimizations
-		)
-
-		# Point the imminent CHOST build to the Python we just
-		# built for CBUILD.
-		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
-		# libdir correctly for cross.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
-			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS=disabled
-			MODULE__DBM=disabled
-			MODULE__GDBM=disabled
-			MODULE__DBM=disabled
-			MODULE__SQLITE3=disabled
-			MODULE__HASHLIB=disabled
-			MODULE__SSL=disabled
-			MODULE__CURSES=disabled
-			MODULE__CURSES_PANEL=disabled
-			MODULE_READLINE=disabled
-			MODULE__TKINTER=disabled
-			MODULE_PYEXPAT=disabled
-			MODULE_ZLIB=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the Python it was pointed to
-		# immediately.
-		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	hprefixify setup.py
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	# Gentoo hack to disable accessing system site-packages
-	export GENTOO_CPYTHON_BUILD=1
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-		local -x TMPDIR=/tmp
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	local test_opts=(
-		--verbose3
-		-u-network
-		-j "$(makeopts_jobs)"
-		"${COMMON_TEST_SKIPS[@]}"
-	)
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x TMPDIR=/tmp
-
-	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.9.20_p2.ebuild b/dev-lang/python/python-3.9.20_p2.ebuild
index aa65518937fb..64cab1508101 100644
--- a/dev-lang/python/python-3.9.20_p2.ebuild
+++ b/dev-lang/python/python-3.9.20_p2.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"
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm +ncurses pgo
 	+readline +sqlite +ssl test tk valgrind
diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index 46d24648f75e..f4152926aa96 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,3 +1 @@
-DIST qp10.6.tar.gz 1671349 BLAKE2B 189ddd733a0bbf939387de60ec76e8e41a430af5f4684a9a3b8cc3effa4e402cfd4471c955f4d626d2de8cf14eb93c2977540ad209d06ce9b562325a4b984fea SHA512 425b35c758ba86cc14a1faf5c19f2c091142be6c42261323dc6f551efd6c80f7223584cd2be239748539eaf25308f777d95fd5bfdc65b33ca3245377e1766299
-DIST qp10.7.tar.gz 1857589 BLAKE2B 986f0d8744d5b0a3974191d154a2ca0efa97f6c02483d975b4bb43bd7ae44d9d4233f6bffc1947d03ac3db9c0181953254e66bc62d55add6b0debbed1ad21de6 SHA512 305c89710e02167bb37e999b5af182b9dbca710d32c79149782a90f29b2e80f6a5462e9fb22153e770cef7484c5181bde31f1fe680b786f0f253ced13a3df830
 DIST qp10.8.tar.gz 1707106 BLAKE2B aaba3e722c3aa3f566e7e4469f581fa854fc865066173664a18421c3de32ba7be804896812191b3bcdb2f4e713e9886f12765e0fc1bc3f5f609e0c679cdb4374 SHA512 7c677a9b9cac0c1de626f213be158297844fd403deb62ec976684926c287827734c27a89771b6e48dfc5822033aeb24aafc2c34cd13cada88db49ee1f9612fc7
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.x-compiler-flags.patch b/dev-lang/qu-prolog/files/qu-prolog-10.x-compiler-flags.patch
deleted file mode 100644
index 3d07947a4977..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-10.x-compiler-flags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- qp10.6.orig/configure.in	2020-06-24 23:37:02.000000000 -0000
-+++ qp10.6/configure.in	2021-05-15 16:36:32.504585122 -0000
-@@ -228,9 +228,12 @@
- #-----------------------------------------------------------------------------
- dnl Check for -fno-strict-aliasing
- AC_MSG_CHECKING([for -fno-strict-aliasing])
--echo "int i;" > aliasing_test.cc
--qp_alias=[`gcc -fno-strict-aliasing -c aliasing_test.cc`]
--rm aliasing_test.*
-+ac_saved_cflags=$[]_AC_LANG_PREFIX[]FLAGS
-+_AC_LANG_PREFIX[]FLAGS="-Werror -fno-strict-aliasing"
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int main(void) { return 0; }]])],
-+    [qp_alias=""],
-+    [qp_alias="not-found"])
-+_AC_LANG_PREFIX[]FLAGS="$ac_saved_cflags"
- if test -n "$qp_alias"; then
-     AC_MSG_RESULT(not found)
-     GCC_ALIAS_FLAG=
diff --git a/dev-lang/qu-prolog/qu-prolog-10.6.ebuild b/dev-lang/qu-prolog/qu-prolog-10.6.ebuild
deleted file mode 100644
index cc10e9da950d..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-10.6.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools multilib python-any-r1 qmake-utils
-
-MY_P=qp${PV}
-
-DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
-HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
-SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug doc examples pedro qt5 readline threads"
-
-RDEPEND="
-	!dev-util/mpatch
-	!dev-util/rej
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-	 )
-	pedro? ( net-misc/pedro )
-	readline? ( app-misc/rlwrap )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-10.x-qt5.patch
-	eapply "${FILESDIR}"/${PN}-10.x-compiler-flags.patch
-	eapply_user
-
-	eautoconf
-
-	python_fix_shebang "${S}"/bin/qc.in
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable debug) \
-		$(use_enable threads multiple-threads)
-
-	if use qt5; then
-		cd "${S}"/src/xqp || die
-		eqmake5 xqp.pro
-	fi
-}
-
-src_compile() {
-	emake OPTIMISATION="${CXXFLAGS}"
-
-	if use qt5; then
-		cd "${S}"/src/xqp || die
-		emake
-	fi
-}
-
-src_install() {
-	sed \
-		-e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
-		-i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
-
-	dobin bin/{qc,qecat,qp,kq}
-
-	use qt5 && dobin src/xqp/xqp
-
-	into /usr/$(get_libdir)/${PN}
-	dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
-
-	insinto /usr/$(get_libdir)/${PN}/bin
-	doins bin/rl_commands
-	doins bin/{qc1.qup,qecat,qg,qp}.qx
-
-	insinto /usr/$(get_libdir)/${PN}/library
-	doins prolog/library/*.qo
-
-	insinto /usr/$(get_libdir)/${PN}/compiler
-	doins prolog/compiler/*.qo
-
-	doman doc/man/man1/*.1
-
-	dodoc README
-
-	if use doc ; then
-		docinto reference-manual
-		dodoc doc/manual/*.html
-		docinto user-guide
-		dodoc doc/user/main.pdf
-	fi
-
-	if use examples ; then
-		docinto examples
-		newdoc examples/README README.examples
-		dodoc examples/*.ql
-	fi
-}
diff --git a/dev-lang/qu-prolog/qu-prolog-10.7.ebuild b/dev-lang/qu-prolog/qu-prolog-10.7.ebuild
deleted file mode 100644
index a9b27bccbba7..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-10.7.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools flag-o-matic python-any-r1 qmake-utils
-
-MY_P=qp${PV}
-
-DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
-HOMEPAGE="https://staff.itee.uq.edu.au/pjr/HomePages/QuPrologHome.html"
-SRC_URI="https://staff.itee.uq.edu.au/pjr/HomePages/QPFiles/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc examples pcre pedro qt5 readline threads"
-
-RDEPEND="
-	!dev-util/rej
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-	 )
-	pcre? ( dev-libs/libpcre2 )
-	pedro? ( net-misc/pedro )
-	readline? ( app-misc/rlwrap )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-10.x-qt5.patch
-	eapply "${FILESDIR}"/${PN}-10.x-compiler-flags.patch
-	eapply "${FILESDIR}"/${PN}-10.x-qa-compiler-flags.patch
-	eapply_user
-
-	mv configure.in configure.ac || die
-	eautoconf
-
-	python_fix_shebang "${S}"/bin/qc.in
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/924768
-	# Upstream's sole provided contact method is email. I have sent an email
-	# describing the issue with a fairly rapid response saying there will be
-	# a new release "shortly" and that hopefully it will include a fix. -- Eli
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable debug) \
-		$(use_enable threads multiple-threads)
-
-	if use qt5; then
-		cd "${S}"/src/xqp || die
-		eqmake5 xqp.pro
-	fi
-}
-
-src_compile() {
-	emake OPTIMISATION="${CXXFLAGS}"
-
-	if use qt5; then
-		cd "${S}"/src/xqp || die
-		emake
-	fi
-}
-
-src_install() {
-	sed \
-		-e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
-		-i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
-
-	dobin bin/{qc,qecat,qp,kq}
-
-	use qt5 && dobin src/xqp/xqp
-
-	into /usr/$(get_libdir)/${PN}
-	dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
-
-	insinto /usr/$(get_libdir)/${PN}/bin
-	doins bin/rl_commands
-	doins bin/{qc1.qup,qecat,qg,qp}.qx
-
-	insinto /usr/$(get_libdir)/${PN}/library
-	doins prolog/library/*.qo
-
-	insinto /usr/$(get_libdir)/${PN}/compiler
-	doins prolog/compiler/*.qo
-
-	doman doc/man/man1/*.1
-
-	dodoc README
-
-	if use doc ; then
-		docinto reference-manual
-		dodoc doc/manual/*.html
-		docinto user-guide
-		dodoc doc/user/main.pdf
-	fi
-
-	if use examples ; then
-		docinto examples
-		newdoc examples/README README.examples
-		dodoc examples/*.ql
-	fi
-}
diff --git a/dev-lang/qu-prolog/qu-prolog-10.8.ebuild b/dev-lang/qu-prolog/qu-prolog-10.8.ebuild
index bb5358c114ed..3768b27acc7b 100644
--- a/dev-lang/qu-prolog/qu-prolog-10.8.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-10.8.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 @@ SRC_URI="https://staff.itee.uq.edu.au/pjr/HomePages/QPFiles/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug doc examples pcre pedro qt5 readline threads"
 
 RDEPEND="
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 00c7742b8897..32482c770d08 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -7,4 +7,5 @@ DIST ruby-3.2.6.tar.xz 15126888 BLAKE2B d59352e5543b96abe3de5f10b578c2b910a0f18f
 DIST ruby-3.3.4.tar.xz 16366580 BLAKE2B e10b81ad7838e3d443ce0b12b8372faebb001f00a32dc0fa1f5e37c46baae99ea714e7f2a8741f0294255312030e844f32fc5d1c3695545cf8303e85b3255f21 SHA512 b26461a13ff82a08a282f10108028bb2a2e4a28da6182a291062fc54089c6655d79c22cc69d59156f9b11cb10a17fe8c69d489343fbae123a45f03361b95c9eb
 DIST ruby-3.3.5.tar.xz 16403660 BLAKE2B 4fa242ceeaf0dbf0d048b3f116f149f299c1a0ccca500a47929344da523cd3c49365381777e56546fe94003ee90ccc1f2cc957697eb82cd8beb7311b0b00287c SHA512 dd5c6a7f74854e143e0ca46b9d7c0d1983fc4886f5f733cd108345dbf4b21f61ad978ad6806e05a57b7af28fd9216dd38d7145808188bbb3695a7f3a4eda3883
 DIST ruby-3.3.6.tar.xz 16398228 BLAKE2B 7e2fb58ca1f5ee7ab9c2fd7b24fdbf9eef9805329cdf23c9926bac0268344f101475c2c7aacb26f73c4c5f73704727e19a9cc074c4587b9c53a115d6fb0a5e85 SHA512 c4b86188bf539fa737932e1ba5b746bc295e7c43b2f8cca2668eb7c88aa7228e2ce9032bbcd244a7d558a11bc842445b5fbeac3503ca7d223b63c53e08dba4ab
+DIST ruby-3.3.7.tar.xz 16379504 BLAKE2B 33bd05d8462ec7e33872a31bcbfabcfc65a0245dc6519248e474085f3255dc3ad67210400ac314b291f16d3eb261459cadba180dfccc510a2b2c978035435347 SHA512 4082a7684c1b0d53a0ce493f79568e851d37a864f59c58b2e0c273b2659e0ca75318ddff939fdf5e9d0a3eeba1b6d8f03bf88afb49a5ffd77714f1c8a7dfdd55
 DIST ruby-3.4.1.tar.xz 17222800 BLAKE2B 949cb57aeb6af4ca70d6638a2cd38ec9d067a3798ec27e02ee5934c902b74684b9f96d9fc00c1b22932de20b38b5bd3403a9a1a1bfe0c1caa380327d376d4c45 SHA512 8d2e34117696f9debf463ae1eed288fdbb5c1a12e32800e901b69218e3b7302a0066052077e2ebca851e3a635296199bd5a10437eea1d6f787f69a77bb865680
diff --git a/dev-lang/ruby/files/3.2/014-time-pointer-incompatibility.patch b/dev-lang/ruby/files/3.2/014-time-pointer-incompatibility.patch
new file mode 100644
index 000000000000..5363049b72aa
--- /dev/null
+++ b/dev-lang/ruby/files/3.2/014-time-pointer-incompatibility.patch
@@ -0,0 +1,28 @@
+From 59254caff0f39c87370d0c11793e3aae5c38d6e1 Mon Sep 17 00:00:00 2001
+From: nagachika <nagachika@ruby-lang.org>
+Date: Sun, 15 Dec 2024 15:31:58 +0900
+Subject: [PATCH] merge revision(s) 055613fd868a8c94e43893f8c58a00cdd2a81f6d:
+ [Backport #20447]
+
+	Fix pointer incompatiblity
+
+	Since the subsecond part is discarded, WIDEVAL to VALUE conversion is
+	needed.
+---
+ time.c    | 2 +-
+ version.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/time.c b/time.c
+index 7f859d5eb40acc..04f6f2afc5f28c 100644
+--- a/time.c
++++ b/time.c
+@@ -2322,7 +2322,7 @@ zone_timelocal(VALUE zone, VALUE time)
+     struct time_object *tobj = DATA_PTR(time);
+     wideval_t t, s;
+ 
+-    split_second(tobj->timew, &t, &s);
++    wdivmod(tobj->timew, WINT2FIXWV(TIME_SCALE), &t, &s);
+     tm = tm_from_time(rb_cTimeTM, time);
+     utc = rb_check_funcall(zone, id_local_to_utc, 1, &tm);
+     if (UNDEF_P(utc)) return 0;
diff --git a/dev-lang/ruby/files/3.4/901-musl-stacksize.patch b/dev-lang/ruby/files/3.4/901-musl-stacksize.patch
new file mode 100644
index 000000000000..f18aa271ea65
--- /dev/null
+++ b/dev-lang/ruby/files/3.4/901-musl-stacksize.patch
@@ -0,0 +1,20 @@
+--- a/thread_pthread.c	2023-02-08 05:02:20.000000000 +0100
++++ b/thread_pthread.c	2023-03-10 17:46:25.694739053 +0100
+@@ -1033,7 +1033,7 @@
+ {
+     native_main_thread.id = pthread_self();
+ 
+-#if MAINSTACKADDR_AVAILABLE
++#if MAINSTACKADDR_AVAILABLE && !(defined(__linux__) && !defined(__GLIBC__))
+     if (native_main_thread.stack_maxsize) return;
+     {
+         void* stackaddr;
+@@ -2090,7 +2090,7 @@
+ 
+ #ifdef STACKADDR_AVAILABLE
+     if (get_stack(&base, &size) == 0) {
+-# ifdef __APPLE__
++# if defined(__APPLE__) || (defined(__linux__) && !defined(__GLIBC__))
+         if (pthread_equal(th->nt->thread_id, native_main_thread.id)) {
+             struct rlimit rlim;
+             if (getrlimit(RLIMIT_STACK, &rlim) == 0 && rlim.rlim_cur > size) {
diff --git a/dev-lang/ruby/ruby-3.2.6-r3.ebuild b/dev-lang/ruby/ruby-3.2.6-r3.ebuild
new file mode 100644
index 000000000000..f29355c9117c
--- /dev/null
+++ b/dev-lang/ruby/ruby-3.2.6-r3.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+RUST_OPTIONAL="yes"
+
+inherit autotools flag-o-matic multiprocessing rust
+
+MY_P="${PN}-$(ver_cut 1-3)"
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jit? ( ${RUST_DEPEND} )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	systemtap? ( dev-debug/systemtap )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	dev-libs/libffi:=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	>=app-eselect/eselect-ruby-20231008
+"
+
+DEPEND="
+	${RDEPEND}
+	valgrind? ( dev-debug/valgrind )
+"
+
+BUNDLED_GEMS="
+	>=dev-ruby/debug-1.7.1[ruby_targets_ruby32(-)]
+	>=dev-ruby/irb-1.6.2[ruby_targets_ruby32(-)]
+	>=dev-ruby/matrix-0.4.2[ruby_targets_ruby32(-)]
+	>=dev-ruby/minitest-5.16.3[ruby_targets_ruby32(-)]
+	>=dev-ruby/net-ftp-0.2.1[ruby_targets_ruby32(-)]
+	>=dev-ruby/net-imap-0.3.4.1[ruby_targets_ruby32(-)]
+	>=dev-ruby/net-pop-0.1.2[ruby_targets_ruby32(-)]
+	>=dev-ruby/net-smtp-0.3.4[ruby_targets_ruby32(-)]
+	>=dev-ruby/power_assert-2.0.3[ruby_targets_ruby32(-)]
+	>=dev-ruby/prime-0.1.2[ruby_targets_ruby32(-)]
+	>=dev-ruby/rake-13.0.6-r2[ruby_targets_ruby32(-)]
+	>=dev-ruby/rbs-2.8.2[ruby_targets_ruby32(-)]
+	>=dev-ruby/rexml-3.3.9[ruby_targets_ruby32(-)]
+	>=dev-ruby/rss-0.3.1[ruby_targets_ruby32(-)]
+	>=dev-ruby/test-unit-3.5.7[ruby_targets_ruby32(-)]
+	>=dev-ruby/typeprof-0.21.3[ruby_targets_ruby32(-)]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby32(-)]
+	>=dev-ruby/bundler-2.3.3[ruby_targets_ruby32(-)]
+	>=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby32(-)]
+	>=dev-ruby/json-2.6.1[ruby_targets_ruby32(-)]
+	>=dev-ruby/rdoc-6.3.3[ruby_targets_ruby32(-)]
+	xemacs? ( app-xemacs/ruby-modes )
+"
+
+pkg_setup() {
+	use jit && rust_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
+	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
+	eapply "${FILESDIR}"/"${SLOT}"/013*.patch
+	eapply "${FILESDIR}"/"${SLOT}"/014*.patch
+	eapply "${FILESDIR}"/"${SLOT}"/902*.patch
+
+	if use elibc_musl ; then
+		eapply "${FILESDIR}"/${SLOT}/901-musl-*.patch
+	fi
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700.
+	rm -fr gems/* || die
+	touch gems/bundled_gems || die
+	# Don't install CLI tools since they will clash with the gem
+	rm -f bin/{racc,racc2y,y2racc} || die
+	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
+
+	# Remove tests that are known to fail or require a network connection
+	rm -f test/ruby/test_process.rb test/rubygems/test_gem{,_path_support}.rb || die
+	rm -f test/rinda/test_rinda.rb test/socket/test_tcp.rb test/fiber/test_address_resolve.rb spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.rb|| die
+
+	# Remove webrick tests because setting LD_LIBRARY_PATH does not work for them.
+	rm -rf tool/test/webrick || die
+
+	# Avoid test using the system ruby
+	sed -i -e '/test_dumb_terminal/aomit "Uses system ruby"' test/reline/test_reline.rb || die
+
+	# Avoid testing against hard-coded blockdev devices that most likely are not available
+	sed -i -e '/def blockdev/a@blockdev = nil' test/ruby/test_file_exhaustive.rb || die
+
+	# Avoid tests that require gem downloads
+	sed -i -e '/^test-syntax-suggest/ s/\$(TEST_RUNNABLE)/no/' common.mk || die
+	sed -i -e '/^check:/ s/\$(TEST_RUNNABLE)-\$(PREPARE_SYNTAX_SUGGEST) test-syntax-suggest//' common.mk || die
+
+	# Avoid test that fails intermittently
+	sed -i -e '/test_gem_exec_gem_uninstall/aomit "Fails intermittently"' test/rubygems/test_gem_commands_exec_command.rb || die
+
+	if use prefix ; then
+		# Fix hardcoded SHELL var in mkmf library
+		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
+	fi
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules="win32,win32ole" myconf=
+
+	# Ruby's build system does interesting things with MAKEOPTS and doesn't
+	# handle MAKEOPTS="-Oline" or similar well. Just filter it all out
+	# and use -j/-l parsed out from the original MAKEOPTS, then use that.
+	# Newer Portage sets this option by default in GNUMAKEFLAGS if nothing
+	# is set by the user in MAKEOPTS. See bug #900929 and bug #728424.
+	local makeopts_tmp="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+	unset MAKEOPTS MAKEFLAGS GNUMAKEFLAGS
+	export MAKEOPTS="${makeopts_tmp}"
+
+	# Avoid a hardcoded path to mkdir to avoid issues with mixed
+	# usr-merge and normal binary packages, bug #932386.
+	export ac_cv_path_mkdir=mkdir
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		export DTRACE="${BROOT}"/usr/bin/stap-dtrace
+	fi
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	# except on Darwin, where we really need LIBPATHENV to set the right
+	# DYLD_ stuff during the invocation of miniruby for it to work
+	[[ ${CHOST} == *-darwin* ]] || export LIBPATHENV=""
+	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--with-readline-dir="${EPREFIX}"/usr \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--without-baseruby \
+		--with-compress-debug-sections=no \
+		--enable-mkmf-verbose \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable jit jit-support) \
+		$(use_enable jit yjit) \
+		$(use_enable socks5 socks) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable doc install-doc) \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		$(use_with valgrind) \
+		--enable-option-checking=no
+
+	# Makefile is broken because it lacks -ldl
+	rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+	local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
+}
+
+src_test() {
+	local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake V=1 check
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	einfo "Removing default gems before installation"
+	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	local -x LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+
+	local -x RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+
+	# Create directory for the default gems
+	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
+	fi
+
+	if use examples; then
+		dodoc -r sample
+	fi
+
+	dodoc ChangeLog NEWS.md README*
+	dodoc -r doc
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(30|31|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/ruby/ruby-3.3.7.ebuild b/dev-lang/ruby/ruby-3.3.7.ebuild
new file mode 100644
index 000000000000..14dadbad7b4e
--- /dev/null
+++ b/dev-lang/ruby/ruby-3.3.7.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+RUST_OPTIONAL="yes"
+
+inherit autotools flag-o-matic multiprocessing rust
+
+MY_P="${PN}-$(ver_cut 1-3)"
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="https://cache.ruby-lang.org/pub/ruby/$(ver_cut 1-2)/${MY_P}.tar.xz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jit? ( ${RUST_DEPEND} )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	systemtap? ( dev-debug/systemtap )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	dev-libs/libffi:=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	>=app-eselect/eselect-ruby-20231226
+"
+
+DEPEND="
+	${RDEPEND}
+	valgrind? ( dev-debug/valgrind )
+"
+
+BUNDLED_GEMS="
+	>=dev-ruby/debug-1.9.2[ruby_targets_ruby33(-)]
+	>=dev-ruby/irb-1.11.0[ruby_targets_ruby33(-)]
+	>=dev-ruby/matrix-0.4.2[ruby_targets_ruby33(-)]
+	>=dev-ruby/minitest-5.20.0[ruby_targets_ruby33(-)]
+	>=dev-ruby/net-ftp-0.3.4[ruby_targets_ruby33(-)]
+	>=dev-ruby/net-imap-0.4.9.1[ruby_targets_ruby33(-)]
+	>=dev-ruby/net-pop-0.1.2[ruby_targets_ruby33(-)]
+	>=dev-ruby/net-smtp-0.4.0.1[ruby_targets_ruby33(-)]
+	>=dev-ruby/power_assert-2.0.3[ruby_targets_ruby33(-)]
+	>=dev-ruby/prime-0.1.2[ruby_targets_ruby33(-)]
+	>=dev-ruby/racc-1.7.3[ruby_targets_ruby33(-)]
+	>=dev-ruby/rake-13.1.0[ruby_targets_ruby33(-)]
+	>=dev-ruby/rbs-3.4.0[ruby_targets_ruby33(-)]
+	>=dev-ruby/rexml-3.3.9[ruby_targets_ruby33(-)]
+	>=dev-ruby/rss-0.3.1[ruby_targets_ruby33(-)]
+	>=dev-ruby/test-unit-3.6.1[ruby_targets_ruby33(-)]
+	>=dev-ruby/typeprof-0.21.9[ruby_targets_ruby33(-)]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby33(-)]
+	>=dev-ruby/bundler-2.5.11[ruby_targets_ruby33(-)]
+	>=dev-ruby/did_you_mean-1.6.3[ruby_targets_ruby33(-)]
+	>=dev-ruby/json-2.7.2[ruby_targets_ruby33(-)]
+	>=dev-ruby/rdoc-6.6.2[ruby_targets_ruby33(-)]
+	xemacs? ( app-xemacs/ruby-modes )
+"
+
+pkg_setup() {
+	use jit && rust_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
+	eapply "${FILESDIR}"/"${SLOT}"/013*.patch
+	eapply "${FILESDIR}"/"${SLOT}"/902*.patch
+
+	if use elibc_musl ; then
+		eapply "${FILESDIR}"/${SLOT}/901-musl-*.patch
+	fi
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700.
+	rm -fr gems/* || die
+	touch gems/bundled_gems || die
+
+	# Avoid the irb default gemspec since we will install the normal gem
+	# instead. This avoids a file collision with dev-ruby/irb.
+	rm lib/irb/irb.gemspec || die
+
+	# Remove tests that are known to fail or require a network connection
+	rm -f test/ruby/test_process.rb test/rubygems/test_gem{,_path_support}.rb || die
+	rm -f test/rinda/test_rinda.rb test/socket/test_tcp.rb test/fiber/test_address_resolve.rb \
+	   spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.rb|| die
+
+	# Remove webrick tests because setting LD_LIBRARY_PATH does not work for them.
+	rm -rf tool/test/webrick || die
+
+	# Avoid test using the system ruby
+	sed -i -e '/test_dumb_terminal/aomit "Uses system ruby"' test/reline/test_reline.rb || die
+
+	# Avoid testing against hard-coded blockdev devices that most likely are not available
+	sed -i -e '/def blockdev/a@blockdev = nil' test/ruby/test_file_exhaustive.rb || die
+
+	# Avoid tests that require gem downloads
+	sed -e '/^\(test-syntax-suggest\|PREPARE_SYNTAX_SUGGEST\)/ s/\$(TEST_RUNNABLE)/no/' \
+		-i common.mk
+
+	# Avoid test that fails intermittently
+	sed -e '/test_gem_exec_gem_uninstall/aomit "Fails intermittently"' \
+		-i test/rubygems/test_gem_commands_exec_command.rb || die
+
+	# Avoid test fragile for git command output not matching on whitespace
+	sed -e '/test_pretty_print/aomit "Fragile for output differences"' \
+		-i test/rubygems/test_gem_source_git.rb || die
+
+	if use prefix ; then
+		# Fix hardcoded SHELL var in mkmf library
+		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
+	fi
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules="win32,win32ole" myconf=
+
+	# Ruby's build system does interesting things with MAKEOPTS and doesn't
+	# handle MAKEOPTS="-Oline" or similar well. Just filter it all out
+	# and use -j/-l parsed out from the original MAKEOPTS, then use that.
+	# Newer Portage sets this option by default in GNUMAKEFLAGS if nothing
+	# is set by the user in MAKEOPTS. See bug #900929 and bug #728424.
+	local makeopts_tmp="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+	unset MAKEOPTS MAKEFLAGS GNUMAKEFLAGS
+	export MAKEOPTS="${makeopts_tmp}"
+
+	# Avoid a hardcoded path to mkdir to avoid issues with mixed
+	# usr-merge and normal binary packages, bug #932386.
+	export ac_cv_path_mkdir=mkdir
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		export DTRACE="${BROOT}"/usr/bin/stap-dtrace
+	fi
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Fix co-routine selection for x32, bug 933070
+	[[ ${CHOST} == *gnux32 ]] && myconf="${myconf} --with-coroutine=amd64"
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	# except on Darwin, where we really need LIBPATHENV to set the right
+	# DYLD_ stuff during the invocation of miniruby for it to work
+	[[ ${CHOST} == *-darwin* ]] || export LIBPATHENV=""
+	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--without-baseruby \
+		--with-compress-debug-sections=no \
+		--enable-mkmf-verbose \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable jit jit-support) \
+		$(use_enable jit yjit) \
+		$(use_enable socks5 socks) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable doc install-doc) \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		$(use_with valgrind) \
+		--enable-option-checking=no
+
+	# Makefile is broken because it lacks -ldl
+	rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+	local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
+}
+
+src_test() {
+	local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake V=1 check
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	einfo "Removing default gems before installation"
+	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	local -x LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+
+	local -x RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+
+	# Create directory for the default gems
+	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
+	fi
+
+	if use examples; then
+		dodoc -r sample
+	fi
+
+	dodoc ChangeLog NEWS.md README*
+	dodoc -r doc
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(30|31|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 3cebc27d7564..8c6a3c537b40 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
@@ -395,6 +361,35 @@ DIST rust-1.83.0-x86_64-unknown-linux-gnu.tar.xz 180329116 BLAKE2B e2c661061e21c
 DIST rust-1.83.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 1453c9047b590358731d4ea9e8d6dab0da1ea937fd9b9f6ee2137459d0a426df6333a9dc53dff65f6c82a17b93a98efc5dea33f9218145070a7605baffebc1da SHA512 f6a3636611d0bb5cb41989547388901bed0dbe54fe3d99d94391bc815718a85af52d0110747c3d7f1b6a455ebaa221b74c2c9fe11403b147325b6ec0c4bf46ef
 DIST rust-1.83.0-x86_64-unknown-linux-musl.tar.xz 260755616 BLAKE2B 0a61fad7f03645a9b4032fe4ca910663f0406a64a42cd113a09019199e6deceefce2a450ca14bc47745db08a9fe8970897fd01c2121f9b6bcb20b23652ada5de SHA512 2e219eec7b28a60e9bd160972042316460d91fe60f755c625bee30724059f4f9c4a29d567bea54718f9b8d739cc1c81cb4dedff0c868270861c866452d5cf8a3
 DIST rust-1.83.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B f87ab0bb59b5e4fa9078bb973845bf606c61faf2c728db6cc3e9a61907fc2d1c9ea3ede7ec55c3388c53b0ff06ffcbbb89f63b585c36b5bff7637acc8b8f3336 SHA512 20740272925662be9178c9c87f8184c4d0a355051fa85fd8459563bd23bde798b01d53c823726d0788f6311a4f3c7f3c8bb8a2bf4f470c8d3b7d1303090a78ad
+DIST rust-1.84.0-aarch64-unknown-linux-gnu.tar.xz 241841868 BLAKE2B 814ce6b3e7ee391fe93bdd8164a7c29c49e146eff2356c165a7cf14125c91188c8c3c89c3ccc8bcb006f1e30d3123b7332293d084b1888d11e47cfb105faa0c8 SHA512 a3b394dbe6e8a149c6d6bd18789f1b3393128c8add67c18788198d7c12c7e8a2b7d818424c6ec465d89e7423f39949258eb9c933aaaa946449540d2f8c458c86
+DIST rust-1.84.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B a83bd4fd2a71a9f080563427fd23bf9cb781f2728f04464a6aa44d38dec5d807eaa5b3ee3b232e58b2ed27d0185cdb546d8b2d0c8c2dc1da43cb001c5be540f9 SHA512 71fd88b65a74b2c83a8eaeb5bea37feb60339b18200a2eeba471a74ce844386a296ade9bff1c6c6413f32493fa7b1057e3a3740920ca1207bea4c02d7421b7cf
+DIST rust-1.84.0-aarch64-unknown-linux-musl.tar.xz 219144116 BLAKE2B fae31bdcaa7b7839a5e071adbe24d507c4b39ed52b413219941057fff6d8416ea68e957606b658919fdbf9cb4d1b26f01692bb01e9f967147457717a30041cc9 SHA512 89ac6b14c23958c4df2e924d78093d5c652a910ace7b9166756e6d36bc215bca301d4e3b61f54c6128cb0d4a01d6941908e5b51fd1718ad81b3c495aaa64e6a2
+DIST rust-1.84.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B c64496baff24d7c2a83a5884e58de952114a1cbe4e9605c837576cd09b496d9af90dad5d70685cc01340b060c31ef05fcd02f95295ce9bf16fa4dee4b86687e8 SHA512 ce2b30bbf217d039cf5824c3cfb084a467547698049e6c088b27af17af95f312d434119aac7cb9a9333fbb19654cdb2466f4686c14d42f6b6e50dcf235f5a57a
+DIST rust-1.84.0-arm-unknown-linux-gnueabi.tar.xz 203482932 BLAKE2B 409cf02ab8977b80f4fefdfaebd6f5de75182682737ffc2df8fbbb35a8d925b4b7d77867c210f206f4e3db19db5cc295e20ca24223ac55f98926a2b62564f202 SHA512 57cc5de6b72e7db5ab5051118f1e4a6a59f29256b85f9e661d7fd91e93fd961cc690a87ecebce6e39696ce7ed0e124e5fa65c6d591f31cc56d3c691c42c0528f
+DIST rust-1.84.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B c61e1c691426c5ec80b2b1b8a7dd63968a3a5e8421a12ac1507bf54ffe0229b8b2a8a386694e6b731a47844b6c1882eba188ae39c6eda0f79bae21891cf6f747 SHA512 3bb76c15085f4292d7bb10382df18da44c29bce03db486da22ada9eeadec5561bbf00809a8b37c4d389552c257e947f60b368502687fa7ff2d0aefdf2f51a924
+DIST rust-1.84.0-arm-unknown-linux-gnueabihf.tar.xz 203947296 BLAKE2B 12a6e18912f5c9819c76503d82490a5dd85037e5aff6bf7eb121ad433819ba0a717301102c720b8f22e43cf254c9e9974645b80cee0eb5605906d1505ca501b1 SHA512 4695723ebc0cf4d2db822593e85681faeb3968a8e86d81a7c7708fbfb328cc7c9c65534f483266b6f1358ed40e343dd9b6b35375833abd7e15a375efe01609b5
+DIST rust-1.84.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 2585ace544427a8539e292f78b399e1b4c3488e78922ca6335ecd857ade7b589b11c80ce1a80fab957fb5f301118745efb3ae37e43ba69407c58db5e0e8a6ed5 SHA512 d5e4ae979aa35b3d734c6397e7d1745e5d80620743eb2dc3c96ef13d31aa44db6f32088b89063f5c2f9af7f296fbfcba4f7ed277e95cc632d702cb352b1ce768
+DIST rust-1.84.0-armv7-unknown-linux-gnueabihf.tar.xz 209524676 BLAKE2B 3056c0415fa4aa71cca11f573de504eb06b350c3fa43bf17aed802e4db94f66ad38afcb9b7f8d2f8ba5665ed38e94f48a377f0194b0661d534340b5e1bdacfbf SHA512 de268b97f1b30198ad6065a4ea10fa3e6aa366f852c42413eb3c3efed971dda1e0dcb112958f56824265f8f4d205a09521ef200c3b362056f2fdca07c5558304
+DIST rust-1.84.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B ba8e7bf6831f78f31bb3590b87807a0fa44ceadae19e93cf76ede44d724e27c97cb27aa82f8cc9567da3f079fcea731965ef0966ddf1f93d03146d1f483cbfad SHA512 242055a1fe7232e6301633bbc81a15a649e9713c9bbd655ccce72ecedfd2e1b1f0d78de98842c2a8e40d42e760c4c040403521eabcea63be822caa54811bb7be
+DIST rust-1.84.0-i686-unknown-linux-gnu.tar.xz 235927300 BLAKE2B f0825b84374556291893d644178f09cbe58e41fbe2742474b7c6d47f9ac379d5566d92a59fdbaa336765ea9aa0112027fb1f1c80758b4b03a38091cff7d0fa0c SHA512 9dbbf55dc04e6071ff597c75e194676c4d15bffcbec559c7a7622ce19c4300ecd460c5712ecebe4a4419cd1b0206cd18ab4596a8d9963f7aa0432eda5234d7c8
+DIST rust-1.84.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 9b8d092db5f894f563bbfb45666430f231ccdebcf05a811c3546be167d851a84891122c29ba3bceb6a2bf71e87817a29d703a40cad4f8fcdf3968d391347578a SHA512 51595e120a71958ed6551ff102f7891cdf3d9a6b9adaa990525b82ec75eb1c0266dce6350775139052a27d787612596cf083e9b0c3b9e7de5db8eb65a2546c59
+DIST rust-1.84.0-loongarch64-unknown-linux-gnu.tar.xz 234981212 BLAKE2B 1e6616834440eac754ad0725ce88ec7d83e6804bf084bb2ab1c2adff1fbbbb0861780ebf57116f4fa38ad67667b89d0d7e9ca7184f0c0ee65f7b23886652ee10 SHA512 47671edf5c751bffcf87ab3a76cdb1233eb64c3d6815825ff0130bbb8956e6bc452bd75395bf8f44abd7b78c23db8d9f0047b6538a4f9c12d729d25ba43d038f
+DIST rust-1.84.0-loongarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 4cb2035ed10a735a688b2b80975aa16b2a311c9ccf5c8b6ec63af4dbe30e06713621c119721cde6e44d504133343ea2aa5158dc6bbb6253aa330894161559374 SHA512 ec74e916f9479ab046f0d997f4eee99b1c23028a3aa207fa7be71762ce7cf428af53a6d172714653fb30e5d6d8d42936cc7fe3d9c7f3a33262703d15fc9baffb
+DIST rust-1.84.0-powerpc-unknown-linux-gnu.tar.xz 226162544 BLAKE2B e1bb743b29f8dffed0e5b7f83da5ec58b4977dbb7621eb1a66f7d42dc9e588eecbd51013d2bca3dd24e679ec1f57bd8d1b9d5bd44fb155b8757b75c61f2649e1 SHA512 d09d52c64c097f9e8238c64a5e69530c8e7fc72db6c48c76f5118598d0c2c1186b40b053aa78b8b1d071cc716cc50ab7d824655af777b8a76c4131edac44e813
+DIST rust-1.84.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 8eded34d62506f87d38ef3c503f62d5687a646aec8a0ff699d73d1b0907d0735aa7f7893d3b5ee481f069a01998182c70e10d48f664268bdec44655449825e78 SHA512 a3a5a6ae3ac2f210253c2eae61b0c0647cf5f526866e0f5c0141a07f9587cd614573bb2728186889483806a1a3ab5885c9abcca91a16dc36d042bc78239592d4
+DIST rust-1.84.0-powerpc64-unknown-linux-gnu.tar.xz 222899356 BLAKE2B ff9b3bc680cae85485131d23fef5d04abffa69c7d4f4ad254a868707b1206bec543faf20a0be5c287c83165680da8dfbb9a0ce8c688e4f29231df2a589125450 SHA512 16440b2c604061dff6ebdb60af6697d3064ce6ec740c617968b22d8479cdb16cfb61330b2afeadbb544826c6fe90b245eba0de3956ae2924cf77ef8565defae0
+DIST rust-1.84.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 67fd274e3315a21ed0b23fc8bcf013ab20b905c373785b74bada5431d0d1cc1b63e7ea3dcbfe4bd8def0861d08ce13cf769796e244437cc6beab6db95f01c6b6 SHA512 87ea6ead36d9dfddb5a71690f4d434978dcd73264c32e93ab7d3ef74f7c5835fd5e73316f1bb827c418492dd30f3a5bac752054ce1e27d99600249b64412d1c2
+DIST rust-1.84.0-powerpc64le-unknown-linux-gnu.tar.xz 235629500 BLAKE2B 32903240ada4cf2640814374c55d71e3351a0dcf413d54041117a3f6603ddd6c19033368382bbb18c5d1f278c9bb3f5d6d0ace966bb1fcad9cc9389fdd066135 SHA512 626476e551869a066600f459e7a6e9c8435f61b4018efba5b3102af72ec7508cbd4464d0b60adce5c669d34adf4315ec3529d0ebdac6d294de7c7437da264367
+DIST rust-1.84.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 3e762822c5563db6efc128aab7ff704165dbe35cd06dda07c677ef2b94084a2ee37fdf77e8aaeaec4987de2f5bc73da9a2ab572e4e4d2b64a775a447b548e40b SHA512 113b7ef16977f24ad6acd72426ce389492aad7d8fc36bd3feeb921a21563e20c0144c3eaba3c63818556794df7904def0e83e5645cd4c766724898baca9ef208
+DIST rust-1.84.0-riscv64gc-unknown-linux-gnu.tar.xz 221099540 BLAKE2B 0941d02fed906487753188150220c7e5a957e68b40e2e33929a74c6c520d34b2547307f74738ca6728f7e68213da81c5d2b07bc8b5ab7c0048bb222cc4aa2d6d SHA512 fe57aa11719164bb3865049ac91d1739f02e098f096db77a290f55f22423a870e1e0bc19d3ae2fd0bf32e5c6c9b10d5f3884b0070c5ffcf58b5d77598653b811
+DIST rust-1.84.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e1100cd2dc56582472c312ce4d2a161a85cd371fc42bd281b14475f4ed922a38e8b79068aad5cf66c2c489965f782733edec1f72414f4b88628e4d661fea9014 SHA512 d54d69eca7651d166fa9c52bba562ce5008d5e6fd96eab8499a8dc9dcd178f009228e1d6788a4023478b29c2e477a379c6a2cc2b5c015072d87bbe929493eaab
+DIST rust-1.84.0-s390x-unknown-linux-gnu.tar.xz 225691648 BLAKE2B e007b7c08998a488162721b418c9bd22dcb8ffbe450da543be285d4708ed366fc01f0bc6f668b7058e544c3df7025977454e3aa98fd98d29970be28e2a6d6438 SHA512 cafcb20513a27bfdb9d4caf0e53f929f30f40592f340ee6683294ef52c438c913381c677b6c266efe85b2980ddcddf7d2f90fd22b2482a6ea7348084e5638598
+DIST rust-1.84.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 27b6afef3ca0c4df951e678469548784cbbc339772297966a449f17869ff7c47bad72c114edaca66d79dea6a63cf38755fa2c439e9283c7bb786a9c4eab02fb9 SHA512 6656f2ea30758ba23f7a1ac330695c262cea1c82d33bc64e968d8bbd5b39366e8d8e0983f6bdcbfa818225b63863fd941eeb9090d024e3d8ba254cb99f214a2e
+DIST rust-1.84.0-sparc64-unknown-linux-gnu.tar.xz 67048992 BLAKE2B a84fcd2139ecdf9a5bd071518f7880e015a611a1d1ea9176ba3f8ed935e52254359bad0c15fb3d5e5fb2fb20913fcd3e3d4d29c764c04eb5269026d93c13dbf1 SHA512 47d0eee57de82fb155957631103399e2da1cafd74f7f16115549b4adde49fc58bd3a405acd0fc2e5095d89e3fbc5fa835a37f64b3e6f9079584de9b111a5cd60
+DIST rust-1.84.0-x86_64-unknown-linux-gnu.tar.xz 183288052 BLAKE2B 6a9bdf25e8ebdad1e8b36feee4d152235397eb3a52351a166905f350a8fccabdc4f03f4c1e490bc81d4f403f2810b37aeee964b49f4c375a9792ca8a054c61ac SHA512 4d37691577636ecd233e4c507da4aa2c6c31f965fec29a59eb22bbc6c8d765eaf95d63fc1ffe8ba9ad309f5a0a712e60c5a94a832164bae283f06b41fecc2579
+DIST rust-1.84.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 3ceb1130faa28ed9caf86b0c66471b04aa2663bf6188230fd96a0c0d4ff7a4255cb0e7e3e6e71d8a3de86798bd7f53ccdafe21285ae247d1f1718fbd0aa04d31 SHA512 bb782d01731f8aeb4a54555ac2163bbf625e83a17f5d8e10fa76217b345b247b4d653b5bada065fe647c8b19e1dc66316b1ebea252525fa194cb7bdc6370c59b
+DIST rust-1.84.0-x86_64-unknown-linux-musl.tar.xz 263170948 BLAKE2B d4e43adbcc8ab3f49306d5ae624340f7e7b0844821c74140997510ca40d4bf252ff698e1295ab8138bae237d079c1e3cff6a46f895f55fbb7ba2c93054e1648c SHA512 6cf083cc2cda4591314ba49a302aba2aec8fd036eb9a72b775d16561d0739df23a1f3b0cb44d6539a068a47730142b09aeaafa1b0756703c51b539851e59bee5
+DIST rust-1.84.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 9abf6ad52601fa64e807a71bb6af5a9fd8c3ecda5589ec7232ffdbd7884db67535a5845216fe7ab9133fc114fdc12caee436bc1bb78a163f94a021060459b1e6 SHA512 f9a0c7fa85668b034f0a0891ddc0b9d8f624589c8c9485421e199abc9a82dec481ef3491a4e1286fdf6c6863221e7761cada393697ff1da93716321bcbca679c
 DIST rust-src-1.71.1.tar.xz 2460244 BLAKE2B e3a5b5bfb808310f96e760aab55310c7a790fa551d248c9c5dbb407e0a80653563d8df73a9e0973aa63d3286aad6c755b78098dd8db2dc1a2ed3cadb926b40e1 SHA512 659cc46e1ece2ddbcf5ab748bae48843bd36353cc633b59e4ac062d843af66919e8d5c39ccb72ebdbf94a0e26a8056ade6bd1c8fe9a936469bd405122a8ae35d
 DIST rust-src-1.74.1.tar.xz 2544036 BLAKE2B d95431b69f102782f51878ff73ce8802cac6dab7909497c3231d1c479b95dc2a618cc6efd8bac9c6bd59a2b10dc6be05199f1e1bd74e45cc640ee52352c29268 SHA512 11467d0936193c5a5be8c2eba1aefe2b7028af48494698863de2c4057d68ce33dcee1fc66dc2d68b1d32f0202ce49e9b906727849de8f8d904dd07930e76d5a4
 DIST rust-src-1.75.0.tar.xz 2570256 BLAKE2B 9db7ccff07ffe6991233e9f530321fd6ba48c561dcf1226537afa70c7d045421d8e83c5300b0866ec6fccfaae96dd67b9f204e9e0e12108c0c766d467cd78909 SHA512 e7565cea2f1658a05237a698e38880df2544319b41b6d8b0805db5f1f94fd3bb4f986967d0440fcdfe3a135e33246f3c747665b964f57ff5942f56133af78cdd
@@ -406,3 +401,4 @@ DIST rust-src-1.80.1.tar.xz 2870456 BLAKE2B 9096fab01b38cc3ea2a32a2ab2e9052e5988
 DIST rust-src-1.81.0.tar.xz 2901440 BLAKE2B 7ad2855c21728cc323108f7e45416a425a222e550c132818b302dc2b9fabc1281e560b0f097e1fc41e682f52b4524c69737096e12cc9e97a677828efab96dc2b SHA512 d38b1afc17a4cc7ba67d2e1b7d3dfbcc2a61ad96e87b130064d6788538817c27bce06c9fd7a4733de5b5862ff5f6aa441bf71ebaaae9ff80a86c354a6ec05e14
 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
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-bin/rust-bin-1.83.0.ebuild b/dev-lang/rust-bin/rust-bin-1.83.0.ebuild
index 3b04eb349c4b..6651854b7c67 100644
--- a/dev-lang/rust-bin/rust-bin-1.83.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.83.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
@@ -40,7 +40,7 @@ SRC_URI+=" ppc64? ( elibc_musl? (
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
 
 RDEPEND="
diff --git a/dev-lang/rust-bin/rust-bin-1.84.0.ebuild b/dev-lang/rust-bin/rust-bin-1.84.0.ebuild
new file mode 100644
index 000000000000..4b7d8613a5bb
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.84.0.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 19 )
+LLVM_OPTIONAL="yes"
+
+inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature
+
+MY_P="rust-${PV}"
+# curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
+MY_SRC_URI="${RUST_TOOLCHAIN_BASEURL%/}/2025-01-09/rust-src-${PV}.tar.xz"
+GENTOO_BIN_BASEURI="https://dev.gentoo.org/~arthurzam/distfiles/${CATEGORY}/${PN}" # omit leading slash
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="$(rust_all_arch_uris ${MY_P})
+	rust-src? ( ${MY_SRC_URI} )
+"
+# Keep this separate to allow easy commenting out if not yet built
+SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz ) "
+#SRC_URI+=" mips? (
+#	abi_mips_o32? (
+#		big-endian?  ( ${GENTOO_BIN_BASEURI}/${MY_P}-mips-unknown-linux-gnu.tar.xz )
+#		!big-endian? ( ${GENTOO_BIN_BASEURI}/${MY_P}-mipsel-unknown-linux-gnu.tar.xz )
+#	)
+#	abi_mips_n64? (
+#		big-endian?  ( ${GENTOO_BIN_BASEURI}/${MY_P}-mips64-unknown-linux-gnuabi64.tar.xz )
+#		!big-endian? ( ${GENTOO_BIN_BASEURI}/${MY_P}-mips64el-unknown-linux-gnuabi64.tar.xz )
+#	)
+#)"
+#SRC_URI+=" riscv? (
+#	elibc_musl? ( ${GENTOO_BIN_BASEURI}/${MY_P}-riscv64gc-unknown-linux-musl.tar.xz )
+#)"
+#SRC_URI+=" ppc64? ( elibc_musl? (
+#	big-endian?  ( ${GENTOO_BIN_BASEURI}/${MY_P}-powerpc64-unknown-linux-musl.tar.xz )
+#	!big-endian? ( ${GENTOO_BIN_BASEURI}/${MY_P}-powerpc64le-unknown-linux-musl.tar.xz )
+#) )"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
+
+RDEPEND="
+	>=app-eselect/eselect-rust-20190311
+	dev-libs/openssl
+	sys-apps/lsb-release
+	sys-devel/gcc:*
+	!dev-lang/rust:stable
+	!dev-lang/rust-bin:stable
+"
+BDEPEND="
+	prefix? ( dev-util/patchelf )
+	verify-sig? ( sec-keys/openpgp-keys-rust )
+"
+
+REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
+
+# stripping rust may break it (at least on x86_64)
+# https://github.com/rust-lang/rust/issues/112286
+RESTRICT="strip"
+
+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() {
+	# sadly rust-src tarball does not have corresponding .asc file
+	# so do partial verification
+	if use verify-sig; then
+		for f in ${A}; do
+			if [[ -f ${DISTDIR}/${f}.asc ]]; then
+				verify-sig_verify_detached "${DISTDIR}/${f}" "${DISTDIR}/${f}.asc"
+			fi
+		done
+	fi
+
+	default_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}"
+	use doc && components="${components},rust-docs"
+	use clippy && components="${components},clippy-preview"
+	use rustfmt && components="${components},rustfmt-preview"
+	use rust-analyzer && components="${components},rust-analyzer-preview,${analysis}"
+	# Rust component 'rust-src' is extracted from separate archive
+	if use rust-src; then
+		einfo "Combining rust and rust-src installers"
+		mv -v "${WORKDIR}/rust-src-${PV}/rust-src" "${S}" || die
+		echo rust-src >> ./components || die
+		components="${components},rust-src"
+	fi
+	./install.sh \
+		--components="${components}" \
+		--disable-verify \
+		--prefix="${ED}/opt/${P}" \
+		--mandir="${ED}/opt/${P}/man" \
+		--disable-ldconfig \
+		|| die
+
+	docompress /opt/${P}/man/
+
+	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
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+	use rust-analyzer && symlinks+=( rust-analyzer )
+
+	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}" || die
+		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}"
+
+	# make all capital underscored variable
+	local CARGO_TRIPLET="$(rust_abi)"
+	CARGO_TRIPLET="${CARGO_TRIPLET//-/_}"
+	CARGO_TRIPLET="${CARGO_TRIPLET^^}"
+	cat <<-_EOF_ > "${T}/50${P}"
+	LDPATH="${EPREFIX}/usr/lib/rust/lib-bin-${PV}"
+	MANPATH="${EPREFIX}/usr/lib/rust/man-bin-${PV}"
+	$(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_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
+	_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
+	if use rust-analyzer; then
+		echo /usr/bin/rust-analyzer >> "${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
+
+	if has_version dev-debug/gdb || has_version llvm-core/lldb; then
+		elog "Rust installs helper scripts for calling GDB and LLDB,"
+		elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+	fi
+
+	if has_version app-editors/emacs; then
+		optfeature "emacs support for rust" app-emacs/rust-mode
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		optfeature "vim support for rust" app-vim/rust-vim
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-lang/rust-common/Manifest b/dev-lang/rust-common/Manifest
index 2f233b63cf30..6bbfe739474c 100644
--- a/dev-lang/rust-common/Manifest
+++ b/dev-lang/rust-common/Manifest
@@ -4,3 +4,5 @@ DIST rustc-1.82.0-src.tar.xz 219769328 BLAKE2B 611f33e134c2d459c9af1695c0a4d033d
 DIST rustc-1.82.0-src.tar.xz.asc 801 BLAKE2B 8138fb15b8d7ec15be45378fe663207a8e87e3c527348ab079995b1840a771ed6e9d5464eb8855ac9e006c0cfcf54b1a4fea489d31e6c9899cb03e6f4c737b67 SHA512 3cd6b27e72041baf9996efa10f25aca2e04f3e3727b60ecfd90c1bef9c52d216d2dc130802f935b110e35766645a27637a01661aa8d5acf02bf64b02a107c93c
 DIST rustc-1.83.0-src.tar.xz 353808388 BLAKE2B 217c85f7351a7c57a2684da2c7c81a32094187b3812dee628b327a5b2faca57235abc54d033c586c071c8bfa0c7360bb28761aaa42fe18414e388db704d81231 SHA512 64db57949c6ac1df6a3f4c6bd0938685a5fb1bc3d318b34ccfcfccb0f9eff1cffd4d8a53a190ef0409eeca9ad12bc6234c2c1de69196cc74ae02d6afa20d0ce6
 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
diff --git a/dev-lang/rust-common/rust-common-1.82.0.ebuild b/dev-lang/rust-common/rust-common-1.82.0.ebuild
index 285a9a5b8e5f..5c676ac678bf 100644
--- a/dev-lang/rust-common/rust-common-1.82.0.ebuild
+++ b/dev-lang/rust-common/rust-common-1.82.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
@@ -27,7 +27,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 
 # Legacy non-slotted versions bash completions will collide.
 RDEPEND="
diff --git a/dev-lang/rust-common/rust-common-1.83.0.ebuild b/dev-lang/rust-common/rust-common-1.83.0.ebuild
index 285a9a5b8e5f..5c676ac678bf 100644
--- a/dev-lang/rust-common/rust-common-1.83.0.ebuild
+++ b/dev-lang/rust-common/rust-common-1.83.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
@@ -27,7 +27,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 
 # Legacy non-slotted versions bash completions will collide.
 RDEPEND="
diff --git a/dev-lang/rust-common/rust-common-1.84.0.ebuild b/dev-lang/rust-common/rust-common-1.84.0.ebuild
new file mode 100644
index 000000000000..0969c3472e3c
--- /dev/null
+++ b/dev-lang/rust-common/rust-common-1.84.0.ebuild
@@ -0,0 +1,58 @@
+# 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/rust.asc
+inherit bash-completion-r1 verify-sig
+
+DESCRIPTION="Common files shared between multiple slots of Rust"
+HOMEPAGE="https://www.rust-lang.org/"
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz"
+else
+	ABI_VER="$(ver_cut 1-2)"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.xz"
+fi
+
+SRC_URI="
+	https://static.rust-lang.org/dist/${SRC}
+	verify-sig? ( https://static.rust-lang.org/dist/${SRC}.asc )
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# Legacy non-slotted versions bash completions will collide.
+RDEPEND="
+	!dev-lang/rust:stable
+	!dev-lang/rust-bin:stable
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-rust )"
+
+src_unpack() {
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${SRC} "${DISTDIR}"/${SRC}.asc
+	fi
+
+	# Avoid unpacking the whole tarball which would need check-reqs
+	tar -xf "${DISTDIR}"/${SRC} ${SRC%%.tar.xz}/src/tools/cargo/src/etc/cargo.bashcomp.sh || die
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	newbashcomp src/tools/cargo/src/etc/cargo.bashcomp.sh cargo
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 0ad597da094f..74d396547e79 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,7 +1,3 @@
-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
@@ -24,3 +20,5 @@ DIST rustc-1.82.0-src.tar.xz 219769328 BLAKE2B 611f33e134c2d459c9af1695c0a4d033d
 DIST rustc-1.82.0-src.tar.xz.asc 801 BLAKE2B 8138fb15b8d7ec15be45378fe663207a8e87e3c527348ab079995b1840a771ed6e9d5464eb8855ac9e006c0cfcf54b1a4fea489d31e6c9899cb03e6f4c737b67 SHA512 3cd6b27e72041baf9996efa10f25aca2e04f3e3727b60ecfd90c1bef9c52d216d2dc130802f935b110e35766645a27637a01661aa8d5acf02bf64b02a107c93c
 DIST rustc-1.83.0-src.tar.xz 353808388 BLAKE2B 217c85f7351a7c57a2684da2c7c81a32094187b3812dee628b327a5b2faca57235abc54d033c586c071c8bfa0c7360bb28761aaa42fe18414e388db704d81231 SHA512 64db57949c6ac1df6a3f4c6bd0938685a5fb1bc3d318b34ccfcfccb0f9eff1cffd4d8a53a190ef0409eeca9ad12bc6234c2c1de69196cc74ae02d6afa20d0ce6
 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
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.71.1-r100.ebuild b/dev-lang/rust/rust-1.71.1-r100.ebuild
index 6193d3d771e8..dedaab4fcbad 100644
--- a/dev-lang/rust/rust-1.71.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.71.1-r100.ebuild
@@ -38,6 +38,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai LoongArch Mips MSP43
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="${PV}"
 
@@ -237,6 +239,14 @@ src_configure() {
 
 	rust_target="$(rust_abi)"
 
+	LLVM_EXPERIMENTAL_TARGETS=()
+	for _x in "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if use llvm_targets_${_x} ; then
+			LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+		fi
+	done
+	LLVM_EXPERIMENTAL_TARGETS=${LLVM_EXPERIMENTAL_TARGETS[@]}
+
 	local cm_btype="$(usex debug DEBUG RELEASE)"
 	cat <<- _EOF_ > "${S}"/config.toml
 		changelog-seen = 2
@@ -247,7 +257,7 @@ src_configure() {
 		assertions = $(toml_usex debug)
 		ninja = true
 		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
+		experimental-targets = "${LLVM_EXPERIMENTAL_TARGETS// /;}"
 		link-shared = $(toml_usex system-llvm)
 		$(if is_libcxx_linked; then
 			# https://bugs.gentoo.org/732632
diff --git a/dev-lang/rust/rust-1.74.1-r100.ebuild b/dev-lang/rust/rust-1.74.1-r100.ebuild
index 3fe183405a84..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
@@ -40,10 +44,12 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
+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
@@ -65,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="
@@ -172,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}
 }
 
@@ -195,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
 }
 
@@ -251,14 +285,26 @@ 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}")"
 	rust_host="$(rust_abi "${CHOST}")"
 
+	LLVM_EXPERIMENTAL_TARGETS=()
+	for _x in "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if use llvm_targets_${_x} ; then
+			LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+		fi
+	done
+	LLVM_EXPERIMENTAL_TARGETS=${LLVM_EXPERIMENTAL_TARGETS[@]}
+
 	local cm_btype="$(usex debug DEBUG RELEASE)"
 	cat <<- _EOF_ > "${S}"/config.toml
 		changelog-seen = 2
@@ -269,7 +315,7 @@ src_configure() {
 		assertions = $(toml_usex debug)
 		ninja = true
 		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
+		experimental-targets = "${LLVM_EXPERIMENTAL_TARGETS// /;}"
 		link-shared = $(toml_usex system-llvm)
 		$(if is_libcxx_linked; then
 			# https://bugs.gentoo.org/732632
@@ -504,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-lang/rust/rust-1.75.0-r100.ebuild b/dev-lang/rust/rust-1.75.0-r100.ebuild
index 32f8d4d41fe3..478f58c567f0 100644
--- a/dev-lang/rust/rust-1.75.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.75.0-r100.ebuild
@@ -39,6 +39,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
 
@@ -261,6 +263,14 @@ src_configure() {
 	rust_build="$(rust_abi "${CBUILD}")"
 	rust_host="$(rust_abi "${CHOST}")"
 
+	LLVM_EXPERIMENTAL_TARGETS=()
+	for _x in "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if use llvm_targets_${_x} ; then
+			LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+		fi
+	done
+	LLVM_EXPERIMENTAL_TARGETS=${LLVM_EXPERIMENTAL_TARGETS[@]}
+
 	local cm_btype="$(usex debug DEBUG RELEASE)"
 	cat <<- _EOF_ > "${S}"/config.toml
 		changelog-seen = 2
@@ -271,7 +281,7 @@ src_configure() {
 		assertions = $(toml_usex debug)
 		ninja = true
 		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
+		experimental-targets = "${LLVM_EXPERIMENTAL_TARGETS// /;}"
 		link-shared = $(toml_usex system-llvm)
 		$(if is_libcxx_linked; then
 			# https://bugs.gentoo.org/732632
diff --git a/dev-lang/rust/rust-1.76.0-r100.ebuild b/dev-lang/rust/rust-1.76.0-r100.ebuild
index 04b921cbf7e5..364d59bed5b6 100644
--- a/dev-lang/rust/rust-1.76.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.76.0-r100.ebuild
@@ -39,6 +39,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
 
@@ -260,6 +262,14 @@ src_configure() {
 	rust_build="$(rust_abi "${CBUILD}")"
 	rust_host="$(rust_abi "${CHOST}")"
 
+	LLVM_EXPERIMENTAL_TARGETS=()
+	for _x in "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if use llvm_targets_${_x} ; then
+			LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+		fi
+	done
+	LLVM_EXPERIMENTAL_TARGETS=${LLVM_EXPERIMENTAL_TARGETS[@]}
+
 	local cm_btype="$(usex debug DEBUG RELEASE)"
 	cat <<- _EOF_ > "${S}"/config.toml
 		changelog-seen = 2
@@ -270,7 +280,7 @@ src_configure() {
 		assertions = $(toml_usex debug)
 		ninja = true
 		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
+		experimental-targets = "${LLVM_EXPERIMENTAL_TARGETS// /;}"
 		link-shared = $(toml_usex system-llvm)
 		$(if is_libcxx_linked; then
 			# https://bugs.gentoo.org/732632
diff --git a/dev-lang/rust/rust-1.77.1-r100.ebuild b/dev-lang/rust/rust-1.77.1-r100.ebuild
index 1a86dda8a2ea..5461a2a6b93e 100644
--- a/dev-lang/rust/rust-1.77.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.77.1-r100.ebuild
@@ -39,6 +39,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
 
@@ -259,6 +261,14 @@ src_configure() {
 	rust_build="$(rust_abi "${CBUILD}")"
 	rust_host="$(rust_abi "${CHOST}")"
 
+	LLVM_EXPERIMENTAL_TARGETS=()
+	for _x in "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if use llvm_targets_${_x} ; then
+			LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+		fi
+	done
+	LLVM_EXPERIMENTAL_TARGETS=${LLVM_EXPERIMENTAL_TARGETS[@]}
+
 	local cm_btype="$(usex debug DEBUG RELEASE)"
 	cat <<- _EOF_ > "${S}"/config.toml
 		changelog-seen = 2
@@ -269,7 +279,7 @@ src_configure() {
 		assertions = $(toml_usex debug)
 		ninja = true
 		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
+		experimental-targets = "${LLVM_EXPERIMENTAL_TARGETS// /;}"
 		link-shared = $(toml_usex system-llvm)
 		$(if is_libcxx_linked; then
 			# https://bugs.gentoo.org/732632
diff --git a/dev-lang/rust/rust-1.78.0-r100.ebuild b/dev-lang/rust/rust-1.78.0-r100.ebuild
index feaca456180b..19a64890ab0b 100644
--- a/dev-lang/rust/rust-1.78.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.78.0-r100.ebuild
@@ -39,6 +39,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
 
@@ -259,6 +261,14 @@ src_configure() {
 	rust_build="$(rust_abi "${CBUILD}")"
 	rust_host="$(rust_abi "${CHOST}")"
 
+	LLVM_EXPERIMENTAL_TARGETS=()
+	for _x in "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if use llvm_targets_${_x} ; then
+			LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+		fi
+	done
+	LLVM_EXPERIMENTAL_TARGETS=${LLVM_EXPERIMENTAL_TARGETS[@]}
+
 	local cm_btype="$(usex debug DEBUG RELEASE)"
 	cat <<- _EOF_ > "${S}"/config.toml
 		[llvm]
@@ -268,7 +278,7 @@ src_configure() {
 		assertions = $(toml_usex debug)
 		ninja = true
 		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
+		experimental-targets = "${LLVM_EXPERIMENTAL_TARGETS// /;}"
 		link-shared = $(toml_usex system-llvm)
 		$(if is_libcxx_linked; then
 			# https://bugs.gentoo.org/732632
diff --git a/dev-lang/rust/rust-1.79.0-r100.ebuild b/dev-lang/rust/rust-1.79.0-r100.ebuild
index feaca456180b..19a64890ab0b 100644
--- a/dev-lang/rust/rust-1.79.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.79.0-r100.ebuild
@@ -39,6 +39,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
 
@@ -259,6 +261,14 @@ src_configure() {
 	rust_build="$(rust_abi "${CBUILD}")"
 	rust_host="$(rust_abi "${CHOST}")"
 
+	LLVM_EXPERIMENTAL_TARGETS=()
+	for _x in "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if use llvm_targets_${_x} ; then
+			LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+		fi
+	done
+	LLVM_EXPERIMENTAL_TARGETS=${LLVM_EXPERIMENTAL_TARGETS[@]}
+
 	local cm_btype="$(usex debug DEBUG RELEASE)"
 	cat <<- _EOF_ > "${S}"/config.toml
 		[llvm]
@@ -268,7 +278,7 @@ src_configure() {
 		assertions = $(toml_usex debug)
 		ninja = true
 		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
+		experimental-targets = "${LLVM_EXPERIMENTAL_TARGETS// /;}"
 		link-shared = $(toml_usex system-llvm)
 		$(if is_libcxx_linked; then
 			# https://bugs.gentoo.org/732632
diff --git a/dev-lang/rust/rust-1.80.1-r100.ebuild b/dev-lang/rust/rust-1.80.1-r100.ebuild
index 6e2454510ddc..fb5eef4568b5 100644
--- a/dev-lang/rust/rust-1.80.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.80.1-r100.ebuild
@@ -39,6 +39,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
 
@@ -258,6 +260,14 @@ src_configure() {
 	rust_build="$(rust_abi "${CBUILD}")"
 	rust_host="$(rust_abi "${CHOST}")"
 
+	LLVM_EXPERIMENTAL_TARGETS=()
+	for _x in "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if use llvm_targets_${_x} ; then
+			LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+		fi
+	done
+	LLVM_EXPERIMENTAL_TARGETS=${LLVM_EXPERIMENTAL_TARGETS[@]}
+
 	local cm_btype="$(usex debug DEBUG RELEASE)"
 	cat <<- _EOF_ > "${S}"/config.toml
 		[llvm]
@@ -267,7 +277,7 @@ src_configure() {
 		assertions = $(toml_usex debug)
 		ninja = true
 		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
+		experimental-targets = "${LLVM_EXPERIMENTAL_TARGETS// /;}"
 		link-shared = $(toml_usex system-llvm)
 		$(if is_libcxx_linked; then
 			# https://bugs.gentoo.org/732632
diff --git a/dev-lang/rust/rust-1.81.0-r100.ebuild b/dev-lang/rust/rust-1.81.0-r100.ebuild
index 5b0447c1e997..93dfa988757c 100644
--- a/dev-lang/rust/rust-1.81.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.81.0-r100.ebuild
@@ -40,6 +40,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
 
@@ -262,6 +264,14 @@ src_configure() {
 	rust_build="$(rust_abi "${CBUILD}")"
 	rust_host="$(rust_abi "${CHOST}")"
 
+	LLVM_EXPERIMENTAL_TARGETS=()
+	for _x in "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if use llvm_targets_${_x} ; then
+			LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+		fi
+	done
+	LLVM_EXPERIMENTAL_TARGETS=${LLVM_EXPERIMENTAL_TARGETS[@]}
+
 	local cm_btype="$(usex debug DEBUG RELEASE)"
 	cat <<- _EOF_ > "${S}"/config.toml
 		[llvm]
@@ -271,7 +281,7 @@ src_configure() {
 		assertions = $(toml_usex debug)
 		ninja = true
 		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
+		experimental-targets = "${LLVM_EXPERIMENTAL_TARGETS// /;}"
 		link-shared = $(toml_usex system-llvm)
 		$(if is_libcxx_linked; then
 			# https://bugs.gentoo.org/732632
diff --git a/dev-lang/rust/rust-1.82.0-r100.ebuild b/dev-lang/rust/rust-1.82.0-r100.ebuild
index eca2deabe012..25fbe716b6a7 100644
--- a/dev-lang/rust/rust-1.82.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.82.0-r100.ebuild
@@ -39,6 +39,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
 
@@ -269,6 +271,14 @@ src_configure() {
 	rust_build="$(rust_abi "${CBUILD}")"
 	rust_host="$(rust_abi "${CHOST}")"
 
+	LLVM_EXPERIMENTAL_TARGETS=()
+	for _x in "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if use llvm_targets_${_x} ; then
+			LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+		fi
+	done
+	LLVM_EXPERIMENTAL_TARGETS=${LLVM_EXPERIMENTAL_TARGETS[@]}
+
 	local cm_btype="$(usex debug DEBUG RELEASE)"
 	cat <<- _EOF_ > "${S}"/config.toml
 		[llvm]
@@ -278,7 +288,7 @@ src_configure() {
 		assertions = $(toml_usex debug)
 		ninja = true
 		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
+		experimental-targets = "${LLVM_EXPERIMENTAL_TARGETS// /;}"
 		link-shared = $(toml_usex system-llvm)
 		$(if is_libcxx_linked; then
 			# https://bugs.gentoo.org/732632
diff --git a/dev-lang/rust/rust-1.82.0-r101.ebuild b/dev-lang/rust/rust-1.82.0-r101.ebuild
index 84788dff3186..1f70f958d492 100644
--- a/dev-lang/rust/rust-1.82.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.82.0-r101.ebuild
@@ -39,6 +39,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
 
@@ -270,6 +272,14 @@ src_configure() {
 	rust_build="$(rust_abi "${CBUILD}")"
 	rust_host="$(rust_abi "${CHOST}")"
 
+	LLVM_EXPERIMENTAL_TARGETS=()
+	for _x in "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if use llvm_targets_${_x} ; then
+			LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+		fi
+	done
+	LLVM_EXPERIMENTAL_TARGETS=${LLVM_EXPERIMENTAL_TARGETS[@]}
+
 	local cm_btype="$(usex debug DEBUG RELEASE)"
 	cat <<- _EOF_ > "${S}"/config.toml
 		[llvm]
@@ -279,7 +289,7 @@ src_configure() {
 		assertions = $(toml_usex debug)
 		ninja = true
 		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
+		experimental-targets = "${LLVM_EXPERIMENTAL_TARGETS// /;}"
 		link-shared = $(toml_usex system-llvm)
 		$(if is_libcxx_linked; then
 			# https://bugs.gentoo.org/732632
diff --git a/dev-lang/rust/rust-1.83.0-r1.ebuild b/dev-lang/rust/rust-1.83.0-r1.ebuild
index cc756f4e4dab..2262915b0d62 100644
--- a/dev-lang/rust/rust-1.83.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.83.0-r1.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
@@ -20,7 +20,7 @@ if [[ ${PV} = *beta* ]]; then
 else
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 DESCRIPTION="Systems programming language from Mozilla"
@@ -39,6 +39,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
 
@@ -270,6 +272,14 @@ src_configure() {
 	rust_build="$(rust_abi "${CBUILD}")"
 	rust_host="$(rust_abi "${CHOST}")"
 
+	LLVM_EXPERIMENTAL_TARGETS=()
+	for _x in "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if use llvm_targets_${_x} ; then
+			LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+		fi
+	done
+	LLVM_EXPERIMENTAL_TARGETS=${LLVM_EXPERIMENTAL_TARGETS[@]}
+
 	local cm_btype="$(usex debug DEBUG RELEASE)"
 	cat <<- _EOF_ > "${S}"/config.toml
 		[llvm]
@@ -279,7 +289,7 @@ src_configure() {
 		assertions = $(toml_usex debug)
 		ninja = true
 		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
+		experimental-targets = "${LLVM_EXPERIMENTAL_TARGETS// /;}"
 		link-shared = $(toml_usex system-llvm)
 		$(if is_libcxx_linked; then
 			# https://bugs.gentoo.org/732632
diff --git a/dev-lang/rust/rust-1.84.0.ebuild b/dev-lang/rust/rust-1.84.0.ebuild
new file mode 100644
index 000000000000..f07d34111b3e
--- /dev/null
+++ b/dev-lang/rust/rust-1.84.0.ebuild
@@ -0,0 +1,730 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 19 )
+PYTHON_COMPAT=( python3_{10..13} )
+
+RUST_MAX_VER=${PV}
+RUST_MIN_VER="$(ver_cut 1).$(($(ver_cut 2) - 1)).0"
+
+inherit check-reqs estack flag-o-matic llvm-r1 multiprocessing optfeature \
+	multilib multilib-build python-any-r1 rust rust-toolchain toolchain-funcs verify-sig
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz"
+else
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+
+SRC_URI="
+	https://static.rust-lang.org/dist/${SRC}
+	verify-sig? ( https://static.rust-lang.org/dist/${SRC}.asc )
+"
+S="${WORKDIR}/${MY_P}-src"
+
+# keep in sync with llvm ebuild of the same version as bundled one.
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
+	LoongArch M68k Mips MSP430 NVPTX PowerPC RISCV Sparc SPIRV SystemZ VE
+	WebAssembly X86 XCore Xtensa )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
+
+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[*]}"
+
+LLVM_DEPEND=()
+# splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
+for _x in "${ALL_LLVM_TARGETS[@]}"; do
+	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+done
+LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
+LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
+
+BDEPEND="${PYTHON_DEPS}
+	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 )
+"
+
+DEPEND="
+	>=app-arch/xz-utils-5.2
+	net-misc/curl:=[http2,ssl]
+	sys-libs/zlib:=
+	dev-libs/openssl:0=
+	system-llvm? (
+		${LLVM_DEPEND[*]}
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
+	)
+	!system-llvm? (
+		!llvm-libunwind? (
+			elibc_musl? ( sys-libs/libunwind:= )
+		)
+	)
+"
+
+RDEPEND="${DEPEND}
+	app-eselect/eselect-rust
+	dev-lang/rust-common
+	sys-apps/lsb-release
+	!dev-lang/rust:stable
+	!dev-lang/rust-bin:stable
+"
+
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
+	miri? ( nightly )
+	parallel-compiler? ( nightly )
+	rust-analyzer? ( rust-src )
+	test? ( ${ALL_LLVM_TARGETS[*]} )
+	wasm? ( llvm_targets_WebAssembly )
+	x86? ( cpu_flags_x86_sse2 )
+"
+
+# we don't use cmake.eclass, but can get a warning
+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
+"
+
+QA_PRESTRIPPED="
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/bin/rust-llvm-dwp
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/self-contained/crtn.o
+"
+
+# 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.78.0-musl-dynamic-linking.patch
+	"${FILESDIR}"/1.83.0-cross-compile-libz.patch
+	#"${FILESDIR}"/1.72.0-bump-libc-deps-to-0.2.146.patch  # pending refresh
+	"${FILESDIR}"/1.67.0-doc-wasm.patch
+)
+
+clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' "vendor/${1}/.cargo-checksum.json" || die
+}
+
+toml_usex() {
+	usex "${1}" true false
+}
+
+pre_build_checks() {
+	local M=9216
+	# multiply requirements by 1.3 if we are doing x86-multilib
+	if use amd64; then
+		M=$(( $(usex abi_x86_32 13 10) * ${M} / 10 ))
+	fi
+	M=$(( $(usex clippy 128 0) + ${M} ))
+	M=$(( $(usex miri 128 0) + ${M} ))
+	M=$(( $(usex rustfmt 256 0) + ${M} ))
+	# add 2G if we compile llvm and 256M per llvm_target
+	if ! use system-llvm; then
+		M=$(( 2048 + ${M} ))
+		local ltarget
+		for ltarget in ${ALL_LLVM_TARGETS[@]}; do
+			M=$(( $(usex ${ltarget} 256 0) + ${M} ))
+		done
+	fi
+	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}
+}
+
+llvm_check_deps() {
+	has_version -r "llvm-core/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include <ciso646>
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	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
+
+	rust_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
+}
+
+src_prepare() {
+	# Rust baselines to Pentium4 on x86, this patch lowers the baseline to i586 when sse2 is not set.
+	if use x86; then
+		if ! use cpu_flags_x86_sse2; then
+			eapply "${FILESDIR}/1.82.0-i586-baseline.patch"
+			#grep -rl cmd.args.push\(\"-march=i686\" . | xargs sed  -i 's/march=i686/-march=i586/g' || die
+		fi
+	fi
+
+	default
+}
+
+src_configure() {
+	if tc-is-cross-compiler; then
+		export PKG_CONFIG_ALLOW_CROSS=1
+		export PKG_CONFIG_PATH="${ESYSROOT}/usr/$(get_libdir)/pkgconfig"
+		export OPENSSL_INCLUDE_DIR="${ESYSROOT}/usr/include"
+		export OPENSSL_LIB_DIR="${ESYSROOT}/usr/$(get_libdir)"
+	fi
+
+	filter-lto # https://bugs.gentoo.org/862109 https://bugs.gentoo.org/866231
+
+	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_abi $(get_abi_CHOST ${v##*.}))\""
+	done
+	if use wasm; then
+		rust_targets+=",\"wasm32-unknown-unknown\""
+		if use system-llvm; then
+			# un-hardcode rust-lld linker for this target
+			# https://bugs.gentoo.org/715348
+			sed -i '/linker:/ s/rust-lld/wasm-ld/' compiler/rustc_target/src/spec/base/wasm.rs || die
+		fi
+	fi
+	rust_targets="${rust_targets#,}"
+
+	# cargo and rustdoc are mandatory and should always be included
+	local tools='"cargo","rustdoc"'
+	use clippy && tools+=',"clippy"'
+	use miri && tools+=',"miri"'
+	use rustfmt && tools+=',"rustfmt"'
+	use rust-analyzer && tools+=',"rust-analyzer","rust-analyzer-proc-macro-srv"'
+	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"
+
+	rust_target="$(rust_abi)"
+	rust_build="$(rust_abi "${CBUILD}")"
+	rust_host="$(rust_abi "${CHOST}")"
+
+	local cm_btype="$(usex debug DEBUG RELEASE)"
+	cat <<- _EOF_ > "${S}"/config.toml
+		# https://github.com/rust-lang/rust/issues/135358 (bug #947897)
+		profile = "dist"
+		[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 = $(toml_usex system-llvm)
+		$(if is_libcxx_linked; then
+			# https://bugs.gentoo.org/732632
+			echo "use-libcxx = true"
+			echo "static-libstdcpp = false"
+		fi)
+		$(case "${rust_target}" in
+			i586-*-linux-*)
+				# https://github.com/rust-lang/rust/issues/93059
+				echo 'cflags = "-fcf-protection=none"'
+				echo 'cxxflags = "-fcf-protection=none"'
+				echo 'ldflags = "-fcf-protection=none"'
+				;;
+			*)
+				;;
+		esac)
+		enable-warnings = false
+		[llvm.build-config]
+		CMAKE_VERBOSE_MAKEFILE = "ON"
+		$(if ! tc-is-cross-compiler; then
+			# When cross-compiling, LLVM is compiled twice, once for host and
+			# once for target.  Unfortunately, this build configuration applies
+			# to both, which means any flags applicable to one target but not
+			# the other will break.  Conditionally disable respecting user
+			# flags when cross-compiling.
+			echo "CMAKE_C_FLAGS_${cm_btype} = \"${CFLAGS}\""
+			echo "CMAKE_CXX_FLAGS_${cm_btype} = \"${CXXFLAGS}\""
+			echo "CMAKE_EXE_LINKER_FLAGS_${cm_btype} = \"${LDFLAGS}\""
+			echo "CMAKE_MODULE_LINKER_FLAGS_${cm_btype} = \"${LDFLAGS}\""
+			echo "CMAKE_SHARED_LINKER_FLAGS_${cm_btype} = \"${LDFLAGS}\""
+			echo "CMAKE_STATIC_LINKER_FLAGS_${cm_btype} = \"${ARFLAGS}\""
+		fi)
+		[build]
+		build-stage = 2
+		test-stage = 2
+		build = "${rust_build}"
+		host = ["${rust_host}"]
+		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 = true
+		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
+		$(if ! tc-is-cross-compiler; then
+			echo "default-linker = \"$(tc-getCC)\""
+		fi)
+		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 = $(usex system-llvm false $(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
+		# See https://github.com/rust-lang/rust/issues/121124
+		lto = "$(usex lto thin off)"
+		[dist]
+		src-tarball = false
+		compression-formats = ["xz"]
+		compression-profile = "balanced"
+	_EOF_
+
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
+
+		export CFLAGS_${rust_target//-/_}="${arch_cflags}"
+
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.${rust_target}]
+			ar = "$(tc-getAR)"
+			cc = "$(tc-getCC)"
+			cxx = "$(tc-getCXX)"
+			linker = "$(tc-getCC)"
+			ranlib = "$(tc-getRANLIB)"
+			llvm-libunwind = "$(usex llvm-libunwind $(usex system-llvm system in-tree) no)"
+		_EOF_
+		if use system-llvm; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix)/bin/llvm-config"
+			_EOF_
+		fi
+		# by default librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
+		# but we patch it and set to false here as well
+		if use elibc_musl; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				crt-static = false
+				musl-root = "$($(tc-getCC) -print-sysroot)/usr"
+			_EOF_
+		fi
+	done
+	if use wasm; then
+		wasm_target="wasm32-unknown-unknown"
+		export CFLAGS_${wasm_target//-/_}="$(filter-flags '-mcpu*' '-march*' '-mtune*'; echo "$CFLAGS")"
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.wasm32-unknown-unknown]
+			linker = "$(usex system-llvm lld rust-lld)"
+			# wasm target does not have profiler_builtins https://bugs.gentoo.org/848483
+			profiler = false
+		_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, system-llvm, 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}]
+			ar = "${cross_toolchain}-ar"
+			cc = "${cross_toolchain}-gcc"
+			cxx = "${cross_toolchain}-g++"
+			linker = "${cross_toolchain}-gcc"
+			ranlib = "${cross_toolchain}-ranlib"
+		_EOF_
+		if use system-llvm; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix)/bin/llvm-config"
+			_EOF_
+		fi
+		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}\""
+	echo MAGIC_EXTRA_RUSTFLAGS="\"${MAGIC_EXTRA_RUSTFLAGS}\""
+	env | grep "CARGO_TARGET_.*_RUSTFLAGS="
+	env | grep "CFLAGS_.*"
+	echo
+	einfo "config.toml contents:"
+	cat "${S}"/config.toml || die
+	echo
+}
+
+src_compile() {
+	RUST_BACKTRACE=1 "${EPYTHON}" ./x.py build -vvv --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=(
+		codegen
+		codegen-units
+		compile-fail
+		incremental
+		mir-opt
+		pretty
+		run-make
+	)
+
+	# fails if llvm is not built with ALL targets.
+	# and known to fail with system llvm sometimes.
+	use system-llvm || tests+=( assembly )
+
+	# 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 ! 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() {
+	DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+
+	docompress /usr/lib/${PN}/${PV}/share/man/
+
+	# 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
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use miri && symlinks+=( miri cargo-miri )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+	use rust-analyzer && symlinks+=( rust-analyzer )
+
+	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}"
+	use rust-analyzer && 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}"
+	_EOF_
+
+	rm -rf "${ED}/usr/lib/${PN}/${PV}"/*.old || die
+	rm -rf "${ED}/usr/lib/${PN}/${PV}/bin"/*.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/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
+	_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
+	if use rust-analyzer; then
+		echo /usr/lib/rust/libexec >> "${T}/provider-${P}"
+		echo /usr/bin/rust-analyzer >> "${T}/provider-${P}"
+	fi
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+
+	if use dist; then
+		"${EPYTHON}" ./x.py dist -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+		insinto "/usr/lib/${PN}/${PV}/dist"
+		doins -r "${S}/build/dist/."
+	fi
+}
+
+pkg_preinst() {
+	# 943308 and friends; basically --keep-going can forget to unmerge old rust
+	# but the soft blocker allows us to install conflicting files.
+	# This results in duplicated .{rlib,so} files which confuses rustc and results in
+	# the need for manual intervention.
+	if has_version -b "dev-lang/rust:stable/$(ver_cut 1-2)"; then
+		# we need to find all .{rlib,so} files in the old rust lib directory
+		# and store them in an array for later use
+		readarray -d '' old_rust_libs < <(
+			find "${EROOT}/usr/lib/rust/${PV}/lib/rustlib" \
+			-type f \( -name '*.rlib' -o -name '*.so' \) -print0)
+		export old_rust_libs
+		if [[ ${#old_rust_libs[@]} -gt 0 ]]; then
+			einfo "Found old .rlib and .so files in the old rust lib directory"
+		else
+			die "Found no old .rlib and .so files but old rust version is installed. Bailing!"
+		fi
+	fi
+}
+
+pkg_postinst() {
+
+	if has_version -b "dev-lang/rust:stable/$(ver_cut 1-2)"; then
+		# Be _extra_ careful here as we're removing files from the live filesystem
+		local f
+		for f in "${old_rust_libs[@]}"; do
+			[[ -f ${f} ]] || die "old_rust_libs array contains non-existent file"
+			local base_name="${f%-*}"
+			local ext="${f##*.}"
+			local matching_files=("${base_name}"-*.${ext})
+			if [[ ${#matching_files[@]} -ne 2 ]]; then
+				die "Expected exactly two files matching ${base_name}-\*.rlib, but found ${#matching_files[@]}"
+			fi
+			einfo "Removing old .rlib file ${f}"
+			rm "${f}" || die
+		done
+	fi
+
+	eselect rust update
+
+	if has_version dev-debug/gdb || has_version llvm-core/lldb; then
+		elog "Rust installs helper scripts for calling GDB and LLDB,"
+		elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+	fi
+
+	if has_version app-editors/emacs; then
+		optfeature "emacs support for rust" app-emacs/rust-mode
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		optfeature "vim support for rust" app-vim/rust-vim
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index a02f1d7a4c30..d4e20b3963ba 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -4,7 +4,9 @@ DIST firefox-115.16.0esr.source.tar.xz 515133700 BLAKE2B 9501b617b346d56f6de975f
 DIST firefox-115esr-patches-13.tar.xz 51360 BLAKE2B a048bfadba989ebbd4c6e3df97d303d6853844e66ed92f5f5f322acf18866218b91d52dbbece63827de283eef855c932d67e329c8d93200aa83f11268a5d1b2f SHA512 186ec72323e621362dcef1bc67c476716aff97dfad701faa9220a7302e798d3cb4ed90d5ea59e3e92f016be29875bb5219787635db99a8848b7c76e4e2e09e90
 DIST firefox-128.4.0esr.source.tar.xz 558619512 BLAKE2B 1f0528c8806bb034af623f2022740bb5056ea11817b9cb7154a60b87f04051ba5ae06b0daf55e6b03b7531c369deb871d3d3579a86f3ca19f3ab71ccb45243f9 SHA512 e720b1f993926d73f5a5727648f753176ac2fd093fb0b71393946bbc5919ce5fc7b88b82960bd1aa427b5663c7f659828dc6702485fc0c1e7a6961571c67faa3
 DIST firefox-128.5.0esr.source.tar.xz 567200548 BLAKE2B b524796854d4f622e90c219e4e302e5665f3f1e3ffb7935ba58244903dbcf1c2b9a13731e9af5507ffc25dda621d4ea13650aae842ed0317843182da55d1d652 SHA512 ff20f18f92c5e9cd1d9eaf7c38cec61bcab2dca8dd2817519b712bc1f760b5c6e290212acf3289152764e5130e01626950b7ecd9327b2c587b24a246591afd67
+DIST firefox-128.6.0esr.source.tar.xz 563259116 BLAKE2B 401c54e4c3e81dd1d4aa9fed072e5266a7549d9ac05e03f9755d3da192c9c46d2bc636e8bf0a7fad2269074615789ab274b897c8bd75fd524f4a5f138c3aa1d5 SHA512 49bce966e062766861712bd65cca46a438b339fe31598f69e4fe64da78ef6f8b4581c1d502341ef1c032aafaab2f4f88e69cb93a0b845ba7173fec277ae695b5
 DIST firefox-128esr-patches-07.tar.xz 18856 BLAKE2B 44d0ddf11518c7eef0a96de4f475a6ae1535e43e5bf89b8f61dc95330f28d6a053d08e6a183cf71432107256c83cd6ee6f742b235ca82babe4dd83698bf80d07 SHA512 60b4f18f5d91fc25f86cceccd561b55f167299908fbf2f9d7d69a8ce299c643f0b538d613d4348e42dd17c3812e4fa315e15004614af1f40fbe2adda417a1a81
+DIST firefox-128esr-patches-08.tar.xz 17564 BLAKE2B d904b74fdae2e76866ded11de5377a7b6883d35996b358ae3419ffb7da53b04b2c7d4bb10d48998a8318a84e8221de39955289cb33a8f278c131b4af2006be62 SHA512 344a2d04dec679cd8ed714dcecc9dd5b56696803cee9267e7c0c45c439d78728e7eae674bb5f0a64f2e5802dc59c1ec25f1703885024d88bda8a02e2b3e0d69e
 DIST spidermonkey-102-patches-05j.tar.xz 4596 BLAKE2B 215b770bbdf17973d7b3fd1df6cee9647459d2b02b0be5bdb289d457e5dbdb06ceac7a3082fc2f5836e991a4ac4486d73330b0276a466b5c528dab226a27829c SHA512 d2b8e32dac87d60a00fd93479dc34d8adab4feec24a38591cebeb4cf271aa2fd964f4dc26e67ebfb127a47bc8f684d50b32b2cff18ed5286701a04a289058185
 DIST spidermonkey-115-patches-02.tar.xz 4896 BLAKE2B f78d9804c1427b45d6fda496b4991ec6f672dec9ce031ed57a2920fa1968c942a235f46e40166c8ab8d731a1963f322d34bb2f6984133179175e6f7376d27d13 SHA512 11fd01152d1e7b8ca89bf628076e1f4fb4f1ba6c9dc0f9dd544252495c580c04e4d5ffc238d5587f9e993aa91a47828333564ca55f60e008bd370089cd07d2e6
 DIST spidermonkey-128-patches-02.tar.xz 3916 BLAKE2B b6640860ea091b22c61b2a78da5004816a08ab9fb39fda04ae76fe48a3a8061770d6d6e451e5f34951aa3f63473dd77d3dde8b60aec80b4c31f1b29064ce68ee SHA512 3f2d272a36ca2ac831de9108769c68e380be4e8bba7071d02686699702acac6a9325e4256d9c5c2441c3742552179031b0898d3f96f08477857fd6e989596ee6
diff --git a/dev-lang/spidermonkey/spidermonkey-128.5.0.ebuild b/dev-lang/spidermonkey/spidermonkey-128.5.0.ebuild
index 827f5b82d384..16fc99683ae2 100644
--- a/dev-lang/spidermonkey/spidermonkey-128.5.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-128.5.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"
@@ -58,7 +58,7 @@ DESCRIPTION="Mozilla's JavaScript engine written in C and C++"
 HOMEPAGE="https://spidermonkey.dev https://firefox-source-docs.mozilla.org/js/index.html"
 SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
 	${PATCH_URIS[@]}"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 
 LICENSE="MPL-2.0"
 SLOT="$(ver_cut 1)"
diff --git a/dev-lang/spidermonkey/spidermonkey-128.6.0.ebuild b/dev-lang/spidermonkey/spidermonkey-128.6.0.ebuild
new file mode 100644
index 000000000000..1f1a17198baf
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-128.6.0.ebuild
@@ -0,0 +1,473 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+FIREFOX_PATCHSET="firefox-128esr-patches-08.tar.xz"
+SPIDERMONKEY_PATCHSET="spidermonkey-128-patches-02.tar.xz"
+
+LLVM_COMPAT=( 17 18 19 )
+RUST_NEEDS_LLVM=1
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,ssl,xml(+)"
+
+WANT_AUTOCONF="2.1"
+
+inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 rust toolchain-funcs
+
+MY_PN="mozjs"
+MY_PV="${PV/_pre*}"
+
+MY_MAJOR=$(ver_cut 1)
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="firefox"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~juippis/mozilla/patchsets/${FIREFOX_PATCHSET}
+	https://dev.gentoo.org/~juippis/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}
+)
+
+DESCRIPTION="Mozilla's JavaScript engine written in C and C++"
+HOMEPAGE="https://spidermonkey.dev https://firefox-source-docs.mozilla.org/js/index.html"
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+
+LICENSE="MPL-2.0"
+SLOT="$(ver_cut 1)"
+IUSE="clang cpu_flags_arm_neon debug +jit test"
+
+#RESTRICT="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		clang? (
+			llvm-core/clang:${LLVM_SLOT}
+			llvm-core/lld:${LLVM_SLOT}
+			llvm-core/llvm:${LLVM_SLOT}
+		)
+	')
+	>=dev-util/cbindgen-0.26.0
+	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	)"
+DEPEND=">=dev-libs/icu-73.1:=
+	dev-libs/nspr
+	sys-libs/readline:0=
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/firefox-${PV%_*}"
+
+llvm_check_deps() {
+	if use clang ; then
+		if ! has_version -b "llvm-core/clang:${LLVM_SLOT}" ; then
+			einfo "llvm-core/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! has_version -b "llvm-core/llvm:${LLVM_SLOT}" ; then
+			einfo "llvm-core/llvm:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! tc-ld-is-mold ; then
+			if ! has_version -b "llvm-core/lld:${LLVM_SLOT}" ; then
+				einfo "llvm-core/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+python_check_deps() {
+	if use test ; then
+		python_has_version "dev-python/six[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_pretend() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="4400M"
+	else
+		CHECKREQS_DISK_BUILD="4300M"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	# Get LTO from environment; export after this phase for use in src_configure (etc)
+	use_lto=no
+
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if tc-is-lto; then
+			use_lto=yes
+			# LTO is handled via configure
+			filter-lto
+		fi
+
+		if [[ ${use_lto} = yes ]]; then
+			# -Werror=lto-type-mismatch -Werror=odr are going to fail with GCC,
+			# bmo#1516758, bgo#942288
+			filter-flags -Werror=lto-type-mismatch -Werror=odr
+		fi
+
+		if use test ; then
+			CHECKREQS_DISK_BUILD="4400M"
+		else
+			CHECKREQS_DISK_BUILD="4300M"
+		fi
+
+		check-reqs_pkg_setup
+		llvm-r1_pkg_setup
+		rust_pkg_setup
+		python-any-r1_pkg_setup
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+
+	export use_lto
+}
+
+src_prepare() {
+	if [[ ${use_lto} == "yes" ]]; then
+		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
+	fi
+
+	# Workaround for bgo #915651,915651,929013 on musl
+	if use elibc_glibc ; then
+		rm -v "${WORKDIR}"/firefox-patches/*bgo-748849-RUST_TARGET_override.patch || die
+	fi
+
+	eapply "${WORKDIR}"/firefox-patches
+	eapply "${WORKDIR}"/spidermonkey-patches
+
+	default
+
+	# Make cargo respect MAKEOPTS
+	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
+
+	# Workaround for bgo #915651,915651,929013 on musl
+	if ! use elibc_glibc ; then
+		if use amd64 ; then
+			export RUST_TARGET="x86_64-unknown-linux-musl"
+		elif use x86 ; then
+			export RUST_TARGET="i686-unknown-linux-musl"
+		elif use arm64 ; then
+			export RUST_TARGET="aarch64-unknown-linux-musl"
+		elif use ppc64 ; then
+			export RUST_TARGET="powerpc64le-unknown-linux-musl"
+		else
+			die "Unknown musl chost, please post your rustc -vV along with emerge --info on Gentoo's bug #915651"
+		fi
+	fi
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		python/mozbuild/mozbuild/configure/check_debug_ranges.py ||
+			die "sed failed to set toolchain prefix"
+
+	einfo "Removing pre-built binaries ..."
+	find third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:    ${CFLAGS}"
+	einfo "Current CXXFLAGS:  ${CXXFLAGS}"
+	einfo "Current LDFLAGS:   ${LDFLAGS}"
+	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
+
+	local have_switched_compiler=
+	if use clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+
+		local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }')
+		[[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}")
+		[[ -z ${version_clang} ]] && die "Failed to read clang version!"
+
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
+
+		AR=llvm-ar
+		CC=${CHOST}-clang-${version_clang}
+		CXX=${CHOST}-clang++-${version_clang}
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+		READELF=llvm-readelf
+		OBJDUMP=llvm-objdump
+
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+		READELF=readelf
+		OBJDUMP=objdump
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain,
+	# AS is used in a non-standard way by upstream, #bmo1654031
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
+
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB READELF PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# ../python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-project=js
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--host="${CBUILD:-${CHOST}}" \
+		--target="${CHOST}" \
+		--disable-ctype \
+		--disable-jemalloc \
+		--disable-smoosh \
+		--disable-strip \
+		--enable-readline \
+		--enable-release \
+		--enable-shared-js \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--with-intl-api \
+		--with-system-icu \
+		--with-system-nspr \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--x-includes="${ESYSROOT}/usr/include" \
+		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable jit
+	mozconfig_use_enable test tests
+
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+		mozconfig_add_options_ac '+debug' --enable-debug-symbols
+		mozconfig_add_options_ac '+debug' --enable-real-time-tracing
+	else
+		mozconfig_add_options_ac '-debug' --enable-optimize
+		mozconfig_add_options_ac '-debug' --disable-debug-symbols
+		mozconfig_add_options_ac '-debug' --disable-real-time-tracing
+	fi
+
+	# We always end up disabling this at some point due to newer rust versions. bgo#933372
+	mozconfig_add_options_ac '--disable-rust-simd' --disable-rust-simd
+
+	# Modifications to better support ARM, bug 717344
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-thumb=yes
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-thumb-interwork=no
+		fi
+	fi
+
+	# Tell build system that we want to use LTO
+	if [[ ${use_lto} == "yes" ]] ; then
+		if use clang ; then
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac '+lto' --enable-linker=mold
+			else
+				mozconfig_add_options_ac '+lto' --enable-linker=lld
+			fi
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+
+		else
+			mozconfig_add_options_ac '+lto' --enable-linker=bfd
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-lto
+
+	# Pass MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:    ${CFLAGS}"
+	einfo "Build CXXFLAGS:  ${CXXFLAGS}"
+	einfo "Build LDFLAGS:   ${LDFLAGS}"
+	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
+
+	./mach configure || die
+}
+
+src_compile() {
+	./mach build --verbose || die
+}
+
+src_test() {
+	if "${BUILD_DIR}/js/src/js" -e 'print("Hello world!")'; then
+		einfo "Smoke-test successful, continuing with full test suite"
+	else
+		die "Smoke-test failed: did interpreter initialization fail?"
+	fi
+
+	cp "${FILESDIR}"/spidermonkey-${SLOT}-known-test-failures.txt "${T}"/known_test_failures.list || die
+
+	if use x86 ; then
+		echo "non262/Intl/DateTimeFormat/timeZone_version.js" >> "${T}"/known_test_failures.list
+		echo "test262/intl402/Locale/constructor-non-iana-canon.js" >> "${T}"/known_test_failures.list
+	fi
+
+	./mach jstests --exclude-file="${T}"/known_test_failures.list || die
+}
+
+src_install() {
+	cd "${BUILD_DIR}" || die
+	default
+
+	# fix soname links
+	pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die
+	mv lib${MY_PN}-${MY_MAJOR}.so lib${MY_PN}-${MY_MAJOR}.so.0.0.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0.0.0 lib${MY_PN}-${MY_MAJOR}.so.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0 lib${MY_PN}-${MY_MAJOR}.so || die
+	popd &>/dev/null || die
+
+	# remove unneeded files
+	rm \
+		"${ED}"/usr/bin/js${MY_MAJOR}-config \
+		"${ED}"/usr/$(get_libdir)/libjs_static.ajs || die
+
+	# fix permissions
+	chmod -x \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/*.pc \
+		"${ED}"/usr/include/mozjs-${MY_MAJOR}/js-config.h || die
+}
diff --git a/dev-lang/starlark-rust/Manifest b/dev-lang/starlark-rust/Manifest
deleted file mode 100644
index d439db41473d..000000000000
--- a/dev-lang/starlark-rust/Manifest
+++ /dev/null
@@ -1,165 +0,0 @@
-DIST Inflector-0.11.4.crate 17438 BLAKE2B eaf0c7f983b3186e9bc89353021a10592f2877e46585bd50b96db9b087343d1199c7b6cf3fa53cd274fb6d33de025a904b8aa31a7ac9599ae3689ecdbcec34cd SHA512 f1f6463e033b6d3c16c51dc1e1a3f5569954308b95b59058294b7f9310919bbda797e99e6a07529071bb83f0688867a243997d33795a7136b0af73977004296e
-DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68
-DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
-DIST annotate-snippets-0.9.1.crate 31829 BLAKE2B 6919f78127653f9f022667b0ee7cb80bd2ef95220698e033031c6f4d3ff3341ed260e8baf776d032291538503e26577fc8fa82e99bcdc032985fb297351586a3 SHA512 e1e8b262a6681730ad068c29d7e0f3879acf0c7138721f606851228bd5d90292f24ac2c225fe49f26264e7d35de5ed3904850e522da8cd2c44a67f7db36f2d8e
-DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
-DIST anyhow-1.0.57.crate 44614 BLAKE2B b8d8274325b7959cedb2b8f4023d13b0d3824034c8433aea9a0a6f3c3fa6a6d7460b93bf624dff4b7168075524545f1a312e454ed0b15e8dff2109cf3c6dc433 SHA512 311b9280aa7d573c11752ca2ffe810e2d4b55fe4c34cca948bbd42f1ddb1d36a51eda39684cffb7f6c4a18508cb53a5a38495521562a0088e3374fee800ff004
-DIST argfile-0.1.4.crate 7933 BLAKE2B e0256758f704afa1c1702c7eb9c27ac87bc10c60d8d1c1fd6700de9ef47c47c25a4b1cf41376f47908b76e442b05cd9b0bfc54da82f1fda0debc842e576fe78f SHA512 fdc5646bdd90602addbd3cd6eaa4aefaf0c89431839eecda4c66e6050bbdd2dfbef0ccf5b9186a2f48dd05e1e4be431892bbde97a68600c5ee45ddd144676584
-DIST ascii-canvas-3.0.0.crate 10575 BLAKE2B fc40c40551e3e1b2bec6ae5a85ee8b0a1ab1ef3425cdd19ec6dd47d849205004781a2c8f51470417fe7556cf8524cc63b84a532532c5081604adbcd92d286b44 SHA512 216056640604f5faba6d46e2c94ff75234fec83d3bc2dc7cf34dd279706362874e3a513c717b23bc591da07cc3088458913c4e9aa5f280550c93d261095c8703
-DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST beef-0.5.1.crate 15177 BLAKE2B 7d81c3e4dd7e8e66b670b7a907d54656c5e1932554e2c162401ec2b406495120fc7c5297faa7b827565c27b483b76c63a531cbf0478aafb5a5822bc076aa1468 SHA512 7e4e33c598d7f28a0b939f9be67bfa6cc4deb5c2b04179a24e4e26ffafe715fa84c9dabbf3a1979c456be8d07f8e39cea1dcb24d1717118ef86900b292741a0e
-DIST bit-set-0.5.2.crate 14093 BLAKE2B 06d41a217438d9a00f8e57e592d12364b671d082f21a4d174673bc820dde28ef5ce02e782002d03c9311f71b0130eeeca7cfacbc4c1b27475069479163643ef3 SHA512 9709f35c7e69b84eed61f73da99ffe0693d1d0fa5fb94d13759cfbbb9dd4b0bb27628c3200e4b29ef29cdb0aede5fd3d7ddf663012b2c5946975bc169efbac34
-DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
-DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST bumpalo-3.9.1.crate 77507 BLAKE2B b248a0c2a9faaf52061f2fe0a82b9fd4efb4dae01da9dbd986493941f3ef2632f1d5608d167f2d088536dc96b4cce28981602220062892a7af51c3ead7a74a4b SHA512 40bf3f0d261aaff1f7c30a539953b9c14f4526f05586af0dbe2e4df4cc042cbe6180e3dcc2fbc6f1802e694066f72e629e74de40bc2951c5527edaf551722a52
-DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
-DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
-DIST clipboard-win-4.4.1.crate 12561 BLAKE2B c9870360d637b379269952620a48d379e8a132c80d67e93660a211a80633d876ab36369e9fc405d07f09dc9abd18d286b0d8531c773ab3ffc7b6d9fe630a904d SHA512 df83e7d13ef492080a70301bcfa3567727f584a4f7057963732d66609f46ba2fd26386b22c79f4b2c5250a2346a1997a48e38a1a56a7b7fbbda33d540f1a4910
-DIST convert_case-0.4.0.crate 8098 BLAKE2B cd038a7b0d52a9e183a96cbd548a8deefbe0c60d6aea15d7c6f92a4bbf991444d401b5cd3c944f3d37019e7e3db2a648e321402e13803768556f32c08ec00084 SHA512 e17e92b94b030e39f368ef0dd0288dbb45f77c8ce3034c1a6fd2fd43f38cf10a1af5aa7bebdfb447c335d9593c32dde7262e13f97c271c419c6106cf47dc01e1
-DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
-DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
-DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
-DIST debugserver-types-0.5.0.crate 18075 BLAKE2B 9748c6852e5b9291820eab35be0f56f49e12b7592e5594b98f5fb662d7ef22db1eb3be45b6065ac448522fd8d9cd6c70a4828dfcbbc98bf10cf2cec91606d6f7 SHA512 20f780d6f1b6e4cbe8381122b8c9bbb7026ad0621c548b5724efb8b95b65e60027af4d25e7f01cbecc622d8e6e93900f5c43947eb636b2b8de0efd8201a22e02
-DIST derivative-2.2.0.crate 48076 BLAKE2B 56d27e27493c3b818ad45703efda607a0a0d9a48b0d43785b6a013443b8b964b67bb5b5284d242358415c5fb81b86b02079ee7c0595ec07bc658240eb114b887 SHA512 3c65ecdabd2dc202be3d83b06f96b6f68504fe542ede7e2285093c6d360a33ec76a3787c436c6e5ff8f59d430436a4b8ce2f908cf7b2b08cd8b0045de4e5d1da
-DIST derive_more-0.99.17.crate 55771 BLAKE2B b290bfbf06119018206be0f8ad4c92508be4cbc443f1a937c38961e207fc3f433d8a87b2b5a17e72aa1735520799540557d9dd9e49e26b8eb7cc80289afd44bd SHA512 0bb5a94e56d35a17ff4deed61c437ba75c9063694032ba98b58be1b072d33f2fb170d51bd262a17ff1beed2110b334528de75d5315ac627202ccb13d8c490baf
-DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
-DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
-DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
-DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
-DIST ena-0.14.0.crate 23052 BLAKE2B ac9a4141d831bd16cfd260a162572b43e9389b5cee4319cc22a23b550b25370cf49856c320fd4489633171a4fca91cf7091e974418ddbb1649fec8730c9cd2c9 SHA512 bcf842f8f5da8a7e9b8e51df50bdf3f00234534f1d59d96bb1e45b0ee4fa74847eb8b9b5ca615a66d84d23c629d7386f28294a5c64d22efdf2903bc89faab2d4
-DIST endian-type-0.1.2.crate 2340 BLAKE2B 6048948b467403409807fec776add4366685282a277d4ca40c5fc901228c0652c5759210048b28a94c8bb04c39bb3b359d43254e953e5b476112da7e49151a5b SHA512 d8a9b125fb87099f8bcbaf3688e2feb1c463ce624cd3dd36396e75e7aff177ed5033ecc295c02f491be04dbf240aac376e79a5c7cb591c3b208c442e1c1e6bbd
-DIST erased-serde-0.3.20.crate 26473 BLAKE2B c55de1e10ae724b5dba249d0557cad7e4a6ced4b85864f057372b941e2557a7dbfccfbef241943ab9477b3e31e86a320e48c34732b2236ef6ba6c7effe13bc32 SHA512 b11981c37b706de3546cc72943c4a7eb33cc7e5987d42d4759636552aee95b8eb5bd80b960755c0ec220f541e96bd598b534882d7af2571b89ce1c58ed83b000
-DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1
-DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
-DIST error-code-2.3.1.crate 5324 BLAKE2B 3e6c18560c4f30d9fa8e5487453432b220b88acf59a421d2c2ec29bd77bba75ad8bca63e99d384442c7d458b5936dcae149897c2b0c57ad6e621f9b7928b2331 SHA512 a3953c854f7fba48dc34c35ca841d6f0671e8bde19f5dc36cbdc167fcc7c22c143dcd071a35c1866f5bbf05cedcdbcba3f1902d93aa21d19993b426c458af46e
-DIST fancy-regex-0.5.0.crate 73970 BLAKE2B a4f9ea5f36b14de00d8358a2d3b68252d80dadc1044fcd5fdfb67c845eec05e0c7232d1af089e6de8ef8b9bd6ebaee954a4ff0d23182d95da79dc8ef0c967093 SHA512 9768db0aa8335d68dd30cb2841fbbd4cc86154ad60d54d54ec7c3944003c7b9aff60ea4ad288d97199c2e027101fd66128d331319235b92b775429cfced85e22
-DIST fd-lock-3.0.5.crate 13383 BLAKE2B 554729ecd142e9f783112ff479de14e52554b902319c061321a38e37ed80a1a445d4eb9b45ed91a44fc913b02f98aab8f7187b29e692e08b67edd789a337d936 SHA512 7173838a01960e0870ae90055fd97173d647fe9eb7457f76c0bfbb95f7d95c02e4ec9a9a7c7ea528ecefc4400b4c6b99f6c847248c55392e72d94248ad6db239
-DIST fixedbitset-0.4.1.crate 15551 BLAKE2B bcebd833a45215566a565bcc8cc3440c5bacbced810d2658048da7050808b56c13951bacdd3930f85530129a118bdc23c42381206b63265da7d6846085937536 SHA512 8c53515f1a372a2626e83bc6999adaa00be6451f68627a63e0207ce6a8967e9cab6061adde3e33305c700c472be750903eb36b6f5ce071248db461c0af450b33
-DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
-DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
-DIST gazebo-0.7.0.crate 28540 BLAKE2B 38de72a17468e27ae1a4b9ffe8c6f441ae1a0717b298b8ba14b910fc2ffe564ff409af7feff779a3867f2ae6429ad8a03a4940dc5652c94cc5e88986700051fc SHA512 4fbb8b537bdd6d3dc290c93ae7654b3b16a8fbacdec535ae9c17d24ad462365f6ff539cf3eae226d466025df31762e181517e48de24890dfd87cf66c3f2539c9
-DIST gazebo_derive-0.7.0.crate 15454 BLAKE2B 25af108f4e82c6c37ee9f6874e2406f4081ec8d838dce9d7ce71967a448e80e1550977bc80b92d921d52e3a4d9cb823d13cd3c96ae2a508d421545b9a888910d SHA512 d9d40acf58989d5858e9632de4280a9d6b305bdcb99ee23faa123cdcf2d4e245e55228688cf0810b1b6855a59c7896895363bf205b4a6fc24dbb2c69f22c5fae
-DIST gazebo_lint-0.1.1.crate 12606 BLAKE2B 28a762905241bf443ffd928323b8af8e4c87d33a91b4f65eae13eb0cf3a5099c97a39a816ea7351491af034dde8df5694c01829915176ba46d55464b98a986ee SHA512 b81a4b24434f2c26899d4529dfde76b087ba37f396ac59af2b563308122af2463ef69cb1359d1ebf56482cc3b6e6982008f1c210187932b0a5e31f8173d91a10
-DIST getrandom-0.2.6.crate 28043 BLAKE2B b9871b18389f6e5503b3b817baa37dc585eec980851114b3407f34d25bbf68fd70e8bdef60ab682967a1397cb9659b343312deee740aa2107bbf38d1f4629d60 SHA512 3fca26198bbab1a9e189fb45ad6cc7c7a18969eed6f68ca43407a2d463fe004955b1d199c1794a23a53ba21fedb61eff86d380d2bf49bfdb6c7055c11d543096
-DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
-DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
-DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
-DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
-DIST indenter-0.3.3.crate 6587 BLAKE2B dc4a73eb90bf05ec939634d3f1543f57c8b612e44e0fb3b38329ed2b9bdedcaedce84eb3f542f71c726b00c7cd273c3c390f827da170b5ba361cf669de4d1d3f SHA512 6585964939ee84739cdd19576faef467703415777e159ab2ff8b0f2a371fb2cd6c7a83dff4df954e9bea35844a43b72d93131dd4d23d328e9f365950ad831a71
-DIST indexmap-1.8.1.crate 53220 BLAKE2B 9605405ef6d7559fc5d6fde38cc6810ae49e69b93e0687323f9a4ecee9b513a1cf7c57b8ef625a9095fd36cc7ba6e98410fa11a7a8788c424fb6a0cecfe6b37c SHA512 919372d9bbe791092ca78026ea6f7f6b6560b5c011682b21afcfbbc76684a18844602545a527e3342e2b787643b1c07c8f18f2279535b7afdf395361c9a8749b
-DIST indoc-1.0.6.crate 14312 BLAKE2B e4757497450f9c5e854f472e576c0df49f1aecb10e3ae77ca56b436dbefc5c75fd9b83093f9bb485b697d32c454af5d70d72da27e231124f7af20d3dc6e320e2 SHA512 798d36767d29ac5170a9de498ebee1056a6658e74b94310d589d429471ae059f974bd83eaa823c99a637c16758b3fdaaeaaaf7b21a2a35cbcbf345840b5f23cf
-DIST io-lifetimes-0.6.1.crate 37632 BLAKE2B 5e38a460d823b5b63253e7b41bdda2443b7153ee4b5cd7772784dd9d10830208ffcfee5f8bc74662584a805c24d9eb2af9333d65b5b90f01fecd061c7673b4ee SHA512 2e2003e47f5c21c44d45ecb9d371534ca8ae6c1ef6f7d2e2ca2f56f9e3d4f18ebb6fafdbb241495b472dbcfabd5e274167179667b6d9ee2f22c70b0f15c77da3
-DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
-DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
-DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
-DIST lalrpop-0.19.8.crate 228864 BLAKE2B c280697f25a333f02f646055f748fe96801d7c8793e66b0c41a3861c45e8368996cd6d3284d4b3c8120f1a5e717ef2c688350b3ca7329898b57f1c61b281d726 SHA512 62af845f2b0087a08b98fd55a2b07bfceb84ebf63a38b53cac23ee4c1043ff4f8e5f84194b314b25a0dcfba3ecc10b050be63d638a991d1ea90fb73707567d9f
-DIST lalrpop-util-0.19.8.crate 10216 BLAKE2B f3331d3eb8eb9615daca080c9df0ed6e6558d839002e69f6eac3d73d81687fe8800b3073422075010c48a7f299f54618416eaf97909f504d39be29fdf9379d09 SHA512 4b32f2055c10b7210c39c47c0599ce724464692512ff8ca682693e8e3c0ea191bfb3f2dc6fac55780627af22b7b21816940b6a3f4c60d0690e64cf5d204bb3e4
-DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.125.crate 589236 BLAKE2B 57ca3aa19687b5c5702b66ad690a86ec7639dca41c5846c7cc3500f2d0fffcfee95a2def7695652174862fb6b8d211e7564fef6bef6d1197c481b5b8f18a9c74 SHA512 64ea5bb20120b9893bf5a3648f28da07384972e3cbad13da40c3ecc501efe1bff0bd6b71f52d5f253f00d7a97c2f69d86fba490955e8d70ca1360b8db1e431cf
-DIST linux-raw-sys-0.0.46.crate 807633 BLAKE2B 58a63a6ee202e53892d78f2142d6ef98f8bb21109962273689b284cb4d6756e6399010983da813f6f58664d6191b392b70ecd161518e8ca0fb46992bc3d23adf SHA512 b821ab53d9a885b9dfef6eb3d36a422525cf35d797fe32fee3abf9bb5463712af57febf684c9ab41b5de40c9b0e73d9e369599497f7a7f1314ff455795d32b39
-DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
-DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
-DIST logos-0.12.0.crate 8849 BLAKE2B 1aa4d2fcf57d7e3953bd4325da1ad43af1c0c9a968ef964a8449b6aa09e92c65c0d0e178f319e0ce004fba55618d576023f810b5aa64f2f59c2c26b0315726b7 SHA512 3fe0b51294bb929d85c7c8223f07012a292376d57b2ed8e91b974cb27501170aa14a50cfc4c64840006ffd0adcdf60bdddf1596a4bf56ca8824d7d08cb26afca
-DIST logos-derive-0.12.0.crate 32455 BLAKE2B 94556a68e8ddb65cb000877e057b46dabc03360068ce06494c400df07006eb6adfad61311420187a55b68760971708564c4b3daf9fdab5f5c864fb34aaace9e1 SHA512 be0454574faaf7e2ecbfec7f2692af2e08ede3751e4efe8d431ca3f1bcb9944c45479c3decf7232c7136390bad1fdc32b46cb2c2fd9883aa43eebe570ba5f425
-DIST lsp-server-0.5.2.crate 15018 BLAKE2B 90567a348794c9b53929cd0f1b877e7820e204ca39747d1ccad5bc53a98cfa3b0bb73137b8f121a2f3dc4b3e774eb78f943687345e72aa500511f53afb704296 SHA512 deac4de563a8f1fd4bf475f62b6597946ff287a4000b17f6e7736b2d30b5837c17c6dee0f41c0b0f9b4f6f76ac56dd587471168663f38711bbb95cdc1c5e6129
-DIST lsp-types-0.89.2.crate 49933 BLAKE2B 00c23d427672f539e1187de55717edc2ebd4518e483e460b4ed19370810ec08142273c00bfde0dd97df68cf77b27485af387d05dc47309cab25f0bb6ac739ca1 SHA512 a1ba7c572c5d9aff31e57f63de7ef7224a558c9b798a7c175c8ebece1f75b122c0d8dc7bb3952fdb8f711b659996d9824ab2cd606f7197d710d7f50c3540fb42
-DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
-DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
-DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
-DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
-DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85
-DIST nibble_vec-0.1.0.crate 11796 BLAKE2B 2e80648e4e18d17fdd41671acc1e166a8337fe1ec1765e5a7f08c19fbcb23ce43b11d1cb396b867b9a2c0ae58e30225d9b13fa337793d8c32abf99969e7c11af SHA512 21bc50bfa5f11f50b19a20691346f098db083ceb6891faed72fb91d2e911cee060ad4d19ee1c98792c5809cb6ab2bd65061bc051a1dea75d9096060b87497f67
-DIST nix-0.23.1.crate 240531 BLAKE2B 8e03f4edbad39a467c1557083cfbbd6eff4b78d5ec4e0f1ba06eb043f853352f5154f115ce75556e0d672f0499a9d4c03650bc5a1f57ba1b920cd1595cc50ea9 SHA512 23431030b094ebb027200d8cdc05d0ac1730fbb86ee088795a2314f1ba19b76ed5f24373c1aba8125575bf69f8e7d4d9c08344b9cb49a4ae3d8f7987b5f4e6b6
-DIST num-bigint-0.4.3.crate 97799 BLAKE2B afe9a08bf20dc974dcea12b5f9dd465e8b399a0cb0a6d0028d08f7f753aa4dfc929710e4dae883e67633d9dda073f995287e5315b1487e8f99f8f23f1f70e581 SHA512 4b38eaa8b51119dbc7cd8a1e177f37ec935ee348b693a93378742e9bfa68fe5f7e5062b7f34638283c23f04d2127451d796d310cd8adb64dc8e865b28708374f
-DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
-DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
-DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
-DIST os_str_bytes-6.0.0.crate 21046 BLAKE2B 9d2a9f47aac852ca2e27e63a22c7267e1a4affde2277d50e128b54f377758322f07ca7263478c39c91e11a2b32b0e7a5fc5ba1b31e0ee014b412a4151642e605 SHA512 d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8
-DIST parking_lot-0.12.0.crate 39761 BLAKE2B 227ae508bebea21bd06c7a9c1651879ce3f5cd308019c8733f6b88e75a57b57d19b7bbc5dfed5ef1bff57ec0f116606ab699cfa6017b6e00078e7e4717cd58a6 SHA512 efa1ebe2f3849a9c6ac484c7e1cdd279640539468bd4d4da6c4c97ae34e86fa3a42818ee4839dea512635fbbd836829dbadd81dc05208614c820d1374139673f
-DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df
-DIST paste-1.0.7.crate 18285 BLAKE2B c32095dc3e828fb91aac7af107af824866d2efb70ad6e01faea4862156341130ca686076e3cfc1b5f127354bd4ad513f47da553577c91437794f63d2a8b6f29e SHA512 6f203485cd916f68c4acac6fe6193e2ed8c5a36a6f58865fecbbc4e112e14c6e849cf61cfdbe22fd5b6311d60f1831d726da519a51a1a936552c3b39f01c90f0
-DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
-DIST petgraph-0.6.0.crate 182063 BLAKE2B da9373f4d671d0694b8924e25efde32eaf29a1dc3e460a971b655461717594a84823da8bf65bae20e7a277057d081397999ae3d8c9ca83404e626e547bfefa2b SHA512 d71e014b25cf6008a35d425794f69b4361de7c5e8b8fb255c35758bf5631f375a5646431ab1cb59f1fceef93762a169d0408301a5baebbd3a0886a60f688e8d0
-DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b127f4af79b2b5855cb014a0080bec1ec45be466513bd57faa39c77cfde0d6ca02b6bb77d37a23d697603227da37 SHA512 f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5
-DIST pico-args-0.4.2.crate 11565 BLAKE2B 2dd0dd6679d418fba0f6bab93a8216cbb9182431dd7e0819e382db2fa1632bb5ed17cfc2bd7da90df41024066d26cc82188dd4693e6b4f7eeec44d440edfb12d SHA512 a6e46bc8d086091a37a0edf418d5414eaa5ef57a508aa81c352c66281cc2c88c97611b7eedd4f5f18c7a8169f48aa3bfdc7a5eb7b3cb570cbf871eed5e867ea1
-DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74
-DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05
-DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
-DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
-DIST proc-macro2-1.0.38.crate 41687 BLAKE2B 226f76a1c264d6e74b72fe1f1a10fa8ab1405b618d0412863cc7e04509f682435dcc2703bf196e4fb1628219630d882d2be64926da19903b36d052113dfa60d8 SHA512 f360b00b4b1e05df52ca1714df34c719778f7bb6ed54fab04a84811acd0a29f7c4d4871fad7d988f0c042fe0fc326d7b1fedc731c55fd32c7257dd1895203080
-DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
-DIST radix_trie-0.2.1.crate 251366 BLAKE2B 14b50e45eacbc5b42cdde8a4f8e8642adfdfa3cc569c3fe0e3aa1fdab901713b3929d706dc0aede1b679762fb8fb1af345efca15befc9234322db434c8a3923c SHA512 f6f54511860b6b878c83de4455bdbd71289599dba93234d5c7469342f3401cba99a9ea6bca2d32df2e31ba657f40e42e7d5fd7de66786ddd2814e22fe867f9d8
-DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
-DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
-DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
-DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
-DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
-DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
-DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
-DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
-DIST rustix-0.34.6.crate 281783 BLAKE2B a216aff4a1d4240a1c6f0967dc18afbf8f09b4f476745bb56b39705ef615d69458b5aa52ea255a49e0bd2598cc55e11dd314c7e548f6dcfda78c2335d42a97ca SHA512 1e38ab7d1f6812c01d51aceb62f2bc251e76dcb83e460c64729ee77d4aa340382cbd4012b5265278ef15faa0a5517ac771eaf9b73debb91a4f4370f10c84061b
-DIST rustversion-1.0.6.crate 18380 BLAKE2B 2969bb40849dbd2f0d3f4a190629e53204cc5ef9065be6aec7a4504470e1dba6cde7172a3075a1bade421b30b88947cef6b29c0ab5aea8601695f72a7acc45d1 SHA512 fa9efca7e49eff6c510d062d02fc73d15341b1fe16d24dada86108202a4295d2e0519aecf3f1701540cd4d49a513c05e74d3d27e21e5eb3cb1aba46c70a992cc
-DIST rustyline-9.1.2.crate 100566 BLAKE2B e729f79d80d85ae492e493adfad1739962eb1693e75602342ae59a3d07ad35535eebfe3df7069edf948ae11a8de2ee81a0c4c746541b40d78e8ee0f2dff56d75 SHA512 6e012ffb9da22a79bddc119c4a6230ffedcf663836784998b2211bf13f83eceda2e98f63a47a6d6d489926a7c1667709a8b31f9035726d48bcf0703e7e411a96
-DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
-DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
-DIST schemafy-0.5.2.crate 62997 BLAKE2B fe2762796f97379dc223d84b2bcf9beed8c4787b095e129ca0562c388dfb7498aeb32eb71839f74d393c1ec2e6ec7acd4b8b20e0b50b01065acea8a74a63ccb7 SHA512 08c84f8186186b50a647531b8c47425b7a8a82da2fb2e03dc817a100b6dc6f99265dcbe1d4de4eaceb2f2dcd53fdd8bcecd99c1b3f4d34bca3915455703337af
-DIST schemafy_core-0.5.2.crate 2667 BLAKE2B be9a8f71189277b4e4d5be735bdf760c05cc317cbe24c64cd50644ee915f4d80138e89ca097b3bbe11f0aec75522cbde88be53a793ab869c49aceadf09b4ceec SHA512 80f0b45b584673c26a28b0c651eb6df8aca733a73184149719153e8592438fe0c632302cd9173b515ba592ea762cfc501ff132d3f7543814fb6a43d2e52e1bb4
-DIST schemafy_lib-0.5.2.crate 7858 BLAKE2B 8d4d9c4fcb65a9d376f19418b1101cc54ae7df061c3aa6295b774cb9b946fcfd09443cb12ad56eda292fb21f45004685fe582b6a8a84c56ec0a892801df15ae6 SHA512 9646ea8b33b75b949f9da2745986b714df8018956c7b6f5dfe23adb50a15106abd3c1281631b244c616bd10cf6436d4d74892734779f0004dc20c8f3bbe4a4b6
-DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
-DIST semver-1.0.9.crate 30843 BLAKE2B 52c90056ec744bccbeb4a603b8e138a9b980a063c05462011d3b4cd11c5272c5284d0eec427ffd1e838d73f97a21af70a6c7f8094b6faecd3c18adb1b0be1449 SHA512 23da181209ca26a9e78d8111444c465273cdaac23ef6023b1e9a9a10e2ab9dfb13baf51f8b6f597598bde84c36910e0a45bae4f14555d731a9c9a3e94f37214a
-DIST serde-1.0.137.crate 76182 BLAKE2B dffef53be259eeb051a375e532c3748219f8219413af0615debdbbce61c5ca17be13b06c0bbbd7a85a696b4bc76ae8e252d880b01ecf540b758fc10f11415b21 SHA512 28223488e18826f83a7e90029aebc0722e0cd238a2c0c021e5a162d0f5deaa494713fad10f7ac79c8e14de856af931b6d83cb3efcfd0885837fc71e35ee38a2b
-DIST serde_derive-1.0.137.crate 54831 BLAKE2B 19a0324c18bd00da4feabcf83dd78de2ff7a1905abb82d5600c6128a8351f5ccc37df21e0135601167a51ea1e6691bd22957c2bbd9da637653c7673dbb808d24 SHA512 ee47d3bad717ae16118c43e6f308a0e264bde80caab8f8649bef96ed3f7aa0f9b6a479311df22ecdc7bbcdade65f7b03b79100f8b86caf02f9a0bc77ce01035a
-DIST serde_json-1.0.81.crate 144480 BLAKE2B 3c95d56e65c6673ebe9ef0aa41ba184c5246cbcfb0dd9edf8e87ca6cab736d195ce8b6349846806ba7047854d579517d2d19bbfa932c90b700f06e54cf49b131 SHA512 9f224b2182db2fdddfe1878d05d857c52a60a38f9b4fdfc87c09c20efc8b6ec2419bc60e4b18a0852ed080b09332773eac372f8356af5ac0ddf3da8212345cb8
-DIST serde_repr-0.1.8.crate 10327 BLAKE2B 2df93b708e840c7cf4528a9d15c13ae94a9b3660c5937cf405fc3ae3a1c32fc2c2c743503e7a63e27a999b5a7d550cfee182dc4c7db77377ce91f131a71f601d SHA512 6554814bc6cac332c8d5cc94241c224d8ca532719703b1fad19963db5f4793db7e2a5d195df6a1a534d1edafbb4223a63bae55dc928cafb3fbe69dce76d8547e
-DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
-DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
-DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f
-DIST starlark-rust-0.8.0.tar.gz 676951 BLAKE2B 06372ad19c6aa343c6d4fc0de5450eab2fd1c3303c99fc7e7962db55804c461babca22d0c37d2b1314cf643b8da8bca8f514a949936f22980df57991e50f039b SHA512 9508e34b3dccbec0c068d7af6ae019f98e1cd3c80713a26df99dccfc8f36d127505e5010997ee9b5f36ffab07c205ad235c75bfed4f60b185e8c9be8e3e948ff
-DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
-DIST str-buf-1.0.5.crate 3852 BLAKE2B 94178810ed2476c2a47a63a6efab8022cba9341c7ce04caa2ff09c675baa5b17327bf4824b7d24339896143ab1baafe6edf6c6a4bfd7367e16a5506346dec6a1 SHA512 d474b6cbcc53d72587b21e8352239dd7eb7eeed859493382d5cf052ff78997e72ea19c9d0e9afb8471853fc71d38f404b877a09dd6dd92a7584fc6733516e823
-DIST string_cache-0.8.4.crate 16380 BLAKE2B 235973fff64a66175b563bc512137bba98f84bc00fdffa771a9925950903f3ee91a9f1025786aa68b796a55782e4d5bb26756e1134db96dc6f4cf69974c18774 SHA512 dff6d359226fd2c4ea5934a3d5ea73324d548ec235cd9aac8c233f2d9e67ba9b045ee598a34063839eb5b906d344a70fe3be65abcbe106cb9ff79cbc40b833e3
-DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
-DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST structopt-0.3.26.crate 53798 BLAKE2B 04be64637d18bcc87d261320668023459a42c167bb5a4c52216df556a7dd19be28032e7bf759cbcf710a3729a9dfaeb20c29f37f35fcf33533db583ac4fa049a SHA512 dec27090b57107473c9d398db68bde3b1b5191e7c7980d7d2c20fc723f92c64a6cf1d391d5122a103222c4262253d8073fd0fdfb11c74f235af79b2ae0caf069
-DIST structopt-derive-0.4.18.crate 20996 BLAKE2B 2ae17e0d365a7ce7a4d0e007513623ee0d5acf45afdc3844114e02975b855fd1a9f7df404a24044cf33a3a4cc4142eccc34d1e97925646d54d460a89baa28275 SHA512 68a7f9c2ed987993fdd8bb7e81c31969a1fdf5351c58cba9de61a2f5957aba1626be4b0742f31d4de502301675ba24b0d91dd3acb24f5607bdeec83070626a57
-DIST syn-1.0.93.crate 236682 BLAKE2B 6ad6cd905c5c8c4d4a0401fac4f54fc25fff765e6b294225d80ec2d790d7d3a1775308f37576eda3f69606ca5f06d66ec440d49acef79b7f7e1afb189ba356f1 SHA512 8f767d2ecaab1f3c0aa094f047668be278f9a5c9cd5200f8ee4eaf295749bcbe4aa70a3714c315ed7b6e9a40d38e5f30db343cc9025c36579ce36457ce2f5e84
-DIST term-0.7.0.crate 37082 BLAKE2B cb7947c696f71fc68bab3b25cc6cbde74b92380fdde5447399b06de99534b0cb2160963792824ac74a350444ce41a4fa16d6a9792a68d84578a15ab37ab76ca2 SHA512 9de6e836f1fd205b3b58645ec880eaabfc0fd8991e3980ef90bc6184b370a14676edb688a2a75bce412dd8ebd97345aef742afe5b964250e2b6f84e6b15b486a
-DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST textwrap-0.14.2.crate 52016 BLAKE2B db80b15ba23db718064ef0214578ea6aa4f0ee3b76723adaca131be26b770324205f2ead13c8f5c1e438ae1b5c9476cf1ede8f4ed82426c9d99d9406f2b83191 SHA512 521ab37e03aae8fcce5b909541399fc90a23020e353f95102c658fa94ffc56b9bdff43f47fb3da6e30f5c9cc9447fab72fe21d7276dfa21fe5a1a5a1c874e371
-DIST thiserror-1.0.31.crate 18013 BLAKE2B 5a46332efc602f8ce864024a538379b23b4586c04b18bf01b32b3cafae3ad90ae0c1ae5639cad555c01767c20f0109f87384918cb15a7ce51437094e70a2e544 SHA512 0e11aba54d38fc164c65b9357d1738ca96af2bc7bc2bcacfc4efc6f5c26a594effbb5e47aef46772ccafbe88871825a517920030572b79fae3d305550bfa6431
-DIST thiserror-impl-1.0.31.crate 15283 BLAKE2B ad7afdfbbf9c42a08dfbd5a2385883bc0bd855c123040cb187f8ec633456a7912f9e46559b41e4943bcca86043adcee08ddd9c61ec04ab6fcd78ebb42c1d1d10 SHA512 a265be50ae209775abb812f0e9b8c5af7a639514149d9f50f4a95bcedabd3666076bf7764351ea6f1836eb8a0e3c67c0b76abd26b27b0a853132fef011543e1e
-DIST tiny-keccak-2.0.2.crate 20129 BLAKE2B 105a2d2af36cc053cd95721ea563108f33b8a3feb2ae84c75a04a65ed5d548dfe35d8b2e48977a82f725c0ebcf914f21157c547f4a74bb4d98c2e894385139be SHA512 c0219f23361eb07e0a68575c461a36b7286d9bdebae89080d9e259178d402b0c7762ccf33e65a16951ea168392322c44a24eb55189cf143e22d09d6dfc4acec1
-DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
-DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
-DIST unicode-bidi-0.3.8.crate 36575 BLAKE2B c0442dd47a8ee81f575b28e34c9781ccf507b53ea96d1d4df2e8117231e8e67579031e4244a2dacfd6f4c24ec01fbbd4da7c9ab72ad50af51ef56d7d813b6444 SHA512 810b5be48159ecbca542c715496f279518285c3b09f7c39451986f94e6c259fab1057512a2148bf99ba9abf76e861a24456b547cc2273f0b45ed5d3ce9dfe3d5
-DIST unicode-linebreak-0.1.2.crate 69293 BLAKE2B 825dc2a29d86314cff3492cac71add2cd48948284d9e9b684580186f4c021c8ce1e288d21cc47493eb19a158385ec602f0cd5608a7618e38667c1cc7445a302d SHA512 170db67d6d74df913dffc921986b92df8a2ba68776ddb17c8ffca51d0d4bee597a5460591e7ba593c1eaec8b6227956f4e0f9b11d217aed4ee85cf46f1be5277
-DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
-DIST unicode-segmentation-1.9.0.crate 93241 BLAKE2B 359904bcaadfd161128d40a896a2d10e5dfdb4098de245c949ae3fffecce9b4b6b999bbc2c6ca522944733ab0074e50fe829690183639c312bba8f8d0ad24456 SHA512 7d0ea37bfb24a1a803b1cd40b7b0c0e6e44ebf9a474fdedf0dcca1ead25662e19f44af29b87de1b000c3cc75fec93320938bb3ab9d9e82298eda324bb97e7294
-DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
-DIST unicode-xid-0.2.3.crate 15174 BLAKE2B 5cfb2a094047106a45eaeb77ebc1ae2e17ca51ece71082c127d3e2bf36773959f52df1c6df0d0d5cbc40ec4ee7f81820a094fd7ee99f01a2f99a1f7f68317223 SHA512 2adea0c8447c9450be34859f2b2e2b87a61b5e313685da994d21bc24a96dd94088f3320bcdb8d20466a3fdafb0bc0375823f0c28ec0077c9c42a9818f66ac1f5
-DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
-DIST utf8-ranges-1.0.5.crate 8497 BLAKE2B 912fc7bd781b110950ecefe6f6b719da330e3c3180e6e1ad44d5a25a8bf3fce0a45794266e04cccfcee87177df4440d8d135945117781ef727d1dac181c0391a SHA512 b17f8de898e1a94c22477ee7d3b1038185ec46eecb57ac3cc8cd8eae224b1384289cab8f975c6d0840b6d28833b97942cee740ff3b1612e27d755070a5b5f6a2
-DIST utf8parse-0.2.0.crate 13392 BLAKE2B 05296f48fe429a871f42e729e3540ec3a974a69892c6bc9da95e23c0aee2163c9b115a9614eb1943363076793e17ac4c89e28066a9816cab30c451524a5832c0 SHA512 1f6a2eca32e42c8e4b53d28c4fea54c426ed66fc01447b3cf8fc0fd75694453eadbe3ba000ac8ee0347d16dbfec47681254117949109081798eab5370886827c
-DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
-DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
-DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
-DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
-DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
-DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
-DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST windows-sys-0.30.0.crate 3256610 BLAKE2B a1a0563b6cacca5202c8ee4dddb9c2a3030935269ea3959949afc7aff747afa7e38de061f3a77978b7d9d90a6245f99e07a283566cdc48602dc21fb2cb4987e9 SHA512 ac71860c93295956f18b6b0f2617443e56e4b8475c042b0e428cd0decbb921cc2c4202298bd9480e090b201df7cb8247ef0269d1902f7350a9df234ab568b1cd
-DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
-DIST windows_aarch64_msvc-0.30.0.crate 669666 BLAKE2B 8d864958cc1c431429f5433695216606256a08a58dfc0ddb72741cc42472e72560051cad122126593e64cd02ab063cd2461cc8aedab053a9b96890402e708b02 SHA512 323f272a6bcf3d2d9afbc5d4bcf3d43763156828a599b4f30380c43c437c139c0c54fe58752d5d2c88890699e94f49a2486c0d4d3ca5e9fafb11ceee18c93d9a
-DIST windows_aarch64_msvc-0.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf
-DIST windows_i686_gnu-0.30.0.crate 774464 BLAKE2B 62740a8f355d08d94f453a2727808a328a831955c1996aae923afa748bcecd849f5e2f76c69aa5c4e58cb8d3ddbf30e12f2c459e5ccad77af6dce050de65449a SHA512 a02e9a1e3fbd9b1dfa41aa581f89ae2f87efa6a5ae08438c2556092d490e216f77a45872921c6f2a2b55f957447c38acd5b44e20aa3545e4385d0bad7c88b714
-DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5
-DIST windows_i686_msvc-0.30.0.crate 732295 BLAKE2B 97747c5889375d7bcde1d614b5d20c04d4e5491a6c5257347bba788a0849a8853f8130432589d7a3918e87aab4f8b21b73f7feb86ad1242b3e976568c72beafd SHA512 5bf84371a7fb69da38db95b74d9b2c91e205aa30733e2d72556c656b0c45a26876096646408f72d59b68d104bd73b339b14b361235307df2d049835f0462ad5c
-DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
-DIST windows_x86_64_gnu-0.30.0.crate 743236 BLAKE2B 93a67f4c3afb7c2c667dd4b914fa649d0c169ccb7e24a19ff3c0afb7f5358cb3847ca48ecc5f2f968ace3f15d9ffb62bf57f50d031b141c71ca9c71271b2caeb SHA512 e0231935951c916e8accd3977128e943efba26e5c1cf5ea1c128d33324fe1d00c277d96571ac62e1f018aac15bbf0667b9afd8e9f7173beb46fa329c0955a2ff
-DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
-DIST windows_x86_64_msvc-0.30.0.crate 668972 BLAKE2B 46ca7506391d28b3317e730fcd8d994e01191b59a7a08eedc86cfa0a735435fbe0b9d09cef37f318a1dd250103e2f76915456183d2cb25406a209c8086751257 SHA512 25737d7088457e2c3e93ec17af814db6522dd2a9c72a78199bb4035d5ddded3aa364cc96f9a8c2beb1e5f96d2199de0288ca8e61e79ef870a2ff8fea38ea1875
-DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
-DIST yansi-term-0.1.2.crate 14342 BLAKE2B 31a1651bb43644cf880d591a22fe9d899ab0acbc744ced2952f120b4abfa0c42f6513089e34deaff1a453f3a26f9fb78442f016baa9524ccac9b21e4a7ed6ad6 SHA512 ba720e36487871427aaa7139e8aeaf5b2b3f2d1df4798d7e238e323dc3d3220f12202e223f74339201be3466848c372dc1712e1842e5cd6bd51c3dedf76c9ff6
diff --git a/dev-lang/starlark-rust/files/test/features.bash b/dev-lang/starlark-rust/files/test/features.bash
deleted file mode 100644
index 35fb173e3cd1..000000000000
--- a/dev-lang/starlark-rust/files/test/features.bash
+++ /dev/null
@@ -1,175 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck disable=SC2034
-STARLARK_RUST_EXPECTED_functions=(
-	any
-	dir
-	fail
-	getattr
-	hasattr
-	hash
-	len
-	max
-	min
-	print
-	range
-	repr
-	reversed
-	sorted
-	type
-	zip
-)
-
-# shellcheck disable=SC2034
-STARLARK_RUST_EXPECTED_types=(
-	bool
-	int
-	list
-	str
-	tuple
-	dict
-)
-
-# shellcheck disable=SC2034
-STARLARK_RUST_EXPECTED_dict_methods=(
-	clear
-	get
-	items
-	keys
-	pop
-	popitem
-	setdefault
-	update
-	values
-)
-
-# shellcheck disable=SC2034
-STARLARK_RUST_EXPECTED_list_methods=(
-	append
-	clear
-	extend
-	index
-	insert
-	pop
-	remove
-)
-
-# shellcheck disable=SC2034
-STARLARK_RUST_EXPECTED_str_methods=(
-	capitalize
-	count
-	elems
-	endswith
-	find
-	format
-	index
-	isalnum
-	isalpha
-	isdigit
-	islower
-	isspace
-	istitle
-	isupper
-	join
-	lower
-	lstrip
-	partition
-	replace
-	rfind
-	rindex
-	rpartition
-	rsplit
-	rstrip
-	split
-	splitlines
-	startswith
-	strip
-	title
-	upper
-)
-
-_test-features_execute-test() {
-	local error_msg test_title=$1 test_stdin=$2 exp_stdout=$3 exp_stderr=$4 exp_exitcode=$5
-	ebegin "$test_title"
-	error_msg=$(
-		# Redirect stderr to stdin because print goes to stderr since this commit:
-		# https://github.com/facebookexperimental/starlark-rust/commit/cdd68fa752aa8b6cae602297de1e43658b0a63fd
-		test_stdout=$("$starlark_binary" -i --json <<< "$test_stdin" 2>&1)
-		test_exitcode=$?
-
-		if (( test_exitcode != exp_exitcode )); then
-			echo "unexpected exit code \"$test_exitcode\", expected exit code \"$exp_exitcode\" for test_stdin: $test_stdin"
-			exit 1
-		elif [[ "$test_stdout" != "$exp_stdout" ]]; then
-			echo "unexpected stdout \"$test_stdout\", expected stdout \"$exp_stdout\" for test_stdin: $test_stdin"
-			exit 1
-		fi
-		exit 0
-	)
-	eend $? "$error_msg"
-
-	# shellcheck disable=SC2015
-	[[ $error_msg ]] && failures+=("$error_msg") || (( successes += 1 ))
-}
-
-test-features_main() {
-	local starlark_binary=$1
-	local failures=() successes=0
-	local banner_width=45
-
-	local attr attr_type test_case
-	for attr_type in function type; do
-		printf -- '\n\n' >&2
-		printf -- '%s\n' "Checking for existence of expected ${attr_type}s" >&2
-		eval "printf -- '=%.0s' {1..${banner_width}}" >&2
-		echo >&2
-		while read -r attr; do
-			test_case=(
-				"$attr"
-				"$attr and print('$attr exists')"
-				"$attr exists"
-				""
-				0
-			)
-			_test-features_execute-test "${test_case[@]}"
-		done < <(eval "printf -- '%s\n' \"\${STARLARK_RUST_EXPECTED_${attr_type}s[@]}\"")
-	done
-
-	local attr attr_type test_case type_literal
-	for attr_type in dict list str; do
-		printf -- '\n\n' >&2
-		printf -- '%s\n' "Checking ${attr_type} built-in methods" >&2
-		eval "printf -- '=%.0s' {1..${banner_width}}" >&2
-		echo >&2
-
-		case $attr_type in
-			str)
-				type_literal='""'
-				;;
-			*)
-				type_literal="$attr_type()"
-				;;
-		esac
-
-		while read -r attr; do
-			test_case=(
-				"$attr_type.$attr"
-				"hasattr($type_literal, \"$attr\") and print('$attr method exists')"
-				"$attr method exists"
-				""
-				0
-			)
-			_test-features_execute-test "${test_case[@]}"
-		done < <(eval "printf -- '%s\n' \"\${STARLARK_RUST_EXPECTED_${attr_type}_methods[@]}\"")
-	done
-
-	printf -- '\n\n' >&2
-
-	if (( ${#failures[@]} > 0 )); then
-		echo "${#failures[@]} test (s) failed" >&2
-		return 1
-	elif (( successes == 0 )); then
-		echo "no tests ran" >&2
-		return 1
-	fi
-}
diff --git a/dev-lang/starlark-rust/metadata.xml b/dev-lang/starlark-rust/metadata.xml
deleted file mode 100644
index 28b9dd7e4f55..000000000000
--- a/dev-lang/starlark-rust/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://github.com/facebookexperimental/starlark-rust/issues</bugs-to>
-		<changelog>https://github.com/facebookexperimental/starlark-rust/blob/master/CHANGELOG.md</changelog>
-		<doc>https://github.com/bazelbuild/starlark/blob/master/spec.md</doc>
-		<remote-id type="github">facebookexperimental/starlark-rust</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild b/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild
deleted file mode 100644
index 78c7d2f5a9d9..000000000000
--- a/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	Inflector@0.11.4
-	ahash@0.7.6
-	aho-corasick@0.7.18
-	annotate-snippets@0.9.1
-	ansi_term@0.12.1
-	anyhow@1.0.57
-	argfile@0.1.4
-	ascii-canvas@3.0.0
-	atty@0.2.14
-	autocfg@1.1.0
-	beef@0.5.1
-	bit-set@0.5.2
-	bit-vec@0.6.3
-	bitflags@1.3.2
-	bumpalo@3.9.1
-	cc@1.0.73
-	cfg-if@1.0.0
-	clap@2.34.0
-	clipboard-win@4.4.1
-	convert_case@0.4.0
-	crossbeam-channel@0.5.4
-	crossbeam-utils@0.8.8
-	crunchy@0.2.2
-	debugserver-types@0.5.0
-	derivative@2.2.0
-	derive_more@0.99.17
-	diff@0.1.12
-	dirs-next@2.0.0
-	dirs-sys-next@0.1.2
-	either@1.6.1
-	ena@0.14.0
-	endian-type@0.1.2
-	erased-serde@0.3.20
-	errno@0.2.8
-	errno-dragonfly@0.1.2
-	error-code@2.3.1
-	fancy-regex@0.5.0
-	fd-lock@3.0.5
-	fixedbitset@0.4.1
-	fnv@1.0.7
-	form_urlencoded@1.0.1
-	gazebo@0.7.0
-	gazebo_derive@0.7.0
-	gazebo_lint@0.1.1
-	getrandom@0.2.6
-	hashbrown@0.11.2
-	heck@0.3.3
-	hermit-abi@0.1.19
-	idna@0.2.3
-	indenter@0.3.3
-	indexmap@1.8.1
-	indoc@1.0.6
-	io-lifetimes@0.6.1
-	itertools@0.9.0
-	itertools@0.10.3
-	itoa@1.0.1
-	lalrpop@0.19.8
-	lalrpop-util@0.19.8
-	lazy_static@1.4.0
-	libc@0.2.125
-	linux-raw-sys@0.0.46
-	lock_api@0.4.7
-	log@0.4.17
-	logos@0.12.0
-	logos-derive@0.12.0
-	lsp-server@0.5.2
-	lsp-types@0.89.2
-	maplit@1.0.2
-	matches@0.1.9
-	memchr@2.5.0
-	memoffset@0.6.5
-	new_debug_unreachable@1.0.4
-	nibble_vec@0.1.0
-	nix@0.23.1
-	num-bigint@0.4.3
-	num-integer@0.1.45
-	num-traits@0.2.15
-	once_cell@1.10.0
-	os_str_bytes@6.0.0
-	parking_lot@0.12.0
-	parking_lot_core@0.9.3
-	paste@1.0.7
-	percent-encoding@2.1.0
-	petgraph@0.6.0
-	phf_shared@0.10.0
-	pico-args@0.4.2
-	ppv-lite86@0.2.16
-	precomputed-hash@0.1.1
-	proc-macro-error@1.0.4
-	proc-macro-error-attr@1.0.4
-	proc-macro2@1.0.38
-	quote@1.0.18
-	radix_trie@0.2.1
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.3
-	redox_syscall@0.2.13
-	redox_users@0.4.3
-	regex@1.5.5
-	regex-syntax@0.6.25
-	rustc_version@0.4.0
-	rustix@0.34.6
-	rustversion@1.0.6
-	rustyline@9.1.2
-	ryu@1.0.9
-	same-file@1.0.6
-	schemafy@0.5.2
-	schemafy_core@0.5.2
-	schemafy_lib@0.5.2
-	scopeguard@1.1.0
-	semver@1.0.9
-	serde@1.0.137
-	serde_derive@1.0.137
-	serde_json@1.0.81
-	serde_repr@0.1.8
-	siphasher@0.3.10
-	smallvec@1.8.0
-	smawk@0.3.1
-	static_assertions@1.1.0
-	str-buf@1.0.5
-	string_cache@0.8.4
-	strsim@0.8.0
-	strsim@0.10.0
-	structopt@0.3.26
-	structopt-derive@0.4.18
-	syn@1.0.93
-	term@0.7.0
-	textwrap@0.11.0
-	textwrap@0.14.2
-	thiserror@1.0.31
-	thiserror-impl@1.0.31
-	tiny-keccak@2.0.2
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.0
-	unicode-bidi@0.3.8
-	unicode-linebreak@0.1.2
-	unicode-normalization@0.1.19
-	unicode-segmentation@1.9.0
-	unicode-width@0.1.9
-	unicode-xid@0.2.3
-	url@2.2.2
-	utf8-ranges@1.0.5
-	utf8parse@0.2.0
-	vec_map@0.8.2
-	version_check@0.9.4
-	walkdir@2.3.2
-	wasi@0.10.2+wasi-snapshot-preview1
-	winapi@0.3.9
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.5
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	windows-sys@0.30.0
-	windows-sys@0.36.1
-	windows_aarch64_msvc@0.30.0
-	windows_aarch64_msvc@0.36.1
-	windows_i686_gnu@0.30.0
-	windows_i686_gnu@0.36.1
-	windows_i686_msvc@0.30.0
-	windows_i686_msvc@0.36.1
-	windows_x86_64_gnu@0.30.0
-	windows_x86_64_gnu@0.36.1
-	windows_x86_64_msvc@0.30.0
-	windows_x86_64_msvc@0.36.1
-	yansi-term@0.1.2
-"
-
-inherit cargo
-
-DESCRIPTION="A Rust implementation of the Starlark language"
-HOMEPAGE="https://github.com/facebookexperimental/starlark-rust"
-SRC_URI="${CARGO_CRATE_URIS}
-	https://github.com/facebookexperimental/starlark-rust/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# Nightly rust-1.53.0 required for https://bugs.gentoo.org/796824
-BDEPEND="${RUST_DEPEND}
-	>=dev-lang/rust-1.53.0[nightly]"
-
-# RUSTFLAGS support needed: https://bugs.gentoo.org/796887
-QA_FLAGS_IGNORED=".*"
-
-src_prepare() {
-	sed -e 's:#!\[feature(const_mut_refs)\]:\0\n#![feature(maybe_uninit_extra)]:' \
-		-i starlark/src/lib.rs || die
-	default
-}
-
-src_test() {
-	source "${FILESDIR}/test/features.bash" || die
-	test-features_main "${PWD}/$(cargo_target_dir)/starlark" || die
-}
-
-src_install() {
-	dobin "$(cargo_target_dir)/starlark"
-	ln "${ED}/usr/bin/starlark"{,-rust} || die
-	dodoc -r {docs,{CHANGELOG,README}.md}
-}
diff --git a/dev-lang/typescript/Manifest b/dev-lang/typescript/Manifest
index 34426acfa004..2784c30f921f 100644
--- a/dev-lang/typescript/Manifest
+++ b/dev-lang/typescript/Manifest
@@ -1,2 +1,2 @@
-DIST typescript-5.6.3.tgz 4174590 BLAKE2B 1de80bd262ceed3096801365222592ef64b1c112a90d5cbba4ba54f86f8d78464bef64f5f2d92a9880261b0924ebc41cfbf693e60c1edeaf4175669c0f159a4c SHA512 863712d6685fbb28b8596f085ad8cfedbac3ac6d9cb8366e932ad8ad26aea1718d831d12ef371e3f4eda758909c9c12be7a04e51334fcdb227a2888dddf9f5ab
 DIST typescript-5.7.2.tgz 4231797 BLAKE2B cb399f4d52613796145f8426bc526b2f9cc5f740ca946036252a26e0599a6466e2487c9ebb00ee9c5d207347de7b33a466afad3b563547948eb678a9b06b21b8 SHA512 8b9b7ae911f10ef54de341df0ddd4fb044e118d9e5302313de3314ba887dff44daa967af3689ed69cba75b2374d8b03dfdf21b11695c1d97204ca6fd42868b7e
+DIST typescript-5.7.3.tgz 4232501 BLAKE2B 12165981b51cd343aac582d05c6d57c94773c9deefaf0b18ddfed404bbdb889fb948c289399275061d897479478ed5df05ab4de9844e6de130435b7f22d83746 SHA512 f383154a33041cff854113f2de95fdb13555fc83487b1ef5b3d4cbd869b9146fd61b54aa5de2b267493bfdb958ff815d3b3235d82072d6f19ce2883f7aeb347f
diff --git a/dev-lang/typescript/typescript-5.6.3.ebuild b/dev-lang/typescript/typescript-5.6.3.ebuild
deleted file mode 100644
index ebdd7db72e65..000000000000
--- a/dev-lang/typescript/typescript-5.6.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Superset of JavaScript with optional static typing, classes and interfaces"
-HOMEPAGE="https://www.typescriptlang.org/
-	https://github.com/microsoft/TypeScript/"
-SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
-S="${WORKDIR}/package"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64"
-
-RDEPEND="
-	net-libs/nodejs
-"
-BDEPEND="
-	>=net-libs/nodejs-16[npm]
-"
-
-src_compile() {
-	# Skip, nothing to compile here.
-	:
-}
-
-src_install() {
-	local -a myopts=(
-		--audit false
-		--color false
-		--foreground-scripts
-		--global
-		--offline
-		--omit dev
-		--prefix "${ED}/usr"
-		--progress false
-		--verbose
-	)
-	npm "${myopts[@]}" install "${DISTDIR}/${P}.tgz" || die "npm install failed"
-
-	dodoc *.md *.txt
-}
diff --git a/dev-lang/typescript/typescript-5.7.3.ebuild b/dev-lang/typescript/typescript-5.7.3.ebuild
new file mode 100644
index 000000000000..145001b5fed2
--- /dev/null
+++ b/dev-lang/typescript/typescript-5.7.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Superset of JavaScript with optional static typing, classes and interfaces"
+HOMEPAGE="https://www.typescriptlang.org/
+	https://github.com/microsoft/TypeScript/"
+SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
+S="${WORKDIR}/package"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+RDEPEND="
+	net-libs/nodejs
+"
+BDEPEND="
+	>=net-libs/nodejs-16[npm]
+"
+
+src_compile() {
+	# Skip, nothing to compile here.
+	:
+}
+
+src_install() {
+	local -a myopts=(
+		--audit false
+		--color false
+		--foreground-scripts
+		--global
+		--offline
+		--omit dev
+		--prefix "${ED}/usr"
+		--progress false
+		--verbose
+	)
+	npm "${myopts[@]}" install "${DISTDIR}/${P}.tgz" || die "npm install failed"
+
+	dodoc *.md *.txt
+}
diff --git a/dev-libs/FP16/FP16-2024.05.27.ebuild b/dev-libs/FP16/FP16-2024.05.27.ebuild
new file mode 100644
index 000000000000..083edbf6e0d1
--- /dev/null
+++ b/dev-libs/FP16/FP16-2024.05.27.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+inherit python-r1 cmake
+
+CommitId=95163a75c51bc8dc29f72d0d7419ec50132984ff
+
+DESCRIPTION="conversion to/from half-precision floating point formats"
+HOMEPAGE="https://github.com/Maratyszcza/FP16/"
+SRC_URI="https://github.com/Maratyszcza/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="dev-libs/psimd"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+	dev-python/peachpy[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-cpp/gtest )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2021.03.20-gentoo.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	mkdir -p module/fp16 || die
+	cp include/fp16/*py module/fp16 || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DFP16_BUILD_BENCHMARKS=OFF
+		-DFP16_BUILD_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
+
+python_install() {
+	python_domodule module/fp16
+}
+
+src_install() {
+	cmake_src_install
+	rm "${ED}"/usr/include/fp16/*.py || die
+	python_foreach_impl python_install
+}
diff --git a/dev-libs/FP16/Manifest b/dev-libs/FP16/Manifest
index 4d5e56966264..3fd0b65e93a5 100644
--- a/dev-libs/FP16/Manifest
+++ b/dev-libs/FP16/Manifest
@@ -1,2 +1,3 @@
 DIST FP16-2021.03.20.tar.gz 71228 BLAKE2B e598225032324ffe38db9002e8397e67a713b6323ac57408e7e39e146826b2bb1dab60cd75181a25b1b07958463e3913bbf0e53b23803e53d472fda66b8ba6d5 SHA512 3f094f242425ea37de274eb8539dc5f8ab0c13fd5325d14180ef12e9c04e6002a110d086c4c667f7c8054af337deab096d59482eb95cc8a632c3c412b48e89d1
+DIST FP16-2024.05.27.tar.gz 71220 BLAKE2B 5b101aad7a8339fff400bba1db896c82498832075f3eb00cc6eaf27608ee0988f918956b5a768262b74552a52436200d4acd17f04f4a05060a32512afb26a9ac SHA512 b88fd0a91e6b6873ce5d0e2cd2afd2b8dceb8b17c366240abb8a5e2fe152faea3ba577ef420038c595cab0b61581a70b84c019c825a8dd262b1bee4686843b66
 DIST FP16-2024.06.20.tar.gz 64704 BLAKE2B cd086ca7419aa004c0c4c840227e61612348efb98bdddbf68ef92959267f5f4b0aef55751c5b8a6f50a1f0e7f386e4df5fac273c3849961168e0a5c03faf81e2 SHA512 d3ae46b5b0c944f1d8dcfbb90689266f4abaff3e0b5ef338d5d79193367f06d1bfbb9ad85a5a7685a894daeee6dc73fc5d73631718be1379cc6918655a0289aa
diff --git a/dev-libs/apache-arrow/Manifest b/dev-libs/apache-arrow/Manifest
index 1df70652cc04..cece0e7dd1cb 100644
--- a/dev-libs/apache-arrow/Manifest
+++ b/dev-libs/apache-arrow/Manifest
@@ -1,4 +1,6 @@
 DIST apache-arrow-18.0.0.tar.gz 19113236 BLAKE2B c358f8e61155432540a4002c6dfba7a3763d934a43eddae0a9a6f98bb26879df51e3cdcc64db6dd684ffde2ef8ef6dcff8906355b5769f71afae907aa1e920c5 SHA512 4df30ab5561da695eaa864422626b9898555d86ca56835c3b8a8ca93a1dbaf081582bb36e2440d1daf7e1dd48c76941f1152a4f25ce0dbcc1c2abe244a00c05e
 DIST apache-arrow-18.1.0.tar.gz 19132388 BLAKE2B 4a8c60d8a5dcf2b8ac4e2ae3a7f555dd0604d5ccc4b72ba317f18e16e75725b24553050fe88a02f382b0581310f20d0b795133b243f2851fa0e8d3801a839358 SHA512 7249c03a6097bc64fb0092143e4d4aaef3227565147e6254f026ddd504177c8dd565a184a0df39743dc989070dc3785e5b66f738c8e310ed9c982b61c2ec4914
+DIST apache-arrow-19.0.0.tar.gz 17830405 BLAKE2B cf611106b0ee5f92a4cbf341e9f5b6771f377710bb11c6eab555706a52b5c72fcf4590ba55c36100a97c6219ec421813f51ef6337530d84eb8394735ef2787b5 SHA512 6820de33a5d5b0922ea64dd8ff55d186ef02596ad0415578067aaf3e5cf7d3eead473bc3a5f92d6d3f19b97d153fe1c901359008d922d1ffb0fc2a65dc860c79
 DIST arrow-testing-4d209492d514c2d3cb2d392681b9aa00e6d8da1c.tar.gz 3572558 BLAKE2B fe5b6a46babbde8e2becefea09fecf090201a49faa7d4ee2f44b0bb4da42c344b37564999d32fdbd54a81a56c33fbde9b2d9d2fa664bf127cb5661e845fb6229 SHA512 6758ad936e1eeb2c5dd2b4b40fe90822a48a4ce67ee4d36657c168e1db5d9a17c092f4cf571b13d56b568a773515385441874d1ea36a1f6e5b15a99f67176fa3
+DIST parquet-testing-c7cf1374cf284c0c73024cd1437becea75558bf8.tar.gz 1076246 BLAKE2B 070323055ce6cbcff6987b03e6f483cb4647021b29fd2e62b6f05751637dc46df27601f7519e2aa1c6c4edb4b016d0dfc16f69d31e4a262c7231fbc96f21d711 SHA512 81799640604bec3c5f91499a4af7a3c1a4b669f8f4933d3cf622b556fcd376635eb869197d41371b3745a662118961488b6a8eed17fc664c0a1e0f879a1a42e4
 DIST parquet-testing-cb7a9674142c137367bf75a01b79c6e214a73199.tar.gz 1068025 BLAKE2B 0fdd12d04108b27b17564c60ca36e751453f5d74cfbbe3a076e8befa1696aa0f093e2d1a5eacb99e69a98deda502930ba79b8329403af1e8b9d696e6617c6075 SHA512 dd221d9d59442cebb7158d7cf769d6e5323416bfcde2852eee37a26ff089bc04ea10b9ae7158a37d8694c10469d77c7d251d0dd2549596a7b3899d9c39b45997
diff --git a/dev-libs/apache-arrow/apache-arrow-19.0.0.ebuild b/dev-libs/apache-arrow/apache-arrow-19.0.0.ebuild
new file mode 100644
index 000000000000..9ac405157cf5
--- /dev/null
+++ b/dev-libs/apache-arrow/apache-arrow-19.0.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+# arrow.git: testing
+ARROW_DATA_GIT_HASH=4d209492d514c2d3cb2d392681b9aa00e6d8da1c
+# arrow.git: cpp/submodules/parquet-testing
+PARQUET_DATA_GIT_HASH=c7cf1374cf284c0c73024cd1437becea75558bf8
+
+DESCRIPTION="A cross-language development platform for in-memory data."
+HOMEPAGE="
+	https://arrow.apache.org/
+	https://github.com/apache/arrow/
+"
+SRC_URI="
+	mirror://apache/arrow/arrow-${PV}/${P}.tar.gz
+	test? (
+		https://github.com/apache/parquet-testing/archive/${PARQUET_DATA_GIT_HASH}.tar.gz
+			-> parquet-testing-${PARQUET_DATA_GIT_HASH}.tar.gz
+		https://github.com/apache/arrow-testing/archive/${ARROW_DATA_GIT_HASH}.tar.gz
+			-> arrow-testing-${ARROW_DATA_GIT_HASH}.tar.gz
+	)
+"
+S="${WORKDIR}/${P}/cpp"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~s390 ~x86"
+IUSE="
+	+brotli bzip2 compute dataset +json lz4 +parquet re2 +snappy ssl
+	test zlib zstd
+"
+REQUIRED_USE="
+	test? (
+		json
+		parquet? ( zstd )
+	)
+	ssl? ( json )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	brotli? ( app-arch/brotli:= )
+	bzip2? ( app-arch/bzip2:= )
+	compute? ( dev-libs/libutf8proc:= )
+	dataset? (
+		dev-libs/libutf8proc:=
+	)
+	elibc_musl? ( sys-libs/timezone-data )
+	lz4? ( app-arch/lz4:= )
+	parquet? (
+		dev-libs/libutf8proc:=
+		dev-libs/thrift:=
+		ssl? ( dev-libs/openssl:= )
+	)
+	re2? ( dev-libs/re2:= )
+	snappy? ( app-arch/snappy:= )
+	zlib? ( sys-libs/zlib:= )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/xsimd
+	>=dev-libs/boost-1.81.0
+	json? ( dev-libs/rapidjson )
+	test? (
+		dev-cpp/gflags
+		dev-cpp/gtest
+	)
+"
+
+src_prepare() {
+	# use Gentoo CXXFLAGS, specify docdir at src_configure.
+	sed -i \
+		-e '/SetupCxxFlags/d' \
+		-e '/set(ARROW_DOC_DIR.*)/d' \
+		CMakeLists.txt \
+		|| die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DARROW_BUILD_STATIC=OFF
+		-DARROW_BUILD_TESTS=$(usex test ON OFF)
+		-DARROW_COMPUTE=$(usex compute ON OFF)
+		-DARROW_CSV=ON
+		-DARROW_DATASET=$(usex dataset ON OFF)
+		-DARROW_DEPENDENCY_SOURCE=SYSTEM
+		-DARROW_DOC_DIR=share/doc/${PF}
+		-DARROW_FILESYSTEM=ON
+		-DARROW_HDFS=ON
+		-DARROW_JEMALLOC=OFF
+		-DARROW_JSON=$(usex json ON OFF)
+		-DARROW_MIMALLOC=OFF
+		-DARROW_PARQUET=$(usex parquet ON OFF)
+		-DPARQUET_REQUIRE_ENCRYPTION=$(usex ssl ON OFF)
+		-DARROW_USE_CCACHE=OFF
+		-DARROW_USE_SCCACHE=OFF
+		-DARROW_WITH_BROTLI=$(usex brotli ON OFF)
+		-DARROW_WITH_BZ2=$(usex bzip2 ON OFF)
+		-DARROW_WITH_LZ4=$(usex lz4 ON OFF)
+		-DARROW_WITH_RE2=$(usex re2 ON OFF)
+		-DARROW_WITH_SNAPPY=$(usex snappy ON OFF)
+		-DARROW_WITH_ZLIB=$(usex zlib ON OFF)
+		-DARROW_WITH_ZSTD=$(usex zstd ON OFF)
+		-DCMAKE_CXX_STANDARD=17
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x PARQUET_TEST_DATA="${WORKDIR}/parquet-testing-${PARQUET_DATA_GIT_HASH}/data"
+	local -x ARROW_TEST_DATA="${WORKDIR}/arrow-testing-${ARROW_DATA_GIT_HASH}/data"
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	if use test; then
+		cd "${D}"/usr/$(get_libdir) || die
+		rm -r cmake/ArrowTesting || die
+		rm libarrow_testing* || die
+		rm pkgconfig/arrow-testing.pc || die
+	fi
+}
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 35b4d3636a13..b46df5fa688d 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1 +1,2 @@
 DIST AppStream-1.0.3.tar.xz 2644220 BLAKE2B cd7aa28b49c23229ee48b9a69e57a08244f81115e23525695e463930d2296daf80b5c7bb098c89726c220caec8c3e072fd85d77ac808e96c5cf2ff0488ba4ba1 SHA512 9b70d965966d55dbcc6a62d85525fdd5990a28abb1d94b2df91ab1549c24ce9c40d95e2d761c2f24e0c61fe5b74ab6a1f829dda387a8282aa9dff9198dc9610d
+DIST AppStream-1.0.4.tar.xz 2719900 BLAKE2B e8b3ca6092d4cddf73e5f902ac9d5e071d9eb31d8b206fd814e2078f5bcfcba1683e97beccaea9e7024da0285d77c63fb426e3b3d17f15c3add332e964e313d3 SHA512 ea0f9e226401b6c5a004676d14d01c195da295269169807bc956dbfd1d4f4b2b4ba61fe905fbefbe3c562a502c31fc869aba9e87c490dcac1d861f50038d14f1
diff --git a/dev-libs/appstream/appstream-1.0.4.ebuild b/dev-libs/appstream/appstream-1.0.4.ebuild
new file mode 100644
index 000000000000..98d966051a45
--- /dev/null
+++ b/dev-libs/appstream/appstream-1.0.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg-utils
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ximion/${PN}"
+else
+	MY_PN="AppStream"
+	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
+HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
+
+LICENSE="LGPL-2.1+ GPL-2+"
+# check as_api_level
+SLOT="0/5"
+IUSE="apt compose doc +introspection qt6 systemd test"
+RESTRICT="test" # bug 691962
+
+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
+	compose? (	dev-libs/glib:2
+				dev-libs/libyaml
+				gnome-base/librsvg:2
+				media-libs/fontconfig:1.0
+				media-libs/freetype:2
+				x11-libs/cairo
+				x11-libs/gdk-pixbuf:2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	qt6? ( dev-qt/qtbase:6 )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	doc? ( app-text/docbook-xml-dtd:4.5 )
+	test? ( dev-qt/qttools:6[linguist] )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.0-disable-Werror-flags.patch ) # bug 733774
+
+src_prepare() {
+	default
+	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
+	if ! use test; then
+		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local emesonargs=(
+		-Dapidocs=false
+		-Ddocs=false
+		-Dcompose=false
+		-Dmaintainer=false
+		-Dstatic-analysis=false
+		-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)
+		-Dsystemd=$(usex systemd true false)
+	)
+
+	meson_src_configure
+}
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/atcore/Manifest b/dev-libs/atcore/Manifest
deleted file mode 100644
index 680d872e7290..000000000000
--- a/dev-libs/atcore/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST atcore-1.0.0.tar.xz 169116 BLAKE2B 8aaafe18edfbb0dcbe08b99c9cfba2d2390a9e9aaf5ed8ebbc61b6320c37ac4e893a7c64e5c56a131e32ec112fa0d9e253749e634661834de3d03e2cced97dea SHA512 8be63850d939aa9b89651252e91cd3295d52d2d0603f88b846783cca25fc0e29dd3569bfef97aeaf6c115a3bc3328fb127e126b20aaf67faf1c319ac8be7b88b
diff --git a/dev-libs/atcore/atcore-1.0.0.ebuild b/dev-libs/atcore/atcore-1.0.0.ebuild
deleted file mode 100644
index effc4ea9ba27..000000000000
--- a/dev-libs/atcore/atcore-1.0.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="API to manage the serial connection between the computer and 3D Printers"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-HOMEPAGE="https://atelier.kde.org/"
-
-LICENSE="|| ( LGPL-2.1+ LGPL-3 ) gui? ( GPL-3+ )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc gui test"
-
-DEPEND="
-	>=dev-qt/qtserialport-${QTMIN}:5
-	gui? (
-		>=dev-qt/qtcharts-${QTMIN}:5
-		>=dev-qt/qtgui-${QTMIN}:5
-		>=dev-qt/qtwidgets-${QTMIN}:5
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=dev-qt/linguist-tools-${QTMIN}:5
-	doc? ( app-text/doxygen[dot] )
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	sed -e "s/${PN}/${PF}/" -i doc/CMakeLists.txt || die
-
-	use gui || ecm_punt_qt_module Charts
-	use test || cmake_comment_add_subdirectory unittests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS=$(usex doc)
-		-DBUILD_TEST_GUI=$(usex gui)
-	)
-
-	ecm_src_configure
-}
diff --git a/dev-libs/atcore/metadata.xml b/dev-libs/atcore/metadata.xml
deleted file mode 100644
index fbb79823ed64..000000000000
--- a/dev-libs/atcore/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
-	</upstream>
-	<use>
-		<flag name="gui">Build test GUI</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-libs/atf/Manifest b/dev-libs/atf/Manifest
index 6d124f1bc3d2..8d80871d32de 100644
--- a/dev-libs/atf/Manifest
+++ b/dev-libs/atf/Manifest
@@ -1 +1,2 @@
 DIST atf-0.21.tar.gz 567791 BLAKE2B e9449bb61008a91c10050462e84ff65c6fd88124db56ff3f6c149ff47fe8647fe8fe786cd7b1106cbfd62723a57ab613432323f266a93a4c86d8a6ab39bfcc0a SHA512 9b4b67d7d0d1f65cc9571d38c67dfc620b08ff7c0abf57d87bcae54055b4af21f95f3363f2cf8ee9b13b89a5351bc58669b784a0fd8c1beb0664c14933c10ce1
+DIST atf-0.22.tar.gz 196918 BLAKE2B 9dcd71d71daeb6a9364382d93972254c303599b61be2ae5126136ee5e00a6af1c8d9e7d5b25964f6a21edff7ce1e2bbad43e9ed5819d7dcfa0b83b55fa664750 SHA512 2bf2e8cb379aae6b435bfe9deb6d235c1641ec4ae9604fcfe9bb90324fd298b0ee7b7be2df3dd80cb140fe777936b239a14bab766b72a5a9862c1a463cea9455
diff --git a/dev-libs/atf/atf-0.21-r2.ebuild b/dev-libs/atf/atf-0.21-r2.ebuild
deleted file mode 100644
index bc30e3d33c4e..000000000000
--- a/dev-libs/atf/atf-0.21-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="Libraries to write tests in C, C++ and shell"
-HOMEPAGE="https://github.com/freebsd/atf"
-SRC_URI="https://github.com/freebsd/atf/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-getopt-solaris.patch )
-
-src_configure() {
-	# Uses std::auto_ptr (deprecated in c++11, removed in c++17)
-	append-cxxflags "-std=c++14"
-
-	default
-}
-
-src_install() {
-	default
-	rm -r "${ED}"/usr/tests || die
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/atf/atf-0.21-r3.ebuild b/dev-libs/atf/atf-0.21-r3.ebuild
new file mode 100644
index 000000000000..a91b0d57209a
--- /dev/null
+++ b/dev-libs/atf/atf-0.21-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2017-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Libraries to write tests in C, C++ and shell"
+HOMEPAGE="https://github.com/freebsd/atf"
+SRC_URI="https://github.com/freebsd/atf/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-getopt-solaris.patch )
+
+src_prepare() {
+	default
+	# Refresh autotools, bug 879659
+	eautoreconf
+}
+
+src_configure() {
+	# Uses std::auto_ptr (deprecated in c++11, removed in c++17)
+	append-cxxflags "-std=c++14"
+
+	local myconf=(
+		ATF_SHELL="${EPREFIX}/bin/sh"
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -r "${ED}"/usr/tests || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/atf/atf-0.22-r1.ebuild b/dev-libs/atf/atf-0.22-r1.ebuild
new file mode 100644
index 000000000000..79e2b1a661d3
--- /dev/null
+++ b/dev-libs/atf/atf-0.22-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2017-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Libraries to write tests in C, C++ and shell"
+HOMEPAGE="https://github.com/freebsd/atf"
+SRC_URI="https://github.com/freebsd/atf/archive/refs/tags/${P}.tar.gz"
+S="${WORKDIR}/atf-${P}"
+
+LICENSE="BSD BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/atf-0.22-atf_check-temp.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		ATF_SHELL="${EPREFIX}/bin/sh"
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -r "${ED}"/usr/tests || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/atf/files/atf-0.21-getopt-solaris.patch b/dev-libs/atf/files/atf-0.21-getopt-solaris.patch
index d70af36ce40e..08e4fe0faadb 100644
--- a/dev-libs/atf/files/atf-0.21-getopt-solaris.patch
+++ b/dev-libs/atf/files/atf-0.21-getopt-solaris.patch
@@ -1,3 +1,5 @@
+https://github.com/freebsd/atf/pull/100
+
 On Solaris, getopt(3) is in stdio.h.
 
 --- a/atf-c/tp_test.c
diff --git a/dev-libs/atf/files/atf-0.22-atf_check-temp.patch b/dev-libs/atf/files/atf-0.22-atf_check-temp.patch
new file mode 100644
index 000000000000..325a4d86858a
--- /dev/null
+++ b/dev-libs/atf/files/atf-0.22-atf_check-temp.patch
@@ -0,0 +1,43 @@
+https://github.com/freebsd/atf/issues/76
+https://github.com/freebsd/atf/commit/b42c98612cb99fa3f52766a46203263dc1de7187
+
+From b42c98612cb99fa3f52766a46203263dc1de7187 Mon Sep 17 00:00:00 2001
+From: Enji Cooper <ngie@FreeBSD.org>
+Date: Sat, 7 Dec 2024 17:29:17 -0800
+Subject: [PATCH] atf_check: fix std::length_error thrown from temp_file
+
+The previous logic used 2 separate calls to `atf::fs::path::str()` when
+constructing a `std::vector<char>` to pass to `mkstemp(..)`. This in
+turn caused grief with how data copying is done in atf-c(3), etc, as the
+prior code computed the length of the path of an internal buffer in
+`atf_dynstr` structs.
+
+Moreover, the code was manually appending a nul char, which was
+unnecessary when making the valid assumption that `std::string` is a
+nul-terminated string.
+
+The new code convert the path to an `std::string` once, includes the
+existing nul char in the buffer, then passes it to mkstemp(3) instead.
+The code works properly now.
+
+Closes:	#76
+Signed-off-by: Enji Cooper <ngie@FreeBSD.org>
+---
+ atf-sh/atf-check.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/atf-sh/atf-check.cpp b/atf-sh/atf-check.cpp
+index 508a9c51..f6ebc7a6 100644
+--- a/atf-sh/atf-check.cpp
++++ b/atf-sh/atf-check.cpp
+@@ -118,8 +118,8 @@ class temp_file : public std::ostream {
+         const atf::fs::path file = atf::fs::path(
+             atf::env::get("TMPDIR", "/tmp")) / pattern;
+ 
+-        std::vector<char> buf(file.str().begin(), file.str().end());
+-        buf.push_back('\0');
++        std::string file_s = file.str();
++        std::vector<char> buf(file_s.begin(), file_s.end() + 1);
+ 
+         m_fd = ::mkstemp(buf.data());
+         if (m_fd == -1)
diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest
index 1d4f3f73423e..a298a2d03d0e 100644
--- a/dev-libs/cdk/Manifest
+++ b/dev-libs/cdk/Manifest
@@ -4,3 +4,5 @@ DIST cdk-5.0-20240331.tgz 538287 BLAKE2B 0d4e3b8d04056aa658e94a29a836cdc4f82c228
 DIST cdk-5.0-20240331.tgz.asc 729 BLAKE2B 108697e54bbc335cb8aa8e3c4d29fdaffb2a3d8a05f9608f8f5e87ab0cd7ffae74ad9b70ef1dec10cda859e515a19de35b25dbed72dfd185aebab7f92a61153f SHA512 923ecf8ede1b799d6c91220d10f3f4721ac049ee9d0e1716751a4c607fd9e19c67745a202e1cef910821e2c68955733e22e7ef2e6624a9f03fd6fd8e165272b8
 DIST cdk-5.0-20240619.tgz 547275 BLAKE2B c43689561f2338382c9defe9cd5b1d2b26672396ba973e1a7192311c2725a976f7e2c8d2ed25ec15ef64cc20ca677078cb162f4060bc1c4f99508c1a1df50bcb SHA512 13f15a53142167352f9b4e6ebd7d49cc2b4c209c36b53422f04d640bd652d33928e55af47f8e02a54a668e89f5df94245008b2a3466fdeae683224582f9a8919
 DIST cdk-5.0-20240619.tgz.asc 729 BLAKE2B 35113c83dbd649ec67a4b3c97d769f98650f5489536894f0111c5f492cd9a9bac387514cf231806f5e35ccd329c38b9a817fe5915ecdcf7c3959a2eddb1bc926 SHA512 fffebaed05ff032b83196bb9e186636bbe5d661a02a1736bc7a70bda8a5efb474fa91da1610852cb327f49701d0c1dc33214e911e3514d15bd512fd4d3ac6f2f
+DIST cdk-5.0-20250116.tgz 549798 BLAKE2B 5509f5ce311f9cc0d3e833d18f9d434f0cd88b8106d9ffcce03b9203d63796089e1d67ac566ffc26a61f3e335a6327f48a0662959d5f497ee94f72e7970fed9a SHA512 d86a26fcce3f2b23c86138b0e620bafcae4ac63d1932f58c074a5e96b8eb856be1a858e190c6563d2986b92f9e770e5d0bd7c3d872f31880ceba41f9eb1754a2
+DIST cdk-5.0-20250116.tgz.asc 729 BLAKE2B 1d624eeb1071d3ed1b6174941fa5059ae35f7208b8e213bb9cb6d3cf1210d8c62fc7fa7217c13324591e21325a199c6abf09a5afa37ff3d6b38bb280d4b146f8 SHA512 643e3bf1aa71873341a4455626fd284d80be261abfc694dbc93c07c62ce9e8dde38b690c196b780e697c39d44b53dde038543b95615ead1a05364c334f2b152d
diff --git a/dev-libs/cdk/cdk-5.0.20250116.ebuild b/dev-libs/cdk/cdk-5.0.20250116.ebuild
new file mode 100644
index 000000000000..57e04aacc320
--- /dev/null
+++ b/dev-libs/cdk/cdk-5.0.20250116.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-$(ver_rs 2 -)"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
+DESCRIPTION="A library of curses widgets"
+HOMEPAGE="https://dickey.his.com/cdk/cdk.html https://github.com/ThomasDickey/cdk-snapshots"
+SRC_URI="https://invisible-island.net/archives/${PN}/${MY_P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${MY_P}.tgz.asc )"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples unicode"
+
+DEPEND="sys-libs/ncurses:=[unicode(+)?]"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
+"
+
+src_configure() {
+	if [[ ${CHOST} == *-*-darwin* ]] ; then
+		export ac_cv_prog_LIBTOOL=glibtool
+	fi
+
+	# --with-libtool dropped for now because of broken Makefile
+	# bug #790773
+	#
+	# Fedora and openSUSE at least both build with --enable-const. Without
+	# this, consumers end up broken like gphoto2 in bug #919279.
+	econf \
+		--disable-rpath-hack \
+		--enable-const \
+		--with-shared \
+		--with-pkg-config \
+		--enable-pc-files \
+		--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" \
+		--with-ncurses$(usex unicode "w" "")
+}
+
+src_install() {
+	# parallel make installs duplicate libs
+	emake -j1 \
+		DESTDIR="${D}" \
+		DOCUMENT_DIR="${ED}/usr/share/doc/${PF}" \
+		install
+
+	if use examples ; then
+		local x
+		for x in include c++ demos examples cli cli/utils cli/samples ; do
+			docinto ${x}
+			find ${x} -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc || die
+		done
+	fi
+
+	find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete || die
+}
diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.2-r1.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..e02b068bbbfc
--- /dev/null
+++ b/dev-libs/concurrencykit/concurrencykit-0.7.2-r1.ebuild
@@ -0,0 +1,34 @@
+# 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_PN="ck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A library with concurrency related algorithms and data structures in C"
+HOMEPAGE="http://concurrencykit.org"
+SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+
+# The 'libck.so' has a name collision.
+# See bug #616762 for more information.
+RDEPEND="!sys-cluster/charm"
+
+PATCHES=( "${FILESDIR}/${PN}-0.7.2-strict-aliasing.patch" )
+
+src_configure() {
+	tc-export AR CC LD
+
+	local myeconfargs=(
+		"--disable-static"
+	)
+
+	GZIP="" econf ${myeconfargs[@]}
+}
diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.2.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.2.ebuild
deleted file mode 100644
index e4db47d51ef1..000000000000
--- a/dev-libs/concurrencykit/concurrencykit-0.7.2.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
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PN="ck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library with concurrency related algorithms and data structures in C"
-HOMEPAGE="http://concurrencykit.org"
-SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-# The 'libck.so' has a name collision.
-# See bug #616762 for more information.
-RDEPEND="!sys-cluster/charm"
-
-src_configure() {
-	# https://github.com/concurrencykit/ck/issues/200
-	append-cflags -fno-strict-aliasing
-
-	tc-export AR CC LD
-
-	local myeconfargs=(
-		"--disable-static"
-	)
-
-	GZIP="" econf ${myeconfargs[@]}
-}
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.2-strict-aliasing.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.2-strict-aliasing.patch
new file mode 100644
index 000000000000..457da38deef7
--- /dev/null
+++ b/dev-libs/concurrencykit/files/concurrencykit-0.7.2-strict-aliasing.patch
@@ -0,0 +1,24 @@
+From 4f1e5cc70889058e809984a30917ef1d88bdd63d Mon Sep 17 00:00:00 2001
+From: Samy Al Bahra <sbahra@fileshield.io>
+Date: Fri, 10 Jan 2025 19:48:41 -0500
+Subject: [PATCH] regressions/ck_pr: fix type aliasing warning.
+
+Fixes #200
+---
+ regressions/ck_pr/validate/ck_pr_store.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/regressions/ck_pr/validate/ck_pr_store.c b/regressions/ck_pr/validate/ck_pr_store.c
+index e012b222..428655bc 100644
+--- a/regressions/ck_pr/validate/ck_pr_store.c
++++ b/regressions/ck_pr/validate/ck_pr_store.c
+@@ -67,7 +67,8 @@
+ 	{									\
+ 		uint##m##_t f = 0;						\
+ 		uint##w##_t j = (uint##w##_t)-1;				\
+-		ck_pr_store_##w((uint##w##_t *)(void *)&f, j);			\
++		void *f_p = &f;							\
++		ck_pr_store_##w((uint##w##_t *)f_p, j);				\
+ 		if (f != j) {							\
+ 			printf("FAIL [%#" PRIx##m " != %#" PRIx##w "]\n", f, j);\
+ 			exit(EXIT_FAILURE);					\
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 710720bed01d..f5298e7e716f 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1 +1,2 @@
 DIST efl-1.27.0.tar.xz 168543208 BLAKE2B 082f7089f1a017db8e62f36fb2a51e18c7d00b74b8e865a60d066e49921c69720101deb3184a125633a6c646e241b8765cccc038c906c00d4ca16ecb705faf6f SHA512 5dda2f630463a2504d9246be17449579bbc470904e137b02b3b5c44db033dec2688f6c477885de1485944d875ee62619b6e7c5d4d3657225951f6feaf83b4fa4
+DIST efl-1.28.0.tar.xz 168556580 BLAKE2B d40cc99a5512c81931ba6d8459ff3941406a377cf17131300a2681a180e40467526ea71039c5d4bcaf8c4fe192d3b656a168333a75a0d5d3f7bbc7c681ec3c61 SHA512 f88b005f981f09496baac0a1232c26433ad80acc5957a0a972a9b1335dda111d8defbfd7ed0ed6a7ead1528d58fef4f7ed53c60b87f33c625fb22f38683a890d
diff --git a/dev-libs/efl/efl-1.28.0.ebuild b/dev-libs/efl/efl-1.28.0.ebuild
new file mode 100644
index 000000000000..04c679ce28e5
--- /dev/null
+++ b/dev-libs/efl/efl-1.28.0.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_REQ_USE="deprecated(+)"
+LUA_COMPAT=( lua5-{1,2} luajit )
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit lua-single meson python-any-r1 xdg
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug doc drm +eet efl-one elogind examples fbcon"
+IUSE+=" +fontconfig fribidi gif glib +gstreamer harfbuzz heif hyphen ibus ico jpeg2k jpegxl json"
+IUSE+=" nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim sdl +sound +svg"
+IUSE+=" +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim xpm xpresent"
+IUSE+=" zeroconf"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	?? ( elogind systemd )
+	?? ( fbcon tslib )
+	drm? ( wayland )
+	examples? ( eet svg )
+	gstreamer? ( sound )
+	ibus? ( glib )
+	opengl? ( X )
+	pulseaudio? ( sound )
+	xim? ( X )
+	xpresent? ( X )"
+
+# Requires everything to be enabled unconditionally.
+RESTRICT="test"
+
+RDEPEND="${LUA_DEPS}
+	dev-libs/libinput:=
+	dev-libs/libunibreak:=
+	dev-libs/openssl:0=
+	net-misc/curl
+	media-libs/giflib:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/zlib
+	X? (
+		!opengl? ( media-libs/libglvnd )
+		media-libs/freetype
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXcomposite
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libxkbcommon
+		wayland? ( x11-libs/libxkbcommon[X] )
+	)
+	avif? ( media-libs/libavif:= )
+	connman? ( net-misc/connman )
+	drm? (
+		dev-libs/libinput:=
+		dev-libs/wayland
+		media-libs/mesa[gbm(+)]
+		x11-libs/libdrm
+		x11-libs/libxkbcommon
+	)
+	elogind? (
+		sys-auth/elogind
+		virtual/libudev:=
+	)
+	fontconfig? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	fribidi? ( dev-libs/fribidi )
+	glib? ( dev-libs/glib:2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	harfbuzz? ( media-libs/harfbuzz:= )
+	heif? ( media-libs/libheif:= )
+	hyphen? ( dev-libs/hyphen )
+	ibus? ( app-i18n/ibus )
+	jpeg2k? ( media-libs/openjpeg:= )
+	jpegxl? ( media-libs/libjxl:= )
+	json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
+	mono? ( dev-lang/mono )
+	opengl? ( virtual/opengl )
+	pdf? ( app-text/poppler:=[cxx] )
+	physics? ( sci-physics/bullet:= )
+	postscript? ( app-text/libspectre )
+	pulseaudio? ( media-libs/libpulse )
+	raw? ( media-libs/libraw:= )
+	scim? ( app-i18n/scim )
+	sdl? ( media-libs/libsdl2 )
+	sound? ( media-libs/libsndfile )
+	svg? ( gnome-base/librsvg:2 )
+	system-lz4? ( app-arch/lz4:= )
+	systemd? ( sys-apps/systemd:= )
+	tiff? ( media-libs/tiff:= )
+	tslib? ( x11-libs/tslib:= )
+	unwind? ( sys-libs/libunwind:= )
+	v4l? ( media-libs/libv4l )
+	vnc? ( net-libs/libvncserver )
+	wayland? (
+		dev-libs/wayland
+		media-libs/libglvnd
+		media-libs/mesa[wayland]
+		x11-libs/libxkbcommon
+	)
+	webp? ( media-libs/libwebp:= )
+	xpm? ( x11-libs/libXpm )
+	xpresent? ( x11-libs/libXpresent )
+	zeroconf? ( net-dns/avahi )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	wayland? ( dev-libs/wayland-protocols )"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+	examples? ( sys-devel/gettext )
+	mono? ( dev-build/cmake )
+	nls? ( sys-devel/gettext )
+	wayland? ( dev-util/wayland-scanner )"
+
+pkg_setup() {
+	# Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so.
+	QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.${PV}
+		/usr/$(get_libdir)/libefreet_mime.so.${PV}"
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Remove automagic unwind configure option, #743154
+	if ! use unwind; then
+		sed -i "/config_h.set('HAVE_UNWIND/,/eina_ext_deps += unwind/d" src/lib/eina/meson.build ||
+			die "Failed to remove libunwind dep"
+	fi
+
+	# Fix python shebangs for python-exec[-native-symlinks], #764086
+	local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
+	python_fix_shebang -q ${shebangs[*]}
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbuffer=false
+		-Dbuild-tests=false
+		-Dcocoa=false
+		-Ddrm-deprecated=false
+		-Dembedded-libunibreak=false
+		-Dg-mainloop=false
+		-Dmono-beta=false
+		-Ddotnet=false
+		-Dpixman=false
+		-Dwl-deprecated=false
+
+		-Dedje-sound-and-video=true
+		-Deeze=true
+		-Dinput=true
+		-Dinstall-eo-files=true
+		-Dlibmount=true
+		-Dnative-arch-optimization=true
+		-Dxinput2=true
+		-Dxinput22=true
+
+		-Dcrypto=openssl
+		-Ddotnet-stylecop-severity=Warning
+
+		$(meson_use X x11)
+		$(meson_use debug debug-threads)
+		$(meson_use doc docs)
+		$(meson_use drm)
+		$(meson_use examples build-examples)
+		$(meson_use fbcon fb)
+		$(meson_use fontconfig)
+		$(meson_use fribidi)
+		$(meson_use glib)
+		$(meson_use gstreamer)
+		$(meson_use harfbuzz)
+		$(meson_use hyphen)
+		$(meson_use lua_single_target_luajit elua)
+		$(meson_use nls)
+		$(meson_use physics)
+		$(meson_use pulseaudio)
+		$(meson_use sdl)
+		$(meson_use sound audio)
+		$(meson_use tslib)
+		$(meson_use v4l v4l2)
+		$(meson_use vnc vnc-server)
+		$(meson_use wayland wl)
+		$(meson_use xpresent)
+		$(meson_use zeroconf avahi)
+
+		$(meson_use !system-lz4 embedded-lz4)
+	)
+
+	if use elogind || use systemd; then
+		emesonargs+=( -D systemd=true )
+	else
+		emesonargs+=( -D systemd=false )
+	fi
+
+	if use wayland; then
+		emesonargs+=( -D opengl=es-egl )
+	elif ! use wayland && use opengl; then
+		emesonargs+=( -D opengl=full )
+	elif ! use wayland && use X && ! use opengl; then
+		emesonargs+=( -D opengl=es-egl )
+	else
+		emesonargs+=( -D opengl=none )
+	fi
+
+	if use connman; then
+		emesonargs+=( -D network-backend=connman )
+	else
+		emesonargs+=( -D network-backend=none )
+	fi
+
+	local disabledEvasLoaders=""
+	! use avif && disabledEvasLoaders="avif,"
+	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
+	! use dds && disabledEvasLoaders+="dds,"
+	! use eet && disabledEvasLoaders+="eet,"
+	! use gstreamer && disabledEvasLoaders+="gst,"
+	! use heif && disabledEvasLoaders+="heif,"
+	! use ico && disabledEvasLoaders+="ico,"
+	! use jpeg2k && disabledEvasLoaders+="jp2k,"
+	! use jpegxl && disabledEvasLoaders+="jxl,"
+	! use json && disabledEvasLoaders+="json,"
+	! use pdf && disabledEvasLoaders+="pdf,"
+	! use pmaps && disabledEvasLoaders+="pmaps,"
+	! use postscript && disabledEvasLoaders+="ps,"
+	! use psd && disabledEvasLoaders+="psd,"
+	! use raw && disabledEvasLoaders+="raw,"
+	! use svg && disabledEvasLoaders+="rsvg,svg,"
+	! use tga && disabledEvasLoaders+="tga,"
+	! use tgv && disabledEvasLoaders+="tgv,"
+	! use tiff && disabledEvasLoaders+="tiff,"
+	! use webp && disabledEvasLoaders+="webp,"
+	! use xcf && disabledEvasLoaders+="xcf,"
+	! use xpm && disabledEvasLoaders+="xpm,"
+	[[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
+	emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
+
+	local disabledImfLoaders=""
+	! use ibus && disabledImfLoaders+="ibus,"
+	! use scim && disabledImfLoaders+="scim,"
+	! use xim && disabledImfLoaders+="xim,"
+	[[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
+	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
+
+	local bindingsList="cxx,"
+	use lua_single_target_luajit && bindingsList+="lua,"
+	use mono && bindingsList+="mono,"
+	[[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
+	emesonargs+=( -D bindings="${bindingsList}" )
+
+	local luaChoice=""
+	if use lua_single_target_luajit; then
+		luaChoice+="luajit"
+	else
+		luaChoice+="lua"
+	fi
+	emesonargs+=( -D lua-interpreter="${luaChoice}" )
+
+	# Not all arm CPU's have neon instruction set, #722552
+	if use arm && ! use cpu_flags_arm_neon; then
+		emesonargs+=( -D native-arch-optimization=false )
+	fi
+
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+}
+
+src_install() {
+	meson_src_install
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples/
+		dodoc -r "${BUILD_DIR}"/src/examples/
+	fi
+}
diff --git a/dev-libs/elfutils/files/elfutils-0.189-musl-macros.patch b/dev-libs/elfutils/files/elfutils-0.189-musl-macros.patch
deleted file mode 100644
index 97c6c1dcd62e..000000000000
--- a/dev-libs/elfutils/files/elfutils-0.189-musl-macros.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-May not be required (or at least some hunks) with next release (0.186?)
-
-https://git.alpinelinux.org/aports/plain/main/elfutils/musl-macros.patch
---- a/lib/libeu.h
-+++ b/lib/libeu.h
-@@ -31,6 +31,27 @@
- 
- #include <stddef.h>
- #include <stdint.h>
-+#include <unistd.h>
-+#include <alloca.h>
-+#include <string.h>
-+
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+   ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+#ifndef strndupa
-+#define strndupa(s, n) \
-+       (__extension__ ({const char *__in = (s); \
-+                        size_t __len = strnlen (__in, (n)) + 1; \
-+                        char *__out = (char *) alloca (__len); \
-+                        __out[__len-1] = '\0'; \
-+                        (char *) memcpy (__out, __in, __len-1);}))
-+#endif
- 
- extern void *xmalloc (size_t) __attribute__ ((__malloc__));
- extern void *xcalloc (size_t, size_t) __attribute__ ((__malloc__));
---- a/src/arlib.h
-+++ b/src/arlib.h
-@@ -29,6 +29,16 @@
- #include <stdint.h>
- #include <sys/types.h>
- 
-+#if !defined(ACCESSPERMS)
-+# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */
-+#endif
-+#if !defined(ALLPERMS)
-+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */
-+#endif
-+#if !defined(DEFFILEMODE)
-+# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/
-+#endif
-+
- 
- /* State of -D/-U flags.  */
- extern bool arlib_deterministic_output;
---- a/src/elfcompress.c
-+++ b/src/elfcompress.c
-@@ -37,6 +37,14 @@
- #include "libeu.h"
- #include "printversion.h"
- 
-+#if !defined(FNM_EXTMATCH)
-+# define FNM_EXTMATCH 0
-+#endif
-+
-+#if !defined(ALLPERMS)
-+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */
-+#endif
-+
- /* Name and version of program.  */
- ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
- 
---- a/src/strip.c
-+++ b/src/strip.c
-@@ -45,6 +45,14 @@
- #include <system.h>
- #include <printversion.h>
- 
-+#if !defined(FNM_EXTMATCH)
-+# define FNM_EXTMATCH 0
-+#endif
-+
-+#if !defined(ACCESSPERMS)
-+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO)
-+#endif
-+
- typedef uint8_t GElf_Byte;
- 
- /* Name and version of program.  */
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 822b5fe2529d..ca2c02babb06 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,3 +1 @@
-DIST ell-0.69.tar.xz 574172 BLAKE2B 3d28392b6cb378a8512667172598ec3cf9b5eeb5f68c65b43a939636a23a03d8f168b500171c4e1224e97bc072e88e9d57e5f02a9d5cbf489d684537070cfeef SHA512 9631b364ba48f984b104cf1091a4dbf10f675b04f58b555f55249d3fec6610c3ccf6e1b0197e807e843b179a39f22c33b8e2a58c4dbcff91bb8c6ce628618f65
-DIST ell-0.70.tar.xz 574184 BLAKE2B eee4c9a6bb3a7f2f04c91cca732a1f6aea86eef2006f22bf6e418fbe0ad2301cdead991cd9e46e8ca75178a5fcc7d7db5430dad2dfabe68490def77e0e51ed90 SHA512 9f6613ccd4bc54e75227863adf213d96068305b22bb47049b97ff801b468c8cd828be350f2b8edb27a2fee33a76cba563e53ce17af181ca483917503e9a1932c
 DIST ell-0.71.tar.xz 574408 BLAKE2B ccd0f15504621c183b9f3e8d109f1f66c23d88b2e0773efc2347fabd147e2f45cca53fc49b4e972a9cf57d3623361bee2eb6864a19523624cb1ca0b4203556f2 SHA512 2e75dda61185d545edfc60157ff94cff6562e6fd4580d2613e189651f4cfc0a1fa6e1408275a790c37705073e67607778a4fdf0200faee7d9b0e25b2bcbf659d
diff --git a/dev-libs/ell/ell-0.69.ebuild b/dev-libs/ell/ell-0.69.ebuild
deleted file mode 100644
index 9df526a060e0..000000000000
--- a/dev-libs/ell/ell-0.69.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-IUSE="pie test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-apps/dbus )"
-
-CONFIG_CHECK="
-	~TIMERFD
-	~EVENTFD
-	~CRYPTO_USER_API
-	~CRYPTO_USER_API_HASH
-	~CRYPTO_MD5
-	~CRYPTO_SHA1
-	~KEY_DH_OPERATIONS
-"
-
-src_prepare() {
-	default
-	sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \
-		unit/test-dbus*.c unit/dbus.conf || die
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	append-cflags "-fsigned-char" #662694
-	local myeconfargs=(
-		$(use_enable pie)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-}
-
-src_test() {
-	# New dbus tests fail with >3 jobs, this should get fixed soon
-	emake -j1 check
-}
diff --git a/dev-libs/ell/ell-0.70-r1.ebuild b/dev-libs/ell/ell-0.70-r1.ebuild
deleted file mode 100644
index 458f682ec04f..000000000000
--- a/dev-libs/ell/ell-0.70-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-IUSE="pie test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-apps/dbus )"
-
-CONFIG_CHECK="
-	~TIMERFD
-	~EVENTFD
-	~CRYPTO_USER_API
-	~CRYPTO_USER_API_HASH
-	~CRYPTO_MD5
-	~CRYPTO_SHA1
-	~KEY_DH_OPERATIONS
-"
-
-PATCHES=(
-	"${FILESDIR}"/0.70
-)
-
-src_prepare() {
-	default
-	sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \
-		unit/test-dbus*.c unit/dbus.conf || die
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	append-cflags "-fsigned-char" #662694
-	local myeconfargs=(
-		$(use_enable pie)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-}
-
-src_test() {
-	# New dbus tests fail with >3 jobs, this should get fixed soon
-	emake -j1 check
-}
diff --git a/dev-libs/ell/ell-0.70.ebuild b/dev-libs/ell/ell-0.70.ebuild
deleted file mode 100644
index 3bc689c9a7c9..000000000000
--- a/dev-libs/ell/ell-0.70.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-IUSE="pie test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-apps/dbus )"
-
-CONFIG_CHECK="
-	~TIMERFD
-	~EVENTFD
-	~CRYPTO_USER_API
-	~CRYPTO_USER_API_HASH
-	~CRYPTO_MD5
-	~CRYPTO_SHA1
-	~KEY_DH_OPERATIONS
-"
-
-src_prepare() {
-	default
-	sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \
-		unit/test-dbus*.c unit/dbus.conf || die
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	append-cflags "-fsigned-char" #662694
-	local myeconfargs=(
-		$(use_enable pie)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-}
-
-src_test() {
-	# New dbus tests fail with >3 jobs, this should get fixed soon
-	emake -j1 check
-}
diff --git a/dev-libs/ell/ell-0.71.ebuild b/dev-libs/ell/ell-0.71.ebuild
index 3bc689c9a7c9..300277eeda9f 100644
--- a/dev-libs/ell/ell-0.71.ebuild
+++ b/dev-libs/ell/ell-0.71.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 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index 84992c3602ab..8c504692af80 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,2 +1 @@
 DIST flatbuffers-24.12.23.gh.tar.gz 2326944 BLAKE2B d32d8f861cfb2eff23cdedda01d4e0bd2f203c4d4bf1d0ade1a06ce9caf9fcf3b43c58f2e5bf9014892c184f819ab8005b322d6e96b9f3c9b9c5624eef12642f SHA512 f97762ba41b9cfef648e93932fd789324c6bb6ebc5b7aeca8185c9ef602294b67d73aea7ae371035579a1419cbfbeba7c3e88b31b5a5848db98f5e8a03b982b1
-DIST flatbuffers-24.3.25.gh.tar.gz 2297829 BLAKE2B f3a5a94119a1b1b63fba9126e1cdff7ab712996bfc0d65626a679405f62dfa722bc5de244ef775fba336224b60feff3aa27acf54bed027c4013590b4afbefe7c SHA512 e2a614f4fc526ce07bfe1e1bc79efd3c87acbdb93aee7b42994d4855abd2593f36b5ca1edb53c7dcd470d5fbe14a3e394bd75dcebb4458cc0aeb33d622a3c662
diff --git a/dev-libs/flatbuffers/flatbuffers-24.12.23.ebuild b/dev-libs/flatbuffers/flatbuffers-24.12.23.ebuild
index c03ba67b3e92..07228e942d39 100644
--- a/dev-libs/flatbuffers/flatbuffers-24.12.23.ebuild
+++ b/dev-libs/flatbuffers/flatbuffers-24.12.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
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/flatbuffers/flatbuffers-24.3.25.ebuild b/dev-libs/flatbuffers/flatbuffers-24.3.25.ebuild
deleted file mode 100644
index ead2e8a0a127..000000000000
--- a/dev-libs/flatbuffers/flatbuffers-24.3.25.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Memory efficient serialization library"
-HOMEPAGE="
-	https://flatbuffers.dev/
-	https://github.com/google/flatbuffers/
-"
-SRC_URI="
-	https://github.com/google/flatbuffers/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
-		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
-		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
-		-DFLATBUFFERS_BUILD_BENCHMARKS=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 0c2bd2c704d2..51d79117eabb 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1 +1,2 @@
 DIST fribidi-1.0.13.tar.xz 1170100 BLAKE2B 8cc31220304ddbdeb0047b30ed9084921920b32ad3f1bdcf29ecbb2fafbd430c391bc99bb7f205546ff8482aea1ef7ed369da71deb3474aa623fc2aeace1b62a SHA512 09357d842ff9e05b918f826e28e4a25ad996e17f73242ee9ce53fae9f37ec6c639f9cae4271577f6e0269f34265afc893858225c4a94610f0a6ee7580fb1fe07
+DIST fribidi-1.0.16.tar.xz 1098260 BLAKE2B 9a0dce6152ba0f0ca4a42a83ca0f6d234fb9fef2a681d274aab6922e3394b70430e677fd549b17b13d928d733c0e72a7e3527cfb461971bbfd155ec1bd5e738c SHA512 e3a56f36155f6813e3609473639fc533de742309f561c463012dc90b412a1ac7694b765d92669b2cbfaee973ca0e92fa5e926e68a1a078921f26ef17d82ab651
diff --git a/dev-libs/fribidi/fribidi-1.0.16.ebuild b/dev-libs/fribidi/fribidi-1.0.16.ebuild
new file mode 100644
index 000000000000..2da9139de635
--- /dev/null
+++ b/dev-libs/fribidi/fribidi-1.0.16.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
+HOMEPAGE="https://fribidi.org/"
+SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+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"
+
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddeprecated=true
+		$(meson_native_use_bool doc docs)
+		-Dbin=true
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/hidapi/hidapi-0.14.0.ebuild b/dev-libs/hidapi/hidapi-0.14.0.ebuild
index a82035c07c55..96d5eeada9ee 100644
--- a/dev-libs/hidapi/hidapi-0.14.0.ebuild
+++ b/dev-libs/hidapi/hidapi-0.14.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
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="|| ( BSD GPL-3 HIDAPI )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-libs/hipother/Manifest b/dev-libs/hipother/Manifest
index 0c54674e72c0..2dde3bd57777 100644
--- a/dev-libs/hipother/Manifest
+++ b/dev-libs/hipother/Manifest
@@ -1 +1,2 @@
 DIST hipother-6.1.1.tar.gz 33496 BLAKE2B 026967cb298a888df441d543d70478836036b81dc26c8284410076daf18eb28dc42f7d4b6aaf2bfaa8b6c957ada8244afc0e7c40882c0370bc2b6a0ae94ffaf8 SHA512 ca4d5df9e3138e845be051aace8fb02d84b879439e6bc9ca1551853f80f54b554b9cad1a91c6c114160b21d3ca62fa47a88e32efe60c0f475ff8b56f7f18b5d4
+DIST hipother-6.3.0.tar.gz 37660 BLAKE2B 8af74369c769750575d55c7ab152af32f6b8ce06f65247fb1390900427c0a24282b4681dbd65e36241262423a793af48b432fc252d0fad5ac367c25f242e1865 SHA512 3bdd70e6ef34aeb51c7d973f73cf3b761016659892c57719cc85d123e8212e4510c5d799563d20cea9de441e983ed148900c6656784a0cc28d0f67c4ea91c99e
diff --git a/dev-libs/hipother/hipother-6.3.0.ebuild b/dev-libs/hipother/hipother-6.3.0.ebuild
new file mode 100644
index 000000000000..8160512df6a2
--- /dev/null
+++ b/dev-libs/hipother/hipother-6.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="ROCclr runtime implementation for non-AMD HIP platforms, like NVIDIA"
+HOMEPAGE="https://github.com/ROCm/hipother"
+SRC_URI="https://github.com/ROCm/hipother/archive/refs/tags/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/hipother-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	!<dev-util/hip-6
+"
+
+src_install() {
+	insinto /usr/include
+	doins -r hipnv/include/hip
+}
diff --git a/dev-libs/icu-layoutex/icu-layoutex-76.1-r1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-76.1-r1.ebuild
index 386834c67bb3..3e0aed8d009b 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-76.1-r1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-76.1-r1.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
@@ -19,7 +19,7 @@ S="${WORKDIR}"/${PN/-layoutex}/source
 LICENSE="BSD"
 SLOT="0/${PV%.*}"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
 fi
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/icu/icu-76.1-r1.ebuild b/dev-libs/icu/icu-76.1-r1.ebuild
index c720bcb4b581..2ea3b7d3ef20 100644
--- a/dev-libs/icu/icu-76.1-r1.ebuild
+++ b/dev-libs/icu/icu-76.1-r1.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
@@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/re
 S="${WORKDIR}"/${PN}/source
 
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 LICENSE="BSD"
 SLOT="0/${PV%.*}"
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index c9ee72b93ef1..f71289fb030f 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1 +1,2 @@
 DIST imath-3.1.11.tar.gz 596585 BLAKE2B d5fc8d7607070bc96619e74eb67c60048695023c1baa715e3ab5de84a49bf1f7381cc19e3a047b75f8520e20a9976c58503b2063feb2add7b6dfcc7c73e13ad7 SHA512 0bc86bea3a2aca89d02b501b4fba3c13ca861e914cec558e820fe9e4c43ab14cac34e31ff278b8c35b5fe76f7bea32f2c8105c0d33eb92224eb23d42d7a402e9
+DIST imath-3.1.12.tar.gz 604232 BLAKE2B f11cd2ac2e8ba9df36b2401083088e5603980b45ca36b7b89348a5b87af99cb89de39154e9d37a0d0ef505a06d270f087f96dbc6bca3d4349e03840f34915bb3 SHA512 32628dfcacb610310b81ffe017a66215cf5fb84c2e0a6ac8c94a68c048be3d2b97eb57965dd253770184d5824cce1e5440b8eefb2834666b273b3193ff108343
diff --git a/dev-libs/imath/imath-3.1.11.ebuild b/dev-libs/imath/imath-3.1.11.ebuild
deleted file mode 100644
index 79345be46be9..000000000000
--- a/dev-libs/imath/imath-3.1.11.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake python-single-r1
-
-MY_PN=${PN^}
-
-DESCRIPTION="Imath basic math package"
-HOMEPAGE="https://imath.readthedocs.io"
-SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="3/29"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc large-stack python test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen
-		$(python_gen_cond_dep '
-			dev-python/breathe[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-press-theme[${PYTHON_USEDEP}]
-		')
-	)
-	python? ( ${PYTHON_DEPS} )
-"
-
-DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WEBSITE=$(usex doc)
-		-DIMATH_ENABLE_LARGE_STACK=$(usex large-stack)
-		# the following options are at their default value
-		-DIMATH_HALF_USE_LOOKUP_TABLE=ON
-		-DIMATH_INSTALL_PKG_CONFIG=ON
-		-DIMATH_USE_CLANG_TIDY=OFF
-		-DIMATH_USE_DEFAULT_VISIBILITY=OFF
-		-DIMATH_USE_NOEXCEPT=ON
-	)
-	if use python; then
-		mycmakeargs+=(
-			-DBoost_NO_BOOST_CMAKE=OFF
-			-DPYTHON=ON
-			-DPython3_EXECUTABLE="${PYTHON}"
-			-DPython3_INCLUDE_DIR="$(python_get_includedir)"
-			-DPython3_LIBRARY="$(python_get_library_path)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}/website/sphinx/." )
-	cmake_src_install
-}
diff --git a/dev-libs/imath/imath-3.1.12.ebuild b/dev-libs/imath/imath-3.1.12.ebuild
new file mode 100644
index 000000000000..3a1960478263
--- /dev/null
+++ b/dev-libs/imath/imath-3.1.12.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake python-single-r1
+
+MY_PN=${PN^}
+
+DESCRIPTION="Imath basic math package"
+HOMEPAGE="https://imath.readthedocs.io"
+SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD"
+SLOT="3/29"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc large-stack python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen
+		$(python_gen_cond_dep '
+			dev-python/breathe[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-press-theme[${PYTHON_USEDEP}]
+		')
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+
+DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.11-fix_cmake_module_export.patch"
+	"${FILESDIR}/${PN}-3.1.11-use-correct-boost_python_version.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WEBSITE="$(usex doc)"
+		-DIMATH_ENABLE_LARGE_STACK="$(usex large-stack)"
+		# the following options are at their default value
+		-DIMATH_HALF_USE_LOOKUP_TABLE=ON
+		-DIMATH_INSTALL_PKG_CONFIG=ON
+		-DIMATH_USE_CLANG_TIDY=OFF
+		-DIMATH_USE_DEFAULT_VISIBILITY=OFF
+		-DIMATH_USE_NOEXCEPT=ON
+	)
+	if use python; then
+		mycmakeargs+=(
+			-DBoost_NO_BOOST_CMAKE=OFF
+			-DPYTHON=ON
+			-DPython3_EXECUTABLE="${PYTHON}"
+			-DPython3_INCLUDE_DIR="$(python_get_includedir)"
+			-DPython3_LIBRARY="$(python_get_library_path)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}/website/sphinx/." )
+	cmake_src_install
+}
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index 0df565c5a236..06b695bc2638 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -1,3 +1,3 @@
 DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86
 DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968
-DIST iniparser-4.2.2.tar.bz2 32649 BLAKE2B e4ab230ca1cde6a0322e05aa483e3112e324903c65e1f22640e17a7696ac30a4eef66c1bb449ea730b9a0caf55091b425fafb9d1514fbf7bbd21d7ef4503147e SHA512 a9b0d4b80a4d4faeff4ec5ae9f0de8f0d4e1d6244dddfca7c3ef9bb188fcb0c3bb288478632145232fe52073cd0714abc0ad12a1cca4e3936fc40a3fba357601
+DIST iniparser-v4.2.5.tar.bz2 34574 BLAKE2B 47eeffa4f441d491c153717df5b713e56181e090509b4496e9768b7f4654970b9cc6f261f9c821afbd2769b194a5742f82d20fc46471c92577bcde5ad350f989 SHA512 db7ebab3336bf9854efc9a70784762b1917da616d4c1f5e6c2409b238dd967967c196df85f444c1d21732dc47d195ca044a93ae2b0d8d556fe150e7dd1b78d64
diff --git a/dev-libs/iniparser/iniparser-4.1-r1.ebuild b/dev-libs/iniparser/iniparser-4.1-r1.ebuild
deleted file mode 100644
index c47f61626075..000000000000
--- a/dev-libs/iniparser/iniparser-4.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A free stand-alone ini file parsing library"
-HOMEPAGE="https://github.com/ndevilla/iniparser"
-SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc examples"
-
-BDEPEND="doc? ( app-text/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-CVE-null-getstring.patch  # upstream, bug #907928
-)
-
-_newlib_so_with_symlinks() {
-	local source="${1}" base="${2}" current="${3}" revision="${4}" age="${5}"
-
-	newlib.so ${source} ${base}.so.${current}.${revision}.${age}
-	local i
-	for i in ".${current}" '' ; do
-		dosym ${base}.so.${current}.${revision}.${age} /usr/$(get_libdir)/${base}.so${i}
-	done
-}
-
-src_prepare() {
-	default
-	rm -r html || die
-}
-
-src_configure() {
-	append-lfs-flags
-}
-
-_emake() {
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" V=1 \
-		SO_TARGET=lib${PN}${SLOT}.so.1 \
-		ADDITIONAL_CFLAGS= \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake -C test
-}
-
-src_install() {
-	_newlib_so_with_symlinks lib${PN}${SLOT}.so.1 lib${PN}${SLOT} 1 0 0
-
-	insinto /usr/include/${PN}${SLOT}
-	doins src/*.h
-
-	if use doc; then
-		emake -C doc
-		HTML_DOCS=( html/. )
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
diff --git a/dev-libs/iniparser/iniparser-4.1-r2.ebuild b/dev-libs/iniparser/iniparser-4.1-r2.ebuild
new file mode 100644
index 000000000000..d48fac06d4e7
--- /dev/null
+++ b/dev-libs/iniparser/iniparser-4.1-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Free stand-alone ini file parsing library"
+HOMEPAGE="https://github.com/ndevilla/iniparser/"
+SRC_URI="
+	https://github.com/ndevilla/iniparser/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0/1"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc examples"
+
+BDEPEND="doc? ( app-text/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-CVE-null-getstring.patch
+)
+
+src_prepare() {
+	default
+
+	rm -r html || die
+}
+
+src_compile() {
+	append-lfs-flags
+	tc-export AR CC
+
+	emake V=1 ADDITIONAL_CFLAGS=
+	use doc && emake -C doc
+}
+
+src_test() {
+	emake V=1 -C test
+}
+
+src_install() {
+	dolib.so lib${PN}.so.1
+	dosym -r /usr/$(get_libdir)/lib${PN}.so{.1,}
+
+	doheader src/*.h
+
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	use doc && local HTML_DOCS=( html/. )
+	einstalldocs
+}
diff --git a/dev-libs/iniparser/iniparser-4.2.2.ebuild b/dev-libs/iniparser/iniparser-4.2.2.ebuild
deleted file mode 100644
index 338c713a9dd4..000000000000
--- a/dev-libs/iniparser/iniparser-4.2.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A free stand-alone ini file parsing library"
-HOMEPAGE="https://gitlab.com/iniparser/iniparser"
-SRC_URI="https://gitlab.com/iniparser/iniparser/-/archive/v${PV}/iniparser-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-S="${WORKDIR}/${PN}-v${PV}"
-LICENSE="MIT"
-SLOT="4"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc examples"
-
-BDEPEND="doc? ( app-text/doxygen )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS=$(usex doc)
-		-DBUILD_EXAMPLES=$(usex examples)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/iniparser/iniparser-4.2.5.ebuild b/dev-libs/iniparser/iniparser-4.2.5.ebuild
new file mode 100644
index 000000000000..019cee487407
--- /dev/null
+++ b/dev-libs/iniparser/iniparser-4.2.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Free stand-alone ini file parsing library"
+HOMEPAGE="https://gitlab.com/iniparser/iniparser/"
+SRC_URI="https://gitlab.com/iniparser/iniparser/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+S=${WORKDIR}/${PN}-v${PV}
+
+LICENSE="MIT"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc examples"
+
+BDEPEND="doc? ( app-text/doxygen )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCS=$(usex doc)
+		-DBUILD_STATIC_LIBS=no
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	local DOCS=( AUTHORS README.md FAQ* )
+	cmake_src_install
+
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+	fi
+}
diff --git a/dev-libs/iniparser/metadata.xml b/dev-libs/iniparser/metadata.xml
index 1c90e38bac72..7f7e9f7f07a5 100644
--- a/dev-libs/iniparser/metadata.xml
+++ b/dev-libs/iniparser/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>samba@gentoo.org</email>
-		<name>Samba Team</name>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="gitlab">iniparser/iniparser</remote-id>
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index b828d023e778..51a71fb57a7a 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1 +1,3 @@
 DIST intel-compute-runtime-24.35.30872.25.tar.gz 7375680 BLAKE2B 8aede769b46ecdb2eb49346bc87c1e58fbefa382e80419a301b00197fbdc977f62b001e7670a912a28c736aafc59e60d45a4c4d3e61331d6001307c184d3a4b8 SHA512 4e09f432f1f3a7f8c3b9a7bbd6981f2b26a837fc6f6b4459d21bb51fcce94a3c95726d23fb77be2664c7fbdf4dd270e1ec21af1bc815e718a5df865e8bbdac03
+DIST intel-compute-runtime-24.35.30872.32.tar.gz 7376572 BLAKE2B af924c111d288621ddcb14b9d77ff384c632668705e4858ed27424522b6c96e1e7b54012b202c6ade64da668681f3089d0a35d64ecb97ddec642ace8774b3e47 SHA512 2ac8dbefcc1a86b33afd78b8a1d30a959fb980e47402852514d43503df87ea70ea35f192243b78faedce749b3087f244631080f16ddb099a93ec79698176f6b5
+DIST intel-compute-runtime-24.52.32224.5.tar.gz 7418220 BLAKE2B fa1e165cf20e7c31fff15c19700e3589338edc8255b567131c038fb58086a72243994b08e668ecc43fdbc5668177ab6acb95ff32ac40c7703de90778c876b9db SHA512 548b249aab5a21fd94846a96443fd3f766664ea401ba86803f106b8001d4f4f0224d8581952162c31c12b4aa5bc82fc6b4236929c921c0a93763950a7e221363
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.32.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.32.ebuild
new file mode 100644
index 000000000000..50c31549953b
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.32.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0/1.5.30872"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND="
+	>=dev-util/intel-graphics-compiler-1.0.17791.18
+	>=media-libs/gmmlib-22.5.2:=
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-libs/intel-metrics-discovery:=
+	>=dev-libs/intel-metrics-library-1.0.182:=
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-system-controller-0.9.5:=
+	media-libs/mesa
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.19.2:= )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		media-libs/libva
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+src_prepare() {
+	# Remove '-Werror' from default
+	sed -e '/Werror/d' -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Filtered for two reasons:
+	# 1) https://github.com/intel/compute-runtime/issues/528
+	# 2) bug #930199
+	filter-lto
+
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DNEO_ALLOW_LEGACY_PLATFORMS_SUPPORT="ON"
+		-DNEO_DISABLE_LTO="ON"
+		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+		-DSUPPORT_DG1="ON"
+		-Wno-dev
+
+		# See https://github.com/intel/intel-graphics-compiler/issues/204
+		# -DNEO_DISABLE_BUILTINS_COMPILATION="ON"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="1"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-24.52.32224.5.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.52.32224.5.ebuild
new file mode 100644
index 000000000000..d4291a73bbd6
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.52.32224.5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0/1.6.32224"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND="
+	>=dev-util/intel-graphics-compiler-2.5.7
+	>=media-libs/gmmlib-22.5.2:=
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-libs/intel-metrics-discovery:=
+	>=dev-libs/intel-metrics-library-1.0.182:=
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-system-controller-0.9.5:=
+	media-libs/mesa
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.19.2:= )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		media-libs/libva
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+src_prepare() {
+	# Remove '-Werror' from default
+	sed -e '/Werror/d' -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Filtered for two reasons:
+	# 1) https://github.com/intel/compute-runtime/issues/528
+	# 2) bug #930199
+	filter-lto
+
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DNEO_ALLOW_LEGACY_PLATFORMS_SUPPORT="ON"
+		-DNEO_DISABLE_LTO="ON"
+		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+		-DSUPPORT_DG1="ON"
+		-Wno-dev
+
+		# See https://github.com/intel/intel-graphics-compiler/issues/204
+		# -DNEO_DISABLE_BUILTINS_COMPILATION="ON"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="1"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/intel-metrics-discovery/Manifest b/dev-libs/intel-metrics-discovery/Manifest
index bf448635bae7..6075aa125632 100644
--- a/dev-libs/intel-metrics-discovery/Manifest
+++ b/dev-libs/intel-metrics-discovery/Manifest
@@ -1,2 +1 @@
-DIST metrics-discovery-1.13.178.tar.gz 5398480 BLAKE2B f36a239318d7050f6abcb3cf9a9b12e9aea9b87a91a73dcd32f1d3d02addaf70f168fc8b17b19edcd2abfda2288170076237c9e8f9ce4c37cbb103b8faf68fd5 SHA512 d4fd142f23d06fff281106490d790eb81fe7cbf5fb4d2b57d796807aedaddb975a85d4c11880a867d6e60545eae106841cabbae6f80d9663f787b1aa3dd8af7d
 DIST metrics-discovery-1.13.179.tar.gz 5630041 BLAKE2B 0a7d44eb70550c0e68b6402e077c3ec3798cd7f50fb894d836d0d361398edc0886ca8114085c76313cfec3c72f041521174291cbe3dcdc42bef8d1001798efd3 SHA512 4e50c0c34f0d0b4470ede001d35ceebd838508e4125dd7e3572ad3d521affa15f20af4551c039f167c79b44a96a4f206aa122c8cbb030377b9584bf8ae9fb737
diff --git a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.178.ebuild b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.178.ebuild
deleted file mode 100644
index c6731ce7f26b..000000000000
--- a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.178.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake
-
-DESCRIPTION="A user mode library that provides access to GPU performance data"
-HOMEPAGE="https://github.com/intel/metrics-discovery"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64"
-
-DEPEND="x11-libs/libdrm"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.12.178-revert-definitions.patch" )
-
-src_configure() {
-	local mycmakeargs=( -DLINUX_DISTRO="Gentoo" )
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.179.ebuild b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.179.ebuild
index fa161df3c12e..f2ea6aaecbd1 100644
--- a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.179.ebuild
+++ b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.179.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="x11-libs/libdrm"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/intel-metrics-library/Manifest b/dev-libs/intel-metrics-library/Manifest
index f5b337b06265..5cc80e072f7d 100644
--- a/dev-libs/intel-metrics-library/Manifest
+++ b/dev-libs/intel-metrics-library/Manifest
@@ -1,2 +1 @@
-DIST metrics-library-1.0.178.tar.gz 279352 BLAKE2B 20a95639c270f84f0fb773f80799593e800d74034dc2d5913fe1bede26ca8dd777b994610adf9bbe81314c2d1043f66ef086e3292f1c99f1b44f67a3a80810f1 SHA512 52f1580a3eafea678ec3d27b89097d8710ecc5dc710ad2a414b805799af0a70d32fd0d57894bbe99eca7855df142331fdf387270efe0b7240c867c5c108dfbed
 DIST metrics-library-1.0.182.tar.gz 271427 BLAKE2B 16431e1d4010f762a220876bf72b10d87f3c86478ed4f89fad0a56dbd04c2e95da7ef5a89f4f9fe443705d7ca9c8a78891f4eb69046f1e62c8b9dd1fafe18422 SHA512 5632956a5fd541840aa59a88a01a8b498ea94ed27a36f644e65bcfefdfef1e73d36908925d0b00f60bb152953227f1d17e882f554187695944e0b5b09751d3a2
diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.178.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.178.ebuild
deleted file mode 100644
index 553a918ad5e3..000000000000
--- a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.178.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake
-
-DESCRIPTION="User mode driver helper library that provides access to GPU performance counters"
-HOMEPAGE="https://github.com/intel/metrics-library"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64"
-
-DEPEND="x11-libs/libdrm"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e '/-Werror/d' -i CMakeLists.txt || die
-	cmake_src_prepare
-}
diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.182.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.182.ebuild
index 86657df2d0c0..94876ae6b3b0 100644
--- a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.182.ebuild
+++ b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.182.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="x11-libs/libdrm"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/intel-vc-intrinsics/Manifest b/dev-libs/intel-vc-intrinsics/Manifest
index fccc7bc13849..760cecb08532 100644
--- a/dev-libs/intel-vc-intrinsics/Manifest
+++ b/dev-libs/intel-vc-intrinsics/Manifest
@@ -1,3 +1 @@
-DIST intel-vc-intrinsics-0.19.0.tar.gz 146538 BLAKE2B b32e91405a8ca4e56870d41d1d17bc9aa9d3ab94fbb76ef0444591a1fb1415cffc4cdea0c938d8b87844218390a0f190b276abbab133bb443f3c66be87a07544 SHA512 7900273bb37c95605707ce589ba0ff5f414ba7c46c0d41539fc11bef2dece8f7ef8b8ec3219330c36252bbf5de4a99045506b79a1afc1bc7598c26e6335d7fae
-DIST intel-vc-intrinsics-0.20.2.tar.gz 146639 BLAKE2B d8d71ad06a1b7cfde93bf8c748ed4cdbd0e4da8ef6310fc61abc598173432b60df04fe14ed3bc9f51df65e39f42f755cf287e9ac223163690035eaf13c42aad2 SHA512 b4b6a4bc91d5187891129f04f8737be4572b6722f782175b7901571ec38e97be71b713c2d7783aaf9172ce77dc2943cd5c733ba1e60e0542474ab382ec2055ee
 DIST intel-vc-intrinsics-0.21.0.tar.gz 146968 BLAKE2B d0605f10b9374490364275fcedc396d8df71c28f051a71463682e981c2620dec84e2b5541fa155a2f38e8a018c3ee5332ce89ad72c97f4ab1d7381ab4c0005be SHA512 5c10b45f26e16074a51878db1dfb85ec0361823e844e358f1df84b272754e7e1ba9f64089fe40f5949ebe38675c214cc933bb872267c83415c5991aec5b060bc
diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.19.0.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.19.0.ebuild
deleted file mode 100644
index 0a28f32b2f02..000000000000
--- a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.19.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_COMPAT=( {15..18} )
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit cmake llvm-r1 python-any-r1
-
-DESCRIPTION="A set of new intrinsics on top of core LLVM IR instructions"
-HOMEPAGE="https://github.com/intel/vc-intrinsics"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND="
-	dev-libs/libxml2:2=
-	$(llvm_gen_dep '
-		llvm-core/llvm:${LLVM_SLOT}
-	')
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="$(get_llvm_prefix)"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.20.2.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.20.2.ebuild
deleted file mode 100644
index f8ecae5df2a0..000000000000
--- a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.20.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_COMPAT=( {15..18} )
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit cmake llvm-r1 python-any-r1
-
-DESCRIPTION="A set of new intrinsics on top of core LLVM IR instructions"
-HOMEPAGE="https://github.com/intel/vc-intrinsics"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	dev-libs/libxml2:2=
-	$(llvm_gen_dep '
-		llvm-core/llvm:${LLVM_SLOT}
-	')
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="$(get_llvm_prefix)"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.21.0.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.21.0.ebuild
index f8ecae5df2a0..a8f648f1339f 100644
--- a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.21.0.ebuild
+++ b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.21.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}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	dev-libs/libxml2:2=
diff --git a/dev-libs/ivykis/ivykis-0.43.1.ebuild b/dev-libs/ivykis/ivykis-0.43.1.ebuild
index d1ba67d173ca..2c8a7d9d5b12 100644
--- a/dev-libs/ivykis/ivykis-0.43.1.ebuild
+++ b/dev-libs/ivykis/ivykis-0.43.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-libs/kirigami-addons/Manifest b/dev-libs/kirigami-addons/Manifest
index f6f4c0c1a102..1a358965c9fa 100644
--- a/dev-libs/kirigami-addons/Manifest
+++ b/dev-libs/kirigami-addons/Manifest
@@ -1,2 +1,3 @@
 DIST kirigami-addons-1.5.0.tar.xz 1502124 BLAKE2B 3298b3ae5d9fdd46ae0b74a69b73f679ba04e6316e2750c24a319e820b566ab2c5fd86389c65fce0e4e2d66140c0f603c0698d4bfb9119d23aa946384ca6ebf6 SHA512 dc4359d61dc24bc970acbacb94924bdfa2dbf699f80cc15dc892b22dc6f89494f6616530152dafa4898f48bf24fa3ef24455efc1dd9c35c903a7c5e91ea9c72a
 DIST kirigami-addons-1.6.0.tar.xz 1508992 BLAKE2B c319bc792c869eda8412a8bf1bae67ec954f6f994cb509bde06b00f199c18276128c75ba59586ae7af998625ce98312e440bb9f13152569c5280e0abbc083bfa SHA512 ba033dcd0e70c250dee71298f32f6b88bdfe7f52a4ddcd2445daf6ecf87458610728dc7dfdb09ccaac1a8a7c41f4efcb892d35b2641ce4dd311c231de93ef363
+DIST kirigami-addons-1.7.0.tar.xz 1518680 BLAKE2B ad13723e1429205bb44d300204f828790939e365329310216a227e63d0e43ed8c4433a19dbc626113352d61d9bc625ba9ed7256312ba398a05b84021f9b62858 SHA512 9675f6e92aac6f4785b5e360b6005effba60c6bb4fbdc3ab596ea5c45dbdcb24317a7e5f5f3c5dea4973b210fb4c2cfa76e12f0d006a7813f86da47f37358c8b
diff --git a/dev-libs/kirigami-addons/kirigami-addons-1.6.0.ebuild b/dev-libs/kirigami-addons/kirigami-addons-1.6.0.ebuild
index bec6e1fe92c3..64f2e16ee196 100644
--- a/dev-libs/kirigami-addons/kirigami-addons-1.6.0.ebuild
+++ b/dev-libs/kirigami-addons/kirigami-addons-1.6.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 @@ inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Visual end user components for Kirigami-based applications"
diff --git a/dev-libs/kirigami-addons/kirigami-addons-1.7.0.ebuild b/dev-libs/kirigami-addons/kirigami-addons-1.7.0.ebuild
new file mode 100644
index 000000000000..a0bd578c3d2a
--- /dev/null
+++ b/dev-libs/kirigami-addons/kirigami-addons-1.7.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Visual end user components for Kirigami-based applications"
+HOMEPAGE="https://invent.kde.org/libraries/kirigami-addons"
+
+LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) LGPL-2.1+"
+SLOT="6"
+IUSE=""
+
+# would profit from VIRTUALX_REQUIRED=test, but then still requires
+# org.qt-project.qt.mediaplayer service and fails, bug 911186
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+	kde-plasma/libplasma:6
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+		x11-themes/sound-theme-freedesktop
+	)
+"
diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest
index 2309a3695086..0349244418d9 100644
--- a/dev-libs/kopeninghours/Manifest
+++ b/dev-libs/kopeninghours/Manifest
@@ -1,2 +1,2 @@
 DIST kopeninghours-24.08.3.tar.xz 74616 BLAKE2B 083dfdda40b2d7084cb4dccf253d911ad4a2228dc4b88ff9386be7b95a9d44ee93a54a185b2ab7892c2f37f50480305876016bade7cad04b64bcd3073323ccb5 SHA512 fe953735989f4da3e3e0c652f8df4a5a96762c7bfad23e88d2472f8004f4eec550589328e7a45edace37acf9129fe4f397e54bce4c72b124fa1fe20536f1248e
-DIST kopeninghours-24.12.0.tar.xz 74772 BLAKE2B 72448773bceec8d33ad4daae78b8862aef0f4527b7ad239eb87fbd10e7ddeeeda60bf579f115b2096a3ed8e31573008f6beee549bdbbee8dfb4276fb8fea6817 SHA512 115728d650507dbb557a1d89785a8b62215eb51827292ae0c5fa71d950553796d87f2a39b09f410a1dd9150022681378664f4bfb0bc1fbc8ccf1e19e31fad285
+DIST kopeninghours-24.12.1.tar.xz 74860 BLAKE2B 4102999c5f264580b750ddf1fa5232226aef355b051b115e1a4cfc924f7dab1ca60601cc487f3646bd4dbaae4642f2b876308d0e67e2884d91399ffe36523524 SHA512 63f71ddee3e8e7e85a92dcc98fc925b6b13a539709950cf0e9adcef3e8ad2b29694181a2e13887b769af91308de77966de06b7ea841739436805ea1b57d93af6
diff --git a/dev-libs/kopeninghours/kopeninghours-24.12.0-r1.ebuild b/dev-libs/kopeninghours/kopeninghours-24.12.0-r1.ebuild
deleted file mode 100644
index a51a13f17f19..000000000000
--- a/dev-libs/kopeninghours/kopeninghours-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-PYTHON_COMPAT=( python3_{10..12} )
-inherit ecm gear.kde.org python-single-r1
-
-DESCRIPTION="Library for parsing and evaluating OSM opening hours expressions"
-HOMEPAGE="https://api.kde.org/kopeninghours/html/index.html
-https://invent.kde.org/libraries/kopeninghours"
-
-LICENSE="LGPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	>=dev-libs/kpublictransport-${PVCUT}:6
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-frameworks/kholidays-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	sys-libs/zlib
-	python? (
-		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	app-alternatives/lex
-	app-alternatives/yacc
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-22.04.0-boostpython.patch )
-
-pkg_setup() {
-	ecm_pkg_setup
-	python_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON}
-		$(cmake_use_find_package python Boost)
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	python_optimize
-}
diff --git a/dev-libs/kopeninghours/kopeninghours-24.12.1.ebuild b/dev-libs/kopeninghours/kopeninghours-24.12.1.ebuild
new file mode 100644
index 000000000000..3182b121a372
--- /dev/null
+++ b/dev-libs/kopeninghours/kopeninghours-24.12.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+PYTHON_COMPAT=( python3_{10..12} )
+inherit ecm gear.kde.org python-single-r1
+
+DESCRIPTION="Library for parsing and evaluating OSM opening hours expressions"
+HOMEPAGE="https://api.kde.org/kopeninghours/html/index.html
+https://invent.kde.org/libraries/kopeninghours"
+
+LICENSE="LGPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	>=dev-libs/kpublictransport-${PVCUT}:6
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kholidays-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	sys-libs/zlib
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	app-alternatives/lex
+	app-alternatives/yacc
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-22.04.0-boostpython.patch )
+
+pkg_setup() {
+	ecm_pkg_setup
+	python_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON}
+		$(cmake_use_find_package python Boost)
+	)
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	python_optimize
+}
diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest
index 2faf47131883..800ff93647bb 100644
--- a/dev-libs/kosmindoormap/Manifest
+++ b/dev-libs/kosmindoormap/Manifest
@@ -1,2 +1,2 @@
 DIST kosmindoormap-24.08.3.tar.xz 692392 BLAKE2B 41879a7ef4dbde858d8e6f2e53b4b32efd94f4277ed8bf6c9d4343907364814acc00cc5bdf09840e429e7fd4cf2150d535dcb261ae7debcc0c941837b1607385 SHA512 cf63d91306d41d8fd9cc3c33eee91a6380a0d043a610b49b214dfb8de76531dacf03e2745d1783e4627b218e6bf55b370d1946b6e4276aea10906d790d63f881
-DIST kosmindoormap-24.12.0.tar.xz 693112 BLAKE2B aedc39091b46f1f72cca4f9a276b1ef6d6da79bd88e55bccb0b6f75649e9dc8424711023e9c8f199feb8d264d20f1239a61ef4e334df99be2f3aa41d37d73e8c SHA512 7fb543ae894cf1256acc1852a6de90ef40c1f43e34cbcdfe8b2a59fd49def5bc95b740c3fd8585449103caa4e52f35c38e36f2940437afdae89c74c8cc961e30
+DIST kosmindoormap-24.12.1.tar.xz 693648 BLAKE2B 53435662dd3f80e7aa5bfd1949dd337fc9ca90883330c25f47a800715c933fa54c60af32b1aa3fabdfd607972153daf1f19d0fb52db06719b7e00246b2675839 SHA512 9bb1d87e28836019439878d6b5dcb5d82839f5b5a6b3beb7964bd3d13b7ffbfb9796b7ca6180727c110a579630b0ff5a9e78d65c35535db7e3cebaf65f282efb
diff --git a/dev-libs/kosmindoormap/kosmindoormap-24.12.0-r1.ebuild b/dev-libs/kosmindoormap/kosmindoormap-24.12.0-r1.ebuild
deleted file mode 100644
index 000bf9687072..000000000000
--- a/dev-libs/kosmindoormap/kosmindoormap-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://invent.kde.org/libraries/kosmindoormap"
-
-LICENSE="LGPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="+gui"
-
-# kservice is optional and only used to find and open josm
-RDEPEND="
-	dev-libs/protobuf:=
-	>=dev-qt/qtbase-${QTMIN}:6[gui?,network]
-	sys-libs/zlib
-	gui? (
-		>=dev-libs/kopeninghours-${PVCUT}:6
-		>=dev-libs/kpublictransport-${PVCUT}:6
-		>=dev-qt/qtdeclarative-${QTMIN}:6
-		>=kde-frameworks/kcoreaddons-${KFMIN}:6
-		>=kde-frameworks/ki18n-${KFMIN}:6
-		>=kde-frameworks/kservice-${KFMIN}:6
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] )
-"
-BDEPEND="
-	app-alternatives/lex
-	app-alternatives/yacc
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TOOLS_ONLY=$(usex !gui)
-		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
-	)
-	ecm_src_configure
-}
diff --git a/dev-libs/kosmindoormap/kosmindoormap-24.12.1.ebuild b/dev-libs/kosmindoormap/kosmindoormap-24.12.1.ebuild
new file mode 100644
index 000000000000..b8a26817ebff
--- /dev/null
+++ b/dev-libs/kosmindoormap/kosmindoormap-24.12.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
+HOMEPAGE="https://invent.kde.org/libraries/kosmindoormap"
+
+LICENSE="LGPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+gui"
+
+# kservice is optional and only used to find and open josm
+RDEPEND="
+	dev-libs/protobuf:=
+	>=dev-qt/qtbase-${QTMIN}:6[gui?,network]
+	sys-libs/zlib
+	gui? (
+		>=dev-libs/kopeninghours-${PVCUT}:6
+		>=dev-libs/kpublictransport-${PVCUT}:6
+		>=dev-qt/qtdeclarative-${QTMIN}:6
+		>=kde-frameworks/kcoreaddons-${KFMIN}:6
+		>=kde-frameworks/ki18n-${KFMIN}:6
+		>=kde-frameworks/kservice-${KFMIN}:6
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] )
+"
+BDEPEND="
+	app-alternatives/lex
+	app-alternatives/yacc
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TOOLS_ONLY=$(usex !gui)
+		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
+	)
+	ecm_src_configure
+}
diff --git a/dev-libs/kpathsea/kpathsea-6.4.0_p20240311.ebuild b/dev-libs/kpathsea/kpathsea-6.4.0_p20240311.ebuild
index abe68220b9d5..7968bb4df024 100644
--- a/dev-libs/kpathsea/kpathsea-6.4.0_p20240311.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.4.0_p20240311.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
@@ -20,7 +20,7 @@ S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
 LICENSE="LGPL-2.1"
 SLOT="0/${PV%_p*}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc source static-libs"
 
 TL_REVISION=72376
diff --git a/dev-libs/kpublictransport/Manifest b/dev-libs/kpublictransport/Manifest
index eed19398ae6a..67e7de509847 100644
--- a/dev-libs/kpublictransport/Manifest
+++ b/dev-libs/kpublictransport/Manifest
@@ -1,2 +1,2 @@
 DIST kpublictransport-24.08.3.tar.xz 744252 BLAKE2B 590da416055119224ebdaf2c14e8c45377910bf77097a9099b46707a03138179d80ba48363af9041ea630b11924699cd135318a22e9ca3ac359db0bdd9aa74c6 SHA512 04b9278119b071da3170504c3609b41d98d36853d34f81ac8995dad491056c120a8cfce79483cdcb78810ff31cb5dfb6c92147bf0feb163f1f4bd19775ae9243
-DIST kpublictransport-24.12.0.tar.xz 757532 BLAKE2B ed7fae7061c942890011b8d7d9fefcf543585dcc1af7abf5c0033cc52dd6fcad4e0a9190571d280bf71ffd6bd311b735b0eba5b6f48e5c7d7754362c6f9ca6e5 SHA512 b3348d9a8b0e4ee1d6ecff573563d6c5983968a6bbc487f1e829479f960f28324ef1deb27ea0f5bbb51ff85179bc74f525657cf3a464fd9ec357e939d6f82b05
+DIST kpublictransport-24.12.1.tar.xz 776512 BLAKE2B ff991da8e1babb68dc943e669632a0f4b6e28a1b8d53ca24c0ecf09e9065e246ced526047c0e30d3bbf8e378f14ae0a188a6302124f0db2c740b9d202fccfbe0 SHA512 c81ba13bca0df907484a4d2fce7ef9ae1fda8bb8684398a246fb0fdcf6272b76e4902d2e1a01c13f080b6a0ada870fddccbe362364a240a00158aa15cb150b62
diff --git a/dev-libs/kpublictransport/kpublictransport-24.12.0-r1.ebuild b/dev-libs/kpublictransport/kpublictransport-24.12.0-r1.ebuild
deleted file mode 100644
index 5f7144d67a63..000000000000
--- a/dev-libs/kpublictransport/kpublictransport-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for accessing public transport timetables and other information"
-HOMEPAGE="https://invent.kde.org/libraries/kpublictransport
-	https://www.volkerkrause.eu/2019/03/02/kpublictransport-introduction.html"
-
-LICENSE="LGPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="networkmanager"
-
-RDEPEND="
-	dev-libs/protobuf:=
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,ssl]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	sys-libs/zlib
-	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
-		$(cmake_use_find_package networkmanager KF6NetworkManagerQt)
-	)
-	ecm_src_configure
-}
diff --git a/dev-libs/kpublictransport/kpublictransport-24.12.1.ebuild b/dev-libs/kpublictransport/kpublictransport-24.12.1.ebuild
new file mode 100644
index 000000000000..edf5189f0a2d
--- /dev/null
+++ b/dev-libs/kpublictransport/kpublictransport-24.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for accessing public transport timetables and other information"
+HOMEPAGE="https://invent.kde.org/libraries/kpublictransport
+	https://www.volkerkrause.eu/2019/03/02/kpublictransport-introduction.html"
+
+LICENSE="LGPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="networkmanager"
+
+RDEPEND="
+	dev-libs/protobuf:=
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,ssl]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	sys-libs/zlib
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
+		$(cmake_use_find_package networkmanager KF6NetworkManagerQt)
+	)
+	ecm_src_configure
+}
diff --git a/dev-libs/kweathercore/Manifest b/dev-libs/kweathercore/Manifest
index 58435d021abc..78108be018d7 100644
--- a/dev-libs/kweathercore/Manifest
+++ b/dev-libs/kweathercore/Manifest
@@ -1,2 +1,2 @@
 DIST kweathercore-24.08.3.tar.xz 75416 BLAKE2B 1e61a17ae4d5ced5879af63975fcdcba3215a75ebe97fd2d616b92d7c7b8104423049371d3494b884b401c200b2fb441c74d164f24d7fa099bdbabfa728dc338 SHA512 a9b128e4e939c567f32e14a4401a7ab101e8364d8c9c0c0386f72f00d879748637aebcb8e45c5f75324555e2213bb21bb76bc368884d6f70f7057a5392c607ae
-DIST kweathercore-24.12.0.tar.xz 75788 BLAKE2B 89139b129be2b8dbff547e9f9c0bb2d465a89e9bb3ed663bc5f7137514f9bff7694a2259e2f2d40c0c4cf38753fedb65aec442b74e4d0d508b386e71be4fc467 SHA512 365ce0d4a89d1e83da14fb771e35e3a70264dfbc52f3b0ab4b65590de0f89151c639fb602aa14c0d0b0ed60fe66a6c98822df9e1d36488738a310961194ff327
+DIST kweathercore-24.12.1.tar.xz 75796 BLAKE2B 08af40e4a2459457149b51e301c18b1f349b55ba41a1270f56be914a34bb2a39d346a574aae93f2dc63ec9c1964ff4c5375f16e2d588d2c644d5acb666d71363 SHA512 04aea2f072725a8f850aca0b98c87e9605b46999a355e2590f251369054a512b358d032fedede71d057e9ec622136549eec05f0680d5acc93d67bf6f2ffdc32b
diff --git a/dev-libs/kweathercore/kweathercore-24.12.0.ebuild b/dev-libs/kweathercore/kweathercore-24.12.0.ebuild
deleted file mode 100644
index 84cb17ab0481..000000000000
--- a/dev-libs/kweathercore/kweathercore-24.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_NONGUI="true"
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for retrieval of weather information including forecasts and alerts"
-HOMEPAGE="https://invent.kde.org/libraries/kweathercore"
-
-LICENSE="LGPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[network]
-	>=dev-qt/qtpositioning-${QTMIN}:6
-	>=kde-frameworks/kholidays-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-
-CMAKE_SKIP_TESTS=(
-	locationquerytest
-	# bug 906392
-	metnoparsertest
-)
diff --git a/dev-libs/kweathercore/kweathercore-24.12.1.ebuild b/dev-libs/kweathercore/kweathercore-24.12.1.ebuild
new file mode 100644
index 000000000000..20744092c015
--- /dev/null
+++ b/dev-libs/kweathercore/kweathercore-24.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_NONGUI="true"
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for retrieval of weather information including forecasts and alerts"
+HOMEPAGE="https://invent.kde.org/libraries/kweathercore"
+
+LICENSE="LGPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[network]
+	>=dev-qt/qtpositioning-${QTMIN}:6
+	>=kde-frameworks/kholidays-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	locationquerytest
+	# bug 906392
+	metnoparsertest
+)
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index 9a280b1d61e3..bd23d3c40302 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -1 +1,2 @@
 DIST level-zero-1.19.2.tar.gz 891887 BLAKE2B 9f7fb43f36e3d67ed43110a7868572fccb3423401257b158f23f38dcbffddecdef1bd4147ac4b59c2b51eaa29f3dd5cac34f1639358806ea70b405923f9f4909 SHA512 45ce777712ed4dad766a4de6808acaf2588345907c6dc039c5c2f56076b6ecbd0cdcddae6c14531f3e8b6b261b7d4f0302f82ff629f98fc62f5b03cfeb633d2d
+DIST level-zero-1.20.1.tar.gz 900763 BLAKE2B 8b25db24dbf74dd499970a0f326bcc0ccb6e3cf93b0cce701efbcf4caf1571f4f743093427c4ae645a6d2904cde1606c6922a85fdc5f0f658f156054be9e2fb1 SHA512 09743eb45f37ffb824dfe837064e5d5a94563f1c45febe54578ca5e220a83a1c07bb06b83c0ea65e688d3dcac44eebb7dd9d3920c23993c6f789329d7fb90c08
diff --git a/dev-libs/level-zero/level-zero-1.20.1.ebuild b/dev-libs/level-zero/level-zero-1.20.1.ebuild
new file mode 100644
index 000000000000..7855ea438290
--- /dev/null
+++ b/dev-libs/level-zero/level-zero-1.20.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="oneAPI Level Zero headers, loader and validation layer"
+HOMEPAGE="https://github.com/oneapi-src/level-zero"
+SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/spdlog:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Don't hardcore -Werror
+	sed -e 's/-Werror//g' -i CMakeLists.txt || die
+
+	cmake_src_prepare
+
+	# According to upstream, release tarballs should contain this file but at least
+	# some of them do not. Fortunately it is trivial to make one ourselves.
+	echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSTEM_SPDLOG="ON"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libb64/libb64-2.0.0.1.ebuild b/dev-libs/libb64/libb64-2.0.0.1.ebuild
index 488d25f845a4..7be3021ab471 100644
--- a/dev-libs/libb64/libb64-2.0.0.1.ebuild
+++ b/dev-libs/libb64/libb64-2.0.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="
 LICENSE="CC-PD"
 # static library, so always rebuild
 SLOT="0/${PVR}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/dev-libs/libbpf/libbpf-1.4.5.ebuild b/dev-libs/libbpf/libbpf-1.4.5.ebuild
index a10ed8cffeed..b481220c5694 100644
--- a/dev-libs/libbpf/libbpf-1.4.5.ebuild
+++ b/dev-libs/libbpf/libbpf-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 S="${WORKDIR}/${P}/src"
 
diff --git a/dev-libs/libbpf/libbpf-1.5.0.ebuild b/dev-libs/libbpf/libbpf-1.5.0.ebuild
index 9ff1eb278ac1..85766b0dcb76 100644
--- a/dev-libs/libbpf/libbpf-1.5.0.ebuild
+++ b/dev-libs/libbpf/libbpf-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 S="${WORKDIR}/${P}/src"
 
diff --git a/dev-libs/libdex/Manifest b/dev-libs/libdex/Manifest
index cfaf8a8ff39f..59275a67c3d5 100644
--- a/dev-libs/libdex/Manifest
+++ b/dev-libs/libdex/Manifest
@@ -1,2 +1,2 @@
-DIST libdex-0.4.3.tar.xz 96820 BLAKE2B 51f6c9a209d8ff19d7e97f4d8cbc9065739f08c555712076c9b6f4d345d56522f31afa1b8dffe8da2cfc128d368d7dc5f6a93757f0fe5cfd0a55de17587d776e SHA512 26691373d560d20cefa3a23e31677259b234cdf623b17b8fb2b6976b03768e86e458d2670aa3b260638b595994f278240e972bf3ff5b765013fb6d3114f46cef
 DIST libdex-0.6.1.tar.xz 99056 BLAKE2B 3899f89ac652c2790c93e2799a5b0d066c45ee314c6f773bb586e49c89a8a78e6a09ebf08263b88b25900a15ac736d2bd37590720e0ac0e074581342534eaba3 SHA512 36be15d2da9edeae195abcb6f97639dd7fdea74463cdfdf752293007e44ab41a5e5350a7005883f202d70f96047567fba6370f1a2c45a0f898c242bebc88e847
+DIST libdex-0.8.1.tar.xz 99480 BLAKE2B 2a10a9a134cdb2017b6136a54e484f6fd2bb9329957f4d3f205edabdbcbb659f3a1c97a2b1a1c61a06f253a85733500b9475eebd8554e9af5cb0abcec232052d SHA512 fc3f4d81b3a3e5c87758b2f706dc02c558becafc489c620ca491ca3b658f4c00cbc48886c6f5271e7308c4d7255610ec7ece1ad77308b5fac6088402a96543e0
diff --git a/dev-libs/libdex/libdex-0.4.3.ebuild b/dev-libs/libdex/libdex-0.4.3.ebuild
deleted file mode 100644
index 93a7becd291c..000000000000
--- a/dev-libs/libdex/libdex-0.4.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org linux-info meson vala
-
-DESCRIPTION="Deferred Execution library for GNOME and GTK"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libdex"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-IUSE="+eventfd gtk-doc +introspection +liburing sysprof test vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.68:2
-	liburing? ( >=sys-libs/liburing-0.7:= )
-	introspection? ( dev-libs/gobject-introspection:= )
-	sysprof? ( dev-util/sysprof-capture:4 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gi-docgen )
-"
-
-pkg_setup() {
-	if use eventfd && linux_config_exists; then
-		if ! linux_chkconfig_present EVENTFD ; then
-			ewarn "CONFIG_EVENTFD must be enabled for USE=eventfd"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	use vala && vala_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dexamples=false
-		$(meson_use vala vapi)
-		$(meson_feature introspection)
-		$(meson_use sysprof)
-		$(meson_use test tests)
-		$(meson_feature liburing)
-		$(meson_feature eventfd)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/${PN}-1 "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-}
diff --git a/dev-libs/libdex/libdex-0.8.1.ebuild b/dev-libs/libdex/libdex-0.8.1.ebuild
new file mode 100644
index 000000000000..bee830cf5288
--- /dev/null
+++ b/dev-libs/libdex/libdex-0.8.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org linux-info meson vala
+
+DESCRIPTION="Dex provides Future-based programming for GLib-based applications"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libdex"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="+eventfd gtk-doc +introspection +liburing sysprof test vala"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.68:2
+	liburing? ( >=sys-libs/liburing-0.7:= )
+	introspection? ( dev-libs/gobject-introspection:= )
+	sysprof? ( dev-util/sysprof-capture:4 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	vala? ( $(vala_depend) )
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gi-docgen )
+"
+
+pkg_setup() {
+	if use eventfd && linux_config_exists; then
+		if ! linux_chkconfig_present EVENTFD ; then
+			ewarn "CONFIG_EVENTFD must be enabled for USE=eventfd"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dexamples=false
+		$(meson_use vala vapi)
+		$(meson_feature introspection)
+		$(meson_use sysprof)
+		$(meson_use test tests)
+		$(meson_feature liburing)
+		$(meson_feature eventfd)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/${PN}-1 "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
diff --git a/dev-libs/libei/Manifest b/dev-libs/libei/Manifest
index 8fd924055976..650dce5bd837 100644
--- a/dev-libs/libei/Manifest
+++ b/dev-libs/libei/Manifest
@@ -1,3 +1,2 @@
-DIST libei-1.2.1.tar.bz2 174636 BLAKE2B b718d2287e83adb43a8dee9ae06499d780b2a50231e9ce452b6e7bfa9e89e9599058628614fb4325d0cef842d6b29ca68eb38b3e547790cd5a7a0ac14728f250 SHA512 ac8e32a381b9555a6b9becab9217a323d79aeba4b3f11e1dbba9f876d566f232f41d0f299f8cb8e5de6707d0dd91e93872edd81532c971e35d1cf33f9f9063b4
 DIST libei-1.3.0.tar.bz2 175492 BLAKE2B cc5b0ae228a7282e0b5890280cab15cbb4c9179aa40140d6d01dc0d650bc1a646efd3d07dc6db0b501c3d203480d2df2bf3107e8b07e13b49eef8dcea59dd011 SHA512 a63b52c7251660404b307dba82ee24e31b64aaff7140acb174a33aeb60a07e59391522e2a5c56cd7bbdc45ab5e4a0e6111e214f2f1b79834b152e6ebc3e5e0c1
 DIST munit-fbbdf1467eb0d04a6ee465def2e529e4c87f2118.tar.gz 27724 BLAKE2B 9670c9b7a0b5d9ee6ec8df2dea9e241b043964ecf1fa3f6060ad1d16c40ab6afe47f53c6d4a791003e101a0b363263b858e6e4e445f868292753dd1ee7f7e3ce SHA512 26b5599fd12be627a692823ebf496fa446be7ed04a1233fb42e0667c05109b0f804f76646e289ac660fc815baf45f77ec8caf0ff2ea7fb0b4f87f0038a2b971c
diff --git a/dev-libs/libei/libei-1.2.1.ebuild b/dev-libs/libei/libei-1.2.1.ebuild
deleted file mode 100644
index e879c4cb2627..000000000000
--- a/dev-libs/libei/libei-1.2.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit meson python-any-r1
-
-DESCRIPTION="Library for Emulated Input, primarily aimed at the Wayland stack"
-HOMEPAGE="https://gitlab.freedesktop.org/libinput/libei"
-SRC_URI="https://gitlab.freedesktop.org/libinput/${PN}/-/archive/${PV}/${P}.tar.bz2"
-MUNIT_COMMIT="fbbdf1467eb0d04a6ee465def2e529e4c87f2118"
-SRC_URI+=" https://github.com/nemequ/munit/archive/${MUNIT_COMMIT}.tar.gz -> munit-${MUNIT_COMMIT}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="elogind systemd test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libevdev-1.9.902
-	|| (
-		systemd? ( >=sys-apps/systemd-237 )
-		elogind? ( >=sys-auth/elogind-237 )
-		sys-libs/basu
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	$(python_gen_any_dep '
-		dev-python/attrs[${PYTHON_USEDEP}]
-		dev-python/jinja2[${PYTHON_USEDEP}]
-	')
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			dev-python/structlog[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	if use test; then
-		python_has_version \
-			"dev-python/pytest[${PYTHON_USEDEP}]" \
-			"dev-python/python-dbusmock[${PYTHON_USEDEP}]" \
-			"dev-python/pyyaml[${PYTHON_USEDEP}]" \
-			"dev-python/structlog[${PYTHON_USEDEP}]" \
-			|| return 1
-	fi
-	python_has_version \
-		"dev-python/attrs[${PYTHON_USEDEP}]" \
-		"dev-python/jinja2[${PYTHON_USEDEP}]" \
-		|| return 1
-}
-
-src_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-		mv "${WORKDIR}"/munit-${MUNIT_COMMIT} "${WORKDIR}"/${P}/subprojects/munit || die
-		rm "${WORKDIR}"/${P}/subprojects/munit.wrap || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e 's:^valgrind = .*:valgrind = disabler():g' test/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=""
-		-Dliboeffis=enabled
-		$(meson_feature test tests)
-	)
-	if use systemd; then
-		emesonargs+=(-Dsd-bus-provider=libsystemd)
-	elif use elogind; then
-		emesonargs+=(-Dsd-bus-provider=libelogind)
-	else
-		emesonargs+=(-Dsd-bus-provider=basu)
-	fi
-	meson_src_configure
-}
-
-src_test() {
-	# bug #916777
-	meson_src_test --no-suite sigalrm --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# munit subproject is installed but not wanted
-	if use test; then
-		rm "${ED}"/usr/lib*/libmunit.so || die
-	fi
-}
diff --git a/dev-libs/libei/libei-1.3.0.ebuild b/dev-libs/libei/libei-1.3.0.ebuild
deleted file mode 100644
index 3e4ed19e4764..000000000000
--- a/dev-libs/libei/libei-1.3.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit meson python-any-r1
-
-DESCRIPTION="Library for Emulated Input, primarily aimed at the Wayland stack"
-HOMEPAGE="https://gitlab.freedesktop.org/libinput/libei"
-SRC_URI="https://gitlab.freedesktop.org/libinput/${PN}/-/archive/${PV}/${P}.tar.bz2"
-MUNIT_COMMIT="fbbdf1467eb0d04a6ee465def2e529e4c87f2118"
-SRC_URI+=" https://github.com/nemequ/munit/archive/${MUNIT_COMMIT}.tar.gz -> munit-${MUNIT_COMMIT}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="elogind systemd test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libevdev-1.9.902
-	|| (
-		systemd? ( >=sys-apps/systemd-237 )
-		elogind? ( >=sys-auth/elogind-237 )
-		sys-libs/basu
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	$(python_gen_any_dep '
-		dev-python/attrs[${PYTHON_USEDEP}]
-		dev-python/jinja2[${PYTHON_USEDEP}]
-	')
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			dev-python/structlog[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/1.3.0-skip-protocol-test.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version \
-			"dev-python/pytest[${PYTHON_USEDEP}]" \
-			"dev-python/python-dbusmock[${PYTHON_USEDEP}]" \
-			"dev-python/pyyaml[${PYTHON_USEDEP}]" \
-			"dev-python/structlog[${PYTHON_USEDEP}]" \
-			|| return 1
-	fi
-	python_has_version \
-		"dev-python/attrs[${PYTHON_USEDEP}]" \
-		"dev-python/jinja2[${PYTHON_USEDEP}]" \
-		|| return 1
-}
-
-src_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-		mv "${WORKDIR}"/munit-${MUNIT_COMMIT} "${WORKDIR}"/${P}/subprojects/munit || die
-		rm "${WORKDIR}"/${P}/subprojects/munit.wrap || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e 's:^valgrind = .*:valgrind = disabler():g' test/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=""
-		-Dliboeffis=enabled
-		$(meson_feature test tests)
-	)
-	if use systemd; then
-		emesonargs+=(-Dsd-bus-provider=libsystemd)
-	elif use elogind; then
-		emesonargs+=(-Dsd-bus-provider=libelogind)
-	else
-		emesonargs+=(-Dsd-bus-provider=basu)
-	fi
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# munit subproject is installed but not wanted
-	if use test; then
-		rm "${ED}"/usr/lib*/libmunit.so || die
-	fi
-}
diff --git a/dev-libs/libevent/libevent-2.2.1-r2.ebuild b/dev-libs/libevent/libevent-2.2.1-r2.ebuild
deleted file mode 100644
index 64aa2bd59b5c..000000000000
--- a/dev-libs/libevent/libevent-2.2.1-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal verify-sig
-
-MY_P="${P}-alpha-dev"
-DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
-HOMEPAGE="
-	https://libevent.org/
-	https://github.com/libevent/libevent/
-"
-BASE_URI="https://github.com/libevent/libevent/releases/download/release-${PV}-alpha"
-SRC_URI="
-	${BASE_URI}/${MY_P}.tar.gz
-	verify-sig? (
-		${BASE_URI}/${MY_P}.tar.gz.asc
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0/2.2.1-r2"
-KEYWORDS=""
-IUSE="
-	+clock-gettime debug malloc-replacement mbedtls +ssl static-libs
-	test verbose-debug
-"
-# TODO: hangs
-RESTRICT="test"
-
-DEPEND="
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	ssl? ( >=dev-libs/openssl-1.0.1h-r2:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	verify-sig? (
-		sec-keys/openpgp-keys-libevent
-	)
-"
-
-DOCS=( README.md ChangeLog{,-1.4,-2.0} whatsnew-2.{0,1}.txt )
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/event2/event-config.h
-)
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libevent.asc
-
-PATCHES=(
-	# signalfd-by-default breaks at least app-misc/tmux
-	# https://github.com/libevent/libevent/pull/1486
-	"${FILESDIR}/${P}-disable-signalfd.patch"
-)
-
-multilib_src_configure() {
-	# fix out-of-source builds
-	mkdir -p test || die
-
-	local ECONF_SOURCE="${S}"
-	local myconf=(
-		$(use_enable clock-gettime)
-		$(use_enable debug debug-mode)
-		$(use_enable malloc-replacement malloc-replacement)
-		$(use_enable mbedtls)
-		$(use_enable ssl openssl)
-		$(use_enable static-libs static)
-		$(use_enable test libevent-regress)
-		$(use_enable verbose-debug)
-		--disable-samples
-	)
-	econf "${myconf[@]}"
-
-	# workaround https://github.com/libevent/libevent/issues/1459
-	sed -i -e 's:@CMAKE_DEBUG_POSTFIX@::' *.pc || die
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libevent/libevent-2.2.1-r3.ebuild b/dev-libs/libevent/libevent-2.2.1-r3.ebuild
new file mode 100644
index 000000000000..16f66939a1f7
--- /dev/null
+++ b/dev-libs/libevent/libevent-2.2.1-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal verify-sig
+
+MY_P="${P}-alpha-dev"
+DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
+HOMEPAGE="
+	https://libevent.org/
+	https://github.com/libevent/libevent/
+"
+BASE_URI="https://github.com/libevent/libevent/releases/download/release-${PV}-alpha"
+SRC_URI="
+	${BASE_URI}/${MY_P}.tar.gz
+	verify-sig? (
+		${BASE_URI}/${MY_P}.tar.gz.asc
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0/2.2.1-r2"
+KEYWORDS=""
+IUSE="
+	+clock-gettime debug malloc-replacement mbedtls +ssl static-libs
+	test verbose-debug
+"
+# TODO: hangs
+RESTRICT="test"
+
+DEPEND="
+	mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
+	ssl? ( >=dev-libs/openssl-1.0.1h-r2:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	verify-sig? (
+		sec-keys/openpgp-keys-libevent
+	)
+"
+
+DOCS=( README.md ChangeLog{,-1.4,-2.0} whatsnew-2.{0,1}.txt )
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/event2/event-config.h
+)
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libevent.asc
+
+PATCHES=(
+	# signalfd-by-default breaks at least app-misc/tmux
+	# https://github.com/libevent/libevent/pull/1486
+	"${FILESDIR}/${P}-disable-signalfd.patch"
+)
+
+multilib_src_configure() {
+	# fix out-of-source builds
+	mkdir -p test || die
+
+	local ECONF_SOURCE="${S}"
+	local myconf=(
+		$(use_enable clock-gettime)
+		$(use_enable debug debug-mode)
+		$(use_enable malloc-replacement malloc-replacement)
+		$(use_enable mbedtls)
+		$(use_enable ssl openssl)
+		$(use_enable static-libs static)
+		$(use_enable test libevent-regress)
+		$(use_enable verbose-debug)
+		--disable-samples
+	)
+	econf "${myconf[@]}"
+
+	# workaround https://github.com/libevent/libevent/issues/1459
+	sed -i -e 's:@CMAKE_DEBUG_POSTFIX@::' *.pc || die
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-9999.ebuild
index 471fb8418bef..cf26212e3cb4 100644
--- a/dev-libs/libevent/libevent-9999.ebuild
+++ b/dev-libs/libevent/libevent-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ IUSE="
 RESTRICT="test"
 
 DEPEND="
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
 	ssl? ( >=dev-libs/openssl-1.0.1h-r2:=[${MULTILIB_USEDEP}] )
 "
 RDEPEND="
diff --git a/dev-libs/libffi/libffi-3.4.6-r2.ebuild b/dev-libs/libffi/libffi-3.4.6-r2.ebuild
index 61fa9d5ad843..689780e01215 100644
--- a/dev-libs/libffi/libffi-3.4.6-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.4.6-r2.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
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 
-	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
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-libs/libfido2/libfido2-1.15.0-r1.ebuild b/dev-libs/libfido2/libfido2-1.15.0-r1.ebuild
index c33060a63e10..6575ed1c2e7a 100644
--- a/dev-libs/libfido2/libfido2-1.15.0-r1.ebuild
+++ b/dev-libs/libfido2/libfido2-1.15.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-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/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="hidapi nfc smartcard static-libs"
 
 DEPEND="
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index b961f7532e8c..1213d19485a6 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -1,5 +1,5 @@
 DIST libfmt-10.1.1.tar.gz 851454 BLAKE2B 8b1237e6de72e81ebf2ad8d3c321b6ae9352bfeeb817d2e7f4541a722cd7ecc9212a2b83276fa0aa901473e1b90a15f487feefb3ea03acdcabdfe6b6f22997a1 SHA512 288c349baac5f96f527d5b1bed0fa5f031aa509b4526560c684281388e91909a280c3262a2474d963b5d1bf7064b1c9930c6677fe54a0d8f86982d063296a54c
 DIST libfmt-10.2.1.tar.gz 854665 BLAKE2B 7bef719aa99464b5cb608c81ca78e23f3aed81cadfa9ed65246c4983a98f0cadb27983d42929ab4e0b5e264673e38d7658a4f7d5171e624b2431b3c6327071d9 SHA512 27df90c681ec37e55625062a79e3b83589b6d7e94eff37a3b412bb8c1473f757a8adb727603acc9185c3490628269216843b7d7bd5a3cb37f0029da5d1495ffa
 DIST libfmt-11.0.2.tar.gz 700956 BLAKE2B c1f7998e68770bbb93ab7211a18b4930727699b340b2f2e15dedc83e55ff02400cfd363abaec1bf63a0165f8c21cc515a4aa23c4f3bc2e65b6fbc041781f0379 SHA512 47ff6d289dcc22681eea6da465b0348172921e7cafff8fd57a1540d3232cc6b53250a4625c954ee0944c87963b17680ecbc3ea123e43c2c822efe0dc6fa6cef3
-DIST libfmt-11.1.1.tar.gz 701999 BLAKE2B 1641265c8e54955ad0d005f935a87dccd2ce0987872925381799a8359b7966ce9cc6ae154a3e5c8059fb8e0e537f37a11592c3fc63b3ba2999c5012f33cef7fd SHA512 d6b0a28cd72328cf324b9e4e14a23e6c35c6e4f0f2724a85427853fc50850578ebffd256d49743ffcad2eb8b422291d0f0c72d0ef0ca2da5d62200a63ba65b27
+DIST libfmt-11.1.2.tar.gz 702448 BLAKE2B cd187ec11d9fc4c7a4995f5264e21c8519aca89827400777641026e90f3a5fdfa04b5a16bcb03689416591ed97194ddc900238c19ca7c91bbb9b36fe5afdb3c4 SHA512 97570686251e9122fd49a869c0be2340b5a32917f5e184bc55fde565fe06d5bd6a2f95fc7d8ea09f0a847d65482d3524bfe478aee3b82bbdc6d3af094ee3815f
 DIST libfmt-9.1.0.tar.gz 837901 BLAKE2B ff1daa43140615b63aeb1ecd0aa1c32d24decfd5006805080293ef3db04d544c0445a30e8da0d985a6f5a25ad48ce4f6ae61e52da5ea4a4d3b031c212da38b18 SHA512 a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be
diff --git a/dev-libs/libfmt/libfmt-11.0.2.ebuild b/dev-libs/libfmt/libfmt-11.0.2.ebuild
index da45c0e71554..e889642820b6 100644
--- a/dev-libs/libfmt/libfmt-11.0.2.ebuild
+++ b/dev-libs/libfmt/libfmt-11.0.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
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 hppa ~loong ppc ppc64 ~riscv x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libfmt/libfmt-11.1.1.ebuild b/dev-libs/libfmt/libfmt-11.1.1.ebuild
deleted file mode 100644
index da45c0e71554..000000000000
--- a/dev-libs/libfmt/libfmt-11.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	append-lfs-flags
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-11.1.2.ebuild b/dev-libs/libfmt/libfmt-11.1.2.ebuild
new file mode 100644
index 000000000000..08b4876431fd
--- /dev/null
+++ b/dev-libs/libfmt/libfmt-11.1.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="Small, safe and fast formatting library"
+HOMEPAGE="https://github.com/fmtlib/fmt"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/fmt-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	append-lfs-flags
+	local mycmakeargs=(
+		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
+		-DFMT_LIB_DIR="$(get_libdir)"
+		-DFMT_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libgit2/libgit2-1.8.4.ebuild b/dev-libs/libgit2/libgit2-1.8.4.ebuild
index 6fd39616baa4..3a6f70228408 100644
--- a/dev-libs/libgit2/libgit2-1.8.4.ebuild
+++ b/dev-libs/libgit2/libgit2-1.8.4.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
@@ -16,7 +16,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgit2/libgit2-1.9.0.ebuild b/dev-libs/libgit2/libgit2-1.9.0.ebuild
index 2633d8d6db71..e67a9617a728 100644
--- a/dev-libs/libgit2/libgit2-1.9.0.ebuild
+++ b/dev-libs/libgit2/libgit2-1.9.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
@@ -16,7 +16,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgpg-error/libgpg-error-1.51.ebuild b/dev-libs/libgpg-error/libgpg-error-1.51.ebuild
index 1ef943033047..4df32d38ae33 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.51.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.51.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
@@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-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"
 IUSE="common-lisp nls static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 3cd57c8e58d1..68091e48728c 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1 +1,2 @@
 DIST libical-3.0.18.tar.gz 908948 BLAKE2B 0d3a665bce64752bbb1d28afea708643e6f52f19d5e5eae576aac40b720661e5c9593ff1e5ae48ef9a6c1b54259a7848847817ae669bbc8ef6b34bf1c7d90ee6 SHA512 53ecf6c14a68d569dd11bfdeb1a072def847a14d189c6af16eab202e004350ee7d9488c6b63e9cb67889e8c2dec90643fef46aec143a915f28270d0752eaa9d5
+DIST libical-3.0.19.tar.gz 973744 BLAKE2B d3a8bc71cbef7014db23358b523691de7f32c071d5d978c79e94b7f21c4776bc9f88bd39df5ba552ce6e8e0f86beda13bbd14a73a11f21b1f45e020d2a15bb53 SHA512 32e5cac219801b40d8691deae6efae6fdaa64ca0968a72af5b27647958d44d79626c26c4e3675cfb284c2f1039c237c61ba2dd6030e9b1ea6a9d69296424240d
diff --git a/dev-libs/libical/libical-3.0.19.ebuild b/dev-libs/libical/libical-3.0.19.ebuild
new file mode 100644
index 000000000000..1ffc77e1b830
--- /dev/null
+++ b/dev-libs/libical/libical-3.0.19.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+VALA_USE_DEPEND="vapigen"
+inherit cmake python-any-r1 vala
+
+DESCRIPTION="Implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc examples +glib +introspection static-libs test vala"
+
+REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/icu:=
+	glib? ( dev-libs/glib:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	glib? ( dev-libs/libxml2:2 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-libs/timezone-data
+"
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen[dot]
+		glib? ( dev-util/gtk-doc )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	test? (
+		${PYTHON_DEPS}
+		glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') )
+	)
+	vala? ( $(vala_depend) )
+"
+
+DOCS=(
+	AUTHORS README.md ReleaseNotes.txt TEST THANKS TODO
+	doc/{AddingOrModifyingComponents.txt,UsingLibical.md}
+)
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.11-pkgconfig-libdir.patch" )
+
+python_check_deps() {
+	python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	use vala && vala_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_BerkeleyDB=ON
+		-DICAL_BUILD_DOCS=$(usex doc)
+		-DLIBICAL_BUILD_EXAMPLES=$(use examples)
+		-DICAL_GLIB=$(usex glib)
+		-DGOBJECT_INTROSPECTION=$(usex introspection)
+		-DSHARED_ONLY=$(usex !static-libs)
+		-DLIBICAL_BUILD_TESTING=$(usex test)
+		-DICAL_GLIB_VAPI=$(usex vala)
+	)
+	if use vala; then
+		mycmakeargs+=(
+			-DVALAC="${VALAC}"
+			-DVAPIGEN="${VAPIGEN}"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		cmake_src_compile docs
+
+		HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+	fi
+}
+
+src_test() {
+	local myctestargs=(
+		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		rm examples/CMakeLists.txt || die
+		dodoc -r examples
+	fi
+}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 055483dfd1a9..5748f08fc541 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,2 +1,3 @@
 DIST libinput-1.26.2.tar.bz2 824312 BLAKE2B df463f377cf2f246f6b5b35bdc69039830b4eb5b836a8df9698330140b1bc4b31c7dd50d8ffdec7c935e8b14909d98436ce8f1f9a6d0120e4b72f29381f9b697 SHA512 51fab62e1bfb6007287e1219bf458a351806ce685e6e7ba5360062c863f0811da75acc6ec92aef7f9e0556dac0413fbe43a4744885f7449e38036130112907a6
 DIST libinput-1.27.0.tar.bz2 843722 BLAKE2B 342166bc48943a65e70be274a4b946769b27029b8d3014b081f268537c7bbdf5c7e9be5e2c2b547e1433e444c9e5b2994a4d03f7894afe15b923ba09cd58d490 SHA512 ddfb4a16cbd40f8e55a536f8e18e77bb26113690bd4188d2e6ea04c1a906d8392d4df340d4e24f20c5152b3ef7d727702229a86fc27ad50c5ea9a85a58d3e24a
+DIST libinput-1.27.1.tar.bz2 844741 BLAKE2B 816977ea6fdc84c160523ad574801f818cdf9f8da5b0ebe30e04a71c2d1ebd15e1530cacf4d56893ef3e23fa14cd7bcd25b6ce6661adf291e8d7a9d4ab2b7752 SHA512 c8312000d7ce8c6f209b233177358c53dc830769cf2a80bd23ceebb408a0371de668846a5d1321b6ef803b3c17af5c0aba941ce5a2dc1fac6a0d5d791a13088b
diff --git a/dev-libs/libinput/libinput-1.27.0.ebuild b/dev-libs/libinput/libinput-1.27.0.ebuild
index ca9af35486aa..c1dd8bf559e9 100644
--- a/dev-libs/libinput/libinput-1.27.0.ebuild
+++ b/dev-libs/libinput/libinput-1.27.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2024 Gentoo Authors
+# Copyright 2014-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2
 LICENSE="MIT"
 SLOT="0/10"
 if [[ $(ver_cut 3) -lt 900 ]] ; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libinput/libinput-1.27.1.ebuild b/dev-libs/libinput/libinput-1.27.1.ebuild
new file mode 100644
index 000000000000..3b150a3add3f
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.27.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2014-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit meson optfeature python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0/10"
+if [[ $(ver_cut 3) -lt 900 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+IUSE="doc input_devices_wacom test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.27:= )
+	>=dev-libs/libevdev-1.9.902
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-libs/check-0.9.10 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx-rtd-theme-0.2.4[${PYTHON_USEDEP}]
+		')
+		>=app-text/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		')
+	)
+"
+#	test? ( dev-debug/valgrind )
+
+python_check_deps() {
+	if use doc; then
+		python_has_version \
+			"dev-python/commonmark[${PYTHON_USEDEP}]" \
+			"dev-python/recommonmark[${PYTHON_USEDEP}]" \
+			"dev-python/sphinx[${PYTHON_USEDEP}]" \
+			">=dev-python/sphinx-rtd-theme-0.2.4[${PYTHON_USEDEP}]" \
+		|| return
+	fi
+	if use test; then
+		python_has_version \
+			"dev-python/pytest[${PYTHON_USEDEP}]" \
+			"dev-python/pytest-xdist[${PYTHON_USEDEP}]" \
+		|| return
+	fi
+}
+
+src_prepare() {
+	default
+	sed "s@, '-Werror'@@" -i meson.build || die #744250
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		$(meson_use test tests)
+		-Dudev-dir="${EPREFIX}$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	optfeature "measure and replay tools" dev-python/libevdev
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-libs/libltdl/libltdl-2.5.4.ebuild b/dev-libs/libltdl/libltdl-2.5.4.ebuild
index b367c10d5e46..93790c2c82bb 100644
--- a/dev-libs/libltdl/libltdl-2.5.4.ebuild
+++ b/dev-libs/libltdl/libltdl-2.5.4.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 @@ if false && ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
 	SRC_URI="https://alpha.gnu.org/gnu/libtool/${MY_P}.tar.xz"
 else
 	SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
-	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
 
 S="${WORKDIR}"/${MY_P}/libltdl
diff --git a/dev-libs/libmcfp/libmcfp-1.2.3.ebuild b/dev-libs/libmcfp/libmcfp-1.2.3.ebuild
index 39c57dc4f1bf..968609febe62 100644
--- a/dev-libs/libmcfp/libmcfp-1.2.3.ebuild
+++ b/dev-libs/libmcfp/libmcfp-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mhekkel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
index 1b16340f2594..19564016a043 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-r4.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="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug hsieh +libevent sasl"
 # https://bugs.gentoo.org/498250
 # https://bugs.launchpad.net/gentoo/+bug/1278023
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 2a74fd84ee65..1baae32e7e37 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,2 +1 @@
-DIST libmspack-0.10.1alpha.tar.gz 963274 BLAKE2B 39bcb3b7ea419d6d00850b70c217c802a2095dd4398038e594ae7c01ca12e71508218c1cfca5ae8b102636ab9517b13d55c1e411b31e87d28aa46331cd0127e6 SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245
 DIST libmspack-1.11.tar.gz 408982 BLAKE2B fd0c197cf222effa79366e7a763765c7a7eabf7a71319d0544a525b8062ea0ad64291351b2a285c5f3b6d7059a54fd60f20f75b019040d138ae8204fb426397e SHA512 f53a253375584d815ba9249bf36b5f08906c37d7ac7fc9e44040ec5600380f830b2e6774e4493d6fa8024409ae9cf8afe782da52fc8f670debe3aaa4ae6b7306
diff --git a/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild b/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild
deleted file mode 100644
index c18e97198694..000000000000
--- a/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/kyz/libmspack.git"
-	inherit git-r3
-	MY_P="${PN}-9999"
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-	MY_PV="${PV/_alpha/alpha}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
-fi
-
-DESCRIPTION="A library for Microsoft compression formats"
-HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="debug doc"
-
-src_prepare() {
-	if [[ ${PV} == *9999 ]] ; then
-		# Re-create file layout from release tarball
-		pushd "${WORKDIR}" > /dev/null || die
-
-		cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die
-		rm -r "${S}" || die
-		mv "${WORKDIR}"/${PN}-source "${S}" || die
-
-		popd > /dev/null || die
-	fi
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_test() {
-	default
-
-	cd "${S}"/test || die
-	./cabd_test || die
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/. )
-
-	default
-
-	if use doc ; then
-		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-	find "${ED}" -name "*.a" -delete || die
-}
diff --git a/dev-libs/libmspack/libmspack-1.11.ebuild b/dev-libs/libmspack/libmspack-1.11.ebuild
index 8ae48497d8f2..5256d180a6dd 100644
--- a/dev-libs/libmspack/libmspack-1.11.ebuild
+++ b/dev-libs/libmspack/libmspack-1.11.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
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/kyz/libmspack.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	SRC_URI="https://github.com/kyz/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-libs/libratbag/Manifest b/dev-libs/libratbag/Manifest
index 619b6ab36a94..41d06358c506 100644
--- a/dev-libs/libratbag/Manifest
+++ b/dev-libs/libratbag/Manifest
@@ -1 +1,2 @@
 DIST libratbag-0.17.tar.gz 279273 BLAKE2B 7252afc8bca5d95c24d61dbd68c4e486550df7d6d9fa74a8c9d2a58c6363ed2ee289c0d02cdd72c968618f5c08a0687c97836dd2c47b457ba4228f4716b50cb9 SHA512 80ab5c895d83e28b6b6adcd0669854944d7932ef037c8d64b923a7362399e861475e9d81c5ee2cf814f654d7796b00a81314cc177f34e13c8684d525974068c8
+DIST libratbag-0.18.tar.gz 296737 BLAKE2B db691af43b3d2aeafcb31cdb4ce41504dd37a7a0a5a6d97bf2a3bee6840bbe49de25351990787436bc00a0dc80f5a20e31030069aa58ea8e38c7cad1029e39f8 SHA512 ae1796d738f7e448c6022c56cb876af5fb43e29b89fef31bbf42b9c838a07fd1d6cf94815dfde87dcd94a72bae159ca14624826b75cf83c988ba4c20340031cb
diff --git a/dev-libs/libratbag/files/ratbagd.init-r1 b/dev-libs/libratbag/files/ratbagd.init-r1
new file mode 100644
index 000000000000..b92c22b55deb
--- /dev/null
+++ b/dev-libs/libratbag/files/ratbagd.init-r1
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="system daemon to introspect and modify configurable mice"
+pidfile="/run/${SVCNAME}.pid"
+command="/usr/sbin/ratbagd"
+start_stop_daemon_args="--quiet"
+command_background="true"
+
+depend() {
+	need dbus
+}
diff --git a/dev-libs/libratbag/libratbag-0.17-r1.ebuild b/dev-libs/libratbag/libratbag-0.17-r1.ebuild
deleted file mode 100644
index e1cf833f0ff6..000000000000
--- a/dev-libs/libratbag/libratbag-0.17-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit meson python-single-r1 systemd udev
-
-DESCRIPTION="Library to configure gaming mice"
-HOMEPAGE="https://github.com/libratbag/libratbag"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/libratbag/libratbag.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc elogind systemd test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	^^ ( elogind systemd )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/swig
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		dev-libs/check
-		dev-libs/gobject-introspection
-		dev-debug/valgrind
-		$(python_gen_cond_dep '
-			dev-python/evdev[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	acct-group/plugdev
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libevdev
-	dev-libs/libunistring:=
-	virtual/libudev:=
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/evdev[${PYTHON_USEDEP}]
-	')
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/gobject-introspection
-"
-
-src_prepare() {
-	default
-
-	if use elogind ; then
-		# Fix systemd includes for elogind
-		sed -i -e 's@include <systemd@include <elogind@' \
-			ratbagd/ratbag*.c || die
-	fi
-}
-
-src_configure() {
-	python_setup
-
-	local emesonargs=(
-		$(meson_use doc documentation)
-		$(meson_use systemd)
-		$(meson_use test tests)
-		-Ddbus-group="plugdev"
-		-Dlogind-provider=$(usex elogind elogind systemd)
-		-Dsystemd-unit-dir="$(systemd_get_systemunitdir)"
-		-Dudev-dir="${EPREFIX}$(get_udevdir)"
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-	newinitd "${FILESDIR}"/ratbagd.init ratbagd
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog 'You need to be in "plugdev" group in order to access the'
-		elog 'ratbagd dbus interface'
-	fi
-	elog 'You may be required to create and/or be part of the "games" group if you intend on using piper'
-}
diff --git a/dev-libs/libratbag/libratbag-0.17-r2.ebuild b/dev-libs/libratbag/libratbag-0.17-r2.ebuild
index 7620f30d382d..052a4ed12603 100644
--- a/dev-libs/libratbag/libratbag-0.17-r2.ebuild
+++ b/dev-libs/libratbag/libratbag-0.17-r2.ebuild
@@ -1,11 +1,11 @@
-# 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} )
 
-inherit meson python-single-r1 systemd udev
+inherit linux-info meson python-single-r1 systemd udev
 
 DESCRIPTION="Library to configure gaming mice"
 HOMEPAGE="https://github.com/libratbag/libratbag"
@@ -67,10 +67,17 @@ DEPEND="
 	dev-libs/gobject-introspection
 "
 
+CONFIG_CHECK="~HIDRAW"
+
 PATCHES=(
 	"${FILESDIR}"/libratbag-0.17-python3.12-imp.patch
 )
 
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	default
 
diff --git a/dev-libs/libratbag/libratbag-0.18.ebuild b/dev-libs/libratbag/libratbag-0.18.ebuild
new file mode 100644
index 000000000000..9f30a435f111
--- /dev/null
+++ b/dev-libs/libratbag/libratbag-0.18.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit linux-info meson python-single-r1 systemd udev
+
+DESCRIPTION="Library to configure gaming mice"
+HOMEPAGE="https://github.com/libratbag/libratbag"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/libratbag/libratbag.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc elogind systemd test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	^^ ( elogind systemd )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/swig
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		dev-libs/check
+		dev-libs/gobject-introspection
+		dev-debug/valgrind
+		$(python_gen_cond_dep '
+			dev-python/evdev[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	acct-group/plugdev
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libevdev
+	dev-libs/libunistring:=
+	virtual/libudev:=
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/evdev[${PYTHON_USEDEP}]
+	')
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/gobject-introspection
+"
+
+CONFIG_CHECK="~HIDRAW"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if use elogind ; then
+		# Fix systemd includes for elogind
+		sed -i -e 's@include <systemd@include <elogind@' \
+			ratbagd/ratbag*.c || die
+	fi
+}
+
+src_configure() {
+	python_setup
+
+	local emesonargs=(
+		$(meson_use doc documentation)
+		$(meson_use systemd)
+		$(meson_use test tests)
+		-Ddbus-group="plugdev"
+		-Dlogind-provider=$(usex elogind elogind systemd)
+		-Dsystemd-unit-dir="$(systemd_get_systemunitdir)"
+		-Dudev-dir="${EPREFIX}$(get_udevdir)"
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	# ratbagctl-test writes a "devel" D-Bus policy to the build host. Note that
+	# test must be run as root with FEATURES="-userpriv" or it is skipped.
+	SANDBOX_WRITE+=":${EPREFIX}/etc/dbus-1/system.d" meson_src_test
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	newinitd "${FILESDIR}"/ratbagd.init-r1 ratbagd
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog 'You need to be in "plugdev" group in order to access the'
+		elog 'ratbagd dbus interface'
+	fi
+	elog 'You may be required to create and/or be part of the "games" group if you intend on using piper'
+}
diff --git a/dev-libs/libratbag/libratbag-9999.ebuild b/dev-libs/libratbag/libratbag-9999.ebuild
index 47fc210ab543..9f30a435f111 100644
--- a/dev-libs/libratbag/libratbag-9999.ebuild
+++ b/dev-libs/libratbag/libratbag-9999.ebuild
@@ -1,11 +1,11 @@
-# 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 meson python-single-r1 systemd udev
+inherit linux-info meson python-single-r1 systemd udev
 
 DESCRIPTION="Library to configure gaming mice"
 HOMEPAGE="https://github.com/libratbag/libratbag"
@@ -67,6 +67,13 @@ DEPEND="
 	dev-libs/gobject-introspection
 "
 
+CONFIG_CHECK="~HIDRAW"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	default
 
@@ -93,10 +100,16 @@ src_configure() {
 	meson_src_configure
 }
 
+src_test() {
+	# ratbagctl-test writes a "devel" D-Bus policy to the build host. Note that
+	# test must be run as root with FEATURES="-userpriv" or it is skipped.
+	SANDBOX_WRITE+=":${EPREFIX}/etc/dbus-1/system.d" meson_src_test
+}
+
 src_install() {
 	meson_src_install
 	python_fix_shebang "${ED}"/usr/bin/
-	newinitd "${FILESDIR}"/ratbagd.init ratbagd
+	newinitd "${FILESDIR}"/ratbagd.init-r1 ratbagd
 }
 
 pkg_postinst() {
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index 12475731329b..83459f94e189 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -1,5 +1 @@
-DIST libstrophe-0.12.2.tar.xz 400092 BLAKE2B 28b655e4bf3a279f837fd26e7c7ba34cd32053ad16be660c04d1c07b5335d805e9745cd24af584ed62f8ae44caebd8bda48473872163c122ecbcd57f042fc3db SHA512 1026f57b107a0ff8f088a5c7f1d88b3b5a35d0e6bfefb4f6eb56de37fe9fd2f554f547663a41353b7c6b01a2aa47f6cab4a9f7a7c87ba8c0c7708d7b2b4c2086
-DIST libstrophe-0.12.3.tar.xz 399056 BLAKE2B 9e7e344d46c78393ee2386a842895e29c417eeffbf41bd2e1c775f16bd40cb2387b59e56955a5331242af74932f61abb8afec2bda49c97063689b976b4892a52 SHA512 fa0fcb91c47197391f3b7f186b49ca4921f1937e2d1c9d25afdb73ee766bbeae5efbdeddde9cb6361eb58997c2fb136e2c1ed73a62f8c5618805a9555c473e0b
-DIST libstrophe-0.13.0.tar.xz 405368 BLAKE2B 8fb29b5f396a75620df6948b1ef109f846832f7781a527221d6781b350b522ac314cd5d44558757787659476481f66d4dcaa9ccea68dfa56fd907578eb74f78a SHA512 b7c3c728af986a6a3a7b9efcdc107f96f857ee3397cc5c2569fa033be47960cc0045a2d6c1b20524b1e1483d0d7234a3987490c0e0ebfea1371013d28de60384
 DIST libstrophe-0.13.1.tar.xz 405676 BLAKE2B b5ee084899c01d600c23e8d54e600bf72c2a92147e739d3b286c034ea3badf5e924b11a08c8c84f1453e88df40d494549286897ac3e90fb9af18b29da9754e07 SHA512 e150567db75ce615d7946471d15f968f8825ae75aa349a3c3be4e960eaea0b4960ac4c2da9aec40e984678361d89db3055062aa523ef485e9ea58a761bbcceed
-DIST libstrophe-fix-configure-bashisms.patch 1274 BLAKE2B d9308e2687eab255f94ac2b0e030f4d0424e56c3d129f544eb75fb25addf57485de0e210afe12bad29d3b92db6bf4e7400c4152707f6316921a1f2d4aa1b9367 SHA512 a2fdea484ba4e5bce4982ae5d5699df6bf2169027e7f62865baa7a7049a264d16a9dcda05826bbd942a1cc256e8559c6dfb6883913edf7f4711f5ce2601b83c5
diff --git a/dev-libs/libstrophe/files/libstrophe-0.12.3-allow-tests-when-static.patch b/dev-libs/libstrophe/files/libstrophe-0.12.3-allow-tests-when-static.patch
deleted file mode 100644
index b351bb0137c7..000000000000
--- a/dev-libs/libstrophe/files/libstrophe-0.12.3-allow-tests-when-static.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9eba8e873847b6ed6e4aa8e9e887d45c2351f6ed Mon Sep 17 00:00:00 2001
-From: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
-Date: Wed, 9 Aug 2023 13:34:18 +0200
-Subject: [PATCH] Allow running tests when static library is disabled
-
-We then only run a subset of the tests, but still better than failing to
-build.
-
-Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -175,23 +175,29 @@ endif
- 
- 
- ## Tests
--TESTS = \
-+STATIC_TESTS = \
- 	tests/check_parser \
-+	tests/test_hash \
-+	tests/test_jid \
-+	tests/test_ctx \
-+	tests/test_send_queue \
-+	tests/test_string \
-+	tests/test_resolver
-+
-+TESTS = \
- 	tests/test_sha1 \
- 	tests/test_sha256 \
- 	tests/test_sha512 \
- 	tests/test_md5 \
- 	tests/test_rand \
- 	tests/test_scram \
--	tests/test_ctx \
- 	tests/test_base64 \
--	tests/test_hash \
--	tests/test_jid \
--	tests/test_send_queue \
- 	tests/test_snprintf \
--	tests/test_string \
--	tests/test_stanza \
--	tests/test_resolver
-+	tests/test_stanza
-+
-+if !DISABLE_STATIC
-+TESTS += $(STATIC_TESTS)
-+endif
- 
- if !DISABLE_TLS
- TESTS += tests/test_xmppaddr
---- a/configure.ac
-+++ b/configure.ac
-@@ -256,6 +256,7 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],
- 
- AM_CONDITIONAL([PARSER_EXPAT], [test x$with_parser != xlibxml2])
- AM_CONDITIONAL([DISABLE_TLS], [test x$enable_tls = xno])
-+AM_CONDITIONAL([DISABLE_STATIC], [test x$enable_static = xno])
- AM_CONDITIONAL([NEED_SNPRINTF], [test x$have_snprintf = xno])
- AM_CONDITIONAL([TLS_WITH_GNUTLS], [test x$with_gnutls = xyes])
- AM_CONDITIONAL([TLS_WITH_SCHANNEL], [test x$with_schannel = xyes])
diff --git a/dev-libs/libstrophe/libstrophe-0.12.2.ebuild b/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
deleted file mode 100644
index 304dae8e12ed..000000000000
--- a/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
-HOMEPAGE="https://strophe.im/libstrophe/"
-# 2nd SRC is a backport of the /bin/sh -> dash fix, #877049, #879533
-SRC_URI="
-	https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz
-	https://github.com/strophe/libstrophe/commit/7352bd5cdbacf98771fdc0d32a606c4b6718077c.patch -> ${PN}-fix-configure-bashisms.patch
-"
-LICENSE="|| ( MIT GPL-3 )"
-# Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME
-SLOT="0/0.1"
-KEYWORDS="amd64 ~arm64"
-IUSE="doc expat gnutls"
-
-RDEPEND="
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2:2 )
-	gnutls? ( net-libs/gnutls:0= )
-	!gnutls? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-
-DOCS=( ChangeLog )
-
-PATCHES=(
-	# https://github.com/strophe/libstrophe/pull/218
-	"${DISTDIR}/${PN}-fix-configure-bashisms.patch"
-)
-
-src_prepare() {
-	default
-
-	# Needed for bashisms patch which touches configure
-	eautoreconf
-}
-
-src_configure() {
-	# shellcheck disable=SC2207
-	local myeconf=(
-		--enable-tls
-		$(use_with !expat libxml2)
-		$(use_with gnutls)
-	)
-	econf "${myeconf[@]}"
-}
-
-src_compile() {
-	default
-	if use doc; then
-		doxygen || die
-		HTML_DOCS=( docs/html/* )
-	fi
-}
-
-src_install() {
-	default
-	use doc && dodoc -r examples
-	find "${D}" -type f \( -name '*.la' -o -name '*.a' \) -delete || die
-}
diff --git a/dev-libs/libstrophe/libstrophe-0.12.3.ebuild b/dev-libs/libstrophe/libstrophe-0.12.3.ebuild
deleted file mode 100644
index f195859a711c..000000000000
--- a/dev-libs/libstrophe/libstrophe-0.12.3.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
-
-inherit autotools
-
-DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
-HOMEPAGE="https://strophe.im/libstrophe/"
-SRC_URI="
-	https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz
-"
-LICENSE="|| ( MIT GPL-3 )"
-# Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME
-SLOT="0/0.1"
-KEYWORDS="amd64 ~arm64"
-IUSE="doc expat gnutls"
-
-RDEPEND="
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2:2 )
-	gnutls? ( net-libs/gnutls:0= )
-	!gnutls? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-
-DOCS=( ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.12.3-allow-tests-when-static.patch"
-)
-
-src_prepare() {
-	default
-
-	# tests patch touches Makefile.am, need to regenerate to avoid maintainer mode
-	eautoreconf
-}
-
-src_configure() {
-	local myeconf=(
-		--enable-tls
-		$(use_with !expat libxml2)
-		$(use_with gnutls)
-	)
-	econf "${myeconf[@]}"
-}
-
-src_compile() {
-	default
-	if use doc; then
-		doxygen || die
-		HTML_DOCS=( docs/html/* )
-	fi
-}
-
-src_install() {
-	default
-	use doc && dodoc -r examples
-	find "${D}" -type f \( -name '*.la' -o -name '*.a' \) -delete || die
-}
diff --git a/dev-libs/libstrophe/libstrophe-0.13.0.ebuild b/dev-libs/libstrophe/libstrophe-0.13.0.ebuild
deleted file mode 100644
index c1a86333b67e..000000000000
--- a/dev-libs/libstrophe/libstrophe-0.13.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
-HOMEPAGE="https://strophe.im/libstrophe/"
-SRC_URI="
-	https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz
-"
-LICENSE="|| ( MIT GPL-3 )"
-# Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME
-SLOT="0/0.1"
-KEYWORDS="~amd64 ~arm64"
-IUSE="doc expat gnutls"
-
-RDEPEND="
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2:2 )
-	gnutls? ( net-libs/gnutls:0= )
-	!gnutls? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-
-DOCS=( ChangeLog )
-
-src_prepare() {
-	default
-
-	# tests patch touches Makefile.am, need to regenerate to avoid maintainer mode
-	eautoreconf
-}
-
-src_configure() {
-	local myeconf=(
-		--enable-tls
-		$(use_with !expat libxml2)
-		$(use_with gnutls)
-	)
-	econf "${myeconf[@]}"
-}
-
-src_compile() {
-	default
-	if use doc; then
-		doxygen || die
-		HTML_DOCS=( docs/html/* )
-	fi
-}
-
-src_install() {
-	default
-	use doc && dodoc -r examples
-	find "${D}" -type f \( -name '*.la' -o -name '*.a' \) -delete || die
-}
diff --git a/dev-libs/libstrophe/libstrophe-0.13.1.ebuild b/dev-libs/libstrophe/libstrophe-0.13.1.ebuild
index 23a0f02893f7..9de62974e612 100644
--- a/dev-libs/libstrophe/libstrophe-0.13.1.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.13.1.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
 
-inherit autotools
+inherit flag-o-matic
 
 DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
 HOMEPAGE="https://strophe.im/libstrophe/"
@@ -30,14 +30,9 @@ BDEPEND="
 
 DOCS=( ChangeLog )
 
-src_prepare() {
-	default
-
-	# tests patch touches Makefile.am, need to regenerate to avoid maintainer mode
-	eautoreconf
-}
-
 src_configure() {
+	# bug #944913
+	append-cflags -std=gnu17
 	local myeconf=(
 		--enable-tls
 		$(use_with !expat libxml2)
diff --git a/dev-libs/libtpms/libtpms-0.10.0.ebuild b/dev-libs/libtpms/libtpms-0.10.0.ebuild
index e7a56cee6fd5..c8d8fd24e619 100644
--- a/dev-libs/libtpms/libtpms-0.10.0.ebuild
+++ b/dev-libs/libtpms/libtpms-0.10.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit autotools
 
-DESCRIPTION="Library providing software emultion of a TPM"
+DESCRIPTION="Library providing software emulation of a TPM"
 HOMEPAGE="https://github.com/stefanberger/libtpms"
 SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}"
@@ -26,8 +26,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# --disable-hardening because it just sets what our toolchain
+	# already does. If the user wants to disable that in their *FLAGS,
+	# or via USE on toolchain packages, honour that.
 	econf \
-		--with-openssl
+		--with-openssl \
+		--disable-hardening
 }
 
 src_install() {
diff --git a/dev-libs/libtpms/libtpms-0.9.6.ebuild b/dev-libs/libtpms/libtpms-0.9.6.ebuild
index b78b99d4a24a..5dda33f6cd23 100644
--- a/dev-libs/libtpms/libtpms-0.9.6.ebuild
+++ b/dev-libs/libtpms/libtpms-0.9.6.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
 
 inherit autotools
 
-DESCRIPTION="Library providing software emultion of a TPM"
+DESCRIPTION="Library providing software emulation of a TPM"
 HOMEPAGE="https://github.com/stefanberger/libtpms"
 SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 29cd3c50b814..1c4f3838fbfb 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -1,2 +1,4 @@
+DIST libutf8proc-2.10.0.tar.gz 199045 BLAKE2B 5fdbf4d2606033c752ca965593431714cbc968a3c41905410e32cb2bd707a651428ee9fda0abfc365bf2129816fce392c3fe537426d64412ca543fe97dc14af5 SHA512 92a771606bcbecbb86c8d101931bc042dc7035938a665a7a449c2d8a7d3255df9df9c77c5cab0fc9dcaecb04be970149f60bfff463fc813e96727b7035ca9bb4
 DIST libutf8proc-2.9.0.tar.gz 190190 BLAKE2B 9f259bb4eea31c95f586f8f7711cc69959d5c1aaa15b940327d6e2cc909e3a7a46dd864fa1c1fe606cd7176f7fbcfaafbb54dcbf3f2ea6d285346d96f628b72b SHA512 fef52e9fabd77efdd42c31a96a80c792cb912ad3158354cec6b260c81062444e35dd0c9c8ff311fe6a540f0022dc2f26f007afd2578e86a31a0ac74ecfc3456f
 DIST libutf8proc-EastAsianWidth-15.1.0.xz 71448 BLAKE2B 4f4bc996c4fc316b7f48b59c38e2b515ecdc7c1cf0a06db093d3ae8255cb03fd380d3f28f629140b3dbbb202bdc522f3593388ff917c76388ea5f2143527ab81 SHA512 d269cd963a2e3326881a127b368b17638775ba581f36cac5de29f99a4971cc4bd21801bacb0a7958bab75fe5b075e69dd38a3ebedab8d02ed2c9feeff28e3b58
+DIST libutf8proc-EastAsianWidth-16.0.0.xz 71896 BLAKE2B 84baaf37ca8252e13605edfc52ca9fa2966cbb49289ca522314a93128a232eea7fd49da1b8301377f973d333dabbd5a43d2d661aa74790fe81ca68335ddef6c7 SHA512 a558cc22b0caf5fcfd0c7d0cb224192c8c43eddad5267f69b544bce1f243f4209d836d373f448a922506ea0b43d55b26394f3dcbe1c0ce39b84a5cb854ac3506
diff --git a/dev-libs/libutf8proc/libutf8proc-2.10.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.10.0.ebuild
new file mode 100644
index 000000000000..ce4f8dc02540
--- /dev/null
+++ b/dev-libs/libutf8proc/libutf8proc-2.10.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+EAW="${PN}-EastAsianWidth-16.0.0"
+
+DESCRIPTION="A clean C Library for processing UTF-8 Unicode data"
+HOMEPAGE="https://github.com/JuliaStrings/utf8proc"
+SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}/${P#lib}.tar.gz -> ${P}.tar.gz
+	cjk? ( https://dev.gentoo.org/~hattya/distfiles/${EAW}.xz )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="cjk static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( =app-i18n/unicode-data-16.0* )"
+S="${WORKDIR}/${P#lib}"
+
+QA_PKGCONFIG_VERSION="3.1.0"
+
+src_prepare() {
+	if use cjk; then
+		einfo "Modifying East Asian Ambiguous (A) as wide ..."
+		cp "${WORKDIR}"/${EAW} ${PN#lib}_data.c || die
+
+		sed -i \
+			-e "/return .*_CATEGORY_CO/s/ ||.*/;/" \
+			-e "/if (ambiguous/,/}/d" \
+			-e "/0xe000/d" \
+			test/charwidth.c
+	fi
+
+	sed -i "/^libdir/s:/lib:/$(get_libdir):" Makefile
+	default
+}
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		prefix="${EPREFIX}/usr"
+}
+
+src_test() {
+	cp "${BROOT}"/usr/share/unicode-data/{DerivedCoreProperties,{Normalization,auxiliary/GraphemeBreak}Test}.txt data || die
+
+	local name
+	for name in Uppercase Lowercase; do
+		sed -n "/# Derived Property: ${name}/,/# Total code points:/p" data/DerivedCoreProperties.txt >data/${name}.txt
+	done
+
+	emake CC="$(tc-getCC)" check
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		prefix="${EPREFIX}/usr" \
+		install
+	use static-libs || find "${ED}" -name '*.a' -delete || die
+}
diff --git a/dev-libs/libwacom/libwacom-2.14.0.ebuild b/dev-libs/libwacom/libwacom-2.14.0.ebuild
index 8e910684acea..9781eb37ce3e 100644
--- a/dev-libs/libwacom/libwacom-2.14.0.ebuild
+++ b/dev-libs/libwacom/libwacom-2.14.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/9" # libwacom SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 5cd9d573ab4e..9849e0ea3003 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,2 +1 @@
-DIST libzia-4.61.tar.gz 649569 BLAKE2B 992f7d7a4f2a7497d490a32b04c2f67e45aef361d4f55bd24ab873b3a422f2bd2a23501c275d6771459b5ebe5d169fc28123a4fd328f0977a639fa92991ba62b SHA512 210104a16846b4bbae51e91cd88428cb8b6f487a6bc234a8a7351d03865ff968bf75d102dfe5657f9fc1c181e2071a4e4ab6be0e22da277188f3ab9752ea789d
 DIST libzia-4.64.tar.gz 655073 BLAKE2B 7ec3397565d441d7f820bda9b73e1051031e30bea6111e28cc2073cd1ea49be237c35c1eb358671b1930de74e0e2f3ff4beb476676ce9b9bef608a9f39da5ca3 SHA512 5e520fb1e1782e919c727e6056ae1e979c9774e9a994267c9eabe86f4a5b9c62d11639b59735e236cc36fa42e319418e4cbe12a2e41c47d5040ed6c1d7929192
diff --git a/dev-libs/libzia/libzia-4.61.ebuild b/dev-libs/libzia/libzia-4.61.ebuild
deleted file mode 100644
index 44c174497d96..000000000000
--- a/dev-libs/libzia/libzia-4.61.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 autotools flag-o-matic
-
-DESCRIPTION="Platform abstraction code for tucnak package"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ftdi"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:3
-	media-libs/libsdl2
-	media-libs/sdl2-ttf
-	media-libs/libpng:=
-	net-libs/gnutls:=
-	ftdi? ( dev-embedded/libftdi:1 )
-	elibc_musl? ( sys-libs/libunwind )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	eapply_user
-	sed -i -e "s/docsdir/#docsdir/g" \
-		-e "s/docs_/#docs_/g" Makefile.am || die
-
-	# fix build for MUSL (bugs #832235, 935544)
-	if use elibc_musl ; then
-		sed -i -e "s/zstr.h>/zstr.h>\\n#include <libunwind.h>/" src/zbfd.c || die
-		sed -i -e "s/ backtrace(/ unw_backtrace(/" src/zbfd.c || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	use elibc_musl && append-libs -lunwind
-	econf \
-		$(use_with ftdi) --with-sdl \
-		--with-png --without-bfd \
-		--disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/libzip/libzip-1.11.2-r1.ebuild b/dev-libs/libzip/libzip-1.11.2-r1.ebuild
new file mode 100644
index 000000000000..568eae26576c
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.11.2-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake multibuild flag-o-matic
+
+DESCRIPTION="Library for manipulating zip archives"
+HOMEPAGE="https://nih.at/libzip/"
+SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd"
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2:= )
+	lzma? ( app-arch/xz-utils )
+	ssl? (
+		gnutls? (
+			dev-libs/nettle:=
+			>=net-libs/gnutls-3.6.5:=
+		)
+		!gnutls? (
+			mbedtls? ( net-libs/mbedtls:0= )
+			!mbedtls? ( dev-libs/openssl:= )
+		)
+	)
+	zstd? ( >=app-arch/zstd-1.4.0:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? ( dev-util/nihtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-nullability.patch
+)
+
+pkg_setup() {
+	# Upstream doesn't support building dynamic & static
+	# simultaneously: https://github.com/nih-at/libzip/issues/76
+	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+src_configure() {
+	append-lfs-flags
+	myconfigure() {
+		local mycmakeargs=(
+			-DBUILD_OSSFUZZ=OFF
+			-DBUILD_EXAMPLES=OFF # nothing is installed
+			-DENABLE_COMMONCRYPTO=OFF # not in tree
+			-DENABLE_BZIP2=$(usex bzip2)
+			-DENABLE_LZMA=$(usex lzma)
+			-DENABLE_ZSTD=$(usex zstd)
+		)
+		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+			mycmakeargs+=(
+				-DBUILD_DOC=OFF
+				-DBUILD_EXAMPLES=OFF
+				-DBUILD_SHARED_LIBS=OFF
+				-DBUILD_TOOLS=OFF
+			)
+		else
+			mycmakeargs+=(
+				-DBUILD_DOC=ON
+				-DBUILD_REGRESS=$(usex test)
+				-DBUILD_TOOLS=$(usex tools)
+			)
+		fi
+
+		if use ssl; then
+			if use gnutls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=$(usex gnutls)
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=OFF
+				)
+			elif use mbedtls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=$(usex mbedtls)
+					-DENABLE_OPENSSL=OFF
+				)
+			else
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=ON
+				)
+			fi
+		else
+			mycmakeargs+=(
+				-DENABLE_GNUTLS=OFF
+				-DENABLE_MBEDTLS=OFF
+				-DENABLE_OPENSSL=OFF
+			)
+		fi
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_test() {
+	run_tests() {
+		[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
+	}
+
+	multibuild_foreach_variant run_tests
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
diff --git a/dev-libs/libzip/libzip-1.11.2.ebuild b/dev-libs/libzip/libzip-1.11.2.ebuild
deleted file mode 100644
index 769236e73b97..000000000000
--- a/dev-libs/libzip/libzip-1.11.2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake multibuild flag-o-matic
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="https://nih.at/libzip/"
-SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0/5"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd"
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2:= )
-	lzma? ( app-arch/xz-utils )
-	ssl? (
-		gnutls? (
-			dev-libs/nettle:=
-			>=net-libs/gnutls-3.6.5:=
-		)
-		!gnutls? (
-			mbedtls? ( net-libs/mbedtls:= )
-			!mbedtls? ( dev-libs/openssl:= )
-		)
-	)
-	zstd? ( >=app-arch/zstd-1.4.0:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	test? ( dev-util/nihtest )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-nullability.patch
-)
-
-pkg_setup() {
-	# Upstream doesn't support building dynamic & static
-	# simultaneously: https://github.com/nih-at/libzip/issues/76
-	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
-}
-
-src_configure() {
-	append-lfs-flags
-	myconfigure() {
-		local mycmakeargs=(
-			-DBUILD_OSSFUZZ=OFF
-			-DBUILD_EXAMPLES=OFF # nothing is installed
-			-DENABLE_COMMONCRYPTO=OFF # not in tree
-			-DENABLE_BZIP2=$(usex bzip2)
-			-DENABLE_LZMA=$(usex lzma)
-			-DENABLE_ZSTD=$(usex zstd)
-		)
-		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
-			mycmakeargs+=(
-				-DBUILD_DOC=OFF
-				-DBUILD_EXAMPLES=OFF
-				-DBUILD_SHARED_LIBS=OFF
-				-DBUILD_TOOLS=OFF
-			)
-		else
-			mycmakeargs+=(
-				-DBUILD_DOC=ON
-				-DBUILD_REGRESS=$(usex test)
-				-DBUILD_TOOLS=$(usex tools)
-			)
-		fi
-
-		if use ssl; then
-			if use gnutls; then
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=$(usex gnutls)
-					-DENABLE_MBEDTLS=OFF
-					-DENABLE_OPENSSL=OFF
-				)
-			elif use mbedtls; then
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=OFF
-					-DENABLE_MBEDTLS=$(usex mbedtls)
-					-DENABLE_OPENSSL=OFF
-				)
-			else
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=OFF
-					-DENABLE_MBEDTLS=OFF
-					-DENABLE_OPENSSL=ON
-				)
-			fi
-		else
-			mycmakeargs+=(
-				-DENABLE_GNUTLS=OFF
-				-DENABLE_MBEDTLS=OFF
-				-DENABLE_OPENSSL=OFF
-			)
-		fi
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_test() {
-	run_tests() {
-		[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
-	}
-
-	multibuild_foreach_variant run_tests
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-}
diff --git a/dev-libs/libzip/libzip-1.9.2-r1.ebuild b/dev-libs/libzip/libzip-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..4481cb00690e
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.9.2-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake multibuild flag-o-matic
+
+DESCRIPTION="Library for manipulating zip archives"
+HOMEPAGE="https://nih.at/libzip/"
+SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd"
+REQUIRED_USE="test? ( tools )"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2:= )
+	lzma? ( app-arch/xz-utils )
+	ssl? (
+		gnutls? (
+			dev-libs/nettle:0=
+			>=net-libs/gnutls-3.6.5:=
+		)
+		!gnutls? (
+			mbedtls? ( net-libs/mbedtls:0= )
+			!mbedtls? ( dev-libs/openssl:0= )
+		)
+	)
+	zstd? ( app-arch/zstd )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	# Upstream doesn't support building dynamic & static
+	# simultaneously: https://github.com/nih-at/libzip/issues/76
+	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+src_configure() {
+	append-lfs-flags
+	myconfigure() {
+		local mycmakeargs=(
+			-DBUILD_EXAMPLES=OFF # nothing is installed
+			-DENABLE_COMMONCRYPTO=OFF # not in tree
+			-DENABLE_BZIP2=$(usex bzip2)
+			-DENABLE_LZMA=$(usex lzma)
+			-DENABLE_ZSTD=$(usex zstd)
+		)
+		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+			mycmakeargs+=(
+				-DBUILD_DOC=OFF
+				-DBUILD_EXAMPLES=OFF
+				-DBUILD_SHARED_LIBS=OFF
+				-DBUILD_TOOLS=OFF
+			)
+		else
+			mycmakeargs+=(
+				-DBUILD_DOC=ON
+				-DBUILD_REGRESS=$(usex test)
+				-DBUILD_TOOLS=$(usex tools)
+			)
+		fi
+
+		if use ssl; then
+			if use gnutls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=$(usex gnutls)
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=OFF
+				)
+			elif use mbedtls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=$(usex mbedtls)
+					-DENABLE_OPENSSL=OFF
+				)
+			else
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=ON
+				)
+			fi
+		else
+			mycmakeargs+=(
+				-DENABLE_GNUTLS=OFF
+				-DENABLE_MBEDTLS=OFF
+				-DENABLE_OPENSSL=OFF
+			)
+		fi
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_test() {
+	run_tests() {
+		[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
+	}
+
+	multibuild_foreach_variant run_tests
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
diff --git a/dev-libs/libzip/libzip-1.9.2.ebuild b/dev-libs/libzip/libzip-1.9.2.ebuild
deleted file mode 100644
index 40578c7008c6..000000000000
--- a/dev-libs/libzip/libzip-1.9.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake multibuild flag-o-matic
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="https://nih.at/libzip/"
-SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd"
-REQUIRED_USE="test? ( tools )"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2:= )
-	lzma? ( app-arch/xz-utils )
-	ssl? (
-		gnutls? (
-			dev-libs/nettle:0=
-			>=net-libs/gnutls-3.6.5:=
-		)
-		!gnutls? (
-			mbedtls? ( net-libs/mbedtls:= )
-			!mbedtls? ( dev-libs/openssl:0= )
-		)
-	)
-	zstd? ( app-arch/zstd )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	# Upstream doesn't support building dynamic & static
-	# simultaneously: https://github.com/nih-at/libzip/issues/76
-	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
-}
-
-src_configure() {
-	append-lfs-flags
-	myconfigure() {
-		local mycmakeargs=(
-			-DBUILD_EXAMPLES=OFF # nothing is installed
-			-DENABLE_COMMONCRYPTO=OFF # not in tree
-			-DENABLE_BZIP2=$(usex bzip2)
-			-DENABLE_LZMA=$(usex lzma)
-			-DENABLE_ZSTD=$(usex zstd)
-		)
-		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
-			mycmakeargs+=(
-				-DBUILD_DOC=OFF
-				-DBUILD_EXAMPLES=OFF
-				-DBUILD_SHARED_LIBS=OFF
-				-DBUILD_TOOLS=OFF
-			)
-		else
-			mycmakeargs+=(
-				-DBUILD_DOC=ON
-				-DBUILD_REGRESS=$(usex test)
-				-DBUILD_TOOLS=$(usex tools)
-			)
-		fi
-
-		if use ssl; then
-			if use gnutls; then
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=$(usex gnutls)
-					-DENABLE_MBEDTLS=OFF
-					-DENABLE_OPENSSL=OFF
-				)
-			elif use mbedtls; then
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=OFF
-					-DENABLE_MBEDTLS=$(usex mbedtls)
-					-DENABLE_OPENSSL=OFF
-				)
-			else
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=OFF
-					-DENABLE_MBEDTLS=OFF
-					-DENABLE_OPENSSL=ON
-				)
-			fi
-		else
-			mycmakeargs+=(
-				-DENABLE_GNUTLS=OFF
-				-DENABLE_MBEDTLS=OFF
-				-DENABLE_OPENSSL=OFF
-			)
-		fi
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_test() {
-	run_tests() {
-		[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
-	}
-
-	multibuild_foreach_variant run_tests
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-}
diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest
index 38ab22ecce28..3caffdba9716 100644
--- a/dev-libs/mimalloc/Manifest
+++ b/dev-libs/mimalloc/Manifest
@@ -1,4 +1,3 @@
-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
+DIST mimalloc-2.1.9.tar.gz 1276218 BLAKE2B 183749c1bb98c92986da9d3cb636d465927dd5b4186072edbe6e4fae88b59fdbfe4a0dd711c4705d64287c8085a0059d891c07f6aba50747eb67e56937d2e3ad SHA512 404a7827aea6f39bb4b9d43b5c93d5ca39e84e29bf362d597744703f7a6d0c091f55b45a070e6d61ad7f68bf7c28f541668c75db16bae1423bd318f47bf06974
diff --git a/dev-libs/mimalloc/mimalloc-2.1.2.ebuild b/dev-libs/mimalloc/mimalloc-2.1.2.ebuild
deleted file mode 100644
index 82790836bf71..000000000000
--- a/dev-libs/mimalloc/mimalloc-2.1.2.ebuild
+++ /dev/null
@@ -1,35 +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() {
-	# Bug #923177
-	append-atomic-flags
-
-	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)
-	)
-
-	cmake-multilib_src_configure
-}
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.8.ebuild b/dev-libs/mimalloc/mimalloc-2.1.8.ebuild
new file mode 100644
index 000000000000..49b88d5cd215
--- /dev/null
+++ b/dev-libs/mimalloc/mimalloc-2.1.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="A compact general purpose allocator with excellent performance"
+HOMEPAGE="https://github.com/microsoft/mimalloc"
+SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened test valgrind"
+RESTRICT="!test? ( test )"
+
+DEPEND="valgrind? ( dev-debug/valgrind )"
+
+src_configure() {
+	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/mimalloc/mimalloc-2.1.9.ebuild b/dev-libs/mimalloc/mimalloc-2.1.9.ebuild
new file mode 100644
index 000000000000..49b88d5cd215
--- /dev/null
+++ b/dev-libs/mimalloc/mimalloc-2.1.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="A compact general purpose allocator with excellent performance"
+HOMEPAGE="https://github.com/microsoft/mimalloc"
+SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened test valgrind"
+RESTRICT="!test? ( test )"
+
+DEPEND="valgrind? ( dev-debug/valgrind )"
+
+src_configure() {
+	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/miniz/miniz-3.0.2.ebuild b/dev-libs/miniz/miniz-3.0.2.ebuild
index d9773d0dde20..3a6d0698c592 100644
--- a/dev-libs/miniz/miniz-3.0.2.ebuild
+++ b/dev-libs/miniz/miniz-3.0.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
@@ -11,6 +11,6 @@ SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 DOCS=( ChangeLog.md readme.md )
diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index f48bdf977e33..440afe91147e 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,2 +1,3 @@
 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
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/ncnn/ncnn-20240820.ebuild b/dev-libs/ncnn/ncnn-20240820.ebuild
index 3ca6898ed9c5..432e9ebb568f 100644
--- a/dev-libs/ncnn/ncnn-20240820.ebuild
+++ b/dev-libs/ncnn/ncnn-20240820.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
@@ -35,6 +35,9 @@ DEPEND="
 	${RDEPEND}
 	vulkan? ( dev-util/vulkan-headers )
 "
+BDEPEND="
+	tools? ( dev-libs/protobuf[protoc(+)] )
+"
 
 DOCS=( README.md docs/. )
 
diff --git a/dev-libs/newt/files/newt-0.52.24-c99-fix.patch b/dev-libs/newt/files/newt-0.52.24-c99-fix.patch
new file mode 100644
index 000000000000..c891942fa524
--- /dev/null
+++ b/dev-libs/newt/files/newt-0.52.24-c99-fix.patch
@@ -0,0 +1,12 @@
+diff --git a/form.c b/form.c
+index 24c601d..c6c15f5 100644
+--- a/form.c
++++ b/form.c
+@@ -5,6 +5,7 @@
+ #include <slang.h>
+ #include <stdarg.h>
+ #include <stdlib.h>
++#include <string.h>
+ #ifdef HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+ #endif
diff --git a/dev-libs/newt/newt-0.52.24-r1.ebuild b/dev-libs/newt/newt-0.52.24-r1.ebuild
new file mode 100644
index 000000000000..61146a8dba41
--- /dev/null
+++ b/dev-libs/newt/newt-0.52.24-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..13} )
+
+inherit autotools python-r1 toolchain-funcs
+
+MY_PV="r$(ver_rs 1- -)"
+
+DESCRIPTION="Redhat's Newt windowing toolkit development files"
+HOMEPAGE="https://pagure.io/newt"
+SRC_URI="https://github.com/mlichvar/newt/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
+IUSE="gpm nls tcl"
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/popt-1.6
+	=sys-libs/slang-2*
+	gpm? ( sys-libs/gpm )
+	tcl? ( >=dev-lang/tcl-8.5:0 )
+	"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.52.23-gold.patch
+	"${FILESDIR}"/${PN}-0.52.21-python-sitedir.patch
+	"${FILESDIR}"/${PN}-0.52.24-c99-fix.patch
+)
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	sed -i Makefile.in \
+		-e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \
+		-e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \
+		-e 's|instroot|DESTDIR|g' \
+		-e 's|	make |	$(MAKE) |g' \
+		-e "s|	ar |	$(tc-getAR) |g" \
+		|| die "sed Makefile.in"
+
+	if [[ -n ${LINGUAS} ]]; then
+		local lang langs
+		for lang in ${LINGUAS}; do
+			test -r po/${lang}.po && langs="${langs} ${lang}.po"
+		done
+		sed -i po/Makefile \
+			-e "/^CATALOGS = /cCATALOGS = ${langs}" \
+			|| die "sed po/Makefile"
+	fi
+
+	default
+	eautoreconf
+
+	# can't build out-of-source
+	python_copy_sources
+}
+
+src_configure() {
+	configuring() {
+		econf \
+			PYTHONVERS="${PYTHON}" \
+			$(use_with gpm gpm-support) \
+			$(use_with tcl) \
+			$(use_enable nls)
+	}
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	building() {
+		emake PYTHONVERS="${EPYTHON}"
+	}
+	python_foreach_impl run_in_build_dir building
+}
+
+src_install() {
+	installit() {
+		emake \
+			DESTDIR="${D}" \
+			PYTHON_SITEDIR="$(python_get_sitedir)" \
+			PYTHONVERS="${EPYTHON}" \
+			install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installit
+	dodoc peanuts.py popcorn.py tutorial.sgml
+	doman whiptail.1
+	einstalldocs
+
+	# don't want static archives
+	rm "${ED}"/usr/$(get_libdir)/libnewt.a || die
+}
diff --git a/dev-libs/newt/newt-0.52.24.ebuild b/dev-libs/newt/newt-0.52.24.ebuild
deleted file mode 100644
index f05b2ee51b89..000000000000
--- a/dev-libs/newt/newt-0.52.24.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..13} )
-
-inherit autotools python-r1 toolchain-funcs
-
-MY_PV="r$(ver_rs 1- -)"
-
-DESCRIPTION="Redhat's Newt windowing toolkit development files"
-HOMEPAGE="https://pagure.io/newt"
-SRC_URI="https://github.com/mlichvar/newt/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="gpm nls tcl"
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/popt-1.6
-	=sys-libs/slang-2*
-	gpm? ( sys-libs/gpm )
-	tcl? ( >=dev-lang/tcl-8.5:0 )
-	"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.52.23-gold.patch
-	"${FILESDIR}"/${PN}-0.52.21-python-sitedir.patch
-)
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	sed -i Makefile.in \
-		-e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \
-		-e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \
-		-e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \
-		-e 's|instroot|DESTDIR|g' \
-		-e 's|	make |	$(MAKE) |g' \
-		-e "s|	ar |	$(tc-getAR) |g" \
-		|| die "sed Makefile.in"
-
-	if [[ -n ${LINGUAS} ]]; then
-		local lang langs
-		for lang in ${LINGUAS}; do
-			test -r po/${lang}.po && langs="${langs} ${lang}.po"
-		done
-		sed -i po/Makefile \
-			-e "/^CATALOGS = /cCATALOGS = ${langs}" \
-			|| die "sed po/Makefile"
-	fi
-
-	default
-	eautoreconf
-
-	# can't build out-of-source
-	python_copy_sources
-}
-
-src_configure() {
-	configuring() {
-		econf \
-			PYTHONVERS="${PYTHON}" \
-			$(use_with gpm gpm-support) \
-			$(use_with tcl) \
-			$(use_enable nls)
-	}
-	python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
-	building() {
-		emake PYTHONVERS="${EPYTHON}"
-	}
-	python_foreach_impl run_in_build_dir building
-}
-
-src_install() {
-	installit() {
-		emake \
-			DESTDIR="${D}" \
-			PYTHON_SITEDIR="$(python_get_sitedir)" \
-			PYTHONVERS="${EPYTHON}" \
-			install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installit
-	dodoc peanuts.py popcorn.py tutorial.sgml
-	doman whiptail.1
-	einstalldocs
-
-	# don't want static archives
-	rm "${ED}"/usr/$(get_libdir)/libnewt.a || die
-}
diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest
index 9d9d0029d58b..1613db617233 100644
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@@ -1,3 +1,2 @@
-DIST npth-1.6.tar.bz2 300486 BLAKE2B 665fdb2f4cbe59750b6b4b7c2701ee80a23a122df10c9f8be47c4af5f3bf5968f709637ab3f4878bb68609752fbb6ce1364e109fdfeba64e4db258733a33f3fc SHA512 2ed1012e14a9d10665420b9a23628be7e206fd9348111ec751349b93557ee69f1176bcf7e6b195b35b1c44a5e0e81ee33b713f03d79a33d1ecd9037035afeda2
 DIST npth-1.7.tar.bz2 313213 BLAKE2B 39bc5857fb61a4264bef6ff23c28755d2a3b3ceef93034aefd5cf1c2ad905adf696c6753ebd5cea5e0a875df4ecb97db03e023a50a27f51ec0641bbc36b54089 SHA512 8893023bcf953a3f7c490cf8116bed323a9d4af2bea35277e919f437916fda8b8e68ded28ec1777717cf9187c504892556159cbdb8bc02ed4a8b30b3d897d244
 DIST npth-1.8.tar.bz2 317739 BLAKE2B 554620f6a45f57bb958d245f7464abffd565b592941f0c404ce384c854be57ee35754a78dcf6afac751ee87e1df230bf3d2b78fb37cb1ef3e5ea534ddfd4ef2a SHA512 34fdeea3d8a7a594d8fdbcc6d5d389b5c8e282e8e84c1491b1e51960c0fa007df6a1d62543f0107f0772f3215557d4b25c2a9c7067cb0ae2f8de7b4d63d09fb4
diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild
deleted file mode 100644
index 0da1d8cb733c..000000000000
--- a/dev-libs/npth/npth-1.6-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="New GNU Portable Threads Library"
-HOMEPAGE="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="hppa"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
-	# https://github.com/gentoo/gentoo/pull/28355
-	# mold needs this too but right now tc-ld-is-mold is also not available
-	if tc-ld-is-lld; then
-		append-ldflags -Wl,--undefined-version
-	fi
-
-	econf \
-		--disable-static \
-		$(use_enable test tests)
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/npth/npth-1.8.ebuild b/dev-libs/npth/npth-1.8.ebuild
index b83032c047d3..df49e68dd360 100644
--- a/dev-libs/npth/npth-1.8.ebuild
+++ b/dev-libs/npth/npth-1.8.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://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/nspr/nspr-4.36.ebuild b/dev-libs/nspr/nspr-4.36.ebuild
index dac2d9a856d3..983804967b48 100644
--- a/dev-libs/nspr/nspr-4.36.ebuild
+++ b/dev-libs/nspr/nspr-4.36.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 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss/files/nss-3.106-bmo-1927096-fix-broken-test-files.patch b/dev-libs/nss/files/nss-3.106-bmo-1927096-fix-broken-test-files.patch
deleted file mode 100644
index 069e97e6aacf..000000000000
--- a/dev-libs/nss/files/nss-3.106-bmo-1927096-fix-broken-test-files.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/tests/tools/tools.sh b/tests/tools/tools.sh
---- a/tests/tools/tools.sh
-+++ b/tests/tools/tools.sh
-@@ -542,25 +542,25 @@
-   check_tmpfile
- 
-   echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
-   ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
-   ret=$?
--  html_msg $ret 19 "Fail to list private key with bad iterator"
-+  html_msg $ret 17 "Fail to list private key with bad iterator"
-   check_tmpfile
- 
-   echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
-   ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
-   ret=$?
-   echo "Fail to list private key with bad salt val=$ret"
--  html_msg $ret 19 "Fail to import private key with bad salt"
-+  html_msg $ret 17 "Fail to import private key with bad salt"
-   check_tmpfile
- 
-   echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'"
-   ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1
-   ret=$?
-   echo "Fail to import private key with no length val=$ret"
--  html_msg $ret 19 "Fail to import private key with no length"
-+  html_msg $ret 17 "Fail to import private key with no length"
-   check_tmpfile
- }
- 
- ############################## tools_p12 ###############################
- # local shell function to test basic functionality of pk12util
-
diff --git a/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch b/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch
deleted file mode 100644
index d883db8181d1..000000000000
--- a/dev-libs/nss/files/nss-3.90-remove-support-of-curve25519.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-# HG changeset patch
-# User Natalia Kulatova <nkulatova@mozilla.com>
-# Date 1687519432 0
-#      Fri Jun 23 11:23:52 2023 +0000
-# Node ID 653f4c1b58425219c0e9c005d555994a3fe1fa72
-# Parent  f095bf91ffaa273ea38ca6df34c905e5442de012
-Bug 1836925 - Removing the support of Curve25519 r=bbeurdouche,nss-reviewers
-
-Differential Revision: https://phabricator.services.mozilla.com/D180068
-
-diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/Makefile
---- a/lib/freebl/Makefile	Fri Jun 23 08:56:27 2023 +0000
-+++ b/lib/freebl/Makefile	Fri Jun 23 11:23:52 2023 +0000
-@@ -568,9 +568,6 @@
-             HAVE_INT128_SUPPORT = 1
-             DEFINES += -DHAVE_INT128_SUPPORT
-     else ifeq (1,$(CC_IS_GCC))
--        ifeq ($(CPU_ARCH),x86_64)
--            SUPPORTS_VALE_CURVE25519 = 1
--        endif
-         ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
-             HAVE_INT128_SUPPORT = 1
-             DEFINES += -DHAVE_INT128_SUPPORT
-@@ -595,11 +592,6 @@
-     DEFINES += -DKRML_VERIFIED_UINT128
- endif
- 
--ifdef SUPPORTS_VALE_CURVE25519
--    VERIFIED_SRCS += Hacl_Curve25519_64.c
--    DEFINES += -DHACL_CAN_COMPILE_INLINE_ASM
--endif
--
- ifndef NSS_DISABLE_CHACHAPOLY
-     ifeq ($(CPU_ARCH),x86_64)
-         ifndef NSS_DISABLE_AVX2
-diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/freebl.gyp
---- a/lib/freebl/freebl.gyp	Fri Jun 23 08:56:27 2023 +0000
-+++ b/lib/freebl/freebl.gyp	Fri Jun 23 11:23:52 2023 +0000
-@@ -866,12 +866,6 @@
-           }],
-         ],
-       }],
--      [ 'supports_vale_curve25519==1', {
--        'defines': [
--          # The Makefile does version-tests on GCC, but we're not doing that here.
--          'HACL_CAN_COMPILE_INLINE_ASM',
--        ],
--      }],
-       [ 'OS=="linux" or OS=="android"', {
-         'conditions': [
-           [ 'target_arch=="x64"', {
-@@ -934,11 +928,6 @@
-   'variables': {
-     'module': 'nss',
-     'conditions': [
--      [ 'target_arch=="x64" and cc_is_gcc==1', {
--        'supports_vale_curve25519%': 1,
--      }, {
--        'supports_vale_curve25519%': 0,
--      }],
-       [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', {
-         'have_int128_support%': 1,
-       }, {
-diff -r f095bf91ffaa -r 653f4c1b5842 lib/freebl/freebl_base.gypi
---- a/lib/freebl/freebl_base.gypi	Fri Jun 23 08:56:27 2023 +0000
-+++ b/lib/freebl/freebl_base.gypi	Fri Jun 23 11:23:52 2023 +0000
-@@ -154,11 +154,6 @@
-         'ecl/curve25519_32.c',
-       ],
-     }],
--    ['supports_vale_curve25519==1', {
--      'sources': [
--        'verified/Hacl_Curve25519_64.c',
--      ],
--    }],
-     ['(target_arch!="ppc64" and target_arch!="ppc64le") or disable_altivec==1', {
-       'sources': [
-         # Gyp does not support per-file cflags, so working around like this.
diff --git a/dev-libs/nss/files/nss-3.90.2-backport-D180718.patch b/dev-libs/nss/files/nss-3.90.2-backport-D180718.patch
deleted file mode 100644
index 102ed5227488..000000000000
--- a/dev-libs/nss/files/nss-3.90.2-backport-D180718.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/nss-dev/nss/commit/6ab861ba652985ce5985a3fb1ddc87a15aac5027
-https://bugzilla.mozilla.org/show_bug.cgi?id=1835357
-https://phabricator.services.mozilla.com/D180718
-
-From 6ab861ba652985ce5985a3fb1ddc87a15aac5027 Mon Sep 17 00:00:00 2001
-From: Robert Relyea <rrelyea@redhat.com>
-Date: Mon, 12 Jun 2023 11:18:03 -0700
-Subject: [PATCH] Bug 1835357 dbtests.sh failure in "certutil dump keys with
- explicit default trust flags" r=jschanck
-
- Fix the time value so we don't fail on slower or overloaded platforms.
-
- bob
-
-Differential Revision: https://phabricator.services.mozilla.com/D180718
-
---HG--
-extra : rebase_source : 3fb50de29dbf5f635cae10e962eb995c25cd108a
----
- tests/dbtests/dbtests.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/dbtests/dbtests.sh b/tests/dbtests/dbtests.sh
-index b0b195d4d0..c82ea85caf 100755
---- a/tests/dbtests/dbtests.sh
-+++ b/tests/dbtests/dbtests.sh
-@@ -366,7 +366,7 @@ dbtest_main()
-       RARRAY=($dtime)
-       TIMEARRAY=(${RARRAY[1]//./ })
-       echo "${TIMEARRAY[0]} seconds"
--      test ${TIMEARRAY[0]} -lt 2
-+      test ${TIMEARRAY[0]} -lt 5
-       ret=$?
-       html_msg ${ret} 0 "certutil dump keys with explicit default trust flags"
-     fi
diff --git a/dev-libs/nss/files/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch b/dev-libs/nss/files/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch
deleted file mode 100644
index e5769308144c..000000000000
--- a/dev-libs/nss/files/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-
-# HG changeset patch
-# User Natalia Kulatova <nkulatova@mozilla.com>
-# Date 1685981398 0
-# Node ID 52a5d8fe37410d940e7d3ca244146ebc46a7d52a
-# Parent  52969cff7db635e0ee10fad66eed2c0cfdcf999b
-Bug 1836781 - Disabling ASM C25519 for A but X86_64 r=bbeurdouche,nss-reviewers
-
-Differential Revision: https://phabricator.services.mozilla.com/D179969
-
-diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
---- a/lib/freebl/Makefile
-+++ b/lib/freebl/Makefile
-@@ -563,17 +563,19 @@ endif # target == SunO
- ifdef USE_64
- # no __int128 at least up to lcc 1.23 (pretending to be gcc5)
- # NB: CC_NAME is not defined here
- ifneq ($(shell $(CC) -? 2>&1 >/dev/null </dev/null | sed -e 's/:.*//;1q'),lcc)
-     ifdef CC_IS_CLANG
-             HAVE_INT128_SUPPORT = 1
-             DEFINES += -DHAVE_INT128_SUPPORT
-     else ifeq (1,$(CC_IS_GCC))
--        SUPPORTS_VALE_CURVE25519 = 1
-+        ifeq ($(CPU_ARCH),x86_64)
-+            SUPPORTS_VALE_CURVE25519 = 1
-+        endif
-         ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
-             HAVE_INT128_SUPPORT = 1
-             DEFINES += -DHAVE_INT128_SUPPORT
-         endif
-         ifneq (,$(filter 0 1 2 3 4,$(word 1,$(GCC_VERSION))))
-             NSS_DISABLE_AVX2 = 1
-         endif
-         ifeq (,$(filter 0 1 2 3 4,$(word 1,$(GCC_VERSION))))
-
diff --git a/dev-libs/opencl-clang/opencl-clang-19.1.0.ebuild b/dev-libs/opencl-clang/opencl-clang-19.1.0.ebuild
index 6b9fa2537a70..9fe30a36fa1c 100644
--- a/dev-libs/opencl-clang/opencl-clang-19.1.0.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-19.1.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 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2024.05.08.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2024.05.08.ebuild
index 4194abf18346..e0bd0b7bc0d2 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2024.05.08.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2024.05.08.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/openspecfun/openspecfun-0.5.5.ebuild b/dev-libs/openspecfun/openspecfun-0.5.5.ebuild
index e296b44d04f0..951a5d905401 100644
--- a/dev-libs/openspecfun/openspecfun-0.5.5.ebuild
+++ b/dev-libs/openspecfun/openspecfun-0.5.5.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="https://github.com/JuliaLang/openspecfun/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="sci-libs/openlibm:="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/openssl/openssl-3.0.9999.ebuild b/dev-libs/openssl/openssl-3.0.9999.ebuild
new file mode 100644
index 000000000000..6d7eefcece55
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.0.9999.ebuild
@@ -0,0 +1,288 @@
+# 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/openssl.org.asc
+inherit edo flag-o-matic linux-info toolchain-funcs
+inherit multilib multilib-minimal multiprocessing preserve-libs
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://openssl-library.org/"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == *9999 ]] ; then
+	[[ ${PV} == *.*.9999 ]] && EGIT_BRANCH="openssl-${PV%%.9999}"
+	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
+
+	inherit git-r3
+else
+	inherit verify-sig
+	SRC_URI="
+		https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz
+		verify-sig? (
+			https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz.asc
+		)
+	"
+
+	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+
+	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 )"
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0/3" # .so version of libssl/libcrypto
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+BDEPEND+="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		app-alternatives/bc
+		sys-process/procps
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+pkg_setup() {
+	if use ktls ; then
+		if kernel_is -lt 4 18 ; then
+			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
+		else
+			CONFIG_CHECK="~TLS ~TLS_DEVICE"
+			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
+			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp ; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile || die
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES} ; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# Test fails depending on kernel configuration, bug #699134
+	rm test/recipes/30-test_afalg.t || die
+}
+
+src_configure() {
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/12247
+	# - https://github.com/openssl/openssl/issues/18225
+	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+	# The OpenSSL developers don't test with LTO right now, it leads to various
+	# warnings/errors (which may or may not be false positives), it's considered
+	# unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663.
+	filter-lto
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# bug #895308
+	append-atomic-flags
+	# Configure doesn't respect LIBS
+	export LDLIBS="${LIBS}"
+
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	#local ec_nistp_64_gcc_128
+	#
+	# Disable it for now though (bug #469976)
+	# Do NOT re-enable without substantial discussion first!
+	#
+	#echo "__uint128_t i;" > "${T}"/128.c
+	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#fi
+
+	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
+	einfo "Using configuration: ${sslout:-(openssl knows best)}"
+
+	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
+	local myeconfargs=(
+		${sslout}
+
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use fips && echo "enable-fips")
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	edo perl "${S}/Configure" "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake build_sw
+
+	if multilib_is_native_abi; then
+		emake build_docs
+	fi
+}
+
+multilib_src_test() {
+	# VFP = show subtests verbosely and show failed tests verbosely
+	# Normal V=1 would show everything verbosely but this slows things down.
+	emake HARNESS_JOBS="$(makeopts_jobs)" -Onone VFP=1 test
+}
+
+multilib_src_install() {
+	# Only -j1 is supported for the install targets:
+	# https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305
+	emake DESTDIR="${D}" -j1 install_sw
+	if use fips; then
+		emake DESTDIR="${D}" -j1 install_fips
+		# Regen this in pkg_preinst, bug 900625
+		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
+	fi
+
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" -j1 install_ssldirs
+		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs
+	fi
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs. But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
+
+	# Create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# bug #254521
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_preinst() {
+	if use fips; then
+		# Regen fipsmodule.cnf, bug 900625
+		ebegin "Running openssl fipsinstall"
+		"${ED}/usr/bin/openssl" fipsinstall -quiet \
+			-out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
+			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
+		eend $?
+	fi
+
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
+
+pkg_postinst() {
+	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
+	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
+	eend $?
+
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
diff --git a/dev-libs/openssl/openssl-3.1.9999.ebuild b/dev-libs/openssl/openssl-3.1.9999.ebuild
new file mode 100644
index 000000000000..56f9601dd58f
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.1.9999.ebuild
@@ -0,0 +1,289 @@
+# 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/openssl.org.asc
+inherit edo flag-o-matic linux-info toolchain-funcs
+inherit multilib multilib-minimal multiprocessing preserve-libs
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://openssl-library.org/"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == *9999 ]] ; then
+	[[ ${PV} == *.*.9999 ]] && EGIT_BRANCH="openssl-${PV%%.9999}"
+	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
+
+	inherit git-r3
+else
+	inherit verify-sig
+	SRC_URI="
+		https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz
+		verify-sig? (
+			https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz.asc
+		)
+	"
+
+	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+
+	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 )"
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	!<net-misc/openssh-9.2_p1-r3
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+BDEPEND+="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		app-alternatives/bc
+		sys-process/procps
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+pkg_setup() {
+	if use ktls ; then
+		if kernel_is -lt 4 18 ; then
+			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
+		else
+			CONFIG_CHECK="~TLS ~TLS_DEVICE"
+			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
+			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp ; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES} ; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# Test fails depending on kernel configuration, bug #699134
+	rm test/recipes/30-test_afalg.t || die
+}
+
+src_configure() {
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/12247
+	# - https://github.com/openssl/openssl/issues/18225
+	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+	# The OpenSSL developers don't test with LTO right now, it leads to various
+	# warnings/errors (which may or may not be false positives), it's considered
+	# unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663.
+	filter-lto
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# bug #895308
+	append-atomic-flags
+	# Configure doesn't respect LIBS
+	export LDLIBS="${LIBS}"
+
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	#local ec_nistp_64_gcc_128
+	#
+	# Disable it for now though (bug #469976)
+	# Do NOT re-enable without substantial discussion first!
+	#
+	#echo "__uint128_t i;" > "${T}"/128.c
+	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#fi
+
+	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
+	einfo "Using configuration: ${sslout:-(openssl knows best)}"
+
+	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
+	local myeconfargs=(
+		${sslout}
+
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use fips && echo "enable-fips")
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	edo perl "${S}/Configure" "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake build_sw
+
+	if multilib_is_native_abi; then
+		emake build_docs
+	fi
+}
+
+multilib_src_test() {
+	# VFP = show subtests verbosely and show failed tests verbosely
+	# Normal V=1 would show everything verbosely but this slows things down.
+	emake HARNESS_JOBS="$(makeopts_jobs)" -Onone VFP=1 test
+}
+
+multilib_src_install() {
+	# Only -j1 is supported for the install targets:
+	# https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305
+	emake DESTDIR="${D}" -j1 install_sw
+	if use fips; then
+		emake DESTDIR="${D}" -j1 install_fips
+		# Regen this in pkg_preinst, bug 900625
+		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
+	fi
+
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" -j1 install_ssldirs
+		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs
+	fi
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs. But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
+
+	# Create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# bug #254521
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_preinst() {
+	if use fips; then
+		# Regen fipsmodule.cnf, bug 900625
+		ebegin "Running openssl fipsinstall"
+		"${ED}/usr/bin/openssl" fipsinstall -quiet \
+			-out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
+			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
+		eend $?
+	fi
+
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
+
+pkg_postinst() {
+	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
+	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
+	eend $?
+
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
diff --git a/dev-libs/openssl/openssl-3.2.9999.ebuild b/dev-libs/openssl/openssl-3.2.9999.ebuild
new file mode 100644
index 000000000000..162a9453a625
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.2.9999.ebuild
@@ -0,0 +1,295 @@
+# 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/openssl.org.asc
+inherit edo flag-o-matic linux-info toolchain-funcs
+inherit multilib multilib-minimal multiprocessing preserve-libs
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://openssl-library.org/"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == *9999 ]] ; then
+	[[ ${PV} == *.*.9999 ]] && EGIT_BRANCH="openssl-${PV%%.9999}"
+	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
+
+	inherit git-r3
+else
+	inherit verify-sig
+	SRC_URI="
+		https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz
+		verify-sig? (
+			https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz.asc
+		)
+	"
+
+	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+
+	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 )"
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	!<net-misc/openssh-9.2_p1-r3
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+BDEPEND+="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		app-alternatives/bc
+		sys-process/procps
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+pkg_setup() {
+	if use ktls ; then
+		if kernel_is -lt 4 18 ; then
+			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
+		else
+			CONFIG_CHECK="~TLS ~TLS_DEVICE"
+			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
+			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp ; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES} ; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# Test fails depending on kernel configuration, bug #699134
+	rm test/recipes/30-test_afalg.t || die
+}
+
+src_configure() {
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/12247
+	# - https://github.com/openssl/openssl/issues/18225
+	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+	# The OpenSSL developers don't test with LTO right now, it leads to various
+	# warnings/errors (which may or may not be false positives), it's considered
+	# unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663.
+	filter-lto
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# bug #895308 -- check inserts GNU ld-compatible arguments
+	[[ ${CHOST} == *-darwin* ]] || append-atomic-flags
+	# Configure doesn't respect LIBS
+	export LDLIBS="${LIBS}"
+
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	#local ec_nistp_64_gcc_128
+	#
+	# Disable it for now though (bug #469976)
+	# Do NOT re-enable without substantial discussion first!
+	#
+	#echo "__uint128_t i;" > "${T}"/128.c
+	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#fi
+
+	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
+	einfo "Using configuration: ${sslout:-(openssl knows best)}"
+
+	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
+	local myeconfargs=(
+		${sslout}
+
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use fips && echo "enable-fips")
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	edo perl "${S}/Configure" "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake build_sw
+
+	if multilib_is_native_abi; then
+		emake build_docs
+	fi
+}
+
+multilib_src_test() {
+	# See https://github.com/openssl/openssl/blob/master/test/README.md for options.
+	#
+	# VFP = show subtests verbosely and show failed tests verbosely
+	# Normal V=1 would show everything verbosely but this slows things down.
+	#
+	# -j1 here for https://github.com/openssl/openssl/issues/21999, but it
+	# shouldn't matter as tests were already built earlier, and HARNESS_JOBS
+	# controls running the tests.
+	emake -Onone -j1 HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test
+}
+
+multilib_src_install() {
+	# Only -j1 is supported for the install targets:
+	# https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305
+	emake DESTDIR="${D}" -j1 install_sw
+	if use fips; then
+		emake DESTDIR="${D}" -j1 install_fips
+		# Regen this in pkg_preinst, bug 900625
+		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
+	fi
+
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" -j1 install_ssldirs
+		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs
+	fi
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs. But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
+
+	# Create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# bug #254521
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_preinst() {
+	if use fips; then
+		# Regen fipsmodule.cnf, bug 900625
+		ebegin "Running openssl fipsinstall"
+		"${ED}/usr/bin/openssl" fipsinstall -quiet \
+			-out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
+			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
+		eend $?
+	fi
+
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
+
+pkg_postinst() {
+	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
+	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
+	eend $?
+
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
diff --git a/dev-libs/openssl/openssl-3.3.9999.ebuild b/dev-libs/openssl/openssl-3.3.9999.ebuild
new file mode 100644
index 000000000000..41de3131f213
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.3.9999.ebuild
@@ -0,0 +1,293 @@
+# 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/openssl.org.asc
+inherit edo flag-o-matic linux-info toolchain-funcs
+inherit multilib multilib-minimal multiprocessing preserve-libs
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://openssl-library.org/"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == *9999 ]] ; then
+	[[ ${PV} == *.*.9999 ]] && EGIT_BRANCH="openssl-${PV%%.9999}"
+	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
+
+	inherit git-r3
+else
+	inherit verify-sig
+	SRC_URI="
+		https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz
+		verify-sig? (
+			https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz.asc
+		)
+	"
+
+	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+
+	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 )"
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto
+IUSE="+asm cpu_flags_x86_sse2 fips ktls +quic rfc3779 sctp static-libs test tls-compression vanilla weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	!<net-misc/openssh-9.2_p1-r3
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+BDEPEND+="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		app-alternatives/bc
+		sys-process/procps
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+pkg_setup() {
+	if use ktls ; then
+		if kernel_is -lt 4 18 ; then
+			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
+		else
+			CONFIG_CHECK="~TLS ~TLS_DEVICE"
+			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
+			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp ; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile || die
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES} ; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# Test fails depending on kernel configuration, bug #699134
+	rm test/recipes/30-test_afalg.t || die
+}
+
+src_configure() {
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/12247
+	# - https://github.com/openssl/openssl/issues/18225
+	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+	# The OpenSSL developers don't test with LTO right now, it leads to various
+	# warnings/errors (which may or may not be false positives), it's considered
+	# unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663.
+	filter-lto
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# bug #895308 -- check inserts GNU ld-compatible arguments
+	[[ ${CHOST} == *-darwin* ]] || append-atomic-flags
+	# Configure doesn't respect LIBS
+	export LDLIBS="${LIBS}"
+
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	#local ec_nistp_64_gcc_128
+	#
+	# Disable it for now though (bug #469976)
+	# Do NOT re-enable without substantial discussion first!
+	#
+	#echo "__uint128_t i;" > "${T}"/128.c
+	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#fi
+
+	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
+	einfo "Using configuration: ${sslout:-(openssl knows best)}"
+
+	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
+	local myeconfargs=(
+		${sslout}
+
+		$(multilib_is_native_abi || echo "no-docs")
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use fips && echo "enable-fips")
+		$(use quic && echo "enable-quic")
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	edo perl "${S}/Configure" "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake build_sw
+}
+
+multilib_src_test() {
+	# See https://github.com/openssl/openssl/blob/master/test/README.md for options.
+	#
+	# VFP = show subtests verbosely and show failed tests verbosely
+	# Normal V=1 would show everything verbosely but this slows things down.
+	#
+	# -j1 here for https://github.com/openssl/openssl/issues/21999, but it
+	# shouldn't matter as tests were already built earlier, and HARNESS_JOBS
+	# controls running the tests.
+	emake -Onone -j1 HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test
+}
+
+multilib_src_install() {
+	# Only -j1 is supported for the install targets:
+	# https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305
+	emake DESTDIR="${D}" -j1 install_sw
+	if use fips; then
+		emake DESTDIR="${D}" -j1 install_fips
+		# Regen this in pkg_preinst, bug 900625
+		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
+	fi
+
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" -j1 install_ssldirs
+		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs
+	fi
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs. But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
+
+	# Create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# bug #254521
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_preinst() {
+	if use fips; then
+		# Regen fipsmodule.cnf, bug 900625
+		ebegin "Running openssl fipsinstall"
+		"${ED}/usr/bin/openssl" fipsinstall -quiet \
+			-out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
+			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
+		eend $?
+	fi
+
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
+
+pkg_postinst() {
+	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
+	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
+	eend $?
+
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
diff --git a/dev-libs/openssl/openssl-3.4.9999.ebuild b/dev-libs/openssl/openssl-3.4.9999.ebuild
new file mode 100644
index 000000000000..41de3131f213
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.4.9999.ebuild
@@ -0,0 +1,293 @@
+# 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/openssl.org.asc
+inherit edo flag-o-matic linux-info toolchain-funcs
+inherit multilib multilib-minimal multiprocessing preserve-libs
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://openssl-library.org/"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == *9999 ]] ; then
+	[[ ${PV} == *.*.9999 ]] && EGIT_BRANCH="openssl-${PV%%.9999}"
+	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
+
+	inherit git-r3
+else
+	inherit verify-sig
+	SRC_URI="
+		https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz
+		verify-sig? (
+			https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz.asc
+		)
+	"
+
+	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+
+	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 )"
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto
+IUSE="+asm cpu_flags_x86_sse2 fips ktls +quic rfc3779 sctp static-libs test tls-compression vanilla weak-ssl-ciphers"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	!<net-misc/openssh-9.2_p1-r3
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+BDEPEND+="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		app-alternatives/bc
+		sys-process/procps
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+pkg_setup() {
+	if use ktls ; then
+		if kernel_is -lt 4 18 ; then
+			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
+		else
+			CONFIG_CHECK="~TLS ~TLS_DEVICE"
+			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
+			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl doesn't work with userpriv!
+	if use test && use sctp ; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile || die
+
+	if ! use vanilla ; then
+		PATCHES+=(
+			# Add patches which are Gentoo-specific customisations here
+		)
+	fi
+
+	default
+
+	if use test && use sctp && has network-sandbox ${FEATURES} ; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# Test fails depending on kernel configuration, bug #699134
+	rm test/recipes/30-test_afalg.t || die
+}
+
+src_configure() {
+	# Keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (bug #417795 again)
+	tc-is-clang && append-flags -Qunused-arguments
+
+	# We really, really need to build OpenSSL w/ strict aliasing disabled.
+	# It's filled with violations and it *will* result in miscompiled
+	# code. This has been in the ebuild for > 10 years but even in 2022,
+	# it's still relevant:
+	# - https://github.com/llvm/llvm-project/issues/55255
+	# - https://github.com/openssl/openssl/issues/12247
+	# - https://github.com/openssl/openssl/issues/18225
+	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
+	# Don't remove the no strict aliasing bits below!
+	filter-flags -fstrict-aliasing
+	append-flags -fno-strict-aliasing
+	# The OpenSSL developers don't test with LTO right now, it leads to various
+	# warnings/errors (which may or may not be false positives), it's considered
+	# unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663.
+	filter-lto
+
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# bug #895308 -- check inserts GNU ld-compatible arguments
+	[[ ${CHOST} == *-darwin* ]] || append-atomic-flags
+	# Configure doesn't respect LIBS
+	export LDLIBS="${LIBS}"
+
+	# bug #197996
+	unset APPS
+	# bug #312551
+	unset SCRIPTS
+	# bug #311473
+	unset CROSS_COMPILE
+
+	tc-export AR CC CXX RANLIB RC
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths, bug #460790.
+	#local ec_nistp_64_gcc_128
+	#
+	# Disable it for now though (bug #469976)
+	# Do NOT re-enable without substantial discussion first!
+	#
+	#echo "__uint128_t i;" > "${T}"/128.c
+	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#fi
+
+	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
+	einfo "Using configuration: ${sslout:-(openssl knows best)}"
+
+	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
+	local myeconfargs=(
+		${sslout}
+
+		$(multilib_is_native_abi || echo "no-docs")
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use fips && echo "enable-fips")
+		$(use quic && echo "enable-quic")
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use test || echo "no-tests")
+		$(use_ssl tls-compression zlib)
+		$(use_ssl weak-ssl-ciphers)
+
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+
+		shared
+		threads
+	)
+
+	edo perl "${S}/Configure" "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake build_sw
+}
+
+multilib_src_test() {
+	# See https://github.com/openssl/openssl/blob/master/test/README.md for options.
+	#
+	# VFP = show subtests verbosely and show failed tests verbosely
+	# Normal V=1 would show everything verbosely but this slows things down.
+	#
+	# -j1 here for https://github.com/openssl/openssl/issues/21999, but it
+	# shouldn't matter as tests were already built earlier, and HARNESS_JOBS
+	# controls running the tests.
+	emake -Onone -j1 HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test
+}
+
+multilib_src_install() {
+	# Only -j1 is supported for the install targets:
+	# https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305
+	emake DESTDIR="${D}" -j1 install_sw
+	if use fips; then
+		emake DESTDIR="${D}" -j1 install_fips
+		# Regen this in pkg_preinst, bug 900625
+		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
+	fi
+
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" -j1 install_ssldirs
+		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs
+	fi
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs. But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
+
+	# Create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# bug #254521
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_preinst() {
+	if use fips; then
+		# Regen fipsmodule.cnf, bug 900625
+		ebegin "Running openssl fipsinstall"
+		"${ED}/usr/bin/openssl" fipsinstall -quiet \
+			-out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
+			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
+		eend $?
+	fi
+
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
+
+pkg_postinst() {
+	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
+	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
+	eend $?
+
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+		/usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
+}
diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
index a0c7fbe21642..25842e2da528 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-wayland-protocols-1.14.0.tar.xz 45776 BLAKE2B 1b2373b87ea7c6c0d82fd527ad07450747b4dda5d7b1ef73d122243f2ce4959b7ed32ead265cd93f9466802d84fb7486d123803c6665525b67b65d935b23014a SHA512 6f5acfa6fdbe7c4b362698c7fbfc6011c342fe9aadebc9677b21960887249ede876062eb1d5103b4440b577bd5add90a61c21ca7d7300c8b374129e50e621911
 DIST plasma-wayland-protocols-1.15.0.tar.xz 46356 BLAKE2B 9514d65ccac94f51ae1c23268c4b977464574221211b46719f22b9286d7f439743b7ac5e048127b1ad92d18157de1fa2d5f9ee830ee728eeba38115c94b4b69a SHA512 6d89261380dd8343db51215b2e5495d38d3c12ea0dd3efdb7e5e651024b8c3ab88b86f9dea57d0aa1382971e1053551833ca87689dfdb3da3f259b2ab6e09412
+DIST plasma-wayland-protocols-1.16.0.tar.xz 46904 BLAKE2B ac564ee2d51bdfd7fe7d3b63d5c057b5ada273ed31bf11d56c21941f5660755ede42a6ec7f80f07083db0c9f9ab8e3e88bffc70dfcc149f9b4e580481746f242 SHA512 2befeffcb4593ba6efeb19202adc136c4ffef0b7851fe81ed68d5dd5add91d11c88fcd1e09ac4767f3827dbd6b6a3c48e769b864f5e1fea9ae88674d61d9ea47
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.15.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.15.0.ebuild
index 35ebde149a5d..6f1aed84acf7 100644
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.15.0.ebuild
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.15.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.16.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.16.0.ebuild
new file mode 100644
index 000000000000..d9df14c50669
--- /dev/null
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.16.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake kde.org
+
+DESCRIPTION="Plasma Specific Protocols for Wayland"
+HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/wayland )"
+BDEPEND="
+	dev-libs/libpcre2:*
+	dev-qt/qtbase:6
+	>=kde-frameworks/extra-cmake-modules-6.0:*
+	test? ( dev-util/wayland-scanner )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT_MAJOR_VERSION=6
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass
+		-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/poco/files/poco-1.14.0-missing-utf8proc.patch b/dev-libs/poco/files/poco-1.14.0-missing-utf8proc.patch
new file mode 100644
index 000000000000..82f5d0c46036
--- /dev/null
+++ b/dev-libs/poco/files/poco-1.14.0-missing-utf8proc.patch
@@ -0,0 +1,58 @@
+https://bugs.gentoo.org/947508
+https://github.com/pocoproject/poco/pull/4816
+
+From b5873caae53ef9adaecd7d10897c47b0b4812b3e Mon Sep 17 00:00:00 2001
+From: Matej Kenda <matejken@gmail.com>
+Date: Wed, 11 Dec 2024 16:18:04 +0100
+Subject: [PATCH] CMake: fix for missing utf8proc with unbundled build,
+ resolves #4798 (#4816)
+
+* fix(cmake): Add missing install and find dependency for utf8proc in unbundled build.
+
+* chore(gitignore): Corrected path to Qt creator generated build files.
+---
+ .gitignore                                  | 2 +-
+ CMakeLists.txt                              | 4 ++--
+ Foundation/cmake/PocoFoundationConfig.cmake | 1 +
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/.gitignore b/.gitignore
+index 4c163f64de..3a5ed86f82 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -48,7 +48,7 @@ config.make
+ 
+ # Qt Creator #
+ #########
+-build/
++build/Qt_*
+ 
+ # CMake #
+ ########
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 861c27c565..2d120e68fb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -557,8 +557,8 @@ install(
+ )
+ 
+ if(POCO_UNBUNDLED)
+-	install(FILES cmake/FindPCRE2.cmake
+-			DESTINATION "${PocoConfigPackageLocation}")
++	install(FILES cmake/FindPCRE2.cmake DESTINATION "${PocoConfigPackageLocation}")
++	install(FILES cmake/FindUtf8Proc.cmake DESTINATION "${PocoConfigPackageLocation}")
+ endif()
+ 
+ message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator")
+diff --git a/Foundation/cmake/PocoFoundationConfig.cmake b/Foundation/cmake/PocoFoundationConfig.cmake
+index 82c5788940..32b5d83023 100644
+--- a/Foundation/cmake/PocoFoundationConfig.cmake
++++ b/Foundation/cmake/PocoFoundationConfig.cmake
+@@ -3,6 +3,7 @@ if(@POCO_UNBUNDLED@)
+ 	list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
+ 	find_dependency(ZLIB REQUIRED)
+ 	find_dependency(PCRE2 REQUIRED)
++	find_dependency(Utf8Proc REQUIRED)
+ endif()
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/PocoFoundationTargets.cmake")
diff --git a/dev-libs/poco/poco-1.14.0-r1.ebuild b/dev-libs/poco/poco-1.14.0-r1.ebuild
new file mode 100644
index 000000000000..e93b9e8e1966
--- /dev/null
+++ b/dev-libs/poco/poco-1.14.0-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C++ libraries for building network-based applications"
+HOMEPAGE="https://pocoproject.org/"
+SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}-release"
+
+LICENSE="Boost-1.0"
+# SHARED_LIBRARY_VERSION -> "${S}"/libversion
+SLOT="0/110"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="7z activerecord avahi cppparser +crypt +data examples +file2pagecompiler iodbc mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc postgres prometheus sqlite test +util +xml +zip"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	activerecord? ( util xml )
+	7z? ( xml )
+	file2pagecompiler? ( pagecompiler )
+	iodbc? ( odbc )
+	mongodb? ( data )
+	mysql? ( data )
+	odbc? ( data )
+	postgres? ( data )
+	pagecompiler? ( net util xml )
+	pocodoc? ( cppparser util xml )
+	sqlite? ( data )
+	crypt? ( util )
+	test? ( data? ( sqlite ) activerecord cppparser crypt pdf prometheus xml )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+RDEPEND="
+	>=dev-libs/libpcre2-10.40:=
+	dev-libs/libutf8proc:=
+
+	activerecord? ( !app-arch/arc )
+	avahi? ( net-dns/avahi:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	odbc? (
+		iodbc? ( dev-db/libiodbc )
+		!iodbc? ( dev-db/unixODBC )
+	)
+	pdf? ( media-libs/libpng:= )
+	sqlite? ( dev-db/sqlite:3 )
+	crypt? (
+		dev-libs/openssl:=
+	)
+	xml? ( dev-libs/expat )
+	zip? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-missing-utf8proc.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${SLOT} != 0/$(< "${S}"/libversion) ]] ; then
+		die "Please update subslot in ebuild to the version in ${S}/libversion!"
+	fi
+
+	if use test ; then
+		# ignore missing tests on experimental library
+		# and tests requiring running DB-servers, internet connections, etc.
+		sed -i -e '/testsuite/d' \
+			{Data/{,MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,Redis}/CMakeLists.txt || die
+
+		# Poco expands ~ using passwd, which does not match $HOME in the build environment
+		sed -i -e '/CppUnit_addTest.*testExpand/d' \
+			Foundation/testsuite/src/PathTest.cpp || die
+	fi
+
+	sed -i 's/ENABLE_DNSSD_AVHAI/ENABLE_DNSSD_AVAHI/' DNSSD/CMakeLists.txt || die
+}
+
+src_configure() {
+	# apache support is dead and buggy, https://github.com/pocoproject/poco/issues/1764
+	local mycmakeargs=(
+		-DPOCO_UNBUNDLED=ON
+		-DENABLE_APACHECONNECTOR=OFF
+		-DENABLE_ACTIVERECORD="$(usex activerecord)"
+		-DENABLE_ACTIVERECORD_COMPILER="$(usex activerecord)"
+		-DENABLE_CPPPARSER="$(usex cppparser)"
+		-DENABLE_CRYPTO="$(usex crypt)"
+		-DENABLE_DATA="$(usex data)"
+		-DENABLE_DATA_MYSQL="$(usex mysql)"
+		-DENABLE_DATA_ODBC="$(usex odbc)"
+		-DENABLE_DATA_POSTGRESQL="$(usex postgres)"
+		-DENABLE_DATA_SQLITE="$(usex sqlite)"
+		-DENABLE_DNSSD="$(usex avahi)"
+		-DENABLE_DNSSD_AVAHI="$(usex avahi)"
+		-DENABLE_JSON="$(usex util)"
+		-DENABLE_JWT="$(usex crypt)"
+		-DENABLE_MONGODB="$(usex mongodb)"
+		-DENABLE_NET="$(usex net)"
+		-DENABLE_NETSSL="$(usex crypt)"
+		-DENABLE_NETSSL_WIN=OFF
+		-DENABLE_PAGECOMPILER="$(usex pagecompiler)"
+		-DENABLE_PAGECOMPILER_FILE2PAGE="$(usex file2pagecompiler)"
+		-DENABLE_PDF="$(usex pdf)"
+		-DENABLE_POCODOC="$(usex pocodoc)"
+		-DENABLE_PROMETHEUS="$(usex prometheus)"
+		-DENABLE_SEVENZIP="$(usex 7z)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_UTIL="$(usex util)"
+		-DENABLE_XML="$(usex xml)"
+		-DENABLE_ZIP="$(usex zip)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	POCO_BASE="${S}" cmake_src_test -E DataPostgreSQL
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples ; then
+		for sd in */samples ; do
+			docinto examples/${sd%/samples}
+			dodoc -r ${sd}
+		done
+
+		find "${D}/usr/share/doc/${PF}/examples" \
+			-iname "*.sln" -or -iname "*.vcproj" -or \
+			-iname "*.vmsbuild" -or -iname "*.properties" \
+			| xargs rm -v || die
+	fi
+}
diff --git a/dev-libs/poco/poco-1.14.0.ebuild b/dev-libs/poco/poco-1.14.0.ebuild
deleted file mode 100644
index 122e330a4374..000000000000
--- a/dev-libs/poco/poco-1.14.0.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C++ libraries for building network-based applications"
-HOMEPAGE="https://pocoproject.org/"
-SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}-release"
-
-LICENSE="Boost-1.0"
-# SHARED_LIBRARY_VERSION -> "${S}"/libversion
-SLOT="0/110"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="7z activerecord avahi cppparser +crypt +data examples +file2pagecompiler iodbc mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc postgres prometheus sqlite test +util +xml +zip"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	activerecord? ( util xml )
-	7z? ( xml )
-	file2pagecompiler? ( pagecompiler )
-	iodbc? ( odbc )
-	mongodb? ( data )
-	mysql? ( data )
-	odbc? ( data )
-	postgres? ( data )
-	pagecompiler? ( net util xml )
-	pocodoc? ( cppparser util xml )
-	sqlite? ( data )
-	crypt? ( util )
-	test? ( data? ( sqlite ) activerecord cppparser crypt pdf prometheus xml )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-RDEPEND="
-	>=dev-libs/libpcre2-10.40:=
-	dev-libs/libutf8proc:=
-
-	activerecord? ( !app-arch/arc )
-	avahi? ( net-dns/avahi:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	odbc? (
-		iodbc? ( dev-db/libiodbc )
-		!iodbc? ( dev-db/unixODBC )
-	)
-	pdf? ( media-libs/libpng:= )
-	sqlite? ( dev-db/sqlite:3 )
-	crypt? (
-		dev-libs/openssl:=
-	)
-	xml? ( dev-libs/expat )
-	zip? ( sys-libs/zlib:= )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${SLOT} != 0/$(< "${S}"/libversion) ]] ; then
-		die "Please update subslot in ebuild to the version in ${S}/libversion!"
-	fi
-
-	if use test ; then
-		# ignore missing tests on experimental library
-		# and tests requiring running DB-servers, internet connections, etc.
-		sed -i -e '/testsuite/d' \
-			{Data/{,MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,Redis}/CMakeLists.txt || die
-
-		# Poco expands ~ using passwd, which does not match $HOME in the build environment
-		sed -i -e '/CppUnit_addTest.*testExpand/d' \
-			Foundation/testsuite/src/PathTest.cpp || die
-	fi
-
-	sed -i 's/ENABLE_DNSSD_AVHAI/ENABLE_DNSSD_AVAHI/' DNSSD/CMakeLists.txt || die
-}
-
-src_configure() {
-	# apache support is dead and buggy, https://github.com/pocoproject/poco/issues/1764
-	local mycmakeargs=(
-		-DPOCO_UNBUNDLED=ON
-		-DENABLE_APACHECONNECTOR=OFF
-		-DENABLE_ACTIVERECORD="$(usex activerecord)"
-		-DENABLE_ACTIVERECORD_COMPILER="$(usex activerecord)"
-		-DENABLE_CPPPARSER="$(usex cppparser)"
-		-DENABLE_CRYPTO="$(usex crypt)"
-		-DENABLE_DATA="$(usex data)"
-		-DENABLE_DATA_MYSQL="$(usex mysql)"
-		-DENABLE_DATA_ODBC="$(usex odbc)"
-		-DENABLE_DATA_POSTGRESQL="$(usex postgres)"
-		-DENABLE_DATA_SQLITE="$(usex sqlite)"
-		-DENABLE_DNSSD="$(usex avahi)"
-		-DENABLE_DNSSD_AVAHI="$(usex avahi)"
-		-DENABLE_JSON="$(usex util)"
-		-DENABLE_JWT="$(usex crypt)"
-		-DENABLE_MONGODB="$(usex mongodb)"
-		-DENABLE_NET="$(usex net)"
-		-DENABLE_NETSSL="$(usex crypt)"
-		-DENABLE_NETSSL_WIN=OFF
-		-DENABLE_PAGECOMPILER="$(usex pagecompiler)"
-		-DENABLE_PAGECOMPILER_FILE2PAGE="$(usex file2pagecompiler)"
-		-DENABLE_PDF="$(usex pdf)"
-		-DENABLE_POCODOC="$(usex pocodoc)"
-		-DENABLE_PROMETHEUS="$(usex prometheus)"
-		-DENABLE_SEVENZIP="$(usex 7z)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_UTIL="$(usex util)"
-		-DENABLE_XML="$(usex xml)"
-		-DENABLE_ZIP="$(usex zip)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	POCO_BASE="${S}" cmake_src_test -E DataPostgreSQL
-}
-
-src_install() {
-	cmake_src_install
-
-	if use examples ; then
-		for sd in */samples ; do
-			docinto examples/${sd%/samples}
-			dodoc -r ${sd}
-		done
-
-		find "${D}/usr/share/doc/${PF}/examples" \
-			-iname "*.sln" -or -iname "*.vcproj" -or \
-			-iname "*.vmsbuild" -or -iname "*.properties" \
-			| xargs rm -v || die
-	fi
-}
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 3c3a725e543d..92ff8602671f 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -6,8 +6,11 @@ DIST protobuf-23.4.tar.gz 5043507 BLAKE2B bf6a50771eb977ef92b779a32fd909693faae6
 DIST protobuf-24.4.tar.gz 5180235 BLAKE2B 1c7e9035d9f3810886baaea7d679414c882463c79828c99dd8895a9549638c1ca17f9ab3b38d461019f3e1412d9cb9584b995b1da99866eb6fdbb8bdeb063e6f SHA512 52b6ab5587d03cbd1f35cf3cdc388e1710fa50f3031559ac53cf754965407ded7602cdead56080444ab695588112cc3391a1d7fdd5e565d90d0af7ad08706315
 DIST protobuf-25.3.tar.gz 5878962 BLAKE2B 9268f9bd993a1cfd6d3937a2ad56ba4cfe3d84923756513841cbf13039d4a07acb260468745cb1294f30334cb34b45c6fde272f5c40d9de63ac6a4ce5c263077 SHA512 1f73e237c919082e5423ae9e2ea8813dccf672c059051d1531fe89ffaa45872d3cf3052b8c3af26f674296ec17d7dc861c67b8f0834ed80261ce4a6a14ed7115
 DIST protobuf-25.4.tar.gz 5878444 BLAKE2B 9b40985bda31a84dd3ab7a1d18f746d5f88660d9e036a20234cbc85e79322005d2ffd4e60d72c55a8b5f624d7cc50522771f0804f203f2eabca7b0b8ace0545e SHA512 1b3ba1a1575bcc9d52ddce93d466912863d600dfbb40f64845b8e66c8000047d05508b8f1baba8d5eef42a7ff90eb778f7c8a553c9ec2778fd3a9a18122c67ab
+DIST protobuf-25.5.tar.gz 5877036 BLAKE2B a8174c7cbda47afa3f31d64c7a7aa7f233efd5df5a783abedd229613c8c27a2380684fb5851dad67f76f063688dd8060a0a373f2c95441c2ad91630eb187af22 SHA512 9fe130f5c04919accc99113e13096df93db4c2254a9c2428faf9459416907c77fbf4adefbae3fe644e1f26d9c1fc597165e2c5b6219156c97500d6ef3fdc0793
 DIST protobuf-26.1.tar.gz 5957903 BLAKE2B 1a7faab2f56aa0995801a80f73a812c7fc38a00af0bf25bdd5eecf7aec27a86a575ea2fb8484787d19c9ac6e46007c9864e79464f529c446f31af732981feed1 SHA512 0363ac09f92d8e040491425d444c8dca0b9b430e02d2dff6e2b28a0c2b2bea0d33a47f50bc9e2e2d4e8e22b65a02009a20c0066fb89c75df93a7b703dda42ed4
 DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397
 DIST protobuf-27.4.tar.gz 9156456 BLAKE2B 004427f4923e523bf77298600bf91a8fe4ca8be4bd6da5b7efcfe9186a032155e525426f83f683e1bed1e799ed1e62d250053386c1463cbd0c062bd05da786d0 SHA512 d076ce7e075096d0dba7ee2314b12e3223c4239c019e25670636a0ef812ddf0ce3f1fd9b9fe8517319db87b14bbdb2653cc4e06023f90032dfedb014457b2863
+DIST protobuf-27.5.tar.gz 9153935 BLAKE2B 08b1b5927188e68ef2ae8ce8cdc6f21c34ee8453f4dfaeb362a7f5a5f0ee5ddc24772e5583ab10fbf193aa43e7fdd316e8fbbe4d066df704aef5469dae01fc8d SHA512 bb266483b11268c207aa0e8ce76442351a331f30151586714d57ed7c9bae05f09aabf5042b90eac85658f708671ba0b33c64d1c58a91a24c00bbf4f4ffdce1bb
 DIST protobuf-28.0.tar.gz 9259114 BLAKE2B 328e09ebffb296d838557ea72a4fc4da8e0ad5f1edfccebcc8ee7c9e0e74d06e5e6dbad741fd89f6a4502c1cb246a973fd60c035ccdbf89700b7baff49e2a65e SHA512 8745f625ac781f3bbefe9494cbf570143d38aecc1521edef7a52ffb403b8be24df2c71f4f2410b5a5b78a0f3e8a38a7d19be2cf916b1b9125349d2da18262cd1
 DIST protobuf-28.3.tar.gz 9256608 BLAKE2B 05162124676abe18300481e9f985fd2cfb09b052d06670a993e79ef02f3daf0d5380b521977ebc2362d4094486151ea285fe1c98a1d2f3799b18a1fa422fdc13 SHA512 a91e175fed7eb01c4240842a5af73a7d3cefccbb10885434bceeb7bc89ab6c56a74912cee290bf46e81d4026f3c9c2b10faad5545816064e215c4bae7908263d
+DIST protobuf-29.2.tar.gz 9348408 BLAKE2B 847798474bc6a76b9badfdbf605e118dece5e321e81242d7fa1bf5f5d17ee05a3d365ec112dc6d861cade97efff8be1d5d04006a5144f613bdb3ff5eacc63b99 SHA512 aeb21773edc3dd92a6c1ba6ccd721cc8a20d61230a5309c75ee3ef19baa554c228a6d1095f191ccc18f10183b646f3140dfe6526f5812bcaa64b7d5260572643
diff --git a/dev-libs/protobuf/protobuf-25.5.ebuild b/dev-libs/protobuf/protobuf-25.5.ebuild
new file mode 100644
index 000000000000..6a9820f1a034
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-25.5.ebuild
@@ -0,0 +1,169 @@
+# Copyright 2008-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib elisp-common multilib
+
+# NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules
+ABSEIL_BRANCH="lts_2023_08_02"
+
+ABSEIL_MIN_VER="${ABSEIL_BRANCH//lts_}"
+ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
+
+if [[ "${PV}" == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=( '-*' )
+	MY_SLOT="28.0"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	MY_SLOT=$(ver_cut 1-2)
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://protobuf.dev/"
+
+LICENSE="BSD"
+SLOT="0/${MY_SLOT}.0"
+IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
+
+# Require protobuf for the time being
+REQUIRED_USE="
+	protobuf
+	examples? ( protobuf protoc )
+	libprotoc? ( protobuf )
+	libupb? (	protobuf )
+	protoc? ( protobuf )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	emacs? ( app-editors/emacs:* )
+"
+
+COMMON_DEPEND="
+	>=dev-cpp/abseil-cpp-${ABSEIL_MIN_VER}:=[${MULTILIB_USEDEP}]
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	conformance? ( dev-libs/jsoncpp[${MULTILIB_USEDEP}] )
+	test? ( >=dev-cpp/gtest-1.11[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	${BDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-26.1-disable-32-bit-tests.patch"
+	"${FILESDIR}/${PN}-23.3-static_assert-failure.patch"
+	"${FILESDIR}/${PN}-27.4-findJsonCpp.patch"
+)
+
+DOCS=( CONTRIBUTORS.txt README.md )
+
+src_prepare() {
+	cmake_src_prepare
+
+	cp "${FILESDIR}/FindJsonCpp.cmake" "${S}/cmake" || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-Dprotobuf_ABSL_PROVIDER="package"
+		-Dprotobuf_JSONCPP_PROVIDER="package"
+
+		-Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")"
+		-Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)"
+		-Dprotobuf_BUILD_LIBUPB="$(usex libupb)"
+		-Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)"
+		-Dprotobuf_BUILD_PROTOC_BINARIES="$(usex protoc)"
+		-Dprotobuf_BUILD_SHARED_LIBS="yes"
+		-Dprotobuf_BUILD_TESTS="$(usex test)"
+
+		-Dprotobuf_DISABLE_RTTI="no"
+
+		-Dprotobuf_INSTALL="yes"
+		-Dprotobuf_TEST_XML_OUTDIR="$(usex test)"
+
+		-Dprotobuf_WITH_ZLIB="$(usex zlib)"
+		-Dprotobuf_VERBOSE="$(usex debug)"
+		-DCMAKE_MODULE_PATH="${S}/cmake"
+	)
+	if use protobuf ; then
+		if use examples ; then
+			mycmakeargs+=(
+				-Dprotobuf_BUILD_EXAMPLES="$(usex examples)"
+				-Dprotobuf_INSTALL_EXAMPLES="$(usex examples)"
+			)
+		fi
+	fi
+
+	use test && mycmakeargs+=( -Dprotobuf_USE_EXTERNAL_GTEST="yes" )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+src_test() {
+	local -x srcdir="${S}/src"
+
+	local -x TEST_TMPDIR="${T%/}/TEST_TMPDIR_${ABI}"
+	mkdir -m 777 "${TEST_TMPDIR}" || die
+
+	setup_test_env() {
+		ln -sr "${S}/src" "${BUILD_DIR}/include" || die
+	}
+
+	multilib_foreach_abi setup_test_env
+
+	cmake-multilib_src_test
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" ]]; then
+		eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
+			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})"
+		die "Please update SLOT variable"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install "${PN}" editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-27.5.ebuild b/dev-libs/protobuf/protobuf-27.5.ebuild
new file mode 100644
index 000000000000..3c5e73019120
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-27.5.ebuild
@@ -0,0 +1,170 @@
+# Copyright 2008-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib elisp-common multilib
+
+# NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules
+ABSEIL_BRANCH="lts_2023_08_02"
+
+ABSEIL_MIN_VER="${ABSEIL_BRANCH//lts_}"
+ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
+
+if [[ "${PV}" == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=( '-*' )
+	MY_SLOT="28.0"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	MY_SLOT=$(ver_cut 1-2)
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://protobuf.dev/"
+
+LICENSE="BSD"
+SLOT="0/${MY_SLOT}.0"
+IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
+
+# Require protobuf for the time being
+REQUIRED_USE="
+	protobuf
+	examples? ( protobuf protoc )
+	libprotoc? ( protobuf )
+	libupb? (	protobuf )
+	protoc? ( protobuf )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	emacs? ( app-editors/emacs:* )
+"
+
+COMMON_DEPEND="
+	>=dev-cpp/abseil-cpp-${ABSEIL_MIN_VER}:=[${MULTILIB_USEDEP}]
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	conformance? ( dev-libs/jsoncpp[${MULTILIB_USEDEP}] )
+	test? ( >=dev-cpp/gtest-1.11[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	${BDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-26.1-disable-32-bit-tests.patch"
+	"${FILESDIR}/${PN}-23.3-static_assert-failure.patch"
+	"${FILESDIR}/${PN}-27.4-findJsonCpp.patch"
+	"${FILESDIR}/${PN}-28.0-disable-test_upb-lto.patch"
+)
+
+DOCS=( CONTRIBUTORS.txt README.md )
+
+src_prepare() {
+	cmake_src_prepare
+
+	cp "${FILESDIR}/FindJsonCpp.cmake" "${S}/cmake" || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-Dprotobuf_ABSL_PROVIDER="package"
+		-Dprotobuf_JSONCPP_PROVIDER="package"
+
+		-Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")"
+		-Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)"
+		-Dprotobuf_BUILD_LIBUPB="$(usex libupb)"
+		-Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)"
+		-Dprotobuf_BUILD_PROTOC_BINARIES="$(usex protoc)"
+		-Dprotobuf_BUILD_SHARED_LIBS="yes"
+		-Dprotobuf_BUILD_TESTS="$(usex test)"
+
+		-Dprotobuf_DISABLE_RTTI="no"
+
+		-Dprotobuf_INSTALL="yes"
+		-Dprotobuf_TEST_XML_OUTDIR="$(usex test)"
+
+		-Dprotobuf_WITH_ZLIB="$(usex zlib)"
+		-Dprotobuf_VERBOSE="$(usex debug)"
+		-DCMAKE_MODULE_PATH="${S}/cmake"
+	)
+	if use protobuf ; then
+		if use examples ; then
+			mycmakeargs+=(
+				-Dprotobuf_BUILD_EXAMPLES="$(usex examples)"
+				-Dprotobuf_INSTALL_EXAMPLES="$(usex examples)"
+			)
+		fi
+	fi
+
+	use test && mycmakeargs+=( -Dprotobuf_USE_EXTERNAL_GTEST="yes" )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+src_test() {
+	local -x srcdir="${S}/src"
+
+	local -x TEST_TMPDIR="${T%/}/TEST_TMPDIR_${ABI}"
+	mkdir -m 777 "${TEST_TMPDIR}" || die
+
+	setup_test_env() {
+		ln -sr "${S}/src" "${BUILD_DIR}/include" || die
+	}
+
+	multilib_foreach_abi setup_test_env
+
+	cmake-multilib_src_test
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" ]]; then
+		eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
+			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})"
+		die "Please update SLOT variable"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install "${PN}" editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-28.0.ebuild b/dev-libs/protobuf/protobuf-28.0.ebuild
index 7e7dfd9eae0a..08a9d6fd464f 100644
--- a/dev-libs/protobuf/protobuf-28.0.ebuild
+++ b/dev-libs/protobuf/protobuf-28.0.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
@@ -127,6 +127,14 @@ src_test() {
 
 	multilib_foreach_abi setup_test_env
 
+	# Do headstands for LTO # 942985
+	local -x GTEST_FILTER
+	GTEST_FILTER="-FileDescriptorSetSource/EncodeDecodeTest*"
+
+	cmake-multilib_src_test
+
+	GTEST_FILTER="${GTEST_FILTER//-/}"
+
 	cmake-multilib_src_test
 }
 
diff --git a/dev-libs/protobuf/protobuf-28.3-r1.ebuild b/dev-libs/protobuf/protobuf-28.3-r1.ebuild
new file mode 100644
index 000000000000..ed7af8070753
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-28.3-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 2008-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib elisp-common multilib
+
+# NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules
+ABSEIL_BRANCH="lts_2023_08_02"
+
+ABSEIL_MIN_VER="${ABSEIL_BRANCH//lts_}"
+ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
+
+if [[ "${PV}" == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=( '-*' )
+	MY_SLOT="28.0"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	MY_SLOT=$(ver_cut 1-2)
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://protobuf.dev/"
+
+LICENSE="BSD"
+SLOT="0/${MY_SLOT}.0"
+IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
+
+# Require protobuf for the time being
+REQUIRED_USE="
+	protobuf
+	examples? ( protobuf protoc )
+	libprotoc? ( protobuf )
+	libupb? (	protobuf )
+	protoc? ( protobuf )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	emacs? ( app-editors/emacs:* )
+"
+
+COMMON_DEPEND="
+	>=dev-cpp/abseil-cpp-${ABSEIL_MIN_VER}:=[${MULTILIB_USEDEP}]
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	conformance? ( dev-libs/jsoncpp[${MULTILIB_USEDEP}] )
+	test? ( >=dev-cpp/gtest-1.11[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	${BDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-26.1-disable-32-bit-tests.patch"
+	"${FILESDIR}/${PN}-23.3-static_assert-failure.patch"
+	"${FILESDIR}/${PN}-27.4-findJsonCpp.patch"
+	"${FILESDIR}/${PN}-28.0-disable-test_upb-lto.patch"
+)
+
+DOCS=( CONTRIBUTORS.txt README.md )
+
+src_prepare() {
+	cmake_src_prepare
+
+	cp "${FILESDIR}/FindJsonCpp.cmake" "${S}/cmake" || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-Dprotobuf_ABSL_PROVIDER="package"
+		-Dprotobuf_JSONCPP_PROVIDER="package"
+
+		-Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")"
+		-Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)"
+		-Dprotobuf_BUILD_LIBUPB="$(usex libupb)"
+		-Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)"
+		-Dprotobuf_BUILD_PROTOC_BINARIES="$(usex protoc)"
+		-Dprotobuf_BUILD_SHARED_LIBS="yes"
+		-Dprotobuf_BUILD_TESTS="$(usex test)"
+
+		-Dprotobuf_DISABLE_RTTI="no"
+
+		-Dprotobuf_INSTALL="yes"
+		-Dprotobuf_TEST_XML_OUTDIR="$(usex test)"
+
+		-Dprotobuf_WITH_ZLIB="$(usex zlib)"
+		-Dprotobuf_VERBOSE="$(usex debug)"
+		-DCMAKE_MODULE_PATH="${S}/cmake"
+	)
+	if use protobuf ; then
+		if use examples ; then
+			mycmakeargs+=(
+				-Dprotobuf_BUILD_EXAMPLES="$(usex examples)"
+				-Dprotobuf_INSTALL_EXAMPLES="$(usex examples)"
+			)
+		fi
+	fi
+
+	use test && mycmakeargs+=( -Dprotobuf_USE_EXTERNAL_GTEST="yes" )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+src_test() {
+	local -x srcdir="${S}/src"
+
+	local -x TEST_TMPDIR="${T%/}/TEST_TMPDIR_${ABI}"
+	mkdir -m 777 "${TEST_TMPDIR}" || die
+
+	setup_test_env() {
+		ln -sr "${S}/src" "${BUILD_DIR}/include" || die
+	}
+
+	multilib_foreach_abi setup_test_env
+
+	# Do headstands for LTO # 942985
+	local -x GTEST_FILTER
+	GTEST_FILTER="-FileDescriptorSetSource/EncodeDecodeTest*"
+
+	cmake-multilib_src_test
+
+	GTEST_FILTER="${GTEST_FILTER//-/}"
+
+	cmake-multilib_src_test
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" ]]; then
+		eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
+			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})"
+		die "Please update SLOT variable"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install "${PN}" editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-28.3.ebuild b/dev-libs/protobuf/protobuf-28.3.ebuild
deleted file mode 100644
index bffa811e8049..000000000000
--- a/dev-libs/protobuf/protobuf-28.3.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 2008-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib elisp-common multilib
-
-# NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules
-ABSEIL_BRANCH="lts_2023_08_02"
-
-ABSEIL_MIN_VER="${ABSEIL_BRANCH//lts_}"
-ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
-
-if [[ "${PV}" == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
-	EGIT_SUBMODULES=( '-*' )
-	MY_SLOT="28.0"
-
-	inherit git-r3
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-	MY_SLOT=$(ver_cut 1-2)
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://protobuf.dev/"
-
-LICENSE="BSD"
-SLOT="0/${MY_SLOT}.0"
-IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
-
-REQUIRED_USE="
-	|| (
-		libprotoc
-		libupb
-		protobuf
-		protoc
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	emacs? ( app-editors/emacs:* )
-	!protobuf? (
-		>=dev-libs/protobuf-${PV}
-	)
-"
-
-COMMON_DEPEND="
-	dev-libs/jsoncpp[${MULTILIB_USEDEP}]
-	>=dev-cpp/abseil-cpp-${ABSEIL_MIN_VER}:=[${MULTILIB_USEDEP}]
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( >=dev-cpp/gtest-1.11[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	${BDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-26.1-disable-32-bit-tests.patch"
-	"${FILESDIR}/${PN}-23.3-static_assert-failure.patch"
-	"${FILESDIR}/${PN}-27.4-findJsonCpp.patch"
-	"${FILESDIR}/${PN}-28.0-disable-test_upb-lto.patch"
-)
-
-DOCS=( CONTRIBUTORS.txt README.md )
-
-src_prepare() {
-	cmake_src_prepare
-
-	cp "${FILESDIR}/FindJsonCpp.cmake" "${S}/cmake" || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-Dprotobuf_ABSL_PROVIDER="package"
-		-Dprotobuf_JSONCPP_PROVIDER="package"
-
-		-Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")"
-		-Dprotobuf_BUILD_EXAMPLES="$(usex examples)"
-		-Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)"
-		-Dprotobuf_BUILD_LIBUPB="$(usex libupb)"
-		-Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)"
-		-Dprotobuf_BUILD_PROTOC_BINARIES="$(usex protoc)"
-		-Dprotobuf_BUILD_SHARED_LIBS="yes"
-		-Dprotobuf_BUILD_TESTS="$(usex test)"
-
-		-Dprotobuf_DISABLE_RTTI="no"
-
-		-Dprotobuf_INSTALL="yes"
-		-Dprotobuf_INSTALL_EXAMPLES="$(usex examples)"
-		-Dprotobuf_TEST_XML_OUTDIR="$(usex test)"
-
-		-Dprotobuf_WITH_ZLIB="$(usex zlib)"
-		-Dprotobuf_VERBOSE="$(usex debug)"
-		-DCMAKE_MODULE_PATH="${S}/cmake"
-	)
-	use test && mycmakeargs+=( -Dprotobuf_USE_EXTERNAL_GTEST="yes" )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake-multilib_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-src_test() {
-	local -x srcdir="${S}/src"
-
-	local -x TEST_TMPDIR="${T%/}/TEST_TMPDIR_${ABI}"
-	mkdir -m 777 "${TEST_TMPDIR}" || die
-
-	setup_test_env() {
-		ln -sr "${S}/src" "${BUILD_DIR}/include" || die
-	}
-
-	multilib_foreach_abi setup_test_env
-
-	cmake-multilib_src_test
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" ]]; then
-		eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
-			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})"
-		die "Please update SLOT variable"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install "${PN}" editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-29.2.ebuild b/dev-libs/protobuf/protobuf-29.2.ebuild
new file mode 100644
index 000000000000..3080cc281d8b
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-29.2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 2008-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib elisp-common multilib
+
+# NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules
+ABSEIL_BRANCH="lts_2023_08_02"
+
+ABSEIL_MIN_VER="${ABSEIL_BRANCH//lts_}"
+ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
+
+if [[ "${PV}" == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=( '-*' )
+	MY_SLOT="28.0"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	MY_SLOT=$(ver_cut 1-2)
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://protobuf.dev/"
+
+LICENSE="BSD"
+SLOT="0/${MY_SLOT}.0"
+IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
+
+# Require protobuf for the time being
+REQUIRED_USE="
+	protobuf
+	examples? ( protobuf protoc )
+	libprotoc? ( protobuf )
+	libupb? (	protobuf )
+	protoc? ( protobuf )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	emacs? ( app-editors/emacs:* )
+"
+
+COMMON_DEPEND="
+	>=dev-cpp/abseil-cpp-${ABSEIL_MIN_VER}:=[${MULTILIB_USEDEP}]
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	conformance? ( dev-libs/jsoncpp[${MULTILIB_USEDEP}] )
+	test? ( >=dev-cpp/gtest-1.11[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	${BDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-23.3-static_assert-failure.patch"
+	"${FILESDIR}/${PN}-27.4-findJsonCpp.patch"
+	"${FILESDIR}/${PN}-28.0-disable-test_upb-lto.patch"
+)
+
+DOCS=( CONTRIBUTORS.txt README.md )
+
+src_prepare() {
+	cmake_src_prepare
+
+	cp "${FILESDIR}/FindJsonCpp.cmake" "${S}/cmake" || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-Dprotobuf_ABSL_PROVIDER="package"
+		-Dprotobuf_JSONCPP_PROVIDER="package"
+
+		-Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")"
+		-Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)"
+		-Dprotobuf_BUILD_LIBUPB="$(usex libupb)"
+		-Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)"
+		-Dprotobuf_BUILD_PROTOC_BINARIES="$(usex protoc)"
+		-Dprotobuf_BUILD_SHARED_LIBS="yes"
+		-Dprotobuf_BUILD_TESTS="$(usex test)"
+
+		-Dprotobuf_DISABLE_RTTI="no"
+
+		-Dprotobuf_INSTALL="yes"
+		-Dprotobuf_TEST_XML_OUTDIR="$(usex test)"
+
+		-Dprotobuf_WITH_ZLIB="$(usex zlib)"
+		-Dprotobuf_VERBOSE="$(usex debug)"
+		-DCMAKE_MODULE_PATH="${S}/cmake"
+	)
+	if use protobuf ; then
+		if use examples ; then
+			mycmakeargs+=(
+				-Dprotobuf_BUILD_EXAMPLES="$(usex examples)"
+				-Dprotobuf_INSTALL_EXAMPLES="$(usex examples)"
+			)
+		fi
+	fi
+
+	use test && mycmakeargs+=( -Dprotobuf_USE_EXTERNAL_GTEST="yes" )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+src_test() {
+	local -x srcdir="${S}/src"
+
+	local -x TEST_TMPDIR="${T%/}/TEST_TMPDIR_${ABI}"
+	mkdir -m 777 "${TEST_TMPDIR}" || die
+
+	setup_test_env() {
+		ln -sr "${S}/src" "${BUILD_DIR}/include" || die
+	}
+
+	multilib_foreach_abi setup_test_env
+
+	# Do headstands for LTO # 942985
+	local -x GTEST_FILTER
+	GTEST_FILTER="-FileDescriptorSetSource/EncodeDecodeTest*"
+
+	cmake-multilib_src_test
+
+	GTEST_FILTER="${GTEST_FILTER//-/}"
+
+	cmake-multilib_src_test
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" ]]; then
+		eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
+			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})"
+		die "Please update SLOT variable"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install "${PN}" editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index 30ab416efd86..1106a4dfca74 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.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
@@ -14,48 +14,44 @@ ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
 if [[ "${PV}" == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
 	EGIT_SUBMODULES=( '-*' )
-	MY_SLOT="28.0"
+	SLOT="0/9999"
 
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-	MY_SLOT=$(ver_cut 1-2)
+	SLOT="0/$(ver_cut 1-2).0"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
 HOMEPAGE="https://protobuf.dev/"
 
 LICENSE="BSD"
-SLOT="0/${MY_SLOT}.0"
 IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
 
+# Require protobuf for the time being
 REQUIRED_USE="
-	|| (
-		libprotoc
-		libupb
-		protobuf
-		protoc
-	)
+	protobuf
+	examples? ( protobuf protoc )
+	libprotoc? ( protobuf )
+	libupb? (	protobuf )
+	protoc? ( protobuf )
 "
 
 RESTRICT="!test? ( test )"
 
 BDEPEND="
 	emacs? ( app-editors/emacs:* )
-	!protobuf? (
-		>=dev-libs/protobuf-${PV}
-	)
 "
 
 COMMON_DEPEND="
-	dev-libs/jsoncpp[${MULTILIB_USEDEP}]
 	>=dev-cpp/abseil-cpp-${ABSEIL_MIN_VER}:=[${MULTILIB_USEDEP}]
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
 "
 
 DEPEND="
 	${COMMON_DEPEND}
+	conformance? ( dev-libs/jsoncpp[${MULTILIB_USEDEP}] )
 	test? ( >=dev-cpp/gtest-1.11[${MULTILIB_USEDEP}] )
 "
 RDEPEND="
@@ -64,7 +60,6 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-26.1-disable-32-bit-tests.patch"
 	"${FILESDIR}/${PN}-23.3-static_assert-failure.patch"
 	"${FILESDIR}/${PN}-27.4-findJsonCpp.patch"
 	"${FILESDIR}/${PN}-28.0-disable-test_upb-lto.patch"
@@ -84,7 +79,6 @@ multilib_src_configure() {
 		-Dprotobuf_JSONCPP_PROVIDER="package"
 
 		-Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")"
-		-Dprotobuf_BUILD_EXAMPLES="$(usex examples)"
 		-Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)"
 		-Dprotobuf_BUILD_LIBUPB="$(usex libupb)"
 		-Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)"
@@ -95,13 +89,21 @@ multilib_src_configure() {
 		-Dprotobuf_DISABLE_RTTI="no"
 
 		-Dprotobuf_INSTALL="yes"
-		-Dprotobuf_INSTALL_EXAMPLES="$(usex examples)"
 		-Dprotobuf_TEST_XML_OUTDIR="$(usex test)"
 
 		-Dprotobuf_WITH_ZLIB="$(usex zlib)"
 		-Dprotobuf_VERBOSE="$(usex debug)"
 		-DCMAKE_MODULE_PATH="${S}/cmake"
 	)
+	if use protobuf ; then
+		if use examples ; then
+			mycmakeargs+=(
+				-Dprotobuf_BUILD_EXAMPLES="$(usex examples)"
+				-Dprotobuf_INSTALL_EXAMPLES="$(usex examples)"
+			)
+		fi
+	fi
+
 	use test && mycmakeargs+=( -Dprotobuf_USE_EXTERNAL_GTEST="yes" )
 
 	cmake_src_configure
@@ -127,6 +129,14 @@ src_test() {
 
 	multilib_foreach_abi setup_test_env
 
+	# Do headstands for LTO # 942985
+	local -x GTEST_FILTER
+	GTEST_FILTER="-FileDescriptorSetSource/EncodeDecodeTest*"
+
+	cmake-multilib_src_test
+
+	GTEST_FILTER="${GTEST_FILTER//-/}"
+
 	cmake-multilib_src_test
 }
 
diff --git a/dev-libs/ptexenc/ptexenc-1.4.6_p20240311.ebuild b/dev-libs/ptexenc/ptexenc-1.4.6_p20240311.ebuild
index 2172b01423d9..0c8fd3cbb25f 100644
--- a/dev-libs/ptexenc/ptexenc-1.4.6_p20240311.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.4.6_p20240311.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 @@ S="${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="iconv"
 
 DEPEND="
diff --git a/dev-libs/qcoro/qcoro-0.11.0.ebuild b/dev-libs/qcoro/qcoro-0.11.0.ebuild
index dd118783947b..aa3b1f6e16d2 100644
--- a/dev-libs/qcoro/qcoro-0.11.0.ebuild
+++ b/dev-libs/qcoro/qcoro-0.11.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
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/danvratil/${PN}"
 else
 	SRC_URI="https://github.com/danvratil/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="C++ Coroutine Library for Qt"
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index 2ce18944064b..cfa35a0604e9 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1 +1,2 @@
 DIST qtkeychain-0.14.3.tar.gz 50948 BLAKE2B 4f2189b2d6a1faf7b5041baeb1c2f00498d0297a8028799ab646aa92189d569114c76b45528d15a72d7cee8dc6252797bebd3e2849034e703709a3b41f74a805 SHA512 d1d87553db94bf54da1373016a847476e6cd608db6d427ed72532658e2272501daf45d7c9976efdde2f26ab3810ba9dbfec2518d46dee5a76ecaa369bfee2e4a
+DIST qtkeychain-0.15.0.tar.gz 55584 BLAKE2B e12b69a7fbc60a6cda75b06c5e8ae435b9a6e15a9564b71590cd3d5a8c491526e8bf840eaba0cadf36f4e7518dda1d6b45c0090aa26538a92c668c29d4646350 SHA512 b1068ae513d5eab8f300186497ddcce4075e11a2a569deddbc949177efaa27970ed7bdce0b1aff61a021144540e942f60c9259b975601a92c60b8a742754624a
diff --git a/dev-libs/qtkeychain/qtkeychain-0.15.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.15.0.ebuild
new file mode 100644
index 000000000000..400dbfc6db2c
--- /dev/null
+++ b/dev-libs/qtkeychain/qtkeychain-0.15.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake multibuild
+
+DESCRIPTION="Qt API for storing passwords securely"
+HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/frankosterfeld/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/frankosterfeld/${PN}.git"
+fi
+
+LICENSE="BSD-2"
+SLOT="0/1"
+IUSE="keyring qt5 +qt6 test"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+# tests require DBus
+RESTRICT="test !test? ( test )"
+
+RDEPEND="
+	keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+	)
+	qt6? ( dev-qt/qtbase:6[dbus] )
+"
+DEPEND="${RDEPEND}
+	qt5? ( test? ( dev-qt/qttest:5 ) )
+"
+BDEPEND="
+	qt5? ( dev-qt/linguist-tools:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )
+"
+
+DOCS=( ChangeLog ReadMe.md )
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_configure() {
+	my_src_configure() {
+		local mycmakeargs=(
+			-DECM_MKSPECS_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir)/${MULTIBUILD_VARIANT}/mkspecs
+			-DBUILD_TEST_APPLICATION=OFF
+			-DBUILD_TRANSLATIONS=ON
+			-DLIBSECRET_SUPPORT=$(usex keyring)
+			-DBUILD_TESTING=$(usex test)
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
+			mycmakeargs+=( -DBUILD_WITH_QT6=ON )
+		else
+			mycmakeargs+=( -DBUILD_WITH_QT6=OFF )
+		fi
+
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant cmake_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
diff --git a/dev-libs/qxlsx/Manifest b/dev-libs/qxlsx/Manifest
index e5495b020fa6..6954f4cad734 100644
--- a/dev-libs/qxlsx/Manifest
+++ b/dev-libs/qxlsx/Manifest
@@ -1 +1,2 @@
 DIST qxlsx-1.4.8.tar.gz 4705148 BLAKE2B 5b24716f1aa99233a51b1290e12d51fc532c21b5397cae84bd524d11a977d18d7178cc3e9f6bd66b5d837bafea1872d981ce2cf4724821e2fb40ba10feb152a8 SHA512 309560bde9da6461c52e883466908d493986251b0ef89d74fb3ddcec374f8a4f9d96f61f5be96431f224484e778388be8d78244f4d8ebd7de3250e65ec60edda
+DIST qxlsx-1.5.0.tar.gz 4714070 BLAKE2B 47abe97544ac806139c8457bba0bd327c1df7dbc1b585e13fc061e00f35971898d59a586f441914eeb0530e5d57bbce63769239a7994875001302db0849452eb SHA512 6aa2bc848ce6a34d35e7483cd44f0503aa8be7c1a0087e3f6b4cb425501b79d636efca5ebf970a06bdc9c9a90c073f6fdcc5917eaff7751e238597393c49f038
diff --git a/dev-libs/qxlsx/qxlsx-1.5.0.ebuild b/dev-libs/qxlsx/qxlsx-1.5.0.ebuild
new file mode 100644
index 000000000000..713f0e48f28d
--- /dev/null
+++ b/dev-libs/qxlsx/qxlsx-1.5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Excel file(*.xlsx) reader/writer library using Qt"
+HOMEPAGE="https://github.com/QtExcel/QXlsx"
+SRC_URI="https://github.com/QtExcel/QXlsx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/QXlsx-${PV}/QXlsx"
+
+LICENSE="MIT"
+# soversion
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-qt/qtbase:6=[gui]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# https://github.com/QtExcel/QXlsx/issues/375#issuecomment-2565987610
+	sed -i -e "s/SOVERSION.*/SOVERSION 0.${PV}/" CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT_VERSION_MAJOR=6
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
index 8ce9b421344b..a40a8eb250b1 100644
--- a/dev-libs/rccl/Manifest
+++ b/dev-libs/rccl/Manifest
@@ -1,2 +1,3 @@
 DIST rccl-5.7.1.tar.gz 1425561 BLAKE2B 852c111ad806d5c99f48b3c65c8cf37315c68b969f9544bfa14c1faf1d5557edcc57cdc21705ced6ded4a0288d42b1076e65fb67b3f89b4fa78cfba9d317b23e SHA512 5913b8ff67fa787714713b7d5b571374898be740d56c77db9f04fe7a3e6ca74023fa930a3494d8a6f984ac9e68ee318343835e110049d08700fe773376618af4
 DIST rccl-6.1.1.tar.gz 1679144 BLAKE2B 371d64691dc74f875c49e14df8f3f2d8b9c607376e6c5a889bd2bdb50607e88715d6d75ffed4ba3184a5b9b241cb37b8501e927a5f495632212909e410102490 SHA512 6c6376dd822182bcf28f573c0f3b5c7e52f94f4b670ee7c88519232f51b443d52cd37cbe6c41b5b6e9cb0b93c1124246a989f6e6a2ae74935134135585118002
+DIST rccl-6.3.0.tar.gz 1828647 BLAKE2B 8c312fc51e7d600bb62fa059e1af53e153955b79b2ba2e8a6b6b52228b9217b7df6dc815c3a48c0800aaa9387f645070e079d04e99c0e8ebdfe41d5ebe0bda06 SHA512 a068b4a21786176638d108c8c85d5e5a8b0413335b555c2602f2a2e0b9f291f6872dbf68fbb5a17a6a0af9d9b5a90b1b37cce63b655a867b68fc9e20d49931ea
diff --git a/dev-libs/rccl/files/rccl-6.1.1-headers-fix.patch b/dev-libs/rccl/files/rccl-6.1.1-headers-fix.patch
new file mode 100644
index 000000000000..297627819f2c
--- /dev/null
+++ b/dev-libs/rccl/files/rccl-6.1.1-headers-fix.patch
@@ -0,0 +1,12 @@
+gtest 1.14 included iomanip, gtest 1.15 does not anymore.
+Upstream bug: https://github.com/ROCm/rccl/issues/1455
+--- a/test/common/TestBed.cpp
++++ b/test/common/TestBed.cpp
+@@ -4,6 +4,7 @@
+  * See LICENSE.txt for license information
+  ************************************************************************/
+ #include <unistd.h>
++#include <iomanip>
+ #include "TestBed.hpp"
+ #include <rccl/rccl.h>
+ 
diff --git a/dev-libs/rccl/files/rccl-6.3.0-same-rank-sendrecv.patch b/dev-libs/rccl/files/rccl-6.3.0-same-rank-sendrecv.patch
new file mode 100644
index 000000000000..435d6ac57b0f
--- /dev/null
+++ b/dev-libs/rccl/files/rccl-6.3.0-same-rank-sendrecv.patch
@@ -0,0 +1,250 @@
+Enable UT sendrecv to same rank. Fixes test failure.
+Backports commit: https://github.com/ROCm/rccl/commit/fd9924cfe7afbb94b1f157972ba001865481480a
+--- a/test/SendRecvTests.cpp
++++ b/test/SendRecvTests.cpp
+@@ -16,7 +16,6 @@ namespace RcclUnitTesting
+     std::vector<int>            const  numElements     = {1048576, 53327, 1024, 0};
+     bool                        const  inPlace         = false;
+     bool                        const  useManagedMem   = false;
+-    int                         const  groupCallId     = 0;
+ 
+     OptionalColArgs options;
+     bool isCorrect = true;
+@@ -28,7 +27,10 @@ namespace RcclUnitTesting
+       int ranksPerGpu = rpg == 0 ? 1 : testBed.ev.maxRanksPerGpu;
+       int totalRanks = numGpus * ranksPerGpu;
+       int const numProcesses = isMultiProcess ? numGpus : 1;
+-      testBed.InitComms(TestBed::GetDeviceIdsList(numProcesses, numGpus, ranksPerGpu), 1);
++      testBed.InitComms(TestBed::GetDeviceIdsList(numProcesses, numGpus, ranksPerGpu),
++                        {1,2}, //two group, second group sendrecv to self, has 2 coll
++                        testBed.GetNumStreamsPerGroup(1,2),
++                        2);
+ 
+       for (int dataIdx = 0; dataIdx < dataTypes.size() && isCorrect; ++dataIdx)
+       for (int numIdx = 0; numIdx < numElements.size() && isCorrect; ++numIdx)
+@@ -37,6 +39,8 @@ namespace RcclUnitTesting
+         for (int recvRank = 0; recvRank  < totalRanks; ++recvRank)
+         {
+           options.root = recvRank;
++          int groupCallId = sendRank == recvRank; //self sendrecv group has two coll
++          int recvId      = sendRank == recvRank; //where recv will be second coll
+           testBed.SetCollectiveArgs(ncclCollSend,
+                                     dataTypes[dataIdx],
+                                     numElements[numIdx],
+@@ -47,36 +51,46 @@ namespace RcclUnitTesting
+                                     sendRank);
+           if (recvRank == 0)
+           {
+-            testBed.AllocateMem(inPlace, useManagedMem, groupCallId, 0, sendRank);
+-            testBed.PrepareData(groupCallId, 0, sendRank);
+-          }
+-          if (recvRank  != sendRank)
+-          {
+-            if (testBed.ev.showNames) // Show test names
+-              INFO("%s Datatype: %s SendReceive test Rank %d -> Rank %d for %d Elements\n",
+-                  isMultiProcess ? "MP" : "SP",
+-                  ncclDataTypeNames[dataTypes[dataIdx]],
+-                  sendRank,
+-                  recvRank,
+-                  numElements[numIdx]);
+-
+-            options.root = sendRank;
+-            testBed.SetCollectiveArgs(ncclCollRecv,
++            //set up the collArg slot to make sure AllocateMem is called once and correctly
++            testBed.SetCollectiveArgs(ncclCollSend,
+                                       dataTypes[dataIdx],
+                                       numElements[numIdx],
+                                       numElements[numIdx],
+                                       options,
+                                       0,
+-                                      groupCallId,
+-                                      recvRank);
+-            testBed.AllocateMem(inPlace, useManagedMem, groupCallId, 0, recvRank);
+-            testBed.PrepareData(groupCallId, 0, recvRank);
+-            testBed.ExecuteCollectives({sendRank, recvRank});
+-            testBed.ValidateResults(isCorrect, groupCallId, 0, recvRank);
+-            testBed.DeallocateMem(groupCallId, 0, recvRank);
++                                      !groupCallId,
++                                      sendRank);
++            testBed.AllocateMem(inPlace, useManagedMem, 0, 0, sendRank);
++            testBed.PrepareData(0, 0, sendRank);
++            testBed.AllocateMem(inPlace, useManagedMem, 1, 0, sendRank);
++            testBed.PrepareData(1, 0, sendRank);
+           }
++
++          if (testBed.ev.showNames) // Show test names
++            INFO("%s Datatype: %s SendReceive test Rank %d -> Rank %d for %d Elements\n",
++                 isMultiProcess ? "MP" : "SP",
++                 ncclDataTypeNames[dataTypes[dataIdx]],
++                 sendRank,
++                 recvRank,
++                 numElements[numIdx]);
++          options.root = sendRank;
++
++          testBed.SetCollectiveArgs(ncclCollRecv,
++                                    dataTypes[dataIdx],
++                                    numElements[numIdx],
++                                    numElements[numIdx],
++                                    options,
++                                    recvId,
++                                    groupCallId,
++                                    recvRank);
++          testBed.AllocateMem(inPlace, useManagedMem, groupCallId, recvId, recvRank);
++          testBed.PrepareData(groupCallId, recvId, recvRank);
++          testBed.ExecuteCollectives({sendRank, recvRank}, groupCallId);
++          testBed.ValidateResults(isCorrect, groupCallId, recvId, recvRank);
++          testBed.DeallocateMem(groupCallId, recvId, recvRank);
+         }
+-        testBed.DeallocateMem(groupCallId, 0, sendRank);
++        testBed.DeallocateMem(0, 0, sendRank);
++        testBed.DeallocateMem(1, 0, sendRank);
+       }
+       testBed.DestroyComms();
+     }
+@@ -94,7 +108,6 @@ namespace RcclUnitTesting
+     bool                        const  inPlace         = false;
+     bool                        const  useManagedMem   = false;
+     bool                        const  userRegistered  = true;
+-    int                         const  groupCallId     = 0;
+ 
+     OptionalColArgs options;
+     bool isCorrect = true;
+@@ -106,7 +119,10 @@ namespace RcclUnitTesting
+       int ranksPerGpu = rpg == 0 ? 1 : testBed.ev.maxRanksPerGpu;
+       int totalRanks = numGpus * ranksPerGpu;
+       int const numProcesses = isMultiProcess ? numGpus : 1;
+-      testBed.InitComms(TestBed::GetDeviceIdsList(numProcesses, numGpus, ranksPerGpu), 1);
++      testBed.InitComms(TestBed::GetDeviceIdsList(numProcesses, numGpus, ranksPerGpu),
++                        {1,2}, //two group, second group sendrecv to self, has 2 coll
++                        testBed.GetNumStreamsPerGroup(1,2),
++                        2);
+ 
+       for (int dataIdx = 0; dataIdx < dataTypes.size() && isCorrect; ++dataIdx)
+       for (int numIdx = 0; numIdx < numElements.size() && isCorrect; ++numIdx)
+@@ -115,6 +131,8 @@ namespace RcclUnitTesting
+         for (int recvRank = 0; recvRank  < totalRanks; ++recvRank)
+         {
+           options.root = recvRank;
++          int groupCallId = sendRank == recvRank;
++          int recvId      = sendRank == recvRank;
+           testBed.SetCollectiveArgs(ncclCollSend,
+                                     dataTypes[dataIdx],
+                                     numElements[numIdx],
+@@ -125,36 +143,45 @@ namespace RcclUnitTesting
+                                     sendRank);
+           if (recvRank == 0)
+           {
+-            testBed.AllocateMem(inPlace, useManagedMem, groupCallId, 0, sendRank, userRegistered);
+-            testBed.PrepareData(groupCallId, 0, sendRank);
+-          }
+-          if (recvRank  != sendRank)
+-          {
+-            if (testBed.ev.showNames) // Show test names
+-              INFO("%s Datatype: %s SendReceive test Rank %d -> Rank %d for %d Elements\n",
+-                  isMultiProcess ? "MP" : "SP",
+-                  ncclDataTypeNames[dataTypes[dataIdx]],
+-                  sendRank,
+-                  recvRank,
+-                  numElements[numIdx]);
+-
+-            options.root = sendRank;
+-            testBed.SetCollectiveArgs(ncclCollRecv,
++            testBed.SetCollectiveArgs(ncclCollSend,
+                                       dataTypes[dataIdx],
+                                       numElements[numIdx],
+                                       numElements[numIdx],
+                                       options,
+                                       0,
+-                                      groupCallId,
+-                                      recvRank);
+-            testBed.AllocateMem(inPlace, useManagedMem, groupCallId, 0, recvRank, userRegistered);
+-            testBed.PrepareData(groupCallId, 0, recvRank);
+-            testBed.ExecuteCollectives({sendRank, recvRank});
+-            testBed.ValidateResults(isCorrect, groupCallId, 0, recvRank);
+-            testBed.DeallocateMem(groupCallId, 0, recvRank);
++                                      !groupCallId,
++                                      sendRank);
++            testBed.AllocateMem(inPlace, useManagedMem, 0, 0, sendRank, userRegistered);
++            testBed.PrepareData(0, 0, sendRank);
++            testBed.AllocateMem(inPlace, useManagedMem, 1, 0, sendRank, userRegistered);
++            testBed.PrepareData(1, 0, sendRank);
+           }
++
++          if (testBed.ev.showNames) // Show test names
++            INFO("%s Datatype: %s SendReceive test Rank %d -> Rank %d for %d Elements\n",
++                 isMultiProcess ? "MP" : "SP",
++                 ncclDataTypeNames[dataTypes[dataIdx]],
++                 sendRank,
++                 recvRank,
++                 numElements[numIdx]);
++
++          options.root = sendRank;
++          testBed.SetCollectiveArgs(ncclCollRecv,
++                                    dataTypes[dataIdx],
++                                    numElements[numIdx],
++                                    numElements[numIdx],
++                                    options,
++                                    recvId,
++                                    groupCallId,
++                                    recvRank);
++          testBed.AllocateMem(inPlace, useManagedMem, groupCallId, recvId, recvRank, userRegistered);
++          testBed.PrepareData(groupCallId, recvId, recvRank);
++          testBed.ExecuteCollectives({sendRank, recvRank}, groupCallId);
++          testBed.ValidateResults(isCorrect, groupCallId, recvId, recvRank);
++          testBed.DeallocateMem(groupCallId, recvId, recvRank);
+         }
+-        testBed.DeallocateMem(groupCallId, 0, sendRank);
++        testBed.DeallocateMem(0, 0, sendRank);
++        testBed.DeallocateMem(1, 0, sendRank);
+       }
+       testBed.DestroyComms();
+     }
+--- a/test/common/TestBedChild.cpp
++++ b/test/common/TestBedChild.cpp
+@@ -395,6 +395,8 @@ namespace RcclUnitTesting
+       {
+         CollectiveArgs& collArg = this->collArgs[groupId][localRank][collIdx];
+         CHECK_CALL(collArg.AllocateMem(inPlace, useManagedMem, userRegistered));
++        if (collArg.userRegistered && (collArg.funcType == ncclCollSend || collArg.funcType == ncclCollRecv))
++          CHILD_NCCL_CALL(ncclCommRegister(this->comms[localRank], collArg.inputGpu.ptr, collArg.numInputBytesAllocated, &(collArg.commRegHandle)),"ncclCommRegister");
+         if (this->verbose) INFO("Rank %d on child %d allocates memory for collective %d in group %d on device %d (%s,%s,%s) Input: %p Output %p\n",
+                                 globalRank, this->childId, collIdx, groupId, this->deviceIds[localRank],
+                                 inPlace ? "in-place" : "out-of-place",
+@@ -646,8 +648,6 @@ namespace RcclUnitTesting
+                           "ncclAllToAllv");
+           break;
+         case ncclCollSend:
+-          if (collArg.userRegistered)
+-            CHILD_NCCL_CALL_RANK(errCode, ncclCommRegister(this->comms[localRank], collArg.inputGpu.ptr, collArg.numInputBytesAllocated, &(collArg.commRegHandle)),"ncclCommRegister");
+           CHILD_NCCL_CALL_RANK(errCode, ncclSend(
+                                    collArg.inputGpu.ptr,
+                                    collArg.numInputElements,
+@@ -658,8 +658,6 @@ namespace RcclUnitTesting
+                           "ncclSend");
+           break;
+         case ncclCollRecv:
+-          if (collArg.userRegistered)
+-            CHILD_NCCL_CALL_RANK(errCode, ncclCommRegister(this->comms[localRank], collArg.outputGpu.ptr, collArg.numOutputBytesAllocated, &(collArg.commRegHandle)), "ncclCommRegister");
+           CHILD_NCCL_CALL_RANK(errCode, ncclRecv(
+                                    collArg.outputGpu.ptr,
+                                    collArg.numOutputElements,
+@@ -891,8 +889,6 @@ namespace RcclUnitTesting
+     for (int collIdx = 0; collIdx < collArgs[groupId][localRank].size(); ++collIdx)
+     {
+       CollectiveArgs& collArg = this->collArgs[groupId][localRank][collIdx];
+-      if (collArg.userRegistered && (collArg.funcType == ncclCollSend || collArg.funcType == ncclCollRecv))
+-        CHILD_NCCL_CALL(ncclCommDeregister(this->comms[localRank], collArg.commRegHandle), "ncclCommDeregister");
+       if (collId == -1 || collId == collIdx)
+       {
+         if (this->verbose)
+@@ -900,6 +896,10 @@ namespace RcclUnitTesting
+           INFO("Child %d release memory for collective %d in group %d (Input: %p Output %p\n",
+                this->childId, collIdx, groupId, collArg.inputGpu.ptr, collArg.outputGpu.ptr);
+         }
++        if (collArg.userRegistered && (collArg.funcType == ncclCollSend || collArg.funcType == ncclCollRecv))
++        {
++          CHILD_NCCL_CALL(ncclCommDeregister(this->comms[localRank], collArg.commRegHandle), "ncclCommDeregister");
++        }
+ 
+         CHECK_CALL(collArg.DeallocateMem());
+       }
diff --git a/dev-libs/rccl/rccl-6.1.1.ebuild b/dev-libs/rccl/rccl-6.1.1.ebuild
index 8b583cb22096..a3838aa9d4a2 100644
--- a/dev-libs/rccl/rccl-6.1.1.ebuild
+++ b/dev-libs/rccl/rccl-6.1.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
@@ -32,6 +32,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-6.0.2-fix-version-check.patch"
+	"${FILESDIR}/${PN}-6.1.1-headers-fix.patch"
 )
 
 src_prepare() {
@@ -67,5 +68,6 @@ src_configure() {
 src_test() {
 	check_amdgpu
 	cd "${BUILD_DIR}" || die
-	LD_LIBRARY_PATH="${BUILD_DIR}" edob test/rccl-UnitTests
+	# APU (as second device, if any) expectedly breaks tests
+	HIP_VISIBLE_DEVICES=0 LD_LIBRARY_PATH="${BUILD_DIR}" edob test/rccl-UnitTests
 }
diff --git a/dev-libs/rccl/rccl-6.3.0.ebuild b/dev-libs/rccl/rccl-6.3.0.ebuild
new file mode 100644
index 000000000000..13edd47c89de
--- /dev/null
+++ b/dev-libs/rccl/rccl-6.3.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake edo rocm flag-o-matic
+
+DESCRIPTION="ROCm Communication Collectives Library (RCCL)"
+HOMEPAGE="https://github.com/ROCm/rccl"
+SRC_URI="https://github.com/ROCm/rccl/archive/rocm-${PV}.tar.gz -> rccl-${PV}.tar.gz"
+S="${WORKDIR}/rccl-rocm-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-util/hip:${SLOT}
+	dev-util/rocm-smi:${SLOT}"
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs"
+BDEPEND="
+	>=dev-build/cmake-3.22
+	>=dev-build/rocm-cmake-5.7.1
+	dev-util/hipify-clang:${SLOT}
+	test? ( dev-cpp/gtest )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.0.2-fix-version-check.patch"
+	"${FILESDIR}/${PN}-6.3.0-same-rank-sendrecv.patch"
+	"${FILESDIR}/${PN}-6.1.1-headers-fix.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# https://reviews.llvm.org/D69582 - clang does not support parallel jobs
+	sed '/parallel-jobs/d' -i CMakeLists.txt || die
+
+	# complete fix-version-check patch
+	sed "s/@rocm_version@/${PV}/" -i CMakeLists.txt || die
+
+	# don't install tests
+	sed "/rocm_install(TARGETS rccl-UnitTests/d" -i test/CMakeLists.txt || die
+}
+
+src_configure() {
+	rocm_use_hipcc
+
+	# lto flags make compilation fail with "undefined hidden symbol"
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-DROCM_SYMLINK_LIBS=OFF
+		-DROCM_PATH="${EPREFIX}/usr"
+		-DRCCL_ROCPROFILER_REGISTER=OFF
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}" || die
+	# APU (as second device, if any) expectedly breaks tests
+	HIP_VISIBLE_DEVICES=0 LD_LIBRARY_PATH="${BUILD_DIR}" edob test/rccl-UnitTests
+}
diff --git a/dev-libs/rocdbgapi/Manifest b/dev-libs/rocdbgapi/Manifest
index 9153f597bc1b..b714542e461e 100644
--- a/dev-libs/rocdbgapi/Manifest
+++ b/dev-libs/rocdbgapi/Manifest
@@ -1,2 +1,3 @@
 DIST rocdbgapi-5.7.1.tar.gz 251913 BLAKE2B 96dc859937fdde75a3d68368b29efdd14711e256c7d3c60cd40b128e9a0c066f108c02f7d47d9d64d7ca485e85e9d56d48cac6c67088fc3fbafe44d1d23a7ce2 SHA512 e30cf6062b07ced7de1660398cd84d104e632907cfaf9bc05d29289a81a977c2272b69ff0810db201675f9d7e8476b4451c988ad9da0a13eee01fffdde839d26
 DIST rocdbgapi-6.1.1.tar.gz 254274 BLAKE2B 1621dc715e2540578126ff2fa6dc30dc9db711689e82b5c750dd203aafa091c00f897425a372d4617bec25eddb7b9a44105e8c9b46eb660e197602ede2beecba SHA512 d613e633e27ad9f582b9612d7d088c3ea465c29d6520e94b4821e0340c736e556dcd4a89f8027701097ee4e2d8b55640a232d484f9fa26f8a9165c648f8af219
+DIST rocdbgapi-6.3.0.tar.gz 275368 BLAKE2B da4ee565d0bbafad4838ca6a346525bfc0e174ee39a1e4d99da16f2ba041885211d38cc9f9aac0ab0358b62557061f7c4cfc8fd3bcf241398b510ea952d56254 SHA512 b9acf8787fa6e76bd9d28a36b3c09932d830085cbdc4b6712d481c19cb36c2fd4ff50fb31fd249d9a523c053019657ae7eace850102be94170c327d4efb49e9d
diff --git a/dev-libs/rocdbgapi/files/rocdbgapi-6.3.0-fix-libcxx.patch b/dev-libs/rocdbgapi/files/rocdbgapi-6.3.0-fix-libcxx.patch
new file mode 100644
index 000000000000..b51901035ca6
--- /dev/null
+++ b/dev-libs/rocdbgapi/files/rocdbgapi-6.3.0-fix-libcxx.patch
@@ -0,0 +1,37 @@
+Fix for libc++ (std::basic_ostringstream<char> is not a part of C++ standard).
+Upstream bug: https://github.com/ROCm/ROCdbgapi/issues/18
+--- a/src/os_driver.cpp
++++ b/src/os_driver.cpp
+@@ -1006,12 +1006,12 @@ public:
+   template <typename T, std::enable_if_t<!std::is_pointer_v<T>, int> = 0>
+   void write (const T &v)
+   {
+-    m_stream.write (reinterpret_cast<const std::byte *> (&v), sizeof (T));
++    m_stream.write (reinterpret_cast<const char *> (&v), sizeof (T));
+   }
+ 
+   void write (const std::vector<std::byte> &v)
+   {
+-    m_stream.write (reinterpret_cast<const std::byte *> (v.data ()),
++    m_stream.write (reinterpret_cast<const char *> (v.data ()),
+                     v.size ());
+   }
+ 
+@@ -1026,7 +1026,7 @@ public:
+ 
+     auto str = m_stream.str ();
+     note.size = str.size ();
+-    auto buffer = amd::dbgapi::allocate_memory<std::byte> (note.size);
++    auto buffer = amd::dbgapi::allocate_memory<char> (note.size);
+     std::copy (str.begin (), str.end (), buffer.get ());
+     note.data = buffer.release ();
+ 
+@@ -1034,7 +1034,7 @@ public:
+   }
+ 
+ private:
+-  std::basic_ostringstream<std::byte> m_stream;
++  std::basic_ostringstream<char> m_stream;
+ };
+ 
+ }; /* anonymous namespace.  */
diff --git a/dev-libs/rocdbgapi/rocdbgapi-6.3.0.ebuild b/dev-libs/rocdbgapi/rocdbgapi-6.3.0.ebuild
new file mode 100644
index 000000000000..bac45a37c3f1
--- /dev/null
+++ b/dev-libs/rocdbgapi/rocdbgapi-6.3.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="AMD Debugger API"
+HOMEPAGE="https://github.com/ROCm/ROCdbgapi"
+SRC_URI="https://github.com/ROCm/ROCdbgapi/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ROCdbgapi-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		app-text/doxygen[dot]
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-plaingeneric
+	)
+"
+RDEPEND="
+	dev-libs/rocm-comgr:${SLOT}
+	dev-libs/rocr-runtime:${SLOT}
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.3.0-fix-libcxx.patch"
+)
+
+src_prepare() {
+	sed -e "s/-Werror//" \
+		-e "s/if(DOXYGEN_FOUND)/if(WITH_DOCS AND DOXYGEN_FOUND)/" \
+		-e "s:\${CMAKE_INSTALL_DATADIR}/html/amd-dbgapi:\${CMAKE_INSTALL_DOCDIR}/html:" \
+		-i CMakeLists.txt || die
+
+	# Clang 19 detects error
+	# https://github.com/ROCm/ROCdbgapi/issues/12
+	sed -e "s/->n_next/->m_next/g" -i src/utils.h || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_DOCS=$(usex doc ON OFF)
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove unneeded copy
+	rm -r "${ED}/usr/share/doc/${PF}-asan" || die
+}
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index aefb0b28d727..50ff7f85aa1a 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -1,6 +1,6 @@
 DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6ff8aaff44751f9b380addfae73a18dc388093c0535f230b0cc7528724bc43f6992e2ae6decd3d0d3c700893ca95a6166b7b8dc SHA512 e320d4eeaa6f61ed1cdbf653d67fe887d3ce9dc0d6743b4713502e1cb5318ab8afbe1ee71f8cba07635c54ce532df6683de40ade0e5be4a52e50ce25a9b70818
 DIST llvm-project-rocm-6.1.2.tar.gz 195992927 BLAKE2B d821f29f2f1f7c1ff414c63a710281f16d2a394b21f3365d01b86710cc09ed27e514b49fb744bf6a36b38815afa56cc26d44f0238f38479a0c2db9bf9989f389 SHA512 5f7e5dbe5976141de35e96e603624bd9d5a2c08b0690ba9fcd81d1b32f540f94bb9f4b74539e2838fd60ae1312dbe5e0b429ba80a03871782cdf3bd834940ce0
-DIST llvm-project-rocm-6.2.4.tar.gz 206742705 BLAKE2B e4d40c900b56a3d31003295c517fcb8fdc5cb0954f298d541d545c6d142746eecfa70a44bfdcb9044d70284f15af612c27dbd55d51e94e638e03bf21c1d3bc06 SHA512 5c5784c318c607168c9d2227ce1150e92fdc6aa457a9e64d62745a70f6fce92c4d4b1202422940f1ccc37a4bccf1efb220d8be39ec2ffdba7591d17e54ec8a5f
+DIST llvm-project-rocm-6.3.0.tar.gz 206677330 BLAKE2B f3e68a8c94599e3a938d3e761af163b9f010a06421680ee70aaaaf8073fb18da9151729c311fc4bd12b281b3afdd15e61cea31c970f0e4d36bb97838fa17ca5f SHA512 674fc3242c6dbb6962f1002dc34ccbd618da6adeb640bac15265d22fdcedf9de16ea3d79899891734ccc1099cb5b5ed9110b1162f4515c4cbc0d847810682b59
 DIST rocm-comgr-5.1.3.tar.gz 117155 BLAKE2B 40e415c4c7ae3e709dd50981299291f0fc1133f35310b4c86a86847d3bce5fd7685a3f4480f8f156873ca922921c1d4e1cb620fd33bd5cdc87f155af839f2bbe SHA512 5927250f5e03c32b7f270a1dbfe5221d349dfe32aba34143040da53d4e7eb83faa3073a43edabcff13e1fc977bc17088404523f2ab2ea95e207d2c00beb4249b
 DIST rocm-comgr-5.3.3.tar.gz 120414 BLAKE2B 29b9d466d74ef94165a2b9bea35eac4616f6b2fc529cdac3c830ee7dc08f219cb9e5d4f081658881c76633f12eaebb74d1a2ea30a76652231b8ee516f9988db1 SHA512 ba7b1ef214e3624168e438ed7fd94291a07508fe89d178c0b158bf22e0998d5a8e4d8f0a7f08f05ac108ef65f725db5764fd66353a85bc25000e572a4fdcb61f
 DIST rocm-comgr-5.4.3.tar.gz 120461 BLAKE2B c4eb79dd5a72a2b18e16841fc8cb9a3a33efb0c7b04a7585df9672d682bba6fa826ab8b37dba5febca3b8c5ee5aca30d8546e1fa69e77671e5c750e2a8c1f12f SHA512 1a25af99a0166d70ca6dc5df5a667068eaf583dccd74bbb18a2a5de3c1b769e0c1eb9a0c539e0cd88bc50bbbe53214a1d1b23fbdfd6fc5b6507c44da259815c4
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.2.2-missing-isa.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.2.2-missing-isa.patch
deleted file mode 100644
index ea8e3ee1eabf..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-6.2.2-missing-isa.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/comgr-isa-metadata.def	2024-10-14 13:40:22.023251450 -0000
-+++ b/src/comgr-isa-metadata.def	2024-10-14 13:40:31.949824212 -0000
-@@ -89,7 +89,6 @@
- HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1103",  false, false, EF_AMDGPU_MACH_AMDGCN_GFX1103, true, 65536,  32,  4,   40, 1024,  106, 800, 106,   16, 1024, 256)
- HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1150",  false, false, EF_AMDGPU_MACH_AMDGCN_GFX1150, true, 65536,  32,  4,   40, 1024,  106, 800, 106,   16, 1024, 256)
- HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1151",  false, false, EF_AMDGPU_MACH_AMDGCN_GFX1151, true, 65536,  32,  4,   40, 1024,  106, 800, 106,   24, 1536, 256)
--HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1152",  false, false, EF_AMDGPU_MACH_AMDGCN_GFX1152, true, 65536,  32,  4,   40, 1024,  106, 800, 106,   16, 1024, 256)
- HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1200",  false, false, EF_AMDGPU_MACH_AMDGCN_GFX1200, true, 65536,  32,  4,   40, 1024,  106, 800, 106,   24, 1536, 256)
- HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1201",  false, false, EF_AMDGPU_MACH_AMDGCN_GFX1201, true, 65536,  32,  4,   40, 1024,  106, 800, 106,   24, 1536, 256)
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-bypass-device-libs-copy.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-bypass-device-libs-copy.patch
new file mode 100644
index 000000000000..8c126d9a5108
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-bypass-device-libs-copy.patch
@@ -0,0 +1,28 @@
+Use files from dev-libs/rocm-device-libs instead of their copy in /tmp.
+--- a/src/comgr-compiler.cpp
++++ b/src/comgr-compiler.cpp
+@@ -1070,24 +1070,7 @@ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() {
+ }
+ 
+ amd_comgr_status_t AMDGPUCompiler::addDeviceLibraries() {
+-  llvm::SmallString<128> FakeRocmDir = TmpDir;
+-  path::append(FakeRocmDir, "rocm");
+-  llvm::SmallString<128> DeviceLibsDir = FakeRocmDir;
+-  path::append(DeviceLibsDir, "amdgcn", "bitcode");
+-  if (fs::create_directory(InputDir)) {
+-    return AMD_COMGR_STATUS_ERROR;
+-  }
+-  Args.push_back(Saver.save(Twine("--rocm-path=") + FakeRocmDir).data());
+   NoGpuLib = false;
+-
+-  for (auto DeviceLib : getDeviceLibraries()) {
+-    llvm::SmallString<128> DeviceLibPath = DeviceLibsDir;
+-    path::append(DeviceLibPath, std::get<0>(DeviceLib));
+-    if (auto Status = outputToFile(std::get<1>(DeviceLib), DeviceLibPath)) {
+-      return Status;
+-    }
+-  }
+-
+   return AMD_COMGR_STATUS_SUCCESS;
+ }
+ 
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-fix-comgr-default-flags.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-fix-comgr-default-flags.patch
new file mode 100644
index 000000000000..2d4ed66481cc
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-fix-comgr-default-flags.patch
@@ -0,0 +1,40 @@
+--- a/src/comgr-compiler.cpp
++++ b/src/comgr-compiler.cpp
+@@ -1031,9 +1031,8 @@ AMDGPUCompiler::addTargetIdentifierFlags(llvm::StringRef IdentStr,
+ }
+ 
+ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() {
+-  HIPIncludePath = (Twine(env::getHIPPath()) + "/include").str();
+-  // HIP headers depend on hsa.h which is in ROCM_DIR/include.
+-  ROCMIncludePath = (Twine(env::getROCMPath()) + "/include").str();
++  // Allow to include <include/cuda_wrappers/algorithm> (used in some hip files)
++  ClangIncludePath = @CLANG_RESOURCE_DIR@;
+ 
+   // Default to O3 for all contexts
+   Args.push_back("-O3");
+@@ -1059,9 +1058,7 @@ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() {
+     Args.push_back("-nogpuinc");
+     Args.push_back("--offload-device-only");
+     Args.push_back("-isystem");
+-    Args.push_back(ROCMIncludePath.c_str());
+-    Args.push_back("-isystem");
+-    Args.push_back(HIPIncludePath.c_str());
++    Args.push_back(ClangIncludePath.c_str());
+     break;
+   default:
+     return AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT;
+--- a/src/comgr-compiler.h
++++ b/src/comgr-compiler.h
+@@ -95,12 +95,7 @@ class AMDGPUCompiler {
+   /// User supplied target GPU Arch.
+   std::string GPUArch;
+   std::string OffloadArch;
+-  /// ROCM include Path
+-  std::string ROCMIncludePath;
+-  /// HIP and Clang Include Paths
+-  std::string HIPIncludePath;
+   std::string ClangIncludePath;
+-  std::string ClangIncludePath2;
+   /// Perform out-of-process compilation.
+   bool CompileOOP = false;
+   /// Precompiled header file paths.
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-llvm-19-compat.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-llvm-19-compat.patch
new file mode 100644
index 000000000000..e910b8ade94c
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.3.0-llvm-19-compat.patch
@@ -0,0 +1,65 @@
+Combination of upstream patches to make comgr compatible with LLVM 19
+https://github.com/ROCm/llvm-project/commit/91c18ff3482abdf90239e9b482797403f6e7e9bc
+https://github.com/ROCm/llvm-project/commit/971fd662887f21877d29f936c2f818eac37589d3
+https://github.com/ROCm/llvm-project/commit/7a784d7acfd7dadfa8516054adfbe7c884e70786
+https://github.com/ROCm/llvm-project/commit/1fb58bcb4868087ed314e2f5e7363d871d69f4da
+--- a/src/comgr-compiler.cpp
++++ b/src/comgr-compiler.cpp
+@@ -384,15 +384,14 @@ static bool executeAssemblerImpl(AssemblerInvocation &Opts,
+   assert(MRI && "Unable to create target register info!");
+ 
+   llvm::MCTargetOptions MCOptions;
++  MCOptions.X86RelaxRelocations = Opts.RelaxELFRelocations;
++  MCOptions.CompressDebugSections = Opts.CompressDebugSections;
+   std::unique_ptr<MCAsmInfo> MAI(
+       TheTarget->createMCAsmInfo(*MRI, Opts.Triple, MCOptions));
+   assert(MAI && "Unable to create target asm info!");
+ 
+   // Ensure MCAsmInfo initialization occurs before any use, otherwise sections
+   // may be created with a combination of default and explicit settings.
+-  MAI->setCompressDebugSections(Opts.CompressDebugSections);
+-
+-  MAI->setRelaxELFRelocations(Opts.RelaxELFRelocations);
+ 
+   bool IsBinary = Opts.OutputType == AssemblerInvocation::FT_Obj;
+   std::unique_ptr<raw_fd_ostream> FDOS = getOutputStream(Opts, Diags, IsBinary);
+@@ -428,9 +427,6 @@ static bool executeAssemblerImpl(AssemblerInvocation &Opts,
+   }
+ 
+   MOFI->initMCObjectFileInfo(Ctx, PIC);
+-  if (Opts.SaveTemporaryLabels) {
+-    Ctx.setAllowTemporaryLabels(false);
+-  }
+   if (Opts.GenDwarfForAssembly) {
+     Ctx.setGenDwarfForAssembly(true);
+   }
+--- a/src/comgr-symbol.cpp
++++ b/src/comgr-symbol.cpp
+@@ -146,7 +146,7 @@ SymbolContext *SymbolHelper::createBinary(StringRef Ins, const char *Name,
+         return NULL;
+       }
+       StringRef SymName = *SymNameOrErr;
+-      if (SymName.equals(Sname)) {
++      if (SymName == Sname) {
+ #if DEBUG
+         outs() << "Found! " << sname.data() << "\n";
+ #endif
+--- a/src/comgr.cpp
++++ b/src/comgr.cpp
+@@ -51,6 +51,7 @@
+ #include "llvm/Object/ObjectFile.h"
+ #include "llvm/Support/TargetSelect.h"
+ #include "llvm/IR/Constants.h"
++#include "llvm/IR/Module.h"
+ #include <fstream>
+ #include <mutex>
+ #include <string>
+@@ -2126,7 +2127,7 @@ amd_comgr_populate_name_expression_map(amd_comgr_data_t Data,
+         }
+         StringRef SecName = std::move(SecNameOrError.get());
+ 
+-        if (SecName.equals(StringRef(".rodata")))
++        if (SecName == StringRef(".rodata"))
+           rodataShdr = Shdr;
+       }
+     }
diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.2.4.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.2.4.ebuild
deleted file mode 100644
index eb873e94c0dc..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-6.2.4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 18 )
-
-inherit cmake llvm-r1 prefix
-
-MY_P=llvm-project-rocm-${PV}
-components=( "amd/comgr" )
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/ROCm/ROCm-CompilerSupport"
-SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}/${components[0]}"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.3-rocm-path.patch"
-	"${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch"
-	"${FILESDIR}/${PN}-6.0.0-extend-isa-compatibility-check.patch"
-	"${FILESDIR}/${PN}-6.1.0-enforce-oop-compiler.patch"
-	"${FILESDIR}/${PN}-6.1.0-fix-comgr-default-flags.patch"
-	"${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch"
-	"${FILESDIR}/${PN}-6.2.2-missing-isa.patch"
-)
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	llvm-core/clang-runtime:=
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}=
-		llvm-core/lld:${LLVM_SLOT}=
-	')
-	dev-util/hipcc:${SLOT}
-"
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=Release
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-r3_fetch
-		git-r3_checkout '' . '' "${components[@]}"
-	else
-		archive="${MY_P}.tar.gz"
-		ebegin "Unpacking from ${archive}"
-		tar -x -z -o \
-			-f "${DISTDIR}/${archive}" \
-			"${components[@]/#/${MY_P}/}" || die
-		eend ${?}
-	fi
-}
-
-src_prepare() {
-	sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die
-	sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix)\")," -i src/comgr-env.cpp || die
-	eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch)
-
-	cmake_src_prepare
-
-	# Replace @CLANG_RESOURCE_DIR@ in patches
-	local CLANG_RESOURCE_DIR="$("$(get_llvm_prefix)"/bin/clang -print-resource-dir)"
-	sed "s,@CLANG_RESOURCE_DIR@,\"${CLANG_RESOURCE_DIR}\"," -i src/comgr-compiler.cpp || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="$(get_llvm_prefix)"
-		-DCMAKE_STRIP=""  # disable stripping defined at lib/comgr/CMakeLists.txt:58
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local CMAKE_SKIP_TESTS=(
-		comgr_nested_kernel_test # See https://github.com/ROCm/llvm-project/issues/35
-	)
-	cmake_src_test
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.3.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.3.0.ebuild
new file mode 100644
index 000000000000..66239d28f79c
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-6.3.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 19 )
+
+inherit cmake llvm-r1 prefix
+
+MY_P=llvm-project-rocm-${PV}
+components=( "amd/comgr" )
+
+DESCRIPTION="Radeon Open Compute Code Object Manager"
+HOMEPAGE="https://github.com/ROCm/llvm-project/tree/amd-staging/amd/comgr"
+SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}/${components[0]}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.1.3-rocm-path.patch"
+	"${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch"
+	"${FILESDIR}/${PN}-6.0.0-extend-isa-compatibility-check.patch"
+	"${FILESDIR}/${PN}-6.1.0-enforce-oop-compiler.patch"
+	"${FILESDIR}/${PN}-6.3.0-fix-comgr-default-flags.patch"
+	"${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch"
+	"${FILESDIR}/${PN}-6.3.0-llvm-19-compat.patch"
+	"${FILESDIR}/${PN}-6.3.0-bypass-device-libs-copy.patch"
+)
+
+RDEPEND=">=dev-libs/rocm-device-libs-${PV}
+	llvm-core/clang-runtime:=
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}=
+		llvm-core/lld:${LLVM_SLOT}=
+	')
+	dev-util/hipcc:${SLOT}
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_BUILD_TYPE=Release
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		git-r3_fetch
+		git-r3_checkout '' . '' "${components[@]}"
+	else
+		archive="${MY_P}.tar.gz"
+		ebegin "Unpacking from ${archive}"
+		tar -x -z -o \
+			-f "${DISTDIR}/${archive}" \
+			"${components[@]/#/${MY_P}/}" || die
+		eend ${?}
+	fi
+}
+
+src_prepare() {
+	sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die
+	sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix)\")," -i src/comgr-env.cpp || die
+	eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch)
+
+	cmake_src_prepare
+
+	# Replace @CLANG_RESOURCE_DIR@ in patches
+	local CLANG_RESOURCE_DIR="$("$(get_llvm_prefix)"/bin/clang -print-resource-dir)"
+	sed "s,@CLANG_RESOURCE_DIR@,\"${CLANG_RESOURCE_DIR}\"," -i src/comgr-compiler.cpp || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="$(get_llvm_prefix)"
+		-DCMAKE_STRIP=""  # disable stripping defined at lib/comgr/CMakeLists.txt:58
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=(
+		comgr_nested_kernel_test # See https://github.com/ROCm/llvm-project/issues/35
+	)
+	cmake_src_test
+}
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index e6570a4121ed..08227416e607 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,6 +1,6 @@
 DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6ff8aaff44751f9b380addfae73a18dc388093c0535f230b0cc7528724bc43f6992e2ae6decd3d0d3c700893ca95a6166b7b8dc SHA512 e320d4eeaa6f61ed1cdbf653d67fe887d3ce9dc0d6743b4713502e1cb5318ab8afbe1ee71f8cba07635c54ce532df6683de40ade0e5be4a52e50ce25a9b70818
 DIST llvm-project-rocm-6.1.2.tar.gz 195992927 BLAKE2B d821f29f2f1f7c1ff414c63a710281f16d2a394b21f3365d01b86710cc09ed27e514b49fb744bf6a36b38815afa56cc26d44f0238f38479a0c2db9bf9989f389 SHA512 5f7e5dbe5976141de35e96e603624bd9d5a2c08b0690ba9fcd81d1b32f540f94bb9f4b74539e2838fd60ae1312dbe5e0b429ba80a03871782cdf3bd834940ce0
-DIST llvm-project-rocm-6.2.4.tar.gz 206742705 BLAKE2B e4d40c900b56a3d31003295c517fcb8fdc5cb0954f298d541d545c6d142746eecfa70a44bfdcb9044d70284f15af612c27dbd55d51e94e638e03bf21c1d3bc06 SHA512 5c5784c318c607168c9d2227ce1150e92fdc6aa457a9e64d62745a70f6fce92c4d4b1202422940f1ccc37a4bccf1efb220d8be39ec2ffdba7591d17e54ec8a5f
+DIST llvm-project-rocm-6.3.0.tar.gz 206677330 BLAKE2B f3e68a8c94599e3a938d3e761af163b9f010a06421680ee70aaaaf8073fb18da9151729c311fc4bd12b281b3afdd15e61cea31c970f0e4d36bb97838fa17ca5f SHA512 674fc3242c6dbb6962f1002dc34ccbd618da6adeb640bac15265d22fdcedf9de16ea3d79899891734ccc1099cb5b5ed9110b1162f4515c4cbc0d847810682b59
 DIST rocm-device-libs-5.1.3.tar.gz 242862 BLAKE2B 68d66de897f461e9f876de5fe2214803d4c00665651dea6af0952f0ce579c6704a5ec41b08971fa613ade309a0a85cb611b56b592dc2a25e247183e634ea3378 SHA512 cc3dfb8d4b4841ba777355c537175259d0019159ff462358320674b85082cccd99f6462f60fee66228ddfb88fade043445c1bac62504aa1462ba61b7e2751de7
 DIST rocm-device-libs-5.3.3.tar.gz 245690 BLAKE2B 475c0d818b8b0f090a8daeca2910cd4002e4cdf505d020327f46eb5f864a26937a6a3dfe4ff7b188ebda0f936b1c396f2163bb27b9e2a62c5976e60fa60856ac SHA512 8f6f2fc1534e348e02ba30a25cfc6017f8eab768968b5d0344a5ea7d65c4f0a874072f9e53919c74545814330602ef7c190753c7ff019137230e02f58a5d3a5d
 DIST rocm-device-libs-5.4.3.tar.gz 246095 BLAKE2B eb749346c96d465a5f22831968ccbd71f02749e6aa0d9c2becc0f378641ca0f65c1a131bfd3ed226f838b4208091fcc920b1e31b427adbd69a42881898668e6a SHA512 67b904363a3cff6c15bbd032cbc72cb5cd5f82acaa68c74391dbcf415266e8f35486a496b69b69e1fc0721e0e4e21fb6a6b9c180a46cb59cdcf53916be846ca4
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-6.2.0-test-bitcode-dir.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.2.0-test-bitcode-dir.patch
new file mode 100644
index 000000000000..0ab47c9d7e6d
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.2.0-test-bitcode-dir.patch
@@ -0,0 +1,32 @@
+`--rocm-device-lib-path` is needed to execute the tests because they are not
+installed to system yet
+--- a/test/compile/CMakeLists.txt
++++ b/test/compile/CMakeLists.txt
+@@ -40,6 +40,7 @@ function(add_compile_test test_name func_name)
+      -DFILECHECK_BIN=${FILECHECK_BIN}
+      -DOUTPUT_FILE=output.${test_name}.${test_cpu}.s
+      -DINPUT_FILE=${file_name}
++     -DAMDGCN_BITCODES=${PROJECT_BINARY_DIR}/lib/amdgcn/bitcode
+      -DTEST_CPU=${test_cpu}
+      -DCOMPILE_FLAGS=${COMPILE_TEST_COMPILE_FLAGS}
+      -DEXTRA_CHECK_PREFIX=${COMPILE_TEST_EXTRA_CHECK_PREFIXES}
+--- a/test/compile/RunCompileTest.cmake
++++ b/test/compile/RunCompileTest.cmake
+@@ -16,6 +16,7 @@ execute_process(COMMAND
+   -target amdgcn-amd-amdhsa -mcpu=${TEST_CPU}
+   -Xclang -finclude-default-header
+   --rocm-path=${BINARY_DIR}
++  --rocm-device-lib-path=${AMDGCN_BITCODES}
+   -mllvm -amdgpu-simplify-libcall=0
+   ${COMPILE_FLAGS}
+   -o ${OUTPUT_FILE} ${INPUT_FILE}
+--- a/test/compile/RunConstantFoldTest.cmake
++++ b/test/compile/RunConstantFoldTest.cmake
+@@ -16,6 +16,7 @@ execute_process(COMMAND
+   -target amdgcn-amd-amdhsa -mcpu=${TEST_CPU}
+   -Xclang -finclude-default-header
+   --rocm-path=${BINARY_DIR}
++  --rocm-device-lib-path=${AMDGCN_BITCODES}
+   -mllvm -amdgpu-simplify-libcall=0
+   -o ${OUTPUT_FILE} ${INPUT_FILE}
+   RESULT_VARIABLE CLANG_RESULT
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-6.2.4.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-6.2.4.ebuild
deleted file mode 100644
index 0995cc93e0c9..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-6.2.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 18 )
-inherit cmake flag-o-matic llvm-r1
-
-MY_P=llvm-project-rocm-${PV}
-components=( "amd/device-libs" )
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ROCm/llvm-project"
-	inherit git-r3
-	S="${WORKDIR}/${P}/${components[0]}"
-else
-	SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}/${components[0]}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Device Libraries"
-HOMEPAGE="https://github.com/ROCm/ROCm-Device-Libs"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-build/rocm-cmake
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/lld:${LLVM_SLOT}
-	')
-"
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.1.0-fix-llvm-link.patch"
-	"${FILESDIR}/${PN}-6.1.2-fix-build.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-r3_fetch
-		git-r3_checkout '' . '' "${components[@]}"
-	else
-		archive="${MY_P}.tar.gz"
-		ebegin "Unpacking from ${archive}"
-		tar -x -z -o \
-			-f "${DISTDIR}/${archive}" \
-			"${components[@]/#/${MY_P}/}" || die
-		eend ${?}
-	fi
-}
-
-src_prepare() {
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Do not trust CMake with autoselecting Clang, as it autoselects the latest one
-	# producing too modern LLVM bitcode and causing linker errors in other packages.
-	# Clean up unsupported flags for the switched compiler, see #936099
-	local -x CC="$(get_llvm_prefix)/bin/clang"
-	local -x CXX="$(get_llvm_prefix)/bin/clang++"
-	strip-unsupported-flags
-
-	local mycmakeargs=(
-		-DLLVM_DIR="$(get_llvm_prefix)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	local CLANG_EXE="$(get_llvm_prefix)/bin/clang"
-	# install symlink, so that clang won't ask for "--rocm-device-lib-path" flag anymore
-	local bitcodedir="$("${CLANG_EXE}" -print-resource-dir)/$(get_libdir)/amdgcn/bitcode"
-	dosym -r "/usr/lib/amdgcn/bitcode" "${bitcodedir#${EPREFIX}}"
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-6.3.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-6.3.0.ebuild
new file mode 100644
index 000000000000..16f98f0605c3
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-6.3.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 19 )
+inherit cmake flag-o-matic llvm-r1
+
+MY_P=llvm-project-rocm-${PV}
+components=( "amd/device-libs" )
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/llvm-project"
+	inherit git-r3
+	S="${WORKDIR}/${P}/${components[0]}"
+else
+	SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}/${components[0]}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/ROCm/llvm-project/tree/amd-staging/amd/device-libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-build/rocm-cmake
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+		llvm-core/lld:${LLVM_SLOT}
+	')
+"
+
+CMAKE_BUILD_TYPE=Release
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.1.0-fix-llvm-link.patch"
+	"${FILESDIR}/${PN}-6.1.2-fix-build.patch"
+	"${FILESDIR}/${PN}-6.2.0-test-bitcode-dir.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		git-r3_fetch
+		git-r3_checkout '' . '' "${components[@]}"
+	else
+		archive="${MY_P}.tar.gz"
+		ebegin "Unpacking from ${archive}"
+		tar -x -z -o \
+			-f "${DISTDIR}/${archive}" \
+			"${components[@]/#/${MY_P}/}" || die
+		eend ${?}
+	fi
+}
+
+src_prepare() {
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" \
+		-i "${S}/cmake/OCL.cmake" \
+		-i "${S}/cmake/Packages.cmake" || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Do not trust CMake with autoselecting Clang, as it autoselects the latest one
+	# producing too modern LLVM bitcode and causing linker errors in other packages.
+	# Clean up unsupported flags for the switched compiler, see #936099
+	local -x CC="$(get_llvm_prefix)/bin/clang"
+	local -x CXX="$(get_llvm_prefix)/bin/clang++"
+	strip-unsupported-flags
+
+	local mycmakeargs=(
+		-DLLVM_DIR="$(get_llvm_prefix)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	local CLANG_EXE="$(get_llvm_prefix)/bin/clang"
+	# install symlink, so that clang won't ask for "--rocm-device-lib-path" flag anymore
+	local bitcodedir="$("${CLANG_EXE}" -print-resource-dir)/$(get_libdir)/amdgcn/bitcode"
+	dosym -r "/usr/lib/amdgcn/bitcode" "${bitcodedir#${EPREFIX}}"
+}
+
+src_test() {
+	# https://github.com/ROCm/llvm-project/issues/76
+	# "Failing tests are on gfx that are not supported"
+	local CMAKE_SKIP_TESTS=(
+		compile_frexp__gfx600
+		compile_fract__gfx600
+		compile_fract__gfx700
+	)
+
+	cmake_src_test
+}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index 9c99f5c85dcf..931e5e868bc8 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -5,7 +5,7 @@ DIST rocclr-5.5.1.tar.gz 634330 BLAKE2B e6383a6b6b09f274a944d66effd345e38a191ec7
 DIST rocm-clr-5.7.1.tar.gz 2008647 BLAKE2B 3db0760d6f83504e60caf88a2dd5e0bc02c7db9d6f263ad0eb2cfc79aa0f88a3699c412844a0158a796d9d02e79660287e791edad787d814eefffea4fd2298b4 SHA512 d79323481d82fc02c12a32cdcc0d14437d512af023e7737db0387b7eecb27fe6e4ae7c71d6adce57932a04bb24c880440d9dc10aeb5af11a4f2ca64d44330965
 DIST rocm-clr-6.1.1.tar.gz 2031034 BLAKE2B b0485bb015d31986f4988d1db0c029c826856e50b5bb1b58fac2097c14b3966668f1b8d41ec198889e27ac860497a8b3c081ec31d52390d5c9ff5db092bf7cce SHA512 86925e8b9a9e77b06a57daefbc7279887b4ef7c6a79c3717bc2f2d3bf29926281c60063fd17e21c65d7def520d9f579bf88f69051d053a38750ba968f69ca3fc
 DIST rocm-clr-6.1.2.tar.gz 2031283 BLAKE2B d51d32a77794ea97f1a3817786c9fd6b482106b665eea6e2c9b4c11e4dce19a3486386eb5ba111554c2d82c30e2a93add7502eed5768caf3fb709fb5fbb2e71b SHA512 e97224451864efe0084c4117f54893c9624a6a9f365a0b4abad08fd9635f008dea742dc589429fbb714e1b8177d06362c0f5a741f6c4a050d0fd4d48da72d54b
-DIST rocm-clr-6.2.4.tar.gz 2078004 BLAKE2B 28fdd2a81a5b831e157d781d6d869c02a288d9b8dc47a8a1d0a9f3b7ed99393c06f9b2bbc8d7dc2b2173a1b8c57fa1328b0fd6a7f24e759ace77e8c1ae777442 SHA512 74a198595929003248a3684fb5d83c20a8769eef237fcc07371f4385380f347917d6beaca15527334d06ea19bc446a03fca7251e5b2782f05547a36ccd1dfa49
+DIST rocm-clr-6.3.0.tar.gz 2093572 BLAKE2B 14f75f9f5dc4000a2abf28e523659def8cd96112c9c8b95abb634c33433077faa3ddab3fbe659e0ed2e1f309f63a93b7eb03fa6f246b4cea06ca8c512c13308a SHA512 f005baaf2a8f63946811db990e2d373906b31a4085a51427d407c9e4c1d877a14aeb713190a285953cadb960b5517570941c60e2f998adb2b1f9833f1d2f5925
 DIST rocm-opencl-runtime-5.1.3.tar.gz 1004765 BLAKE2B 64d9b42026d2be1d0e4aa666785699f6b4ec0584a927904a94bf830883050943503f8bdd7c97438a2fb11c71686a330d526f633959916c5c6c8da2e037841e79 SHA512 b83c3ae0bfad80f867bacce36710a8964f6dd7e64bf50da3ec6ce842217d6de63299d9ceaab9dc25a22252484520a85d02859809463dad5dda9b1f00a86863e0
 DIST rocm-opencl-runtime-5.3.3.tar.gz 1007773 BLAKE2B a3f600a68183337f92b152a123241cb7025889cca2ef6814d9d5b5a2146a78703b171d20bcb432bc7a2cdd1f24ad349408c17816b25a66702e9f0f5345af9082 SHA512 391f0f244b7f02972df8cada821e69ee8d81d96b9cff3c14f1d0838da583d8fb136ec4bd5ee820f6dd261968e9eef5e9a5b10b7bb76b1b64625c399d79bcb03f
 DIST rocm-opencl-runtime-5.4.3.tar.gz 1005268 BLAKE2B f9398e4c2b0f045f1b5d8df9f31b7f2bef6a9201885aa6ee5fc5d71632cfde26a078d9a5ea38c3da12d3c187faf04c7bdcf1a8ecb9927cdba56b1efdfcdc44ee SHA512 f65d4622ce8721a6b91ab5b5b306d142ba507d3e631ac3ab0b76c5bc6d8d18455e02debd954c82e7eb609f232b509f1ec1a013dc2fad467c2c2ad31fdf15755d
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.1.2-musl.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.1.2-musl.patch
new file mode 100644
index 000000000000..424cd0dde119
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.1.2-musl.patch
@@ -0,0 +1,24 @@
+Fix "basename" and "__cpu_mask" definitions for musl
+
+Upstream PR: https://github.com/ROCm/clr/pull/83
+--- a/rocclr/os/os.hpp
++++ b/rocclr/os/os.hpp
+@@ -29,6 +29,7 @@
+ 
+ #if defined(__linux__)
+ #include <sched.h>
++#include <libgen.h>
+ #endif
+ 
+ #ifdef _WIN32
+@@ -377,6 +378,10 @@ ALWAYSINLINE address Os::currentStackPtr() {
+ 
+ #if defined(__linux__)
+ 
++#ifndef __GLIBC__
++typedef unsigned long int __cpu_mask;
++#endif
++
+ inline void Os::ThreadAffinityMask::init() { CPU_ZERO(&mask_); }
+ 
+ inline void Os::ThreadAffinityMask::set(uint cpu) { CPU_SET(cpu, &mask_); }
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.2.4-fix-lib-version.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.2.4-fix-lib-version.patch
new file mode 100644
index 000000000000..17c6ebcc6f6e
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.2.4-fix-lib-version.patch
@@ -0,0 +1,13 @@
+There is no ROCM_LIBPATCH_VERSION outside of AMD farm.
+Upstream bug: https://github.com/ROCm/clr/issues/112
+--- a/opencl/amdocl/CMakeLists.txt
++++ b/opencl/amdocl/CMakeLists.txt
+@@ -66,6 +66,8 @@ set(AMDOCL_LIB_VERSION_MAJOR "2")
+ set(AMDOCL_LIB_VERSION_MINOR "1")
+ if(DEFINED ENV{ROCM_LIBPATCH_VERSION})
+   set(AMDOCL_LIB_VERSION_PATCH "${AMDOCL_LIB_VERSION_MAJOR}.${AMDOCL_LIB_VERSION_MINOR}.$ENV{ROCM_LIBPATCH_VERSION}")
++else()
++  set(AMDOCL_LIB_VERSION_PATCH "${AMDOCL_LIB_VERSION_MAJOR}.${AMDOCL_LIB_VERSION_MINOR}")
+ endif()
+ 
+ set_target_properties(amdocl PROPERTIES
diff --git a/dev-libs/rocm-opencl-runtime/metadata.xml b/dev-libs/rocm-opencl-runtime/metadata.xml
index c815e421fb36..1b835a209717 100644
--- a/dev-libs/rocm-opencl-runtime/metadata.xml
+++ b/dev-libs/rocm-opencl-runtime/metadata.xml
@@ -10,6 +10,6 @@
         <name>Yiyang Wu</name>
     </maintainer>
     <upstream>
-        <remote-id type="github">RadeonOpenCompute/ROCm-OpenCL-Runtime</remote-id>
+        <remote-id type="github">ROCm/ROCm-OpenCL-Runtime</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.2-r1.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.2-r1.ebuild
index 540038443185..ff5b6f1635e8 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.2-r1.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.2-r1.ebuild
@@ -29,7 +29,10 @@ BDEPEND=">=dev-build/rocm-cmake-5.3
 	test? ( >=x11-apps/mesa-progs-8.5.0[X] )
 "
 
-PATCHES=( "${FILESDIR}/rocm-opencl-runtime-6.1.2-fix-segfault.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-6.1.2-fix-segfault.patch"
+	"${FILESDIR}/${PN}-6.1.2-musl.patch"
+)
 
 src_configure() {
 	# -Werror=strict-aliasing
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.2.4.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.2.4.ebuild
deleted file mode 100644
index 465e3a2ddc66..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.2.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ROCM_SKIP_GLOBALS=1
-inherit cmake edo flag-o-matic rocm
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/clr"
-
-SRC_URI="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz"
-S="${WORKDIR}/clr-rocm-${PV}/"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/rocr-runtime-6.0
-	>=dev-libs/rocm-comgr-6.0
-	>=dev-libs/rocm-device-libs-6.0
-	>=virtual/opencl-3
-	media-libs/mesa[-opencl]"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-build/rocm-cmake-5.3
-	media-libs/glew
-	test? ( >=x11-apps/mesa-progs-8.5.0[X] )
-"
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/856088
-	# https://github.com/ROCm/clr/issues/64
-	#
-	# Do not trust it for LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	# Fix ld.lld linker error: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/155
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
-	append-cflags -fcommon
-
-	local mycmakeargs=(
-		-Wno-dev
-		-DROCM_PATH="${EPREFIX}/usr"
-		-DBUILD_TESTS=$(usex test ON OFF)
-		-DEMU_ENV=ON
-		-DBUILD_ICD=ON
-		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
-		-DCLR_BUILD_OCL=on
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors
-	doins opencl/config/amdocl64.icd
-
-	cd "${BUILD_DIR}"/opencl || die
-	insinto /usr/lib64
-	doins amdocl/libamdocl64.so
-	doins tools/cltrace/libcltrace.so
-}
-
-src_test() {
-	check_amdgpu
-	cd "${BUILD_DIR}"/tests/ocltst || die
-	export OCL_ICD_FILENAMES="${BUILD_DIR}"/amdocl/libamdocl64.so
-	local instruction1="Please start an X server using amdgpu driver (not Xvfb!),"
-	local instruction2="and export OCLGL_DISPLAY=\${DISPLAY} OCLGL_XAUTHORITY=\${XAUTHORITY} before reruning the test."
-	if [[ -n ${OCLGL_DISPLAY+x} ]]; then
-		export DISPLAY=${OCLGL_DISPLAY}
-		export XAUTHORITY=${OCLGL_XAUTHORITY}
-		ebegin "Running oclgl test under DISPLAY ${OCLGL_DISPLAY}"
-		if ! glxinfo | grep "OpenGL vendor string: AMD"; then
-			ewarn "${instruction1}"
-			ewarn "${instruction2}"
-			die "This display does not have AMD OpenGL vendor!"
-		fi
-		./ocltst -m $(realpath liboclgl.so) -A ogl.exclude
-		eend $? || die "oclgl test failed"
-	else
-		ewarn "${instruction1}"
-		ewarn "${instruction2}"
-		die "\${OCLGL_DISPLAY} not set."
-	fi
-	edob ./ocltst -m $(realpath liboclruntime.so) -A oclruntime.exclude
-	edob ./ocltst -m $(realpath liboclperf.so) -A oclperf.exclude
-}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.3.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.3.0.ebuild
new file mode 100644
index 000000000000..9b71c076cb2d
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.3.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_SKIP_GLOBALS=1
+inherit cmake edo flag-o-matic rocm
+
+DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
+HOMEPAGE="https://github.com/ROCm/clr"
+
+SRC_URI="https://github.com/ROCm/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz"
+S="${WORKDIR}/clr-rocm-${PV}/"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/rocr-runtime:${SLOT}
+	dev-libs/rocm-comgr:${SLOT}
+	dev-libs/rocm-device-libs:${SLOT}
+	>=virtual/opencl-3
+	media-libs/mesa[-opencl]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-build/rocm-cmake-6.0
+	media-libs/glew
+	test? ( >=x11-apps/mesa-progs-8.5.0[X] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.2.4-fix-lib-version.patch"
+	"${FILESDIR}/${PN}-6.1.2-musl.patch"
+)
+
+src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/856088
+	# https://github.com/ROCm/clr/issues/64
+	#
+	# Do not trust it for LTO either
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	# Fix ld.lld linker error: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/155
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
+	append-cflags -fcommon
+
+	local mycmakeargs=(
+		-Wno-dev
+		-DROCM_PATH="${EPREFIX}/usr"
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-DEMU_ENV=ON
+		-DBUILD_ICD=ON
+		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DCLR_BUILD_OCL=on
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	insinto /etc/OpenCL/vendors
+	doins opencl/config/amdocl64.icd
+
+	cd "${BUILD_DIR}"/opencl || die
+	insinto /usr/lib64
+	doins amdocl/libamdocl64.so*
+	doins tools/cltrace/libcltrace.so
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}"/tests/ocltst || die
+	export OCL_ICD_FILENAMES="${BUILD_DIR}"/amdocl/libamdocl64.so
+	local instruction1="Please start an X server using amdgpu driver (not Xvfb!),"
+	local instruction2="and export OCLGL_DISPLAY=\${DISPLAY} OCLGL_XAUTHORITY=\${XAUTHORITY} before reruning the test."
+	if [[ -n ${OCLGL_DISPLAY+x} ]]; then
+		export DISPLAY=${OCLGL_DISPLAY}
+		export XAUTHORITY=${OCLGL_XAUTHORITY}
+		ebegin "Running oclgl test under DISPLAY ${OCLGL_DISPLAY}"
+		if ! glxinfo | grep "OpenGL vendor string: AMD"; then
+			ewarn "${instruction1}"
+			ewarn "${instruction2}"
+			die "This display does not have AMD OpenGL vendor!"
+		fi
+		./ocltst -m $(realpath liboclgl.so) -A ogl.exclude
+		eend $? || die "oclgl test failed"
+	else
+		ewarn "${instruction1}"
+		ewarn "${instruction2}"
+		die "\${OCLGL_DISPLAY} not set."
+	fi
+	edob ./ocltst -m $(realpath liboclruntime.so) -A oclruntime.exclude
+	edob ./ocltst -m $(realpath liboclperf.so) -A oclperf.exclude
+}
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index dc4ec5978304..b4df296c7850 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -5,4 +5,4 @@ DIST rocr-runtime-5.5.1.tar.gz 816175 BLAKE2B e588d98cbd0d9a753b950ba676d6cddeed
 DIST rocr-runtime-5.7.1.tar.gz 832009 BLAKE2B 67e4a64ee03b1f6edc43923c7ac44113ab58f78b032dc0a01952b2dd5b2ca37404044811effb9c8d83002ac4ea344a5d95ac62f3c66012bff2884ef55285cdb5 SHA512 a6547a104303032244d17b662a3eda48039732c215debb6178c0af8842c01c60f80989793420c101bd554e58332d215205da0c228dfc25538c56499f47dc6832
 DIST rocr-runtime-6.1.1.tar.gz 903611 BLAKE2B 175e7267bfd9d70fb805135e765004cf2b43b2d66354f0cef857d417c8dac4ce7638ec1b90a1088324aa5f90ed8354c66b56846115368d68d622a215350d84dd SHA512 5e6e28dee29ef9df9d617f56038b2e52022738d5510833cd8e1738defe1049d0a957db4d9f63bbf55d8efca3a4ea349b95919dd1b6b35b9814ebba575a67af57
 DIST rocr-runtime-6.1.2.tar.gz 903633 BLAKE2B 058492c6c37bb80e8cdb29752f3f1404ac88108dcfd5137042e4fdaff521db01d64bd14bdcbed9e53b8984f8bbb22b126f1a798bd064c393b5bcf76c1d3311ca SHA512 2893aff72a5fbf03bfde67ab64fcf00f4e10b5e5b11ff4617e94ae0c019a24a9b80601d8629d4e119e6a4957dc0aaf03d645111063979af60090fe3b232a477e
-DIST rocr-runtime-6.2.4.tar.gz 959982 BLAKE2B a4cc3960c7e559c7c1837e009c998784832c861ca59c0cbf9388c8ae081670b4e45c4e5b032dbd17a4c2efe8708a1330c9ff66c814196e29df5c7a6735a6d3e9 SHA512 cdd84ddf2120f494eec282b78d0858970e0603ea096213f25731af5a97f652d058ff93122bb3a0813c45cb87f625af6f33c2c108d8fb5db63d62674b13e40c71
+DIST rocr-runtime-6.3.0.tar.gz 2258605 BLAKE2B 53b43a8bc4a327c2138e39db20f5217b2def6866d1b52e48017c41e6c3c8541e6bdce76f5a7669cdffccfb34a4cfa863e56e0ce4058d23c5f38d9d0900903751 SHA512 451e74d88875b8d0a1f21d95c543fd93610d966e69258b50fe4b8796381c58f5ea381384e199e5bcf01a80369a59e5a093d8f318fbe2ed1ca6a97dc915060f7a
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-6.1.2-gcc15-stdint.patch b/dev-libs/rocr-runtime/files/rocr-runtime-6.1.2-gcc15-stdint.patch
new file mode 100644
index 000000000000..21691ae0c1c0
--- /dev/null
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-6.1.2-gcc15-stdint.patch
@@ -0,0 +1,11 @@
+https://github.com/ROCm/ROCR-Runtime/issues/227
+--- a/core/inc/amd_elf_image.hpp
++++ b/core/inc/amd_elf_image.hpp
+@@ -47,6 +47,7 @@
+ #include <sstream>
+ #include <vector>
+ #include <memory>
++#include <cstdint>
+ 
+ namespace rocr {
+ namespace amd {
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-6.3.0-musl.patch b/dev-libs/rocr-runtime/files/rocr-runtime-6.3.0-musl.patch
new file mode 100644
index 000000000000..75cd032ce373
--- /dev/null
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-6.3.0-musl.patch
@@ -0,0 +1,107 @@
+--- a/runtime/hsa-ext-finalize/CMakeLists.txt
++++ b/runtime/hsa-ext-finalize/CMakeLists.txt
+@@ -101,6 +101,18 @@ if( NOT DEFINED OPEN_SOURCE_DIR )
+   set ( OPEN_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/.." )
+ endif()
+ 
++## Check for _GNU_SOURCE pthread extensions
++set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
++CHECK_SYMBOL_EXISTS ( "pthread_attr_setaffinity_np" "pthread.h" HAVE_PTHREAD_ATTR_SETAFFINITY_NP )
++CHECK_SYMBOL_EXISTS ( "pthread_rwlockattr_setkind_np" "pthread.h" HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP )
++unset(CMAKE_REQUIRED_DEFINITIONS)
++if ( HAVE_PTHREAD_ATTR_SETAFFINITY_NP )
++  target_compile_definitions(${CORE_RUNTIME_TARGET} PRIVATE HAVE_PTHREAD_ATTR_SETAFFINITY_NP )
++endif()
++if ( HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP )
++  target_compile_definitions(${CORE_RUNTIME_TARGET} PRIVATE HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP )
++endif()
++
+ ## ------------------------- Linux Compiler and Linker options -------------------------
+ set ( CMAKE_CXX_FLAGS "-std=c++11 " )
+ 
+--- a/runtime/hsa-runtime/CMakeLists.txt
++++ b/runtime/hsa-runtime/CMakeLists.txt
+@@ -47,7 +47,7 @@ cmake_minimum_required ( VERSION 3.7 )
+ ## Need an update to CMake 3.12 to remove this hack. See CMake policy change CMP0073.
+ unset ( hsa-runtime64_LIB_DEPENDS CACHE )
+ 
+-set(CMAKE_VERBOSE_MAKEFILE ON)
++#_cmake_modify_IGNORE set(CMAKE_VERBOSE_MAKEFILE ON)
+ 
+ ## Set core runtime module name and project name.
+ set ( CORE_RUNTIME_NAME "hsa-runtime64" )
+@@ -109,6 +109,18 @@ if ( HAVE_MEMFD_CREATE )
+   target_compile_definitions(${CORE_RUNTIME_TARGET} PRIVATE HAVE_MEMFD_CREATE )
+ endif()
+ 
++## Check for _GNU_SOURCE pthread extensions
++set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
++CHECK_SYMBOL_EXISTS ( "pthread_attr_setaffinity_np" "pthread.h" HAVE_PTHREAD_ATTR_SETAFFINITY_NP )
++CHECK_SYMBOL_EXISTS ( "pthread_rwlockattr_setkind_np" "pthread.h" HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP )
++unset(CMAKE_REQUIRED_DEFINITIONS)
++if ( HAVE_PTHREAD_ATTR_SETAFFINITY_NP )
++  target_compile_definitions(${CORE_RUNTIME_TARGET} PRIVATE HAVE_PTHREAD_ATTR_SETAFFINITY_NP )
++endif()
++if ( HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP )
++  target_compile_definitions(${CORE_RUNTIME_TARGET} PRIVATE HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP )
++endif()
++
+ ## Set include directories for ROCr runtime
+ target_include_directories( ${CORE_RUNTIME_TARGET}
+   PUBLIC
+--- a/runtime/hsa-runtime/core/util/lnx/os_linux.cpp
++++ b/runtime/hsa-runtime/core/util/lnx/os_linux.cpp
+@@ -137,12 +137,14 @@ class os_thread {
+       for (int i = 0; i < cores; i++) {
+         CPU_SET_S(i, CPU_ALLOC_SIZE(cores), cpuset);
+       }
++#ifdef HAVE_PTHREAD_ATTR_SETAFFINITY_NP
+       err = pthread_attr_setaffinity_np(&attrib, CPU_ALLOC_SIZE(cores), cpuset);
+       CPU_FREE(cpuset);
+       if (err != 0) {
+         fprintf(stderr, "pthread_setaffinity_np failed: %s\n", strerror(err));
+         return;
+       }
++#endif
+     }
+ 
+     do {
+@@ -165,6 +167,18 @@ class os_thread {
+       }
+     } while (stackSize < 20 * 1024 * 1024);
+ 
++#ifndef HAVE_PTHREAD_ATTR_SETAFFINITY_NP
++    if (cores && cpuset) {
++      err = pthread_setaffinity_np(thread, CPU_ALLOC_SIZE(cores), cpuset);
++      CPU_FREE(cpuset);
++      if (err != 0) {
++        fprintf(stderr, "pthread_setaffinity_np failed: %s\n", strerror(err));
++        thread = 0;
++        return;
++      }
++    }
++#endif
++
+     args.release();
+   }
+ 
+@@ -655,18 +669,12 @@ SharedMutex CreateSharedMutex() {
+     return nullptr;
+   }
+ 
+-#ifdef __GLIBC__
++#ifdef HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP
+   err = pthread_rwlockattr_setkind_np(&attrib, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
+   if (err != 0) {
+     fprintf(stderr, "Set rw lock attribute failure: %s\n", strerror(err));
+     return nullptr;
+   }
+-#else
+-  err = pthread_rwlockattr_setkind(&attrib, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
+-  if (err != 0) {
+-    fprintf(stderr, "Set rw lock attribute failure: %s\n", strerror(err));
+-    return nullptr;
+-  }
+ #endif
+ 
+   pthread_rwlock_t* lock = new pthread_rwlock_t;
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-6.3.0-use-system-hsakmt.patch b/dev-libs/rocr-runtime/files/rocr-runtime-6.3.0-use-system-hsakmt.patch
new file mode 100644
index 000000000000..06f6610a71f4
--- /dev/null
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-6.3.0-use-system-hsakmt.patch
@@ -0,0 +1,20 @@
+libhsakmt is a part of dev-libs/roct-thunk-interface
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -96,11 +96,16 @@ if (HSA_DEP_ROCPROFILER_REGISTER)
+   string(APPEND CPACK_RPM_BINARY_PACKAGE_REQUIRES " rocprofiler-register")
+ endif()
+ 
++if (BUILD_HSAKMT)
+ add_rocm_subdir(libhsakmt "${THUNK_DEFINITIONS}")
+ set_target_properties(hsakmt PROPERTIES
+                                 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/libhsakmt/archive"
+                                 LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/libhsakmt/lib"
+                                 RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/libhsakmt/runtime")
++else()
++  find_package(hsakmt REQUIRED)
++  add_library(hsakmt ALIAS hsakmt::hsakmt)
++endif()
+ 
+ if (BUILD_ROCR)
+   add_rocm_subdir(runtime/hsa-runtime "${ROCR_DEFINITIONS}")
diff --git a/dev-libs/rocr-runtime/rocr-runtime-6.1.2.ebuild b/dev-libs/rocr-runtime/rocr-runtime-6.1.2.ebuild
index d7000ea9ca92..a16005a972f1 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-6.1.2.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-6.1.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
@@ -24,6 +24,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.7.1-extend-isa-compatibility-check.patch"
 	"${FILESDIR}/${PN}-6.1.0-musl.patch"
 	"${FILESDIR}/${PN}-6.1.0-ld-lld.patch"
+	"${FILESDIR}/${PN}-6.1.2-gcc15-stdint.patch"
 )
 
 LICENSE="MIT"
@@ -33,8 +34,8 @@ IUSE="debug"
 COMMON_DEPEND="dev-libs/elfutils
 	x11-libs/libdrm"
 DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
+	dev-libs/roct-thunk-interface:${SLOT}
+	dev-libs/rocm-device-libs:${SLOT}
 	$(llvm_gen_dep '
 		llvm-core/clang:${LLVM_SLOT}=
 		llvm-core/lld:${LLVM_SLOT}=
diff --git a/dev-libs/rocr-runtime/rocr-runtime-6.2.4.ebuild b/dev-libs/rocr-runtime/rocr-runtime-6.2.4.ebuild
deleted file mode 100644
index dfbf8f00ebdd..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-6.2.4.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
-
-LLVM_COMPAT=( 18 )
-
-inherit cmake flag-o-matic llvm-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ROCm/ROCR-Runtime/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/ROCm/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/ROCm/ROCR-Runtime"
-PATCHES=(
-	"${FILESDIR}/${PN}-4.3.0_no-aqlprofiler.patch"
-	"${FILESDIR}/${PN}-5.7.1-extend-isa-compatibility-check.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="debug"
-
-COMMON_DEPEND="dev-libs/elfutils
-	x11-libs/libdrm"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}=
-		llvm-core/lld:${LLVM_SLOT}=
-	')
-"
-RDEPEND="${DEPEND}"
-BDEPEND="app-editors/vim-core"
-	# vim-core is needed for "xxd"
-
-src_prepare() {
-	# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
-	sed -e "s:-O2:--rocm-path=${EPREFIX}/usr/lib/ -O2:" -i image/blit_src/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/856091
-	# https://github.com/ROCm/ROCR-Runtime/issues/182
-	filter-lto
-
-	use debug || append-cxxflags "-DNDEBUG"
-	cmake_src_configure
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-6.3.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-6.3.0.ebuild
new file mode 100644
index 000000000000..d5f08251958d
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-6.3.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 19 )
+
+inherit cmake flag-o-matic llvm-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/ROCR-Runtime/"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="https://github.com/ROCm/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCR-Runtime-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Runtime"
+HOMEPAGE="https://github.com/ROCm/ROCR-Runtime"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="debug"
+
+COMMON_DEPEND="dev-libs/elfutils
+	x11-libs/libdrm"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/roct-thunk-interface:${SLOT}
+	dev-libs/rocm-device-libs:${SLOT}
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}=
+		llvm-core/lld:${LLVM_SLOT}=
+	')
+"
+RDEPEND="${DEPEND}"
+BDEPEND="app-editors/vim-core"
+	# vim-core is needed for "xxd"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.3.0-use-system-hsakmt.patch"
+	"${FILESDIR}/${PN}-6.3.0-musl.patch"
+)
+
+src_prepare() {
+	cd "${S}/runtime/hsa-runtime" || die
+	eapply "${FILESDIR}/${PN}-4.3.0_no-aqlprofiler.patch"
+	eapply "${FILESDIR}/${PN}-5.7.1-extend-isa-compatibility-check.patch"
+	eapply "${FILESDIR}/${PN}-6.1.2-gcc15-stdint.patch"
+
+	# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
+	sed -e "s:-O2:--rocm-path=${EPREFIX}/usr/lib/ -O2:" -i image/blit_src/CMakeLists.txt || die
+
+	cd "${S}" || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/856091
+	# https://github.com/ROCm/ROCR-Runtime/issues/182
+	filter-lto
+
+	use debug || append-cxxflags "-DNDEBUG"
+
+	cmake_src_configure
+}
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index 229c62f064f3..f6991f4abe4d 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -5,4 +5,4 @@ DIST roct-thunk-interface-5.5.1.tar.gz 649617 BLAKE2B 54ecae486e5d8b99363947a93b
 DIST roct-thunk-interface-5.7.1.tar.gz 665529 BLAKE2B 407601d45976ad66e85999c53bcaa62fefa2ea823e1d3296a9aabe8b6a9c915776344de4499fcf6f9ee80193201308b27b387a7225aca5d2cc7e294143eefacd SHA512 c0dc449c8b713ac543f6cd6c876ea0f160dcb1a5c4a52a2b1364fcae0039e9fe195e4223a2644d7d3a7fbc2a48166e798d15b9088e2097b65974e2ba5e48bdcf
 DIST roct-thunk-interface-6.1.1.tar.gz 666377 BLAKE2B b30d733fb769f7169e97b8a28eaa61c84205aec06b55d662d24f159a3c84190f3252f090413769e56eb621abc789fae521cb7b26d7cdac952ff1e4e120707bc9 SHA512 2c579606d2ced9f8b5e32841db745819771b7d6ce0cef90b818e3710470e30c7715540125d99ed5ea13c4e672d5af6d8ad2dd5975ef76cab7ba993d86cf74eb4
 DIST roct-thunk-interface-6.1.2.tar.gz 666380 BLAKE2B ffff2405bbb95a6908670a23cf6090147a5669f8ab0c999047203731c99c511738a33ac8d3fc0f0e5432e3744e948ec3fe658d6a578ecc63606c8a5662025b0a SHA512 083b1a865608016f78c094a27ece3858072e72d80e1322e7cef22261222a0f868d3b72ebfcd80a11e4719e90d3d3fc7b0c683aed77714f54f520bb126b13ab7c
-DIST roct-thunk-interface-6.2.4.tar.gz 674228 BLAKE2B d1e13cd4d772a2118c6af973893be077b205a197a7fbfc2c6b8ca616d079bfbd1edab788fe170980c3d746afee409dca00f267f6c5c481a7eb1320faafbf4145 SHA512 2df159af277be9834ff7fc60094fdeefdae029099e9208426d0efc817e8b88d74c40a75b36a774ab06d638ce37aef68483d2c7b8d77be96a4f76a160e1cd1bf7
+DIST roct-thunk-interface-6.3.0.tar.gz 2258605 BLAKE2B 53b43a8bc4a327c2138e39db20f5217b2def6866d1b52e48017c41e6c3c8541e6bdce76f5a7669cdffccfb34a4cfa863e56e0ce4058d23c5f38d9d0900903751 SHA512 451e74d88875b8d0a1f21d95c543fd93610d966e69258b50fe4b8796381c58f5ea381384e199e5bcf01a80369a59e5a093d8f318fbe2ed1ca6a97dc915060f7a
diff --git a/dev-libs/roct-thunk-interface/files/kfdtest-6.2.4-fix-llvm-header.patch b/dev-libs/roct-thunk-interface/files/kfdtest-6.2.4-fix-llvm-header.patch
new file mode 100644
index 000000000000..30515c2d12f8
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/kfdtest-6.2.4-fix-llvm-header.patch
@@ -0,0 +1,14 @@
+Add header for llvm_shutdown.
+Backports https://github.com/ROCm/ROCT-Thunk-Interface/commit/8bb5764ee1c4e3a8dc7588b597831389b4481345
+--- a/tests/kfdtest/src/Assemble.cpp
++++ b/tests/kfdtest/src/Assemble.cpp
+@@ -69,6 +69,9 @@
+ #else
+ #include <llvm/Support/TargetRegistry.h>
+ #endif
++#if LLVM_VERSION_MAJOR > 18
++#include "llvm/Support/ManagedStatic.h"
++#endif
+ 
+ #include <linux/elf.h>
+ #include "OSWrapper.hpp"
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.3.0-functions.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.3.0-functions.patch
new file mode 100644
index 000000000000..3b6c2623bd7a
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.3.0-functions.patch
@@ -0,0 +1,12 @@
+https://github.com/ROCm/ROCR-Runtime/issues/263
+--- a/src/libhsakmt.ver
++++ b/src/libhsakmt.ver
+@@ -89,6 +89,8 @@ hsaKmtPcSamplingDestroy;
+ hsaKmtPcSamplingStart;
+ hsaKmtPcSamplingStop;
+ hsaKmtPcSamplingSupport;
++hsaKmtCreateQueueExt;
++hsaKmtRegisterGraphicsHandleToNodesExt;
+ local: *;
+ };
+ 
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.3.0-musl.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.3.0-musl.patch
new file mode 100644
index 000000000000..f1a117050c9a
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.3.0-musl.patch
@@ -0,0 +1,71 @@
+Fix error: 'hsakmt_page_size' undeclared (musl-only)
+Upstream bug: https://github.com/ROCm/ROCR-Runtime/issues/267
+--- a/src/libhsakmt.h
++++ b/src/libhsakmt.h
+@@ -64,14 +64,15 @@ extern HsaVersionInfo hsakmt_kfd_version_info;
+ 	do { if ((minor) > hsakmt_kfd_version_info.KernelInterfaceMinorVersion)\
+ 		return HSAKMT_STATUS_NOT_SUPPORTED; } while (0)
+ 
++extern int hsakmt_page_size;
++extern int hsakmt_page_shift;
++
+ /* Might be defined in limits.h on platforms where it is constant (used by musl) */
+ /* See also: https://pubs.opengroup.org/onlinepubs/7908799/xsh/limits.h.html */
+ #ifndef PAGE_SIZE
+-extern int hsakmt_page_size;
+ #define PAGE_SIZE hsakmt_page_size
+ #endif
+ #ifndef PAGE_SHIFT
+-extern int hsakmt_page_shift;
+ #define PAGE_SHIFT hsakmt_page_shift
+ #endif
+ 
+--- a/tests/kfdtest/src/KFDTestUtilQueue.cpp
++++ b/tests/kfdtest/src/KFDTestUtilQueue.cpp
+@@ -57,13 +57,13 @@ class AsyncMPSQ {
+         void PlacePacketOnNode(PacketList &packetList, int node, TSPattern tsp);
+ 
+         /* Run the packets placed on nodes and return immediately.*/
+-        void Submit(void) { ASSERT_NE((HSAuint64)m_queue, NULL); m_queue->SubmitPacket(); }
++        void Submit(void) { ASSERT_NE(m_queue, nullptr); m_queue->SubmitPacket(); }
+ 
+         /* Return only when all packets are consumed.
+          * If there is any packet issues some IO operations, wait these IO to complete too.
+          */
+         void Wait(void) {
+-            ASSERT_NE((HSAuint64)m_queue, NULL);
++            ASSERT_NE(m_queue, nullptr);
+             m_queue->Wait4PacketConsumption(m_event, std::max((unsigned int)6000, g_TestTimeOut));
+         }
+ 
+@@ -244,7 +244,7 @@ HSAuint64 AsyncMPSQ::Report(int indexOfPacket, HSAuint64 &begin, HSAuint64 &end)
+     if (m_ts_pattern == HEAD_TAIL)
+         indexOfPacket = 0;
+ 
+-    EXPECT_NE((HSAuint64)m_ts, NULL)
++    EXPECT_NE(m_ts, nullptr)
+         << " Error " << ++error << ": No timestamp buf!" << std::endl;
+     /* m_ts_count is equal to packets count + 1, see PlacePacketOnNode().
+      * So the max index of a packet is m_ts_count - 2.
+--- a/tests/kfdtest/src/OSWrapper.hpp
++++ b/tests/kfdtest/src/OSWrapper.hpp
+@@ -23,6 +23,8 @@
+ 
+ #include <stdlib.h>
+ #include <stdint.h>
++#include <limits.h>
++#include <sys/user.h>
+ #include <string>
+ 
+ #include "KFDTestFlags.hpp"
+@@ -33,10 +35,8 @@
+ 
+ #ifndef PAGE_SIZE
+ #define PAGE_SIZE   (1<<12)
+-#define PAGE_SHIFT  (12)
+ #endif
+ #ifndef PAGE_SHIFT
+-#define PAGE_SIZE   (1<<12)
+ #define PAGE_SHIFT  (12)
+ #endif
+ 
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.1.2.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.1.2.ebuild
index 1dbc511d8147..371100384195 100644
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.1.2.ebuild
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.1.2.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=8
 
+LLVM_COMPAT=( 18 )
 ROCM_SKIP_GLOBALS=1
-inherit cmake linux-info rocm
+inherit cmake linux-info llvm-r1 rocm
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/ROCm/ROCT-Thunk-Interface/"
@@ -24,8 +25,10 @@ SLOT="0/$(ver_cut 1-2)"
 RDEPEND="sys-process/numactl
 	x11-libs/libdrm[video_cards_amdgpu]"
 DEPEND="${RDEPEND}
-	test? ( llvm-core/llvm
-	dev-cpp/gtest )"
+	test? (
+		$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')
+		dev-cpp/gtest
+	)"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
@@ -62,6 +65,9 @@ src_configure() {
 
 	if use test; then
 		export LIBHSAKMT_PATH="${BUILD_DIR}"
+		local mycmakeargs=(
+			-DLLVM_DIR="$(get_llvm_prefix)"
+		)
 		test_wrapper "${S}/tests/kfdtest" cmake_src_configure
 	fi
 }
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.2.4.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.2.4.ebuild
deleted file mode 100644
index cb766e9f4d95..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.2.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ROCM_SKIP_GLOBALS=1
-inherit cmake linux-info rocm
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ROCm/ROCT-Thunk-Interface/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/ROCm/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Thunk Interface"
-HOMEPAGE="https://github.com/ROCm/ROCT-Thunk-Interface"
-CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl
-	x11-libs/libdrm[video_cards_amdgpu]"
-DEPEND="${RDEPEND}
-	test? ( llvm-core/llvm
-	dev-cpp/gtest )"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CMAKE_BUILD_TYPE=Release
-
-test_wrapper() {
-	local S="$1"
-	shift 1
-	local CMAKE_USE_DIR="${S}"
-	local BUILD_DIR="${S}_build"
-	cd "${S}" || die
-	$@
-}
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-
-	if use test; then
-		export LIBHSAKMT_PATH="${BUILD_DIR}"
-		test_wrapper "${S}/tests/kfdtest" cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-	if use test; then
-		LIBRARY_PATH="${BUILD_DIR}" test_wrapper "${S}/tests/kfdtest" cmake_src_compile
-	fi
-}
-
-src_test() {
-	check_amdgpu
-	TESTDIR="${S}/tests/kfdtest_build/"
-	cd "${TESTDIR}" || die
-	PATH="${PATH}:${TESTDIR}" ./run_kfdtest.sh
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.3.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.3.0.ebuild
new file mode 100644
index 000000000000..575bf9d7254d
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.3.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 19 )
+ROCM_SKIP_GLOBALS=1
+inherit cmake linux-info llvm-r1 rocm
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/ROCR-Runtime/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/libhsakmt"
+else
+	SRC_URI="https://github.com/ROCm/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/libhsakmt"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/ROCm/ROCR-Runtime/tree/amd-staging/libhsakmt"
+CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl
+	x11-libs/libdrm[video_cards_amdgpu]"
+DEPEND="${RDEPEND}
+	test? (
+		$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')
+		dev-cpp/gtest
+	)"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CMAKE_BUILD_TYPE=Release
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.3.0-functions.patch"
+	"${FILESDIR}/${PN}-6.3.0-musl.patch"
+	"${FILESDIR}/kfdtest-6.1.0-skipIPCtest.patch"
+	"${FILESDIR}/kfdtest-6.2.4-fix-llvm-header.patch"
+)
+
+test_wrapper() {
+	local S="$1"
+	shift 1
+	local CMAKE_USE_DIR="${S}"
+	local BUILD_DIR="${S}_build"
+	cd "${S}" || die
+	$@
+}
+
+src_prepare() {
+	sed -e "s/get_version ( \"1.0.0\" )/get_version ( \"${PV}\" )/" -i CMakeLists.txt || die
+
+	# https://github.com/ROCm/ROCR-Runtime/issues/263
+	sed -e "s/\${HSAKMT_TARGET} STATIC/\${HSAKMT_TARGET}/" -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake_src_configure
+
+	if use test; then
+		export LIBHSAKMT_PATH="${BUILD_DIR}"
+		local mycmakeargs=(
+			-DLLVM_DIR="$(get_llvm_prefix)"
+		)
+		test_wrapper "${S}/tests/kfdtest" cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+	if use test; then
+		LIBRARY_PATH="${BUILD_DIR}" test_wrapper "${S}/tests/kfdtest" cmake_src_compile
+	fi
+}
+
+src_test() {
+	check_amdgpu
+	TESTDIR="${S}/tests/kfdtest_build/"
+	cd "${TESTDIR}" || die
+	PATH="${PATH}:${TESTDIR}" ./run_kfdtest.sh
+}
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 5323f0ef7226..72ff0ff2c424 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -2,7 +2,5 @@ DIST CPM_0.40.2.cmake 41017 BLAKE2B 012ee2bfc1aac818efc49a04a52e77a3f574c63a12b2
 DIST simdjson-3.10.1.gh.tar.gz 2652674 BLAKE2B 3ccfc55d5bf8ce6a7e8be1b6cb28ed7b6289e23b1d4fe8505e35a42f4ff32a0ee7f500402828164bdeacae1b72e238413575288082151723d6d0c87dcefd1fa0 SHA512 b19fde8d81eaff34b83bb41028d7ee3a408ae5bc896277148e96879b1cba1a7cfc4af0064973bcb07e2b56e0955c3a3a581910d7af23d68510374e7f297c3b7c
 DIST simdjson-3.11.0.gh.tar.gz 2703217 BLAKE2B 85a747a99ff0e8cae3d91743501838742dd070e15b2430706e7244d2a304d05aa8059a2d8fbaa9feddecf1a42800aac3b0a4d0b0b0097ef1871064c75f00f482 SHA512 a08a440d62274c1e788db5ce3ac4c4f7dc06ccf29ecb3b9156e79d31febb5207b39ffab9ca8fa41e440fe8d56d857c4ad7eccbfbe2cd86b6c060729aada132ad
 DIST simdjson-3.11.2.gh.tar.gz 2703937 BLAKE2B 390c99f46efa92893b8b1fb193baf9333a7f19b909d7c9e621988eb9b11a89a3feea672069fbba044495d8b4d2f76f38a293b4ffcdddfb2be4820e527edc7866 SHA512 417e158e8b03ee50a50e927606ee8771eb457b94c8bba8e106c2aeb3eab3455a9431b9d5a92a852938e475a8101624b5785d0a2a45965490e42331cfe17efa62
-DIST simdjson-3.9.1.gh.tar.gz 2636602 BLAKE2B 82c4956ebc902574ed1b36196097c6c07e9ca0f11384f71b260ae95ff5e7c436ce016da417197f84c21ece0ae2239fc1c4e02cf63672fae98b3fa69831de3adb SHA512 b8c091e7ecce4cdc67f538ab6715ce89bff16e68f6d56bdc37e05ab0b110b90bc6b039d5c76e2dceef9e30f35cb6ace5e4e230d4c70e928329a376f989b23bed
-DIST simdjson-3.9.3.gh.tar.gz 2643869 BLAKE2B f2e0f8d13a234c7ee639a57333b66a464312a20bd67f808688f6456ded7b6bdac75d857b10207adc03e05d89e701efe874d068774a90c3082d9e83792ed784d1 SHA512 893ce0cb380b1418438f5910262325031f8071c4577589a491713f91c980964b4105c1e1aa7f2b9373deed40ecf6b48fe48a1aa243151e424f138f5418e4821c
-DIST simdjson-3.9.4.gh.tar.gz 2646588 BLAKE2B c0f0e5d6af2342d338ea7fbe033af2715e4317cd81818fca9dfcc04cb25ffe1eb08683f04d43162305d317178b14ed5f78e8ffa115ed02c7af41b8646c4eae76 SHA512 6fa940ad60b7560d1865806195428ae17f0daf19de803bdb7bd93b0704490994ec3cddc09c9d91f2e70036c6cb34153cdc5c998e7ebee2e4504f6a23944e25c1
+DIST simdjson-3.11.5.gh.tar.gz 2707916 BLAKE2B 88535b826346a468038271b265e6ac6d8bceefc87c968ad868eb25f312c518ab8f82e2065b0f1e36ab581083f76f0da77a899813d1499bcdc7ca71498ba1e31b SHA512 bfa44dea3dbe93a9b3521a3fa6204adb26647098c62607d43f2585ea437f1d69ce0986bea65e6155a7633687b8f9964c4823a7973db1a8e392a1676d5f5eee3f
 DIST simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
diff --git a/dev-libs/simdjson/files/simdjson-0.9.0-tests.patch b/dev-libs/simdjson/files/simdjson-0.9.0-tests.patch
deleted file mode 100644
index 49594ca291c0..000000000000
--- a/dev-libs/simdjson/files/simdjson-0.9.0-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/ondemand/compilation_failure_tests/CMakeLists.txt b/tests/ondemand/compilation_failure_tests/CMakeLists.txt
-index 2d0959be..324edf80 100644
---- a/tests/ondemand/compilation_failure_tests/CMakeLists.txt
-+++ b/tests/ondemand/compilation_failure_tests/CMakeLists.txt
-@@ -14,6 +14,7 @@ function(add_dual_compile_test TEST_NAME)
- endfunction(add_dual_compile_test)
- 
- 
-+target_compile_options(simdjson-internal-flags INTERFACE -Werror=uninitialized)
- add_dual_compile_test(iterate_char_star)
- add_dual_compile_test(iterate_string_view)
- add_dual_compile_test(iterate_temporary_buffer)
diff --git a/dev-libs/simdjson/files/simdjson-1.0.0-dont-bundle-cxxopts.patch b/dev-libs/simdjson/files/simdjson-1.0.0-dont-bundle-cxxopts.patch
deleted file mode 100644
index f796677655d6..000000000000
--- a/dev-libs/simdjson/files/simdjson-1.0.0-dont-bundle-cxxopts.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
-index 76651318..2cc06e9e 100644
---- a/dependencies/CMakeLists.txt
-+++ b/dependencies/CMakeLists.txt
-@@ -133,15 +133,3 @@ endfunction()
- if(SIMDJSON_COMPETITION)
-   competition_scope_()
- endif()
--
--cmake_dependent_option(SIMDJSON_CXXOPTS "Download cxxopts (necessary for tools)" ON
--        SIMDJSON_ALLOW_DOWNLOADS OFF)
--
--if(SIMDJSON_CXXOPTS)
--  set_off(CXXOPTS_BUILD_EXAMPLES)
--  set_off(CXXOPTS_BUILD_TESTS)
--  set_off(CXXOPTS_ENABLE_INSTALL)
--
--  import_dependency(cxxopts jarro2783/cxxopts 794c975)
--  add_dependency(cxxopts)
--endif()
diff --git a/dev-libs/simdjson/files/simdjson-3.1.7-tests.patch b/dev-libs/simdjson/files/simdjson-3.1.7-tests.patch
deleted file mode 100644
index dd254be00a73..000000000000
--- a/dev-libs/simdjson/files/simdjson-3.1.7-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ba15fe93..6993bdd5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -249,12 +249,11 @@ add_subdirectory(singleheader)
- #
- # Compile tools / tests / benchmarks
- #
--add_subdirectory(tests)
--add_subdirectory(examples)
--if(CMAKE_SIZEOF_VOID_P EQUAL 8) # we only include the benchmarks on 64-bit systems.
--  add_subdirectory(benchmark)
-+if (SIMDJSON_TESTS)
-+  add_subdirectory(tests)
-+  add_subdirectory(fuzz)
- endif()
--add_subdirectory(fuzz)
-+add_subdirectory(examples)
- 
- #
- # Source files should be just ASCII
diff --git a/dev-libs/simdjson/simdjson-3.11.5.ebuild b/dev-libs/simdjson/simdjson-3.11.5.ebuild
new file mode 100644
index 000000000000..91e3578a07dd
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-3.11.5.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs cmake
+
+SIMDJSON_DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
+CPM_SIMDJSON_DATA_HASH="01efb6b90e94a7163d69e4e28efc28d96dbeaf0b"
+CPM_VERSION="0.40.2"
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_VERSION}/CPM.cmake -> CPM_${CPM_VERSION}.cmake
+	https://github.com/${PN}/${PN}-data/archive/${SIMDJSON_DATA_HASH}.tar.gz -> ${PN}-data-${SIMDJSON_DATA_HASH}.tar.gz
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
+SLOT="0/24"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+all-impls test tools"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/grep
+	virtual/pkgconfig
+"
+DEPEND="
+	tools? ( >=dev-libs/cxxopts-3.2:= )
+"
+
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
+	"${FILESDIR}/simdjson-3.10.1-tests.patch"
+)
+
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	CONTRIBUTORS
+	HACKING.md
+	README.md
+)
+
+src_prepare() {
+	# Need to make sure that CPM finds the data package
+	mkdir "${WORKDIR}/cpm" "${WORKDIR}/${PN}-data" || die
+	cp "${DISTDIR}/CPM_${CPM_VERSION}.cmake" "${WORKDIR}/cpm/CPM_${CPM_VERSION}.cmake" || die
+	ln -s "../${PN}-data-${SIMDJSON_DATA_HASH}" "${WORKDIR}/${PN}-data/${CPM_SIMDJSON_DATA_HASH}" || die
+
+	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
+	sed -e '/Werror/ d ; /Werror/ d ' -i tests/ondemand/compilation_failure_tests/CMakeLists.txt || die
+	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
+	mv tools/{,simd}jsonpointer.cpp || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSIMDJSON_ENABLE_THREADS:BOOL=ON
+		-DCPM_SOURCE_CACHE:STRING="${WORKDIR}"
+		-Wno-dev
+	)
+	use test && mycmakeargs+=(
+		-DSIMDJSON_TESTS:BOOL=ON
+	)
+
+	if use tools; then
+		mycmakeargs+=(
+			-DSIMDJSON_DEVELOPER_MODE:BOOL=ON
+			-DSIMDJSON_ALLOW_DOWNLOADS:BOOL=OFF
+			-DSIMDJSON_GOOGLE_BENCHMARKS:BOOL=OFF
+			-DSIMDJSON_COMPETITION:BOOL=OFF
+			-DSIMDJSON_TOOLS:BOOL=ON
+		)
+	elif ! use test; then
+		mycmakeargs+=(
+			-DSIMDJSON_DEVELOPER_MODELBOOL=OFF
+		)
+	fi
+
+	if use all-impls; then
+		local -a impls=("fallback")
+		if use amd64; then
+			impls+=("westmere" "haswell" "icelake")
+		elif use arm64; then
+			impls+=("arm64")
+		elif use ppc64; then
+			impls+=("ppc64")
+		fi
+
+		mycmakeargs+=(
+			-DSIMDJSON_IMPLEMENTATION:STRING=$(printf '%s;' "${impls[@]}")
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-libs/simdjson/simdjson-3.9.1.ebuild b/dev-libs/simdjson/simdjson-3.9.1.ebuild
deleted file mode 100644
index b9e577db4eed..000000000000
--- a/dev-libs/simdjson/simdjson-3.9.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs cmake
-
-DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
-DESCRIPTION="SIMD accelerated C++ JSON library"
-HOMEPAGE="
-	https://simdjson.org/
-	https://github.com/simdjson/simdjson
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
-"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
-SLOT="0/22"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="+all-impls test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/grep
-	virtual/pkgconfig
-"
-DEPEND="
-	tools? ( <dev-libs/cxxopts-3.1:= )
-"
-
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
-	"${FILESDIR}/simdjson-0.9.0-tests.patch"
-	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
-	"${FILESDIR}/simdjson-3.1.7-tests.patch"
-	"${FILESDIR}/simdjson-3.7.1-data-optional.patch"
-)
-
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	CONTRIBUTORS
-	HACKING.md
-	README.md
-)
-
-src_prepare() {
-	if use test; then
-		mkdir "${S}/dependencies/.cache" || die
-		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/.cache/${PN}-data" || die
-	fi
-
-	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
-	sed -e '/Werror/ d ; /Werror/ d ' -i tests/ondemand/compilation_failure_tests/CMakeLists.txt || die
-	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
-	mv tools/{,simd}jsonpointer.cpp || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSIMDJSON_ENABLE_THREADS:BOOL=ON
-	)
-	use test && mycmakeargs+=(
-		-DSIMDJSON_TESTS:BOOL=ON
-	)
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE:BOOL=ON
-			-DSIMDJSON_ALLOW_DOWNLOADS:BOOL=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS:BOOL=OFF
-			-DSIMDJSON_COMPETITION:BOOL=OFF
-			-DSIMDJSON_TOOLS:BOOL=ON
-		)
-	elif ! use test; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODELBOOL=OFF
-		)
-	fi
-
-	if use all-impls; then
-		local -a impls=("fallback")
-		if use amd64; then
-			impls+=("westmere" "haswell" "icelake")
-		elif use arm64; then
-			impls+=("arm64")
-		elif use ppc64; then
-			impls+=("ppc64")
-		fi
-
-		mycmakeargs+=(
-			-DSIMDJSON_IMPLEMENTATION:STRING=$(printf '%s;' "${impls[@]}")
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/dev-libs/simdjson/simdjson-3.9.3.ebuild b/dev-libs/simdjson/simdjson-3.9.3.ebuild
deleted file mode 100644
index 613f210c0376..000000000000
--- a/dev-libs/simdjson/simdjson-3.9.3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs cmake
-
-DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
-DESCRIPTION="SIMD accelerated C++ JSON library"
-HOMEPAGE="
-	https://simdjson.org/
-	https://github.com/simdjson/simdjson
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
-"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
-SLOT="0/22"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="+all-impls test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/grep
-	virtual/pkgconfig
-"
-DEPEND="
-	tools? ( <dev-libs/cxxopts-3.1:= )
-"
-
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
-	"${FILESDIR}/simdjson-0.9.0-tests.patch"
-	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
-	"${FILESDIR}/simdjson-3.1.7-tests.patch"
-	"${FILESDIR}/simdjson-3.7.1-data-optional.patch"
-)
-
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	CONTRIBUTORS
-	HACKING.md
-	README.md
-)
-
-src_prepare() {
-	if use test; then
-		mkdir "${S}/dependencies/.cache" || die
-		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/.cache/${PN}-data" || die
-	fi
-
-	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
-	sed -e '/Werror/ d ; /Werror/ d ' -i tests/ondemand/compilation_failure_tests/CMakeLists.txt || die
-	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
-	mv tools/{,simd}jsonpointer.cpp || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSIMDJSON_ENABLE_THREADS:BOOL=ON
-	)
-	use test && mycmakeargs+=(
-		-DSIMDJSON_TESTS:BOOL=ON
-	)
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE:BOOL=ON
-			-DSIMDJSON_ALLOW_DOWNLOADS:BOOL=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS:BOOL=OFF
-			-DSIMDJSON_COMPETITION:BOOL=OFF
-			-DSIMDJSON_TOOLS:BOOL=ON
-		)
-	elif ! use test; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODELBOOL=OFF
-		)
-	fi
-
-	if use all-impls; then
-		local -a impls=("fallback")
-		if use amd64; then
-			impls+=("westmere" "haswell" "icelake")
-		elif use arm64; then
-			impls+=("arm64")
-		elif use ppc64; then
-			impls+=("ppc64")
-		fi
-
-		mycmakeargs+=(
-			-DSIMDJSON_IMPLEMENTATION:STRING=$(printf '%s;' "${impls[@]}")
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/dev-libs/simdjson/simdjson-3.9.4.ebuild b/dev-libs/simdjson/simdjson-3.9.4.ebuild
deleted file mode 100644
index 613f210c0376..000000000000
--- a/dev-libs/simdjson/simdjson-3.9.4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs cmake
-
-DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
-DESCRIPTION="SIMD accelerated C++ JSON library"
-HOMEPAGE="
-	https://simdjson.org/
-	https://github.com/simdjson/simdjson
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
-"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
-SLOT="0/22"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="+all-impls test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/grep
-	virtual/pkgconfig
-"
-DEPEND="
-	tools? ( <dev-libs/cxxopts-3.1:= )
-"
-
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
-	"${FILESDIR}/simdjson-0.9.0-tests.patch"
-	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
-	"${FILESDIR}/simdjson-3.1.7-tests.patch"
-	"${FILESDIR}/simdjson-3.7.1-data-optional.patch"
-)
-
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	CONTRIBUTORS
-	HACKING.md
-	README.md
-)
-
-src_prepare() {
-	if use test; then
-		mkdir "${S}/dependencies/.cache" || die
-		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/.cache/${PN}-data" || die
-	fi
-
-	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
-	sed -e '/Werror/ d ; /Werror/ d ' -i tests/ondemand/compilation_failure_tests/CMakeLists.txt || die
-	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
-	mv tools/{,simd}jsonpointer.cpp || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSIMDJSON_ENABLE_THREADS:BOOL=ON
-	)
-	use test && mycmakeargs+=(
-		-DSIMDJSON_TESTS:BOOL=ON
-	)
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE:BOOL=ON
-			-DSIMDJSON_ALLOW_DOWNLOADS:BOOL=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS:BOOL=OFF
-			-DSIMDJSON_COMPETITION:BOOL=OFF
-			-DSIMDJSON_TOOLS:BOOL=ON
-		)
-	elif ! use test; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODELBOOL=OFF
-		)
-	fi
-
-	if use all-impls; then
-		local -a impls=("fallback")
-		if use amd64; then
-			impls+=("westmere" "haswell" "icelake")
-		elif use arm64; then
-			impls+=("arm64")
-		elif use ppc64; then
-			impls+=("ppc64")
-		fi
-
-		mycmakeargs+=(
-			-DSIMDJSON_IMPLEMENTATION:STRING=$(printf '%s;' "${impls[@]}")
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0-fixups.patch b/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0-fixups.patch
new file mode 100644
index 000000000000..afada8092f37
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0-fixups.patch
@@ -0,0 +1,69 @@
+https://github.com/gabime/spdlog/commit/7f8060d5b280eac9786f92ac74d263cc8359c5ed
+https://github.com/gabime/spdlog/commit/96a8f6250cbf4e8c76387c614f666710a2fa9bad
+
+From 7f8060d5b280eac9786f92ac74d263cc8359c5ed Mon Sep 17 00:00:00 2001
+From: Christian Blichmann <cblichmann@users.noreply.github.com>
+Date: Tue, 7 Jan 2025 23:59:12 +0100
+Subject: [PATCH] fix: Compatibility with external fmtlib 11.1.1 (#3312)
+
+Include fmtlib's `xchar` header to include `fmt::basic_format_string`.
+Otherwise, compilation with an external fmtlib 11.1.1 fails with
+
+```
+In file included from include/spdlog/spdlog.h:12:
+include/spdlog/common.h:369:49: error: no template named 'basic_format_string' in namespace 'fmt'; did you mean 'std::basic_format_string'?
+  369 | inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_string<T, Args...> fmt) {
+      |                                                 ^~~~~
+```
+
+Signed-off-by: Christian Blichmann <cblichmann@google.com>
+---
+ include/spdlog/fmt/fmt.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
+index 7fa6b0933..2f09c15ed 100644
+--- a/include/spdlog/fmt/fmt.h
++++ b/include/spdlog/fmt/fmt.h
+@@ -27,4 +27,5 @@
+ #else  // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
+     #include <fmt/core.h>
+     #include <fmt/format.h>
++    #include <fmt/xchar.h>
+ #endif
+
+From 96a8f6250cbf4e8c76387c614f666710a2fa9bad Mon Sep 17 00:00:00 2001
+From: jdrouhard <john@drouhard.dev>
+Date: Thu, 9 Jan 2025 16:58:46 -0600
+Subject: [PATCH] fix: remove unused to_string_view overload in fmt >= 11.1
+ (#3314)
+
+---
+ include/spdlog/common.h | 14 +-------------
+ 1 file changed, 1 insertion(+), 13 deletions(-)
+
+diff --git a/include/spdlog/common.h b/include/spdlog/common.h
+index 2d73f8300..71ffd2403 100644
+--- a/include/spdlog/common.h
++++ b/include/spdlog/common.h
+@@ -364,19 +364,7 @@ SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view
+ }
+ #endif
+ 
+-#ifndef SPDLOG_USE_STD_FORMAT
+-#if FMT_VERSION >= 110100
+-template <typename T, typename... Args>
+-inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_arg<T> fmt) {
+-    return fmt;
+-}
+-#else
+-template <typename T, typename... Args>
+-inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_string<T, Args...> fmt) {
+-    return fmt;
+-}
+-#endif
+-#elif __cpp_lib_format >= 202207L
++#if defined(SPDLOG_USE_STD_FORMAT) &&  __cpp_lib_format >= 202207L
+ template <typename T, typename... Args>
+ SPDLOG_CONSTEXPR_FUNC std::basic_string_view<T> to_string_view(
+     std::basic_format_string<T, Args...> fmt) SPDLOG_NOEXCEPT {
diff --git a/dev-libs/spdlog/spdlog-1.13.0-r2.ebuild b/dev-libs/spdlog/spdlog-1.13.0-r2.ebuild
index 70357b7d6a09..e6b260871621 100644
--- a/dev-libs/spdlog/spdlog-1.13.0-r2.ebuild
+++ b/dev-libs/spdlog/spdlog-1.13.0-r2.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
@@ -28,7 +28,7 @@ BDEPEND="
 	)
 "
 DEPEND="
-	>=dev-libs/libfmt-9.1.0-r2[${MULTILIB_USEDEP}]
+	>=dev-libs/libfmt-9.1.0-r2:=[${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/spdlog/spdlog-1.14.1.ebuild b/dev-libs/spdlog/spdlog-1.14.1.ebuild
index 3acca343cbc8..9cf9e250d714 100644
--- a/dev-libs/spdlog/spdlog-1.14.1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.14.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
@@ -34,6 +34,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-force_external_fmt.patch"
+	"${FILESDIR}/${PN}-1.15.0-libfmt-11.1.0.patch"
 )
 
 multilib_src_prepare() {
diff --git a/dev-libs/spdlog/spdlog-1.15.0-r1.ebuild b/dev-libs/spdlog/spdlog-1.15.0-r1.ebuild
new file mode 100644
index 000000000000..cefd2edefc7e
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.15.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Fast C++ logging library"
+HOMEPAGE="https://github.com/gabime/spdlog"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gabime/${PN}"
+else
+	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="test static-libs"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		>=dev-cpp/catch-3.4.0
+	)
+"
+DEPEND="
+	dev-libs/libfmt:=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-force_external_fmt.patch"
+	"${FILESDIR}/${PN}-1.15.0-libfmt-11.1.0.patch"
+	"${FILESDIR}/${PN}-1.15.0-libfmt-11.1.0-fixups.patch"
+)
+
+multilib_src_prepare() {
+	cmake_src_prepare
+	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSPDLOG_BUILD_BENCH=no
+		-DSPDLOG_BUILD_EXAMPLE=no
+		-DSPDLOG_FMT_EXTERNAL=yes
+		-DSPDLOG_BUILD_SHARED=$(usex static-libs)
+		-DSPDLOG_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/spdlog/spdlog-1.15.0.ebuild b/dev-libs/spdlog/spdlog-1.15.0.ebuild
index 85cc51616b1c..9cf9e250d714 100644
--- a/dev-libs/spdlog/spdlog-1.15.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.15.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
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gabime/${PN}"
 else
 	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index 70357b7d6a09..e6b260871621 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-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
@@ -28,7 +28,7 @@ BDEPEND="
 	)
 "
 DEPEND="
-	>=dev-libs/libfmt-9.1.0-r2[${MULTILIB_USEDEP}]
+	>=dev-libs/libfmt-9.1.0-r2:=[${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/stb/stb-20240201-r1.ebuild b/dev-libs/stb/stb-20240201-r1.ebuild
index b69f24538402..be12aa9b9f5d 100644
--- a/dev-libs/stb/stb-20240201-r1.ebuild
+++ b/dev-libs/stb/stb-20240201-r1.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 @@ S="${WORKDIR}/${PN}-${CHECKSUM}"
 
 LICENSE="|| ( MIT Unlicense )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
 
 src_prepare() {
 	default
diff --git a/dev-libs/uriparser/uriparser-0.9.8-r1.ebuild b/dev-libs/uriparser/uriparser-0.9.8-r1.ebuild
index 984256a19ba3..2a958e3decf3 100644
--- a/dev-libs/uriparser/uriparser-0.9.8-r1.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.8-r1.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="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+doc qt5 test unicode"  # +doc to address warning RequiredUseDefaults
 
 REQUIRED_USE="qt5? ( doc ) test? ( unicode )"
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index f60d83496dc1..5013c30fd704 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,2 +1 @@
-DIST wayland-1.23.0.tar.xz 237900 BLAKE2B efb80e3c67db7a707a6d2ea66e7a5132173550bc13fdff447925ec3d33bfba8131532f819d5ab0dd80924cb4339b58b7ca83d9e70a436cea8268167476355bd8 SHA512 9c525231a7ea3e68d3178230d476285a960d23e38571ac96d885f86c0588c52ef01460bff6833db5adb9456ce8db7b996613611187aac972736748ba91b8fd81
 DIST wayland-1.23.1.tar.xz 238212 BLAKE2B 74784b537a6e28610466ff1549286cea9ff8b9ca914afa26a07f177bbe0be56b80de037d5eb5d07a38bf02a9041c32e62c896facd5417c1435571640ad8f87b2 SHA512 818eda003e3f7aa15690eedb1ff227a6056b2ce54bf23d45ffe573dc40a914623c5a1358218b59444dcdc483db0503324f0d27091d0ea954412a8b290de5f50a
diff --git a/dev-libs/wayland/files/wayland-1.23.0-c23-clang-fix.patch b/dev-libs/wayland/files/wayland-1.23.0-c23-clang-fix.patch
deleted file mode 100644
index 8dc80d3c8fe8..000000000000
--- a/dev-libs/wayland/files/wayland-1.23.0-c23-clang-fix.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-https://bugs.gentoo.org/936061
-https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3859
-https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/401
-
-From 7be937e795ff88128d64b88f9482f05aa0d91319 Mon Sep 17 00:00:00 2001
-From: Kirill Primak <vyivel@eclair.cafe>
-Date: Sat, 29 Jun 2024 15:05:00 +0300
-Subject: [PATCH] Put WL_DEPRECATED in front of the function declarations
-
-This fixes the following clang error when using C23:
-
-../src/wayland-server-core.h:680:41: error: 'deprecated' attribute cannot be applied to types
-  680 |                      int32_t stride, uint32_t format) WL_DEPRECATED;
-      |                                                       ^
-../src/wayland-util.h:52:25: note: expanded from macro 'WL_DEPRECATED'
-   52 | #define WL_DEPRECATED [[deprecated]]
-      |                         ^
-
-Signed-off-by: Kirill Primak <vyivel@eclair.cafe>
---- a/src/wayland-server-core.h
-+++ b/src/wayland-server-core.h
-@@ -674,10 +674,11 @@ wl_display_init_shm(struct wl_display *display);
- uint32_t *
- wl_display_add_shm_format(struct wl_display *display, uint32_t format);
- 
-+WL_DEPRECATED
- struct wl_shm_buffer *
- wl_shm_buffer_create(struct wl_client *client,
- 		     uint32_t id, int32_t width, int32_t height,
--		     int32_t stride, uint32_t format) WL_DEPRECATED;
-+		     int32_t stride, uint32_t format);
- 
- void
- wl_log_set_handler_server(wl_log_func_t handler);
---- a/src/wayland-server.c
-+++ b/src/wayland-server.c
-@@ -2483,9 +2483,10 @@ wl_priv_signal_final_emit(struct wl_priv_signal *signal, void *data)
- 
- /** \cond */ /* Deprecated functions below. */
- 
-+WL_DEPRECATED
- uint32_t
- wl_client_add_resource(struct wl_client *client,
--		       struct wl_resource *resource) WL_DEPRECATED;
-+		       struct wl_resource *resource);
- 
- WL_EXPORT uint32_t
- wl_client_add_resource(struct wl_client *client,
-@@ -2514,11 +2515,12 @@ wl_client_add_resource(struct wl_client *client,
- 	return resource->object.id;
- }
- 
-+WL_DEPRECATED
- struct wl_resource *
- wl_client_add_object(struct wl_client *client,
- 		     const struct wl_interface *interface,
- 		     const void *implementation,
--		     uint32_t id, void *data) WL_DEPRECATED;
-+		     uint32_t id, void *data);
- 
- WL_EXPORT struct wl_resource *
- wl_client_add_object(struct wl_client *client,
-@@ -2537,10 +2539,11 @@ wl_client_add_object(struct wl_client *client,
- 	return resource;
- }
- 
-+WL_DEPRECATED
- struct wl_resource *
- wl_client_new_object(struct wl_client *client,
- 		     const struct wl_interface *interface,
--		     const void *implementation, void *data) WL_DEPRECATED;
-+		     const void *implementation, void *data);
- 
- WL_EXPORT struct wl_resource *
- wl_client_new_object(struct wl_client *client,
-@@ -2599,10 +2602,11 @@ wl_client_get_user_data(struct wl_client *client)
- 	return client->data;
- }
- 
-+WL_DEPRECATED
- struct wl_global *
- wl_display_add_global(struct wl_display *display,
- 		      const struct wl_interface *interface,
--		      void *data, wl_global_bind_func_t bind) WL_DEPRECATED;
-+		      void *data, wl_global_bind_func_t bind);
- 
- WL_EXPORT struct wl_global *
- wl_display_add_global(struct wl_display *display,
-@@ -2612,9 +2616,10 @@ wl_display_add_global(struct wl_display *display,
- 	return wl_global_create(display, interface, interface->version, data, bind);
- }
- 
-+WL_DEPRECATED
- void
- wl_display_remove_global(struct wl_display *display,
--			 struct wl_global *global) WL_DEPRECATED;
-+			 struct wl_global *global);
- 
- WL_EXPORT void
- wl_display_remove_global(struct wl_display *display, struct wl_global *global)
---- a/src/wayland-server.h
-+++ b/src/wayland-server.h
-@@ -70,30 +70,35 @@ struct wl_resource {
- 	void *data;
- };
- 
-+WL_DEPRECATED
- uint32_t
- wl_client_add_resource(struct wl_client *client,
--		       struct wl_resource *resource) WL_DEPRECATED;
-+		       struct wl_resource *resource);
- 
-+WL_DEPRECATED
- struct wl_resource *
- wl_client_add_object(struct wl_client *client,
- 		     const struct wl_interface *interface,
- 		     const void *implementation,
--		     uint32_t id, void *data) WL_DEPRECATED;
-+		     uint32_t id, void *data);
- 
-+WL_DEPRECATED
- struct wl_resource *
- wl_client_new_object(struct wl_client *client,
- 		     const struct wl_interface *interface,
--		     const void *implementation, void *data) WL_DEPRECATED;
-+		     const void *implementation, void *data);
- 
-+WL_DEPRECATED
- struct wl_global *
- wl_display_add_global(struct wl_display *display,
- 		      const struct wl_interface *interface,
- 		      void *data,
--		      wl_global_bind_func_t bind) WL_DEPRECATED;
-+		      wl_global_bind_func_t bind);
- 
-+WL_DEPRECATED
- void
- wl_display_remove_global(struct wl_display *display,
--			 struct wl_global *global) WL_DEPRECATED;
-+			 struct wl_global *global);
- 
- #endif
- 
--- 
-GitLab
-
diff --git a/dev-libs/wayland/wayland-1.23.0-r1.ebuild b/dev-libs/wayland/wayland-1.23.0-r1.ebuild
deleted file mode 100644
index d3a90d11bb3b..000000000000
--- a/dev-libs/wayland/wayland-1.23.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-inherit meson-multilib
-
-DESCRIPTION="Wayland protocol libraries"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	~dev-util/wayland-scanner-${PV}
-	virtual/pkgconfig
-	doc? (
-		>=app-text/doxygen-1.6[dot]
-		app-text/xmlto
-		>=media-gfx/graphviz-2.26.0
-	)
-"
-DEPEND="
-	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/wayland-1.23.0-c23-clang-fix.patch
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_use_bool doc documentation)
-		$(meson_native_true dtd_validation)
-		-Dlibraries=true
-		-Dscanner=false
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# We set it on purpose to only a short subdir name, as socket paths are
-	# created in there, which are 108 byte limited. With this it hopefully
-	# barely fits to the limit with /var/tmp/portage/${CATEGORY}/${PF}/temp/x
-	export XDG_RUNTIME_DIR="${T}"/x
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	multilib-minimal_src_test
-}
-
-src_install() {
-	meson-multilib_src_install
-
-	if use doc; then
-		mv "${ED}"/usr/share/doc/"${PN}"/* "${ED}"/usr/share/doc/"${PF}"/ || die
-		rmdir "${ED}"/usr/share/doc/"${PN}" || die
-	fi
-}
diff --git a/dev-libs/xerces-c/xerces-c-3.2.5.ebuild b/dev-libs/xerces-c/xerces-c-3.2.5.ebuild
index b08d056a8670..4109425814e2 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.5.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.5.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
 	inherit subversion
 else
 	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/xmlsec/xmlsec-1.3.6.ebuild b/dev-libs/xmlsec/xmlsec-1.3.6.ebuild
index 2021483cd92c..78ba551e9c1c 100644
--- a/dev-libs/xmlsec/xmlsec-1.3.6.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.3.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 LICENSE="MIT"
 # Upstream consider major version bumps to be changes in either X or Y in X.Y.Z
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc gcrypt gnutls http nss +openssl static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/dev-libs/zix/Manifest b/dev-libs/zix/Manifest
index 00107cd0259d..c79c179c938b 100644
--- a/dev-libs/zix/Manifest
+++ b/dev-libs/zix/Manifest
@@ -1 +1,2 @@
 DIST zix-0.4.2.tar.xz 76492 BLAKE2B 46d9e3049632abe8fe60928fa4d27ab5a94e86549dbde999c8215f951fe6f70f29124c89de9639c07a3bfb06da6ce902ea2a59f431ea6015d2c7a38df2f6eff6 SHA512 b8fb931a3e9ab5a67f6da57a07bf10b91e7f861c8cf39db14c49c083a9983a0971cc6bc6abcb54a83c00471b386e377cb9bb51e2edd945ba07b9ae43a35964cc
+DIST zix-0.6.2.tar.xz 81316 BLAKE2B 230d9f6717f10ac6f7608593fa94331a4aebd8c4c1c59f1db5a7d1881d674d687d67c353c3944bf4649ea5cbb49a8c4afe8abc82bad9eaf84bff79777a0a91e1 SHA512 3b072f00481a34e8b900311c2dc77fd73a63a34f69ea953be6b714f5bcbdebcc3cdd81feae73b5ad2bdc09a4bac122e12d9035cfc417ca41dfe5230d1fe13d9c
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-libs/zziplib/zziplib-0.13.78.ebuild b/dev-libs/zziplib/zziplib-0.13.78.ebuild
index eb63c22c7ca5..c74adee3fbd6 100644
--- a/dev-libs/zziplib/zziplib-0.13.78.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.78.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
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="sdl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/lutok/Manifest b/dev-lua/lutok/Manifest
index 3e5ea1851b45..daf3fd0c8cab 100644
--- a/dev-lua/lutok/Manifest
+++ b/dev-lua/lutok/Manifest
@@ -1 +1,2 @@
 DIST lutok-0.4.tar.gz 489570 BLAKE2B b4bc26d9a4901901e6ca66a41bc42ccc2f82697ff14e64c1bea35b4a9ed08b6f13ecfa9aaabb54e25fb3e4f3aea03791c225c4c8fc6ed3e0387d34d933a228e9 SHA512 664f30099bfbb30978e24068a9232a4ff1b5b1839c601bf784f35f6bb1394558067495093a3b0343c94e756d2e4186a32a8227baf5934c15c45905f7c0a5d19c
+DIST lutok-0.6.tar.gz 47380 BLAKE2B 47f371dfa0cdc165398ad74b0d768d90c74c74ec4c7fa6fac747f915a5a35290a1e190950360c38d3f9165dcc1172aed0ababba3a84e33f54d52d83eea096e32 SHA512 b88d932ca151f72e48a0c6f3070418013e24083c142c745e35513406057686333f562e1fc159d5e35ca0e511b79e3c0b5dfd2431d050dc421b1e22283b88865d
diff --git a/dev-lua/lutok/lutok-0.6.ebuild b/dev-lua/lutok/lutok-0.6.ebuild
new file mode 100644
index 000000000000..3c7e1c9b70f8
--- /dev/null
+++ b/dev-lua/lutok/lutok-0.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2017-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LUA_COMPAT=( lua5-{3..4} )
+
+inherit autotools lua-single
+
+DESCRIPTION="Lightweight C++ API library for Lua"
+HOMEPAGE="https://github.com/freebsd/lutok"
+SRC_URI="https://github.com/freebsd/lutok/archive/refs/tags/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-libs/atf
+		dev-util/kyua
+	)
+"
+DEPEND="${LUA_DEPS}"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	:
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	lua_setup
+	local myconf=(
+		--enable-shared
+		--disable-static
+		$(use_enable test atf)
+		LUA_VERSION="${ELUA#lua}"
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -rf "${ED}"/usr/tests || die
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-ml/llvm/Manifest b/dev-ml/llvm/Manifest
index fef409fa0e6a..b7114fc7aeab 100644
--- a/dev-ml/llvm/Manifest
+++ b/dev-ml/llvm/Manifest
@@ -10,4 +10,7 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607 SHA512 d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
+DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/dev-ml/llvm/llvm-19.1.7.ebuild b/dev-ml/llvm/llvm-19.1.7.ebuild
new file mode 100644
index 000000000000..2f25336b3337
--- /dev/null
+++ b/dev-ml/llvm/llvm-19.1.7.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake llvm.org llvm-utils python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~llvm-core/llvm-${PV}:=[debug?]
+	!llvm-core/llvm[ocaml(-)]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-ml/findlib
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/llvm/llvm-20.0.0_pre20241227.ebuild b/dev-ml/llvm/llvm-20.0.0_pre20241227.ebuild
deleted file mode 100644
index 2b98b4b8952e..000000000000
--- a/dev-ml/llvm/llvm-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,107 +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} )
-inherit cmake llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-IUSE="+debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~llvm-core/llvm-${PV}:=[debug?]
-	!llvm-core/llvm[ocaml(-)]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-ml/findlib
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/llvm/llvm-20.0.0_pre20250111.ebuild b/dev-ml/llvm/llvm-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..bacc5c89fa79
--- /dev/null
+++ b/dev-ml/llvm/llvm-20.0.0_pre20250111.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake llvm.org llvm-utils python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+IUSE="+debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~llvm-core/llvm-${PV}:=[debug?]
+	!llvm-core/llvm[ocaml(-)]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-ml/findlib
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/llvm/llvm-20.0.0_pre20250118.ebuild b/dev-ml/llvm/llvm-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..bacc5c89fa79
--- /dev/null
+++ b/dev-ml/llvm/llvm-20.0.0_pre20250118.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake llvm.org llvm-utils python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+IUSE="+debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~llvm-core/llvm-${PV}:=[debug?]
+	!llvm-core/llvm[ocaml(-)]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-ml/findlib
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-perl/AppConfig/AppConfig-1.710.0-r1.ebuild b/dev-perl/AppConfig/AppConfig-1.710.0-r1.ebuild
index 4600d4fffeac..40b9cbe868cb 100644
--- a/dev-perl/AppConfig/AppConfig-1.710.0-r1.ebuild
+++ b/dev-perl/AppConfig/AppConfig-1.710.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl5 module for reading configuration files and parsing command line arguments"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Browser-Open/Browser-Open-0.40.0-r1.ebuild b/dev-perl/Browser-Open/Browser-Open-0.40.0-r1.ebuild
index 8a13a37620a6..2f6e0118b13b 100644
--- a/dev-perl/Browser-Open/Browser-Open-0.40.0-r1.ebuild
+++ b/dev-perl/Browser-Open/Browser-Open-0.40.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Open a browser at a given URL"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.411.200.ebuild b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.411.200.ebuild
index 897faa7668e3..4e387dc1efaa 100644
--- a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.411.200.ebuild
+++ b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.411.200.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Mapping Perl releases on CPAN to the location of the tarballs"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/CSS-Tiny/CSS-Tiny-1.200.0-r1.ebuild b/dev-perl/CSS-Tiny/CSS-Tiny-1.200.0-r1.ebuild
index 5c62138eeae4..3a24dae9fe10 100644
--- a/dev-perl/CSS-Tiny/CSS-Tiny-1.200.0-r1.ebuild
+++ b/dev-perl/CSS-Tiny/CSS-Tiny-1.200.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,4 +9,4 @@ inherit perl-module
 
 DESCRIPTION="Read/Write .css files with as little code as possible"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86"
diff --git a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.ebuild b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.ebuild
index 4442ce76c856..bd3f7a1c7044 100644
--- a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.ebuild
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.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=7
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.danga.com/memcached/ https://metacpan.org/release/Cache-Mem
 # Bug: https://bugs.gentoo.org/721730
 LICENSE="|| ( Artistic GPL-1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	virtual/perl-Encode
diff --git a/dev-perl/Config-AutoConf/Config-AutoConf-0.320.0.ebuild b/dev-perl/Config-AutoConf/Config-AutoConf-0.320.0.ebuild
index b89a0bba69b8..8f54eafb24d5 100644
--- a/dev-perl/Config-AutoConf/Config-AutoConf-0.320.0.ebuild
+++ b/dev-perl/Config-AutoConf/Config-AutoConf-0.320.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Module to implement some of AutoConf macros in pure perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-perl/Capture-Tiny
diff --git a/dev-perl/DBD-MariaDB/DBD-MariaDB-1.230.0.ebuild b/dev-perl/DBD-MariaDB/DBD-MariaDB-1.230.0.ebuild
index f111c839b49c..1a42e45c74d2 100644
--- a/dev-perl/DBD-MariaDB/DBD-MariaDB-1.230.0.ebuild
+++ b/dev-perl/DBD-MariaDB/DBD-MariaDB-1.230.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
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="MariaDB and MySQL driver for the Perl5 Database Interface (DBI)"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86"
 IUSE="+mariadb mysql minimal"
 REQUIRED_USE="^^ ( mysql mariadb )"
 
diff --git a/dev-perl/DBD-mysql/DBD-mysql-5.7.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-5.7.0.ebuild
index 375e826ec3e3..4df60beaff64 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-5.7.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-5.7.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 @@ inherit perl-module
 DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="mariadb +mysql test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( mysql mariadb )"
diff --git a/dev-perl/DateTime-Format-HTTP/DateTime-Format-HTTP-0.430.0.ebuild b/dev-perl/DateTime-Format-HTTP/DateTime-Format-HTTP-0.430.0.ebuild
index 6d6f77541c7d..1b0793031ce6 100644
--- a/dev-perl/DateTime-Format-HTTP/DateTime-Format-HTTP-0.430.0.ebuild
+++ b/dev-perl/DateTime-Format-HTTP/DateTime-Format-HTTP-0.430.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Date conversion routines"
 
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-perl/DateTime-0.170.0
diff --git a/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0-r1.ebuild b/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0-r1.ebuild
index 445696a0a4a8..17d39143b995 100644
--- a/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0-r1.ebuild
+++ b/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert between DateTime and RFC2822/822 formats"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.80.0.ebuild b/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.80.0.ebuild
index 441936e8827f..acc62219a9cd 100644
--- a/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.80.0.ebuild
+++ b/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.80.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse and format W3CDTF datetime strings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-1.440.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-1.440.0.ebuild
index ef3285bfc420..9f3b239a0ed3 100644
--- a/dev-perl/DateTime-Locale/DateTime-Locale-1.440.0.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-1.440.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
@@ -12,7 +12,7 @@ DESCRIPTION="Localization support for DateTime"
 
 LICENSE="|| ( Artistic GPL-1+ ) unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Devel-Cover/Devel-Cover-1.440.0.ebuild b/dev-perl/Devel-Cover/Devel-Cover-1.440.0.ebuild
index f1764d33d402..f0bf5298ad20 100644
--- a/dev-perl/Devel-Cover/Devel-Cover-1.440.0.ebuild
+++ b/dev-perl/Devel-Cover/Devel-Cover-1.440.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Code coverage metrics for Perl"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Digest-HMAC/Digest-HMAC-1.50.0.ebuild b/dev-perl/Digest-HMAC/Digest-HMAC-1.50.0.ebuild
index 3a592afae968..50906ecc7649 100644
--- a/dev-perl/Digest-HMAC/Digest-HMAC-1.50.0.ebuild
+++ b/dev-perl/Digest-HMAC/Digest-HMAC-1.50.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Keyed Hashing for Message Authentication"
 
 SLOT="0"
-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"
 
 RDEPEND="
 	>=virtual/perl-Digest-MD5-2.0.0
diff --git a/dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.950.0-r2.ebuild b/dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.950.0-r2.ebuild
deleted file mode 100644
index 0ac7fefcdc81..000000000000
--- a/dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.950.0-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_AUTHOR=ESAYM
-DIST_VERSION=1.95
-
-inherit perl-module
-
-DESCRIPTION="Connect to a local Clam Anti-Virus clamd service and send commands"
-
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-RDEPEND="
-	app-antivirus/clamav
-"
-BDEPEND="
-	${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-# Test's can't be run in parallel because they internally spawn a
-# clam server on the same shared socket
-DIST_TEST="do"
-
-src_test() {
-	if [[ "${TEST_SCAN_CLAMAV:-0}" == "1" || -n "${DIST_TEST_OVERRIDE}" ]]; then
-		perl_rm_files t/pod-coverage.t t/pod.t
-		perl-module_src_test
-	else
-		einfo "Skipping Tests."
-		einfo
-		einfo "Tests require a manually and correctly configured ClamAV."
-		einfo
-		einfo "Set TEST_SCAN_CLAMAV=1 if you wish to run this test and have"
-		einfo "configured ClamAV"
-	fi
-}
diff --git a/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0-r1.ebuild b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0-r1.ebuild
index ea8eb2980aaa..2312134fd8d3 100644
--- a/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0-r1.ebuild
+++ b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0-r1.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 @@ inherit perl-module
 DESCRIPTION="Lexically scoped subroutine wrappers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Locale-gettext/Locale-gettext-1.70.0_p20181130.ebuild b/dev-perl/Locale-gettext/Locale-gettext-1.70.0_p20181130.ebuild
new file mode 100644
index 000000000000..27eb95507767
--- /dev/null
+++ b/dev-perl/Locale-gettext/Locale-gettext-1.70.0_p20181130.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_NAME=gettext
+DIST_AUTHOR=PVANDRY
+inherit perl-module
+
+DESCRIPTION="A Perl module for accessing the GNU locale utilities"
+
+COMMIT="0e6b2fb24521e8ea1f6720641412ab31b3301071"
+SRC_URI="
+	https://github.com/vandry/Perl-Locale-gettext/archive/${COMMIT}.tar.gz
+		-> Perl-Locale-gettext-${COMMIT}.tar.gz
+"
+S="${WORKDIR}/Perl-Locale-gettext-${COMMIT}"
+
+SLOT="0"
+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"
+
+RDEPEND="
+	sys-devel/gettext
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Config-AutoConf-0.313
+	>=virtual/perl-ExtUtils-MakeMaker-6.520.0
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.70.0-tests.patch"
+	"${FILESDIR}/${PN}-1.70.0_p20181130-config-log.patch"
+)
diff --git a/dev-perl/Locale-gettext/Manifest b/dev-perl/Locale-gettext/Manifest
index e801cadb3765..15e0b522f8aa 100644
--- a/dev-perl/Locale-gettext/Manifest
+++ b/dev-perl/Locale-gettext/Manifest
@@ -1 +1,2 @@
+DIST Perl-Locale-gettext-0e6b2fb24521e8ea1f6720641412ab31b3301071.tar.gz 8967 BLAKE2B f9a579f624343e636a403089904b20e95d7d6c11064949d68e37bfb4f38679897f5a8a28f3bade57e77dac6ea265bd92620e2ec4fd7b9f8cbe6b0599303199f1 SHA512 459d36c4c62abab08ec2dd226614d4c2addfbd8191390fd972cf11eca4497fdc23237f92d0deda6f539354daba21aa3642aafd28a4d0eb38cdb2582abb1e9f87
 DIST gettext-1.07.tar.gz 8651 BLAKE2B ecdc105303c0b494d53f985ca0d789d75da33abc85e8579a43af1658d6faa18e2564e18fc6613548acc2add4ce847d03769c1fbe29dbb760b9498f4b251cbb1c SHA512 d3716a597d586ee2ff29472ca7b13aaf67770299de31e5f12abafebc879bbe4a1e1dbc0025cf4f3dc29992955f26cffc3be387d974c3911af095d5b49e67a1c6
diff --git a/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0_p20181130-config-log.patch b/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0_p20181130-config-log.patch
new file mode 100644
index 000000000000..cfdbd24f2177
--- /dev/null
+++ b/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0_p20181130-config-log.patch
@@ -0,0 +1,12 @@
+Make it easier to debug configure test failures.
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -13,7 +13,7 @@ for (@ARGV) {
+ 
+ my @libs;
+ 
+-my $ac = Config::AutoConf->new;
++my $ac = Config::AutoConf->new(logfile => "config.log");
+ 
+ if (defined(my $ccflags = $args{CCFLAGS})) {
+     $ac->check_compiler_flags($ccflags);
diff --git a/dev-perl/Locale-gettext/metadata.xml b/dev-perl/Locale-gettext/metadata.xml
index c0b5ec048699..4f4e4eea8e7e 100644
--- a/dev-perl/Locale-gettext/metadata.xml
+++ b/dev-perl/Locale-gettext/metadata.xml
@@ -8,5 +8,6 @@
   <upstream>
     <remote-id type="cpan">gettext</remote-id>
     <remote-id type="cpan-module">Locale::gettext</remote-id>
+    <remote-id type="github">vandry/Perl-Locale-gettext</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/MIME-Base32/MIME-Base32-1.303.0-r1.ebuild b/dev-perl/MIME-Base32/MIME-Base32-1.303.0-r1.ebuild
index 6fc4c3c9ee4b..693bca5b8af0 100644
--- a/dev-perl/MIME-Base32/MIME-Base32-1.303.0-r1.ebuild
+++ b/dev-perl/MIME-Base32/MIME-Base32-1.303.0-r1.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Base32 encoder / decoder"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	virtual/perl-Exporter
diff --git a/dev-perl/MLDBM/MLDBM-2.50.0-r1.ebuild b/dev-perl/MLDBM/MLDBM-2.50.0-r1.ebuild
index 8473a5615ad3..604a89a5299e 100644
--- a/dev-perl/MLDBM/MLDBM-2.50.0-r1.ebuild
+++ b/dev-perl/MLDBM/MLDBM-2.50.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Multidimensional/tied hash Perl Module"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Data-Dumper-2.80.0
diff --git a/dev-perl/MailTools/MailTools-2.220.0.ebuild b/dev-perl/MailTools/MailTools-2.220.0.ebuild
index b387490c4f22..7d9a7bc0b909 100644
--- a/dev-perl/MailTools/MailTools-2.220.0.ebuild
+++ b/dev-perl/MailTools/MailTools-2.220.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
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Manipulation of electronic mail addresses"
 
 SLOT="0"
-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"
 
 RDEPEND="
 	dev-perl/TimeDate
diff --git a/dev-perl/Math-Base-Convert/Math-Base-Convert-0.110.0-r1.ebuild b/dev-perl/Math-Base-Convert/Math-Base-Convert-0.110.0-r1.ebuild
index 8470a3237a17..1d3a8f427f60 100644
--- a/dev-perl/Math-Base-Convert/Math-Base-Convert-0.110.0-r1.ebuild
+++ b/dev-perl/Math-Base-Convert/Math-Base-Convert-0.110.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Very fast base to base conversion"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
diff --git a/dev-perl/Memory-Process/Manifest b/dev-perl/Memory-Process/Manifest
new file mode 100644
index 000000000000..6a7fb2e4a435
--- /dev/null
+++ b/dev-perl/Memory-Process/Manifest
@@ -0,0 +1 @@
+DIST Memory-Process-0.06.tar.gz 27651 BLAKE2B 7b70321bb167b894cd105b8ff6e67012a9932f801c1e898f7916ceca55c69d37bb9110e9eb9112595c6dd2b9f46d65506c4b8e0fdaddd7d6ff1592990f03c00d SHA512 13a52f12965ec0541ad0d52ac182b39de8c1fcf00d7482aa9d860fc20c7011287b48e8146e344e8a89583954d7b584010fe320458c944eeb28eac66072ceac91
diff --git a/dev-perl/Memory-Process/Memory-Process-0.60.0.ebuild b/dev-perl/Memory-Process/Memory-Process-0.60.0.ebuild
new file mode 100644
index 000000000000..955fecbbc645
--- /dev/null
+++ b/dev-perl/Memory-Process/Memory-Process-0.60.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SKIM
+DIST_VERSION=0.06
+inherit perl-module
+
+DESCRIPTION="Perl class to determine actual memory usage"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-perl/Memory-Usage
+	dev-perl/Readonly
+"
+BDEPEND="
+	test? (
+		dev-perl/Capture-Tiny
+		dev-perl/Test-NoWarnings
+	)
+"
diff --git a/dev-perl/Memory-Process/metadata.xml b/dev-perl/Memory-Process/metadata.xml
new file mode 100644
index 000000000000..1d102cf1a715
--- /dev/null
+++ b/dev-perl/Memory-Process/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Memory-Process</remote-id>
+    <remote-id type="cpan-module">Memory::Process</remote-id>
+    <remote-id type="github">michal-josef-spacek/Memory-Process</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/Memory-Usage/Manifest b/dev-perl/Memory-Usage/Manifest
new file mode 100644
index 000000000000..df93abf7eda2
--- /dev/null
+++ b/dev-perl/Memory-Usage/Manifest
@@ -0,0 +1 @@
+DIST Memory-Usage-0.201.tar.gz 19746 BLAKE2B ecd929fd01135ef6ae5a0d1c0858b13b836e27259c4d54650eae9d5c5e5eb2a23e1c65133ae6a9735d010d22749454752ffd81c8ea585f2f0fbb7bae6fa4ea2b SHA512 4e34869ca1c97c39224c784e3dd6ef945174399678bfaefa5483cfd11ee0dc4b0efbde7a9ed59f146c4515c6db935261a8fb8fd7a4431c110160c28f9a2f9292
diff --git a/dev-perl/Memory-Usage/Memory-Usage-0.201.0.ebuild b/dev-perl/Memory-Usage/Memory-Usage-0.201.0.ebuild
new file mode 100644
index 000000000000..71acff879a72
--- /dev/null
+++ b/dev-perl/Memory-Usage/Memory-Usage-0.201.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DONEILL
+DIST_VERSION=0.201
+inherit perl-module
+
+DESCRIPTION="Tools to determine actual memory usage"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="dev-perl/Module-Install"
diff --git a/dev-perl/Memory-Usage/metadata.xml b/dev-perl/Memory-Usage/metadata.xml
new file mode 100644
index 000000000000..40c61b7ce5d0
--- /dev/null
+++ b/dev-perl/Memory-Usage/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="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Memory-Usage</remote-id>
+    <remote-id type="cpan-module">Memory::Usage</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/Module-Install/Module-Install-1.210.0.ebuild b/dev-perl/Module-Install/Module-Install-1.210.0.ebuild
index 2be7cdddc1bf..f2cccd537dcd 100644
--- a/dev-perl/Module-Install/Module-Install-1.210.0.ebuild
+++ b/dev-perl/Module-Install/Module-Install-1.210.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Standalone, extensible Perl module installer"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
 
 RDEPEND="
 	>=virtual/perl-CPAN-Meta-1.441.300
diff --git a/dev-perl/Module-Pluggable/Module-Pluggable-6.200.0.ebuild b/dev-perl/Module-Pluggable/Module-Pluggable-6.200.0.ebuild
index ab953930e32a..45037601c657 100644
--- a/dev-perl/Module-Pluggable/Module-Pluggable-6.200.0.ebuild
+++ b/dev-perl/Module-Pluggable/Module-Pluggable-6.200.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Automatically give your module the ability to have plugins"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-File-Spec-3
diff --git a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.370.0.ebuild b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.370.0.ebuild
index 92478ff04b80..b40fb442a2c8 100644
--- a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.370.0.ebuild
+++ b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.370.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Recursively scan Perl code for dependencies"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/Mojolicious/Mojolicious-9.390.0.ebuild b/dev-perl/Mojolicious/Mojolicious-9.390.0.ebuild
index 7fa0f3c2dc79..0517f9962b48 100644
--- a/dev-perl/Mojolicious/Mojolicious-9.390.0.ebuild
+++ b/dev-perl/Mojolicious/Mojolicious-9.390.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
@@ -13,7 +13,7 @@ DESCRIPTION="Real-time web framework"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Net-DNS/Net-DNS-1.480.0.ebuild b/dev-perl/Net-DNS/Net-DNS-1.480.0.ebuild
index 7691058a0dfb..58b62ab3bed0 100644
--- a/dev-perl/Net-DNS/Net-DNS-1.480.0.ebuild
+++ b/dev-perl/Net-DNS/Net-DNS-1.480.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
@@ -12,7 +12,7 @@ DESCRIPTION="Perl Interface to the Domain Name System"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 PDEPEND="
diff --git a/dev-perl/Object-Pad/Object-Pad-0.816.0.ebuild b/dev-perl/Object-Pad/Object-Pad-0.816.0.ebuild
index 397d81b5f0ec..552b8c313123 100644
--- a/dev-perl/Object-Pad/Object-Pad-0.816.0.ebuild
+++ b/dev-perl/Object-Pad/Object-Pad-0.816.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple syntax for lexical field-based objects"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	dev-perl/File-ShareDir
diff --git a/dev-perl/PAR-Dist/PAR-Dist-0.530.0.ebuild b/dev-perl/PAR-Dist/PAR-Dist-0.530.0.ebuild
index b70317e22833..3ed2654cd847 100644
--- a/dev-perl/PAR-Dist/PAR-Dist-0.530.0.ebuild
+++ b/dev-perl/PAR-Dist/PAR-Dist-0.530.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Create and manipulate PAR distributions"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/PPI-HTML/PPI-HTML-1.80.0-r1.ebuild b/dev-perl/PPI-HTML/PPI-HTML-1.80.0-r1.ebuild
index 0281d48a3f86..a2e878dabfd7 100644
--- a/dev-perl/PPI-HTML/PPI-HTML-1.80.0-r1.ebuild
+++ b/dev-perl/PPI-HTML/PPI-HTML-1.80.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generate syntax-hightlighted HTML for Perl using PPI"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86"
 
 RDEPEND="
 	>=dev-perl/CSS-Tiny-1.100.0
diff --git a/dev-perl/PPI/PPI-1.279.0.ebuild b/dev-perl/PPI/PPI-1.279.0.ebuild
index 3296976bd33c..2ec010d771d7 100644
--- a/dev-perl/PPI/PPI-1.279.0.ebuild
+++ b/dev-perl/PPI/PPI-1.279.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse, Analyze, and Manipulate Perl (without perl)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Parallel-Iterator/Parallel-Iterator-1.2.0.ebuild b/dev-perl/Parallel-Iterator/Parallel-Iterator-1.2.0.ebuild
index 084c43145041..979e4fd5d787 100644
--- a/dev-perl/Parallel-Iterator/Parallel-Iterator-1.2.0.ebuild
+++ b/dev-perl/Parallel-Iterator/Parallel-Iterator-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Simple parallel execution"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86"
 
 RDEPEND="
 	virtual/perl-IO
diff --git a/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.636.0.ebuild b/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.636.0.ebuild
index e32e8754ec98..a8af2e7c255e 100644
--- a/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.636.0.ebuild
+++ b/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.636.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
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Unix process table information"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-perl/SQL-Statement/SQL-Statement-1.414.0.ebuild b/dev-perl/SQL-Statement/SQL-Statement-1.414.0.ebuild
index a54a62174767..c5a935fe21d4 100644
--- a/dev-perl/SQL-Statement/SQL-Statement-1.414.0.ebuild
+++ b/dev-perl/SQL-Statement/SQL-Statement-1.414.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Small SQL parser and engine"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.25.5-r1.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.25.5-r1.ebuild
deleted file mode 100644
index 9d499a36a930..000000000000
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.25.5-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_AUTHOR=OLLY
-inherit perl-module toolchain-funcs
-
-DESCRIPTION="Perl XS frontend to the Xapian C++ search library"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 ~sparc x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/xapian-1.4:0=
-	!dev-libs/xapian-bindings[perl]"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( dev-perl/Devel-Leak )
-"
-
-DIST_TEST=do
-# parallel fails sometimes...
-
-src_configure() {
-	myconf="CXX=$(tc-getCXX) CXXFLAGS=${CXXFLAGS}"
-	perl-module_src_configure
-}
-
-src_install() {
-	perl-module_src_install
-
-	use examples && {
-		docinto examples
-		dodoc "${S}"/examples/*
-	}
-}
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.25.5-r3.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.25.5-r3.ebuild
deleted file mode 100644
index 3c4566a26520..000000000000
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.25.5-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_AUTHOR=OLLY
-inherit perl-module toolchain-funcs
-
-DESCRIPTION="Perl XS frontend to the Xapian C++ search library"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/xapian-1.4:0=[inmemory(+)]
-	!dev-libs/xapian-bindings[perl]"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( dev-perl/Devel-Leak )
-"
-
-DIST_TEST=do
-# parallel fails sometimes...
-
-src_configure() {
-	myconf="CXX=$(tc-getCXX) CXXFLAGS=${CXXFLAGS}"
-	perl-module_src_configure
-}
-
-src_install() {
-	perl-module_src_install
-
-	use examples && {
-		docinto examples
-		dodoc "${S}"/examples/*
-	}
-}
diff --git a/dev-perl/Sereal-Decoder/Sereal-Decoder-5.4.0.ebuild b/dev-perl/Sereal-Decoder/Sereal-Decoder-5.4.0.ebuild
index 795758b3f4d9..6cdfe1f21098 100644
--- a/dev-perl/Sereal-Decoder/Sereal-Decoder-5.4.0.ebuild
+++ b/dev-perl/Sereal-Decoder/Sereal-Decoder-5.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit edo perl-module toolchain-funcs
 DESCRIPTION="Fast, compact, powerful binary deserialization"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	virtual/perl-XSLoader
diff --git a/dev-perl/Sereal-Encoder/Sereal-Encoder-5.4.0.ebuild b/dev-perl/Sereal-Encoder/Sereal-Encoder-5.4.0.ebuild
index 5ff38b046252..f72277fb7e4e 100644
--- a/dev-perl/Sereal-Encoder/Sereal-Encoder-5.4.0.ebuild
+++ b/dev-perl/Sereal-Encoder/Sereal-Encoder-5.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ inherit edo perl-module toolchain-funcs
 
 DESCRIPTION="Fast, compact, powerful binary serialization"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Note: bundled zstd fails to compile
 RDEPEND="
diff --git a/dev-perl/String-CRC32/String-CRC32-2.100.0.ebuild b/dev-perl/String-CRC32/String-CRC32-2.100.0.ebuild
index 94d2555c1aec..07e8c6a6b13d 100644
--- a/dev-perl/String-CRC32/String-CRC32-2.100.0.ebuild
+++ b/dev-perl/String-CRC32/String-CRC32-2.100.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
@@ -11,4 +11,4 @@ DESCRIPTION="Perl interface for cyclic redundancy check generation"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
diff --git a/dev-perl/Syntax-Keyword-Try/Syntax-Keyword-Try-0.300.0.ebuild b/dev-perl/Syntax-Keyword-Try/Syntax-Keyword-Try-0.300.0.ebuild
index 074b1169599d..802167a72cc8 100644
--- a/dev-perl/Syntax-Keyword-Try/Syntax-Keyword-Try-0.300.0.ebuild
+++ b/dev-perl/Syntax-Keyword-Try/Syntax-Keyword-Try-0.300.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A try/catch/finally syntax for Perl"
 
 SLOT="0"
-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"
 
 RDEPEND="dev-perl/XS-Parse-Keyword"
 BDEPEND="
diff --git a/dev-perl/Task-Weaken/Task-Weaken-1.60.0.ebuild b/dev-perl/Task-Weaken/Task-Weaken-1.60.0.ebuild
index 1c70959e3b51..3160bc513045 100644
--- a/dev-perl/Task-Weaken/Task-Weaken-1.60.0.ebuild
+++ b/dev-perl/Task-Weaken/Task-Weaken-1.60.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Ensure that a platform has weaken support"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Template-DBI/Template-DBI-2.650.0-r3.ebuild b/dev-perl/Template-DBI/Template-DBI-2.650.0-r3.ebuild
index 2b0947950673..dd9d5fae3753 100644
--- a/dev-perl/Template-DBI/Template-DBI-2.650.0-r3.ebuild
+++ b/dev-perl/Template-DBI/Template-DBI-2.650.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="DBI plugin for the Template Toolkit"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-perl/DBI-1.612.0
diff --git a/dev-perl/Template-Toolkit/Template-Toolkit-3.102.0.ebuild b/dev-perl/Template-Toolkit/Template-Toolkit-3.102.0.ebuild
index cb53778f66ad..5304b5ae7d85 100644
--- a/dev-perl/Template-Toolkit/Template-Toolkit-3.102.0.ebuild
+++ b/dev-perl/Template-Toolkit/Template-Toolkit-3.102.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The Template Toolkit"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="gd mysql postgres latex vim-syntax test xml"
 
 RDEPEND="
diff --git a/dev-perl/Template-XML/Template-XML-2.170.0-r2.ebuild b/dev-perl/Template-XML/Template-XML-2.170.0-r2.ebuild
index 2e305ca40543..6314a6c11b02 100644
--- a/dev-perl/Template-XML/Template-XML-2.170.0-r2.ebuild
+++ b/dev-perl/Template-XML/Template-XML-2.170.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="XML plugins for the Template Toolkit"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-perl/Template-Toolkit-2.150.0-r1
diff --git a/dev-perl/Test-LongString/Test-LongString-0.170.0-r1.ebuild b/dev-perl/Test-LongString/Test-LongString-0.170.0-r1.ebuild
index 71340037b0ef..ad9ae4cd861d 100644
--- a/dev-perl/Test-LongString/Test-LongString-0.170.0-r1.ebuild
+++ b/dev-perl/Test-LongString/Test-LongString-0.170.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A library to test long strings"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="virtual/perl-Test-Simple"
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Test-Object/Test-Object-0.80.0-r1.ebuild b/dev-perl/Test-Object/Test-Object-0.80.0-r1.ebuild
index 0895e0a6a5cc..e9eb0ab58400 100644
--- a/dev-perl/Test-Object/Test-Object-0.80.0-r1.ebuild
+++ b/dev-perl/Test-Object/Test-Object-0.80.0-r1.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Thoroughly testing objects via registered handlers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Test-SubCalls/Test-SubCalls-1.100.0-r1.ebuild b/dev-perl/Test-SubCalls/Test-SubCalls-1.100.0-r1.ebuild
index 04927ba3bc7f..a13e3c7656e9 100644
--- a/dev-perl/Test-SubCalls/Test-SubCalls-1.100.0-r1.ebuild
+++ b/dev-perl/Test-SubCalls/Test-SubCalls-1.100.0-r1.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Track the number of times subs are called"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	virtual/perl-Exporter
diff --git a/dev-perl/Test-YAML/Test-YAML-1.70.0.ebuild b/dev-perl/Test-YAML/Test-YAML-1.70.0.ebuild
index 2c2e66905810..78c8e4aa2a66 100644
--- a/dev-perl/Test-YAML/Test-YAML-1.70.0.ebuild
+++ b/dev-perl/Test-YAML/Test-YAML-1.70.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Testing Module for YAML Implementations"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~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 ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/Test-Base-0.860.0
diff --git a/dev-perl/Test-utf8/Test-utf8-1.30.0.ebuild b/dev-perl/Test-utf8/Test-utf8-1.30.0.ebuild
index 9f2fee22de12..b6874b8d5ca2 100644
--- a/dev-perl/Test-utf8/Test-utf8-1.30.0.ebuild
+++ b/dev-perl/Test-utf8/Test-utf8-1.30.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Handy utf8 tests"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND=""
 BDEPEND="
diff --git a/dev-perl/Text-Autoformat/Text-Autoformat-1.750.0.ebuild b/dev-perl/Text-Autoformat/Text-Autoformat-1.750.0.ebuild
index 4b3866be9dda..4fdf77aa72a9 100644
--- a/dev-perl/Text-Autoformat/Text-Autoformat-1.750.0.ebuild
+++ b/dev-perl/Text-Autoformat/Text-Autoformat-1.750.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Automatic text wrapping and reformatting"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-perl/Text-Reform/Text-Reform-1.200.0-r2.ebuild b/dev-perl/Text-Reform/Text-Reform-1.200.0-r2.ebuild
index 1f962e20cc4c..7852f4a756bf 100644
--- a/dev-perl/Text-Reform/Text-Reform-1.200.0-r2.ebuild
+++ b/dev-perl/Text-Reform/Text-Reform-1.200.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Manual text wrapping and reformatting"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 BDEPEND="dev-perl/Module-Build
diff --git a/dev-perl/Text-Soundex/Text-Soundex-3.50.0-r1.ebuild b/dev-perl/Text-Soundex/Text-Soundex-3.50.0-r1.ebuild
index 1013fb2b799a..5e8924fd3120 100644
--- a/dev-perl/Text-Soundex/Text-Soundex-3.50.0-r1.ebuild
+++ b/dev-perl/Text-Soundex/Text-Soundex-3.50.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Implementation of the soundex algorithm"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/URI/URI-5.310.0.ebuild b/dev-perl/URI/URI-5.310.0.ebuild
index dced9cf5923d..26fc0e224a36 100644
--- a/dev-perl/URI/URI-5.310.0.ebuild
+++ b/dev-perl/URI/URI-5.310.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Uniform Resource Identifiers (absolute and relative)"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/XML-DOM/XML-DOM-1.460.0-r2.ebuild b/dev-perl/XML-DOM/XML-DOM-1.460.0-r2.ebuild
index fe118c1e5a48..fed1ffa510e7 100644
--- a/dev-perl/XML-DOM/XML-DOM-1.460.0-r2.ebuild
+++ b/dev-perl/XML-DOM/XML-DOM-1.460.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl module for an DOM Level 1 compliant interface"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-perl/libwww-perl
diff --git a/dev-perl/XML-RSS/XML-RSS-1.640.0.ebuild b/dev-perl/XML-RSS/XML-RSS-1.640.0.ebuild
index 2ef7545f0714..b15f8576321a 100644
--- a/dev-perl/XML-RSS/XML-RSS-1.640.0.ebuild
+++ b/dev-perl/XML-RSS/XML-RSS-1.640.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
@@ -12,7 +12,7 @@ DESCRIPTION="Basic framework for creating and maintaining RSS files"
 HOMEPAGE="https://perl-rss.sourceforge.net/"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/XML-RegExp/XML-RegExp-0.40.0-r2.ebuild b/dev-perl/XML-RegExp/XML-RegExp-0.40.0-r2.ebuild
index 9ecc939f88fa..1eef66f48ecf 100644
--- a/dev-perl/XML-RegExp/XML-RegExp-0.40.0-r2.ebuild
+++ b/dev-perl/XML-RegExp/XML-RegExp-0.40.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Regular expressions for XML tokens"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/XML-Parser-2.290.0
diff --git a/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.470.0.ebuild b/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.470.0.ebuild
index 944f193ef11e..93a0e8cc571f 100644
--- a/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.470.0.ebuild
+++ b/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.470.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="XS functions to assist in parsing keyword syntax"
 
 SLOT="0"
-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"
 
 RDEPEND="
 	dev-perl/File-ShareDir
diff --git a/dev-perl/YAML-Syck/YAML-Syck-1.340.0.ebuild b/dev-perl/YAML-Syck/YAML-Syck-1.340.0.ebuild
index 16f214a87461..fcf2da4bb3a1 100644
--- a/dev-perl/YAML-Syck/YAML-Syck-1.340.0.ebuild
+++ b/dev-perl/YAML-Syck/YAML-Syck-1.340.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
@@ -11,7 +11,7 @@ DESCRIPTION="Fast, lightweight YAML loader and dumper"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 src_configure() {
 	export CC="$(tc-getCC) -std=gnu17"
diff --git a/dev-perl/YAML/YAML-1.310.0.ebuild b/dev-perl/YAML/YAML-1.310.0.ebuild
index ded15ce60f59..0c7355ae9c9c 100644
--- a/dev-perl/YAML/YAML-1.310.0.ebuild
+++ b/dev-perl/YAML/YAML-1.310.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="YAML Ain't Markup Language (tm)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~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 ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/namespace-autoclean/namespace-autoclean-0.310.0.ebuild b/dev-perl/namespace-autoclean/namespace-autoclean-0.310.0.ebuild
index 4960f038ad06..4934fc5adac5 100644
--- a/dev-perl/namespace-autoclean/namespace-autoclean-0.310.0.ebuild
+++ b/dev-perl/namespace-autoclean/namespace-autoclean-0.310.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Keep imports out of your namespace"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-perl/B-Hooks-EndOfScope-0.120.0
diff --git a/dev-perl/prefork/prefork-1.50.0.ebuild b/dev-perl/prefork/prefork-1.50.0.ebuild
index e969387415b8..da758b9f36e7 100644
--- a/dev-perl/prefork/prefork-1.50.0.ebuild
+++ b/dev-perl/prefork/prefork-1.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Optimized module loading for forking or non-forking processes"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~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 ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-php/PEAR-Net_IMAP/Manifest b/dev-php/PEAR-Net_IMAP/Manifest
new file mode 100644
index 000000000000..1fd38cac978c
--- /dev/null
+++ b/dev-php/PEAR-Net_IMAP/Manifest
@@ -0,0 +1 @@
+DIST Net_IMAP-1.1.4.tgz 40723 BLAKE2B 0e6b7bc01301f26464afdee148318549e239c6bb8fc5646f13fc728b0e581ae8c9bc9961e83065138f31df0a81e4ed79794420be4d3a7c43b6bacc619ed672ad SHA512 2747cdb3d7f11dc4e9bc5c531c4c49cbd1b65b0ff71b30f46f06a4ad10aae341c1323a7c4a9ffb4fa3b8694a75cf60fdcb9cf433c765f29e17bd1e86c5fa929d
diff --git a/dev-php/PEAR-Net_IMAP/PEAR-Net_IMAP-1.1.4.ebuild b/dev-php/PEAR-Net_IMAP/PEAR-Net_IMAP-1.1.4.ebuild
new file mode 100644
index 000000000000..345cf489d8c1
--- /dev/null
+++ b/dev-php/PEAR-Net_IMAP/PEAR-Net_IMAP-1.1.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Provides an implementation of the IMAP protocol"
+HOMEPAGE="https://pear.php.net/package/Net_IMAP
+	https://github.com/pear/Net_IMAP"
+SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="sasl"
+RDEPEND="dev-lang/php:*
+	dev-php/PEAR-Net_Socket
+	dev-php/PEAR-PEAR
+	sasl? ( dev-php/PEAR-Auth_SASL )"
+
+src_install() {
+	insinto /usr/share/php
+	doins -r Net
+	dodoc docs/*
+	insinto /usr/share/php/.packagexml
+	newins "${WORKDIR}/package.xml" "${MY_P}.xml"
+}
+
+pkg_postinst() {
+	# It is not critical to complete so only warn on failure
+	if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" && \
+		-x "${EROOT}/usr/bin/peardev" ]] ; then
+		"${EROOT}/usr/bin/peardev" install -nrO --force \
+			"${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
+			|| ewarn "Failed to insert package into local PEAR database"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -x "${EROOT}/usr/bin/peardev" ]]; then
+		"${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/${MY_PN}"
+	fi
+}
diff --git a/dev-php/PEAR-Net_IMAP/metadata.xml b/dev-php/PEAR-Net_IMAP/metadata.xml
new file mode 100644
index 000000000000..86cdbad4cb33
--- /dev/null
+++ b/dev-php/PEAR-Net_IMAP/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">pear/Net_IMAP</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-php/pecl-event/pecl-event-3.1.4.ebuild b/dev-php/pecl-event/pecl-event-3.1.4.ebuild
index 8425536a7b47..5357ace6dca6 100644
--- a/dev-php/pecl-event/pecl-event-3.1.4.ebuild
+++ b/dev-php/pecl-event/pecl-event-3.1.4.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"
@@ -17,7 +17,7 @@ DESCRIPTION="PHP wrapper for libevent2"
 HOMEPAGE="https://pecl.php.net/package/event"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug examples +extra +sockets +ssl threads"
 DEPEND=">=dev-libs/libevent-2.0.2[ssl?]
 	ssl? ( dev-libs/openssl:= )"
diff --git a/dev-php/pecl-redis/pecl-redis-6.1.0.ebuild b/dev-php/pecl-redis/pecl-redis-6.1.0.ebuild
index 84df442bf7cd..0a58a9f1494f 100644
--- a/dev-php/pecl-redis/pecl-redis-6.1.0.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-6.1.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 @@ inherit php-ext-pecl-r3
 DESCRIPTION="PHP extension for interfacing with Redis"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="igbinary +json lz4 +session zstd"
 
 DEPEND="
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/pecl-yaz-1.2.4-r1.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.4-r1.ebuild
index e4d5f45b5344..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
@@ -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 @@ 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/a2wsgi/Manifest b/dev-python/a2wsgi/Manifest
index c0e8002a0c22..2f3d7002cfa5 100644
--- a/dev-python/a2wsgi/Manifest
+++ b/dev-python/a2wsgi/Manifest
@@ -1 +1,2 @@
 DIST a2wsgi-1.10.7.tar.gz 18669 BLAKE2B a29f294cd3d31ad3859d190a2e187bbb0b667fe6d29068793163aa0cf6429ff03fc408613c772c5efcbb1c961820664304c118f1036e4c9c567fc3e06ce55214 SHA512 49075f6cac08f1a5ae3e4ac1d1510a33394912e7e973771b8db2643792e7d875daa1db9e87a69062697cd3001533ddb7e13388edf4d963cd23f5bb84db141095
+DIST a2wsgi-1.10.8.tar.gz 18729 BLAKE2B d36614cdf66680240c49f142208d9cbad660117bfd160f37606bf67ecc7dd7178f63bf7685669b1207bcfb417568807449b49e8ef85d3b8642da0c199211686a SHA512 b8ed1d1370af6ba13339fa408e4da575cbb3229346a67a8c270207038b739daee341d1755c5db0e7b690f4a8654f54113e0c6f9a99ff359634c663e6df86e0ae
diff --git a/dev-python/a2wsgi/a2wsgi-1.10.8.ebuild b/dev-python/a2wsgi/a2wsgi-1.10.8.ebuild
new file mode 100644
index 000000000000..6fd945ac9a2e
--- /dev/null
+++ b/dev-python/a2wsgi/a2wsgi-1.10.8.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Convert WSGI app to ASGI app or ASGI app to WSGI app"
+HOMEPAGE="
+	https://github.com/abersheeran/a2wsgi/
+	https://pypi.org/project/a2wsgi/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		<dev-python/httpx-1[${PYTHON_USEDEP}]
+		>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/starlette[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires baize
+		tests/test_asgi.py::test_baize_stream_response
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p asyncio
+}
diff --git a/dev-python/aiohttp-socks/Manifest b/dev-python/aiohttp-socks/Manifest
index 481218730f8f..97371e4161d6 100644
--- a/dev-python/aiohttp-socks/Manifest
+++ b/dev-python/aiohttp-socks/Manifest
@@ -1,4 +1 @@
-DIST aiohttp-socks-0.10.0.gh.tar.gz 13778 BLAKE2B 2bee4f2befa2ecefc121cea67cffaad8f0e6560651f73f0549cc9e5a7afa05b05ef7c1fc361149ed72df5ba1b89db017d09e70c3ae4d8ddebc7f5eadab5b09bc SHA512 18d0354cfaf49c7dee076bc7fe47f338122f5ee1f9fc42c22cfab4ab878a05941bcc1d3df0fa5c3107d6ed191ab459bdcf6a1a408f9357351518661b434dd0ef
 DIST aiohttp-socks-0.10.1.gh.tar.gz 13783 BLAKE2B e1446c13847bde3cf39a55ba650bf20037199694006b15101925c812a304c24a558722809a14299e97e6d1a7eae9ff4433d6f9f15232dbb7bad2c280773de1d6 SHA512 0519a82d4a157ef708deed89706606ffe318ad935ec8a1ff4bd94fe3acdab294e44eb99119f90e639ef4a7f16c705fe6688f45c31286d4ada0ecd8859a3a69c9
-DIST aiohttp-socks-0.9.1.gh.tar.gz 13699 BLAKE2B 9d6f86fdb767b286f72b6b6a9c7c7abd5a4ee05f52bfe5c94830ee477a12cd1c97572e31acdb05ca8ea0d70a5a12bd23afff7b946859e7de3fa8ce4cfdafd18e SHA512 dd4f5c2a8a7c7af6d46293fd0213fedd3f75c0cf36b96c776aa05f7e1433d2032c7927f1b10cf74d801e5e294bd0cde066562abcd8b196aeb0e1c58a88de0423
-DIST aiohttp-socks-0.9.2.gh.tar.gz 13845 BLAKE2B fb401ad108804a4dccce7aed096a91b655d698c74a02da778876e8b35b5f1798f83f9c51f9b0aa7820d1c2d70bb3f316727daa27aabe00f96e8b744487a79847 SHA512 bbbf85baa1784dbdda42e2fc12e8fa6774da020a023a05fa1c3760ba87ada373ff9f6656d39ae9f3efac1925fdeca03df3f9d8e57ac05fc1fb347407201f482b
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.10.0.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.10.0.ebuild
deleted file mode 100644
index da83dfcce838..000000000000
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.10.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS proxy connector for aiohttp"
-HOMEPAGE="
-	https://pypi.org/project/aiohttp-socks/
-	https://github.com/romis2012/aiohttp-socks/
-"
-SRC_URI="
-	https://github.com/romis2012/aiohttp-socks/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aiohttp-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-socks-2.4.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/attrs[${PYTHON_USEDEP}]
-		dev-python/yarl[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/tiny-proxy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.10.1.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.10.1.ebuild
index da83dfcce838..e7c343105b26 100644
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.10.1.ebuild
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.10.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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/aiohttp-3.10.0[${PYTHON_USEDEP}]
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.9.1.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.9.1.ebuild
deleted file mode 100644
index 55bc1af8d1c5..000000000000
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.9.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS proxy connector for aiohttp"
-HOMEPAGE="
-	https://pypi.org/project/aiohttp-socks/
-	https://github.com/romis2012/aiohttp-socks/
-"
-SRC_URI="
-	https://github.com/romis2012/aiohttp-socks/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/aiohttp-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-socks-2.4.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/attrs[${PYTHON_USEDEP}]
-		dev-python/yarl[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/tiny-proxy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.9.2.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.9.2.ebuild
deleted file mode 100644
index da83dfcce838..000000000000
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.9.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS proxy connector for aiohttp"
-HOMEPAGE="
-	https://pypi.org/project/aiohttp-socks/
-	https://github.com/romis2012/aiohttp-socks/
-"
-SRC_URI="
-	https://github.com/romis2012/aiohttp-socks/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aiohttp-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-socks-2.4.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/attrs[${PYTHON_USEDEP}]
-		dev-python/yarl[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/tiny-proxy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index dfe89a1b1acc..33f666162715 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,4 +1 @@
-DIST aiohttp-3.10.10.tar.gz 7542993 BLAKE2B edc9808937892e2915b591a3d5b9e2be8401a67e6421ada8c49e27cfa1ee67283465d17e3c3a77f7579d4ed45df39884a2f9e336429ef7d64adf351ce7507a85 SHA512 c6928d989c110c323347b6f5b0a90c42e17924b4121455a240f5a15d87f939580640ba0f8d576f8254e484e5b631ec4562a2fb4e6c86402924b1892a6d72aff8
-DIST aiohttp-3.11.10.tar.gz 7668832 BLAKE2B e2a8637f1d26ec1bb64d344aebdcf123bb918055185cf40d444d6d02fdf40c2b1ea36ce168b9d4c1e2003e877634d66c456e446cf01a51c9ec086adf1be0a9eb SHA512 06c4bf434705151cd5aa8d4a1759ab41e3b5c307dd92eb22f7293d1e1e3b7597a5f927ad3d1e8bcd3a8cdd4b2ebf12fedf72efd50dbf575b61e5aca4d2e54a55
 DIST aiohttp-3.11.11.tar.gz 7669618 BLAKE2B 148c15503ca2b5449b8afe4d0cadb054625cd12c7e3d958547c7ba6b46ca4d4da1b4091db0f97e2003c8bc7a582c36f4c6aba062a8fe0b0894740042853b68e9 SHA512 7b5c6fdf15a3bdae49b28f6955f31f528aff29f635b8bbbe60f0677dea8fbbe5de8e09b3cbb85f8a846942470b9e44c9d287aaf9eb08f8e8d9fab3bd64079edf
-DIST aiohttp-3.11.9.tar.gz 7668012 BLAKE2B 5845d14392429f3aa83ce1469679a89badf5e50a6142e98a58704643fa93e290d5d9e4bc27720e8d9f5c62eafdfb0b43f7381a747fae867960e7b5c13a558fee SHA512 b6be296f08fb4421d3e8f206ca1abcd781a275d24da3434ccf049c95ac332a0fe7334f0450d35e57caa505f348485257ffd627924fbfd1795eb579a5475c7187
diff --git a/dev-python/aiohttp/aiohttp-3.10.10.ebuild b/dev-python/aiohttp/aiohttp-3.10.10.ebuild
deleted file mode 100644
index 47ad1f2fbe44..000000000000
--- a/dev-python/aiohttp/aiohttp-3.10.10.ebuild
+++ /dev/null
@@ -1,123 +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=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP client/server for asyncio"
-HOMEPAGE="
-	https://github.com/aio-libs/aiohttp/
-	https://pypi.org/project/aiohttp/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+native-extensions test-rust"
-
-RDEPEND="
-	>=dev-python/aiodns-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohappyeyeballs-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/brotlicffi[${PYTHON_USEDEP}]
-	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.12.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		<dev-python/async-timeout-5[${PYTHON_USEDEP}]
-		>=dev-python/async-timeout-4.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		test-rust? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# increase the timeout a little
-	sed -e '/abs=/s/0.001/0.01/' -i tests/test_helpers.py || die
-	# xfail_strict fails on py3.10
-	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
-	sed -i -e 's:-Werror::' Makefile || die
-
-	distutils-r1_src_prepare
-}
-
-python_configure() {
-	if [[ ! -d tools && ${EPYTHON} != pypy3 ]] && use native-extensions
-	then
-		# workaround missing files
-		mkdir tools || die
-		> requirements/cython.txt || die
-		> tools/gen.py || die
-		chmod +x tools/gen.py || die
-		# force rehashing first
-		emake requirements/.hash/cython.txt.hash
-		> .update-pip || die
-		> .install-cython || die
-		emake cythonize
-	fi
-}
-
-python_compile() {
-	# implicitly disabled for pypy3
-	if ! use native-extensions; then
-		local -x AIOHTTP_NO_EXTENSIONS=1
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# proxy is not packaged
-		tests/test_proxy_functional.py
-		# python_on_whales is not packaged
-		tests/autobahn/test_autobahn.py
-	)
-
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/test_client_session.py::test_client_session_timeout_zero
-		# broken by irrelevant deprecation warnings
-		tests/test_circular_imports.py::test_no_warnings
-	)
-
-	# upstream unconditionally blocks building C extensions
-	# on PyPy3 but the test suite needs an explicit switch
-	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
-		local -x AIOHTTP_NO_EXTENSIONS=1
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin
-	rm -rf aiohttp || die
-	epytest -m "not internal and not dev_mode" \
-		-p rerunfailures --reruns=5
-}
diff --git a/dev-python/aiohttp/aiohttp-3.11.10.ebuild b/dev-python/aiohttp/aiohttp-3.11.10.ebuild
deleted file mode 100644
index b1db97419c19..000000000000
--- a/dev-python/aiohttp/aiohttp-3.11.10.ebuild
+++ /dev/null
@@ -1,135 +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=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP client/server for asyncio"
-HOMEPAGE="
-	https://github.com/aio-libs/aiohttp/
-	https://pypi.org/project/aiohttp/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+native-extensions test-rust"
-
-RDEPEND="
-	>=dev-python/aiodns-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohappyeyeballs-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/brotlicffi[${PYTHON_USEDEP}]
-	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/propcache-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.17.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		<dev-python/async-timeout-6[${PYTHON_USEDEP}]
-		>=dev-python/async-timeout-4.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		test-rust? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# increase the timeout a little
-	sed -e '/abs=/s/0.001/0.01/' -i tests/test_helpers.py || die
-	# xfail_strict fails on py3.10
-	sed -i -e '/--cov/d' -e '/pytest_cov/d' -e '/xfail_strict/d' setup.cfg || die
-	sed -i -e 's:-Werror::' Makefile || die
-
-	distutils-r1_src_prepare
-}
-
-python_configure() {
-	if [[ ! -d tools && ${EPYTHON} != pypy3 ]] && use native-extensions
-	then
-		# workaround missing files
-		mkdir tools || die
-		> requirements/cython.txt || die
-		> tools/gen.py || die
-		chmod +x tools/gen.py || die
-		# force rehashing first
-		emake requirements/.hash/cython.txt.hash
-		> .update-pip || die
-		> .install-cython || die
-		emake cythonize
-	fi
-}
-
-python_compile() {
-	# implicitly disabled for pypy3
-	if ! use native-extensions; then
-		local -x AIOHTTP_NO_EXTENSIONS=1
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# proxy is not packaged
-		tests/test_proxy_functional.py
-		# python_on_whales is not packaged
-		tests/autobahn/test_autobahn.py
-		# benchmarks
-		tests/test_benchmarks_client.py
-		tests/test_benchmarks_client_request.py
-		tests/test_benchmarks_client_ws.py
-		tests/test_benchmarks_cookiejar.py
-		tests/test_benchmarks_http_websocket.py
-		tests/test_benchmarks_http_writer.py
-		tests/test_benchmarks_web_fileresponse.py
-		tests/test_benchmarks_web_middleware.py
-		tests/test_benchmarks_web_response.py
-		tests/test_benchmarks_web_urldispatcher.py
-	)
-
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/test_client_session.py::test_client_session_timeout_zero
-		# broken by irrelevant deprecation warnings
-		tests/test_circular_imports.py::test_no_warnings
-	)
-
-	# upstream unconditionally blocks building C extensions
-	# on PyPy3 but the test suite needs an explicit switch
-	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
-		local -x AIOHTTP_NO_EXTENSIONS=1
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin
-	rm -rf aiohttp || die
-	epytest -m "not internal and not dev_mode" \
-		-p rerunfailures --reruns=5
-}
diff --git a/dev-python/aiohttp/aiohttp-3.11.11.ebuild b/dev-python/aiohttp/aiohttp-3.11.11.ebuild
index b6ddfae2e7e3..fea365fec27c 100644
--- a/dev-python/aiohttp/aiohttp-3.11.11.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.11.11.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+native-extensions test-rust"
 
 RDEPEND="
diff --git a/dev-python/aiohttp/aiohttp-3.11.9.ebuild b/dev-python/aiohttp/aiohttp-3.11.9.ebuild
deleted file mode 100644
index aab347bd3181..000000000000
--- a/dev-python/aiohttp/aiohttp-3.11.9.ebuild
+++ /dev/null
@@ -1,134 +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=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP client/server for asyncio"
-HOMEPAGE="
-	https://github.com/aio-libs/aiohttp/
-	https://pypi.org/project/aiohttp/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+native-extensions test-rust"
-
-RDEPEND="
-	>=dev-python/aiodns-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohappyeyeballs-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/brotlicffi[${PYTHON_USEDEP}]
-	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/propcache-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.17.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		<dev-python/async-timeout-6[${PYTHON_USEDEP}]
-		>=dev-python/async-timeout-4.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		test-rust? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# increase the timeout a little
-	sed -e '/abs=/s/0.001/0.01/' -i tests/test_helpers.py || die
-	# xfail_strict fails on py3.10
-	sed -i -e '/--cov/d' -e '/pytest_cov/d' -e '/xfail_strict/d' setup.cfg || die
-	sed -i -e 's:-Werror::' Makefile || die
-
-	distutils-r1_src_prepare
-}
-
-python_configure() {
-	if [[ ! -d tools && ${EPYTHON} != pypy3 ]] && use native-extensions
-	then
-		# workaround missing files
-		mkdir tools || die
-		> requirements/cython.txt || die
-		> tools/gen.py || die
-		chmod +x tools/gen.py || die
-		# force rehashing first
-		emake requirements/.hash/cython.txt.hash
-		> .update-pip || die
-		> .install-cython || die
-		emake cythonize
-	fi
-}
-
-python_compile() {
-	# implicitly disabled for pypy3
-	if ! use native-extensions; then
-		local -x AIOHTTP_NO_EXTENSIONS=1
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# proxy is not packaged
-		tests/test_proxy_functional.py
-		# python_on_whales is not packaged
-		tests/autobahn/test_autobahn.py
-		# benchmarks
-		tests/test_benchmarks_client.py
-		tests/test_benchmarks_client_request.py
-		tests/test_benchmarks_client_ws.py
-		tests/test_benchmarks_cookiejar.py
-		tests/test_benchmarks_http_websocket.py
-		tests/test_benchmarks_http_writer.py
-		tests/test_benchmarks_web_middleware.py
-		tests/test_benchmarks_web_response.py
-		tests/test_benchmarks_web_urldispatcher.py
-	)
-
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/test_client_session.py::test_client_session_timeout_zero
-		# broken by irrelevant deprecation warnings
-		tests/test_circular_imports.py::test_no_warnings
-	)
-
-	# upstream unconditionally blocks building C extensions
-	# on PyPy3 but the test suite needs an explicit switch
-	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
-		local -x AIOHTTP_NO_EXTENSIONS=1
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin
-	rm -rf aiohttp || die
-	epytest -m "not internal and not dev_mode" \
-		-p rerunfailures --reruns=5
-}
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/aioquic/aioquic-1.2.0.ebuild b/dev-python/aioquic/aioquic-1.2.0.ebuild
index 3ad1c96c76ee..2c26cfb3539e 100644
--- a/dev-python/aioquic/aioquic-1.2.0.ebuild
+++ b/dev-python/aioquic/aioquic-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 DEPEND="
 	dev-libs/openssl:=
diff --git a/dev-python/aioresponses/Manifest b/dev-python/aioresponses/Manifest
index 190ae9f18006..0bf3720f9c20 100644
--- a/dev-python/aioresponses/Manifest
+++ b/dev-python/aioresponses/Manifest
@@ -1 +1,2 @@
 DIST aioresponses-0.7.7.tar.gz 39087 BLAKE2B 4692e088ec1c0a0f5e4f65a1269eb845ea6892ce41cc772cab9d0bb3795767b9ef776045d699e05f0816acdc795521318ce2ddd17ea8d436e89e9aae5e29436c SHA512 36fc45bc33d011d24fdbc437ea2adbba63eadec67d7198fe1e645d1dc0e7596104d5bf61ac1fe40b1d64f21cbe707e80775d26aa3762f87ad0a440ebabaa3a47
+DIST aioresponses-0.7.8.tar.gz 40253 BLAKE2B 470a71e1b9e315cdce32bb35daf3c111f439dc7096a5d991b7da479c4514331debe903b8d0cd1a9503b2c264ed7bf2901399139719e631adcf2f8aa359b9d4e2 SHA512 a7368e9f344d2790df9c10c9a5e2b9124f56b12413a0b52b91dced9513338b22f75887f94fc9c0b4e2709d7ed37f2c0978ba2652745546387b5317d188190390
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/aiorpcx/Manifest b/dev-python/aiorpcx/Manifest
index dffa34dd1f32..1b023ac9e896 100644
--- a/dev-python/aiorpcx/Manifest
+++ b/dev-python/aiorpcx/Manifest
@@ -1,2 +1,3 @@
 DIST aiorpcX-0.22.1.gh.tar.gz 75206 BLAKE2B 92c481388198fec94faa10482ad4195fe6dce5ae4aa445ce2812e1e81e084c629712b87a3c157aa33ae42335c1a96bdcafa5e389802740fcae8eb9e4aaf43dd2 SHA512 3484da36ce6042d8d4c6b168fd2326c0fc77a825691b95631e54510697708a27ea07e9a808445d504056432adf04f04cb0bc28d4b7194c55c1995096bb938b4d
 DIST aiorpcX-0.23.1.gh.tar.gz 70759 BLAKE2B e61aeee430670962491d165fe6841653b035b96cd07a70e6be0a0f4f5d5891859398826e4a964cd119ae7e42f2e02808363ab44b6b8f28054d86539c5067cf7b SHA512 e92f68da0783bcf66926047ab2af12b5971f4bab0a028a639e53440c9cfc39ba54ddbdd1c2a20a6dacf73dac583305f692851c0d911cd68d6aabdbe131b1a8e1
+DIST aiorpcX-0.24.gh.tar.gz 70778 BLAKE2B d747fa2fe37eb67782c1c6327c45afcef1b332c177962590f81e220fa8eb6b19a95f8926fb48e71a2713bc1760e46d570c81375bcf89cb6787c8cd68c4d41d43 SHA512 e2701b6625982b10c01e6ee59fdfabb2dd2e0595cddf6b3cbaeb36692273f74eb73f9b0336fd27922cf08ac76a3020f8f5515d9b38c9fb37dd33cde78f3c32b8
diff --git a/dev-python/aiorpcx/aiorpcx-0.23.1.ebuild b/dev-python/aiorpcx/aiorpcx-0.23.1.ebuild
index 7c72f73f9006..14fc42a3f534 100644
--- a/dev-python/aiorpcx/aiorpcx-0.23.1.ebuild
+++ b/dev-python/aiorpcx/aiorpcx-0.23.1.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..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiorpcx/aiorpcx-0.24.ebuild b/dev-python/aiorpcx/aiorpcx-0.24.ebuild
new file mode 100644
index 000000000000..1b700a124a79
--- /dev/null
+++ b/dev-python/aiorpcx/aiorpcx-0.24.ebuild
@@ -0,0 +1,40 @@
+# 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
+
+MY_P=aiorpcX-${PV}
+DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
+HOMEPAGE="
+	https://github.com/kyuupichan/aiorpcX/
+	https://pypi.org/project/aiorpcX/
+"
+SRC_URI="
+	https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/uvloop[${PYTHON_USEDEP}]
+		>=dev-python/websockets-0.14[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# require Internet
+	tests/test_socks.py::TestSOCKSProxy::test_create_connection_resolve_good
+)
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 6db4c46b0533..dc40f7648ffb 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1 +1,2 @@
 DIST alembic-1.14.0.tar.gz 1916172 BLAKE2B 22c9373df866857328dbcd10e87ded6d7768bff0f5955a2ca607d9a31e722f69b3adb0560150483f59122bc676ba7d9bd4245e29f5f1a35c8f96b4741422b77a SHA512 efc6eb3527672a136a6acef8bcc1d484c4a331fbb1b825085ac337133facddd11c4cfe4f473175a748bbbec8f7d58c45cb341902cdedbbb7b00a0403e2ba53d5
+DIST alembic-1.14.1.tar.gz 1918219 BLAKE2B ba86062e0662b75fdd616d27f235ff836622deceb412f760af2f75313b6b81d8b42e0fc1d49d0bb5e164cbd54d8fed5faa2f402dd51393aa9f57899a9a1e541f SHA512 ae3f31f102ff6e2903d0719051e58fb7b30c251a9ce20c22e658bb343ba252cb0d66adc429ec83fc65ce73d6a6f6ae1673c878de81f433baa16663393a14d3dd
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/aniso8601/Manifest b/dev-python/aniso8601/Manifest
index bab2940c528b..74b475e80e8f 100644
--- a/dev-python/aniso8601/Manifest
+++ b/dev-python/aniso8601/Manifest
@@ -1 +1,2 @@
+DIST aniso8601-10.0.0.tar.gz 47008 BLAKE2B ab1746fe61700bceb4f1a8c3eabb7eba87c8fc15d956e21af249492c114ec7684758f6e4ddd46d35b3dff6d03d5ed27b933ed282638913bb3ec407bb93c005d1 SHA512 62cb81308f8445d05d81d97928a1c5d93434ba59364b471cf4adb074aab6e465921a283c2403880b16771b7e8c1e2d6b91bdc9e1e6fcbcf6c83c88b8bb842a6c
 DIST aniso8601-9.0.1.tar.gz 47345 BLAKE2B d8167bff8fdde88799e165c12aa0ea10a34d2edc91f8eeba93105e669dab52ab73e688467370927ef749395491baa128b55c984feb4f1d972e75242ec1c1efbc SHA512 a17c363a3a67b69a2fde50cc37b080b52615cebc453ef70090498ffce909775b0109c889b63e87381c795c2d8531efd6048542627c88e97297ac22ce81c10c8c
diff --git a/dev-python/aniso8601/aniso8601-10.0.0.ebuild b/dev-python/aniso8601/aniso8601-10.0.0.ebuild
new file mode 100644
index 000000000000..774aebc86616
--- /dev/null
+++ b/dev-python/aniso8601/aniso8601-10.0.0.ebuild
@@ -0,0 +1,25 @@
+# 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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A library for parsing ISO 8601 strings"
+HOMEPAGE="
+	https://bitbucket.org/nielsenb/aniso8601/
+	https://pypi.org/project/aniso8601/
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 37f74ab047c5..a99f02e45465 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,2 +1,3 @@
 DIST ansible-compat-24.9.1.gh.tar.gz 76018 BLAKE2B 581199ab65ccc884a3eeef246a8dbe527cac91fc3b588edaf1ad45e7aa83a2e77d44eab8e9dc5d7f2598b02a22fb724ccf235d25592ff8c9de0b7718b9ad5507 SHA512 d5da3cbd29bfb49b9ac68f004eb957edbfdfa303ce204e230117e9964df36c6bcbf3b47ef343d6a77b4f24c390266aebd649a8036cf9e7f29dc350d207ab7409
 DIST ansible_compat-24.10.0.tar.gz 81818 BLAKE2B 78afad41dbe2172cb485186d78a488343391b5feb39f233f8584dc65ece8f290b43c8a6b0112db4606329bc5f38a9e44c6e39fd48efcb5562292152d44276539 SHA512 636ccb66be3570bf7ab0a51f991fefe3b4754db3fddb4d45ebd116de2721082e8ad4049e0cdd975431f01daaa4cb9d24ca57a97913fa66ce1f1f47780734ab14
+DIST ansible_compat-25.0.0.tar.gz 86030 BLAKE2B 42e0b6ed23e5e9b91b9d07b15c60f60ce39d5756c4948eb20a8bb19c4178145275677ba68d75682b2e37842ba275d61346989947d764612a0459c2a986b316ba SHA512 f4aeb4be2af86cad50a1d340449b3b85992d5cd6b99761847e3c638f9fd18639c9783052bccff5f1fec45ee1392463d0a5700f58de826c4cfd27741578672ef8
diff --git a/dev-python/ansible-compat/ansible-compat-25.0.0.ebuild b/dev-python/ansible-compat/ansible-compat-25.0.0.ebuild
new file mode 100644
index 000000000000..eb855234a94e
--- /dev/null
+++ b/dev-python/ansible-compat/ansible-compat-25.0.0.ebuild
@@ -0,0 +1,57 @@
+# 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_{11..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
+HOMEPAGE="
+	https://pypi.org/project/ansible-compat/
+	https://github.com/ansible/ansible-compat/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RDEPEND="
+	>=app-admin/ansible-core-2.18.1[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.23.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/subprocess-tee-0.4.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-plus[${PYTHON_USEDEP}]
+	)
+"
+
+# All these tests attempt to connect to galaxy.ansible.com
+EPYTEST_DESELECT=(
+	test/test_runtime.py::test_install_collection
+	test/test_runtime.py::test_install_collection_dest
+	'test/test_runtime.py::test_load_plugins[modules]'
+	test/test_runtime.py::test_prepare_environment_with_collections
+	test/test_runtime.py::test_prerun_reqs_v1
+	test/test_runtime.py::test_prerun_reqs_v2
+	test/test_runtime.py::test_require_collection_no_cache_dir
+	test/test_runtime.py::test_require_collection_wrong_version
+	test/test_runtime.py::test_require_collection
+	test/test_runtime.py::test_upgrade_collection
+	test/test_runtime_example.py::test_runtime
+	# pip, failing due to internets
+	test/test_runtime_scan_path.py::test_scan_sys_path
+	# internets?
+	test/test_runtime.py::test_runtime_has_playbook
+	# TODO
+	test/test_prerun.py::test_get_cache_dir_relative
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 69055fa7f1be..066504e67df7 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,4 +1,2 @@
-DIST anyio-4.6.0.tar.gz 170983 BLAKE2B 686cb9b622cba29d02fe6e440502de80c159dc40547124aed79eb7558fe147fa62f378745c2aa5487ca1ea7c24e1f3c6167f8343236dbb7e0876d95f741c46ec SHA512 4828198d3e2b2924b3490c305dcaddc14b5746b29a0cb36f75913f897254fed0ac46e075a3c04bf164a7d4d597b0dcdd991fe5cb26ffce477d029db7ff924f38
-DIST anyio-4.6.2.post1.tar.gz 173422 BLAKE2B 938b0b12110aea3eb733f251b4cf24a82098314a393e07d5ada45a16fae4d10a89462bd81f67002dcc6ac272df9b600d24bb569cb9a3897213bf9ecf1b00f554 SHA512 86d177d1f3e236fd3a2762ce6a760ad77daf9a9fd0daa6e651e778e8c847f85382d2647bf674970fdf8ab02454a8e0a85cc74585e4912c39f5d230eaf0f363a1
-DIST anyio-4.6.2.tar.gz 171302 BLAKE2B 4c44ac9d896fc98fde450c1311ba6a37d28d79848f4d89a1ca571afe53e61e538447bb12b6aa08f3a98b66ff57aee856c2eb1a5472d521f35d07a86a62dd97a1 SHA512 854322ffd16b4002d5ddaa9f417bb2b27e791a417fa41a5e75276c98aed9ad8e1317830c65445f6a9c1f3851589dab0d1950a0b06efade40c743bd976a20ca1c
 DIST anyio-4.7.0.tar.gz 177076 BLAKE2B 80d05e2c37b05491f39a9ad4110dc5f8e08a8c75486a71596668b0f073a7cb2ce2bdce07f1dce5854d6b0e748337d709e1c7614beb84348fccbdfc0b975894a5 SHA512 b8b34aac61a2835847b974c7cb06066714ac5a4b76437fa969265c81601ad5259f7a118901b0e8a519e1c256f23594bb4d7042d3cf4fda03feb50052512a192e
+DIST anyio-4.8.0.tar.gz 181126 BLAKE2B f33df2d5df27ff05d553544e1c4f351fa20d6f551d23b80d5f0beaa658c145c7b13d7d7da1c4c3c17e97ecfc595b3662dbc1c7bedbbda7471d1004090599c557 SHA512 939ae76eff4c91979f1ce2bdf3ef1f05f488931e7ae357632090855125656721099732a9a1e167755677757c2125287842e49fce19302f90615bd79b41cc9e67
diff --git a/dev-python/anyio/anyio-4.6.0.ebuild b/dev-python/anyio/anyio-4.6.0.ebuild
deleted file mode 100644
index 07e1a47c5d38..000000000000
--- a/dev-python/anyio/anyio-4.6.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
-HOMEPAGE="
-	https://github.com/agronholm/anyio/
-	https://pypi.org/project/anyio/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# On amd64, let's get more test coverage by dragging in uvloop, but let's
-# not bother on other arches where uvloop may not be supported.
-BDEPEND="
-	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/exceptiongroup-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/trio-0.26.1[${PYTHON_USEDEP}]
-		' 3.{10..13})
-		amd64? (
-			$(python_gen_cond_dep '
-				>=dev-python/uvloop-0.21.0_beta1[${PYTHON_USEDEP}]
-			' python3_{10..13})
-		)
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	'>=dev-python/sphinx-rtd-theme-1.2.2' \
-	dev-python/sphinxcontrib-jquery \
-	dev-python/sphinx-autodoc-typehints
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires link-local IPv6 interface
-		tests/test_sockets.py::TestTCPListener::test_bind_link_local
-	)
-
-	local filter=()
-	if ! has_version ">=dev-python/trio-0.26.1[${PYTHON_USEDEP}]"; then
-		filter+=( -k "not trio" )
-		EPYTEST_DESELECT+=(
-			tests/test_pytest_plugin.py::test_plugin
-			tests/test_pytest_plugin.py::test_autouse_async_fixture
-			tests/test_pytest_plugin.py::test_cancel_scope_in_asyncgen_fixture
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m 'not network' "${filter[@]}"
-}
diff --git a/dev-python/anyio/anyio-4.6.2.ebuild b/dev-python/anyio/anyio-4.6.2.ebuild
deleted file mode 100644
index c31d6419dd16..000000000000
--- a/dev-python/anyio/anyio-4.6.2.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
-HOMEPAGE="
-	https://github.com/agronholm/anyio/
-	https://pypi.org/project/anyio/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
-	>=dev-python/truststore-0.9.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# On amd64, let's get more test coverage by dragging in uvloop, but let's
-# not bother on other arches where uvloop may not be supported.
-BDEPEND="
-	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/exceptiongroup-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/trio-0.26.1[${PYTHON_USEDEP}]
-		' 3.{10..13})
-		amd64? (
-			$(python_gen_cond_dep '
-				>=dev-python/uvloop-0.21.0_beta1[${PYTHON_USEDEP}]
-			' python3_{10..13})
-		)
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	'>=dev-python/sphinx-rtd-theme-1.2.2' \
-	dev-python/sphinxcontrib-jquery \
-	dev-python/sphinx-autodoc-typehints
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires link-local IPv6 interface
-		tests/test_sockets.py::TestTCPListener::test_bind_link_local
-	)
-
-	local filter=()
-	if ! has_version ">=dev-python/trio-0.26.1[${PYTHON_USEDEP}]"; then
-		filter+=( -k "not trio" )
-		EPYTEST_DESELECT+=(
-			tests/test_pytest_plugin.py::test_plugin
-			tests/test_pytest_plugin.py::test_autouse_async_fixture
-			tests/test_pytest_plugin.py::test_cancel_scope_in_asyncgen_fixture
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m 'not network' "${filter[@]}"
-}
diff --git a/dev-python/anyio/anyio-4.6.2_p1.ebuild b/dev-python/anyio/anyio-4.6.2_p1.ebuild
deleted file mode 100644
index 1425e24ea378..000000000000
--- a/dev-python/anyio/anyio-4.6.2_p1.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
-HOMEPAGE="
-	https://github.com/agronholm/anyio/
-	https://pypi.org/project/anyio/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
-	>=dev-python/truststore-0.9.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# On amd64, let's get more test coverage by dragging in uvloop, but let's
-# not bother on other arches where uvloop may not be supported.
-BDEPEND="
-	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/exceptiongroup-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/trio-0.26.1[${PYTHON_USEDEP}]
-		' 3.{10..13})
-		amd64? (
-			$(python_gen_cond_dep '
-				>=dev-python/uvloop-0.21.0_beta1[${PYTHON_USEDEP}]
-			' python3_{10..13})
-		)
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	'>=dev-python/sphinx-rtd-theme-1.2.2' \
-	dev-python/sphinxcontrib-jquery \
-	dev-python/sphinx-autodoc-typehints
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires link-local IPv6 interface
-		tests/test_sockets.py::TestTCPListener::test_bind_link_local
-	)
-
-	local filter=()
-	if ! has_version ">=dev-python/trio-0.26.1[${PYTHON_USEDEP}]"; then
-		filter+=( -k "not trio" )
-		EPYTEST_DESELECT+=(
-			tests/test_pytest_plugin.py::test_plugin
-			tests/test_pytest_plugin.py::test_autouse_async_fixture
-			tests/test_pytest_plugin.py::test_cancel_scope_in_asyncgen_fixture
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m 'not network' "${filter[@]}"
-}
diff --git a/dev-python/anyio/anyio-4.7.0.ebuild b/dev-python/anyio/anyio-4.7.0.ebuild
index 73ce3bb37357..6f6da42a4cc7 100644
--- a/dev-python/anyio/anyio-4.7.0.ebuild
+++ b/dev-python/anyio/anyio-4.7.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
diff --git a/dev-python/anyio/anyio-4.8.0.ebuild b/dev-python/anyio/anyio-4.8.0.ebuild
new file mode 100644
index 000000000000..c869787273af
--- /dev/null
+++ b/dev-python/anyio/anyio-4.8.0.ebuild
@@ -0,0 +1,74 @@
+# 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="Compatibility layer for multiple asynchronous event loop implementations"
+HOMEPAGE="
+	https://github.com/agronholm/anyio/
+	https://pypi.org/project/anyio/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
+	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
+	>=dev-python/truststore-0.9.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.5[${PYTHON_USEDEP}]
+	' 3.10)
+"
+# On amd64, let's get more test coverage by dragging in uvloop, but let's
+# not bother on other arches where uvloop may not be supported.
+BDEPEND="
+	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/exceptiongroup-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
+		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/trio-0.26.1[${PYTHON_USEDEP}]
+		' 3.{10..13})
+		amd64? (
+			$(python_gen_cond_dep '
+				>=dev-python/uvloop-0.21.0_beta1[${PYTHON_USEDEP}]
+			' python3_{10..13})
+		)
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	'>=dev-python/sphinx-rtd-theme-1.2.2' \
+	dev-python/sphinxcontrib-jquery \
+	dev-python/sphinx-autodoc-typehints
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires link-local IPv6 interface
+		tests/test_sockets.py::TestTCPListener::test_bind_link_local
+	)
+
+	local filter=()
+	if ! has_version ">=dev-python/trio-0.26.1[${PYTHON_USEDEP}]"; then
+		filter+=( -k "not trio" )
+		EPYTEST_DESELECT+=(
+			tests/test_pytest_plugin.py::test_plugin
+			tests/test_pytest_plugin.py::test_autouse_async_fixture
+			tests/test_pytest_plugin.py::test_cancel_scope_in_asyncgen_fixture
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -m 'not network' "${filter[@]}"
+}
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index 86febf789a1a..341981f1ab13 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -1,2 +1,3 @@
 DIST apispec-6.7.1.tar.gz 76714 BLAKE2B ced24f5d455d02a64bbcd098d892bf5f37275eb6cc3ea445b97f89b8e21d0446ae069e1086cdd9c833135931fa3ddf0694eddf10fbbbd81986a59c79f4faf42c SHA512 97a0800f95301b249c57b05560ef45912462c3754f1923530bdfbbbd5e6968f2b1a8174470a5fdb06368d8541a6ef2c76e4964e98cfb47eea0715e1e7abaac7f
 DIST apispec-6.8.0.tar.gz 76919 BLAKE2B c97f9a87175755c517a22ebbe66c1fb058b89f370a89f09af1007664519d95cf5938e1b699062f9b7f643bc3263a2055487996f759e0e64e2e2038d36e552525 SHA512 ad8b155dcc373f2423153a4b17d3b446a188e8835ea971496818a93bea098b641a3663dc75b6cd8b92a92de607ddc64fb9b13ad10356e6eeb05e4ff9918e9ecf
+DIST apispec-6.8.1.tar.gz 77050 BLAKE2B 394714c23721a18cf205c9f705bebbfa34d508d333e34cd89bab7e4fbd0f61d1427f55d94425135dbbd9a4b6eff1b313bea156ca29eccbc21865787e296ada6c SHA512 db6e92ce765ae8a7cb0dafe2b6bdcf47ff4849f7d11b344526640d3536ff5251b644bb49f9385dafea339eeb59072fc08094b309f4092080fcf9ec582071fc9d
diff --git a/dev-python/apispec/apispec-6.8.1.ebuild b/dev-python/apispec/apispec-6.8.1.ebuild
new file mode 100644
index 000000000000..337253ee2b06
--- /dev/null
+++ b/dev-python/apispec/apispec-6.8.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A pluggable API specification generator"
+HOMEPAGE="
+	https://github.com/marshmallow-code/apispec/
+	https://pypi.org/project/apispec/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		>=dev-python/marshmallow-3.18.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/sphinx-rtd-theme
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires unpackaged prance
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/apprise/Manifest b/dev-python/apprise/Manifest
index 4af44c7b1f60..b313c10b1d6f 100644
--- a/dev-python/apprise/Manifest
+++ b/dev-python/apprise/Manifest
@@ -1,2 +1,2 @@
-DIST apprise-1.9.0.tar.gz 1753505 BLAKE2B 83dda79cb585387ba3fa0405126274c35bee20e40a91e699441f56341f411e16dd62ff73115e6cde42e0184afffcaa4cb0783e082d0b2c1ed59a58839cfe9c73 SHA512 9b1ebc18f1662cea35186ddf28182e5507d7faf6e13770a4d6448f129c9d4659665ddf502e0cc7e6bd2e67cda41ee94cd0898f53b986af0daae5f905ccdab2eb
 DIST apprise-1.9.1.tar.gz 1778862 BLAKE2B 5c2d919e7d2f105f0636de6495a7ab450551e6cb2fb806f6f28e8f0bc1370c88e1ed0f55bc350a9828def787a43694bc519020ab522c06b70b648e4aefc187dc SHA512 02b96e6bf88858631d62fef7215d25b383015e916f8031fa01c30a44bb15ff6afd9eb8198e99ce107072f2802db25f5abfa033bb2e9752f559b4c6c40f99ac80
+DIST apprise-1.9.2.tar.gz 1779362 BLAKE2B 903cd3fdabb4c00348687de447adcc30dfcb8cfee797e9a661b6278ea249b5c03baba701a0716d5d9efca5e77ed3b4ff05a7aa136ec54d2ebfb7a8ef47ba76c6 SHA512 57316bcce6de3ce6dbe19eee6a8bebfa8a3e10066054c47f3225c4fed397762c749939b29d2eb86460698662d125f97898551004d1e02886b31a0c46d41e7875
diff --git a/dev-python/apprise/apprise-1.9.0.ebuild b/dev-python/apprise/apprise-1.9.0.ebuild
deleted file mode 100644
index a12c883f9558..000000000000
--- a/dev-python/apprise/apprise-1.9.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Push Notifications that work with just about every platform"
-HOMEPAGE="
-	https://pypi.org/project/apprise/
-	https://github.com/caronc/apprise/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv"
-IUSE="+dbus mqtt"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	mqtt? ( dev-python/paho-mqtt[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	dev-python/babel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/apprise/apprise-1.9.1.ebuild b/dev-python/apprise/apprise-1.9.1.ebuild
index ff298c31cd7b..c50362bf5bff 100644
--- a/dev-python/apprise/apprise-1.9.1.ebuild
+++ b/dev-python/apprise/apprise-1.9.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv"
 IUSE="+dbus mqtt"
 
 RDEPEND="
diff --git a/dev-python/apprise/apprise-1.9.2.ebuild b/dev-python/apprise/apprise-1.9.2.ebuild
new file mode 100644
index 000000000000..8094a0d6fd60
--- /dev/null
+++ b/dev-python/apprise/apprise-1.9.2.ebuild
@@ -0,0 +1,38 @@
+# 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="Push Notifications that work with just about every platform"
+HOMEPAGE="
+	https://pypi.org/project/apprise/
+	https://github.com/caronc/apprise/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+IUSE="+dbus mqtt"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	mqtt? ( dev-python/paho-mqtt[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	dev-python/babel[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index ea2de4a0fa92..324b8cea1b06 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,4 +1 @@
-DIST apsw-3.46.1.0.gh.tar.gz 913223 BLAKE2B c0ad61e61a97471ef677ffe80f3f91e6520c95f8cece225a8086884f34de497714892e4ce0ca375f2ec66f48b8ecb4d38dd5ebdb57cd94050ef5eaee20d5d3ee SHA512 3cd81ceab03dadf10d9c10d645d33b962ba9ec55075bb193eb076f458dde11d5c5c6ec087ec31fc96d011ca1b339a9ffe07cb5d660b8205f6f156baaa0b18c81
-DIST apsw-3.47.0.0.gh.tar.gz 1633544 BLAKE2B a84634948c760cc8e8d6be83b1667ff86c973a1e8c52172d5f91852d42fd25189b367357f0eb0cb3b7b3868b21553e5258427da0958b5c117e05e55c3496a2b6 SHA512 4b90c7f13dbed9015ce1b7215c9dd6d8889433917e123bfac642f271dfec1d8be929b41fa530e867ec4f068a8c4fc337a82043811e8afcb707b187a46db7e176
-DIST apsw-3.47.1.0.gh.tar.gz 1647701 BLAKE2B b40fe83b86ce618234876eb5fad4ae7558d9d360913b7eada60e7ddb2057882cca1c491d8f5893727186b9efe27217f160d0ddf49cda7e547f223fbe63092720 SHA512 520434f89cf3ea317ed2cb9d1746f358d9da4cf136ffe3c8fbf19e27698f8a01ad3d56a90c758c5d7d77e7662fe44898d63f6b2f1c438861054d141dff12128f
 DIST apsw-3.47.2.0.zip 2428145 BLAKE2B 12ece7d7854a729510b2e18d3285fc49135b3cbb3480567a0c6879c98d48b2d49bc75f4cb46af738c4a565cc6c29f7cd5d35fd2c6ea5fe1814e8048030f966fb SHA512 9884f36811bfff7276642841ebaa198669c48f4d54bb764a985ea5bdd88f9f630f9fd8a13cf0a44b5675e374c2a911fcec579ca4165622e8049bff327ef66c1d
diff --git a/dev-python/apsw/apsw-3.46.1.0.ebuild b/dev-python/apsw/apsw-3.46.1.0.ebuild
deleted file mode 100644
index ebff5eb704f6..000000000000
--- a/dev-python/apsw/apsw-3.46.1.0.ebuild
+++ /dev/null
@@ -1,51 +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=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="
-	https://github.com/rogerbinns/apsw/
-	https://pypi.org/project/apsw/
-"
-SRC_URI="
-	https://github.com/rogerbinns/apsw/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="doc"
-
-DEPEND="
-	>=dev-db/sqlite-${PV%.*}:3
-"
-RDEPEND="
-	${DEPEND}
-"
-
-src_configure() {
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		enable=load_extension
-		use_system_sqlite_config=True
-	EOF
-}
-
-python_test() {
-	esetup.py build_test_extension
-	cd "${T}" || die
-	"${EPYTHON}" -m apsw.tests -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/apsw/apsw-3.47.0.0.ebuild b/dev-python/apsw/apsw-3.47.0.0.ebuild
deleted file mode 100644
index 7b49484a85a9..000000000000
--- a/dev-python/apsw/apsw-3.47.0.0.ebuild
+++ /dev/null
@@ -1,51 +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=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="
-	https://github.com/rogerbinns/apsw/
-	https://pypi.org/project/apsw/
-"
-SRC_URI="
-	https://github.com/rogerbinns/apsw/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="doc"
-
-DEPEND="
-	>=dev-db/sqlite-${PV%.*}:3
-"
-RDEPEND="
-	${DEPEND}
-"
-
-src_configure() {
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		enable=load_extension
-		use_system_sqlite_config=True
-	EOF
-}
-
-python_test() {
-	esetup.py build_test_extension
-	cd "${T}" || die
-	"${EPYTHON}" -m apsw.tests -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/apsw/apsw-3.47.1.0.ebuild b/dev-python/apsw/apsw-3.47.1.0.ebuild
deleted file mode 100644
index 7b49484a85a9..000000000000
--- a/dev-python/apsw/apsw-3.47.1.0.ebuild
+++ /dev/null
@@ -1,51 +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=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="
-	https://github.com/rogerbinns/apsw/
-	https://pypi.org/project/apsw/
-"
-SRC_URI="
-	https://github.com/rogerbinns/apsw/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="doc"
-
-DEPEND="
-	>=dev-db/sqlite-${PV%.*}:3
-"
-RDEPEND="
-	${DEPEND}
-"
-
-src_configure() {
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		enable=load_extension
-		use_system_sqlite_config=True
-	EOF
-}
-
-python_test() {
-	esetup.py build_test_extension
-	cd "${T}" || die
-	"${EPYTHON}" -m apsw.tests -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/apsw/apsw-3.47.2.0.ebuild b/dev-python/apsw/apsw-3.47.2.0.ebuild
index 0feaa2defca6..01e6eca5bd6b 100644
--- a/dev-python/apsw/apsw-3.47.2.0.ebuild
+++ b/dev-python/apsw/apsw-3.47.2.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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index d2fcabd3cd24..115992703cb9 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,2 +1 @@
-DIST argcomplete-3.5.2.tar.gz 82341 BLAKE2B ddc118d562a742bda9f552c62f9b873010c7d660267d606a46ae98453384bf2c9ebc90b5fdaee675f65cf9a9c27a8d5fcc2484e9a54d83d6ac0e51f67ef60766 SHA512 6c852b8cf81d0dc174c8053b5d8310fe716d8491380e7d98018c5788d83a4c01167963d6e713b30db892090e7140e19be092d35f2c8137292ed48c98fd835e8e
 DIST argcomplete-3.5.3.tar.gz 72999 BLAKE2B a31ff9ff63fbbca0b132948b6cd0c126e355eadecc1b84004d6bde90ac5f5d010d492e6addc2e926caa9ac8323e6fa9b6e0c41ee48ecd0695da50c56bd9ee5b3 SHA512 f22319ad0a37570a33ad9b674ba51af50e1a21ddd21950778a6804ee62e08352cdfb73387116f6669525a7b7582a567bda06d3b63084edcabea31b4235cb7624
diff --git a/dev-python/argcomplete/argcomplete-3.5.2.ebuild b/dev-python/argcomplete/argcomplete-3.5.2.ebuild
deleted file mode 100644
index f1c6c5d8df9f..000000000000
--- a/dev-python/argcomplete/argcomplete-3.5.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="
-	https://github.com/kislyuk/argcomplete/
-	https://pypi.org/project/argcomplete/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# pip is called as an external tool
-BDEPEND="
-	test? (
-		app-shells/fish
-		app-shells/tcsh
-		app-shells/zsh
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pip-19
-	)
-"
-
-PATCHES=(
-	# increase test timeouts -- this is particularly necessary
-	# for entry point tests because they read metadata of all installed
-	# packages which can take real long on systems with lots of packages
-	"${FILESDIR}/argcomplete-3.1.6-timeout.patch"
-)
-
-python_test() {
-	"${EPYTHON}" test/test.py -v || die
-}
diff --git a/dev-python/argcomplete/argcomplete-3.5.3.ebuild b/dev-python/argcomplete/argcomplete-3.5.3.ebuild
index dd35ffbe1ba3..86e64ddd6466 100644
--- a/dev-python/argcomplete/argcomplete-3.5.3.ebuild
+++ b/dev-python/argcomplete/argcomplete-3.5.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/asteval/Manifest b/dev-python/asteval/Manifest
index 54d188d27705..4aa61c6de08f 100644
--- a/dev-python/asteval/Manifest
+++ b/dev-python/asteval/Manifest
@@ -1,2 +1,3 @@
 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
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/astroid/Manifest b/dev-python/astroid/Manifest
index c082aedbebf1..707709d23497 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,3 +1 @@
-DIST astroid-3.3.6.gh.tar.gz 466233 BLAKE2B 6b8bebeb7f56009d6ea7749f911a309e6cd2a0a7bac7ade1ea91ca74bc157f048c3652a50321a72c961670cb8dcc8f584bd39ef8a2d82408b4be27c8efcbdb58 SHA512 7ed2900cdf563cb761596cb816452e64be131c34d7ea7eedb27a5ceac4e588c3c675deba72bee17557c408c019e489c6f1e86772bdc235e2f1b048239b76c993
-DIST astroid-3.3.7.gh.tar.gz 466979 BLAKE2B 1f6abc37d1fd35eafc3bd6cebdc7611259cb6e77ff4c447d108ce1d88fa723a867c82eab2a93b9095bee033745a2fe3e81441e940d9c7b82910d5d04c75c334c SHA512 1debf08f1707714ac23e024632a0f686020fe7e46fdd9e417586923b7ff5b393d2e106e6145b7580c8ffece728f3228d52f71ca0b52adbd8ad1c40102fc72bc8
 DIST astroid-3.3.8.gh.tar.gz 467093 BLAKE2B 0f019e8569d7fff96d0c6e4025312d03ec518a3d7014b35bd381989d88b4ed4bb4c796597cbf6ee892ea25c03eeb9159e1f40791f20f9a27a0f8c2578d565a0c SHA512 b788815d07d6a9f5796a4e5d1c1d1df5ad9786c43b82c9f10719097bad01881c394352aaeada3171bfaf8fa72f1542efb1f75b88b8ea9164f96f4946654d00c6
diff --git a/dev-python/astroid/astroid-3.3.6.ebuild b/dev-python/astroid/astroid-3.3.6.ebuild
deleted file mode 100644
index 8e973999aca6..000000000000
--- a/dev-python/astroid/astroid-3.3.6.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/pylint-dev/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/pylint-dev/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# dev-python/regex isn't available for pypy
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/regex[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why they're broken
-		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# pydantic-2?
-		tests/brain/test_dataclasses.py::test_pydantic_field
-		# requires urllib3 with bundled six (skipped with urllib3>=2)
-		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
-		# hangs
-		tests/test_nodes.py::AsStringTest::test_recursion_error_trapped
-		# TODO
-		tests/test_builder.py::BuilderTest::test_data_build_error_filename
-		# numpy-2 (https://github.com/pylint-dev/astroid/issues/2442)
-		tests/brain/numpy/test_core_einsumfunc.py::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_fromnumeric.py::BrainNumpyCoreFromNumericTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_multiarray.py::BrainNumpyCoreMultiarrayTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_datetime_astype_return
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_generic_types_are_subscriptables
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type_tuple
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_transforms.py::TestTransforms::test_transform_aborted_if_recursion_limited
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# changes in py3.13.0b4
-				# https://github.com/pylint-dev/astroid/issues/2478
-				tests/test_nodes.py::AsStringTest::test_f_strings
-				tests/test_nodes_lineno.py::TestLinenoColOffset::test_end_lineno_string
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/astroid/astroid-3.3.7.ebuild b/dev-python/astroid/astroid-3.3.7.ebuild
deleted file mode 100644
index adfa5e854419..000000000000
--- a/dev-python/astroid/astroid-3.3.7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/pylint-dev/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/pylint-dev/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# dev-python/regex isn't available for pypy
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/regex[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why they're broken
-		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# pydantic-2?
-		tests/brain/test_dataclasses.py::test_pydantic_field
-		# requires urllib3 with bundled six (skipped with urllib3>=2)
-		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
-		# hangs
-		tests/test_nodes.py::AsStringTest::test_recursion_error_trapped
-		# TODO
-		tests/test_builder.py::BuilderTest::test_data_build_error_filename
-		# numpy-2 (https://github.com/pylint-dev/astroid/issues/2442)
-		tests/brain/numpy/test_core_einsumfunc.py::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_fromnumeric.py::BrainNumpyCoreFromNumericTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_multiarray.py::BrainNumpyCoreMultiarrayTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_datetime_astype_return
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_generic_types_are_subscriptables
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type_tuple
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_transforms.py::TestTransforms::test_transform_aborted_if_recursion_limited
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# changes in py3.13.0b4
-				# https://github.com/pylint-dev/astroid/issues/2478
-				tests/test_nodes.py::AsStringTest::test_f_strings
-				tests/test_nodes_lineno.py::TestLinenoColOffset::test_end_lineno_string
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/astroid/astroid-3.3.8.ebuild b/dev-python/astroid/astroid-3.3.8.ebuild
index adfa5e854419..528cca0ef320 100644
--- a/dev-python/astroid/astroid-3.3.8.ebuild
+++ b/dev-python/astroid/astroid-3.3.8.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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Version specified in pyproject.toml
 RDEPEND="
diff --git a/dev-python/asttokens/Manifest b/dev-python/asttokens/Manifest
index 2017432de27f..d3c75d70446f 100644
--- a/dev-python/asttokens/Manifest
+++ b/dev-python/asttokens/Manifest
@@ -1,2 +1 @@
-DIST asttokens-2.4.1.gh.tar.gz 57358 BLAKE2B dff2bdbbb62ed0c99f620284e4ad4abe418c315356caee26988ed7722a9aec77be4fe79b877e350cf632e076cd7c421f6ec824e7ffdda1d6684b03fffb15e7b2 SHA512 62263e50e14953e98236cdcbd75121ff5f6a3dc949170412a97f17af9b2572415373971d2286c4821b03249404b5a4c53ef5c7f1ec37aa9e2bf4a743d16de1da
 DIST asttokens-3.0.0.gh.tar.gz 56937 BLAKE2B 38b3c9271ba57c032f552cb6dedd2cd2ef2eb6294b2f5e2fde4821260b73453495576b6641fa9450bd86f08ed4a296e010a5ce5f0f3502cbeb27857e1792802f SHA512 9d0f78ee90758d52fd15ee2f1940ddc14e8fc0d15e83fb01e731c6b79e328510f6c588c7856935aed99017b98f1daa99ee25802964990d59f63c62a0a5646804
diff --git a/dev-python/asttokens/asttokens-2.4.1.ebuild b/dev-python/asttokens/asttokens-2.4.1.ebuild
deleted file mode 100644
index 32f02bb81aa8..000000000000
--- a/dev-python/asttokens/asttokens-2.4.1.ebuild
+++ /dev/null
@@ -1,52 +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=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Annotate Python AST trees with source text and token information"
-HOMEPAGE="
-	https://github.com/gristlabs/asttokens/
-	https://pypi.org/project/asttokens/
-"
-SRC_URI="
-	https://github.com/gristlabs/asttokens/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/astroid[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# already skipped in git
-				tests/test_tokenless.py::TestFstringPositionsWork::test_fstring_positions_work
-			)
-			;;
-	esac
-
-	epytest
-}
diff --git a/dev-python/asttokens/asttokens-3.0.0.ebuild b/dev-python/asttokens/asttokens-3.0.0.ebuild
index 035310192e6e..0284f00e0daf 100644
--- a/dev-python/asttokens/asttokens-3.0.0.ebuild
+++ b/dev-python/asttokens/asttokens-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index e1277c2e9097..c32c610f3d58 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,2 +1 @@
-DIST attrs-24.2.0.tar.gz 792678 BLAKE2B f5110f5bf4b848a929a3766985fc49ee8da346398c26d0f786a12d89e7596ec7165bdefaae4b2716003c4b3ad7fcc619ec2f5e0d184df899318a7bb02c9919a4 SHA512 fcd14ff79a09a0b2b56734c460b5c43836999b6ed27665038ff7a146f53891b31ab3da07df05f1686474507f342bfce09bc0a6a60865c241e58f7ce8423dc968
 DIST attrs-24.3.0.tar.gz 805984 BLAKE2B 634b89958d0af8e420aa4abd12db6e575ad73c88e29ff5a056bd1be372125dce3799da56481473a485c07715083fa460fe07cbeaf94df3f558ad16afe143af71 SHA512 9974c1510e78887aedae51813d2edcbb5210de302360c1b0e8cd64265b32acae65e633d61d936aaf8541f79180b9e61e1a9e2a88ac09f8ef29423afb340db8ef
diff --git a/dev-python/attrs/attrs-24.2.0.ebuild b/dev-python/attrs/attrs-24.2.0.ebuild
deleted file mode 100644
index 62b29caea049..000000000000
--- a/dev-python/attrs/attrs-24.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Attributes without boilerplate"
-HOMEPAGE="
-	https://github.com/python-attrs/attrs/
-	https://attrs.readthedocs.io/
-	https://pypi.org/project/attrs/
-"
-
-LICENSE="MIT"
-SLOT="0"
-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="
-	>=dev-python/hatch-fancy-pypi-readme-23.2.0[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/cloudpickle[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/zope-interface[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/attrs/attrs-24.3.0-r1.ebuild b/dev-python/attrs/attrs-24.3.0-r1.ebuild
new file mode 100644
index 000000000000..e4da2f978f91
--- /dev/null
+++ b/dev-python/attrs/attrs-24.3.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Attributes without boilerplate"
+HOMEPAGE="
+	https://github.com/python-attrs/attrs/
+	https://attrs.readthedocs.io/
+	https://pypi.org/project/attrs/
+"
+
+LICENSE="MIT"
+SLOT="0"
+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="
+	>=dev-python/hatchling-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/hatch-fancy-pypi-readme-23.2.0[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/cloudpickle[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/zope-interface[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/attrs/attrs-24.3.0.ebuild b/dev-python/attrs/attrs-24.3.0.ebuild
deleted file mode 100644
index f1dd9fbe35f2..000000000000
--- a/dev-python/attrs/attrs-24.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Attributes without boilerplate"
-HOMEPAGE="
-	https://github.com/python-attrs/attrs/
-	https://attrs.readthedocs.io/
-	https://pypi.org/project/attrs/
-"
-
-LICENSE="MIT"
-SLOT="0"
-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="
-	>=dev-python/hatch-fancy-pypi-readme-23.2.0[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/cloudpickle[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/zope-interface[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index 0aef665d4b91..4b1ad2944db2 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1 +1,2 @@
 DIST autopep8-2.3.1.tar.gz 92064 BLAKE2B 735abcd2e9a5cfc2783dbe3f25a46e841ab71575e3e22f75750a4c1a49a8ca1676723af76785b37f0f95aa8ebe798214be5e89964673dd3dcc767db1c850f87e SHA512 27751ea37d3067efb693acf4872b9e15f1815f1d4116d73b504d491382e4e54337afaef4a1f171979d4cc737b0014e8ebfbc0d34fe02255c39c6b5b09c263067
+DIST autopep8-2.3.2.tar.gz 92210 BLAKE2B f2bed11c2667667c260564637ecb9122cc70692b4c8c8ce00bda75994f9fdd05452cf23d3f321ccde8c827caebb60c938f160ddd40348c875f2f818614e156d4 SHA512 1fc897feec093e7e945b10bbd3cbbef5a83c4ec7d86215fb9643434d80a14ff54bf613dbb9dd0acacc9706ac35e8f0486ef643ae49da040471965d41fdd03cc4
diff --git a/dev-python/autopep8/autopep8-2.3.2.ebuild b/dev-python/autopep8/autopep8-2.3.2.ebuild
new file mode 100644
index 000000000000..e0bfdfe3db7a
--- /dev/null
+++ b/dev-python/autopep8/autopep8-2.3.2.ebuild
@@ -0,0 +1,29 @@
+# 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} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
+HOMEPAGE="
+	https://github.com/hhatto/autopep8/
+	https://pypi.org/project/autopep8/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/pycodestyle-2.12.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index dc861eadf068..1af0b02ee66b 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1,2 +1,2 @@
-DIST bandit-1.7.10.tar.gz 4228540 BLAKE2B ca1fdbd5061a635520500cb583b739d19335920eeb89661c7ddf2a2c3a97d3c55c2ce7797be984dd1dba2613a38d6b2e0bbcfde655f9d4ed76582ce831e4b42e SHA512 c9c5d098186a23f856f4bdecdebfe863f7ddce8627608b80c62a537416d2aa91666a95c304f5cdde43ff1a41e1f6a58b30dce1042159a1ea74b8b5c9a8ee381a
 DIST bandit-1.8.0.tar.gz 4228600 BLAKE2B 136357ae96a4eca96c1e49a603727b8c160dc79b8fc98ab12ae927e2f613308c51fb11250145e091ff0fae022957eb0fd1eff93f1836fe02a22930e8eadbe600 SHA512 c2a6056a7c9cd17f58da34b978d69161da4873a485a44f1fca2824e79f3b18283e0691c3a632a766a9377a2bca4a2e926d13b7b7656fdc3c5362468e78b18e36
+DIST bandit-1.8.2.tar.gz 4228832 BLAKE2B 71539701adee94e12c168aed5ec51a5772e6e7f91440e41e51a998ac1665a42a5a4d7e9b155f4411e3723efd7a46a44283c0f58569c78c3c090faf26561eb902 SHA512 b4202d208cc05186e80a36c704156827400c79510a9e1ac640b3bdb9926dd57f772e635755ed399b892f559171f5340207f8ea1af92ee2374d7a27c1234e2e70
diff --git a/dev-python/bandit/bandit-1.7.10.ebuild b/dev-python/bandit/bandit-1.7.10.ebuild
deleted file mode 100644
index eff3a92d7f6f..000000000000
--- a/dev-python/bandit/bandit-1.7.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A security linter from OpenStack Security"
-HOMEPAGE="
-	https://github.com/PyCQA/bandit/
-	https://pypi.org/project/bandit/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/gitpython-3.1.30[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/beautifulsoup4-4.8.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.9.4[${PYTHON_USEDEP}]
-		>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/bandit/bandit-1.8.0.ebuild b/dev-python/bandit/bandit-1.8.0.ebuild
index eff3a92d7f6f..82c244d8b355 100644
--- a/dev-python/bandit/bandit-1.8.0.ebuild
+++ b/dev-python/bandit/bandit-1.8.0.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..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/bandit/bandit-1.8.2.ebuild b/dev-python/bandit/bandit-1.8.2.ebuild
new file mode 100644
index 000000000000..206df6bf30b1
--- /dev/null
+++ b/dev-python/bandit/bandit-1.8.2.ebuild
@@ -0,0 +1,44 @@
+# 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="A security linter from OpenStack Security"
+HOMEPAGE="
+	https://github.com/PyCQA/bandit/
+	https://pypi.org/project/bandit/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/gitpython-3.1.30[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/beautifulsoup4-4.8.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
+		>=dev-python/pylint-1.9.4[${PYTHON_USEDEP}]
+		>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+		' 3.10)
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/beartype/Manifest b/dev-python/beartype/Manifest
index fc2da5ef4a57..c99ac187dff8 100644
--- a/dev-python/beartype/Manifest
+++ b/dev-python/beartype/Manifest
@@ -1 +1,2 @@
 DIST beartype-0.19.0.tar.gz 1294480 BLAKE2B 7a0d2800a28af49815bf300c93081faee0e01c922497418bc7328c0968cac077a0fdfe984de66c214af610bb972a217224a6d164a2f3aac9c0a2d067c0658fc3 SHA512 9a87086736ba0d3497f3dfc3b57fdfd3ebb33812aaf58d195f1161474a553499e87d6f3f9c12bc66ab33cb3ca1697b00220828d004d568495ac743efb473c1e8
+DIST beartype-0.20.0rc0.tar.gz 1375891 BLAKE2B 96945c21f5ab8e8e86b8e16958d748fa5f47e5f1a843f35f52d9edf6a7039ecf919ff90f0f6e737d6a19b1aedcea5cb634e70df0b09c8f758569e3aac16094ce SHA512 bfb714c997455659cfd91b167b72d9f64bf81b662118b693a8a1444801a635bb24b2f6d385235524cf968792f7d07fb4f10e3c5a9835ef8bd05805d233bff307
diff --git a/dev-python/beartype/beartype-0.20.0_rc0.ebuild b/dev-python/beartype/beartype-0.20.0_rc0.ebuild
new file mode 100644
index 000000000000..59c4ca51bb05
--- /dev/null
+++ b/dev-python/beartype/beartype-0.20.0_rc0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Unbearably fast runtime type checking in pure Python"
+HOMEPAGE="
+	https://pypi.org/project/beartype/
+	https://github.com/beartype/beartype/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+BDEPEND="
+	test? (
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/mypy[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# fragile performance test
+		beartype_test/a00_unit/a70_decor/test_decorwrapper.py::test_wrapper_fail_obj_large
+		# test for building docs, apparently broken too
+		beartype_test/a90_func/z90_lib/a00_sphinx
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index 7b95eb17c1b3..370f0c740fc9 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1,2 +1 @@
-DIST bitstring-4.2.3.tar.gz 250537 BLAKE2B 81902038a0b422533b5fe863a4dc71ec7b828d55a45e9edabb632ffc4682e1bf5d5620edce69c245b877d0ee93dff474533db3d46ddd57435a7a4c0b0bd71f9a SHA512 caf53aeb746f4c132d7b91e2c0983bc96f33cb240033872e9d6fc15318f3ced2638427ccc6fc5bfbac05d221fbb4cad4791213b32f97d8a1f8d57e8841a3e176
 DIST bitstring-4.3.0.tar.gz 251408 BLAKE2B 62e4e28752758a149d8b612efcfaa67cf379e5b426034146b4163182edc5be158bc26b8ecefd0dc44c034c4b901354a3ffc372360c20d3955876667c60eeb87f SHA512 72a4b343d5035ed6f88a165466337d7b519b10bde58a91ebb001e74e81ad1eaeb03ad643958a4956ffbe012da237533eaec9bb8c18cc546030a7306172dbd826
diff --git a/dev-python/bitstring/bitstring-4.2.3.ebuild b/dev-python/bitstring/bitstring-4.2.3.ebuild
deleted file mode 100644
index a76f31f06897..000000000000
--- a/dev-python/bitstring/bitstring-4.2.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A pure Python module for creation and analysis of binary data"
-HOMEPAGE="
-	https://github.com/scott-griffiths/bitstring/
-	https://pypi.org/project/bitstring/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	<dev-python/bitarray-3[${PYTHON_USEDEP}]
-	>=dev-python/bitarray-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/gfloat-0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	tests/test_benchmarks.py
-)
diff --git a/dev-python/bitstring/bitstring-4.3.0.ebuild b/dev-python/bitstring/bitstring-4.3.0.ebuild
index a80201a27482..24e26ac67a93 100644
--- a/dev-python/bitstring/bitstring-4.3.0.ebuild
+++ b/dev-python/bitstring/bitstring-4.3.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	=dev-python/bitarray-3.0*[${PYTHON_USEDEP}]
diff --git a/dev-python/blake3/Manifest b/dev-python/blake3/Manifest
index c159b0d659c3..cf0b76d29884 100644
--- a/dev-python/blake3/Manifest
+++ b/dev-python/blake3/Manifest
@@ -1,75 +1,55 @@
-DIST arrayref-0.3.7.crate 9620 BLAKE2B 69d25ca9c15c188ca954a862f320869a448a5d8ed5765a6fc26309abb030e1d846d12800d960c8a97aa3ab422e8d2b883bd154781ed219a858e02b20cc803613 SHA512 dcf1c7de6d1d4b921e26a39cd70070bd460cd27f0a38be9099e41fc8b05fb60ba4f9aa91f92401cdcd0847bad08bffa7db4dca8d7cc84a3c8a1416d1758838ce
 DIST arrayref-0.3.9.crate 9186 BLAKE2B 8d7443944c81bf849fbb8a4e09ee379134c173decc712c6fafe483fb1545fba1f7f735979e5e26976502284502b5c7046f0b6aad59f8731a4ac8e1a51929c979 SHA512 f97e33e7fd65a8e908c21ab918350f71f12d49783162b90c5618660217b36516c39750b292a1248125f12429e4e00af9ff20c3846be81175946b8541d96ee606
-DIST arrayvec-0.7.4.crate 29856 BLAKE2B 81ffac1db340e919618351819def3880ab1ef70d0acc47d680f15298eb749bcbc3bf7944ba14159be46b1e734c91b4c0f8cbaf774fd864c17caa3c9fb1fc2e9b SHA512 91e8f70330c515c966d78ae235e890594f9607381ac738a2c3586b53f01411e98d1687494f39ccc365948ae60497df3dfb2be18e26ab7e69bc0966b6c250e1ac
 DIST arrayvec-0.7.6.crate 31237 BLAKE2B b9d1df7e3ec47d434a2606fe9540e37e02351873b376a4e113b54461288e9ab20e02285eed5c4bc0f052ec4d6b3c804044413490ea706c31a852624b03bde7bb SHA512 b1f320746018a7f32340a833420089446ec5cefb7f299b4506eab7423d5db49f00b72d8aa8c6600f9159b9480d5eb3ce69407d93f5c9934147860c83e4d6eca8
-DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST autocfg-1.4.0.crate 17712 BLAKE2B 7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6 SHA512 3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c
-DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST blake3-1.5.0.crate 168914 BLAKE2B 72d1851f3cbe5c996570f5cf0cb4ab8c4215ac0e95a6b930dd64ff650333a8745ad1b63a2f988227d66a096cafc59777aeec8e63c05a22d666c1bdd58acaa320 SHA512 39c4d3d370bede96b3f4e37c44514dddfd1ef91d178116e1556eb8f3e2687b705e2320f842e600e59229198aeffff4ab1de34eaf59e8a3c039003f13d0f08aab
 DIST blake3-1.5.5.crate 181134 BLAKE2B 0195efa92e121dfa22abf56e72daef664f00c36eac9839543a4ea27351be6393d2edae6cfa2f9442a7b6e268bd2fbc76ea718d5d939940097b0e0f9e0c29405c SHA512 93dcfbb3e1236534beaeeedfde2aac7a13c83bdf9f0e85352e8920706df41fbf042fcfafd3726f2a23450d4ac77caa3fc7da3d26abb1477137dc00ad35f543c5
-DIST blake3-py-0.4.1.gh.tar.gz 116080 BLAKE2B 9fd2db2a573182ec4bab9d6e37750f4afff9b200e2bb9fe4c26e6bfde328ad2aab162d2adcadc312f3e007ddca19d92c73e058466caddf6c7aa7fc10b553f51a SHA512 e166d2d6ac52dac4158e7b494e83398afd692cb8b93951809338f8da26d337506e3ce2bf37528da6960cfab9b6e3f229a2b5e845dd9a83b35028249113869112
 DIST blake3-py-1.0.0.gh.tar.gz 113868 BLAKE2B 5b2b7ddea81cb9080a9db18b4262ec7b1e922454cb9fafe08a24d36721ddbc551093431f9b908e9453c8a72be4dffbaf47815c7dbe3178ec8fe3336db90b2d4c SHA512 fecef1d92b1fa209fe24bc94aa1f3bb83a5896f0615f62f99811b7cdf45099a5b7e9be35355174fc49721e72b6ec594719e4cfc01bb89b7534aa594acbdbfc54
-DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7
+DIST blake3-py-1.0.1.gh.tar.gz 114051 BLAKE2B 4ff842d91d64237b030d7fa9e5b6efefb8d0a78c846bb78fa2a5075da5a969a7aec98edf4b5d1bbba0276f5d6d4021f85a9f54af66c54f6c0ce0d643b3aefcb5 SHA512 54d2b0b3aef48dfde6f15d3cfb7a4ebd4549ca8bedbb8b4a95fc882e4a08ed1beb1ad53f62042f0de3792fa1a9177f287e6c8f6c65aa4e7414210549bc67ec77
+DIST blake3-py-1.0.2.gh.tar.gz 114126 BLAKE2B 03aa71de8fa1b48d40635a1ad2a3890e94b3b7209705e3c617cb50cf6d73da46278544b011fc33e923244051452a62b3c5ac477304fa9e947bc3eb9b5169b021 SHA512 e6a288c672692b2e004660cfcd9f8889e8740e3dcb2b61632e3e589fc41cc183006147f2809101f6f75aba0a4ab88644f698893f6991e9bdb7625be2c79ec393
 DIST cc-1.2.2.crate 98719 BLAKE2B 7a7722721f98869bfe773ce90c6d756bb5ab76df05b516067528d7285c47cbc80d965aca97c7d7a118515035326c843b1721429e12afd6b15f187f0c59fe18c0 SHA512 5364d3822a566573d45e40a6076d3f9aef20c67f1a5687895f5a76be210a48cc44857ac778e2cce58d3a5dfb07255a3e6e541dd97be8492ae6f66fa18222492c
+DIST cc-1.2.7.crate 100283 BLAKE2B 98102a93e01ff0fc95a18ec4b2382a0e4b74000c33002da4553c2ea030d5f09b898b5c046bcf1868368b5fbf510d74c710916b98ead11a1bbe21c4f7bd1c5977 SHA512 f3c947912aaeb9d76fc5e3fa3c7ec1f87b19d9815170190b47e9925edfcca2963d56b75a140506656ef49a3a0ca22575304ab76e1b4c028730557b436baa3da4
+DIST cc-1.2.9.crate 101156 BLAKE2B 05f44c0c8161b75a9697c55e0d024f305cceb685823085d449f98612de71c58a913ceca5a472a89cce3ccf3ae58c21ecc0f5a3e14283facf92937da8f4a8c31b SHA512 a4368b1b2bb7f428139c0fe8ce5d0c17386d274f0f02de459c5d127052d39b089cf6e2920a258721196453cc89960292fde4d811e9f6b94c69a679b96713c756
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST constant_time_eq-0.3.0.crate 11369 BLAKE2B a6fb4ad3146b26bb3e18458938e65133431df129963041465291b38a69ba2b53ffcc849f455e67a65a5291803591b350afe4ad4996f1c4cb76c18a987b5b3ee2 SHA512 77bf6817c521daa45c0df7721418b4aa367531adde46b1db97316d52ffb46fc4ee2d3e6f62ff91ca6292db5e1d3e040f0f5287c3936f12a595b2c8c5928bf5e6
 DIST constant_time_eq-0.3.1.crate 11561 BLAKE2B 9ac06a1b13da2aacfaa20d60e48df4f32f6462e4036fd9ec116c45a9bbe142a18b82cf18d762989876f31b745d98d52ce7e3d32f6c9700a500f16f00649b5699 SHA512 2b6b0d7572c02606b7c3780013fb1d1773b999a0d9934e4b140dd82f94e6c91d2ef82f6daaa1bda94f95bdf6b5997b2f0ea0c8eba8ca7e28a07d1e06b1071b50
 DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864
+DIST crossbeam-deque-0.8.6.crate 22471 BLAKE2B 02b854df171b0430ca8a40349674ff251698d0c322c317055da8678da6661730c945d86737fa4947c3bd824ffe402271ee2f77fd6a505d2d46b4a41454c510c8 SHA512 9368c0c224c4b84356f1d422d8869a5ab4bfb36b0ff69244a9e7a7304ed51f034001cd9b2bc35849df874d36ed34285c66574943573522ea32bbdc5a05df6989
 DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2
-DIST crossbeam-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9
 DIST crossbeam-utils-0.8.20.crate 42487 BLAKE2B b50da06721cfbfff07825574feada8a28d3814edb218434288683eec31bddabe2ffbf7e5ef1281ee14a8a77c56db3b66f3c5ceabaea9c72317c1bd2cecda0c26 SHA512 7175eadf9fa7c526fa11ff87e40ff203f0e7a4bcec15cb972f924f3c7ff7cc20b6e2e8dbbc1ede142a0207cd2baa4f446deb25d825d28a54cbd25c263701bfaa
+DIST crossbeam-utils-0.8.21.crate 42691 BLAKE2B cd9015c41f532eb3c90101603f32d383f01e6880718b727d6d1fe46872ae276cda685e1b548cf77dd22bb1a05f0d4c4982332c2bde90e1743dbd7f51919022a7 SHA512 6f4aa7ca10c20da291c4714b56ceb1fab1c06b03b2f4e28e474e9aeb95ab6615a25462dc7819713652c3b5f6a06fa0f24ebc92c533fcf35dfcf2655857d975f8
 DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
-DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd7aa0aa9c99d44abf8428939362f32fc8dbb1b60ac56016e0096201071d0bf8c0431b660605d0dfa97da466 SHA512 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177
-DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
-DIST indoc-2.0.4.crate 14311 BLAKE2B 8d604e20825ae64530014081c627abe4ecec6447e1e214408743aca79ed217531baad4bd7021137ae6628555d769a248f06acc556cc3254d2626074aab110a44 SHA512 ef1b8d19d89d848c1133f2865247e0ce23cbe5552454805910ed0478ac4acb11b11629aa4a5ce8756d0ed5cbc0644abedeac0246f433166c68f47cf58cf4487a
 DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f
-DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
 DIST libc-0.2.167.crate 757723 BLAKE2B 38f1657dea6d13cb6cc87c8cbededa9f0ac280e4f141f780719164451c941ef873cf6348fef7ab249ba7eed1cbf6768c6a8dc9a51796007c8ce31cdd2f90ecaa SHA512 f6690776266836371e5f9e20ec3a93bb17bc4296219755750e4e70e745016245dab9e247fe564e0f21d10d0c7c97ae97bf54da5068464a48ebfac244cf699166
-DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3
-DIST memmap2-0.7.1.crate 30741 BLAKE2B bbeb8199ad5f004837c9fbd7b0984010ef73b6959dac537a5b0265b6e16720a220bbd37b39cbae3c576a39bb2fd4b43bccaf7eb59203eb304e29e7e2b25d0a30 SHA512 a264ee152bca45af4ebe22fe30330c1984a65b064dbad2bd14c66eaac5053f35cd7569cf10517d9ba98fda64e468e3a8e599cebb107a627975417283e3530e17
+DIST libc-0.2.169.crate 757901 BLAKE2B 1012cf93d8975aa20fc3f2332e253426ff66be6aed63ace5292cc8568ee419b0f1a4b5b39ddbb78d9c2dfd8d72eb0d068c98faa229ab55556da5e674429f0e97 SHA512 c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce
 DIST memmap2-0.9.5.crate 33280 BLAKE2B cffb232e313c40c6a698ad6c9e6bf140193cf1cd4dc003ea6da08d748f11001c5426786f741dfe23490841350363db3b9adea927f3e40138b36f2f4558c7a113 SHA512 947eeaf7ded7241a256fc2b288013585f5034a77a18c8621ab01a4b47c0ae6e9b9414c5e9e2f2d47b661f8c6966b1ed0d159342cae80cf45e51629949c3b1337
-DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
-DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
 DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
-DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
-DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb03a3b223173a3bb8cee65a28724eeb7bac87f62aa7b1df5ea3fc93af3cee3ef30b83d06c6773d6b856a7e6fa5fa197ea SHA512 7f0df70f9f1ca8d3da0b9dcc96e49daf05d95c3a995289266b5333f68818d686d32b0c733dfe3a0f62da78fa45caa843a963923b2d0c80899c33413dc749c032
 DIST portable-atomic-1.10.0.crate 174760 BLAKE2B 9a05d6162c95f5140709cbd005c1997449fb6373700e8ed3966e3379898e95f3cbdb90b387f1c7deb3f1eb33125378852a7168d0d22b433813f6c082112b0365 SHA512 fb47ab53fe240d5b0824dd068c6dda473d3e71ae6f5dfccaa17262a8b6de0e1dde05d83975e53bbfcf43f10ef5c634fc024f94613937927ae93f1adad1dadb19
-DIST proc-macro2-1.0.78.crate 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769
 DIST proc-macro2-1.0.92.crate 52353 BLAKE2B 9aa29fa6f1c56c0392a94a81b4c61953f4d185012cdca37e356817845535da79d7094bf43472ce63109ce479a2fd0cbef4d802afd61daf92c4db303bcac60e7e SHA512 e614f08acc0a7e97ef580479cf5b682378df1ca16f09bfb2296ebb3490a435229dea9d682c621c54ce57e8e1d3b7803eb8ff83c88bd02e07228dba6d02f14aee
-DIST pyo3-0.20.2.crate 434326 BLAKE2B 3114fd6f3fb8ae7d1b35c9d2ac5ba6a49c5ac911ee3a5b941c5063263ca7cce47fa4b4f7ec34cbfe3083f3d1303fd7f061639fba833a04fedb9d5098f5784028 SHA512 cc5151a116179157046ec92677e5a72318b4cdb13a7d7e3bb83778739b5758040e5020f667dd83554a66b758581a08f5de05eb38e7b339813cec85e0712e6355
+DIST proc-macro2-1.0.93.crate 52388 BLAKE2B dae4493215b88f68cc485bc0ae80f0a48ebad68e0260839b1c367832d1ab778197bf040647b3fe36cfe9d5f7a496e05cd71b5914f531eb129c2d458d5f0be896 SHA512 1ae650e390e4f1b18d05f42d2ffcd025cabf72568a326cd85496c722600108b0aa0ab0161b39fcc931b8b302427f678650e703f4db57aa1a60f1751db881dc6c
 DIST pyo3-0.23.2.crate 1073639 BLAKE2B 01ddd26a4e347f3b6d7fee215a1894e779167730710373d59712f2119332fcf287d9c0e75d3d28baff8cf5000afb9d0e577947a26bdd8828428d33aa0f8be537 SHA512 b2b40809e1f26978c140b7ca4ecebb661a47fc01cd03fcd5c486076576c9b229de04f15ed55661db4e26545cb29110f1034a185abb623e4bf7fbb69188db335c
-DIST pyo3-build-config-0.20.2.crate 30029 BLAKE2B 846eb95d1417a658763417a2750dca1c55201105a3978d61b1db5e3962680ede188f8285dd7deec778ea9860d43e40513b88f5a54f0b1881b08416760bdbbedf SHA512 9dbc669ec69d38716c3909fa8f3b6c5be13c717b20bfd5dd11edab59b8eb35247d7996acd260fec88f92eb3e71248c86e9b40c1a700827889e2990bba20ecddf
+DIST pyo3-0.23.3.crate 1073838 BLAKE2B 5e1ce6a5c5232ebf0399b1b969e737cca12f978f445efec9408ea80b8bc6ac1047125dbefa36149c8a904882d6a64dd24a9bd50f1e8de7afe3a3271e1a0f2d6f SHA512 c80377e8673de8b8e51e2423d102dbcc46605a783c13127215916d69fc600efd67ba5f9cca420cb6859124165ec97fde40eb0a0566d8b4b60708e20b8e6e9b6d
+DIST pyo3-0.23.4.crate 1087676 BLAKE2B 2c7d3530460ff687e8f60dcff0fb01465b2a4642043ebdfc927fc3824b9fbce9c4b304250808a85405d21df12d17a1d1ada7bdf8f3563710692f22223e2732f1 SHA512 0015aa75163ad0ec026d185e15c26f59aaad0eb3cc3044b146e5d703bb375fcd838df2044febbd52e6e129dfba81c8249329fc3e4805695274dac7a69eee0651
 DIST pyo3-build-config-0.23.2.crate 32197 BLAKE2B 393c76b1dcb625145673736272d4cb9d96a02df87ddcc385316652f0ff1b5595a34ebe5d789f61888c2fd82de05476c85f781d21018bd99cb630fa634afee203 SHA512 29678272073e896cb0b65efb0eaba40c82977b18efd389597aef8902e32daff51f2609c6be93ecfe0336260446c3186951f770ff449823cdde5a0518a1585c81
-DIST pyo3-ffi-0.20.2.crate 64601 BLAKE2B cf1141ad34a13dcb46de0d1e15dda192ca41a7441bfc92a9295861876dcc690d1d5d6d39dafa51cd70c4627353efa91563eaefee8c39f655d12818003f9524da SHA512 ee6386b6fdb80689d104f9cd5229f02e1893d00a52be710bd36882c47305abbe24ef2f3cdef8200fddc0bb97e29001fa3a2fd9d3d2673ecd9a104a070420d01e
+DIST pyo3-build-config-0.23.3.crate 32509 BLAKE2B 9e77701712589dec4ad74b3d0e66ae82c7a01b6f29ed36231d999aaf909f80def59d17916e1900bfff10b1d36a0a48ed4bf9757c817eb6c6269549f3d04bd6d4 SHA512 db8b0aa86e96eeb30a8ab36a8a1ba917b7b9e6918c2193d7466841ef38e689908f7719a5390d35fb9a156aa6bd84348fa99ea8d5a784faf5c5cc4635d9a3fac9
+DIST pyo3-build-config-0.23.4.crate 33885 BLAKE2B 7f95a8a9e08d413899ff1fa64af5a52783bad4a7b4db92835464f12bd8565f152497aaeb45d25cc91eed73950abeea30ca4c7495e3b15423ae588b97038beb18 SHA512 b11442609f43d9baab79daf083caf0366987f6ae182239814ad6df6fe4ad31b95132d74f1162fa9428d229bd8c18ef9b696a4c3329b3960fd705d1705fc5e973
 DIST pyo3-ffi-0.23.2.crate 74052 BLAKE2B 085c66bae61e6059331813be77a1e4f850c4b8b12ac60b03188f2a009c9f58e062dc3ea2b9e470a480956bb8cbef645f95e53fae2638d59ebf5039aa5d41d504 SHA512 e228e473da98ce0fe4f15cf840ba1f51f66bb6fd103a7c0bb76b3218980c93b45ecf691f712333f4a27a9efc76517a85f6e13d5e9650b774eadebf59a647e493
-DIST pyo3-macros-0.20.2.crate 7925 BLAKE2B 00fc60becfa39bf452786d8a612247785f1737cc3e627700d0d144ab2efaadfb34ce8a8f46e932382a1ea99caebfe1946fbc517b5c26fadb0822ecaa8b2e9df0 SHA512 dd9ea9acda95dfc53689a4c26d8c2139f8a90a05ab06737037f19b8bccd5e52b0da5f297a29194b958f5f8b59cbb566b5f409b3f17a863eddf855ecb755d2719
+DIST pyo3-ffi-0.23.3.crate 74064 BLAKE2B ec3cc59e047f780041a05e2bf9fac9d65a6f8ccfb5a3e1c35d7c7918da6ded7e65676888a743d3b4d0fe7b0996e441b722c159eed67360c1e3c5b598160a46cc SHA512 fe4678d4cfe81f065554f0d454345f5f8fde927af1afec9212bb49a67be5080dcc9be84e088612208b7732d2283c2c9168a31b0b6fbd32496520d500e372e161
+DIST pyo3-ffi-0.23.4.crate 74806 BLAKE2B 650784d46347c00f09c010c39e9762f778efc510ad0b99b5ddf30cab18edaba552207339ad44ed4ae6d87ddfcc56fa540a17e3a4cb331905a0988d5ba2dc682a SHA512 c12097292b4620f4fd98d61fde4a0f0c7d423a94d518fa5b1cf759089b066fede6d83e20171acc2aa7bf268de5700c9b59da32131216734626b0fa5cd5651801
 DIST pyo3-macros-0.23.2.crate 8056 BLAKE2B a87c4b8aab972eaf5e9b941db34e18be411bed8b5753d3e2d3f65e4a18723a72e70858bb34e8db949f0c6b748e122fed41e9c78f6c20150077fcc3c4eb0026ba SHA512 dba0b5bd212b6a5f38d6fc93183c8ab80bb53bfa5f03d471897014f2d3d1959804e5fdbc817845c1cef797f314b924d58eff95cfcb848eb98b283e104d24637c
-DIST pyo3-macros-backend-0.20.2.crate 49710 BLAKE2B 711b18984e61219555df4b62667f7f376951c6cb47e6dd947fc24618b923c4f4f790eb1aba1901abea4761632cdb58cfa81cce91f33586da3022e6c7d126bc9f SHA512 c6ca2a2cdae8630fba3f8e4122e81b60ef2ef0905ad2a3fbcfae134456d5ca9e73690b61590e391f3b9d82c24725809f18544c5dfa0b36ffdb1914844fe65d3a
+DIST pyo3-macros-0.23.3.crate 8085 BLAKE2B bf9ea45a8afe7c663da4f3f5c09c23039bbcf9a9ae350eac2b6581a227864d259b1e5c5ea36f9d6f302c26cd957bb4564562b98785eac49233515d7d54453fdf SHA512 23bfcff285db1276f2dcca9895f7672ec6e5aec118039e2cef3cabca0a85eb97f138391cea4da26eb887dff09c65947b165ca83392edcc8640cb283df2929901
+DIST pyo3-macros-0.23.4.crate 8852 BLAKE2B ba5722fd52e47aa4dc2e89bacd69326bd98943a1670ebeab08a2e9e8070a0975ebbe928a0bce8b53a700b65294fee2b00d2a1e6623a0c48ac15902cdbfcb7a97 SHA512 c36c9005db5a4b48b5fda881130f4e7da8eef46e2c363c395ccca3fe476e0204d98c2a832cd03c787fb37a2664fadd42bf8f47de71eb44d055754ab5766af934
 DIST pyo3-macros-backend-0.23.2.crate 70067 BLAKE2B 905c0e6e5ca0c0a91af8386a632cc81f4a9b08a51a22a260188078abf9ee70d60f77e2fc0df09483d8dc6b37cd455a23b7f70f41ee74a2ad9dd0dbef39cc22c2 SHA512 dc3f8780c09c63c0e0d4f26c29a9a4e29e4fc9f14254ac8a942235e480a3f4bfa3bf073d3011e043b6c22e1999d1f68bf7b0fdf212e9edb4bfb2396a97ab0ee1
-DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
+DIST pyo3-macros-backend-0.23.3.crate 70098 BLAKE2B f8ee9c39f743960fc8093bfd53c043fca03b973192e1ab24b48066634e57ea7e74b3ba825ae72380e10569855eec9cb4f0d54f5f8c88dc60e67793257bef8d43 SHA512 9b22e975480f9afc2037587ba85889868a1b543069c2280c65f4cf98e5537708d098bb4885e881c1c9427740c8259988d82176b974900551a4e51097cefb8708
+DIST pyo3-macros-backend-0.23.4.crate 70912 BLAKE2B a428c732f0b17d9a8f620d0e8d58469f2cba339c8a8307393ce252a7860808e5d50e6bbf711cafd0635c844f4b1d48e57db4dd99ef7b5e3d97d6f760164278e9 SHA512 2fe670fbf35724f489cc82f38d3f7c1e6aa15b087a2674b7a68b562572f9bb00cbb7746cccfcb62d0861a18f6d24c5739273c8302d1662a161142f4a6b532b6f
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
+DIST quote-1.0.38.crate 31252 BLAKE2B a3836efbe5c21dec70c684002b47b8fc7cef643c82ee903b537a48bc0707a28106c4b33d98e60ff81e04c7520f7404b1dc4d49446e8d91dded517e476c36e1c2 SHA512 530c47c5e6372b508bf5b2b88a138408a7afa5ef52c47280ed20eccf39f8e97dfc1e0a18c1bd5472efcdc49a7a1e69566333a0a1b4c0b4f0e11e6a7a85bfe8af
 DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2a0a0dc24f0282fa7eb01fd1351a7dc8b5af3a55ea321e6526fbe037fec3cf8b32463166a082a6e417a51fca SHA512 3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3
-DIST rayon-1.8.1.crate 170448 BLAKE2B 982f7ba7d6a43956e6f438921fea2e40d3b398f4f72a4c89f55657aba6aa0d99912a7240b1c32c1dadafa9852adf440e3153a3f0cc56f6582867fa2794bb5144 SHA512 a83304be8334f5aa1c63468ddc749d8e8124c6947f1472320ba0bd4351c9ae582dba31ff369e9efdafdab439571fbf91b497c2370ec15406cfa810f5161cfb32
 DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
-DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
-DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
-DIST smallvec-1.13.1.crate 34952 BLAKE2B e0dcf1d26883564cd4f5d20a588562404e193075b1ae011f7f7542009a9466e5df3ade7768e1a8feb8806774b2cee5f15d31779928f83714e7d4b6ed46af9ab9 SHA512 1259ef947400470b8c9e74c5582dbc1a49753aa46420883c1f7d66f320f67bebe733a15a23cd57ba461020fad4ff337a5b298de82754602a78f5e6cec969652d
-DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325
 DIST syn-2.0.90.crate 290584 BLAKE2B 9f469001c1439ffe57c578119653d3021c2709767e8e881441459a190402679f4fb78aa65e7822ff20913801c3be00d9b8f115189ea8e63ed94ed359b40fc9e1 SHA512 44606124f113c259c19edcb2adc1378d8292b422d800604c0e0d1ba89bd2d13d518cf4a6afa58daded54da9cb285464aadb113815406a0f09c5e18f865789ae0
-DIST target-lexicon-0.12.13.crate 25424 BLAKE2B 5fcac231c270a59b6589adb79c90cd3bb15ce024e3c5fa3fd267b3226e5514ce77387c57c86ca765b43ee593a55ec99fdc8fbfd464dc01afaa91ad10337b6278 SHA512 323331857bd3db9877a6c7304392e39d378439462ae4f6d6939c02d28914ecddec52696c94ceebfe8a0e7e93ce25c900099bb3922d7783643162e55c7a8769b7
+DIST syn-2.0.94.crate 297667 BLAKE2B 5edcd33596b147a01ffee8fef6ed0b3c084e6082bb65a9e67641944ffd3f0f7b3e806d63f7850ea8859327044fce0ac2a6f7bc8ce4fea81db2122c658eb1d468 SHA512 5d345b71945f7904a3f88d15dfa63397e82df113a655739ccc7430eb8716fe25ad096a75d019aed587f9e1b4374e8999d55ed1e2df4d0b8ee986469f64ea65f0
+DIST syn-2.0.96.crate 297497 BLAKE2B 68b62de28ad670572096a1d92ff8ed6fb55fee441f2d429edfeffcc48fa1d4f1cd39327540a4216d94a9763b84831956cb7e5c8ce89b81f1dc5767ea5734620d SHA512 ec2e352a5b0b2aa619774c01d7a7767674a44ffe91dea45d3379bf172d13039c3d37f264e98e26b20fe1d86db6d5190f220831c842f3316469d4ae73c2bfddec
 DIST target-lexicon-0.12.16.crate 26488 BLAKE2B e7950e4a302059a1bfc9bc15618a3c1b971a17cffae117a6e8f5f63a0d82fd2bd02680301d15338612d5426d349dd24cfee30ee787a15a7d3187f2a6825e69ce SHA512 092639957c4a0391560b6442b31c47159c04d12e971010f730a6ec9cb5389e4be903ef3d7daa06db95e64dc78b6970731fb647179ebaad2b12e9ed5e9b24da27
-DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 DIST unicode-ident-1.0.14.crate 47547 BLAKE2B 30e0b6d7f3a967aaf5b9d91237008a60c3a8ded53bda901696e23cea3931dd71b01ddab866dca9e31e17c395d5f5a68f2a938655b693e894962568c2cff5ca15 SHA512 7c6dcd1724e8cfedc37546d1abd49088b633dad228097acc73d7b6cab255b223e830c541144e05a00388fd8ca8066f27c18792419cfa58ee9da4460a38d0bc0a
 DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505
-DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709
-DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996
-DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff
-DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a
-DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e
-DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
-DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
-DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
diff --git a/dev-python/blake3/blake3-0.4.1-r1.ebuild b/dev-python/blake3/blake3-0.4.1-r1.ebuild
deleted file mode 100644
index 56a207480f01..000000000000
--- a/dev-python/blake3/blake3-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=1
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..13} )
-
-CRATES="
-	arrayref@0.3.7
-	arrayvec@0.7.4
-	autocfg@1.1.0
-	bitflags@1.3.2
-	blake3@1.5.0
-	cc@1.0.83
-	cfg-if@1.0.0
-	constant_time_eq@0.3.0
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-utils@0.8.19
-	either@1.9.0
-	heck@0.4.1
-	hex@0.4.3
-	indoc@2.0.4
-	libc@0.2.153
-	lock_api@0.4.11
-	memmap2@0.7.1
-	memoffset@0.9.0
-	once_cell@1.19.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.9
-	proc-macro2@1.0.78
-	pyo3-build-config@0.20.2
-	pyo3-ffi@0.20.2
-	pyo3-macros-backend@0.20.2
-	pyo3-macros@0.20.2
-	pyo3@0.20.2
-	quote@1.0.35
-	rayon-core@1.12.1
-	rayon@1.8.1
-	redox_syscall@0.4.1
-	scopeguard@1.2.0
-	smallvec@1.13.1
-	syn@2.0.48
-	target-lexicon@0.12.13
-	unicode-ident@1.0.12
-	unindent@0.2.3
-	windows-targets@0.48.5
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_msvc@0.48.5
-	windows_i686_gnu@0.48.5
-	windows_i686_msvc@0.48.5
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_msvc@0.48.5
-"
-
-inherit cargo distutils-r1
-
-MY_P=blake3-py-${PV}
-DESCRIPTION="Python bindings for the BLAKE3 cryptographic hash function"
-HOMEPAGE="
-	https://github.com/oconnor663/blake3-py/
-	https://pypi.org/project/blake3/
-"
-SRC_URI="
-	https://github.com/oconnor663/blake3-py/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-	rust? (
-		${CARGO_CRATE_URIS}
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="
-	|| ( CC0-1.0 Apache-2.0 )
-	rust? (
-"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0-with-LLVM-exceptions BSD-2 MIT Unicode-DFS-2016
-	|| ( Apache-2.0 CC0-1.0 )
-"
-LICENSE+="
-	)
-"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+rust"
-
-BDEPEND="
-	rust? (
-		${RUST_DEPEND}
-		dev-util/maturin[${PYTHON_USEDEP}]
-	)
-	!rust? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/blake3/blake3.*.so"
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	use rust && rust_pkg_setup
-}
-
-src_unpack() {
-	# Do this unconditionally as it has sensible behaviour even
-	# w/ USE=-rust.
-	cargo_src_unpack
-}
-
-src_prepare() {
-	local PATCHES=(
-		# https://github.com/oconnor663/blake3-py/pull/44
-		"${FILESDIR}/${P}-gcc14.patch"
-	)
-
-	# sed the package name and version to improve compatibility
-	sed -e 's:blake3_experimental_c:blake3:' \
-		-e "s:0[.]0[.]1:${PV}:" \
-		-i c_impl/setup.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	local DISTUTILS_USE_PEP517=$(usex rust maturin setuptools)
-
-	if ! use rust; then
-		cd c_impl || die
-	fi
-	distutils-r1_python_compile
-	if ! use rust; then
-		cd - >/dev/null || die
-	fi
-}
diff --git a/dev-python/blake3/blake3-1.0.1.ebuild b/dev-python/blake3/blake3-1.0.1.ebuild
new file mode 100644
index 000000000000..5916995711e5
--- /dev/null
+++ b/dev-python/blake3/blake3-1.0.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=1
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..13} )
+
+CRATES="
+	arrayref@0.3.9
+	arrayvec@0.7.6
+	autocfg@1.4.0
+	blake3@1.5.5
+	cc@1.2.7
+	cfg-if@1.0.0
+	constant_time_eq@0.3.1
+	crossbeam-deque@0.8.6
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.21
+	either@1.13.0
+	heck@0.5.0
+	hex@0.4.3
+	indoc@2.0.5
+	libc@0.2.169
+	memmap2@0.9.5
+	memoffset@0.9.1
+	once_cell@1.20.2
+	portable-atomic@1.10.0
+	proc-macro2@1.0.92
+	pyo3-build-config@0.23.3
+	pyo3-ffi@0.23.3
+	pyo3-macros-backend@0.23.3
+	pyo3-macros@0.23.3
+	pyo3@0.23.3
+	quote@1.0.38
+	rayon-core@1.12.1
+	rayon@1.10.0
+	shlex@1.3.0
+	syn@2.0.94
+	target-lexicon@0.12.16
+	unicode-ident@1.0.14
+	unindent@0.2.3
+"
+
+inherit cargo distutils-r1
+
+MY_P=blake3-py-${PV}
+DESCRIPTION="Python bindings for the BLAKE3 cryptographic hash function"
+HOMEPAGE="
+	https://github.com/oconnor663/blake3-py/
+	https://pypi.org/project/blake3/
+"
+SRC_URI="
+	https://github.com/oconnor663/blake3-py/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+	rust? (
+		${CARGO_CRATE_URIS}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="
+	|| ( CC0-1.0 Apache-2.0 )
+	rust? (
+"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0-with-LLVM-exceptions BSD-2 MIT Unicode-3.0
+	|| ( Apache-2.0 CC0-1.0 MIT-0 )
+"
+LICENSE+="
+	)
+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+rust"
+
+BDEPEND="
+	rust? (
+		${RUST_DEPEND}
+		dev-util/maturin[${PYTHON_USEDEP}]
+	)
+	!rust? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/blake3/blake3.*.so"
+
+distutils_enable_tests pytest
+
+pkg_setup() {
+	use rust && rust_pkg_setup
+}
+
+src_unpack() {
+	# Do this unconditionally as it has sensible behaviour even
+	# w/ USE=-rust.
+	cargo_src_unpack
+}
+
+src_prepare() {
+	# sed the package name and version to improve compatibility
+	sed -e 's:blake3_experimental_c:blake3:' \
+		-e "s:0[.]0[.]1:${PV}:" \
+		-i c_impl/setup.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	local DISTUTILS_USE_PEP517=$(usex rust maturin setuptools)
+
+	if ! use rust; then
+		cd c_impl || die
+	fi
+	distutils-r1_python_compile
+	if ! use rust; then
+		cd - >/dev/null || die
+	fi
+}
diff --git a/dev-python/blake3/blake3-1.0.2.ebuild b/dev-python/blake3/blake3-1.0.2.ebuild
new file mode 100644
index 000000000000..e7420a53224a
--- /dev/null
+++ b/dev-python/blake3/blake3-1.0.2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=1
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..13} )
+
+CRATES="
+	arrayref@0.3.9
+	arrayvec@0.7.6
+	autocfg@1.4.0
+	blake3@1.5.5
+	cc@1.2.9
+	cfg-if@1.0.0
+	constant_time_eq@0.3.1
+	crossbeam-deque@0.8.6
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.21
+	either@1.13.0
+	heck@0.5.0
+	hex@0.4.3
+	indoc@2.0.5
+	libc@0.2.169
+	memmap2@0.9.5
+	memoffset@0.9.1
+	once_cell@1.20.2
+	portable-atomic@1.10.0
+	proc-macro2@1.0.93
+	pyo3-build-config@0.23.4
+	pyo3-ffi@0.23.4
+	pyo3-macros-backend@0.23.4
+	pyo3-macros@0.23.4
+	pyo3@0.23.4
+	quote@1.0.38
+	rayon-core@1.12.1
+	rayon@1.10.0
+	shlex@1.3.0
+	syn@2.0.96
+	target-lexicon@0.12.16
+	unicode-ident@1.0.14
+	unindent@0.2.3
+"
+
+inherit cargo distutils-r1
+
+MY_P=blake3-py-${PV}
+DESCRIPTION="Python bindings for the BLAKE3 cryptographic hash function"
+HOMEPAGE="
+	https://github.com/oconnor663/blake3-py/
+	https://pypi.org/project/blake3/
+"
+SRC_URI="
+	https://github.com/oconnor663/blake3-py/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+	rust? (
+		${CARGO_CRATE_URIS}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="
+	|| ( CC0-1.0 Apache-2.0 )
+	rust? (
+"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0-with-LLVM-exceptions BSD-2 MIT Unicode-3.0
+	|| ( Apache-2.0 CC0-1.0 MIT-0 )
+"
+LICENSE+="
+	)
+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+rust"
+
+BDEPEND="
+	rust? (
+		${RUST_DEPEND}
+		dev-util/maturin[${PYTHON_USEDEP}]
+	)
+	!rust? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/blake3/blake3.*.so"
+
+distutils_enable_tests pytest
+
+pkg_setup() {
+	use rust && rust_pkg_setup
+}
+
+src_unpack() {
+	# Do this unconditionally as it has sensible behaviour even
+	# w/ USE=-rust.
+	cargo_src_unpack
+}
+
+src_prepare() {
+	# sed the package name and version to improve compatibility
+	sed -e 's:blake3_experimental_c:blake3:' \
+		-e "s:0[.]0[.]1:${PV}:" \
+		-i c_impl/setup.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	local DISTUTILS_USE_PEP517=$(usex rust maturin setuptools)
+
+	if ! use rust; then
+		cd c_impl || die
+	fi
+	distutils-r1_python_compile
+	if ! use rust; then
+		cd - >/dev/null || die
+	fi
+}
diff --git a/dev-python/blake3/files/blake3-0.4.1-gcc14.patch b/dev-python/blake3/files/blake3-0.4.1-gcc14.patch
deleted file mode 100644
index 367d5c94e1b1..000000000000
--- a/dev-python/blake3/files/blake3-0.4.1-gcc14.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/c_impl/blake3module.c b/c_impl/blake3module.c
-index 4448445..842421a 100644
---- a/c_impl/blake3module.c
-+++ b/c_impl/blake3module.c
-@@ -217,7 +217,7 @@ static PyObject *Blake3_update(Blake3Object *self, PyObject *args) {
-   // Success. We need to increment the refcount on self to return it, see:
-   // https://docs.python.org/3/extending/extending.html#ownership-rules.
-   Py_INCREF(self);
--  ret = self;
-+  ret = (PyObject *)self;
- 
- exit:
-   release_buf_if_acquired(&data);
-@@ -272,7 +272,7 @@ static PyObject *Blake3_update_mmap(Blake3Object *self, PyObject *args,
-   // Success. We need to increment the refcount on self to return it, see:
-   // https://docs.python.org/3/extending/extending.html#ownership-rules.
-   Py_INCREF(self);
--  ret = self;
-+  ret = (PyObject *)self;
- 
- exit:
-   if (file) {
-@@ -347,11 +347,11 @@ static PyObject *Blake3_reset(Blake3Object *self, PyObject *args) {
- 
- static PyMethodDef Blake3_methods[] = {
-     {"update", (PyCFunction)Blake3_update, METH_VARARGS, "add input bytes"},
--    {"update_mmap", (PyCFunctionWithKeywords)Blake3_update_mmap,
-+    {"update_mmap", (PyCFunction)Blake3_update_mmap,
-      METH_VARARGS | METH_KEYWORDS, "add input bytes from a filepath"},
--    {"digest", (PyCFunctionWithKeywords)Blake3_digest,
-+    {"digest", (PyCFunction)Blake3_digest,
-      METH_VARARGS | METH_KEYWORDS, "finalize the hash"},
--    {"hexdigest", (PyCFunctionWithKeywords)Blake3_hexdigest,
-+    {"hexdigest", (PyCFunction)Blake3_hexdigest,
-      METH_VARARGS | METH_KEYWORDS,
-      "finalize the hash and encode the result as hex"},
-     {"copy", (PyCFunction)Blake3_copy, METH_VARARGS,
diff --git a/dev-python/blurb/Manifest b/dev-python/blurb/Manifest
index 6bee69ca3bf4..f7af6049713f 100644
--- a/dev-python/blurb/Manifest
+++ b/dev-python/blurb/Manifest
@@ -1,4 +1,2 @@
-DIST blurb-1.1.0.tar.gz 25064 BLAKE2B 4fbdd0d068cc7abb1ffa78dff70bd83feccc1bcfbf8ebb085c9f7e77e0f330d3759f10a94a5ca024b465c01f9d659496ae55162a52b7158a06caf2d114d36806 SHA512 9397173e7bf5babf02c96df27983462e7dd2a729e9eb0cacdf23ca3778336902d5c611ab5e2432bbc877344426d7c62ea8ae77719aa08da98f9b44365583b7ee
-DIST blurb-1.2.0.tar.gz 23573 BLAKE2B a7a15fed82fca3f13eb840379b186210d6b8a039f61d48c65dce33ab80e970791add63efe9986adb54e7bedd452a3a867791237e250c1949b5b90f06bfac28ae SHA512 ebfe4c84d1f813822d7a583b337460a840235b61257428a47b7b61eb43b4b38fffc84f0fe758c6f61e9ae4b8c9c1affd9038077ddf846f17032e4497f87b78ad
-DIST blurb-1.2.1.tar.gz 23333 BLAKE2B 57374a3c787845a867c77480f1826cc82eae8cbdb659eeff9871cb3cf69f8e040d616cf40f051b63160b209b443dc26113b0d319f810cfe78842a759a139881b SHA512 f2bec26dacaa5f3c2016a4712a693ff483c0765b93f61900e7fa69765908b1c16318791e51778b71ffc222d339b5454603e7baec4a1bdfdd4c0e7b41a095f49c
 DIST blurb-1.3.0.tar.gz 23864 BLAKE2B 15d82e7f2917391b8d514d03c060d5ea6a088658a6aa838fd3056767e42428764330e910406132c250f6f76174e57d031ab339d4dbd23c4a423d12712717132b SHA512 ae4d519353eae1725df45647d8345f3e04f1da176a20d3df281f0528e9ec0e3d7cf30edf94b811082fbe100141698aaba2886054e940191a56fbcaeb6fba4256
+DIST blurb-2.0.0.tar.gz 24666 BLAKE2B 74ff80ab4503278423c5ac600d71e5fea57e837f39aedf6f12b24841aa96ffadd030ae61898964527218fc32468efa8885374165221c7131882f63127ce9b981 SHA512 ef943797fb6c5a3716aa86af0741c267b6ed1760c305e779410cd7ce0e2c99b0ce2437b8c6f5b8b39c01850cc79819f5977eefdb3906269af321a78b60d95f49
diff --git a/dev-python/blurb/blurb-1.1.0.ebuild b/dev-python/blurb/blurb-1.1.0.ebuild
deleted file mode 100644
index 5c5e7524a953..000000000000
--- a/dev-python/blurb/blurb-1.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2018-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Tool to create and manage NEWS blurbs for CPython"
-HOMEPAGE="
-	https://github.com/python/core-workflow/tree/master/blurb
-	https://pypi.org/project/blurb/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-src_test() {
-	# Tests expect to be run from github repo, in which code is inside dir
-	ln -s . blurb || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" -m blurb test || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/blurb/blurb-1.2.0.ebuild b/dev-python/blurb/blurb-1.2.0.ebuild
deleted file mode 100644
index ed8b87d5b515..000000000000
--- a/dev-python/blurb/blurb-1.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2018-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Tool to create and manage NEWS blurbs for CPython"
-HOMEPAGE="
-	https://github.com/python/core-workflow/tree/master/blurb
-	https://pypi.org/project/blurb/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/blurb/blurb-1.2.1.ebuild b/dev-python/blurb/blurb-1.2.1.ebuild
deleted file mode 100644
index ed8b87d5b515..000000000000
--- a/dev-python/blurb/blurb-1.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2018-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Tool to create and manage NEWS blurbs for CPython"
-HOMEPAGE="
-	https://github.com/python/core-workflow/tree/master/blurb
-	https://pypi.org/project/blurb/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/blurb/blurb-2.0.0.ebuild b/dev-python/blurb/blurb-2.0.0.ebuild
new file mode 100644
index 000000000000..a38e748d1e8c
--- /dev/null
+++ b/dev-python/blurb/blurb-2.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2018-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Tool to create and manage NEWS blurbs for CPython"
+HOMEPAGE="
+	https://github.com/python/core-workflow/tree/master/blurb
+	https://pypi.org/project/blurb/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		dev-python/time-machine[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index a6617f673181..bcdeb8398c4a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,4 +1,8 @@
-DIST boto3-1.35.81.gh.tar.gz 913534 BLAKE2B aab88ae95d4c93c8f54042ef2b3ec9defdafa4d9dd4dfb57ff1da896254bbc0d1ac8c4583b8870cc8cc814366f9ef79d67d69d45b0f373878d1c22dba465e523 SHA512 fcbc31295a94983620405dbaa0f32eee2149619cf113658c2955fe84ca541cb93e8d6d637d8d7b322e6b7252bfc390b4aff77b99af3978267c64cfa5effef1f3
-DIST boto3-1.35.86.gh.tar.gz 917880 BLAKE2B 9ebf2ff2d8674013f6edead87ff92c649e977ff942fd50dfe80da4ac7a00f812735ff38791e5572b442524d335a838f4cb16fa0cc2bf54e51ef5932cb4639bf2 SHA512 4daa945a64381aca49175211b40893bf05ec733a92ab8b972c3c3e53cfd29ac8ca142c7903ee49ba75097bdf10f7a7b36d35ff0f8cb1501b12149c9f6dffdb65
 DIST boto3-1.35.90.gh.tar.gz 918672 BLAKE2B a875ee6f59cac2a5f085719fed71090f8d717071dc7e2941075d12d3d98bd9850283c157a9176e890f67dfb78f68cd9f3942e0c8515629f70fa9cd9090eac837 SHA512 ab19a1fc324fb151cf781ac8de306af67edceb7190c6970e296c1f6dfc59e66da6c056a84aefbbe2509c7acb33ca3da81ad58736217ad45ccc16490eb4d96fc2
-DIST boto3-1.35.91.gh.tar.gz 919505 BLAKE2B bb241cf6b37fc3ae76437d1ccbb5077536b32e01daf7a1be6add18a4fa7c5e2663017c41c0edbfe9fc3b2313402480ff6a59fd405e9847320fac1699eefa4397 SHA512 46b325015d30613a894808aa93a3920f116fecb643668562d3e5c7dda6b6e5f7421f16cab5167004f104c97c21f0d127b893aa448587cb64e1ce32ec4576dbc2
+DIST boto3-1.35.92.gh.tar.gz 919812 BLAKE2B fd52fbcb99538e46fd05e117353a93f8496150c6c518d445c2c78d8c91390fe6a15cdad419f25b1ced5b1433f1e63ff8204a25ee452e995f715dd915ea676d17 SHA512 7e9bc15b43e3e4babce3465e96b58f177eea316751f0c9982bc33e17ae3673cef026871bfb4bfdd254debfd3c7a342e3afa6aa65d9c97aefea13a9922b010fd0
+DIST boto3-1.35.97.gh.tar.gz 920994 BLAKE2B e333a53118122ddd70e77e3f158171507e6430d9f85d58fc8d9300801c68703834965016004826628bb20f9908034939d3f11598156e2bc93ea3412fccdfb33e SHA512 a22193cf6992cc6d30049d47d53048ba416ff21cb4b45bed9a8524ae2446800cb6843838f347484d0b4d5ff898dbdf5b15b598e7d079c1ee0273da25f71bea0e
+DIST boto3-1.35.98.gh.tar.gz 921601 BLAKE2B ec4b4e24a60174ce2799977f26fb1ce732ede9b6acdf8b1ef6fa0766e5fb49dbfcdacab6abc3f4e4df00d692b727dcfc2f944f3c9e7e0700d7588814d1791c68 SHA512 71eaf4dcd1ddaacc0080630022af1122395e93eb6eff5461b5d8f2d76a58da33d1da060818b42367a227ca5d4167b98097ff76e821107cb0f83f74a152a277a5
+DIST boto3-1.35.99.gh.tar.gz 921797 BLAKE2B f42ac47ce3e1c647555320f0434cfa3539053029efe0fbb06f12f7a165a7afc194acc0d9131fc3654dbcf4cc734c7fac634427fd19adadbcacc99d9693b88741 SHA512 0f04e7c45c022593da150e610cd8af5020b63fb1abeb0e0135936d949928147f6776676611509bf905f1ee6656292e0c4e0a36b87438f62e04769072186afed8
+DIST boto3-1.36.0.gh.tar.gz 923064 BLAKE2B 3e3afd985492be0e0a1bd2e66b1a645ab0f25f0809533a240ba109b97b55aa0683a8df7197367e9623f67b9308b9fec2bf1e8627339793981f5b8456db547ee4 SHA512 7701866feadd5115b255f8b9d783297774dfaeb2ceac503d10d682457144fcbd2f885ec0b5671b0ae317de6bf87669be3895a15c02b7442a99194b84a131dc62
+DIST boto3-1.36.1.gh.tar.gz 923135 BLAKE2B 7935b58d3a5815ec5e34541981d18c82400e0ba31b27956106d408732887cc8be560831b6aa4397fca91d1caed19f6a03b0cdf13a47735119c5d9246ef237b40 SHA512 b0c5ef5d34068290d4de7e546131f0ccfded90db61f4e480ed98627bf7a649b07311d3ebff85d4782bd46fd7749ef3ac90fd7530f8d9bb035f6a5bafcb8ed38f
+DIST boto3-1.36.2.gh.tar.gz 923432 BLAKE2B 91f19eb6e1451923adbf323688d89cfadd384009fbc3fdcae688b48dee54d9a3f14956cedaed07b15f2cdc3badaf0533a6ec1e1baf5cedc88e91580104834eb2 SHA512 e9e14f4aacd0814952198d5446050f0cf822baac0b3ce3604c40dbb6b122c431624b46b144ea4699be7328f6236e099981905a4be6a9de3400750800d8d40e60
diff --git a/dev-python/boto3/boto3-1.35.81.ebuild b/dev-python/boto3/boto3-1.35.81.ebuild
deleted file mode 100644
index 54e9299b7dca..000000000000
--- a/dev-python/boto3/boto3-1.35.81.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.86.ebuild b/dev-python/boto3/boto3-1.35.86.ebuild
deleted file mode 100644
index 8cba6d95740e..000000000000
--- a/dev-python/boto3/boto3-1.35.86.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.90.ebuild b/dev-python/boto3/boto3-1.35.90.ebuild
index 8cba6d95740e..ede368155d4f 100644
--- a/dev-python/boto3/boto3-1.35.90.ebuild
+++ b/dev-python/boto3/boto3-1.35.90.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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.35.91.ebuild b/dev-python/boto3/boto3-1.35.92.ebuild
index f770025655ec..f770025655ec 100644
--- a/dev-python/boto3/boto3-1.35.91.ebuild
+++ b/dev-python/boto3/boto3-1.35.92.ebuild
diff --git a/dev-python/boto3/boto3-1.35.97.ebuild b/dev-python/boto3/boto3-1.35.97.ebuild
new file mode 100644
index 000000000000..290d95fd73d4
--- /dev/null
+++ b/dev-python/boto3/boto3-1.35.97.ebuild
@@ -0,0 +1,53 @@
+# 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="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/boto3/boto3-1.35.98.ebuild b/dev-python/boto3/boto3-1.35.98.ebuild
new file mode 100644
index 000000000000..290d95fd73d4
--- /dev/null
+++ b/dev-python/boto3/boto3-1.35.98.ebuild
@@ -0,0 +1,53 @@
+# 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="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/boto3/boto3-1.35.99.ebuild b/dev-python/boto3/boto3-1.35.99.ebuild
new file mode 100644
index 000000000000..290d95fd73d4
--- /dev/null
+++ b/dev-python/boto3/boto3-1.35.99.ebuild
@@ -0,0 +1,53 @@
+# 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="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/boto3/boto3-1.36.0.ebuild b/dev-python/boto3/boto3-1.36.0.ebuild
new file mode 100644
index 000000000000..b087a88814e8
--- /dev/null
+++ b/dev-python/boto3/boto3-1.36.0.ebuild
@@ -0,0 +1,53 @@
+# 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="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.11.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/boto3/boto3-1.36.1.ebuild b/dev-python/boto3/boto3-1.36.1.ebuild
new file mode 100644
index 000000000000..b087a88814e8
--- /dev/null
+++ b/dev-python/boto3/boto3-1.36.1.ebuild
@@ -0,0 +1,53 @@
+# 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="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.11.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/boto3/boto3-1.36.2.ebuild b/dev-python/boto3/boto3-1.36.2.ebuild
new file mode 100644
index 000000000000..b087a88814e8
--- /dev/null
+++ b/dev-python/boto3/boto3-1.36.2.ebuild
@@ -0,0 +1,53 @@
+# 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="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.11.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 5d0bc84ad964..3d1f1c4a43e7 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,4 +1,8 @@
-DIST botocore-1.35.81.gh.tar.gz 14142565 BLAKE2B f0c5c284f5f0964841ab0f84f278fa574b696df614d5602856065c83971bf366449b7ccb12fbf15c3bb734d894e6eb49be89e5dae3000bd8fd8913d2f465c5e6 SHA512 7b67d6f1dc31369afc3a4ebf109682b9365b59fe46635ef92b0e8adcaa16fbcaf7e1350a13537149dd0a55b60a57534a18d9f4e8bbb28663e8b2e427ece20819
-DIST botocore-1.35.86.gh.tar.gz 14177900 BLAKE2B 7b80010dca6496eceedf8598f195ac80d4416c0f2032f931586a1db2ec100185e8c9591d6d42f549fb9a579b295178aee293c4b317717b4e9264d9adc54fb2c5 SHA512 28185963f5a3a937bddcd47a3afc13fab16b32ec092bfa7b6c007ff77cfe5e0ead1b253f708ff9077638185173034d484abee0d49f97475a88dfb00fad0c31c2
 DIST botocore-1.35.90.gh.tar.gz 14180996 BLAKE2B d3b39e375d33af6515649c9be4b783e6dc7717ffc29460f83507ba392ae4b77a55811e07b7a0fc732e9d5d24b7bd0d1dee450ae7c62ef535c7f70d79936cb186 SHA512 8814eb1c435f753195f5189d21bb60ae29ccc007f16cd451bea0fc7650b6c5daf1c94e07e04d95b3c320974b2dcf27520aa3ab6b56b1351b22d137312d9dc3c2
-DIST botocore-1.35.91.gh.tar.gz 14185588 BLAKE2B 801124dc9a996a8e28341a3154dfea8dcb39b56da50a92bd57293023147c4f312f552eb658546abd74a66b7eb1be76a9cc6c2b31ec4fa1d1e1871d6b8e85d832 SHA512 047b3a742596ee956722f0a24faea41ce550f2dec4f0746791f545cd12c96c3e056f13d83f1f830aa57fc1e2325b5d4855a41fe89f5c89ceb6d0bce1dbde470d
+DIST botocore-1.35.92.gh.tar.gz 14183742 BLAKE2B daace36b81ddb44f13e785979c37d1f22a997c88e32554595a0db910a93148fccbf74def98b64210ee8159bf41fec99f57750741f13e2b468268035413d9bce0 SHA512 fb916bbe9c572c02fec36748ec3c5c3d6f9b9e8c7afd09bd48221675a6738ca9cafd2a05862236275e3b156cb392953b9a23d958afa9ad88b2a2d89fa23c02b9
+DIST botocore-1.35.97.gh.tar.gz 14178448 BLAKE2B dd5f48480abe1495925215a77ca29a4b5a79e79256ac1267c7c86cc1f5db4b14bf32fd5ea6e634f84f77fd28670adb33938f770c11c09ed979654af4f237c1a3 SHA512 28f7d7fc0d7535dca7e22acef0906188fe18da3a96877a88fffc2ae3fcf02433aa18220c32936c4713a8cfe47b15ec63387e836a6cb61574810943fd789a903e
+DIST botocore-1.35.98.gh.tar.gz 14182207 BLAKE2B 427a5d1fa48cea7f2862fcfc8e994c537558e793f74db28936e19a2264960f58780af538ccdd74ad9e8aa5ec26ad95208a383b27503ce5c0ec85feb75f604e8e SHA512 d273490e9f47ae316e8322a014dc36287d7a7dc9c2e7f7239bb00ca0b2b765e2f9a65d4a86a401143e86540d6e928e17c1a1ad4070839c25629b206204127bbe
+DIST botocore-1.35.99.gh.tar.gz 14183345 BLAKE2B bc75753f1a18aa402ec4885daea1edc8c019a4d7558dd35a7848e01fef531cf20fd81de2a88cb4aff59972f11d8ef70e7df70c3ea68587f1855d06e9e236c5e0 SHA512 d0304fa26305fd8d451333892904bc0e5d87308222ba50cfe0b867f3bf0b0d4e2daf8c7f93d921374132384b9a3b89d4110f048c1a509070228fc5ef6c278989
+DIST botocore-1.36.0.gh.tar.gz 14191030 BLAKE2B 32e34c717fe5d2161c92380010b8f9936509bae4775626133b0f6c56ffe3096673902adc464ea392befbb97998277e907159659e2ede5ff31062d3c54ee8c2ff SHA512 95923e75a549c791588c58e5e5fef25ee5920b1f949fb93d8478926583de40216160147c2421fa90a1a23cb4f58dc4c2e194aabfb5fcabd30a31c944bc95567c
+DIST botocore-1.36.1.gh.tar.gz 14190157 BLAKE2B ff3c5ef62d6eb7c3907187ccb29bedc4515456d1d50fe3169d27dfd6e8374d953a33761dce0958131fb8d25681be3dfc3b07495e0082292a278695199a93d1bf SHA512 cc50a7b84c8002dad65434899958ef07b0fd9368efeed59d1419580c96824a0e4f34edbf39668138a200169cfdec3820d5ce669b8e0aedf498c7c45497efc127
+DIST botocore-1.36.2.gh.tar.gz 14197789 BLAKE2B 21441cd52052d117ce05e425c13f34941dcc1ca26a03e2e7eefb6c82584d7faffb548435ebb6b716b72db8149cfe6a3378b79f9174c676fd193c194501b0c844 SHA512 45d9515c493b238a003e5ad264b152b68a62e7ca140ea13111865a4b7c674a7b309a0f550f9782c37966b95c114136b8788f00ba0c83ed4bc61521b593376594
diff --git a/dev-python/botocore/botocore-1.35.81.ebuild b/dev-python/botocore/botocore-1.35.81.ebuild
deleted file mode 100644
index 2a4066b03f9d..000000000000
--- a/dev-python/botocore/botocore-1.35.81.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.86.ebuild b/dev-python/botocore/botocore-1.35.86.ebuild
deleted file mode 100644
index 0f88c5cbe9f3..000000000000
--- a/dev-python/botocore/botocore-1.35.86.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.90.ebuild b/dev-python/botocore/botocore-1.35.90.ebuild
index 0f88c5cbe9f3..607aafac8c57 100644
--- a/dev-python/botocore/botocore-1.35.90.ebuild
+++ b/dev-python/botocore/botocore-1.35.90.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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.35.91.ebuild b/dev-python/botocore/botocore-1.35.92.ebuild
index dc4ea7243fc6..dc4ea7243fc6 100644
--- a/dev-python/botocore/botocore-1.35.91.ebuild
+++ b/dev-python/botocore/botocore-1.35.92.ebuild
diff --git a/dev-python/botocore/botocore-1.35.97.ebuild b/dev-python/botocore/botocore-1.35.97.ebuild
new file mode 100644
index 000000000000..9e1580d45581
--- /dev/null
+++ b/dev-python/botocore/botocore-1.35.97.ebuild
@@ -0,0 +1,67 @@
+# 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="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.35.98.ebuild b/dev-python/botocore/botocore-1.35.98.ebuild
new file mode 100644
index 000000000000..9e1580d45581
--- /dev/null
+++ b/dev-python/botocore/botocore-1.35.98.ebuild
@@ -0,0 +1,67 @@
+# 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="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.35.99.ebuild b/dev-python/botocore/botocore-1.35.99.ebuild
new file mode 100644
index 000000000000..9e1580d45581
--- /dev/null
+++ b/dev-python/botocore/botocore-1.35.99.ebuild
@@ -0,0 +1,67 @@
+# 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="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.36.0.ebuild b/dev-python/botocore/botocore-1.36.0.ebuild
new file mode 100644
index 000000000000..9e1580d45581
--- /dev/null
+++ b/dev-python/botocore/botocore-1.36.0.ebuild
@@ -0,0 +1,67 @@
+# 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="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.36.1.ebuild b/dev-python/botocore/botocore-1.36.1.ebuild
new file mode 100644
index 000000000000..9e1580d45581
--- /dev/null
+++ b/dev-python/botocore/botocore-1.36.1.ebuild
@@ -0,0 +1,67 @@
+# 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="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.36.2.ebuild b/dev-python/botocore/botocore-1.36.2.ebuild
new file mode 100644
index 000000000000..9e1580d45581
--- /dev/null
+++ b/dev-python/botocore/botocore-1.36.2.ebuild
@@ -0,0 +1,67 @@
+# 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="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index a92edc89a76d..f48b0d5e736e 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1 +1,2 @@
 DIST bpython-0.24.tar.gz 222879 BLAKE2B d74276c2da25e4c9f4440af3c26bd69b08baa3f6f8ae04f55ace2a159c5d839711b6f969dcaae831bc680273bc6f4f8e7f9297751534ae14d76fb06e6bc4be48 SHA512 f95e853ad5aaba476cf0bcc197ae1d322af4a458637f8445372b54b75d315d3caae7a3f8b7d8c6d1bd2c4307c36b21cf320b22c367990bd0b9bfbf42a5e02267
+DIST bpython-0.25.tar.gz 207610 BLAKE2B d180838ddbf87165acf44214bdf3d5983ebcecb529647ecdd4f1b8f7c325a1d7013e47908ee88bdacacec9ba9b0b3f3052fc88999128416e6a01e1b7cfa1194b SHA512 052a84666e5e559a883964d8eb41a1ed8c704a9760799cdbe98d7fdcd8060815b5d7b26e7589a56735f91c1f1214b1cdf17ad30d6bed34a506233d2d9e0bbd2c
diff --git a/dev-python/bpython/bpython-0.25.ebuild b/dev-python/bpython/bpython-0.25.ebuild
new file mode 100644
index 000000000000..b6073f6d348b
--- /dev/null
+++ b/dev-python/bpython/bpython-0.25.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=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
+HOMEPAGE="
+	https://www.bpython-interpreter.org/
+	https://github.com/bpython/bpython/
+	https://pypi.org/project/bpython/
+"
+
+LICENSE="MIT BSD-2 PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="clipboard +jedi watch"
+
+# see https://github.com/bpython/bpython/issues/641 wrt greenlet
+RDEPEND="
+	>=dev-python/curtsies-0.4.0[${PYTHON_USEDEP}]
+	dev-python/cwcwidth[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	clipboard? ( dev-python/pyperclip[${PYTHON_USEDEP}] )
+	jedi? ( dev-python/jedi[${PYTHON_USEDEP}] )
+	watch? ( dev-python/watchdog[${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+# sphinx is used implicitly to build manpages
+BDEPEND="
+	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst )
+
+distutils_enable_sphinx doc/sphinx/source --no-autodoc
+distutils_enable_tests unittest
diff --git a/dev-python/btrfsutil/Manifest b/dev-python/btrfsutil/Manifest
index a2be730e685c..06b1e86b2059 100644
--- a/dev-python/btrfsutil/Manifest
+++ b/dev-python/btrfsutil/Manifest
@@ -1,8 +1,2 @@
-DIST btrfs-progs-v6.10.1.tar.sign 566 BLAKE2B dc18c0048716e422475c6630c26c74e09b3595fb8c5c1a1826464eb837d16edfe7d5fa1f418631ae4d380b24bc3fb91fa79ba1e9b1d42a2534838558362ddc18 SHA512 a8a1805ab22feda9f0535841d44120200e48d6d3762ae98f3323be09c9bd7905ff69f21066a8de1fe5cb34a3113879b73ae030a74ccc74737f06dafb32093375
-DIST btrfs-progs-v6.10.1.tar.xz 2670604 BLAKE2B 7a2631b8462bb02be0936861a42b868907bd4f4e365293f9c95744b963e769b81248ba0a290fca517d689ff9f93d8709cc37e217264b2dac1469a47349f97e8c SHA512 cd10747d1f5f9377abfdf209b517791d3eb13b417c0be65fd5c0c044b01063125b4176c178345387bb3deda7a3a379953f31d46d7834854455a5dbfbf967aa97
-DIST btrfs-progs-v6.11.tar.sign 566 BLAKE2B 15db44b5db3265eff9d5195ad4842cef5d001c46e1170f219784fca8d049756dccbc1bd95f20fc343fbdf1078c610a166921c043828cdc5f64c0f465323ca0e4 SHA512 a2fdd9100ad3ddd30cb923a72a2b4f70634277e5fbbf0d2cf912c00dc876dad6cd2c24e624f41dbb83aabdda4e3c08aea9c0ae39084bb3481700491df3d47fd5
-DIST btrfs-progs-v6.11.tar.xz 2695752 BLAKE2B 6dec219394e39a821f29858eddf1d501537d3cebad2dc83f0cea6d88d0b0e94c4fe2e660a48a27942ccfb6f3ac0630d5930f44e083168de65b60af36e895b2af SHA512 fad3c7e908e2020a3983f9737a7e87367023e2ad35aea14197e2bfa71c1e0435bc3da3f7e6ef463de47c033323163f8b1b7933013042c6fcea673d0f4723ade1
 DIST btrfs-progs-v6.12.tar.sign 566 BLAKE2B 3a32b52522acd9e2fcf34cbf90d91ca2491ae1b34142320b987084a60c9f6c13100fcfb554f877c0f659b60415234550c05d980c633015cd8d083df18521187a SHA512 86396dad38f15c19eb4b641632deb99073829896001b71fbdfaa3ebd11468e8b89ed324e563ec9db837c9095501227824f97085347dca4204cbaecceed9da7d3
 DIST btrfs-progs-v6.12.tar.xz 2705336 BLAKE2B d1569ec7b2079a43ac370c3a7e9f1b37a06545675753490f16d6a7bb52281f76df39f924c96569a1c75daa8a998f251c5219e2f09a54cb94c42cba1db3cf43ca SHA512 57da37f460a33b5f5232a5c8e67eb5976fb13483a1437112bd433b179bc0e497a1aadfe24705eb4fb4e0a98d2a33fd3c46808b3ca161421475442a70b964c446
-DIST btrfs-progs-v6.9.2.tar.sign 566 BLAKE2B 4cd95496d355444c7d3e582a7e6c05fbb55683008b1585a26f38aef6cceb1afd5e80c9611518d6bd92dc1167798d4012c4bcab2f9bda752c459d94cfa6f3c477 SHA512 3fb04e1894e231abde388a39d2f0c90f43c1a1494622c2158fab9b94bb340e064404bcf96e24d913c60aaf5e06ade42fbb91a479949109b329682bb089f66bf2
-DIST btrfs-progs-v6.9.2.tar.xz 2661684 BLAKE2B 38ab189ac8271ba8d68b74e82569159c671cca1cb946f56ccab28b6b206cb6ee5b330d83afc3536b7e0d7399da3fb01e368809c1ef4a64b843ea88796ebd28bd SHA512 1df9d5456d07a035c38c17795996a4fc621eeaa244ef54383d4387205826d2a6e971910e55031d20bb1baf23193efa7439e110312ffd8471f07aaf8c0baca20a
diff --git a/dev-python/btrfsutil/btrfsutil-6.10.1.ebuild b/dev-python/btrfsutil/btrfsutil-6.10.1.ebuild
deleted file mode 100644
index fd6e43e52785..000000000000
--- a/dev-python/btrfsutil/btrfsutil-6.10.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc
-
-inherit distutils-r1 verify-sig
-
-DESCRIPTION="Library for managing Btrfs filesystems"
-HOMEPAGE="https://github.com/kdave/btrfs-progs"
-
-MY_PN="btrfs-progs"
-MY_PV="v${PV/_/-}"
-MY_P="${MY_PN}-${MY_PV}"
-SRC_URI="
-	https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${MY_PN}/${MY_P}.tar.xz
-	verify-sig? ( https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${MY_PN}/${MY_P}.tar.sign )
-"
-S="${WORKDIR}/${MY_P}/libbtrfsutil/python"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-DEPEND="~sys-fs/btrfs-progs-${PV}"
-RDEPEND="${DEPEND}"
-
-distutils_enable_tests unittest
-
-RDEPEND+=" !sys-fs/btrfs-progs[python(-)]"
-
-src_unpack() {
-	# Upstream sign the decompressed .tar
-	if use verify-sig; then
-		einfo "Unpacking ${MY_P}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
diff --git a/dev-python/btrfsutil/btrfsutil-6.11.ebuild b/dev-python/btrfsutil/btrfsutil-6.11.ebuild
deleted file mode 100644
index fd6e43e52785..000000000000
--- a/dev-python/btrfsutil/btrfsutil-6.11.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc
-
-inherit distutils-r1 verify-sig
-
-DESCRIPTION="Library for managing Btrfs filesystems"
-HOMEPAGE="https://github.com/kdave/btrfs-progs"
-
-MY_PN="btrfs-progs"
-MY_PV="v${PV/_/-}"
-MY_P="${MY_PN}-${MY_PV}"
-SRC_URI="
-	https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${MY_PN}/${MY_P}.tar.xz
-	verify-sig? ( https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${MY_PN}/${MY_P}.tar.sign )
-"
-S="${WORKDIR}/${MY_P}/libbtrfsutil/python"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-DEPEND="~sys-fs/btrfs-progs-${PV}"
-RDEPEND="${DEPEND}"
-
-distutils_enable_tests unittest
-
-RDEPEND+=" !sys-fs/btrfs-progs[python(-)]"
-
-src_unpack() {
-	# Upstream sign the decompressed .tar
-	if use verify-sig; then
-		einfo "Unpacking ${MY_P}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
diff --git a/dev-python/btrfsutil/btrfsutil-6.9.2.ebuild b/dev-python/btrfsutil/btrfsutil-6.9.2.ebuild
deleted file mode 100644
index bb3aa96ea329..000000000000
--- a/dev-python/btrfsutil/btrfsutil-6.9.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-# py3.13: https://github.com/kdave/btrfs-progs/issues/838
-PYTHON_COMPAT=( python3_{10..12} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc
-
-inherit distutils-r1 verify-sig
-
-DESCRIPTION="Library for managing Btrfs filesystems"
-HOMEPAGE="https://github.com/kdave/btrfs-progs"
-
-MY_PN="btrfs-progs"
-MY_PV="v${PV/_/-}"
-MY_P="${MY_PN}-${MY_PV}"
-SRC_URI="
-	https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${MY_PN}/${MY_P}.tar.xz
-	verify-sig? ( https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${MY_PN}/${MY_P}.tar.sign )
-"
-S="${WORKDIR}/${MY_P}/libbtrfsutil/python"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-DEPEND="~sys-fs/btrfs-progs-${PV}"
-RDEPEND="${DEPEND}"
-
-distutils_enable_tests unittest
-
-RDEPEND+=" !sys-fs/btrfs-progs[python(-)]"
-
-src_unpack() {
-	# Upstream sign the decompressed .tar
-	if use verify-sig; then
-		einfo "Unpacking ${MY_P}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
diff --git a/dev-python/cachecontrol/cachecontrol-0.14.1.ebuild b/dev-python/cachecontrol/cachecontrol-0.14.1.ebuild
index 3e3e9f8ff85b..43df822171e5 100644
--- a/dev-python/cachecontrol/cachecontrol-0.14.1.ebuild
+++ b/dev-python/cachecontrol/cachecontrol-0.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/msgpack-2[${PYTHON_USEDEP}]
diff --git a/dev-python/cerberus/Manifest b/dev-python/cerberus/Manifest
index 3f64dd28104f..f33d3efa0845 100644
--- a/dev-python/cerberus/Manifest
+++ b/dev-python/cerberus/Manifest
@@ -1,3 +1 @@
-DIST cerberus-1.3.5.gh.tar.gz 921848 BLAKE2B 1f7f1c6804702dea6ab31c3e278a4d769c80c898e786aa7c7f7df0bc212edf07c4026c5dd6adf7ecdcacfd596ec33c3493ec26c3de68bd8254fce56e6532fff7 SHA512 eaa91f229a009770a1750a51e82c34f06dffeebca7af7cafd5ba3a8529502326dd20af1ed7a60fd5e5ed28edb4b974712b1493aa1e330097a8e36ad70c5e4f23
-DIST cerberus-1.3.6.gh.tar.gz 920930 BLAKE2B 168ca5e628448a4477f1aec7f1371cdf8c89c0e40c3e3f10bd3b6da1c7d78580e0db4403c8f2abe98baa7db5cbbe1b92241af725bacd9f3eced899397bafe8eb SHA512 2ee32ade240198af6aa2927d80a24e00a5d4aac22486aa13b375f7235e5491a2c61910a16e1d965c0e57cf226a3865675f2037e281d1461b262c6cbb13cb6271
 DIST cerberus-1.3.7.gh.tar.gz 920947 BLAKE2B 0cf9cb6fbb156007f7c44dfc427579649b8ed1e70cdf7f89f728b4d6071fda7073d5e5328be6e398744fa715dbc53ff8ea79195ef87e42f9b3bc4c838532c531 SHA512 69ed22089f3fb8c1869585abff39510f9a0bcf8dfbf82fa995177999e634e1a93bc535a2c7d330ec2491b01a0fe807d803144d3f08cdd6c9589c39e2aaec9235
diff --git a/dev-python/cerberus/cerberus-1.3.5.ebuild b/dev-python/cerberus/cerberus-1.3.5.ebuild
deleted file mode 100644
index 4e6ecff289e5..000000000000
--- a/dev-python/cerberus/cerberus-1.3.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight and extensible data-validation library for Python"
-HOMEPAGE="
-	https://docs.python-cerberus.org/
-	https://github.com/pyeve/cerberus/
-	https://pypi.org/project/Cerberus/
-"
-SRC_URI="
-	https://github.com/pyeve/cerberus/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.4-raw_docstrings.patch
-)
-
-EPYTEST_DESELECT=(
-	# Require currently unpackaged pytest-benchmark, more useful
-	# to developers than to end users.
-	cerberus/benchmarks/
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/cerberus/cerberus-1.3.6.ebuild b/dev-python/cerberus/cerberus-1.3.6.ebuild
deleted file mode 100644
index 3d821d540124..000000000000
--- a/dev-python/cerberus/cerberus-1.3.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight and extensible data-validation library for Python"
-HOMEPAGE="
-	https://docs.python-cerberus.org/
-	https://github.com/pyeve/cerberus/
-	https://pypi.org/project/Cerberus/
-"
-SRC_URI="
-	https://github.com/pyeve/cerberus/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-EPYTEST_DESELECT=(
-	# Require currently unpackaged pytest-benchmark, more useful
-	# to developers than to end users.
-	cerberus/benchmarks/
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/cerberus/cerberus-1.3.7.ebuild b/dev-python/cerberus/cerberus-1.3.7.ebuild
index 60d0a0c21ea1..28688e714434 100644
--- a/dev-python/cerberus/cerberus-1.3.7.ebuild
+++ b/dev-python/cerberus/cerberus-1.3.7.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 EPYTEST_DESELECT=(
 	# Require currently unpackaged pytest-benchmark, more useful
diff --git a/dev-python/cerberus/files/cerberus-1.3.4-raw_docstrings.patch b/dev-python/cerberus/files/cerberus-1.3.4-raw_docstrings.patch
deleted file mode 100644
index 70ba15b0445f..000000000000
--- a/dev-python/cerberus/files/cerberus-1.3.4-raw_docstrings.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Addresses https://github.com/pyeve/cerberus/issues/568.
-Backported upstream commit 5c267b554a39b5a8650659d3eea0cf383e47a166.
-
---- a/cerberus/errors.py
-+++ b/cerberus/errors.py
-@@ -153,7 +153,7 @@
- 
-     @property
-     def definitions_errors(self):
--        """
-+        r"""
-         Dictionary with errors of an \*of-rule mapped to the index of the definition it
-         occurred in. Returns :obj:`None` if not applicable.
-         """
-@@ -181,7 +181,7 @@
- 
-     @property
-     def is_logic_error(self):
--        """
-+        r"""
-         ``True`` for validation errors against different schemas with \*of-rules.
-         """
-         return bool(self.code & LOGICAL.code - ERROR_GROUP.code)
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 9d7f5369842c..d9a94d18d03e 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,3 +1,2 @@
-DIST cfn_lint-1.21.0.tar.gz 2747268 BLAKE2B 580fffc95d5829374f1dda111e2cc805639a463514112cabe0e34b6f53344991819f81b8246adb9fe3ee8fe59ee5db9000befead7a21ce85694bac248589a72a SHA512 2091f02a30ee22313db52094e9f54e5978eca69aa0c0cc96e1e39cae720f04165b4ff2aa0f01419c5327f149d5bd5ab16c4ba9b2af0a8f42b1a1872991a6e4da
-DIST cfn_lint-1.22.2.tar.gz 2848845 BLAKE2B 4f9194e019c1dae1d373b8432693be9463a668e5db522c7a23adcfaf04c591e49d0d1dc4853323f32fdb0d2c8db1c9e7a0bf6cddf652541bb057cfc3525ed53e SHA512 8e80892692e4458591f9863ad43af8bd8c5fbe2e554c75dda3029ac73a5a04987238221d50a3d2597dc0195dd049f36f9fcdc2b917c68b9a4d6807b4e8bf411c
 DIST cfn_lint-1.22.3.tar.gz 2700564 BLAKE2B d1bfed3fda2d5133919396a54257ad484c3c7fd50b1a387e94eff404f9b8175135f0f39455bc45b69c8112e2f2c57eb055d7b2c879415bdc4abfdad74b7bb34f SHA512 45502d913488784ff8e355a24317cce42fc7df39b3afd80b8fc170c9c5b7e6191f3ff41a460e8bb0277d1c21483aef8addb41d60fe2e8e5d13058aa85fefcc84
+DIST cfn_lint-1.22.5.tar.gz 2722622 BLAKE2B 147f1ec4543a2e54c6b6652b439ca4dd870aad44532a71bc75564bcb71e1aed0258b0387e3be57ef2c8059343cefaf2fef1af02b9442c37347987c018c9411ef SHA512 772430a958e53b90c529311a6f90602de7c2ced9d86840907a9c1e612f18db456c6678d2de43b3bee2e3498cc71b238e2ab8564238aef4467cc285c52ad3a6dd
diff --git a/dev-python/cfn-lint/cfn-lint-1.21.0.ebuild b/dev-python/cfn-lint/cfn-lint-1.21.0.ebuild
deleted file mode 100644
index cf3dbb45dc5f..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.21.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.94.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.22.2.ebuild b/dev-python/cfn-lint/cfn-lint-1.22.2.ebuild
deleted file mode 100644
index 55b02df4cc9d..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.22.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.94.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.22.3.ebuild b/dev-python/cfn-lint/cfn-lint-1.22.3.ebuild
index 55b02df4cc9d..7eae4ea2a82b 100644
--- a/dev-python/cfn-lint/cfn-lint-1.22.3.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-1.22.3.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.94.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-1.22.5.ebuild b/dev-python/cfn-lint/cfn-lint-1.22.5.ebuild
new file mode 100644
index 000000000000..11b35b918d51
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-1.22.5.ebuild
@@ -0,0 +1,70 @@
+# 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="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.94.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
+	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/unit/module/test_template.py::TestTemplate::test_build_graph
+		# requires git repo
+		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+		# Internet
+		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
+		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
+		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
+		# different graphviz version?
+		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
+	)
+
+	# from tox.ini
+	local -x AWS_DEFAULT_REGION=us-east-1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 496452a4eb93..edfff0d60787 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,2 +1 @@
-DIST Chameleon-4.5.4.tar.gz 180464 BLAKE2B cb77a1a928e67b029038f7e2704f077cc45e2baf79dfb30bdf460d0f940cb8fb30f5e42ef5b977a6c33e070b229ede1b53268d30a5d2f165607db8f03179f061 SHA512 476ecc902e252eca6de0552f4526666eaccd305f973d2cf6035c209174152c27d7dce8f4e8a21b9507a3609c38215446bfaa7203865c6151d02922893422e160
 DIST Chameleon-4.6.0.tar.gz 181111 BLAKE2B cbc518ab34d10d1a715418365728b1a7643a8ab8a31f8cf5adfa33ed24afc4fa502c6226db67d62b704cae577aea4ad2207c8312b68cb380ea2c8b2f78e267c7 SHA512 ff840c73d3b14a060dc98f27d50206ef4d1ae90a1b1541662c585089d5cadd522c58bea03d27883bcb6e80fa0d8ce7e31c8054ef31094eeed065ad074e3ab856
diff --git a/dev-python/chameleon/chameleon-4.5.4.ebuild b/dev-python/chameleon/chameleon-4.5.4.ebuild
deleted file mode 100644
index af3516b5367f..000000000000
--- a/dev-python/chameleon/chameleon-4.5.4.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fast HTML/XML template compiler for Python"
-HOMEPAGE="
-	https://github.com/malthe/chameleon/
-	https://pypi.org/project/Chameleon/
-"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/chameleon/chameleon-4.6.0.ebuild b/dev-python/chameleon/chameleon-4.6.0.ebuild
index 64b0835ea30c..71af5446afd7 100644
--- a/dev-python/chameleon/chameleon-4.6.0.ebuild
+++ b/dev-python/chameleon/chameleon-4.6.0.ebuild
@@ -18,6 +18,6 @@ HOMEPAGE="
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/charset-normalizer/Manifest b/dev-python/charset-normalizer/Manifest
index bc3f3e97bb04..2bfccaa94354 100644
--- a/dev-python/charset-normalizer/Manifest
+++ b/dev-python/charset-normalizer/Manifest
@@ -1,2 +1 @@
-DIST charset_normalizer-3.4.0.tar.gz 106620 BLAKE2B 52dc9a2db3d4aaf841cd464dbe95d1089fd8a8d37e3dcc518ade0a3efe7d26fee529f4f82e344971965ada09108e9b3647c9dfa3222f99cc9fc5fd6b9dd34e8e SHA512 7b7098d389bf4b181bd26037fa439abb44811ee68b01b78bfd399b4213cca7309d4878e90a0983d6aa2c550c3b9b355c8b5157fae731981f3e6e4028a911d143
 DIST charset_normalizer-3.4.1.tar.gz 123188 BLAKE2B 04a2a47967d3992eb6320f173689693efb0614d67986fe1417f2f096435d2cdfaf10c57b6ecd2659f19ee907902c16fcd30f050cd14460973a059fc62ea999e3 SHA512 2891c0bd3097ad38d296a8378ded36110a06113c0f79e49cdfd7f3bca4f42487d10895db34cbb020cb70e93d9094ae72555ceef5535f8984de1cac4082232f4f
diff --git a/dev-python/charset-normalizer/charset-normalizer-3.4.0.ebuild b/dev-python/charset-normalizer/charset-normalizer-3.4.0.ebuild
deleted file mode 100644
index 925b82e56f56..000000000000
--- a/dev-python/charset-normalizer/charset-normalizer-3.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="The Real First Universal Charset Detector"
-HOMEPAGE="
-	https://pypi.org/project/charset-normalizer/
-	https://github.com/jawah/charset_normalizer/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts=
-}
diff --git a/dev-python/charset-normalizer/charset-normalizer-3.4.1.ebuild b/dev-python/charset-normalizer/charset-normalizer-3.4.1.ebuild
index 2389de2c6759..d8c918823913 100644
--- a/dev-python/charset-normalizer/charset-normalizer-3.4.1.ebuild
+++ b/dev-python/charset-normalizer/charset-normalizer-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # please keep this ebuild at EAPI 8 -- sys-apps/portage dep
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/cheroot/cheroot-10.0.1.ebuild b/dev-python/cheroot/cheroot-10.0.1.ebuild
index 0ceac605bb4e..514c6a2219e5 100644
--- a/dev-python/cheroot/cheroot-10.0.1.ebuild
+++ b/dev-python/cheroot/cheroot-10.0.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/cherrypy/cherrypy-18.10.0.ebuild b/dev-python/cherrypy/cherrypy-18.10.0.ebuild
index ae0a09d7de53..d648f1261c53 100644
--- a/dev-python/cherrypy/cherrypy-18.10.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.10.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 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="ssl test"
 
 RDEPEND="
diff --git a/dev-python/clang/Manifest b/dev-python/clang/Manifest
index fef409fa0e6a..b7114fc7aeab 100644
--- a/dev-python/clang/Manifest
+++ b/dev-python/clang/Manifest
@@ -10,4 +10,7 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607 SHA512 d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
+DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/dev-python/clang/clang-19.1.7.ebuild b/dev-python/clang/clang-19.1.7.ebuild
new file mode 100644
index 000000000000..07386b38357e
--- /dev/null
+++ b/dev-python/clang/clang-19.1.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for llvm-core/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=llvm-core/clang-${PV}:*
+	!llvm-core/llvm:0[clang(-),python(-)]
+	!llvm-core/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		llvm-core/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	local -x CLANG_NO_DEFAULT_CONFIG=1
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/clang/clang-20.0.0_pre20241227.ebuild b/dev-python/clang/clang-20.0.0_pre20241227.ebuild
deleted file mode 100644
index 871a0ee635a8..000000000000
--- a/dev-python/clang/clang-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for llvm-core/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=llvm-core/clang-${PV}:*
-	!llvm-core/llvm:0[clang(-),python(-)]
-	!llvm-core/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		llvm-core/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	local -x CLANG_NO_DEFAULT_CONFIG=1
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang/clang-20.0.0_pre20250111.ebuild b/dev-python/clang/clang-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..694150a44a53
--- /dev/null
+++ b/dev-python/clang/clang-20.0.0_pre20250111.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for llvm-core/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=llvm-core/clang-${PV}:*
+	!llvm-core/llvm:0[clang(-),python(-)]
+	!llvm-core/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		llvm-core/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	local -x CLANG_NO_DEFAULT_CONFIG=1
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/clang/clang-20.0.0_pre20250118.ebuild b/dev-python/clang/clang-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..694150a44a53
--- /dev/null
+++ b/dev-python/clang/clang-20.0.0_pre20250118.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for llvm-core/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=llvm-core/clang-${PV}:*
+	!llvm-core/llvm:0[clang(-),python(-)]
+	!llvm-core/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		llvm-core/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	local -x CLANG_NO_DEFAULT_CONFIG=1
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index b20215e5a268..a4f66063471c 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,2 +1 @@
-DIST click-8.1.7.gh.tar.gz 341625 BLAKE2B 11acc52c1138945e2588019811c88c4edf492fe7de44a17e9e5b60f0ca503c22f877ff42b3384b95cf207995d8cd7c8c3c90b47be2bf2b3f4efc0d03ab883405 SHA512 a1cb115b90193d78f94ec2a6af563b089820517e6e0e4b71ea3d6c68304444d16db3597358c62e1757d9d05449996b7168a220eecde6ab4991367fdb6e74096f
 DIST click-8.1.8.gh.tar.gz 342860 BLAKE2B f55518e66473c43e78d5127d7a4467cce5a7e25c84dae2f740e9cfa1682213e5c243ff4da90768a25374921b5d2d482525b6975818f5383ebcde77f298c9694d SHA512 f9f501210d202026a8449df1eef570f5399887a3efda9499d4a4180bbe96bc232809929bf80f9a65037583e84dfa8af3f0c348353c41121c815a9ead2c58d3aa
diff --git a/dev-python/click/click-8.1.7.ebuild b/dev-python/click/click-8.1.7.ebuild
deleted file mode 100644
index 4a8e2e7a9923..000000000000
--- a/dev-python/click/click-8.1.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-HOMEPAGE="
-	https://palletsprojects.com/p/click/
-	https://github.com/pallets/click/
-	https://pypi.org/project/click/
-"
-SRC_URI="
-	https://github.com/pallets/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="examples"
-
-distutils_enable_sphinx docs \
-	'>=dev-python/docutils-0.14' \
-	dev-python/pallets-sphinx-themes \
-	dev-python/sphinxcontrib-log-cabinet \
-	dev-python/sphinx-issues \
-	dev-python/sphinx-tabs
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click/click-8.1.8.ebuild b/dev-python/click/click-8.1.8.ebuild
index cfb129e27c99..fc74cec44125 100644
--- a/dev-python/click/click-8.1.8.ebuild
+++ b/dev-python/click/click-8.1.8.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
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="examples"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index ce9eb012e497..4bbb383ac2c3 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1 +1,2 @@
 DIST cloudpickle-3.1.0.gh.tar.gz 62638 BLAKE2B f99e2c96aa60a98ed401c59d8bfb6fc18735cda685ce669747e50a28d19cf27bea6e863af42b8e93c28ee7ddd0a075359864b683fca356c74c425a13f9573833 SHA512 1ab356d394af43496ab426c58a33e087dc2c71da77a7e744f860115a40217bac9f16d10b9510543415f8b8c1799729c6a6bf0f4c6b4b5eb82fce7a25fabbfa1d
+DIST cloudpickle-3.1.1.gh.tar.gz 63697 BLAKE2B 81a971fd2e96cab4bdd56adf3c6f9eb4349a978a2b5d7dddeb3a1c0ecf0b2c4f02f4fb64890759316d4ba978758aee042ede883f1803d5133d6012da8eef5a48 SHA512 a967f7236dde114d76b3b77e981bc274101e3bd5a11b05b57a23428bf6b9cd8f6b04113295170e40b9d30f1f09d646bc906879c0146aa81b7adf0368608f45b4
diff --git a/dev-python/cloudpickle/cloudpickle-3.1.1.ebuild b/dev-python/cloudpickle/cloudpickle-3.1.1.ebuild
new file mode 100644
index 000000000000..7b068fb9b2b2
--- /dev/null
+++ b/dev-python/cloudpickle/cloudpickle-3.1.1.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=flit
+PYTHON_COMPAT=( pypy3 python3_{10..13} python3_13t )
+
+inherit distutils-r1
+
+DESCRIPTION="Extended pickling support for Python objects"
+HOMEPAGE="
+	https://github.com/cloudpipe/cloudpickle/
+	https://pypi.org/project/cloudpickle/
+"
+SRC_URI="
+	https://github.com/cloudpipe/cloudpickle/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTHONPATH=${PYTHONPATH}:tests/cloudpickle_testpkg
+	# -s unbreaks some tests
+	# https://github.com/cloudpipe/cloudpickle/issues/252
+	epytest -s
+}
diff --git a/dev-python/clr-loader/Manifest b/dev-python/clr-loader/Manifest
index d5b783bc3770..8bd2dfd07c0d 100644
--- a/dev-python/clr-loader/Manifest
+++ b/dev-python/clr-loader/Manifest
@@ -1,4 +1,3 @@
-DIST clr_loader-0.2.6.tar.gz 44757 BLAKE2B dd1a9513ffebc39b0861780d14c85b98e2b08b9911fd34bef180dcf76a5fc9f95236db47d3802b4cdcc7bcfb9343de4b1d4c516036562baf92d3e37e07ff42c0 SHA512 59d7918de9ca0b42dd7509b43f7994a5b3788e01fa4015e00e7957f4430c8291ad8736615b859ca0a91d26ad9a495677cb724654414f870f7f43d07d1b6516ce
 DIST clr_loader-0.2.7.post0.tar.gz 56701 BLAKE2B 17271bc3bdbaa70a2aec0d3570df0739536a05289bb538349fdbe4daed2fca041a0640b110cea7e2b8f67d03f5437a76d46829c77d418f05918af29b4adaee33 SHA512 9ab59712556d293ae3611cf841ce072346973ab731cb9fbb1cdd5dfb737a1a410d447d3032485f4bb918490ae68c3c4893629a8b63639b06c0bb9d9e6c682986
 DIST microsoft.netcore.platforms.1.1.0.nupkg 17960 BLAKE2B 6a9fa22d75f5a1c65746dd71a63c3d4e37c393e99c23007c10f5ecce248a04863bf26e7562c7751177a6985eaac266c29cc6a5443a4a853e773f88994ad2a3fd SHA512 6bf892c274596fe2c7164e3d8503b24e187f64d0b7bec6d9b05eb95f04086fceb7a85ea6b2685d42dc465c52f6f0e6f636c0b3fddac48f6f0125dfd83e92d106
 DIST microsoft.netframework.referenceassemblies.1.0.0.nupkg 20946 BLAKE2B ac609f5ddaec68f4afca36b710408e8f5601f13e6b2c793dae11e1afd3f8fc9b45c3ae9abba2429b4f414a43a48f8e0ea11498f439a17158257701466f372582 SHA512 c8f18b9fc83113c65086d93f7dfd9d62600edd614f5eaaeb294d96cc46bb024cc1cbd93b665f849a33d367acd4df30913db1e50ebc695de7e12cd185a6e1ee9e
diff --git a/dev-python/clr-loader/clr-loader-0.2.6.ebuild b/dev-python/clr-loader/clr-loader-0.2.6.ebuild
deleted file mode 100644
index a18dcbd28462..000000000000
--- a/dev-python/clr-loader/clr-loader-0.2.6.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-DOTNET_PKG_COMPAT=8.0
-NUGETS="
-microsoft.netcore.platforms@1.1.0
-microsoft.netframework.referenceassemblies.net461@1.0.0
-microsoft.netframework.referenceassemblies.net47@1.0.0
-microsoft.netframework.referenceassemblies@1.0.0
-netstandard.library@2.0.3
-nxports@1.0.0
-"
-
-inherit check-reqs dotnet-pkg distutils-r1
-
-DESCRIPTION="Generic pure Python loader for .NET runtimes"
-HOMEPAGE="https://pythonnet.github.io/clr-loader/
-	https://github.com/pythonnet/clr-loader/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/pythonnet/${PN}.git"
-else
-	inherit pypi
-
-	KEYWORDS="amd64"
-fi
-
-SRC_URI+=" ${NUGET_URIS} "
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/cffi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-"
-
-CHECKREQS_DISK_BUILD="500M"
-DOTNET_PKG_PROJECTS=(
-	example/example.csproj
-	netfx_loader/ClrLoader.csproj
-)
-
-EPYTEST_DESELECT=(
-	# Mono only.
-	'tests/test_common.py::test_mono'
-	'tests/test_common.py::test_mono_debug'
-	'tests/test_common.py::test_mono_signal_chaining'
-	'tests/test_common.py::test_mono_set_dir'
-
-	# MS Windows only.
-	'tests/test_common.py::test_netfx'
-	'tests/test_common.py::test_netfx_chinese_path'
-	'tests/test_common.py::test_netfx_separate_domain'
-)
-
-distutils_enable_tests pytest
-dotnet-pkg_force-compat
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	dotnet-pkg_pkg_setup
-}
-
-src_prepare() {
-	# To be compatible with .NET >= 6.0.
-	cat <<-EOF > Directory.Build.props || die
-<Project>
-<PropertyGroup>
-<RollForward>Major</RollForward>
-</PropertyGroup>
-</Project>
-EOF
-	nuget_writeconfig "$(pwd)/"
-
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	dotnet-pkg_src_configure
-	distutils-r1_src_configure
-}
diff --git a/dev-python/clr-loader/clr-loader-0.2.7_p0.ebuild b/dev-python/clr-loader/clr-loader-0.2.7_p0.ebuild
index 71fae40773a5..223f06eb1093 100644
--- a/dev-python/clr-loader/clr-loader-0.2.7_p0.ebuild
+++ b/dev-python/clr-loader/clr-loader-0.2.7_p0.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
@@ -19,8 +19,11 @@ nxports@1.0.0
 inherit check-reqs dotnet-pkg distutils-r1
 
 DESCRIPTION="Generic pure Python loader for .NET runtimes"
-HOMEPAGE="https://pythonnet.github.io/clr-loader/
-	https://github.com/pythonnet/clr-loader/"
+HOMEPAGE="
+	https://pythonnet.github.io/clr-loader/
+	https://github.com/pythonnet/clr-loader/
+	https://pypi.org/project/clr_loader/
+"
 
 if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
@@ -29,7 +32,7 @@ if [[ "${PV}" == *9999* ]] ; then
 else
 	inherit pypi
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 SRC_URI+=" ${NUGET_URIS} "
diff --git a/dev-python/clr-loader/metadata.xml b/dev-python/clr-loader/metadata.xml
index dd021b2598b7..67ec48738db2 100644
--- a/dev-python/clr-loader/metadata.xml
+++ b/dev-python/clr-loader/metadata.xml
@@ -14,6 +14,6 @@
   <upstream>
     <bugs-to>https://github.com/pythonnet/clr-loader/issues/</bugs-to>
     <remote-id type="github">pythonnet/clr-loader</remote-id>
-    <remote-id type="pypi">clr-loader</remote-id>
+    <remote-id type="pypi">clr_loader</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 8eaac05aa0c9..c73ccdb9a857 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,2 +1,2 @@
-DIST cmd2-2.5.7.tar.gz 691584 BLAKE2B a43f22817cd028913d1ec49150d826e33ddde1037c2cd1bce066d9ee85c20e5f59daa1b7d5365968aa7f17e3709bd7a58e586c449415ea93f62b157df08eb366 SHA512 b230b7fbad97bdba28a1335839e13c711ef629b0c18c1773c24c64a34626217659e1c362e8d72d71726baa06c50ba3f89732860eee8e527d1485de17e0eeacb7
 DIST cmd2-2.5.8.tar.gz 592395 BLAKE2B 52ea8ffd83dc8fdc904bba8b0bc72960d3782d0bf43a7dcb99b00d68f5bc4fcb5d17ddbe44655cb812bceed861a0dfd8d8753d818233dd9b1ad0e4461ce29eff SHA512 ce19006dff46279f14ac7d23ab4177b7926b061565ceff054291a508773ed0c037bdd20ffc72ecc99d44bcbc3751a486a14dd9d1d43c2e61a7ebd45cf967f06c
+DIST cmd2-2.5.9.tar.gz 883164 BLAKE2B 386c713e5bede98516842965c42f16abf97daaea1b52d8e2beaae04d32bcdfc419d00d5c48bff95dfc703be6dc073327da6dd8aeac947451218ac1f6e06d7632 SHA512 09d742728a964cbc6d01668b554c71535025834f46b1bae36cded63fc07234d0b53c5adae712437826f3df863b80734d7a78b6c36389bffab93201871be9eca1
diff --git a/dev-python/cmd2/cmd2-2.5.7.ebuild b/dev-python/cmd2/cmd2-2.5.7.ebuild
deleted file mode 100644
index 2e5f855520d4..000000000000
--- a/dev-python/cmd2/cmd2-2.5.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 virtualx pypi
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="
-	https://github.com/python-cmd2/cmd2/
-	https://pypi.org/project/cmd2/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pyperclip[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel).
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# TODO: tests_isolated?
-	epytest -o addopts= -p pytest_mock tests || die
-}
diff --git a/dev-python/cmd2/cmd2-2.5.8.ebuild b/dev-python/cmd2/cmd2-2.5.8.ebuild
index 820c48bb0ffa..2683dce6d63c 100644
--- a/dev-python/cmd2/cmd2-2.5.8.ebuild
+++ b/dev-python/cmd2/cmd2-2.5.8.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pyperclip[${PYTHON_USEDEP}]
diff --git a/dev-python/cmd2/cmd2-2.5.9.ebuild b/dev-python/cmd2/cmd2-2.5.9.ebuild
new file mode 100644
index 000000000000..a4d7d976d043
--- /dev/null
+++ b/dev-python/cmd2/cmd2-2.5.9.ebuild
@@ -0,0 +1,54 @@
+# 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 virtualx pypi
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="
+	https://github.com/python-cmd2/cmd2/
+	https://pypi.org/project/cmd2/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/pyperclip-1.8[${PYTHON_USEDEP}]
+	>=dev-python/wcwidth-0.2.10[${PYTHON_USEDEP}]
+"
+# pyperclip uses clipboard backends in the following preference order:
+# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
+# klipper is known to be broken in Xvfb, and therefore causes test
+# failures.  to avoid them, we must ensure that one of the backends
+# preferred to it is available (i.e. xclip or xsel).
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		|| (
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# TODO: tests_isolated?
+	epytest -o addopts= -p pytest_mock -p rerunfailures --reruns=5 tests || die
+}
diff --git a/dev-python/commentjson/commentjson-0.9.0-r2.ebuild b/dev-python/commentjson/commentjson-0.9.0-r2.ebuild
index 49c092272bb1..19f98e0c7e52 100644
--- a/dev-python/commentjson/commentjson-0.9.0-r2.ebuild
+++ b/dev-python/commentjson/commentjson-0.9.0-r2.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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/lark[${PYTHON_USEDEP}]
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index b4d9706cbf74..3f0639df98dd 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,3 +1,2 @@
 DIST coverage-7.6.10.tar.gz 803868 BLAKE2B 88ab379f33ca3056b03020befa56406b3e4d8ce57f9152abddefbf77186dbccd993e855078ea6f61ed2da3d198aab9b63e65fb9db3789a80bb080b1907e9de80 SHA512 3badf42f8f1f1dc19ff7dd7cca7fe57cd738364fea71b1fee52ec7774fbebd2bb241154d2ca06adb6ed87766179bcf0b6eb9a5120af5ec8f3df7b6fd0c27fa02
-DIST coverage-7.6.4.tar.gz 798716 BLAKE2B 2b89e05fa71b18d94e19e9ee7acf3cea4125aa0baf32425e1bcdd695fbad4ac46f89d761cdd1593df1cc59d622dc6b63c010cb85d1b7c0d1396da4b0ac0c29c8 SHA512 ebd0f08584fbe6741f1b578bff22b3bc916b4ea352fd906a090c7a497ab7b885417e83344f108e95a22e93db306822e670578cc290af48e7a24f5a04956bceec
 DIST coverage-7.6.9.tar.gz 801710 BLAKE2B ac3a28d939e5ad7af341e8ef6ac2021ce9aad14117a4f6a31ae68432a0d55c2721c0f99a5e4fec40d4f2bf293e1cd549533643d3f1d6dd20997955614c7eb987 SHA512 ee2e3f93dfd723dabe3c88bac888c056f8dabc890d9078c49393d01c21522d946f7f6d50565a978dfc1d5b8009eca612d9a102a86f568689adc85df8478ecb8c
diff --git a/dev-python/coverage/coverage-7.6.10.ebuild b/dev-python/coverage/coverage-7.6.10.ebuild
index 806fc7ea8616..7c787e847d2e 100644
--- a/dev-python/coverage/coverage-7.6.10.ebuild
+++ b/dev-python/coverage/coverage-7.6.10.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
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/coverage/coverage-7.6.4.ebuild b/dev-python/coverage/coverage-7.6.4.ebuild
deleted file mode 100644
index a00cbee03d96..000000000000
--- a/dev-python/coverage/coverage-7.6.4.ebuild
+++ /dev/null
@@ -1,102 +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=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="
-	https://coverage.readthedocs.io/en/latest/
-	https://github.com/nedbat/coveragepy/
-	https://pypi.org/project/coverage/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/s:-q -n auto::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-test_tracer() {
-	local -x COVERAGE_CORE=${1}
-	einfo "  Testing with the ${COVERAGE_CORE} core ..."
-	epytest -p flaky -p hypothesis -p xdist tests
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO: fails because of additional "Terminated" print on SIGTERM
-		tests/test_concurrency.py::SigtermTest::test_sigterm_threading_saves_data
-		# broken because of pytest plugins explicity loaded
-		tests/test_debug.py::ShortStackTest::test_short_stack{,_skip}
-		# these expect specific availability of C extension matching
-		# COVERAGE_CORE (which breaks testing pytracer on CPython)
-		tests/test_cmdline.py::CmdLineStdoutTest::test_version
-		tests/test_debug.py::DebugTraceTest::test_debug_sys_ctracer
-		# mismatch of expected concurrency in error message
-		# TODO: report upstream?
-		tests/test_concurrency.py::ConcurrencyTest::test_greenlet
-		tests/test_concurrency.py::ConcurrencyTest::test_greenlet_simple_code
-	)
-	local EPYTEST_IGNORE=(
-		# pip these days insists on fetching build deps from Internet
-		tests/test_venv.py
-	)
-
-	"${EPYTHON}" igor.py zip_mods || die
-
-	local -x COVERAGE_TESTING=True
-	# TODO: figure out why they can't be imported inside test env
-	local -x COVERAGE_NO_CONTRACTS=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-
-	local prev_opt=$(shopt -p nullglob)
-	shopt -s nullglob
-	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
-	${prev_opt}
-
-	if [[ -n ${c_ext} ]]; then
-		cp "${c_ext}" coverage/ || die
-		test_tracer ctrace
-	fi
-
-	test_tracer pytrace
-
-	case ${EPYTHON} in
-		python3.1[01]|pypy3)
-			;;
-		*)
-			# available since Python 3.12
-			test_tracer sysmon
-			;;
-	esac
-
-	if [[ -n ${c_ext} ]]; then
-		rm coverage/*.so || die
-	fi
-}
diff --git a/dev-python/cramjam/cramjam-2.9.1.ebuild b/dev-python/cramjam/cramjam-2.9.1.ebuild
index fe9612cabbe3..78e0d6ade615 100644
--- a/dev-python/cramjam/cramjam-2.9.1.ebuild
+++ b/dev-python/cramjam/cramjam-2.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -130,7 +130,7 @@ LICENSE+="
 	Unicode-3.0
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
 
 DEPEND="
 	app-arch/bzip2:=
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index ce8e7cb7b126..a50fa25ac9d0 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,2 +1 @@
-DIST croniter-5.0.1.tar.gz 57084 BLAKE2B 5417d548c103dca87e9dff2ad521e82d5cb468332f3dc11bdff74f331ea23f49753cc9135b22ab1c269e8aa96a05dc04e9b92269b5bbb7334688143daad4664b SHA512 410a3b0ada979259bcd9b82d1b83f3384714645bae642ffaf9e118d65417b716b0efaa3a8c592cc3cc8a9a2694d6f70aa8d36af83aab0c8461493ce96f457bbb
 DIST croniter-6.0.0.tar.gz 64481 BLAKE2B 912932b2919cf8b9d1ed027965ffa0225c29960c3373c40917a32c7a51b1f4f7074791e58c8ee18e301d5e48efc2e6a743d3d294a49ee2bddd5a28ed8ac45755 SHA512 189afd46439471be6f98e477f4a180c56de5b1640463de7a20a3a6c5ff36c121638183d4297be47bfd7fc33a4c38689c9f0d3578010117cf954043638d6a8fe4
diff --git a/dev-python/croniter/croniter-5.0.1.ebuild b/dev-python/croniter/croniter-5.0.1.ebuild
deleted file mode 100644
index 6b9cd9264d4d..000000000000
--- a/dev-python/croniter/croniter-5.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="
-	https://github.com/kiorky/croniter/
-	https://pypi.org/project/croniter/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/croniter/croniter-6.0.0.ebuild b/dev-python/croniter/croniter-6.0.0.ebuild
index 678616a1506d..4317564e8dfb 100644
--- a/dev-python/croniter/croniter-6.0.0.ebuild
+++ b/dev-python/croniter/croniter-6.0.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
@@ -10,13 +10,13 @@ inherit distutils-r1 pypi
 
 DESCRIPTION="Python module to provide iteration for datetime object"
 HOMEPAGE="
-	https://github.com/kiorky/croniter/
+	https://github.com/corpusops/croniter/
 	https://pypi.org/project/croniter/
 "
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/croniter/metadata.xml b/dev-python/croniter/metadata.xml
index 70839ef08cc9..7b44296fd4ca 100644
--- a/dev-python/croniter/metadata.xml
+++ b/dev-python/croniter/metadata.xml
@@ -3,12 +3,9 @@
 <pkgmetadata>
 	<upstream>
 		<remote-id type="pypi">croniter</remote-id>
-		<remote-id type="github">kiorky/croniter</remote-id>
+		<remote-id type="github">corpusops/croniter</remote-id>
 	</upstream>
 	<stabilize-allarches/>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/cstruct/Manifest b/dev-python/cstruct/Manifest
index 3229b3e29c9f..ecbc39030375 100644
--- a/dev-python/cstruct/Manifest
+++ b/dev-python/cstruct/Manifest
@@ -1 +1,2 @@
 DIST python-cstruct-5.3.gh.tar.gz 38987 BLAKE2B 49fc1d7bc70faa1b437a82e22c5e187800dbaacd152685eae2defe3c6cf748ebe73910cf43066661b9f456261619a59c1ac546dc8ddc461bd1967bee6ffe7672 SHA512 71ad411c6733676c165c9724554a7c1b5f56921ac925020817d812b53b1dfcc9a30d794e8aa8da75bae144e3d659a7426034b5cced4262a699e4626e287b3790
+DIST python-cstruct-6.0.gh.tar.gz 40316 BLAKE2B 7dfc5c7515c08f18795dba886cfec64c4a86780b721738bd0377c85d62543bcb8ebdb854c4b1a24d0972f73435b92deb3ca6bbbf6324352d6f34ff582775477c SHA512 77ca6876cfc68e0c27a84eebcf3a356d3a9241cb68b7e912dbd9db29d17f074f115d983de6216a068d754506f301616ed0e7e9284023f7a27304e787beb7a547
diff --git a/dev-python/cstruct/cstruct-6.0.ebuild b/dev-python/cstruct/cstruct-6.0.ebuild
new file mode 100644
index 000000000000..e806b1f1dae3
--- /dev/null
+++ b/dev-python/cstruct/cstruct-6.0.ebuild
@@ -0,0 +1,29 @@
+# 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
+
+MY_P=python-cstruct-${PV}
+DESCRIPTION="C-style structs for Python"
+HOMEPAGE="
+	https://github.com/andreax79/python-cstruct/
+	https://pypi.org/project/cstruct/
+"
+SRC_URI="
+	https://github.com/andreax79/python-cstruct/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+
+distutils_enable_tests pytest
diff --git a/dev-python/cypari2/Manifest b/dev-python/cypari2/Manifest
index 379839a9eefc..54b933892f6c 100644
--- a/dev-python/cypari2/Manifest
+++ b/dev-python/cypari2/Manifest
@@ -1,2 +1,2 @@
-DIST cypari2-2.1.4.gh.tar.gz 127038 BLAKE2B 0d4998841a9a630ea062d7096845771a9a250ed66b68f99988ded6442724559089e8dbbce13ef5c6ad467705c65b2ac9fc5889fa9c40b9665083af558280b81a SHA512 b5926281037aebb899c1a433a0ca106cdfafcb8cb7abb863268ff8151dbc52ee21dbe1d09dde632de1640a4cc4d37f59bebb0e379d61ac2fbdf9fffcf3ba4775
 DIST cypari2-2.2.0.tar.gz 127530 BLAKE2B 0ce2e3f157d63c20a257b3b7eaf9a06bf241893193bd561c8980ecb38e698b2ca6679a74958a2398944753e6445c1ab5b063b14e408ef0395a9eaf9e0d7cc8db SHA512 5ba237feb1910bd7182a3c3e8e1409209d4f6e68c9f8966c3bd0ad2f6e66193b4dc3006f26fcb507cac7e6d1ee32ec6d5dda612290d8bd3b3350c8243dd89616
+DIST cypari2-2.2.1.tar.gz 127323 BLAKE2B 8dc382c54516482516388cdb98ff026938f87fb0b93cddc32ddc0bd6feca2dfd7983cabd0a2c9730bbe5f8eb189a23f4386bbe6325916e505fedfc10052e56e1 SHA512 b5b5c32a321cc8c58f44f9aecabf0a2ece5332596903a98bc6299c3598a247d994b4368318e57ae52e6768dcb1bdb95f152d31f1df378088d3412e22e979341b
diff --git a/dev-python/cypari2/cypari2-2.1.4-r1.ebuild b/dev-python/cypari2/cypari2-2.1.4-r1.ebuild
deleted file mode 100644
index eecd9596cc46..000000000000
--- a/dev-python/cypari2/cypari2-2.1.4-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=standalone
-DISTUTILS_EXT=1
-
-inherit distutils-r1
-
-DESCRIPTION="Cython interface to PARI"
-HOMEPAGE="https://github.com/sagemath/cypari2"
-
-# We're only using Github for v2.1.4 because PyPI is lagging:
-# https://github.com/sagemath/cypari2/issues/143
-SRC_URI="https://github.com/sagemath/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="sci-mathematics/pari[gmp,doc]
-	dev-python/cysignals[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-python/cython-3[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${P}-regen-bindings-for-each-python.patch" )
-
-python_test(){
-	cd "${S}"/tests || die
-	"${EPYTHON}" rundoctest.py || die
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/cypari2/cypari2-2.2.1.ebuild b/dev-python/cypari2/cypari2-2.2.1.ebuild
new file mode 100644
index 000000000000..522686d8c0bb
--- /dev/null
+++ b/dev-python/cypari2/cypari2-2.2.1.ebuild
@@ -0,0 +1,34 @@
+# 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=standalone
+DISTUTILS_EXT=1
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Cython interface to PARI"
+HOMEPAGE="https://github.com/sagemath/cypari2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+DEPEND=">=sci-mathematics/pari-2.17.1:=[gmp,doc]
+	dev-python/cysignals[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-python/cython-3[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/cypari2-2.2.0-regen-bindings-for-each-python.patch" )
+
+python_test(){
+	cd "${S}"/tests || die
+	"${EPYTHON}" rundoctest.py || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
diff --git a/dev-python/cypari2/files/cypari2-2.1.4-regen-bindings-for-each-python.patch b/dev-python/cypari2/files/cypari2-2.1.4-regen-bindings-for-each-python.patch
deleted file mode 100644
index cb9ba55fdd29..000000000000
--- a/dev-python/cypari2/files/cypari2-2.1.4-regen-bindings-for-each-python.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Ensure that the file auto_paridecl.pxd is both (re)generated with and
-installed for each python implementation.
-
-From 248d26e3e6b1c02fdd3391f033e29d7012189d9e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= <frp.bissey@gmail.com>
-Date: Tue, 28 Apr 2020 09:42:39 +1200
-Subject: [PATCH] move rebuild out of build_ext so it is run before everything
-
----
- setup.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 099ed3b..473fe12 100755
---- a/setup.py
-+++ b/setup.py
-@@ -13,6 +13,10 @@ from autogen.paths import include_dirs, library_dirs
- 
- ext_kwds = dict(include_dirs=include_dirs(), library_dirs=library_dirs())
- 
-+# Generate auto-generated sources from pari.desc
-+# This needs to be done before build/build_ext so the generated pxd is moved
-+# to the build directory and installed with newer setuptools.
-+rebuild()
- 
- if "READTHEDOCS" in os.environ:
-     # When building with readthedocs, disable optimizations to decrease
-@@ -29,9 +33,6 @@ if "READTHEDOCS" in os.environ:
- # Adapted from Cython's new_build_ext
- class build_ext(_build_ext):
-     def finalize_options(self):
--        # Generate auto-generated sources from pari.desc
--        rebuild()
--
-         self.directives = {
-             "autotestdict.cdef": True,
-             "binding": True,
--- 
-2.26.2
-
diff --git a/dev-python/cysignals/Manifest b/dev-python/cysignals/Manifest
index f849a71e782c..2380a22c410c 100644
--- a/dev-python/cysignals/Manifest
+++ b/dev-python/cysignals/Manifest
@@ -1,3 +1 @@
-DIST cysignals-1.11.4.tar.gz 105100 BLAKE2B c21c5cae69332885dd4b9f13d0fbe9ab836466dd699f0d51908d129107ce4922f4076fafa8dce3650983fd69d25182464f9831545a8da3535699d36d198ec6a7 SHA512 b083a62bcca71634cdd21ca6c8d1363e7754ed97d6f2ad0280b0ae97fdf1264be3dc202acf67added4c12a0815420d9641269da1212b83472ea304883d3b85ab
-DIST cysignals-1.12.0.tar.gz 65857 BLAKE2B 4a9bb56c8491814480a9deae053eb13574b480245418c743b1a99cc4fbe4c784c35e8518707cd6ced22174f032444e38daee16ab933b044f8942da2d1c47cfab SHA512 c4575f9d07f4d4c1c27a2e953b12693758babe79000fe62e2423ae484695f0ee813ebc2868ec74aa6c2c4e85d074c3a0db1524ad4ca58e1250fd1d4ca8386692
 DIST cysignals-1.12.2.tar.gz 65828 BLAKE2B dff532fb0c95abe53331082c88f79edd3a7136501c2015272d83e0a5d29b51e26c007b06f3e4ead42eaa306c1219ccc207827dc58ff954514ebd7fdc47dd2d02 SHA512 9cbf3eb4a11724949f513b4409d136b0890f987f9a5d3c3324b12bddd85eb7226dd793a5b2ec383e9ee46fa59e55f9ca19b0fb4c02e0b6eab46e01607668a8cb
diff --git a/dev-python/cysignals/cysignals-1.11.4-r1.ebuild b/dev-python/cysignals/cysignals-1.11.4-r1.ebuild
deleted file mode 100644
index 7940ad35c445..000000000000
--- a/dev-python/cysignals/cysignals-1.11.4-r1.ebuild
+++ /dev/null
@@ -1,41 +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=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Interrupt and signal handling for Cython"
-HOMEPAGE="
-	https://github.com/sagemath/cysignals/
-	https://pypi.org/project/cysignals/
-"
-
-# setup.py has "or later"
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-DEPEND="
-	sci-mathematics/pari:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# https://github.com/sagemath/cysignals/pull/204
-	"${FILESDIR}/${P}-helper.patch"
-)
-
-python_test(){
-	local -x PATH="${BUILD_DIR}/scripts:${PATH}"
-	"${EPYTHON}" -B rundoctests.py src/cysignals/*.pyx || die
-}
diff --git a/dev-python/cysignals/cysignals-1.12.0-r1.ebuild b/dev-python/cysignals/cysignals-1.12.0-r1.ebuild
deleted file mode 100644
index fe0f2f6b4ac6..000000000000
--- a/dev-python/cysignals/cysignals-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,34 +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=meson-python
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Interrupt and signal handling for Cython"
-HOMEPAGE="
-	https://github.com/sagemath/cysignals/
-	https://pypi.org/project/cysignals/
-"
-
-# setup.py has "or later"
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-BDEPEND="
-	>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-building-against-me.patch" )
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cysignals/cysignals-1.12.2.ebuild b/dev-python/cysignals/cysignals-1.12.2.ebuild
index 85da267f5797..468d639fef67 100644
--- a/dev-python/cysignals/cysignals-1.12.2.ebuild
+++ b/dev-python/cysignals/cysignals-1.12.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
@@ -18,7 +18,7 @@ HOMEPAGE="
 # setup.py has "or later"
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 BDEPEND="
 	>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cysignals/files/cysignals-1.11.4-helper.patch b/dev-python/cysignals/files/cysignals-1.11.4-helper.patch
deleted file mode 100644
index 0c09f236eccb..000000000000
--- a/dev-python/cysignals/files/cysignals-1.11.4-helper.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 2abd7ef94775b3320b6f1954b55168e06da0e6b3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 6 Jul 2024 13:06:49 +0200
-Subject: [PATCH] Install cysignals-CSI-helper as package data for better
- portability
-
-Rather than installing `cysignals-CSI-helper.py` into a `share`
-directory and then trying to figure out the correct path to it, install
-it as Python package data and use the standard `importlib.resources`
-API to access it.  For Python versions older than 3.9,
-the `importlib_resources` backport is used instead.
-
-Fixes #200
----
- setup.py                                      |  4 +++-
- .../cysignals-CSI-helper.py                   |  0
- src/scripts/cysignals-CSI                     | 20 ++++++++++---------
- 3 files changed, 14 insertions(+), 10 deletions(-)
- rename src/{scripts => cysignals}/cysignals-CSI-helper.py (100%)
-
-diff --git a/setup.py b/setup.py
-index 7953170..7154a4a 100755
---- a/setup.py
-+++ b/setup.py
-@@ -215,7 +215,6 @@ setup(
-     packages=["cysignals"],
-     package_dir={"": "src"},
-     package_data={"cysignals": ["*.pxd", "*.h"]},
--    data_files=[(opj("share", "cysignals"), [opj("src", "scripts", "cysignals-CSI-helper.py")])],
-     scripts=glob(opj("src", "scripts", "cysignals-CSI")),
-     cmdclass=dict(
-         configure=configure,
-@@ -223,4 +222,7 @@ setup(
-         build_ext=build_ext,
-         bdist_egg=no_egg
-     ),
-+    install_requires=[
-+        "importlib_resources; python_version < '3.9'",
-+    ],
- )
-diff --git a/src/scripts/cysignals-CSI-helper.py b/src/cysignals/cysignals-CSI-helper.py
-similarity index 100%
-rename from src/scripts/cysignals-CSI-helper.py
-rename to src/cysignals/cysignals-CSI-helper.py
-diff --git a/src/scripts/cysignals-CSI b/src/scripts/cysignals-CSI
-index dd8b4e6..3896dca 100755
---- a/src/scripts/cysignals-CSI
-+++ b/src/scripts/cysignals-CSI
-@@ -41,6 +41,11 @@ from argparse import ArgumentParser
- from datetime import datetime
- from distutils.spawn import find_executable
- 
-+if sys.version_info >= (3, 9):
-+    import importlib.resources as importlib_resources
-+else:
-+    import importlib_resources
-+
- 
- def pid_exists(pid):
-     """
-@@ -65,15 +70,12 @@ def gdb_commands(pid, color):
-     cmds += b'import sys; sys.stdout.flush()\n'
-     cmds += b'end\n'
-     cmds += b'bt full\n'
--    cysignals_share = os.path.join(os.path.dirname(sys.argv[0]), '..',
--                                   'share', 'cysignals')
--    script = os.path.join(cysignals_share, 'cysignals-CSI-helper.py')
--    with open(script, 'rb') as f:
--        cmds += b'python\n'
--        cmds += b'color = %r; ' % color
--        cmds += b'sys_path = %r; ' % sys.path
--        cmds += f.read()
--        cmds += b'end\n'
-+    script = importlib_resources.files('cysignals') / 'cysignals-CSI-helper.py'
-+    cmds += b'python\n'
-+    cmds += b'color = %r; ' % color
-+    cmds += b'sys_path = %r; ' % sys.path
-+    cmds += script.read_bytes()
-+    cmds += b'end\n'
-     cmds += b'detach inferior 1\n'
-     cmds += b'quit\n'
-     return cmds
--- 
-2.45.2
-
diff --git a/dev-python/cysignals/files/cysignals-1.12.0-fix-building-against-me.patch b/dev-python/cysignals/files/cysignals-1.12.0-fix-building-against-me.patch
deleted file mode 100644
index a305936838d0..000000000000
--- a/dev-python/cysignals/files/cysignals-1.12.0-fix-building-against-me.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 7c05d63f87e6f7b9c3366939a6494aa3335381e8 Mon Sep 17 00:00:00 2001
-From: Ludo Pulles <ludo.pulles@gmail.com>
-Date: Fri, 6 Dec 2024 13:18:28 +0100
-Subject: [PATCH] Fix build issues
-
----
- example/meson.build       | 7 -------
- meson.build               | 5 -----
- src/cysignals/signals.pxd | 1 +
- src/cysignals/signals.pyx | 1 +
- src/cysignals/tests.pyx   | 1 +
- 5 files changed, 3 insertions(+), 12 deletions(-)
-
-diff --git a/example/meson.build b/example/meson.build
-index e40c614..ae3e120 100644
---- a/example/meson.build
-+++ b/example/meson.build
-@@ -15,13 +15,6 @@ print(cysignals.__file__.replace('__init__.py', ''))
- ).stdout().strip()
- cysignals = declare_dependency(include_directories: inc_cysignals)
- 
--# Make declarations in Cython code available to C include files
--add_project_arguments(
--  '-X preliminary_late_includes_cy28=True',
--  language: 'cython',
--)
--
--
- py.extension_module('cysignals_example',
-   sources: ['cysignals_example.pyx'],
-   install: true,
-diff --git a/meson.build b/meson.build
-index d66145b..5209bf2 100644
---- a/meson.build
-+++ b/meson.build
-@@ -22,11 +22,6 @@ add_project_arguments('-DCYTHON_CLINE_IN_TRACEBACK=0', language: 'c')
- # Disable sanity checking in GNU libc
- # This is required because of false positives in the longjmp() check
- add_project_arguments('-U_FORTIFY_SOURCE', language: 'c')
--# Make declarations in Cython code available to C include files
--add_project_arguments(
--  '-X preliminary_late_includes_cy28=True',
--  language: 'cython',
--)
- 
- # Platform-specific settings
- if is_cygwin
-diff --git a/src/cysignals/signals.pxd b/src/cysignals/signals.pxd
-index 76320f7..531a9a8 100644
---- a/src/cysignals/signals.pxd
-+++ b/src/cysignals/signals.pxd
-@@ -1,3 +1,4 @@
-+# cython: preliminary_late_includes_cy28=True
- #*****************************************************************************
- #  cysignals is free software: you can redistribute it and/or modify it
- #  under the terms of the GNU Lesser General Public License as published
-diff --git a/src/cysignals/signals.pyx b/src/cysignals/signals.pyx
-index b988167..72f206e 100644
---- a/src/cysignals/signals.pyx
-+++ b/src/cysignals/signals.pyx
-@@ -1,3 +1,4 @@
-+# cython: preliminary_late_includes_cy28=True
- r"""
- Interrupt and signal handling
- 
-diff --git a/src/cysignals/tests.pyx b/src/cysignals/tests.pyx
-index 547095f..ffb04ca 100644
---- a/src/cysignals/tests.pyx
-+++ b/src/cysignals/tests.pyx
-@@ -1,3 +1,4 @@
-+# cython: preliminary_late_includes_cy28=True
- """
- Test interrupt and signal handling
- 
diff --git a/dev-python/datastructclass/datastructclass-0.1.1.ebuild b/dev-python/datastructclass/datastructclass-0.1.1.ebuild
index 7ff88f3b8e3b..0439b1f8d7bf 100644
--- a/dev-python/datastructclass/datastructclass-0.1.1.ebuild
+++ b/dev-python/datastructclass/datastructclass-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/dbus-fast/Manifest b/dev-python/dbus-fast/Manifest
new file mode 100644
index 000000000000..1763e4914707
--- /dev/null
+++ b/dev-python/dbus-fast/Manifest
@@ -0,0 +1 @@
+DIST dbus-fast-2.24.4.gh.tar.gz 178320 BLAKE2B 790935c94b8c5984993bbbc7741cca1ab6c232e8a58266030318c774dcbdd77b3712fbb5ab3b3c6197f86eb8c0be0d8626e9dfcabf50a1a485be8d80334721fe SHA512 e08a1b8c028cf33f7055621b502ffdffb1d9c79875b9f9d05afca401cdc583ae97bb029706002ad0e94e2ce8ccf3a992fe9cc9c023e87f64d04bb581b2e9f263
diff --git a/dev-python/dbus-fast/dbus-fast-2.24.4.ebuild b/dev-python/dbus-fast/dbus-fast-2.24.4.ebuild
new file mode 100644
index 000000000000..bf290b3322cf
--- /dev/null
+++ b/dev-python/dbus-fast/dbus-fast-2.24.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="A faster version of dbus-next"
+HOMEPAGE="
+	https://github.com/bluetooth-devices/dbus-fast/
+	https://pypi.org/project/dbus-fast/
+"
+SRC_URI="
+	https://github.com/Bluetooth-Devices/dbus-fast/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	>=dev-python/cython-3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-65.4.1[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pycairo-1.21.0[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.42.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-asyncio-0.19[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export REQUIRE_CYTHON=1
+
+src_test() {
+	local dbus_params=(
+		$(dbus-daemon --session --print-address --fork --print-pid)
+	)
+	local -x DBUS_SESSION_BUS_ADDRESS=${dbus_params[0]}
+
+	virtx distutils-r1_src_test
+
+	kill "${dbus_params[1]}" || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# interface not found on this object: org.freedesktop.DBus.Debug.Stats
+		tests/client/test_signals.py::test_signals
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest -o addopts= -p asyncio || die
+}
diff --git a/dev-python/dbus-fast/metadata.xml b/dev-python/dbus-fast/metadata.xml
new file mode 100644
index 000000000000..584f534455fa
--- /dev/null
+++ b/dev-python/dbus-fast/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="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">bluetooth-devices/dbus-fast</remote-id>
+		<remote-id type="pypi">dbus-fast</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/dirty-equals/Manifest b/dev-python/dirty-equals/Manifest
index fe8aea7fde90..f31625dcf514 100644
--- a/dev-python/dirty-equals/Manifest
+++ b/dev-python/dirty-equals/Manifest
@@ -1 +1,2 @@
 DIST dirty-equals-0.8.0.gh.tar.gz 50468 BLAKE2B 5d5c58807c0ef26db80895a26b5246a0305ab55389f95d7e13586cad2adc4edd17d24905fad5e462c2bafb59cad7453b55400e4576e0f845ec75d617405f67bb SHA512 8fc6ee0eefe700c89acf5b2181e502422835a89e8f0bb771b07133bda48b804f09b18e452919c8eb7d50e579b032732edad3e9ec150cd7bc7a33a4db77d9ab5c
+DIST dirty-equals-0.9.0.gh.tar.gz 50607 BLAKE2B ec569a818b067a9162d8efefffc9cfae7a7a3ee7ebf1e3659334d4123644046d5195849a9bde0c93f29d23e32657eae2bf692376a6928a8e82044b5fe54a530d SHA512 5e0a3f465c1a0bc70292ab013e5622afdfa1150e3315cfde7cc6dfb458000cc925a9ec6c54fb93bfe287b2c497dbbadc6ebe8e100819e537c7e6769a7ce61776
diff --git a/dev-python/dirty-equals/dirty-equals-0.9.0.ebuild b/dev-python/dirty-equals/dirty-equals-0.9.0.ebuild
new file mode 100644
index 000000000000..594314e83c8f
--- /dev/null
+++ b/dev-python/dirty-equals/dirty-equals-0.9.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Doing dirty (but extremely useful) things with equals"
+HOMEPAGE="
+	https://dirty-equals.helpmanual.io/latest/
+	https://github.com/samuelcolvin/dirty-equals/
+	https://pypi.org/project/dirty-equals/
+"
+SRC_URI="
+	https://github.com/samuelcolvin/dirty-equals/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		>=dev-python/pydantic-2.4.2[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2021.3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# require unpackaged pytest-examples
+		tests/test_docs.py
+	)
+
+	if ! has_version "dev-python/pydantic[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/test_other.py
+		)
+	fi
+
+	local -x TZ=UTC
+	epytest "${args[@]}"
+}
diff --git a/dev-python/distro/distro-1.9.0.ebuild b/dev-python/distro/distro-1.9.0.ebuild
index f934cfe8a5e2..bc867fe3b0eb 100644
--- a/dev-python/distro/distro-1.9.0.ebuild
+++ b/dev-python/distro/distro-1.9.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
@@ -17,6 +17,6 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/django-debug-toolbar/Manifest b/dev-python/django-debug-toolbar/Manifest
index 1493398a7089..71b9fb9a481f 100644
--- a/dev-python/django-debug-toolbar/Manifest
+++ b/dev-python/django-debug-toolbar/Manifest
@@ -1 +1,2 @@
 DIST django_debug_toolbar-4.4.6.tar.gz 272610 BLAKE2B bcba8f2dd1c44392a595c8c4a60f1ba40928747760ab49255ef1fefb0847ffc232a409b39d7819f59996b3c7f7a6557fb2b47365b9adcddfe743fcd6a943304e SHA512 ae009219b6eee2427ef6875438900e5d8878986264b6c0c91ddd1939385c7481914ad490050747f13385278d0ce3af225a8fb0282c71b3b8a685467dcc753d88
+DIST django_debug_toolbar-5.0.1.tar.gz 295982 BLAKE2B 27461e537ec6408e63b2c9f4d94dc5966014b37f707d2eeb604205f473ad5976e3a9635a76846e2dd5a84fff68231af5d27eca551d8f87cde7300f85428f5bd9 SHA512 6ab82bc504a18858d3deab96a78dfdfd0820bb653fa10c91c9dec503159b7659e4b775a7c4d5c54d3db299813269bbd874e3790f4a3f67232a56ed5187474ec8
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-5.0.1.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-5.0.1.ebuild
new file mode 100644
index 000000000000..76ce9d73cac5
--- /dev/null
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-5.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A configurable set of panels that display various debug information"
+HOMEPAGE="
+	https://github.com/django-commons/django-debug-toolbar/
+	https://pypi.org/project/django-debug-toolbar/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-4.2.9[${PYTHON_USEDEP}]
+	elibc_musl? ( dev-python/tzdata )
+"
+
+BDEPEND="
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# requires django-csp
+	rm tests/test_csp_rendering.py || die
+}
+
+python_test() {
+	"${EPYTHON}" -m django test -v 2 --settings tests.settings tests \
+		|| die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/django-debug-toolbar/metadata.xml b/dev-python/django-debug-toolbar/metadata.xml
index fd28509eea42..46a8df1ad4d7 100644
--- a/dev-python/django-debug-toolbar/metadata.xml
+++ b/dev-python/django-debug-toolbar/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">django-debug-toolbar</remote-id>
-		<remote-id type="github">jazzband/django-debug-toolbar</remote-id>
+		<remote-id type="github">django-commons/django-debug-toolbar</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-timezone-field/Manifest b/dev-python/django-timezone-field/Manifest
index 385fd7e38358..7326d47b2113 100644
--- a/dev-python/django-timezone-field/Manifest
+++ b/dev-python/django-timezone-field/Manifest
@@ -1 +1,2 @@
 DIST django-timezone-field-7.0.gh.tar.gz 37416 BLAKE2B a0420ccbcb9d7d834e65d0cc89fd83662bd4b3773f1443f05866381d6bbeacba86bdd2e6078a3819bdbf6c174e3ede08e4b9d307838d5082e7bef037ff751681 SHA512 9a96b65a7dce48f58c3915e835e92b8d884f6b15f8314f5d6f1a34bc75ad4bc8f0c33035a4844b5906b7d6bc468cf364be8c82843f3af714a59dc9a40e71f9af
+DIST django-timezone-field-7.1.gh.tar.gz 36680 BLAKE2B 47a754f0050967c196b9d47199bb83f87984ae66cf36578681d54722b76908c506c5ae290d81bb5e33fe3df3c79840301697d935edf8f076f89c6cda1b64e36b SHA512 e242ccebccb3942b2b681e87ebeb4546f925d270b705fa9049a350640c3888c2a9388339c5be9909645b0fa772a4dd71199450639f9fbe2cce531fa6a9bd0df0
diff --git a/dev-python/django-timezone-field/django-timezone-field-7.1.ebuild b/dev-python/django-timezone-field/django-timezone-field-7.1.ebuild
new file mode 100644
index 000000000000..8f7ffcd028be
--- /dev/null
+++ b/dev-python/django-timezone-field/django-timezone-field-7.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django app providing database and form fields for timezone objects"
+HOMEPAGE="
+	https://github.com/mfogel/django-timezone-field/
+	https://pypi.org/project/django-timezone-field/
+"
+SRC_URI="
+	https://github.com/mfogel/django-timezone-field/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	<dev-python/django-6[${PYTHON_USEDEP}]
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/djangorestframework[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-lazy-fixtures[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x DB_ENGINE=sqlite
+	epytest
+}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index ccdc090c9cd2..f62242446e1c 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,8 +1,10 @@
-DIST Django-4.2.17.checksum.txt 2420 BLAKE2B ad0f88aba31f6e78d7ce3624614e2515b48f4f22546ca637197a1b7561f831bd5742bd6823d311f34f801a271efdc92dc37cb73a99fea9a1b1bf43db2901134e SHA512 c5ddbadff0b56e87037d72416f80d55e6525b173c79d06dc92d4e7c2a5fb5e631ea396be11dca94d16865dc8e17cc4f4bde6c0612fa36ca12b8c872557bbdb15
-DIST Django-4.2.17.tar.gz 10437674 BLAKE2B c67e5cd8d52c418358bf4bc1bc9c01fcdfa3a923e956515e7bd833e2e83417d44075c07ce3d4f46e3c7c0c563d2636f1d716da17fb4cee656c4880121596e7fe SHA512 0811b9416800f3f03fe7eab38f836e130dad67d61117573220b74622e2d47ed71928a200878fe88c444fc5ad33db9e48d0549dfcfeb5482e466278818591ff9c
-DIST Django-5.0.10.checksum.txt 2420 BLAKE2B 714bee82a128c2e6dc64a7d387a9021c3ff38abf128cd896718401f8c79dad72554446a178e8f6a8b742ef8825c93b81976316edac9fd39e2e60ad5dbb539e30 SHA512 d5df887ca330b0aa5b1a7a42c565fa790abfda6541cd8d3addaf4b8c43261a80eaff9d07157983db78081f96a81fa793c295d4e9c497bf9bd6a502e2beca9f39
-DIST Django-5.0.10.tar.gz 10651802 BLAKE2B 44c7107df7f73db662ccbc8e6fedfd52b4c27dd46cf37f0770cca65feb663847bcf1040703a5d14e60814d9f5bc4d7a604032131c2693dd733230a20d56f2793 SHA512 438a917b786e8d7496ebafbadca9a2cab14b4001f1ed80c7220b867459fd5cea9bd7cd4693a26bbaab728ac66c31b74b77b35081c284577812aa78d7255c1270
-DIST Django-5.1.4.checksum.txt 2410 BLAKE2B a83e84895865d76c44751ba2f2ee8abcf77172b6ba3653b44515fe9ff4c9d29e0f2c2f9a621d42bca303858b733a04746cd50a6ed8c3fe68996b537d1ec9358d SHA512 829b4317e1c754b990ea4510e2e35e0a63230bae88dba6a02de5fbf5c4d65809a544cfa64cc1626e4cc4e68dc8400d7374177e7210cb05bc007e59cb56cbb87b
-DIST Django-5.1.4.tar.gz 10716397 BLAKE2B 678df9c8905a27d1c902c7065ffb1da83771c55117c23ba058931347c3be5362269e4accb30bc88299dff30e0bafd2286eab31745244793a861e61d49f7e23bd SHA512 252c185b82da60fb8b1be9c284e8912f5f2846f10a314bc5e611a24e499ea31d7dc29b31a4de16ee3329b1e6861d7faf02b65a043e8a2a28328541105a1e7dc3
+DIST Django-4.2.18.checksum.txt 2583 BLAKE2B 93f616de52243945fd8498c91dd27c92d10bab4d1782e2fe23f44f86fa9bfd72bc0fa088713948c9efad82bbfc84ee6bf2a981a4c8e8c3dfc7c9e59b9529e6a4 SHA512 a90bbf3e86c072d022cf462b15b69e60dbe2077982131451a105e4e1cac3222bbfba31c06839fdf5880698eef2a8d3a742def2a786a771f06c3a665d8631b2ad
+DIST Django-4.2.18.tar.gz 10428204 BLAKE2B 45c2059e89ce988596120894e62c76ceb5054d2b7bbdc18befe7a0a54b4d19c3b5850b3d4dfed14950f2fb323a5b0196bee3a4d1520fcbfe9e734da6b9cdc2c4 SHA512 74469711d0238583c46cadd42737b9002417010796b713a0750c1f28ea17c9c6b2d33e0136fcc5556029a78e0c24b617ae366cb667051c09552298faee791609
+DIST Django-5.0.11.checksum.txt 2583 BLAKE2B e7cc6ed8c4f3d9398eb892cfb6e4d6b983485128180099ad069e0594f8a398ce8127cf934bd738df826d61ffd66d2c0cb27f4ac27630a3f3d2f20edf30e44f00 SHA512 16bdb35fa566db8995233841e53cc793a4656604f351913ad97b470b4044d9476a9bda094493d170d63d637d4f2cc1a22b3b372005f05ed043b1d1b56c6137f2
+DIST Django-5.0.11.tar.gz 10635979 BLAKE2B b55d539d541c661ebe0e4e3db21b89de3fb4a32dc1d07d6bae1be6cd22b82bf4c5692eb23ddb2d4425140ecdcab272d6fb5629c1b525b7fdad1469eb40376a8e SHA512 a43b3245a8e4f1b315ac75128f0d24cf4202471a9dce6791e1fffc88580427c7823c4abfeab6bfee821ff44407728089f563180525eb6bc172bf52858dce867e
+DIST Django-5.1.5.checksum.txt 2573 BLAKE2B af41ffe32d60f10c99b558d32dbcf8658fe6ccadf21168afa6812ec9f40d6a0d2024cde733a26d515d90a025e8814c10ab745679133ed1f13a0ffbed8ce59319 SHA512 70c4af1a339a0b195b3788c10425ef83480274ba3efe5344bfa43d8245d681ed2622f48d62c284ad4bbeb77fb5132308197dfe1d308d027ea650c452e6454d90
+DIST Django-5.1.5.tar.gz 10700031 BLAKE2B 8de45f7574e2f74a06916018a12cf6df9c263cf754ff575d12735fb6921729c7d2937235fee57abb95e9f20e6de0282ec3e737a0a2ee9d9e38e70a1ee90fa6e9 SHA512 cc28eb7166d9babdb3f3d61cc87eb9ed038d7115bd7de7da5b9cff33da114c334fd51140d32c597229cd07e400520bc92ebf69611c6a455ac926f3e9eaa5ee88
+DIST Django-5.2a1.checksum.txt 2410 BLAKE2B 34659b6ff74e39fd13e8b1392dcb0411ae88cb88dc0271f3e7f84ad829e2525f1db11c3951b1b1def4ea95a432135996656fd2e894f3afc3c1913913d1033cb6 SHA512 b1e70a6978707b1d90d8810dc349796e969d63299ec8496b5ec1d45d0881ddfa524e2b78fdd07d1e212d74497de011b7d5377dc31e19e74fb532f2cc26f94212
+DIST Django-5.2a1.tar.gz 10814424 BLAKE2B fffa0f9f31fdd03b1dbf826ec1484d22fbfdeb13724254034726699d303a66d397e847954d15ab2b2975600bcbe4113051a6d9b7c14f2aeeca862ffd06c21d13 SHA512 5513cf718a30bd1bca5973c4fa679ec9af7b7a69cdfd554a5d5ab6706fdab18d5d9de8e1162968fc0d6c3254823577e43d1704482321178edbce434a8b4b8dd9
 DIST django-4.2.17-pypy3.patch.xz 5900 BLAKE2B 2a564fc31d8e2f3def5a532d3bca1a4426a496c659192f602d659e0c1a5f5882978baedb384cc3b67fda8c836513ce43aece80db1528c8e8b6e9ca420f7572ce SHA512 9c9d935aff6db7230a26931b5e7f5f94f3b5ff4fc8f7d4201178571de9d9c7929a0e1e558cc2d9b54b8ee91f85819a5680d24fad6251620515a4a020e3b2d66d
 DIST django-5.0-pypy3.patch.xz 6124 BLAKE2B 7eba7cc70b30743cf4e186a2c5b0f27c13f49114a7a80bcaa2b25fdd7a959583c115a302c9bc6da97c32f6401cf8f3616818ba759190d317c5b033a0f0088766 SHA512 c550e2b2c1243d13cd1f4908f4b6df606355d1491e3bf72042e4b4777a4474306ff0f67b1c2eb4ab4d137cc85bde52dcdbd54bec245d2ba2e092545be8a2993b
diff --git a/dev-python/django/django-4.2.17.ebuild b/dev-python/django/django-4.2.17.ebuild
deleted file mode 100644
index 88704b474529..000000000000
--- a/dev-python/django/django-4.2.17.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 multiprocessing optfeature verify-sig
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="
-	https://www.djangoproject.com/
-	https://github.com/django/django/
-	https://pypi.org/project/Django/
-"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/python/django-4.2.17-pypy3.patch.xz
-	verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt )
-"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/asgiref-4[${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.6.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.3.1[${PYTHON_USEDEP}]
-	sys-libs/timezone-data
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-django-20240807 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/django-4.0-bashcomp.patch
-	"${WORKDIR}"/django-4.2.17-pypy3.patch
-	# https://code.djangoproject.com/ticket/35661
-	"${FILESDIR}"/django-5.1-more-pypy3.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${P^}.checksum.txt" sha256 "${P^}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite \
-		-v2 --parallel="${EPYTEST_JOBS:-$(makeopts_jobs)}" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:0
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-}
diff --git a/dev-python/django/django-4.2.18.ebuild b/dev-python/django/django-4.2.18.ebuild
new file mode 100644
index 000000000000..df280a39d62e
--- /dev/null
+++ b/dev-python/django/django-4.2.18.ebuild
@@ -0,0 +1,103 @@
+# 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..12} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 multiprocessing optfeature verify-sig
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+	https://www.djangoproject.com/
+	https://github.com/django/django/
+	https://pypi.org/project/Django/
+"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/python/django-4.2.17-pypy3.patch.xz
+	verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt )
+"
+S="${WORKDIR}/${P^}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/asgiref-4[${PYTHON_USEDEP}]
+	>=dev-python/asgiref-3.6.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.3.1[${PYTHON_USEDEP}]
+	sys-libs/timezone-data
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja2[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20240807 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/django-4.0-bashcomp.patch
+	"${WORKDIR}"/django-4.2.17-pypy3.patch
+	# https://code.djangoproject.com/ticket/35661
+	"${FILESDIR}"/django-5.1-more-pypy3.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${P^}.checksum.txt" sha256 "${P^}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite \
+		-v2 --parallel="${EPYTEST_JOBS:-$(makeopts_jobs)}" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:0
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+}
diff --git a/dev-python/django/django-5.0.10.ebuild b/dev-python/django/django-5.0.10.ebuild
deleted file mode 100644
index c5a3d39928b0..000000000000
--- a/dev-python/django/django-5.0.10.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 multiprocessing optfeature verify-sig
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="
-	https://www.djangoproject.com/
-	https://github.com/django/django/
-	https://pypi.org/project/Django/
-"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/python/django-5.0-pypy3.patch.xz
-	verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt )
-"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/asgiref-4[${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.3.1[${PYTHON_USEDEP}]
-	sys-libs/timezone-data
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		>=dev-python/docutils-0.19[${PYTHON_USEDEP}]
-		>=dev-python/jinja2-2.11.0[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/selenium-4.8.0[${PYTHON_USEDEP}]
-		>=dev-python/tblib-1.5.0[${PYTHON_USEDEP}]
-		sys-devel/gettext
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-django-20240807 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/django-4.0-bashcomp.patch
-	"${WORKDIR}"/django-5.0-pypy3.patch
-	# https://github.com/django/django/commit/3426a5c33c36266af42128ee9eca4921e68ea876
-	"${FILESDIR}"/django-5.0.6-py313.patch
-	# https://code.djangoproject.com/ticket/35661
-	"${FILESDIR}"/django-5.1-more-pypy3.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${P^}.checksum.txt" sha256 "${P^}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite \
-		-v2 --parallel="${EPYTEST_JOBS:-$(makeopts_jobs)}" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:0
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-}
diff --git a/dev-python/django/django-5.0.11.ebuild b/dev-python/django/django-5.0.11.ebuild
new file mode 100644
index 000000000000..323953488c18
--- /dev/null
+++ b/dev-python/django/django-5.0.11.ebuild
@@ -0,0 +1,105 @@
+# 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} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 multiprocessing optfeature verify-sig
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+	https://www.djangoproject.com/
+	https://github.com/django/django/
+	https://pypi.org/project/Django/
+"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/python/django-5.0-pypy3.patch.xz
+	verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt )
+"
+S="${WORKDIR}/${P^}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/asgiref-4[${PYTHON_USEDEP}]
+	>=dev-python/asgiref-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.3.1[${PYTHON_USEDEP}]
+	sys-libs/timezone-data
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		>=dev-python/docutils-0.19[${PYTHON_USEDEP}]
+		>=dev-python/jinja2-2.11.0[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/selenium-4.8.0[${PYTHON_USEDEP}]
+		>=dev-python/tblib-1.5.0[${PYTHON_USEDEP}]
+		sys-devel/gettext
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20240807 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/django-4.0-bashcomp.patch
+	"${WORKDIR}"/django-5.0-pypy3.patch
+	# https://github.com/django/django/commit/3426a5c33c36266af42128ee9eca4921e68ea876
+	"${FILESDIR}"/django-5.0.6-py313.patch
+	# https://code.djangoproject.com/ticket/35661
+	"${FILESDIR}"/django-5.1-more-pypy3.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${P^}.checksum.txt" sha256 "${P^}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite \
+		-v2 --parallel="${EPYTEST_JOBS:-$(makeopts_jobs)}" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:0
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+}
diff --git a/dev-python/django/django-5.1.4.ebuild b/dev-python/django/django-5.1.4.ebuild
deleted file mode 100644
index dd954893ee30..000000000000
--- a/dev-python/django/django-5.1.4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 multiprocessing optfeature verify-sig
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="
-	https://www.djangoproject.com/
-	https://github.com/django/django/
-	https://pypi.org/project/Django/
-"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt )
-"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/asgiref-4[${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.8.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.3.1[${PYTHON_USEDEP}]
-	sys-libs/timezone-data
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		>=dev-python/docutils-0.19[${PYTHON_USEDEP}]
-		>=dev-python/jinja2-2.11.0[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/selenium-4.8.0[${PYTHON_USEDEP}]
-		>=dev-python/tblib-1.5.0[${PYTHON_USEDEP}]
-		sys-devel/gettext
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-django-20240807 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/django-4.0-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${P^}.checksum.txt" sha256 "${P^}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite \
-		-v2 --parallel="${EPYTEST_JOBS:-$(makeopts_jobs)}" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:0
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-}
diff --git a/dev-python/django/django-5.1.5.ebuild b/dev-python/django/django-5.1.5.ebuild
new file mode 100644
index 000000000000..5e9c542b417d
--- /dev/null
+++ b/dev-python/django/django-5.1.5.ebuild
@@ -0,0 +1,99 @@
+# 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} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 multiprocessing optfeature verify-sig
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+	https://www.djangoproject.com/
+	https://github.com/django/django/
+	https://pypi.org/project/Django/
+"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt )
+"
+S="${WORKDIR}/${P^}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/asgiref-4[${PYTHON_USEDEP}]
+	>=dev-python/asgiref-3.8.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.3.1[${PYTHON_USEDEP}]
+	sys-libs/timezone-data
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		>=dev-python/docutils-0.19[${PYTHON_USEDEP}]
+		>=dev-python/jinja2-2.11.0[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/selenium-4.8.0[${PYTHON_USEDEP}]
+		>=dev-python/tblib-1.5.0[${PYTHON_USEDEP}]
+		sys-devel/gettext
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20240807 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/django-4.0-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${P^}.checksum.txt" sha256 "${P^}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite \
+		-v2 --parallel="${EPYTEST_JOBS:-$(makeopts_jobs)}" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:0
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+}
diff --git a/dev-python/django/django-5.2_alpha1.ebuild b/dev-python/django/django-5.2_alpha1.ebuild
new file mode 100644
index 000000000000..a54c7d29492c
--- /dev/null
+++ b/dev-python/django/django-5.2_alpha1.ebuild
@@ -0,0 +1,99 @@
+# 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} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 multiprocessing optfeature verify-sig
+
+MY_P=${PN^}-${PV/_alpha/a}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+	https://www.djangoproject.com/
+	https://github.com/django/django/
+	https://pypi.org/project/Django/
+"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/asgiref-4[${PYTHON_USEDEP}]
+	>=dev-python/asgiref-3.8.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.3.1[${PYTHON_USEDEP}]
+	sys-libs/timezone-data
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		>=dev-python/docutils-0.19[${PYTHON_USEDEP}]
+		>=dev-python/jinja2-2.11.0[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/selenium-4.8.0[${PYTHON_USEDEP}]
+		>=dev-python/tblib-1.5.0[${PYTHON_USEDEP}]
+		sys-devel/gettext
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20240807 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/django-4.0-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite \
+		-v2 --parallel="${EPYTEST_JOBS:-$(makeopts_jobs)}" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:0
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+}
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 79727f1e9a10..0576487497d5 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,25 +1,18 @@
 DIST autocfg-1.4.0.crate 17712 BLAKE2B 7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6 SHA512 3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST dulwich-0.22.6.tar.gz 450726 BLAKE2B b051b85482121672c83c928ec1dbc914f879bffd83ad9a37dc582afa43ae0c3dcd71050fb21729a263292117609b62911086dc25610803173f8c9398fcb37020 SHA512 3d71b9ba1bfd1d10cdddce0140e2571e2321efa3c8bd420caa0632fa087cd318bdfcd00b53b0ef3394077c83ef9ee85e06d3467461465e4efccf9bd560365df5
 DIST dulwich-0.22.7.tar.gz 452893 BLAKE2B 4ed0a1dbe4a91988a05f3d42559b817547595e3c32bd41d3e0f880459a52851b53bb0db1e5a41e5672027887ac7bb7fb196d358fa6831909e5b417e6061905ea SHA512 ac3acf66aca5972e727c32b58bb2d0ac256eeb1e90ce2f3b30f84324e75390950c27de9dd51f442185797ebec66e9fbd4561ba417ca2e3354011453adab9c96f
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f
-DIST libc-0.2.162.crate 769354 BLAKE2B 3bac6124db801cdcd6918ccd86e84c99cced45c44dba11f198ec5852354942db511966fc85347d2ce4c8ff82c89eef2c47016766b2f6ffbea20d99c1deab4ead SHA512 f43e294d587e7cd9c2da9b67be83fc70801ea66c318342cf1e11556566ecc1c8a612925770d85c75af1e887b425f326fac59229b78877d2377092243ea8e6a99
 DIST libc-0.2.164.crate 769055 BLAKE2B cfb757ea04ec8ad6d6a0dff92cbedd626aa4932cd83d67d19ac51cc140f9aeb54b38b488796c4a0e722f7bceaf54c4807a32ec0560bae4840a82fc1c4a5151ab SHA512 614835ee7388c854cacdc179b5700b7de0c696ec0eebca2b997f1039157f737fa79e208832a46f2fa27fcedb6fe7a27faf26079f06ee0e679b6f35d4a5371e3f
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
 DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
 DIST portable-atomic-1.9.0.crate 166365 BLAKE2B 9abc31364770923847dac16f532452bc8783a5068c0f757f79122bc5b68863b58c0acfa12d28836188413c2f0b61d494cb53fa07a57e199ecd4910a2534c5bb3 SHA512 1431a4c092f6a0cb50bcc78488d603c8ba8f4ee697f77fdcfcce7002fcb371f52a321089422c76564fbf3277c48e30f889565747951c60360d95a6917bb6adeb
 DIST proc-macro2-1.0.89.crate 49446 BLAKE2B 844c021394e7a2551bc179592a6769d672360150abf92debcb9ac60a94a2e426c48c408f06aeb2128686f5f04d66dc12973714670c21a5063ee6b9f3bae4e671 SHA512 488ab38a04df1d0330309382a7e4f667238cbc9b4d513da6a8f5718f8a762f76cc122af67fefe8f4b021a286b3d23e3ec83d781fe6ac823042a6daf14d147e2f
-DIST pyo3-0.23.0.crate 1072538 BLAKE2B 9eaf6a6aa88ae643197cae9bcd591778b6d8925e46808e0c995e4ca0b34de2f206b44ac6009ce52a65525a85f24c9dc14bd69806391138578d0dac7d18ee25b4 SHA512 01c8724b28b0e7882e387c93151a7261a0b265aad47aaaaf2356ce4db9568602cb11e0f107444eddb0d2557f334339d7b42d92164f3ecb02015af6ca3c29a6ba
 DIST pyo3-0.23.3.crate 1073838 BLAKE2B 5e1ce6a5c5232ebf0399b1b969e737cca12f978f445efec9408ea80b8bc6ac1047125dbefa36149c8a904882d6a64dd24a9bd50f1e8de7afe3a3271e1a0f2d6f SHA512 c80377e8673de8b8e51e2423d102dbcc46605a783c13127215916d69fc600efd67ba5f9cca420cb6859124165ec97fde40eb0a0566d8b4b60708e20b8e6e9b6d
-DIST pyo3-build-config-0.23.0.crate 31756 BLAKE2B 0371909fcec57ccd8f1acea9e132da013150a1b76835989bd2832cdba58ebabf18ffdf229a241366399bc10a63834bd09c9e02872de5b1f2aaa7b14e3acce61f SHA512 488527e26c07ff05bd23ab458d06ca851e62b0bd5f1616cd4b313ba0897b156859231209469ea2f7e4a4aa907066665a7adbc85472abb789dc92da6adb7d5d94
 DIST pyo3-build-config-0.23.3.crate 32509 BLAKE2B 9e77701712589dec4ad74b3d0e66ae82c7a01b6f29ed36231d999aaf909f80def59d17916e1900bfff10b1d36a0a48ed4bf9757c817eb6c6269549f3d04bd6d4 SHA512 db8b0aa86e96eeb30a8ab36a8a1ba917b7b9e6918c2193d7466841ef38e689908f7719a5390d35fb9a156aa6bd84348fa99ea8d5a784faf5c5cc4635d9a3fac9
-DIST pyo3-ffi-0.23.0.crate 73989 BLAKE2B 792e14d43bcefaa3c5305a8d5938c574cbd50395d573a9af8323e7c6ce81c7c00ae5d637e80ed9c2b450994ce35ae5630ecd7212b0cb76a1f38a0c17378841df SHA512 e28be29015724247b844912e6bcfcd21d6b17d5f31d80e2d6e9d21ff7f3038ee975a03c0ae7aac05ad2a624282e90b99f06177a09ddff623ab95bba980faeb03
 DIST pyo3-ffi-0.23.3.crate 74064 BLAKE2B ec3cc59e047f780041a05e2bf9fac9d65a6f8ccfb5a3e1c35d7c7918da6ded7e65676888a743d3b4d0fe7b0996e441b722c159eed67360c1e3c5b598160a46cc SHA512 fe4678d4cfe81f065554f0d454345f5f8fde927af1afec9212bb49a67be5080dcc9be84e088612208b7732d2283c2c9168a31b0b6fbd32496520d500e372e161
-DIST pyo3-macros-0.23.0.crate 8064 BLAKE2B d7b97774c1d54787b3aeb9d5c23847c6e42069fe114c964d608495747a29b8529df0c019944395303336aec17b04b9727cdc1aa8771dfad4ffcfb901c67a213f SHA512 da40d548a039c77158b860922aece8ea35fdb6d46da8b71284a39ae3b76094f85eb133ba7cc68ef7b5d160530eb460da92c004c88985223af8341669986531f5
 DIST pyo3-macros-0.23.3.crate 8085 BLAKE2B bf9ea45a8afe7c663da4f3f5c09c23039bbcf9a9ae350eac2b6581a227864d259b1e5c5ea36f9d6f302c26cd957bb4564562b98785eac49233515d7d54453fdf SHA512 23bfcff285db1276f2dcca9895f7672ec6e5aec118039e2cef3cabca0a85eb97f138391cea4da26eb887dff09c65947b165ca83392edcc8640cb283df2929901
-DIST pyo3-macros-backend-0.23.0.crate 70119 BLAKE2B aba55954140ce497c0c6e046178a3f5b4a2de3830cf841fff2d192f3b29422863ab6ce039049a431ba0c84de44d4ab652301120b7e59549171c245415e11fd4c SHA512 91ea6b6647e626320ece44c1c8fff10f9730bcd328826fe3bbda88e8b0c8cd364fade7ad4684dae4abd242bbfbdbdd0e23e9efd72eb6e3ecbeff62fd431a2765
 DIST pyo3-macros-backend-0.23.3.crate 70098 BLAKE2B f8ee9c39f743960fc8093bfd53c043fca03b973192e1ab24b48066634e57ea7e74b3ba825ae72380e10569855eec9cb4f0d54f5f8c88dc60e67793257bef8d43 SHA512 9b22e975480f9afc2037587ba85889868a1b543069c2280c65f4cf98e5537708d098bb4885e881c1c9427740c8259988d82176b974900551a4e51097cefb8708
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
 DIST syn-2.0.87.crate 278076 BLAKE2B 93385f64103fdb482bec34c7912474ae7a5935948715e6eb9a54907e0db5c39f089f6cd393bab33c935c59a1bbb0f4099431f206343811c1a450554d96a35756 SHA512 bcfff545d6dfefd81e09f8f30a86bdd85759b3a7d4093ef3365ed02718e10dbd604c52b94c9d7fa955d339fdc5b6c079940c6f345b5a48c52b5c8607794ca6f2
diff --git a/dev-python/dulwich/dulwich-0.22.6.ebuild b/dev-python/dulwich/dulwich-0.22.6.ebuild
deleted file mode 100644
index d11ad59e042c..000000000000
--- a/dev-python/dulwich/dulwich-0.22.6.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=1
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-CRATES="
-	autocfg@1.4.0
-	cfg-if@1.0.0
-	heck@0.5.0
-	indoc@2.0.5
-	libc@0.2.162
-	memchr@2.7.4
-	memoffset@0.9.1
-	once_cell@1.20.2
-	portable-atomic@1.9.0
-	proc-macro2@1.0.89
-	pyo3-build-config@0.23.0
-	pyo3-ffi@0.23.0
-	pyo3-macros-backend@0.23.0
-	pyo3-macros@0.23.0
-	pyo3@0.23.0
-	quote@1.0.37
-	syn@2.0.87
-	target-lexicon@0.12.16
-	unicode-ident@1.0.13
-	unindent@0.2.3
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/jelmer/dulwich/
-	https://pypi.org/project/dulwich/
-"
-SRC_URI+="
-	native-extensions? (
-		${CARGO_CRATE_URIS}
-	)
-"
-
-LICENSE="GPL-2+ Apache-2.0"
-LICENSE+=" native-extensions? ("
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
-LICENSE+=" )"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc examples +native-extensions test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/urllib3-1.25[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		${RUST_DEPEND}
-		dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		app-crypt/gpgme[python,${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/dulwich/_.*.so"
-
-pkg_setup() {
-	# avoid rust_pkg_setup which will die when there's no Rust found
-	if use native-extensions ; then
-		rust_pkg_setup  # implicitly inherited through cargo
-	fi
-}
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-python_compile() {
-	unset PURE
-	# TODO: enable Rust extensions
-	if ! use native-extensions; then
-		local -x PURE=1
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
-	unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE
-	unset EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v tests.test_suite ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.22.7.ebuild b/dev-python/dulwich/dulwich-0.22.7.ebuild
index 5b7d197fa1c7..5a3c0ce33287 100644
--- a/dev-python/dulwich/dulwich-0.22.7.ebuild
+++ b/dev-python/dulwich/dulwich-0.22.7.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
@@ -51,7 +51,7 @@ LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
 LICENSE+=" )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples +native-extensions test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/elastic-transport/Manifest b/dev-python/elastic-transport/Manifest
index 81c3059c388d..69345e449223 100644
--- a/dev-python/elastic-transport/Manifest
+++ b/dev-python/elastic-transport/Manifest
@@ -1 +1,2 @@
 DIST elastic-transport-python-8.15.1.gh.tar.gz 76741 BLAKE2B 83be377cda7cc39ffc8832b8dd07399842608b8350058a846abc753807779baf823642f0c5156b3c0249dfca5cea9b9d4cc613f944c34bdf917356c200222898 SHA512 642d145e7732282fc0a41987ea2b5addb049ae999ce60acbaa1c370430c54fe1f4b86aa642e6dec1bba4bbbc62b95b6ab65e4ccb878c7b6cf2d1ca242d740af0
+DIST elastic-transport-python-8.17.0.gh.tar.gz 77173 BLAKE2B 30b94a7cb4ce7a59278d65525c8c1dcefe86c2f2c69f0536996de505d7b180b966165562a07bd391b975161b89641fe4a101f43931b8f2f6fd95fca4755b14fd SHA512 88c0ff27109b0450317b7e895d10b0e4b1a48643b17a01b787efbe2f058fd46e28a13ac28979d0fea3c9016610ebefc75bcef37777f36fd3c39270b20811511d
diff --git a/dev-python/elastic-transport/elastic-transport-8.17.0.ebuild b/dev-python/elastic-transport/elastic-transport-8.17.0.ebuild
new file mode 100644
index 000000000000..5bd9b9378356
--- /dev/null
+++ b/dev-python/elastic-transport/elastic-transport-8.17.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit distutils-r1
+
+MY_P=elastic-transport-python-${PV}
+DESCRIPTION="Transport classes and utilities shared among Python Elastic client libraries"
+HOMEPAGE="
+	https://github.com/elastic/elastic-transport-python/
+	https://pypi.org/project/elastic-transport/
+"
+SRC_URI="
+	https://github.com/elastic/elastic-transport-python/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/httpx[${PYTHON_USEDEP}]
+		dev-python/opentelemetry-api[${PYTHON_USEDEP}]
+		dev-python/opentelemetry-sdk[${PYTHON_USEDEP}]
+		dev-python/orjson[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/respx[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/sphinx \
+	dev-python/furo \
+	dev-python/sphinx-autodoc-typehints
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# >=aiohttp-3.11 throws DeprecationWarning which cannot be filtered for this test
+		# https://github.com/aio-libs/aiohttp/pull/9726
+		# https://github.com/elastic/elastic-transport-python/pull/61
+		tests/async_/test_httpserver.py::test_simple_request
+		# fragile to random warnings
+		tests/node/test_http_aiohttp.py::TestAiohttpHttpNode::test_uses_https_if_verify_certs_is_off
+		tests/node/test_urllib3_chain_certs.py::test_assert_fingerprint_in_cert_chain
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# https://github.com/encode/httpx/discussions/3214#discussioncomment-10830925
+	epytest -p asyncio -o addopts= -k "not (test_unsupported_tls_versions and HttpxAsyncHttpNode)"
+}
diff --git a/dev-python/elasticsearch/Manifest b/dev-python/elasticsearch/Manifest
index 7b54179b45e9..9806b92f587f 100644
--- a/dev-python/elasticsearch/Manifest
+++ b/dev-python/elasticsearch/Manifest
@@ -1,5 +1 @@
-DIST elasticsearch-py-8.14.0.gh.tar.gz 1092912 BLAKE2B 4ee556bc475d63e33cec318936b2dbf8b280236bcdfe28bc90a4beb7e1d024b8d63180c29e42096cb32bf3da7c771532c57190d763651118603779f816e95656 SHA512 9e9821102659b4c877959e25c33e1b1942f6eabe62bb6de73cda4875c248b0f9285d948e535e9426ca42552f7aa3e75c459f991bfa574c1d8400d78486ee5493
-DIST elasticsearch-py-8.15.0.gh.tar.gz 1163528 BLAKE2B 8ee26e504f09b4ed2ccd695c034f5e35bdc609c1de7055b1f93f279edc7b3b6ac72625e8645c25d126481d7d877a197ecb8d7b35771841b412291caa42d4ee5f SHA512 7982f8366d7b74c85fdcaf4761fcbd9e6e14f0ef2a4aff353bad0b5bbedf7251eabf933e86f1dc9734de0aa6d43a30e1f055cd3b9c7ff2c7864da8779f64bfbc
-DIST elasticsearch-py-8.15.1.gh.tar.gz 1536398 BLAKE2B 459bebd94fdfe1c30e8e7e996de8ab3495e6f3341cd59ced6cb066065d21de751dc54d764455d2e7accdb6af9ea00f47e7c6a2c1e5af125cfe64a6e0b8f9e2cc SHA512 3e544187ca530932c730ada304d4c3f36c1c7561c1f53f6b35793c1ad7e9d95ffb435228e3fad76e746e6b2624e2d3bfe5c4036d06c72f5f2d625e4a557dd28d
-DIST elasticsearch-py-8.16.0.gh.tar.gz 1569493 BLAKE2B 467c264af1dd1ce9bf63c0e3f9c8eabecc34dc3b3e51598bfd050230cb7e2bd56bc209ad146785a5ea310752e81c61d80c708b39167a12a0cc73214370e95a0e SHA512 dafca178603b2e681ed52c39f8e0864481ed55c6d01924498d9d1e5f425482291e2b81ffa1e9e7e6bfd86b6424b6703dbcd5971e729b521e81ce3e2ffeb0bd27
 DIST elasticsearch-py-8.17.0.gh.tar.gz 1604639 BLAKE2B 94363d23606ec820fbc4608ad8319a2753f04f6a250204ec91662772712079ac56d63ef630780fc19f20e9b0527ceea4db2c3d7c4db98c7e4410d5ce67751a6f SHA512 2239fe52a49387988903d574e33d2f5aedf077beb9c00c46a725af942289f0b0522aef462fb8ee43b078594e4af65b3b14b2fdaefea076ddd1dad8ca0a306843
diff --git a/dev-python/elasticsearch/elasticsearch-8.14.0.ebuild b/dev-python/elasticsearch/elasticsearch-8.14.0.ebuild
deleted file mode 100644
index 0d52bab441a9..000000000000
--- a/dev-python/elasticsearch/elasticsearch-8.14.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
-
-inherit distutils-r1
-
-MY_P="elasticsearch-py-${PV}"
-DESCRIPTION="Official Elasticsearch client library for Python"
-HOMEPAGE="
-	https://ela.st/es-python
-	https://github.com/elastic/elasticsearch-py/
-	https://pypi.org/project/elasticsearch/
-"
-SRC_URI="
-	https://github.com/elastic/elasticsearch-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 arm64 ~x86"
-
-RDEPEND="
-	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3[${PYTHON_USEDEP}]
-	<dev-python/elastic-transport-9[${PYTHON_USEDEP}]
-	>=dev-python/elastic-transport-8.13[${PYTHON_USEDEP}]
-	>=dev-python/orjson-3[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mapbox-vector-tile[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/opentelemetry-api[${PYTHON_USEDEP}]
-		dev-python/opentelemetry-sdk[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-		dev-python/unasync[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/sphinx \
-	dev-python/sphinx-autodoc-typehints \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-src_prepare() {
-	# https://github.com/elastic/elasticsearch-py/pull/2552/
-	sed -i -e '/float_/d' elasticsearch/serializer.py \
-		test_elasticsearch/test_serializer.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# REST api tests are a black hole for effort. It downloads the tests
-		# so its an ever moving target. It also requires effort to blacklist
-		# tests for apis which are license restricted.
-		"test_elasticsearch/test_server/test_rest_api_spec.py"
-		# Counting deprecation warnings from python is bound to fail even
-		# if all are fixed in this package. Not worth it.
-		"test_elasticsearch/test_client/test_deprecated_options.py"
-		# Running daemon for tests is finicky and upstream CI fails at it
-		# as well.
-		"test_elasticsearch/test_server/"
-		"test_elasticsearch/test_async/test_server/"
-	)
-
-	local -x TEST_WITH_OTEL=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts= -p asyncio
-}
diff --git a/dev-python/elasticsearch/elasticsearch-8.15.0.ebuild b/dev-python/elasticsearch/elasticsearch-8.15.0.ebuild
deleted file mode 100644
index dc051ed81435..000000000000
--- a/dev-python/elasticsearch/elasticsearch-8.15.0.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
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{11..12} )
-
-inherit distutils-r1
-
-MY_P="elasticsearch-py-${PV}"
-DESCRIPTION="Official Elasticsearch client library for Python"
-HOMEPAGE="
-	https://ela.st/es-python
-	https://github.com/elastic/elasticsearch-py/
-	https://pypi.org/project/elasticsearch/
-"
-SRC_URI="
-	https://github.com/elastic/elasticsearch-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3[${PYTHON_USEDEP}]
-	<dev-python/elastic-transport-9[${PYTHON_USEDEP}]
-	>=dev-python/elastic-transport-8.13[${PYTHON_USEDEP}]
-	>=dev-python/orjson-3[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mapbox-vector-tile[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/opentelemetry-api[${PYTHON_USEDEP}]
-		dev-python/opentelemetry-sdk[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pyarrow[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-		dev-python/unasync[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/sphinx \
-	dev-python/sphinx-autodoc-typehints \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# REST api tests are a black hole for effort. It downloads the tests
-		# so its an ever moving target. It also requires effort to blacklist
-		# tests for apis which are license restricted.
-		"test_elasticsearch/test_server/test_rest_api_spec.py"
-		# Counting deprecation warnings from python is bound to fail even
-		# if all are fixed in this package. Not worth it.
-		"test_elasticsearch/test_client/test_deprecated_options.py"
-		# Running daemon for tests is finicky and upstream CI fails at it
-		# as well.
-		"test_elasticsearch/test_server/"
-		"test_elasticsearch/test_async/test_server/"
-	)
-
-	local -x TEST_WITH_OTEL=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts= -p asyncio
-}
diff --git a/dev-python/elasticsearch/elasticsearch-8.15.1.ebuild b/dev-python/elasticsearch/elasticsearch-8.15.1.ebuild
deleted file mode 100644
index dc051ed81435..000000000000
--- a/dev-python/elasticsearch/elasticsearch-8.15.1.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
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{11..12} )
-
-inherit distutils-r1
-
-MY_P="elasticsearch-py-${PV}"
-DESCRIPTION="Official Elasticsearch client library for Python"
-HOMEPAGE="
-	https://ela.st/es-python
-	https://github.com/elastic/elasticsearch-py/
-	https://pypi.org/project/elasticsearch/
-"
-SRC_URI="
-	https://github.com/elastic/elasticsearch-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3[${PYTHON_USEDEP}]
-	<dev-python/elastic-transport-9[${PYTHON_USEDEP}]
-	>=dev-python/elastic-transport-8.13[${PYTHON_USEDEP}]
-	>=dev-python/orjson-3[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mapbox-vector-tile[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/opentelemetry-api[${PYTHON_USEDEP}]
-		dev-python/opentelemetry-sdk[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pyarrow[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-		dev-python/unasync[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/sphinx \
-	dev-python/sphinx-autodoc-typehints \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# REST api tests are a black hole for effort. It downloads the tests
-		# so its an ever moving target. It also requires effort to blacklist
-		# tests for apis which are license restricted.
-		"test_elasticsearch/test_server/test_rest_api_spec.py"
-		# Counting deprecation warnings from python is bound to fail even
-		# if all are fixed in this package. Not worth it.
-		"test_elasticsearch/test_client/test_deprecated_options.py"
-		# Running daemon for tests is finicky and upstream CI fails at it
-		# as well.
-		"test_elasticsearch/test_server/"
-		"test_elasticsearch/test_async/test_server/"
-	)
-
-	local -x TEST_WITH_OTEL=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts= -p asyncio
-}
diff --git a/dev-python/elasticsearch/elasticsearch-8.16.0.ebuild b/dev-python/elasticsearch/elasticsearch-8.16.0.ebuild
deleted file mode 100644
index 0db4238a86a8..000000000000
--- a/dev-python/elasticsearch/elasticsearch-8.16.0.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
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{11..12} )
-
-inherit distutils-r1
-
-MY_P="elasticsearch-py-${PV}"
-DESCRIPTION="Official Elasticsearch client library for Python"
-HOMEPAGE="
-	https://ela.st/es-python
-	https://github.com/elastic/elasticsearch-py/
-	https://pypi.org/project/elasticsearch/
-"
-SRC_URI="
-	https://github.com/elastic/elasticsearch-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3[${PYTHON_USEDEP}]
-	<dev-python/elastic-transport-9[${PYTHON_USEDEP}]
-	>=dev-python/elastic-transport-8.15.1[${PYTHON_USEDEP}]
-	>=dev-python/orjson-3[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mapbox-vector-tile[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/opentelemetry-api[${PYTHON_USEDEP}]
-		dev-python/opentelemetry-sdk[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pyarrow[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-		dev-python/unasync[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/sphinx \
-	dev-python/sphinx-autodoc-typehints \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# REST api tests are a black hole for effort. It downloads the tests
-		# so its an ever moving target. It also requires effort to blacklist
-		# tests for apis which are license restricted.
-		"test_elasticsearch/test_server/test_rest_api_spec.py"
-		# Counting deprecation warnings from python is bound to fail even
-		# if all are fixed in this package. Not worth it.
-		"test_elasticsearch/test_client/test_deprecated_options.py"
-		# Running daemon for tests is finicky and upstream CI fails at it
-		# as well.
-		"test_elasticsearch/test_server/"
-		"test_elasticsearch/test_async/test_server/"
-	)
-
-	local -x TEST_WITH_OTEL=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts= -p asyncio
-}
diff --git a/dev-python/elasticsearch/elasticsearch-8.17.0.ebuild b/dev-python/elasticsearch/elasticsearch-8.17.0.ebuild
index 0db4238a86a8..25736b843e08 100644
--- a/dev-python/elasticsearch/elasticsearch-8.17.0.ebuild
+++ b/dev-python/elasticsearch/elasticsearch-8.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
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index ff168b762324..8bd8ed50485a 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,2 +1 @@
-DIST elementpath-4.6.0.tar.gz 355931 BLAKE2B 7617e778bb48b3d7aaf9ec4043af3827c2bd41eb3b0f7a2e4dae71d080cacd9d9a7932f8d358dc8d1fbd2e872fe9f390b90be4a55e04030eba806183e2d29fc1 SHA512 87e01f2aa2c98b626a1cfa38b4695c16b39c1425dbe686afef092cb265b82e6dc25997c989ffa2b198a6cb60e042d2361fabb0b53fb3efb853263a5651a59fd6
 DIST elementpath-4.7.0.tar.gz 357225 BLAKE2B 4f39f27ff6be7ae3b159b1a8c6bbba30dcb2cd4306df0f61c0ec8895faf382a19aed23dd10552224b64b91f99b0efbeaba22901b8ab920ec9f1074472d1a3f47 SHA512 320b7d037247412604be5365d60a8fb9040f2c29b36484d8b8a6894647aad6ba2f903d29d9c2fcbe25de1e075bdc2a879bfdd72b8443481030df6dcebd152e6f
diff --git a/dev-python/elementpath/elementpath-4.6.0.ebuild b/dev-python/elementpath/elementpath-4.6.0.ebuild
deleted file mode 100644
index 80c31fa544cc..000000000000
--- a/dev-python/elementpath/elementpath-4.6.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
-HOMEPAGE="
-	https://github.com/sissaschool/elementpath/
-	https://pypi.org/project/elementpath/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		>=dev-python/xmlschema-3.3.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# fails for some reason, more fit for upstream testing anyway
-	tests/test_typing.py
-)
diff --git a/dev-python/elementpath/elementpath-4.7.0.ebuild b/dev-python/elementpath/elementpath-4.7.0.ebuild
index a45ac427b816..1c5e05dafdbe 100644
--- a/dev-python/elementpath/elementpath-4.7.0.ebuild
+++ b/dev-python/elementpath/elementpath-4.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/emoji/Manifest b/dev-python/emoji/Manifest
index 069ae8f08f35..910ff4bd0f7b 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1 +1,2 @@
 DIST emoji-2.14.0.gh.tar.gz 664189 BLAKE2B 1bde169cfb1d82d86cc2a5720036fdc44e2009880c21756bc48588f0e6b8e34a512309b0b01899717c49fc9dd6800344e182386e72d0824f120012a29941d8c2 SHA512 6e91a67702b42e246003feca13b24794faf55cbcbcc06c66ed7671f0407cf68ac66f8b076655b550c5b5ed7835d1c13ba680128fea8a656721780eac2fd9ea46
+DIST emoji-2.14.1.gh.tar.gz 668132 BLAKE2B 99e1d0dbf7694ff44a2dab4d3c3095c866dd48603f3b394fcad05d156014186673dd9117a7f6d885da859c34d869ee72b34c14ded1e7ccccf64f85f231cb098f SHA512 05151df1ddda61efad85c42f4f2c0e049883bd9a2c1a2ffdda59aa9e90c1105662f8529071aa507a8ee7fa264893db45450ae65f6727bec785c7c485e93f6ef2
diff --git a/dev-python/emoji/emoji-2.14.0.ebuild b/dev-python/emoji/emoji-2.14.0.ebuild
index fcfa79db4a02..ba3b04c68cb0 100644
--- a/dev-python/emoji/emoji-2.14.0.ebuild
+++ b/dev-python/emoji/emoji-2.14.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
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~riscv ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/emoji/emoji-2.14.1.ebuild b/dev-python/emoji/emoji-2.14.1.ebuild
new file mode 100644
index 000000000000..17e645561987
--- /dev/null
+++ b/dev-python/emoji/emoji-2.14.1.ebuild
@@ -0,0 +1,25 @@
+# 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="Emoji for Python"
+HOMEPAGE="
+	https://github.com/carpedm20/emoji/
+	https://pypi.org/project/emoji/
+"
+SRC_URI="
+	https://github.com/carpedm20/emoji/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ensurepip-pip/Manifest b/dev-python/ensurepip-pip/Manifest
index 6bb7c3fafff2..f6b5c941c8ab 100644
--- a/dev-python/ensurepip-pip/Manifest
+++ b/dev-python/ensurepip-pip/Manifest
@@ -1,3 +1,2 @@
-DIST pip-24.0-py3-none-any.whl 2110226 BLAKE2B 6a0c8c9796cd574ef1d709de40a8530a15e50158143e332b79e5ad3edceda6ce93c5ef4df49b169062598618dcc6967c2115ac2c10b05abf345318204f1eeffc SHA512 5d7462a584105bccaa9cf376f5a8c5827ead099c813c8af7392d478a4398f373d9e8cac7bbad2db51b335411ab966b21e119b1b1234c9a7ab70c6ddfc9306da6
 DIST pip-24.1-py3-none-any.whl 1823006 BLAKE2B ca5282b1100243cc4e391ce30d5ae7d4978987e46323b7e151c87457c4ab762f909c88ae3cb72015d09bf7c1243ddb6ad791e991093713431961962fc6fdde83 SHA512 84e8318896294e5750f30a3fa55833e5e5c802066091802e05ff94fe139c825f3fe0fb5014b899f0afd844ad1129e8d04b9fedd74a7f46a1c248dac546ab16f8
 DIST pip-24.3.1-py3-none-any.whl 1822182 BLAKE2B 8ec4f45dcc84094426db053dea43d86d14d24f6f23ca8b1b094a989f08b5653a2290df24e907c3ed283a668fa6da305620b4f74a3054d67f6e048327c5f06c66 SHA512 21cb4a844b7c9216a4878639a876acdce17ffda9e7228e85e344169d548a3f4316e5ec5183a950848c7391e2a650152e4a1e1f0f020de57f895c458de5ee7b82
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-24.0.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-24.0.ebuild
deleted file mode 100644
index 8e0424eae76b..000000000000
--- a/dev-python/ensurepip-pip/ensurepip-pip-24.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared pip wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/pip/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
-SLOT="0"
-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"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-24.3.1.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-24.3.1.ebuild
index f6b395df87bf..23904e1f43a9 100644
--- a/dev-python/ensurepip-pip/ensurepip-pip-24.3.1.ebuild
+++ b/dev-python/ensurepip-pip/ensurepip-pip-24.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S=${DISTDIR}
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
 SLOT="0"
-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"
 
 src_install() {
 	insinto /usr/lib/python/ensurepip
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index c8534b346343..0bd2860b9e9e 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1 +1,3 @@
 DIST setuptools-75.6.0-py3-none-any.whl 1224032 BLAKE2B 7a91cf811611082234c0d4d52970f81126c5908f6ef1fe8455e33870c6872d86181447bdb052e21a145558cd259983e73b6e18128a7d9f42478c716816c74394 SHA512 2c80b0bbcfa0d09a8a380b60ef9512d387129fba233e1aab83279caa5ca53ecc252f060edaef9ed00eb6d79312cd10fed82dd2491b723d50940828d1766aee89
+DIST setuptools-75.7.0-py3-none-any.whl 1224467 BLAKE2B a08aa2c039769980c4b895f224846c8977abefeb6980fc383fd49569107de7e2f59e8833ced4830641f1e8df94c9e48e50b122a8ca2cf1ac22cc5959c0032dd9 SHA512 52360623989144e511426d948647d091925f705a417892e3ba9ae62267ca3dcd3365a493e809329da0b4673afeb51a5247113c2807d66d872267c26b4e7b76ef
+DIST setuptools-75.8.0-py3-none-any.whl 1228782 BLAKE2B 0e53d2e2d3666bce8072b23556c77a013a6db704eaa1b582a37defcd5691bb6cc66533bc9edc164911e5e5839c0c418571052a696c5c9a98b289ea232d045a38 SHA512 02760ed1215eefe7ad4beae24243fa6372d47b975a060dd69d5c521c6c53fe9ba1a6e73f39448ed9471b89371d19273824becbc8471da40cf43d3c799f0b50cf
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.7.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.7.0.ebuild
new file mode 100644
index 000000000000..b76c3f6972d8
--- /dev/null
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.7.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pypi
+
+DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
+HOMEPAGE="https://pypi.org/project/setuptools/"
+SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
+S=${DISTDIR}
+
+LICENSE="MIT"
+SLOT="0"
+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"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${A}"
+}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.0.ebuild
new file mode 100644
index 000000000000..b76c3f6972d8
--- /dev/null
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pypi
+
+DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
+HOMEPAGE="https://pypi.org/project/setuptools/"
+SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
+S=${DISTDIR}
+
+LICENSE="MIT"
+SLOT="0"
+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"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${A}"
+}
diff --git a/dev-python/environs/Manifest b/dev-python/environs/Manifest
index 199b96f75ef7..3d0f15ec8fe9 100644
--- a/dev-python/environs/Manifest
+++ b/dev-python/environs/Manifest
@@ -1,3 +1,4 @@
-DIST environs-11.1.0.gh.tar.gz 24227 BLAKE2B 5a4ebec604dedccf6757fa69f0ae9a5d426c23e8f0bcdbbe51f2ca190e2cfe4cebaa473656dedee4486bf7f61eef102b60a1553426ece78129aec65baded0ad0 SHA512 a7564a251228d3fa131af96a2cad312d8e3c3ba95fa56c4b0abf74a6040c70b77e147120f9646f6f3fd6339760561b63e920494fe26b4fcb1f2caac32f7d7703
-DIST environs-11.2.0.gh.tar.gz 25195 BLAKE2B eba1cf8731db715c04345bc33100ef5bb2693a81e2815195164d56ada02eff8d65f3a2328e7d87b17c858df4cb8a7418120dceb49cf1e44c42dd25d249661469 SHA512 50d1e68fec2cd47a6805cb87ce8a1f7692cc3797ca30177189d3268bc91716671735dca8c085fcb5ed733e38e88b69354a6fc5b6a4ceb480e03ecf7d9a40391e
 DIST environs-11.2.1.gh.tar.gz 25595 BLAKE2B 478818c964625965200b154ef9412a1d94ac9f78d507be0ebd378117613e7c7f8163c9db58225220ef9cde68367f973999a9914f13db6bdee02c83e9ee924518 SHA512 cd859e86b4308047ad661f3fa12788a117f70686e3f5dc7f55e876c9de38c6d2b75f208b488b99f3c9189080e8ebb45385fea45421d55e9b2f9a22ba4a3fbd86
+DIST environs-12.0.0.gh.tar.gz 26281 BLAKE2B d663ede5220bc3d1b6f3a1da5b2b8500bfc98d134bf9ec00a81796fb1619c98e96b2336e474dee2d17e6b541fd97bcd916dcdb5d19509a76f6af28e2bf26b691 SHA512 30622788d787516408cb9a6548124475a752fb37284f880c534763007c736daf0c666c8e8c773cbb078da7ac3ba5b271aaf28d3d7842afb6da630bddf5233623
+DIST environs-14.0.0.gh.tar.gz 28247 BLAKE2B fe1fcc78940840f67c8cb38d9f7c10d03e1c91b5f94943eaee1a603bfbb8bccbc46bed003913fb64a62b49ab40bfbe806ea0c21dc74926d48b2d58a8e96886fa SHA512 5caddf4ee09cc2e6acbad93d7f40b7d6fe9f241454a96ae33da2467858b7a53bc03132e702d87c6f9731f2b600a559135da6ac033de7ccd1b0623402ccdfbc4c
+DIST environs-14.1.0.gh.tar.gz 28783 BLAKE2B b93711edaa4b9d2a3353e3a06e9baf545716dd96da6f3288825fef15306d793c4b18d0401698c86cddd2813d723e188a7be6570940eec49171f81d1f6dea071f SHA512 26cc7a920b4d9a6d7d7c7f1c729e688767a03de8e439483c99020a0a838d9c52dc3f5d0e78db6b910cc087580efb42ce3cd8e3be32e69a889abd40d0fb1a9fd9
diff --git a/dev-python/environs/environs-11.1.0.ebuild b/dev-python/environs/environs-11.1.0.ebuild
deleted file mode 100644
index 28662b82e90f..000000000000
--- a/dev-python/environs/environs-11.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for simplified environment variable parsing"
-HOMEPAGE="
-	https://github.com/sloria/environs/
-	https://pypi.org/project/environs/
-"
-SRC_URI="
-	https://github.com/sloria/environs/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	dev-python/python-dotenv[${PYTHON_USEDEP}]
-	>=dev-python/marshmallow-3.13.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/django-cache-url[${PYTHON_USEDEP}]
-		dev-python/dj-database-url[${PYTHON_USEDEP}]
-		dev-python/dj-email-url[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGELOG.md CONTRIBUTING.md README.md  )
-
-distutils_enable_tests pytest
diff --git a/dev-python/environs/environs-11.2.0.ebuild b/dev-python/environs/environs-11.2.0.ebuild
deleted file mode 100644
index 28662b82e90f..000000000000
--- a/dev-python/environs/environs-11.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for simplified environment variable parsing"
-HOMEPAGE="
-	https://github.com/sloria/environs/
-	https://pypi.org/project/environs/
-"
-SRC_URI="
-	https://github.com/sloria/environs/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	dev-python/python-dotenv[${PYTHON_USEDEP}]
-	>=dev-python/marshmallow-3.13.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/django-cache-url[${PYTHON_USEDEP}]
-		dev-python/dj-database-url[${PYTHON_USEDEP}]
-		dev-python/dj-email-url[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGELOG.md CONTRIBUTING.md README.md  )
-
-distutils_enable_tests pytest
diff --git a/dev-python/environs/environs-12.0.0.ebuild b/dev-python/environs/environs-12.0.0.ebuild
new file mode 100644
index 000000000000..e3b002adda80
--- /dev/null
+++ b/dev-python/environs/environs-12.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for simplified environment variable parsing"
+HOMEPAGE="
+	https://github.com/sloria/environs/
+	https://pypi.org/project/environs/
+"
+SRC_URI="
+	https://github.com/sloria/environs/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	dev-python/python-dotenv[${PYTHON_USEDEP}]
+	>=dev-python/marshmallow-3.13.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/django-cache-url[${PYTHON_USEDEP}]
+		dev-python/dj-database-url[${PYTHON_USEDEP}]
+		dev-python/dj-email-url[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGELOG.md CONTRIBUTING.md README.md  )
+
+distutils_enable_tests pytest
diff --git a/dev-python/environs/environs-14.0.0.ebuild b/dev-python/environs/environs-14.0.0.ebuild
new file mode 100644
index 000000000000..d45b0ac5d9c6
--- /dev/null
+++ b/dev-python/environs/environs-14.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for simplified environment variable parsing"
+HOMEPAGE="
+	https://github.com/sloria/environs/
+	https://pypi.org/project/environs/
+"
+SRC_URI="
+	https://github.com/sloria/environs/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	dev-python/python-dotenv[${PYTHON_USEDEP}]
+	>=dev-python/marshmallow-3.18.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		dev-python/django-cache-url[${PYTHON_USEDEP}]
+		dev-python/dj-database-url[${PYTHON_USEDEP}]
+		dev-python/dj-email-url[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGELOG.md CONTRIBUTING.md README.md  )
+
+distutils_enable_tests pytest
diff --git a/dev-python/environs/environs-14.1.0.ebuild b/dev-python/environs/environs-14.1.0.ebuild
new file mode 100644
index 000000000000..b72b45079c97
--- /dev/null
+++ b/dev-python/environs/environs-14.1.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for simplified environment variable parsing"
+HOMEPAGE="
+	https://github.com/sloria/environs/
+	https://pypi.org/project/environs/
+"
+SRC_URI="
+	https://github.com/sloria/environs/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	dev-python/python-dotenv[${PYTHON_USEDEP}]
+	>=dev-python/marshmallow-3.18.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/backports-strenum[${PYTHON_USEDEP}]
+		' 3.10)
+		dev-python/django-cache-url[${PYTHON_USEDEP}]
+		dev-python/dj-database-url[${PYTHON_USEDEP}]
+		dev-python/dj-email-url[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGELOG.md CONTRIBUTING.md README.md  )
+
+distutils_enable_tests pytest
diff --git a/dev-python/faker/Manifest b/dev-python/faker/Manifest
index 93e6c4fa098a..2c22bdc39438 100644
--- a/dev-python/faker/Manifest
+++ b/dev-python/faker/Manifest
@@ -1 +1,3 @@
 DIST faker-33.1.0.tar.gz 1850515 BLAKE2B 71ff6e379f195f220af96562daa1876cd0476f321bb881091929b82ce576b30aa6aa11444411eb5cad30d1922fcfc940012f8b3cd36d074defd3336eac5f8a4a SHA512 0a24af11d64588de2a6c22844efcac11eeacc74faf439e4c0e4bca2cd8d3723177d8fdf5e3b0c6286776e659e38397cea80024ffaaae09c17067ae9b13ea983d
+DIST faker-33.3.0.tar.gz 1854655 BLAKE2B 6a877f7d39b9174285cf406d343a2fbfd204eb0648c9964819c9eb0a4c77b866a846e2c6142221d28ef04097ff9a48971d5ea2ed5f93862a3f4bac77c6345959 SHA512 137082c70e37a863a27f1e0fb5ff807a6b8072fc71c53b1f7ace45f19e98398cfe7a7a419f39bd113755ab50939aa6b5991508015e990f18039d4cd61d397964
+DIST faker-33.3.1.tar.gz 1854895 BLAKE2B 15862330622cd257b0d663a67df4141b3673d077858a655def54152878ba290cb0c3480b0dfb40b2c69ac7481b827ac62827545bddd1edc97a1c5e55af35aad4 SHA512 48e1be12bdbcf12b4da44ede6bb0cd3a8937308f50e4145bbaf1fc80a3fb51dc430e03b5c4bf9a99fce66ea5cac9c5a8e806d036e4052588971ed264c8c472aa
diff --git a/dev-python/faker/faker-33.3.0.ebuild b/dev-python/faker/faker-33.3.0.ebuild
new file mode 100644
index 000000000000..b0c932d87fbe
--- /dev/null
+++ b/dev-python/faker/faker-33.3.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN=${PN^}
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="
+	https://github.com/joke2k/faker/
+	https://pypi.org/project/Faker/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+# note: tests are flaky with xdist
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
+	epytest
+	epytest --exclusive-faker-session tests/pytest/session_overrides
+}
diff --git a/dev-python/faker/faker-33.3.1.ebuild b/dev-python/faker/faker-33.3.1.ebuild
new file mode 100644
index 000000000000..b0c932d87fbe
--- /dev/null
+++ b/dev-python/faker/faker-33.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN=${PN^}
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="
+	https://github.com/joke2k/faker/
+	https://pypi.org/project/Faker/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+# note: tests are flaky with xdist
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
+	epytest
+	epytest --exclusive-faker-session tests/pytest/session_overrides
+}
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 8842af7fb68c..f1d2ea83abab 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,2 +1 @@
-DIST fakeredis-2.26.1.tar.gz 150240 BLAKE2B 4a3416731ba1c4d96b0a7fe4d1a4382fa4de6eac1f029a00bd84e8fbbb2fa2142ad3efe6140c062f19ed9d806899fadfa584ddd453df63ef30400d93863ea19e SHA512 04ba6ec80cf2b9b2bb80b4da37286b5751b1565458727ea116625b4599e6343be11db472a793f859c29c22d09c03f9ec6adc40f2a3204cd9803bc08cfe01e63b
 DIST fakeredis-2.26.2.tar.gz 150563 BLAKE2B 3def1db25e1bfe2bcc23dd0788963f57245c01d0e1810d6c36dac5186fc8024956cbb6be09667792ce5c55f015cce1f7fd12a2fe5c32a0eb8e305519bfa301fe SHA512 2316cdf555367103a83b36b52ebc1295918fe43ab158c0d9fa28fe8d159fe7d79f3b575c754ca4efde57007e88e1bd39b1dd4a8a8f6ef80ca034c615ce5031c0
diff --git a/dev-python/fakeredis/fakeredis-2.26.1.ebuild b/dev-python/fakeredis/fakeredis-2.26.1.ebuild
deleted file mode 100644
index e84169511210..000000000000
--- a/dev-python/fakeredis/fakeredis-2.26.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/redis-4.3[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# https://github.com/cunla/fakeredis-py/issues/320
-	sed -i -e '/LICENSE/d' pyproject.toml || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		test/test_aioredis2.py::test_failed_script_error
-		# TODO
-		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
-		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
-		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-		# new redis-server?
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_shardnumsub[StrictRedis]"
-		# json ext
-		test/test_json/test_json.py
-		test/test_json/test_json_arr_commands.py
-		# tdigest ext?
-		'test/test_mixins/test_server_commands.py::test_command[FakeStrictRedis]'
-	)
-	local EPYTEST_IGNORE=(
-		# these tests fail a lot...
-		test/test_hypothesis.py
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	# Note: this package is not xdist-friendly
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p pytest_mock "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6390
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/fakeredis/fakeredis-2.26.2.ebuild b/dev-python/fakeredis/fakeredis-2.26.2.ebuild
index 7dfb54aa0658..d9f63d850fe1 100644
--- a/dev-python/fakeredis/fakeredis-2.26.2.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.26.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/fastimport/fastimport-0.9.14.ebuild b/dev-python/fastimport/fastimport-0.9.14.ebuild
index ad1c86a70904..cdb3445a4e84 100644
--- a/dev-python/fastimport/fastimport-0.9.14.ebuild
+++ b/dev-python/fastimport/fastimport-0.9.14.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 python_test() {
 	"${EPYTHON}" -m unittest -v fastimport.tests.test_suite ||
diff --git a/dev-python/fixtures/Manifest b/dev-python/fixtures/Manifest
index 5c4d6b5c61ef..d64080dcd534 100644
--- a/dev-python/fixtures/Manifest
+++ b/dev-python/fixtures/Manifest
@@ -1,2 +1 @@
-DIST fixtures-4.1.0.tar.gz 58561 BLAKE2B fc88ee580806e289d3d4a8a35701b0b17ee48bc157dbb355035ac0fb1bde64bdbf3596d54538e6032c74f8862a36fea92d1f72a96fd7d60c04480089db755bd8 SHA512 6897449fdefd07abe7714186b366fdf4505283f6747f8fa4d17044bc45da58eb36e69d89381527ccecb98e6c62c58bc6d4f558af41cbfc87b0221ae60ba71ff6
 DIST fixtures-4.2.2.tar.gz 59199 BLAKE2B 4e390e767e180009533dda5d68e4f4bbbe903acb75d3227a3a447c2b17a3d0497131271888a8ccb5385db447f1f892300811a8a7224ae95fedbeeb37cd31cda6 SHA512 fabb1092bee985d446e7f6eccb7f61d7e89a50b6fb98455d3ea6a45670568a4200fd57409ab78edf288c4103c45f5bf0bd62fc9886a6f9101c1d626078b1fb38
diff --git a/dev-python/fixtures/fixtures-4.1.0.ebuild b/dev-python/fixtures/fixtures-4.1.0.ebuild
deleted file mode 100644
index a882d37db28f..000000000000
--- a/dev-python/fixtures/fixtures-4.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fixtures, reusable state for writing clean tests and more"
-HOMEPAGE="
-	https://github.com/testing-cabal/fixtures/
-	https://pypi.org/project/fixtures/
-"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pbr-5.7.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/fixtures/fixtures-4.2.2.ebuild b/dev-python/fixtures/fixtures-4.2.2.ebuild
index b88a0b7eaad7..754579e24d2e 100644
--- a/dev-python/fixtures/fixtures-4.2.2.ebuild
+++ b/dev-python/fixtures/fixtures-4.2.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pbr-5.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index 27f83b17100f..f7d0c1e3045e 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -1 +1,2 @@
 DIST Flask-HTMLmin-2.2.1.gh.tar.gz 17550 BLAKE2B 30393f6739ba8bdcfc17586e0955dff4341707b3c5bc27e30e9f9ddd5d4ff5b5b1b71b512b034b3b09cab3bfbcfb47c1651bc8cedba597de8aca5f2c7cfc0907 SHA512 34d5c9e2393901b32ab43c4333d87d75b489a410af2fdb019c180d0cb7bac01074616125486b49ef577782311a394bde6444ce311d5ab4f2ae2852a3ea92f4cd
+DIST Flask-HTMLmin-3.0.0.gh.tar.gz 28315 BLAKE2B 16748063018e793a9ae07a247681613fdb7cb08ce55a7ecaa5ef0d2c59bc04ad8749ed4c44a5c8aea08fa8f6b5d4a960bfb6b47967bee8803a814a61d7167d7f SHA512 422324b16256def44be5406b71ffe05b48e34c3d3b16f5ee8212a270da1b03ced3066c6c2a705342df44ec04173493de5ef2ece55406a06f9205eb9efba58362
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-3.0.0.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-3.0.0.ebuild
new file mode 100644
index 000000000000..5c104cd837f9
--- /dev/null
+++ b/dev-python/flask-htmlmin/flask-htmlmin-3.0.0.ebuild
@@ -0,0 +1,40 @@
+# 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
+
+MY_P="Flask-HTMLmin-${PV}"
+DESCRIPTION="Minimize your flask rendered html"
+HOMEPAGE="
+	https://github.com/hamidfzm/Flask-HTMLmin/
+	https://pypi.org/project/Flask-HTMLmin/
+"
+SRC_URI="
+	https://github.com/hamidfzm/Flask-HTMLmin/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	app-text/cssmin[${PYTHON_USEDEP}]
+	app-text/htmlmin[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# TODO: remove when htmlmin-0.1.12* is gone
+	sed -i -e '/htmlmin2/d' setup.py || die
+}
diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
index a9ec36fee4e3..ff859c2a5cc1 100644
--- a/dev-python/flask-migrate/Manifest
+++ b/dev-python/flask-migrate/Manifest
@@ -1 +1,2 @@
 DIST Flask-Migrate-4.0.7.gh.tar.gz 27172 BLAKE2B 743eccd8705c57a5748676e3f824632d2a547291d9816f903311c7abbc62eb418bf422aed183b10d986a923a00337310b7ab03bce774f839c81520686a9b90f5 SHA512 51da745b60d43d24ee5b63e5ee7d354d12e53b7c62a9c639f322443df62113485a42a6fd21e50673742d6a35c1f175e15a2a0af8f20918b44bf34fc4c2da4c7c
+DIST Flask-Migrate-4.1.0.gh.tar.gz 27430 BLAKE2B 7adc49eb0b80cc74cc381ab803ccd2dfcc107beeb5fd06f24ca36a98f6e617e6f56a48c0ef739d41770ec508d4bf0e13b78f57be62d23317c8d797bfa1ef5c2d SHA512 683842e3e5832cf3eaf6b7ee5e194c1eb2fe1b096d3360a64f2f0de5024e1fa4ebd8e0b6659a1c87ded47efd0e07cecf9d82807e1e64af99a18bb9b596261963
diff --git a/dev-python/flask-migrate/flask-migrate-4.1.0.ebuild b/dev-python/flask-migrate/flask-migrate-4.1.0.ebuild
new file mode 100644
index 000000000000..039aa8e5d3df
--- /dev/null
+++ b/dev-python/flask-migrate/flask-migrate-4.1.0.ebuild
@@ -0,0 +1,46 @@
+# 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
+
+MY_P="Flask-Migrate-${PV}"
+DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
+HOMEPAGE="
+	https://github.com/miguelgrinberg/Flask-Migrate/
+	https://pypi.org/project/Flask-Migrate/
+"
+SRC_URI="
+	https://github.com/miguelgrinberg/Flask-Migrate/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/alembic-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.9[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	local -x PATH=${T}/bin:${PATH}
+
+	mkdir -p "${T}"/bin || die
+	cat > "${T}"/bin/flask <<-EOF || die
+		#!/bin/sh
+		exec ${EPYTHON} -m flask "\${@}"
+	EOF
+	chmod +x "${T}"/bin/flask || die
+
+	eunittest
+}
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index 84992c3602ab..8c504692af80 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,2 +1 @@
 DIST flatbuffers-24.12.23.gh.tar.gz 2326944 BLAKE2B d32d8f861cfb2eff23cdedda01d4e0bd2f203c4d4bf1d0ade1a06ce9caf9fcf3b43c58f2e5bf9014892c184f819ab8005b322d6e96b9f3c9b9c5624eef12642f SHA512 f97762ba41b9cfef648e93932fd789324c6bb6ebc5b7aeca8185c9ef602294b67d73aea7ae371035579a1419cbfbeba7c3e88b31b5a5848db98f5e8a03b982b1
-DIST flatbuffers-24.3.25.gh.tar.gz 2297829 BLAKE2B f3a5a94119a1b1b63fba9126e1cdff7ab712996bfc0d65626a679405f62dfa722bc5de244ef775fba336224b60feff3aa27acf54bed027c4013590b4afbefe7c SHA512 e2a614f4fc526ce07bfe1e1bc79efd3c87acbdb93aee7b42994d4855abd2593f36b5ca1edb53c7dcd470d5fbe14a3e394bd75dcebb4458cc0aeb33d622a3c662
diff --git a/dev-python/flatbuffers/flatbuffers-24.12.23.ebuild b/dev-python/flatbuffers/flatbuffers-24.12.23.ebuild
index e82e5d455faa..554aca6bd6be 100644
--- a/dev-python/flatbuffers/flatbuffers-24.12.23.ebuild
+++ b/dev-python/flatbuffers/flatbuffers-24.12.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
@@ -21,7 +21,7 @@ S=${WORKDIR}/${P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flatbuffers/flatbuffers-24.3.25-r1.ebuild b/dev-python/flatbuffers/flatbuffers-24.3.25-r1.ebuild
deleted file mode 100644
index bfb978e1fb13..000000000000
--- a/dev-python/flatbuffers/flatbuffers-24.3.25-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="
-	https://github.com/google/flatbuffers/
-	https://pypi.org/project/flatbuffers/
-"
-SRC_URI="
-	https://github.com/google/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	cd "${WORKDIR}/${P}" || die
-	eapply "${FILESDIR}/${PN}-24.3.25-numpy-2.patch"
-	cd "${S}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cd "${WORKDIR}/${P}/tests" || die
-	# zeroes means without benchmarks
-	"${EPYTHON}" py_test.py 0 0 0 0 false || die
-	"${EPYTHON}" py_flexbuffers_test.py -v || die
-}
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index 0b504e00620c..201439c3991e 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,2 +1 @@
-DIST flexmock-0.12.1.tar.gz 52765 BLAKE2B 5b1317ff0d9b1a14d58b47d558a88f38ff7aef40fd349d0e70e9d9688a89b0464419aca953ba481afe3f4ccf88217b76c34e8bf1a053c62caaa1f9877ad35183 SHA512 898876695e9eff4fc37a9d3f6b93a34869500a3ce740e7c43cd4c4317ba59f2ea16ec11b4094037e6b56755047584870fa3af27a041003eb6200d79b3a716e63
 DIST flexmock-0.12.2.tar.gz 53195 BLAKE2B f1f0b33f3f75ba87e4fb983df2461b0478f02402de31edeeede017a08c61ea0b3a1f69408b0360dcbccc1130bbf93161e5f0767f888e83dfa757e0744ab44089 SHA512 8fac117032c6321b05dfb6c4d53e2f3e29c121ef9029d70aeaae8a96aadbb4e0120f319817c0a5e7699cd80d765f974d128a8e3d7b151e30c1a8ff834b87dbd5
diff --git a/dev-python/flexmock/flexmock-0.12.1.ebuild b/dev-python/flexmock/flexmock-0.12.1.ebuild
deleted file mode 100644
index 0f0522dee2cf..000000000000
--- a/dev-python/flexmock/flexmock-0.12.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Testing library to create mocks, stubs and fakes"
-HOMEPAGE="
-	https://flexmock.readthedocs.io/
-	https://github.com/flexmock/flexmock/
-	https://pypi.org/project/flexmock/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/test_teamcity.py
-		tests/test_testtools.py
-		tests/test_unittest.py
-	)
-	epytest -p no:flaky
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r docs
-}
diff --git a/dev-python/flexmock/flexmock-0.12.2.ebuild b/dev-python/flexmock/flexmock-0.12.2.ebuild
index 8d764b843b59..d81781111831 100644
--- a/dev-python/flexmock/flexmock-0.12.2.ebuild
+++ b/dev-python/flexmock/flexmock-0.12.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/fpylll/Manifest b/dev-python/fpylll/Manifest
index 5cd10f6be752..c67752daec88 100644
--- a/dev-python/fpylll/Manifest
+++ b/dev-python/fpylll/Manifest
@@ -1,2 +1,2 @@
-DIST fpylll-0.6.1.tar.gz 1083895 BLAKE2B 091d757a1c64830307c0dffe10418305a625f1eceabee251a4f6d06e6fe7eb449ec85fdeb72fe8177d093c50e642e730283b0022fd70383338ca74ac6301e010 SHA512 3469c7b70cfdb0077a38f2c46c06901c4b2a1ac6db9fdab1e347c3b5ba147ee495aad56a6263d163e5f140cf9fa1591de98d01b83b92ec896092dd3e0a5d5a9b
 DIST fpylll-0.6.2.tar.gz 123743 BLAKE2B 755e322c1e88f0257531b356363447f05bb5c90bed1318796be5558ec96349b31e2a57420a502646f84e3d3eef2dd10ff648acbc140a0cc51cc9eb789660d499 SHA512 b5cff20f5bfb7398a76f772f72130b6c84af6a4cca10790a0b4e3df0bb6fdf3eaa6ceb351cd87422ad710081290c5a45dd0c3ccf71ad56cfc38dc16714a25242
+DIST fpylll-0.6.3.tar.gz 123868 BLAKE2B aa9e0ed169a39e1b17fb559c8d840fb6132b8d54b139ecfe1a154e5b2a6265d9e7ebfaa97b9a84278952a4c1629ad37ec9a12e3c0a3ff77f7be14c78e071f819 SHA512 c5a857e81347c53ad9b4ee93078dc384274737c72049ee7745245a7c0861ec7670ec338e4e7dc7d2fc72a9d7e59e6d918715224b2d0286a7b3f53993bdb47409
diff --git a/dev-python/fpylll/files/fpylll-0.6.1-testfix.patch b/dev-python/fpylll/files/fpylll-0.6.1-testfix.patch
deleted file mode 100644
index 4160fef6cf84..000000000000
--- a/dev-python/fpylll/files/fpylll-0.6.1-testfix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From fc432b21fa7e4b9891f5b761b3539989eb958f2b Mon Sep 17 00:00:00 2001
-From: "Martin R. Albrecht" <martinralbrecht@googlemail.com>
-Date: Sun, 28 Jan 2024 17:19:42 +0000
-Subject: [PATCH] we are not testing this code here
-
-avoids side-effects from doctest order
----
- src/fpylll/fplll/gso.pyx | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/fpylll/fplll/gso.pyx b/src/fpylll/fplll/gso.pyx
-index 3879f29b..e42a00b2 100644
---- a/src/fpylll/fplll/gso.pyx
-+++ b/src/fpylll/fplll/gso.pyx
-@@ -568,8 +568,7 @@ cdef class MatGSO:
-         >>> M = GSO.Mat(A)
-         >>> M.float_type
-         'double'
--        >>> FPLLL.set_precision(100)
--        53
-+        >>> _ = FPLLL.set_precision(100)
-         >>> M = GSO.Mat(A, float_type='mpfr')
-         >>> M.float_type
-         'mpfr'
diff --git a/dev-python/fpylll/fpylll-0.6.1.ebuild b/dev-python/fpylll/fpylll-0.6.1.ebuild
deleted file mode 100644
index 078836f19aaa..000000000000
--- a/dev-python/fpylll/fpylll-0.6.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-python/cython-3[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/${P}-testfix.patch" )
-
-distutils_enable_tests pytest
-
-python_test(){
-	local -x PY_IGNORE_IMPORTMISMATCH=1
-	epytest
-}
diff --git a/dev-python/fpylll/fpylll-0.6.2.ebuild b/dev-python/fpylll/fpylll-0.6.2.ebuild
index 49cb3a12f9d7..127d0aaea884 100644
--- a/dev-python/fpylll/fpylll-0.6.2.ebuild
+++ b/dev-python/fpylll/fpylll-0.6.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
@@ -18,7 +18,7 @@ HOMEPAGE="
 # setup.py says "or later"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 
 DEPEND="
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/fsspec/Manifest b/dev-python/fsspec/Manifest
index 1b3565202075..6ff993aba195 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,2 +1 @@
-DIST filesystem_spec-2024.10.0.gh.tar.gz 415286 BLAKE2B 59e8a1457c528c350ef49da546ee8e15dc27031dde3c5b2ae4c97a7ec0a392010c8d1558c4a6569be07aebc272add9629c6e8e7fc7e392259bb5f72b47b65a3c SHA512 46542e494044e40110c3da879ec620daca15e3a18e3e0a318f0c98f18a08aa7c319fffdf396527e920f6bc5f17fbec5e4c2030ed6a9b8853720e513165dbc56d
 DIST filesystem_spec-2024.12.0.gh.tar.gz 421670 BLAKE2B f6e6f2b478f89c9fbad6822149dc9a2b868fd2fee6edfbd532471b23d49248360170323e9454cc803c4096e62d8957e4ecaf1062bce3cdce005b39af94fdf52c SHA512 9e506da2c81a603350ecea7745b98fa38727bd0f176dc587dd570cab0e27650cd77ac061dce190d6b6372bb5dc4d5a0f3beb59b831a11a1392e178e6c94ab872
diff --git a/dev-python/fsspec/fsspec-2024.10.0.ebuild b/dev-python/fsspec/fsspec-2024.10.0.ebuild
deleted file mode 100644
index e06e223520d0..000000000000
--- a/dev-python/fsspec/fsspec-2024.10.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=filesystem_spec-${PV}
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="
-	https://github.com/fsspec/filesystem_spec/
-	https://pypi.org/project/fsspec/
-"
-# upstream removed tests in 2024.6.0
-SRC_URI="
-	https://github.com/fsspec/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tqdm[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-# Note: this package is not xdist-friendly
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p pytest_mock -o tmp_path_retention_policy=all
-}
diff --git a/dev-python/fsspec/fsspec-2024.12.0.ebuild b/dev-python/fsspec/fsspec-2024.12.0.ebuild
index 41b76892ce29..bac21cbb7a3e 100644
--- a/dev-python/fsspec/fsspec-2024.12.0.ebuild
+++ b/dev-python/fsspec/fsspec-2024.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index c542131a2650..7271387321e0 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,2 +1 @@
-DIST gitdb-4.0.11.tar.gz 394469 BLAKE2B a79caf7def6094f1c99ff8621d7a01a9bc438e3ff54c73e5e9f598fada892e0209334edf73415476e31aef1cd0cd344fba6c8fe11c80cc157fdef5b9d2cda292 SHA512 024256481c553cd8e4b7fb0c0adc735aa6485c396e43aba73873cd4ad950ca686c3df7000a85acd1ac4f09db3f6ab613018739d24a8a69b4708150c171acf13d
 DIST gitdb-4.0.12.tar.gz 394684 BLAKE2B 5176e65a3991c2d2bfc925995029b4d8f35ec7206ff0b60400b82ffb20c2e4b8a15d6494c7841c18e642a17ec42491bd44fa8052469e48bfbd3ee3dc7f99c2c4 SHA512 10891c05dd238094b6b62ff0346529af98c1110eabc3c26992afb6cd767b938291a1e1ff6dc2c33423cbcf11c0a8daf0718232a20522c06a40fb5113a64a7b6a
diff --git a/dev-python/gitdb/gitdb-4.0.11.ebuild b/dev-python/gitdb/gitdb-4.0.11.ebuild
deleted file mode 100644
index f2e771b9ace3..000000000000
--- a/dev-python/gitdb/gitdb-4.0.11.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="GitDB is a pure-Python git object database"
-HOMEPAGE="
-	https://github.com/gitpython-developers/gitdb/
-	https://pypi.org/project/gitdb/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e 's:,<[0-9.]*::' setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	local i
-
-	mkdir "${T}"/repo || die
-	cd "${T}"/repo || die
-
-	for (( i = 0; i < 2500; ++i )); do
-		echo "${i}" > file"${i}" || die
-	done
-
-	git init || die
-	git config user.email "you@example.com" || die
-	git config user.name "Your Name" || die
-	git add -A || die
-	git commit -q -m ".." || die
-	git clone --bare "${T}"/repo "${T}"/repo.git || die
-	cd "${S}" || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		gitdb/test/performance
-	)
-	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
-	epytest
-}
diff --git a/dev-python/gitdb/gitdb-4.0.12.ebuild b/dev-python/gitdb/gitdb-4.0.12.ebuild
index 03c7bd60da32..0fc3886bb98e 100644
--- a/dev-python/gitdb/gitdb-4.0.12.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.12.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/gitpython/Manifest b/dev-python/gitpython/Manifest
index 99e81a809a0f..d3a738671a02 100644
--- a/dev-python/gitpython/Manifest
+++ b/dev-python/gitpython/Manifest
@@ -1,7 +1,4 @@
-DIST GitPython-3.1.43.gitbundle 10674326 BLAKE2B c430e6fec138077502dce16a1a100459c30134af7865a2e228646791465a7176ee3ef4db5cc83081f56b5e9877aeb4ba7e54b0526d6c2f594520335db4b48e9e SHA512 8c4b2fdf2e382393420bee1cb19929171d72e72669ac3ef96ff112119d803775aae92a14908b9bd51873f102ab85dfadd940b0789da6179b0f99354ae4b6d469
-DIST GitPython-3.1.43.tar.gz 214149 BLAKE2B bc95520b839a43b88571678d7dadd3998a613a4e4f5b0e59f8740add7794767db2820e2d68a98940976ed27fa57b6e487895b1f3d2894b55f1d7f4e06757a461 SHA512 c193418bbb6ebb4f202c4f6aa95b731acf319d6560db176aa7126cf848a1f11eea9f432c4ff6812e8ddb5f8386b1fa5e10335fbf170f3ec3ac5fd2dcde783415
 DIST GitPython-3.1.44.gitbundle 10877475 BLAKE2B bb699c221be259d0be53cf9b0a8e62191547dda2dee911406b14ce753f92748dabe5827adf86a5e5a373f6113daa8d5c93490208bc7250589a37379debd42f93 SHA512 b20ac8f691e57283d0167ee0d021d559153e51fef1ae64811624e3efb96620566ed8625d6bfd0d17a6ea385534de78c60c34aaa4a9bf8416bd45da36e196ee43
-DIST gitdb-4.0.11.gitbundle 1620355 BLAKE2B 8095193318d4262b8ebb04f35a0500eda8757057ed472dbaaece53e6afa6227e2b2c02a2be5daa5e4c0cc43dcbb5046555407d3d7c8dbed0bc5c415515032b8d SHA512 17e404b335a3c081f4058aeba5c57e5697a580f8ad7a280fde868968cf48f5a0852bfa45019eab730279582c0c536f8204e973d93af09da05908477329d73360
 DIST gitdb-4.0.12.gitbundle 1627457 BLAKE2B 2fb730fb72f682bac9a71a2b70af6ed476f69d57e00b323e669550793bcc330bd4b71575e0d0f008ed58f39e5beb622213ce2a10df6f512f1f5536b72c77871a SHA512 2fc619f511e373ad2ee51a108057e3a558dbfd68cbd7632244d7fd7914ed5fce99c182de5542264273de642e6e7680ee9b54a6da95224c562f43cf65e325db56
 DIST gitpython-3.1.44.tar.gz 214196 BLAKE2B e51d50bdfaf7a96d58f744dd632439ae7d0001df25af00a732a292970ec5666e7efe167ecf4b83c32ce8f1717e465fee419405d44a3963004bd5e04461fe86c2 SHA512 ad87a76510c980cce1cf24eb1097a11d3f44833708556af6ae46d7a3e5fe6610f6a9d00e03e2e03fc0b48bb1d4d546a854c574d99e46f364478d0264abc1d076
 DIST smmap-5.0.1.gitbundle 362567 BLAKE2B 72c8b48ad3250a33b94218c145c02033dee84c1da5f1eea57983a58699262d51844be675330d95c7d64924b6aeaacd4b0a57e9a5acad3be184aaad62102202e7 SHA512 9ca8386bfec25d1562cdf1c2ee85f7edb15fd3f44ecd1abbef738979f12b82f0b0f39a06589203a39f89518d981d7129e35f64f2d855cd162cd964bdd87c8d18
diff --git a/dev-python/gitpython/gitpython-3.1.43.ebuild b/dev-python/gitpython/gitpython-3.1.43.ebuild
deleted file mode 100644
index f1e9f6b4bc0a..000000000000
--- a/dev-python/gitpython/gitpython-3.1.43.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=GitPython
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-TEST_P=GitPython-${PV}
-GITDB_P=gitdb-4.0.11
-SMMAP_P=smmap-5.0.1
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="
-	https://github.com/gitpython-developers/GitPython/
-	https://pypi.org/project/GitPython/
-"
-SRC_URI+="
-	test? (
-		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
-	)
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/typing-extensions[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "travis@ci.com" || die
-	git config --global user.name "Travis Runner" || die
-
-	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
-	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb || die
-	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
-
-	cd "${T}"/test || die
-	git rev-parse HEAD > .git/refs/remotes/origin/master || die
-	TRAVIS=1 ./init-tests-after-clone.sh || die
-	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# performance tests are unreliable by design
-		test/performance
-		# unimportant and problematic
-		test/test_installation.py
-		# Internet
-		test/test_quick_doc.py::QuickDoc::test_cloned_repo_object
-		# TODO
-		test/test_submodule.py::TestSubmodule::test_base_rw
-		test/test_submodule.py::TestSubmodule::test_root_module
-	)
-
-	epytest -o addopts= test
-}
diff --git a/dev-python/gitpython/gitpython-3.1.44.ebuild b/dev-python/gitpython/gitpython-3.1.44.ebuild
index 1e515a258973..c1a57ee319bb 100644
--- a/dev-python/gitpython/gitpython-3.1.44.ebuild
+++ b/dev-python/gitpython/gitpython-3.1.44.ebuild
@@ -29,7 +29,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 73c2b627719a..93023ca1c0e1 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,3 +1,2 @@
-DIST google_api_python_client-2.155.0.tar.gz 12195015 BLAKE2B f9c82244881b131dd022b7fd817c9fae28d4be6c6a1410e5e674d050e66b1361182515b6a220eef988ab4fdfa62e4cbf13de58e699672b3382a5449380c422e9 SHA512 1b2101d93178aa0507dcb2d8fb70c0ec29d547b87a7572508f56c87f8877b6c795f494c7f7f020df72d9e2b96083d135dfddd0ad80bb9d317189598fca9192f8
-DIST google_api_python_client-2.156.0.tar.gz 12230345 BLAKE2B 9ce77dc4fd962bf24a8046678c4c21501218dd1f3a356b364bb6940f564f9aa7e6d99c77db9b5e7fea271a17b10726a668f07dec6ec344bad5cad98a1975a107 SHA512 c29debb48f8504eb6316ec465613e87b083429344a9e74f4f52d07f6edf47b017a7f0b539557de4ca575ead3dda1d4b0579faf483102fab407c15386277d5078
 DIST google_api_python_client-2.157.0.tar.gz 12275652 BLAKE2B 9410a8b7a726c94286f9ded13091cf59d8de7238c184969f0f7cdb9330f9e6e278b2953d70cf91fa2e74b62314f02ae5372ac661a04c426ac813cec651fdacbd SHA512 3ff7078c8ccb80d84cbe8df3eefb15f5a5c986285ab6e7b06e0b49962b96f25655fc618ae15416af2c33744673c36058ffcc9df3cc1b31fb78d4dd0f053a5d19
+DIST google_api_python_client-2.159.0.tar.gz 12302576 BLAKE2B a4cf681694930b303aab3a1756fee9af2bbd52258fa6ce3a3ede3db0a211467b0ad3a8d4d75e756d66d08ee5d5b58d799136ebc6d4e739bb9e655fbf6ca24eae SHA512 57295f7a9d651466760cfb69c61e52478951da083c4c7a2238d1b0e55860cbe9d1f6d76c9b89acf36bfa39beac28c8594f96c4ecfeb04f174474d259434c32e5
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.155.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.155.0.ebuild
deleted file mode 100644
index 56cf84636d29..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.155.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-		tests/test_discovery.py::Universe::test_client_options_universe_configured_with_mtls
-		tests/test_discovery.py::Universe::test_universe_env_var_configured_with_mtls
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.156.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.156.0.ebuild
deleted file mode 100644
index 58a0eb467bad..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.156.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-		tests/test_discovery.py::Universe::test_client_options_universe_configured_with_mtls
-		tests/test_discovery.py::Universe::test_universe_env_var_configured_with_mtls
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.157.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.157.0.ebuild
index f4f4a9c95e9b..411db6ad1c18 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.157.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.157.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.159.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.159.0.ebuild
new file mode 100644
index 000000000000..f4f4a9c95e9b
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.159.0.ebuild
@@ -0,0 +1,50 @@
+# 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="Google API Client for Python"
+HOMEPAGE="
+	https://github.com/googleapis/google-api-python-client/
+	https://pypi.org/project/google-api-python-client/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+		tests/test_discovery.py::Universe::test_client_options_universe_configured_with_mtls
+		tests/test_discovery.py::Universe::test_universe_env_var_configured_with_mtls
+	)
+
+	epytest tests
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 738835dc4a7d..693ada68b9f7 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,3 +1 @@
-DIST google_auth-2.35.0.tar.gz 267223 BLAKE2B d30c8ca15f0e8183c1d50c285d578d8373bf722dddbeb2d5e423b2e25b26f038d406a6dccacf2cebbb0741a2ef07e8b0c86d0362734db3a56054ff76b6d213d7 SHA512 5c359bb94f213812c57cc2c2942d1da3aa08f0e73dde6f5b6c2f563fb51056009f3b821ec0fc39571221da267011d850c242a5ab044d88648be44759f7337973
-DIST google_auth-2.36.0.tar.gz 268336 BLAKE2B cb9df17eb367ef9be27abacb29b481490e4a471311befa2c269031b888f0a7a804b4c41a30f8914f05f3ee60e9b9664e3c694a24509418c64374d23c40cc3666 SHA512 9e61d5ab21e8973f6d9d2af8d4b73e5637efe9b09b1854bf82743e4a03a6b5fc6154a492e4b7ad5935ba3796186d6ed11e891bd0a0eb1190e06fedc824904c22
 DIST google_auth-2.37.0.tar.gz 268878 BLAKE2B da39fd1909ce93a212a71624e925df2dee753765718c5a7bb4a5ca5115dfc15c0790eeaf77d52ead7bff795f2bf9d2cfa12a6cd8cdd964d63f0dbf7d47e27b82 SHA512 08f194c99077a230845857e98ac8c4eab3ca086a288be9ce1031c9d3f6a5b40cb4fe3305be6b822b27561e4e7b0c0a144e9888be5a95ebe06de42d74fc911756
diff --git a/dev-python/google-auth/google-auth-2.35.0.ebuild b/dev-python/google-auth/google-auth-2.35.0.ebuild
deleted file mode 100644
index dc9a27d8e5d6..000000000000
--- a/dev-python/google-auth/google-auth-2.35.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# these are compatibility tests with oauth2client
-		# disable them to unblock removal of that package
-		tests/test__oauth2client.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.36.0.ebuild b/dev-python/google-auth/google-auth-2.36.0.ebuild
deleted file mode 100644
index 5778ba5b4f5d..000000000000
--- a/dev-python/google-auth/google-auth-2.36.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# these are compatibility tests with oauth2client
-		# disable them to unblock removal of that package
-		tests/test__oauth2client.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.37.0.ebuild b/dev-python/google-auth/google-auth-2.37.0.ebuild
index 494cfbdb84b9..14d4582fa1b1 100644
--- a/dev-python/google-auth/google-auth-2.37.0.ebuild
+++ b/dev-python/google-auth/google-auth-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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
@@ -26,6 +26,7 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
+		dev-python/aioresponses[${PYTHON_USEDEP}]
 		>=dev-python/cryptography-38.0.3[${PYTHON_USEDEP}]
 		dev-python/flask[${PYTHON_USEDEP}]
 		dev-python/freezegun[${PYTHON_USEDEP}]
diff --git a/dev-python/griffe/Manifest b/dev-python/griffe/Manifest
index fbd1fa01a8d8..4a12d1c42fdf 100644
--- a/dev-python/griffe/Manifest
+++ b/dev-python/griffe/Manifest
@@ -1,2 +1,2 @@
-DIST griffe-1.5.1.gh.tar.gz 385601 BLAKE2B 0d38626937af61000d2e0e1520353b00b103b33eccb9dc356e93615d0a85cc3a23d51cf9967e98666fbebb81368486bd1c87731ee9ea4f102586cce56abe3002 SHA512 9c4edbba478adb480aff15590c2b2a0c9619298652f34606f872088b05a60ce39d2f3ae8ca6a60c6fdc03a1e7ac1c8ec3a0ac6bae21043d349b87edd95b8e500
 DIST griffe-1.5.4.gh.tar.gz 391756 BLAKE2B 61f027aaaff3a1476c74646322d01db4c7f1dc2cc6c70b5d6dc27c53b71967a2304870e916120e5777612f36ce3b208227e06824bb6b5a3db0216e1016f416c5 SHA512 fa924f62a03c94f1ad45cbbff8f38262b24883ff464e3c72bce08bcdfee0722aa54a84660894e2a75a7294a041d3c928e2ce2e210c8229951d0b7e8453c88351
+DIST griffe-1.5.5.gh.tar.gz 393243 BLAKE2B a365cd210d3c11ea3e327bd38298a81b4849f0f902db949c84a4e745766753191df461cf6309abd0c3f3bc340f9cc5303484549acd7c3666595bfec600835f9d SHA512 49757656dd7ddbcb648329fb92d21742c69d13ebe49e725d70c945726833236f128851434a0095d725e4e74624473bc86948094d2d86bc898296bd860569b6cc
diff --git a/dev-python/griffe/griffe-1.5.1.ebuild b/dev-python/griffe/griffe-1.5.1.ebuild
deleted file mode 100644
index b3ab8d048238..000000000000
--- a/dev-python/griffe/griffe-1.5.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Signature generator for Python programs"
-HOMEPAGE="
-	https://mkdocstrings.github.io/griffe/
-	https://github.com/mkdocstrings/griffe/
-	https://pypi.org/project/griffe/
-"
-# Tests need files absent from the PyPI tarballs
-SRC_URI="
-	https://github.com/mkdocstrings/griffe/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/backports-strenum-1.3[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/jsonschema-4.17[${PYTHON_USEDEP}]
-		dev-python/mkdocstrings[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-2.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export PDM_BUILD_SCM_VERSION=${PV}
-
-EPYTEST_DESELECT=(
-	# fragile to installed packages
-	# (failed on PySide2 for me)
-	tests/test_stdlib.py::test_fuzzing_on_stdlib
-)
diff --git a/dev-python/griffe/griffe-1.5.5.ebuild b/dev-python/griffe/griffe-1.5.5.ebuild
new file mode 100644
index 000000000000..b90f3d687486
--- /dev/null
+++ b/dev-python/griffe/griffe-1.5.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Signature generator for Python programs"
+HOMEPAGE="
+	https://mkdocstrings.github.io/griffe/
+	https://github.com/mkdocstrings/griffe/
+	https://pypi.org/project/griffe/
+"
+# Tests need files absent from the PyPI tarballs
+SRC_URI="
+	https://github.com/mkdocstrings/griffe/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RDEPEND="
+	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/backports-strenum-1.3[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		>=dev-python/jsonschema-4.17[${PYTHON_USEDEP}]
+		dev-python/mkdocstrings[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-2.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export PDM_BUILD_SCM_VERSION=${PV}
+
+EPYTEST_DESELECT=(
+	# fragile to installed packages
+	# (failed on PySide2 for me)
+	tests/test_stdlib.py::test_fuzzing_on_stdlib
+)
diff --git a/dev-python/grpcio-status/Manifest b/dev-python/grpcio-status/Manifest
index 60500a585e4f..7320c3f98519 100644
--- a/dev-python/grpcio-status/Manifest
+++ b/dev-python/grpcio-status/Manifest
@@ -1,2 +1,3 @@
 DIST grpc-1.67.0.gh.tar.gz 17317493 BLAKE2B 81aaf9a4d293dd41d9d068e81eb8a9898b610498722dd6f9c5ff88118fc5a31a936ac83c7cdb4f56c288d131c7721beed8e307dd91bf3de5cc25951cdb06de5a SHA512 5e76a3147ca051e5304d5d64eefe124cd446dd5d7bd9a65667bae5474b59f70b32368d225e8345c9414bddb968c1390b8bcd08ed97abb62b543528289b29ec35
 DIST grpc-1.68.1.gh.tar.gz 17320674 BLAKE2B 46f4ae35c6a3a6ddfd47918a68a42d10e115ef81052715e8d8a73abf973063c730ddda06373278f3a4a6280dd4938e530a5e7377ab76aa653bb208583deab7f3 SHA512 cfb88a1290e2ee46fbd5f2b50b9c066ac174b1077170088c3b1a30bd37e66c6ca5254d2b951329a3991ac2b4320d12a50b1464babffbfc3bcf4eab670a449fd1
+DIST grpc-1.69.0.gh.tar.gz 17425484 BLAKE2B ad0f6c12312d5ef96748bc4e7b6b1b9453e00bbbe4f1233016bab132d177bf7f17325788fdec64072c339baa002816d805b3db930e0f1a767d62e4667a54afad SHA512 227c5256a8ff94d923d1c7123aa452db3853351589812a1ab325c8e1203bf9eb3066c1838eb306652a32ac2ab5d2cbffa34ae0b2bc2afddbf9281c503b4863c4
diff --git a/dev-python/grpcio-status/grpcio-status-1.68.1.ebuild b/dev-python/grpcio-status/grpcio-status-1.68.1.ebuild
index 6012fd853c7a..4a17cc01591b 100644
--- a/dev-python/grpcio-status/grpcio-status-1.68.1.ebuild
+++ b/dev-python/grpcio-status/grpcio-status-1.68.1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}/src/python/grpcio_status
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/grpcio-status/grpcio-status-1.69.0.ebuild b/dev-python/grpcio-status/grpcio-status-1.69.0.ebuild
new file mode 100644
index 000000000000..d56518703928
--- /dev/null
+++ b/dev-python/grpcio-status/grpcio-status-1.69.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2024-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
+
+MY_P=grpc-${PV}
+DESCRIPTION="Reference package for GRPC Python status proto mapping"
+HOMEPAGE="
+	https://grpc.io/
+	https://github.com/grpc/grpc/
+	https://pypi.org/project/grpcio-status/
+"
+SRC_URI="
+	https://github.com/grpc/grpc/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/src/python/grpcio_status
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/googleapis-common-protos-1.5.5[${PYTHON_USEDEP}]
+	<dev-python/protobuf-6[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-5.29.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+
+	cd "${WORKDIR}/${MY_P}/src/python/grpcio_tests" || die
+	epytest tests{,_aio}/status
+}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 65ecb79d1272..d1f957a777b9 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,6 +1,9 @@
 DIST grpc-1.67.0.gh.tar.gz 17317493 BLAKE2B 81aaf9a4d293dd41d9d068e81eb8a9898b610498722dd6f9c5ff88118fc5a31a936ac83c7cdb4f56c288d131c7721beed8e307dd91bf3de5cc25951cdb06de5a SHA512 5e76a3147ca051e5304d5d64eefe124cd446dd5d7bd9a65667bae5474b59f70b32368d225e8345c9414bddb968c1390b8bcd08ed97abb62b543528289b29ec35
 DIST grpc-1.68.1.gh.tar.gz 17320674 BLAKE2B 46f4ae35c6a3a6ddfd47918a68a42d10e115ef81052715e8d8a73abf973063c730ddda06373278f3a4a6280dd4938e530a5e7377ab76aa653bb208583deab7f3 SHA512 cfb88a1290e2ee46fbd5f2b50b9c066ac174b1077170088c3b1a30bd37e66c6ca5254d2b951329a3991ac2b4320d12a50b1464babffbfc3bcf4eab670a449fd1
+DIST grpc-1.69.0.gh.tar.gz 17425484 BLAKE2B ad0f6c12312d5ef96748bc4e7b6b1b9453e00bbbe4f1233016bab132d177bf7f17325788fdec64072c339baa002816d805b3db930e0f1a767d62e4667a54afad SHA512 227c5256a8ff94d923d1c7123aa452db3853351589812a1ab325c8e1203bf9eb3066c1838eb306652a32ac2ab5d2cbffa34ae0b2bc2afddbf9281c503b4863c4
 DIST grpcio-1.67.0.tar.gz 12569330 BLAKE2B 597efd14625898daf8c7aeff65e1d5aac4e08f7152263784c41f6b9bf0b83b8774b01ada85bfd461191d34c547296be82b994694585a57ee306d6aceebf4a9dd SHA512 201ca2548b68561135a06de971dc5a2a87bebbb6e48b4aeca23389fdd3046a11677a440af75730a0ce7cc2b7c9c7e3ab4a43d0e040c803768d04a27be645bc4e
 DIST grpcio-1.68.1.tar.gz 12694654 BLAKE2B 73dc8ef4371f43d232e452b4aba4a7a3c32f83a93631179123a020660484ecb54ce6da14ef262442ab537a60859c624876e9b6285882f998a17c3a1a144c5416 SHA512 98f517687a9e46f316a08943122e2d002eac03637049e319b070832121ec8b4f140a0e0e1c530d6f3e83973e3503b5a50cdf1532b59e23a2b2e3d8514cd4132d
+DIST grpcio-1.69.0.tar.gz 12738244 BLAKE2B b7849f57591407c6882da4596b31c974c6bd493eaea2e629e32cc757799dbdca618959db7140c0b985e9ee107a377c3fa82f6b71f705feba4a6ecbd344666daa SHA512 c2cc418c01d5c9550c6b5468f3ff6cc0417cf6dae7ab3d0cab62804ca1ce86b5c305b2fda3af2b66c9ae1e05ead41962b02c171b121ca8e75a434ecc47b16761
 DIST grpcio_tools-1.67.0.tar.gz 5159163 BLAKE2B 54a7db77514033c4747d20a13fded114828fed23f649587c649f5ad2716d4bb31b80eeda560d55ae087a564cb9d34563a612cc91df581ae6b9a761f307828397 SHA512 f9644b4424aa68f1ae4d679c7b635db9bbfc0b493c76caf7d2e9fe0a49e5e81b6f146666c8dba3fc1d1c0db141f8fb362dd0ede0842c34cb178009412a672ec5
 DIST grpcio_tools-1.68.1.tar.gz 5275384 BLAKE2B 29f504ccb3335c8f183c78c286b36c8e220dd30bd3ffb07770d330b232e40f87977bfe10e0099b05ca2a1d86c5743b056a5a4ae54f5343d9de0a9036a9b5cde4 SHA512 a967137875a50a28293d90a2b4ba6ceb35ce7532b73ea727cca0a40e734227a70e2b1f4ce201477b8418c4b29766e21d40fe33c92522d7d94c92c3a55cf265c4
+DIST grpcio_tools-1.69.0.tar.gz 5323319 BLAKE2B 70e2bc1f2a661c8f8a8eb21becd8b6b39b25c93821490b57c6c36b98de6d0f9a1abf59596ede81c38b11b597ee41b92dd857a3db5fe3b66ed301878bd3c691ab SHA512 04aa5282cf3837f21c78ee60f2980f3ed9bb0d895b3909076d9a0779c722e5ebace58e9f60c37d04f3433bbf770142238070c77b96f14e495811dfe79a208982
diff --git a/dev-python/grpcio/grpcio-1.68.1.ebuild b/dev-python/grpcio/grpcio-1.68.1.ebuild
index 3a63e258aa32..9913dd0fb8c4 100644
--- a/dev-python/grpcio/grpcio-1.68.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.68.1.ebuild
@@ -28,7 +28,7 @@ SRC_URI+="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 DEPEND="
 	dev-libs/openssl:=
diff --git a/dev-python/grpcio/grpcio-1.69.0.ebuild b/dev-python/grpcio/grpcio-1.69.0.ebuild
new file mode 100644
index 000000000000..558eb786ec35
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.69.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 2024-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 flag-o-matic multiprocessing pypi
+
+MY_P=grpc-${PV}
+DESCRIPTION="HTTP/2-based RPC framework"
+HOMEPAGE="
+	https://grpc.io/
+	https://github.com/grpc/grpc/
+	https://pypi.org/project/grpcio/
+"
+# Tests need other packages from the source tree, so use a GitHub
+# archive.  sdist provides bundled library sources (git submodules).
+SRC_URI+="
+	test? (
+		https://github.com/grpc/grpc/archive/v${PV}.tar.gz
+			-> ${MY_P}.gh.tar.gz
+		$(pypi_sdist_url grpcio_tools)
+	)
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	dev-libs/openssl:=
+	net-dns/c-ares:=
+	sys-libs/zlib:=
+"
+RDEPEND="
+	${DEPEND}
+"
+# TODO: try to remove coverage dep
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-5.29.0[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_configure() {
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+	# system abseil-cpp crashes with USE=-debug, sigh
+	# https://bugs.gentoo.org/942021
+	#export GRPC_PYTHON_BUILD_SYSTEM_ABSL=1
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	# re2 needs to be built against the same abseil-cpp version
+	#export GRPC_PYTHON_BUILD_SYSTEM_RE2=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+
+	# copied from setup.py, except for removed -std= that does not apply
+	# to C code and causes warnings
+	export GRPC_PYTHON_CFLAGS="-fvisibility=hidden -fno-wrapv -fno-exceptions"
+	# required by abseil-cpp
+	append-cxxflags -std=c++14
+	# silence a lot of harmless noise from bad quality code
+	append-cxxflags -Wno-attributes
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/unit/_dns_resolver_test.py::DNSResolverTest::test_connect_loopback
+		# not a test
+		tests_aio/unit/channel_argument_test.py::test_if_reuse_port_enabled
+		# expects grpcio-admin
+		tests/unit/test_all_modules_installed.py::TestAllModulesInstalled::test_import_all_modules
+		# TODO
+		tests_py3_only/unit/_simple_stubs_test.py::SimpleStubsTest::test_default_ssl
+	)
+	local EPYTEST_IGNORE=(
+		# not a test
+		tests/unit/test_common.py
+		# requires oauth2client
+		tests/unit/beta/_implementations_test.py
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+
+	cp -a "${BUILD_DIR}"/{install,test} || die
+	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
+
+	# grpcio proper builds against system libs
+	# grpcio_tools supports bundled libs only, and requires different
+	# flags
+	unset GRPC_PYTHON_CFLAGS
+	cd "${WORKDIR}/grpcio_tools-${PV}" || die
+	distutils_pep517_install "${BUILD_DIR}"/test
+
+	cd "${WORKDIR}/${MY_P}" || die
+	local protodir=src/proto/grpc/testing
+	local testdir=src/python/grpcio_tests
+	"${EPYTHON}" -m grpc_tools.protoc -I. --python_out="${testdir}" \
+		"${protodir}"/{empty,messages}.proto || die
+	"${EPYTHON}" -m grpc_tools.protoc -I. --grpc_python_out="${testdir}" \
+		"${protodir}"/test.proto || die
+
+	cd "${testdir}" || die
+	"${EPYTHON}" -m grpc_tools.protoc -I. --python_out=. \
+		tests/testing/proto/{requests,services}.proto || die
+	"${EPYTHON}" -m grpc_tools.protoc -I. --grpc_python_out=. \
+		tests/testing/proto/services.proto || die
+
+	# TODO: aio tests are failing randomly, so we're skipping them entirely
+	epytest tests{_py3_only,}/unit
+}
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 4c7dec33af1c..2ffa01ecfd27 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,2 +1,4 @@
 DIST gst-python-1.22.11.tar.xz 118072 BLAKE2B 7133bdc6462ed54669b18f0650ec9e9d5c90d406eadedccc2f125c01b05366c8cfd89ae17178a8197fd4c251d53fd848bdb498ff377076e402983a404f16c186 SHA512 749a3080ad56edfee66c6f24ab106b07cd2a7d6e5f704147a69e12fc0a1da9d9b8d8337c36ce62af459577df3f0804c60cbeb4a211454277ad0a46fd89edcfa5
 DIST gst-python-1.22.12.tar.xz 118924 BLAKE2B 0d31f86e2b2e673da545c94f7f4b5f934614d4cf906b96844fbfecb0cf8d6af3d85fbf197477d534f2d72248e048b945c4b974b5239e4ae68951428e016526e3 SHA512 27cd724a21d66a6c3827e3cbaeeb70f15af5253763c1410990232cb550a363a7c61ff076771fdad94f31026ad70b051d2b1ef180bbab92e2e456ae4ce467223f
+DIST gst-python-1.24.10.tar.xz 124364 BLAKE2B 6ef522ed2575e27059584a43925bf609a6efb3ba786521e2ddc68a87b3073350bcacd4efc5db8b9863949f663571c4a2b5d76dd3b044d92a340e1f92627609f2 SHA512 11c32ebd0374f7f4b51c8fe8f3874773c7f4b3b5d53c09ddc22d36cdd2512fc638d85c25085e2583ba7ea36da91c5e2f2169603c584c8be59d46fdcdd642f4db
+DIST gst-python-1.24.11.tar.xz 125216 BLAKE2B 9ec4ad340e907912f3fb3ce3dc7aa40100ef38c4428044dbf979b27ca979e09ceb238a2acd1f768f1c19bba27a77bc4c12e5a71c9d2aa2389f19db28b8b4c082 SHA512 68627c06d38ec1c51597e9018d4a101c7ede5c36980a85055a63135a59d8ac8fdb33f2e6a5d52c5bb91f5efcc9c8c4df218d9892b980da4ae997531aa6d414eb
diff --git a/dev-python/gst-python/gst-python-1.22.12.ebuild b/dev-python/gst-python/gst-python-1.22.12.ebuild
index 50e860486672..2f5920def90b 100644
--- a/dev-python/gst-python/gst-python-1.22.12.ebuild
+++ b/dev-python/gst-python/gst-python-1.22.12.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 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/gst-python/gst-python-1.24.10.ebuild b/dev-python/gst-python/gst-python-1.24.10.ebuild
new file mode 100644
index 000000000000..50e860486672
--- /dev/null
+++ b/dev-python/gst-python/gst-python-1.24.10.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit meson python-r1 xdg-utils
+
+DESCRIPTION="A Python Interface to GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=media-libs/gstreamer-${PV}:1.0[introspection]
+	>=media-libs/gst-plugins-base-${PV}:1.0[introspection]
+	>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	# Avoid building & testing plugin - it must NOT be multi-python as gst-inspect will map in all libpython.so versions and crash or behave mysteriously.
+	# Python plugin support is of limited use (GIL gets in the way). If it's ever requested or needed, it should be a
+	# separate python-single-r1 media-plugins/gst-plugins-python package that only builds the plugin directory.
+	sed -e '/subdir.*plugin/d' -i meson.build || die
+	sed -e '/test_plugin.py/d' -i testsuite/meson.build || die
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	configuring() {
+		meson_src_configure \
+			-Dpython="${EPYTHON}"
+	}
+	python_foreach_impl configuring
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	python_foreach_impl meson_src_test
+}
+
+src_install() {
+	installing() {
+		meson_src_install
+		python_optimize
+	}
+	python_foreach_impl installing
+}
diff --git a/dev-python/gst-python/gst-python-1.24.11.ebuild b/dev-python/gst-python/gst-python-1.24.11.ebuild
new file mode 100644
index 000000000000..b0dadf336030
--- /dev/null
+++ b/dev-python/gst-python/gst-python-1.24.11.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit meson python-r1 xdg-utils
+
+DESCRIPTION="A Python Interface to GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=media-libs/gstreamer-${PV}:1.0[introspection]
+	>=media-libs/gst-plugins-base-${PV}:1.0[introspection]
+	>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	# Avoid building & testing plugin - it must NOT be multi-python as gst-inspect will map in all libpython.so versions and crash or behave mysteriously.
+	# Python plugin support is of limited use (GIL gets in the way). If it's ever requested or needed, it should be a
+	# separate python-single-r1 media-plugins/gst-plugins-python package that only builds the plugin directory.
+	sed -e '/subdir.*plugin/d' -i meson.build || die
+	sed -e '/test_plugin.py/d' -i testsuite/meson.build || die
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	configuring() {
+		meson_src_configure \
+			-Dpython="${EPYTHON}"
+	}
+	python_foreach_impl configuring
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	python_foreach_impl meson_src_test
+}
+
+src_install() {
+	installing() {
+		meson_src_install
+		python_optimize
+	}
+	python_foreach_impl installing
+}
diff --git a/dev-python/hatch/Manifest b/dev-python/hatch/Manifest
new file mode 100644
index 000000000000..dcbe2ac39977
--- /dev/null
+++ b/dev-python/hatch/Manifest
@@ -0,0 +1 @@
+DIST hatch-1.14.0.tar.gz 5188143 BLAKE2B e018bb96f08f8ba390b4681f376d69c8f50d16254dcababf5ca308f46aa3b2f654a0af88b883130d2f4255c440c9a3038e2640a6ffdb6e3449ca73b898eef032 SHA512 bb0b6e03cb2174f9c761b4b322c8da00949e0afab779d8506ebc24773f809e04f2c7ec7b54b450de860fdc8ebe5063011d2d085ea133f3c7ad3c40bcfe28f335
diff --git a/dev-python/hatch/hatch-1.14.0-r1.ebuild b/dev-python/hatch/hatch-1.14.0-r1.ebuild
new file mode 100644
index 000000000000..67af1d9235a0
--- /dev/null
+++ b/dev-python/hatch/hatch-1.14.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Modern, extensible Python project management"
+HOMEPAGE="
+	https://github.com/pypa/hatch/
+	https://pypi.org/project/hatch/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/click-8.0.6[${PYTHON_USEDEP}]
+	>=dev-python/hatchling-1.24.2[${PYTHON_USEDEP}]
+	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
+	>=dev-python/keyring-23.5.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-24.2[${PYTHON_USEDEP}]
+	<dev-python/pexpect-5[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.8[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.5.0[${PYTHON_USEDEP}]
+	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
+	>=dev-python/rich-11.2.0[${PYTHON_USEDEP}]
+	>=dev-python/shellingham-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-w-1.0[${PYTHON_USEDEP}]
+	>=dev-python/tomlkit-0.11.1[${PYTHON_USEDEP}]
+	<dev-python/userpath-2[${PYTHON_USEDEP}]
+	>=dev-python/userpath-1.7[${PYTHON_USEDEP}]
+	>=dev-python/uv-0.1.35
+	>=dev-python/virtualenv-20.26.6[${PYTHON_USEDEP}]
+	<dev-python/zstandard-1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/hatch-vcs-0.3.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/editables[${PYTHON_USEDEP}]
+		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-python/flit-core[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# we don't install .dist-info for uv
+	sed -i -e '/uv/d' pyproject.toml || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/cli/env/test_create.py::test_uv_env
+	)
+	local EPYTEST_IGNORE=(
+		# we're running these in dev-python/hatchling
+		tests/backend
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_fakefs -p pytest_mock \
+		-m "not requires_internet and not requires_docker"
+}
diff --git a/dev-python/hatch/metadata.xml b/dev-python/hatch/metadata.xml
new file mode 100644
index 000000000000..56782bba5b9e
--- /dev/null
+++ b/dev-python/hatch/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="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">pypa/hatch</remote-id>
+		<remote-id type="pypi">hatch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index 3b9e9403b388..90878d785943 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1,2 +1 @@
-DIST hatch-hatchling-v1.26.3.gh.tar.gz 5275661 BLAKE2B 2aa7ac3cfb0e07b29765749fca94bdf6f54eb4fe38b809851b4a41ab7dde28faa304c2efc0f9a1cb53868167ad1c01871723cb89aa299d0619b8fa190435bb95 SHA512 1e62384acdf6707297a2847cdba2da4d63caf48d7428544c70b106d75aa3966f4204cd172cf9ddf25e5c1fe8c029c6730cf884c705ebfdc4f93773fa6527e5a4
 DIST hatch-hatchling-v1.27.0.gh.tar.gz 5275714 BLAKE2B 5db266a4efa8d315ac991b4f109834cbe3710d6b944de78591f3707d1552a60ac24c1970c093190c2b3fdb8515d7ed5f4af7a32a1a364cefe9f4c08eef84b369 SHA512 d519428c4c7c21950df2484f38332b5c89525347f3557ff21a55a85811955c8466f6eb4f919d824ab7a576cd35d8a59e4a5e7827100f6ea1e38c10c0f1864a29
diff --git a/dev-python/hatchling/hatchling-1.26.3-r1.ebuild b/dev-python/hatchling/hatchling-1.26.3-r1.ebuild
deleted file mode 100644
index 8e5205e5a8fd..000000000000
--- a/dev-python/hatchling/hatchling-1.26.3-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t )
-
-inherit distutils-r1
-
-TAG=${P/-/-v}
-MY_P=hatch-${TAG}
-DESCRIPTION="Modern, extensible Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/hatchling/
-	https://github.com/pypa/hatch/
-"
-SRC_URI="
-	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/backend
-
-LICENSE="MIT"
-SLOT="0"
-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"
-
-# deps are listed in backend/src/hatchling/ouroboros.py
-# editables are optional but required for editable installs
-RDEPEND="
-	>=dev-python/editables-0.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24.2[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-	' 3.10)
-	dev-python/trove-classifiers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/atomicwrites[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-			dev-python/httpx[${PYTHON_USEDEP}]
-			dev-python/platformdirs[${PYTHON_USEDEP}]
-			dev-python/pytest-mock[${PYTHON_USEDEP}]
-			dev-python/rich[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# top-level "tests" directory contains tests both for hatch
-	# and hatchling
-	cd "${WORKDIR}/${MY_P}" || die
-
-	# sigh; standalone test suites are overrated, right?
-	echo "__version__ = '${PV}'" > src/hatch/_version.py || die
-	local -x PYTHONPATH="src:${PYTHONPATH}"
-
-	# do not require uv for portability, sigh
-	mkdir "${T}/bin" || die
-	cat > "${T}/bin/uv" <<-EOF || die
-		#!/bin/sh
-		exit 127
-	EOF
-	chmod +x "${T}/bin/uv" || die
-	local -x PATH=${T}/bin:${PATH}
-
-	# tests mock cargo subprocess call but the backend raises if CARGO
-	# is not set and shutil.which() can't find it
-	local -x CARGO=cargo
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x EPYTEST_DESELECT=(
-		# most of these run uv to install stuff
-		# the few remaining tests aren't worth running
-		tests/backend/dep/test_core.py
-		# broken if CARGO is set
-		tests/backend/builders/test_binary.py::TestBuildBootstrap::test_no_cargo
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock tests/backend
-}
diff --git a/dev-python/hatchling/hatchling-1.27.0.ebuild b/dev-python/hatchling/hatchling-1.27.0.ebuild
index d6cb34a09c15..df602bfd6d23 100644
--- a/dev-python/hatchling/hatchling-1.27.0.ebuild
+++ b/dev-python/hatchling/hatchling-1.27.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}/backend
 
 LICENSE="MIT"
 SLOT="0"
-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"
 
 # deps are listed in backend/src/hatchling/ouroboros.py
 # editables are optional but required for editable installs
diff --git a/dev-python/httpretty/files/httpretty-1.1.4-urllib3-2.3.patch b/dev-python/httpretty/files/httpretty-1.1.4-urllib3-2.3.patch
new file mode 100644
index 000000000000..c559f84fe997
--- /dev/null
+++ b/dev-python/httpretty/files/httpretty-1.1.4-urllib3-2.3.patch
@@ -0,0 +1,40 @@
+From 8e96b1e312d473429fbd08bc867376e9932ad42a Mon Sep 17 00:00:00 2001
+From: Carl Smedstad <carl.smedstad@protonmail.com>
+Date: Mon, 30 Dec 2024 19:08:26 +0100
+Subject: [PATCH] Mock socket.shutdown for compatibility with urllib3 >= 2.3
+
+Version 2.3.0 of urllib3 gets the attribute socket.shutdown which
+HTTPretty does no mock. See the following call stack:
+
+    /usr/lib/python3.13/site-packages/requests/sessions.py:602: in get
+        return self.request("GET", url, **kwargs)
+    /usr/lib/python3.13/site-packages/requests/sessions.py:589: in request
+        resp = self.send(prep, **send_kwargs)
+    /usr/lib/python3.13/site-packages/requests/sessions.py:703: in send
+        r = adapter.send(request, **kwargs)
+    /usr/lib/python3.13/site-packages/requests/adapters.py:667: in send
+        resp = conn.urlopen(
+    /usr/lib/python3.13/site-packages/urllib3/connectionpool.py:787: in urlopen
+        response = self._make_request(
+    /usr/lib/python3.13/site-packages/urllib3/connectionpool.py:534: in _make_request
+        response = conn.getresponse()
+    /usr/lib/python3.13/site-packages/urllib3/connection.py:513: in getresponse
+        _shutdown = getattr(self.sock, "shutdown", None)
+---
+ httpretty/core.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/httpretty/core.py b/httpretty/core.py
+index 69686458..de7e091a 100644
+--- a/httpretty/core.py
++++ b/httpretty/core.py
+@@ -861,6 +861,9 @@ def recv_into(self, *args, **kwargs):
+         def recvfrom(self, *args, **kwargs):
+             return self.forward_and_trace('recvfrom', *args, **kwargs)
+ 
++        def shutdown(self, *args, **kwargs):
++            return self.forward_and_trace('shutdown', *args, **kwargs)
++
+         def recv(self, buffersize=0, *args, **kwargs):
+             if not self._read_buf:
+                 self._read_buf = io.BytesIO()
diff --git a/dev-python/httpretty/httpretty-1.1.4-r1.ebuild b/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
deleted file mode 100644
index b3df1302ab77..000000000000
--- a/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="
-	https://github.com/gabrielfalcao/httpretty/
-	https://pypi.org/project/httpretty/
-"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		>=dev-python/tornado-2.2[${PYTHON_USEDEP}]
-	)
-"
-# These are optional test deps, that are used to test compatibility
-# with various HTTP libs.  We prefer pulling them in whenever possible
-# to increase test coverage but we can live without them.
-# We're skipping redis entirely since it requires a running server.
-BDEPEND+="
-	test? (
-		test-rust? (
-			dev-python/pyopenssl[${PYTHON_USEDEP}]
-		)
-		>=dev-python/boto3-1.17.72[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.18.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${P}-pytest.patch"
-)
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# this seems to be a stress test
-		tests/bugfixes/pytest/test_426_mypy_segfault.py
-		# passthrough tests require Internet access
-		tests/functional/test_passthrough.py
-		# eventlet is masked for removal
-		tests/bugfixes/nosetests/test_eventlet.py
-	)
-	local EPYTEST_DESELECT=(
-		# regressions with newer dev-python/requests
-		tests/functional/test_requests.py::test_httpretty_should_allow_registering_regexes_with_streaming_responses
-		tests/functional/test_requests.py::test_httpretty_should_handle_paths_starting_with_two_slashes
-	)
-
-	local ignore_by_dep=(
-		dev-python/boto3:tests/bugfixes/nosetests/test_416_boto3.py
-		dev-python/httplib2:tests/functional/test_httplib2.py
-		dev-python/httpx:tests/bugfixes/nosetests/test_414_httpx.py
-		dev-python/pyopenssl:tests/bugfixes/nosetests/test_417_openssl.py
-	)
-
-	local x
-	for x in "${ignore_by_dep[@]}"; do
-		if ! has_version "${x%:*}[${PYTHON_USEDEP}]"; then
-			EPYTEST_IGNORE+=( "${x#*:}" )
-		fi
-	done
-
-	epytest
-}
diff --git a/dev-python/httpretty/httpretty-1.1.4-r3.ebuild b/dev-python/httpretty/httpretty-1.1.4-r3.ebuild
new file mode 100644
index 000000000000..f7906b02e6a1
--- /dev/null
+++ b/dev-python/httpretty/httpretty-1.1.4-r3.ebuild
@@ -0,0 +1,86 @@
+# 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="HTTP client mock for Python"
+HOMEPAGE="
+	https://github.com/gabrielfalcao/httpretty/
+	https://pypi.org/project/httpretty/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+IUSE="test-rust"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		>=dev-python/tornado-2.2[${PYTHON_USEDEP}]
+	)
+"
+# These are optional test deps, that are used to test compatibility
+# with various HTTP libs.  We prefer pulling them in whenever possible
+# to increase test coverage but we can live without them.
+# We're skipping redis entirely since it requires a running server.
+BDEPEND+="
+	test? (
+		test-rust? (
+			dev-python/pyopenssl[${PYTHON_USEDEP}]
+		)
+		>=dev-python/boto3-1.17.72[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/httpx-0.18.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/${P}-pytest.patch"
+	# https://github.com/gabrielfalcao/HTTPretty/pull/485
+	"${FILESDIR}/${P}-urllib3-2.3.patch"
+)
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# this seems to be a stress test
+		tests/bugfixes/pytest/test_426_mypy_segfault.py
+		# passthrough tests require Internet access
+		tests/functional/test_passthrough.py
+		# eventlet is masked for removal
+		tests/bugfixes/nosetests/test_eventlet.py
+	)
+	local EPYTEST_DESELECT=(
+		# regressions with newer dev-python/requests
+		tests/functional/test_requests.py::test_httpretty_should_allow_registering_regexes_with_streaming_responses
+		tests/functional/test_requests.py::test_httpretty_should_handle_paths_starting_with_two_slashes
+	)
+
+	local ignore_by_dep=(
+		dev-python/boto3:tests/bugfixes/nosetests/test_416_boto3.py
+		dev-python/httplib2:tests/functional/test_httplib2.py
+		dev-python/httpx:tests/bugfixes/nosetests/test_414_httpx.py
+		dev-python/pyopenssl:tests/bugfixes/nosetests/test_417_openssl.py
+	)
+
+	local x
+	for x in "${ignore_by_dep[@]}"; do
+		if ! has_version "${x%:*}[${PYTHON_USEDEP}]"; then
+			EPYTEST_IGNORE+=( "${x#*:}" )
+		fi
+	done
+
+	epytest
+}
diff --git a/dev-python/httptools/httptools-0.6.4.ebuild b/dev-python/httptools/httptools-0.6.4.ebuild
index a23d42aafad2..baaec7546d9c 100644
--- a/dev-python/httptools/httptools-0.6.4.ebuild
+++ b/dev-python/httptools/httptools-0.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # don't ask me why they use both
 DEPEND="
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 44bd16e5da49..b734a193e3e7 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,3 +1 @@
-DIST httpx-0.27.2.gh.tar.gz 2185609 BLAKE2B 7e77cab0e9bda032cd595549e43dfc102f90bb8668b62f6b1f0df6bce6b6358f34aa1f51457a315eb774dde8c76083d180c02ff45283dd348c39b4a659307713 SHA512 c7852ae3e982bacee1587b66aed506f3f7e12caf296e651d3cdd9c111a7d737af49473be455bcabccc8e52487ad18b4821ea56b39500c3b77ed2325fc55505ae
-DIST httpx-0.28.0.gh.tar.gz 4117883 BLAKE2B 0fa645a5767355d4c29d7eedb137c73ddf620ddb7b2b84550f6538fcf9e9900b27bcd91d7177392f6490db3cd6db92e1b7b6ab62e19e97b4a4a8cce0d72c65d9 SHA512 2b3a3a84af81dd130ad574e87369769c8cd76fd40793dd41032e89d2632f25468dcf7ae7279302cd0b3d32dafa9f4c17b7b4c9eae81b5dd7b9fcde1daa26e844
 DIST httpx-0.28.1.gh.tar.gz 4118011 BLAKE2B 76c24a3b3618798d5b65aaaa87ee583f9debf8cb7866204a3e12c151179d9f69a6ad23198c9ee7df61058f73b6ca84f453c3bced25a60f583d7b3ad7681839bb SHA512 5571957a3516533f1c1e76f311316811f6365e192d19ebae10c9ab0d0c4094d811063fd2be2995f3b6a41d6899a7882f27265badecf238a4f7903f976136d3ba
diff --git a/dev-python/httpx/httpx-0.27.2.ebuild b/dev-python/httpx/httpx-0.27.2.ebuild
deleted file mode 100644
index 8b4cd9b49acb..000000000000
--- a/dev-python/httpx/httpx-0.27.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
-HOMEPAGE="
-	https://www.python-httpx.org/
-	https://github.com/encode/httpx/
-	https://pypi.org/project/httpx/
-"
-SRC_URI="
-	https://github.com/encode/httpx/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	dev-python/anyio[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	=dev-python/httpcore-1*[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	cli? (
-		=dev-python/click-8*[${PYTHON_USEDEP}]
-		=dev-python/pygments-2*[${PYTHON_USEDEP}]
-		dev-python/rich[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	test? (
-		dev-python/brotlicffi[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/h2[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-		>=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/trio[${PYTHON_USEDEP}]
-		' 3.{10..13})
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-0.27.0-opt-trio.patch"
-	)
-
-	if ! use cli; then
-		sed -i -e '/^httpx =/d' pyproject.toml || die
-	fi
-	sed -i -e '/rich/s:,<14::' pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local args=()
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/client/test_proxies.py::test_async_proxy_close
-		tests/client/test_proxies.py::test_sync_proxy_close
-	)
-
-	use cli || EPYTEST_IGNORE+=(
-		tests/test_main.py
-	)
-
-	if ! has_version "dev-python/trio[${PYTHON_USEDEP}]"; then
-		args+=( -o filterwarnings= -k "not trio" )
-	fi
-
-	epytest "${args[@]}"
-}
-
-pkg_postinst() {
-	optfeature "HTTP/2 support" dev-python/h2
-	optfeature "SOCKS proxy support" dev-python/socksio
-	optfeature "Decoding for brotli compressed responses" dev-python/brotlicffi
-}
diff --git a/dev-python/httpx/httpx-0.28.0.ebuild b/dev-python/httpx/httpx-0.28.0.ebuild
deleted file mode 100644
index ce5c39fc1ade..000000000000
--- a/dev-python/httpx/httpx-0.28.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
-HOMEPAGE="
-	https://www.python-httpx.org/
-	https://github.com/encode/httpx/
-	https://pypi.org/project/httpx/
-"
-SRC_URI="
-	https://github.com/encode/httpx/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	dev-python/anyio[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	=dev-python/httpcore-1*[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	cli? (
-		=dev-python/click-8*[${PYTHON_USEDEP}]
-		=dev-python/pygments-2*[${PYTHON_USEDEP}]
-		dev-python/rich[${PYTHON_USEDEP}]
-	)
-"
-# httptools cause tests to fail
-# https://github.com/encode/httpx/discussions/3429
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	test? (
-		dev-python/brotlicffi[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/h2[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-		>=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/trio[${PYTHON_USEDEP}]
-		' 3.{10..13})
-		!!dev-python/httptools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-0.27.0-opt-trio.patch"
-	)
-
-	if ! use cli; then
-		sed -i -e '/^httpx =/d' pyproject.toml || die
-	fi
-	sed -i -e '/rich/s:,<14::' pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local args=()
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/client/test_proxies.py::test_async_proxy_close
-		tests/client/test_proxies.py::test_sync_proxy_close
-	)
-
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/encode/httpx/discussions/3430
-			# https://github.com/pypy/pypy/issues/5141
-			tests/test_config.py::test_load_ssl_with_keylog
-		)
-	fi
-
-	use cli || EPYTEST_IGNORE+=(
-		tests/test_main.py
-	)
-
-	if ! has_version "dev-python/trio[${PYTHON_USEDEP}]"; then
-		args+=( -o filterwarnings= -k "not trio" )
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p anyio "${args[@]}"
-}
-
-pkg_postinst() {
-	optfeature "HTTP/2 support" dev-python/h2
-	optfeature "SOCKS proxy support" dev-python/socksio
-	optfeature "Decoding for brotli compressed responses" dev-python/brotlicffi
-}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 931d6e27edd0..db0ee0d3fcda 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,10 +1,8 @@
-DIST hypothesis-6.119.4.gh.tar.gz 9490666 BLAKE2B 99a45054b90026317bca165915b2ffe3b3abfa03a98efc6181bd64f6ca851f9a90e4ba1b41ba4f3b2181de02818a91367f1c29523b78bca303da4eea31db1284 SHA512 003b01fd3e1e4ae2ea68f72b80063928dd56a069fdf8b6ffc73f6ffb3db4b048523564bd616d604d04a3ea55b19c01940ad7ba60bf1e88c54e29359ca0e397db
-DIST hypothesis-6.122.1.gh.tar.gz 9492677 BLAKE2B 66f89d2388cb34e5df95bc73af69259c8460b0508b14b07b99d749443be44f0c43b20bfb1d2edddf844e97f18b20e98ceade1dc66d08ecfc8403fdb6f9a461dd SHA512 27e3fca0510cc4267f3ec4df112937fc1e06331d1498f0db1815912a6eaacd3fcb07705aed84db1f03212dae3bd3d4902071070c81694f9ae2df1a03d4964c14
-DIST hypothesis-6.122.3.gh.tar.gz 9495681 BLAKE2B af743d0486d31590639216e60901eb7ee376dfcce18a9e130ea5061788d9c9d66f1ebcec23f144d41652581e50c30903aa9d697e304cfe05259c454c344f02e0 SHA512 8776f603682a3ef7c36bc47f6e36b64b0e01c37f4db80fe78d492a3e4d347b4ec1d9c87e6999069d2cb4b5ac7d33e0d1258055b679fcacc6812b256e6398f043
-DIST hypothesis-6.122.4.gh.tar.gz 9495842 BLAKE2B 4a17e7096a1c86a13851af3d905839c53e0b8b15685a84bad9fbde5d74679e1153bcfe8dae6780bdaabcb3242990f4cd29d4eaf29f564eda4c09c01b4fdd5f98 SHA512 4828b35ca3c9a601303eb671e322d1c81afe079d0eb04d5518397310e5ee15a1e0bdc5c3fb252c34de8a5ad931992974a9bbe136ebebd10c26a52096febdda31
-DIST hypothesis-6.122.5.gh.tar.gz 9499110 BLAKE2B 57de8290600ceadc408804d4ec5df7bc96977757dfb9039d894e39bef6c0a53fd3453ac86320353079c4835218557e5331a45894e5f61a60191c562c334827dc SHA512 67df638efaca6fccafba2305042a785c32ea532ac52336f55e38fe085351052386408399e0097572a9be546891212286228a12b48839892883284a4cee01ff33
-DIST hypothesis-6.122.6.gh.tar.gz 9499547 BLAKE2B 2d111698688050f3ce0d9cfdc1bc5b900b4d347b3733edac483e8e1b0b915b158903d055955893041c80064a0878d6a2a7aaafcf3b9b00c4c232567b9709aeae SHA512 3aa0d6a8ac033b6145b6ba831663074002bd67a793e8fe157e76d2768b2048d9864b82179667f7cb732444f09a5b178490b6eecb34d4c0460a164968b33c9f88
-DIST hypothesis-6.122.7.gh.tar.gz 9503262 BLAKE2B d7b98f0df159c8e234d8d46d94f2803f9db21d9b36e029ae1e7ddd8403193a3bf0ddaf46087b7dd0cf003c3cf55cbecbac8431f140462b60d5eebe00d7b65a79 SHA512 c8625ba7252c750ee26f2db28f899e63b1bcfb7e5cecb8eb722fe75bb26cbed69e7e1e3616b27bae5336b68cd823ac658058e9fdb55a9df777c99b9f9c95354d
-DIST hypothesis-6.123.0.gh.tar.gz 9504064 BLAKE2B a71a119dfa15318bf8afd0fa586edc2cc67e7987d5544eca7a15495a73a4c3a9c637c3948003ac868aafb9cb6540426fd0628b8fc8f8d21d2e606ff536993924 SHA512 29459331a546ee03e6ee7307049c632523af6dddd475ce6d690a7f6fe11d6506ce4b37de8ea11cd8dc7b35acede901c0138018488973b35f3827e832a6ccc5f9
-DIST hypothesis-6.123.1.gh.tar.gz 9504686 BLAKE2B 755a1eca08744621ab9d836d8ea610bf58ea6e768da3580e6b88514ec46d578dd0bfdfe9cd0d416d889e6c48fdf8d58970a007a40f608f81c5686e477092a7bb SHA512 ed0646f9a0f88da130e44976a3340125253d626fcb0c5aa06ce0631471d320c74818326c3858198c2288e4a05557e491026d0f8bdf905daadf54a7a5d4bfb6ae
+DIST hypothesis-6.123.13.gh.tar.gz 9510548 BLAKE2B d2656c4e76713533eb58f5cbee945bcd66be2ba50bfa1278d7e507214dcb00f067a1ef0e74e2e7240763fc7ceb9f2cd9f2036840850910134f713fe1891a924e SHA512 541172d8ffaa0a8103d7e889042b20426bfa6131c1628bce1131c83509f449b8b20bb448ed867e8a297392421d300b6e8ca8893da9d42cbf84144db705e35b5c
+DIST hypothesis-6.123.15.gh.tar.gz 9507335 BLAKE2B e4e017ecd78f702aaf02efd5df0a87d145d5a4f2650a1136dd03d240f4d0cd13ab56b39b5e863ea984c6d1db3d8124b59d48151923a0f4750726f05d92ab54dd SHA512 432457b4c556e842b7fbc8248ab094798e895e72e9f7e70fe579eca877d9ab8aec1291584eb6383d18784dacc666525f5200ebec2ee52c9a0397aa35f2114d5e
+DIST hypothesis-6.123.16.gh.tar.gz 9507597 BLAKE2B 15876ea1a5a8c7916ea8724a84889a68be670a937a0d42ea12f74a9c391f088aa1a1ab34b1384cecee5c475fab479d3cb7f782733c2b047b947949078321e59b SHA512 75b1a225b0f8e5e77706b42b911bfac72f3d259574af46e7a09e77abd1ae906f0c401efd158f4786e8eb0f6352931709abd24b1ef072f76074f65049cab6e04c
+DIST hypothesis-6.123.17.gh.tar.gz 9508250 BLAKE2B 494c41299a646856050889e2093dae477386c76ac3e57576698178a65cfe4b3bb7a2cfe19204904ae0ca8d25cf8d347389c7eb76b7d8ac046067fc4b11bd509f SHA512 73f2c2cd1bb9063d74448cfba0f85308398b52fcb0cd948a64b6396f698b914154a93b7afdf2b3c32a902f21f6a84996218572af700c35c518d9a41bbe6cae8f
 DIST hypothesis-6.123.2.gh.tar.gz 9506171 BLAKE2B a7033cf2b5d56753ce19c5b369889b62d88c86df8254c840341c599dd97f575fc84e73236e701f4303d6141146bdef24f13f8d666f30a578ff80b067976934ba SHA512 d46b3d83a14b629a39f7eb2dcb0915802ee8185b4796ea38d053e44f2e8e4025a053c99a0aea7b4b59442a24fd3600b78d5a19e1f0bbd13e8a2d9f93cdca3df6
+DIST hypothesis-6.123.7.gh.tar.gz 9509012 BLAKE2B 71def0634aee97b4d64bacf9b4a09e091fb209c9de2d2ecbcbb86ad0f7bc2e330e7d7b93e1c810b864fd80ecd82eb6bf51aaf6a6de99c74c338609062ce1e90e SHA512 00b26f4e040a948aaf64554ee395fad4c9b0bb116c87d97bd3ef20be1d25068a79ed1c856c497c1d3d5122481386625c3323be77c0ec851fab823a706350b437
+DIST hypothesis-6.124.0.gh.tar.gz 9509075 BLAKE2B 06bcce0c2f3772ae16c623367e53410b1d5237a2f62f77643080d69e4b32b47f0cbbeba98c66a83247c35d3d6a3d9e7c6493383393a13fc63d86792ef464ca59 SHA512 f876e18fcc784f9b61c18435c66a9aaf9aee76875f5d5e29dbca31448421e7691977660946ea5e3d3f0c33d740ddee55d860995636ff54706cd5c01d39663dc4
+DIST hypothesis-6.124.1.gh.tar.gz 9512599 BLAKE2B 4220d41a7c2573fc4fe2ae550370c563feb3a558f74808979ea66afc5da3e749960842ab8a213d4826c2c2c4c8e9ddfbb263b99820b7fb142f0586036a8683d4 SHA512 64a1c64ad68295ddaeb11cd28c7650fc79fbf668129daefc6fa8c492d3de919468015127721bf1525512f1929dd0dd70906a864ab402571517ddd61ddb097ae7
diff --git a/dev-python/hypothesis/hypothesis-6.119.4.ebuild b/dev-python/hypothesis/hypothesis-6.119.4.ebuild
deleted file mode 100644
index e25e20b3b7f3..000000000000
--- a/dev-python/hypothesis/hypothesis-6.119.4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= tests/cover tests/pytest tests/quality
-}
-
-src_install() {
-	local HAD_CLI=
-
-	distutils-r1_src_install
-
-	if [[ ! ${HAD_CLI} ]]; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		HAD_CLI=1
-	else
-		rm -r "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.122.1.ebuild b/dev-python/hypothesis/hypothesis-6.122.1.ebuild
deleted file mode 100644
index dde5562c67da..000000000000
--- a/dev-python/hypothesis/hypothesis-6.122.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
-		tests/cover tests/pytest tests/quality
-}
-
-src_install() {
-	local HAD_CLI=
-
-	distutils-r1_src_install
-
-	if [[ ! ${HAD_CLI} ]]; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		HAD_CLI=1
-	else
-		rm -r "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.122.3.ebuild b/dev-python/hypothesis/hypothesis-6.122.3.ebuild
deleted file mode 100644
index dde5562c67da..000000000000
--- a/dev-python/hypothesis/hypothesis-6.122.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
-		tests/cover tests/pytest tests/quality
-}
-
-src_install() {
-	local HAD_CLI=
-
-	distutils-r1_src_install
-
-	if [[ ! ${HAD_CLI} ]]; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		HAD_CLI=1
-	else
-		rm -r "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.122.4.ebuild b/dev-python/hypothesis/hypothesis-6.122.4.ebuild
deleted file mode 100644
index dde5562c67da..000000000000
--- a/dev-python/hypothesis/hypothesis-6.122.4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
-		tests/cover tests/pytest tests/quality
-}
-
-src_install() {
-	local HAD_CLI=
-
-	distutils-r1_src_install
-
-	if [[ ! ${HAD_CLI} ]]; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		HAD_CLI=1
-	else
-		rm -r "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.122.5.ebuild b/dev-python/hypothesis/hypothesis-6.122.5.ebuild
deleted file mode 100644
index dde5562c67da..000000000000
--- a/dev-python/hypothesis/hypothesis-6.122.5.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
-		tests/cover tests/pytest tests/quality
-}
-
-src_install() {
-	local HAD_CLI=
-
-	distutils-r1_src_install
-
-	if [[ ! ${HAD_CLI} ]]; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		HAD_CLI=1
-	else
-		rm -r "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.122.6.ebuild b/dev-python/hypothesis/hypothesis-6.122.6.ebuild
deleted file mode 100644
index dde5562c67da..000000000000
--- a/dev-python/hypothesis/hypothesis-6.122.6.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
-		tests/cover tests/pytest tests/quality
-}
-
-src_install() {
-	local HAD_CLI=
-
-	distutils-r1_src_install
-
-	if [[ ! ${HAD_CLI} ]]; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		HAD_CLI=1
-	else
-		rm -r "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.122.7.ebuild b/dev-python/hypothesis/hypothesis-6.122.7.ebuild
deleted file mode 100644
index dde5562c67da..000000000000
--- a/dev-python/hypothesis/hypothesis-6.122.7.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
-		tests/cover tests/pytest tests/quality
-}
-
-src_install() {
-	local HAD_CLI=
-
-	distutils-r1_src_install
-
-	if [[ ! ${HAD_CLI} ]]; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		HAD_CLI=1
-	else
-		rm -r "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.123.0.ebuild b/dev-python/hypothesis/hypothesis-6.123.0.ebuild
deleted file mode 100644
index dde5562c67da..000000000000
--- a/dev-python/hypothesis/hypothesis-6.123.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
-		tests/cover tests/pytest tests/quality
-}
-
-src_install() {
-	local HAD_CLI=
-
-	distutils-r1_src_install
-
-	if [[ ! ${HAD_CLI} ]]; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		HAD_CLI=1
-	else
-		rm -r "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.123.1.ebuild b/dev-python/hypothesis/hypothesis-6.123.1.ebuild
deleted file mode 100644
index dde5562c67da..000000000000
--- a/dev-python/hypothesis/hypothesis-6.123.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
-		tests/cover tests/pytest tests/quality
-}
-
-src_install() {
-	local HAD_CLI=
-
-	distutils-r1_src_install
-
-	if [[ ! ${HAD_CLI} ]]; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		HAD_CLI=1
-	else
-		rm -r "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.123.13.ebuild b/dev-python/hypothesis/hypothesis-6.123.13.ebuild
new file mode 100644
index 000000000000..4486f30faf3d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.123.13.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
+	local -x HYPOTHESIS_NO_PLUGINS=1
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
+		tests/cover tests/pytest tests/quality
+}
+
+src_install() {
+	local HAD_CLI=
+
+	distutils-r1_src_install
+
+	if [[ ! ${HAD_CLI} ]]; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		HAD_CLI=1
+	else
+		rm -r "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.123.15.ebuild b/dev-python/hypothesis/hypothesis-6.123.15.ebuild
new file mode 100644
index 000000000000..4486f30faf3d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.123.15.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
+	local -x HYPOTHESIS_NO_PLUGINS=1
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
+		tests/cover tests/pytest tests/quality
+}
+
+src_install() {
+	local HAD_CLI=
+
+	distutils-r1_src_install
+
+	if [[ ! ${HAD_CLI} ]]; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		HAD_CLI=1
+	else
+		rm -r "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.123.16.ebuild b/dev-python/hypothesis/hypothesis-6.123.16.ebuild
new file mode 100644
index 000000000000..4486f30faf3d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.123.16.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
+	local -x HYPOTHESIS_NO_PLUGINS=1
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
+		tests/cover tests/pytest tests/quality
+}
+
+src_install() {
+	local HAD_CLI=
+
+	distutils-r1_src_install
+
+	if [[ ! ${HAD_CLI} ]]; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		HAD_CLI=1
+	else
+		rm -r "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.123.17.ebuild b/dev-python/hypothesis/hypothesis-6.123.17.ebuild
new file mode 100644
index 000000000000..4486f30faf3d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.123.17.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
+	local -x HYPOTHESIS_NO_PLUGINS=1
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
+		tests/cover tests/pytest tests/quality
+}
+
+src_install() {
+	local HAD_CLI=
+
+	distutils-r1_src_install
+
+	if [[ ! ${HAD_CLI} ]]; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		HAD_CLI=1
+	else
+		rm -r "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.123.2.ebuild b/dev-python/hypothesis/hypothesis-6.123.2.ebuild
index dde5562c67da..3b81c426627d 100644
--- a/dev-python/hypothesis/hypothesis-6.123.2.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.123.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
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.123.7.ebuild b/dev-python/hypothesis/hypothesis-6.123.7.ebuild
new file mode 100644
index 000000000000..4486f30faf3d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.123.7.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
+	local -x HYPOTHESIS_NO_PLUGINS=1
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
+		tests/cover tests/pytest tests/quality
+}
+
+src_install() {
+	local HAD_CLI=
+
+	distutils-r1_src_install
+
+	if [[ ! ${HAD_CLI} ]]; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		HAD_CLI=1
+	else
+		rm -r "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.124.0.ebuild b/dev-python/hypothesis/hypothesis-6.124.0.ebuild
new file mode 100644
index 000000000000..4486f30faf3d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.124.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
+	local -x HYPOTHESIS_NO_PLUGINS=1
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
+		tests/cover tests/pytest tests/quality
+}
+
+src_install() {
+	local HAD_CLI=
+
+	distutils-r1_src_install
+
+	if [[ ! ${HAD_CLI} ]]; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		HAD_CLI=1
+	else
+		rm -r "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.124.1.ebuild b/dev-python/hypothesis/hypothesis-6.124.1.ebuild
new file mode 100644
index 000000000000..4486f30faf3d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.124.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
+	local -x HYPOTHESIS_NO_PLUGINS=1
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
+		tests/cover tests/pytest tests/quality
+}
+
+src_install() {
+	local HAD_CLI=
+
+	distutils-r1_src_install
+
+	if [[ ! ${HAD_CLI} ]]; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		HAD_CLI=1
+	else
+		rm -r "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index c48f9066c818..f1b9e31dd638 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1 +1,2 @@
 DIST icalendar-6.1.0.tar.gz 142307 BLAKE2B fb5b6e6c337aaf4f18b1d2237d3523cbd4502e61255ee3d3de0f335ca90da384119c1cda5843b455f3eb93540c17d9448a3745e6a09e27b35158b26ab6f7e01f SHA512 dbab2542371d038060be9e9d2ecccdf6db7d51c4ca80515e02798db1a0f96fc9b4a7eb8e098831d7da97c2c8ba715da2836badf872a0d5c206299fb78923b864
+DIST icalendar-6.1.1.tar.gz 145256 BLAKE2B cf3cf5a79f25f6c2820e4a04fc02a1546949e99c4e3fa9e6a204b0e4eb13e475b0c5a1f3179009b77437a33ab360b561cdff59453bcd77b771fc223ad14a2494 SHA512 3afb10dcfd07d0348bb404e2bfef3b790e312764bed1147999a3322255d7c881a1513077b49b3ed6cfc03a22afa81a3211823d94a2414b00bc2c4503bed73264
diff --git a/dev-python/icalendar/icalendar-6.1.1.ebuild b/dev-python/icalendar/icalendar-6.1.1.ebuild
new file mode 100644
index 000000000000..bb9bf58e9f10
--- /dev/null
+++ b/dev-python/icalendar/icalendar-6.1.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
+HOMEPAGE="
+	https://github.com/collective/icalendar/
+	https://pypi.org/project/icalendar/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/tzdata[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-copybutton \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# reset conf.py to not read version from an installed instance
+	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index ab26d32b11a6..b4252d258c4e 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,2 +1,3 @@
-DIST identify-2.6.3.gh.tar.gz 101836 BLAKE2B e4a66cc0df9ce3f172bdba78322ea22ba2d89cc54a82c03388a0cd00bfe8e6645e1e42c80a94d0c407319c2719509ce12ce3e9fb2e3714ce2a46bffeec75eb9e SHA512 462b0b54643b7de91cf96ca07a38e4f8a0a424edf205d37e28eee9720cdd0f0804d9a7c8094f099656c2ae5cbb09a966b2b87732647f92ddb71ce5143def0d87
 DIST identify-2.6.4.gh.tar.gz 101872 BLAKE2B 5e1cad94df06eb5ba60e37c1f88341098759ab9e1e76aa765618fa948c24b2bbba704a3ace87fe37a2af3f4c6e47eaa41b02abca438554095f44c4d0f76277cb SHA512 ce89b6a49ab683f97fdd7a506f5c82419b73ab53e1c4aa0728ede499e48e958fcfe14532bc2d81a0e0bf73411413143744048f8f2e7616cd0166f4c7b8c91279
+DIST identify-2.6.5.gh.tar.gz 101871 BLAKE2B 32beb0e5185f39df6f3f45969eb2a4e11e711f36bd1c728322307ffa02aa60c3d7f20c5cf3f93afc88a3304ad98f36d426cca32108d9b2e79663250acaaddd57 SHA512 933e269c1f68a7ba4e97f2b20297b665e9ba955e3d26b3a9f535e84d8d8e929f844a4e5d8f6c053d819318368ae89c87058ca81f8d24e92c60a5f053db3056ba
+DIST identify-2.6.6.gh.tar.gz 101889 BLAKE2B e6246bceed1aaf806e4d7984581214c9272508782cd35429b8d58779a0546b5dc1536d970d6a71bd7135afb73216896ffaee0ec627261f25907034081580018f SHA512 0312654b6cf20e59248656fe09d54292fafa4f1c41b85def6f828f986b4ef5fe9d275a9d90537f3129060a572106b79aad338ac52f9d0d4287a8a6db805fb18f
diff --git a/dev-python/identify/identify-2.6.3.ebuild b/dev-python/identify/identify-2.6.3.ebuild
deleted file mode 100644
index 90e00b762c78..000000000000
--- a/dev-python/identify/identify-2.6.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.6.4.ebuild b/dev-python/identify/identify-2.6.4.ebuild
index 6294eec35289..007edcf9a3ef 100644
--- a/dev-python/identify/identify-2.6.4.ebuild
+++ b/dev-python/identify/identify-2.6.4.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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/ukkonen[${PYTHON_USEDEP}]
diff --git a/dev-python/identify/identify-2.6.5.ebuild b/dev-python/identify/identify-2.6.5.ebuild
new file mode 100644
index 000000000000..c40a9ab3694b
--- /dev/null
+++ b/dev-python/identify/identify-2.6.5.ebuild
@@ -0,0 +1,29 @@
+# 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="File identification library for Python"
+HOMEPAGE="
+	https://github.com/pre-commit/identify/
+	https://pypi.org/project/identify/
+"
+SRC_URI="
+	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/ukkonen[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.6.6.ebuild b/dev-python/identify/identify-2.6.6.ebuild
new file mode 100644
index 000000000000..c40a9ab3694b
--- /dev/null
+++ b/dev-python/identify/identify-2.6.6.ebuild
@@ -0,0 +1,29 @@
+# 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="File identification library for Python"
+HOMEPAGE="
+	https://github.com/pre-commit/identify/
+	https://pypi.org/project/identify/
+"
+SRC_URI="
+	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/ukkonen[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/imageio-ffmpeg/Manifest b/dev-python/imageio-ffmpeg/Manifest
index b784b0c55423..c1a99527fa38 100644
--- a/dev-python/imageio-ffmpeg/Manifest
+++ b/dev-python/imageio-ffmpeg/Manifest
@@ -1,3 +1,2 @@
-DIST imageio-ffmpeg-0.4.9.gh.tar.gz 27344 BLAKE2B f9bf6421859f8b17aee5300613a14de9883436aaa724b61b8068498f533cc24ab4c8372a6de6ce4ab49218abb84af8a35e29e1ccbe9c913fcdcf2db159f13a92 SHA512 ebf63b9ac9c733d4c12d3aa4c6a9e81dd0128795a040e65df03bfae00e3562a3976eaa2f4058562bbddc3f8d63d6bf2a38133de4d2ddb0d2dc62ffab2449e143
-DIST imageio-ffmpeg-0.5.0.gh.tar.gz 27594 BLAKE2B 371aceb4760aac6a593d72f58526cedde2ce16c177adf421f5a9edecc1b6ae3eba0af307514014f1a8b45bf58375d9d3367167242d660f1b5e94778bc13bcc13 SHA512 e38d28da5b06f70e0a53647a2d490efb2c4b0201fd81395163bb1ed1dec3db4a1a29802ff1c6cbed0d7714db710304fe58b8e8e4f7cc0553f77417e97af21551
 DIST imageio-ffmpeg-0.5.1.gh.tar.gz 27587 BLAKE2B da508b5627e7b842e123a6b56302f8c4a6f6d8a5fe6a7ff82949a6d3f156b898c05e4f2ffe2b074223e788b31a68d6b49f8165f55d9aa5ab1e5c5a3b16ba10c5 SHA512 7971417ff3c5b36b2b0e09da6ee52a19efd662a3f8896a316e537d0c72ff7d65bffb87c2d01a6bd72ec6442d3aa736ebe38785e82cbe1d4b27a653fb83d08bef
+DIST imageio-ffmpeg-0.6.0.gh.tar.gz 27896 BLAKE2B f6d1916e2eef32c6ed4e0fa28081dc7afc8725321b810ea7a9d4de66333ec065c52d74e02ae2c18222b9201fa79a67eb4d990cf500404ee13800f7cce5db3a1f SHA512 93b871b9ece52cff6c1bec63c1567e3842aea306a4d0274d996b701891690ca3ee5067e623b00233cdc3378108c43b9306e27916a0f89285157e0aa802c59dfc
diff --git a/dev-python/imageio-ffmpeg/files/imageio-ffmpeg-0.4.9-ffmpeg-6.patch b/dev-python/imageio-ffmpeg/files/imageio-ffmpeg-0.4.9-ffmpeg-6.patch
deleted file mode 100644
index 196c21523426..000000000000
--- a/dev-python/imageio-ffmpeg/files/imageio-ffmpeg-0.4.9-ffmpeg-6.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e2ec5ea3b7d9e5fd3225a05891f3611e29adbd1d Mon Sep 17 00:00:00 2001
-From: Tom Vercauteren <tom.vercauteren@kcl.ac.uk>
-Date: Thu, 7 Mar 2024 14:28:21 +0000
-Subject: [PATCH] Add a null filter to re-enable frame count
-
-This aims at addressing https://github.com/imageio/imageio-ffmpeg/issues/99
----
- imageio_ffmpeg/_io.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/imageio_ffmpeg/_io.py b/imageio_ffmpeg/_io.py
-index b85c453..faf1ee8 100644
---- a/imageio_ffmpeg/_io.py
-+++ b/imageio_ffmpeg/_io.py
-@@ -153,8 +153,8 @@ def count_frames_and_secs(path):
-         path,
-         "-map",
-         "0:v:0",
--        "-c",
--        "copy",
-+        "-vf",
-+        "null",
-         "-f",
-         "null",
-         "-",
diff --git a/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.9-r1.ebuild b/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.9-r1.ebuild
deleted file mode 100644
index 375a32f86b2f..000000000000
--- a/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.9-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="FFMPEG wrapper for Python"
-HOMEPAGE="
-	https://github.com/imageio/imageio-ffmpeg/
-	https://pypi.org/project/imageio-ffmpeg/
-"
-SRC_URI="
-	https://github.com/imageio/imageio-ffmpeg/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-# ffmpeg is used as an executable during runtime
-RDEPEND="
-	media-video/ffmpeg:*
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/imageio/imageio-ffmpeg/pull/107
-	"${FILESDIR}/${P}-ffmpeg-6.patch"
-)
diff --git a/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.5.0.ebuild b/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.5.0.ebuild
deleted file mode 100644
index ccbb512610be..000000000000
--- a/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="FFMPEG wrapper for Python"
-HOMEPAGE="
-	https://github.com/imageio/imageio-ffmpeg/
-	https://pypi.org/project/imageio-ffmpeg/
-"
-SRC_URI="
-	https://github.com/imageio/imageio-ffmpeg/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-# ffmpeg is used as an executable during runtime
-RDEPEND="
-	media-video/ffmpeg:*
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.6.0.ebuild b/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.6.0.ebuild
new file mode 100644
index 000000000000..5a8521170f55
--- /dev/null
+++ b/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.6.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-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="FFMPEG wrapper for Python"
+HOMEPAGE="
+	https://github.com/imageio/imageio-ffmpeg/
+	https://pypi.org/project/imageio-ffmpeg/
+"
+SRC_URI="
+	https://github.com/imageio/imageio-ffmpeg/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+PROPERTIES="test_network"
+RESTRICT="test"
+
+# ffmpeg is used as an executable during runtime
+RDEPEND="
+	media-video/ffmpeg:*
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index e43d48c4965c..b97fa9a33915 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,3 +1,3 @@
-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
diff --git a/dev-python/imageio/imageio-2.36.0.ebuild b/dev-python/imageio/imageio-2.36.0.ebuild
deleted file mode 100644
index b87adefff348..000000000000
--- a/dev-python/imageio/imageio-2.36.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-# teh test suite always clones the newest version
-TEST_IMAGES_COMMIT=1121036015c70cdbb3015e5c5ba0aaaf7d3d6021
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="
-	https://imageio.readthedocs.io/en/stable/
-	https://github.com/imageio/imageio/
-	https://pypi.org/project/imageio/
-"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/imageio/test_images/archive/${TEST_IMAGES_COMMIT}.tar.gz
-			-> imageio-test_images-${TEST_IMAGES_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-BDEPEND="
-	test? (
-		>=dev-python/imageio-ffmpeg-0.4.9-r1[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/tifffile[${PYTHON_USEDEP}]
-		|| (
-			media-video/ffmpeg[openh264]
-			media-video/ffmpeg[x264]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# block silently downloading vulnerable libraries from the Internet
-		"${FILESDIR}/imageio-2.22.0-block-download.patch"
-	)
-
-	if use test; then
-		mv "${WORKDIR}/test_images-${TEST_IMAGES_COMMIT}" .test_images || die
-		# upstream tries to update the image cache, and invalidates it
-		# if "git pull" fails
-		sed -i -e 's:git pull:true:' tests/conftest.py || die
-		# ffmpeg tests expect it there
-		mkdir -p "${HOME}/.imageio/images" || die
-		cp .test_images/cockatoo.mp4 "${HOME}/.imageio/images" || die
-	fi
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# uses fsspec to grab prebuilt .so from GitHub, sigh
-		tests/test_freeimage.py
-	)
-
-	local EPYTEST_DESELECT=(
-		# Note: upstream has a needs_internet marker but it is also
-		# used to mark tests that require test_images checkout that we
-		# supply
-
-		# Tries to download ffmpeg binary ?!
-		tests/test_ffmpeg.py::test_get_exe_installed
-		# blocked by our patch
-		tests/test_core.py::test_fetching
-		tests/test_core.py::test_request
-		# Internet
-		tests/test_bsdf.py::test_from_url
-		tests/test_core.py::test_mvolread_out_of_bytes
-		tests/test_core.py::test_request_read_sources
-		tests/test_pillow.py::test_gif_first_p_frame
-		tests/test_pillow.py::test_png_remote
-		tests/test_pillow.py::test_webp_remote
-		tests/test_pillow_legacy.py::test_png_remote
-		tests/test_swf.py::test_read_from_url
-		# requires pillow-heif, also possibly Internet
-		tests/test_pillow.py::test_avif_remote
-		tests/test_pillow.py::test_heif_remote
-		# not important, requires random system libs
-		tests/test_core.py::test_findlib2
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/imageio/imageio-2.37.0.ebuild b/dev-python/imageio/imageio-2.37.0.ebuild
new file mode 100644
index 000000000000..882eec18d4dd
--- /dev/null
+++ b/dev-python/imageio/imageio-2.37.0.ebuild
@@ -0,0 +1,104 @@
+# 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
+
+# teh test suite always clones the newest version
+TEST_IMAGES_COMMIT=1121036015c70cdbb3015e5c5ba0aaaf7d3d6021
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="
+	https://imageio.readthedocs.io/en/stable/
+	https://github.com/imageio/imageio/
+	https://pypi.org/project/imageio/
+"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/imageio/test_images/archive/${TEST_IMAGES_COMMIT}.tar.gz
+			-> imageio-test_images-${TEST_IMAGES_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+BDEPEND="
+	test? (
+		>=dev-python/imageio-ffmpeg-0.4.9-r1[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/tifffile[${PYTHON_USEDEP}]
+		|| (
+			media-video/ffmpeg[openh264]
+			media-video/ffmpeg[x264]
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		# block silently downloading vulnerable libraries from the Internet
+		"${FILESDIR}/imageio-2.22.0-block-download.patch"
+	)
+
+	if use test; then
+		mv "${WORKDIR}/test_images-${TEST_IMAGES_COMMIT}" .test_images || die
+		# upstream tries to update the image cache, and invalidates it
+		# if "git pull" fails
+		sed -i -e 's:git pull:true:' tests/conftest.py || die
+		# ffmpeg tests expect it there
+		mkdir -p "${HOME}/.imageio/images" || die
+		cp .test_images/cockatoo.mp4 "${HOME}/.imageio/images" || die
+	fi
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# uses fsspec to grab prebuilt .so from GitHub, sigh
+		tests/test_freeimage.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# Note: upstream has a needs_internet marker but it is also
+		# used to mark tests that require test_images checkout that we
+		# supply
+
+		# Tries to download ffmpeg binary ?!
+		tests/test_ffmpeg.py::test_get_exe_installed
+		# blocked by our patch
+		tests/test_core.py::test_fetching
+		tests/test_core.py::test_request
+		# Internet
+		tests/test_bsdf.py::test_from_url
+		tests/test_core.py::test_mvolread_out_of_bytes
+		tests/test_core.py::test_request_read_sources
+		tests/test_pillow.py::test_gif_first_p_frame
+		tests/test_pillow.py::test_png_remote
+		tests/test_pillow.py::test_webp_remote
+		tests/test_pillow_legacy.py::test_png_remote
+		tests/test_swf.py::test_read_from_url
+		# requires pillow-heif, also possibly Internet
+		tests/test_pillow.py::test_avif_remote
+		tests/test_pillow.py::test_heif_remote
+		# not important, requires random system libs
+		tests/test_core.py::test_findlib2
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/importlib-metadata/Manifest b/dev-python/importlib-metadata/Manifest
index 5a336f07af29..f2a4751402a3 100644
--- a/dev-python/importlib-metadata/Manifest
+++ b/dev-python/importlib-metadata/Manifest
@@ -1 +1,2 @@
 DIST importlib_metadata-8.5.0.tar.gz 55304 BLAKE2B 801d7edaed5a42ef5c871830286e698620cd06cde43178c1ab65a5d35f6055fdd2a02b0f14bada94704a13a6708ea3091e634548e534df2df92d942c83192c3b SHA512 86ceb3ff408705565628b71a740a9e9123eee4b49e2ad029b9ee204548a78257dfefe9756194ce660939806f75983dd4b858dacd642b40fddc4188e699ef4e19
+DIST importlib_metadata-8.6.1.tar.gz 55767 BLAKE2B 206263c5d6c9e0d02bb7acd063f8ef3392ae183a39808949ba6780816fd01cd7787797c378bceb377b85384739184a01cee6ee5c8a3f241b63d0be760455be32 SHA512 4e7ecb05c6c6102f24fe896772942137edfc57257f2f12e3add3ee771ff4146e0ee6a23fd6e3e9ab7e4547d2ab573ad8d21bdd0746b7039d2421f3ba6968eede
diff --git a/dev-python/importlib-metadata/importlib-metadata-8.6.1.ebuild b/dev-python/importlib-metadata/importlib-metadata-8.6.1.ebuild
new file mode 100644
index 000000000000..d31c671730ff
--- /dev/null
+++ b/dev-python/importlib-metadata/importlib-metadata-8.6.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="
+	https://github.com/python/importlib_metadata/
+	https://pypi.org/project/importlib-metadata/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	>=dev-python/zipp-3.20[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/jaraco-test-5.4[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "importlib_metadata"
+		version = "${PV}"
+		description = "Read metadata from Python packages"
+	EOF
+}
diff --git a/dev-python/importlib-resources/Manifest b/dev-python/importlib-resources/Manifest
index b55375f854ab..727538c77721 100644
--- a/dev-python/importlib-resources/Manifest
+++ b/dev-python/importlib-resources/Manifest
@@ -1 +1,2 @@
 DIST importlib_resources-6.4.5.tar.gz 43372 BLAKE2B 8ab9cb9f2e693de87d6d3c2696e660ae067ad00d725db542fbbd9b916cedfc8246c45285e728d352f02e4b7a56cc7d8f360f324af9a65cfdb935e7c20f753206 SHA512 e5949475a27220b101d0ba57b091a3d56a2e1092ca3102d9e260561742289ee32e2bfe17738304a72507314fc46a151f3cadcce06e71781d20bbedf7057a6366
+DIST importlib_resources-6.5.2.tar.gz 44693 BLAKE2B 07b5136ab40ca57e6c255d6544da231ff8ffdc3547f6e970fcd0444789382960358041042715ddccfff3be6a0b3cbcc12660ad45bab9266c1032dc0b60ef0e2b SHA512 e9ca57f5191effdb570cde2b8adaddb27a1bfccc36575f5b15684283ff1b6363831bcb073322fecbf067456f8cf288a576b3a95a506c3701a4f2f30c03ec1c8a
diff --git a/dev-python/importlib-resources/importlib-resources-6.5.2.ebuild b/dev-python/importlib-resources/importlib-resources-6.5.2.ebuild
new file mode 100644
index 000000000000..17f0b8b72e89
--- /dev/null
+++ b/dev-python/importlib-resources/importlib-resources-6.5.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+# backport from py3.12
+PYTHON_COMPAT=( pypy3 python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="
+	https://github.com/python/importlib_resources/
+	https://pypi.org/project/importlib-resources/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/jaraco-test-5.4[${PYTHON_USEDEP}]
+		>=dev-python/zipp-3.17[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index c8fd4f91ac05..4b9be661ac51 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,2 +1 @@
-DIST inflect-7.4.0.tar.gz 72730 BLAKE2B eaaaa46a1f710f5b05165f3f894eb5a2437908299146369a2537a675a1d50facba56c7a9efa2e459b7cfb95a4f2c5f615d64948fb278a4a990423b40414f701a SHA512 fe3658a2f4c9303db90604268a525112c6a67f66ed37f6fbe76cd04a008658362e682413297dc1fcae6e6a0415098f3adaf0f205b781e1e24a050f59c9dc9021
 DIST inflect-7.5.0.tar.gz 73751 BLAKE2B a17c5cb5bfcd10530f29537335ffd1b4725fb1f53e78ef7ce1f40a3031fa486baae3400878e575c8ce6a77b4953332f051ec65dcba024a14c527301e51079edb SHA512 ee9f69dff451017a2aad2226d8c6ae02b4b7b4bc4d4c49f3efee50d85eeef43c49c6c6ef3e7f30fa2c5ef21e065ff5242140d5a98bc71af17c7e70d9e75e54c1
diff --git a/dev-python/inflect/inflect-7.4.0.ebuild b/dev-python/inflect/inflect-7.4.0.ebuild
deleted file mode 100644
index 49c815a7f8f9..000000000000
--- a/dev-python/inflect/inflect-7.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="
-	https://pypi.org/project/inflect/
-	https://github.com/jaraco/inflect/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/typeguard-4.0.1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/inflect/inflect-7.5.0.ebuild b/dev-python/inflect/inflect-7.5.0.ebuild
index d1cdcca00005..1e19013be5bb 100644
--- a/dev-python/inflect/inflect-7.5.0.ebuild
+++ b/dev-python/inflect/inflect-7.5.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/typeguard-4.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/inline-snapshot/Manifest b/dev-python/inline-snapshot/Manifest
index 07adecd7bd7c..9803cc0bf43d 100644
--- a/dev-python/inline-snapshot/Manifest
+++ b/dev-python/inline-snapshot/Manifest
@@ -1,3 +1,4 @@
-DIST inline_snapshot-0.17.1.tar.gz 223166 BLAKE2B 119d14f075cd3ca27fea6f1e8a50f680a87cc62cd0568ba48462a63accf8708c88a2087b975fad56ed6ba0800d5a811af641baf09b28e875f6a5e7623add155b SHA512 a3e8a2be31aad87e6a45b74d2af5112911b94de7188b7a95d30513fc2328d573723485be13aca8d5cd71054ec315fa0a0bcfa75d7cce0e6ec80068b0fe25295c
-DIST inline_snapshot-0.18.1.tar.gz 225403 BLAKE2B abf8465856f655bb08c307a455bed011a4c9f9f1ecabe620a47deed1bcbfa028f29f883511da97fc035de43ca2015cd37b8a3589db911fcbb09149dd5e11810d SHA512 3497b8dc651057aebe96295ac10d5b6ca764841b1a0b2e4e0838bb303965d1b385c24d050771e51b1fd607ba5cb6f68f9e23d43e809f3a6008f84df9a168b6b3
 DIST inline_snapshot-0.18.2.tar.gz 225777 BLAKE2B 45a08224c8ec94e052c6fe1393ad9b12c7227b9208ef591f323b15baf1622866fcfc7c91167fa8d352dae895e140348df4b3e492c52e441c2b8799e7f53f7ca5 SHA512 6b370ee0a717834f361b712ee71434362a44e92688df298572a801bbf384d69bd37816b2aa1e701f77d72149fff2ec5da9fceb24980af15de807973451e161c9
+DIST inline_snapshot-0.19.0.tar.gz 87554 BLAKE2B 9cb8d15b1d33844053b0ed5df8a4d47ea290bf3c67872671e147fb284e1fb2013bffda21fb38e96c01336b768a1315b81ba8a71d9df8a716ee4ffd92658160a8 SHA512 bb528a6657196938994e678042e379159d28635cc7679ab21a42e550efb35e1edc58fd58ec0b25560866062c6956b8d73f475a682c43255ff18ce31ed55cf9fd
+DIST inline_snapshot-0.19.1.tar.gz 88072 BLAKE2B 83ddb98a9ff7fe6b4a5071cd9452b81ee92b0f2538c0b55876bc4e4a08770a64415c95334ce4cb825000e1bd295fa582eb3be6db400e75447fe85daed360c17e SHA512 3750de436a5b19002728df954d4b60e30f7fd6ff0ae49e1a0268cf61d5ba40b809ccaf2b8474b9c3a2b9195a9b0edb7ec98dc4d29af77738fab997e566890bd5
+DIST inline_snapshot-0.19.3.tar.gz 88636 BLAKE2B 537e68eec4f7db9ddeb8cea1e93f872160129d8b7b51b3d693c0cebb94c2cf5652d57989ccb44b7a3f3157ffbe6322c032fce42594d94f8daf454f922accad0b SHA512 b1f3a0123a1f17ffb85cb296861e3558057d45a8a576d72b2dca1ad1ce3151d4354b6bf86f9e0fb21d941d7ee708fd33c3961fdd1c0bad4c7368b720388fcf85
diff --git a/dev-python/inline-snapshot/inline-snapshot-0.17.1.ebuild b/dev-python/inline-snapshot/inline-snapshot-0.17.1.ebuild
deleted file mode 100644
index a3b1dde2626b..000000000000
--- a/dev-python/inline-snapshot/inline-snapshot-0.17.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Create and update inline snapshots in your Python tests"
-HOMEPAGE="
-	https://15r10nk.github.io/inline-snapshot/
-	https://github.com/15r10nk/inline-snapshot/
-	https://pypi.org/project/inline-snapshot/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/asttokens-2.0.5[${PYTHON_USEDEP}]
-	>=dev-python/black-23.3.0[${PYTHON_USEDEP}]
-	>=dev-python/click-8.1.4[${PYTHON_USEDEP}]
-	>=dev-python/executing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		>=dev-python/dirty-equals-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.75.5[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/mypy[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/pydantic[${PYTHON_USEDEP}]
-		>=dev-python/pytest-freezer-0.4.8[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.14.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-subtests-0.11.0[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires pyright
-		'tests/test_typing.py::test_typing[pyright]'
-	)
-
-	local -x COLUMNS=80
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=inline_snapshot.pytest_plugin,pytest_freezer,pytest_subtests.plugin,xdist.plugin
-	local -x PYTHONPATH=${S}/src
-	epytest -p pytest_mock
-}
diff --git a/dev-python/inline-snapshot/inline-snapshot-0.18.1.ebuild b/dev-python/inline-snapshot/inline-snapshot-0.18.1.ebuild
deleted file mode 100644
index c3bb2735fc6a..000000000000
--- a/dev-python/inline-snapshot/inline-snapshot-0.18.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Create and update inline snapshots in your Python tests"
-HOMEPAGE="
-	https://15r10nk.github.io/inline-snapshot/
-	https://github.com/15r10nk/inline-snapshot/
-	https://pypi.org/project/inline-snapshot/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/asttokens-2.0.5[${PYTHON_USEDEP}]
-	>=dev-python/black-23.3.0[${PYTHON_USEDEP}]
-	>=dev-python/click-8.1.4[${PYTHON_USEDEP}]
-	>=dev-python/executing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		>=dev-python/dirty-equals-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.75.5[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/mypy[${PYTHON_USEDEP}]
-		' 'python*')
-		>=dev-python/pydantic-2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-freezer-0.4.8[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.14.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-subtests-0.11.0[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires pyright
-		'tests/test_typing.py::test_typing[pyright]'
-	)
-
-	local -x COLUMNS=80
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=inline_snapshot.pytest_plugin,pytest_freezer,pytest_subtests.plugin,xdist.plugin
-	local -x PYTHONPATH=${S}/src
-	epytest -p pytest_mock
-}
diff --git a/dev-python/inline-snapshot/inline-snapshot-0.18.2.ebuild b/dev-python/inline-snapshot/inline-snapshot-0.18.2.ebuild
index 58f25807629d..eefc08e9c6dc 100644
--- a/dev-python/inline-snapshot/inline-snapshot-0.18.2.ebuild
+++ b/dev-python/inline-snapshot/inline-snapshot-0.18.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/asttokens-2.0.5[${PYTHON_USEDEP}]
diff --git a/dev-python/inline-snapshot/inline-snapshot-0.19.0.ebuild b/dev-python/inline-snapshot/inline-snapshot-0.19.0.ebuild
new file mode 100644
index 000000000000..fd8a5cc819a8
--- /dev/null
+++ b/dev-python/inline-snapshot/inline-snapshot-0.19.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Create and update inline snapshots in your Python tests"
+HOMEPAGE="
+	https://15r10nk.github.io/inline-snapshot/
+	https://github.com/15r10nk/inline-snapshot/
+	https://pypi.org/project/inline-snapshot/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/asttokens-2.0.5[${PYTHON_USEDEP}]
+	>=dev-python/executing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		dev-python/attrs[${PYTHON_USEDEP}]
+		>=dev-python/black-23.3.0[${PYTHON_USEDEP}]
+		>=dev-python/click-8.1.4[${PYTHON_USEDEP}]
+		>=dev-python/dirty-equals-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.75.5[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/mypy[${PYTHON_USEDEP}]
+		' 'python*')
+		>=dev-python/pydantic-2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezer-0.4.8[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.14.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-subtests-0.11.0[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires pyright
+		'tests/test_typing.py::test_typing[pyright]'
+		# TODO
+		tests/test_formating.py::test_format_command_fail
+	)
+
+	local -x COLUMNS=80
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=inline_snapshot.pytest_plugin,pytest_freezer,pytest_subtests.plugin,xdist.plugin
+	local -x PYTHONPATH=${S}/src
+	epytest -p pytest_mock
+}
diff --git a/dev-python/inline-snapshot/inline-snapshot-0.19.1.ebuild b/dev-python/inline-snapshot/inline-snapshot-0.19.1.ebuild
new file mode 100644
index 000000000000..fd8a5cc819a8
--- /dev/null
+++ b/dev-python/inline-snapshot/inline-snapshot-0.19.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Create and update inline snapshots in your Python tests"
+HOMEPAGE="
+	https://15r10nk.github.io/inline-snapshot/
+	https://github.com/15r10nk/inline-snapshot/
+	https://pypi.org/project/inline-snapshot/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/asttokens-2.0.5[${PYTHON_USEDEP}]
+	>=dev-python/executing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		dev-python/attrs[${PYTHON_USEDEP}]
+		>=dev-python/black-23.3.0[${PYTHON_USEDEP}]
+		>=dev-python/click-8.1.4[${PYTHON_USEDEP}]
+		>=dev-python/dirty-equals-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.75.5[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/mypy[${PYTHON_USEDEP}]
+		' 'python*')
+		>=dev-python/pydantic-2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezer-0.4.8[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.14.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-subtests-0.11.0[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires pyright
+		'tests/test_typing.py::test_typing[pyright]'
+		# TODO
+		tests/test_formating.py::test_format_command_fail
+	)
+
+	local -x COLUMNS=80
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=inline_snapshot.pytest_plugin,pytest_freezer,pytest_subtests.plugin,xdist.plugin
+	local -x PYTHONPATH=${S}/src
+	epytest -p pytest_mock
+}
diff --git a/dev-python/inline-snapshot/inline-snapshot-0.19.3.ebuild b/dev-python/inline-snapshot/inline-snapshot-0.19.3.ebuild
new file mode 100644
index 000000000000..fd8a5cc819a8
--- /dev/null
+++ b/dev-python/inline-snapshot/inline-snapshot-0.19.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Create and update inline snapshots in your Python tests"
+HOMEPAGE="
+	https://15r10nk.github.io/inline-snapshot/
+	https://github.com/15r10nk/inline-snapshot/
+	https://pypi.org/project/inline-snapshot/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/asttokens-2.0.5[${PYTHON_USEDEP}]
+	>=dev-python/executing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		dev-python/attrs[${PYTHON_USEDEP}]
+		>=dev-python/black-23.3.0[${PYTHON_USEDEP}]
+		>=dev-python/click-8.1.4[${PYTHON_USEDEP}]
+		>=dev-python/dirty-equals-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.75.5[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/mypy[${PYTHON_USEDEP}]
+		' 'python*')
+		>=dev-python/pydantic-2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezer-0.4.8[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.14.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-subtests-0.11.0[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires pyright
+		'tests/test_typing.py::test_typing[pyright]'
+		# TODO
+		tests/test_formating.py::test_format_command_fail
+	)
+
+	local -x COLUMNS=80
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=inline_snapshot.pytest_plugin,pytest_freezer,pytest_subtests.plugin,xdist.plugin
+	local -x PYTHONPATH=${S}/src
+	epytest -p pytest_mock
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index b8eb5bf2d0c3..4fefdd56602c 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,2 +1 @@
-DIST ipython-8.30.0.tar.gz 5592205 BLAKE2B e935305ce08ba287bb811a3efe7ae88821485f726c4c45815f4c39c1a51bb59ab439d256fbb91ddd71d12512fb58c913e4120663d6035b4644da67b3eee9b91c SHA512 36432ed736ce06f47b3ccb6172e6c03a15bfa51a2e38b80d5b579687abad0c03181684b218750f320b185fe3f96baf159eb9c9184c40ddfca78fdd9683233a9b
 DIST ipython-8.31.0.tar.gz 5501011 BLAKE2B 0ffc49a663c7a0942fadc4eb98fac945c726a3150f20fe87a68935d660ce280346c270740788b6a5f70291f572d7663ace9dc8a131773176ac89dc7259cafcbe SHA512 b5fe31c54f93a696fcb6474d4bc7ca7c52ad1ce7bdd94971fd9b886b1e134d662524810bd5cc98e621fd3965f65c647cbd2d77d518d001af07a61c4b5a3320cb
diff --git a/dev-python/ipython/files/ipython-8.30.0-python3.13-debugger-pdb-curframe.patch b/dev-python/ipython/files/ipython-8.30.0-python3.13-debugger-pdb-curframe.patch
deleted file mode 100644
index 8e44fd3d0261..000000000000
--- a/dev-python/ipython/files/ipython-8.30.0-python3.13-debugger-pdb-curframe.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-FAILED IPython/core/tests/test_run.py::TestMagicRunPass::test_run_debug_twice - AttributeError: 'Pdb' object has no attribute 'curframe'. Did you mean: 'botframe'?
-FAILED IPython/core/tests/test_run.py::TestMagicRunPass::test_run_debug_twice_with_breakpoint - AttributeError: 'Pdb' object has no attribute 'curframe'. Did you mean: 'botframe'?
-https://bugs.gentoo.org/946568
-https://github.com/ipython/ipython/pull/14598
-https://github.com/ipython/ipython/commit/c1e945b5bc8fb673109cf32c4f238f6d5e0f5149.patch
-
-From c1e945b5bc8fb673109cf32c4f238f6d5e0f5149 Mon Sep 17 00:00:00 2001
-From: M Bussonnier <bussonniermatthias@gmail.com>
-Date: Sun, 8 Dec 2024 11:37:11 +0100
-Subject: [PATCH] Fix pdb issues in Python 3.13.1
-
-For some reason it is not always set, it was/is a bug in IPython to not
-check.
----
- IPython/core/debugger.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
-index 1f0d7b2fba..76c42e0230 100644
---- a/IPython/core/debugger.py
-+++ b/IPython/core/debugger.py
-@@ -550,7 +550,7 @@ def _get_frame_locals(self, frame):
-         So if frame is self.current_frame we instead return self.curframe_locals
- 
-         """
--        if frame is self.curframe:
-+        if frame is getattr(self, "curframe", None):
-             return self.curframe_locals
-         else:
-             return frame.f_locals
diff --git a/dev-python/ipython/ipython-8.30.0-r1.ebuild b/dev-python/ipython/ipython-8.30.0-r1.ebuild
deleted file mode 100644
index 8cae90959a59..000000000000
--- a/dev-python/ipython/ipython-8.30.0-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_REQ_USE='readline(+),sqlite,threads(+)'
-
-inherit distutils-r1 optfeature pypi virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="
-	https://ipython.org/
-	https://github.com/ipython/ipython/
-	https://pypi.org/project/ipython/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="examples notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-3.0.41[${PYTHON_USEDEP}]
-	<dev-python/prompt-toolkit-3.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	dev-python/stack-data[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.13.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/exceptiongroup[${PYTHON_USEDEP}]
-	' 3.10)
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.10 3.11)
-"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-3.9[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pickleshare[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? (
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	$(python_gen_cond_dep '
-		qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	' 'python*')
-	$(python_gen_cond_dep '
-		notebook? (
-			dev-python/notebook[${PYTHON_USEDEP}]
-			dev-python/ipywidgets[${PYTHON_USEDEP}]
-			dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-		)
-	' 3.{10..12})
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${P}-python3.13-debugger-pdb-curframe.patch ) # bug #946568
-
-python_prepare_all() {
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=(
-		# TODO: looks to be a regression due to a newer dep
-		IPython/core/tests/test_oinspect.py::test_class_signature
-		IPython/core/tests/test_oinspect.py::test_render_signature_long
-		IPython/terminal/tests/test_shortcuts.py::test_modify_shortcut_with_filters
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# https://github.com/ipython/ipython/issues/14244
-				IPython/lib/tests/test_display.py::TestAudioDataWithoutNumpy
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# docstring mismatch?
-				IPython/core/tests/test_debugger.py::IPython.core.tests.test_debugger.test_ipdb_magics
-			)
-			;;
-	esac
-
-	# nonfatal implied by virtx
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	nonfatal epytest -p asyncio --asyncio-mode=auto ||
-		die "Tests failed on ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "code formatting" dev-python/black
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line-profiler
-	optfeature "%matplotlib magic command" dev-python/matplotlib-inline
-
-	if use nbconvert; then
-		if ! has_version virtual/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-8.31.0.ebuild b/dev-python/ipython/ipython-8.31.0.ebuild
index 002d16d2e32f..eb2e4a083503 100644
--- a/dev-python/ipython/ipython-8.31.0.ebuild
+++ b/dev-python/ipython/ipython-8.31.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 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="examples notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-path/Manifest b/dev-python/jaraco-path/Manifest
index 56e2946d8aee..36e5138c0961 100644
--- a/dev-python/jaraco-path/Manifest
+++ b/dev-python/jaraco-path/Manifest
@@ -1,2 +1 @@
-DIST jaraco_path-3.7.1.tar.gz 11771 BLAKE2B 25ba1ff90514984be0885c0507ebe554372f4fa32aadda1a1bda8bde1781d60e81726fa899e863bf0d34ec49a79c57052b2b5b4035cd2655cdbb513df54da626 SHA512 aa002c649b4d0d4dbfc7bd3fe25b4ef71ca3c92d200029c282453002c75d3c642630b4ba4bfd0355a6311c72407fc874b3a092daa94ed99824f129119dd464d0
 DIST jaraco_path-3.7.2.tar.gz 12360 BLAKE2B 0e0a70e0af49db7e4ce9b54825beb057214277dd57e62c48f0ff2388ff2d489fe82d8773f7544464a64f0e83a9b95c8f794a91de2e6000360f0ebfee2693b03d SHA512 7869308504601368ef94c414e4d0c19d6115dccbb0d50b5287a15d3d31948c93ccfd01db71c95d534f670fdf61b2e2c00deb873ee1e81b7f6bc1bdf0d3a1f9a9
diff --git a/dev-python/jaraco-path/jaraco-path-3.7.1.ebuild b/dev-python/jaraco-path/jaraco-path-3.7.1.ebuild
deleted file mode 100644
index 23540dbf99b3..000000000000
--- a/dev-python/jaraco-path/jaraco-path-3.7.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Miscellaneous path functions"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.path/
-	https://pypi.org/project/jaraco.path/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest tests
-}
diff --git a/dev-python/jaraco-path/jaraco-path-3.7.2.ebuild b/dev-python/jaraco-path/jaraco-path-3.7.2.ebuild
index 97281217d16a..7a93c01b9a63 100644
--- a/dev-python/jaraco-path/jaraco-path-3.7.2.ebuild
+++ b/dev-python/jaraco-path/jaraco-path-3.7.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index 679810d02d8a..47b0465c21df 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -7,9 +7,7 @@ DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f
 DIST itoa-1.0.14.crate 11210 BLAKE2B b2d33dc384757963eab3ae7d80bb672d828a549967986e3af8c70fe71a0ad46c4a278da2db4dfccef99e804e6cd4934067e97c0697a33ac3302cafbc46eeb416 SHA512 ea2d38df373652ddacccd11e610dfdad4e3ae7f0d476514e6ac58092733c817bd834e8cd88c3bc4178dd5a646ba628ae626195e0aa407e8534ae3c2a7b049987
-DIST jellyfish-1.1.2.tar.gz 364387 BLAKE2B 116ed8375ae114b9db1364dc9e649aa3a373e0b0f19c3928cdef6683c1c7c5d95c186de5bcea45b037e4005d0ce0de552f04e656f69f3c710bb83ab4e7bd3163 SHA512 160bd8a2658b7814bc39a96e63ce669c4f3acd95e664418f71d5776d4d76a2d6939c19f1a2efd1c7d3222ff198f67da0d51d41d8c184ec2cc2d800c04366fa66
 DIST jellyfish-1.1.3.tar.gz 364473 BLAKE2B d2c41dffa8efaef96d89258005cdedfa831f049ba1a58d2a19a62aba7f5b6a324dadc09950175bf2e3303e5f98a97f1779c990f393d88578b1f3b9c15fd10e1c SHA512 bf70b87aa97832efd04b498d07e1fa50928fb40f1a308fbeaaf48353b6c5f7f45ce26334c49bf1fbb267b2557b69844f42bef58968529bb98c45a31865d314e5
-DIST libc-0.2.167.crate 757723 BLAKE2B 38f1657dea6d13cb6cc87c8cbededa9f0ac280e4f141f780719164451c941ef873cf6348fef7ab249ba7eed1cbf6768c6a8dc9a51796007c8ce31cdd2f90ecaa SHA512 f6690776266836371e5f9e20ec3a93bb17bc4296219755750e4e70e745016245dab9e247fe564e0f21d10d0c7c97ae97bf54da5068464a48ebfac244cf699166
 DIST libc-0.2.168.crate 757025 BLAKE2B 2597fdf5a77345754b8c9168d9f07f83ebaa0413262b94ebb19f976f49cc2c47893e788ee2abb3d00a995bc8f99b6ebcf24abbdb320e18037e779e1241599b44 SHA512 499f7273ab5eac0961fd927d5204ff4d5b3b290c20d00ac99054ee596b6d3ec4d6712772c52b09c84554f0514a8f66b41995ceb5b0ec38a7295a4fccf0e94349
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
@@ -24,9 +22,7 @@ DIST pyo3-macros-0.22.6.crate 8182 BLAKE2B 81998e4f4cb325763e4d3477af05b332e184c
 DIST pyo3-macros-backend-0.22.6.crate 66312 BLAKE2B ec0b11bee1ad2192e8d95cebab0075d6ec5bf628e3344b86fb8e20a6d0bc1f891b56ccfa4622840a609480581f32bd211b9a3d1dd989716cf255efe3fdc89331 SHA512 87463939b5a5674e30e8ca05ae747f652f8679f0c5c85d20967e9910ad853768a769a914580e82e409188fe4add80a3117ccb9da24c250406bc6f76fe4453799
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
-DIST serde-1.0.215.crate 78527 BLAKE2B ca8e1175839ca45a4d78a155f5943396211408a85e0840b065c52948188010653d68fc4fc7b63bf2c39a11a6988abb7f6f3c6d878ca1373596e0a5d62186e109 SHA512 3da13f1a74393f1fcb6d659b5e060a11ecae358f55cdf4a2fd05bfc863fea6f75d3140d3bc74902f8feba8cddf7dae71a3f4e4e78e78e1b08ed46b3e4900281f
 DIST serde-1.0.216.crate 79000 BLAKE2B 98c0f5cee2f9212c6b7620d2068665379471ceb7557d1454cab9b1c2120b526ef597fbb642f65440e70f92a4764cad33613b478bacf99138dd5bd51fdbdbee6b SHA512 baabf4c7aac4a540c9ed18b336662087258b71c9cb0e547c8d83a2734818ab2cbbe62f910d812eb61d3d46e653c41a3eebc99b1d679bfc51f95710c71a8ecc20
-DIST serde_derive-1.0.215.crate 57092 BLAKE2B f28bb66017599afdcd8d45c514b8e07854eb944c1dcf931e052a01ce421e0de6c20c13b3867da5922e2153e25ce88bf9fa27e2e68ddc9d212977f71fa0bd6352 SHA512 cae686bdf10c683149956ffe1c64fcf3e9b9bf0cd6e33b4ce7429d0ca35b9fdb55443693866c1202fa79348c6ea0f49ab3be3d5f857de4ae0818d2b4c8c67d9b
 DIST serde_derive-1.0.216.crate 57674 BLAKE2B 12a9228679c16288c08c8b256707e276aec79f84ac7af0c4cfd1f109500dfea80438df17d798acdd30a9743c753e70093b22bd324217529bac483f257682a3e2 SHA512 80fcb552279ac7562297df878f2f5e9ac09241701f5cf1088fcbf473b638f58cd3092a7930d8937ca0df9a47b9ae1a42d490cd46a275259cd8089fe8f5426469
 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
 DIST syn-2.0.90.crate 290584 BLAKE2B 9f469001c1439ffe57c578119653d3021c2709767e8e881441459a190402679f4fb78aa65e7822ff20913801c3be00d9b8f115189ea8e63ed94ed359b40fc9e1 SHA512 44606124f113c259c19edcb2adc1378d8292b422d800604c0e0d1ba89bd2d13d518cf4a6afa58daded54da9cb285464aadb113815406a0f09c5e18f865789ae0
diff --git a/dev-python/jellyfish/jellyfish-1.1.2.ebuild b/dev-python/jellyfish/jellyfish-1.1.2.ebuild
deleted file mode 100644
index 06e9b51e5ebc..000000000000
--- a/dev-python/jellyfish/jellyfish-1.1.2.ebuild
+++ /dev/null
@@ -1,79 +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=maturin
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-CRATES="
-	ahash@0.8.11
-	autocfg@1.4.0
-	cfg-if@1.0.0
-	csv-core@0.1.11
-	csv@1.3.1
-	getrandom@0.2.15
-	heck@0.5.0
-	indoc@2.0.5
-	itoa@1.0.14
-	libc@0.2.167
-	memchr@2.7.4
-	memoffset@0.9.1
-	num-traits@0.2.19
-	once_cell@1.20.2
-	portable-atomic@1.10.0
-	proc-macro2@1.0.92
-	pyo3-build-config@0.22.6
-	pyo3-ffi@0.22.6
-	pyo3-macros-backend@0.22.6
-	pyo3-macros@0.22.6
-	pyo3@0.22.6
-	quote@1.0.37
-	ryu@1.0.18
-	serde@1.0.215
-	serde_derive@1.0.215
-	smallvec@1.13.2
-	syn@2.0.90
-	target-lexicon@0.12.16
-	tinyvec@1.8.0
-	tinyvec_macros@0.1.1
-	unicode-ident@1.0.14
-	unicode-normalization@0.1.24
-	unicode-segmentation@1.12.0
-	unindent@0.2.3
-	version_check@0.9.5
-	wasi@0.11.0+wasi-snapshot-preview1
-	zerocopy-derive@0.7.35
-	zerocopy@0.7.35
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
-HOMEPAGE="
-	https://github.com/jamesturk/jellyfish/
-	https://pypi.org/project/jellyfish/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0
-	|| ( Apache-2.0 Boost-1.0 )
-"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/jellyfish/_rustyfish.*.so"
-
-distutils_enable_tests pytest
-
-export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
-
-python_test_all() {
-	cargo_src_test
-}
diff --git a/dev-python/jellyfish/jellyfish-1.1.3.ebuild b/dev-python/jellyfish/jellyfish-1.1.3.ebuild
index de5d634ea796..642054e473b2 100644
--- a/dev-python/jellyfish/jellyfish-1.1.3.ebuild
+++ b/dev-python/jellyfish/jellyfish-1.1.3.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
@@ -66,7 +66,7 @@ LICENSE+="
 	|| ( Apache-2.0 Boost-1.0 )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/jellyfish/_rustyfish.*.so"
 
diff --git a/dev-python/jinja2/Manifest b/dev-python/jinja2/Manifest
index b45554b87b91..e12212062b7c 100644
--- a/dev-python/jinja2/Manifest
+++ b/dev-python/jinja2/Manifest
@@ -1,2 +1 @@
-DIST jinja2-3.1.4.tar.gz 240245 BLAKE2B cb70699cea93ddf53b7c8876b9006cc70599d49f8c64ab615759a53db6829cab7b55ac673777bc4c8dc5dfc68efada29d37f47fe7cf449044721f659fe6a654d SHA512 d07d68a2687af68c705d3b7f5a2c67aca7b9d125316b15085888b9d0d6e769981af76f6f524728b89b5501bd671d518fcb2638f9ae112e57ca2bf2a53482cd89
 DIST jinja2-3.1.5.tar.gz 244674 BLAKE2B 0b3f44e5d3a5f3d898d0b678035ddaaeb30f1f7ca09555da93adbb8d7f7159a3e192809f69f47c21ce5be6f4fb1cc91bc35d4d62f2c38c71582210085091b3d7 SHA512 75ad0094482c69d45fcd3aa8ee32e249931e53fee3f804f6ddfd5b6da0ed16962d8f1fced811e7dcb4d8401fadd828e77528d6d1280547a7d4f5f77cccf9bbd4
diff --git a/dev-python/jinja2/files/jinja2-3.1.4-py313.patch b/dev-python/jinja2/files/jinja2-3.1.4-py313.patch
deleted file mode 100644
index b68091e5397a..000000000000
--- a/dev-python/jinja2/files/jinja2-3.1.4-py313.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 679af7f816ced8941ed5cf9b151a0cac543d0336 Mon Sep 17 00:00:00 2001
-From: Thomas Grainger <tagrain@gmail.com>
-Date: Mon, 13 May 2024 18:02:35 +0100
-Subject: [PATCH] fix test_package_zip_list on 3.13
-
----
- src/jinja2/loaders.py | 32 ++++++++++++++++++++++++++------
- tests/test_loader.py  |  2 +-
- 2 files changed, 27 insertions(+), 7 deletions(-)
-
-diff --git a/src/jinja2/loaders.py b/src/jinja2/loaders.py
-index 9eaf647ba..8c2c86cd0 100644
---- a/src/jinja2/loaders.py
-+++ b/src/jinja2/loaders.py
-@@ -238,6 +238,30 @@ def list_templates(self) -> t.List[str]:
-         return sorted(found)
- 
- 
-+if sys.version_info >= (3, 13):
-+
-+    def _get_zipimporter_files(z: t.Any) -> t.Dict[str, object]:
-+        try:
-+            get_files = z._get_files
-+        except AttributeError as e:
-+            raise TypeError(
-+                "This zip import does not have the required"
-+                " metadata to list templates."
-+            ) from e
-+        return get_files()
-+else:
-+
-+    def _get_zipimporter_files(z: t.Any) -> t.Dict[str, object]:
-+        try:
-+            files = z._files
-+        except AttributeError as e:
-+            raise TypeError(
-+                "This zip import does not have the required"
-+                " metadata to list templates."
-+            ) from e
-+        return files  # type: ignore[no-any-return]
-+
-+
- class PackageLoader(BaseLoader):
-     """Load templates from a directory in a Python package.
- 
-@@ -382,11 +406,7 @@ def list_templates(self) -> t.List[str]:
-                     for name in filenames
-                 )
-         else:
--            if not hasattr(self._loader, "_files"):
--                raise TypeError(
--                    "This zip import does not have the required"
--                    " metadata to list templates."
--                )
-+            files = _get_zipimporter_files(self._loader)
- 
-             # Package is a zip file.
-             prefix = (
-@@ -395,7 +415,7 @@ def list_templates(self) -> t.List[str]:
-             )
-             offset = len(prefix)
- 
--            for name in self._loader._files.keys():
-+            for name in files:
-                 # Find names under the templates directory that aren't directories.
-                 if name.startswith(prefix) and name[-1] != os.path.sep:
-                     results.append(name[offset:].replace(os.path.sep, "/"))
diff --git a/dev-python/jinja2/jinja2-3.1.4.ebuild b/dev-python/jinja2/jinja2-3.1.4.ebuild
deleted file mode 100644
index abbf2c5a1c94..000000000000
--- a/dev-python/jinja2/jinja2-3.1.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYPI_PN=jinja2
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="
-	https://palletsprojects.com/p/jinja/
-	https://github.com/pallets/jinja/
-	https://pypi.org/project/Jinja2/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
-
-# XXX: handle Babel better?
-
-src_prepare() {
-	local PATCHES=(
-		# https://github.com/pallets/jinja/pull/1979
-		"${FILESDIR}/${P}-py313.patch"
-	)
-
-	# avoid unnecessary dep on extra sphinxcontrib modules
-	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/babel; then
-		elog "For i18n support, please emerge dev-python/babel."
-	fi
-}
diff --git a/dev-python/jinja2/jinja2-3.1.5.ebuild b/dev-python/jinja2/jinja2-3.1.5.ebuild
index c194a64b9b22..14ae3bcf19a4 100644
--- a/dev-python/jinja2/jinja2-3.1.5.ebuild
+++ b/dev-python/jinja2/jinja2-3.1.5.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
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jmespath/jmespath-1.0.1.ebuild b/dev-python/jmespath/jmespath-1.0.1.ebuild
index 7bbeafaf84ad..672409289bcb 100644
--- a/dev-python/jmespath/jmespath-1.0.1.ebuild
+++ b/dev-python/jmespath/jmespath-1.0.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
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 EPYTEST_IGNORE=(
 	# fuzzing tests, they take forever
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index f7f5d8cf6e09..5aa61115066c 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,2 +1 @@
-DIST jsonpickle-4.0.0.gh.tar.gz 308065 BLAKE2B f55d8e6cc88a35057ecd75cf61878db7040b29c7e6980a99b5457e0851e2be048fed5995a55f2eeae41299c9ee335d7e046ef4389b5549a0a88f3e5e3b516f24 SHA512 6e227d7002e53f705df77c1af95cfa33778c31e030217c5d17a9f0879f6dfa3c4be88e6cb5ec59aec057b874995acf3dd20917f4aa2f098dc2fcb6605eef38b1
 DIST jsonpickle-4.0.1.gh.tar.gz 307912 BLAKE2B c8f6e9320eb38c6656d97f3b1397040a03ff09b31bb924bb38112c041e7e91954b7c1026328dd511e382a238731d6ca017331881e7fd15da68607daa1d01fba9 SHA512 21da8f4fc1d1801cd2dc7849b6088f9991814d86014df30f769e7c07035934e2f794a3a449714b64ac5cc4452f1af163a7d8c52fb5432972e058d832bab4daf1
diff --git a/dev-python/jsonpickle/jsonpickle-4.0.0.ebuild b/dev-python/jsonpickle/jsonpickle-4.0.0.ebuild
deleted file mode 100644
index d6418ac89153..000000000000
--- a/dev-python/jsonpickle/jsonpickle-4.0.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="
-	https://github.com/jsonpickle/jsonpickle/
-	https://pypi.org/project/jsonpickle/
-"
-SRC_URI="
-	https://github.com/jsonpickle/jsonpickle/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/feedparser[${PYTHON_USEDEP}]
-		dev-python/gmpy2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# unpackaged bson dependency
-		tests/bson_test.py
-	)
-
-	if ! has_version "dev-python/gmpy2[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=( jsonpickle/ext/gmpy.py )
-	fi
-	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=( jsonpickle/ext/pandas.py )
-	fi
-
-	epytest tests
-}
-
-pkg_postinst() {
-	# Unpackaged optional backends: yajl, demjson
-	optfeature "encoding numpy-based data" dev-python/numpy
-	optfeature "encoding pandas objects" dev-python/pandas
-	optfeature "fast JSON backend" dev-python/simplejson
-}
diff --git a/dev-python/jsonpickle/jsonpickle-4.0.1.ebuild b/dev-python/jsonpickle/jsonpickle-4.0.1.ebuild
index 971fe8e5ffc6..c76b31384811 100644
--- a/dev-python/jsonpickle/jsonpickle-4.0.1.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-4.0.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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter-events/Manifest b/dev-python/jupyter-events/Manifest
index 04143cc81be5..8b75a25da0e7 100644
--- a/dev-python/jupyter-events/Manifest
+++ b/dev-python/jupyter-events/Manifest
@@ -1,2 +1 @@
-DIST jupyter_events-0.10.0.tar.gz 61516 BLAKE2B 12cf323f65cd52a6c0aa29e7b75e7899ec245752a7c4e17d32650ae3e9b27f47a7e593b491747667dfc58bde5e0745077c72317dbfa6db1f266d7ada14bc8f6a SHA512 6e56b48a238353fbd5e6a1a8cb3fcc5a506063aa555c96172ec2e03a14fb527b39d03a9897de49353927e8993a770d028d6d0d2c9a92785c4b727e3da66676df
 DIST jupyter_events-0.11.0.tar.gz 62039 BLAKE2B 0a6d4598c763c59595d66e8ea30c0c056e48600a024e138258a6d0b306a002b10bf2eabaad78bb7ca1280b214660cd682737518c503437ba4921451473cb0d92 SHA512 a19458ca9e2b9c44af1a7b4b80259aa4f67b318a5bf6ca7a9b4e24c6e6923b64947b6de8f9476e354b090542bfd9af5b7db2479df0e08ff3617d7c0f32cc267e
diff --git a/dev-python/jupyter-events/files/jupyter-events-0.10.0-test.patch b/dev-python/jupyter-events/files/jupyter-events-0.10.0-test.patch
deleted file mode 100644
index 44695c174cdd..000000000000
--- a/dev-python/jupyter-events/files/jupyter-events-0.10.0-test.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 6c6219710e08784b3b8beed25d17240ea7f9ef93 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 12 Jul 2024 11:05:40 +0200
-Subject: [PATCH 1/2] Improve compatibility with patched python-json-logger on
- py3.12+
-
-Discard the `taskName` field from event capsule, to preserve
-compatibility both with current python-json-logger versions, and with
-versions containing the Python 3.12 fix
-from madzak/python-json-logger#188 that removes the reserved `taskName`
-field.
----
- tests/test_logger.py | 15 +++++----------
- 1 file changed, 5 insertions(+), 10 deletions(-)
-
-diff --git a/tests/test_logger.py b/tests/test_logger.py
-index 8a0a499..986aade 100644
---- a/tests/test_logger.py
-+++ b/tests/test_logger.py
-@@ -166,8 +166,7 @@ def test_emit():
-         "__metadata_version__": 1,
-         "something": "blah",
-     }
--    if sys.version_info >= (3, 12):
--        expected["taskName"] = None
-+    event_capsule.pop("taskName", None)
-     assert event_capsule == expected
- 
- 
-@@ -214,8 +213,7 @@ def test_message_field():
-         "something": "blah",
-         "message": "a message was seen",
-     }
--    if sys.version_info >= (3, 12):
--        expected["taskName"] = None
-+    event_capsule.pop("taskName", None)
-     assert event_capsule == expected
- 
- 
-@@ -263,8 +261,7 @@ def test_nested_message_field():
-         "__metadata_version__": 1,
-         "thing": {"message": "a nested message was seen"},
-     }
--    if sys.version_info >= (3, 12):
--        expected["taskName"] = None
-+    event_capsule.pop("taskName", None)
-     assert event_capsule == expected
- 
- 
-@@ -428,8 +425,7 @@ def test_unique_logger_instances():
-         "__metadata_version__": 1,
-         "something": "blah",
-     }
--    if sys.version_info >= (3, 12):
--        expected["taskName"] = None
-+    event_capsule0.pop("taskName", None)
-     assert event_capsule0 == expected
- 
-     event_capsule1 = json.loads(output1.getvalue())
-@@ -443,8 +439,7 @@ def test_unique_logger_instances():
-         "__metadata_version__": 1,
-         "something": "blah",
-     }
--    if sys.version_info >= (3, 12):
--        expected["taskName"] = None
-+    event_capsule1.pop("taskName", None)
-     assert event_capsule1 == expected
- 
- 
-
-From 5ad1b27eb8424f1c33067eb68859f9ed0d7ede74 Mon Sep 17 00:00:00 2001
-From: "pre-commit-ci[bot]"
- <66853113+pre-commit-ci[bot]@users.noreply.github.com>
-Date: Fri, 12 Jul 2024 09:08:44 +0000
-Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks
-
-for more information, see https://pre-commit.ci
----
- tests/test_logger.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tests/test_logger.py b/tests/test_logger.py
-index 986aade..ecd56ab 100644
---- a/tests/test_logger.py
-+++ b/tests/test_logger.py
-@@ -3,7 +3,6 @@
- import io
- import json
- import logging
--import sys
- from datetime import datetime, timedelta, timezone
- from unittest.mock import MagicMock
- 
diff --git a/dev-python/jupyter-events/jupyter-events-0.10.0.ebuild b/dev-python/jupyter-events/jupyter-events-0.10.0.ebuild
deleted file mode 100644
index 241a36a33ff2..000000000000
--- a/dev-python/jupyter-events/jupyter-events-0.10.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Jupyter Event System library"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/jupyter_events/
-	https://pypi.org/project/jupyter-events/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# jsonschema[format-nongpl] deps are always on in our ebuild
-RDEPEND="
-	>=dev-python/jsonschema-4.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-json-logger-2.0.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3[${PYTHON_USEDEP}]
-	dev-python/referencing[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/rich[${PYTHON_USEDEP}]
-	)
-"
-
-# TODO: package jupyterlite-sphinx
-# distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-PATCHES=(
-	# fix compatibility with patched python-json-logger
-	# https://github.com/jupyter/jupyter_events/pull/100
-	"${FILESDIR}/${P}-test.patch"
-)
diff --git a/dev-python/jupyter-events/jupyter-events-0.11.0.ebuild b/dev-python/jupyter-events/jupyter-events-0.11.0.ebuild
index b30d637e912e..67132ac1a856 100644
--- a/dev-python/jupyter-events/jupyter-events-0.11.0.ebuild
+++ b/dev-python/jupyter-events/jupyter-events-0.11.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 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"
 
 # jsonschema[format-nongpl] deps are always on in our ebuild
 RDEPEND="
diff --git a/dev-python/jupyter-server/Manifest b/dev-python/jupyter-server/Manifest
index 7073fc41710d..e7410f46e5c3 100644
--- a/dev-python/jupyter-server/Manifest
+++ b/dev-python/jupyter-server/Manifest
@@ -1,2 +1 @@
-DIST jupyter_server-2.14.2.tar.gz 719933 BLAKE2B 2d8a8a283b394ceaabde14b2a997fc71d7dccc80a284ef7770d948634e48c8689c8393c77992d685abd7d8766b8608cfd279a47b5cc9569b6f6c98d416f284c8 SHA512 ea8fbf93c1bafcdb77c95cc65e2e7c6e9d010add7fb8b2b1d4538f415c4b39a89cf18a58795da05dd41a838fc1057fadde3f68d9bc73d532aec76ae5cab357a7
 DIST jupyter_server-2.15.0.tar.gz 725227 BLAKE2B da7b0106de95aa2dd3abed6d89e768a8beed1377b6a5dd0f6f9d79cd5c22cfe1259279be34771f48065ce618ae5de61ff1376a30af6c2085c481eecdec0b0d62 SHA512 96d5cf536c0ac242c86f20d0c18662f544d8d6b7a11a3fd06e473205fa597da02333f2064ffc9440ffd177c916dd37b3c608a623c35443e67663768aae97f0fc
diff --git a/dev-python/jupyter-server/jupyter-server-2.14.2.ebuild b/dev-python/jupyter-server/jupyter-server-2.14.2.ebuild
deleted file mode 100644
index 37faf06b7dc6..000000000000
--- a/dev-python/jupyter-server/jupyter-server-2.14.2.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
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter-server/jupyter_server/
-	https://pypi.org/project/jupyter-server/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/argon2-cffi-21.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja2-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-terminals-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-events-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}]
-	>=dev-python/overrides-5.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/prometheus-client-0.9[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-24[${PYTHON_USEDEP}]
-	>=dev-python/send2trash-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.6.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-1.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.7[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# This fails if your terminal is zsh (and maybe other non-bash as well?)
-		tests/test_terminal.py
-		# Fails because above is ignored
-		tests/auth/test_authorizer.py
-		# Fails with additional extensions installed
-		tests/extension/test_app.py::test_stop_extension
-	)
-
-	# FIXME: tests seem to be affected by previously installed version
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest \
-		-p pytest_tornasync.plugin \
-		-p jupyter_server.pytest_plugin \
-		-p pytest_console_scripts \
-		-p pytest_timeout \
-		-o tmp_path_retention_policy=all
-}
diff --git a/dev-python/jupyter-server/jupyter-server-2.15.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.15.0.ebuild
index 9ba53e4f8c78..78e371015fd8 100644
--- a/dev-python/jupyter-server/jupyter-server-2.15.0.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.15.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index 94355ed153ad..20f36ed139c3 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,3 +1 @@
-DIST jupyterlab-4.3.2.tar.gz 21797175 BLAKE2B 72626351e0cadb523a8fc8a3b5ce7c6f452755eb145a5ac1c07118a0fbe2830025f78f94015381097360a171f9f4f5903fe71c3941d931db633328869caf5a28 SHA512 44e364b4bed7985394cfc28f2a7ff5e82c78861d61021886816c2ff26c9fca68140e956d281726433e63eee8f076ca35131ca930341430023c3043ee297981e2
-DIST jupyterlab-4.3.3.tar.gz 21797278 BLAKE2B d68dbe86e2d7a94a862f6323920b1b725ff5595e01834c36cdced4a56ff8b2860ab23321da0fa4d22fb93c6e7dd98013892d61c4c7ea4425de02d695dceb78cb SHA512 6cd2a3c68adf824ef586eb8df52bc878ee32cc26395a0aa47212fbb10e8e435efe5005dad875771910de9839694eb28eabb2e9e548416500ce5d1aa37f27e1f1
 DIST jupyterlab-4.3.4.tar.gz 21797583 BLAKE2B 6b3cf186992edd58dd02e77e58c5e729391468438ab04a18a59b286adb9d8db677c14878eb09cc2d8857dd80915dd7191ae8bd24abaa1f7d96e8c76785ae0a57 SHA512 e9d46ec06f5bca037d45a9c6ef811a1927db3e1fb32996592676f8578563d4a24aaad82facf4f75014740711247d66a8362d2e344537d4952c2af3a9e5bdf9e3
diff --git a/dev-python/jupyterlab/jupyterlab-4.3.2.ebuild b/dev-python/jupyterlab/jupyterlab-4.3.2.ebuild
deleted file mode 100644
index 1f3e3b7fe40e..000000000000
--- a/dev-python/jupyterlab/jupyterlab-4.3.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi xdg
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab/
-	https://pypi.org/project/jupyterlab/
-"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/async-lru-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.28.0[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-6.5.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja2-3.0.3[${PYTHON_USEDEP}]
-	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.27.1[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-40.8.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-	' 3.10)
-	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	net-libs/nodejs[npm]
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-cache[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# These tests call npm and want internet
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
-)
-
-EPYTEST_IGNORE=(
-	jupyterlab/tests/test_announcements.py
-)
-
-distutils_enable_tests pytest
-# TODO: package sphinx_copybutton
-#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyterlab/jupyterlab-4.3.3.ebuild b/dev-python/jupyterlab/jupyterlab-4.3.3.ebuild
deleted file mode 100644
index 30f9428b6455..000000000000
--- a/dev-python/jupyterlab/jupyterlab-4.3.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi xdg
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab/
-	https://pypi.org/project/jupyterlab/
-"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/async-lru-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.28.0[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-6.5.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja2-3.0.3[${PYTHON_USEDEP}]
-	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.27.1[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-40.8.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-	' 3.10)
-	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	net-libs/nodejs[npm]
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-cache[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# These tests call npm and want internet
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
-)
-
-EPYTEST_IGNORE=(
-	jupyterlab/tests/test_announcements.py
-)
-
-distutils_enable_tests pytest
-# TODO: package sphinx_copybutton
-#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyterlab/jupyterlab-4.3.4.ebuild b/dev-python/jupyterlab/jupyterlab-4.3.4.ebuild
index 30f9428b6455..7acef31bbe8b 100644
--- a/dev-python/jupyterlab/jupyterlab-4.3.4.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-4.3.4.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD MIT GPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/async-lru-1.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/keep/Manifest b/dev-python/keep/Manifest
index 39df976abf49..fbcab25257c7 100644
--- a/dev-python/keep/Manifest
+++ b/dev-python/keep/Manifest
@@ -1,2 +1 @@
-DIST keep-2.10.1.tar.gz 13044 BLAKE2B 178207ccad7f0feec2d9a57f0e5345e0ef9853bedd3f8efc8afac5f81c35e74ee6d3dab66b75ceeac4a3d76f2297ec645bae61f2f1e78218e910a2537984f4cd SHA512 d4144bd7f6f623b1c9c9468f5596818f47cba8a9bc80e75ebaf75f147823a01da53ef84c76b9f24240a8d0fbdb770c5cdf108c276ecdcd882ac9db0c1608480f
 DIST keep-2.11.tar.gz 12175 BLAKE2B 88116819bf3aafeac5d4891a136f4a17751aff3141d55891bb7c29bbcf36e7c3a5a7d5aeaf6ccf62377cf7f660178cc971ffba7c8e8a80e9d3ffb87f91bed150 SHA512 b26349dcaf03cdec6463ee73029e644a41985f09efa4923ce6344884ea8d4189679747202af1ec930479ec1290374b4c55d4ae478590ce690f8920de00276782
diff --git a/dev-python/keep/keep-2.10.1-r2.ebuild b/dev-python/keep/keep-2.10.1-r2.ebuild
deleted file mode 100644
index c71c85f113ca..000000000000
--- a/dev-python/keep/keep-2.10.1-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Personal shell command keeper and snippets manager"
-HOMEPAGE="
-	https://pypi.org/project/keep/
-	https://github.com/orkohunter/keep
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/pygithub[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/terminaltables[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	"${EPYTHON}" - <<-EOF || die "Smoke test failed with ${EPYTHON}"
-		import datetime, sys, os
-		import keep.cli, keep.utils
-
-		# avoid automatic initialization, otherwise keep basically just creates
-		# this directory and exits
-		# see https://github.com/OrkoHunter/keep/blob/8dddc00aaaf0e53edbd2477a02d3fe53e38b7f28/keep/utils.py#L53-L63
-		os.makedirs(keep.utils.dir_path, exist_ok=True)
-
-		# keep tries to check newest version on pypi once a day, let's pretend
-		# that this check was already done
-		# see https://github.com/OrkoHunter/keep/blob/8dddc00aaaf0e53edbd2477a02d3fe53e38b7f28/keep/utils.py#L23-L50
-		with open(os.path.join(keep.utils.dir_path, 'update_check.txt'), 'w') as f: f.write(datetime.date.today().strftime("%m/%d/%Y"))
-
-		sys.exit(keep.cli.cli())
-	EOF
-}
diff --git a/dev-python/keep/keep-2.11.ebuild b/dev-python/keep/keep-2.11.ebuild
index 318de55a30fe..4b4dcbb3d1f7 100644
--- a/dev-python/keep/keep-2.11.ebuild
+++ b/dev-python/keep/keep-2.11.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/click[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 0d4129194d2b..e3196dc56f2c 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,2 +1 @@
-DIST keyring-25.5.0.tar.gz 62675 BLAKE2B 9499adbc756a94761acadf121ff22f55186481788477b17dcdb206200ab8041c9b68fba64139f823d1155e0c679f028281fc0093e1038b3cfd740c7c3e38fb7b SHA512 bd8b792781bde9bb5d609acd9516b66486bd785231b81239bf9add483aefaa864ebe541d30c9977216c7a635e3f9161a55da15ba1070d8aab06bb86769fca476
 DIST keyring-25.6.0.tar.gz 62750 BLAKE2B b6c5f30308a168e690caf43e566c98ac7a755253cb961e2c0be5bf3591c6b59b43ace1a5fe7050d20a439cfc0c579f5f5a1ae52ab007d89f45e3f957bceae77c SHA512 192863cd36d597ae55c8e3e8ae909388f64894c812db6dd80c92bb7c8467029b54976f855807cf6f245419599d191113c9b12e272631bb6e4f6cf6e122296421
diff --git a/dev-python/keyring/keyring-25.5.0.ebuild b/dev-python/keyring/keyring-25.5.0.ebuild
deleted file mode 100644
index e6e8c540e9b9..000000000000
--- a/dev-python/keyring/keyring-25.5.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="
-	https://github.com/jaraco/keyring/
-	https://pypi.org/project/keyring/
-"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-context[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib-metadata-4.11.4[${PYTHON_USEDEP}]
-	' 3.10 3.11)
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# this test fails if importlib-metadata returns more than one
-		# entry, i.e. when keyring is installed already
-		tests/test_packaging.py::test_entry_point
-	)
-	local EPYTEST_IGNORE=(
-		# apparently does not unlock the keyring properly
-		tests/backends/test_libsecret.py
-		# hangs
-		tests/backends/test_kwallet.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts=
-}
diff --git a/dev-python/keyring/keyring-25.6.0.ebuild b/dev-python/keyring/keyring-25.6.0.ebuild
index 6253b57dcaf9..b0c682ec869d 100644
--- a/dev-python/keyring/keyring-25.6.0.ebuild
+++ b/dev-python/keyring/keyring-25.6.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.8.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.8.ebuild
index d4c7b11a09d9..8f60498041b5 100644
--- a/dev-python/kiwisolver/kiwisolver-1.4.8.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.4.8.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
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 COMMON_DEPEND="
 	>=dev-python/cppy-1.3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/latexrestricted/latexrestricted-0.6.2.ebuild b/dev-python/latexrestricted/latexrestricted-0.6.2.ebuild
index 224017075216..767633c60d59 100644
--- a/dev-python/latexrestricted/latexrestricted-0.6.2.ebuild
+++ b/dev-python/latexrestricted/latexrestricted-0.6.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
@@ -20,4 +20,4 @@ SRC_URI="
 
 LICENSE="LPPL-1.3c"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-python/legacy-cgi/Manifest b/dev-python/legacy-cgi/Manifest
index 6effbd44b8ce..1bd464d794c7 100644
--- a/dev-python/legacy-cgi/Manifest
+++ b/dev-python/legacy-cgi/Manifest
@@ -1 +1,2 @@
 DIST legacy_cgi-2.6.1.tar.gz 24782 BLAKE2B 4a147583a951e128282eef445fce9ad0acc6f63036d115b9f048956f17999946808f563e025bc6f45687e6ea095b459c10e90e01c114ff535a485de1fe344917 SHA512 584ed4c2fdf05e89944dc86dc31dd4de80efbad3e43f15e411f9eff0fabbeeaf3df757faa2a56527f61d661b6d73eb258135ab7763dd3a58c9611829c6d28cb0
+DIST legacy_cgi-2.6.2.tar.gz 24794 BLAKE2B 2651a11f86c92570ceca3c915654828d83d1af75e604bd5d2d9d4e5b049a44cfbc9775e64ebe1c98fadbadcd327492662f543fc24ed2bff33324abb50f58ee79 SHA512 7147806056edaddcc129d8f4495bb2b62835432591c080373b369c628d895914ec6c5221c236ab5e4d82a2f19f6c48944e9fcb64449d9215e3f0de3c3a8aa80b
diff --git a/dev-python/legacy-cgi/legacy-cgi-2.6.2.ebuild b/dev-python/legacy-cgi/legacy-cgi-2.6.2.ebuild
new file mode 100644
index 000000000000..849a9e167fec
--- /dev/null
+++ b/dev-python/legacy-cgi/legacy-cgi-2.6.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_13 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Fork of the standard library cgi and cgitb modules (deprecated)"
+HOMEPAGE="
+	https://github.com/jackrosenthal/legacy-cgi/
+	https://pypi.org/project/legacy-cgi/
+"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/libcst/Manifest b/dev-python/libcst/Manifest
index 5f4a2e1d2ed1..7ac01ca210d0 100644
--- a/dev-python/libcst/Manifest
+++ b/dev-python/libcst/Manifest
@@ -30,6 +30,7 @@ DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a
 DIST half-1.8.2.crate 41874 BLAKE2B c3c5c01771f05b7af652abb8e5490dde7afd04de130537e67845fe7ed58904e7ad66c7286a4e7deca3641876a6d12c5b6e95883fee2809c8e685d2f79cf96610 SHA512 5eb128e41b8b7f9769a669834b2f8380b115395bf2a2a181732bf6c71234d978dbc4c527fddadaa7bd7fae9add77958b27616bfa1767fd123d3cfb887663292e
 DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
+DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST hermit-abi-0.3.2.crate 13783 BLAKE2B 43089507a5ca0731a9e9a54fdc8f4dd5f807244797eba5bdcc072c2c2b3761481df65b8cc65900769777d9d21f8345b502cb1915ec36747160e87f179469a661 SHA512 22901ec8976a7c96e93c9e07a2c5d3db49d7af60ce60c7ee6f61c3cbe93190d1f285e737c1c8b2236d540ab14e5d92e42828ec05f1b212332a862baf2b1b57f6
 DIST indexmap-2.4.0.crate 83544 BLAKE2B f4b3e1b877c9355a491e33d10e3ef730f943b54bb14f33ed476120e2a8f0cd3550f6aeee1a56e1868881e1853b3d41283ab803faf5afbf32c86b36e08e7f2026 SHA512 9c7f2b495f0568ce56e2fa8d3355948783b490b23b46a83acade2864e41eb31a50cf372d818b2a1d3d24327282a9866e690348134a20ee481d748bdc581145ec
 DIST indoc-2.0.4.crate 14311 BLAKE2B 8d604e20825ae64530014081c627abe4ecec6447e1e214408743aca79ed217531baad4bd7021137ae6628555d769a248f06acc556cc3254d2626074aab110a44 SHA512 ef1b8d19d89d848c1133f2865247e0ce23cbe5552454805910ed0478ac4acb11b11629aa4a5ce8756d0ed5cbc0644abedeac0246f433166c68f47cf58cf4487a
@@ -42,6 +43,7 @@ DIST js-sys-0.3.58.crate 78794 BLAKE2B d664fda1e19a7ebb621596cd4773e7ebe86b3749e
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.149.crate 715592 BLAKE2B 21dd5d4f9351f3c75790077c7b025046db665f2d48d7a72cda7667bc60febf79d82708cf7d39a323a594397cd590bd3d2a2f85349b4473b90ea4da918382ed0a SHA512 0def64d400d473d6eed30e985522d36801ee6472b15f90e74dc4592e0a8ffbaf30b731be280de52b30255cf60aeca8efe817b67049227dc7000c807e007d7289
 DIST libcst-1.5.1.tar.gz 773387 BLAKE2B c866d3483fb5037ae0bafc7463c377a1ba2bc55afe8182695de10c4344ed38b8c56d16241e8b19159a8cb93dcabf6cf8b6776d45e11367241f976cd9a9da74cf SHA512 587bc312de2e3dd76539f4e3963f5308815dcb3b4ed9e224ba808ec8510f5a10a6fa199b0560864fb73d0aeef837b39293e7a61b3d815568b2fe2a1157ee4aeb
+DIST libcst-1.6.0.tar.gz 776146 BLAKE2B a941471a1e6f786e7e93c12548e75d44ba4c15af61c3535607c9298ba30ba1a6d75d803abde1279627f69a6755db054a477bd5639505323769ee9c4dbb2e19aa SHA512 0599133eec32803f2f88278ee0fa0ecd5b270b6e3e01b0106c2c7dbb1786d4359c7dfef520e1d269ddd65d265969c5e640bb4bdf1a9ed40d3dc265263d57bc6f
 DIST linux-raw-sys-0.4.10.crate 1407767 BLAKE2B 8bc633d99bc1ee1a6fdfa19501fd034a4475fa9ebe18a206e4254309d91aee7a91fc70faf9775efa5157a1b2fb7e5f827bde40a770b066643356113f2cf38b5d SHA512 107f61add087bff55869798d5c71bc6ac9ecb27a603d8f9071b856189de8b7b0a7f9243fa1433700f52a0c3020eff5604dbf6e0653109d0dd277b98ab45fae21
 DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
@@ -60,12 +62,18 @@ DIST peg-runtime-0.8.3.crate 4159 BLAKE2B 10183478eaec5d3057eb8d6a4e58728dad682d
 DIST plotters-0.3.1.crate 8595577 BLAKE2B 7c500c43c2b2875d9dc17e4eab57cbd8a470c6064deadf4e78c429abe2f1e97511f64bc67782b4e03e7cc47c8ac54aadfa5f7cc8c27d3b4453d2ee8252896c99 SHA512 c7bcdf9da56c2d1c03053f61256d44d2384fac1a9a7e0db058090c13b359bce76a2a96bbcbfde04fdcde0a9dd3db8a1a22bc57508b0b6e4a374c8b35ec6c9707
 DIST plotters-backend-0.3.2.crate 13524 BLAKE2B cfd42df0fcea4e5ee944a6b8c48e3b7fcecefd6d97f07e1c333067193c211da9eba29fb56e9fc8b861cfa2d1baa3c042fddb494bb66b9109656b26bde7901f7d SHA512 116bc6866094a2ec40a9ab9363378566ff37eeb4a4e3805562dd3e95f1d5e8664b54d3dc858a2c9974b125e308e46b77c294de2a655f836d342712c32f0242a3
 DIST plotters-svg-0.3.1.crate 7596 BLAKE2B ac8dffc5dea833c0506c472567056be0804e5519828b68f7b3bec9ee63dd59f9aa828c10732a50e004214512df06c7eaf164eb9613cda75b2753270fa358c0d6 SHA512 4d3cd02534440dc26f5eaa3b4966081901626c61d9fabe0092fed87c48929cb9be070d9c34486fc7c7bef308337ff4890d30f9581a613549e507db60dd9d8876
+DIST portable-atomic-1.4.3.crate 126291 BLAKE2B 08fbfd391c9eb55c02b8345549a57fb5c3b8cfcd81e3867ca49cba94faa7b2d372e4f2996fbef4a52742d852b117d4b7cc488571df7272b93caf47a9a2680c46 SHA512 89f14902c1e55c37d7663bc9255378441a0951e5d8e21665a8102e06b766135cec6d982f9ed01b4167e872a7853102ad0e9347e9b163ea81d81b00ee2362e9a0
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST pyo3-0.20.2.crate 434326 BLAKE2B 3114fd6f3fb8ae7d1b35c9d2ac5ba6a49c5ac911ee3a5b941c5063263ca7cce47fa4b4f7ec34cbfe3083f3d1303fd7f061639fba833a04fedb9d5098f5784028 SHA512 cc5151a116179157046ec92677e5a72318b4cdb13a7d7e3bb83778739b5758040e5020f667dd83554a66b758581a08f5de05eb38e7b339813cec85e0712e6355
+DIST pyo3-0.22.2.crate 538342 BLAKE2B faf347695117f9fe0ebe5cd7f6aa1b0dcfe718343875d6c06438046deccc1075f104d2a2413dcda41ae9827bc363aa147057b45968f6634f577a6a4510a4bb8e SHA512 e8bae09059f50ffe477dad44499cedeaf3a734665f0fd8e8bd4b44f48578d21e4bdb8d55ceea00c5a27da750761842ddf89cfcecdecb2e7a4a17ab192259be9c
 DIST pyo3-build-config-0.20.2.crate 30029 BLAKE2B 846eb95d1417a658763417a2750dca1c55201105a3978d61b1db5e3962680ede188f8285dd7deec778ea9860d43e40513b88f5a54f0b1881b08416760bdbbedf SHA512 9dbc669ec69d38716c3909fa8f3b6c5be13c717b20bfd5dd11edab59b8eb35247d7996acd260fec88f92eb3e71248c86e9b40c1a700827889e2990bba20ecddf
+DIST pyo3-build-config-0.22.2.crate 31225 BLAKE2B c2e6a3d3d23b7f2f51bcbf1214ab20a298a1e62f85c9af3dab1e77b09f20b657b576feefffb18eb49d438f0ffab525b6bcd1086d500601c327ffd4fd24a719ee SHA512 644c82d30bb27051557efcc9789a81380a64e29bc62abf97de88f42c3791dac74228c7a7d09e0d46d14f07c0475f0bc03fac6ed1367b9a616153e8820b94cbc8
 DIST pyo3-ffi-0.20.2.crate 64601 BLAKE2B cf1141ad34a13dcb46de0d1e15dda192ca41a7441bfc92a9295861876dcc690d1d5d6d39dafa51cd70c4627353efa91563eaefee8c39f655d12818003f9524da SHA512 ee6386b6fdb80689d104f9cd5229f02e1893d00a52be710bd36882c47305abbe24ef2f3cdef8200fddc0bb97e29001fa3a2fd9d3d2673ecd9a104a070420d01e
+DIST pyo3-ffi-0.22.2.crate 67749 BLAKE2B 0a4357d5f4fbcab9717d58b7a80b63a63bc329267d4725136c4eac7c0101095a50e5f840638dde79034e5df99c4f46664cfdc2ad437837643db5d475c5705cb3 SHA512 bf8b83b4790832d99de8c6a61a15a43fc189505dd843011933305f7f93c4f5f4849fb00cc2a6fa410b788645f8ed8c0df61799cf801966a925abb9756b1ab579
 DIST pyo3-macros-0.20.2.crate 7925 BLAKE2B 00fc60becfa39bf452786d8a612247785f1737cc3e627700d0d144ab2efaadfb34ce8a8f46e932382a1ea99caebfe1946fbc517b5c26fadb0822ecaa8b2e9df0 SHA512 dd9ea9acda95dfc53689a4c26d8c2139f8a90a05ab06737037f19b8bccd5e52b0da5f297a29194b958f5f8b59cbb566b5f409b3f17a863eddf855ecb755d2719
+DIST pyo3-macros-0.22.2.crate 8136 BLAKE2B 9dc97d2f60581db1b8ddb562dac917069525f297fe2cbb9aff3ed34d5a08ea43c112c9c7a450539da3536d753778b5ca506dd1b18e1d6b8a3649fc098e7af439 SHA512 f4f4f6af8dc3aa4bcc1698661990ab2112391ef9502e9f71d86e35bd10dc4e1be309102ebb1b7b32751817a6033168dc0486fdb16b35c626101e69f0de807a4a
 DIST pyo3-macros-backend-0.20.2.crate 49710 BLAKE2B 711b18984e61219555df4b62667f7f376951c6cb47e6dd947fc24618b923c4f4f790eb1aba1901abea4761632cdb58cfa81cce91f33586da3022e6c7d126bc9f SHA512 c6ca2a2cdae8630fba3f8e4122e81b60ef2ef0905ad2a3fbcfae134456d5ca9e73690b61590e391f3b9d82c24725809f18544c5dfa0b36ffdb1914844fe65d3a
+DIST pyo3-macros-backend-0.22.2.crate 65620 BLAKE2B 37fba9ff384373418d3a7341acafb8e33308a64e30026f828693a37c32ab4a74d058f2db84d00467a20f9f267c96fe54c0f154d1ebbae92490e8dfc0d29c042f SHA512 0517080c0d5d4ed8136521fd37aa3a192c2eb8cab58545d8543ee4df9cd0dcea19fe0678d5ab90f05fe3eb0f4a86fc2f07b76f2e12ac1fcf7e7c195c2ffa4fd8
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
 DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2a0a0dc24f0282fa7eb01fd1351a7dc8b5af3a55ea321e6526fbe037fec3cf8b32463166a082a6e417a51fca SHA512 3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3
 DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
@@ -84,6 +92,7 @@ DIST serde_spanned-0.6.7.crate 9164 BLAKE2B 559a62c0ac00a1559947224bd268842f35c5
 DIST smallvec-1.8.1.crate 28295 BLAKE2B c776b37e8cda81fe1df6ace794739b7e0cb1e3c5d5c1ffa57656ef0c0d0aec354c2c93ae23ff895996ab50a26ced28b913fab89ced27cb2f1d15568ab45957c7 SHA512 e93cbce48b81fe1a26d6016ad15b27ede8ae7162933e8923d3eb9c93f61910fee177c1aff16a1dd60c9917e41f8b7e474601a60c6d6d6867ef33c6d2e5fdf688
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-2.0.75.crate 268805 BLAKE2B 936688757ef1b39df0ac34fb2b98e14d15ea5d500b7db7d0c6358c495a385686287f5220b1427c0f086c56fab9caa0eb1f4b1c8cc6e6079f5b9cd24332ce7626 SHA512 f200b5fc6656912471a976e81f460713e9194a962441eb984e26320fc9f197a1d09c6a0a6bba4ab9bd153720ff5b48758f4bac617735ca455c37cc3041f84e38
+DIST target-lexicon-0.12.15.crate 26384 BLAKE2B d1ba50aa9d50647c6f778df86b35db1a4dee56fad918e6ef216688d9ac716dc5e8b40bff15aa89a99e4874e74d7e2731ad7fd9ea7094652def8abf57b74f9811 SHA512 32cf3e2da1c28003e1b6347abc8ae4d8182bf5b719ef84772271fc871dbaf96ec98c03b555a748cb8ab76584e67e17532757193d1d84b057cc90bed525727fb3
 DIST target-lexicon-0.12.4.crate 23020 BLAKE2B ad9780b9478b00b4fdcb07bd016d83216695413090ac29cca06388c3790e2832c978b1c7e69f6d34bb6fc9adc39c0a0b6b6636e50a9715a9f5f16445dba22d19 SHA512 194fe1946ad8d9fdb383bf8a65374e24d216382c1ed5379dabc98d58842512624c32838b8d6d0658d866f6559d37f1343a30c5809e8914dd85790399252b3e06
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
diff --git a/dev-python/libcst/libcst-1.6.0.ebuild b/dev-python/libcst/libcst-1.6.0.ebuild
new file mode 100644
index 000000000000..2a561efd3339
--- /dev/null
+++ b/dev-python/libcst/libcst-1.6.0.ebuild
@@ -0,0 +1,198 @@
+# Copyright 2024-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=( pypy3 python3_{10..13} )
+
+CRATES="
+	aho-corasick@1.0.4
+	anes@0.1.6
+	annotate-snippets@0.6.1
+	anstyle@1.0.2
+	autocfg@1.1.0
+	bitflags@2.4.0
+	bumpalo@3.12.0
+	cast@0.3.0
+	cc@1.0.83
+	cfg-if@1.0.0
+	chic@1.2.2
+	ciborium-io@0.2.0
+	ciborium-ll@0.2.0
+	ciborium@0.2.0
+	clap@4.4.0
+	clap_builder@4.4.0
+	clap_lex@0.5.1
+	criterion-plot@0.5.0
+	criterion@0.5.1
+	crossbeam-deque@0.8.1
+	crossbeam-epoch@0.9.9
+	crossbeam-utils@0.8.10
+	difference@2.0.0
+	either@1.6.1
+	equivalent@1.0.1
+	errno-dragonfly@0.1.2
+	errno@0.3.2
+	glob@0.3.0
+	half@1.8.2
+	hashbrown@0.14.5
+	heck@0.5.0
+	hermit-abi@0.3.2
+	indexmap@2.4.0
+	indoc@2.0.4
+	is-terminal@0.4.9
+	itertools@0.10.5
+	itertools@0.13.0
+	itoa@1.0.2
+	js-sys@0.3.58
+	lazy_static@1.4.0
+	libc@0.2.149
+	linux-raw-sys@0.4.10
+	log@0.4.17
+	memchr@2.7.4
+	memoffset@0.6.5
+	memoffset@0.9.0
+	num-traits@0.2.15
+	once_cell@1.16.0
+	oorandom@11.1.3
+	paste@1.0.15
+	peg-macros@0.8.4
+	peg-runtime@0.8.3
+	peg@0.8.4
+	plotters-backend@0.3.2
+	plotters-svg@0.3.1
+	plotters@0.3.1
+	portable-atomic@1.4.3
+	proc-macro2@1.0.86
+	pyo3-build-config@0.22.2
+	pyo3-ffi@0.22.2
+	pyo3-macros-backend@0.22.2
+	pyo3-macros@0.22.2
+	pyo3@0.22.2
+	quote@1.0.37
+	rayon-core@1.12.1
+	rayon@1.10.0
+	regex-automata@0.4.7
+	regex-syntax@0.8.4
+	regex@1.10.6
+	rustix@0.38.19
+	ryu@1.0.10
+	same-file@1.0.6
+	scopeguard@1.1.0
+	serde@1.0.208
+	serde_derive@1.0.208
+	serde_json@1.0.125
+	serde_spanned@0.6.7
+	syn@1.0.109
+	syn@2.0.75
+	target-lexicon@0.12.15
+	termcolor@1.1.3
+	thiserror-impl@1.0.63
+	thiserror@1.0.63
+	tinytemplate@1.2.1
+	toml@0.8.19
+	toml_datetime@0.6.8
+	toml_edit@0.22.20
+	trybuild@1.0.99
+	unicode-ident@1.0.1
+	unindent@0.2.3
+	walkdir@2.3.2
+	wasm-bindgen-backend@0.2.81
+	wasm-bindgen-macro-support@0.2.81
+	wasm-bindgen-macro@0.2.81
+	wasm-bindgen-shared@0.2.81
+	wasm-bindgen@0.2.81
+	web-sys@0.3.58
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.5
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.48.0
+	windows-targets@0.48.5
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_msvc@0.48.5
+	windows_i686_gnu@0.48.5
+	windows_i686_msvc@0.48.5
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_msvc@0.48.5
+	winnow@0.6.18
+"
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="A concrete syntax tree with AST-like properties for Python"
+HOMEPAGE="
+	https://github.com/Instagram/LibCST/
+	https://pypi.org/project/libcst/
+"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT Apache-2.0 PSF-2"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=dev-python/pyyaml-5.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/black[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+QA_FLAGS_IGNORED="usr/lib/py.*/site-packages/libcst/native.*"
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		libcst/codemod/tests/test_codemod_cli.py::TestCodemodCLI::test_codemod_formatter_error_input
+	)
+	local EPYTEST_IGNORE=(
+		# fuzzing, require hypothesmith
+		libcst/tests/test_fuzz.py
+		# require pyre-check
+		libcst/metadata/tests/test_type_inference_provider.py
+		# requires `python -m libcst.codegen.generate` which has extra
+		# deps and needs patching to work in our venv
+		# TODO: figure out if we don't need that for revdeps anyway
+		libcst/codegen/tests/test_codegen_clean.py
+	)
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# https://github.com/Instagram/LibCST/issues/1278
+				libcst/codemod/commands/tests/test_rename_typing_generic_aliases.py::TestRenameCommand::test_rename_typing_generic_alias
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	# fixtures
+	ln -s "${S}/native" . || die
+
+	nonfatal epytest
+	local ret=${?}
+
+	rm native || die
+
+	[[ ${ret} -ne 0 ]] && die "Tests failed on ${EPYTHON}"
+}
+
+python_test_all() {
+	cd native || die
+	cargo_src_test
+}
diff --git a/dev-python/license-expression/Manifest b/dev-python/license-expression/Manifest
index 56bd4072ea62..49f12de61809 100644
--- a/dev-python/license-expression/Manifest
+++ b/dev-python/license-expression/Manifest
@@ -1 +1,2 @@
 DIST license-expression-30.4.0.gh.tar.gz 172061 BLAKE2B aaa96d1d39feb34bbce92945a61369717d31652794f667406010397f9194f48075406c7bcea1681771ab25c6fb2bd01da9228480a40092925d748f662101538f SHA512 8ea6d9c3be9237a405fef010512ca5bbf7cab4088ae6ac9bc3d4152e92dbfe4fdc5c8c82f9df994524d4622f6be7d58cfeeddfb4ca4c63c527fa94bb5a0a8074
+DIST license-expression-30.4.1.gh.tar.gz 172977 BLAKE2B b09352eee9eac0292a0c1ed11381dfa20979ede10f1bddd794617b7cb414233bd872fa76820202ef18286fbbd6beec81c6a6ca0b9588ed40e00e33fb108948ea SHA512 862024b37e304269522b2cb1bca97ca02491bcd7c402c6e1522e0a275f86fe4ae5ec719c9bdb9bec0e883768a7d138883af04f49ffd7ec44f441c7dc1ca3230a
diff --git a/dev-python/license-expression/license-expression-30.4.1.ebuild b/dev-python/license-expression/license-expression-30.4.1.ebuild
new file mode 100644
index 000000000000..8abef2189088
--- /dev/null
+++ b/dev-python/license-expression/license-expression-30.4.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-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
+
+DESCRIPTION="Parse, compare, simplify and normalize license expressions"
+HOMEPAGE="
+	https://pypi.org/project/license-expression/
+	https://github.com/aboutcode-org/license-expression/
+"
+SRC_URI="
+	https://github.com/aboutcode-org/license-expression/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/boolean-py-4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/linode-metadata/linode-metadata-0.3.0.ebuild b/dev-python/linode-metadata/linode-metadata-0.3.0.ebuild
index 5edf9e7930d6..dde3a8d59e77 100644
--- a/dev-python/linode-metadata/linode-metadata-0.3.0.ebuild
+++ b/dev-python/linode-metadata/linode-metadata-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-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 distutils-r1 pypi
 
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index fef409fa0e6a..b7114fc7aeab 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -10,4 +10,7 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607 SHA512 d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
+DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/dev-python/lit/lit-19.1.7.ebuild b/dev-python/lit/lit-19.1.7.ebuild
new file mode 100644
index 000000000000..f1a116c6f5a6
--- /dev/null
+++ b/dev-python/lit/lit-19.1.7.ebuild
@@ -0,0 +1,46 @@
+# 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 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		llvm-core/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from llvm-core/llvm)
+
+src_prepare() {
+	# flaky test
+	# https://github.com/llvm/llvm-project/issues/72022
+	rm tests/progress-bar.py || die
+
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/lit/lit-20.0.0_pre20241227.ebuild b/dev-python/lit/lit-20.0.0_pre20241227.ebuild
deleted file mode 100644
index cb62066830d4..000000000000
--- a/dev-python/lit/lit-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		llvm-core/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from llvm-core/llvm)
-
-src_prepare() {
-	# flaky test
-	# https://github.com/llvm/llvm-project/issues/72022
-	rm tests/progress-bar.py || die
-
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-20.0.0_pre20250111.ebuild b/dev-python/lit/lit-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..3dfabbc0d46e
--- /dev/null
+++ b/dev-python/lit/lit-20.0.0_pre20250111.ebuild
@@ -0,0 +1,45 @@
+# 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 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		llvm-core/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from llvm-core/llvm)
+
+src_prepare() {
+	# flaky test
+	# https://github.com/llvm/llvm-project/issues/72022
+	rm tests/progress-bar.py || die
+
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/lit/lit-20.0.0_pre20250118.ebuild b/dev-python/lit/lit-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..3dfabbc0d46e
--- /dev/null
+++ b/dev-python/lit/lit-20.0.0_pre20250118.ebuild
@@ -0,0 +1,45 @@
+# 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 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		llvm-core/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from llvm-core/llvm)
+
+src_prepare() {
+	# flaky test
+	# https://github.com/llvm/llvm-project/issues/72022
+	rm tests/progress-bar.py || die
+
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/livereload/Manifest b/dev-python/livereload/Manifest
index 53b81fa8b141..ea86806f48b2 100644
--- a/dev-python/livereload/Manifest
+++ b/dev-python/livereload/Manifest
@@ -1,2 +1 @@
-DIST python-livereload-2.7.0.gh.tar.gz 26138 BLAKE2B 4cb2fd5352cbb68f09c914000e37b8305d66c9735e232e5eccad3ea1016ffc6d3da0846ebce048385f6606ceaa176b8df77461d9a0ca939a2f65d089cec9c3e9 SHA512 676f50b9300e1582177493cef24f4e2b10a4e385d0de780bf9161dee66e3063420338021464477c8079bffd0e4690a4b0d15c71025ebf1959addbaa6e69fa8bb
 DIST python-livereload-2.7.1.gh.tar.gz 26793 BLAKE2B e06bc364c660189d51b9553614e37a70fabeccf16d9af15763b398936e4889e6d7ed760145e424da22da3ff4a0b53cbcc7de8e226a6938025ee5d8dfcfd54410 SHA512 a0c5a316ad5d34518b6ca44cddff51ba45d60a8ba24de767e791aa529e4ab22accf15916321fea755e67f4fd0aecb1e0ed840142662c27c8eaa6cad5dc2a7399
diff --git a/dev-python/livereload/livereload-2.7.0.ebuild b/dev-python/livereload/livereload-2.7.0.ebuild
deleted file mode 100644
index 3d444865528f..000000000000
--- a/dev-python/livereload/livereload-2.7.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P=python-livereload-${PV}
-DESCRIPTION="livereload server in Python"
-HOMEPAGE="
-	https://github.com/lepture/python-livereload/
-	https://pypi.org/project/livereload/
-"
-SRC_URI="
-	https://github.com/lepture/python-livereload/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/tornado[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/furo \
-	dev-python/myst-parser \
-	dev-python/sphinxcontrib-programoutput
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/livereload/livereload-2.7.1.ebuild b/dev-python/livereload/livereload-2.7.1.ebuild
index 5ac19be95fdb..b9ec9c00bc1f 100644
--- a/dev-python/livereload/livereload-2.7.1.ebuild
+++ b/dev-python/livereload/livereload-2.7.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
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/lmdb/Manifest b/dev-python/lmdb/Manifest
index 5855f60da74d..72f599784e84 100644
--- a/dev-python/lmdb/Manifest
+++ b/dev-python/lmdb/Manifest
@@ -1 +1,2 @@
 DIST lmdb-1.5.1.tar.gz 881246 BLAKE2B 49fbb09a3205aa1d3ea82427a03493aa579e201e831a5d61774d130b2600673892fc1b37fc30e5a6614f98e4f9f3672d5351e2a77ba24abd3999c5d5f18a58e9 SHA512 3f5f7e91813fc2a621ea6ec40e4d85c42d996a8424d5181ce5dab4e414ef17e949c6297c41ccd03b8bb749d1038ed8b143ee5d4e93f38ffcde993beeeacd3aea
+DIST lmdb-1.6.2.tar.gz 881434 BLAKE2B 3128bf5a27b89935602d49fb8c8ae951835ae8657c21bc91821253d03ca35642323b6601ad9483599078185516d21bc3299b0281921c6c867f04cee1eb5e0c98 SHA512 60ef1954c44e0f5ce34cb5570402f402dcddbb0bffcd7d2004da489dbc1329705f8e1b2655449335d246dfb88ea58e325351d4b3ab21b62a4e167a6b93911a78
diff --git a/dev-python/lmdb/lmdb-1.6.2.ebuild b/dev-python/lmdb/lmdb-1.6.2.ebuild
new file mode 100644
index 000000000000..f3d9086ff394
--- /dev/null
+++ b/dev-python/lmdb/lmdb-1.6.2.ebuild
@@ -0,0 +1,40 @@
+# 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=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python bindings for the Lightning Database"
+HOMEPAGE="
+	https://github.com/jnwatson/py-lmdb/
+	https://pypi.org/project/lmdb/
+"
+
+LICENSE="OPENLDAP"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+# cffi is used only on pypy, so no dep
+DEPEND="
+	>=dev-db/lmdb-0.9.28:=
+"
+RDEPEND="
+	${DEPEND}
+"
+
+distutils_enable_tests pytest
+
+src_compile() {
+	local -x LMDB_FORCE_SYSTEM=1
+	distutils-r1_src_compile
+}
+
+python_test() {
+	rm -rf lmdb || die
+	epytest tests
+}
diff --git a/dev-python/mapbox-earcut/Manifest b/dev-python/mapbox-earcut/Manifest
index b8e8ab6e6b1c..d8933e4eaec2 100644
--- a/dev-python/mapbox-earcut/Manifest
+++ b/dev-python/mapbox-earcut/Manifest
@@ -1,2 +1 @@
-DIST mapbox_earcut_python-1.0.2.gh.tar.gz 12488 BLAKE2B c5a3f30f5044380979aa579caef3d1bbe55c650bb04740979723561985d7cddb7e10b85b214363b701a5d0ac0135cc646186d35da9f1b1cac2bcd67374121745 SHA512 5d5a4ceebc2cd7cd6492253445ac1f0cb5d0435d58fd0b08c4d4ba7e33643bdfd4d7db5171eac3ae4ece678957cee61c4c09fd4af0ab8fa500681493bfa36894
 DIST mapbox_earcut_python-1.0.3.gh.tar.gz 22851 BLAKE2B d46e199691f123eb3265036596a4b910f653c06c748d8ba280dcf7c1262f8dc73d5f3f56299a0925d3516a4845c924fce4083f12658a68a1a039c02c635b9fe7 SHA512 3700a25de44e73edd762b5cfa0c43fa73ebbf95f811694bfc8bb77f07dc9512c3fb814b409b5ea88c9e1a32cc5272f3ae33c1e4e323afe8b139cf8b96f1edc54
diff --git a/dev-python/mapbox-earcut/mapbox-earcut-1.0.2.ebuild b/dev-python/mapbox-earcut/mapbox-earcut-1.0.2.ebuild
deleted file mode 100644
index 588c246f5c74..000000000000
--- a/dev-python/mapbox-earcut/mapbox-earcut-1.0.2.ebuild
+++ /dev/null
@@ -1,37 +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=( python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P="mapbox_earcut_python-${PV}"
-DESCRIPTION="Python bindings to the mapbox earcut C++ library"
-HOMEPAGE="https://github.com/skogler/mapbox_earcut_python"
-SRC_URI="
-	https://github.com/skogler/mapbox_earcut_python/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-
-DEPEND="
-	dev-python/numpy:=[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-python/pybind11-2.12[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-python/mapbox-earcut/mapbox-earcut-1.0.3.ebuild b/dev-python/mapbox-earcut/mapbox-earcut-1.0.3.ebuild
index d470b4cf86bb..0c00d23c702d 100644
--- a/dev-python/mapbox-earcut/mapbox-earcut-1.0.3.ebuild
+++ b/dev-python/mapbox-earcut/mapbox-earcut-1.0.3.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 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 DEPEND="
 	dev-python/numpy:=[${PYTHON_USEDEP}]
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index 5fc8572f4f0d..f4d42024eb40 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,2 +1,3 @@
-DIST marshmallow-3.23.1.gh.tar.gz 185357 BLAKE2B ac856805e919173a674ac70683bcd75092e5a3ec2a1a82b37f1bb32624e130927a9111ab69c851bba3fcc83960129b6d1eb3429e19fa1a47f07aafab4219ac55 SHA512 5ec3171ebd2fbcad21e831ae5ad6f482f83af8f50d17f7868517d2702b093ff9084eb29c0e9e64a9619dcbfa96cda226a916a2078a74796c6eafbaebb5fc6176
-DIST marshmallow-3.23.2.gh.tar.gz 184949 BLAKE2B b144ffa2715979e7ab824d7b538cebca00d904c78a24255e9843dec6698698a65b5a8ba38cb0c7dddacf15c141e2ac87c372d0295ce2f9fe1824fbc50ef13343 SHA512 6f000799175b82d4de49a12074fedb62276b703652992d92b431896470d59f545486a02e842492dee7b20382deee28cdd395e5ab7d921d872704e28bf61d6971
+DIST marshmallow-3.24.2.gh.tar.gz 184933 BLAKE2B 0b35eee9c70583875f01d9694322ade0945f1b4e9ef4858e18abffe9dcbe68a6a05eb1d9ff4a9366910ded32d6ce18bf0b948db6344fffb3f62d1e2b3cdf9983 SHA512 250497e3fb6b32f4ef103732c2231659db63fa2f7a2c8173b31bbc8a5d40a67cfabbec03af72187f99d92e6c659a6b9ee699fc2a4ff052874eb41cdfb28b7626
+DIST marshmallow-3.25.0.gh.tar.gz 185182 BLAKE2B 9e560ec5b7a4f1a34d37bbf544edd3cdfdf59ce8bf3fa73a5bd15b85eaecdc59130892e42d91f668230505a7aa3d94527282e7bf2f39097389bf8aa795ee4e6e SHA512 b00e9a13a3ccf08baeb8ad85f2c68462ddecb891d76a8e91974d4cebda63c1299fc3a7bd1d41fb7b7fc73b0eee4831630bb6023b68f3f288e86d566f04d7e533
+DIST marshmallow-3.25.1.tar.gz 217295 BLAKE2B 73f6b1e7430f44bc3ea70c35ae5f5a3d219d6a89b53785ab7c32ec223714cd085822f3f41fef10e5af602ae64fab26d67ba49c2f7ef1f3ac24e8c406e3e18ff1 SHA512 7f67ec90ce4b8933d8e6b3aaac66de314d249b314cde85c2489644271426624136334daaea4aabfda638cb156bcbaf685c9a10e5fd7ecd7f008a0d4bd5a6a72d
diff --git a/dev-python/marshmallow/marshmallow-3.23.1.ebuild b/dev-python/marshmallow/marshmallow-3.23.1.ebuild
deleted file mode 100644
index f7d269422f0f..000000000000
--- a/dev-python/marshmallow/marshmallow-3.23.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for converting to and from native Python datatypes"
-HOMEPAGE="
-	https://github.com/marshmallow-code/marshmallow/
-	https://pypi.org/project/marshmallow/
-"
-SRC_URI="
-	https://github.com/marshmallow-code/marshmallow/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-17.0[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/marshmallow/marshmallow-3.23.2.ebuild b/dev-python/marshmallow/marshmallow-3.23.2.ebuild
deleted file mode 100644
index f7d269422f0f..000000000000
--- a/dev-python/marshmallow/marshmallow-3.23.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for converting to and from native Python datatypes"
-HOMEPAGE="
-	https://github.com/marshmallow-code/marshmallow/
-	https://pypi.org/project/marshmallow/
-"
-SRC_URI="
-	https://github.com/marshmallow-code/marshmallow/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-17.0[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/marshmallow/marshmallow-3.24.2.ebuild b/dev-python/marshmallow/marshmallow-3.24.2.ebuild
new file mode 100644
index 000000000000..d2c01dd970e1
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.24.2.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=flit
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for converting to and from native Python datatypes"
+HOMEPAGE="
+	https://github.com/marshmallow-code/marshmallow/
+	https://pypi.org/project/marshmallow/
+"
+SRC_URI="
+	https://github.com/marshmallow-code/marshmallow/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-17.0[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/marshmallow/marshmallow-3.25.0.ebuild b/dev-python/marshmallow/marshmallow-3.25.0.ebuild
new file mode 100644
index 000000000000..d2c01dd970e1
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.25.0.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=flit
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for converting to and from native Python datatypes"
+HOMEPAGE="
+	https://github.com/marshmallow-code/marshmallow/
+	https://pypi.org/project/marshmallow/
+"
+SRC_URI="
+	https://github.com/marshmallow-code/marshmallow/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-17.0[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/marshmallow/marshmallow-3.25.1.ebuild b/dev-python/marshmallow/marshmallow-3.25.1.ebuild
new file mode 100644
index 000000000000..00c37a86fba2
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.25.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A library for converting to and from native Python datatypes"
+HOMEPAGE="
+	https://github.com/marshmallow-code/marshmallow/
+	https://pypi.org/project/marshmallow/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-17.0[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/matplotlib/matplotlib-3.10.0.ebuild b/dev-python/matplotlib/matplotlib-3.10.0.ebuild
index 118d1707c8a9..389bbe80a27d 100644
--- a/dev-python/matplotlib/matplotlib-3.10.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.10.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
@@ -29,7 +29,7 @@ SRC_URI+="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="cairo excel gtk3 latex qt6 tk webagg wxwidgets"
 
 DEPEND="
diff --git a/dev-python/mcbootflash/Manifest b/dev-python/mcbootflash/Manifest
index 098cfe031457..1e3fdb0c0bfd 100644
--- a/dev-python/mcbootflash/Manifest
+++ b/dev-python/mcbootflash/Manifest
@@ -1,3 +1,3 @@
 DIST mcbootflash-10.0.0.tar.gz 43202 BLAKE2B 78ddf1a0711a5147ecc55abbbeb2a220d41981ef547e609b0360ac2966f21826d7e0a11d324f82476af97501412dcfd7a72f4c593810f94c83d43d993588dc89 SHA512 5dd765af0dfb106e009f06d677cc892a53cd66611194cf4a990358d7060f3e13919132fdba8d91c5ed7523b0e25eb62553576e875e8976fc0890a148a7abe9b7
-DIST mcbootflash-9.0.1.tar.gz 26858 BLAKE2B d8d8486a8713d46f7b93443dcfd9cbd9a93452fa7c8e76aeba1f4bfbf52765fbe3807fe8206b994015c094f9fba1626d5a3bb2fa93bd6b6400a9cbaaee7c19a9 SHA512 0c001a0a2c10e9d4bf111136d08ec89c4bc62568934ef9d8b75d7c58d59f451f5459ccc387c72424e8d16c5e49e7bba903efce403f41923ca33d87c2290a84e9
-DIST test_mcbootflash.jsonl 9259 BLAKE2B d05287760b3dc82ccf720a140390e027758a4e1e79d72364aed741937298d872127f11db8d5a4c07a93cb72f091ab89bd606062446f9108359205ec75c92321f SHA512 b9f5ea649a8cff9ea576b96e22bb352c61f8cd1f3e7ca0a7a0ae84a2c03fa07b1ecc7a3d8a83de868e4f946ef9fb22a5fc757038be4c5ba2398c483c67bbd9ca
+DIST mcbootflash-10.1.0.tar.gz 44252 BLAKE2B d6fe39af1dfc253a376f7ea9dd5948af9fc3eb16b43da517377ee395b34b33de1a27c044a6e406d39ec1109158e0e436b29d67b05bae150b14856f93c24ff70e SHA512 256464c27a8173d2aa42e120354e51bf992dd7c6905ff45ded61952edb6057b795b8c0dcb0cfb954b8b1fd9fd9a5a9449390671487d6b225eead842538b956a7
+DIST mcbootflash-10.1.1.tar.gz 44977 BLAKE2B 144c4d8b7db6e35e09c6c023b7f956a6f5ec2e7cc2bf6eca2a136470268c74d6e146b5b260b3318c427b194ec99020c17128ea0ad6a72e181d81e4f4f1c1c813 SHA512 6784901e57444f61afcc0fe0e67f8171be676da68c5d188aeb132ea82bbdd936badbfcd31bf126e8cd275762aa7899447600620c08c9b6a81a91c88e679e0926
diff --git a/dev-python/mcbootflash/mcbootflash-10.0.0-r1.ebuild b/dev-python/mcbootflash/mcbootflash-10.0.0-r1.ebuild
index 18cf8d46b0dc..6db6251695a2 100644
--- a/dev-python/mcbootflash/mcbootflash-10.0.0-r1.ebuild
+++ b/dev-python/mcbootflash/mcbootflash-10.0.0-r1.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=dev-python/bincopy-20.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mcbootflash/mcbootflash-10.1.0.ebuild b/dev-python/mcbootflash/mcbootflash-10.1.0.ebuild
new file mode 100644
index 000000000000..a8038a51f99f
--- /dev/null
+++ b/dev-python/mcbootflash/mcbootflash-10.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Flash firmware to devices running Microchip's 16-bit bootloader"
+HOMEPAGE="
+	https://pypi.org/project/mcbootflash/
+	https://github.com/bessman/mcbootflash/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/bincopy-20.0.0[${PYTHON_USEDEP}]
+	dev-python/datastructclass[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-reserial[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p reserial --replay
+}
diff --git a/dev-python/mcbootflash/mcbootflash-10.1.1.ebuild b/dev-python/mcbootflash/mcbootflash-10.1.1.ebuild
new file mode 100644
index 000000000000..a8038a51f99f
--- /dev/null
+++ b/dev-python/mcbootflash/mcbootflash-10.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Flash firmware to devices running Microchip's 16-bit bootloader"
+HOMEPAGE="
+	https://pypi.org/project/mcbootflash/
+	https://github.com/bessman/mcbootflash/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/bincopy-20.0.0[${PYTHON_USEDEP}]
+	dev-python/datastructclass[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-reserial[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p reserial --replay
+}
diff --git a/dev-python/mcbootflash/mcbootflash-9.0.1.ebuild b/dev-python/mcbootflash/mcbootflash-9.0.1.ebuild
deleted file mode 100644
index 47a2cf61611b..000000000000
--- a/dev-python/mcbootflash/mcbootflash-9.0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Flash firmware to devices running Microchip's 16-bit bootloader"
-HOMEPAGE="
-	https://pypi.org/project/mcbootflash/
-	https://github.com/bessman/mcbootflash/
-"
-SRC_URI+="
-	https://github.com/bessman/mcbootflash/raw/eb940f0324eb0c6822a0feca48449f5191cf5a00/tests/test_mcbootflash.jsonl
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=dev-python/bincopy-20.0.0[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-reserial[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	# sigh, pytest-reserial arbitrarily changed output format
-	# without caring for backwards compatibility
-	cp "${DISTDIR}"/test_mcbootflash.jsonl "${S}"/tests/ || die
-}
-
-python_test() {
-	epytest --replay
-}
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index d3817492ccb5..384574121def 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,2 +1,4 @@
 DIST miniupnpc-2.2.8.tar.gz 104603 BLAKE2B eae4d97bdf8c494ea6744edfeb870f9d92df8468d23f974e0e44e735fc7c8925189ea58f60a71c37315aebff1269ae69e9413cdf80dc292c4b90df5f12bf58a4 SHA512 526c9df1485302d4c9c78062fb058cfd433463f6e7a9f4025a9f5228aef41ee61a4b9e7a76b6cfa8779b91cc3c663846a997dc1470902d7108b129155e6a3360
 DIST miniupnpc-2.2.8.tar.gz.sig 543 BLAKE2B b4d056972fc7e46c1e41a658d301db8e9a0d3b99af2220c264d06267b4e8ae45847e2bf2cd6583fded67f12c2e0a3c833ba7e38d9c05b5a0cc363e0c1fc8feae SHA512 b5eec0d24a84183021cd16bfd6ecedda587dee0bbb017fe6d107e8c2815ef90cf5f904c6fb9aa32e2e4d5f0b63de8566814c9a0d921b338b26b60ea35c23ecae
+DIST miniupnpc-2.3.0.tar.gz 105071 BLAKE2B a5a2d22d99eb9f20fcb0b61107db61b97fec8207f5d8079c7d8e1d7bbc73478c3b575c7ecf32cb3ffe64f82a93673ab1f734139755c512d48439358e314e8762 SHA512 63efda015c7f693499a6f1f28b8356c4bb05ed0354fe2fb79042295607bf4f12c15082a48ced348ca5647fca9d83b99068c28311623f46225e9b09b5dc23a290
+DIST miniupnpc-2.3.0.tar.gz.sig 543 BLAKE2B acbc2fedd1984e2488aac4618a70b2f0e5573ab17beaa84660117fada915b9ee94e419ee4ddbeae30c04e4eff8749d2a8724b4826bd5ce8ac972908fbda1189c SHA512 081d6c77fb08863760e4ddeb5bc1a5414603782b785f1f86efe516e59a113a4da794895ad160922818574029189df32a0c57fe2558c2ce99d521aa2673d40d43
diff --git a/dev-python/miniupnpc/miniupnpc-2.3.0.ebuild b/dev-python/miniupnpc/miniupnpc-2.3.0.ebuild
new file mode 100644
index 000000000000..8279a83834a9
--- /dev/null
+++ b/dev-python/miniupnpc/miniupnpc-2.3.0.ebuild
@@ -0,0 +1,52 @@
+# 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} pypy3 )
+
+inherit distutils-r1 verify-sig
+
+MY_P=${P/python-}
+DESCRIPTION="Python bindings for UPnP client library"
+HOMEPAGE="
+	http://miniupnp.free.fr/
+	https://miniupnp.tuxfamily.org/
+	https://github.com/miniupnp/miniupnp/
+"
+SRC_URI="
+	https://miniupnp.tuxfamily.org/files/${MY_P}.tar.gz
+	verify-sig? (
+		https://miniupnp.tuxfamily.org/files/${MY_P}.tar.gz.sig
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	>=net-libs/miniupnpc-${PV}:0=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	verify-sig? ( sec-keys/openpgp-keys-miniupnp )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/miniupnp.asc
+
+PATCHES=(
+	"${FILESDIR}"/miniupnpc-2.2.3-shared-lib.patch
+)
+
+# DOCS are installed by net-libs/miniupnpc.
+DOCS=()
+
+# Example test command:
+# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
+distutils_enable_tests import-check
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index 79c0a1158aaf..f6884f8965ae 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,2 +1 @@
-DIST mistune-3.0.2.tar.gz 90840 BLAKE2B bc4f477b24c8244d2fb7032835b3dc3bfc0bda8948fabbfa78660f77c861df76f9e01abcb58f8643efd689482fe3a187995cc92dd7cd0b7817ad799237d9b72d SHA512 9a7e0e2886afddb8a6e314af1e4ed6e41f886f64823713f941b6a713a29986044ac66c437c4029e0fbf20224d106ce445a46906825b20b17b9e2ff6173476d28
 DIST mistune-3.1.0.tar.gz 94401 BLAKE2B e1e6f17c5aa378998bec8a8480c8b311243e067f52a9da6b451db33c639ec5a69f6d8b3c815bf9582b0b9c9a7aff3d197ab9bf477c634805eb704c0bbdaebe67 SHA512 2532565f15c1563547db131e28ea373a76dc5ab96b98a0f2f156709e625953f6f52a9e7b216e235b17ab09b282dfea8ee82c3975d9a08a0f52463b235e5589d8
diff --git a/dev-python/mistune/mistune-3.0.2.ebuild b/dev-python/mistune/mistune-3.0.2.ebuild
deleted file mode 100644
index 6a71a0698fe6..000000000000
--- a/dev-python/mistune/mistune-3.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="The fastest markdown parser in pure Python"
-HOMEPAGE="
-	https://github.com/lepture/mistune/
-	https://pypi.org/project/mistune/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mistune/mistune-3.1.0.ebuild b/dev-python/mistune/mistune-3.1.0.ebuild
index f5c3a1861e8f..07718f2b8a0c 100644
--- a/dev-python/mistune/mistune-3.1.0.ebuild
+++ b/dev-python/mistune/mistune-3.1.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/mkdocs-autorefs/Manifest b/dev-python/mkdocs-autorefs/Manifest
index 88599132298b..cc74ba41d66c 100644
--- a/dev-python/mkdocs-autorefs/Manifest
+++ b/dev-python/mkdocs-autorefs/Manifest
@@ -1,3 +1,2 @@
-DIST mkdocs_autorefs-1.0.1.tar.gz 17743 BLAKE2B 400a640bf200276744b2ad8694cfc37818526e725c9c5b551ad585c2f6dc2edc63f253228c6717a44d86c912d9dbe9625569fce716d6ca7041cd777046fd11d2 SHA512 2494cea8bee86f2d996347a71f775ec428d76f7cc2060e51b6d8df573fbabc6c848d3055636e81329236ea4aa14fa7b97070e1d3af93d5a7242118be7c02629d
-DIST mkdocs_autorefs-1.1.0.tar.gz 36989 BLAKE2B c094b0d2ff7ea9ccbdca0732bc2dd4a99f229f220117467bf22dd894098d51b56d25a5abafd0420cb3bb10028c05ec5cc5537dfdc1830d642f129999833bda7b SHA512 a75848ab0885fcd65242891a2169129243222c733d2e5978f53043a27999f913560a40868e17cfa1f580114e48392ae098cb37eb1c2e234365652d52f4ece9b4
 DIST mkdocs_autorefs-1.2.0.tar.gz 40262 BLAKE2B 5f066c3a3b917eeba7c45c013ecf3067f4b669fd1a74b4471dfb1df20c2eab67909e99470822a986b0632b97ab81d9cb8db67e32816721beafbc7d2f02a3b881 SHA512 f0be27246af229a3d0b5daf33083dba0ddb604ded1624fb28fe1f5f2d120669975948e620ee4f3dcde48af83199fe1cfb96e37db74ff60825bc018206fb1ce17
+DIST mkdocs_autorefs-1.3.0.tar.gz 42597 BLAKE2B a07555f714578b2a88d98ed4201542a23fd0ed4f5b686cefe9571cf876e02c5f949fb92d2f02ac6e13d4d234afcc648bc52078b4ad18c2f372b1a5f9d719cf68 SHA512 a140f4ce6fa2e2b5a6174b7ad808ee300819d5edf4e8b421faa09de8bfaaaa450d04aa9c9bc3d1aeea4cf27fccdfdb04a504f4101e7e1200c6a62111e036912d
diff --git a/dev-python/mkdocs-autorefs/mkdocs-autorefs-1.0.1.ebuild b/dev-python/mkdocs-autorefs/mkdocs-autorefs-1.0.1.ebuild
deleted file mode 100644
index 97383ef46311..000000000000
--- a/dev-python/mkdocs-autorefs/mkdocs-autorefs-1.0.1.ebuild
+++ /dev/null
@@ -1,34 +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} pypy3 )
-DISTUTILS_USE_PEP517=pdm-backend
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Automatically link across pages in MkDoc"
-HOMEPAGE="
-	https://mkdocstrings.github.io/autorefs/
-	https://github.com/mkdocstrings/autorefs/
-	https://pypi.org/project/mkdocs-autorefs/
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/markdown-3.3[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-		>=dev-python/pymdown-extensions-10.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-autorefs/mkdocs-autorefs-1.1.0.ebuild b/dev-python/mkdocs-autorefs/mkdocs-autorefs-1.1.0.ebuild
deleted file mode 100644
index 97383ef46311..000000000000
--- a/dev-python/mkdocs-autorefs/mkdocs-autorefs-1.1.0.ebuild
+++ /dev/null
@@ -1,34 +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} pypy3 )
-DISTUTILS_USE_PEP517=pdm-backend
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Automatically link across pages in MkDoc"
-HOMEPAGE="
-	https://mkdocstrings.github.io/autorefs/
-	https://github.com/mkdocstrings/autorefs/
-	https://pypi.org/project/mkdocs-autorefs/
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/markdown-3.3[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-		>=dev-python/pymdown-extensions-10.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-autorefs/mkdocs-autorefs-1.3.0.ebuild b/dev-python/mkdocs-autorefs/mkdocs-autorefs-1.3.0.ebuild
new file mode 100644
index 000000000000..a7e84f238896
--- /dev/null
+++ b/dev-python/mkdocs-autorefs/mkdocs-autorefs-1.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+DISTUTILS_USE_PEP517=pdm-backend
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Automatically link across pages in MkDoc"
+HOMEPAGE="
+	https://mkdocstrings.github.io/autorefs/
+	https://github.com/mkdocstrings/autorefs/
+	https://pypi.org/project/mkdocs-autorefs/
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RDEPEND="
+	>=dev-python/markdown-3.3[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
+		>=dev-python/pymdown-extensions-10.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 0f7558c46308..0625f86ab2b5 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,2 +1,2 @@
-DIST mkdocs-material-9.5.47.gh.tar.gz 14708561 BLAKE2B ea3ac2df6f88d3c9b8ebd9bbbe5b6d0bf826fe3ebe733f8a84d532becbbfa66e0c11aa069da9571810593405d91e5d4e45ea0aad158ca1a956cb18c9f7fa9f13 SHA512 3ccce10161552c70276255a25e4467064de4adc92e38ec77e244ae140e9e58fa95144c5667116de89b41807df875ad3bb988685eec37e1285534367a6b4e9d76
 DIST mkdocs-material-9.5.49.gh.tar.gz 14750118 BLAKE2B dfa64a6e61363edc8829a5a97c7990d59e1f48d1a11c60085396471f38f3dbe5930550b0859c06ee2d7d3d5c593b7eeddd755cff765847fbc998c8ad1852fa19 SHA512 7b2121fcf5aeace241ccaa8c4d97cd1492fcf0b2c829945656beb140a2f132955cc80b5448e6ceee932fcacec3870deca693411152ef2ceec3032d30a688ac11
+DIST mkdocs-material-9.5.50.gh.tar.gz 14753521 BLAKE2B 3d4b98bdd89d3e106f5cbd78b4deb639164991da1adb5b0dc141c7feb1b07a08466daba7793e3cc46b7db5c26bb6c46ebe3635dfc4e9f943318eff829eced6e8 SHA512 1a24b97deb43e92de7ffac52f7b3a1139f26ae112e6a9218d1a31ac8f07e250bfd0905b95d3d01f3ad5daf12246b4aa98d852fac3cecc7e5dc60b1337b820ec7
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.47.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.47.ebuild
deleted file mode 100644
index d1977cb2e919..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.47.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="social"
-
-RDEPEND="
-	>=dev-python/babel-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja2-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
-	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	social? (
-		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
-		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
-"
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.49.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.49.ebuild
index 1ad2af7ab97d..7b13384c1bc7 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.49.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.49.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
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="social"
 
 RDEPEND="
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.50.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.50.ebuild
new file mode 100644
index 000000000000..8b4499b238b5
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.50.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material/
+	https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="social"
+
+RDEPEND="
+	>=dev-python/babel-2.10.3[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
+	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
+	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
+	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
+	social? (
+		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
+		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
+"
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# simplify pyproject to remove extra deps for metadata
+	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+	echo "__version__ = '${PV}'" > gentoo_version.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/mkdocs-pymdownx-material-extras/Manifest b/dev-python/mkdocs-pymdownx-material-extras/Manifest
index 9b794ebdf435..dbd975b3986b 100644
--- a/dev-python/mkdocs-pymdownx-material-extras/Manifest
+++ b/dev-python/mkdocs-pymdownx-material-extras/Manifest
@@ -1 +1,2 @@
 DIST mkdocs_pymdownx_material_extras-2.6.tar.gz 25412 BLAKE2B 8b62aa93ec57ea5607436905877c0d125c6ee8e2a79148ae146e907b54c77cd2581274958eb73cd44b4f664e1c798749ecc97e8b4e362fd5bff2fddd86734116 SHA512 a7aa7a83c53bc9f0c6d428fcdd935320c09b203690a7cd60ed45b24f3d9ce6f7276772f21e9b0f44ba9ecba578fb8890d0312ba07357c1825a2ead775a411f99
+DIST mkdocs_pymdownx_material_extras-2.7.tar.gz 25619 BLAKE2B 5be865ef8d4c5dbcdebaee9ee36d239b40e5bc3df5241c9f3fc036a26fc54cc93f328b4dfdfdbb8e5df018e72c783c5a6c7ec80831e1aba95cdf1fc2be7a13ce SHA512 3fac8fed8e045e8e98eaf024a53d5522a4cd42b62c140ece98f2c6615fcfdaf5e2670d91aa90abe9e3c9dcea56657c0f0379b24b08eda0cca263034f006dcb46
diff --git a/dev-python/mkdocs-pymdownx-material-extras/mkdocs-pymdownx-material-extras-2.7.ebuild b/dev-python/mkdocs-pymdownx-material-extras/mkdocs-pymdownx-material-extras-2.7.ebuild
new file mode 100644
index 000000000000..446ec3a86409
--- /dev/null
+++ b/dev-python/mkdocs-pymdownx-material-extras/mkdocs-pymdownx-material-extras-2.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Custom alterations based on Mkdocs-Material"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs_pymdownx_material_extras/
+	https://pypi.org/project/mkdocs-pymdownx-material-extras/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-material-8.3.3[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/ml-dtypes/Manifest b/dev-python/ml-dtypes/Manifest
index eb3d041189c8..2b8e67db9f36 100644
--- a/dev-python/ml-dtypes/Manifest
+++ b/dev-python/ml-dtypes/Manifest
@@ -1,2 +1,3 @@
 DIST eigen-7bf2968fed5f246c0589e1111004cb420fcd7c71.tar.bz2 2239233 BLAKE2B 3a7e81c302cb11ae1d6ef9433a9ec41506c1f37d04cfb8744ac3fcf7dbe9430c1b48d7197ca3b8e1f9354398bac3d0dbc3e0599c0b649acd6175e906befe2973 SHA512 29ee89770726e6e0f5135b7fab24649f3e69223caed90d2daa6f0014783e69fe98f0551de49bd4e393d7b7938f2943caf1ed00f3933fa771ac14fae3c63fd5dd
 DIST ml_dtypes-0.5.0.gh.tar.gz 86170 BLAKE2B a289490fd6d06801965cc72d1abfe4a3b8b48459462bc4ae73a3ace2b4385f26b46081d924c02e1342a18eb98db2df33e3dd77284e40f2357a209a85010071f3 SHA512 20b2677c1e69b9ea298ac7d8ccfee3f0d19b847a805efa183ba04845e1a1697e9030abe00d6e8a4d46981df14c8d5986bcbc3b4e0f36eef2aee1cd04e3996bfe
+DIST ml_dtypes-0.5.1.gh.tar.gz 86384 BLAKE2B 1989df40221262784983732067946bc1ac51c44db27e54d30471884508f080403107c811d33940b2de27a1cea5d5928bebdfc96b987c36d71b7f8f81f68c4615 SHA512 d0fab3492ad9f8caeec665c026baca9eca7a15fcb032267ff57d9c9b6eccb852e6659b4f7bd25f64b50974b5a93f5be9ec68ab1746ede286f22d60c13a7d2d4c
diff --git a/dev-python/ml-dtypes/ml-dtypes-0.5.1.ebuild b/dev-python/ml-dtypes/ml-dtypes-0.5.1.ebuild
new file mode 100644
index 000000000000..e0843af55970
--- /dev/null
+++ b/dev-python/ml-dtypes/ml-dtypes-0.5.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2024-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} )
+
+inherit distutils-r1
+
+MY_P=${PN/-/_}-${PV}
+EIGEN_CommitId="7bf2968fed5f246c0589e1111004cb420fcd7c71"
+
+DESCRIPTION="A stand-alone implementation of several NumPy dtype extensions"
+HOMEPAGE="
+	https://github.com/jax-ml/ml_dtypes/
+	https://pypi.org/project/ml-dtypes/
+"
+SRC_URI="
+	https://github.com/jax-ml/ml_dtypes/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+	https://gitlab.com/libeigen/eigen/-/archive/${EIGEN_CommitId}/eigen-${EIGEN_CommitId}.tar.bz2
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND="
+	>=dev-python/numpy-1.21:=[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	test? (
+		dev-python/absl-py[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	rmdir third_party/eigen || die
+	mv "${WORKDIR}/eigen-${EIGEN_CommitId}" third_party/eigen || die
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	mv ml_dtypes/tests . || die
+	rm -r ml_dtypes || die
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	distutils-r1_src_test
+}
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 2cb8e7dac33b..585448cbb56a 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1 +1,2 @@
 DIST more-itertools-10.5.0.tar.gz 121020 BLAKE2B 16ab278873f4d7de97f61a2e865ff8561baa0aacd743c7483138c3dc7c8a219609ae80a0ff30bfc22f7064bfed45d764f17e35c2780ac6caf3a24231ab544e9b SHA512 fdb56b6bce26b335da61ae3a4bd0154a78389786132f62eaea53f0e8ee603c5609e35c69baccaac57935e81f839409b70f94cb8bbab9d541b0964a2c929c8168
+DIST more-itertools-10.6.0.tar.gz 125009 BLAKE2B f4bade093a730f7daf035d698bfb0fb8f0f8aa6832546e30f9e6d0c39aef96e9cd326d73682c7fa5458f7e75511d759c443a58fed96e831d11375818abb020d8 SHA512 57322c80252e79d1ef82fe5cfc3a3f0208ab6f90d2e59c47491974c23fc30ad1b48d1671c06507b0489b2bdb240c52dee5419a19b96ae06a3d2bdb3a3b483eab
diff --git a/dev-python/more-itertools/more-itertools-10.6.0.ebuild b/dev-python/more-itertools/more-itertools-10.6.0.ebuild
new file mode 100644
index 000000000000..3fe77bf8eaaf
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-10.6.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="
+	https://github.com/more-itertools/more-itertools/
+	https://pypi.org/project/more-itertools/
+"
+
+LICENSE="MIT"
+SLOT="0"
+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"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests unittest
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 835bf2806f2e..4d0962bff59a 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,4 +1,4 @@
 DIST moto-4.2.14.tar.gz 4933741 BLAKE2B 4c50a808dc8f27cfbcd0ba234d268084ee9a32f36cb5d6af61aacc4ee79f7bf5cf1045147c4642472129eee37bef8bc2c1953d140260d39d7f333ae0f5e5cf95 SHA512 d4079118ed1d2eef9134575e33dc0ed749bff0293d753baa63a630dbb987914b9933445027abdc344bb93fa1d6e483baf8a337a444c9dd055dda50b095ff9937
-DIST moto-5.0.22.tar.gz 6303034 BLAKE2B 6607f14c2246a63c289ee0ab6b4168a5446e46a9616f680fc2f1ece70a413d0e31d3e078a108556e723e5b4b08657161e1e2224bc602ca60d6c5e935f37af50c SHA512 3f5dcf4f514e7c0864b9a29b26f795505d4604a26c4e062fab4f0414c7a8e009542957ca3c3c6e763e6bccdbd22b74791f3a01f6a52b87a155fe804efeaf9167
-DIST moto-5.0.24.tar.gz 6326457 BLAKE2B 0bf61468c8f85d0a202710f668a07428ffbe07e463a9972cc1f319776410c946692765150fddf7bb36088f6e10ce6e328cce58e87f1d340321f46c771239e753 SHA512 0a583bf9fdf7dd962e7584c719db597169f90161c07802209e2865ff1da748ebe31a303a24908942e3a741426de8eed49f5e332e6755a9e923009f50e24307ed
 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
diff --git a/dev-python/moto/moto-5.0.22.ebuild b/dev-python/moto/moto-5.0.22.ebuild
deleted file mode 100644
index 3f1227ba7392..000000000000
--- a/dev-python/moto/moto-5.0.22.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi 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-3.3.1[${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/jsondiff-1.1.2[${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.15.0[${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/moto/moto-5.0.24.ebuild b/dev-python/moto/moto-5.0.24.ebuild
deleted file mode 100644
index 2d270d4224ac..000000000000
--- a/dev-python/moto/moto-5.0.24.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi 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/jsondiff-1.1.2[${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.15.0[${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/moto/moto-5.0.25.ebuild b/dev-python/moto/moto-5.0.25.ebuild
index 9d641364f6ee..3eeb7a2602d8 100644
--- a/dev-python/moto/moto-5.0.25.ebuild
+++ b/dev-python/moto/moto-5.0.25.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-5.0.26.ebuild b/dev-python/moto/moto-5.0.26.ebuild
new file mode 100644
index 000000000000..a570f166ecd8
--- /dev/null
+++ b/dev-python/moto/moto-5.0.26.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.15.0[${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/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/msgpack/Manifest b/dev-python/msgpack/Manifest
index 3bd4a08cf02e..a473d0b0ab38 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1,2 +1 @@
-DIST msgpack-1.0.8.tar.gz 167014 BLAKE2B 714b0355941104e791c5a3b8ee2bd4f40b11484631a3bde63e7c0bdbb925a603c4704b037ab437c2330dc0d2e466d41ccfd50c6a45ef798e5cd34a87e4e3863f SHA512 b739667d4384ba0e18a4e55de6033933822180eb5d28bd7f5ecd7e7da112a214f400740feb45de6f0873d12c8b062b1a8b9b9e5939c2961a8c9585f282645c5b
 DIST msgpack-1.1.0.tar.gz 167260 BLAKE2B fd6497ce248fabae481de41cb27bccf001e75425564f16caff9f5dceb52d82949481589a92635f4c25178f03002daf604073fc2bb07c8133e81a8ee2f1ccb7c4 SHA512 2af3a6ae9a68a0261bf1cbb5ca6925004b421241c445d17023976fe38738049458937a578828cdf3c1f2fd19dfbbcceb21762957bfd459d6862adb110cad3faa
diff --git a/dev-python/msgpack/msgpack-1.0.8.ebuild b/dev-python/msgpack/msgpack-1.0.8.ebuild
deleted file mode 100644
index 5b71941535d4..000000000000
--- a/dev-python/msgpack/msgpack-1.0.8.ebuild
+++ /dev/null
@@ -1,51 +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=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="MessagePack (de)serializer for Python"
-HOMEPAGE="
-	https://msgpack.org/
-	https://github.com/msgpack/msgpack-python/
-	https://pypi.org/project/msgpack/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="+native-extensions"
-
-# extension code is relying on CPython implementation details
-BDEPEND="
-	native-extensions? (
-		$(python_gen_cond_dep '
-			>=dev-python/cython-3.0.8[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Remove pre-generated cython files
-	rm msgpack/_cmsgpack.cpp || die
-
-	# native-extensions are always disabled on PyPy
-	# https://github.com/msgpack/msgpack-python/blob/main/setup.py#L76
-	if ! use native-extensions ; then
-		export MSGPACK_PUREPYTHON=1
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf msgpack || die
-	epytest
-}
diff --git a/dev-python/msgpack/msgpack-1.1.0.ebuild b/dev-python/msgpack/msgpack-1.1.0.ebuild
index e2222cf1cab3..be029b87a600 100644
--- a/dev-python/msgpack/msgpack-1.1.0.ebuild
+++ b/dev-python/msgpack/msgpack-1.1.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 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="+native-extensions"
 
 # extension code is relying on CPython implementation details
diff --git a/dev-python/mygpoclient/Manifest b/dev-python/mygpoclient/Manifest
index 5102e2f47f4d..48baf54ffabe 100644
--- a/dev-python/mygpoclient/Manifest
+++ b/dev-python/mygpoclient/Manifest
@@ -1,3 +1 @@
 DIST mygpoclient-1.10.gh.tar.gz 44992 BLAKE2B 395fd80bc5c29d16cc02a84a5e763c51f9ef1e4363a56d847f173acf1c01c08591fab9219372bd5f82dfe62ce26037f82697ac844299d40b5077f8700d63895c SHA512 65af230ad86da9dd93023b17737774fcdbd1622c7623cf1934cb63a3e63fad642faecfd2f00461830e492fe14cc61cc47f92a0b0e3970961be1714cffb71255d
-DIST mygpoclient-1.9.gh.tar.gz 44998 BLAKE2B 5feb17fbcdd02c632a11d9ae685b099addd2fed056e72d532e6391b707cfc46e694182ea4e5d7334be10796b5bb19b2d8cbceafe0b69798206f5ec41ca337913 SHA512 57502295725d3a1351e877998442141dd596927215d3746786c12db061ebe3bdf8282e8b2d554997515a558f608c0815e4caad311ad3f1ea9f5b62321e8d6635
-DIST mygpoclient-pr19.patch 32982 BLAKE2B b0103372aaea9c83a45a035d3e32e6e0d3297370e7e6dd93996a14cec7f3f1723c4e0a4dca943b346fe6ce976aaea90d51478cdb3ee0218612fe28c36153047d SHA512 b816ee676c62e696f0bc14f06a60ee2a276d21b0ffb781a0d800042c64e16bee972a56c348c9dde203a0d41fc4f403d707a15bf197ea47d952ba753e659f26ab
diff --git a/dev-python/mygpoclient/mygpoclient-1.9-r1.ebuild b/dev-python/mygpoclient/mygpoclient-1.9-r1.ebuild
deleted file mode 100644
index c031351e15ca..000000000000
--- a/dev-python/mygpoclient/mygpoclient-1.9-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A gpodder.net client library"
-HOMEPAGE="
-	https://github.com/gpodder/mygpoclient/
-	https://pypi.org/project/mygpoclient/
-	https://mygpoclient.readthedocs.io/en/latest/
-"
-SRC_URI="
-	https://github.com/gpodder/mygpoclient/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	https://patch-diff.githubusercontent.com/raw/gpodder/mygpoclient/pull/19.patch
-		-> ${PN}-pr19.patch
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/minimock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/gpodder/mygpoclient/pull/19
-	"${DISTDIR}/${PN}-pr19.patch"
-)
diff --git a/dev-python/mypy/mypy-1.13.0.ebuild b/dev-python/mypy/mypy-1.13.0.ebuild
index 59bd4a2befcc..a9b4ead74636 100644
--- a/dev-python/mypy/mypy-1.13.0.ebuild
+++ b/dev-python/mypy/mypy-1.13.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
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+native-extensions"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
diff --git a/dev-python/mypy/mypy-1.14.1-r1.ebuild b/dev-python/mypy/mypy-1.14.1-r1.ebuild
new file mode 100644
index 000000000000..55e75919d84d
--- /dev/null
+++ b/dev-python/mypy/mypy-1.14.1-r1.ebuild
@@ -0,0 +1,125 @@
+# 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
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="
+	https://www.mypy-lang.org/
+	https://github.com/python/mypy/
+	https://pypi.org/project/mypy/
+"
+SRC_URI="
+	https://github.com/python/mypy/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+native-extensions"
+
+# stubgen collides with this package: https://bugs.gentoo.org/585594
+RDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-4[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy-extensions-1.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	native-extensions? (
+		${RDEPEND}
+		dev-python/types-psutil[${PYTHON_USEDEP}]
+		dev-python/types-setuptools[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
+		>=dev-python/filelock-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.9.1[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+# frustratingly, mypyc produces non-deterministic output. If ccache is enabled it will be a waste of time,
+# but simultaneously it might trash your system and fill up the cache with a giant wave of non-reproducible
+# test files (https://github.com/mypyc/mypyc/issues/1014)
+export CCACHE_DISABLE=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14.0-no-werror.patch
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# don't force pytest-xdist, in case user asked for EPYTEST_JOBS=1
+	sed -i -e '/addopts/s:-nauto::' pyproject.toml || die
+}
+
+python_compile() {
+	local -x MYPY_USE_MYPYC=$(usex native-extensions 1 0)
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# the majority of them require Internet (via pip)
+		mypy/test/testpep561.py
+		# known broken with assertions enabled
+		# https://github.com/python/mypy/issues/16043
+		mypyc/test/test_run.py::TestRun::run-i64.test::testI64GlueMethodsAndInheritance
+		mypyc/test/test_run.py::TestRun::run-floats.test::testFloatOps
+		mypyc/test/test_run.py::TestRunStrictDunderTyping::run-floats.test::testFloatOps_dunder_typing
+		# these assume that types-docutils are not installed
+		mypy/test/testpythoneval.py::PythonEvaluationSuite::pythoneval.test::testIgnoreImportIfNoPython3StubAvailable
+		mypy/test/testpythoneval.py::PythonEvaluationSuite::pythoneval.test::testNoPython3StubAvailable
+		# TODO
+		mypy/test/meta/test_parse_data.py
+		mypy/test/meta/test_update_data.py
+	)
+	case ${EPYTHON} in
+		python3.13)
+			;&
+		python3.12)
+			EPYTEST_DESELECT+=(
+				# more assertions, sigh
+				mypyc/test/test_run.py::TestRun::run-bools.test::testBoolOps
+				mypyc/test/test_run.py::TestRun::run-i64.test::testI64BasicOps
+				mypyc/test/test_run.py::TestRun::run-i64.test::testI64DefaultArgValues
+				mypyc/test/test_run.py::TestRun::run-i64.test::testI64ErrorValuesAndUndefined
+			)
+			;;
+	esac
+
+	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
+	# fail with high COLUMNS values
+	local -x COLUMNS=80
+
+	# The tests depend on having in-source compiled extensions if you want to
+	# test those compiled extensions. Various crucial test dependencies aren't
+	# installed. Even pyproject.toml is needed because that's where pytest args
+	# are in. Hack them into the build directory and delete them afterwards.
+	# See: https://github.com/python/mypy/issues/16143
+	local -x MYPY_TEST_PREFIX="${S}"
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	cp -r "${S}"/{conftest.py,pyproject.toml} . || die
+
+	local failed=
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest || failed=1
+
+	rm conftest.py pyproject.toml || die
+
+	[[ ${failed} ]] && die "epytest failed with ${EPYTHON}"
+}
diff --git a/dev-python/mypy/mypy-1.14.1.ebuild b/dev-python/mypy/mypy-1.14.1.ebuild
deleted file mode 100644
index e86f197574bc..000000000000
--- a/dev-python/mypy/mypy-1.14.1.ebuild
+++ /dev/null
@@ -1,131 +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=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="
-	https://www.mypy-lang.org/
-	https://github.com/python/mypy/
-	https://pypi.org/project/mypy/
-"
-SRC_URI="
-	https://github.com/python/mypy/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+native-extensions"
-
-# stubgen collides with this package: https://bugs.gentoo.org/585594
-RDEPEND="
-	!dev-util/stubgen
-	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/mypy-extensions-1.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	native-extensions? (
-		${RDEPEND}
-		dev-python/types-psutil[${PYTHON_USEDEP}]
-		dev-python/types-setuptools[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
-		>=dev-python/filelock-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.9.1[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-# frustratingly, mypyc produces non-deterministic output. If ccache is enabled it will be a waste of time,
-# but simultaneously it might trash your system and fill up the cache with a giant wave of non-reproducible
-# test files (https://github.com/mypyc/mypyc/issues/1014)
-export CCACHE_DISABLE=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14.0-no-werror.patch
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# don't force pytest-xdist, in case user asked for EPYTEST_JOBS=1
-	sed -i -e '/addopts/s:-nauto::' pyproject.toml || die
-}
-
-python_compile() {
-	local -x MYPY_USE_MYPYC=$(usex native-extensions 1 0)
-	case ${EPYTHON} in
-		python3.13)
-			# https://github.com/mypyc/mypyc/issues/1056
-			MYPY_USE_MYPYC=0
-			;;
-	esac
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# the majority of them require Internet (via pip)
-		mypy/test/testpep561.py
-		# known broken with assertions enabled
-		# https://github.com/python/mypy/issues/16043
-		mypyc/test/test_run.py::TestRun::run-i64.test::testI64GlueMethodsAndInheritance
-		mypyc/test/test_run.py::TestRun::run-floats.test::testFloatOps
-		mypyc/test/test_run.py::TestRunStrictDunderTyping::run-floats.test::testFloatOps_dunder_typing
-		# these assume that types-docutils are not installed
-		mypy/test/testpythoneval.py::PythonEvaluationSuite::pythoneval.test::testIgnoreImportIfNoPython3StubAvailable
-		mypy/test/testpythoneval.py::PythonEvaluationSuite::pythoneval.test::testNoPython3StubAvailable
-		# TODO
-		mypy/test/meta/test_parse_data.py
-		mypy/test/meta/test_update_data.py
-	)
-	case ${EPYTHON} in
-		python3.13)
-			;&
-		python3.12)
-			EPYTEST_DESELECT+=(
-				# more assertions, sigh
-				mypyc/test/test_run.py::TestRun::run-bools.test::testBoolOps
-				mypyc/test/test_run.py::TestRun::run-i64.test::testI64BasicOps
-				mypyc/test/test_run.py::TestRun::run-i64.test::testI64DefaultArgValues
-				mypyc/test/test_run.py::TestRun::run-i64.test::testI64ErrorValuesAndUndefined
-			)
-			;;
-	esac
-
-	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
-	# fail with high COLUMNS values
-	local -x COLUMNS=80
-
-	# The tests depend on having in-source compiled extensions if you want to
-	# test those compiled extensions. Various crucial test dependencies aren't
-	# installed. Even pyproject.toml is needed because that's where pytest args
-	# are in. Hack them into the build directory and delete them afterwards.
-	# See: https://github.com/python/mypy/issues/16143
-	local -x MYPY_TEST_PREFIX="${S}"
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	cp -r "${S}"/{conftest.py,pyproject.toml} . || die
-
-	local failed=
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	nonfatal epytest || failed=1
-
-	rm conftest.py pyproject.toml || die
-
-	[[ ${failed} ]] && die "epytest failed with ${EPYTHON}"
-}
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index d37be360b1a3..ab6a05970b33 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1 +1,2 @@
 DIST mysqlclient-2.2.6.tar.gz 91055 BLAKE2B e515e693100135404bf00a41b7fe0364c8276ee1be847b22ef014bb01ef065a0bbb12cb2becbdb27a1b2a9528d43c668ba36ec25f8b43adffcc5762ed641a011 SHA512 cb5f9e8e0c8bfc8d1360a3ca03d6961b4e083ce25727d0340727e3d70816d37147ebce8507eb1a2c42e093b63ba375f9806958834c0703abe7c27908c7a094d1
+DIST mysqlclient-2.2.7.tar.gz 91383 BLAKE2B a09735acfb00abb5dd8dc46265aa3daa756217763593143cc3ea31cfbb01e08b2e51f00845e8806a6a4d1cb9c04c40c2228e41cfad3a3b4f45a82f6dcb752950 SHA512 085141575d4b1ce87a1fa1d69c235a6f0ad3b57c3aebac83739dddbe86a2cca8321cfa99332efafd8ac76f1d0dd3bcf03232756a1c26da02616a8adf9db57e29
diff --git a/dev-python/mysqlclient/mysqlclient-2.2.7.ebuild b/dev-python/mysqlclient/mysqlclient-2.2.7.ebuild
new file mode 100644
index 000000000000..799b6fa602ec
--- /dev/null
+++ b/dev-python/mysqlclient/mysqlclient-2.2.7.ebuild
@@ -0,0 +1,93 @@
+# 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="Python interface to MySQL"
+HOMEPAGE="
+	https://pypi.org/project/mysqlclient/
+	https://github.com/PyMySQL/mysqlclient/
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	dev-db/mysql-connector-c:0=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		dev-db/mariadb[server]
+	)
+"
+
+distutils_enable_sphinx doc \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+src_test() {
+	rm -r src || die
+
+	local datadir="${T}/mysql" \
+		install_log="${T}/mysqld_install.log" \
+		pidfile="${T}/mysqld.pid" \
+		socket="${T}/mysqld.sock" \
+		log="${T}/mysqld.log"
+	einfo "Creating test MySQL instance ..."
+	if ! mysql_install_db \
+		--no-defaults \
+		--auth-root-authentication-method=normal \
+		--basedir="${EPREFIX}/usr" \
+		--datadir="${datadir}" >& "${install_log}"
+	then
+		cat "${install_log}"
+		die "Failed to create database"
+	fi
+
+	einfo "Starting test MySQL instance ..."
+	mysqld \
+		--no-defaults \
+		--character-set-server=utf8 \
+		--pid-file="${pidfile}" \
+		--socket="${socket}" \
+		--skip-networking \
+		--datadir="${datadir}" >& "${log}" &
+
+	local i timeout=10
+	einfo "Waiting for MySQL to start for up to ${timeout} seconds ..."
+	for i in seq 1 ${timeout}; do
+		[[ -S "${socket}" ]] && break
+		sleep 1
+	done
+	if [[ ! -S "${socket}" ]]; then
+		cat "${log}"
+		die "MySQL failed to start in ${timeout} seconds"
+	fi
+
+	cat > "${T}/mysql.cnf" <<- EOF
+		[MySQLdb-tests]
+		socket = ${socket}
+		user = root
+		database = test
+	EOF
+
+	distutils-r1_src_test
+
+	einfo "Stopping test MySQL instance ..."
+	pkill -F "${pidfile}" &>/dev/null
+}
+
+python_test() {
+	local -x TESTDB="${T}/mysql.cnf"
+	epytest
+}
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index 293fdc9514a0..8fd3f9fd7663 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1 +1,2 @@
 DIST nbclassic-1.1.0.tar.gz 20194834 BLAKE2B 7fe5e3d405964faf09a6f58b54d03dae7ec661e276d5e26e71e054b277f99db61dd7ef0c3ec2417230ea7d724814a4919514b4274772b5a73a89d0c59db09468 SHA512 a5348ff7bff944c12745111fcf64ca92d75bf7bc063d51baf04bc8894473ba0689ec4420ff1ce2d2a40601b55d14a1cd257215cd4f11839fa47e8ea93933268d
+DIST nbclassic-1.2.0.tar.gz 20204389 BLAKE2B 37d2614b48e28d187b7f22aeab71bb5b1d8dbc0349654bbd8323a76bb6cd789ed6bd3d0c04764e6e9757d37df1131dde3fe3927d1933de6b9e2db2d4651e00b9 SHA512 416345cb773392b4d2b03a914ed3511bf75a7ea8dad02360a0623233af56f38a9853647ad1b62f0f7e397e6b3715bd66bc5e52e4736fe5b30884136fab0b459c
diff --git a/dev-python/nbclassic/nbclassic-1.2.0.ebuild b/dev-python/nbclassic/nbclassic-1.2.0.ebuild
new file mode 100644
index 000000000000..28e6cbb5ed5a
--- /dev/null
+++ b/dev-python/nbclassic/nbclassic-1.2.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+DISTUTILS_USE_PEP517=jupyter
+
+inherit distutils-r1 pypi xdg-utils
+
+DESCRIPTION="Jupyter Notebook as a Jupyter Server Extension"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/nbclassic/
+	https://pypi.org/project/nbclassic/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython-genutils[${PYTHON_USEDEP}]
+	>=dev-python/nest-asyncio-1.5[${PYTHON_USEDEP}]
+	>=dev-python/notebook-shim-0.2.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/nbval[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		virtual/pandoc
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source \
+	dev-python/pydata-sphinx-theme \
+	dev-python/nbsphinx \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/myst-parser \
+	dev-python/ipython-genutils
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+
+	# Notebook interferes with our tests, pretend it does not exist
+	echo "raise ImportError" > notebook.py || die
+
+	epytest -p pytest_tornasync.plugin
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# move /usr/etc stuff to /etc
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index 5b3b712292a9..c56cee9e974b 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,2 +1 @@
-DIST nbclient-0.10.1.tar.gz 62273 BLAKE2B 0a268e4078af3807b6795d5b6dbbc572628d891d42f4ddeed3decd06d471cad59ab903e652be6a7f1e00a07cea3745cd989c62674e937934a6a696dfd24eefa4 SHA512 8c5b52aa367f255669fa7ad248d45292dd0e3589e23e381027a093c9fc57280eb296f453c2bfc3c57969056846a0caba81e57feaad1768e70aff006df4b85324
 DIST nbclient-0.10.2.tar.gz 62424 BLAKE2B f0efae4b3eed70f04f3d0cc830ef4cc47ed98b93785c6048103b62aff9537eaeebc0ad54a513c142c3d76c64d093c9bac3003608c6510b719d9b5de7b67ad463 SHA512 e19e58950822711af8588fdb7a24c1df028c77c2e128023494335973ff28f524478637c491b16329c38edb2ff7714632d4216e6483bb9aa79e2b393e3de72be8
diff --git a/dev-python/nbclient/files/nbclient-0.10.0-py313.patch b/dev-python/nbclient/files/nbclient-0.10.0-py313.patch
deleted file mode 100644
index 1403cd0e0513..000000000000
--- a/dev-python/nbclient/files/nbclient-0.10.0-py313.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 57222265bfd8bdcf8851997e1dce5cd564e1a573 Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Wed, 3 Jul 2024 14:21:41 +0200
-Subject: [PATCH] Fix compatibility with Python 3.13 beta 2
-
-There are more calls in 3.13 than in previous versions
-so the tests are now more permissive.
-
-Fixes: https://github.com/jupyter/nbclient/issues/316
----
- tests/test_cli.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_cli.py b/tests/test_cli.py
-index 04b9887..55ccbd6 100644
---- a/tests/test_cli.py
-+++ b/tests/test_cli.py
-@@ -60,7 +60,7 @@ def test_mult(input_names, relative, inplace, jupyterapp, client, reader, writer
-     # add suffix if needed
-     paths = [p.with_suffix(".ipynb") for p in paths]
- 
--    assert path_open.mock_calls[::3] == [call(p) for p in paths]
-+    assert all(call(p) in path_open.mock_calls for p in paths)
-     assert reader.call_count == len(paths)
-     # assert reader.mock_calls == [call(p, as_version=4) for p in paths]
- 
-@@ -114,7 +114,7 @@ def test_output(input_names, relative, output_base, jupyterapp, client, reader,
-     # add suffix if needed
-     paths = [p.with_suffix(".ipynb") for p in paths]
- 
--    assert path_open.mock_calls[::3] == [call(p) for p in paths]
-+    assert all(call(p) in path_open.mock_calls for p in paths)
-     assert reader.call_count == len(paths)
- 
-     expected = []
diff --git a/dev-python/nbclient/nbclient-0.10.1.ebuild b/dev-python/nbclient/nbclient-0.10.1.ebuild
deleted file mode 100644
index 33919d855b04..000000000000
--- a/dev-python/nbclient/nbclient-0.10.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A client library for executing Jupyter notebooks"
-HOMEPAGE="
-	https://nbclient.readthedocs.io/en/latest/
-	https://github.com/jupyter/nbclient/
-	https://pypi.org/project/nbclient/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jupyter-client-6.1.12[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		>=dev-python/ipykernel-6.19.3[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		dev-python/xmltodict[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/jupyter/nbclient/pull/317
-	"${FILESDIR}/${PN}-0.10.0-py313.patch"
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# hangs?
-		'tests/test_client.py::test_run_all_notebooks[Interrupt.ipynb-opts6]'
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p rerunfailures --reruns=3
-}
diff --git a/dev-python/nbclient/nbclient-0.10.2.ebuild b/dev-python/nbclient/nbclient-0.10.2.ebuild
index ffd15a47301b..f134d7b6d8a3 100644
--- a/dev-python/nbclient/nbclient-0.10.2.ebuild
+++ b/dev-python/nbclient/nbclient-0.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter-client-6.1.12[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 19ac8166a969..9dbdd85b043e 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,2 +1 @@
-DIST nbconvert-7.16.4.tar.gz 854422 BLAKE2B f04a8fbffde70e08736d13a3db3278c9248f742b27688eb56760b9ff46c58aec63aa05a4cff256e5929009c3f76d760ce71209f3c49b40af374f06b073ddd661 SHA512 f9793ce89f18530492e1e9aeba3759ac6ae8aa8e0459be52928689a58b0d816128d275bdf9061ec9f33a047e0b6c8d4d83e5a81da556700e0add48374f15fcd8
 DIST nbconvert-7.16.5.tar.gz 856367 BLAKE2B d1b44e2665a4a96c2d7a78c986b93c5e9e5e12bc984f20735a03e1fb28d81b43cc7b1d6ebf0a8dad56b470e5e683c672f096c9fd98d22852f5c8fe94a9c2ce44 SHA512 703ed3e33efc2a42c8bde84829b82a8e9ef2313c1766bfc0ab642743173ade642d4a796afa9ef489ba2f58bd75fc0ce6e50009676e2ef1d3848967ddf775f861
diff --git a/dev-python/nbconvert/nbconvert-7.16.4.ebuild b/dev-python/nbconvert/nbconvert-7.16.4.ebuild
deleted file mode 100644
index b5e899e39320..000000000000
--- a/dev-python/nbconvert/nbconvert-7.16.4.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
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi virtualx
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="
-	https://nbconvert.readthedocs.io/
-	https://github.com/jupyter/nbconvert/
-	https://pypi.org/project/nbconvert/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	>=dev-python/jinja2-3.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
-	dev-python/jupyterlab-pygments[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
-	<dev-python/mistune-4[${PYTHON_USEDEP}]
-	>=dev-python/nbclient-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.7[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.1[${PYTHON_USEDEP}]
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		>=dev-python/ipywidgets-7.5[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_nbconvertapp.py::TestNbConvertApp::test_convert_full_qualified_name
-		tests/test_nbconvertapp.py::TestNbConvertApp::test_post_processor
-		# crazy qtweb* stuff, perhaps permissions
-		tests/exporters/test_qtpdf.py::TestQtPDFExporter::test_export
-		tests/exporters/test_qtpng.py::TestQtPNGExporter::test_export
-	)
-
-	# virtx implies nonfatal, make it explicit to avoid confusion
-	nonfatal epytest || die
-}
-
-pkg_postinst() {
-	if ! has_version virtual/pandoc; then
-		einfo "Pandoc is required for converting to formats other than Python,"
-		einfo "HTML, and Markdown. If you need this functionality, install"
-		einfo "app-text/pandoc or app-text/pandoc-bin."
-	fi
-}
diff --git a/dev-python/nbconvert/nbconvert-7.16.5.ebuild b/dev-python/nbconvert/nbconvert-7.16.5.ebuild
index 891f16a69514..1b8896c23b17 100644
--- a/dev-python/nbconvert/nbconvert-7.16.5.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.16.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index 0607d6038629..70566b65ea6b 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,2 +1 @@
-DIST nbsphinx-0.9.5.tar.gz 179599 BLAKE2B ca7ec2a4b9665fe189c5c8020c345abbf60cff72b7434365359bf6ae1f569570bfb0928072a6d01227f685cc837d9fc75b31b1a2361788c6fa45a075c9d1f23c SHA512 2b1a1575af9ad462888992f3bc6792c014536e7abba5c4b20a1e36da385eae87b23a79e74d9e02cb122dfccfb93e15a817b794565371b5d69d857ca19d163a9c
 DIST nbsphinx-0.9.6.tar.gz 180213 BLAKE2B 83aa7490527a9906ce665fcc3ba493648d2d0b6ae93aa5a36d62408e880033b763747a4ebc460db029427accda5d00676c362368390ff168337a3a53fd81da6d SHA512 26a5631b07dfb0d4ab17be5c41e921584d8487b45b45702abe4a6c9d2f10c70dab536ce31822c0c3ae9ab759cdb12c5b5ef62cbdf6243eab4baf81d12569e0ab
diff --git a/dev-python/nbsphinx/nbsphinx-0.9.5.ebuild b/dev-python/nbsphinx/nbsphinx-0.9.5.ebuild
deleted file mode 100644
index 024bb2e92abc..000000000000
--- a/dev-python/nbsphinx/nbsphinx-0.9.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Jupyter Notebook Tools for Sphinx"
-HOMEPAGE="
-	https://github.com/spatialaudio/nbsphinx/
-	https://pypi.org/project/nbsphinx/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	>=dev-python/docutils-0.18.1[${PYTHON_USEDEP}]
-	dev-python/jinja2[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-5.5[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/nbsphinx/nbsphinx-0.9.6.ebuild b/dev-python/nbsphinx/nbsphinx-0.9.6.ebuild
index 13cf6dd6b5c7..ddfc27499a14 100644
--- a/dev-python/nbsphinx/nbsphinx-0.9.6.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.9.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/docutils-0.18.1[${PYTHON_USEDEP}]
diff --git a/dev-python/nextinspace/Manifest b/dev-python/nextinspace/Manifest
index fd04f35727ab..b6c6934b6e29 100644
--- a/dev-python/nextinspace/Manifest
+++ b/dev-python/nextinspace/Manifest
@@ -1,3 +1 @@
-DIST nextinspace-2.0.5.gh.tar.gz 48406 BLAKE2B 6f6e2c95fc1a5a8175faca4df0a51de9996ca24847926dc35b94d0e4bd5c9de880ad757606309f622f41c825d0c2e46c587f255573b4df70fe35c937148af9d7 SHA512 c8f55446d9eea0409afb8a8ddb41001b18b55d9105d007b306717a3d932ea1b03ecb2363d0deb42ec8da1cc245b77ffb18cee6ec3474121c15c4c9b79ff80405
-DIST nextinspace-3.0.0.gh.tar.gz 55095 BLAKE2B 02140cbfaeca9fd4cb19fefd40448fc5ffbed19a8e5bcb448800b1c5917d7873be69e0aab5c4d96acf4dfb7fc57b780420de19dc38a523b5ca38c9847cfa0263 SHA512 fa1d20401b7ed910e0c65c9010062cf6d1ffe7e73c09b47f42b19ab1bfbb74612cb7405571e4db0404de81e66211799f38b6654763222643f66e63176e4a72ab
 DIST nextinspace-3.0.1.gh.tar.gz 55101 BLAKE2B aeec5e34e6ae611d4f693dde10b14430d46853949c6e5d81aa90a842da670a156ecf3216c09d70f40279836155fe097c85c82e05a3e5c31d5457409f41a62f29 SHA512 92aa209e36eeed742cbfec99456aa452a164ffd97c87d6a17271c1731d9e4cdca1e616217ea6fdd347356b68644cc8fa3035228877324a7d180f764b6f8b012e
diff --git a/dev-python/nextinspace/files/nextinspace-2.0.5-lazy_fixtures.patch b/dev-python/nextinspace/files/nextinspace-2.0.5-lazy_fixtures.patch
deleted file mode 100644
index 92d94f7394f1..000000000000
--- a/dev-python/nextinspace/files/nextinspace-2.0.5-lazy_fixtures.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-commit 6d9b758075e756650b5a13ff3cf0852b21d6f1e7
-Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Date:   Fri Sep 20 23:13:24 2024 +0200
-Upstream: https://github.com/gideonshaked/nextinspace/pull/17
-
-    Migrate from pytest-lazy-fixture to pytest-lazy-fixtures
-
---- a/tests/cli/test_viewer.py
-+++ b/tests/cli/test_viewer.py
-@@ -1,6 +1,7 @@
- # type: ignore
- 
- import pytest
-+from pytest_lazy_fixtures import lf
- 
- from nextinspace.cli import viewer
- 
-@@ -13,8 +14,8 @@ def test_dict_event(example_event, example_event_dict):
-     "launcher, dict_",
-     [
-         (
--            pytest.lazy_fixture("example_launcher"),
--            pytest.lazy_fixture("example_launcher_dict"),
-+            lf("example_launcher"),
-+            lf("example_launcher_dict"),
-         ),
-         (None, None),
-     ],
-@@ -27,12 +28,12 @@ def test_dict_launcher(launcher, dict_):
-     "launch, dict_",
-     [
-         (
--            pytest.lazy_fixture("example_launch_verbose"),
--            pytest.lazy_fixture("example_launch_verbose_dict"),
-+            lf("example_launch_verbose"),
-+            lf("example_launch_verbose_dict"),
-         ),
-         (
--            pytest.lazy_fixture("example_launch_normal"),
--            pytest.lazy_fixture("example_launch_normal_dict"),
-+            lf("example_launch_normal"),
-+            lf("example_launch_normal_dict"),
-         ),
-     ],
- )
-@@ -44,12 +45,12 @@ def test_dict_launch(launch, dict_):
-     "item, dict_",
-     [
-         (
--            pytest.lazy_fixture("example_launch_normal"),
--            pytest.lazy_fixture("example_launch_normal_dict"),
-+            lf("example_launch_normal"),
-+            lf("example_launch_normal_dict"),
-         ),
-         (
--            pytest.lazy_fixture("example_event"),
--            pytest.lazy_fixture("example_event_dict"),
-+            lf("example_event"),
-+            lf("example_event_dict"),
-         ),
-     ],
- )
---- a/tests/test_nextinspace.py
-+++ b/tests/test_nextinspace.py
-@@ -4,6 +4,7 @@ import copy
- from datetime import MINYEAR, datetime, timedelta, timezone
- 
- import pytest
-+from pytest_lazy_fixtures import lf
- 
- import nextinspace
- from nextinspace import BASE_URL
-@@ -12,9 +13,9 @@ from nextinspace import BASE_URL
- @pytest.mark.parametrize(
-     "example",
-     [
--        pytest.lazy_fixture("example_event"),
--        pytest.lazy_fixture("example_launcher"),
--        pytest.lazy_fixture("example_launch_verbose"),
-+        lf("example_event"),
-+        lf("example_launcher"),
-+        lf("example_launch_verbose"),
-     ],
- )
- def test_eq(example):
-@@ -69,8 +70,8 @@ def test_date_str_to_datetime(datetime_str, result):
- @pytest.mark.parametrize(
-     "launch, include_launcher",
-     [
--        (pytest.lazy_fixture("example_launch_verbose"), True),
--        (pytest.lazy_fixture("example_launch_normal"), False),
-+        (lf("example_launch_verbose"), True),
-+        (lf("example_launch_normal"), False),
-     ],
- )
- def test_next_launch(requests_mock, example_launch_text, launch, include_launcher, example_launcher_text):
diff --git a/dev-python/nextinspace/files/nextinspace-3.0.0-license.patch b/dev-python/nextinspace/files/nextinspace-3.0.0-license.patch
deleted file mode 100644
index 0f1708777ff7..000000000000
--- a/dev-python/nextinspace/files/nextinspace-3.0.0-license.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 6e03e0f5cc94f039df06506a340b70d38860b84b
-Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Date:   Thu Dec 19 18:40:53 2024 +0100
-Upstream: https://github.com/gideonshaked/nextinspace/pull/18
-
-    Don't install LICENSE file in site-diretory
-
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -58,7 +58,9 @@ classifiers = [
-   "Programming Language :: Python :: 3 :: Only",
-   "Natural Language :: English"
- ]
--include = ["LICENSE"]
-+include = [
-+  { path = "LICENSE", format = "sdist" },
-+]
- 
- [tool.poetry.dependencies]
- python = "^3.10"
diff --git a/dev-python/nextinspace/metadata.xml b/dev-python/nextinspace/metadata.xml
index 56879b2e53b6..83495fb65bc9 100644
--- a/dev-python/nextinspace/metadata.xml
+++ b/dev-python/nextinspace/metadata.xml
@@ -15,6 +15,7 @@
 		application. You can also get data printed to the terminal in JSON,
 		which can be piped into another program.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">gideonshaked/nextinspace</remote-id>
 		<remote-id type="pypi">nextinspace</remote-id>
diff --git a/dev-python/nextinspace/nextinspace-2.0.5-r1.ebuild b/dev-python/nextinspace/nextinspace-2.0.5-r1.ebuild
deleted file mode 100644
index bb014fe9d684..000000000000
--- a/dev-python/nextinspace/nextinspace-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..13} )
-inherit distutils-r1
-
-DESCRIPTION="A command-line tool for seeing the latest in space"
-HOMEPAGE="https://github.com/gideonshaked/nextinspace"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gideonshaked/nextinspace.git"
-else
-	SRC_URI="https://github.com/gideonshaked/nextinspace/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.24[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest-lazy-fixtures[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.8[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-lazy_fixtures.patch"
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-
-	# Don't install license files
-	sed -e '/^include = \["LICENSE"\]$/d' -i pyproject.toml || die
-}
diff --git a/dev-python/nextinspace/nextinspace-3.0.0.ebuild b/dev-python/nextinspace/nextinspace-3.0.0.ebuild
deleted file mode 100644
index 4017cac96b5e..000000000000
--- a/dev-python/nextinspace/nextinspace-3.0.0.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
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..13} )
-inherit distutils-r1
-
-DESCRIPTION="A command-line tool for seeing the latest in space"
-HOMEPAGE="https://github.com/gideonshaked/nextinspace"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gideonshaked/nextinspace.git"
-else
-	SRC_URI="https://github.com/gideonshaked/nextinspace/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.24[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-lazy-fixtures[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.8[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-license.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/nextinspace/nextinspace-3.0.1.ebuild b/dev-python/nextinspace/nextinspace-3.0.1.ebuild
index 5d72a32bb012..bff36e6e9b83 100644
--- a/dev-python/nextinspace/nextinspace-3.0.1.ebuild
+++ b/dev-python/nextinspace/nextinspace-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/gideonshaked/nextinspace.git"
 else
 	SRC_URI="https://github.com/gideonshaked/nextinspace/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/dev-python/nh3/Manifest b/dev-python/nh3/Manifest
index 2d8d111c2bda..add88ed6f4f0 100644
--- a/dev-python/nh3/Manifest
+++ b/dev-python/nh3/Manifest
@@ -1,9 +1,7 @@
 DIST ammonia-4.0.0.crate 47763 BLAKE2B 6f952a8030ce2cfb9bcaf01c36d795c470f47bd7fa8e3935e058016876de04c6c43db3d56776c9ec5bb2acd83f315fd5dbd7c60373b397d70336d6926340c816 SHA512 84f523eaf7db9d98e44c7d1198fae40e59e838dcc9fc256ca7ef3f3d243a767755f318e516411b4feba4ecb26e30e77d501e9163f996b4d113804e5f2c41a65e
-DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST autocfg-1.4.0.crate 17712 BLAKE2B 7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6 SHA512 3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c
 DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf
 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
-DIST cc-1.2.1.crate 92731 BLAKE2B c9cb100964834692781ecc3f47972f83adaf27e019ca212f896b19a853521cf2084da213f2c2fc5c8a1bc794cc83fe9f81faf7751e1b065a3a2a08137cda0b61 SHA512 54bc5d85d48d678d33dc795aa6cc823a59ae6d17b4ec5708a1dd515e3495eabccdd949e9467e9bb3a29e44847a2d3ccd75055dfda241d8abbb16bfad650f2819
 DIST cc-1.2.4.crate 99823 BLAKE2B f05e52fd921578f14907911730f1c5bd7cf2c03e83f2d5ebaae9c2710025f5e5ea7c8f713888bd75d80abfed1b8e932a2047410f043f0b62e296389c9bf695a4 SHA512 76274e9676f09277a22e4cfb8c53a08bf562f98b710b479af6f95d590d3762fca1d6ec34791a219d59e3184774f13f624e84733f7c90c13c48707b75d75c0ec9
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST displaydoc-0.2.5.crate 24219 BLAKE2B ba3396c93d27a99a92ff4a0f01a8d192b419bad25e48d9427b76260ebf2f9982291d77f2eb24d239c0b1fbb097e866a20bc46dc1879fdfc6637ea49928444a92 SHA512 5ca35fa59f263162389c1180331e9df607d9374bcb056cb04bc46c98e4d87277162ddb2335ffa8a8c5f69218abc3eabccdcaa71c21b8dd9081cc4146f266b948
@@ -22,12 +20,9 @@ DIST icu_properties-1.5.1.crate 64479 BLAKE2B be7d3a1663664095f4af654723ebc74f38
 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 indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f
-DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
-DIST libc-0.2.166.crate 760418 BLAKE2B e4a81e82d139d03b85eb061439f045f1965f6260dc4d4a769f1db19e5d682a923497ba2cf041ebebd46b90c627b91cd97f86250d8b1854945b4f2e826a04d14f SHA512 55a484456ca4d0fc90e488c5b793a6100f160c9333f0b4173f21a49e33e2ce3ae28d74eadd4f2e72e51040667f0a2a93d7edcdc727fe266ff35b8b37608cce2d
 DIST libc-0.2.168.crate 757025 BLAKE2B 2597fdf5a77345754b8c9168d9f07f83ebaa0413262b94ebb19f976f49cc2c47893e788ee2abb3d00a995bc8f99b6ebcf24abbdb320e18037e779e1241599b44 SHA512 499f7273ab5eac0961fd927d5204ff4d5b3b290c20d00ac99054ee596b6d3ec4d6712772c52b09c84554f0514a8f66b41995ceb5b0ec38a7295a4fccf0e94349
 DIST litemap-0.7.4.crate 28257 BLAKE2B 52989ad353a782e9592357530dca3504e3ef5475bd2f1b2c795b60825d971ee6d3e6da51fbb6bbc26cb3c3303f6a751a3e15d1caa78c0cb888288a965666279c SHA512 5009c486a87b2f52237e15e2e772365424e4780c146776656d8e1551e52bc8e06e5c1cee8db1c59ef20d0463962fc07ba5221a46020a82df17a2f623a175f58f
 DIST lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe884dd69c61c54dec978733b95a853c3e5af26f237e48ebb4ee9dbebfce0f6c06067f74a3d122e92f5ace40e22d7 SHA512 525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7
@@ -37,10 +32,7 @@ DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b62
 DIST markup5ever-0.12.1.crate 34763 BLAKE2B 8057bde6b03d3e80c920b9007462b134937c80393f7422b4182823676069c4934d0c2806007e0c42b958b2c9f1b73679f62ed1e38b5c872b917937562b9ec7bc SHA512 5063b6591c63897017d79f64d11cc13edce2e8e21462df8a00166d582e83af3132ea7f4e50af4f248b56b75cbd12c6f89b7433da14147c76004fb2ffeda02b92
 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
 DIST new_debug_unreachable-1.0.6.crate 2582 BLAKE2B 2ac3dd86f1a532832a40ccfda95654e43709a62faebb8182c87309827afdd23e6d3f250f2345f044cb789015c30b7907be63253b487d368e68c4fdbc7de20492 SHA512 73a61acbc9b20b3595925360827ba8798f3338471b291fa37c72a1c9505b3ec9f688808fcaac9a2eb494e5f3ea5331d30545d5f21f89559111bec6126ac90b48
-DIST nh3-0.2.18.tar.gz 15028 BLAKE2B a2eb2640ef41bbabc394b9d6ce84f8f25e0fd706553b8659e14056df270c093ff59a66afd00550e1d479418c6ae8cc0d324c8a608fff825bac940d4c3827261b SHA512 1579ece4642911bf760ee3747ea44b7001ee7f70da65940b548fc2b30a20fee5d5c924d7d44ee73fcf4b3642591cb7085b3da0088b91a6752abfde53c798c275
-DIST nh3-0.2.19.tar.gz 17327 BLAKE2B 43cd0372ef83845cfda650e47e8d3ff485b1e6da580a37e005c720e0e2ebc725e85e3abc9d996be51e8d1621e33a9a6d450142d1448e69cb0d6769b25162ae4f SHA512 d0958dd847e68dd0368f362835be53fcbca7f2fff09d6bc4f3bdc6f8379d47d6590e7457bc4700663a6aae1b4ca0a16c6b3d08f7f6bc42644aabf2c7be46eccb
 DIST nh3-0.2.20.tar.gz 17489 BLAKE2B 6ccd4068846f116ab213aaac4ccd1c3a865227c655bb70de4e3b494c28b15271099d0a30b94af7857f0de0004f428269e79df31886039041a513f1c2d159c3f4 SHA512 f423d5bb670dd0d0b3c87b40846b14b6c030e473fb7844a469bf9a37d652e3b29d196cff6dc8a03dbf81002ed1cb61e554a3f4e7d94ed9efe63bf82b8e1a805f
-DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
 DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
 DIST parking_lot-0.12.3.crate 41860 BLAKE2B d1899a1132035aaea3a784290cf4951ea3b36b2018d407e27d333b2a2ce3820e040d635009c44cb6e58ad07cec6565c0347af6f6fb02954eac2d4c348bb036f0 SHA512 368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703
 DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389
@@ -52,43 +44,22 @@ DIST phf_generator-0.11.2.crate 14190 BLAKE2B a20d6d3d815ca0eb5ef18780587b996345
 DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b127f4af79b2b5855cb014a0080bec1ec45be466513bd57faa39c77cfde0d6ca02b6bb77d37a23d697603227da37 SHA512 f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5
 DIST phf_shared-0.11.2.crate 14284 BLAKE2B 3c3bbd24de77b032d194d0b0679a84a4e2848d41ceea5552f73e51e3ebddd5e61188393f126f668689dccbbfa92a8accd9c09a77de39eeaf72b8993dae280dcf SHA512 f2cf9e8ceabde75bb7548e5a47dece9a8fb7eea4a6c5568675e7bd735860c3e51181d749a26cd3dcad1476ec22d524ccb77a956dd267cd0f2b7dfb81db9abcbe
 DIST portable-atomic-1.10.0.crate 174760 BLAKE2B 9a05d6162c95f5140709cbd005c1997449fb6373700e8ed3966e3379898e95f3cbdb90b387f1c7deb3f1eb33125378852a7168d0d22b433813f6c082112b0365 SHA512 fb47ab53fe240d5b0824dd068c6dda473d3e71ae6f5dfccaa17262a8b6de0e1dde05d83975e53bbfcf43f10ef5c634fc024f94613937927ae93f1adad1dadb19
-DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c
-DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
 DIST ppv-lite86-0.2.20.crate 22478 BLAKE2B 9d68dc36d8148047d571c0147ed29f586f3c6ac9394b56bd955c8ae5bb18f5a8da5369809f7b8c3199074e23660325158c32c62e1bf69a16cb1f5da2a01f5df0 SHA512 6d171f63b42296f7765732fce3af7ea05d0d81f1541ffb3ad86e81210715ef4afe5bc9e58926e97e757aea6ff96a8012c8411eac78be0fd080898318ed21d7d1
 DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05
-DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST proc-macro2-1.0.92.crate 52353 BLAKE2B 9aa29fa6f1c56c0392a94a81b4c61953f4d185012cdca37e356817845535da79d7094bf43472ce63109ce479a2fd0cbef4d802afd61daf92c4db303bcac60e7e SHA512 e614f08acc0a7e97ef580479cf5b682378df1ca16f09bfb2296ebb3490a435229dea9d682c621c54ce57e8e1d3b7803eb8ff83c88bd02e07228dba6d02f14aee
-DIST pyo3-0.22.0.crate 535742 BLAKE2B 772a4f8b718bbec32faa3dac4cad07a5b452fb366280753c3316d932663bf367192483fb5cd0bd405321128e67157b982eaa89264685739a141e021f0f7e2b72 SHA512 44e0237fd3a8d4c7b082c48a5c8a52d8f4cc4673d134f680e29504bb46d870015fa210da34de4c1998defbcd4afdf2aaea4e148fbe093e4b2c8b0d064cd48da4
-DIST pyo3-0.23.2.crate 1073639 BLAKE2B 01ddd26a4e347f3b6d7fee215a1894e779167730710373d59712f2119332fcf287d9c0e75d3d28baff8cf5000afb9d0e577947a26bdd8828428d33aa0f8be537 SHA512 b2b40809e1f26978c140b7ca4ecebb661a47fc01cd03fcd5c486076576c9b229de04f15ed55661db4e26545cb29110f1034a185abb623e4bf7fbb69188db335c
 DIST pyo3-0.23.3.crate 1073838 BLAKE2B 5e1ce6a5c5232ebf0399b1b969e737cca12f978f445efec9408ea80b8bc6ac1047125dbefa36149c8a904882d6a64dd24a9bd50f1e8de7afe3a3271e1a0f2d6f SHA512 c80377e8673de8b8e51e2423d102dbcc46605a783c13127215916d69fc600efd67ba5f9cca420cb6859124165ec97fde40eb0a0566d8b4b60708e20b8e6e9b6d
-DIST pyo3-build-config-0.22.0.crate 31205 BLAKE2B 6b9a0de5f431bfc123628c67da040e146e39353d7b42d8d083e1911929dc420622f8a1276229d89b7780bccd02a8e653bcb85bfa51281e72ddfacebadef5277a SHA512 50341f4e5134a275610a5b86e833d1963a0726c2ddc14f4742053c60ad336ee209e73441aca46c8670920ee47a81c76bbd3f9e6412d253a5b389692ff8f3c1f3
-DIST pyo3-build-config-0.23.2.crate 32197 BLAKE2B 393c76b1dcb625145673736272d4cb9d96a02df87ddcc385316652f0ff1b5595a34ebe5d789f61888c2fd82de05476c85f781d21018bd99cb630fa634afee203 SHA512 29678272073e896cb0b65efb0eaba40c82977b18efd389597aef8902e32daff51f2609c6be93ecfe0336260446c3186951f770ff449823cdde5a0518a1585c81
 DIST pyo3-build-config-0.23.3.crate 32509 BLAKE2B 9e77701712589dec4ad74b3d0e66ae82c7a01b6f29ed36231d999aaf909f80def59d17916e1900bfff10b1d36a0a48ed4bf9757c817eb6c6269549f3d04bd6d4 SHA512 db8b0aa86e96eeb30a8ab36a8a1ba917b7b9e6918c2193d7466841ef38e689908f7719a5390d35fb9a156aa6bd84348fa99ea8d5a784faf5c5cc4635d9a3fac9
-DIST pyo3-ffi-0.22.0.crate 67420 BLAKE2B 65e4ed1a1ce854f37380aa23637a494226b98941b9e3f13eae8f627db0fea248c3cc93c7e594090407ab169cfdb27ab20c47f7004f2b4646103ee34da9a55f31 SHA512 cede32dc8025badcdd6d00b4a1204c6ceb5ad30fa0b637deecca669f2ee2b8961f88d9d867caa8cae59f498dc4e1c15f3b4049c5f47615e215b0f289fc560bce
-DIST pyo3-ffi-0.23.2.crate 74052 BLAKE2B 085c66bae61e6059331813be77a1e4f850c4b8b12ac60b03188f2a009c9f58e062dc3ea2b9e470a480956bb8cbef645f95e53fae2638d59ebf5039aa5d41d504 SHA512 e228e473da98ce0fe4f15cf840ba1f51f66bb6fd103a7c0bb76b3218980c93b45ecf691f712333f4a27a9efc76517a85f6e13d5e9650b774eadebf59a647e493
 DIST pyo3-ffi-0.23.3.crate 74064 BLAKE2B ec3cc59e047f780041a05e2bf9fac9d65a6f8ccfb5a3e1c35d7c7918da6ded7e65676888a743d3b4d0fe7b0996e441b722c159eed67360c1e3c5b598160a46cc SHA512 fe4678d4cfe81f065554f0d454345f5f8fde927af1afec9212bb49a67be5080dcc9be84e088612208b7732d2283c2c9168a31b0b6fbd32496520d500e372e161
-DIST pyo3-macros-0.22.0.crate 7889 BLAKE2B 0b61caaed415023341dfd675c578e39cc3e5b2a08eb8c439857c81cf6cb895837f5df28decd7c08a3aa365411ff33a97eb5fe2f20e18427bda133f7df53349ba SHA512 ed9e9d6322fb8d3fd11114899c3ad84ebbc5b5eba58e5aabfc7f9691f02ec053f1c2804cea93d21f2ac9332f5b719b7fee9878faa95f21eb2a2d86f9050c7339
-DIST pyo3-macros-0.23.2.crate 8056 BLAKE2B a87c4b8aab972eaf5e9b941db34e18be411bed8b5753d3e2d3f65e4a18723a72e70858bb34e8db949f0c6b748e122fed41e9c78f6c20150077fcc3c4eb0026ba SHA512 dba0b5bd212b6a5f38d6fc93183c8ab80bb53bfa5f03d471897014f2d3d1959804e5fdbc817845c1cef797f314b924d58eff95cfcb848eb98b283e104d24637c
 DIST pyo3-macros-0.23.3.crate 8085 BLAKE2B bf9ea45a8afe7c663da4f3f5c09c23039bbcf9a9ae350eac2b6581a227864d259b1e5c5ea36f9d6f302c26cd957bb4564562b98785eac49233515d7d54453fdf SHA512 23bfcff285db1276f2dcca9895f7672ec6e5aec118039e2cef3cabca0a85eb97f138391cea4da26eb887dff09c65947b165ca83392edcc8640cb283df2929901
-DIST pyo3-macros-backend-0.22.0.crate 64837 BLAKE2B 4961b8c8720bfc2bbd11089a658d64cb2b1e43e150e622d53490faec3b905344d256b2092238ebb1dd92290583ee7d04a12eb5759bd55276e7042e1c948c71bd SHA512 09496c7285b9faaad820cfea237ef602569de3adeaa3362727182b0cd1c8377ef55c0c28f14eb703ea73a86c94acbdfb1384b44ef32b318a76c730a0430ca233
-DIST pyo3-macros-backend-0.23.2.crate 70067 BLAKE2B 905c0e6e5ca0c0a91af8386a632cc81f4a9b08a51a22a260188078abf9ee70d60f77e2fc0df09483d8dc6b37cd455a23b7f70f41ee74a2ad9dd0dbef39cc22c2 SHA512 dc3f8780c09c63c0e0d4f26c29a9a4e29e4fc9f14254ac8a942235e480a3f4bfa3bf073d3011e043b6c22e1999d1f68bf7b0fdf212e9edb4bfb2396a97ab0ee1
 DIST pyo3-macros-backend-0.23.3.crate 70098 BLAKE2B f8ee9c39f743960fc8093bfd53c043fca03b973192e1ab24b48066634e57ea7e74b3ba825ae72380e10569855eec9cb4f0d54f5f8c88dc60e67793257bef8d43 SHA512 9b22e975480f9afc2037587ba85889868a1b543069c2280c65f4cf98e5537708d098bb4885e881c1c9427740c8259988d82176b974900551a4e51097cefb8708
-DIST python3-dll-a-0.2.10.crate 74573 BLAKE2B 770c5b070f4dd1b9639b8aff59bb733575eb1117ae8e510818b6e13bdc69b22bcad395bb5cf0d1931de3562775a56e1404bb7fca7384b62e5e782e6284fa1494 SHA512 c1171c29f6914ff809950a9f6c330638e72c58c7c691bf4d9e765dee47166915cc91131b494b65aeb3a812543690c5072f2f5ff32cdebb76ba588330f9c74cdb
 DIST python3-dll-a-0.2.11.crate 83622 BLAKE2B 4bb801097422fc59be57b64edebeaee851dbad6ccb334d2fb672d279458d8925a08ae5a00c8603c8ab51e4210753483dba81bde189724ec47d1019bd9c4f4dee SHA512 3a5bee1eaec72650fc093105a4139f14c1f65012903a1311aa4ab754fbf7104936f743f0e7c69ee6d7b8d344ec25746c1fd415bdcd0a959c3828a28f9b63ce52
-DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
-DIST redox_syscall-0.5.2.crate 23957 BLAKE2B 6261df25a59af5119a21d31fc3b6a8800bb1783cf2fd63a5524d48d0b187f5f2e65ebbdec00d9282adf110ba8f307d4ceb154bf029a0c6a26e8a887fc722b2d7 SHA512 b7e39a08e220153370449cec7b058c2dbc4916ff7be01b34658e1793035323ecc28f40712194cb9bfc9b863e4bb316e58662721eb0e54f68f09438bd880ea032
-DIST redox_syscall-0.5.7.crate 26249 BLAKE2B 97f848b130403686404dc193415e5060c32585aa3638b825b4775e54d9a058695b86457ae9e3cc0240bcac27ab4c05dd6b488bdc1c797faecd236c6e477fbc3f SHA512 e9f2d254279a4063089436b699ecca766a997a72718d132a9b35f7c8c8fc82c4b5e25fd8f3e6cbd17920fec484140db520c262376ed1c74f847929b7f43fb97e
 DIST redox_syscall-0.5.8.crate 26319 BLAKE2B bd69a69e2a0f3d84843a8f76199ef6b3991698ebac58b23f69c26d02f5f3e24e77a9d5e8259e9fbff3887f06d15ced94ff23b5a3272ab475918e6e3e753dcde6 SHA512 5f9632f1f89f4963c36ede4da9b955c3474b673c3414d81cdbb61f46c08eff67167f703a0b06b239beeb2d720f8fa592a5493c0f7e872728b5b95f561ff11348
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
-DIST serde-1.0.204.crate 78253 BLAKE2B 6fdebf3cbcc0327b404caaae43c87ba2b6105374a5ee3eaa34d44866e782132cff535da4c069c007783b7b6468d55cb1ceb6a41da74b9eab03ace7cf4811e09e SHA512 2fefbeed0117bd791fd25dd5ad0c99ed4f60aac5919605b6f642050f748dd472bf9d4d121b78b0cfe8719db30a675559d097bcc7542cb57451d1779dfd8d294f
-DIST serde-1.0.215.crate 78527 BLAKE2B ca8e1175839ca45a4d78a155f5943396211408a85e0840b065c52948188010653d68fc4fc7b63bf2c39a11a6988abb7f6f3c6d878ca1373596e0a5d62186e109 SHA512 3da13f1a74393f1fcb6d659b5e060a11ecae358f55cdf4a2fd05bfc863fea6f75d3140d3bc74902f8feba8cddf7dae71a3f4e4e78e78e1b08ed46b3e4900281f
 DIST serde-1.0.216.crate 79000 BLAKE2B 98c0f5cee2f9212c6b7620d2068665379471ceb7557d1454cab9b1c2120b526ef597fbb642f65440e70f92a4764cad33613b478bacf99138dd5bd51fdbdbee6b SHA512 baabf4c7aac4a540c9ed18b336662087258b71c9cb0e547c8d83a2734818ab2cbbe62f910d812eb61d3d46e653c41a3eebc99b1d679bfc51f95710c71a8ecc20
-DIST serde_derive-1.0.204.crate 55871 BLAKE2B 8f0cdb244a820712d557a3273e505c4461f4d7db89e8394040b4c66ede787b6b38b4c9923b38959ab4042c9076b8af72008c0dd15ac93a0ecdeb99da8fb526ae SHA512 bbb2b5e60e2af5bc7528b937ffaf0d3ffd433dbd9cb2592c1e07090620309057e4f11cbd6112fc1d2c5557e1bb3c0f4d59eb06ff06fa021ec683ab880997140e
-DIST serde_derive-1.0.215.crate 57092 BLAKE2B f28bb66017599afdcd8d45c514b8e07854eb944c1dcf931e052a01ce421e0de6c20c13b3867da5922e2153e25ce88bf9fa27e2e68ddc9d212977f71fa0bd6352 SHA512 cae686bdf10c683149956ffe1c64fcf3e9b9bf0cd6e33b4ce7429d0ca35b9fdb55443693866c1202fa79348c6ea0f49ab3be3d5f857de4ae0818d2b4c8c67d9b
 DIST serde_derive-1.0.216.crate 57674 BLAKE2B 12a9228679c16288c08c8b256707e276aec79f84ac7af0c4cfd1f109500dfea80438df17d798acdd30a9743c753e70093b22bd324217529bac483f257682a3e2 SHA512 80fcb552279ac7562297df878f2f5e9ac09241701f5cf1088fcbf473b638f58cd3092a7930d8937ca0df9a47b9ae1a42d490cd46a275259cd8089fe8f5426469
 DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST siphasher-0.3.11.crate 10442 BLAKE2B 771221614bbd56f609b9743da4352dc7a2cbd0f6257952fab0cd052e5e5b258a4c95a0461d6d1b579dec90b72d66a0e58e036899b3db8341ae753a421a4cd4d5 SHA512 601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b
@@ -96,22 +67,13 @@ DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
 DIST string_cache-0.8.7.crate 16655 BLAKE2B 9a017f3248a3d5e7b8c1a05462a882862b20174c7ce5dda1568c3d3f61c422e84ba2ccd5d6dbd726d1c752f1eaa8062a179470927a80d5bdda0ce530d1ae2c17 SHA512 03f9cdd2c01c0f233284851f17eaefebd68a91ae2ed2b231fab2d6d6476bd19e0696d7d3a74fb6ecb2ec36b89e79ad966ab73051255c9e194bcf9c5029fb8479
 DIST string_cache_codegen-0.5.2.crate 8156 BLAKE2B b1cd91e22937622ce51152957ed45ee88dba9756449f3ef4c4884e491b7810e1c9f10b58012244dafa4422d5589502876f30a43940ee9754ef7b9952ebe4bb41 SHA512 01b9b1a865878537f657adf908159fd04f3f2ba4e70f8c632b73d0ed5a8a09fe2bb9ac8ac4397dec1f50d771dec33fc5d3f9e68dbf80cc177118665b2c67e864
-DIST syn-2.0.69.crate 265441 BLAKE2B b01576c2c86426d2bbb2c9553dc1dce6a309d9922c35167ee6a718ad08cf3d0a22f0aed4d4c547cdbed85b47283e5b60a128fd1bbb230a6687f0c28af3a9c228 SHA512 fddc0f1ffa3e68ce57833c6ff18382296838287dd98f9f77f679ced471c3f801af30376363a870232f337bda27b3ba6ea93074f8e3c05ee390bcc024e3690bea
-DIST syn-2.0.89.crate 289852 BLAKE2B 4e2b06d2a0ea9b8970338ab61f8c5569cb7c10466dcf139576d0618c3690cfd23c98b66f0714c34839364dee72df6a6d8571f73dbf03ecc347fb1effb118fc2f SHA512 d172936f04a383b7b5e79dad328e70ea3c4faba4a88d0b6d186645413e8698434d30f53012cc9d3813f617c8bef75e95a2d064fdabae7867678abbed22bcd910
 DIST syn-2.0.90.crate 290584 BLAKE2B 9f469001c1439ffe57c578119653d3021c2709767e8e881441459a190402679f4fb78aa65e7822ff20913801c3be00d9b8f115189ea8e63ed94ed359b40fc9e1 SHA512 44606124f113c259c19edcb2adc1378d8292b422d800604c0e0d1ba89bd2d13d518cf4a6afa58daded54da9cb285464aadb113815406a0f09c5e18f865789ae0
 DIST synstructure-0.13.1.crate 18327 BLAKE2B b29ee88c559a2d58fa46b7af155b448f001649ea79a1898f0ac87e69108b87c65cbd287d8f9001f360df7fef06ff39c937b48d33e487a30c8eec6a46c639c0c2 SHA512 09024193b44fc9a8901bda845b9f86c57dad65d0f53e309b2e7e968538fab6f67db1c86e5e52a2eb8fd116dc073e3ad10983bd60764662ec6ba94fee22a958aa
-DIST target-lexicon-0.12.14.crate 25508 BLAKE2B 5ebb6b49e5c3b0057959557651287d4bf5ffe5b499340019ff64d5fc3b64e780e344982e358c94b1b25a20bf0f526a584aeecc704695b50a55cc268dd65edb97 SHA512 3410ecc0faf854f49c41c99f83972960e67065b1e0e78557a7c4996d996109bfd167d2121a019f5256f996c896cd45af032038ab7918fdcc6ee6311693ce951a
 DIST target-lexicon-0.12.16.crate 26488 BLAKE2B e7950e4a302059a1bfc9bc15618a3c1b971a17cffae117a6e8f5f63a0d82fd2bd02680301d15338612d5426d349dd24cfee30ee787a15a7d3187f2a6825e69ce SHA512 092639957c4a0391560b6442b31c47159c04d12e971010f730a6ec9cb5389e4be903ef3d7daa06db95e64dc78b6970731fb647179ebaad2b12e9ed5e9b24da27
 DIST tendril-0.4.3.crate 37210 BLAKE2B 0a70926644e8dc492247d49b8939169702903c2458d7b2c0fea2e6ed54166909f484e8e876eddc8ff7491642ec24a200c5d1e51412c6a7c26ee60f1f4164e98c SHA512 53f074aec6e59717fca280b1764f6c2e0a1c073336f48d012ff268a7189697d42d24a91a6a549c7d9e1fe8b0006e34c219f4dba3cc95247d3905c6f8a6a8186f
 DIST tinystr-0.7.6.crate 16971 BLAKE2B 33a248261c4cded41a81f0d6e6c8df55437f042b37f235c39787986ec562f0dbff50b282ad0f1483daaf49c4b33e6618e139a6677d1238c21f4e12082562b4ae SHA512 a33051848de248cac0a2d151760a78cb3aa62c787d84ff7aac38b11c0660e9188e4d43d43a77fb8676e49ac6102015e9c3db057848d809e71981851875d0fb25
-DIST tinyvec-1.7.0.crate 46743 BLAKE2B ec9741aaf6900ed2651c222d80688176353fd2ba99ef54db18059bc527b638fea1e9d0ed03b18a8c2f3a4732f94dcfbdf1411050f1d744da5d88cbab569b88de SHA512 9628e5a8861d01e22f00161b3cee58861a2801cd0c64016872bc0c6fb49899a553abd0bbed61064ed91e3a8fbd93e311b2a622fd21d74345e80ec27c1e2f36db
-DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
-DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8
-DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 DIST unicode-ident-1.0.14.crate 47547 BLAKE2B 30e0b6d7f3a967aaf5b9d91237008a60c3a8ded53bda901696e23cea3931dd71b01ddab866dca9e31e17c395d5f5a68f2a938655b693e894962568c2cff5ca15 SHA512 7c6dcd1724e8cfedc37546d1abd49088b633dad228097acc73d7b6cab255b223e830c541144e05a00388fd8ca8066f27c18792419cfa58ee9da4460a38d0bc0a
-DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c8782321b1bbbee724db1e4d8c1d43af4e6bd8044b99307c227d93631d178d10fda445a941a485882ae0015a6e3d3c347e4bd465bbe1d9 SHA512 539f04010810d73fde7b0ab314faf813f3e7ecd2e51d7975281554b7cba4a8706e2b5523c4b7840568593652360ca59e9db0e1ce342e71c28db635ff55ffb0f5
 DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505
-DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d9183478cf501c26fb5f22d7704ef1313ba6d355e849cbf8ab7980310c1aae85e253a2b28d59099e23af29 SHA512 2515903e41c0659cb226f9bb049ef80f2a49d1b609b6ac480e570a84e899088ffe3be4fb58f41a1fa7f5288eb5f97ab513f331aeb6d56979df783d48e2ace28a
 DIST url-2.5.4.crate 81097 BLAKE2B 74943c63809ca41a526a146bedae66f91f390fbd2ccbd90f9397d8074ee7ec26535f0f67170eb1d7232e139d8d795fde99be37f53f1bc32c6a6a4d46aad1369f SHA512 8f1d62bfdd45f52fa12ad657a521a3478d0ab54d187346a29dd59cc66a0f140ca96d850948e09f6316f08b44b3fc68526c58bd620fed5d065b7e8528df3cd46d
 DIST utf-8-0.7.6.crate 10422 BLAKE2B 296690040895ba9da9e69d527aea415f4bd6bd3c010e67a08f9cffd2f4cd92a99f9ddde77512f9ef5a0db069ac9ac3cd6fd91aa18f0bcadf870ed212fdd76f2b SHA512 6bf0787cc297a1ac4e47389464d05ef6850602f549621687e776618bec96c1f7bacbb1ac8faaa63e5d28d975b850db8d6c784eb66e2466128f0521b91c14015b
 DIST utf16_iter-1.0.5.crate 9736 BLAKE2B edcd9776113d4d2b267a9cbd58cab11c5497ff1a8252c4e695de619fc8e5eee1595343c857651774b3670d13392144e9d7df579f2e226842aa7e4e023a76fb65 SHA512 44dcbc5a7db149392fdaa31862be240f78fc5d7616f54be32cfc8f3adbee310e8681ae1bbe6edaad8a7fe6e7759dbac8ae4f69d0dbdbe5350c21dccdbbe975fa
diff --git a/dev-python/nh3/nh3-0.2.18-r1.ebuild b/dev-python/nh3/nh3-0.2.18-r1.ebuild
deleted file mode 100644
index 14e9c185d518..000000000000
--- a/dev-python/nh3/nh3-0.2.18-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	ammonia@4.0.0
-	autocfg@1.3.0
-	bitflags@2.6.0
-	cfg-if@1.0.0
-	form_urlencoded@1.2.1
-	futf@0.1.5
-	getrandom@0.2.15
-	heck@0.5.0
-	html5ever@0.27.0
-	idna@0.5.0
-	indoc@2.0.5
-	libc@0.2.155
-	lock_api@0.4.12
-	log@0.4.22
-	mac@0.1.1
-	maplit@1.0.2
-	markup5ever@0.12.1
-	memoffset@0.9.1
-	new_debug_unreachable@1.0.6
-	once_cell@1.19.0
-	parking_lot@0.12.3
-	parking_lot_core@0.9.10
-	percent-encoding@2.3.1
-	phf@0.11.2
-	phf_codegen@0.11.2
-	phf_generator@0.10.0
-	phf_generator@0.11.2
-	phf_shared@0.10.0
-	phf_shared@0.11.2
-	portable-atomic@1.6.0
-	ppv-lite86@0.2.17
-	precomputed-hash@0.1.1
-	proc-macro2@1.0.86
-	pyo3-build-config@0.22.0
-	pyo3-ffi@0.22.0
-	pyo3-macros-backend@0.22.0
-	pyo3-macros@0.22.0
-	pyo3@0.22.0
-	quote@1.0.36
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	redox_syscall@0.5.2
-	scopeguard@1.2.0
-	serde@1.0.204
-	serde_derive@1.0.204
-	siphasher@0.3.11
-	smallvec@1.13.2
-	string_cache@0.8.7
-	string_cache_codegen@0.5.2
-	syn@2.0.69
-	target-lexicon@0.12.14
-	tendril@0.4.3
-	tinyvec@1.7.0
-	tinyvec_macros@0.1.1
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	unindent@0.2.3
-	url@2.5.2
-	utf-8@0.7.6
-	wasi@0.11.0+wasi-snapshot-preview1
-	windows-targets@0.52.6
-	windows_aarch64_gnullvm@0.52.6
-	windows_aarch64_msvc@0.52.6
-	windows_i686_gnu@0.52.6
-	windows_i686_gnullvm@0.52.6
-	windows_i686_msvc@0.52.6
-	windows_x86_64_gnu@0.52.6
-	windows_x86_64_gnullvm@0.52.6
-	windows_x86_64_msvc@0.52.6
-"
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Ammonia HTML sanitizer Python binding"
-HOMEPAGE="
-	https://github.com/messense/nh3/
-	https://pypi.org/project/nh3/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-# Rust
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/nh3/nh3.*.so"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# force unstable ABI to workaround stable ABI crash in py3.13
-	# https://github.com/PyO3/pyo3/issues/4311
-	sed -i -e 's:"abi3-py37",::' Cargo.toml || die
-	export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
-}
diff --git a/dev-python/nh3/nh3-0.2.19.ebuild b/dev-python/nh3/nh3-0.2.19.ebuild
deleted file mode 100644
index 0911685ee910..000000000000
--- a/dev-python/nh3/nh3-0.2.19.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	ammonia@4.0.0
-	autocfg@1.4.0
-	bitflags@2.6.0
-	byteorder@1.5.0
-	cc@1.2.1
-	cfg-if@1.0.0
-	displaydoc@0.2.5
-	form_urlencoded@1.2.1
-	futf@0.1.5
-	getrandom@0.2.15
-	heck@0.5.0
-	html5ever@0.27.0
-	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
-	indoc@2.0.5
-	libc@0.2.166
-	litemap@0.7.4
-	lock_api@0.4.12
-	log@0.4.22
-	mac@0.1.1
-	maplit@1.0.2
-	markup5ever@0.12.1
-	memoffset@0.9.1
-	new_debug_unreachable@1.0.6
-	once_cell@1.20.2
-	parking_lot@0.12.3
-	parking_lot_core@0.9.10
-	percent-encoding@2.3.1
-	phf@0.11.2
-	phf_codegen@0.11.2
-	phf_generator@0.10.0
-	phf_generator@0.11.2
-	phf_shared@0.10.0
-	phf_shared@0.11.2
-	portable-atomic@1.10.0
-	ppv-lite86@0.2.20
-	precomputed-hash@0.1.1
-	proc-macro2@1.0.92
-	pyo3-build-config@0.23.2
-	pyo3-ffi@0.23.2
-	pyo3-macros-backend@0.23.2
-	pyo3-macros@0.23.2
-	pyo3@0.23.2
-	python3-dll-a@0.2.10
-	quote@1.0.37
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	redox_syscall@0.5.7
-	scopeguard@1.2.0
-	serde@1.0.215
-	serde_derive@1.0.215
-	shlex@1.3.0
-	siphasher@0.3.11
-	smallvec@1.13.2
-	stable_deref_trait@1.2.0
-	string_cache@0.8.7
-	string_cache_codegen@0.5.2
-	syn@2.0.89
-	synstructure@0.13.1
-	target-lexicon@0.12.16
-	tendril@0.4.3
-	tinystr@0.7.6
-	unicode-ident@1.0.14
-	unindent@0.2.3
-	url@2.5.4
-	utf-8@0.7.6
-	utf16_iter@1.0.5
-	utf8_iter@1.0.4
-	wasi@0.11.0+wasi-snapshot-preview1
-	windows-targets@0.52.6
-	windows_aarch64_gnullvm@0.52.6
-	windows_aarch64_msvc@0.52.6
-	windows_i686_gnu@0.52.6
-	windows_i686_gnullvm@0.52.6
-	windows_i686_msvc@0.52.6
-	windows_x86_64_gnu@0.52.6
-	windows_x86_64_gnullvm@0.52.6
-	windows_x86_64_msvc@0.52.6
-	write16@1.0.0
-	writeable@0.5.5
-	yoke-derive@0.7.5
-	yoke@0.7.5
-	zerocopy-derive@0.7.35
-	zerocopy@0.7.35
-	zerofrom-derive@0.1.5
-	zerofrom@0.1.5
-	zerovec-derive@0.10.3
-	zerovec@0.10.4
-"
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Ammonia HTML sanitizer Python binding"
-HOMEPAGE="
-	https://github.com/messense/nh3/
-	https://pypi.org/project/nh3/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-distutils_enable_tests pytest
-
-# Rust
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/nh3/nh3.*.so"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# force unstable ABI to workaround stable ABI crash in py3.13
-	# https://github.com/PyO3/pyo3/issues/4311
-	sed -i -e 's:"abi3-py37",::' Cargo.toml || die
-	export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
-}
diff --git a/dev-python/nh3/nh3-0.2.20.ebuild b/dev-python/nh3/nh3-0.2.20.ebuild
index b9cb71e8372a..94aab35600cb 100644
--- a/dev-python/nh3/nh3-0.2.20.ebuild
+++ b/dev-python/nh3/nh3-0.2.20.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
@@ -124,7 +124,7 @@ LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 177897dc2391..a7953dffa782 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,2 +1 @@
-DIST notebook-7.3.1.tar.gz 12777449 BLAKE2B 76e874c692ecdd6cf0b694c5185184e7f6523ef75e65b3dbe512773f4194dfb56fe41bac6b41af6f5a14fcd7c56251efc68b3812fe20460bd4681bedc6331d1a SHA512 af9f4f85163e5494e3e7540d2ef5cc63304018a1afd3ad48158e5b9192ca6c7b1a23760f62ae372fb4a73c081fab1255649ac592b717270f86266712173f500f
 DIST notebook-7.3.2.tar.gz 12781804 BLAKE2B 708d9d2bf43db2de71b4a9b5b1bf664b5922cde036171e7792238e10b6ac05a2ae93dcf478dc7d9d262ab8bbf8ad916695f46eeddd32ea763b53bd8c53009f73 SHA512 71c81e745488985ecb75b37e70d5c3937a824366270e3ee8d45c6bc535614d1e5c0f0f06b5e2b7bc0a8d5f47fa99679d1fe6de86659f494be9ba4d99e9bfe34e
diff --git a/dev-python/notebook/notebook-7.3.1.ebuild b/dev-python/notebook/notebook-7.3.1.ebuild
deleted file mode 100644
index 3044dfb68486..000000000000
--- a/dev-python/notebook/notebook-7.3.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/notebook/
-	https://pypi.org/project/notebook/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-4.3.2[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-4.4[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.27.1[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	<dev-python/notebook-shim-0.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-4.3.2[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-4.4[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/nbval[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/notebook/notebook-7.3.2.ebuild b/dev-python/notebook/notebook-7.3.2.ebuild
index 19a2515ea0d1..90bf91a89442 100644
--- a/dev-python/notebook/notebook-7.3.2.ebuild
+++ b/dev-python/notebook/notebook-7.3.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
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index e223dfa8e11a..d63322f974e8 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,2 +1,2 @@
-DIST Nuitka-2.5.8.tar.gz 3777360 BLAKE2B 77a7c4cb3b71c6e0d5ae5fc3467c75afa4374593a187312ddb7caf54053eca9dbd17744c323b55954699e491fd28810b660ea44c2b25aa69d2b595000fb0ab11 SHA512 024d32b28e312baff1a68e654a78c4581ad09dace681202d0077c46c2d9117f7666a87288a5cc1005604fd535ce0ae8409c2002b37694edab95788b38fcee30c
 DIST Nuitka-2.5.9.tar.gz 3777278 BLAKE2B 1140c02c0f204f70d6646efcf88178a59cd6ad4c7848855711a0ca7462f5e173f2260f7106552e785120c8f0f1926b45f459047b0053a6a1718ae793829c9232 SHA512 ef3645d9ed35579c2021c185418eb8e1a78390b80b88669e271703fd04910ee5e8d2203ef3c3dddc432bf5ab4f51f2ecb4d8b6c60c3ac02dc43545ce32c01606
+DIST Nuitka-2.6.tar.gz 3858229 BLAKE2B 810f99da2560a302366cd2f9729fcbd1e4a0b4429cba3d4b4b43e70c91619afa8f3f4f73bf19282e246c2ec4ffbf468df8206ed3acbac09148f5302c5b67a3d9 SHA512 5194614cc8de3d3fa0f8be3769f0fb6e10b6c6f1bd45e5be0b09e96774a6a0cbe6938f6c66f903b23ad4cb480d7557aa69d14a4b8a659d12e33859f215e9a1f7
diff --git a/dev-python/nuitka/nuitka-2.5.8.ebuild b/dev-python/nuitka/nuitka-2.5.8.ebuild
deleted file mode 100644
index d79d86fa299c..000000000000
--- a/dev-python/nuitka/nuitka-2.5.8.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 flag-o-matic optfeature pypi
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="
-	https://nuitka.net/
-	https://github.com/Nuitka/Nuitka/
-	https://pypi.org/project/Nuitka/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-build/scons[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/zstandard-0.15[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka.1 doc/nuitka-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" dev-util/patchelf
-}
diff --git a/dev-python/nuitka/nuitka-2.6.ebuild b/dev-python/nuitka/nuitka-2.6.ebuild
new file mode 100644
index 000000000000..a5b9f247836d
--- /dev/null
+++ b/dev-python/nuitka/nuitka-2.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN^}
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 flag-o-matic optfeature pypi
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="
+	https://nuitka.net/
+	https://github.com/Nuitka/Nuitka/
+	https://pypi.org/project/Nuitka/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-build/scons[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.1.0[${PYTHON_USEDEP}]
+	>=dev-python/zstandard-0.15[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka.1 doc/nuitka-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" dev-util/patchelf
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index a52adf238591..bdc662226c1b 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -3,3 +3,4 @@ DIST numpy-2.0.2.tar.gz 18902015 BLAKE2B 63f993e3429bff1dac1ff79fad23a36a2493fd2
 DIST numpy-2.1.3.tar.gz 20166090 BLAKE2B 746d343b17039d58738358168a613a2b85d6fb9cad1eeb367b851cd8d46fd42647990b47f0b4fb794ce5c4da2fa0a5d61e3ba42ea2f1945680f36cff31bb7b0d SHA512 59568acda3a77160908a23c354f0574970cb3daeea79ab535762a75a5f3a52a5cedd5754bb507cc238cf5948b37f0045523ed59c04cf6fc4a94ed22b9b77b8c1
 DIST numpy-2.2.0.tar.gz 20225497 BLAKE2B 87450bbe52085edd55cd99303bbb7d71b44bf14be8326bffe46886cf14d442bd51443b1c89e3f04ce13ee7724e39c9a2f302e2394f05781430e66efd8347c3dc SHA512 3a0776ac175beb82b2aea0d384b60896cd1ee1055b414765965edd621839c8292fadaaaa18482c975c8e34319578cb20db4aa8f4ad06bd41a1833563c55fc3e9
 DIST numpy-2.2.1.tar.gz 20227662 BLAKE2B 2b963af971b0fff6ea5802aa6e4b7ed33fcb885aec40b529cd97de9b5887697cd3cd857ffdedcce7f9b9d077ed388947683bc0b3f8fa7ef724acf382378da2c5 SHA512 15876635bd2b26a0f511472c447ff95102f3016eea02e5117d7f5a1ae4782cd656c10706e8b2e00adee0920a7673f216056fb842700d634fbb5630b672f26ddf
+DIST numpy-2.2.2.tar.gz 20233295 BLAKE2B 5b95ae4ff511468e55c0367066e9d4b8939fd1da2dd7ce39e5c7cb5897789599ba622c3c7ad53e787903042c1fcfd6225205f0da3d54110410b635e4179f9941 SHA512 f30c400b0a0296ac7990bfe143d4e01e9429e14a09f0525843c6f8e29d2e589289774e4c803fc9de640bf920749dcb3e50663da812b3541f4dc1b7046ab27b40
diff --git a/dev-python/numpy/numpy-2.2.1.ebuild b/dev-python/numpy/numpy-2.2.1.ebuild
index a9648e63599e..acf6950f909a 100644
--- a/dev-python/numpy/numpy-2.2.1.ebuild
+++ b/dev-python/numpy/numpy-2.2.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
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 # +lapack because the internal fallbacks are pretty slow. Building without blas
 # is barely supported anyway, see bug #914358.
 IUSE="big-endian +lapack"
diff --git a/dev-python/numpy/numpy-2.2.2.ebuild b/dev-python/numpy/numpy-2.2.2.ebuild
new file mode 100644
index 000000000000..84c10bd2db9d
--- /dev/null
+++ b/dev-python/numpy/numpy-2.2.2.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 pypi
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="
+	https://numpy.org/
+	https://github.com/numpy/numpy/
+	https://pypi.org/project/numpy/
+"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# +lapack because the internal fallbacks are pretty slow. Building without blas
+# is barely supported anyway, see bug #914358.
+IUSE="big-endian +lapack"
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8
+		>=virtual/lapack-3.8
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-build/meson-1.1.0
+	>=dev-python/cython-3.0.6[${PYTHON_USEDEP}]
+	lapack? (
+		virtual/pkgconfig
+	)
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/charset-normalizer[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	)
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# https://bugs.gentoo.org/925367
+	vrndq_f32
+)
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# bug #922457
+	filter-lto
+	# https://github.com/numpy/numpy/issues/25004
+	append-flags -fno-strict-aliasing
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	DISTUTILS_ARGS=(
+		-Dallow-noblas=$(usex !lapack true false)
+		-Dblas=$(usev lapack cblas)
+		-Dlapack=$(usev lapack lapack)
+		# TODO: cpu-* options
+	)
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Very disk-and-memory-hungry
+		numpy/lib/tests/test_io.py::TestSaveTxt::test_large_zip
+		numpy/lib/tests/test_io.py::TestSavezLoad::test_closing_fid
+		numpy/lib/tests/test_io.py::TestSavezLoad::test_closing_zipfile_after_load
+
+		# Precision problems
+		numpy/_core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
+
+		# Runs the whole test suite recursively, that's just crazy
+		numpy/core/tests/test_mem_policy.py::test_new_policy
+
+		numpy/typing/tests/test_typing.py
+		# Uses huge amount of memory
+		numpy/core/tests/test_mem_overlap.py
+	)
+
+	if [[ $(uname -m) == armv8l ]]; then
+		# Degenerate case of arm32 chroot on arm64, bug #774108
+		EPYTEST_DESELECT+=(
+			numpy/_core/tests/test_cpu_features.py::Test_ARM_Features::test_features
+		)
+	fi
+
+	case ${ARCH} in
+		arm)
+			EPYTEST_DESELECT+=(
+				# TODO: warnings
+				numpy/_core/tests/test_umath.py::TestSpecialFloats::test_unary_spurious_fpexception
+
+				# TODO
+				numpy/_core/tests/test_function_base.py::TestLinspace::test_denormal_numbers
+				numpy/f2py/tests/test_kind.py::TestKind::test_real
+				numpy/f2py/tests/test_kind.py::TestKind::test_quad_precisionn
+
+				# require too much memory
+				'numpy/_core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
+				'numpy/_core/tests/test_multiarray.py::TestDot::test_huge_vectordot[float64]'
+			)
+			;;
+		hppa)
+			EPYTEST_DESELECT+=(
+				# https://bugs.gentoo.org/942689
+				"numpy/_core/tests/test_dtype.py::TestBuiltin::test_dtype[int]"
+				"numpy/_core/tests/test_dtype.py::TestBuiltin::test_dtype[float]"
+				numpy/f2py/tests/test_kind.py::TestKind::test_real
+				numpy/f2py/tests/test_kind.py::TestKind::test_quad_precision
+				numpy/tests/test_ctypeslib.py::TestAsArray::test_reference_cycles
+				numpy/tests/test_ctypeslib.py::TestAsArray::test_segmentation_fault
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_scalar
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_subarray
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_structure
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_structure_aligned
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_union
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_padded_union
+			)
+			;;
+		ppc|x86)
+			EPYTEST_DESELECT+=(
+				# require too much memory
+				'numpy/_core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
+				'numpy/_core/tests/test_multiarray.py::TestDot::test_huge_vectordot[float64]'
+			)
+			;;
+	esac
+
+	if [[ ${CHOST} == powerpc64le-* ]]; then
+		EPYTEST_DESELECT+=(
+			# long double thingy
+			numpy/_core/tests/test_scalarprint.py::TestRealScalars::test_ppc64_ibm_double_double128
+		)
+	fi
+
+	if use big-endian; then
+		EPYTEST_DESELECT+=(
+			# ppc64 and sparc
+			numpy/linalg/tests/test_linalg.py::TestDet::test_generalized_sq_cases
+			numpy/linalg/tests/test_linalg.py::TestDet::test_sq_cases
+			"numpy/f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[s1]"
+			"numpy/f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[t1]"
+			"numpy/f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[s1]"
+			"numpy/f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[t1]"
+		)
+	fi
+
+	if ! has_version -b "~${CATEGORY}/${P}[${PYTHON_USEDEP}]" ; then
+		# depends on importing numpy.random from system namespace
+		EPYTEST_DESELECT+=(
+			'numpy/random/tests/test_extending.py::test_cython'
+		)
+	fi
+
+	if has_version ">=dev-python/setuptools-74[${PYTHON_USEDEP}]"; then
+		# msvccompiler removal
+		EPYTEST_DESELECT+=(
+			numpy/tests/test_public_api.py::test_all_modules_are_expected_2
+			numpy/tests/test_public_api.py::test_api_importable
+		)
+		EPYTEST_IGNORE+=(
+			numpy/distutils/tests/test_mingw32ccompiler.py
+			numpy/distutils/tests/test_system_info.py
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	epytest -p rerunfailures --reruns=5
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/objgraph/objgraph-3.6.2.ebuild b/dev-python/objgraph/objgraph-3.6.2.ebuild
index 570a9f811807..f96d5d7f4f66 100644
--- a/dev-python/objgraph/objgraph-3.6.2.ebuild
+++ b/dev-python/objgraph/objgraph-3.6.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/openapi-schema-validator/Manifest b/dev-python/openapi-schema-validator/Manifest
index 371a9906cd90..ac4b92c23fee 100644
--- a/dev-python/openapi-schema-validator/Manifest
+++ b/dev-python/openapi-schema-validator/Manifest
@@ -1 +1,2 @@
 DIST openapi_schema_validator-0.6.2.tar.gz 11860 BLAKE2B c9f540998e3e69f987900caa8b12e5bab258c9046babd0705e168d57817666302e000b7b69a71ea74f37cc5bd363a90a45ac29a31e32b91dcc6f48adccb21489 SHA512 709f7a7c00bf050fa2c48a05bcd4e83ad309029f62df10ba61424cb46413cb9218bf2930f24a4db09f7648e51135f346855a4d58ce836b315a82a9986b655932
+DIST openapi_schema_validator-0.6.3.tar.gz 11550 BLAKE2B 5080b089301a651514b1c5689f28d94893bfcae66ee9624f17bf59a017d9246b23855ae66fc82e0d74a42810978dfeb4b84029c9dbb7d6724885e765b3d9162c SHA512 f335fc4dd1530cbcdd63ece998a42b27497e31e7191fc8e65437ae1810a7bc12e313d8eac982368d33a643502d13e1f69f6b00f710b4e90c50961bdfe7150ff9
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.6.3.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.6.3.ebuild
new file mode 100644
index 000000000000..9ed789e4893f
--- /dev/null
+++ b/dev-python/openapi-schema-validator/openapi-schema-validator-0.6.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="OpenAPI schema validation for Python"
+HOMEPAGE="
+	https://github.com/python-openapi/openapi-schema-validator/
+	https://pypi.org/project/openapi-schema-validator/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.19.1[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-specifications-2023.5.2[${PYTHON_USEDEP}]
+	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	sed -i -e '/--cov/d' pyproject.toml || die
+}
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index d048be4775fb..b0339bbe0316 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,2 +1 @@
-DIST openstackdocstheme-3.4.0.tar.gz 1256314 BLAKE2B 595f1a8b1729cd79e998d4de9817daf23365b4e1b9d8361afbddbd20ecd8ead3c07662a5ff0de70986547ed3cad32785c5182cdf1fadfea455d6824036b5f59b SHA512 34cc9a2f4d1f6cda86e4f4b411edaf3d3fc229c2384ce160cb9b65068054793867b14c40beaf9f4b46948da8f22f70a68d5a3868c4b8605ade0aa2b0d8750828
 DIST openstackdocstheme-3.4.1.tar.gz 1256381 BLAKE2B df100b6092c8c3635b80f01cb31de4cc3ded146289c40c77049c6f2f993bd779147d295b7867b23f930d44590e89d5d26af7b03e935077ca74702122f3699113 SHA512 93473465e6ce5199b20f738232f71d837d537052fa273efa3dc11448ec4d86a7f6a0253baac4fbcec7f3378d1e6683982c14d91dd1f9f2fd7638d1fe96791a33
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.4.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.4.0.ebuild
deleted file mode 100644
index 6beae3254415..000000000000
--- a/dev-python/openstackdocstheme/openstackdocstheme-3.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Theme and extension support for Sphinx documentation"
-HOMEPAGE="
-	https://docs.openstack.org/openstackdocstheme/latest/
-	https://opendev.org/openstack/openstackdocstheme/
-	https://github.com/openstack/openstackdocstheme/
-	https://pypi.org/project/openstackdocstheme/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv ~s390 x86"
-
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${BDEPEND}
-	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.4.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.4.1.ebuild
index 1034959ab80a..8c7a9ceb07ce 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-3.4.1.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-3.4.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv ~s390 x86"
 
 BDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 25693ec939c5..ac58a788609e 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,2 +1 @@
-DIST openstacksdk-4.1.0.tar.gz 1233207 BLAKE2B d7473caa09e2ce7b4a91690a43adfd7e4aeb04e56be68f50cccce74b39368460656148656d540389538ad671205b752da0826ce74dbbf2c4078c0f999224853c SHA512 38a077d487cbdaf22e33a7dacb06ccd78145caba9a5c69afd3be49d742c87ae642440b331ececcdeb331f2d0040e49ba5f707be83972db1671728008ecd2df09
 DIST openstacksdk-4.2.0.tar.gz 1236489 BLAKE2B bf45026569535dea61798583e8988e59be403e5835eafaae6f0ff206e26e07f67c1e32ea518f2d55c6e32c91c3c372def025c561f720e78fb11cc76eba70bdb3 SHA512 2e4ef9a853b74645816affa40d57aa71cdbc50ee09d14bddff5314966d8cf35eb1179df4b58ea14f225edf597da2cdffaf11c28a25ba79549dd7d1b837d01879
diff --git a/dev-python/openstacksdk/openstacksdk-4.1.0.ebuild b/dev-python/openstacksdk/openstacksdk-4.1.0.ebuild
deleted file mode 100644
index 45d7c67aff60..000000000000
--- a/dev-python/openstacksdk/openstacksdk-4.1.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A collection of libraries for building applications to work with OpenStack"
-HOMEPAGE="
-	https://opendev.org/openstack/openstacksdk/
-	https://github.com/openstack/openstacksdk/
-	https://pypi.org/project/openstacksdk/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonpatch-1.21[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Internet?
-	sed -e 's:test_create_dynamic_large_object:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# TODO
-	sed -e 's:test_generate_form:_&:' \
-		-e 's:test_create_static_large_object:_&:' \
-		-e 's:test_object_segment_retries:_&:' \
-		-e 's:test_object_segment_retry_failure:_&:' \
-		-e 's:test_slo_manifest_retry:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-	sed -e 's:test_servers:_&:' \
-		-i openstack/tests/unit/test_stats.py || die
-
-	# unhappy about paths due to test runner
-	sed -e 's:test_method_not_supported:_&:' \
-		-i openstack/tests/unit/test_exceptions.py || die
-	sed -e 's:test_repr:_&:' \
-		-i openstack/tests/unit/test_resource.py || die
-
-	# requires hacking
-	rm openstack/tests/unit/test_hacking.py || die
-
-	# fragile warning-based tests
-	sed -e 's:test_unsupported_version_override:_&:' \
-		-i openstack/tests/unit/test_missing_version.py || die
-	sed -e 's:test_create_unknown_proxy:_&:' \
-		-i openstack/tests/unit/test_connection.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstack/tests/unit
-}
diff --git a/dev-python/openstacksdk/openstacksdk-4.2.0.ebuild b/dev-python/openstacksdk/openstacksdk-4.2.0.ebuild
index 046e9dd2bf3e..76e0ddec3a5b 100644
--- a/dev-python/openstacksdk/openstacksdk-4.2.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-4.2.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
diff --git a/dev-python/orjson/Manifest b/dev-python/orjson/Manifest
index 3d5a2316248f..fec3618e9654 100644
--- a/dev-python/orjson/Manifest
+++ b/dev-python/orjson/Manifest
@@ -5,6 +5,7 @@ DIST cc-1.1.31.crate 84637 BLAKE2B 80b95666f87f80f20efc53aacb132db32900132a58995
 DIST cc-1.2.1.crate 92731 BLAKE2B c9cb100964834692781ecc3f47972f83adaf27e019ca212f896b19a853521cf2084da213f2c2fc5c8a1bc794cc83fe9f81faf7751e1b065a3a2a08137cda0b61 SHA512 54bc5d85d48d678d33dc795aa6cc823a59ae6d17b4ec5708a1dd515e3495eabccdd949e9467e9bb3a29e44847a2d3ccd75055dfda241d8abbb16bfad650f2819
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST compact_str-0.8.0.crate 70994 BLAKE2B 27ab4163d71915f9cfc160fdfa4ed049c98b06d0060def8c4bdd29e8ca37716a1c53877f70d1eb38260d44003e833c538b20bb4960f0b28a7becca5c9b29984e SHA512 5a236c501222b577fef7d7190882e20e85cc6deacf9d1f6a1d710893654b53a91c7d47373f0d10e9bfe138dbb2f4e99802deb2a92001bae7e130f6558ed9d1fd
+DIST compact_str-0.8.1.crate 71371 BLAKE2B de7fd2b980a4b34b323010fe559a94e8b1aafa30456debc039aefcdaaefa48439353139a071e440b3bb136df166aabe096774bf3f6a7b91669cd5d80e4a24408 SHA512 146e2a6be6cf948981d51f9034f0aaa1a1563debef58ca7fd3110093b0f4333a9a6a3c5dc7cde25b936d8dfba72254bfacb7814f86167043431ded9c5797417a
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST encoding_rs-0.8.35.crate 1381050 BLAKE2B 2db6797e4f226b3836c18496ed77f3fb113fbc075864fd264f23c4fec8396eb3a01c439985ba0586a4464ac4043ddd3acac80e0ecf897cb59569e5065ce2137c SHA512 4b55b53553c5cb6fe05ae81d1c6f3b0bab73ecd3d426b15c58b9de9ea8dd61617bf0bb2e6d3ae2514c7cb6e73019b1a083173d1423b3ece2d190770c597114c4
 DIST gimli-0.30.0.crate 277411 BLAKE2B e3d2b0f55a407f6ea64c36dd4042e3e3601d032c4feb9819c2c414f0203a860cd2181c4d6cf9590ec2c2d978998c2cde6e5d36dfae885abacf7a42d57e13f1af SHA512 f7ab35abb6e565d4cc717659ec6fbb21598c1d350052b60e3f7cf03e87ed3b588f0f2e44991960ec5cbc7992299cdf4cee88eda38dda456127374a758cfdcb35
@@ -12,38 +13,54 @@ DIST gimli-0.31.1.crate 279515 BLAKE2B c8924ce351af5b8f96ef757a189f7a9be14533c02
 DIST half-2.4.1.crate 50892 BLAKE2B c275a9ec70d2fc0c50cb63421399202d31252b0dbf463798ed0a12a17493817c66b8933811d483b348f8f945cb05aab7cc2a4d952bd16009c3da4860202e28dc SHA512 0bce235583ca128723186e1fb50f636b519bf826c942f02c5b969db4117baa87c644665c541991c16d1f1dd97c7233c017a513d45075fc72c5d99ccc7c1ac193
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST itoa-1.0.13.crate 11188 BLAKE2B f9e61bff257763f1b395e8f8f93335be2e46d1c57be67ddc42af44053ebca2e7a35b26f6d109fb42af35ddbf608ab6960c62f1dd740aaaf0dda18ee2b44d09de SHA512 8d9104f57e6eef32ec7c1389177060cd0ecb628d48c8b202c7f46e29c8a6a2ac93f9fcaf00f903024d213998a88febeeaf70d15cdebc414517b94e76b29ac6a2
+DIST itoa-1.0.14.crate 11210 BLAKE2B b2d33dc384757963eab3ae7d80bb672d828a549967986e3af8c70fe71a0ad46c4a278da2db4dfccef99e804e6cd4934067e97c0697a33ac3302cafbc46eeb416 SHA512 ea2d38df373652ddacccd11e610dfdad4e3ae7f0d476514e6ac58092733c817bd834e8cd88c3bc4178dd5a646ba628ae626195e0aa407e8534ae3c2a7b049987
 DIST itoap-1.0.1.crate 83316 BLAKE2B db0d9f712155bfe4285c3d3debf314da2d64ffd127d6b9dd471074eb7e5dcda41f1e5b04bdad63e0fbd695043eff21956709ffdf2cdd7fc5b329d1d79ee69fc6 SHA512 ed15ba3e1ee1ef5f1658fbb47e8cba66e62acf05d8ac45340e15ace24c86e5adf072b52bfb90ebc5e90f31a9a8e91ada23d4322db9a87bb966922afdd4775840
 DIST jiff-0.1.14.crate 605138 BLAKE2B 130b0fff23f8d710378aed399ab20c84e3a69e5b05d21046c6f6eec4767006c2d9995a7327ead3d334b82a38d11111a5a5591f14fe52d4c7adc26135ee8b047e SHA512 3f1d403e4a6393bcb84b93d4aa0b876de83056fa7dd145b61da611b5436a7dd6ecd1d1681c2eec8c61406c9f4f5cca7cc3000391c9fbeac2f81d7666fdea0d0e
+DIST jiff-0.1.21.crate 687373 BLAKE2B 1c4c48de3e04034df6e699c15957dfab16df211074d846029e7b24103d35555074c672a0f10822152ad6917ab4c6bd62431f3e2002df90e0d916889d6880a2ef SHA512 f78e3ef0023d8dfebd50f3651bfc1ebe5453d0f99d3a3581648dd2e3194253e8f864da4b8c1d1871516c71e92fe8f47f4cbdbde52db9cebc52d38be177b0b4e9
 DIST libc-0.2.161.crate 765389 BLAKE2B 4880efbc347e0b92faa893993f37c486a69afd1a3c741cfb9d3a2d3c87fd56e49788f8aeac17baca217f4ceee9180097386ef481f4e142942802f27983f8e6fa SHA512 264d7a872c10484b9cb19ee858c2ac44bf165297653fbc6220672bd2e0ba10913408130f21d370d2861eef529f9ecafece66515b47b4461d56e6b02f55ea2be8
 DIST libc-0.2.164.crate 769055 BLAKE2B cfb757ea04ec8ad6d6a0dff92cbedd626aa4932cd83d67d19ac51cc140f9aeb54b38b488796c4a0e722f7bceaf54c4807a32ec0560bae4840a82fc1c4a5151ab SHA512 614835ee7388c854cacdc179b5700b7de0c696ec0eebca2b997f1039157f737fa79e208832a46f2fa27fcedb6fe7a27faf26079f06ee0e679b6f35d4a5371e3f
+DIST libc-0.2.169.crate 757901 BLAKE2B 1012cf93d8975aa20fc3f2332e253426ff66be6aed63ace5292cc8568ee419b0f1a4b5b39ddbb78d9c2dfd8d72eb0d068c98faa229ab55556da5e674429f0e97 SHA512 c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST no-panic-0.1.30.crate 11789 BLAKE2B 11c9978e79fc55a259f4a6b16dc5df9b46e722301970722f9ede1133f3907e0d6c474eda5071f619f52e578c9afafcb94a80c3aa67843f0360db9d70d41f8a7e SHA512 c357be0341e7008662a79b1f3c8b749f90074553002dfa5177089116f4cceaeb062c1a2953acc91d63079d95a70fe550f1f02f47a96d7b09858d60e72be26bb0
 DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
 DIST orjson-3.10.11.tar.gz 5444879 BLAKE2B bfa24e6f07fdc952dc9f80a28449fa9121c960cac52cd867796e1ce21344a5c00450bc652b28340c8a4c64f2e8f63699595528e924a019c0b46a8b0c4103eb41 SHA512 b7a960cd06c0176a194c7c9e9dd412c47000258fb79e2407182156e07a48bc02823118ac708c23f482bcb8f3b77dcdcfd95f61f408b45cbaabca8ed317ef63e4
 DIST orjson-3.10.12.tar.gz 5438647 BLAKE2B 88378c76f7b4aaefcc56b3963e60bc6fd8cf740ab683a15c735b8b1a9f69f0a9fb9924e2385c3234ca6f4b44c772f7b6ef359cfc1afc8982fc521db0e99b3100 SHA512 089420645ef4a54674436ebc4f49ba67fda4fff716c949e03a4af402fdd817decd066c508b18c19ac24b634e7173b37924ac1c2180679a92551884957d4b11ae
 DIST orjson-3.10.13.tar.gz 5438389 BLAKE2B 4845c232441ff87e323f661961537e4a9705a7f0191f364c31a62d0784b15c2bd230d6999985b84f2417043451616facd91bad63d84317ac4a12e71687b33713 SHA512 84ee3a42654e5576190dd115483db1e3a9a151b22de79b99b497c2e181adbd5e33a4aa77bb5f72394e0947887e657c5dc6380e852dddb4a5e95b47e72486b18c
+DIST orjson-3.10.14.tar.gz 5282116 BLAKE2B 01c7e3c024e96924bd630556445d0355c43dfaf20241a850c0cf92696dde07b856e54707642d67ea91e457fac7ff7a8ea801f32ce3f869bdccda57c9d75a16f5 SHA512 d186e95ac6750af9f2688744fe663e63973e06942fcbfc10deadc1d63a5ad59f437ea4e2485d1866bde6abcd59086fa5c1a0794d3ba975e693995d3ca58f0f76
+DIST orjson-3.10.15.tar.gz 5282482 BLAKE2B 12ec9b9f5928ac3e9c62362bf7237edc3b68a1559912f7d75f54dcb8d415192c68e5f10d700cf647e9a8e1d7b32b8433fefdd4913c51080ed308b9a96aa5182e SHA512 e20fc9313e494719a1c2ebaeb0fedc45b5c58005dfb868f915b545995b8ca4e705f6bdc691f5df0d8705f393eee439576f82de89c35c0f3c1932a51eca3ef9b3
+DIST portable-atomic-1.10.0.crate 174760 BLAKE2B 9a05d6162c95f5140709cbd005c1997449fb6373700e8ed3966e3379898e95f3cbdb90b387f1c7deb3f1eb33125378852a7168d0d22b433813f6c082112b0365 SHA512 fb47ab53fe240d5b0824dd068c6dda473d3e71ae6f5dfccaa17262a8b6de0e1dde05d83975e53bbfcf43f10ef5c634fc024f94613937927ae93f1adad1dadb19
+DIST portable-atomic-util-0.2.4.crate 47043 BLAKE2B 6a8e122bb2b9eb8262e9eb790f336dbb602f6c086f8ac025740c043170360d5474af578b3842b06ec51535535de3f4d1b6753ec54a6871dd0396f5c1012b0bd4 SHA512 f2266e78576181123aaf68e7b5d3523a368fa8136d447bac68a08d65c7051dea677cea84491a1a03b9decb4704b2f9392574d68dda9427092a2ac92cfa0affe8
 DIST proc-macro2-1.0.89.crate 49446 BLAKE2B 844c021394e7a2551bc179592a6769d672360150abf92debcb9ac60a94a2e426c48c408f06aeb2128686f5f04d66dc12973714670c21a5063ee6b9f3bae4e671 SHA512 488ab38a04df1d0330309382a7e4f667238cbc9b4d513da6a8f5718f8a762f76cc122af67fefe8f4b021a286b3d23e3ec83d781fe6ac823042a6daf14d147e2f
 DIST proc-macro2-1.0.92.crate 52353 BLAKE2B 9aa29fa6f1c56c0392a94a81b4c61953f4d185012cdca37e356817845535da79d7094bf43472ce63109ce479a2fd0cbef4d802afd61daf92c4db303bcac60e7e SHA512 e614f08acc0a7e97ef580479cf5b682378df1ca16f09bfb2296ebb3490a435229dea9d682c621c54ce57e8e1d3b7803eb8ff83c88bd02e07228dba6d02f14aee
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
+DIST quote-1.0.38.crate 31252 BLAKE2B a3836efbe5c21dec70c684002b47b8fc7cef643c82ee903b537a48bc0707a28106c4b33d98e60ff81e04c7520f7404b1dc4d49446e8d91dded517e476c36e1c2 SHA512 530c47c5e6372b508bf5b2b88a138408a7afa5ef52c47280ed20eccf39f8e97dfc1e0a18c1bd5472efcdc49a7a1e69566333a0a1b4c0b4f0e11e6a7a85bfe8af
 DIST rustversion-1.0.18.crate 17794 BLAKE2B fa35445404b836214bdbaa3de8e43312b6d8f50eea32540f808a6255908d756bb1a5dcf49ca6268a1d214c535c2ee770e295c0e7d6430268142a190b31032421 SHA512 263d2cef02b6df4d38b35af7a9ee3a6a044f160f3cf7c6771528f23dea342232087f73f89e419ef7869db771e73c273c05b3dccfe9e29f707586b2059e820645
+DIST rustversion-1.0.19.crate 20616 BLAKE2B 025944fe053ef928f26affb890ef6a563b0e63cf6acc0ce7bd4ff104541f819bbda48ebb59fd8a677e44ca1ea21f4a18c209adf2004c9ad79604dfbeca43b5fb SHA512 45b959aea8155ee47c51aa1d87c6c344b5f4b20199a2646ca30bdabe1c2458b014be91fe0c48c29c2261ad9e5de6df7eef7ddead1682e584d4a906c17984baab
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST serde-1.0.214.crate 78523 BLAKE2B c701f316a3204625d475668d2722991d75c8d9c573ae32e9175ccf99780fbe0c9c9d1dd0b4bac35f2cc91aca888c7f3dc41af2842dd833ab82776a38c2a2f6c0 SHA512 100eac65a39b9b9c32c1671d36fa9cf8aca84a2673e24c2521fdbdb3ed9f932c71548f3f1a26b1e73dd7c92a34ffa8ed1c76eb173fa20d6e85736cdf8dc9a8ee
 DIST serde-1.0.215.crate 78527 BLAKE2B ca8e1175839ca45a4d78a155f5943396211408a85e0840b065c52948188010653d68fc4fc7b63bf2c39a11a6988abb7f6f3c6d878ca1373596e0a5d62186e109 SHA512 3da13f1a74393f1fcb6d659b5e060a11ecae358f55cdf4a2fd05bfc863fea6f75d3140d3bc74902f8feba8cddf7dae71a3f4e4e78e78e1b08ed46b3e4900281f
+DIST serde-1.0.217.crate 79019 BLAKE2B a0aacff795d34583365ddd469fa14c58a6cccf8afbb248210aaff3134c7ce6e34b3d03f437326d7c01b3e78f82a5d19c37ed9fa4372970d8b2793f2889288e1c SHA512 f97b3b54b9e99c9a027390405cc054c3072f49c92803a4ed5f5f69e76a179deda9d77993b645b3581437085912d881da88d0451b9e0da423c64033a23fdd8054
 DIST serde_derive-1.0.214.crate 56630 BLAKE2B c284561109e5d60e103f1bb421e4da48f35c5046aa52359177e286449cf8fe51a92f6295f5bec3dc4cd737025e8d0bc618436e2f7640873f66bc5b77bb4f450a SHA512 70bc0a31d344cfec8d30f2034beab25097ef76ab8d89947b21753f737759e5d4e60e5596e0c7994a7cc35993bae01148120f6cdf5239be25fb243056effa27f0
 DIST serde_derive-1.0.215.crate 57092 BLAKE2B f28bb66017599afdcd8d45c514b8e07854eb944c1dcf931e052a01ce421e0de6c20c13b3867da5922e2153e25ce88bf9fa27e2e68ddc9d212977f71fa0bd6352 SHA512 cae686bdf10c683149956ffe1c64fcf3e9b9bf0cd6e33b4ce7429d0ca35b9fdb55443693866c1202fa79348c6ea0f49ab3be3d5f857de4ae0818d2b4c8c67d9b
+DIST serde_derive-1.0.217.crate 57749 BLAKE2B 63b4930122d80d64492ba2718630513012202e42bbaa74510729ee66a0e72b8a1ad123784b479697ba562db43868f4bddfdf5e94bb3d744cd68a547471ba40aa SHA512 31020f4533d04b31ae125580a3c5093fad36438d324e2d9b063923aa8c125c654102ae7fbc3b3df892bb41db6b321962a23e0a37950e080055d715d15b18af76
 DIST serde_json-1.0.132.crate 150549 BLAKE2B a49aef7737fad2e6f6ec79cb6da00c734e7de7ef16be321846d1f6229534b58e15ceb0f6306eeae6f85bf07431d82959c0a56ed1394d21a67b65c8c48e971f3f SHA512 9d157ce7d705fee8245569e7c577310782b69675a6e459f21904544b824a1ca5c9b445d17419fee438dfeb6fcc35343ba14e022043fffade0210b6d2c1b5795e
 DIST serde_json-1.0.133.crate 150739 BLAKE2B 7891eb5b8edcc7fd09ab1e15d3881ffdcb629aa39f2bd758c0505700a5f2dfabd85b1b66c3b094268bc1627b346e204c792f4ca61efa76c54ab9cd5744fb0ee2 SHA512 20e65ec87bff319897a141960d13deb5cadcf821209c1ee8799f1dc7f458ce432bc62c16df5bdada1c8d3cc01ff23b8125e8fa0a03545d4614f32efd687dc69f
+DIST serde_json-1.0.135.crate 154499 BLAKE2B deeb22932145715d6a443b36b9b984b6ace1e254199db9586c48dcfdd270a3208ef127584431e19a826947df705de78f07e58d9126ee1c5ccd2bc73d1e779bd8 SHA512 e19c583aa4a55f1c3b9a4e49b8b5c6b66e91c893db06e52f33e87608be1ff0aa27996065157f45dd4d2c59b752259ae747b2d353fe7cd1d466f56cd8a97fe71d
 DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST simdutf8-0.1.5.crate 28488 BLAKE2B 1e0ac310d874a3c279c4d2d5369de12c2ec20050455b2102c0a10325383c0d2ebcf262ffa1bc1eabda14ca62508d4120538d7b353200122168a659ad4791d162 SHA512 139668c7232f533d3439986474da5036efa32d4e0d21fa72e1283e27dbd0670984283d91c238e445be61317426f67cdb8d3f13738b2fb657563f866c8b6d89d6
 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST syn-2.0.86.crate 276473 BLAKE2B be9de484d0b3ea6818cac64f195c893e39271fdc5eefe2b78fbe6c39f61a7960bfb254324deec6f1b0da2626c3d116ac50fe491427a967a00d20e4affd3e5c54 SHA512 1106de0b14981e4dcc1526d932764837cd2905ca2ca3f259a59e9f9992438f88dff49934bd99f3268055e920c1f226a8bbde0c779fbade7ed311a2d4e5230095
 DIST syn-2.0.89.crate 289852 BLAKE2B 4e2b06d2a0ea9b8970338ab61f8c5569cb7c10466dcf139576d0618c3690cfd23c98b66f0714c34839364dee72df6a6d8571f73dbf03ecc347fb1effb118fc2f SHA512 d172936f04a383b7b5e79dad328e70ea3c4faba4a88d0b6d186645413e8698434d30f53012cc9d3813f617c8bef75e95a2d064fdabae7867678abbed22bcd910
+DIST syn-2.0.95.crate 297136 BLAKE2B 5f0ec2d11613e7c172ba25302e4303b09c8d81813735a1ac6d368c7aad5171198dd276365ddd2fa3fc9f3cedf4951cace0c56831c7cd40d71ecbdeed9a47886f SHA512 2c1ebc62893830c34815b29fd6788b3a3b80cfddd5e303fa438569262da1bacd9fe3b892881b544e022f10a4f0c2fa9df1569a73418ce003cc7c8cd8c7420035
 DIST target-lexicon-0.12.16.crate 26488 BLAKE2B e7950e4a302059a1bfc9bc15618a3c1b971a17cffae117a6e8f5f63a0d82fd2bd02680301d15338612d5426d349dd24cfee30ee787a15a7d3187f2a6825e69ce SHA512 092639957c4a0391560b6442b31c47159c04d12e971010f730a6ec9cb5389e4be903ef3d7daa06db95e64dc78b6970731fb647179ebaad2b12e9ed5e9b24da27
+DIST target-lexicon-0.13.1.crate 27925 BLAKE2B 39317f01ad37184db6064e0f4c8450fc45b9f15739a1a422e675b078e0a655cc07a0bc10bbc0acddef3554172b66cebd3e48359404d37aff62d1da2798f4b303 SHA512 88103910a737bde18b1ab21c7f0b7ff7a3fb76499cbec445fbc81e24bfc4066de3d5a155c444bf71b35fd6c9422b1ee779ff297ca055b61f5997e8308fb6ff0f
 DIST unicode-ident-1.0.13.crate 43279 BLAKE2B b5e935020d1c9f3aa24f7d382f6b73d6510d654a61ce1c9c024e2e365bb817182e076139f370e822573531356fb78ff7499049b1f29aa1e2f4a2cc74a955b47b SHA512 5ba884f39debe9c8eb0b1d251ca713f7e2bc191d211707ed10cd81465487dbdca53914c19e131edfa1da15af132dc2c346260c3969c61e3747b63399ccb1cc51
 DIST unicode-ident-1.0.14.crate 47547 BLAKE2B 30e0b6d7f3a967aaf5b9d91237008a60c3a8ded53bda901696e23cea3931dd71b01ddab866dca9e31e17c395d5f5a68f2a938655b693e894962568c2cff5ca15 SHA512 7c6dcd1724e8cfedc37546d1abd49088b633dad228097acc73d7b6cab255b223e830c541144e05a00388fd8ca8066f27c18792419cfa58ee9da4460a38d0bc0a
 DIST unwinding-0.2.2.crate 26818 BLAKE2B 14e918929cb6d7f2d0e1698ab425658353549d83a66733f05d172344a5b6b319c977576d48601ab5f363f5f7b552ec6049a4f291382885f295a1549c0b043ae0 SHA512 0fb87c31dcf607a01f6600fee2a4c87e8d2864603b71b060e3cfcc14f96ffd351e39e8217e8c8a39ef3e550dbe923befa5294367c64edf42bebb3df6878047dd
 DIST unwinding-0.2.4.crate 27931 BLAKE2B d12075b92a298203642a85ec776bd8a85c6ebe561c3042783b7e54288507791e79d11625f0673f1efcaffbf0868829c8758a5c62f2530ca15a3637920c70ae99 SHA512 9bd56197a4befbcc65b3ef926945b3efb37a6206556437435fd2fd97a447dbd8d2d5236afce05e21b015404e301d51e7a4a4bc573cc4ec64bf85dddae5c3ced6
+DIST unwinding-0.2.5.crate 28025 BLAKE2B 48ec97462daa9d42f6f257daa4dbf72dfc40c58a04f154264892d4918cbde01faf50bff08c8400789b4147388c1fb3a958a1f323b09f0dc20cc3fe60c9a5c63b SHA512 67608b01fa7adde11510520d5136239732e0361e34c004bf89e3f8e29587adbbaed2e333d9c799169e97dcd2cbbc644189c9f3c294fa905d5eaf904a5bea7dd5
 DIST uuid-1.11.0.crate 47683 BLAKE2B 37a601b0fe7ec57333613f8c18ada76bd784c43c8af7c252200a7c9c76b445b179931cdf727b5ddae3ffa3fa29c5a13507fb0f2bd604d306982843e042038314 SHA512 0cd1b95fc2247bf4e627de6abb41e332ebaf39e5720640e52b9f235f7a0e2d451e7a486efdabb616ce00e47832d21919611683d0e6a71c86a86f290940cfda32
 DIST version_check-0.9.5.crate 15554 BLAKE2B 131e75cc287518831e142430e2a39b48e4275874f4473780d47a27552294097aa1cddb65c385583e1022478f940b495eb43c24a8b1617b8ac5a24af3340c0d72 SHA512 d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db
 DIST xxhash-rust-0.8.12.crate 21329 BLAKE2B e9596bb83cd0f0465c279deecaf4dd87aac05db1c8c7d3aed4f0689022c5a0522d976379fb3dcf6cfe1c18452c87890e95f3d17998c777d92f5cbe58119a20a9 SHA512 6fd17ec65be94b58f109b6aa9bb283e51092621e8af624f8c2c2c95558a3d0461d743cb8a65a0da5853ff7fd98273daec0dcc5b632440868524f99894beeff3d
+DIST xxhash-rust-0.8.15.crate 21515 BLAKE2B 0d82ffaecfedc3001e4273c7cb3211e847c110334c0558099c02c2457ccc1f6381b5b1c9c13ec87236e23f4e5551e3cb09101bca75358481ed7ae8ecb83d4866 SHA512 80a73a93249cfa0043a743e883f078d9e4bbedc236dec239d9f89b6816715c614f212930fe8842f0598275d2676a0e406a1ab7101158c163f50b9d1d00265925
diff --git a/dev-python/orjson/orjson-3.10.13.ebuild b/dev-python/orjson/orjson-3.10.13.ebuild
index 1409fb2b7633..be0bc45574fa 100644
--- a/dev-python/orjson/orjson-3.10.13.ebuild
+++ b/dev-python/orjson/orjson-3.10.13.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
@@ -63,7 +63,7 @@ LICENSE+="
 	Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT Unicode-3.0
 "
 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"
 
 BDEPEND="
 	>=dev-util/maturin-1.7.8[${PYTHON_USEDEP}]
diff --git a/dev-python/orjson/orjson-3.10.14.ebuild b/dev-python/orjson/orjson-3.10.14.ebuild
new file mode 100644
index 000000000000..93308955056e
--- /dev/null
+++ b/dev-python/orjson/orjson-3.10.14.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( python3_{10..13} )
+
+CRATES="
+	associative-cache@2.0.0
+	bytecount@0.6.8
+	castaway@0.2.3
+	cc@1.2.1
+	cfg-if@1.0.0
+	compact_str@0.8.1
+	crunchy@0.2.2
+	encoding_rs@0.8.35
+	gimli@0.31.1
+	half@2.4.1
+	itoa@1.0.14
+	itoap@1.0.1
+	jiff@0.1.21
+	libc@0.2.169
+	memchr@2.7.4
+	once_cell@1.20.2
+	portable-atomic-util@0.2.4
+	portable-atomic@1.10.0
+	proc-macro2@1.0.92
+	quote@1.0.38
+	rustversion@1.0.19
+	ryu@1.0.18
+	serde@1.0.217
+	serde_derive@1.0.217
+	serde_json@1.0.135
+	shlex@1.3.0
+	simdutf8@0.1.5
+	smallvec@1.13.2
+	static_assertions@1.1.0
+	syn@2.0.95
+	target-lexicon@0.13.1
+	unicode-ident@1.0.14
+	unwinding@0.2.5
+	uuid@1.11.0
+	version_check@0.9.5
+	xxhash-rust@0.8.15
+"
+
+RUST_MIN_VER="1.74.1"
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
+HOMEPAGE="
+	https://github.com/ijl/orjson/
+	https://pypi.org/project/orjson/
+"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT Unicode-3.0
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	>=dev-util/maturin-1.7.8[${PYTHON_USEDEP}]
+	test? (
+		dev-python/arrow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		' 'python3*')
+	)
+"
+
+QA_FLAGS_IGNORED=".*"
+
+distutils_enable_tests pytest
+
+export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/orjson/orjson-3.10.15.ebuild b/dev-python/orjson/orjson-3.10.15.ebuild
new file mode 100644
index 000000000000..93308955056e
--- /dev/null
+++ b/dev-python/orjson/orjson-3.10.15.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( python3_{10..13} )
+
+CRATES="
+	associative-cache@2.0.0
+	bytecount@0.6.8
+	castaway@0.2.3
+	cc@1.2.1
+	cfg-if@1.0.0
+	compact_str@0.8.1
+	crunchy@0.2.2
+	encoding_rs@0.8.35
+	gimli@0.31.1
+	half@2.4.1
+	itoa@1.0.14
+	itoap@1.0.1
+	jiff@0.1.21
+	libc@0.2.169
+	memchr@2.7.4
+	once_cell@1.20.2
+	portable-atomic-util@0.2.4
+	portable-atomic@1.10.0
+	proc-macro2@1.0.92
+	quote@1.0.38
+	rustversion@1.0.19
+	ryu@1.0.18
+	serde@1.0.217
+	serde_derive@1.0.217
+	serde_json@1.0.135
+	shlex@1.3.0
+	simdutf8@0.1.5
+	smallvec@1.13.2
+	static_assertions@1.1.0
+	syn@2.0.95
+	target-lexicon@0.13.1
+	unicode-ident@1.0.14
+	unwinding@0.2.5
+	uuid@1.11.0
+	version_check@0.9.5
+	xxhash-rust@0.8.15
+"
+
+RUST_MIN_VER="1.74.1"
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
+HOMEPAGE="
+	https://github.com/ijl/orjson/
+	https://pypi.org/project/orjson/
+"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT Unicode-3.0
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	>=dev-util/maturin-1.7.8[${PYTHON_USEDEP}]
+	test? (
+		dev-python/arrow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		' 'python3*')
+	)
+"
+
+QA_FLAGS_IGNORED=".*"
+
+distutils_enable_tests pytest
+
+export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index eda3e3c74754..4940482f43f1 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1 +1,2 @@
 DIST oslo.concurrency-6.2.0.tar.gz 60573 BLAKE2B f5ddfbf0f566e6bc4925526738e6823732c8acb1552929009423f87e8766295a5be578bb82dffb2d0b756fb15089616788228dca7abb91fb6e9fbac290294eb2 SHA512 d15dd2049a717e4530c778a3dfb41f9df538835d2f4ea47fbea1fc8f584981b1cbd54a3d5eca273f0202dc4bb8b19b6c59b377690420aa471cf3006f246be8c2
+DIST oslo.concurrency-7.0.0.tar.gz 59671 BLAKE2B f8462d9d2ca7b5b665fe92572775c0b9ca7b35eb7a48256b25f7df9038305a3ee1898cc3f7a3d0236c9959f30410d83f807a93f46941feb932bd80de4460afe4 SHA512 1bb310b4804c1c7f55d699d04281a1926b6f9414bc73ddafd7904180603243b324b82a45d2d1a637db740aa910e87c225e543e23866933a7e592120a19fa079e
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-7.0.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-7.0.0.ebuild
new file mode 100644
index 000000000000..bb1a060724d5
--- /dev/null
+++ b/dev-python/oslo-concurrency/oslo-concurrency-7.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Oslo Concurrency library"
+HOMEPAGE="
+	https://opendev.org/openstack/oslo.concurrency/
+	https://github.com/openstack/oslo.concurrency/
+	https://pypi.org/project/oslo.concurrency/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# fails, then hangs
+	rm oslo_concurrency/tests/unit/test_lockutils_eventlet.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	eunittest
+}
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 5a412bff44c1..401a8cef47a9 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,2 +1 @@
-DIST oslo.config-9.6.0.tar.gz 164859 BLAKE2B 251e75d3ed919f2fce1efcd3aa5695da6e7911972ac89065813ef0c5b2b96fc02c436362875bf965b70e149d4436080ab23092f8f17568324e30eec7befe25cb SHA512 ebf31035bdf6f4ac8a9ce6bef14ca52fcad4418696520f0c199058211dbaa37723273a7c07eded03b139426392d7df6b192381af23e2324a92632029b1031292
 DIST oslo.config-9.7.0.tar.gz 164544 BLAKE2B 25e8ff7697878447a9b6e22802322378eadc0e0a519b5bc61daf4913c818189c6a5ccc100b9920e862cc102a7a8250566466cfc09968e9f58abe5caccc84b8e8 SHA512 573376d1fe0ea8ba2a0e3d681eb89524746da4287795b2373591be55cad0bd6bec59e593a61d9e6df27bded47207261d18855acddc81d4b1cc5cad27e4eaec82
diff --git a/dev-python/oslo-config/files/oslo-config-9.6.0-py312.patch b/dev-python/oslo-config/files/oslo-config-9.6.0-py312.patch
deleted file mode 100644
index f105b7719199..000000000000
--- a/dev-python/oslo-config/files/oslo-config-9.6.0-py312.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 972d304bb23baef538ce759004410a20d8109ccb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 27 Aug 2024 15:54:45 +0200
-Subject: [PATCH] Fix test_sub_command_multiple on Python 3.12.5+
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Update the expectations in test_sub_command_multiple for different
-argparse error handling in Python 3.12.5 and newer.  Previously,
-the 'cannot have multiple subparser arguments' error would be output
-to stderr and cause the parser to exit; now it raises an ArgumentError
-instead.
-
-Closes-Bug: 2074130
-Change-Id: I83de6b6943b14f1f6df86a55603e6867dce680d3
-Signed-off-by: Michał Górny <mgorny@gentoo.org>
----
- oslo_config/tests/test_cfg.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/oslo_config/tests/test_cfg.py b/oslo_config/tests/test_cfg.py
-index 1759ae7..383b70f 100644
---- a/oslo_config/tests/test_cfg.py
-+++ b/oslo_config/tests/test_cfg.py
-@@ -4385,8 +4385,12 @@ class SubCommandTestCase(BaseTestCase):
-         self.conf.register_cli_opt(cfg.SubCommandOpt('cmd1'))
-         self.conf.register_cli_opt(cfg.SubCommandOpt('cmd2'))
-         self.useFixture(fixtures.MonkeyPatch('sys.stderr', io.StringIO()))
--        self.assertRaises(SystemExit, self.conf, [])
--        self.assertIn('multiple', sys.stderr.getvalue())
-+        if sys.version_info >= (3, 12, 5):
-+            self.assertRaisesRegex(argparse.ArgumentError, 'multiple',
-+                                   self.conf, [])
-+        else:
-+            self.assertRaises(SystemExit, self.conf, [])
-+            self.assertIn('multiple', sys.stderr.getvalue())
- 
- 
- class SetDefaultsTestCase(BaseTestCase):
--- 
-2.46.0
-
diff --git a/dev-python/oslo-config/oslo-config-9.6.0.ebuild b/dev-python/oslo-config/oslo-config-9.6.0.ebuild
deleted file mode 100644
index 08a6668af8c9..000000000000
--- a/dev-python/oslo-config/oslo-config-9.6.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.config/
-	https://github.com/openstack/oslo.config/
-	https://pypi.org/project/oslo.config/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	local PATCHES=(
-		# https://review.opendev.org/c/openstack/oslo.config/+/927273
-		"${FILESDIR}/${P}-py312.patch"
-	)
-
-	# broken by some dep upgrade
-	sed -i -e '/DeprecationWarningTestsNoOsloLog/,$d' \
-		oslo_config/tests/test_cfg.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x COLUMNS=80
-	eunittest -b
-}
diff --git a/dev-python/oslo-config/oslo-config-9.7.0.ebuild b/dev-python/oslo-config/oslo-config-9.7.0.ebuild
index 31e09862511a..9b11d29e3978 100644
--- a/dev-python/oslo-config/oslo-config-9.7.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-9.7.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
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 8a7e54ea733d..8ee0bc7382c2 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1 +1,2 @@
 DIST oslo.log-6.2.0.tar.gz 95864 BLAKE2B 146c824f1f6c6733d7d1ed541b592a6fdb06c6739fdad03f7d65d1b21079347c9e1deb91984dcd65dd0fa0d1fc0435d8eec9b150800fbd160588347ab6411137 SHA512 50a5f948af9f1989246d8aefb00755a8859fa796c21dbef90dc2ae6757426b5df4b80db3518e0ec68e96198757dfb40da497821096681bda56e91c4c67430671
+DIST oslo.log-7.0.0.tar.gz 96067 BLAKE2B 79af5fcd4bdd35afe7b169edb097f78beb02d2d44733e37ccbe1bd0f7c1ed7255db9701043f6dfb031b716c766840464a1eb17f8ee2263573c127fde8ee803d3 SHA512 90d79adac13959b30ec84772b705b996f54d6e19aeecbafbb5bfb738440683f706ede0a17c5fdc2781eb7ea92779076fb99519ac94c73932cc46517e70b3adfe
diff --git a/dev-python/oslo-log/oslo-log-7.0.0.ebuild b/dev-python/oslo-log/oslo-log-7.0.0.ebuild
new file mode 100644
index 000000000000..023a5732368a
--- /dev/null
+++ b/dev-python/oslo-log/oslo-log-7.0.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="OpenStack logging config library, configuration for all openstack projects"
+HOMEPAGE="
+	https://opendev.org/openstack/oslo.log/
+	https://github.com/openstack/oslo.log/
+	https://pypi.org/project/oslo.log/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-7.1.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx doc/source \
+	dev-python/openstackdocstheme \
+	dev-python/oslo-config
+
+src_test() {
+	# requires eventlet
+	rm oslo_log/tests/unit/test_pipe_mutex.py || die
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/pandas/pandas-2.2.3.ebuild b/dev-python/pandas/pandas-2.2.3.ebuild
index bbed0ddf8805..bf54db5916d9 100644
--- a/dev-python/pandas/pandas-2.2.3.ebuild
+++ b/dev-python/pandas/pandas-2.2.3.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
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~riscv x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="big-endian full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/path/Manifest b/dev-python/path/Manifest
index 665696a8d3f4..73e351da33f8 100644
--- a/dev-python/path/Manifest
+++ b/dev-python/path/Manifest
@@ -1,2 +1 @@
-DIST path-17.0.0.tar.gz 49721 BLAKE2B eb25e41c5fd5a269023dbdf331a1abb4228707f8b2ca8e4523fabd749fe7c76dc564ea18dd1d9ee4af085bfe72a47400c2bd21c8235af8654998bbefbeb87512 SHA512 9e2e6d51f32f6380d944006fc618d41fb6136d878b758a10a81b3cee5b3e11e5330fba3cc88b0f185c4244aa38f338a32f49685da733539e2cf1cd281ed65412
 DIST path-17.1.0.tar.gz 50081 BLAKE2B ed3c87658cd65ff84e6283967d3d91c19f81bc462452592410fef6c86b576cba25584e55c02243dcad36a36ba5bfbe3086b8c427591f94fa32dcfcaab3e98ec0 SHA512 af369767442780c69ae73006f4a18aa2ca15a67718a482190bf0035352473ac2fdae7aa6dd017c9fec075cdd916f42768db16f8f40ebcd68861baaa47f115305
diff --git a/dev-python/path/path-17.0.0.ebuild b/dev-python/path/path-17.0.0.ebuild
deleted file mode 100644
index 0ab4347d0eeb..000000000000
--- a/dev-python/path/path-17.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="
-	https://github.com/jaraco/path/
-	https://pypi.org/project/path/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# unreliable, not really meaningful for end users
-	test_path.py::TestPerformance
-)
diff --git a/dev-python/path/path-17.1.0.ebuild b/dev-python/path/path-17.1.0.ebuild
index 72968c7f7bdb..28c23c97632b 100644
--- a/dev-python/path/path-17.1.0.ebuild
+++ b/dev-python/path/path-17.1.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/pathable/Manifest b/dev-python/pathable/Manifest
index 28d17c8e2e1b..a4d1afd46d33 100644
--- a/dev-python/pathable/Manifest
+++ b/dev-python/pathable/Manifest
@@ -1 +1,2 @@
 DIST pathable-0.4.3.gh.tar.gz 21412 BLAKE2B 6f62cd879723ff14c2fd7100c9ce7135d200fe04afb473180518ed2e80c5bc5836f82334b1dbbbc8fa80b428fa33db1a8ffafcd8b756cc00a24a809094f61dd2 SHA512 5481ba1e6f4ab4318b9a7bd1d1ddd152f715b001bc7edd1b1221501da1a95578ee6601ce4ce0bdb98773c7954212687d249418e69acef1b350fc5d6cb188dbfc
+DIST pathable-0.4.4.gh.tar.gz 21381 BLAKE2B f0ba3579204a636948f96259bc67b3a6e923af1de7b6fcf4021152c9482f82fc362d5d50cb1bcd6b5393c49d2914c6d36e941647754ef7bc2554722ad02f38ad SHA512 4b1ec32f7e952749ec0384036e7becf5343e92cbec9160627c2a678e314d7387bd4ad56a3953171038a38102c715469e973218cb3995df414bd9dd750986e046
diff --git a/dev-python/pathable/pathable-0.4.4.ebuild b/dev-python/pathable/pathable-0.4.4.ebuild
new file mode 100644
index 000000000000..d6bab82be57c
--- /dev/null
+++ b/dev-python/pathable/pathable-0.4.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+inherit distutils-r1
+
+DESCRIPTION="Object-oriented paths"
+HOMEPAGE="
+	https://pypi.org/project/pathable/
+	https://github.com/p1c2u/pathable
+"
+SRC_URI="
+	https://github.com/p1c2u/pathable/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/--cov/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pathvalidate/Manifest b/dev-python/pathvalidate/Manifest
index bc5035f9febf..4f04629cf6f6 100644
--- a/dev-python/pathvalidate/Manifest
+++ b/dev-python/pathvalidate/Manifest
@@ -1,2 +1,2 @@
-DIST pathvalidate-3.2.0.tar.gz 31246 BLAKE2B 9b30ae5957e2e062ef38b784894aec538e47df03c26c76d82145c4ed7363c63035345db4229b705a6df10a75473e7c0a0f3b44884b6d2ac7ac83f8c138edbd8d SHA512 e3a898bb3a1a35b7851600d6c8a6254220905a95e0dca2e697e0aa95857e3a741e3b77c3c3f0aadc42f458fabd5f1b10d34f99434e7aa3891836470b7a33a77f
 DIST pathvalidate-3.2.1.tar.gz 59263 BLAKE2B 897a0cdc79999c47de494479056ec84753fcbfea5b15ce6f74c15b3d6e425391fd433e60eb8defa1b4ff9792745c031c132f5e23dbdbece04bf17447a00784c5 SHA512 47c0d5123e67325c64d256915d85ce080bf322942c42077b205452b149a8f26bb9ff02b5f29168493555495b6db44e92f848e3a60b28b9f063d43eb3ada9be9c
+DIST pathvalidate-3.2.3.tar.gz 61717 BLAKE2B 563a693fb11b349e7ba664db01903599a75e4412334df9a56b5781a16a32c2f73579dfb4c8b1e6a980b9f8079bf3dffdb29b947723d99c229d7ea362a90978bb SHA512 ad45f85dad4af63852fc4382b4cd78219370058246f24961cd2d67f89ca97321dd18af155c4591cbe548357aaceb0d78a3528b03881c953ffa782b5c1ad21aec
diff --git a/dev-python/pathvalidate/pathvalidate-3.2.0.ebuild b/dev-python/pathvalidate/pathvalidate-3.2.0.ebuild
deleted file mode 100644
index e99bf7bd521a..000000000000
--- a/dev-python/pathvalidate/pathvalidate-3.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python library to sanitize/validate a string such as filenames/file-paths/etc"
-HOMEPAGE="
-	https://github.com/thombashi/pathvalidate/
-	https://pypi.org/project/pathvalidate/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/allpairspy[${PYTHON_USEDEP}]
-		dev-python/tcolorpy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pathvalidate/pathvalidate-3.2.3.ebuild b/dev-python/pathvalidate/pathvalidate-3.2.3.ebuild
new file mode 100644
index 000000000000..704fc953fdd6
--- /dev/null
+++ b/dev-python/pathvalidate/pathvalidate-3.2.3.ebuild
@@ -0,0 +1,32 @@
+# 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} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Python library to sanitize/validate a string such as filenames/file-paths/etc"
+HOMEPAGE="
+	https://github.com/thombashi/pathvalidate/
+	https://pypi.org/project/pathvalidate/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-8[${PYTHON_USEDEP}]
+	test? (
+		dev-python/allpairspy[${PYTHON_USEDEP}]
+		dev-python/tcolorpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pbs-installer/Manifest b/dev-python/pbs-installer/Manifest
index f7ca79ef478a..d1d143c86821 100644
--- a/dev-python/pbs-installer/Manifest
+++ b/dev-python/pbs-installer/Manifest
@@ -1,2 +1,2 @@
-DIST pbs-installer-2024.10.16.gh.tar.gz 79499 BLAKE2B 749a0ecc54a4df1e5989eee54b874b92bd7592307fe9bc0a13aa77dea96dcec8b6ff7b5fcfd10e354eaad21054cbf264c718fa7d692c6ee2df348f9217ca89ca SHA512 1b6bfc64bf311d03cf318365b1d16968ac599b40b247970477d6555791407bc104813bd60f82e30d88a13cd37873fef269a98640ee301f86028e6ddf7d097958
 DIST pbs-installer-2024.12.19.gh.tar.gz 82721 BLAKE2B b6a6ed17b4d1e55d9160361f45d4f15b3f8f12a6fa97208a2428c0c9b7f3b3f46e846f01d03539df86f5a4b109623a12133169880445aa386623b3f9e74935c3 SHA512 481ce48d4ba823d13e6c488aa146725e7406baf7f1d42a8561273d69311174e032930fa5d4d9c4f6edd3ce9ea866320e0266763a2b8b8456ed2f052149eb892a
+DIST pbs-installer-2025.01.06.gh.tar.gz 82694 BLAKE2B 171754b6b2d8ce99618e0f241188a8565332fcbd0bdf29ea2b52ec874780adce0c563ae464a2c7a4f74c1fe06d9d334e61b91fa4e50380160403a228ebc55d56 SHA512 f3b150acbfcf64dc6ad1ec1915744b9e1663ef4e13b78e65d6d259e6bf6d844e93a0c432109c6eb5919a26a17ff923699227738fdf9e8d4244810fb63258f2a2
diff --git a/dev-python/pbs-installer/pbs-installer-2024.10.16.ebuild b/dev-python/pbs-installer/pbs-installer-2024.10.16.ebuild
deleted file mode 100644
index c2bbf1f95bc4..000000000000
--- a/dev-python/pbs-installer/pbs-installer-2024.10.16.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Installer for Python Build Standalone"
-HOMEPAGE="
-	https://pypi.org/project/pbs-installer/
-	https://github.com/frostming/pbs-installer/
-
-"
-SRC_URI="
-	https://github.com/frostming/pbs-installer/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-BDEPEND="
-	dev-python/zstandard[${PYTHON_USEDEP}]
-"
-
-# upstream does not provide any tests
-RESTRICT=test
-
-python_configure_all() {
-	export PDM_BUILD_SCM_VERSION=${PV}
-}
diff --git a/dev-python/pbs-installer/pbs-installer-2025.01.06.ebuild b/dev-python/pbs-installer/pbs-installer-2025.01.06.ebuild
new file mode 100644
index 000000000000..9eda0a2dfbf3
--- /dev/null
+++ b/dev-python/pbs-installer/pbs-installer-2025.01.06.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Installer for Python Build Standalone"
+HOMEPAGE="
+	https://pypi.org/project/pbs-installer/
+	https://github.com/frostming/pbs-installer/
+
+"
+SRC_URI="
+	https://github.com/frostming/pbs-installer/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="
+	dev-python/zstandard[${PYTHON_USEDEP}]
+"
+
+# upstream does not provide any tests
+RESTRICT=test
+
+python_configure_all() {
+	export PDM_BUILD_SCM_VERSION=${PV}
+}
diff --git a/dev-python/pdm/Manifest b/dev-python/pdm/Manifest
index b6e6f3544f60..5343789e342d 100644
--- a/dev-python/pdm/Manifest
+++ b/dev-python/pdm/Manifest
@@ -1,4 +1,2 @@
-DIST pdm-2.20.1.tar.gz 2642376 BLAKE2B d24d889d75b06deb7595a7a0691ba21e9af15013372481147ddf1c6a19a13bb398af786cbc38877b29380f162a7923848aaf9d9b6f258dcd22ad80a96ad96ab8 SHA512 f9a164c521f943a89c8eb4792d249b06114b26e5c87022feb0d1bc24ca8ef56085da07e8b0dd9033b3c6e7d0e0ff1d3cb52bf8a69a2ef1e211cdb3c29eeb24b8
-DIST pdm-2.21.0.tar.gz 2643561 BLAKE2B 3fc921c5863749c762163b290a4c9db8593145f509309dfe3437444e509e11c4727510d862e5f8676755191429c0b5cd73afd98104056497a3095acb6d0ee488 SHA512 2e83eab81d85c91249841add97a1d985ac91a0fba42b7b695a23afa785d67c04879a2513a686243fd68e5eec642175b97ef7e36fccbe8d8a160a6d42b8c5318b
-DIST pdm-2.22.0.tar.gz 2645896 BLAKE2B 96cb47299ac52f374bc3e6e22f28d79b3cd0536055292e68f2f76c2f6ef855abbc4840c1a500c43dca02d10fa964bf3595512536855792175817ddf0d4f9ed14 SHA512 5f27a070fce875b3fd9af30ee9cfab1c31f4310bb9e299a11d00beba77e02dfd6346496ac385aaf5ae3f43b96cae91ef97f46766071696834c8a8714fff5bb4f
 DIST pdm-2.22.1.tar.gz 2645872 BLAKE2B 3bb614a02cea489b6698160a7aaed3623199dc62ed3c5055d33ca084639d03fa0f4d380cf6e41fcb812e93c5606c6571250d17c85271c2f81daabfaec8224190 SHA512 335fc2eecbe3c6a63d5f4cf277a1ef6898c40190441da84282662ddd9ac45646b156544b056155bc6bfe6e0d4c4c6a454524fffb564394083eb77207db0ee414
+DIST pdm-2.22.2.tar.gz 2646982 BLAKE2B 673798ac6f2658040b1b9bdf5a1e78933030bf280fb5eaeed3f2996566a9b8828ce3500c67a6810d4def4685450b68677f00155ed2530af9c5de87276cca7f58 SHA512 52ece85fd6b116ad0c74bf53f19c811308f65f507977c0e47a2ac9f8e346aa122022b07f6ebc27ea9e8eeeefbed55c266cfda9316fe8525c610bd0339acca549
diff --git a/dev-python/pdm/pdm-2.20.1.ebuild b/dev-python/pdm/pdm-2.20.1.ebuild
deleted file mode 100644
index d5769a6947b5..000000000000
--- a/dev-python/pdm/pdm-2.20.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python package and dependency manager supporting the latest PEP standards"
-HOMEPAGE="
-	https://pdm-project.org/
-	https://github.com/pdm-project/pdm/
-	https://pypi.org/project/pdm/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/dep-logic-0.4.4[${PYTHON_USEDEP}]
-	<dev-python/findpython-1[${PYTHON_USEDEP}]
-	>=dev-python/findpython-0.6.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/hishel-0.0.32[${PYTHON_USEDEP}]
-	>=dev-python/httpcore-1.0.6[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/installer[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pbs-installer-2024.4.18[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-	dev-python/python-dotenv[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-1.1[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	dev-python/shellingham[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	>=dev-python/truststore-0.9[${PYTHON_USEDEP}]
-	>=dev-python/unearth-0.17.0[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unpin deps
-	sed -i -e 's:,<[0-9.a]*::' pyproject.toml || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		'tests/cli/test_build.py::test_build_with_no_isolation[False]'
-		tests/test_project.py::test_access_index_with_auth
-		"tests/test_project.py::test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV[True]"
-		tests/cli/test_others.py::test_build_distributions
-		'tests/models/test_candidates.py::test_expand_project_root_in_url[demo @ file:///${PROJECT_ROOT}/tests/fixtures/artifacts/demo-0.0.1.tar.gz]'
-		'tests/models/test_candidates.py::test_expand_project_root_in_url[-e file:///${PROJECT_ROOT}/tests/fixtures/projects/demo-#-with-hash#egg=demo]'
-		tests/models/test_candidates.py::test_find_candidates_from_find_links
-		tests/cli/test_build.py::test_build_single_module
-		tests/cli/test_build.py::test_build_single_module_with_readme
-		tests/cli/test_build.py::test_build_package
-		tests/cli/test_build.py::test_build_src_package
-		tests/cli/test_build.py::test_build_package_include
-		tests/cli/test_build.py::test_build_src_package_by_include
-		tests/cli/test_build.py::test_build_with_config_settings
-		tests/cli/test_build.py::test_cli_build_with_config_settings
-		tests/cli/test_build.py::test_build_ignoring_pip_environment
-		tests/cli/test_others.py::test_show_self_package
-		tests/cli/test_publish.py::test_publish_and_build_in_one_run
-		"tests/cli/test_hooks.py::test_hooks[build]"
-		"tests/cli/test_hooks.py::test_hooks[publish]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-pre_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-post_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_publish]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_publish]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-build]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-publish]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-build]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-publish]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-build]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-publish]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-build]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-publish]"
-		"tests/cli/test_venv.py::test_conda_backend_create[True]"
-		"tests/cli/test_venv.py::test_conda_backend_create[False]"
-		tests/cli/test_lock.py::test_lock_all_with_excluded_groups
-		# hangs on interactive keyring prompts
-		tests/cli/test_config.py::test_repository_overwrite_default
-		tests/cli/test_config.py::test_hide_password_in_output_repository
-		tests/cli/test_config.py::test_hide_password_in_output_pypi
-		# junk output, sigh
-		tests/cli/test_others.py::test_info_command_json
-		# why does it try to use python 2.7?!
-		tests/cli/test_run.py::test_import_another_sitecustomize
-		# fails in tinderbox (bug #928964)
-		tests/test_project.py::test_project_packages_path
-		# i guess doesn't expect some dep to be present
-		tests/cli/test_build.py::test_build_with_no_isolation
-	)
-	[[ ${EPYTHON} != python3.10 ]] && EPYTEST_DESELECT+=(
-		# test seems hardcoded to 3.10
-		tests/test_project.py::test_project_packages_path
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest  -m "not network and not integration and not path" \
-		-p pytest_mock
-}
diff --git a/dev-python/pdm/pdm-2.21.0.ebuild b/dev-python/pdm/pdm-2.21.0.ebuild
deleted file mode 100644
index d5769a6947b5..000000000000
--- a/dev-python/pdm/pdm-2.21.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python package and dependency manager supporting the latest PEP standards"
-HOMEPAGE="
-	https://pdm-project.org/
-	https://github.com/pdm-project/pdm/
-	https://pypi.org/project/pdm/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/dep-logic-0.4.4[${PYTHON_USEDEP}]
-	<dev-python/findpython-1[${PYTHON_USEDEP}]
-	>=dev-python/findpython-0.6.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/hishel-0.0.32[${PYTHON_USEDEP}]
-	>=dev-python/httpcore-1.0.6[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/installer[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pbs-installer-2024.4.18[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-	dev-python/python-dotenv[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-1.1[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	dev-python/shellingham[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	>=dev-python/truststore-0.9[${PYTHON_USEDEP}]
-	>=dev-python/unearth-0.17.0[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unpin deps
-	sed -i -e 's:,<[0-9.a]*::' pyproject.toml || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		'tests/cli/test_build.py::test_build_with_no_isolation[False]'
-		tests/test_project.py::test_access_index_with_auth
-		"tests/test_project.py::test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV[True]"
-		tests/cli/test_others.py::test_build_distributions
-		'tests/models/test_candidates.py::test_expand_project_root_in_url[demo @ file:///${PROJECT_ROOT}/tests/fixtures/artifacts/demo-0.0.1.tar.gz]'
-		'tests/models/test_candidates.py::test_expand_project_root_in_url[-e file:///${PROJECT_ROOT}/tests/fixtures/projects/demo-#-with-hash#egg=demo]'
-		tests/models/test_candidates.py::test_find_candidates_from_find_links
-		tests/cli/test_build.py::test_build_single_module
-		tests/cli/test_build.py::test_build_single_module_with_readme
-		tests/cli/test_build.py::test_build_package
-		tests/cli/test_build.py::test_build_src_package
-		tests/cli/test_build.py::test_build_package_include
-		tests/cli/test_build.py::test_build_src_package_by_include
-		tests/cli/test_build.py::test_build_with_config_settings
-		tests/cli/test_build.py::test_cli_build_with_config_settings
-		tests/cli/test_build.py::test_build_ignoring_pip_environment
-		tests/cli/test_others.py::test_show_self_package
-		tests/cli/test_publish.py::test_publish_and_build_in_one_run
-		"tests/cli/test_hooks.py::test_hooks[build]"
-		"tests/cli/test_hooks.py::test_hooks[publish]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-pre_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-post_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_publish]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_publish]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-build]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-publish]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-build]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-publish]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-build]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-publish]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-build]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-publish]"
-		"tests/cli/test_venv.py::test_conda_backend_create[True]"
-		"tests/cli/test_venv.py::test_conda_backend_create[False]"
-		tests/cli/test_lock.py::test_lock_all_with_excluded_groups
-		# hangs on interactive keyring prompts
-		tests/cli/test_config.py::test_repository_overwrite_default
-		tests/cli/test_config.py::test_hide_password_in_output_repository
-		tests/cli/test_config.py::test_hide_password_in_output_pypi
-		# junk output, sigh
-		tests/cli/test_others.py::test_info_command_json
-		# why does it try to use python 2.7?!
-		tests/cli/test_run.py::test_import_another_sitecustomize
-		# fails in tinderbox (bug #928964)
-		tests/test_project.py::test_project_packages_path
-		# i guess doesn't expect some dep to be present
-		tests/cli/test_build.py::test_build_with_no_isolation
-	)
-	[[ ${EPYTHON} != python3.10 ]] && EPYTEST_DESELECT+=(
-		# test seems hardcoded to 3.10
-		tests/test_project.py::test_project_packages_path
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest  -m "not network and not integration and not path" \
-		-p pytest_mock
-}
diff --git a/dev-python/pdm/pdm-2.22.0.ebuild b/dev-python/pdm/pdm-2.22.0.ebuild
deleted file mode 100644
index 061b5361c485..000000000000
--- a/dev-python/pdm/pdm-2.22.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python package and dependency manager supporting the latest PEP standards"
-HOMEPAGE="
-	https://pdm-project.org/
-	https://github.com/pdm-project/pdm/
-	https://pypi.org/project/pdm/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/dep-logic-0.4.4[${PYTHON_USEDEP}]
-	<dev-python/findpython-1[${PYTHON_USEDEP}]
-	>=dev-python/findpython-0.6.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/hishel-0.0.32[${PYTHON_USEDEP}]
-	>=dev-python/httpcore-1.0.6[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/installer[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pbs-installer-2024.4.18[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-	dev-python/python-dotenv[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-1.1[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	dev-python/shellingham[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	>=dev-python/truststore-0.9[${PYTHON_USEDEP}]
-	>=dev-python/unearth-0.17.0[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		dev-python/uv
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unpin deps
-	sed -i -e 's:,<[0-9.a]*::' pyproject.toml || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		'tests/cli/test_build.py::test_build_with_no_isolation[False]'
-		tests/test_project.py::test_access_index_with_auth
-		"tests/test_project.py::test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV[True]"
-		tests/cli/test_others.py::test_build_distributions
-		'tests/models/test_candidates.py::test_expand_project_root_in_url[demo @ file:///${PROJECT_ROOT}/tests/fixtures/artifacts/demo-0.0.1.tar.gz]'
-		'tests/models/test_candidates.py::test_expand_project_root_in_url[-e file:///${PROJECT_ROOT}/tests/fixtures/projects/demo-#-with-hash#egg=demo]'
-		tests/models/test_candidates.py::test_find_candidates_from_find_links
-		tests/cli/test_build.py::test_build_single_module
-		tests/cli/test_build.py::test_build_single_module_with_readme
-		tests/cli/test_build.py::test_build_package
-		tests/cli/test_build.py::test_build_src_package
-		tests/cli/test_build.py::test_build_package_include
-		tests/cli/test_build.py::test_build_src_package_by_include
-		tests/cli/test_build.py::test_build_with_config_settings
-		tests/cli/test_build.py::test_cli_build_with_config_settings
-		tests/cli/test_build.py::test_build_ignoring_pip_environment
-		tests/cli/test_others.py::test_show_self_package
-		tests/cli/test_publish.py::test_publish_and_build_in_one_run
-		"tests/cli/test_hooks.py::test_hooks[build]"
-		"tests/cli/test_hooks.py::test_hooks[publish]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-pre_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-post_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_publish]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_publish]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-build]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-publish]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-build]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-publish]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-build]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-publish]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-build]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-publish]"
-		"tests/cli/test_venv.py::test_conda_backend_create[True]"
-		"tests/cli/test_venv.py::test_conda_backend_create[False]"
-		tests/cli/test_lock.py::test_lock_all_with_excluded_groups
-		'tests/resolver/test_resolve.py::test_resolve_local_artifacts[sdist]'
-		'tests/resolver/test_resolve.py::test_resolve_two_extras_from_the_same_package'
-		'tests/resolver/test_resolve.py::test_resolve_file_req_with_prerelease'
-		# hangs on interactive keyring prompts
-		tests/cli/test_config.py::test_repository_overwrite_default
-		tests/cli/test_config.py::test_hide_password_in_output_repository
-		tests/cli/test_config.py::test_hide_password_in_output_pypi
-		# junk output, sigh
-		tests/cli/test_others.py::test_info_command_json
-		# why does it try to use python 2.7?!
-		tests/cli/test_run.py::test_import_another_sitecustomize
-		# fails in tinderbox (bug #928964)
-		tests/test_project.py::test_project_packages_path
-		# i guess doesn't expect some dep to be present
-		tests/cli/test_build.py::test_build_with_no_isolation
-	)
-	[[ ${EPYTHON} != python3.10 ]] && EPYTEST_DESELECT+=(
-		# test seems hardcoded to 3.10
-		tests/test_project.py::test_project_packages_path
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest  -m "not network and not integration and not path" \
-		-p pytest_mock
-}
diff --git a/dev-python/pdm/pdm-2.22.2.ebuild b/dev-python/pdm/pdm-2.22.2.ebuild
new file mode 100644
index 000000000000..d8a8156f0d6f
--- /dev/null
+++ b/dev-python/pdm/pdm-2.22.2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python package and dependency manager supporting the latest PEP standards"
+HOMEPAGE="
+	https://pdm-project.org/
+	https://github.com/pdm-project/pdm/
+	https://pypi.org/project/pdm/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/dep-logic-0.4.4[${PYTHON_USEDEP}]
+	<dev-python/findpython-1[${PYTHON_USEDEP}]
+	>=dev-python/findpython-0.6.0[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/hishel-0.0.32[${PYTHON_USEDEP}]
+	>=dev-python/httpcore-1.0.6[${PYTHON_USEDEP}]
+	dev-python/httpx[${PYTHON_USEDEP}]
+	dev-python/installer[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pbs-installer-2024.4.18[${PYTHON_USEDEP}]
+	dev-python/platformdirs[${PYTHON_USEDEP}]
+	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
+	dev-python/python-dotenv[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-1.1[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	dev-python/shellingham[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+	>=dev-python/truststore-0.9[${PYTHON_USEDEP}]
+	>=dev-python/unearth-0.17.0[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+		dev-python/uv
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unpin deps
+	sed -i -e 's:,<[0-9.a]*::' pyproject.toml || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		'tests/cli/test_build.py::test_build_with_no_isolation[False]'
+		tests/test_project.py::test_access_index_with_auth
+		"tests/test_project.py::test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV[True]"
+		tests/cli/test_others.py::test_build_distributions
+		'tests/models/test_candidates.py::test_expand_project_root_in_url[demo @ file:///${PROJECT_ROOT}/tests/fixtures/artifacts/demo-0.0.1.tar.gz]'
+		'tests/models/test_candidates.py::test_expand_project_root_in_url[-e file:///${PROJECT_ROOT}/tests/fixtures/projects/demo-#-with-hash#egg=demo]'
+		tests/models/test_candidates.py::test_find_candidates_from_find_links
+		tests/cli/test_build.py::test_build_single_module
+		tests/cli/test_build.py::test_build_single_module_with_readme
+		tests/cli/test_build.py::test_build_package
+		tests/cli/test_build.py::test_build_src_package
+		tests/cli/test_build.py::test_build_package_include
+		tests/cli/test_build.py::test_build_src_package_by_include
+		tests/cli/test_build.py::test_build_with_config_settings
+		tests/cli/test_build.py::test_cli_build_with_config_settings
+		tests/cli/test_build.py::test_build_ignoring_pip_environment
+		tests/cli/test_others.py::test_show_self_package
+		tests/cli/test_publish.py::test_publish_and_build_in_one_run
+		"tests/cli/test_hooks.py::test_hooks[build]"
+		"tests/cli/test_hooks.py::test_hooks[publish]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-pre_build]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-post_build]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_publish]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_build]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_build]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_publish]"
+		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-build]"
+		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-publish]"
+		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-build]"
+		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-publish]"
+		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-build]"
+		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-publish]"
+		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-build]"
+		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-publish]"
+		"tests/cli/test_venv.py::test_conda_backend_create[True]"
+		"tests/cli/test_venv.py::test_conda_backend_create[False]"
+		tests/cli/test_lock.py::test_lock_all_with_excluded_groups
+		'tests/resolver/test_resolve.py::test_resolve_local_artifacts[sdist]'
+		'tests/resolver/test_resolve.py::test_resolve_two_extras_from_the_same_package'
+		'tests/resolver/test_resolve.py::test_resolve_file_req_with_prerelease'
+		# hangs on interactive keyring prompts
+		tests/cli/test_config.py::test_repository_overwrite_default
+		tests/cli/test_config.py::test_hide_password_in_output_repository
+		tests/cli/test_config.py::test_hide_password_in_output_pypi
+		# junk output, sigh
+		tests/cli/test_others.py::test_info_command_json
+		# why does it try to use python 2.7?!
+		tests/cli/test_run.py::test_import_another_sitecustomize
+		# fails in tinderbox (bug #928964)
+		tests/test_project.py::test_project_packages_path
+		# i guess doesn't expect some dep to be present
+		tests/cli/test_build.py::test_build_with_no_isolation
+	)
+	[[ ${EPYTHON} != python3.10 ]] && EPYTEST_DESELECT+=(
+		# test seems hardcoded to 3.10
+		tests/test_project.py::test_project_packages_path
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest  -m "not network and not integration and not path" \
+		-p pytest_mock
+}
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index c55b7bf77d96..393c000258af 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,2 +1 @@
-DIST pgspecial-2.1.2.tar.gz 51057 BLAKE2B d164555363e421f716fd9a03653fa8ef6628fc15b71a03acb040c321a20d03e4193725ca3a809b3d4b8710e62005ba9637f35789795d7b4e195f653527617436 SHA512 3ef15c96b8ae84c2c346f44607360aad4bd0abe6f2dfec421af1ca176178b19c64d55baece118600038e105cacb4b5f9b9c3eebbd1e816a9e7a78877d2cb604c
 DIST pgspecial-2.1.3.tar.gz 51204 BLAKE2B 9dec06aba3c1389d0f2a772305dbde4218ecdcc298a325645e3c3869d9f7dc67d55c3b7dc724dbe4dde7b730ea90dd66028f71db3d5361a2618962d20fc97425 SHA512 67f7376cbad896a29e9ae76fd1f78b1e43069dc6a648eb0e68048f22420c606da437ef4b9f1b149a748161e12f061ccff2fd0682e7f2b9d2ac41003bc062b768
diff --git a/dev-python/pgspecial/pgspecial-2.1.2.ebuild b/dev-python/pgspecial/pgspecial-2.1.2.ebuild
deleted file mode 100644
index 4fa8bed1bfce..000000000000
--- a/dev-python/pgspecial/pgspecial-2.1.2.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_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python implementation of PostgreSQL meta commands"
-HOMEPAGE="
-	https://github.com/dbcli/pgspecial/
-	https://pypi.org/project/pgspecial/
-"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/click-4.1[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-3.0.10:0[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.1.19[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-db/postgresql-8.1[server]
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( License.txt README.rst changelog.rst  )
-
-EPYTEST_DESELECT=(
-	# assumes a very specific locale
-	tests/test_specials.py::test_slash_l
-	tests/test_specials.py::test_slash_l_pattern
-	# change in postgres? *shrug*
-	tests/test_specials.py::test_slash_d_view_verbose
-	tests/test_specials.py::test_slash_dn
-)
-
-src_test() {
-	local db=${T}/pgsql
-
-	initdb --username=postgres -D "${db}" || die
-	# TODO: random port
-	pg_ctl -w -D "${db}" start \
-		-o "-h '127.0.0.1' -p 5432 -k '${T}'" || die
-	psql -h "${T}" -U postgres -d postgres \
-		-c "ALTER ROLE postgres WITH PASSWORD 'postgres';" || die
-	createdb -h "${T}" -U postgres _test_db || die
-
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${db}" stop || die
-}
diff --git a/dev-python/pgspecial/pgspecial-2.1.3.ebuild b/dev-python/pgspecial/pgspecial-2.1.3.ebuild
index 0d092904d231..27e9bdd58e19 100644
--- a/dev-python/pgspecial/pgspecial-2.1.3.ebuild
+++ b/dev-python/pgspecial/pgspecial-2.1.3.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/click-4.1[${PYTHON_USEDEP}]
@@ -41,6 +41,9 @@ EPYTEST_DESELECT=(
 	# change in postgres? *shrug*
 	tests/test_specials.py::test_slash_d_view_verbose
 	tests/test_specials.py::test_slash_dn
+	# fails with postgresql:17
+	tests/test_specials.py::test_slash_ddp
+	tests/test_specials.py::test_slash_ddp_pattern
 )
 
 src_test() {
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index fc24c9227987..23da5981d1c2 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1 +1,2 @@
 DIST python-phonenumbers-8.13.52.gh.tar.gz 4916262 BLAKE2B 51267704170ca614f93f8dee5cc1bbe3a8ef833e3aaf7d9ba48e9715eb1f37a7742f942c3bfb543f140d9c08d83006fc698c34fa3264a3b9e9d626bf741b586b SHA512 ac2fa94cffeabc18197a2ca0e2e5ac62f4584e417fb1bee0d52eaeec71d7ce5f1d12722f0f5a48b7d2ff89cfb394f49ec02006a7e8247bb20b2375d0a617132c
+DIST python-phonenumbers-8.13.53.gh.tar.gz 4915816 BLAKE2B cdb981c096318c9b2132a9da1524702d022655c9c3061ddcfc23af17d89966c2e998913808ea3112621ea59f5f17c733290e158f027e9a153fe2893695160ba2 SHA512 b3c73c1b1a98e8c6b501f99dede4883b1e5f9e3c2764d45056f11365f5541a3d99c863180202c23b59a0cd18944c8d0ba9af249e803a6cf75377cb648c66ca2a
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.53.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.53.ebuild
new file mode 100644
index 000000000000..f254b819cb2e
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.13.53.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
+
+MY_P=python-${P}
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="
+	https://github.com/daviddrysdale/python-phonenumbers/
+	https://pypi.org/project/phonenumbers/
+"
+SRC_URI="
+	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/protobuf[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 83c8a246d9b5..16eeafacc2fb 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,5 +1,4 @@
 DIST pikepdf-9.1.1.tar.gz 2869514 BLAKE2B b196a61d599db1355695d40ac69e09ea7a020cb10c246685792b7f6f7854b5dce63dd2f675a542fa256ac713c7a7ce49ba7ddd248fbe901fe267641df399ca74 SHA512 0b3c2c89d9226212806791e00470c2c64147f0738d26bfe9c5288414cf515760213e3cdc70a62ef3f53a0ee43b7d8e2cc0076f14fe22bdbac2ff50e0a8984164
-DIST pikepdf-9.1.2.tar.gz 2869865 BLAKE2B 74b64d628f12a5335a9dfbe2e15fbbd0a39e266100bcc8b33e94c954aab91150f46649b181bf049cd1084a6d2412ea9485cc57d4d6a23a4678a5ea55ebbb7357 SHA512 676d68f05a506b6aa69e1b01d03164de6731d17b48d2cd4b123221ebe27aef04a75d458c897c53d504a0b3aa7d0bc3e78aaf707a3cfdcdf8d31ee5e537188bd3
-DIST pikepdf-9.3.0.tar.gz 2905550 BLAKE2B 62b3a1d655fb5b3e4d315a3feaeb14a043048c5985f5cf99812c07e1d248ae52cb1734dbd091103f36a3fd5a981c89b57208fb50f5c1081e08e3c20ec728ff9c SHA512 3325ab06c285f8f51c66c3815b15f96b0730e38f8023ce5c1e46818c581c38ab3bd89875e5de6ce1064a5929a8c386740d76e662c82d00d9c46961c56da4f0c0
 DIST pikepdf-9.4.2.tar.gz 2914992 BLAKE2B daed44bd1106dbeadef449160e2ba5b389a1eeb7b23a32124a59b7861c1584d49feca01d6f54a18dc53eaace7823b23f62c1240c58445eb382ee25133b2d463b SHA512 2dc84672941a283da5486b2664252b6cd0612d7d2f9e8d10e3ae41f494be89821431568872b6b60045ffb2f1f687cea055093229ee443997997a8fae56e43e0b
 DIST pikepdf-9.5.0.tar.gz 2916148 BLAKE2B ad6d15fe9a6b9e44a4e1f6486a2e060311155292413453d99c52cf2d98f0fe7fdec823cc472282be5efaed7ccd3ad674cb5a5da8caab622d0f740e93b8ea5cc0 SHA512 6b73343fc6f93168059c106aa344b73f483802a2d222fbd5d16daffebe87c887ad2d757874856f4c6f776c39f78b3fe33e985abba80f0318cc65e69aaa369143
+DIST pikepdf-9.5.1.tar.gz 2916260 BLAKE2B ad665a237cc107895cdbca51f13fa4fdee2552449ccbed45dd478e0d1c291e9500f6d3a7138caad6aab4cb68b3f92cda042151f7ccfce9cb455b0eb9724e1ea0 SHA512 73e7f150439a64791b5ab3ca3f831c9cdef356343fa6985016690b3bff54b2cef169a7d223e66dc5e012467dbc969295e5355a01311de0aaf09a0c625c963246
diff --git a/dev-python/pikepdf/pikepdf-9.1.2.ebuild b/dev-python/pikepdf/pikepdf-9.1.2.ebuild
deleted file mode 100644
index 9804ec796bf4..000000000000
--- a/dev-python/pikepdf/pikepdf-9.1.2.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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="
-	https://github.com/pikepdf/pikepdf/
-	https://pypi.org/project/pikepdf/
-"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="big-endian"
-
-# Check QPDF_MIN_VERSION in pyproject.toml on bumps, as well as
-# https://qpdf.readthedocs.io/en/stable/release-notes.html.
-DEPEND="
-	>=app-text/qpdf-11.5.0:0=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/deprecated[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pillow-10.0.1[lcms,${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.36[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.21.0[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-		!big-endian? (
-			>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-		)
-		$(python_gen_cond_dep '
-			dev-python/tomli[${PYTHON_USEDEP}]
-		' 3.10)
-		media-libs/tiff[zlib]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	sed -e '/-n auto/d' -i pyproject.toml || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# fragile to system load
-		tests/test_image_access.py::test_random_image
-		tests/test_image_access.py::test_image_save_compare
-		tests/test_image_access.py::test_palette_nonrgb
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p timeout
-}
diff --git a/dev-python/pikepdf/pikepdf-9.3.0.ebuild b/dev-python/pikepdf/pikepdf-9.3.0.ebuild
deleted file mode 100644
index 92d4925313c5..000000000000
--- a/dev-python/pikepdf/pikepdf-9.3.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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="
-	https://github.com/pikepdf/pikepdf/
-	https://pypi.org/project/pikepdf/
-"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="big-endian"
-
-# Check QPDF_MIN_VERSION in pyproject.toml on bumps, as well as
-# https://qpdf.readthedocs.io/en/stable/release-notes.html.
-DEPEND="
-	>=app-text/qpdf-11.5.0:0=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/deprecated[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pillow-10.0.1[lcms,${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.12.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.36[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.21.0[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-		!big-endian? (
-			>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-		)
-		$(python_gen_cond_dep '
-			dev-python/tomli[${PYTHON_USEDEP}]
-		' 3.10)
-		media-libs/tiff[zlib]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	sed -e '/-n auto/d' -i pyproject.toml || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# fragile to system load
-		tests/test_image_access.py::test_random_image
-		tests/test_image_access.py::test_image_save_compare
-		tests/test_image_access.py::test_palette_nonrgb
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p timeout
-}
diff --git a/dev-python/pikepdf/pikepdf-9.5.1.ebuild b/dev-python/pikepdf/pikepdf-9.5.1.ebuild
new file mode 100644
index 000000000000..3bd9cbda965f
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-9.5.1.ebuild
@@ -0,0 +1,74 @@
+# 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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="
+	https://github.com/pikepdf/pikepdf/
+	https://pypi.org/project/pikepdf/
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="big-endian"
+
+# Check QPDF_MIN_VERSION in pyproject.toml on bumps, as well as
+# https://qpdf.readthedocs.io/en/stable/release-notes.html.
+DEPEND="
+	>=app-text/qpdf-11.5.0:0=
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/deprecated[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pillow-10.0.1[lcms,${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pybind11-2.12.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.36[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.21.0[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+		!big-endian? (
+			>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+		)
+		$(python_gen_cond_dep '
+			dev-python/tomli[${PYTHON_USEDEP}]
+		' 3.10)
+		media-libs/tiff[zlib]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	sed -e '/-n auto/d' -i pyproject.toml || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# fragile to system load
+		tests/test_image_access.py::test_random_image
+		tests/test_image_access.py::test_image_save_compare
+		tests/test_image_access.py::test_palette_nonrgb
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p timeout
+}
diff --git a/dev-python/pillow/pillow-11.1.0.ebuild b/dev-python/pillow/pillow-11.1.0.ebuild
index 627cfd511ac8..8b44231ae51c 100644
--- a/dev-python/pillow/pillow-11.1.0.ebuild
+++ b/dev-python/pillow/pillow-11.1.0.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 2d03a4ed2d47..f21fcaf58241 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,3 +1,2 @@
-DIST pip-24.0.gh.tar.gz 9398156 BLAKE2B 17a7ed9e15e9b8efa0d3e3c5586dc446958b62cf9ba52155a0d1ad97a3e212ee7a08a0e88a592718fc3d542eb8f434155a75cb98d90c008904bd8f59bd2b40b6 SHA512 0c2ecb2ecde4f155c83468d35bc4f52f37efffc16821ae7c706d035e1e8cc3709b41cb10f8140ff09205e8bbdba2c76128ad76d1cbd18401328b619228e834df
 DIST pip-24.1.gh.tar.gz 9188658 BLAKE2B 4a43ff0199d811dd30461e376f655a447f3f706a48dd97fe1d0ccf630f558e72209ccd06d98949a1541cd6b2942a816db23ce8aaa7fbbf9aef429502fb91ab92 SHA512 c60ab329fe91202ff64b5f0f90209085fbf8db0f0a05f0703f952ad69e39e2e3edb5dadc006a3f317cdd4ba4fb5abe56dfbd22792249a2d139702eec272186d1
 DIST pip-24.3.1.gh.tar.gz 9198711 BLAKE2B c70524bfedf46776d5ab8da24754e8177caac6d87cc90aa86b144c0fe9718860fe3d08823f655495c059dbece6e0ecbb2ac8e655cff3124693f64a35deac512e SHA512 9cf5f18eefd559cf27bc026e5206b0028ea77fd904a61fea9a6682b519305c962dd19170b841581bd05ff72192a9c458ec0eba173fa66db0438b046111ff5856
diff --git a/dev-python/pip/files/pip-23.3.1-no-color.patch b/dev-python/pip/files/pip-23.3.1-no-color.patch
deleted file mode 100644
index 528e2c6cf465..000000000000
--- a/dev-python/pip/files/pip-23.3.1-no-color.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ad01e9c2a965d395c5902c8ad70c970c7631316b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 25 Nov 2023 07:36:59 +0100
-Subject: [PATCH] Fix tests when NO_COLOR is set in the calling environment
-
-Add `FORCE_COLOR` and `NO_COLOR` variables to the `isolate()` fixture
-to ensure that these two variables do not affect internal test output.
-This fixes the following two test failures when pytest is called with
-`NO_COLOR` set:
-
-```
-FAILED tests/unit/test_exceptions.py::TestDiagnosticPipErrorPresentation_ASCII::test_complete_color - AssertionError: assert '\x1b[1merror...ing harder.\n' == '\x1b[1;31mer...ing harder.\n'
-FAILED tests/unit/test_exceptions.py::TestDiagnosticPipErrorPresentation_Unicode::test_complete_color - AssertionError: assert '\x1b[1merror...ing harder.\n' == '\x1b[1;31mer...ing harder.\n'
-```
----
- news/7ae28a10-04c4-4a1f-a276-4c9e04f2e0c1.trivial.rst | 0
- tests/conftest.py                                     | 4 ++++
- 2 files changed, 4 insertions(+)
- create mode 100644 news/7ae28a10-04c4-4a1f-a276-4c9e04f2e0c1.trivial.rst
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index c5bf4bb9567..8d9eb029c79 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -318,6 +318,10 @@ def isolate(tmpdir: Path, monkeypatch: pytest.MonkeyPatch) -> None:
-     # Make sure tests don't share a requirements tracker.
-     monkeypatch.delenv("PIP_BUILD_TRACKER", False)
- 
-+    # Make sure color control variables don't affect internal output.
-+    monkeypatch.delenv("FORCE_COLOR", False)
-+    monkeypatch.delenv("NO_COLOR", False)
-+
-     # FIXME: Windows...
-     os.makedirs(os.path.join(home_dir, ".config", "git"))
-     with open(os.path.join(home_dir, ".config", "git", "config"), "wb") as fp:
diff --git a/dev-python/pip/pip-24.0.ebuild b/dev-python/pip/pip-24.0.ebuild
deleted file mode 100644
index 8f06fdcc1722..000000000000
--- a/dev-python/pip/pip-24.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# please bump dev-python/ensurepip-pip along with this package!
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{10..13} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/ensurepip-setuptools
-			dev-python/ensurepip-wheel
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			test-rust? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			)
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-23.1-no-coverage.patch"
-		# https://github.com/pypa/pip/pull/12415
-		"${FILESDIR}/pip-23.3.1-no-color.patch"
-	)
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		local wheels=(
-			"${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl
-		)
-		mkdir tests/data/common_wheels/ || die
-		cp "${wheels[@]}" tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		# Internet
-		tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist
-		tests/functional/test_config_settings.py::test_config_settings_implies_pep517
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-		tests/functional/test_install.py::test_link_hash_in_dep_fails_require_hashes
-		tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# hacky upstream time mocking stopped working, they have it
-				# failing on CI already too
-				tests/unit/test_base_command.py::test_log_command_success
-				tests/unit/test_base_command.py::test_log_command_error
-				tests/unit/test_base_command.py::test_log_file_command_error
-			)
-			;;
-		python3.10)
-			EPYTEST_DESELECT+=(
-				# no clue why they fail
-				tests/unit/test_base_command.py::test_base_command_global_tempdir_cleanup
-				tests/unit/test_base_command.py::test_base_command_local_tempdir_cleanup
-				tests/unit/test_base_command.py::test_base_command_provides_tempdir_helpers
-			)
-			;;
-	esac
-
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local EPYTEST_XDIST=1
-	epytest -m "not network" -o tmp_path_retention_policy=all
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}
diff --git a/dev-python/pip/pip-24.3.1-r2.ebuild b/dev-python/pip/pip-24.3.1-r2.ebuild
index dc26ec994c2a..89532d77b384 100644
--- a/dev-python/pip/pip-24.3.1-r2.ebuild
+++ b/dev-python/pip/pip-24.3.1-r2.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
@@ -26,7 +26,7 @@ LICENSE="MIT"
 # bundled deps
 LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 # see src/pip/_vendor/vendor.txt
diff --git a/dev-python/poetry-core/Manifest b/dev-python/poetry-core/Manifest
index eb18c828eaee..5d840579cd19 100644
--- a/dev-python/poetry-core/Manifest
+++ b/dev-python/poetry-core/Manifest
@@ -1 +1,3 @@
 DIST poetry-core-1.9.1.gh.tar.gz 371296 BLAKE2B 0ccd041a9c5491bb9c9234ca5094162995a3959be0272d916866770d6dbc67bb183c3b1b863b24fc1906c7d4fca0f9593d3c2c7571d4c3bb37c2f8f9dd6316c5 SHA512 9ca0aa68e4e7637e78b0a02cb3946b6efd29b91e99663f26fbb09736ff2fbfa13cd683337001b2200e3037e5d4adcd745bc6ff4c91a708880238f0b78719c281
+DIST poetry-core-2.0.0.gh.tar.gz 406242 BLAKE2B dd5508f8f07a909d38f289ae928502e55713f2f0c3249ec93be9b6f12d951eca68a1d014f7a364b528c9273c68f3ad3f803349c3036af57ececc0b2d9bd3b59d SHA512 7a942feef963e94d8e2661fde1058bfaee19155ee94be6892e0065d241fbda02fce60fd58f56ae7333e2c6d2b709c792ebf0bbcd378fc2513acb00f459dd2a56
+DIST poetry_core-2.0.1.tar.gz 355487 BLAKE2B 84bbeb7129c13d3ed1a06fbcbdcb8e1a1a608c35d398bdbf35ea70c467adbbe5d293945fecdf90e7795122af2a3f5d9fa64a99e56ee37a197ea022d271f10a15 SHA512 dd1d303abd034fc0341aaa5fc8d11f13ef305e93b9e9036f4040c2cb007c8b1eecbdb719d2b5692530b80ecc06d416751a45c499f373a05b7066e56785d1a8e8
diff --git a/dev-python/poetry-core/poetry-core-2.0.0.ebuild b/dev-python/poetry-core/poetry-core-2.0.0.ebuild
new file mode 100644
index 000000000000..8613c979713b
--- /dev/null
+++ b/dev-python/poetry-core/poetry-core-2.0.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1
+
+DESCRIPTION="Poetry PEP 517 Build Backend"
+HOMEPAGE="
+	https://github.com/python-poetry/poetry-core/
+	https://pypi.org/project/poetry-core/
+"
+SRC_URI="
+	https://github.com/python-poetry/poetry-core/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+# check inside vendors/pyproject.toml
+# (note that some are indirect deps)
+RDEPEND="
+	>=dev-python/fastjsonschema-2.21.1[${PYTHON_USEDEP}]
+	>=dev-python/lark-1.2.2[${PYTHON_USEDEP}]
+	>=dev-python/packaging-24.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.2.1[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			>=dev-python/trove-classifiers-2022.5.19[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20.21[${PYTHON_USEDEP}]
+			dev-vcs/git
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove vendoring of dependencies
+	rm -r src/poetry/core/_vendor || die
+	sed -e '/__vendor_site__/d' -i src/poetry/core/__init__.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
+		einfo "Skipping tests on ${EPYTHON} (unported deps)"
+		return
+	fi
+
+	# Poetry expects test to be run inside a git repository, otherwise
+	# VCS-related logic doesn't get triggered.  An empty repository
+	# suffices, though.
+	git init || die
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock
+}
diff --git a/dev-python/poetry-core/poetry-core-2.0.1.ebuild b/dev-python/poetry-core/poetry-core-2.0.1.ebuild
new file mode 100644
index 000000000000..68733f5a7211
--- /dev/null
+++ b/dev-python/poetry-core/poetry-core-2.0.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Poetry PEP 517 Build Backend"
+HOMEPAGE="
+	https://github.com/python-poetry/poetry-core/
+	https://pypi.org/project/poetry-core/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+# check inside vendors/pyproject.toml
+# (note that some are indirect deps)
+RDEPEND="
+	>=dev-python/fastjsonschema-2.21.1[${PYTHON_USEDEP}]
+	>=dev-python/lark-1.2.2[${PYTHON_USEDEP}]
+	>=dev-python/packaging-24.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.2.1[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			>=dev-python/trove-classifiers-2022.5.19[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20.21[${PYTHON_USEDEP}]
+			dev-vcs/git
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove vendoring of dependencies
+	rm -r src/poetry/core/_vendor || die
+	sed -e '/__vendor_site__/d' -i src/poetry/core/__init__.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
+		einfo "Skipping tests on ${EPYTHON} (unported deps)"
+		return
+	fi
+
+	# Poetry expects test to be run inside a git repository, otherwise
+	# VCS-related logic doesn't get triggered.  An empty repository
+	# suffices, though.
+	git init || die
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock
+}
diff --git a/dev-python/poetry-plugin-export/Manifest b/dev-python/poetry-plugin-export/Manifest
index 714b3ff1162b..5f6d29563eca 100644
--- a/dev-python/poetry-plugin-export/Manifest
+++ b/dev-python/poetry-plugin-export/Manifest
@@ -1,2 +1,3 @@
 DIST poetry_plugin_export-1.7.1.tar.gz 29656 BLAKE2B 130eb35064104c3f22958816447ff674d1f5aed657ada2fe23a635de52338cb736f631b622b0641aae308d69494eb939a1ea659e33fc6227bb742ee01335ae15 SHA512 d472d8e4d6eb803587722854be912009a9bc0a8f86ee0e3ef0046f385ed59236af229109dae85198e3a205702cff86780576939e518fa797f3e5093537a0d2f1
 DIST poetry_plugin_export-1.8.0.tar.gz 29840 BLAKE2B 67748605964f90120be8a696b454497e53f9ff8c739a09930e31fef19623f05552b069a5c572a1a32a0ad68ee85e760901f61bfdf8ba35351b982863e250d4ed SHA512 90cbf0e79787611a4d78c6ce637d4087d375aa25e65489d770d13f2a769d9919d76512b3fad70073073a83fe41ec42a8925c8b27983d84458007356b3ec8409d
+DIST poetry_plugin_export-1.9.0.tar.gz 30835 BLAKE2B f8f7649d0bcec78bb0c2279204d7279c6c7d1d32e9f2d76b45e5a9fe817924ccbfc61ca6da13e151e5b1c45e2974d1cdf25214b1e9e550a2595efa386c2a1784 SHA512 5c2c5d6bca5832d17083fa568d7974e16ec66010a0dc05aca66d090ed12ce1a1645ed29ce072cbe156315b54e77906b4e723101c6206aa1fbc1e64295a2a8da5
diff --git a/dev-python/poetry-plugin-export/poetry-plugin-export-1.9.0.ebuild b/dev-python/poetry-plugin-export/poetry-plugin-export-1.9.0.ebuild
new file mode 100644
index 000000000000..f8206b459303
--- /dev/null
+++ b/dev-python/poetry-plugin-export/poetry-plugin-export-1.9.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A plugin that allows the export of locked packages to various formats"
+HOMEPAGE="
+	https://python-poetry.org/
+	https://github.com/python-poetry/poetry-plugin-export
+	https://pypi.org/project/poetry-plugin-export/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/poetry-core-1.7.0[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	test? (
+		>=dev-python/poetry-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.9[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/poetry/Manifest b/dev-python/poetry/Manifest
index 886dbc5cd6ce..90d45bb57d0b 100644
--- a/dev-python/poetry/Manifest
+++ b/dev-python/poetry/Manifest
@@ -1,2 +1,3 @@
-DIST poetry-1.8.4.tar.gz 1519163 BLAKE2B 20b73806ae4559e3a137d80db1abbd52b0ba2edb8b512875dcd784c66fa74ebe8659518af9a87349f5ae821f3962bd325d06c2f52567c6d7bd6fb9e10d2988d4 SHA512 59e4e9737ae8a129544460735aa6d82dd4370bd94b37231b5d336cc4f5b9d48a3b7aeaeea1a5b564339663fd0fa914afc83ddf43aef98aa62387daa959d032c0
 DIST poetry-1.8.5.tar.gz 1519790 BLAKE2B 378cb327fe6762e8dd09d7f08fb11cd17963c382754a20fba3cc000ac07ab93672b54d967ba6d609d00e9f303461e55ec40eb9549a0b9329f50c4af363fd2343 SHA512 91c2902e5dfb8f3319de53472b1da20b1d8f570a7a3212e6e55883e364295a9e58ce5b7c59450e741f97692e897283d9f624f3d2128db017476d94fd2ea7839c
+DIST poetry-2.0.0.tar.gz 2844621 BLAKE2B 17c3c91c839e3a7bd5f27b7659cd4906bfc5337d64699d92614bd880f1c9351ab2dd05d8486ce7304860b1705c0f6e16526f10e2f7f71ec2ad5234807fca3327 SHA512 82ecf902dfa804ff54f4d77557d51d781f29a532699d3d901a844c9ed5906d421869d90789468d563febaa838ad6b237c0021eb4b27953233e351929ca556c1d
+DIST poetry-2.0.1.tar.gz 2846041 BLAKE2B 691ffcd39799d0794f8853cdb9742d95d5dd64a62488af56f58b6ac1d8b7e734b109375d595f975e7b310bd3c36a5b5c846dd37e2ffd7bf2fe7d25bd1835cff1 SHA512 9a53fe5cbaea7c923e8af6920b545a54402d49937f31c5812dcc8939f8db44ea2557302f54e015fd7f7e96de66d8fc90596cd06a30dc53ef474a8bb54fdc2c97
diff --git a/dev-python/poetry/poetry-1.8.4.ebuild b/dev-python/poetry/poetry-1.8.4.ebuild
deleted file mode 100644
index 5c5bb9038e98..000000000000
--- a/dev-python/poetry/poetry-1.8.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A frontend for poetry - a python dependency management and packaging tool"
-HOMEPAGE="
-	https://python-poetry.org/
-	https://github.com/python-poetry/poetry
-	https://pypi.org/project/poetry/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/poetry-core-1.9.1[${PYTHON_USEDEP}]
-	>=dev-python/poetry-plugin-export-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/cachecontrol-0.14.0[${PYTHON_USEDEP}]
-	>=dev-python/cleo-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/crashtest-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.21.2[${PYTHON_USEDEP}]
-	>=dev-python/fastjsonschema-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/installer-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keyring-24.0.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pkginfo-1.10[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/shellingham-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2022.5.19[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.26.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/deepdiff-6.3.1[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-1.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.9[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	# unpin
-	sed -e 's:\^:>=:' \
-		-e '/poetry-core/s:":">=:' \
-		-e 's:,<[0-9.]*::' \
-		-i pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-EPYTEST_DESELECT=(
-	# Internal test for lockfile being up-to-date
-	# Meaningless, also sdist does not include lockfile
-	tests/installation/test_installer.py::test_not_fresh_lock
-
-	# TODO
-	tests/installation/test_executor.py::test_executor_known_hashes
-	tests/utils/env/test_env_manager.py::test_create_venv_finds_no_python_executable
-)
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m "not network" -p pytest_mock
-}
diff --git a/dev-python/poetry/poetry-1.8.5-r1.ebuild b/dev-python/poetry/poetry-1.8.5-r1.ebuild
new file mode 100644
index 000000000000..2206c02197fc
--- /dev/null
+++ b/dev-python/poetry/poetry-1.8.5-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A frontend for poetry - a python dependency management and packaging tool"
+HOMEPAGE="
+	https://python-poetry.org/
+	https://github.com/python-poetry/poetry
+	https://pypi.org/project/poetry/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	<dev-python/poetry-core-2[${PYTHON_USEDEP}]
+	>=dev-python/poetry-core-1.9.1[${PYTHON_USEDEP}]
+	>=dev-python/poetry-plugin-export-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/cachecontrol-0.14.0[${PYTHON_USEDEP}]
+	>=dev-python/cleo-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/crashtest-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.21.2[${PYTHON_USEDEP}]
+	>=dev-python/fastjsonschema-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/installer-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keyring-24.0.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.12[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/shellingham-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
+	>=dev-python/trove-classifiers-2022.5.19[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.26.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.10)
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/deepdiff-6.3.1[${PYTHON_USEDEP}]
+		>=dev-python/httpretty-1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.9[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	# unpin
+	sed -e 's:\^:>=:' \
+		-e '/poetry-core/s:":">=:' \
+		-e 's:,<[0-9.]*::' \
+		-i pyproject.toml || die
+
+	distutils-r1_src_prepare
+}
+
+EPYTEST_DESELECT=(
+	# Internal test for lockfile being up-to-date
+	# Meaningless, also sdist does not include lockfile
+	tests/installation/test_installer.py::test_not_fresh_lock
+
+	# TODO
+	tests/installation/test_executor.py::test_executor_known_hashes
+	tests/utils/env/test_env_manager.py::test_create_venv_finds_no_python_executable
+)
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -m "not network" -p pytest_mock
+}
diff --git a/dev-python/poetry/poetry-1.8.5.ebuild b/dev-python/poetry/poetry-1.8.5.ebuild
deleted file mode 100644
index 2a5737492d83..000000000000
--- a/dev-python/poetry/poetry-1.8.5.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A frontend for poetry - a python dependency management and packaging tool"
-HOMEPAGE="
-	https://python-poetry.org/
-	https://github.com/python-poetry/poetry
-	https://pypi.org/project/poetry/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/poetry-core-1.9.1[${PYTHON_USEDEP}]
-	>=dev-python/poetry-plugin-export-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/cachecontrol-0.14.0[${PYTHON_USEDEP}]
-	>=dev-python/cleo-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/crashtest-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.21.2[${PYTHON_USEDEP}]
-	>=dev-python/fastjsonschema-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/installer-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keyring-24.0.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pkginfo-1.12[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/shellingham-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2022.5.19[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.26.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/deepdiff-6.3.1[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-1.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.9[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	# unpin
-	sed -e 's:\^:>=:' \
-		-e '/poetry-core/s:":">=:' \
-		-e 's:,<[0-9.]*::' \
-		-i pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-EPYTEST_DESELECT=(
-	# Internal test for lockfile being up-to-date
-	# Meaningless, also sdist does not include lockfile
-	tests/installation/test_installer.py::test_not_fresh_lock
-
-	# TODO
-	tests/installation/test_executor.py::test_executor_known_hashes
-	tests/utils/env/test_env_manager.py::test_create_venv_finds_no_python_executable
-)
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m "not network" -p pytest_mock
-}
diff --git a/dev-python/poetry/poetry-2.0.0.ebuild b/dev-python/poetry/poetry-2.0.0.ebuild
new file mode 100644
index 000000000000..aa856184ffdd
--- /dev/null
+++ b/dev-python/poetry/poetry-2.0.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A frontend for poetry - a python dependency management and packaging tool"
+HOMEPAGE="
+	https://python-poetry.org/
+	https://github.com/python-poetry/poetry
+	https://pypi.org/project/poetry/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/poetry-core-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/poetry-plugin-export-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/build-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/cachecontrol-0.14.0[${PYTHON_USEDEP}]
+	>=dev-python/cleo-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.22.6[${PYTHON_USEDEP}]
+	>=dev-python/fastjsonschema-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/installer-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keyring-25.1.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-24.0[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.12[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/shellingham-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
+	>=dev-python/trove-classifiers-2022.5.19[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.26.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.10)
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/deepdiff-6.3.1[${PYTHON_USEDEP}]
+		>=dev-python/httpretty-1.1[${PYTHON_USEDEP}]
+		>=dev-python/jaraco-classes-3.3.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.9[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	# unpin
+	sed -e 's:\^:>=:' \
+		-e '/poetry-core/s:":">=:' \
+		-e 's:,<[0-9.]*::' \
+		-i pyproject.toml || die
+
+	distutils-r1_src_prepare
+}
+
+EPYTEST_DESELECT=(
+	# Internal test for lockfile being up-to-date
+	# Meaningless, also sdist does not include lockfile
+	tests/installation/test_installer.py::test_not_fresh_lock
+
+	# TODO
+	tests/installation/test_executor.py::test_executor_known_hashes
+	tests/puzzle/test_provider.py::test_search_for_directory_setup_read_setup_with_no_dependencies
+	tests/utils/env/test_env_manager.py::test_create_venv_finds_no_python_executable
+	tests/utils/test_python_manager.py::test_python_get_preferred_default
+	'tests/inspection/test_info.py::test_info_setup_missing_mandatory_should_trigger_pep517[name]'
+)
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -m "not network" -p pytest_mock
+}
diff --git a/dev-python/poetry/poetry-2.0.1-r1.ebuild b/dev-python/poetry/poetry-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..3de893c32002
--- /dev/null
+++ b/dev-python/poetry/poetry-2.0.1-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A frontend for poetry - a python dependency management and packaging tool"
+HOMEPAGE="
+	https://python-poetry.org/
+	https://github.com/python-poetry/poetry
+	https://pypi.org/project/poetry/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/poetry-core-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/poetry-plugin-export-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/build-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/cachecontrol-0.14.0[${PYTHON_USEDEP}]
+	>=dev-python/cleo-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.22.6[${PYTHON_USEDEP}]
+	>=dev-python/fastjsonschema-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/installer-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keyring-25.1.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-24.0[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.12[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/shellingham-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
+	>=dev-python/trove-classifiers-2022.5.19[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.26.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.10)
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/deepdiff-6.3.1[${PYTHON_USEDEP}]
+		>=dev-python/httpretty-1.1[${PYTHON_USEDEP}]
+		>=dev-python/jaraco-classes-3.3.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.9[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	# unpin
+	sed -e 's:,<[0-9.]*::' -e 's:==\([0-9]\):>=\1:' -i pyproject.toml || die
+
+	distutils-r1_src_prepare
+}
+
+EPYTEST_DESELECT=(
+	# Internal test for lockfile being up-to-date
+	# Meaningless, also sdist does not include lockfile
+	tests/installation/test_installer.py::test_not_fresh_lock
+
+	# TODO
+	tests/installation/test_executor.py::test_executor_known_hashes
+	tests/puzzle/test_provider.py::test_search_for_directory_setup_read_setup_with_no_dependencies
+	tests/utils/env/test_env_manager.py::test_create_venv_finds_no_python_executable
+	tests/utils/test_python_manager.py::test_python_get_preferred_default
+	'tests/inspection/test_info.py::test_info_setup_missing_mandatory_should_trigger_pep517[name]'
+)
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -m "not network" -p pytest_mock
+}
diff --git a/dev-python/portalocker/Manifest b/dev-python/portalocker/Manifest
index f2ffbaa559d5..1fbee53fd126 100644
--- a/dev-python/portalocker/Manifest
+++ b/dev-python/portalocker/Manifest
@@ -1,2 +1 @@
-DIST portalocker-3.0.0.gh.tar.gz 35104 BLAKE2B b96591c56f8f894eaf012bfa89dd4e5cf7ee300176f4ea861e29dbf6f2a3cade061605b2d0a5796010369caebc3b032d77b77bddff165959bd464e9d9e8b4ebc SHA512 b3417bc0b4f726129b6625a778d7d828ab8401422ee1847b20ee79019fc029acb0cebbe539495e071cdf8dcd628d5764f39036059b19718b5ba2d0702388ac9c
 DIST portalocker-3.1.1.gh.tar.gz 36653 BLAKE2B 88fe7b46cf3d2d4b8f6aa2df8b6ac7582eda35965d7af8688e17f9c22c0ff29e671bfe4c74aef91532ce01e957b4777abc2c93bc3c93503f0f7fee995fdfb1ec SHA512 80163a12d8eab1a0e2bc2eb5fd8f4c64f0abb49cbb99faa48d8e7ae4f61996c5c934e661a7a26996000962b68c45d5ab72c41abf03d7e7593dcaa98e69d0478f
diff --git a/dev-python/portalocker/portalocker-3.0.0.ebuild b/dev-python/portalocker/portalocker-3.0.0.ebuild
deleted file mode 100644
index 2c3098f6479c..000000000000
--- a/dev-python/portalocker/portalocker-3.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..13} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A library for Python file locking"
-HOMEPAGE="
-	https://github.com/WoLpH/portalocker/
-	https://portalocker.readthedocs.io/
-	https://pypi.org/project/portalocker/
-"
-SRC_URI="
-	https://github.com/WoLpH/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-BDEPEND="
-	test? (
-		dev-python/redis[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-6.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-
-	# Disable code coverage in tests.
-	sed -i '/^ *--cov.*$/d' pytest.ini || die
-}
-
-pkg_postinst() {
-	optfeature "redis support" dev-python/redis
-}
diff --git a/dev-python/portalocker/portalocker-3.1.1.ebuild b/dev-python/portalocker/portalocker-3.1.1.ebuild
index 0d07a29a4197..105618269f4e 100644
--- a/dev-python/portalocker/portalocker-3.1.1.ebuild
+++ b/dev-python/portalocker/portalocker-3.1.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/prompt-toolkit/Manifest b/dev-python/prompt-toolkit/Manifest
index e18c78a9a8ed..0980b9fc6b1c 100644
--- a/dev-python/prompt-toolkit/Manifest
+++ b/dev-python/prompt-toolkit/Manifest
@@ -1 +1,2 @@
 DIST prompt_toolkit-3.0.48.tar.gz 424684 BLAKE2B 2b22cebfaf66c07bf9e2ba2677be4c36436c0b5679e01cf39b7335f1898e33f7bb5b4f3a147a39feca37bd3921b8cbe8db98c948d2819c0e7269cca5e2b71d26 SHA512 f999c0d6df94a1a640d735e4b6f4bebd496693b8ae7267c4a8561c726a8148f937781b07f8e76a045ac0b90fa1d98fb767c153c3a96e25bc5e610c873f8e76c3
+DIST prompt_toolkit-3.0.50.tar.gz 429087 BLAKE2B 534c86bc82c34c26df4cbce37ebfdffa720dc0eedde7d1b8ef434474facdbbe327c5634fa949166d72d763198a89890fea95f5d5e86ff8444c44b2f203aaccb3 SHA512 1ee5d91257607da100ac99aa4220067fd85a785495d03e6f617508bed750df7f6fd3857205e55126cf7059074433d4a59d4525c023c8f4401a0efa33495833ed
diff --git a/dev-python/prompt-toolkit/prompt-toolkit-3.0.50.ebuild b/dev-python/prompt-toolkit/prompt-toolkit-3.0.50.ebuild
new file mode 100644
index 000000000000..32d796821fce
--- /dev/null
+++ b/dev-python/prompt-toolkit/prompt-toolkit-3.0.50.ebuild
@@ -0,0 +1,30 @@
+# 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="Building powerful interactive command lines in Python"
+HOMEPAGE="
+	https://pypi.org/project/prompt-toolkit/
+	https://github.com/prompt-toolkit/python-prompt-toolkit/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# requires tree-sitter-languages
+	src/prompt_toolkit/lexers/tree_sitter_test.py
+)
diff --git a/dev-python/protobuf/Manifest b/dev-python/protobuf/Manifest
index 18976180405d..ae5fa1eb4f62 100644
--- a/dev-python/protobuf/Manifest
+++ b/dev-python/protobuf/Manifest
@@ -2,8 +2,11 @@ DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f8
 DIST protobuf-21.9.tar.gz 5110670 BLAKE2B a4f5b7f58e1c5904ca990b100a72992f6f56177b28773f8de8c99e4158391d33cfb8aa8575915887fc9ae4294faf81d4ff6b470bc07b394bfd5885a09ba0fafe SHA512 6954b42d21921e630173b7848c056ab95635627d8eddec960f3db2ddda13eedde00520a9b350722e76e2998649eb8ebe10758e1db938b6a91e38ff3295b1b7c1
 DIST protobuf-22.5.tar.gz 4924661 BLAKE2B d69c73f4ebfddf45fd94b4f5f898faf00256fe674f2cbc0443c60a88d7a0f47fb96f2f6262879927c6da88095b4ea3ee7fd4c471c100bf42a2bae9edf48c07f1 SHA512 058ab2fec5b11007972e6043071056d1944c3b6fe1d31246cddba8eb57686e3b5280f6ad3d58e78940ca63005e74a8de3c72237f9f7c5066548c5a2513ddc584
 DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3 SHA512 646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9dddd615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b
+DIST protobuf-4.25.5.py.tar.gz 380315 BLAKE2B 84b635be347a6ebf14cc3f0862da5b9ed195ae6e418144761a4e0d48a681d28338677621f914bb186f729d7ff7da859a7ff4ea69c0bdabb1ebaab833909c1d7d SHA512 6e085baf8c325a807b036adebd1dca13e018c97be3686a26b43701815548128b54fbfa68eeedfba4707a3311d89f903a02c77c3dfcc2abdc16e64f7ac67b893d
+DIST protobuf-5.27.5.py.tar.gz 401551 BLAKE2B ab51b7a99af041ae2cd96751b2d73092c5af17c55753f4f3e028d11d4f1de3b04a31814939dce707c6d3c95ce0c63714ed583d2a79a1d90e13875ccda004b4fd SHA512 a6e3ae76ceb077af3823d0b6b355cf7e3b811b89ca2f073bf2964890bda9c0339777ed60a0d91d4ebdced9a2c3f6eeec73ef9918f9a6676636727f6a7ed6f60d
 DIST protobuf-5.28.0.py.tar.gz 422388 BLAKE2B 208f92bdb2bc0b92dca76de4d13eda0c98bc4784cb2ce9d57690682d9327fb2a66646241ecc02e96be602b6763b177b3192ca457732540d1fa8c33afecd8d76f SHA512 91f05915ace778ee76a07856049410c48c02a665f6c4665df9ac3e32992a67235a93fb4e19c9f991821652f236b87749c3d79cfabd8c6508fdc17a2ee612cee5
 DIST protobuf-5.28.3.py.tar.gz 422479 BLAKE2B ce571a63641cbb9af0aafd21b140c0732028bf04ae5aafe60301b3b1e31defc9b4d7d1d8f088e5b01fa7911617230feb5f58e38c0909b8f88676e62c59385a69 SHA512 5c42d50c6fbccf03acb95872d3233f75ff20333924e4eba6b36c095824f850121c9aa1664a5826dcb3a7dc79e9647e4f7decdee0d78a1a8557373613645d6507
+DIST protobuf-5.29.2.py.tar.gz 424901 BLAKE2B ea90ff2bda8e2d264b9870d34a2aecf3e86691d144b420c39db1bcfb425723ef91ece5a2d7d448d026160866ee93d2c5d0e506a99712a5c22165f7c07865dc54 SHA512 7b7a0b116f03e5c64e9342ac0f9143bf8a41fe716697bcd58e20a410fb5d1043a174e68b33209178c5e3605421a145a11a17338ca1171597194eb0a5cfd2e63d
 DIST protobuf-python-4.25.4.tar.gz 380283 BLAKE2B 3ded7b654fa4db54b0dff2309f096bcab634b9d587bd94dae4ab49fb2fe9dc8f821c52deed43b026e06189b3b7a1a6697074942c1fa732ec82257233bf1b2f90 SHA512 7b91a9473fafe62b723741faec8e8531c604b025a49ef8be79778f8a48c84c475518447b24f5a08a0a8a8ecb1ff22e2106a3183197b76be3b2b8c6c994d93920
 DIST protobuf-python-5.27.2.tar.gz 401640 BLAKE2B 9d3420b75536ffd452cc2a3317a6ad1e16a62df36085f1e329f0178026032f5533e1a96f7b613f91093ac12a44d7ad4059ebededea636f38ded29da563afd075 SHA512 b3afcf13e223d7e855ac0aa000cc395e3ea1301b2e3dfe3c0d5435d8031be3726e6aec1fb6228c572aa1685f75aba2d97d2c9dfdb6d9e058a2e88321d6ba9180
 DIST protobuf-python-5.27.4.tar.gz 401622 BLAKE2B 4a7f211a4f4b3e7a338f8be6a7c6cdec2df629d6f9b62dfc276d6029864dfb541468a5e4d221f4540ae9281e5fc622ee898daeb178f9d98bac9932af0c8625db SHA512 2b817947363ab8d31bd484c18d33234004c7f5e6cb7bff55657cc33e1f325e22c7ccf83c19e255e839d6061fc62d632af9b36bc4fef0d4b33623b278239043b2
diff --git a/dev-python/protobuf/protobuf-4.25.5.ebuild b/dev-python/protobuf/protobuf-4.25.5.ebuild
new file mode 100644
index 000000000000..389b9b7662da
--- /dev/null
+++ b/dev-python/protobuf/protobuf-4.25.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2008-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Default implementation currently is upb, which doesn't match dev-libs/protobuf
+# https://github.com/protocolbuffers/protobuf/blob/main/python/README.md#implementation-backends
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+PYPI_PN="protobuf"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="
+	https://protobuf.dev/
+	https://pypi.org/project/protobuf/
+"
+
+# Rename sdist to avoid conflicts with dev-libs/protobuf
+SRC_URI="
+	$(pypi_sdist_url) -> ${P}.py.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-3)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
diff --git a/dev-python/protobuf/protobuf-5.27.5.ebuild b/dev-python/protobuf/protobuf-5.27.5.ebuild
new file mode 100644
index 000000000000..389b9b7662da
--- /dev/null
+++ b/dev-python/protobuf/protobuf-5.27.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2008-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Default implementation currently is upb, which doesn't match dev-libs/protobuf
+# https://github.com/protocolbuffers/protobuf/blob/main/python/README.md#implementation-backends
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+PYPI_PN="protobuf"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="
+	https://protobuf.dev/
+	https://pypi.org/project/protobuf/
+"
+
+# Rename sdist to avoid conflicts with dev-libs/protobuf
+SRC_URI="
+	$(pypi_sdist_url) -> ${P}.py.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-3)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
diff --git a/dev-python/protobuf/protobuf-5.28.3.ebuild b/dev-python/protobuf/protobuf-5.28.3.ebuild
index 389b9b7662da..457e87a2c17d 100644
--- a/dev-python/protobuf/protobuf-5.28.3.ebuild
+++ b/dev-python/protobuf/protobuf-5.28.3.ebuild
@@ -26,4 +26,4 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-3)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
diff --git a/dev-python/protobuf/protobuf-5.29.2.ebuild b/dev-python/protobuf/protobuf-5.29.2.ebuild
new file mode 100644
index 000000000000..389b9b7662da
--- /dev/null
+++ b/dev-python/protobuf/protobuf-5.29.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2008-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Default implementation currently is upb, which doesn't match dev-libs/protobuf
+# https://github.com/protocolbuffers/protobuf/blob/main/python/README.md#implementation-backends
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+PYPI_PN="protobuf"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="
+	https://protobuf.dev/
+	https://pypi.org/project/protobuf/
+"
+
+# Rename sdist to avoid conflicts with dev-libs/protobuf
+SRC_URI="
+	$(pypi_sdist_url) -> ${P}.py.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-3)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 1c533f933948..f7f2767fe0fc 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,6 +1,4 @@
 DIST psutil-5.9.8-tests.patch.xz 3716 BLAKE2B cf33173a0d5c6537b0de1c4858beb9ec59c0361c6249f8a5cb3d55edc025578ddc0285a062083d28fcd4ece223728376dd64e9232aed1d761786b772a4cc7778 SHA512 5c9539a9716e25dc3cc5f2ce4373911a6c4524941838aff7aa08cc482d15aba6ec40b7904593723a785284410bcded2595c78a6c186d8af5b5f664c2d77e9220
 DIST psutil-5.9.8.tar.gz 503247 BLAKE2B 192812d9006b9eb1a856ff8d322e6cfb320462e5dc5ee7b88869ce7f4f2277050c4867b5e3f64468bb42de0b5bde85b715b84b37842bd3f605216acf89a62a4c SHA512 6ddeed937119a930bb7b9556ff329f054e9429b8457c9a15d99cb105271297117abba587a974d02760bb8b6b244734973a676bdff6b533a53ce587858e48f337
-DIST psutil-6.0.0-tests.patch.xz 3748 BLAKE2B 6e78418de8ee052e7e9f5d6bc74b8fc79e5216ed4d5fa8eb89532b19298955c388e158770b4af7b42fddc2a03b292e6d8ce9ed98c441179fb7c4a640014f2112 SHA512 3947337dbdddc29c85697d6140fc0fdcfb2b5ce7d84438e5763ad240ccd954e97fbf5dabf03ca17e959273a2c11794a41b2293434e85d2fe4d38d696c7de3900
-DIST psutil-6.0.0.tar.gz 508067 BLAKE2B a4c80d1cead17ab73c99a25c4e1712cc2dd0b4220521d8dacafb905ab27393c49a8ee20790a89ebfc6c1d53779e98fe126c50f9299db1ab9a9c3df6d0a99ec48 SHA512 78ef1abe109c985ad3dd3865de5b4a7682fbad0085e5ca5bc1f2f90f03853775554b6c810cd54543cb7a1238efe345b3dcc9f5191270e03bc6a2f4088dd007ba
 DIST psutil-6.1.0.tar.gz 508565 BLAKE2B 2b5095613854c8e77e5e5ac8bb67b3d631bb29515c8d958e7cedb81a56c03d639663602f01337e191084f1511a6cb921a85394ecc8ac64af2270cf75cdc44262 SHA512 76865df4fdb2a9df45e47589b76b34d0d9d9251491091683e47b4509863e32e46dc62ee2f760b983f0f762b8288d1ea7f32268a6857c049ad12f399908e19c82
 DIST psutil-6.1.1.tar.gz 508502 BLAKE2B ebd8ee40cd86fdbc1ed70e192228889dbae74295ba5b17baa629ca8c3d05945b61ad4b02a836af30886bbf78d65de842cd25486c292ed5b727f37645c6bde93b SHA512 db8a2f4b0b451ca46aaa21b1faae03c4328b1effd04f240a7c8efc94a1c8ca7fc080fc6d16f6ca2046b9232ec43e447be0c414b125f8f511131dc6dff95bd72c
diff --git a/dev-python/psutil/psutil-6.0.0-r1.ebuild b/dev-python/psutil/psutil-6.0.0-r1.ebuild
deleted file mode 100644
index f8d6a5297af0..000000000000
--- a/dev-python/psutil/psutil-6.0.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 )
-
-inherit distutils-r1 pypi
-
-TEST_PATCH=psutil-6.0.0-tests.patch
-DESCRIPTION="Retrieve information on running processes and system utilization"
-HOMEPAGE="
-	https://github.com/giampaolo/psutil/
-	https://pypi.org/project/psutil/
-"
-SRC_URI+="
-	https://dev.gentoo.org/~mgorny/dist/${TEST_PATCH}.xz
-"
-
-LICENSE="BSD"
-SLOT="0"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${WORKDIR}/${TEST_PATCH}"
-)
-
-python_test() {
-	# Since we are running in an environment a bit similar to CI,
-	# let's skip the tests that are disabled for CI
-	local -x TRAVIS=1
-	local -x APPVEYOR=1
-	local -x GITHUB_ACTIONS=1
-	local -x GENTOO_TESTING=1
-	"${EPYTHON}" psutil/tests/runner.py ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_compile() {
-	# Force -j1 to avoid .o linking race conditions
-	local MAKEOPTS=-j1
-	distutils-r1_python_compile
-}
diff --git a/dev-python/psutil/psutil-6.0.0.ebuild b/dev-python/psutil/psutil-6.0.0.ebuild
deleted file mode 100644
index cfe57218cb2f..000000000000
--- a/dev-python/psutil/psutil-6.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-TEST_PATCH=psutil-6.0.0-tests.patch
-DESCRIPTION="Retrieve information on running processes and system utilization"
-HOMEPAGE="
-	https://github.com/giampaolo/psutil/
-	https://pypi.org/project/psutil/
-"
-SRC_URI+="
-	https://dev.gentoo.org/~mgorny/dist/${TEST_PATCH}.xz
-"
-
-LICENSE="BSD"
-SLOT="0"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${WORKDIR}/${TEST_PATCH}"
-)
-
-python_test() {
-	# Since we are running in an environment a bit similar to CI,
-	# let's skip the tests that are disabled for CI
-	local -x TRAVIS=1
-	local -x APPVEYOR=1
-	local -x GITHUB_ACTIONS=1
-	local -x GENTOO_TESTING=1
-	"${EPYTHON}" psutil/tests/runner.py ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_compile() {
-	# Force -j1 to avoid .o linking race conditions
-	local MAKEOPTS=-j1
-	distutils-r1_python_compile
-}
diff --git a/dev-python/psutil/psutil-6.1.1.ebuild b/dev-python/psutil/psutil-6.1.1.ebuild
index 361ba97d3525..78de51380249 100644
--- a/dev-python/psutil/psutil-6.1.1.ebuild
+++ b/dev-python/psutil/psutil-6.1.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-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"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 8572cda16532..1cc36e6d9a74 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,8 +1,7 @@
 DIST psycopg-3.1.19.gh.tar.gz 507073 BLAKE2B c10e2ba83f4a3bb0646d86c0f1311ae43e3fafbf9eb8ae91f8a77941dd2ef21d22c5fdeca724399bbcf5f7f010f5a3b0f78979720efec8f25613abbe568dabc9 SHA512 a7d02570632a28080ffd99fa492c2f1af623e7ca55e57e8c5d4664aff4d033ae85fc21cfbb1f85a90c48e01944ed1be68e857b5cb34c0547b51ca465bac0a361
-DIST psycopg-3.2.0.gh.tar.gz 549161 BLAKE2B 33997b5ee2f4f814561f83f92e9db4b61664f0ac84f6ff3bfd057d1cf9039a5e169478c8f40deb97e07433cf1481bfa7f4f79765158ec968ff6ab74b5aa6d14e SHA512 4466390a33f55eca73e1d490aca98ad7bb0e4c55b166d8956e1c940f5ea71c7cb07ba5602276f7510b2368d6c0c0e6eacac8d4ae67f465fd07afc4c75283f3c1
-DIST psycopg-3.2.1.gh.tar.gz 549277 BLAKE2B badea79ca48b99ae363ffa1d04de922add9456662e0909a2761f61f1a5d03e2afc01ee188814495029551d9521aff95caa7ef3123d96dfcfbb3c0d0a14597e3c SHA512 ecaeee67493ce849a2d7477d0373061ab3b329d228e3c0dd482d7ee8c7eea07c59127db2e6afc0233a78f073306d4adef915aba5f3fc6378c0335c3155350294
 DIST psycopg-3.2.2.gh.tar.gz 550226 BLAKE2B 2731190da5b044f16eb0f90fb5417244e46fc0906dde6ee9bd1ee4d91613f59ef1943da6662ad1f3db1487b8cc2b4ccb4e0a79ecc056a8f72c7e2b7b70e39abd SHA512 48686101c9d568003ffbf90cf07bc4496fb161f599b60a2b2df41ac120f338bee7edbeae3786071969d6bbb9acdbe868fa568b9cfa3b7a17dec2d47e5d54f002
 DIST psycopg-3.2.3.gh.tar.gz 550802 BLAKE2B 1f748fc2dc915fd82b2bc557ae4263ecf1070d5ba08681cb6ae21570acf601b03a2bde7e4324cd506e0146c86db976b003c57e99cd1948a930c074f0674d6ba8 SHA512 cf543652cfd27cf1cad3b1e3b8b50802562cc49f8fbd9ae5bd85ffdf26e30dc470f1f3380261c8cad418945ade8dc4f199ebcba08968cb87fd0b6c241fd8040d
+DIST psycopg-3.2.4.gh.tar.gz 555758 BLAKE2B 1b74f8a6ee91266fb6c6a13ee51fd7d18514b4ce662f911f83baba652bb9198cae21636f6f1dad6eae916cc2c22f2322629dea346e61ce94a1d94a80c8e8b5be SHA512 026f4a74011c37e594903931da629fa0150834db0916bc02a45aa31eb79fbbcd9a0b6b59809d4db389e298101646409097d99c4950981ddb43413a7488e4f1ff
 DIST psycopg2-2.9.10.tar.gz 385672 BLAKE2B 4a3ad64f406c427b785ffeb85f6520aa67ed04de2d1749eb22d8275146b71ba451f7c04c9ead401d6f7a273781492cd6a5a36beba68b36b1e5203ee75f7df503 SHA512 d0916f6a645b5e87f89f2463dc22fad78340a85fbff320d099bf429a42557f40d3a4eebdc670768469aef1e9fcee60123767bfe49e1186e8574f95bfd6f46900
 DIST psycopg2-2.9.4.tar.gz 384017 BLAKE2B 4bc0afcc890c8a257c1ccd5c6e4e5301857a80f8b1428aa46c1473c9e18f5d2914a2e592c13336b06106217bb334d9b0321835bdd123f1627cbeb29dedf97bf7 SHA512 259088e42e0ab0d8a1a0ccf04f5e560f32c6179b4a0a0059e91bcf269baa8f4b0f1f949c332c640a2438c927a29b2c144078a861f8e18ba9c764da7c93c73b8d
 DIST psycopg2-2.9.9.tar.gz 384926 BLAKE2B 8418fca1329703cedfc86be74d85cae5133a0604bb8a21fa43e5359a46626d38ef227d0cd8fbbeb497e2db517a469d7f3e86b74ef9163617a547e999073a6b4c SHA512 a691fd09762221e854861dedce37b05e5354e0701feea470a6d5046960056ef02a8c9ecfa751adeba485271ea7d5834643b7d3a3c3f3270087f5ed9c68509f5f
diff --git a/dev-python/psycopg/psycopg-2.9.9-r1.ebuild b/dev-python/psycopg/psycopg-2.9.9-r1.ebuild
deleted file mode 100644
index 39e51285e624..000000000000
--- a/dev-python/psycopg/psycopg-2.9.9-r1.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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_PN="psycopg2"
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="
-	https://www.psycopg.org/
-	https://github.com/psycopg/psycopg2/
-	https://pypi.org/project/psycopg2/
-"
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/postgresql-8.1:*"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( >=dev-db/postgresql-8.1[server] )
-"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# fix for py3.13
-	sed -e 's:_PyInterpreterState_Get:PyInterpreterState_Get:' \
-		-i psycopg/utils.c || die
-	# broken by different encoding of IPv4-mapped addresses
-	sed -e 's:test_\(cidr\|inet\)_adapt:_&:' \
-		-i tests/test_ipaddress.py || die
-
-	if use debug; then
-		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
-	fi
-}
-
-src_test() {
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" psycopg2_test || die
-
-	local -x PSYCOPG2_TESTDB_HOST="${T}"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-	"${EPYTHON}" -c "
-import tests
-tests.unittest.main(defaultTest='tests.test_suite')
-" --verbose || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/psycopg/psycopg-3.2.0.ebuild b/dev-python/psycopg/psycopg-3.2.0.ebuild
deleted file mode 100644
index 7b5d1e032245..000000000000
--- a/dev-python/psycopg/psycopg-3.2.0.ebuild
+++ /dev/null
@@ -1,119 +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 flag-o-matic
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="
-	https://www.psycopg.org/psycopg3/
-	https://github.com/psycopg/psycopg/
-	https://pypi.org/project/psycopg/
-"
-SRC_URI="
-	https://github.com/psycopg/psycopg/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="+native-extensions"
-
-DEPEND="
-	native-extensions? (
-		>=dev-db/postgresql-8.1:=
-	)
-	!native-extensions? (
-		>=dev-db/postgresql-8.1:*
-	)
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/tomli[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-	test? (
-		>=dev-db/postgresql-8.1[server]
-		>=dev-python/anyio-4.0[${PYTHON_USEDEP}]
-		>=dev-python/dnspython-2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/935401
-	# https://github.com/psycopg/psycopg/issues/867
-	#
-	# Do not trust with LTO either.
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	# Python code + ctypes backend
-	cd psycopg || die
-	distutils-r1_python_compile
-
-	# optional C backend
-	if use native-extensions && [[ ${EPYTHON} != pypy3 ]]; then
-		local DISTUTILS_USE_PEP517=standalone
-		cd ../psycopg_c || die
-		distutils-r1_python_compile
-	fi
-	cd .. || die
-}
-
-src_test() {
-	rm -r psycopg{,_c} || die
-
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" test || die
-
-	local -x PSYCOPG_TEST_DSN="host=${T} dbname=test"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# tests for the psycopg_pool package
-		tests/pool
-		# some broken mypy magic
-		tests/test_module.py::test_version
-		tests/test_module.py::test_version_c
-		tests/test_typing.py
-		tests/crdb/test_typing.py
-		# TODO, relying on undefined ordering in Python?
-		tests/test_dns_srv.py::test_srv
-	)
-
-	local impls=( python )
-	if use native-extensions && [[ ${EPYTHON} != pypy3 ]]; then
-		impls+=( c )
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PSYCOPG_IMPL
-	for PSYCOPG_IMPL in "${impls[@]}"; do
-		einfo "Testing with ${PSYCOPG_IMPL} implementation ..."
-		# leak and timing tests are fragile whereas slow tests are slow
-		epytest -p anyio -k "not leak" \
-			-m "not timing and not slow and not flakey"
-	done
-}
diff --git a/dev-python/psycopg/psycopg-3.2.1.ebuild b/dev-python/psycopg/psycopg-3.2.1.ebuild
deleted file mode 100644
index 218eb8d867f2..000000000000
--- a/dev-python/psycopg/psycopg-3.2.1.ebuild
+++ /dev/null
@@ -1,119 +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 flag-o-matic
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="
-	https://www.psycopg.org/psycopg3/
-	https://github.com/psycopg/psycopg/
-	https://pypi.org/project/psycopg/
-"
-SRC_URI="
-	https://github.com/psycopg/psycopg/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="+native-extensions"
-
-DEPEND="
-	native-extensions? (
-		>=dev-db/postgresql-8.1:=
-	)
-	!native-extensions? (
-		>=dev-db/postgresql-8.1:*
-	)
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/tomli[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-	test? (
-		>=dev-db/postgresql-8.1[server]
-		>=dev-python/anyio-4.0[${PYTHON_USEDEP}]
-		>=dev-python/dnspython-2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/935401
-	# https://github.com/psycopg/psycopg/issues/867
-	#
-	# Do not trust with LTO either.
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	# Python code + ctypes backend
-	cd psycopg || die
-	distutils-r1_python_compile
-
-	# optional C backend
-	if use native-extensions && [[ ${EPYTHON} != pypy3 ]]; then
-		local DISTUTILS_USE_PEP517=standalone
-		cd ../psycopg_c || die
-		distutils-r1_python_compile
-	fi
-	cd .. || die
-}
-
-src_test() {
-	rm -r psycopg{,_c} || die
-
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" test || die
-
-	local -x PSYCOPG_TEST_DSN="host=${T} dbname=test"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# tests for the psycopg_pool package
-		tests/pool
-		# some broken mypy magic
-		tests/test_module.py::test_version
-		tests/test_module.py::test_version_c
-		tests/test_typing.py
-		tests/crdb/test_typing.py
-		# TODO, relying on undefined ordering in Python?
-		tests/test_dns_srv.py::test_srv
-	)
-
-	local impls=( python )
-	if use native-extensions && [[ ${EPYTHON} != pypy3 ]]; then
-		impls+=( c )
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PSYCOPG_IMPL
-	for PSYCOPG_IMPL in "${impls[@]}"; do
-		einfo "Testing with ${PSYCOPG_IMPL} implementation ..."
-		# leak and timing tests are fragile whereas slow tests are slow
-		epytest -p anyio -k "not leak" \
-			-m "not timing and not slow and not flakey"
-	done
-}
diff --git a/dev-python/psycopg/psycopg-3.2.4.ebuild b/dev-python/psycopg/psycopg-3.2.4.ebuild
new file mode 100644
index 000000000000..d5a124be5907
--- /dev/null
+++ b/dev-python/psycopg/psycopg-3.2.4.ebuild
@@ -0,0 +1,119 @@
+# 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=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="
+	https://www.psycopg.org/psycopg3/
+	https://github.com/psycopg/psycopg/
+	https://pypi.org/project/psycopg/
+"
+SRC_URI="
+	https://github.com/psycopg/psycopg/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="+native-extensions"
+
+DEPEND="
+	native-extensions? (
+		>=dev-db/postgresql-8.1:=
+	)
+	!native-extensions? (
+		>=dev-db/postgresql-8.1:*
+	)
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	native-extensions? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/tomli[${PYTHON_USEDEP}]
+		' 3.10)
+	)
+	test? (
+		>=dev-db/postgresql-8.1[server]
+		>=dev-python/anyio-4.0[${PYTHON_USEDEP}]
+		>=dev-python/dnspython-2.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/935401
+	# https://github.com/psycopg/psycopg/issues/867
+	#
+	# Do not trust with LTO either.
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	# Python code + ctypes backend
+	cd psycopg || die
+	distutils-r1_python_compile
+
+	# optional C backend
+	if use native-extensions && [[ ${EPYTHON} != pypy3 ]]; then
+		local DISTUTILS_USE_PEP517=standalone
+		cd ../psycopg_c || die
+		distutils-r1_python_compile
+	fi
+	cd .. || die
+}
+
+src_test() {
+	rm -r psycopg{,_c} || die
+
+	initdb -D "${T}"/pgsql || die
+	# TODO: random port
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createdb -h "${T}" test || die
+
+	local -x PSYCOPG_TEST_DSN="host=${T} dbname=test"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# tests for the psycopg_pool package
+		tests/pool
+		# some broken mypy magic
+		tests/test_module.py::test_version
+		tests/test_module.py::test_version_c
+		tests/test_typing.py
+		tests/crdb/test_typing.py
+		# TODO, relying on undefined ordering in Python?
+		tests/test_dns_srv.py::test_srv
+	)
+
+	local impls=( python )
+	if use native-extensions && [[ ${EPYTHON} != pypy3 ]]; then
+		impls+=( c )
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PSYCOPG_IMPL
+	for PSYCOPG_IMPL in "${impls[@]}"; do
+		einfo "Testing with ${PSYCOPG_IMPL} implementation ..."
+		# leak and timing tests are fragile whereas slow tests are slow
+		epytest -p anyio -k "not leak" \
+			-m "not timing and not slow and not flakey"
+	done
+}
diff --git a/dev-python/pulsectl/Manifest b/dev-python/pulsectl/Manifest
index 53ed570708a1..c98e737a7837 100644
--- a/dev-python/pulsectl/Manifest
+++ b/dev-python/pulsectl/Manifest
@@ -1,2 +1 @@
-DIST pulsectl-24.11.0.tar.gz 41166 BLAKE2B 1dc94c8191d7c47e8185c2a31de380a4b3d0b945201e9643e225eb383c1ed101d6119571b5bfba118b28f9215ff0b2a446156af1fc86226280dbb3cb951bbc96 SHA512 3fa4f913a0cf5dca4e5d24019cd69f3045c3116693ad503f7de04e013be5141a3bcaeda72b73258372d56fb2f35bf321e09ca4c1ed1f6d8880124b744195a124
 DIST pulsectl-24.12.0.tar.gz 41200 BLAKE2B eb5a8eb55c0e3a3c8119e3962fe5ab1f6a53abb9a75d39477c22aa11867d895ab77f876afe4d7f1b066cbd59c65e11db76c9ed0c958c1c9d0d03c3132301397a SHA512 c0e0d71b9f396cbbe29f96d1a8c5e72fbdbdc7e8c06fccfc261b93691c2000fde7761faa8dad34bd04a04cdc9dc75fe509d3f864056fff92329ca7c4c1435f6e
diff --git a/dev-python/pulsectl/pulsectl-24.11.0.ebuild b/dev-python/pulsectl/pulsectl-24.11.0.ebuild
deleted file mode 100644
index a26679e2fc15..000000000000
--- a/dev-python/pulsectl/pulsectl-24.11.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)"
-HOMEPAGE="
-	https://github.com/mk-fg/python-pulse-control/
-	https://pypi.org/project/pulsectl/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-
-RDEPEND="
-	media-libs/libpulse
-"
-BDEPEND="
-	test? (
-		media-sound/pulseaudio-daemon
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pulsectl/pulsectl-24.12.0.ebuild b/dev-python/pulsectl/pulsectl-24.12.0.ebuild
index 693b086854aa..d642ccde0a76 100644
--- a/dev-python/pulsectl/pulsectl-24.12.0.ebuild
+++ b/dev-python/pulsectl/pulsectl-24.12.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 RDEPEND="
 	media-libs/libpulse
diff --git a/dev-python/pyaml/Manifest b/dev-python/pyaml/Manifest
index cc90044a0606..683b589f9abf 100644
--- a/dev-python/pyaml/Manifest
+++ b/dev-python/pyaml/Manifest
@@ -1,2 +1 @@
-DIST pyaml-24.12.1.tar.gz 29288 BLAKE2B 392579d0afbf1b71e0cc38d875c0f8492e9f33b33bdd619f1a9b3d9f042d1cc62ba19a495bab14331c53e745691e802a80b772ff0293dabb8da00da75a3a53ce SHA512 46125a594609cbcfc91f5005d5f551ab8b20ff4615bf8df586f68b1afcda090c1649d973f8e281c1aacd139c27359d44625b8e5aa2f9792a49bde9b2942993b5
 DIST pyaml-25.1.0.tar.gz 29469 BLAKE2B f73ba6bfdcbd5437ec9540845316940d60194b04f039b91180829207b680d1524c7811f424d3a055df87ddc179394e53020083c3fde0e1f10cfde5d495716c71 SHA512 ab006e2ee2c4592ac2e1f8aa2afa3443e206d8147739fc561f994273a41473dfb6faf6324c2c6e9fdc46a9829424f9416b85e8a85a06495430183deca47f16ec
diff --git a/dev-python/pyaml/pyaml-24.12.1.ebuild b/dev-python/pyaml/pyaml-24.12.1.ebuild
deleted file mode 100644
index 20bb9714982f..000000000000
--- a/dev-python/pyaml/pyaml-24.12.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="PyYAML-based module to produce pretty and readable YAML-serialized data"
-HOMEPAGE="
-	https://github.com/mk-fg/pretty-yaml/
-	https://pypi.org/project/pyaml/
-"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/unidecode[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyaml/pyaml-25.1.0.ebuild b/dev-python/pyaml/pyaml-25.1.0.ebuild
index 6bd7aeee95ee..92a4a90224ab 100644
--- a/dev-python/pyaml/pyaml-25.1.0.ebuild
+++ b/dev-python/pyaml/pyaml-25.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/pyarrow/Manifest b/dev-python/pyarrow/Manifest
index 1df70652cc04..01b8a0bee628 100644
--- a/dev-python/pyarrow/Manifest
+++ b/dev-python/pyarrow/Manifest
@@ -1,4 +1,5 @@
 DIST apache-arrow-18.0.0.tar.gz 19113236 BLAKE2B c358f8e61155432540a4002c6dfba7a3763d934a43eddae0a9a6f98bb26879df51e3cdcc64db6dd684ffde2ef8ef6dcff8906355b5769f71afae907aa1e920c5 SHA512 4df30ab5561da695eaa864422626b9898555d86ca56835c3b8a8ca93a1dbaf081582bb36e2440d1daf7e1dd48c76941f1152a4f25ce0dbcc1c2abe244a00c05e
 DIST apache-arrow-18.1.0.tar.gz 19132388 BLAKE2B 4a8c60d8a5dcf2b8ac4e2ae3a7f555dd0604d5ccc4b72ba317f18e16e75725b24553050fe88a02f382b0581310f20d0b795133b243f2851fa0e8d3801a839358 SHA512 7249c03a6097bc64fb0092143e4d4aaef3227565147e6254f026ddd504177c8dd565a184a0df39743dc989070dc3785e5b66f738c8e310ed9c982b61c2ec4914
+DIST apache-arrow-19.0.0.tar.gz 17830405 BLAKE2B cf611106b0ee5f92a4cbf341e9f5b6771f377710bb11c6eab555706a52b5c72fcf4590ba55c36100a97c6219ec421813f51ef6337530d84eb8394735ef2787b5 SHA512 6820de33a5d5b0922ea64dd8ff55d186ef02596ad0415578067aaf3e5cf7d3eead473bc3a5f92d6d3f19b97d153fe1c901359008d922d1ffb0fc2a65dc860c79
 DIST arrow-testing-4d209492d514c2d3cb2d392681b9aa00e6d8da1c.tar.gz 3572558 BLAKE2B fe5b6a46babbde8e2becefea09fecf090201a49faa7d4ee2f44b0bb4da42c344b37564999d32fdbd54a81a56c33fbde9b2d9d2fa664bf127cb5661e845fb6229 SHA512 6758ad936e1eeb2c5dd2b4b40fe90822a48a4ce67ee4d36657c168e1db5d9a17c092f4cf571b13d56b568a773515385441874d1ea36a1f6e5b15a99f67176fa3
 DIST parquet-testing-cb7a9674142c137367bf75a01b79c6e214a73199.tar.gz 1068025 BLAKE2B 0fdd12d04108b27b17564c60ca36e751453f5d74cfbbe3a076e8befa1696aa0f093e2d1a5eacb99e69a98deda502930ba79b8329403af1e8b9d696e6617c6075 SHA512 dd221d9d59442cebb7158d7cf769d6e5323416bfcde2852eee37a26ff089bc04ea10b9ae7158a37d8694c10469d77c7d251d0dd2549596a7b3899d9c39b45997
diff --git a/dev-python/pyarrow/pyarrow-18.0.0.ebuild b/dev-python/pyarrow/pyarrow-18.0.0.ebuild
index 13285a244c05..c3a6c3921c11 100644
--- a/dev-python/pyarrow/pyarrow-18.0.0.ebuild
+++ b/dev-python/pyarrow/pyarrow-18.0.0.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
@@ -33,7 +33,7 @@ S="${WORKDIR}/apache-arrow-${PV}/python"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~riscv x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="+parquet +snappy ssl"
 
 RDEPEND="
diff --git a/dev-python/pyarrow/pyarrow-18.1.0.ebuild b/dev-python/pyarrow/pyarrow-18.1.0.ebuild
index 3c9fc1847c49..55b9c333c4c9 100644
--- a/dev-python/pyarrow/pyarrow-18.1.0.ebuild
+++ b/dev-python/pyarrow/pyarrow-18.1.0.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
@@ -33,7 +33,7 @@ S="${WORKDIR}/apache-arrow-${PV}/python"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~loong ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~riscv ~x86"
 IUSE="+parquet +snappy ssl"
 
 RDEPEND="
diff --git a/dev-python/pyarrow/pyarrow-19.0.0.ebuild b/dev-python/pyarrow/pyarrow-19.0.0.ebuild
new file mode 100644
index 000000000000..3d92143f67e9
--- /dev/null
+++ b/dev-python/pyarrow/pyarrow-19.0.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 2023-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 multiprocessing
+
+# arrow.git: testing
+ARROW_DATA_GIT_HASH=4d209492d514c2d3cb2d392681b9aa00e6d8da1c
+# arrow.git: cpp/submodules/parquet-testing
+PARQUET_DATA_GIT_HASH=cb7a9674142c137367bf75a01b79c6e214a73199
+
+DESCRIPTION="Python library for Apache Arrow"
+HOMEPAGE="
+	https://arrow.apache.org/
+	https://github.com/apache/arrow/
+	https://pypi.org/project/pyarrow/
+"
+SRC_URI="
+	mirror://apache/arrow/arrow-${PV}/apache-arrow-${PV}.tar.gz
+	test? (
+		https://github.com/apache/parquet-testing/archive/${PARQUET_DATA_GIT_HASH}.tar.gz
+			-> parquet-testing-${PARQUET_DATA_GIT_HASH}.tar.gz
+		https://github.com/apache/arrow-testing/archive/${ARROW_DATA_GIT_HASH}.tar.gz
+			-> arrow-testing-${ARROW_DATA_GIT_HASH}.tar.gz
+	)
+"
+S="${WORKDIR}/apache-arrow-${PV}/python"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+parquet +snappy ssl"
+
+RDEPEND="
+	~dev-libs/apache-arrow-${PV}[compute,dataset,json,parquet?,re2,snappy?,ssl?]
+	>=dev-python/numpy-1.16.6:=[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/cffi[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-libs/apache-arrow[lz4,zlib]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# cython's -Werror
+	sed -i -e '/--warning-errors/d' CMakeLists.txt || die
+}
+
+src_compile() {
+	export PYARROW_PARALLEL="$(makeopts_jobs)"
+	export PYARROW_BUILD_VERBOSE=1
+	export PYARROW_CXXFLAGS="${CXXFLAGS}"
+	export PYARROW_BUNDLE_ARROW_CPP_HEADERS=0
+	export PYARROW_CMAKE_GENERATOR=Ninja
+	export PYARROW_WITH_HDFS=1
+	if use parquet; then
+		export PYARROW_WITH_DATASET=1
+		export PYARROW_WITH_PARQUET=1
+		use ssl && export PYARROW_WITH_PARQUET_ENCRYPTION=1
+	fi
+	if use snappy; then
+		export PYARROW_WITH_SNAPPY=1
+	fi
+
+	distutils-r1_src_compile
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# wtf?
+		tests/test_fs.py::test_localfs_errors
+		# these require apache-arrow with jemalloc that doesn't seem
+		# to be supported by the Gentoo package
+		tests/test_memory.py::test_env_var
+		tests/test_memory.py::test_specific_memory_pools
+		tests/test_memory.py::test_supported_memory_backends
+		# require mimalloc
+		tests/test_memory.py::test_memory_pool_factories
+		# hypothesis health check failures
+		# https://github.com/apache/arrow/issues/41318
+		tests/interchange/test_interchange_spec.py::test_dtypes
+		tests/test_convert_builtin.py::test_array_to_pylist_roundtrip
+		tests/test_feather.py::test_roundtrip
+		tests/test_pandas.py::test_array_to_pandas_roundtrip
+		tests/test_strategies.py::test_types
+		tests/test_types.py::test_hashing
+		# fragile memory tests
+		tests/test_csv.py::TestSerialStreamingCSVRead::test_batch_lifetime
+		tests/test_csv.py::TestThreadedStreamingCSVRead::test_batch_lifetime
+		# takes forever, and manages to generate timedeltas over 64 bits
+		tests/test_strategies.py
+		"tests/test_array.py::test_pickling[builtin_pickle]"
+		# scipy.sparse does not support dtype float16
+		"tests/test_sparse_tensor.py::test_sparse_coo_tensor_scipy_roundtrip[f2-arrow_type8]"
+	)
+
+	cd "${T}" || die
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PARQUET_TEST_DATA="${WORKDIR}/parquet-testing-${PARQUET_DATA_GIT_HASH}/data"
+	local -x ARROW_TEST_DATA="${WORKDIR}/arrow-testing-${ARROW_DATA_GIT_HASH}/data"
+	epytest --pyargs pyarrow
+}
diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
index 154af9781796..5a31d6b3607c 100644
--- a/dev-python/pycares/Manifest
+++ b/dev-python/pycares/Manifest
@@ -1,2 +1 @@
-DIST pycares-4.4.0.tar.gz 821630 BLAKE2B c2bddc54db9cd6ba92d7c4fb3809609a8a3526bab68e4cf48f0fee2e7473828f70ca696be11b904e9c3f9241de8b13568cd0317c8cb305a4aca7356f1b74cfb5 SHA512 db387f21975d015e0fcb01972ffb018476d51331a7a49bb4c0bf23ccfa13dff3f8b9c21d5f11da8ece3018debf36b1cddea032ef860353203cf38ab2b3d01e8a
 DIST pycares-4.5.0.tar.gz 821554 BLAKE2B 75e178d288779876becae08af08218364f13fd6b2e03c4dc6a67e5e330e26ef17fee831d0a9329a66cc9358fcc167808379b6881a0f8e18bd76a8e6ed2587c60 SHA512 224c8807396590e07fbe10c3f26eae1a457bf4969788b432b4367898382a5c68f2d7ef33f62e31dea772491319287ff1685f3cb0eb78f9c07cec80d50864e617
diff --git a/dev-python/pycares/pycares-4.4.0.ebuild b/dev-python/pycares/pycares-4.4.0.ebuild
deleted file mode 100644
index 3c65a4ebbb90..000000000000
--- a/dev-python/pycares/pycares-4.4.0.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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python interface for c-ares"
-HOMEPAGE="
-	https://github.com/saghul/pycares/
-	https://pypi.org/project/pycares/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-# Tests fail with network-sandbox, since they try to resolve google.com
-PROPERTIES="test_network"
-RESTRICT="test"
-
-DEPEND="
-	net-dns/c-ares:=
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cffi[${PYTHON_USEDEP}]
-	' 'python*')
-"
-RDEPEND="
-	dev-python/idna[${PYTHON_USEDEP}]
-	${DEPEND}
-	${BDEPEND}
-"
-BDEPEND+="
-	test? (
-		dev-python/idna[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# regression due to Internet changing (probably)
-	# https://github.com/saghul/pycares/issues/187
-	tests/test_all.py::DNSTest::test_query_class_chaos
-	tests/test_all.py::DNSTest::test_idna_encoding_query_a
-	tests/test_all.py::DNSTest::test_query_txt_chunked
-	# TODO
-	tests/test_all.py::DNSTest::test_custom_resolvconf
-)
-
-export PYCARES_USE_SYSTEM_LIB=1
diff --git a/dev-python/pycares/pycares-4.5.0.ebuild b/dev-python/pycares/pycares-4.5.0.ebuild
index 718bdd9bb397..d67ce305747d 100644
--- a/dev-python/pycares/pycares-4.5.0.ebuild
+++ b/dev-python/pycares/pycares-4.5.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 # Tests fail with network-sandbox, since they try to resolve google.com
 PROPERTIES="test_network"
diff --git a/dev-python/pychromecast/Manifest b/dev-python/pychromecast/Manifest
index b9b67db2e5e1..b11613c8db5b 100644
--- a/dev-python/pychromecast/Manifest
+++ b/dev-python/pychromecast/Manifest
@@ -1,3 +1,4 @@
 DIST PyChromecast-13.0.7.tar.gz 52074 BLAKE2B 4e67ce21bf91c52cd83b8a17d86cd321d937c1f55b567d4df7a5548ad02aacb4c269b9d29030a7e41f9f310d53313b6b287032c1d5f1448b415c3896b168b783 SHA512 dc63c901287ae31ce278c9978701ad335715f1daaab1b2683aa7b02ddb38e3e207f2527ae144f6836b65c4ddb4b1fdd62c40005bf776e0655e647ab40634857e
 DIST PyChromecast-13.1.0.tar.gz 53436 BLAKE2B f8d92f0db9da2898e87340de47bf85cfd71ba4a18ca30af95c261e42c0aff95fcf633637b489a15073c5ed946c4f61370473f07ac83bf37078f37bb90377702a SHA512 a4823b79bf9c54d4734e23cd0c064f9ab51be715297fe02632627812778b2d36600382e18f11e6f368046fb70dc6176a9293888bcbc233cd773443edf4c303c4
 DIST PyChromecast-14.0.1.tar.gz 60482 BLAKE2B a34dcba0b975bc8b3c0fb08f5a29a80c2324de3acbcc75dea74cecd5aa9be2fb17fb70f3c2f0131d355edfba5fd0f1d6bdf3d42eb8f368d0b2d3a9f2776f5698 SHA512 72119e27be49128d57a9354aaebd2a5711f3da0ad2e7ca07863107382061d9398c95c901ac33ea2a1c45687b2cbef32dfdba228be99e1acdef79ce133510fb4e
+DIST PyChromecast-14.0.5.tar.gz 60934 BLAKE2B b42e5242d67a0f964e47b381a57c6ddb4714ee2714b92aeea763faf35bd919290beb84f198fbe3437396ec61458c657c9b1eaa3c644ae5eb4436f62ee49f439b SHA512 9627ad6f67b4625e44b56f72e05e0a673396b8c89a542de896beb14f186c86974397878eab8ff42652b987a0524541575797ebea18098a8cdaadf78f9bdfa6d7
diff --git a/dev-python/pychromecast/pychromecast-14.0.5.ebuild b/dev-python/pychromecast/pychromecast-14.0.5.ebuild
new file mode 100644
index 000000000000..ac774c8e101e
--- /dev/null
+++ b/dev-python/pychromecast/pychromecast-14.0.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=PyChromecast
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python module to talk to Google Chromecast"
+HOMEPAGE="
+	https://github.com/home-assistant-libs/pychromecast/
+	https://pypi.org/project/PyChromecast/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/casttube-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-4.25.1[${PYTHON_USEDEP}]
+	>=dev-python/zeroconf-0.25.1[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pyclamd/pyclamd-0.4.0-r6.ebuild b/dev-python/pyclamd/pyclamd-0.4.0-r6.ebuild
new file mode 100644
index 000000000000..8a43f0173ab0
--- /dev/null
+++ b/dev-python/pyclamd/pyclamd-0.4.0-r6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=pyClamd
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python interface to Clamd (ClamAV daemon)"
+HOMEPAGE="https://xael.org/pages/pyclamd-en.html"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# Tests need clamd running and we cannot rely on that being
+# true during build
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-remove-obsolete-bugtrack_url.diff" )
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 842ad2a87c80..63a8717be459 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,2 +1 @@
-DIST pycryptodome-3.20.0.gh.tar.gz 17173888 BLAKE2B 7706a7f512579b4edf080b5074a9f226b2f0ef18a8f1faf74e890cfccff85d0599b4883cd5011a5cc0296b5a10cccce94cb2b948de29d785f6add04e54215a5a SHA512 0d65ccd93f9f78548c04aa3af01cb65b6a39e81bb3dfa4bb08acc5a5a731b17f9c5b07a1d1780739b3f358402a3596b04e446fc7b39345a4c6f03fd5a2de7ff9
 DIST pycryptodome-3.21.0.gh.tar.gz 17464067 BLAKE2B 5fcf62317053ae3d1dddd90bb223e9866944b4c4325ae146c17c48d2345c06c3fc9951dc72c135ec5a61043b7eced92b69c9bc5f43d47e1f512b9c9ce94fa310 SHA512 cfb66b1e53547992b9405bc6a2d90ed3bc3d1857a01ef619069b9d1aa24d809a9d46d8b0d824999588dd6c0de9a5e39db70b572a9954f0ead0dd39f9b7cedbcc
diff --git a/dev-python/pycryptodome/pycryptodome-3.20.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.20.0.ebuild
deleted file mode 100644
index 82dab105e826..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.20.0.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=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="
-	https://www.pycryptodome.org/
-	https://github.com/Legrandin/pycryptodome/
-	https://pypi.org/project/pycryptodome/
-"
-SRC_URI="
-	https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-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"
-
-DEPEND="
-	dev-libs/gmp:=
-	>=dev-libs/libtomcrypt-1.18.2-r1:=
-"
-BDEPEND="
-	$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
-"
-RDEPEND="
-	${DEPEND}
-	${BDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
-)
-
-python_prepare_all() {
-	# make sure we're unbundling it correctly
-	rm -r src/libtom || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTHONPATH=${S}/test_vectors:${PYTHONPATH}
-	"${EPYTHON}" - <<-EOF || die
-		import sys
-		from Crypto import SelfTest
-		SelfTest.run(verbosity=2, stream=sys.stdout)
-	EOF
-
-	# TODO: run cmake tests from src/test?
-}
diff --git a/dev-python/pydantic-core/Manifest b/dev-python/pydantic-core/Manifest
index 6cb9f898d39b..5e3bc34be0c3 100644
--- a/dev-python/pydantic-core/Manifest
+++ b/dev-python/pydantic-core/Manifest
@@ -46,7 +46,6 @@ DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7
 DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST pydantic_core-2.23.4.tar.gz 402156 BLAKE2B af899e149693907542296b5b4fa5f982d2dca5c090331703212aabbbce0a8e0badca3947affa9e42998949ebd18b1ffc2ad9904b47e130bbe7e90150c32bc527 SHA512 c7c9a303ff3c751108622f804f812f3793ad93a95e560b0d6b0a866c3bd41ed7bfdbcd87483f37ad3849969c72adde24083d1a9015ebd610847a7fa6d4068e24
-DIST pydantic_core-2.27.1.tar.gz 412785 BLAKE2B cdea663778301ed02649f4a06afc66f6d46e824ffc36c0f536cf48c291cb41da3498c55d79e0e52ad18e773baeb887493a048e3c8ef91a4a368528be6fb76494 SHA512 d3795398116bf971ddd389532e02494b08d40373a51013cfdd17608d05528cd65759b5e51d8e557b737e1a2d8491f9657a37e9c45696c2f08ac23139c81e0dc0
 DIST pydantic_core-2.27.2.tar.gz 413443 BLAKE2B 2755ba694b17894ff89704203c275315dc6a600e5e89965f24800ff032802168a9fa5bbb26e9714dae42f645e34e0ac32191415fae04bd53a8d04c41f1d3e2c4 SHA512 4e0bc0137463d3a76bb584da76751916ddaa18383efbe15a303880649df67de22c67a8a6e5f889c76292c4557914811d942fd3373dad65b63d9fb1f84f34ce3e
 DIST pyo3-0.22.2.crate 538342 BLAKE2B faf347695117f9fe0ebe5cd7f6aa1b0dcfe718343875d6c06438046deccc1075f104d2a2413dcda41ae9827bc363aa147057b45968f6634f577a6a4510a4bb8e SHA512 e8bae09059f50ffe477dad44499cedeaf3a734665f0fd8e8bd4b44f48578d21e4bdb8d55ceea00c5a27da750761842ddf89cfcecdecb2e7a4a17ab192259be9c
 DIST pyo3-0.22.6.crate 546746 BLAKE2B 2a6f8c5ce2ee96e1812177a11c5fad7e15f3a73d9e30850edf0855b13db6cc95427e186883b4aae25a2d2466d3fe82f56180a39f3e6e0a54bb0a3ef78d495400 SHA512 d746007eae22f5b7bbf173759c61cbd2aa893898d88b8be5680a0237deec4d113246edf5f62fbbec3579ad4bd7307499b94b887ec306112ffe3df5190fe70e44
diff --git a/dev-python/pydantic-core/pydantic-core-2.27.1.ebuild b/dev-python/pydantic-core/pydantic-core-2.27.1.ebuild
deleted file mode 100644
index 4d32d1b7594c..000000000000
--- a/dev-python/pydantic-core/pydantic-core-2.27.1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-CRATES="
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	autocfg@1.3.0
-	base64@0.22.1
-	bitvec@1.0.1
-	cc@1.0.101
-	cfg-if@1.0.0
-	displaydoc@0.2.5
-	enum_dispatch@0.3.13
-	equivalent@1.0.1
-	form_urlencoded@1.2.1
-	funty@2.0.0
-	getrandom@0.2.15
-	hashbrown@0.14.5
-	heck@0.5.0
-	hex@0.4.3
-	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@0.5.0
-	idna@1.0.2
-	indexmap@2.2.6
-	indoc@2.0.5
-	itoa@1.0.11
-	jiter@0.7.1
-	lexical-parse-float@0.8.5
-	lexical-parse-integer@0.8.6
-	lexical-util@0.8.5
-	libc@0.2.155
-	litemap@0.7.3
-	memchr@2.7.4
-	memoffset@0.9.1
-	num-bigint@0.4.6
-	num-integer@0.1.46
-	num-traits@0.2.19
-	once_cell@1.19.0
-	percent-encoding@2.3.1
-	portable-atomic@1.6.0
-	proc-macro2@1.0.86
-	pyo3-build-config@0.22.6
-	pyo3-ffi@0.22.6
-	pyo3-macros-backend@0.22.6
-	pyo3-macros@0.22.6
-	pyo3@0.22.6
-	python3-dll-a@0.2.10
-	quote@1.0.36
-	radium@0.7.0
-	regex-automata@0.4.8
-	regex-syntax@0.8.5
-	regex@1.11.1
-	rustversion@1.0.17
-	ryu@1.0.18
-	serde@1.0.214
-	serde_derive@1.0.214
-	serde_json@1.0.132
-	smallvec@1.13.2
-	speedate@0.15.0
-	stable_deref_trait@1.2.0
-	static_assertions@1.1.0
-	strum@0.26.3
-	strum_macros@0.26.4
-	syn@2.0.82
-	synstructure@0.13.1
-	tap@1.0.1
-	target-lexicon@0.12.14
-	tinystr@0.7.6
-	tinyvec@1.6.1
-	tinyvec_macros@0.1.1
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	unindent@0.2.3
-	url@2.5.2
-	utf16_iter@1.0.5
-	utf8_iter@1.0.4
-	uuid@1.11.0
-	version_check@0.9.5
-	wasi@0.11.0+wasi-snapshot-preview1
-	write16@1.0.0
-	writeable@0.5.5
-	wyz@0.5.1
-	yoke-derive@0.7.4
-	yoke@0.7.4
-	zerocopy-derive@0.7.34
-	zerocopy@0.7.34
-	zerofrom-derive@0.1.4
-	zerofrom@0.1.4
-	zerovec-derive@0.10.3
-	zerovec@0.10.4
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Core validation logic for pydantic written in Rust"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic-core/
-	https://pypi.org/project/pydantic-core/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0 Unicode-DFS-2016
-	|| ( Apache-2.0 Boost-1.0 )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
-		>=dev-python/inline-snapshot-0.13.3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so"
-
-src_prepare() {
-	sed -i -e '/--benchmark/d' pyproject.toml || die
-	sed -i -e '/^strip/d' Cargo.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/benchmarks
-	)
-	local EPYTEST_DESELECT=(
-		# TODO: recursion till segfault
-		tests/serializers/test_functions.py::test_recursive_call
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	rm -rf pydantic_core || die
-	# tests link to libpython, so they fail to link on pypy3
-	[[ ${EPYTHON} != pypy3 ]] && cargo_src_test
-	epytest -p pytest_mock -p timeout -o xfail_strict=False
-}
diff --git a/dev-python/pydantic-core/pydantic-core-2.27.2.ebuild b/dev-python/pydantic-core/pydantic-core-2.27.2.ebuild
index 4d32d1b7594c..bbc38c9a2cfc 100644
--- a/dev-python/pydantic-core/pydantic-core-2.27.2.ebuild
+++ b/dev-python/pydantic-core/pydantic-core-2.27.2.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
@@ -124,7 +124,7 @@ LICENSE+="
 	|| ( Apache-2.0 Boost-1.0 )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 6b7f67ea5352..c466fd8c4e3b 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,3 +1,3 @@
-DIST pydantic-2.10.3.tar.gz 786486 BLAKE2B 74abce2fb92704ab15b4b855fb1d96256720cca086a9911a031a5ffcf3c0fc8fcc2c9975affca8796709a13b4c5173c9598ec939207aa544762767577dc7117f SHA512 d5264c29b042ce24e8c03bad7a7db1fa556fb84c90b287cb87ddc52560d60db3d363ed7f05ea1af9e1469e52150388c9b119982cea5272960c0db2b31bd57fc6
 DIST pydantic-2.10.4.tar.gz 762094 BLAKE2B 0d9f3534df4ae05b2724788944776d0ac95329cfe48d59627e71b4769c7813410d0c64f0d7ca96e28aec8e403b2507873673b87acb230bb12ad5d4f304eb76ca SHA512 1c7bfcc214195d8db0cadbdb177da3e2e3ea596d695360036b0a268410711a780f9a88df622016d9bb6d39596f20e01bebc4cf38bdbe5dc987cb80fbb14aeb56
+DIST pydantic-2.10.5.tar.gz 761287 BLAKE2B f34b8a358a5a0e3839097a47b492eff7e6cea96eb6a77e1623ad1da90b4d13118f4b2c68b076ead91df450d85dfbcab1daebe77c6bdfa1ff9e4a49febf0dc0d1 SHA512 0e8ab6786c94b13fe155501cc1cba357bcf69b40413383415fd7e0b6fcaf5a818aa1efcc67a837c1c3c2315eb8b7b26c3af4b03c3f8a57ff3694955f792d2964
 DIST pydantic-2.9.2.tar.gz 769917 BLAKE2B 4e34fda6a9e8e8331278d0b7d0c2dfd61bde637c126fa6dabf78a09c6ef993f84dc8df6af421c8fb6d69c8e1c387a40e4bcd38cbe02f5ac521c6c70821735763 SHA512 2aace9e79a98bd94e5dc626736a245051912a11fdce36013d2ad2f96b266052386a3e12b259dca30ddc38b63c6b00b5bcc9cd5e80f7805de4d8701064f0982aa
diff --git a/dev-python/pydantic/pydantic-2.10.3.ebuild b/dev-python/pydantic/pydantic-2.10.3.ebuild
deleted file mode 100644
index fd3e9408f99c..000000000000
--- a/dev-python/pydantic/pydantic-2.10.3.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
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic/
-	https://pypi.org/project/pydantic/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/annotated-types-0.6.0[${PYTHON_USEDEP}]
-	~dev-python/pydantic-core-2.27.1[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.12.2[${PYTHON_USEDEP}]
-	dev-python/tzdata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cloudpickle[${PYTHON_USEDEP}]
-		dev-python/dirty-equals[${PYTHON_USEDEP}]
-		>=dev-python/email-validator-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/faker-18.13.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-4.23.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/rich[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/benchmark/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	local EPYTEST_IGNORE=(
-		# require pytest-examples
-		tests/test_docs.py
-		# benchmarks
-		tests/benchmarks
-	)
-
-	if ! has_version "dev-python/cloudpickle[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/test_pickle.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock
-}
diff --git a/dev-python/pydantic/pydantic-2.10.4.ebuild b/dev-python/pydantic/pydantic-2.10.4.ebuild
index 646dfd3a5133..8932669038dc 100644
--- a/dev-python/pydantic/pydantic-2.10.4.ebuild
+++ b/dev-python/pydantic/pydantic-2.10.4.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/annotated-types-0.6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pydantic/pydantic-2.10.5.ebuild b/dev-python/pydantic/pydantic-2.10.5.ebuild
new file mode 100644
index 000000000000..f85903a2c4d8
--- /dev/null
+++ b/dev-python/pydantic/pydantic-2.10.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Data parsing and validation using Python type hints"
+HOMEPAGE="
+	https://github.com/pydantic/pydantic/
+	https://pypi.org/project/pydantic/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/annotated-types-0.6.0[${PYTHON_USEDEP}]
+	~dev-python/pydantic-core-2.27.2[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.12.2[${PYTHON_USEDEP}]
+	dev-python/tzdata[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/cloudpickle[${PYTHON_USEDEP}]
+		dev-python/dirty-equals[${PYTHON_USEDEP}]
+		>=dev-python/email-validator-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/faker-18.13.0[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-4.23.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rich[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/benchmark/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	local EPYTEST_IGNORE=(
+		# require pytest-examples
+		tests/test_docs.py
+		# benchmarks
+		tests/benchmarks
+	)
+
+	if ! has_version "dev-python/cloudpickle[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/test_pickle.py
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock
+}
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index 42fcb1daa5ac..a0eaff40aaee 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -1 +1,2 @@
 DIST pydot-3.0.3.tar.gz 168086 BLAKE2B 10bf54d3c6128890aa67641352bd26bc5f0c7c98bc1a5162d6f1dad5de8cd60caa282b449dea88b67ce757341818f18e2ca682c3866224bec2778b9f74997a63 SHA512 36e1f61b1a5092456d19e27ec71d889699681cc4051f6839f1a5f151eafdac2b3e35180f78c7b127f1e9a85c264eb782ae746f1346b1a0fcc4a1141a09613b5c
+DIST pydot-3.0.4.tar.gz 168167 BLAKE2B 9eb23d0ee2b9a0e1ff1b9677c27f190a77fd7e8d5ae04227a38a8c8eb768565b68901fd1226fcc2cafa3707b9444d8b8a13b317eb5b0166b6ba7285e745f8437 SHA512 b2f60930fba79aa1af06bba05bb570bb597a0547685d7aa8cf7ecef8af00ccf856a0749042791b22775f1a5ae56eb5022f6f7567b988f8dacf09a5337a090602
diff --git a/dev-python/pydot/pydot-3.0.4.ebuild b/dev-python/pydot/pydot-3.0.4.ebuild
new file mode 100644
index 000000000000..6ba86a54e5bf
--- /dev/null
+++ b/dev-python/pydot/pydot-3.0.4.ebuild
@@ -0,0 +1,34 @@
+# 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="Python interface to Graphviz's Dot language"
+HOMEPAGE="
+	https://github.com/pydot/pydot/
+	https://pypi.org/project/pydot/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pyparsing-3.0.9[${PYTHON_USEDEP}]
+	media-gfx/graphviz
+"
+BDEPEND="
+	test? (
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 75d34de8bd23..e2f88e83b514 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,2 +1,2 @@
-DIST pyfakefs-5.7.2.gh.tar.gz 247345 BLAKE2B 8d7a85b74daf4aeef9628b00916f242b257a8fc9b799ae4a29fc8b56f70320815725490efdda6310350fb3666d67209ca8413e25e1da32c73aa53acf3f2607d2 SHA512 51f4dc345b2222756f40f58caa73e34cfc0fd5dbacd61fb9bfead8f3b1f1bb8afa7178bea4f65f191d0324f5ae507a17dc97c918f80fd39b61678e180af4a22b
 DIST pyfakefs-5.7.3.gh.tar.gz 247632 BLAKE2B c57b90cdb1e054125a55b32ef5bb400295cc18a23496d614ce06daf1e2d99a194fc3fb7c9853112461779b95d6dd7f4f0d92efa8b1769898cd9868cddcec57ad SHA512 a9c41fcb75314a8674b29b678c5af610b4f75a1738da205e6c48c6acaadba537fcd827097130f82262560918a43e45ff0cc86639b1b3b776a57ab3f8d758e692
+DIST pyfakefs-5.7.4.gh.tar.gz 248270 BLAKE2B 3690b07f2030dc2428936fa34264c6e43b8145f1cfddade3c95bcebb337e483e9cff3e048f0a9d2d1bd6d542d9dc99a3b489a6fedf44c4ef84f2aaeb42200864 SHA512 305e794a66f3e490a60d1e256133edeef8266739fba73b99314a8e2c71990b9a8d774c5b8575709c0cfff7180ff2c4fcf41736d4f8207998053f87ba45d908be
diff --git a/dev-python/pyfakefs/pyfakefs-5.7.2.ebuild b/dev-python/pyfakefs/pyfakefs-5.7.2.ebuild
deleted file mode 100644
index 5c8eae87c0a8..000000000000
--- a/dev-python/pyfakefs/pyfakefs-5.7.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A fake file system that mocks the Python file system modules"
-HOMEPAGE="
-	https://github.com/pytest-dev/pyfakefs/
-	https://pypi.org/project/pyfakefs/
-"
-SRC_URI="
-	https://github.com/pytest-dev/pyfakefs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	local EPYTEST_IGNORE=(
-		# test for regression with opentimelineio package
-		pyfakefs/pytest_tests/segfault_test.py
-		# test for regression with undefined package
-		pyfakefs/pytest_tests/pytest_fixture_test.py
-	)
-
-	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			pyfakefs/pytest_tests/pytest_reload_pandas_test.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pyfakefs.pytest_plugin
-}
diff --git a/dev-python/pyfakefs/pyfakefs-5.7.3.ebuild b/dev-python/pyfakefs/pyfakefs-5.7.3.ebuild
index 20bdeee372a0..30cbd1cc57ba 100644
--- a/dev-python/pyfakefs/pyfakefs-5.7.3.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-5.7.3.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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyfakefs/pyfakefs-5.7.4.ebuild b/dev-python/pyfakefs/pyfakefs-5.7.4.ebuild
new file mode 100644
index 000000000000..4dbd3a1bc4cf
--- /dev/null
+++ b/dev-python/pyfakefs/pyfakefs-5.7.4.ebuild
@@ -0,0 +1,44 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A fake file system that mocks the Python file system modules"
+HOMEPAGE="
+	https://github.com/pytest-dev/pyfakefs/
+	https://pypi.org/project/pyfakefs/
+"
+SRC_URI="
+	https://github.com/pytest-dev/pyfakefs/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	local EPYTEST_IGNORE=(
+		# test for regression with opentimelineio package
+		pyfakefs/pytest_tests/segfault_test.py
+		# test for regression with undefined package
+		pyfakefs/pytest_tests/pytest_fixture_test.py
+	)
+
+	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			pyfakefs/pytest_tests/pytest_reload_pandas_test.py
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pyfakefs.pytest_plugin
+}
diff --git a/dev-python/pyfzf/Manifest b/dev-python/pyfzf/Manifest
new file mode 100644
index 000000000000..14921394a0c2
--- /dev/null
+++ b/dev-python/pyfzf/Manifest
@@ -0,0 +1 @@
+DIST pyfzf-0.3.1.tar.gz 3652 BLAKE2B b9d9d0ca781147c70723cde40f236fb339c09d25cfd5086a212df7dffeb433bd962e34b5ee6904384d9620e08b0b75de75949ba3b779982aee8fbac4eafa876f SHA512 9c3240ea791123080291eba7ca3f4bf4978aff49fac4cdc9156c4198598a0440248cd9878c15dd939052c6a7decd0cf043f4648ec496ac1b8e3a41dffad5cd24
diff --git a/dev-python/pyfzf/metadata.xml b/dev-python/pyfzf/metadata.xml
new file mode 100644
index 000000000000..d4a51cc4621e
--- /dev/null
+++ b/dev-python/pyfzf/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>parona@protonmail.com</email>
+		<name>Alfred Wingate</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">nk412/pyfzf</remote-id>
+		<remote-id type="pypi">pyfzf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyfzf/pyfzf-0.3.1.ebuild b/dev-python/pyfzf/pyfzf-0.3.1.ebuild
new file mode 100644
index 000000000000..57424851de28
--- /dev/null
+++ b/dev-python/pyfzf/pyfzf-0.3.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A python wrapper for fzf"
+HOMEPAGE="
+	https://github.com/nk412/pyfzf/
+	https://pypi.org/project/pyfzf/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-shells/fzf"
diff --git a/dev-python/pygccxml/Manifest b/dev-python/pygccxml/Manifest
index 2e8b7633ee94..b7d38bf3437f 100644
--- a/dev-python/pygccxml/Manifest
+++ b/dev-python/pygccxml/Manifest
@@ -1 +1,2 @@
 DIST pygccxml-2.5.0.gh.tar.gz 3163862 BLAKE2B 2a61474acab7e7a21b21bc7131a9b9aae2a318d3b761c9a3865055146331891e5fb2041a9136bd8816e60a4dc76a39a22d5f5632f22336341667eee537521a42 SHA512 499be7383ac9817c5620f7f0b2e6fdb9a6f5d934cc54a2ef9864877a2a7d896997ab5bc2e8b0c3c87df1ac7e4a384d3c8cbcc87f9496125502c97766df57b003
+DIST pygccxml-2.6.1.gh.tar.gz 3154561 BLAKE2B 95fb9df63f4175eab707211cb14d178437928ddad76eeb416d8cf4a48b29c211d80ba55533deb0a12e6bad4435df9bf82a1321b37cdc8db39d217f2995d1215e SHA512 b0ccd12b50d93287189fa86be6e11f44e28869045e6d7f6f84f34220cea642fc267eee150fe544bb54839b7f467f64af4a6025c84b94df7793645f2d444ae60d
diff --git a/dev-python/pygccxml/files/pygccxml-2.6.1-xml_generator.patch b/dev-python/pygccxml/files/pygccxml-2.6.1-xml_generator.patch
new file mode 100644
index 000000000000..1daf9e7afbf1
--- /dev/null
+++ b/dev-python/pygccxml/files/pygccxml-2.6.1-xml_generator.patch
@@ -0,0 +1,9 @@
+diff --git a/tests/xml_generator.cfg b/tests/xml_generator.cfg
+new file mode 100644
+index 0000000..44aea50
+--- /dev/null
++++ b/tests/xml_generator.cfg
+@@ -0,0 +1,3 @@
++[xml_generator]
++cflags="-std=c++14"
++
diff --git a/dev-python/pygccxml/pygccxml-2.6.1.ebuild b/dev-python/pygccxml/pygccxml-2.6.1.ebuild
new file mode 100644
index 000000000000..f9872baf8620
--- /dev/null
+++ b/dev-python/pygccxml/pygccxml-2.6.1.ebuild
@@ -0,0 +1,70 @@
+# 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="A specialized XML reader to navigate C++ declarations"
+HOMEPAGE="
+	https://github.com/CastXML/pygccxml/
+	https://pypi.org/project/pygccxml/
+"
+SRC_URI="
+	https://github.com/CastXML/pygccxml/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-libs/castxml
+"
+RDEPEND="
+	${DEPEND}
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+
+EPYTEST_DESELECT=(
+	# fails with >=gcc-14
+	# with 'unable to find actual class definition 'type''
+	tests/test_cached_source_file.py
+	tests/test_core.py
+	tests/test_cpp_standards.py
+	tests/test_decl_printer.py
+	tests/test_declarations_comparison.py
+	tests/test_file_cache.py
+	tests/test_non_copyable_recursive.py
+	tests/test_null_comparison.py
+	tests/test_overrides.py
+	tests/test_pattern_parser.py::test_template_split_std_vector
+	tests/test_project_reader_correctness.py
+	tests/test_xmlfile_reader.py
+
+	tests/test_example.py
+
+	# spaces inside <  >
+	tests/test_variable_matcher.py::test_no_defaults
+	tests/test_vector_traits.py::test_element_type
+	tests/test_remove_template_defaults.py
+	tests/test_find_container_traits.py
+)
+
+python_prepare_all() {
+	local PATCHES=(
+		# force -std=c++14 as default for tests because of errors due to
+		# test files with dynamic exception specification
+		"${FILESDIR}/${PN}-2.6.1-xml_generator.patch"
+		"${FILESDIR}/${PN}-2.4.0-doc.patch"
+	)
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pygdbmi/pygdbmi-0.11.0.0.ebuild b/dev-python/pygdbmi/pygdbmi-0.11.0.0.ebuild
index 54def8ffdf76..77feef279ffc 100644
--- a/dev-python/pygdbmi/pygdbmi-0.11.0.0.ebuild
+++ b/dev-python/pygdbmi/pygdbmi-0.11.0.0.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
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-debug/gdb-9.6
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index f11a79adf00b..bfa77ee10b8d 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1 +1,2 @@
 DIST pygit2-1.16.0.tar.gz 768597 BLAKE2B 30e8df4c3f992e075117bdcda3d84e2ed0618dd8556ae8574f6238992cacff69ec3c7c22a6ab85f7857156fbb4b3e6e75bc899e71ea59efcb1f8dee61687355f SHA512 297fc46f2e48e77937718e54b3ef2bb41a252348173fc5858ab4225fc3403a4d29efd2d6377508220d8bdf901f6cd9595c31601d8c0f77e9dc9a44f159a1d278
+DIST pygit2-1.17.0.tar.gz 769002 BLAKE2B d42b2509e341dd8e58e1d8b57d8b38a8d2e35323fa6714bbce97f4d685e68932ea010d3dade00504bbf29b9fecd8ffbcc5f53111398c03a6f2992570bf170db1 SHA512 f0f70c5ca0903c0c51ee431a8c4cded44ad3c5272b81df5b7c3b61c5fd0dd5279ed64e27132c051a6a02c8087d6914d8ffb2a2d24c1d14d1e0dde1ba2a3d428b
diff --git a/dev-python/pygit2/pygit2-1.16.0.ebuild b/dev-python/pygit2/pygit2-1.16.0.ebuild
index 87c95816f425..aeb7d90c56b9 100644
--- a/dev-python/pygit2/pygit2-1.16.0.ebuild
+++ b/dev-python/pygit2/pygit2-1.16.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
+KEYWORDS="amd64 ~loong ~riscv x86"
 
 DEPEND="
 	<dev-libs/libgit2-1.9:=
diff --git a/dev-python/pygit2/pygit2-1.17.0.ebuild b/dev-python/pygit2/pygit2-1.17.0.ebuild
new file mode 100644
index 000000000000..a31d43cb304f
--- /dev/null
+++ b/dev-python/pygit2/pygit2-1.17.0.ebuild
@@ -0,0 +1,46 @@
+# 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="Python bindings for libgit2"
+HOMEPAGE="
+	https://github.com/libgit2/pygit2/
+	https://pypi.org/project/pygit2/
+"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
+
+DEPEND="
+	<dev-libs/libgit2-1.10:=
+	>=dev-libs/libgit2-1.9.0:=
+"
+BDEPEND="
+	>=dev-python/cffi-1.17.0:=[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unconditionally prevent it from using network
+	sed -i -e '/has_network/s:True:False:' test/utils.py || die
+}
+
+src_test() {
+	rm -r pygit2 || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index a2c2a887a0e1..c44471f804a3 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,3 +1,4 @@
 DIST pyglet-2.0.20.gh.tar.gz 6507362 BLAKE2B 43d1d60922f84e05da59ac970516fe33df4a7b86f8b30bb5c7433696d8b2414a2ccd7dbc1c3713f7bd92f1f5ce1c4547e28b65270132f4d7b4f8d4311f1e97ac SHA512 9a628206b758a07eb43efbc4e4d62e25e162885eb25e064a6e0dbfc045472baa57cbebc7c85a9cde0cebe1e3562304878b45f880b51e59c2b226a937da20565f
-DIST pyglet-2.1.rc2.gh.tar.gz 6535560 BLAKE2B c8a9682c914007c974ed311a644af3df4008dc22850fef7e8e6de062e29d1e0a8e813cd0e74a3a4d8e02e7b4f20bc8c79196a1acc7e7813671d471aaa137f971 SHA512 b3404eaf1e98df1d40457621187fe643cd7ce40839f412f0a8e3d997b8ef0bfc14ddd1bd2ac019835072e6236df92961bb7eb608274d07f006e925eeb2acfba6
-DIST pyglet-2.1.rc3.gh.tar.gz 6533959 BLAKE2B adba9ba8d105d832540e2296c0b5de32e8925b12c66cff2645f29a4cf89cc8d4db58ce4e7ed56b6fe1fafaeb1c229d876fceb57058b3367e382c6e751249cfcf SHA512 5a21b04a528aa7b7099af715930d6f81586690a521073716b4628904e44c6f9676cf5444954b15a49d1cea63928a99a95586fd245a95193a8d6f95ddd641e2f8
+DIST pyglet-2.0.21.gh.tar.gz 6507374 BLAKE2B a75177b5d6d18b29f48c764d68f89377f11a817bd6d7c5c13f8ea1620e1d9b911127599a9c7ff02ae8b10566724be551dc87f1b8f0105ef938afddb4be4efd5c SHA512 adbfac15fcc75d1dd768ef4af14f15fabef53a69b9f166691d387ebb1ba092170052bc99b254f3596decedcdc7e7880074665177f1821af9fca41e21502b7003
+DIST pyglet-2.1.0.gh.tar.gz 6533224 BLAKE2B fed9421ae153f2d117f7ee5b136dab747e84c859383e6e12e5cdac7d9f3fa0476e33762a4a161f46cad087a791007ceba6e80706150a98079d5f2ba96f978128 SHA512 c13ac90600711b134b4770a8cb72e639ed440db79046585139b7ada92f35432b2357204d6d7e95ee457fe921dbce2c384c80a024bb44e7eae2d3ad69543343c8
+DIST pyglet-2.1.1.gh.tar.gz 6535792 BLAKE2B 012574c472b5f7ec280bf15ad03a668733637890913f7bc555d2f2cf1a0c0232bb08b68605bb70ae13ae9738e4e0322660200bcd0b6a1248835bdea17f60218f SHA512 77dfd1b43e27c08fd9765bd266d04ff37e408868ed64cbb5e18a7906da5f101b1a9cbcf7861de89a97d1884d5d9c25478261c8e91fc7b437caadd242d3103a46
diff --git a/dev-python/pyglet/pyglet-2.0.21.ebuild b/dev-python/pyglet/pyglet-2.0.21.ebuild
new file mode 100644
index 000000000000..8026c4b61260
--- /dev/null
+++ b/dev-python/pyglet/pyglet-2.0.21.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="
+	https://pyglet.org/
+	https://github.com/pyglet/pyglet/
+	https://pypi.org/project/pyglet/
+"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? (
+		|| (
+			dev-python/pillow[${PYTHON_USEDEP}]
+			x11-libs/gtk+:2
+		)
+	)
+	sound? (
+		|| (
+			media-libs/libpulse
+			media-libs/openal
+		)
+	)
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		media-libs/fontconfig
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	local EPYTEST_DESELECT=(
+		# lacking device/server permissions
+		tests/unit/media/test_listener.py::test_openal_listener
+		tests/unit/media/test_listener.py::test_pulse_listener
+		# fragile to system load
+		tests/unit/media/test_player.py::PlayerTestCase::test_pause_resume
+		tests/unit/test_clock_freq.py::test_elapsed_time_between_tick
+	)
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest tests/unit || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyglet/pyglet-2.1.0.ebuild b/dev-python/pyglet/pyglet-2.1.0.ebuild
new file mode 100644
index 000000000000..b53946c484de
--- /dev/null
+++ b/dev-python/pyglet/pyglet-2.1.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+MY_P=${P/_/.}
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="
+	https://pyglet.org/
+	https://github.com/pyglet/pyglet/
+	https://pypi.org/project/pyglet/
+"
+SRC_URI="
+	https://github.com/pyglet/pyglet/archive/v${PV/_/.}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? (
+		|| (
+			dev-python/pillow[${PYTHON_USEDEP}]
+			x11-libs/gtk+:2
+		)
+	)
+	sound? (
+		|| (
+			media-libs/libpulse
+			media-libs/openal
+		)
+	)
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		media-libs/fontconfig
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	local EPYTEST_DESELECT=(
+		# lacking device/server permissions
+		tests/unit/media/test_listener.py::test_openal_listener
+		tests/unit/media/test_listener.py::test_pulse_listener
+		# fragile to system load
+		tests/unit/media/test_player.py::PlayerTestCase::test_pause_resume
+		tests/unit/test_clock_freq.py::test_elapsed_time_between_tick
+	)
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest tests/unit || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyglet/pyglet-2.1.1.ebuild b/dev-python/pyglet/pyglet-2.1.1.ebuild
new file mode 100644
index 000000000000..b53946c484de
--- /dev/null
+++ b/dev-python/pyglet/pyglet-2.1.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+MY_P=${P/_/.}
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="
+	https://pyglet.org/
+	https://github.com/pyglet/pyglet/
+	https://pypi.org/project/pyglet/
+"
+SRC_URI="
+	https://github.com/pyglet/pyglet/archive/v${PV/_/.}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? (
+		|| (
+			dev-python/pillow[${PYTHON_USEDEP}]
+			x11-libs/gtk+:2
+		)
+	)
+	sound? (
+		|| (
+			media-libs/libpulse
+			media-libs/openal
+		)
+	)
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		media-libs/fontconfig
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	local EPYTEST_DESELECT=(
+		# lacking device/server permissions
+		tests/unit/media/test_listener.py::test_openal_listener
+		tests/unit/media/test_listener.py::test_pulse_listener
+		# fragile to system load
+		tests/unit/media/test_player.py::PlayerTestCase::test_pause_resume
+		tests/unit/test_clock_freq.py::test_elapsed_time_between_tick
+	)
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest tests/unit || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyglet/pyglet-2.1_rc2.ebuild b/dev-python/pyglet/pyglet-2.1_rc2.ebuild
deleted file mode 100644
index 527153a64f9e..000000000000
--- a/dev-python/pyglet/pyglet-2.1_rc2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-MY_P=${P/_/.}
-DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="
-	https://pyglet.org/
-	https://github.com/pyglet/pyglet/
-	https://pypi.org/project/pyglet/
-"
-SRC_URI="
-	https://github.com/pyglet/pyglet/archive/v${PV/_/.}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	image? (
-		|| (
-			dev-python/pillow[${PYTHON_USEDEP}]
-			x11-libs/gtk+:2
-		)
-	)
-	sound? (
-		|| (
-			media-libs/libpulse
-			media-libs/openal
-		)
-	)
-"
-#	ffmpeg? ( media-libs/avbin-bin )
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		media-libs/fontconfig
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	xdg_environment_reset
-
-	local EPYTEST_DESELECT=(
-		# lacking device/server permissions
-		tests/unit/media/test_listener.py::test_openal_listener
-		tests/unit/media/test_listener.py::test_pulse_listener
-		# fragile to system load
-		tests/unit/media/test_player.py::PlayerTestCase::test_pause_resume
-		tests/unit/test_clock_freq.py::test_elapsed_time_between_tick
-	)
-
-	# Specify path to avoid running interactive tests
-	# We could add in integration tests, but they're slow
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	nonfatal epytest tests/unit || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyglet/pyglet-2.1_rc3.ebuild b/dev-python/pyglet/pyglet-2.1_rc3.ebuild
deleted file mode 100644
index 527153a64f9e..000000000000
--- a/dev-python/pyglet/pyglet-2.1_rc3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-MY_P=${P/_/.}
-DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="
-	https://pyglet.org/
-	https://github.com/pyglet/pyglet/
-	https://pypi.org/project/pyglet/
-"
-SRC_URI="
-	https://github.com/pyglet/pyglet/archive/v${PV/_/.}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	image? (
-		|| (
-			dev-python/pillow[${PYTHON_USEDEP}]
-			x11-libs/gtk+:2
-		)
-	)
-	sound? (
-		|| (
-			media-libs/libpulse
-			media-libs/openal
-		)
-	)
-"
-#	ffmpeg? ( media-libs/avbin-bin )
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		media-libs/fontconfig
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	xdg_environment_reset
-
-	local EPYTEST_DESELECT=(
-		# lacking device/server permissions
-		tests/unit/media/test_listener.py::test_openal_listener
-		tests/unit/media/test_listener.py::test_pulse_listener
-		# fragile to system load
-		tests/unit/media/test_player.py::PlayerTestCase::test_pause_resume
-		tests/unit/test_clock_freq.py::test_elapsed_time_between_tick
-	)
-
-	# Specify path to avoid running interactive tests
-	# We could add in integration tests, but they're slow
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	nonfatal epytest tests/unit || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 29dfcc2dc3c0..d452f23483b7 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1 +1,3 @@
 DIST pygments-2.18.0.tar.gz 4891905 BLAKE2B 4ff1cc75ca348eecb96ecefe549a1e1c9a9cc81e1829a2354c70ce6f6e538bddbb9b7f90e781bbdd6433cee36e4a99fef9adaef95ca275d1be57a33ed8a77351 SHA512 2f696fed7f2120f9e3bd5f3d2837a5d6b883434b8d0f68d039c2620213508638cedf1517375019809720d56fc52f07e3bddd0defc4707703ace5d707908c00fb
+DIST pygments-2.19.0.tar.gz 4967733 BLAKE2B 0240b876edc619623f9102ef5d88a1135c9229aa34ce44a7482d6004b3b2618c1d0727bd3a43c056a0b9f745aa3fac73a13eb9875a0cd1338c43482439ba0f74 SHA512 ac7b8c85b54acf65fc4de2202c25a0dfc35daf3ac8eacc9bbae5a07fa0b66bfb5fdedd952b0917773e4f4ce5359854b2e8c4ac368c2137e5b5a794b6f267ea74
+DIST pygments-2.19.1.tar.gz 4968581 BLAKE2B 24bc120c4709af2f313010ed953a446bc29ee32269d47c3325067fea60c2a945376426a7c8d37e8916cc09e0534c2b6e63f69226768d6afd6e88dac875cc4419 SHA512 f8547b1eb032fb4c0ad15f1bb61bc6d8c25b309e61850a7ebe4e879fefe1ebb0acba53192d1294e8ef243613ba546e1e7ac7474ab1b49b1a1c1551c6733d9ec7
diff --git a/dev-python/pygments/pygments-2.19.0.ebuild b/dev-python/pygments/pygments-2.19.0.ebuild
new file mode 100644
index 000000000000..32672a54af5c
--- /dev/null
+++ b/dev-python/pygments/pygments-2.19.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYPI_PN=${PN^}
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 bash-completion-r1 pypi
+
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="
+	https://pygments.org/
+	https://github.com/pygments/pygments/
+	https://pypi.org/project/Pygments/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/wcag-contrast-ratio[${PYTHON_USEDEP}]
+		virtual/ttf-fonts
+	)
+"
+
+EPYTEST_DESELECT=(
+	# fuzzing tests, very slow
+	tests/test_basic_api.py::test_random_input
+	# incompatibility with python-ctags3, apparently
+	# https://github.com/pygments/pygments/issues/2486
+	tests/test_html_formatter.py::test_ctags
+)
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pygments/pygments-2.19.1.ebuild b/dev-python/pygments/pygments-2.19.1.ebuild
new file mode 100644
index 000000000000..32672a54af5c
--- /dev/null
+++ b/dev-python/pygments/pygments-2.19.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYPI_PN=${PN^}
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 bash-completion-r1 pypi
+
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="
+	https://pygments.org/
+	https://github.com/pygments/pygments/
+	https://pypi.org/project/Pygments/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/wcag-contrast-ratio[${PYTHON_USEDEP}]
+		virtual/ttf-fonts
+	)
+"
+
+EPYTEST_DESELECT=(
+	# fuzzing tests, very slow
+	tests/test_basic_api.py::test_random_input
+	# incompatibility with python-ctags3, apparently
+	# https://github.com/pygments/pygments/issues/2486
+	tests/test_html_formatter.py::test_ctags
+)
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pygraphviz/pygraphviz-1.14.ebuild b/dev-python/pygraphviz/pygraphviz-1.14.ebuild
index e58d7fbd5c79..f2f13deaf495 100644
--- a/dev-python/pygraphviz/pygraphviz-1.14.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.14.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 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
 DEPEND="
diff --git a/dev-python/pylibmc/pylibmc-1.6.3-r1.ebuild b/dev-python/pylibmc/pylibmc-1.6.3-r1.ebuild
index 155678d2891e..dc2000dbeb5c 100644
--- a/dev-python/pylibmc/pylibmc-1.6.3-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.3-r1.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
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 x86"
 IUSE="sasl"
 
 DEPEND="
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 5d5c2b127178..5496197ad008 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,2 +1 @@
-DIST pylint-3.3.2.gh.tar.gz 1454335 BLAKE2B dba68aead7d2babe885d4a94220e61ddc6c5759bd9703d2bbeb1c7d1c68b6bebce7cbe6d7b0cc18a7c8cfe32b7e0cc6be929e021e7a9223ae31839185c07558f SHA512 48f57bc74a47c8658cad9ede6bb8540077c72fc6b3e8d9d401ddd1d43daaf547637ad253af885ac503a79aa31c30de1b4b302c4d4001a18b68e064e505975980
 DIST pylint-3.3.3.gh.tar.gz 1454469 BLAKE2B e44ee31359421c560f89eee04215c222ce6b9f1fdce97750fe118cdb011f69c2a44a0a5a870787f4cd0c647650a78bc5a01dc327d8aaa8976f89e298f26596a1 SHA512 2267e7684b464255d03366bfd7988ac74222c08903a8b93bd5bc64181b12d1386c56ebb6dd79eb5b3f6c1a71bbc60282bf388fafc37a3e2c271286bc07ff2ac7
diff --git a/dev-python/pylint/pylint-3.3.2.ebuild b/dev-python/pylint/pylint-3.3.2.ebuild
deleted file mode 100644
index a29067b0bba9..000000000000
--- a/dev-python/pylint/pylint-3.3.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/pylint-dev/pylint/
-"
-SRC_URI="
-	https://github.com/pylint-dev/pylint/archive/v${PV/_beta/b}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-3.4[${PYTHON_USEDEP}]
-	>=dev-python/astroid-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/gitpython-3[${PYTHON_USEDEP}]
-		' 'python*' )
-		>=dev-python/pytest-8.3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.12[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		'tests/test_functional.py::test_functional[no_name_in_module]'
-		'tests/test_functional.py::test_functional[shadowed_import]'
-		'tests/test_functional.py::test_functional[use_yield_from]'
-		'tests/test_functional.py::test_functional[wrong_import_order]'
-	)
-	local EPYTEST_IGNORE=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-
-	if ! has_version "dev-python/gitpython[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/profile/test_profile_against_externals.py
-			tests/testutils/_primer/test_package_to_lint.py
-			tests/testutils/_primer/test_primer.py
-		)
-	fi
-
-	rm -rf pylint || die
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p timeout
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-3.3.3.ebuild b/dev-python/pylint/pylint-3.3.3.ebuild
index 7344911a46a3..4ebcea8d606b 100644
--- a/dev-python/pylint/pylint-3.3.3.ebuild
+++ b/dev-python/pylint/pylint-3.3.3.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 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.4.0-r2.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.4.0-r2.ebuild
deleted file mode 100644
index 1098dbd49097..000000000000
--- a/dev-python/pyls-spyder/pyls-spyder-0.4.0-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Spyder extensions for the python language server"
-HOMEPAGE="
-	https://github.com/spyder-ide/pyls-spyder
-	https://pypi.org/project/pyls-spyder/
-"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="dev-python/python-lsp-server[all-plugins,${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.4.0-r3.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.4.0-r3.ebuild
index 88be125b3d98..414a28b54b2b 100644
--- a/dev-python/pyls-spyder/pyls-spyder-0.4.0-r3.ebuild
+++ b/dev-python/pyls-spyder/pyls-spyder-0.4.0-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="dev-python/python-lsp-server[all-plugins,${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pylsqpack/pylsqpack-0.3.18.ebuild b/dev-python/pylsqpack/pylsqpack-0.3.18.ebuild
index 4be4c922c3ed..488c14f9a059 100644
--- a/dev-python/pylsqpack/pylsqpack-0.3.18.ebuild
+++ b/dev-python/pylsqpack/pylsqpack-0.3.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index ef6dd8ec5cc6..3811a21c0c41 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,2 +1,2 @@
-DIST pymdown_extensions-10.12.tar.gz 840790 BLAKE2B cb0567072847b37a1717259dac2db06ca780d35cb6cde7b0b969f6b3cedf62c03db0f229f7d45feb69062bf5d62e149cb8ced7330a380e3e2ba30a5696138ce8 SHA512 4bf1decf0b44ea05b0df4a147f0aabdc9182e14f4dc5f731c74f851764f9a9bd38a3bd2a1a0e619ca6aa3c0898989f4cc97df500e9cd7a6067e2d75722b113dd
 DIST pymdown_extensions-10.13.tar.gz 843302 BLAKE2B 7d4196d32abaa16b6f21ae8a5c4a651d8cc59f0eaa94f9822d0d8344b1b032cc43933ed47ec8cec05f1cb8bdfdacbeb4efb33fdb0a4215688a4fef11b5804dcb SHA512 663c22e11d06411de597febb8eb97291182f86c343e791993bbd26be475c4812b497af896620765f6af7759048e6c502420de8e79ce761deb8ad058bcd9dc830
+DIST pymdown_extensions-10.14.tar.gz 844927 BLAKE2B 1b0531ad7be052a220a5d713acbfbd88f1b891f8313b8aac8ab5e44628a312622df50ccb6441508213b5b03314dfcedfdd901c4ef40b95df81f8e2294b87652c SHA512 39eec56073954a1a26d34e39169fd3e8cedb070796b6ffc682eacf4da75b4dfa308e8e30068de38f940ea7143d2c71240ea82a66cec7c8add2643312da6499fc
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.12.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.12.ebuild
deleted file mode 100644
index acf98580e863..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.6[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.13.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.13.ebuild
index 8447dcb9ba40..954e1dbc8f90 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.13.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-10.13.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.6[${PYTHON_USEDEP}]
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.14.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.14.ebuild
new file mode 100644
index 000000000000..8ff34e09c949
--- /dev/null
+++ b/dev-python/pymdown-extensions/pymdown-extensions-10.14.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Extensions for Python Markdown"
+HOMEPAGE="
+	https://github.com/facelessuser/pymdown-extensions/
+	https://pypi.org/project/pymdown-extensions/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.6[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/pygments-2.19.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/pynvim/Manifest b/dev-python/pynvim/Manifest
index d92ff7d0f041..1581b1b8b56f 100644
--- a/dev-python/pynvim/Manifest
+++ b/dev-python/pynvim/Manifest
@@ -1,2 +1 @@
-DIST pynvim-0.5.0.gh.tar.gz 59043 BLAKE2B 4c9ce46e90dbb6cf278b48a904bef6dbd821d696c578a29d84af5ee64b223c602727dd09bdecbc90f7b6a634cbcd11b615d7ae48782e5cf71ae59faf8f8b1ff2 SHA512 91ffe3f42cc23ba372223b8c9f6930b0cff9d30b6764052a77a5c34e39a3312a1834b9a753152e96d04d5b4b61ce647bd7470095fac3122ae6b1346dcdf07f2f
 DIST pynvim-0.5.2.gh.tar.gz 61269 BLAKE2B 252c9e38935cfb8558ad0536090942b5dbd582f5164c7172fb85e0fa76ba50f18c6be42831905599e28c6a1c074af7c71d7b35b6a37560a28f7bb8a11fcc7b5b SHA512 3bc07e6e1aec265d9584cb03946a0d72fbd43be498bfcefc35d6b60f23316d1dd0ea812f24d96a0e156bd54918944b3cce6303f9a66b23e61c9a000233aa10eb
diff --git a/dev-python/pynvim/pynvim-0.5.0.ebuild b/dev-python/pynvim/pynvim-0.5.0.ebuild
deleted file mode 100644
index e8451390379c..000000000000
--- a/dev-python/pynvim/pynvim-0.5.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Neovim"
-HOMEPAGE="
-	https://github.com/neovim/pynvim/
-	https://pypi.org/project/pynvim/
-"
-SRC_URI="
-	https://github.com/neovim/pynvim/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
-
-RDEPEND="
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/greenlet[${PYTHON_USEDEP}]
-	' 'python*')
-"
-BDEPEND="
-	test? ( app-editors/neovim )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pynvim/pynvim-0.5.2.ebuild b/dev-python/pynvim/pynvim-0.5.2.ebuild
index 18ec98ab49f8..fd1b6b9522c0 100644
--- a/dev-python/pynvim/pynvim-0.5.2.ebuild
+++ b/dev-python/pynvim/pynvim-0.5.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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 
 RDEPEND="
 	dev-python/msgpack[${PYTHON_USEDEP}]
diff --git a/dev-python/pyopengl-accelerate/Manifest b/dev-python/pyopengl-accelerate/Manifest
index 2207d15fd9f2..34069827b4da 100644
--- a/dev-python/pyopengl-accelerate/Manifest
+++ b/dev-python/pyopengl-accelerate/Manifest
@@ -1 +1,2 @@
 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
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 a5d4d4e20cc4..969c95c481ad 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,2 +1,3 @@
 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
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/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index edae2a00ce37..3a9365cdb662 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,2 +1,3 @@
 DIST pyopenssl-24.2.1.tar.gz 184323 BLAKE2B 5d077508c45c56b1da886877fb41e18699f932933badb73b271ce6d55fbf985398f5a74187fe65fde79b60768cb1705daf805f6fb8570f66ad3cecf11ad9b1c3 SHA512 4d0cdf71a5ae785644bd466ef094592fbf4ab804de8d153c139a88d3ff9b8cc80d073f3d49d4dc73d8ebf97a867e1560a5308b998f7ef0ccc734dcc56697c831
 DIST pyopenssl-24.3.0.tar.gz 178944 BLAKE2B ba3117c3c1238ecc84dfdbc84beaeb47c2d12d9e7f2742f798816482954696fd61405884780726f902f7784407e47f129cc5c38f7cf4cd76df4511d215ea4e4c SHA512 ca46a56a5c97ac91d1cbe1cb8b4d9e6d84610785736e925a579560802c1dce6b1cd95c0fed5c25aa775be8a4ae514c5962a86f2db5ecab4506e67ba80ebebd44
+DIST pyopenssl-25.0.0.tar.gz 179573 BLAKE2B e5c9c9e4daa590008163b2e67b7c318cf72a0c922b1db41bf8ef31a44aa59f98a7a594ce1b59a887d47ffb0257f1d11faa920d3bf7807a19e6ece819947e5614 SHA512 77f9f03610a4ddaf115d581b873e728a79ba0e8d762ddeffacb600b6bc4a50bde2edfc114aebe12b9e177f3d53c19fe0c2bf0a5821e609489b8640e23c324376
diff --git a/dev-python/pyopenssl/pyopenssl-25.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-25.0.0.ebuild
new file mode 100644
index 000000000000..cb646ef145ef
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-25.0.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN=pyOpenSSL
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs pypi
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+	https://www.pyopenssl.org/
+	https://github.com/pyca/pyopenssl/
+	https://pypi.org/project/pyOpenSSL/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/cryptography-45[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-41.0.5[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.9[${PYTHON_USEDEP}]
+	' 3.{10..12})
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/cffi[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+src_test() {
+	local -x TZ=UTC
+	local EPYTEST_DESELECT=(
+		tests/test_ssl.py::TestContext::test_set_default_verify_paths
+	)
+
+	if ! tc-has-64bit-time_t; then
+		einfo "time_t is smaller than 64 bits, will skip broken tests"
+		EPYTEST_DESELECT+=(
+			tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	distutils-r1_src_test
+}
+
+python_test() {
+	epytest -p rerunfailures
+}
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index 01c574d19afb..8efc5c0c1585 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,2 +1 @@
-DIST pyparsing-3.2.0.tar.gz 920984 BLAKE2B 417dc6f21f0f16e21422531c729efa4948eba458a28b38347cb665148b4fc438c8e420e4084d79c41386a959a8929f05a80c9b6323f1282b41e8cc1b85f1165d SHA512 0a3096f07c41d3ff954c9aba8bd259a1c8af7ecb391add863e5743262b34778d32f05a617736295dcadbda80d94ca9af2e395a2077f616ac4d1557459a0b7cff
 DIST pyparsing-3.2.1.tar.gz 1067694 BLAKE2B dc82426b4b74d22932451a828cf76a69501b926f737d201c5b01d32b152e113e2d3f6e900723e2dc6cd7b8d21eda11dfc55bd7436bba625125f5e25f52e132b6 SHA512 bb0e703ebf7bcdf34909ac693e16a1c17386a3e92b6c52c157ef338360b3c0cfab9a238bcbfdfe9c061fdff93a34c732d4e1a184b8fb12c728b2b7f2306aa978
diff --git a/dev-python/pyparsing/pyparsing-3.2.0.ebuild b/dev-python/pyparsing/pyparsing-3.2.0.ebuild
deleted file mode 100644
index e024dfa71f16..000000000000
--- a/dev-python/pyparsing/pyparsing-3.2.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2004-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="
-	https://github.com/pyparsing/pyparsing/
-	https://pypi.org/project/pyparsing/
-"
-
-LICENSE="MIT"
-SLOT="0"
-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"
-IUSE="examples"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# railroad-diagrams not packaged (and not suitable for packaging yet)
-		tests/test_diagram.py
-	)
-	local EPYTEST_DESELECT=(
-		# also railroad-diagrams
-		tests/test_examples.py::TestExamples::test_range_check
-		tests/test_examples.py::TestExamples::test_rosettacode
-		tests/test_unit.py::Test02_WithoutPackrat::testEmptyExpressionsAreHandledProperly
-		tests/test_unit.py::Test04_WithPackrat::testEmptyExpressionsAreHandledProperly
-		tests/test_unit.py::Test06_WithBoundedPackrat::testEmptyExpressionsAreHandledProperly
-		tests/test_unit.py::Test08_WithUnboundedPackrat::testEmptyExpressionsAreHandledProperly
-		tests/test_unit.py::Test09_WithLeftRecursionParsing::testEmptyExpressionsAreHandledProperly
-		tests/test_unit.py::Test10_WithLeftRecursionParsingBoundedMemo::testEmptyExpressionsAreHandledProperly
-	)
-
-	if ! has_version "dev-python/matplotlib[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/test_matplotlib_cases.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyparsing/pyparsing-3.2.1.ebuild b/dev-python/pyparsing/pyparsing-3.2.1.ebuild
index 6b3ec380d5cd..62a0ae49c27b 100644
--- a/dev-python/pyparsing/pyparsing-3.2.1.ebuild
+++ b/dev-python/pyparsing/pyparsing-3.2.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-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"
 IUSE="examples"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index 5a8307467c3d..a31302067bbe 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1 +1,2 @@
 DIST pyphen-0.17.0.tar.gz 2072773 BLAKE2B 14c7700854dfe952ff24f7d8fcd80b2287fda4e53dfd57c8cfc506162641a5f13031a0f49b3e0868e1adf050a6fb736b87b95cb5136b90e545b1328d61774a2a SHA512 2f856e9d7f404c515bc7c4c26f4a60664d1f22e08d078818d008d87809e76e4a56976169a131bb368785bd4b01b4c08b2699702afa721d498eb715eb797dc3e2
+DIST pyphen-0.17.2.tar.gz 2079470 BLAKE2B 9b0363d8c098d2dad28edd06b0fcf1ad11b940e6060323a9e38e34520df69cb7aeec3c65f930282ccb8c4af9df51573462477bd70697024547d4ec09a1f30fac SHA512 8009dc6b82fc5c17cfad12fbf26cbbf4a8580cbbe6cb8274fbe640d7ac9ae30f08c21e2b670e69712c909b1624a930159e7398003b139fc8ad8e486611e5e5c4
diff --git a/dev-python/pyphen/pyphen-0.17.2.ebuild b/dev-python/pyphen/pyphen-0.17.2.ebuild
new file mode 100644
index 000000000000..db446f59c5f0
--- /dev/null
+++ b/dev-python/pyphen/pyphen-0.17.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python module for hyphenation using hunspell dictionaries"
+HOMEPAGE="
+	https://github.com/Kozea/Pyphen/
+	https://pypi.org/project/pyphen/
+"
+
+LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -o addopts=
+}
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
index 2dc14669cd8f..3967ec2b4a67 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -8,7 +8,6 @@ DIST bstr-1.10.0.crate 380426 BLAKE2B 19330a5a293430c09908d2174ff814351b16419f60
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST countme-3.0.1.crate 10784 BLAKE2B de1803559fab0accab1edcf5db43279dfa3d7b2874f5c0ee300f46ccccc8ce4c5c3d92c5a3c211068430d903f2e9288ea07fff532d84e3c0f80edadb0752a803 SHA512 f4c8c0977c6871ac8b7eab15904789ca53cbb28385a6fc90d880f85afb44bf10602850198c624963c7db04dbee8c97e271865ae2eadfdf840c21792de4f2af47
 DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43
-DIST derivative-2.2.0.crate 48076 BLAKE2B 56d27e27493c3b818ad45703efda607a0a0d9a48b0d43785b6a013443b8b964b67bb5b5284d242358415c5fb81b86b02079ee7c0595ec07bc658240eb114b887 SHA512 3c65ecdabd2dc202be3d83b06f96b6f68504fe542ede7e2285093c6d360a33ec76a3787c436c6e5ff8f59d430436a4b8ce2f908cf7b2b08cd8b0045de4e5d1da
 DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
@@ -35,7 +34,6 @@ DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd401
 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST lexical-sort-0.3.1.crate 63689 BLAKE2B 801e69d0643785e82a86d25620a2e97330d0adf17e82aa1130aa30d1b885f58bebab3751ce7fb7e82986388464af9cd958ed9adfb422ae10840f256d7b4a1aac SHA512 ca7885bc22b4b67053aa7c83299459d5b1f5e627eddbde4827b6a5bf09827ef81d506a445a5a742bc6736cb9e02d7f9b458f16b87ad1af038ea4559ca0184c69
-DIST libc-0.2.159.crate 755366 BLAKE2B 70f46eb6228b4a8958dfbee00cdfa3c7d218f30d66c8591f4ccc9c5d8eda411d83ce9450552384ac4bc29deb2869561a2111dd157c9f228f617baf8f6b537bc4 SHA512 c803939ceea5ad9bdfdd122726c7a5f12ffd8b0cb66cf0bc62c9670e1e5904a504def388c1e043c520f4ece484addf6dac465aebd58578aa6b79995077bbdf9f
 DIST libc-0.2.161.crate 765389 BLAKE2B 4880efbc347e0b92faa893993f37c486a69afd1a3c741cfb9d3a2d3c87fd56e49788f8aeac17baca217f4ceee9180097386ef481f4e142942802f27983f8e6fa SHA512 264d7a872c10484b9cb19ee858c2ac44bf165297653fbc6220672bd2e0ba10913408130f21d370d2861eef529f9ecafece66515b47b4461d56e6b02f55ea2be8
 DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
 DIST logos-0.12.1.crate 8973 BLAKE2B 344780990917e2c15caeebab955e98ec155f240056b3239bdc9db723e44929c135d4e783a5d3a5af256d7bea2363bfb74a3002ace1865fdd4840bb03a4d79ece SHA512 011bcf2bed59e5c707adb8ce50b26bb845631595426429e741231613e215286c2c05f3ae9fc5b7336b7e7fd0690a9fae2579413b750f7694b6c475d0fca3278d
@@ -44,28 +42,22 @@ DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e322
 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
 DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100
 DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
-DIST pep440_rs-0.6.6.crate 42621 BLAKE2B 311ea4eb85b1d3b450d1a757627956ce15b2bccc96d0d62577aef63f3cbd27bee8c36291679ba36db1e29d447c5d0fbcfc0d8fdeef16613974a9890afd7de34a SHA512 1843649bcb93359226f49a1479075e1ab1409671167313bdb7f4999d9a5941ae1814160026ef4fe6f2ed52fbfdaf75c8b4b6e1e86fb0473774520ad22eb88186
 DIST pep440_rs-0.7.1.crate 42506 BLAKE2B 4a5e4595f12f0ad0edfc6ce42373eed66797617ae0c40bffc44fbad47d9d5946600d0e3374e58daa4d33c4f54b546b29ae2c56a04ba53d3f18fee7fa04895395 SHA512 2005a6273e4e5421ab88df51e2991b9025ddc6b6808254159db57db43b665eb922de8998bd8eb5638ba6cc7e3eb967b0686a6f30a5ba87ed5d00cdfcaf1e1510
-DIST pep508_rs-0.6.1.crate 34148 BLAKE2B 95caea07ffa19695dfac3f8c32cbcea0753a239c41719b9742c2b489024d06c836a04445ebc24e958b456794df52fa8ef0fb089a18d837b64394d251fe313bda SHA512 595e808a8ce190430b1d31af31156971cb5cd922629ab36d627c45ec27a2137badf4c4e6276702efcacddbe3af7a1c19d0d887b482a41e27d961b5e0677b57bb
 DIST pep508_rs-0.8.1.crate 31283 BLAKE2B 5a28af5e4139fd72ee499b978536594979896dbd01c489716cef395b0b5de3230334354af6586aeadb9dd313a2d3d87096f9434df3e007d40eb79424004feb5e SHA512 18a253dadb5fe445f4b68280c25c3a845530cf48b8ee288b954309fdfb692039c5d1d9534c06d556cba2d5a90cb166c97d496006eeac763b4558f634f9e061a7
 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
-DIST pin-project-lite-0.2.14.crate 28817 BLAKE2B 8e9875967059faff399fbffff82cf8835982c46ea8df942acf50b038e3f500e04d3d8cde39da5a71ebcc38b869553f8c49830e484d1109b353247a4cfdeda89e SHA512 f90a6b9f5ab8701718f72677a4f3597c1b9f32e5fa53198b47a94696227ea37815997599abaa6058b217c5b32a94602582c6b13fdb66e2d683bc98921de95293
 DIST pin-project-lite-0.2.15.crate 29683 BLAKE2B da9dd581eca047f089c2a069a355caf66a631b3ff81fc07220a3c378dc77ea2c399b165ff8a1d2f6556595ec52dc1bbdcbbdea5ad9e5e317281650c9158b3669 SHA512 ba3c22c70f98ee0d0e78fb8a25bdc3100b26c3f03f3e4c6c0c238fde75774c5634d6014660c39406a828d1c28f17f44f20fe19dacd331c4da2f4961a7f7c124c
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST portable-atomic-1.9.0.crate 166365 BLAKE2B 9abc31364770923847dac16f532452bc8783a5068c0f757f79122bc5b68863b58c0acfa12d28836188413c2f0b61d494cb53fa07a57e199ecd4910a2534c5bb3 SHA512 1431a4c092f6a0cb50bcc78488d603c8ba8f4ee697f77fdcfcce7002fcb371f52a321089422c76564fbf3277c48e30f889565747951c60360d95a6917bb6adeb
 DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029
 DIST proc-macro-crate-3.2.0.crate 11164 BLAKE2B dba3e1f4e38f427df72794ad891746fbb8c24239cf06b076e75ab6795a7e8c9abf25ae0f40379e07a696827156e7a3780ae242da7e5442cf1224d058f54b83a6 SHA512 41479ec5e414a8b05dffaa0ece21122387d5165a54e60d8ee3502f8a3c0a2ac0247f56996f933d5d77f1efe41a56bffe16874e8c6a34b66100cf047e4b760863
-DIST proc-macro2-1.0.87.crate 49121 BLAKE2B 4a5136e28b5174c1382037d294dfec51cd7211eb7876c06a98600768d071915e76c81a7958a780cb7b843b98d9df4bd4e01d4f280db226d241bf84de348593f2 SHA512 32ce9c8b5bad55cfae537882c3fffc4d56824f6214ea97aede89ad460e3f66956b52af4a268496fc95c2c0eda0baeaaed4b12cd98df2efab24837e23b48b1f0e
 DIST proc-macro2-1.0.89.crate 49446 BLAKE2B 844c021394e7a2551bc179592a6769d672360150abf92debcb9ac60a94a2e426c48c408f06aeb2128686f5f04d66dc12973714670c21a5063ee6b9f3bae4e671 SHA512 488ab38a04df1d0330309382a7e4f667238cbc9b4d513da6a8f5718f8a762f76cc122af67fefe8f4b021a286b3d23e3ec83d781fe6ac823042a6daf14d147e2f
 DIST pyo3-0.22.5.crate 546700 BLAKE2B 8ee81360b205bcfc763dbd3d313e2d2f31bde4577bdc77a2ebc3084aa06e30bcc1f7efb97349d781b27882af5b8e82c6476498c86039b9c39286721ed1c08504 SHA512 48b9ada19bb12c6e5f1d41982c3b607f206d88dc078517c45106b631e0ad973145b0b60af06e58013a5189ca8b50e1cfa326c6904bba5aadb791933272ffb277
 DIST pyo3-build-config-0.22.5.crate 31293 BLAKE2B c1e10f78ce66993fa4a88a5994f0266200a529c2939dc1d29137aaa6133bd4c83062cd00d347b491afe5dfcf2995f4a1a0da271a24baf198447b5983a9620d83 SHA512 c11ebfeff1e8ada612dbab16bd86fb8659edb9026bbd826cba84601096fa4192faf260e067b5f9efcd0e8e72fe90bc8f08358cbced45175c662d78bde5eb3d82
 DIST pyo3-ffi-0.22.5.crate 69354 BLAKE2B 91dfb41a24cb2b12bf54d6e54949a381ba6635ee55623a7f77a7e672fcf71d7f6937b7ab96f20457d770cf132047ddc9df50ea4aae8506d64e833f11a3b504e6 SHA512 36b8ed6273f7a0298179729c41081c787f353eb338be0f470859ce62a12e05305bd53eb24b6e72f2c56971f18bd64d16c63576f41909e9ac849f355041139a91
 DIST pyo3-macros-0.22.5.crate 8186 BLAKE2B 78f0c348fec0878ce4c873af3d4c438ccf02a5e971f2fd8b1cc9ea40a3aa8396dc6ea11e4d421a8b8c5eff5752182623632d92403ba6c5565b6b71b386768b04 SHA512 cfd848fb82f183290791930ca2e43a0db63de4f23436c1f1d3c688efdcbba1462346177c5956817418a0f0ea172b1039f5408a02a05ff03671dbb025f0697076
 DIST pyo3-macros-backend-0.22.5.crate 66308 BLAKE2B d30c021da6b013abb8bbc8d55f110f3394c79d85f02506d7a42bba256afd639647210ed66bae289f4dfbd6d060995c0365b278749798b302eb89f1b09c074ab3 SHA512 8a79f9c6f948375e20804d2bc4b98d9fd7d39f99a936afb1d9a0fab599a3ad07e95bc985aa51b0ab8410b6b4f5ebaa2aa347013ae722a2b3f4c51f318415d472
-DIST pyproject_fmt-2.4.3.tar.gz 44238 BLAKE2B 23c6103beb572d0dc5c025a086204130b93a49b9525ae683a3374d0b72ef8065f0875f46225f651cf51ac11b9f8f229254eb50fdde3a007230f32a6982c80157 SHA512 e114d8cff0345ae95104ee8984d2ef2119126be8ce36542b24c14000f9fc9d23f4b3983b7820bd4f8cb1cb05bca779d7b0635afc1317cad89fee30bb49fc5591
 DIST pyproject_fmt-2.5.0.tar.gz 41799 BLAKE2B a3edc7f29e1d529ee5d0ac06ca0deafd9923c4133d8842dd6f7dd15e844030e5b6bc06665af2f3cd57b02f9cd640e51b7217de7e8cd974aed05d8cb64e034ff2 SHA512 2032bd7639afab2449f39f1f572a7283ee9e7d31f67a7c41c2615023a5a1a86fb441fe163dcfe393892171c6042dd216d9f8811a0ee5660b9424428ff3f387ca
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
-DIST regex-1.11.0.crate 254059 BLAKE2B 9450e54b522c3f12e4f1d814025c3037f8373b9e1feaf2028756b573335cb7f22400b0925e3ceb0716d72aeb19b02b4bcf70b0b435a0252d0d52a7028d95308c SHA512 16c066664ae87497f9880a52222301fb0d44053ae2d6861ea21dc59cab82bd1ab8ac407f9e77228a21a586ee745b02f9eb10e7b9b30df2f3aad73633270bf73d
 DIST regex-1.11.1.crate 254170 BLAKE2B 5cf41012fc2ba8a006c0eb4a922cbbf1614bf300be361c9e2d98956a9a5e9b140e37bea09132fab7bfb633d4439158723624bcf45e8c619c4061b399253c1b82 SHA512 d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8
 DIST regex-automata-0.4.8.crate 617784 BLAKE2B 7535c79f6ddf1b1225e21171921594dcf32fc3afd47519d2067b2047b19070cb7e6fdfd1563b884fec6f91dd568522fc95d85bf095c11f8c02daeac128c45020 SHA512 278e3e2ab230ed5fa7d4837e8ea879fae68ebf35c2da5cc3a67f46b7d593abbcf71e6326a0cf34e38edc0f3f2166ff42a4fcc17a400d9604429aa5b4be075a3f
 DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e
@@ -78,22 +70,16 @@ DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e78
 DIST rustc_version-0.4.1.crate 12245 BLAKE2B 0ed627c560d88e5ade830cc5f72c62f6ba88be3e30d0f8db34761fcd0b284e5b2fc063c240149aabdfb12c8410ecdbe50cb10a3544500b5a020f95a31cd6709c SHA512 7aa8a487ca7411b6d23cae62f7568fa3474a7b1fd1589621071be3428a550ed3b7c4ad68277a8f86849e5900397d7d0e9d678f5d423742a045dc7c660fa6c598
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743ad0feca0929bf2409eb81e03637ec5f92ba9f38ea386c4ee5cde72bd3d2042083e2fb0d6fa0b839b1c5093a SHA512 5ea1fa17c08d1280c3a4bc8d28494e88ee05acd5dc969ef6f0c6f91fd3b5a8fbe999c9e8bbd2da383413038b8d29fabf02b87bd5265bbb8333f3fcbe409103ec
-DIST serde-1.0.210.crate 78338 BLAKE2B b3621d1313312177a346313e6e384fe9660f74eefb18e6cffa39fc2aadc0ab73be84b9037c59b716e5feafcd73f4f054f83e6d17d82746984b3064bf8d3ed338 SHA512 0d853ca51543ae8b4a0c70204ff4e559a4eec77af3d3bdcfc75c5905c80d4ffd1bd9eb8258ea4f6ecfbdd26477ecac7dd698d84d86759fa32e03a9cce02fa4ae
 DIST serde-1.0.214.crate 78523 BLAKE2B c701f316a3204625d475668d2722991d75c8d9c573ae32e9175ccf99780fbe0c9c9d1dd0b4bac35f2cc91aca888c7f3dc41af2842dd833ab82776a38c2a2f6c0 SHA512 100eac65a39b9b9c32c1671d36fa9cf8aca84a2673e24c2521fdbdb3ed9f932c71548f3f1a26b1e73dd7c92a34ffa8ed1c76eb173fa20d6e85736cdf8dc9a8ee
-DIST serde_derive-1.0.210.crate 56020 BLAKE2B b346e574c99b6a8b12dfc29b20a4fd2daf8abfabd3714ccfde059a3a1f14a5628d4acf6a03f8076174fd28adfdb7cb9bbdb8ac0d4403aa2f43e917eed4b08028 SHA512 1c54d70a55007c00d3ff3d8c2096f4f9966431ba7bfd9195bcf41932de71b71c4ab934f9a8c5067cb56a042742cf0efab07377dbabf12feb1af6d20399de00b5
 DIST serde_derive-1.0.214.crate 56630 BLAKE2B c284561109e5d60e103f1bb421e4da48f35c5046aa52359177e286449cf8fe51a92f6295f5bec3dc4cd737025e8d0bc618436e2f7640873f66bc5b77bb4f450a SHA512 70bc0a31d344cfec8d30f2034beab25097ef76ab8d89947b21753f737759e5d4e60e5596e0c7994a7cc35993bae01148120f6cdf5239be25fb243056effa27f0
-DIST serde_json-1.0.128.crate 149520 BLAKE2B 246eb865f64a0f161b79f3d4f783dbadbc930c4a19edb6c0fe8f0c6145c7c47be4b692d3e084b1b500820ece8e94214820978cf898926dd805bd431fb411bbc9 SHA512 9e6290d3a6a971b3c37bbc97097b8179e64c655779b43c7b75303a35ef7030f5401b3a5f62cbc95a7bd5f42ecbefb0b469234d78a76c8c1597726d8e08908a7d
 DIST serde_json-1.0.132.crate 150549 BLAKE2B a49aef7737fad2e6f6ec79cb6da00c734e7de7ef16be321846d1f6229534b58e15ceb0f6306eeae6f85bf07431d82959c0a56ed1394d21a67b65c8c48e971f3f SHA512 9d157ce7d705fee8245569e7c577310782b69675a6e459f21904544b824a1ca5c9b445d17419fee438dfeb6fcc35343ba14e022043fffade0210b6d2c1b5795e
 DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
-DIST syn-2.0.79.crate 268981 BLAKE2B 2bf4bde1890ce4ee91fbacca81bd298d15f0111fedb27b9cf8d675dc2489f46026c1804f9e4e24afbd0718539820096cd5c4ed2c2da02e598370dbfd2b18c293 SHA512 1ee073fa3428c031e53bff8ff305bcd6b37ac142bee3955dcdb44fec1c77c733eb78760c8bfb30b83fc3dacdad8a384e2b6f9f31a89c4cc300359e33457fd433
 DIST syn-2.0.85.crate 275231 BLAKE2B e7679e81bcef87920bc0ed707c997563844ffa1e9d470675ae6ec11d1e045e04ee2ad5744d423b8bc16def1c197ebecd874f468c1e12244838d1b4f34f9c1a30 SHA512 14b1402d2cd91456eb32dcffd494592eb3bd848ae22571f7ef0686493f91b82d23ba41428f9d31686fd24ea6ebca4b239b6c5099302a32014dffbc4ff9afeec1
 DIST taplo-0.13.2.crate 53458 BLAKE2B 44256ac6c6d2d63e056e08feb549610f0d0e1749828f9ce54c4064677229bb3a09d2a8d9d8463aeea242351d6f0ca56c4a4357aaca2e7c0e4ebf0813af15edb7 SHA512 ee645b7edc7dc01504921b08692b00c86369b3dea1f49bf5351248b0500a5d33656e6416e67c6e0dbf498347aadf118a7cea50bd50b875ff5f8485547b21b8fe
 DIST target-lexicon-0.12.16.crate 26488 BLAKE2B e7950e4a302059a1bfc9bc15618a3c1b971a17cffae117a6e8f5f63a0d82fd2bd02680301d15338612d5426d349dd24cfee30ee787a15a7d3187f2a6825e69ce SHA512 092639957c4a0391560b6442b31c47159c04d12e971010f730a6ec9cb5389e4be903ef3d7daa06db95e64dc78b6970731fb647179ebaad2b12e9ed5e9b24da27
 DIST text-size-1.1.1.crate 12553 BLAKE2B 54c48d202650606d182b2d046d6a0a35b41d4e49adebb8f9f48a22329966891036af7dbc09a4522f0ca55533dfc8e87c276fa2bb4e7a24bed57a26794bfc3ee8 SHA512 e1b0323d2f83ad85ab8c5dcbe9b2084d09592979e9edbcd03d40576abc805b20ba3d6b59261465cae5e987542d4b665fbf797369ff1cd7cbbbfad271258b0ce8
-DIST thiserror-1.0.64.crate 21574 BLAKE2B d2c7cd7c1a8850dcd3f188aa1af61d4727c4bfc27a069f0e743adf86b7934e6db85d9ee9af14e78c7391e99f4ac828c00277a1354bfe1a47ddf5964211bb2037 SHA512 cff21ebd9d5d37e548c35dd1dc0e6e885a47363cbd8ce3cc8508e8e9b5f844c168b9f3d9ab12ca8d5910a53a9e09b4ddc75a0c32f983e27727fc104e4ff77618
 DIST thiserror-1.0.65.crate 21825 BLAKE2B feca5315211d9c2f953dbc2a1b94eb7e00aee29918617b033dacd24fa8575bb3c540dc788496b4d8c4f2ef93715e2c1586ebed9dadb4531c13cc8404dd5860b2 SHA512 80a6525265bccfc890599070166133c25ba764d6bc63a486e5f7350e473826c5a004b08a5c58b0fd4c04dcafb7649617720021564717021230078ca0bb416697
-DIST thiserror-impl-1.0.64.crate 16073 BLAKE2B 8b0eee3d70f926c2719d084676cd14674dc5cf7c474c72e3e628a3cdda7afadd67a78f76224d2a05f1fe04ac59a178b879e467bac1981fc56c5904073153c88e SHA512 75e55f204a290eb38b2215fcdfa91f9f1cb002b121ffdf56bd5f6d75476614e3ce06360da7d74b870c45f6b107fa9e61f85ce39c0e65e713f8c191d79f96f443
 DIST thiserror-impl-1.0.65.crate 16077 BLAKE2B 06b704bac22338710de027d220d86451d2dc832df722888d01d35f87e34853d683f1c2508937ae221cf0c7d20d8026092d676f8910b18f7cb3b21189556141c2 SHA512 ef211d621322fb5886b2eb3c7fdc210c7885545a736bb37b195666051a8b47ec8b771fc4f6c641cfe36a840cb841186ba132cc5a270caf3137cc17bdd061251a
 DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
 DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
@@ -108,7 +94,6 @@ DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d35935
 DIST unicode-bidi-0.3.17.crate 58120 BLAKE2B 9d7759554e265136ab9d95dda90bab84763189d3613522a5cb966ad6417ac0ee726d79e296c8821ccca589ef09a999701149c88a9189cabe0ed7d32902040832 SHA512 cf523ff9a2e1face42da035f81bba2476e80d1154f73f3e34cbaf5ce322504e93a520114a54e0a4b2e5d6b930e508ce31b5d8b4f4ed4d39159a8c9a9c7b94d91
 DIST unicode-ident-1.0.13.crate 43279 BLAKE2B b5e935020d1c9f3aa24f7d382f6b73d6510d654a61ce1c9c024e2e365bb817182e076139f370e822573531356fb78ff7499049b1f29aa1e2f4a2cc74a955b47b SHA512 5ba884f39debe9c8eb0b1d251ca713f7e2bc191d211707ed10cd81465487dbdca53914c19e131edfa1da15af132dc2c346260c3969c61e3747b63399ccb1cc51
 DIST unicode-normalization-0.1.24.crate 126536 BLAKE2B 1d6d535a1236562918d2625172d38c261854cd8c45cccc81c5d5aefb052db5d0e33981d95f5c87e8760cf77b3651c60b7ec1762421a7a9caa72fe7eac3f562a0 SHA512 f7af59688773319b9d1523955ce9b82e6735bd72358715ba5c056f41956ca050b6a612cae1b39199cc089674b3c71e4016d85d48167277c794c5cef3df881754
-DIST unicode-width-0.1.14.crate 271615 BLAKE2B dd2e1504caedecb5d37c397ba05446d3d762b8b6833a8032ebbc213e324d53d89db5e96ed2f7223096e5754d800b39a54105906effc88d9437d7acb9e7beb81e SHA512 3c58a18776aa82cc13c761789a47901616cd98a30356f93d7eb05ae457314209d0a66213e2bbfa5eb8b59be6beacf62438234ce8daafa31b128dbf7d5d6fcadb
 DIST unicode-width-0.2.0.crate 271509 BLAKE2B 53015f24c57ba65d7ffc6e15e947f5ab96fa272996fe5a4d2f9203051972238ea7591c99f1d8ae5d2610c7b83c215b6912eff7aaae034237aec8d79620bfb843 SHA512 38149ad512a44fc79b2c991c6b5667da2e8f8b442ab6bb7e4f404e7fbb034f7540c7e0e8b9e72a1ff6117b899d6034862239f43b6423fa89d55dcf489caff37d
 DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505
 DIST unscanny-0.1.0.crate 10338 BLAKE2B fd725928107d4d2ed2686709335ef01136bcd54d34180189906b7c2436e3f77496328484c623dec4920738f4a07e92be7e7581387c4f5b6996fa34c03efd7b0f SHA512 8267e327e4e852d627d416d58ebad5ba937ab6a2477b265fd5f79a98d43ade2d1780e67696b801cae8a4af10da8f7c0c257d2c878289eb6cf7e711dcf357d87c
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-2.4.3-r1.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-2.4.3-r1.ebuild
deleted file mode 100644
index b045b694143b..000000000000
--- a/dev-python/pyproject-fmt/pyproject-fmt-2.4.3-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-CRATES="
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	any_ascii@0.1.7
-	arc-swap@1.7.1
-	autocfg@1.4.0
-	beef@0.5.2
-	bstr@1.10.0
-	cfg-if@1.0.0
-	countme@3.0.1
-	deranged@0.3.11
-	derivative@2.2.0
-	either@1.13.0
-	equivalent@1.0.1
-	fnv@1.0.7
-	form_urlencoded@1.2.1
-	futures-channel@0.3.31
-	futures-core@0.3.31
-	futures-executor@0.3.31
-	futures-io@0.3.31
-	futures-macro@0.3.31
-	futures-sink@0.3.31
-	futures-task@0.3.31
-	futures-timer@3.0.3
-	futures-util@0.3.31
-	futures@0.3.31
-	getrandom@0.2.15
-	glob@0.3.1
-	globset@0.4.15
-	hashbrown@0.14.5
-	hashbrown@0.15.0
-	heck@0.5.0
-	idna@0.5.0
-	indexmap@2.6.0
-	indoc@2.0.5
-	itertools@0.10.5
-	itoa@1.0.11
-	lexical-sort@0.3.1
-	libc@0.2.159
-	log@0.4.22
-	logos-derive@0.12.1
-	logos@0.12.1
-	memchr@2.7.4
-	memoffset@0.9.1
-	num-conv@0.1.0
-	once_cell@1.20.2
-	pep440_rs@0.6.6
-	pep508_rs@0.6.1
-	percent-encoding@2.3.1
-	pin-project-lite@0.2.14
-	pin-utils@0.1.0
-	portable-atomic@1.9.0
-	powerfmt@0.2.0
-	proc-macro-crate@3.2.0
-	proc-macro2@1.0.87
-	pyo3-build-config@0.22.5
-	pyo3-ffi@0.22.5
-	pyo3-macros-backend@0.22.5
-	pyo3-macros@0.22.5
-	pyo3@0.22.5
-	quote@1.0.37
-	regex-automata@0.4.8
-	regex-syntax@0.6.29
-	regex-syntax@0.8.5
-	regex@1.11.0
-	relative-path@1.9.3
-	rowan@0.15.16
-	rstest@0.23.0
-	rstest_macros@0.23.0
-	rustc-hash@1.1.0
-	rustc_version@0.4.1
-	ryu@1.0.18
-	semver@1.0.23
-	serde@1.0.210
-	serde_derive@1.0.210
-	serde_json@1.0.128
-	slab@0.4.9
-	syn@1.0.109
-	syn@2.0.79
-	taplo@0.13.2
-	target-lexicon@0.12.16
-	text-size@1.1.1
-	thiserror-impl@1.0.64
-	thiserror@1.0.64
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tinyvec@1.8.0
-	tinyvec_macros@0.1.1
-	toml_datetime@0.6.8
-	toml_edit@0.22.22
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing@0.1.40
-	unicode-bidi@0.3.17
-	unicode-ident@1.0.13
-	unicode-normalization@0.1.24
-	unicode-width@0.1.14
-	unindent@0.2.3
-	unscanny@0.1.0
-	url@2.5.2
-	urlencoding@2.1.3
-	version_check@0.9.5
-	wasi@0.11.0+wasi-snapshot-preview1
-	winnow@0.6.20
-	zerocopy-derive@0.7.35
-	zerocopy@0.7.35
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Format your pyproject.toml file"
-HOMEPAGE="
-	https://github.com/tox-dev/pyproject-fmt/
-	https://pypi.org/project/pyproject-fmt/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0-with-LLVM-exceptions ISC MIT Unicode-DFS-2016
-	|| ( Apache-2.0 BSD-2 )
-	|| ( Apache-2.0 Boost-1.0 )
-"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.2[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# tox is called as a subprocess, to get targets from tox.ini
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.10[${PYTHON_USEDEP}]
-		dev-python/tox
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib/py.*/site-packages/pyproject_fmt/_lib.*.so"
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e '/strip/d' pyproject.toml || die
-}
-
-python_test_all() {
-	# default features cause linking errors because they make pyo3
-	# wrongly assume it's compiling a Python extension
-	# https://github.com/tox-dev/toml-fmt/issues/23
-	cargo_src_test --no-default-features
-}
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-2.5.0-r1.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-2.5.0-r1.ebuild
index 18b2b11ed53b..630e875372d9 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-2.5.0-r1.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-2.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -134,7 +134,7 @@ LICENSE+="
 	|| ( Apache-2.0 Boost-1.0 )
 "
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	~dev-python/toml-fmt-common-1.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyqt-builder/Manifest b/dev-python/pyqt-builder/Manifest
index 48e5320bb135..50900a238f56 100644
--- a/dev-python/pyqt-builder/Manifest
+++ b/dev-python/pyqt-builder/Manifest
@@ -1,2 +1,2 @@
-DIST pyqt_builder-1.17.0.tar.gz 3671922 BLAKE2B d322f17a04b5ea92c3cda9daddac5b7dc84c3a2e3341923413df25b5f6e63a3f21d148a194efd091b22069086eb395c6b0bc8563995e286d754475e2413865d7 SHA512 e8e2755611cbe1430ec50af3189bcf06152b7fe524787e0823a594be9fd18fb8ff7055fead4b55d4025b97f2e856ccf3bac8cbc9019f9cfe1658f1f3e402133f
 DIST pyqt_builder-1.17.1.tar.gz 3671718 BLAKE2B 38290399fdd9bbe8a2582cdfc3b9edc15a330a18159e6dbe4bacd05d7c8ab31ebf39941bfce33a54d3ff13704a0b626ac3e9ab7ce8cb3599b1dff095e00e7e95 SHA512 645655c2a51821a909c2799427ba5aab8b14b8324c3d797b34a38d372b27de29a13688fb8ac9ee9fb9160d194e044f9f3e89822f94e2160b6238076bceb8a5c7
+DIST pyqt_builder-1.17.2.tar.gz 3671828 BLAKE2B f8f822275f90929542e2800ff6802658b5a27402eda76de96d0546a8abee65ce803ce48eb93d001d6298f95c10393e066673057746e97de7244b4c6d17678f10 SHA512 54f99a50ba8534c84df563c80375165baaeb2dc1255297298a5a5360176d267d858b105b7fb06a8b029f1697919c3dad977aa1916c9ab41b9ace272db5db5295
diff --git a/dev-python/pyqt-builder/pyqt-builder-1.17.0.ebuild b/dev-python/pyqt-builder/pyqt-builder-1.17.0.ebuild
deleted file mode 100644
index 67533013d421..000000000000
--- a/dev-python/pyqt-builder/pyqt-builder-1.17.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_PN=PyQt-builder
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="The PEP 517 compliant PyQt build system"
-HOMEPAGE="
-	https://github.com/Python-PyQt/PyQt-builder/
-	https://pypi.org/project/PyQt-builder/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/sip-6.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# skip installing DLLs
-	rm -r pyqtbuild/bundle/dlls || die
-}
diff --git a/dev-python/pyqt-builder/pyqt-builder-1.17.1.ebuild b/dev-python/pyqt-builder/pyqt-builder-1.17.1.ebuild
index 89fe6a4d0332..316a400b3f9f 100644
--- a/dev-python/pyqt-builder/pyqt-builder-1.17.1.ebuild
+++ b/dev-python/pyqt-builder/pyqt-builder-1.17.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 @@ HOMEPAGE="https://github.com/Python-PyQt/PyQt-builder/"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/pyqt-builder/pyqt-builder-1.17.2.ebuild b/dev-python/pyqt-builder/pyqt-builder-1.17.2.ebuild
new file mode 100644
index 000000000000..9978b298678f
--- /dev/null
+++ b/dev-python/pyqt-builder/pyqt-builder-1.17.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN=PyQt-builder
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="The PEP 517 compliant PyQt build system"
+HOMEPAGE="https://github.com/Python-PyQt/PyQt-builder/"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/sip-6.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# skip installing DLLs
+	rm -r pyqtbuild/bundle/dlls || die
+}
diff --git a/dev-python/pyqt5-sip/Manifest b/dev-python/pyqt5-sip/Manifest
index b6107bbbfc0e..b012f303de72 100644
--- a/dev-python/pyqt5-sip/Manifest
+++ b/dev-python/pyqt5-sip/Manifest
@@ -1,2 +1 @@
-DIST PyQt5_sip-12.15.0.tar.gz 104024 BLAKE2B 40fdf25bfb8ca321f50926d7041e33edee9fbebafaded50d283ea95b04ea050e368d2b8470110d758f68f3ac08ada68b65b2f6ebcb9d7dd43707636e26701854 SHA512 1a009b53e80fc8231478f741839d8a88ab26f531c4ab0d41ccc00c8b0650c13c95c3c89cc949858a99bd1d817d736507df519384dff029530edc554f4b35b4cc
 DIST pyqt5_sip-12.16.1.tar.gz 103975 BLAKE2B 43a71f75809c64ce104044c8aa9610ba03de5a87bb69a3cf173153a7ae10ddef623113e54922fcb215920c2635bcd7294e761ea5043d735f700cde431d0f7a16 SHA512 c85305503927dee0886f88d54aa74c4a0123159d1f534b1ec6d5ea5dff149954b2f11cf14c4a14d97cb04b0ce40fc75fd28b0109b5a2232e89cb057b3caa57bc
diff --git a/dev-python/pyqt5-sip/pyqt5-sip-12.15.0.ebuild b/dev-python/pyqt5-sip/pyqt5-sip-12.15.0.ebuild
deleted file mode 100644
index acdb27ee0932..000000000000
--- a/dev-python/pyqt5-sip/pyqt5-sip-12.15.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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-# actually, it's PyQt5-sip but upstream uses incorrect sdist name
-PYPI_PN=PyQt5_sip
-# keep compat in sync with PyQt5 or else it confuses some revdeps
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="sip extension module for PyQt5"
-# note that PyQt5-sip is currently not on github, but this is the
-# homepage listed upstream as of the writing of this
-HOMEPAGE="https://github.com/Python-SIP/sip/"
-
-LICENSE="BSD-2"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
diff --git a/dev-python/pyqt6-sip/Manifest b/dev-python/pyqt6-sip/Manifest
index 5a49d9aca039..1b1f76a0a075 100644
--- a/dev-python/pyqt6-sip/Manifest
+++ b/dev-python/pyqt6-sip/Manifest
@@ -1,2 +1 @@
-DIST PyQt6_sip-13.8.0.tar.gz 92264 BLAKE2B b44ba35c3209b3a49fccf0e4634af8a410b1531d0dd74fc665d7da9780f4e32baf18fbba80eb9635a96442c1c91295dc10e0388194d1e169d300e0e1b37d18cd SHA512 6947690e61fe65a21f61d034ae9de7b7adb001c59a4a362933c5441648fe27140b43666efa73f981b138cfc73fac72777bb7318b98accc3c7f808687e3fc5d81
 DIST pyqt6_sip-13.9.1.tar.gz 92358 BLAKE2B 0a92decce0b27acbc24cf903ea1ca6efa15315920bb4dd92af960c0e58bbc861b74daa950c983c56f5cc458204ebb86912c07af10b9f942ea66a6add8dc1ac7a SHA512 a4d4f3207f6bc86e148934fc84f86bcbe895d1d890b9e642154a1b5881898f1d363662ca51a847aed9bfc9942479b77581771b4f5d8d9c140bc4066d06d584f9
diff --git a/dev-python/pyqt6-sip/pyqt6-sip-13.8.0.ebuild b/dev-python/pyqt6-sip/pyqt6-sip-13.8.0.ebuild
deleted file mode 100644
index 4b3eeeed1788..000000000000
--- a/dev-python/pyqt6-sip/pyqt6-sip-13.8.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-# actually, it's PyQt6-sip but upstream uses incorrect sdist name
-PYPI_PN=PyQt6_sip
-# keep compat in sync with PyQt6 or else it confuses some revdeps
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="sip module support for PyQt6"
-# note that PyQt6-sip is currently not on github, but this is the
-# homepage listed upstream as of the writing of this
-HOMEPAGE="https://github.com/Python-SIP/sip/"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
diff --git a/dev-python/pyqt6-webengine/Manifest b/dev-python/pyqt6-webengine/Manifest
index c926e456aeea..13bcfeafb9a4 100644
--- a/dev-python/pyqt6-webengine/Manifest
+++ b/dev-python/pyqt6-webengine/Manifest
@@ -1,2 +1 @@
-DIST PyQt6_WebEngine-6.7.0.tar.gz 32593 BLAKE2B 6c14323b440a83f6fed9f1f77f20b350f00255dfedfbc328a5ee638760d20958d8864eb3c590248acd5c69152c537993a95e66d1f76b28349561c8223dfc2a85 SHA512 8298aecc43e420c4fa912802fd66ee95fd71156d9a6d1f1a499ffcc2d0d45a8c3e3c170f911acfc8f094d2e434567b5143b145ce40413ee75c9a9e4420341c0c
 DIST PyQt6_WebEngine-6.8.0.tar.gz 34203 BLAKE2B eeec38d0804039fa4d80d9c621457e18c4ae7831f351401b552191f3db8899102a4396164a1df89597460a9d6591a5d885b1bd813f226094c853aedb0918e3c4 SHA512 f48575829ccf9350ec6e743f2185975706c149dd37b8fbdf5c76bb65f606084b3d3c732ce39bfd35317d1e65659d5ec6e77b489a83c43971b5b3b3ce278bd8dc
diff --git a/dev-python/pyqt6-webengine/pyqt6-webengine-6.7.0.ebuild b/dev-python/pyqt6-webengine/pyqt6-webengine-6.7.0.ebuild
deleted file mode 100644
index 62544c47adda..000000000000
--- a/dev-python/pyqt6-webengine/pyqt6-webengine-6.7.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=sip
-PYPI_NO_NORMALIZE=1
-# actually, it's PyQt6-WebEngine but upstream uses incorrect sdist name
-PYPI_PN=PyQt6_WebEngine
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 flag-o-matic multiprocessing pypi qmake-utils
-
-QT_PV=$(ver_cut 1-2):6
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-IUSE="debug quick +widgets"
-
-RDEPEND="
-	>=dev-python/pyqt6-${QT_PV%:*}[gui,ssl,webchannel,${PYTHON_USEDEP}]
-	>=dev-qt/qtbase-${QT_PV}[gui,widgets?]
-	>=dev-qt/qtwebengine-${QT_PV}[widgets]
-	quick? (
-		dev-python/pyqt6[qml]
-		>=dev-qt/qtwebengine-${QT_PV}[qml]
-	)
-	widgets? ( dev-python/pyqt6[network,printsupport,widgets] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-python/pyqt-builder-1.11[${PYTHON_USEDEP}]
-	>=dev-python/sip-6.8[${PYTHON_USEDEP}]
-	>=dev-qt/qtbase-${QT_PV}
-"
-
-src_prepare() {
-	default
-
-	# hack: PyQt-builder runs qmake without our arguments and calls g++
-	# or clang++ depending on what qtbase was built with, not used for
-	# building but fails with -native-symlinks
-	mkdir "${T}"/cxx || die
-	local cxx
-	! cxx=$(type -P "${CHOST}"-g++) || ln -s -- "${cxx}" "${T}"/cxx/g++ || die
-	! cxx=$(type -P "${CHOST}"-clang++) || ln -s -- "${cxx}" "${T}"/cxx/clang++ || die
-	PATH=${T}/cxx:${PATH}
-}
-
-python_configure_all() {
-	append-cxxflags -std=c++17 # for old gcc / clang that use <17 (bug #892331)
-	append-cxxflags ${CPPFLAGS} # respect CPPFLAGS notably for DISTUTILS_EXT=1
-
-	DISTUTILS_ARGS=(
-		--jobs="$(makeopts_jobs)"
-		--qmake="$(qt6_get_bindir)"/qmake
-		--qmake-setting="$(qt6_get_qmake_args)"
-		--verbose
-
-		--enable=QtWebEngineCore
-		$(usex quick --{enable,disable}=QtWebEngineQuick)
-		$(usex widgets --{enable,disable}=QtWebEngineWidgets)
-
-		$(usev debug '--debug --qml-debug --tracing')
-	)
-}
diff --git a/dev-python/pyqt6/Manifest b/dev-python/pyqt6/Manifest
index 82776a9d9522..5184766b8d02 100644
--- a/dev-python/pyqt6/Manifest
+++ b/dev-python/pyqt6/Manifest
@@ -1,2 +1 @@
-DIST PyQt6-6.7.1.tar.gz 1051212 BLAKE2B 9c1c619b08cc14e0a92ea22812c14d5a3cb47e45eea917d50ab63918d8433d54b354f26b885f2567b9c6e2f0380e819972d055d1a1751f6646ebb5e6cf72b228 SHA512 1e0fec009e1823b06460fd96eddc00ed31388c20f6d832aa0ebaa130baf06d83514df43af7961c3cb2872570d27e539d6db7bf6143ccdfd61a19da7521be2c7e
 DIST PyQt6-6.8.0.tar.gz 1061357 BLAKE2B da944a8ec6c5632cb24d56b5a268521cbf3ae17d307ec5aba292bf5f25e33cb2e92fef28c1bcc506c4e5ea60c9e2f714bfd2a95aefe2cc40726b4ec9fccb36cb SHA512 da57be66ede5fe1355ab1fd95e436c139e0d1dffc75f23f3933c20623d62fc9b9fad573d876e90d066588d2dc2f01e83771a0f05fe3b668fbb69a889ddfbcc15
diff --git a/dev-python/pyqt6/pyqt6-6.7.1-r1.ebuild b/dev-python/pyqt6/pyqt6-6.7.1-r1.ebuild
deleted file mode 100644
index ecb861b00433..000000000000
--- a/dev-python/pyqt6/pyqt6-6.7.1-r1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=sip
-PYPI_NO_NORMALIZE=1
-PYPI_PN=PyQt6
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 flag-o-matic multiprocessing pypi qmake-utils
-
-# 'can' work with older Qt depending on features, but keeping it simple
-QT_PV=$(ver_cut 1-2):6
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-# defaults match what is provided with qtbase by default (except testlib),
-# reduces the need to set flags but does increase build time a fair amount
-IUSE="
-	bluetooth +dbus debug designer examples gles2-only +gui help
-	multimedia +network nfc opengl pdfium positioning +printsupport
-	qml quick quick3d remoteobjects serialport sensors spatialaudio
-	speech +sql +ssl svg testlib webchannel websockets +widgets +xml
-"
-# see `grep -r "%Import " sip` and `grep qmake_QT project.py`
-REQUIRED_USE="
-	designer? ( gui widgets )
-	help? ( gui widgets )
-	multimedia? ( gui network )
-	opengl? ( gui )
-	pdfium? ( gui )
-	printsupport? ( gui widgets )
-	qml? ( network )
-	quick3d? ( gui qml )
-	quick? ( gui qml )
-	remoteobjects? ( network )
-	spatialaudio? ( multimedia )
-	sql? ( widgets )
-	svg? ( gui )
-	testlib? ( gui widgets )
-	webchannel? ( network )
-	websockets? ( network )
-	widgets? ( gui )
-"
-
-# may use qt private symbols wrt qtbase's :=
-# non-trivially broken with Qt6.8 wrt upper bound, waiting for PyQt6-6.8.0
-DEPEND="
-	>=dev-qt/qtbase-${QT_PV}=[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml?]
-	<dev-qt/qtbase-6.8
-	bluetooth? ( >=dev-qt/qtconnectivity-${QT_PV}[bluetooth] )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		sys-apps/dbus
-	)
-	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
-	help? ( >=dev-qt/qttools-${QT_PV}[assistant] )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
-	nfc? ( >=dev-qt/qtconnectivity-${QT_PV}[nfc] )
-	opengl? (
-		gles2-only? ( media-libs/libglvnd )
-	)
-	pdfium? ( >=dev-qt/qtwebengine-${QT_PV}[pdfium,widgets?] )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )
-	quick? ( >=dev-qt/qtdeclarative-${QT_PV}[opengl] )
-	remoteobjects? ( >=dev-qt/qtremoteobjects-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	speech? (
-		>=dev-qt/qtdeclarative-${QT_PV}
-		>=dev-qt/qtspeech-${QT_PV}
-	)
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/pyqt6-sip-13.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pyqt-builder-1.15[${PYTHON_USEDEP}]
-	>=dev-python/sip-6.8.6[${PYTHON_USEDEP}]
-	>=dev-qt/qtbase-${QT_PV}
-	dbus? ( virtual/pkgconfig )
-"
-
-src_prepare() {
-	default
-
-	# hack: PyQt-builder runs qmake without our arguments and calls g++
-	# or clang++ depending on what qtbase was built with, not used for
-	# building but fails with -native-symlinks
-	mkdir "${T}"/cxx || die
-	local cxx
-	! cxx=$(type -P "${CHOST}"-g++) || ln -s -- "${cxx}" "${T}"/cxx/g++ || die
-	! cxx=$(type -P "${CHOST}"-clang++) || ln -s -- "${cxx}" "${T}"/cxx/clang++ || die
-	PATH=${T}/cxx:${PATH}
-}
-
-python_configure_all() {
-	append-cxxflags -std=c++17 # for old gcc / clang that use <17 (bug #892331)
-	append-cxxflags ${CPPFLAGS} # respect CPPFLAGS notably for DISTUTILS_EXT=1
-
-	pyqt_use_enable() {
-		local state=$(usex ${1} --enable= --disable=)
-		shift
-		echo ${*/#/${state}}
-	}
-
-	DISTUTILS_ARGS=(
-		--jobs="$(makeopts_jobs)"
-		--qmake="$(qt6_get_bindir)"/qmake
-		--qmake-setting="$(qt6_get_qmake_args)"
-		--verbose
-		--confirm-license
-
-		--enable=QtCore
-
-		$(pyqt_use_enable bluetooth QtBluetooth)
-		$(pyqt_use_enable dbus QtDBus)
-		$(pyqt_use_enable designer QtDesigner)
-		$(pyqt_use_enable help QtHelp)
-		$(pyqt_use_enable gui QtGui)
-		#--disable=QtLocation # force-disabled in project.py
-		$(pyqt_use_enable multimedia QtMultimedia \
-			$(usev widgets QtMultimediaWidgets))
-		$(pyqt_use_enable network QtNetwork)
-		$(pyqt_use_enable nfc QtNfc)
-		$(pyqt_use_enable opengl QtOpenGL \
-			$(usev widgets QtOpenGLWidgets))
-		$(pyqt_use_enable pdfium QtPdf \
-			$(usev widgets QtPdfWidgets))
-		$(pyqt_use_enable positioning QtPositioning)
-		$(pyqt_use_enable printsupport QtPrintSupport)
-		$(pyqt_use_enable qml QtQml)
-		$(pyqt_use_enable quick QtQuick \
-			$(usev widgets QtQuickWidgets))
-		$(pyqt_use_enable quick3d QtQuick3D)
-		$(pyqt_use_enable remoteobjects QtRemoteObjects)
-		$(pyqt_use_enable sensors QtSensors)
-		$(pyqt_use_enable serialport QtSerialPort)
-		$(pyqt_use_enable spatialaudio QtSpatialAudio)
-		$(pyqt_use_enable sql QtSql)
-		$(pyqt_use_enable svg QtSvg \
-			$(usev widgets QtSvgWidgets))
-		$(pyqt_use_enable testlib QtTest)
-		$(pyqt_use_enable speech QtTextToSpeech)
-		$(pyqt_use_enable webchannel QtWebChannel)
-		$(pyqt_use_enable websockets QtWebSockets)
-		$(pyqt_use_enable widgets QtWidgets)
-		$(pyqt_use_enable xml QtXml)
-
-		$(usev debug '--debug --qml-debug --tracing')
-
-		$(usev !dbus --no-dbus-python)
-		# note: upstream currently intentionally skips installing these two
-		# plugins when using wheels w/ pep517 so, *if* something does need
-		# them, it will need to be handled manually
-		$(usev !designer --no-designer-plugin)
-		$(usev !qml --no-qml-plugin)
-
-		$(usev !gles2-only --disabled-feature=PyQt_OpenGL_ES2)
-		$(usev !opengl --disabled-feature=PyQt_OpenGL)
-		$(usev !ssl --disabled-feature=PyQt_SSL)
-
-		# intended for Windows / Android or others
-		--disable=QAxContainer
-		--disabled-feature=PyQt_Permissions
-	)
-}
-
-python_install_all() {
-	einstalldocs
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index 135485b7b0a7..1fd2bf6e090a 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1 +1,2 @@
 DIST pyroute2-0.7.12.tar.gz 423519 BLAKE2B 75dbb9348bc6e6cf67ca6e79bd4bb0e93c77502935f9df855317cf22335c15fa0a19c40855cb4d89201f6e83fb4def9a44ade19e099c6a9c1d4233c0269224d6 SHA512 928e7f45569d43c1849d9c8d5972b38343ed8dd79137d6bfc757557d3bde23526af6baea61acc720b7e2d5d26731066b93f180138a6227b7d76d094e04111df7
+DIST pyroute2-0.8.1.tar.gz 435829 BLAKE2B 8f309f5109863a91842e53b170e03e94d6a712bd4416774aee870965ef27c7bfaa16722b2f82b74ba12c934c3923ae411ee570e7afa8139a5e63fade05204c3f SHA512 8f0843e2331bfb5601b9742fb1fbbd3e5b02575ea013ea4390b79f8988499bda200b35afec8f326b34b9d790bbe208c53ad148c11c260ef1fe9135650f746d62
diff --git a/dev-python/pyroute2/pyroute2-0.8.1.ebuild b/dev-python/pyroute2/pyroute2-0.8.1.ebuild
new file mode 100644
index 000000000000..3168053daa89
--- /dev/null
+++ b/dev-python/pyroute2/pyroute2-0.8.1.ebuild
@@ -0,0 +1,26 @@
+# 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..12} pypy3 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A pure Python netlink and Linux network configuration library"
+HOMEPAGE="
+	https://github.com/svinota/pyroute2/
+	https://pypi.org/project/pyroute2/
+"
+
+LICENSE="|| ( GPL-2+ Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+# tests need root access
+RESTRICT="test"
+
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index b3ad876e6449..52ec108e08c7 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1 +1,2 @@
 DIST pyscard-2.2.0.tar.gz 154847 BLAKE2B 4941ddb8b5ba38855eb69d61432241fc181e7fff7c181eb9d40ae03f0e4ce5818483d2ea35e25e92033f946e5f3e17aad297c02b3c90def91f79c24941bc80bf SHA512 91ceeab576345ff7f2e9d173399ab4d2ddebd26dab613fba33b7620253aea81645d6efdf0d365724a34cec8e9fd4f76cd43801d925a94e058ff797e5c0a41b73
+DIST pyscard-2.2.1.tar.gz 156518 BLAKE2B b68dace8a9b4b6cdae20b23d6e7d8838e0ad64e229d5a3a5e4a8fc5c1edeb16a6d7bd162c57cfdd7d5e5c56c0370f121a71e498e463b42b509bc97dce10ef14c SHA512 7a09211743c56473e7c1d034acf4b08402b41462da36b35fe45617511dc9bc5fa704e0d1d5102277a44c4aee216e84b019b5cff188eda255b32de0c7517c58d3
diff --git a/dev-python/pyscard/pyscard-2.2.1.ebuild b/dev-python/pyscard/pyscard-2.2.1.ebuild
new file mode 100644
index 000000000000..68e78542f37b
--- /dev/null
+++ b/dev-python/pyscard/pyscard-2.2.1.ebuild
@@ -0,0 +1,41 @@
+# 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 optfeature
+
+DESCRIPTION="Smart card support in python"
+HOMEPAGE="
+	https://pyscard.sourceforge.io/
+	https://github.com/LudovicRousseau/pyscard/
+	https://pypi.org/project/pyscard/
+"
+SRC_URI="
+	https://downloads.sourceforge.net/project/pyscard/pyscard/pyscard%20${PV}/${P}.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="
+	sys-apps/pcsc-lite
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-lang/swig
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "Gui support" dev-python/wxpython
+	optfeature "Support of remote readers with Pyro" dev-python/Pyro4
+}
diff --git a/dev-python/pyside6-tools/Manifest b/dev-python/pyside6-tools/Manifest
index c9b70110b9de..68e216d91778 100644
--- a/dev-python/pyside6-tools/Manifest
+++ b/dev-python/pyside6-tools/Manifest
@@ -1,4 +1,2 @@
 DIST pyside-pyside-setup-6.8.1.1.gh.tar.gz 18699613 BLAKE2B 2c16f305a746106edc770c267900b31fe480b167a615adc82496e0604cc618982bb787a0c173b069c258749364d7d2cac900d8d8b82244fc3b916744b7339537 SHA512 bd258be6e4c5f0b6b4bbdf8887e5f8ab16a90117deb00f9c46c4acb7f6bbcc36fb9f6b6e7c201403556e0ee269947a5f5b2611ff1b05e48f231f81b1eeac7bce
 DIST pyside-pyside-setup-6.8.1.gh.tar.gz 18700869 BLAKE2B 5924f8ffc3e5a4f15442af9191b0531ee9f509595d41ae2759b94c2a7f8d7e08f4a70f9c7fff07f11c5252afb77084dc21ca3b22762d6c8dd66f4fca5944c9f2 SHA512 941844b1f6711859add828cbefe7c39497d45f0936f970f3050631294ed3bfe88d9d7b827a81d61ba3efbbf7920daef6ea6c28fa9c78f8e672d68b8bd3fbb2ad
-DIST pyside-setup-everywhere-src-6.7.2.tar.xz 14402156 BLAKE2B 321717ba46c7ed29404ee326f852cd4032f93e23b6b32a16e4e05305ff04a00a2029ee7c1d50ad7191a836ffd9a3ae858483bac35e8254bdcaeb474e2c92df60 SHA512 4376aba85867b5a04dab9d8889f5e32cb503cb8010757c1e810e60d29755f15a002b582594d0737a4119c030b48ede26964e8b1392700a6c061d7d631cdfe73e
-DIST pyside-setup-everywhere-src-6.7.3.tar.xz 14591496 BLAKE2B dfe21f8d9af346e43720685982ee736974661059f83e7f22e59ef98d444d181a5f6235e41db4c40c83697401e45dbc4e8765e6351702d4f300d1c63e5789a4d5 SHA512 5e4292b9809df571e1aa3db7c1366973aecf5aaba6638c78d676413985a965aa23b694ba287bdc1d9b8dca59ac24b8229021db6f5a2b5818c929cbada7ef7491
diff --git a/dev-python/pyside6-tools/pyside6-tools-6.7.2.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.7.2.ebuild
deleted file mode 100644
index f4295516bbfe..000000000000
--- a/dev-python/pyside6-tools/pyside6-tools-6.7.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{10..13} )
-
-LLVM_COMPAT=( {15..18} )
-
-inherit cmake llvm-r1 python-r1
-
-MY_PN="pyside-setup-everywhere-src"
-
-DESCRIPTION="PySide development tools (pyside6-lupdate with support for Python)"
-HOMEPAGE="https://wiki.qt.io/PySide6"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
-S="${WORKDIR}/${MY_PN}-${PV}/sources/pyside-tools"
-
-LICENSE="GPL-2"
-SLOT="6/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-3)*:6"
-
-RDEPEND="${PYTHON_DEPS}
-	=dev-python/shiboken6-${QT_PV}[${PYTHON_USEDEP},${LLVM_USEDEP}]
-	=dev-python/pyside6-${QT_PV}[quick,${PYTHON_USEDEP},${LLVM_USEDEP}]
-	!dev-python/pyside6-tools:0
-"
-DEPEND="${RDEPEND}
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
-	')
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	pyside-tools_configure() {
-		local mycmakeargs=(
-			# If this is enabled cmake just makes copies of /lib64/qt6/bin/*
-			-DNO_QT_TOOLS=yes
-		)
-		cmake_src_configure
-	}
-
-	python_foreach_impl pyside-tools_configure
-}
-
-src_compile() {
-	pyside-tools_compile() {
-		cmake_src_compile
-	}
-
-	python_foreach_impl pyside-tools_compile
-}
-
-src_install() {
-	pyside-tools_install() {
-		# This replicates the contents of the PySide6 pypi wheel
-		DESTDIR="${BUILD_DIR}" cmake_build install
-		cp __init__.py "${BUILD_DIR}/usr/bin" || die
-		rm -r  "${BUILD_DIR}/usr/bin/qtpy2cpp_lib/tests" || die
-		python_moduleinto PySide6/scripts
-		python_domodule "${BUILD_DIR}/usr/bin/."
-	}
-
-	python_foreach_impl pyside-tools_install
-
-	einstalldocs
-}
diff --git a/dev-python/pyside6-tools/pyside6-tools-6.7.3.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.7.3.ebuild
deleted file mode 100644
index 41fea86aa1e7..000000000000
--- a/dev-python/pyside6-tools/pyside6-tools-6.7.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{10..13} )
-
-LLVM_COMPAT=( {15..18} )
-
-inherit cmake llvm-r1 python-r1
-
-MY_PN="pyside-setup-everywhere-src"
-
-DESCRIPTION="PySide development tools (pyside6-lupdate with support for Python)"
-HOMEPAGE="https://wiki.qt.io/PySide6"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
-S="${WORKDIR}/${MY_PN}-${PV}/sources/pyside-tools"
-
-LICENSE="GPL-2"
-SLOT="6/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-3)*:6"
-
-RDEPEND="${PYTHON_DEPS}
-	=dev-python/shiboken6-${QT_PV}[${PYTHON_USEDEP},${LLVM_USEDEP}]
-	=dev-python/pyside6-${QT_PV}[quick,${PYTHON_USEDEP},${LLVM_USEDEP}]
-	!dev-python/pyside6-tools:0
-"
-DEPEND="${RDEPEND}
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
-	')
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	pyside-tools_configure() {
-		local mycmakeargs=(
-			# If this is enabled cmake just makes copies of /lib64/qt6/bin/*
-			-DNO_QT_TOOLS=yes
-		)
-		cmake_src_configure
-	}
-
-	python_foreach_impl pyside-tools_configure
-}
-
-src_compile() {
-	pyside-tools_compile() {
-		cmake_src_compile
-	}
-
-	python_foreach_impl pyside-tools_compile
-}
-
-src_install() {
-	pyside-tools_install() {
-		# This replicates the contents of the PySide6 pypi wheel
-		DESTDIR="${BUILD_DIR}" cmake_build install
-		cp __init__.py "${BUILD_DIR}/usr/bin" || die
-		rm -r  "${BUILD_DIR}/usr/bin/qtpy2cpp_lib/tests" || die
-		python_moduleinto PySide6/scripts
-		python_domodule "${BUILD_DIR}/usr/bin/."
-	}
-
-	python_foreach_impl pyside-tools_install
-
-	einstalldocs
-}
diff --git a/dev-python/pyside6-tools/pyside6-tools-6.8.1.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.8.1.ebuild
index e0b92633b3b6..e40fed32fe2f 100644
--- a/dev-python/pyside6-tools/pyside6-tools-6.8.1.ebuild
+++ b/dev-python/pyside6-tools/pyside6-tools-6.8.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
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}/sources/pyside-tools"
 
 LICENSE="GPL-2"
 SLOT="6/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Minimal supported version of Qt.
diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest
index c9b70110b9de..68e216d91778 100644
--- a/dev-python/pyside6/Manifest
+++ b/dev-python/pyside6/Manifest
@@ -1,4 +1,2 @@
 DIST pyside-pyside-setup-6.8.1.1.gh.tar.gz 18699613 BLAKE2B 2c16f305a746106edc770c267900b31fe480b167a615adc82496e0604cc618982bb787a0c173b069c258749364d7d2cac900d8d8b82244fc3b916744b7339537 SHA512 bd258be6e4c5f0b6b4bbdf8887e5f8ab16a90117deb00f9c46c4acb7f6bbcc36fb9f6b6e7c201403556e0ee269947a5f5b2611ff1b05e48f231f81b1eeac7bce
 DIST pyside-pyside-setup-6.8.1.gh.tar.gz 18700869 BLAKE2B 5924f8ffc3e5a4f15442af9191b0531ee9f509595d41ae2759b94c2a7f8d7e08f4a70f9c7fff07f11c5252afb77084dc21ca3b22762d6c8dd66f4fca5944c9f2 SHA512 941844b1f6711859add828cbefe7c39497d45f0936f970f3050631294ed3bfe88d9d7b827a81d61ba3efbbf7920daef6ea6c28fa9c78f8e672d68b8bd3fbb2ad
-DIST pyside-setup-everywhere-src-6.7.2.tar.xz 14402156 BLAKE2B 321717ba46c7ed29404ee326f852cd4032f93e23b6b32a16e4e05305ff04a00a2029ee7c1d50ad7191a836ffd9a3ae858483bac35e8254bdcaeb474e2c92df60 SHA512 4376aba85867b5a04dab9d8889f5e32cb503cb8010757c1e810e60d29755f15a002b582594d0737a4119c030b48ede26964e8b1392700a6c061d7d631cdfe73e
-DIST pyside-setup-everywhere-src-6.7.3.tar.xz 14591496 BLAKE2B dfe21f8d9af346e43720685982ee736974661059f83e7f22e59ef98d444d181a5f6235e41db4c40c83697401e45dbc4e8765e6351702d4f300d1c63e5789a4d5 SHA512 5e4292b9809df571e1aa3db7c1366973aecf5aaba6638c78d676413985a965aa23b694ba287bdc1d9b8dca59ac24b8229021db6f5a2b5818c929cbada7ef7491
diff --git a/dev-python/pyside6/pyside6-6.7.2.ebuild b/dev-python/pyside6/pyside6-6.7.2.ebuild
deleted file mode 100644
index c432902fc246..000000000000
--- a/dev-python/pyside6/pyside6-6.7.2.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{10..13} )
-
-LLVM_COMPAT=( {15..18} )
-
-inherit cmake llvm-r1 python-r1 virtualx
-
-# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
-# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
-# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
-# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
-# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
-# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
-# that the "PySide6/QtGui/CMakeLists.txt" and
-# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
-# testing whether the "Qt5::Gui" list property defined by
-# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
-# time contains the substring "opengles2". Since cmake does not permit
-# properties to be overridden from the command line, these files must instead
-# be conditionally patched to avoid these tests. An issue should be filed with
-# upstream requesting a CLI-settable variable to control this.
-
-MY_PN="pyside-setup-everywhere-src"
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://wiki.qt.io/PySide6"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
-S="${WORKDIR}/${MY_PN}-${PV}/sources/pyside6"
-
-# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details.
-# Shall we allow essential modules to be disabled? They are:
-# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
-# x11extras (for X)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
-SLOT="6/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
-IUSE="
-	3d bluetooth charts +concurrent +dbus designer gles2-only +gui help location
-	multimedia +network network-auth nfc positioning +opengl pdfium positioning
-	+printsupport qml quick quick3d serialport scxml sensors spatialaudio speech
-	+sql svg test +testlib webchannel webengine	websockets +widgets +xml
-"
-
-# Manually reextract these requirements on version bumps by running the
-# following one-liner from within "${S}":
-#     $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt
-# Note that the "designer" USE flag corresponds to the "Qt6UiTools" module.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	3d? ( gui network )
-	charts? ( gui widgets )
-	designer? ( widgets )
-	gles2-only? ( gui )
-	gui? ( dbus opengl )
-	help? ( network sql widgets )
-	location? ( gui network positioning quick )
-	multimedia? ( gui network )
-	network-auth? ( network )
-	opengl? ( gui )
-	pdfium? ( gui )
-	printsupport? ( widgets )
-	qml? ( network )
-	quick? ( gui network opengl qml )
-	quick3d? ( gui network opengl qml quick )
-	spatialaudio? ( multimedia )
-	speech? ( multimedia )
-	sql? ( widgets )
-	svg? ( gui )
-	testlib? ( widgets )
-	webchannel? ( qml )
-	webengine? ( network gui printsupport quick webchannel )
-	websockets? ( network )
-	widgets? ( gui )
-"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-3)*:6"
-
-RDEPEND="${PYTHON_DEPS}
-	=dev-python/shiboken6-${QT_PV}[${PYTHON_USEDEP},${LLVM_USEDEP}]
-	=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]
-	3d? ( =dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] )
-	bluetooth? ( =dev-qt/qtconnectivity-${QT_PV}[bluetooth] )
-	charts? ( =dev-qt/qtcharts-${QT_PV} )
-	designer? ( =dev-qt/qttools-${QT_PV}[designer] )
-	gui? (
-		=dev-qt/qtbase-${QT_PV}[gui,jpeg(+)]
-		x11-libs/libxkbcommon
-	)
-	help? ( =dev-qt/qttools-${QT_PV}[assistant] )
-	location? ( =dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( =dev-qt/qtmultimedia-${QT_PV} )
-	network? ( =dev-qt/qtbase-${QT_PV}[ssl] )
-	network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} )
-	nfc? ( =dev-qt/qtconnectivity-${QT_PV}[nfc] )
-	pdfium? ( =dev-qt/qtwebengine-${QT_PV}[pdfium(-),widgets?] )
-	positioning? ( =dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )
-	qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	quick3d? ( =dev-qt/qtquick3d-${QT_PV} )
-	scxml? ( =dev-qt/qtscxml-${QT_PV} )
-	sensors? ( =dev-qt/qtsensors-${QT_PV}[qml?] )
-	speech? ( =dev-qt/qtspeech-${QT_PV} )
-	serialport? ( =dev-qt/qtserialport-${QT_PV} )
-	svg? ( =dev-qt/qtsvg-${QT_PV} )
-	testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )
-	webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
-	webengine? ( || (
-		=dev-qt/qtwebengine-${QT_PV}[alsa,widgets?]
-		=dev-qt/qtwebengine-${QT_PV}[pulseaudio,widgets?]
-		)
-	)
-	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
-	!dev-python/pyside6:0
-"
-DEPEND="${RDEPEND}
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
-	')
-	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
-"
-# testlib is toggled by the gui flag on qtbase
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.3.1-no-strip.patch"
-	# References files not present in our dev-qt/qtbase
-	"${FILESDIR}/${PN}-6.6.0-no-qtexampleicons.patch"
-)
-
-src_configure() {
-	# See collect_module_if_found macros in PySideHelpers.cmake
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=$(usex !3d)
-		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=$(usex !bluetooth)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=$(usex !charts)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6HttpServer=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=$(usex !location)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=$(usex !network-auth)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=$(usex !nfc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Pdf=$(usex !pdfium)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=$(usex !pdfium yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=$(usex !scxml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=$(usex !sensors)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SpatialAudio=$(usex !spatialaudio)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=$(usex !speech)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets)
-		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml)
-		# try to avoid pre-stripping
-		-DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes
-		-DQFP_NO_STRIP=yes
-
-	)
-
-	pyside6_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
-			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
-		)
-		cmake_src_configure
-	}
-	python_foreach_impl pyside6_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE
-	python_foreach_impl virtx cmake_src_test
-}
-
-src_install() {
-	pyside6_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig
-		# file for the current Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \
-			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
-
-		# Uniquify the PySide6 pkgconfig file for the current Python target,
-		# preserving an unversioned "pyside6.pc" file arbitrarily associated
-		# with the last Python target. (See the previously linked issue.)
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl pyside6_install
-
-	# CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., pyside6-tools) to target one
-	# "libpyside6-*.so" library linked to one Python interpreter. See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)/cmake/PySide6/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die
-}
diff --git a/dev-python/pyside6/pyside6-6.7.3.ebuild b/dev-python/pyside6/pyside6-6.7.3.ebuild
deleted file mode 100644
index 78f2ebf2ba25..000000000000
--- a/dev-python/pyside6/pyside6-6.7.3.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{10..13} )
-
-LLVM_COMPAT=( {15..18} )
-
-inherit cmake llvm-r1 python-r1 virtualx
-
-# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
-# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
-# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
-# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
-# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
-# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
-# that the "PySide6/QtGui/CMakeLists.txt" and
-# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
-# testing whether the "Qt5::Gui" list property defined by
-# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
-# time contains the substring "opengles2". Since cmake does not permit
-# properties to be overridden from the command line, these files must instead
-# be conditionally patched to avoid these tests. An issue should be filed with
-# upstream requesting a CLI-settable variable to control this.
-
-MY_PN="pyside-setup-everywhere-src"
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://wiki.qt.io/PySide6"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
-S="${WORKDIR}/${MY_PN}-${PV}/sources/pyside6"
-
-# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details.
-# Shall we allow essential modules to be disabled? They are:
-# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
-# x11extras (for X)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
-SLOT="6/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="
-	3d bluetooth charts +concurrent +dbus designer gles2-only +gui help location
-	multimedia +network network-auth nfc positioning +opengl pdfium positioning
-	+printsupport qml quick quick3d serialport scxml sensors spatialaudio speech
-	+sql svg test +testlib webchannel webengine	websockets +widgets +xml
-"
-
-# Manually reextract these requirements on version bumps by running the
-# following one-liner from within "${S}":
-#     $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt
-# Note that the "designer" USE flag corresponds to the "Qt6UiTools" module.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	3d? ( gui network )
-	charts? ( gui widgets )
-	designer? ( widgets )
-	gles2-only? ( gui )
-	gui? ( dbus opengl )
-	help? ( network sql widgets )
-	location? ( gui network positioning quick )
-	multimedia? ( gui network )
-	network-auth? ( network )
-	opengl? ( gui )
-	pdfium? ( gui )
-	printsupport? ( widgets )
-	qml? ( network )
-	quick? ( gui network opengl qml )
-	quick3d? ( gui network opengl qml quick )
-	spatialaudio? ( multimedia )
-	speech? ( multimedia )
-	sql? ( widgets )
-	svg? ( gui )
-	testlib? ( widgets )
-	webchannel? ( qml )
-	webengine? ( network gui printsupport quick webchannel )
-	websockets? ( network )
-	widgets? ( gui )
-"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-3)*:6"
-
-RDEPEND="${PYTHON_DEPS}
-	=dev-python/shiboken6-${QT_PV}[${PYTHON_USEDEP},${LLVM_USEDEP}]
-	=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]
-	3d? ( =dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] )
-	bluetooth? ( =dev-qt/qtconnectivity-${QT_PV}[bluetooth] )
-	charts? ( =dev-qt/qtcharts-${QT_PV} )
-	designer? ( =dev-qt/qttools-${QT_PV}[designer] )
-	gui? (
-		=dev-qt/qtbase-${QT_PV}[gui,jpeg(+)]
-		x11-libs/libxkbcommon
-	)
-	help? ( =dev-qt/qttools-${QT_PV}[assistant] )
-	location? ( =dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( =dev-qt/qtmultimedia-${QT_PV} )
-	network? ( =dev-qt/qtbase-${QT_PV}[ssl] )
-	network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} )
-	nfc? ( =dev-qt/qtconnectivity-${QT_PV}[nfc] )
-	pdfium? ( =dev-qt/qtwebengine-${QT_PV}[pdfium(-),widgets?] )
-	positioning? ( =dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )
-	qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	quick3d? ( =dev-qt/qtquick3d-${QT_PV} )
-	scxml? ( =dev-qt/qtscxml-${QT_PV} )
-	sensors? ( =dev-qt/qtsensors-${QT_PV}[qml?] )
-	speech? ( =dev-qt/qtspeech-${QT_PV} )
-	serialport? ( =dev-qt/qtserialport-${QT_PV} )
-	svg? ( =dev-qt/qtsvg-${QT_PV} )
-	testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )
-	webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
-	webengine? ( || (
-		=dev-qt/qtwebengine-${QT_PV}[alsa,widgets?]
-		=dev-qt/qtwebengine-${QT_PV}[pulseaudio,widgets?]
-		)
-	)
-	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
-	!dev-python/pyside6:0
-"
-DEPEND="${RDEPEND}
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
-	')
-	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
-"
-# testlib is toggled by the gui flag on qtbase
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.3.1-no-strip.patch"
-	# References files not present in our dev-qt/qtbase
-	"${FILESDIR}/${PN}-6.6.0-no-qtexampleicons.patch"
-)
-
-src_configure() {
-	# See collect_module_if_found macros in PySideHelpers.cmake
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=$(usex !3d)
-		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=$(usex !bluetooth)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=$(usex !charts)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6HttpServer=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=$(usex !location)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=$(usex !network-auth)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=$(usex !nfc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Pdf=$(usex !pdfium)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=$(usex !pdfium yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=$(usex !scxml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=$(usex !sensors)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SpatialAudio=$(usex !spatialaudio)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=$(usex !speech)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets)
-		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml)
-		# try to avoid pre-stripping
-		-DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes
-		-DQFP_NO_STRIP=yes
-
-	)
-
-	pyside6_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
-			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
-		)
-		cmake_src_configure
-	}
-	python_foreach_impl pyside6_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE
-	python_foreach_impl virtx cmake_src_test
-}
-
-src_install() {
-	pyside6_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig
-		# file for the current Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \
-			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
-
-		# Uniquify the PySide6 pkgconfig file for the current Python target,
-		# preserving an unversioned "pyside6.pc" file arbitrarily associated
-		# with the last Python target. (See the previously linked issue.)
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl pyside6_install
-
-	# CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., pyside6-tools) to target one
-	# "libpyside6-*.so" library linked to one Python interpreter. See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)/cmake/PySide6/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die
-}
diff --git a/dev-python/pyside6/pyside6-6.8.1.1.ebuild b/dev-python/pyside6/pyside6-6.8.1.1.ebuild
index b9575fe5dcff..63048b26324f 100644
--- a/dev-python/pyside6/pyside6-6.8.1.1.ebuild
+++ b/dev-python/pyside6/pyside6-6.8.1.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
@@ -38,7 +38,7 @@ S="${WORKDIR}/${MY_P}/sources/pyside6"
 # x11extras (for X)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="6/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="
 	3d bluetooth charts +concurrent +dbus designer gles2-only +gui help
 	httpserver location multimedia +network network-auth nfc positioning +opengl
diff --git a/dev-python/pyside6/pyside6-6.8.1.ebuild b/dev-python/pyside6/pyside6-6.8.1.ebuild
index 564a3d5b8721..f6f18aa25ee5 100644
--- a/dev-python/pyside6/pyside6-6.8.1.ebuild
+++ b/dev-python/pyside6/pyside6-6.8.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
@@ -38,7 +38,7 @@ S="${WORKDIR}/${MY_P}/sources/pyside6"
 # x11extras (for X)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="6/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 IUSE="
 	3d bluetooth charts +concurrent +dbus designer gles2-only +gui help
 	httpserver location multimedia +network network-auth nfc positioning +opengl
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index 134016605f6b..225f8b036a59 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1 +1,2 @@
 DIST pysnmp-7.1.15.tar.gz 380504 BLAKE2B a0bc0d321c88fd3ab45b32be590172d67d721dacbd10effa4e535db907cd39ca191413007b2c1ff2f42553049b4ca4472abdde72bef541685edad474597e8e31 SHA512 8e24d5e7563c6299dbeaeb066a4045c44f860ed8fb9565bf621b3d6c99301c8a6f6e8661ecbb3285b4032b415bec3cbbe4969b856a22fad932ce5371fc019144
+DIST pysnmp-7.1.16.tar.gz 379606 BLAKE2B 7ba59e52b7d27ef9400e1ec4c2aee395f86873b03b9bbb3a313e23c3af69965b245e2f3d5c4c3cdc98ee257aa4bc41c213b9d0237e9d5bc960dda2a4606c57ff SHA512 ee6a86dbf104f510eb698cc705d24f2c67efcede0b4605f7ba0aa5f3b1ebdec50608eb1144a16e6418213f824f996a7185c1452fd144d5a0df1a4f2650dbf3a4
diff --git a/dev-python/pysnmp/pysnmp-7.1.16.ebuild b/dev-python/pysnmp/pysnmp-7.1.16.ebuild
new file mode 100644
index 000000000000..19ed4eb3da9d
--- /dev/null
+++ b/dev-python/pysnmp/pysnmp-7.1.16.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python SNMP library"
+HOMEPAGE="
+	https://pypi.org/project/pysnmp/
+	https://github.com/lextudio/pysnmp/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/cryptography-43.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.4.8[${PYTHON_USEDEP}]
+	>=dev-python/pysmi-1.5.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+# TODO
+# distutils_enable_sphinx docs/source dev-python/furo dev-python/sphinx-copybutton dev-python/sphinx-sitemap
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/smi/manager/test_mib-tree-inspection.py::test_getNodeName_by_symbol_description_with_module_name_2
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	mibdump CISCO-ENHANCED-IPSEC-FLOW-MIB.py || die
+	mibdump LEXTUDIO-TEST-MIB || die
+	mibdump NET-SNMP-EXAMPLES-MIB || die
+	mibdump IF-MIB || die
+	epytest -p asyncio
+}
diff --git a/dev-python/pysubs2/Manifest b/dev-python/pysubs2/Manifest
index be277dc5f52d..768ae8021ac1 100644
--- a/dev-python/pysubs2/Manifest
+++ b/dev-python/pysubs2/Manifest
@@ -1,2 +1 @@
-DIST pysubs2-1.7.3.tar.gz 1123849 BLAKE2B fd630ca7e4bf2d84d65a2ed2f143c6c1cc333ae6994f7c89a86db2f92c5736e70e488115ccd17cea84dedaa057b8d808bf2fcfdedbb3de0781341ac632a12235 SHA512 5ba9675121490628b0df86e0fd46f67c783d7494e59d37e52be49593b292104756d03368cea19d238c503ee8c05ccf5c257723dd5f570af0bcae5cd53243f62a
 DIST pysubs2-1.8.0.tar.gz 1130048 BLAKE2B 9e2819611e91662fdb2c5e6fff8d0558d552caed059254ad05f7122d0e7ccb1df7476148d426d1b8dd6a173822ac71003cf89b4a3e094066d049a8615324d2d4 SHA512 4572b83109b8095897296b303e4462116023281d4874d2be5c41a6ef030a0fd33cedadbf0da51b94e0e27f6f19f4d9cb24e127715794e86f8df9d46400fd87c1
diff --git a/dev-python/pysubs2/pysubs2-1.7.3.ebuild b/dev-python/pysubs2/pysubs2-1.7.3.ebuild
deleted file mode 100644
index 7ddb7e4dcc43..000000000000
--- a/dev-python/pysubs2/pysubs2-1.7.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python library for editing subtitle files"
-HOMEPAGE="
-	https://github.com/tkarabela/pysubs2
-	https://pypi.org/project/pysubs2/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pysubs2/pysubs2-1.8.0.ebuild b/dev-python/pysubs2/pysubs2-1.8.0.ebuild
index 7e320c75c063..26de229aba82 100644
--- a/dev-python/pysubs2/pysubs2-1.8.0.ebuild
+++ b/dev-python/pysubs2/pysubs2-1.8.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
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 533906b2354c..df811f97bb91 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,2 +1,2 @@
-DIST pytest_asyncio-0.25.0.tar.gz 53298 BLAKE2B e29641f9e0ae24aac80bca7eaa14258d0bdfa6080abeaedd38ffe121cb9a9bf5886da2a38a3033010fcb47f4c2aee0eb17b0f63cee020c5ae81e8334486c66b7 SHA512 162d1693c82c4be96cf20cfeb075c4e434e897cdfc172564b8b2513b362a6bbf54d8be6da4a63a7de34236b6c55eb515e60b994198c07a5c63a63333fe019932
 DIST pytest_asyncio-0.25.1.tar.gz 53760 BLAKE2B e7e30691734c0c0c0783f152531b6e3e7455098b577a0ae87d560959e5fbd7a3a04148b85b13543a69763022b49d5d946af089a2ad0cedae5d9f3470643c1e6e SHA512 8a6ce121dfce4362a9b9dd320ee8207129a5f9d667e80fc8d6b9a43095883cfbbb59813e2fafc5deae062c596b2a9af76b80b18fabcc003fbecf9a0fc8b09e01
+DIST pytest_asyncio-0.25.2.tar.gz 53950 BLAKE2B 950cbaa50e2bb8a66cd2396e7e6b5c0c97e2cd0272381b0de23f3668dea2f663f9eaf0c92ec91c474cd1dc44f3aeae77dac1e347ee86cefb518850d9985d2e7a SHA512 d19e2de9ae27cfedc06580ffea21b8894054c35e62601a01487d485ece906f765640dcd9fb633059925701f082644c424b7b532a91e978b8c099192e9a324f6e
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.25.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.25.0.ebuild
deleted file mode 100644
index 67c1aeb1f2de..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.25.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Library for testing asyncio code with pytest"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-asyncio/
-	https://pypi.org/project/pytest-asyncio/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-5.7.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on precise warning counts
-		tests/hypothesis/test_base.py::test_can_use_explicit_event_loop_fixture
-		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_fixture_leaves_loop_unclosed
-		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_test_leaves_loop_unclosed
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_asyncio.plugin,_hypothesis_pytestplugin
-	epytest
-}
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.25.1.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.25.1.ebuild
index ea77c34a602f..fa7f62f71940 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.25.1.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.25.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pytest-8.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.25.2.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.25.2.ebuild
new file mode 100644
index 000000000000..cbc3a46751b2
--- /dev/null
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.25.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Library for testing asyncio code with pytest"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-asyncio/
+	https://pypi.org/project/pytest-asyncio/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/pytest-8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-5.7.1[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on precise warning counts
+		tests/hypothesis/test_base.py::test_can_use_explicit_event_loop_fixture
+		tests/test_event_loop_fixture.py::test_event_loop_fixture_handles_unclosed_async_gen
+		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_fixture_leaves_loop_unclosed
+		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_test_leaves_loop_unclosed
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_asyncio.plugin,_hypothesis_pytestplugin
+	epytest
+}
diff --git a/dev-python/pytest-bdd/Manifest b/dev-python/pytest-bdd/Manifest
index 720e1d846267..ed6d832096fb 100644
--- a/dev-python/pytest-bdd/Manifest
+++ b/dev-python/pytest-bdd/Manifest
@@ -1,2 +1 @@
-DIST pytest-bdd-7.3.0.gh.tar.gz 81595 BLAKE2B 80c5323ba3c50fae17bb57ec26b968ca7d7b673d2aeb2716dee02e3543916ca8b5752d9af56d3d250f3a4b0a857a3dc760de615f0650eaf379380fb24a5b7c2a SHA512 e7c309552714a77d47e437a825e661dbf201a6945e84f4b611b5c3da3d0b4ceb535bde4809fc9633b82a74e2b52cc69c7e14b27a27032c7e4400727498442e29
 DIST pytest-bdd-8.1.0.gh.tar.gz 116529 BLAKE2B b282f42dbde9394f37e41682d44352d5895a30e2b88c20c46f8d9344f8069e25e2a7a2b6225ebd34a43b60d2392c7bc515f2ebd94bb26a0d350b7d188dd4d77e SHA512 6b03a509a8026ac242a4446caffc019b264f3528322eab8aa0ca2ce4c099bbc45640d63087a756d0d1d0daacdd2f396f121823ca500cef38391e9313a0f898ab
diff --git a/dev-python/pytest-bdd/pytest-bdd-7.3.0.ebuild b/dev-python/pytest-bdd/pytest-bdd-7.3.0.ebuild
deleted file mode 100644
index 8123e325faa8..000000000000
--- a/dev-python/pytest-bdd/pytest-bdd-7.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..13} )
-inherit distutils-r1
-
-DESCRIPTION="BDD library for the pytest runner"
-HOMEPAGE="https://pytest-bdd.readthedocs.io/"
-SRC_URI="
-	https://github.com/pytest-dev/pytest-bdd/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-
-RDEPEND="
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	dev-python/parse-type[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-DOCS=( AUTHORS.rst CHANGES.rst README.rst )
-
-src_test() {
-	# terminal_reporter test needs exact wrapping
-	local -x COLUMNS=80
-
-	# hooks output parsing may be affected by other pytest-*, e.g. tornasync
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_bdd.plugin
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/pytest-flask/metadata.xml b/dev-python/pytest-flask/metadata.xml
index ec950627c5ed..63f26c181102 100644
--- a/dev-python/pytest-flask/metadata.xml
+++ b/dev-python/pytest-flask/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>arsen@gentoo.org</email>
-		<description>Arsen Arsenović</description>
+		<name>Arsen Arsenović</name>
 	</maintainer>
 	<maintainer type="person" proxied="yes">
 		<email>davidroman96@gmail.com</email>
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index 1d4952703de8..cf272698ef28 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,2 +1 @@
-DIST pytest_httpx-0.34.0.tar.gz 54108 BLAKE2B b2c761a993d5c15aa28ee4d2b29ed44764c9825a3b9a9a471eef534a4f040324d6c822bfd413090d86428591be60d9092541a77188d8ef84bd3e333a976647da SHA512 49ca01ddd16fb68213ec2178111c65fb3f47be6416b67ebe356a47f658140ee42e275e07e377c6740956d895a4b1a719c2cf12ad9cbabc339b20cca94b892ef0
 DIST pytest_httpx-0.35.0.tar.gz 54146 BLAKE2B 1d0814478c3ef26720b42c0bf0fd0a2b42c57eda887b99ba8b09acd6d12a8af04dc3821645130e786558f2f0d42625e0f9145231a86f9ecd0e508fb9a5247a90 SHA512 70ecfc7778aa4eb617e4685851dacec563e507d5f2aa571cd5acae7ac9f1667d7c67ce40144fa5e2649993c0e0aaa11650ea32f2dfe74652ecb115291a4c77ff
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.34.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.34.0.ebuild
deleted file mode 100644
index ef89e388d43d..000000000000
--- a/dev-python/pytest-httpx/pytest-httpx-0.34.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Send responses to HTTPX using pytest"
-HOMEPAGE="
-	https://colin-b.github.io/pytest_httpx/
-	https://github.com/Colin-b/pytest_httpx/
-	https://pypi.org/project/pytest-httpx/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	=dev-python/httpx-0.27*[${PYTHON_USEDEP}]
-	=dev-python/pytest-8*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.35.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.35.0.ebuild
index 59866749864f..1b431641001e 100644
--- a/dev-python/pytest-httpx/pytest-httpx-0.35.0.ebuild
+++ b/dev-python/pytest-httpx/pytest-httpx-0.35.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	=dev-python/httpx-0.28*[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index 5cdc35a5f4f9..f9b834b83b95 100644
--- a/dev-python/pytest-regressions/Manifest
+++ b/dev-python/pytest-regressions/Manifest
@@ -1,2 +1,2 @@
-DIST pytest-regressions-2.5.0.tar.gz 113615 BLAKE2B 3364893a9cd96a44611d023c08fe5e319ceaad5a6a9b210b72095a560c42742c871406de1290821ea5cd61960bf5bef72d08bd143db93b20f288d5367cf1ae70 SHA512 2d23568b8d5dbc86000c9b552c72a1e269fafe79e0b829f799fe31ecc142e74d233c69940a51d2da457c6f7b3713fcd788461b0420eca9d56cc395568c517c0f
 DIST pytest_regressions-2.6.0.tar.gz 116150 BLAKE2B c6a5cfec055ef5a2ed0e615aff5211083633a542d08f48af6fdfd453c9a9c2992bb47e0d8a634ded1d1a753ae362dcf3a84db26f07a3d169635b286ea6af8760 SHA512 57248a851179c0f0cb840618cc529289b80d94a537b9e49f4a322405c92f8fd0baadb67472a577fe5fad2d3c22e44339663e86b1005cc831bb26e4b380d51fb1
+DIST pytest_regressions-2.7.0.tar.gz 116270 BLAKE2B 90d589081db352e2acbb58b8b56445ba86c92e4eec1ac588b573b27e979a9d5cbd942b8ba8cf978c9c372364176517e76376c3b33775297df5300fe2ce225bc9 SHA512 b4702850470d03e3f1759b7abda003ff930cfffa9e70c95097778fd4efa634ee62e955f2abbec5e0eaac840c0918b7257b747509c8bf3819af0234a15f80fecd
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.5.0.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.5.0.ebuild
deleted file mode 100644
index 47de12a93f4e..000000000000
--- a/dev-python/pytest-regressions/pytest-regressions-2.5.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Easy to use fixtures to write regression tests"
-HOMEPAGE="
-	https://github.com/ESSS/pytest-regressions/
-	https://pypi.org/project/pytest-regressions/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pytest-datadir[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/sphinx-rtd-theme
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	local EPYTEST_IGNORE=()
-	if ! has_version "dev-python/matplotlib[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_image_regression.py::test_image_regression
-		)
-	fi
-	if ! has_version "dev-python/numpy[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/test_ndarrays_regression.py
-		)
-	fi
-	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_filenames.py::test_foo
-			tests/test_filenames.py::TestClass::test_foo
-			tests/test_filenames.py::TestClassWithIgnoredName::test_foo
-		)
-		EPYTEST_IGNORE+=(
-			tests/test_dataframe_regression.py
-			tests/test_num_regression.py
-		)
-	fi
-	if ! has_version "dev-python/pillow[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_image_regression.py
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.6.0.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.6.0.ebuild
index 78519bbe3a8a..61a43e63931b 100644
--- a/dev-python/pytest-regressions/pytest-regressions-2.6.0.ebuild
+++ b/dev-python/pytest-regressions/pytest-regressions-2.6.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.7.0.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.7.0.ebuild
new file mode 100644
index 000000000000..4df817581afd
--- /dev/null
+++ b/dev-python/pytest-regressions/pytest-regressions-2.7.0.ebuild
@@ -0,0 +1,61 @@
+# 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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Easy to use fixtures to write regression tests"
+HOMEPAGE="
+	https://github.com/ESSS/pytest-regressions/
+	https://pypi.org/project/pytest-regressions/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/pytest-datadir[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx-rtd-theme
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	local EPYTEST_IGNORE=()
+	if ! has_version "dev-python/matplotlib[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_image_regression.py::test_image_regression
+		)
+	fi
+	if ! has_version "dev-python/numpy[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/test_ndarrays_regression.py
+		)
+	fi
+	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_filenames.py::test_foo
+			tests/test_filenames.py::TestClass::test_foo
+			tests/test_filenames.py::TestClassWithIgnoredName::test_foo
+		)
+		EPYTEST_IGNORE+=(
+			tests/test_dataframe_regression.py
+			tests/test_num_regression.py
+		)
+	fi
+	if ! has_version "dev-python/pillow[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_image_regression.py
+		)
+	fi
+
+	epytest
+}
diff --git a/dev-python/pytest-reserial/Manifest b/dev-python/pytest-reserial/Manifest
index f094b0e06c63..996798024f0d 100644
--- a/dev-python/pytest-reserial/Manifest
+++ b/dev-python/pytest-reserial/Manifest
@@ -1,2 +1 @@
-DIST pytest_reserial-0.4.2.tar.gz 12374 BLAKE2B 4f0d89bef2f4f99f2a9d9ef1ac5c46e31817ed4c91b78bd41f2670a89dd87dd642a1c80f0574957c24467cb77cebb9f0de27e540b47e0f70933cd6cf4a933ac7 SHA512 e3b9a82feee58c6808bb0491bf6c92f6ee0e1f83b3fafb676a4eac4ed03c90e29ead8d93ed275a83a7f2de3148aa55ba27f6dc6266c2e308e7085794d88a0ffa
 DIST pytest_reserial-0.4.3.tar.gz 12625 BLAKE2B 09f3ee9706f06923d8edd53d19c956046f075b90675642c692c51dc65f66429413d756a902396f147f27cc547dc3487641645dedae6c6900f96b1c2c66dca33a SHA512 282a9edd457b6bc622aaa66ee7715671eeb945e8dab72c3c7898d7850fb6d151ebfbcddefaad25c1b3f10c13c52b6bc8438975484f1fecd87b5c224f431dba59
diff --git a/dev-python/pytest-reserial/pytest-reserial-0.4.2.ebuild b/dev-python/pytest-reserial/pytest-reserial-0.4.2.ebuild
deleted file mode 100644
index 74a38cc5b887..000000000000
--- a/dev-python/pytest-reserial/pytest-reserial-0.4.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pytest plugin for recording and replaying serial port traffic during tests"
-HOMEPAGE="
-	https://pypi.org/project/pytest-reserial/
-	https://github.com/bessman/pytest-reserial/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-reserial/pytest-reserial-0.4.3.ebuild b/dev-python/pytest-reserial/pytest-reserial-0.4.3.ebuild
index d7bd5483c32e..eb3414937308 100644
--- a/dev-python/pytest-reserial/pytest-reserial-0.4.3.ebuild
+++ b/dev-python/pytest-reserial/pytest-reserial-0.4.3.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-python/pyserial[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-services/pytest-services-2.2.1-r1.ebuild b/dev-python/pytest-services/pytest-services-2.2.1-r1.ebuild
index 2d147d758b7e..387931d140f7 100644
--- a/dev-python/pytest-services/pytest-services-2.2.1-r1.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.2.1-r1.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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-subprocess/Manifest b/dev-python/pytest-subprocess/Manifest
index fdac6d1036de..3e6c581779b9 100644
--- a/dev-python/pytest-subprocess/Manifest
+++ b/dev-python/pytest-subprocess/Manifest
@@ -1 +1,2 @@
 DIST pytest-subprocess-1.5.2.gh.tar.gz 35438 BLAKE2B bbc92d99dfdd094e8295df37dd3fb66a022ebd4d711bb3f80408d21c8dbe3304bdafd8e7b0fcba15c681b8598bb55f92e0e91e9bd837ca165e94b791ef02c4e3 SHA512 56bf95ee085e74df1b9691d23a1e766de304896a74fb319df22dbb3faa6e4959fe9b7e790cd65a55c816fb39f3ae8db68bd501aeaade0db498a7273cd7267e45
+DIST pytest-subprocess-1.5.3.gh.tar.gz 36830 BLAKE2B 5bd696971ebf97722e0d5712ec57e8642e32187d22b91630c38f0945fc2b1ae35697c22efa4a8104406306482a2231dbe063c4607ed4c616cc3a564bb4b141fd SHA512 639195fdc77ed27efcc7fd7557cadd4f631b81de640754a4b4bcfbc0a9cc6f13efa3b4c38a59a49b594b9cc84baf1cfa97cf1a19e9be7ab7888854cf0057d355
diff --git a/dev-python/pytest-subprocess/pytest-subprocess-1.5.3.ebuild b/dev-python/pytest-subprocess/pytest-subprocess-1.5.3.ebuild
new file mode 100644
index 000000000000..eb021c3db5f3
--- /dev/null
+++ b/dev-python/pytest-subprocess/pytest-subprocess-1.5.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2023-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
+
+DESCRIPTION="A plugin to fake subprocess for pytest"
+HOMEPAGE="
+	https://github.com/aklajnert/pytest-subprocess/
+	https://pypi.org/project/pytest-subprocess/
+"
+SRC_URI="
+	https://github.com/aklajnert/pytest-subprocess/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/anyio[${PYTHON_USEDEP}]
+		>=dev-python/docutils-0.12[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-asyncio-0.15.1[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_subprocess.fixtures,pytest_asyncio.plugin
+	epytest -p rerunfailures
+}
diff --git a/dev-python/python-box/Manifest b/dev-python/python-box/Manifest
index 64bfd306d489..7c1c3ccbd5a7 100644
--- a/dev-python/python-box/Manifest
+++ b/dev-python/python-box/Manifest
@@ -1 +1,3 @@
 DIST Box-7.3.0.gh.tar.gz 87791 BLAKE2B eba82f4fa083f2f7725547254143d86d034d1dbf0ad540eb4cef8eb387846053a44a7b7dc6b94878a124f98336cade4c6a64c89beb779e5db6008393b721ecc9 SHA512 9425dc339abac6649f9e78b279720ce191559e1629eb4451fc1a63495df1d5c64bf20a339407bbfc6f8e64d9def4accf312087958880a5300c83369ee9d6ceb4
+DIST Box-7.3.1.gh.tar.gz 88055 BLAKE2B a222af827b9774d482b335ec4854429ace81144d11622dcc55cbd648e6c550d086fc6dbcba885a882a56cc9d4d43808b0bdc65ebd641984f109b797172426c78 SHA512 cf6ddc38fad160ee651f19da5d1b24ce7e396590de490aa0874de139888128a1c673228acbe5a3a1b68deeabbe372c3be20f5b2bfc1c576bf1f827d8a042707d
+DIST Box-7.3.2.gh.tar.gz 88125 BLAKE2B c5f1fb1aa0ebad873869e401ebf74ba9dd99dde79585248f2f91c11d0f8bbf673447b2a521e209452c706e7d3fc8eee0b1e80e37f48ca5d9f7742fb9edadee5d SHA512 82baa150fbc7fbc4659b4395f6329daffc1fcfbf773112c05ba114316468e46fb0757f607a15c69ad94c5d9e0dfcfa6fed294debb70fd93063458345e7f295e4
diff --git a/dev-python/python-box/python-box-7.3.1.ebuild b/dev-python/python-box/python-box-7.3.1.ebuild
new file mode 100644
index 000000000000..fd6da46c3478
--- /dev/null
+++ b/dev-python/python-box/python-box-7.3.1.ebuild
@@ -0,0 +1,58 @@
+# 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
+
+MY_P=Box-${PV}
+DESCRIPTION="Python dictionaries with advanced dot notation access"
+HOMEPAGE="
+	https://github.com/cdgriffith/Box/
+	https://pypi.org/project/python-box/
+"
+SRC_URI="
+	https://github.com/cdgriffith/Box/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+native-extensions"
+
+RDEPEND="
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	dev-python/tomli-w[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	native-extensions? (
+		dev-python/cython[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	if ! use native-extensions; then
+		# a cheap hack, extensions are auto-disabled if Cython.Build
+		# is not importable
+		> Cython.py || die
+	fi
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	rm -rf box || die
+	epytest
+}
diff --git a/dev-python/python-box/python-box-7.3.2.ebuild b/dev-python/python-box/python-box-7.3.2.ebuild
new file mode 100644
index 000000000000..fd6da46c3478
--- /dev/null
+++ b/dev-python/python-box/python-box-7.3.2.ebuild
@@ -0,0 +1,58 @@
+# 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
+
+MY_P=Box-${PV}
+DESCRIPTION="Python dictionaries with advanced dot notation access"
+HOMEPAGE="
+	https://github.com/cdgriffith/Box/
+	https://pypi.org/project/python-box/
+"
+SRC_URI="
+	https://github.com/cdgriffith/Box/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+native-extensions"
+
+RDEPEND="
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	dev-python/tomli-w[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	native-extensions? (
+		dev-python/cython[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	if ! use native-extensions; then
+		# a cheap hack, extensions are auto-disabled if Cython.Build
+		# is not importable
+		> Cython.py || die
+	fi
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	rm -rf box || die
+	epytest
+}
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index ee37365d25df..f97fdc1f7d38 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1,3 +1 @@
-DIST python-dbusmock-0.33.0.tar.gz 105903 BLAKE2B 5a101e64d5eff70e7a32d21080cd0051fd5617c8d057fe1cbe465903eda419fab9d0e720b0c72bac2c856d9a1371493c9b01d07ec144c2a847b6c44b65f6dd3c SHA512 419f09a5bfeab4e914c809546f3dc3bd294844116f7f0cd4a6a0b4121493c64fe6587647866323f74ed2818d1d6b45d417e384ea54c6d1244233b2a7b0d8d97d
-DIST python_dbusmock-0.34.1.tar.gz 111561 BLAKE2B 933b09ea2a679831894432bcd2e74804c3b8e7023d924512eccfdab40165f99736f85a27dd98accc2d97e36e546729fff4954eb913f7d3f5293aa50ba9326620 SHA512 093b5dec4b6f9d70b480046320211beca02e83cd0bc077448bb5329d888634805e4e6dfac9d1665b4c1ee5a15c1cec613a530443954cb4676b7a025c52bf457f
 DIST python_dbusmock-0.34.2.tar.gz 111535 BLAKE2B 8f3f125bcfbf0d1674e0dea3d87d6f776e85fb818c5fd3f814ca139f4f6936e06eabe7c60c467114918609e1897b0c770a5765eb356fc1843eb781e264fd93ac SHA512 3a4a46afa0ca54004a6891c639c0e1bfd879e575189bdd1bbe031f12333d2358af77456e8b6cb32681010b7c19fb8171f819f67ec8960494408100118b19881d
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.33.0.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.33.0.ebuild
deleted file mode 100644
index 1b12f148b5bb..000000000000
--- a/dev-python/python-dbusmock/python-dbusmock-0.33.0.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="
-	https://github.com/martinpitt/python-dbusmock/
-	https://pypi.org/project/python-dbusmock/
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		sys-power/upower
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# linter tests, fragile to newer linter versions
-	tests/test_code.py
-)
-
-src_prepare() {
-	# dev-python/dbus-python uses autotools, so no .dist-info there
-	sed -i '/dbus-python/d' pyproject.toml setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# tests are fragile to long socket paths
-	local -x TMPDIR=/tmp
-	# Tests break if XDG_DATA_DIRS is modified by flatpak install
-	unset XDG_DATA_DIRS
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.34.1.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.34.1.ebuild
deleted file mode 100644
index c61d864e5070..000000000000
--- a/dev-python/python-dbusmock/python-dbusmock-0.34.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="
-	https://github.com/martinpitt/python-dbusmock/
-	https://pypi.org/project/python-dbusmock/
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		sys-power/upower
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# linter tests, fragile to newer linter versions
-	tests/test_code.py
-)
-
-src_prepare() {
-	# dev-python/dbus-python uses autotools, so no .dist-info there
-	sed -i '/dbus-python/d' pyproject.toml setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# tests are fragile to long socket paths
-	local -x TMPDIR=/tmp
-	# Tests break if XDG_DATA_DIRS is modified by flatpak install
-	unset XDG_DATA_DIRS
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.34.2.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.34.2.ebuild
index c61d864e5070..aa3afc2399e4 100644
--- a/dev-python/python-dbusmock/python-dbusmock-0.34.2.ebuild
+++ b/dev-python/python-dbusmock/python-dbusmock-0.34.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index 52a10328c96f..3ba745d6d7e9 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -1,2 +1,4 @@
 DIST python-gnupg-0.5.3.tar.gz 65457 BLAKE2B d5b646b2aadfef922d1b3116259b0f02668df373375676e679fd900bf001c91b58dd6fb06c8e3470d4135f4ef6b45fd1c5f63a78d3425e82931f2c190a28b129 SHA512 88a2d754df7265aefac6b9a0651c7e933125ba7f8170bda7e867f5dd8bb54272609c26d0ce17a15afa7710baebe06fa3ab211e2af1d1d84eb1f1c65ba7a1dd6a
 DIST python-gnupg-0.5.3.tar.gz.asc 833 BLAKE2B bbb455c138df56dec489334f1d9c9a13603e60bc88f156977ad09c0a0e8eefa89ceb5fe4dd4d01c4e2d92d193257024decee879457633bcba9ebc3a83fe8f20c SHA512 052022dd90821e3aac3b77e92921dcdcaa0e5d6914d04a533bf3e9af1cd74fbae59a756c37a9ed0a1b6e945a316e5414c4174c51d03bb70a5fc4d6d8e3c5400e
+DIST python-gnupg-0.5.4.tar.gz 65705 BLAKE2B bbafc21296e0b16043e470cbee28832ceb403519bdfa3be0c887c2e0fd4ec702ab1ce6ec8e870f5aa25c87191ff8dbccdcfdae129d1aa7a6ea40ae3275699c07 SHA512 7136c423d388f0b7e77c55272be4b80a273468e02b576753183ae93ebe82182143662ee92c264982c3ad62d8465da49800706af76c400af578341d2b8bc0008f
+DIST python-gnupg-0.5.4.tar.gz.asc 801 BLAKE2B 1f57f8443e5c37ea6ebdf137763cd67bd7d2651d6572cc740d606df317bc87baf27638989e2b83140c28fd16804ae036854bdac687ed147d2f368c603181caba SHA512 5f62119ddbff351f6fdab01533f54c8312a01eaf2d08358a9b54e8208ca2eb9d8ab67411da0ce8cee584691f4ea50a70786dcad2af2486386fedbf7631c70955
diff --git a/dev-python/python-gnupg/python-gnupg-0.5.4.ebuild b/dev-python/python-gnupg/python-gnupg-0.5.4.ebuild
new file mode 100644
index 000000000000..ae4712c09530
--- /dev/null
+++ b/dev-python/python-gnupg/python-gnupg-0.5.4.ebuild
@@ -0,0 +1,48 @@
+# 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 verify-sig
+
+DESCRIPTION="A Python wrapper for GnuPG"
+HOMEPAGE="
+	https://docs.red-dove.com/python-gnupg/
+	https://github.com/vsajip/python-gnupg/
+	https://pypi.org/project/python-gnupg/
+"
+SRC_URI="
+	https://github.com/vsajip/python-gnupg/releases/download/${PV}/${P}.tar.gz
+	verify-sig? (
+		https://github.com/vsajip/python-gnupg/releases/download/${PV}/${P}.tar.gz.asc
+	)
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# Need gnupg[nls] for avoiding decode errors and possible hangs
+# w/ e.g. sec-keys/openpgp-keys-gentoo-developers but other pkgs too.
+DEPEND="
+	app-crypt/gnupg[nls]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	verify-sig? ( sec-keys/openpgp-keys-vinaysajip )
+"
+
+distutils_enable_tests unittest
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/vinaysajip.asc
+
+python_test() {
+	# NO_EXTERNAL_TESTS must be enabled,
+	# to disable all tests, which need internet access.
+	NO_EXTERNAL_TESTS=1 eunittest
+}
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index ed0402418b61..63fab3b3a172 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,2 +1,2 @@
-DIST python-ironicclient-5.8.0.tar.gz 235768 BLAKE2B 254e70bf1a007bcc1fbd5c13f8a650c473f294ab218c01b8b69b66a4518fdbd35b4dd1cdda808342efde92ebebbe25e7221b0e97492b0c2d6095d0107f05d0d7 SHA512 fa96807bb17907f9ae9a761c9dcd4e87e5fed5d73a978da0e0e8536574277032c52fd96675bf7738271616e3f2897b67dba4d8ac3731ff0785ed2b8a91acb900
+DIST python-ironicclient-5.10.0.tar.gz 222766 BLAKE2B d1b7d828dbab733d5f414976b72a1ce3d223f5e6889624786e17a0693b07aaea3a7b2c0d723cf978b7f0c385ba4890cb79af5924fcea1506932ab07281181eaa SHA512 937da841ce8466a104eae0468f47793e69fd708aab1dfc4d903da56e387ae01c08ddeaf6affb9993a337e66d4410df6dc9e943c04cac7cba1db712fbc438a9a8
 DIST python-ironicclient-5.9.0.tar.gz 220842 BLAKE2B 737f9fa46ec96d1b7b5332284c7f3b8989f3b48c032bc5c6fb26d195366c0834cc737b60051da118544b54bb620fc316cf7940357f1e710179f3b1dc1778991f SHA512 ead6ad9ed3c8e5575bb7b7297dc74d804cd16732a706b4fbbfa5000509b7939a06e74b70ac0e4cb91d0d6e845cb49030e178fde1151cfadf945049e2108715e0
diff --git a/dev-python/python-ironicclient/python-ironicclient-5.10.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-5.10.0.ebuild
new file mode 100644
index 000000000000..eb71ec703959
--- /dev/null
+++ b/dev-python/python-ironicclient/python-ironicclient-5.10.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pbr
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python bindings for the Ironic API"
+HOMEPAGE="
+	https://opendev.org/openstack/python-ironicclient/
+	https://github.com/openstack/python-ironicclient/
+	https://pypi.org/project/python-ironicclient/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/pbr-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth1-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.18.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/python-ironicclient/python-ironicclient-5.8.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-5.8.0.ebuild
deleted file mode 100644
index cf8010e79c9b..000000000000
--- a/dev-python/python-ironicclient/python-ironicclient-5.8.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pbr
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python bindings for the Ironic API"
-HOMEPAGE="
-	https://opendev.org/openstack/python-ironicclient/
-	https://github.com/openstack/python-ironicclient/
-	https://pypi.org/project/python-ironicclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-ironicclient/python-ironicclient-5.9.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-5.9.0.ebuild
index 13708fedd40d..03bb8b6c9427 100644
--- a/dev-python/python-ironicclient/python-ironicclient-5.9.0.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-5.9.0.ebuild
@@ -1,11 +1,11 @@
-# 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=pbr
 PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 pypi
 
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/pbr-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-json-logger/python-json-logger-3.2.1.ebuild b/dev-python/python-json-logger/python-json-logger-3.2.1.ebuild
index 2b11127f7179..11dbc68fa5d3 100644
--- a/dev-python/python-json-logger/python-json-logger-3.2.1.ebuild
+++ b/dev-python/python-json-logger/python-json-logger-3.2.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.12.0-r1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.12.0-r1.ebuild
index 8a673c456491..67e55de51a35 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.12.0-r1.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.12.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="all-plugins"
 
 PLUGIN_DEP="
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.12.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.12.0.ebuild
deleted file mode 100644
index 2b4e55599089..000000000000
--- a/dev-python/python-lsp-server/python-lsp-server-1.12.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Python Language Server for the Language Server Protocol"
-HOMEPAGE="
-	https://github.com/python-lsp/python-lsp-server/
-	https://pypi.org/project/python-lsp-server/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="all-plugins"
-
-PLUGIN_DEP="
-	>=dev-python/autopep8-2.0.4[${PYTHON_USEDEP}]
-	>=dev-python/flake8-7.1[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.12.0[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pylint-3.1[${PYTHON_USEDEP}]
-	>=dev-python/rope-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/yapf-0.33.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	dev-python/docstring-to-markdown[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-jsonrpc-1.1.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	all-plugins? (
-		${PLUGIN_DEP}
-	)
-"
-BDEPEND="
-	test? (
-		${PLUGIN_DEP}
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/qtpy[gui,testlib,${PYTHON_USEDEP}]
-	)
-"
-
-# Note: xdist breaks some tests
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e '/addopts =/d' pyproject.toml || die
-	# unpin all the deps
-	sed -i -e 's:,<[0-9.]*::' pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by presence of pathlib2
-		'test/plugins/test_autoimport.py'
-	)
-	local EPYTEST_IGNORE=(
-		# pydocstyle is archived upstream and broken with py3.12
-		test/plugins/test_pydocstyle_lint.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "Automatically format Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-ly/Manifest b/dev-python/python-ly/Manifest
index e4e019e6716d..ebb79e40a6f3 100644
--- a/dev-python/python-ly/Manifest
+++ b/dev-python/python-ly/Manifest
@@ -1 +1,4 @@
 DIST python-ly-0.9.7.gh.tar.gz 239814 BLAKE2B 322d8e9bb3293aada00834e8e4822b2ace11643ac8bec2d351d38f302c941703c1c47f541c5141097fa0e9e7da59fb93f473891a568a222dc5f6cf212e004af3 SHA512 83b5030e2626146f1309b0cc8a4626d6fac58112c97785ef47672fcb14dcb8fb7e95ed86f3afb09709cdf6c15d4ed21619d94926b02315860b9e151c411f6652
+DIST python-ly-0.9.9.gh.tar.gz 252206 BLAKE2B 72fbeebf69f875a20a748c03a8a8be5ccfc200a6d2e2e1cb735bfa07ce5ce59485f068bc6a020ce49e54a9c7b16e6552bcbda04937bcde3e65442673c7caa890 SHA512 9a5246c6668515ff9294ad39873614561fc86058dd17e659f4a11abc25980f84286b2981a9206b2fda528ef0f3b676e83257352a7d76d04af917eccb76dcd727
+DIST xlink.xsd 9386 BLAKE2B fa4117e867a40b8c12d4ad3bcccd64db53d3e76775f61060af35e21e73e50555b4f713d6b3a8a300caece483aaf5c661c9e4d71ece2d1dd859ba7b24d0e2a308 SHA512 59d43d587652cdbd9190fc33c715bfeba0748b54200921a4a6e8becb109427366919c2b77c3bd461b4890982e386033048212d0a5d2f04efcc1e27cc9ef80da9
+DIST xml.xsd 4726 BLAKE2B cca0062a0a812d5bae01f5f2d5fa111ac0d0641f8d6353e93fc704e1878082a6e52ad3d5a70fc7dff86736691ba252829a334b91758d0ab51a3901ecd1da988c SHA512 a716c93db1bbbcf9c353ff939f15aa1ed83c8d96739bafad93c790a7779c49c680a279c97c760fe55546fa43cab1d43e92431f24c46ff001976e05329231b635
diff --git a/dev-python/python-ly/python-ly-0.9.9.ebuild b/dev-python/python-ly/python-ly-0.9.9.ebuild
new file mode 100644
index 000000000000..f0958d99d3e5
--- /dev/null
+++ b/dev-python/python-ly/python-ly-0.9.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool and library for manipulating LilyPond files"
+HOMEPAGE="
+	https://github.com/frescobaldi/python-ly/
+	https://pypi.org/project/python-ly/
+"
+SRC_URI="
+	https://github.com/frescobaldi/python-ly/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+# https://github.com/frescobaldi/python-ly/issues/176
+SRC_URI+="
+	test? (
+		https://www.w3.org/2001/03/xml.xsd
+		https://www.w3.org/XML/2008/06/xlink.xsd
+	)
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# https://github.com/frescobaldi/python-ly/issues/176
+	sed -e 's:\(schemaLocation="\).*/\([a-z]*\.xsd"\):\1\2:' \
+		-i tests/musicxml.xsd || die
+	cp "${DISTDIR}"/{xml,xlink}.xsd tests/ || die
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	distutils-r1_src_test
+}
diff --git a/dev-python/python-multipart/Manifest b/dev-python/python-multipart/Manifest
index 5dfa7b8b738c..720a04ea7c47 100644
--- a/dev-python/python-multipart/Manifest
+++ b/dev-python/python-multipart/Manifest
@@ -1,2 +1 @@
-DIST python-multipart-0.0.19.gh.tar.gz 95805 BLAKE2B fcd22b383aab09cc9dd1eaf6b6859d406b3439fbfe3460761f147ab8230f4cae118e44d3f3f067c03d4ff508b655c8f84d120765e233c87ae11b014d2d544051 SHA512 cd4f1dc7b5b2e4b29dbccb62f71143dc5ecfad419c12aca2d780d8ef0f3fcc1ef9f7e129b56daa48caef04c95e2e365157b9d945a2e40a5693ba70b2d1d80686
 DIST python-multipart-0.0.20.gh.tar.gz 96069 BLAKE2B 64fa4e24c7df40ad6a8e84f5a862df47f5df9c9f2821394781a6b689bf79ac07d13779442bfe9486209c86bd1dc778d4b5f925b0098b7380dcb0a6194699769d SHA512 9e59fc38413da38429e9fab15105d20103da820437a059082dfed588423fb4a2ec10abd7742e65c3778e7e5e5aba346936900d9dbe49c73518eaa30b24842203
diff --git a/dev-python/python-multipart/python-multipart-0.0.19.ebuild b/dev-python/python-multipart/python-multipart-0.0.19.ebuild
deleted file mode 100644
index 2055891e131f..000000000000
--- a/dev-python/python-multipart/python-multipart-0.0.19.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A streaming multipart parser for Python"
-HOMEPAGE="
-	https://github.com/Kludex/python-multipart/
-	https://pypi.org/project/python-multipart/
-"
-SRC_URI="
-	https://github.com/Kludex/python-multipart/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# do not install the backwards compatibility package
-	# we're patching revdeps instead
-	rm -r multipart || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/python-multipart/python-multipart-0.0.20.ebuild b/dev-python/python-multipart/python-multipart-0.0.20.ebuild
index 5f4588cbad96..c17e46e03aa5 100644
--- a/dev-python/python-multipart/python-multipart-0.0.20.ebuild
+++ b/dev-python/python-multipart/python-multipart-0.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 0abea54cb913..39525c286ce3 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1 +1,2 @@
 DIST python-neutronclient-11.3.1.tar.gz 211410 BLAKE2B db1bed173ca546529502dc2ce564e950c6908f4fa3dc81eb78bc59dfa4ba3e608a058c2b143db111afba153eef9e62f3a7f3bb588faed9d306e3bc960fc33e94 SHA512 76e17bf2f0bce6bad939029beb3a75b840675582fcef766f61ac139d29d7f0632dae3a7ee3aea596c60e3b86b9e5cf24c8070f75a03a9c8066b92437fcdd03be
+DIST python-neutronclient-11.4.0.tar.gz 211796 BLAKE2B 5e34719a525d9744fe74fd9433b587433d594886f0518462159f8e495eb7fdace7e28c3f2e3a2b8efb4a184e9a367dcf12b7eb94f826eaf800b0aa319d956751 SHA512 6b53551dcfb897b0751797a7380e3b01d2b0b473513db78c06d8b57f1900aa6a8af7f8579db1646dc05b91d35979d743449e7b488bce5d5e2fb28fd6fc9668b5
diff --git a/dev-python/python-neutronclient/python-neutronclient-11.4.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-11.4.0.ebuild
new file mode 100644
index 000000000000..518b05b57acb
--- /dev/null
+++ b/dev-python/python-neutronclient/python-neutronclient-11.4.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A client for the OpenStack Quantum API"
+HOMEPAGE="
+	https://opendev.org/openstack/python-neutronclient/
+	https://github.com/openstack/python-neutronclient/
+	https://pypi.org/project/python-neutronclient/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth1-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/bandit[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/oslotest[${PYTHON_USEDEP}]
+		dev-python/python-openstackclient[${PYTHON_USEDEP}]
+		dev-python/python-subunit[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Needs osprofile
+	rm neutronclient/tests/unit/test_http.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b neutronclient.tests.unit
+}
+
+python_install() {
+	distutils-r1_python_install
+	# stupid stupid stupid
+	local SITEDIR="${D}$(python_get_sitedir)" || die
+	cd "${SITEDIR}" || die
+	local egg=( python_neutronclient*.dist-info )
+	[[ -d ${egg[0]} ]] || die "python_quantumclient*.dist-info not found"
+	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
+	ln -s neutronclient quantumclient || die
+	ln -s neutron quantumclient/quantum || die
+}
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index be6c192e50e9..ad17b29440d5 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1 +1,2 @@
 DIST python-novaclient-18.7.0.tar.gz 340344 BLAKE2B c21122bef909453ee33e4fda3a49349dc228759012f2ed627a07d4abf6a83eeee83d12b3cef6a4adb6fdefa69f416b0e6248baab63c8c7f46c5a461ec0437901 SHA512 32ff8e3bb6b2c91d9d6fc157147e2e44cb2e1efd1da31407c6de2f504498aa896d76157907c784ee3c8b3b1cb6f5030880fecc42d5f3437f0ae8968bb7e5cf4f
+DIST python-novaclient-18.8.0.tar.gz 340549 BLAKE2B 2c443379573027bdddb66f9365ded3050cf9b206c2b073001408e23d7c16d945ab836f920c513081c128afa543bff0de0acf38c8e875ee9815f0616b206a64b6 SHA512 d97157fbeee76bb937efc355b9f25c2e3f53d30f3acc566919ab1434adc104d8e9c3d43ae4ea7ae37c75a6b9a0622512a49970dc6f4f6db58c7ca2e48c89d6a5
diff --git a/dev-python/python-novaclient/python-novaclient-18.8.0.ebuild b/dev-python/python-novaclient/python-novaclient-18.8.0.ebuild
new file mode 100644
index 000000000000..4268d03b3998
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-18.8.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pbr
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="
+	https://opendev.org/openstack/python-novaclient/
+	https://github.com/openstack/python-novaclient/
+	https://pypi.org/project/python-novaclient/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth1-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	>dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/bandit[${PYTHON_USEDEP}]
+		dev-python/ddt[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/python-keystoneclient[${PYTHON_USEDEP}]
+		dev-python/python-cinderclient[${PYTHON_USEDEP}]
+		dev-python/python-neutronclient[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/openstacksdk[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/tempest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	sed -e 's/test_osprofiler/_&/' -i novaclient/tests/unit/test_shell.py || die
+	sed -e 's/novaclient\.tests\.unit\.//' -i novaclient/tests/unit/test_api_versions.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b novaclient/tests/unit
+}
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index b5fe21768b01..4ff60428697c 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,3 +1 @@
-DIST python-socks-2.5.3.gh.tar.gz 32399 BLAKE2B 39360537311683cb4ec6d1d9850e51877ab9d5f2319d83eefbee7362af1d0061bf7fba0fea9ebc74d24b9fab3a46ba78722ca4629c783406e935758f393d8183 SHA512 fd6351adf611e019298d2885d97d4ecdf1b9c9160297621d61bc770568eb5e20652507c7590b72de11e1e7505a60326139329d979ae325cba4abc81947ad6189
-DIST python-socks-2.6.0.gh.tar.gz 32596 BLAKE2B f68032b98c0689d2d7b9bcb581be9b6aa08fcf7b2813427a8acb6eb291d817a54ffbaa8ecac7a114d47ffc30ce4f9ea940e9bba0310f22950b8c1d129e1df167 SHA512 88d9d4e5166ddeceae66b3c61d89f25f099a89aba87f5524cd414b176f7d0eebe51f8d5ec2d98db683504bfd4936aec50f3354fafad97b587a687d49e21ad6f0
 DIST python-socks-2.6.1.gh.tar.gz 32352 BLAKE2B 0bfc85bdeb6aefab34d307a6956171fad8b0876f49959bfc91193c864ba8ed7d05a1efb4f052202d99984aad7bb9bfc8472e2853d57b5812156dec6ee791a04e SHA512 2e046849a66125ddb14f887f84354e56f689034695a48532cbd4d4a1ef9508212c30e34faeb3b318ceede32a0604d62f92ca92cfe14b63c54a42fd5c1cfafbc0
diff --git a/dev-python/python-socks/python-socks-2.5.3.ebuild b/dev-python/python-socks/python-socks-2.5.3.ebuild
deleted file mode 100644
index fedf95cb5d75..000000000000
--- a/dev-python/python-socks/python-socks-2.5.3.ebuild
+++ /dev/null
@@ -1,48 +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..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
-HOMEPAGE="
-	https://github.com/romis2012/python-socks/
-	https://pypi.org/project/python-socks/
-"
-SRC_URI="
-	https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-# curio is not packaged
-# asyncio is the only backend we have, so dep on its deps unconditionally
-# TODO: revisit
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/async-timeout[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/async-timeout-3.0.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18.3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-trio-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/tiny-proxy-0.1.1[${PYTHON_USEDEP}]
-		>=dev-python/trio-0.16.0[${PYTHON_USEDEP}]
-		>=dev-python/trustme-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/yarl-1.4.2[${PYTHON_USEDEP}]
-	)
-"
-
-# Test markers exist to exclude trio etc if needed
-distutils_enable_tests pytest
diff --git a/dev-python/python-socks/python-socks-2.6.0.ebuild b/dev-python/python-socks/python-socks-2.6.0.ebuild
deleted file mode 100644
index 6e7cdd24fd84..000000000000
--- a/dev-python/python-socks/python-socks-2.6.0.ebuild
+++ /dev/null
@@ -1,48 +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..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
-HOMEPAGE="
-	https://github.com/romis2012/python-socks/
-	https://pypi.org/project/python-socks/
-"
-SRC_URI="
-	https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# curio is not packaged
-# asyncio is the only backend we have, so dep on its deps unconditionally
-# TODO: revisit
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-4.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/async-timeout-3.0.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18.3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-trio-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/tiny-proxy-0.1.1[${PYTHON_USEDEP}]
-		>=dev-python/trio-0.24[${PYTHON_USEDEP}]
-		>=dev-python/trustme-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/yarl-1.4.2[${PYTHON_USEDEP}]
-	)
-"
-
-# Test markers exist to exclude trio etc if needed
-distutils_enable_tests pytest
diff --git a/dev-python/python-socks/python-socks-2.6.1.ebuild b/dev-python/python-socks/python-socks-2.6.1.ebuild
index 6e7cdd24fd84..db9ed7a8d19e 100644
--- a/dev-python/python-socks/python-socks-2.6.1.ebuild
+++ b/dev-python/python-socks/python-socks-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 # curio is not packaged
 # asyncio is the only backend we have, so dep on its deps unconditionally
diff --git a/dev-python/python-tests/Manifest b/dev-python/python-tests/Manifest
index 405cc435ffe3..dada496efb7d 100644
--- a/dev-python/python-tests/Manifest
+++ b/dev-python/python-tests/Manifest
@@ -1,29 +1,14 @@
-DIST Python-3.10.15.tar.xz 19596540 BLAKE2B fe62f7c7377136576e73a59b5f0b3c9729f9c958da5c8dd1771e88121fdd1928686166066351fc8ae98c9f97295a85feb7ec44c39317f93ae414244aed8a8f66 SHA512 3c0396b2dae1521315a9b5ce9ad4ab6ede385447922fceb00ea3df75bfd79cb547b9380e936d83c9c1b964e38e16d70e34aec39f4c292853a032407bb6a58063
-DIST Python-3.10.15.tar.xz.asc 833 BLAKE2B 31858fe2d3c8d868417eea66de1cf0b2fc7880e73ea7770b50191b8088bbd1c78485c64d94f6f005d18cef559d7e8e0906cb2a30aa1472d90f5af4cca045970b SHA512 0cac9b78649330a2a35a835d45e4a8a111db45943cc0ae0d24f5d9e03a058b4b739fe43d6cd1aee481dcd415a57820bf875996fa60b81d4d5911588db5adad70
 DIST Python-3.10.16.tar.xz 19610392 BLAKE2B bcc5ff71904b8a936363c6b07b8ffbcb981640c29c1e537a90f838c0a7fa45c1bdd764eae48bcb6d16d7260a44c235e9f5538ada45903b1627527e24c49212a5 SHA512 a6b004974db93f21590f00b9b1a569dfd8c3e334f8c6a8eb8997dec5646fa4515cfc02a7dabea9e4f75f908938dc64333ce4899b9a26aff97f9ffcb027fa2bca
 DIST Python-3.10.16.tar.xz.asc 833 BLAKE2B 4fd4ce76ade6d64539e5eb641c64b0d99ade71a8514f97594097207e78412bd2d09afeab6788598a3159f045b98ccd5537c6771e59eeba52d4820c0c0a6c0dcb SHA512 18032fdb60a022d6381b1137789ada1c4bb198049616ed158fb548e728dd1fb95d116a86c41c852ca2acc9127baf3cdd9644a1e2df90ae9c3ffcd66eabf454d6
-DIST Python-3.11.10.tar.xz 20067656 BLAKE2B aba211a09e4c083d71574c7537ba98474476ebf7092ddda815f8d355d01605456868a89f0bcc6a9e747f71f914fa0129547de2ae70d8b579c6458fdeeafd23f0 SHA512 6ce77cced1ce90bb5eea38504dfc1bc19c872149a5a63fdd8353ac8c772c54ab7a42176e141c7f6f898d31761bf93e1739b238920fbeefbedd6016ad033c1de0
-DIST Python-3.11.10.tar.xz.asc 833 BLAKE2B a1cbe57e568367fbc5817c983696619f515263a9b37662ca536c4d1132ad336959285bbe3076a251778016966f030d1e259f48accdb0df67c116af0e335acb8f SHA512 3a9efe1dd39fd6883ae3fc8dd7f6e25af7e06c6e6049cf9a31a1a82e6d7c84f85ac838d2a71127977d93ce77233a8bbff86a10a80d24fcee85a4e70fcbd1db19
 DIST Python-3.11.11.tar.xz 20085792 BLAKE2B a9a778eff94529e1029ae252ef28ecdc2f0673a4406d831865e12de3cba21ea48905542d0e806e428802b05947239ca6a44eff3573bd541469b01644790c7377 SHA512 3ff90f15f725fa8d06686158aaddb887a247b03ca4dc1fdfd81a8efb53373db3e8673bd0b3de30bb7669f3f07d9854e9d8a2dbcd49b18d15b8172787a53a0a9e
 DIST Python-3.11.11.tar.xz.asc 833 BLAKE2B 6a9d873e181d636712567ea46823ad7f972f872d038092506e67bada24187441188b8fde4672c205ce6d37e60c4e0c69a8f3cc5d1915fd8f5dd8743292a16d1b SHA512 d71b0b42537fb636e8c469d62d13ff020149e4fb9d87eb17f8c999301195e418d134dbdb7e4ab49b06de16e96f8ef6bbcf2a749956fffca2ce03185f191c181d
-DIST Python-3.12.6.tar.xz 20434028 BLAKE2B 527fafdbfd0c1784ff72a93cdeb3f49666bae7d9343b6d1e4ef773fc52bd397081b41bec3ee9ed5b7652f28f09f29a1b553424cef26aebfa6c2e13499870bf2b SHA512 e658b0d59b5cfdc591d626e8282b9945759f27ee6fbc8bcb8670737db32ffc11fb832dfed9b0e80188fb5f7f3f39fe6dd6191ab7736376453c9e248321e9b063
-DIST Python-3.12.6.tar.xz.asc 963 BLAKE2B d5f9e4c5053610a1a53769278e69d8a25e2fb047afb2a55dfee67917d8d200ebc159e614327ac87f34a4a9718cb3436b55190322ee231116b26074a78bb72642 SHA512 91a15bb7e8dd26616a2cdabe69c3ee81668cc67cb55a88b2be20433d24c9f8ae41c8f93f67aff2fa5858cd5b94600409cd472bd437a2fd33153483734ecd863f
-DIST Python-3.12.7.tar.xz 20444032 BLAKE2B eed8744261cab3b401963ec5187a8b814adb9a18f8d0a6a3d59c027a83cf8408524af9b20204b0a0861d173cc33c45ae37bb1542a1ace3344dc59c649087ff1f SHA512 4a363d3f852ad8f4fd1484aa4cec35494a3811be48ef67fadb2bdf2e2489ed07dc78fad6ab475257db503ddd64d39f9800f23a1c94b6bbd15b7f632cff0c90ae
-DIST Python-3.12.7.tar.xz.asc 963 BLAKE2B 8c7db3d1971d93a10c611a2e6dd3679d0b331b48df87b5fe410b089061e48753d98af67084d4f051a31ae803fce3aa3c7af7cba9c692640f50068bd1e46f40e6 SHA512 4d0a7a0da2c81888e93d8ff89ca2ed4bb85a7b0bd00f0d54a14e2c201affac2677ef3984d2b5aea253e624f6465548d9032eefdd9033c1eb3864d82cfd8d3df0
 DIST Python-3.12.8.tar.xz 20489808 BLAKE2B 24b9a5abafdb9fedfc371e7acf0efce50bdc6702050c4f5f0b9e97916a899e3462f928cb217c48e6ffae6fdd4d2cd7c05c5f1d73eaa9ef646f4b3281db5ca977 SHA512 406ce1146c4c2c70d252df56bbe9e5970ef469395cbaa211a96af71f32de2cf7abd944906920cc18b4a470027e63a3f64bf7679fb4954b31bf4ca4baf24fa370
 DIST Python-3.12.8.tar.xz.asc 963 BLAKE2B 5aeacf16d337949a66bb56e346447e7bbcd9166b60fc512c98bcff6862976732ef2e3ac59869cd9df29a653c2bafd4af63b1e6c14f4c6603efb85d5c3dd88357 SHA512 19493499ddb80764aa105e100585d2ef872798dc30fdff2e31d158cd7fd65b69ca133c6d9d16eb974660eed6ba474a26a2af3acd13a90522cf50e142492bd9a6
-DIST Python-3.13.0.tar.xz 22532980 BLAKE2B 4a4e397199402de8c9fe8e4d63443ed972cbe8a4f541743908d699c7987127d159d600fd14145b6a946e8671426279d230c9155fdc5863c1e49a945eedcbf21b SHA512 44a143c9b96b55b01885ec020c3364265bda55289615cd7d5071915b0d0178a6f35e7551a89090001fcb7f3172d38177a56bf8b8532b15c9dbc50295c9210152
-DIST Python-3.13.0.tar.xz.asc 963 BLAKE2B d05f02692a9fea42b73dbfe5dc42bd6533555e5ecb848510d2b94bb7f0e55d4a0f89bcd20b073ed2c7f7a68be35b12cb6dbff6bc16fc9a4592ded2c339ada7fd SHA512 1b8bb0fe4eb93e31ec1770e90b94d44b5864c0391aad5dcba3a30d8e505d9b17107385414353c0060007f8a536254f49b8e919f36ddf6421a6e4330f817f1a3e
 DIST Python-3.13.1.tar.xz 22589692 BLAKE2B 161d5c0a7b4cacc4ce9983f9540a7e01662a7b76cbb34c5f3681582b0e7207574bdec5ad7bf79d820d8744b69bc2fb7196cf07a2ecadbfab6a158872f562741d SHA512 056c9b5fc0a6b540f41513d045f43c1ed463d15e0f345cecec703ec9c2335e53b4beb19de9c74ab2b236b023f934d5fd9ae7727a808634eaa01cfe66018a9a35
 DIST Python-3.13.1.tar.xz.asc 963 BLAKE2B 47cbfb6bceb92716181a0ed8f41742958568e62609fa4996d341e465bd6be0ebcab586ba1ebe275aa3a99108221be047fab66ec4b7e90af27d9db7524b6b4951 SHA512 1b56b7c2f547aa39c75c18978e174debb113444ce3f9da3829ba6842e3160051e0de70bd49d306b8014299aa8aa911d7c67efe71dd648c3528cf8d7535a01599
-DIST python-gentoo-patches-3.10.15_p1.tar.xz 24048 BLAKE2B 191c28ad9bc781d6f3077870e8d40ff98a47a64009ecfbbd10fe2b3c5330692181837fd3e9b336fd01f936a39160fc12761b2ef9bc00843248ab978cda2e2767 SHA512 4461e351c991694415e2812e558d6c3d3f79295358623dc955bc0839691a170d95a3efd31c0bf9f0d6191e4184d7b55fdb485b948d591782fef5b060d7660cce
-DIST python-gentoo-patches-3.10.15_p2.tar.xz 25284 BLAKE2B 24ecd523dba88915db130b174a5d692b9218decf81db7617ba016d4e21555cefa807e344a490110bcd3992637a95d0ce3179b219911417d29d008b4e2b5d7b33 SHA512 e1017b80272c57c18dbf7e1515d50fe13ead8de028d1ccaf1339a93ad4b0286f758979ee6f27011fa12350855cefdbdf049927bf2dd185905d4f3fe146c5bd68
 DIST python-gentoo-patches-3.10.16_p1.tar.xz 24964 BLAKE2B 93cf5d208f80f1017e4afdcf7d3551d150a1d68c378312af43c668156d98f10087d2b6f315f717823a9aae1114e2baa999f61ce179639e5511d30ed9620c9570 SHA512 74ad92d3256d744e3572c0d858b4ba4d5f0f6fda84d8f3c1a1fb675376c2d525e2d9fd636a65c8a859a0a312eda00877b13ba311f620b6a51e47dfb082843333
-DIST python-gentoo-patches-3.11.10_p1.tar.xz 10592 BLAKE2B 1cc02d22b55cb76beba133c37e6db3b9ba12b11cd8776acb064f14431842405cbc9efb5a06319cff1c73d9178ddbbe2e340829d4628c88a9589aa2fc1d308f80 SHA512 7ddb08e4d8a9173a26fa18de687a4c85c3d460e2bc595da6f4b15cfe3be264ccdc7d61d5fed1e7a82f256d21caf3ea7de87f774fde61a9d37bed15f86f546adb
 DIST python-gentoo-patches-3.11.11_p1.tar.xz 11644 BLAKE2B d080e1b987ea0e1b397113f20a5c84f6a34d6619a3ed9f7389fd10d95636169563fba97d212477ca7f9b93d2bd0b66c9521fc61963bb468805a661ca3ab287a7 SHA512 f6045adf25923053fc9a60506b9164c9c062580d6886f1a3dcaca00dc4affe69aa9e138f8ce93f093798ccf33322ccca2aca674ab87457df98a93dcaca234b44
-DIST python-gentoo-patches-3.12.6_p2.tar.xz 8144 BLAKE2B 2f36ce972e0b3e2884c9df629e3aeb1af05e4c77dffb866ff28e08a0a7df3c7cf36a9de250d148d909c07fd5bad483c95b3267818657c04e7d0d6fe512e21f9a SHA512 caa86c6cf693f9293b3aa8944452d117b78c1c3f8d6a6aa658cb5c2d2ffb0cecc6cf14b293872bd2101766ee7167ba88183904b2814090f8cbc64c1fa3b771be
-DIST python-gentoo-patches-3.12.6_p4.tar.xz 8764 BLAKE2B a75b9bc3768f1e07272f43d1a8f0fb6858eee7c786bc3141cd152382c287ee984b92ff1301e5894db7c24af994ee52ac7374a3edf692aa4255c1413b73209020 SHA512 237c9e8b50173a757204621d7019f68f230ea3e520ea1f078528acfb509fe7f44c0919a8ac0245e79b1a51c3e3545dd9ded51047451048ca782e35b1c4365363
-DIST python-gentoo-patches-3.12.7_p1.tar.xz 10228 BLAKE2B 71cc6034201198d9483414fa362d68b550bfcbf75ca6f44dd8ab9d90b201098a05cbf4799b1db9359f4dc464acfcee9b0ce59045db27e8e9ce916b5aab010448 SHA512 22f9256c28b96723ad86878cbe44da155e280a8df08c6bcc568dc5296aca1a6fcc41ab823ee9e6d34ce5954bbedb76aea7dba2d9189e0558c536e8b2b9a3c8ce
 DIST python-gentoo-patches-3.12.8.tar.xz 10772 BLAKE2B 9833b5ee6c307a4aa1335fd966fcd64a0f3732a97a190abdd3121b3496ea68ead9436af4ec5e3e8c0e781fd68df41403a1b2e5f29f264fc8569a883141e5f7f9 SHA512 d5906845a6259f7349a0299e185f569750b493c64ea1f6537dc8bfc0babc9b54de7db1c4f1b5b6ec2f7076937ad07ca0ca9c4941bbb8d542da6c687957bdbd5e
-DIST python-gentoo-patches-3.13.0.tar.xz 8316 BLAKE2B 8fb8ba8f41f310140ad7066b614952023112d5043e5d82058364125611785144c1843e87eecb7669bcbab51c40d0694069526219f7419a7009517ce0821b74ba SHA512 0eb31ebfa3411020aa70b3b66fd7eec98b4b7a686b0e8f1f7ed76a8186a7c1ee85ccd9565a86a1d7ec13b975855eeb7303036af05e2dfdce3d64e4ad99299df4
+DIST python-gentoo-patches-3.12.8_p1.tar.xz 11088 BLAKE2B 4d7ccf4759b624aafde1ef2a0a341cda8f4d3e7c4d86586201a910d77327219e61b134985f2fe85e83892ad4ba607b4e661aed675cc038e4cc193efe9fbe6f6e SHA512 6f1d6ab2b9e958ae7d2ca3f204b7c7eb1435998919cf5a577a82bbf1339232f92a2f517c248afb9e1802850acd2b59b84c41e87f4b8582e19ec88155743cdaae
 DIST python-gentoo-patches-3.13.1.tar.xz 8320 BLAKE2B 2fef9c501df7ed7603eabb3e01a8c3bde5bcfae3a8ac9bbe772b458cb04ffa9598cf38f3a74f6dcbcda29e7bd294d664b8fb12f7ddd9e0e42ed6268300947bb0 SHA512 419e1f12daaf19ed2d2195699b5e8c2c604779562d84d6a68adb4016dcb13fc3e0383ccc4b01eb153930600e6c9cdcc518929ffce3d6343019226a6111e9d617
+DIST python-gentoo-patches-3.13.1_p1.tar.xz 8672 BLAKE2B d35b8b47c6d549753d9a764fbc3538cb6517c809e69901f3221110ccbb0ea9eed10ba1f1637a5ffe4f90d8c3932f53815c7dcf844a7350ad89458763bf0aeea1 SHA512 0505bc1f7c8e264fdcad5459900e37d12ed9bea57e615ea42492fa211d3f0641e79c3e711a6970cd34a3a6275f36a22ed7ba64fd71c988bcdaebfcefc7b6a1d2
diff --git a/dev-python/python-tests/python-tests-3.10.15_p1.ebuild b/dev-python/python-tests/python-tests-3.10.15_p1.ebuild
deleted file mode 100644
index 4cc74f86a5e4..000000000000
--- a/dev-python/python-tests/python-tests-3.10.15_p1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-	!<dev-lang/python-3.10.14_p3-r1:${PYVER}
-"
-BDEPEND="
-	${RDEPEND}
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	local dirs=(
-		ctypes/test distutils/tests idlelib/idle_test lib2to3/tests
-		sqlite3/test ./test tkinter/test unittest/test
-	)
-	local dir
-	for dir in "${dirs[@]}"; do
-		python_moduleinto "/usr/lib/python${PYVER}/${dir%/*}"
-		python_domodule "${dir}"
-	done
-}
diff --git a/dev-python/python-tests/python-tests-3.10.15_p2.ebuild b/dev-python/python-tests/python-tests-3.10.15_p2.ebuild
deleted file mode 100644
index 4cc74f86a5e4..000000000000
--- a/dev-python/python-tests/python-tests-3.10.15_p2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-	!<dev-lang/python-3.10.14_p3-r1:${PYVER}
-"
-BDEPEND="
-	${RDEPEND}
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	local dirs=(
-		ctypes/test distutils/tests idlelib/idle_test lib2to3/tests
-		sqlite3/test ./test tkinter/test unittest/test
-	)
-	local dir
-	for dir in "${dirs[@]}"; do
-		python_moduleinto "/usr/lib/python${PYVER}/${dir%/*}"
-		python_domodule "${dir}"
-	done
-}
diff --git a/dev-python/python-tests/python-tests-3.10.16_p1.ebuild b/dev-python/python-tests/python-tests-3.10.16_p1.ebuild
index c71dae4a9501..522e1752bf53 100644
--- a/dev-python/python-tests/python-tests-3.10.16_p1.ebuild
+++ b/dev-python/python-tests/python-tests-3.10.16_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}/Lib"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-python/python-tests/python-tests-3.11.10_p1.ebuild b/dev-python/python-tests/python-tests-3.11.10_p1.ebuild
deleted file mode 100644
index 359f16eb8f42..000000000000
--- a/dev-python/python-tests/python-tests-3.11.10_p1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_11 )
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-	!<dev-lang/python-3.11.9_p2-r1:${PYVER}
-"
-BDEPEND="
-	${RDEPEND}
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	local dirs=(
-		ctypes/test distutils/tests idlelib/idle_test lib2to3/tests
-		./test tkinter/test unittest/test
-	)
-	local dir
-	for dir in "${dirs[@]}"; do
-		python_moduleinto "/usr/lib/python${PYVER}/${dir%/*}"
-		python_domodule "${dir}"
-	done
-}
diff --git a/dev-python/python-tests/python-tests-3.11.11_p1.ebuild b/dev-python/python-tests/python-tests-3.11.11_p1.ebuild
index bb4e1d4b8623..9d1f94e65213 100644
--- a/dev-python/python-tests/python-tests-3.11.11_p1.ebuild
+++ b/dev-python/python-tests/python-tests-3.11.11_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}/Lib"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-python/python-tests/python-tests-3.12.6_p2.ebuild b/dev-python/python-tests/python-tests-3.12.6_p2.ebuild
deleted file mode 100644
index 5f2ce86f6117..000000000000
--- a/dev-python/python-tests/python-tests-3.12.6_p2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_12 )
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-	!<dev-lang/python-3.12.5_p1-r1:${PYVER}
-"
-BDEPEND="
-	${RDEPEND}
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	python_moduleinto "/usr/lib/python${PYVER}"
-	python_domodule test
-	python_moduleinto "/usr/lib/python${PYVER}/idlelib"
-	python_domodule idlelib/idle_test
-}
diff --git a/dev-python/python-tests/python-tests-3.12.6_p4.ebuild b/dev-python/python-tests/python-tests-3.12.6_p4.ebuild
deleted file mode 100644
index f7a0b548f220..000000000000
--- a/dev-python/python-tests/python-tests-3.12.6_p4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_12 )
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-	!<dev-lang/python-3.12.5_p1-r1:${PYVER}
-"
-BDEPEND="
-	${RDEPEND}
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	python_moduleinto "/usr/lib/python${PYVER}"
-	python_domodule test
-	python_moduleinto "/usr/lib/python${PYVER}/idlelib"
-	python_domodule idlelib/idle_test
-}
diff --git a/dev-python/python-tests/python-tests-3.12.7_p1.ebuild b/dev-python/python-tests/python-tests-3.12.7_p1.ebuild
deleted file mode 100644
index cf9126a2dca0..000000000000
--- a/dev-python/python-tests/python-tests-3.12.7_p1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_12 )
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-	!<dev-lang/python-3.12.5_p1-r1:${PYVER}
-"
-BDEPEND="
-	${RDEPEND}
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	python_moduleinto "/usr/lib/python${PYVER}"
-	python_domodule test
-	python_moduleinto "/usr/lib/python${PYVER}/idlelib"
-	python_domodule idlelib/idle_test
-}
diff --git a/dev-python/python-tests/python-tests-3.12.8.ebuild b/dev-python/python-tests/python-tests-3.12.8.ebuild
index 69294e562d04..c99868cf98e5 100644
--- a/dev-python/python-tests/python-tests-3.12.8.ebuild
+++ b/dev-python/python-tests/python-tests-3.12.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}/Lib"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-python/python-tests/python-tests-3.12.8_p1.ebuild b/dev-python/python-tests/python-tests-3.12.8_p1.ebuild
new file mode 100644
index 000000000000..19c1a967d71e
--- /dev/null
+++ b/dev-python/python-tests/python-tests-3.12.8_p1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_12 )
+
+inherit python-r1 verify-sig
+
+MY_PV=${PV}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="Test modules from dev-lang/python"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}/Lib"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	~dev-lang/python-${PV}:${PYVER}
+	!<dev-lang/python-3.12.5_p1-r1:${PYVER}
+"
+BDEPEND="
+	${RDEPEND}
+	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	cd .. || die
+	default
+}
+
+src_install() {
+	python_setup
+	# keep in sync with TESTSUBDIRS in Makefile.pre.in
+	python_moduleinto "/usr/lib/python${PYVER}"
+	python_domodule test
+	python_moduleinto "/usr/lib/python${PYVER}/idlelib"
+	python_domodule idlelib/idle_test
+}
diff --git a/dev-python/python-tests/python-tests-3.13.0.ebuild b/dev-python/python-tests/python-tests-3.13.0.ebuild
deleted file mode 100644
index 18359c06c7b9..000000000000
--- a/dev-python/python-tests/python-tests-3.13.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_13 )
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV/_}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-	!<dev-lang/python-3.13.0_rc1_p3-r1:${PYVER}
-"
-BDEPEND="
-	${RDEPEND}
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	python_moduleinto "/usr/lib/python${PYVER}"
-	python_domodule test
-	python_moduleinto "/usr/lib/python${PYVER}/idlelib"
-	python_domodule idlelib/idle_test
-}
diff --git a/dev-python/python-tests/python-tests-3.13.1.ebuild b/dev-python/python-tests/python-tests-3.13.1.ebuild
index 8b8ce61edb90..3d0f3e32a365 100644
--- a/dev-python/python-tests/python-tests-3.13.1.ebuild
+++ b/dev-python/python-tests/python-tests-3.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}/Lib"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-python/python-tests/python-tests-3.13.1_p1.ebuild b/dev-python/python-tests/python-tests-3.13.1_p1.ebuild
new file mode 100644
index 000000000000..aa58066a52a4
--- /dev/null
+++ b/dev-python/python-tests/python-tests-3.13.1_p1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_13 )
+
+inherit python-r1 verify-sig
+
+MY_PV=${PV}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="Test modules from dev-lang/python"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}/Lib"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	~dev-lang/python-${PV}:${PYVER}
+	!<dev-lang/python-3.13.0_rc1_p3-r1:${PYVER}
+"
+BDEPEND="
+	${RDEPEND}
+	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	cd .. || die
+	default
+}
+
+src_install() {
+	python_setup
+	# keep in sync with TESTSUBDIRS in Makefile.pre.in
+	python_moduleinto "/usr/lib/python${PYVER}"
+	python_domodule test
+	python_moduleinto "/usr/lib/python${PYVER}/idlelib"
+	python_domodule idlelib/idle_test
+}
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/pythonnet/Manifest b/dev-python/pythonnet/Manifest
index c660a11dd3e5..43509e1e2a64 100644
--- a/dev-python/pythonnet/Manifest
+++ b/dev-python/pythonnet/Manifest
@@ -48,7 +48,6 @@ DIST nunit3testadapter.3.16.1.nupkg 485883 BLAKE2B 601bbe55147c4a41ca35db0a9a91b
 DIST nunit3testadapter.3.17.0.nupkg 520006 BLAKE2B a8cd4eddd4a0dda614f17591b33e204944a63ab2358f24524ed6e1ca22c63d1cf305bb52d05fc208eece01938ef81957e528e8d4f9f7efd2042021f8aa48f5cf SHA512 e0459f379592f0523adc73be45af72a1aad87466d87ad7cc7e9d12597c48315e80e1136596227cfcf52789da2e421158fdf1ddc58bb345cdf338510d0c9b22ee
 DIST nunit3testadapter.4.6.0.nupkg 512620 BLAKE2B ab251ac7d56407d35cfb352956ae153f4052a4e6c014a50becdc31ed9b2c325d0b6fcb61752e3b11e435b61c86b1f7ea51415e72f1ae894dd35acb17410fb23b SHA512 4e489dea089cbf32e01b74105003eaf64a11e11a488aefba50553f856afde2940a2659d0017055b8a86a7aa79247d5572bee41b497ceb0efe7074e8b9c86294a
 DIST perfolizer.0.2.1.nupkg 51987 BLAKE2B 2e01e7673ae420136e6194d89c406fca31af85b7f90b460a53ebbe0fef82c38ba3be3821d9e1a7b9b2bf5d117bb9f2f4f91767796bffb51ac14e5cb9f472d873 SHA512 9db50cdcf13a85737c275a0aa3dc4a98b97e7d23e7aca1c9b27df28e454b0d4587315bd62f7181dc03e0257a83d79c7af2e90733eafda70afe5a956c92c20a9a
-DIST pythonnet-3.0.4.gh.tar.gz 421787 BLAKE2B 2e73192c21810878f7eb9da209dadb41604815f6f1d57bb1585a83e87f522f34ad92aae9dfc26f90e36926aba8bbc1686943d4c5f4928c64ceceaf1a339249a4 SHA512 82a15fd4cd239bd79fb20c406571e91bc419e4b4d7e888fcee89e322213c86af64543f6910ac71c171a9bf1a6cfedd27c5c71997978c8327fc81a532f4328afb
 DIST pythonnet-3.0.5.gh.tar.gz 370060 BLAKE2B 2f095e8e97cdb70ce31f76918c6bdd99e84a8b20108faa54188c2891104dc6a9882eba3d4192d9fc356c435ddfd81d15b5ea0a638b5cebace5bbcd50c8d73998 SHA512 235ca48e4375d880a7b38142fa90e9a84b5711565b45fa806bcd23c4b730d314f2e4b166c6fd5752f394832187285498b8c3c226706b4e7c87135c87fbe19eb4
 DIST runtime.any.system.collections.4.3.0.nupkg 107990 BLAKE2B 802e2ae919a4834150d825ac086d8f47e2185e31b60b45f3dbe5f63b1d714953d9faaa7d8fe4cc25a1ea8495c4f8fd925bb198eea0b67e594a8558238b18196c SHA512 9f8833176c139b71a58694ae401c5aec209a63227be07c7ab559bef772082bd1f6cc38ba2949cb1c8e5c5514ad9f4ff51859838dc2f28191f8bb7ae611a50239
 DIST runtime.any.system.diagnostics.tools.4.3.0.nupkg 43707 BLAKE2B 33d1c57eb4e50c06488da02ab2bb1b8dba9948026053e662986af05b74045c014e76815edbb588f10d6a904de22e4c50177f31f3fac36d159b9af361a4cb2b62 SHA512 bd257401e179d4b836a4a2f7236a0e303ae997d2453c946bf272036620a0b14e85e5f42c229332930a954655ab4cae359d191a3e3d9746df09535a651367764c
diff --git a/dev-python/pythonnet/pythonnet-3.0.4.ebuild b/dev-python/pythonnet/pythonnet-3.0.4.ebuild
deleted file mode 100644
index 4c451257c7e1..000000000000
--- a/dev-python/pythonnet/pythonnet-3.0.4.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{11..12} )
-
-DOTNET_PKG_COMPAT="8.0"
-NUGETS="
-benchmarkdotnet.annotations@0.13.1
-benchmarkdotnet@0.13.1
-commandlineparser@2.4.3
-iced@1.8.0
-lost.compat.nullabilityattributes@0.0.4
-microsoft.build.tasks.git@1.1.1
-microsoft.codeanalysis.analyzers@2.6.1
-microsoft.codeanalysis.common@2.10.0
-microsoft.codeanalysis.csharp@2.10.0
-microsoft.codecoverage@16.11.0
-microsoft.codecoverage@17.0.0
-microsoft.codecoverage@17.11.1
-microsoft.csharp@4.7.0
-microsoft.diagnostics.netcore.client@0.2.61701
-microsoft.diagnostics.runtime@1.1.126102
-microsoft.diagnostics.tracing.traceevent@2.0.61
-microsoft.dotnet.internalabstractions@1.0.0
-microsoft.dotnet.platformabstractions@2.1.0
-microsoft.net.compilers.toolset@4.0.1
-microsoft.net.test.sdk@16.11.0
-microsoft.net.test.sdk@17.0.0
-microsoft.net.test.sdk@17.11.1
-microsoft.netcore.platforms@1.0.1
-microsoft.netcore.platforms@1.1.0
-microsoft.netcore.targets@1.0.1
-microsoft.netcore.targets@1.1.0
-microsoft.netframework.referenceassemblies.net461@1.0.0
-microsoft.netframework.referenceassemblies.net472@1.0.0
-microsoft.netframework.referenceassemblies@1.0.0
-microsoft.sourcelink.common@1.1.1
-microsoft.sourcelink.github@1.1.1
-microsoft.testplatform.objectmodel@16.11.0
-microsoft.testplatform.objectmodel@17.11.1
-microsoft.testplatform.testhost@16.11.0
-microsoft.testplatform.testhost@17.11.1
-microsoft.win32.primitives@4.3.0
-microsoft.win32.registry@4.3.0
-microsoft.win32.registry@4.5.0
-netstandard.library@2.0.0
-netstandard.library@2.0.3
-newtonsoft.json@13.0.1
-newtonsoft.json@9.0.1
-noncopyableanalyzer@0.7.0
-nuget.frameworks@5.0.0
-nunit3testadapter@3.16.1
-nunit3testadapter@3.17.0
-nunit3testadapter@4.6.0
-nunit@3.12.0
-nunit@3.14.0
-perfolizer@0.2.1
-runtime.any.system.collections@4.3.0
-runtime.any.system.diagnostics.tools@4.3.0
-runtime.any.system.diagnostics.tracing@4.3.0
-runtime.any.system.globalization@4.3.0
-runtime.any.system.io@4.3.0
-runtime.any.system.reflection.extensions@4.3.0
-runtime.any.system.reflection.primitives@4.3.0
-runtime.any.system.reflection@4.3.0
-runtime.any.system.resources.resourcemanager@4.3.0
-runtime.any.system.runtime.handles@4.3.0
-runtime.any.system.runtime.interopservices@4.3.0
-runtime.any.system.runtime@4.3.0
-runtime.any.system.text.encoding.extensions@4.3.0
-runtime.any.system.text.encoding@4.3.0
-runtime.any.system.threading.tasks@4.3.0
-runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.native.system@4.3.0
-runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.unix.microsoft.win32.primitives@4.3.0
-runtime.unix.system.diagnostics.debug@4.3.0
-runtime.unix.system.io.filesystem@4.3.0
-runtime.unix.system.private.uri@4.3.0
-runtime.unix.system.runtime.extensions@4.3.0
-system.appcontext@4.1.0
-system.appcontext@4.3.0
-system.buffers@4.3.0
-system.buffers@4.4.0
-system.collections.concurrent@4.3.0
-system.collections.immutable@1.5.0
-system.collections.nongeneric@4.3.0
-system.collections.specialized@4.3.0
-system.collections@4.0.11
-system.collections@4.3.0
-system.componentmodel.eventbasedasync@4.3.0
-system.componentmodel.primitives@4.3.0
-system.componentmodel.typeconverter@4.3.0
-system.componentmodel@4.3.0
-system.console@4.3.0
-system.diagnostics.debug@4.0.11
-system.diagnostics.debug@4.3.0
-system.diagnostics.fileversioninfo@4.3.0
-system.diagnostics.process@4.3.0
-system.diagnostics.stacktrace@4.3.0
-system.diagnostics.tools@4.0.1
-system.diagnostics.tools@4.3.0
-system.diagnostics.tracing@4.3.0
-system.dynamic.runtime@4.0.11
-system.dynamic.runtime@4.3.0
-system.globalization.extensions@4.3.0
-system.globalization@4.0.11
-system.globalization@4.3.0
-system.io.compression@4.3.0
-system.io.filesystem.primitives@4.0.1
-system.io.filesystem.primitives@4.3.0
-system.io.filesystem@4.0.1
-system.io.filesystem@4.3.0
-system.io@4.1.0
-system.io@4.3.0
-system.linq.expressions@4.1.0
-system.linq.expressions@4.3.0
-system.linq@4.1.0
-system.linq@4.3.0
-system.management@4.5.0
-system.memory@4.5.3
-system.numerics.vectors@4.4.0
-system.objectmodel@4.0.12
-system.private.uri@4.3.0
-system.reflection.emit.ilgeneration@4.0.1
-system.reflection.emit.ilgeneration@4.3.0
-system.reflection.emit.lightweight@4.0.1
-system.reflection.emit.lightweight@4.3.0
-system.reflection.emit@4.0.1
-system.reflection.emit@4.3.0
-system.reflection.extensions@4.0.1
-system.reflection.extensions@4.3.0
-system.reflection.metadata@1.6.0
-system.reflection.primitives@4.0.1
-system.reflection.primitives@4.3.0
-system.reflection.typeextensions@4.1.0
-system.reflection.typeextensions@4.3.0
-system.reflection@4.1.0
-system.reflection@4.3.0
-system.resources.resourcemanager@4.0.1
-system.resources.resourcemanager@4.3.0
-system.runtime.compilerservices.unsafe@4.5.2
-system.runtime.extensions@4.1.0
-system.runtime.extensions@4.3.0
-system.runtime.handles@4.0.1
-system.runtime.handles@4.3.0
-system.runtime.interopservices.runtimeinformation@4.0.0
-system.runtime.interopservices.runtimeinformation@4.3.0
-system.runtime.interopservices@4.1.0
-system.runtime.interopservices@4.3.0
-system.runtime.numerics@4.3.0
-system.runtime.serialization.primitives@4.1.1
-system.runtime@4.1.0
-system.runtime@4.3.0
-system.security.accesscontrol@4.5.0
-system.security.cryptography.algorithms@4.3.0
-system.security.cryptography.encoding@4.3.0
-system.security.cryptography.primitives@4.3.0
-system.security.cryptography.x509certificates@4.3.0
-system.security.principal.windows@4.5.0
-system.text.encoding.codepages@4.3.0
-system.text.encoding.extensions@4.0.11
-system.text.encoding.extensions@4.3.0
-system.text.encoding@4.0.11
-system.text.encoding@4.3.0
-system.text.regularexpressions@4.1.0
-system.text.regularexpressions@4.3.0
-system.threading.tasks.extensions@4.0.0
-system.threading.tasks.extensions@4.3.0
-system.threading.tasks.extensions@4.5.2
-system.threading.tasks.parallel@4.3.0
-system.threading.tasks@4.0.11
-system.threading.tasks@4.3.0
-system.threading.thread@4.3.0
-system.threading.threadpool@4.3.0
-system.threading@4.0.11
-system.threading@4.3.0
-system.valuetuple@4.5.0
-system.xml.readerwriter@4.0.11
-system.xml.readerwriter@4.3.0
-system.xml.xdocument@4.0.11
-system.xml.xdocument@4.3.0
-system.xml.xmldocument@4.3.0
-system.xml.xpath.xdocument@4.3.0
-system.xml.xpath.xmldocument@4.3.0
-system.xml.xpath@4.3.0
-"
-
-inherit check-reqs dotnet-pkg distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Nearly seamless integration with the .NET Common Language Runtime"
-HOMEPAGE="
-	https://pythonnet.github.io/
-	https://github.com/pythonnet/pythonnet/
-"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/pythonnet/${PN}.git"
-else
-	SRC_URI="https://github.com/pythonnet/${PN}/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-	KEYWORDS="amd64"
-fi
-
-SRC_URI+=" ${NUGET_URIS} "
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/clr-loader[${PYTHON_USEDEP}]
-	dev-python/pycparser[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-CHECKREQS_DISK_BUILD="1500M"
-EPYTEST_DESELECT=(
-	'tests/test_codec.py::test_sequence'
-	'tests/test_engine.py::test_import_module'
-	'tests/test_engine.py::test_run_string'
-	'tests/test_method.py::test_getting_method_overloads_binding_does_not_leak_memory'
-	'tests/test_method.py::test_params_array_overloaded_failing'
-	'tests/test_module.py::test_assembly_load_recursion_bug'
-	'tests/test_module.py::test_implicit_assembly_load'
-)
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.3-no-sourcelink.patch"
-)
-
-DOCS=( AUTHORS.md CHANGELOG.md README.rst )
-DOC_CONTENTS="Python.NET defaults to the mono runtime, not .NET SDK's coreclr.
-You can workaround this either by exporting PYTHONNET_RUNTIME=coreclr or some
-Python code. Please read the documentation on
-https://pythonnet.github.io/pythonnet/python.html"
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	dotnet-pkg_pkg_setup
-}
-
-src_prepare() {
-	nuget_writeconfig "$(pwd)/"
-
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	dotnet-pkg_src_configure
-	distutils-r1_src_configure
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	readme.gentoo_create_doc
-}
-
-python_test() {
-	local -x PYTHONNET_RUNTIME="coreclr"
-
-	epytest --runtime coreclr
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/dev-python/pythonnet/pythonnet-3.0.5.ebuild b/dev-python/pythonnet/pythonnet-3.0.5.ebuild
index 2b48e8b70a53..64886554957f 100644
--- a/dev-python/pythonnet/pythonnet-3.0.5.ebuild
+++ b/dev-python/pythonnet/pythonnet-3.0.5.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
@@ -212,7 +212,7 @@ else
 	SRC_URI="https://github.com/pythonnet/${PN}/archive/refs/tags/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 SRC_URI+=" ${NUGET_URIS} "
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 64ceb3a0ea78..0ad0804e88c5 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,2 +1,4 @@
 DIST pytools-2024.1.21.tar.gz 79853 BLAKE2B bf592feb22fa6c1c43a924cc54e7b17320705d823954f2179242b8db2ef893e306c5f671eeb63c66b5a97b18c9c3fb20b9b38516f48ea3cd51b419fa51739981 SHA512 2159d982a9b2272d7bc172a48d4cf9d7a9ce278ec99cc2cfd47cfb6162f543b774a2c717b312155c9332e7d96782914e42443cb90ebd9a1f342d54018f2c34aa
 DIST pytools-2024.1.6.tar.gz 81344 BLAKE2B ff68e2606170bf54e3f609ee7f4cfe58e063f43dcfb2706d5ed7659ea2fde863e6315d0d81dff2e62a3378f195413561a927b0c1e7bedc06388cf4893c07b873 SHA512 a9e934f1cbaf0ace32420f9b74224a06ce8421ee291b837292133969c6788c4cc8bea01446cd4d1505aca9fa81e8ae0d3eacf60d3285186e66d67d5abe10ce3e
+DIST pytools-2025.1.1.tar.gz 80186 BLAKE2B c5886b1bb3d3c18ff14bd6ccb298a73e1c84d5149e3644eee5fb7d0aa9a19608397686b444544639814a1d64e9b86d64ca56db9b1fa93911b2ebc03b630e50a3 SHA512 6c04a6a11e2797f0506963a3d2a71970af44863517ff237c68c705e94e4efe059ee08548fe9dfed6d3eab9b9fdb6b68596b8d26c943b0c5fe95543270f3e82ca
+DIST pytools-2025.1.tar.gz 80129 BLAKE2B db37d958da0cc3bef91d69028f46d193d6c06223d967990eaf4653d27a35a3b2053b3954a7abfc5c61e6979f9d4028be64bb95029e813f3bac6152669efc1854 SHA512 4a79e22f4385d86bc95f55d1b99f6146f7e9308f6108a2d32f948ed735442777a21f93ce32d0c9b3560f92dc8ac01628da6aebb81952fc3f8fa472a947fd53f5
diff --git a/dev-python/pytools/pytools-2025.1.1.ebuild b/dev-python/pytools/pytools-2025.1.1.ebuild
new file mode 100644
index 000000000000..032de67dd81f
--- /dev/null
+++ b/dev-python/pytools/pytools-2025.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="
+	https://mathema.tician.de/software/pytools/
+	https://github.com/inducer/pytools/
+	https://pypi.org/project/pytools/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+# NB: numpy & siphash24 are an "extra" (optional) deps
+RDEPEND="
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2[${PYTHON_USEDEP}]
+	>=dev-python/siphash24-1.6[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2025.1.ebuild b/dev-python/pytools/pytools-2025.1.ebuild
new file mode 100644
index 000000000000..032de67dd81f
--- /dev/null
+++ b/dev-python/pytools/pytools-2025.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="
+	https://mathema.tician.de/software/pytools/
+	https://github.com/inducer/pytools/
+	https://pypi.org/project/pytools/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+# NB: numpy & siphash24 are an "extra" (optional) deps
+RDEPEND="
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2[${PYTHON_USEDEP}]
+	>=dev-python/siphash24-1.6[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index 874c438f922a..c847ea977f96 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -1,2 +1 @@
-DIST pyudev-0.24.1.tar.gz 85963 BLAKE2B 86c6d04691c99671735915564f58b4ef892e45925047487500bc7005343db7145941dde270f4ce9279881bd9bbf203965082d54b34b396febff52f387a1c26ac SHA512 10e32d9a74884000fbf8b86bee60530f6e7b936b990e7ae3b76099ace71834602de404721101c1076ef57365622a9a8f4819d57f58508ced09a21b7d50326886
 DIST pyudev-0.24.3.gh.tar.gz 80807 BLAKE2B 8b047c1d44f9bbb9ace782b690e0859eb3cdc2c1a994a398513e7cc2288803f8cfcdc227546de22275d47961f880bd76e0dec244e46abf451534f5648682febe SHA512 9075437f6fdba0fc1921e252c0a49e1a5eeed8c5cf598856a32aa9f9fcb8885dc0727258d2965241b2e044acfdf70561d5aa3f1380b84e013afc7cb8dcbfce2b
diff --git a/dev-python/pyudev/pyudev-0.24.1.ebuild b/dev-python/pyudev/pyudev-0.24.1.ebuild
deleted file mode 100644
index 3885c94c9f65..000000000000
--- a/dev-python/pyudev/pyudev-0.24.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Python binding to libudev"
-HOMEPAGE="https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="qt5"
-
-# Known to fail on test system that aren't exactly the same devices as on CI
-RESTRICT="test"
-
-RDEPEND="virtual/udev"
-BDEPEND="
-	test? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGES.rst README.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if use test; then
-		ewarn "If your PORTAGE_TMPDIR is longer in length then '/var/tmp/',"
-		ewarn "change it to /var/tmp to ensure tests will pass."
-	fi
-
-	# tests are known to pass then fail on alternate runs
-	# tests: fix run_path
-	sed -e "s|== \('/run/udev'\)|in (\1,'/dev/.udev')|g" \
-		-i tests/test_core.py || die
-
-	# disable usage of hypothesis timeouts (too short)
-	sed -e '/@settings/s/(/(deadline=None,/' -i tests{,/_device_tests}/*.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "PyQt5 bindings" "dev-python/pyqt5"
-}
diff --git a/dev-python/pyudev/pyudev-0.24.3.ebuild b/dev-python/pyudev/pyudev-0.24.3.ebuild
index 6ea0c8e65ffd..c0751716b768 100644
--- a/dev-python/pyudev/pyudev-0.24.3.ebuild
+++ b/dev-python/pyudev/pyudev-0.24.3.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 @@ SRC_URI="https://github.com/pyudev/pyudev/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="qt5"
 
 # Known to fail on test system that aren't exactly the same devices as on CI
@@ -72,6 +72,15 @@ python_test() {
 	epytest tests
 }
 
+src_test() {
+	local virt=$(systemd-detect-virt 2>/dev/null)
+	if [[ ${virt} == systemd-nspawn ]] ; then
+		ewarn "Skipping tests because in systemd-nspawn container"
+	else
+		distutils-r1_src_test
+	fi
+}
+
 pkg_postinst() {
 	optfeature "PyQt5 bindings" "dev-python/pyqt5"
 }
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index b1ae96b342b4..8e1ede0ee4c0 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1 +1,2 @@
 DIST pyusb-1.2.1.tar.gz 75292 BLAKE2B c1b99f22919ab4beb8e96d664147dc51001c4a48b3acf9ba3961f7f53a9d13277c622e891481fd00b9d34d2ed8a2a0932b7949c13396ea4d76b36f36fcc4cdb0 SHA512 51d0c1165540afa21d6d0ab7315ac77b08083d1cb8e502173dfb1766bc542173f9d7b0070fd14bc71d147e31c3f0780b277093791a7c82485962a04ec62bf0f1
+DIST pyusb-1.3.1.tar.gz 77281 BLAKE2B e86a24022e2ced4286500ca537d964cf974a47204fc70af6dd8993e039ccf47f710cb7a3564417bbd392cac0b4b06acc1de4ad8c880f782604ecae83ce87aae4 SHA512 91dad112b928133f7439c25ba473bfa8b214fc15daa37c8992304032766498694da5a84c8451d1ae007d0eeb9e840f700d071579324fb96d95302a1e6042e208
diff --git a/dev-python/pyusb/pyusb-1.3.1.ebuild b/dev-python/pyusb/pyusb-1.3.1.ebuild
new file mode 100644
index 000000000000..c65c73c487a6
--- /dev/null
+++ b/dev-python/pyusb/pyusb-1.3.1.ebuild
@@ -0,0 +1,31 @@
+# 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="USB support for Python"
+HOMEPAGE="
+	https://pyusb.github.io/pyusb/
+	https://github.com/pyusb/pyusb/
+	https://pypi.org/project/pyusb/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+
+### This version is compatible with both 0.X and 1.X versions of libusb
+DEPEND="virtual/libusb:="
+RDEPEND="${DEPEND}"
+
+DOCS=( README.rst docs/tutorial.rst )
+
+python_test() {
+	cd tests || die
+	"${EPYTHON}" testall.py || die "Tests failed with ${EPYTHON}"
+}
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/pyzmq/pyzmq-26.2.0.ebuild b/dev-python/pyzmq/pyzmq-26.2.0.ebuild
index 2e96c7d2b190..370bb421f949 100644
--- a/dev-python/pyzmq/pyzmq-26.2.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-26.2.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
@@ -56,6 +56,9 @@ distutils_enable_tests pytest
 src_configure() {
 	DISTUTILS_ARGS=(
 		-DZMQ_DRAFT_API="$(usex drafts)"
+		-DPYZMQ_NO_BUNDLE=ON
+		# unnecessarily adds /usr/lib* to rpath
+		-DPYZMQ_LIBZMQ_RPATH=OFF
 	)
 }
 
diff --git a/dev-python/pyzotero/Manifest b/dev-python/pyzotero/Manifest
index 9fc8d5d05123..96e5c9ae31af 100644
--- a/dev-python/pyzotero/Manifest
+++ b/dev-python/pyzotero/Manifest
@@ -1,2 +1,2 @@
-DIST pyzotero-1.6.1.tar.gz 544183 BLAKE2B 9bf62f387e35440a05bc1195395c959e0ac61bad274a12dadffc946d368ce1fdf3309b4475c762e44987964ab42c710e05c300f9627b9710383290f6a4409ea9 SHA512 591c30cb47e78aeaefd475c11478cb8422448c002164cd962ff2c9fee18f8cdf62ef96670f1c325595cdbe5d64fffc2abc4f72a48d6656aeb463456f38248d66
 DIST pyzotero-1.6.2.tar.gz 540331 BLAKE2B d38e8c386f7ad1c208b23b4f38440ae101952bb1e9b2f5e6fcd438bdf1fdc3401348a14ebcba307c167f46e13ce7f8cbf46b16ebf0223bc0878b31d80c675d60 SHA512 eb2170cf1e7ff65e79d4caba68461518f81c6b457f4575f2b0fb35f8df78c4086d5656f483e4c1ff39759bdfa9f95a7865d2bd0d3895b5fb335cd12aa415b126
+DIST pyzotero-1.6.4.tar.gz 540642 BLAKE2B b0784892a7c2534e828e88f3dd10f995f733f4095b620e1ca6a10e6e0c088db6dcb5733268f621d8bf2450f17ff04dc174a58262b8aea85069f8ae4761263475 SHA512 2901e26db33f0a75e19e0bb6e2e734fae6a9ca9ff888203ae69793fbed47f76aad59246a7cbccfc68435b8f911a0e574832bf6cd371bc62e7a19528e3275ff04
diff --git a/dev-python/pyzotero/pyzotero-1.6.1.ebuild b/dev-python/pyzotero/pyzotero-1.6.1.ebuild
deleted file mode 100644
index 7b6b73892ad9..000000000000
--- a/dev-python/pyzotero/pyzotero-1.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python client for the Zotero API"
-HOMEPAGE="
-	https://github.com/urschrei/pyzotero/
-	https://pypi.org/project/pyzotero/
-"
-
-LICENSE="BlueOak-1.0.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	app-text/zotero-bin
-	dev-python/bibtexparser[${PYTHON_USEDEP}]
-	>=dev-python/feedparser-6.0.11[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.21.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	>=dev-python/trove-classifiers-2024.7.2[${PYTHON_USEDEP}]
-	test? (
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/httpretty[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
diff --git a/dev-python/pyzotero/pyzotero-1.6.4.ebuild b/dev-python/pyzotero/pyzotero-1.6.4.ebuild
new file mode 100644
index 000000000000..4e8e71d83f19
--- /dev/null
+++ b/dev-python/pyzotero/pyzotero-1.6.4.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="A Python client for the Zotero API"
+HOMEPAGE="
+	https://github.com/urschrei/pyzotero/
+	https://pypi.org/project/pyzotero/
+"
+
+LICENSE="BlueOak-1.0.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-text/zotero-bin
+	dev-python/bibtexparser[${PYTHON_USEDEP}]
+	>=dev-python/feedparser-6.0.11[${PYTHON_USEDEP}]
+	>=dev-python/httpx-0.28.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	>=dev-python/trove-classifiers-2024.7.2[${PYTHON_USEDEP}]
+	test? (
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/httpretty[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
diff --git a/dev-python/qiskit-aer/Manifest b/dev-python/qiskit-aer/Manifest
index f56ecf03b21c..841379ba28be 100644
--- a/dev-python/qiskit-aer/Manifest
+++ b/dev-python/qiskit-aer/Manifest
@@ -1,2 +1,3 @@
 DIST qiskit-aer-0.15.1.gh.tar.gz 7136084 BLAKE2B 521329642f141fbb5d4bb045f42b53e1a116614328837999d73e28c54fd7e1b8aa64d72080b54950575c264bd14349227b395363cc92ce384f1b4951d414862b SHA512 bd3a320b8022aacc9691e5aa6e54cbc63fe51e623b7b22399ad23ff8e7c14f7870c78b5ca84c0aeb420b44e088307296d01f351bb1cc90488f0018496ebbaa25
 DIST qiskit-aer-0.15.gh.tar.gz 7133462 BLAKE2B 3a72d5e1c97e54dd9090bbd072ca52c03bc90d53ec13bdb52b20112adebde6ef4e85a5d3761d5cc9fab7bc8d41651865e538eaad591dad266533441114ae1ddc SHA512 ce70755fa26150e8ce870a5f80c7f37a8e09f02ac4dbcfe52de2153b8af6f92764ac6866b1fffb75db6e1ae1b31815432ffca54f2f916337f640c14007a682f3
+DIST qiskit-aer-0.16.gh.tar.gz 7137525 BLAKE2B ddbad1c1c8be51806c5de524327312f8c56fb46f686b3c61b2059770485ff0022fab45faae55f22f2ac37e4cd6e71fd2d2b9c27c945639dc785b6dbb3a33492f SHA512 ef976cc51f0899aeaafd15d8e493925c6c60245a321bc0bf130b8496d003a5b684ce6af4f3caa91fdefe085bba96e957401b7d1aa7e9db3e5fb5d795a0459ad8
diff --git a/dev-python/qiskit-aer/qiskit-aer-0.16.ebuild b/dev-python/qiskit-aer/qiskit-aer-0.16.ebuild
new file mode 100644
index 000000000000..cc789dc13a1a
--- /dev/null
+++ b/dev-python/qiskit-aer/qiskit-aer-0.16.ebuild
@@ -0,0 +1,119 @@
+# Copyright 2022-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
+
+DESCRIPTION="High performance simulator for quantum circuits that includes noise models"
+HOMEPAGE="
+	https://github.com/Qiskit/qiskit-aer/
+	https://pypi.org/project/qiskit-aer/
+"
+SRC_URI="
+	https://github.com/Qiskit/qiskit-aer/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# The reference implementation of BLAS/CBLAS is not compatible with qiskit-aer right now,
+# because importing library causes an error.
+# /usr/lib/python3.9/site-packages/qiskit/providers/aer/backends/controller_wrappers.cpython-39-x86_64-linux-gnu.so: undefined symbol: slamch_
+# Using sci-libs/openblas instead here,
+# with the option to switch between reference/openblas implementation runtime (eselect-ldso).
+#
+# <nlohmann_json-3.10.3 for https://github.com/Qiskit/qiskit-aer/issues/1742
+DEPEND="
+	>=dev-python/numpy-1.16.3[${PYTHON_USEDEP}]
+	<dev-cpp/nlohmann_json-3.10.3
+	>=dev-cpp/nlohmann_json-3.1.1
+	>=dev-libs/spdlog-1.9.2:=
+	>=dev-cpp/muParserX-4.0.8
+	virtual/cblas[eselect-ldso]
+	sci-libs/openblas[eselect-ldso]
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/psutil-5[${PYTHON_USEDEP}]
+	>=dev-python/qiskit-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-build/cmake-3.17
+	>=dev-python/scikit-build-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.6[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ddt[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+check_openblas() {
+	local libdir=$(get_libdir) me="openblas"
+
+	# check blas
+	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_blas} != "${me}" ]]; then
+		eerror "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+		eerror "To use qiskit-aer, you have to issue (as root):"
+		eerror "\t eselect blas set ${libdir} ${me}"
+		return 1
+	fi
+	return 0
+}
+
+pkg_setup() {
+	if use test; then
+		check_openblas
+		if [[ $? -ne 0 ]]; then
+			die "Set blas implementation to openblas using 'eselect blas set openblas'!"
+		fi
+	fi
+}
+
+python_prepare_all() {
+	export DISABLE_CONAN="ON"
+	export DISABLE_DEPENDENCY_INSTALL="ON"
+	export SKBUILD_CONFIGURE_OPTIONS="-DTEST_JSON=1"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires qiskit_qasm3_import
+		test/terra/backends/aer_simulator/test_save_statevector.py::TestSaveStatevector::test_save_statevector_for_qasm3_circuit_1___automatic____CPU__
+		test/terra/backends/aer_simulator/test_save_statevector.py::TestSaveStatevector::test_save_statevector_for_qasm3_circuit_2___statevector____CPU__
+		test/terra/backends/aer_simulator/test_save_statevector.py::TestSaveStatevector::test_save_statevector_for_qasm3_circuit_3___matrix_product_state____CPU__
+		test/terra/backends/aer_simulator/test_save_statevector.py::TestSaveStatevector::test_save_statevector_for_qasm3_circuit_4___extended_stabilizer____CPU__
+	)
+
+	local EPYTEST_IGNORE=(
+		# TODO: qiskit.providers.aer? wtf?
+		test/terra/expression/test_classical_expressions.py
+	)
+
+	# From tox.ini/tests.yml in CI
+	# Needed to suppress a warning in jupyter-core 5.x by eagerly migrating to
+	# a new internal interface that will be the default in jupyter-core 6.x.
+	# This variable should become redundant on release of jupyter-core 6.
+	local -x JUPYTER_PLATFORM_DIRS=1
+
+	rm -rf qiskit_aer || die
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -s
+}
+
+pkg_postinst() {
+	check_openblas
+}
diff --git a/dev-python/qiskit/Manifest b/dev-python/qiskit/Manifest
index 0ef059d6bcc5..57adcdc16110 100644
--- a/dev-python/qiskit/Manifest
+++ b/dev-python/qiskit/Manifest
@@ -25,7 +25,6 @@ DIST concolor-query-0.3.3.crate 8337 BLAKE2B 0d4069a63d79dbf76fb56ab1aeb9992e2c3
 DIST countme-3.0.1.crate 10784 BLAKE2B de1803559fab0accab1edcf5db43279dfa3d7b2874f5c0ee300f46ccccc8ce4c5c3d92c5a3c211068430d903f2e9288ea07fff532d84e3c0f80edadb0752a803 SHA512 f4c8c0977c6871ac8b7eab15904789ca53cbb28385a6fc90d880f85afb44bf10602850198c624963c7db04dbee8c97e271865ae2eadfdf840c21792de4f2af47
 DIST cov-mark-2.0.0.crate 7890 BLAKE2B 7218b81a8e40d2e4d80b334c349bafcb690078a145637053343f5fb8ced074beebecd00e51358b6137cd0852b670c215bd8183f969200e7e680592c37911ee2f SHA512 98f234f7d96b55f2cf6432aed8a010f76ace30b2bb4ae960868860ace2145074dd4629ea173fb6d99b4dc75cbb5da513017a4374b49e5c57e5a9ce5a6e0b5725
 DIST cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6
-DIST cpufeatures-0.2.14.crate 13165 BLAKE2B 45521d1a4bf2ddc03c6cdb9ceacb900806a03748fd122dd4431f6927d06cbf8608f9830e312b5728dd55b5084476280669129ea80477432fd04fdd68a0e50fb0 SHA512 402c0d6497c65882415841b9eb5953b1dcc1cb35b9fb4512801f3d0e2a056ca95bd32fdf70b6e65a18b048d7df8892c95fef1de975b56b63cfe45460783d5867
 DIST cpufeatures-0.2.15.crate 13196 BLAKE2B e22ad481d663822de89032f18f63bbdcd1ddb989738893caa9cf15105043d46a1fb657df034212030238596dee2a8b1fb7c8de4065795611fd6259ea39c14f68 SHA512 297c094870c6becb0f0d41b09ac63df4f2e23858803a36469f7391a9051af2ed7ac28beb1ff926cd2f4376102fa72a903441945e7cde809a09495a3af34b0792
 DIST crossbeam-channel-0.5.13.crate 91174 BLAKE2B 7a9aed6f4922c1d10e4ae12508a03dc7daca773adad6a317c4ea38e544d7c28c56a06623d958aec540fcaa86fa9051a1aaa2c859dadff72873f18f2f3a951449 SHA512 0f31223a7099f84e39e6b76b19cf26736e0c3907fffc2ed3eb0012c7984b1993570bf6d155eba5bfb82897ef0e4fc93b89096071410bbac256ca6be9a9568ff8
 DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864
@@ -63,7 +62,6 @@ DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384
 DIST half-2.4.1.crate 50892 BLAKE2B c275a9ec70d2fc0c50cb63421399202d31252b0dbf463798ed0a12a17493817c66b8933811d483b348f8f945cb05aab7cc2a4d952bd16009c3da4860202e28dc SHA512 0bce235583ca128723186e1fb50f636b519bf826c942f02c5b969db4117baa87c644665c541991c16d1f1dd97c7233c017a513d45075fc72c5d99ccc7c1ac193
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
 DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
-DIST hashbrown-0.15.0.crate 136460 BLAKE2B a2bc34b9d2eb7ca52dad7bc59e9bbb38ff9f79925495e1645eda7c0587e86e0a3d0675f8c7f159c5a83dfb2832fee9788a7ba6914168b51c26f762e140bd05b2 SHA512 497310e0f8e256e931ae0e752f66eb3811d5d3b9254dacfe2a1227e8532dc23eac8cce7a3f0758fbe0e0fd8f08b7bb18b5f118dbbf4fdf575a31666283583111
 DIST hashbrown-0.15.1.crate 135873 BLAKE2B 2ea5caf324b9574b2fd25a5659ffe00f4c05015b92fa8cdb8b33658469986c6117f7123085c41de83dc0ff1e91986cd5ee9ddf692b7a162d97bbf50aec76ded0 SHA512 8bdd4966b336f5d5b184cf14d4a7e625d184d8f3f0782845c746f374f92425055def71e64087fb3a3770fd9b2d9ed40310fa45f60e56d298accaf9c500add841
 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
@@ -80,7 +78,6 @@ DIST itertools-0.13.0.crate 146261 BLAKE2B b23d59a87f80d24925bc868c0ac7abb6b9d05
 DIST jod-thread-0.1.2.crate 6322 BLAKE2B 8e27300e03c4d34265be761212b8d23dbea90fa6f443a55437a23df8b769e76a341f060c6ced8dd5a036d4142b08461b9d0a68a46b593fcf772fb0d3a7e78cec SHA512 fe3a3feb983b273bf86ec26dcf4edbb1fc0c5f583c3115cedcc63279cb72f0b40bf4134f95d673d5f3e532bcbeafff09759509f55543c98850e750aea39711e2
 DIST lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f
 DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
-DIST libc-0.2.159.crate 755366 BLAKE2B 70f46eb6228b4a8958dfbee00cdfa3c7d218f30d66c8591f4ccc9c5d8eda411d83ce9450552384ac4bc29deb2869561a2111dd157c9f228f617baf8f6b537bc4 SHA512 c803939ceea5ad9bdfdd122726c7a5f12ffd8b0cb66cf0bc62c9670e1e5904a504def388c1e043c520f4ece484addf6dac465aebd58578aa6b79995077bbdf9f
 DIST libc-0.2.162.crate 769354 BLAKE2B 3bac6124db801cdcd6918ccd86e84c99cced45c44dba11f198ec5852354942db511966fc85347d2ce4c8ff82c89eef2c47016766b2f6ffbea20d99c1deab4ead SHA512 f43e294d587e7cd9c2da9b67be83fc70801ea66c318342cf1e11556566ecc1c8a612925770d85c75af1e887b425f326fac59229b78877d2377092243ea8e6a99
 DIST libm-0.2.11.crate 111477 BLAKE2B b1247b197dc66a38b9a1f9db0e32655c9ee09575347895bb1e3f22e6953c334d74574a7015f214b0af0eed564ff2ee4576d07d0db5421aae917a7aa1e10ea142 SHA512 86742b5d97dc976cec5bbf75f565b40c7058e74cf840cbc7baf4d84823318040ac692b5796a407bd44caac553dda3f5a087d3bf8d6099cf26305123ce106c7bb
 DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
@@ -124,16 +121,12 @@ DIST parking_lot-0.12.3.crate 41860 BLAKE2B d1899a1132035aaea3a784290cf4951ea3b3
 DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389
 DIST paste-1.0.15.crate 18374 BLAKE2B 69ee7def55e658a9aa72405bad62325e8d6021a4989fbf11c88d1bf05fbac520f7b04d467bc3c6eb45043a41119f65aceecc4a6a1418a9192d73f33134545062 SHA512 5026d3ec7141ec4e2517a0b1283912d0801e9356f77b703d954b379439b8d85e3886d42fb28f7835edaeeac465582da14233564fb010c71425a59c9e1cbd46b4
 DIST pest-2.7.11.crate 123779 BLAKE2B 23bb1f3453d5d839dba7b3292806eb2d327ccafb1b1472fd970262a44c0abbabfbf3316ca16dd5526177bcb67a701cf79fa86b68fd1e57a3d875cb4b7ff89ad9 SHA512 daf92b28d8757d0c41e347668e54b90522d654a451ba03d01d9aff9b22d6c57b6a264237c5c8b1340e45605626fe848dad84672ae2e83604ce22b2c89cbd08ac
-DIST pest-2.7.13.crate 126601 BLAKE2B 1f284093e30ebe7596b584be5e3d0e077b88987aa1b192de4559247fcabca7f8c6cf607167f1553218194678dbe0acf24e81c91877a1f41ad6784fdb4b5db61a SHA512 6cb0fcbc2adeacb8a761ee927ccab47815ca6d8cd56c289406f278cadd2a4c22b307e8b15a1c38fedddabf237b4b7b2772e7b25d752ca8c9444972e77a0c5697
 DIST pest-2.7.14.crate 128275 BLAKE2B e9c98901c2237d94f9d5fa742674e5eb71c5257cec89a3ea6a16ad7488ec77a21bfe4078c34e890f55393ff6d3223ec86868304df86884fd40b955984fadc998 SHA512 3662eb93631aa6821f1ef98350c7569afbdff82edd764697b170ebeaa75e92d7b301bac4722ba14175d0f0432b39bc891617413393569cfbf17e21b25fd6afee
 DIST pest_derive-2.7.11.crate 36320 BLAKE2B e81ed8b60492da9612d2208c6cfa712ebf8c6ed7993642bfc4fadeaba10a0bc16700bce012d34d955104041ed8bbf659d16d9b86eab52342875d4c6148e7f60d SHA512 96f6b44ac09785ce5981f082ddf283a178c676a0b436f9b0cf7afddc8be38583f0512adce83363f0ee8ec4f26bbfba01e30dcb17d9420adc00b0a82c10349b86
-DIST pest_derive-2.7.13.crate 38735 BLAKE2B 227a3c8e598d7b5016c49f385cfcc9063b508c9167f1c7bb671057aee8ef16a75352f5167fc5bc772902b75c1fdbac8c975bb643a8eca3c0dac957142508a6cf SHA512 bff81420a7f1ecf75a32b34865f20ccbabc843fca46db5bb9ce85894cff207726c9544d9959d8e7a1de4549b53aa2a458d18bd63f388befb54941b96df3315a9
 DIST pest_derive-2.7.14.crate 38801 BLAKE2B e36399e55739b65e1056c82fda128e3eefc746cfdee523f174f3986a48f0442f802f35660ac889e7b96e1e1b6eeb5c9251403994a78e2f21b8c9630de181037e SHA512 df44b21a3c32209a2f0ab121a60a8442272a54bcc53a414ebf54de8721d09cbd6790737d5fa2ae4acf3d4aa9affb4df6f0570459ab8c48ed7634663469b17a7d
 DIST pest_generator-2.7.11.crate 18415 BLAKE2B dd65c69d8d0ff343d36e31e6a4f4e11aeb01b1fd23d0db06d90f506ec2f2bb2c50422f6a73b48780e16e07c8d0addb374dd09cfabaf6230d5b2ba409dd3fa6cd SHA512 14fb3bcc44ea6253cca86c78166f3f424a312e864294d0f1aa12029641c5255c106d69b1712aae37cab443ab32077b1033b97c0d7650a7496c191748d28707eb
-DIST pest_generator-2.7.13.crate 18416 BLAKE2B d602b176fef7967bb1e3bc1410ff9477d54af581fcc52319467c117a3fb409dc87e4ff01eaed5d916c8b91b4a6a201d220783a4f14488b4b9a13bacade0aeea5 SHA512 1211ae0850f9225cf5d3f24986ebedbf6cba9cc17d84d0cc2047fe19ea7298dd34282a3fb776702ab2dca8e5ba2914073b4d92c04f2f8eff072997bba089e01a
 DIST pest_generator-2.7.14.crate 18413 BLAKE2B 9ed53ed9c60151ab86ba8a23f863f57bb6aea3f2d400fd1bbd1dd12e6fa6d903c594d0dcc9f940b4211046c86079df2f0fe12233a26ac54fed5d848063f90838 SHA512 2fdedd51d09b5349e18edeb021ae1f137ce3a46dcf536708a455aa5ab23bc108f00d08a89c2313d5220cd9fa2e6d96cc4a5d22e43e61250c5970a8ea941a27d9
 DIST pest_meta-2.7.11.crate 41551 BLAKE2B 9c34f1ab14ad5ae124882513e0f14b1d731d06a43203bdc37fa3b202dd3ce93dbe8ebb554d01bab475689fe6ffd3ec0cbc0d5365c9b984cb83fb34ea3e9e732e SHA512 a9edfaf3fbaa8cab0615b16c631895f1442d3e64561bb9b356b5a2150c1dc3db269375740a898d986fea399d8f7c8f50d01325ead8d976d6d165d6a104e281b6
-DIST pest_meta-2.7.13.crate 42079 BLAKE2B 641ccab452ce3dbfec11e188d8e1576ade3da0f10781ebe6478319e9caf42107436acd14e6e3c52eae7488e635a67787910b3625e19532e0aa3afca0971885d7 SHA512 c61ae59f25d7bfb56df8738fd13b2e99040db8129f724cd92ac6cb8537df606cdf7ecf4d2bc8393e116c4b09ff7e9bc5583a83658af974be03d778ba74fa0fe6
 DIST pest_meta-2.7.14.crate 42079 BLAKE2B dd4ee146631601a64b33632702b0b54754a31d325e44faefd94a1de4acbf599a64ce7fba6465bdc82be1e5d6a08d9184d3779c0ef11d971a8c781b7b855056c1 SHA512 9de54eb0442091745ed494fca85b6d86401b942cde5793ba405939ab83334ea71434675cb3c12db6222f188924753309a3f7a3464e32a445d6037369590c5c87
 DIST petgraph-0.6.5.crate 710970 BLAKE2B 7f590e93fb44f1bfb8920e512402edc1cb087ff9d5dac7bc4be965f64ffacf9c1c503eab4156cd2005f41099f6b34f51e49b21dfa217271fcc0d4ee16ae85366 SHA512 454e9805731374abf1085f1a8a72aaed85e83cd30ab9601bcfe0e46882ba6656242284bdf32b6e75c2f5ebdd1325d5f8873d5f720aabf297822ca97311afb677
 DIST portable-atomic-1.7.0.crate 145385 BLAKE2B 7d9622d636677e3adae0f909405090318a9d6189fc18683ed21074e9360f213b44c5213f3561e3dd1f642547c2c2e6682b9e1efa63243c1f12636bb11bd15dbe SHA512 0849edaa7a1f9ea66182443e31691e7839c857240916521bbd6009b5e692b13f5b315df36e656134651386bc50d895ecf6155a906750009514cad8bfc7e57fe2
@@ -145,7 +138,6 @@ DIST priority-queue-2.1.1.crate 36321 BLAKE2B 12b77ff251da81df6f3879e5a61c545865
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
-DIST proc-macro2-1.0.87.crate 49121 BLAKE2B 4a5136e28b5174c1382037d294dfec51cd7211eb7876c06a98600768d071915e76c81a7958a780cb7b843b98d9df4bd4e01d4f280db226d241bf84de348593f2 SHA512 32ce9c8b5bad55cfae537882c3fffc4d56824f6214ea97aede89ad460e3f66956b52af4a268496fc95c2c0eda0baeaaed4b12cd98df2efab24837e23b48b1f0e
 DIST proc-macro2-1.0.89.crate 49446 BLAKE2B 844c021394e7a2551bc179592a6769d672360150abf92debcb9ac60a94a2e426c48c408f06aeb2128686f5f04d66dc12973714670c21a5063ee6b9f3bae4e671 SHA512 488ab38a04df1d0330309382a7e4f667238cbc9b4d513da6a8f5718f8a762f76cc122af67fefe8f4b021a286b3d23e3ec83d781fe6ac823042a6daf14d147e2f
 DIST pulp-0.18.21.crate 117829 BLAKE2B ee42b3cfdae4d8a78f01568c1579247afff9f4f2d56c2fcef3052990c006dcdd92720aeb400bca2410ed1590bd3e17675ce02db71a4a773490cd08948cda29c8 SHA512 ed668aad2df595b3381678e09e5302f675d3a73d686e23d816cb509ef354e43e136ae4d8d7ba2c8af40e91b2ef2ade9e2e10ac44799dd64cd6b7a4984029334d
 DIST pulp-0.18.22.crate 117838 BLAKE2B 5ba49997207ecbe92aac295094a12d078d6cb6aa2ded5d40d73186129881a15de1c0b0f8682dbf054c2e4fadb40000f7455a4bd4da1545618edc5427a1ae7d32 SHA512 f4515b91da08143a1053f7c5f54680beff49357401edfb9fe1a1e16b656139d2d86f3de2c264e9377b16241e68f7bca698c7d591a464831f9c7ab12c3ae17f0c
@@ -162,9 +154,8 @@ DIST pyo3-macros-0.22.6.crate 8182 BLAKE2B 81998e4f4cb325763e4d3477af05b332e184c
 DIST pyo3-macros-backend-0.21.2.crate 58088 BLAKE2B 05dd49983c8aeddc47cd94f6cd58f10e41ad6f4ec57006908cde4fe3edbcf6814058d7843a88c9dbeb0824f840ad3509414c52e47fffe5ad4b730f791c9a3f19 SHA512 f8488ba0a68f1ae20d053e2323d065f03b40c24231a50b05205b100e973ae50bc7bb9c25e4d37df56f4cfa73d2001655ce9685078d1017a4a90bd7945c01b833
 DIST pyo3-macros-backend-0.22.6.crate 66312 BLAKE2B ec0b11bee1ad2192e8d95cebab0075d6ec5bf628e3344b86fb8e20a6d0bc1f891b56ccfa4622840a609480581f32bd211b9a3d1dd989716cf255efe3fdc89331 SHA512 87463939b5a5674e30e8ca05ae747f652f8679f0c5c85d20967e9910ad853768a769a914580e82e409188fe4add80a3117ccb9da24c250406bc6f76fe4453799
 DIST qiskit-1.2.4.gh.tar.gz 10825861 BLAKE2B 5a916fc3b726d3f623c5c822a475248c5e5ebe6c5d4ff9485d0177714c335cf87d29b7b911535df7a5f9076ee24e7d2c8116d9062ae4e1d689c83e3805607665 SHA512 46e7c83f9a4b3c0e99a6328fc50ebc30bc57aabf0773c229575734bac606649fb6e2d82f1b3de01983a8fb29a2416a813ce020d8d2c87714ad28a6d14ac5fcb0
-DIST qiskit-1.3.0rc1.gh.tar.gz 11125834 BLAKE2B 6ff50d28fa8b8d3490e5ada449bc5a8cd2549ceef9d663decc3c172a1a63600f5beaed80693bab6406fb48f6a55aa2646f99a231009eeea651e06f8cda906116 SHA512 a7c8a8920a53a9fa4ea043a8f1432d9c93443d1cb4826576f68ca81d4edd2f9575ec9e30e9230fefdab816650099d5fbeb10b92a5a0de236e1433613da8367f1
-DIST qiskit-1.3.0rc2.gh.tar.gz 11127183 BLAKE2B b7c1b9f27397f7031d449ba796d9c43e5f985869b083f8b6985008c58ea12d23eb70fd7936eebc2b67a703306d4c0cb687b53f0dae7ca0815494d36d429eb3c7 SHA512 2e5a764175a0da0f2c0be4c3ec994762b1aceb6cafc1029d49523a23f9af8e15ee76d3191c7b0fcb1f89cf130f5d2471a01e8ea7c6d1caaf064bb2991fd33196
 DIST qiskit-1.3.1.gh.tar.gz 11111216 BLAKE2B c57aa2ce99efcd536dfc6f66fb680f58264930e4476ad5d8a32608468564815ab6a92a3edc6633f831e48767648561787e610587aa2014441d888f09a90981db SHA512 b83d2e7bb69dadf76931f17965ba28dd2994c01fab9343029517d086c897edf087bf65c5f2ca85873669d65d7cc31934068264df0c2695e5c04d49832365bf68
+DIST qiskit-1.3.2.gh.tar.gz 8483402 BLAKE2B e2f191f3231f858ded9c389f952a2207bfea4680be13db6207e9870fb08f2015c483e3fd891a298eaa531635cb7d1027bc10952b0c471dff9b89ed524e6228a3 SHA512 067143cbab3b89a33327fb5350ebd699a12b1be6405d1186fce4767971cb0a59b27e08292d3828a3db40f241a70e96eab2e4ef117dc6b8de9dbfd6be05da1025
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
 DIST ra_ap_limit-0.0.188.crate 1283 BLAKE2B 265a70d088ed76500cdbefa04d1b2778d54985aa978b806e9ebb016348556559799b8ac889c00aeff51d4ff08f3fa86cd3be3742f5896916edbbda49bca1946e SHA512 01d56844fb4437959e93fc3394d674848eaae3365d271c01ba5ff12fc05d4a1d11eb4145ee89a65eb5ba12db4075e8102ee31df55c569c8ee5ad6d383f9f451a
@@ -181,9 +172,7 @@ DIST rayon-cond-0.3.0.crate 9913 BLAKE2B 4096dc35abfa825739953b92e2eb62822761e4f
 DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
 DIST reborrow-0.5.5.crate 3789 BLAKE2B fe9dc9308f9ba42779d46a4e329068f75ca401ad17ff497f0f04710eed3392a11c316e76223b6e0b6f3d5ddee5e2382acc8307de930f17ecff36e47570b3a58c SHA512 86323b500ecbe862634f5a85d494bfb8b67398a3d704882e29826c47ec03d496f3bc4d8b35d55b530f6034a750c716e2628283bb68fa4ea612bda5f963f5c9f3
 DIST redox_syscall-0.5.3.crate 23830 BLAKE2B 0a38235ec277144f0c3e7bcb1d273c7f357d85aef33dbd06328ef16bab7df0a07b523431590899ea58d55e8e1d84c32392478530200cca3a9483e8a47b29e233 SHA512 777d1208004b7756887d6c5745ea408972670e59430e1d299d01a463ae41b98e0920ee77aefef8755fc949d4799dca679afaaae9c1a7d060f76f69af5b90427e
-DIST regex-1.11.0.crate 254059 BLAKE2B 9450e54b522c3f12e4f1d814025c3037f8373b9e1feaf2028756b573335cb7f22400b0925e3ceb0716d72aeb19b02b4bcf70b0b435a0252d0d52a7028d95308c SHA512 16c066664ae87497f9880a52222301fb0d44053ae2d6861ea21dc59cab82bd1ab8ac407f9e77228a21a586ee745b02f9eb10e7b9b30df2f3aad73633270bf73d
 DIST regex-1.11.1.crate 254170 BLAKE2B 5cf41012fc2ba8a006c0eb4a922cbbf1614bf300be361c9e2d98956a9a5e9b140e37bea09132fab7bfb633d4439158723624bcf45e8c619c4061b399253c1b82 SHA512 d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8
-DIST regex-automata-0.4.8.crate 617784 BLAKE2B 7535c79f6ddf1b1225e21171921594dcf32fc3afd47519d2067b2047b19070cb7e6fdfd1563b884fec6f91dd568522fc95d85bf095c11f8c02daeac128c45020 SHA512 278e3e2ab230ed5fa7d4837e8ea879fae68ebf35c2da5cc3a67f46b7d593abbcf71e6326a0cf34e38edc0f3f2166ff42a4fcc17a400d9604429aa5b4be075a3f
 DIST regex-automata-0.4.9.crate 618525 BLAKE2B ee3fc41c8c445be4c1aa3e5b19a3e61efd641b1a24e7a1ed55f837c1fba9c816272cb4645c13232b66b170bc7c413802928beb22e3891500141ad4ede65b60b0 SHA512 40bde0ec91cc27bc0c3fa237a37ecee5a1f023dbe006a999c5888f8f578ee2c4c64d9edfe1827546cea8e92ca3c10f8b4d494d81f3d0422b40d90bca9cf598d2
 DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff736f2d9991b19814ffc1a414ebc5b76e84fb8fd36c983b38e8e391d165cdd9047832b0d9100f0e1ba7085484b7db5 SHA512 549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8
 DIST rowan-0.15.15.crate 39971 BLAKE2B 26f2ac9d56998141d770bd2a4c9d19500591c814c497f9e2ebc45d89c440a623021469aa54e2775f5138aa0b87d7a1fd73b731e033822ee193122750e6cae29d SHA512 77caf068a088d2ae7fa333b744a30483b560c395fb7e6d3958858da871b495bbdcd8bd8472f44a247cbaa315fe4c7174c6d85b61cf30a0eeb7b0cbd3526ced2c
@@ -196,26 +185,21 @@ DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST seq-macro-0.3.5.crate 13332 BLAKE2B 2e93de606214852f2d5818398565770d01425fa2cd8361397e877dfba2c890e472d46eebe2c8ea2483f99dd783c8e80383f700b81dab3cc019cbea977f4ec96d SHA512 5eea67d40e6c6217512140791dba33e0909bdef6ddbc09ab14ebf5ec862126be68413e0c4ea34dda416ef1a9b2e64e32d7c69ae14dff44a7965b04606b6ed596
 DIST serde-1.0.204.crate 78253 BLAKE2B 6fdebf3cbcc0327b404caaae43c87ba2b6105374a5ee3eaa34d44866e782132cff535da4c069c007783b7b6468d55cb1ceb6a41da74b9eab03ace7cf4811e09e SHA512 2fefbeed0117bd791fd25dd5ad0c99ed4f60aac5919605b6f642050f748dd472bf9d4d121b78b0cfe8719db30a675559d097bcc7542cb57451d1779dfd8d294f
-DIST serde-1.0.210.crate 78338 BLAKE2B b3621d1313312177a346313e6e384fe9660f74eefb18e6cffa39fc2aadc0ab73be84b9037c59b716e5feafcd73f4f054f83e6d17d82746984b3064bf8d3ed338 SHA512 0d853ca51543ae8b4a0c70204ff4e559a4eec77af3d3bdcfc75c5905c80d4ffd1bd9eb8258ea4f6ecfbdd26477ecac7dd698d84d86759fa32e03a9cce02fa4ae
 DIST serde-1.0.215.crate 78527 BLAKE2B ca8e1175839ca45a4d78a155f5943396211408a85e0840b065c52948188010653d68fc4fc7b63bf2c39a11a6988abb7f6f3c6d878ca1373596e0a5d62186e109 SHA512 3da13f1a74393f1fcb6d659b5e060a11ecae358f55cdf4a2fd05bfc863fea6f75d3140d3bc74902f8feba8cddf7dae71a3f4e4e78e78e1b08ed46b3e4900281f
 DIST serde_derive-1.0.204.crate 55871 BLAKE2B 8f0cdb244a820712d557a3273e505c4461f4d7db89e8394040b4c66ede787b6b38b4c9923b38959ab4042c9076b8af72008c0dd15ac93a0ecdeb99da8fb526ae SHA512 bbb2b5e60e2af5bc7528b937ffaf0d3ffd433dbd9cb2592c1e07090620309057e4f11cbd6112fc1d2c5557e1bb3c0f4d59eb06ff06fa021ec683ab880997140e
-DIST serde_derive-1.0.210.crate 56020 BLAKE2B b346e574c99b6a8b12dfc29b20a4fd2daf8abfabd3714ccfde059a3a1f14a5628d4acf6a03f8076174fd28adfdb7cb9bbdb8ac0d4403aa2f43e917eed4b08028 SHA512 1c54d70a55007c00d3ff3d8c2096f4f9966431ba7bfd9195bcf41932de71b71c4ab934f9a8c5067cb56a042742cf0efab07377dbabf12feb1af6d20399de00b5
 DIST serde_derive-1.0.215.crate 57092 BLAKE2B f28bb66017599afdcd8d45c514b8e07854eb944c1dcf931e052a01ce421e0de6c20c13b3867da5922e2153e25ce88bf9fa27e2e68ddc9d212977f71fa0bd6352 SHA512 cae686bdf10c683149956ffe1c64fcf3e9b9bf0cd6e33b4ce7429d0ca35b9fdb55443693866c1202fa79348c6ea0f49ab3be3d5f857de4ae0818d2b4c8c67d9b
 DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785
 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
 DIST smol_str-0.2.2.crate 15840 BLAKE2B b41fe165eb52a0d0e315a2a8b78c9c8afe8767e0cc90f5f547a193b4c0206725fae2d3c14d9cfdb40474d288765178366a8e553ae7adce894c02fdc684fe7d99 SHA512 0ae3f9f94cfdf0c8040e77fe31517f8281c5d0c15a2007302034139d9e04b65c629b23d7406cade8118c932b8e9837b37448f05a77b01ca180d477d14a05dd8b
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-2.0.72.crate 267069 BLAKE2B b0b979f78937a10a6db45f96d5d93c595427a4e158d658a2186419d89b219a4a405ade488d88d9ebdbd605ce4b706aba7088ab39a77294f3cf9847bf032d8f91 SHA512 c3d26bf9787555bc6fd8bd789855d252e80ad28a413593e13bad174adf86087ff195a6b4227bdeb6d1a1c87b0af8e965d6f2d04b8d45e7383b6de49990b92e89
-DIST syn-2.0.79.crate 268981 BLAKE2B 2bf4bde1890ce4ee91fbacca81bd298d15f0111fedb27b9cf8d675dc2489f46026c1804f9e4e24afbd0718539820096cd5c4ed2c2da02e598370dbfd2b18c293 SHA512 1ee073fa3428c031e53bff8ff305bcd6b37ac142bee3955dcdb44fec1c77c733eb78760c8bfb30b83fc3dacdad8a384e2b6f9f31a89c4cc300359e33457fd433
 DIST syn-2.0.87.crate 278076 BLAKE2B 93385f64103fdb482bec34c7912474ae7a5935948715e6eb9a54907e0db5c39f089f6cd393bab33c935c59a1bbb0f4099431f206343811c1a450554d96a35756 SHA512 bcfff545d6dfefd81e09f8f30a86bdd85759b3a7d4093ef3365ed02718e10dbd604c52b94c9d7fa955d339fdc5b6c079940c6f345b5a48c52b5c8607794ca6f2
 DIST sysctl-0.5.5.crate 18414 BLAKE2B 221ed0a30b698a7a32b4bf86f16a641182b6e430ffb584420b555628ece13b5a6ed44f663337c4bf278d5e151967e82ea5ad55a9a8090f80b837708740830521 SHA512 cb8914b367e4d6adb31924adedaaea22a404a4274bea5a3f2b7f71dc429297e7805511c74616a41015c13db0a10a714ed8d8f5d999e87e0418afdc4791760fb4
 DIST target-lexicon-0.12.16.crate 26488 BLAKE2B e7950e4a302059a1bfc9bc15618a3c1b971a17cffae117a6e8f5f63a0d82fd2bd02680301d15338612d5426d349dd24cfee30ee787a15a7d3187f2a6825e69ce SHA512 092639957c4a0391560b6442b31c47159c04d12e971010f730a6ec9cb5389e4be903ef3d7daa06db95e64dc78b6970731fb647179ebaad2b12e9ed5e9b24da27
 DIST text-size-1.1.1.crate 12553 BLAKE2B 54c48d202650606d182b2d046d6a0a35b41d4e49adebb8f9f48a22329966891036af7dbc09a4522f0ca55533dfc8e87c276fa2bb4e7a24bed57a26794bfc3ee8 SHA512 e1b0323d2f83ad85ab8c5dcbe9b2084d09592979e9edbcd03d40576abc805b20ba3d6b59261465cae5e987542d4b665fbf797369ff1cd7cbbbfad271258b0ce8
 DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
-DIST thiserror-1.0.65.crate 21825 BLAKE2B feca5315211d9c2f953dbc2a1b94eb7e00aee29918617b033dacd24fa8575bb3c540dc788496b4d8c4f2ef93715e2c1586ebed9dadb4531c13cc8404dd5860b2 SHA512 80a6525265bccfc890599070166133c25ba764d6bc63a486e5f7350e473826c5a004b08a5c58b0fd4c04dcafb7649617720021564717021230078ca0bb416697
 DIST thiserror-1.0.69.crate 22198 BLAKE2B fdd8ca8c8ca78702377d0bf7b253440519018275b105db980d63229d0d44aa5c39a703e14aa6fe453c779b3c864d8044009dfef893d2a5294950f067656d7a80 SHA512 ef50d2867d965da1dfb29d26faf6de273b5fadf78f95313f6caf44d68bfc610b9bd4b7544200b05bb0861231cfc84e961007f8db83c7905244c492037fd31899
 DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102
-DIST thiserror-impl-1.0.65.crate 16077 BLAKE2B 06b704bac22338710de027d220d86451d2dc832df722888d01d35f87e34853d683f1c2508937ae221cf0c7d20d8026092d676f8910b18f7cb3b21189556141c2 SHA512 ef211d621322fb5886b2eb3c7fdc210c7885545a736bb37b195666051a8b47ec8b771fc4f6c641cfe36a840cb841186ba132cc5a270caf3137cc17bdd061251a
 DIST thiserror-impl-1.0.69.crate 18365 BLAKE2B 51663251ea6ec99c59aec35fe73c5f9760809d6b6b7eaa8ecbc8f6939acdc4d0ebc11f9034d9204dde7bd689d5e8303ae0be86e298745e9ef96825bf73453a08 SHA512 579eb796c8885feb01d27638862823acd96c79440655bb444c3445ac00121852603396ce7439aed617c0a0ac69f62102167fde5845411c906997574a46d6d9e3
 DIST triomphe-0.1.11.crate 28299 BLAKE2B b7ad2ce3aae0d97363bda330b2e0fd83fcd661550cfb84f8b90061dd85719c18846bb002552a6e1bdfa6028636729fb5945b2568ca42d13b41ee890a2c9e0b46 SHA512 4f555d9955978efd7d1bd806d098e0d39bf7f41cac7fbe2864de02b43697735d64746300edbf18cda2a3ec61ec0936cbbedd7a4e82fb4f99916be79f8c3e34bf
 DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
diff --git a/dev-python/qiskit/qiskit-1.3.0_rc1-r1.ebuild b/dev-python/qiskit/qiskit-1.3.0_rc1-r1.ebuild
deleted file mode 100644
index 86853089155e..000000000000
--- a/dev-python/qiskit/qiskit-1.3.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-CRATES="
-	ahash@0.7.8
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	allocator-api2@0.2.18
-	approx@0.4.0
-	approx@0.5.1
-	ariadne@0.3.0
-	autocfg@1.4.0
-	bitflags@1.3.2
-	bitflags@2.6.0
-	block-buffer@0.10.4
-	boolenum@0.1.0
-	bytemuck@1.19.0
-	bytemuck_derive@1.8.0
-	byteorder@1.5.0
-	cfg-if@1.0.0
-	coe-rs@0.1.2
-	concolor-query@0.3.3
-	concolor@0.1.1
-	countme@3.0.1
-	cov-mark@2.0.0
-	cpufeatures@0.2.14
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-utils@0.8.20
-	crunchy@0.2.2
-	crypto-common@0.1.6
-	dbgf@0.1.2
-	digest@0.10.7
-	drop_bomb@0.1.5
-	dyn-stack@0.10.0
-	either@1.13.0
-	enum-as-inner@0.6.1
-	equator-macro@0.2.1
-	equator-macro@0.4.1
-	equator@0.2.2
-	equator@0.4.1
-	equivalent@1.0.1
-	faer-entity@0.19.2
-	faer-ext@0.2.0
-	faer@0.19.4
-	fixedbitset@0.4.2
-	gemm-c32@0.18.0
-	gemm-c64@0.18.0
-	gemm-common@0.18.0
-	gemm-f16@0.18.0
-	gemm-f32@0.18.0
-	gemm-f64@0.18.0
-	gemm@0.18.0
-	generic-array@0.14.7
-	getrandom@0.2.15
-	half@2.4.1
-	hashbrown@0.12.3
-	hashbrown@0.14.5
-	hashbrown@0.15.0
-	heck@0.5.0
-	hermit-abi@0.4.0
-	indexmap@2.6.0
-	indoc@2.0.5
-	is-terminal@0.4.13
-	itertools@0.10.5
-	itertools@0.11.0
-	itertools@0.13.0
-	lazy_static@1.5.0
-	libc@0.2.159
-	libm@0.2.8
-	matrixcompare-core@0.1.0
-	matrixcompare@0.3.0
-	matrixmultiply@0.3.9
-	memchr@2.7.4
-	memoffset@0.9.1
-	nano-gemm-c32@0.1.0
-	nano-gemm-c64@0.1.0
-	nano-gemm-codegen@0.1.0
-	nano-gemm-core@0.1.0
-	nano-gemm-f32@0.1.0
-	nano-gemm-f64@0.1.0
-	nano-gemm@0.1.2
-	ndarray@0.15.6
-	ndarray_einsum_beta@0.7.0
-	npyz@0.8.3
-	num-bigint@0.4.6
-	num-complex@0.4.6
-	num-integer@0.1.46
-	num-traits@0.2.19
-	numpy@0.22.1
-	once_cell@1.20.2
-	oq3_lexer@0.7.0
-	oq3_parser@0.7.0
-	oq3_semantics@0.7.0
-	oq3_source_file@0.7.0
-	oq3_syntax@0.7.0
-	paste@1.0.15
-	pest@2.7.13
-	pest_derive@2.7.13
-	pest_generator@2.7.13
-	pest_meta@2.7.13
-	petgraph@0.6.5
-	portable-atomic@1.9.0
-	ppv-lite86@0.2.20
-	priority-queue@2.1.1
-	proc-macro-error-attr@1.0.4
-	proc-macro-error@1.0.4
-	proc-macro2@1.0.87
-	pulp-macro@0.1.1
-	pulp@0.18.22
-	py_literal@0.4.0
-	pyo3-build-config@0.22.6
-	pyo3-ffi@0.22.6
-	pyo3-macros-backend@0.22.6
-	pyo3-macros@0.22.6
-	pyo3@0.22.6
-	quote@1.0.37
-	ra_ap_limit@0.0.188
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rand_distr@0.4.3
-	rand_pcg@0.3.1
-	raw-cpuid@10.7.0
-	rawpointer@0.2.1
-	rayon-cond@0.3.0
-	rayon-core@1.12.1
-	rayon@1.10.0
-	reborrow@0.5.5
-	regex-automata@0.4.8
-	regex-syntax@0.8.5
-	regex@1.11.0
-	rowan@0.15.15
-	rustc-hash@1.1.0
-	rustiq-core@0.0.10
-	rustversion@1.0.17
-	rustworkx-core@0.15.1
-	same-file@1.0.6
-	seq-macro@0.3.5
-	serde@1.0.210
-	serde_derive@1.0.210
-	sha2@0.10.8
-	smallvec@1.13.2
-	smol_str@0.2.2
-	syn@1.0.109
-	syn@2.0.79
-	sysctl@0.5.5
-	target-lexicon@0.12.16
-	text-size@1.1.1
-	thiserror-impl@1.0.65
-	thiserror@1.0.65
-	triomphe@0.1.11
-	typenum@1.17.0
-	ucd-trie@0.1.7
-	unicode-ident@1.0.13
-	unicode-properties@0.1.3
-	unicode-width@0.1.14
-	unicode-xid@0.2.6
-	unindent@0.2.3
-	version_check@0.9.5
-	walkdir@2.5.0
-	wasi@0.11.0+wasi-snapshot-preview1
-	winapi-util@0.1.9
-	windows-sys@0.45.0
-	windows-sys@0.52.0
-	windows-sys@0.59.0
-	windows-targets@0.42.2
-	windows-targets@0.52.6
-	windows_aarch64_gnullvm@0.42.2
-	windows_aarch64_gnullvm@0.52.6
-	windows_aarch64_msvc@0.42.2
-	windows_aarch64_msvc@0.52.6
-	windows_i686_gnu@0.42.2
-	windows_i686_gnu@0.52.6
-	windows_i686_gnullvm@0.52.6
-	windows_i686_msvc@0.42.2
-	windows_i686_msvc@0.52.6
-	windows_x86_64_gnu@0.42.2
-	windows_x86_64_gnu@0.52.6
-	windows_x86_64_gnullvm@0.42.2
-	windows_x86_64_gnullvm@0.52.6
-	windows_x86_64_msvc@0.42.2
-	windows_x86_64_msvc@0.52.6
-	xshell-macros@0.2.6
-	xshell@0.2.6
-	yansi@0.5.1
-	zerocopy-derive@0.7.35
-	zerocopy@0.7.35
-"
-
-inherit cargo distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="An open-source SDK for working with quantum computers"
-HOMEPAGE="
-	https://github.com/Qiskit/qiskit/
-	https://pypi.org/project/qiskit/
-"
-SRC_URI="
-	https://github.com/Qiskit/qiskit/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT
-	Unicode-DFS-2016
-	|| ( LGPL-3+ MPL-2.0 )
-"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+visualization"
-
-RDEPEND="
-	>=dev-python/dill-0.3[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
-	>=dev-python/python-constraint-1.4[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/rustworkx-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.5[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/symengine-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.3[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.10)
-	visualization? (
-		>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
-		dev-python/pydot[${PYTHON_USEDEP}]
-		>=dev-python/pillow-4.2.1[${PYTHON_USEDEP}]
-		>=dev-python/pylatexenc-1.4[${PYTHON_USEDEP}]
-		>=dev-python/seaborn-0.9.0[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/cython-0.27.1[${PYTHON_USEDEP}]
-	test? (
-		app-text/poppler[png]
-		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}]
-		>=dev-python/networkx-2.2[${PYTHON_USEDEP}]
-		>=dev-python/qiskit-aer-0.14[${PYTHON_USEDEP}]
-		>=dev-python/scikit-learn-0.20.0[${PYTHON_USEDEP}]
-	)
-"
-
-# Files built without CFLAGS/LDFLAGS, acceptable for rust
-QA_FLAGS_IGNORED="
-	usr/lib.*/py.*/site-packages/qiskit/_accelerate.*.so
-	usr/lib.*/py.*/site-packages/qiskit/_qasm2.*.so
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# strip forcing -Werror from tests that also leaks to other packages
-	sed -i -e '/filterwarnings.*error/d' test/utils/base.py || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/python/circuit/test_equivalence.py::TestEquivalenceLibraryVisualization::test_equivalence_draw
-		test/python/quantum_info/operators/symplectic/test_sparse_pauli_op.py::TestSparsePauliOpConversions::test_to_matrix_zero
-		test/python/transpiler/test_unitary_synthesis_plugin.py::TestUnitarySynthesisPlugin
-		test/python/visualization/test_dag_drawer.py::TestDagDrawer::test_dag_drawer_no_register
-		test/python/circuit/test_scheduled_circuit.py::TestScheduledCircuit::test_fail_to_assemble_circuits_with_unbounded_parameters
-		test/python/circuit/test_scheduled_circuit.py::TestScheduledCircuit::test_schedule_circuit_in_sec_when_no_one_tells_dt
-		test/python/compiler/test_assembler.py::TestCircuitAssembler::test_circuit_with_global_phase
-		test/python/compiler/test_assembler.py::TestPulseAssembler::test_assemble_user_rep_time_delay
-		# tiny image differences, sigh
-		test/python/visualization/test_gate_map.py::TestGateMap::test_plot_error_map_over_100_qubit
-	)
-
-	local EPYTEST_IGNORE=(
-		# Breaks xdist
-		test/python/qasm2/test_parse_errors.py
-		test/python/transpiler/test_preset_passmanagers.py
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# docstring mismatches
-				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_meta_lines
-				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_multiple_entries
-				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_no_meta_lines
-			)
-			;;
-	esac
-
-	rm -rf qiskit || die
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# Run the Python test suite rather than everything under test/ which
-	# includes the 'randomized' suite. Upstream run that in a separate CI job.
-	epytest test/python
-}
diff --git a/dev-python/qiskit/qiskit-1.3.0_rc2.ebuild b/dev-python/qiskit/qiskit-1.3.0_rc2.ebuild
deleted file mode 100644
index 86853089155e..000000000000
--- a/dev-python/qiskit/qiskit-1.3.0_rc2.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-CRATES="
-	ahash@0.7.8
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	allocator-api2@0.2.18
-	approx@0.4.0
-	approx@0.5.1
-	ariadne@0.3.0
-	autocfg@1.4.0
-	bitflags@1.3.2
-	bitflags@2.6.0
-	block-buffer@0.10.4
-	boolenum@0.1.0
-	bytemuck@1.19.0
-	bytemuck_derive@1.8.0
-	byteorder@1.5.0
-	cfg-if@1.0.0
-	coe-rs@0.1.2
-	concolor-query@0.3.3
-	concolor@0.1.1
-	countme@3.0.1
-	cov-mark@2.0.0
-	cpufeatures@0.2.14
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-utils@0.8.20
-	crunchy@0.2.2
-	crypto-common@0.1.6
-	dbgf@0.1.2
-	digest@0.10.7
-	drop_bomb@0.1.5
-	dyn-stack@0.10.0
-	either@1.13.0
-	enum-as-inner@0.6.1
-	equator-macro@0.2.1
-	equator-macro@0.4.1
-	equator@0.2.2
-	equator@0.4.1
-	equivalent@1.0.1
-	faer-entity@0.19.2
-	faer-ext@0.2.0
-	faer@0.19.4
-	fixedbitset@0.4.2
-	gemm-c32@0.18.0
-	gemm-c64@0.18.0
-	gemm-common@0.18.0
-	gemm-f16@0.18.0
-	gemm-f32@0.18.0
-	gemm-f64@0.18.0
-	gemm@0.18.0
-	generic-array@0.14.7
-	getrandom@0.2.15
-	half@2.4.1
-	hashbrown@0.12.3
-	hashbrown@0.14.5
-	hashbrown@0.15.0
-	heck@0.5.0
-	hermit-abi@0.4.0
-	indexmap@2.6.0
-	indoc@2.0.5
-	is-terminal@0.4.13
-	itertools@0.10.5
-	itertools@0.11.0
-	itertools@0.13.0
-	lazy_static@1.5.0
-	libc@0.2.159
-	libm@0.2.8
-	matrixcompare-core@0.1.0
-	matrixcompare@0.3.0
-	matrixmultiply@0.3.9
-	memchr@2.7.4
-	memoffset@0.9.1
-	nano-gemm-c32@0.1.0
-	nano-gemm-c64@0.1.0
-	nano-gemm-codegen@0.1.0
-	nano-gemm-core@0.1.0
-	nano-gemm-f32@0.1.0
-	nano-gemm-f64@0.1.0
-	nano-gemm@0.1.2
-	ndarray@0.15.6
-	ndarray_einsum_beta@0.7.0
-	npyz@0.8.3
-	num-bigint@0.4.6
-	num-complex@0.4.6
-	num-integer@0.1.46
-	num-traits@0.2.19
-	numpy@0.22.1
-	once_cell@1.20.2
-	oq3_lexer@0.7.0
-	oq3_parser@0.7.0
-	oq3_semantics@0.7.0
-	oq3_source_file@0.7.0
-	oq3_syntax@0.7.0
-	paste@1.0.15
-	pest@2.7.13
-	pest_derive@2.7.13
-	pest_generator@2.7.13
-	pest_meta@2.7.13
-	petgraph@0.6.5
-	portable-atomic@1.9.0
-	ppv-lite86@0.2.20
-	priority-queue@2.1.1
-	proc-macro-error-attr@1.0.4
-	proc-macro-error@1.0.4
-	proc-macro2@1.0.87
-	pulp-macro@0.1.1
-	pulp@0.18.22
-	py_literal@0.4.0
-	pyo3-build-config@0.22.6
-	pyo3-ffi@0.22.6
-	pyo3-macros-backend@0.22.6
-	pyo3-macros@0.22.6
-	pyo3@0.22.6
-	quote@1.0.37
-	ra_ap_limit@0.0.188
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rand_distr@0.4.3
-	rand_pcg@0.3.1
-	raw-cpuid@10.7.0
-	rawpointer@0.2.1
-	rayon-cond@0.3.0
-	rayon-core@1.12.1
-	rayon@1.10.0
-	reborrow@0.5.5
-	regex-automata@0.4.8
-	regex-syntax@0.8.5
-	regex@1.11.0
-	rowan@0.15.15
-	rustc-hash@1.1.0
-	rustiq-core@0.0.10
-	rustversion@1.0.17
-	rustworkx-core@0.15.1
-	same-file@1.0.6
-	seq-macro@0.3.5
-	serde@1.0.210
-	serde_derive@1.0.210
-	sha2@0.10.8
-	smallvec@1.13.2
-	smol_str@0.2.2
-	syn@1.0.109
-	syn@2.0.79
-	sysctl@0.5.5
-	target-lexicon@0.12.16
-	text-size@1.1.1
-	thiserror-impl@1.0.65
-	thiserror@1.0.65
-	triomphe@0.1.11
-	typenum@1.17.0
-	ucd-trie@0.1.7
-	unicode-ident@1.0.13
-	unicode-properties@0.1.3
-	unicode-width@0.1.14
-	unicode-xid@0.2.6
-	unindent@0.2.3
-	version_check@0.9.5
-	walkdir@2.5.0
-	wasi@0.11.0+wasi-snapshot-preview1
-	winapi-util@0.1.9
-	windows-sys@0.45.0
-	windows-sys@0.52.0
-	windows-sys@0.59.0
-	windows-targets@0.42.2
-	windows-targets@0.52.6
-	windows_aarch64_gnullvm@0.42.2
-	windows_aarch64_gnullvm@0.52.6
-	windows_aarch64_msvc@0.42.2
-	windows_aarch64_msvc@0.52.6
-	windows_i686_gnu@0.42.2
-	windows_i686_gnu@0.52.6
-	windows_i686_gnullvm@0.52.6
-	windows_i686_msvc@0.42.2
-	windows_i686_msvc@0.52.6
-	windows_x86_64_gnu@0.42.2
-	windows_x86_64_gnu@0.52.6
-	windows_x86_64_gnullvm@0.42.2
-	windows_x86_64_gnullvm@0.52.6
-	windows_x86_64_msvc@0.42.2
-	windows_x86_64_msvc@0.52.6
-	xshell-macros@0.2.6
-	xshell@0.2.6
-	yansi@0.5.1
-	zerocopy-derive@0.7.35
-	zerocopy@0.7.35
-"
-
-inherit cargo distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="An open-source SDK for working with quantum computers"
-HOMEPAGE="
-	https://github.com/Qiskit/qiskit/
-	https://pypi.org/project/qiskit/
-"
-SRC_URI="
-	https://github.com/Qiskit/qiskit/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT
-	Unicode-DFS-2016
-	|| ( LGPL-3+ MPL-2.0 )
-"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+visualization"
-
-RDEPEND="
-	>=dev-python/dill-0.3[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
-	>=dev-python/python-constraint-1.4[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/rustworkx-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.5[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/symengine-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.3[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.10)
-	visualization? (
-		>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
-		dev-python/pydot[${PYTHON_USEDEP}]
-		>=dev-python/pillow-4.2.1[${PYTHON_USEDEP}]
-		>=dev-python/pylatexenc-1.4[${PYTHON_USEDEP}]
-		>=dev-python/seaborn-0.9.0[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/cython-0.27.1[${PYTHON_USEDEP}]
-	test? (
-		app-text/poppler[png]
-		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}]
-		>=dev-python/networkx-2.2[${PYTHON_USEDEP}]
-		>=dev-python/qiskit-aer-0.14[${PYTHON_USEDEP}]
-		>=dev-python/scikit-learn-0.20.0[${PYTHON_USEDEP}]
-	)
-"
-
-# Files built without CFLAGS/LDFLAGS, acceptable for rust
-QA_FLAGS_IGNORED="
-	usr/lib.*/py.*/site-packages/qiskit/_accelerate.*.so
-	usr/lib.*/py.*/site-packages/qiskit/_qasm2.*.so
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# strip forcing -Werror from tests that also leaks to other packages
-	sed -i -e '/filterwarnings.*error/d' test/utils/base.py || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/python/circuit/test_equivalence.py::TestEquivalenceLibraryVisualization::test_equivalence_draw
-		test/python/quantum_info/operators/symplectic/test_sparse_pauli_op.py::TestSparsePauliOpConversions::test_to_matrix_zero
-		test/python/transpiler/test_unitary_synthesis_plugin.py::TestUnitarySynthesisPlugin
-		test/python/visualization/test_dag_drawer.py::TestDagDrawer::test_dag_drawer_no_register
-		test/python/circuit/test_scheduled_circuit.py::TestScheduledCircuit::test_fail_to_assemble_circuits_with_unbounded_parameters
-		test/python/circuit/test_scheduled_circuit.py::TestScheduledCircuit::test_schedule_circuit_in_sec_when_no_one_tells_dt
-		test/python/compiler/test_assembler.py::TestCircuitAssembler::test_circuit_with_global_phase
-		test/python/compiler/test_assembler.py::TestPulseAssembler::test_assemble_user_rep_time_delay
-		# tiny image differences, sigh
-		test/python/visualization/test_gate_map.py::TestGateMap::test_plot_error_map_over_100_qubit
-	)
-
-	local EPYTEST_IGNORE=(
-		# Breaks xdist
-		test/python/qasm2/test_parse_errors.py
-		test/python/transpiler/test_preset_passmanagers.py
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# docstring mismatches
-				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_meta_lines
-				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_multiple_entries
-				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_no_meta_lines
-			)
-			;;
-	esac
-
-	rm -rf qiskit || die
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# Run the Python test suite rather than everything under test/ which
-	# includes the 'randomized' suite. Upstream run that in a separate CI job.
-	epytest test/python
-}
diff --git a/dev-python/qiskit/qiskit-1.3.2.ebuild b/dev-python/qiskit/qiskit-1.3.2.ebuild
new file mode 100644
index 000000000000..d2598e3d36c4
--- /dev/null
+++ b/dev-python/qiskit/qiskit-1.3.2.ebuild
@@ -0,0 +1,309 @@
+# Copyright 2022-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} )
+
+CRATES="
+	ahash@0.7.8
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	allocator-api2@0.2.20
+	approx@0.4.0
+	approx@0.5.1
+	ariadne@0.3.0
+	autocfg@1.4.0
+	bitflags@1.3.2
+	bitflags@2.6.0
+	block-buffer@0.10.4
+	boolenum@0.1.0
+	bytemuck@1.19.0
+	bytemuck_derive@1.8.0
+	byteorder@1.5.0
+	cfg-if@1.0.0
+	coe-rs@0.1.2
+	concolor-query@0.3.3
+	concolor@0.1.1
+	countme@3.0.1
+	cov-mark@2.0.0
+	cpufeatures@0.2.15
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.20
+	crunchy@0.2.2
+	crypto-common@0.1.6
+	dbgf@0.1.2
+	digest@0.10.7
+	drop_bomb@0.1.5
+	dyn-stack@0.10.0
+	either@1.13.0
+	enum-as-inner@0.6.1
+	equator-macro@0.2.1
+	equator-macro@0.4.1
+	equator@0.2.2
+	equator@0.4.1
+	equivalent@1.0.1
+	faer-entity@0.19.2
+	faer-ext@0.2.0
+	faer@0.19.4
+	fixedbitset@0.4.2
+	gemm-c32@0.18.0
+	gemm-c64@0.18.0
+	gemm-common@0.18.0
+	gemm-f16@0.18.0
+	gemm-f32@0.18.0
+	gemm-f64@0.18.0
+	gemm@0.18.0
+	generic-array@0.14.7
+	getrandom@0.2.15
+	half@2.4.1
+	hashbrown@0.12.3
+	hashbrown@0.14.5
+	hashbrown@0.15.1
+	heck@0.5.0
+	hermit-abi@0.4.0
+	indexmap@2.6.0
+	indoc@2.0.5
+	is-terminal@0.4.13
+	itertools@0.10.5
+	itertools@0.11.0
+	itertools@0.13.0
+	lazy_static@1.5.0
+	libc@0.2.162
+	libm@0.2.11
+	matrixcompare-core@0.1.0
+	matrixcompare@0.3.0
+	matrixmultiply@0.3.9
+	memchr@2.7.4
+	memoffset@0.9.1
+	nano-gemm-c32@0.1.0
+	nano-gemm-c64@0.1.0
+	nano-gemm-codegen@0.1.0
+	nano-gemm-core@0.1.0
+	nano-gemm-f32@0.1.0
+	nano-gemm-f64@0.1.0
+	nano-gemm@0.1.2
+	ndarray@0.15.6
+	ndarray_einsum_beta@0.7.0
+	npyz@0.8.3
+	num-bigint@0.4.6
+	num-complex@0.4.6
+	num-integer@0.1.46
+	num-traits@0.2.19
+	numpy@0.22.1
+	once_cell@1.20.2
+	oq3_lexer@0.7.0
+	oq3_parser@0.7.0
+	oq3_semantics@0.7.0
+	oq3_source_file@0.7.0
+	oq3_syntax@0.7.0
+	paste@1.0.15
+	pest@2.7.14
+	pest_derive@2.7.14
+	pest_generator@2.7.14
+	pest_meta@2.7.14
+	petgraph@0.6.5
+	portable-atomic@1.9.0
+	ppv-lite86@0.2.20
+	priority-queue@2.1.1
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro2@1.0.89
+	pulp-macro@0.1.1
+	pulp@0.18.22
+	py_literal@0.4.0
+	pyo3-build-config@0.22.6
+	pyo3-ffi@0.22.6
+	pyo3-macros-backend@0.22.6
+	pyo3-macros@0.22.6
+	pyo3@0.22.6
+	quote@1.0.37
+	ra_ap_limit@0.0.188
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rand_distr@0.4.3
+	rand_pcg@0.3.1
+	raw-cpuid@10.7.0
+	rawpointer@0.2.1
+	rayon-cond@0.3.0
+	rayon-core@1.12.1
+	rayon@1.10.0
+	reborrow@0.5.5
+	regex-automata@0.4.9
+	regex-syntax@0.8.5
+	regex@1.11.1
+	rowan@0.15.15
+	rustc-hash@1.1.0
+	rustiq-core@0.0.10
+	rustversion@1.0.18
+	rustworkx-core@0.15.1
+	same-file@1.0.6
+	seq-macro@0.3.5
+	serde@1.0.215
+	serde_derive@1.0.215
+	sha2@0.10.8
+	smallvec@1.13.2
+	smol_str@0.2.2
+	syn@1.0.109
+	syn@2.0.87
+	sysctl@0.5.5
+	target-lexicon@0.12.16
+	text-size@1.1.1
+	thiserror-impl@1.0.69
+	thiserror@1.0.69
+	triomphe@0.1.11
+	typenum@1.17.0
+	ucd-trie@0.1.7
+	unicode-ident@1.0.13
+	unicode-properties@0.1.3
+	unicode-width@0.1.14
+	unicode-xid@0.2.6
+	unindent@0.2.3
+	version_check@0.9.5
+	walkdir@2.5.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	winapi-util@0.1.9
+	windows-sys@0.45.0
+	windows-sys@0.52.0
+	windows-sys@0.59.0
+	windows-targets@0.42.2
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.42.2
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.42.2
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.42.2
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.42.2
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.42.2
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.42.2
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.42.2
+	windows_x86_64_msvc@0.52.6
+	xshell-macros@0.2.6
+	xshell@0.2.6
+	yansi@0.5.1
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+"
+
+inherit cargo distutils-r1
+
+MY_P=${P/_}
+DESCRIPTION="An open-source SDK for working with quantum computers"
+HOMEPAGE="
+	https://github.com/Qiskit/qiskit/
+	https://pypi.org/project/qiskit/
+"
+SRC_URI="
+	https://github.com/Qiskit/qiskit/archive/${PV/_}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT
+	Unicode-DFS-2016
+	|| ( LGPL-3+ MPL-2.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+visualization"
+
+RDEPEND="
+	>=dev-python/dill-0.3[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	>=dev-python/python-constraint-1.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rustworkx-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.5[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/symengine-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.10)
+	visualization? (
+		>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
+		dev-python/pydot[${PYTHON_USEDEP}]
+		>=dev-python/pillow-4.2.1[${PYTHON_USEDEP}]
+		>=dev-python/pylatexenc-1.4[${PYTHON_USEDEP}]
+		>=dev-python/seaborn-0.9.0[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	>=dev-python/cython-0.27.1[${PYTHON_USEDEP}]
+	test? (
+		app-text/poppler[png]
+		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}]
+		>=dev-python/networkx-2.2[${PYTHON_USEDEP}]
+		>=dev-python/qiskit-aer-0.14[${PYTHON_USEDEP}]
+		>=dev-python/scikit-learn-0.20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="
+	usr/lib.*/py.*/site-packages/qiskit/_accelerate.*.so
+	usr/lib.*/py.*/site-packages/qiskit/_qasm2.*.so
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# strip forcing -Werror from tests that also leaks to other packages
+	sed -i -e '/filterwarnings.*error/d' test/utils/base.py || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/python/circuit/test_equivalence.py::TestEquivalenceLibraryVisualization::test_equivalence_draw
+		test/python/quantum_info/operators/symplectic/test_sparse_pauli_op.py::TestSparsePauliOpConversions::test_to_matrix_zero
+		test/python/transpiler/test_unitary_synthesis_plugin.py::TestUnitarySynthesisPlugin
+		test/python/visualization/test_dag_drawer.py::TestDagDrawer::test_dag_drawer_no_register
+		test/python/circuit/test_scheduled_circuit.py::TestScheduledCircuit::test_fail_to_assemble_circuits_with_unbounded_parameters
+		test/python/circuit/test_scheduled_circuit.py::TestScheduledCircuit::test_schedule_circuit_in_sec_when_no_one_tells_dt
+		test/python/compiler/test_assembler.py::TestCircuitAssembler::test_circuit_with_global_phase
+		test/python/compiler/test_assembler.py::TestPulseAssembler::test_assemble_user_rep_time_delay
+		# tiny image differences, sigh
+		test/python/visualization/test_gate_map.py::TestGateMap::test_plot_error_map_over_100_qubit
+	)
+
+	local EPYTEST_IGNORE=(
+		# Breaks xdist
+		test/python/qasm2/test_parse_errors.py
+		test/python/transpiler/test_preset_passmanagers.py
+	)
+
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				# docstring mismatches
+				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_meta_lines
+				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_multiple_entries
+				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_no_meta_lines
+			)
+			;;
+	esac
+
+	rm -rf qiskit || die
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# Run the Python test suite rather than everything under test/ which
+	# includes the 'randomized' suite. Upstream run that in a separate CI job.
+	epytest test/python
+}
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/quart-trio/Manifest b/dev-python/quart-trio/Manifest
index ca8de06ec426..d8741725361f 100644
--- a/dev-python/quart-trio/Manifest
+++ b/dev-python/quart-trio/Manifest
@@ -1 +1,2 @@
 DIST quart-trio-0.11.1.gh.tar.gz 18568 BLAKE2B faabf4204a82dcc70e41d1d1ec7171c89386f2e40979c20501890d9bc27eb2af693bc791a9015a9c4c676a5e25ec69dc4975a0cd09987cd14f699a04442d54da SHA512 8ea20c36c772eff3e2b0a83a4c325cd223c19b3d7e1e51e7378897bd11479db2c8015d2e8c4713721070fc413f42b19f844a3966a0d06d299439cf514b0b3291
+DIST quart_trio-0.12.0.tar.gz 14979 BLAKE2B 7a7ffaba59e6984001941c1c54cfab189434366ab1b56d6509567c79560d916e2a5f0c81e8f23e17462de17d012d77eda3803cc8828a5378b3b92c1bab00e475 SHA512 70b1f2406185b020f999cb335c2c13599faf9c36c69f8adc437fbb846158f659e8d6527199083f9674e75c99bcd10dbf228dbd62ca7c5614b471c462b22227ee
diff --git a/dev-python/quart-trio/quart-trio-0.12.0.ebuild b/dev-python/quart-trio/quart-trio-0.12.0.ebuild
new file mode 100644
index 000000000000..53640fe9bc8b
--- /dev/null
+++ b/dev-python/quart-trio/quart-trio-0.12.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Quart extension to provide trio support"
+HOMEPAGE="
+	https://github.com/pgjones/quart-trio/
+	https://pypi.org/project/quart-trio/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.1.0[${PYTHON_USEDEP}]
+	' 3.10)
+	>=dev-python/hypercorn-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/quart-0.19[${PYTHON_USEDEP}]
+	>=dev-python/trio-0.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-trio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -o addopts= -p trio
+}
diff --git a/dev-python/quart/Manifest b/dev-python/quart/Manifest
index 961192c158b5..3bec30ec94d5 100644
--- a/dev-python/quart/Manifest
+++ b/dev-python/quart/Manifest
@@ -1,2 +1 @@
-DIST quart-0.19.9.gh.tar.gz 747986 BLAKE2B cd6c9d919e6174305490b59b76815d0b0fcd854c0527c517a463563ed1b3b5dc0fd7ac7e7baf555a56b277cf1a64c6e54da5d9ddb368e862736897dfb34a6cc0 SHA512 7a3020a9fb9c49cdf1ba91ec3ea6a6bb07da5a0571badefc880864921c4b7d1219250bb896cc614dd525920380d660204063431abd99bf0d99418dd3206c0eae
 DIST quart-0.20.0.gh.tar.gz 746472 BLAKE2B 7c558532e6bbd2b4f37fbde7517700cd5e777faebd6ee2c5249ae774250d222e3e858f22a51ed8012c4695485a880ac7d288c723c615d6d80f7c8593e7eeb441 SHA512 22d99aae1f30ebc50326ed0c589938386d7b6c11398925b1cf326d2efa2d79ca40ad21939acb191b8a804ed78276f213375e20f31b66c7bb63ff28e91047017c
diff --git a/dev-python/quart/quart-0.19.9.ebuild b/dev-python/quart/quart-0.19.9.ebuild
deleted file mode 100644
index 8ee917f1f2d3..000000000000
--- a/dev-python/quart/quart-0.19.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python ASGI web microframework with the same API as Flask"
-HOMEPAGE="
-	https://github.com/pallets/quart/
-	https://pypi.org/project/Quart/
-"
-# no tests in sdist as of 0.19.4
-SRC_URI="
-	https://github.com/pallets/quart/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/aiofiles[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.6[${PYTHON_USEDEP}]
-	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/hypercorn-0.11.2[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja2[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts= -p asyncio
-}
diff --git a/dev-python/quart/quart-0.20.0.ebuild b/dev-python/quart/quart-0.20.0.ebuild
index b36abd98d9e0..b53379a8411f 100644
--- a/dev-python/quart/quart-0.20.0.ebuild
+++ b/dev-python/quart/quart-0.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/aiofiles[${PYTHON_USEDEP}]
diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
index 936dbe340e38..84dc88e31980 100644
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@@ -1,2 +1 @@
-DIST rapidfuzz-3.10.1.tar.gz 57982250 BLAKE2B 7b0c5f4a940b46bcc340eb8bf32cec3389b243368c36caa92e39e62f18c7ebb1f56d439bf8609825b4b64d743dc0ae041b4660b89cd03af0016944620ab99648 SHA512 f72a9ed6e3fd64640a877d50ab25c90d1969adfd93ff0029526a94ff1e62aa4fd8e9b4ce63ee8a5b37cfb68d2966051e76d78b26ef502a8c0b28fe5f462c8462
 DIST rapidfuzz-3.11.0.tar.gz 57983000 BLAKE2B 0de87fc6a392162b3ef908ed003f54b062d4a3a798cb6915c6ca1e4736ddf5666ae44bacb4351a4948e761ee08e278d5278f63f8c48ec41ef7870baaccbb4194 SHA512 5d8f00321b4314dbfd0409ba1533b35b337838b18e2efa37ef4ce8c406cea3f6fee3655a20d44a0007248ac58173cb60672324a553593a8b70dc5ecc17d8ac4e
diff --git a/dev-python/rapidfuzz/rapidfuzz-3.10.1.ebuild b/dev-python/rapidfuzz/rapidfuzz-3.10.1.ebuild
deleted file mode 100644
index 1eac6330b659..000000000000
--- a/dev-python/rapidfuzz/rapidfuzz-3.10.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=scikit-build-core
-PYPI_PN=RapidFuzz
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
-HOMEPAGE="
-	https://github.com/rapidfuzz/RapidFuzz/
-	https://pypi.org/project/RapidFuzz/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# all these are header-only libraries
-DEPEND="
-	>=dev-cpp/taskflow-3.0.0
-	>=dev-cpp/rapidfuzz-cpp-3.1.1
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/cython-3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# sterilize build flags
-	sed -i -e '/CMAKE_INTERPROCEDURAL_OPTIMIZATION/d' CMakeLists.txt || die
-	# remove bundled libraries
-	rm -r extern || die
-	# force recythonization
-	find src -name '*.cxx' -delete || die
-	# do not require exact taskflow version
-	sed -i -e '/Taskflow/s:3\.8\.0::' CMakeLists.txt || die
-	# https://github.com/scikit-build/scikit-build-core/issues/912
-	sed -i -e '/scikit-build-core/s:0\.10:0.8:' pyproject.toml || die
-
-	distutils-r1_src_prepare
-
-	export RAPIDFUZZ_BUILD_EXTENSION=1
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/rapidfuzz/rapidfuzz-3.11.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-3.11.0.ebuild
index 7c73ac5c9f26..4878f4912bbc 100644
--- a/dev-python/rapidfuzz/rapidfuzz-3.11.0.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-3.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # all these are header-only libraries
 DEPEND="
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index f8a4af856b87..4dea2a154163 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1 +1,3 @@
 DIST rdflib-7.1.1.tar.gz 4864216 BLAKE2B b583e6f9afab95fc0818c4f11740ab8cab540b774a3db15fc8be7b836149f40af6eb445a61b61e020c55f9b561c17f5019275070272449bd4ea25827e4925e39 SHA512 6eafaebfb604446399b214496aabc91fe0c689e9b35d5637de35a5d9784a1acb9d727c7ad5eebe8700d0be2b1e54b3d51cd3fe723a2a6cbd38f0e259d42bc2c5
+DIST rdflib-7.1.2.gh.tar.gz 5030802 BLAKE2B 7a8444d39a456a8e1ca0f3956f3f3a7e43d7fd8a166b1738c5add32a21f6625d71ce5a97a65e5ff3550fbb6ac4eaa8de353e6f333fe7aad947be8e849298dee0 SHA512 a88efdbf461392033e14f72bfe755e449d86927b9d48668cded68e0ad2a5d04de1255eccf8086993cb8c9a3442eb5549dc73f66cfb2c97ff35fcba021c970ec7
+DIST rdflib-7.1.3.gh.tar.gz 5029906 BLAKE2B 4eff2756acfe636403ccf1cc8c11850e99385f444e1d80ca1a0ee6c04e1f5352df745a1c27a159a8740eb7a950211824ab51820e54830cec5e279e3d2a1a838f SHA512 ed735611719cfab7da636cf57b02456c26ee7732c18508e1382bc722cba3a0206ca5dcb4ad8cd2ebc0e5550038c5571fb1b0195b9fae172f768cbab72db2b621
diff --git a/dev-python/rdflib/rdflib-7.1.2.ebuild b/dev-python/rdflib/rdflib-7.1.2.ebuild
new file mode 100644
index 000000000000..fbbf708e8ef9
--- /dev/null
+++ b/dev-python/rdflib/rdflib-7.1.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="sqlite?,threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="RDF library containing a triple store and parser/serializer"
+HOMEPAGE="
+	https://github.com/RDFLib/rdflib/
+	https://pypi.org/project/rdflib/
+"
+# tests removed in 7.1.2
+SRC_URI="
+	https://github.com/RDFLib/rdflib/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples sqlite"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		<dev-python/isodate-1[${PYTHON_USEDEP}]
+		>=dev-python/isodate-0.7.2[${PYTHON_USEDEP}]
+	' 3.10)
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	<dev-python/pyparsing-4[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# doctests require internet
+	sed -i -e '/doctest-modules/d' pyproject.toml || die
+
+	# we disable pytest-cov
+	sed -i -e 's@, no_cover: None@@' test/test_misc/test_plugins.py || die
+
+	# allow regular html5lib, html5rdf is a fork with minimal changes:
+	# removing six dep (which is kinda good) and bundling webencodings
+	# (which is horrible)
+	find -name '*.py' -exec sed -i -e 's:html5rdf:html5lib:g' {} + || die
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -m "not webtest"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/rdflib/rdflib-7.1.3.ebuild b/dev-python/rdflib/rdflib-7.1.3.ebuild
new file mode 100644
index 000000000000..fbbf708e8ef9
--- /dev/null
+++ b/dev-python/rdflib/rdflib-7.1.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="sqlite?,threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="RDF library containing a triple store and parser/serializer"
+HOMEPAGE="
+	https://github.com/RDFLib/rdflib/
+	https://pypi.org/project/rdflib/
+"
+# tests removed in 7.1.2
+SRC_URI="
+	https://github.com/RDFLib/rdflib/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples sqlite"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		<dev-python/isodate-1[${PYTHON_USEDEP}]
+		>=dev-python/isodate-0.7.2[${PYTHON_USEDEP}]
+	' 3.10)
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	<dev-python/pyparsing-4[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# doctests require internet
+	sed -i -e '/doctest-modules/d' pyproject.toml || die
+
+	# we disable pytest-cov
+	sed -i -e 's@, no_cover: None@@' test/test_misc/test_plugins.py || die
+
+	# allow regular html5lib, html5rdf is a fork with minimal changes:
+	# removing six dep (which is kinda good) and bundling webencodings
+	# (which is horrible)
+	find -name '*.py' -exec sed -i -e 's:html5rdf:html5lib:g' {} + || die
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -m "not webtest"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/recurring-ical-events/Manifest b/dev-python/recurring-ical-events/Manifest
index af7ca96811f0..98c577d9d269 100644
--- a/dev-python/recurring-ical-events/Manifest
+++ b/dev-python/recurring-ical-events/Manifest
@@ -1,3 +1,4 @@
 DIST python-recurring-ical-events-3.3.3.gh.tar.gz 479005 BLAKE2B eca43a5892ffd3bc7b6b8e6c0d7d5c84d588894b2cc2d8a592d3753bd5c3158b3b0b4ac31932aa39e20c08789d72688b724cc128d53454b4a6c6e90e2dbd16ca SHA512 1b92383252c5497ff49adad5a2b5d2bb866dd72ccfd31621c305f5ec96baa5db9ca656f32787e34d9f551837cf9da769443fa017775a0d0042f6607fd138c7ef
 DIST python-recurring-ical-events-3.3.4.gh.tar.gz 479042 BLAKE2B cabd8679c362aa78f3f9a600d0518724dd4cabd4b813990147858dcb2659a14e5d947c8e1a2d4e681bf535387160a02e59bb816d6376ba9ba085b04718b5b1da SHA512 fcbc8faad94f34cdced49a9d7452aca61242241e45a591ce76334eb7b29a680e7bcd11f0b03c9037d43b3b4784fe641b032b48f714ee406d80ff43eec5208558
 DIST python-recurring-ical-events-3.4.0.gh.tar.gz 511539 BLAKE2B b451debd28dfa0e629dc7386841968bc3457d5dffe418aa2da10a7637956eb5975dd1d507701931cb9c95bb1f4d39deec452270c4d4f7a7758374af1a2fb46c7 SHA512 5031e902327b3b29806e65c24c059ec7e2a167f7ca96e6c79b639ddc67cbc526b569d822a1c9d9b625b08c8bde22f04b4cfc756bfed355c913de3a64db24ccc9
+DIST python-recurring-ical-events-3.4.1.gh.tar.gz 511709 BLAKE2B 30d0c8894b723d4e2a824840837d5f966fbfcf9b525e98e28993d8bfa5aad4f9a8042e1484339afeb8a966381cc4df92335cb7d13e31baaeb85e22e5e5fc6a1f SHA512 fbad8bf7878a0806fba6c11cfb644f2aecd99b3bab63194137effc4730b81b18aa9a8b3bc48c4442d083515e8a41fc392afbe64f15b5d597fd24079c80e02ff6
diff --git a/dev-python/recurring-ical-events/recurring-ical-events-3.4.1.ebuild b/dev-python/recurring-ical-events/recurring-ical-events-3.4.1.ebuild
new file mode 100644
index 000000000000..178daa312f14
--- /dev/null
+++ b/dev-python/recurring-ical-events/recurring-ical-events-3.4.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2023-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
+
+MY_P=python-${P}
+DESCRIPTION="Repeat ICalendar events by RRULE, RDATE and EXDATE"
+HOMEPAGE="
+	https://github.com/niccokunzmann/python-recurring-ical-events/
+	https://pypi.org/project/recurring-ical-events/
+"
+SRC_URI="
+	https://github.com/niccokunzmann/python-recurring-ical-events/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/icalendar-7[${PYTHON_USEDEP}]
+	>=dev-python/icalendar-6.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+	<dev-python/x-wr-timezone-3[${PYTHON_USEDEP}]
+	>=dev-python/x-wr-timezone-1.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/icalendar-6[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2023.3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	test/test_readme.py
+)
diff --git a/dev-python/referencing/Manifest b/dev-python/referencing/Manifest
index 0552de56138a..dac9b5104837 100644
--- a/dev-python/referencing/Manifest
+++ b/dev-python/referencing/Manifest
@@ -1 +1,2 @@
 DIST referencing-0.35.1.tar.gz 62991 BLAKE2B b434d3b24bb01c7ea2b97300408571483ecfaa49b52867374a8734b4dafd06404c8b993757620329668fa01eb791c2a6f938aa4be20ff841fe691a4b47dcf6b3 SHA512 b737afb45bfb1adb91f457b78ab4a31a6f33839ef61095663fd66d91c09fc379d900f778bacaa36722770ce80eccd6a227a074cb44836e69205bed06165d033d
+DIST referencing-0.36.1.tar.gz 74661 BLAKE2B a5eb713a0f227f4e331169e7aed7691d12712279ce3851cc58da87e7ba41ba291a80066360f7d6fc6f5e170977ae1718717438c7383c9e33bfc0a14f30e4c805 SHA512 2e2cbe9614811a650cd1dd6a63dd42ddb152ed934e9f3cb93671965ae66b982d7fc5207412f3c3fc4216727cc54499c9a39102e20dfc6d6a668a5d5d4c3ec604
diff --git a/dev-python/referencing/referencing-0.36.1.ebuild b/dev-python/referencing/referencing-0.36.1.ebuild
new file mode 100644
index 000000000000..9f96720001ad
--- /dev/null
+++ b/dev-python/referencing/referencing-0.36.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Cross-specification JSON referencing (JSON Schema, OpenAPI...)"
+HOMEPAGE="
+	https://github.com/python-jsonschema/referencing/
+	https://pypi.org/project/referencing/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/rpds-py-0.7.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.4.0[${PYTHON_USEDEP}]
+	' 3.{10..12})
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/repoze-lru/repoze-lru-0.7-r3.ebuild b/dev-python/repoze-lru/repoze-lru-0.7-r3.ebuild
index 36b789e4efd7..2ad5a66e545f 100644
--- a/dev-python/repoze-lru/repoze-lru-0.7-r3.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.7-r3.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
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/resolvelib/resolvelib-1.1.0.ebuild b/dev-python/resolvelib/resolvelib-1.1.0.ebuild
index 18c923535e3d..8cf6de340270 100644
--- a/dev-python/resolvelib/resolvelib-1.1.0.ebuild
+++ b/dev-python/resolvelib/resolvelib-1.1.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
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index caee0becbef5..f63437ca7998 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1 +1,3 @@
 DIST responses-0.25.3.tar.gz 77798 BLAKE2B c85ccca93bf24e392e33bffc697d657e1bdb1d733c36ba035dffb0e1185ad579e35b44c9342d257c3eec735ea789961ea37e739884511b0c5ef9ef88f344dd77 SHA512 f5691cb603174a06a8efebde3e64091a8b21005adc841dcfa83f2bb9aea0c0b8bd8a3d490cc579d77fd4a1106bbdd2f140da1d3c04cbcfd42a6d49c900618f47
+DIST responses-0.25.5.tar.gz 79099 BLAKE2B f945ac9ce60a46a598e675daab0cdffcf72edce0aa43e90082a2054f2978a1bafdf18cd9c5b6b7b3b7e2609eacb78ca0fba0e2152fd8101f1d6086c684b3a101 SHA512 327d2c7a6bafd9054e0450add98023e16a8f58a8c7a1c44b0493804e125813912a4f6ac613f6beb7e81983a0e9820609edfec2b62829d4cf65c86f7e95068a12
+DIST responses-0.25.6.tar.gz 79145 BLAKE2B c46ea523e2abf3e245cb80f6f81dd99bb0acf545c6393f6e79c8b2a2631f07e897eba30915acdac48d33ad65c702ff21c1f319cdeec0122f50c1c0a7194726a2 SHA512 03ea531ec5fda150245e8abd89245e71741a7b63e6c2e475254cd3fd56b81759da784c4c298f3f98975f49771cfbc298acceea8869bf5e7203f27c56e4afa87a
diff --git a/dev-python/responses/responses-0.25.5.ebuild b/dev-python/responses/responses-0.25.5.ebuild
new file mode 100644
index 000000000000..20c4714b14ad
--- /dev/null
+++ b/dev-python/responses/responses-0.25.5.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=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="
+	https://pypi.org/project/responses/
+	https://github.com/getsentry/responses/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# tomli backend is optional now, with pyyaml being the new default.
+# However, keeping it unconditional here for backwards compatibility.
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.30.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+	dev-python/tomli-w[${PYTHON_USEDEP}]
+	<dev-python/urllib3-3[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -o asyncio_mode=auto -p asyncio -p pytest_httpserver
+}
diff --git a/dev-python/responses/responses-0.25.6.ebuild b/dev-python/responses/responses-0.25.6.ebuild
new file mode 100644
index 000000000000..20c4714b14ad
--- /dev/null
+++ b/dev-python/responses/responses-0.25.6.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=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="
+	https://pypi.org/project/responses/
+	https://github.com/getsentry/responses/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# tomli backend is optional now, with pyyaml being the new default.
+# However, keeping it unconditional here for backwards compatibility.
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.30.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+	dev-python/tomli-w[${PYTHON_USEDEP}]
+	<dev-python/urllib3-3[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -o asyncio_mode=auto -p asyncio -p pytest_httpserver
+}
diff --git a/dev-python/respx/Manifest b/dev-python/respx/Manifest
index 6343234dbd40..3253c156a965 100644
--- a/dev-python/respx/Manifest
+++ b/dev-python/respx/Manifest
@@ -1,2 +1 @@
-DIST respx-0.21.1.gh.tar.gz 432341 BLAKE2B b375e8bc9370e13855197487e1e8139cf3fede0f03d7ad034ef2c78bce5ad95d3cb8cc7440c2566d188a98a52d0068c13288c7d4ec802e04d2f269a64e1ce326 SHA512 156f34f4635012230b68812f24978136f37f96dc0cf0ea9e80ed2d6a3e0639eb7591ed34933f75d5cda32993852aa034b22389af0fed341ab4ad1002482f2e9c
 DIST respx-0.22.0.gh.tar.gz 432547 BLAKE2B 60fb516b3793faeea8f236c3ccfae7dcf20087eb8af8f1fb8c128de454b9fa395f4c7ed6fc5c94c59eff225525de6bc7c2b89bedf882028076fa9fb668a46ac9 SHA512 3cc84edced79475764b00369b5926bb5a74627b3f0c966fdf4e96a1a5944b8ea2fccaa39f77ebde62324762cb4ff5e0b611c910093fc3010e8c8e1dbbbe678e3
diff --git a/dev-python/respx/respx-0.21.1-r1.ebuild b/dev-python/respx/respx-0.21.1-r1.ebuild
deleted file mode 100644
index 8b938b5a1627..000000000000
--- a/dev-python/respx/respx-0.21.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock HTTPX with awesome request patterns and response side effects"
-HOMEPAGE="
-	https://lundberg.github.io/respx/
-	https://pypi.org/project/respx/
-	https://github.com/lundberg/respx/
-"
-# no tests in pypi sdist
-SRC_URI="
-	https://github.com/lundberg/respx/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-# https://bugs.gentoo.org/945735
-# https://github.com/lundberg/respx/issues/277
-RDEPEND="
-	<dev-python/httpx-0.28.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/httpcore[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/starlette[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p 'no:*' -p asyncio -o addopts=
-}
diff --git a/dev-python/respx/respx-0.22.0-r1.ebuild b/dev-python/respx/respx-0.22.0-r1.ebuild
index 0c70c55a4901..7b7cf95fa585 100644
--- a/dev-python/respx/respx-0.22.0-r1.ebuild
+++ b/dev-python/respx/respx-0.22.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/httpx-0.28.0[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 4622b9eef062..8af3d857f146 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,3 +1 @@
-DIST rich-13.7.1.gh.tar.gz 15058064 BLAKE2B 6fad18bf0a4e4f72e530c78db7a498f27dd8c9a7b9b17ca5ef12a94bbe513857f3c42d4903f8ebbfe8907727cddaf290f08862c27efb29db8aaf70c7bcb13ace SHA512 0c69101bc6c2a238a4c516812cda08299115b903b8282ee348b45b212a88fcbfbf69d11a3705a97bdb6192988ee3047804bb5b52b7950d860542cde8ce2d4bd2
-DIST rich-13.9.3.gh.tar.gz 15064090 BLAKE2B 4ef76583ed13692b9f4a9714a68186fd06262e76d691f79cd256b4ab153052efd5fdf2320df797683ea1765cf063215a6b2d2614cd8040ebed0b89178cdcf2e0 SHA512 ca74d59e5df0476b482f60fac8d1f2e0810ffa61a10d410ff188c82548df3307405119f3b18992d96b01458b921ebcd61c99bf68dd808358395e9b04cf78579b
 DIST rich-13.9.4.gh.tar.gz 15064359 BLAKE2B bf0bd53f3993fbfa309012b646d293799699040827c160a627fb4dbf292146e43b4a823606a6d9855d835f9739c1d75f539328aa093471db54adff44ef7d4e77 SHA512 36d9f0442759784453a75c9a80cd3dde113db5544d62da1eb85bc0572c16b6247da9b5254246fa571007ce0e70a234aea2ab1ed5dc20c1ec23084070733d39a1
diff --git a/dev-python/rich/rich-13.7.1.ebuild b/dev-python/rich/rich-13.7.1.ebuild
deleted file mode 100644
index c930ae408f07..000000000000
--- a/dev-python/rich/rich-13.7.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
-HOMEPAGE="
-	https://github.com/Textualize/rich/
-	https://pypi.org/project/rich/
-"
-SRC_URI="
-	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	>=dev-python/markdown-it-py-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.13.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/attrs-21.4.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-		# TODO: segfault in recursion (PyQt6 interfering?)
-		tests/test_traceback.py::test_recursive
-	)
-	# version-specific output -- the usual deal
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# pypy3.10, to be more precise
-				tests/test_inspect.py::test_inspect_integer_with_methods_python310only
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				tests/test_inspect.py::test_inspect_builtin_function_except_python311
-				tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
-				tests/test_inspect.py::test_inspect_integer_with_methods_python310only
-				tests/test_inspect.py::test_inspect_integer_with_methods_python311
-				tests/test_pretty.py::test_pretty_dataclass
-				tests/test_pretty.py::test_reference_cycle_dataclass
-				tests/test_pretty.py::test_max_depth_dataclass
-				tests/test_pretty.py::test_attrs_broken
-			)
-			;;
-	esac
-
-	local -x COLUMNS=80
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-13.9.3.ebuild b/dev-python/rich/rich-13.9.3.ebuild
deleted file mode 100644
index 6bcdf3a18c49..000000000000
--- a/dev-python/rich/rich-13.9.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
-HOMEPAGE="
-	https://github.com/Textualize/rich/
-	https://pypi.org/project/rich/
-"
-SRC_URI="
-	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	>=dev-python/markdown-it-py-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.13.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/attrs-21.4.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-		# TODO: segfault in recursion (PyQt6 interfering?)
-		tests/test_traceback.py::test_recursive
-	)
-	# version-specific output -- the usual deal
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# pypy3.10, to be more precise
-				tests/test_inspect.py::test_inspect_integer_with_methods_python310only
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				tests/test_inspect.py::test_inspect_builtin_function_except_python311
-				tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
-				tests/test_inspect.py::test_inspect_integer_with_methods_python310only
-				tests/test_inspect.py::test_inspect_integer_with_methods_python311
-				tests/test_pretty.py::test_pretty_dataclass
-				tests/test_pretty.py::test_reference_cycle_dataclass
-				tests/test_pretty.py::test_max_depth_dataclass
-				tests/test_pretty.py::test_attrs_broken
-			)
-			;;
-	esac
-
-	local -x COLUMNS=80
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-13.9.4.ebuild b/dev-python/rich/rich-13.9.4.ebuild
index de21ed690f8d..80df0e3fb36f 100644
--- a/dev-python/rich/rich-13.9.4.ebuild
+++ b/dev-python/rich/rich-13.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/roman/Manifest b/dev-python/roman/Manifest
index 18dcda558ee7..a1f3a1f35678 100644
--- a/dev-python/roman/Manifest
+++ b/dev-python/roman/Manifest
@@ -1 +1,2 @@
 DIST roman-4.2.tar.gz 7339 BLAKE2B 1315925ffc4324e21582030fa6d963ed50f9fe917056fdf8dba62d90812874dd40d8899ae47274fc584bb56877c5517f507ff8741266e95a89912aead3a23a15 SHA512 4b1ddd54078e5ab38a11cad29fe4ea1f8e4740d7a9d1b093bec7d08ba37ca2bbbf89b2c420987b74270b01a8af5c03bfbfe8cfb5a4dfeb8923894cb52f083e82
+DIST roman-5.0.tar.gz 7664 BLAKE2B 1e3b8f90eba33abe7bc061ca30b8f12da23976fc15315923813c97a9f9dfc5909de475c3db752f015aa34faa775165cd8518ede5c9a8b1a87da5778abf964305 SHA512 9acd5d1587338497080066d3cd01c0a2cf007c664145514acaaa38cbbd6bbc6eac55469db9015dcd050a2457c69837dd9cdccf110a771f6b09c2a9bd59de8c4e
diff --git a/dev-python/roman/roman-5.0.ebuild b/dev-python/roman/roman-5.0.ebuild
new file mode 100644
index 000000000000..7f46f2c20fbd
--- /dev/null
+++ b/dev-python/roman/roman-5.0.ebuild
@@ -0,0 +1,26 @@
+# 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="An Integer to Roman numerals converter"
+HOMEPAGE="
+	https://pypi.org/project/roman/
+	https://github.com/zopefoundation/roman
+"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	mv "${S}/src/tests.py" . || die "moving test file failed"
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/rope/rope-1.13.0-r1.ebuild b/dev-python/rope/rope-1.13.0-r1.ebuild
index 33e3ad7738ee..0361cfab291a 100644
--- a/dev-python/rope/rope-1.13.0-r1.ebuild
+++ b/dev-python/rope/rope-1.13.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/rope/rope-1.13.0.ebuild b/dev-python/rope/rope-1.13.0.ebuild
deleted file mode 100644
index 17994cbaff67..000000000000
--- a/dev-python/rope/rope-1.13.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python refactoring library"
-HOMEPAGE="
-	https://pypi.org/project/rope/
-	https://github.com/python-rope/rope/
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/pytoolconfig-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# our venv style confuses this comparison
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_source_typing
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_typing
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_compiled
-	# TODO
-	ropetest/contrib/autoimport/autoimporttest.py::TestQueryUsesIndexes::test_search_by_name_like_uses_index
-	ropetest/contrib/autoimport/autoimporttest.py::TestQueryUsesIndexes::test_search_module_like_uses_index
-)
diff --git a/dev-python/routes/routes-2.5.1-r2.ebuild b/dev-python/routes/routes-2.5.1-r2.ebuild
index 4e6920b51d93..5015479cca41 100644
--- a/dev-python/routes/routes-2.5.1-r2.ebuild
+++ b/dev-python/routes/routes-2.5.1-r2.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 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/repoze-lru-0.3[${PYTHON_USEDEP}]
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index c4151750666f..c1baeb38c671 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,2 +1 @@
-DIST rq-2.0.0.tar.gz 639193 BLAKE2B ec44a45618f4ba0cafd30d13d15db8efc26c35f41100019e94d28ac21ca0c6157df34c55fd9bc2c2afdd4752e815a45150c95840339744c005c297153795e598 SHA512 46878626ad939fdc3f31bfd04fab9d11f266a390fe75ea22fde62e1622607e715673a8f3d2e3aba78e489b861d16068836aea4eca5a88cd295d6b6ca61707a41
 DIST rq-2.1.0.tar.gz 640535 BLAKE2B c269527d9863b7991be24cb6fac43cfbe8cea23fbbdbb8ff9699bce9653e014a0def7439ffbced1658bc54bb328119c2d3ddea9a83e0a3c2cbcd3d21500a1f28 SHA512 215c33e29ab18e8ebb693e4d9da2bf51750e1558ef20b13c4d301a803a5dda0e1c00edbfa019717043ea777e8c47e1772ab9334b12cc08e7fe9196121c6bd287
diff --git a/dev-python/rq/rq-2.0.0.ebuild b/dev-python/rq/rq-2.0.0.ebuild
deleted file mode 100644
index 1bb4b1c0f6a0..000000000000
--- a/dev-python/rq/rq-2.0.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{11..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="
-	https://python-rq.org/
-	https://github.com/rq/rq/
-	https://pypi.org/project/rq/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-4.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unnecessary typechecking deps
-	sed -i -e '/types-/d' pyproject.toml || die
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the actual tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires <sentry-sdk-2
-		tests/test_sentry.py::TestSentry::test_failure_capture
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/rq/rq-2.1.0.ebuild b/dev-python/rq/rq-2.1.0.ebuild
index 5cde9ca9c756..736865a5cf39 100644
--- a/dev-python/rq/rq-2.1.0.ebuild
+++ b/dev-python/rq/rq-2.1.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 49ae06ce339c..dcaf69ce4e58 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,3 +1,2 @@
-DIST ruamel.yaml-0.18.6.tar.xz 198544 BLAKE2B 94d50ba8aef92e2885b24118bd9f4b1d06a82d51b2e7930c39dea93f4c0f9fc9d0604dfbbe716f81f3c9a927698d14c7005bb0ce2ae5d2eadf27514dfbba88c1 SHA512 319e1029746ebf6ef1c6b6bf6055d7c56e7caa2559b34b4fe639616c4332ef46661afad67c42d123bd0de67819812ea8f9cc9d51c0189edd6e33d5d47f47bb26
-DIST ruamel.yaml-0.18.7.tar.xz 199304 BLAKE2B 707e83c78c4301aae6d6130664a9e98fde7323c8d886f2ef1a5e9f147e1cb5cc835e414a1b055e359bd64442c45d0ab6f024f9165b5df8388bda423ed51c20ba SHA512 c5efa894d0fa1e8cfa9ff586d71e29ed7663c0f2e379603880d009260441ec2e476de6b2e97076c43e9b51cbb452e2cc18f21955c9d9bab54d56195567d3406d
+DIST ruamel.yaml-0.18.10.tar.xz 198860 BLAKE2B 02b6a1791002e5bd31c321c6307b7239be6f248e9b9186fcf9bdc440b966f15f5e947976a3295a279071a3b1f2853a2eb196851363ad3ed87f943850e40f0909 SHA512 089977ba0ac7b2f9cf761b4d94aa647ec431abe88fe21f167011899be3d13b5072b330a4c3f09cd14406692377235ec433db3f15e15df1a56697443cce4027fa
 DIST ruamel.yaml-0.18.8.tar.xz 199244 BLAKE2B 02935cd28ede36bf1ae84bb9d0cc4f15793051940195f714f9ed124df643c828cea7624310c58bf50312e8569ba7d0bc83af223b54c5e5e2a3c122dc0438f9be SHA512 533ede0b41101a0a02131983d032c229e8a6c64c5b679fc2793b9a98c81809c253a250a94c36a94e96f184ffe9a5fc8cd5dc8568f568e47d78219561638363b5
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.18.10.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.18.10.ebuild
new file mode 100644
index 000000000000..703a261ade8b
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.18.10.ebuild
@@ -0,0 +1,53 @@
+# 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
+
+MY_P="${P/-/.}"
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="
+	https://pypi.org/project/ruamel.yaml/
+	https://sourceforge.net/projects/ruamel-yaml/
+"
+# PyPI tarballs do not include tests
+SRC_URI="https://downloads.sourceforge.net/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
+	!dev-python/namespace-ruamel
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		_test/test_deprecation.py::test_collections_deprecation
+	)
+	local EPYTEST_IGNORE=(
+		# Old PyYAML tests from lib/ require special set-up and are
+		# invoked indirectly via test_z_olddata, tell pytest itself
+		# to leave the subdir alone.
+		_test/lib/
+	)
+
+	# this is needed to keep the tests working while
+	# dev-python/namespace-ruamel is still installed
+	distutils_write_namespace ruamel
+	epytest
+}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.18.6.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.18.6.ebuild
deleted file mode 100644
index 64b87bd02b8f..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.18.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P="${P/-/.}"
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/projects/ruamel-yaml/
-"
-# PyPI tarballs do not include tests
-SRC_URI="https://downloads.sourceforge.net/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
-	!dev-python/namespace-ruamel
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-	local EPYTEST_IGNORE=(
-		# Old PyYAML tests from lib/ require special set-up and are
-		# invoked indirectly via test_z_olddata, tell pytest itself
-		# to leave the subdir alone.
-		_test/lib/
-	)
-
-	# this is needed to keep the tests working while
-	# dev-python/namespace-ruamel is still installed
-	distutils_write_namespace ruamel
-	epytest
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.18.7.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.18.7.ebuild
deleted file mode 100644
index 8fe17291f6bb..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.18.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P="${P/-/.}"
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/projects/ruamel-yaml/
-"
-# PyPI tarballs do not include tests
-SRC_URI="https://downloads.sourceforge.net/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
-	!dev-python/namespace-ruamel
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-	local EPYTEST_IGNORE=(
-		# Old PyYAML tests from lib/ require special set-up and are
-		# invoked indirectly via test_z_olddata, tell pytest itself
-		# to leave the subdir alone.
-		_test/lib/
-	)
-
-	# this is needed to keep the tests working while
-	# dev-python/namespace-ruamel is still installed
-	distutils_write_namespace ruamel
-	epytest
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.18.8.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.18.8.ebuild
index 703a261ade8b..4efd00e6d2e1 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.18.8.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.18.8.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index e67351e2b608..ddef2112107b 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1 +1,3 @@
 DIST s3transfer-0.10.4.tar.gz 145287 BLAKE2B 0b15068862236237287243237639310d35de942b0d3d399edd5ee924195ee8f45b2badea4b02f8dceef64f034111a810910b8208cb6e0c5db070b39f5c39f615 SHA512 671d95e9f507bdca8cf53b88cd28285f9c2ae1456fcb24ba4a61a75d30e8c8fa8b2a4faa8c8364114dc3e5c57f630d5b61575847b167e37b3de44b42c45f6a63
+DIST s3transfer-0.11.0.tar.gz 146986 BLAKE2B 050e757482c5b7524b2cc0b7aee1d41cbbff2ee26f62caff481077a4985932ffc486abe7076e4f4e4e4549eb616b302da0a279d86b826a780f4cf017168ad828 SHA512 8e12199fbcec039f228df877ff2026a1e977eafb9fd967d7e5669a9e6f8b73673f295df1a469ed6ce082a1882dab4518b1f6621ca3714c13f8febaa90dfee922
+DIST s3transfer-0.11.1.tar.gz 146952 BLAKE2B 25da68be52e1ba6723061ac87628235062ce4fef0a03d8c9958f72bade37b2851f77f5ed3944c8f43b82b45c65d90fecc41b5dbf4830215e4a533c2e5186088a SHA512 c1a9e14dd1f19166944193d5891c58b4392c2693d8171900937f473a2f55bc504a667c23730f0da837a7252948c62faa1476448c1254d61d4cc01db881d33cb7
diff --git a/dev-python/s3transfer/s3transfer-0.10.4.ebuild b/dev-python/s3transfer/s3transfer-0.10.4.ebuild
index 9a3d528445d1..a0f906780e1a 100644
--- a/dev-python/s3transfer/s3transfer-0.10.4.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.10.4.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/botocore-2[${PYTHON_USEDEP}]
diff --git a/dev-python/s3transfer/s3transfer-0.11.0.ebuild b/dev-python/s3transfer/s3transfer-0.11.0.ebuild
new file mode 100644
index 000000000000..66ebf3255b17
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.11.0.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="An Amazon S3 Transfer Manager"
+HOMEPAGE="
+	https://github.com/boto/s3transfer/
+	https://pypi.org/project/s3transfer/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/botocore-2[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.33.2[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{unit,functional}
+}
diff --git a/dev-python/s3transfer/s3transfer-0.11.1.ebuild b/dev-python/s3transfer/s3transfer-0.11.1.ebuild
new file mode 100644
index 000000000000..89ed9abf75cd
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.11.1.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="An Amazon S3 Transfer Manager"
+HOMEPAGE="
+	https://github.com/boto/s3transfer/
+	https://pypi.org/project/s3transfer/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/botocore-2[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.36.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{unit,functional}
+}
diff --git a/dev-python/scikit-learn/Manifest b/dev-python/scikit-learn/Manifest
index 722d4adfb74f..5a7b56d1d2db 100644
--- a/dev-python/scikit-learn/Manifest
+++ b/dev-python/scikit-learn/Manifest
@@ -1 +1,2 @@
 DIST scikit-learn-1.6.0.gh.tar.gz 7058791 BLAKE2B 57a81223d4cd2ac60cf00829f0e9b3fc404341428ec5ebbdf187f6c69213d90bf541ee6bf69a7dbe6e68225d34cf393302b098cc62e44068515b22d9e6462549 SHA512 7301503d581f908d7d70c708c44d5ec39567628c9f05a4135d69864a6bff6252fe1af6aac9c87c4c829c7e98008bab6fe964bcab6a3bb617996dc8368bb4fa60
+DIST scikit-learn-1.6.1.gh.tar.gz 7046495 BLAKE2B 83292549cc12e44033451345fe6deac17fa4f3d013f9755839d4d7f1c7de9690c089a754493d0d3879ef44ed8523400d617fa4d135ce8500dab608552777cdf6 SHA512 ad91d7bd67884851334fed9b0f3b6f3bfacb6b1521b89acbe22e9428a88009579373118bbd3a55358ea60c997e98609062fc4eac8b1def1d0ad18026c0491074
diff --git a/dev-python/scikit-learn/scikit-learn-1.6.1.ebuild b/dev-python/scikit-learn/scikit-learn-1.6.1.ebuild
new file mode 100644
index 000000000000..6494e5fac5ee
--- /dev/null
+++ b/dev-python/scikit-learn/scikit-learn-1.6.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Machine learning library for Python"
+HOMEPAGE="
+	https://scikit-learn.org/stable/
+	https://github.com/scikit-learn/scikit-learn/
+	https://pypi.org/project/scikit-learn/
+"
+SRC_URI="
+	https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
+IUSE="examples"
+
+DEPEND="
+	virtual/blas:=
+	virtual/cblas:=
+	>=dev-python/numpy-1.19.5:=[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/joblib-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/threadpoolctl-3.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pythran-0.14.0[${PYTHON_USEDEP}]
+	>=dev-python/cython-3.0.10[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+# For some reason this wants to use urllib to fetch things from the internet
+# distutils_enable_sphinx doc \
+# 	dev-python/matplotlib \
+# 	dev-python/memory-profiler \
+# 	dev-python/numpydoc \
+# 	dev-python/pandas \
+# 	dev-python/pillow \
+# 	dev-python/seaborn \
+# 	dev-python/sphinx-gallery \
+# 	dev-python/sphinx-prompt \
+# 	dev-python/scikit-image
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO: floating-point problems
+		gaussian_process/kernels.py::sklearn.gaussian_process.kernels.ExpSineSquared
+		# doctest failing on extra shape= in repr, probably numpy version
+		cluster/_hdbscan/hdbscan.py::sklearn.cluster._hdbscan.hdbscan.HDBSCAN
+	)
+
+	rm -rf sklearn || die
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest --pyargs sklearn
+}
+
+python_install_all() {
+	find "${S}" -name \*LICENSE.txt -delete || die
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 16dfeb1fada8..f19eb2f509f3 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,4 +1,5 @@
 DIST scipy-1.14.1.tar.gz 58620554 BLAKE2B 5cb383648a5f3b8d0d321efcd66992212c59ce3fc3dbf812a2fa97c09cb18831b280af6c7689553644f83c531a266e9152e2a139a12aed08307e1ed64deea78e SHA512 20e3cf13590f76dfdc40ca8f90e6d5a68502e74415f37fa24fdb8169098e1d7f0aa631ae742c8c3e9573fa7d63da61986d51f35f090a3785873ae0761f7fcfa6
-DIST scipy-1.15.0rc1.tar.gz 59145455 BLAKE2B 07375d2ecb2433b510d14f77e47bed30e7d4c111f1f07e94f096c862e741083e36aede216c8891c26df490a07180f931ea0f6430d4aa6ab4fb5f1787e1483a6e SHA512 a488d5019b7565af7f1dd2dc74e592bd63d30ec0898c1188b170cc1b241d3606bd9a91afb18becff3a39cdf6dc4c92b198b163d05e1c298c014184e98f9fe94b
-DIST scipy-1.15.0rc2.tar.gz 59412249 BLAKE2B 3acbb7e952a9b4ee88d8dcbdb31465ed2f20866ca016377ddffb7ff2469d91468eceecb481fd44bd715c4fc8dc9b6518e8c54c9c4e6c7b3ee77a2afd7b7ce667 SHA512 d39bb8277d1881dff2c0694552076bb30cf69a9813d70c1b4a8eb90a355ba1f274936654f3ac5768ef3c4fca76659682f4c89453cc26a832c21119523939bf49
+DIST scipy-1.15.0.tar.gz 59407226 BLAKE2B 30e2f1c797c46646b21578c9b22145773c27119674ec8d4bba1b6e4bac4fe6d56d7b6fa49964783f432008a027e1498edbdceec6d1345aaee4bbe8975648b9b7 SHA512 62c2616535790a65cfe5907abaaa655ca9268406765e9baab31097aece7a3887e2bc616a77abe9869b2ff4b07dc4a56fc1dbbaaf82ebfd7d9a89e05b8e87df86
+DIST scipy-1.15.1.tar.gz 59407493 BLAKE2B 959e1e311c5e53c2751794f629777a611ebd79c87d6cc2dec330ca335100b773528aa151e319cd9ae0520257d89597acdb3aca2319ab78c367c135499f54001f SHA512 92cb6a2cdb5a305eef0aa81baea4b90c14c0084c09ffbf62f2d6ee8dd5a08791a838838e2d4907356b5b07d0b4f74a81a8e861f81628bd9e5c7e0216e3f77b17
 DIST scipy-html-1.14.0.zip 65723829 BLAKE2B ba47dbf00a5d2a53a9addc5ea68ab18b42f211a018b89aa4b0b57ff0dee02e410a3effc59ddf8fbbc5aa33075d45d86880aed3a14068da5bd7b62ee526199967 SHA512 93be0bafcc64cea1ba130bbcc77c0741acc4f819c84a5030391a22657a1bc63abe8434a2723f66b7ad04c0809dc6d02e3a97ffb8d94bd3d4a4bb759ee796b475
+DIST scipy-html-1.15.1.zip 68514487 BLAKE2B 328550d3d5700c520b2a6404c326a54ffecacc95ad5d05c727d833803d698346fb0188b6bcb659838c1a0f26355b28d70df02cddff48b8bdf564292e6cab56bc SHA512 14311da185c9454fe7dd2a8253dc4fad434664df4c7261b22a3415de576a49d51ce9a00dfb3c3ea4df9ce2bf1c9d7547ceeeb5af72eeda823243d7a2541db676
diff --git a/dev-python/scipy/scipy-1.15.0.ebuild b/dev-python/scipy/scipy-1.15.0.ebuild
new file mode 100644
index 000000000000..9412dd55294c
--- /dev/null
+++ b/dev-python/scipy/scipy-1.15.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic fortran-2 distutils-r1
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="
+	https://scipy.org/
+	https://github.com/scipy/scipy/
+	https://pypi.org/project/scipy/
+"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	# Need submodules, so git for now.
+	EGIT_REPO_URI="https://github.com/scipy/scipy"
+	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
+	EGIT_SUBMODULES=( '*' )
+else
+	inherit pypi
+
+	# Upstream is often behind with doc updates
+	DOC_PV=1.14.0
+
+	SRC_URI+="
+		doc? (
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
+		)"
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+fi
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc +fortran test-rust"
+
+# umfpack is technically optional but it's preferred to have it available.
+DEPEND="
+	>=dev-python/numpy-1.23.5:=[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:=
+	sci-libs/umfpack
+	virtual/cblas
+	>=virtual/lapack-3.8
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-3.0.8[${PYTHON_USEDEP}]
+	>=dev-python/meson-python-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.13.2[${PYTHON_USEDEP}]
+	>=dev-build/meson-1.1.0
+	!kernel_Darwin? ( dev-util/patchelf )
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	fortran? (
+		>=dev-python/pythran-0.16.0[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/hypothesis-6.30[${PYTHON_USEDEP}]
+	)
+	test-rust? (
+		dev-python/pooch[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_configure_all() {
+	DISTUTILS_ARGS=(
+		-Dblas=blas
+		-Dlapack=lapack
+		-Duse-pythran=$(usex fortran true false)
+	)
+
+	# https://bugs.gentoo.org/932721
+	has_version '>=dev-python/numpy-2.0.0' && filter-lto
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+
+	local EPYTEST_DESELECT=(
+		# Network
+		scipy/datasets/tests/test_data.py::TestDatasets::test_existence_all
+		scipy/datasets/tests/test_data.py::TestDatasets::test_ascent
+		scipy/datasets/tests/test_data.py::TestDatasets::test_face
+		scipy/datasets/tests/test_data.py::TestDatasets::test_electrocardiogram
+
+		# Precision issue with diff. blas?
+		scipy/optimize/tests/test__basinhopping.py::Test_Metropolis::test_gh7799
+
+		# Crashes with assertion, not a regression
+		# https://github.com/scipy/scipy/issues/19321
+		scipy/signal/tests/test_signaltools.py::test_lfilter_bad_object
+
+		# timeouts
+		scipy/sparse/linalg/tests/test_propack.py::test_examples
+		# hang or incredibly slow
+		scipy/optimize/tests/test_lsq_linear.py::TestBVLS::test_large_rank_deficient
+		scipy/optimize/tests/test_lsq_linear.py::TestTRF::test_large_rank_deficient
+
+		# TODO
+		scipy/optimize/tests/test_minimize_constrained.py::TestTrustRegionConstr::test_list_of_problems
+	)
+	local EPYTEST_IGNORE=()
+
+	if ! has_version -b "dev-python/pooch[${PYTHON_USEDEP}]" ; then
+		EPYTEST_IGNORE+=(
+			scipy/datasets/tests/test_data.py
+		)
+	fi
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# fd leaks in tests
+				# https://github.com/scipy/scipy/issues/19553
+				scipy/fft/_pocketfft/tests/test_real_transforms.py
+				# TODO
+				'scipy/special/tests/test_data.py::test_boost[<Data for expi: expinti_data_long_ipp-expinti_data_long>]'
+				# missing dict.__ror__
+				# https://github.com/pypy/pypy/issues/4934
+				'scipy/sparse/tests/test_dok.py::test_dunder_ror[dok_matrix]'
+				# mismatched exception message
+				scipy/optimize/tests/test_hessian_update_strategy.py::TestHessianUpdateStrategy::test_initialize_catch_illegal
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# avoid other stuff being multithreaded when using xdist
+	local -x PYTHON_CPU_COUNT=1
+	epytest scipy
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${WORKDIR}"/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/scipy/scipy-1.15.0_rc1.ebuild b/dev-python/scipy/scipy-1.15.0_rc1.ebuild
deleted file mode 100644
index e2f6d629ee17..000000000000
--- a/dev-python/scipy/scipy-1.15.0_rc1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FORTRAN_NEEDED=fortran
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=meson-python
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit flag-o-matic fortran-2 distutils-r1
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="
-	https://scipy.org/
-	https://github.com/scipy/scipy/
-	https://pypi.org/project/scipy/
-"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-
-	# Need submodules, so git for now.
-	EGIT_REPO_URI="https://github.com/scipy/scipy"
-	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
-	EGIT_SUBMODULES=( '*' )
-else
-	inherit pypi
-
-	# Upstream is often behind with doc updates
-	DOC_PV=1.14.0
-
-	SRC_URI+="
-		doc? (
-			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
-		)"
-
-	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	fi
-fi
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc +fortran test-rust"
-
-# umfpack is technically optional but it's preferred to have it available.
-DEPEND="
-	>=dev-python/numpy-1.23.5:=[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:=
-	sci-libs/umfpack
-	virtual/cblas
-	>=virtual/lapack-3.8
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-lang/swig
-	>=dev-python/cython-3.0.8[${PYTHON_USEDEP}]
-	>=dev-python/meson-python-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.13.2[${PYTHON_USEDEP}]
-	>=dev-build/meson-1.1.0
-	!kernel_Darwin? ( dev-util/patchelf )
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	fortran? (
-		>=dev-python/pythran-0.16.0[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/hypothesis-6.30[${PYTHON_USEDEP}]
-	)
-	test-rust? (
-		dev-python/pooch[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_configure_all() {
-	DISTUTILS_ARGS=(
-		-Dblas=blas
-		-Dlapack=lapack
-		-Duse-pythran=$(usex fortran true false)
-	)
-
-	# https://bugs.gentoo.org/932721
-	has_version '>=dev-python/numpy-2.0.0' && filter-lto
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-
-	local EPYTEST_DESELECT=(
-		# Network
-		scipy/datasets/tests/test_data.py::TestDatasets::test_existence_all
-		scipy/datasets/tests/test_data.py::TestDatasets::test_ascent
-		scipy/datasets/tests/test_data.py::TestDatasets::test_face
-		scipy/datasets/tests/test_data.py::TestDatasets::test_electrocardiogram
-
-		# Precision issue with diff. blas?
-		scipy/optimize/tests/test__basinhopping.py::Test_Metropolis::test_gh7799
-
-		# Crashes with assertion, not a regression
-		# https://github.com/scipy/scipy/issues/19321
-		scipy/signal/tests/test_signaltools.py::test_lfilter_bad_object
-
-		# timeouts
-		scipy/sparse/linalg/tests/test_propack.py::test_examples
-		# hang or incredibly slow
-		scipy/optimize/tests/test_lsq_linear.py::TestBVLS::test_large_rank_deficient
-		scipy/optimize/tests/test_lsq_linear.py::TestTRF::test_large_rank_deficient
-
-		# TODO
-		scipy/optimize/tests/test_minimize_constrained.py::TestTrustRegionConstr::test_list_of_problems
-	)
-	local EPYTEST_IGNORE=()
-
-	if ! has_version -b "dev-python/pooch[${PYTHON_USEDEP}]" ; then
-		EPYTEST_IGNORE+=(
-			scipy/datasets/tests/test_data.py
-		)
-	fi
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# fd leaks in tests
-				# https://github.com/scipy/scipy/issues/19553
-				scipy/fft/_pocketfft/tests/test_real_transforms.py
-				# TODO
-				'scipy/special/tests/test_data.py::test_boost[<Data for expi: expinti_data_long_ipp-expinti_data_long>]'
-				# missing dict.__ror__
-				# https://github.com/pypy/pypy/issues/4934
-				'scipy/sparse/tests/test_dok.py::test_dunder_ror[dok_matrix]'
-				# mismatched exception message
-				scipy/optimize/tests/test_hessian_update_strategy.py::TestHessianUpdateStrategy::test_initialize_catch_illegal
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# avoid other stuff being multithreaded when using xdist
-	local -x PYTHON_CPU_COUNT=1
-	epytest scipy
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${WORKDIR}"/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/scipy/scipy-1.15.0_rc2.ebuild b/dev-python/scipy/scipy-1.15.0_rc2.ebuild
deleted file mode 100644
index e2f6d629ee17..000000000000
--- a/dev-python/scipy/scipy-1.15.0_rc2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FORTRAN_NEEDED=fortran
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=meson-python
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit flag-o-matic fortran-2 distutils-r1
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="
-	https://scipy.org/
-	https://github.com/scipy/scipy/
-	https://pypi.org/project/scipy/
-"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-
-	# Need submodules, so git for now.
-	EGIT_REPO_URI="https://github.com/scipy/scipy"
-	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
-	EGIT_SUBMODULES=( '*' )
-else
-	inherit pypi
-
-	# Upstream is often behind with doc updates
-	DOC_PV=1.14.0
-
-	SRC_URI+="
-		doc? (
-			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
-		)"
-
-	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	fi
-fi
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc +fortran test-rust"
-
-# umfpack is technically optional but it's preferred to have it available.
-DEPEND="
-	>=dev-python/numpy-1.23.5:=[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:=
-	sci-libs/umfpack
-	virtual/cblas
-	>=virtual/lapack-3.8
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-lang/swig
-	>=dev-python/cython-3.0.8[${PYTHON_USEDEP}]
-	>=dev-python/meson-python-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.13.2[${PYTHON_USEDEP}]
-	>=dev-build/meson-1.1.0
-	!kernel_Darwin? ( dev-util/patchelf )
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	fortran? (
-		>=dev-python/pythran-0.16.0[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/hypothesis-6.30[${PYTHON_USEDEP}]
-	)
-	test-rust? (
-		dev-python/pooch[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_configure_all() {
-	DISTUTILS_ARGS=(
-		-Dblas=blas
-		-Dlapack=lapack
-		-Duse-pythran=$(usex fortran true false)
-	)
-
-	# https://bugs.gentoo.org/932721
-	has_version '>=dev-python/numpy-2.0.0' && filter-lto
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-
-	local EPYTEST_DESELECT=(
-		# Network
-		scipy/datasets/tests/test_data.py::TestDatasets::test_existence_all
-		scipy/datasets/tests/test_data.py::TestDatasets::test_ascent
-		scipy/datasets/tests/test_data.py::TestDatasets::test_face
-		scipy/datasets/tests/test_data.py::TestDatasets::test_electrocardiogram
-
-		# Precision issue with diff. blas?
-		scipy/optimize/tests/test__basinhopping.py::Test_Metropolis::test_gh7799
-
-		# Crashes with assertion, not a regression
-		# https://github.com/scipy/scipy/issues/19321
-		scipy/signal/tests/test_signaltools.py::test_lfilter_bad_object
-
-		# timeouts
-		scipy/sparse/linalg/tests/test_propack.py::test_examples
-		# hang or incredibly slow
-		scipy/optimize/tests/test_lsq_linear.py::TestBVLS::test_large_rank_deficient
-		scipy/optimize/tests/test_lsq_linear.py::TestTRF::test_large_rank_deficient
-
-		# TODO
-		scipy/optimize/tests/test_minimize_constrained.py::TestTrustRegionConstr::test_list_of_problems
-	)
-	local EPYTEST_IGNORE=()
-
-	if ! has_version -b "dev-python/pooch[${PYTHON_USEDEP}]" ; then
-		EPYTEST_IGNORE+=(
-			scipy/datasets/tests/test_data.py
-		)
-	fi
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# fd leaks in tests
-				# https://github.com/scipy/scipy/issues/19553
-				scipy/fft/_pocketfft/tests/test_real_transforms.py
-				# TODO
-				'scipy/special/tests/test_data.py::test_boost[<Data for expi: expinti_data_long_ipp-expinti_data_long>]'
-				# missing dict.__ror__
-				# https://github.com/pypy/pypy/issues/4934
-				'scipy/sparse/tests/test_dok.py::test_dunder_ror[dok_matrix]'
-				# mismatched exception message
-				scipy/optimize/tests/test_hessian_update_strategy.py::TestHessianUpdateStrategy::test_initialize_catch_illegal
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# avoid other stuff being multithreaded when using xdist
-	local -x PYTHON_CPU_COUNT=1
-	epytest scipy
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${WORKDIR}"/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/scipy/scipy-1.15.1.ebuild b/dev-python/scipy/scipy-1.15.1.ebuild
new file mode 100644
index 000000000000..ac7448bc5b42
--- /dev/null
+++ b/dev-python/scipy/scipy-1.15.1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic fortran-2 distutils-r1
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="
+	https://scipy.org/
+	https://github.com/scipy/scipy/
+	https://pypi.org/project/scipy/
+"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	# Need submodules, so git for now.
+	EGIT_REPO_URI="https://github.com/scipy/scipy"
+	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
+	EGIT_SUBMODULES=( '*' )
+else
+	inherit pypi
+
+	# Upstream is often behind with doc updates
+	DOC_PV=${PV}
+
+	SRC_URI+="
+		doc? (
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
+		)"
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+fi
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc +fortran test-rust"
+
+# umfpack is technically optional but it's preferred to have it available.
+DEPEND="
+	>=dev-python/numpy-1.23.5:=[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:=
+	sci-libs/umfpack
+	virtual/cblas
+	>=virtual/lapack-3.8
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-3.0.8[${PYTHON_USEDEP}]
+	>=dev-python/meson-python-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.13.2[${PYTHON_USEDEP}]
+	>=dev-build/meson-1.1.0
+	!kernel_Darwin? ( dev-util/patchelf )
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	fortran? (
+		>=dev-python/pythran-0.16.0[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/hypothesis-6.30[${PYTHON_USEDEP}]
+	)
+	test-rust? (
+		dev-python/pooch[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_configure_all() {
+	DISTUTILS_ARGS=(
+		-Dblas=blas
+		-Dlapack=lapack
+		-Duse-pythran=$(usex fortran true false)
+	)
+
+	# https://bugs.gentoo.org/932721
+	has_version '>=dev-python/numpy-2.0.0' && filter-lto
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+
+	local EPYTEST_DESELECT=(
+		# Network
+		scipy/datasets/tests/test_data.py::TestDatasets::test_existence_all
+		scipy/datasets/tests/test_data.py::TestDatasets::test_ascent
+		scipy/datasets/tests/test_data.py::TestDatasets::test_face
+		scipy/datasets/tests/test_data.py::TestDatasets::test_electrocardiogram
+
+		# Precision issue with diff. blas?
+		scipy/optimize/tests/test__basinhopping.py::Test_Metropolis::test_gh7799
+
+		# Crashes with assertion, not a regression
+		# https://github.com/scipy/scipy/issues/19321
+		scipy/signal/tests/test_signaltools.py::test_lfilter_bad_object
+
+		# timeouts
+		scipy/sparse/linalg/tests/test_propack.py::test_examples
+		# hang or incredibly slow
+		scipy/optimize/tests/test_lsq_linear.py::TestBVLS::test_large_rank_deficient
+		scipy/optimize/tests/test_lsq_linear.py::TestTRF::test_large_rank_deficient
+
+		# TODO
+		scipy/optimize/tests/test_minimize_constrained.py::TestTrustRegionConstr::test_list_of_problems
+	)
+	local EPYTEST_IGNORE=()
+
+	if ! has_version -b "dev-python/pooch[${PYTHON_USEDEP}]" ; then
+		EPYTEST_IGNORE+=(
+			scipy/datasets/tests/test_data.py
+		)
+	fi
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# fd leaks in tests
+				# https://github.com/scipy/scipy/issues/19553
+				scipy/fft/_pocketfft/tests/test_real_transforms.py
+				# TODO
+				'scipy/special/tests/test_data.py::test_boost[<Data for expi: expinti_data_long_ipp-expinti_data_long>]'
+				# missing dict.__ror__
+				# https://github.com/pypy/pypy/issues/4934
+				'scipy/sparse/tests/test_dok.py::test_dunder_ror[dok_matrix]'
+				# mismatched exception message
+				scipy/optimize/tests/test_hessian_update_strategy.py::TestHessianUpdateStrategy::test_initialize_catch_illegal
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# avoid other stuff being multithreaded when using xdist
+	local -x PYTHON_CPU_COUNT=1
+	epytest scipy
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${WORKDIR}"/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/semver/semver-3.0.2.ebuild b/dev-python/semver/semver-3.0.2.ebuild
index 846e5c6958e9..4dda9e610eee 100644
--- a/dev-python/semver/semver-3.0.2.ebuild
+++ b/dev-python/semver/semver-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index d22fe42ce44b..e157844ebdc0 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,2 +1 @@
-DIST setproctitle-1.3.3.tar.gz 27253 BLAKE2B 92a789ec5a132e7560e203ef185f914e3b26986da3b53992a1954d3db0ff0b213ffdec5a0db9bf57bd80b197e09481a23541b8979b54a445df1840f469810922 SHA512 daf9954beef0c28b5c9f71e1dbf713e655d2ea6b66387f6f47da5b3b6c679f3faaa26c74d2b7c3b5460468394e0582a1ff45e5d67ff2d85826317fc69c9eb828
 DIST setproctitle-1.3.4.tar.gz 26456 BLAKE2B c0be58c004c7a1834c0967ba4f90688aa668c3f6c8ab7c944891e7e4e78de65e14b829f8abf63c8490689d8cd6ab23f236ecfa7837fc4bbc28a45ef46dd3f24b SHA512 b1a8648a83648766eb9f88a15982568de6640692a39a1079455d8788996f73e313b879f567c82878450798b5755a8111a7965b3776e9238eebb59dfd09d41c4e
diff --git a/dev-python/setproctitle/setproctitle-1.3.3.ebuild b/dev-python/setproctitle/setproctitle-1.3.3.ebuild
deleted file mode 100644
index b347e9c3c3e0..000000000000
--- a/dev-python/setproctitle/setproctitle-1.3.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# The package has a fallback implementation which is a noop but warns
-# if the extensions weren't built, so we always build them.
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="
-	https://github.com/dvarrazzo/py-setproctitle/
-	https://pypi.org/project/setproctitle/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/setproctitle/setproctitle-1.3.4-r1.ebuild b/dev-python/setproctitle/setproctitle-1.3.4-r1.ebuild
index 450f5ea2ac17..7fab1ef22867 100644
--- a/dev-python/setproctitle/setproctitle-1.3.4-r1.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.3.4-r1.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
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index fa831b8af949..02a92c745c28 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1 +1,3 @@
 DIST setuptools-75.6.0.tar.gz 1337429 BLAKE2B 65ba2e3de8dd0c86ab0ad59a5dc99a860ef5b59f357272eb2568347a496d853ef8e12a2d456dee3effe6f100bfb8d29e2f9f60123b58d791003ce3cddac23e8a SHA512 bdc12309165912f8de84e6f4ceaaf8f6b05dc1506a9205201784eb740346d773a7701af9b570cb13c272d81dcc0b4928e53ea1c4bb7c179debf479701c35bb6e
+DIST setuptools-75.7.0.tar.gz 1338616 BLAKE2B df1a44a354fc48fc9bdbbea3883d0659f9865c1000b50dc8a329f6c8be9c9777b1f9cc6ce93e2e38cc53f46d08daadd470101913bf1a5992a50cd4049684c1fa SHA512 22cb119056efbfd5986eaa38ab37b24bdbbfd9903202fa031eb9a8acc4cbc1586df04bdf871eaaeeb09bfe1ad28d117e9b187f16d54afe26afc658295b5183f1
+DIST setuptools-75.8.0.tar.gz 1343222 BLAKE2B a71cba4c11ede52aae24e8a8045f2733f93001b896ea4dd46ebdfa0dd639fccfcc24b038cf4f9b6363b768e98d66cbeac2331cbcd4bb38767ea73f1811a11837 SHA512 4afa657c5259f9f405c39d82d8c264236749861ba2b104e8b26dd49da8ffb27ad3089ea894f2bb65208f480d7a4042114b93228f1cf2b224dc248774d7681a3d
diff --git a/dev-python/setuptools/setuptools-75.7.0.ebuild b/dev-python/setuptools/setuptools-75.7.0.ebuild
new file mode 100644
index 000000000000..5b55118e8f20
--- /dev/null
+++ b/dev-python/setuptools/setuptools-75.7.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+# please bump dev-python/ensurepip-setuptools along with this package!
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!<dev-python/setuptools-rust-1.8.0
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-4[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-24.2[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-4.2.2[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.44.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.10)
+	!<=dev-libs/gobject-introspection-1.76.1-r0
+	!=dev-libs/gobject-introspection-1.78.1-r0
+	!=dev-libs/gobject-introspection-1.80.1-r1
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.14[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.7.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-test-5.5[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
+			dev-python/pyproject-hooks[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			>=dev-python/pytest-home-0.5[${PYTHON_USEDEP}]
+			dev-python/pytest-subprocess[${PYTHON_USEDEP}]
+			dev-python/pytest-timeout[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+# setuptools-scm is here because installing plugins apparently breaks stuff at
+# runtime, so let's pull it early. See bug #663324.
+#
+# trove-classifiers are optionally used in validation, if they are
+# installed.  Since we really oughtn't block them, let's always enforce
+# the newest version for the time being to avoid errors.
+# https://github.com/pypa/setuptools/issues/4459
+PDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
+		# https://github.com/abravalheri/validate-pyproject/pull/221
+		"${FILESDIR}/setuptools-75.6.0-disable-trove-classifiers.patch"
+	)
+
+	distutils-r1_src_prepare
+
+	# breaks tests
+	sed -i -e '/--import-mode/d' pytest.ini || die
+
+	# remove bundled dependencies
+	rm -r */_vendor || die
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		setuptools/tests/test_build_meta.py::test_legacy_editable_install
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_editable_install.py
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# TODO
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		# fails if python-xlib is installed
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		# TODO, probably some random package
+		setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass
+		# broken by unbundling
+		setuptools/tests/test_setuptools.py::test_wheel_includes_vendored_metadata
+		# fails on normalized metadata, perhaps different dep version?
+		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_with_pyproject_config
+		# TODO
+		setuptools/tests/test_sdist.py::test_sanity_check_setuptools_own_sdist
+	)
+
+	local EPYTEST_XDIST=1
+	local -x PRE_BUILT_SETUPTOOLS_WHEEL=${DISTUTILS_WHEEL_PATH}
+	epytest -o tmp_path_retention_policy=all \
+		-m "not uses_network" setuptools
+}
diff --git a/dev-python/setuptools/setuptools-75.8.0.ebuild b/dev-python/setuptools/setuptools-75.8.0.ebuild
new file mode 100644
index 000000000000..4daa92c3dd0d
--- /dev/null
+++ b/dev-python/setuptools/setuptools-75.8.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+# please bump dev-python/ensurepip-setuptools along with this package!
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!<dev-python/setuptools-rust-1.8.0
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-4[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-24.2[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-4.2.2[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.44.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.10)
+	!<=dev-libs/gobject-introspection-1.76.1-r0
+	!=dev-libs/gobject-introspection-1.78.1-r0
+	!=dev-libs/gobject-introspection-1.80.1-r1
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.14[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.7.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-test-5.5[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
+			dev-python/pyproject-hooks[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			>=dev-python/pytest-home-0.5[${PYTHON_USEDEP}]
+			dev-python/pytest-subprocess[${PYTHON_USEDEP}]
+			dev-python/pytest-timeout[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+# setuptools-scm is here because installing plugins apparently breaks stuff at
+# runtime, so let's pull it early. See bug #663324.
+#
+# trove-classifiers are optionally used in validation, if they are
+# installed.  Since we really oughtn't block them, let's always enforce
+# the newest version for the time being to avoid errors.
+# https://github.com/pypa/setuptools/issues/4459
+PDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
+		# https://github.com/abravalheri/validate-pyproject/pull/221
+		"${FILESDIR}/setuptools-75.6.0-disable-trove-classifiers.patch"
+	)
+
+	distutils-r1_src_prepare
+
+	# breaks tests
+	sed -i -e '/--import-mode/d' pytest.ini || die
+
+	# remove bundled dependencies
+	rm -r */_vendor || die
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		setuptools/tests/test_build_meta.py::test_legacy_editable_install
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_editable_install.py
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# TODO
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		# fails if python-xlib is installed
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		# TODO, probably some random package
+		setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass
+		# broken by unbundling
+		setuptools/tests/test_setuptools.py::test_wheel_includes_vendored_metadata
+		# fails on normalized metadata, perhaps different dep version?
+		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_with_pyproject_config
+		# TODO
+		setuptools/tests/test_sdist.py::test_sanity_check_setuptools_own_sdist
+		# relies on -Werror
+		setuptools/_static.py::setuptools._static.Dict
+		setuptools/_static.py::setuptools._static.List
+	)
+
+	local EPYTEST_XDIST=1
+	local -x PRE_BUILT_SETUPTOOLS_WHEEL=${DISTUTILS_WHEEL_PATH}
+	epytest -o tmp_path_retention_policy=all \
+		-m "not uses_network" setuptools
+}
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index 78a533dfe10d..b84c7a9b2ee9 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1 +1,2 @@
 DIST sh-2.1.0.tar.gz 345525 BLAKE2B 3d0f35ad8281e5dafb6fa7fab886bfd3b8b361e92ab4e5b382cd5341a279a8eb1a66e91351dba220a392f3f4679ce2e298bd92a704b5ba0efd59d6cd3c5e0e27 SHA512 14defeb52c15d6571fe71b97f9b720e3cf161e905f4e7cbea12a5f4c27e14b28c86a4614189176cde4cf05920b86f927605df7cfb4e71accc44b3d58debaaece
+DIST sh-2.2.1.tar.gz 345105 BLAKE2B f788bb73b9a348caf98053147dd28133abd90e68c5398d7d285034d1ef7426f89b47dd4ef107ff2c692994f73453cf00e16b23c95c2dce821829165b2a4dfcf6 SHA512 42036749a1a036be9d984e945f6f5b42360d52d3f49cc5520ea3622873cbb121caf447ad1be65498a28e3d226398dccded139d17d4763fc2b010ceb54c50d3a9
diff --git a/dev-python/sh/sh-2.2.1.ebuild b/dev-python/sh/sh-2.2.1.ebuild
new file mode 100644
index 000000000000..0a56790173dc
--- /dev/null
+++ b/dev-python/sh/sh-2.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python subprocess interface"
+HOMEPAGE="
+	https://github.com/amoffat/sh/
+	https://pypi.org/project/sh/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests unittest
+
+python_test() {
+	local -x SH_TESTS_RUNNING=1
+	eunittest -p "*_test.py"
+}
diff --git a/dev-python/shellingham/shellingham-1.5.4.ebuild b/dev-python/shellingham/shellingham-1.5.4.ebuild
index af510a58131d..53ffa0736a2b 100644
--- a/dev-python/shellingham/shellingham-1.5.4.ebuild
+++ b/dev-python/shellingham/shellingham-1.5.4.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
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv"
 
 DEPEND="
 	test? (
diff --git a/dev-python/shiboken6/Manifest b/dev-python/shiboken6/Manifest
index c9b70110b9de..68e216d91778 100644
--- a/dev-python/shiboken6/Manifest
+++ b/dev-python/shiboken6/Manifest
@@ -1,4 +1,2 @@
 DIST pyside-pyside-setup-6.8.1.1.gh.tar.gz 18699613 BLAKE2B 2c16f305a746106edc770c267900b31fe480b167a615adc82496e0604cc618982bb787a0c173b069c258749364d7d2cac900d8d8b82244fc3b916744b7339537 SHA512 bd258be6e4c5f0b6b4bbdf8887e5f8ab16a90117deb00f9c46c4acb7f6bbcc36fb9f6b6e7c201403556e0ee269947a5f5b2611ff1b05e48f231f81b1eeac7bce
 DIST pyside-pyside-setup-6.8.1.gh.tar.gz 18700869 BLAKE2B 5924f8ffc3e5a4f15442af9191b0531ee9f509595d41ae2759b94c2a7f8d7e08f4a70f9c7fff07f11c5252afb77084dc21ca3b22762d6c8dd66f4fca5944c9f2 SHA512 941844b1f6711859add828cbefe7c39497d45f0936f970f3050631294ed3bfe88d9d7b827a81d61ba3efbbf7920daef6ea6c28fa9c78f8e672d68b8bd3fbb2ad
-DIST pyside-setup-everywhere-src-6.7.2.tar.xz 14402156 BLAKE2B 321717ba46c7ed29404ee326f852cd4032f93e23b6b32a16e4e05305ff04a00a2029ee7c1d50ad7191a836ffd9a3ae858483bac35e8254bdcaeb474e2c92df60 SHA512 4376aba85867b5a04dab9d8889f5e32cb503cb8010757c1e810e60d29755f15a002b582594d0737a4119c030b48ede26964e8b1392700a6c061d7d631cdfe73e
-DIST pyside-setup-everywhere-src-6.7.3.tar.xz 14591496 BLAKE2B dfe21f8d9af346e43720685982ee736974661059f83e7f22e59ef98d444d181a5f6235e41db4c40c83697401e45dbc4e8765e6351702d4f300d1c63e5789a4d5 SHA512 5e4292b9809df571e1aa3db7c1366973aecf5aaba6638c78d676413985a965aa23b694ba287bdc1d9b8dca59ac24b8229021db6f5a2b5818c929cbada7ef7491
diff --git a/dev-python/shiboken6/shiboken6-6.7.2.ebuild b/dev-python/shiboken6/shiboken6-6.7.2.ebuild
deleted file mode 100644
index 4654302f19f6..000000000000
--- a/dev-python/shiboken6/shiboken6-6.7.2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Split the "/usr/bin/shiboken6" binding generator from the
-# "/usr/lib64/libshiboken6-*.so" family of shared libraries. The former
-# requires everything (including Clang) at runtime; the latter only requires
-# Qt and Python at runtime. Note that "pip" separates these two as well. See:
-# https://doc.qt.io/qtforpython/shiboken6/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
-# Once split, the PySide6 ebuild should be revised to require
-# "/usr/bin/shiboken6" at build time and "libshiboken6-*.so" at runtime.
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{10..13} )
-
-LLVM_COMPAT=( {15..18} )
-
-inherit cmake llvm-r1 python-r1 toolchain-funcs
-
-MY_PN="pyside-setup-everywhere-src"
-
-DESCRIPTION="Python binding generator for C++ libraries"
-HOMEPAGE="https://wiki.qt.io/PySide6"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
-S="${WORKDIR}/${MY_PN}-${PV}/sources/shiboken6"
-
-# The "sources/shiboken6/libshiboken" directory is triple-licensed under the
-# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
-# with version 1.0 of a Qt-specific exception enabling shiboken6 output to be
-# arbitrarily relicensed. (TODO)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
-SLOT="6/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
-IUSE="+docstrings numpy test vulkan"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-3)*:6"
-
-# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
-RDEPEND="${PYTHON_DEPS}
-	=dev-qt/qtbase-${QT_PV}
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
-	')
-	docstrings? (
-		>=dev-libs/libxml2-2.6.32
-		>=dev-libs/libxslt-1.1.19
-	)
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-	!dev-python/shiboken6:0
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
-"
-# testlib is toggled by the gui flag on qtbase
-
-DOCS=( AUTHORS )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.3.1-no-strip.patch"
-)
-
-src_prepare() {
-	# TODO: File upstream issue requesting a sane way to disable NumPy support.
-	if ! use numpy; then
-		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
-			libshiboken/CMakeLists.txt || die
-	fi
-
-	# Shiboken6 assumes Vulkan headers live under either "$VULKAN_SDK/include"
-	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
-	if use vulkan; then
-		sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
-			ApiExtractor/clangparser/compilersupport.cpp || die
-	fi
-
-	local clangver="$(CPP=clang clang-major-version)"
-
-	# Clang 15 and older used the full version as a directory name.
-	if [[ ${clangver} -lt 16 ]]; then
-		clangver="$(CPP=clang clang-fullversion)"
-	fi
-
-	# Shiboken6 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
-	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
-	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
-	# the largest version specifier that exists under the "/usr/lib/clang/"
-	# subdirectory. This assumption is false in edge cases, including when
-	# users downgrade from newer Clang versions but fail to remove those
-	# versions with "emerge --depclean". See also:
-	#     https://github.com/leycec/raiagent/issues/85
-	#
-	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
-	# eclass are defective, returning nonsensical placeholder strings if the
-	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
-	# PySide6 does *NOT* care whether the end user has done so or not, as
-	# PySide6 unconditionally requires Clang in either case. See also:
-	#     https://bugs.gentoo.org/619490
-	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'"${clangver}"'/include"))~' \
-		ApiExtractor/clangparser/compilersupport.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Minimal tests for now, 2 failing with the extended version
-	# FIXME Subscripted generics cannot be used with class and instance checks
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
-	)
-
-	shiboken6_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
-			-DFORCE_LIMITED_API=OFF
-		)
-		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
-		local -x LLVM_INSTALL_DIR="$(get_llvm_prefix)"
-		cmake_src_configure
-	}
-	python_foreach_impl shiboken6_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake_src_test
-}
-
-src_install() {
-	shiboken6_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the "shiboken6" executable for the current Python target,
-		# preserving an unversioned "shiboken6" file arbitrarily associated
-		# with the last Python target.
-		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
-
-		# Uniquify the Shiboken6 pkgconfig file for the current Python target,
-		# preserving an unversioned "shiboken6.pc" file arbitrarily associated
-		# with the last Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl shiboken6_install
-
-	# CMakeLists.txt installs a "Shiboken6Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., PySide6) to target one "libshiboken6-*.so"
-	# library and one "shiboken6" executable linked to one Python interpreter.
-	# See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i \
-		-e 's~shiboken6-python[[:digit:]]\+\.[[:digit:]]\+~shiboken6${PYTHON_CONFIG_SUFFIX}~g' \
-		-e 's~/bin/shiboken6~/bin/shiboken6${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)"/cmake/Shiboken6/Shiboken6Targets-${CMAKE_BUILD_TYPE,,}.cmake || die
-
-	# Remove the broken "shiboken_tool.py" script. By inspection, this script
-	# reduces to a noop. Moreover, this script raises the following exception:
-	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
-	rm "${ED}"/usr/bin/shiboken_tool.py || die
-}
diff --git a/dev-python/shiboken6/shiboken6-6.7.3.ebuild b/dev-python/shiboken6/shiboken6-6.7.3.ebuild
deleted file mode 100644
index 68535f872494..000000000000
--- a/dev-python/shiboken6/shiboken6-6.7.3.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Split the "/usr/bin/shiboken6" binding generator from the
-# "/usr/lib64/libshiboken6-*.so" family of shared libraries. The former
-# requires everything (including Clang) at runtime; the latter only requires
-# Qt and Python at runtime. Note that "pip" separates these two as well. See:
-# https://doc.qt.io/qtforpython/shiboken6/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
-# Once split, the PySide6 ebuild should be revised to require
-# "/usr/bin/shiboken6" at build time and "libshiboken6-*.so" at runtime.
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{10..13} )
-
-LLVM_COMPAT=( {15..18} )
-
-inherit cmake llvm-r1 python-r1 toolchain-funcs
-
-MY_PN="pyside-setup-everywhere-src"
-
-DESCRIPTION="Python binding generator for C++ libraries"
-HOMEPAGE="https://wiki.qt.io/PySide6"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
-S="${WORKDIR}/${MY_PN}-${PV}/sources/shiboken6"
-
-# The "sources/shiboken6/libshiboken" directory is triple-licensed under the
-# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
-# with version 1.0 of a Qt-specific exception enabling shiboken6 output to be
-# arbitrarily relicensed. (TODO)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
-SLOT="6/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+docstrings numpy test vulkan"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-3)*:6"
-
-# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
-RDEPEND="${PYTHON_DEPS}
-	=dev-qt/qtbase-${QT_PV}
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
-	')
-	docstrings? (
-		>=dev-libs/libxml2-2.6.32
-		>=dev-libs/libxslt-1.1.19
-	)
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-	!dev-python/shiboken6:0
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
-"
-# testlib is toggled by the gui flag on qtbase
-
-DOCS=( AUTHORS )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.3.1-no-strip.patch"
-)
-
-src_prepare() {
-	# TODO: File upstream issue requesting a sane way to disable NumPy support.
-	if ! use numpy; then
-		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
-			libshiboken/CMakeLists.txt || die
-	fi
-
-	# Shiboken6 assumes Vulkan headers live under either "$VULKAN_SDK/include"
-	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
-	if use vulkan; then
-		sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
-			ApiExtractor/clangparser/compilersupport.cpp || die
-	fi
-
-	local clangver="$(CPP=clang clang-major-version)"
-
-	# Clang 15 and older used the full version as a directory name.
-	if [[ ${clangver} -lt 16 ]]; then
-		clangver="$(CPP=clang clang-fullversion)"
-	fi
-
-	# Shiboken6 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
-	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
-	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
-	# the largest version specifier that exists under the "/usr/lib/clang/"
-	# subdirectory. This assumption is false in edge cases, including when
-	# users downgrade from newer Clang versions but fail to remove those
-	# versions with "emerge --depclean". See also:
-	#     https://github.com/leycec/raiagent/issues/85
-	#
-	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
-	# eclass are defective, returning nonsensical placeholder strings if the
-	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
-	# PySide6 does *NOT* care whether the end user has done so or not, as
-	# PySide6 unconditionally requires Clang in either case. See also:
-	#     https://bugs.gentoo.org/619490
-	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'"${clangver}"'/include"))~' \
-		ApiExtractor/clangparser/compilersupport.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Minimal tests for now, 2 failing with the extended version
-	# FIXME Subscripted generics cannot be used with class and instance checks
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
-	)
-
-	shiboken6_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
-			-DFORCE_LIMITED_API=OFF
-		)
-		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
-		local -x LLVM_INSTALL_DIR="$(get_llvm_prefix)"
-		cmake_src_configure
-	}
-	python_foreach_impl shiboken6_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake_src_test
-}
-
-src_install() {
-	shiboken6_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the "shiboken6" executable for the current Python target,
-		# preserving an unversioned "shiboken6" file arbitrarily associated
-		# with the last Python target.
-		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
-
-		# Uniquify the Shiboken6 pkgconfig file for the current Python target,
-		# preserving an unversioned "shiboken6.pc" file arbitrarily associated
-		# with the last Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl shiboken6_install
-
-	# CMakeLists.txt installs a "Shiboken6Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., PySide6) to target one "libshiboken6-*.so"
-	# library and one "shiboken6" executable linked to one Python interpreter.
-	# See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i \
-		-e 's~shiboken6-python[[:digit:]]\+\.[[:digit:]]\+~shiboken6${PYTHON_CONFIG_SUFFIX}~g' \
-		-e 's~/bin/shiboken6~/bin/shiboken6${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)"/cmake/Shiboken6/Shiboken6Targets-${CMAKE_BUILD_TYPE,,}.cmake || die
-
-	# Remove the broken "shiboken_tool.py" script. By inspection, this script
-	# reduces to a noop. Moreover, this script raises the following exception:
-	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
-	rm "${ED}"/usr/bin/shiboken_tool.py || die
-}
diff --git a/dev-python/shiboken6/shiboken6-6.8.1.1.ebuild b/dev-python/shiboken6/shiboken6-6.8.1.1.ebuild
index 94c8d7add7f8..fda8e9ae5dac 100644
--- a/dev-python/shiboken6/shiboken6-6.8.1.1.ebuild
+++ b/dev-python/shiboken6/shiboken6-6.8.1.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
@@ -32,7 +32,7 @@ S="${WORKDIR}/${MY_P}/sources/shiboken6"
 # arbitrarily relicensed. (TODO)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
 SLOT="6/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+docstrings numpy test vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/shiboken6/shiboken6-6.8.1.ebuild b/dev-python/shiboken6/shiboken6-6.8.1.ebuild
index 62f05dcae968..d3da3cc06805 100644
--- a/dev-python/shiboken6/shiboken6-6.8.1.ebuild
+++ b/dev-python/shiboken6/shiboken6-6.8.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
@@ -32,7 +32,7 @@ S="${WORKDIR}/${MY_P}/sources/shiboken6"
 # arbitrarily relicensed. (TODO)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
 SLOT="6/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 IUSE="+docstrings numpy test vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/sigstore-protobuf-specs/Manifest b/dev-python/sigstore-protobuf-specs/Manifest
index 155c240f5258..6ada89cd92ca 100644
--- a/dev-python/sigstore-protobuf-specs/Manifest
+++ b/dev-python/sigstore-protobuf-specs/Manifest
@@ -1,2 +1,4 @@
 DIST sigstore_protobuf_specs-0.3.2.tar.gz 17529 BLAKE2B e12bcd471f20c993b0fd5cabc2abf424fd5d185d159321c34c14175d5e11089c18d631f612d81b083176359dc66948691e3711de4c91e1c64e55a5bd7df85543 SHA512 52559a5b2eb4f108950c41ab885fa22169b30de674af08314dd81dc1dbc568b887427d0fee497f5b98c230700f8d81c6901ccad77bddd7ca89f1a453d48c94ae
 DIST sigstore_protobuf_specs-0.3.3.tar.gz 17475 BLAKE2B d973b24d55dc2e5eda4dbb20175f3d9d481c619748dc720934843c42744e5640fdb39c6902cd736df23f97cdf0c267615d4c0d31ec491a7296c19ee9a7ee9081 SHA512 4bf412d29212efc87782d8585b58cadc801b0246fb6b8bc02e163c04f968694fd07d3bdbe8ce60ec4546bdb6c0b43a6ed42b1f56423eb624cc1f2b5b59b3b304
+DIST sigstore_protobuf_specs-0.3.4.tar.gz 17596 BLAKE2B 470012394af8eec796e2683b3dd9b4c71e9a3f41fcb495fe7982eac14b937a68993d00fc3b80fbc6fc021a9f84766e696110b183ff6590449a04e220e2d0c1fd SHA512 cfaedea569e592d85d7e0ca7d78af483326db0aea7a8f1cf052f0ab733a43009e318bb1100b49412a92f6b3dc83768f03f514f5426dc3f816eee5ef499ceede4
+DIST sigstore_protobuf_specs-0.3.5.tar.gz 18179 BLAKE2B a022b5c937902bb0f6fcfefebf2347d101a5d803dbbebd03a1c7e595df4edff73c8f0c09af0b686e5c090193f696802d8a41fea9b20160fe1d5e55e43322f2d4 SHA512 f413ca3344093e863078698de49ebf141f0152638ea9e47300835444c7c15a9ecc9fcd477cece3aab6bdbdc0052c7c1e607917b32ece56bf3b5cd11cecfd5fe2
diff --git a/dev-python/sigstore-protobuf-specs/sigstore-protobuf-specs-0.3.4.ebuild b/dev-python/sigstore-protobuf-specs/sigstore-protobuf-specs-0.3.4.ebuild
new file mode 100644
index 000000000000..951bbea7e6e6
--- /dev/null
+++ b/dev-python/sigstore-protobuf-specs/sigstore-protobuf-specs-0.3.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A library for serializing and deserializing Sigstore messages"
+HOMEPAGE="
+	https://github.com/sigstore/protobuf-specs/tree/main/gen/pb-python/
+	https://pypi.org/project/sigstore-protobuf-specs/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	~dev-python/betterproto-2.0.0_beta7[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/sigstore-protobuf-specs/sigstore-protobuf-specs-0.3.5.ebuild b/dev-python/sigstore-protobuf-specs/sigstore-protobuf-specs-0.3.5.ebuild
new file mode 100644
index 000000000000..18873ee1f9f4
--- /dev/null
+++ b/dev-python/sigstore-protobuf-specs/sigstore-protobuf-specs-0.3.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A library for serializing and deserializing Sigstore messages"
+HOMEPAGE="
+	https://github.com/sigstore/protobuf-specs/tree/main/gen/pb-python/
+	https://pypi.org/project/sigstore-protobuf-specs/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	~dev-python/betterproto-2.0.0_beta7[${PYTHON_USEDEP}]
+	=dev-python/pydantic-2*[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 27862e8befa9..a2c25c5afe79 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,2 +1 @@
-DIST sip-6.8.6.gh.tar.gz 515751 BLAKE2B 769a1270351473f1c498e0d3cd463df3aa0992782b5501bd06455b71be05cae5a9754611bad4f966cc5b204170fec7fccbb065d9ed4c800daaa1bd6448a96352 SHA512 bfbeace21ef0bfd072548bcdb9af1f4917a33e15bcd9c5f6575aea0dc0eeaeec4aa322b2408f586c0e2713ada65c1657f81a4e0eb25cb9a3472fada234beca33
 DIST sip-6.9.1.gh.tar.gz 517896 BLAKE2B 1ed8eb2e3cdf4eca76aed82bafbfb6ed60163cc58aff7a709cff29c2b370c68d5dcfce8db04768b9133fba58a24734bbc32b7c5a004ab84a73661db690976228 SHA512 670b1afcf7c6337f48d53cea86c535f24932393d68ee1654c754bfa3481f2f736f1dc935f39f501650e210112034b0fdb8c8ec46627066d9af3be0c599e8a093
diff --git a/dev-python/sip/sip-6.8.6-r1.ebuild b/dev-python/sip/sip-6.8.6-r1.ebuild
deleted file mode 100644
index 25b663e2221a..000000000000
--- a/dev-python/sip/sip-6.8.6-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="https://github.com/Python-SIP/sip/"
-SRC_URI="
-	https://github.com/Python-SIP/sip/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2 BSD"
-SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/tomli[${PYTHON_USEDEP}]' 3.10)
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-8[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/myst-parser \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index 6b0a3e167a8a..65dc7b9c35e7 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,2 +1 @@
-DIST slixmpp-1.8.5.tar.gz 574560 BLAKE2B 3ac5b1f41acdf4dd725355cdb06e7642d67b5b51a533e933af1b451df424d3e81267ce945e577b21a07f943578119913a9a42dd4e65426223ff413ad52c3f110 SHA512 f2e123bd462097d0b7dc28cd960f723419f4fa2af59c8f5b7d30a05135c2f9fc6982e6d2855ea10b22936bdd4a96faeae73f87a495e2d1f10e6c63cdcb412665
 DIST slixmpp-1.8.6.tar.gz 581633 BLAKE2B 43482ae13020c8302ec432cb77da5bac53a4ed43368ee5398e05c300f63db5d14b4590aacbf592cbdf904b7ce6f07bcd72b152efd0614fba2028cf01f3663174 SHA512 b013145fbd44dd6f38fd7beb15af5d83bd9e6f843308a2124b2fbb1a70f0ead1f0739946c24d66a11aef60d660de6fcced846e91ecd1ad58ef84410be89b2356
diff --git a/dev-python/slixmpp/slixmpp-1.8.5.ebuild b/dev-python/slixmpp/slixmpp-1.8.5.ebuild
deleted file mode 100644
index b1603f069a6d..000000000000
--- a/dev-python/slixmpp/slixmpp-1.8.5.ebuild
+++ /dev/null
@@ -1,52 +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=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 3 library for XMPP"
-HOMEPAGE="
-	https://codeberg.org/poezio/slixmpp/
-	https://pypi.org/project/slixmpp/
-"
-LICENSE="MIT"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://codeberg.org/poezio/slixmpp.git"
-	inherit git-r3
-else
-	inherit pypi
-	KEYWORDS="amd64 ~riscv"
-fi
-
-DEPEND="
-	net-dns/libidn:=
-"
-RDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-lang/python-3.12.1_p1:3.12
-	' python3_12)
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	rm -rf slixmpp || die
-	eunittest -s tests
-}
diff --git a/dev-python/slixmpp/slixmpp-1.8.6.ebuild b/dev-python/slixmpp/slixmpp-1.8.6.ebuild
index bfb50b4c7a14..7c47037354e0 100644
--- a/dev-python/slixmpp/slixmpp-1.8.6.ebuild
+++ b/dev-python/slixmpp/slixmpp-1.8.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
@@ -22,7 +22,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	inherit pypi
-	KEYWORDS="~amd64 ~riscv"
+	KEYWORDS="amd64 ~riscv"
 fi
 
 DEPEND="
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index 7de1fb308759..85d9df24886c 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,2 +1,3 @@
 DIST sphinx_autodoc_typehints-2.5.0.tar.gz 40822 BLAKE2B 0d09c878f0f8462879bec6fe786577a8587065a757218b775f6642aa5cf28cca82b85aeedb1c7dd3cf0788758d00b56c2a775f44bb550ff95aa947c88f1a642d SHA512 4308873ee2bd794c822e76ed712b0c0547815f5e3125e158e79f512fdd31dd482a60b172a39f6f53ae57d5c2bf156eb4c4ff2fe3c8f39446fc2acd69004f8bc0
 DIST sphinx_autodoc_typehints-3.0.0.tar.gz 35943 BLAKE2B 591fa66e0ebf55cb89077c299b08dee4ba01ff85ab958cbe2c703873e4e7f6b924305a8ae1b4f58fb29fc34f35099014cb6254d8745fecd7f8e5c60ed96d0c81 SHA512 23e0017d68e12bedc56ff59b3620e981733816be5803bb86446821d0b5d66b5b472bee9fc242ad084913034fab1241200b8835a8f82fc89a1ae85b9e22e2f03c
+DIST sphinx_autodoc_typehints-3.0.1.tar.gz 36282 BLAKE2B 44fbb2de34cd788e400d0556599cac9501d65cbccc1338be3b927d9c35e2141042885376da6df488cfae05af0667210b6d74c240710af5c848eff0a03c83eeca SHA512 f15a14c010328d46ab50c8f28c84d332502b577b95d739439a8b583e95303105fa403058443f4120c043a3d3635d4cff8274adc9472e1876aa9f476e78b4abcd
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-3.0.1.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-3.0.1.ebuild
new file mode 100644
index 000000000000..2377b9336314
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-3.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Type hints support for the Sphinx autodoc extension"
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/sphinx-8.1.3[${PYTHON_USEDEP}]
+"
+# skipping optional test dep on dev-python/nptyping as that package
+# is horribly broken and on its way out
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/sphobjinv-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.5[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# this package is addicted to Internet
+		tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/sphinx-press-theme/sphinx-press-theme-0.9.1.ebuild b/dev-python/sphinx-press-theme/sphinx-press-theme-0.9.1.ebuild
index 6166645d0bdf..db1809be2c51 100644
--- a/dev-python/sphinx-press-theme/sphinx-press-theme-0.9.1.ebuild
+++ b/dev-python/sphinx-press-theme/sphinx-press-theme-0.9.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
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 PYPI_PN="sphinx_press_theme"
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index 4144de9fa46f..1fe55b2b2543 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,2 +1 @@
-DIST sphinxcontrib-spelling-8.0.0.tar.gz 37610 BLAKE2B 8ae9fb62a5a7d35194884ce075b27b0e54f54c18d55f9573bc53ef7b2f953011655631e37ac3bb7c988df470c8cdf1cb576e4830c61fddc068e50d382d067751 SHA512 0d8c21ea660516238c43fabb505666dfee15abb39f538c40c6b61f91e20c246b16aa170cd444263507dd51913a27fc7719cddb28f30eab26825b565f70dd3ab6
 DIST sphinxcontrib_spelling-8.0.1.tar.gz 36005 BLAKE2B 75813ea9bc90fc87a657f16b5ca057628041dd5628a2489b259c7009662c9e0dea2c60271c2ee87336e2f0a5cd15e9e360addaad2d8e7ef36863e90ec02e5915 SHA512 8d1e98e50f040b773d117422582315f9535a8a3ccee3984012b3b21e70e8600b325f39579583cace1cd8d3eed096b187eba5e2e9b1ba0f32e5f554ac4b43d48f
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.0.ebuild
deleted file mode 100644
index 97485043d455..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="
-	https://github.com/sphinx-contrib/spelling/
-	https://pypi.org/project/sphinxcontrib-spelling/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pyenchant-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		app-dicts/myspell-en
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires the git repo
-	tests/test_filter.py::test_contributors
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	rm -rf sphinxcontrib || die
-	epytest tests
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.1.ebuild
index a140665462d7..16fbf73ffab3 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.1.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pyenchant-3.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxygen/Manifest b/dev-python/sphinxygen/Manifest
index 8a610b47e5d2..b041a1f04690 100644
--- a/dev-python/sphinxygen/Manifest
+++ b/dev-python/sphinxygen/Manifest
@@ -1 +1,3 @@
+DIST sphinxygen-v1.0.10.tar.bz2 16711 BLAKE2B 3915125ceb70e50bc9848216e5b98a7d17886184f9aa6838f18030bc8b57f464e305adb84c14e3bd758164973eb85afb76ada0b3928f95a4c6ea96517d6e3a1c SHA512 8789962a76c770eb460b672d753c880574ad7abdf2e971053a8b1460efa166abf1689f4361db186b8a1e2fd91f6c4135d24bb7e413119d8d234f365b337e2c69
 DIST sphinxygen-v1.0.4.tar.bz2 16224 BLAKE2B 6b06e015bc04a445b2f1983be193b2a17296c263efccb7a67a06e73c4f06d312d3cd103e6493c428d1ee5fb3058309b50cb066e8f988145edf3705181ab3c658 SHA512 54872ead6725aa41057347b5cf45285411db90266266f8805d34dc846d0a0a69c013f894958721238b1eb7f7c9d13e105bbd4e7d5afe50eaaf17bad6d4f46662
+DIST sphinxygen-v1.0.6.tar.bz2 16583 BLAKE2B e9838b66de1575fdb884978a2b33e0d5b4585063b9d3cd52ca464bbaf4af56af26fa264916564c54bfcdc36603d87648037a2b8c129f53a294b312e7e7a20c3d SHA512 298a7017480a51e29dd3f74d3615bb931175635a9169b7aa308eacd51cfa274a6504e9231f08b7e71fcd00ca2d18086030b4805cb4ad4517ea43c1b8ab0e1111
diff --git a/dev-python/sphinxygen/sphinxygen-1.0.10.ebuild b/dev-python/sphinxygen/sphinxygen-1.0.10.ebuild
new file mode 100644
index 000000000000..a23270e7f581
--- /dev/null
+++ b/dev-python/sphinxygen/sphinxygen-1.0.10.ebuild
@@ -0,0 +1,35 @@
+# 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="Python module/script that generates Sphinx markup to describe a C API"
+HOMEPAGE="
+	https://gitlab.com/drobilla/sphinxygen/
+	https://pypi.org/project/sphinxygen/
+"
+SRC_URI="
+	https://gitlab.com/drobilla/sphinxygen/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	app-text/doxygen
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinxygen/sphinxygen-1.0.6.ebuild b/dev-python/sphinxygen/sphinxygen-1.0.6.ebuild
new file mode 100644
index 000000000000..a23270e7f581
--- /dev/null
+++ b/dev-python/sphinxygen/sphinxygen-1.0.6.ebuild
@@ -0,0 +1,35 @@
+# 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="Python module/script that generates Sphinx markup to describe a C API"
+HOMEPAGE="
+	https://gitlab.com/drobilla/sphinxygen/
+	https://pypi.org/project/sphinxygen/
+"
+SRC_URI="
+	https://gitlab.com/drobilla/sphinxygen/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	app-text/doxygen
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphobjinv/Manifest b/dev-python/sphobjinv/Manifest
index c8a774c468f8..fbe73f493fed 100644
--- a/dev-python/sphobjinv/Manifest
+++ b/dev-python/sphobjinv/Manifest
@@ -1,2 +1 @@
-DIST sphobjinv-2.3.1.1.gh.tar.gz 1345537 BLAKE2B 8cbe5a6066ed611cb3b7579a34f75021e26262069aad2bd77bf3fefb1dd69b8a9977692424b296f9444968e1decb54ac8246896e678b64a7bd526d45e160f307 SHA512 c5260bbccff8531469ec67c44dfb33e46f55c4a07d25ed4a1332ebde3be09721877cf4af31feff8ff0aa81d6af68905607bf47a62cfda7893e449fd90b10bdbf
 DIST sphobjinv-2.3.1.2.gh.tar.gz 1346638 BLAKE2B c7f25caa055557ab4fa31335132b56f40237404925617f6d2f6495e1b10ef06517f3019ea10ef3b77d13e9f5270ce0669126146bfff0725bb9ff65ee3850edee SHA512 de26ba688238d0e26506bd4bc2662ab01f82bf2aa878c8fec98c4b2efdaabe80780a2bf83a9ed528f9c33fa81b1d105a7c4bc1350dd0514ddb81d0ea023b74b1
diff --git a/dev-python/sphobjinv/sphobjinv-2.3.1.1.ebuild b/dev-python/sphobjinv/sphobjinv-2.3.1.1.ebuild
deleted file mode 100644
index ad81258eb475..000000000000
--- a/dev-python/sphobjinv/sphobjinv-2.3.1.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx objects.inv Inspection/Manipulation Tool"
-HOMEPAGE="
-	https://github.com/bskinn/sphobjinv/
-	https://pypi.org/project/sphobjinv/
-"
-SRC_URI="
-	https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/fuzzywuzzy[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/dictdiffer[${PYTHON_USEDEP}]
-		dev-python/pytest-check[${PYTHON_USEDEP}]
-		dev-python/pytest-ordering[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		>=dev-python/stdio-mgr-1.0.1[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	README.rst::README.rst
-	tests/test_readme.py::test_readme_shell_cmds
-)
-
-src_prepare() {
-	sed -e '/CLI_TEST_TIMEOUT/s/2/20/' -i tests/test_cli.py || die
-
-	# remove bundled deps
-	rm -r src/sphobjinv/_vendored || die
-	sed -i -e 's:sphobjinv[.]_vendored[.]::' src/sphobjinv/*.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/sphobjinv/sphobjinv-2.3.1.2.ebuild b/dev-python/sphobjinv/sphobjinv-2.3.1.2.ebuild
index 59d7b3fc8cd9..c297880dfb3c 100644
--- a/dev-python/sphobjinv/sphobjinv-2.3.1.2.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.3.1.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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
diff --git a/dev-python/spotipy/Manifest b/dev-python/spotipy/Manifest
index dff2b528d321..844bcf148799 100644
--- a/dev-python/spotipy/Manifest
+++ b/dev-python/spotipy/Manifest
@@ -1 +1,2 @@
 DIST spotipy-2.24.0.gh.tar.gz 114822 BLAKE2B 0db73d723c1cb3818d68cfa90fd8077c6d6eb82b16f24e087907091d74644b86431aa93ea5ed9a842ec674c16f67cddc5be17a3b6cfcb92d0c01aa8bd3d1529f SHA512 9860119f078ff894a9b27bb4d51cd7b469c2cea4981757338d8c3f1c6c8a1c0bbb3b79622820486c07f0b86ce4e26f9329635b51fc976c4cee43122b9a0209ff
+DIST spotipy-2.25.0.gh.tar.gz 117172 BLAKE2B 1d8c8a286e8849b0799c66f94a2137f16b0e636e9b7ff37e19047cc7d41cc8c7183a0f6b0c73834c0746b562f4d8192a3c5d1343cd70c7d5796c5c75ca0ad0e2 SHA512 2406eb445976f6cf54ce78a92739c18453415bbf330c40f255c2ab8a4734874051d38c329b044659723da7843bc06600ffa656c9d679a984390bf16a75e2fa72
diff --git a/dev-python/spotipy/spotipy-2.25.0.ebuild b/dev-python/spotipy/spotipy-2.25.0.ebuild
new file mode 100644
index 000000000000..ab10c388d374
--- /dev/null
+++ b/dev-python/spotipy/spotipy-2.25.0.ebuild
@@ -0,0 +1,47 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A lightweight Python library for the Spotify Web API"
+HOMEPAGE="
+	https://spotipy.readthedocs.io/
+	https://github.com/spotipy-dev/spotipy/
+	https://pypi.org/project/spotipy/
+"
+SRC_URI="
+	https://github.com/spotipy-dev/spotipy/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/redis[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	dev-python/redis \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/unit/test_oauth.py::TestSpotifyClientCredentials::test_spotify_client_credentials_get_access_token
+)
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index bff967ef62a0..604e11ae1145 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,2 +1,3 @@
 DIST sqlalchemy-1.4.54.tar.gz 8470350 BLAKE2B 0d97beb4edde38455c03dfc1238655d1cb63aa6e042b941913ec68dca3654de07087ab967f208fda495f048a5068ced70d642c4b8b80ab32e5346fcefa3bf9bc SHA512 e7ea4920d81914d362134a3c6fd4a2dd4fdb75f6ce17358528d568e2b2ac0ee711a71f6beb894e61d6d1e4e5833034ebde651d73a13f873c682f780e1831b427
 DIST sqlalchemy-2.0.36.tar.gz 9574485 BLAKE2B 31fb7375041f354b940a5b8beee8886cbb66cb0a4b4dcad8f9bdb9ebfeb673cdc6ce7335d9fa7bbc443e3dafb0337106e0ca0c6a8ccf3df55bde3e6e310dcbc6 SHA512 480fa9893d20806127f6b060726210e32989af92439ff445066aebfc931453eb8c05b5f8497582fcdb897f8e9e70243f092f46e06d7dfe49301ab71ada4eebda
+DIST sqlalchemy-2.0.37.tar.gz 9626249 BLAKE2B 8bcfbaa7d83c09b5c57cd422ac6e0ba759a5fd8ec63af01f32fe35c616811a74a9e19382813b2104a938aa3a19aa4adbe36cb02ad206cf069a8649094d483cde SHA512 ea83a9cc1bcd69424d8f0b6c0f2195ac2c7c77ad92187d9f83e1c0d02fbd0bc8b75973c1849757283434041f073994ed235dc9d520c24f21bd72b4cd20a51a5c
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.37.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.37.ebuild
new file mode 100644
index 000000000000..c310c9c86fe8
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.37.ebuild
@@ -0,0 +1,109 @@
+# 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
+PYPI_PN=SQLAlchemy
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		test/ext/mypy/test_mypy_plugin_py3k.py
+		test/typing/test_mypy.py
+		# hardcode call counts specific to Python versions
+		test/aaa_profiling
+	)
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+	)
+	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+				test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
+				test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
+				test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
+				test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
+				test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
+				"test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_${sqlite_version//./_}::test_cant_parse_datetime_message"
+				"test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_${sqlite_version//./_}"::test_{delete,insert,update}_single
+				test/base/test_utils.py::ImmutableDictTest::test_pep584
+				'test/sql/test_compare.py::HasCacheKeySubclass::test_init_args_in_traversal[_MemoizedSelectEntities]'
+			)
+			;;
+	esac
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[has_terminate-is_asyncio]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[not_has_terminate-is_asyncio]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p rerunfailures --reruns=10 --reruns-delay=2
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlglot/Manifest b/dev-python/sqlglot/Manifest
index 00d8b1e8c9d6..acb7253bb69b 100644
--- a/dev-python/sqlglot/Manifest
+++ b/dev-python/sqlglot/Manifest
@@ -1,10 +1,41 @@
+DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
+DIST anes-0.1.6.crate 23857 BLAKE2B 9ef464a964709b408c7d7846b9b1e54e52d6ae8f21f22ccfe509ef7197d4694f439084dbdb01fdf88829d181965ea9d1452253789a46fdf6d0520e3413c50d61 SHA512 f9dfaaca9ca327881ec30efaf24e208daae668b1e9d6963c8b0ca9f9fd13be777c793076a87980429f0dfa4db28ef5331ce6652a76da4d5a87485b23fc2fde29
+DIST anstyle-1.0.10.crate 15725 BLAKE2B 36e656bd8f9c584f11fda5cfe0c2e24e8426b9e1b602aad34ed118ae6950a55440e292d2e0ff7615f5e4f466fd06f07536be198a59506a587d40cb0c4ede4f80 SHA512 621e7a89fad13db985f07375d316cf8efba57fd44ae18628a8049a65aefbaef27949f99317872e91e0922bb089a00234055199ea3167f80ae03d00ada4f75dea
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
+DIST cast-0.3.0.crate 11452 BLAKE2B fe6edddd0589fa436cda32342d7beaabe4003afdbdf1d7c5db7e8748adf23b1b2cdcdd286235837c735d2143f29e692c152a5d56fb0458a54961e4dea303b2cb SHA512 4a3e19bc1e9e5ecc03aaef9bcdce01624ac0e6858c065fa1c41693db0ac172b9735ce872064561347cd9e79f00a274129011f6e4ccf9e61d960c8bb684b6d396
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST ciborium-0.2.2.crate 35611 BLAKE2B 7bb34ed2b16f55af2d762bbc83263bba901a0f05bc7677a370460549297839c4d6e913622e8a6cb3a5c2447b94b0bd17b7d5007228ea8881193d08e5b8deb072 SHA512 8d1af6a09f116e42f0098d7d0e34dd906dc3e718b257ff1a1fde655a235d40619f61f18917c0cf35c55de9160c255a9795d5e7525989037e3512807cc6a900b1
+DIST ciborium-io-0.2.2.crate 6697 BLAKE2B 07636da78f59859515af0075cb36d9ca969113ac327ff727953c73b64b60ddae22e5b1b65d8be5aa401f8b13d34074cbc8b47f23abd7a13d551f0b1c78f23575 SHA512 641b8592f9699d5e6c607815c8e6dfc82b2bd01897015e04ef8853420a7d90c2ec5c1140e39eb7623ce05587bea52ef63659eae76baee5b6592d2ac5298ce106
+DIST ciborium-ll-0.2.2.crate 14695 BLAKE2B 3c9ab0b338070359f9565706a504e4f6c65560072380af6e0a57068ae6716773d40e75dee84ded5e1d32f93445a07a0965759bedace58291b68b94479fb16488 SHA512 2f7ef6ad8bf5a862e8b9daa64bc6d8184c87a22c264b10dbb35c00c9effcd5712f354b4ca6c2eb8e6795d4b99d7cb88fa2acf01f3ad6fb28caf81708a500549a
+DIST clap-4.5.23.crate 56460 BLAKE2B 5c0ff6ecc072368022b8dc08703d87802160817e40228fccbf9cbdc15d86dfaf0eec141dec4e8f1327e5a6d1622df9b334e94797027372dbe8765a12b918961e SHA512 4a8ef8731c9768844debcd1ba83a79a607fd32d9fbfe7411abefb8939c5c442e8a206738bb54dddd136117d3992f519ffd1640694ad7796c4e0aae3f95502c7c
+DIST clap_builder-4.5.23.crate 164180 BLAKE2B 90948ac5e8ea620be3e1ec1334677b0ae9dc227a00354fcd3d78e2cf23a1c101e009e6cc96fc19c0a2395e1b9ac6272fd9615abc1acf1a5d60392e337cfc961b SHA512 0889876990f0a361cc6b6d41f2a8f4b1decd376987a02fe69888455c92f3e583d6ff70880c6f0ea154ba62f4be7d2e7b18cdc4e0e2f243e6b17f250c3e8d1c2a
+DIST clap_lex-0.7.4.crate 12858 BLAKE2B a5ecd50cc503157dd69746f3b6e9c288e0fe4f6d5d82271499f657134fd401fbe076255e2be6a23ed0b69daf3941c6429dad8b288223b0ad390a2c435575cdd1 SHA512 a2566868f4619679d3b74b70592ffa6a04b13e38e3196c56bb1dae8bea0c711bddbccd778d2aba3cc0ee074c9b1cc0335222818f0d47fb3cc8109cbc35bb992e
+DIST criterion-0.5.1.crate 110088 BLAKE2B b99018b6a6f97fe47d90a2135e3d483ee624d43088d7881bafb2c35ba385629f1a4353110bf190c04903abc4ee99ad1735bc9c5afc6c2854a1aa9221fd714617 SHA512 6a1a32437bdb95f8472bafb5b04bb5999a6ff6fee4ca5965028ec53b4867d01b529241d01809a003722ec7d5710c323274b6f3b50ca0935919a9dee693f4d3b0
+DIST criterion-plot-0.5.0.crate 22706 BLAKE2B 28a50375f2871ce6f168aafabff46f4368bf55cac379c67a2b4396403259372759dba3355786e695b566b1cddee9091a469755a04c06ee949f00aee8e9a28699 SHA512 971e96dcc64a5afa7488f1a99475f0f5639c0ef63f9eeebcada351868697cbff397e99827cc07c0a52e7d7d1a87856fe1fc48c22075776b3bc9c94af62d79f14
+DIST crossbeam-deque-0.8.6.crate 22471 BLAKE2B 02b854df171b0430ca8a40349674ff251698d0c322c317055da8678da6661730c945d86737fa4947c3bd824ffe402271ee2f77fd6a505d2d46b4a41454c510c8 SHA512 9368c0c224c4b84356f1d422d8869a5ab4bfb36b0ff69244a9e7a7304ed51f034001cd9b2bc35849df874d36ed34285c66574943573522ea32bbdc5a05df6989
+DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2
+DIST crossbeam-utils-0.8.21.crate 42691 BLAKE2B cd9015c41f532eb3c90101603f32d383f01e6880718b727d6d1fe46872ae276cda685e1b548cf77dd22bb1a05f0d4c4982332c2bde90e1743dbd7f51919022a7 SHA512 6f4aa7ca10c20da291c4714b56ceb1fab1c06b03b2f4e28e474e9aeb95ab6615a25462dc7819713652c3b5f6a06fa0f24ebc92c533fcf35dfcf2655857d975f8
+DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
+DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
+DIST half-2.4.1.crate 50892 BLAKE2B c275a9ec70d2fc0c50cb63421399202d31252b0dbf463798ed0a12a17493817c66b8933811d483b348f8f945cb05aab7cc2a4d952bd16009c3da4860202e28dc SHA512 0bce235583ca128723186e1fb50f636b519bf826c942f02c5b969db4117baa87c644665c541991c16d1f1dd97c7233c017a513d45075fc72c5d99ccc7c1ac193
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
+DIST hermit-abi-0.4.0.crate 16310 BLAKE2B efcd1dee7bcd6d185cbe0051c7bc7e2776857ffcfd2adc3fb101febd7c1bd75994b7e4a4a0a59c5b4628cc2521b4c1f043e98a0c44935d0180e7499667690ab8 SHA512 b1a21f6d54598185a8e8c29565ffc2e1bc5da57cf1c9d87ba643d23d7c23d53e8ad36ee2f5c1ec8a504334b6f98b0f17a832ff37877c7b7f9238b196f4034e6f
 DIST indoc-2.0.4.crate 14311 BLAKE2B 8d604e20825ae64530014081c627abe4ecec6447e1e214408743aca79ed217531baad4bd7021137ae6628555d769a248f06acc556cc3254d2626074aab110a44 SHA512 ef1b8d19d89d848c1133f2865247e0ce23cbe5552454805910ed0478ac4acb11b11629aa4a5ce8756d0ed5cbc0644abedeac0246f433166c68f47cf58cf4487a
-DIST libc-0.2.150.crate 719359 BLAKE2B d08e17fb29992c76337bb5862cbc1cdaf7b9d7749cd65021f145fcf49fa7954d6251c8c2f3c9a796b46283c3bc014bccfd259ea52824459841911ad847fd7f5a SHA512 7ae8fe6a1db38ac6d951c0b4880d25a02f064f5e61d6057c20f7208dec8395d58efd085e41857bcf5f4da2b014d2952dc4ddaf18ac4acd3a23675bb659e70385
+DIST is-terminal-0.4.13.crate 7665 BLAKE2B 47a024e135ca4931a04a8dc8151f999f816ab50c924f17321af4295dd84fd51bf98ff057de967e646a461c1cc9ffbfd7ae245a9021b3a77f3812f43707b44aa2 SHA512 ea5b18dbfc965b96a27086eabc070747fdc557a6a9acd06203164e846c2f390c4bebedb29211ec008e060dc80b10f53de6d6cdc822d4f51a543057736fe33448
+DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
+DIST itoa-1.0.14.crate 11210 BLAKE2B b2d33dc384757963eab3ae7d80bb672d828a549967986e3af8c70fe71a0ad46c4a278da2db4dfccef99e804e6cd4934067e97c0697a33ac3302cafbc46eeb416 SHA512 ea2d38df373652ddacccd11e610dfdad4e3ae7f0d476514e6ac58092733c817bd834e8cd88c3bc4178dd5a646ba628ae626195e0aa407e8534ae3c2a7b049987
+DIST js-sys-0.3.76.crate 54420 BLAKE2B 8d211aee6d8af87c339250e06e321bf02d2ff313b80505f696f66c43298e2aee8286076f2b291aa853730f8e1b9940f09c56535d3534fc7990aeb16653844250 SHA512 54e9a6be3f5a19021351d22d655a3aa55579c80f1453a99aba5989fafc7429078dea57ffebada4240b9185d3260d02f30da250fa539ac12c4bdda975adfe0dad
+DIST libc-0.2.169.crate 757901 BLAKE2B 1012cf93d8975aa20fc3f2332e253426ff66be6aed63ace5292cc8568ee419b0f1a4b5b39ddbb78d9c2dfd8d72eb0d068c98faa229ab55556da5e674429f0e97 SHA512 c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce
+DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
+DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
+DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
+DIST oorandom-11.1.4.crate 10201 BLAKE2B fc77678ec202bc5ef7314ed876f670575983612db9cc94ddec4ad7e9f04e2e2742d12b746803b33f1dada4a10c8afe19210fbc337803ca59a0df74998fa6de92 SHA512 8d5acd7b344b1eb9635ae597b38d65f0da519366664f02bfd083d37b5e9c88f21403066a8e93d8a61e843e06ad9323cca9796058aabd901d0adf7e7235c17562
+DIST plotters-0.3.7.crate 149031 BLAKE2B a53b3aa85eda3ac2278cf49c4d701642b37a5f52a3a013594101388d9d104b96e35f542ff6b8ee33bf711fb64c8c25a48c8f10b3c12e70e6e57c90fd30cb9b5f SHA512 526fa20153b445176efcd1314c2e36963561e267c566223ddbbcdaf74340aa821e9c0174c15849c55f3cb3177fd5e34aa9bdd872888476b7ff0a20ec3c1a04e1
+DIST plotters-backend-0.3.7.crate 13709 BLAKE2B 7ba96de1435beaffe0171dd4fd010f84d0bb6bf0856adb05da87dd324a5834aee3a71545a019ac899e141cec32cd15e395c56d281f498430e54b6715eaa46761 SHA512 5b53e5d369f39748d45269c82c87a0731cf23666b88d7e407162602c715a01807ebc50f8a90805f417c0e7e74dc511d1d7861052835beb8a9d548e2f33c062e3
+DIST plotters-svg-0.3.7.crate 6715 BLAKE2B 1437ad7e1c1b3e82ab1f58660ff6931e510f6ea5ea6cae6eb48582d4652bc65c5dad518d3312e25303651c03d90bf56d9abac4c2e3979f8290b4cb35c0b6ba5c SHA512 9a60e19026edfad359a7d042630b60825d7723855fc0c17881ac880c29160a81449ca672a3ae5cea4405293947ae0556f31cb37f519dad4cef56353248350cd6
 DIST portable-atomic-1.9.0.crate 166365 BLAKE2B 9abc31364770923847dac16f532452bc8783a5068c0f757f79122bc5b68863b58c0acfa12d28836188413c2f0b61d494cb53fa07a57e199ecd4910a2534c5bb3 SHA512 1431a4c092f6a0cb50bcc78488d603c8ba8f4ee697f77fdcfcce7002fcb371f52a321089422c76564fbf3277c48e30f889565747951c60360d95a6917bb6adeb
 DIST proc-macro2-1.0.89.crate 49446 BLAKE2B 844c021394e7a2551bc179592a6769d672360150abf92debcb9ac60a94a2e426c48c408f06aeb2128686f5f04d66dc12973714670c21a5063ee6b9f3bae4e671 SHA512 488ab38a04df1d0330309382a7e4f667238cbc9b4d513da6a8f5718f8a762f76cc122af67fefe8f4b021a286b3d23e3ec83d781fe6ac823042a6daf14d147e2f
 DIST pyo3-0.22.6.crate 546746 BLAKE2B 2a6f8c5ce2ee96e1812177a11c5fad7e15f3a73d9e30850edf0855b13db6cc95427e186883b4aae25a2d2466d3fe82f56180a39f3e6e0a54bb0a3ef78d495400 SHA512 d746007eae22f5b7bbf173759c61cbd2aa893898d88b8be5680a0237deec4d113246edf5f62fbbec3579ad4bd7307499b94b887ec306112ffe3df5190fe70e44
@@ -13,10 +44,40 @@ DIST pyo3-ffi-0.22.6.crate 69352 BLAKE2B 99eea6ed87001b23fdeb263937bc14be0fadadc
 DIST pyo3-macros-0.22.6.crate 8182 BLAKE2B 81998e4f4cb325763e4d3477af05b332e184cabf6391761f850d23508cebcf8d496ce12f747ea241523bb3899886eb20494b076a0651151744bb81d52901a1b4 SHA512 63f7a7b42e099742518c8a3bbc7647e98debb5500d08c39e11e8140fc146e790ab06e005d8d14c89aba79ebc5bf04fe1c92c0e9c5b13421307d3a4682d044179
 DIST pyo3-macros-backend-0.22.6.crate 66312 BLAKE2B ec0b11bee1ad2192e8d95cebab0075d6ec5bf628e3344b86fb8e20a6d0bc1f891b56ccfa4622840a609480581f32bd211b9a3d1dd989716cf255efe3fdc89331 SHA512 87463939b5a5674e30e8ca05ae747f652f8679f0c5c85d20967e9910ad853768a769a914580e82e409188fe4add80a3117ccb9da24c250406bc6f76fe4453799
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
-DIST sqlglot-25.34.1.tar.gz 19772522 BLAKE2B 70ec20f25436858df7ae116d7c5cb68439b28601384a94e82343d45d3a3ebdd5bf2cae7f1455f9bb37144923eaf0ca0d4d5aa8a4b28ff36c767c0a38a3443d56 SHA512 62580df95d3984c8967e0c883156ba6bb089ce2180b24cb09d53d2e84c5ed2462808f7ce6858e3a91243a7ce25f5157dca5a0efe161afab0ccdb1428d9b918bb
-DIST sqlglot-26.0.0.tar.gz 19775305 BLAKE2B 8c727ff5d8dee15acadd870171cf430cf10403fc50c40420df4f31d31e501ea1a1dc43c3e450fa1a2a372e815adc205539cf97124a419a7df0342d2e2c0f8e98 SHA512 6f1f9300af5c183aa19cbbb337a6bd47a7e512e583d33279484e7fac447c52ba45c89afe1ca6dd1a3dbeb7193de234f1f0f568c3cb061cdbf0987705ea389875
-DIST sqlglot-26.0.1.tar.gz 19785413 BLAKE2B 64e1df5df4391222a845eeb2804f78e241cff00596701954d79fa58e14fd9ee9ac6231cb2b54536c793c54f95cf66090f5a9d2d85b33adb8d6df2f232627cbc9 SHA512 b4f09828a3264367c7e562c0750179edb1457caa77d0a0c5e234d44762b9446ccbcecb7d9ed59152d2e85a957f496e6b0787f898f8c0fca1258b9eecaf7283a9
+DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2a0a0dc24f0282fa7eb01fd1351a7dc8b5af3a55ea321e6526fbe037fec3cf8b32463166a082a6e417a51fca SHA512 3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3
+DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
+DIST regex-1.11.1.crate 254170 BLAKE2B 5cf41012fc2ba8a006c0eb4a922cbbf1614bf300be361c9e2d98956a9a5e9b140e37bea09132fab7bfb633d4439158723624bcf45e8c619c4061b399253c1b82 SHA512 d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8
+DIST regex-automata-0.4.9.crate 618525 BLAKE2B ee3fc41c8c445be4c1aa3e5b19a3e61efd641b1a24e7a1ed55f837c1fba9c816272cb4645c13232b66b170bc7c413802928beb22e3891500141ad4ede65b60b0 SHA512 40bde0ec91cc27bc0c3fa237a37ecee5a1f023dbe006a999c5888f8f578ee2c4c64d9edfe1827546cea8e92ca3c10f8b4d494d81f3d0422b40d90bca9cf598d2
+DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff736f2d9991b19814ffc1a414ebc5b76e84fb8fd36c983b38e8e391d165cdd9047832b0d9100f0e1ba7085484b7db5 SHA512 549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8
+DIST rustc-hash-2.1.0.crate 13316 BLAKE2B 3e93739234cd36f3cda5d71522e3d2204e98b1d134cf01cae5a93a93e6c4340a7b1b0485c339f312145c723185fb83f6aa87ae2a0b9b726a34cd29c19d3ede56 SHA512 6f6a40586fd7a99016efd53888970c745888a06bb6b9d32eeb4936bcd16906c90ba22fad82a4a6b547df4b6c9cf6d73eaa8d36af097d65d3d6de18a0669d5ad2
+DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST serde-1.0.216.crate 79000 BLAKE2B 98c0f5cee2f9212c6b7620d2068665379471ceb7557d1454cab9b1c2120b526ef597fbb642f65440e70f92a4764cad33613b478bacf99138dd5bd51fdbdbee6b SHA512 baabf4c7aac4a540c9ed18b336662087258b71c9cb0e547c8d83a2734818ab2cbbe62f910d812eb61d3d46e653c41a3eebc99b1d679bfc51f95710c71a8ecc20
+DIST serde_derive-1.0.216.crate 57674 BLAKE2B 12a9228679c16288c08c8b256707e276aec79f84ac7af0c4cfd1f109500dfea80438df17d798acdd30a9743c753e70093b22bd324217529bac483f257682a3e2 SHA512 80fcb552279ac7562297df878f2f5e9ac09241701f5cf1088fcbf473b638f58cd3092a7930d8937ca0df9a47b9ae1a42d490cd46a275259cd8089fe8f5426469
+DIST serde_json-1.0.133.crate 150739 BLAKE2B 7891eb5b8edcc7fd09ab1e15d3881ffdcb629aa39f2bd758c0505700a5f2dfabd85b1b66c3b094268bc1627b346e204c792f4ca61efa76c54ab9cd5744fb0ee2 SHA512 20e65ec87bff319897a141960d13deb5cadcf821209c1ee8799f1dc7f458ce432bc62c16df5bdada1c8d3cc01ff23b8125e8fa0a03545d4614f32efd687dc69f
+DIST sqlglot-26.1.3.tar.gz 19858552 BLAKE2B d89dd7480dffc3028ac7f9687bbb99c74d2194426ae21420f1fc636f2649e69b29d616951ddb2dbae2a093e908c2ceff816d4ce81037033aadcd355e23349aba SHA512 0de92250a41b9390bd85370bafb2dd4e45f1078a17c67494d75e4d3a211294afd925f29fdbbc5394452911882dd821bcd0d59c21a8e9ca67fe89f4107d8a1ce4
+DIST sqlglot-26.2.1.tar.gz 19933689 BLAKE2B 6c04880973de1a0dd66b825cb7d1a1c32d140ca3a8885c09885c4f2c6a0b52b9ff36c65f2cfc2e62b564b7156c37522991518a7c4857b98fce77b3daaa82d935 SHA512 1bb0110bd572daaa3cfd2d93ff6f03d2175f304b31a5043020730ecb547d8638afcf75f1a1ad431aa03bf43f3331a39a15166ca9495962842afe00294f5fc8ac
 DIST syn-2.0.87.crate 278076 BLAKE2B 93385f64103fdb482bec34c7912474ae7a5935948715e6eb9a54907e0db5c39f089f6cd393bab33c935c59a1bbb0f4099431f206343811c1a450554d96a35756 SHA512 bcfff545d6dfefd81e09f8f30a86bdd85759b3a7d4093ef3365ed02718e10dbd604c52b94c9d7fa955d339fdc5b6c079940c6f345b5a48c52b5c8607794ca6f2
 DIST target-lexicon-0.12.16.crate 26488 BLAKE2B e7950e4a302059a1bfc9bc15618a3c1b971a17cffae117a6e8f5f63a0d82fd2bd02680301d15338612d5426d349dd24cfee30ee787a15a7d3187f2a6825e69ce SHA512 092639957c4a0391560b6442b31c47159c04d12e971010f730a6ec9cb5389e4be903ef3d7daa06db95e64dc78b6970731fb647179ebaad2b12e9ed5e9b24da27
+DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505
+DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf3ab82536295019268b3125084da5dbcad818070bfdcb6a5de08da4eb483475bc225a829f58a1e3e040b5fba SHA512 da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad
+DIST wasm-bindgen-0.2.99.crate 46136 BLAKE2B 04e69294da3dc4feff9001185bcc5b864d1f14a1ead6b9a31c830b2043dde191f9f7c65755d607365a3b8885bd340bbd266e26cfa74c48464933c8d7a1164f94 SHA512 184aec11998b99a730ea5b63d6141260cd0b7cdc29b02696f533b3e75ec79f7c17c6aac892e7a7b24036c6e73592d01df638ca31b54bda11d3bdbf857b1489c2
+DIST wasm-bindgen-backend-0.2.99.crate 30928 BLAKE2B ecfa94a461df79a33fd2bb9807374a2a0c7ac370b443e5a1103ba73a29c9d337ed3feb427c80571ccc15599f81135987742e698199528a9c1bb570baef3e9d09 SHA512 8369a5e618223f09fff7cdc35662a930b3eb11024af51bf5fb9e70c45dfa22452a518d723f3d912c0c970fc4bf748ef2d83d48756483174993f7d04c92d9621f
+DIST wasm-bindgen-macro-0.2.99.crate 7011 BLAKE2B 07182a9fb98f519d1e5c934e609d7a42cf2409319f59dd901e2a5bec77972b4d16fc6f67cf40ade58af874b05faa981c894443d3950616e2aad117ac7355ac6f SHA512 344bf5192e43582246efad257c600003c41b589234c1900f6ed201f96b6f7665eb55226da15d612060042f89c6214e452489cf3aabc61645843be9c27f9cca0b
+DIST wasm-bindgen-macro-support-0.2.99.crate 22800 BLAKE2B 9772cc94a64f768eecae12072e6d700bf95fded306297b84e235f3450f7c5630cb1985def3eaef05aee193c693f92c6fa61d7a6ca18e84a2b73aa38f070d47e7 SHA512 936ab8211a13fbe8b8f21a870a78c03e24219d0872731561353cfcae245e9f632246f179b67f2b13e106c799e68c5c39f9e388370a8ad3f93f299c4804f5907e
+DIST wasm-bindgen-shared-0.2.99.crate 7773 BLAKE2B 73489af59d16f4d0a1ea51b535cd02d2759b5b7b07873d8a71fa6bd6b6ce1cfc6e8139e6a79346abec13665ed9aeadd0b5b6aed28ae008f9dcb3d5da9fce665a SHA512 8da0f107be99b6666cf1859d68ac0a7295fc03e7b494fce1df9dbe57d21807de8e2bc95f5b974562303923ca4646f38c5297588ad7c97bd59ef236218b2a64f9
+DIST web-sys-0.3.76.crate 635842 BLAKE2B ecd166e739e4ae4ebccc51fe0d429723ed7e4209bc9bd4658b5447486d7d58d8f2d2a6186e433e8ff11e7b52fe159d842a28de6251d61cd5f5876a92a7d945fe SHA512 370fb49edffd9ce125f77a9451389dd23ab5b70fd49263248d5794310ed757c28839a29436111df2fe6369ae8d6af56a64ac59af5258743cccfd9d18cd07dbd1
+DIST winapi-util-0.1.9.crate 12464 BLAKE2B 7fb9dd803fc2608c4e5bc75674472992d82da364f24c22072d5624d6ae6abc44abd3e3ea3c45a7558e045331f3d87572b306b4ab5de52c07ff3706e7f13c2a38 SHA512 c46b893f67ec6e36499b00736bb6b9421e0e2611e76784afa6da01d7ebd033df82f1be7cf8d871d541125d290983f98f26f759488ba9aface49efce8edd682e9
+DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03
+DIST windows-sys-0.59.0.crate 2387323 BLAKE2B 3110c8cd2bc005f8c95cd038a8d574af648dc19788fe4485f977376f92e36b911b1a542d669a07ae9cd4ea72a884ab01ec78b8a2b5587456eb202452d1d8fa0d SHA512 d35e009e979633a1f3c8468cd038bd5c8c0381405165ce03497decd7d9edaaac485d704487e4a61d9aaf4e4d011b4248408912df6a0044d50e8457259867e061
+DIST windows-targets-0.52.6.crate 6403 BLAKE2B eb98d0a8daeed5fe76e7fa8edb2743e2a3e77dfb9c4ea68605a6ab10532cb7cfc43bc1cea0180869445bd940be762a40136500e26b84ca88b5e0c502004c7a4c SHA512 d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f
+DIST windows_aarch64_gnullvm-0.52.6.crate 435718 BLAKE2B 8b12ae02892cb69401329034bbca671d13bd268a112120b56b90504707cef89decfbd2560492844a9f0588fab62dc1476ab7e931126b939015d25a8cc91ca334 SHA512 f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5
+DIST windows_aarch64_msvc-0.52.6.crate 832615 BLAKE2B adc8ff61b6dc96d39c92c7d4221ae6aa0575edfc016cfcd046067ca5d8fcfd56d10e8e227be1c038ce34684be22c7ccaf5f18cd5a7638d28fbff4ba15b48b90b SHA512 a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b
+DIST windows_i686_gnu-0.52.6.crate 880402 BLAKE2B 5aab8ee07132eccb7695807eb44811beeb0657aadfb672c54e99b6ae39c067ba9b93e38fc69bb5b9b14a9759f263ccd5e301597d2727d83b31b49a409b6bd405 SHA512 a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822
+DIST windows_i686_gnullvm-0.52.6.crate 475940 BLAKE2B fec4fda8bb2bf319a501a22372fa642ae682e4dee3235b258a028190ee73220bfc55b3142f06249bb4579b17e5fde662bb2b121aefe18544653350d7d0fe7d8e SHA512 95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f
+DIST windows_i686_msvc-0.52.6.crate 901163 BLAKE2B 99ed34e052db5ba77bab240ed5d38ce450be347a794d63ec39b719304c32722c9999b540ab40abe0216318900b7412970df99dfb36d1516a9517cae0c77d1bdc SHA512 ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96
+DIST windows_x86_64_gnu-0.52.6.crate 836363 BLAKE2B e2335829155cdbd4a55cc9f9babc237e14e32aab97f6f91afabcdf80d2aee37d6fb4b8669aaf433ff532c85dba59b3d366c7d41b61a2f29b96f960169c900687 SHA512 c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb
+DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd
+DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
diff --git a/dev-python/sqlglot/sqlglot-25.34.1.ebuild b/dev-python/sqlglot/sqlglot-25.34.1.ebuild
deleted file mode 100644
index 27ddd9c3901d..000000000000
--- a/dev-python/sqlglot/sqlglot-25.34.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-CARGO_OPTIONAL=1
-CRATES="
-	autocfg@1.1.0
-	cfg-if@1.0.0
-	heck@0.5.0
-	indoc@2.0.4
-	libc@0.2.150
-	memoffset@0.9.0
-	once_cell@1.19.0
-	portable-atomic@1.9.0
-	proc-macro2@1.0.89
-	pyo3-build-config@0.22.6
-	pyo3-ffi@0.22.6
-	pyo3-macros-backend@0.22.6
-	pyo3-macros@0.22.6
-	pyo3@0.22.6
-	quote@1.0.37
-	syn@2.0.87
-	target-lexicon@0.12.16
-	unicode-ident@1.0.12
-	unindent@0.2.3
-"
-
-inherit cargo distutils-r1 pypi optfeature
-
-DESCRIPTION="An easily customizable SQL parser and transpiler"
-HOMEPAGE="
-	https://sqlglot.com/
-	https://github.com/tobymao/sqlglot/
-	https://pypi.org/project/sqlglot/
-"
-SRC_URI+="
-	native-extensions? (
-		${CARGO_CRATE_URIS}
-	)
-"
-
-LICENSE="MIT"
-LICENSE+=" native-extensions? ("
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
-LICENSE+=" )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+native-extensions"
-
-BDEPEND="
-	native-extensions? (
-		${RUST_DEPEND}
-		dev-util/maturin[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
-
-pkg_setup() {
-	use native-extensions && rust_pkg_setup
-}
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use native-extensions; then
-		local DISTUTILS_USE_PEP517=maturin
-		cd sqlglotrs || die
-		distutils-r1_python_compile
-		cd - >/dev/null || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# timing, sigh
-		# https://github.com/tobymao/sqlglot/issues/3961
-		tests/test_generator.py::TestGenerator::test_generate_nested_binary
-	)
-	local EPYTEST_IGNORE=(
-		# Tests require pyspark or duckdb which aren't in the tree.
-		# Pandas would be a requirement normally, but it gets ignored by proxy.
-		"tests/dataframe/integration/test_dataframe.py"
-		"tests/dataframe/integration/test_grouped_data.py"
-		"tests/dataframe/integration/test_session.py"
-		"tests/test_executor.py"
-		"tests/test_optimizer.py"
-	)
-
-	# make sure not to use an earlier installed version
-	local -x SQLGLOTRS_TOKENIZER=$(usex native-extensions 1 0)
-	rm -rf sqlglotrs || die
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
-}
diff --git a/dev-python/sqlglot/sqlglot-26.0.0.ebuild b/dev-python/sqlglot/sqlglot-26.0.0.ebuild
deleted file mode 100644
index 27ddd9c3901d..000000000000
--- a/dev-python/sqlglot/sqlglot-26.0.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-CARGO_OPTIONAL=1
-CRATES="
-	autocfg@1.1.0
-	cfg-if@1.0.0
-	heck@0.5.0
-	indoc@2.0.4
-	libc@0.2.150
-	memoffset@0.9.0
-	once_cell@1.19.0
-	portable-atomic@1.9.0
-	proc-macro2@1.0.89
-	pyo3-build-config@0.22.6
-	pyo3-ffi@0.22.6
-	pyo3-macros-backend@0.22.6
-	pyo3-macros@0.22.6
-	pyo3@0.22.6
-	quote@1.0.37
-	syn@2.0.87
-	target-lexicon@0.12.16
-	unicode-ident@1.0.12
-	unindent@0.2.3
-"
-
-inherit cargo distutils-r1 pypi optfeature
-
-DESCRIPTION="An easily customizable SQL parser and transpiler"
-HOMEPAGE="
-	https://sqlglot.com/
-	https://github.com/tobymao/sqlglot/
-	https://pypi.org/project/sqlglot/
-"
-SRC_URI+="
-	native-extensions? (
-		${CARGO_CRATE_URIS}
-	)
-"
-
-LICENSE="MIT"
-LICENSE+=" native-extensions? ("
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
-LICENSE+=" )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+native-extensions"
-
-BDEPEND="
-	native-extensions? (
-		${RUST_DEPEND}
-		dev-util/maturin[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
-
-pkg_setup() {
-	use native-extensions && rust_pkg_setup
-}
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use native-extensions; then
-		local DISTUTILS_USE_PEP517=maturin
-		cd sqlglotrs || die
-		distutils-r1_python_compile
-		cd - >/dev/null || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# timing, sigh
-		# https://github.com/tobymao/sqlglot/issues/3961
-		tests/test_generator.py::TestGenerator::test_generate_nested_binary
-	)
-	local EPYTEST_IGNORE=(
-		# Tests require pyspark or duckdb which aren't in the tree.
-		# Pandas would be a requirement normally, but it gets ignored by proxy.
-		"tests/dataframe/integration/test_dataframe.py"
-		"tests/dataframe/integration/test_grouped_data.py"
-		"tests/dataframe/integration/test_session.py"
-		"tests/test_executor.py"
-		"tests/test_optimizer.py"
-	)
-
-	# make sure not to use an earlier installed version
-	local -x SQLGLOTRS_TOKENIZER=$(usex native-extensions 1 0)
-	rm -rf sqlglotrs || die
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
-}
diff --git a/dev-python/sqlglot/sqlglot-26.0.1.ebuild b/dev-python/sqlglot/sqlglot-26.0.1.ebuild
deleted file mode 100644
index 27ddd9c3901d..000000000000
--- a/dev-python/sqlglot/sqlglot-26.0.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-CARGO_OPTIONAL=1
-CRATES="
-	autocfg@1.1.0
-	cfg-if@1.0.0
-	heck@0.5.0
-	indoc@2.0.4
-	libc@0.2.150
-	memoffset@0.9.0
-	once_cell@1.19.0
-	portable-atomic@1.9.0
-	proc-macro2@1.0.89
-	pyo3-build-config@0.22.6
-	pyo3-ffi@0.22.6
-	pyo3-macros-backend@0.22.6
-	pyo3-macros@0.22.6
-	pyo3@0.22.6
-	quote@1.0.37
-	syn@2.0.87
-	target-lexicon@0.12.16
-	unicode-ident@1.0.12
-	unindent@0.2.3
-"
-
-inherit cargo distutils-r1 pypi optfeature
-
-DESCRIPTION="An easily customizable SQL parser and transpiler"
-HOMEPAGE="
-	https://sqlglot.com/
-	https://github.com/tobymao/sqlglot/
-	https://pypi.org/project/sqlglot/
-"
-SRC_URI+="
-	native-extensions? (
-		${CARGO_CRATE_URIS}
-	)
-"
-
-LICENSE="MIT"
-LICENSE+=" native-extensions? ("
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
-LICENSE+=" )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+native-extensions"
-
-BDEPEND="
-	native-extensions? (
-		${RUST_DEPEND}
-		dev-util/maturin[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
-
-pkg_setup() {
-	use native-extensions && rust_pkg_setup
-}
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use native-extensions; then
-		local DISTUTILS_USE_PEP517=maturin
-		cd sqlglotrs || die
-		distutils-r1_python_compile
-		cd - >/dev/null || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# timing, sigh
-		# https://github.com/tobymao/sqlglot/issues/3961
-		tests/test_generator.py::TestGenerator::test_generate_nested_binary
-	)
-	local EPYTEST_IGNORE=(
-		# Tests require pyspark or duckdb which aren't in the tree.
-		# Pandas would be a requirement normally, but it gets ignored by proxy.
-		"tests/dataframe/integration/test_dataframe.py"
-		"tests/dataframe/integration/test_grouped_data.py"
-		"tests/dataframe/integration/test_session.py"
-		"tests/test_executor.py"
-		"tests/test_optimizer.py"
-	)
-
-	# make sure not to use an earlier installed version
-	local -x SQLGLOTRS_TOKENIZER=$(usex native-extensions 1 0)
-	rm -rf sqlglotrs || die
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
-}
diff --git a/dev-python/sqlglot/sqlglot-26.1.3.ebuild b/dev-python/sqlglot/sqlglot-26.1.3.ebuild
new file mode 100644
index 000000000000..dbaa103b3b89
--- /dev/null
+++ b/dev-python/sqlglot/sqlglot-26.1.3.ebuild
@@ -0,0 +1,176 @@
+# Copyright 2023-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} )
+
+CARGO_OPTIONAL=1
+CRATES="
+	aho-corasick@1.1.3
+	anes@0.1.6
+	anstyle@1.0.10
+	autocfg@1.1.0
+	bumpalo@3.16.0
+	cast@0.3.0
+	cfg-if@1.0.0
+	ciborium-io@0.2.2
+	ciborium-ll@0.2.2
+	ciborium@0.2.2
+	clap@4.5.23
+	clap_builder@4.5.23
+	clap_lex@0.7.4
+	criterion-plot@0.5.0
+	criterion@0.5.1
+	crossbeam-deque@0.8.6
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.21
+	crunchy@0.2.2
+	either@1.13.0
+	half@2.4.1
+	heck@0.5.0
+	hermit-abi@0.4.0
+	indoc@2.0.4
+	is-terminal@0.4.13
+	itertools@0.10.5
+	itoa@1.0.14
+	js-sys@0.3.76
+	libc@0.2.169
+	log@0.4.22
+	memchr@2.7.4
+	memoffset@0.9.0
+	num-traits@0.2.19
+	once_cell@1.19.0
+	oorandom@11.1.4
+	plotters-backend@0.3.7
+	plotters-svg@0.3.7
+	plotters@0.3.7
+	portable-atomic@1.9.0
+	proc-macro2@1.0.89
+	pyo3-build-config@0.22.6
+	pyo3-ffi@0.22.6
+	pyo3-macros-backend@0.22.6
+	pyo3-macros@0.22.6
+	pyo3@0.22.6
+	quote@1.0.37
+	rayon-core@1.12.1
+	rayon@1.10.0
+	regex-automata@0.4.9
+	regex-syntax@0.8.5
+	regex@1.11.1
+	ryu@1.0.18
+	same-file@1.0.6
+	serde@1.0.216
+	serde_derive@1.0.216
+	serde_json@1.0.133
+	syn@2.0.87
+	target-lexicon@0.12.16
+	tinytemplate@1.2.1
+	unicode-ident@1.0.12
+	unindent@0.2.3
+	walkdir@2.5.0
+	wasm-bindgen-backend@0.2.99
+	wasm-bindgen-macro-support@0.2.99
+	wasm-bindgen-macro@0.2.99
+	wasm-bindgen-shared@0.2.99
+	wasm-bindgen@0.2.99
+	web-sys@0.3.76
+	winapi-util@0.1.9
+	windows-sys@0.52.0
+	windows-sys@0.59.0
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.52.6
+"
+
+inherit cargo distutils-r1 pypi optfeature
+
+DESCRIPTION="An easily customizable SQL parser and transpiler"
+HOMEPAGE="
+	https://sqlglot.com/
+	https://github.com/tobymao/sqlglot/
+	https://pypi.org/project/sqlglot/
+"
+SRC_URI+="
+	native-extensions? (
+		${CARGO_CRATE_URIS}
+	)
+"
+
+LICENSE="MIT"
+LICENSE+=" native-extensions? ("
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
+"
+LICENSE+=" )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+native-extensions"
+
+BDEPEND="
+	native-extensions? (
+		${RUST_DEPEND}
+		dev-util/maturin[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
+
+pkg_setup() {
+	use native-extensions && rust_pkg_setup
+}
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use native-extensions; then
+		local DISTUTILS_USE_PEP517=maturin
+		cd sqlglotrs || die
+		distutils-r1_python_compile
+		cd - >/dev/null || die
+	fi
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# timing, sigh
+		# https://github.com/tobymao/sqlglot/issues/3961
+		tests/test_generator.py::TestGenerator::test_generate_nested_binary
+	)
+	local EPYTEST_IGNORE=(
+		# Tests require pyspark or duckdb which aren't in the tree.
+		# Pandas would be a requirement normally, but it gets ignored by proxy.
+		"tests/dataframe/integration/test_dataframe.py"
+		"tests/dataframe/integration/test_grouped_data.py"
+		"tests/dataframe/integration/test_session.py"
+		"tests/test_executor.py"
+		"tests/test_optimizer.py"
+	)
+
+	# make sure not to use an earlier installed version
+	local -x SQLGLOTRS_TOKENIZER=$(usex native-extensions 1 0)
+	rm -rf sqlglotrs || die
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
+}
diff --git a/dev-python/sqlglot/sqlglot-26.2.1.ebuild b/dev-python/sqlglot/sqlglot-26.2.1.ebuild
new file mode 100644
index 000000000000..f66889c1ac68
--- /dev/null
+++ b/dev-python/sqlglot/sqlglot-26.2.1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 2023-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} )
+
+CARGO_OPTIONAL=1
+CRATES="
+	aho-corasick@1.1.3
+	anes@0.1.6
+	anstyle@1.0.10
+	autocfg@1.1.0
+	bumpalo@3.16.0
+	cast@0.3.0
+	cfg-if@1.0.0
+	ciborium-io@0.2.2
+	ciborium-ll@0.2.2
+	ciborium@0.2.2
+	clap@4.5.23
+	clap_builder@4.5.23
+	clap_lex@0.7.4
+	criterion-plot@0.5.0
+	criterion@0.5.1
+	crossbeam-deque@0.8.6
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.21
+	crunchy@0.2.2
+	either@1.13.0
+	half@2.4.1
+	heck@0.5.0
+	hermit-abi@0.4.0
+	indoc@2.0.4
+	is-terminal@0.4.13
+	itertools@0.10.5
+	itoa@1.0.14
+	js-sys@0.3.76
+	libc@0.2.169
+	log@0.4.22
+	memchr@2.7.4
+	memoffset@0.9.0
+	num-traits@0.2.19
+	once_cell@1.19.0
+	oorandom@11.1.4
+	plotters-backend@0.3.7
+	plotters-svg@0.3.7
+	plotters@0.3.7
+	portable-atomic@1.9.0
+	proc-macro2@1.0.89
+	pyo3-build-config@0.22.6
+	pyo3-ffi@0.22.6
+	pyo3-macros-backend@0.22.6
+	pyo3-macros@0.22.6
+	pyo3@0.22.6
+	quote@1.0.37
+	rayon-core@1.12.1
+	rayon@1.10.0
+	regex-automata@0.4.9
+	regex-syntax@0.8.5
+	regex@1.11.1
+	rustc-hash@2.1.0
+	ryu@1.0.18
+	same-file@1.0.6
+	serde@1.0.216
+	serde_derive@1.0.216
+	serde_json@1.0.133
+	syn@2.0.87
+	target-lexicon@0.12.16
+	tinytemplate@1.2.1
+	unicode-ident@1.0.12
+	unindent@0.2.3
+	walkdir@2.5.0
+	wasm-bindgen-backend@0.2.99
+	wasm-bindgen-macro-support@0.2.99
+	wasm-bindgen-macro@0.2.99
+	wasm-bindgen-shared@0.2.99
+	wasm-bindgen@0.2.99
+	web-sys@0.3.76
+	winapi-util@0.1.9
+	windows-sys@0.52.0
+	windows-sys@0.59.0
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.52.6
+"
+
+inherit cargo distutils-r1 pypi optfeature
+
+DESCRIPTION="An easily customizable SQL parser and transpiler"
+HOMEPAGE="
+	https://sqlglot.com/
+	https://github.com/tobymao/sqlglot/
+	https://pypi.org/project/sqlglot/
+"
+SRC_URI+="
+	native-extensions? (
+		${CARGO_CRATE_URIS}
+	)
+"
+
+LICENSE="MIT"
+LICENSE+=" native-extensions? ("
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
+"
+LICENSE+=" )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+native-extensions"
+
+BDEPEND="
+	native-extensions? (
+		${RUST_DEPEND}
+		dev-util/maturin[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
+
+pkg_setup() {
+	use native-extensions && rust_pkg_setup
+}
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use native-extensions; then
+		local DISTUTILS_USE_PEP517=maturin
+		cd sqlglotrs || die
+		distutils-r1_python_compile
+		cd - >/dev/null || die
+	fi
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# timing, sigh
+		# https://github.com/tobymao/sqlglot/issues/3961
+		tests/test_generator.py::TestGenerator::test_generate_nested_binary
+	)
+	local EPYTEST_IGNORE=(
+		# Tests require pyspark or duckdb which aren't in the tree.
+		# Pandas would be a requirement normally, but it gets ignored by proxy.
+		"tests/dataframe/integration/test_dataframe.py"
+		"tests/dataframe/integration/test_grouped_data.py"
+		"tests/dataframe/integration/test_session.py"
+		"tests/test_executor.py"
+		"tests/test_optimizer.py"
+	)
+
+	# make sure not to use an earlier installed version
+	local -x SQLGLOTRS_TOKENIZER=$(usex native-extensions 1 0)
+	rm -rf sqlglotrs || die
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
+}
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index e7b041fbad8e..5dcb277587b1 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,6 +1,2 @@
-DIST starlette-0.41.3.gh.tar.gz 2574193 BLAKE2B 4363317669b44df1e3f882aa88a32c2f6c53d9b349c8e65455a4f5bbd58a39a6e5342cfdd24cec2b652616fd57cbd4e46b9a81702251d336747d984c946bed3f SHA512 f6f0dc60dc557567fb342bbfff4b19b2c634f202d355589c4b66021f5018fdbf84e101b820926284519e0b8272f325045845f126239516034ce2d3c25558b7b3
-DIST starlette-0.42.0.gh.tar.gz 2575175 BLAKE2B 8c8d85288ad7a42b9771431377e5b6ecd98f6c6088fa913bddf496db2de1c7c1e471d1b9a0a6a17885acfe96e503391e066d1b8c6f612329afe69d8ca8743935 SHA512 d7b0da5333930d6ce9315387cc7e23fd22b4ed379d37c8f143cf6e6a07b5cb2d207d4c349616788633387fa54c6fc377feb28df6ccd1216b824e66a47c950f2b
-DIST starlette-0.43.0.gh.tar.gz 2575272 BLAKE2B 9905f678f5ea26e40e8b37cbf130fb03c1b6337c30777a24f3092134ac2ab077b4de2ca7b25feae8ee6bdb3334558c196688d8dca89f519d0949370992477218 SHA512 9cb80e0eebb6fecde411dce6c3beb1d733ccf887b9145c88b5608ef78e942d8c808c0bc8971fcdb233b6f2b973617fe7e60bc8a0d97cc14b002efe74f1900683
 DIST starlette-0.44.0.gh.tar.gz 2575663 BLAKE2B f566f354b87379ba076b37ebb7366ffc8c209bf1318f8c49ffcdc2cb604b90d29ecb24071b17c551c7e2aa4d383393fae9bf2b3e8129095e7adcaf10956d3a9d SHA512 052baac1a0f60354a35711e87de58b90b1c6fd13f6a2290746663dcc88d131840c340a2c95f8664b4b6347a7397639e26e547a1c353ca7b1911c3f5e3873868e
-DIST starlette-0.45.0.gh.tar.gz 2574328 BLAKE2B 5f482b255d0bfe88e0c8c882d4f49a792d14c6cef9237a28708cadab3880d0b77363827cec6aa371044974997ba44ba2eec4b3488775bb596ecfb58032a35e90 SHA512 9b949d110c2a83f29245ac442d83e7f7b856e6f95f5c0d4f0e8691c9976158c650bac05ccbebc3738e6735cbb1b54d6acabd5d1848d920a0ca91905f2ddcfc14
-DIST starlette-0.45.1.gh.tar.gz 2573973 BLAKE2B 25969d380b0318b28bf176ef38136d3280ce6f93d501f547734427110f2c65527d45131315aecf3f19d188b9d8ac551a2e64ff59497b054b72eede3f0d842fac SHA512 7ead358b2cabef0df89b7f61674f5b24c350fd1dc48437e0578b31ebc995e22aadbe8569dd04878cd47c44ffa3aad0ef3beb6d6b9ae14b13116c035e2d60cd12
+DIST starlette-0.45.2.gh.tar.gz 2574149 BLAKE2B 8e75566e5235bb987fc6ee3e9ab56b792c11c32046f0c93e10ca71488bf93fede2741ed6425511d6d061144c2bac4c859620310b6517d9860ab4e81d4b4cbcfa SHA512 f8a7f553abba43554263d94de65d843784a7a97d05f76142a6ba4c814488e0abc398305b6c11ed3d5228c287795df78f1174f0a4ecd79a7beb2ad3b5e76bf86f
diff --git a/dev-python/starlette/starlette-0.41.3.ebuild b/dev-python/starlette/starlette-0.41.3.ebuild
deleted file mode 100644
index b783714cd86b..000000000000
--- a/dev-python/starlette/starlette-0.41.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja2[${PYTHON_USEDEP}]
-	>=dev-python/python-multipart-0.0.13[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-: ${EPYTEST_TIMEOUT:-180}
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Unpackaged 'databases' dependency
-		tests/test_database.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p anyio
-}
diff --git a/dev-python/starlette/starlette-0.42.0.ebuild b/dev-python/starlette/starlette-0.42.0.ebuild
deleted file mode 100644
index b7ad404f1294..000000000000
--- a/dev-python/starlette/starlette-0.42.0.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
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	<dev-python/httpx-0.29[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja2[${PYTHON_USEDEP}]
-	>=dev-python/python-multipart-0.0.18[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-: ${EPYTEST_TIMEOUT:-180}
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Unpackaged 'databases' dependency
-		tests/test_database.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p anyio
-}
diff --git a/dev-python/starlette/starlette-0.43.0.ebuild b/dev-python/starlette/starlette-0.43.0.ebuild
deleted file mode 100644
index b7ad404f1294..000000000000
--- a/dev-python/starlette/starlette-0.43.0.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
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	<dev-python/httpx-0.29[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja2[${PYTHON_USEDEP}]
-	>=dev-python/python-multipart-0.0.18[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-: ${EPYTEST_TIMEOUT:-180}
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Unpackaged 'databases' dependency
-		tests/test_database.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p anyio
-}
diff --git a/dev-python/starlette/starlette-0.44.0.ebuild b/dev-python/starlette/starlette-0.44.0.ebuild
index b7ad404f1294..c5ff6274ffb2 100644
--- a/dev-python/starlette/starlette-0.44.0.ebuild
+++ b/dev-python/starlette/starlette-0.44.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
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/anyio-5[${PYTHON_USEDEP}]
diff --git a/dev-python/starlette/starlette-0.45.0.ebuild b/dev-python/starlette/starlette-0.45.0.ebuild
deleted file mode 100644
index b7ad404f1294..000000000000
--- a/dev-python/starlette/starlette-0.45.0.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
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	<dev-python/httpx-0.29[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja2[${PYTHON_USEDEP}]
-	>=dev-python/python-multipart-0.0.18[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-: ${EPYTEST_TIMEOUT:-180}
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Unpackaged 'databases' dependency
-		tests/test_database.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p anyio
-}
diff --git a/dev-python/starlette/starlette-0.45.1.ebuild b/dev-python/starlette/starlette-0.45.1.ebuild
deleted file mode 100644
index b7ad404f1294..000000000000
--- a/dev-python/starlette/starlette-0.45.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
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	<dev-python/httpx-0.29[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja2[${PYTHON_USEDEP}]
-	>=dev-python/python-multipart-0.0.18[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-: ${EPYTEST_TIMEOUT:-180}
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Unpackaged 'databases' dependency
-		tests/test_database.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p anyio
-}
diff --git a/dev-python/starlette/starlette-0.45.2.ebuild b/dev-python/starlette/starlette-0.45.2.ebuild
new file mode 100644
index 000000000000..944b7f1ef8da
--- /dev/null
+++ b/dev-python/starlette/starlette-0.45.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="The little ASGI framework that shines"
+HOMEPAGE="
+	https://www.starlette.io/
+	https://github.com/encode/starlette/
+	https://pypi.org/project/starlette/
+"
+# no docs or tests in sdist, as of 0.27.0
+SRC_URI="
+	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/anyio-5[${PYTHON_USEDEP}]
+	>=dev-python/anyio-3.6.2[${PYTHON_USEDEP}]
+	<dev-python/httpx-0.29[${PYTHON_USEDEP}]
+	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
+	>=dev-python/python-multipart-0.0.18[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+	)
+"
+
+: ${EPYTEST_TIMEOUT:-180}
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# Unpackaged 'databases' dependency
+		tests/test_database.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p anyio
+}
diff --git a/dev-python/statsmodels/statsmodels-0.14.4.ebuild b/dev-python/statsmodels/statsmodels-0.14.4.ebuild
index 4b6a6b819c74..b643638d78be 100644
--- a/dev-python/statsmodels/statsmodels-0.14.4.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.14.4.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 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~riscv ~amd64-linux"
+KEYWORDS="amd64 arm64 ~riscv ~amd64-linux"
 IUSE="examples"
 
 # NB: upstream requires building with numpy-2 but supports 1.x
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index c83b2a7442af..a90b08977460 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,3 +1 @@
-DIST stripe-11.3.0.tar.gz 1367031 BLAKE2B b46cae95059a1aa7087743772b5cb23456e64b276befa852b0c13ce417f624ac6d9a90e64a43aeb3d60941ad73cc87afa114d4161c5e5b3e5ae6033b4378f6c1 SHA512 4b8934653f138b86f7d64977f2817fc0ad54a89d794521af7d1f193ecdcbb366e78ece286a3c768f946d281aba998443e675e6db66fcd3a0084641053e55a182
-DIST stripe-11.4.0.tar.gz 1378868 BLAKE2B 86444654843d90cd068c8f5b240fbc7f141a128c31b4d85e2b096fa202b5f1a662891f4ac0902725ebb2ec54f61e4fc45558239caa31f7db5c67bfc0c72e758f SHA512 083f9fee32d48c1a4097168871f56b9027f5098e9628b6ac29440ab4fced445b824795ba77129edf1e5cd41f99f086f26475d289d65f2e2fff94103913aa9d6a
 DIST stripe-11.4.1.tar.gz 1379118 BLAKE2B 6acbbe35ab7625d9bb0be6c92b901c71b9d93a69d5b1bfd99826cdd1288db10a87c07e88a7f66a08dece7d84767b43760c3487e9f601658b2a0d13c27f9405d5 SHA512 1bf68094002226d9b47cf29cae54116f7fb5cbc7cb000a7dc3d95eb0cbbcb75b5979348aabab4417ca455a8a28bd8d90756f6258ff0ff1c6b0af3130e8fe0563
diff --git a/dev-python/stripe/stripe-11.3.0.ebuild b/dev-python/stripe/stripe-11.3.0.ebuild
deleted file mode 100644
index 4a41682bd6e3..000000000000
--- a/dev-python/stripe/stripe-11.3.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe Python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="telemetry"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.192.0
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/anyio[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	if ! use telemetry; then
-		sed -i -e '/enable_telemetry/s:True:False:' stripe/__init__.py || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# exception message mismatch with aiohttp-3.10.0
-		"tests/test_integration.py::TestIntegration::test_async_timeout[asyncio-aiohttp]"
-		"tests/test_integration.py::TestIntegration::test_async_raw_request_timeout[asyncio-aiohttp]"
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p anyio -p pytest_mock
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-11.4.0.ebuild b/dev-python/stripe/stripe-11.4.0.ebuild
deleted file mode 100644
index eb697bfc26cb..000000000000
--- a/dev-python/stripe/stripe-11.4.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe Python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="telemetry"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.192.0
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/anyio[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	if ! use telemetry; then
-		sed -i -e '/enable_telemetry/s:True:False:' stripe/__init__.py || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# exception message mismatch with aiohttp-3.10.0
-		"tests/test_integration.py::TestIntegration::test_async_timeout[asyncio-aiohttp]"
-		"tests/test_integration.py::TestIntegration::test_async_raw_request_timeout[asyncio-aiohttp]"
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p anyio -p pytest_mock
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-11.4.1.ebuild b/dev-python/stripe/stripe-11.4.1.ebuild
index d7bc19c335ba..7b1c850c6663 100644
--- a/dev-python/stripe/stripe-11.4.1.ebuild
+++ b/dev-python/stripe/stripe-11.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="telemetry"
 
 RDEPEND="
diff --git a/dev-python/structlog/Manifest b/dev-python/structlog/Manifest
index e3465d5f8617..0d454e783b70 100644
--- a/dev-python/structlog/Manifest
+++ b/dev-python/structlog/Manifest
@@ -1 +1,2 @@
 DIST structlog-24.4.0.tar.gz 1348634 BLAKE2B 29b35ad7471e6e681c86363880397869b5a149ff06bd1e5c68c7587ff2da6663ded7d278788b77fbc6d945cadda89073dbb3f43fbd4b0e21a71380a6d361593a SHA512 0dedb73caa9cd8f288267f129b9b61ae7db542fec1c92a38d785e1606d56a1272fb9fb5dd23c04a8fd0ce0a3c41f430d51230475bde4eab1919998187fbe680b
+DIST structlog-25.1.0.tar.gz 1364973 BLAKE2B 6e7237eb87e0e8669a42bdee214d9a9d7095363b42fcf4f86be8d50e6d320bf9199d08de13e138cd520c42dadb68cfd676dbe8f6792a892fe1f79738d1c711a6 SHA512 190722bbd71355fce1dc6842ca3b358a2de99b4823e1175e52205e719b8164e3d5d16f55307e93bb3b4b03d9f655ae01a8ccb89cd3a5908d6d5cf3fa63e0f03a
diff --git a/dev-python/structlog/structlog-25.1.0.ebuild b/dev-python/structlog/structlog-25.1.0.ebuild
new file mode 100644
index 000000000000..38ba2b097d70
--- /dev/null
+++ b/dev-python/structlog/structlog-25.1.0.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=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Structured Logging for Python"
+HOMEPAGE="
+	https://github.com/hynek/structlog/
+	https://pypi.org/project/structlog/
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sure/sure-2.0.1.ebuild b/dev-python/sure/sure-2.0.1.ebuild
index a1471f0f8a07..22d67993f3e1 100644
--- a/dev-python/sure/sure-2.0.1.ebuild
+++ b/dev-python/sure/sure-2.0.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/mock[${PYTHON_USEDEP}]
diff --git a/dev-python/symengine/symengine-0.13.0.ebuild b/dev-python/symengine/symengine-0.13.0.ebuild
index cc0c62820514..e66abd98e263 100644
--- a/dev-python/symengine/symengine-0.13.0.ebuild
+++ b/dev-python/symengine/symengine-0.13.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	dev-build/cmake
diff --git a/dev-python/tables/Manifest b/dev-python/tables/Manifest
index 914db9a3d26e..f31457af63fc 100644
--- a/dev-python/tables/Manifest
+++ b/dev-python/tables/Manifest
@@ -1 +1,2 @@
 DIST tables-3.10.1.tar.gz 4762413 BLAKE2B b185e839767cb339bf5e3760d6d37593eb57551776c563bd99eaaeabc5ee3c041f3b86a03995294dbfaa1a27b0581b0c4544fac0dbdfacd507fe487c1256a2cc SHA512 7590dccefdd718d170ac288d391173ed540760a911f53fd39e37dd74237dc554f9363c8d9d4d518f067da299d71a1d8cb4a40134b1afaf79daa0a17de248caf5
+DIST tables-3.10.2.tar.gz 4779722 BLAKE2B 3242a1a4ec167f5f21496e8602fcf319fa387ad9245955d17c74605cec97a6222f92197ad7c2f7d3d53fa72740c5bfe9c0c759500698999e3fa5aea036e6ff7e SHA512 c2a1781113d31b35a75a2ce34fe0e922824340efd3077df419913ec6bdb4b0a59ee0601736423c34baf9d61aa0a7122f0b0440e4000cfe61a6dde5f369574450
diff --git a/dev-python/tables/tables-3.10.2.ebuild b/dev-python/tables/tables-3.10.2.ebuild
new file mode 100644
index 000000000000..9b9a6e87c758
--- /dev/null
+++ b/dev-python/tables/tables-3.10.2.ebuild
@@ -0,0 +1,75 @@
+# 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=( pypy3 python3_{10..13} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 prefix pypi
+
+DESCRIPTION="Hierarchical datasets for Python"
+HOMEPAGE="
+	https://www.pytables.org/
+	https://github.com/PyTables/PyTables/
+	https://pypi.org/project/tables/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+cpudetection examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-arch/bzip2:0=
+	app-arch/lz4:0=
+	>=app-arch/zstd-1.0.0:=
+	>=dev-libs/c-blosc-1.11.1:0=
+	>=dev-libs/c-blosc2-2.11.0:=
+	dev-libs/lzo:2=
+	>=dev-python/numpy-1.19.0:=[${PYTHON_USEDEP}]
+	>=sci-libs/hdf5-1.8.4:=
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/numexpr-2.6.2[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	cpudetection? ( dev-python/py-cpuinfo[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	>=dev-python/cython-3.0.10[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	cpudetection? ( dev-python/py-cpuinfo[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+	)
+"
+
+python_prepare_all() {
+	rm -r c-blosc/{blosc,internal-complibs} || die
+
+	distutils-r1_python_prepare_all
+
+	sed -i -e '/blosc2/d' pyproject.toml || die
+	hprefixify -w '/prefixes =/' setup.py
+
+	export PYTABLES_NO_EMBEDDED_LIBS=1
+	export USE_PKGCONFIG=TRUE
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	"${EPYTHON}" tables/tests/test_all.py -v || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r contrib examples
+		docompress -x /usr/share/doc/${PF}/{contrib,examples}
+	fi
+}
diff --git a/dev-python/tagpy/Manifest b/dev-python/tagpy/Manifest
index cae7e14312ac..18621be5bf11 100644
--- a/dev-python/tagpy/Manifest
+++ b/dev-python/tagpy/Manifest
@@ -1 +1,2 @@
 DIST tagpy-2022.1.gh.tar.gz 198744 BLAKE2B 1a0722017ae532444cf97171c04964453bdb6c427a49bace4ad9fe3a3be9be7f0903a9ae3fb8dbf0c8450112ed5f83677044c6b2546dddec3550d8251cef4cff SHA512 d740bf17abe6a2a7cd7fe037c024c8361d49d2ec4e8d03dbdc27c9ec273696b0a41d087a7159692e9b849e807af493f68239562da01d5191bee95060b32aabda
+DIST tagpy-2025.1.gh.tar.gz 256974 BLAKE2B 629dc6b4dd980040e2a248b2ca55a4dc1f90e5dde214602dd80c68fc55a864c34ea3e1c7849185b04a13b66eace7b865054d667f0edb007b9eb479df2b5aae19 SHA512 9842c1bcf2ca9d3ba554d1771e7296280fe9b2749fe834ddc8045fc9587b5acc2705019f0065839690b3f65f9e4e2fab42d14e0f1267367fbf446993517e3531
diff --git a/dev-python/tagpy/tagpy-2022.1-r1.ebuild b/dev-python/tagpy/tagpy-2022.1-r1.ebuild
index e2bf7fed8cd3..619d870002d8 100644
--- a/dev-python/tagpy/tagpy-2022.1-r1.ebuild
+++ b/dev-python/tagpy/tagpy-2022.1-r1.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
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 
 DEPEND="
 	dev-libs/boost:=[python,${PYTHON_USEDEP}]
diff --git a/dev-python/tagpy/tagpy-2022.1.ebuild b/dev-python/tagpy/tagpy-2022.1.ebuild
deleted file mode 100644
index 2a8e65aca5eb..000000000000
--- a/dev-python/tagpy/tagpy-2022.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Bindings for TagLib"
-HOMEPAGE="
-	https://github.com/palfrey/tagpy/
-	https://pypi.org/project/tagpy/
-"
-SRC_URI="
-	https://github.com/palfrey/tagpy/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-
-DEPEND="
-	dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	>=media-libs/taglib-1.8
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tagpy/tagpy-2025.1.ebuild b/dev-python/tagpy/tagpy-2025.1.ebuild
new file mode 100644
index 000000000000..d7db5a0aabc2
--- /dev/null
+++ b/dev-python/tagpy/tagpy-2025.1.ebuild
@@ -0,0 +1,34 @@
+# 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
+
+DESCRIPTION="Python Bindings for TagLib"
+HOMEPAGE="
+	https://github.com/palfrey/tagpy/
+	https://pypi.org/project/tagpy/
+"
+SRC_URI="
+	https://github.com/palfrey/tagpy/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	media-libs/taglib:=
+"
+RDEPEND="
+	${DEPEND}
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/taskgroup/Manifest b/dev-python/taskgroup/Manifest
index 15705eb6b262..f7685f9e6c27 100644
--- a/dev-python/taskgroup/Manifest
+++ b/dev-python/taskgroup/Manifest
@@ -1,3 +1,4 @@
 DIST taskgroup-0.0.0a4.tar.gz 8553 BLAKE2B b9fe9e2442ef8ea5972599a150ad8d2e41004a0aee2112e455d0b850c3833fb266fe2a6b730a4d8371eb3fff0d7101f2803d8708f3f9ea1159338495ca9255be SHA512 fc5a78de3d20fecd82a2c9a142ecf1df8f33f185a792f50b86558d7bb38d49307977a4db0709dbb806cca2a1d3aba46c86833c24973e155c3295437038581ab7
 DIST taskgroup-0.1.1.tar.gz 8907 BLAKE2B 9decb86c5461de880547baa1c391b63cdfce03efa53f24e5508015ce2e3d6940a03174e77292621798f56f48b478665c1a3907f30a8f696578adf8c4a3553524 SHA512 05241eac884bf6d99a543a466d7b0b621c52c5e2569cf3a067b4c1a0b2296ee5d27297090bb46e77c32a1491d8398bdfea0f3ea2fca366f22189e390497d1ea4
 DIST taskgroup-0.2.1.tar.gz 11184 BLAKE2B fc2edd9962bff0441bf742b91c57e2b107ecf0ea3ae9d551c05c044217419eca9d45dd9d1106d227b83eed82e18ebd3e18943b15ed84c611a95e46eafe46a940 SHA512 a7d9533f7e82151db0b847a8b3197593920536a6fc9cac10ed6f3b6952224d66fa4c45359109f1797c057155370ac0f4ed099b3c6c942aa258fd2cb033e9daad
+DIST taskgroup-0.2.2.tar.gz 11504 BLAKE2B 125316de4069d84b9bbc25e8d46b1b3d59ac97c39630af7e4c50d41a55c2748d07b709fc67be13450e799b3d6799712736ea1b7d463fde50da0b96961871b91a SHA512 194c7130538f5e474b7e7df5b7c8ea764fd0c81203f0cf4eaa57bef7bbc7af5bb47c4a1f75b0d1132376018f8ef8eb32a3f486e6de548578ab2006d79306c903
diff --git a/dev-python/taskgroup/taskgroup-0.1.1.ebuild b/dev-python/taskgroup/taskgroup-0.1.1.ebuild
index 765a82e33124..f7cf424ec8af 100644
--- a/dev-python/taskgroup/taskgroup-0.1.1.ebuild
+++ b/dev-python/taskgroup/taskgroup-0.1.1.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/exceptiongroup[${PYTHON_USEDEP}]
diff --git a/dev-python/taskgroup/taskgroup-0.2.2.ebuild b/dev-python/taskgroup/taskgroup-0.2.2.ebuild
new file mode 100644
index 000000000000..4072f210b3e4
--- /dev/null
+++ b/dev-python/taskgroup/taskgroup-0.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+# py3.11: this is a backport to py3.10, please do not add more targets
+PYTHON_COMPAT=( pypy3 python3_10 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Backport of asyncio.TaskGroup, asyncio.Runner and asyncio.timeout"
+HOMEPAGE="
+	https://github.com/graingert/taskgroup/
+	https://pypi.org/project/taskgroup/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/exceptiongroup[${PYTHON_USEDEP}]
+	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.12.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index eff7b259492e..be6fa8110d61 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,2 +1 @@
-DIST tempest-41.0.0.tar.gz 1151830 BLAKE2B 6c732647f49a07d1ae747a4f286779b21c1c64f046a8542cf3f067f79cc839d99fcc6eced01162f5e0415e803c8a2ee0a0e5e5ec92f1088736cff3b341874b9f SHA512 aa5065dbb7431b5cf5d93075083e74eb6c811c759f109ac9ceee7cc45240b84c091f84542a3455cf686f84e359a17f99154ec417ee7003bb01c7ef191f6dcc27
 DIST tempest-42.0.0.tar.gz 1154522 BLAKE2B 5ff8aad2a131034507a99da82a7c279490341e4186f50aaa49498e3da697bc48ed3a61809207440d4c0a8af7ec9a487415905bb7a345df3f1e3ef5c7bca98ff4 SHA512 dcf546f08b309b9ceb08337e39b7931a3c96a591cb2578e3727b42aa74a85dd0c218cebd6708bd9592e3a39a845ef692a01df434a4f147289166c88996d11d3c
diff --git a/dev-python/tempest/tempest-41.0.0.ebuild b/dev-python/tempest/tempest-41.0.0.ebuild
deleted file mode 100644
index ad51505078e9..000000000000
--- a/dev-python/tempest/tempest-41.0.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="OpenStack Integration Testing"
-HOMEPAGE="
-	https://pypi.org/project/tempest/
-	https://docs.openstack.org/tempest/latest/
-	https://launchpad.net/tempest/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/python-subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		dev-python/stestr[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	# Small subset of tests, which fail as result of not using specific
-	# testing environment.
-	rm -r tempest/tests/lib/services/volume/v3/ || die
-
-	# remove dep on hacking
-	rm tempest/tests/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	mv "${BUILD_DIR}"/install/{usr/,}etc || die
-}
-
-python_test() {
-	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1
-	local -x OS_TEST_TIMEOUT=300
-	stestr --test-path ./tempest/tests run --concurrency="$(makeopts_jobs)" ||
-		die "Tests failed for ${EPYTHON}"
-}
diff --git a/dev-python/tempest/tempest-42.0.0.ebuild b/dev-python/tempest/tempest-42.0.0.ebuild
index 47cf9fe84171..4ecd6ba0084a 100644
--- a/dev-python/tempest/tempest-42.0.0.ebuild
+++ b/dev-python/tempest/tempest-42.0.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 30128f3db181..0797827d3c3f 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,3 +1 @@
-DIST tempora-5.7.0.tar.gz 22239 BLAKE2B 11c9ba681b1973b75e22cc4a2c8bcc1a2620e0284ce1b7d42fda25ce8c2a35bd4a9a4b329013143dbfd27613a327fb8d3d048d1230f679a240ed5ea6abc9761a SHA512 4c1bc7e45cfa1f415bfa6bcee3d6b82246477279b89328a98b8b944dddf7184a515e0733bb868321f63cbcb21fcb7847543a2643c059e6d2e0721c2e66ad4239
-DIST tempora-5.7.1.tar.gz 23234 BLAKE2B 882eef718f7f49b072de62d7bbdd023b11b602c173fd5e156d1b16176f9b5a5976b84966d8d07e2e27a87b49c3f79e7b043102ebb2f4b55f5c65e6ac6e17a5c8 SHA512 58d10ca6bc10994b65db1dc5d90af2446141ac0d7aef11459808c38bac76b775fbeefe11529a6c81d76659b8e2317f6a3de82ea94b300a0dab5596a16a1c7cea
 DIST tempora-5.8.0.tar.gz 23019 BLAKE2B 698dfd60181612f95ae5f411af0d909dc966c06250871cebc6ccf46caf9b1212814a15ad57ff00a520c16465a55b7f72fc1de51f0b41626f1c6511511d77adcf SHA512 387c08b2ec9b1f8345835f26a95aa47659399c9b2422168e114b2c28331e0ecdf627d0ba41a0279f3d74cb3da1670e3db918d83ccf9e169d3fc962926b4cfee5
diff --git a/dev-python/tempora/tempora-5.7.0.ebuild b/dev-python/tempora/tempora-5.7.0.ebuild
deleted file mode 100644
index 7b8fa416b2ac..000000000000
--- a/dev-python/tempora/tempora-5.7.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( pypy3 python3_{10..13} python3_13t )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="
-	https://github.com/jaraco/tempora/
-	https://pypi.org/project/tempora/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest-freezer[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p freezer
-}
diff --git a/dev-python/tempora/tempora-5.7.1.ebuild b/dev-python/tempora/tempora-5.7.1.ebuild
deleted file mode 100644
index fa874b15fdde..000000000000
--- a/dev-python/tempora/tempora-5.7.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( pypy3 python3_{10..13} python3_13t )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="
-	https://github.com/jaraco/tempora/
-	https://pypi.org/project/tempora/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest-freezer[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p freezer
-}
diff --git a/dev-python/tempora/tempora-5.8.0.ebuild b/dev-python/tempora/tempora-5.8.0.ebuild
index fa874b15fdde..3cd0cd6a3678 100644
--- a/dev-python/tempora/tempora-5.8.0.ebuild
+++ b/dev-python/tempora/tempora-5.8.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/terminaltables3/terminaltables3-4.0.0.ebuild b/dev-python/terminaltables3/terminaltables3-4.0.0.ebuild
index 6ffc94fde017..492556bd73cf 100644
--- a/dev-python/terminaltables3/terminaltables3-4.0.0.ebuild
+++ b/dev-python/terminaltables3/terminaltables3-4.0.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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index 03804b12f15c..4a50732f6b89 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,2 +1,2 @@
 DIST tifffile-2024.12.12.gh.tar.gz 354766 BLAKE2B f4f6a8be64a16dd2c34b9f1f80ac390a7211515f0b96b54a43e132b0040130689e6e7eccd1668ec7f112bc204efb89cfc9f5cc4d37f6168d8e64fa9c82c8b371 SHA512 ef4895739304d6cb0cb9f6af0156da1915105ab5a10dbb07e52ee7168b7bbd9f6f7e8f5d291aa6cb52df48d25064fb6f9a73495c8b80969048d64c05dcd74ff5
-DIST tifffile-2024.9.20.gh.tar.gz 355281 BLAKE2B 485418ce16bcc74c331b71a11ac4fdd82a3f67a0630bb9e70e8fc04cad1998ae46e13e5ba6c6ca3c7d7cee38396f199e5853681b968cdb515074110da706787d SHA512 f4840b40e59e66a6900b46576709c4910b20be0b820becc81b281540654b899e60a52bedf240a49c7f6140cbf91a268b9ba538fc3439715872f00e3603dffff2
+DIST tifffile-2025.1.10.gh.tar.gz 354970 BLAKE2B c646ea217a66b24f7afb8a4de86d2cecf9707caf94e8c8f82012bcb6cae89b49e37866c963900238c4f941ea31c66683db1cd7f0e9f531af62e1dd228c40d4da SHA512 568f0be93e84321a3dc2bed91a2f32477813d9416e356c9c9e139dbe628dfebb2ea3c395b6e5fd7bf9bdc681db0fa1eb0b0a82b502ea5afb9010d11558851ae1
diff --git a/dev-python/tifffile/tifffile-2024.9.20.ebuild b/dev-python/tifffile/tifffile-2024.9.20.ebuild
deleted file mode 100644
index a9bd677f4e53..000000000000
--- a/dev-python/tifffile/tifffile-2024.9.20.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read and write TIFF files"
-HOMEPAGE="
-	https://pypi.org/project/tifffile/
-	https://github.com/cgohlke/tifffile/
-	https://www.cgohlke.com/
-"
-SRC_URI="
-	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local -x SKIP_LARGE=1
-	local -x SKIP_HTTP=1
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/tifffile/tifffile-2025.1.10.ebuild b/dev-python/tifffile/tifffile-2025.1.10.ebuild
new file mode 100644
index 000000000000..acb6ec9229bb
--- /dev/null
+++ b/dev-python/tifffile/tifffile-2025.1.10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021-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="Read and write TIFF files"
+HOMEPAGE="
+	https://pypi.org/project/tifffile/
+	https://github.com/cgohlke/tifffile/
+	https://www.cgohlke.com/
+"
+SRC_URI="
+	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local -x SKIP_LARGE=1
+	local -x SKIP_HTTP=1
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/toml-fmt-common/toml-fmt-common-1.0.1.ebuild b/dev-python/toml-fmt-common/toml-fmt-common-1.0.1.ebuild
index 4772aae964e9..91a1eaa36710 100644
--- a/dev-python/toml-fmt-common/toml-fmt-common-1.0.1.ebuild
+++ b/dev-python/toml-fmt-common/toml-fmt-common-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/tomli-w/Manifest b/dev-python/tomli-w/Manifest
index f77287bc79a1..6030b78ccad7 100644
--- a/dev-python/tomli-w/Manifest
+++ b/dev-python/tomli-w/Manifest
@@ -1 +1,2 @@
 DIST tomli-w-1.1.0.gh.tar.gz 64682 BLAKE2B ca4cee4931f2df5ddf58cfdc2d28a20fcac7c7efe576dcbe43f2d30e0f5b9747f10632dd2b466fc769e2823896450876592cf518665f071cf6af55d9d3f94bb5 SHA512 0755004461017d3a62059ab74651c1fa0d2c67e224935760daa8d569b996db99e6c4077c92127b303a9026cf689d3db6a75cdb8d9178d9d3009b747b43ca2057
+DIST tomli-w-1.2.0.gh.tar.gz 65320 BLAKE2B d48174d177a5ed13880ba8c9c6beefae8ed43b0a3539441ecc17aa32af07428d9f7d2c2d185264a20f27ab2ab9b5085b91da120e49dfc17a0cf36b590ebfa81b SHA512 d7b5888d7e60eda701c4d3d02189b9e26467a647ed4e09f55ee325c6d62618de6a6b299de522d105decaee68fb9804968c59d4c911bdfb7520a0beb6c05f432b
diff --git a/dev-python/tomli-w/tomli-w-1.2.0.ebuild b/dev-python/tomli-w/tomli-w-1.2.0.ebuild
new file mode 100644
index 000000000000..2f7ec5bd9ea1
--- /dev/null
+++ b/dev-python/tomli-w/tomli-w-1.2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A lil' TOML writer"
+HOMEPAGE="
+	https://pypi.org/project/tomli-w/
+	https://github.com/hukkin/tomli-w/
+"
+SRC_URI="
+	https://github.com/hukkin/tomli-w/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/tomli[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests
+}
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 998bad17843f..327758210d2a 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,4 +1,2 @@
-DIST translate-3.14.2.gh.tar.gz 1175450 BLAKE2B db13e59036bd75a62847c68c4e2633a17152def48ccfd1d36531a0325b4b5d819711dab1cb3cfc23abc2e7201b348836434428ed155e6e593273ff8750038faa SHA512 7ae64bd93459b29e6a341ea8ded2993e02e277dbba48a0638eda28fff4dfcc9b490d0a669e277cb75c395f385e5a54feb0665919c27b1ab7c5cffd0add109d27
-DIST translate-3.14.3.gh.tar.gz 1174793 BLAKE2B 9aad67c2bc390083dcacca53a41b99adeff679db4d576c054d8298da0e5114e5204128c94ee924cf4e5851378b3cec7b99d52b2dd12c5ece86562d45d05c205d SHA512 6f584ea46aceb4080eda2b05e3fbe51d76667d8afcac8da4e0b7644965aa833617db031329e315cbb18c6194e289a9054f127814372e97535bc40d765d65316e
-DIST translate-3.14.4.gh.tar.gz 1174947 BLAKE2B 1a4f9b4b146145ef215ca0118c328c5c6153461b3f6899c665d1c69762bfe543ffffb7e590229b6d5ada5c5373b46484d4ebf6fbc4d9cac4b908174fde358d04 SHA512 4cb4b94f02858348c7e2e66cc3b0efa495084fbf03fb659ec701349f693c27647b11f2aefefca7b585b2c6e68a699149e85cedccbcf796e57edf825925e4f7d2
 DIST translate-3.14.5.gh.tar.gz 1175068 BLAKE2B d3627d8a69f98d01fceb3d8e233ff9d19238ff42aa5255e5f4b8372ecacb07f1cea02ff75c6e7e27eec684eeda207db83b91c6905edf7b82d93ca1a275db4564 SHA512 40467e48aeca0a51caf6baabce13a3daa3b643a5416a1dc8b8ce70198b7b6f13688f808c0e050ca2e2e6d977347dab59b454b6d9c537b4d615f623d5531bcc10
+DIST translate-3.14.6.gh.tar.gz 1175486 BLAKE2B 3cfd844815adcd7ac24a41df41f3e717d7afa7c19f4e4467f9ce7892ec9adb321ed2e499358cdaa294c5a5d8ca8e20271ac47cc598b8e7585c290eea8e9b8235 SHA512 a2e23c4ec29e61fdcc0c28e7789478d595a11751c6117b7b5cc9191deec01e31309cea8a6e39c81635105b8b6b10c34533af5b91b736f7c2bbd4780146b79b3d
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.14.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.14.2.ebuild
deleted file mode 100644
index 9eb3702f7c4b..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.14.2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="
-	https://github.com/translate/translate/
-	https://pypi.org/project/translate-toolkit/
-"
-SRC_URI="
-	https://github.com/translate/translate/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/mistletoe-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	>=dev-python/cwcwidth-0.1.9[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-# Technically, the test suite also has undeclared dependency
-# on dev-python/snapshottest but all the tests using it are broken
-# anyway, so we skip them.
-BDEPEND="
-	test? (
-		dev-python/phply[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# unfortunately, this bad quality package doesn't support XDG_DATA_DIRS
-	# correctly, so we need to reassemble all data files in a single directory
-	local -x XDG_DATA_HOME=${T}/share
-	cp -r translate/share "${T}/" || die
-	cp -r "${ESYSROOT}/usr/share"/gaupol "${XDG_DATA_HOME}"/ || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-		# all tests based on snapshottest are broken and I'm too tired
-		# to figure this out
-		tests/translate/tools/test_pocount.py::test_{cases,output}
-		tests/translate/tools/test_junitmsgfmt.py::test_output
-		# gettext 0.23
-		# https://github.com/translate/translate/issues/5436
-		tests/translate/storage/test_cpo.py::TestCPOFile::test_wrap_gettext
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		tests/translate/storage/test_fluent.py
-		# changes directory and does not change it back, sigh
-		tests/odf_xliff/test_odf_xliff.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr
-	doins -r translate/share
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.14.3.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.14.3.ebuild
deleted file mode 100644
index fc68f99127cf..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.14.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="
-	https://github.com/translate/translate/
-	https://pypi.org/project/translate-toolkit/
-"
-SRC_URI="
-	https://github.com/translate/translate/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/mistletoe-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	>=dev-python/cwcwidth-0.1.9[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-# Technically, the test suite also has undeclared dependency
-# on dev-python/snapshottest but all the tests using it are broken
-# anyway, so we skip them.
-BDEPEND="
-	test? (
-		dev-python/phply[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# unfortunately, this bad quality package doesn't support XDG_DATA_DIRS
-	# correctly, so we need to reassemble all data files in a single directory
-	local -x XDG_DATA_HOME=${T}/share
-	cp -r translate/share "${T}/" || die
-	cp -r "${ESYSROOT}/usr/share"/gaupol "${XDG_DATA_HOME}"/ || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-		# all tests based on snapshottest are broken and I'm too tired
-		# to figure this out
-		tests/translate/tools/test_pocount.py::test_{cases,output}
-		tests/translate/tools/test_junitmsgfmt.py::test_output
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		tests/translate/storage/test_fluent.py
-		# changes directory and does not change it back, sigh
-		tests/odf_xliff/test_odf_xliff.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr
-	doins -r translate/share
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.14.4.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.14.4.ebuild
deleted file mode 100644
index fc68f99127cf..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.14.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="
-	https://github.com/translate/translate/
-	https://pypi.org/project/translate-toolkit/
-"
-SRC_URI="
-	https://github.com/translate/translate/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/mistletoe-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	>=dev-python/cwcwidth-0.1.9[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-# Technically, the test suite also has undeclared dependency
-# on dev-python/snapshottest but all the tests using it are broken
-# anyway, so we skip them.
-BDEPEND="
-	test? (
-		dev-python/phply[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# unfortunately, this bad quality package doesn't support XDG_DATA_DIRS
-	# correctly, so we need to reassemble all data files in a single directory
-	local -x XDG_DATA_HOME=${T}/share
-	cp -r translate/share "${T}/" || die
-	cp -r "${ESYSROOT}/usr/share"/gaupol "${XDG_DATA_HOME}"/ || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-		# all tests based on snapshottest are broken and I'm too tired
-		# to figure this out
-		tests/translate/tools/test_pocount.py::test_{cases,output}
-		tests/translate/tools/test_junitmsgfmt.py::test_output
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		tests/translate/storage/test_fluent.py
-		# changes directory and does not change it back, sigh
-		tests/odf_xliff/test_odf_xliff.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr
-	doins -r translate/share
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.14.5.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.14.5.ebuild
index fc68f99127cf..7d7997a48816 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.14.5.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.14.5.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 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 
 RDEPEND="
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.14.6.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.14.6.ebuild
new file mode 100644
index 000000000000..9af4d0313f20
--- /dev/null
+++ b/dev-python/translate-toolkit/translate-toolkit-3.14.6.ebuild
@@ -0,0 +1,119 @@
+# 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..12} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+MY_P=translate-${PV}
+DESCRIPTION="Toolkit to convert between many translation formats"
+HOMEPAGE="
+	https://github.com/translate/translate/
+	https://pypi.org/project/translate-toolkit/
+"
+SRC_URI="
+	https://github.com/translate/translate/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+html +ical +ini +subtitles +yaml"
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	dev-python/cheroot[${PYTHON_USEDEP}]
+	>=dev-python/levenshtein-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/mistletoe-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	>=dev-python/cwcwidth-0.1.9[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
+	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
+	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
+	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
+	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
+"
+# Technically, the test suite also has undeclared dependency
+# on dev-python/snapshottest but all the tests using it are broken
+# anyway, so we skip them.
+BDEPEND="
+	test? (
+		dev-python/phply[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# unfortunately, this bad quality package doesn't support XDG_DATA_DIRS
+	# correctly, so we need to reassemble all data files in a single directory
+	local -x XDG_DATA_HOME=${T}/share
+	cp -r translate/share "${T}/" || die
+	cp -r "${ESYSROOT}/usr/share"/gaupol "${XDG_DATA_HOME}"/ || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Fails with network-sandbox (and even with it off but w/ softer fail)
+		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
+		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
+		# all tests based on snapshottest are broken and I'm too tired
+		# to figure this out
+		tests/translate/tools/test_pocount.py::test_{cases,output}
+		tests/translate/tools/test_junitmsgfmt.py::test_output
+	)
+	local EPYTEST_IGNORE=(
+		# unpackaged fluent.*
+		tests/translate/storage/test_fluent.py
+		# changes directory and does not change it back, sigh
+		tests/odf_xliff/test_odf_xliff.py
+	)
+
+	if ! use ini; then
+		EPYTEST_IGNORE+=(
+			translate/convert/test_ini2po.py
+			translate/convert/test_po2ini.py
+		)
+	fi
+
+	if ! use subtitles; then
+		EPYTEST_IGNORE+=(
+			translate/storage/test_subtitles.py
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr
+	doins -r translate/share
+
+	if ! use html; then
+		rm "${ED}"/usr/bin/{html2po,po2html} || die
+	fi
+	if ! use ical; then
+		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
+	fi
+	if ! use ini; then
+		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
+	fi
+	if ! use subtitles; then
+		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
+	fi
+}
diff --git a/dev-python/trio/Manifest b/dev-python/trio/Manifest
index 9a402d9a1b56..0571d61b7837 100644
--- a/dev-python/trio/Manifest
+++ b/dev-python/trio/Manifest
@@ -1,2 +1 @@
-DIST trio-0.27.0.gh.tar.gz 617781 BLAKE2B 343e7e351c34cfa6176d9ae46ad2c4311793f47b8032713efbdc5ed1d152552260002a59b8e02e256a8241a32a9d21505f4354340bcca88a62ca16e8dc5c8a01 SHA512 10fb7b14a7dcccc7a8f04793a1c6992449bd9934726f5a2648fde2533a33cb38468ecd0de8f098544174d51046400bae32b435ed432085cf4d631c9feef88058
 DIST trio-0.28.0.gh.tar.gz 590844 BLAKE2B 4e9f89e0fd68db37bb07ee045809af8795216809885f79f6f247c7711be87995546f2db5a957f7ee5927edc60a442ed6d60a41cec7a559dd4acbc34d20435ba0 SHA512 2699cb55e237247737704852c34be6726746e35426c9a2ed3ca1a5e612a64fec0bd59e259bec4e88e1eb85c8d5a05e3f238346d8227ca0f9fcab271efe45bdd0
diff --git a/dev-python/trio/trio-0.27.0.ebuild b/dev-python/trio/trio-0.27.0.ebuild
deleted file mode 100644
index d7a0315ad2ad..000000000000
--- a/dev-python/trio/trio-0.27.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for async concurrency and I/O"
-HOMEPAGE="
-	https://github.com/python-trio/trio/
-	https://pypi.org/project/trio/
-"
-SRC_URI="
-	https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/attrs-23.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.2.1[${PYTHON_USEDEP}]
-	' 3.10)
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/outcome[${PYTHON_USEDEP}]
-	>=dev-python/sniffio-1.3.0[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/astor-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/immutables-0.6[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-# Bug https://bugs.gentoo.org/916756
-# distutils_enable_sphinx docs/source \
-# 	dev-python/immutables \
-# 	dev-python/sphinxcontrib-trio \
-# 	dev-python/sphinx-rtd-theme \
-# 	dev-python/towncrier
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Times out on slower arches (ia64 in this case)
-		# https://github.com/python-trio/trio/issues/1753
-		tests/test_unix_pipes.py::test_close_at_bad_time_for_send_all
-		# requires ruff
-		_tests/tools/test_gen_exports.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	rm -rf trio || die
-	epytest -p trio._tests.pytest_plugin \
-		-m "not redistributors_should_skip" \
-		--pyargs trio \
-		--skip-optional-imports
-}
diff --git a/dev-python/trio/trio-0.28.0.ebuild b/dev-python/trio/trio-0.28.0.ebuild
index 01b349cf4ec8..5b98b5989227 100644
--- a/dev-python/trio/trio-0.28.0.ebuild
+++ b/dev-python/trio/trio-0.28.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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 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"
 
 RDEPEND="
 	>=dev-python/attrs-23.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
index 0a5af0537dad..6ed054edbf85 100644
--- a/dev-python/trove-classifiers/Manifest
+++ b/dev-python/trove-classifiers/Manifest
@@ -1 +1,4 @@
 DIST trove_classifiers-2024.10.21.16.tar.gz 16153 BLAKE2B 9170a2f78b41d2d6793a5bbf7df7ce2ae4c1d70a193a92874bf74cad5a083d8153a9cd8ae42c85da3cdedc690c485aff8d864626efdb52965301f2a377ebb048 SHA512 4fca7cc5d172ddcb210bfbd6e993fc3d7243887762ba37c05aca3d6c5fcece8f573372704160c8048eb39c68d284fe808ca289c8c07564b06334bed6bafdc61e
+DIST trove_classifiers-2025.1.10.15.tar.gz 16251 BLAKE2B 38e4cf90c855762fe2fda81c7bb4099127e0d6e92b160026b0b29a1da211d8ae6f63c3002e37aed5abbbdc77f1d715d116aa44a2db0c3a020881d0199c2793b7 SHA512 d07e3c68e08c7a9488bc05f59762eaf70934c7645b4714860944e720b43cad20ca844d6d40eb468a40b7127080c11f526ed688a1fd38181a1701a7fa2eea5223
+DIST trove_classifiers-2025.1.15.22.tar.gz 16236 BLAKE2B 23003b48c5f6b919559c3355b9eda56d229c5e19420368200952ab9a81a6ca850c779788ccb3c9340bd08e11f9c1da6ea67ecc180c206216313064881d3469f8 SHA512 460df4327866ea6ef19ea04e9ea4dd746eb733ceafec0db9920b1e6eb1649abfcc914f4e103700072696846c4af4c85003a1ef6323b4605a8f1659126d459503
+DIST trove_classifiers-2025.1.7.14.tar.gz 16130 BLAKE2B 7c5278e30dd939bfdf8795a8d73a50293a64f3e1c0784fda44d546d9c70ec98c69e88a87160517e6d759597b06e9728b53ac9bb26b9e8ac2995d4356c245a2d9 SHA512 06210009c52e6d4bb070f40052a396a48d9643b09864d2ac370449a91200818aabb595703048b3cb1fb97551e8e86d17b4cccbc3dbc19b34d199bdcbe50c3d96
diff --git a/dev-python/trove-classifiers/trove-classifiers-2025.1.10.15.ebuild b/dev-python/trove-classifiers/trove-classifiers-2025.1.10.15.ebuild
new file mode 100644
index 000000000000..6b9c9bfd7c08
--- /dev/null
+++ b/dev-python/trove-classifiers/trove-classifiers-2025.1.10.15.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{10..13} python3_13t )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
+HOMEPAGE="
+	https://github.com/pypa/trove-classifiers/
+	https://pypi.org/project/trove-classifiers/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+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"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease hatchling bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "trove-classifiers"
+		version = "${PV}"
+		description = "Canonical source for classifiers on PyPI (pypi.org)."
+	EOF
+}
+
+python_test() {
+	epytest
+	"${EPYTHON}" -m tests.lib || die
+}
diff --git a/dev-python/trove-classifiers/trove-classifiers-2025.1.15.22.ebuild b/dev-python/trove-classifiers/trove-classifiers-2025.1.15.22.ebuild
new file mode 100644
index 000000000000..6b9c9bfd7c08
--- /dev/null
+++ b/dev-python/trove-classifiers/trove-classifiers-2025.1.15.22.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{10..13} python3_13t )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
+HOMEPAGE="
+	https://github.com/pypa/trove-classifiers/
+	https://pypi.org/project/trove-classifiers/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+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"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease hatchling bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "trove-classifiers"
+		version = "${PV}"
+		description = "Canonical source for classifiers on PyPI (pypi.org)."
+	EOF
+}
+
+python_test() {
+	epytest
+	"${EPYTHON}" -m tests.lib || die
+}
diff --git a/dev-python/trove-classifiers/trove-classifiers-2025.1.7.14.ebuild b/dev-python/trove-classifiers/trove-classifiers-2025.1.7.14.ebuild
new file mode 100644
index 000000000000..6b9c9bfd7c08
--- /dev/null
+++ b/dev-python/trove-classifiers/trove-classifiers-2025.1.7.14.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{10..13} python3_13t )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
+HOMEPAGE="
+	https://github.com/pypa/trove-classifiers/
+	https://pypi.org/project/trove-classifiers/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+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"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease hatchling bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "trove-classifiers"
+		version = "${PV}"
+		description = "Canonical source for classifiers on PyPI (pypi.org)."
+	EOF
+}
+
+python_test() {
+	epytest
+	"${EPYTHON}" -m tests.lib || die
+}
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 0c834fad7db6..b24494f778ef 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,2 +1 @@
-DIST trustme-1.2.0.tar.gz 26350 BLAKE2B 885b96d8ef63a8bf0b96583ecac2c19148f7df28a9e2ad8816fe0d0f752718bb91d84f3d01a7e73663133a3094eb8199ad6eea609e27958db4720a14ff62b1be SHA512 84cfa02cf00bac1a304dacbae8b3d673307d066116e38c396f25fb868174f020c415921d4c56a6a37354e5205f294cf95611a8c4f2b02f82dda2aa9b2e80192b
 DIST trustme-1.2.1.tar.gz 26844 BLAKE2B 83512726438b191e131d3aec847fa80a799463447f1be3586a32bae604d0fc26c8d3d68366c80df4a77661e9ce073c857c1df5bce4fd6ecdb46f22bd63ec410e SHA512 3dc5158294d79603378a281e706ea6b376833a40621c211f12c383bc1ef0720b2b6c1441eadab43292cbeee34aaa4618ed8ce4b8dedc4ca6f1faa14e4cb485bc
diff --git a/dev-python/trustme/trustme-1.2.0.ebuild b/dev-python/trustme/trustme-1.2.0.ebuild
deleted file mode 100644
index 800e2c9be560..000000000000
--- a/dev-python/trustme/trustme-1.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
-HOMEPAGE="
-	https://github.com/python-trio/trustme/
-	https://pypi.org/project/trustme/
-"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/cryptography-3.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/service-identity[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/trustme/trustme-1.2.1.ebuild b/dev-python/trustme/trustme-1.2.1.ebuild
index bed09f8539e3..a97a7087dfd3 100644
--- a/dev-python/trustme/trustme-1.2.1.ebuild
+++ b/dev-python/trustme/trustme-1.2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/cryptography-3.1[${PYTHON_USEDEP}]
diff --git a/dev-python/truststore/truststore-0.10.0.ebuild b/dev-python/truststore/truststore-0.10.0.ebuild
index fe7b85a05f6f..c0bd1f766c98 100644
--- a/dev-python/truststore/truststore-0.10.0.ebuild
+++ b/dev-python/truststore/truststore-0.10.0.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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 # The vast majority of tests require Internet access.
 PROPERTIES="test_network"
 RESTRICT="test"
diff --git a/dev-python/twisted/twisted-24.11.0.ebuild b/dev-python/twisted/twisted-24.11.0.ebuild
index db7fa420f946..8146dc5bc40b 100644
--- a/dev-python/twisted/twisted-24.11.0.ebuild
+++ b/dev-python/twisted/twisted-24.11.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
@@ -22,7 +22,7 @@ SRC_URI+="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="conch http2 serial ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/types-psutil/types-psutil-6.1.0.20241221.ebuild b/dev-python/types-psutil/types-psutil-6.1.0.20241221.ebuild
index 5713f7e7b7b9..ddcc02fe9116 100644
--- a/dev-python/types-psutil/types-psutil-6.1.0.20241221.ebuild
+++ b/dev-python/types-psutil/types-psutil-6.1.0.20241221.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,4 +13,4 @@ HOMEPAGE="https://pypi.org/project/types-psutil/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/types-setuptools/Manifest b/dev-python/types-setuptools/Manifest
index 5f091c1488f4..2f154902983e 100644
--- a/dev-python/types-setuptools/Manifest
+++ b/dev-python/types-setuptools/Manifest
@@ -1,2 +1,2 @@
-DIST types_setuptools-75.6.0.20241126.tar.gz 48569 BLAKE2B 0e896fa128c5799b14dcca2fdc7385c09223652f775bc0928b21ee7992e0f34c0e057a63ccc99065b48dd19cecccdf57423cad682060014a0e0c62d396d55f3d SHA512 89d2705fd69e117345d04f5f735c00d7365bae1ced78cfab3a210a69847df8be134fb25092db563b5d83621f5e8524e8abeab368c531186282f70dc9d7ac40ab
 DIST types_setuptools-75.6.0.20241223.tar.gz 48063 BLAKE2B ecd24e67fe4df358a88c3de2f7cbbc003febbba4216cab3913d5672112d15d88767bd695ee918eff5790918ce749bd2359b8b159ef2e182cbf387b4e0f11dd51 SHA512 5251c28cd36c5e0ed3353ecf76c15bef567488286ebf839a60410a100456a85edd56a4c5d72fd15ac718a8abe57d71958252a9811d6c1a2eeab50c2591ae5510
+DIST types_setuptools-75.8.0.20250110.tar.gz 48185 BLAKE2B d6db261fe44fe7bd05670c5cd6519d4ea4825e97af0d3663ebe0538496d2816af81dff9bab3e7f51641d07b4d185e75e87d5dbda77f244019488384d5db6d56a SHA512 fe9ce44c59b237f75af5f38f6efdb63fba142673cfd9f8b765f825d2d52154dda4c3d4fe8dd0bd7a22448192a4bbb90e02cb31619c473e1e7d9f0df39959c326
diff --git a/dev-python/types-setuptools/types-setuptools-75.6.0.20241126.ebuild b/dev-python/types-setuptools/types-setuptools-75.6.0.20241126.ebuild
deleted file mode 100644
index 4408778058d4..000000000000
--- a/dev-python/types-setuptools/types-setuptools-75.6.0.20241126.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for setuptools"
-HOMEPAGE="https://pypi.org/project/types-setuptools/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/types-setuptools/types-setuptools-75.6.0.20241223.ebuild b/dev-python/types-setuptools/types-setuptools-75.6.0.20241223.ebuild
index c03ab94d7227..ceb64b48dfd9 100644
--- a/dev-python/types-setuptools/types-setuptools-75.6.0.20241223.ebuild
+++ b/dev-python/types-setuptools/types-setuptools-75.6.0.20241223.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,4 +13,4 @@ HOMEPAGE="https://pypi.org/project/types-setuptools/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/types-setuptools/types-setuptools-75.8.0.20250110.ebuild b/dev-python/types-setuptools/types-setuptools-75.8.0.20250110.ebuild
new file mode 100644
index 000000000000..8149f98d4409
--- /dev/null
+++ b/dev-python/types-setuptools/types-setuptools-75.8.0.20250110.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2023-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="Typing stubs for setuptools"
+HOMEPAGE="https://pypi.org/project/types-setuptools/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/typogrify/Manifest b/dev-python/typogrify/Manifest
index f55f3ea5ae75..6bf3facbfc00 100644
--- a/dev-python/typogrify/Manifest
+++ b/dev-python/typogrify/Manifest
@@ -1 +1,2 @@
 DIST typogrify-2.0.7.tar.gz 12903 BLAKE2B e08b27a531f21e99d5a35c47c1deb94bc7f67e31a47789ba4750520c893633966b1319a731c81ab2435e7024aea1e8fd0b46a52bbb73a050cdf83a1588644d18 SHA512 6212024a88372f1b14e5932c0541ec4d5a2ada7514c1327dc8f3775cd7adf3372cae0037c4310ed4a03fd0657a91eb4c0d114b74172190f7f84d82908441ddd0
+DIST typogrify-2.1.0.tar.gz 28622 BLAKE2B b3ca5fa5c518bcbf508bd30bfca665c222809e8760e04b0aaec34e87e1dc137391b66bbf99d601b168c7178bd10273625d209ba5bcbddb9742b3c4cc9b2161f8 SHA512 25d7e52f370928b542d5202bd64dfd461f4ba81a92c8ca74423faa8bf852ad859fc5291847a0b3c69252d671257249474aa4639f032c6a9635f42e35b82af48e
diff --git a/dev-python/typogrify/typogrify-2.1.0.ebuild b/dev-python/typogrify/typogrify-2.1.0.ebuild
new file mode 100644
index 000000000000..da55e13a799e
--- /dev/null
+++ b/dev-python/typogrify/typogrify-2.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Filters for web typography, supporting Django & Jinja templates"
+HOMEPAGE="
+	https://github.com/mintchaos/typogrify/
+	https://pypi.org/project/typogrify/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/smartypants-1.8.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest --doctest-modules \
+		typogrify/filters.py \
+		typogrify/packages/titlecase/tests.py
+}
diff --git a/dev-python/ujson/ujson-5.10.0.ebuild b/dev-python/ujson/ujson-5.10.0.ebuild
index 6ee232e9116a..0a5b556c781d 100644
--- a/dev-python/ujson/ujson-5.10.0.ebuild
+++ b/dev-python/ujson/ujson-5.10.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-libs/double-conversion:=
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 230f6353f518..5a560f0a210f 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,3 +1,2 @@
 DIST hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.gh.tar.gz 156216 BLAKE2B fcb5f49653401e6e4079e1c770d3cd407602d4d6764437b735bd4ec04191dec59cdc930822fa2aff726ee25cddd0f71fd457dedf31026bff1da121d93af8b768 SHA512 62d6787d88a2e716f0ac04fc49f6cdc586e473a660ee754ff66961922ae78bcc75d1f78b091e78557dd60f006e8e480114738c7b4ff71beac804e4fc9603240b
-DIST urllib3-2.2.3.tar.gz 300677 BLAKE2B 7eb17ab324bf210fb52b1012bf9d37c1a7f3b742aafe7e49adf2dde1678089e94683feedaa2301dd510944da0a5afc331ded13d0631af3efe4dbd576d0dee0ec SHA512 f461cc959d675b8b13c2f40f4b021cab01ccb3a5033143f5c3eae3fce7486115994d198c78db9ef353fce47c17b25e0ecb010fbdebc1b8731d4fd708054b39cc
 DIST urllib3-2.3.0.tar.gz 307268 BLAKE2B 516c3b8b538682bf7b37324568757cf033df0d6a785f5fe0cdb3eaa81c68532958dd0801a007508523ca9674ec2b8ea3c9130c44b6742f6e05e9dc929ba41d01 SHA512 cf33a9082c304d8782fa054412686f9fac65fa860404243b72c75374f7459bf6c7668297b37b5fadc978f9a85b3e7653ddc7b2c415903f7eee5a70fe9ae281cb
diff --git a/dev-python/urllib3/urllib3-2.2.3.ebuild b/dev-python/urllib3/urllib3-2.2.3.ebuild
deleted file mode 100644
index 31a214a682ec..000000000000
--- a/dev-python/urllib3/urllib3-2.2.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_TESTED=( python3_{10..13} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-# The package has a test dependency on their own hypercorn fork.
-HYPERCORN_COMMIT=d1719f8c1570cbd8e6a3719ffdb14a4d72880abb
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-SRC_URI+="
-	test? (
-		https://github.com/urllib3/hypercorn/archive/${HYPERCORN_COMMIT}.tar.gz
-			-> hypercorn-${HYPERCORN_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="brotli http2 test zstd"
-RESTRICT="!test? ( test )"
-
-# [secure] extra is deprecated and slated for removal, we don't need it:
-# https://github.com/urllib3/urllib3/issues/2680
-RDEPEND="
-	>=dev-python/pysocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/pysocks-2.0[${PYTHON_USEDEP}]
-	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
-	http2? (
-		<dev-python/h2-5[${PYTHON_USEDEP}]
-		>=dev-python/h2-4[${PYTHON_USEDEP}]
-	)
-	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/freezegun[\${PYTHON_USEDEP}]
-			dev-python/h2[\${PYTHON_USEDEP}]
-			dev-python/httpx[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-rerunfailures[\${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[\${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[\${PYTHON_USEDEP}]
-			dev-python/quart[\${PYTHON_USEDEP}]
-			dev-python/quart-trio[\${PYTHON_USEDEP}]
-			dev-python/trio[\${PYTHON_USEDEP}]
-			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=dev-python/zstandard-0.18.0[\${PYTHON_USEDEP}]
-		" "${PYTHON_TESTED[@]}")
-	)
-"
-
-src_prepare() {
-	# upstream considers 0.5 s to be "long" for a timeout
-	# we get tons of test failures on *fast* systems because of that
-	sed -i -e '/LONG_TIMEOUT/s:0.5:5:' test/__init__.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTHONPATH=${WORKDIR}/hypercorn-${HYPERCORN_COMMIT}/src
-	local -x CI=1
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# TODO: timeouts
-		test/contrib/test_pyopenssl.py::TestSocketClosing::test_timeout_errors_cause_retries
-		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local EPYTEST_XDIST=1
-	epytest -p timeout -p rerunfailures --reruns=10 --reruns-delay=2
-}
diff --git a/dev-python/urllib3/urllib3-2.3.0.ebuild b/dev-python/urllib3/urllib3-2.3.0.ebuild
index 491feb6fc739..756f5fa189cf 100644
--- a/dev-python/urllib3/urllib3-2.3.0.ebuild
+++ b/dev-python/urllib3/urllib3-2.3.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
 
 # please keep this ebuild at EAPI 8 -- sys-apps/portage dep
@@ -27,7 +27,7 @@ SRC_URI+="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="brotli http2 test zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/urwidtrees/urwidtrees-1.0.3-r2.ebuild b/dev-python/urwidtrees/urwidtrees-1.0.3-r2.ebuild
index 7d46fa388d5a..9a0f420d48b6 100644
--- a/dev-python/urwidtrees/urwidtrees-1.0.3-r2.ebuild
+++ b/dev-python/urwidtrees/urwidtrees-1.0.3-r2.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..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index a1e7dd1f072c..5f69d954b30e 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -1,17 +1,16 @@
-DIST pubgrub-05e8d12cea8d72c6d2d017900e478d0abd28fef4.gh.tar.gz 97027 BLAKE2B b8f5a454dce1b845f4d2ad562a5858e490ef25874b950d12336cdafe2d52dd44e83e86be13ed9637ee8dd1bf312114b1cf07e54523292e24b182c6ae999b398d SHA512 010180c7a294be0727647489cef0dde7024f92d827409872fe596471eb44451ac4a08dc4928fbc774a8b04c944b7daffc4684b0d868eee904222cbf673299f62
 DIST pubgrub-57832d0588fbb7aab824813481104761dc1c7740.gh.tar.gz 95600 BLAKE2B 8bdf971091d6816c326925c4603aa9296d6a92c2ede6a6245e0e5e64b741863e5d93aac03990004c13bd592d3d6ca2c662500e4c8d33e9959d6df9e1023a41e5 SHA512 8eae3c00928d921ca7cfdeff124962e477ae32387fb4b1ebfecd968181ec6bb2c2d96c918d8a9f521f1b9666eb6272c9f982b444d22a432f9471414f081694ee
 DIST pubgrub-648aa343486e5529953153781fc86025c73c4a61.gh.tar.gz 99073 BLAKE2B 86252bb78e0f832ce77040d86b188b4dd0637acd68e28c8b87fa36ab7cc23c5e296d0f634647d407bcd7fc24bf6c34d281de1744608ff0fd2741428bb0bf55a8 SHA512 8386273deca98df82c95931159848fa159ea4dbb75b8bba539cfe73f91e87340bc0e8048f1a4483148b021bb99d6a3b90275d9bb1cedccf153a7ebc29bd70e17
 DIST rs-async-zip-c909fda63fcafe4af496a07bfda28a5aae97e58d.gh.tar.gz 51763 BLAKE2B 59d053bc6692014d884a9247dea1b57a8789469ba2abbcc92ec21bb0022cbd74874afc463082156ab697aa6c80635019857a5d7e2dc150274e8b04d720518c36 SHA512 3a309566f4925b02496fcf19bc2865968edf6fb65082ca4079d2cee79e6b0353a1910c079f2afe656da0d0f6ddde5102052a221ea35a7dabc6d690a11218b20a
 DIST tl-6e25b2ee2513d75385101a8ff9f591ef51f314ec.gh.tar.gz 37106 BLAKE2B c30d1c33f6f52e2bc83823eb6319f8a3e462b7c7408fb6a08f995747857ef234f81db4135a04f9d183095fe473a4087f8f0cb89d8f87ef4400285d2ce034ec22 SHA512 4abbc4240ed129c92da8d616e27a6df0f24cdc85a0803acfdae588ca91f9e5b8d482e3ac88b2e657ff68917b1b43cef1e7ef3c887f624659b231fa5a13fcae68
-DIST uv-0.5.10-crates.tar.xz 46466896 BLAKE2B 94093c9d74732dba6516a80fa24c3af8e91df7c97fce4eb7f1914d278060459c09d5c136d5b0a6eba1533f77f4310150761024fd76fded46815c1250b2c2397e SHA512 cef96bee97c01ce43e0274094524f08d51b6c5e26b29e777d5b7462a6cb40b1b0d03e63460cffffdaa217cdb9a8153f608a242d937ad71e55e24f37ad5b83471
-DIST uv-0.5.11.gh.tar.gz 3145749 BLAKE2B 7473182f05accb38a2253327f95d874a62defdd43f7b1937e0f03674882c2fc2daaca5b5087a870bc72200342fd0b423c7ffc29dea91959cc6237c241e5b6c73 SHA512 a6f8fea5d30a387e3f7efcdd3b5f721567d48fa55f16ac67cd26f67eff17cd892ba1f4e0f774f8911e679100bcc3e2a9adb8fde7d1082cf3a1419f4227e85a03
-DIST uv-0.5.12-crates.tar.xz 46555948 BLAKE2B 24a69983cd75b3bf3ad7c15503afc4bde7b80a70789630e6b123bf91abffb15b18803d613d81d354842de4a1b522db9aff1c9821722ff6f7188c43577df625b1 SHA512 a30e535e40a67cac18fcdaf9215a43cf870d4d992be9c4a6863c9264d6b8cb29fcc79d11f8757aa70c6701e4e9f06a8281c188b34c0f5ed52d07c034cff8b98c
-DIST uv-0.5.12.gh.tar.gz 3174790 BLAKE2B 5b9ddf4d70e5534731bc50ba168aaa16a3a5321887613d6cc4141e767f1122f8c5bcaf3a2ace3be11e28e61a8eb3ddd7d910a40071ae3cadb57cffbefed087df SHA512 9623b8ece53a4ab9fa3ea2a5f4cffdc3da13645a460b59cd97dcbda9a48247bfbd9fb2316363c7f9c78869cd888511cbcdc528413e6be1ffbca8d9ece210d5ff
-DIST uv-0.5.13-crates.tar.xz 46487696 BLAKE2B 88805f95f170f3417fdc9c98b09fab73d9196ba105edd22eaea261afadf962503acdf1dee349992c16932354f8e44166f2c241ef384f8e06b8f869d89f7f4d79 SHA512 d9b84064f628e5ff1858964e61c5288ab2247c7590a745d7e7d3b00eebc457bb0e52bd8aa5b9d82b37519089d098ba0e0267dc97118c55d1fb86548b2241ddaa
-DIST uv-0.5.13.gh.tar.gz 3175346 BLAKE2B 86dc0b635062e17b7cb35529ba71b173b3e4d89ba8cbc747a61c3eb03a2fc751726af1f07cc20bc31b759706a893a10b9ceda9ab579dc5d1ac84a61be9ec7d4c SHA512 9dfc771c203fdb4440e38a4e8ec6d4221030c2d2eca463fb335ba8651fe702430c7497d58a0928215e3e17a20719db252959899874a38d13016f377185b5f49b
-DIST uv-0.5.14-crates.tar.xz 46533192 BLAKE2B 89451a3c162f80d4d8b9af369fe11d9661bdf06d7a5f624f91ba71d993c34faa5c412cdee352c483db0d617e2cef2db46e534a58e04cb6c741aa4a48e8d0ddf5 SHA512 dbb8d0715fb7f360dbb8d9f7af5db0a5c962bc7f91ba53edd44213074666e9abb090e2cf4d3d0e23343668028d1465c5769f24c773fef91b7d332c6d596c34b4
-DIST uv-0.5.14.gh.tar.gz 3182160 BLAKE2B c0839df464543f1ae9cf4f984c514709a44d6b11289a2dc37e33db5d15dc33c08f8bad4cfb8e62960feb63506e8395f9fa0038d6b28059677ada10be8baeaa76 SHA512 7604791df108feda9ce0a44d915785ca0520b5453c8a49c66881476606e2bf04b3d980d1200a64661decf2fa5580ba84d35bc8e766b273649f9734b5c2bbf20c
+DIST uv-0.5.15-crates.tar.xz 46668184 BLAKE2B a7f1509d03b4725bfad125b804f08f4bc57d5fa0cc7cc6128635ff8bde48ffc4a0f11cc4154877ca4b5efc8f670b7258744e8fa247367e17bf979d770622b0d5 SHA512 f8ebd846769ba0ef2f0692c6387dfcaa01f0116b15344ed666b9250c7e692dfd9fc2d37202d438e80043508af7db4a545cf7f32b47e87bc0de72cd4170818e2c
+DIST uv-0.5.15.gh.tar.gz 3188828 BLAKE2B f3c817d584e27121ec8d0e1727a4b55d05a5c9017e1df12afe603d48c66af8768fa0688a4d96375fe56556c12ffd4e2efc2ac0ba7a0745373d1d145feba0eabf SHA512 8a79c35c13dc6bf6264d3bda9967e4f32e6658ca6636de80ad07d26b2f83d58dda3c3e4e69d104cc3f9fb5b63cd89a719f196c454db5f71f8af00205cf0e6438
+DIST uv-0.5.16-crates.tar.xz 46968084 BLAKE2B d71602b2fbb5aab53917c893dbbf65024b9dd4578156667f992eecd91b034e229ed4107491e700c848e19ad64b98ac831cb1a22ef4c4e4fb39ab40dc0b73e5d1 SHA512 5c15a66deb335c52150215b587487825e7d997875635743a37a81f5cb56a52ad82a1a3f583308230f5be5e7b8a1a921aed62cfe4fd4768651041801fd8dba60e
+DIST uv-0.5.16.gh.tar.gz 3195545 BLAKE2B 47ed5f0ebf8c9ab5c6035a91083a665ed52066ec21025c94d889c0aaf915d080b1b827e6161ed5679763f609310bbf230c5bc7fa83b8466458da303852f919dd SHA512 78dba23b21d71037e13c00bc420db7c00435507911890985d677c396cf58a01a8c06d55887e46fbc59a200eab48fed3fab9bbe4972f146c8ca71bf57a0fb3a98
+DIST uv-0.5.17-crates.tar.xz 47012000 BLAKE2B 0cfc660d087a3e5ea8fc78a5e8a7f0992d1af29050183241c19cb2b934e942ccbd0ced96f342fc797d6b16eca680a94efabeedf21f3049b6b3923b0688dc7931 SHA512 e1da8528ccd233b3a842851998f62e4ed819affc3b1a7f89f5b9cb64df9ff8b6c4025ac6b14a4587ee645e9f6d210dec34d68ee5ddf1dd9a2a559d95c2a211e3
+DIST uv-0.5.17.gh.tar.gz 3229851 BLAKE2B ed463ce99e3ae32e846482cb4bc9d601bfe3953bd11e76b5803b5329eaf5a1e912a5a65fa07cbdb485839f63c0239fd657603f6954f304b48932b924b80af548 SHA512 6cab15b5c3f39844ddda0937257abd72c3878d745b0ae6a9f08dbfac64a7e35afb15e383c2b53d778a4d0dd7f28de9c9743f5b4f0d77905bac9a752db678c1bf
+DIST uv-0.5.18.gh.tar.gz 3230088 BLAKE2B 1244e352f2853dc66e8d99ce304b4b086d1f1b0c8c84fd06bb5c589e73ea0c82acbd477042a5f98da5229b6c4af81281d11b6397393001f7abe1c7218fc9af27 SHA512 3b0a709808155846a3d7d4ba1e916b93a6acc2c26a0a6fd0394f44791fbfe866adb15a1c4170893f7d9480568b87bcf3f38d1a445634376a4f7091f7eadda2b3
+DIST uv-0.5.20-crates.tar.xz 53845912 BLAKE2B 3ebe6099304f4520cba49bf36a7b900146b57740c6dcf783cf2f064707b5880041eac8ee0adf2e251819cb7f3ac3f2739dd89636a48618f6220bc21bdb7fd334 SHA512 fbfb6becb1008c5dbfd571871abe053721f4a9939f98e1d0b1c3c5ad405d1d4dcdd121986e12cdaab9e1ff7a9bc0353aa69345ddb2fbb8c0ac0a427bdbb6c9f9
+DIST uv-0.5.20.gh.tar.gz 3256266 BLAKE2B 595e8c6e868b469a3ec0366d77ce685feabd56351a276208d40f9f45e9b35e07df9b118766c1955d77cdacf80e4aeafb27fc16e668d8a48702ea68e906aa4a61 SHA512 388e406950266933e168a76399ff349b941caee38c99d49c866c191b3841936df8ed15564528bf351454f52f480a7bffce3e260d502d630e890609aa876b11c1
+DIST uv-0.5.21.gh.tar.gz 3260658 BLAKE2B 064f52d4c690d2992988ca1683ce2c5183c2662961b931519b84651bebedff90a5b64fd87052b79c591b62a8fa07691997c38cf2b636e9a0facfb5683e64627b SHA512 351bf2a76cc0ec10f254f9eab0df0c0f307594a7052388e3b793c8314d9119488c2ebaa20125021fe0bf54192ce17d7e69719832c17aa4c815a5d9d69521e225
 DIST uv-0.5.6-crates.tar.xz 46263172 BLAKE2B 73b1d2dc957f89f923dda09a8c038426041292c442ce253ff9110f996cd1e1f892a5a438d8e1c894fc0d823401cced0ddc8ad88b5e6a83199af7055a04ce85dc SHA512 c9d4f8085416bffb1e1872fd907d15a50cae0c0c5fba994d27b3acdc3c836dffd771558246573af4bb7467353a031ea56018d5ae1fbdffa4f63988462de00343
 DIST uv-0.5.6.gh.tar.gz 2952255 BLAKE2B b815b60b99f959751f5839365b8b210919247ad99bff93ee4d202bc152bd06b83a62914cfbf341bfddb5b2c87d9e546c5e2a6d1baff1599d0218160ee89de504 SHA512 fc8c7f4f60a3d2ce997341450daf20ad039ef379ac5dd4575f8db0327284bd8278419b66f8f9695f2701a9579ab004b5b60476bd8dc4c27314211f795118bc5a
-DIST uv-0.5.8-crates.tar.xz 46445240 BLAKE2B 119e471d7f9a851179e2e5d9cd15cb94476355e27db36b05378036b7f9a3e0021a33a2fd29ed9e5a67cd7d962783b3ea96145ca9092da0a6a114899ff2b712fd SHA512 d517fdc9e48b4cb4acacf1d3c986c7e348ee65c89cb5bdbd9c3947f66d450f7f59b5a4f5f0f45560d5241bc8f7756039014cf350a8aea22be876c197759e5aff
-DIST uv-0.5.9.gh.tar.gz 3127431 BLAKE2B fd3e1c31c232a535c4f4f1c8f58bc5609cfe87680da36261b0dccd0db40ac0287e7c04988476a916da6994659ec1a7a2eeceb0b1555a18d5ee96734cf2f0c257 SHA512 e022095b9014a6b760b6dd0dd37ca158cd3a4089faec74a14b8d7039a34e337a19e43b96bf1fc374999172f50031008c86476189adca9e45cebf353b573e557d
diff --git a/dev-python/uv/uv-0.5.11.ebuild b/dev-python/uv/uv-0.5.11.ebuild
deleted file mode 100644
index 021234b01c6e..000000000000
--- a/dev-python/uv/uv-0.5.11.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;05e8d12cea8d72c6d2d017900e478d0abd28fef4;pubgrub-%commit%'
-	[tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
-	[version-ranges]='https://github.com/astral-sh/pubgrub;05e8d12cea8d72c6d2d017900e478d0abd28fef4;pubgrub-%commit%/version-ranges'
-)
-
-RUST_MIN_VER="1.83.0"
-
-inherit cargo check-reqs
-
-CRATE_PV=0.5.10
-DESCRIPTION="A Python package installer and resolver, written in Rust"
-HOMEPAGE="
-	https://github.com/astral-sh/uv/
-	https://pypi.org/project/uv/
-"
-# pypi sdist misses scripts/, needed for tests
-SRC_URI="
-	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-if [[ ${PKGBUMPING} != ${PVR} ]]; then
-	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
-	"
-fi
-
-# most of the code
-LICENSE="|| ( Apache-2.0 MIT )"
-# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
-# Dependent crate licenses
-LICENSE+="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
-	MPL-2.0 Unicode-3.0 Unicode-DFS-2016 ZLIB
-"
-# ring crate
-LICENSE+=" openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-DEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		dev-lang/python:3.8
-		dev-lang/python:3.9
-		dev-lang/python:3.10
-		dev-lang/python:3.11
-		dev-lang/python:3.12
-		!!~dev-python/uv-0.5.0
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-check_space() {
-	local CHECKREQS_DISK_BUILD=3G
-	use debug && CHECKREQS_DISK_BUILD=9G
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	rust_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# enable system libraries where supported
-	export ZSTD_SYS_USE_PKG_CONFIG=1
-	# TODO: unbundle libz-ng-sys, tikv-jemalloc-sys?
-
-	# remove unbundled sources, just in case
-	find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die
-
-	# bzip2-sys requires a pkg-config file
-	# https://github.com/alexcrichton/bzip2-rs/issues/104
-	mkdir "${T}/pkg-config" || die
-	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
-	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
-		Name: bzip2
-		Version: 9999
-		Description:
-		Libs: -lbz2
-	EOF
-}
-
-src_configure() {
-	local myfeatures=(
-		git
-		pypi
-		python
-	)
-
-	cargo_src_configure --no-default-features
-}
-
-src_compile() {
-	cd crates/uv || die
-	cargo_src_compile
-}
-
-src_test() {
-	# work around https://github.com/astral-sh/uv/issues/4376
-	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
-	local -x COLUMNS=100
-	local -x PYTHONDONTWRITEBYTECODE=
-	# fix tests failing because of our config
-	local -x XDG_CONFIG_DIRS=${T}
-
-	cd crates/uv || die
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cd crates/uv || die
-	cargo_src_install
-
-	insinto /etc/xdg/uv
-	newins - uv.toml <<-EOF || die
-		# These defaults match Fedora, see:
-		# https://src.fedoraproject.org/rpms/uv/pull-request/18
-
-		# By default ("automatic"), uv downloads missing Python versions
-		# automatically and keeps them in the user's home directory.
-		# Disable that to make downloading opt-in, and especially
-		# to avoid unnecessarily fetching custom Python when the distro
-		# package would be preferable.  Python builds can still be
-		# downloaded manually via "uv python install".
-		#
-		# https://docs.astral.sh/uv/reference/settings/#python-downloads
-		python-downloads = "manual"
-
-		# By default ("managed"), uv always prefers self-installed
-		# Python versions over the system Python, independently
-		# of versions.  Since we generally expect users to use that
-		# to install old Python versions not in ::gentoo anymore,
-		# this effectively means that uv would end up preferring very
-		# old Python versions over the newer ones that are provided
-		# by the system.  Default to using the system versions to avoid
-		# this counter-intuitive behavior.
-		#
-		# https://docs.astral.sh/uv/reference/settings/#python-preference
-		python-preference = "system"
-	EOF
-}
diff --git a/dev-python/uv/uv-0.5.12.ebuild b/dev-python/uv/uv-0.5.12.ebuild
deleted file mode 100644
index 7eaa8c0ef6ae..000000000000
--- a/dev-python/uv/uv-0.5.12.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;648aa343486e5529953153781fc86025c73c4a61;pubgrub-%commit%'
-	[tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
-	[version-ranges]='https://github.com/astral-sh/pubgrub;648aa343486e5529953153781fc86025c73c4a61;pubgrub-%commit%/version-ranges'
-)
-
-RUST_MIN_VER="1.83.0"
-
-inherit cargo check-reqs
-
-CRATE_PV=${PV}
-DESCRIPTION="A Python package installer and resolver, written in Rust"
-HOMEPAGE="
-	https://github.com/astral-sh/uv/
-	https://pypi.org/project/uv/
-"
-# pypi sdist misses scripts/, needed for tests
-SRC_URI="
-	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-if [[ ${PKGBUMPING} != ${PVR} ]]; then
-	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
-	"
-fi
-
-# most of the code
-LICENSE="|| ( Apache-2.0 MIT )"
-# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
-# Dependent crate licenses
-LICENSE+="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
-	MPL-2.0 Unicode-3.0 Unicode-DFS-2016 ZLIB
-"
-# ring crate
-LICENSE+=" openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-DEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		dev-lang/python:3.8
-		dev-lang/python:3.9
-		dev-lang/python:3.10
-		dev-lang/python:3.11
-		dev-lang/python:3.12
-		!!~dev-python/uv-0.5.0
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-check_space() {
-	local CHECKREQS_DISK_BUILD=3G
-	use debug && CHECKREQS_DISK_BUILD=9G
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	rust_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# enable system libraries where supported
-	export ZSTD_SYS_USE_PKG_CONFIG=1
-	# TODO: unbundle libz-ng-sys, tikv-jemalloc-sys?
-
-	# remove unbundled sources, just in case
-	find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die
-
-	# bzip2-sys requires a pkg-config file
-	# https://github.com/alexcrichton/bzip2-rs/issues/104
-	mkdir "${T}/pkg-config" || die
-	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
-	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
-		Name: bzip2
-		Version: 9999
-		Description:
-		Libs: -lbz2
-	EOF
-}
-
-src_configure() {
-	local myfeatures=(
-		git
-		pypi
-		python
-	)
-
-	cargo_src_configure --no-default-features
-}
-
-src_compile() {
-	cd crates/uv || die
-	cargo_src_compile
-}
-
-src_test() {
-	# work around https://github.com/astral-sh/uv/issues/4376
-	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
-	local -x COLUMNS=100
-	local -x PYTHONDONTWRITEBYTECODE=
-	# fix tests failing because of our config
-	local -x XDG_CONFIG_DIRS=${T}
-
-	cd crates/uv || die
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cd crates/uv || die
-	cargo_src_install
-
-	insinto /etc/xdg/uv
-	newins - uv.toml <<-EOF || die
-		# These defaults match Fedora, see:
-		# https://src.fedoraproject.org/rpms/uv/pull-request/18
-
-		# By default ("automatic"), uv downloads missing Python versions
-		# automatically and keeps them in the user's home directory.
-		# Disable that to make downloading opt-in, and especially
-		# to avoid unnecessarily fetching custom Python when the distro
-		# package would be preferable.  Python builds can still be
-		# downloaded manually via "uv python install".
-		#
-		# https://docs.astral.sh/uv/reference/settings/#python-downloads
-		python-downloads = "manual"
-
-		# By default ("managed"), uv always prefers self-installed
-		# Python versions over the system Python, independently
-		# of versions.  Since we generally expect users to use that
-		# to install old Python versions not in ::gentoo anymore,
-		# this effectively means that uv would end up preferring very
-		# old Python versions over the newer ones that are provided
-		# by the system.  Default to using the system versions to avoid
-		# this counter-intuitive behavior.
-		#
-		# https://docs.astral.sh/uv/reference/settings/#python-preference
-		python-preference = "system"
-	EOF
-}
diff --git a/dev-python/uv/uv-0.5.13.ebuild b/dev-python/uv/uv-0.5.13.ebuild
deleted file mode 100644
index 7eaa8c0ef6ae..000000000000
--- a/dev-python/uv/uv-0.5.13.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;648aa343486e5529953153781fc86025c73c4a61;pubgrub-%commit%'
-	[tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
-	[version-ranges]='https://github.com/astral-sh/pubgrub;648aa343486e5529953153781fc86025c73c4a61;pubgrub-%commit%/version-ranges'
-)
-
-RUST_MIN_VER="1.83.0"
-
-inherit cargo check-reqs
-
-CRATE_PV=${PV}
-DESCRIPTION="A Python package installer and resolver, written in Rust"
-HOMEPAGE="
-	https://github.com/astral-sh/uv/
-	https://pypi.org/project/uv/
-"
-# pypi sdist misses scripts/, needed for tests
-SRC_URI="
-	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-if [[ ${PKGBUMPING} != ${PVR} ]]; then
-	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
-	"
-fi
-
-# most of the code
-LICENSE="|| ( Apache-2.0 MIT )"
-# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
-# Dependent crate licenses
-LICENSE+="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
-	MPL-2.0 Unicode-3.0 Unicode-DFS-2016 ZLIB
-"
-# ring crate
-LICENSE+=" openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-DEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		dev-lang/python:3.8
-		dev-lang/python:3.9
-		dev-lang/python:3.10
-		dev-lang/python:3.11
-		dev-lang/python:3.12
-		!!~dev-python/uv-0.5.0
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-check_space() {
-	local CHECKREQS_DISK_BUILD=3G
-	use debug && CHECKREQS_DISK_BUILD=9G
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	rust_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# enable system libraries where supported
-	export ZSTD_SYS_USE_PKG_CONFIG=1
-	# TODO: unbundle libz-ng-sys, tikv-jemalloc-sys?
-
-	# remove unbundled sources, just in case
-	find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die
-
-	# bzip2-sys requires a pkg-config file
-	# https://github.com/alexcrichton/bzip2-rs/issues/104
-	mkdir "${T}/pkg-config" || die
-	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
-	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
-		Name: bzip2
-		Version: 9999
-		Description:
-		Libs: -lbz2
-	EOF
-}
-
-src_configure() {
-	local myfeatures=(
-		git
-		pypi
-		python
-	)
-
-	cargo_src_configure --no-default-features
-}
-
-src_compile() {
-	cd crates/uv || die
-	cargo_src_compile
-}
-
-src_test() {
-	# work around https://github.com/astral-sh/uv/issues/4376
-	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
-	local -x COLUMNS=100
-	local -x PYTHONDONTWRITEBYTECODE=
-	# fix tests failing because of our config
-	local -x XDG_CONFIG_DIRS=${T}
-
-	cd crates/uv || die
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cd crates/uv || die
-	cargo_src_install
-
-	insinto /etc/xdg/uv
-	newins - uv.toml <<-EOF || die
-		# These defaults match Fedora, see:
-		# https://src.fedoraproject.org/rpms/uv/pull-request/18
-
-		# By default ("automatic"), uv downloads missing Python versions
-		# automatically and keeps them in the user's home directory.
-		# Disable that to make downloading opt-in, and especially
-		# to avoid unnecessarily fetching custom Python when the distro
-		# package would be preferable.  Python builds can still be
-		# downloaded manually via "uv python install".
-		#
-		# https://docs.astral.sh/uv/reference/settings/#python-downloads
-		python-downloads = "manual"
-
-		# By default ("managed"), uv always prefers self-installed
-		# Python versions over the system Python, independently
-		# of versions.  Since we generally expect users to use that
-		# to install old Python versions not in ::gentoo anymore,
-		# this effectively means that uv would end up preferring very
-		# old Python versions over the newer ones that are provided
-		# by the system.  Default to using the system versions to avoid
-		# this counter-intuitive behavior.
-		#
-		# https://docs.astral.sh/uv/reference/settings/#python-preference
-		python-preference = "system"
-	EOF
-}
diff --git a/dev-python/uv/uv-0.5.14.ebuild b/dev-python/uv/uv-0.5.15.ebuild
index bd242a76bb09..bd242a76bb09 100644
--- a/dev-python/uv/uv-0.5.14.ebuild
+++ b/dev-python/uv/uv-0.5.15.ebuild
diff --git a/dev-python/uv/uv-0.5.16.ebuild b/dev-python/uv/uv-0.5.16.ebuild
new file mode 100644
index 000000000000..bd242a76bb09
--- /dev/null
+++ b/dev-python/uv/uv-0.5.16.ebuild
@@ -0,0 +1,170 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;648aa343486e5529953153781fc86025c73c4a61;pubgrub-%commit%'
+	[tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
+	[version-ranges]='https://github.com/astral-sh/pubgrub;648aa343486e5529953153781fc86025c73c4a61;pubgrub-%commit%/version-ranges'
+)
+
+RUST_MIN_VER="1.83.0"
+
+inherit cargo check-reqs
+
+CRATE_PV=${PV}
+DESCRIPTION="A Python package installer and resolver, written in Rust"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv/
+"
+# pypi sdist misses scripts/, needed for tests
+SRC_URI="
+	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
+	"
+fi
+
+# most of the code
+LICENSE="|| ( Apache-2.0 MIT )"
+# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	MPL-2.0 Unicode-3.0 Unicode-DFS-2016 ZLIB
+"
+# ring crate
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+DEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-arch/zstd:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		dev-lang/python:3.8
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+		!!~dev-python/uv-0.5.0
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	rust_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# enable system libraries where supported
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+	# TODO: unbundle libz-ng-sys, tikv-jemalloc-sys?
+
+	# remove unbundled sources, just in case
+	find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die
+
+	# bzip2-sys requires a pkg-config file
+	# https://github.com/alexcrichton/bzip2-rs/issues/104
+	mkdir "${T}/pkg-config" || die
+	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
+	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
+		Name: bzip2
+		Version: 9999
+		Description:
+		Libs: -lbz2
+	EOF
+}
+
+src_configure() {
+	local myfeatures=(
+		git
+		pypi
+		python
+	)
+
+	cargo_src_configure --no-default-features
+}
+
+src_compile() {
+	cd crates/uv || die
+	cargo_src_compile
+}
+
+src_test() {
+	# work around https://github.com/astral-sh/uv/issues/4376
+	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
+	local -x COLUMNS=100
+	local -x PYTHONDONTWRITEBYTECODE=
+	# fix tests failing because of our config
+	local -x XDG_CONFIG_DIRS=${T}
+
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+
+	insinto /etc/xdg/uv
+	newins - uv.toml <<-EOF || die
+		# These defaults match Fedora, see:
+		# https://src.fedoraproject.org/rpms/uv/pull-request/18
+
+		# By default ("automatic"), uv downloads missing Python versions
+		# automatically and keeps them in the user's home directory.
+		# Disable that to make downloading opt-in, and especially
+		# to avoid unnecessarily fetching custom Python when the distro
+		# package would be preferable.  Python builds can still be
+		# downloaded manually via "uv python install".
+		#
+		# https://docs.astral.sh/uv/reference/settings/#python-downloads
+		python-downloads = "manual"
+
+		# By default ("managed"), uv always prefers self-installed
+		# Python versions over the system Python, independently
+		# of versions.  Since we generally expect users to use that
+		# to install old Python versions not in ::gentoo anymore,
+		# this effectively means that uv would end up preferring very
+		# old Python versions over the newer ones that are provided
+		# by the system.  Default to using the system versions to avoid
+		# this counter-intuitive behavior.
+		#
+		# https://docs.astral.sh/uv/reference/settings/#python-preference
+		python-preference = "system"
+	EOF
+}
diff --git a/dev-python/uv/uv-0.5.17.ebuild b/dev-python/uv/uv-0.5.17.ebuild
new file mode 100644
index 000000000000..bd242a76bb09
--- /dev/null
+++ b/dev-python/uv/uv-0.5.17.ebuild
@@ -0,0 +1,170 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;648aa343486e5529953153781fc86025c73c4a61;pubgrub-%commit%'
+	[tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
+	[version-ranges]='https://github.com/astral-sh/pubgrub;648aa343486e5529953153781fc86025c73c4a61;pubgrub-%commit%/version-ranges'
+)
+
+RUST_MIN_VER="1.83.0"
+
+inherit cargo check-reqs
+
+CRATE_PV=${PV}
+DESCRIPTION="A Python package installer and resolver, written in Rust"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv/
+"
+# pypi sdist misses scripts/, needed for tests
+SRC_URI="
+	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
+	"
+fi
+
+# most of the code
+LICENSE="|| ( Apache-2.0 MIT )"
+# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	MPL-2.0 Unicode-3.0 Unicode-DFS-2016 ZLIB
+"
+# ring crate
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+DEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-arch/zstd:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		dev-lang/python:3.8
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+		!!~dev-python/uv-0.5.0
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	rust_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# enable system libraries where supported
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+	# TODO: unbundle libz-ng-sys, tikv-jemalloc-sys?
+
+	# remove unbundled sources, just in case
+	find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die
+
+	# bzip2-sys requires a pkg-config file
+	# https://github.com/alexcrichton/bzip2-rs/issues/104
+	mkdir "${T}/pkg-config" || die
+	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
+	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
+		Name: bzip2
+		Version: 9999
+		Description:
+		Libs: -lbz2
+	EOF
+}
+
+src_configure() {
+	local myfeatures=(
+		git
+		pypi
+		python
+	)
+
+	cargo_src_configure --no-default-features
+}
+
+src_compile() {
+	cd crates/uv || die
+	cargo_src_compile
+}
+
+src_test() {
+	# work around https://github.com/astral-sh/uv/issues/4376
+	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
+	local -x COLUMNS=100
+	local -x PYTHONDONTWRITEBYTECODE=
+	# fix tests failing because of our config
+	local -x XDG_CONFIG_DIRS=${T}
+
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+
+	insinto /etc/xdg/uv
+	newins - uv.toml <<-EOF || die
+		# These defaults match Fedora, see:
+		# https://src.fedoraproject.org/rpms/uv/pull-request/18
+
+		# By default ("automatic"), uv downloads missing Python versions
+		# automatically and keeps them in the user's home directory.
+		# Disable that to make downloading opt-in, and especially
+		# to avoid unnecessarily fetching custom Python when the distro
+		# package would be preferable.  Python builds can still be
+		# downloaded manually via "uv python install".
+		#
+		# https://docs.astral.sh/uv/reference/settings/#python-downloads
+		python-downloads = "manual"
+
+		# By default ("managed"), uv always prefers self-installed
+		# Python versions over the system Python, independently
+		# of versions.  Since we generally expect users to use that
+		# to install old Python versions not in ::gentoo anymore,
+		# this effectively means that uv would end up preferring very
+		# old Python versions over the newer ones that are provided
+		# by the system.  Default to using the system versions to avoid
+		# this counter-intuitive behavior.
+		#
+		# https://docs.astral.sh/uv/reference/settings/#python-preference
+		python-preference = "system"
+	EOF
+}
diff --git a/dev-python/uv/uv-0.5.18.ebuild b/dev-python/uv/uv-0.5.18.ebuild
new file mode 100644
index 000000000000..510948fb3c31
--- /dev/null
+++ b/dev-python/uv/uv-0.5.18.ebuild
@@ -0,0 +1,170 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;648aa343486e5529953153781fc86025c73c4a61;pubgrub-%commit%'
+	[tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
+	[version-ranges]='https://github.com/astral-sh/pubgrub;648aa343486e5529953153781fc86025c73c4a61;pubgrub-%commit%/version-ranges'
+)
+
+RUST_MIN_VER="1.83.0"
+
+inherit cargo check-reqs
+
+CRATE_PV=0.5.17
+DESCRIPTION="A Python package installer and resolver, written in Rust"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv/
+"
+# pypi sdist misses scripts/, needed for tests
+SRC_URI="
+	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
+	"
+fi
+
+# most of the code
+LICENSE="|| ( Apache-2.0 MIT )"
+# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	MPL-2.0 Unicode-3.0 Unicode-DFS-2016 ZLIB
+"
+# ring crate
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+DEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-arch/zstd:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		dev-lang/python:3.8
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+		!!~dev-python/uv-0.5.0
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	rust_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# enable system libraries where supported
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+	# TODO: unbundle libz-ng-sys, tikv-jemalloc-sys?
+
+	# remove unbundled sources, just in case
+	find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die
+
+	# bzip2-sys requires a pkg-config file
+	# https://github.com/alexcrichton/bzip2-rs/issues/104
+	mkdir "${T}/pkg-config" || die
+	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
+	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
+		Name: bzip2
+		Version: 9999
+		Description:
+		Libs: -lbz2
+	EOF
+}
+
+src_configure() {
+	local myfeatures=(
+		git
+		pypi
+		python
+	)
+
+	cargo_src_configure --no-default-features
+}
+
+src_compile() {
+	cd crates/uv || die
+	cargo_src_compile
+}
+
+src_test() {
+	# work around https://github.com/astral-sh/uv/issues/4376
+	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
+	local -x COLUMNS=100
+	local -x PYTHONDONTWRITEBYTECODE=
+	# fix tests failing because of our config
+	local -x XDG_CONFIG_DIRS=${T}
+
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+
+	insinto /etc/xdg/uv
+	newins - uv.toml <<-EOF || die
+		# These defaults match Fedora, see:
+		# https://src.fedoraproject.org/rpms/uv/pull-request/18
+
+		# By default ("automatic"), uv downloads missing Python versions
+		# automatically and keeps them in the user's home directory.
+		# Disable that to make downloading opt-in, and especially
+		# to avoid unnecessarily fetching custom Python when the distro
+		# package would be preferable.  Python builds can still be
+		# downloaded manually via "uv python install".
+		#
+		# https://docs.astral.sh/uv/reference/settings/#python-downloads
+		python-downloads = "manual"
+
+		# By default ("managed"), uv always prefers self-installed
+		# Python versions over the system Python, independently
+		# of versions.  Since we generally expect users to use that
+		# to install old Python versions not in ::gentoo anymore,
+		# this effectively means that uv would end up preferring very
+		# old Python versions over the newer ones that are provided
+		# by the system.  Default to using the system versions to avoid
+		# this counter-intuitive behavior.
+		#
+		# https://docs.astral.sh/uv/reference/settings/#python-preference
+		python-preference = "system"
+	EOF
+}
diff --git a/dev-python/uv/uv-0.5.20.ebuild b/dev-python/uv/uv-0.5.20.ebuild
new file mode 100644
index 000000000000..bd242a76bb09
--- /dev/null
+++ b/dev-python/uv/uv-0.5.20.ebuild
@@ -0,0 +1,170 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;648aa343486e5529953153781fc86025c73c4a61;pubgrub-%commit%'
+	[tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
+	[version-ranges]='https://github.com/astral-sh/pubgrub;648aa343486e5529953153781fc86025c73c4a61;pubgrub-%commit%/version-ranges'
+)
+
+RUST_MIN_VER="1.83.0"
+
+inherit cargo check-reqs
+
+CRATE_PV=${PV}
+DESCRIPTION="A Python package installer and resolver, written in Rust"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv/
+"
+# pypi sdist misses scripts/, needed for tests
+SRC_URI="
+	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
+	"
+fi
+
+# most of the code
+LICENSE="|| ( Apache-2.0 MIT )"
+# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	MPL-2.0 Unicode-3.0 Unicode-DFS-2016 ZLIB
+"
+# ring crate
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+DEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-arch/zstd:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		dev-lang/python:3.8
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+		!!~dev-python/uv-0.5.0
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	rust_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# enable system libraries where supported
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+	# TODO: unbundle libz-ng-sys, tikv-jemalloc-sys?
+
+	# remove unbundled sources, just in case
+	find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die
+
+	# bzip2-sys requires a pkg-config file
+	# https://github.com/alexcrichton/bzip2-rs/issues/104
+	mkdir "${T}/pkg-config" || die
+	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
+	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
+		Name: bzip2
+		Version: 9999
+		Description:
+		Libs: -lbz2
+	EOF
+}
+
+src_configure() {
+	local myfeatures=(
+		git
+		pypi
+		python
+	)
+
+	cargo_src_configure --no-default-features
+}
+
+src_compile() {
+	cd crates/uv || die
+	cargo_src_compile
+}
+
+src_test() {
+	# work around https://github.com/astral-sh/uv/issues/4376
+	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
+	local -x COLUMNS=100
+	local -x PYTHONDONTWRITEBYTECODE=
+	# fix tests failing because of our config
+	local -x XDG_CONFIG_DIRS=${T}
+
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+
+	insinto /etc/xdg/uv
+	newins - uv.toml <<-EOF || die
+		# These defaults match Fedora, see:
+		# https://src.fedoraproject.org/rpms/uv/pull-request/18
+
+		# By default ("automatic"), uv downloads missing Python versions
+		# automatically and keeps them in the user's home directory.
+		# Disable that to make downloading opt-in, and especially
+		# to avoid unnecessarily fetching custom Python when the distro
+		# package would be preferable.  Python builds can still be
+		# downloaded manually via "uv python install".
+		#
+		# https://docs.astral.sh/uv/reference/settings/#python-downloads
+		python-downloads = "manual"
+
+		# By default ("managed"), uv always prefers self-installed
+		# Python versions over the system Python, independently
+		# of versions.  Since we generally expect users to use that
+		# to install old Python versions not in ::gentoo anymore,
+		# this effectively means that uv would end up preferring very
+		# old Python versions over the newer ones that are provided
+		# by the system.  Default to using the system versions to avoid
+		# this counter-intuitive behavior.
+		#
+		# https://docs.astral.sh/uv/reference/settings/#python-preference
+		python-preference = "system"
+	EOF
+}
diff --git a/dev-python/uv/uv-0.5.21.ebuild b/dev-python/uv/uv-0.5.21.ebuild
new file mode 100644
index 000000000000..346ff22e5500
--- /dev/null
+++ b/dev-python/uv/uv-0.5.21.ebuild
@@ -0,0 +1,170 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;648aa343486e5529953153781fc86025c73c4a61;pubgrub-%commit%'
+	[tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
+	[version-ranges]='https://github.com/astral-sh/pubgrub;648aa343486e5529953153781fc86025c73c4a61;pubgrub-%commit%/version-ranges'
+)
+
+RUST_MIN_VER="1.83.0"
+
+inherit cargo check-reqs
+
+CRATE_PV=0.5.20
+DESCRIPTION="A Python package installer and resolver, written in Rust"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv/
+"
+# pypi sdist misses scripts/, needed for tests
+SRC_URI="
+	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
+	"
+fi
+
+# most of the code
+LICENSE="|| ( Apache-2.0 MIT )"
+# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	MPL-2.0 Unicode-3.0 Unicode-DFS-2016 ZLIB
+"
+# ring crate
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+DEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-arch/zstd:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		dev-lang/python:3.8
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+		!!~dev-python/uv-0.5.0
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	rust_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# enable system libraries where supported
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+	# TODO: unbundle libz-ng-sys, tikv-jemalloc-sys?
+
+	# remove unbundled sources, just in case
+	find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die
+
+	# bzip2-sys requires a pkg-config file
+	# https://github.com/alexcrichton/bzip2-rs/issues/104
+	mkdir "${T}/pkg-config" || die
+	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
+	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
+		Name: bzip2
+		Version: 9999
+		Description:
+		Libs: -lbz2
+	EOF
+}
+
+src_configure() {
+	local myfeatures=(
+		git
+		pypi
+		python
+	)
+
+	cargo_src_configure --no-default-features
+}
+
+src_compile() {
+	cd crates/uv || die
+	cargo_src_compile
+}
+
+src_test() {
+	# work around https://github.com/astral-sh/uv/issues/4376
+	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
+	local -x COLUMNS=100
+	local -x PYTHONDONTWRITEBYTECODE=
+	# fix tests failing because of our config
+	local -x XDG_CONFIG_DIRS=${T}
+
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+
+	insinto /etc/xdg/uv
+	newins - uv.toml <<-EOF || die
+		# These defaults match Fedora, see:
+		# https://src.fedoraproject.org/rpms/uv/pull-request/18
+
+		# By default ("automatic"), uv downloads missing Python versions
+		# automatically and keeps them in the user's home directory.
+		# Disable that to make downloading opt-in, and especially
+		# to avoid unnecessarily fetching custom Python when the distro
+		# package would be preferable.  Python builds can still be
+		# downloaded manually via "uv python install".
+		#
+		# https://docs.astral.sh/uv/reference/settings/#python-downloads
+		python-downloads = "manual"
+
+		# By default ("managed"), uv always prefers self-installed
+		# Python versions over the system Python, independently
+		# of versions.  Since we generally expect users to use that
+		# to install old Python versions not in ::gentoo anymore,
+		# this effectively means that uv would end up preferring very
+		# old Python versions over the newer ones that are provided
+		# by the system.  Default to using the system versions to avoid
+		# this counter-intuitive behavior.
+		#
+		# https://docs.astral.sh/uv/reference/settings/#python-preference
+		python-preference = "system"
+	EOF
+}
diff --git a/dev-python/uv/uv-0.5.9.ebuild b/dev-python/uv/uv-0.5.9.ebuild
deleted file mode 100644
index 836a6e5dc1e6..000000000000
--- a/dev-python/uv/uv-0.5.9.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;57832d0588fbb7aab824813481104761dc1c7740;pubgrub-%commit%'
-	[tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
-	[version-ranges]='https://github.com/astral-sh/pubgrub;57832d0588fbb7aab824813481104761dc1c7740;pubgrub-%commit%/version-ranges'
-)
-
-RUST_MIN_VER="1.83.0"
-
-inherit cargo check-reqs
-
-CRATE_PV=0.5.8
-DESCRIPTION="A Python package installer and resolver, written in Rust"
-HOMEPAGE="
-	https://github.com/astral-sh/uv/
-	https://pypi.org/project/uv/
-"
-# pypi sdist misses scripts/, needed for tests
-SRC_URI="
-	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-if [[ ${PKGBUMPING} != ${PVR} ]]; then
-	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
-	"
-fi
-
-# most of the code
-LICENSE="|| ( Apache-2.0 MIT )"
-# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
-# Dependent crate licenses
-LICENSE+="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
-	MPL-2.0 Unicode-3.0 Unicode-DFS-2016 ZLIB
-"
-# ring crate
-LICENSE+=" openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-DEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		dev-lang/python:3.8
-		dev-lang/python:3.9
-		dev-lang/python:3.10
-		dev-lang/python:3.11
-		dev-lang/python:3.12
-		!!~dev-python/uv-0.5.0
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-check_space() {
-	local CHECKREQS_DISK_BUILD=3G
-	use debug && CHECKREQS_DISK_BUILD=9G
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	rust_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# enable system libraries where supported
-	export ZSTD_SYS_USE_PKG_CONFIG=1
-	# TODO: unbundle libz-ng-sys, tikv-jemalloc-sys?
-
-	# remove unbundled sources, just in case
-	find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die
-
-	# bzip2-sys requires a pkg-config file
-	# https://github.com/alexcrichton/bzip2-rs/issues/104
-	mkdir "${T}/pkg-config" || die
-	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
-	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
-		Name: bzip2
-		Version: 9999
-		Description:
-		Libs: -lbz2
-	EOF
-}
-
-src_configure() {
-	local myfeatures=(
-		git
-		pypi
-		python
-	)
-
-	cargo_src_configure --no-default-features
-}
-
-src_compile() {
-	cd crates/uv || die
-	cargo_src_compile
-}
-
-src_test() {
-	# work around https://github.com/astral-sh/uv/issues/4376
-	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
-	local -x COLUMNS=100
-	local -x PYTHONDONTWRITEBYTECODE=
-	# fix tests failing because of our config
-	local -x XDG_CONFIG_DIRS=${T}
-
-	cd crates/uv || die
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cd crates/uv || die
-	cargo_src_install
-
-	insinto /etc/xdg/uv
-	newins - uv.toml <<-EOF || die
-		# These defaults match Fedora, see:
-		# https://src.fedoraproject.org/rpms/uv/pull-request/18
-
-		# By default ("automatic"), uv downloads missing Python versions
-		# automatically and keeps them in the user's home directory.
-		# Disable that to make downloading opt-in, and especially
-		# to avoid unnecessarily fetching custom Python when the distro
-		# package would be preferable.  Python builds can still be
-		# downloaded manually via "uv python install".
-		#
-		# https://docs.astral.sh/uv/reference/settings/#python-downloads
-		python-downloads = "manual"
-
-		# By default ("managed"), uv always prefers self-installed
-		# Python versions over the system Python, independently
-		# of versions.  Since we generally expect users to use that
-		# to install old Python versions not in ::gentoo anymore,
-		# this effectively means that uv would end up preferring very
-		# old Python versions over the newer ones that are provided
-		# by the system.  Default to using the system versions to avoid
-		# this counter-intuitive behavior.
-		#
-		# https://docs.astral.sh/uv/reference/settings/#python-preference
-		python-preference = "system"
-	EOF
-}
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 60ce81fdd9f6..42e5e8524b4f 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,5 +1,2 @@
 DIST uvicorn-0.31.1.gh.tar.gz 728604 BLAKE2B 4f8f4e34bc6b13f6f0866a6890855a5b3bf9aad179de2fdeab40fdb017f76acfaa1cb7c9bd97d55d2ea5cd513afc3b6857ae0613912f6be55dc1d17cf810b213 SHA512 2ceab852cd7819fee592cf2507fa9ce8cc80f19dec0492fec621e6eded4a47edecbe4fe559a8474dacff260546ba146e33af9cab964e121356797fdc9a2dae28
-DIST uvicorn-0.32.0.gh.tar.gz 728882 BLAKE2B 8ab5341b23a97fbf4e8d6cf046f71ef09831bd7914c631fd1683eefe8a2aa8377b572443c180505f0413d5c04462519aa7fd848623d9765905add47650dad19e SHA512 66bfaf0ff37507b90fa63d4a9d3cdb8ae7aa70629ad9bcf52a391abd2c85e67cfce066ba8fb39d9e8f7781bdbad52a03ac9beb9cdbc91af59c29bcf2654ba8b0
-DIST uvicorn-0.32.1.gh.tar.gz 729220 BLAKE2B f092a1ff0fe08469afbeb9ee244e290bf42ecdb5c56f429386a2c827719d1d85b577cdf9eaeab3c487574593c2716ffa4f7887ec364bab34fbf19a63ff7f62b5 SHA512 f965d37108ee7867cc6d49983156e47d21cda7b252f5ac67daa5b3a258c741238625fdc508e9cdceb4762dc24b808f2c1895fedf8abfd50438af708dda86e36e
-DIST uvicorn-0.33.0.gh.tar.gz 728545 BLAKE2B d780247dda6050fcdbb084c5d4267effd74e414c51400c3d5df46190cca04d456a7fc8bd60e5d00d464fd1b737c2e7f56cb3f75f8d6df27b706a858db22724fe SHA512 7da1abf9811d97d7e8c0a520ffbf7f164810165ff47abb4f44849773bd5821ec76a3bf7c9551fcc9e4be3a5474e02ff519a3a70a8255e5a4b27f8e17f829382a
 DIST uvicorn-0.34.0.gh.tar.gz 728609 BLAKE2B 50b0cb2d0d7e81398bb078c999d17e3cc021e371274fb3387559d92cc3086386aa5e62a56ba14ae60e5da742017ad58aee3fb8b045e438b614ce8e812934b4ad SHA512 260782e385a2934049da8c474750958826afe1bfe23b38fe2f6420f355af7a537563f8fe6ac3830814c7469203703d10f4f9f3d6e53e79113bfd2fd34f7a7c72
diff --git a/dev-python/uvicorn/uvicorn-0.32.0.ebuild b/dev-python/uvicorn/uvicorn-0.32.0.ebuild
deleted file mode 100644
index f2a271c54646..000000000000
--- a/dev-python/uvicorn/uvicorn-0.32.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="
-	https://www.uvicorn.org/
-	https://github.com/encode/uvicorn/
-	https://pypi.org/project/uvicorn/
-"
-# as of 0.28.0, no tests in sdist
-SRC_URI="
-	https://github.com/encode/uvicorn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/a2wsgi[${PYTHON_USEDEP}]
-		dev-python/httptools[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		>=dev-python/websockets-10.4[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-			dev-python/trustme[${PYTHON_USEDEP}]
-			dev-python/watchfiles[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# too long path for unix socket
-		tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
-		# TODO
-		'tests/protocols/test_http.py::test_close_connection_with_multiple_requests[httptools]'
-	)
-	case ${EPYTHON} in
-		pypy3)
-			# TODO
-			EPYTEST_DESELECT+=(
-				tests/middleware/test_logging.py::test_running_log_using_fd
-			)
-			;;
-	esac
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "auto reload on file changes" dev-python/watchfiles
-}
diff --git a/dev-python/uvicorn/uvicorn-0.32.1.ebuild b/dev-python/uvicorn/uvicorn-0.32.1.ebuild
deleted file mode 100644
index bbce08a80952..000000000000
--- a/dev-python/uvicorn/uvicorn-0.32.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="
-	https://www.uvicorn.org/
-	https://github.com/encode/uvicorn/
-	https://pypi.org/project/uvicorn/
-"
-# as of 0.28.0, no tests in sdist
-SRC_URI="
-	https://github.com/encode/uvicorn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/a2wsgi[${PYTHON_USEDEP}]
-		>=dev-python/httptools-0.6.3[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		>=dev-python/websockets-10.4[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-			dev-python/trustme[${PYTHON_USEDEP}]
-			dev-python/watchfiles[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# too long path for unix socket
-		tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
-		# TODO
-		'tests/protocols/test_http.py::test_close_connection_with_multiple_requests[httptools]'
-		'tests/protocols/test_websocket.py::test_send_binary_data_to_server_bigger_than_default_on_websockets[httptools-max=defaults sent=defaults+1]'
-		'tests/protocols/test_websocket.py::test_send_binary_data_to_server_bigger_than_default_on_websockets[h11-max=defaults sent=defaults+1]'
-	)
-	case ${EPYTHON} in
-		pypy3)
-			# TODO
-			EPYTEST_DESELECT+=(
-				tests/middleware/test_logging.py::test_running_log_using_fd
-			)
-			;;
-	esac
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "auto reload on file changes" dev-python/watchfiles
-}
diff --git a/dev-python/uvicorn/uvicorn-0.33.0.ebuild b/dev-python/uvicorn/uvicorn-0.33.0.ebuild
deleted file mode 100644
index 83a8684c768c..000000000000
--- a/dev-python/uvicorn/uvicorn-0.33.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="
-	https://www.uvicorn.org/
-	https://github.com/encode/uvicorn/
-	https://pypi.org/project/uvicorn/
-"
-# as of 0.28.0, no tests in sdist
-SRC_URI="
-	https://github.com/encode/uvicorn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/a2wsgi[${PYTHON_USEDEP}]
-		>=dev-python/httptools-0.6.3[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		>=dev-python/websockets-10.4[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-			dev-python/trustme[${PYTHON_USEDEP}]
-			dev-python/watchfiles[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# too long path for unix socket
-		tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
-		# TODO
-		'tests/protocols/test_http.py::test_close_connection_with_multiple_requests[httptools]'
-		'tests/protocols/test_websocket.py::test_send_binary_data_to_server_bigger_than_default_on_websockets[httptools-max=defaults sent=defaults+1]'
-		'tests/protocols/test_websocket.py::test_send_binary_data_to_server_bigger_than_default_on_websockets[h11-max=defaults sent=defaults+1]'
-	)
-	case ${EPYTHON} in
-		pypy3)
-			# TODO
-			EPYTEST_DESELECT+=(
-				tests/middleware/test_logging.py::test_running_log_using_fd
-			)
-			;;
-	esac
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "auto reload on file changes" dev-python/watchfiles
-}
diff --git a/dev-python/uvicorn/uvicorn-0.34.0.ebuild b/dev-python/uvicorn/uvicorn-0.34.0.ebuild
index 83a8684c768c..a7d499d3c56e 100644
--- a/dev-python/uvicorn/uvicorn-0.34.0.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.34.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
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
@@ -36,10 +36,11 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/a2wsgi[${PYTHON_USEDEP}]
+		dev-python/anyio[${PYTHON_USEDEP}]
 		>=dev-python/httptools-0.6.3[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		>=dev-python/httpx-0.28[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 		dev-python/python-dotenv[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
@@ -53,6 +54,7 @@ BDEPEND="
 	)
 "
 
+EPYTEST_XDIST=1
 distutils_enable_tests pytest
 
 python_test() {
@@ -73,7 +75,8 @@ python_test() {
 			;;
 	esac
 
-	epytest
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p anyio -p pytest_mock -p rerunfailures --reruns=5
 }
 
 pkg_postinst() {
diff --git a/dev-python/uvloop/uvloop-0.21.0.ebuild b/dev-python/uvloop/uvloop-0.21.0.ebuild
index 8465f7187ddb..430908a4c254 100644
--- a/dev-python/uvloop/uvloop-0.21.0.ebuild
+++ b/dev-python/uvloop/uvloop-0.21.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 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.19.0-
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 -riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 -riscv sparc x86"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index d8c618e30981..7ec54968093f 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,2 +1 @@
-DIST vcrpy-6.0.2.gh.tar.gz 338830 BLAKE2B 946c30bc7d0a5663b2dea8989b298665fba6ce63dcb59127e7e444a1384457d65838ba0b24bac7c6285196c3fe796014aa68373ebf902f3e4e8928b76df3a120 SHA512 7e6b86bd60d2a2bd9ca8843f08143ec75656fc017ef7a9df29d4ee45e09bf985e9591204c466372459eb7987951ac2dbc730783e127e0db610e25261656275b2
 DIST vcrpy-7.0.0.gh.tar.gz 339068 BLAKE2B 15ae3cdfa3ba6755c0d7b2a31b91a4465bd603a80ee2900207181ba95dca4b863d16cf44ae98b7cac35bd312daaa95ca882a2a9d75e46e2a48b788e7bf82ab51 SHA512 6e82f56adddc5b5e3d56c261e612af5a66daed6a3485dfc082be235e95901ceaae9aa83bab96cef19d8fbe35c27953b4b101fea702fd3a44cbe578c926990d87
diff --git a/dev-python/vcrpy/vcrpy-6.0.2.ebuild b/dev-python/vcrpy/vcrpy-6.0.2.ebuild
deleted file mode 100644
index b0f5e6e674be..000000000000
--- a/dev-python/vcrpy/vcrpy-6.0.2.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
-HOMEPAGE="
-	https://github.com/kevin1024/vcrpy/
-	https://pypi.org/project/vcrpy/
-"
-SRC_URI="
-	https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.16.2[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-httpbin-2.0.0-r1[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# these tests are failing with recent dev-python/werkzeug; losely related:
-		# https://github.com/kevin1024/vcrpy/issues/645
-		tests/integration/test_record_mode.py::test_new_episodes_record_mode_two_times
-		tests/integration/test_urllib2.py::test_random_body
-		tests/integration/test_urllib2.py::test_multiple_requests
-		# Internet
-		"tests/integration/test_urllib3.py::test_post[https]"
-	)
-
-	local EPYTEST_IGNORE=(
-		# requires boto3
-		tests/integration/test_boto3.py
-		# Internet
-		tests/integration/test_tornado.py
-		tests/integration/test_aiohttp.py
-	)
-
-	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m 'not online' -p httpbin -p rerunfailures --reruns=5
-}
diff --git a/dev-python/vcrpy/vcrpy-7.0.0.ebuild b/dev-python/vcrpy/vcrpy-7.0.0.ebuild
index edc8b114a061..43cc3a8db2d1 100644
--- a/dev-python/vcrpy/vcrpy-7.0.0.ebuild
+++ b/dev-python/vcrpy/vcrpy-7.0.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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/vdf/Manifest b/dev-python/vdf/Manifest
index 1de34608f4ed..685006ff88f2 100644
--- a/dev-python/vdf/Manifest
+++ b/dev-python/vdf/Manifest
@@ -1 +1,2 @@
 DIST vdf-3.4_p20240630.gh.tar.gz 17415 BLAKE2B d8f108cc09e9df787fcbd9829de81d8d90fb032a38cdffb8c86690fe4aa5a980cf079ba943e0a1166f57f948fe0ead89278c2ee2b7c1924188ef8fe212aa9050 SHA512 0af688d89b35369178b49135cfb869afc3f40da6f2a606b45646ea17804ad964b28c7b3dc5e9fdf2ee5ca12bad5a7f7d3c9b04803111ead45b967f2e9c9cba98
+DIST vdf-4.0.gh.tar.gz 16808 BLAKE2B 1d4cddc7057081c8aefb1bf603eca8cac69c62926643459b88d856e49938b461e106a89d6fe09dfb3a6ee3956af6fbf9cb9e3d2fca82665eb2f1dbe1198bc5d6 SHA512 fde95258ccc63811c1eb6069333b6dc727be3c9ca29da2b9f200386903f5fcd183bfef82d22534ff6e4ce74dd9ab48ee498b6365112e050bcb354c4127aec475
diff --git a/dev-python/vdf/vdf-4.0.ebuild b/dev-python/vdf/vdf-4.0.ebuild
new file mode 100644
index 000000000000..547a0e25cc80
--- /dev/null
+++ b/dev-python/vdf/vdf-4.0.ebuild
@@ -0,0 +1,25 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A module for (de)serialization to and from VDF, Valve's key-value text format"
+HOMEPAGE="
+	https://github.com/solsticegamestudios/vdf/
+	https://pypi.org/project/vdf/
+"
+SRC_URI="
+	https://github.com/solsticegamestudios/vdf/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 8ece7c23c036..a2044690cc62 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,2 +1,2 @@
-DIST virtualenv-20.28.0.tar.gz 7650368 BLAKE2B b18ae57a929bb2a84a7ffa92771913dbd941cc2fc4c2962b18ce34dc105dcdfdb46b01366affea04ec44a7795b9c78a136b385eee8c457274079e65313d19896 SHA512 6a66663af74a240b9ad1cd3170f765ea44aea5f013d63c996a66af4aa0ad4e56c2c38c4f51d43181ac55c6099363694478d7ef15b640c56f8f801d3cd318966e
 DIST virtualenv-20.28.1.tar.gz 7650532 BLAKE2B 08b356a1547573f5a4d55e32e5d0c0f0d12f137d651a46efe79dba8680cdb7e8e24dc37adc7fcb12ba3a83ed7b0185c553dc2269767488d9280e0e4f99282da9 SHA512 f68f0c0cbcfb5a0a7e7d98eb695a9843ff20f8fbb50412919f1001f939c56ba1ccc64506c53d0c0f37bcd28db376bac7c72be99c0ebec8b584e2402cd17b2342
+DIST virtualenv-20.29.1.tar.gz 7658028 BLAKE2B b03008966fdeb0f7e72525ae5612a17721b9e5cbfb1e95f7a0b1d9677dfc8d3036e86623724a722ea5571f32bb7a43a7af0ec530fba3fa4e96b5215b5ee06e66 SHA512 94a2c9ce13cb98bf1df6f2e0a9db0e1acacf4667fb9609ad39d8ae7a6529818c0b1597b463262b0ea9a492684d9af027fa0ac9c1bb499e862ab587786b3b9511
diff --git a/dev-python/virtualenv/virtualenv-20.28.0.ebuild b/dev-python/virtualenv/virtualenv-20.28.0.ebuild
deleted file mode 100644
index 47c4776991ac..000000000000
--- a/dev-python/virtualenv/virtualenv-20.28.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
-
-	dev-python/ensurepip-pip
-	dev-python/ensurepip-setuptools
-	dev-python/ensurepip-wheel
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_TIMEOUT=180
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# use wheels from ensurepip bundle
-		"${FILESDIR}/${PN}-20.26.3-ensurepip.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# workaround test failures due to warnings from setuptools-scm, sigh
-	echo '[tool.setuptools_scm]' >> pyproject.toml || die
-
-	# remove useless pins
-	sed -i -e 's:,<[0-9.]*::' pyproject.toml || die
-
-	# remove bundled wheels
-	rm src/virtualenv/seed/wheels/embed/*.whl || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		# tests for old wheels with py3.7 support
-		tests/unit/seed/embed/test_pip_invoke.py::test_base_bootstrap_via_pip_invoke
-		tests/unit/seed/wheels/test_wheels_util.py::test_wheel_not_support
-		# broken by different wheel versions in ensurepip
-		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_string
-		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_exact
-		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_none
-		tests/unit/seed/wheels/test_acquire.py::test_download_wheel_bad_output
-		# hangs on a busy system, sigh
-		tests/unit/test_util.py::test_reentrant_file_lock_is_thread_safe
-	)
-	case ${EPYTHON} in
-		python3.1[23])
-			EPYTEST_DESELECT+=(
-				tests/unit/create/via_global_ref/test_build_c_ext.py
-			)
-			;&
-		python3.11)
-			EPYTEST_DESELECT+=(
-				# TODO
-				tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezer )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# remove bundled wheels, we're using ensurepip bundle instead
-	find "${ED}" -name '*.whl' -delete || die
-}
diff --git a/dev-python/virtualenv/virtualenv-20.28.1.ebuild b/dev-python/virtualenv/virtualenv-20.28.1.ebuild
index 8af728153afa..fb15c1250415 100644
--- a/dev-python/virtualenv/virtualenv-20.28.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.28.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
diff --git a/dev-python/virtualenv/virtualenv-20.29.1.ebuild b/dev-python/virtualenv/virtualenv-20.29.1.ebuild
new file mode 100644
index 000000000000..8af728153afa
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.29.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 multiprocessing pypi
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
+
+	dev-python/ensurepip-pip
+	dev-python/ensurepip-setuptools
+	dev-python/ensurepip-wheel
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
+		' pypy3)
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/time-machine[${PYTHON_USEDEP}]
+		' 'python3*')
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_TIMEOUT=180
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		# use wheels from ensurepip bundle
+		"${FILESDIR}/${PN}-20.26.3-ensurepip.patch"
+	)
+
+	distutils-r1_src_prepare
+
+	# workaround test failures due to warnings from setuptools-scm, sigh
+	echo '[tool.setuptools_scm]' >> pyproject.toml || die
+
+	# remove useless pins
+	sed -i -e 's:,<[0-9.]*::' pyproject.toml || die
+
+	# remove bundled wheels
+	rm src/virtualenv/seed/wheels/embed/*.whl || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		# tests for old wheels with py3.7 support
+		tests/unit/seed/embed/test_pip_invoke.py::test_base_bootstrap_via_pip_invoke
+		tests/unit/seed/wheels/test_wheels_util.py::test_wheel_not_support
+		# broken by different wheel versions in ensurepip
+		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_string
+		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_exact
+		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_none
+		tests/unit/seed/wheels/test_acquire.py::test_download_wheel_bad_output
+		# hangs on a busy system, sigh
+		tests/unit/test_util.py::test_reentrant_file_lock_is_thread_safe
+	)
+	case ${EPYTHON} in
+		python3.1[23])
+			EPYTEST_DESELECT+=(
+				tests/unit/create/via_global_ref/test_build_c_ext.py
+			)
+			;&
+		python3.11)
+			EPYTEST_DESELECT+=(
+				# TODO
+				tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x TZ=UTC
+	local plugins=( -p flaky -p pytest_mock )
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		plugins+=( -p freezer )
+	else
+		plugins+=( -p time_machine )
+	fi
+	epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# remove bundled wheels, we're using ensurepip bundle instead
+	find "${ED}" -name '*.whl' -delete || die
+}
diff --git a/dev-python/watchfiles/Manifest b/dev-python/watchfiles/Manifest
index 8e7362bb6129..373b072b7460 100644
--- a/dev-python/watchfiles/Manifest
+++ b/dev-python/watchfiles/Manifest
@@ -15,11 +15,15 @@ DIST instant-0.1.13.crate 6305 BLAKE2B 83a2c479e21e789ca9795f66116ebc55481a42afb
 DIST kqueue-1.0.8.crate 12642 BLAKE2B 93a0ee7484655045986d6d5ca800ca001d68bb327f841bff3e54b38beff09ff10c099b2432ebf90cf8213153370e4c4aeab9bb0eb3bb02b1bb494b461dfd2fa0 SHA512 c8734fa2cfbf8b8f173604acf5d13ad4cc2739c879387b548a1200f8383b81a1b72315449eb73844e4b82280a4c29901d20c12cdc746d48f9047db89849985f3
 DIST kqueue-sys-1.0.4.crate 7160 BLAKE2B d75e152cfccbdf7ae000be14e0f84c6d1fd07290fe498349a8715061a83d8c02011b59578db2c451de011ac3eb4b218aeea73963a2a5cd82e7f5f49de0779632 SHA512 6650aef7efd7fbf4f9b6c8c6e4c1a91b79636423d46a0173dcb99de74e6f277cb02ada01cb62aa71c3f174a2c28db62a708b0aada9480fc5bde613204acb30a5
 DIST libc-0.2.154.crate 743304 BLAKE2B 25ff132ec29b78dec455f0a1fc9fbfc744ee0d6eb410aba05ec6b1b08af9d83ec61e56f840f86cb833f590e8cdec7f67ce6e7b630ee227a36581650c81298b84 SHA512 891a36cf153a9f4d58793412c104504c57280994e428ce8ba208673a924b2de38cc21eece09b91696eaea3b2359606dbe9f1509f9bf364bdabdb366ef2dd0f61
+DIST libc-0.2.169.crate 757901 BLAKE2B 1012cf93d8975aa20fc3f2332e253426ff66be6aed63ace5292cc8568ee419b0f1a4b5b39ddbb78d9c2dfd8d72eb0d068c98faa229ab55556da5e674429f0e97 SHA512 c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce
 DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
 DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
 DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
+DIST mio-1.0.3.crate 103703 BLAKE2B 0d2360e4ef45f37104208a31e9aa467d6db041dfeb97403a010a36e1e1427f51d97f8408948c75c0084e6c118f058267bfe87d36e7911cb37366f2b1ac6eb693 SHA512 2142edc7e9378fc3437110c85ba2cee9c9683e87034cd44275d2c389645979db53fbbc29fec304f1d8c8f0464ae17d2a5db1aa9215d696fa0282f5069700b1e2
 DIST notify-0f87ab12707d231fa44180454d59478d3992eb59.gh.tar.gz 96557 BLAKE2B 6365bff1c274d26cf333af40d6fbe66d6ae661e24f67e955cb4c8d00555ca813226e40684129902c248eb557de300424776576204218fbbcb8333b9384ec010e SHA512 3f100ea3fd443c616d8bcdbebe0d69626bb0f1e5dacdc4798db036f6f657e7684924bbaa1cd83ae958b6b93a47988939243d3987bea2cd72133cd2196b5bec7f
+DIST notify-7.0.0.crate 35141 BLAKE2B 671e6e02d35f277a1fb552ba04d9aa8073fd98212ab5ddd6eb92e3d234961f14a5541c3466f6da8a0e366f4d83a1c9723159e41249d8032a6d6405b0ff2cea5a SHA512 e55407f5235192dd784132182549f5cd8ab211bfbc4aebdfc5b2da61b726d5bc523951b675190ab218c6aa125bc70d2bd85c87061e113f825dae22b0b5990d82
+DIST notify-types-1.0.1.crate 14490 BLAKE2B dcdf805989cd64a3c132a73c4100388113bffd1446f1a4d9685826ea43b126b9a51c70340c3221fdd20b1e3aa814b58d4051a995820de206078deaeae4d34eb5 SHA512 3a040f916c967fafc934ddb75b0cab81c8e3c4cd9e7213a8bc5e8650f7481f6a11b740e033348833338c46ba917189f34fd9a933a6dce606381cc361ef44b447
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
 DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c
 DIST proc-macro2-1.0.81.crate 48233 BLAKE2B 94319064772c757b6bf57eb9e759e827454f719d82210271ebab9c6ee4ecfddc9099522cdc8595123efe2efb64fd50eadd7e31419c5842ff1cb8fdd32e8daa0c SHA512 7edec4b786d9fe076ced4fa5c0d369c163fd1c27c895431245a8268ab2e16665b7c0a585552d46ceee6b8103979a4201f92abb381f0e678128abed359f514de7
@@ -39,6 +43,7 @@ DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4
 DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf3ab82536295019268b3125084da5dbcad818070bfdcb6a5de08da4eb483475bc225a829f58a1e3e040b5fba SHA512 da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST watchfiles-1.0.3.gh.tar.gz 47675 BLAKE2B d10b8f0a9db435939e08ab700a7b29e08bcc5fb2d7b1ff255d18aaa125b6bfb7474a9737f22de52947d3a281201dd347ff07b9a5f21989f94c14a9470412ebca SHA512 7e5864a53c28ee4a5486394bad05b1d3c09851dd4b921b364b648170e5eec4ca853f5cf4a1d60dac93b037837e56fffb5f45572d9a13875f4745fa2417a94d2f
+DIST watchfiles-1.0.4.gh.tar.gz 99947 BLAKE2B 94155b090a05f8aad33e6492c264dce4e8da20d8a0a48e314ce67566f523040ec7c14b7445331651dc24477defd3b76953ee6f9558c884aa22bf6d62e0ec6564 SHA512 8b8c0deb0e4a880d6762745fc306d1727df8010c629c2a8c96f44e0a5a2421569d71dc6464b8a340b3b21c22915d75900fe857c0e5d6a4af2db409af730b9938
 DIST winapi-util-0.1.9.crate 12464 BLAKE2B 7fb9dd803fc2608c4e5bc75674472992d82da364f24c22072d5624d6ae6abc44abd3e3ea3c45a7558e045331f3d87572b306b4ab5de52c07ff3706e7f13c2a38 SHA512 c46b893f67ec6e36499b00736bb6b9421e0e2611e76784afa6da01d7ebd033df82f1be7cf8d871d541125d290983f98f26f759488ba9aface49efce8edd682e9
 DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed
 DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03
diff --git a/dev-python/watchfiles/watchfiles-1.0.4.ebuild b/dev-python/watchfiles/watchfiles-1.0.4.ebuild
new file mode 100644
index 000000000000..1a7fe0761bb1
--- /dev/null
+++ b/dev-python/watchfiles/watchfiles-1.0.4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+CRATES="
+	autocfg@1.3.0
+	bitflags@1.3.2
+	bitflags@2.6.0
+	cc@1.0.96
+	cfg-if@1.0.0
+	crossbeam-channel@0.5.12
+	crossbeam-utils@0.8.19
+	filetime@0.2.24
+	fsevent-sys@4.1.0
+	heck@0.5.0
+	indoc@2.0.5
+	inotify-sys@0.1.5
+	inotify@0.10.2
+	instant@0.1.13
+	kqueue-sys@1.0.4
+	kqueue@1.0.8
+	libc@0.2.169
+	libredox@0.1.3
+	log@0.4.22
+	memoffset@0.9.1
+	mio@1.0.3
+	notify-types@1.0.1
+	notify@7.0.0
+	once_cell@1.19.0
+	portable-atomic@1.6.0
+	proc-macro2@1.0.81
+	pyo3-build-config@0.23.3
+	pyo3-ffi@0.23.3
+	pyo3-macros-backend@0.23.3
+	pyo3-macros@0.23.3
+	pyo3@0.23.3
+	python3-dll-a@0.2.11
+	quote@1.0.36
+	redox_syscall@0.5.3
+	same-file@1.0.6
+	syn@2.0.60
+	target-lexicon@0.12.14
+	unicode-ident@1.0.12
+	unindent@0.2.3
+	walkdir@2.5.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	winapi-util@0.1.9
+	windows-sys@0.52.0
+	windows-sys@0.59.0
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.52.6
+"
+
+inherit cargo distutils-r1
+
+DESCRIPTION="Simple, modern file watching and code reload in Python"
+HOMEPAGE="
+	https://pypi.org/project/watchfiles/
+	https://github.com/samuelcolvin/watchfiles/
+"
+SRC_URI="
+	https://github.com/samuelcolvin/watchfiles/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/anyio-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	test? (
+		dev-python/dirty-equals[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+# enjoy Rust
+QA_FLAGS_IGNORED=".*/_rust_notify.*"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# test broken with new anyio
+		# https://github.com/samuelcolvin/watchfiles/issues/254
+		tests/test_watch.py::test_awatch_interrupt_raise
+	)
+
+	rm -rf watchfiles || die
+	epytest
+}
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index d4e198b3256e..0de41c5c8345 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,6 +1,4 @@
 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
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.0.ebuild
deleted file mode 100644
index 93fc44988e99..000000000000
--- a/dev-python/websockets/websockets-14.0.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.2.ebuild b/dev-python/websockets/websockets-14.2.ebuild
new file mode 100644
index 000000000000..767a592057f3
--- /dev/null
+++ b/dev-python/websockets/websockets-14.2.ebuild
@@ -0,0 +1,60 @@
+# 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=( 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/webtest/Manifest b/dev-python/webtest/Manifest
index 25d970d10aa6..5001a63c5c00 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -1 +1,2 @@
 DIST webtest-3.0.2.tar.gz 79331 BLAKE2B 2fa124c25889e5d256861b9df6d2b7b3af18a8ea367197b7dcf38e6182c64e8c3fbba6855f1b95f69917caef6cc82bab3a24064f8ec496775fe1f972d838c63d SHA512 f94d78a09368575f772136f7263244d0dfacd344d94d819b15a7e7d5af2a4186cb88659249f1e7009754ac45fbb9f5a3ee0f9bb7f6eccf903f955b9072bb0433
+DIST webtest-3.0.3.tar.gz 79391 BLAKE2B 7ac8362c325d5570446ed587d725b3e4a81e6167295de3030070078e209c692ed95c1a4a03f5db2b2a2e390cfb80ab17adf1a359ec3b349e11514f4bcd4c483d SHA512 5122fa995f9fc4a2338cfe9c3516648d56b0e843c66b8e40b869d5ba3e3ed1bd442836712ed6dd683ea1db2080ce7d5674d71f053c7a29a80812e4cc2606f1de
diff --git a/dev-python/webtest/webtest-3.0.3.ebuild b/dev-python/webtest/webtest-3.0.3.ebuild
new file mode 100644
index 000000000000..94ac2b3113cd
--- /dev/null
+++ b/dev-python/webtest/webtest-3.0.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN="WebTest"
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Helper to test WSGI applications"
+HOMEPAGE="
+	https://docs.pylonsproject.org/projects/webtest/en/latest/
+	https://github.com/Pylons/webtest/
+	https://pypi.org/project/WebTest/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/paste[${PYTHON_USEDEP}]
+	dev-python/pastedeploy[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
+	>=dev-python/waitress-3.0.2[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyquery[${PYTHON_USEDEP}]
+		dev-python/wsgiproxy2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/legacy-cgi[${PYTHON_USEDEP}]
+		' 3.13)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/webtest-2.0.33-no-pylons-theme.patch"
+)
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index 3f5bcd58fc44..03c8ffe64f7b 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,2 +1,3 @@
-DIST wrapt-1.16.0.gh.tar.gz 138520 BLAKE2B 6317f2fa58aaa017b510f60fb20e8b3bc4721977806f4b8e7a3f316bfa4da2a8d24156f8ab670d96f5bab6fcc29437d5d18c28ce91618f5a7093cc85d6c5b578 SHA512 65bdda3b6580748ceb720e8fc1a6b05832a355d541aa650bc87052f3aa8793d03d29a080b79eceb16392e297aed8f11a283e36f5f40a0db614b409b1dc2b6c9c
 DIST wrapt-1.17.0.gh.tar.gz 140517 BLAKE2B 0aa883d31cac6a72c18b48a03e3ba18326d2b6f71ab241a9c772a58662011c706db2526d3459b4d5c7017f911cdc9e2518b52abefae7239cc38ee635d47a46ba SHA512 b552676a9c41c2feadf9eeab78c011bcc068f6b160d5d91aa6afc8b880abaaf8f170071e8eb03811959d3510cb19cb8fcc0db41a3c4e7eb6c92cf04882d9c0d2
+DIST wrapt-1.17.1.gh.tar.gz 140610 BLAKE2B 9e556a06094eb81853685632a311b9accf05d39979e4bdc66eb7a4560dad7ffb253239eb51ef9545f689e6eec6c80de2e6ee12747068c28dd3dae1a9b4bf6784 SHA512 b73f60c9ea0dae9bb0009b2f0d4149001645e4e2940bcd36d867fb44cb9b68cd7e726fb3c2d8d4345da44ff626dd2a457edbd527d46291ea030e13828fe68506
+DIST wrapt-1.17.2.gh.tar.gz 140660 BLAKE2B 58e9da7bb250a614717d18a20c61a0f6f45e77aa9c90e13be21e8e4094a1d24516d6388e15997cbbca296abb976bac0ce42f720f74fe4946d000dd570bca0da4 SHA512 12a6e610f180ce34a7edad39225b54f62d58d487e8b3379321e00e0d0c1b265a5a570de15ec5e5a6b38748052617dbb486f802ae924ab48b51b3ccd40d1170bf
diff --git a/dev-python/wrapt/files/wrapt-1.16.0-py313.patch b/dev-python/wrapt/files/wrapt-1.16.0-py313.patch
deleted file mode 100644
index b404bc0762b9..000000000000
--- a/dev-python/wrapt/files/wrapt-1.16.0-py313.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 185f1f2692a64f7b908b98a25d890b951a12c3c7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Fri, 8 Mar 2024 00:40:11 +0100
-Subject: [PATCH] Fix classmethod tests with Python 3.13+
-
-Fixes https://github.com/GrahamDumpleton/wrapt/issues/259
-
----
- tests/test_outer_classmethod.py | 18 ++++++++++--------
- tests/test_synchronized_lock.py | 26 ++++++++++++++------------
- 2 files changed, 24 insertions(+), 20 deletions(-)
-
-diff --git a/tests/test_outer_classmethod.py b/tests/test_outer_classmethod.py
-index ab807646..c08d34a5 100644
---- a/tests/test_outer_classmethod.py
-+++ b/tests/test_outer_classmethod.py
-@@ -128,18 +128,20 @@ def test_class_call_function(self):
-         # first argument with the actual arguments following that. This
-         # was only finally fixed in Python 3.9. For more details see:
-         # https://bugs.python.org/issue19072
-+        # Starting with Python 3.13 the old behavior is back.
-+        # For more details see https://github.com/python/cpython/issues/89519
- 
-         _args = (1, 2)
-         _kwargs = {'one': 1, 'two': 2}
- 
-         @wrapt.decorator
-         def _decorator(wrapped, instance, args, kwargs):
--            if PYXY < (3, 9):
--                self.assertEqual(instance, None)
--                self.assertEqual(args, (Class,)+_args)
--            else:
-+            if (3, 9) <= PYXY < (3, 13):
-                 self.assertEqual(instance, Class)
-                 self.assertEqual(args, _args)
-+            else:
-+                self.assertEqual(instance, None)
-+                self.assertEqual(args, (Class,)+_args)
- 
-             self.assertEqual(kwargs, _kwargs)
-             self.assertEqual(wrapped.__module__, _function.__module__)
-@@ -176,12 +178,12 @@ def test_instance_call_function(self):
- 
-         @wrapt.decorator
-         def _decorator(wrapped, instance, args, kwargs):
--            if PYXY < (3, 9):
--                self.assertEqual(instance, None)
--                self.assertEqual(args, (Class,)+_args)
--            else:
-+            if (3, 9) <= PYXY < (3, 13):
-                 self.assertEqual(instance, Class)
-                 self.assertEqual(args, _args)
-+            else:
-+                self.assertEqual(instance, None)
-+                self.assertEqual(args, (Class,)+_args)
- 
-             self.assertEqual(kwargs, _kwargs)
-             self.assertEqual(wrapped.__module__, _function.__module__)
-diff --git a/tests/test_synchronized_lock.py b/tests/test_synchronized_lock.py
-index 0e43f7af..7c41aa5a 100644
---- a/tests/test_synchronized_lock.py
-+++ b/tests/test_synchronized_lock.py
-@@ -165,36 +165,38 @@ def test_synchronized_outer_classmethod(self):
-         # function to the class before calling and just calls it direct,
-         # explicitly passing the class as first argument. For more
-         # details see: https://bugs.python.org/issue19072
-+        # Starting with Python 3.13 the old behavior is back.
-+        # For more details see https://github.com/python/cpython/issues/89519
- 
--        if PYXY < (3, 9):
--            _lock0 = getattr(C4.function2, '_synchronized_lock', None)
--        else:
-+        if (3, 9) <= PYXY < (3, 13):
-             _lock0 = getattr(C4, '_synchronized_lock', None)
-+        else:
-+            _lock0 = getattr(C4.function2, '_synchronized_lock', None)
-         self.assertEqual(_lock0, None)
- 
-         c4.function2()
- 
--        if PYXY < (3, 9):
--            _lock1 = getattr(C4.function2, '_synchronized_lock', None)
--        else:
-+        if (3, 9) <= PYXY < (3, 13):
-             _lock1 = getattr(C4, '_synchronized_lock', None)
-+        else:
-+            _lock1 = getattr(C4.function2, '_synchronized_lock', None)
-         self.assertNotEqual(_lock1, None)
- 
-         C4.function2()
- 
--        if PYXY < (3, 9):
--            _lock2 = getattr(C4.function2, '_synchronized_lock', None)
--        else:
-+        if (3, 9) <= PYXY < (3, 13):
-             _lock2 = getattr(C4, '_synchronized_lock', None)
-+        else:
-+            _lock2 = getattr(C4.function2, '_synchronized_lock', None)
-         self.assertNotEqual(_lock2, None)
-         self.assertEqual(_lock2, _lock1)
- 
-         C4.function2()
- 
--        if PYXY < (3, 9):
--            _lock3 = getattr(C4.function2, '_synchronized_lock', None)
--        else:
-+        if (3, 9) <= PYXY < (3, 13):
-             _lock3 = getattr(C4, '_synchronized_lock', None)
-+        else:
-+            _lock3 = getattr(C4.function2, '_synchronized_lock', None)
-         self.assertNotEqual(_lock3, None)
-         self.assertEqual(_lock3, _lock2)
- 
diff --git a/dev-python/wrapt/wrapt-1.16.0.ebuild b/dev-python/wrapt/wrapt-1.16.0.ebuild
deleted file mode 100644
index 8679d9cc6028..000000000000
--- a/dev-python/wrapt/wrapt-1.16.0.ebuild
+++ /dev/null
@@ -1,45 +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=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Module for decorators, wrappers and monkey patching"
-HOMEPAGE="
-	https://github.com/GrahamDumpleton/wrapt/
-	https://pypi.org/project/wrapt/
-"
-SRC_URI="
-	https://github.com/GrahamDumpleton/wrapt/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+native-extensions"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-
-PATCHES=(
-	# https://github.com/GrahamDumpleton/wrapt/pull/260
-	"${FILESDIR}/${P}-py313.patch"
-)
-
-python_compile() {
-	local -x WRAPT_INSTALL_EXTENSIONS=$(usex native-extensions true false)
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/wrapt/wrapt-1.17.0.ebuild b/dev-python/wrapt/wrapt-1.17.0.ebuild
index cecbe2d9407c..c5a3aa5e3098 100644
--- a/dev-python/wrapt/wrapt-1.17.0.ebuild
+++ b/dev-python/wrapt/wrapt-1.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
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+native-extensions"
 
 distutils_enable_tests pytest
diff --git a/dev-python/wrapt/wrapt-1.17.1.ebuild b/dev-python/wrapt/wrapt-1.17.1.ebuild
new file mode 100644
index 000000000000..8928c246da61
--- /dev/null
+++ b/dev-python/wrapt/wrapt-1.17.1.ebuild
@@ -0,0 +1,40 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/_}
+DESCRIPTION="Module for decorators, wrappers and monkey patching"
+HOMEPAGE="
+	https://github.com/GrahamDumpleton/wrapt/
+	https://pypi.org/project/wrapt/
+"
+SRC_URI="
+	https://github.com/GrahamDumpleton/wrapt/archive/${PV/_}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+native-extensions"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+
+python_compile() {
+	local -x WRAPT_INSTALL_EXTENSIONS=$(usex native-extensions true false)
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/wrapt/wrapt-1.17.2.ebuild b/dev-python/wrapt/wrapt-1.17.2.ebuild
new file mode 100644
index 000000000000..8928c246da61
--- /dev/null
+++ b/dev-python/wrapt/wrapt-1.17.2.ebuild
@@ -0,0 +1,40 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/_}
+DESCRIPTION="Module for decorators, wrappers and monkey patching"
+HOMEPAGE="
+	https://github.com/GrahamDumpleton/wrapt/
+	https://pypi.org/project/wrapt/
+"
+SRC_URI="
+	https://github.com/GrahamDumpleton/wrapt/archive/${PV/_}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+native-extensions"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+
+python_compile() {
+	local -x WRAPT_INSTALL_EXTENSIONS=$(usex native-extensions true false)
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index ac7f9119e650..8ce13070d5ca 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,5 +1,5 @@
 DIST xarray-2024.10.0.tar.gz 3788358 BLAKE2B 974e84e4584201a435e6b2eb48e882f09c44b4fd66583fb86aad4002e404bb07480598e27b1ae5b66863b8f69026d62affdf999f0a6d316966e05841cf1f21b9 SHA512 3a17548cdc3d3b6123c81c124a47b1e538b223e8955593064b37dcc23f61b7cbaf62df57d74a0b8f8cd55f21bfd1a8c69622cb328d08e4212cf0c16d464416dd
 DIST xarray-2024.11.0.tar.gz 3247277 BLAKE2B 2011ba6fa587a6fe96792a7d5a8f253dc589aea59af909c14b7c6a6295eda555df3a12d225fea0af503a778551c8a542fa743a5027c27b60c3e2f8cb4f6c3281 SHA512 0f2d22391eb851b82b804ebd9404a9863143a9ca647fa0d52d9c1b421f94187739986e8c1205274840f46329478846802b11304c02c5dad58ae9ffc6062b1cec
-DIST xarray-2024.6.0.tar.gz 3715179 BLAKE2B 42fa46883d27f656dca9b82e1647bd94a62a427582cd52d847131a8e01caf77a597fcc128453fee1f68c38897a9f995dd4c644e9b68b551ee1c28bc0d48e9465 SHA512 b6f24f834d71cca84f6a485858571a17bcb250915d4f84c886c9e16fc240ae3c3e91d573726e8a09f1dbe269abbfae97498868476eef1a90813ddb29c6a6db62
-DIST xarray-2024.7.0.tar.gz 3728663 BLAKE2B c5b14c3d4ea2cec90565a8fb93e49974f52c6f0e55103cd791e746e674d886be85c7df244690513a482b32062e733a670b759b710739303ae79f9a13beea8c01 SHA512 6a094dacdd8f09fb4674c67e03e1df67d0651053088fe39912713842dddb397cf5b5629193df170a4738dc8f75e96ae26582c73fac4679a1439e9d015dfcfcd1
 DIST xarray-2024.9.0.tar.gz 3747432 BLAKE2B 4b2a3be1712194710aa00f4416479d93171ba3bcc49a68edf2bff65a2224c334807d4db9e63a95d6da7f7bd08170771cdad73f2d224837c35ccfcb2c72b881fb SHA512 179e1a6689095a091c49d6fe3b34e72afbfcfbf4d10056a695e4804cee2fc5e6da1ff9b3073ecce790618031286a2f383f00042d38c49e94a672ee6c2214b85b
+DIST xarray-2025.1.0.tar.gz 3256313 BLAKE2B 28d16b4d7ee99252ce684e4e0ed69b6eb06a3f476c0dbdd6b952bae08a68357bcdc3dde427a788ebffa4498856eb1af78fe9a625541bf6616a32a5daa7862468 SHA512 ea70284f3a9b8bc1dc217354683e67101ea03514ace39a3bdd9f96bf58c36ae6846330ef647f72475e25087f272a33114ba88ecdfed5e18a5df8593efa6e19fd
+DIST xarray-2025.1.1.tar.gz 3257038 BLAKE2B 2a1efed4dbd9de3f099d6fbc89f31f477dfa31f9067b976a5c18d1d8699d21428a6bb5d94a6ca7f31b296f4b132e8ef4e312aca25fc3da6a5d7dec4022f084c4 SHA512 a0cde2c8e38887878bcde25fd3ea6ee436b522ca73f52359d2c8ac1993447472d7cd5e5d4b11016ec48d1b86dba08e9207caf00b2b43ab896c777395e51f7943
diff --git a/dev-python/xarray/xarray-2024.6.0-r1.ebuild b/dev-python/xarray/xarray-2024.6.0-r1.ebuild
deleted file mode 100644
index 60f9f6b9a7e3..000000000000
--- a/dev-python/xarray/xarray-2024.6.0-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="
-	https://xarray.pydata.org/
-	https://github.com/pydata/xarray/
-	https://pypi.org/project/xarray/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-IUSE="big-endian"
-
-RDEPEND="
-	>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
-	>=dev-python/pandas-2.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-"
-# note: most of the test dependencies are optional
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/cftime[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		!riscv? ( dev-python/netcdf4[bzip2,szip,${PYTHON_USEDEP}] )
-		dev-python/toolz[${PYTHON_USEDEP}]
-		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO: these fail with filter errors even if netcdf4 is built
-		# with blosc/zstd support
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[zstd]'
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_lz]'
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_lz4]'
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_lz4hc]'
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_zlib]'
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_zstd]'
-	)
-
-	if ! has_version ">=dev-python/scipy-1.4[${PYTHON_USEDEP}]" ; then
-		EPYTEST_DESELECT+=(
-			'xarray/tests/test_missing.py::test_interpolate_na_2d[coords1]'
-		)
-
-		if ! has_version "dev-python/scipy[${PYTHON_USEDEP}]" ; then
-			EPYTEST_DESELECT+=(
-				xarray/tests/test_calendar_ops.py::test_interp_calendar
-			)
-		fi
-	fi
-
-	if use big-endian ; then
-		EPYTEST_DESELECT+=(
-			# Appears to be a numpy issue in display? See bug #916460.
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-20-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-09-21T00:12:44.145224808-ns-float64-1e+30-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225216-ns-float64--9.223372036854776e+18-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-01-01T00:00:01.000001-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:21:52.901038080-ns-float32-20.0-True]'
-		)
-	fi
-
-	if [[ ${ABI} != *64* ]]; then
-		EPYTEST_DESELECT+=(
-			# these tests hardcode object sizes for 64-bit arches
-			# https://github.com/pydata/xarray/issues/9127
-			xarray/tests/test_dataarray.py::TestDataArray::test_repr_multiindex
-			xarray/tests/test_dataarray.py::TestDataArray::test_repr_multiindex_long
-			xarray/tests/test_dataset.py::TestDataset::test_repr_multiindex
-			xarray/tests/test_formatting.py::test_array_repr_dtypes_unix
-		)
-	fi
-
-	if has_version ">=dev-python/numpy-2[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			xarray/tests/test_dataset.py::TestDataset::test_polyfit_warnings
-			# https://github.com/pandas-dev/pandas/issues/56996
-			xarray/tests/test_backends.py::test_use_cftime_false_standard_calendar_in_range
-			# TODO
-			'xarray/tests/test_dtypes.py::test_maybe_promote[q-expected19]'
-			'xarray/tests/test_dtypes.py::test_maybe_promote[Q-expected20]'
-			'xarray/tests/test_conventions.py::TestCFEncodedDataStore::test_roundtrip_mask_and_scale[dtype0-create_unsigned_masked_scaled_data-create_encoded_unsigned_masked_scaled_data]'
-			'xarray/tests/test_conventions.py::TestCFEncodedDataStore::test_roundtrip_mask_and_scale[dtype1-create_unsigned_masked_scaled_data-create_encoded_unsigned_masked_scaled_data]'
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/xarray/xarray-2024.6.0.ebuild b/dev-python/xarray/xarray-2024.6.0.ebuild
deleted file mode 100644
index 446bc77dca5c..000000000000
--- a/dev-python/xarray/xarray-2024.6.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="
-	https://xarray.pydata.org/
-	https://github.com/pydata/xarray/
-	https://pypi.org/project/xarray/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~riscv x86"
-IUSE="big-endian"
-
-RDEPEND="
-	>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
-	>=dev-python/pandas-2.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-"
-# note: most of the test dependencies are optional
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/cftime[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version ">=dev-python/scipy-1.4[${PYTHON_USEDEP}]" ; then
-		EPYTEST_DESELECT+=(
-			'xarray/tests/test_missing.py::test_interpolate_na_2d[coords1]'
-		)
-
-		if ! has_version "dev-python/scipy[${PYTHON_USEDEP}]" ; then
-			EPYTEST_DESELECT+=(
-				xarray/tests/test_calendar_ops.py::test_interp_calendar
-			)
-		fi
-	fi
-
-	if use big-endian ; then
-		EPYTEST_DESELECT+=(
-			# Appears to be a numpy issue in display? See bug #916460.
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-20-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-09-21T00:12:44.145224808-ns-float64-1e+30-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225216-ns-float64--9.223372036854776e+18-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-01-01T00:00:01.000001-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:21:52.901038080-ns-float32-20.0-True]'
-		)
-	fi
-
-	if [[ ${ABI} != *64* ]]; then
-		EPYTEST_DESELECT+=(
-			# these tests hardcode object sizes for 64-bit arches
-			# https://github.com/pydata/xarray/issues/9127
-			xarray/tests/test_dataarray.py::TestDataArray::test_repr_multiindex
-			xarray/tests/test_dataarray.py::TestDataArray::test_repr_multiindex_long
-			xarray/tests/test_dataset.py::TestDataset::test_repr_multiindex
-			xarray/tests/test_formatting.py::test_array_repr_dtypes_unix
-		)
-	fi
-
-	if has_version ">=dev-python/numpy-2[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			xarray/tests/test_dataset.py::TestDataset::test_polyfit_warnings
-			# https://github.com/pandas-dev/pandas/issues/56996
-			xarray/tests/test_backends.py::test_use_cftime_false_standard_calendar_in_range
-			# TODO
-			'xarray/tests/test_dtypes.py::test_maybe_promote[q-expected19]'
-			'xarray/tests/test_dtypes.py::test_maybe_promote[Q-expected20]'
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/xarray/xarray-2024.7.0.ebuild b/dev-python/xarray/xarray-2024.7.0.ebuild
deleted file mode 100644
index 3e4615142e1f..000000000000
--- a/dev-python/xarray/xarray-2024.7.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="
-	https://xarray.pydata.org/
-	https://github.com/pydata/xarray/
-	https://pypi.org/project/xarray/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="big-endian"
-
-RDEPEND="
-	>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
-	>=dev-python/pandas-2.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-"
-# note: most of the test dependencies are optional
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/cftime[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		!riscv? ( dev-python/netcdf4[bzip2,szip,${PYTHON_USEDEP}] )
-		dev-python/toolz[${PYTHON_USEDEP}]
-		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO: these fail with filter errors even if netcdf4 is built
-		# with blosc/zstd support
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[zstd]'
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_lz]'
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_lz4]'
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_lz4hc]'
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_zlib]'
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_zstd]'
-	)
-
-	if ! has_version ">=dev-python/scipy-1.4[${PYTHON_USEDEP}]" ; then
-		EPYTEST_DESELECT+=(
-			'xarray/tests/test_missing.py::test_interpolate_na_2d[coords1]'
-		)
-
-		if ! has_version "dev-python/scipy[${PYTHON_USEDEP}]" ; then
-			EPYTEST_DESELECT+=(
-				xarray/tests/test_calendar_ops.py::test_interp_calendar
-			)
-		fi
-	fi
-
-	if use big-endian ; then
-		EPYTEST_DESELECT+=(
-			# Appears to be a numpy issue in display? See bug #916460.
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-20-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-09-21T00:12:44.145224808-ns-float64-1e+30-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225216-ns-float64--9.223372036854776e+18-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-01-01T00:00:01.000001-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:21:52.901038080-ns-float32-20.0-True]'
-		)
-	fi
-
-	if [[ ${ABI} != *64* ]]; then
-		EPYTEST_DESELECT+=(
-			# these tests hardcode object sizes for 64-bit arches
-			# https://github.com/pydata/xarray/issues/9127
-			xarray/tests/test_dataarray.py::TestDataArray::test_repr_multiindex
-			xarray/tests/test_dataarray.py::TestDataArray::test_repr_multiindex_long
-			xarray/tests/test_dataset.py::TestDataset::test_repr_multiindex
-			xarray/tests/test_formatting.py::test_array_repr_dtypes_unix
-		)
-	fi
-
-	if has_version ">=dev-python/numpy-2[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			xarray/tests/test_dataset.py::TestDataset::test_polyfit_warnings
-			# https://github.com/pandas-dev/pandas/issues/56996
-			xarray/tests/test_backends.py::test_use_cftime_false_standard_calendar_in_range
-			# TODO
-			'xarray/tests/test_dtypes.py::test_maybe_promote[q-expected19]'
-			'xarray/tests/test_dtypes.py::test_maybe_promote[Q-expected20]'
-			'xarray/tests/test_conventions.py::TestCFEncodedDataStore::test_roundtrip_mask_and_scale[dtype0-create_unsigned_masked_scaled_data-create_encoded_unsigned_masked_scaled_data]'
-			'xarray/tests/test_conventions.py::TestCFEncodedDataStore::test_roundtrip_mask_and_scale[dtype1-create_unsigned_masked_scaled_data-create_encoded_unsigned_masked_scaled_data]'
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/xarray/xarray-2025.1.0-r1.ebuild b/dev-python/xarray/xarray-2025.1.0-r1.ebuild
new file mode 100644
index 000000000000..c7dd33b2184f
--- /dev/null
+++ b/dev-python/xarray/xarray-2025.1.0-r1.ebuild
@@ -0,0 +1,118 @@
+# 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="N-D labeled arrays and datasets in Python"
+HOMEPAGE="
+	https://xarray.pydata.org/
+	https://github.com/pydata/xarray/
+	https://pypi.org/project/xarray/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="big-endian"
+
+RDEPEND="
+	>=dev-python/numpy-1.24[${PYTHON_USEDEP}]
+	>=dev-python/pandas-2.1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-23.2[${PYTHON_USEDEP}]
+"
+# note: most of the test dependencies are optional
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/bottleneck[${PYTHON_USEDEP}]
+		dev-python/cftime[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		!riscv? ( !x86? (
+			dev-python/netcdf4[bzip2,szip,${PYTHON_USEDEP}]
+		) )
+		dev-python/toolz[${PYTHON_USEDEP}]
+		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO: these fail with filter errors even if netcdf4 is built
+		# with blosc/zstd support
+		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[zstd]'
+		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_lz]'
+		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_lz4]'
+		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_lz4hc]'
+		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_zlib]'
+		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_zstd]'
+	)
+
+	if ! has_version ">=dev-python/scipy-1.4[${PYTHON_USEDEP}]" ; then
+		EPYTEST_DESELECT+=(
+			'xarray/tests/test_missing.py::test_interpolate_na_2d[coords1]'
+		)
+
+		if ! has_version "dev-python/scipy[${PYTHON_USEDEP}]" ; then
+			EPYTEST_DESELECT+=(
+				xarray/tests/test_calendar_ops.py::test_interp_calendar
+			)
+		fi
+	fi
+
+	if use big-endian ; then
+		EPYTEST_DESELECT+=(
+			# Appears to be a numpy issue in display? See bug #916460.
+			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-20-True]'
+			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-09-21T00:12:44.145224808-ns-float64-1e+30-True]'
+			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225216-ns-float64--9.223372036854776e+18-True]'
+			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-None-False]'
+			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225-us-int64-None-False]'
+			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-01-01T00:00:01.000001-us-int64-None-False]'
+			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:21:52.901038080-ns-float32-20.0-True]'
+		)
+	fi
+
+	if [[ ${ABI} != *64* ]]; then
+		EPYTEST_DESELECT+=(
+			# these tests hardcode object sizes for 64-bit arches
+			# https://github.com/pydata/xarray/issues/9127
+			xarray/tests/test_dataarray.py::TestDataArray::test_repr_multiindex
+			xarray/tests/test_dataarray.py::TestDataArray::test_repr_multiindex_long
+			xarray/tests/test_dataset.py::TestDataset::test_repr_multiindex
+			xarray/tests/test_formatting.py::test_array_repr_dtypes_unix
+
+			# converting timestamps into ns, causing an overflow
+			xarray/tests/test_cftimeindex.py::test_asi8
+			xarray/tests/test_coding_times.py::test_decode_cf_time_bounds
+			xarray/tests/test_coding_times.py::test_use_cftime_false_standard_calendar_in_range
+			xarray/tests/test_coding_times.py::test_decode_cf_datetime_non_standard_units
+		)
+	fi
+
+	case ${ARCH} in
+		arm64)
+			EPYTEST_DESELECT+=(
+				'xarray/tests/test_backends.py::TestNetCDF4Data::test_roundtrip_mask_and_scale[dtype0-create_unsigned_false_masked_scaled_data-create_encoded_unsigned_false_masked_scaled_data]'
+				'xarray/tests/test_backends.py::TestNetCDF4Data::test_roundtrip_mask_and_scale[dtype1-create_unsigned_false_masked_scaled_data-create_encoded_unsigned_false_masked_scaled_data]'
+			)
+			;;
+	esac
+
+	if ! has_version "dev-python/seaborn[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			xarray/tests/test_plot.py::TestContour::test_colors
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/xarray/xarray-2025.1.1.ebuild b/dev-python/xarray/xarray-2025.1.1.ebuild
new file mode 100644
index 000000000000..c7dd33b2184f
--- /dev/null
+++ b/dev-python/xarray/xarray-2025.1.1.ebuild
@@ -0,0 +1,118 @@
+# 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="N-D labeled arrays and datasets in Python"
+HOMEPAGE="
+	https://xarray.pydata.org/
+	https://github.com/pydata/xarray/
+	https://pypi.org/project/xarray/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="big-endian"
+
+RDEPEND="
+	>=dev-python/numpy-1.24[${PYTHON_USEDEP}]
+	>=dev-python/pandas-2.1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-23.2[${PYTHON_USEDEP}]
+"
+# note: most of the test dependencies are optional
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/bottleneck[${PYTHON_USEDEP}]
+		dev-python/cftime[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		!riscv? ( !x86? (
+			dev-python/netcdf4[bzip2,szip,${PYTHON_USEDEP}]
+		) )
+		dev-python/toolz[${PYTHON_USEDEP}]
+		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO: these fail with filter errors even if netcdf4 is built
+		# with blosc/zstd support
+		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[zstd]'
+		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_lz]'
+		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_lz4]'
+		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_lz4hc]'
+		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_zlib]'
+		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_zstd]'
+	)
+
+	if ! has_version ">=dev-python/scipy-1.4[${PYTHON_USEDEP}]" ; then
+		EPYTEST_DESELECT+=(
+			'xarray/tests/test_missing.py::test_interpolate_na_2d[coords1]'
+		)
+
+		if ! has_version "dev-python/scipy[${PYTHON_USEDEP}]" ; then
+			EPYTEST_DESELECT+=(
+				xarray/tests/test_calendar_ops.py::test_interp_calendar
+			)
+		fi
+	fi
+
+	if use big-endian ; then
+		EPYTEST_DESELECT+=(
+			# Appears to be a numpy issue in display? See bug #916460.
+			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-20-True]'
+			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-09-21T00:12:44.145224808-ns-float64-1e+30-True]'
+			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225216-ns-float64--9.223372036854776e+18-True]'
+			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-None-False]'
+			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225-us-int64-None-False]'
+			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-01-01T00:00:01.000001-us-int64-None-False]'
+			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:21:52.901038080-ns-float32-20.0-True]'
+		)
+	fi
+
+	if [[ ${ABI} != *64* ]]; then
+		EPYTEST_DESELECT+=(
+			# these tests hardcode object sizes for 64-bit arches
+			# https://github.com/pydata/xarray/issues/9127
+			xarray/tests/test_dataarray.py::TestDataArray::test_repr_multiindex
+			xarray/tests/test_dataarray.py::TestDataArray::test_repr_multiindex_long
+			xarray/tests/test_dataset.py::TestDataset::test_repr_multiindex
+			xarray/tests/test_formatting.py::test_array_repr_dtypes_unix
+
+			# converting timestamps into ns, causing an overflow
+			xarray/tests/test_cftimeindex.py::test_asi8
+			xarray/tests/test_coding_times.py::test_decode_cf_time_bounds
+			xarray/tests/test_coding_times.py::test_use_cftime_false_standard_calendar_in_range
+			xarray/tests/test_coding_times.py::test_decode_cf_datetime_non_standard_units
+		)
+	fi
+
+	case ${ARCH} in
+		arm64)
+			EPYTEST_DESELECT+=(
+				'xarray/tests/test_backends.py::TestNetCDF4Data::test_roundtrip_mask_and_scale[dtype0-create_unsigned_false_masked_scaled_data-create_encoded_unsigned_false_masked_scaled_data]'
+				'xarray/tests/test_backends.py::TestNetCDF4Data::test_roundtrip_mask_and_scale[dtype1-create_unsigned_false_masked_scaled_data-create_encoded_unsigned_false_masked_scaled_data]'
+			)
+			;;
+	esac
+
+	if ! has_version "dev-python/seaborn[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			xarray/tests/test_plot.py::TestContour::test_colors
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 87c165427006..9814c8d0840b 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,2 +1,5 @@
 DIST xcffib-1.5.0.tar.gz 89544 BLAKE2B cb3820a53eb7694078e5dbb175951b6dbdc445c06f397898e52319fd8a7633f2d8115f0d096a14b2b3de0c7b07918343d077705814574ff41de2bf06a12812c0 SHA512 aaa426b57d0d8dc45cb6a2036c862af6308fb5781667b8dba3f5ff399fe5e15912860d0bb696ac09f1efd4ffbbdaf7f555ef76039bd660f36f5c6179535b654f
 DIST xcffib-1.6.0.tar.gz 101378 BLAKE2B 75b4e64f125d0948fc438202b81d0808acd988d363216382f42611e7f821f4df2cecd9464edfc0e89cacd4237d82fc0d0276a357f5625dc03811b1f9c0951a0d SHA512 53fbde4a61f061a460d8a33c70ce4189c7ea5ff30777cee0017f42fcee9d7e2954d48906d764feabbb0506be96a40350579043e9cea04f9886ff1e8f35ed3f9c
+DIST xcffib-1.6.2.tar.gz 101368 BLAKE2B a4768fd7d5da875c04a45beccd8ad8bcdc2459dd9a5b3b19fe40813376262a025c04af80d75927c26c2fb26e1a5fefb29e0ff406aae206ac0edab546535e40cf SHA512 f3d3c751c2307025b2f3b3cb523a31fe4f0560af428e2705d06fc1ce7980d36a5568ad1e73c9acde065347210d754c0f30718cff28fb823f09c65025c0ecfc4a
+DIST xcffib-1.7.0.tar.gz 102415 BLAKE2B 8ce76e52cda54f1985659667601f9abd001e8f0373a399cbf327037a24142b22722ebf55efe0f292d906f06216149e1d3122fde3162f59f923783f319fd73420 SHA512 bb21e50690cb50ab32108552cc0ea9f7758a23541789b365b38a8c2c1d839cc8f468e6ba581f69b6235fd96782036ef5afcee4b555a4a721333e527db6c2b20c
+DIST xcffib-1.7.1.tar.gz 101487 BLAKE2B e489e96305cc8b277ebc02389514c23522c54444dc05434d0ac669b3337446947f5d5b9db1bfbbc1e1d7f9d81de06a50d63c0e4c3a2fddc6b8e1a8fad3ad704b SHA512 59ef3adf29fd8e6c5636855aa56777cab84d92c18d8e93500df9e315f0ae53f5693561f571ee98dbea6d9eae9ce5708018e2d6c27dccb14e9eb0ca85668fd515
diff --git a/dev-python/xcffib/xcffib-1.6.2.ebuild b/dev-python/xcffib/xcffib-1.6.2.ebuild
new file mode 100644
index 000000000000..c4ee6e535384
--- /dev/null
+++ b/dev-python/xcffib/xcffib-1.6.2.ebuild
@@ -0,0 +1,42 @@
+# 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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
+HOMEPAGE="
+	https://github.com/tych0/xcffib/
+	https://pypi.org/project/xcffib/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="
+	x11-libs/libxcb
+"
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
+	' 'python*')
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		x11-base/xorg-server[xvfb]
+		x11-apps/xeyes
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	rm -rf xcffib || die
+	epytest
+}
diff --git a/dev-python/xcffib/xcffib-1.7.0.ebuild b/dev-python/xcffib/xcffib-1.7.0.ebuild
new file mode 100644
index 000000000000..943dced69962
--- /dev/null
+++ b/dev-python/xcffib/xcffib-1.7.0.ebuild
@@ -0,0 +1,43 @@
+# 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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
+HOMEPAGE="
+	https://github.com/tych0/xcffib/
+	https://pypi.org/project/xcffib/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="
+	x11-libs/libxcb
+"
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
+	' 'python*')
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		x11-base/xorg-server[xvfb]
+		x11-apps/xeyes
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	rm -rf xcffib || die
+	epytest
+}
diff --git a/dev-python/xcffib/xcffib-1.7.1.ebuild b/dev-python/xcffib/xcffib-1.7.1.ebuild
new file mode 100644
index 000000000000..943dced69962
--- /dev/null
+++ b/dev-python/xcffib/xcffib-1.7.1.ebuild
@@ -0,0 +1,43 @@
+# 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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
+HOMEPAGE="
+	https://github.com/tych0/xcffib/
+	https://pypi.org/project/xcffib/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="
+	x11-libs/libxcb
+"
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
+	' 'python*')
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		x11-base/xorg-server[xvfb]
+		x11-apps/xeyes
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	rm -rf xcffib || die
+	epytest
+}
diff --git a/dev-python/yara-python/Manifest b/dev-python/yara-python/Manifest
index 7d6e025c5f69..93d43b85609b 100644
--- a/dev-python/yara-python/Manifest
+++ b/dev-python/yara-python/Manifest
@@ -1,2 +1 @@
-DIST yara-python-4.5.0.gh.tar.gz 39301 BLAKE2B 9bee247ef21b6e2e576acbac7cfcf140fd3b1ab992affc019f9ce290e00809e397d5057b9033f53fcd94885e855e783e4c43835850c9e6dcd57d74661ba8380b SHA512 b4f091bff7fd3bcd63e7f9f0a765aac7bdb3f17a1bc4b163687ae9ca21048194d90cf2bf1165998edb9953b83e022939179c51de59862a456676f099de69778d
 DIST yara-python-4.5.1.gh.tar.gz 39419 BLAKE2B e89677bd8b857e9c7b40b172311245ab7cc2149bfec6de09905494645d65abd67b1a41978101795ddb9dcb9d4344c3a4ffc23c96291580f17f59cdabe66a1d59 SHA512 fb3d78cea58a5dcb21287d5211805ef7097c07b9117e4fe78a7e56b40f2520950f0e8d6f1eb3c4253a454e10ca782c3826c19613bd17677bef491ae91f9f9d2a
diff --git a/dev-python/yara-python/yara-python-4.5.0.ebuild b/dev-python/yara-python/yara-python-4.5.0.ebuild
deleted file mode 100644
index bde11ea7577c..000000000000
--- a/dev-python/yara-python/yara-python-4.5.0.ebuild
+++ /dev/null
@@ -1,41 +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_EXT=1
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1
-
-DESCRIPTION="Python interface for a malware identification and classification tool"
-HOMEPAGE="https://github.com/VirusTotal/yara-python"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/VirusTotal/yara-python.git"
-else
-	SRC_URI="https://github.com/virustotal/yara-python/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	=app-forensics/yara-$(ver_cut 1-2)*
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests unittest
-
-python_configure_all() {
-	cat >> setup.cfg <<-EOF
-	[build_ext]
-	dynamic_linking = True
-	EOF
-}
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/yara-python/yara-python-4.5.1.ebuild b/dev-python/yara-python/yara-python-4.5.1.ebuild
index 8d9384a3f704..424796f10c59 100644
--- a/dev-python/yara-python/yara-python-4.5.1.ebuild
+++ b/dev-python/yara-python/yara-python-4.5.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
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/VirusTotal/yara-python.git"
 else
 	SRC_URI="https://github.com/virustotal/yara-python/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index 2af9eaf5d668..a7f08ab4883a 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -1,3 +1 @@
-DIST ytmusicapi-1.8.2.tar.gz 284079 BLAKE2B c47560141062bd43af8334132c16d095daa3e8a6accc90f7c2300f602d85627bcefdda6ef05f2371bef11bd33be1f83575cda1b6bd386a0b449f82b9cbfcd8b9 SHA512 6396f1e245bc390251ca37fe896cf41bb0c5608608134a7d8cc07895aca35cb348e18fdd861b830d8efc4399d5931b82e489e734914f9b685606a2bd7af890ea
-DIST ytmusicapi-1.9.0.tar.gz 292697 BLAKE2B da46b1d5687b5c2f9906e17ec522f918f2286b3ed847c1d43ec3e4e067fc90e8af52f7291c72ae91ccd3cecc7ac07dd9379bef95e9e6b2189d65592dea7bada1 SHA512 4a1236590c0500ffc8a6b4cf809d29ea10998b8ea89e5fde91e1ed1fa65edfcd2fc8e94690e1f332c52fe812669e3c148d405dd821ec4d38b8508e95247183a9
 DIST ytmusicapi-1.9.1.tar.gz 294717 BLAKE2B db290d1d229dfd0791c3d6e24c933b5743c68743cc7030a4344901e9b70300f3617f789a3cc50b57883e896e1c9f8daf6545230576f1a4453d414982f2a886b9 SHA512 0418d224b8ee0563d6f904a9cf429bd8d8d7c9ca9cb51e950a1177317d7d84612280e031d96d4c42c2b713768bbbae13e1ac8172437d093f5b143978979f6577
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.8.2.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.8.2.ebuild
deleted file mode 100644
index 2383fc81933b..000000000000
--- a/dev-python/ytmusicapi/ytmusicapi-1.8.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Unofficial API for YouTube Music"
-HOMEPAGE="https://ytmusicapi.readthedocs.io/
-	https://github.com/sigma67/ytmusicapi/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.9.0.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.9.0.ebuild
deleted file mode 100644
index a2454cd6c6f2..000000000000
--- a/dev-python/ytmusicapi/ytmusicapi-1.9.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{11..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Unofficial API for YouTube Music"
-HOMEPAGE="https://ytmusicapi.readthedocs.io/
-	https://github.com/sigma67/ytmusicapi/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.9.1.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.9.1.ebuild
index a2454cd6c6f2..b8b19e3b23fb 100644
--- a/dev-python/ytmusicapi/ytmusicapi-1.9.1.ebuild
+++ b/dev-python/ytmusicapi/ytmusicapi-1.9.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
@@ -14,7 +14,7 @@ HOMEPAGE="https://ytmusicapi.readthedocs.io/
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 
 RDEPEND="
diff --git a/dev-python/zc-lockfile/zc-lockfile-3.0_p1.ebuild b/dev-python/zc-lockfile/zc-lockfile-3.0_p1.ebuild
index 54ce919576c8..361f69ff3c82 100644
--- a/dev-python/zc-lockfile/zc-lockfile-3.0_p1.ebuild
+++ b/dev-python/zc-lockfile/zc-lockfile-3.0_p1.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 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/zconfig/Manifest b/dev-python/zconfig/Manifest
index 2555384ea9fe..90cac129532f 100644
--- a/dev-python/zconfig/Manifest
+++ b/dev-python/zconfig/Manifest
@@ -1 +1,2 @@
 DIST zconfig-4.1.tar.gz 146996 BLAKE2B fd4299121b418ba7517ef17c2f9be9e0f0a975199a0fb59bd45f54338becb921c2bf0fd87344e08b21734b80dc11abd64d7bef27d7d17313197d9c781b5e5017 SHA512 71dd5a9ce5f72eda76fde19fa2bec4aaf542ebe4b617753b14c07239366d934d9d635aa63407c76bc00edfb305c85c1cecdd187ee7f2b85f25acaa7682839363
+DIST zconfig-4.2.tar.gz 127198 BLAKE2B a533d39c32280bdc5d4b869b9128444e0a36919100bbf7cbe86bf3cd3a67d9be7d20abd6bca831cedff8e8d3f8af4d412fbd92c0db6b1996e72c19d8d2f79879 SHA512 35cc83c51ecfc894edf7d8f2408f63f0c8f59affebb38bab171cc7a56a46916e2f7dae985f0cc9cde92c85cbe93667e2b91b236f60b418f4551d2e5520220a4b
diff --git a/dev-python/zconfig/zconfig-4.2.ebuild b/dev-python/zconfig/zconfig-4.2.ebuild
new file mode 100644
index 000000000000..035b37632cd6
--- /dev/null
+++ b/dev-python/zconfig/zconfig-4.2.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
+PYPI_PN="ZConfig"
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Configuration library supporting a hierarchical schema-driven model"
+HOMEPAGE="
+	https://github.com/zopefoundation/ZConfig/
+	https://pypi.org/project/ZConfig/
+"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="
+	test? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/manuel[${PYTHON_USEDEP}]
+		dev-python/zope-exceptions[${PYTHON_USEDEP}]
+		dev-python/zope-interface[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGES.rst README.rst )
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs \
+	dev-python/sphinxcontrib-programoutput
+
+python_test() {
+	eunittest -s src/ZConfig/tests
+}
diff --git a/dev-python/zenlib/Manifest b/dev-python/zenlib/Manifest
index 177932bb902d..efbb8e285b1a 100644
--- a/dev-python/zenlib/Manifest
+++ b/dev-python/zenlib/Manifest
@@ -1,4 +1,4 @@
 DIST zenlib-2.4.1.gh.tar.gz 21281 BLAKE2B e6a4005d7e5db95ccc18ecb87c10180e148bcf0a860923ac71177c90d448186247e08eee9f2c5dcb7e0803536dc07bfa3137b363a410ea2e03f875c4096fdadc SHA512 a8ceadbda243583ebe45fb56a4a72d2693505d9123346b3a140ccb16ed7de85d60caafffac0274e3f6289b0b82a82643feba039d85ea4f159fb259c7bdd46725
-DIST zenlib-3.0.1.gh.tar.gz 20583 BLAKE2B 9f6e1e349488bd97c9f85b21fb629067b6f207077604e93f8692e98773f2637149f69a4b97328c32fc198660f4fee880110bcef428717218bde5a83c451e4eae SHA512 759684f376bd7f297dd4539289159c2b163b397d80a99a1cda2882ebb125cabdcbf18884299d67af2cb8c50c3fb36af06c48fa29d62121a40406f8c3857732fd
 DIST zenlib-3.0.2.gh.tar.gz 21046 BLAKE2B 1416246d7f030e938a28e6ec8ad7981ca52186df75bf4e48e171b6e41d85bddbb60646642d238b7b3269a204be5f625c15dc9bf0008bb7002db8ae772c7c4c80 SHA512 09574b62dd0e06d1cca67e16a9dd4b75d4b2d3884f483dd17c1bb82debb4bc3c89f8b7f0e8d743c5eb6e2269be7741e3ac9941812f3baed5e1d297a41194c294
 DIST zenlib-3.1.4.gh.tar.gz 23131 BLAKE2B f1595317c2384227ee65e8730889c8af8d243a51075a5dfa0e5b3e40ad5c74cb7e0e13b6789fd77eb109633c793820c3c742660d2f33e46e2dd630c64cb59109 SHA512 13ff8ab3d1a206844731f06aa26bb4060e83efb7c915b946bfa9b60fe83f273f8f938a4ca54324969e60f337e4ba7132a0abce586e173e4658372315e8f32e9e
+DIST zenlib-3.1.5.gh.tar.gz 23230 BLAKE2B 900cc0dbdb087d0d294027747eed046dee452ac7dd15cb572ff769e148e07478a5030f8412fdbebcf89db17c6e06df5368fe28ff1df983723e068b9005cba6ce SHA512 2ece8426ab169e77e14c27c86b4d0d5dab7a0318a9a264a255db102d4f882d1297ac6f8de23b8e80c6ab0d7fbfc0998a08f04eab53bad007efd39171f45b8089
diff --git a/dev-python/zenlib/metadata.xml b/dev-python/zenlib/metadata.xml
index 6b4addafb5fd..f1e8f3757039 100644
--- a/dev-python/zenlib/metadata.xml
+++ b/dev-python/zenlib/metadata.xml
@@ -11,6 +11,8 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
+		<bugs-to>https://github.com/desultory/zenlib/issues</bugs-to>
+		<changelog>https://github.com/desultory/zenlib/releases</changelog>
 		<remote-id type="github">desultory/zenlib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/zenlib/zenlib-3.0.1.ebuild b/dev-python/zenlib/zenlib-3.0.1.ebuild
deleted file mode 100644
index cd63c6cb8120..000000000000
--- a/dev-python/zenlib/zenlib-3.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Useful python decorators and utilities"
-HOMEPAGE="https://github.com/desultory/zenlib/"
-SRC_URI="
-	https://github.com/desultory/zenlib/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest tests
-}
diff --git a/dev-python/zenlib/zenlib-3.1.5.ebuild b/dev-python/zenlib/zenlib-3.1.5.ebuild
new file mode 100644
index 000000000000..f18782714c1a
--- /dev/null
+++ b/dev-python/zenlib/zenlib-3.1.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Useful python decorators and utilities"
+HOMEPAGE="https://github.com/desultory/zenlib/"
+SRC_URI="
+	https://github.com/desultory/zenlib/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+distutils_enable_tests unittest
+
+python_test() {
+	CI=true eunittest tests  # Set CI=true to disable namespace module tests and imports
+}
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 40b30d38ded3..59ddce5ea174 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1 +1,4 @@
 DIST zeroconf-0.136.2.tar.gz 238720 BLAKE2B c47bd38a75f01c1e4268c6567a13e664638c05efa1a45ff1593b3d1347e369acd7a284580a02d34f398710f5faf319150c9eca151667dbb6a184bad35f24d4ce SHA512 30e352cfa2c3b7e7c3b9e38d6d1db0471d1f2c7dcd6785b0aab63a1027da21e966565803d4b2bfde6a89d4362039165f19b5c179117128a992f4960af2ac031d
+DIST zeroconf-0.137.2.tar.gz 237962 BLAKE2B 9ff84381cbd465a49fffeb18e671e8ab55f1c0d0e44f96312177d5a6372c6558e2175846d0cbd96c8e8b8ccd449e56ce614078e0ae22eeed8458b8a421f97192 SHA512 a4ed7146016a68bbc077cc1c61e9299d0f7d636b96da0d3dc9a4d161f709b429d7d44948435a0ed1151e280c173093dd1aaeacf4370958fd2c1b30337e3216af
+DIST zeroconf-0.139.0.tar.gz 240030 BLAKE2B b06f229334d18a840d5e203b3823375ba81f96076df4487c7090e0a971f9c15570dac11f7306d8da8d29fe964c231d3bdd142229a4ab96d6c7b2ef9b35dfc27e SHA512 e989a4b6c9f2a259d916da9808df5ff75db7375bbdc2cfc4b4c76fec8adda0c54112fd10d6a7266a28c408ac47c5955be5bd8e658ba87492dbdc54ed38eccf95
+DIST zeroconf-0.140.1.tar.gz 240320 BLAKE2B 70d10656f8a79a837d24901ceffb106ff86c805f922569aef48aa4e7b94f0f88e80c48085a282d3a928a863509309593f8f6457d6a0b0608eb0143c5dd56c7aa SHA512 b92c25dad0e313f72870da54d0f9f9f96c889130f23eba2946702fb95c82757a40f96285771568074d78346f67f9e366ef0e488256a669daf602971919f48ab1
diff --git a/dev-python/zeroconf/zeroconf-0.137.2.ebuild b/dev-python/zeroconf/zeroconf-0.137.2.ebuild
new file mode 100644
index 000000000000..d93c4b7a232a
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.137.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/python-zeroconf/python-zeroconf/
+	https://pypi.org/project/zeroconf/
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+# the build system uses custom build script that uses distutils to build
+# C extensions, sigh
+BDEPEND="
+	>=dev-python/cython-3.0.8[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export REQUIRE_CYTHON=1
+
+python_test() {
+	local -x SKIP_IPV6=1
+	local EPYTEST_DESELECT=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+
+		# fragile to timeouts (?)
+		tests/services/test_browser.py::test_service_browser_expire_callbacks
+		tests/utils/test_asyncio.py::test_run_coro_with_timeout
+	)
+	local EPYTEST_IGNORE=(
+		tests/benchmarks
+	)
+
+	epytest -o addopts=
+}
diff --git a/dev-python/zeroconf/zeroconf-0.139.0.ebuild b/dev-python/zeroconf/zeroconf-0.139.0.ebuild
new file mode 100644
index 000000000000..d93c4b7a232a
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.139.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/python-zeroconf/python-zeroconf/
+	https://pypi.org/project/zeroconf/
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+# the build system uses custom build script that uses distutils to build
+# C extensions, sigh
+BDEPEND="
+	>=dev-python/cython-3.0.8[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export REQUIRE_CYTHON=1
+
+python_test() {
+	local -x SKIP_IPV6=1
+	local EPYTEST_DESELECT=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+
+		# fragile to timeouts (?)
+		tests/services/test_browser.py::test_service_browser_expire_callbacks
+		tests/utils/test_asyncio.py::test_run_coro_with_timeout
+	)
+	local EPYTEST_IGNORE=(
+		tests/benchmarks
+	)
+
+	epytest -o addopts=
+}
diff --git a/dev-python/zeroconf/zeroconf-0.140.1.ebuild b/dev-python/zeroconf/zeroconf-0.140.1.ebuild
new file mode 100644
index 000000000000..d93c4b7a232a
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.140.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/python-zeroconf/python-zeroconf/
+	https://pypi.org/project/zeroconf/
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+# the build system uses custom build script that uses distutils to build
+# C extensions, sigh
+BDEPEND="
+	>=dev-python/cython-3.0.8[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export REQUIRE_CYTHON=1
+
+python_test() {
+	local -x SKIP_IPV6=1
+	local EPYTEST_DESELECT=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+
+		# fragile to timeouts (?)
+		tests/services/test_browser.py::test_service_browser_expire_callbacks
+		tests/utils/test_asyncio.py::test_run_coro_with_timeout
+	)
+	local EPYTEST_IGNORE=(
+		tests/benchmarks
+	)
+
+	epytest -o addopts=
+}
diff --git a/dev-python/zope-deprecation/Manifest b/dev-python/zope-deprecation/Manifest
index 7dbd8f008faa..aa8d3ca1d06a 100644
--- a/dev-python/zope-deprecation/Manifest
+++ b/dev-python/zope-deprecation/Manifest
@@ -1 +1,2 @@
 DIST zope.deprecation-5.0.tar.gz 23353 BLAKE2B 9b98291fe252942a8235c70c0a13bfbaf2cb3091e1502099f8a0651b517e748645cbda957f92c790c4d4f2b6ed7324cd5e21bae9d2906f2943e507376a980d76 SHA512 11313626e4141c2f92805c7c533b32160f88bf45667cd5a53a867daad3172947e5ac80433893c515243276030400a8a8e3d3a623ea51cb2b15bd5a5a0927bc46
+DIST zope_deprecation-5.1.tar.gz 24453 BLAKE2B 4dc7d9639a998ba11de839145bf4fb11d3b34de29c756c87de98b833ced4a6f2de4024d7b52a4f8c9ab225bf9c459ae79656d2073b9c76a38d9d8d1397aa06e2 SHA512 77b32d3456c5456ffc36eec936b176cdec365fd4561dd2ac06c3222dd4360ef6339ba34601abb29e273eabc3562b6bcdac5627c35b8b95f083015ba118be7979
diff --git a/dev-python/zope-deprecation/zope-deprecation-5.1.ebuild b/dev-python/zope-deprecation/zope-deprecation-5.1.ebuild
new file mode 100644
index 000000000000..0e1dc958a8e7
--- /dev/null
+++ b/dev-python/zope-deprecation/zope-deprecation-5.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Zope Deprecation Infrastructure"
+HOMEPAGE="
+	https://pypi.org/project/zope.deprecation/
+	https://github.com/zopefoundation/zope.deprecation/
+"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	!dev-python/namespace-zope
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "s:'setuptools',::" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	distutils_write_namespace zope
+	eunittest
+}
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 2c5513439aec..55d86cf0c760 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,2 +1 @@
-DIST zope.interface-7.1.1.tar.gz 253129 BLAKE2B 643092ca4497cf1854be7010aa412f009fa0108e8015a7df0c0d1c00ca0cc66e44863c3e5b24ac950d87f1dbea9d7840b21e0ba9552f7b119779990e18c1d091 SHA512 92809dd7744d5d90c773a85e17b4fdad646690e4f55023ee97541553ef41419dcf733d2944ebb5be911d9b962920c7e1f9660eea1273dfe30751b7c875291fad
 DIST zope.interface-7.2.tar.gz 252960 BLAKE2B be79d583c146d4b33213286696f929ce3f753aa9c966ecffe46c5ef508f1422b521509642a2f6475c0f1ddab3b70345ec31a4a37bf4b811ff3c6760ffc506c9d SHA512 eb927395bd4c4b2567dfeabad9a88bf91cc0cc0838289e96d7452e6a7c9ea56237a1d1f492703eac71ac0957dc0d3e23f57ceec55ff82fcffbbf413e09868a9c
diff --git a/dev-python/zope-interface/zope-interface-7.1.1.ebuild b/dev-python/zope-interface/zope-interface-7.1.1.ebuild
deleted file mode 100644
index 8598bd96dde5..000000000000
--- a/dev-python/zope-interface/zope-interface-7.1.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
-PYPI_PN=${PN/-/.}
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Interfaces for Python"
-HOMEPAGE="
-	https://github.com/zopefoundation/zope.interface/
-	https://pypi.org/project/zope.interface/
-"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+native-extensions"
-
-BDEPEND="
-	test? (
-		dev-python/zope-event[${PYTHON_USEDEP}]
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# strip rdep specific to namespaces
-	sed -i -e "/'setuptools'/d" setup.py || die
-	# force failure if extension build fails
-	sed -i -e "/'build_ext':/d" setup.py || die
-	if ! use native-extensions; then
-		sed -i -e '/ext_modules=/d' setup.py || die
-	fi
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	local -x PURE_PYTHON=0
-	if ! use native-extensions || [[ ${EPYTHON} == pypy3 ]]; then
-		PURE_PYTHON=1
-	fi
-
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	distutils_write_namespace zope
-	eunittest
-}
diff --git a/dev-python/zope-interface/zope-interface-7.2.ebuild b/dev-python/zope-interface/zope-interface-7.2.ebuild
index bcc32b6558ef..c69247fbbf82 100644
--- a/dev-python/zope-interface/zope-interface-7.2.ebuild
+++ b/dev-python/zope-interface/zope-interface-7.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
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+native-extensions"
 
 BDEPEND="
diff --git a/dev-python/zstd/Manifest b/dev-python/zstd/Manifest
index fcd2f14983b9..18b5b624bd03 100644
--- a/dev-python/zstd/Manifest
+++ b/dev-python/zstd/Manifest
@@ -1,2 +1 @@
-DIST zstd-1.5.5.1.tar.gz 1106585 BLAKE2B 6c0d6108a3c5e5e3d013d6e10fadad8150311d2e17d304751dba4ac709e2c8005575ff73e2800392dfd9d7b6bcda9a8e8014d3cbe4a90d12bf12e7416776d744 SHA512 7dc2f3ffe0f94b56ba0cf8360ee510b292e9b8b1e92b8ba1ad1a9206b50f852a4e67e04d8e4900c0705820163d551644b38977e2864c648aae7dcc6b2a2c0a68
 DIST zstd-1.5.6.1.tar.gz 643831 BLAKE2B 8c6cc1cca4fb9fb8a697ea2840f7eded5ec528f079115d15f24fd87b65648aaddfdb784315df8ba6f5fee18bee7c628478fc248b4769cfccca4f300d859768ee SHA512 1dd99ec381794664ae0891d1982ed0d627f72569f1d2c1b439204ccc5194979de8f393594bae17e5e4abbfde29811b4276085385c40664cc65f4b7940ce84d9d
diff --git a/dev-python/zstd/zstd-1.5.5.1.ebuild b/dev-python/zstd/zstd-1.5.5.1.ebuild
deleted file mode 100644
index 7e8b1b988440..000000000000
--- a/dev-python/zstd/zstd-1.5.5.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simple python bindings to Yann Collet ZSTD compression library"
-HOMEPAGE="
-	https://github.com/sergey-dryabzhinsky/python-zstd/
-	https://pypi.org/project/zstd/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	export ZSTD_EXTERNAL=1
-}
diff --git a/dev-python/zstd/zstd-1.5.6.1.ebuild b/dev-python/zstd/zstd-1.5.6.1.ebuild
index c12683519797..e25711563567 100644
--- a/dev-python/zstd/zstd-1.5.6.1.ebuild
+++ b/dev-python/zstd/zstd-1.5.6.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	app-arch/zstd:=
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index ad47418727a4..1988501b8a29 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1,2 @@
-DIST qt-creator-opensource-src-14.0.2.tar.xz 52423044 BLAKE2B 491b00aa9900b45e8e0dea33d4a7c99f543cf3b526931121b87d51828292b1e7e422e890c69cb904a2d5ca3c20de5fa60d87a889c0036a9624c1825b63efe57f SHA512 45b7c1aef062f59446b162006f22fcba17a99f02008624ab332ae5109a31ec55caa3548f7b61a4feb04793fa049b2a67c4a3c37aa3d3e2f3eced31bd11a48ab2
 DIST qt-creator-opensource-src-15.0.0-vendor.tar.xz 509332 BLAKE2B 7c417a0fc14eb3b8e27aec73afa362cea43008107a68290c8fc17631fb06d24f89d7454e191a68ba199bd349142b3f1ae1ddbdff0af6bc69b6d53f61227236c0 SHA512 52fb8b585f8821919550622710b76ab7376668c8cae76ea9880d34b281f052972b3c08192ce8e994f51d86de33c247d27bf3252194dd17c1a7b37e8d5e68d42d
 DIST qt-creator-opensource-src-15.0.0.tar.xz 53254544 BLAKE2B bf295974a904c182f37321a8e7e06704906d9db34f3c96d3e7b1ac2aad2807c106f271e480e9ef7c72f98413fd6faca3c6d9e47d47b62736ce88f4722857be05 SHA512 0a003a17bec60b34c4dc4ac700125dc62be9d2cf50e9044b61cc926b1d7cfa1e8303b98f9ae25abca07cb893398c25f61c3ec28029efe50e88339e5d984d1279
diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch
deleted file mode 100644
index b36cfef2d4e7..000000000000
--- a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-execinfo is unavailable with musl (unless opted to package+use libexecinfo)
---- a/src/libs/utils/qtcassert.cpp
-+++ b/src/libs/utils/qtcassert.cpp
-@@ -9,5 +9,5 @@
- #include <QTime>
- 
--#if defined(Q_OS_UNIX)
-+#if defined(Q_OS_UNIX) && defined(__GLIBC__)
- #include <stdio.h>
- #include <signal.h>
-@@ -30,5 +30,5 @@
-     if (maxdepth < 0 || maxdepth > ArraySize)
-         maxdepth = ArraySize;
--#if defined(Q_OS_UNIX)
-+#if defined(Q_OS_UNIX) && defined(__GLIBC__)
-     void *bt[ArraySize] = {nullptr};
-     int size = backtrace(bt, maxdepth);
---- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
-+++ b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
-@@ -4,5 +4,5 @@
- #include "exception.h"
- 
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
- #include <execinfo.h>
- #include <cxxabi.h>
-@@ -31,5 +31,5 @@
- namespace QmlDesigner {
- 
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
- const char* demangle(const char* name)
- {
-@@ -76,5 +76,5 @@
- }
- 
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
- static QString getBackTrace()
- {
-@@ -114,5 +114,5 @@
-   , m_file(QString::fromUtf8(file))
-   , m_description(description)
--  #ifdef Q_OS_LINUX
-+  #if defined(Q_OS_LINUX) && defined(__GLIBC__)
-   , m_backTrace(getBackTrace())
-   #endif
diff --git a/dev-qt/qt-creator/files/qt-creator-14.0.2-qt681.patch b/dev-qt/qt-creator/files/qt-creator-14.0.2-qt681.patch
deleted file mode 100644
index 0dbe75feb7c4..000000000000
--- a/dev-qt/qt-creator/files/qt-creator-14.0.2-qt681.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-Backport of [1]+[2] to fix tests with Qt6.8.0 and build with Qt6.8.1.
-
-There was some refactoring in these files which prevent anything from
-applying cleanly, so this was manually rebased -- hopefully correct
-(fsengine tests pass again, so it should be fine).
-
-[1] https://github.com/qt-creator/qt-creator/commit/81d4e8a3742
-[2] https://github.com/qt-creator/qt-creator/commit/f993fb76ded
---- a/src/libs/utils/fsengine/diriterator.h
-+++ b/src/libs/utils/fsengine/diriterator.h
-@@ -16,4 +16,36 @@
- namespace Internal {
- 
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
-+inline std::pair<QDir::Filters, QDirIterator::IteratorFlags> convertQDirListingIteratorFlags(
-+    QDirListing::IteratorFlags flags)
-+{
-+    QDir::Filters filters = QDir::Files | QDir::Dirs | QDir::System | QDir::NoDotAndDotDot;
-+    QDirIterator::IteratorFlags iteratorFlags = QDirIterator::NoIteratorFlags;
-+
-+    if (flags & QDirListing::IteratorFlag::ExcludeFiles)
-+        filters.setFlag(QDir::Files, false);
-+    if (flags & QDirListing::IteratorFlag::ExcludeDirs)
-+        filters.setFlag(QDir::Dirs, false);
-+    if (flags & QDirListing::IteratorFlag::ExcludeSpecial)
-+        filters.setFlag(QDir::System, false);
-+    if (flags & QDirListing::IteratorFlag::CaseSensitive)
-+        filters.setFlag(QDir::CaseSensitive, true);
-+    if (flags & QDirListing::IteratorFlag::IncludeHidden)
-+        filters.setFlag(QDir::Hidden, true);
-+
-+    if (flags & QDirListing::IteratorFlag::IncludeDotAndDotDot) {
-+        filters.setFlag(QDir::NoDot, false);
-+        filters.setFlag(QDir::NoDotDot, false);
-+    }
-+
-+    if (flags & QDirListing::IteratorFlag::Recursive)
-+        iteratorFlags.setFlag(QDirIterator::Subdirectories, true);
-+    if (flags & QDirListing::IteratorFlag::FollowDirSymlinks)
-+        iteratorFlags.setFlag(QDirIterator::FollowSymlinks, true);
-+
-+    return {filters, iteratorFlags};
-+}
-+#endif
-+
- class DirIterator : public QAbstractFileEngineIterator
- {
---- a/src/libs/utils/fsengine/fixedlistfsengine.h
-+++ b/src/libs/utils/fsengine/fixedlistfsengine.h
-@@ -67,8 +67,14 @@
- 
- #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
--    IteratorUniquePtr beginEntryList(const QString &path,
--                                     QDir::Filters filters,
--                                     const QStringList &filterNames) override
-+    QAbstractFileEngine::IteratorUniquePtr beginEntryList(
-+        const QString &path,
-+        QDirListing::IteratorFlags itFlags,
-+        const QStringList &filterNames) override
-     {
-+        // We do not support recursive or following symlinks for the Fixed List engine.
-+        Q_ASSERT(itFlags.testFlag(QDirListing::IteratorFlag::Recursive) == false);
-+
-+        const auto [filters, _] = convertQDirListingIteratorFlags(itFlags);
-+
-         return std::make_unique<DirIterator>(m_children, path, filters, filterNames);
-     }
---- a/src/libs/utils/fsengine/fsengine_impl.cpp
-+++ b/src/libs/utils/fsengine/fsengine_impl.cpp
-@@ -297,11 +297,25 @@
- 
- #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
--QAbstractFileEngine::IteratorUniquePtr FSEngineImpl::beginEntryList(const QString &path,
--                                                                    QDir::Filters filters,
--                                                                    const QStringList &filterNames)
-+QAbstractFileEngine::IteratorUniquePtr FSEngineImpl::beginEntryList(
-+    const QString &path, QDirListing::IteratorFlags itFlags, const QStringList &filterNames)
-+{
-+    const auto [filters, iteratorFlags] = convertQDirListingIteratorFlags(itFlags);
-+
-+    FilePaths paths{m_filePath.pathAppended(".")};
-+    m_filePath.iterateDirectory(
-+        [&paths](const FilePath &p, const FilePathInfo &fi) {
-+            paths.append(p);
-+            FilePathInfoCache::CachedData *data
-+                = new FilePathInfoCache::CachedData{fi, QDateTime::currentDateTime().addSecs(60)};
-+            g_filePathInfoCache.cache(p, data);
-+            return IterationPolicy::Continue;
-+        },
-+        {filterNames, filters, iteratorFlags});
-+
-+    return std::make_unique<DirIterator>(std::move(paths), path, filters, filterNames);
-+}
- #else
- QAbstractFileEngine::Iterator *FSEngineImpl::beginEntryList(QDir::Filters filters,
-                                                             const QStringList &filterNames)
--#endif
- {
-     FilePaths paths{m_filePath.pathAppended(".")};
-@@ -317,10 +331,7 @@
-         {filterNames, filters});
- 
--#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
--    return std::make_unique<DirIterator>(std::move(paths), path, filters, filterNames);
--#else
-     return new DirIterator(std::move(paths));
--#endif
- }
-+#endif
- 
- qint64 FSEngineImpl::read(char *data, qint64 maxlen)
---- a/src/libs/utils/fsengine/fsengine_impl.h
-+++ b/src/libs/utils/fsengine/fsengine_impl.h
-@@ -60,7 +60,10 @@
- 
- #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
--    IteratorUniquePtr beginEntryList(const QString &path, QDir::Filters filters,
--                                     const QStringList &filterNames) override;
--    IteratorUniquePtr endEntryList() override { return {}; }
-+    IteratorUniquePtr beginEntryList(
-+        const QString &path,
-+        QDirListing::IteratorFlags filters,
-+        const QStringList &filterNames) final;
-+
-+    IteratorUniquePtr endEntryList() final { return {}; }
- #else
-     Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override;
---- a/src/libs/utils/fsengine/fsenginehandler.cpp
-+++ b/src/libs/utils/fsengine/fsenginehandler.cpp
-@@ -23,7 +23,8 @@
- public:
- #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
--    IteratorUniquePtr beginEntryList(const QString &path,
--                                     QDir::Filters filters,
--                                     const QStringList &filterNames) override
-+    IteratorUniquePtr beginEntryList(
-+        const QString &path,
-+        QDirListing::IteratorFlags filters,
-+        const QStringList &filterNames) override
-     {
-         return std::make_unique<FileIteratorWrapper>(
diff --git a/dev-qt/qt-creator/qt-creator-14.0.2.ebuild b/dev-qt/qt-creator/qt-creator-14.0.2.ebuild
deleted file mode 100644
index a51b3ea8a921..000000000000
--- a/dev-qt/qt-creator/qt-creator-14.0.2.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"https://code.qt.io/qt-creator/qt-creator.git"
-		"https://github.com/qt-creator/qt-creator.git"
-	)
-	EGIT_SUBMODULES=(
-		perfparser
-		src/libs/qlitehtml
-		src/libs/qlitehtml/src/3rdparty/litehtml
-	)
-else
-	QTC_PV=${PV/_/-}
-	QTC_P=${PN}-opensource-src-${QTC_PV}
-	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
-	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
-	S=${WORKDIR}/${QTC_P}
-	KEYWORDS="amd64"
-fi
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://www.qt.io/product/development-tools"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="
-	+clang designer doc +help keyring plugin-dev qmldesigner
-	serialterminal +svg test +tracing webengine
-"
-REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-QT_PV=6.5.4:6
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
-	dev-cpp/yaml-cpp:=
-	>=dev-qt/qt5compat-${QT_PV}
-	>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
-	>=dev-qt/qtdeclarative-${QT_PV}=
-	clang? (
-		$(llvm_gen_dep '
-			llvm-core/clang:${LLVM_SLOT}=
-			llvm-core/llvm:${LLVM_SLOT}=
-		')
-	)
-	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
-	help? (
-		>=dev-qt/qttools-${QT_PV}[assistant]
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
-	)
-	keyring? (
-		app-crypt/libsecret
-		dev-libs/glib:2
-	)
-	qmldesigner? (
-		>=dev-qt/qtquick3d-${QT_PV}=
-		>=dev-qt/qtsvg-${QT_PV}
-	)
-	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	tracing? (
-		app-arch/zstd:=
-		dev-libs/elfutils
-		>=dev-qt/qtcharts-${QT_PV}
-		>=dev-qt/qtshadertools-${QT_PV}
-	)
-"
-# qtimageformats for .webp in examples, semi-optfeature but useful in general
-RDEPEND="
-	${COMMON_DEPEND}
-	help? ( >=dev-qt/qtimageformats-${QT_PV} )
-	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/qttools-${QT_PV}[linguist]
-	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
-	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
-	"${FILESDIR}"/${PN}-14.0.1-clang19.patch
-	"${FILESDIR}"/${PN}-14.0.2-qt681.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	use clang && llvm-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# needed for finding docs at runtime in PF
-	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
-		-i cmake/QtCreatorAPIInternal.cmake || die
-
-	if use plugin-dev; then #928423
-		# cmake --install --component integrates poorly with the cmake
-		# eclass and the install targets are otherwise missing, so strip
-		# out EXCLUDE_FROM_ALL until figure out a better solution
-		find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \
-			's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die
-	fi
-}
-
-src_configure() {
-	# -Werror=lto-type-mismatch issues, needs looking into
-	filter-lto
-
-	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
-	# needs fixing in qtbase as *64 usage comes from its headers' macros
-	use elibc_musl && append-lfs-flags
-
-	local mycmakeargs=(
-		-DBUILD_DEVELOPER_DOCS=$(usex doc)
-		-DBUILD_DOCS_BY_DEFAULT=$(usex doc)
-		-DBUILD_WITH_PCH=no
-		-DWITH_DOCS=$(usex doc)
-		-DWITH_TESTS=$(usex test)
-
-		# sticking to bundled for now until it switches to KF6's
-		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
-
-		# Much can be optional, but do not want to flood users (or maintainers)
-		# with too many flags. Not to mention that many plugins are merely
-		# wrappers around still optional tools (e.g. cvs) and any unwanted
-		# plugins can be disabled at runtime. So optional flags are limited
-		# to plugins with additional build-time dependencies.
-		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
-		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
-		-DBUILD_PLUGIN_APPSTATISTICSMONITOR=$(usex tracing)
-
-		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
-		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
-		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
-		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
-
-		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
-
-		-DBUILD_PLUGIN_HELP=$(usex help)
-		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
-		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
-		# TODO?: package litehtml, but support for latest releases seem
-		# to lag behind and bundled may work out better for now
-		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
-		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
-
-		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
-
-		-DENABLE_SVG_SUPPORT=$(usex svg)
-
-		-DWITH_QMLDESIGNER=$(usex qmldesigner)
-
-		# meant to be in sync with qtbase[journald], but think(?) not worth
-		# handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays
-		-Djournald=no
-
-		# not packaged, but allow using if found
-		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
-		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
-
-		# for bundled qtkeychain (no switch to unbundle right now)
-		# reminder: if ever unbundled/optional, qtbase[dbus] can be removed
-		-DLIBSECRET_SUPPORT=$(usex keyring)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x QT_QPA_PLATFORM=offscreen
-
-	local CMAKE_SKIP_TESTS=(
-		# skipping same tests+label as upstream's CI by default
-		# `grep ctest .github/workflows/build_cmake.yml`
-		tst_perfdata
-	)
-
-	cmake_src_test --label-exclude exclude_from_precheck
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/doc/html
-		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
-	fi
-
-	local DISABLE_AUTOFORMATTING=yes
-	local DOC_CONTENTS="\
-Some plugins (if used) may need optional extra dependencies/USE.
-
-This list provides associations with Gentoo's packages (if exists)
-ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
-
-dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
-else the example tab will be empty alongside missing documentation.
-
-Build Systems:
-- CMakeProjectManager (dev-build/cmake)
-- MesonProjectManager (dev-build/meson)
-- QbsProjectManager (dev-util/qbs)
-
-C++:
-- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
-- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
-- ClangFormat (USE=clang)
-
-Code Analyzer:
-- ClangTools (USE=clang)
-- Cppcheck (dev-util/cppcheck)
-- CtfVisualizer (USE=tracing)
-- PerfProfiler (USE=tracing)
-- Valgrind (dev-debug/valgrind)
-
-Core:
-- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
-
-Device Support:
-- Android (virtual/jdk, will also want the unpackaged Qt for Android)
-
-Other Languages:
-- Nim (dev-lang/nim)
-- Python (dev-lang/python)
-
-Qt Creator:
-- Designer (USE=designer)
-
-Qt Quick:
-- Insight (USE=qmldesigner)
-- QmlDesigner (USE=qmldesigner)
-- QmlProfiler (USE=tracing)
-
-Utilities:
-- AppStatisticsMonitor (USE=tracing)
-- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
-- Conan (dev-util/conan)
-- Docker (app-containers/docker)
-- Haskell (dev-lang/ghc)
-- ScreenRecorder (media-video/ffmpeg)
-- SerialTerminal (USE=serialterminal)
-- SilverSearcher (sys-apps/the_silver_searcher)
-- StudioWelcome (USE=qmldesigner)
-
-Version Control:
-- CVS (dev-vcs/cvs)
-- Fossil (dev-vcs/fossil)
-- Git (dev-vcs/git)
-- Mercurial (dev-vcs/mercurial)
-- Subversion (dev-vcs/subversion)"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild b/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
index 80029092f457..7bdeffec0681 100644
--- a/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-15.0.0-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
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( {15..19} )
 LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake edo flag-o-matic go-env llvm-r1 multiprocessing
+inherit cmake edo flag-o-matic go-env llvm-r2 multiprocessing
 inherit python-any-r1 readme.gentoo-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then
@@ -105,11 +105,6 @@ PATCHES=(
 
 QA_FLAGS_IGNORED="usr/libexec/qtcreator/cmdbridge-.*" # written in Go
 
-pkg_setup() {
-	python-any-r1_pkg_setup
-	use clang && llvm-r1_pkg_setup
-}
-
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
@@ -142,9 +137,11 @@ src_prepare() {
 }
 
 src_configure() {
+	use clang && llvm_chost_setup
+
 	if use cmdbridge-server; then
 		go-env_set_compile_environment
-		local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false -buildmode=pie"
+		export GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false -buildmode=pie"
 	fi
 
 	# -Werror=lto-type-mismatch issues, needs looking into
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index a68584bdc223..3ed1685d4f1f 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-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
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( {15..19} )
 LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake edo flag-o-matic go-env llvm-r1 multiprocessing
+inherit cmake edo flag-o-matic go-env llvm-r2 multiprocessing
 inherit python-any-r1 readme.gentoo-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then
@@ -104,11 +104,6 @@ PATCHES=(
 
 QA_FLAGS_IGNORED="usr/libexec/qtcreator/cmdbridge-.*" # written in Go
 
-pkg_setup() {
-	python-any-r1_pkg_setup
-	use clang && llvm-r1_pkg_setup
-}
-
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
@@ -141,9 +136,11 @@ src_prepare() {
 }
 
 src_configure() {
+	use clang && llvm_chost_setup
+
 	if use cmdbridge-server; then
 		go-env_set_compile_environment
-		local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false -buildmode=pie"
+		export GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false -buildmode=pie"
 	fi
 
 	# -Werror=lto-type-mismatch issues, needs looking into
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index b337d8fe8681..dc15036a7256 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -53,210 +53,6 @@ DIST 5.15.2-0-202011130614qtwidgets-documentation.7z 26789215 BLAKE2B f0561ae272
 DIST 5.15.2-0-202011130614qtx11extras-documentation.7z 36673 BLAKE2B b7eb8f048acecce20b911267755e1e467fb23b975911025cd43915e043ffc3f34b2b38862f32ae9959dc7e5c759d22731d33fa600c9b8d239f0f0ba1bd6343ff SHA512 ade0a62026d32342fb2b48ade9a164d24e506f5e392e68c451055238ce2a673ea4358472c1132daa779498ff7f2351440d73b6218d5a01e8162bda0907215894
 DIST 5.15.2-0-202011130614qtxml-documentation.7z 448310 BLAKE2B 36de636799fbbe1b67db6e0ec19bc478d7d5003b840a7119ad8b11589a4d514b00c7aebc2ac2ff4a80004ecbb8a70b7297eae8f7624171f4ba62435996f62b32 SHA512 ac5d137311eb13491dac18746eef3a1c5dd87d37d3446047c380cfdacad8dfc9d5e54a078278d98ff4ff75b39ad6044fed9bda481e35e307b3f103b792d253cb
 DIST 5.15.2-0-202011130614qtxmlpatterns-documentation.7z 1199986 BLAKE2B 49caea50be44260696026fcc395df016ef69992fc2bb8e3f31005194cda4987729fbf4e837171732ac5d95184a36cf1574c1fa01f6f2520bb8c52515773564c1 SHA512 c2ad2759ef7dcd78c2039f47ee01f9d61338f6735b9ef2caf8c99b959dad94dfb32249ee5cf8d605d71ff8a3cb5549ec602df1877f3624dd9ba6ca7621a5cf0c
-DIST 6.7.2-0-202406110334activeqt-documentation.tar.xz 248756 BLAKE2B 39a43239922db46f1a539ecd61ff952ba9472d7963f772fc9b13bd2e1c030e667c6e753181724918f808c0d4c0553633cc23e54da306bf6c8d94c71d9eab232d SHA512 d024c521ec69c75c0f8ab2c6372ee36d8c57a72c199dfa658344e916ba1678ef67b0a4fb9931645dd0bf29691c65b73a0721514fa290e3538bdccd676d5f6b50
-DIST 6.7.2-0-202406110334qdoc-documentation.tar.xz 287468 BLAKE2B 8848b8a34cae5fb7a77ab2ab34c761ae3c2eaa5ac34892deea2819de13421f10650a93314ec910a16306a1162dc8f063ec4170a091e623379cc373b68cfd00db SHA512 489001ae82ec932dcdac8e110425ea6f240bb96c105ba21658cb5ef4430d9214eb6f79cf47fc8612fca970f21c0e59ab45251e5a10dab84cfa04c7022df9cbb4
-DIST 6.7.2-0-202406110334qmake-documentation.tar.xz 344204 BLAKE2B 1e5c9c4e21eb53dcc303963f6018ecf85414b282d92ad6751ab5095edc141e587644145614e04e3b3eb02fec7310ec07f17a2b28879706013050ab2b71f48ac1 SHA512 a9ee6d7ce909d55c757ff46ac6ae9c813140087b161e41212d91291b90b3a732e7356691f332db31814e7766d070b5f8b3dd67f8fa67abcb1176ae80fb64c5bc
-DIST 6.7.2-0-202406110334qt3d-documentation.tar.xz 5596452 BLAKE2B 91f3033ecc3592011a9634fd3089ecb5c835b49672fdbe5d895eb31aa16caf9610b67a4a9760127390bb9376f22a097b142d7b90643388fa6723593f493c0c5d SHA512 61444822db33e6e4d59c9699eb401cf7375a484a213ba89412899c8e9921b7452d21d1fa01d63babfa17bdbee166f708983a05804c1b6dfbaea245bdeb86d391
-DIST 6.7.2-0-202406110334qt3d-examples-6.7.2.7z 60337866 BLAKE2B 494e4e6e1b50c1468557090aea6b8c335fc0998dd9d9ed0c18535139e1043a36c782f934883af744c9b5686f875abe55a56ce32dcd82b3b192e400669449898b SHA512 0c50921e239199f29b21f4189e313dabde584842552bbdabcc1aef55b059083e895c4bd3d65e91fc876ef82cd3fbce45452d16f8a5a234fd6ca552dd93a6fc73
-DIST 6.7.2-0-202406110334qt5compat-examples-6.7.2.7z 28013 BLAKE2B be3aa45f92eb06ddae1739fce35d975cf28e540aa6604750f5fb369ebfa533d817fa57aeb4d84817e4a901ec5333a4620dd9be2dc83fa73667db403f84dc9555 SHA512 fb823c73b02d60bbcfb51f1c4d010090b98552790ec2bf26f33d77866ed46efb731895d205f2de203dde1fe83b7eadfba3a47e1b04fdb01782ecb803b5a63b26
-DIST 6.7.2-0-202406110334qtactiveqt-examples-6.7.2.7z 12056 BLAKE2B d3e46398a1522cf32670f46c16325f244f57059c1a47a7671f736d09bd2908cdc3b97d5a2aa07311f4f1dec1d4c786a3378b20fdf75ba2f42f3871df3a5014de SHA512 d72314b38859547c9f2956476fa43a25c7475b77ce843b63177d48a839767eafde67caff7ab7c9d3644a7e20088393fa72839474d7a7f36a3d07140526484757
-DIST 6.7.2-0-202406110334qtassistant-documentation.tar.xz 469236 BLAKE2B c8afdf54e4eef9cf3c1f591ede408c6e95882a7e0abab554a246de7dcb869ba343d2930aa67591da39792c9faf662031d55d8d070f6ac6ae7663fe32c0e47d5a SHA512 2fab86d18927fa765ee0980541c58885b4afa40f1e749ab5be1956cd6990f22224c18e53a01089f1f30c441c4640c2d551f3e2244ee52cab38a16a4bf87aedcd
-DIST 6.7.2-0-202406110334qtbase-examples-6.7.2.7z 4314957 BLAKE2B 9061ea75a4363e56aa0338433f3552b4177b3dd6eac23f234e531058cf1a0ad00a496366d768a380c352a731fae4dcf4918a70a4f83d5ed21463fe41fcef47bc SHA512 a38ffc5b48bd0e13983df1020c9b9ce6bc5598f140db58bf265306ab007188a437f031e84f8b8e715158441620a9c03b5063d051572fd6256f6c6c320d8b7dfe
-DIST 6.7.2-0-202406110334qtbluetooth-documentation.tar.xz 1035068 BLAKE2B 5f8c0e5860b85d34730e0a3203148ac88f7dff0e9ded2f4fd213e67a2380f7183ae854d81d6f8b47d359e27406f9a547a4ed22772d93ae80540b51ec9336a741 SHA512 5c259aded83cebac905961c5b8e9a18d80e6cad8cdbac468bf78efd2893c7529477c3a6b298214c2a9b82304f26c8a5c7ea7374d8784909fc3327b15a8db69cc
-DIST 6.7.2-0-202406110334qtcharts-documentation.tar.xz 8853312 BLAKE2B 46e3e55b5622351650a298227dfe9a493f0010c593ec175e30bc8bd3762a24ab32121e703bec165a00cbbc9bb74463e14bf8efda55f493d0ebd895f9ebc75b4e SHA512 3ce033e38b518eacb6ee1e6085a4b63b4244cb7e362cc40f8b0ff1a2d73e09358103217a48ab9145c865e57c5b70add5b5581b607423d2697bc9161d21a4526b
-DIST 6.7.2-0-202406110334qtcharts-examples-6.7.2.7z 163213 BLAKE2B d4da66167bbcc09d7c131f1cb5b68f1690f786444cf3c446a6941c033ef62f5800e2953ca50e2708bbf4136add4b46d3fdadad9f280f5f9dce120d7e918c3e7e SHA512 cb825edf6d61f2849965c1132c0f834ee325bc0f9c0d34bf687891f0c27fbd018a961f586023e7f789a555b2ad063215390a5ab92dd56c90dc0ea7f12a4e5eef
-DIST 6.7.2-0-202406110334qtcmake-documentation.tar.xz 93580 BLAKE2B 08c8289e2f2accd46868873fefa1a98363a839da3bd28a7962975e7633cf142cfc9e53cc7af6022118ec06bbaaea5599c413a58232294125daf8b3cc2fb0d33a SHA512 eae1d5c7d2c74c55aeaf3eda507c5886a25140e5715339c3fc6e549e15d8167f3dc4b2e23eca16965e09f744ddaad516034b2466a60966e6329ba6da8a778276
-DIST 6.7.2-0-202406110334qtconcurrent-documentation.tar.xz 185812 BLAKE2B 5713c3d8633cc6efbd049ba0001c280ba4306f68b5f4809e66145b45c4b72474a7fb17c95208b49fbb4a9ddfac1e1d132028545f6658ad3fb67aac558b6a3513 SHA512 332fcc314f2e0c1a77313147575bbcd60871c117ae2240eaa88a6fbb2a2020fef1220acf6ee8e70a45b1e9ed4f4ac026ef68ba461171a2c91c91d53d0db2baa1
-DIST 6.7.2-0-202406110334qtconnectivity-examples-6.7.2.7z 403863 BLAKE2B 914adc150d8a62b5fda7083e2407917eabfb1b28a90451a3a815c4384a9139bbcc3a7b7b5b0b878d28fca6c1efa846c5a63710e5ab49bf665581bcc5f208728c SHA512 7a538bb8b4e5f9c33846f56e82ddc6f1e16b57a4b8657f60645eefeddedf4e54fa39c82de403accdf93afb4b9e0d34e322072608f130bebfcf9f14a8b556457b
-DIST 6.7.2-0-202406110334qtcore-documentation.tar.xz 7126464 BLAKE2B 3d5418808ab38994e695dfb6625374bf009cc27bb45993e6a4ff5a29634c736760f373d749d4b4f78a376400117390a98f9e7b6ede82462a5b5cbde92aa114ff SHA512 6105b49fdd5023674dff91381b0bc79ca45b8a1b748be7d1872cba9b78f5c2d2e8e57bd0c4462ad3735a772b8c788b47fa449797556208028d411c86e8b41e5a
-DIST 6.7.2-0-202406110334qtcore5compat-documentation.tar.xz 319612 BLAKE2B 1c29e5510853c8ae434143d39dfd846900b9b74721b50d89d7120784566a15e54e94be651ad91697c45c10111fc4d61b55f2f1d0da6b51f4691c7d67ef767abc SHA512 75cc6f0381a65c1c286f2d698442c4250fa096e9bc2f4640ffd005adfc3bc114a554b33a214ad436740750db9985af8657bba7cef8d987331ffd0a9a06db235a
-DIST 6.7.2-0-202406110334qtdatavis3d-documentation.tar.xz 2709180 BLAKE2B 36b8799ec2ca35ea02f8234c3c7027bd92130f1e65dcd98884fbdffc02cde78e21256e53710b5e4aa390630d1aa8cec4884fdf8e581c42b0635e8338782ff2a2 SHA512 6c56fdc8c0412f37ba4dae705a0caa829cd204c66c0ea5e69a74b3bdf3e94ee192b159cc53bcc0caa3a68390a326d39cd8439c8a6790e01226e71a94a275f607
-DIST 6.7.2-0-202406110334qtdatavis3d-examples-6.7.2.7z 2771387 BLAKE2B 5f04db8cda0d5c81bc1f7530d3fce1e1f537600ef512cf7497966a03dc81c05f0e65fea95203ee8a6b88626cdcd5826bee5e93a1918e9b61fab6e61462ab61e5 SHA512 54a0efca7282e00cd6b5db165a33134c3ba2b70a9bbae34509d5dff1f456cab9da060c1327550be5846a722ba38852157c084066a159ac21c10cd0ec8442553a
-DIST 6.7.2-0-202406110334qtdbus-documentation.tar.xz 333800 BLAKE2B 25d93de929a7938699a8f3514802fe4581ebb890155ac649b6585640273cc0f50e57606ababb78affbb775bed2862aebc45aa74528f415011b900b7b97e8939f SHA512 478544db47bc96ee337ed0aedda2b58ed40e3731dcfedbc630760563ee377da03db206f878a3252d5637353bbe66e53c58537c4f0fc030cd01c7f7c9df1e887b
-DIST 6.7.2-0-202406110334qtdeclarative-examples-6.7.2.7z 11655278 BLAKE2B d9a33bf8c0e156e1e892e42518a380e8ca19daec3b74d82532d90428b7871ab5475d9cec66876e223653a9af68cedd5f3d0306d0408edc3ded71bb3f8182f2da SHA512 bc9d26fc022fb90e7b52c060775c296f534dfba014a25869967dbed401528c2cb8b5553cfd8e214669fab3ab60055c79729150f109dee2b5264333d088672128
-DIST 6.7.2-0-202406110334qtdesigner-documentation.tar.xz 3330880 BLAKE2B 71dce44e612bd9069f66579b09fb5308c7e47438e8d10ad300ce5d21e9c87df57217372c35d3550880573869a7ac3c138ec65bb19567823e107db99456b72427 SHA512 20eede5887aea1ede90aba2e46190ced5e3e37e14f236e98401d6bf35bbe66e214b796c90014af2df1eff25d7de1195271099e6cb08d91289b34a6feb4d64f46
-DIST 6.7.2-0-202406110334qtdistancefieldgenerator-documentation.tar.xz 149740 BLAKE2B 1a16b07c97d1efc72e584f7ec8e441346a404dea5fc65755b19277908e1b1974f6fc4cd738f8f0368f3679dd2ad1fb3f6b76e3676f416568d4609e7d04b09118 SHA512 828ebc0065589aa9a5bc0d8ba651c313cb1b3f1a2d5b8922c7007c36e6fb292ad39ac660c8f8177f949e6e008b0c54cedce58327469ee5d8af77ccbefd894703
-DIST 6.7.2-0-202406110334qtdoc-documentation.tar.xz 14801980 BLAKE2B fb2385d28d379d58ff293cb707627beecacd0e5183a5d0302c440b526fc88dfcced97c85ea31a48e18cc31571170f4bb072928f231ee1ac2571fbf9b8b91d7d2 SHA512 2389d3e1c1ceb5f1afe256f141cef0c080e7c0d19c97950fa70edb313190006c5b42ee39ee11be82ff85174e3946a1eaaa818d8dbcd9f3e33ef82c8ea1381ed8
-DIST 6.7.2-0-202406110334qtdoc-examples-6.7.2.7z 8045618 BLAKE2B 114661c51fff3ce96277fb8bd4ef14972496fa475a25526d2d83486309caf55ac70888eb98877ad0465a08f4274bcb64231f078d40067480db4f356a5e9860c2 SHA512 a28903d8d41b33a265a1e7c8f3f7116199d945023d7f9e33988f018ca0ba0fc0a70844aeff5eb80ba51ef535c2b2c279cacfb621935d31d253994d1eb4d36da6
-DIST 6.7.2-0-202406110334qtgraphicaleffects5compat-documentation.tar.xz 25785044 BLAKE2B 02dabda8cb4a8c4b55e1082549be2953f13beec622769bd2645a360159aeb43f1f317d4d0d792b7f190b1f2c4ab2478ce02a97c19d951829190ac2c7cdcbc9e6 SHA512 5b4ad1ca5720c8c4c2df9ef8c55dd503b103824a267d7dd95446c4b1a70d2ee1038b7cb54d999cde9217b3c91a77331c3e8021874bb2edd8c39fbda139ccbc04
-DIST 6.7.2-0-202406110334qtgraphs-documentation.tar.xz 2989464 BLAKE2B b9681a7ed7a97b8a6d8d61d0078f306ad8e787975ed4b7d78f77fe8feea09cf94e0ada1ae543236e1ca09605f15a5d76ebed26535e061bb62fe9877c39af0a0d SHA512 c06fac09c7a9789ebf04706d6a4c29c66b849bee68bbf31830a3001af81fa5a70b050aa352107da3370f750c9e219612480f926012d8f526e01ae0c044480477
-DIST 6.7.2-0-202406110334qtgraphs-examples-6.7.2.7z 2456415 BLAKE2B 774f4a1f0b6a5286372ad2532fbd1e99ecd6d547b22383bdfba7e20444d27727bc5860b6733a25ba9618f9e25bfc8df627b7d394ba7a5097250f3e48bdf73bff SHA512 1109be1000a232b15b42c7dd17f425418c168d19bad25a3c08abee1d67ab784281a9d25403c9e600271e912377a1204f7239e8fdbff3b98612c8ced9f96f4b91
-DIST 6.7.2-0-202406110334qtgrpc-documentation.tar.xz 274072 BLAKE2B d7b048e2c233cec7e2b73d68f5a41aac0675d1c2f3a74cbed318fd78b0d5331f6522f0b06fd2b87b0a37d62084570e91b3eb7d96572f3cc69947f5d6444a8687 SHA512 c7438fab2b5ab5651e9c75a8f5270d18586dbb68ec8536d556d7931a3f9bfbaab3b65131e8d8a6c372ef2269e1095eee52acbf48eb7fa482681d783cb32a8efb
-DIST 6.7.2-0-202406110334qtgrpc-examples-6.7.2.7z 96580 BLAKE2B d9d52451dbd76b97137223ba9ff3964e81b9edb87b0119bb245e24b9c82af2a611ff78e377df310b5872df66447a9a7ed953b5f9b0787b170d500dddeba21586 SHA512 43482367d7f8916ab45ab8857389836f2a12cc4caa76c2bc01b2f7a693eaa08562e9b618f45a3b2f67c262e0091313fd99f3ab32f5dfb1454f2e74dbe2cbaaca
-DIST 6.7.2-0-202406110334qtgui-documentation.tar.xz 7205960 BLAKE2B 21170b5e49b87768338e3356fa13d48954b0fe3af906c8d264db9f586ab2cb1b16315334b162a1ea1a01f10e3e1e47e1ab1e3206d489a67bca6c2af346a5503d SHA512 02044b7a95cae891dce7c7fe63d20ffbe553fd856ecc4f341a7988e96fefa40b388ddabc58084b993898dd9115da22a54a037ea8751af44ae104fe2d365f56ab
-DIST 6.7.2-0-202406110334qthelp-documentation.tar.xz 212392 BLAKE2B 166dd59a2f28d9189a0843ef29f54f8a475899f66597df9bd9beb48b88d60c86d6e66af16455217c4f06b4ab9b5479a56cfe0c7a552d48b64754ad836c6fcd2b SHA512 aa8cd18f97f5723fa87dc071ac7ca2d90f30c890bc3044d5e914d96b5ad683f1d8bc25b1014c2ece71427ae8e2a7b2c9d2c8ab235ac9b84c7e39fbccc0fe10cf
-DIST 6.7.2-0-202406110334qthttpserver-documentation.tar.xz 292108 BLAKE2B 8012c32de12fb741fa600fa9ebfebf2458747fdcd000050a72240998efa05f4c91892cbde9e1b5eff15960182969c4aa4bb4cc2020ec8b2ecf9e05a099d5fc4e SHA512 220249d0e3275f185bb2c7c1cdd354cc76bdf17caf5865ca5039670a78143559b732cba738727a8df7a91335a10a418710c0435b4fb4b965ef0c0d7975b38e2d
-DIST 6.7.2-0-202406110334qthttpserver-examples-6.7.2.7z 51619 BLAKE2B ea16eaca2c34099e555c83166045c5aad97a73362d11d9d6f3e8c574817202e2d4d52229a9ec522b3c520c313043aa3958f57c6888c1d42a8a6c1d5cad26b59e SHA512 54e8e1104f15337f0d50d1945b59812e2a1b83f1a15e7b439d2dcded5814beb91cd2e3b41cb5d127d112205a3a682f5aaf5ab5c6a2a119d7bbe7eeb79f6dbb46
-DIST 6.7.2-0-202406110334qtimageformats-documentation.tar.xz 32220 BLAKE2B e7208e65f05bade8ca2ef9ac694263ea796557293b34450573c270fbad1d831c7f921dfeb8f11d754d3f5ef0f6a4b629d48499573be4c0f7bb8da7df12d8f5b5 SHA512 ae9289d92c296b6685e362a1180182955d508efa93761f30915f5597959731bf34c2293d604a9532d1f85e99a36e4c848afaebf4b8826342e7d45f8078d875f6
-DIST 6.7.2-0-202406110334qtlabsplatform-documentation.tar.xz 539392 BLAKE2B a75e8392a780e5265dc816210e0dfcec6b7da7c8ebbe466b3d55e3340ffe44de07f6ce1fd7aab20fd832f1c9d2ccfa3222136420a2172530d1c6da69b8c86ba2 SHA512 fa5d02ffecb279b1ce94ae475004e79420f98e950b76e5871598980f7cc38b9fdbb2d17e371c14023cf54cdc543855cda38c8be9928abe742a024b662ce4ce1e
-DIST 6.7.2-0-202406110334qtlinguist-documentation.tar.xz 1133804 BLAKE2B ce21532d436823d430ff50cc2fe75b0a73d74b14a96349a9d58f249e071e2456e8af8b926a7a486885e48f2000fe8fb216f486ab07a81bec5b2ec1005772db0c SHA512 ca82eba79057e564f24fcd9293f2dccb3ce78211d62ef88327526064c0a104734d00da12ee4f789eab1558062f66824978862bf7b6c6c4d9938a7d53f050434f
-DIST 6.7.2-0-202406110334qtlocation-documentation.tar.xz 2935176 BLAKE2B 91d86d30d181c6aef6eeeedb57cb0fd553e7bb6b441829cbc8aecf9f691ef3065d54e2e9a237d58df137a9fc4d5d2d4ecc66c4f3faa368bcb7cb94520a11a318 SHA512 c2fd774ee7bbc32d2512764806ceedd621d0c3d8005a447f1b4ca4aaaac6c02856a1ea878361c5dc4daa0a1a6d6c2bbe1945ea2ff76ea488be534c04f811e19f
-DIST 6.7.2-0-202406110334qtlocation-examples-6.7.2.7z 1570415 BLAKE2B aa93f7e9aadec35396ea18297fea54c0f52020e46549de73f8dc41702e3c3952738134bb50578d8c14901374065e0734a6de1e6c5f5658203651e98372b09063 SHA512 ddf31aced7175dcd2c54b96842a76974bb47c8d853c33200ca190cb5ff857d09b814289d973fdc95928ea07dd78ff70719918df04fc50d640dd1cee45fa7b803
-DIST 6.7.2-0-202406110334qtlottieanimation-documentation.tar.xz 40604 BLAKE2B 76a742cfb6260be5bd47356700c680588c770e0f4e7c8d9fac486f37c3a235a1879023bbe78a479dad0abcc26717aaddb75a296fab75e203e8567e7d8f4efe3b SHA512 d9878f8409de6711b042b95f7ece3f65384411c49e26722233fa1bb50fd29c76afede28be8a55df88517a15779efd8e20f91d9d7d8f33adb9c454f6451251872
-DIST 6.7.2-0-202406110334qtmultimedia-documentation.tar.xz 4650432 BLAKE2B 05f741824f83f4a7f91ef5d16add4286a26ccba11239448fbb3bbcc28434fe74f49b3f2e1d420f8660c76723b4f097832ede2f1a8226b4b748748ebb58677a13 SHA512 8f4216c0b802d8d7d7cefdb6862220a3299f52a7eeca28b06b67edd7b807fe885a05b4b451571bd81ecc0039026abe6d425fec656b4e9a54955703cd2108e908
-DIST 6.7.2-0-202406110334qtmultimedia-examples-6.7.2.7z 1648928 BLAKE2B f17437c523f1078cb9d7cd12438e6515a5740dd3ccdb619a5db5758f87982cdfc4778270a1ad9d569ec74f43cba0fbaac2490bbfa05f619ca30b85340333fba7 SHA512 5866d5a0881353e1846861757ba6172c2e7b7540be7f5ede27001fad7ecbce21e558338c40025dab260ef11dd73bb97fcf3049b6a04783d47cc3faf9ecdc85e6
-DIST 6.7.2-0-202406110334qtnetwork-documentation.tar.xz 1431832 BLAKE2B 713310893e7115a13582bd9c7f61dc49e6ef0c53690fcd7100178a9f6494a3991607890a207fa5c39e03ad8457f8313d1dee5684bfc48116776e876894af9ff0 SHA512 39d9c5a5fc90ecfa9356361f552277f2b0a54165d3f21d9f9f2e5a5ec2d4c3c90318d35894cf83e6bee314c76c24e40c9d884ad0a31d6879b7c2029e7c452221
-DIST 6.7.2-0-202406110334qtnetworkauth-documentation.tar.xz 199604 BLAKE2B de90694d2f915dd4ab6adee19c284787979fe04bc37001484338a353e504f868eb221e48470aa9a2375308dad369a05e144737f15cfc1dc5499ca35e7c78058a SHA512 2ede152b577325a68afe5f496ff76fee7e361b70e5b0b86a777b681d4c3ea3e5b891de291c0f11254af41754ad05d64b4675a20469d6e6403c6546afca169a18
-DIST 6.7.2-0-202406110334qtnetworkauth-examples-6.7.2.7z 41557 BLAKE2B c452bcc102b710b5851369e8a6236320f6136e98de1751272b54bab9f2c7fb1f692a30616058e7b41278be83688cd0da4ba5ae91786c43d9c1a20b6b157f4c24 SHA512 9138744f1f78accf7fa7e6f4e7575bd026fc070c414ef6d1bafa043a903a3005e839176b568ea21b8f826eb5f7c872f72c05329c5a16c2b8e54ee4818f124d12
-DIST 6.7.2-0-202406110334qtnfc-documentation.tar.xz 234520 BLAKE2B 698dc75ee43059061b7fb92a3f290c7d566f561c0017efb8c6729924de95320d1409b25583da12b535ea81f919614195f29135b38a5c87ee27eb9f25abbaf1a3 SHA512 5ef536f4c45f86ce9c82a800d33337abf044fe04d6a91e129c7fe70ece5029a9424fd100007c96dc1712aa9b07ea3d2d7212c515a5495e8aedb433e209e12a0a
-DIST 6.7.2-0-202406110334qtopengl-documentation.tar.xz 1026132 BLAKE2B b9a2fe45542101fa624e0c736138840c46a8d1ee065c8d6db5086bd1923a04b22a5e8caad34c4da9e42373dc936c800b6b266e83ce6243f5b6075dd706c2ce92 SHA512 6a672fc414b7f20531a2a62e4f7c0059f56ef5aa1177eb823e19790ca7d62f9b7b79c317aff83dd19337fec2e412c66687e77739426124d45006fc4d0a1b93ba
-DIST 6.7.2-0-202406110334qtpdf-documentation.tar.xz 1023764 BLAKE2B 46333ccc8f68d2689ff78e54df08ed283d698aeea3984ddfd663d893042b3aa63ffcb9df0b06dc99c82c31d6e1011d0c16f0843e2416b4126b8c1411429ac3b5 SHA512 937e9f1d8bb9cfb4b349bbbb728b3c2ad5aa3e7c64d1dbb16c8e18b7f5aba001330793662f0036971e5de6c3d22ebaa4522deb1394aec196e8a0726d053b0e7f
-DIST 6.7.2-0-202406110334qtplatformintegration-documentation.tar.xz 42212 BLAKE2B 49f3488b043d6bda7eb31070c964a7f3149dae59d24913fa61ac0f13797afa98db9b5b7534f6dde2a781da09c5b2243fac27f08d38137a67974df24d45b04373 SHA512 f429d4a114594f25d3b95469c5e210ef79e94b1f0c4915c61e382b2688d43389a4ed18ca32c1a1a00b448078662b4e0a9ccd47809fd746d06adcc3b47f076fe4
-DIST 6.7.2-0-202406110334qtpositioning-documentation.tar.xz 681780 BLAKE2B 95a31613b5dbbf6a50f68b7bcb7f82005df8d5f0f4db64b31acf3efed983187ffb9be4e799164b297c4627767d4550f013098507650aa2f421aa8d912fbbbe11 SHA512 9bc27f7610b6491d00857c418f6e411d56b0beca0977debd095bc5b92b95a8480d05c9dca2899fe1519a00fd7388da0ebd672fec0de1ea88902f1792faa24ded
-DIST 6.7.2-0-202406110334qtpositioning-examples-6.7.2.7z 272482 BLAKE2B 22eeaafe29871448ba81412141c5fd2522a805e24431ebefc1a3b0ce8ed8a1ae66962d1b2e3da86fe14aee0b2e6dbfce70e2fd57cd659ee34512bb21960a9ffc SHA512 62a225b63d24e1cd3952bf060a1d387d2b54d988a3e1c8c8fbf8cbeec3120338346d8f219626f04fd9363b49b0815af5623cf913db2fd4520e5465201cad7a71
-DIST 6.7.2-0-202406110334qtprintsupport-documentation.tar.xz 349784 BLAKE2B 76d46b323a8386723a4a0586ff712fa8584ffe8eb254fee2816955ee56bf24718edaf4bd8e6ba810d7c6970e01434ff025663f27e7c844ad8befd8268b164b6b SHA512 230b813c397d47a121b1b5c93e20f2c1a89c18239d3d57705be2f56e441b91d28a2d908d61e3042d688e4dff633ceb99a2b5bf14cbef6cf543f36444cdab6b4f
-DIST 6.7.2-0-202406110334qtprotobuf-documentation.tar.xz 318092 BLAKE2B 1de9f5056e236f8bd6f264ab57a9097fd188666df3579283a54c9ad60286969a45b0e389487c3f87811acd44875cbc78f97a16454abe6b6b293090eb1d159f94 SHA512 62bb13e629ba430ae10ed1da99bd642dbad9d2493fb34a5711bbbc56d7a93b1d5bfb30e0816ce25b958c47504fe355f98c65e6205740076bea45f1975cf211d0
-DIST 6.7.2-0-202406110334qtqml-documentation.tar.xz 1502496 BLAKE2B c5387024a57048400114a30035ff428dc58c52de4f5f1aa1567bf59217dfe4754b3836801d5b7951ffd3dc745977eb7193f6974743948a97c3609aa255b77a9b SHA512 f5b7fa31be294d45a3dad3fb413f279564af471af7d4b38f6d8ecdb3b9d937aec9476601c4364eaee9200153600f3c05046a66d574144b32db57b8437b6c0144
-DIST 6.7.2-0-202406110334qtqmlcore-documentation.tar.xz 69676 BLAKE2B f456ed4d619d994b719d180e655381f6a18d00d8a60c44972a3758d0ac1ff3f6b6f51613906c98312fb1f0f8ddad4be5a12f164a6052aece82702731a3aa2cdd SHA512 ef8ce824ffed51b61302782ba26e4995368e0a57847f2a7f5402ba296983dd86a3109af05d90304cdf4b1be27ce063c97ba3e8a1ff737ec161e20e8f52424297
-DIST 6.7.2-0-202406110334qtqmlmodels-documentation.tar.xz 139448 BLAKE2B cb4ec40f1940c419aaeb039acec374f1dae578787c155447c816440e15dcc82af9d9c2c838f4191d7b73a308ee5763ae541d489f125179ae521826c5e277e839 SHA512 e8f91c1626a93778a1e182513598f36e7edbcacd539d3722c80cc0ed30a81fe29d7d399496b73cc7e96d1ce864170f2d83e72f3045cf4c126f81208de6b49dfb
-DIST 6.7.2-0-202406110334qtqmltest-documentation.tar.xz 92176 BLAKE2B 8996ddca3e72c8d495df30e72995b219008478fb7925a1082d668f702c05f44a7bf032c652344c305d6043ceaed0c256e74bfff9060d43fc6ab97cf68ac5c453 SHA512 3cf082e888bff06204e9fb430d44345552af4344708e27c3f8f8c55ef05b2771c43b33fb7a235a4cca37e0bd696ec877298d9c646b53a74db4cfea599622071e
-DIST 6.7.2-0-202406110334qtqmlworkerscript-documentation.tar.xz 31272 BLAKE2B 828a5e2580481b50dcd543fb9b8f8314380edeec77c2605e86fda2b3fdb11d2d728009e75c4e2bd4ca3eecc34c3bd7a4f551124ba6abedaaae73b4bca4f471d0 SHA512 8b24ad46e64640dee0ffb0cb464835f94a97401e51927e11469d41d116922106aa6b4ce0dfb4ff5aa84decd9f2eefc69bdfa25f79b4329898286476dce082cc3
-DIST 6.7.2-0-202406110334qtqmlxmllistmodel-documentation.tar.xz 37088 BLAKE2B c960e59852dab4bef13d13f0cdb21ec7ae78a1a1c770c09254da48fbbb1e8593f12e1ac05ca251aa517518efd1769e1b0d58b28165f7f8897746413f2558e5e5 SHA512 2bb2619f5af332b5a52250654697bcdb768477b1083f2e611bb2c7803bafc1019f89c30b26e787f1a5775983eff1e0fcc218082be926145bb928ad6e1efead51
-DIST 6.7.2-0-202406110334qtquick-documentation.tar.xz 24140184 BLAKE2B 2f43c01419dafebc2259c4494014c0cf755b9bc7b44706893e23ea7f1ead40341f202d1db40233ea9a99922344cebc552511d54b28bc2ce6b66679bf8afe2f8e SHA512 ebae5ffcc93e62c8aff95477406d1233f75974086f3e7a15ada6fd3dce07afacfdca2e25ed39cc77537504badf1762519cc098ebb81e225d4ae2b3e19330850b
-DIST 6.7.2-0-202406110334qtquick3d-documentation.tar.xz 62792892 BLAKE2B 3d727767f030f66694399f7d257279a528828fc18a3a4fa468547003a315aa00130f8a0afa1ddaeb5c6e55fa3f8b2f261efa57f8ae48b31d5b59e329c3b426ee SHA512 11fed151af4aa51e6ab14f9e8600a6f80c5244e96c9ea90dd76046462854c0a2858850edc8888e0a7882c733dc74e91322da8394b3e3749dde8a0092649e7a55
-DIST 6.7.2-0-202406110334qtquick3d-examples-6.7.2.7z 19437981 BLAKE2B 331f89b06bdc6d1418e0afab3243148320c41bef07a43265b926eeaeec125f04d646107594e280e16c3399ea903fed940714e9b14e9e303352984d34ee29215a SHA512 dfc92196f37a8e0030eb5231def17c54be21a08d44a6eff3eedf50e666b3e152947d11b2822690f37878b7a09fe75171ee9de46e5d3a5a3742dcda20d64a7535
-DIST 6.7.2-0-202406110334qtquick3dphysics-documentation.tar.xz 4591824 BLAKE2B e2c1dced63ea10f77b010d48afbf41a7e94bf56e226af7a34a430c70545fdd493b0fc193b3084195ca28a612e37a443dad49c6cb0c1d8ec1d26dcfb37d38f726 SHA512 1f03a5414146b0ce64be3feaabde1af9ee958c5ffe173b7df95c86e8e1404dfaf13563cbc1842f70b423e2c9e1a9a3299578a247dfb2de18c1adae67670d7439
-DIST 6.7.2-0-202406110334qtquick3dphysics-examples-6.7.2.7z 2355396 BLAKE2B 41e23b2b8865e7cec48d1f5e1f8b7a8d00b562196c82ea76b3f151e55c715cb5b4d6a95c2cec93aefd07e3cbc747e49e555d9a5e91b8bd4576bcb0738358a196 SHA512 01ba69553e7877b8668a7a847f86327d6291fe3d3b3078d6142e86795dcd16a1c664df862098e100ed52b51cdd8e30ac0bf77cf808c1270d7ba9343bcdbfb0a0
-DIST 6.7.2-0-202406110334qtquickcontrols-documentation.tar.xz 7159884 BLAKE2B 559577315beba463d7b3e9a60bea048f48da1e285beaf8d38f8a977d49429e6474388d869eecf5e1229e856fbc4474adddd31f43661b2f01c12e94b8293eb0f9 SHA512 2c45208561bb529345f1800d21351b1535d77cb6e0fcd9700b6626467655820a4faf89d00bf4abd09a483253e9d78625a25ca26776877277c7a535f31ed9756c
-DIST 6.7.2-0-202406110334qtquickdialogs-documentation.tar.xz 314076 BLAKE2B 430405e1c7200994ca76c9c1eeb6461223db3cd87c343cd03e08e9f4748ba4072f9c1ff41f2a1e38eb6d1a446010640ed5c17a621cdc18dac7231ef70f8e4ed2 SHA512 a5286f6d7b2a5fca05b9ee59f902a6358769db3552a7a3497b7c6969a7b3037ae52ae7f907c1dd8b36cdad4ffe433fbcb0190317dc5fa34537eb8db381a94749
-DIST 6.7.2-0-202406110334qtquickeffectmaker-documentation.tar.xz 804648 BLAKE2B 3d6c48dadaadfb983093878f6ec99833ede76f0236f9bf56f01ecdaa4dd8aadcdadd25a84f2d0d0ce2be0347924040998f0d6f99b642785f5ff45507e534d6ad SHA512 9f811a417137ab6fd4f60f1b3e19985ac8f4a82d391ddb7c494042fa2fdb8402a337dcaa1caee11f784814689fad672fc8e6a746edcfeac1cb95940af4b9e62b
-DIST 6.7.2-0-202406110334qtquickeffectmaker-examples-6.7.2.7z 244740 BLAKE2B 5cf7f634050ce84119c6c9d1b9a097fc55083bada213a7b142853ff82281168d39690560c4a05d9700429255104d9f1f681458be9adf8a665cd5468ccd6c36f1 SHA512 f2c8042e0e0972bc7dd65aad2b60b561b46ec2120fed5208eb686d452166c0ad5e7e44b761feab5868043693bf45df79e9cd8f6c8563c1da21f1abe91e74844f
-DIST 6.7.2-0-202406110334qtquicktimeline-documentation.tar.xz 166184 BLAKE2B 405d91d252437c180c197dd61d9e72d191ae3340199a0d40f7c91f37675812a66f1526c5d2ab85770cd8f382243459117f17671bcfff8d611abda82bf028aaef SHA512 778428a44f39a391cb898e9522f4c9e880de497d0856af2ea2867b71ca404209097b0760bcbc220d049d81cf27975636bcdc97f4d964b6482d67927399bcd5ee
-DIST 6.7.2-0-202406110334qtremoteobjects-documentation.tar.xz 492756 BLAKE2B 77103530cf7fc3bee9160b46e7d2dd0e45a85271c0e87890fe6a84f126723d37ad3a2868c9cccc4d159e6953657284c1b4a397c89b15ccf06a50179ac9215c46 SHA512 ca72d44a48e62ff531546b194d76b0811534191ede837f56f26afd1819be8905f5fee2a8297191eb9d90f703b6e0019b8a69136c6f8c2f3b41ce4a34e32ea39f
-DIST 6.7.2-0-202406110334qtremoteobjects-examples-6.7.2.7z 81608 BLAKE2B 69bf707084ac808348eb3f145927934fa514c84915b686e10e1545b7132193e1d30b603fc818b3cd00ec4afe861e49a2ef491d964451186bf49659d3a78b906a SHA512 050b2955bfa8820c3cec1e335f631ff9f2b2ee35ea3378fb2113b5d20d60b9e72aa2f18752b7729781e676cfe66b33f5f71e71520fad902e5716c498ca6294c2
-DIST 6.7.2-0-202406110334qtscxml-documentation.tar.xz 396068 BLAKE2B 73cbb3ffce89f8d0ae6c7f88a691c1b30e69df737e6b0019fce8f29cca2a92e9a2ca188a6983cd62113c37c20ce2ab2a4acaa78a53076de4543bb309fbe0a11e SHA512 f734d47277ec3b9dae31c0d42b5be32ca439eca9bac6a9855880c08c404d1633386c376613961a148284d1c8abac1e9161658ae5417a703b662ce813e6510fe0
-DIST 6.7.2-0-202406110334qtscxml-examples-6.7.2.7z 140543 BLAKE2B 31c3081b8902934ec30dc63f0ecd2806d03f5668d3aa09b4769b4b7a8dde40d1f85eb0e8261aefe91168a347d5622cb556563ee6c045fb505345b365b7a2fc5c SHA512 f3341a015c8ff9bb938a784ed1f3ad8978e50565dbc4324233d0f31880e44ad35864928e96c0671ccc92e5a0800e4aafa98e49a0eaaaa17fbb6e80e6a9991e45
-DIST 6.7.2-0-202406110334qtsensors-documentation.tar.xz 2146504 BLAKE2B b6aa99a5e27d7803ae26d5db242ac6ed36bfbaf24f4fbbdfc1b1f673e239d8e835fac814a52222855636b6abfd090f282d7ea8e1b3248ddb5b99e419484f3971 SHA512 7a2c7d5c4cf3730234ebdc4aedffa92e047c7e65e113f47d5ddf14f4b6e8449064ee727bb61fd32de669c33bb39f24244f501d2a81b85d767c7bc2798511267d
-DIST 6.7.2-0-202406110334qtsensors-examples-6.7.2.7z 53417 BLAKE2B 651ee12cd0c87ce2684740e701b09a754acecfec8839fe6aba0e9673305e7c4266269860e2aea7d1c2ea1ea05e2bc43752fb57399111decae340314016d76359 SHA512 173bb07bbbf27ce0af739f104d56ffc1f3d94626531e1be99da984844b55677f1577e872c8320153bb57794b81f5fc626d662fd1e741e471a04bcc3ac5a6aa70
-DIST 6.7.2-0-202406110334qtserialbus-documentation.tar.xz 737340 BLAKE2B 190e453e5ee7c593c34387fdaf62298e0f9bb9d0457bd52d03a78d1a00e0b389b75ab3bf38a75e8c723d137235df752ef741f54a19deec1832a6b09cb21134d8 SHA512 8498afab2c0d47828768321ad411533bfd598290a2173ab8c86e7f16ee09bde5212361c77bdc22e4b18e56059edd5fca4ed0baf85871270b6ec78ebb0ec2f20c
-DIST 6.7.2-0-202406110334qtserialbus-examples-6.7.2.7z 212228 BLAKE2B 0cebbbdfd30f504f96a1fe8c3459cb19e123181ec669073aa0c94092578ab5ca41de4179c95af24a9eb9b87adcb59029b5117d0cfa270032324cc66e79a5650e SHA512 8e6bf466d26b15ff569379ab43b5f672be46c8893955f3e00a207dae8e48a0e72298e318f2543fb14fb214dd792b9d10f8a919012da29fd67f24cbfa4edca9b8
-DIST 6.7.2-0-202406110334qtserialport-documentation.tar.xz 183948 BLAKE2B b3c50f09d653632992ea04e2f99c6526e2daa343f70ea18fe9d48dd36f2cca9f73c5543fb6d93710aed911acbed4c8af2e0ae24a223bdf1e6cdf577a098d9360 SHA512 bfedd01eef60196dcb486b0038039d9cfa3428ca37bfc5148587bd9f248cb8f18c7b05da92e53ee35e35107210fce219216f90c6fa6c34ab110779578bd7bbbd
-DIST 6.7.2-0-202406110334qtserialport-examples-6.7.2.7z 81071 BLAKE2B cdc59c20e95bc3cbe74e6478a805ced55e59af097a8cf1e594bb5ee14b91de67040d605568de31806248144f9ad9e5eb6067dbced73e3aa3e13eea9d1ad8f473 SHA512 22a320b856c06cd40be848d94571d68c7d3b8271fe532c9e6803b8b6a2491a996c3961853ff896991b79c7d6ae474542ed148c0bba24f0ede5c1604c995d22a1
-DIST 6.7.2-0-202406110334qtshadertools-documentation.tar.xz 196076 BLAKE2B c2efe1bdee6a95db972b2cb866ba7656a7fa8342215b960e4082469747ce501a196ae4f90d682ae644de5b9660c6bb8c62237cc55cf20ea63842e27979977e71 SHA512 1d2b7a9b74286a4ce5d497fba4489979a82e8597bcde5a3b96806985610d546b264e6e36cb1d42cc944f53856ee6e1dfbbb6ea86bd6b92d512f542a5453522f3
-DIST 6.7.2-0-202406110334qtspeech-examples-6.7.2.7z 157785 BLAKE2B 39d929437b792f0601ab4bcd2f335132070d57caf3efa03efc38c7958d1af458f30a2a235612587bc654b718fbae28ae62ca9f5a27c4caeedb63f8e741b337cc SHA512 32e953677a958dbdbf5030e70907908cf3ff2694a4a5533b82cc4def6dc83c45ab42318394cc2dd48c0311575340f22e70f160f83f1082b2f977a63fa7d6a76e
-DIST 6.7.2-0-202406110334qtsql-documentation.tar.xz 898056 BLAKE2B a1ae5a475470088ef4f35c1b672b83c0342ede3f0304c589d40129d5a6e2d9282058890883ef8b39985c5b28b0091949d14f4d9baa2ad98c9980ac553970c5f9 SHA512 709f6aa42749b4ab96a9bcdb3bc0fac8f1b9e6c2264063801eaf8766d7d91aabb073ae53d778eaed921c6bf8f993ef0e4eee3ede9febea3c5a8da52b971b8e27
-DIST 6.7.2-0-202406110334qtsvg-documentation.tar.xz 104084 BLAKE2B d2639414b4e824b23b809e01f6784f4af871977ba2a364b735001fa8fad6e0789e868502adc9c24d47e64878e5f0aea92551445fe4e5091c7de73187b994d47d SHA512 79b69d05d0a4bd2693e938e89ff44b7e7f20c455a0579e0fe700433a52aedfa0035ffe418162067098bdd3be52436697c4773e79d5de4745cf0c54a3d3210384
-DIST 6.7.2-0-202406110334qtsvg-examples-6.7.2.7z 157 BLAKE2B e458df7959196c4d9545701dcf58e2b324e78aca0b460d4e2deb289a224d5677e927fae391ea631be765a9a65535468a6380ff337e9924283ecc49e5dafa2462 SHA512 31b791b67fadce021124c49f1b498a85dda90780bf3d5f26a2d182a0d8479a5341b5352fa06af61285487acd7e3e7f7301550593c31996d18895f21bc7569327
-DIST 6.7.2-0-202406110334qttestlib-documentation.tar.xz 220500 BLAKE2B 6c296bfee9289706cfb8739fab252e2beb99b105485120d522b649ea2f5593f7828c3a89ebfaee2187337cfca06218a3b12023e2aa93a9b6ecfe084d0e6d2ad9 SHA512 1342e85a39e06aa3b751dfecd06099ca0a74a48450172984709861251c2a56fe8f56cfab4b118c49a673f534e1eae470e527ecbe59b69e2f80fb534f9fb9ecbe
-DIST 6.7.2-0-202406110334qttexttospeech-documentation.tar.xz 401676 BLAKE2B f9a444a54ab89d00b7feee6a0ff38453b265de869033034e39e5c5dbd7273dd59a727d067b56b9ed5594da3db6368fd3d9aca59f8407c22179688e1d7855518e SHA512 6aa104060a48191988cd292625b6e60fe8487353fefab63c82807bb1d6585bc2262de33d703d99b175a0667d6b87c74c3f43256145a962acebedbe4c7437095a
-DIST 6.7.2-0-202406110334qttools-examples-6.7.2.7z 469076 BLAKE2B 943fccdc1ecc3f0b9d4c31193671ca509fc16cb72ebc56f14a39dad463ee35e487a39cf9d0ef5bf473bf9f58e4eb435021919ed2d616c550cd7421d24a25f326 SHA512 68585f2839f68a974bf8f640c1492f7e82c89cf761c49a887105a0433aad0b9ec64867e0e45202318a3c6ee90d04201ad10c2699a57fa91abbcd4abeb7c70d37
-DIST 6.7.2-0-202406110334qtuitools-documentation.tar.xz 206528 BLAKE2B 628d8d5072934f72596dd52139928239aa093e9a21926563fe954665a594637f137b80720b0c553460d95f4fb2291db6b8085c59f0634a3155b92d82f78409d8 SHA512 d142a35f3e9a966551e91c77ebc2a99f8854c63c026a3441383f3fcca653d475278315a23d35ece2bc112422a0c4e592bdb47c517bf24e35ea14c8d16e43e9fa
-DIST 6.7.2-0-202406110334qtvirtualkeyboard-documentation.tar.xz 2073996 BLAKE2B a85db2eedc43f61983a288bd4642a5a66bd6256f64e552d8f27272e101b4217b4ea9768b21e7baf00ee899981e02a3879950db2e76168449083a3810ab97518f SHA512 6b34f26701758c440ffc2221918966da27196e7fa4333896e4451e9c9f1c4a72a00c8671df2d1ac4a277a8c6dd0317c50e8382049c0fdcc950c054270b0450ee
-DIST 6.7.2-0-202406110334qtvirtualkeyboard-examples-6.7.2.7z 7045 BLAKE2B 58d162662e75159ef9794fdd009b7f6edd7278c00552a28f947f342f1bbcbaccfa359b6d500c2c83216acd00461f28cdead5f024e9ffee61f0649c13336a1624 SHA512 5bf7b79e65ff4d400c2b1f05d5901457bc3c04a54f73c9cfeb26a245e3986ba4dbe2315098afc0461a7e071035b083d38c1a077953c508b769f59553688cdce4
-DIST 6.7.2-0-202406110334qtwayland-examples-6.7.2.7z 568514 BLAKE2B 439103691d2b454179ccc852feb299f0daa85860b56b6fb129f240a8877b63815cf736cfe661c99c6aeca4225f8042126e653572c0e88100d6ea683cbde66bca SHA512 36dfe3729b02562ece3421a7fe6ff77982e4f61f9bc10c49ebfd7f235794441cd0f33bc31c9dfe5beae6c3f5dd924287ef39112d384744c42bc72bf73b288c8f
-DIST 6.7.2-0-202406110334qtwaylandcompositor-documentation.tar.xz 1602076 BLAKE2B e95ac0a1ffdc8fee007d4541b4d745517d108d4b556e7a783a85b064f64cce4af6247d7a03c4c2c3217aabb5b11b7a97056a2ba3674b07af3f65e61456bac87e SHA512 460563745ad61bfcad0fa23f1569ae743e987e47dad648ea5dd1ba32152c5ba11e0c931134af335950504c23a8f93bac54bae24a77de1f7899018e69b678e299
-DIST 6.7.2-0-202406110334qtwebchannel-documentation.tar.xz 166376 BLAKE2B fefa8eef18b90a5356502179b8483a66290fd44ed7590dd7ba3a3fe993de003848b51821dd95a049d053a7557794b5aca89b753c5b395dea561c3fb4e9d80401 SHA512 a9afb624dcc976ab16771c1fa2441901a0a1a97d791e05a8727ce4560a42a7d3e2832dd21ab4663ee52214e412f13f2b338ffcb02b4709d89f0340ed9f6926a0
-DIST 6.7.2-0-202406110334qtwebchannel-examples-6.7.2.7z 66110 BLAKE2B b59233f2fdea36af9efac13c21ca7607f2c77450fddfa3632fc957f2c34edc23a2187a616e758107d5b6b69174d94090e1c9af8a8fc1e892405243f175249ea3 SHA512 1e1de5b9eeb90e6f5395f5e5e825d931bb25a27976f0e2f2722ac1ea886d86deb9daac98ace80f0e2f40112ba6728edf36f71ac613a98805f3e27fc6894bc15c
-DIST 6.7.2-0-202406110334qtwebengine-documentation.tar.xz 2007124 BLAKE2B 3df41500c15e05c3986d79af3816ab612c53987d1e4c95be1642b6459c13c93b231f2c94d58ccf1fe8815a0d13db15b57f2a83fd64874d68395ee605846811f4 SHA512 aa7d8dc2933865ffa91e050cf64622d05cfb65bc9c9e3c622183c63692f243571f98fdb3925ef3958d9ac1f0229329ef08af9541bf07170ae56020b2d9beba85
-DIST 6.7.2-0-202406110334qtwebengine-examples-6.7.2.7z 1115962 BLAKE2B c9e960c8b4a897f9c16be4d19ea08dabf5cda36751361c123dc2a42dd26822e1f67c4f65812b9007d5bd00f433fe30bd0ac9bfbe86d5d838aaa92a926059f4ce SHA512 d4dca761d9abc9b481c37e7de1d290d25842d0fb21100eb063cb8cbafd6f6705759b3f1015bc5603d844768cd52351b3188ac2f82187bd96f08c32236675615b
-DIST 6.7.2-0-202406110334qtwebsockets-documentation.tar.xz 532424 BLAKE2B 812bd822496b900842bc59927fc08da962a050cb36511d8ddbe21536fbbe5dd447985e0a70d46f3ab26b7806b6104ad2ae33d7206972340fba557bac6814d831 SHA512 c37e2a7d34ff1f1a6e8945284483a21db42d3b620a16c10f4ab83f6bf169484d4b15975e315f70e6a5146a97afbba3da15fdcd4e54fa19088d47f88825ff349d
-DIST 6.7.2-0-202406110334qtwebsockets-examples-6.7.2.7z 249019 BLAKE2B 746b05ab113ae49351fcbf7e8ef940084ca305d1b4d5ce64503f5319f9ecb18d358e10ba193000b6be7c8c0e092d1748abfbb0c0f738a54cac5e65e0e1b1c621 SHA512 959b6401fa49f79f8651afcab87b9a6aa550cefba9575c71c75ee1edbc754a4a09649c74806b3da4a19c61d248e4e29cee8f112dee1a93ebc6ee51240bd559ac
-DIST 6.7.2-0-202406110334qtwebview-documentation.tar.xz 126020 BLAKE2B a8523c1e1f642a4a3cb8a08051538f1be30e9216e6c902135362e18cfe54b7d7ebe8f0d52f1e4b982cc5f4c06ab9c65293f621aaf069a8367fb2a664a697be8f SHA512 7fb8e4eb61f29f2583003a32372f49c70dc86875a354ae1aa5a88f4d233369f13ce2f4d4495a989678f1ddd7df4299d204beed8aa2121cc35b471dd3f8ce51cc
-DIST 6.7.2-0-202406110334qtwebview-examples-6.7.2.7z 47314 BLAKE2B 822c3ce800c5fb12a63cb87190bfcddf1c7cb6da2420f9ac53cc5a668f68085412084714f10ae93e6e53d87bfacbee12c3bf62975aa46e8ba0c4c1813bf7fa52 SHA512 fde14ae310958dbcaf46500ebd13800bf5673be889f421ad0a8b98f2d26d3776ab2ba2c3ba1917fb94a8900e3a0aedb465e812d177c39b1c39646c9d7b226f3f
-DIST 6.7.2-0-202406110334qtwidgets-documentation.tar.xz 18053400 BLAKE2B 3190d89f451b8178023a5a09b3b1721563ae0d5f12b51376be1b9c9c7386a9038006d16c0181ab2784bb710b52c3018b6d92b94ce5a86caeb86c656bbe3767ac SHA512 7844e47239686a8b63e73af36d5f35b9a9e0e6bcb7f2f95f5690cd36ae46e57d2b8b1d363379620dcd4586d56e3e6402aeb1955eaf4654de6cbdb2ca9b377401
-DIST 6.7.2-0-202406110334qtxml-documentation.tar.xz 341328 BLAKE2B a72b95b2f3c16400d9b7219def352719f81a338a060829a170db5da500672c14c36434669fa74944be59b071362ff8d9dd436e939afbc4b6d63f4c7038c60003 SHA512 9023ae9bec76f28785458e6cde0750aa0b15563ef7d891faa7652d215458fa1516abc891de591cb8b98cf14a2c09ea264f1aabdeb296ca1e929163a60db11b54
-DIST 6.7.3-0-202409200836activeqt-documentation.tar.xz 183200 BLAKE2B e19b998b0f10a0f047056c537f30f1edcd455d9d4adeefe746e8fc07d36cda5844e302d1bd7b5e557366e208062b61a33a1f4f4780c662898f15501c78b459d4 SHA512 7f1735c33a1af9af877c39166762cb23da386d39461cc186c909816a02e01b654dd2b612116cdb1fbbae52dd1207eb51c331c86eaee16a01b5097416a4d60fb0
-DIST 6.7.3-0-202409200836qdoc-documentation.tar.xz 276700 BLAKE2B 6d138bde130c880980ad64556d2fccf79a3c0cc24a42c544de4d1d952eb8c50b9ab854374e3d066f97df33ce40239e122b613cdb53344e5645d5af5eed33dcec SHA512 39a701c885d019cbbd457f49cc348790ca81972bb4e882e28e4d319981f2c956e0bb516edae7ebcfb5b28b4b2b23fc9183f53750da00bc34207174aeb74ee676
-DIST 6.7.3-0-202409200836qmake-documentation.tar.xz 344240 BLAKE2B ac2fef32f4e3621eb2bd0f747aa9f45908a686d9f542cec60184db64e88e101fbb9b0919de0e37fe06cb73db3befc8056164869ba56892d0c8a05f66e78c86f8 SHA512 c8c14b2a987d396e9ce66987efd289c63a45fc78945395b70f1e00b515124c3f01c5808da10bf7fc85570be50f39523d98637acd2603d83cead2cf6a982a9ca7
-DIST 6.7.3-0-202409200836qt3d-documentation.tar.xz 5604636 BLAKE2B bd0cff921d91643f2716fe17c9b3d42cbe54064ac2ac703d0fb0e4e89af9b4d9874b7a242a1f9e011cbc15a5432469f041a17c120ca7eedf3cd692b98148c360 SHA512 5ccfaa6947457eda687191e27d0e231230cc3b9d5ef9ecb498d83b847d0e57c91b0d08d462240a1d63e0d2731f1c38dc14e22cb8e14cff3a7780fc1a6da5b984
-DIST 6.7.3-0-202409200836qt3d-examples-6.7.3.7z 60337747 BLAKE2B b9463d24652ad3d12b090a0be763c127806d7503edea829ce30d75cc2ebe2f5d9a122b68593a24e8535088f457dc03e7517d9e45ff51872f585da169eebd9001 SHA512 c9349d189a2bc47629e34fbe2ed7ae4570564d96872d544e046ce9f28c500f3ce6d4452727a40bf48b39fa312a5fedc85848596e827e5070a9a4c088df7de439
-DIST 6.7.3-0-202409200836qt5compat-examples-6.7.3.7z 28031 BLAKE2B 7b665a7bc737e547b6f2105bb460ce47287e7799b61aa69658a5827899fb2382dd4299935006cd3d06cdba0bcd631fe91148cbd16064cc5b4fa85498ae2b8e83 SHA512 ce9f1512dcc1e1d48f783dfe7d8d7e15bec45b711a932c75a5718864d11da4a999895140be5cf8951fb3757eb11947c4e59d8a3085fea9f2d99f0d30ae08591a
-DIST 6.7.3-0-202409200836qtactiveqt-examples-6.7.3.7z 12022 BLAKE2B a46f5f3344cc4440adce64a69a46b6e22a941dab36c958164cd048e9ead855cb8c057cfb39e185c6a40b3941ee4ca2407f954c87566e2fe5b44a361896d39646 SHA512 b6dd82c6a0043f986fe0a2f1aba18cb8abc97c1a64add8542e95ccc9b800ed6cae37432d10527a80debcba33d459153d9c20a2d897d27ad1630c66f286fdcd61
-DIST 6.7.3-0-202409200836qtassistant-documentation.tar.xz 469220 BLAKE2B 3bdfab60eeb40b03b629e721e48b190e7ff2d75be826cd6b1ef5dd4200a4ba551126dd6768095cdddcbdf705441f1796e1dcc7d85b873a7196450d05fee70311 SHA512 7109b8942453459249d09525bc938cd301a9a040a80c103d6fbd776ba6632f526afa23244c625224b5210480be85df66b08fa66e00ed81e4cc01a699f7450e34
-DIST 6.7.3-0-202409200836qtbase-examples-6.7.3.7z 4314680 BLAKE2B 898772dae8f2e2b593169d13e41a826d26303033dc961d7380fa699a3965707a3584757d3cf77baa53fb33fdc707c3c3b0310ed1a6419840acb84a7bb7e32d61 SHA512 9eb9b7798e5d5ed1afb53cad10846246344834fac03f2ef784928cda0c0ecef6e213211663f2999b70738efaed560ea3303d47c41b4d4d18bd10e8032e8adcbe
-DIST 6.7.3-0-202409200836qtbluetooth-documentation.tar.xz 1034816 BLAKE2B c7a2e14cced3c31d1e9334c08b193e7c8e552198546d8ba7402fa6f94a6571d28f1708bcd0be994ff629e23ba57e32f817ac714370459d18da168c6aa563b0a2 SHA512 cc435be32e7116bed917250a6cb0c3074340c35ea153c3195312b905b0408c164c75ce8cf5e9f15e793aa2c1fd1dbbc73c9cca000e49e209dcf436793963c84f
-DIST 6.7.3-0-202409200836qtcharts-documentation.tar.xz 8854756 BLAKE2B c8526a118497af6933659b0de47f42d8a4cd3f2e15fc2a5fd69983730f3ca3695b04fdb199c1bd56001992b133c18e9ceb31d6630ca4116f09df5d1bef7d4e73 SHA512 10c603c6434a6db664bd4bb933879c0f7b46dc0dc48ad1de6162927dfa594f9b5e1e5b74def1e4264fd6d8ee0154359fd058d9645fa88d8f3b9c1663ea88a096
-DIST 6.7.3-0-202409200836qtcharts-examples-6.7.3.7z 163114 BLAKE2B 23a1c947b40e16bc8986e17a628fdc5c3936a56ffb4e06afb1d7eb9412606800f27bd26b4558619e59d2e49012eda1432cb4343d4b88c1c3aded959241e753f0 SHA512 28f37e48641afd9cb2d1fc08dd2c429a08695954a45c08fce436b83976de1978f0acc82b55eb7200391b0724d251227869970885b02db2b229d5c3877630c0c4
-DIST 6.7.3-0-202409200836qtcmake-documentation.tar.xz 96048 BLAKE2B 28bd3038f47615c799281faf6246ac8fdd578043ccabcc8b3d68de94477b5925cae880bfeade5ba2d0716139d1625879b44744f3a127fe2d2d86e9976c015105 SHA512 7ca7c85c5e5d1ab6ab18505766fa3dde68a3c8c907413ca82ad46624ba348fdc1911468e22faab3ed36d541b27a2f995557c33613ea774d577fcb107b6085fe5
-DIST 6.7.3-0-202409200836qtconcurrent-documentation.tar.xz 185808 BLAKE2B 357c9e2471e5217f0fe833bc302653cf1d33f0069bd1b119ec165b533b6f97aedb467bc581917f6bc1050b41724f8e6e66e88f40502174cbfe2eeff1fb495a02 SHA512 18c925276d97b94391bd95f90349705b59fc91954792ad328a58b2c643b89de750db01f6c9aac19b9ec1b1b147b0fe65f35b72ebdf82ecf16a7199f48f07d0c1
-DIST 6.7.3-0-202409200836qtconnectivity-examples-6.7.3.7z 403836 BLAKE2B 29dd7ed50d9cecc830035933c401bd10af291b2263c082709a7936cf081d939b55bfc8057466da0c9a4ab80746984fbe5f501bb1a0ae79ee596cf683996e7704 SHA512 0090e8473e1c7bfc5c936d6441e2cbb7760a774cd5c18c78f62ee384d30a7185237eb11f04311badd75816be1e40aa779bdfd559929da1f5bf6a79f3ae391a9c
-DIST 6.7.3-0-202409200836qtcore-documentation.tar.xz 7147148 BLAKE2B 0572796b9952e7dac6b18d322891c9eb19016425bbb06c94c581233a0f03a2733a6ba4a42576c6a5381c7adc04cf3e97ad961743f83924f884c0b69063aaeb97 SHA512 e450d50043c01b4747410c61a6822f485cf79806354d4c5e7dfbc31553a94f1afb4823cd5f2797d53aa7898500f50ce5d84e99af52841390530f1fa798ed5372
-DIST 6.7.3-0-202409200836qtcore5compat-documentation.tar.xz 319588 BLAKE2B f514eb34d20d869cabe4503e40afeb1500fb5db68d1343ec8389c6cbff9a9cdac88910e018274f318692c65f8c7820bfcf102695420a87b2850aaa8288a8cf91 SHA512 6adb76f5cacd41dfd0d9fc6ab35f563d021f4a2165f2f708bac07a91d28a2e629a9b3f55109f8024fd6f612d81562631cac54031319f06b27873af8d074897cb
-DIST 6.7.3-0-202409200836qtdatavis3d-documentation.tar.xz 2711624 BLAKE2B 5a68716384c6ef9ef044aaa80d46630758c7a29c4a014f95701333832862cd0f171f648f3a3878354234dfbe740a9c2339401a4b8753155ab69a0a7c25d65a63 SHA512 3bc7161fb1570f21080922d5615ffdcf0b1302e7adebff83a88b0f46556ff220aee9070324135bbcf4a80d186711c2119478b0823625e431ef5c16ca3a39b9af
-DIST 6.7.3-0-202409200836qtdatavis3d-examples-6.7.3.7z 2771480 BLAKE2B bd6fd07927b536a9c76cc132365cc17318540d64aca826fcdb26ab9d40dddb7d23d4179c3ba16a08b8fc03603157ca02afa12bb4d0e185c34b5c07cf4216b4b1 SHA512 b5af212984c6589da411fb5e99fabc14dccdc3a36620e84e63c4dd85437df43dd18f5c64ecfd50b696e46f71eb26e5f2d2186ff4942ce01c13c1c274722eb2bd
-DIST 6.7.3-0-202409200836qtdbus-documentation.tar.xz 333572 BLAKE2B 6fe5169423040adb8e2bf8ff5f5e9cad1abc85c2e2be0c49a9f98c3f50f2d97f381aa335ac7772c12fad9edc2215f4487ed302a5bde2e7c14a822014b6c5998b SHA512 a249a7b418470e5f4e60c7c8ade04c691f8fa84e507b4458630b8f6e48238994fcc4d824e8482f34ebba5a193a024e498b8437c72275f0299626aa3a944c837b
-DIST 6.7.3-0-202409200836qtdeclarative-examples-6.7.3.7z 11655539 BLAKE2B 5670b9b9d8574b2aea67e7fc199937d499a445079bedb9f37547c179f92c400b121fe88fa10039c57e538fa1134cb2e5ccdc7e21db97225f81ce290180351b4f SHA512 01a8e74b54d97fc1c40fc54fb7714d2957bbdd564ccf25e4f18c1347c89d57b5a0f8d07d12d1100538372bbcb6645da867e4d540c2359937bb7a5c227f127593
-DIST 6.7.3-0-202409200836qtdesigner-documentation.tar.xz 3330776 BLAKE2B 1be966b3bfa3477e3343b5686912ccb2dcdd76c182192982bc91a5799725e7f98fafc3a9b0ebf014a200abdc15bdc73f2d9d23aa42dbc3fc588db34b0a25d6b9 SHA512 722ab1038c0dc025fe4b3895417dee321b71fd7eefe6805c8e801ba864c1538196f2c69054e5f338b52c34ef5741966be0c1487467295a551e7d381ad15904ec
-DIST 6.7.3-0-202409200836qtdistancefieldgenerator-documentation.tar.xz 149748 BLAKE2B 868d54c4f94ec08df17f98e0b23a5956842590cf623bb15a915615d7fa6ef13dd3cd4963beeb035a5c557a0f5654bf5a00dd10ad1f31571443a0142f4a267ea2 SHA512 f532cf4b2a6e86a234efbcaa07e6ba8345582a73922439a66da1d6fc604fc26c61af5ff189a1fb858b30012750f5538c753aed04ba9ba288fd57cf8309f466ef
-DIST 6.7.3-0-202409200836qtdoc-documentation.tar.xz 13926084 BLAKE2B 1a5d278948cd430dac4dad922adfae2d941adca819e73cf8d18c381f89556ff0d08eebb7587a9637efa335b141470ddbc8a658bf953e56769b42db8076d37e85 SHA512 1e745a76a09fb7c99f0a410321d4b697ea0e540dc114f5f4a1eca60d70189f06f40e7476ed43ddd43c7d8e699a76b21b59ee37bb55797cefb9ebd032dd92e857
-DIST 6.7.3-0-202409200836qtdoc-examples-6.7.3.7z 8047938 BLAKE2B 258198bd519e22d738f850486e2e70f523e5400b7024f40eb472549ac10c2e25ed1ab4845ce812dcd9f9fc03c68862d9efe186dcfa8656e94b71961745189c7a SHA512 6cd2c77661a7b7633c3636b71657de48cc089b244281a8e5ff2bbc8fb45d993435ac54a44251993fc726ea25310591c7a54d7b24bfab3489abb102f350523d51
-DIST 6.7.3-0-202409200836qtgraphicaleffects5compat-documentation.tar.xz 25784960 BLAKE2B 0185d86be5537d78a119e0ed3beeb000128c1ed65f15f2429b0a3c66541e69732eb06e67558b0107f82da1c507d7e098666f8db75bca948019e2ab9f7fa50634 SHA512 111eaf9d6af09bd3caa54206046fdbbeec1acddbb8f9a40f021612ede5c6692345b5a64c9f1bd042edee278cab8297932cc39c2b7004ca0aa8c1adec92e9870b
-DIST 6.7.3-0-202409200836qtgraphs-documentation.tar.xz 2989044 BLAKE2B d2a60450fb320be36d9a233420c2c4151abf93f82976618567027c5f92f037c7ebd03b93c6d612f497242b3cb01ca249e71a05bc2a693e1a7c23470f66def4e6 SHA512 0d4b752c495f64c93857100416ea2eac52bcd3251677b05ee876b2d503df2f80fd7a7ef4c9db49fd92d0f5706617ef73cf74d8a84c17fae1b6628ede87d0240e
-DIST 6.7.3-0-202409200836qtgraphs-examples-6.7.3.7z 2456471 BLAKE2B 533cdc4c5a498683fcf25d001936887737f957e7ee2e6402c55dce8873924526428bb5a8d9bd92696549248e5c5128a714ab91e290c8522f55a90a4742df06b0 SHA512 d79cd74cb8ef87305ab3ca1067713774164be557b17489facac97e31e2317986b4c19286da9c0fc5c669742be9c58c65c802336e27f0934e57d76a184a5a0459
-DIST 6.7.3-0-202409200836qtgrpc-documentation.tar.xz 274260 BLAKE2B 4c812f0a5a72fcefeaeb7ed562e8d8f2e959c65313d2f0f92ffa7aba5dbc8c0b6c97fa64ba698657924699effdd286e102093f86f05c0aa4c212c4fdea4593ea SHA512 55045db50b3c96154fbd29bb6a59256cd6f4b823057d863e933ee6e220e787300431c9b9622cd4e67c067e493d89ca57a0691271e57c3d303a91dc9ba6d5c5b8
-DIST 6.7.3-0-202409200836qtgrpc-examples-6.7.3.7z 96581 BLAKE2B 8dd30b8b813f3794cb8d14962c0987ea75d1102c91c516568b1739b37158485731a8fc03d626bda3bdc2863fedf18a8c34e7b366de10e3ce11506f90fe5354dd SHA512 f390996dde0d510497c3d674404693e4c2371dd7e7111708cbd29a187285ec5d81d4c29afdc00141ac362d2cef8dfa9407f2da91a502825f7bfb60a8680d2436
-DIST 6.7.3-0-202409200836qtgui-documentation.tar.xz 7206496 BLAKE2B 93a76c23994ff91bf0ea97c6667f7e3307a8cd10e9de08a10c8c6b03baa7bbc37d54c4b2e25f7002a8cc08fa87222447827b3361727fdf14a82aa5e8d6fd23fb SHA512 acd5483d0284728ad06d337e915ef5e911a789ff16d514d63074b23e21bf23557b4838d34fd447c8147b07313089630d38d8d4eed8e7a1d1a18216f00c62caf2
-DIST 6.7.3-0-202409200836qthelp-documentation.tar.xz 212616 BLAKE2B b0b0ce9949e5c77d45621f66d71bc64f012479b02ecd916d04b557924882a46b66e75e31d3541544090ba792c0ee41bc9a748436b3ebe69e480fc1996693eeb6 SHA512 c07380110d8bb296925db16cd96a4d1a9410266c0fa3cf96fbb9a44e68449cbab619c8dfe13527160a6a1f44cdb86cbffae3aee3208489b6dd16e95b0d9791d0
-DIST 6.7.3-0-202409200836qthttpserver-documentation.tar.xz 292188 BLAKE2B 85d1f3966ce75cb42e14a1df387de74ba3d2fcebae0d7e716a4a23a4578a777aa936c84bfe82454c596167e9c27ecb84c29a821f12b728f4b0171602053f8e7b SHA512 c3b3b14d5aed3543782870f8625ea8fb3d64ba1184ea64d61d967769fa77456c2aac9a49da58db62e13f5bc63262eec7300dc378f7dee932e0791d1792d2031c
-DIST 6.7.3-0-202409200836qthttpserver-examples-6.7.3.7z 51607 BLAKE2B a90f12392102517d398d85d59fb96ee77e3af4a20480706fb04c800560fcaeaad07015a8195f1999e4f73dff8e50da73baba9f6797ebaceb83daa2c7ff519458 SHA512 781d98e0d7ad944db5160348774038e1246919653ae5753fa973a4ef32c8a42f43aaafb4302c4e00057af51d32147fee8484780a20481d14ec14f5705916918d
-DIST 6.7.3-0-202409200836qtimageformats-documentation.tar.xz 32224 BLAKE2B a40505ba6363ce669fa978af3f12660fa42ab1e01dea8e954d6e2e6c1d1859911968152e75b63507a2357e278fa7c1b05f1aebf3706278644aabb361e29ea6ff SHA512 16bec611fe7a32da5b40fcbaab4fd0cb66f8bec60cda2008cac041f2547e30dbdc3fac43e0e0be92595d95e2a3d7996ac01d41da5b4cc2921f2664cf9655b756
-DIST 6.7.3-0-202409200836qtlabsplatform-documentation.tar.xz 539540 BLAKE2B 75a133ec3f58cecf2f9a48b4542c321474709e91fb971f50d5e24aeeaee9f765e6394e635a5fda5ad7c12a95fb85451e80ba687075aea353c1e70098a119ff57 SHA512 f91e8885dfb420354cd217757a4991c504cda7bc55dab3451a4ef8dab4beb9a13c370a00578b0913feaa78c56a9b4553e9eedb6107c2f5b7656821b0cef93105
-DIST 6.7.3-0-202409200836qtlinguist-documentation.tar.xz 1134256 BLAKE2B 2a8d9a48bf3df940abb6981dc3ab604cf6f70f87cd3d7481ee63474c361e8d7978c112f6aaaefdff45d9691b00d8d5b80f62f8e40c89ce5950fdb9be2e49b13f SHA512 3b08ac6afed2f25314c89911b3f5300cd4b644c8da9652fce54e8368e2bcd0b2cb925cea789e8cb8319b7545c900554785c926d8ab55c6948b8f977bad574ce3
-DIST 6.7.3-0-202409200836qtlocation-documentation.tar.xz 2934928 BLAKE2B 045f97c7d32de5ba38952868cc6d67cfcb78469677f9dc5595f1865ef9aca35a3173e1ce32a825a38daad58dd8d4631077a4732f908f3034d298b26e414bf84b SHA512 6c8a916e1a6bea24bf5ec2ef6ca0c42899dddf3d48f6915b52da741ecc31bb1efc3e3909417d702cba55d0eb1090ecfc666ee59dc1c6c159216287074e4d2197
-DIST 6.7.3-0-202409200836qtlocation-examples-6.7.3.7z 1570346 BLAKE2B ef91aeedf11054e9e7b1861024c8744f6903ab9cf0b83bceccd8cf2cf8f1f1ac2deaa4af592b6e0038ca021411f2e66f7e1c20276ee30176233b92b64027a2c7 SHA512 92df348a14ae4b4c684f145b9226e28fa8e0ee00924ca908da0e5d44d42d73d0d3f91156f4c06f0c08179d9fcd7cb2a7d0e448058d25d5bb36be3c472e2ea850
-DIST 6.7.3-0-202409200836qtlottieanimation-documentation.tar.xz 40592 BLAKE2B d92b6976aa76692b6172a6804c9177f7c5835c4deb0d067b5c2a1d30ef3119d930b5b7bce092d13ac4a2dcd5a8153cb5dcfe2bfd65e058fae31b979f7d124f54 SHA512 00bb58a3927e84d7263a12ebdba1e0b3be5c17471ae248aa18124d925dcb70874220677d49699fe4e6c99e578d72065a33d74bced0e08b86b00c508138c51f43
-DIST 6.7.3-0-202409200836qtmultimedia-documentation.tar.xz 4651144 BLAKE2B 688d721a7425e6ef16c241dfbfc1b069e94329e68d01e312973c35f3945aadda323c12ac910ff8cfc6d7ff3a85d495a0d595a927688ee61aba0e8d30ee285251 SHA512 27dd9e1ecbb65b65e17f9d07d33bd91702bae4e15cd25018dde097755fa365a524155308ac0f7cbbf572b9fda5be4c63aaed31fb6beb9f8f7852f47a8f49a7d7
-DIST 6.7.3-0-202409200836qtmultimedia-examples-6.7.3.7z 1648936 BLAKE2B bfb37717f45bd6700e7834b829745d7414b9f26e14f36e443e30890a5eefa5f05dbbd3a34173f065b7e77f7356598011bc9fef6514c80ab58a75f19532620d1e SHA512 3cbcab878651df4d709167e544027f64d449882df2bea42f962e901e7518c6eb796ba83baa2646f9c1fc39ae767e67b7a7323096e9826ce77fb250401f703f3c
-DIST 6.7.3-0-202409200836qtnetwork-documentation.tar.xz 1432032 BLAKE2B 1ead88a9e3008c7b1b6bb170b00ba6b38f567a0dfa33b8a471ce6cf9822c2ed0e87f8483a1bff7790c76c338d248d8f1f8868b0526e0ab1ca30013f2d476b944 SHA512 46e1b057cec360484dedde7c500faf48f373f06c1dd81493b76eb74a8af8f374196bd21fb9b6e82a969a4f0148a409f86a2651d8be269a8f361b6fb750babf88
-DIST 6.7.3-0-202409200836qtnetworkauth-documentation.tar.xz 199664 BLAKE2B c8573aa9caae574b1baf81989014b8edd3d01ee0bf3aa94afa3399b1018e9977e95b03e87ad24a6dfaa74859577bd0b90421304a502564accab7411ef6578f5f SHA512 6eebecf39a325ea34e9393899754805fe8f0d560c8bfb330870132dfd974ff1f87d22738f68f9ed41791491922a178500ade4841eb49d877987c2558cc6747f8
-DIST 6.7.3-0-202409200836qtnetworkauth-examples-6.7.3.7z 41529 BLAKE2B 71da9d342d967b715813a58af32382a089b84c04ac2f91b0cd671731b861a8a1bc85261d5eb3157a6989c4b5695696c18718a4e203b86c043535a17aae6118cc SHA512 49a5c97cd5f4d8d22e769473d394a90ad6a3bd1cc5af9245c0bc5b6004dbdbb12848673ae51928b25eafbb2c562f90ed92a750d21660f168992e15f1da2d8c01
-DIST 6.7.3-0-202409200836qtnfc-documentation.tar.xz 234632 BLAKE2B 2b7ff118e72764d2a02a50338ebd863cdaf6795567572044d9f281499668e368d4049223d7c1533911f05f5dee5b4ab56ea4c709d79ecdd48f984aad53ceed48 SHA512 bf9ddd77276e9a1d6c23431b5b33c725f6ec6591dd983a45b252a4929e4ead29f6fc4bb8fedbc78703daf0399eea3de79495100f457db302663cf29b3517b6f5
-DIST 6.7.3-0-202409200836qtopengl-documentation.tar.xz 1023896 BLAKE2B 7ad72d7453d4ec2daddac43aa770c8ce0e75cdb0495b8ffae477a422e45030bb0491e520388e292d75f8dc992a7f244d2e532a19e140aacb60758cd061271b79 SHA512 a8d77c2e3fa72fac17a8ee4ab93b5d5b46fd0400a2d9b6a09ed6baa92dd325c6ce5b6c2df1e0b3d269fae8ef48097088e5bdca35c286e220f089d756ae4295bc
-DIST 6.7.3-0-202409200836qtpdf-documentation.tar.xz 1023600 BLAKE2B 1474c8e2c0ccbd20e21b125b6b1cd4a4343d359362221662f1945ca6804ad693a7092bfc59e2089ba6d03fccc8ee0d7c997e3e791eb70132e4c2bcba9c4a319d SHA512 427e6ac9826dd98ec06fe8e242e89b91e65d8c5ca534d8fd9ec2d9413b7b07ea8aa50e13bff34c560f4dd628c1e0b13908e56e92e02bf8244519b3d607e21824
-DIST 6.7.3-0-202409200836qtplatformintegration-documentation.tar.xz 42240 BLAKE2B edae5cff09e367ec5c23c5d43476aaabc0af02fac41bba4ccc5a18890745eef2b0d01e70415cf11b4e92d047e58184bd0e3970ca8bc6cc1349ea5e37a4826c55 SHA512 2c5c16ab948eecf97c195c27415021b634d0fac4dfa3e13a1bc66516e1b0d68eaa740ac62e8f575680d3fed1048f9ce52da4e37326e9e72ad24468cbd7c3bf3f
-DIST 6.7.3-0-202409200836qtpositioning-documentation.tar.xz 681764 BLAKE2B 35b6bd8128a4ad366b66448c327d3ac8b4256d4c1ab9487ae4005240f7433cdbc3a187432e26022fa7587ac59f1fef0f140a7d53a44494f933bc9bf723ad173b SHA512 069e614ebbb52575c47c73eb3f9549ac2ca961d1cc344a84e7310260239e11b10688254ee1cf94ee4e0da71c01e5b7889da21808c18fa9f12b74d18e77a191ef
-DIST 6.7.3-0-202409200836qtpositioning-examples-6.7.3.7z 272388 BLAKE2B 07df84d4ce34cbaf26b4e9dc53a9b5523cabaefd4baec1db21e9f31a1ae4cb0e2fc565ede3cb2e0a8cac75d9564bc1c8bb06d28ccc86cbabf64f1f6c744d63e6 SHA512 3f180434a6a240b99c1dd3cad6bfef6b9ff38192b36faa497db62c20b218c0f0f25dc3aa2ce4c4c0b5abf4ae04feaa48d0bc8dba6fa7c16fa2071c74be30eaa9
-DIST 6.7.3-0-202409200836qtprintsupport-documentation.tar.xz 350260 BLAKE2B 1eb58a964023f19d6e9ff50da8b9b7124be00b69552a9e5bd9637cfeb9007d484e684d60e577196aad6a7331827b4f3fdb09d52b8b64e35ba589b1e5486f7190 SHA512 ddbcb3b771cfbf46f7edac7ed3516144735e724f3ad954880056d180fa88ad6a6179acadc320901bbf77e8258dfb0bb65aa7219483938a569bb1651839b1459a
-DIST 6.7.3-0-202409200836qtprotobuf-documentation.tar.xz 318136 BLAKE2B deedecb0a06f6f357877b31e6708d28ba265c757d98d02e913e718268121d01af8bc8645d7f532fc9a35de73a84c2a72a5617f2309438a4c16c36c372664ef34 SHA512 4dc2e01852b3537d7e8b30d4aa64900c072e3bd8f0e9bb2801813028e8172996b6b5d4d25c3b3095982e1494d5ce64eec9f4c9adca051a722e7289a1b7a19cc9
-DIST 6.7.3-0-202409200836qtqml-documentation.tar.xz 1529032 BLAKE2B f0b6bf830453068a846070a1c0941aaa3092bb34eb3fce0bddf9ca634842c8caf9dc9f4d90419c266192d0c4bbeda55f4c468b300b998599d451d5d7a5fa5e91 SHA512 da487211028baff68823dc1ba41cef5175bbe0aeb6e28ce35776681371100fb71547c3334d7e54ab802fdbc9ce9e767d81a51dc81e9cc6a193b8b660f9872631
-DIST 6.7.3-0-202409200836qtqmlcore-documentation.tar.xz 68116 BLAKE2B 27748a99d7ff2e449d91c42df9d354942832ac2ca21701f14773d3ea8b529def6a325d44d03fd1c373c1b58f07ed7e66f389af23b9c51fd85701bfdd2a318e36 SHA512 da4d421dc31f51d68e11f6198ff912ee4cc6caa477fb78d3ed2d524b3d7f11a9091535b3c3448172d1ebe79c1c4b746b595f7209e53b8944d7e0991cea0c9ee9
-DIST 6.7.3-0-202409200836qtqmlmodels-documentation.tar.xz 139444 BLAKE2B 9daf0f8c9912f987567e20f7175fe5a41a3d0f9a96aa6550e9c9f3fab5a132eaf9203bdcac21db09703050600b236c3417ee45db413313c443c751c19987103a SHA512 6c71985fcbf7956a348ef850d5c6810e6dbde01d1fc14759ef19be848b9ab127b8645a8e3dd50d7de78bbc81f2ea24128570ce7336efa9e24a01f2108711b421
-DIST 6.7.3-0-202409200836qtqmltest-documentation.tar.xz 92172 BLAKE2B 0cb6dc2c935bbbb3b07f8366e472cb94a14164e5bb11b73f8f8d32874218284f55ea8dfa195952f125722020d206bcacfd32e1a181e61fddcce30c1bd8cc50d2 SHA512 ec701f4962fe490beb3c63f2a1e17f9b9d569ee92510e3b53b75c8cfb01b6682b2d0ce77f29c60d57db2bc196c016f29262a7934ea58980bbb69128a9c121e5c
-DIST 6.7.3-0-202409200836qtqmlworkerscript-documentation.tar.xz 31260 BLAKE2B 4ee064c62c5f7bbb29c92b3a8503d4e4c2d6280438a947d7d88ea4012dfed4ceed02581658fd256a9f2956ca2ed19f4f0780e8cfeb84c5c4f35eab5db1b3feb3 SHA512 1f007541163ca7cc6b622ef8fd2527da6d4049eb1a3a002b53ec2973a0797df3dc70c71c68a9c4306412ddb4f7a53dbdce029a7ffa207b220e6f7478eaeb7582
-DIST 6.7.3-0-202409200836qtqmlxmllistmodel-documentation.tar.xz 37100 BLAKE2B 746da8b1d46ff1192a20055f0961b4cac7991ecb422f2d618f7a15a73c36b4822e91f6840f4196f4a7dc9b897a5c8dadf85d3005a17d17735037a93a007ec0b6 SHA512 6dce8bb56076df535714c9aab44e54c1fb963b64975e90f0e26c06b23f47ff492cd990ba3d7f469ea7b12cf372e905f39e6f7f9e9900444884bbeae5eafe8e78
-DIST 6.7.3-0-202409200836qtquick-documentation.tar.xz 24149716 BLAKE2B 8e65e1c650682c45102ac8659ce882807e5dd7677196be590c48acd6f9d0b8cc1d9fe3ac081c1d38e40b8c04137f722fa4083a0d22e79aad6ff6a42f0fc8ef2a SHA512 411a019adc3ad05ee43095ad787f539be3696bf50c1df74d55b64162aaa62822665a7d93bfa1d13d11e2c2e0279bd336106a73ee5c57a2732ce70b6558ba3885
-DIST 6.7.3-0-202409200836qtquick3d-documentation.tar.xz 50871560 BLAKE2B 2f2e937a16266b070b589128f999d06fcd65dd381da25d6932545d5a09f9519af1387b85d1919b706a65b9f9ad9feec544a97b86a69ba86958e83a8eb2ff5c8b SHA512 69c29f046bc66f03a1ccd9dc954fbbc78436dabdbc0a2a0feae31d59aeaf28597a9a3da7f148445a1bb3911095938980ba01eb6b6cc07e196893b9387d11893d
-DIST 6.7.3-0-202409200836qtquick3d-examples-6.7.3.7z 19437018 BLAKE2B 8cdc95098e217d92df316e239508e8770c77b25775c6c6cb32b589de6bb48843d4cc817f7e3ab5597d1a10e1f6690f8e9506b30796e281151116eb1d84de0869 SHA512 79a4da57a942ccf6d70654b47dc1546367f21ce5840be2410b14c1d7c773d4327b0f40fc99fb682a6298b8dad622d18eddc2c680e97b684e55f7d4bb82ed0fb9
-DIST 6.7.3-0-202409200836qtquick3dphysics-documentation.tar.xz 4592020 BLAKE2B 9463027346d948160385f5f8a51fe25f51b20342c5a17aa4743e9875783fcc29476b98a0791da2d1de1f951c3140f607fc9b0952b9e94400be2f2fcc04f59a4a SHA512 3801c2f1fda8b0f93fc8907894ba3ad916808b9cc04a26edd7bbf07c2d15ffbee004ea6fc8ea10a05869bc99223d9de61ec6852ed180b18fe4c9ca5c5caab60a
-DIST 6.7.3-0-202409200836qtquick3dphysics-examples-6.7.3.7z 2355228 BLAKE2B 5ec50f9911de9e9c823f30e5a4b8c8a14d5f9562d35fa56e3bd268f6d343572e749cb81fb4f903da48f010b6e203bf8c177154ae52ce610d05c78e3d131e4947 SHA512 4dabce43120a2b17b90200cb8dbe9411306c72f916fd903032f83bc98152e15772bdd9581ba182abd03fccac2549649057a5e8e53b1e5155471880a6af0d1960
-DIST 6.7.3-0-202409200836qtquickcontrols-documentation.tar.xz 7160444 BLAKE2B 7bcaaea46a0b8be3ce20ca0eea93b522933ef332ffc2f63ee0fe67e99a7d81996f2c65fa696322e6bc5f02e275de299be2d2ea386f1c604673e94884ba64a737 SHA512 24453be0827654951e7d9ad8e06890c281683ca3f4b698b74f02b30f100b1d31b2fedc0e7d30fec0ea5d74ac5b8d014baccd098699812059cdfcce8a23258f25
-DIST 6.7.3-0-202409200836qtquickdialogs-documentation.tar.xz 314292 BLAKE2B a727310a699a3c64202946589f8b191932779a6cd2eea1c2a206ffc5140d31ff607fbef854c035f41a28ea8f3a3a15f726efe9d017c2673505f533b25bfd888d SHA512 c543fcea015085cdf08dad9e729795b5d19a97af12bb57ea99441f76cb3ae090d22ea2fabf51271d14881b4691bfd1baf497a0909373bca4611fe9668512617d
-DIST 6.7.3-0-202409200836qtquickeffectmaker-documentation.tar.xz 804596 BLAKE2B 4e97f08ffd73dc30e0f26ccd1812562c67fd96a3b96d57d200220cacce89ee2fcccd9663f22174a36e909a622bb98978030dc850201942315cf61139a0b56fd8 SHA512 91eca3c4de7f51cb0743817ee385d5d1c377fa121e4b90c51b3137ad70f6e80e80cb577bf1e40b023cedb20f1bde6085988bbc8b66e70370f0abd153929a1c0c
-DIST 6.7.3-0-202409200836qtquickeffectmaker-examples-6.7.3.7z 244717 BLAKE2B ae4e2ff552f2c5ead2f86470315b4efb87df384c9f66c074023f18bea56a362fcad7dc6c80989cbcbb59cc5d1477bec113d24726ac7395bc28e02aef54a2b057 SHA512 2d24cf993c67f1978c0bcef26c61b15b62c85b07a5bc173c49b35748cd90e3cfe5f895b81ec395ed6bb518a330958fb7be7678a827f36abd5ff75f09f14e7473
-DIST 6.7.3-0-202409200836qtquicktimeline-documentation.tar.xz 166268 BLAKE2B 9019ccdf35da353fc7a11420dd6721ef9058fdbf8d9400ede4246492e196169bc4e818b9b41db02b4ade2d5286044543477a4336a3654c523f209371bf74efff SHA512 1f84f11cf256aeb1101f33b2545e93b39802042d8ab1445df880682c738ffeebbc58090e410f5c8c984fe1d099bde78c0f98edde27dbb8abb991fa390e12de8b
-DIST 6.7.3-0-202409200836qtremoteobjects-documentation.tar.xz 492812 BLAKE2B a6dc95772834137f6963b984f1ba297ac19a98e317e1669a8b27509e1245a2236ae2bed1a6e190b92070de432f37f674269e7737e51b765d3964f8b839a54ebe SHA512 e2461b976b1980da739f68ce9d560dbe1bb7be18a1aae6a69f39f7826650cb5e38b3cb7a4b2cfcd8b9959bff20e39c03274572e84c158c18afc7305a51fe3935
-DIST 6.7.3-0-202409200836qtremoteobjects-examples-6.7.3.7z 81608 BLAKE2B 5fdfdee93c5f7e2d445308cbe4db3727da7a79e05a193048161aae9ae0b0c03a8d9dc0ea9ebd85c5f9be6f25e86acebcbc277bc00df13477b8aa1d01e38e1a5d SHA512 90e10b5fe497f4c88f842122c3cd7bf162173a1cb736b1a0baf30814f388147df095114e9207c46f2ae6e26284d08feab9e0deb36d077071b41a33e76528c4b2
-DIST 6.7.3-0-202409200836qtscxml-documentation.tar.xz 395916 BLAKE2B 0f6a3ddacca1253488fe857d2a7aca457a055ae0c61d174fdbe10927a6f3f5a9f9284431fc358f6013f56d25f5d0f150d51a70c0d96e540351feb83a67a5525b SHA512 b66967ac10604b30297139277b12ead292128bc6f9877e045af5e7ba21daa06affdd388b73c9729229ab004bec6d92daaf2bd81a41b0262e246784e74118a92e
-DIST 6.7.3-0-202409200836qtscxml-examples-6.7.3.7z 140382 BLAKE2B eae71ad5b0ed37c1a49f9e16084e9ae0938ea455201a499e1a4d5c6f691d077b5ac09cd083513f495496a1fc94c69e69cd387050eec629ea9fcd784fb1a5194b SHA512 53630312b941ff700ea6ff19e103e59201a20db411163015b57cf69f61a988cacb88c312867741c206451c0eb9d3ae6f00066eeccfb23bfa1aececc06728de99
-DIST 6.7.3-0-202409200836qtsensors-documentation.tar.xz 2148664 BLAKE2B 98fccab9d45c201d5875784c5a08c6e550ac47233b7bf9fca79a4ab36cd51bda0c3765c42c49a70e8605dfbbf8be508c6365c77725b1ce732d5e35ea79baae2f SHA512 62ecd202c253f3c5fe1d932e77e1599b48ac8a35f838c42ee11f8bc94fd0b5ca48df08323266ef09682987561e3dedb33d6e4908c5d3e7515113b6720e56bc81
-DIST 6.7.3-0-202409200836qtsensors-examples-6.7.3.7z 53421 BLAKE2B 5dd8b6b764498470712770ed63f286433e6cb5e9b3dab8946f42153e384c03a0a59b104f6b49b9ac19079e557811764b34f015ea99ed23bdbd0c39751a76a282 SHA512 392b8a8e69f0b4188630b9039b94566cb859944169faaf9152ba5593022cd09669f02c68737a39850770837ef81abb56a683030b3794df2ff189cc92c8d100aa
-DIST 6.7.3-0-202409200836qtserialbus-documentation.tar.xz 738132 BLAKE2B 1dbc073c18831cba617ee027a490800cef6dd8224eef03b09dafd508025ded3263bd2ec346201c53f7a128711ce027168b49e0f7335db72ea159511fe8673ff3 SHA512 7c62f099ba43bab43f0c613f7a23ecf21d8e477aeda585648cef2e6982132162c41574700350392653d1eccf550ea1c75b0500a7dd50ece67fa6602124cec4c0
-DIST 6.7.3-0-202409200836qtserialbus-examples-6.7.3.7z 212140 BLAKE2B fc4d5150dd29cd910086d1fe348f912ab9fdc300b97fce467f1fc0cb399db8e9c69987e098b03f2e05e70188d3672c4b38c1962ef52d8a3ae0e476fdc365685d SHA512 9dc44b9cad1126f935c2b97cf366103059a9cdaa795e39590880485f2a66630ce6d37e61988b45247aca5f402606d6d16802a917667e112eff021563838a47e4
-DIST 6.7.3-0-202409200836qtserialport-documentation.tar.xz 183948 BLAKE2B 3402cc134dfcecba9e661478c8896dc0cd9b36e8a653a3560f60f231463fdcfb2922fc0e0362e2f305692b41e62a97a05d4d1bfa28980dbd59c89de2f46fe407 SHA512 7a83f958f6c0721423f5b21e3373aba0049d3dfa12d69f7e9a6861f7d460d65b5922da1f0629b6f74104619bcf15a45d08776f20e246998019ccfdc3eb66c1e9
-DIST 6.7.3-0-202409200836qtserialport-examples-6.7.3.7z 81054 BLAKE2B 2bb47ca5ae033ef1a2a39bab2fb3d1b2c29c5c8105faf89d38635b1dcfcd8c272f2c14d29e553ed34dd1020aa4857bb6236935785255e33ae7a440160131153f SHA512 b5f690484e3b2bd163252f6c96128a543309876d078f0323c8d575b928f4acfbae5e168313df8ed6d3123aac369b60b259c35860033d2aacbd6820caf3ae059f
-DIST 6.7.3-0-202409200836qtshadertools-documentation.tar.xz 196276 BLAKE2B a548c5b364ad68dda1c92a6102af3e87998323195770bbe0d0373bb527176aa908dbdcdc6e1fbeb0b9372d9bdc237e9af080188e5fd5f13e5fa376f45e39d976 SHA512 353a70044c5461bae008c299a9b3c9094f0fdd5321c27740bd509a8dc261848403e2306c8939387c4713cadc7a6a65ce11bc006d4502a1f36c8e6baa484917fe
-DIST 6.7.3-0-202409200836qtspeech-examples-6.7.3.7z 157761 BLAKE2B bd61bfda9efb1f831e0d81e086b5b5c40e991d0959bd7a9abf5d2e6c2e318140e0b1811ff666740dee2213272f7d1afa87b7176c34adb696083b405d60719f10 SHA512 90f6cae36a7a6d79dd81dc4e9b915ce9e3b98f8637f5880c6ad0ef4dc2d9e53a481f4634866f18689ed6ef3d93a02f658fdb5b44fe8beba123c6d7843c62918f
-DIST 6.7.3-0-202409200836qtsql-documentation.tar.xz 898960 BLAKE2B 3a1d13fb9788ec0043488c815784c6412f71868c188bb009cbe52e63016954d7922ddc0248e32f4b07aa317f38962740115b7fad514850cffacd4ad22a2e9f43 SHA512 84c7280ae5835081bbb3d33385adef996a7057f5ec4e4e632f257d48f73b1657a281a290ddac7116d758dafd7d43e8fdde43dd380eb8661e68658d07010ea622
-DIST 6.7.3-0-202409200836qtsvg-documentation.tar.xz 104076 BLAKE2B 6b13c200057a348cef0ac2a22386ff08066181127534d5366cd2e53b7e17b6ded94734eb66e54b981c054e775b12f4d25fc03db884fc795e4b013994c02a42b9 SHA512 18232923172d3eda70ea19b4be60a402686c1be53f4e3e63f339f7553720f6c972c53df0ce44db85a0c91c933839d80a31622f7cc9cfa415136f52a92dabe4a7
-DIST 6.7.3-0-202409200836qtsvg-examples-6.7.3.7z 157 BLAKE2B a7ce693fffeb108d3741d5193da6c19c1c24c80d11e5647d67de4805dd0a3465a757240e8bc6f4d0dba64f8860ca0fd1bc91ee76f2fe5a69773019bc155a2d46 SHA512 ad44bd6ba4a9088f29a85db994f5b0f55276d5367d69bed091fa42cba7455fda5ab758a8c1fab526bf6a874436406e0d9275bf4d020dc60eab4a186bdf0425bd
-DIST 6.7.3-0-202409200836qttestlib-documentation.tar.xz 220492 BLAKE2B e66a5bbd172e773ef09ac6bf92472d993899614df7b4163ea1a9bce41a02d07d35235c1bd275cc23cd04ffb60417f34352e5c0905472fd61a3ad10526b0613bd SHA512 d053732db3b42f7ab29964da56d5409f6eddfa6ff05d5f686d2e9f452239ea7ebe4ce5e6ba07f24b1e1df34e84217c60b27287445d5a0a7a227937b680ec7f49
-DIST 6.7.3-0-202409200836qttexttospeech-documentation.tar.xz 401596 BLAKE2B 2cef1dc312cacfb2e9c6552b10c90cd40cbe5928436a4cb7865efba5161166eb3b4f751ac8aafca2c4b75c697bffb757ee6d533f3ae81a46ce8859db6c055c97 SHA512 e4c3b733f97a0c0e4d8387ef7a9adfcb0ec028861a2beb51b712b2aa5a8438d93cf84c667cc40a69d09e56494acdfa9cabc16de43c8b56cea91c1919c5718a25
-DIST 6.7.3-0-202409200836qttools-examples-6.7.3.7z 468972 BLAKE2B a09fd2a593958d38f552c9dcf929a54817013f4e6ebc9574c34bcfab8cc53e7aa7938523516414ae1772e44204e948f3a4ca00f9f45742a928f82c0802522095 SHA512 d12079727ea3a98639788aec8495f9a8d3b38a44cf222da5f764d619ae4cb7592724f4607788d71e125fe21063f9b07867bc08e5200865d104bfd4345c59dccc
-DIST 6.7.3-0-202409200836qtuitools-documentation.tar.xz 206516 BLAKE2B 966320ece395b9369913796a3ff8b06cb33d03f766b0b2abd7c6cd180b97fa6aa3ec2168e453a9fc2c43184d50040338203577fd24d9527471a10e1a9d79e2e3 SHA512 be412bccdad5831528f3b31231a500d7c510fbb9b5c45a6a35150f377f0bd1a032411564562b4ca4485ba0f12dd90c1b8273a8b65cc4fe731d58e0e9cfc0ca67
-DIST 6.7.3-0-202409200836qtvirtualkeyboard-documentation.tar.xz 2073520 BLAKE2B c754383fd71bc46d84286ce7c48aac9c3a5da0e5e34e740edbcb7b06a9db8b0005c95172c43b0859920da594dd91d721bc49fe259a0c766c78c572aeceee1627 SHA512 ef29575f9fd937badf69168717c1f25a15f568eb50080acd2898d5cc3a9a4b9e8f34d7bc19e5093e69ce0c17c431af921f609edb76b59705f211a1e329e0b9f7
-DIST 6.7.3-0-202409200836qtvirtualkeyboard-examples-6.7.3.7z 7042 BLAKE2B 6c66636522001d4981fbdb606485c0d5eee8e33130e77d067d5e612ce3a6a00b798202e2c5052a60618883495b6d6af52d677ba73a6488d68de1379789ee2eca SHA512 18eac7752f106cc298ade87272079b410965b3170bb94c9f26d63ddddb27300a1c36f9f5713591a9f111834efae39f07026b3892ef8b4825634669292737cf91
-DIST 6.7.3-0-202409200836qtwayland-examples-6.7.3.7z 568459 BLAKE2B 8e51cd25054de517703ee6e6882a28f5b37e4777b59638a808fbfe796de343d550e675e24bcc7fd7c0b3cbe3a6befe5d2c6c3bcaa46d100e06bdf73bcf58990a SHA512 248e3a34377fb6f5267410a78c6934fed5106e2ec4110e8121abfde9ef6940bea2024da9d4f4a0e4a14f7d4af31b3bced841a85d91cedba1a04b014e67725ffe
-DIST 6.7.3-0-202409200836qtwaylandcompositor-documentation.tar.xz 1601724 BLAKE2B cc5c6a37c26c04c8052d0d477bd35a8c22e5432aff41443516913c73701f686d6151dcabb49de7ed0923c550192f7ca55aaf0e899d3978f2ac4177460280b68e SHA512 54ae98bb06156de1ee9b957a1a28bda882cb4bf30b6000750298d412c169982decfaafecb05674c9ede57a8bd73b8cd5bc7fb94b8996efb496ebd3abe5de0391
-DIST 6.7.3-0-202409200836qtwebchannel-documentation.tar.xz 167740 BLAKE2B 2e54abe5303a2e2982770508444c1de31b842c787779600818c60f32487b9b27282ca303f6c78fb1664c092806f03f39bcfd9e03a821aaeece07d58822962f8b SHA512 7fc251d2ae60dc579f9542c59fc395c9719705fb4df9b286bc3b36c79f8996b5b2670ae77d6e717f9f788f3eac4cbe5a8987c737df88f1e6d7b31bb85ceb414a
-DIST 6.7.3-0-202409200836qtwebchannel-examples-6.7.3.7z 66063 BLAKE2B 8ed405b09171cf259b2566f6537746a6c252d5842a2a06c4aaabc676e116371b5f2157e4e3bf5330cbf5e4d3377a3c82c529e81bc799f03f8a3d1ac001b76d8f SHA512 b639e14376dc9e7ebdac950e854c28cd8857b059dc4b73cdcbc50f5f39633662ac8d7278f60f249b77d6c30935085af4fcaee05814d47970dfa451eb7848cab1
-DIST 6.7.3-0-202409200836qtwebengine-documentation.tar.xz 2007804 BLAKE2B 5c49863d6dd2dd43ea9dab06106c476c034f1650783868f7977ecd58e817b1af7bc8da6f8998b5fb6a4fa3f82b638711bfddba63c119d105875dfe6dac2aa84e SHA512 06696b81c36db038129925b05a1181b16f9435aeaee27e5083fdbcd259ca82462499cd363ff590ec9dd2c7d7c47b85c7235e692cc209643e54c9833bacad5363
-DIST 6.7.3-0-202409200836qtwebengine-examples-6.7.3.7z 1115815 BLAKE2B e1d8e29520806805332d9bc44aa0dd37a48ebf6ba718cc780e572065833354b1d3f14d780fbbeb949f347b1ffe8bab8528b3e54e323f21f9210effb15ca71b9f SHA512 66907c97490d83a977ab8abf70380e1919f81c3904b81b0fe8465d10a653f66d3ab4418241214fb40a79d6ea389091bdd89414093d03957134c8ced834faa354
-DIST 6.7.3-0-202409200836qtwebsockets-documentation.tar.xz 532392 BLAKE2B b8549314309633090761e2173de3255e365fbdd2265dfa6b2aa664e871486700e9b37171095c47c2e2c7429fd8e6ef7a47a0d3a932fe8fd1e451070d3548a496 SHA512 ccda076d0be738f186b74040633f4f5abaea5560a4d0a64536598b14818604867997759c377a368ac57a5fdd15e71ea3bc17a63fbb2c74a44f9f48e0bff0ff4a
-DIST 6.7.3-0-202409200836qtwebsockets-examples-6.7.3.7z 248974 BLAKE2B cc84fec1dffb3cd972bc16f23f9485e75de439db25b0a570a2adc11f1091b3adc686bb965d6eadbca2fc856919bdcc88c73b632969835d198ff081caf94e752d SHA512 14cbfcc8ba2eeba3aa69705d3dda6cc66f1ac1e78ba89efa663d026ff96bf3d7fd6fd8d9eac63c5233a87a7d26fceeb09748760a8fb6a58a6bff7eff2bc7adf6
-DIST 6.7.3-0-202409200836qtwebview-documentation.tar.xz 126004 BLAKE2B 4d00689399b5bac2da16cab6ee97427706be03b29589e95677c10363195a7ffb4d77a623f49d5f205a2568ca5361d0015d9419cb4d4107d722303f23d8274831 SHA512 c029a00a12770e7aa0a1171857b52a33d979be7b1ec8007ee639d292468084ab99b2d3332f529f243c51dec93d3733561b282769aae4d8e41bbbfb2f3a34e70a
-DIST 6.7.3-0-202409200836qtwebview-examples-6.7.3.7z 47280 BLAKE2B 7eb46b2b57c646107cff12a3b8d23a067a6d2d76f461c3bc6f1a58e8e247865fd62ff9b6dc660dc916f4b05b6e399cadfa7937e59e247580d15d40a8dea2ad97 SHA512 40a6dd90a280da1dcc676acf828975c47362057b23e34041ee9ab6e7df609fb617f50532af025ea085d0253340a52c6a4045b6151eba21e21ecbc1cc8aea75c3
-DIST 6.7.3-0-202409200836qtwidgets-documentation.tar.xz 18056796 BLAKE2B 2ef45348e89c18a44e696d25b19c07d1b3703e647632908e7bff5c2e550ae2eded7e510a8af7bd5a4020e64362c6adbd4c2809ce974a39d1866c66c90f62fd50 SHA512 af145afbe113215ec33e2f0050dabb1bda36bcb01184de6a83a88744820188ac89d3b520b97f05727904b8fdb42969818cea93d1a676907754533175b04022d5
-DIST 6.7.3-0-202409200836qtxml-documentation.tar.xz 341128 BLAKE2B 564b740ab1aca8e52e7cc6c8c87af7a42b5915b055b46e94785bc55db575e150648bf43a751bd4eec66af49cd6fa2b34c7c8ab6391ee82ca3083cec331d0211c SHA512 475d871301490f7d029338628f9effca4cd366b1390b5f1edfa46078e230d1c327d98f90687fda6b999992f2afce0f127b86a935627b29cf6c309443508887b6
 DIST 6.8.1-0-202411221531activeqt-documentation.tar.xz 248784 BLAKE2B c261643c305e5549cb3ebaa27ebea0322064f49e1a15f87ba50232a04c1a88712bf5aec2d0ca5f4183f4870b86afb1572cbb4f65aa7b00bfa5f0be97750ebc36 SHA512 cc6cc90091b5a79eaf0a34a25040281a5c119aa716f052a4fca48c6541bfa3185360babfc930f80a05083b2f572465555a83444e970415bd33faf94ad954f670
 DIST 6.8.1-0-202411221531qdoc-documentation.tar.xz 287508 BLAKE2B 6998adf733dbed1b0d28cd6e80ccdf7bf82a7f8b155282e242afec23c5797c26353facf1c3143eaadb36ab8a46b4a3d9d8717681050956905fa47d20b5827288 SHA512 563f96b6ec76a2f10265bb396c834d22af898d40e25ce7ddb09121f8396334bf21ad8ad8a8af72c544e650725cfc8e2e549cfb224dcc9d71c6199f182c1c74d5
 DIST 6.8.1-0-202411221531qmake-documentation.tar.xz 342776 BLAKE2B 0ce2611d68d5435f51a674be0b4a002e0d449db6ce48715b7db38c6d237195e0539512d4276422257db4f3e7f4b838f9452cf0ebec22c063725d710abe401f49 SHA512 2f88c7a46e7582d148b4177f3a7b2882f4f763a47cb2dd4971223236706bf0ed1b816602efeb45f1dc1dcac340bcaaac66c917d96cd0e6f7691efbbd6875a45b
diff --git a/dev-qt/qt-docs/qt-docs-6.7.2_p202406110334.ebuild b/dev-qt/qt-docs/qt-docs-6.7.2_p202406110334.ebuild
deleted file mode 100644
index 395aa460d478..000000000000
--- a/dev-qt/qt-docs/qt-docs-6.7.2_p202406110334.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit unpacker
-
-DESCRIPTION="Qt6 documentation and examples for Qt Creator and other tools"
-HOMEPAGE="https://doc.qt.io/"
-
-LICENSE="FDL-1.3"
-SLOT="6"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-IUSE="+examples +html +qch"
-REQUIRED_USE="|| ( examples html qch )"
-
-BDEPEND="
-	examples? ( $(unpacker_src_uri_depends .7z) )
-"
-
-qt6_docs_generate_metadata() {
-	local qtver=${PV%%_p*}
-	local prefix=${qtver}-0-${PV##*_p}
-	local doc_suffix=-documentation.tar.xz
-	local exa_suffix=-examples-${qtver}.7z
-	local baseuri=https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_${qtver//.}_src_doc_examples/qt.qt6.${qtver//.}
-	SRC_URI=
-	S=${WORKDIR}
-
-	# Bumping involves diff'ing the unversioned *_src_doc_examples/*/ files
-	# list from old version to the new for -documentation and -examples
-	# files, then adding/removing entries if anything changed.
-	#
-	# Format: [+-%]<USE>[</|^><package>[!|:]][="<module> ..."]
-	#  -    [+-%]<USE>: enable(+), disable(-), or no IUSE(%)
-	#          (should disable if associated package is not in tree)
-	#  -    /<package>: qt.qt6.*.examples.<package>/*-<package>-examples*
-	#  -    ^<package>: qt.qt6.*.examples/*-<package>-examples.7z
-	#  -      <module>: qt.qt6.*.doc.<package>/*-<module>-documentation*
-	#          (if <module> is unspecified, defaults to <package>)
-	#  - <package>[!:]: only has examples(!) or documentation(:)
-	# Note: sub-300 bytes examples archives are empty, can be skipped
-	local map=(
-		# map with (non-split) Qt6 packages rather than per-module
-		%base^qtbase="
-			qmake qtcmake qtconcurrent qtcore qtdbus
-			qtgui qtnetwork qtopengl qtplatformintegration
-			qtprintsupport qtsql qttestlib qtwidgets qtxml
-		"
-		+3d/qt3d
-		-activeqt/qtactiveqt="activeqt"
-		+charts/qtcharts
-		+connectivity/qtbluetooth:
-		+connectivity/qtconnectivity!
-		+connectivity/qtnfc:
-		-datavis/qtdatavis3d
-		+declarative^qtdeclarative="
-			qtlabsplatform qtqml qtqmlcore qtqmlmodels
-			qtqmltest qtqmlworkerscript qtqmlxmllistmodel
-			qtquick qtquickcontrols qtquickdialogs
-		"
-		%doc^qtdoc
-		-graphs/qtgraphs
-		-grpc/qtgrpc="qtgrpc qtprotobuf"
-		+httpserver/qthttpserver
-		+imageformats/qtimageformats: # empty examples
-#		+languageserver/qtlanguageserver # docs and examples are empty
-		+location/qtlocation
-		-lottie/qtlottie:="qtlottieanimation" # empty examples
-		+multimedia/qtmultimedia
-		+networkauth/qtnetworkauth
-		+positioning/qtpositioning
-		+qt5compat/qt5compat="qtcore5compat qtgraphicaleffects5compat"
-#		+qt5="qt5" # already installed by qtbase (conflicts)
-		-quick3dphysics/qtquick3dphysics
-		+quick3d/qtquick3d
-		-quickeffectmaker/qtquickeffectmaker
-		-remoteobjects/qtremoteobjects
-		+scxml/qtscxml
-		+sensors/qtsensors
-		+serialbus/qtserialbus
-		+serialport/qtserialport
-		+shadertools/qtshadertools: # empty examples
-		+speech/qtspeech="qttexttospeech"
-		+svg^qtsvg
-		+timeline/qtquicktimeline:
-		+tools^qttools="
-			qdoc qtassistant qtdesigner qtdistancefieldgenerator
-			qthelp qtlinguist qtuitools
-		"
-		+virtualkeyboard/qtvirtualkeyboard
-		+wayland^qtwayland="qtwaylandcompositor"
-		+webchannel/qtwebchannel
-		+webengine/qtpdf:
-		+webengine/qtwebengine
-		+websockets/qtwebsockets
-		+webview/qtwebview
-	)
-
-	local entry operator use subdir package exception modules uris
-	local -A iuse
-	for entry in "${map[@]}"; do
-		[[ ${entry} =~ ^([%+-])([^/^!:=]+)([/^])?([^!:=]+)?([!:])?=?(.+)? ]] # || die
-		operator=${BASH_REMATCH[1]#-}
-		use=${BASH_REMATCH[2]}
-		subdir=${BASH_REMATCH[3]}
-		package=${BASH_REMATCH[4]}
-		exception=${BASH_REMATCH[5]}
-		modules=${BASH_REMATCH[6]:-${package}}
-
-		[[ ${subdir} == / ]] && subdir=.${package} || subdir=
-
-		[[ ${exception} == ! ]] ||
-			printf -v uris "${baseuri}.doc${subdir}/${prefix}%s${doc_suffix} " \
-				${modules}
-		[[ ${exception} == : ]] ||
-			uris+=" examples? ( ${baseuri}.examples${subdir}/${prefix}${package}${exa_suffix} )"
-
-		if [[ ${operator} == % ]]; then
-			SRC_URI+=" ${uris}"
-		else
-			iuse[${operator}${use}]= # avoid duplicates
-			SRC_URI+=" ${use}? ( ${uris} )"
-		fi
-	done
-	IUSE+=" ${!iuse[*]}"
-}
-qt6_docs_generate_metadata
-
-src_install() {
-	insinto /usr/share/qt6-doc # QT6_DOCDIR
-	use qch && doins -r Docs/*/*.qch
-
-	if use html; then
-		doins -r Docs/*/*/
-
-		# needed not to let Qt Creator believe that these examples exist
-		use examples ||
-			find "${ED}" -type f -name examples-manifest.xml -delete || die
-	elif use examples; then
-		# still need docs tarballs even with USE="-html -qch"
-		for dir in Docs/*/*/; do
-			if [[ -e ${dir}/examples-manifest.xml ]]; then
-				insinto /usr/share/qt6-doc/"${dir#*/*/}"
-				doins ${dir}/examples-manifest.xml
-			fi
-		done
-	fi
-
-	insinto /usr/share/qt6/examples # QT6_EXAMPLESDIR
-	use examples && doins -r Examples/*/*/
-}
diff --git a/dev-qt/qt-docs/qt-docs-6.7.3_p202409200836.ebuild b/dev-qt/qt-docs/qt-docs-6.7.3_p202409200836.ebuild
deleted file mode 100644
index ccf2557a1f10..000000000000
--- a/dev-qt/qt-docs/qt-docs-6.7.3_p202409200836.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit unpacker
-
-DESCRIPTION="Qt6 documentation and examples for Qt Creator and other tools"
-HOMEPAGE="https://doc.qt.io/"
-
-LICENSE="FDL-1.3"
-SLOT="6"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-IUSE="+examples +html +qch"
-REQUIRED_USE="|| ( examples html qch )"
-
-BDEPEND="
-	examples? ( $(unpacker_src_uri_depends .7z) )
-"
-
-qt6_docs_generate_metadata() {
-	local qtver=${PV%%_p*}
-	local prefix=${qtver}-0-${PV##*_p}
-	local doc_suffix=-documentation.tar.xz
-	local exa_suffix=-examples-${qtver}.7z
-	local baseuri=https://download.qt.io/online/qtsdkrepository/all_os/qt/qt6_${qtver//.}_src_doc_examples/qt.qt6.${qtver//.}
-	SRC_URI=
-	S=${WORKDIR}
-
-	# Bumping involves diff'ing the unversioned *_src_doc_examples/*/ files
-	# list from old version to the new for -documentation and -examples
-	# files, then adding/removing entries if anything changed.
-	#
-	# Format: [+-%]<USE>[</|^><package>[!|:]][="<module> ..."]
-	#  -    [+-%]<USE>: enable(+), disable(-), or no IUSE(%)
-	#          (should disable if associated package is not in tree)
-	#  -    /<package>: qt.qt6.*.examples.<package>/*-<package>-examples*
-	#  -    ^<package>: qt.qt6.*.examples/*-<package>-examples.7z
-	#  -      <module>: qt.qt6.*.doc.<package>/*-<module>-documentation*
-	#          (if <module> is unspecified, defaults to <package>)
-	#  - <package>[!:]: only has examples(!) or documentation(:)
-	# Note: sub-300 bytes examples archives are empty, can be skipped
-	local map=(
-		# map with (non-split) Qt6 packages rather than per-module
-		%base^qtbase="
-			qmake qtcmake qtconcurrent qtcore qtdbus
-			qtgui qtnetwork qtopengl qtplatformintegration
-			qtprintsupport qtsql qttestlib qtwidgets qtxml
-		"
-		+3d/qt3d
-		-activeqt/qtactiveqt="activeqt"
-		+charts/qtcharts
-		+connectivity/qtbluetooth:
-		+connectivity/qtconnectivity!
-		+connectivity/qtnfc:
-		-datavis/qtdatavis3d
-		+declarative^qtdeclarative="
-			qtlabsplatform qtqml qtqmlcore qtqmlmodels
-			qtqmltest qtqmlworkerscript qtqmlxmllistmodel
-			qtquick qtquickcontrols qtquickdialogs
-		"
-		%doc^qtdoc
-		-graphs/qtgraphs
-		-grpc/qtgrpc="qtgrpc qtprotobuf"
-		+httpserver/qthttpserver
-		+imageformats/qtimageformats: # empty examples
-#		+languageserver/qtlanguageserver # docs and examples are empty
-		+location/qtlocation
-		-lottie/qtlottie:="qtlottieanimation" # empty examples
-		+multimedia/qtmultimedia
-		+networkauth/qtnetworkauth
-		+positioning/qtpositioning
-		+qt5compat/qt5compat="qtcore5compat qtgraphicaleffects5compat"
-#		+qt5="qt5" # already installed by qtbase (conflicts)
-		-quick3dphysics/qtquick3dphysics
-		+quick3d/qtquick3d
-		-quickeffectmaker/qtquickeffectmaker
-		+remoteobjects/qtremoteobjects
-		+scxml/qtscxml
-		+sensors/qtsensors
-		+serialbus/qtserialbus
-		+serialport/qtserialport
-		+shadertools/qtshadertools: # empty examples
-		+speech/qtspeech="qttexttospeech"
-		+svg^qtsvg
-		+timeline/qtquicktimeline:
-		+tools^qttools="
-			qdoc qtassistant qtdesigner qtdistancefieldgenerator
-			qthelp qtlinguist qtuitools
-		"
-		+virtualkeyboard/qtvirtualkeyboard
-		+wayland^qtwayland="qtwaylandcompositor"
-		+webchannel/qtwebchannel
-		+webengine/qtpdf:
-		+webengine/qtwebengine
-		+websockets/qtwebsockets
-		+webview/qtwebview
-	)
-
-	local entry operator use subdir package exception modules uris
-	local -A iuse
-	for entry in "${map[@]}"; do
-		[[ ${entry} =~ ^([%+-])([^/^!:=]+)([/^])?([^!:=]+)?([!:])?=?(.+)? ]] # || die
-		operator=${BASH_REMATCH[1]#-}
-		use=${BASH_REMATCH[2]}
-		subdir=${BASH_REMATCH[3]}
-		package=${BASH_REMATCH[4]}
-		exception=${BASH_REMATCH[5]}
-		modules=${BASH_REMATCH[6]:-${package}}
-
-		[[ ${subdir} == / ]] && subdir=.${package} || subdir=
-
-		[[ ${exception} == ! ]] ||
-			printf -v uris "${baseuri}.doc${subdir}/${prefix}%s${doc_suffix} " \
-				${modules}
-		[[ ${exception} == : ]] ||
-			uris+=" examples? ( ${baseuri}.examples${subdir}/${prefix}${package}${exa_suffix} )"
-
-		if [[ ${operator} == % ]]; then
-			SRC_URI+=" ${uris}"
-		else
-			iuse[${operator}${use}]= # avoid duplicates
-			SRC_URI+=" ${use}? ( ${uris} )"
-		fi
-	done
-	IUSE+=" ${!iuse[*]}"
-}
-qt6_docs_generate_metadata
-
-src_install() {
-	insinto /usr/share/qt6-doc # QT6_DOCDIR
-	use qch && doins -r Docs/*/*.qch
-
-	if use html; then
-		doins -r Docs/*/*/
-
-		# needed not to let Qt Creator believe that these examples exist
-		use examples ||
-			find "${ED}" -type f -name examples-manifest.xml -delete || die
-	elif use examples; then
-		# still need docs tarballs even with USE="-html -qch"
-		for dir in Docs/*/*/; do
-			if [[ -e ${dir}/examples-manifest.xml ]]; then
-				insinto /usr/share/qt6-doc/"${dir#*/*/}"
-				doins ${dir}/examples-manifest.xml
-			fi
-		done
-	fi
-
-	insinto /usr/share/qt6/examples # QT6_EXAMPLESDIR
-	use examples && doins -r Examples/*/*/
-}
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index ad998102c93d..7e633061b14f 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,4 +1,2 @@
 DIST qt3d-everywhere-opensource-src-5.15.16.tar.xz 118265056 BLAKE2B b5a20f20e8f8a1dbb25fa370d5f02b104e2b3b4902f1f58596cd2d0d2a4ddda67dcaaa9ccd865f7474e1b66bb506f5eeb687fbedbc796a1da7ff95b407566ec9 SHA512 bdb13bd73a8b706eae8ad07d506ca21469a138dadb47b604a23ebe4640b593cba1353efa081a51a6d869a3d75e1b2b25c432bc7bc4621991f2fd2f5d18914fc6
-DIST qt3d-everywhere-src-6.7.2.tar.xz 141589248 BLAKE2B cb775f7e66a3c5a42a665605715a94cffcac8c9618a02048c453d527e87465b0adeac0f683346e6edb67de8843aa803a13e1af6e778eb5ff7e25c38f488a8d3e SHA512 d2b5ccf76f75db886acf4a73b1f2bc77e79a584f08f39915b7565179943c09a3ea90904af342a6d2d668b033161c41d6d4d20022e5e990ad55fa40fcb6746480
-DIST qt3d-everywhere-src-6.7.3.tar.xz 141600080 BLAKE2B 56371cb24430475d470546f762a8517a5fe9aafffbf329db0e906d4ab1e380085451dca123a3cb8f8e5c61fe062bbb9d8174cb72ec4d71874e4ee024767fd1b4 SHA512 8337c68e99a634e367899a49ce6aa51b98443c5f5e9c7487e1e79b0f2988d6543c78d8cf5e305506703d196032664a1dad33073530a10a5999ad623c6f7af98d
 DIST qt3d-everywhere-src-6.8.1.tar.xz 141818588 BLAKE2B c9b88c9fdc5db349a1f0e764b4aa9ad85799c870da891ffcea1f80b1c2d7c88351b2863eaeb858f85b93bdb686b78c68777636995ebf6b316753737259931973 SHA512 8ff647cc209fed963d3d8192c8ff495383c3118c699398ee280832086c1a33b70ef9f5b8486295be842ba2eaf419bdb10241a1371e84be4797665865fd48b6a9
diff --git a/dev-qt/qt3d/qt3d-6.7.2.ebuild b/dev-qt/qt3d/qt3d-6.7.2.ebuild
deleted file mode 100644
index 1d6c2f7e0838..000000000000
--- a/dev-qt/qt3d/qt3d-6.7.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="3D rendering module for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~riscv x86"
-elif [[ ${QT6_BUILD_TYPE} == live ]]; then
-	EGIT_SUBMODULES=() # skip qtquick3d-assimp
-fi
-
-IUSE="gles2-only qml vulkan"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=]
-	~dev-qt/qtshadertools-${PV}:6
-	media-libs/assimp:=
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-"
-DEPEND="
-	${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-		-DQT_FEATURE_qt3d_system_assimp=ON
-		-DQT_UNITY_BUILD=OFF # fails to build
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qt3d/qt3d-6.7.3.ebuild b/dev-qt/qt3d/qt3d-6.7.3.ebuild
deleted file mode 100644
index db2eacdd658c..000000000000
--- a/dev-qt/qt3d/qt3d-6.7.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="3D rendering module for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~riscv x86"
-elif [[ ${QT6_BUILD_TYPE} == live ]]; then
-	EGIT_SUBMODULES=() # skip qtquick3d-assimp
-fi
-
-IUSE="gles2-only qml vulkan"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=]
-	~dev-qt/qtshadertools-${PV}:6
-	media-libs/assimp:=
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-"
-DEPEND="
-	${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-		-DQT_FEATURE_qt3d_system_assimp=ON
-		-DQT_UNITY_BUILD=OFF # fails to build
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qt3d/qt3d-6.8.1.ebuild b/dev-qt/qt3d/qt3d-6.8.1.ebuild
index c6a3302f5a76..51fae49912bb 100644
--- a/dev-qt/qt3d/qt3d-6.8.1.ebuild
+++ b/dev-qt/qt3d/qt3d-6.8.1.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
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="3D rendering module for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~riscv x86"
 elif [[ ${QT6_BUILD_TYPE} == live ]]; then
 	EGIT_SUBMODULES=() # skip qtquick3d-assimp
 fi
diff --git a/dev-qt/qt3d/qt3d-6.8.9999.ebuild b/dev-qt/qt3d/qt3d-6.8.9999.ebuild
index c67d6bef95e6..e24eb983b7f6 100644
--- a/dev-qt/qt3d/qt3d-6.8.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-6.8.9999.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
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="3D rendering module for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 elif [[ ${QT6_BUILD_TYPE} == live ]]; then
 	EGIT_SUBMODULES=() # skip qtquick3d-assimp
 fi
diff --git a/dev-qt/qt3d/qt3d-6.9.9999.ebuild b/dev-qt/qt3d/qt3d-6.9.9999.ebuild
index c67d6bef95e6..e24eb983b7f6 100644
--- a/dev-qt/qt3d/qt3d-6.9.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-6.9.9999.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
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="3D rendering module for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 elif [[ ${QT6_BUILD_TYPE} == live ]]; then
 	EGIT_SUBMODULES=() # skip qtquick3d-assimp
 fi
diff --git a/dev-qt/qt3d/qt3d-6.9999.ebuild b/dev-qt/qt3d/qt3d-6.9999.ebuild
index c67d6bef95e6..e24eb983b7f6 100644
--- a/dev-qt/qt3d/qt3d-6.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-6.9999.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
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="3D rendering module for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 elif [[ ${QT6_BUILD_TYPE} == live ]]; then
 	EGIT_SUBMODULES=() # skip qtquick3d-assimp
 fi
diff --git a/dev-qt/qt5compat/Manifest b/dev-qt/qt5compat/Manifest
index e917480dd40c..033eb63e10b8 100644
--- a/dev-qt/qt5compat/Manifest
+++ b/dev-qt/qt5compat/Manifest
@@ -1,3 +1 @@
-DIST qt5compat-everywhere-src-6.7.2.tar.xz 14632348 BLAKE2B 81622db206b0902a14b5f14668464538989044506cfa417bfd2a5bb5163f0e6c09fdc10b641a3767595e4c80a554c6181118f75501d11eff997255a3bcfd50aa SHA512 31da40af3ab0a2283ead3363ee6c94a45018beccb777d2e4188f182d45ffb7e70d97543e22e5f6bc2c13df149676e44e259c8785626c54a4ed8757dcf414b4b0
-DIST qt5compat-everywhere-src-6.7.3.tar.xz 14631404 BLAKE2B 4a48890740a240d2a2a711d387782ae9f590f8edcb2611ec8c7ddfd0917132acd1124e16ee7215737c1688620e3be0eaec54a3553c9ef61dfff32bd6b4c4ccda SHA512 5a9cdf6cc4d56c2576e68aaf1c68f59a6f0b7655685235876dd2916506afb11253a8fc88c8b1e7756533c39bf42263499f7fc2ef72ad6ba672a45a55cc7048a3
 DIST qt5compat-everywhere-src-6.8.1.tar.xz 14632944 BLAKE2B abb42dd9fd5b12ea17ce6baed5829d497b3c6ab56e2ef3d6c65ab5e8b4b8726c5d1a2425ea7ed3238cd3835f1b684cbea569e37b1b9587eeb3affa71c2df926c SHA512 ef1764820387a6c9461fe4e21e44f77c6e95068d4cb37ea221228f06596b7bdb2cbe971e8646832454749954cbc31942eb882808c1b5b3b4d1efce5cf84bd93b
diff --git a/dev-qt/qt5compat/qt5compat-6.7.2.ebuild b/dev-qt/qt5compat/qt5compat-6.7.2.ebuild
deleted file mode 100644
index 4f479ea72d81..000000000000
--- a/dev-qt/qt5compat/qt5compat-6.7.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt module containing the unsupported Qt 5 APIs"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-IUSE="icu qml"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,icu=,network,xml]
-	icu? ( dev-libs/icu:= )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}:6
-		~dev-qt/qtshadertools-${PV}:6
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Quick)
-	)
-
-	qt6-build_src_configure
-}
-
-src_test() {
-	# tst_qxmlinputsource sometimes hang without -j1
-	qt6-build_src_test -j1
-}
diff --git a/dev-qt/qt5compat/qt5compat-6.7.3.ebuild b/dev-qt/qt5compat/qt5compat-6.7.3.ebuild
deleted file mode 100644
index 5d6bd4178335..000000000000
--- a/dev-qt/qt5compat/qt5compat-6.7.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt module containing the unsupported Qt 5 APIs"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-IUSE="icu qml"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,icu=,network,xml]
-	icu? ( dev-libs/icu:= )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}:6
-		~dev-qt/qtshadertools-${PV}:6
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Quick)
-	)
-
-	qt6-build_src_configure
-}
-
-src_test() {
-	# tst_qxmlinputsource sometimes hang without -j1
-	qt6-build_src_test -j1
-}
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index a3255ea3a196..13aa830c4d2b 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1,3 +1 @@
-DIST qtbase-everywhere-src-6.7.2.tar.xz 49364504 BLAKE2B b48b8a8decafe3262d459b9446c25561851fef88b3316107c2909f5964e8122a558b5501a3e59667bdf4776d36ea5ba0d9f227538c45c1f8e94fbc8fff4244a6 SHA512 eb4b2f1fb02ab0ed5508d32449e140778278ff1a619cfcae14920b276b5c46e01a566d73fb8f84cf2cfc81e19cb11e53ab500df6b27d12ab875aa8c07bd15d6b
-DIST qtbase-everywhere-src-6.7.3.tar.xz 49426156 BLAKE2B da7eacd64bd122bf2b320c0cec41ae7630e55e0d588912bc2cc6ef7ecc755af0f375ca84c6fe0bb8381e4008da2fd43fc491c5c88ecc7694223c62700761ed37 SHA512 99495c6ed942b3a7bd19f9471bac76502baaafc20ad7e139adf25726f699c1b4deffa1ab761fe9a49a3ffe6a36d830422a20f8a369aded67a083652bf4a19290
 DIST qtbase-everywhere-src-6.8.1.tar.xz 48220752 BLAKE2B b42d562f9069cf3d68807c63492f0ae1dcb9cb9a057a8d8548a7d134b36af169e403324e2902fa59c6c82ce087add107173c7606dff952dbbbc06c33b056ddff SHA512 87b7df95a63f7c28bfc7659f19658e4151b9da55b0dc4d34dc0e04c5270254b01a72f8deac0b2fc5543fce8d7542128addb398833de9c3248196aa96b2dd1601
diff --git a/dev-qt/qtbase/files/qtbase-6.7.2-CVE-2024-39936.patch b/dev-qt/qtbase/files/qtbase-6.7.2-CVE-2024-39936.patch
deleted file mode 100644
index cc6238a55f1b..000000000000
--- a/dev-qt/qtbase/files/qtbase-6.7.2-CVE-2024-39936.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-https://bugs.gentoo.org/935869
-https://github.com/qt/qtbase/commit/2b1e36e183ce75c224305c7a94457b92f7a5cf58
-From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
-Date: Tue, 25 Jun 2024 17:09:35 +0200
-Subject: [PATCH] HTTP2: Delay any communication until encrypted() can be
- responded to
-
-We have the encrypted() signal that lets users do extra checks on the
-established connection. It is emitted as BlockingQueued, so the HTTP
-thread stalls until it is done emitting. Users can potentially call
-abort() on the QNetworkReply at that point, which is passed as a Queued
-call back to the HTTP thread. That means that any currently queued
-signal emission will be processed before the abort() call is processed.
-
-In the case of HTTP2 it is a little special since it is multiplexed and
-the code is built to start requests as they are available. This means
-that, while the code worked fine for HTTP1, since one connection only
-has one request, it is not working for HTTP2, since we try to send more
-requests in-between the encrypted() signal and the abort() call.
-
-This patch changes the code to delay any communication until the
-encrypted() signal has been emitted and processed, for HTTP2 only.
-It's done by adding a few booleans, both to know that we have to return
-early and so we can keep track of what events arose and what we need to
-resume once enough time has passed that any abort() call must have been
-processed.
-
-Fixes: QTBUG-126610
---- a/src/network/access/qhttp2protocolhandler.cpp
-+++ b/src/network/access/qhttp2protocolhandler.cpp
-@@ -304,10 +304,10 @@
-     }
- 
--    if (!prefaceSent && !sendClientPreface())
--        return false;
--
-     if (!requests.size())
-         return true;
- 
-+    if (!prefaceSent && !sendClientPreface())
-+        return false;
-+
-     m_channel->state = QHttpNetworkConnectionChannel::WritingState;
-     // Check what was promised/pushed, maybe we do not have to send a request
---- a/src/network/access/qhttpnetworkconnectionchannel.cpp
-+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
-@@ -210,4 +210,8 @@
- {
-     Q_ASSERT(protocolHandler);
-+    if (waitingForPotentialAbort) {
-+        needInvokeSendRequest = true;
-+        return false; // this return value is unused
-+    }
-     return protocolHandler->sendRequest();
- }
-@@ -222,7 +226,6 @@
- {
-     QMetaObject::invokeMethod(this, [this] {
--        Q_ASSERT(protocolHandler);
-         if (reply)
--            protocolHandler->sendRequest();
-+            sendRequest();
-     }, Qt::ConnectionType::QueuedConnection);
- }
-@@ -231,4 +234,8 @@
- {
-     Q_ASSERT(protocolHandler);
-+    if (waitingForPotentialAbort) {
-+        needInvokeReceiveReply = true;
-+        return;
-+    }
-     protocolHandler->_q_receiveReply();
- }
-@@ -237,4 +244,8 @@
- {
-     Q_ASSERT(protocolHandler);
-+    if (waitingForPotentialAbort) {
-+        needInvokeReadyRead = true;
-+        return;
-+    }
-     protocolHandler->_q_readyRead();
- }
-@@ -1240,5 +1251,16 @@
-             // Similar to HTTP/1.1 counterpart below:
-             const auto &pair = std::as_const(h2RequestsToSend).first();
-+            waitingForPotentialAbort = true;
-             emit pair.second->encrypted();
-+
-+            // We don't send or handle any received data until any effects from
-+            // emitting encrypted() have been processed. This is necessary
-+            // because the user may have called abort(). We may also abort the
-+            // whole connection if the request has been aborted and there is
-+            // no more requests to send.
-+            QMetaObject::invokeMethod(this,
-+                                      &QHttpNetworkConnectionChannel::checkAndResumeCommunication,
-+                                      Qt::QueuedConnection);
-+
-             // In case our peer has sent us its settings (window size, max concurrent streams etc.)
-             // let's give _q_receiveReply a chance to read them first ('invokeMethod', QueuedConnection).
-@@ -1258,4 +1280,26 @@
- }
- 
-+
-+void QHttpNetworkConnectionChannel::checkAndResumeCommunication()
-+{
-+    Q_ASSERT(connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2
-+             || connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2Direct);
-+
-+    // Because HTTP/2 requires that we send a SETTINGS frame as the first thing we do, and respond
-+    // to a SETTINGS frame with an ACK, we need to delay any handling until we can ensure that any
-+    // effects from emitting encrypted() have been processed.
-+    // This function is called after encrypted() was emitted, so check for changes.
-+
-+    if (!reply && h2RequestsToSend.isEmpty())
-+        abort();
-+    waitingForPotentialAbort = false;
-+    if (needInvokeReadyRead)
-+        _q_readyRead();
-+    if (needInvokeReceiveReply)
-+        _q_receiveReply();
-+    if (needInvokeSendRequest)
-+        sendRequest();
-+}
-+
- void QHttpNetworkConnectionChannel::requeueHttp2Requests()
- {
---- a/src/network/access/qhttpnetworkconnectionchannel_p.h
-+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
-@@ -75,4 +75,8 @@
-     bool ssl;
-     bool isInitialized;
-+    bool waitingForPotentialAbort = false;
-+    bool needInvokeReceiveReply = false;
-+    bool needInvokeReadyRead = false;
-+    bool needInvokeSendRequest = false;
-     ChannelState state;
-     QHttpNetworkRequest request; // current request, only used for HTTP
-@@ -147,4 +151,6 @@
-     void resendCurrentRequest();
- 
-+    void checkAndResumeCommunication();
-+
-     bool isSocketBusy() const;
-     bool isSocketWriting() const;
---- a/tests/auto/network/access/http2/tst_http2.cpp
-+++ b/tests/auto/network/access/http2/tst_http2.cpp
-@@ -107,4 +107,6 @@
-     void duplicateRequestsWithAborts();
- 
-+    void abortOnEncrypted();
-+
- protected slots:
-     // Slots to listen to our in-process server:
-@@ -1480,4 +1482,46 @@
- }
- 
-+void tst_Http2::abortOnEncrypted()
-+{
-+#if !QT_CONFIG(ssl)
-+    QSKIP("TLS support is needed for this test");
-+#else
-+    clearHTTP2State();
-+    serverPort = 0;
-+
-+    ServerPtr targetServer(newServer(defaultServerSettings, H2Type::h2Direct));
-+
-+    QMetaObject::invokeMethod(targetServer.data(), "startServer", Qt::QueuedConnection);
-+    runEventLoop();
-+
-+    nRequests = 1;
-+    nSentRequests = 0;
-+
-+    const auto url = requestUrl(H2Type::h2Direct);
-+    QNetworkRequest request(url);
-+    request.setAttribute(QNetworkRequest::Http2DirectAttribute, true);
-+
-+    std::unique_ptr<QNetworkReply> reply{manager->get(request)};
-+    reply->ignoreSslErrors();
-+    connect(reply.get(), &QNetworkReply::encrypted, reply.get(), [reply = reply.get()](){
-+        reply->abort();
-+    });
-+    connect(reply.get(), &QNetworkReply::errorOccurred, this, &tst_Http2::replyFinishedWithError);
-+
-+    runEventLoop();
-+    STOP_ON_FAILURE
-+
-+    QCOMPARE(nRequests, 0);
-+    QCOMPARE(reply->error(), QNetworkReply::OperationCanceledError);
-+
-+    const bool res = QTest::qWaitFor(
-+            [this, server = targetServer.get()]() {
-+                return serverGotSettingsACK || prefaceOK || nSentRequests > 0;
-+            },
-+            500);
-+    QVERIFY(!res);
-+#endif // QT_CONFIG(ssl)
-+}
-+
- void tst_Http2::serverStarted(quint16 port)
- {
diff --git a/dev-qt/qtbase/files/qtbase-6.7.2-float16-sse2.patch b/dev-qt/qtbase/files/qtbase-6.7.2-float16-sse2.patch
deleted file mode 100644
index a54c9daa42b9..000000000000
--- a/dev-qt/qtbase/files/qtbase-6.7.2-float16-sse2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Backport from 6.7.3 as it may cause major problems for x86 sse2-less
-systems using gcc14.
-
-https://github.com/qt/qtbase/commit/39fa7e7bef90be2940c5f736935f963e3969e0bd
-From: Dmitry Shachnev <mitya57@gmail.com>
-Date: Sat, 27 Jul 2024 23:03:07 +0300
-Subject: [PATCH] Use _Float16 only when SSE2 is enabled
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The GCC documentation [1] says: “On x86 targets with SSE2 enabled, GCC
-supports half-precision (16-bit) floating point via the _Float16 type”.
-
-On non-SSE2 x86 (such as Debian i386 baseline [2]), __FLT16_MAX__ is
-defined starting with GCC 14 [3], however any non-trivial use of the
-_Float16 type results in an error:
-
-error: operation not permitted on type �_Float16’ without option �-msse2’
-
-which makes some packages fail to build on i386 architecture [4].
-
-[1]: https://gcc.gnu.org/onlinedocs/gcc/Half-Precision.html
-[2]: https://wiki.debian.org/ArchitectureSpecificsMemo#i386-1
-[3]: https://gcc.gnu.org/g:9a19fa8b616f83474c35cc5b34a3865073ced829
-[4]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1076986
---- a/src/corelib/global/qtypes.h
-+++ b/src/corelib/global/qtypes.h
-@@ -264,11 +264,10 @@
- #  define QFLOAT16_IS_NATIVE        1
- using NativeFloat16Type = decltype(__FLT16_MAX__);
--#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__)
-+#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__) && defined(__ARM_FP16_FORMAT_IEEE)
- #  define QFLOAT16_IS_NATIVE        1
--#  ifdef __ARM_FP16_FORMAT_IEEE
- using NativeFloat16Type = __fp16;
--#  else
-+#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__) && defined(__SSE2__)
-+#  define QFLOAT16_IS_NATIVE        1
- using NativeFloat16Type = _Float16;
--#  endif
- #else
- #  define QFLOAT16_IS_NATIVE        0
diff --git a/dev-qt/qtbase/files/qtbase-6.7.2-gcc15-odr.patch b/dev-qt/qtbase/files/qtbase-6.7.2-gcc15-odr.patch
deleted file mode 100644
index 64cedb14662a..000000000000
--- a/dev-qt/qtbase/files/qtbase-6.7.2-gcc15-odr.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://codereview.qt-project.org/c/qt/qtbase/+/582403
-From: Sam James <sam@gentoo.org>
-Date: Sat, 10 Aug 2024 16:43:05 +0100
-Subject: [PATCH] Fix ODR violation for IsFloatType_v
-
-With recent GCC 15 trunk, I started to see:
-```
-ld: .../kwalletentry.cc.o:(.rodata+0x0): multiple definition of `QtPrivate::IsFloatType_v<_Float16>';
-	src/runtime/kwalletd/backend/CMakeFiles/KF6WalletBackend.dir/cbc.cc.o:(.rodata+0x0): first defined here
-```
-
-The issue is that constexpr is only implicitly inline for functions or
-static data members [0], so the two constexpr IsFloatType_v definitions
-here cause an ODR violation.
-
-Explicitly mark them as inline constexpr.
-
-[0] http://eel.is/c++draft/dcl.constexpr#1.sentence-3
---- a/src/corelib/global/qcomparehelpers.h
-+++ b/src/corelib/global/qcomparehelpers.h
-@@ -348,9 +348,9 @@
- 
- template <typename T>
--constexpr bool IsFloatType_v = std::is_floating_point_v<T>;
-+inline constexpr bool IsFloatType_v = std::is_floating_point_v<T>;
- 
- #if QFLOAT16_IS_NATIVE
- template <>
--constexpr bool IsFloatType_v<QtPrivate::NativeFloat16Type> = true;
-+inline constexpr bool IsFloatType_v<QtPrivate::NativeFloat16Type> = true;
- #endif
- 
diff --git a/dev-qt/qtbase/files/qtbase-6.7.2-haswell-no-rdrnd.patch b/dev-qt/qtbase/files/qtbase-6.7.2-haswell-no-rdrnd.patch
deleted file mode 100644
index 0427315d69d5..000000000000
--- a/dev-qt/qtbase/files/qtbase-6.7.2-haswell-no-rdrnd.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-https://bugreports.qt.io/browse/QTBUG-129193 
-https://forums.gentoo.org/viewtopic-t-1170690.html
-https://forums.gentoo.org/viewtopic-t-1169619.html
-https://codereview.qt-project.org/c/qt/qtbase/+/593073
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Mon, 23 Sep 2024 13:44:31 -0700
-Subject: [PATCH] qsimd_x86: disable the requirement that CPUs must have RNGs
-
-Intel CPUs have had this since 2013 (Ivy Bridge), but some older
-Bulldozer AMD CPUs appear to be missing it. This creates a mismatch
-between when the __haswell__ macro gets declared in qsimd_p.h and the
-runtime check using the CpuArchHaswell value. That in turn creates a
-condition where qInitDrawhelperFunctions() in qdrawhelper.cpp leaves the
-memfill pointers set to null.
-
-#elif defined(__SSE2__)
-#  ifndef __haswell__
-    qt_memfill32 = qt_memfill32_sse2;
-    qt_memfill64 = qt_memfill64_sse2;
-#  endif
-...
-#if defined(QT_COMPILER_SUPPORTS_AVX2)
-    if (qCpuHasFeature(ArchHaswell)) {
-        qt_memfill32 = qt_memfill32_avx2;
-        qt_memfill64 = qt_memfill64_avx2;
-
-It does this so the qt_memfillXX_sse2 functions don't have to be defined
-anywhere, so the QtGui build won't carry unnecessary dead code.
-
-This is old code (from Qt 4.x) and several improvements I've made for
-QtCore are not applied yet. My work for qSimdDispatcher[1] isn't
-complete: it might have avoided this problem here, but it would also
-have required major work for the draw helpers to work in the first
-place.
-
-[1] https://codereview.qt-project.org/c/qt/qtbase/+/537384
-
-Pick-to: 6.8 6.7 6.5 6.2
-Fixes: QTBUG-129193
-Change-Id: Ia427a9e502b0fb46b2bdfffda8e2131b7091c9e9
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---- a/src/corelib/global/qsimd_x86_p.h
-+++ b/src/corelib/global/qsimd_x86_p.h
-@@ -85,16 +85,14 @@
- #define cpu_snb                 (cpu_wsm \
-                                  | cpu_feature_avx)
- #define cpu_ivb                 (cpu_snb \
--                                 | cpu_feature_f16c \
--                                 | cpu_feature_rdrnd)
-+                                 | cpu_feature_f16c)
- #define cpu_hsw                 (cpu_ivb \
-                                  | cpu_feature_avx2 \
-                                  | cpu_feature_fma \
-                                  | cpu_feature_bmi \
-                                  | cpu_feature_bmi2 \
-                                  | cpu_feature_movbe)
--#define cpu_bdw                 (cpu_hsw \
--                                 | cpu_feature_rdseed)
-+#define cpu_bdw                 (cpu_hsw)
- #define cpu_bdx                 (cpu_bdw)
- #define cpu_skl                 (cpu_bdw)
- #define cpu_skx                 (cpu_skl \
-@@ -237,9 +235,9 @@
- #define QT_FUNCTION_TARGET_STRING_ARCH_NHM          QT_FUNCTION_TARGET_STRING_ARCH_CORE2 ",sse4.1,sse4.2,popcnt"
- #define QT_FUNCTION_TARGET_STRING_ARCH_WSM          QT_FUNCTION_TARGET_STRING_ARCH_NHM
- #define QT_FUNCTION_TARGET_STRING_ARCH_SNB          QT_FUNCTION_TARGET_STRING_ARCH_WSM ",avx"
--#define QT_FUNCTION_TARGET_STRING_ARCH_IVB          QT_FUNCTION_TARGET_STRING_ARCH_SNB ",f16c,rdrnd,fsgsbase"
-+#define QT_FUNCTION_TARGET_STRING_ARCH_IVB          QT_FUNCTION_TARGET_STRING_ARCH_SNB ",f16c,fsgsbase"
- #define QT_FUNCTION_TARGET_STRING_ARCH_HSW          QT_FUNCTION_TARGET_STRING_ARCH_IVB ",avx2,fma,bmi,bmi2,lzcnt,movbe"
--#define QT_FUNCTION_TARGET_STRING_ARCH_BDW          QT_FUNCTION_TARGET_STRING_ARCH_HSW ",adx,rdseed"
-+#define QT_FUNCTION_TARGET_STRING_ARCH_BDW          QT_FUNCTION_TARGET_STRING_ARCH_HSW ",adx"
- #define QT_FUNCTION_TARGET_STRING_ARCH_BDX          QT_FUNCTION_TARGET_STRING_ARCH_BDW
- #define QT_FUNCTION_TARGET_STRING_ARCH_SKL          QT_FUNCTION_TARGET_STRING_ARCH_BDW ",xsavec,xsaves"
- #define QT_FUNCTION_TARGET_STRING_ARCH_SKX          QT_FUNCTION_TARGET_STRING_ARCH_SKL ",avx512f,avx512dq,avx512cd,avx512bw,avx512vl"
-@@ -473,9 +471,9 @@
-     CpuArchNHM = cpu_nhm,
-     CpuArchWSM = cpu_wsm,
-     CpuArchSNB = cpu_snb,
--    CpuArchIVB = cpu_ivb,
-+    CpuArchIVB = cpu_ivb,                                    ///< rdrnd
-     CpuArchHSW = cpu_hsw,                                    ///< hle,rtm
--    CpuArchBDW = cpu_bdw,
-+    CpuArchBDW = cpu_bdw,                                    ///< rdseed
-     CpuArchBDX = cpu_bdx,
-     CpuArchSKL = cpu_skl,
-     CpuArchSKX = cpu_skx,                                    ///< clwb
---- a/util/x86simdgen/3rdparty/simd-intel.conf
-+++ b/util/x86simdgen/3rdparty/simd-intel.conf
-@@ -142,9 +142,9 @@
- arch=NHM	Core2	sse4.1,sse4.2,popcnt
- arch=WSM	NHM
- arch=SNB	WSM	avx
--arch=IVB	SNB	f16c,rdrnd,fsgsbase
-+arch=IVB	SNB	f16c,fsgsbase		        # rdrnd
- arch=HSW	IVB	avx2,fma,bmi,bmi2,lzcnt,movbe	# hle,rtm
--arch=BDW	HSW	adx,rdseed
-+arch=BDW	HSW	adx				# rdseed
- arch=BDX	BDW
- arch=SKL	BDW	xsavec,xsaves
- arch=SKX	SKL	avx512f,avx512dq,avx512cd,avx512bw,avx512vl #clwb
diff --git a/dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch b/dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch
deleted file mode 100644
index 02219feaf681..000000000000
--- a/dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-https://bugs.gentoo.org/938475
-Older version of https://codereview.qt-project.org/c/qt/qtbase/+/585668 for 6.7
---- a/src/corelib/tools/qcontiguouscache.h
-+++ b/src/corelib/tools/qcontiguouscache.h
-@@ -10,2 +10,3 @@
- #include <QtCore/qtcoreexports.h>
-+#include <QtCore/qglobal.h>
- #include <QtCore/qtypeinfo.h>
diff --git a/dev-qt/qtbase/files/qtbase-6.7.2-qwindowprivate-crash.patch b/dev-qt/qtbase/files/qtbase-6.7.2-qwindowprivate-crash.patch
deleted file mode 100644
index 353383921b7f..000000000000
--- a/dev-qt/qtbase/files/qtbase-6.7.2-qwindowprivate-crash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.kde.org/show_bug.cgi?id=490791
-https://codereview.qt-project.org/c/qt/qtbase/+/584636
-From: David Edmundson <davidedmundson@kde.org>
-Date: Wed, 31 Jul 2024 11:59:14 +0100
-Subject: [PATCH] QWidget: Store initialScreen as QPointer
-
-A Toplevel QWidget can hold a pointer to the screen where it will
-eventually show contents, before a QWidgetWindow is created which then
-takes precedence.
-
-The screen member of QWindows is always kept up-to-date when a screen is
-removed, but not the contents of a toplevel window. If a widget has
-setScreen called but is never shown, it has potentially dangling pointer
-which can cause issues in the future.
-
-Pick-to: 6.5
-Change-Id: Ia7c80549e8b3c90a75cdde745487e87ecddaca63
-Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-(cherry picked from commit d67acf94afffde6a71498be6e30447f3acf7558e)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-(cherry picked from commit 6af4e5f604fff40cdb3be40099b8884362806ef4)
---- a/src/widgets/kernel/qwidget_p.h
-+++ b/src/widgets/kernel/qwidget_p.h
-@@ -110,3 +110,3 @@
-     Qt::WindowFlags savedFlags; // Save widget flags while showing fullscreen
--    QScreen *initialScreen; // Screen when passing a QDesktop[Screen]Widget as parent.
-+    QPointer<QScreen> initialScreen; // Screen when passing a QDesktop[Screen]Widget as parent.
- 
diff --git a/dev-qt/qtbase/files/qtbase-6.7.3-QTBUG-125053.patch b/dev-qt/qtbase/files/qtbase-6.7.3-QTBUG-125053.patch
deleted file mode 100644
index fc60e30b62c1..000000000000
--- a/dev-qt/qtbase/files/qtbase-6.7.3-QTBUG-125053.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://bugreports.qt.io/browse/QTBUG-125053
-https://bugreports.qt.io/browse/QTBUG-127340
-https://codereview.qt-project.org/c/qt/qtbase/+/593123
---- a/src/corelib/itemmodels/qabstractitemmodel.cpp
-+++ b/src/corelib/itemmodels/qabstractitemmodel.cpp
-@@ -3396,4 +3396,11 @@
- void QAbstractItemModel::beginResetModel()
- {
-+    Q_D(QAbstractItemModel);
-+    if (d->resetting) {
-+        qWarning() << "beginResetModel called on" << this << "without calling endResetModel first";
-+        // Warn, but don't return early in case user code relies on the incorrect behavior.
-+    }
-+
-+    d->resetting = true;
-     emit modelAboutToBeReset(QPrivateSignal());
- }
-@@ -3413,6 +3420,12 @@
- {
-     Q_D(QAbstractItemModel);
-+    if (!d->resetting) {
-+        qWarning() << "endResetModel called on" << this << "without calling beginResetModel first";
-+        // Warn, but don't return early in case user code relies on the incorrect behavior.
-+    }
-+
-     d->invalidatePersistentIndexes();
-     resetInternalData();
-+    d->resetting = false;
-     emit modelReset(QPrivateSignal());
- }
---- a/src/corelib/itemmodels/qabstractitemmodel_p.h
-+++ b/src/corelib/itemmodels/qabstractitemmodel_p.h
-@@ -46,4 +46,6 @@
-     ~QAbstractItemModelPrivate();
- 
-+    static const QAbstractItemModelPrivate *get(const QAbstractItemModel *model) { return model->d_func(); }
-+
-     void removePersistentIndexData(QPersistentModelIndexData *data);
-     void movePersistentIndexes(const QList<QPersistentModelIndexData *> &indexes, int change, const QModelIndex &parent,
-@@ -116,4 +118,6 @@
-     } persistent;
- 
-+    bool resetting = false;
-+
-     static const QHash<int,QByteArray> &defaultRoleNames();
-     static bool isVariantLessThan(const QVariant &left, const QVariant &right,
diff --git a/dev-qt/qtbase/files/qtbase-6.7.3-erratic-mouse-input.patch b/dev-qt/qtbase/files/qtbase-6.7.3-erratic-mouse-input.patch
deleted file mode 100644
index 14bdf1463949..000000000000
--- a/dev-qt/qtbase/files/qtbase-6.7.3-erratic-mouse-input.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-https://bugreports.qt.io/browse/QTBUG-129509
-https://bugreports.qt.io/browse/QTBUG-129514
-https://codereview.qt-project.org/c/qt/qtbase/+/594889
-From 42845904d51ad14b2ab41a165bd9b9b1a9459840 Mon Sep 17 00:00:00 2001
-From: Liang Qi <liang.qi@qt.io>
-Date: Tue, 01 Oct 2024 12:46:30 +0200
-Subject: [PATCH] Revert "xcb: handle XI2 input button and motion events from slave devices"
-
-This reverts commit b71be292780b858f2c55ce92601452e2ea946de2, which causes a regression when using mouse wheel and moving cursor together
-on scroll bar for some qt applications, like qutebrowser and
-qbittorrent.
-
-Fixes: QTBUG-129509
-Fixes: QTBUG-129514
-Task-number: QTBUG-110841
-Pick-to: 6.8.0 6.8 6.7 6.5 6.2 5.15
-Change-Id: I703158874413a1306ea99217bced4ba38382f543
---- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
-+++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
-@@ -683,94 +683,21 @@
- }
- 
--//implementation is ported from https://codereview.qt-project.org/c/qt/qtbase/+/231552/12/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp#558
--namespace {
--
--/*! \internal
--
-- Qt listens for XIAllDevices to avoid losing mouse events. This function
-- ensures that we don't process the same event twice: from a slave device and
-- then again from a master device.
--
-- In a normal use case (e.g. mouse press and release inside a window), we will
-- drop events from master devices as duplicates. Other advantage of processing
-- events from slave devices is that they don't share button state. All buttons
-- on a master device share the state.
--
-- Examples of special cases:
--
--\list
--
--\li During system move/resize, window manager (_NET_WM_MOVERESIZE) grabs the
--   master pointer, in this case we process the matching release from the slave
--   device. A master device event is not sent by the server, hence no duplicate
--   event to drop. If we listened for XIAllMasterDevices instead, we would never
--   see a release event in this case.
--
--\li If we dismiss a context menu by clicking somewhere outside a Qt application,
--   we will process the mouse press from the master pointer as that is the
--   device we are grabbing. We are not grabbing slave devices (grabbing on the
--   slave device is buggy according to 19d289ab1b5bde3e136765e5432b5c7d004df3a4).
--   And since the event occurs outside our window, the slave device event is
--   not sent to us by the server, hence no duplicate event to drop.
--
--\endlist
--*/
--bool isDuplicateEvent(xcb_ge_event_t *event)
--{
--    Q_ASSERT(event);
--
--    struct qXIEvent {
--        bool isValid = false;
--        uint16_t sourceid;
--        uint8_t evtype;
--        uint32_t detail;
--        int32_t root_x;
--        int32_t root_y;
--    };
--    static qXIEvent lastSeenEvent;
--
--    bool isDuplicate = false;
--    auto *xiDeviceEvent = reinterpret_cast<qt_xcb_input_device_event_t *>(event);
--    if (lastSeenEvent.isValid) {
--        isDuplicate = lastSeenEvent.sourceid == xiDeviceEvent->sourceid &&
--                lastSeenEvent.evtype == xiDeviceEvent->event_type &&
--                lastSeenEvent.detail == xiDeviceEvent->detail &&
--                lastSeenEvent.root_x == xiDeviceEvent->root_x &&
--                lastSeenEvent.root_y == xiDeviceEvent->root_y;
--    } else {
--        lastSeenEvent.isValid = true;
--    }
--    lastSeenEvent.sourceid = xiDeviceEvent->sourceid;
--    lastSeenEvent.evtype = xiDeviceEvent->event_type;
--    lastSeenEvent.detail = xiDeviceEvent->detail;
--    lastSeenEvent.root_x = xiDeviceEvent->root_x;
--    lastSeenEvent.root_y = xiDeviceEvent->root_y;
--
--    if (isDuplicate) {
--        qCDebug(lcQpaXInputEvents, "Duplicate XI2 event %d", event->event_type);
--        // This sanity check ensures that special cases like QTBUG-59277 keep working.
--        lastSeenEvent.isValid = false; // An event can be a duplicate only once.
--    }
--
--    return isDuplicate;
--}
--
--} // namespace
--
- void QXcbConnection::xi2HandleEvent(xcb_ge_event_t *event)
- {
-     auto *xiEvent = reinterpret_cast<qt_xcb_input_device_event_t *>(event);
--    if (m_xiSlavePointerIds.contains(xiEvent->deviceid)) {
--        if (!(xiEvent->event_type == XCB_INPUT_BUTTON_PRESS
--              || xiEvent->event_type == XCB_INPUT_BUTTON_RELEASE
--              || xiEvent->event_type == XCB_INPUT_MOTION)) {
--            if (!m_duringSystemMoveResize)
--                return;
--            if (xiEvent->event == XCB_NONE)
--                return;
--
--            if (xiEvent->event_type == XCB_INPUT_TOUCH_END)
--                abortSystemMoveResize(xiEvent->event);
-+    setTime(xiEvent->time);
-+    if (m_xiSlavePointerIds.contains(xiEvent->deviceid) && xiEvent->event_type != XCB_INPUT_PROPERTY) {
-+        if (!m_duringSystemMoveResize)
-+            return;
-+        if (xiEvent->event == XCB_NONE)
-+            return;
- 
-+        if (xiEvent->event_type == XCB_INPUT_BUTTON_RELEASE
-+            && xiEvent->detail == XCB_BUTTON_INDEX_1 ) {
-+            abortSystemMoveResize(xiEvent->event);
-+        } else if (xiEvent->event_type == XCB_INPUT_TOUCH_END) {
-+            abortSystemMoveResize(xiEvent->event);
-+            return;
-+        } else {
-             return;
-         }
-@@ -784,25 +711,9 @@
-     case XCB_INPUT_BUTTON_PRESS:
-     case XCB_INPUT_BUTTON_RELEASE:
--    case XCB_INPUT_MOTION: {
--        if (isDuplicateEvent(event))
--            return;
--        if (m_xiSlavePointerIds.contains(xiEvent->deviceid)) {
--            if (m_duringSystemMoveResize) {
--                if (xiEvent->event_type == XCB_INPUT_BUTTON_RELEASE
--                    && xiEvent->detail == XCB_BUTTON_INDEX_1 ) {
--                    abortSystemMoveResize(xiEvent->event);
--                } else {
--                    return;
--                }
--            }
--        }
--        xiDeviceEvent = xiEvent;
--        eventListener = windowEventListenerFromId(xiDeviceEvent->event);
--        sourceDeviceId = xiDeviceEvent->sourceid; // use the actual device id instead of the master
--        break;
--    }
-+    case XCB_INPUT_MOTION:
-     case XCB_INPUT_TOUCH_BEGIN:
-     case XCB_INPUT_TOUCH_UPDATE:
--    case XCB_INPUT_TOUCH_END: {
-+    case XCB_INPUT_TOUCH_END:
-+    {
-         xiDeviceEvent = xiEvent;
-         eventListener = windowEventListenerFromId(xiDeviceEvent->event);
diff --git a/dev-qt/qtbase/files/qtbase-6.8.2-pyqt6.patch b/dev-qt/qtbase/files/qtbase-6.8.2-pyqt6.patch
new file mode 100644
index 000000000000..de728b73f404
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.8.2-pyqt6.patch
@@ -0,0 +1,18 @@
+Revert of [1] which breaks PyQt6, and reverting "shouldn't"
+negatively affected anything. Can probably leave this until
+6.9.x instead (or at least until PyQt6-6.8.2 is released).
+Please file a bug to Gentoo if believe that this is wrong.
+
+Ideally need to fix PyQt6 itself, but proper fix hasn't been
+figured out yet, and PyQt6-6.8.2 may take a while to release.
+--- a/src/corelib/text/qstringconverter_base.h
++++ b/src/corelib/text/qstringconverter_base.h
+@@ -81,8 +81,5 @@ public:
+     };
+ protected:
+-    QStringConverterBase() = default;
+     ~QStringConverterBase() = default;
+-    QStringConverterBase(QStringConverterBase &&) = default;
+-    QStringConverterBase &operator=(QStringConverterBase &&) = default;
+ };
+ Q_DECLARE_OPERATORS_FOR_FLAGS(QStringConverterBase::Flags)
diff --git a/dev-qt/qtbase/qtbase-6.7.2-r5.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r5.ebuild
deleted file mode 100644
index bdb824ccb53d..000000000000
--- a/dev-qt/qtbase/qtbase-6.7.2-r5.ebuild
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qt6-build toolchain-funcs
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-declare -A QT6_IUSE=(
-	[global]="+ssl +udev zstd"
-	[core]="icu journald syslog"
-	[modules]="+concurrent +dbus +gui +network +sql +xml"
-
-	[gui]="
-		+X accessibility eglfs evdev gles2-only +libinput
-		opengl renderdoc tslib vulkan wayland +widgets
-	"
-	[network]="brotli gssapi libproxy sctp"
-	[sql]="mysql oci8 odbc postgres +sqlite"
-	[widgets]="cups gtk"
-
-	[optfeature]="nls" #810802
-)
-IUSE="${QT6_IUSE[*]}"
-REQUIRED_USE="
-	?? ( journald syslog )
-	$(
-		printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/}
-		printf '%s? ( network ) ' ${QT6_IUSE[network]//+/}
-		printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
-		printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
-	)
-	accessibility? ( dbus )
-	eglfs? ( opengl )
-	gles2-only? ( opengl )
-	gui? ( || ( X eglfs wayland ) )
-	libinput? ( udev )
-	sql? ( || ( ${QT6_IUSE[sql]//+/} ) )
-	test? ( icu sql? ( sqlite ) )
-"
-
-# groups:
-# - global (configure.cmake)
-# - qtcore (src/corelib/configure.cmake)
-# - qtgui (src/gui/configure.cmake)
-# - qtnetwork (src/network/configure.cmake)
-# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
-# - qtsql (src/plugins/sqldrivers/configure.cmake)
-# nolink: renderdoc, systemd
-COMMON_DEPEND="
-	sys-libs/zlib:=
-	ssl? ( dev-libs/openssl:= )
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-
-	app-crypt/libb2
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2:=[pcre16,unicode(+)]
-	icu? ( dev-libs/icu:= )
-	journald? ( sys-apps/systemd )
-
-	dbus? ( sys-apps/dbus )
-	gui? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-		media-libs/harfbuzz:=
-		media-libs/libjpeg-turbo:=
-		media-libs/libpng:=
-		x11-libs/libdrm
-		x11-libs/libxkbcommon[X?]
-		X? (
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libX11
-			x11-libs/libxcb:=
-			x11-libs/xcb-util-cursor
-			x11-libs/xcb-util-image
-			x11-libs/xcb-util-keysyms
-			x11-libs/xcb-util-renderutil
-			x11-libs/xcb-util-wm
-		)
-		accessibility? ( app-accessibility/at-spi2-core:2 )
-		eglfs? ( media-libs/mesa[gbm(+)] )
-		evdev? ( sys-libs/mtdev )
-		libinput? ( dev-libs/libinput:= )
-		opengl? (
-			gles2-only? ( media-libs/libglvnd )
-			!gles2-only? ( media-libs/libglvnd[X?] )
-		)
-		renderdoc? ( media-gfx/renderdoc )
-		tslib? ( x11-libs/tslib )
-		widgets? (
-			cups? ( net-print/cups )
-			gtk? (
-				x11-libs/gdk-pixbuf:2
-				>=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?]
-				x11-libs/pango
-			)
-		)
-	)
-	network? (
-		brotli? ( app-arch/brotli:= )
-		gssapi? ( virtual/krb5 )
-		libproxy? ( net-libs/libproxy )
-	)
-	sql? (
-		mysql? ( dev-db/mysql-connector-c:= )
-		oci8? ( dev-db/oracle-instantclient:=[sdk] )
-		odbc? ( dev-db/unixODBC )
-		postgres? ( dev-db/postgresql:* )
-		sqlite? ( dev-db/sqlite:3 )
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	syslog? ( virtual/logger )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	X? ( x11-base/xorg-proto )
-	gui? (
-		vulkan? ( dev-util/vulkan-headers )
-	)
-	network? (
-		sctp? ( net-misc/lksctp-tools )
-	)
-	test? (
-		elibc_musl? ( sys-libs/timezone-data )
-	)
-"
-BDEPEND="zstd? ( app-arch/libarchive[zstd] )" #910392
-PDEPEND="
-	nls? ( ~dev-qt/qttranslations-${PV}:6 )
-	wayland? ( ~dev-qt/qtwayland-${PV}:6 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
-	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
-	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
-	"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
-	"${FILESDIR}"/${PN}-6.7.2-CVE-2024-39936.patch
-	"${FILESDIR}"/${PN}-6.7.2-gcc15-odr.patch
-	"${FILESDIR}"/${PN}-6.7.2-float16-sse2.patch
-	"${FILESDIR}"/${PN}-6.7.2-qwindowprivate-crash.patch
-	"${FILESDIR}"/${PN}-6.7.2-qcontiguouscache.patch
-	"${FILESDIR}"/${PN}-6.7.2-haswell-no-rdrnd.patch
-)
-
-src_prepare() {
-	qt6-build_src_prepare
-
-	if use test; then
-		# test itself has -Werror=strict-aliasing issues, drop for simplicity
-		sed -e '/add_subdirectory(qsharedpointer)/d' \
-			-i tests/auto/corelib/tools/CMakeLists.txt || die
-
-		# workaround for __extendhfxf2 being used for tst_qfloat16.cpp
-		# which is unavailable with compiler-rt (assume used if clang)
-		if tc-is-clang; then
-			sed -e '/add_subdirectory(qfloat16)/d' \
-				-i tests/auto/corelib/global/CMakeLists.txt || die
-		fi
-	fi
-}
-
-src_configure() {
-	# The only component that uses gdk backends is the qgtk3 platformtheme plugin
-	if use gtk; then
-		# defang automagic dependencies
-		use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
-		use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_WITH_PCH=OFF
-
-		-DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}"
-		-DINSTALL_BINDIR="${QT6_BINDIR}"
-		-DINSTALL_DATADIR="${QT6_DATADIR}"
-		-DINSTALL_DOCDIR="${QT6_DOCDIR}"
-		-DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}"
-		-DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}"
-		-DINSTALL_LIBDIR="${QT6_LIBDIR}"
-		-DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}"
-		-DINSTALL_MKSPECSDIR="${QT6_MKSPECSDIR}"
-		-DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}"
-		-DINSTALL_QMLDIR="${QT6_QMLDIR}"
-		-DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}"
-		-DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}"
-
-		-DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too
-
-		-DQT_FEATURE_relocatable=OFF #927691
-		$(qt_feature ssl openssl)
-		$(qt_feature ssl openssl_linked)
-		$(qt_feature udev libudev)
-		$(qt_feature zstd)
-
-		# qtcore
-		$(qt_feature icu)
-		$(qt_feature journald)
-		$(qt_feature syslog)
-
-		# tools
-		-DQT_FEATURE_androiddeployqt=OFF
-
-		# modules
-		$(qt_feature concurrent)
-		$(qt_feature dbus)
-		$(qt_feature gui)
-		$(qt_feature network)
-		$(qt_feature sql)
-		# trivial, and is often needed (sometimes even when not building tests)
-		-DQT_FEATURE_testlib=ON
-		$(qt_feature xml)
-	)
-
-	use gui && mycmakeargs+=(
-		$(qt_feature X xcb)
-		$(qt_feature X system_xcb_xinput)
-		$(qt_feature X xkbcommon_x11)
-		$(cmake_use_find_package X X11) # needed for truly no automagic
-		$(qt_feature accessibility accessibility_atspi_bridge)
-		$(qt_feature eglfs)
-		$(qt_feature evdev)
-		$(qt_feature evdev mtdev)
-		$(qt_feature libinput)
-		$(qt_feature renderdoc graphicsframecapture)
-		$(qt_feature tslib)
-		$(qt_feature vulkan)
-		$(qt_feature wayland)
-		$(qt_feature widgets)
-		-DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no)
-		-DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c
-	) && use widgets && mycmakeargs+=(
-		# note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups
-		$(qt_feature cups)
-		$(qt_feature gtk gtk3)
-	)
-
-	use network && mycmakeargs+=(
-		$(qt_feature brotli)
-		$(qt_feature gssapi)
-		$(qt_feature libproxy)
-		$(qt_feature sctp)
-		$(usev test -DQT_SKIP_DOCKER_COMPOSE=ON)
-	)
-
-	use sql && mycmakeargs+=(
-		-DQT_FEATURE_sql_db2=OFF # unpackaged
-		-DQT_FEATURE_sql_ibase=OFF # unpackaged
-		-DQT_FEATURE_sql_mimer=OFF # unpackaged
-		$(qt_feature mysql sql_mysql)
-		$(qt_feature oci8 sql_oci)
-		$(usev oci8 -DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client)
-		$(qt_feature odbc sql_odbc)
-		$(qt_feature postgres sql_psql)
-		$(qt_feature sqlite sql_sqlite)
-		$(qt_feature sqlite system_sqlite)
-	)
-
-	qt6-build_src_configure
-}
-
-src_test() {
-	local -x TZ=UTC
-	local -x LC_TIME=C
-
-	local CMAKE_SKIP_TESTS=(
-		# broken with out-of-source + if qtbase is not already installed
-		tst_moc
-		tst_qmake
-		# similarly broken when relocatable=OFF (bug #927691)
-		tst_qapplication
-		tst_qt_cmake_create
-		tst_uic
-		# needs x11/opengl, we *could* run these but tend to be flaky
-		# when opengl rendering is involved (even if software-only)
-		tst_qopengl{,config,widget,window}
-		tst_qgraphicsview
-		tst_qx11info
-		# fails with network sandbox
-		tst_qdnslookup
-		# fails with sandbox
-		tst_qsharedmemory
-		# typical to lack SCTP support on non-generic kernels
-		tst_qsctpsocket
-		# randomly fails without -j1, and not worth it over this (bug #916181)
-		tst_qfiledialog{,2}
-		# may randomly hang+timeout, perhaps related to -j as well
-		tst_qprocess #936484
-		tst_qtimer
-		# these can be flaky depending on the environment/toolchain
-		tst_qlogging # backtrace log test can easily vary
-		tst_q{,raw}font # affected by available fonts / settings (bug #914737)
-		tst_qprinter # checks system's printers (bug #916216)
-		tst_qhighdpi # may detect users' settings and fail (bug #935364)
-		tst_qstorageinfo # checks mounted filesystems
-		# flaky due to using different test framework and fails with USE=-gui
-		tst_selftests
-		# known failing when using clang+glibc+stdc++, needs looking into
-		tst_qthread
-		# partially failing on x86 chroots and seemingly(?) harmless (dev-qt
-		# revdeps tests pass), skip globally to avoid keywording flakiness
-		tst_json
-		tst_qcolorspace
-		tst_qdoublevalidator
-		tst_qglobal
-		tst_qglyphrun
-		tst_qvectornd
-		tst_rcc
-		# similarly, but on armv7 and potentially others (bug #914028)
-		tst_qlineedit
-		tst_qpainter
-		# likewise, known failing on BE arches (bug #914033,914371,918878)
-		tst_qimagereader
-		tst_qimagewriter
-		tst_qpluginloader
-		tst_quuid # >=6.6.2 had related fixes, needs retesting
-		# partially broken on llvm-musl, needs looking into but skip to have
-		# a baseline for regressions (rest of dev-qt still passes with musl)
-		$(usev elibc_musl '
-			tst_qicoimageformat
-			tst_qimagereader
-			tst_qimage
-		')
-		# fails due to hppa's NaN handling, needs looking into (bug #914371)
-		$(usev hppa '
-			tst_qcborvalue
-			tst_qnumeric
-		')
-		# note: for linux, upstream only really runs+maintains tests for amd64
-		# https://doc.qt.io/qt-6/supported-platforms.html
-	)
-
-	qt6-build_src_test
-}
-
-src_install() {
-	qt6-build_src_install
-
-	if use test; then
-		local delete_bins=( # need a better way to handle this
-			clientserver copier crashingServer desktopsettingsaware_helper
-			echo fileWriterProcess modal_helper nospace 'one space'
-			paster qcommandlineparser_test_helper qfileopeneventexternal
-			socketprocess syslocaleapp tst_qhashseed_helper 'two space s'
-			write-read-write
-		)
-		local delete=( # sigh
-			"${D}${QT6_BINDIR}"/test*
-			"${delete_bins[@]/#/${D}${QT6_BINDIR}/}"
-		)
-		# using -f given not tracking which tests may be skipped or not
-		rm -rf -- "${delete[@]}" || die
-	fi
-}
diff --git a/dev-qt/qtbase/qtbase-6.7.3-r2.ebuild b/dev-qt/qtbase/qtbase-6.7.3-r2.ebuild
deleted file mode 100644
index 69e086cb213e..000000000000
--- a/dev-qt/qtbase/qtbase-6.7.3-r2.ebuild
+++ /dev/null
@@ -1,361 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qt6-build toolchain-funcs
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-declare -A QT6_IUSE=(
-	[global]="+ssl +udev zstd"
-	[core]="icu journald syslog"
-	[modules]="+concurrent +dbus +gui +network +sql +xml"
-
-	[gui]="
-		+X accessibility eglfs evdev gles2-only +libinput
-		opengl renderdoc tslib vulkan wayland +widgets
-	"
-	[network]="brotli gssapi libproxy sctp"
-	[sql]="mysql oci8 odbc postgres +sqlite"
-	[widgets]="cups gtk"
-
-	[optfeature]="nls" #810802
-)
-IUSE="${QT6_IUSE[*]}"
-REQUIRED_USE="
-	?? ( journald syslog )
-	$(
-		printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/}
-		printf '%s? ( network ) ' ${QT6_IUSE[network]//+/}
-		printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/}
-		printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/}
-	)
-	accessibility? ( dbus )
-	eglfs? ( opengl )
-	gles2-only? ( opengl )
-	gui? ( || ( X eglfs wayland ) )
-	libinput? ( udev )
-	sql? ( || ( ${QT6_IUSE[sql]//+/} ) )
-	test? ( icu sql? ( sqlite ) )
-"
-
-# groups:
-# - global (configure.cmake)
-# - qtcore (src/corelib/configure.cmake)
-# - qtgui (src/gui/configure.cmake)
-# - qtnetwork (src/network/configure.cmake)
-# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets]
-# - qtsql (src/plugins/sqldrivers/configure.cmake)
-# nolink: renderdoc, systemd
-COMMON_DEPEND="
-	sys-libs/zlib:=
-	ssl? ( dev-libs/openssl:= )
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-
-	app-crypt/libb2
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2:=[pcre16,unicode(+)]
-	icu? ( dev-libs/icu:= )
-	journald? ( sys-apps/systemd )
-
-	dbus? ( sys-apps/dbus )
-	gui? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-		media-libs/harfbuzz:=
-		media-libs/libjpeg-turbo:=
-		media-libs/libpng:=
-		x11-libs/libdrm
-		x11-libs/libxkbcommon[X?]
-		X? (
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libX11
-			x11-libs/libxcb:=
-			x11-libs/xcb-util-cursor
-			x11-libs/xcb-util-image
-			x11-libs/xcb-util-keysyms
-			x11-libs/xcb-util-renderutil
-			x11-libs/xcb-util-wm
-		)
-		accessibility? ( app-accessibility/at-spi2-core:2 )
-		eglfs? ( media-libs/mesa[gbm(+)] )
-		evdev? ( sys-libs/mtdev )
-		libinput? ( dev-libs/libinput:= )
-		opengl? (
-			gles2-only? ( media-libs/libglvnd )
-			!gles2-only? ( media-libs/libglvnd[X?] )
-		)
-		renderdoc? ( media-gfx/renderdoc )
-		tslib? ( x11-libs/tslib )
-		widgets? (
-			cups? ( net-print/cups )
-			gtk? (
-				x11-libs/gdk-pixbuf:2
-				>=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?]
-				x11-libs/pango
-			)
-		)
-	)
-	network? (
-		brotli? ( app-arch/brotli:= )
-		gssapi? ( virtual/krb5 )
-		libproxy? ( net-libs/libproxy )
-	)
-	sql? (
-		mysql? ( dev-db/mysql-connector-c:= )
-		oci8? ( dev-db/oracle-instantclient:=[sdk] )
-		odbc? ( dev-db/unixODBC )
-		postgres? ( dev-db/postgresql:* )
-		sqlite? ( dev-db/sqlite:3 )
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	syslog? ( virtual/logger )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	X? ( x11-base/xorg-proto )
-	gui? (
-		vulkan? ( dev-util/vulkan-headers )
-	)
-	network? (
-		sctp? ( net-misc/lksctp-tools )
-	)
-	test? (
-		elibc_musl? ( sys-libs/timezone-data )
-	)
-"
-BDEPEND="zstd? ( app-arch/libarchive[zstd] )" #910392
-PDEPEND="
-	nls? ( ~dev-qt/qttranslations-${PV}:6 )
-	wayland? ( ~dev-qt/qtwayland-${PV}:6 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
-	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
-	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
-	"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
-	"${FILESDIR}"/${PN}-6.7.2-qcontiguouscache.patch
-	"${FILESDIR}"/${PN}-6.7.2-haswell-no-rdrnd.patch
-	"${FILESDIR}"/${PN}-6.7.3-erratic-mouse-input.patch
-	"${FILESDIR}"/${PN}-6.7.3-QTBUG-125053.patch
-)
-
-src_prepare() {
-	qt6-build_src_prepare
-
-	if use test; then
-		# test itself has -Werror=strict-aliasing issues, drop for simplicity
-		sed -e '/add_subdirectory(qsharedpointer)/d' \
-			-i tests/auto/corelib/tools/CMakeLists.txt || die
-
-		# workaround for __extendhfxf2 being used for tst_qfloat16.cpp
-		# which is unavailable with compiler-rt (assume used if clang)
-		if tc-is-clang; then
-			sed -e '/add_subdirectory(qfloat16)/d' \
-				-i tests/auto/corelib/global/CMakeLists.txt || die
-		fi
-	fi
-}
-
-src_configure() {
-	if use gtk; then
-		# defang automagic dependencies (bug #624960)
-		use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
-		use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_WITH_PCH=OFF
-
-		-DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}"
-		-DINSTALL_BINDIR="${QT6_BINDIR}"
-		-DINSTALL_DATADIR="${QT6_DATADIR}"
-		-DINSTALL_DOCDIR="${QT6_DOCDIR}"
-		-DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}"
-		-DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}"
-		-DINSTALL_LIBDIR="${QT6_LIBDIR}"
-		-DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}"
-		-DINSTALL_MKSPECSDIR="${QT6_MKSPECSDIR}"
-		-DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}"
-		-DINSTALL_QMLDIR="${QT6_QMLDIR}"
-		-DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}"
-		-DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}"
-
-		-DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too
-
-		-DQT_FEATURE_relocatable=OFF #927691
-		$(qt_feature ssl openssl)
-		$(qt_feature ssl openssl_linked)
-		$(qt_feature udev libudev)
-		$(qt_feature zstd)
-
-		# qtcore
-		$(qt_feature icu)
-		$(qt_feature journald)
-		$(qt_feature syslog)
-
-		# tools
-		-DQT_FEATURE_androiddeployqt=OFF
-
-		# modules
-		$(qt_feature concurrent)
-		$(qt_feature dbus)
-		$(qt_feature gui)
-		$(qt_feature network)
-		$(qt_feature sql)
-		# trivial, and is often needed (sometimes even when not building tests)
-		-DQT_FEATURE_testlib=ON
-		$(qt_feature xml)
-	)
-
-	use gui && mycmakeargs+=(
-		$(qt_feature X xcb)
-		$(qt_feature X system_xcb_xinput)
-		$(qt_feature X xkbcommon_x11)
-		$(cmake_use_find_package X X11) # needed for truly no automagic
-		$(qt_feature accessibility accessibility_atspi_bridge)
-		$(qt_feature eglfs)
-		$(qt_feature evdev)
-		$(qt_feature evdev mtdev)
-		$(qt_feature libinput)
-		$(qt_feature renderdoc graphicsframecapture)
-		$(qt_feature tslib)
-		$(qt_feature vulkan)
-		$(qt_feature wayland)
-		$(qt_feature widgets)
-		-DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no)
-		-DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c
-	) && use widgets && mycmakeargs+=(
-		# note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups
-		$(qt_feature cups)
-		$(qt_feature gtk gtk3)
-	)
-
-	use network && mycmakeargs+=(
-		$(qt_feature brotli)
-		$(qt_feature gssapi)
-		$(qt_feature libproxy)
-		$(qt_feature sctp)
-		$(usev test -DQT_SKIP_DOCKER_COMPOSE=ON)
-	)
-
-	use sql && mycmakeargs+=(
-		-DQT_FEATURE_sql_db2=OFF # unpackaged
-		-DQT_FEATURE_sql_ibase=OFF # unpackaged
-		-DQT_FEATURE_sql_mimer=OFF # unpackaged
-		$(qt_feature mysql sql_mysql)
-		$(qt_feature oci8 sql_oci)
-		$(usev oci8 -DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client)
-		$(qt_feature odbc sql_odbc)
-		$(qt_feature postgres sql_psql)
-		$(qt_feature sqlite sql_sqlite)
-		$(qt_feature sqlite system_sqlite)
-	)
-
-	qt6-build_src_configure
-}
-
-src_test() {
-	local -x TZ=UTC
-	local -x LC_TIME=C
-
-	local CMAKE_SKIP_TESTS=(
-		# broken with out-of-source + if qtbase is not already installed
-		tst_moc
-		tst_qmake
-		# similarly broken when relocatable=OFF (bug #927691)
-		tst_qapplication
-		tst_qt_cmake_create
-		tst_uic
-		# needs x11/opengl, we *could* run these but tend to be flaky
-		# when opengl rendering is involved (even if software-only)
-		tst_qopengl{,config,widget,window}
-		tst_qgraphicsview
-		tst_qx11info
-		# fails with network sandbox
-		tst_qdnslookup
-		# fails with sandbox
-		tst_qsharedmemory
-		# typical to lack SCTP support on non-generic kernels
-		tst_qsctpsocket
-		# randomly fails without -j1, and not worth it over this (bug #916181)
-		tst_qfiledialog{,2}
-		# may randomly hang+timeout, perhaps related to -j as well
-		tst_qprocess #936484
-		tst_qtimer
-		# these can be flaky depending on the environment/toolchain
-		tst_qlogging # backtrace log test can easily vary
-		tst_q{,raw}font # affected by available fonts / settings (bug #914737)
-		tst_qprinter # checks system's printers (bug #916216)
-		tst_qhighdpi # may detect users' settings and fail (bug #935364)
-		tst_qstorageinfo # checks mounted filesystems
-		# flaky due to using different test framework and fails with USE=-gui
-		tst_selftests
-		# known failing when using clang+glibc+stdc++, needs looking into
-		tst_qthread
-		# partially failing on x86 chroots and seemingly(?) harmless (dev-qt
-		# revdeps tests pass), skip globally to avoid keywording flakiness
-		tst_json
-		tst_qcolorspace
-		tst_qdoublevalidator
-		tst_qglobal
-		tst_qglyphrun
-		tst_qvectornd
-		tst_rcc
-		# similarly, but on armv7 and potentially others (bug #914028)
-		tst_qlineedit
-		tst_qpainter
-		# likewise, known failing on BE arches (bug #914033,914371,918878)
-		tst_qimagereader
-		tst_qimagewriter
-		tst_qpluginloader
-		tst_quuid # >=6.6.2 had related fixes, needs retesting
-		# partially broken on llvm-musl, needs looking into but skip to have
-		# a baseline for regressions (rest of dev-qt still passes with musl)
-		$(usev elibc_musl '
-			tst_qicoimageformat
-			tst_qimagereader
-			tst_qimage
-		')
-		# fails due to hppa's NaN handling, needs looking into (bug #914371)
-		$(usev hppa '
-			tst_qcborvalue
-			tst_qnumeric
-		')
-		# note: for linux, upstream only really runs+maintains tests for amd64
-		# https://doc.qt.io/qt-6/supported-platforms.html
-	)
-
-	qt6-build_src_test
-}
-
-src_install() {
-	qt6-build_src_install
-
-	if use test; then
-		local delete_bins=( # need a better way to handle this
-			clientserver copier crashingServer desktopsettingsaware_helper
-			echo fileWriterProcess modal_helper nospace 'one space'
-			paster qcommandlineparser_test_helper qfileopeneventexternal
-			socketprocess syslocaleapp tst_qhashseed_helper 'two space s'
-			write-read-write
-		)
-		local delete=( # sigh
-			"${D}${QT6_BINDIR}"/test*
-			"${delete_bins[@]/#/${D}${QT6_BINDIR}/}"
-		)
-		# using -f given not tracking which tests may be skipped or not
-		rm -rf -- "${delete[@]}" || die
-	fi
-}
diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index 11036a11512b..584b606a0590 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.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
@@ -146,6 +146,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
 	"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
 	"${FILESDIR}"/${PN}-6.8.0-qcontiguouscache.patch
+	"${FILESDIR}"/${PN}-6.8.2-pyqt6.patch
 )
 
 src_prepare() {
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index 8b9123688c4a..f9f9615099d1 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,4 +1,2 @@
 DIST qtcharts-everywhere-opensource-src-5.15.16.tar.xz 4246260 BLAKE2B 6a902fa889d1b32f5dc6aeeb18838806d29b52d5da9ec91cfd9a33da6049ae89f3fc57ed73bd68dfd56dcbb971a57c384598af9e0c1743391ea0339a6ca9029e SHA512 f57df425e767ad5e18d5bf2439c137c0b656acf4ae998d42a41e59acf8a7b3d6733ef1c4ee4b11e1d54801df1550af5ee53cb190f05db223568b31fb4fcaa96d
-DIST qtcharts-everywhere-src-6.7.2.tar.xz 4661448 BLAKE2B f35a3185bd6ca684dea07390e95e1bbe0b15e9a774e9da852425afbe22dea2c52b4592eba015b64f39e4816ae2603558067f2b453d96a0af44c755d60fcf3d62 SHA512 8e142bb3a925e802ab482890363ec1b7ed8c7b1d1bbbf6b30361afc8571ddef75d82f10b7d44bc29e6d87b752f235171f282080591f1ca252b2e47ad0b58b5ef
-DIST qtcharts-everywhere-src-6.7.3.tar.xz 4661392 BLAKE2B a36feb2e656f3405ca454b05a16875019951049a3264202b5be46dfcb21fbe64951fab67ae744a004bef273af3da81b6b4374bb1fe4b5ce5305d309c711c0baa SHA512 5e1e9387bee3a500a0178390ee827d76c58ac66486236e677e2854c3ea06011aadaaa08f742bdb0674b382209d54d30e8a0fa5f110d78c2b0dbeab49d46736e4
 DIST qtcharts-everywhere-src-6.8.1.tar.xz 4662224 BLAKE2B cf32ccb4e56379f17ac030832efe614c75ea3711c3d7ba7c0835c6972c6cf800a0ed5747612f6bef563bb28b2cf658de94123eb987bc4e13283c28d205885eba SHA512 bd15caaf0a4f06d13a5fc18a2e7063061dd279609d9c6db7f98ca07ce576e7580a7f1fc65cbc291b4fe34287fa01bb7e4409c767c57e201817c5ead96fa5de45
diff --git a/dev-qt/qtcharts/qtcharts-6.7.2.ebuild b/dev-qt/qtcharts/qtcharts-6.7.2.ebuild
deleted file mode 100644
index 1a8eabee8904..000000000000
--- a/dev-qt/qtcharts/qtcharts-6.7.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Chart component library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-IUSE="gles2-only qml"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gles2-only=,gui,opengl,widgets]
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6[opengl] )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtcharts/qtcharts-6.7.3.ebuild b/dev-qt/qtcharts/qtcharts-6.7.3.ebuild
deleted file mode 100644
index cc88617811dc..000000000000
--- a/dev-qt/qtcharts/qtcharts-6.7.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Chart component library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-IUSE="gles2-only qml"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gles2-only=,gui,opengl,widgets]
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6[opengl] )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtconnectivity/Manifest b/dev-qt/qtconnectivity/Manifest
index b9ba28263013..be20bdeae269 100644
--- a/dev-qt/qtconnectivity/Manifest
+++ b/dev-qt/qtconnectivity/Manifest
@@ -1,3 +1 @@
-DIST qtconnectivity-everywhere-src-6.7.2.tar.xz 1061952 BLAKE2B 2b46b255f5ca5ab7b5363f6e3584dd4318a4e4d120c8595b309fba1354d9e1c763d9fa8e84b22f5c342204b2849b27d08a7f5dbd9d00533e150c2b8fb6561db3 SHA512 381098e406ac18d87d34eb9087d1655c16e604059d69b77c04df9d444cefc77630a212f52b0fc2a1573c524044aa1837379d70460e152cd353731e52c4bd0e67
-DIST qtconnectivity-everywhere-src-6.7.3.tar.xz 1062684 BLAKE2B 69a10c7c9e6ad25726a136e582005c5306ab3adba1a5f253b51e4ef46009de315e5593bf76020f6019a09d60600c9ae12855f2713c1424f407399a9660a14f8d SHA512 46d77b7c02a03f8aee3401c889121ada5979858d95959ab4d7f31d54ce17c92c5f9c18097297baecc08c468c4f020a826b08edffb55e00e5d3fdaa0523600362
 DIST qtconnectivity-everywhere-src-6.8.1.tar.xz 1067952 BLAKE2B d0c1dbc863dbd12041321248f9256d63f03ecf919ac7c60f3e3e87dd4102fa9063dbb3b0896e3f168713e4dd7eccf2deb62109bea39ba8425184aaf9c019dee1 SHA512 61933f37210323cd912ec677322002557dae308228e390f692beb88374f328b2791e3448b14256a570de741ef6f3e935261ab90cfd3ae22725a8919bd304a8fb
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.7.2.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.2.ebuild
deleted file mode 100644
index 89f22274689a..000000000000
--- a/dev-qt/qtconnectivity/qtconnectivity-6.7.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-fi
-
-IUSE="+bluetooth nfc smartcard"
-REQUIRED_USE="|| ( bluetooth nfc )"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network]
-	bluetooth? (
-		~dev-qt/qtbase-${PV}:6[dbus]
-		net-wireless/bluez:=
-	)
-	nfc? (
-		smartcard? ( sys-apps/pcsc-lite )
-	)
-"
-DEPEND="${RDEPEND}"
-
-CMAKE_SKIP_TESTS=(
-	# most hardware tests are auto-skipped, but some still misbehave
-	# if bluez/hardware is available (generally tests here may not be
-	# very relevant without hardware, lists may need to be extended)
-	tst_qbluetoothdevicediscoveryagent #936485
-	tst_qbluetoothlocaldevice
-	tst_qbluetoothserver
-	tst_qbluetoothservicediscoveryagent
-	tst_qbluetoothserviceinfo
-	tst_qlowenergycontroller
-)
-
-src_prepare() {
-	qt6-build_src_prepare
-
-	use bluetooth ||
-		sed -i '/add_subdirectory(bluetooth)/d' src/CMakeLists.txt || die
-	use nfc ||
-		sed -i '/add_subdirectory(nfc)/d' src/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(usev nfc $(qt_feature smartcard pcsclite))
-	)
-
-	qt6-build_src_configure
-}
-
-src_install() {
-	qt6-build_src_install
-
-	# broken (unnecessary) symlink due to add_app() being used over add_tool()
-	use !bluetooth || rm -- "${ED}"/usr/bin/sdpscanner6 || die
-
-	if use test; then
-		local delete=( # sigh
-			"${D}${QT6_BINDIR}"/bluetoothtestdevice
-			"${D}${QT6_BINDIR}"/bttestui
-			"${D}${QT6_BINDIR}"/qlecontroller-server
-		)
-		# using -f given not tracking which tests may be skipped or not
-		rm -f -- "${delete[@]}" || die
-	fi
-}
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.7.3.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.3.ebuild
deleted file mode 100644
index 6b4668b5fd55..000000000000
--- a/dev-qt/qtconnectivity/qtconnectivity-6.7.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-IUSE="+bluetooth nfc smartcard"
-REQUIRED_USE="|| ( bluetooth nfc )"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network]
-	bluetooth? (
-		~dev-qt/qtbase-${PV}:6[dbus]
-		net-wireless/bluez:=
-	)
-	nfc? (
-		smartcard? ( sys-apps/pcsc-lite )
-	)
-"
-DEPEND="${RDEPEND}"
-
-CMAKE_SKIP_TESTS=(
-	# most hardware tests are auto-skipped, but some still misbehave
-	# if bluez/hardware is available (generally tests here may not be
-	# very relevant without hardware, lists may need to be extended)
-	tst_qbluetoothdevicediscoveryagent #936485
-	tst_qbluetoothlocaldevice
-	tst_qbluetoothserver
-	tst_qbluetoothservicediscoveryagent
-	tst_qbluetoothserviceinfo
-	tst_qlowenergycontroller
-)
-
-src_prepare() {
-	qt6-build_src_prepare
-
-	use bluetooth ||
-		sed -i '/add_subdirectory(bluetooth)/d' src/CMakeLists.txt || die
-	use nfc ||
-		sed -i '/add_subdirectory(nfc)/d' src/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(usev nfc $(qt_feature smartcard pcsclite))
-	)
-
-	qt6-build_src_configure
-}
-
-src_install() {
-	qt6-build_src_install
-
-	# broken (unnecessary) symlink due to add_app() being used over add_tool()
-	use !bluetooth || rm -- "${ED}"/usr/bin/sdpscanner6 || die
-
-	if use test; then
-		local delete=( # sigh
-			"${D}${QT6_BINDIR}"/bluetoothtestdevice
-			"${D}${QT6_BINDIR}"/bttestui
-			"${D}${QT6_BINDIR}"/qlecontroller-server
-		)
-		# using -f given not tracking which tests may be skipped or not
-		rm -f -- "${delete[@]}" || die
-	fi
-}
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 288efc1b3057..1ac0fc7b105e 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,5 +1,3 @@
 DIST qtdeclarative-5.15.16-gentoo-kde-1.tar.xz 19148 BLAKE2B ebdc17253887c5b22816c3bdcd07f30274c3aa4680088ceee7abce8896a17aff7272e5a4bba576e1ad0372b7d1d80322c6890e1b5343eaab915a5355da659c5b SHA512 3fbbb7b06c67d31a9074737f68437a9e920e4b816c78c78dec2e700e339f6f8ad0b244a1eb78d7521133873b17015861a84057a890887d4dfbef91699428d8c6
 DIST qtdeclarative-everywhere-opensource-src-5.15.16.tar.xz 21599596 BLAKE2B 7f69370eab4909891beb27a730e7082030715f1fcbd9faf87bdd8f3d7d3e469c56b609f58a1cf769bdb22303829d573d30fd9aaff4824456778d11ae46f7ddaa SHA512 be492d95d11ab13e13d27ca2024b5b5860d515d0b66c6d1c201bdba155841996bfdb3b813313dc75578228b6d3e661220dcc5db037624fe73d6e5e1c3ec84aa7
-DIST qtdeclarative-everywhere-src-6.7.2.tar.xz 35629324 BLAKE2B a2c5a17e2f88dd91dd7ae21950d8bb7bc0856f1f05a093405c68e1b3b584a75fee474a9a7116a1797c464e2ca92778ebec774d4afa5ac6eebb1022daabad8868 SHA512 ca172e79af317f481d6f5e6388dc074fc6f99966b896135ab9991fa1a9502e46b0ac21b7f2bc38278448939e77882c5fd17252e3e6460c1665f8156fa99bceaf
-DIST qtdeclarative-everywhere-src-6.7.3.tar.xz 35663596 BLAKE2B b9dc18b4a459c283883a9bd2b2708ea758dc2853e93af05a503b84cb348398e5cdd9b28f6735cbf8e480d252f33cf6c36b06deedd468e7b0169e59b5bae296cd SHA512 54e9b262b07c80eb6530da3e980319edd7370cc90f4241ebaf22a73e1f7f4f14177cea06276a0d3b2b553c6ed0825be0c56b9e2ddca53e99db57b67c3ad4bb47
 DIST qtdeclarative-everywhere-src-6.8.1.tar.xz 36463572 BLAKE2B ac8b9d37c28ba22c266785cfe60bc0d405edb85f260b41bb01c43fd38dbeb51054d7f3f390bb9c4e78656dda3b9d5c7b945dba8ee897add0a2dbb398cc3f8a51 SHA512 f9548ee58ac81eac72f1763647a9f28c16e7ab73bf6bc828574e5194d5209c53440f834a721e9bb74f50d4e437ce2de6eb7c7a13acd8602b3080e95d8929e674
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-6.7.3-QTBUG-125053.patch b/dev-qt/qtdeclarative/files/qtdeclarative-6.7.3-QTBUG-125053.patch
deleted file mode 100644
index c1aa74599923..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-6.7.3-QTBUG-125053.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-https://bugreports.qt.io/browse/QTBUG-125053
-https://bugreports.qt.io/browse/QTBUG-127340
-https://codereview.qt-project.org/c/qt/qtdeclarative/+/593122
---- a/src/qmlmodels/qqmldelegatemodel.cpp
-+++ b/src/qmlmodels/qqmldelegatemodel.cpp
-@@ -4,4 +4,6 @@
- #include "qqmldelegatemodel_p_p.h"
- 
-+#include <QtCore/private/qabstractitemmodel_p.h>
-+
- #include <QtQml/qqmlinfo.h>
- 
-@@ -168,5 +170,4 @@
-     , m_incubatorCleanupScheduled(false)
-     , m_waitingToFetchMore(false)
--    , m_maybeResetRoleNames(false)
-     , m_cacheItems(nullptr)
-     , m_items(nullptr)
-@@ -373,6 +374,4 @@
-     qmlobject_connect(aim, QAbstractItemModel, SIGNAL(layoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)),
-                       q, QQmlDelegateModel, SLOT(_q_layoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)));
--    QObject::connect(aim, &QAbstractItemModel::modelReset, q, &QQmlDelegateModel::handleModelReset);
--    QObject::connect(aim, &QAbstractItemModel::layoutChanged, q, &QQmlDelegateModel::_q_layoutChanged);
- }
- 
-@@ -404,6 +403,4 @@
-     QObject::disconnect(aim, SIGNAL(layoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)),
-                         q, SLOT(_q_layoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)));
--    QObject::disconnect(aim, &QAbstractItemModel::modelReset, q, &QQmlDelegateModel::handleModelReset);
--    QObject::disconnect(aim, &QAbstractItemModel::layoutChanged, q, &QQmlDelegateModel::_q_layoutChanged);
- }
- 
-@@ -429,4 +426,19 @@
-         d->requestMoreIfNecessary();
-     }
-+
-+    // Since 837c2f18cd223707e7cedb213257b0158ea07146, we connect to modelAboutToBeReset
-+    // rather than modelReset so that we can handle role name changes. _q_modelAboutToBeReset
-+    // now connects modelReset to handleModelReset with a single shot connection instead.
-+    // However, it's possible for user code to begin the reset before connectToAbstractItemModel is called
-+    // (QTBUG-125053), in which case we connect to modelReset too late and handleModelReset is never called,
-+    // resulting in delegates not being created in certain cases.
-+    // So, we check at the earliest point we can if the model is in the process of being reset,
-+    // and if so, connect modelReset to handleModelReset.
-+    if (d->m_adaptorModel.adaptsAim()) {
-+        auto *aim = d->m_adaptorModel.aim();
-+        auto *aimPrivate = QAbstractItemModelPrivate::get(aim);
-+        if (aimPrivate->resetting)
-+            QObject::connect(aim, &QAbstractItemModel::modelReset, this, &QQmlDelegateModel::handleModelReset, Qt::SingleShotConnection);
-+    }
- }
- 
-@@ -1915,26 +1927,23 @@
-     if (!d->m_adaptorModel.adaptsAim())
-         return;
--
--    /*
--        roleNames are generally guaranteed to be stable (given that QAIM has no
--        change signal for them), except that resetting the model is allowed to
--        invalidate them (QTBUG-32132). DelegateModel must take this into account by
--        snapshotting the current roleNames before the model is reset.
--        Afterwards, if we detect that roleNames has changed, we throw the
--        current model set up away and rebuild everything from scratch – it is
--        unlikely that a more efficient implementation would be worth it.
--
--        If we detect no changes, we simply use the existing logic to handle the
--        model reset.
--
--        This (role name resetting) logic relies on the fact that
--        modelAboutToBeReset must be followed by a modelReset signal before any
--        further modelAboutToBeReset can occur. However, it's possible for user
--        code to begin the reset before connectToAbstractItemModel is called
--        (QTBUG-125053), in which case we don't attempt to reset the role names.
--    */
--    Q_ASSERT(!d->m_maybeResetRoleNames);
--    d->m_maybeResetRoleNames = true;
--    d->m_roleNamesBeforeReset = d->m_adaptorModel.aim()->roleNames();
-+    auto aim = d->m_adaptorModel.aim();
-+    auto oldRoleNames = aim->roleNames();
-+    // this relies on the fact that modelAboutToBeReset must be followed
-+    // by a modelReset signal before any further modelAboutToBeReset can occur
-+    QObject::connect(aim, &QAbstractItemModel::modelReset, this, [this, d, oldRoleNames, aim](){
-+        if (!d->m_adaptorModel.adaptsAim() || d->m_adaptorModel.aim() != aim)
-+            return;
-+        if (oldRoleNames == aim->roleNames()) {
-+            // if the rolenames stayed the same (most common case), then we don't have
-+            // to throw away all the setup that we did
-+            handleModelReset();
-+        } else {
-+            // If they did change, we give up and just start from scratch via setMode
-+            setModel(QVariant::fromValue(model()));
-+            // but we still have to call handleModelReset, otherwise views will
-+            // not refresh
-+            handleModelReset();
-+        }
-+    }, Qt::SingleShotConnection);
- }
- 
-@@ -1946,21 +1955,4 @@
- 
-     int oldCount = d->m_count;
--
--    if (d->m_maybeResetRoleNames) {
--        auto aim = d->m_adaptorModel.aim();
--        if (!d->m_adaptorModel.adaptsAim() || d->m_adaptorModel.aim() != aim)
--            return;
--
--        // If the role names stayed the same (most common case), then we don't have
--        // to throw away all the setup that we did.
--        // If they did change, we give up and just start from scratch via setModel.
--        // We do this before handling the reset to ensure that views refresh.
--        if (aim->roleNames() != d->m_roleNamesBeforeReset)
--            setModel(QVariant::fromValue(model()));
--
--        d->m_maybeResetRoleNames = false;
--        d->m_roleNamesBeforeReset.clear();
--    }
--
-     d->m_adaptorModel.rootIndex = QModelIndex();
- 
---- a/src/qmlmodels/qqmldelegatemodel_p_p.h
-+++ b/src/qmlmodels/qqmldelegatemodel_p_p.h
-@@ -335,5 +335,4 @@
-     QList<QQDMIncubationTask *> m_finishedIncubating;
-     QList<QByteArray> m_watchedRoles;
--    QHash<int, QByteArray> m_roleNamesBeforeReset;
- 
-     QString m_filterGroup;
-@@ -349,5 +348,4 @@
-     bool m_incubatorCleanupScheduled : 1;
-     bool m_waitingToFetchMore : 1;
--    bool m_maybeResetRoleNames : 1;
- 
-     union {
---- a/tests/auto/qml/qqmldelegatemodel/data/proxyModelWithDelayedSourceModelInListView.qml
-+++ b/tests/auto/qml/qqmldelegatemodel/data/proxyModelWithDelayedSourceModelInListView.qml
-@@ -0,0 +1,30 @@
-+import QtQuick
-+import Test
-+
-+Window {
-+    id: root
-+    title: listView.count
-+
-+    property alias listView: listView
-+    property ProxySourceModel connectionModel: null
-+
-+    Component {
-+        id: modelComponent
-+        ProxySourceModel {}
-+    }
-+
-+    ListView {
-+        id: listView
-+        anchors.fill: parent
-+
-+        delegate: Text {
-+            text: model.Name
-+        }
-+
-+        model: ProxyModel {
-+            sourceModel: root.connectionModel
-+        }
-+    }
-+
-+    Component.onCompleted: root.connectionModel = modelComponent.createObject(root)
-+}
---- a/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
-+++ b/tests/auto/qml/qqmldelegatemodel/tst_qqmldelegatemodel.cpp
-@@ -4,4 +4,5 @@
- #include <QtTest/qtest.h>
- #include <QtCore/qjsonobject.h>
-+#include <QtCore/qsortfilterproxymodel.h>
- #include <QtCore/QConcatenateTablesProxyModel>
- #include <QtCore/qtimer.h>
-@@ -52,4 +53,5 @@
-     void clearCacheDuringInsertion();
-     void viewUpdatedOnDelegateChoiceAffectingRoleChange();
-+    void proxyModelWithDelayedSourceModelInListView();
- };
- 
-@@ -732,4 +734,77 @@
- }
- 
-+class ProxySourceModel : public QAbstractListModel
-+{
-+    Q_OBJECT
-+    QML_ELEMENT
-+public:
-+    explicit ProxySourceModel(QObject *parent = nullptr)
-+        : QAbstractListModel(parent)
-+    {
-+        for (int i = 0; i < rows; ++i) {
-+            beginInsertRows(QModelIndex(), i, i);
-+            endInsertRows();
-+        }
-+    }
-+
-+    ~ProxySourceModel() override = default;
-+
-+    int rowCount(const QModelIndex &) const override
-+    {
-+        return rows;
-+    }
-+
-+    QVariant data(const QModelIndex &, int ) const override
-+    {
-+        return "Hello";
-+    }
-+
-+    QHash<int, QByteArray> roleNames() const override
-+    {
-+        QHash<int, QByteArray> roles = QAbstractListModel::roleNames();
-+        roles[Qt::UserRole + 1] = "Name";
-+
-+        return roles;
-+    }
-+
-+    static const int rows = 1;
-+};
-+
-+class ProxyModel : public QSortFilterProxyModel
-+{
-+    Q_OBJECT
-+    QML_ELEMENT
-+    Q_PROPERTY(QAbstractItemModel *sourceModel READ sourceModel WRITE setSourceModel)
-+
-+public:
-+    explicit ProxyModel(QObject *parent = nullptr)
-+        : QSortFilterProxyModel(parent)
-+    {
-+    }
-+
-+    ~ProxyModel() override = default;
-+};
-+
-+// Checks that the correct amount of delegates are created when using a proxy
-+// model whose source model is set after a delay.
-+void tst_QQmlDelegateModel::proxyModelWithDelayedSourceModelInListView()
-+{
-+    QTest::failOnWarning();
-+
-+    qmlRegisterTypesAndRevisions<ProxySourceModel>("Test", 1);
-+    qmlRegisterTypesAndRevisions<ProxyModel>("Test", 1);
-+
-+    QQuickApplicationHelper helper(this, "proxyModelWithDelayedSourceModelInListView.qml");
-+    QVERIFY2(helper.ready, helper.failureMessage());
-+    QQuickWindow *window = helper.window;
-+    window->show();
-+    QVERIFY(QTest::qWaitForWindowExposed(window));
-+
-+    auto *listView = window->property("listView").value<QQuickListView *>();
-+    QVERIFY(listView);
-+    const auto delegateModel = QQuickItemViewPrivate::get(listView)->model;
-+    QTRY_COMPARE(listView->count(), 1);
-+}
-+
- QTEST_MAIN(tst_QQmlDelegateModel)
- 
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-6.7.3-QTBUG-129165.patch b/dev-qt/qtdeclarative/files/qtdeclarative-6.7.3-QTBUG-129165.patch
deleted file mode 100644
index 78ea5f72a341..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-6.7.3-QTBUG-129165.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-Recommended backport from 6.8.0 to prevent a crash with kcm_pulseaudio.
-https://bugreports.qt.io/browse/QTBUG-129165
-https://bugs.kde.org/show_bug.cgi?id=493266
-(kde bug mentions is for 6.8.0, but was seemingly the -rc without the fix)
---- a/src/quick/items/qquickitemview.cpp
-+++ b/src/quick/items/qquickitemview.cpp
-@@ -11,4 +11,5 @@
- 
- Q_LOGGING_CATEGORY(lcItemViewDelegateLifecycle, "qt.quick.itemview.lifecycle")
-+Q_LOGGING_CATEGORY(lcCount, "qt.quick.itemview.count")
- 
- // Default cacheBuffer for all views.
-@@ -224,5 +225,5 @@
-         if (QQmlDelegateModel *dataModel = qobject_cast<QQmlDelegateModel*>(d->model))
-             QObjectPrivate::connect(dataModel, &QQmlDelegateModel::delegateChanged, d, &QQuickItemViewPrivate::applyDelegateChange);
--        emit countChanged();
-+        d->emitCountChanged();
-     }
-     emit modelChanged();
-@@ -256,5 +257,5 @@
-         dataModel->setDelegate(delegate);
-         if (oldCount != dataModel->count())
--            emit countChanged();
-+            d->emitCountChanged();
-     }
-     emit delegateChanged();
-@@ -1126,4 +1127,12 @@
- }
- 
-+// Simplifies debugging of count.
-+void QQuickItemViewPrivate::emitCountChanged()
-+{
-+    Q_Q(QQuickItemView);
-+    qCDebug(lcCount).nospace() << "about to emit countChanged for " << q << "; count changed to " << q->count();
-+    emit q->countChanged();
-+}
-+
- void QQuickItemViewPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change,
-                                                 const QRectF &oldGeometry)
-@@ -1225,5 +1234,5 @@
-         }
-         d->moveReason = QQuickItemViewPrivate::Other;
--        emit countChanged();
-+        d->emitCountChanged();
- #if QT_CONFIG(quick_viewtransitions)
-         if (d->transitioner && d->transitioner->populateTransition)
-@@ -1488,5 +1497,5 @@
-     }
-     if (d->model && d->model->count())
--        emit countChanged();
-+        d->emitCountChanged();
- }
- 
-@@ -1814,5 +1823,5 @@
- 
-         if (prevCount != itemCount)
--            emit q->countChanged();
-+            emitCountChanged();
-     } while (currentChanges.hasPendingChanges() || bufferedChanges.hasPendingChanges());
-     storeFirstVisibleItemPosition();
-@@ -1865,4 +1874,14 @@
-     // views (see tst_QQuickListView::resizeView).
-     if ((!isValid() && !visibleItems.size()) || q->size().isNull()) {
-+        if (q->size().isNull() && hasPendingChanges()) {
-+            // count() refers to the number of items in the model, not in the view
-+            // (which is why we don't emit for the !visibleItems.size() case).
-+            // If there are pending model changes, emit countChanged in order to
-+            // support the use case of QTBUG-129165, where visible is bound to count > 0
-+            // and the ListView is in a layout with Layout.preferredHeight bound to
-+            // contentHeight. This ensures that a hidden ListView will become visible.
-+            emitCountChanged();
-+        }
-+
-         clear();
-         setPosition(contentStartOffset());
-@@ -2139,5 +2158,5 @@
-     updateSections();
-     if (prevItemCount != itemCount)
--        emit q->countChanged();
-+        emitCountChanged();
-     if (!visibleAffected && viewportChanged)
-         updateViewport();
---- a/src/quick/items/qquickitemview_p_p.h
-+++ b/src/quick/items/qquickitemview_p_p.h
-@@ -230,4 +230,6 @@
-     }
- 
-+    void emitCountChanged();
-+
-     virtual QQuickItemViewAttached *getAttachedObject(const QObject *) const { return nullptr; }
- 
---- a/tests/auto/quick/qquicklistview2/data/visibleBoundToCountGreaterThanZero.qml
-+++ b/tests/auto/quick/qquicklistview2/data/visibleBoundToCountGreaterThanZero.qml
-@@ -0,0 +1,31 @@
-+import QtQuick
-+import QtQuick.Layouts
-+
-+ColumnLayout {
-+    property alias listView: listView
-+
-+    ListView {
-+        id: listView
-+
-+        visible: count > 0 // actual defect. countChanged never fires so this never turns true
-+
-+        Layout.fillWidth: true
-+        Layout.preferredHeight: contentHeight // grow with content, initially 0
-+
-+        model: ListModel {
-+            id: idModel
-+        }
-+
-+        delegate: Text {
-+            required property string name
-+            text: name
-+        }
-+
-+        Timer {
-+            running: true
-+            interval: 10
-+            repeat: true
-+            onTriggered: idModel.append({name:"Hello"})
-+        }
-+    }
-+}
---- a/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp
-+++ b/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp
-@@ -19,4 +19,6 @@
- using namespace QQuickVisualTestUtils;
- 
-+static const int oneSecondInMs = 1000;
-+
- class tst_QQuickListView2 : public QQmlDataTest
- {
-@@ -69,4 +71,5 @@
- 
-     void clearObjectListModel();
-+    void visibleBoundToCountGreaterThanZero();
- 
- private:
-@@ -1313,4 +1316,21 @@
- }
- 
-+void tst_QQuickListView2::visibleBoundToCountGreaterThanZero()
-+{
-+    QQuickView window;
-+    QVERIFY(QQuickTest::showView(window, testFileUrl("visibleBoundToCountGreaterThanZero.qml")));
-+
-+    auto *listView = window.rootObject()->property("listView").value<QQuickListView *>();
-+    QVERIFY(listView);
-+
-+    QSignalSpy countChangedSpy(listView, SIGNAL(countChanged()));
-+    QVERIFY(countChangedSpy.isValid());
-+
-+    QTRY_COMPARE_GT_WITH_TIMEOUT(listView->count(), 1, oneSecondInMs);
-+    // Using the TRY variant here as well is necessary.
-+    QTRY_COMPARE_GT_WITH_TIMEOUT(countChangedSpy.count(), 1, oneSecondInMs);
-+    QVERIFY(listView->isVisible());
-+}
-+
- QTEST_MAIN(tst_QQuickListView2)
- 
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-6.7.3-QTBUG-129622.patch b/dev-qt/qtdeclarative/files/qtdeclarative-6.7.3-QTBUG-129622.patch
deleted file mode 100644
index 3e2bc70b5c2c..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-6.7.3-QTBUG-129622.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-https://bugreports.qt.io/browse/QTBUG-129622
-https://bugs.kde.org/show_bug.cgi?id=493854
-https://codereview.qt-project.org/c/qt/qtdeclarative/+/598853
---- a/src/quick/items/qquickitemview.cpp
-+++ b/src/quick/items/qquickitemview.cpp
-@@ -2481,5 +2481,7 @@
-                 QQuickItemPrivate::get(item->item)->setCulled(true);
-             }
--            if (!isClearing)
-+            // If deleteLater was called, the item isn't long for this world and so we shouldn't store references to it.
-+            // This can happen when a Repeater is used to populate items in SwipeView's ListView contentItem.
-+            if (!isClearing && !QObjectPrivate::get(item->item)->deleteLaterCalled)
-                 unrequestedItems.insert(item->item, model->indexOf(item->item, q));
-         } else if (flags & QQmlInstanceModel::Destroyed) {
---- a/tests/auto/quickcontrols/controls/data/tst_swipeview.qml
-+++ b/tests/auto/quickcontrols/controls/data/tst_swipeview.qml
-@@ -5,4 +5,5 @@
- import QtTest
- import QtQuick.Controls
-+import QtQuick.Layouts
- 
- TestCase {
-@@ -761,3 +762,61 @@
-         compare(item2.x, swipeListView.width)
-     }
-+
-+    Component {
-+        id: zeroSizeSwipeViewWithRepeatersComponent
-+
-+        Item {
-+            objectName: "rootItem"
-+            anchors.fill: parent
-+
-+            property alias swipeView: swipeView
-+            property int d
-+
-+            Timer {
-+                interval: 2
-+                running: true
-+                repeat: false
-+                onTriggered: d = 2
-+            }
-+
-+            SwipeView {
-+                id: swipeView
-+                contentItem.objectName: "swipeViewListView"
-+
-+                Repeater {
-+                    objectName: "swipeViewContentItemRepeater"
-+                    model: [
-+                        {
-+                            title: d
-+                        }
-+                    ]
-+
-+                    delegate: GridLayout {
-+                        objectName: "gridLayoutDelegate"
-+
-+                        Repeater {
-+                            id: repeater
-+                            objectName: "delegateRepeater"
-+                            model: d
-+                            delegate: Item {
-+                                objectName: "delegate" + index
-+
-+                                required property int index
-+                            }
-+                        }
-+                    }
-+                }
-+            }
-+        }
-+    }
-+
-+    // QTBUG-129622
-+    function test_zeroSizeSwipeViewWithRepeaters() {
-+        let root = createTemporaryObject(zeroSizeSwipeViewWithRepeatersComponent, testCase)
-+        verify(root)
-+
-+        let swipeView = root.swipeView
-+        tryCompare(root, "d", 2)
-+        // Shouldn't crash when the model is changed.
-+    }
- }
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.2.ebuild
deleted file mode 100644
index 05450ab45f3c..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-6.7.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-# behaves very badly when qtdeclarative is not already installed, also
-# other more minor issues (installs junk, sandbox/offscreen issues)
-QT6_RESTRICT_TESTS=1
-
-inherit python-any-r1 qt6-build
-
-DESCRIPTION="Qt Declarative (Quick 2)"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]
-	qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 )
-	svg? ( ~dev-qt/qtsvg-${PV}:6 )
-"
-DEPEND="
-	${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	~dev-qt/qtshadertools-${PV}:6
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qmlls Qt6LanguageServerPrivate)
-		$(cmake_use_find_package sql Qt6Sql)
-		$(cmake_use_find_package svg Qt6Svg)
-		$(qt_feature jit qml_jit)
-		$(qt_feature network qml_network)
-		$(qt_feature ssl qml_ssl)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r4.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r4.ebuild
deleted file mode 100644
index 2678f1b739f3..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-# behaves very badly when qtdeclarative is not already installed, also
-# other more minor issues (installs junk, sandbox/offscreen issues)
-QT6_RESTRICT_TESTS=1
-
-inherit python-any-r1 qt6-build
-
-DESCRIPTION="Qt Declarative (Quick 2)"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]
-	>=dev-qt/qtbase-${PV}-r2
-	qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 )
-	svg? ( ~dev-qt/qtsvg-${PV}:6 )
-"
-DEPEND="
-	${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	~dev-qt/qtshadertools-${PV}:6
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.7.3-QTBUG-125053.patch
-	"${FILESDIR}"/${PN}-6.7.3-QTBUG-129165.patch
-	"${FILESDIR}"/${PN}-6.7.3-QTBUG-129622.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qmlls Qt6LanguageServerPrivate)
-		$(cmake_use_find_package sql Qt6Sql)
-		$(cmake_use_find_package svg Qt6Svg)
-		$(qt_feature jit qml_jit)
-		$(qt_feature network qml_network)
-		$(qt_feature ssl qml_ssl)
-	)
-
-	qt6-build_src_configure
-}
-
-src_install() {
-	qt6-build_src_install
-
-	if [[ ! -e ${D}${QT6_LIBDIR}/libQt6QuickControls2.so.6 ]]; then #940675
-		eerror "${CATEGORY}/${PF} seems to have been improperly built and"
-		eerror "install was aborted to protect the system. Possibly(?) due"
-		eerror "to a rare portage ordering bug. If using portage, try:"
-		eerror "    emerge -1 qtshadertools:6 qtdeclarative:6"
-		eerror "If that did not resolve the issue, please provide build.log"
-		eerror "on https://bugs.gentoo.org/940675"
-		die "aborting due to incomplete/broken build (see above)"
-	fi
-}
diff --git a/dev-qt/qthttpserver/Manifest b/dev-qt/qthttpserver/Manifest
index 636ebe24521d..46a2d35f6913 100644
--- a/dev-qt/qthttpserver/Manifest
+++ b/dev-qt/qthttpserver/Manifest
@@ -1,3 +1 @@
-DIST qthttpserver-everywhere-src-6.7.2.tar.xz 163640 BLAKE2B e8ab499db3e91c95685a41645ed1992b669f5049d39f6ae232dcaf527ab1c9fa5fe69be145bf0a67310be8e4ee192449be3734ef2230ea590b9c76552f93b331 SHA512 0830fb4c5968ec5e23576f58e117dcca9f012cf742043c8b4786fb7bdcd68cd86f49d15d1ba66ee64e80d5a50d3c797dbffdf6f977ad7c101bb5be1bc02c1323
-DIST qthttpserver-everywhere-src-6.7.3.tar.xz 163692 BLAKE2B 4181301caaf80b4c6f9f0df152427deda903e267c30d71dc41e39bb24419934afe750ea5ace5ccfa88589bf5540f553d384e81d3739d78d7e8612dfa1a7f4c3d SHA512 05238a97b9576f015a741446cfda434355fee8599975b5f4bf062bd28c63127d4bfbf52c4b84ff1f7b88def31200f4c3d298812a7eff5583546a5b925a390edf
 DIST qthttpserver-everywhere-src-6.8.1.tar.xz 183724 BLAKE2B 40217aeb8ff2e07e301ceed41879c48edab1da225b3b4daf24cd0085f4347c0dbf2a1df86eca78915bf5095082122ddd7c846016f24c45404b6bf5008ee282b3 SHA512 889dcfecb0443d49ce1a7a781c91e34b7fc80410ada823df65fbce59362aa85aa5db439eeabb34287d61b64747c450637555ad62b1ecfd8b88674984409ad55a
diff --git a/dev-qt/qthttpserver/qthttpserver-6.7.2.ebuild b/dev-qt/qthttpserver/qthttpserver-6.7.2.ebuild
deleted file mode 100644
index a4b020165245..000000000000
--- a/dev-qt/qthttpserver/qthttpserver-6.7.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="HTTP server functionality for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64"
-fi
-
-IUSE="+ssl websockets"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network,ssl=]
-	websockets? ( ~dev-qt/qtwebsockets-${PV}:6 )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( ~dev-qt/qtbase-${PV}:6[concurrent] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package websockets Qt6WebSockets)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qthttpserver/qthttpserver-6.7.3.ebuild b/dev-qt/qthttpserver/qthttpserver-6.7.3.ebuild
deleted file mode 100644
index a4b020165245..000000000000
--- a/dev-qt/qthttpserver/qthttpserver-6.7.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="HTTP server functionality for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64"
-fi
-
-IUSE="+ssl websockets"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network,ssl=]
-	websockets? ( ~dev-qt/qtwebsockets-${PV}:6 )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( ~dev-qt/qtbase-${PV}:6[concurrent] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package websockets Qt6WebSockets)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qthttpserver/qthttpserver-6.8.1.ebuild b/dev-qt/qthttpserver/qthttpserver-6.8.1.ebuild
index a4b020165245..c39d98d4fab9 100644
--- a/dev-qt/qthttpserver/qthttpserver-6.8.1.ebuild
+++ b/dev-qt/qthttpserver/qthttpserver-6.8.1.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
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="HTTP server functionality for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 ~loong"
 fi
 
 IUSE="+ssl websockets"
diff --git a/dev-qt/qthttpserver/qthttpserver-6.8.9999.ebuild b/dev-qt/qthttpserver/qthttpserver-6.8.9999.ebuild
index 7583ea864f5f..5acef53e8e76 100644
--- a/dev-qt/qthttpserver/qthttpserver-6.8.9999.ebuild
+++ b/dev-qt/qthttpserver/qthttpserver-6.8.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
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="HTTP server functionality for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~loong"
 fi
 
 IUSE="+ssl websockets"
diff --git a/dev-qt/qthttpserver/qthttpserver-6.9.9999.ebuild b/dev-qt/qthttpserver/qthttpserver-6.9.9999.ebuild
index 7583ea864f5f..5acef53e8e76 100644
--- a/dev-qt/qthttpserver/qthttpserver-6.9.9999.ebuild
+++ b/dev-qt/qthttpserver/qthttpserver-6.9.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
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="HTTP server functionality for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~loong"
 fi
 
 IUSE="+ssl websockets"
diff --git a/dev-qt/qthttpserver/qthttpserver-6.9999.ebuild b/dev-qt/qthttpserver/qthttpserver-6.9999.ebuild
index 49febbf2b658..5acef53e8e76 100644
--- a/dev-qt/qthttpserver/qthttpserver-6.9999.ebuild
+++ b/dev-qt/qthttpserver/qthttpserver-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="HTTP server functionality for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~loong"
 fi
 
 IUSE="+ssl websockets"
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 14fb122f7b9f..5dc820287222 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,5 +1,3 @@
 DIST qtimageformats-5.15.16-gentoo-kde-1.tar.xz 2428 BLAKE2B 95c0794814d26ac6f2ee0d3e5acacd9d1587f211c204e3b1fe22c5f25e0f891ff8d85f128990f3bb78b0c4688476418c092e17adc403cec1ac5a3b8259f5fc1e SHA512 5d772d5ee4cdc9740f834383425224e0bc660c6a431c09f886b3e721ca7c3c1ecd12c35d448fcd4dad02e0363e9f4e4520c21f517e22942a1b0cc5ed65b9bd6f
 DIST qtimageformats-everywhere-opensource-src-5.15.16.tar.xz 1889480 BLAKE2B cd0b6c31ee19ea4a852f7476f8aa93281ec3f9ad6fa24b95254147b07db49deba43604d4d720bb9eaafb71eab23c987c2a079ca1cbd15b93833435b2dbe01fe6 SHA512 922c513f1d3e46b37cd87aadd06c993128c428773aad12e8fd252258840b969996e911248530b135400e43538783d8fc1c69b4fab53ab526fc5d38478d11e6a9
-DIST qtimageformats-everywhere-src-6.7.2.tar.xz 1974768 BLAKE2B d57ba2cc12b3af02b0b15bb9836328ff0586c53cdb0acec7ba72ec4c089092f54677ee7faae18bd6e352c9105bb441e9173d33c8bf73c92205e01490728163fb SHA512 78871edcdf1ea0dec172e5d17fb7fee75c0512d18a7830ddcdcabb04719f57fc41faa7d1a82bcf4639213dbe98f495f817f5680745eb43a80b2e321f141d562a
-DIST qtimageformats-everywhere-src-6.7.3.tar.xz 1974700 BLAKE2B fe66163d0e9c5de9c60bbe37840ff9334f78031569af5c7d38f6bf9894d01ba1995c57cc1944680b4e2609176d76085d506430c404b8c4cc8b6e109b98e32c6e SHA512 ca4ef39cc0bdf53ff00ff870301ec184c52bb7db422eb04011926b03bedac22ba9c9426c75cb124d0016d2e70a108383c57c6826cc9e2c5d62adcd2f68db6471
 DIST qtimageformats-everywhere-src-6.8.1.tar.xz 2024820 BLAKE2B 90578a8dc31c186c5feced9b226c04465b16efa6678a15a75cd79ebd0443e2427f71b3643b99515ce086c6bde477305f596688c48a017c6312b03206e3cf9f15 SHA512 9e5a7226d904234304ab5f4a884b2a3e42176477687492aaadf10cab9ec92bc512c44a0cd9cae3c1cb2e7224c322e2c15197f1d0f7966f167258a1c2b7b9b360
diff --git a/dev-qt/qtimageformats/qtimageformats-6.7.2.ebuild b/dev-qt/qtimageformats/qtimageformats-6.7.2.ebuild
deleted file mode 100644
index ac6f299f55a0..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-6.7.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc64 ~riscv x86"
-fi
-
-IUSE="mng"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui]
-	media-libs/libwebp:=
-	media-libs/tiff:=
-	mng? ( media-libs/libmng:= )
-"
-DEPEND="${RDEPEND}"
-
-CMAKE_SKIP_TESTS=(
-	# heif plugin is only for Mac, test is normally auto-skipped but may
-	# misbehave with kde-frameworks/kimageformats:6[heif] (bug #927971)
-	tst_qheif
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DQT_FEATURE_jasper=OFF
-		$(qt_feature mng)
-		-DQT_FEATURE_tiff=ON
-		-DQT_FEATURE_webp=ON
-		-DQT_FEATURE_system_tiff=ON
-		-DQT_FEATURE_system_webp=ON
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtimageformats/qtimageformats-6.7.3.ebuild b/dev-qt/qtimageformats/qtimageformats-6.7.3.ebuild
deleted file mode 100644
index 152620623882..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-6.7.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc64 ~riscv x86"
-fi
-
-IUSE="mng"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui]
-	media-libs/libwebp:=
-	media-libs/tiff:=
-	mng? ( media-libs/libmng:= )
-"
-DEPEND="${RDEPEND}"
-
-CMAKE_SKIP_TESTS=(
-	# heif plugin is only for Mac, test is normally auto-skipped but may
-	# misbehave with kde-frameworks/kimageformats:6[heif] (bug #927971)
-	tst_qheif
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DQT_FEATURE_jasper=OFF
-		$(qt_feature mng)
-		-DQT_FEATURE_tiff=ON
-		-DQT_FEATURE_webp=ON
-		-DQT_FEATURE_system_tiff=ON
-		-DQT_FEATURE_system_webp=ON
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtlanguageserver/Manifest b/dev-qt/qtlanguageserver/Manifest
index 97b2a3e25330..662bb0f77294 100644
--- a/dev-qt/qtlanguageserver/Manifest
+++ b/dev-qt/qtlanguageserver/Manifest
@@ -1,3 +1 @@
-DIST qtlanguageserver-everywhere-src-6.7.2.tar.xz 145660 BLAKE2B adef11c166335fca41eceb4f48321cb1df84937663351f35e007476232d857221cd25ea1bbbc211e450858cebce95a6ca0b54f2a09d5d423defaeea7e722fa90 SHA512 15ece6a24b43502a66b992404230d4561fe3e3ac561bfbf75b1e56ca4b6f5e0110a95155207b844692b72e43fbaa44ab7c9ea39bfb21c30b2c3fd30f92ec3303
-DIST qtlanguageserver-everywhere-src-6.7.3.tar.xz 145752 BLAKE2B 895c9bcb4333fde964ffbfe4c880aec7bba6bf2b4f40e7b226bc2e8e58324486914b1f464f519e4ef4e8d08d198aa579f7e35a37a4d1ec1d06470a53b50480d1 SHA512 29ade3d88c5c2d33cd777ffef87f1e7606664ab25194912f4a575c364f2621b99128e821d1685acc332671b77235a02c92333e4186a133b5f180e5b184bf7551
 DIST qtlanguageserver-everywhere-src-6.8.1.tar.xz 150260 BLAKE2B 714816c66fa1626e976e84fdef342f143afea1cb3eaa7f23648035b8e0325d9866f859f3d8cec7a6adc2c447ecbb29133c191d39c90771e827506c89b423a876 SHA512 bb5238e897123f87aeef5bdfc234025e16e1b229595e63e6c3e8b5b338405a1662ba1e7b2d07954bda83ffa7f8605bbb63d7ec822d55ef5428fafbc9de4b690e
diff --git a/dev-qt/qtlanguageserver/qtlanguageserver-6.7.2.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.2.ebuild
deleted file mode 100644
index 3dbf250ac2cc..000000000000
--- a/dev-qt/qtlanguageserver/qtlanguageserver-6.7.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Implementation of the Language Server Protocol for Qt"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64"
-fi
-
-RDEPEND="~dev-qt/qtbase-${PV}:6"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtlanguageserver/qtlanguageserver-6.7.3.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.3.ebuild
deleted file mode 100644
index 3dbf250ac2cc..000000000000
--- a/dev-qt/qtlanguageserver/qtlanguageserver-6.7.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Implementation of the Language Server Protocol for Qt"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64"
-fi
-
-RDEPEND="~dev-qt/qtbase-${PV}:6"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index fc4282878b2d..b7bb5552fef4 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,6 +1,4 @@
 DIST qtlocation-5.15.11-patchset.tar.xz 4796 BLAKE2B dcfa75bd3fb2e9069e1a530c27e2b4e9ac921fcf0ccb712f0894375b575ba25103948c6e5b85b56a8f9c9f2d7edf7df8e38501e93356e69f060b577a04c2d221 SHA512 14bd2864abc6f446dc4fbac03548cb42305685b46db757d856360780144095a021130bc0ebf1d07a516dc7991dc0cfbf733bd0ef6be58237bc15822c21af1d0b
 DIST qtlocation-everywhere-opensource-src-5.15.16.tar.xz 6548480 BLAKE2B 9f6d66d22f4ad45935e3e76e275866b236cd842b7a17a3a9e6553f75dcf3048cd70e0b046d5d08c57d4c9d7ea73f723b210d044f44bf494cafbbff590b0703e5 SHA512 321a8e68f731a97c7ef0209d6db0ff4891dd14dc43e14f5c4c5ac763069c7f17298fbc6410326df9265ccd631372cdba662fc82e26a324936d371c8572e19a48
-DIST qtlocation-everywhere-src-6.7.2.tar.xz 3166188 BLAKE2B ca22bc51308b5f5b28f96bedd4190ad747bd335790ec0975e1dc381d8fdacf720907a9842ec01cdd1add3d56549d4c096021731ea3268423d3288e1b24c993a6 SHA512 d7b8d4b9c99247362747d2d8fcf9207e710bed70c320d5c38e6868760cfe5ae2a158d1c0496af939a3e0d74369a86673cddfb25096ff8dda8dc209fd0df94e21
-DIST qtlocation-everywhere-src-6.7.3.tar.xz 3166232 BLAKE2B be9833355f758c6a7ffc799c911262c841f3419691a37a3ec21d3a2f2ffead23e69fce09811a8071c9454070659f7ea8a81eeb7ee5d7cfd89e5d76889649d8f6 SHA512 e905001e5edd4aa6fc3e28e7d9e0461083706510ae652bb8329a3eb9d0ca6a8cbea75ded54538e35a1a9389d743a41a4d1834f29184d398bdbb1281c0f4f591a
 DIST qtlocation-everywhere-src-6.8.1.tar.xz 3164180 BLAKE2B 12544d071894925abbc4c8af6875fafa5bf628e8814ef96a85caa2a0135b2a30cb4c68a96feb21b3b6ae20e53343f8fb14684a27d86a08b6cc3803830f38d6c7 SHA512 0d002e99b1e7434814a58e560a0730f0b1f9cc81cfe7d01001b2a2bd213b5ceaa4deaf6693f210f8576d7e76ac32fe22e758bc9c03888e7acfd4440902d454ac
 DIST qtlocation-mapboxgl-5.15.16-35d56672.tar.gz 3726302 BLAKE2B f51c0589a06fab35ba85b3bf4ca8a1904cda5aec47b17fdf747da527d02be623a76b1af5883b33267fab825a4b5d0863ea0220f2907e98e286b40d4a0bbc82e5 SHA512 5c2ff6ab7e4382d87546a802c5603bdcec3deb7fbb836fc981292c67660514caaa6118e164d2e099d0304710035572706562ec84e4aba5ce36b01cade8b0993e
diff --git a/dev-qt/qtlocation/qtlocation-6.7.2.ebuild b/dev-qt/qtlocation/qtlocation-6.7.2.ebuild
deleted file mode 100644
index 2eb3c22bc232..000000000000
--- a/dev-qt/qtlocation/qtlocation-6.7.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-fi
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network]
-	~dev-qt/qtdeclarative-${PV}:6
-	~dev-qt/qtpositioning-${PV}:6[qml]
-"
-DEPEND="${RDEPEND}"
-
-CMAKE_SKIP_TESTS=(
-	# ignores QML_IMPORT_PATH (unlike other tests) and looks in
-	# the missing builddir/qml, skip rather than work around
-	tst_declarative_ui
-)
-
-src_install() {
-	qt6-build_src_install
-
-	if use test; then
-		local delete=( # sigh
-			"${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake
-			"${D}${QT6_LIBDIR}"/cmake/Qt6Location/*UnsupportedPlacesGeoServicePlugin*.cmake
-			"${D}${QT6_LIBDIR}"/cmake/Qt6Qml/QmlPlugins/*declarative_location_test*.cmake
-			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_geocodingplugin.so
-			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_placesplugin_unsupported.so
-			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_qmltestplugin.so
-			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_routingplugin.so
-			"${D}${QT6_QMLDIR}"/QtLocation/Test
-		)
-		# using -f given not tracking which tests may be skipped or not
-		rm -rf -- "${delete[@]}" || die
-	fi
-}
diff --git a/dev-qt/qtlocation/qtlocation-6.7.3.ebuild b/dev-qt/qtlocation/qtlocation-6.7.3.ebuild
deleted file mode 100644
index 737731d3a4e8..000000000000
--- a/dev-qt/qtlocation/qtlocation-6.7.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86"
-fi
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network]
-	~dev-qt/qtdeclarative-${PV}:6
-	~dev-qt/qtpositioning-${PV}:6[qml]
-"
-DEPEND="${RDEPEND}"
-
-CMAKE_SKIP_TESTS=(
-	# ignores QML_IMPORT_PATH (unlike other tests) and looks in
-	# the missing builddir/qml, skip rather than work around
-	tst_declarative_ui
-)
-
-src_install() {
-	qt6-build_src_install
-
-	if use test; then
-		local delete=( # sigh
-			"${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake
-			"${D}${QT6_LIBDIR}"/cmake/Qt6Location/*UnsupportedPlacesGeoServicePlugin*.cmake
-			"${D}${QT6_LIBDIR}"/cmake/Qt6Qml/QmlPlugins/*declarative_location_test*.cmake
-			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_geocodingplugin.so
-			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_placesplugin_unsupported.so
-			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_qmltestplugin.so
-			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_routingplugin.so
-			"${D}${QT6_QMLDIR}"/QtLocation/Test
-		)
-		# using -f given not tracking which tests may be skipped or not
-		rm -rf -- "${delete[@]}" || die
-	fi
-}
diff --git a/dev-qt/qtlocation/qtlocation-6.8.1.ebuild b/dev-qt/qtlocation/qtlocation-6.8.1.ebuild
index 2eb3c22bc232..1e368063e6be 100644
--- a/dev-qt/qtlocation/qtlocation-6.8.1.ebuild
+++ b/dev-qt/qtlocation/qtlocation-6.8.1.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
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtlocation/qtlocation-6.8.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.8.9999.ebuild
index d407e2f12e54..4685eef8061e 100644
--- a/dev-qt/qtlocation/qtlocation-6.8.9999.ebuild
+++ b/dev-qt/qtlocation/qtlocation-6.8.9999.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
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtlocation/qtlocation-6.9.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.9.9999.ebuild
index d407e2f12e54..4685eef8061e 100644
--- a/dev-qt/qtlocation/qtlocation-6.9.9999.ebuild
+++ b/dev-qt/qtlocation/qtlocation-6.9.9999.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
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtlocation/qtlocation-6.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.9999.ebuild
index d407e2f12e54..4685eef8061e 100644
--- a/dev-qt/qtlocation/qtlocation-6.9999.ebuild
+++ b/dev-qt/qtlocation/qtlocation-6.9999.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
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index b06f423b8581..cd40ae1bc062 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,5 +1,3 @@
 DIST qtmultimedia-5.15.16-gentoo-kde-1.tar.xz 1496 BLAKE2B 760f0ee32f353849c0e826622fea0e744ceb4e96d3ae3a6e903b32e7e5211d803e29761538c45797f61f0766ae726206fd799fc4d2fa094f46176ee0d6d5a0fb SHA512 97b161727450864643c0c2d395757d3f78503c02d26151017bdbebfd55e7ffeeffc63e530baecdba4a43dc364dad614dd893278eb84e89587c8ac51f89e14f87
 DIST qtmultimedia-everywhere-opensource-src-5.15.16.tar.xz 3824912 BLAKE2B d98fcc82164d36f2bc21769796ce69c4b0aff57295795004cc609662a10fa80ecf8709c39ed53f96576071fd9e1e2d6eaadcc4eeb97c3fa6406ca7e2f8dcafe7 SHA512 a848affbc38a532455a34bdf887948210ff9794dae312115be0622246993324902b81209c2cac89ca5db63e6fcc29690f47c1255b1b7c4de68bf6ad5a6ecc5e7
-DIST qtmultimedia-everywhere-src-6.7.2.tar.xz 8451800 BLAKE2B 44523ebe4f1b0c910fdad8ff29f24273c1b7872e9f5dd58b2dd779e61fe3b5c1a97ee900009ca693c740a6e578f9dd62995ac101ef70e1cd718af1bd1c355430 SHA512 bfcd04a5ba142e2a3bee3b67a261ffb4f651ac4e043e3dcafc0175bd25409de375041aa6fdda4f6899b00e4bad6c06ae9fd0d6a1e7db0b874f1bcf0a578d3c70
-DIST qtmultimedia-everywhere-src-6.7.3.tar.xz 9360356 BLAKE2B c3ba0c1729b412022959900d4ee7b31f92df5c1b03326ffaea974a59a217be8f39cacf62e03374d63e1d804798ac1bfcfda011a42047ebaa53f5dc1511a44f06 SHA512 6c8c7c18ad71e32507af57456d1c11544f3e6c67c9cd3811a83fd0c20e12d6457ab294d91905e3911bdef1977ec1b535de82e9d92b2a38bd9eef7851e6349b5a
 DIST qtmultimedia-everywhere-src-6.8.1.tar.xz 9664564 BLAKE2B 675544811c845ddb34908fe82e33824451e6ec8fecb66730a2f4dbe754c4466db3ae6e157fac9e8d5d0505adf90ac65bed807bd52eaad0de05047e4532b8ebeb SHA512 77f8e913116ff75cf4602e9c5ee01c48161fb40aaadca0e09ca2f89292071fc6f2918403932b9b0653bbc2b007f25362e0cb84a382baedd67e9e4c31bc414463
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch
deleted file mode 100644
index d364699fc401..000000000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Fix was for ffmpeg-7.0.1 (masked) but the change was backported to 6.1.2.
-
-Should hardly be an issue but it does cause a test failure when it
-attempts to compare the return error when reading a (intentionally)
-corrupted file (aborts either way, just differently). Still some time
-until 6.7.3, and prefer to keep tests in a working state meanwhile.
-
-https://bugreports.qt.io/browse/QTBUG-126687
-https://github.com/qt/qtmultimedia/commit/8d809d56697f8d23669a9b1476ac0b0748e32e0d
-From: Pavel Dubsky <pavel.dubsky@qt.io>
-Date: Wed, 10 Jul 2024 14:42:51 +0200
-Subject: [PATCH] Process FFmpeg AVERROR_INVALIDDATA from avformat_open_input
-
-FFmpeg version n7.0.1 changed the error code that is returned from
-function mp3_read_header: AVERROR(EINVAL) -> AVERROR_INVALIDDATA.
-
-Task-number: QTBUG-126687
-Pick-to: 6.8 6.7 6.5
-Change-Id: I6aee7771a9d1f80ea459376711d5264bed9a7bac
-Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
---- a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp
-+++ b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp
-@@ -194,7 +194,7 @@ loadMedia(const QUrl &mediaUrl, QIODevice *stream, const std::shared_ptr<ICancel
-         auto code = QMediaPlayer::ResourceError;
-         if (ret == AVERROR(EACCES))
-             code = QMediaPlayer::AccessDeniedError;
--        else if (ret == AVERROR(EINVAL))
-+        else if (ret == AVERROR(EINVAL) || ret == AVERROR_INVALIDDATA)
-             code = QMediaPlayer::FormatError;
- 
-         return MediaDataHolder::ContextError{ code, QMediaPlayer::tr("Could not open file") };
---- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
-+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
-@@ -962,7 +962,7 @@ void tst_QMediaPlayerBackend::setSource_emitsError_whenSdpFileIsLoaded()
-     });
- 
-     m_fixture->player.setSource(sdpUrl);
--    QTRY_COMPARE_EQ(m_fixture->player.error(), QMediaPlayer::ResourceError);
-+    QTRY_COMPARE_EQ(m_fixture->player.error(), QMediaPlayer::FormatError);
- #endif // QT_CONFIG(process)
- }
- 
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch
deleted file mode 100644
index 0f61539b00d2..000000000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# https://bugs.gentoo.org/934582
-
---- a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamercamera.cpp
-+++ b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamercamera.cpp
-@@ -718,6 +718,7 @@ int QGstreamerCamera::getV4L2Parameter(quint32 id) const
-         return control.value;
-     });
- }
-+#endif // QT_CONFIG(linux_v4l)
- 
- QGstreamerCustomCamera::QGstreamerCustomCamera(QCamera *camera)
-     : QGstreamerCameraBase{
-@@ -766,6 +767,4 @@ void QGstreamerCustomCamera::setActive(bool active)
-     emit activeChanged(active);
- }
- 
--#endif
--
- QT_END_NAMESPACE
-
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.8.1-qversionnumber.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.8.1-qversionnumber.patch
new file mode 100644
index 000000000000..625c760fb1ce
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-6.8.1-qversionnumber.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/947606
+TODO: needs upstreaming
+--- a/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp
++++ b/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp
+@@ -13,2 +13,3 @@
+ #if QT_CONFIG(pulseaudio)
++#  include <QVersionNumber>
+ #  include <pulse/version.h>
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild
deleted file mode 100644
index 75aefa2fa156..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qt6-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
-# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
-REQUIRED_USE="
-	|| ( ffmpeg gstreamer )
-	eglfs? ( ffmpeg opengl qml )
-	vaapi? ( ffmpeg opengl )
-	test? ( qml )
-"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? (
-		!pulseaudio? ( media-libs/alsa-lib )
-	)
-	ffmpeg? (
-		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
-		media-video/ffmpeg:=[vaapi?]
-		X? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrandr
-		)
-	)
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0[X=,opengl?]
-		media-libs/gstreamer:1.0
-	)
-	opengl? ( media-libs/libglvnd )
-	pulseaudio? ( media-libs/libpulse )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}:6
-		~dev-qt/qtquick3d-${PV}:6
-	)
-"
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	v4l? ( sys-kernel/linux-headers )
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="~dev-qt/qtshadertools-${PV}:6"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gstreamer-no-v4l.patch
-	"${FILESDIR}"/${P}-ffmpeg-6.1.2.patch
-)
-
-CMAKE_SKIP_TESTS=(
-	# unimportant and expects all backends to be available (bug #928420)
-	tst_backends
-	# tries to use real alsa or pulseaudio and fails in sandbox
-	tst_qaudiosink
-	tst_qaudiosource
-	tst_qmediacapturesession
-	tst_qmediaplayerbackend
-	tst_qsoundeffect
-	# may try to use v4l2 or hardware acceleration depending on availability
-	tst_qscreencapture_integration
-	tst_qscreencapturebackend
-	tst_qvideoframebackend
-	# fails with offscreen rendering
-	tst_qvideoframecolormanagement
-	tst_qwindowcapturebackend
-)
-
-src_configure() {
-	# normally passed by the build system, but needed for 32-on-64 chroots
-	use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
-
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature ffmpeg)
-		$(qt_feature gstreamer)
-		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
-		$(qt_feature pulseaudio)
-		$(qt_feature v4l linux_v4l)
-		$(qt_feature vaapi)
-	)
-
-	# ALSA backend is experimental off-by-default and can take priority
-	# causing problems (bug #935146), disable if USE=pulseaudio is set
-	# (also do not want unnecessary usage of ALSA plugins -> pulse)
-	if use alsa && use pulseaudio; then
-		# einfo should be enough given pure-ALSA users tend to disable pulse
-		einfo "Warning: USE=alsa is ignored when USE=pulseaudio is set"
-		mycmakeargs+=( -DQT_FEATURE_alsa=OFF )
-	else
-		mycmakeargs+=( $(qt_feature alsa) )
-	fi
-
-	qt6-build_src_configure
-}
-
-src_install() {
-	qt6-build_src_install
-
-	if use test; then
-		local delete=( # sigh
-			"${D}${QT6_LIBDIR}"/cmake/Qt6Multimedia/Qt6MockMultimediaPlugin*.cmake
-			"${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_mockmultimediaplugin.pri
-			"${D}${QT6_PLUGINDIR}"/multimedia/libmockmultimediaplugin.*
-			"${D}${QT6_PLUGINDIR}"/multimedia/objects-*
-		)
-		# using -f given not tracking which tests may be skipped or not
-		rm -rf -- "${delete[@]}" || die
-	fi
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild
deleted file mode 100644
index 4c90076675b9..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qt6-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-IUSE="
-	+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio
-	qml v4l vaapi vulkan wayland
-"
-# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
-REQUIRED_USE="
-	|| ( ffmpeg gstreamer )
-	eglfs? ( ffmpeg opengl qml )
-	test? ( qml )
-	vaapi? ( ffmpeg opengl )
-"
-
-# gstreamer[X=] is to avoid broken gst detect if -X w/ gst[X] w/o xorg-proto
-# (*could* be removed if gst-plugins-base[X] RDEPENDs on xorg-proto)
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? (
-		!pulseaudio? ( media-libs/alsa-lib )
-	)
-	ffmpeg? (
-		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
-		media-video/ffmpeg:=[vaapi?]
-		X? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrandr
-		)
-	)
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0[X=]
-		media-libs/gstreamer:1.0
-		opengl? (
-			~dev-qt/qtbase-${PV}:6[X?,wayland?]
-			media-libs/gst-plugins-base:1.0[X?,egl,opengl,wayland?]
-		)
-	)
-	opengl? ( media-libs/libglvnd )
-	pulseaudio? ( media-libs/libpulse )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}:6
-		~dev-qt/qtquick3d-${PV}:6
-	)
-"
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	v4l? ( sys-kernel/linux-headers )
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="~dev-qt/qtshadertools-${PV}:6"
-
-CMAKE_SKIP_TESTS=(
-	# unimportant and expects all backends to be available (bug #928420)
-	tst_backends
-	# tries to use real alsa or pulseaudio and fails in sandbox
-	tst_qaudiosink
-	tst_qaudiosource
-	tst_qmediacapture_gstreamer
-	tst_qmediacapturesession
-	tst_qmediaplayerbackend
-	tst_qsoundeffect
-	# may try to use v4l2 or hardware acceleration depending on availability
-	tst_qscreencapture_integration
-	tst_qscreencapturebackend
-	tst_qvideoframebackend
-	# fails with offscreen rendering
-	tst_qvideoframecolormanagement
-	tst_qwindowcapturebackend
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
-)
-
-src_configure() {
-	# eigen + ppc32 seems broken w/ -maltivec (forced by Qt, bug #943402)
-	use ppc && append-cppflags -DEIGEN_DONT_VECTORIZE
-
-	# normally passed by the build system, but needed for 32-on-64 chroots
-	use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
-
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature ffmpeg)
-		$(qt_feature gstreamer)
-		$(usev gstreamer "
-			$(qt_feature opengl gstreamer_gl)
-			$(usev opengl "
-				$(qt_feature X gstreamer_gl_x11)
-				$(qt_feature wayland gstreamer_gl_wayland)
-			")
-		")
-		$(qt_feature pulseaudio)
-		$(qt_feature v4l linux_v4l)
-		$(qt_feature vaapi)
-	)
-
-	# ALSA backend is experimental off-by-default and can take priority
-	# causing problems (bug #935146), disable if USE=pulseaudio is set
-	# (also do not want unnecessary usage of ALSA plugins -> pulse)
-	if use alsa && use pulseaudio; then
-		# einfo should be enough given pure-ALSA users tend to disable pulse
-		einfo "Warning: USE=alsa is ignored when USE=pulseaudio is set"
-		mycmakeargs+=( -DQT_FEATURE_alsa=OFF )
-	else
-		mycmakeargs+=( $(qt_feature alsa) )
-	fi
-
-	qt6-build_src_configure
-}
-
-src_install() {
-	qt6-build_src_install
-
-	if use test; then
-		local delete=( # sigh
-			"${D}${QT6_LIBDIR}"/cmake/Qt6Multimedia/Qt6MockMultimediaPlugin*.cmake
-			"${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_mockmultimediaplugin.pri
-			"${D}${QT6_PLUGINDIR}"/multimedia/libmockmultimediaplugin.*
-			"${D}${QT6_PLUGINDIR}"/multimedia/objects-*
-		)
-		# using -f given not tracking which tests may be skipped or not
-		rm -rf -- "${delete[@]}" || die
-	fi
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild
index f018b0b87f76..3bed1852e8eb 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.1.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
@@ -94,6 +94,7 @@ CMAKE_SKIP_TESTS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+	"${FILESDIR}"/${PN}-6.8.1-qversionnumber.patch
 )
 
 src_configure() {
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
index 5c9d4372dcb4..ebedbf72d367 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.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
@@ -87,6 +87,8 @@ CMAKE_SKIP_TESTS=(
 	tst_qscreencapture_integration
 	tst_qscreencapturebackend
 	tst_qvideoframebackend
+	# seems flaky depending on what codecs system libraries support or not
+	tst_qmediaformatbackend
 	# fails with offscreen rendering
 	tst_qvideoframecolormanagement
 	tst_qwindowcapturebackend
@@ -94,6 +96,7 @@ CMAKE_SKIP_TESTS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+	"${FILESDIR}"/${PN}-6.8.1-qversionnumber.patch
 )
 
 src_configure() {
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild
index 5c9d4372dcb4..ebedbf72d367 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.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
@@ -87,6 +87,8 @@ CMAKE_SKIP_TESTS=(
 	tst_qscreencapture_integration
 	tst_qscreencapturebackend
 	tst_qvideoframebackend
+	# seems flaky depending on what codecs system libraries support or not
+	tst_qmediaformatbackend
 	# fails with offscreen rendering
 	tst_qvideoframecolormanagement
 	tst_qwindowcapturebackend
@@ -94,6 +96,7 @@ CMAKE_SKIP_TESTS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+	"${FILESDIR}"/${PN}-6.8.1-qversionnumber.patch
 )
 
 src_configure() {
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index 5c9d4372dcb4..ebedbf72d367 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.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
@@ -87,6 +87,8 @@ CMAKE_SKIP_TESTS=(
 	tst_qscreencapture_integration
 	tst_qscreencapturebackend
 	tst_qvideoframebackend
+	# seems flaky depending on what codecs system libraries support or not
+	tst_qmediaformatbackend
 	# fails with offscreen rendering
 	tst_qvideoframecolormanagement
 	tst_qwindowcapturebackend
@@ -94,6 +96,7 @@ CMAKE_SKIP_TESTS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+	"${FILESDIR}"/${PN}-6.8.1-qversionnumber.patch
 )
 
 src_configure() {
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index d6278a3093d5..b00f5336534a 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,5 +1,3 @@
 DIST qtnetworkauth-5.15.16-gentoo-kde-1.tar.xz 2296 BLAKE2B 3bc5ce51289a0d238649064ad74a971e955a4436fdef6b876455a256f3063ad6e0721c81710f3bbca5b6c1722ef4daf4e14d471ba3a7a07ddba146880424d6d1 SHA512 2657aca08e73f81e24121e0e7c3d96487a591f896987e643eb160dab74ff307c73f6d6d13ed25853b6249604faf56fcee92dcec63a56a78f1ccac2ab4fb6dbd0
 DIST qtnetworkauth-everywhere-opensource-src-5.15.16.tar.xz 135600 BLAKE2B b74bd1c8ea20dbcadc3d83709462d1bde8b67ec767633b1dd880248532769eeb5694ac0c92a2ccb6dc407ddd7a0acc69bcc5b9a3ffc3ef361fc853a0ca780bc0 SHA512 cbf112c1f9c03f6cf78de148da44639393a3a2df56116e85d51d674cb31c37ea45823c44b9839af021c1c7e7733eefd646fbaae52459088b03e3b00fd30b1d49
-DIST qtnetworkauth-everywhere-src-6.7.2.tar.xz 146892 BLAKE2B d2d788edbf0bc8c6a33cd7303cd593d8415ee7f006ee00bc19b4659052ad02032dddbcad4eaeedcba56f782fd2b5607304720a9b131781eeb12ca7daea6b301b SHA512 8357b2b833da9f652c88e706c7bf15b19b2c5b8f054914bfc16d33ea69dce86999b03fb7dd5b79e2a58d8d4e16af0fd2ff6dcf8e621ed251e63171fc8151f75b
-DIST qtnetworkauth-everywhere-src-6.7.3.tar.xz 148772 BLAKE2B f949e65d00b99bbdc36f4c80bd6e7454f4ac38363924ab8abef4a6a4dfb61f4ff627d7059c50f37d57207da1d91d560bc290d9671e3f2eec7dc5a0e8b480c717 SHA512 f5eacb898423bcee0b063f70bf227ef954702b281964dbf182a2e280ef98d203fd88e2696c5f6f45f62b0a6a2e6b9a33f968c71f63b02647e57c475c4c37f6df
 DIST qtnetworkauth-everywhere-src-6.8.1.tar.xz 253260 BLAKE2B 2597f8e6d4213d647ced9042ec42a4a53bc78ee949d245a637ae7c02ea1fd4e49c3d120de366ca8c10bc5fef1c5284d217e5010a28f38b47b229eeab3f8ec983 SHA512 9f6e3b1bcc5921b8c663f9a84884e347eca17554d912188f3f2b6781ff6bd45a5783156425c2084ac214d05e5fa559a05a8881b9a90781154c45da18d3c23338
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.7.2.ebuild
deleted file mode 100644
index a9c901a07baf..000000000000
--- a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Network authorization library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
-fi
-
-RDEPEND="~dev-qt/qtbase-${PV}:6[network]"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.3.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.7.3.ebuild
deleted file mode 100644
index b28f1f7c1bac..000000000000
--- a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Network authorization library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-fi
-
-RDEPEND="~dev-qt/qtbase-${PV}:6[network]"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.8.1.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.8.1.ebuild
index 097d77186d49..6a9ae4cbf97c 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-6.8.1.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.8.1.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
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Network authorization library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
 fi
 
 RDEPEND="~dev-qt/qtbase-${PV}:6[gui,network]"
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.8.9999.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.8.9999.ebuild
index e5e7961d25ba..63beca1f3ccb 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-6.8.9999.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.8.9999.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
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Network authorization library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 RDEPEND="~dev-qt/qtbase-${PV}:6[gui,network]"
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.9.9999.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.9.9999.ebuild
index e5e7961d25ba..63beca1f3ccb 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-6.9.9999.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.9.9999.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
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Network authorization library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 RDEPEND="~dev-qt/qtbase-${PV}:6[gui,network]"
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild
index e5e7961d25ba..63beca1f3ccb 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.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
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Network authorization library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 RDEPEND="~dev-qt/qtbase-${PV}:6[gui,network]"
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 6230e08ebd7c..fee0923f8f10 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,4 +1,2 @@
 DIST qtlocation-everywhere-opensource-src-5.15.16.tar.xz 6548480 BLAKE2B 9f6d66d22f4ad45935e3e76e275866b236cd842b7a17a3a9e6553f75dcf3048cd70e0b046d5d08c57d4c9d7ea73f723b210d044f44bf494cafbbff590b0703e5 SHA512 321a8e68f731a97c7ef0209d6db0ff4891dd14dc43e14f5c4c5ac763069c7f17298fbc6410326df9265ccd631372cdba662fc82e26a324936d371c8572e19a48
-DIST qtpositioning-everywhere-src-6.7.2.tar.xz 658112 BLAKE2B ef32068ae5d718df1ad10fddf735d65f9f90edb559211978f7112d6228a69ef37e92dcd7c124d3fff3887f1032e970c8735f92397751bdcd482451251afb4cc6 SHA512 2983fde05cbccf86288cd989279551b5babeddcf9be2848870e59dbbfc2d91749465bf43c17e291d6df37ee746b5490c0bb1e6b3fd4298b4f0a22cc6d67db04e
-DIST qtpositioning-everywhere-src-6.7.3.tar.xz 659068 BLAKE2B b8489699a31005ae4de5238147c318d40d6928694c8e6c7ec601b2a69a03b6a5c2c4ba3304006e1a5029a855d3d045e964769f5f2fde73ff25ee72cf30a5cae9 SHA512 feb900f7371e712a63be6798f924d42e79676c317e18d1b347ae3cc870e9bf1003accc147dfeaa18d91ce6fdf2a7f3626c11a0419cb5058fa81f6f9ef17d6554
 DIST qtpositioning-everywhere-src-6.8.1.tar.xz 661544 BLAKE2B 400c4c46afe624ccd51a93e1bcb1974315bbf663aaa9f2a5f869469f823578745924260922706f0d1e21ca49e775628099cb3547359ab374e0410acdc17ca1b7 SHA512 483da18c59375e72641b46218327339e487e1ec1e9463be5ff9d89611c1d8daed28624523632029b3daedaec46e3e0564a9136a3e29933b3267c3d33a922ad35
diff --git a/dev-qt/qtpositioning/qtpositioning-6.7.2.ebuild b/dev-qt/qtpositioning/qtpositioning-6.7.2.ebuild
deleted file mode 100644
index ccc9e5fd0f6c..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-6.7.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Physical position determination library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-IUSE="geoclue nmea +qml"
-
-DEPEND="
-	~dev-qt/qtbase-${PV}:6
-	geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] )
-	nmea? (
-		~dev-qt/qtbase-${PV}:6[network]
-		~dev-qt/qtserialport-${PV}:6
-	)
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-"
-RDEPEND="
-	${DEPEND}
-	geoclue? ( app-misc/geoclue:2.0 )
-"
-
-CMAKE_SKIP_TESTS=(
-	# threads test (rarely) fails randomly
-	tst_qgeoareamonitor
-)
-
-src_prepare() {
-	qt6-build_src_prepare
-
-	# unfortunately cmake_use_find_package would break things with qtbase
-	use geoclue ||
-		sed -e 's/TARGET Qt::DBus/FALSE/' \
-			-i src/plugins/position/CMakeLists.txt || die
-	use nmea ||
-		sed -e 's/TARGET Qt::Network/FALSE/' \
-			-i src/plugins/position/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-	)
-
-	qt6-build_src_configure
-}
-
-src_install() {
-	qt6-build_src_install
-
-	if use test; then
-		local delete=( # sigh
-			"${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*DummyPlugin*.cmake
-			"${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*TestPlugin*.cmake
-			"${D}${QT6_PLUGINDIR}"/position/libqtposition_satellitesourcetest.so
-			"${D}${QT6_PLUGINDIR}"/position/libqtposition_testplugin{,2}.so
-		)
-		# using -f given not tracking which tests may be skipped or not
-		rm -f -- "${delete[@]}" || die
-	fi
-}
diff --git a/dev-qt/qtpositioning/qtpositioning-6.7.3.ebuild b/dev-qt/qtpositioning/qtpositioning-6.7.3.ebuild
deleted file mode 100644
index 1ec67a313800..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-6.7.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Physical position determination library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-IUSE="geoclue nmea +qml"
-
-DEPEND="
-	~dev-qt/qtbase-${PV}:6
-	geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] )
-	nmea? (
-		~dev-qt/qtbase-${PV}:6[network]
-		~dev-qt/qtserialport-${PV}:6
-	)
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-"
-RDEPEND="
-	${DEPEND}
-	geoclue? ( app-misc/geoclue:2.0 )
-"
-
-CMAKE_SKIP_TESTS=(
-	# threads test (rarely) fails randomly
-	tst_qgeoareamonitor
-)
-
-src_prepare() {
-	qt6-build_src_prepare
-
-	# unfortunately cmake_use_find_package would break things with qtbase
-	use geoclue ||
-		sed -e 's/TARGET Qt::DBus/FALSE/' \
-			-i src/plugins/position/CMakeLists.txt || die
-	use nmea ||
-		sed -e 's/TARGET Qt::Network/FALSE/' \
-			-i src/plugins/position/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-	)
-
-	qt6-build_src_configure
-}
-
-src_install() {
-	qt6-build_src_install
-
-	if use test; then
-		local delete=( # sigh
-			"${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*DummyPlugin*.cmake
-			"${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*TestPlugin*.cmake
-			"${D}${QT6_PLUGINDIR}"/position/libqtposition_satellitesourcetest.so
-			"${D}${QT6_PLUGINDIR}"/position/libqtposition_testplugin{,2}.so
-		)
-		# using -f given not tracking which tests may be skipped or not
-		rm -f -- "${delete[@]}" || die
-	fi
-}
diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest
index ca680dbb9a04..047e62e1ae46 100644
--- a/dev-qt/qtquick3d/Manifest
+++ b/dev-qt/qtquick3d/Manifest
@@ -1,3 +1 @@
-DIST qtquick3d-everywhere-src-6.7.2.tar.xz 66202160 BLAKE2B 1f3741bb11d21804ec56aa5bfa00b590d94258cb119b4284aa2757fa00785a69aba243e06bf68ca625355a8e8a392249be2ac9679226c8d250320aeb6c4ccf0f SHA512 d5a4557a6f0ea73b43de9238b8cd42fc037c417e72443a8cae96e8be779f82d5fd9efe1a09258a4d5dd55c4791b84192cb72e31bb1d744b618951080fe6fa1e2
-DIST qtquick3d-everywhere-src-6.7.3.tar.xz 66208152 BLAKE2B d165ea6d61c3b7e0253e6cc28a33c298a30b78add8cb761b460df280ebc069c979e52868b5675e15d4b2add6110f610bd9c6160848c7e02e5be0313f16179ec2 SHA512 cdfc34521a201325ee0d41dfb5608fc9deca6c27d71d27e170d147a53fad808c4e70ee67b5c7598c8685b8c534dd5fa8460f436ae4e7a208b7d5be27bf1631d5
 DIST qtquick3d-everywhere-src-6.8.1.tar.xz 75292284 BLAKE2B b0fa2fed9de6f9aa3cfb9bea6f50775f03aca17355e2b4f4f6b8b5de3f10febbe9e275b03337c9745c37fd62ac0a155c2b969ebd6be07662b0141e58fd5078c6 SHA512 9845cf84b57b33d0acb29a4c5ea2492ac60367d210b51c4896d6d5b9a33197be007cc02934c1b0dde5ee888641c8104cc4080f1493d0d09ed271fe2d08d2f410
diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild
deleted file mode 100644
index d24670414f6f..000000000000
--- a/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-elif [[ ${QT6_BUILD_TYPE} == live ]]; then
-	EGIT_SUBMODULES=() # skip qtquick3d-assimp
-fi
-
-IUSE="opengl vulkan"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[concurrent,gui,opengl=,vulkan=,widgets]
-	~dev-qt/qtdeclarative-${PV}:6
-	~dev-qt/qtquicktimeline-${PV}:6
-	~dev-qt/qtshadertools-${PV}:6
-	media-libs/assimp:=
-	sys-libs/zlib:=
-"
-DEPEND="
-	${RDEPEND}
-	test? ( ~dev-qt/qtbase-${PV}:6[network] )
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="
-	~dev-qt/qtshadertools-${PV}:6
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
-	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
-	"${FILESDIR}"/${PN}-6.7.2-gcc15.patch
-)
-
-CMAKE_SKIP_TESTS=(
-	# needs off-by-default assimp[collada] that is masked on some profiles,
-	# not worth the extra trouble
-	tst_qquick3dassetimport
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DQT_FEATURE_system_assimp=ON
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.3.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.3.ebuild
deleted file mode 100644
index 84ee23157e6c..000000000000
--- a/dev-qt/qtquick3d/qtquick3d-6.7.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc64 ~riscv x86"
-elif [[ ${QT6_BUILD_TYPE} == live ]]; then
-	EGIT_SUBMODULES=() # skip qtquick3d-assimp
-fi
-
-IUSE="opengl vulkan"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[concurrent,gui,opengl=,vulkan=,widgets]
-	~dev-qt/qtdeclarative-${PV}:6
-	~dev-qt/qtquicktimeline-${PV}:6
-	~dev-qt/qtshadertools-${PV}:6
-	media-libs/assimp:=
-	sys-libs/zlib:=
-"
-DEPEND="
-	${RDEPEND}
-	test? ( ~dev-qt/qtbase-${PV}:6[network] )
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="
-	~dev-qt/qtshadertools-${PV}:6
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
-	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
-	"${FILESDIR}"/${PN}-6.7.2-gcc15.patch
-)
-
-CMAKE_SKIP_TESTS=(
-	# needs off-by-default assimp[collada] that is masked on some profiles,
-	# not worth the extra trouble
-	tst_qquick3dassetimport
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DQT_FEATURE_system_assimp=ON
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index 54b7aef0e23b..af1d74b484ef 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -1,4 +1,2 @@
 DIST qtquicktimeline-everywhere-opensource-src-5.15.16.tar.xz 96540 BLAKE2B e70c51afe55cfd8836d1a379975b4ffc4b1f0413707970148f1870ea99f38c6eec1a38e3190d6e1c186d5306de2745346978a9d3e29ea79b849f56f52b8b8e8c SHA512 0d27b672a76fdb6ba531bc823792bbcda2f286cebf9b64332651544344c1d78c9d397d40b3ccd426cea4dea6ea0971cc142ce0258a1f5a92a2239b39aef79054
-DIST qtquicktimeline-everywhere-src-6.7.2.tar.xz 110200 BLAKE2B ab181ced9e06bbf4ac9d9c3e558749a14d038a2bc741a67461f901f013b0e5da328485747499934829b60d3ee125a674033caad69dec3b2255fb36ed206a55c1 SHA512 cb460db34b726216f539bcd305e257375b01250a4f2df546a9a27c53bf78287e2c9d1ecc81edc336e5d55b87006a271ddc435e5fb57a898947bcf93cf5ea1b90
-DIST qtquicktimeline-everywhere-src-6.7.3.tar.xz 110184 BLAKE2B b56e7d670715a2ba0fe48bb3b05fa815ab764795652c3768da7aad70afb221ff2e8d609baafdbb374854bae44ced0f2dd31ca386d3a6cbfccee313a9d59c0bdc SHA512 e01acaad6080bec84b1efdf33c71859c609dd3a9b3e5a4af57384e9ad6b875a8ba9e426a62cea90ac51f0adf842d5e6abbcd6ec0453fba45133c39408e365816
 DIST qtquicktimeline-everywhere-src-6.8.1.tar.xz 110612 BLAKE2B 7662fadd94c20a4ef8847397e88c0d39914c6e16e26312e3766190774a691ccfc5821895598d8344035b06dbf48c4c6c374faecd75b26ad43a102f259794a1a6 SHA512 479ec01b1c4ef829bca59458138eeeee0bcca5cee0b93cac01bfd6675ffd7a2bde31784b817760ae9fac908548a7ff581e8ea3f13237433e365471a9c570b8dc
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.7.2.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.7.2.ebuild
deleted file mode 100644
index 53b50c299892..000000000000
--- a/dev-qt/qtquicktimeline/qtquicktimeline-6.7.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt module for keyframe-based timeline construction"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6
-	~dev-qt/qtdeclarative-${PV}:6
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.7.3.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.7.3.ebuild
deleted file mode 100644
index d8585283c26a..000000000000
--- a/dev-qt/qtquicktimeline/qtquicktimeline-6.7.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt module for keyframe-based timeline construction"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6
-	~dev-qt/qtdeclarative-${PV}:6
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtremoteobjects/Manifest b/dev-qt/qtremoteobjects/Manifest
index 05e766ca41a7..f38449fdb605 100644
--- a/dev-qt/qtremoteobjects/Manifest
+++ b/dev-qt/qtremoteobjects/Manifest
@@ -1,2 +1 @@
-DIST qtremoteobjects-everywhere-src-6.7.3.tar.xz 537012 BLAKE2B 81363b9ce519dad0ac94109243dffd3043c010d125cb738f1dc49c31b0aa6324a28c055c0126b5992e63b5296781af87f59236c759f3e82121d8cf663d0950e6 SHA512 42b744dc946296bbd57ed31509b720285fd50760484243eede06ac25205fced40060601bef257745635ab4e15a59ddc8bd207dec52246adfde94078706d23e0f
 DIST qtremoteobjects-everywhere-src-6.8.1.tar.xz 537132 BLAKE2B b00cc0fd193c7b2638ed5ac2b91cdb6cc23cd8ff0b49ec55ef44cbd8633b0a62107e7ba69e6f2e5a0003d62138e8a88511483d2cfbd5616afc3fd8f5aff409b2 SHA512 30660149a59b8c7630fcafaf6d735b6ed0dc950c2658e7547c63c73f73468e5cbb4c3490a8849fabf9b021393b9c745ec339e7db909184711f05f3d30ab794cf
diff --git a/dev-qt/qtremoteobjects/qtremoteobjects-6.7.3.ebuild b/dev-qt/qtremoteobjects/qtremoteobjects-6.7.3.ebuild
deleted file mode 100644
index f3819e416a2d..000000000000
--- a/dev-qt/qtremoteobjects/qtremoteobjects-6.7.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Inter-Process Communication (IPC) library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network]
-	qml? (
-		~dev-qt/qtbase-${PV}:6[gui]
-		~dev-qt/qtdeclarative-${PV}:6
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? ( ~dev-qt/qtbase-${PV}:6[gui] )
-"
-
-src_configure() {
-	# same issue as bug #913692 when tests are enabled
-	has_version "=dev-qt/qtdeclarative-$(ver_cut 1-3)*:6" &&
-		local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) )
-
-	qt6-build_src_configure
-}
-
-src_test() {
-	# tests re-use 127.0.0.1:65213 and randomly fail if ran at same time
-	qt6-build_src_test -j1
-}
-
-src_install() {
-	qt6-build_src_install
-
-	if use test; then
-		# installs 30+ test binaries like "qt6/bin/state" and, given
-		# otherwise empty, "can" delete the directory rather than list
-		rm -r -- "${D}${QT6_BINDIR}" || die
-	fi
-}
diff --git a/dev-qt/qtremoteobjects/qtremoteobjects-6.8.1.ebuild b/dev-qt/qtremoteobjects/qtremoteobjects-6.8.1.ebuild
index 39f29b8c9731..d4438f8aaaaa 100644
--- a/dev-qt/qtremoteobjects/qtremoteobjects-6.8.1.ebuild
+++ b/dev-qt/qtremoteobjects/qtremoteobjects-6.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Inter-Process Communication (IPC) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 ~loong"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtremoteobjects/qtremoteobjects-6.8.9999.ebuild b/dev-qt/qtremoteobjects/qtremoteobjects-6.8.9999.ebuild
index 62948acc2c91..5a992a36755d 100644
--- a/dev-qt/qtremoteobjects/qtremoteobjects-6.8.9999.ebuild
+++ b/dev-qt/qtremoteobjects/qtremoteobjects-6.8.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Inter-Process Communication (IPC) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~loong"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtremoteobjects/qtremoteobjects-6.9.9999.ebuild b/dev-qt/qtremoteobjects/qtremoteobjects-6.9.9999.ebuild
index 62948acc2c91..5a992a36755d 100644
--- a/dev-qt/qtremoteobjects/qtremoteobjects-6.9.9999.ebuild
+++ b/dev-qt/qtremoteobjects/qtremoteobjects-6.9.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Inter-Process Communication (IPC) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~loong"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtremoteobjects/qtremoteobjects-6.9999.ebuild b/dev-qt/qtremoteobjects/qtremoteobjects-6.9999.ebuild
index 62948acc2c91..5a992a36755d 100644
--- a/dev-qt/qtremoteobjects/qtremoteobjects-6.9999.ebuild
+++ b/dev-qt/qtremoteobjects/qtremoteobjects-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Inter-Process Communication (IPC) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~loong"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index 635dee87e90f..e755ee39d3e1 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,4 +1,2 @@
 DIST qtscxml-everywhere-opensource-src-5.15.16.tar.xz 429268 BLAKE2B 3d3b41eab16da426b8071fe5b95a53469965bbaf056530cef0732d248394c4a889055094ef1716b0d1d7291d4fe986ed159ea7fc06ae9282f36630680d305f01 SHA512 fbfb054e07767975fc44a41cc015fd12aa15cec5abda1fd3f01425eaa1fd191c529f49dd5a97b6bdf9b83e841d069e1b3190f35d396c0ea5e44d5df66337102d
-DIST qtscxml-everywhere-src-6.7.2.tar.xz 1168452 BLAKE2B 7cb06fd09758aaea28ccada62aa51b427c265416afa3f152601cadd1c9586050e87d36f8cf9679ca3ef83777bfec1119d861bd9491a176460d58beb5376e4ce4 SHA512 4eba366c2c10593cfc0fdeeff92aa9951b838837cacf113bf849b5da68da4d41d550490bc4be28620f766ab412ca4066c71ee7a1ff18651dd08267b01df6c2fe
-DIST qtscxml-everywhere-src-6.7.3.tar.xz 1168340 BLAKE2B 3082ed9be66233a53ec99a684c87c9211b8805f9dd6967f9e0b7b509d0fb809704d39e0c688e039103cc36f4ad0f4aef39823b3b57e16b67126c9772b5fd7754 SHA512 d2d561f7a94d1fad2ad578b602c51c5f506bb0ea2c145647ea490399bac5995191c56ad62454775f15a2d3973e99cd220487ead3d5873163949b9ddd58bdada7
 DIST qtscxml-everywhere-src-6.8.1.tar.xz 558424 BLAKE2B 7b0c27288678844d85676f0c8e4126b268f8b94ed229fd1e86282cfe26b4d700c7d89cacaefb17f91c4caec28a32cb4deb002ac129831c85fd3175387a7d5b88 SHA512 294d830569f05450a57fd30741707f7c6d42d07ad9ae03840e41c1382f72f8d3408d9cc1ba16145ede51f5ca510cef87b0ca298991c7697a7c2b58b0db8f8f29
diff --git a/dev-qt/qtscxml/qtscxml-6.7.2.ebuild b/dev-qt/qtscxml/qtscxml-6.7.2.ebuild
deleted file mode 100644
index c856510d3f29..000000000000
--- a/dev-qt/qtscxml/qtscxml-6.7.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="State Chart XML (SCXML) support library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui]
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-"
-DEPEND="${RDEPEND}"
-
-CMAKE_SKIP_TESTS=(
-	# may fail with pid-sandbox, or at least musl/hardened+gcc (exact
-	# conditions unknown but passes without pid, considering this flaky)
-	tst_qstatemachine
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtscxml/qtscxml-6.7.3.ebuild b/dev-qt/qtscxml/qtscxml-6.7.3.ebuild
deleted file mode 100644
index 725df1ebb7a9..000000000000
--- a/dev-qt/qtscxml/qtscxml-6.7.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="State Chart XML (SCXML) support library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui]
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-"
-DEPEND="${RDEPEND}"
-
-CMAKE_SKIP_TESTS=(
-	# may fail with pid-sandbox, or at least musl/hardened+gcc (exact
-	# conditions unknown but passes without pid, considering this flaky)
-	tst_qstatemachine
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index 47070c8b56b1..fe4d71215e20 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,4 +1,2 @@
 DIST qtsensors-everywhere-opensource-src-5.15.16.tar.xz 2051048 BLAKE2B 85fa8c67639751676ffa1ccd5ad1a89efbaed56f4bd39e99fd88bd25924d8cfc08d67a4f8f20878bac82a91f5768d60b5576e3799fc80221f2f6f7e7ac9994be SHA512 2bd63e07a996f5377bda885e7218fc218fc981bf2a637b3d939ae5913bbffe2a797716b0aaa63e61c7e1384f07712de8683787590649a8f01a424b7f4526502b
-DIST qtsensors-everywhere-src-6.7.2.tar.xz 1497432 BLAKE2B 6bec19a047e8331cc3b7a6f8f3965f4dce0435a57374fb28bb38651dbb6e758727e5e2116d38f2ee6ebb3ca82f935ca9103b1a928514bdb714a0e770751e2c65 SHA512 fcc437407191ea8d56f54bdbef07d0c25f15e1eefa74f5bb2c3a49af4418fb75cd8f7a16a9afc9efcba7e14ed842ca6bddeff6225949e1d193bb6e8ff55fe565
-DIST qtsensors-everywhere-src-6.7.3.tar.xz 1497316 BLAKE2B 5078a62ec46b2b9341b0de6599291dc9934596928e61f2b35ff5a1ec8084b884f57877db05a851a84408464a3b92f06897d83e1205858142307511dd67f12e13 SHA512 78ddb7cad68f37e7e6f1206c1f9db1b86ecba0806659a1049b562c45ed94439200230040a441e7e3c8cc5a17460e5e2e236cf42adfa88ff640f8aceb786c2288
 DIST qtsensors-everywhere-src-6.8.1.tar.xz 1498024 BLAKE2B 6ca4548fb62e7f44a8cb23178c586f3f0b1f828e506077f3345f96b103ae9443048a00a62bf50455c7180425aa46adbc50a24cc5f1e736cc236c5034391b6fe1 SHA512 565a332120c134099e8fbc7ba3fd1073046d512d8b5523bde3a2f4d353febc6a2a3839410f290ddeff05341fe37b0c8bd4dc4d0e990fa4c43918b944f10884e3
diff --git a/dev-qt/qtsensors/qtsensors-6.7.2.ebuild b/dev-qt/qtsensors/qtsensors-6.7.2.ebuild
deleted file mode 100644
index d1c5cf9d6455..000000000000
--- a/dev-qt/qtsensors/qtsensors-6.7.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Hardware sensor access library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[dbus]
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtsensors/qtsensors-6.7.3.ebuild b/dev-qt/qtsensors/qtsensors-6.7.3.ebuild
deleted file mode 100644
index 7a5e783d146f..000000000000
--- a/dev-qt/qtsensors/qtsensors-6.7.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Hardware sensor access library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[dbus]
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index e99cd80f0ade..742ba98a3f6f 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,4 +1,2 @@
 DIST qtserialbus-everywhere-opensource-src-5.15.16.tar.xz 350832 BLAKE2B 8faaa6b4d41a2ad395dec85116a5d251489b5d982fec0edcd5ab7c51b4224a1776935a6c182421eccc275f9b297edb01aaa76458cc0dcd7c2b0002dfb224d71c SHA512 7153d0d14545394c4217d0fff62b508358335f87cfa873955f7a6618773fb796231636fd73d681f6105e3d7f6ed1b18ffd59b831c6053afc91ea625b584cec7a
-DIST qtserialbus-everywhere-src-6.7.2.tar.xz 547596 BLAKE2B de990e57a8139e540d906ba11a4a396db8bf5c6f719e366585251e513364cbd531bf8a31638b29aec0bc8fb5c2208745395de07569a5358c918b0c95c40f1656 SHA512 ba4d8c698e68508080f851d96428908b83f3d2f5d36dbcb00586567beb3001a8ca3f1d79fd9895aefb32c7d1a8400024e43cee2cdd4f427e80d47949593a3055
-DIST qtserialbus-everywhere-src-6.7.3.tar.xz 547720 BLAKE2B dbc7dd8f9a3aeed0b515a10a4d7f261ae1ceec101543c5cfd57324ba7a562296fe83d0b978f61b321cfdb22b3fc595a962a392e666fe5b137aa31d67ca955ca3 SHA512 fb032e65392ea6ee5e3edfe4dccbae3514493dca8fa5b3ffada18f0ce661475f847bc27e4c49573d360d55ed1bd17d4bb7e5faf5a31fc169a6984070c8fd8cae
 DIST qtserialbus-everywhere-src-6.8.1.tar.xz 548316 BLAKE2B 71fd63a50d15fd2c447f5585e8013cc0ecbdd2825a676ab40ab8e449b786a135ca2bcbcfd7def68ee8150aa4c80c81fb5bb620d2394b8654f6f0e814e96be179 SHA512 7b024b28b5c5615e1f1795f7fc60c9271a5fe0eeea6e63fb1a8121be2edf572877b0b03ab5e90699a297138b52ad3c619acde3bb6adb699b8a139e5f75edeb73
diff --git a/dev-qt/qtserialbus/qtserialbus-6.7.2.ebuild b/dev-qt/qtserialbus/qtserialbus-6.7.2.ebuild
deleted file mode 100644
index f545d9e396f3..000000000000
--- a/dev-qt/qtserialbus/qtserialbus-6.7.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network]
-	~dev-qt/qtserialport-${PV}:6
-"
-DEPEND="${RDEPEND}"
-
-CMAKE_SKIP_TESTS=(
-	# rarely fails randomly (perhaps related to -j)
-	tst_qcandbcfileparser
-)
-
-src_install() {
-	qt6-build_src_install
-
-	if use test; then
-		local delete=( # sigh
-			"${D}${QT6_LIBDIR}"/cmake/Qt6SerialBus/*TestCanBusPlugin*.cmake
-			"${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_qttestcanbus.pri
-			"${D}${QT6_PLUGINDIR}"/canbus/libqttestcanbus.*
-			"${D}${QT6_PLUGINDIR}"/canbus/objects-*/
-		)
-		# using -f given not tracking which tests may be skipped or not
-		rm -rf -- "${delete[@]}" || die
-	fi
-}
diff --git a/dev-qt/qtserialbus/qtserialbus-6.7.3.ebuild b/dev-qt/qtserialbus/qtserialbus-6.7.3.ebuild
deleted file mode 100644
index f545d9e396f3..000000000000
--- a/dev-qt/qtserialbus/qtserialbus-6.7.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network]
-	~dev-qt/qtserialport-${PV}:6
-"
-DEPEND="${RDEPEND}"
-
-CMAKE_SKIP_TESTS=(
-	# rarely fails randomly (perhaps related to -j)
-	tst_qcandbcfileparser
-)
-
-src_install() {
-	qt6-build_src_install
-
-	if use test; then
-		local delete=( # sigh
-			"${D}${QT6_LIBDIR}"/cmake/Qt6SerialBus/*TestCanBusPlugin*.cmake
-			"${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_qttestcanbus.pri
-			"${D}${QT6_PLUGINDIR}"/canbus/libqttestcanbus.*
-			"${D}${QT6_PLUGINDIR}"/canbus/objects-*/
-		)
-		# using -f given not tracking which tests may be skipped or not
-		rm -rf -- "${delete[@]}" || die
-	fi
-}
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 1fc3b103cad6..4db255de7edd 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,4 +1,2 @@
 DIST qtserialport-everywhere-opensource-src-5.15.16.tar.xz 314732 BLAKE2B 2464d81ce8bafd82164b61586dbda7faf0258c28538356bc6449e439705e4bb1d4b5a18efe165c99cc79dfd1deaa4c6eddf55ae2fa448c7646c16a03ee6b6f99 SHA512 d386d528aacce7d4e015110d814e852511db83a3648bc68116e4d300168ac826e83a145d9dd38e4a40ec2d4fd48ba89ac1eb9558afb895f7b39271ad760f2b17
-DIST qtserialport-everywhere-src-6.7.2.tar.xz 271320 BLAKE2B 14283d2a7452a828e5b238003ed1762d0c502b9abab9d42af4f56b5aad29d5f26a263fc8f9d68988b2d4b038c1169b0a8999cc5aacb2af67a43a643103f40700 SHA512 faedff39212a98e6b3d96e0fb530c6b63c5fec519f5226b015771b8c5122528c8b087b6ccf74aed42ee87f61ffe324ac5c87152dad282395013a84e3f5cb2d3f
-DIST qtserialport-everywhere-src-6.7.3.tar.xz 271372 BLAKE2B 9cc971aba45fcf97f7c73922991fc68902422ac9017ce206638c946c3c10f733b6bef5764e86e489984fac72a62f84d0a33c0c41f83d8e396fc04937446d6ec2 SHA512 b5296a1494b9601d29b74518abade07274559eb2cade9cedd10e922bede0e759334a6982d799ea2438b0e3940e122a43fc07e0250e273d97c0307f9d9f0cac5b
 DIST qtserialport-everywhere-src-6.8.1.tar.xz 273504 BLAKE2B c0dee1ae704b2d5a4651e805b4b9f84fe6f49ed791644c7e59e9b3c03cb50d89f93b052b0924ce21194a12d9ebbe644cb481d955f3f4a5342ec803cde3b414fa SHA512 3f70261905557330fc2d32f555b0d8bf6abb022030a860f7fad45fcb2489486dcee87d24a624d12526f2a4fc9a73fa55d123db28dc83cf24be33fb0812709cfb
diff --git a/dev-qt/qtserialport/qtserialport-6.7.2.ebuild b/dev-qt/qtserialport/qtserialport-6.7.2.ebuild
deleted file mode 100644
index 050871411f2f..000000000000
--- a/dev-qt/qtserialport/qtserialport-6.7.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Serial port abstraction library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6
-	virtual/libudev:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtserialport/qtserialport-6.7.3.ebuild b/dev-qt/qtserialport/qtserialport-6.7.3.ebuild
deleted file mode 100644
index df18d7a46acd..000000000000
--- a/dev-qt/qtserialport/qtserialport-6.7.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Serial port abstraction library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6
-	virtual/libudev:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest
index e44403277c18..931cb9b76a92 100644
--- a/dev-qt/qtshadertools/Manifest
+++ b/dev-qt/qtshadertools/Manifest
@@ -1,3 +1 @@
-DIST qtshadertools-everywhere-src-6.7.2.tar.xz 1111256 BLAKE2B a0bdf6f27882a903819c580c37a3dc7f361101345b66542dda162e99adf9a62983bfa7321881d6dac7e662178a125674606b08973bd55b77743fee19cbad8737 SHA512 b33e55f81d6878518dfe05db8ea3b319614dda10e215784496a61daaf8415fdeed1a3d802efc3cddc4fbca6c9894faf13475b35b3bb7d9a215b91238f9b38233
-DIST qtshadertools-everywhere-src-6.7.3.tar.xz 1111640 BLAKE2B dd1084c88469c881af776d173e9aa126abb550d314830bfe13b97bb9d1f19732e49ca077d4a70c8382c35ea4194988d6ee1c9ad2ade31c88ac442172e9e4e509 SHA512 751c1e321c98a8074a9c071f7484a840ce1b0cee44b0c355c33df0e496d277fa2c1ed26e68d46412fd9c2be6231946d97c57b31601b841f65e4b8dff166e106d
 DIST qtshadertools-everywhere-src-6.8.1.tar.xz 1138644 BLAKE2B 23f51afa195bb330396dada6df3dff9ba60121eccc356f72236aa60521b4669f3ed45ce41d56dc93f86922244a19f001223d27f61e9419f63fa0ea312e86e055 SHA512 774eb2e041b743da12669905bb5b8b4def1100a5b7244172389ce5333bd6d400e39f5c6875c0409390bbf82dbdc606a2254503b0392c16e897198be93ed49b55
diff --git a/dev-qt/qtshadertools/qtshadertools-6.7.2.ebuild b/dev-qt/qtshadertools/qtshadertools-6.7.2.ebuild
deleted file mode 100644
index 8b562ba44b0f..000000000000
--- a/dev-qt/qtshadertools/qtshadertools-6.7.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt APIs and Tools for Graphics Pipelines"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.7.2-gcc15.patch
-)
diff --git a/dev-qt/qtshadertools/qtshadertools-6.7.3.ebuild b/dev-qt/qtshadertools/qtshadertools-6.7.3.ebuild
deleted file mode 100644
index ef01e1690ab7..000000000000
--- a/dev-qt/qtshadertools/qtshadertools-6.7.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt APIs and Tools for Graphics Pipelines"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.7.2-gcc15.patch
-)
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index 9d4c13385a43..2eba929b3b4f 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,5 +1,3 @@
 DIST qtspeech-5.15.16-gentoo-kde-1.tar.xz 1048 BLAKE2B 66a3a3ebdbcf9973a35b26180092d9df2d655f23753ea02ea5868c6fb0bca8bbc2647bf9dad6edb85feb9668e072d480aab94a84ba149fe188aa047d7a92701e SHA512 148372b02124a49a70ba17ab43e562c3373371660806ff625f6cb4553e189c99c4929c92309022ad53975cdf5c7cca33f2f0d2c5586ae5251f2390cc019db28f
 DIST qtspeech-everywhere-opensource-src-5.15.16.tar.xz 95716 BLAKE2B 79e9d960df53c3d26a6770de73e0aee025659202755e28254246baa35988e914f146fb1de4b1bd8c63a9cb23544ed26063943380cf18181403ccafab4b274e89 SHA512 d0ff73b35e6d94751a31b77bcdc084623d947ace092bdddc98f29d79bf932425fd5adbef74edceb4e8dc9065bfda49efa651cef63c72fcb42171ff083b29b335
-DIST qtspeech-everywhere-src-6.7.2.tar.xz 262360 BLAKE2B 0faceb7e8425ccb03574fa6db5a9f8dab967197341fce497fc2600a6200d417dba8b83a6a7616fed7cbce3d2c34b48b77e37814518996f917aeadc7ca628ebff SHA512 f6e598834ab455c9feb5836b0add05802261210be088f7860b746a214a5be7d332a43d7c09bd03eef48d362165f2739b858e966249c061c9ef537346453bd588
-DIST qtspeech-everywhere-src-6.7.3.tar.xz 262376 BLAKE2B 065b50141c712dae2103c0e81dc7dfcd255df502b598e924e0bb3d2498c670dbf71cd2f65da341a6833c7b60a78580ba0bdf68fa9430373fb8587281ceb87a22 SHA512 b2b5a3b67160b75a679701eeac97587add53a1f8c2a2d120a61c54ead1d519d1fb726945fd2d4871b800f028e70f44e1079480322f71e2010c72b675b1cf935f
 DIST qtspeech-everywhere-src-6.8.1.tar.xz 262512 BLAKE2B 65e20f1785d02dc6e0904c2ff47e23c73f5fa2f7fd5ebc62c35a8241963547ccb2a7374b399f6d1fb5bd1047ff7b9b9e147c1fe9f0349cd8f7008bbe4858802e SHA512 a20d89c5bcad354d1896c87bf9c0a401e824b5dcbf0e5c86a72381e8f7f9d5946f10536b7a54d899c2fd6b84018ccd9159be4ffdc84cf2e568b54c688aa1101d
diff --git a/dev-qt/qtspeech/qtspeech-6.7.2.ebuild b/dev-qt/qtspeech/qtspeech-6.7.2.ebuild
deleted file mode 100644
index 246f1b0383b9..000000000000
--- a/dev-qt/qtspeech/qtspeech-6.7.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# tests are kind of flaky, sometimes hang, and also fail with clang
-# (not that it's unusable with clang) -- may be worth revisiting
-# eventually given qtspeech is still somewhat new (added in 6.4.0)
-QT6_RESTRICT_TESTS=1
-
-inherit qt6-build
-
-DESCRIPTION="Text-to-speech library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-fi
-
-IUSE="flite qml +speechd"
-# can build with neither, but then it is just mock tts and may be confusing
-REQUIRED_USE="|| ( flite speechd )"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6
-	~dev-qt/qtmultimedia-${PV}:6
-	flite? ( app-accessibility/flite )
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-	speechd? ( app-accessibility/speech-dispatcher )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature flite)
-		$(qt_feature speechd)
-
-		# flite_alsa was likely to work around old issues in flite, it does
-		# nothing but add -lasound (no code change, and is unneeded)
-		-DQT_FEATURE_flite_alsa=OFF
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtspeech/qtspeech-6.7.3.ebuild b/dev-qt/qtspeech/qtspeech-6.7.3.ebuild
deleted file mode 100644
index c5f70da6bc4a..000000000000
--- a/dev-qt/qtspeech/qtspeech-6.7.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# tests are kind of flaky, sometimes hang, and also fail with clang
-# (not that it's unusable with clang) -- may be worth revisiting
-# eventually given qtspeech is still somewhat new (added in 6.4.0)
-QT6_RESTRICT_TESTS=1
-
-inherit qt6-build
-
-DESCRIPTION="Text-to-speech library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-IUSE="flite qml +speechd"
-# can build with neither, but then it is just mock tts and may be confusing
-REQUIRED_USE="|| ( flite speechd )"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6
-	~dev-qt/qtmultimedia-${PV}:6
-	flite? ( app-accessibility/flite )
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-	speechd? ( app-accessibility/speech-dispatcher )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature flite)
-		$(qt_feature speechd)
-
-		# flite_alsa was likely to work around old issues in flite, it does
-		# nothing but add -lasound (no code change, and is unneeded)
-		-DQT_FEATURE_flite_alsa=OFF
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 3ed131e89e93..ab759d342f13 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,5 +1,3 @@
 DIST qtsvg-5.15.16-gentoo-kde-1.tar.xz 2880 BLAKE2B 43407f054b958e911b23d89baad627a947f305968943149ebe7712ffe76a3f0cb03b4cdc6cee019e46c7dbc6f38d802b48ee472b2d8aac92aba6187aff93ab7b SHA512 01bcc1dba55f32b77eebf8f0a2ca2230ac4d8440f345599846584c19adbdab6038f834f2647c4102ff46d10898b4764f554ca19d3339c6114d9c82760227247c
 DIST qtsvg-everywhere-opensource-src-5.15.16.tar.xz 1881028 BLAKE2B 50bac71738e2f8e7572ca5de1fd198d32db7b5c7ae1432d854b5e40632110359c3b24d1f390b7e80bedaa362a18f4f783b666ab0100ceeee87380843a736e6b5 SHA512 227b6b4f0d6ad7d9405c0bceabadfab28e591b4b02d7575de0ee7679280fc7115ec04751a8e839af5e9958e1800e6d4529bf8bae2251b579abbc688fdb99b9e8
-DIST qtsvg-everywhere-src-6.7.2.tar.xz 1791468 BLAKE2B e72cf5b153141942c7aa92f7433b19317549deacc5d9bf981dd41f80ce25b0bc60c81185eb9134146aa93a6ce830aa3afcaced9e92902b9aa8c4a321718a5f86 SHA512 5a4209134afd3265d4b4b02a388a3078f2f915613c83e8a4aafd292e6b49d77019597f820468c8a9fe6c046c64e6890ac94ebc52e6b321a9b57a5ef3b51552e4
-DIST qtsvg-everywhere-src-6.7.3.tar.xz 1792980 BLAKE2B 0f40b212c942b0e4a60ce6dbd2904d3510d350f0830c7e8703a5f04559c11e8d0d21f511d609724ad5f18f71b751c7d39b35b34206077cf0f9d8faa2420caec5 SHA512 4113d12b3662d37e1119f4f506b3b0c6712fc0718ce7840e92acd300990ad4ac6a753e839b4adc91fc1ef7dc938fc517340f990bd7b89636a42d40a25f8f4bdb
 DIST qtsvg-everywhere-src-6.8.1.tar.xz 2006760 BLAKE2B 352359dd60d363e3afea562b09ddd0939ac56ad05d47590843d78ba697232e2d44b548092f8b28353737f1066165bd792ac1d03f080089970d358000ff40dbaf SHA512 5c345e87b957370521ead10bb2fd02433d75a443021b6cf45a88e35f692a346607636ffaf6651f3d289cf4584e8c5732270173743eb79d048b3c580b9e00ec86
diff --git a/dev-qt/qtsvg/qtsvg-6.7.2.ebuild b/dev-qt/qtsvg/qtsvg-6.7.2.ebuild
deleted file mode 100644
index a715121ada1c..000000000000
--- a/dev-qt/qtsvg/qtsvg-6.7.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build toolchain-funcs
-
-DESCRIPTION="SVG rendering library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,widgets]
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	# tst_QSvgRenderer::testFeColorMatrix (new in 6.7, likely low impact)
-	# is known failing on BE, could use more looking into (bug #935356)
-	[[ $(tc-endian) == big ]] && local CMAKE_SKIP_TESTS=( tst_qsvgrenderer )
-
-	qt6-build_src_test
-}
diff --git a/dev-qt/qtsvg/qtsvg-6.7.3.ebuild b/dev-qt/qtsvg/qtsvg-6.7.3.ebuild
deleted file mode 100644
index bc445782163c..000000000000
--- a/dev-qt/qtsvg/qtsvg-6.7.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build toolchain-funcs
-
-DESCRIPTION="SVG rendering library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,widgets]
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	# tst_QSvgRenderer::testFeColorMatrix (new in 6.7, likely low impact)
-	# is known failing on BE, could use more looking into (bug #935356)
-	[[ $(tc-endian) == big ]] && local CMAKE_SKIP_TESTS=( tst_qsvgrenderer )
-
-	qt6-build_src_test
-}
diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 3d6728aaa925..528299bd9ce1 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,3 +1 @@
-DIST qttools-everywhere-src-6.7.2.tar.xz 9019636 BLAKE2B c4324275adddefc2399ce4ff1305d285c9e4bc7fb6cebf6bd310573773ada5cf91f14561b855df685bdcce0a39897c3b9e0b62544083af2794d7eaaf35660146 SHA512 311467d0e6970711b4d984fe792d2b75609f38c04121073d5c3c34c682fcee89787f6982c886e62206a76b1f647de60e56510439b0288f8bd1ae21a2683a37cd
-DIST qttools-everywhere-src-6.7.3.tar.xz 9022820 BLAKE2B e1eafdbc9a08b031a51480733be38e2b217e66b6f66a49e99e603fa0b6ed780164a403c984069cc33819203edd7984b6a1f8dc5af4ebcad94ecc6730f3f1d604 SHA512 c15a76a84e8cea53e8c68b00325acf2cd3fe8097c578f3e96fbb68958453116f02fed25d2811d4485b82f196b988870f0078aea0450c4526523fb8ffacbfae57
 DIST qttools-everywhere-src-6.8.1.tar.xz 10293192 BLAKE2B f670dcbf624dd32a59ad4e29020a46b745f6fc3cfc07b971c7704e7e63719fef3b226abdc9d3b8f9ff054659fde03633c2aa05ae487f12ee4a3ef44db356a252 SHA512 1f5eb44e86d400858abe21efcadb27537ae213127078d95ee56792b57923573e55fd850042e63ca547cd27ba199196fe9956646dcb285c6f6976a22a7832db52
diff --git a/dev-qt/qttools/qttools-6.7.2.ebuild b/dev-qt/qttools/qttools-6.7.2.ebuild
deleted file mode 100644
index 7c2fc972d872..000000000000
--- a/dev-qt/qttools/qttools-6.7.2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum
-LLVM_OPTIONAL=1
-
-# behaves very badly when qttools is not already installed, also
-# other issues to handle (clang tests flaky depending on version,
-# and 3rdparty/ tries to FetchContent gtest)
-QT6_RESTRICT_TESTS=1
-
-inherit desktop llvm-r1 optfeature qt6-build
-
-DESCRIPTION="Qt Tools Collection"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-IUSE="
-	+assistant clang designer distancefieldgenerator gles2-only
-	+linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner
-	qtdiag qtplugininfo vulkan +widgets zstd
-"
-# note that some tools do not *require* widgets but will skip a sub-tool
-# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
-REQUIRED_USE="
-	assistant? ( widgets )
-	clang? ( ${LLVM_REQUIRED_USE} )
-	designer? ( qml widgets )
-	distancefieldgenerator? ( qml widgets )
-	pixeltool? ( widgets )
-	qdoc? ( clang qml )
-"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network,widgets?]
-	assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
-	clang? (
-		$(llvm_gen_dep '
-			llvm-core/clang:${LLVM_SLOT}=
-			llvm-core/llvm:${LLVM_SLOT}=
-		')
-	)
-	designer? (
-		~dev-qt/qtbase-${PV}:6[xml,zstd=]
-		zstd? ( app-arch/zstd:= )
-	)
-	qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
-	qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
-	widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
-"
-DEPEND="
-	${RDEPEND}
-	qtdiag? (
-		vulkan? ( dev-util/vulkan-headers )
-	)
-"
-
-pkg_setup() {
-	use clang && llvm-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# prevent the clang test as it can abort due to bug #916098
-		$(cmake_use_find_package clang WrapLibClang)
-		$(cmake_use_find_package qml Qt6Qml)
-		$(cmake_use_find_package widgets Qt6Widgets)
-		$(qt_feature assistant)
-		$(qt_feature clang)
-		$(qt_feature designer)
-		$(qt_feature distancefieldgenerator)
-		$(qt_feature linguist)
-		$(qt_feature pixeltool)
-		$(qt_feature qdbus)
-		$(qt_feature qdoc)
-		$(qt_feature qtattributionsscanner)
-		$(qt_feature qtdiag)
-		$(qt_feature qtplugininfo)
-
-		# TODO?: package litehtml, but support for latest releases seem
-		# to lag behind and bundled may work out better for now
-		# https://github.com/litehtml/litehtml/issues/266
-		$(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
-
-		$(usev designer -DQT_UNITY_BUILD=OFF) # fails to build (QTBUG-122634)
-	)
-
-	qt6-build_src_configure
-}
-
-src_install() {
-	qt6-build_src_install
-
-	if use widgets; then #914766
-		use designer || use distancefieldgenerator || use pixeltool &&
-			newicon src/designer/src/designer/images/designer.png designer6.png
-
-		if use assistant; then
-			make_desktop_entry assistant6 'Qt 6 Assistant' assistant6 \
-				'Qt;Development;Documentation' \
-				'Comment=Tool for viewing online documentation in Qt help file format'
-			newicon src/assistant/assistant/images/assistant-128.png assistant6.png
-		fi
-
-		if use designer; then
-			make_desktop_entry designer6 'Qt 6 Designer' designer6 \
-				'Qt;Development;GUIDesigner' \
-				'Comment=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets'
-		fi
-
-		if use distancefieldgenerator; then
-			# no icon, sharing with designer which fits letter-wise
-			make_desktop_entry qdistancefieldgenerator6 'Qt 6 Distance Field Generator' designer6 \
-				'Qt;Development' \
-				'Comment=Tool for pregenerating the font cache of Qt applications'
-		fi
-
-		if use linguist; then
-			make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \
-				'Qt;Development;Translation' \
-				'Comment=Tool for translating Qt applications'
-			newicon src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png
-		fi
-
-		if use pixeltool; then
-			# no icon, not fitting but share with designer for now
-			make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' designer6 \
-				'Qt;Development' \
-				'Comment=Tool for zooming in the desktop area pointed by the cursor'
-		fi
-
-		if use qdbus; then
-			make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' qdbusviewer6 \
-				'Qt;Development' \
-				'Comment=Tool that lets introspect D-Bus objects and messages'
-			newicon src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png
-		fi
-
-		# hack: make_destop_entry does not support overriding DESCRIPTION
-		find "${ED}" -type f -name "*.desktop" \
-			-exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die
-	fi
-}
-
-pkg_postinst() {
-	use assistant &&
-		optfeature "Qt documentation viewable in assistant" \
-			'dev-qt/qt-docs:6[qch]' #602296
-}
diff --git a/dev-qt/qttools/qttools-6.7.3.ebuild b/dev-qt/qttools/qttools-6.7.3.ebuild
deleted file mode 100644
index 35144aef699c..000000000000
--- a/dev-qt/qttools/qttools-6.7.3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum
-LLVM_OPTIONAL=1
-
-# behaves very badly when qttools is not already installed, also
-# other issues to handle (clang tests flaky depending on version,
-# and 3rdparty/ tries to FetchContent gtest)
-QT6_RESTRICT_TESTS=1
-
-inherit desktop llvm-r1 optfeature qt6-build
-
-DESCRIPTION="Qt Tools Collection"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-IUSE="
-	+assistant clang designer distancefieldgenerator gles2-only
-	+linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner
-	qtdiag qtplugininfo vulkan +widgets zstd
-"
-# note that some tools do not *require* widgets but will skip a sub-tool
-# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
-REQUIRED_USE="
-	assistant? ( widgets )
-	clang? ( ${LLVM_REQUIRED_USE} )
-	designer? ( qml widgets )
-	distancefieldgenerator? ( qml widgets )
-	pixeltool? ( widgets )
-	qdoc? ( clang qml )
-"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[widgets?]
-	assistant? ( ~dev-qt/qtbase-${PV}:6[network,sql,sqlite] )
-	clang? (
-		$(llvm_gen_dep '
-			llvm-core/clang:${LLVM_SLOT}=
-			llvm-core/llvm:${LLVM_SLOT}=
-		')
-	)
-	designer? (
-		~dev-qt/qtbase-${PV}:6[network,xml,zstd=]
-		zstd? ( app-arch/zstd:= )
-	)
-	qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
-	qtdiag? ( ~dev-qt/qtbase-${PV}:6[network,gles2-only=,vulkan=] )
-	widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
-"
-DEPEND="
-	${RDEPEND}
-	qtdiag? (
-		vulkan? ( dev-util/vulkan-headers )
-	)
-"
-
-pkg_setup() {
-	use clang && llvm-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# prevent the clang test as it can abort due to bug #916098
-		$(cmake_use_find_package clang WrapLibClang)
-		$(cmake_use_find_package qml Qt6Qml)
-		$(cmake_use_find_package widgets Qt6Widgets)
-		$(qt_feature assistant)
-		$(qt_feature clang)
-		$(qt_feature designer)
-		$(qt_feature distancefieldgenerator)
-		$(qt_feature linguist)
-		$(qt_feature pixeltool)
-		$(qt_feature qdbus)
-		$(qt_feature qdoc)
-		$(qt_feature qtattributionsscanner)
-		$(qt_feature qtdiag)
-		$(qt_feature qtplugininfo)
-
-		# TODO?: package litehtml, but support for latest releases seem
-		# to lag behind and bundled may work out better for now
-		# https://github.com/litehtml/litehtml/issues/266
-		$(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
-
-		$(usev designer -DQT_UNITY_BUILD=OFF) # fails to build (QTBUG-122634)
-	)
-
-	qt6-build_src_configure
-}
-
-src_install() {
-	qt6-build_src_install
-
-	if use widgets; then #914766
-		use designer || use distancefieldgenerator || use pixeltool &&
-			newicon src/designer/src/designer/images/designer.png designer6.png
-
-		if use assistant; then
-			make_desktop_entry assistant6 'Qt 6 Assistant' assistant6 \
-				'Qt;Development;Documentation' \
-				'Comment=Tool for viewing online documentation in Qt help file format'
-			newicon src/assistant/assistant/images/assistant-128.png assistant6.png
-		fi
-
-		if use designer; then
-			make_desktop_entry designer6 'Qt 6 Designer' designer6 \
-				'Qt;Development;GUIDesigner' \
-				'Comment=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets'
-		fi
-
-		if use distancefieldgenerator; then
-			# no icon, sharing with designer which fits letter-wise
-			make_desktop_entry qdistancefieldgenerator6 'Qt 6 Distance Field Generator' designer6 \
-				'Qt;Development' \
-				'Comment=Tool for pregenerating the font cache of Qt applications'
-		fi
-
-		if use linguist; then
-			make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \
-				'Qt;Development;Translation' \
-				'Comment=Tool for translating Qt applications'
-			newicon src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png
-		fi
-
-		if use pixeltool; then
-			# no icon, not fitting but share with designer for now
-			make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' designer6 \
-				'Qt;Development' \
-				'Comment=Tool for zooming in the desktop area pointed by the cursor'
-		fi
-
-		if use qdbus; then
-			make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' qdbusviewer6 \
-				'Qt;Development' \
-				'Comment=Tool that lets introspect D-Bus objects and messages'
-			newicon src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png
-		fi
-
-		# hack: make_destop_entry does not support overriding DESCRIPTION
-		find "${ED}" -type f -name "*.desktop" \
-			-exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die
-	fi
-}
-
-pkg_postinst() {
-	use assistant &&
-		optfeature "Qt documentation viewable in assistant" \
-			'dev-qt/qt-docs:6[qch]' #602296
-}
diff --git a/dev-qt/qttools/qttools-6.8.1.ebuild b/dev-qt/qttools/qttools-6.8.1.ebuild
index 75971ea96c1a..7f580d0836cb 100644
--- a/dev-qt/qttools/qttools-6.8.1.ebuild
+++ b/dev-qt/qttools/qttools-6.8.1.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 @@ LLVM_OPTIONAL=1
 # and 3rdparty/ tries to FetchContent gtest)
 QT6_RESTRICT_TESTS=1
 
-inherit desktop llvm-r1 optfeature qt6-build
+inherit desktop llvm-r2 optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
 
@@ -62,11 +62,9 @@ DEPEND="
 	)
 "
 
-pkg_setup() {
-	use clang && llvm-r1_pkg_setup
-}
-
 src_configure() {
+	use clang && llvm_chost_setup
+
 	local mycmakeargs=(
 		# prevent the clang test as it can abort due to bug #916098
 		$(cmake_use_find_package clang WrapLibClang)
diff --git a/dev-qt/qttools/qttools-6.8.9999.ebuild b/dev-qt/qttools/qttools-6.8.9999.ebuild
index 94d7719b638f..8f4634e0ffca 100644
--- a/dev-qt/qttools/qttools-6.8.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.8.9999.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 @@ LLVM_OPTIONAL=1
 # and 3rdparty/ tries to FetchContent gtest)
 QT6_RESTRICT_TESTS=1
 
-inherit desktop llvm-r1 optfeature qt6-build
+inherit desktop llvm-r2 optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
 
@@ -62,11 +62,9 @@ DEPEND="
 	)
 "
 
-pkg_setup() {
-	use clang && llvm-r1_pkg_setup
-}
-
 src_configure() {
+	use clang && llvm_chost_setup
+
 	local mycmakeargs=(
 		# prevent the clang test as it can abort due to bug #916098
 		$(cmake_use_find_package clang WrapLibClang)
diff --git a/dev-qt/qttools/qttools-6.9.9999.ebuild b/dev-qt/qttools/qttools-6.9.9999.ebuild
index 94d7719b638f..8f4634e0ffca 100644
--- a/dev-qt/qttools/qttools-6.9.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9.9999.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 @@ LLVM_OPTIONAL=1
 # and 3rdparty/ tries to FetchContent gtest)
 QT6_RESTRICT_TESTS=1
 
-inherit desktop llvm-r1 optfeature qt6-build
+inherit desktop llvm-r2 optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
 
@@ -62,11 +62,9 @@ DEPEND="
 	)
 "
 
-pkg_setup() {
-	use clang && llvm-r1_pkg_setup
-}
-
 src_configure() {
+	use clang && llvm_chost_setup
+
 	local mycmakeargs=(
 		# prevent the clang test as it can abort due to bug #916098
 		$(cmake_use_find_package clang WrapLibClang)
diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild
index 94d7719b638f..8f4634e0ffca 100644
--- a/dev-qt/qttools/qttools-6.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9999.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 @@ LLVM_OPTIONAL=1
 # and 3rdparty/ tries to FetchContent gtest)
 QT6_RESTRICT_TESTS=1
 
-inherit desktop llvm-r1 optfeature qt6-build
+inherit desktop llvm-r2 optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
 
@@ -62,11 +62,9 @@ DEPEND="
 	)
 "
 
-pkg_setup() {
-	use clang && llvm-r1_pkg_setup
-}
-
 src_configure() {
+	use clang && llvm_chost_setup
+
 	local mycmakeargs=(
 		# prevent the clang test as it can abort due to bug #916098
 		$(cmake_use_find_package clang WrapLibClang)
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 44643740b616..1e9ee8e7c89e 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,4 +1,2 @@
 DIST qttranslations-everywhere-opensource-src-5.15.16.tar.xz 1626988 BLAKE2B 94ba45fff3007b5635bf6c5b904820d3ebdf9b4dc7448b3e12e35f4d52f8d789fe3c887dc43b061d00fda088b640e0fd68d4864ec21dbb1efbe1fe274ac30250 SHA512 9702390b89696211b1d85a11143e3432231085c2d96b298ea584f43e8db215bf5cdb5fb5355c8c4d900d1f761dfd3dc0d5c16df2ed0cca483557f8b867e3b2ac
-DIST qttranslations-everywhere-src-6.7.2.tar.xz 1547608 BLAKE2B 93d6dcd62a0dd4210be5d0f00957dd89d32d6362d8e3a1459eb819d32eeb05f354185df4ae8cc2fe705b0b964f73dbf01ed5b8d8fd89c679f99cb2953a065505 SHA512 a1937f117af71a6896ebaf89f05bcb9c61c34711105609ac80a0f85d96cd427786e902ae4e2dccc38060c4fd9161f42a0cfdd7e39e618e3996fbe1c7f05c84d9
-DIST qttranslations-everywhere-src-6.7.3.tar.xz 1547944 BLAKE2B c6e1a57ed440e78a1de132da53ef045bf6243aa50e5061abea98f0958d3cb8d5b64dae9b494a1f7f2ec382eb638a4e6dea94bf7a52c15338c0f035297fb67756 SHA512 06c9ac70c77de52e750315bb74c5ad580c154805b924a95387bbac1297ca04df643f69e3ada74bd027071b179cf009927a1c0db8825104bb355036402092c405
 DIST qttranslations-everywhere-src-6.8.1.tar.xz 1550288 BLAKE2B 370ad4cb98e3ed3b59d51c2835fea88717f31e052b5566119b5ad9a98f6b0d9c610435e9bd6024ec7ddda852a883d885725ed34ed23a5b125a4cbac087a5945d SHA512 4b4f62e45c6d53cf53bb89497314d805cbd9ca24bdefb10c4f0888e943d80b17563886dc56195b07fbaf3d1c8ad0e76a1dfcc3c765341fb3ded314eee71659d3
diff --git a/dev-qt/qttranslations/qttranslations-6.7.2.ebuild b/dev-qt/qttranslations/qttranslations-6.7.2.ebuild
deleted file mode 100644
index ad7190f23db2..000000000000
--- a/dev-qt/qttranslations/qttranslations-6.7.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT6_RESTRICT_TESTS=1 # no tests
-inherit qt6-build
-
-DESCRIPTION="Translation files for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-DEPEND="~dev-qt/qtbase-${PV}:6"
-BDEPEND="~dev-qt/qttools-${PV}:6[linguist]"
diff --git a/dev-qt/qttranslations/qttranslations-6.7.3.ebuild b/dev-qt/qttranslations/qttranslations-6.7.3.ebuild
deleted file mode 100644
index 45a5849487c9..000000000000
--- a/dev-qt/qttranslations/qttranslations-6.7.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT6_RESTRICT_TESTS=1 # no tests
-inherit qt6-build
-
-DESCRIPTION="Translation files for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-DEPEND="~dev-qt/qtbase-${PV}:6"
-BDEPEND="~dev-qt/qttools-${PV}:6[linguist]"
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index 1242aa50805b..fb6dac429eab 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,4 +1,2 @@
 DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.16.tar.xz 10951872 BLAKE2B 5e05b68162e779df73c209f959bb641b7c4eb20badf8299fa7277c99b86e4462fe6d5f98c2c9ae1bc49f4995b61eb0132428409a3286d24232f20cb214686996 SHA512 af7ca963784773b94bfed000cabf5dbfb6363211d6b2601ccb6aed26eccd2eaa1e34dc8e7a6f1bbc678432f4086284df82c66e8da1c7fc7c8f5ec37983f687b9
-DIST qtvirtualkeyboard-everywhere-src-6.7.2.tar.xz 3722296 BLAKE2B 316ee5e2204ebabd97c0d6ceb8bd9775bc456eb404f6ffee43a163823c43d86a94e900a06d8a1124506385aa8b17d67efd70caec64cded9dcd747d667186c9fd SHA512 016400a65e14a5ec960f20ecf6b2b7c32fa0c67d530c5046b423633b02efce200e0967642a072ff825c54c334dfe45be3e569c16d641a735f181d233fa414782
-DIST qtvirtualkeyboard-everywhere-src-6.7.3.tar.xz 3720000 BLAKE2B fb01edae53fd2b1f67cc33533dc5baf91c6a84bfe9f51c40bdb6f1b00dbe07287359fedc95af294686789d896cc64e5b2cd07f4b0515a3c99cf954db53a04a49 SHA512 cc08560c565289c43e9e89f247f9eb26eed6d678892681310728c639f6f70bdaa5947b436dfce437b8e0dd9d9386229a391f19587080f043e41a53f4fcf06067
 DIST qtvirtualkeyboard-everywhere-src-6.8.1.tar.xz 3264444 BLAKE2B 72632e771aa9dcf3134c8eaa4b54917a70332797273899da18ee36ff71cd68af4758a214c51e7bf3ff4e2354345ea03f559099148e37cf79786c56b5e985bdde SHA512 be90765c490285638c9ed50a4cf666419f178c68f4bf8f0679a77fa4bc240fa31f36335197877813abb52ae70e9c2ec22548824add69aa5d1df14529517fef08
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.2.ebuild
deleted file mode 100644
index 8c917e41434e..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-fi
-
-IUSE="+spell"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui]
-	~dev-qt/qtdeclarative-${PV}:6
-	~dev-qt/qtsvg-${PV}:6
-	spell? ( app-text/hunspell:= )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(qt_feature spell hunspell)
-		-DINPUT_vkb_handwriting=no # neither cerence nor myscript are packaged
-	)
-
-	qt6-build_src_configure
-}
-
-src_test() {
-	local CMAKE_SKIP_TESTS=(
-		# rarely randomly(?) fails even with -j1
-		tst_layoutfilesystem
-	)
-
-	if use spell && has_version app-dicts/myspell-en; then
-		# 99% pass but minor sub-tests fail with myspell-en, needs looking into
-		ewarn "Warning: notable tests were skipped due to ${_} being installed"
-		CMAKE_SKIP_TESTS+=(
-			tst_inputpanel
-			tst_inputpanelcontrols2
-		)
-	else
-		einfo "tst_inputpanel can take >5mins, not known to actually hang"
-	fi
-
-	qt6-build_src_test
-}
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.3.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.3.ebuild
deleted file mode 100644
index 3b93e5446893..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-IUSE="+spell"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui]
-	~dev-qt/qtdeclarative-${PV}:6
-	~dev-qt/qtsvg-${PV}:6
-	spell? ( app-text/hunspell:= )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(qt_feature spell hunspell)
-		-DINPUT_vkb_handwriting=no # neither cerence nor myscript are packaged
-	)
-
-	qt6-build_src_configure
-}
-
-src_test() {
-	local CMAKE_SKIP_TESTS=(
-		# rarely randomly(?) fails even with -j1
-		tst_layoutfilesystem
-	)
-
-	if use spell && has_version app-dicts/myspell-en; then
-		# 99% pass but minor sub-tests fail with myspell-en, needs looking into
-		ewarn "Warning: notable tests were skipped due to ${_} being installed"
-		CMAKE_SKIP_TESTS+=(
-			tst_inputpanel
-			tst_inputpanelcontrols2
-		)
-	else
-		einfo "tst_inputpanel can take >5mins, not known to actually hang"
-	fi
-
-	qt6-build_src_test
-}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 3f8669b68832..711a0b2d52b0 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,5 +1,3 @@
 DIST qtwayland-5.15.16-gentoo-kde-2.tar.xz 47116 BLAKE2B 30646c02214167b1891b84873f7d10812d3aa1894db1a246771a2df2a799d1768c857a623153d862e15f6a7ed7b784738c8afdc5f4968e57a7e2296735d69876 SHA512 c3af344eb647fb16f1237387345ee4e56e2efa7376f10d46d09de34c77add092cb50acf29d180fa61ab33331fee959ab187339b05b6fa0b9d4fda6f0c28b600b
 DIST qtwayland-everywhere-opensource-src-5.15.16.tar.xz 561148 BLAKE2B a095051245e0ba0f0a27c7da703628e67b30465e12de06c1662dea3a3d74163cc67baa004f0cbab01bf5b70c6d2bdea289278859b2713a00f595cc51bb6f654a SHA512 9ce2bca54aa0e17be17383fccd6caca721db5b54f8905ec86cf871ed0e2414e6bc86878b9cc5167c322153467076b2afdcd6163a8fb2feb6b19cef11c3a29247
-DIST qtwayland-everywhere-src-6.7.2.tar.xz 1123220 BLAKE2B 70c2d8942afc4e1629d2ef34b6c062ecb5800185bb37e150c1d66a5216606028d2f59668991bddb5036572c962e92c3658d336167a7f9ffbf3d2f4d609a771f9 SHA512 2cd4f45f05ae60bc7f82b94f2e9c217ee4b8322f60381e1b079b90e0687e51cfbeb10b5dd724e1cca7e422b1b101d2b91c0ee47b1a732411cef330fb052c97c2
-DIST qtwayland-everywhere-src-6.7.3.tar.xz 1123508 BLAKE2B 39cd8c7d2486318d3eb4351dc0e4e6a2c37e0aeb9727e2715accfec7ba2710288c251fdd5d6a71ba11c065509f7312c194a8e2b757d484ec1734270044e0d7aa SHA512 9e15f3798ae7738b69e367343ffd7992fcdaebeffbcb10414fe2f24be553ca63e5504ef0a8405348702d0581dabebd1c2360728f63757c7445900b04df5e9ad7
 DIST qtwayland-everywhere-src-6.8.1.tar.xz 1134428 BLAKE2B 84ebe923a3963f47bb2abe67e942524020be4d202b441d7cca689d045b7a7ca28b433df5a189da766743c6817a327b6ba80ceb7916a99b3ba9b0508daede4147 SHA512 34885910532f6049cac09846aa4295e2ce82a1e6af2d3256391c835a406f0c6f679e9c94c06ca8921acf23036ccc747812631a91dc1f355ab20aafd8836e7312
diff --git a/dev-qt/qtwayland/files/qtwayland-6.7.2-drag-drop.patch b/dev-qt/qtwayland/files/qtwayland-6.7.2-drag-drop.patch
deleted file mode 100644
index 6141d95cb834..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-6.7.2-drag-drop.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Backport from upcoming 6.7.3[1][2] for [3][4].
-
-[1] https://github.com/qt/qtwayland/commit/85ec3ae70b905ddf9e16d86c468446d74867743f
-[2] https://codereview.qt-project.org/c/qt/qtwayland/+/565408
-[3] https://bugs.kde.org/show_bug.cgi?id=482770
-[4] https://bugs.kde.org/show_bug.cgi?id=490059
-
-From: =?UTF-8?q?Niccol=C3=B2=20Venerandi?= <niccolo@venerandi.com>
-Date: Mon, 3 Jun 2024 12:19:59 +0200
-Subject: [PATCH] Emit a LeaveEvent on drag and drop start
-
-All focused windows will now receive a LeaveEvent when a drag and drop starts.
-This makes sure that the dragged element does not preserve any hover decoration
-during the drag and drop, and that other elements that happen to take place
-of the dragged elements don't become hovered too.
---- a/src/client/qwaylanddnd.cpp
-+++ b/src/client/qwaylanddnd.cpp
-@@ -29,4 +29,9 @@
- void QWaylandDrag::startDrag()
- {
-+    // Some compositors do not send a pointer leave before starting a drag, some do.
-+    // This is discussed upstream at: https://gitlab.freedesktop.org/wayland/wayland/-/issues/444
-+    // For consistency between compositors we emit the leave event here, upon drag start.
-+    m_display->currentInputDevice()->handleStartDrag();
-+
-     QBasicDrag::startDrag();
-     QWaylandWindow *icon = static_cast<QWaylandWindow *>(shapedPixmapWindow()->handle());
---- a/src/client/qwaylandinputdevice.cpp
-+++ b/src/client/qwaylandinputdevice.cpp
-@@ -524,4 +524,10 @@
- }
- 
-+void QWaylandInputDevice::handleStartDrag()
-+{
-+    if (mPointer)
-+        mPointer->leavePointers();
-+}
-+
- #if QT_CONFIG(wayland_datadevice)
- void QWaylandInputDevice::setDataDevice(QWaylandDataDevice *device)
-@@ -880,4 +886,12 @@
-         window->handleMouse(mParent, e);
-     }
-+}
-+
-+void QWaylandInputDevice::Pointer::leavePointers()
-+{
-+    if (auto *window = focusWindow()) {
-+        LeaveEvent e(focusWindow(), mSurfacePos, mGlobalPos);
-+        window->handleMouse(mParent, e);
-+    }
- }
- 
---- a/src/client/qwaylandinputdevice_p.h
-+++ b/src/client/qwaylandinputdevice_p.h
-@@ -93,4 +93,5 @@
-     void setCursor(const QCursor *cursor, const QSharedPointer<QWaylandBuffer> &cachedBuffer = {}, int fallbackOutputScale = 1);
- #endif
-+    void handleStartDrag();
-     void handleEndDrag();
- 
-@@ -321,4 +322,5 @@
- public:
-     void releaseButtons();
-+    void leavePointers();
- 
-     QWaylandInputDevice *mParent = nullptr;
diff --git a/dev-qt/qtwayland/files/qtwayland-6.7.2-null-screen.patch b/dev-qt/qtwayland/files/qtwayland-6.7.2-null-screen.patch
deleted file mode 100644
index 6a7e85a8f4b6..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-6.7.2-null-screen.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Backport of [1] for [2], will be fixed in qtwayland-6.7.3.
-
-[1] https://codereview.qt-project.org/c/qt/qtwayland/+/576718
-[2] https://bugs.kde.org/show_bug.cgi?id=489072
-
-From: David Edmundson <davidedmundson@kde.org>
-Date: Wed, 10 Jul 2024 09:00:33 +0100
-Subject: [PATCH] client: Guard against windows being on a null screen
-
-calculateScreenFromSurfaceEvents uses the screen information from our
-surface enter events. If this is not set yet, or refers to outputs not
-yet complete we fall back to the QWindow::screen. This was introduced in
-e03613524fc9f6be5c4cd7e9bdb00bc09c7f1e0b.
-
-It was assumed that this would always be a valid value as QtBase keeps
-it updated, but there are apparently paths for it to still be null.
-
-It will be evaluated again when the surface receives a wl_enter event or
-the output that we have entered is finally initialised and we will then
-be marked as on the correct screen.
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -1406,5 +1406,5 @@
-     QPlatformScreen *newScreen = calculateScreenFromSurfaceEvents();
- 
--    if (newScreen->screen() == window()->screen())
-+    if (!newScreen || newScreen->screen() == window()->screen())
-         return;
- 
diff --git a/dev-qt/qtwayland/files/qtwayland-6.7.2-plasma-popup.patch b/dev-qt/qtwayland/files/qtwayland-6.7.2-plasma-popup.patch
deleted file mode 100644
index 25c7918a5a8b..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-6.7.2-plasma-popup.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Fixed in qtwayland-6.7.3
-
-https://mail.kde.org/pipermail/distributions/2024-July/001512.html
-https://invent.kde.org/qt/qt/qtwayland/-/commit/92bcb8f6b7a852c7a5d662fc34de561692a7a454
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Thu, 20 Jun 2024 11:25:06 +0300
-Subject: [PATCH] Client: Ensure that guessed popup parent has a shell surface
-
-The last input window may not have a shell surface if it is a subsurface
-or that window has been just made invisible.
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -1157,8 +1157,10 @@ QWaylandWindow *QWaylandWindow::guessTransientParent() const
-             return mTopPopup;
-     }
- 
--    if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup)
--        return display()->lastInputWindow();
-+    if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup) {
-+        if (auto lastInputWindow = display()->lastInputWindow())
-+            return closestShellSurfaceWindow(lastInputWindow->window());
-+    }
- 
-     return nullptr;
- }
diff --git a/dev-qt/qtwayland/files/qtwayland-6.7.2-thread-safety.patch b/dev-qt/qtwayland/files/qtwayland-6.7.2-thread-safety.patch
deleted file mode 100644
index 92be3b81d5b0..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-6.7.2-thread-safety.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Backport from 6.8 branch which should later land in 6.7.3 in [1] for [2].
-
-[1] https://codereview.qt-project.org/c/qt/qtwayland/+/574983
-[2] https://bugs.kde.org/show_bug.cgi?id=489180
-
-From: David Edmundson <davidedmundson@kde.org>
-Date: Fri, 05 Jul 2024 16:13:40 +0100
-Subject: [PATCH] Client: Improve thread safety determining window size on the render thread
-
-updateSurface is called from both the render and GUI thread. We
-therefore need every property referenced to be thread safe.
-
-Rather than guarding each property we cache the buffer size whenever the
-window geometry or scale changes and put a mutex round this one
-variable.
---- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
-+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
-@@ -51,4 +51,13 @@
- void QWaylandEglWindow::ensureSize()
- {
-+    // this is always called on the main thread
-+    QMargins margins = mWindowDecoration ? frameMargins() : QMargins{};
-+    QRect rect = geometry();
-+    QSize sizeWithMargins = (rect.size() + QSize(margins.left() + margins.right(), margins.top() + margins.bottom())) * scale();
-+    {
-+        QWriteLocker lock(&m_bufferSizeLock);
-+        m_bufferSize = sizeWithMargins;
-+    }
-+
-     updateSurface(false);
- }
-@@ -61,12 +70,15 @@
-     // Just resize the wl_egl_window, the EGLSurface will be created
-     // the next time makeCurrent is called.
--    updateSurface(false);
-+    ensureSize();
- }
- 
- void QWaylandEglWindow::updateSurface(bool create)
- {
--    QMargins margins = mWindowDecoration ? frameMargins() : QMargins{};
--    QRect rect = geometry();
--    QSize sizeWithMargins = (rect.size() + QSize(margins.left() + margins.right(), margins.top() + margins.bottom())) * scale();
-+
-+    QSize sizeWithMargins;
-+    {
-+        QReadLocker lock(&m_bufferSizeLock);
-+        sizeWithMargins = m_bufferSize;
-+    }
- 
-     // wl_egl_windows must have both width and height > 0
---- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow_p.h
-+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow_p.h
-@@ -61,5 +61,11 @@
- 
-     QSurfaceFormat m_format;
-+    // Size used in the last call to wl_egl_window_resize
-     QSize m_requestedSize;
-+
-+    // Size of the buffer used by QWaylandWindow
-+    // This is always written to from the main thread, potentially read from the rendering thread
-+    QReadWriteLock m_bufferSizeLock;
-+    QSize m_bufferSize;
- };
- 
diff --git a/dev-qt/qtwayland/files/qtwayland-6.7.3-wayland.xml-1.23.0.patch b/dev-qt/qtwayland/files/qtwayland-6.7.3-wayland.xml-1.23.0.patch
deleted file mode 100644
index a93132ec0936..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-6.7.3-wayland.xml-1.23.0.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-Not essential to backport the update, but KDE upstream recommends
-it to avoid warnings.
-
-https://codereview.qt-project.org/c/qt/qtwayland/+/574283
---- a/src/3rdparty/protocol/wayland.xml
-+++ b/src/3rdparty/protocol/wayland.xml
-@@ -49 +49 @@
--	The callback_data passed in the callback is the event serial.
-+	The callback_data passed in the callback is undefined and should be ignored.
-@@ -215 +215 @@
--  <interface name="wl_shm_pool" version="1">
-+  <interface name="wl_shm_pool" version="2">
-@@ -265,5 +265,5 @@
--        This request only changes the amount of bytes that are mmapped
--        by the server and does not touch the file corresponding to the
--        file descriptor passed at creation time. It is the client's
--        responsibility to ensure that the file is at least as big as
--        the new pool size.
-+	This request only changes the amount of bytes that are mmapped
-+	by the server and does not touch the file corresponding to the
-+	file descriptor passed at creation time. It is the client's
-+	responsibility to ensure that the file is at least as big as
-+	the new pool size.
-@@ -275 +275 @@
--  <interface name="wl_shm" version="1">
-+  <interface name="wl_shm" version="2">
-@@ -421,0 +422,15 @@
-+      <entry name="c1" value="0x20203143" summary="[7:0] C0:C1:C2:C3:C4:C5:C6:C7 1:1:1:1:1:1:1:1 eight pixels/byte"/>
-+      <entry name="c2" value="0x20203243" summary="[7:0] C0:C1:C2:C3 2:2:2:2 four pixels/byte"/>
-+      <entry name="c4" value="0x20203443" summary="[7:0] C0:C1 4:4 two pixels/byte"/>
-+      <entry name="d1" value="0x20203144" summary="[7:0] D0:D1:D2:D3:D4:D5:D6:D7 1:1:1:1:1:1:1:1 eight pixels/byte"/>
-+      <entry name="d2" value="0x20203244" summary="[7:0] D0:D1:D2:D3 2:2:2:2 four pixels/byte"/>
-+      <entry name="d4" value="0x20203444" summary="[7:0] D0:D1 4:4 two pixels/byte"/>
-+      <entry name="d8" value="0x20203844" summary="[7:0] D"/>
-+      <entry name="r1" value="0x20203152" summary="[7:0] R0:R1:R2:R3:R4:R5:R6:R7 1:1:1:1:1:1:1:1 eight pixels/byte"/>
-+      <entry name="r2" value="0x20203252" summary="[7:0] R0:R1:R2:R3 2:2:2:2 four pixels/byte"/>
-+      <entry name="r4" value="0x20203452" summary="[7:0] R0:R1 4:4 two pixels/byte"/>
-+      <entry name="r10" value="0x20303152" summary="[15:0] x:R 6:10 little endian"/>
-+      <entry name="r12" value="0x20323152" summary="[15:0] x:R 4:12 little endian"/>
-+      <entry name="avuy8888" value="0x59555641" summary="[31:0] A:Cr:Cb:Y 8:8:8:8 little endian"/>
-+      <entry name="xvuy8888" value="0x59555658" summary="[31:0] X:Cr:Cb:Y 8:8:8:8 little endian"/>
-+      <entry name="p030" value="0x30333050" summary="2x2 subsampled Cr:Cb plane 10 bits per channel packed"/>
-@@ -444,0 +460,11 @@
-+
-+    <!-- Version 2 additions -->
-+
-+    <request name="release" type="destructor" since="2">
-+      <description summary="release the shm object">
-+	Using this request a client can tell the server that it is not going to
-+	use the shm object anymore.
-+
-+	Objects created via this interface remain unaffected.
-+      </description>
-+    </request>
-@@ -456,3 +482,5 @@
--      If the buffer uses a format that has an alpha channel, the alpha channel
--      is assumed to be premultiplied in the color channels unless otherwise
--      specified.
-+      Color channels are assumed to be electrical rather than optical (in other
-+      words, encoded with a transfer function) unless otherwise specified. If
-+      the buffer uses a format that has an alpha channel, the alpha channel is
-+      assumed to be premultiplied into the electrical color channel values
-+      (after transfer function encoding) unless otherwise specified.
-@@ -849,0 +878 @@
-+      <entry name="used_source" value="1" summary="source has already been used"/>
-@@ -871 +900 @@
--	hotspot, but subsequent wl_surface.attach request can move the
-+	hotspot, but subsequent wl_surface.offset requests can move the
-@@ -878,0 +908,4 @@
-+
-+	The given source may not be used in any further set_selection or
-+	start_drag requests. Attempting to reuse a previously-used source
-+	may send a used_source error.
-@@ -891,0 +925,4 @@
-+
-+	The given source may not be used in any further set_selection or
-+	start_drag requests. Attempting to reuse a previously-used source
-+	may send a used_source error.
-@@ -1414 +1451 @@
--             summary="surface was destroyed before its role object"/>
-+	     summary="surface was destroyed before its role object"/>
-@@ -1443,3 +1480,3 @@
--        'invalid_offset' error being raised. The x and y arguments are ignored
--        and do not change the pending state. To achieve equivalent semantics,
--        use wl_surface.offset.
-+	'invalid_offset' error being raised. The x and y arguments are ignored
-+	and do not change the pending state. To achieve equivalent semantics,
-+	use wl_surface.offset.
-@@ -1481,0 +1519,7 @@
-+
-+	If a pending wl_buffer has been destroyed, the result is not specified.
-+	Many compositors are known to remove the surface content on the following
-+	wl_surface.commit, but this behaviour is not universal. Clients seeking to
-+	maximise compatibility should not destroy pending buffers and should
-+	ensure that they explicitly remove content from surfaces, even after
-+	destroying buffers.
-@@ -1621,10 +1665,12 @@
--	as opposed to the current state in use by the compositor. A commit
--	request atomically applies all pending state, replacing the current
--	state. After commit, the new pending state is as documented for each
--	related request.
--
--	On commit, a pending wl_buffer is applied first, and all other state
--	second. This means that all coordinates in double-buffered state are
--	relative to the new wl_buffer coming into use, except for
--	wl_surface.attach itself. If there is no pending wl_buffer, the
--	coordinates are relative to the current surface contents.
-+	as opposed to the active state in use by the compositor.
-+
-+	A commit request atomically creates a content update from the pending
-+	state, even if the pending state has not been touched. The content
-+	update is placed in a queue until it becomes active. After commit, the
-+	new pending state is as documented for each related request.
-+
-+	When the content update is applied, the wl_buffer is applied before all
-+	other state. This means that all coordinates in double-buffered state
-+	are relative to the newly attached wl_buffers, except for
-+	wl_surface.attach itself. If there is no newly attached wl_buffer, the
-+	coordinates are relative to the previous content update.
-@@ -1669,4 +1715,6 @@
--	This request sets an optional transformation on how the compositor
--	interprets the contents of the buffer attached to the surface. The
--	accepted values for the transform parameter are the values for
--	wl_output.transform.
-+	This request sets the transformation that the client has already applied
-+	to the content of the buffer. The accepted values for the transform
-+	parameter are the values for wl_output.transform.
-+
-+	The compositor applies the inverse of this transformation whenever it
-+	uses the buffer contents.
-@@ -1728 +1776 @@
--	If scale is not positive the invalid_scale protocol error is
-+	If scale is not greater than 0 the invalid_scale protocol error is
-@@ -1732 +1780 @@
--	   summary="positive scale for interpreting buffer contents"/>
-+	   summary="scale for interpreting buffer contents"/>
-@@ -1804,0 +1853,3 @@
-+	Before receiving this event the preferred buffer scale for this surface
-+	is 1.
-+
-@@ -1808,0 +1860,2 @@
-+
-+	The compositor shall emit a scale value greater than 0.
-@@ -1818,3 +1871,6 @@
--	It is intended that transform aware clients use this event to apply the
--	transform to their content and use wl_surface.set_buffer_transform to
--	indicate the transform they have rendered with.
-+	Before receiving this event the preferred buffer transform for this
-+	surface is normal.
-+
-+	Applying this transformation to the surface buffer contents and using
-+	wl_surface.set_buffer_transform might allow the compositor to use the
-+	surface buffer more efficiently.
-@@ -1995 +2051 @@
--	On surface.attach requests to the pointer surface, hotspot_x
-+	On wl_surface.offset requests to the pointer surface, hotspot_x
-@@ -1997 +2053 @@
--	passed to the request. Attach must be confirmed by
-+	passed to the request. The offset must be applied by
-@@ -2251 +2307 @@
--    <event name="axis_discrete" since="5">
-+    <event name="axis_discrete" since="5" deprecated-since="8">
-@@ -2376,0 +2433,10 @@
-+
-+      Each wl_keyboard has the following logical state:
-+
-+      - an active surface (possibly null),
-+      - the keys currently logically down,
-+      - the active modifiers,
-+      - the active group.
-+
-+      By default, the active surface is null, the keys currently logically down
-+      are empty, the active modifiers and the active group are 0.
-@@ -2410,0 +2477,5 @@
-+
-+	In the wl_keyboard logical state, this event sets the active surface to
-+	the surface argument and the keys currently logically down to the keys
-+	in the keys argument. The compositor must not send this event if the
-+	wl_keyboard already had an active surface immediately before this event.
-@@ -2414 +2485 @@
--      <arg name="keys" type="array" summary="the currently pressed keys"/>
-+      <arg name="keys" type="array" summary="the keys currently logically down"/>
-@@ -2425,2 +2496,4 @@
--	After this event client must assume that all keys, including modifiers,
--	are lifted and also it must stop key repeating if there's some going on.
-+	In the wl_keyboard logical state, this event resets all values to their
-+	defaults. The compositor must not send this event if the active surface
-+	of the wl_keyboard was not equal to the surface argument immediately
-+	before this event.
-@@ -2450,0 +2524,9 @@
-+
-+	In the wl_keyboard logical state, this event adds the key to the keys
-+	currently logically down (if the state argument is pressed) or removes
-+	the key from the keys currently logically down (if the state argument is
-+	released). The compositor must not send this event if the wl_keyboard
-+	did not have an active surface immediately before this event. The
-+	compositor must not send this event if state is pressed (resp. released)
-+	and the key was already logically down (resp. was not logically down)
-+	immediately before this event.
-@@ -2461,0 +2544,11 @@
-+
-+	The compositor may send this event without a surface of the client
-+	having keyboard focus, for example to tie modifier information to
-+	pointer focus instead. If a modifier event with pressed modifiers is sent
-+	without a prior enter event, the client can assume the modifier state is
-+	valid until it receives the next wl_keyboard.modifiers event. In order to
-+	reset the modifier state again, the compositor can send a
-+	wl_keyboard.modifiers event with no pressed modifiers.
-+
-+	In the wl_keyboard logical state, this event updates the modifiers and
-+	group.
-@@ -2568,0 +2662,2 @@
-+
-+	No frame event is required after the cancel event.
-@@ -2668,4 +2763,3 @@
--      <description summary="transform from framebuffer to output">
--	This describes the transform that a compositor will apply to a
--	surface to compensate for the rotation or mirroring of an
--	output device.
-+      <description summary="transformation applied to buffer contents">
-+	This describes transformations that clients and compositors apply to
-+	buffer contents.
-@@ -2702,0 +2797,4 @@
-+	Clients should use wl_surface.preferred_buffer_transform instead of the
-+	transform advertised by this event to find the preferred buffer
-+	transform to use for a surface.
-+
-@@ -2725 +2823 @@
--	   summary="transform that maps framebuffer to output"/>
-+	   summary="additional transformation applied to buffer contents during presentation"/>
-@@ -2798,2 +2896,3 @@
--	later. If it is not sent, the client should assume a
--	scale of 1.
-+	later. The compositor will emit a non-zero, positive
-+	value for scale. If it is not sent, the client should
-+	assume a scale of 1.
-@@ -2807,6 +2906,3 @@
--	It is intended that scaling aware clients track the
--	current output of a surface, and if it is on a scaled
--	output it should use wl_surface.set_buffer_scale with
--	the scale of the output. That way the compositor can
--	avoid scaling the surface, and the client can supply
--	a higher detail image.
-+	Clients should use wl_surface.preferred_buffer_scale
-+	instead of this event to find the preferred buffer
-+	scale to use for a surface.
-@@ -3037,0 +3134,5 @@
-+
-+      A sub-surface never has the keyboard focus of any seat.
-+
-+      The wl_surface.offset request is ignored: clients must use set_position
-+      instead to move the sub-surface.
-@@ -3063,3 +3164 @@
--	parent surface is applied. When this happens depends on whether the
--	parent surface is in synchronized mode or not. See
--	wl_subsurface.set_sync and wl_subsurface.set_desync for details.
-+	parent surface is applied.
-@@ -3088,3 +3187 @@
--	surface is applied. When this happens depends on whether the parent
--	surface is in synchronized mode or not. See wl_subsurface.set_sync and
--	wl_subsurface.set_desync for details.
-+	surface is applied.
diff --git a/dev-qt/qtwayland/qtwayland-6.7.2-r3.ebuild b/dev-qt/qtwayland/qtwayland-6.7.2-r3.ebuild
deleted file mode 100644
index 42bf15947da3..000000000000
--- a/dev-qt/qtwayland/qtwayland-6.7.2-r3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-IUSE="accessibility compositor qml vulkan"
-
-RDEPEND="
-	dev-libs/wayland
-	~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl,vulkan=,wayland]
-	media-libs/libglvnd
-	x11-libs/libxkbcommon
-	compositor? (
-		qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="dev-util/wayland-scanner"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-plasma-popup.patch
-	"${FILESDIR}"/${P}-drag-drop.patch
-	"${FILESDIR}"/${P}-thread-safety.patch
-	"${FILESDIR}"/${P}-null-screen.patch
-)
-
-CMAKE_SKIP_TESTS=(
-	# segfaults for not-looked-into reasons, but not considered
-	# an issue given >=seatv5 exists since wayland-1.10 (2016)
-	tst_seatv4
-	# needs a compositor/opengl, skip the extra trouble
-	tst_surface
-	tst_xdgdecorationv1
-	# known failing with wayland-1.23.0 (or at least with offscreen), not
-	# believed to result in critical runtime issues so skip until this is
-	# looked at upstream (https://bugreports.qt.io/browse/QTBUG-126379)
-	tst_client
-	tst_compositor
-	tst_scaling
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Quick)
-		$(qt_feature compositor wayland_server)
-	)
-
-	qt6-build_src_configure
-}
-
-src_test() {
-	# users' session setting may break tst_clientextension (bug #927030)
-	unset DESKTOP_SESSION XDG_CURRENT_DESKTOP
-	unset GNOME_DESKTOP_SESSION_ID KDE_FULL_SESSION
-
-	qt6-build_src_test
-}
diff --git a/dev-qt/qtwayland/qtwayland-6.7.3-r1.ebuild b/dev-qt/qtwayland/qtwayland-6.7.3-r1.ebuild
deleted file mode 100644
index ba330b2031cf..000000000000
--- a/dev-qt/qtwayland/qtwayland-6.7.3-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-IUSE="accessibility compositor qml vulkan"
-
-RDEPEND="
-	dev-libs/wayland
-	~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl,vulkan=,wayland]
-	media-libs/libglvnd
-	x11-libs/libxkbcommon
-	compositor? (
-		qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="dev-util/wayland-scanner"
-
-CMAKE_SKIP_TESTS=(
-	# segfaults for not-looked-into reasons, but not considered
-	# an issue given >=seatv5 exists since wayland-1.10 (2016)
-	tst_seatv4
-	# needs a compositor/opengl, skip the extra trouble
-	tst_surface
-	tst_xdgdecorationv1
-	# known failing with wayland-1.23.0 (or at least with offscreen), not
-	# believed to result in critical runtime issues so skip until this is
-	# looked at upstream (https://bugreports.qt.io/browse/QTBUG-126379)
-	tst_client
-	tst_compositor
-	tst_scaling
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.7.3-wayland.xml-1.23.0.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Quick)
-		$(qt_feature compositor wayland_server)
-	)
-
-	qt6-build_src_configure
-}
-
-src_test() {
-	# users' session setting may break tst_clientextension (bug #927030)
-	unset DESKTOP_SESSION XDG_CURRENT_DESKTOP
-	unset GNOME_DESKTOP_SESSION_ID KDE_FULL_SESSION
-
-	qt6-build_src_test
-}
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 1c56a1890fe1..8b8615eca8f7 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,5 +1,3 @@
 DIST qtwebchannel-5.15.16-gentoo-kde-1.tar.xz 5812 BLAKE2B 101597f6f40c8055b481f20c1a9cd848f3fa7cfccd90a1a5e8a85c4490a30ae34077fddc8b1ee4c800d88c198e1eb9384551458d6e55a884f082022735f53b53 SHA512 c9151c3db57f48d10d2b7b328bcd540c1fab438bce6904dd831449fd6d10381fc064cc02635b58f5ee1a8fcf13ebffb4c76556d502f548cc63ec35025d49f83d
 DIST qtwebchannel-everywhere-opensource-src-5.15.16.tar.xz 203080 BLAKE2B 684ff50715945d568bcf3d2aed5ee8627e4d57a8ca4a1429180282004031c04d7f78f093cd39e52b0eff619b1b80b59c720d3e153df8ae8fc5a2e88ae73f9e57 SHA512 106c72c0f49e79d92b4aa2aed235f57aef358aecdc0f30eb9b5ab2c28a56ab44df709143d2755ea5f35026e5aa3994d187da14838a2a542e878d6f5b70a7fe1b
-DIST qtwebchannel-everywhere-src-6.7.2.tar.xz 206584 BLAKE2B fb990da23a2228a49a5e4eb99d1c8085265b25e7371c3cafb565c3977772ac0a47bdc6cad7e4ea4493c4c25897e8ac4993e3718cb893fcc299f8e1c5b56c6fdf SHA512 6d9dae2925acfe560c2c1b4382d6e7ce7762f840e76b513f03f5e9e892fb4ad3fb0059ffef725210d88ee4210a8a09678af9b7d3dfbc6d7ff55f3e65396153dc
-DIST qtwebchannel-everywhere-src-6.7.3.tar.xz 206716 BLAKE2B d543ab5ac17564fb71362d4d155aca8395aa3bde258a810487c4601f287c727cf995a6c4d0aa29b20ee56917343dae88311d559997a81471495dd91defff366a SHA512 4cf329c865f9b9eb30584061a0cc684a014f6bdd8cc1f7cd037416cd6aacb386a8d16fe58b5c1c9854c3df4182fd6117ec6297e8d941d5215f0f86ad51f80180
 DIST qtwebchannel-everywhere-src-6.8.1.tar.xz 207412 BLAKE2B ddbe5b0eeb874973ee45775b205ace97e5492153e04cd3e66c2573a39a1c04c64b0fc9bc6d55eccb01f3f02560339fb0946bf71b70c52ff0b42c4ce1fed606de SHA512 43907776dbdea09821819aa6112e56288848b0975be24333977d9177cbba5203bba5841e269dfc7590f40f87a96cbe4c9416e0aba821ff96798b627f2203a51a
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.7.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.7.2.ebuild
deleted file mode 100644
index 3d70b781aaa8..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-6.7.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt WebChannel"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[concurrent]
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	has_version "=dev-qt/qtdeclarative-$(ver_cut 1-3)*:6" && #913692
-		local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) )
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.7.3.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.7.3.ebuild
deleted file mode 100644
index a4709fcf9c4a..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-6.7.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Qt WebChannel"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[concurrent]
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	has_version "=dev-qt/qtdeclarative-$(ver_cut 1-3)*:6" && #913692
-		local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) )
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 4f48aa6d9474..587422ba5970 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,9 +1,5 @@
 DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
 DIST qtwebengine-5.15.16_p20241115.tar.xz 301382752 BLAKE2B 08adfae6228a91f1f4b2a603a28881d9cf97f339d951217f3837d614ebb58aff9b0963220be04cc9a17869b6021a6d7687848bd8ccd1c8c49115a5e6944be84b SHA512 50e0bc7b4236859b4419f2f8eaf37e47c1994c30ca3bf584dd2f4996b5f8ba7cd31c8aae48c28f0fcd39c144490f5e451c7ecf5d340e7b10fa2e37666ef21100
-DIST qtwebengine-6.7-patchset-11.tar.xz 10004 BLAKE2B 10d96134cd02ca4665f72369817f55e2bf0eb209b5d7c4f6131cd3a1be193940c62f656a65081c77ac0dd7aa7bdda76d6ff3f994f8f6c815b249a33b797a10c2 SHA512 198f19d9e20f146878a6050cde435f4662c0d42a6ed21650bfadaab217b2e369284a1a11e5a01d096d3af3f0b34fe24f9bdc0195d37f7f74076b862503bb6c9f
-DIST qtwebengine-6.7-patchset-13.tar.xz 8312 BLAKE2B 8483dff26fdc1479d72bf77d176bf747415be989889946bca96f9ddd1612ab2307afbea40fa908f5644893401bf62e4e334b48a3afe86c2028b13246905eae36 SHA512 546883aa8903bf34bc97d5a8d4d8fe39b55d059acab91fd2979b028c268ef30872a8e078ee5d9bca85f393d689010e937a3cdad421098629a8278e113f84fadd
 DIST qtwebengine-6.8-patchset-7.tar.xz 9096 BLAKE2B 58a95b198a6c8180a71a4365e7c2e3bee2d3798ecff18b01fe23e228a4ceafe2aae43088f503a98fa2d5097271ec442985d993fb24e1b2d2c09014b3309bef4d SHA512 489caa5f7cc3d3091e5896c2eb4d489a40fc220738c2240ec406928c7c948ab8962817024c2fbe3c393294e70ef6ce8c02e47964952a3656ff6ebf7908069fc3
 DIST qtwebengine-6.9-patchset-1.tar.xz 8660 BLAKE2B c7d5e8bff9122e57ebba7402bff9600f1ad7a56af3100f8b355b9b9ed72b30bd54a4ce838c408a0c393ee07f2881b8ea51a5d88b311e780d97f182ef45a219c0 SHA512 a175ff9c757c37b9c784cecd0ef01095b75fd663258965a6d3575ed620257eac4afe7551bfaf48f25a993d97e20e0fc9a73add9d3c56b1bfa4f470a240af00dd
-DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7
-DIST qtwebengine-everywhere-src-6.7.3.tar.xz 550988288 BLAKE2B e506e8bd950be478a9d0ecf69c66f7c56dab3c7a1503c5534f0ed5a770ed4d009935ca6905a1255701750cc8d5b790b895eb4f1d6f994ea8231d57c461c22da9 SHA512 f20769ac9b3f4a9fda9865c86d9dd2c779e404823d85aaf12cbbc425880352c19352ed39eb804a80a06a99e13582d22d45dbf2a8d7bbefea3592ff965b863cbe
 DIST qtwebengine-everywhere-src-6.8.1.tar.xz 566480152 BLAKE2B 6e4137f66363169ae0ab9014d0f60e0af0af70e310ecfa5770d9b73ddb0cb32cffc2a3b15ec89d390aeb323e5250d3ce42576ebd09f741a23b333c6bebc85a4a SHA512 1cab90353894032e23ccccb279e3d0b4269f049879e5033f979b15f28141fd2fb3cae2cd31812811f648ca5b6a115d14790506e07f44cb56475f5865360b0ea6
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.2-musl-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.2-musl-cstdint.patch
deleted file mode 100644
index c654e68fa2fc..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.7.2-musl-cstdint.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/939519
-
-Just one more of these, should be merged with the cstdint patch
-in patchset next update & ideally upstreamed eventually.
---- a/src/3rdparty/chromium/third_party/blink/public/common/page_state/page_state.h
-+++ b/src/3rdparty/chromium/third_party/blink/public/common/page_state/page_state.h
-@@ -6,4 +6,5 @@
- #define THIRD_PARTY_BLINK_PUBLIC_COMMON_PAGE_STATE_PAGE_STATE_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps-blink.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps-blink.patch
deleted file mode 100644
index 87f19dcceef4..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps-blink.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Patch status: fixed in >=chromium-120.0.6088.0 / Qt6.8.0
-
-Backport from [1] for [2] to fix a race condition.
-
-[1] https://crrev.com/ac2ad9c9f01bf255fd123785bd37d3b0ec44e410
-[2] https://bugs.gentoo.org/942142
---- a/src/3rdparty/chromium/third_party/blink/public/BUILD.gn
-+++ b/src/3rdparty/chromium/third_party/blink/public/BUILD.gn
-@@ -437,4 +437,5 @@
-     "//third_party/blink/public/common",
-     "//third_party/blink/public/common:headers",
-+    "//third_party/blink/renderer/platform:make_platform_generated",
-     "//ui/accessibility:ax_base",
-     "//ui/base/dragdrop/mojom:mojom_shared",
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn
-@@ -142,5 +142,8 @@
- group("make_platform_generated") {
-   visibility = []  # Allow re-assignment of list.
--  visibility = [ "//third_party/blink/renderer/*" ]
-+  visibility = [
-+    "//third_party/blink/public:blink_headers",
-+    "//third_party/blink/renderer/*",
-+  ]
-   public_deps = [
-     ":bindings_buildflags",
-@@ -151,4 +154,5 @@
-     ":runtime_feature_state_override_context",
-     "//third_party/blink/public/common:buildflags",
-+    "//third_party/blink/renderer/platform/heap:blink_heap_buildflags",
-     "//third_party/blink/renderer/platform/network:make_generated",
-   ]
-@@ -197,5 +201,4 @@
-     "//third_party/blink/public/mojom:mojom_platform_blink",
-     "//third_party/blink/public/mojom:web_bluetooth_mojo_bindings_blink",
--    "//third_party/blink/renderer/platform/heap:blink_heap_buildflags",
-     "//third_party/blink/renderer/platform/network:make_generated",
-     "//third_party/blink/renderer/platform/wtf",
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps.patch
deleted file mode 100644
index 032a0fd617d8..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Patch status: needs upstreaming
-
-Add missing dependencies for rare race conditions, these are all
-related to Qt-speific changes as far as I can see while normal
-chromium has the right dependencies.
-
-https://bugs.gentoo.org/942142
---- a/src/3rdparty/chromium/components/autofill/core/browser/BUILD.gn
-+++ b/src/3rdparty/chromium/components/autofill/core/browser/BUILD.gn
-@@ -768,4 +768,5 @@
-     deps = []
-     deps = [
-+      ":buildflags",
-       "//base",
-       "//base:i18n",
---- a/src/3rdparty/chromium/components/history/core/browser/BUILD.gn
-+++ b/src/3rdparty/chromium/components/history/core/browser/BUILD.gn
-@@ -184,4 +184,8 @@
-       "//components/sync",
-     ]
-+
-+    deps += [
-+      "//components/signin/public/base:signin_buildflags",
-+    ]
-   }
- 
---- a/src/3rdparty/chromium/qtwebengine/browser/extensions/api/BUILD.gn
-+++ b/src/3rdparty/chromium/qtwebengine/browser/extensions/api/BUILD.gn
-@@ -29,4 +29,5 @@
- 
-   deps = [
-+    "//build/config/chromebox_for_meetings:buildflags",
-     "//chrome/common:buildflags",
-     "//content/public/browser",
-@@ -46,4 +47,5 @@
-   deps = [
-     "//content/public/browser",
-+    "//qtwebengine/common/extensions/api:api",
-   ]
- }
---- a/src/core/ozone/BUILD.gn
-+++ b/src/core/ozone/BUILD.gn
-@@ -22,4 +22,5 @@
-   deps = [
-     "//base",
-+    "//media/gpu:buildflags",
-     "//ui/base:buildflags",
-     "//ui/ozone:ozone_base",
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.8.1-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-6.8.1-cstdint.patch
new file mode 100644
index 000000000000..10f410856032
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.8.1-cstdint.patch
@@ -0,0 +1,26 @@
+Patch status: fixed in >=chromium-133.0.6892.0
+
+IWYU issue, only manifests with gcc+musl (clang+musl or gcc+glibc are fine).
+Backport of [1] (>=chromium-133.0.6892.0) and [2] (>=chromium-128.0.6571.0)
+
+Note have not tested USE=-jumbo-build which may expose more of these issues.
+
+TODO: merge in patchset's cstdint.patch and keep a note to review for 128/133
+given a lot of commits been adding cstdint/stdint.h and all hunks may not
+necessarily fail to apply when fixed given headers being added differently
+
+[1] https://chromium.googlesource.com/external/webrtc/+/000f04375b67e6139a1dc88d832d2da65c7acb29
+[2] https://crrev.com/0d3d5062f7d5ff83f38685bf864c71dd5bd9d460
+--- a/src/3rdparty/chromium/content/public/browser/mhtml_generation_result.h
++++ b/src/3rdparty/chromium/content/public/browser/mhtml_generation_result.h
+@@ -7,2 +7,3 @@
+ 
++#include <cstdint>
+ #include <optional>
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_coding/neteq/reorder_optimizer.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_coding/neteq/reorder_optimizer.cc
+@@ -12,2 +12,4 @@
+ 
++#include <stdint.h>
++
+ #include <algorithm>
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
deleted file mode 100644
index 02da9a205be6..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs flag-o-matic multiprocessing optfeature
-inherit prefix python-any-r1 qt6-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-SRC_URI+="
-	https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-11.tar.xz
-"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64"
-fi
-
-IUSE="
-	accessibility +alsa bindist custom-cflags designer geolocation
-	+jumbo-build kerberos opengl pdfium pulseaudio qml screencast
-	+system-icu vaapi vulkan webdriver +widgets
-"
-REQUIRED_USE="
-	designer? ( qml widgets )
-"
-
-# dlopen: krb5, libva, pciutils, udev
-# gcc: for -latomic
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
-	~dev-qt/qtdeclarative-${PV}:6[widgets?]
-	~dev-qt/qtwebchannel-${PV}:6[qml?]
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/libwebp:=
-	media-libs/mesa[gbm(+)]
-	media-libs/openjpeg:2=
-	media-libs/opus
-	media-libs/tiff:=
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-devel/gcc:*
-	sys-libs/zlib:=[minizip]
-	virtual/libudev
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/libdrm
-	x11-libs/libxcb:=
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	alsa? ( media-libs/alsa-lib )
-	designer? ( ~dev-qt/qttools-${PV}:6[designer] )
-	geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
-	kerberos? ( virtual/krb5 )
-	pulseaudio? ( media-libs/libpulse[glib] )
-	screencast? (
-		dev-libs/glib:2
-		media-video/pipewire:=
-	)
-	system-icu? ( dev-libs/icu:= )
-	vaapi? ( media-libs/libva:=[X] )
-	!vaapi? ( media-libs/libvpx:= )
-"
-DEPEND="
-	${RDEPEND}
-	media-libs/libglvnd
-	x11-base/xorg-proto
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libxshmfence
-	opengl? ( media-libs/libglvnd[X] )
-	screencast? ( media-libs/libepoxy[egl(+)] )
-	pdfium? ( net-print/cups )
-	test? (
-		widgets? ( app-text/poppler[cxx(+)] )
-	)
-	vaapi? (
-		vulkan? ( dev-util/vulkan-headers )
-	)
-"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
-	dev-util/gperf
-	net-libs/nodejs[ssl]
-	sys-devel/bison
-	sys-devel/flex
-"
-
-PATCHES=( "${WORKDIR}"/patches/${PN} )
-[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
-	PATCHES+=( "${WORKDIR}"/patches/chromium )
-
-PATCHES+=(
-	# add extras as needed here, may merge in set if carries across versions
-	"${FILESDIR}"/${PN}-6.7.2-musl-cstdint.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-qtwebengine_check-reqs() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if is-flagq '-g?(gdb)?([1-9])'; then #307861
-		ewarn
-		ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
-		ewarn "is non-trivial with ${PN}. May experience extended compilation"
-		ewarn "times, increased disk/memory usage, and potentially link failure."
-		ewarn
-		ewarn "If run into issues, please try disabling before reporting a bug."
-	fi
-
-	local CHECKREQS_DISK_BUILD=8G
-	local CHECKREQS_DISK_USR=360M
-
-	if ! has distcc ${FEATURES}; then #830661
-		# assume ~2GB per job or 1.5GB if clang, possible with less
-		# depending on free memory and *FLAGS, but prefer being safe as
-		# users having OOM issues with qtwebengine been rather common
-		tc-is-clang && : 15 || : 20
-		local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
-	fi
-
-	check-reqs_${EBUILD_PHASE_FUNC} #570534
-}
-
-pkg_pretend() {
-	qtwebengine_check-reqs
-}
-
-pkg_setup() {
-	qtwebengine_check-reqs
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	qt6-build_src_prepare
-
-	# for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
-	hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
-
-	# store chromium versions, only used in postinst for a warning
-	local chromium
-	mapfile -t chromium < CHROMIUM_VERSION || die
-	[[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
-		QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
-	[[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
-		QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(qt_feature pdfium qtpdf_build)
-		$(qt_feature qml qtpdf_quick_build)
-		$(qt_feature webdriver webenginedriver)
-		$(qt_feature widgets qtpdf_widgets_build)
-		$(usev pdfium -DQT_FEATURE_pdf_v8=ON)
-
-		-DQT_FEATURE_qtwebengine_build=ON
-		$(qt_feature qml qtwebengine_quick_build)
-		$(qt_feature widgets qtwebengine_widgets_build)
-
-		$(cmake_use_find_package designer Qt6Designer)
-
-		$(qt_feature alsa webengine_system_alsa)
-		$(qt_feature !bindist webengine_proprietary_codecs)
-		$(qt_feature geolocation webengine_geolocation)
-		$(qt_feature jumbo-build webengine_jumbo_build)
-		$(qt_feature kerberos webengine_kerberos)
-		$(qt_feature pulseaudio webengine_system_pulseaudio)
-		$(qt_feature screencast webengine_webrtc_pipewire)
-		$(qt_feature system-icu webengine_system_icu)
-		$(qt_feature vaapi webengine_vaapi)
-		$(qt_feature vulkan webengine_vulkan)
-		-DQT_FEATURE_webengine_embedded_build=OFF
-		-DQT_FEATURE_webengine_extensions=ON
-		-DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
-		-DQT_FEATURE_webengine_pepper_plugins=ON
-		-DQT_FEATURE_webengine_printing_and_pdf=ON
-		-DQT_FEATURE_webengine_spellchecker=ON
-		-DQT_FEATURE_webengine_webchannel=ON
-		-DQT_FEATURE_webengine_webrtc=ON
-
-		# needs a modified ffmpeg to be usable, and even then it may not
-		# cooperate with new major ffmpeg versions (bug #831487)
-		-DQT_FEATURE_webengine_system_ffmpeg=OFF
-
-		# use bundled re2 to avoid complications, may revisit
-		# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
-		-DQT_FEATURE_webengine_system_re2=OFF
-
-		# bundled is currently required when using vaapi (forced regardless)
-		$(qt_feature !vaapi webengine_system_libvpx)
-
-		# not necessary to pass these (default), but in case detection fails
-		$(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
-			freetype gbm glib harfbuzz lcms2 libevent libjpeg \
-			libopenjpeg2 libpci libpng libtiff libwebp libxml \
-			minizip opus poppler snappy zlib)
-
-		# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
-		-DINSTALL_GN=OFF
-	)
-
-	local mygnargs=(
-		# prefer no dlopen where possible
-		$(usev pulseaudio link_pulseaudio=true)
-		$(usev screencast rtc_link_pipewire=true)
-		# reduce default disk space usage
-		symbol_level=0
-	)
-
-	if use !custom-cflags; then
-		strip-flags # fragile
-
-		if is-flagq '-g?(gdb)?([2-9])'; then #914475
-			replace-flags '-g?(gdb)?([2-9])' -g1
-			ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
-		fi
-
-		# Built helpers segfault when using (at least) -march=armv8-a+pauth
-		# (bug #920555, #920568 -- suspected gcc bug). For now, filter all
-		# for simplicity. Override with USE=custom-cflags if wanted, please
-		# report if above -march works again so can cleanup.
-		use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
-	fi
-
-	# Workaround for build failure with clang-18 and -march=native without
-	# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
-	# TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
-	use amd64 && tc-is-clang && is-flagq -march=native &&
-		[[ $(clang-major-version) -ge 18 ]] &&
-		has_version '<llvm-core/llvm-18.1.5-r1' &&
-		tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
-		append-flags -mevex512
-
-	export NINJA NINJAFLAGS=$(get_NINJAOPTS)
-	[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
-
-	local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
-	einfo "Extra Gn args: ${EXTRA_GN}"
-
-	qt6-build_src_configure
-}
-
-src_compile() {
-	# tentatively work around a possible (rare) race condition (bug #921680)
-	cmake_build WebEngineCore_sync_all_public_headers
-
-	cmake_src_compile
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		# almost every tests fail, so skip entirely
-		ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
-		return
-	fi
-
-	local CMAKE_SKIP_TESTS=(
-		# fails with network sandbox
-		tst_loadsignals
-		tst_qquickwebengineview
-		tst_qwebengineglobalsettings
-		tst_qwebengineview
-		# fails with offscreen rendering, may be worth retrying if the issue
-		# persist given these are rather major tests (or consider virtx)
-		tst_qmltests
-		tst_qwebenginepage
-		# certs verfication seems flaky and gives expiration warnings
-		tst_qwebengineclientcertificatestore
-		# test is misperformed when qtbase is built USE=-test?
-		tst_touchinput
-		# currently requires webenginedriver to be already installed
-		tst_webenginedriver
-	)
-
-	# prevent using the system's qtwebengine
-	# (use glob to avoid unnecessary complications with arch dir)
-	local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
-	[[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
-	local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
-	local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
-	local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
-
-	# random failures in several tests without -j1
-	qt6-build_src_test -j1
-}
-
-src_install() {
-	qt6-build_src_install
-
-	[[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-
-	if use test && use webdriver; then
-		rm -- "${D}${QT6_BINDIR}"/testbrowser || die
-	fi
-}
-
-pkg_postinst() {
-	# plugin may also be found in $HOME if provided by chrome or firefox
-	use amd64 &&
-		optfeature "Widevine DRM support (protected media playback)" \
-			www-plugins/chrome-binary-plugins
-
-	elog
-	elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
-	elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. Extensive as it is, the"
-	elog "list of backports is impossible to evaluate, but always bound to be behind"
-	elog "Chromium's release schedule."
-	elog
-	elog "In addition, various online services may deny service based on an outdated"
-	elog "user agent version (and/or other checks). Google is already known to do so."
-	elog
-	elog "tl;dr your web browsing experience will be compromised."
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild
deleted file mode 100644
index d9b580efb949..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs flag-o-matic multiprocessing optfeature
-inherit prefix python-any-r1 qt6-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-SRC_URI+="
-	https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-13.tar.xz
-"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm64"
-fi
-
-IUSE="
-	accessibility +alsa bindist custom-cflags designer geolocation
-	+jumbo-build kerberos opengl pdfium pulseaudio qml screencast
-	+system-icu vaapi vulkan webdriver +widgets
-"
-REQUIRED_USE="
-	designer? ( qml widgets )
-"
-
-# dlopen: krb5, libva, pciutils, udev
-# gcc: for -latomic
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
-	~dev-qt/qtdeclarative-${PV}:6[widgets?]
-	~dev-qt/qtwebchannel-${PV}:6[qml?]
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/libwebp:=
-	media-libs/mesa[gbm(+)]
-	media-libs/openjpeg:2=
-	media-libs/opus
-	media-libs/tiff:=
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-devel/gcc:*
-	sys-libs/zlib:=[minizip]
-	virtual/libudev
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/libdrm
-	x11-libs/libxcb:=
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	alsa? ( media-libs/alsa-lib )
-	designer? ( ~dev-qt/qttools-${PV}:6[designer] )
-	geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
-	kerberos? ( virtual/krb5 )
-	pulseaudio? ( media-libs/libpulse[glib] )
-	screencast? (
-		dev-libs/glib:2
-		media-video/pipewire:=
-	)
-	system-icu? ( dev-libs/icu:= )
-	vaapi? ( media-libs/libva:=[X] )
-	!vaapi? ( media-libs/libvpx:= )
-"
-DEPEND="
-	${RDEPEND}
-	media-libs/libglvnd
-	x11-base/xorg-proto
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libxshmfence
-	opengl? ( media-libs/libglvnd[X] )
-	screencast? ( media-libs/libepoxy[egl(+)] )
-	pdfium? ( net-print/cups )
-	test? (
-		widgets? ( app-text/poppler[cxx(+)] )
-	)
-	vaapi? (
-		vulkan? ( dev-util/vulkan-headers )
-	)
-"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
-	dev-util/gperf
-	net-libs/nodejs[ssl]
-	sys-devel/bison
-	sys-devel/flex
-"
-
-PATCHES=( "${WORKDIR}"/patches/${PN} )
-[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
-	PATCHES+=( "${WORKDIR}"/patches/chromium )
-
-PATCHES+=(
-	# add extras as needed here, may merge in set if carries across versions
-	"${FILESDIR}"/${PN}-6.7.3-missing-gn-deps.patch
-	"${FILESDIR}"/${PN}-6.7.3-missing-gn-deps-blink.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-qtwebengine_check-reqs() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if is-flagq '-g?(gdb)?([1-9])'; then #307861
-		ewarn
-		ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
-		ewarn "is non-trivial with ${PN}. May experience extended compilation"
-		ewarn "times, increased disk/memory usage, and potentially link failure."
-		ewarn
-		ewarn "If run into issues, please try disabling before reporting a bug."
-	fi
-
-	local CHECKREQS_DISK_BUILD=8G
-	local CHECKREQS_DISK_USR=360M
-
-	if ! has distcc ${FEATURES}; then #830661
-		# assume ~2GB per job or 1.5GB if clang, possible with less
-		# depending on free memory and *FLAGS, but prefer being safe as
-		# users having OOM issues with qtwebengine been rather common
-		tc-is-clang && : 15 || : 20
-		local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
-	fi
-
-	check-reqs_${EBUILD_PHASE_FUNC} #570534
-}
-
-pkg_pretend() {
-	qtwebengine_check-reqs
-}
-
-pkg_setup() {
-	qtwebengine_check-reqs
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	qt6-build_src_prepare
-
-	# for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
-	hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
-
-	# store chromium versions, only used in postinst for a warning
-	local chromium
-	mapfile -t chromium < CHROMIUM_VERSION || die
-	[[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
-		QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
-	[[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
-		QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(qt_feature pdfium qtpdf_build)
-		$(qt_feature qml qtpdf_quick_build)
-		$(qt_feature webdriver webenginedriver)
-		$(qt_feature widgets qtpdf_widgets_build)
-		$(usev pdfium -DQT_FEATURE_pdf_v8=ON)
-
-		-DQT_FEATURE_qtwebengine_build=ON
-		$(qt_feature qml qtwebengine_quick_build)
-		$(qt_feature widgets qtwebengine_widgets_build)
-
-		$(cmake_use_find_package designer Qt6Designer)
-
-		$(qt_feature alsa webengine_system_alsa)
-		$(qt_feature !bindist webengine_proprietary_codecs)
-		$(qt_feature geolocation webengine_geolocation)
-		$(qt_feature jumbo-build webengine_jumbo_build)
-		$(qt_feature kerberos webengine_kerberos)
-		$(qt_feature pulseaudio webengine_system_pulseaudio)
-		$(qt_feature screencast webengine_webrtc_pipewire)
-		$(qt_feature system-icu webengine_system_icu)
-		$(qt_feature vaapi webengine_vaapi)
-		$(qt_feature vulkan webengine_vulkan)
-		-DQT_FEATURE_webengine_embedded_build=OFF
-		-DQT_FEATURE_webengine_extensions=ON
-		-DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
-		-DQT_FEATURE_webengine_pepper_plugins=ON
-		-DQT_FEATURE_webengine_printing_and_pdf=ON
-		-DQT_FEATURE_webengine_spellchecker=ON
-		-DQT_FEATURE_webengine_webchannel=ON
-		-DQT_FEATURE_webengine_webrtc=ON
-
-		# needs a modified ffmpeg to be usable, and even then it may not
-		# cooperate with new major ffmpeg versions (bug #831487)
-		-DQT_FEATURE_webengine_system_ffmpeg=OFF
-
-		# use bundled re2 to avoid complications, Qt has also disabled
-		# this by default in 6.7.3+ (bug #913923)
-		-DQT_FEATURE_webengine_system_re2=OFF
-
-		# bundled is currently required when using vaapi (forced regardless)
-		$(qt_feature !vaapi webengine_system_libvpx)
-
-		# not necessary to pass these (default), but in case detection fails
-		$(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
-			freetype gbm glib harfbuzz lcms2 libevent libjpeg \
-			libopenjpeg2 libpci libpng libtiff libwebp libxml \
-			minizip opus poppler snappy zlib)
-
-		# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
-		-DINSTALL_GN=OFF
-	)
-
-	local mygnargs=(
-		# prefer no dlopen where possible
-		$(usev pulseaudio link_pulseaudio=true)
-		$(usev screencast rtc_link_pipewire=true)
-		# reduce default disk space usage
-		symbol_level=0
-	)
-
-	if use !custom-cflags; then
-		strip-flags # fragile
-
-		if is-flagq '-g?(gdb)?([2-9])'; then #914475
-			replace-flags '-g?(gdb)?([2-9])' -g1
-			ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
-		fi
-
-		# Built helpers segfault when using (at least) -march=armv8-a+pauth
-		# (bug #920555, #920568 -- suspected gcc bug). For now, filter all
-		# for simplicity. Override with USE=custom-cflags if wanted, please
-		# report if above -march works again so can cleanup.
-		use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
-	fi
-
-	export NINJAFLAGS=$(get_NINJAOPTS)
-	[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
-
-	local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
-	einfo "Extra Gn args: ${EXTRA_GN}"
-
-	qt6-build_src_configure
-}
-
-src_compile() {
-	# tentatively work around a possible (rare) race condition (bug #921680)
-	cmake_build WebEngineCore_sync_all_public_headers
-
-	cmake_src_compile
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		# almost every tests fail, so skip entirely
-		ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
-		return
-	fi
-
-	local CMAKE_SKIP_TESTS=(
-		# fails with network sandbox
-		tst_loadsignals
-		tst_qquickwebengineview
-		tst_qwebengineglobalsettings
-		tst_qwebengineview
-		# fails with offscreen rendering, may be worth retrying if the issue
-		# persist given these are rather major tests (or consider virtx)
-		tst_qmltests
-		tst_qwebenginepage
-		# certs verfication seems flaky and gives expiration warnings
-		tst_qwebengineclientcertificatestore
-		# test is misperformed when qtbase is built USE=-test?
-		tst_touchinput
-		# currently requires webenginedriver to be already installed
-		tst_webenginedriver
-	)
-
-	# prevent using the system's qtwebengine
-	# (use glob to avoid unnecessary complications with arch dir)
-	local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
-	[[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
-	local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
-	local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
-	local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
-
-	# random failures in several tests without -j1
-	qt6-build_src_test -j1
-}
-
-src_install() {
-	qt6-build_src_install
-
-	[[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-
-	if use test && use webdriver; then
-		rm -- "${D}${QT6_BINDIR}"/testbrowser || die
-	fi
-}
-
-pkg_postinst() {
-	# plugin may also be found in $HOME if provided by chrome or firefox
-	use amd64 &&
-		optfeature "Widevine DRM support (protected media playback)" \
-			www-plugins/chrome-binary-plugins
-
-	elog
-	elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
-	elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. Extensive as it is, the"
-	elog "list of backports is impossible to evaluate, but always bound to be behind"
-	elog "Chromium's release schedule."
-	elog
-	elog "In addition, various online services may deny service based on an outdated"
-	elog "user agent version (and/or other checks). Google is already known to do so."
-	elog
-	elog "tl;dr your web browsing experience will be compromised."
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild
index 0ae70e897de7..39e9490aeb43 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild
@@ -110,6 +110,7 @@ PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
 	"${FILESDIR}"/${PN}-6.8.1-QTBUG-131156.patch
 	"${FILESDIR}"/${PN}-6.8.1-aarch64-xnnpack.patch
+	"${FILESDIR}"/${PN}-6.8.1-cstdint.patch
 )
 
 python_check_deps() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index aabbe2abf000..0988f8bb29d5 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -109,6 +109,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
 	"${FILESDIR}"/${PN}-6.8.1-aarch64-xnnpack.patch
+	"${FILESDIR}"/${PN}-6.8.1-cstdint.patch
 )
 
 python_check_deps() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild
index af3631213753..605f0c62a61f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9.9999.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
@@ -105,6 +105,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 
 PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
+	"${FILESDIR}"/${PN}-6.8.1-cstdint.patch
 )
 
 python_check_deps() {
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 38deca62671c..4a600b0cf28e 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,5 +1,3 @@
 DIST qtwebsockets-5.15.16-gentoo-kde-1.tar.xz 1512 BLAKE2B 2d12fa2f79412974c1397af4bf93e65a5ad7688e5f0b3bbc4fbfac645b7f646642a3d2ff48451ff607cdce36f3b301fdc97a951afd92673e88cc06a200fadf1f SHA512 4fe5ff5fa4850f527e553e741b65d7028ad121464030c61e6eae0f8267d735c88686bb781b00d2309619147dbc8465cf3d16e4b672c157a50a145f9d4a56326f
 DIST qtwebsockets-everywhere-opensource-src-5.15.16.tar.xz 253084 BLAKE2B a90fa9950793b5f6d8d792328b105f8085c3a47abaef256f6b8a4c101eb6bd6d7b687d49390c4c009ff03ba4d493abc8cc6433df92dd47865e48606e19c9b8fd SHA512 9bb15c9277f96acee0d5a49e961483706c0d6c709c587400c402b7864fe2635cf688222448bdabd5ef53568e6d8c1c32e54a9410301eede0507b975989f30b2b
-DIST qtwebsockets-everywhere-src-6.7.2.tar.xz 459636 BLAKE2B c639132f9a4b029d52172bf50aa3b4534f7dc39dad12a1ea85d6bb6a9f72a61d9043688734713fd553952cf63be034102a9c22daa9306fd112d75bd3bd756930 SHA512 ccd2bde6f68aa0993f099b4755f6e79f64d8ff85be8891b2682194984851e0ec0f71dfa69aec53df6c7f49df7f123eff30920c9b1f5c79da5285ab5605d22dee
-DIST qtwebsockets-everywhere-src-6.7.3.tar.xz 459844 BLAKE2B 3fb663066db50d19fa2829b026141d450571e451d63ffbfcc32d7e5e471726ce89690e0cf6291be0e9291002417fbefcab08e3c366d7cfa070c8963259f293c4 SHA512 3dd1ed7a29c4bcc070241f465608a2f0b35142f73bc5cf0b3e964504a68da5a76002dabd4c6f14330f29200c8fb8d5e0ad46c5bc6de7af4889fd355796bce261
 DIST qtwebsockets-everywhere-src-6.8.1.tar.xz 460488 BLAKE2B a8c8c755e3698dea4eeb519c86e2814f64e7325b3b945e37289161a1f5f2986e7dbd28a6c06b7db7d00f47a9302cc3a4368a373231dff564b0398a96cf1aefcb SHA512 27b8c8a256f4319bd1f9a78efb4a5109d8677aa285c361787f0499930ea1813d44d56538ec3f1887b83ec4c4a717684efaba59ac9db88f86ee74e79d3d81c6e2
diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.7.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.7.2.ebuild
deleted file mode 100644
index af33451a2582..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-6.7.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-IUSE="qml +ssl"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network,ssl=]
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Quick)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.7.3.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.7.3.ebuild
deleted file mode 100644
index 066afe761b1a..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-6.7.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-IUSE="qml +ssl"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network,ssl=]
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Quick)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index 6aad83976f5b..f4a06078a231 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,4 +1,2 @@
 DIST qtwebview-everywhere-opensource-src-5.15.16.tar.xz 128180 BLAKE2B 1ef88bd8eb5c405ea581305b30c04ae3bb775441daed3323b5d3003982e8bfa50c5bd8b79b3e8327468550e6519d785d3cb8c9f019a107877152b3e7f624c9fc SHA512 2d6761a6b01a8791dae785f829f429f336b8ba42f0675226ab09a05a7f4e170a3bc569e92e845b9416f4a0eef93f87d2e34c0a18eed025847445bb794e457982
-DIST qtwebview-everywhere-src-6.7.2.tar.xz 138764 BLAKE2B 3c7d51dfa8f82a30c92eed804e9f51986947e3f8042b6a3a8d777b02bd7369b98c53686e5032b855bee2200958df00b0e779720bfbe91aae9df154133ca765be SHA512 9cae6f415941049c975a86f99afbb62f3177285a15d182655b9fbab5b3d9ff19d7fb0b646c243db75f382fd971f5b89bf29659c150294e9c4e7ced2921b77c2d
-DIST qtwebview-everywhere-src-6.7.3.tar.xz 139024 BLAKE2B 29eb9849ca88c185de3a51b0093e21025eacd8703121627ace6b78d1f34e69929565f3918a13bdf7cc019163629d828f5be4c95b01a68b9e4d1befb79d1397fd SHA512 d23ca95d252078a8b2dc4738298603a45384d88e0a4c0d4880ea7bf20195f0f6dfb201704cc7b7cb7127a702ec9b87b90a6e9d1f94a721efb291d7e50720cc26
 DIST qtwebview-everywhere-src-6.8.1.tar.xz 139068 BLAKE2B 211b0819f6be98892bfe38742742589eaa9257d97807ea520e095ce8606f0a85fd7ad4853080ff95a6e3dc3f8801000a8f75985733c4c4063c7ad8741a7ab616 SHA512 a40ba675028afafdae6018ec32ac18b4a9f4dc93d53dfb7f8f2e47bbd91ac46d3d2f47dcfb24eebc20ff2d9e85551fd96099c58d93ddea82f21e835da97ab9ee
diff --git a/dev-qt/qtwebview/qtwebview-6.7.2.ebuild b/dev-qt/qtwebview/qtwebview-6.7.2.ebuild
deleted file mode 100644
index 39a6aa99e416..000000000000
--- a/dev-qt/qtwebview/qtwebview-6.7.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Module for displaying web content in a QML application using the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64"
-fi
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui]
-	~dev-qt/qtdeclarative-${PV}:6
-	~dev-qt/qtwebengine-${PV}:6[qml]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtwebview/qtwebview-6.7.3.ebuild b/dev-qt/qtwebview/qtwebview-6.7.3.ebuild
deleted file mode 100644
index 9e7e9d36e4ab..000000000000
--- a/dev-qt/qtwebview/qtwebview-6.7.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Module for displaying web content in a QML application using the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm64"
-fi
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui]
-	~dev-qt/qtdeclarative-${PV}:6
-	~dev-qt/qtwebengine-${PV}:6[qml]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r4.ebuild b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r4.ebuild
new file mode 100644
index 000000000000..170082471d28
--- /dev/null
+++ b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack-xml_parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="XML parameters parser for Action Pack (removed from core in Rails 4.0)"
+HOMEPAGE="https://github.com/rails/actionpack-xml_parser"
+SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	|| ( dev-ruby/actionpack:7.2 dev-ruby/actionpack:7.1 dev-ruby/actionpack:7.0 dev-ruby/actionpack:6.1 )
+	|| ( dev-ruby/railties:7.2 dev-ruby/railties:7.1 dev-ruby/railties:7.0 dev-ruby/railties:6.1 )
+"
+
+ruby_add_bdepend "test? ( =dev-ruby/railties-7* )"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" Rakefile test/helper.rb || die
+	sed -e '1igem "actionpack", "~>7.2.0"' \
+		-e '3irequire "active_support/core_ext/kernel/reporting.rb"' \
+		-i test/helper.rb || die
+
+	# Skip test that is not compatible with Rails 5.2
+	sed -i -e '/occurring a parse error if parsing unsuccessful/askip "rails 5.2"' test/xml_params_parsing_test.rb || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:.:test -e "Dir['test/*_test.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/amatch/amatch-0.4.1.ebuild b/dev-ruby/amatch/amatch-0.4.1.ebuild
index 4c0399a8981e..9e7b3fb330ec 100644
--- a/dev-ruby/amatch/amatch-0.4.1.ebuild
+++ b/dev-ruby/amatch/amatch-0.4.1.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 ruby33"
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
@@ -19,12 +19,11 @@ HOMEPAGE="https://github.com/flori/amatch"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
 
 ruby_add_rdepend "=dev-ruby/tins-1*"
 
 # These packages also provide agrep, bug 626480
-RDEPEND+=" !app-misc/glimpse !app-text/agrep !dev-libs/tre"
+RDEPEND="!dev-libs/tre"
 
 all_ruby_prepare() {
 	# mize is listed as a dependency but not actually used
diff --git a/dev-ruby/arel-helpers/Manifest b/dev-ruby/arel-helpers/Manifest
index c87c573ef0c3..f60274543556 100644
--- a/dev-ruby/arel-helpers/Manifest
+++ b/dev-ruby/arel-helpers/Manifest
@@ -1,2 +1,2 @@
-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
+DIST arel-helpers-2.16.0.tar.gz 11845 BLAKE2B 584ecaf16b19274674e92a524a256d3045b9007683123c8bf7bc73d02ec91be8513c4a1c0eff5e0be094db74772b31b0afd4186fb5950914d5d9d76348cc8f0e SHA512 b1d9b74c0082fabd4cf79c43d79f53a2e46e4647d5fbe05bdcdb3821692a46a15a1d6418c24155838c739e83c646f9af0c636b99bfc4f84c6355792c959fae8b
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.14.0-r1.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.14.0-r1.ebuild
deleted file mode 100644
index 62e4e4422c0f..000000000000
--- a/dev-ruby/arel-helpers/arel-helpers-2.14.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_S=${PN}-*
-RUBY_FAKEGEM_VERSION="$(ver_cut 1-3)"
-inherit ruby-fakegem
-
-DESCRIPTION="Tools to help construct database queries"
-HOMEPAGE="https://github.com/camertron/arel-helpers"
-# No test data in gems
-SRC_URI="https://github.com/camertron/arel-helpers/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-
-ruby_add_rdepend "
-	|| (
-		dev-ruby/activerecord:7.0
-		dev-ruby/activerecord:6.1
-	)
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rr
-		dev-ruby/activerecord[sqlite]
-		dev-ruby/bundler
-		dev-ruby/combustion
-		>=dev-ruby/database_cleaner-1.8
-		>=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 '/rake/ s/~>/>=/' \
-		-e '/appraisal/ s:^:#:' \
-		-e '/database_cleaner/ s/1.8/1.7/' \
-		-e '/database_cleaner/ s/~>/>=/' \
-		-e '/sqlite3/ s/~>/>=/' \
-		-i arel-helpers.gemspec || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake spec || die
-}
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.16.0.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.16.0.ebuild
new file mode 100644
index 000000000000..347f1c25241b
--- /dev/null
+++ b/dev-ruby/arel-helpers/arel-helpers-2.16.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_S=${PN}-*
+RUBY_FAKEGEM_VERSION="$(ver_cut 1-3)"
+inherit ruby-fakegem
+
+DESCRIPTION="Tools to help construct database queries"
+HOMEPAGE="https://github.com/camertron/arel-helpers"
+# No test data in gems
+SRC_URI="https://github.com/camertron/arel-helpers/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+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
+	)
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rr
+		dev-ruby/activerecord[sqlite]
+		dev-ruby/bundler
+		>=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 -e '/pry-/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '2igem "activerecord", "<8.1"' \
+		-i Gemfile || die
+
+	sed \
+		-e '/rake/ s/~>/>=/' \
+		-e '/appraisal/ s:^:#:' \
+		-e '/database_cleaner/ s/1.8/1.7/' \
+		-e '/database_cleaner/ s/~>/>=/' \
+		-e '/sqlite3/ s/~>/>=/' \
+		-i arel-helpers.gemspec || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake spec || die
+}
diff --git a/dev-ruby/aws-sigv4/Manifest b/dev-ruby/aws-sigv4/Manifest
index 114f9dea3bf1..488cc3f52388 100644
--- a/dev-ruby/aws-sigv4/Manifest
+++ b/dev-ruby/aws-sigv4/Manifest
@@ -1,2 +1,3 @@
 DIST aws-sigv4-1.10.1.gem 19456 BLAKE2B ecce6885c428b978d02903d24c0b4f7fe8d1f76cd2f9b8e6fe5ba8cd0b02429a311af5ac68f480946d63cc76d1980676c7624c4fed0a7d0620f470972ee08554 SHA512 d00c50fe9d71fb9dcc53c319ca79b640dee370a55977520a4f19b5596cecb14dde5f801afed9012c4b3c0008c45770b2ae0edd5d92c5656e7a0ae1ef061ef201
+DIST aws-sigv4-1.11.0.gem 19456 BLAKE2B ab515b4c847fe655d05e4f95134156844cc59a437fafc2a6e36f946fe1fdc5f2b2b2d98983fe7354163bc4c5252e2b260aff5e8df02c322607e30342b2180ea4 SHA512 2ad243cedbf386c141caa63ccc9c4896a9777946f4330db851ca986c66115464cb6ccba3a20528e719d9c2bb1c386d4095915af9f06209ca1fc565e701ed6dbc
 DIST aws-sigv4-1.9.1.gem 19968 BLAKE2B 5f1012ea015c75109e6d4cd3403263b6feea9eb5504acfbad29cd3d2fad06eafe4df51485096e42216855ec0667b74575e19f95d2ca75e3d3754a9f8c84d58a6 SHA512 5d92b56def12b61327b7981da54816c578e60c6833a80ee08750ef477ac99524e472964afe0909a0cdfa27d07063422921c34ff00e5b1e450fc1e9d3e4968aee
diff --git a/dev-ruby/aws-sigv4/aws-sigv4-1.11.0.ebuild b/dev-ruby/aws-sigv4/aws-sigv4-1.11.0.ebuild
new file mode 100644
index 000000000000..a0427044aad5
--- /dev/null
+++ b/dev-ruby/aws-sigv4/aws-sigv4-1.11.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md"
+RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Amazon Web Services Signature Version 4 signing library"
+HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64"
+
+ruby_add_rdepend ">=dev-ruby/aws-eventstream-1.0.2:1"
diff --git a/dev-ruby/barby/barby-0.6.8-r1.ebuild b/dev-ruby/barby/barby-0.6.8-r1.ebuild
index 26423a9c0361..5845573f53e8 100644
--- a/dev-ruby/barby/barby-0.6.8-r1.ebuild
+++ b/dev-ruby/barby/barby-0.6.8-r1.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="ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 992d1a923693..5490c107e415 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -4,6 +4,5 @@ DIST bundler-2.4.22.gem 419840 BLAKE2B 885686da1c100181b0faf3f5eea53e9c42ada65b8
 DIST bundler-2.5.11.gem 432640 BLAKE2B cbf95fc447afe251bb9679c6cd986212f8032392e02fb81995f62b02948027e3bfc080661c3dc2b82da351a55c0cfa86502b42f71f899efb11356f800d4993c5 SHA512 1db71e0df80d49c0f5eec1f0e01569dbd41ef27af486cbfb217b94b4db49abc93689866779f262ab087e3ee0facc0cc4b6d3bf701ea7d489d1f37104e92192b6
 DIST bundler-2.5.21.gem 444416 BLAKE2B 73253dd4308a2a503c38c9e6bd74abcce2b15b24cb90d585ea47622a2784c8a5103eaf5ec4655715db02a75ec97b5dd886c4f997fafd98f7d3363591cefff446 SHA512 215261034e89b6555266220e9cdcad6c7f4f764c289807a888098de2c49efdc6ee999d0e6776f60893e4f7bce8bd3da50a2a452b413b5ff7afa94a2b8bdb6f96
 DIST bundler-2.5.23.gem 445440 BLAKE2B b5bc3bd77a20847ce2ef92655faaf41f7b9f4f0d95adbc03748863bd3a910d1f4e911e64459213bc3057d251e63e7d58faa3fe95806ff5719f8d8c2fc617e4b6 SHA512 7583e22f5fdf43b7c7f4f5d48908e86d2ca7fe0ac4bc06bf9bc248bf9ca6681e1f81aac9a03cc9cebec9e3448b758c921949f1a49986e1b3269ae60be7a82f70
-DIST bundler-2.5.3.gem 429568 BLAKE2B d692ec7b4bdedefd3d7b5063467834d6414bed135209547ab403e529500debfce4a2cc503d0b72aceb1bdb14541de48271340bd669e4c1b7e950381ffce910bc SHA512 31dcdf401075066c46eb50adc547deffa9da71d72841a12f6cee383765e7d428ca4a8df0795f07cb401578a65899f11fcaeeccaba4d0d65967ce67aee543a8cd
-DIST bundler-2.5.9.gem 431104 BLAKE2B e7fe8e10c3ef22c854f75f1c4a3f66eec801fa9a826d22fb6970869005c8391eafa1f11770bbbbe328ccf67dfc60185a8711a1836f3de480381870c3398f861b SHA512 bea50de47c68ed0b525d3310ba448c1dba76c46bd72410e344f885701a34e0a429490348d3a42b11ec9d7522164172f66b62ab4497b6aea0eedb0a06c431087f
 DIST bundler-2.6.2.gem 449024 BLAKE2B 3e3994eb59244dea54131f7e332f9293e1f7b279f2f82693ce161ec760b88e398a2523f22800233aa00a265efc0e4132871a09d79629e09ad8373fb8d241ec9c SHA512 b7cbc15ba0956457a77a842df05565b68bf8621726ccc1d7e0f15bf088727fcbdfd1f63e12f644bccfa226e7a570daa9af33422242581a4fc1a2af4823cf6b0a
+DIST bundler-2.6.3.gem 449536 BLAKE2B a74be4804d19452dc760025e210d30346af8c6c8f0e0ac5c209ac96c0887689590d2368d7d69f02228873864a25832b063496a5501d9e29dcf79db09ca89c08a SHA512 4a3ba97070e820b20324bfb1e48709b7867215567e2aa3e0293aaa1e767614adaa3b80b0daddb0c94dab70516c78541ae2a3b08464a941295fae69cc4acdf135
diff --git a/dev-ruby/bundler/bundler-2.5.3.ebuild b/dev-ruby/bundler/bundler-2.5.3.ebuild
deleted file mode 100644
index f7ab04ebb77d..000000000000
--- a/dev-ruby/bundler/bundler-2.5.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/rubygems/rubygems"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git"
diff --git a/dev-ruby/bundler/bundler-2.5.9.ebuild b/dev-ruby/bundler/bundler-2.5.9.ebuild
deleted file mode 100644
index 9d74c9aee9b7..000000000000
--- a/dev-ruby/bundler/bundler-2.5.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/rubygems/rubygems"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git"
diff --git a/dev-ruby/bundler/bundler-2.6.3.ebuild b/dev-ruby/bundler/bundler-2.6.3.ebuild
new file mode 100644
index 000000000000..da1933c0b649
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.6.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/rubygems/rubygems"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND=" dev-vcs/git"
diff --git a/dev-ruby/concurrent-ruby/Manifest b/dev-ruby/concurrent-ruby/Manifest
index d6de30eaf1e8..dc414c843a91 100644
--- a/dev-ruby/concurrent-ruby/Manifest
+++ b/dev-ruby/concurrent-ruby/Manifest
@@ -1,6 +1,3 @@
 DIST concurrent-ruby-1.2.2.tar.gz 1161215 BLAKE2B 42f42022e469a1131d40e96a04dacb0ac49d94e96b6a8c58348d34402319ea0abff53b8b1312a274a34c332301ca17a007b685d8d9fe8c229350177abac0a285 SHA512 e2b26de147468b09403cd1727750922526ba240ad0cfe7889b722b357a3c71e709b12958cc4dad1a0d2d2c10d4dd2c67be1fe23053b98c35c7a50722fecb24b0
-DIST concurrent-ruby-1.2.3.tar.gz 1152422 BLAKE2B 72057ef4db1cc7dd0eb30122671e1c6106d1330215ded04040cbb92c10688866a643b0614bda21accbf8782470b03ea53c2b5b5e4e69a01cb73a2dac2b41d182 SHA512 6da7b3e13f7043f9fbb95b566e312584c479d7de5e34e29bfa90887ade143fca756dd40d7135dc923c41c468bc402e6fd06f33a075465ca6bde763affe50c751
-DIST concurrent-ruby-1.3.1.tar.gz 1153932 BLAKE2B e516528e20f23c1f65f6528b97f5ee61f8cb61cb34703022e2763736a85d4e55ce637df45e9477cc39c93d89b92e63adc23a8966d5c025ba328bf9d148ebe629 SHA512 837705cd37f7c6c16f3ac1f7b0ed5f4f460c8f3dbe87fa1cfc4efd8e70e4c70f62efe7dfd009a4bfc5626fbdda9fabc87a6e1efb82ab03926b6d098a5ead4423
-DIST concurrent-ruby-1.3.2.tar.gz 1154379 BLAKE2B 23a3b344fdabf403e8176db941cb953e5d59d41d417021ba2412005f486f4cec88d2bd29aaef6481fc7727759493bc5c9fca8cdb6af832ddd38e1a9f34365f5b SHA512 a74fd5c1df97289b4287d3a20fddd3d4277019288e45227649d3597199c1a47325b626d8c323fc722e6638b8f8433729b541acaa060a7b570a921a78ebb49eec
-DIST concurrent-ruby-1.3.3.tar.gz 1154451 BLAKE2B d18d02e94d42f8937b0e662216b3b87ea8fd52fee8c1a110c3d291062055c58e1fa6938dc0e7b9bef0dbbd250e08d648751ed65f460a79494fa2dbb14759184a SHA512 bf6f7883637dd4026d0ae14cca053eaf0c080976a28c5438290787bfafa43fa93c217e58976ada5d764b81a5884f0229d0b29044ac84d770679559803927b12d
 DIST concurrent-ruby-1.3.4.tar.gz 1154935 BLAKE2B f27a8b1deab77b7897d9faadc4ddef9a8dbe55988e0a7cbcfd88a32b0369fbf37ab3c98a8244bae1509ae128d01c283b18716a723b5a3173d8e8f5cef28a37b2 SHA512 d08a20ec465429875ddb1b1bcc7a75e74cfdb3113e4141e7d7f690ddd6fe50af978b7911bf0457a3e535fd79e463e423c34d23f77e645ecb6dd69704b17fdad6
+DIST concurrent-ruby-1.3.5.tar.gz 1155186 BLAKE2B 11c4dc45094b505d5a9104f9cf797358ac1fe9e3fd649df2a5560d4f030017df7ef0d936b0f948a83f40946872cb615345d9b1c607258be4591bc2c836007789 SHA512 0bf85fb3d9c5b1107768e2175c9f6958449de4033be403ef92d73f3f665ce04fca1a6d1437493b83ce7a1928c79ec89bda7ec47d9d7053435b7de0b5158afba7
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.2.3.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.2.3.ebuild
deleted file mode 100644
index cc6cafba3b2e..000000000000
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.2.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Modern concurrency tools including agents, futures, promises, thread pools, more"
-HOMEPAGE="https://github.com/ruby-concurrency/concurrent-ruby"
-SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.9 )"
-
-all_ruby_prepare() {
-	# Remove edge files as defined in support/file_map.rb
-	rm -rf spec/concurrent/{actor,cancellation,channel,edge,lazy_register,processing,promises,throttle}* || die
-	rm -r spec/concurrent/executor/wrapping_executor_spec.rb || die
-	sed -i -e '/concurrent-edge/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's:lib-edge:lib/concurrent-ruby:' .rspec || die
-	sed -i -e 's:../../../::' spec/concurrent/executor/executor_quits.rb || die
-
-	# Remove specs for the ext gem
-	rm -rf spec/concurrent/atomic || die
-
-	sed -i 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.1.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.1.ebuild
deleted file mode 100644
index cc6cafba3b2e..000000000000
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Modern concurrency tools including agents, futures, promises, thread pools, more"
-HOMEPAGE="https://github.com/ruby-concurrency/concurrent-ruby"
-SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.9 )"
-
-all_ruby_prepare() {
-	# Remove edge files as defined in support/file_map.rb
-	rm -rf spec/concurrent/{actor,cancellation,channel,edge,lazy_register,processing,promises,throttle}* || die
-	rm -r spec/concurrent/executor/wrapping_executor_spec.rb || die
-	sed -i -e '/concurrent-edge/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's:lib-edge:lib/concurrent-ruby:' .rspec || die
-	sed -i -e 's:../../../::' spec/concurrent/executor/executor_quits.rb || die
-
-	# Remove specs for the ext gem
-	rm -rf spec/concurrent/atomic || die
-
-	sed -i 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.2.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.2.ebuild
deleted file mode 100644
index cc6cafba3b2e..000000000000
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Modern concurrency tools including agents, futures, promises, thread pools, more"
-HOMEPAGE="https://github.com/ruby-concurrency/concurrent-ruby"
-SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.9 )"
-
-all_ruby_prepare() {
-	# Remove edge files as defined in support/file_map.rb
-	rm -rf spec/concurrent/{actor,cancellation,channel,edge,lazy_register,processing,promises,throttle}* || die
-	rm -r spec/concurrent/executor/wrapping_executor_spec.rb || die
-	sed -i -e '/concurrent-edge/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's:lib-edge:lib/concurrent-ruby:' .rspec || die
-	sed -i -e 's:../../../::' spec/concurrent/executor/executor_quits.rb || die
-
-	# Remove specs for the ext gem
-	rm -rf spec/concurrent/atomic || die
-
-	sed -i 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.3.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.3.ebuild
deleted file mode 100644
index cc6cafba3b2e..000000000000
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Modern concurrency tools including agents, futures, promises, thread pools, more"
-HOMEPAGE="https://github.com/ruby-concurrency/concurrent-ruby"
-SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.9 )"
-
-all_ruby_prepare() {
-	# Remove edge files as defined in support/file_map.rb
-	rm -rf spec/concurrent/{actor,cancellation,channel,edge,lazy_register,processing,promises,throttle}* || die
-	rm -r spec/concurrent/executor/wrapping_executor_spec.rb || die
-	sed -i -e '/concurrent-edge/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's:lib-edge:lib/concurrent-ruby:' .rspec || die
-	sed -i -e 's:../../../::' spec/concurrent/executor/executor_quits.rb || die
-
-	# Remove specs for the ext gem
-	rm -rf spec/concurrent/atomic || die
-
-	sed -i 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.5.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.5.ebuild
new file mode 100644
index 000000000000..4a3f3fbb74ed
--- /dev/null
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.3.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Modern concurrency tools including agents, futures, promises, thread pools, more"
+HOMEPAGE="https://github.com/ruby-concurrency/concurrent-ruby"
+SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.9 )"
+
+all_ruby_prepare() {
+	# Remove edge files as defined in support/file_map.rb
+	rm -rf spec/concurrent/{actor,cancellation,channel,edge,lazy_register,processing,promises,throttle}* || die
+	rm -r spec/concurrent/executor/wrapping_executor_spec.rb || die
+	sed -i -e '/concurrent-edge/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's:lib-edge:lib/concurrent-ruby:' .rspec || die
+	sed -i -e 's:../../../::' spec/concurrent/executor/executor_quits.rb || die
+
+	# Remove specs for the ext gem
+	rm -rf spec/concurrent/atomic || die
+
+	sed -e 's/git ls-files/find * -print/' \
+		-e "s/__dir__/'.'/" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/connection_pool/Manifest b/dev-ruby/connection_pool/Manifest
index b6511dbbfed6..ae912b5ccedb 100644
--- a/dev-ruby/connection_pool/Manifest
+++ b/dev-ruby/connection_pool/Manifest
@@ -1 +1,2 @@
 DIST connection_pool-2.4.1.tar.gz 11425 BLAKE2B 17aae4f8ce0461554eaddb4ee3535062608d75a29219ca44b1535f087db39429ddbc591d996c020b1fa557337e75bb15b0ac218e8b9f393f94e32e70ffe76800 SHA512 4529446de89d01adee28127807fe104ada683866bc61b60ee77acb718881aced982aa1a1e6e2330077d79ed3d77af199e8612a6dc08de4c40468ac4e3623b799
+DIST connection_pool-2.5.0.tar.gz 13120 BLAKE2B e914c07de63367d61e0f136ac95cb15cfb0595a232f2c72095b0ae97959f7d49a7dd1295e1509a3a21a43429e2f44a454e3e2146076cce683fdf6a0229e274d4 SHA512 ce43edb4dd25c050ad93d13ad0a4243bd8ed3234f3af3593b5301696fe31574b4ec20ffb6410caa459876ab4ed4d39d4767ebf57dd2970c25ad18672b42342ed
diff --git a/dev-ruby/connection_pool/connection_pool-2.5.0.ebuild b/dev-ruby/connection_pool/connection_pool-2.5.0.ebuild
new file mode 100644
index 000000000000..91a152103373
--- /dev/null
+++ b/dev-ruby/connection_pool/connection_pool-2.5.0.ebuild
@@ -0,0 +1,29 @@
+# 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_GEMSPEC="connection_pool.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changes.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generic connection pooling for Ruby"
+HOMEPAGE="https://github.com/mperham/connection_pool"
+SRC_URI="https://github.com/mperham/connection_pool/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' connection_pool.gemspec || die
+	sed -i -e '/\(bundler\|standard\)/ s:^:#:' Rakefile || die
+	sed -i -e "s/gem 'minitest'/gem 'minitest', '~> 5.0'/" test/helper.rb || die
+}
diff --git a/dev-ruby/diff-lcs/Manifest b/dev-ruby/diff-lcs/Manifest
index 82610ea80a0c..f63335a09e27 100644
--- a/dev-ruby/diff-lcs/Manifest
+++ b/dev-ruby/diff-lcs/Manifest
@@ -1,2 +1 @@
-DIST diff-lcs-1.5.0.gem 52736 BLAKE2B ff405fd3ed5238af3eba2ab4fa277edca0eec66df93b0e8d6fba1a52980d484623e57f70587de31fec1696e556f2ae90d82af4b856a9bd4a248de12aa74ada4a SHA512 5cef9dc1d143217cc402173e2b84ffdcbb8d5a4d05716bdbca732ac00d73591e4cab2f7e792382a3686d8e72fdc32269fd7100941d602ca6d683e7645229ef8d
 DIST diff-lcs-1.5.1.gem 53248 BLAKE2B a40399223c659b548e59605eb537faae8eff139cacf793fea6af1e543016f8afa80049490dccf915edb0063bd3d71705e47c6343e1f616903b8c12a6f37c8cf4 SHA512 ad0357a047b57bb0314b158f92e83485cec9fe6a3dfeb16117d57cf746ee38545f652397093448862ff36d13945bda3b26bb22b5d0d91643b16ae11548ef463b
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.5.0.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.5.0.ebuild
deleted file mode 100644
index b80c3802e940..000000000000
--- a/dev-ruby/diff-lcs/diff-lcs-1.5.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Use the McIlroy-Hunt LCS algorithm to compute differences"
-HOMEPAGE="https://github.com/halostatue/diff-lcs"
-
-LICENSE="|| ( Artistic MIT GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
diff --git a/dev-ruby/dry-core/Manifest b/dev-ruby/dry-core/Manifest
index 028684b4143a..2d80cdd9bcc2 100644
--- a/dev-ruby/dry-core/Manifest
+++ b/dev-ruby/dry-core/Manifest
@@ -1,2 +1,3 @@
 DIST dry-core-1.0.1.tar.gz 44746 BLAKE2B fb85107dd68dfb2a8d3ee2e66b4bb8b416ac325be4d28bcbbf5605e0a90992eb8aa85a8fad3cba8f228a5a7e50109cd2c1dbf920eebc3423d282055204c6b0a5 SHA512 d769795459a0ffc007eb66e2b9af9be4e635c620a5ca54a76113057b495e1126600a572761d8ff33a3ee6a4fca948f6fc29d3200e7ba0b56c1bb600a4749bbd4
 DIST dry-core-1.0.2.tar.gz 44646 BLAKE2B 0ae5a3d2bd245d7f42b9f500841dc47e8baf827e78a89d3a2f1edd5e4821470b26eb9180079886bcbb007d2ab86369ddb1855a465a88fe04e30a6dbe557b2a92 SHA512 4d4ba37f3c7d25047cd0b4d5f28a358ed98e664ac5397476f3999dae26674a63d5e70fc9f64f0a8b863149ba9978d6dd87af89f55fc6ad43236c09c235550345
+DIST dry-core-1.1.0.tar.gz 44589 BLAKE2B ec1cca6b3eba5d23c721993d681c1518e1f5466714dad0b6a7e77f1a5de5c5f805ff49ece775569fc257e5106f597e0cec610776aaa06a0cc298d79e3a9d1228 SHA512 2649b04c95b9e53048808c5df6a1346f6c54c862bac6d164aa8c4c4f5f333d778c555fa081cbbaedab83925e72027b6391418f6857936a4d8a0940005f8c0d52
diff --git a/dev-ruby/dry-core/dry-core-1.1.0.ebuild b/dev-ruby/dry-core/dry-core-1.1.0.ebuild
new file mode 100644
index 000000000000..2352c7017c06
--- /dev/null
+++ b/dev-ruby/dry-core/dry-core-1.1.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="dry-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A toolset of small support modules used throughout the dry-rb ecosystem"
+
+HOMEPAGE="https://dry-rb.org/gems/dry-core/"
+SRC_URI="https://github.com/dry-rb/dry-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+ruby_add_rdepend "
+	dev-ruby/concurrent-ruby:1
+	dev-ruby/logger
+	>=dev-ruby/zeitwerk-2.6:2
+"
+
+ruby_add_bdepend "test? (
+	<dev-ruby/activesupport-8
+	dev-ruby/dry-inflector
+	dev-ruby/dry-logic
+	dev-ruby/dry-types
+)"
+
+all_ruby_prepare() {
+	# Inflecto is not packaged
+	sed -e '/with Inflecto/ s/context/xcontext/' \
+		-i spec/dry/core/inflector_spec.rb || die
+
+	sed -e '3igem "activesupport", "<8"' \
+		-i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/dry-inflector/Manifest b/dev-ruby/dry-inflector/Manifest
index 9e18d2b77e33..15c80d0eee7b 100644
--- a/dev-ruby/dry-inflector/Manifest
+++ b/dev-ruby/dry-inflector/Manifest
@@ -1,2 +1,2 @@
-DIST dry-inflector-1.0.0.tar.gz 25030 BLAKE2B 628f5af9ac1517e6711242b6678808c0b64f1f1bb3391e0792fe85ccebfe4c334e2ee62370bd3a13f842a435028b684c09b8215c78ab7fbe2742679863f8e27d SHA512 34b5e723982621e3e090fe9273310d6dfd6e8145c274d7eefe2e7c3bdcc2c6222c2a6bc6e0bbd70d79226b81f1cd89d8364692421ef3dd361432a03b1a8d1c06
 DIST dry-inflector-1.1.0.tar.gz 26360 BLAKE2B 2b918590372d9ae1591e08420a5e3c926934188e96541c238a6ee6275f293a02d2148b69544e77f6935012f600f709db22cb78688dcbed49b68dd8fe37285cc6 SHA512 cb01f251ea7ce9ea6339f528e2eb146e81fb74ffd36ff93b6375718677e33e4c29711fa3699cdab881916b0b8caea15740aae1b3dc418da04cf74ba852e8a568
+DIST dry-inflector-1.2.0.tar.gz 26459 BLAKE2B aa34171c2e059097da1f3e66b43a177e8a66abde488a8a1024991665ebb4fef1687382fdfd367ba71ba9fe1a44183aa58f82806a80d6fb8650008f84bac6c248 SHA512 3345a66caf6b6dc62e6ce6ebc1704b4dc8377cbf203a54b34c4a47e7cdc40551fdcb68cbfb616dd9ed0ce635e52826f73fea83dc86b53e55618c772eafcebe0d
diff --git a/dev-ruby/dry-inflector/dry-inflector-1.0.0.ebuild b/dev-ruby/dry-inflector/dry-inflector-1.0.0.ebuild
deleted file mode 100644
index 2ac05ebf42cd..000000000000
--- a/dev-ruby/dry-inflector/dry-inflector-1.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="dry-inflector.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="String inflections for dry-rb"
-
-HOMEPAGE="https://dry-rb.org/gems/dry-inflector/"
-SRC_URI="https://github.com/dry-rb/dry-inflector/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/warning )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|coverage\)/ s/^/#/' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/dry-inflector/dry-inflector-1.2.0.ebuild b/dev-ruby/dry-inflector/dry-inflector-1.2.0.ebuild
new file mode 100644
index 000000000000..8e613e1280de
--- /dev/null
+++ b/dev-ruby/dry-inflector/dry-inflector-1.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="dry-inflector.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="String inflections for dry-rb"
+
+HOMEPAGE="https://dry-rb.org/gems/dry-inflector/"
+SRC_URI="https://github.com/dry-rb/dry-inflector/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/warning )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|coverage\)/ s/^/#/' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/dry-logic/Manifest b/dev-ruby/dry-logic/Manifest
index 225926e58b44..0be7168b2e32 100644
--- a/dev-ruby/dry-logic/Manifest
+++ b/dev-ruby/dry-logic/Manifest
@@ -1 +1,2 @@
 DIST dry-logic-1.5.0.tar.gz 38438 BLAKE2B 9b00ac4bed7c400858554b3485f0bce04633caaac2b70bd0c76c1d11cb20b1ab34136a3e2189e247b012833f10219140366c18faa7af09d603b3b8cca4778dda SHA512 cde3a01c0c16af1bd40f6c0c39b8777e464d6796f5c1eb52297453bb4301934c23ec48ac0e2bcc023844252b5da38687ae0bb8977f99c7f656d3fe18708bb7b8
+DIST dry-logic-1.6.0.tar.gz 40513 BLAKE2B f030a293fca7153ff4c06909cdd1ac3eba09bb9b7237f4ffa3b7663bc08b4e9c1cd86d1caed8cac0fd1d1392d1d3d1b966425d5e2fc2c7129285bc9528015818 SHA512 9ec100d08213e85d4164de672861c8507abe67fde67edbe90ca0c0076097007aad935c98d58544e210d6e603e07cdd57b0140c45b458908739d9b76db7855604
diff --git a/dev-ruby/dry-logic/dry-logic-1.6.0.ebuild b/dev-ruby/dry-logic/dry-logic-1.6.0.ebuild
new file mode 100644
index 000000000000..a2c87f294df3
--- /dev/null
+++ b/dev-ruby/dry-logic/dry-logic-1.6.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="dry-logic.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Predicate logic with rule composition"
+
+HOMEPAGE="https://dry-rb.org/gems/dry-logic/"
+SRC_URI="https://github.com/dry-rb/dry-logic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/bigdecimal
+	dev-ruby/concurrent-ruby:1
+	dev-ruby/dry-core:1
+	>=dev-ruby/zeitwerk-2.6:2
+"
+
+ruby_add_bdepend "test? ( dev-ruby/warning )"
+
+all_ruby_prepare() {
+	sed -e '3irequire "uri"' -i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/dry-monads/Manifest b/dev-ruby/dry-monads/Manifest
index c6d8af4e7536..ab3c18a7fa04 100644
--- a/dev-ruby/dry-monads/Manifest
+++ b/dev-ruby/dry-monads/Manifest
@@ -1 +1,2 @@
 DIST dry-monads-1.6.0.tar.gz 77141 BLAKE2B 714b2a35b6136639e4b071f01dcdc01a83b447731906b0b98f9101a4d524f77395d8f2e77b7c09ea8bd039f53de6ba2fbaeaaf805d63d299d10fa5c92b07080a SHA512 080e02299f2a39159bdf571afa4678ccade07e363f60ad7fef397e07dfa156e9a187757cc6de199fbc876c79110e73b9541369d3d04b32fdb6bde13e96bcb300
+DIST dry-monads-1.7.0.tar.gz 77851 BLAKE2B ae665e9e04d3c395be2f8356e8e1cecaee9a17f3c572d7d9b3ff265d4eefea490863e2f256e9de0175baac7dbb769d543fdfada58fb9f0364a2eba208201331f SHA512 4719db7a144e751b9e38fd39cc3d4aece5a273146f2aed0a7397b280aacab59f6540fd3848c6ddf3fb9d68e812d86bb242b488cdde35b56328e13b02adafc6b9
diff --git a/dev-ruby/dry-monads/dry-monads-1.7.0.ebuild b/dev-ruby/dry-monads/dry-monads-1.7.0.ebuild
new file mode 100644
index 000000000000..01c798b92dad
--- /dev/null
+++ b/dev-ruby/dry-monads/dry-monads-1.7.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="dry-monads.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Common monads for Ruby"
+
+HOMEPAGE="https://dry-rb.org/gems/dry-monads/"
+SRC_URI="https://github.com/dry-rb/dry-monads/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/concurrent-ruby:1
+	dev-ruby/dry-core:1
+	>=dev-ruby/zeitwerk-2.6:2
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/dry-types
+	dev-ruby/warning
+)"
diff --git a/dev-ruby/dry-struct/Manifest b/dev-ruby/dry-struct/Manifest
index 93ee03259b59..fab2f16fdd9a 100644
--- a/dev-ruby/dry-struct/Manifest
+++ b/dev-ruby/dry-struct/Manifest
@@ -1 +1,2 @@
 DIST dry-struct-1.6.0.tar.gz 37804 BLAKE2B c41a764cea576126ace4729dcc34ccd88c80f8751d8e9e11c825fc4caccd3a2cf5b7c92b129d2275cc8731f70ae98271462a359e8f6acf3c5ba2242513d20e6b SHA512 78258a74fd4b359142d42133df4f632dca7518959a15e42d544ee3b3e94ff5f2c7d14b2ed38609a125c788d092203d574d46f5a1030f9ec28738f76d24d7cdcc
+DIST dry-struct-1.7.0.tar.gz 39963 BLAKE2B f484a9ae9cc828c81d79a37fdbf0054fa4d38468061d45ef36d84f96fb52bbb69068edc4fade477faecfb1161b9b0911bac9c00c3d280104e2a84f2f9ce56270 SHA512 14c40d01be5e5a9dcdfc385415d86128da78fd25d34161c32299d403ecc8dcf27bddeecc416fccce9be964de21dde418330c728a3fb9e7f3ae3767aea5d8dfd7
diff --git a/dev-ruby/dry-struct/dry-struct-1.7.0.ebuild b/dev-ruby/dry-struct/dry-struct-1.7.0.ebuild
new file mode 100644
index 000000000000..21f2e05f8c52
--- /dev/null
+++ b/dev-ruby/dry-struct/dry-struct-1.7.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="dry-struct.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Typed structs and value objects"
+
+HOMEPAGE="https://dry-rb.org/gems/dry-struct/"
+SRC_URI="https://github.com/dry-rb/dry-struct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/dry-core-1.1:1
+	>=dev-ruby/dry-types-1.8:1
+	>=dev-ruby/ice_nine-0.11:0
+	>=dev-ruby/zeitwerk-2.6:2
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/dry-monads
+	dev-ruby/dry-struct
+	dev-ruby/warning
+)"
+
+all_ruby_prepare() {
+	# Avoid broken spec, already fixed upstream.
+	sed -e '/with Test::User/ s/context/xcontext/' \
+		-e '/with Test::SuperUSer/ s/context/xcontext/' \
+		-i spec/extensions/pretty_print_spec.rb || die
+}
diff --git a/dev-ruby/dry-types/Manifest b/dev-ruby/dry-types/Manifest
index 5fe862332caf..1afa01a1924a 100644
--- a/dev-ruby/dry-types/Manifest
+++ b/dev-ruby/dry-types/Manifest
@@ -1 +1,2 @@
 DIST dry-types-1.7.2.tar.gz 101450 BLAKE2B e0ebd390bea2178a9a348b65bc7cb5af8657d61f66a77ba52ba26e64aab44c2bd6d142c164c023002244aded5da7175199108c069635b1031d469d7e678f0ed1 SHA512 401372b73b55947d1ba6619903cacd422be1a04ffdd3746d3323a68afa98fcea3d87a4bf1d81a9e9a389b2dcd8dd3a9d096f6982d168528d9fadf60e0fc33076
+DIST dry-types-1.8.0.tar.gz 102719 BLAKE2B 2fdb836d2bdc2e0a71d3239c5588d13341b4b1706f8626702ecf4187c6b8ac54dc3bbe6ce353465c9097773275b184496c5e07ec8045b024d714565cd460f0cd SHA512 001c4f1de3f8bec175eecb0052a477e044125c9582c41d44a61b6d5133a2b011b211e8b8c4c2216a708abdd06abaa51c75ef9b54bd43e0d6d646448616fd2dfe
diff --git a/dev-ruby/dry-types/dry-types-1.8.0.ebuild b/dev-ruby/dry-types/dry-types-1.8.0.ebuild
new file mode 100644
index 000000000000..387117ddb1b8
--- /dev/null
+++ b/dev-ruby/dry-types/dry-types-1.8.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="dry-types.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Type system for Ruby supporting coercions, constraints and complex types."
+
+HOMEPAGE="https://dry-rb.org/gems/dry-types/"
+SRC_URI="https://github.com/dry-rb/dry-types/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/bigdecimal:0
+	dev-ruby/concurrent-ruby:1
+	dev-ruby/dry-core:1
+	dev-ruby/dry-inflector:1
+	>=dev-ruby/dry-logic-1.4:1
+	>=dev-ruby/zeitwerk-2.6:2
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/dry-monads
+	dev-ruby/dry-struct
+	dev-ruby/warning
+)"
diff --git a/dev-ruby/elasticsearch-api/Manifest b/dev-ruby/elasticsearch-api/Manifest
index 0f0fc328993e..460bc4c7f09b 100644
--- a/dev-ruby/elasticsearch-api/Manifest
+++ b/dev-ruby/elasticsearch-api/Manifest
@@ -2,3 +2,4 @@ DIST elasticsearch-ruby-7.17.11.tar.gz 1033022 BLAKE2B 77fb6b37d447af88a6b093bf3
 DIST elasticsearch-ruby-8.15.0.tar.gz 1935690 BLAKE2B 380eebdb9fdcce1600051d9078d8af90789fa4f0b91266fe2297092aa32eed96dabe591fad69f8f4a37f56f15dbbe32a79d07c25693cc83907ba52eb10a77c32 SHA512 011f01914e457959f9737a65cc1fc09e0c31f70c4c4976a14b2506a2b66f4ffbaadc8fb643db10ec90b70a7cc0012c7752aecd598a76a9281cf12586e27fb08a
 DIST elasticsearch-ruby-8.16.0.tar.gz 1938620 BLAKE2B 742180d14d6d003b498f2e5812239c6d83c39c5d8fb37dad1a113f017857fe2563932e05ca67774e1db428f264d57d43bd694b6bf784c374db0c560e31af2931 SHA512 78191a95577aa443a85c75476a6743cc31371958a3f30d1d95cbe9159893bdeb297a9010c1e41d7adcb53172f5f096e7666a8f1506a6b05fcbaa7559328589ab
 DIST elasticsearch-ruby-8.17.0.tar.gz 1940073 BLAKE2B 25d141927f4adacb2f7d447a8f929859fd0081526e47355673d702445cdb01add122c303d1cea6bef0f4c5d9ac743c55fba98220303a9440218e99860bd619e8 SHA512 2968ed0648eeb9b0b0620d6778f9dd63cee0c20da433a5023b6c0eec8f9c906449cc5d5c8a0bad195815f6f85b93e70545dafc43c9ce2fdbf113be80524ee3ab
+DIST elasticsearch-ruby-8.17.1.tar.gz 1940369 BLAKE2B 95e7b79b6f95905ce221cda6bea928868507d8629f8122a1eb3181e4da3a652df0e35ed13823451d10fd3fc3e6e619c24856803afdef68ecb6340f843d4ac382 SHA512 49937635a2488a155a03dc86ac55ec27b3e1c98ed4445a0df038e9cc6ac51d524252ac8b923c1174f7d121a42d1f72d542c0460e360c055dacb467c916dff970
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-7.17.11.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-7.17.11.ebuild
index 7c0b693e967d..a4fc7b18df15 100644
--- a/dev-ruby/elasticsearch-api/elasticsearch-api-7.17.11.ebuild
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-7.17.11.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
 
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 RUBY_FAKEGEM_TASK_DOC=doc
 
@@ -31,7 +31,7 @@ ruby_add_bdepend "
 		dev-ruby/ansi
 		dev-ruby/elasticsearch
 		dev-ruby/elasticsearch-transport
-		dev-ruby/mocha:1.0
+		dev-ruby/mocha:2
 		dev-ruby/pry
 		dev-ruby/rspec:3
 		dev-ruby/shoulda-context
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-8.17.1.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-8.17.1.ebuild
new file mode 100644
index 000000000000..06beb83a7e82
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-8.17.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/activesupport
+		dev-ruby/ansi
+		dev-ruby/elasticsearch
+		dev-ruby/elastic-transport
+		dev-ruby/mocha:2
+		dev-ruby/patron
+		dev-ruby/pry
+		dev-ruby/rspec:3
+		dev-ruby/shoulda-context
+		dev-ruby/yard
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -i -e '/add_formatter/ s/documentation/progress/' spec/spec_helper.rb || die
+
+	# Avoid tests that require unpackaged jbuilder and jsonify
+	sed -e '/\(pry-\|jbuilder\|jsonify\)/ s:^:#:' \
+		-e '/RspecJunitFormatter/ s:^:#:' \
+		-e '/ansi/arequire "patron"' \
+		-i spec/spec_helper.rb || die
+	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
+
+	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
+
+	# Create tmp directory required for tests
+	mkdir -p ../tmp/rest-api-spec/api || die
+}
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.11.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.11.ebuild
index dfa6f97a2350..863445d284e7 100644
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.11.ebuild
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.11.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
 
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -29,7 +29,7 @@ ruby_add_bdepend "
 	doc? ( dev-ruby/yard )
 	test? (
 		dev-ruby/ansi
-		dev-ruby/mocha:1.0
+		dev-ruby/mocha:2
 		dev-ruby/pry
 		dev-ruby/rspec:3
 		dev-ruby/shoulda-context
diff --git a/dev-ruby/elasticsearch/Manifest b/dev-ruby/elasticsearch/Manifest
index 0f0fc328993e..460bc4c7f09b 100644
--- a/dev-ruby/elasticsearch/Manifest
+++ b/dev-ruby/elasticsearch/Manifest
@@ -2,3 +2,4 @@ DIST elasticsearch-ruby-7.17.11.tar.gz 1033022 BLAKE2B 77fb6b37d447af88a6b093bf3
 DIST elasticsearch-ruby-8.15.0.tar.gz 1935690 BLAKE2B 380eebdb9fdcce1600051d9078d8af90789fa4f0b91266fe2297092aa32eed96dabe591fad69f8f4a37f56f15dbbe32a79d07c25693cc83907ba52eb10a77c32 SHA512 011f01914e457959f9737a65cc1fc09e0c31f70c4c4976a14b2506a2b66f4ffbaadc8fb643db10ec90b70a7cc0012c7752aecd598a76a9281cf12586e27fb08a
 DIST elasticsearch-ruby-8.16.0.tar.gz 1938620 BLAKE2B 742180d14d6d003b498f2e5812239c6d83c39c5d8fb37dad1a113f017857fe2563932e05ca67774e1db428f264d57d43bd694b6bf784c374db0c560e31af2931 SHA512 78191a95577aa443a85c75476a6743cc31371958a3f30d1d95cbe9159893bdeb297a9010c1e41d7adcb53172f5f096e7666a8f1506a6b05fcbaa7559328589ab
 DIST elasticsearch-ruby-8.17.0.tar.gz 1940073 BLAKE2B 25d141927f4adacb2f7d447a8f929859fd0081526e47355673d702445cdb01add122c303d1cea6bef0f4c5d9ac743c55fba98220303a9440218e99860bd619e8 SHA512 2968ed0648eeb9b0b0620d6778f9dd63cee0c20da433a5023b6c0eec8f9c906449cc5d5c8a0bad195815f6f85b93e70545dafc43c9ce2fdbf113be80524ee3ab
+DIST elasticsearch-ruby-8.17.1.tar.gz 1940369 BLAKE2B 95e7b79b6f95905ce221cda6bea928868507d8629f8122a1eb3181e4da3a652df0e35ed13823451d10fd3fc3e6e619c24856803afdef68ecb6340f843d4ac382 SHA512 49937635a2488a155a03dc86ac55ec27b3e1c98ed4445a0df038e9cc6ac51d524252ac8b923c1174f7d121a42d1f72d542c0460e360c055dacb467c916dff970
diff --git a/dev-ruby/elasticsearch/elasticsearch-7.17.11.ebuild b/dev-ruby/elasticsearch/elasticsearch-7.17.11.ebuild
index d53f1669e0bf..9a9a02245ada 100644
--- a/dev-ruby/elasticsearch/elasticsearch-7.17.11.ebuild
+++ b/dev-ruby/elasticsearch/elasticsearch-7.17.11.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
 
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
@@ -30,7 +30,7 @@ ruby_add_bdepend "
 	test? (
 		dev-ruby/ansi
 		dev-ruby/elasticsearch-transport
-		dev-ruby/mocha:1.0
+		dev-ruby/mocha:2
 		dev-ruby/pry
 		dev-ruby/shoulda-context
 		dev-ruby/webmock
diff --git a/dev-ruby/elasticsearch/elasticsearch-8.17.1.ebuild b/dev-ruby/elasticsearch/elasticsearch-8.17.1.ebuild
new file mode 100644
index 000000000000..de8538d090f6
--- /dev/null
+++ b/dev-ruby/elasticsearch/elasticsearch-8.17.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	~dev-ruby/elasticsearch-api-${PV}
+	>=dev-ruby/elastic-transport-8.3:8
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/base64
+		dev-ruby/mocha:2
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -e '/documentation/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid spec requiring a running elasticsearch server
+	rm -f spec/integration/{characters_escaping,client_integration,validation_integration}_spec.rb || die
+	rm -f spec/integration/helpers/*_helper_spec.rb || die
+}
diff --git a/dev-ruby/excon/Manifest b/dev-ruby/excon/Manifest
index 28377e204c17..d9ee4860d717 100644
--- a/dev-ruby/excon/Manifest
+++ b/dev-ruby/excon/Manifest
@@ -2,3 +2,4 @@ DIST excon-0.104.0.tar.gz 229173 BLAKE2B b719d9391f8afc3553c45b88436725e2d7ed649
 DIST excon-0.112.0.tar.gz 239915 BLAKE2B 5873c43ae0739d46c01c18caf2aeb22244372377b565cb00ee56a74995a9672165cba28f9da7cf53e9878e6f99cc69b50937b6bef6ebf7f7edd3ca8e81d41c00 SHA512 1b27cfbb8483c4f0ace6cead44f375e3fb13e7e551220f02f9ba6b3a868a2f9f5c28da535b82becc81f1350088b8246fce34c5b1a978c2da1ffeb3979771784f
 DIST excon-1.2.1.tar.gz 240670 BLAKE2B c68eaf58604939aab2a93964061114545a195aed8acce82165988cc26f8047e562448211bbe6e3aedf42d729a9deb06de1ac2ed7eeed0b5ba987f5106884a78f SHA512 773f994d69c505e1087627f332af08d6d39529ec35d528467c107c51149677d3ff7c281c10a929cd6b8594cba60656b310601a559c042eec4b7f291a69efa7d1
 DIST excon-1.2.2.tar.gz 242853 BLAKE2B 823cd40744233d190466e8d43a695a93640a5a651c1b8c16e67380466011e64bdfb98a6597964d149ecc77b881122aba15a29ec6350ac0b1406906d0f42142e8 SHA512 49b6eb69210420db25b3d2af3c151883bfacede9eef20a966c8d3d732fe7ec484826a3913d9a76088fcbc1389868a745ac72c723eef9f9496d7b5adc2c6cef54
+DIST excon-1.2.3.tar.gz 239407 BLAKE2B 74d6232b7b558821d65dc0e9644c7f3fa89379ea5a89b55b9d29cc271b2c6faf8f620a4d539608985a161aad2443ff2eee5e23d0996d051e407a1b7ee1501102 SHA512 6acd9cacad2f0689f824d56fda535968c70bfd42a9cedf9155cb6a25cffc187763e57e95109beeadff408092a58ae4ac188129fc22a230287203067271ad0965
diff --git a/dev-ruby/excon/excon-0.112.0.ebuild b/dev-ruby/excon/excon-0.112.0.ebuild
index cd358ef64a12..349c575aac3c 100644
--- a/dev-ruby/excon/excon-0.112.0.ebuild
+++ b/dev-ruby/excon/excon-0.112.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
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/excon/excon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/excon/excon-1.2.3.ebuild b/dev-ruby/excon/excon-1.2.3.ebuild
new file mode 100644
index 000000000000..a8a928e3343b
--- /dev/null
+++ b/dev-ruby/excon/excon-1.2.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="changelog.txt README.md"
+RUBY_FAKEGEM_GEMSPEC="excon.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="EXtended http(s) CONnections"
+HOMEPAGE="https://github.com/excon/excon"
+SRC_URI="https://github.com/excon/excon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "
+	dev-ruby/rake
+	test? (
+		dev-ruby/activesupport
+		>=dev-ruby/json-1.8.5
+		dev-ruby/open4
+		>=dev-ruby/rack-2.2.7-r1
+		dev-ruby/rackup
+		dev-ruby/rdoc
+		dev-ruby/sinatra
+		dev-ruby/webrick
+	)
+"
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# test that need network
+	rm -f spec/excon/test/server_spec.rb || die
+
+	# test that wrongly assumes 127.0.0.1 won't run a DNS server
+	rm -f spec/requests/{dns_timeout,resolv_resolver}_spec.rb || die
+
+	# tests that depend on eventmachine which is broken and no longer maintained
+	rm -f tests/{bad,error,pipeline,response,request}_tests.rb \
+		tests/{batch-requests,complete_responses}.rb \
+		tests/middlewares/{decompress,mock}_tests.rb  || die
+	rm -f spec/requests/eof_requests_spec.rb spec/excon/error_spec.rb || die
+}
diff --git a/dev-ruby/exifr/Manifest b/dev-ruby/exifr/Manifest
index 7a7eb397db27..6dbd9f08316d 100644
--- a/dev-ruby/exifr/Manifest
+++ b/dev-ruby/exifr/Manifest
@@ -1 +1,2 @@
 DIST exifr-1.4.0.tar.gz 266179 BLAKE2B 6f729fbfdfe4128760faf7b562495518ccbaa3d5d5b5e8ffdc5e9ce613271951cc9d3d27392bf80372b66a241d1157898a25480fd44b9d18e808a23766013e37 SHA512 cd4cfcf6ebc5d88e4d41d859756a2b887a3e4954c1b548616e7aaa6485c2c46fb4e74a0e20cd3644aa0aa3afcb59dc3f9cf865d9215b8a3b7b05cdac68f2a663
+DIST exifr-1.4.1.tar.gz 266512 BLAKE2B 0d86fe419535d742e1c999a9aa3a326e78da08176bf480dc8644cc43eb16b2433e956e9670a472897c7ce91cbf0feec7f6cfd60ca8025979bc833b9cc065f68a SHA512 c2163404d06df8e52c32fc4b2897b05186ad71bfa3f0927d00ccea541747fdf91f2c11ff70b7232804df6d08610829f5be7d821b1b3d79262da70b27ce885dfe
diff --git a/dev-ruby/exifr/exifr-1.4.1.ebuild b/dev-ruby/exifr/exifr-1.4.1.ebuild
new file mode 100644
index 000000000000..40475eb1309e
--- /dev/null
+++ b/dev-ruby/exifr/exifr-1.4.1.ebuild
@@ -0,0 +1,22 @@
+# 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_DOCDIR="doc/api"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library to read EXIF info from JPEG and TIFF images"
+HOMEPAGE="https://codeberg.org/rwv/exifr"
+SRC_URI="https://codeberg.org/rwv/exifr/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-ruby/exifr/metadata.xml b/dev-ruby/exifr/metadata.xml
index 7e8555564588..bee0a6643614 100644
--- a/dev-ruby/exifr/metadata.xml
+++ b/dev-ruby/exifr/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">remvee/exifr</remote-id>
+    <remote-id type="codeberg">rwv/exifr</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest
index 10d51e510384..33753bf562e4 100644
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@@ -1,4 +1,3 @@
-DIST fast_gettext-2.3.0.tar.gz 93620 BLAKE2B 2f4dd0f6ad74df593573ce73ee40da549e506fc6fc7ca9ea17dacaa120cec97c202ba31b1fe32b628006fa1381572858dc314110a76c1ee7a91c049664133ede SHA512 517499785022922e54278ad4427abaabb63fd9d0470398cfca1c1804f3ca4992c01105ea727d152d2b8d1cbab86138a7552dfbbd4b3b3241b5fc1a3298db7dc2
 DIST fast_gettext-2.6.0.tar.gz 94293 BLAKE2B b7b955fa87a010c85a22824a9bc5d6835836219cad13c82f42c16b1102a55b5d33a7386394efd2ba2baa299445d29e444ffcc750733ae51c9defc297a769a06a SHA512 1f0b824a8335572646a8486487e22b9fbe4ee63d0e67985a6b56806afac565610492834d34d5e45dab7908e986cc34ab80261aaea87489898e90b6fbe51a4f0a
-DIST fast_gettext-3.0.0.tar.gz 94279 BLAKE2B bc1988a87f9dfe3b6a68d6d614e0d42ead3b6eb6d698a55596fb394ca646fd373a066a49afd9d69806e3dbbdc48e8150249a64aa5f00ab75d88fa650ee02de8b SHA512 870263485465d02e03363ac4db3116cea1ecf2c71db7d5432fec10857de7653bc200241b8cf38ac30a17c51c498c3e1401b5fca3a27fc57a60c9940c7ace4ccb
 DIST fast_gettext-3.1.0.tar.gz 94367 BLAKE2B 9ac9716397eb8ae433a112b8d86451506a80dd3fbd92585ba5a2e24ce3a90d7926feb32ceb2ceda217858c696cdf5e05e6a2166653a5a2fde3e016768857f6f4 SHA512 71d3a9a0ce2ebc09fa462ea2ddc65c4fc6e6e5ae345e7c831dcfe02c1303d2c26700a14dadff31a457e701961dd3cc076bb50dbf9c654640636ce797cc9e7d5a
+DIST fast_gettext-4.1.0.tar.gz 94826 BLAKE2B 8c2ce52cb4738af96df90069daf1d587529f610c0b6c658c72b80f7bf654c4237bae9cd2363125cb77c038594b22db0f4ca069efed54f9e799f21c41519a9099 SHA512 40296ab8cf229c9739d86835c482cda372a6773580a0f4f17922c72d2a9dcb663b052c77d8733885b19a9784497f2af8a1ee702b734732cd75a29d2ad6b60ee8
diff --git a/dev-ruby/fast_gettext/fast_gettext-2.3.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-2.3.0.ebuild
deleted file mode 100644
index 3ee6d07d7a0b..000000000000
--- a/dev-ruby/fast_gettext/fast_gettext-2.3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="fast_gettext.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsafe!"
-HOMEPAGE="https://github.com/grosser/fast_gettext"
-SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm Gemfile.lock || die
-
-	sed -i -e '/single/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/SingleCov/ s:^:#:' spec/{*,*/*}/*spec.rb || die
-
-	# Avoid unneeded dependency on git and development dependencies.
-	sed -e '/git ls-files/ s:^:#:' \
-		-e '/\(wwtd\|bump\|sqlite3\|activerecord\|i18n\|single_cov\|forking_test_runner\|rubocop\)/ s:^:#:' \
-		-e 's:require_relative ":require "./:' \
-		-i fast_gettext.gemspec || die
-
-	# Avoid a test dependency on activerecord since this is now in the
-	# dependency tree for app-admin/puppet and many arches don't have
-	# rails keyworded.
-	sed -i -e '/active_record/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/fast_gettext/translation_repository/db_spec.rb || die
-	rm -f spec/fast_gettext/storage_spec.rb || die
-	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Make sure the right ruby interpreter is used
-	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
-}
diff --git a/dev-ruby/fast_gettext/fast_gettext-3.0.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-3.0.0.ebuild
deleted file mode 100644
index a2f8fdc3d20d..000000000000
--- a/dev-ruby/fast_gettext/fast_gettext-3.0.0.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
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="fast_gettext.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsafe!"
-HOMEPAGE="https://github.com/grosser/fast_gettext"
-SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT BSD-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-ruby_add_depend "dev-ruby/prime"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm Gemfile.lock || die
-
-	sed -i -e '/single/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/SingleCov/ s:^:#:' spec/{*,*/*}/*spec.rb || die
-
-	# Avoid unneeded dependency on git and development dependencies.
-	sed -e '/git ls-files/ s:^:#:' \
-		-e '/\(wwtd\|bump\|sqlite3\|activerecord\|i18n\|single_cov\|forking_test_runner\|rubocop\)/ s:^:#:' \
-		-e 's:require_relative ":require "./:' \
-		-i fast_gettext.gemspec || die
-
-	# Avoid a test dependency on activerecord since this is now in the
-	# dependency tree for app-admin/puppet and many arches don't have
-	# rails keyworded.
-	sed -i -e '/active_record/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/fast_gettext/translation_repository/db_spec.rb || die
-	rm -f spec/fast_gettext/storage_spec.rb || die
-	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Make sure the right ruby interpreter is used
-	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
-}
diff --git a/dev-ruby/fast_gettext/fast_gettext-4.1.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-4.1.0.ebuild
new file mode 100644
index 000000000000..a865a816fff5
--- /dev/null
+++ b/dev-ruby/fast_gettext/fast_gettext-4.1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="fast_gettext.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsafe!"
+HOMEPAGE="https://github.com/grosser/fast_gettext"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT BSD-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+ruby_add_depend "dev-ruby/prime dev-ruby/racc"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm Gemfile.lock || die
+
+	sed -i -e '/single/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/SingleCov/ s:^:#:' spec/{*,*/*}/*spec.rb || die
+
+	# Avoid unneeded dependency on git and development dependencies.
+	sed -e '/git ls-files/ s:^:#:' \
+		-e '/\(wwtd\|bump\|sqlite3\|activerecord\|i18n\|single_cov\|forking_test_runner\|rubocop\)/ s:^:#:' \
+		-e 's:require_relative ":require "./:' \
+		-i fast_gettext.gemspec || die
+
+	# Avoid a test dependency on activerecord since this is now in the
+	# dependency tree for app-admin/puppet and many arches don't have
+	# rails keyworded.
+	sed -i -e '/active_record/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/fast_gettext/translation_repository/db_spec.rb || die
+	rm -f spec/fast_gettext/storage_spec.rb || die
+	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Make sure the right ruby interpreter is used
+	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
+}
diff --git a/dev-ruby/fiber-storage/Manifest b/dev-ruby/fiber-storage/Manifest
index 1f442bc27969..86271d6de329 100644
--- a/dev-ruby/fiber-storage/Manifest
+++ b/dev-ruby/fiber-storage/Manifest
@@ -1 +1,2 @@
 DIST fiber-storage-0.1.2.tar.gz 6064 BLAKE2B d052a660b37947b27c924c278330820dd14b041fd1e9a02df74f076467613000b48cb8f4f053702430ad29465577017b027246ef3112e4ef1e4c048f4d84368a SHA512 761be842905c4ac6766dc333c82cbcd7f95e442c06b7426f8139910794ea5f779128c64d7fadb306de232f1f527800318deb41a8d0af877fc763ff30fc00b666
+DIST fiber-storage-1.0.0.tar.gz 7048 BLAKE2B 0f007d00ae5d7471f1268e42a33c7a6b809df1b188dc40c66576fc5b95d685118ed70f4fba37bfd6c18b28f4b02d27ce6f46fdbc433791411b8663bd14af6990 SHA512 c9f50dd2dda978c7050dab8fe16ee7eabe1b685a52e6a5c09e078d9fd7dceb7842a169b824b968e688c980b15d21f126415a4cbd8d014fe923133c452c090e24
diff --git a/dev-ruby/fiber-storage/fiber-storage-1.0.0.ebuild b/dev-ruby/fiber-storage/fiber-storage-1.0.0.ebuild
new file mode 100644
index 000000000000..923909d13d4d
--- /dev/null
+++ b/dev-ruby/fiber-storage/fiber-storage-1.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="fiber-storage.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a compatibility shim for fiber storage"
+HOMEPAGE="https://github.com/ioquatix/fiber-storage"
+SRC_URI="https://github.com/ioquatix/fiber-storage/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	rm -f config/sus.rb || die
+}
diff --git a/dev-ruby/file-tail/Manifest b/dev-ruby/file-tail/Manifest
index 35684f8ce76d..cacb7df0b344 100644
--- a/dev-ruby/file-tail/Manifest
+++ b/dev-ruby/file-tail/Manifest
@@ -1,2 +1 @@
-DIST file-tail-1.2.0.gem 19968 BLAKE2B 8a9ef8b73d2e7c8c21ec04e817991ebe40ba62800e565b607dbae9732b0192074cff4b3fc9dc7a495be9a2315eab63b48126e524091d72b37f7e8261cb1333f1 SHA512 ac20e5e855144f7462ef0471be08ab56e521a7b22117f1653e06624e1d81ac11d047a21a6979476bc8547dd88d90f25e51052950148acbe3ea64bdd3c35e1da3
 DIST file-tail-1.3.0.gem 20992 BLAKE2B ecb15f77cabebc9f048888eba2ae2b1b49e66cbbb6143c84a8f98e98f5f6f9480da0b1652b24adfcc826c318d84238e980b3309a0ab1782d6065cb0242726ac5 SHA512 225f73895d76f4c7db37dc891603cf9c7cd6a188c30cd6a19c758cb470ff89d3beb0887cd7bc052c846236b56384a928277c53dfe9e9adef60d35f4fe2f0d0f5
diff --git a/dev-ruby/file-tail/file-tail-1.2.0-r1.ebuild b/dev-ruby/file-tail/file-tail-1.2.0-r1.ebuild
deleted file mode 100644
index 752ea7517b83..000000000000
--- a/dev-ruby/file-tail/file-tail-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOC_SOURCES="lib README.md"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A small ruby library that allows it to 'tail' files in Ruby"
-HOMEPAGE="https://flori.github.io/file-tail/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/tins-1*"
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-all_ruby_prepare() {
-	sed -i -e '/test_tail_change2/aomit "has race condition"' tests/file_tail_test.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib tests/*_test.rb
-
-	rm -f test.*
-}
diff --git a/dev-ruby/file-tail/file-tail-1.3.0.ebuild b/dev-ruby/file-tail/file-tail-1.3.0.ebuild
index e323c0191884..57f30b27d5b6 100644
--- a/dev-ruby/file-tail/file-tail-1.3.0.ebuild
+++ b/dev-ruby/file-tail/file-tail-1.3.0.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
 
-USE_RUBY="ruby31 ruby32 ruby33"
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/google-protobuf/Manifest b/dev-ruby/google-protobuf/Manifest
index 54da6d766493..6f57b72a452d 100644
--- a/dev-ruby/google-protobuf/Manifest
+++ b/dev-ruby/google-protobuf/Manifest
@@ -1,6 +1,10 @@
 DIST google-protobuf-3.21.12-ruby.tar.gz 5141502 BLAKE2B 2e57a401b6fc86dff2af54e3d1a32db87f6c54fed46e557964c01c2d87f333ca94dafbe2d7d9cf279ac67d53219ae0154c5a1ea5cb90cdcf72d3576cefc44653 SHA512 152f8441c325e808b942153c15e82fdb533d5273b50c25c28916ec568ada880f79242bb61ee332ac5fb0d20f21239ed6f8de02ef6256cc574b1fc354d002c6b0
 DIST google-protobuf-3.24.4-ruby.tar.gz 5179247 BLAKE2B f3b53769f31a0fc9151e90b133c836127e745f9f0c591b0d4e476ab50a6b7ca21562169bdedcd6637961131ef39484d2c945dd83d01a3839cca7f0555144d3a8 SHA512 19b8aa89647fa14b4716cfeed289233bed65be2417d9f7e2b1082975a4753e5a1f091eb36ad7cff159d125b01bfe005e2911ebda896f15cba58299e340487518
 DIST google-protobuf-3.25.4-ruby.tar.gz 5879814 BLAKE2B 529c28b0568b5dee97b12102e2f960606e3cb65c7d5f53bcfbd4c22b93b30d3d9e1465c2ec537d480b756f74fc1cf3c7ad6e3cd3bdb2955010583d7666224816 SHA512 ff85dedd2e381fc18471c71bb2f0854210dfc65d53ad8105afd57b77cab7d47bad7569cb64547c85d9d7464697b67049acf6c0906757a01fb0519346eaa6ed72
+DIST protobuf-25.5.tar.gz 5877036 BLAKE2B a8174c7cbda47afa3f31d64c7a7aa7f233efd5df5a783abedd229613c8c27a2380684fb5851dad67f76f063688dd8060a0a373f2c95441c2ad91630eb187af22 SHA512 9fe130f5c04919accc99113e13096df93db4c2254a9c2428faf9459416907c77fbf4adefbae3fe644e1f26d9c1fc597165e2c5b6219156c97500d6ef3fdc0793
 DIST protobuf-26.1.tar.gz 5957903 BLAKE2B 1a7faab2f56aa0995801a80f73a812c7fc38a00af0bf25bdd5eecf7aec27a86a575ea2fb8484787d19c9ac6e46007c9864e79464f529c446f31af732981feed1 SHA512 0363ac09f92d8e040491425d444c8dca0b9b430e02d2dff6e2b28a0c2b2bea0d33a47f50bc9e2e2d4e8e22b65a02009a20c0066fb89c75df93a7b703dda42ed4
 DIST protobuf-27.4.tar.gz 9156456 BLAKE2B 004427f4923e523bf77298600bf91a8fe4ca8be4bd6da5b7efcfe9186a032155e525426f83f683e1bed1e799ed1e62d250053386c1463cbd0c062bd05da786d0 SHA512 d076ce7e075096d0dba7ee2314b12e3223c4239c019e25670636a0ef812ddf0ce3f1fd9b9fe8517319db87b14bbdb2653cc4e06023f90032dfedb014457b2863
+DIST protobuf-27.5.tar.gz 9153935 BLAKE2B 08b1b5927188e68ef2ae8ce8cdc6f21c34ee8453f4dfaeb362a7f5a5f0ee5ddc24772e5583ab10fbf193aa43e7fdd316e8fbbe4d066df704aef5469dae01fc8d SHA512 bb266483b11268c207aa0e8ce76442351a331f30151586714d57ed7c9bae05f09aabf5042b90eac85658f708671ba0b33c64d1c58a91a24c00bbf4f4ffdce1bb
 DIST protobuf-28.0.tar.gz 9259114 BLAKE2B 328e09ebffb296d838557ea72a4fc4da8e0ad5f1edfccebcc8ee7c9e0e74d06e5e6dbad741fd89f6a4502c1cb246a973fd60c035ccdbf89700b7baff49e2a65e SHA512 8745f625ac781f3bbefe9494cbf570143d38aecc1521edef7a52ffb403b8be24df2c71f4f2410b5a5b78a0f3e8a38a7d19be2cf916b1b9125349d2da18262cd1
+DIST protobuf-28.3.tar.gz 9256608 BLAKE2B 05162124676abe18300481e9f985fd2cfb09b052d06670a993e79ef02f3daf0d5380b521977ebc2362d4094486151ea285fe1c98a1d2f3799b18a1fa422fdc13 SHA512 a91e175fed7eb01c4240842a5af73a7d3cefccbb10885434bceeb7bc89ab6c56a74912cee290bf46e81d4026f3c9c2b10faad5545816064e215c4bae7908263d
+DIST protobuf-29.2.tar.gz 9348408 BLAKE2B 847798474bc6a76b9badfdbf605e118dece5e321e81242d7fa1bf5f5d17ee05a3d365ec112dc6d861cade97efff8be1d5d04006a5144f613bdb3ff5eacc63b99 SHA512 aeb21773edc3dd92a6c1ba6ccd721cc8a20d61230a5309c75ee3ef19baa554c228a6d1095f191ccc18f10183b646f3140dfe6526f5812bcaa64b7d5260572643
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.25.5.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.25.5.ebuild
new file mode 100644
index 000000000000..c6e6d8b2f63a
--- /dev/null
+++ b/dev-ruby/google-protobuf/google-protobuf-3.25.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/google/protobuf_c/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/google
+
+inherit ruby-fakegem
+
+PROTOBUF_PV="$(ver_cut 2-)"
+
+DESCRIPTION="Protocol Buffers are Google's data interchange format"
+HOMEPAGE="https://protobuf.dev/"
+SRC_URI="
+		https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_PV}/${PN##google-}-${PROTOBUF_PV}.tar.gz
+"
+RUBY_S="protobuf-${PROTOBUF_PV}/ruby"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+DEPEND=">=dev-libs/protobuf-${PROTOBUF_PV}"
+
+ruby_add_bdepend "test? ( dev-ruby/json dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^  end/ s:^:#:' \
+		-e 's:../src/protoc:protoc:' \
+		-e 's/:compile,//' \
+		-e '/:test/ s/:build,//' \
+		-i Rakefile || die
+}
+
+each_ruby_prepare() {
+	${RUBY} -S rake genproto || die
+	${RUBY} -S rake copy_third_party || die
+}
diff --git a/dev-ruby/google-protobuf/google-protobuf-4.27.5.ebuild b/dev-ruby/google-protobuf/google-protobuf-4.27.5.ebuild
new file mode 100644
index 000000000000..c6e6d8b2f63a
--- /dev/null
+++ b/dev-ruby/google-protobuf/google-protobuf-4.27.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/google/protobuf_c/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/google
+
+inherit ruby-fakegem
+
+PROTOBUF_PV="$(ver_cut 2-)"
+
+DESCRIPTION="Protocol Buffers are Google's data interchange format"
+HOMEPAGE="https://protobuf.dev/"
+SRC_URI="
+		https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_PV}/${PN##google-}-${PROTOBUF_PV}.tar.gz
+"
+RUBY_S="protobuf-${PROTOBUF_PV}/ruby"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+DEPEND=">=dev-libs/protobuf-${PROTOBUF_PV}"
+
+ruby_add_bdepend "test? ( dev-ruby/json dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^  end/ s:^:#:' \
+		-e 's:../src/protoc:protoc:' \
+		-e 's/:compile,//' \
+		-e '/:test/ s/:build,//' \
+		-i Rakefile || die
+}
+
+each_ruby_prepare() {
+	${RUBY} -S rake genproto || die
+	${RUBY} -S rake copy_third_party || die
+}
diff --git a/dev-ruby/google-protobuf/google-protobuf-4.28.3.ebuild b/dev-ruby/google-protobuf/google-protobuf-4.28.3.ebuild
new file mode 100644
index 000000000000..c6e6d8b2f63a
--- /dev/null
+++ b/dev-ruby/google-protobuf/google-protobuf-4.28.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/google/protobuf_c/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/google
+
+inherit ruby-fakegem
+
+PROTOBUF_PV="$(ver_cut 2-)"
+
+DESCRIPTION="Protocol Buffers are Google's data interchange format"
+HOMEPAGE="https://protobuf.dev/"
+SRC_URI="
+		https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_PV}/${PN##google-}-${PROTOBUF_PV}.tar.gz
+"
+RUBY_S="protobuf-${PROTOBUF_PV}/ruby"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+DEPEND=">=dev-libs/protobuf-${PROTOBUF_PV}"
+
+ruby_add_bdepend "test? ( dev-ruby/json dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^  end/ s:^:#:' \
+		-e 's:../src/protoc:protoc:' \
+		-e 's/:compile,//' \
+		-e '/:test/ s/:build,//' \
+		-i Rakefile || die
+}
+
+each_ruby_prepare() {
+	${RUBY} -S rake genproto || die
+	${RUBY} -S rake copy_third_party || die
+}
diff --git a/dev-ruby/google-protobuf/google-protobuf-4.29.2.ebuild b/dev-ruby/google-protobuf/google-protobuf-4.29.2.ebuild
new file mode 100644
index 000000000000..c6e6d8b2f63a
--- /dev/null
+++ b/dev-ruby/google-protobuf/google-protobuf-4.29.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/google/protobuf_c/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/google
+
+inherit ruby-fakegem
+
+PROTOBUF_PV="$(ver_cut 2-)"
+
+DESCRIPTION="Protocol Buffers are Google's data interchange format"
+HOMEPAGE="https://protobuf.dev/"
+SRC_URI="
+		https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_PV}/${PN##google-}-${PROTOBUF_PV}.tar.gz
+"
+RUBY_S="protobuf-${PROTOBUF_PV}/ruby"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+DEPEND=">=dev-libs/protobuf-${PROTOBUF_PV}"
+
+ruby_add_bdepend "test? ( dev-ruby/json dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^  end/ s:^:#:' \
+		-e 's:../src/protoc:protoc:' \
+		-e 's/:compile,//' \
+		-e '/:test/ s/:build,//' \
+		-i Rakefile || die
+}
+
+each_ruby_prepare() {
+	${RUBY} -S rake genproto || die
+	${RUBY} -S rake copy_third_party || die
+}
diff --git a/dev-ruby/highline/Manifest b/dev-ruby/highline/Manifest
index 94ea04efaf93..20fc8b7be68b 100644
--- a/dev-ruby/highline/Manifest
+++ b/dev-ruby/highline/Manifest
@@ -1,2 +1,3 @@
 DIST highline-2.1.0.tar.gz 234116 BLAKE2B e1e899093de7e162e83f4d2e694e5841cedc336063a4410cab392702241136d5eec258b53065ffcded567f0af163d04a25bbdfd0767211b059980e9e5effe7c9 SHA512 b763428d67b1eb77762b54b8e2dd39bda720589e7030db8694e793bb432fa94caa2848b23358e7eaea0ccb22d8a93e0a64aeef3865f7e9fec348bbebee19d713
 DIST highline-3.1.1.tar.gz 237291 BLAKE2B e0e4bce282bb1ab87e803864882db1b8d59872ede17fc606573f3238971b1f986a9bdc4f4679e9e2a346510dac6e4716bc2a43f5a70a10016a6b9cb0374a5009 SHA512 f3f9ed1cd0658bdbf95913c75cfbaf2e69e31dc49d846c715b0ede1a0fcd2fc7ed9efb06bcc7e42bd262ccd626a3a87c49a00cfeeb4384af182c9c45a9b21085
+DIST highline-3.1.2.tar.gz 237459 BLAKE2B d50b71c5d370d6dabf4fe6eb3e9b68cd080789e7c7b05d8bd78373272b0840a9a95d515db191a6271b1c9d06d0b8095a95c5a990aee907c3deaa4a243300ed63 SHA512 5964ba76de71eefbb3b097bea394e9c6e00b371d17fb3bc3ad045c04717a597502d58ddfca994e4269d5990992bbd5c1e5fde990259b2a354e2d9ca1514a9185
diff --git a/dev-ruby/highline/highline-3.1.2.ebuild b/dev-ruby/highline/highline-3.1.2.ebuild
new file mode 100644
index 000000000000..495ef2f4729b
--- /dev/null
+++ b/dev-ruby/highline/highline-3.1.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
+
+RUBY_FAKEGEM_GEMSPEC="highline.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Highline is a high-level command-line IO library for ruby"
+HOMEPAGE="https://github.com/JEG2/highline"
+SRC_URI="https://github.com/JEG2/highline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 Ruby-BSD )"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/reline"
+
+ruby_add_bdepend "test? ( dev-ruby/dry-types )"
+
+all_ruby_prepare() {
+	# fix up gemspec file not to call git
+	sed -i -e 's/git ls-files -z/find * -print0/' highline.gemspec || die
+
+	# Avoid unneeded dependencies
+	sed -i -e '/\(bundler\|code_statistics\)/ s:^:#:' \
+		-e '/PackageTask/,/end/ s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/ s:^:#:' test/test_helper.rb || die
+
+	# Remove almost empty doc directory to allow rdoc recipe to work
+	rm -rf doc || die
+}
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 9cb0ece5a9d4..db430020a24e 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -1,2 +1,3 @@
 DIST i18n-1.14.5.tar.gz 75739 BLAKE2B 10af6c88e5ab4d50dee156b944795525f4d79035f3c2369b379f70d7fa48b84cc26fe0855017b378b7c94f8b4ecdc37dd122f536d2b54c595d70c5c731ba5c64 SHA512 b6c6e333fff38228136ce55a75f466b4885542973e96eea0cbfb5c2ea1dd4780847e59b10090f8ecbc4aeb0de67258dcdbfc1812369b8d9f1d7597468f756677
 DIST i18n-1.14.6.tar.gz 75978 BLAKE2B e2c56a8600b94b91a32481c4f24bd8b47aee118aee87da0012ddd95e9d01a6c0db489fa0528ca0a9a37ec49124d41f4322eb09f0828f0a53c268d02da1c3b7d5 SHA512 5713e6e2576c16698333058bae3f1758ab71bc040c7feab2d3b51dfc6faa7a76539c6916dd3807e429e53b1a3bf22064cea7eb7b9dd731ddb9a04f06615803a6
+DIST i18n-1.14.7.tar.gz 76045 BLAKE2B 2261dfcd9ef68e42ae7a2cf4314a5ff7d9030172bb68b8e10ff1fb6399912054f87ec9f48177a1ae155819edd6a4f89042b62a713cb3d969ecc3cac3d7e22e0d SHA512 e647c5a454a3929f62feb9464fe6a44c0cded23eaf48fc827d084a98bca5ca8f312c6f51d5c1241a709263ee6cd47b314c69a8f95db1393136dafd6287586a76
diff --git a/dev-ruby/i18n/i18n-1.14.7.ebuild b/dev-ruby/i18n/i18n-1.14.7.ebuild
new file mode 100644
index 000000000000..7e4018609c38
--- /dev/null
+++ b/dev-ruby/i18n/i18n-1.14.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add Internationalization support to your Ruby application"
+HOMEPAGE="http://rails-i18n.org/"
+SRC_URI="https://github.com/ruby-i18n/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_rdepend "
+	dev-ruby/concurrent-ruby:1
+	>=dev-ruby/racc-1.7:0
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/activesupport-5.1
+		dev-ruby/bundler
+		>=dev-ruby/minitest-5.14:5
+		dev-ruby/mocha:2
+		dev-ruby/test_declarative
+	)
+"
+
+all_ruby_prepare() {
+	rm -f gemfiles/*.lock || die
+
+	# Remove optional unpackaged oj gem.
+	# Make mocha dependency more lenient.
+	sed -e '/oj/ s:^:#:' \
+		-e '/mocha/ s/2.1.0/2.1/' \
+		-i gemfiles/* || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby33)
+			versions="7.0 7.1 7.2 8.0"
+			;;
+		*ruby32)
+			versions="6.1 7.0 7.1 7.2 8.0"
+			;;
+		*ruby31)
+			versions="6.1 7.0 7.1 7.2"
+			;;
+	esac
+
+	for version in ${versions} ; do
+		if has_version "dev-ruby/activesupport:${version}" ; then
+			einfo "Running tests with activesupport ${version}"
+			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
+		fi
+	done
+}
diff --git a/dev-ruby/libusb/Manifest b/dev-ruby/libusb/Manifest
index 649a5f1779f5..c32a24561b68 100644
--- a/dev-ruby/libusb/Manifest
+++ b/dev-ruby/libusb/Manifest
@@ -1,2 +1 @@
-DIST libusb-0.7.1.gem 815104 BLAKE2B c72bac1f43b9cc70e9d6e2c6e48b9e4fc95f62117d26e0925f5bc5d49fca88f6610254dd0c5ed11368397e2149706f78f9919c26f01c23fa84b97fc07edcd14d SHA512 eed881ea9658911aba93dfd5c72d74ad7e9fc333d890dff872ec5ee3e8262ccbdf0e19f8f4c918d6b67438a72cde51397c652d2b9215dce4f0725cd5c8031ff6
 DIST libusb-0.7.2.gem 815104 BLAKE2B d9fa4a8d78c7cab0f386e3624a515b2b6011edcaf1ec18b522d3695fe2a94ef684f0f0bbe609b0a1f2fa6a09999e4064195b7859776018df19a31f5ae4ebc53f SHA512 e1e70bf4cc98cc9e0fda6e98d1e8cf567be2c62e2110e10fd6ac08250e00d6808089da134d0af649ff31bafdb2826076a7aa866cec380776c3c2accbf7260b1e
diff --git a/dev-ruby/libusb/libusb-0.7.1.ebuild b/dev-ruby/libusb/libusb-0.7.1.ebuild
deleted file mode 100644
index d86ffb6892be..000000000000
--- a/dev-ruby/libusb/libusb-0.7.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="binding that gives Ruby programmers access to arbitrary USB devices"
-HOMEPAGE="https://github.com/larskanis/libusb"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND+=">=dev-libs/libusb-1.0.27:1"
-RDEPEND+="${DEPEND}"
-
-ruby_add_rdepend "dev-ruby/ffi:0"
-ruby_add_bdepend "test? ( dev-ruby/eventmachine )"
-
-all_ruby_prepare() {
-	sed -e '/mini_portile2/d' \
-		-e 's/git ls-files --/find/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid tests that try to open devices or depend on specific hardware
-	rm -f test/test_libusb_{bos,bulk_stream_transfer,descriptors}.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -I.:lib -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	# This gem includes an extension that does not actually do anything
-	# when using the system libusb, but newer rubygems versions still
-	# require the marker to be present.
-	ruby_fakegem_extensions_installed
-}
diff --git a/dev-ruby/liquid/Manifest b/dev-ruby/liquid/Manifest
index c443f260028f..ddd079913f91 100644
--- a/dev-ruby/liquid/Manifest
+++ b/dev-ruby/liquid/Manifest
@@ -1,3 +1,4 @@
 DIST liquid-4.0.3.tar.gz 102242 BLAKE2B 4a025fd8501e237f7619ed989e185a6c55a234577c99423857a826b616c40625c1fd205d998a368488306a88c0b84fc3d3ac59bd01c1231055aa9f60a3d14338 SHA512 5aed3b98fa486a00744e0225f7a3b8004be8ded1e3347f9118fd062684fe33b725b84d1f88bdd5e881399e6efa60b4aa32f57cf10f4583aa27ec8c8288b52bf9
+DIST liquid-4.0.4.tar.gz 102376 BLAKE2B 034c1635556455b41911230e03329f2e817562c9de91ad6cf94ec96f997293927b3c4c6cf4b3db6f778bb5b8a94c8727175d57a60ed8c5db562269f2d8e4d7ed SHA512 8c7a674ea7f7542f3a57e57235f1252d1177794fe2108463d29fb91efec68ac6e3cc2df5efe865afa47b34dbfce5bb4326d9cd661786429e8985b320671c6d23
 DIST liquid-5.5.1.tar.gz 130515 BLAKE2B 49c0077dbddcc8ecc9e96144ae996c69401b703c283c3017406ee5c22ad217a5243a37c23f9d3b08aba7927260ecfed12e970e833fe085671f98905035ff2b0a SHA512 d7c206d15556aa77eaa727c99ed687b7b4146a0f8192ee482c4e31557c0876439843297ac2a1ffd4bdb7f4ebd72c420a2f1fbc8aa6adce8f164cfe01c3bf9689
 DIST liquid-5.6.0.tar.gz 134318 BLAKE2B bad5b8899acde697d8f339d49fe07a292524dd3826750e1acf930a0a607dfe6349847406a6ce0c2d0f1366ce577b0677094ecbe0f19b26a5e30fbb4c72e1b644 SHA512 2c893ae1ce8db0a0ef4485bceba64e3a4ec80bf56666b5bb5e2da1f96477ef58579977aed3e2ae1cdc85886f5c012277414aa2ddf37fa22290b88699b09fc660
diff --git a/dev-ruby/liquid/liquid-4.0.4.ebuild b/dev-ruby/liquid/liquid-4.0.4.ebuild
new file mode 100644
index 000000000000..835e6064572b
--- /dev/null
+++ b/dev-ruby/liquid/liquid-4.0.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+RUBY_FAKEGEM_GEMSPEC="liquid.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Template engine for Ruby"
+HOMEPAGE="https://shopify.github.io/liquid/"
+SRC_URI="https://github.com/Shopify/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest
+	dev-ruby/spy )"
+
+all_ruby_prepare() {
+	# liquid-c is not packaged
+	sed -i -e '/LIQUID-C/ s:^:#:' Rakefile || die
+
+	# Avoid test requiring unpackaged stackprof
+	sed -i -e '/assert_no_object_allocations/askip "unpackaged stackprof"' test/unit/context_unit_test.rb || die
+
+	# Avoid tests using taint since this is no longer supported in ruby 2.7+
+	sed -i -e '/test.*tainted_attr/askip "taint is no longer supported"' test/integration/drop_test.rb || die
+}
diff --git a/dev-ruby/logger/Manifest b/dev-ruby/logger/Manifest
index 3e381e888d63..375056fa9194 100644
--- a/dev-ruby/logger/Manifest
+++ b/dev-ruby/logger/Manifest
@@ -2,3 +2,4 @@ DIST logger-1.6.1.tar.gz 19719 BLAKE2B 68e711550c0323614ee32fc0589c17d987be1cd65
 DIST logger-1.6.2.tar.gz 20358 BLAKE2B 6e57eda1b8446b3cfd15db5e2d5fc5ceb5ead820ec51827f822c4f6eb11c36328430bdfb2eaa9b1eea7d44094fc3fec1a9be9890bb1de08e2153ad08e611b42d SHA512 e80d3a5825ad5f860f9c91f35a6480eae908ffcb5c35e15336199f12c275340f99c1a2366a5aa40932a0e4d6eb6c34e1a412d548200224a76c4fb1ce8fe75985
 DIST logger-1.6.3.tar.gz 20548 BLAKE2B fafdf4242ce7d4c5899a5c50add133541174e6a48a901b901217ee995f6d6f739acb652ba993f9be84d0713be8aee0e907469289c058c02394e3505405037ff1 SHA512 a89919cd9e6e85d1918a2bfde68ce07ce3006cd866a2fd85c38b6e3e728b5fa64b9837c5f7083c8c81a8665702eb79ca84d9ba597e248ecc61c75959e0b13e05
 DIST logger-1.6.4.tar.gz 20542 BLAKE2B 6b4665139467dd4dc6ee63fc98c0dbf8a17c00640fb44a0d7f1bb31be556ba74a94edcaa715ed6c0d49b7d05228c3ee938762af9b92eae6426d4943d62db718c SHA512 0a18e4c68424d4f12c388e207f99cd5fffdafdf2fbcc6432ddd934a30f05b66e96749c604668ed645ddab335740df9472078113a544f3b4f6748b575875dd50d
+DIST logger-1.6.5.tar.gz 20816 BLAKE2B 6d9038dd85b76e728609b46d69a28b7c872336955d87884c92729b56f08518d8fad254a5f30a977ab4ea7f8ce615959369b9803c0d8262d5013c54a099023a43 SHA512 bca2ec07661502c23d363f4ece660079b6efad090bd2586907ba5ad4572c878eac989231a0c75396ce23fff626b2786ec8e4138e1a6c1f88b96d1c8ea01788d2
diff --git a/dev-ruby/logger/logger-1.6.5.ebuild b/dev-ruby/logger/logger-1.6.5.ebuild
new file mode 100644
index 000000000000..c722d1bc707b
--- /dev/null
+++ b/dev-ruby/logger/logger-1.6.5.ebuild
@@ -0,0 +1,27 @@
+# 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_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="logger.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a simple logging utility for outputting messages"
+HOMEPAGE="https://github.com/ruby/logger"
+SRC_URI="https://github.com/ruby/logger/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
+
+all_ruby_prepare() {
+	sed -e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/maildir/maildir-2.2.3-r1.ebuild b/dev-ruby/maildir/maildir-2.2.3-r1.ebuild
index dd920095148a..9cb2005f0e1d 100644
--- a/dev-ruby/maildir/maildir-2.2.3-r1.ebuild
+++ b/dev-ruby/maildir/maildir-2.2.3-r1.ebuild
@@ -1,8 +1,8 @@
-# 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="ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRAINSTALL="README.rdoc"
 
@@ -14,17 +14,23 @@ DESCRIPTION="A library for reading and writing arbitrary messages in DJB's maild
 HOMEPAGE="https://github.com/ktheory/maildir"
 LICENSE="MIT"
 
-KEYWORDS="~amd64"
 SLOT="2"
+KEYWORDS="~amd64"
 IUSE="test"
 
 ruby_add_bdepend "
 	test? ( >=dev-ruby/fakefs-0.3.2 dev-ruby/mail dev-ruby/shoulda dev-ruby/test-unit:2 )"
 
 all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/helper.rb || die
+	sed -e '/bundler/ s:^:#:' \
+		-e '/pride/ s:^:#:' \
+		-i Rakefile test/helper.rb || die
 
 	# Avoid tests that appear to need activesupport for .blank? support
 	sed -i -e '/add and remove flags/,/^    end/ s:^:#:' test/test_message.rb || die
 	sed -i -e '/be removed from flag list/,/^    end/ s:^:#:' test/test_maildir.rb || die
+
+	# Fix deprecations
+	sed -e 's/File.exists/File.exist/' \
+		-i test/test_message.rb || die
 }
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-ruby/mime-types-data/Manifest b/dev-ruby/mime-types-data/Manifest
index 065fc13a6ce7..cebd1e7fa026 100644
--- a/dev-ruby/mime-types-data/Manifest
+++ b/dev-ruby/mime-types-data/Manifest
@@ -1,3 +1,4 @@
 DIST mime-types-data-3.2024.1001.gem 209408 BLAKE2B a299749ee73afef0be96b481528916b3f046f0b647b5528b7883b724a37ea8ff63ae84db2a2b4a2a1d69fbd15df6a16f9037de1469ab718ac3457a6824dac15f SHA512 1316455fb6efa8818ebe84985d2d815a1b0199e7896b8777fd40a9f2b498a9fd63b1139f9d3265ccc3c93f529e3da2e69e0becebfbf6598f62e8a334676896ea
 DIST mime-types-data-3.2024.1105.gem 209920 BLAKE2B fc4fb601c8fab3bc30c0c5776f31a80714c364f8aafafdf8f36d36fd1acef922bd4210985d8cf1139e975b59edc26d5c9a073069d68b132425199d4f28eed3c1 SHA512 3ec407b3fa91c0b52cfa4e166bcb48bf8cc33a6ff34876676ede3adaa865a27e1e2c1d5e730361cfa42e75e3539ede14a619375a6b29332fab55d24c3ff81112
 DIST mime-types-data-3.2024.1203.gem 210432 BLAKE2B 6a1f048f0d966589ac117f80e9225d9080466c6dc4c69c9f4d46424b092a5b131a43aca20e560336c4c3b80fb5eb079fa01002dbd658acc2a5bc7c4f7d84f162 SHA512 87998fa3f46311bcc0ee2307aa1ee95f8fd5da45044d1ba5b8b5b036bfcf29a09f207cb00a5c725ea7a4460b52fa0ed46e87d09afda03610ac50eb33f8df7de7
+DIST mime-types-data-3.2025.0107.gem 153600 BLAKE2B 3856eef43fb603df41be96868bbe0724d34e73ec03a343eb9af141675b636f1b1bd947cc37a4b6658a61e654ab5bbc87c280fd56cbd344cff085f8b17b8fabd2 SHA512 6c5c1433904b3941387f00c637476b97985b9afcfa4681f2df347ba09781490c67ef73fe52dd657c3ed23f2e3f6e426e96912312e9b85664ba2fa8dfa6280caf
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2025.0107.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2025.0107.ebuild
new file mode 100644
index 000000000000..af103ca6946e
--- /dev/null
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2025.0107.ebuild
@@ -0,0 +1,21 @@
+# 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_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Registry for information about MIME media type definitions"
+HOMEPAGE="https://github.com/mime-types/mime-types-data"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
diff --git a/dev-ruby/mimemagic/mimemagic-0.4.3-r2.ebuild b/dev-ruby/mimemagic/mimemagic-0.4.3-r2.ebuild
index e89f936c8497..ed6790243a1b 100644
--- a/dev-ruby/mimemagic/mimemagic-0.4.3-r2.ebuild
+++ b/dev-ruby/mimemagic/mimemagic-0.4.3-r2.ebuild
@@ -1,8 +1,8 @@
-# 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 ruby33"
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -18,7 +18,7 @@ LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-RDEPEND+=" x11-misc/shared-mime-info"
+RDEPEND="x11-misc/shared-mime-info"
 
 ruby_add_rdepend "
 	dev-ruby/nokogiri
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index 5eef5b7edc02..1cc289568079 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,3 +1,4 @@
 DIST mini_magick-4.13.1.tar.gz 1330619 BLAKE2B ea51265c68b247c8558381e359660b649834c63cdc0de55c9bc47a2ae83ef4f592c14a7f84e12e016860363ba6326ac342481f25a4bc718c059515c30d48fd2d SHA512 2c9a55e69f3770974fa32124ac7f0da63114c17704848d3c957bcfa6b2e00d162694a4e34a25e27f8b214101d6a4bb6a9f1d0dbee597140b94874409ebea4363
 DIST mini_magick-4.13.2.tar.gz 1330632 BLAKE2B 831d6676cf2e65f857f149db77086ff9a8a209cf9aa4cfb0dc38a73e82b5d10605cf105d7126f0319203a9cae824e0b94812cf450ad5552316bbd94e21f71365 SHA512 a7a4628fe523816aef37eecfd755b84d11072c6c57134fd3b237312f302d41d2cccc2cefcbf1ef7a291d97d02b830887aa0f628140c51ca28fa9f955c6f96b57
 DIST mini_magick-5.0.1.tar.gz 1325633 BLAKE2B 6dce4cf3b488122732952771cd425139fa5ca33389abaa0f8ed0d797282b66247a529b5ad4cc2de569af9be00406cd4a88e60ce805f4132374aebd0a3f9a7808 SHA512 5579967be69065e1da79d11bc9de85acef4030345367ab8c57b91e26a99821a771d09bbdf8da012a9741141ceca8c4643e921dd9170209088425d7ab6ea845bb
+DIST mini_magick-5.1.0.tar.gz 1325990 BLAKE2B 5c0301cb9ee252bdc97b823aa039fdb099dfcc5fdc2aef09471806c258780a00416fb53b40b1cfb0bcf5c0fc36ee753840295abfc734c170e8e516c944423fed SHA512 5d5beedead029fbd20b7eb9b3154433e34c804859e1e59f86c855a1781961d5f0bb944d562264e22acf69bc1bb6ab49dd27f88040f1735005492ee1908ba73f9
diff --git a/dev-ruby/mini_magick/mini_magick-5.1.0.ebuild b/dev-ruby/mini_magick/mini_magick-5.1.0.ebuild
new file mode 100644
index 000000000000..5641902cd585
--- /dev/null
+++ b/dev-ruby/mini_magick/mini_magick-5.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Manipulate images with minimal use of memory"
+HOMEPAGE="https://github.com/minimagick/minimagick"
+SRC_URI="https://github.com/minimagick/minimagick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="minimagick-${PV}"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+# It's only used at runtime in this case because this extension only
+# _calls_ the commands. But when we run tests we're going to need tiff
+# and jpeg support at a minimum.
+RDEPEND="media-gfx/imagemagick"
+DEPEND="test? ( virtual/imagemagick-tools[jpeg,png,tiff] )"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	# remove executable bit from all files
+	find "${S}" -type f -exec chmod -x {} +
+
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+
+	# Don't force a specific formatter but use overall Gentoo defaults
+	# and show all failures.
+	sed -i -e '/config.\(fail_fast\|formatter\)/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid broken spec that does not assume . in path name
+	sed -i -e '/reformats a layer/,/end/ s:^:#:' spec/lib/mini_magick/image_spec.rb || die
+
+	# Avoid spec broken by recent imagemagick updates
+	sed -i -e '/reads exif/askip "Now returns more complete EXIF data"' spec/lib/mini_magick/image_spec.rb || die
+}
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.8.8.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.8.8.ebuild
index 05cf768babd0..5d5bf8b95b1b 100644
--- a/dev-ruby/mini_portile2/mini_portile2-2.8.8.ebuild
+++ b/dev-ruby/mini_portile2/mini_portile2-2.8.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
 
-USE_RUBY="ruby31 ruby32 ruby33"
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
 
 inherit ruby-fakegem
 
@@ -15,7 +15,7 @@ SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
 IUSE="test"
 
-BDEPEND="test? ( dev-build/cmake )"
+BDEPEND="test? ( app-crypt/gnupg dev-build/cmake )"
 
 ruby_add_bdepend "test? (
 	dev-ruby/minitar:0
@@ -29,6 +29,10 @@ all_ruby_prepare() {
 	# cannot guarantee.
 	sed -e '/test_configure_defaults_with/askip("Requires gcc to be the C/C++ compiler.")' \
 		-i test/test_cmake.rb || die
+
+	# Keep gpg from creating a default common.conf with broken keyboxd support.
+	mkdir -m 700 "${HOME}/.gnupg" || die
+	touch "${HOME}/.gnupg/common.conf" || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/minitest-hooks/minitest-hooks-1.5.1.ebuild b/dev-ruby/minitest-hooks/minitest-hooks-1.5.1.ebuild
index ec292c0b4544..c9c55b02ad13 100644
--- a/dev-ruby/minitest-hooks/minitest-hooks-1.5.1.ebuild
+++ b/dev-ruby/minitest-hooks/minitest-hooks-1.5.1.ebuild
@@ -1,8 +1,8 @@
-# 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 ruby33"
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
 
 # Skip tests since they require unpackaged sequel
 RUBY_FAKEGEM_RECIPE_TEST="none"
@@ -16,4 +16,3 @@ HOMEPAGE="https://github.com/jeremyevans/minitest-hooks"
 LICENSE="MIT"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
diff --git a/dev-ruby/mixlib-shellout/Manifest b/dev-ruby/mixlib-shellout/Manifest
index 0614fd88a3fa..9fc1613a3485 100644
--- a/dev-ruby/mixlib-shellout/Manifest
+++ b/dev-ruby/mixlib-shellout/Manifest
@@ -1,3 +1,4 @@
 DIST mixlib-shellout-3.2.8.tar.gz 46644 BLAKE2B 329e5e92fda0677e417cf938988d610b6da324bb1b9e4044dd9e4feac97aff8b1b54d89ad91e29e6e0c196d6429b43e5b52a0da57ae8c0ce59e9242b5f08bd48 SHA512 8b801c63ff458c50807802bf0e5c055f978ebe8104c310e12b00508b00eb57ccdbee0672ebf0bdb601f82064a0279f3f07291cc24d59b3eacb7aa51fb39ecc99
 DIST mixlib-shellout-3.3.3.tar.gz 47105 BLAKE2B 84aba2f8dc6190318e610d93f85fcef12659c71a3bd2d05b8e17056e6d8e4d6138c6385b23932c3dcb6a8b5623c426056002fb998cf786616155daafa1eb5d3a SHA512 1b3e3b469ea77917ce839efb8a28ddb439cf8b0853e38674c1e5c34c2bf33b828d11d6976a5a75ec6ade902425be69e52c6d99a1607d8089ef7f59d135378f60
 DIST mixlib-shellout-3.3.4.tar.gz 47137 BLAKE2B 382ccfe4988097c3481576ae00537ecf12bb794f9704104f8317d4afcf214a0b87f66b0225d8bd56e3337d580579352ad6ae92842a634832b1df556052f6c7d1 SHA512 1432c4c1b7cea5f22aa3531cb76b8969959ff2c1acd0ad4c5a349353c8d390aedddb1ecf45e319d313b396b8533f7bfee9eae2dfb1b29fb1129e0c748674ca53
+DIST mixlib-shellout-3.3.6.tar.gz 47237 BLAKE2B 819f63b8365fbc14b0259cfdc9a841de019aef5ae4803af15a768e8fcaeafc7669648f746e7c89d28c972b371baae4a6a46230880bf549e3a6274debb7dd6dc8 SHA512 1bbff4b8926d8519606dd2457e9327958f8079d7982205b97ced1e7fa58ad42fb1de3c5a453b0cdb777e9142de0c84a817e783279f406e8380625cdeb39eabbf
diff --git a/dev-ruby/mixlib-shellout/mixlib-shellout-3.3.6.ebuild b/dev-ruby/mixlib-shellout/mixlib-shellout-3.3.6.ebuild
new file mode 100644
index 000000000000..9f1e66ef1396
--- /dev/null
+++ b/dev-ruby/mixlib-shellout/mixlib-shellout-3.3.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRA_DOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="mixlib-shellout.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Run external commands on Unix or Windows"
+HOMEPAGE="https://github.com/chef/mixlib-shellout"
+SRC_URI="https://github.com/chef/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_rdepend "dev-ruby/chef-utils"
+
+each_ruby_prepare() {
+	# Make sure we actually use the right interpreter for testing
+	sed -i -e "/ruby_eval/ s:ruby :${RUBY} :" spec/mixlib/shellout_spec.rb || die
+
+	# Avoid spec that requires an interactive terminal
+	sed -e '/with subprocess writing lots of data to both stdout and stderr/,/^      end/ s:^:#:' \
+		-i spec/mixlib/shellout_spec.rb || die
+}
diff --git a/dev-ruby/moneta/moneta-1.6.0-r1.ebuild b/dev-ruby/moneta/moneta-1.6.0-r1.ebuild
index dba54100757d..b8e50896fd68 100644
--- a/dev-ruby/moneta/moneta-1.6.0-r1.ebuild
+++ b/dev-ruby/moneta/moneta-1.6.0-r1.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_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/net-imap/Manifest b/dev-ruby/net-imap/Manifest
index 5688d2bc4ffc..5d063b6be736 100644
--- a/dev-ruby/net-imap/Manifest
+++ b/dev-ruby/net-imap/Manifest
@@ -2,3 +2,4 @@ DIST net-imap-0.4.17.tar.gz 254727 BLAKE2B 57311009a92d1e68cfa833dccdcb7d42d56cd
 DIST net-imap-0.4.18.tar.gz 254836 BLAKE2B b4980717dbebae729d83899265c3883f18afb5d63f8b26b7df7e1ca50df1b3a9c72d6b53563439720f11b27a936549505a7571d273e6f7d44f1b285cec616dd7 SHA512 d98e382f2a6c194a487c20fff16f7ca2427704630f79f3e0e71c30096118d69f358afc190e41e25d00690277173732be01133e194caec303315e9450b27f382f
 DIST net-imap-0.5.3.tar.gz 277208 BLAKE2B f518b18203d67c01f8ebd44f8f642de1e3cd33b1e5d99785611eee6a0cfb44e1e34845d19d082d28299241b3347116b685848b7c5e0ace946122c431280bb99b SHA512 2e50aca7e577a556b29b6301f93afbd3e4cdcf534fb298c37a8816e21b20b3497c773e78954e23a18608fcc4f75297892fbc3ddd1a68384ea43468cd52e10bef
 DIST net-imap-0.5.4.tar.gz 279986 BLAKE2B 2a294b89b9940ae132aee3120d7006d6b41b84445809ee5689b94c66a09a222569cf7b2755e98c52cbeb1b8fa3241ba5a255762970b0660721779f32ceea240e SHA512 e013b6c2c2933e69689a1b4912f4b5bd27e29118da04d74311d4f87032e9d5e74ca1ddd8bf3362763908eceab5f17dc4415ddaecac25cab7e6bd25c2fe6294f9
+DIST net-imap-0.5.5.tar.gz 282026 BLAKE2B bb7eaf85c7ec2b16b5d3ff5f6ac5f61e2509f5bc47415d56e6a4a5b2b8cabb02f35b25b53b21c7e9fdcef22f9f8d78955ea2aa3e1d798fc0cc5bc5721f4285ae SHA512 4828196b45fa83517e903d098a730ce69ec8c8f5e08d9c138f843754cea88d182a43499cdbe5ed5fa4db3a299172e478944f30de0a2d72b986ebc6a449f7d9ce
diff --git a/dev-ruby/net-imap/net-imap-0.5.5.ebuild b/dev-ruby/net-imap/net-imap-0.5.5.ebuild
new file mode 100644
index 000000000000..cf99a833fdd7
--- /dev/null
+++ b/dev-ruby/net-imap/net-imap-0.5.5.ebuild
@@ -0,0 +1,42 @@
+# 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_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-imap.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby client api for Internet Message Access Protocol"
+HOMEPAGE="https://github.com/ruby/net-imap"
+SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/date
+	dev-ruby/net-protocol
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/digest
+	dev-ruby/strscan
+	dev-ruby/test-unit
+	dev-ruby/test-unit-ruby-core
+)"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -e '/simplecov/,/^end/ s:^:#:' \
+		-i test/lib/helper.rb || die
+}
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 208e2d98ebc7..bbe6781aa626 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -3,3 +3,4 @@ DIST nokogiri-1.16.6-git.tgz 11014594 BLAKE2B 5a2becbbaf52d753569d778fcf2c84b521
 DIST nokogiri-1.16.7-git.tgz 11014702 BLAKE2B b300ceb73101c822df040ed99edcae3b1556ca8a9060b05b51107a949d562ffdd02349d2f771207ad6cb8aa6d17725b823f22b086acde638ad36e0ac36c75889 SHA512 6f4c28351bcf1d01e1892eaceb75a6af3fb8399c2cb18c9db1c2a2e65d87103d9a7f8ef4bf6396e2ab8ca6c178125999bd7273893cb43e6ce47c9e46cfb17462
 DIST nokogiri-1.16.8-git.tgz 11014909 BLAKE2B 55a580c96bb281bd57136488139f01dd5939b9fa8122104b6a19c92a121038215ba63d585e6e229b01b5779b650485cf6ff3585daa048173fc6f539d3b3c25a7 SHA512 bcfd72cd4b2b425d9615d7df095989b2ce39abb01eee3fa2d24e09b5f9f3e25d58879a95c3e869cebf6f6d3c0e94f7c2114da51218d2569d806223bd2654de86
 DIST nokogiri-1.17.2-git.tgz 11048266 BLAKE2B eb7c1b178d8fbb91e1b398e639a9a68d1b9e62af8de0d41e5b48e681f6359a4501734216431273f4e7d9d3e2aafee9cf9f0237c504e0b0f9cfc848d8cba2ef57 SHA512 9282f38feadd6139e99689706c045c6cc42ef71b7372a6c6d7e684faad6a40249a69553eaa7fbff4f7677e328b4d64b0ab7752415f574f21cca4e2e32ed75852
+DIST nokogiri-1.18.1-git.tgz 11051288 BLAKE2B 544d1cbcfb8e75ca499b93a68928dbeba678ba978e6f2bdd624537d7adb0508e8e0127f2ba4ac2f49be552ba1db932561059d30db65a9940da0ed329b9acf3e9 SHA512 3a099d0c5fec88b3728be150dc5a7a5d52e0b7d2f875e662eccc2fcb7dc4c5c140cf4fca14792d8329f196e3f1fc564af6791c48f693a08816ab977011a157fd
diff --git a/dev-ruby/nokogiri/nokogiri-1.16.8.ebuild b/dev-ruby/nokogiri/nokogiri-1.16.8.ebuild
index ae75d1819732..dd23d7e63f3b 100644
--- a/dev-ruby/nokogiri/nokogiri-1.16.8.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.16.8.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
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~arm64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-ruby/nokogiri/nokogiri-1.18.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.18.1.ebuild
new file mode 100644
index 000000000000..9a0fc231b909
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.18.1.ebuild
@@ -0,0 +1,96 @@
+# 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_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
+
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+HOMEPAGE="https://nokogiri.org/"
+SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.13.5
+	>=dev-libs/libxslt-1.1.42
+	>=sys-libs/zlib-1.3.1
+	virtual/libiconv"
+DEPEND="
+	>=dev-libs/libxml2-2.13.5
+	>=dev-libs/libxslt-1.1.42
+	>=sys-libs/zlib-1.3.1
+	virtual/libiconv"
+
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
+ruby_add_bdepend "
+	dev-ruby/mini_portile2:2.8
+	>=dev-ruby/rexical-1.0.7
+	dev-ruby/rdoc
+	test? ( dev-ruby/minitest dev-ruby/rubyzip )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		-e '/license/ s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+
+	sed -e '/reporters/I s:^:#:' \
+		-i test/helper.rb || die
+
+	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
+	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=1 \
+	RUBY_MEMCHECK_RUNNING=true \
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 382f1eb31828..dd8f79604c83 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,2 +1,3 @@
 DIST ox-2.14.18.tar.gz 224697 BLAKE2B 2add505ebaefc8d8915d2c64f7717073df2c2792efffa75d7e4653c7ebda91390fbb1929099506119535b939a365cecf902e7405d2d84f9240e45ceadeeb38f3 SHA512 9be6c2c6a5e0bc02ec86b1495455112930737d74c1771098b68089e45c2acf897c94a8c8c0b9fdc70ccf584a692eb6aece440d4f7bece9d75bde1cea595853dc
 DIST ox-2.14.19.tar.gz 225524 BLAKE2B dbed8012e82cc1b0ff4c86d73e22bb041432711824407252fe1e7a869ba9bc1aa3940810b6890db5f7b0196e0f5fbc4da7f4bf4741c5fef7d638980e30fb8bf3 SHA512 db502e62be78086df8ee6499d0c26260a9d93b5c0a7460e454a80d7a41066374bc802bcebe83553d5f955c76692fd953914fba84a83f40c135cdbb251dea13b4
+DIST ox-2.14.20.tar.gz 225719 BLAKE2B 8fdd4b95a9a3a2843b02e2796afe65cc54b5a50a427a94d5a3f7616120576cc91ffab2d7e2cfc00e6b77c8810fe6aea4a2c06aa5ecc52c0dc41217187848b39d SHA512 70f4e5c6f4fdf2d9b771deb63a5722abec69419649cd4fcbe6fab416a9f928233e25be3031fec9da1f07c03c4a7817247155509d8bd64a2f88c74f1f7edb1c6b
diff --git a/dev-ruby/ox/ox-2.14.20.ebuild b/dev-ruby/ox/ox-2.14.20.ebuild
new file mode 100644
index 000000000000..412f8a9a4f54
--- /dev/null
+++ b/dev-ruby/ox/ox-2.14.20.ebuild
@@ -0,0 +1,28 @@
+# 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_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/ox/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/ox
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast XML parser and Object marshaller"
+HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"
+SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+ruby_add_rdepend ">=dev-ruby/bigdecimal-3.0"
+
+each_ruby_test() {
+	${RUBY} test/tests.rb || die
+}
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index fa084669c06c..ee9b9975a9f5 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -3,3 +3,4 @@ DIST parser-3.3.4.2.tar.gz 331155 BLAKE2B 8070f7359d9e29470e3d9bb132c4a6e2682b4a
 DIST parser-3.3.5.0.tar.gz 331207 BLAKE2B cd60df47b165d88e4e8fa5154ab41d3021f14f41bf0ecb73f0fcfa0762d4956954ce73b5a9e9a7376a9ecfd97c36e1887afa15c91dc1436b8de1e4d2468a4eb4 SHA512 00951144e3539730a9f2b02c9435f23716993e75f51db8f2bddc216d5e25902dad56d574af470190a0a9f91a93a09ef034fbc0fb030ce1a65d23c43e09bcab7b
 DIST parser-3.3.5.1.tar.gz 331231 BLAKE2B 24fd5fc06a7c2d28874a100178a693ab84e9b9f0a7f58215d3611d724ad2cd0a346509efb406f824d2f66122058cc16e78dfca71db4168368c3471d8cbbe9337 SHA512 64dec0fa37f941580cef77bff461fbd99ff8cd92e209673ed16b88fd03cfb69b71306d8b468399e77123ed911e4c49f34eaa81c87da51c98652e2d7138f806ac
 DIST parser-3.3.6.0.tar.gz 331236 BLAKE2B 282b11251bb47a13d459344b662f1e0f25c97328304479d8a32bdcce597a270a7bef800da06866da98b0f9be7ccbf0e888e0834c2af96edc4606f6c0d10cf8cd SHA512 c722b596fd5e941235bd7dd4eadbfbf34a83d9886cb21aa7267cae9f060efbb161bbcab4b043f9c9694703398d60358266afbe67d556e2d6f49a97c9fda9242b
+DIST parser-3.3.7.0.tar.gz 331670 BLAKE2B 7d5dcdb5bc0e2c75852c6bb942213e13902b885852acf0416c0242acdd7838daa45de03d1fedaa067031df86fa4f566dd21c5bddd133051e34d1835ee485cf9d SHA512 5f44360eb02afd85afd0bf9c42af2a397caa7aff47de43a8fe2ae1329f6517bf2180fa64230e0d8d89afb3348ce008a4e70e30bb36da818df4cbd7566414f95f
diff --git a/dev-ruby/parser/parser-3.3.7.0.ebuild b/dev-ruby/parser/parser-3.3.7.0.ebuild
new file mode 100644
index 000000000000..74ad4d0241bd
--- /dev/null
+++ b/dev-ruby/parser/parser-3.3.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+RUBY_FAKEGEM_GEMSPEC="parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser"
+SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc"
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/minitest:5 )
+	dev-ruby/cliver
+"
+ruby_add_rdepend "=dev-ruby/ast-2.4* >=dev-ruby/ast-2.4.1 dev-ruby/racc"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake generate || die
+}
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 74b27e1b7064..612ba508d674 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -1,2 +1,3 @@
 DIST pkg-config-1.5.6.gem 23040 BLAKE2B dad69e21b43fd8b97ea0f01973b89bf5182664b4170fcff7aacb40db045da313579920750450e1b2fa90a955d4c9a64b8eb9bb5618d2728db1114f4e9e173354 SHA512 cff5b2e3ed19ea6f8ea554990ba51a6313a663a258d9962c951ae75016fd181bc35593a871086c7f1fa4347e3f15949ad1621ea8fa86ca0d330db19c84a80ee4
 DIST pkg-config-1.5.8.gem 23552 BLAKE2B d760d67b991aeb1f7a941652350925fdbc45b76204925cf7f5b9a410c75aea5a2fa0bc116fdcbca62f836f53f37a3b1369a21ef66247876ca9dc45f3acab2b74 SHA512 4b1d8c68f4ed407788fd265da021efcaa887b9e680cf443eae2b0fb3ca975640621b497d62908d685226f80353d07c562f7d9cec3525abdb738843139476637e
+DIST pkg-config-1.5.9.gem 23552 BLAKE2B afbf0de891eea1891788f97ac1dbf2f9e5ec77a66cfccb6848773c9888ec79405a49e76cb137741db6b80e8f9201eebb61ab381902627f38dbfb472ee5c66153 SHA512 0d075f6c39b4d4ac0cda141457f25b3b6925d856dc08b53319ea055e8ef38316eaea39ee4181e2dfb6312636faf1878819eec1923790d8cc7656a337c2a98c7b
diff --git a/dev-ruby/pkg-config/pkg-config-1.5.9.ebuild b/dev-ruby/pkg-config/pkg-config-1.5.9.ebuild
new file mode 100644
index 000000000000..ccf2ccc56541
--- /dev/null
+++ b/dev-ruby/pkg-config/pkg-config-1.5.9.ebuild
@@ -0,0 +1,29 @@
+# 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_EXTRADOC="README.rdoc NEWS.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pkg-config implementation by Ruby"
+HOMEPAGE="https://github.com/ruby-gnome/pkg-config"
+LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+# this is used for testing
+DEPEND=" test? ( x11-libs/cairo )"
+
+all_ruby_prepare() {
+	sed -e '/test_cflags/aomit "Fragile on Gentoo"' -i test/test-pkg-config.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test-pkg-config.rb || die
+}
diff --git a/dev-ruby/psych/Manifest b/dev-ruby/psych/Manifest
index 735fd18309bb..20f9f163ceb4 100644
--- a/dev-ruby/psych/Manifest
+++ b/dev-ruby/psych/Manifest
@@ -3,3 +3,4 @@ DIST psych-5.1.2.tar.gz 84689 BLAKE2B 868b653f28aa158777db34f33a76059e3f95652933
 DIST psych-5.2.0.tar.gz 86286 BLAKE2B 5dff687f9328703801cdfeb8a83ef69ecba06359de07ce2d4d182228672a338df2023c32205dd169fb9f45302637ec20cc826f8cd9603d9cc32c48543ebdec48 SHA512 f6add0340761920996c63d6bfb3992e166fe1d2cbdfe251de01700fa92f2fa987e9ebcaaa098e2ca611c5763b94e1e0f9ddd2fa886b4bb6c0b44d5919d204207
 DIST psych-5.2.1.tar.gz 86449 BLAKE2B d9d388e46518f2387d8052c8878a115ff607af7c3fd81d692179a6863b0e886162bce7c73879bb12e406a3e3909a8a8501b39525f1dad9d1abf593420f190576 SHA512 8fbed9ec8b173e8051e1ebaa747ba007e7087889240815aa7cf5754e8973be7be9a18e27bd8849b160591e31fa236b54afbb0113524565d52d04077585fe594b
 DIST psych-5.2.2.tar.gz 86462 BLAKE2B 3d374c10c13ccd9957f1412d9a55f8af761a81128d0b61fc89f7cdd414a84164b8f7b84387a5a24f07c783ebaab39bcc05d2d0558df8790a4062255ed68b6b02 SHA512 3fa5f47474903ddb13e6de1251703f0ca82d9f0b532364490a2e9960a53901c5cb1bf31fa4c00b566615e2ea1b22cd95a72252c49ad866be0227d268675e0f78
+DIST psych-5.2.3.tar.gz 86569 BLAKE2B a2045d617c8e1e2b85de0bca78c22fe862e64e00a838ca59e248f70ad241c2f437e526c47729d84f5ef949aa1f94d27f726db265aa8e524a6ff2185727738b76 SHA512 7c494eac06a8ad80554d5b05de8997f7d40016ab64b5d7b289ba1c5058a0462b29b678ad68209d9a9734c1573005c0bb9aff4591baf2a90f5ea6089327f036bf
diff --git a/dev-ruby/psych/psych-5.2.3.ebuild b/dev-ruby/psych/psych-5.2.3.ebuild
new file mode 100644
index 000000000000..b68ed66312c2
--- /dev/null
+++ b/dev-ruby/psych/psych-5.2.3.ebuild
@@ -0,0 +1,43 @@
+# 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_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/psych/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="psych.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A YAML parser and emitter"
+HOMEPAGE="https://github.com/ruby/psych"
+SRC_URI="https://github.com/ruby/psych/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=dev-libs/libyaml-0.2.5"
+BDEPEND=">=dev-libs/libyaml-0.2.5"
+
+ruby_add_rdepend "
+	dev-ruby/date
+	dev-ruby/stringio
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit
+	dev-ruby/test-unit-ruby-core
+)"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC}
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'require "lib/helper"; Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rack-session/Manifest b/dev-ruby/rack-session/Manifest
index 0b6be764241e..81070534c723 100644
--- a/dev-ruby/rack-session/Manifest
+++ b/dev-ruby/rack-session/Manifest
@@ -1,2 +1,3 @@
 DIST rack-session-1.0.1.tar.gz 3120 BLAKE2B a36fefd25da9bbab26a58419782baf7606171fcdf9d033b3abb52ee225f5bd3f8b52d18c11947cceae8f00f278c832412b3babb8c2d7088f2a6554dcb0293689 SHA512 fa8362689cd49d55e24c82699eca9a45dd408b5e8978f6aee11f3f107e8d0a1f36ad319f4dd92e4fe5fd83e985382a43c41a353e9366d03b41f28e826d65483f
 DIST rack-session-2.0.0.tar.gz 23964 BLAKE2B 457210c3588c31d2d0d9251e6b12fe1f606545c4593c9be50a42110f99f7d15840553cac7e35653f2ef86d88f881a0a91537948bfca5b34e3d507cef8134c52b SHA512 8975a85845fa4dbdf22c10793fb2bb1a69aed3242c70c45b1d436448243e65ad77ecbfb17c8f2ef6f780b81ef480f8a46c5623e36dacc95401cd59a1510748f8
+DIST rack-session-2.1.0.tar.gz 24667 BLAKE2B ee426b244a9441254b008e9ab357c52ef08c8814b75a573cd04216b772972b602a5a7638b3a17084a80637dd0829a1faf9d469fdbaa1480cc9429ec49486a244 SHA512 e9f9fa6d5fe0e0f39ecb130c96d98010b03f9d89301424dfda671beaf14e9f3e07f480fa8e638501a53861033f1cce060ecc79548d90bde8ad7d734d1f008a9e
diff --git a/dev-ruby/rack-session/rack-session-2.1.0.ebuild b/dev-ruby/rack-session/rack-session-2.1.0.ebuild
new file mode 100644
index 000000000000..8b3806f9e5ba
--- /dev/null
+++ b/dev-ruby/rack-session/rack-session-2.1.0.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"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="rack-session.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A session implementation for Rack"
+HOMEPAGE="https://github.com/rack/rack-session"
+SRC_URI="https://github.com/rack/rack-session/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/base64-0.1.0
+	>=dev-ruby/rack-3.0.0
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/minitest-global_expectations
+	dev-ruby/rack:3.0
+)"
+
+all_ruby_prepare() {
+	sed -e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -e '2igem "rack", "~> 3.0.0"' \
+		-i test/helper.rb || die
+}
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.6.2.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.6.2.ebuild
index 20b685d1f8f0..098a961af55d 100644
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.6.2.ebuild
+++ b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.6.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
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rails/rails-html-sanitizer"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
 IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/loofah-2.21:0 >=dev-ruby/nokogiri-1.16.8:0"
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index bb1d344bb639..8a732a30d9ce 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,4 +1,5 @@
 DIST rdoc-6.10.0.tar.gz 797421 BLAKE2B f73029ea1d4984510a2ffe30ca608f609b218948b34ea9966e0ea0482b20946b90b753fe905109a042819677a291442fadc9e66961648db4f1bc442fc817600b SHA512 670295bf8dceb59100fcf6cef46942414d5b1367ff604be3623b5264955c879e37f0bbe382af48a22113f7702d6e3d6e2ed122b6649466779ae4bca1cb0c128b
+DIST rdoc-6.11.0.tar.gz 798268 BLAKE2B facb81a6da071e388260ad4ac04632fe3eb63790c20999bc14ba38668ef3dbaf473fd619629fb14067c3266a92d8abecdf1f507ad75c8e13615e14f4f96d49c0 SHA512 9433ca7dea0d75b539bf247204fe6e5926c1d46e31f8ea9b4fec89d2ba2d0b639e62de360526b15738762042e35aed21a58ea7d32d1f0469b4ce6ca116c545c5
 DIST rdoc-6.6.3.1.tar.gz 766103 BLAKE2B 15cef9df763e40e105155d49c6c0c1a449c366ac35ab6036c43773c52114f00b19109b056033366b873b5b3317a3bf11c574dd76094d8f606fa0916a84257d0a SHA512 c6f3aae83e895e2de28e5a7c27456160dd53007ceb4464a045e0211473eb3d51f49a7c2ac28f2e44e807c5b36447140d15eadff65bfa52335e94adc9c8b56d2e
 DIST rdoc-6.8.1.tar.gz 794457 BLAKE2B d239d482e6f06604ceee39e493bf3151b44895c774c3f23dee2858acb012196e0ec6837bc22da5ad854d28b20043392a4e0cbab3cff7dddfaab3c13d03f94e23 SHA512 b355b79c010d2918701b5bb52a326b6e7e10e33c457db3ac9d07592b8b0ef7fa01257a590dbbc1d22f0bec585f02a995b05c3c348cd081dbd75af87da4e0d7d1
 DIST rdoc-6.9.1.tar.gz 796367 BLAKE2B 6d80fa5b903c4c87acfe18de2d6e75f92bfd57b0b998bb8f80572b06308334c0a42370f79160c1b761cccfcb7810f1877fcbb3315381c8ec962b5f4c7bf7fb68 SHA512 24fbaf6f9c32bbde9b29267f5865c812382bf6afcddb6bc3b4a3427d068294609f102b6ed1859a7e3da7491fbb9105e9cfd99231a64645ee9968120bd6710dc3
diff --git a/dev-ruby/rdoc/rdoc-6.11.0.ebuild b/dev-ruby/rdoc/rdoc-6.11.0.ebuild
new file mode 100644
index 000000000000..e4ae4a575902
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-6.11.0.ebuild
@@ -0,0 +1,102 @@
+# 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=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.md TODO.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
+HOMEPAGE="https://github.com/ruby/rdoc/"
+SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 Ruby-BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc"
+
+RDEPEND=">=app-eselect/eselect-ruby-20181225"
+
+ruby_add_rdepend "
+	>=dev-ruby/psych-4.0.0
+"
+
+ruby_add_bdepend "
+	>=dev-ruby/kpeg-1.1.0-r1
+	>dev-ruby/racc-1.4.10
+	dev-ruby/rake
+	test? (
+		dev-ruby/bundler
+		>=dev-ruby/minitest-5.8:5
+		dev-ruby/test-unit-ruby-core
+	)"
+
+all_ruby_prepare() {
+	# Other packages also have use for a nonexistent directory, bug 321059
+	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/rdoc/test_rdoc*.rb || die
+
+	# Avoid unneeded dependency on bundler, bug 603696
+	sed -i -e '/bundler/ s:^:#:' \
+		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' \
+		-e '/rubocop\/rake/ s:^:#:' \
+		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
+
+	# Skip rubygems tests since the rubygems test case code is no longer installed by rubygems.
+	sed -i -e '/^task/ s/, :rubygems_test//' Rakefile || die
+
+	# Remove test that is depending on the locale, which we can't garantuee.
+	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
+
+	# Remove test depending on FEATURES=userpriv, bug 361959
+	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
+
+	# Remove test depending on currently unpackaged prism
+	rm -f test/rdoc/test_rdoc_parser_prism_ruby.rb || die
+
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		ruby -S exe/rdoc --force-output || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_compile() {
+	LANG=C.UTF-8 ${RUBY} -S rake generate || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for bin in rdoc ri; do
+		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
+
+		for version in $(ruby_get_use_implementations); do
+			version=`echo ${version} | cut -c 5-`
+			if use ruby_targets_ruby${version}; then
+				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
+				sed -i -e "1s/env ruby/ruby${version}/" \
+					"${ED}/usr/bin/${bin}${version}" || die
+			fi
+		done
+	done
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/rdoc) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+}
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.9.3.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.9.3.ebuild
index 24715aaf7a43..e8b560d6555c 100644
--- a/dev-ruby/regexp_parser/regexp_parser-2.9.3.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-2.9.3.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
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND+=" =dev-util/ragel-6*"
 
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 00eac6e0181d..5230f9aafcfa 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,2 +1,3 @@
 DIST rmagick-5.5.0.tar.gz 2045116 BLAKE2B 018d4e940043210238b6026a8bc0b65656633aaaf559954b666c75dda74c0f0fd33319a13fd6c494a6a51a3cfac67aac283e3e79d06dc90b6d4581464805e476 SHA512 f813104c347867b14281b044135fd626805d35d2afa3167c25d5e31179b31e985c5cc75deb630f8a64d20b877d8c42ce13e31e137f573467d3c5f3f2453d514f
 DIST rmagick-6.0.1.tar.gz 2045860 BLAKE2B e36ed9c2719df593cce32591111010a8d64e54ff4348ed22ebf9d840ca6f7ceec91b8097b5258bb0a195db63c422373e408f5995cef8944eac42e71d6fd00c4e SHA512 a6fdecd4ad6d17045438a9a14fc6c0a8b9d18224d6d3d0af2ade6fcba1bd0c889710f03d8b2f9738214023d87c504f7a7017f49b467a778fa3d97a14aa2bfeb3
+DIST rmagick-6.1.0.tar.gz 2048383 BLAKE2B 2d032dac7ce7d6d684ae3ed9f894dfa8e6b5d061b17d6a9118bae5bf7824da50f67cce809d26e3d68fdfcf0bc188f134891880e2fb79cd0f35269f05ef801b2c SHA512 8b00e888481991a7e991c7616e1b2575ec9e08da4d5620436439bf0cbe9cb38fa3a5b24986ba0d943c565d73dd0bf675e703a70b7fc3420df6fb932bc7bd2ccb
diff --git a/dev-ruby/rmagick/rmagick-6.1.0.ebuild b/dev-ruby/rmagick/rmagick-6.1.0.ebuild
new file mode 100644
index 000000000000..565929110967
--- /dev/null
+++ b/dev-ruby/rmagick/rmagick-6.1.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rmagick.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/RMagick/extconf.rb)
+
+MY_PV=RMagick_${PV//\./-}
+
+inherit ruby-fakegem
+
+DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
+HOMEPAGE="https://github.com/rmagick/rmagick"
+SRC_URI="https://github.com/rmagick/rmagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="rmagick-${MY_PV}"
+
+LICENSE="Artistic"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=media-gfx/imagemagick-6.9.0:="
+DEPEND=">=media-gfx/imagemagick-6.9.0 test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,lcms,postscript,tiff,webp,xml] media-fonts/dejavu )"
+
+# observer is a default gem packaged with ruby
+
+ruby_add_bdepend "dev-ruby/pkg-config"
+
+all_ruby_prepare() {
+	# Avoid unused dependency on rake-compiler. This also avoids an
+	# extra compile during tests.
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/end/ s:^:#:' \
+		-e '/compile/ s:^:#:' Rakefile || die
+	sed -i -e '/pry/ s:^:#:' -e '5irequire "tempfile"' spec/spec_helper.rb || die
+	sed -e 's/git ls-files/find */' \
+		-e '/pkg-config/ s:^:#:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Squelch harmless warning about imagemagick installation.
+	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
+
+	# Create directory used for a test
+	mkdir tmp
+}
+
+each_ruby_test() {
+	# Borrowed from media-gfx/gscan2pdf
+	# Needed to avoid test failures on e.g. ppc, bug #815856
+	# (Unclear why it doesn't manifest on amd64 here at least)
+	local confdir="${HOME}/.config/ImageMagick"
+	mkdir -p "${confdir}" || die
+	cat > "${confdir}/policy.xml" <<-EOT || die
+		<policymap>
+			<policy domain="coder" rights="read|write" pattern="PDF" />
+			<policy domain="coder" rights="read" pattern="PS" />
+		</policymap>
+	EOT
+
+	RSPEC_VERSION="3" ruby-ng_rspec
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+
+	if use doc ; then
+		docinto .
+		dodoc -r doc
+	fi
+}
diff --git a/dev-ruby/roadie-rails/roadie-rails-3.3.0.ebuild b/dev-ruby/roadie-rails/roadie-rails-3.3.0.ebuild
index aeb401c2ff65..901e81fd1a4a 100644
--- a/dev-ruby/roadie-rails/roadie-rails-3.3.0.ebuild
+++ b/dev-ruby/roadie-rails/roadie-rails-3.3.0.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
 
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
@@ -25,7 +25,7 @@ ruby_add_rdepend "dev-ruby/roadie:5
 ruby_add_bdepend "
 	test? (
 		dev-ruby/bundler
-		|| ( dev-ruby/rails:7.0 dev-ruby/rails:6.1 )
+		|| ( dev-ruby/rails:8.0 dev-ruby/rails:7.2 dev-ruby/rails:7.1 dev-ruby/rails:7.0 dev-ruby/rails:6.1 )
 		dev-ruby/rspec-rails
 		dev-ruby/rspec-collection_matchers
 		dev-ruby/sass-rails )"
@@ -54,6 +54,14 @@ all_ruby_prepare() {
 
 each_ruby_prepare() {
 	sed -i -e '/run_in_app_context/ s:bin/rails:'${RUBY}' -S bin/rails:' spec/support/rails_app.rb || die
+
+	case ${RUBY} in
+		*ruby33)
+			# Rails 7.0 does not have a ruby33 target so we can't test it.
+			sed -e '/rails_70/ s:^:#:' \
+				-i spec/integration_spec.rb || die
+			;;
+	esac
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 1c62ef305a58..d7b445687af1 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -3,6 +3,5 @@ DIST rubygems-3.4.22.tar.gz 15054005 BLAKE2B 856b60bf3a2f477b6e0aeaa4522f17934a6
 DIST rubygems-3.5.11.tar.gz 13541588 BLAKE2B 3cc349776955d1666d67f7e4021c3237cbe16928c60842a334f928dd018e31ddc40a94862ae6e760adf377ff41161445c96151fe07ccbffa58b426d37777a5ad SHA512 611096b4776176d9f166786d2d050c53c1d6284f635a9521b391f11304654b947a7a27b0eb40af0bfa80bc20b21abe8f189f8b60764eb4234c7ccb1e8fbebfef
 DIST rubygems-3.5.21.tar.gz 13169518 BLAKE2B dc0bac435903d84633ac5560f4739d0123bc8a4d8afb70ce47b4503bbe759f3de7642ad9e8d5f9f42cc4c715792edd24cfbe9474b5ae4cf7e642173cd9f26812 SHA512 9739799b020b8e11362f4892ec404fdf16661ff0166193b0130b2433f5a5c1d24db9792d490f448dcbb37cb31298d9ae0e06caa48953c7f48b36eec1d044bd68
 DIST rubygems-3.5.23.tar.gz 13176890 BLAKE2B 45fa342eb10e4ea19122bef523771bcc7864d302e87f967e7048359bc8ff84e824caf18b4b5d07c5708e481153efba70a93e9446ed7bffa790d1fb00c0603009 SHA512 423e112551e85459a713a3ce89568341894075c63645a65d4efc81f2534d1d713c74c8405848417216b8c21f3428187c2411296bc5ef8eb034b2f155bf1b4020
-DIST rubygems-3.5.3.tar.gz 13495997 BLAKE2B 1c9e01cc15a7afb0dfeaf61d14cea43fa19844a901cf6337f542b14da608dfa016ba438807276018b372f9c6ce8a44df2ea491f08a1217bd9f3fd04cd1ec57a7 SHA512 50f6ccd9f47c6d56c20c2bc23a35f0ca0edb2d55ae9904749bf03d1181acee499cce668df6a8847a5a59b37de0efb884acf028df6b768cb7cd2f1993ca4f8db2
-DIST rubygems-3.5.9.tar.gz 13538062 BLAKE2B db8b3c17381572f53df222b7fed53c6c16e2d6bfd6a74a21aa18ee4bc43c7824c5918956076ccc15b93e4ed669d9e58bda8b9736b3435c736c8da726161634a6 SHA512 c1de5b5744665590179efb5389829ace8345703007d880ff99dc55a230482aa696c960add4c2e2d5c290f2a762c3a7a469668158c95cdf4acb4afa82c0d67ecb
 DIST rubygems-3.6.2.tar.gz 12945336 BLAKE2B 68e3637c78c2ac2f59eb58c26cb47c021fda5e0a6fc93e601731cf56ef81ef7f1829a1488074c8535869edf1566a71fdafe3a44bda379c896fc6872a6d660c6d SHA512 0a7a7a44656ebb717b0bd805a27c18a92e391589a36838e4abecc6c9643192ab9e2a63cd56e113716e635169fa659fcdd1157fa1e394a37c7de7081774365db2
+DIST rubygems-3.6.3.tar.gz 12949599 BLAKE2B 43dfba92af2507a69a939b6c0ffd8642de06b179f4aecfd2df772975c32651828533dda7130089729e2f92f9b87806f0cdf0195b378b3ce398cc4f30e47d5683 SHA512 a8252e661727f86ca3a6dacaf7a882316e236199a9f4cd2fc852e5ec1d0f694803273b97f489d7c55470174812f3a37618002f282c8f7188dc9cbaf92392c3f4
diff --git a/dev-ruby/rubygems/rubygems-3.5.3.ebuild b/dev-ruby/rubygems/rubygems-3.5.3.ebuild
deleted file mode 100644
index d1f12abbe3fc..000000000000
--- a/dev-ruby/rubygems/rubygems-3.5.3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-LICENSE="|| ( Ruby MIT )"
-
-SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="0"
-IUSE="server test"
-RESTRICT="!test? ( test )"
-
-PDEPEND="server? ( =dev-ruby/builder-3* )"
-
-ruby_add_depend "virtual/ruby-ssl"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/json
-		dev-ruby/minitest:5
-		dev-ruby/rake
-		dev-ruby/rdoc
-		dev-ruby/webrick
-	)"
-
-all_ruby_prepare() {
-	# Remove unpackaged automatiek from Rakefile which stops it from working
-	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	sed -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' \
-		-i test/rubygems/test_gem_path_support.rb || die
-	# Avoid test that won't work as json is also installed as plain ruby code
-	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
-
-	# Avoid test that requires additional utility scripts
-	rm -f test/test_changelog_generator.rb || die
-
-	# Avoid tests that require a network connection (for crates.io or other downloads)
-	rm -f test/rubygems/test_gem_ext_cargo_builder.rb || die
-	sed -e '/test_gem_exec_gem_uninstall/aomit "requires network"' \
-		-i test/rubygems/test_gem_commands_exec_command.rb || die
-
-	# Update manifest after changing files to avoid a test failure
-	if use test; then
-		rake update_manifest || die
-	fi
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' exe/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
-			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { require _1 }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
-
-	newbin exe/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
-}
-
-all_ruby_install() {
-	dodoc CHANGELOG.md README.md
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(30|31|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-3.5.9.ebuild b/dev-ruby/rubygems/rubygems-3.5.9.ebuild
deleted file mode 100644
index d0c9d9d059fc..000000000000
--- a/dev-ruby/rubygems/rubygems-3.5.9.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-
-SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( Ruby MIT )"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="server test"
-RESTRICT="!test? ( test )"
-
-PDEPEND="server? ( =dev-ruby/builder-3* )"
-
-ruby_add_depend "virtual/ruby-ssl"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/json
-		dev-ruby/minitest:5
-		dev-ruby/rake
-		dev-ruby/rdoc
-		dev-ruby/webrick
-	)"
-
-all_ruby_prepare() {
-	# Remove unpackaged automatiek from Rakefile which stops it from working
-	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	sed -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' \
-		-i test/rubygems/test_gem_path_support.rb || die
-	# Avoid test that won't work as json is also installed as plain ruby code
-	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
-
-	# Avoid test that requires additional utility scripts
-	rm -f test/test_changelog_generator.rb || die
-
-	# Avoid tests that require a network connection (for crates.io or other downloads)
-	rm -f test/rubygems/test_gem_ext_cargo_builder.rb || die
-	sed -e '/test_gem_exec_gem_uninstall/aomit "requires network"' \
-		-i test/rubygems/test_gem_commands_exec_command.rb || die
-
-	# Update manifest after changing files to avoid a test failure
-	if use test; then
-		rake update_manifest || die
-	fi
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' exe/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
-			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { require _1 }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
-
-	newbin exe/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
-}
-
-all_ruby_install() {
-	dodoc CHANGELOG.md README.md
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(30|31|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-3.6.3.ebuild b/dev-ruby/rubygems/rubygems-3.6.3.ebuild
new file mode 100644
index 000000000000..2b846e6171b3
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.6.3.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+
+SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="|| ( Ruby MIT )"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rake
+		dev-ruby/rdoc
+		dev-ruby/test-unit
+		dev-ruby/webrick
+	)"
+
+all_ruby_prepare() {
+	# Remove unpackaged automatiek from Rakefile which stops it from working
+	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' \
+		-i test/rubygems/test_gem_path_support.rb || die
+	# Avoid test that won't work as json is also installed as plain ruby code
+	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
+
+	# Avoid test that requires additional utility scripts
+	rm -f test/test_changelog_generator.rb || die
+
+	# Avoid tests that require a network connection (for crates.io or other downloads)
+	rm -f test/rubygems/test_gem_ext_cargo_builder.rb || die
+	sed -e '/test_gem_exec_gem_uninstall/aomit "requires network"' \
+		-i test/rubygems/test_gem_commands_exec_command.rb || die
+
+	# Avoid tests with newer rdoc versions. These tests have been disabled upstream.
+	sed -e '/test_execute_rdoc/aomit "no longer needed with rdoc 6.9.0"' \
+		-i test/rubygems/test_gem_commands_{install,update}_command.rb || die
+
+	# Update manifest after changing files to avoid a test failure. Set
+	# RUBYLIB to ensure that we consistently use the new code for
+	# rubygems and the bundled bundler.
+	if use test; then
+		RUBYLIB=lib rake update_manifest || die
+	fi
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' exe/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { require _1 }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin exe/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+	dodoc CHANGELOG.md README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(30|31|...)"
+	ewarn
+}
diff --git a/dev-ruby/rubyzip/Manifest b/dev-ruby/rubyzip/Manifest
index 218936ed3a05..a1ff55a08da3 100644
--- a/dev-ruby/rubyzip/Manifest
+++ b/dev-ruby/rubyzip/Manifest
@@ -1 +1,2 @@
 DIST rubyzip-2.3.2-git.tgz 225923 BLAKE2B ed901326cd0f79c8be004d9c14b32d7e67e90ab4d2d5b67dc64559fd4691dfb63cfa1ee18363a7cf864bd62559f1bc2fae71fc25ad1c727d7cc01f94d1ec62ee SHA512 6c64e53c1f5ca530abfa22baf388f87c8cf098d81cc9c639f20903e5193cf26243fbf861ac12002ae954f026e04168d8a55beeaf3ac5542bd0618ca85a5c90de
+DIST rubyzip-2.4-git.tgz 229877 BLAKE2B 3bbc47e714ac759427341d9cc79396643f29ad526d5807b99e12cc459a4e071ab777215dd1916f944f6953454fd886238d660e8384b8bfbff311acd4872fa281 SHA512 b1b7c17bef8c342763a6744847b6741344c905ec4100fe2810e8f2c9ac1435f526553980f48ce5cf2eade60681e97f6bc49b6a4ed8d17a92e3243b346b6a3362
diff --git a/dev-ruby/rubyzip/rubyzip-2.4.ebuild b/dev-ruby/rubyzip/rubyzip-2.4.ebuild
new file mode 100644
index 000000000000..b3adad400f1a
--- /dev/null
+++ b/dev-ruby/rubyzip/rubyzip-2.4.ebuild
@@ -0,0 +1,53 @@
+# 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="Changelog.md README.md TODO"
+
+RUBY_FAKEGEM_GEMSPEC="rubyzip.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby library for reading and writing zip files"
+HOMEPAGE="https://github.com/rubyzip/rubyzip"
+# Tests are not included in the gem.
+SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="Ruby-BSD"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+DEPEND="test? ( app-arch/zip )"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc samples/*
+}
+
+all_ruby_prepare() {
+	# Avoid dependencies on simplecov and coveralls
+	sed -i -e '/simplecov/ s:^:#:' test/test_helper.rb || die
+
+	# Avoid dependency on bundler
+	sed -i -e '/bundler/ s:^:#: ; /rubocop/I s:^:#:' Rakefile || die
+
+	# Fix hardcoded path to /tmp
+	sed -i -e "s:/tmp/:${T}/:g" test/entry_test.rb || die
+
+	# Add missing requires
+	sed -i -e '1irequire "forwardable"; require "pathname"' test/input_stream_test.rb || die
+
+	# Fix broken test that uses native endian
+	sed -i -e '/pack/ s/LLS/VVv/' test/file_extract_test.rb || die
+}
diff --git a/dev-ruby/sanitize/sanitize-6.1.3.ebuild b/dev-ruby/sanitize/sanitize-6.1.3.ebuild
index 589d79da2697..642515bbc62d 100644
--- a/dev-ruby/sanitize/sanitize-6.1.3.ebuild
+++ b/dev-ruby/sanitize/sanitize-6.1.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
 
-USE_RUBY="ruby31 ruby32 ruby33"
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
diff --git a/dev-ruby/sanitize/sanitize-7.0.0.ebuild b/dev-ruby/sanitize/sanitize-7.0.0.ebuild
index 42cd027a00fe..e6f47f81ec44 100644
--- a/dev-ruby/sanitize/sanitize-7.0.0.ebuild
+++ b/dev-ruby/sanitize/sanitize-7.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby31 ruby32 ruby33"
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/semantic_puppet/Manifest b/dev-ruby/semantic_puppet/Manifest
index 3499e960aa11..d6031b7abea7 100644
--- a/dev-ruby/semantic_puppet/Manifest
+++ b/dev-ruby/semantic_puppet/Manifest
@@ -1,2 +1,2 @@
-DIST semantic_puppet-1.0.4.gem 32256 BLAKE2B 4704a6d913388d10cf32442511d66d742bcdba792d81d67de960209dbffc8ade970431e794934152b71031de83a75d9e09bda830e6e66838b68913d2bbb9da0a SHA512 8b830626e973bc74fb4f4147e83ca8048d412751ff48dbe96ec6e790645eae7a51c665b75a09d0f0fdec3b29d3798158c38b613e2f83d115d1ba2a4c8d24362a
 DIST semantic_puppet-1.1.0.gem 32768 BLAKE2B e5f41d88afe1b7c760772e4de05f820b84a1cccc809fe692e0d76bdedc75e1bec1d9c0b66d49ff4468ae0b20fdd3c724bdd5305709af4f1faa2ca867f8a5a679 SHA512 22d5596f445faa7c7a779c11e4a9b52e1ca3f77fcc63270798e4b0fc7dddd59c66bab1644214f1526a0fa5732e349522e8664ea6285f0ca107f35009e8a1d151
+DIST semantic_puppet-1.1.1.gem 32768 BLAKE2B 38a847615f1caf4d89cacf373a566c4b4837df25013bb36609eb5e3b50029b5fdc15af705acfe2b950b57505d3004e47dcd2d515d159c24490a31a6ef18e1d0c SHA512 a33614de1a1e1834fcfa2bd020fe9b73044c0df4bc95ee6fc9a3217a1a60133437e62776542dc702fb540432ac295f1dd3c029333a49b794d24d4207bded1d65
diff --git a/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild b/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild
deleted file mode 100644
index e3c5359cfddc..000000000000
--- a/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library of tools for working with Semantic Versions and module dependencies"
-HOMEPAGE="https://github.com/puppetlabs/semantic_puppet"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86"
-IUSE=""
diff --git a/dev-ruby/semantic_puppet/semantic_puppet-1.1.1.ebuild b/dev-ruby/semantic_puppet/semantic_puppet-1.1.1.ebuild
new file mode 100644
index 000000000000..d0f2a7aa527c
--- /dev/null
+++ b/dev-ruby/semantic_puppet/semantic_puppet-1.1.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library of tools for working with Semantic Versions and module dependencies"
+HOMEPAGE="https://github.com/puppetlabs/semantic_puppet"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
diff --git a/dev-ruby/sparklines/sparklines-0.5.2-r8.ebuild b/dev-ruby/sparklines/sparklines-0.5.2-r8.ebuild
index 6d604998fa0d..937ae8cbdd7b 100644
--- a/dev-ruby/sparklines/sparklines-0.5.2-r8.ebuild
+++ b/dev-ruby/sparklines/sparklines-0.5.2-r8.ebuild
@@ -1,8 +1,8 @@
-# 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="ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -16,13 +16,13 @@ HOMEPAGE="http://sparklines.rubyforge.org/"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
+IUSE="test"
 
 DEPEND+="test? ( media-gfx/imagemagick[png] )"
 
 ruby_add_rdepend "dev-ruby/rmagick:*"
 
-ruby_add_bdepend "test? ( dev-ruby/tidy_table dev-ruby/dust )"
+ruby_add_bdepend "test? ( dev-ruby/tidy_table )"
 
 PATCHES=( "${FILESDIR}/${P}-rmagick4-deprecation.patch" )
 
@@ -31,6 +31,9 @@ all_ruby_prepare() {
 	# versions.
 	sed -i -e '/require/ s/RMagick/rmagick/' lib/sparklines.rb || die
 
+	# Dust does not work with ruby33 and does not seem to be used.
+	sed -e '/dust/ s:^:#:' \
+		-i test/test_all.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/term-ansicolor/Manifest b/dev-ruby/term-ansicolor/Manifest
index 1e898a12e2d8..c5764b82696a 100644
--- a/dev-ruby/term-ansicolor/Manifest
+++ b/dev-ruby/term-ansicolor/Manifest
@@ -1,3 +1 @@
 DIST term-ansicolor-1.11.2.gem 47616 BLAKE2B 4481e347c23af4e03061bd92df387ad996e99e86c63ab9377c713ae3f70f12a53c3aa8a411fdcf003fabaedf3e9b39275910627ebaff19b963f49b2879c7b895 SHA512 df7384dbfd68e1efe161f2edc186306a40d8492b488bfc9436cadef09d7b961bc29983a40fca93e2e127c1b502272eb01aa65cc65ba7729a81b31b37aaafcd65
-DIST term-ansicolor-1.8.0.gem 45056 BLAKE2B 89edaf5ecb56dada8027ab91009b71a6ee9a27c85bddeda26d281230e0fc15f32a2de1c3259d02560bdf9c81a2ed92a920521eec17670eaa0b8db1264ff7311c SHA512 4a13f369c03d3660f48f28068f311d5eb806e2e4724da6a3ee38eb0ed3c195a1ce8ea24215dfe80af5aab8df1f6a86fdd89d54c62ee2fb9b7e782f9e5ed3013f
-DIST term-ansicolor-1.9.0.gem 46592 BLAKE2B 8e9f4f4f09f57b7eef9b824a1327c4ece8be365b1eeb17f9f29437bd883a96f7339912d9d5b52546d262a49bf2f42520e451cdb0a76c08c27bc2b9bcffeed492 SHA512 a6d9bfd11b620c6bb3de204929af58b2b007359975c64b7f9485b4574e1ace68f7ac389f50a6239050735eed8ec894fa8d8d56821f7614c19ece9053d4c781cd
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.11.2.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.11.2.ebuild
index 33d6fedb85c0..f3f3c2ba1c1c 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.11.2.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.11.2.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
 
-USE_RUBY="ruby31 ruby32 ruby33"
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.8.0.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.8.0.ebuild
deleted file mode 100644
index 748d3f1f35ab..000000000000
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.8.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_GEMSPEC="term-ansicolor.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Small Ruby library that colors strings using ANSI escape sequences"
-HOMEPAGE="https://flori.github.io/term-ansicolor/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-ruby_add_rdepend ">=dev-ruby/tins-1.0"
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:tests -e 'Dir["tests/*_test.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.9.0.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.9.0.ebuild
deleted file mode 100644
index 748d3f1f35ab..000000000000
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.9.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_GEMSPEC="term-ansicolor.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Small Ruby library that colors strings using ANSI escape sequences"
-HOMEPAGE="https://flori.github.io/term-ansicolor/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-ruby_add_rdepend ">=dev-ruby/tins-1.0"
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:tests -e 'Dir["tests/*_test.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index d8df2b7f9528..00513208a14e 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,2 +1,3 @@
 DIST tilt-2.4.0.tar.gz 58520 BLAKE2B fe07437d62de1db062625c1ead3a81ed34bba0c7169181d44216b5f42b1b742b2c7900c079affbae13831d1370044827384da4302b6e92a01f151b36b37f3772 SHA512 3053479b9f258e01620db5f4af02247179df39f18baae2b5b83eac23046effafcd6f47575432158bb752e3019dcb0aadb67ca11236a12ea01e2211354b7418d1
 DIST tilt-2.5.0.tar.gz 57181 BLAKE2B 27f2eccaec18c7e87ac30680ad94f9202f9608a384d4391e90cc882a4ed82e8b977d89c275202d67e5f30581104a5279e88d47288e709567d65940c18c8d585f SHA512 d27e08e773dd83cf9310ae2879a3a558ecdf686f105c6f03588646ba771933533f75c0132b404c846dfd10087cd6e9aa2cc7fe41076bb4e84766c79f0b98538f
+DIST tilt-2.6.0.tar.gz 61451 BLAKE2B aa007d0665685ddefb6c5228b3c89444913d632c462d7c9be017bdbd6138238e4d533b25e00f65c99ec0c6e59de512b446916b15a6ff7ef7bd1f9b3cda9911c3 SHA512 b1f2e146d98b75e97e479bfcbad125c0fd9c5bc707b5d9ea73185033f70461d008f9f94e5bab6e6e4676fd8237af08f9ea13f311f4673d3644c8dcc335d25c68
diff --git a/dev-ruby/tilt/tilt-2.5.0.ebuild b/dev-ruby/tilt/tilt-2.5.0.ebuild
index b76fb674cff9..b545d4342969 100644
--- a/dev-ruby/tilt/tilt-2.5.0.ebuild
+++ b/dev-ruby/tilt/tilt-2.5.0.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
 
-USE_RUBY="ruby31 ruby32 ruby33"
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/TEMPLATES.md"
diff --git a/dev-ruby/tilt/tilt-2.6.0.ebuild b/dev-ruby/tilt/tilt-2.6.0.ebuild
new file mode 100644
index 000000000000..b545d4342969
--- /dev/null
+++ b/dev-ruby/tilt/tilt-2.6.0.ebuild
@@ -0,0 +1,34 @@
+# 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="CHANGELOG.md README.md docs/TEMPLATES.md"
+
+RUBY_FAKEGEM_GEMSPEC="tilt.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Thin interface over template engines to make their usage as generic as possible"
+HOMEPAGE="https://github.com/jeremyevans/tilt"
+SRC_URI="https://github.com/jeremyevans/tilt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# Block on some of the potential test dependencies. These dependencies
+# are optional for the test suite, and we don't want to depend on all of
+# them to facilitate keywording and stabling.
+ruby_add_bdepend "test? (
+	dev-ruby/erubi
+	dev-ruby/nokogiri
+)"
+
+all_ruby_prepare() {
+	sed -e '/bundler/I s:^:#:' -i Rakefile test/test_helper.rb || die
+	sed -e '7irequire "uri"' -i test/test_helper.rb || die
+}
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index 4f16f0cc3943..65e467d139d2 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -1,4 +1,4 @@
-DIST tins-1.33.0.gem 307712 BLAKE2B 73f2211e73a99b06f1ad9ff7c770b5e7a9a478eb8d596bd2b1225f072d8be031a361ebfbdf5f1fdd402844d591640523640fa362dcf21fa24da86887fe383f46 SHA512 3a287ca5e8420c3e2582f8996b5a52c5337c82e1abc8f4311751196f94c75518515d534a7fb020886cf41118b9fcc9142299ca06a809255003029a2512e5b32e
 DIST tins-1.36.1.gem 311296 BLAKE2B 5457d24023fcf00c8b843453caabaca4c9338d0f90a1a516f2af1540ece2ab469e21b08e147799d32f4d34b45a5a0121803898a576bbdd9e2df8155b5ea9cfa7 SHA512 c2a109fe8d9d91a90ca9efdc575b1b7b5ad6dfb43bdde1a7456bd184367e49290dbd754c50e2722b53e154b739f7758fcb7feb3bc9a57db2ac7162f4bd6fd61d
 DIST tins-1.37.0.gem 311808 BLAKE2B 691d3b49f15a3c0361d6480e449872c692e6d58f9aa634fc8c07af0c6fc13e7f0fd1e62515310db98c87ffcf7ccc2475c81a0af4d367ec8c1c5199ac838d465d SHA512 01e867b09bb1d9c454bdb0a5e8f4f3a102bc3940d3ad1552ad82a93d58e9a8bbb8aee1e55ba81c6fd43ef78df168969cc601adea161b616bdab672bad91ad66c
 DIST tins-1.37.1.gem 310784 BLAKE2B d6955c2170f6c25927d80ab45bc73613fa90da24bb669c2c306c0910a47052c60780c1d0ea4cf900ab4d29baa1f94db4edac8441395b34d766767e6b2591d3fe SHA512 2a2b9e19cbf644b940bf3df4ff528196f614922bd90d2e99301e07e58ed64d823245dad7a5ad9b4a31049d5201d3ecef8c7bc3796ea01ef0378ffbf814d8916d
+DIST tins-1.38.0.gem 310784 BLAKE2B 2b2d37eb9e551d5326dde5e7cf93dfcfa13b4c73576488ed65e27e4a88ae0a0430009fcfb2a7eb91963884d54337add94b704ea13630a635b37d512c43be6881 SHA512 abb49f4eb8a3d3277edc3ff8cfaadeb97a89068b59e7ad9f87e29889fe79a6e340cfc42e4fd1e1d41c9b1539a45a19fd2debb2e8e1c65dcf1e38d2e6da6e6db0
diff --git a/dev-ruby/tins/tins-1.33.0.ebuild b/dev-ruby/tins/tins-1.33.0.ebuild
deleted file mode 100644
index c7cff3784eab..000000000000
--- a/dev-ruby/tins/tins-1.33.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="All the stuff that isn't good enough for a real library"
-HOMEPAGE="https://github.com/flori/tins"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/bigdecimal dev-ruby/sync"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib tests/*_test.rb
-}
diff --git a/dev-ruby/tins/tins-1.38.0.ebuild b/dev-ruby/tins/tins-1.38.0.ebuild
new file mode 100644
index 000000000000..6cd9a5f97072
--- /dev/null
+++ b/dev-ruby/tins/tins-1.38.0.ebuild
@@ -0,0 +1,29 @@
+# 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_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/bigdecimal dev-ruby/sync"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/tokyocabinet/files/tokyocabinet-1.32.0-arity.patch b/dev-ruby/tokyocabinet/files/tokyocabinet-1.32.0-arity.patch
new file mode 100644
index 000000000000..f11a6c2cc1c8
--- /dev/null
+++ b/dev-ruby/tokyocabinet/files/tokyocabinet-1.32.0-arity.patch
@@ -0,0 +1,11 @@
+--- a/tokyocabinet.c	2025-01-18 08:58:51.200947224 +0100
++++ b/tokyocabinet.c	2025-01-18 09:03:40.936107401 +0100
+@@ -3164,7 +3164,7 @@
+   rb_define_method(cls_tdbqry, "setmax", tdbqry_setlimit, -1);
+   rb_define_method(cls_tdbqry, "search", tdbqry_search, 0);
+   rb_define_method(cls_tdbqry, "searchout", tdbqry_searchout, 0);
+-  rb_define_method(cls_tdbqry, "proc", tdbqry_proc, 0);
++  rb_define_method(cls_tdbqry, "proc", tdbqry_proc, 1);
+   rb_define_method(cls_tdbqry, "hint", tdbqry_hint, 0);
+   rb_define_method(cls_tdbqry, "metasearch", tdbqry_metasearch, -1);
+   rb_define_method(cls_tdbqry, "kwic", tdbqry_kwic, -1);
diff --git a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0-r2.ebuild b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0-r2.ebuild
new file mode 100644
index 000000000000..494678fbc883
--- /dev/null
+++ b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0-r2.ebuild
@@ -0,0 +1,24 @@
+# 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_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTENSIONS=(./extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby bindings for Tokyo Cabinet"
+HOMEPAGE="https://fallabs.com/tokyocabinet/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+
+RDEPEND="dev-db/tokyocabinet"
+
+PATCHES=( "${FILESDIR}/${P}-arity.patch" )
diff --git a/dev-ruby/tty-command/tty-command-0.10.1-r1.ebuild b/dev-ruby/tty-command/tty-command-0.10.1-r1.ebuild
index 070f71a6b410..c5ea5172bbee 100644
--- a/dev-ruby/tty-command/tty-command-0.10.1-r1.ebuild
+++ b/dev-ruby/tty-command/tty-command-0.10.1-r1.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
@@ -21,7 +21,6 @@ SRC_URI="https://github.com/piotrmurach/tty-command/archive/v${PV}.tar.gz -> ${P
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv"
-IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/pastel-0.8:0"
 
@@ -29,4 +28,8 @@ all_ruby_prepare() {
 	echo '-rspec_helper' > .rspec || die
 
 	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid flaky spec that fails with unimportant output differences
+	sed -e '/logs phased output in pseudo terminal mode/ s/it/xit/' \
+		-i spec/unit/pty_spec.rb || die
 }
diff --git a/dev-ruby/typeprof/typeprof-0.30.1-r1.ebuild b/dev-ruby/typeprof/typeprof-0.30.1-r1.ebuild
new file mode 100644
index 000000000000..321a404491bc
--- /dev/null
+++ b/dev-ruby/typeprof/typeprof-0.30.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby32 ruby33 ruby34"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="sig"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="typeprof.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Performs a type analysis of non-annotated Ruby code"
+HOMEPAGE="https://github.com/ruby/typeprof"
+SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_rdepend "
+	dev-ruby/prism
+	>=dev-ruby/rbs-3.6.0
+"
+
+all_ruby_prepare() {
+	sed -e "s:_relative ': './:" \
+		-e 's/git ls-files -z/find * -print0/' \
+		-e '/ruby_version/ s/3.3/3.2/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/vlad/vlad-2.7.1-r1.ebuild b/dev-ruby/vlad/vlad-2.7.1-r1.ebuild
index 38a8ba0ce20d..29141c5d539b 100644
--- a/dev-ruby/vlad/vlad-2.7.1-r1.ebuild
+++ b/dev-ruby/vlad/vlad-2.7.1-r1.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 ruby33"
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
 
 RUBY_FAKEGEM_EXTRADOC="considerations.txt History.txt README.txt"
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/vlad"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
 
 ruby_add_bdepend ">=dev-ruby/hoe-3.13
 	test? ( >=dev-ruby/minitest-5.7 )"
diff --git a/dev-ruby/websocket-driver/Manifest b/dev-ruby/websocket-driver/Manifest
index a92156788621..ea8bd85ff259 100644
--- a/dev-ruby/websocket-driver/Manifest
+++ b/dev-ruby/websocket-driver/Manifest
@@ -1 +1,2 @@
 DIST websocket-driver-0.7.6.tar.gz 26332 BLAKE2B e8da76846b519603f7eef9cef53afdff3d48176cba21de1ce6b17e3718dd33b8309aaca721d4d11480e34e04b1ed2bfbb8892af507fbc72c1ff846c800f46499 SHA512 5444a0748821ab651e9e5ed40fd737c9af50eca1f8046b3110ab436bb8c0c56250ee8a8e762ae1668249d9ebfa2712b52802950529a949aba2574ffc66c1c58a
+DIST websocket-driver-0.7.7.tar.gz 26399 BLAKE2B a247e388995b1bba76b4fdbb1871b42bc2861c7550ebd2600a036c992f68c64e8ed88fd7811b85804e4167394e98bbc2eb01cd821dce3e0c8b181765f526f3d2 SHA512 ef012c2706d0fede25f3ea035c8ac26106f466a188ad46ce6729967aab5f0d655baa70138753ee0c44be9521caf9bab030b3f4d3cee813229ec7e4a2c5793cfa
diff --git a/dev-ruby/websocket-driver/websocket-driver-0.7.7.ebuild b/dev-ruby/websocket-driver/websocket-driver-0.7.7.ebuild
new file mode 100644
index 000000000000..768126c276af
--- /dev/null
+++ b/dev-ruby/websocket-driver/websocket-driver-0.7.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/websocket-driver/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A complete implementation of the WebSocket protocols"
+HOMEPAGE="https://github.com/faye/websocket-driver-ruby"
+SRC_URI="https://github.com/faye/websocket-driver-ruby/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-ruby-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0.7"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+ruby_add_rdepend "
+	dev-ruby/base64
+	>=dev-ruby/websocket-extensions-0.1.0
+"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.7.1.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.7.1.ebuild
index 7901e88e5a88..750f705c1a7c 100644
--- a/dev-ruby/zeitwerk/zeitwerk-2.7.1.ebuild
+++ b/dev-ruby/zeitwerk/zeitwerk-2.7.1.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="ruby32 ruby33"
+USE_RUBY="ruby32 ruby33 ruby34"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
diff --git a/dev-scheme/gauche/gauche-0.9.15-r1.ebuild b/dev-scheme/gauche/gauche-0.9.15-r1.ebuild
new file mode 100644
index 000000000000..95768382c202
--- /dev/null
+++ b/dev-scheme/gauche/gauche-0.9.15-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools
+
+MY_P="${P^g}"
+MY_P="${MY_P/_p/-p}"
+
+DESCRIPTION="A Unix system friendly Scheme Interpreter"
+HOMEPAGE="https://practical-scheme.net/gauche/"
+SRC_URI="https://github.com/shirok/${PN^g}/releases/download/release${PV//./_}/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)8"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="net-libs/mbedtls:0=
+	sys-libs/gdbm
+	virtual/libcrypt:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-ext-ldflags.patch
+	"${FILESDIR}"/${PN}-gauche.m4.patch
+	"${FILESDIR}"/${PN}-info.patch
+	"${FILESDIR}"/${PN}-xz-info.patch
+)
+DOCS=( AUTHORS ChangeLog HACKING.adoc README.adoc )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		--with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+		--with-slib="${EPREFIX}"/usr/share/slib \
+		--with-tls=mbedtls
+}
+
+src_test() {
+	emake -j1 -s check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-pkg install-doc
+	einstalldocs
+}
diff --git a/dev-scheme/gauche/gauche-0.9.15.ebuild b/dev-scheme/gauche/gauche-0.9.15.ebuild
deleted file mode 100644
index 16f7c7362b73..000000000000
--- a/dev-scheme/gauche/gauche-0.9.15.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools
-
-MY_P="${P^g}"
-MY_P="${MY_P/_p/-p}"
-
-DESCRIPTION="A Unix system friendly Scheme Interpreter"
-HOMEPAGE="http://practical-scheme.net/gauche/"
-SRC_URI="https://github.com/shirok/${PN^g}/releases/download/release${PV//./_}/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)8"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="net-libs/mbedtls:=
-	sys-libs/gdbm
-	virtual/libcrypt:="
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-ext-ldflags.patch
-	"${FILESDIR}"/${PN}-gauche.m4.patch
-	"${FILESDIR}"/${PN}-info.patch
-	"${FILESDIR}"/${PN}-xz-info.patch
-)
-DOCS=( AUTHORS ChangeLog HACKING.adoc README.adoc )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		--with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
-		--with-slib="${EPREFIX}"/usr/share/slib \
-		--with-tls=mbedtls
-}
-
-src_test() {
-	emake -j1 -s check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-pkg install-doc
-	einstalldocs
-}
diff --git a/dev-scheme/guile-commonmark/metadata.xml b/dev-scheme/guile-commonmark/metadata.xml
index 8bf01c4d6ab3..aee3208b367f 100644
--- a/dev-scheme/guile-commonmark/metadata.xml
+++ b/dev-scheme/guile-commonmark/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>arsen@gentoo.org</email>
-    <description>Arsen Arsenović</description>
+    <name>Arsen Arsenović</name>
   </maintainer>
   <maintainer type="project">
     <email>scheme@gentoo.org</email>
diff --git a/dev-scheme/guile-dbd-postgresql/files/guile-dbd-postgresql-2.1.8-configure.patch b/dev-scheme/guile-dbd-postgresql/files/guile-dbd-postgresql-2.1.8-configure.patch
deleted file mode 100644
index 5aef8c60b68d..000000000000
--- a/dev-scheme/guile-dbd-postgresql/files/guile-dbd-postgresql-2.1.8-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,7 +58,7 @@ AC_HEADER_STDC
- AC_CHECK_LIB(pq,PQconnectStart,,
-         AC_MSG_ERROR([*** Can't find libpq]))
- 
--CFLAGS=`guile-config compile`
-+CFLAGS="${CFLAGS} `guile-config compile`"
- LIBS=`guile-config link`
- 
- . $srcdir/DBD-VERSION
diff --git a/dev-scheme/guile-dbi/files/guile-dbi-2.1.8-configure.patch b/dev-scheme/guile-dbi/files/guile-dbi-2.1.8-configure.patch
deleted file mode 100644
index 1ab6d4f3c9d4..000000000000
--- a/dev-scheme/guile-dbi/files/guile-dbi-2.1.8-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,7 +62,7 @@ LTDL_INIT
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERBOSITY],1)])
- 
- 
--CFLAGS="$LTDLINCL `$GUILECONFIG compile`"
-+CFLAGS="$CFLAGS $LTDLINCL `$GUILECONFIG compile`"
- LIBS="$LIBLTDL `$GUILECONFIG link`"
- GUILE_SITE=`$GUILECONFIG info sitedir`
- 
diff --git a/dev-scheme/guile/files/guile-2.2.7-fix-buggy-gnulib.patch b/dev-scheme/guile/files/guile-2.2.7-fix-buggy-gnulib.patch
deleted file mode 100644
index 20f04c3b095c..000000000000
--- a/dev-scheme/guile/files/guile-2.2.7-fix-buggy-gnulib.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 76d84a62e84d4206d41ffed16b8baa5af2d1e62f Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Sun, 26 May 2024 13:02:54 -0400
-Subject: [PATCH 1/2] fix invalid bash code causing the wrong type of failure
-
-test $var = no
-
-fails if $var is only ever defined after this line. gnulib is brilliant
-software and naturally does exactly this, because it is highly logical
-to only define code after you try to use it.
-
-Probably. It's hard to tell because the actual code that gets run is:
-
-func_gl_gnulib_m4code_5264294aa0a5557541b53c8c741f7f31
-
-since the other sparkling aspect of gnulib's innovative brilliance is
-the realization that *of course* the most robust way to design software
-is to use checksums as *replacements* for function names.
-
-Or, "that time Eli got jiatanned by gnulib".
-
-The quoting was silently "fixed" upstream in:
-https://github.com/coreutils/gnulib/commit/db1ee11e2168af7137db53289a92e306d2277b0b
-
-It is the same "fix" we do here, thus restoring dash <--> bash
-compatibility and preventing:
-
-```
- * QA Notice: Abnormal configure code
- *
- * ./configure: 38012: test: =: unexpected operator
-```
-
-although it seems to me gnulib is just more generally broken.
----
- m4/timegm.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/m4/timegm.m4 b/m4/timegm.m4
-index 510e25a..34e5347 100644
---- a/m4/timegm.m4
-+++ b/m4/timegm.m4
-@@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_TIMEGM],
-   REPLACE_TIMEGM=0
-   AC_CHECK_FUNCS_ONCE([timegm])
-   if test $ac_cv_func_timegm = yes; then
--    if test $gl_cv_func_working_mktime = no; then
-+    if test "$gl_cv_func_working_mktime" = no; then
-       # Assume that timegm is buggy if mktime is.
-       REPLACE_TIMEGM=1
-     fi
--- 
-2.44.1
-
-
-From fa98775e2a0bc6e33de851a8bd399635b977d0e6 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Sun, 26 May 2024 13:07:25 -0400
-Subject: [PATCH 2/2] gnulib: backport fix for Modern C in round.m4
-
-https://github.com/coreutils/gnulib/commit/f12a7bbb4acaaa72f48e452e04da2a4dd749a664
-
-Fixes undefined exit() by switching it to merely return. That's the
-upstream fix, so use it although arguably one could simply #include the
-headers for functions that are used...
----
- m4/round.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/m4/round.m4 b/m4/round.m4
-index 45b7df4..d4ef7f2 100644
---- a/m4/round.m4
-+++ b/m4/round.m4
-@@ -57,7 +57,7 @@ int main()
-     * (double) (1U << ((DBL_MANT_DIG + 3) / 5))
-     * (double) (1U << ((DBL_MANT_DIG + 4) / 5));
-   volatile double x = 0.5 - 0.5 / TWO_MANT_DIG;
--  exit (x < 0.5 && round (x) != 0.0);
-+  return (x < 0.5 && round (x) != 0.0);
- }]])], [gl_cv_func_round_works=yes], [gl_cv_func_round_works=no],
-         [case "$host_os" in
-            netbsd* | aix*) gl_cv_func_round_works="guessing no";;
--- 
-2.44.1
-
diff --git a/dev-scheme/sigscheme/files/sigscheme-0.9.1-autoconf.patch b/dev-scheme/sigscheme/files/sigscheme-0.9.1-autoconf.patch
new file mode 100644
index 000000000000..ccdfd97e46bd
--- /dev/null
+++ b/dev-scheme/sigscheme/files/sigscheme-0.9.1-autoconf.patch
@@ -0,0 +1,31 @@
+From 1fd438ede105509488ae2f8a9f2d363097f4467d Mon Sep 17 00:00:00 2001
+From: "Z. Liu" <zhixu.liu@gmail.com>
+Date: Sat, 11 Jan 2025 10:09:31 +0800
+Subject: [PATCH] m4/ax_check_page_aligned_malloc: Make macros
+ `-Wstrict-prototypes` compatible
+
+elimate compiler's warning:
+
+  warning: a function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes]
+
+Signed-off-by: Z. Liu <zhixu.liu@gmail.com>
+---
+ m4/ax_check_page_aligned_malloc.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/m4/ax_check_page_aligned_malloc.m4 b/m4/ax_check_page_aligned_malloc.m4
+index 4bfa930..7aa7f74 100644
+--- a/m4/ax_check_page_aligned_malloc.m4
++++ b/m4/ax_check_page_aligned_malloc.m4
+@@ -35,7 +35,7 @@ AC_DEFUN([AX_CHECK_PAGE_ALIGNED_MALLOC],
+ # include <unistd.h>
+ #endif
+ 
+-int main()
++int main(void)
+ {
+   int pagesize = getpagesize();
+   int i;
+-- 
+2.45.2
+
diff --git a/dev-scheme/sigscheme/sigscheme-0.9.1-r1.ebuild b/dev-scheme/sigscheme/sigscheme-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..6ff941ef79e4
--- /dev/null
+++ b/dev-scheme/sigscheme/sigscheme-0.9.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="SigScheme is an R5RS Scheme interpreter for embedded use"
+HOMEPAGE="https://github.com/uim/sigscheme"
+SRC_URI="https://github.com/uim/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.1-autoconf.patch
+)
+
+src_prepare() {
+	default
+	eautoconf # bug 879679
+}
+
+src_configure() {
+	use elibc_musl && append-cflags -D_GNU_SOURCE # bug 906864
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-scheme/sigscheme/sigscheme-0.9.1.ebuild b/dev-scheme/sigscheme/sigscheme-0.9.1.ebuild
deleted file mode 100644
index 38fab32ca30a..000000000000
--- a/dev-scheme/sigscheme/sigscheme-0.9.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="SigScheme is an R5RS Scheme interpreter for embedded use"
-HOMEPAGE="https://github.com/uim/sigscheme"
-SRC_URI="https://github.com/uim/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-scheme/stklos/Manifest b/dev-scheme/stklos/Manifest
index 7e8cc2cc10c2..5bef36d79bdb 100644
--- a/dev-scheme/stklos/Manifest
+++ b/dev-scheme/stklos/Manifest
@@ -1,2 +1 @@
-DIST stklos-2.00.tar.gz 9661074 BLAKE2B c43918f182e8502d5ea4dd0a2d42ea4e788a573ca1184d4e3af792f3932b7a626280110c30bffa9771d73ed7fdc2a29db19bcd7ce8d5a219c1c0b9ef19195c6d SHA512 b98ad62713cb5e85d26378e73e2198d44676a0103c8e8444490cc555defc5b058652c514bdf3a27b0cc34c71b0b72d9f5fc440f260f6aa68064c5adda6571d5f
 DIST stklos-2.10.tar.gz 10280638 BLAKE2B d08b3ca4422e497a4adba1d810c97af6cfa262443214127eb0c82bedb21885bc1dcea5cf8f13387a1bfaf9182a9590d9557368ee2840d5c11d4b15f5e0ffe427 SHA512 41981794bd2a8a600a03b543e87c02d1072c8dd3449704d6bb55586cc45e50c4654d8dd3f2b9ac1efc89cee41da8d3667b895d641ff1817a8d14944b1dcd66cd
diff --git a/dev-scheme/stklos/files/stklos-2.00-gentoo.patch b/dev-scheme/stklos/files/stklos-2.00-gentoo.patch
deleted file mode 100644
index 83c33b8f0b2a..000000000000
--- a/dev-scheme/stklos/files/stklos-2.00-gentoo.patch
+++ /dev/null
@@ -1,153 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -143,28 +143,10 @@
-    htmldir="${docdir}/html"
- fi
- 
--# Manage standard options --libdir and --datadir
--# If the user doesn't specify these option, we fix
--#   libdir to ${prefix}/lib/
--#   datadir to ${prefix}/share
--# Otherwise, we take the user provided values.
--#
--# In any case, we will place our files in the stklos/${VERSION} subdir
--
--if test "$LIBDIR" == ""  ; then
--   # user has not given a "--libdir" option. Use ${prefix}/lib/stklos/${VERSION}
--   libdir="${prefix}/lib/${PACKAGE_TARNAME}/${VERSION}"
--fi
--
--if test "$DATADIR" == ""  ; then
--   # user has not given a "--datadir" option. Use ${prefix}/share/stklos/${VERSION}
--   datadir="${prefix}/share/${PACKAGE_TARNAME}/${VERSION}"
--fi
--
- ### Initialize the extra conf file in src
- PREFIX=$prefix
--SCMDIR=$datadir
--EXECDIR=$libdir
-+SCMDIR="${datadir}/${PACKAGE_TARNAME}/${VERSION}"
-+EXECDIR="${libdir}/${PACKAGE_TARNAME}/${VERSION}"
- 
- 
- ### Determine the kind of the machine which is running this script
---- a/lib/Lalr.d/Makefile.am
-+++ b/lib/Lalr.d/Makefile.am
-@@ -33,8 +33,8 @@
- all: lalr.ostk calc
- 
- install-sources: install
--	mkdir -p $(schemedir)
--	cp lalr.stk $(DESTDIR)/$(schemedir)
-+	mkdir -p $(DESTDIR)$(schemedir)
-+	cp lalr.stk $(DESTDIR)$(schemedir)
- 
- uninstall-hook:
- 	rm  -f $(DESTDIR)/$(schemedir)/lalr.stk
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -174,7 +174,7 @@
- 	@for i in $(SUBDIRS) ;do \
- 	   (cd $$i; $(MAKE) install-sources)\
- 	done
--	cp $(SRC_STK) $(scheme_BOOT) $(DESTDIR)/$(schemedir)
-+	cp $(SRC_STK) $(scheme_BOOT) $(DESTDIR)$(schemedir)
- 
- 
- # Explicit some dependencies here
---- a/lib/SILex.d/Makefile.am
-+++ b/lib/SILex.d/Makefile.am
-@@ -25,8 +25,8 @@
- SRC= silex.scm multilex.scm
- 
- install-sources:
--	mkdir -p  $(DESTDIR)/$(schemedir)
--	cp $(SRC) $(DESTDIR)/$(schemedir)
-+	mkdir -p  $(DESTDIR)$(schemedir)
-+	cp $(SRC) $(DESTDIR)$(schemedir)
- 
- 
- uninstall-hook:
---- a/lib/scheme/Makefile.am
-+++ b/lib/scheme/Makefile.am
-@@ -189,7 +189,7 @@
- 	@for i in $(SUBDIRS) ;do \
- 	   (cd $$i; $(MAKE) install-sources)\
- 	done
--	cp $(scheme_sources) $(schemedir)
-+	cp $(scheme_sources) $(DESTDIR)$(schemedir)
- 
- clean:
- 	(cd vector; $(MAKE) clean)
---- a/lib/scheme/vector/Makefile.am
-+++ b/lib/scheme/vector/Makefile.am
-@@ -130,8 +130,8 @@
- #======================================================================
- 
- install-sources:
--	mkdir -p $(srfidir)
--	cp $(srfi_sources) $(srfi_interm) $(srfidir)
-+	mkdir -p $(DESTDIR)$(srfidir)
-+	cp $(srfi_sources) $(srfi_interm) $(DESTDIR)$(srfidir)
- 
- # we also clean the TAG.stk files -- $(srfi-interm) --, which are NOT
- # srfi_OBJS (should not be installed with other objects):
---- a/lib/srfi/160/Makefile.am
-+++ b/lib/srfi/160/Makefile.am
-@@ -140,8 +140,8 @@
- #======================================================================
- 
- install-sources:
--	mkdir -p $(srfidir)
--	cp $(srfi_sources) $(srfidir)
-+	mkdir -p $(DESTDIR)$(srfidir)
-+	cp $(srfi_sources) $(DESTDIR)$(srfidir)
- 
- clean:
- 	rm -f $(srfi_OBJS) *-incl.c *~
---- a/lib/srfi/Makefile.am
-+++ b/lib/srfi/Makefile.am
-@@ -383,7 +383,7 @@
- 	@for i in $(SUBDIRS) ;do \
- 	   (cd $$i; $(MAKE) install-sources)\
- 	done
--	cp $(srfi_sources) $(srfidir)
-+	cp $(srfi_sources) $(DESTDIR)$(srfidir)
- 
- clean:
- 	rm -f $(srfi_OBJS) *-incl.c *~
---- a/lib/stklos/Makefile.am
-+++ b/lib/stklos/Makefile.am
-@@ -75,7 +75,7 @@
- 
- # ======================================================================
- install-sources:
--	cp $(scheme_sources) $(schemedir)
-+	cp $(scheme_sources) $(DESTDIR)$(schemedir)
- 
- clean:
- 	rm -f $(ALL_OBJS) *-incl.c  *~
---- a/lib/streams/Makefile.am
-+++ b/lib/streams/Makefile.am
-@@ -75,7 +75,7 @@
- 
- # ======================================================================
- install-sources:
--	install $(scheme_sources) $(schemedir)
-+	install $(scheme_sources) $(DESTDIR)$(schemedir)
- 
- clean:
- 	rm -f $(ALL_OBJS) *-incl.c  *~
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -110,8 +110,8 @@
- 
- 
- install-exec-hook:
--	mv $(bindir)/stklos $(bindir)/stklos-@VERSION@
--	ln -s stklos-@VERSION@ $(bindir)/stklos
-+	mv $(DESTDIR)$(bindir)/stklos $(DESTDIR)$(bindir)/stklos-@VERSION@
-+	ln -s stklos-@VERSION@ $(DESTDIR)$(bindir)/stklos
- 
- 
- doc:  $(DOCDB)
diff --git a/dev-scheme/stklos/files/stklos-2.00-ldflags.patch b/dev-scheme/stklos/files/stklos-2.00-ldflags.patch
deleted file mode 100644
index 9e695718e6b0..000000000000
--- a/dev-scheme/stklos/files/stklos-2.00-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -195,12 +195,6 @@
- lib/streams: lib
- lib/srfi: lib/scheme lib/stklos lib/streams
- 
--readline-complete.@SH_SUFFIX@: readline-complete.c
--	@CC@ @CFLAGS@ @STKCFLAGS@ @SH_COMP_FLAGS@ -I../src @GCINC@ \
--	-c -o $*.o $*.c
--	@SH_LOADER@ @SH_LOAD_FLAGS@ -o $*.@SH_SUFFIX@ $*.o @DLLIBS@ @RDLINE@
--	/bin/rm -f $*.o
--
- #
- # SRFIs support
- #
diff --git a/dev-scheme/stklos/files/stklos-2.00-threads.patch b/dev-scheme/stklos/files/stklos-2.00-threads.patch
deleted file mode 100644
index 0a32bc5de7d8..000000000000
--- a/dev-scheme/stklos/files/stklos-2.00-threads.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/stklos.h
-+++ b/src/stklos.h
-@@ -46,15 +46,15 @@
- #include <memory.h>
- #include <locale.h>
- #include <stdint.h>
--#ifndef THEADS_NONE
-+
-+#include "stklosconf.h"
-+#include "extraconf.h"
-+#ifndef THREADS_NONE
- #  include <pthread.h>
- #  define GC_THREADS 1
- #  define _REENTRANT 1
- #endif
- 
--#include "stklosconf.h"
--#include "extraconf.h"
--
- /* To debug the GC uncomment the following line */
- /* #define GC_DEBUG 1 */
- 
diff --git a/dev-scheme/stklos/stklos-2.00-r1.ebuild b/dev-scheme/stklos/stklos-2.00-r1.ebuild
deleted file mode 100644
index a7f5f7d4abfd..000000000000
--- a/dev-scheme/stklos/stklos-2.00-r1.ebuild
+++ /dev/null
@@ -1,62 +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="Fast and light Scheme implementation"
-HOMEPAGE="https://stklos.net/"
-SRC_URI="https://${PN}.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="threads"
-
-RDEPEND="dev-libs/boehm-gc[threads?]
-	dev-libs/gmp:=
-	dev-libs/libffi:=
-	dev-libs/libpcre2:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-ldflags.patch
-	"${FILESDIR}"/${P}-threads.patch
-)
-DOCS=( AUTHORS ChangeLog NEWS.md PACKAGES-USED {PORTING-NOTES,README}.md SUPPORTED-SRFIS )
-
-src_prepare() {
-	default
-
-	if ! use threads; then
-		sed -i '/threads.adoc/d' doc/refman/${PN}.adoc
-		rm -f tests/srfis/2{16,30}.stk
-	fi
-	eautoreconf
-	export LD="$(tc-getCC)"
-	export STKLOS_CONFDIR="${T}"/.config/${PN}
-}
-
-src_configure() {
-	econf \
-		--enable-threads=$(usex threads pthreads none) \
-		--without-provided-bignum \
-		--without-provided-ffi \
-		--without-provided-gc \
-		--without-provided-regexp
-}
-
-src_compile() {
-	emake
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	default
-	einstalldocs
-}
diff --git a/dev-scheme/stklos/stklos-2.10.ebuild b/dev-scheme/stklos/stklos-2.10.ebuild
index 17f5eaa272a9..2893bf029731 100644
--- a/dev-scheme/stklos/stklos-2.10.ebuild
+++ b/dev-scheme/stklos/stklos-2.10.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="https://${PN}.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="threads"
 
 RDEPEND="dev-libs/boehm-gc[threads?]
diff --git a/dev-tex/biber/biber-2.20.ebuild b/dev-tex/biber/biber-2.20.ebuild
index 9fb30d1ddef7..af17decabe5c 100644
--- a/dev-tex/biber/biber-2.20.ebuild
+++ b/dev-tex/biber/biber-2.20.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="https://github.com/plk/biber/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-tex/biblatex/biblatex-3.20.ebuild b/dev-tex/biblatex/biblatex-3.20.ebuild
index adbfc43b38a1..81fc6310f948 100644
--- a/dev-tex/biblatex/biblatex-3.20.ebuild
+++ b/dev-tex/biblatex/biblatex-3.20.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 @@ S="${WORKDIR}"
 
 LICENSE="LPPL-1.3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 IUSE="+biber doc examples"
 
diff --git a/dev-tex/latex2pydata/latex2pydata-0.4.1.ebuild b/dev-tex/latex2pydata/latex2pydata-0.4.1.ebuild
index fbd474731fc6..fea324277ab2 100644
--- a/dev-tex/latex2pydata/latex2pydata-0.4.1.ebuild
+++ b/dev-tex/latex2pydata/latex2pydata-0.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
@@ -22,7 +22,7 @@ S="${WORKDIR}/${PN}-python-v${PV}"
 
 LICENSE="LPPL-1.3c"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # fontsextra for fourier.sty
 # latexextra for upquote.sty
diff --git a/dev-tex/latexmk/latexmk-4.85.ebuild b/dev-tex/latexmk/latexmk-4.85.ebuild
index f3a6644f50d2..2fbb3fb8587f 100644
--- a/dev-tex/latexmk/latexmk-4.85.ebuild
+++ b/dev-tex/latexmk/latexmk-4.85.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 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/dev-tex/minted/minted-3.4.0.ebuild b/dev-tex/minted/minted-3.4.0.ebuild
index 1eee5a8d8056..5e4029588363 100644
--- a/dev-tex/minted/minted-3.4.0.ebuild
+++ b/dev-tex/minted/minted-3.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
@@ -21,7 +21,7 @@ S="${WORKDIR}"/${PN}-latex-v${PV}
 
 LICENSE="|| ( BSD LPPL-1.3 )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="doc"
 
diff --git a/dev-tex/pgf/pgf-3.1.10-r1.ebuild b/dev-tex/pgf/pgf-3.1.10-r1.ebuild
new file mode 100644
index 000000000000..701daca14a2c
--- /dev/null
+++ b/dev-tex/pgf/pgf-3.1.10-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit latex-package
+
+DESCRIPTION="The TeX Portable Graphic Format"
+HOMEPAGE="https://github.com/pgf-tikz/pgf"
+SRC_URI="
+	https://github.com/pgf-tikz/pgf/archive/${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( https://github.com/pgf-tikz/pgf/releases/download/${PV}/pgfmanual-${PV}.pdf -> ${P}-pgfmanual.pdf )
+"
+
+LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc source"
+
+RDEPEND="dev-texlive/texlive-latexrecommended"
+
+# ADJUST ON BUMPS: The date of the according release tag. See also
+# upstream's build.lua
+PGF_VERSION_DATE="2023-01-15"
+
+src_install() {
+	einstalldocs
+
+	insinto "${TEXMF}"
+	doins -r tex
+	insinto "${TEXMF}"/tex/generic/${PN}
+	newins - pgf.revision.tex <<EOF
+\\def\\pgfrevision{${PV}}
+\\def\\pgfversion{${PV}}
+\\def\\pgfrevisiondate{${PGF_VERSION_DATE}}
+\\def\\pgfversiondate{${PGF_VERSION_DATE}}
+EOF
+
+	if use source ; then
+		doins -r source
+	fi
+
+	if use doc; then
+		cd "${S}/doc/generic/pgf" || die
+		docinto texdoc
+		# pgfmanual is now split from the main tar archive
+		newdoc "${DISTDIR}/${P}-pgfmanual.pdf" pgfmanual.pdf
+		doins -r images
+
+		dosym "../../../doc/${PF}/texdoc" "${TEXMF}/doc/latex/${PN}"
+		docompress -x "/usr/share/doc/${P}/texdoc/"
+	fi
+}
diff --git a/dev-tex/pgf/pgf-3.1.10.ebuild b/dev-tex/pgf/pgf-3.1.10.ebuild
deleted file mode 100644
index de532bb1434d..000000000000
--- a/dev-tex/pgf/pgf-3.1.10.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit latex-package
-
-DESCRIPTION="The TeX Portable Graphic Format"
-HOMEPAGE="https://github.com/pgf-tikz/pgf"
-SRC_URI="
-	https://github.com/pgf-tikz/pgf/archive/${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( https://github.com/pgf-tikz/pgf/releases/download/${PV}/pgfmanual-${PV}.pdf -> ${P}-pgfmanual.pdf )
-"
-
-LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc source"
-
-RDEPEND="dev-texlive/texlive-latexrecommended"
-
-src_install() {
-	einstalldocs
-
-	insinto "${TEXMF}"
-	doins -r tex
-	insinto "${TEXMF}"/tex/generic/${PN}
-	# Here is one of the rare examples where you want to quote the label
-	# of the heredoc to prevent the backticks from being evaluated.
-	newins - pgf.revision.tex <<"EOF"
-\begingroup
-\catcode`\-=12
-\catcode`\/=12
-\catcode`\.=12
-\catcode`\:=12
-\catcode`\+=12
-\catcode`\-=12
-\gdef\pgfrevision{@PVR@}
-\gdef\pgfversion{@PVR@}
-\gdef\pgfversiondatetime{2024-02-09 00:00:00 +0000}
-\gdef\pgfrevisiondatetime{2024-02-09 00:00:00 +0000}
-\gdef\pgf@glob@TMPa#1-#2-#3 #4\relax{#1/#2/#3}
-\xdef\pgfversiondate{\expandafter\pgf@glob@TMPa\pgfversiondatetime\relax}
-\xdef\pgfrevisiondate{\expandafter\pgf@glob@TMPa\pgfrevisiondatetime\relax}
-\endgroup
-EOF
-	sed -i s/@PVR@/${PVR}/ "${ED}/${TEXMF}"/tex/generic/${PN}/pgf.revision.tex || die
-
-	if use source ; then
-		doins -r source
-	fi
-
-	if use doc; then
-		cd "${S}/doc/generic/pgf" || die
-		docinto texdoc
-		# pgfmanual is now split from the main tar archive
-		newdoc "${DISTDIR}/${P}-pgfmanual.pdf" pgfmanual.pdf
-		doins -r images
-
-		dosym "../../../doc/${PF}/texdoc" "${TEXMF}/doc/latex/${PN}"
-		docompress -x "/usr/share/doc/${P}/texdoc/"
-	fi
-}
diff --git a/dev-tex/rubber/Manifest b/dev-tex/rubber/Manifest
index be3a9c0f2f42..bbd62445d18f 100644
--- a/dev-tex/rubber/Manifest
+++ b/dev-tex/rubber/Manifest
@@ -1,3 +1,2 @@
-DIST rubber-1.6.5.tar.bz2 100300 BLAKE2B bbddf550fbce2f2f98ecf2e737515b4c6891e89494dc2c39cc4a0f268d76f505cad184f27c5f333bc706fe08adcce1d668e8e33c37e26fc6142b12b32797e402 SHA512 e0fadbca6d9e570e6414a99a72da22656abb0fc71e14dd0840bd3dd68364d0da0b2fd5c416f45eb8489bdcb10c226657799efae4ae0c73807b2485b8c8c2094b
 DIST rubber-1.6.6.tar.bz2 100502 BLAKE2B fa74c189b7265206495436b14f229588f7998e0c2f1b148eb8202805ddea54f6391ee15c6ca40957e242b1f065eb1159904fbafe0ddc4d8e6d64cdd26478d614 SHA512 0913a1c9ac012a8bd577e975aca92eae0965137fbc01b049b139f8f31bd85856503af7d760defc67f76894a74ca0616fcb887b1a9395be5a93ff0397ec6795ae
 DIST rubber-1.6.7.tar.bz2 100670 BLAKE2B 468af397d58bc0866fb3443098ae55fff8eff2be9ef9537d8b7d8ea4c45f9928083732778106850f90bcc52d8decafd11386d4c1c69583c3953094180ce4065c SHA512 82ff4457fbe98de15c09adce2dc6dc9693f1ce8bb8f5fa358e9e9f0268e98fb4aa05fe08bafb5a1fad1c400c1623af21e21376c42cec6a162dd05c7791819ef4
diff --git a/dev-tex/rubber/rubber-1.6.5-r1.ebuild b/dev-tex/rubber/rubber-1.6.5-r1.ebuild
deleted file mode 100644
index 0d6cb11369e9..000000000000
--- a/dev-tex/rubber/rubber-1.6.5-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=hatchling
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/latex-rubber/${PN}.git"
-else
-	# NOTE: Cannot be "PYPI_PN=latex-rubber" + "inherit pypi" due to missing files
-	SRC_URI="https://gitlab.com/latex-rubber/${PN}/-/archive/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~riscv ~x86"
-fi
-
-DESCRIPTION="A LaTeX wrapper for automatically building documents"
-HOMEPAGE="https://gitlab.com/latex-rubber/rubber"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/latex-base"
-
-# Test dependencies:
-# - app-text/texlive-core for rubber's 'cweave' test
-# - dev-lang/R for rubber's 'knitr' test (requires knitr R library, currently disabled)
-# - dev-texlive/texlive-latexextra for rubber's 'combine' test (currently disabled)
-BDEPEND="
-	${RDEPEND}
-	virtual/texi2dvi
-	test? (
-		app-text/ghostscript-gpl
-		app-text/texlive-core
-		dev-tex/biber
-		dev-tex/biblatex
-		dev-tex/glossaries
-		dev-tex/latex-beamer
-		$(python_gen_cond_dep 'dev-tex/pythontex[${PYTHON_USEDEP}]')
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-pstricks
-		media-gfx/asymptote
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.4-pythontex.patch
-)
-
-pkg_setup() {
-	# https://bugs.gentoo.org/727996
-	export VARTEXFONTS="${T}"/fonts
-}
-
-python_test() {
-	cd tests || die
-
-	# Disable the broken 'combine' test as it uses the 'combine' as a
-	# latex package when it is only a document class (probably only in
-	# newer versions of combine). Also note that this tests works
-	# under debian 'buster'. TODO: Look into potential modifications
-	# done by debian.
-	touch combine/disable || die
-
-	# This test does not work under Gentoo nor Debian 'buster'.
-	# TODO: Investigate why it does not work.
-	touch cweb-latex/disable || die
-
-	# TODO: Investigate why the following are failing.
-	touch fig2dev-dvi/disable || die
-	touch fig2dev-path/disable || die
-	touch fig2dev-path-inplace/disable || die
-	touch fig2dev-path-into/disable || die
-	touch graphicx-dotted-files/disable || die
-	touch hooks-input-file/disable || die
-	touch knitr/disable || die
-
-	# Even tough metapost is available, those tests fail on Gentoo
-	# (while they succeed on Debian 'buster').
-	# TODO: Determine why.
-	# ERROR:mpost:I can't read MetaPost's log file, this is wrong.
-	touch metapost/disable || die
-	# expected error message not reported by Rubber
-	touch metapost-error/disable || die
-	# ERROR:mpost:I can't read MetaPost's log file, this is wrong.
-	touch metapost-input/disable || die
-
-	./run.sh * || die "Tests failed with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Move misplaced files to correct location
-	doinfo doc/${PN}/${PN}.info
-	rm "${ED}"/usr/share/doc/${PN}/${PN}.{texi,info} || die
-	mv "${ED}"/usr/share/doc/{${PN}/*,${PF}/} || die
-	rmdir "${ED}"/usr/share/doc/${PN} || die
-}
diff --git a/dev-tex/rubber/rubber-1.6.7.ebuild b/dev-tex/rubber/rubber-1.6.7.ebuild
index da5c2eb0edec..b66e0595b837 100644
--- a/dev-tex/rubber/rubber-1.6.7.ebuild
+++ b/dev-tex/rubber/rubber-1.6.7.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 @@ if [[ ${PV} == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
 else
 	# NOTE: Cannot be "PYPI_PN=latex-rubber" + "inherit pypi" due to missing files
 	SRC_URI="https://gitlab.com/latex-rubber/${PN}/-/archive/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+	KEYWORDS="amd64 ~ppc ~riscv ~x86"
 fi
 
 DESCRIPTION="A LaTeX wrapper for automatically building documents"
diff --git a/dev-tex/tex4ht/tex4ht-20240311_p72882.ebuild b/dev-tex/tex4ht/tex4ht-20240311_p72882.ebuild
index 44a66130ccd2..8bae6fdb4323 100644
--- a/dev-tex/tex4ht/tex4ht-20240311_p72882.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20240311_p72882.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,7 +32,7 @@ S="${WORKDIR}"
 
 LICENSE="LPPL-1.2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc java source"
 
 COMMON_DEPEND="
diff --git a/dev-texlive/texlive-basic/texlive-basic-2024_p72890.ebuild b/dev-texlive/texlive-basic/texlive-basic-2024_p72890.ebuild
index 953ab95c9100..d6d5c1b97c75 100644
--- a/dev-texlive/texlive-basic/texlive-basic-2024_p72890.ebuild
+++ b/dev-texlive/texlive-basic/texlive-basic-2024_p72890.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
@@ -81,7 +81,7 @@ DESCRIPTION="TeXLive Essential programs and files"
 
 LICENSE="GPL-1+ GPL-2+ LPPL-1.3 LPPL-1.3c MIT OFL-1.1 TeX TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=app-text/texlive-core-2024[luajittex?]
 "
diff --git a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2024_p71940.ebuild b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2024_p71940.ebuild
index 4fc6e76f36c7..361bb3cf241a 100644
--- a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2024_p71940.ebuild
+++ b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2024_p71940.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
@@ -373,7 +373,7 @@ DESCRIPTION="TeXLive BibTeX additional styles"
 
 LICENSE="Artistic Artistic-2 BSD-4 CC-BY-SA-3.0 CC-BY-SA-4.0 GPL-1 GPL-1+ GPL-2 GPL-3+ LPPL-1.0 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT TeX TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-latex-2024
 "
diff --git a/dev-texlive/texlive-binextra/texlive-binextra-2024_p72338.ebuild b/dev-texlive/texlive-binextra/texlive-binextra-2024_p72338.ebuild
index b90d0fada0e4..24cc821ea10f 100644
--- a/dev-texlive/texlive-binextra/texlive-binextra-2024_p72338.ebuild
+++ b/dev-texlive/texlive-binextra/texlive-binextra-2024_p72338.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
@@ -207,7 +207,7 @@ DESCRIPTION="TeXLive TeX auxiliary programs"
 
 LICENSE="Apache-2.0 Artistic BSD BSD-2 FDL-1.1+ GPL-1+ GPL-2 GPL-3 GPL-3+ LPPL-1.0 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT TeX TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-context/texlive-context-2024_p72727.ebuild b/dev-texlive/texlive-context/texlive-context-2024_p72727.ebuild
index 0303f93752a2..054c277ca05f 100644
--- a/dev-texlive/texlive-context/texlive-context-2024_p72727.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2024_p72727.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
@@ -62,7 +62,7 @@ DESCRIPTION="TeXLive ConTeXt and packages"
 
 LICENSE="BSD BSD-2 GPL-1+ GPL-2 GPL-3 MIT TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2024_p72727.ebuild b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2024_p72727.ebuild
index 2226cff691aa..81ff34114c6b 100644
--- a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2024_p72727.ebuild
+++ b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2024_p72727.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
@@ -821,7 +821,7 @@ DESCRIPTION="TeXLive Additional fonts"
 
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-1.0 CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 FDL-1.1+ GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ LPPL-1.0 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT OFL-1.1 TeX TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2024_p54074.ebuild b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2024_p54074.ebuild
index 1e8f1ade0380..bc18b163e9c9 100644
--- a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2024_p54074.ebuild
+++ b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2024_p54074.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
@@ -78,7 +78,7 @@ DESCRIPTION="TeXLive Recommended fonts"
 
 LICENSE="BSD GPL-1+ GPL-2 LPPL-1.3 LPPL-1.3c OFL-1.1 TeX TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-fontutils/texlive-fontutils-2024_p61207.ebuild b/dev-texlive/texlive-fontutils/texlive-fontutils-2024_p61207.ebuild
index 8a1c193175d7..1908512da353 100644
--- a/dev-texlive/texlive-fontutils/texlive-fontutils-2024_p61207.ebuild
+++ b/dev-texlive/texlive-fontutils/texlive-fontutils-2024_p61207.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
@@ -42,7 +42,7 @@ DESCRIPTION="TeXLive Graphics and font utilities"
 
 LICENSE="Artistic BSD GPL-1+ GPL-2 LPPL-1.3c TeX TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2024_p72250.ebuild b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2024_p72250.ebuild
index 40c9be47a547..90e5816948dc 100644
--- a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2024_p72250.ebuild
+++ b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2024_p72250.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
@@ -55,7 +55,7 @@ DESCRIPTION="TeXLive Additional formats"
 
 LICENSE="GPL-1+ GPL-2+ GPL-3 LPPL-1.3c MIT TeX TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 	>=dev-texlive/texlive-latex-2024
diff --git a/dev-texlive/texlive-games/texlive-games-2024_p71129.ebuild b/dev-texlive/texlive-games/texlive-games-2024_p71129.ebuild
index a079cb905165..fe58b95be397 100644
--- a/dev-texlive/texlive-games/texlive-games-2024_p71129.ebuild
+++ b/dev-texlive/texlive-games/texlive-games-2024_p71129.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
@@ -153,7 +153,7 @@ DESCRIPTION="TeXLive Games typesetting"
 
 LICENSE="Apache-2.0 CC-BY-1.0 CC-BY-4.0 CC-BY-SA-4.0 GPL-1+ LGPL-2.1 LGPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-latex-2024
 "
diff --git a/dev-texlive/texlive-humanities/texlive-humanities-2024_p72692.ebuild b/dev-texlive/texlive-humanities/texlive-humanities-2024_p72692.ebuild
index 22627bc1713e..dff56c8b6cb4 100644
--- a/dev-texlive/texlive-humanities/texlive-humanities-2024_p72692.ebuild
+++ b/dev-texlive/texlive-humanities/texlive-humanities-2024_p72692.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
@@ -159,7 +159,7 @@ DESCRIPTION="TeXLive Humanities packages"
 
 LICENSE="GPL-1+ GPL-2 LPPL-1.0 LPPL-1.2 LPPL-1.3 LPPL-1.3c"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-latex-2024
 	doc? ( app-text/sword )
diff --git a/dev-texlive/texlive-langarabic/texlive-langarabic-2024_p69111.ebuild b/dev-texlive/texlive-langarabic/texlive-langarabic-2024_p69111.ebuild
index d671f1e8ec90..f05031a8dfb4 100644
--- a/dev-texlive/texlive-langarabic/texlive-langarabic-2024_p69111.ebuild
+++ b/dev-texlive/texlive-langarabic/texlive-langarabic-2024_p69111.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
@@ -82,7 +82,7 @@ DESCRIPTION="TeXLive Arabic"
 
 LICENSE="CC-BY-SA-4.0 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c MIT OFL-1.1 public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-langchinese/texlive-langchinese-2024_p72136.ebuild b/dev-texlive/texlive-langchinese/texlive-langchinese-2024_p72136.ebuild
index 342d03698853..16fe184e87d3 100644
--- a/dev-texlive/texlive-langchinese/texlive-langchinese-2024_p72136.ebuild
+++ b/dev-texlive/texlive-langchinese/texlive-langchinese-2024_p72136.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
@@ -84,7 +84,7 @@ DESCRIPTION="TeXLive Chinese"
 
 LICENSE="FDL-1.1+ GPL-1+ GPL-3+ LGPL-2+ LPPL-1.3 LPPL-1.3c MIT TeX TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-langcjk-2024
 "
diff --git a/dev-texlive/texlive-langcjk/texlive-langcjk-2024_p65824.ebuild b/dev-texlive/texlive-langcjk/texlive-langcjk-2024_p65824.ebuild
index f4bed586ff0c..d8cbfcb043ba 100644
--- a/dev-texlive/texlive-langcjk/texlive-langcjk-2024_p65824.ebuild
+++ b/dev-texlive/texlive-langcjk/texlive-langcjk-2024_p65824.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
@@ -56,7 +56,7 @@ DESCRIPTION="TeXLive Chinese/Japanese/Korean (base)"
 
 LICENSE="BSD GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c MIT TeX"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=app-text/texlive-core-2024[cjk]
 	>=dev-texlive/texlive-basic-2024
diff --git a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2024_p69727.ebuild b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2024_p69727.ebuild
index 55be46857d0e..eb30e41c68aa 100644
--- a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2024_p69727.ebuild
+++ b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2024_p69727.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
@@ -107,7 +107,7 @@ DESCRIPTION="TeXLive Cyrillic"
 
 LICENSE="GPL-1+ GPL-2 LPPL-1.3 LPPL-1.3c MIT TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 	>=dev-texlive/texlive-latex-2024
diff --git a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2024_p54074.ebuild b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2024_p54074.ebuild
index 02761e6e36d4..d2feeebb80c3 100644
--- a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2024_p54074.ebuild
+++ b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2024_p54074.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
@@ -37,7 +37,7 @@ DESCRIPTION="TeXLive Czech/Slovak"
 
 LICENSE="GPL-1+ LPPL-1.3 LPPL-1.3c TeX-other-free"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 	>=dev-texlive/texlive-latex-2024
diff --git a/dev-texlive/texlive-langenglish/texlive-langenglish-2024_p71835.ebuild b/dev-texlive/texlive-langenglish/texlive-langenglish-2024_p71835.ebuild
index 421056d0a55b..5d7174f9b43b 100644
--- a/dev-texlive/texlive-langenglish/texlive-langenglish-2024_p71835.ebuild
+++ b/dev-texlive/texlive-langenglish/texlive-langenglish-2024_p71835.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
@@ -95,7 +95,7 @@ DESCRIPTION="TeXLive US and UK English"
 
 LICENSE="CC-BY-3.0 CC-BY-SA-4.0 FDL-1.1+ GPL-1+ GPL-2 GPL-2+ LPPL-1.2 LPPL-1.3 LPPL-1.3c OPL TeX TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2024_p66432.ebuild b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2024_p66432.ebuild
index 27bac87f5052..68aa4502b8c4 100644
--- a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2024_p66432.ebuild
+++ b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2024_p66432.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
@@ -157,7 +157,7 @@ DESCRIPTION="TeXLive Other European languages"
 
 LICENSE="CC-BY-SA-4.0 GPL-1+ GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-langfrench/texlive-langfrench-2024_p72499.ebuild b/dev-texlive/texlive-langfrench/texlive-langfrench-2024_p72499.ebuild
index fcd8d77fda1d..b08f3229d29f 100644
--- a/dev-texlive/texlive-langfrench/texlive-langfrench-2024_p72499.ebuild
+++ b/dev-texlive/texlive-langfrench/texlive-langfrench-2024_p72499.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
@@ -108,7 +108,7 @@ DESCRIPTION="TeXLive French"
 
 LICENSE="CC-BY-4.0 CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 FDL-1.1+ GPL-1+ LPPL-1.0 LPPL-1.2 LPPL-1.3 LPPL-1.3c TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-langgerman/texlive-langgerman-2024_p68711.ebuild b/dev-texlive/texlive-langgerman/texlive-langgerman-2024_p68711.ebuild
index bb78637782f7..496561e05759 100644
--- a/dev-texlive/texlive-langgerman/texlive-langgerman-2024_p68711.ebuild
+++ b/dev-texlive/texlive-langgerman/texlive-langgerman-2024_p68711.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
@@ -90,7 +90,7 @@ DESCRIPTION="TeXLive German"
 
 LICENSE="FDL-1.1+ GPL-1+ LPPL-1.0 LPPL-1.3 LPPL-1.3c MIT OPL TeX-other-free"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-langgreek/texlive-langgreek-2024_p65038.ebuild b/dev-texlive/texlive-langgreek/texlive-langgreek-2024_p65038.ebuild
index 9696c6b86215..cbc998f4d8db 100644
--- a/dev-texlive/texlive-langgreek/texlive-langgreek-2024_p65038.ebuild
+++ b/dev-texlive/texlive-langgreek/texlive-langgreek-2024_p65038.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
@@ -74,7 +74,7 @@ DESCRIPTION="TeXLive Greek"
 
 LICENSE="BSD-2 GPL-1+ GPL-2 LGPL-3 LPPL-1.3 LPPL-1.3c TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-langitalian/texlive-langitalian-2024_p55129.ebuild b/dev-texlive/texlive-langitalian/texlive-langitalian-2024_p55129.ebuild
index 3ec22c1eae7a..4824c8d6c597 100644
--- a/dev-texlive/texlive-langitalian/texlive-langitalian-2024_p55129.ebuild
+++ b/dev-texlive/texlive-langitalian/texlive-langitalian-2024_p55129.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
@@ -51,7 +51,7 @@ DESCRIPTION="TeXLive Italian"
 
 LICENSE="FDL-1.1+ GPL-1+ LGPL-2+ LPPL-1.3 LPPL-1.3c TeX-other-free"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2024_p72817.ebuild b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2024_p72817.ebuild
index b3708fe166f6..00a6e13b35b8 100644
--- a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2024_p72817.ebuild
+++ b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2024_p72817.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
@@ -153,7 +153,7 @@ DESCRIPTION="TeXLive Japanese"
 
 LICENSE="BSD BSD-2 GPL-1+ GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c MIT OFL-1.1 TeX TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-langcjk-2024
 "
diff --git a/dev-texlive/texlive-langkorean/texlive-langkorean-2024_p54074.ebuild b/dev-texlive/texlive-langkorean/texlive-langkorean-2024_p54074.ebuild
index d2b4f6a86e92..262b41fee637 100644
--- a/dev-texlive/texlive-langkorean/texlive-langkorean-2024_p54074.ebuild
+++ b/dev-texlive/texlive-langkorean/texlive-langkorean-2024_p54074.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
@@ -38,7 +38,7 @@ DESCRIPTION="TeXLive Korean"
 
 LICENSE="FDL-1.1+ GPL-1+ GPL-2 LPPL-1.3 LPPL-1.3c OFL-1.1 TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-langcjk-2024
 "
diff --git a/dev-texlive/texlive-langother/texlive-langother-2024_p68719.ebuild b/dev-texlive/texlive-langother/texlive-langother-2024_p68719.ebuild
index 42dda2584a79..5f32b646763c 100644
--- a/dev-texlive/texlive-langother/texlive-langother-2024_p68719.ebuild
+++ b/dev-texlive/texlive-langother/texlive-langother-2024_p68719.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
@@ -149,7 +149,7 @@ DESCRIPTION="TeXLive Other languages"
 
 LICENSE="CC-BY-SA-4.0 FDL-1.1+ GPL-1+ GPL-2 GPL-2+ GPL-3+ LPPL-1.3 LPPL-1.3c OFL-1.1 TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-langpolish/texlive-langpolish-2024_p54074.ebuild b/dev-texlive/texlive-langpolish/texlive-langpolish-2024_p54074.ebuild
index e80059099bef..8dc7a84fd1e0 100644
--- a/dev-texlive/texlive-langpolish/texlive-langpolish-2024_p54074.ebuild
+++ b/dev-texlive/texlive-langpolish/texlive-langpolish-2024_p54074.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
@@ -50,7 +50,7 @@ DESCRIPTION="TeXLive Polish"
 
 LICENSE="FDL-1.1+ GPL-2+ LPPL-1.2 LPPL-1.3 LPPL-1.3c TeX public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 	>=dev-texlive/texlive-latex-2024
diff --git a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2024_p67125.ebuild b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2024_p67125.ebuild
index f1692f0e2b59..c2681f741d57 100644
--- a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2024_p67125.ebuild
+++ b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2024_p67125.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
@@ -38,7 +38,7 @@ DESCRIPTION="TeXLive Portuguese"
 
 LICENSE="GPL-1+ GPL-2+ LPPL-1.3 LPPL-1.3c MIT public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-langspanish/texlive-langspanish-2024_p72203.ebuild b/dev-texlive/texlive-langspanish/texlive-langspanish-2024_p72203.ebuild
index ab25ee953284..9025ea30a8f0 100644
--- a/dev-texlive/texlive-langspanish/texlive-langspanish-2024_p72203.ebuild
+++ b/dev-texlive/texlive-langspanish/texlive-langspanish-2024_p72203.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
@@ -41,7 +41,7 @@ DESCRIPTION="TeXLive Spanish"
 
 LICENSE="CC-BY-4.0 LPPL-1.3 LPPL-1.3c MIT TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-latex/texlive-latex-2024_p71912.ebuild b/dev-texlive/texlive-latex/texlive-latex-2024_p71912.ebuild
index 55f3d704d33b..c76a9eae8e04 100644
--- a/dev-texlive/texlive-latex/texlive-latex-2024_p71912.ebuild
+++ b/dev-texlive/texlive-latex/texlive-latex-2024_p71912.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
@@ -183,7 +183,7 @@ DESCRIPTION="TeXLive LaTeX fundamental packages"
 
 LICENSE="GPL-2 LPPL-1.0 LPPL-1.3 LPPL-1.3c public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2024_p72895.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2024_p72895.ebuild
index e16dd3df1fe7..9aa7fb3bc3b1 100644
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2024_p72895.ebuild
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2024_p72895.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
@@ -4079,7 +4079,7 @@ DESCRIPTION="TeXLive LaTeX additional packages"
 
 LICENSE="Apache-2.0 Artistic BSD BSD-2 CC-BY-2.0 CC-BY-4.0 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 FDL-1.1+ GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ LGPL-2+ LGPL-3 LPPL-1.0 LPPL-1.2 LPPL-1.3 LPPL-1.3a LPPL-1.3c MIT OFL-1.1 TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-latexrecommended-2024
 	>=dev-texlive/texlive-pictures-2024
diff --git a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2024_p71527.ebuild b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2024_p71527.ebuild
index 3717cc7a714b..ed91272850f5 100644
--- a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2024_p71527.ebuild
+++ b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2024_p71527.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
@@ -204,7 +204,7 @@ DESCRIPTION="TeXLive LaTeX recommended packages"
 
 LICENSE="CC0-1.0 GPL-1+ LPPL-1.2 LPPL-1.3 LPPL-1.3a LPPL-1.3c MIT TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-latex-2024
 "
diff --git a/dev-texlive/texlive-luatex/texlive-luatex-2024_p72049.ebuild b/dev-texlive/texlive-luatex/texlive-luatex-2024_p72049.ebuild
index 006dcb20c0b8..e304d7c7206c 100644
--- a/dev-texlive/texlive-luatex/texlive-luatex-2024_p72049.ebuild
+++ b/dev-texlive/texlive-luatex/texlive-luatex-2024_p72049.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
@@ -260,7 +260,7 @@ DESCRIPTION="TeXLive LuaTeX packages"
 
 LICENSE="BSD CC-BY-SA-3.0 CC-BY-SA-4.0 EUPL-1.2 FDL-1.1+ GPL-2 GPL-3 GPL-3+ LPPL-1.3 LPPL-1.3c MIT OFL-1.1 TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-mathscience/texlive-mathscience-2024_p72655.ebuild b/dev-texlive/texlive-mathscience/texlive-mathscience-2024_p72655.ebuild
index 91038fd3ebb6..38e075eb5c7a 100644
--- a/dev-texlive/texlive-mathscience/texlive-mathscience-2024_p72655.ebuild
+++ b/dev-texlive/texlive-mathscience/texlive-mathscience-2024_p72655.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
@@ -701,7 +701,7 @@ DESCRIPTION="TeXLive Mathematics, natural sciences, computer science packages"
 
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-3.0 CC-BY-SA-4.0 GPL-1+ GPL-2 GPL-3 GPL-3+ ISC LGPL-2+ LGPL-2.1 LPPL-1.0 LPPL-1.2 LPPL-1.3 LPPL-1.3a LPPL-1.3c MIT TeX TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-fontsrecommended-2024
 	>=dev-texlive/texlive-latex-2024
diff --git a/dev-texlive/texlive-metapost/texlive-metapost-2024_p72550.ebuild b/dev-texlive/texlive-metapost/texlive-metapost-2024_p72550.ebuild
index b10ddbfc213a..25c85f2c6f4b 100644
--- a/dev-texlive/texlive-metapost/texlive-metapost-2024_p72550.ebuild
+++ b/dev-texlive/texlive-metapost/texlive-metapost-2024_p72550.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
@@ -128,7 +128,7 @@ DESCRIPTION="TeXLive MetaPost and Metafont packages"
 
 LICENSE="CC-BY-SA-4.0 EUPL-1.2 GPL-1+ GPL-2+ GPL-3+ LGPL-2+ LPPL-1.3 LPPL-1.3c MIT TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-music/texlive-music-2024_p69613.ebuild b/dev-texlive/texlive-music/texlive-music-2024_p69613.ebuild
index f357bf4c2aad..fd15911711b5 100644
--- a/dev-texlive/texlive-music/texlive-music-2024_p69613.ebuild
+++ b/dev-texlive/texlive-music/texlive-music-2024_p69613.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
@@ -90,7 +90,7 @@ DESCRIPTION="TeXLive Music packages"
 
 LICENSE="BSD CC-BY-SA-4.0 FDL-1.1+ GPL-1+ GPL-2 GPL-2+ GPL-3 LGPL-2.1 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-latex-2024
 "
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2024_p72555.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2024_p72555.ebuild
index 3070470e4eb3..2405b03e6959 100644
--- a/dev-texlive/texlive-pictures/texlive-pictures-2024_p72555.ebuild
+++ b/dev-texlive/texlive-pictures/texlive-pictures-2024_p72555.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
@@ -613,7 +613,7 @@ DESCRIPTION="TeXLive Graphics, pictures, diagrams"
 
 LICENSE="Apache-2.0 BSD-2 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-1.0 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 FDL-1.1+ GPL-1+ GPL-2 GPL-3 GPL-3+ ISC LPPL-1.0 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2024_p72878.ebuild b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2024_p72878.ebuild
index 8508ef2e4f75..9ff58b7c9395 100644
--- a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2024_p72878.ebuild
+++ b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2024_p72878.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
@@ -255,7 +255,7 @@ DESCRIPTION="TeXLive Plain (La)TeX packages"
 
 LICENSE="CC0-1.0 FDL-1.1+ GPL-1+ GPL-2 GPL-3 GPL-3+ LPPL-1.0 LPPL-1.3 LPPL-1.3c MIT TeX TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 "
diff --git a/dev-texlive/texlive-pstricks/texlive-pstricks-2024_p65367.ebuild b/dev-texlive/texlive-pstricks/texlive-pstricks-2024_p65367.ebuild
index ef9f9afa4dc0..219cf64a0925 100644
--- a/dev-texlive/texlive-pstricks/texlive-pstricks-2024_p65367.ebuild
+++ b/dev-texlive/texlive-pstricks/texlive-pstricks-2024_p65367.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
@@ -269,7 +269,7 @@ DESCRIPTION="TeXLive PSTricks"
 
 LICENSE="GPL-1+ GPL-2 LGPL-2+ LGPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2024
 	>=dev-texlive/texlive-plaingeneric-2024
diff --git a/dev-texlive/texlive-publishers/texlive-publishers-2024_p72771.ebuild b/dev-texlive/texlive-publishers/texlive-publishers-2024_p72771.ebuild
index 115c09c6e71e..969426e0ecaa 100644
--- a/dev-texlive/texlive-publishers/texlive-publishers-2024_p72771.ebuild
+++ b/dev-texlive/texlive-publishers/texlive-publishers-2024_p72771.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
@@ -767,7 +767,7 @@ DESCRIPTION="TeXLive Publisher styles, theses, etc."
 
 LICENSE="Apache-2.0 BSD CC-BY-4.0 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 FDL-1.1+ GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ LPPL-1.2 LPPL-1.3 LPPL-1.3a LPPL-1.3c MIT OFL-1.1 TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-latex-2024
 "
diff --git a/dev-texlive/texlive-xetex/texlive-xetex-2024_p71515.ebuild b/dev-texlive/texlive-xetex/texlive-xetex-2024_p71515.ebuild
index 33b927e4ba80..69eb2c608481 100644
--- a/dev-texlive/texlive-xetex/texlive-xetex-2024_p71515.ebuild
+++ b/dev-texlive/texlive-xetex/texlive-xetex-2024_p71515.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
@@ -103,7 +103,7 @@ DESCRIPTION="TeXLive XeTeX and packages"
 
 LICENSE="Apache-2.0 CC-BY-4.0 CC-BY-SA-4.0 GPL-1+ GPL-3 LGPL-2+ LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 COMMON_DEPEND="
 	>=app-text/texlive-core-2024[xetex]
 	>=dev-texlive/texlive-basic-2024
diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest
index fb95e0c702e7..a0bbe00c22e7 100644
--- a/dev-util/Tensile/Manifest
+++ b/dev-util/Tensile/Manifest
@@ -3,3 +3,4 @@ DIST rocm-Tensile-5.1.3.tar.gz 14357517 BLAKE2B 7c5881cc2b1d25db39f54a99f9f0a083
 DIST rocm-Tensile-5.4.2.tar.gz 14413805 BLAKE2B ca1c13785164439f6fe83f16b36b7a0b06a63b70b9f0741d77b0fff98f38d1e1c7e9a54ef61897e6eb0a4eaf52ec9e5f14f42a7e6fd657f26306afa3de0c74a2 SHA512 d99736a202c7353979e732941199b4b20e53ff2b6c19a7175609440a840aa5624bc53a8013c435f31ac37933527771521ff02137c1c8fd53c5317eca8533be80
 DIST rocm-Tensile-5.7.1.tar.gz 12396002 BLAKE2B ec2c2bc3f07fe22abd800b642c998ea80b9e4e2d0d28c4763d574dbd2fcb14c735223ddc7571d4ab3a48f0bd819cc835c16df9882049c5bf56f25ef729e6d654 SHA512 8f356f36cfec74ee9b000d1180cf52077dc5c595e5c5a40792fc3eb13f3139980c7440f9bc912218f946cf8137e2481d23fe39f110511c1bb55fe85a933ffd36
 DIST rocm-Tensile-6.1.1.tar.gz 12675289 BLAKE2B dfe3698d7dda14d5b20a6fe1ef6535ac9737ac330b71678a3a94e939adc2350e2dcf33e58c711ee90dae543efba59fe210bfa39fc69b63910ec4537db3f209bf SHA512 cf8b014b1ff7cd5d45236b8a9a6f5604b02e34a9245a163c672847b535d565151bf7e3a5127601681e80e6fe26964a0e544594044efe2fe68e39b0f1128f96e2
+DIST rocm-Tensile-6.3.0.tar.gz 12724004 BLAKE2B 83887efe8ab4102b9d33bae1f97a245d40bcc186635760de509079218628fd4d57072c6c2c1726fec6d8603d40e760e37fa1a443eead290d121cac099ae779ff SHA512 4c80a269236690545d8bc9090b799c5b4095ed9152a1e19ff8b2e5decd588545641ccdf3c6c469b12f4de29b3f4c2821a6e4714460771250b05339ac32f57c13
diff --git a/dev-util/Tensile/Tensile-6.1.1-r1.ebuild b/dev-util/Tensile/Tensile-6.1.1-r1.ebuild
index 896eeb8bfb5d..eba19ada31cc 100644
--- a/dev-util/Tensile/Tensile-6.1.1-r1.ebuild
+++ b/dev-util/Tensile/Tensile-6.1.1-r1.ebuild
@@ -29,8 +29,8 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/msgpack[${PYTHON_USEDEP}]
 	dev-python/joblib[${PYTHON_USEDEP}]
-	=dev-util/hip-6*
-	>=dev-util/rocm-smi-4.3.0
+	dev-util/hip:${SLOT}
+	dev-util/rocm-smi:${SLOT}
 	$(llvm_gen_dep '
 		llvm-core/clang:${LLVM_SLOT}
 	')
diff --git a/dev-util/Tensile/Tensile-6.3.0.ebuild b/dev-util/Tensile/Tensile-6.3.0.ebuild
new file mode 100644
index 000000000000..3e03e4831a55
--- /dev/null
+++ b/dev-util/Tensile/Tensile-6.3.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_USE_PEP517=setuptools
+ROCM_VERSION=${PV}
+LLVM_COMPAT=( 19 )
+
+inherit cmake distutils-r1 llvm-r1 prefix rocm
+
+DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions"
+HOMEPAGE="https://github.com/ROCm/Tensile"
+SRC_URI="https://github.com/ROCm/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="client test"
+REQUIRED_USE="client? ( ${ROCM_REQUIRED_USE} )"
+
+# tests can freeze machine depending on gpu/kernel
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	client? ( dev-libs/boost )
+	>=dev-cpp/msgpack-cxx-6.0.0
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/joblib[${PYTHON_USEDEP}]
+	dev-util/hip:${SLOT}
+	dev-util/rocm-smi:${SLOT}
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-python/joblib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.2-fix-arch-parse.patch
+	"${FILESDIR}"/${PN}-6.3.0-use-ninja.patch
+	"${FILESDIR}"/${PN}-6.1.1-fix-msgpack-dependency.patch
+	"${FILESDIR}"/${PN}-6.0.2-expand-isa-compatibility.patch
+)
+
+CMAKE_USE_DIR="${S}/${PN}/Source"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix),g" \
+		"${FILESDIR}"/${PN}-5.7.1-gentoopath.patch > "${S}"/gentoopath.patch || die
+	eapply $(prefixify_ro "${S}"/gentoopath.patch)
+
+	pushd ${PN} || die
+
+	sed -e "/ROCM_SMI_ROOT/s,lib,$(get_libdir)," \
+		-i Source/cmake/FindROCmSMI.cmake || die
+	sed -r -e "/TENSILE_USE_LLVM/s/ON/OFF/" \
+		-i Source/CMakeLists.txt || die
+
+	# ${Tensile_ROOT}/bin does not exists; call command directly
+	sed -e "s,\${Tensile_ROOT}/bin/,,g" -i cmake/TensileConfig.cmake || die
+
+	local Tensile_share_dir="\"${EPREFIX}/usr/share/${PN}\""
+	sed -e "/HipClangVersion/s/0.0.0/$(hipconfig -v)/" -i Common.py || die
+
+	sed -e "s,os.path.dirname(os.path.realpath(__file__)),${Tensile_share_dir},g" \
+		-i ReplacementKernels.py Common.py ${PN}.py || die
+
+	sed -e "s|os\.path\.dirname.*$|\"${EPREFIX}/usr/share/Tensile/Source\", end='')|" -i __init__.py || die
+
+	popd || die
+
+	sed -e "/package_data/d" -e "/data_files/d" -i setup.py || die
+	use client && PATCHES= cmake_src_prepare  # do not apply patches again in cmake_src_prepare
+}
+
+src_configure() {
+	rocm_use_hipcc
+
+	distutils-r1_src_configure
+	if use client; then
+		local mycmakeargs=(
+			-DCMAKE_SKIP_RPATH=ON
+			-DTENSILE_USE_MSGPACK=ON
+			-DTENSILE_USE_LLVM=ON
+			-DTensile_LIBRARY_FORMAT=msgpack
+			-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		)
+		cmake_src_configure
+	fi
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	use client && cmake_src_compile
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_moduleinto Tensile
+	pushd Tensile || die
+	python_domodule Components
+	python_domodule Utilities
+	python_domodule TensileCreateLib
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	pushd ${PN} || die
+	insinto /usr/share/${PN}
+	doins -r Configs Perf Source CustomKernels
+	insinto /usr/$(get_libdir)/cmake/${PN}
+	doins cmake/*.cmake
+
+	if use client; then
+		pushd "${BUILD_DIR}" || die
+		dobin client/tensile_client
+	fi
+}
+
+# Test suite fails to start without this
+python_test() {
+	export ROCM_PATH="${EPREFIX}/usr"
+	epytest
+}
diff --git a/dev-util/Tensile/files/Tensile-6.3.0-use-ninja.patch b/dev-util/Tensile/files/Tensile-6.3.0-use-ninja.patch
new file mode 100644
index 000000000000..ab36761e0e24
--- /dev/null
+++ b/dev-util/Tensile/files/Tensile-6.3.0-use-ninja.patch
@@ -0,0 +1,20 @@
+--- a/Tensile/ClientExecutable.py
++++ b/Tensile/ClientExecutable.py
+@@ -42,7 +42,7 @@ class CMakeEnvironment:
+     def generate(self):
+ 
+         args = ['cmake']
+-        args += ['-G', 'Ninja'] if (os.name == 'nt') else []
++        args += ['-G', 'Ninja']
+         args += itertools.chain.from_iterable([ ['-D{}={}'.format(key, value)] for key,value in self.options.items()])
+         args += [self.sourceDir]
+         args = [cmake_path(arg) for arg in args]
+@@ -59,7 +59,7 @@ class CMakeEnvironment:
+             
+ 
+     def build(self):
+-        args = [('ninja' if (os.name == "nt") else 'make'), f'-j{CPUThreadCount()}']
++        args = ['ninja', f'-j{CPUThreadCount()}']
+         Common.tPrint(3, ' '.join(args))
+         with Common.ClientExecutionLock():
+             # change to use  check_output to force windows cmd block util command finish
diff --git a/dev-util/Tensile/metadata.xml b/dev-util/Tensile/metadata.xml
index 32364cb13b06..a033b1b3e185 100644
--- a/dev-util/Tensile/metadata.xml
+++ b/dev-util/Tensile/metadata.xml
@@ -6,7 +6,7 @@
     <name>Science Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/Tensile</remote-id>
+    <remote-id type="github">ROCm/Tensile</remote-id>
   </upstream>
   <use>
     <flag name="client">Build and install tensile_client executable to run benchmarks and tune GPU GEMM</flag>
diff --git a/dev-util/abi-dumper/Manifest b/dev-util/abi-dumper/Manifest
index 63ed30840b32..5b6d18e1f178 100644
--- a/dev-util/abi-dumper/Manifest
+++ b/dev-util/abi-dumper/Manifest
@@ -1 +1,2 @@
 DIST abi-dumper-1.2.tar.gz 47287 BLAKE2B 93aef6a4f11ce33f04d6778d02749b4caf2eb782297957c6295d0d27f43386a92e0207b9bf6fbd17ae5e7f09964677810d6c42d3aea589fcfa46ce5f8353ee16 SHA512 cb081a8aaa548bb2360cfe55d4258c263990a4cc36feaabdafa0dc32252d19ce3ce0209e6af14c03157a144fea0e5ecb6700848f74b4da4c3ee2cdb6f0d860d2
+DIST abi-dumper-1.4.tar.gz 48463 BLAKE2B c94039d1372231ace0108730405b084a75abbce958990cc7bd32b0dcbeb1ae9b9c7d9aa0dd2400c027d927be023e9cb0bdb091ddec8592e7ab61465dd626813a SHA512 e5a7d59c9a2b3f18ce7b64c2a1d96efcd73084cf651dfc1833755621c21b7edd7e2fa7c194ad7c5b6658021432241bd47b30fe36640e5f1e0bee6e6dcf913ea0
diff --git a/dev-util/abi-dumper/abi-dumper-1.4.ebuild b/dev-util/abi-dumper/abi-dumper-1.4.ebuild
new file mode 100644
index 000000000000..668e5398ba1f
--- /dev/null
+++ b/dev-util/abi-dumper/abi-dumper-1.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Dump ABI of an ELF object containing DWARF debug info"
+HOMEPAGE="https://github.com/lvc/abi-dumper"
+SRC_URI="https://github.com/lvc/abi-dumper/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-libs/elfutils
+	dev-util/vtable-dumper
+"
+BDEPEND="dev-lang/perl"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir /usr
+	perl Makefile.pl -install -prefix "${EPREFIX}/usr" -destdir "${D}" || die
+	einstalldocs
+}
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
deleted file mode 100644
index 9b10cdee2a4c..000000000000
--- a/dev-util/android-sdk-update-manager/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST android-sdk_r24.4.1-linux.tgz 326412652 BLAKE2B 4263a5e942f0ee35069f4fc075504c637381820f40485c9753f5f586f713e614c204b3e5c35968acbc665644aaab4c2e05660e00675d956422cd7d1fc6445ed2 SHA512 96fb71d78a8c2833afeba6df617edcd6cc4e37ecd0c3bec38c39e78204ed3c2bd54b138a56086bf5ccd95e372e3c36e72c1550c13df8232ec19537da93049284
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
deleted file mode 100644
index 6a3fe922894e..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop udev
-
-ANDROID_SDK_DIR="/opt/android-sdk-update-manager"
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-S="${WORKDIR}/android-sdk-linux"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="bindist mirror"
-
-DEPEND="acct-group/android"
-RDEPEND="
-	${DEPEND}
-	>=dev-java/ant-1.10.14-r3:0
-	dev-java/swt:3.7[cairo]
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libpulse
-	sys-libs/ncurses-compat:5[abi_x86_32(-)]
-	sys-libs/zlib[abi_x86_32(-)]
-	>=virtual/jdk-1.8
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-
-"
-
-QA_PREBUILT="*"
-
-src_prepare() {
-	default
-	rm -rf tools/lib/x86* || die
-}
-
-src_install() {
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt" || die
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners -R root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms -R 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-	udev_dorules "${FILESDIR}"/80-android.rules || die
-	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development      environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/files/80-android.rules b/dev-util/android-sdk-update-manager/files/80-android.rules
deleted file mode 100644
index e6eda7c938a0..000000000000
--- a/dev-util/android-sdk-update-manager/files/80-android.rules
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0664", GROUP="android"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0664", GROUP="android"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", MODE="0664", GROUP="android"
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0664", GROUP="android"
diff --git a/dev-util/android-sdk-update-manager/files/android-sdk-update-manager.desktop b/dev-util/android-sdk-update-manager/files/android-sdk-update-manager.desktop
deleted file mode 100644
index 83f1d25990ca..000000000000
--- a/dev-util/android-sdk-update-manager/files/android-sdk-update-manager.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Android SDK update-manager
-Type=Application
-Comment=Manage/update Android SDK (tools).
-Terminal=false
-Exec=/opt/android-sdk-update-manager/tools/android
-Icon=/opt/android-sdk-update-manager/tools/apps/SdkController/res/drawable-xhdpi/ic_launcher.png
-Categories=Development;
-GenericName=Android SDK update-manager
diff --git a/dev-util/android-sdk-update-manager/metadata.xml b/dev-util/android-sdk-update-manager/metadata.xml
deleted file mode 100644
index 8961efbc3c8a..000000000000
--- a/dev-util/android-sdk-update-manager/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-        <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-util/babeltrace/Manifest b/dev-util/babeltrace/Manifest
index 4bd4f00e558d..f02b267c6893 100644
--- a/dev-util/babeltrace/Manifest
+++ b/dev-util/babeltrace/Manifest
@@ -1,3 +1,2 @@
 DIST babeltrace-1.5.11.tar.bz2 998592 BLAKE2B 8d11c0322072464fd2a187ebc1320e3cec1007e8c56f04e9bb845d94b4e0399febce91eb49c1a75c829f5182d9cb5c93c0d647c311c38133e548c30bd0905d59 SHA512 a3158bb9d0306c1cab6ac3d16ba542605ad60b13ecb10fe740a3b95168f0ead87d31483a06d49a15341f7ef6def16765d9a6045f40a60cd8b94070d979c0c3d1
-DIST babeltrace-1.5.8.tar.bz2 992610 BLAKE2B 3d47f9ba40b406271a0b35e441968718c93e8744f95b56f79acf8359001ebffb4966931f2860d48ced4f0d98261b37156564a0d798bf8d9e0ed465c05355cc5d SHA512 827749ae8507efd433bb97ef668628837a3ff15b5be5097af5621d46055c6f10401da0be1f9d9f843a96c8c307b33745e04284d166e275e03b7ddb0a7dd57e96
 DIST babeltrace2-2.0.5.tar.bz2 3252593 BLAKE2B 31a8f3c080e4a6b6e33c224ec4a64d5ff12724a5697954cb92b88c569d6f2019f49ddcb88f82d36be3007c7b5d1334370202d1c0e89122acf340a7cb9e399fa3 SHA512 63469cb0796c720b18bfc09569875eb9a44d2f8a776228bfa503af8ba613b2988b2d20be870f41451e5d6146a3dfb08de6284131d25f1a86137deb75c3a4d514
diff --git a/dev-util/babeltrace/babeltrace-1.5.11.ebuild b/dev-util/babeltrace/babeltrace-1.5.11.ebuild
index 5dd564fb0c7d..32808a028eb9 100644
--- a/dev-util/babeltrace/babeltrace-1.5.11.ebuild
+++ b/dev-util/babeltrace/babeltrace-1.5.11.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="https://www.efficios.com/files/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/babeltrace/babeltrace-1.5.8.ebuild b/dev-util/babeltrace/babeltrace-1.5.8.ebuild
deleted file mode 100644
index bd34b6536b42..000000000000
--- a/dev-util/babeltrace/babeltrace-1.5.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A command-line tool and library to read and convert trace files"
-HOMEPAGE="https://babeltrace.org/"
-SRC_URI="https://www.efficios.com/files/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/popt
-	dev-libs/elfutils
-	sys-apps/util-linux
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	app-alternatives/lex
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-slibtool.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable test glibtest) \
-		--enable-debug-info
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/bindgen/bindgen-0.71.1.ebuild b/dev-util/bindgen/bindgen-0.71.1.ebuild
index 45f606f0037c..e89622b26482 100644
--- a/dev-util/bindgen/bindgen-0.71.1.ebuild
+++ b/dev-util/bindgen/bindgen-0.71.1.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
@@ -109,7 +109,7 @@ LICENSE="BSD"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 BSD ISC MIT Unicode-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv"
 
 DEPEND="${RUST_DEPEND}"
 RDEPEND="${DEPEND}
diff --git a/dev-util/bingrep/Manifest b/dev-util/bingrep/Manifest
index ce954f43916d..50c64d507e3e 100644
--- a/dev-util/bingrep/Manifest
+++ b/dev-util/bingrep/Manifest
@@ -1,22 +1,14 @@
-DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST aho-corasick-0.7.20.crate 111440 BLAKE2B 3f5d54fea2793ce1c2c4d5b3049b910f45a5721e7538cb2557df63dc3069ab3f6b66aceb5e9a48f21c43ae29778fd045428ea103b2a6de81659e605e30e64ca6 SHA512 ad31f3d1b3fe41e593d4ca7e721bbad62936f2e6a17fd1e0997353edb6fc906d1bef2b79f0ac7c7676abe637bbabb23ff22059947be379a2441011f8178983c5
-DIST anyhow-1.0.63.crate 43461 BLAKE2B 6e98a34c151493c032ce236ef1be389616ac6668974e40cc013316be76493ef3c5720555af27f26d301b558413ff27e7f59f7acb6a8d98609644d77986669798 SHA512 41ae7338ba0505cf43b6c8a36b54e5714de91dc2c9c8fe5ba4272fc72ee30c9fc205bc1a63d968ce68b68a556c5307597c91b036e25f71f93b3245303f636ec7
 DIST anyhow-1.0.69.crate 43576 BLAKE2B deb44b3110aee1314dd599b730df8c2f03b7d13c0d945d4ef00a0e30ca74257269e43107be19868adfea331a8c730e0aec2dff3abea704e56bc6a35b9581fe14 SHA512 d65e5c9404a70b1e0af90dd66af157f8c31ad0858f703765d5fc6c828f1fc8db690b17451c4108e3a52a7da2d6c2366e745d7b4bd7d19e6dba3485f7c3a43071
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST bingrep-0.10.1.tar.gz 620969 BLAKE2B 123241e0899c466ae3eb61248fab3337947aab65409b101d9c9f03f89c984664682b5cee0ee502a81c031e982faa51790c833df8718d3364ebe207092b004a51 SHA512 7d687590274eb2856f4292e375066ec11ddaebd85cd16451f97100bb06401420b9cd1064f15573aafca6d0645b49545449d959af74e37644f5059016c8ecac21
 DIST bingrep-0.11.0.tar.gz 621997 BLAKE2B 4dc3df594df6e3de42727d99fdd0280139ee068349f6ba5e4670eca9bf0bf56b0ec5ebceca7f3a75acb15ec045877956d4bd5daf5d5de3d130428617112e2a4a SHA512 9a50aecffdd613f3241d12802ad49dc5d98219c8a99455418dc741eebc0a7c2a26126ca834649271c88963521cb192929413bae7d5e2e8faf0472e9a29b46d88
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
 DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST clap-3.2.20.crate 214114 BLAKE2B b8bf14d5b60ac0a1156718e2993df45bd867519a195414de591ae92e009930121c674bd53ce8e5cad53659a1b9b72810a7cbbabc92d3552b2131cf3836083a4f SHA512 85a1aa5f777a172aca71459225d72282fc7f21122ad7ade496a4734ffdd140476fd73d67da900fe323dd6a72d09401536e318b9654674a9f4f61dab822fe54a9
 DIST clap-4.1.4.crate 207077 BLAKE2B 967f450902ee1fe74a662ea1ae6010eb3a650eddf82b05154d7e98df5eb72f1a7fe6c91ebf6feaddfe9d2b5dd78aa4357525f08aa5a1706da11579798d9f9c93 SHA512 0828a67a5dda8a32251ce5de6570e020cb54ff7198a7df0051e1e78c75bf7c3f7b9e47ee1f6ff93fcac985d06a65c0d6ec061de4b967954949f77c12110053bb
-DIST clap_derive-3.2.18.crate 28208 BLAKE2B 05a23083a8e792858819d7eebf057257b1d49b0e8246d3f24c6f812456cbabfc75d9271c295a0d44539bd531ea6808ca7490e787c1fcae63bce045422d33d280 SHA512 d5349b3d5711bd4900173aa5210d7c4aebb0bf70128e11f26b362f5acb43687f6ce5ef73e4d614ce9c1d649d34b68ff15ab8b65fdf1898fd295ee4b4a7523497
 DIST clap_derive-4.1.0.crate 27897 BLAKE2B e886be1db739d6a14ee5b049f3e991dad62ea884b1f885a357fa436916fc00d51315f7453b85ec7a18384d564f70380c58dfd2fdb862a20b510613b57173cd51 SHA512 dc191ccd0b596395d029e9ded5d1cb2cb86c8392a4de52ddb877b59dafe85369287b6ec2749d01f33372fcd4cb6a4e12a9cb02b394f50d65ebdc4693af062807
-DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f
 DIST clap_lex-0.3.1.crate 9653 BLAKE2B ec1261ed4f402c713c6324dda105d8e9eff95150c50b966096ca71f1c534f73e8bd3ba7ed9afe818ace8501aa35f505d21f040fff578565421710229321599b9 SHA512 2619ba0fb961d8ee86e42864b56511378ef837674aab6b1a21defee20f321e4f29b3b3fead0665b4385b0675d7bc63a7dd7df00dde51dee7ee99c7add6828b89
-DIST cpp_demangle-0.3.5.crate 75313 BLAKE2B efabaeafdd730bcd85d7e22fec3ec014c0f15f0ab7d7eb939c9abaad5edc51696d4cdf6551dc933e76596eb792cb214644bbc4fbc4ff373fcd37af8b18bd6a0b SHA512 ef59cba0cb54cd12232fcd96dc5734b5997ad6ecaf4e86d7f6cccf56c4c18a6cffaa1f6eca46a8889f5a0fb3ea1774495364b698cfd27caccf99fbbaa08d3378
 DIST cpp_demangle-0.4.0.crate 78033 BLAKE2B 938a3d6e8eb0cc0d571be5d8bf7f43884d4a8d65f2bd6014a97e98b76a94ed4202326b392a6e60d2e424cf77fd2ef13e413e3f1095e58586812cddafba1193e0 SHA512 49d2c8a6f9e32e8cc123dda0921e62c426afcce3d2982f18ac95c478c187bd00ea0c8e10f96101a2a3cd667b7cbea77669ff113ec23e20eb2b7ad2a99e132dc7
 DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
@@ -24,92 +16,55 @@ DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47a
 DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
 DIST encode_unicode-1.0.0.crate 56986 BLAKE2B 76e8915408c26bdc909e9ff2d59a1655344dcb4ca0e6accaf038434b7518f1b86554954fda8c7874285924c7d16cc81f62e68afcb8b0efc639407b558df1470b SHA512 c9a21d48ba9d50750789cb6fbe32afd903c583c9ef05a9741007dcdf64b1344735f71dd882ad71ab9e5f96f8839578ca53bca14d13d57b9e27b8cce2cd507359
 DIST env_logger-0.10.0.crate 36574 BLAKE2B d2f387682059fe9b4566ab995be449c58c57b8df5e5d8bd5ffd153aec1648721d8a9606d3f9aa034263651f5182043e08b6cc08d2d29d0a10f6cc61df9949a06 SHA512 4dd02f9d333a1f15657167ef4bd403eda5426cad17e0a4a43fa20cc65449345eb4d3fae2d6b10a3480016b9e23497fac13ed7e70b40c9450ef430be9f910d3e4
-DIST env_logger-0.9.0.crate 33573 BLAKE2B b9c22205ee60ba97da0d338e1d40dda989f0d766d9ebc60e610b53db882a803769fb3c093348c031183856e16a5a948342e09551953f0b98cd73437bec658bee SHA512 d7db85d2f7d16f7f97b6714e01e342ab6b784c799ef26ee322ec85fcee28a549b6e49a49200ff78eceacd0c682e941f8538a497e2a2a196040769c2365feb566
 DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1
 DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
-DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
-DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1
 DIST getrandom-0.2.8.crate 30553 BLAKE2B 30211bc6a8ceb5ba765cbf068405cfc08842b2521c5850647971f4cb4bc9a5b0a9195ccfbc1461de019eeb7744ee69f934922ff21677259d7b815800516df4dc SHA512 cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5
-DIST goblin-0.5.4.crate 158387 BLAKE2B 192d0a3e0542439c07c78a598e2c865757e2182b4fb3a8d505f7a361430e451380e2b91dc55742b85f9be234d6a9c623da1079255ba7ab909541424342ab4560 SHA512 627df59babd5291aa6e37bdd529c3b837001c45d1f22f435bf50ba386e49a6bee93a428bc22d69efbd7182ba1b343985b6d2d8bf405e3c57e524206847d429fa
 DIST goblin-0.6.0.crate 159778 BLAKE2B 2991d67b921945fabe955ee6bdc621a58edba3b7cfffd9cff67625d255bea9a9c4ea578bf5df49fbbc18f3f07119ee7bafe237419064a3b413043673ff9b2060 SHA512 fb00bb3c5a628866ba2c07e69b5146fbe483486c45a0a3b5a0774424b5cb866e81905c12a36690fb11ff589a649aa293d915ac8bc40c3b8d72f18d75635095fe
-DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
-DIST heck-0.4.0.crate 11161 BLAKE2B 13b8bc39cf3ab90e71433e3c7b3e5f1c19404bec58dc4298dca05d94d5c14c2fc97350de737cb78aa45196b1241aa8f1ccf3a11ca309da5fe0f6a657673412b3 SHA512 33bdbf4ff9ecc4f4d74cf06590e056f4d96bf0d990d5381b9da5b65682b2495ed74e27b45419c2afa986c1f6200909d5175b137ae73ced5cc8ac869e4e1bce8f
 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST hermit-abi-0.3.0.crate 15200 BLAKE2B 31b57ebe2814117e3afad95f233b7d882e42bc51206063b8695c167be584f22d933383150f7feac21796de949b28aec439d88d4dba17acefc98f4210477196b5 SHA512 e576f20b40ac3b6eadd74a6083ca3f49098ae70ebda7d625741e1c2e3c2b815ac431d7c0fc8b1772f0388e7d4f54496c8def3645592843720118f62d377c784c
 DIST hexplay-0.2.1.crate 10043 BLAKE2B 37251bd8ae4c5775b4671266b21441d9a21fa30dcfe95d6d0cec606bb114b5fde9ca25c8d1e5f316f1960b2e5e888c60bcd519811d7543b40a1fd0830ce01af0 SHA512 0c5097c05eb99f4cac11cba11143ade1446035d771104a676860773914f5d1cdbf921d56eb7ac15f00ba63233df03d6c64ae7823891ffc77bf268f6042671e5c
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
-DIST indexmap-1.9.1.crate 54114 BLAKE2B 71e4968c85d5b3fac550590658f9fed72c754a9443221fc804efb97bd39b5fca7f894ee67f8d2c330bf212eb8a6b5c85879cd813ed56e3fc43a54f0bb689af5a SHA512 7eac99056123332ad38ef32eb65235c810e8b4d051d9b0ddd5582348c9cd3b162d36defe8e46a532e2066562f224e37fae94b52b4649ee9cfac7673b76a2513e
 DIST io-lifetimes-1.0.5.crate 35939 BLAKE2B e52a66b90464bc799889c5fe32d8269fa125d5eddec709e2daeb9a0b5db20c5fa5b5f51dcca2b130b75b1980e42e2aa5e892e6133b9d7f8f0b3172856e6808f8 SHA512 73b884426e26c19e65e25bb44c6255f1c46178d946306d39088350151253c2b96760ac9df84a01609f50bbfc79680a58e9a2490a14f2bef2ca7d4c11f4faba2a
 DIST is-terminal-0.4.3.crate 7701 BLAKE2B cce8c2da2cc6b405d7682291688583b4a6122572c2fb4ce1e2c6a6e63dbdaffb89d6c0076530faf0a7f1862e8a5739fd6d6311e27cf318bc43dedffab2d9f521 SHA512 cf304ab2e0710cd326353f9ffd726fe1c4a3f261571e188073a378157c72a9228c272ce24251d7e1f641e31d3ff7656433742ad4dea8f88a4d2172cda49d5f0e
 DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.132.crate 595317 BLAKE2B 1b1ae80e034d94468befcafd4bae4c41f29424cbf3770b827dd1d7099cd2364db62cf2e7343da5010e230a47fbd91d320b162f7b54fa3955fd195b6976c3fb45 SHA512 48340dd173ed4d487f6504f4c32cb3c13dac8ad4da95469c8dd79386a7564d258a9ca42ccf1b174154717bafc1d3551b87c8fe35f7e4e062c8e33da9259fec50
 DIST libc-0.2.139.crate 638983 BLAKE2B e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598 SHA512 ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4
 DIST linux-raw-sys-0.1.4.crate 878981 BLAKE2B b8708b06e48ef4e32d820b5a0e25ce12d3d985d729a2d7fef46d0b3b4518b4ad40d037d4689fb2270f9c2583dc031d0f4daa26500197e6c32bffd1400357934c SHA512 ee6d5a7a08b183681ae00890784c9e6b72e4c987b2ce2d7de6e7308b7a10d4a2b532db3d5121523bf5d4a262407f3033af4f4c1fd9f09be091523366fa30d768
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
-DIST memrange-0.1.3.crate 14013 BLAKE2B 61a6dd89d36cc88bd79d225f1ebd37a906ffe6710e7f93467307b8f42c638642903ad3469fda94166a2d4ddbab59378787c04098748aa40f811947b12581b35e SHA512 343c006c52c6679099b41d0debb42e1241a1b4790ac3b606d90809bc4515dcea5e7759db97e486de191955fda7801ef70c1db5daf5348c219948d21e139c9811
-DIST metagoblin-0.6.0.crate 3052 BLAKE2B 0b8646ad26877367e35a9a8b5091af0fdb2d841e9cd10d94a6201e5dfd7ef7b7223972cbb086afbbc3d12a655de19c6bb5f112895a93bf4d18d8f2aaf0a1ee48 SHA512 cdcd96ad57e26b20162ebc4a1eff75eacf1bc3ba6603adb5c12ced6ff8286468ca6417a64c1bfd5c61b5ad1a67bebc0e55c997c2f22376a440a8a28230b5c677
 DIST metagoblin-0.8.0.crate 3186 BLAKE2B d96dd04d00dc845664bae0f81578a2ba9933702729d51d3eb6e4edad657295a8797436da4f65454f0a23b87163eab56be3c4cec34f958b3f7415a7c3ff4100e9 SHA512 03f6f94ff1dbd2782c7cfd5e62c723e9870108f91a0e83f1a901fcdeaacb5c0747316eecc2c740edad89692ec9aeb1b2aa66fc77f28dc8d907f43ffa4108bc94
-DIST once_cell-1.14.0.crate 31614 BLAKE2B b9ac8f889c86d4160ee026fca20b5135aa7bd60e8bfaf23946d003bcf0b666929a4da5859d874449d15b6ba0ec4c26e98273d020be50184b9d44ae90b8608175 SHA512 81531f06f32854e1794555e10ccd6ee2b6913bfefdd9eed52dd44a02e799fa6371cdf102cc67bc70d581a0cc4abb7dd16c9c12ede6df4ff38b20dc5908bad186
 DIST once_cell-1.17.0.crate 32736 BLAKE2B 767fc8f362ce5ed7a9eafceb2f0764a2a1c7f4070e22d1e6e2498b3c841c5f761e77fb66a34b899a75d48f1563f6b9b73b90aa9431055d4e0269c47a1b043c1f SHA512 291d87380c0ea17fb3ffc9fdff8620d2ff55601c06ef65b2f0c54254fecd5b488645c6e94c6026b82071893f4d420491ff712399a782e14efa1e323e5c299c46
-DIST os_str_bytes-6.3.0.crate 22928 BLAKE2B 84e8197375742373bc7c7a3b459f8a9f97ffa0b8a2e517bee0d8ebb420a8509056cf56984612f44171c6b5e219b6ea91b14134fa6386b3cf3502b13ab92386c9 SHA512 34f861a15543933c9fcb560a835bd943231ffcef2c68126d8633f8e792d2d59a20765947feddb0c795a15329d74260d6c2bf74a1f10ee88f355f47240acbb42e
 DIST os_str_bytes-6.4.1.crate 23101 BLAKE2B 252fc826f646bbb999fa80b47f58ac9a77e409b10a99284c7b669304c0cd701a3d20e690350018f5d7de8c6c7d38521f3413ac81d08067dc26f76b7c0e5b056b SHA512 2199502ad24449e08370686a596f905325f5b145e105e8c7bf90ed7729bbc405e065fce62c98eada40f77f0665ca041db41f16cc8e62473501eca32c24e56f43
 DIST plain-0.2.3.crate 10664 BLAKE2B b0ea38fcf6d4f4e3ff91d572b5639f01eac4f19b2c451d27bca49d994a07c6f46118cd58a1b86b3d2a61b7ac9e17e8236f1cc98414738d8c86086d37e0fe4d35 SHA512 6909e4b4b4a0a49e6a226d7393b121ec04beb8a13b1652c23337eb09b3c2e5f202b53a7663dfe7828dcb32c3d18135b514e9a982967c188e127a63b6cbeda252
 DIST prettytable-rs-0.10.0.crate 35474 BLAKE2B cd4103eb30479830376b8ee82f2f9d26a2f974b3f2c44078d7b8c3741475eddef03dbc14a27a2329ec3204860c1389ebc0b52c68d59349cc80f8fe6ea5e4cb6d SHA512 3a77d959f03cc952b533124f299470857b67cd0857fe7afaab1058a726ffba588f533210ce75be81ce66d6c7f0e80f46b7aa1a442c60c6d316c5814cd72266eb
-DIST prettytable-rs-0.9.0.crate 33646 BLAKE2B 6fa110eb2b49803870a9355a1d6eec4c0b2d337d31591151130e5d3841666a114572dd885f977cd427175c5b680e4883f71f8d985d7648861b94e7338c9b0c6b SHA512 eadedb87f40afd35b98ac515dcf5895777c71a10a98587c2cb48c61e76bd537e439971e5046e5b7bc5f619d5958c7881a7bab36810553a31a0cd28f88cc4694b
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
-DIST proc-macro2-1.0.43.crate 41512 BLAKE2B da0577094cb0b8b419f3160bab6342f97865b01337be4cd7a344d4dea98fc2f8905dd05a56427792379f59565a25f8e16cfe4a37edb3bf77bf2e703f27953fdb SHA512 3139c668dbf593afeb77b970c77edc70f7b46b42d80f1d0e30773dedb14ab98c9eeca0dc953bc940610954860fbce663174ea6c270b8711db45aef4d57f3b910
-DIST proc-macro2-1.0.51.crate 41804 BLAKE2B 579e5a157da81cd8350a6407603e5f8102bb9b6618ea8e81ced1692a6a6f4b57bec35aeb965b643f2542f65a3b9965fbbcf7e0ade35cf159270583d34665a628 SHA512 10ad77a5d05437c1b2c40a8f82389d081e64993171aa6259e8dca98d9afb04f5fb870f2037ad626a280d59c1a89fd4482bead701d744d6fb7c893bd9e78dfc1f
-DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
+DIST proc-macro2-1.0.93.crate 52388 BLAKE2B dae4493215b88f68cc485bc0ae80f0a48ebad68e0260839b1c367832d1ab778197bf040647b3fe36cfe9d5f7a496e05cd71b5914f531eb129c2d458d5f0be896 SHA512 1ae650e390e4f1b18d05f42d2ffcd025cabf72568a326cd85496c722600108b0aa0ab0161b39fcc931b8b302427f678650e703f4db57aa1a60f1751db881dc6c
 DIST quote-1.0.23.crate 28058 BLAKE2B 81c483fa26b36b5c4dbe85b386a74f5bfeaa854a99c0d678374507613da916a60e3f5b14d4a4d295e1c9ef0413fa1f16447df8f19a9db8cb0485b7a5c327fdc1 SHA512 3bce6846dda94d285de15771549099e60df39c8395c498b372c90a240f77df31d6d9048127913ec1c7ed8f3a189470ade1db2bede406bb00fa715ea641ec87c2
-DIST rand-0.3.23.crate 11318 BLAKE2B 5ad9b187fcdfc515c606a73bd1e9aa3215e367659c35a013c9d4d0f80f9832331dfb971ca370a627c0a2afe2b8860514740e00b1d7572e221a557b5570cff6ff SHA512 a4f46fb7dfe39677dfc112eeb56fb3c28cec4cdaaf95f336f2a494f0b2b30fdf22ceb9ea956f90e13c7ffe711a68aef9fc1a80d9a911d93221ae263c243fb2c3
-DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
-DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
-DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
-DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
 DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
-DIST regex-1.6.0.crate 239329 BLAKE2B 646405e681ce572ebe2dc51a3339f0f8204143f9b2b8f8e74a4c80379c43c3581363ad347610a384d5ee831cf1425f74ddd944a658b1da2461e8068c5521af69 SHA512 b4861c9cc13d6fb224f67057fd3522f04576591b3d7ae0d3581dce42ca2b2bff96860cf2a7f4dfab00e46a1d29e6473f6723c4aeb02e34ed6d5f205b66f07876
 DIST regex-1.7.1.crate 239648 BLAKE2B d68591ab0627f0bbcead8e81de2b9f6c7eb7be2d29b2c1700e06ffb541c073ecc054dfc76aba8f55ac0630b191d4136805bd04c7d1b9f6cbb1ca2437668ab244 SHA512 ee19bc6d24b981a151324ad4115488383227ec33dfba0225b35b6252f0d363b8d906db59a45170139c7a687fe681a983c2392d2921c7365db38c7c0e9745066f
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
-DIST regex-syntax-0.6.27.crate 297300 BLAKE2B 4ca1a2e23d04e29c5925085ea4ab7ebcc398dfe135eacaab1e686aa8be43a110a28e8bec05a6910183f9a6bb1fd0d635fcb1a60b5a6a03fed4d2cf937a542a5a SHA512 5cc705a5dda08cbdb4dbcf3fa98763cadcda13d9c3ba407b35f3e88d77935efc2704bb40b3fb5aad7dfbad0df43bcb4c4cad9732defb954e2228a0739f7c37c6
 DIST regex-syntax-0.6.28.crate 299288 BLAKE2B 8554370e269e888e603c403089aa6eb4a087ae65fec016a428e424289990a07826e37a2e51cd353c7d530d5b3421e2db6a8f9d50e62379867bb5b6cbc57f2436 SHA512 ba5fb1622a330b67a4eb820551c7f20dbfdc6b38eb697b9bfddea4cf0060b473472045e93aaf6cb9727ae609e06ed285e1e42f06f34ac730ac39fb90425bbe85
 DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
-DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
 DIST rustix-0.36.8.crate 290808 BLAKE2B 62da252100523d282d6d8d2bf141f6e59f0dafcebb0a1025b6bddb78c2a100643d63edcaea4cf64ce68696219ef52706f6b49f6a7b22f99c544866643952f98b SHA512 6fd6ca326feac93145ddbf6eba65c8eff731c9a9e7ff3a6724c19e5c8bbb05236f526df27c4c916e855e7e75e65914470af2d9c98e1571692991a7bd811b5bb0
 DIST rustversion-1.0.11.crate 17485 BLAKE2B 940646bc3783dfc663b179e4624ed03d3726bc745517581fd3d6eef607fea2b2c75e636f1e1dd2d9e30cded59e2b9fb64b964f47693baf2928b515eba0e89f09 SHA512 60b94f8378cb1d0ee61dad768e14f50bd043d4c0e4a4e0ef4979d7366886909e1b186abe2c65cd36ef077bc2663f1610f3bc4328ab2f078b94405384a07dcd76
-DIST rustversion-1.0.9.crate 17425 BLAKE2B 0d4bf497848b3fc0ce10cdb3f1cfd73965bba1c0aa49f24c0b4abb92c2dc133ff546b119a69d2f5843f68cf4d42e4f64e9c59e2879788f91208bd75a2b7c62e8 SHA512 b2c116585816ee3aff5b21ac72ef05520ebb01fc164519e43407685c223ad5f2d3ded663c643a1f0e8150d334383c7504b701ea2708a570e5d7e29d98e2e7c61
-DIST ryu-1.0.11.crate 47007 BLAKE2B d03e8df69c3b21c1b2e4ffa91ece794f141e9f9bce4e9ed1ebf394b1cb0f796147b86189885f0734df8f431b2d166d8f6ed6a261be398d6d088fd56046a85c2e SHA512 dd2642aab2d3017c31432436226d5350b894c8b88a09395eb7de6350964b3cc48451a829ce78b04a9e4e0480076fe1bddd0604f4e57700faa2d60cac6e361408
 DIST ryu-1.0.12.crate 47070 BLAKE2B 02b0eec6bf266b7c482aea15ff83de4bf3cd6f607f8cd6f17f1c3ffc60cc64b62b15738907b4069f5816dd81669ed4f5b00c4bbc8705abaebe3a0846f56e8e29 SHA512 070f0b2b52e47cc9a6d8f003439d257c27aec15ffb030a92481ac22d5052436156e25127ea3ea7986cc514d2a7a924f9328710d743c216d7b1379beacae79829
 DIST scroll-0.11.0.crate 27354 BLAKE2B 21c885468642a77d6871ccf2bb748972f33c8abd504b2c0232bad9ec21228c3ecc9bc267b44898fc1dc5ab3ec494a8c6e01dfc5bee0dbe93117231de9f056b37 SHA512 84a9b1eb8a10c2bb14b718984ebdbac4a02620a65d6ced24f5346a762d92cc22a69fd204de1ed97044076d098a5ff9b7e20f7f00deca2b1302eb0910934265af
 DIST scroll_derive-0.11.0.crate 5615 BLAKE2B 83b8b5d68b7496cf49f16b7a1450ff5927b9b9afa887fca80d2763e88f1be3fc4650e18a74944521867f4d920ec040bd91e7133132d97692cee4b93b9900fb1c SHA512 71cea55a78cceaea15147eb71f463c4a3cc6137a499a7712b61e1c3a340e72f5dd438e49433ba9e73e5a3e9d23515a0e81b2abd2ce1f426aabf1930f7d251ff4
-DIST serde-1.0.144.crate 76387 BLAKE2B 7e66355c24e1116eec4a3ba4f9164570b6d4ab57196d39d19a0bca912c9d2acfb33d8e17e09bc07903984dad154034187d0ffcc8f9073b36336ac2b38ea012cf SHA512 d7388a40e4a5e0a65ec7b49193f2d53d758adcf26b98ca3bc6270351c7553add2f38a8434223a95826994c6d039dd91fc4f4020ce191410fe57bebd29e4938de
 DIST serde-1.0.152.crate 77091 BLAKE2B 89c01ce359042ebe6b1b64ea710580886f965a98e1d6085c58a75269a9b43401e2cace080c4c93ee51982855fb7e2f09fdefe9bd237bbf30c5537f3a4258283b SHA512 b47bd58fdc1a81d96cc0c9d14c8b19153b6689e893851975b1d7c7010c4448750e7fa09056dd4f13ed475a4aea2a3950952ff528832976919a6e78504a37bea7
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST syn-1.0.107.crate 237539 BLAKE2B 5a65968806c72fedf69638661f827a0426b9e49c2f9a5e5208f986105f8facca2bdf241f92f74bde790e9a0dd68240d4827a345a939c087364360e19a5cbeff3 SHA512 58132adb76643521a6a9cbc0316431318ac25f8517bba3cbb98e7e28ed536f9e24f643e898fa21a2f74cc8c1aeafaecf9b4199b23048c7be8c0bab2fe3aa7623
-DIST syn-1.0.99.crate 236084 BLAKE2B 852493506271ee364ecb6e907fca55f18af9dc7ec4b4737e43e104d04064a37a2a59b31f5f780621785e44606d43e74adca5cf24c9ac1a8e186955c6b3e43b85 SHA512 47a9ec4d5e6702709c1069d1804d29880a1c5bbbed5a91c44e80eec657c62ceb223d6fbd942deef591463664766ae1997d154525f4e7a212bb84151418f40d10
 DIST term-0.7.0.crate 37082 BLAKE2B cb7947c696f71fc68bab3b25cc6cbde74b92380fdde5447399b06de99534b0cb2160963792824ac74a350444ce41a4fa16d6a9792a68d84578a15ab37ab76ca2 SHA512 9de6e836f1fd205b3b58645ec880eaabfc0fd8991e3980ef90bc6184b370a14676edb688a2a75bce412dd8ebd97345aef742afe5b964250e2b6f84e6b15b486a
 DIST termcolor-0.3.6.crate 13548 BLAKE2B 4d7faffc3be9ffe4e6da0ea20e6b244c0d9e488ff1c97851dfce073622e68f041e1c77d3c49c769a5e6525c28dfcdd998b381a5abcaa5c4ea63b0acf0e28bf2d SHA512 cfb8e0172abad994da27b1474ab0de244db782ac9c7fcd877d9f1727eaa2fb95036638edbab6b69c3302d1b880eba14cc7282ae0ec78ada1d31a9ef682d4cc90
-DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7
-DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
 DIST terminal_size-0.2.3.crate 9361 BLAKE2B 38862ed4d98442f755a841b3eb44b397645c6e2ad25793dc96b089df3549c07ff353e18515b83686b34f002e7a557404502f847ceb6f5f673b96830286553d44 SHA512 f390c5e8ce53e0387db7c30619a107e484fa80ba4e046fb797b6006966be446d5aee5bd2179734b0684e206762fe7b19e8fe00d75853069a4bc7b9ae14f74c23
-DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
-DIST theban_interval_tree-0.7.1.crate 22912 BLAKE2B a7f1a90a8a1f76808f64c013a0603f8b5f2811623511bc636f453a44b2d446bfe1d3f1257c1e20c0901b44b79c76f55145783f3d092fac947e48c909b4c0e135 SHA512 62ec06e13430c5828337300e8d25010b5a262d6359f33c689ea211798e1ba6103d144838ebf77d718e25360763f47265764e49d3332cbb05e91f4be159337f5d
-DIST thiserror-1.0.33.crate 17252 BLAKE2B 234ba49ca99379cf666f6fdc1e4cccaf59c565b116275f423b3052924d29a61f56c8579e02b91273eb8b04c4dc87b5b2455d5cb27580a8cc08769236818a158d SHA512 7bc7cba1e9beb48d8938c5f6b75eb7b3c2966b87d7adb3a29c1f28db94643fd6b630b4e17f4dcd8f544d1656b5e8ea89fff292f3017e73f0a1fec96461602b18
 DIST thiserror-1.0.38.crate 18947 BLAKE2B fb81df34dba2958395ae360cbb14e2708e5a3cfa5cd0bd03c58f29c146d8afd8595a7ca1b30f1ed2a75ba140a55ba450fd4fd040aa1a1dccb0baf393b0e98d60 SHA512 95b8ca682b579834a04058f03ed0c994ccef426d75e0fcc28ee47151d343da25e8fe31f8157744d942aa54652115f477fc6037f91c581dbc127b829cc96476ce
-DIST thiserror-impl-1.0.33.crate 15429 BLAKE2B 2713d79ac5e04fa5ba3f759541910416d5acd266a564a3effb8aac2d6a17a43f19453417e097aca51728a126b2a4e75bb2e9846e8ba9945363b2f7c818ace339 SHA512 e8d057851992abf0de9310d525efdd55bec6876d0f95e05868b08e0585fdce5b0514ec38fa88f3a717575ed2abf1b0d24e7c19b0ad2d9e64d21925ae2711402a
 DIST thiserror-impl-1.0.38.crate 15429 BLAKE2B 96202c256e970fe23f07b461d71430889e36d9f0e83608d001c6feb4e86f4a34047ce93617b27f89c6e2a5d6ad8702b9f64ac7e59bfee221677261fdfcb06e69 SHA512 628aa28404a181b384ac6a11a433829a5481d97face5bc1704349414f36e93440738122fca716fdf878719870d10e0cf8d495df6b1d40913e985c2824cbc3aba
-DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
-DIST unicode-ident-1.0.3.crate 35031 BLAKE2B d8d20829b97e7f1b9710feb6773cc5c4d25de6509772491e6f508a489285e32ec3a14ae689a1f1cd01ff5e2d4301b98579155535e03e240c8605b5737c9c5de5 SHA512 7ebdcfd7131a0e7a834f7e973b9cf813495259e0a0606539623d3f9bb51f9c6414908e71281d6a77397021e48d41c400a704c65990aaa8ca8d0a6095d9b3ed47
 DIST unicode-ident-1.0.6.crate 42158 BLAKE2B 6e4ef61fcac69b4ccbf743a2c2f857a6ea9fcbac9b9890f5b7208cc0732c6892aa5889b3030e87c8c29ce4ce24ddb7adec6bcf47b7aefe9cb5d19f920f12cfbd SHA512 ee1dc78fe535f46bdaf3e19dd8dfc859bf3133d9271026cadf626a07ba586c39caca4e45d905156a6276cf852f9cebef196b2229c3ba4b5e2b26c956fd6cff86
 DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b
-DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
-DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 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
diff --git a/dev-util/bingrep/bingrep-0.10.1-r1.ebuild b/dev-util/bingrep/bingrep-0.10.1-r1.ebuild
deleted file mode 100644
index c83dca277b99..000000000000
--- a/dev-util/bingrep/bingrep-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	aho-corasick@0.7.18
-	anyhow@1.0.63
-	atty@0.2.14
-	autocfg@1.1.0
-	bitflags@1.3.2
-	bstr@0.2.17
-	cfg-if@1.0.0
-	clap@3.2.20
-	clap_derive@3.2.18
-	clap_lex@0.2.4
-	cpp_demangle@0.3.5
-	csv@1.1.6
-	csv-core@0.1.10
-	dirs-next@2.0.0
-	dirs-sys-next@0.1.2
-	encode_unicode@1.0.0
-	env_logger@0.9.0
-	fuchsia-cprng@0.1.1
-	getrandom@0.2.7
-	goblin@0.5.4
-	hashbrown@0.12.3
-	heck@0.4.0
-	hermit-abi@0.1.19
-	hexplay@0.2.1
-	humantime@2.1.0
-	indexmap@1.9.1
-	itoa@0.4.8
-	lazy_static@1.4.0
-	libc@0.2.132
-	log@0.4.17
-	memchr@2.5.0
-	memrange@0.1.3
-	metagoblin@0.6.0
-	once_cell@1.14.0
-	os_str_bytes@6.3.0
-	plain@0.2.3
-	prettytable-rs@0.9.0
-	proc-macro-error@1.0.4
-	proc-macro-error-attr@1.0.4
-	proc-macro2@1.0.43
-	quote@1.0.21
-	rand@0.3.23
-	rand@0.4.6
-	rand_core@0.3.1
-	rand_core@0.4.2
-	rdrand@0.4.0
-	redox_syscall@0.2.16
-	redox_users@0.4.3
-	regex@1.6.0
-	regex-automata@0.1.10
-	regex-syntax@0.6.27
-	rustc-demangle@0.1.21
-	rustc-serialize@0.3.24
-	rustversion@1.0.9
-	ryu@1.0.11
-	scroll@0.11.0
-	scroll_derive@0.11.0
-	serde@1.0.144
-	strsim@0.10.0
-	syn@1.0.99
-	term@0.7.0
-	termcolor@0.3.6
-	termcolor@1.1.3
-	terminal_size@0.1.17
-	textwrap@0.15.0
-	theban_interval_tree@0.7.1
-	thiserror@1.0.33
-	thiserror-impl@1.0.33
-	time@0.1.44
-	unicode-ident@1.0.3
-	unicode-width@0.1.9
-	version_check@0.9.4
-	wasi@0.10.0+wasi-snapshot-preview1
-	wasi@0.11.0+wasi-snapshot-preview1
-	winapi@0.3.9
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.5
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	wincolor@0.1.6
-"
-
-# https://github.com/rust-lang/rust/issues/113152#issuecomment-1612578376
-RUST_MAX_VER="1.71.1"
-
-inherit cargo
-
-DESCRIPTION="Binary file analysis tool"
-HOMEPAGE="https://github.com/m4b/bingrep"
-SRC_URI="https://github.com/m4b/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	${CARGO_CRATE_URIS}"
-
-LICENSE="Apache-2.0 BSD Boost-1.0 MIT Unicode-DFS-2016"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-QA_FLAGS_IGNORED="usr/bin/bingrep"
-
-pkg_setup() {
-	rust_pkg_setup
-	# Requires nightly feature proc-macro2
-	export RUSTC_BOOTSTRAP=1
-}
-
-src_install() {
-	cargo_src_install
-	einstalldocs
-}
diff --git a/dev-util/bingrep/bingrep-0.11.0-r1.ebuild b/dev-util/bingrep/bingrep-0.11.0-r1.ebuild
index 0fd92e6bef06..182fee958330 100644
--- a/dev-util/bingrep/bingrep-0.11.0-r1.ebuild
+++ b/dev-util/bingrep/bingrep-0.11.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,7 +45,7 @@ CRATES="
 	prettytable-rs@0.10.0
 	proc-macro-error@1.0.4
 	proc-macro-error-attr@1.0.4
-	proc-macro2@1.0.51
+	proc-macro2@1.0.93
 	quote@1.0.23
 	redox_syscall@0.2.16
 	redox_users@0.4.3
@@ -88,9 +88,6 @@ CRATES="
 	windows_x86_64_msvc@0.42.1
 "
 
-# https://github.com/rust-lang/rust/issues/113152#issuecomment-1612578376
-RUST_MAX_VER="1.71.1"
-
 inherit cargo
 
 DESCRIPTION="Binary file analysis tool"
@@ -103,7 +100,11 @@ LICENSE="Apache-2.0 BSD Boost-1.0 MIT Unicode-DFS-2016"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
-QA_FLAGS_IGNORED="usr/bin/bingrep"
+PATCHES=(
+	"${FILESDIR}"/${P}-update-crates.patch
+)
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
 
 pkg_setup() {
 	rust_pkg_setup
diff --git a/dev-util/bingrep/files/bingrep-0.11.0-update-crates.patch b/dev-util/bingrep/files/bingrep-0.11.0-update-crates.patch
new file mode 100644
index 000000000000..91dd2d3d37b3
--- /dev/null
+++ b/dev-util/bingrep/files/bingrep-0.11.0-update-crates.patch
@@ -0,0 +1,16 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index bfaba02..97c1b27 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -394,9 +394,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "proc-macro2"
+-version = "1.0.51"
++version = "1.0.93"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
++checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+ dependencies = [
+  "unicode-ident",
+ ]
diff --git a/dev-util/bpftool/bpftool-7.5.0.ebuild b/dev-util/bpftool/bpftool-7.5.0.ebuild
index 753408c8ea03..b3e3ff89e60a 100644
--- a/dev-util/bpftool/bpftool-7.5.0.ebuild
+++ b/dev-util/bpftool/bpftool-7.5.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
@@ -36,7 +36,7 @@ else
 		S="${WORKDIR}/bpftool-libbpf-v${PV}-sources"
 	fi
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="|| ( GPL-2 BSD-2 )"
diff --git a/dev-util/cargo-c/Manifest b/dev-util/cargo-c/Manifest
index d137ea75a76d..44a303c64518 100644
--- a/dev-util/cargo-c/Manifest
+++ b/dev-util/cargo-c/Manifest
@@ -4,6 +4,7 @@ DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa
 DIST allocator-api2-0.2.18.crate 62504 BLAKE2B 8152c5a611be91ba23b1e8647511e21f48e7d4f1a7b9a828083f5bb8747cdc92aee66f73251b19195bbdc1f65aad992632e820d86cbeff287d598257ae3628a6 SHA512 5e5b0e23e1f5b259e5d3746e3e05817af8dee95af7105ea775a5c1d69b4e537a4d6a25e2c1d46ab83e2385217b158f7940dc1315ae581c35ee23289647105e73
 DIST allocator-api2-0.2.21.crate 63622 BLAKE2B 983897fc977118f220dc4af7e801ac08eba77bfde2a25d756bad3e77f849418e74e7c67eaed68e2d719ca7fc6e1e9ce151dd7dbe8707dc43d4a6400294c8fc8e SHA512 1bb5711ed6041b0d7eae2ec784b8aa9d215db0f49cf79c692946eeb0db545d358cbcaa8156ae34e51d05287c08574f1da251ee574f2392949e4ed26d04770d03
 DIST annotate-snippets-0.11.4.crate 46876 BLAKE2B 87e8a877b472435aec0687a4892b79b07684ba480218daa2fe12834f6211d5dce8db48d07b6054354df087c4fd11b9d4157e6c37241bf23278d415bfdfa8ab62 SHA512 f8d22a5a0e17cf665261e1cb38d773005bd52097a11c75682ee4320c2fd44326fa2c0b7b72751e474230b109629d1886227d2131cb5fe1f021c5aa4c5a33defc
+DIST annotate-snippets-0.11.5.crate 34687 BLAKE2B 56145ab821d64a980b7a7d1e89649ae8a4bb63f688ed9df750d4efc72e69e34a53148d786fdbaf05532fb7061de8ca802e269f0c51557f1a14a926820321d0f1 SHA512 c23c33244118958653b69d7b5b34eaf67a1866e15b79c7eae9c438b246fd840a2447638413fffed1ab61a10d16c2f9982a8f5e5afdf8c2a84a135596566e8a8f
 DIST anstream-0.6.15.crate 29231 BLAKE2B cc4cf0f381c210fecc20b5796fe872b533419e5f957021b0c3be3cdc23fb84ce029fbef6f9b6f174a76ad713c07f0811145a70572de7c24cfab060fdd990f49a SHA512 1cb01a0293b4c9bcc010909707e71c464416d3ec6fc9789060b7aa9fe4cc04424fefa8013cc8765ccdae6dfd9a1c50a11f7b30b39a32c4aeaf525f28167ddb92
 DIST anstream-0.6.18.crate 29681 BLAKE2B b6f72cda084b38f1e1cfe60de2562e8d62ebbc352176bdf668a2d6be09349bec46d291cd475e8af814ce66def44d95cb98c325761150130752284a82d8a84f21 SHA512 5149977d6f7b5e9cf6350f1ef130caa3ff46c7e78976358452a185ce196cdd77fee48a3a9838f434ae6ea9c15b19f6bfbab156edf819f81179d6774318f08963
 DIST anstyle-1.0.10.crate 15725 BLAKE2B 36e656bd8f9c584f11fda5cfe0c2e24e8426b9e1b602aad34ed118ae6950a55440e292d2e0ff7615f5e4f466fd06f07536be198a59506a587d40cb0c4ede4f80 SHA512 621e7a89fad13db985f07375d316cf8efba57fd44ae18628a8049a65aefbaef27949f99317872e91e0922bb089a00234055199ea3167f80ae03d00ada4f75dea
@@ -16,6 +17,7 @@ DIST anstyle-wincon-3.0.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c5
 DIST anstyle-wincon-3.0.6.crate 12271 BLAKE2B d9f4d9d46fa93a1168ca340562681718be852ffa94e30c9ea208af53af9d6697ca84921837a325ddc36681caab2b866b7f574901c80b5c0d862dcb765b81b68b SHA512 59ec6f5a53bd68b6344d82e923eb8c45ddac481dd0d270a7b452dc5b0540ee1656705697c1508942ecc131e7c075248c85d8f4159f27d97ea94f22469ce2eeb5
 DIST anyhow-1.0.86.crate 46741 BLAKE2B 21b1f3acd1c1b659e6e9a53693178de67c806d7dbad30dedea0fb7078b2388baa196d1e7240a7dc88ed9dc93ee4c00bca8e608dad1b6bfb5bfa4f4c5ab51f0d3 SHA512 3853da32a2c53d73969bb29a1e622f3a6d5832d8888dc6bc8eedb76394b392f983aa3fcb1f542933e238841486106f0f38e9a2400c12c7699baba0ebe1d8193a
 DIST anyhow-1.0.94.crate 51731 BLAKE2B 2b8b7ed7506f31a434ff8af198256816bb196f3434925ad688820237893b54b14f3731d34a3968277f532a3b67c39e3c4aaffef43b42b13bb1c6d3cae50e9ae8 SHA512 61209bb1a81104ea86375bff12e6654047a596fd5282fdaa590301c4bcdafcdd8bc83201811063d565bbfab6be42544e43047ec88d2b0b41f7c5f2712f3a3b90
+DIST anyhow-1.0.95.crate 52155 BLAKE2B fc9cebdfae0afed86f2dfb7faf62f5a108000895317dd0cab9c83d6e48c891558fc3a1d8b9940b623b4c6fd861631a0f0344a9915517a9bc39dbfbe48ec6b45b SHA512 8c5c176381c3e861c3c4451f7cd3d9e2447c0a55735ececfd3199288d65d36dc5fdc4a19a0798f62a0b9d6ca2c155a616c7eab8bcd53e6ece743aed57ec3d0fa
 DIST arc-swap-1.7.1.crate 68512 BLAKE2B 5ddeffd2ae8af4125a5b43d4a0a1afc7948533bf037d8cd3e47603c13b57b156618280d99b840bf318b25b6eb29400ad68499695e182acdc05bc5f621c42ee16 SHA512 070fa8dd17b380b6d7d72f6f45c84e591de9a9770b9662351e7a41af03798bf5e34d185a5fcb948f4d8ac5e210a33acd465c39eff6097662c2442b34ee3dbdff
 DIST arrayref-0.3.9.crate 9186 BLAKE2B 8d7443944c81bf849fbb8a4e09ee379134c173decc712c6fafe483fb1545fba1f7f735979e5e26976502284502b5c7046f0b6aad59f8731a4ac8e1a51929c979 SHA512 f97e33e7fd65a8e908c21ab918350f71f12d49783162b90c5618660217b36516c39750b292a1248125f12429e4e00af9ff20c3846be81175946b8541d96ee606
 DIST arrayvec-0.7.6.crate 31237 BLAKE2B b9d1df7e3ec47d434a2606fe9540e37e02351873b376a4e113b54461288e9ab20e02285eed5c4bc0f052ec4d6b3c804044413490ea706c31a852624b03bde7bb SHA512 b1f320746018a7f32340a833420089446ec5cefb7f299b4506eab7423d5db49f00b72d8aa8c6600f9159b9480d5eb3ce69407d93f5c9934147860c83e4d6eca8
@@ -25,11 +27,13 @@ DIST base16ct-0.2.0.crate 10240 BLAKE2B a8097674e84bb85fa72ea752d71446fc39e695fe
 DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9763070e269b56a14b150cbfc4b7f599d4c2a0a5f783638170ee132f0796fefb14fcac7fd73c58db0791007a SHA512 91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20
 DIST base64ct-1.6.0.crate 28870 BLAKE2B 60fbd9958f2519f293db2cd86add5160b51ff4f98718591b3e65d866e8bb176670ceecd5f6e365ff3ff488bf813860bf65d375a2159dd28b25e276e027303c4a SHA512 e3a267dce49257b6990d8d0842299d75b49a9af635082dfee25e314f5ab9067b339c877a4c7b012a1eaf9a84a7f8ddf0173c6f9d8695be81b8b4db03df66c92c
 DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf
+DIST bitflags-2.7.0.crate 45924 BLAKE2B d4266b77e4ee15d7083c8e8eebe1b050029e3f3d21029606d4e9d3c4fe03820b6d5ba2e1309f47cd6ca2a043b5d7e1b19dd991f3fbe97c4bb018aadb54c60818 SHA512 c97246c09551bf1b333850135d82c40650be4aa8df1ab55dc190d80ea8e950ebd122635fa7d82c43d477150e207acfc4e830b9fde41aaca1edbbe7c0a800c174
 DIST bitmaps-2.1.0.crate 16717 BLAKE2B 817045077c198a84d114f68474b14515309bf56abde29398fcb47d7593d41c3fac069825d8a2aa1a598dea5b4865b94a21e83d03dc8d069672e1b835bc1ad551 SHA512 a423ea009bf61629e6dd7cb954f2781dd3c578d2216cd843957e0db05abc8f8c5971d2cca1915929b2b3c7b712450c817bb1de8d08715a1ca2641ace015a1dc7
 DIST blake3-1.5.5.crate 181134 BLAKE2B 0195efa92e121dfa22abf56e72daef664f00c36eac9839543a4ea27351be6393d2edae6cfa2f9442a7b6e268bd2fbc76ea718d5d939940097b0e0f9e0c29405c SHA512 93dcfbb3e1236534beaeeedfde2aac7a13c83bdf9f0e85352e8920706df41fbf042fcfafd3726f2a23450d4ac77caa3fc7da3d26abb1477137dc00ad35f543c5
 DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb
 DIST bstr-1.10.0.crate 380426 BLAKE2B 19330a5a293430c09908d2174ff814351b16419f60de6463abf9b8a9dff06a4e6845e889d8047a710cef54842f2790d9cd5080b92cdcb113d89742b869979c74 SHA512 823abdbda9b13802facc7d6b1ed9ad809ed3b0b827d26e418348ffb8481b5f5735f129c5a9a8c7b2ab010d7f32ca57cba69a1ee10a64225c54c6ceacd22c05d2
 DIST bstr-1.11.0.crate 380721 BLAKE2B f0fac00b83cab351f8b7e02cfd20a2aaf04de853878b8c1a667159ea444093eb3fdebe4bd893e9b3723070fb4b1d2646b7c560987b640bf3f5a4923fe9accf72 SHA512 e4534db9f27184134264dfb16ffc79b7d2374e79ef50400cee4cf44c1e9d7d0b9f7ab8fa034493b5a1ef835c797214bfb399ae95d4b670b3283180fded414ba9
+DIST bstr-1.11.3.crate 351536 BLAKE2B 72a4fcc236942d121f76f42135c332fda2b1ad778d993ee69855c4eb6f909c91491fe6aa68daa0e2d602aea1bce61b1fcf03d03787f84ebb4d63b2bd3f4295fd SHA512 f1082ac8f121c6f9eab4b41c5f60aafe4623696c9f800f9d59f6726efc74f86071910f7749fbcdc8f1c20c83416d58f3ff507978775f602e18ae3d1bb027944d
 DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
 DIST bytes-1.7.1.crate 63623 BLAKE2B c399f7f25b85ac284bd2f139d895838eeba7deb56d109c8579966be4b8a7a56bbc26f9387bd0bef9fe5449d5e2ae8d11b254a7ef93048a4827d945ddddb5ce09 SHA512 04cb5bb1718ee378be1d9d56aef2d117ed561935ddadd78139ef2839f998e92c88369c79560bce9d23246a3ebda1dc888af373f9ad4827a0b9a249379bc71e81
@@ -37,33 +41,46 @@ DIST bytes-1.9.0.crate 67320 BLAKE2B d5a89fc1dced217bd78c6c50d0494308b69b0841506
 DIST bytesize-1.3.0.crate 10164 BLAKE2B 049f292705082dbd3b2f0abb6f153023613107949f4849154aadce2181f4568ea1b3c12f00b6ad56146f8a4f3b07b7025498e0c989ac6561ac7255720b85ffab SHA512 c718af51b0da2979b70142012544fde6bbf8639cd4fde66a8066b138f7f58dce019209e27566027dc0ec5a7fc1d2ee17b9b6366cc7a5f95a6419e29a0ffedab5
 DIST cargo-0.82.0.crate 2613931 BLAKE2B 2dcad04f09fc58f0e2f1e0e7394e2f03854c58bce574bf735f17013cf10723c22bafc29b2c78f59a2f087e79f7bc026e684b34a063dab505ffc38a43825b41a2 SHA512 ad7a8d42da6cd8934c699dd66a72aae756306ef16f526e541298f763533512242fac720ce43e73a083011c20cf207ba25d473852ff46d3bc43c8bf58c4541517
 DIST cargo-0.84.0.crate 2682194 BLAKE2B ee729be81bf872408f390fd5a16ee6a38181b1b05a901191add0ae8348824d7df3ff6952198c378ea2d0d6c91a0f1c31fa2e2c83ec2e493e89fe3485053f9930 SHA512 3816ed108202a5713e7327e1028476dfdee903ff83ab56bb44b4a699ee4bede3da81ab46451d97d475ae75cbc934961b2b6872aaf8c446baeb4b373013872362
+DIST cargo-0.85.0.crate 2697079 BLAKE2B 3e04a38dbf37316f622f5a23e32b379f89b58934127a5e71aabfaae7e066afd6b97fc882ad05806facd80d0e19b923e2fe871c05a6d589e68deb93e6f75fd29f SHA512 983e14c67ac9291fc4087e7537b0c911a1f1221b7f4decd4c93637e40a4a52e0506b139cba8d8d07b2f3f2dc2544b27fcd819d6d306c9ad034161550e7c8b517
 DIST cargo-c-0.10.4.tar.gz 32474 BLAKE2B a6c40cb734d7e6a0c49bcfd16c82d146e94f93dd6804c7679bc8f9422db33d5f08ce708986468c3a24b8f21dc6a02111c342141363eeba1d1fe90917e42f7af6 SHA512 8ffa9855bc1b005c3f7be1230ce3742a443a9cf9b819fc4116317434014d901785e2d6dba236be02b64dd25b8881e6e585f3ca70d65cb77f37dc7e67f81db7cc
 DIST cargo-c-0.10.7.tar.gz 35156 BLAKE2B 3ba9e4a09c7c405dddc2242bded0a68358367a18431daabd261f83c8b8de7987f03513c08121aff34f3928acf4cf005c3a7904b9c921c8353d6c02a867387356 SHA512 df784a98467c5028b9a5b7f6bc0d24a8476f4fec69e2b0cdbd4a1976a6178be5329260207f0e5312f6266139d0d8f1f2fd57b642bea1f58b47eff7ae35f5da44
+DIST cargo-c-0.10.8.tar.gz 35203 BLAKE2B 9e87fa7c8c9bd4e7bb7e5eba0f90d40fc2246f5318ad598ab736f77b77f6381006190e3dc4a181ee328c7354c1cbb24dfd287c531cdf8d70a025eda5d5db19a3 SHA512 a44ebc356c3cd842a44158200e7da59bf73f4f0bf230eb82eca92990337b8c9cf18d0272a0d4c42f4fb4e0a207ae68fe7a7e49b4e9a63184fe7f9dee540bddb8
 DIST cargo-credential-0.4.6.crate 19657 BLAKE2B 181f1544862bc7bb8ca9242d3e69a6eb0d107a73ef1299bf1ff17a62b87504339a9c16ef7b05ae1b4efb0f59762444d800a94e7378206cf7bd2e42247f894dbd SHA512 94da79bdea9389b39945e4cf753badafad5f63d845100d8587ad89a803540c4a52bb7ac93ffdd4ed848e3d36b96078a72a299d97a36ad2acbecf3a752648c86a
 DIST cargo-credential-0.4.7.crate 19739 BLAKE2B 3318a4a4fca815ffb1991d6c39d5877035aedb488556a7b30b40d164dd18236e527d96a53b9d71eec9fcb61742f4a25354188ef52b86b138bf3cf0b8af152ea1 SHA512 11e55d31a9c6931e6b2ea7155eaccd2cec16e8d4d8ac8f2c1058a3d6c6aa0876e2d3b39a6535146dfa77857b786f03a75059a5239d5f47d12530afb9899a3e3a
+DIST cargo-credential-0.4.8.crate 19781 BLAKE2B 92e760ed5e469cbfba6a1263e9fbfcca42d4f1425342854e8f8e7d891bc56501fc05d017f81b432bcd066483e9fd26747fca5114b6ea73eac4612cb6c0dbff2e SHA512 a9c87e625aedc1141810cdb4b5792383d9ded0b824a71025fbb8e9bcb3451e5fb6684ed4c98ef9dbcd760c0522c458f03a6bac42e744d8b94c528b299bbf3aa1
+DIST cargo-credential-libsecret-0.4.10.crate 7476 BLAKE2B 56b0b53e87acd25d662151f76b5e8258478514aa6e1043819bf15a4519a6ad1c816935900d18e88faee253f3f2dc8f07622378f0027da22ffb156ec9a407e5cc SHA512 6c18514a89f5844155f2b19031595bb4010bdf217500d907e381a100e1f8f34bfce1ceec586d14ab3142df46dfc80aa51bc870f5e3e1f64da72254d31d4acc23
 DIST cargo-credential-libsecret-0.4.7.crate 7327 BLAKE2B 9799b83281cb2569ee6dc1359917518a7b11936e2081d945da968fd0ae01a455fad42f5d5bda6e6d52e09bf6ce700b22ee1e2db8b8e76126aa905f157ab5b81b SHA512 1dac378f8c91b0e3b2b5fa18e16962816991e7b8aec4cdd53f770711a5dff7c1a7ce741cdc364305942759609f3d56373fbbbc97c671d05a24f94b4c0f67e8a9
 DIST cargo-credential-libsecret-0.4.9.crate 7455 BLAKE2B 71aee845a23b9c2eeaaab4d6fe2342d5d369c564884e312defcdf40d125dc6e4c06b7b2144b9d0e8142703a2307ff93c36f52d9e6f6fce690851f4b0144313fa SHA512 11834c213e2ef302cb67ec0ca3ba2de774d36de35ae7397d023e8378167c13e52e7f5fca25803a6fc96791de00d4728c78bd90d12968d30a2b2eb886a890abe5
+DIST cargo-credential-macos-keychain-0.4.10.crate 6739 BLAKE2B ea338a53e60f727cf52866b9f452f2e543d8a08ce9e5ccfcfd03edaaaab4f9030b61704d5474882a71f7c12f5b1d664959253d98468e73ee2dbe731f45523e93 SHA512 6cbd92bafa322ea2b790c48b64084d70eb3907e23dceb6e03eb6039febf56484f1581527762fe3b12547adffc6ace96ea15ef48376bc49d8e87de1b428bc5d9a
 DIST cargo-credential-macos-keychain-0.4.7.crate 6588 BLAKE2B e5efb4b81bfec15de1260950dec9f85d5a52af7c727aae76f27154a45937105d897efe0507e537a9d70b3d65c9b9fb78c3ac50f24a32c4cfc0ec231b4cce0d26 SHA512 804c5aa563ad4a974cc97ede6889186b3796f54e7857529b31324b2847dc2536bc386399bf4c2db60c30d19d038ee79025e77a118a45505dd491fb211d31991d
 DIST cargo-credential-macos-keychain-0.4.9.crate 6724 BLAKE2B 7f0f88872a70362088e308d0a99572f85e1ddb654e35ca48507733fecb87b8fb742055635823a8866051b2c812a64b0887737056813bca48cde0e47bf7505c36 SHA512 d6c75480b8a269cdd059cbef327b073aeb22904893bcc4b4b228c0a7e891fddf726d5ecbcdd0123bd87067d9a4dd08af9825bb59425de2ab951f4ec0903bdb82
+DIST cargo-credential-wincred-0.4.10.crate 7239 BLAKE2B 521bcf759df1b6701b50a4c563f3d4f32c7942b9df26c83c6753799ea1fe04d3028328fb6222c6a3aad66df7a84538b483b9741a6b1618052c01e3ba16854147 SHA512 16bc590a55b3888b3e735cd09c9cced0a316dd277139d5dfd4fdb3972f5883a188f0db1c2a52c3896a743622db219852855a7423ead8862839bdb9ff62b7d05d
 DIST cargo-credential-wincred-0.4.7.crate 7084 BLAKE2B a14f4ba6352a343b04d532b5626c3663d9a9dc21f0423ee3e1b743eed2a7e416b1bf942130c9d9ad71ea9ac50655d929e90d369e73e33144fe03fb4eed417fa9 SHA512 aaffe57c987aaceed1b2114b27f33155ca655ef300d55af4584261ea5573a237fc15c44348b11922ba73eeb93f5aadb99e92079cbd2117f70a82273a1a1adcad
 DIST cargo-credential-wincred-0.4.9.crate 7222 BLAKE2B b07221eeb91977520d044163bcb751ad19668991c5e9c344af27b1108379220c42dd0f9670e13706cf1cde62bb39da3d02f083d6b3a9c9a5ef9c67b3e57365a5 SHA512 bfeff840e4ac34e187d42ed4e0daabc021f70917edad4143e08de56a5e87f439b93512f33e2b4ccd24ede22d43fa00765c7a6fe8e65195390bcf9af60ec46dcc
 DIST cargo-platform-0.1.8.crate 11813 BLAKE2B b074b49e08b2b93e93e08276f2a79546fe1f9ba0a52b3b4ef0ecdd28fa3fe5e842c0291fed158a1a12b90804e0172d5419b7603fd0d5f87f062f44dcaf3428f6 SHA512 187acf1b8cc81078ede3353997bec9010df32aba82f56f9479d4c8eaa13436590a16f3ab6ea11ed2b31d1d1d2299d824d9ad10f04bf5281c92372cc8334b0dd2
 DIST cargo-platform-0.1.9.crate 12010 BLAKE2B e178d5a444c6536f0c95f497bdfbb13cadd0d58d55bfae76008bcadc2a042044f432a232f657cb1fdc91b7af4d197cc44bc0cd7a41c9cca6c5da085409ab49d1 SHA512 05cf4c18ed6f3a1193a4567a48f1f3c832ae85faa7487a4e087e5dd8499eabd36c862d8e58af5443933b87aa8becc258011ebbecb2247f8a75067c8ac018676a
 DIST cargo-util-0.2.14.crate 26835 BLAKE2B 690a17097f1aa8c241a48226f94d5952d8ea4158278e28ad743496e71ab0d0c0e9f1037cde20e88cefa0af1f621526fc9d6f1964333e3588ebf8f712284783a3 SHA512 9e700b296548b4b8566d6686da1d695fd2ee55168ee6c9ed6ab03edb81c9b494b6b28486ee50dd4b417e7605584cab5797e23e5b2f976c3b32d13e4dedd24a02
 DIST cargo-util-0.2.16.crate 26994 BLAKE2B 52656ad3fe6aa186ffaa058a45477c4d75caa8c527aecfb87828c11d6d06c3b90c58c4768dd809a2f9d6b7aff737bed1c579b692dcc3dd1e9b7b37a86147b8b7 SHA512 67ee1e06920bf859378370e8c7e751e57eef10dccf9ef30ec6a7e3a58e178b72b074b6230ca4085337b59cbc90ae95441779b88b3f1b45587a1e96ca9cfbe85d
+DIST cargo-util-0.2.17.crate 27288 BLAKE2B 373bcdce5e5e917c7494c68868bf46f550951e1671a0f6cca2bad00e035abaafb91e3039572c6074a28abf0ab304f74cc95580d2b3cf3bf0df220223b349bf63 SHA512 c553a36bcf8f3f802a15daf3ebdf4b1851fd6633f16f20c50804064485fa16d47751626ed757cee814f1d42e3ed7fd3c1802d3e77d89021c98c9446ea51fd6d6
 DIST cargo-util-schemas-0.5.0.crate 25773 BLAKE2B b8322692ca2be9cbbcd1b3ec561a446938e3aae6b0bb3be9b336e9f49d0284e5ee26b849061e0933b536ecea1c627a18fc1c20a4960faa4fee1696285963ed38 SHA512 c05b891943d6674a6fe5ffbe26171a99db64d570d383dbe77ff36684db371e5697b201f9c05a99967d8609778bf62cae615d2659841db0ad82ca132331b83a1d
 DIST cargo-util-schemas-0.7.0.crate 26449 BLAKE2B cf7127f6322c2c05c47149b0ce14199c94e72a8e35a1b1dd11bde27418981fbe7456e14fe02a5932a7b060283c703440780fbb9172e3eed1ff1cdde10e2a791c SHA512 3562139e65bf7101a76aec25687ae8a45ee02b527cb39378f698293fd88e52c0dae2c1eb1dbef8c81e2b3d5ad558793150d211ea38a61864a4ba5f78cc4ead45
+DIST cargo-util-schemas-0.7.1.crate 30245 BLAKE2B 0b167458f17d24a141623d2f8e1d31fdc1a8832f5c9559b41650da3520d39906400ae09f2c8da702b763c8e6a0afaaa8d8f22b5e41d980f00e86a32fe26de6ce SHA512 5f0c8b634eb85de2f8623e5ae48642c198400f4fe41bb38bc466b2fada05c382476ac5761986f58dc9284fae0195f42b7e9447dec28293db2b1a2b1fce8ce59d
 DIST cbindgen-0.27.0.crate 215957 BLAKE2B 4b88f19edd9ac6b862237e4db25e6e6cf989fc1bfaa88c7543b2c687b1c6ca77d2e09e7ac8ef69a960afeb534be37a98c0c62057c1057bfa31191d3e265a80df SHA512 557fe877f95d52feeb9b3bfe427a1b365e8acb3f87a17263917e1fd9b72fef9e8db1b465564c9f213db0d784ec332a27c96ba223ec53ea584fadade1932930b7
 DIST cc-1.1.16.crate 83180 BLAKE2B ece068be561b8000ae82d77d084d34db2be8db6af2fb86fd2cdf25e7c313d4905c093d604aeed53d9268a927a4236a7a4c1d54c06721683b43f00835be93f798 SHA512 0f53ea7363e2e225b7c61339b217adee84f17d9b04123c4492ed2cf722fa0fa3308ca5b8ddcb249785772926d70aafb2eb793ce4abdcf9482b87c0667a5fe8c3
 DIST cc-1.2.3.crate 99421 BLAKE2B b5702d1dcd0d90d1fe27f6ac8e7c04f30ea8edcccd1bad4bd31f12ce4d0b1de70cddb2d6e71ed3c3f984ab76b9af47059ba9639af26f84631eaaf1435d6d6fcb SHA512 b3f3e8bcb7daa2b09da4bc6c35279e020d8e1b506adf322ba37d2b0e875d22dfa9c662406223db6e465c70ac816956e5820f162bdcaeabcf38e54c84ed158efc
+DIST cc-1.2.8.crate 100790 BLAKE2B 15f707b72adc1a6598d5a88df4346223e0efa863d4798c648daff3606adafcae9cc51109eaee197ebd33e8583167c00d18564c50159e0b393e7b7938b928b0aa SHA512 2566ae63afe078e4ed598cfe81d6a37af958c3f96c9689c8c94f873e42115c1cc0b02bf52437905fcfe8ee058a789b864b9959cd105348b7fa907e21db93f068
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-4.5.17.crate 56802 BLAKE2B fcdd23d66ecd27ee3820c4abe681bc997dd6cfd69948e11603aa8c4ca39513d5de901373959328986ef81c046318f240ea87a2f19b38921faf76b6c93d0e4f67 SHA512 69f0fe213007a2e0a564945bf58794b891a345c34747e92ec16877253ff60c1a30fab24031b5f56d6e31ea7b0d8c9dc0c815fd1489b2c0df1e2d24b4a2be6406
 DIST clap-4.5.23.crate 56460 BLAKE2B 5c0ff6ecc072368022b8dc08703d87802160817e40228fccbf9cbdc15d86dfaf0eec141dec4e8f1327e5a6d1622df9b334e94797027372dbe8765a12b918961e SHA512 4a8ef8731c9768844debcd1ba83a79a607fd32d9fbfe7411abefb8939c5c442e8a206738bb54dddd136117d3992f519ffd1640694ad7796c4e0aae3f95502c7c
+DIST clap-4.5.26.crate 56474 BLAKE2B 986e620055ea5c8546162793958ac147f309df76058b49862e15517b1f060f986e631da5816fc7cd22563f1699a57b5d377622974606c96c454d74d8ba72a07c SHA512 ff41bbc3432504eb80dcd95091aa21f00716337a4e271822d9d0e8f244e01583fdcfb890f6eef908ad3cebe7e2597802d09ba26f9cb7b8c325f616ec4ff6d1f9
 DIST clap_builder-4.5.17.crate 163559 BLAKE2B 10731513f76c64027116ec97aa7dcbfbff74e649c64bd32db1a14ed1ec00e81a3b7c8e3ca478e5f077fa49eae9ae48dca4810190924b9af5dccea9cb0f883b5d SHA512 86411378aefae1eeec1128d797a21697d9470fad7ba2e109e00e8ae20d4da218e909d56a2f7065a4b2651d6c5d76d14a7394d747b2a4313c739abe0c9b046492
 DIST clap_builder-4.5.23.crate 164180 BLAKE2B 90948ac5e8ea620be3e1ec1334677b0ae9dc227a00354fcd3d78e2cf23a1c101e009e6cc96fc19c0a2395e1b9ac6272fd9615abc1acf1a5d60392e337cfc961b SHA512 0889876990f0a361cc6b6d41f2a8f4b1decd376987a02fe69888455c92f3e583d6ff70880c6f0ea154ba62f4be7d2e7b18cdc4e0e2f243e6b17f250c3e8d1c2a
+DIST clap_builder-4.5.26.crate 167961 BLAKE2B 4cdb5b3d356a2631e86c9130389e6773d061d0842997233ab470c4c0853a966eb8c40e36574fa9708f7d052901bfc267579a26175e6e2da2c74552bb377ccde9 SHA512 474cb2e9b9732c353ba0b1a5fda60332903296fc50019481ccc881680b30602ca545cf36116374a6b15f6e40574b8631aa682becf6a1707ccd42d18e34a68a29
 DIST clap_complete-4.5.38.crate 47669 BLAKE2B 4cb85c4605460a657abfed6f47da0582bdc7d5f99bd2e801a4263390dd2816319a00d091597bb62699a6f351e693d96062130acd3d06c26695779acadbd11f4f SHA512 a0d40df8eaf56a0688557b517d84a676c86c5b080aae118375201d2196ad3230540f5f8f728f1e3dfbd0c5c95ecdc7b75188959bc6b44743859aee00f85abd77
+DIST clap_complete-4.5.42.crate 47897 BLAKE2B ef0eec7a432a53dd41306d0d0eaf515467286768eecc3b80074d4c89752b25bac3d1abb7320014bb61a8624d65b2c4a73b0c34f6febf3a63c96d1a7a09e4b716 SHA512 b7cfdae8ff3a2f3cf47646812dad297ce90fc1fe309b2da63afa2017b8b299f35af704c87f5bfabd959abb0ade9d29d1243658370cf9f97eac93b5659a50617e
 DIST clap_derive-4.5.13.crate 30132 BLAKE2B d5fcd2c5a213817165c61ba2071fc6424ce822e4881686556b8379fc71188f60d8c6712f6f4a8e5c8b125b58d7454aa9846214caf324fbc93300abba240bea17 SHA512 2dae32bffd91de9311d94e2be0d990074cb2e2edc832f422cd5e7c5177f5daafc0c335e74f865024c77cae5fff631ddaba58028fcfc24b203467478fd473bbf5
 DIST clap_derive-4.5.18.crate 30131 BLAKE2B ff962e52d8d8afcc9639365e27753c6c6943fd809ef89d9e555e8be5b2f13efa650bf1f9ae451f4c127c1529a0af1d892c3b02153b46deb912029b45983e01cb SHA512 035bb918bc7e9badd59341560f23e3a8a2e7cf945b6d8183f74052c4edfcbecf07c9ea6fce0ceef0b84c89a99d62b11760af39398897e4ee7dad0170a96cfefa
+DIST clap_derive-4.5.24.crate 30669 BLAKE2B bc9be1776010a469c19624dc29241ba8d03380697ceade17bf36477c6635603551e4ea36fce7cb338fd2ae831b5fcf35773ddcc1646aed195b5ec874a43232c3 SHA512 83c4cd37b5a11ee4e4015d5d2dcbe1f32d26f77942a94f8fe70c8c0954f851156fca4ce414045e2241421711b00bd7ff553dcf4e2c9ec0ca28f3d69d04434123
 DIST clap_lex-0.7.2.crate 12805 BLAKE2B 952bf3f3885ae7bedd0e8add236590da5fce72a7ccd88ebda063410aef337ce7ccdb5e5e929cb870bc993891610edc0197150a3aa82a62fadc4bbfd96324fcdf SHA512 a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380
 DIST clap_lex-0.7.4.crate 12858 BLAKE2B a5ecd50cc503157dd69746f3b6e9c288e0fe4f6d5d82271499f657134fd401fbe076255e2be6a23ed0b69daf3941c6429dad8b288223b0ad390a2c435575cdd1 SHA512 a2566868f4619679d3b74b70592ffa6a04b13e38e3196c56bb1dae8bea0c711bddbccd778d2aba3cc0ee074c9b1cc0335222818f0d47fb3cc8109cbc35bb992e
 DIST clru-0.6.2.crate 16497 BLAKE2B f77d90984f8b030c43380cc8fd80cfde916f8f9fc4b288a340e9c00f0fe177b2918734c7948ab4bc8fd01abf7864488c76e7744c5974ba23f79fcd1b23b6814c SHA512 6dabdbc4b956fffed9c362b6f33b71625ba62651b0820dcc78b61319d981513d479b453906604de173110bcd9a7441451ef10cb0978e5e587cd0df23fec2c4bc
@@ -82,14 +99,19 @@ DIST cpufeatures-0.2.13.crate 12999 BLAKE2B 4c49e01e91fff33c61bfae48a07a9d76a695
 DIST cpufeatures-0.2.16.crate 13405 BLAKE2B 06d061cb2577057bd2afbc8cd6783488595701dbc46772533645d86aed71ba8b20905625b897840c90aaebb41360a286935824ca49bdebc0763a81df4bd64402 SHA512 97707ae1b533ecd3a6fe412a22fb70cf4ac278c2d7dba407fa7dbebd110d06f88a7b3aee3fb7cf4b0b5ca88f6fecf390c4d3e5ccbd4d18a75fc2f93a647e7074
 DIST crates-io-0.40.4.crate 10560 BLAKE2B a65cda422ee4ea5ba616a845c93ee1a9e4b473f03531699c98b1f76840ea0462fbde6bd5649f845c3194095ed38aed4a3299d74dc12904f61bdbfb7280b41950 SHA512 05ea980bf7ce05fee485e179a916d91b2c7e83924c992cff03480a93ad99a3d33616a883bb7206e22c3e5e4cd9928b7021d020f9f9c5d6b138b1935d54cd7f75
 DIST crates-io-0.40.6.crate 10683 BLAKE2B 9fc7d2bb9749804987d1ccb04b01f0902bc31bc6c3119e0f6f4001ae8851ef267d69faf60e6ae8d832ec4e51ecc896924da9c0c9cb5a3e219e07bedcb0e91426 SHA512 f277e12b615cfb9772736d9d48afaeafb8886b2f85027b3d18479708260d1bcb0df0b486ade165a8b2b42e800673b17600754f732632da74d28a2d2f2d7d1bd9
+DIST crates-io-0.40.7.crate 10702 BLAKE2B b0785b76a02bfba6e728037c8317ff24760fa0bf1aa53a32a2556335bd31a3e33bb6c5f983e451e933a8def98f0e8fb6054287707324a767dc60dbf7076d994f SHA512 225650568b8214f1c1cab2289a96c284417d71ddeddf2ee3e8230410cb7fc191cb6cd2f77e0cca4f46998958bd32061eb3a0f03994fdcfafebacef7a64146bbf
 DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd SHA512 c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266
 DIST crossbeam-channel-0.5.13.crate 91174 BLAKE2B 7a9aed6f4922c1d10e4ae12508a03dc7daca773adad6a317c4ea38e544d7c28c56a06623d958aec540fcaa86fa9051a1aaa2c859dadff72873f18f2f3a951449 SHA512 0f31223a7099f84e39e6b76b19cf26736e0c3907fffc2ed3eb0012c7984b1993570bf6d155eba5bfb82897ef0e4fc93b89096071410bbac256ca6be9a9568ff8
+DIST crossbeam-channel-0.5.14.crate 92728 BLAKE2B 0da1bb0f0dc6f35c4ce8d4bb058d61b7c3ff4854f71b58968edc691c1d7016ec845f27e2fffa34835e86f19fdf4507275b013946b2fe3135dfa83d328ecb5199 SHA512 ab3448f7adeccab3c1d988746c3db1fc1e8854a53f7b5cad63fb7874e5b6f5663d34541d4c5383472db56a7c8b272fddfc78ea2ac1792a18d6c8230dfbabad45
 DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864
+DIST crossbeam-deque-0.8.6.crate 22471 BLAKE2B 02b854df171b0430ca8a40349674ff251698d0c322c317055da8678da6661730c945d86737fa4947c3bd824ffe402271ee2f77fd6a505d2d46b4a41454c510c8 SHA512 9368c0c224c4b84356f1d422d8869a5ab4bfb36b0ff69244a9e7a7304ed51f034001cd9b2bc35849df874d36ed34285c66574943573522ea32bbdc5a05df6989
 DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2
 DIST crossbeam-utils-0.8.20.crate 42487 BLAKE2B b50da06721cfbfff07825574feada8a28d3814edb218434288683eec31bddabe2ffbf7e5ef1281ee14a8a77c56db3b66f3c5ceabaea9c72317c1bd2cecda0c26 SHA512 7175eadf9fa7c526fa11ff87e40ff203f0e7a4bcec15cb972f924f3c7ff7cc20b6e2e8dbbc1ede142a0207cd2baa4f446deb25d825d28a54cbd25c263701bfaa
+DIST crossbeam-utils-0.8.21.crate 42691 BLAKE2B cd9015c41f532eb3c90101603f32d383f01e6880718b727d6d1fe46872ae276cda685e1b548cf77dd22bb1a05f0d4c4982332c2bde90e1743dbd7f51919022a7 SHA512 6f4aa7ca10c20da291c4714b56ceb1fab1c06b03b2f4e28e474e9aeb95ab6615a25462dc7819713652c3b5f6a06fa0f24ebc92c533fcf35dfcf2655857d975f8
 DIST crypto-bigint-0.5.5.crate 83384 BLAKE2B f688f22331b4b3620299ae9b50aa9ba6e1b2c7a4ae55e4236f7ccb8ddee4f61950ee0332b6b67005bad505434f3be74b1a0caa426036dde94162289c6926c8d4 SHA512 04668d432b4169154934d55b8ab14f708e59f70a70704b56cd72ceaca460e15589965aa92a22bef20b32ce637a423cc6e1a8819dfba38a32353bd749f7126021
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
 DIST ct-codecs-1.1.2.crate 5451 BLAKE2B ccfafeee9aeddc0133631d30b84826d68286e0387c57c9a99efdde58437144f20d56b82aeba08466f4fa354d8ab37194368718aa5b7dca4499317e974a6caefb SHA512 3ae3f5a321231387d5fc29d0ad9de2d768b2dea8c5de08ffc26752b972d5319e2428fe6578e78bd36bec3f25a4753975a0f36fee9cc371da20f54a862eeea924
+DIST ct-codecs-1.1.3.crate 5497 BLAKE2B e3e5a6dff9a1dece191fd32c149d6fe68ed1292a8d47e5a5bd93de8641c5e51b072d80e99536077e785e4ea49a766215a79dbb1d9f0b6dabe31bc51af3dfc0d3 SHA512 6173b771e79d9194dd49a2158804d73eff6f13cd75b7a3207adb52f7e414d7ea5827b88e1f808c089b51dd6bf607fbf09e6e62109c1940756b0dcdade3a6ab25
 DIST curl-0.4.46.crate 94864 BLAKE2B bcfc97c19ce299abd3e8a9769a30c0ec5dc6692b5c1d81423f47aeea39066d1840ca7ec1d4713132519f3bea94d43aebd8d733a19028280e2e6c2a8e91eb1948 SHA512 c08f857b385582ba635a76744c940017b74c3f241d28cc7c8c6eeff958c76c01a1a51df41b3a7a6a9a38a31f8cf5b9b3b639eaa163c441fdec29d0b3f14c8336
 DIST curl-0.4.47.crate 97185 BLAKE2B 5dc909fa872bb1b7f94ec965491cb0229039b5d196cb16e7b3e88438a53371ad8fc93b4a3a116248f8776ec726946f7e5ce551da4f45375017c9898f636e5b0f SHA512 d74601c1dd34d4846e1d275c0b72b0a8a72505b97eec9d721288b47dc65f0533e57fc36113815edb7cbc8c0e7c909ddfacb9607004a7f3167adacc06237e1d84
 DIST curl-sys-0.4.74+curl-8.9.0.crate 1786932 BLAKE2B 47244310d60a9e8ed51ce7acddfa6f3895e199277a3400211b77088382804255a7858b4a4b3d30dc3c54622f514cdff76b539f11dd07d26fbbc8829c1a279266 SHA512 125e01702a85f33a9157d67930c92cd8af619d098c5ca98d820ed308d7931f851c395a278f54f57a243b8ae33305292c15ce9d6397b7e3726c6eefe90d3577f6
@@ -115,6 +137,7 @@ DIST fallible-streaming-iterator-0.1.9.crate 9249 BLAKE2B cc4459b34a9ad00552a524
 DIST faster-hex-0.9.0.crate 13053 BLAKE2B 36e07a1b08544f273b30b6c8b79eb97bb0e97efc29c570f59fbe9fb4c818dfc0cbd9f42ccd4e196845c5d1f39db1a49cf61d1931ea5c1f761da2b0da49b03430 SHA512 7713b0929ffe5596823d001a83a40fe1c4c500b7cc4218921ebb65f69826a9a9fd6e7b948fbd093cb921bea52e9f2cf3285c9d1d11f2a321dcfba0fb3c9aa5d9
 DIST fastrand-2.1.1.crate 14983 BLAKE2B a4535b1612b103376fe64d71a393f7bfc37668c574d9122ca90a631aeb91cf0895bb030e597b79a80a4a37ea4d514c4c0836332030bb10a60bd971573a6d6ee0 SHA512 9a51185132c1c89fc31af463c664e996f431e607ce96676b8301f28ff11a99661d18025dd460e3332e373af68d20017d96481719746fc3c5de742d08d63aba3e
 DIST fastrand-2.2.0.crate 15031 BLAKE2B f3fe05ed1acfda1fbca7ebe3da2b26d05a35ab782db693ca58737dad537c53d16142422a04d2d55a6f9fa9a76abe4454923d85f6948601394f39cea5c90e835d SHA512 de2835aee8d5380a6e1c0f627a876594626e1379f2f7dbd3ad0f785d7c3f3f82162c9c20a68417324506f78264cb9dbcfb2d4d5dc9ca666996150979738822e4
+DIST fastrand-2.3.0.crate 15076 BLAKE2B 15c9a1c4f64d94c4bfd38ae139c6fe19b6b621a495c1b57209edd6d76d978eaf018ba77f356b5086c3f462a6de044fb5e3b172fc288309569911a17ec39951bc SHA512 267fecbb7459c8840f03425733d278dd6c4e7637b85b99552877117ed5e8015e094d86aa95841f77064136b7f382276c3cb2c2bef7b2881d272f4aa57c5cf947
 DIST ff-0.13.0.crate 17688 BLAKE2B c32379ebfea6cadd162dc169e0b413577fd191620f4f2a1c7d18e50ddfbe561ca865bc3e0fee3be287f43f6c9f2982992cbc56629889689bcbbf652e512da80b SHA512 eab19938f5a2cddb0fcc78b0724efd788aab7f17f04c482e0d06acac4d1cef2bcbfc74d6e4b2d9f535f9c955bf39c2153e010bdd2fa72d6d637d44baf8bf5f63
 DIST fiat-crypto-0.2.9.crate 495390 BLAKE2B 9201d3faedab8c73b606dce70d65d1138f5fb29e480d56b25cd66a8d2a150fb6d946c9e0ca98eaab0227490cea288b4c78917ccfb6693022d70d74dee94e6e78 SHA512 d916fe8ba3e82a365d20485b93c36994363059dead84c0266b7bfa0bcc74122d71b4a5c8689226c0e1007e7e01fc6f6c76e8687ae14fcc38f6f159287810f510
 DIST filetime-0.2.25.crate 14940 BLAKE2B 1ffcbad3b2023ba5e9b2d71e279fd8c3564458b28290f3e19bf43b87083e1e3c0e18f191f6dc67540baccb83075df453950230089f243e6276e413321cceedc7 SHA512 90b4f3c4df29a3456c393f78f636d70f2615cba748a972dc9b937c2fcbbf4544f5b0d28c6c8fcfed5d5eda026ac670afffec18ab7d7127cee9afa2717146ccf2
@@ -122,6 +145,7 @@ DIST flate2-1.0.33.crate 108838 BLAKE2B 9fd23b3b0a75c29f750c873f74de8565f0d8f3a5
 DIST flate2-1.0.35.crate 109188 BLAKE2B 8bd6e51c3bcc06044e5b8d7ead950c3beab6c6337052fd48e86175f0fc98c8d12804274308ee515dc6156bbedb2277dfa2706cdcd7baaf2a789122473248486e SHA512 aa2c4f0ad46cfbc7d2bfbdffd226eaa37f5223a34d132d8fb2dfd04c20d15a96c4882cc377fd72afbc7d13e512f5e9934386b0390a0ab2b171d081335c58fad4
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST foldhash-0.1.3.crate 13712 BLAKE2B e5913d3aa493d0176af9650354d98870b7e97523ca743a7d9605da3f559463654f391e42438d96fc797397ced449f13ce499c20ed5db7aec772aae97c5f29175 SHA512 844d5b699db632254dfc378d46e34909637118647250e2382cbb88855f6739fb9b5f1b840bb8e250dc8fbd2a97c9155e5d8fd0c5c760b8e02dd0aecd96818a5b
+DIST foldhash-0.1.4.crate 13764 BLAKE2B 7dde82c52671b93d91b2ec9984c0ce539d89d5c80cb115c0db18cf72f84f4fbbe4f7b36b745143102fc83c307df2cae051e4fb461a3131f52c8f98172fc0e72b SHA512 096efd30917c42e75e162a79d5c0ef068af76c7b6206cef880c4a3af92d096b4b4a1cd3de5b66ddb040730d58678c9a651734517dc8a60a265ebddd5559b95c1
 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
@@ -130,8 +154,11 @@ DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384
 DIST git2-0.19.0.crate 215910 BLAKE2B e6dfbc292dd580dfe2b5964745d73c29ab4e43d91af37893eb2b915c7967d557940284c388b5693c8f366d98979cfb43f184627319799a359b2ec40c6d875a83 SHA512 9d868ba1594ace291002c4a10dcd43f192dbb8c2070abd74883e57a7f53825c7a29080ecbe4279f6c7ee845c261bcbc93b10004b99df27de41cd29bd48e137e8
 DIST git2-curl-0.20.0.crate 9587 BLAKE2B 754dc742a2c68aea90b99905d112435fbf31dc1c14064e62dbc0002b01b8adf630b5a4965526b3a3dc634f873bb3f2fdaf01f8d2b639b71f58df686d814711a1 SHA512 06d704e8f5227418bd0b3379c0dd503d694b4071d00432a1ff7593815e5074e02272a3f4e003d0feb7e9e3e806abdf68a5224a0366124f6a83681a9295f58424
 DIST gix-0.64.0.crate 273610 BLAKE2B 0f9f006a8874cc1f8c04f538b9ab1ca8304e9f5c2a66e9708523ab00b0cf3969d345d9320e1bfea26709edb754f0820e1f971674952a3eef4f8714dc4e89fa1c SHA512 3a49ef2004c0ef9dc18ffc25cbb57d343ec1adf088b27f42a81e98ff3d29974aa5024adc324c591174a7fffb425479e1a37e193347748bec1a0f246d3b340836
+DIST gix-0.67.0.crate 286098 BLAKE2B 94c0df973c82dd0d6be4cd426578e9d40116ffd368064bf143b9fc4043db38c99c88c226c4b7cc2090f4f5365dc92016092a52ec677676563e7d33f3244f3eda SHA512 b4ee9da175aad356096ce5a556c175105fa8d2513946aac1a2a8113f3d9b0aa3feb62465344f16fb41039dbf4d98b918b5b904edf432fd2558d2b40f60eeab2b
 DIST gix-actor-0.31.5.crate 9335 BLAKE2B 9ee5d90bfbeb465aa42862f4b4badb3e562d5eb8fa464f129f769f2e53fca06585cb8c510fdc438bad12c05e8c30bed3a471bf1b5ee41144055b979b6ae5936e SHA512 ac1a24e789896d573c217ccadbaa8117bccd22961ad4abe598e5b1acc3aa5bea350a0b6def7f3bcd11ca6550a67f82906c854adad058dd584807b7758f7b837f
+DIST gix-actor-0.33.1.crate 10085 BLAKE2B 807e2d1a9f7c84c515838f0bde3942557bcf2fbeab11855e5b42c91f64be48efb8e1daa2e3f2abdf82476a5478b1fbf1c7ff0ca688851b841436f2e7919908f8 SHA512 cc852e6a4abbeab7059d83b175271c88a79528e039e4995145bacd50c26db143c27a9986b86309cb8824890c791ebf7b74d3275249e684c4b03fca725fb6f6ff
 DIST gix-attributes-0.22.5.crate 19163 BLAKE2B 0801150a9de71cbaf76ce96dcfb442f4c5f29595af9a21de8a8ceb5e0bd84d8eb3b93b56cf74fb9e136aabd0227286f79bcbb1caddf8280e723e243c172d3c30 SHA512 b72057a5e2d97d3600a18dd0005d25fd8a1bc254524833d76370efcae3cdb81721356db9ff60c6480d8584817653916295203aa2043ade3d1b049e42e0176c80
+DIST gix-attributes-0.23.1.crate 19861 BLAKE2B 489d9284d6ddacc1a4fcfe00db3f77287153f5d5ee976499819406252f5f1169d1a72c94c7cae5622387826cad18839c86a187c34f94daef7e2ad8a950bae12e SHA512 38aa6a589edbf7cbbc9fda9f1cf20ff0ee265c43152ef1f4653a1400bd62dd44e768f8e911f5b6a643b19db9805cd0d239433e78cf884b079fa3db639e4c8bda
 DIST gix-bitmap-0.2.11.crate 6920 BLAKE2B eebacb07d6150bc16d4068fb0d5d1646f78cac93ab6cc82b64f3fd9d4ec928f5e904a3ab2bb66f697df2ca51c17eb586d873bec73380e894b66f05b94b7ed690 SHA512 889e0195b9c16f6cafe6d66a7d18da1dcc5f3aaebeb63415665102d838bf702eabe142fcbbebc28f3b69372eec5f51a9dace3d333caa6f5fe8158df89eddc40b
 DIST gix-bitmap-0.2.13.crate 7689 BLAKE2B 966087f65e6a037155c4b75ddf6fd9374694df794acf003228b79946fcd0507ac6521cf0f6de16b2b84416188a7e235fc38b7d0b9ae7c77d6d5a1e167a372e23 SHA512 52b7f61f4ca51d31d127d62bff5fa07493f5bad4ec03d0db58cca3bb83f330c5eb67d93ddce0b8b710714afed9ef0869b9ad48ddafd20055c317236719d63f4d
 DIST gix-chunk-0.4.10.crate 10131 BLAKE2B 3dd2d7d0a2196ab8dca8575ec1c579e4b91b95d8a7a3cb6a78d78d4d31af7bc0059dcd195d5fc1a4978034647bba7115fbe6ce4eb7600199cda0207923a6a0a2 SHA512 1d1f80e1cf204e5107d17ba5f73bc446351ca868fc01d52eb950bc353415de3de01ed953eaeee40def1e0d1d704af4f164bb1f111f26b301f54c73d0d2e8e2b8
@@ -139,58 +166,94 @@ DIST gix-chunk-0.4.8.crate 9358 BLAKE2B 6034c836716906e7b8cf490c9f066ea6a995d384
 DIST gix-command-0.3.11.crate 11669 BLAKE2B 748c3fe00475638906aac4d873ed7dad05d6b65152c0ba45c8d9e788f5fb3855b115db71e0631734740b372bd5f759753b1ee1aa679ca998021d5b0375a54d71 SHA512 42d8503314100a4eb057f2f6dd1bd4f24d707a51d6aa85d6f46d7819227c3d8fff8afa0f8404f9c7478ca7335adc83769c076e14c8c2217e83c470fa2a1102a9
 DIST gix-command-0.3.9.crate 10938 BLAKE2B 0f771ad9f51d4203e54984e71e2c29e2ed13f3dc145dc9e157f8cf2f9db604a973932c1379fbfea9d1caa00498bfe6507d6ee231ad72e73781575f705af81630 SHA512 9a42c1513ce33a874bf0a43fded2025fa1040c1235635159d875275df6bdb2c2853ac535483ffd80b07bd849da5bc7f38ba5228b5ed0ac27fba85059d8db83ef
 DIST gix-commitgraph-0.24.3.crate 18242 BLAKE2B ef37235c7258ef6603b122f9ac9bb527be29f1b4cf7dfb02a484ad77986220499633789466bef94508949ebfae50568493f216d532fdbbb84861e9f04aefc38f SHA512 270edf30cdd8ff90bab02d941d741ab6cf6a85d6c2adc25b41298637153e641307e15db9ad54fbf0ac4008497c77980202b067f48c2eef88a7fc1673e022ae47
+DIST gix-commitgraph-0.25.1.crate 18945 BLAKE2B 65c69910ffaa374ca1c1737d8d04c6c01ae9e5e8bbea31299d1be00d4ffd768f46f3425ca5acff20558d74248f005ea1c3cecd77f0ee8d36fd058b0d3fbc1708 SHA512 27c617d2b81184ef012fb9ced3d05e621f07ff58947132db615bd1059ade26acecf1e6203188c570f253d03196fabe167619f810110459adfc4359c08c5a2014
 DIST gix-config-0.38.0.crate 63374 BLAKE2B cfe0a813c9900439e2e3e599e289651e94de664ce745ab70e7ffbce1d34a3446f31a674cf15f1044440e64ff490c8d3d696c31f71ba9c44ce2f6646ca995c55a SHA512 0158572e9fff19570e29e209a290b32bc11ca3314b060406c38e4ff126ee9af302bfa454aeb4ebf88779fb090f33bebf34ed279b7d446494c3ede726c74dde46
+DIST gix-config-0.41.0.crate 63989 BLAKE2B 3d7b4ac5d99432b0e57702b9def90e62195b219cf5037de5aa578dd9187838658aab94def7c2ab1d42320f079fcd4ad5a5a27c4fddabd92170dd542ec9fc6818 SHA512 5a15df8665563184452205b35994b5095626d4579cd74aa1427c0fca2f2a9a8fdde767c00e4498bb32457eac4b8e613a65b2d798695802f770e2f2c7e5e87a84
 DIST gix-config-value-0.14.10.crate 13604 BLAKE2B 79acdf7ee7769fd0ae666b534c03b02de45bdce74d5bedb702feb993903cd4e1817ab779e6f66f708198a8a35746612e5d063c454551547ffcaf8c04bd32ea53 SHA512 90e63d76bcd4c678f4452b7b312282b330104059307f6bf6184431fe8b63599e1afaf23d93c9440ddc3f9542708a03df2a23ddf88a413c294af03effac50fbf7
 DIST gix-config-value-0.14.8.crate 12828 BLAKE2B 3d08b92b6a5b9468ed5f6bec47a9a7d968cc0727ea7819e1059d518943ac91c2dd34c9c1cec0f520b6dd2c4dab8d0a5db1683bf0a215dd4c9d6965c6e6c83a2b SHA512 2bc52ecb47aee3178f6ca0d02ab325afe6080fc80f85eb2d7150e72b8b46dc4396ec8a9c70e7dd7bcd901357663962888941de382740313eaf82daaf159c5303
 DIST gix-credentials-0.24.5.crate 20026 BLAKE2B 062a6d32b1be527a8e8d085099c0dd49acaddf80598a48b61d3b71d674779b66f81d0c94ea61e8e48b1f48c721510acb4b2ca1fcc39d561617e084934c17c286 SHA512 fbd5a2cda803e04645d61aec5fc5df434578ab9fe5740e7c7d308940ddea2eff387eec4a5f76bc4d697e2a55eb949cae82bf8b5dca5c6136540fbfe37068a079
+DIST gix-credentials-0.25.1.crate 22125 BLAKE2B 360e50044eafc224381bf11fc78a992d61ec052416db60765edc1886347abf8b37abeb9d02814b989e0b90d8aa68a7f31247d51cde10beb297198bed4d1ccd7a SHA512 d0e4a5df9c89475f0699ec80589b0cfae39b4137d3fa00103064e4d15333e823a66fd4516ef242b347314c023894c1420454b8fe0009f1e10643b7965a728804
 DIST gix-date-0.8.7.crate 10349 BLAKE2B 8a08d243bfd1bd11d4adcee0fd4a0cd89f94df03887eb56bccdf4279b5bac7ba0ddcc43ce490911d2588a9a399bf6ecaa149804c437aa1a29e94574916bd79de SHA512 04b9b41dc5e42b3aee063fbcad1dc5d0fd6d842fa6a1aeef08635fae579db8b13530ae518ea93dccc2fda3de691869a82f315fd9afb3cdfb96496e9bb8db0687
 DIST gix-date-0.9.0.crate 10501 BLAKE2B 70ff61b0177f442e3d262008f65529c28a58ca5fd7ee2ba1a7a02f7861e1ae11efb9ed29f6e396885b9c7c21ebb23f574c22c6f5668d7dc1b8f3d766b368b6f3 SHA512 bf620acf06ca58b7990dba33f61ebf8df9e64cbc7ce82ed8b0aa61b495e8e0ed3d4d6b013118aea8b6f8c3890e58c04756e2878072516b4bc4838f90dcd5d0ce
 DIST gix-date-0.9.2.crate 11289 BLAKE2B 5cee9f0e8199a6fc04278a823f8214ba898308657664aa659f7fe18e45426d9ae21a20bf0e9f13da7139cdc31a9cdd174e122bfb902296e93b9a285744f27bc1 SHA512 b2fa1a721eefe97be673ece330be476313225c8f3c13884941620875084956f671187734bf87d0095cbc6e3bd6e90dab17a0460aeaaaff37a2d390e3e243ecf2
+DIST gix-date-0.9.3.crate 11299 BLAKE2B 5a15e00418ac01c9174e2d4c776d1a04fc32c7269396b5de44b5c89f4ac3bc2a721618b4bc59e2e66982d40214168d6022174adece227c85de53c546389ae7f8 SHA512 c75a0108f5289ff82df7cf4f003d3c501b6c8cffa713e0b8d1628ae54744474324e9c9e77c839b94e4a7c9a2ce8d9e5662796d46dfd4cb31a208c6c3ed25a790
 DIST gix-diff-0.44.1.crate 32197 BLAKE2B 4677617e405c22c4756f993674841838b769ae89f9b6109bf9e34b00001115cb1d8b97fc9b22467d6d0399fbdfa884d6e4e5434f15eb52c461c65d4d1a988407 SHA512 90fc23f9ec343864f51c7c18ed0b2a27445d7eb5473fa64635bab3b307413dd44e861e0ba083456ff05e67911b718320ef497d0faf7a6349b4317f433febf400
+DIST gix-diff-0.47.0.crate 39980 BLAKE2B 226ef1f26f0b3f4608f7ac4f79cfa63c9cb99c0852b0afa3014d7b307ab36d62f6dc798b90254d59c6afa6bd994224b5c261437f4ba8075375ed2f011f29f9f8 SHA512 7996a27d7afaa6cefa2a0bb0bd0bd7b784eccca8e3445b970bdf4ac9f27dba653a4ee5d945af81c496df1c8acfc0e23da103256a94d6e07189bce1499d14b170
 DIST gix-dir-0.6.0.crate 47888 BLAKE2B 30843b8d6e95989d023fb7a75555fadf98052ca40cc31890275c7c9cf5ff914de7d773346e5a4bfcba8b89b219c640420b101731f8f6e30f456f7f99a0c419d5 SHA512 046020f3491ddb1e44531c05d64f5e6939b93b295f802ac5a45a312fab5042d763dfa477fdab042d12ead8e5c3337ce64d569860cf3c4d9ccdf86065afdfb5ca
+DIST gix-dir-0.9.0.crate 52444 BLAKE2B 06c6784485e9ed0fe99b20e3d5feea2380e8468b489f050dd765891ba0353d4040cc3e58aaaf6f789a7b2e0730ff746e16c28111f6be9f464b26eba44870dd62 SHA512 e597d6a9817174a28b27453f698b9506c904588d213a1fc45bc0cfa72978ea7b1d25dd8c6055c3978b14b8b5d8ab1bee94ad1760845fe6c8519488d1bd288a13
 DIST gix-discover-0.33.0.crate 16632 BLAKE2B 0f416b93a145ed053e5435b53197815f381da3e1f56734471a434b3ded2cd98e455e29edad52586b9d2629e209c668d215bd642d4fa8390d90edba77cd9d9073 SHA512 aa76b2427366c406294740bb6c5ad93d8c52c3e1aa54a5a48a940e96879741503cbac597ef5888e7812727cabefadc8cfb7b49d917571dcda1977438a9dbbebb
+DIST gix-discover-0.36.0.crate 16673 BLAKE2B 63fe84c93cf2eebc00867db3e00dada1eac2570fff51575b7321b4536dad11bba17bdbdaa22f84ea225cf763d891dee477195e7ccbab4c4046d7181c2654c6cd SHA512 77aacb55760cc0bef02c2d5c3413eb291fd7d72a7e5e6747081472a5f4043c995b129101e4137e52c0bed49e4e857812a106a4ff765c084b0726d5a1aeaa89fb
 DIST gix-features-0.38.2.crate 30604 BLAKE2B 68bb0154bc444a84dd20bdd1a56d770a8c68a816389dc8ba0a94ae71da9c9955974cf7a154de5548f65e547a5e25303efc19b5e225664ce8f827cdb661bb17d8 SHA512 d82f70bd8831701b2c17a761b306e4b630fd5b558e4b936aa8b2f87440e53127b48f024c392b487af23e0c541de4b064c27c35ee57005a81352eba0e6bcf79a1
+DIST gix-features-0.39.1.crate 31228 BLAKE2B b41a71cb0eaebc6139e2b8dcdde9377144bb508f5eee48e2202dc9e3d9c98ed5807963b1c4bd16da1b00d064ecb0e75a4b66a9ef4ef82a93188e9bebc690fc59 SHA512 a150d723b5bf223adc8bcf7faa2eab8f5c5a35ae706dd09d940c6232c9f62c9c36b2ad255f5c4c6fddfa41c4bd301d46b044953e5ce5cdc57790fb234fa81546
 DIST gix-filter-0.11.3.crate 35889 BLAKE2B 77aade805a4476cbaaefd50544c6a5f7781aaa87048da51f2fc06141140c77c0c7c64309ea2e1903ff7c174f59e86c9c3af526a03e60e13c26387e3bf27b19a7 SHA512 b8cdb4a87046f9272408a43ddde61e764a70321b4482300d880ad6245944cc9f535c13077c92ba1a49329547bf12b3f39b67d39275b5f271996957f5ce14e0bc
+DIST gix-filter-0.14.0.crate 36643 BLAKE2B f1347721d1fa43c28673487c13aab779e59a7be03c6c59406870c5244c16fa4a197e132079b75a30405c935a329ffa1a98245a8371d2278be80c9065343b1df3 SHA512 065c8d82fbe489d223a3d273c5dc141b86b8c9610c15eac0efaebf0e255a1a63c6806c8a02ab30a2cdfc32cff4baf4265ca6386605944b06d6323428b2ff424d
 DIST gix-fs-0.11.3.crate 14867 BLAKE2B 71495a8f84c1dddef477ff6bb19343e58e8f0b0e3786d327750bcec04a1971237ba328061505810943e0c8a864ebfb36fd47c01dd51fc48b9d18e0a0ac329070 SHA512 7d420a8cd322561808f84913c5c6880031a07005f535bf4e379673707feaeb8fcff4c2a41b455fe76ab7af6fdf0a934c471290d828e8416c26ad49cbda1f235f
+DIST gix-fs-0.12.1.crate 15734 BLAKE2B 03263ccd2107c89ca87568fa670d5d9f5f1a186d4b47e9d5fb76fa25e10d0825c1a60226f65562c0cbc8a5f0711f3d5b58bf35cb39f33134b5bb111cc2386155 SHA512 e795cea9077ac74480d848ab3d8287a4e14a3f5718e329e28915547304ab415d55b193d91dfa9b97cc09fd32cb7570faa2dd33f6b464c94e996c29e8ee90b390
 DIST gix-glob-0.16.5.crate 13425 BLAKE2B 233ebbd4e1993f5139478b1d482f54b47992686ab175bbb01fb95591934735d93681d8b888e85e7e2b6c256afeaedb7f6cd4fd666bb2a3c8f3e206b34e50a29a SHA512 6b8a22c5225a18645ef673fe73f7da73fc519650d03990f7fa43bf8f0df58d4c1a39a0da297ff5e76557b07f89f1aba5955a82a997bc29e52ca9dad808858b2b
+DIST gix-glob-0.17.1.crate 14136 BLAKE2B 9d8a147de57b7406539b117db96ca8aad91eefa85d2da212a152026f315cfbf8120bc4a54ec7c0dbbc42991353f81dd73aa69a07a1b2b3205ccbb7d3e8162913 SHA512 3eec32350076b5a8257b447c8d683fcb38a7c171cf6187c30186ebf02f12ddc487bbf18c8c260c3721fe69ca84b861bfb003ec8b26fbd00b5056e543a4d8905a
 DIST gix-hash-0.14.2.crate 12759 BLAKE2B 033f46ba342fea5e2a7b5b91eeeac06aabaae527d10ed665ef1d2d7f34362ae7ea27df652012c5ae25872ab18175aefe15de3e981647086d8008a32bdffb2d0e SHA512 32ba5cc7805146fa858501bdf0cd75bd000550aacee258fdd63572323cdd06e54c78b4a71761d410c46471dc1bcf856e5564586f24ca2cca03c60b9e08b4386d
+DIST gix-hash-0.15.1.crate 13513 BLAKE2B 1d80fc96bb4407c424b42a75ea215f6f360fb6025920f3dc04818ccf5c89995b6a7fa62e9a4d9568fedc83f599262747983b57f84628d5ff4189e47e5b3000db SHA512 bf90d93cb676d3558ae14ea3e5bac6643fe7a39a6e596465b0c4a126a4181d721326bd01509ac502d8ed4ab4445a606223bce81e466cbb0ce71e46daadb8af34
 DIST gix-hashtable-0.5.2.crate 6421 BLAKE2B 483871bb398815c4be337e494244a9f9f6bfcf2788bcc975c96a5095f213f6b70a19902bf00987d3f16316625617727cb84408431398d32e5bc1fffdeeb84340 SHA512 d3b963cf2e82dd034bfa5912bdd0fa384cdd501efa6a0dacc70838245ad072daaf49e2f7a84d2d41360c0677af9c0162831423b4a903a77f5f7f8027034bc36a
+DIST gix-hashtable-0.6.0.crate 7189 BLAKE2B 6440018095e5554842ea7ee93b4d44367cf3dac891a2ac4c2e159c926ca4e48d3ad1b505288169703b66ced1046ee6e6233d5529c0a34bdc08de3e22b49bbfd3 SHA512 308358fce4dc1c53dd9a32891b10321364b3c7665b7e646021829ffb94669cff6c3dd53b23cba3186882f3f0a039630cb20b0081bb690233a8b9069ed91e4b7b
 DIST gix-ignore-0.11.4.crate 9154 BLAKE2B 36b83d845d48c115fa6685632dc197bf665305de63bc81e540b00aad0f4d15fd1cc69d9fa0c1c33b7d647a686f6d65d35767be888090a9315d85d6689ba53f71 SHA512 81995c3660f4a7db91fc3b3f3d00ac92a7fd4490c0b8196656f4684dd3b5323c075d340b9ca7d52dce7896d82ccc06e8c335f2419eaf11f073ce525372c2554d
+DIST gix-ignore-0.12.1.crate 9873 BLAKE2B b50fbff14e036b2e12559030936542cbb7f4724ae153757240ba3b0a3202626cbeda705d2239dcff3b7328004c2393a148132b154835a0efaccef59cf5bf9778 SHA512 091e1cdd7922e39211a8227e7b8e5f082e44439fe4ff624902dca897afe2fa5c3b8e1be6974b83018df53c78e75bc9652fca87e736b4bbc06d90de4c54e28f8b
 DIST gix-index-0.33.1.crate 45861 BLAKE2B fa994405d178307645a3c14858a64a58af340593484221bfb2bb7195752962024de2e2543a615647de3c32dd9370e4197845a2045a78e3386361f3a0f4cdc0a5 SHA512 2713b4b1a02a0f6bfe227dd875903278ce8d7c66fd4ba2bf8dbb8b4d8485c32b6bacddd35544eeee9ac3f7a89a4a2ad91a0cee081d9dacb4d5f02a8ae5e098c3
+DIST gix-index-0.36.0.crate 46548 BLAKE2B 6a53a12e56b60cdbb55e84577c656ceb4ab8e8b2c8ab8c0b5d5b615a97218718c2af7d9af02b6e6dd6fd4cd776853234bdacebf1de4bfeea18566f8321c9abdb SHA512 42231215e0fa11dcf909e0c56f884af963f19ba4ae0a1c75280e2efdc3b79092e2740814ea2bf95a64a5f3cedbd0c41046143d44d47d15e3ff579c860eeaf54d
 DIST gix-lock-14.0.0.crate 9795 BLAKE2B fd6c378bdf904be22182ae48e7898e9b8d5ee5e3248545ebdc7dc21195e7da0c5977717104102b050af35a7152829987383c0e8973da18c1620dac1f637b0aa6 SHA512 46228f8ae0d931c6594f2ce08eb8aebcf77901dd9664d134ba5e5583855e40460f08061ab5d9287bdf17e452b821f0c336d49b7aa181b44dc091925d6982205e
+DIST gix-lock-15.0.1.crate 10515 BLAKE2B 2969f4019b48a312c5a0adc23b614424e09b75706ea4d18159f8a30bf20e03312b11d95bba6703034af99a4901d036a4a0d964b7b3ae52aa6dcd024f6468fcc1 SHA512 8ffd3cce4d0952cb6a2fced4a6ab407b4a32184a2b10ac1f5302132d2d7d3e4c285dc50f007141cfdd658352381f66aa79b64cf4f63f0a18a2cfe367b7bb5830
 DIST gix-macros-0.1.5.crate 8627 BLAKE2B f685187e5c6dcd91012b0d3030121fb2f913efa12dcdfa080b936812f9acfb36fe282b8fd6fcc3f41c5eb78f6aac82792bb38a22db851ce06ead2031112a705e SHA512 61f21cfb309da85c5ec00e3023e79ca40af23597e676ffa2875bfc46ab531fa49d5843a25aa7d9293151c6d321ce82b3339bbb1a6bf83721f1fd145b3c77c471
 DIST gix-negotiate-0.13.2.crate 9770 BLAKE2B 2f0cf1839723c5e18aa039dc1a94d8e7b2916754e179be21252c6c5e0ab71cbe6b0839cacffd456acca18aa146bc7e6f1fe45f1308c49c2d5a46d5b3c96dd6ac SHA512 875e47ad37e993dce1086f301176932b5c8e4e5c9afff3c2071b2eda96f1648a252ca0851ab217aefb907e1c67509b631441d8ea1f63c511e4221d2418222f13
+DIST gix-negotiate-0.16.0.crate 10485 BLAKE2B 379a97602ba788bf0379201e3ca3df1babdcb7150b10cfecff25e65902d55cb0848c9f50c1ee969d9ac1fe53cc8e169c87ef2927b17cf6ab4bdfef0b73599c5d SHA512 4242d86d55aee4f1c830268b9dfc65a04255908f778e07ebc21be48d6c73924b1b90e6f0b2fb900f28bd1da9b79d5158745521f7185d689b3646ada6a38d4958
 DIST gix-object-0.42.3.crate 32497 BLAKE2B 72eee3970d4520f3f317330d797671014fe5c768f99d16002e45242ef447e4334b8aa6baef4a2665a2927208b29d8ed896427757ea694b68b5f3aed57f3894aa SHA512 6b890445cf64c1b49ecde30be32d1028b087980567b86bc445426b10d2e4e7a2dbee4464aa601d085827db85a313947cda72ddac8cfbe6959aa4b7a100746bd2
+DIST gix-object-0.45.0.crate 38568 BLAKE2B cddcf96265fddc04a3714518a92e09f7543fa3b9745d4d490f5e4bf111df5ad2e8f624c71678e3319f79478eac5a6c6004e386883b2786126516d1eadc75e4b8 SHA512 0a8949e0ce8fb33be20ffeb1dcdee8bd7c8a495cdd23d9f701547201929f1ed42a198518ba82f618d2ce5bb48184ab501c5539e34ad1256dd214d0164a949549
 DIST gix-odb-0.61.1.crate 54308 BLAKE2B 42f77b7ac0f18f4248fb92cfa198eb49e44c9473159ec2d84c08e7e8770739b072b61976746ed20d78cc14e4ff5d16366c74e1282cf962f4d2cf39f370dd3795 SHA512 54046bcfe9c919ded11c3286e5b588ea507b3f028598ec13f18f5d076d454b521a26458c245ab81f81699d223abebcd7ca5318c21f8737309314aed0e472e05e
+DIST gix-odb-0.64.0.crate 56783 BLAKE2B 1506ea0b6e534a2c6c821defc4b38ecda7ca4e8cf6a93cc91014f825042581aa55a43327b3a93594e2632ee358772deebb0b5eba979583b02b62616c6c5ce5eb SHA512 5a0d791ea3838b140e1fc5d10e4f9c4d85b3bd7ea99f9a0aa3a2e8cc0526cb77a266baaf656afc7ce9d2bd1fe34e7ebba7b601fdcd9756be05c58c26dafa1377
 DIST gix-pack-0.51.1.crate 96737 BLAKE2B ba82d85871651e60884f8a37b34764935ef10e1730079b7ec9ef017b5df2beb3b2f245ef05e4d97b848a7c40e9e92605141b1f677c501d03d4eaaf3a17d36279 SHA512 bad1e67e628100a7511320a3f4118e4f3e7802354fa5f1d6afc6cdace360bd486883f48b61f1aff1b56b55d399811186b0eec0b1f13b761fbe1075d18a90c143
+DIST gix-pack-0.54.0.crate 97349 BLAKE2B 4d7b962029d1668318ff56ff35f2b8b088c5f1f5a115cbae6ac842be6ae62835e4c56c980c87d9a44bcc9823a6a5eb958ac3bef4df430d4a1bc046fa852a1e57 SHA512 26c4a8c67e914754e6ae3db7afc158bbcc54b2a3dd419164afa71587b84e1936a868663fc2b34e07e7bf41409acb216285a1024416aadb55f06498621ea6161a
 DIST gix-packetline-0.17.6.crate 20390 BLAKE2B aa1b168fbcc40e593b3b766283f8f0f60dfc5e652339845e05f00c8b0465150fc96da50475399cd567615dad22bdbdfc1f842de6fd1f0b91499768d736b45712 SHA512 1926eab20c069bfb0e20d5f86a0073a16a23d58cca23ab895982444738a9fe6a4ec583a1d1226679a8a55cbadb0d909bbc1293ada3f7b1198ee8ef50553bb046
+DIST gix-packetline-0.18.2.crate 21148 BLAKE2B ccff09892d256ca930a8b589294a66eb13d922dd4ce7288440d1639b34b50c1a2b650105bf483b44d2bfa89edee3bbbd7953f5ad6301f9ba1e8325d1dc8cc0c1 SHA512 6a68f9af368f607218a4885d401e4f0bddbc65e5eb4e2addff32766d9ddf6ce804efb07bb67af48b60539787d979196cf426f8b4389aab4f99ceb79ee621fb1a
 DIST gix-packetline-blocking-0.17.5.crate 20238 BLAKE2B e7f5e0f742c7fa357ce8fd16c65189af554694719a5a28179e14771208ec750734fc8919562ccdbf17fbbadfd866e48cb7591ad1c563affb06c854d18fef8996 SHA512 b6eed18cf7342164b67718b1682a54e85547c079ab7fb3bf67d84634bcb05eb78ceb5ffdf5938fc3ea61237b2dccbfebe51b4d5dd7a754f3afa07ec9bf33dab1
+DIST gix-packetline-blocking-0.18.1.crate 20988 BLAKE2B 0a33e5dc05066847c2f1260a563c00db85754373e45f5fe43a9fb6307e689a10fc64717224cd62610e0de3a8f4a95dae526afd7a6819504c4ce79b3d8da565ac SHA512 b60c19caad254a47719c17df7ad204e370f771c81f6b3165f85dc9fee405fd252c4787c1d9afc61793eb86ce0184d3d0d7d91b651efc093e2ef4ea4c9d5024bf
 DIST gix-path-0.10.10.crate 19714 BLAKE2B 332b2ded54a1355ad1c4f9a36775339bdb1e81e9948b58a39178ece96afe7ff32fb1263337321bb07a6749953c571fa63f047088b6b0d0d5757f812f4de94c57 SHA512 f38c3d12e4be24c7ae436136ad61db2461308dd1a2c58af136b5bd73658c46432faa1d3de88a83ae9763d81a809fb9189a7dbe5e62c9ec4e9954b560e42dc390
 DIST gix-path-0.10.13.crate 22831 BLAKE2B 23d0d228000362771349cbad65804b2248de1b42e202ba26cbdce4bfb2087b25def13012069d163b273574a1734999928109bcc400afdcf2e2d89c87deec4886 SHA512 7bbe2ff099523869fb8c3d3522988919798ae2ae77188876ef1aa86f2ad484f15ab8f7563eacbee9787c88dd23695601982b9574474f9c1258be2a271c737dad
 DIST gix-pathspec-0.7.7.crate 18137 BLAKE2B a5654d40e484d7e3f0ba17245edaf1fe04407f2528ab010a83515185ba423ffdac07d859228fdc5d0f1533d4c49fcc7847a29ddc9c6abff5a2f54e97689553f4 SHA512 2a7e8079ad75703dc256ab269cd9cea92d9ac44676be3e1ad31821382d8c893f83c74edf9147af22c3c63312aad0b54f194910d21ef1dfe1c9e52154b54ed0ef
+DIST gix-pathspec-0.8.1.crate 18854 BLAKE2B ea6d543152e6b908ce5eb901a8571bad3cea7815943d71e8a8a871d4f1b4bf34cf50e3e5089bd410a6ec590c745f53b8f0aeadbf0412e13c234f5172971d5529 SHA512 29d00955a5260c2460b6ffc0c2de6a618dd5954ed46730cce2f9923ade0dc1c47f1e64ef00fa918eeed3a85266d5676d85d051c25d447a580a18358c1db693e9
 DIST gix-prompt-0.8.7.crate 12599 BLAKE2B c4f01157ea504578c657f9692e2c4d2425e05c8896ce0c06caefb6d56a92f95544ddad1bc16461e8122c33aec7a41308415ad01f1cd105c9c3f4baf556bac26f SHA512 734278fada425925cec9a9633ce9790c086394ac98494ba299aa350fc3120cfec658b6c44c03b2b1498ccbbc9684109ae9004d62d34d5569e303662a2d137de1
 DIST gix-prompt-0.8.9.crate 13413 BLAKE2B 1650bf9284c951a8272d07ed801c88641388fc6016db7a85c80c89286a4a127acc1042f24733147bba2d0dd9444d90b02f84f7b4540b366bd884b763fba634d1 SHA512 90b5dbf42494d57b13731a40fcd186a2f8b2085e1c599302865c35a05190695163018ab115f516f917dcad717966208c2774f4f6f9f0a144654b1e34f5c162d4
 DIST gix-protocol-0.45.3.crate 35179 BLAKE2B 032046041b192dc84b3bbbb25453643455a5b46f955c93ff8713a869a14d68d505f1e49097588967f40730df9d7d87e7f4c580580a9a0f8dec9128d5203e1edc SHA512 3b20d2d802a02b3cdde49c97339d10bcbffa85546051ad2191da4df6d0ded8f3de464998874aed47336d35b80ab57571241242274c878179db747f6064cdb4f4
+DIST gix-protocol-0.46.1.crate 36386 BLAKE2B b5ed73163fff5be75c9daea423f9348db316f9af7c07282111d3212e2bf3b41b0410549c266f56d238faa56f74287353a282f154c93a13222e07a1cdacb2c210 SHA512 85e562067e90cf13a90e27cc6638442eccb0de63439932f84361d2e4c8fa55b40676f37db67e903eb75269d47cf29d4817a9537ac2e043c9c0c631a63358d766
 DIST gix-quote-0.4.12.crate 7055 BLAKE2B e3bbcc1bc1ec169a4d9b36b1fa23caf559bf70bef14a485c2652d59b4562c514457c14ee4d2178e0f564560c310e5d304af993c587d6d352d0d6906dde4e4bbf SHA512 904da737aca01dfda12453b3593410e9aa49b852b91a7d25298ca885be0922d9498fd622e36f0601de0fbc7b2706e73e79f8281e74417b3b7084dbcefaa3cbec
 DIST gix-quote-0.4.14.crate 7828 BLAKE2B cfae180c1fb14e2461453a7ffe83644673cfe99ee473d7788f3202cf68a36bf75ed6d08827d8e12ccaa9517bb6240d64bf63e68a19775b93ac21dd4578a669e9 SHA512 e88ce5f3c6712c3026336115f02628ba35aaff78e39b65ea4749a26851c22cd8ad3da859744559f9fd6d89cd54075b18b28868397d50b6be30048a6a80e5b8f9
 DIST gix-ref-0.45.0.crate 56670 BLAKE2B a56c2b33a19f1332178edb59b4960c86ae2a913deafff7122c45fa1fe80751e70aa64bb63eb51036904f65e2d83af784756035df0117a1246ae7e90742ad7d98 SHA512 27394a20b41d27d958487f122a8553432c061ab4d70c05e659472968294dea8c5bc5db554957b121f4ff196ed911cc9e9e3a9ec590014eb5c1ac029a1a60ea0a
+DIST gix-ref-0.48.0.crate 57633 BLAKE2B 4e6fcf53ad3ab7cef16cf3487a332f5b367c27a464cb346063543464652547dd7b58bec39ea44a643d72bfafd31c799a047aeb5614c37334414dfcfe3faa7d63 SHA512 7b2c6f0fb94f103450d79d310bb77fb50b4e0ff6e314502780629c56bd75678c9e27ef226041032240c0fbba8550e8e759c05f3e36f9cc9427c4e7f22684a870
 DIST gix-refspec-0.23.1.crate 16175 BLAKE2B eb54f73575dcd51d522fb4c288749caf612ea1a362d1edf7cac385d47ae3245c1de0d7042cedaac0d8923cb0bfc51cea920dbafdf5f3cb4d40e2e26e51d26af9 SHA512 f6d9ddd0c7040bd0674d21f66c4459dbde678e89feef0338b5fb30099164acf3f75dfa66ec6777bd503b4bde7ef8425ab4932ad963761926c775416415407381
+DIST gix-refspec-0.26.0.crate 16891 BLAKE2B c6a457a994662b6f57d3f3b13d0d06131685a1cd064bf7fce8670a354a20991cf5caa9636808281d052819562d03b291dffc177fce3ba4bb5daf1040382f4316 SHA512 6eb9d393f61a905684b7338c4288da1497b961375c7f6a5ca4d11f2349fa9bd9fdb42101e0c2539937acbe54e5c83cc59f716dd4082cc577db9dba494797970f
 DIST gix-revision-0.27.2.crate 19204 BLAKE2B 5eac4e2e661df52884038e147d36afd379c4557823f013ba34c8ca69a6272b3c8e42da4bdc35c367d605630239d3fdce95ba538a3e95ab98436a8f45c742ed53 SHA512 21ce7c3c6a060f4632078aa3be87261fe5992f257179bc3c0e8b68e30d6bd18a8163263b0023832f09477f9400ba450447b0735ee8e8faa50ba91c570cede00d
+DIST gix-revision-0.30.0.crate 22299 BLAKE2B 92d62f915615458fb54cedbf94fb15ce99572c97694171a415104d9bf44c2bf36b8447fde68896984268e68cf9f2defaf18731c21dde2bb010b83c037fd24277 SHA512 40f762c18b21ada11c7ac8f78aa1aa53b27bf59ea324026d79ffefcc9eeeca4066aa3cbe1487965bedc2b94607a820a66c972644e36d79d81cfd60e9dc547027
 DIST gix-revwalk-0.13.2.crate 11854 BLAKE2B ed441e03cf1bdd3239fbbb63665b41d25e7f8556b569bee0123bd6500007ec398d43d80d3886331d60d35790dfc1b0411501591f496b0f7e78d561b67c0566a8 SHA512 aa545ae7130b0d52d93e976620ac8d8bab1e347e0ce6c46cb2b1c91b3eda2814ae4fd21ce8850a85f61d2b3ce5d8759a29bd8e52017f325782f8c14e17c7cb58
+DIST gix-revwalk-0.16.0.crate 13298 BLAKE2B 9f182dc3c281a408d51f8ca06d73d0abf3a820c0fd8615d130bd62b3e3234a764f517c7d63f677228643cf5abd99aa315893e5af7a71a30365e171248697eaa0 SHA512 9c255d3af34b3e9d32ee26a6e0e17ac0dea7da9d55611a276e0db606cad72dc12db0c5b9fae1ddb3b52a01fed7c5bbd90d077e995ade9b0dd7fe21da2d2f0b69
 DIST gix-sec-0.10.10.crate 10205 BLAKE2B ba1a7e2f955a54c6bb16fda361e4f7b59ac2ceaa044aaad09893d913e3520f4d40dcef62d457143280b3dfb76ccc24426badd38c4a0e19f35f2505dcbdfbc906 SHA512 0a5733e321e05ca0774518bdf2f171fcc8c63986269184a96ac9faf3d8b14b87c3cb31d731f80e84f098e7419f278d9dbd3b952fcf1150eb952e38e85d799189
 DIST gix-sec-0.10.8.crate 9400 BLAKE2B 1d7be29c2a510c6c5cad62f54ff1b53fd3f9df5c0075a86cb9e7ad578e8962a9ce6e5ad138873605fe80ef42349ad2cf087988b621bf96dbcbcc63a1f2fe713e SHA512 21d244b71abc5ca3b61b05b60aba61e86d5f674fa738f82ea34e0f04c21462683a505e3d692eb323c60a8c532bc639798b1b1cd7fbbf9cba2636c2efdd40abba
 DIST gix-submodule-0.12.0.crate 12151 BLAKE2B da7e1064a2eae5322815325c9fc9e1736a31f5a2dd76244e346d3b59ea76b2dab6894246fa99a20c46e211041e56f151a6a6049241d5fd1486f9c3e3057aaa9c SHA512 401a5023d2cdf436559be0f4c71257823a7084b3c8edf98223230e8c807f951f4b92b4696b13728a7fc07482314adcf99d73aa1d440d86c9d78642b620316e6d
+DIST gix-submodule-0.15.0.crate 12841 BLAKE2B 230a7d622b3a2a3609e5bd50d23a8cbd5ac7d0bee812505dc8d63aee601f9c6f7057ffe23a6ac69e97d48e971d787e70806105d506076bd23fdf6c7f40c769f9 SHA512 f47c775b453378c6f32e19893fab615954c62568fb95dc76bb80cf2d70a1ca97cb28c25095a138404cf3d7e1d38cebe5f0d5902d0b0c9d21f243299a79f5c08e
 DIST gix-tempfile-14.0.2.crate 17489 BLAKE2B eb333777a1389e189b1951fdbab987e4e39c44428fdb5a4cf6bd75e1e963ebb9fe47143be4cb4892ae6524c269e58105bed6463f9dd28d8fdfa57ac7e938f38a SHA512 1baf8a34eacf5df9125dcf0a03b804c5d44f12bbaa93498478bec2a99a7fd64d052a69ecd5e568fb88ca0113c3b8c72e1e5cd8ad062acad94e97ee122898c3c8
+DIST gix-tempfile-15.0.0.crate 18426 BLAKE2B 11d5484b4593191f2579da85f20cd2dee4527e056a9f5dfb35873ea09476b1fcc0ecac821c75e99249938b4ede627d153aca6c1a43e31f46f605ce20265ecca1 SHA512 cc21ef833ee087e6b49fc74da11da3e4bca55fd808952e1283db11f97e38b2318044e1704e78dca2e4eae9e5b66eca039343d78bde7b4b5d4a417190c62c3ad2
 DIST gix-trace-0.1.11.crate 10424 BLAKE2B 3a8fd50adfa33200691d9bd4143906e78ecd0a6ab2aeab69f3b797f7c55f650032f99e7501247373acaea1da36d86cbfb5a9d0ac3cec0fb89c1c75b98f02881f SHA512 11c626d81d73d21a4cd5b0bbc6d60c839331ebcf3c83850e7acdcbe8968b87bbe5ac57290fc33a2477843a9dce07903a86c519987b68ab1c7dc474016ccabe14
 DIST gix-trace-0.1.9.crate 9659 BLAKE2B ce18f59e91f4fb33346869beb2b6f69721d8b374a3a6f583ff77f27b21126f359c812449ea5fff9da00f688bc59e1f32004564a49c2a179a33d4fc184b8ebd22 SHA512 bbff4a4ec60e639238ab0f2623bca6c56914eefa321c8f45ca37507faa431f15d743832facd026dd3a9e3d9aeaf21aa3dd6987284a1876e20000888243cfc0a9
 DIST gix-transport-0.42.3.crate 50131 BLAKE2B b5aca725acd8352ae70c46c11a7b7ff515d1646fdabe5fb70d19feffc5a68ae1380bc4c61e32965587a68e371557bc1c31a7cb7318118f4e976ecf75f7598b61 SHA512 a8ea8c26182c96d56cc2f2f0cbe1230c4ba8b6c1e0f4ec5896fcda2a947484f6319dd0810ab9aca81910d581c60826d79ee0dc2f5f491bf5c64d2e85b5f997de
+DIST gix-transport-0.43.1.crate 50826 BLAKE2B 72ab9fa3da125fdd47af539c99e1e163c4c910a79dbb7e27793da503d7b76fc0981b3adf63bf3fe8dcdbb00c0cf450ced4fe292a0feb3e68934998e0899106d6 SHA512 0f3a7913c407441873fe4460569c46e80e1853e9b6dc1de822736018ba6b12cbbcc11201591d76603fe300c11b22606c8e21dbed71e9df5ba87eef78edc47230
 DIST gix-traverse-0.39.2.crate 17291 BLAKE2B 7d543fa1f438071841597abddcb0944ee912e5ea02390b1c61abb42062315591470d01f80ae9309d15b3512ae6c9ab1e38a47a76b36570d17703c5c24a4c88da SHA512 8e03d9bbf9ab88d2bf1e4a4cd70790811d02f6a347f1781e3bc99e58786b8976ab1a5dfdc2379a0674e97fac0f4e70ae1ff1c348b78577eaf6f7225119bf8dd1
+DIST gix-traverse-0.42.0.crate 18410 BLAKE2B b63ef14b36263245afbe82156c28db71a27801f18f369b61e2a0fa27f81d11006fcbbce52901bc759fda1f6765bc3f64def6dcd03e068d5b6766ac96b6ca773f SHA512 470028c6aeb1510daf194e74696caefe0e1e5d5ec31ff0d57ca9291417d47377ca2c98ba596f35660f435c49ea1bedfbe622cc0b00a66ee7924947184b5190f4
 DIST gix-url-0.27.5.crate 14367 BLAKE2B bb66a9e9cb4ac227f52aeae0cadc01d53de785fc75b618ef6639ca9cfbacd13a9dd63a8eed8152c4b75bdbb6f9760285b157bd4984ea7e995e3177806177695f SHA512 a007a074ca98dec95ed88e19414e55dbfaf7aa5c7b219af2d54785061c761642a3f88dddc52eed85d2a32e2eb36b371ffc6df16e12de2159c5ef2f20ffb4e85c
+DIST gix-url-0.28.2.crate 15297 BLAKE2B dad48c6e518a8a2bdba4ad665badb9935b352cfca7d1540c9f652e9ad450c556a0416056dd153e8f6a2e418845b6296b1a66881b0499aba8485e357a2a329534 SHA512 39b56a5636ec1a490bda88cbb7c0cdbeac2b6cec1f0b2ccafee7a58ecd3e412e61a14747a4176c09e25a666127e7a4bf8f3e9e4945f5af2715a5b9f52b8322bf
 DIST gix-utils-0.1.12.crate 9418 BLAKE2B bb51d3d56670350b9512f7ab8e0646a9390fe2da4b4e2888e312c4ee0a5c935d8e2540dab2883159d5bf164276cf29505914451b5761777fc5e770ff2fe403bf SHA512 5cd4a93a6080eca6e84a13f9e2d63c7c6215cc86c6662f1204fb8d6feafd94cdc6b0bb3b6343e24157b10edb9504d89fd479e707a4c7a017372f1f1530e6d672
 DIST gix-utils-0.1.13.crate 10194 BLAKE2B f9cd4133cc98548d3b4d3c8b43f62f1b84a3725e5de1e3875c6a989e5d3b6fd7086329ba2bb034634414900980345958b0d91a94c87a703956877b9ff787728a SHA512 b30d983b14a7350b4d644a84afda108df34bfc94fdbdd643a68c9d8dbe7c2186de5f6d87e7b31277c24c38ab106508d8dd95a253e232f3356fb9c2ac8705688a
 DIST gix-validate-0.8.5.crate 10408 BLAKE2B 673f056b674e93fac90e996b7f0e63c419d18eb345587b3f1cb1c1744ee9596e4e6b0540db980f55dff6519fdb94f21d67b4ae6c579159893dc672cc9d500219 SHA512 4e9bc069785d23612b93dadd6a39cf29344ab9526bb31fcd980a6b52a85288cdbeae47adbb8a52bc1615073f696512d5faea9ed7512ddf6345c5fa0aa21913b4
+DIST gix-validate-0.9.2.crate 11923 BLAKE2B 5f49496903a0ac439a6cbbab0593eea90ed52299800b2b272d699badfda4e42ebd7d73c618901ed060ac299acda40a63d598e0bf0b53138e3ca80df1b99f576b SHA512 8c79cae368e7cb4e3354b4639fd829418ca8b3ea4731c382f367c23c1ea341be0da29b9dd324fb11dee39827da0439a6623440bbe59dcde2209f1e17165e019c
 DIST gix-worktree-0.34.1.crate 16839 BLAKE2B 3a7e135c41fce381e0f481246d7184c9eff2b9c0fbd6ecd284c55c5ed0c8c4397d5bd16d2bb87f419c04d1e00bcc06377ab45522eb45a1e00ffd356112f27fa6 SHA512 54ea6747128d1781562a5cd06d5f85e5302679d58f672c541cbee3b5a8ea8dc058c1dc4b4e21abeccb826eb99d4f9ee8c252201bce5c253fb0bdd6baef82b812
+DIST gix-worktree-0.37.0.crate 17549 BLAKE2B 7a0db856f4dda43cda1a5bb7bea25a7da91ad11cddd09fca192c4b7a3902172b459442884683f6be8c0ca48215a0290a072001629dee66056df424c2caf467f7 SHA512 8840d57cb532397d694e552b8ec20bf4108851cadf651bb50599bee58ddabffddb24d1785a574baeefdd9866f15b3a62ce40c6f27eceb3475f3755aaa97c503c
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
+DIST glob-0.3.2.crate 22359 BLAKE2B 564b72e2738cce5311aee12d8d6147631cb571f7b96d8d3823098d3dd449bcc23ffed5a6584f8979402bef95536b0e73fe9772f273295a0079782b9f7d88d19f SHA512 d15389441e337e3fab9c30102fe7b4b1b3e68d8cbb5d14162d2fd7e7d01a9812b2d6d6d2a24a60116418be41e2075e70becd6994c13b34365d512521e8debb02
 DIST globset-0.4.14.crate 25090 BLAKE2B 2c3e6f8384a066ebfa1f36bf03125b5eae79329255674e32c58963451d4b342ada10f17524232a953bee133b3c77b678a141543759ebc622b5fd659fe55622ae SHA512 e83e4f5e42a97609e2579b09f49c2cb0a76a94e7e2975c5871f2c5af5d3b809736e0a7b220404c582f4a0c7eebdbfad6cb432e89b26401b58f2b253f8c0151bc
 DIST globset-0.4.15.crate 25177 BLAKE2B 5556f4cd7c311b2ead3a83fb2c84280a48e493f024bfd7269c91cde6ab81315d2d7f051f7cee9d7d34e6c8563c2452f0ec04a9d5a8ba5273bce66f5ff8f9054b SHA512 b9281b8bf48d2e297be533aa31c701c0115978b4e580b684b78a385eb2ecb4125187605368a6858311d6cdf5caae7d733cf1406c79241b7d19e7193f5a111dad
 DIST group-0.13.0.crate 16526 BLAKE2B 099ced5b8d16e6fefc331f2d89aee931ec5900a168dbe31bfbe29bd00304e8525fa5763dbcd60cb19ac6c62c8d77877f2d83e700c7ab18255b08c9b42be60d24 SHA512 359db06bee4cb51ffe799d9c408791e310e72fde3bb3fd447cf97482ebb909af07b43e9b728e3639d5497fc905b650bf00403b3a6b21515e6628c2466e0851e3
@@ -202,6 +265,7 @@ DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST hkdf-0.12.4.crate 171163 BLAKE2B ffa03876879110dcdd3081cdeadc9490534c44763b3b49f1d6a5f4407a7346e6fa1ea18303f429b23adcd23e8898ba8fbf3797f5ef9f7ab7b11499d130311d68 SHA512 a43fe20b7d14fa26b118c6eba2b84219645f65f2ff33fcca679b139ae3e96f72abc1e7a47eb8887aac5afe4e34211434a4eb5a2fdbc014666d82c4af340a4b21
 DIST hmac-0.12.1.crate 42657 BLAKE2B 5d432a666dbcf9077a98e1f8a4aaa3afc88f3d88553cf7a2356d117c66f38efafe686c148598ad67ae89d64ee3edf56387a6f89b75dd9ab5eee63e13953dcead SHA512 77d4bf51f4633a8c36712ce3178945141df31cd645eafcf4bd130b8ecd7cb498bf1ee6f2d9c8dfbbc9f97ac638919fcc81bd3ee600a1b27c3be3fa87313aa0b8
+DIST home-0.5.11.crate 9926 BLAKE2B d9c0d3660aa7784f3a26f3930a5ee35dd50cd15b7e252d930240ff9bcb70fdb0169f78c02b5fd82318af8c398d7139be18d2e9675a1b85c7845c90266945da1f SHA512 cd107c4cee793b6db8b29157c3aa2629b5ef1b9fe129fd903fe414faadfa06a881a1b685f1c66fa5aa1deefd3013a210603c952bfa4bf02d5d1f90f75ba9ff18
 DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
 DIST http-auth-0.1.10.crate 41282 BLAKE2B 1751242d5b3fbae435d629c3ad2ded6c683c157e569f25e5750e6cf5e02b0bcd0a68595cb5bdd55fb5f067dfdfd784917144ce2e8e89f7f080494483cf036a34 SHA512 cc76291849b29253f695335e32fe931d3c8c5fe48542b7d3da67d15e3c53e3f52a3a5123b1b14515ff302a7d7c54a2487a91cc242e4c54a017dd2aa3bfed9c05
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
@@ -227,10 +291,12 @@ DIST indexmap-2.7.0.crate 85335 BLAKE2B c7430ef510738ac5fc4658f3e4d927ca5cde7807
 DIST is_executable-1.0.4.crate 8263 BLAKE2B b6871fd2bf99883a64b35c3839ad499bcb11ec33d8e3fcef95d7cd17d3dfdc7a8b1ecff579ce191f7b09b32a6257904ee2825d606b959f813b1f7a18c453c42c SHA512 a4cea8ac0dc1d08187d210c7864136e4900e3fa1516ce69bbc870c184e3ee66906ebd841ec5eba228a71acaf0080469b4446716043fab8b1a0ab2bf16d85afb3
 DIST is_terminal_polyfill-1.70.1.crate 7492 BLAKE2B fa663f858ab8e5fd56202d731b572bfdd4ab0e8262100424e27360a9ffd2820182bc57d6718a305ef82d04c3798111841c0d9f9dcfe219765c0f63edb560dc1e SHA512 4730fa09401cb4e69c92b38b2b43afd74699c61f5bd7b37605efbc0c08ca7a1318d43e4a844e46e0f84f83f42432f01e33771be2b18eb5977702ab9f894837e1
 DIST itertools-0.13.0.crate 146261 BLAKE2B b23d59a87f80d24925bc868c0ac7abb6b9d05aad5ca08833634ef760ce228a1b753062ec4bd22237d0e74727edecd7ba3df9789cee896345b69780d7de66866c SHA512 c6cb8f93a93b6ac1a2cbb3033e66fc81a39f83be773b734bea3311332b96bc71bbb518aae3e6b40cb537590c23de1ca4964361c336795c3985bde63232d410c4
+DIST itertools-0.14.0.crate 152715 BLAKE2B 3c075b735a6ae4b66980b1f7ca0ccf4237286b140268ea179e4ac01b1349105da227f03ea9ea721d3e762c3cf8b736cc48b6902148eae73addd864b9c79aa219 SHA512 bb168e21281ef3e43f9c93a079fc1938d79b6db2366fe17e26a90f7ce6fa55df73e54a06334cdb2a7b208b0a64473b5af9de76827a9ecb49378a5f9073d2e645
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST itoa-1.0.14.crate 11210 BLAKE2B b2d33dc384757963eab3ae7d80bb672d828a549967986e3af8c70fe71a0ad46c4a278da2db4dfccef99e804e6cd4934067e97c0697a33ac3302cafbc46eeb416 SHA512 ea2d38df373652ddacccd11e610dfdad4e3ae7f0d476514e6ac58092733c817bd834e8cd88c3bc4178dd5a646ba628ae626195e0aa407e8534ae3c2a7b049987
 DIST jiff-0.1.12.crate 603829 BLAKE2B 6885d4b0d314ca417c107be5ea23d92171963a2c77c3cd7db1bb28350394947d0d819f92ee6ec7cfb6eb757775e27d0a55f4d2049b5f6aa7f40be7a760326d70 SHA512 8311e6f78e1e5c4f9495cede3ca1856f476096f2db7441b6438e647f3bc82fbede4e44cdc103fa16289a0a473cd2a4c4379975d34d47427cca420cf6029d1d26
 DIST jiff-0.1.15.crate 608038 BLAKE2B 7d70e9591a5915ffb7ebeb1038888e27f12c58973fa0aace40f23e9ec81628501a00c214c8cbe47a34cedc7347cc660a37db96b7a5f54fafbd98d8b129f8cf85 SHA512 42f173c8f9b819c400325c9c50aa5a0808617d900a97bb3f61d55cdffc0a013cff356ae61ab15a39917bc366221968e1479ca072330af8bd145710195c47404c
+DIST jiff-0.1.21.crate 687373 BLAKE2B 1c4c48de3e04034df6e699c15957dfab16df211074d846029e7b24103d35555074c672a0f10822152ad6917ab4c6bd62431f3e2002df90e0d916889d6880a2ef SHA512 f78e3ef0023d8dfebd50f3651bfc1ebe5453d0f99d3a3581648dd2e3194253e8f864da4b8c1d1871516c71e92fe8f47f4cbdbde52db9cebc52d38be177b0b4e9
 DIST jiff-tzdb-0.1.0.crate 81551 BLAKE2B 2c9018e13f1b641795929611c01ade24754157604d1953b8fab334444c454848d68bc89c07ff9a4d6ca6b4a4d1c94e93de3caf9bfc962f99ab95686aead6a249 SHA512 a8804be90937fc0ee5db685f29403b497ba95354fde06c9984a464eef6edc785c11b4b177f5f05a05b0acecbdfa6163d24f2e2ff60b4144aad976ca2354f8cad
 DIST jiff-tzdb-0.1.1.crate 82030 BLAKE2B 2d1b7931608ceb547962987f7f7abbe4d0eb90bc1c3d62c8dabe7f0836126ca58044a459d55e5dc51899f118b4c17cb08b8dc48f49b6a95c468446918c941fad SHA512 97717db33d0a1399e69077ff4c41af06abeeadbd3dde60ba8dbd649413f6f14c35248cb93ed166a4d5ce7c5133c6ae9aaec9d9ec19d7b25f3272c76c6f1596cf
 DIST jiff-tzdb-platform-0.1.0.crate 2949 BLAKE2B 0035af0307068797dcdd2db75f016135ce288ece6a7441009165925242361e5974afcf2c4b16175d2a496d9b4890e2f355682a101b197d3888598fed1b2e7afe SHA512 eaafaeef311538e1162cc9ac2174c31ab56ece0a8e7fcc7de536e66ff1687193dc6f697dae111c60989a230dc303404a3d30dbc11eaee1eb639fce52809e49a4
@@ -243,6 +309,7 @@ DIST lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST libc-0.2.158.crate 751340 BLAKE2B a67318ab24bb86c4df682cdf846d51f5f0a69504567acff43cc6e724f2641521945dc75dddc10c1c265fda960cb28b528575b5d39ce321073844dbddbc77bdb8 SHA512 c2d90d58480cca3464db475d7c70cd66bc1492239d8183038b48def8f5d8a437a1e2a2f084cb2bd9456889221b10aa07981cd5e9bcbb6bea28a2bde3c76f1105
 DIST libc-0.2.167.crate 757723 BLAKE2B 38f1657dea6d13cb6cc87c8cbededa9f0ac280e4f141f780719164451c941ef873cf6348fef7ab249ba7eed1cbf6768c6a8dc9a51796007c8ce31cdd2f90ecaa SHA512 f6690776266836371e5f9e20ec3a93bb17bc4296219755750e4e70e745016245dab9e247fe564e0f21d10d0c7c97ae97bf54da5068464a48ebfac244cf699166
+DIST libc-0.2.169.crate 757901 BLAKE2B 1012cf93d8975aa20fc3f2332e253426ff66be6aed63ace5292cc8568ee419b0f1a4b5b39ddbb78d9c2dfd8d72eb0d068c98faa229ab55556da5e674429f0e97 SHA512 c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce
 DIST libdbus-sys-0.2.5.crate 1557017 BLAKE2B 4528c792d727e71141ee2fb2bc7080b101df650121487c420c7c6f3602d2ac987deed7ad49bab850619128f258c1f3a94364f7658b83fed16167944c4ed12c88 SHA512 94ce1de7e1f1727e923b2042aed6652f9d0e68f27388c186c37f7aa2195fd71cb3c92a2bee7e8628c95f36ba2d2a38d25d9804900bf55eb13af31f790bca2847
 DIST libgit2-sys-0.17.0+1.8.1.crate 1812997 BLAKE2B 91f61437450398c24a7dbb85803665a0cba268615a0e9d8176e094a192b9e8441d5d985a430722ebdf8c003acd47d40dc5b9e464fb7dae8d9c12b3adbad796fe SHA512 4c37c30426dbba1d9981d65ee42210ec07e2dae73ce2d18beee17b161eb96de0c7b1696cc8b97fa514eb9fdcb8b853713cd19174fc55f033b6a9c1e25520f75b
 DIST libloading-0.8.5.crate 28902 BLAKE2B a0fca8f8876092e874964b3dcbaacd417451704fc1d687669a95a0b9df22ccda73a754118ac0bd706a7c7d86e4eceb2ad012e20e341d71548b34ea8d629bbfdf SHA512 f332884fa75cf210460f4678d45091345b23469c09301614c476e95bc54163afd6d4f098a34f9e0d529fa1ec63892395b50957598070ff327743e4c3b0871074
@@ -253,10 +320,13 @@ DIST libsqlite3-sys-0.28.0.crate 4975624 BLAKE2B e8d9e637a9ed616372e6e9496a9a709
 DIST libsqlite3-sys-0.30.1.crate 5122296 BLAKE2B 3f3d5ecc434af6ce6e28836dc6bccc812d53da909e5e4a92f0eb7b6dd56c66c5243e29901867df2e72be424f20fed6c896da59bfd5349fad831a6305cb25db51 SHA512 6ffb2a23a78f3221ac8f6c9260713741970e522bebc1ec7f3e1d7405f25dac9024ebe3a73d76a6ed74dc7109a8333d6936ad1c64a0a7c75d6d81f97c3524e952
 DIST libssh2-sys-0.3.0.crate 514550 BLAKE2B 55a24d513420e0222c342d252b1699cd583dadb37099082e0ea068fe064e80f6d82470a08d03654c17f50139993f07e20dddac4d11f0574c79040aee08f512d6 SHA512 cb8dfeade699d97fa5fa393bd87315f44810731f78458267ab098a08d949fde47fd57b64ed3e882c10a83ffff8f869de13eda50c72e140f57d802fa07650403d
 DIST libz-sys-1.1.20.crate 830422 BLAKE2B 26265b1faf04f7d0cfd751ddf003585b1be59fcf8fde3ddfd86f18cc3e2d5c3b62a808f47c01329a57759d14fe6283cd94a72eda46d5c5031249df0f1696ab03 SHA512 9b537e7c01553e782be145223c6d174601ade3a950bfd0eb4ea09658da5b8910cf0d0c5984672f9d198f73d5aa63d21e0c20c4c44ff7d0a017ee11ae4ecf4859
+DIST libz-sys-1.1.21.crate 839973 BLAKE2B a65a5a00db733817ecd83c527b88f01b9699c4542dc673d48706cdcffa45f7d7b54da69e1ce998f3c7194b335686e304ca4d0c93d08f776864ed79f9b69a13ac SHA512 4424c93c60468a9460e6071bbeb430066c34827af900242c4f7e654fe2044e85e5f6d174c37d92ca821ce895e70b8f3be9db4a6f320dae8208fe3929bc3422d9
 DIST linux-raw-sys-0.4.14.crate 1826665 BLAKE2B 804af73daf396bb20da14f831f26ce06325181de14f0c277350bd22d21789f2bdd663a964cc0e7c5cbd2e084285d02a401a6bfbb3e8a8f079c120f9488b56f99 SHA512 28149660bd975ede05624af3582d5c78f498239f5d89713c2c32f5372fc16f4ca024dec35f81ea973a2cf986098890395dbda06ac6cf4ee29df3f9a0e11eaea7
+DIST linux-raw-sys-0.4.15.crate 2150898 BLAKE2B d1936eb74377d9bfddccef3830b56eb716c38ea3cb7e13b73325dfd00f9fc0df74bae49e4214dd7f27c257403b8b12cd1ef332d53336279d13f7e9497caf4135 SHA512 b5c39181fb6b901abddd8b2e7b449142e2e5691cddadb8e6b74ddc3b53076b1d410522cfa45af68dd18befd24ff12313c2494cf2cb0cf142e2228bfe42014309
 DIST litemap-0.7.4.crate 28257 BLAKE2B 52989ad353a782e9592357530dca3504e3ef5475bd2f1b2c795b60825d971ee6d3e6da51fbb6bbc26cb3c3303f6a751a3e15d1caa78c0cb888288a965666279c SHA512 5009c486a87b2f52237e15e2e772365424e4780c146776656d8e1551e52bc8e06e5c1cee8db1c59ef20d0463962fc07ba5221a46020a82df17a2f623a175f58f
 DIST lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe884dd69c61c54dec978733b95a853c3e5af26f237e48ebb4ee9dbebfce0f6c06067f74a3d122e92f5ace40e22d7 SHA512 525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7
 DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
+DIST log-0.4.24.crate 44882 BLAKE2B 24dfce781a5a53fb214a6fd7795d5c593fecc7b1c20bd2b001f135101c520296b4dfbbb9677bd3e82b3655a9b25867a068eabbf22c77c2e67077f7938c51c1ad SHA512 1117fb0b868d48f26681c7fc2a4508eeb6dca0c37deb25dd065a4b9ccb6a014c4d43d75b817d58c98caa9db8ed17d66c714b67b16d04802bad9c357fed4720e4
 DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
 DIST maybe-async-0.2.10.crate 22107 BLAKE2B 2b8bea636cc271574bad08313b86d5b3a2163199addb0b6320630655a8b238d811db302f1c9c7168bed5963f0b55a90554627c48f59ec2ccfd5674303b1cb344 SHA512 c41fc42385a47706167fa9c51fbd2e4dac74683c362d66f71705de4125dd639a518207a2ae4cc3e5f913279ea205d260b0ed3fe2edbce68f27ddaa9e9989e59b
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
@@ -265,6 +335,7 @@ DIST memmap2-0.9.5.crate 33280 BLAKE2B cffb232e313c40c6a698ad6c9e6bf140193cf1cd4
 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
 DIST miniz_oxide-0.8.0.crate 56343 BLAKE2B e4abcacab4c8698d0489faca8556faa7bff53d272ea0c80e2e7843dc0f6f9229b7d5b0a17ae210344722a379853e7f14212505ee05da4e60549081cf77717c1b SHA512 044b641ce6d98d1968c1ee0906f91963f9f524d6f3fdf3059708177a759e1d498c63e595d3a3f0f9f3210c45c828b9b70274134ba078b899d7fefc2bbddbeee6
+DIST miniz_oxide-0.8.2.crate 59068 BLAKE2B 22808b2137b4afae29cc5cf25d9f643d24824293524542e2cbac3ed0fb0341417c052310602a6f0a003843abdbe7715a95a6068c807cc0c843ed867958650215 SHA512 e58802e332a72123954ba1751cdb59509789bf930ad74da3d06e2c1c3737547fc0b9848be816a66b6585830786b7a0fce7c9fb574789e15f3b540709563cf854
 DIST miow-0.6.0.crate 27801 BLAKE2B 60156e9f143da8a1a120b79dfba48c2e3a51e3ff3f98f12ccd8c16aef6366431b9c9b3cbd69e8e745518497128b55a975c51d42c2b915c1717d3b7f9f9d14cc5 SHA512 b2fd13947f786b2d54a4c2055ed7f375234fccb5a66306793c819b78b0ee226b9a361570aca903dc97c6d8ab548132d511d91a8408887f625a1d2aa5538e1d8b
 DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
 DIST normpath-1.3.0.crate 20719 BLAKE2B 6f7e91bd80a6fac14fbb72e304aecb6353b05a5e970d75899b8c40313b095f79463fa4cca1f7879c11d41e2437d499247c36915075b4190054f2f9a810e1e682 SHA512 a3cd341d1b4ead252f25a77e42165cd5a6b1459946ef55a5319558b89301e01e445f7cdafa13231836d336284798e48cd4e17632cba53a17213badbad3ce7a6f
@@ -273,6 +344,7 @@ DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294
 DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956
 DIST num_threads-0.1.7.crate 7455 BLAKE2B 282514d1c6ebe67ab2c30f91efd5b6c8880baa078265e22d5d7200eca4f96702aad8b537ba772e5d4e680a6e90fa6919fecfcf37a060668b2a618bb01bbabf2a SHA512 60eecfe49c1afca8efa320c5f4d0cd794f6adf8924193682c903307f484ca0a1ddb56102a772232aca040f29651bbe26ddc1c4939e1f030e229d179837e06bda
 DIST object-0.36.5.crate 327435 BLAKE2B 1ffbb8ba57024a7273217edb1db76eff03e0689f81ba27b0aef0a622972e7f6acdbdc480384b50d603dee6c38c960fd25125a313264187aa0e429aa839198dd4 SHA512 b85375ab3660a8a0c57833c28c4dc665dc0664857e1eb3cd472a61b9ec8c16c470b16475545c2c311fc23cb3c43755967f93feac12c7bfad013cfed5f879e355
+DIST object-0.36.7.crate 329938 BLAKE2B 0b02cf2f44e99002909b38125edada1a259feae59fd0e5ef52001755b6878cac710c87c60fbafdbe405281e039f68572ea3d8093d16128899090fd70df7f2fa8 SHA512 dd69172349ecf51fd2351d32cc4453760ca1d15e854a1cf5ed99112032901a54b4645b24163b946deed11f81d3e3035e1a5afd8bff20f335dbd05eceab073478
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
 DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
 DIST opener-0.7.2.crate 19229 BLAKE2B 73d95b2ca82ad0d21deef1965e0a6ecd88872ba7e73028d694dbcc5759a5088a119abce05f1286b7cfd5aaaa2f69684e8c3d1c7fc62608593be25541493b4e92 SHA512 15e2c6262f887bc53e21f1ba1acf9d3a5c97f011e6b54084274f9f089e658fd747b2c16da0a55cd5f56e9b771306c8f56319939a9e503a6ab5c3b9475808191a
@@ -289,34 +361,43 @@ DIST orion-0.17.6.crate 186853 BLAKE2B 965d68327f27735b1d7bb9076722cf23f595e70c6
 DIST orion-0.17.7.crate 190932 BLAKE2B 561faf4b690a6ae12fd34ad510c11b89847989b86ef20a04d1a7df5c9f664b70f6c9b7aa894a1aadc9e2855644bc0c4ead318c825a51ee17d6069f384033e5d7 SHA512 6d885e300cd6eda26bd53f86a4811b54d8bd767613e8245cfdf38c42c8c86385a9dd080dc40b06b62e04677da39583f26a96333d90d9d55431067ce21deda47b
 DIST os_info-3.8.2.crate 26400 BLAKE2B d685f62f4273a75a5820d5445892fa5878cfcf3763730c2eecdf15fee12331884d04906b7c105f437299ee01f2999f77b6a4034e94f781bf694cbad8aab82b10 SHA512 4454fb13dbec94aea5849427742856619abe77b2209dfd0a60a8f446ce5f843b423831632786eb850d0493e023977fae705d0fabff90798774d1c32366984916
 DIST os_info-3.9.0.crate 27335 BLAKE2B cee85ef20ce6233c5f6d27f07be9d47f7ca3166cb5cc465579258593ab2c8784d0b28619f12cdbce6aa1aa00bb41f788492b4f948a284bd6004f9279bece0e87 SHA512 abb0717a5f3d598d90fa926f105693d3ae264f4e351b7101da922cf3bc5e414cfa65d535889aef1e79e4e1b07b1ae2f7505bc508933358ca35c226848a9c4965
+DIST os_info-3.9.2.crate 22875 BLAKE2B 832ce63a970269fa6cdd89c4201b498b42da6874a8a9893e67412cb8265d269aa73fa8c5e43a0346569b665d5eaee7dbef5a40ba6224302396fafc9ea291bae0 SHA512 08ad32f7e2e8404c9bdfbe1701d25a2ebe4c8f0d333ed7c595082a9ee05ee749cc0ec1eafcd53a97e17039e9c70e54de19b6bc088be5831294c6426e64060ed2
 DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a055ce717d40633b789b0d005be2bfd6616448cac61bd032e74aa6eed212f1677461907cea2f7f7cf536c157f SHA512 f79bc3321f45df5e3d0e5fa9c4e60524e4e28dd3729a09956766738adcf99ca42c187a01d48701ebe23d39aee00a19d4a07da798edc781b942e866b339613532
 DIST p384-0.13.0.crate 236495 BLAKE2B 240fa9cf7cc066cba64e9c89d78ae65d0f0fff3e875b0175646114784a2eb0083cbdac9e1a17e6de6b3e9a6074b8f318e8d6abfe63b7de432c2d19dfc0fc0091 SHA512 e81451d336b2fd0c1dc3483f1e586b7d4059b3ee7cfc935edca6be1be02d23b1e380859a44d0a6cc6538fbdfbb22cc22b8d3aba11cf90c6fdfd0e8edecdfba17
 DIST parking_lot-0.12.3.crate 41860 BLAKE2B d1899a1132035aaea3a784290cf4951ea3b36b2018d407e27d333b2a2ce3820e040d635009c44cb6e58ad07cec6565c0347af6f6fb02954eac2d4c348bb036f0 SHA512 368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703
 DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389
 DIST pasetors-0.6.8.crate 138403 BLAKE2B 6ee8833d1437bfbd600bd2c82f4f198abdca396ccbe5e0e302bef2216b12efcf407a22a71699d2f7a6ac7597178863ce8d80ad0a9d353525a8ee06f8f529ec88 SHA512 5949694252bab7698b322c50b8a8b6a6917b220eade511430f0d59714af908a183b473ad27a3879bc0c8f2dd25f449982cba24d2d6d452f0df547d2092487fa1
 DIST pasetors-0.7.0.crate 139017 BLAKE2B c53bed983d6658a361dabc1eff6f3216799e0933b9291923d84c6c563c09e97b4408a4c755028aac5bdfe900e32d21ec698847b01889e6a26ff71af19da5a9ae SHA512 df1d4b4725eb66700463e7e29c62ab0a4662e6338fdc49031704796d5c003380c0a8d7f5fb76909cd7da4c6ad07b9152641bb108fa763289bca8c0da1245411d
+DIST pasetors-0.7.1.crate 140354 BLAKE2B a0e45bb78d4f5c540672aac5f6fb622c84791f53c71703de49383514246d9341050fd4496224a547c74121082f7d48c28eb18388024ef0c2ff67ddee18f9f694 SHA512 c45541cbbd8e383153392ceb1b1d9b1811e647e4695a4ddac1fed1b21f49d75d4a181aed176de0f54f0a7ca74ae951d547fe3ead7a2611f7ee9c910818283df5
 DIST pathdiff-0.2.1.crate 7142 BLAKE2B 7f9a162c2add4acd69a81171fdb31aa9a67beb4e1be0fe93d76dc46b320729257240fca5d65dee38901f6b6ed1e536e3fff09c93cf3482859e6ba27e7206fc5b SHA512 a646f271ce81d5f6d4a8e0d98a2c802a8796a961cf8fe8177911e7757bdaecd8b156ff22046f1663a9efcd5fef1e6f000e5509d3949dbaeb494126b7e8a546b7
 DIST pathdiff-0.2.3.crate 7495 BLAKE2B 4fd2dc1beb3385b86603404a344d992ec8454addc580384df4004df1e83bc326283081f591b8b1d87d99a4c9f08a3a68159776c0c57a64f7299c1845961ccf73 SHA512 54938b311d4eeb49d1d7418d2ab7ffd19bd308c36419cf3ad3ae58785b971fbb2fd2d8f5907e0c47be7bf74ded98c62deeb90f509e6cb0edc6d3c1a69dce3bf7
 DIST pem-rfc7468-0.7.0.crate 24159 BLAKE2B 478d355dd970b9705ebcf44d74d61ae0694db6de16b2018548fda88546f53e35b965ff72d939def399a49fe97d3c8317a10385ace94b3d552797ec64ace1eb8f SHA512 f47d3b6c7c8bf4547916acc2a3d6671f6c1308e74641419c8f1df810d8bd940aba8f94d361e4cbef3eae3b7f11587cd3996a11be3be41d19111abfcde7a9272a
 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
 DIST pin-project-lite-0.2.14.crate 28817 BLAKE2B 8e9875967059faff399fbffff82cf8835982c46ea8df942acf50b038e3f500e04d3d8cde39da5a71ebcc38b869553f8c49830e484d1109b353247a4cfdeda89e SHA512 f90a6b9f5ab8701718f72677a4f3597c1b9f32e5fa53198b47a94696227ea37815997599abaa6058b217c5b32a94602582c6b13fdb66e2d683bc98921de95293
 DIST pin-project-lite-0.2.15.crate 29683 BLAKE2B da9dd581eca047f089c2a069a355caf66a631b3ff81fc07220a3c378dc77ea2c399b165ff8a1d2f6556595ec52dc1bbdcbbdea5ad9e5e317281650c9158b3669 SHA512 ba3c22c70f98ee0d0e78fb8a25bdc3100b26c3f03f3e4c6c0c238fde75774c5634d6014660c39406a828d1c28f17f44f20fe19dacd331c4da2f4961a7f7c124c
+DIST pin-project-lite-0.2.16.crate 30504 BLAKE2B efd0b426fcc6ea8852bce499fac61f9755a11c6a2999cbec514f093ba7b3f94b1f2d437ee9abb243e31f3838ac1c74491a212851d7798eb249e209b35e015332 SHA512 971adfe54cfed304647fd944c1c915e78b37eaf0de3a582fb984a5e91f1b7d4db2cf0f53a9a64b64427062d4b41c0a36baddef782411a76ae3be0f8ca45f0718
 DIST pkcs8-0.10.2.crate 26360 BLAKE2B a62b5b7386eedba6fcbc4cff2b103b899dbf6179101445283f9076080489129543561af1ad6f09061564f68c28954262e49d0bb3e182f2ce7495e19d6f34bd5e SHA512 87127d51f0e1fe085d46b30394f2a580e857cd64f5c6fe4a3ac3b8871230aa426598dbb007e8bdfd5d729b99a9c0b4d84116f0768886605342d2ed112c51dfa8
 DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
 DIST pkg-config-0.3.31.crate 20880 BLAKE2B ab7676e810751f89639b60ae70bdebe1d57edc76319f83077c3680049a701a26e72e8cc485fe77cdc4346fe3571d32c59e7384c8c86fef17e00d7d81df5daf43 SHA512 ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4
+DIST portable-atomic-1.10.0.crate 174760 BLAKE2B 9a05d6162c95f5140709cbd005c1997449fb6373700e8ed3966e3379898e95f3cbdb90b387f1c7deb3f1eb33125378852a7168d0d22b433813f6c082112b0365 SHA512 fb47ab53fe240d5b0824dd068c6dda473d3e71ae6f5dfccaa17262a8b6de0e1dde05d83975e53bbfcf43f10ef5c634fc024f94613937927ae93f1adad1dadb19
+DIST portable-atomic-util-0.2.4.crate 47043 BLAKE2B 6a8e122bb2b9eb8262e9eb790f336dbb602f6c086f8ac025740c043170360d5474af578b3842b06ec51535535de3f4d1b6753ec54a6871dd0396f5c1012b0bd4 SHA512 f2266e78576181123aaf68e7b5d3523a368fa8136d447bac68a08d65c7051dea677cea84491a1a03b9decb4704b2f9392574d68dda9427092a2ac92cfa0affe8
 DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029
 DIST ppv-lite86-0.2.20.crate 22478 BLAKE2B 9d68dc36d8148047d571c0147ed29f586f3c6ac9394b56bd955c8ae5bb18f5a8da5369809f7b8c3199074e23660325158c32c62e1bf69a16cb1f5da2a01f5df0 SHA512 6d171f63b42296f7765732fce3af7ea05d0d81f1541ffb3ad86e81210715ef4afe5bc9e58926e97e757aea6ff96a8012c8411eac78be0fd080898318ed21d7d1
 DIST primeorder-0.13.6.crate 21296 BLAKE2B 2ba479defa1c26d14f8711f6be5020eee9bb91a39fa7a7c14a93dedc6de920e0ef1c9f6240d308233d0e0d6bce4be9500d0e9cfb01b6c4f9902e0f77a2f97352 SHA512 fdf52b47b36403d5218220b886a3ccec7828731b5a59ea1d48a25fa85de754544fa9c94d51356d2ed904bf2d908bdb4fa87c53e597a3c9f2941d7310f70198ac
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST proc-macro2-1.0.92.crate 52353 BLAKE2B 9aa29fa6f1c56c0392a94a81b4c61953f4d185012cdca37e356817845535da79d7094bf43472ce63109ce479a2fd0cbef4d802afd61daf92c4db303bcac60e7e SHA512 e614f08acc0a7e97ef580479cf5b682378df1ca16f09bfb2296ebb3490a435229dea9d682c621c54ce57e8e1d3b7803eb8ff83c88bd02e07228dba6d02f14aee
+DIST proc-macro2-1.0.93.crate 52388 BLAKE2B dae4493215b88f68cc485bc0ae80f0a48ebad68e0260839b1c367832d1ab778197bf040647b3fe36cfe9d5f7a496e05cd71b5914f531eb129c2d458d5f0be896 SHA512 1ae650e390e4f1b18d05f42d2ffcd025cabf72568a326cd85496c722600108b0aa0ab0161b39fcc931b8b302427f678650e703f4db57aa1a60f1751db881dc6c
 DIST prodash-28.0.0.crate 90695 BLAKE2B c4a78e86174003e2aa18899fc9214acfeb04637d2b90d64eed17d5dd2569fdb4a58991c23f6e6fc21549e4412eacfab9dccc50a8e62683e8d91a922075968f4a SHA512 36a9099fdb61f604d902d28f7082195891056af916727f7d7b78986dca35539238de0c4816c96ca2c3e74fd04f503c59599988e95be46f0ed87af70ae8ef3c70
+DIST prodash-29.0.0.crate 90594 BLAKE2B d35c31cdc949591e81e73e5cbdbdf52a46d3bf2d7b05058c28d7924a9a8432ce377876a310cb0e49b3e7fb27fcecc294717def09810865e621014d0d1092ee8d SHA512 d7d625c4679864183da78c3c036f84805957db10f63c52480e9defca3bf4df23476e65dcfb5a9cffc46983db96a97a9dde7aca119ea0e6e9b1889770f7072705
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
+DIST quote-1.0.38.crate 31252 BLAKE2B a3836efbe5c21dec70c684002b47b8fc7cef643c82ee903b537a48bc0707a28106c4b33d98e60ff81e04c7520f7404b1dc4d49446e8d91dded517e476c36e1c2 SHA512 530c47c5e6372b508bf5b2b88a138408a7afa5ef52c47280ed20eccf39f8e97dfc1e0a18c1bd5472efcdc49a7a1e69566333a0a1b4c0b4f0e11e6a7a85bfe8af
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
 DIST rand_xoshiro-0.6.0.crate 17125 BLAKE2B dabdc3641fa85cecaa057d988396f55bbefa57ddc44ec1989958b40ea7dc51ffc4d04cff556fc6182d202cfd61834256f31fbf8c71c40b37a230610095c0b6a1 SHA512 dfdfc6bbeb222f6badc186773f3f3ac7c899d76f7274c33fa7bddf00a1a02b9eb6990f7f37fd37097085cae7a86d21e0819f8dd0d254aebda66fe367b8867b34
 DIST redox_syscall-0.5.3.crate 23830 BLAKE2B 0a38235ec277144f0c3e7bcb1d273c7f357d85aef33dbd06328ef16bab7df0a07b523431590899ea58d55e8e1d84c32392478530200cca3a9483e8a47b29e233 SHA512 777d1208004b7756887d6c5745ea408972670e59430e1d299d01a463ae41b98e0920ee77aefef8755fc949d4799dca679afaaae9c1a7d060f76f69af5b90427e
 DIST redox_syscall-0.5.7.crate 26249 BLAKE2B 97f848b130403686404dc193415e5060c32585aa3638b825b4775e54d9a058695b86457ae9e3cc0240bcac27ab4c05dd6b488bdc1c797faecd236c6e477fbc3f SHA512 e9f2d254279a4063089436b699ecca766a997a72718d132a9b35f7c8c8fc82c4b5e25fd8f3e6cbd17920fec484140db520c262376ed1c74f847929b7f43fb97e
+DIST redox_syscall-0.5.8.crate 26319 BLAKE2B bd69a69e2a0f3d84843a8f76199ef6b3991698ebac58b23f69c26d02f5f3e24e77a9d5e8259e9fbff3887f06d15ced94ff23b5a3272ab475918e6e3e753dcde6 SHA512 5f9632f1f89f4963c36ede4da9b955c3474b673c3414d81cdbb61f46c08eff67167f703a0b06b239beeb2d720f8fa592a5493c0f7e872728b5b95f561ff11348
 DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
 DIST regex-1.11.1.crate 254170 BLAKE2B 5cf41012fc2ba8a006c0eb4a922cbbf1614bf300be361c9e2d98956a9a5e9b140e37bea09132fab7bfb633d4439158723624bcf45e8c619c4061b399253c1b82 SHA512 d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
@@ -328,10 +409,13 @@ DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff
 DIST rfc6979-0.4.0.crate 9140 BLAKE2B 662d967b1d818439e972d19bd251a4e3609c65bae945b4d11c0ff4966e9fcfaecb739d0b63bd767cda6a22e77a52f3386f02cb27c5c76ce9008837c882f8df33 SHA512 fb68114f5f8c1e7b921ed175fc01813531a584b8cb2df1264b72e1925bd66b4c021714b3627fbbcf3fabc26e4d6578c4d246369a0c98049d4058dca4cbabb20f
 DIST rusqlite-0.31.0.crate 152252 BLAKE2B 5ef8396ab6ee9f6887466e7ff856c6260f40ef85361ca451e230d8590019d6ffa4952df15abd21cf300cf51da4a6ea4e82f5dc88dfba474f2f62036cee76caa3 SHA512 6d20b015ab72d3d75c363111c0cb41feae8bff83104ebdfcb8e5efc1bfb63eb48a17f6de2e6c96cb1e916b4795fea6d58466ab0820b151b12d1dc4c29800ba66
 DIST rusqlite-0.32.1.crate 155563 BLAKE2B fb310ccf297ca0be6f0fa045ece633f12c5664defc56c71763fb44f60292e85103ef235cd37eb60fb2cdc91cbdabdb311b6937696bb96146513f687af9a786d9 SHA512 f21986063af655842c41cb1f9a7711d289d52f69850d02b7c08eb5381e43c0b740fc047912dca5f9a745469ccf6bed12b751d2cc5e351adafdbf37fd69946cd9
+DIST rustc-hash-2.1.0.crate 13316 BLAKE2B 3e93739234cd36f3cda5d71522e3d2204e98b1d134cf01cae5a93a93e6c4340a7b1b0485c339f312145c723185fb83f6aa87ae2a0b9b726a34cd29c19d3ede56 SHA512 6f6a40586fd7a99016efd53888970c745888a06bb6b9d32eeb4936bcd16906c90ba22fad82a4a6b547df4b6c9cf6d73eaa8d36af097d65d3d6de18a0669d5ad2
 DIST rustfix-0.8.5.crate 18521 BLAKE2B 4c0b83750aa51b28cb4d271112e474224d548b2025e3eb2cc82e348f9d190fcc2dec55ab912962c12fc6a9eb2dc928c5a96f26ea5673cde4891fff65b04fbbea SHA512 ff45cdce4537c8b1a868df4395d7368e74a6416f14759e3ffa449b1ac8e7751ec5189681633effbda3b48d5feff6e9bfdc4fdddad4368e0eb497fd417ec53587
 DIST rustfix-0.8.7.crate 18710 BLAKE2B 6882e936c69736e38349fcf335e240c37ac3e16287a1937c4a53237cead4ea384870b53a212f0e9126505e7dea512e7f5b94c11fd82d5b33e24bfdab39bf61ab SHA512 779258dd6c395ff38ab808d96c2350916623aa39c5c129edcc016f5045f8228c56e64a220a493803f84fea27f2d233de4d5686e4969bbf9034d836acba2d83a6
+DIST rustfix-0.9.0.crate 19517 BLAKE2B c3e696460bf03aee301e44c63043ad7d4c4134abeea90d8d91d0b4eb49356efe573d9db21fa262902f27ccaf71766a2a8412d6c3d3c0bde472e031aa56d8ae25 SHA512 fba8acc36b9377b506d09404d32ee65d2ad1a9fee95cff6c1040edd563986095443a0b2a7d53fda9569bf69787438733386c5ca85327f9453b0e329b96eeb7c2
 DIST rustix-0.38.36.crate 370932 BLAKE2B 0c4b963c9045fbb6fd2e4fc91888f574de531074a4a131aec9d8d2f44f3839778bce601050848d9edb2ce4019a94d3226835f7a776af682daf73e5cc52eb6f5b SHA512 2874bbb5fbba8b9fe883cdf21e9662e84f32a3fdf50c8662a908754436d16d177c4c01810fd08a01b2690c79bfeaf8abf29e5efa0987348d93671499cb2fd550
 DIST rustix-0.38.41.crate 378463 BLAKE2B 8af17ffb57da36df6407e112d78e8748fd9931a5cc451530bf46c4c2a57685a9ff5de3591e3d7d01d033060f24f55cd1444541e2899dcc622869f077116ef847 SHA512 faefcebbc668605640d156800781f7c8726271e15ca4cbde4057fed22f94032bd083c873f5595ec39d5cb00c203fcdf7cb863bc3cb3ae79c20c2aed4423f0ec1
+DIST rustix-0.38.43.crate 379134 BLAKE2B 7e527b0a98485c029b89f2946f07226d772d9ddcce2f21d7fc7b74c2f2377f780d7fb0529f9af1be6a750a0d1a00393534708dff48f4bbd0678cc75ac1a9a6df SHA512 0122fc3ef3b1199105f63e3d06df0992b7fbf4a3f0bf54cf68ff8035ed96329c90c2ec30b365f02a7a9ae1f0018897489f5be77787b4048c2bfe49b30d7839df
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST schannel-0.1.23.crate 41667 BLAKE2B 3f34ecf4cc519f5302f0ab5207907a275c68e6fcbb47630aec4ed5d5f1a1cc7475f6d7a8c22361e9878002f9f54314c1f630ab0c1f77ea309714bdb7ada6c9af SHA512 dfce25e3b8bc09d8dd1fce2783fe02ec83f74697cb24aa212ef9369a628685ba488f821cb3e5f863798e0e59995038c8d748f74b89f7929eb8cfd804d5066b84
@@ -339,18 +423,25 @@ DIST schannel-0.1.27.crate 42772 BLAKE2B 55b3cdf596d6d490fdbc10298eed7cb1b1bb8d6
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST sec1-0.7.3.crate 17979 BLAKE2B c30d4e617f9c0c21b80f14a7df88a164ad43f4c18fbedc1ec32af41193053e67ff6ea83db54f46c8cd6389d930984120c2a1688662fd8083e0c23bd4995d510b SHA512 be646413d84b39a43a0af478854f47db3b167c2bf1bedf7a58392782c423aaaa38df3b3676f9807a98c6128152295c426edd16d67d62ae7048caa635bf39641e
 DIST security-framework-2.11.1.crate 80188 BLAKE2B 844d36d2b2216cc7055687110d54ea783a7ed9bfe6375fd4dcbea267ec85531e666fe002648110315f42c3364ff5ff5aeba711cf8d1f5358ba65c8393e96f55c SHA512 02786d62fd9dded80bae3942896bc8fea2a90763427f582bf5d9f127ca5682097b59b5dbff2cde373198ba659316ab5906a68d3141ba00c7408b73ebe353fac1
+DIST security-framework-3.2.0.crate 86095 BLAKE2B 711c6fbabbc381ad08816aa9c3f1a66fccf05b7a3145a76b29845e4b2f059dfcdffa4cb6eea13967f3cc973744160d9d0e5ab8f84bb06b6d8b6d902f8058e01f SHA512 bbef2a7720ef18e3e07559b852ce3bf0651fcd0b8a93cd01b512381c7afc2782cd4ef1a61b29fa439aac630b1acbf3d6248749a7c3b839707f74154d131642c4
 DIST security-framework-sys-2.11.1.crate 18755 BLAKE2B 6e4f8617ab92304a435489492f1126eff2913f5332dacb8b48704b5f051e87893e5f4239ee5d6a8e5c350d14cf5226fe57a36d8119b1e150407e9b157e74232d SHA512 8565d7ca296995c2bba78a328758c84c500e95cbafc988cb595e040ce95d4114c1de46fa30224a310981c3dd2a9b7d1d98c87f129d98a0b2fbc44c72f9085d23
 DIST security-framework-sys-2.12.1.crate 20112 BLAKE2B c03abcc08f068e8cd4dbfb4d5054b4c0a75cc68f0dcc955ea5f5f958db9c28588841723bd7047207dc51bba46868fc1b8d3367b612c7f4a07984d94fc8710cd9 SHA512 5ecae3e1280d99e3730ca3be3dfdebd16971d54b8fe167d29cb07f7b3837a2bb9db2d8131bab679c395e329b10ed28ad9ad8d6764048f6019587d5e2b52c7eef
+DIST security-framework-sys-2.14.0.crate 20537 BLAKE2B 50a04eda370788fb769600b0df2f984155d9ff67c753a8b138568c648fc23f90f076092c9a8f984aa3b6590c547171e53b968ecc4f80f6b7edb8cbbf23bce31c SHA512 a6b5a391450ad91118aff3b9d8420e1099fc9f96926043f5c4061a1fd615a00bb1f86f5a06b9a549f45b27a43b5f9ceb5a015d8589d7df258a77dd4b4dfdd7e4
 DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743ad0feca0929bf2409eb81e03637ec5f92ba9f38ea386c4ee5cde72bd3d2042083e2fb0d6fa0b839b1c5093a SHA512 5ea1fa17c08d1280c3a4bc8d28494e88ee05acd5dc969ef6f0c6f91fd3b5a8fbe999c9e8bbd2da383413038b8d29fabf02b87bd5265bbb8333f3fcbe409103ec
+DIST semver-1.0.24.crate 31267 BLAKE2B 934f55d953ca52f6c11696889182e1e4c660a6eae3917b15b411d91a18b22c6a1178708caf95da93e70e6ea97c0762ed9154333d60bf0a08b156ca7b50c4077e SHA512 751bb04fb50abfbb92b2612e1d1097f612a1ceee1861852681d6ad67fe459d77a72898903b14f2f01d8185fbbc022c7471913785610c2a8e9d6530e48094869a
 DIST serde-1.0.209.crate 78364 BLAKE2B f6b4c2bd931a8067482ca033211c4e85c0dfd6084cb599c38a9ba666cce30489685a3a6a8a539eb6e41141a52328943dccbfe25dbd857af16665094fdf7c3f45 SHA512 25d2236eedc08fa3b9d078a1971df705c4f428b7a4e6a2d28d9f0f9893c19de745bffffe3fa9f3c08074bf4359aaf09cc28770e4b14c21c66d6a0b9411738f7b
 DIST serde-1.0.215.crate 78527 BLAKE2B ca8e1175839ca45a4d78a155f5943396211408a85e0840b065c52948188010653d68fc4fc7b63bf2c39a11a6988abb7f6f3c6d878ca1373596e0a5d62186e109 SHA512 3da13f1a74393f1fcb6d659b5e060a11ecae358f55cdf4a2fd05bfc863fea6f75d3140d3bc74902f8feba8cddf7dae71a3f4e4e78e78e1b08ed46b3e4900281f
+DIST serde-1.0.217.crate 79019 BLAKE2B a0aacff795d34583365ddd469fa14c58a6cccf8afbb248210aaff3134c7ce6e34b3d03f437326d7c01b3e78f82a5d19c37ed9fa4372970d8b2793f2889288e1c SHA512 f97b3b54b9e99c9a027390405cc054c3072f49c92803a4ed5f5f69e76a179deda9d77993b645b3581437085912d881da88d0451b9e0da423c64033a23fdd8054
 DIST serde-untagged-0.1.6.crate 15741 BLAKE2B 34aaa48e9c5e7d0340275affa4e5bfe333002242f5e2369e9141e7498b3828c3da6dcc38d805b7c21bf395467ce0625b29d4065e76886e08a2ddd4515d378414 SHA512 d1659bc19c1b1fc9febc7948c82379bc10560dabcf92d6bbb9c890b4706eddd78f4dab5d7a0cd1f5efd06ce6c58a77175157ad3c258e332505666221f807e065
 DIST serde-value-0.7.0.crate 10249 BLAKE2B d2d3d687cf490eb0be1910bf82c09334ffe32efc485297ee228363e4dbb536b72e2c37f3d37a5f8fe61af7480fa8975c0a654f761c55e56348082e4605f2288b SHA512 6ca9a73420ca9fb5415730bac4daa30087b1722ed7966ae07f403497b8cab95e1e1da664c0581b9cd170494242d4e01be75e1d5f9b6ce19c538e7323da46bf76
 DIST serde_derive-1.0.209.crate 56023 BLAKE2B 752bc9f46b880d0ed8a4f7e29ffde1343c63c4be1e9740afb1a28dcbff5bedfe077eb51c7052adecfbdbd9942c30b63a27914deb6401a2ecaf70fef0f64cd80a SHA512 22c4eb76412bd73814d0b86209b110b9e59626f64b41cbc250755144e545ff30fa69972ac93d74f988a3a6a239d9138f4e8a23b283c746a0aa5fcddfbe077cd6
 DIST serde_derive-1.0.215.crate 57092 BLAKE2B f28bb66017599afdcd8d45c514b8e07854eb944c1dcf931e052a01ce421e0de6c20c13b3867da5922e2153e25ce88bf9fa27e2e68ddc9d212977f71fa0bd6352 SHA512 cae686bdf10c683149956ffe1c64fcf3e9b9bf0cd6e33b4ce7429d0ca35b9fdb55443693866c1202fa79348c6ea0f49ab3be3d5f857de4ae0818d2b4c8c67d9b
+DIST serde_derive-1.0.217.crate 57749 BLAKE2B 63b4930122d80d64492ba2718630513012202e42bbaa74510729ee66a0e72b8a1ad123784b479697ba562db43868f4bddfdf5e94bb3d744cd68a547471ba40aa SHA512 31020f4533d04b31ae125580a3c5093fad36438d324e2d9b063923aa8c125c654102ae7fbc3b3df892bb41db6b321962a23e0a37950e080055d715d15b18af76
+DIST serde_fmt-1.0.3.crate 8677 BLAKE2B db89ed0207d5336b3c135d41763979f878300381ca9a3ed19a8e9e509a57a747903f8c2e919c9f8b5fe446deaf1d6f22a9414ac42a5d9b946180441c2e209853 SHA512 d0f1a35b0a3c910bc6393597cd0564101179e17f9be7c332f35e8de56257a4ee1b87cf23b45791056c7546282af79044750a14b0dab2b0bc00d493c28dc7576f
 DIST serde_ignored-0.1.10.crate 11789 BLAKE2B 16900f4e424fe522a72158ffeaa1c279ea96d498317215d2da9ffb61963587914965c87c31023d67be67675721db693d9ecaab6f4b0e064ca438ea8087e8c2d2 SHA512 c8a0b55c975446e06ae6a6ed16690a9b0a942f9e43e84149a8d9727660283e7d42c9e0386af60c7186923edffaf1781013f52739bdd9ea0a5e22dbb006f5a413
 DIST serde_json-1.0.128.crate 149520 BLAKE2B 246eb865f64a0f161b79f3d4f783dbadbc930c4a19edb6c0fe8f0c6145c7c47be4b692d3e084b1b500820ece8e94214820978cf898926dd805bd431fb411bbc9 SHA512 9e6290d3a6a971b3c37bbc97097b8179e64c655779b43c7b75303a35ef7030f5401b3a5f62cbc95a7bd5f42ecbefb0b469234d78a76c8c1597726d8e08908a7d
 DIST serde_json-1.0.133.crate 150739 BLAKE2B 7891eb5b8edcc7fd09ab1e15d3881ffdcb629aa39f2bd758c0505700a5f2dfabd85b1b66c3b094268bc1627b346e204c792f4ca61efa76c54ab9cd5744fb0ee2 SHA512 20e65ec87bff319897a141960d13deb5cadcf821209c1ee8799f1dc7f458ce432bc62c16df5bdada1c8d3cc01ff23b8125e8fa0a03545d4614f32efd687dc69f
+DIST serde_json-1.0.135.crate 154499 BLAKE2B deeb22932145715d6a443b36b9b984b6ace1e254199db9586c48dcfdd270a3208ef127584431e19a826947df705de78f07e58d9126ee1c5ccd2bc73d1e779bd8 SHA512 e19c583aa4a55f1c3b9a4e49b8b5c6b66e91c893db06e52f33e87608be1ff0aa27996065157f45dd4d2c59b752259ae747b2d353fe7cd1d466f56cd8a97fe71d
 DIST serde_spanned-0.6.7.crate 9164 BLAKE2B 559a62c0ac00a1559947224bd268842f35c52f65d0d52102c98b5e683dfe4c36acb015edf97c5f79ff818dc575b3ae43c3f100d18eb7afc3ab9c96e348ba6794 SHA512 d0ef413867a705080fa68f84a059b4d04b604bec59323329ded7ae03e0caec49c89fc53640c1e58c27bb23b5c9f260ed176ac52f3a93d25d8d7643252dba037f
 DIST serde_spanned-0.6.8.crate 9330 BLAKE2B 630bb2cabd74e8d9736e315ac57c4d2c5c4f72264aab35ecc8e0040cb4186885722051a9f7b8a9006fd121fe58428cbb151e5cf541e7de30b6528c84e968f7ac SHA512 2343a2fda35ff57ed8ff7d8eeadd651821fce7e22f91c2d5797c6af7db9e009b7d637382f6f390c17911912865a5aea1ce87a86fbe36f4b6aeccb065a4c8942d
 DIST sha1-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f
@@ -373,20 +464,32 @@ DIST subtle-2.6.1.crate 14562 BLAKE2B 3cf4940b7a01f04715da1057f6a92b1043a6b86ab2
 DIST supports-hyperlinks-3.0.0.crate 8067 BLAKE2B 5fc8fa7f02fe3ba37efe9dd5ea7712ac294cc29d102eebedfcdf3f8c7d50c10a8c308a4858c5f1aecb7047ddff010b240351832a839c67ac66be2ec7d7e66eac SHA512 a64e441dd48a03324fcd159a16d59d1a65bf4745d15e251e315c43a4fe7f27fa15414dfc61616d915e33b1168da304e9163b249d92d2b109bf4f4b0d7ebe48be
 DIST supports-hyperlinks-3.1.0.crate 8235 BLAKE2B 587f336f430a404a17674438127a4b928adcfe3e11b54b3c1f4e8ae55af8447ad8eebbadeb0313672ef4668d0c9af62b44da94a64270919961d59b55a1aeb62b SHA512 6bffa1255e4b7d7556bd228208ed52a8892e1888aa1ba85288d2d8df2aff5eeb1cd30ba228a200cee87660f1b254ed7d5b6958a8396fd1a8d79375ff7c4874be
 DIST supports-unicode-3.0.0.crate 7825 BLAKE2B db1793dc8b669f0cbfdeb39032ae35abf337f4904a741eb9bf28735ddd53b81747aad8e629af99539fd655dd6f4ef8cbff136fd8bbd77e242951421f040ad02f SHA512 61fc1b6c827cf7a9b6ba7d077fb4bc72fd613742e711b84895251885594bd323298e77cc25b331be73ea41bf975ff913dcce0ba5b19c0b8c6d486074036701b0
+DIST sval-2.13.2.crate 26212 BLAKE2B 78129b9445f2298d3f3c721a90852e424c97edd4bd38d19c197b8d722b9bd4e45c300fa8d49cfa9833abfe175baa020d7aa26ddb8328bd5f0f4a0e896d5aec9d SHA512 6bcfaab3d7331d6309355c55acb41f9075e54e19ac3460721137641b01c8f8d81925691e721cc76334fa8356c32bad0a47d6adf7df65bd1e2643600899f08554
+DIST sval_buffer-2.13.2.crate 18107 BLAKE2B 01c7c9b2414a80c135eea3f5b82e87160b8cc6c0b273271f6569330cb091ccb9bfd3b16909521d8316b1838faef251172551947978e924d076775833373ddffc SHA512 bdb4f28283b490ba5cddce3b93d8e1e4ceab537d7bd5cdc3c4564e8c7659e6bbf02baa5c99accf5afdb3582cd0bf54d405533ed87b95223b8feeaf0e9d87f4ae
+DIST sval_dynamic-2.13.2.crate 8229 BLAKE2B 62536c9bd7b8f8b9fbac37c99ff64e01060e7ea2c2cb91789b0b2f800d066d4da2e9ea0d997c0d5a3bc0e3526367e89877838c2ebda901cf5cc8f52e606509f9 SHA512 3dc64a5928dfd95558175c1a0fca7ff2d92e48ac26d287026f3b0badeb3a1beb110793a74fb39b7bffa72a4fae1e8e4abd2672caedcd10295005471c21bae8d5
+DIST sval_fmt-2.13.2.crate 10551 BLAKE2B b8d08f0202999e7531b8f2abeeb6294786916f6c21d47ae10d25b22f2280a95b3bed5cc8aa32b23009ecd138041d3464fa26ed3c4ede656b224d4050aaea9a39 SHA512 4281d4a3938133b0dc4ad9fb515a68209fad75ff47d20dcb6bcf2eefba74eea9cd79a01586f30d92d41f610b21020190e1a59b8f494ea0ea66c6e5a10cab626c
+DIST sval_json-2.13.2.crate 11088 BLAKE2B 4864c2cda114bce7e080bd6ba00235dfc34180e6521a4487a7815ed41afd979508772a5af5c6d92b944e66302598866ad49a0db57e0e1245561ba5a515b1e57c SHA512 428cc0722630d5a010a57b35448b1af35680a9ab00b2d86cca71f86ee006d4a3a0ea0dec6f746cdffd668f3de2e896e1766d2d004a96215d387d058d43597f66
+DIST sval_nested-2.13.2.crate 16728 BLAKE2B a7ffb2fabcaa82682d169c64d25009753f169a0c11cb6d1c756a1bb209efb9c4f2c3575c4190be1d289eb20c6aa5c35e88113a8e66992f8e9682e9ae7b3145e9 SHA512 fadb99489941268050de4e6d10e53c9fa57debe8c07500f339b4983d1651055b5e7d23e1b99a0846fbba7a78f99aff3568688771f4e77b05d1395b9cff2fa690
+DIST sval_ref-2.13.2.crate 7935 BLAKE2B 2f62e0294d4e4be012933aa5b503d0a67d1cba3e30ee5234b355ebe5a11b449c73f8a8dc8f86a8e7918e66242f178cab1bbf1f3b7cc166394e4e43845b07b892 SHA512 274e2ae69ac4b0bbad87f7294b4b86adab553c8def2e689e8231b8b5c36647c7b980e87cb819a7b28720212a7937ac6af1f766c4ea40af2e7e815b1f8cbac1cb
+DIST sval_serde-2.13.2.crate 10187 BLAKE2B 88ffd29264943a0e91a8791ec7f79ee8e6e94d83d6524f381d52324ba0190f041e0235137774c566e0722b7d6f40943ff18b664c5c7dfdfe8e9934573d5fe573 SHA512 66d6ef5a53685e6cfa3bb661acd6abbc125602d8878cc0fb374dde542a0cd08a80258d9d7c2a26ee00a351f41c7b2732ae365e092ec91f45f39c0a6653f870bf
 DIST syn-2.0.77.crate 268784 BLAKE2B adf14ddc4b284ad78dae3c05be7e63a58a85a2ef16c1051b991aa278843ba7231f0da3cf2adc65eb95762d4c88b4e1440cb616c651d3bb568392bb036399304c SHA512 f8030332c3c4ab34fc1e86196eb0eeda9700e5438f2a339591a5968d8bdd3373b523dba4bd998bf578e4247e0019d999d4e9c6d062a1dedcafe18d27b6c9f6d4
 DIST syn-2.0.90.crate 290584 BLAKE2B 9f469001c1439ffe57c578119653d3021c2709767e8e881441459a190402679f4fb78aa65e7822ff20913801c3be00d9b8f115189ea8e63ed94ed359b40fc9e1 SHA512 44606124f113c259c19edcb2adc1378d8292b422d800604c0e0d1ba89bd2d13d518cf4a6afa58daded54da9cb285464aadb113815406a0f09c5e18f865789ae0
+DIST syn-2.0.96.crate 297497 BLAKE2B 68b62de28ad670572096a1d92ff8ed6fb55fee441f2d429edfeffcc48fa1d4f1cd39327540a4216d94a9763b84831956cb7e5c8ce89b81f1dc5767ea5734620d SHA512 ec2e352a5b0b2aa619774c01d7a7767674a44ffe91dea45d3379bf172d13039c3d37f264e98e26b20fe1d86db6d5190f220831c842f3316469d4ae73c2bfddec
 DIST synstructure-0.13.1.crate 18327 BLAKE2B b29ee88c559a2d58fa46b7af155b448f001649ea79a1898f0ac87e69108b87c65cbd287d8f9001f360df7fef06ff39c937b48d33e487a30c8eec6a46c639c0c2 SHA512 09024193b44fc9a8901bda845b9f86c57dad65d0f53e309b2e7e968538fab6f67db1c86e5e52a2eb8fd116dc073e3ad10983bd60764662ec6ba94fee22a958aa
 DIST tar-0.4.41.crate 51871 BLAKE2B 7b24e1d923089cff48e7f5be141838f5a3db78477ba58304b7a076d5d2eb31525f307d674546e0023e78836f992566646724870eee556db50e96d5a0c851cbcb SHA512 547d4a10cca5b593a04e3775bfc175a3a4de27f3c4dede305c6d50b63b4eb38152c6f06280098f14c4fadcca4cc9aa98626ea50aebe9bab2cb7b7f4e0c4d2b92
 DIST tar-0.4.43.crate 60181 BLAKE2B 0c517cd0ccf1aca093136985513f5ee90312f0b99e34fef9ec8ef21c9537469c3ed31591434a9509ebc6887861e768f52e8dbc1858f0dc1ac5fbcb7d45e805e5 SHA512 d54953e0c7f7e34eb30d85c44527af620e673426592d896261dc2638a9b8a34e2486d0f56dcf93ab3a104c0a43aa3d3478db98fa86fe44ac5be6a10de145447e
 DIST tempfile-3.12.0.crate 34423 BLAKE2B a8b84f54a54be636f5b69791ca567e8b692d6a8485ef37e5a8340d26b32b1b0f9f8e9fcd9a2da90ec2fbd39c281d364dfc5723d06892832edb79ea5cf45d069c SHA512 1a27513548060984be894e6f8fc215831e4b2054b2244c6188bee76c477c001f294c762f2f4a14488c58c04e5d1473806d589c7bba1eaa2cc02d97656709be66
 DIST tempfile-3.14.0.crate 35065 BLAKE2B d155a39f6ed6e846bfd572ffdc73f306d30942642e07f2b497963ae150b8ef774dd046bfb3ce410fa326c8e1df27b0cada804100215e01d02272d6059d5294e3 SHA512 98c1ab70eb3efd2d8b16ed58c8c83f8599663af7ef269304e908a04c38334f659a4d0b1647a13dc0d1eb90a293f1b37ec8ff0b9b45ef5b7ff1b4452bbfcdcb15
+DIST tempfile-3.15.0.crate 35693 BLAKE2B 1b4d6b17ed4263ff89ef6967650b0c18671b2b80cbfe388cbfd77ca597473e91c1c7aebfc715d0fe4360c20d0f235df31147b1f029b471aea8c57d188f7c2be0 SHA512 82636d50a29e1ea8cc61e80dc1fa28ea4cfaeb6175e5bf0558d6cd6f8da823f50a808a555ec17fc8601acfd0f504e15688fe95f64e8792feeb216bf27678807d
 DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
 DIST terminal_size-0.4.1.crate 10037 BLAKE2B 1d99577917b88498902d85718b4ba71ddcd7a1daca4f1b38f4b5ea4c34533eab9cda2cc344cdec5a31ffe0152fbcc5d499ccb40dc73f985f083a3ea21b0b1226 SHA512 e07bdbdf695bf9a607ea7c7c4c5b22a8637b0871877114aa305717a04d31a6b7670e2a79435810aefefe25db8c9a655e4c4ba6075d4ec76322a30cdf71ff03be
 DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
 DIST thiserror-1.0.69.crate 22198 BLAKE2B fdd8ca8c8ca78702377d0bf7b253440519018275b105db980d63229d0d44aa5c39a703e14aa6fe453c779b3c864d8044009dfef893d2a5294950f067656d7a80 SHA512 ef50d2867d965da1dfb29d26faf6de273b5fadf78f95313f6caf44d68bfc610b9bd4b7544200b05bb0861231cfc84e961007f8db83c7905244c492037fd31899
+DIST thiserror-2.0.11.crate 28648 BLAKE2B 973126f9a9ca5f3118e830af11ddde4b26c905e13df89b2888b42facc4e48b3adea53b66405260f6291c3df7ddb85a93856841be3626b005040b3fd15502e2bd SHA512 ba0c3c2615bb9bfb07affa66ffeb2eeda43b16a974dc9a0482165a4a5a502a376e2fd6b569a228a08647de23d291e2c301dedf89d8caa79833b965a184dd5904
 DIST thiserror-2.0.4.crate 28392 BLAKE2B a1b62602cf71dcabc3173e40e2de778ea2453106ab91de5b5bf2120477808bd0423d50287a660f5a9a43f88b7bf2e1352c07df67f4301e2adbe10fbd621f2b5c SHA512 4417de960e7fbeaa68db642355febc059ee7a804060fdde3b331f9f69739f9ef1426940c6ec09c91656a0bb2cc5040b096ceae1995f9071e347a127d0ab4ea8a
 DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102
 DIST thiserror-impl-1.0.69.crate 18365 BLAKE2B 51663251ea6ec99c59aec35fe73c5f9760809d6b6b7eaa8ecbc8f6939acdc4d0ebc11f9034d9204dde7bd689d5e8303ae0be86e298745e9ef96825bf73453a08 SHA512 579eb796c8885feb01d27638862823acd96c79440655bb444c3445ac00121852603396ce7439aed617c0a0ac69f62102167fde5845411c906997574a46d6d9e3
+DIST thiserror-impl-2.0.11.crate 21067 BLAKE2B 33be76d7ab098eaeeaefb2ea5ef20a73221ac51b491d6339e1fff66e24118854f3640de43241e233c68be17804b90d22d75f1d60f7df274acef4647c871e0e17 SHA512 3fb76f16613064917d2b21f1bab06fd4dec9f40ad1f850aa78c5917854347cf9034a72d2091dc792ac06ce9ff9e29ed2bec3a4330b459abff379356e35c8f701
 DIST thiserror-impl-2.0.4.crate 20720 BLAKE2B 5558e267543284117d72ad5103e4795c2ac8799136b1c1a1908ec43daa4d76afc090ab93a73a1d094774ed7c591fea2e2b06dd280d11aaaf329aed6731b98161 SHA512 469002ea042fca93c3d7ae774a250501270bddf184a555b614f25383d0673fed2331f88b3021bfa36b74414c34c7be282d6f203eea9ca5259790199d506ba754
 DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492
 DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
@@ -396,6 +499,7 @@ DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e33
 DIST time-macros-0.2.19.crate 24268 BLAKE2B 18f0601f5307d310010bea20dc7171adc8600c5b2e6303dc9b38ebfbaa7fb59a029dddb627cf5a5b7fd2f7ed66186dbb5321cad0f90f3f85b6edcc901a8c2855 SHA512 c58aa596247a4cab720bef74ff43be44686db2da2978826a1f9b58c640113b5696efc2ae1746bf84042fdbb94bec42c7fc34f7ae6812478f55849a12a90dff5e
 DIST tinystr-0.7.6.crate 16971 BLAKE2B 33a248261c4cded41a81f0d6e6c8df55437f042b37f235c39787986ec562f0dbff50b282ad0f1483daaf49c4b33e6618e139a6677d1238c21f4e12082562b4ae SHA512 a33051848de248cac0a2d151760a78cb3aa62c787d84ff7aac38b11c0660e9188e4d43d43a77fb8676e49ac6102015e9c3db057848d809e71981851875d0fb25
 DIST tinyvec-1.8.0.crate 46796 BLAKE2B 720d0e6d881855a36779e12f5ffa708d3a8b96e6d0de9056cb33c9b8ce0d408f99b22f5b2bb9d64bee72a011fef846dbebbea2ccd238d7b951eb5ef0c4866e05 SHA512 b7b32e38229645965900f80f298685f13e6d13e58cfd6945409a6643ca9c9adc2621456956d5998ab9dd91c2db4ae79638b156ca0d9c7c5505023fd9b28414df
+DIST tinyvec-1.8.1.crate 47269 BLAKE2B d72ec2417520fa0481b8447e6d75e1f24731d38f9083a711185785174a8567c81f6416468b9eabf426f9d32683231e7c5e80202292d1e424f9e4ac9cc8b3e765 SHA512 db32a6beb1c86eb3e9f5ff2732a4acc03d1d684f0e54df5de2ecbfd08399639f47396ae8b17eb5f0122a09ba0c313f39bd73a6f7c44cc38d1891d1bdf3f2d176
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST toml-0.8.19.crate 50974 BLAKE2B f68987353837b74421256fd9a76134bfbfe93887cfb25145b65b7e6b31ad2c3a3384829a06f50c771a2a0be0c5467c856cc631af69f586ea056c4f15af9e3b7c SHA512 16fdc58d14516e81badbe8c9a4506db75b559b377c9c4fecee79e76007b31a4abfc8c8868bf9159f79c6f7c0218f93bdcfb92b669b0917db7da42b51ec155751
 DIST toml_datetime-0.6.8.crate 12028 BLAKE2B 62113366771f22b437b2ed0d3bb2489ae9078cb589cfad2ad2e92c81ddbda48f689e5a573366eea4f54c2b3cbc6b37eaa8b442b6d935b631a992de4917268757 SHA512 d38b98db3b2d4eebd3001d88e2135b6fdbae63b200f7e900c6bb9c121dd3f170e557332bd26f237312c1cbef61666716b0cf550c2d730f86fa7cd9eb5f64a16f
@@ -415,6 +519,7 @@ DIST typeid-1.0.2.crate 8844 BLAKE2B ec74d365b11f17f63f938bfd8819a29d94eee8a3d93
 DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
 DIST unicase-2.7.0.crate 23783 BLAKE2B 2b74b932b45c9d5b984b57bfe8249496c192944e2e66916919177eac81c509e2d7a5d30a85ea58e8cd5a0b47fec746bdb18723f3f14002fc64af3a0d320a9e7d SHA512 c2b05a3bbd8996e1cf65d7458f5ad95de9797c8349484f8db04967bde15c1f057f62b2f7a60e7367871512071ed5076c0da042169dbbdcaf4d6c16cae62da828
 DIST unicase-2.8.0.crate 23843 BLAKE2B 5e479780dd3a690a98e612454761f0248d8106b8efa45964059a04eabadb78f0a6c598115e4b74d38a96c231272e1bde2b8f4edb328069ee6dd0874358613d50 SHA512 2c86abf8c87b87fbcff4ea9a6093d86b876e2e619120c6a9b055712a271f8bf165eb533ab9d523af2b516843a39b5bd549d9251f9b079748176451c9c820c0ed
+DIST unicase-2.8.1.crate 24088 BLAKE2B 29fe558490245cc1f9c551ba524ab452a4ea18d5f3e5763bc58e6b4c52e21bb8bb5e3f16df35bb96652801c3d96e53f8a39cffd31a0cfd1c83f0fa3161f4ed4d SHA512 99a3944a5c987376bdea5fe6c0797e881bc8e6f629c56120ce811c8ebbed0a3ba24617decb74d6939699c8fc994c662eb292869ab407c0ba0ec460a32ede0190
 DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8
 DIST unicode-bom-2.0.3.crate 10773 BLAKE2B 0c47796f83faa4eb5c4405fa385c245fe7b8b6d9eb6ce422738f7aa1788604ed3df22810afc6ce6da78c1592f7f68b41311914ff04d5e49ba4f719310ffa9afd SHA512 3a756761198be468776511ff7b899ee7adf214a678b13b31f42ef3cb3e0320894d8ff0df23bfa02a057727d83082f16b465ff25efa8dbef362977bf308bccffd
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
@@ -432,6 +537,9 @@ DIST utf16_iter-1.0.5.crate 9736 BLAKE2B edcd9776113d4d2b267a9cbd58cab11c5497ff1
 DIST utf8_iter-1.0.4.crate 10437 BLAKE2B 1e7a8b9241ebbb62cb497542b970473780f735010a0af900771a43abceae4e7f362d21d4f79f7c00630e4549400875ea17574b2cbe4f5ea19e8ed428e3b5577d SHA512 a72671995b3eb295581c60dc632e4a25ba257227fb5d58a8bec322428b6d69529bba79a6f02b8e7ee6698b7779d9d6695f5badad73e07c254b00c9d6256c9090
 DIST utf8parse-0.2.2.crate 13499 BLAKE2B 095b5d219ab8ff04c06fd6303e03d913ae36a57845f0b2ca3217a40e31a54cb0fb5ecedbde165d28f5f60f1553d8252986d7098fa83befc84a7cb20bf3b76144 SHA512 f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
+DIST value-bag-1.10.0.crate 40371 BLAKE2B 8d201444eb30bb6820dd9c0132b6e475df3f358762f2dd3ef0a7172bc0241ebe108ff8a8f1b053cd1c27de17f994cb14af13ba8f70fa00618288f0a7c035e973 SHA512 30b7d7e181c7ffdfff2b2f669dced2dd75508678a9f40f01b45249ba95ee685910a069e089867084ff1e3c2092663c3b11544869e3323f4ae77c6adf6fa020ce
+DIST value-bag-serde1-1.10.0.crate 5564 BLAKE2B 87c5f7c3ca5f87bb8f60707b07ba130149422a1dac333e34f675a2dc12023bd5acca2da76b35791f9233d24c0a7354f806ec4a6324e35dbc83be38daaf4a1aee SHA512 2d0043a21e23ad415641e98832e1255193aead12fc38ffdcbbb9256429b0a47ec98a527b1b1aeb4e91d7abca218d9e49ce15c28bb455dd9cad2f125337b7a962
+DIST value-bag-sval2-1.10.0.crate 5624 BLAKE2B 0c3458966ae130888122f60507fd7dfa4f92ee0e83ca37acf52ba1835bfcc6aab15bb5130c6cfab86cb97279944876f3e1787e7b2a1d370908999c8e87d7a2b5 SHA512 f416a0abd5df77db28d2c3dae2d11ee6afbeabf6d851e234fabcef2479a755223c78e5ff8a2542f34e21d5b43a082d97fc2f564f0f667ca9c3db6285a96d2c31
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST version_check-0.9.5.crate 15554 BLAKE2B 131e75cc287518831e142430e2a39b48e4275874f4473780d47a27552294097aa1cddb65c385583e1022478f940b495eb43c24a8b1617b8ac5a24af3340c0d72 SHA512 d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db
 DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf3ab82536295019268b3125084da5dbcad818070bfdcb6a5de08da4eb483475bc225a829f58a1e3e040b5fba SHA512 da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad
@@ -472,6 +580,7 @@ DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d2789
 DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
 DIST winnow-0.6.18.crate 163357 BLAKE2B 7a43eba294c43b187211c6eabc449775081f44405045ec4786c5f10290639e18d002e872f9db14caa94e26fd99079c7ce2f99e70dcb20d842c0886ac203d8ca8 SHA512 3a146d9dc8fe3fcc855f7766852cd69c49a28f9048d553d3952d7722d49216cb44652d98b15ae1ddee99b2bbc3caefb107a9b85c309242dac943deeca65a81dc
 DIST winnow-0.6.20.crate 163617 BLAKE2B b47ba6cd94ec80a72b51ad09c5cb9de350d2243295d3997732d5d3d9f8d08bd83e3129150fb24992243949120da1bd6091d580db5ff10258fd745afaa944c791 SHA512 3347fdfb5b15ec73a40614ecd0cce60f41d3f2d083f49aaafceeaf5db52d5c677dc3eb39fcc2595999fc9f864d1fde81e180e09dc86a6f6124878e16e86e8bc8
+DIST winnow-0.6.24.crate 165680 BLAKE2B 404b91cf890523dc66b2e1c8ed8610a991cc3551de16894a6aed4d6b720b19f33feba9f2257541f9eef6b51051bb5e15e4b7c9c74653a3bdbb782e273d0605a2 SHA512 b0dc1890a59709c61f06096dd37d94bd41cea0b6dd097ae9651c19acbd2963833f5b9cb6c8274aa7577433bff4b3cc68a9de80f7b285035074b5cc96907f967d
 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
diff --git a/dev-util/cargo-c/cargo-c-0.10.8.ebuild b/dev-util/cargo-c/cargo-c-0.10.8.ebuild
new file mode 100644
index 000000000000..6fe1559216b4
--- /dev/null
+++ b/dev-util/cargo-c/cargo-c-0.10.8.ebuild
@@ -0,0 +1,438 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.4
+
+EAPI=8
+
+# Only bother defining this if the github tarball doesn't work!
+# Otherwise just comment it out and things should Just Work (TM).
+#MY_P="${P}+cargo-{CARGO_V}"
+
+CRATES="
+	adler2@2.0.0
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	allocator-api2@0.2.21
+	annotate-snippets@0.11.5
+	anstream@0.6.18
+	anstyle-parse@0.2.6
+	anstyle-query@1.1.2
+	anstyle-wincon@3.0.6
+	anstyle@1.0.10
+	anyhow@1.0.95
+	arc-swap@1.7.1
+	arrayref@0.3.9
+	arrayvec@0.7.6
+	autocfg@1.4.0
+	base16ct@0.2.0
+	base64@0.22.1
+	base64ct@1.6.0
+	bitflags@2.7.0
+	bitmaps@2.1.0
+	blake3@1.5.5
+	block-buffer@0.10.4
+	bstr@1.11.3
+	bumpalo@3.16.0
+	byteorder@1.5.0
+	bytes@1.9.0
+	bytesize@1.3.0
+	cargo-credential-libsecret@0.4.10
+	cargo-credential-macos-keychain@0.4.10
+	cargo-credential-wincred@0.4.10
+	cargo-credential@0.4.8
+	cargo-platform@0.1.9
+	cargo-util-schemas@0.7.1
+	cargo-util@0.2.17
+	cargo@0.85.0
+	cbindgen@0.27.0
+	cc@1.2.8
+	cfg-if@1.0.0
+	clap@4.5.26
+	clap_builder@4.5.26
+	clap_complete@4.5.42
+	clap_derive@4.5.24
+	clap_lex@0.7.4
+	clru@0.6.2
+	color-print-proc-macro@0.3.7
+	color-print@0.3.7
+	colorchoice@1.0.3
+	const-oid@0.9.6
+	constant_time_eq@0.3.1
+	core-foundation-sys@0.8.7
+	core-foundation@0.10.0
+	cpufeatures@0.2.16
+	crates-io@0.40.7
+	crc32fast@1.4.2
+	crossbeam-channel@0.5.14
+	crossbeam-deque@0.8.6
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.21
+	crypto-bigint@0.5.5
+	crypto-common@0.1.6
+	ct-codecs@1.1.3
+	curl-sys@0.4.78+curl-8.11.0
+	curl@0.4.47
+	dbus@0.9.7
+	der@0.7.9
+	deranged@0.3.11
+	digest@0.10.7
+	displaydoc@0.2.5
+	dunce@1.0.5
+	ecdsa@0.16.9
+	ed25519-compact@2.1.1
+	either@1.13.0
+	elliptic-curve@0.13.8
+	encoding_rs@0.8.35
+	equivalent@1.0.1
+	erased-serde@0.4.5
+	errno@0.3.10
+	fallible-iterator@0.3.0
+	fallible-streaming-iterator@0.1.9
+	faster-hex@0.9.0
+	fastrand@2.3.0
+	ff@0.13.0
+	fiat-crypto@0.2.9
+	filetime@0.2.25
+	flate2@1.0.35
+	fnv@1.0.7
+	foldhash@0.1.4
+	foreign-types-shared@0.1.1
+	foreign-types@0.3.2
+	form_urlencoded@1.2.1
+	generic-array@0.14.7
+	getrandom@0.2.15
+	git2-curl@0.20.0
+	git2@0.19.0
+	gix-actor@0.33.1
+	gix-attributes@0.23.1
+	gix-bitmap@0.2.13
+	gix-chunk@0.4.10
+	gix-command@0.3.11
+	gix-commitgraph@0.25.1
+	gix-config-value@0.14.10
+	gix-config@0.41.0
+	gix-credentials@0.25.1
+	gix-date@0.9.3
+	gix-diff@0.47.0
+	gix-dir@0.9.0
+	gix-discover@0.36.0
+	gix-features@0.39.1
+	gix-filter@0.14.0
+	gix-fs@0.12.1
+	gix-glob@0.17.1
+	gix-hash@0.15.1
+	gix-hashtable@0.6.0
+	gix-ignore@0.12.1
+	gix-index@0.36.0
+	gix-lock@15.0.1
+	gix-negotiate@0.16.0
+	gix-object@0.45.0
+	gix-odb@0.64.0
+	gix-pack@0.54.0
+	gix-packetline-blocking@0.18.1
+	gix-packetline@0.18.2
+	gix-path@0.10.13
+	gix-pathspec@0.8.1
+	gix-prompt@0.8.9
+	gix-protocol@0.46.1
+	gix-quote@0.4.14
+	gix-ref@0.48.0
+	gix-refspec@0.26.0
+	gix-revision@0.30.0
+	gix-revwalk@0.16.0
+	gix-sec@0.10.10
+	gix-submodule@0.15.0
+	gix-tempfile@15.0.0
+	gix-trace@0.1.11
+	gix-transport@0.43.1
+	gix-traverse@0.42.0
+	gix-url@0.28.2
+	gix-utils@0.1.13
+	gix-validate@0.9.2
+	gix-worktree@0.37.0
+	gix@0.67.0
+	glob@0.3.2
+	globset@0.4.15
+	group@0.13.0
+	hashbrown@0.14.5
+	hashbrown@0.15.2
+	hashlink@0.9.1
+	heck@0.4.1
+	heck@0.5.0
+	hex@0.4.3
+	hkdf@0.12.4
+	hmac@0.12.1
+	home@0.5.11
+	http-auth@0.1.10
+	humantime@2.1.0
+	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
+	ignore@0.4.23
+	im-rc@15.1.0
+	implib@0.3.3
+	indexmap@2.7.0
+	is_executable@1.0.4
+	is_terminal_polyfill@1.70.1
+	itertools@0.13.0
+	itertools@0.14.0
+	itoa@1.0.14
+	jiff-tzdb-platform@0.1.1
+	jiff-tzdb@0.1.1
+	jiff@0.1.21
+	jobserver@0.1.32
+	js-sys@0.3.76
+	kstring@2.0.2
+	lazy_static@1.5.0
+	lazycell@1.3.0
+	libc@0.2.169
+	libdbus-sys@0.2.5
+	libgit2-sys@0.17.0+1.8.1
+	libloading@0.8.6
+	libnghttp2-sys@0.1.10+1.61.0
+	libredox@0.1.3
+	libsqlite3-sys@0.30.1
+	libssh2-sys@0.3.0
+	libz-sys@1.1.21
+	linux-raw-sys@0.4.15
+	litemap@0.7.4
+	lock_api@0.4.12
+	log@0.4.24
+	matchers@0.1.0
+	maybe-async@0.2.10
+	memchr@2.7.4
+	memmap2@0.9.5
+	memoffset@0.9.1
+	minimal-lexical@0.2.1
+	miniz_oxide@0.8.2
+	miow@0.6.0
+	nom@7.1.3
+	normpath@1.3.0
+	nu-ansi-term@0.46.0
+	num-conv@0.1.0
+	num-traits@0.2.19
+	object@0.36.7
+	once_cell@1.20.2
+	opener@0.7.2
+	openssl-macros@0.1.1
+	openssl-probe@0.1.5
+	openssl-src@300.4.1+3.4.0
+	openssl-sys@0.9.104
+	openssl@0.10.57
+	ordered-float@2.10.1
+	orion@0.17.7
+	os_info@3.9.2
+	overload@0.1.1
+	p384@0.13.0
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	pasetors@0.7.1
+	pathdiff@0.2.3
+	pem-rfc7468@0.7.0
+	percent-encoding@2.3.1
+	pin-project-lite@0.2.16
+	pkcs8@0.10.2
+	pkg-config@0.3.31
+	portable-atomic-util@0.2.4
+	portable-atomic@1.10.0
+	powerfmt@0.2.0
+	ppv-lite86@0.2.20
+	primeorder@0.13.6
+	proc-macro2@1.0.93
+	prodash@29.0.0
+	quote@1.0.38
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rand_xoshiro@0.6.0
+	redox_syscall@0.5.8
+	regex-automata@0.1.10
+	regex-automata@0.4.9
+	regex-syntax@0.6.29
+	regex-syntax@0.8.5
+	regex@1.11.1
+	rfc6979@0.4.0
+	rusqlite@0.32.1
+	rustc-hash@2.1.0
+	rustfix@0.9.0
+	rustix@0.38.43
+	ryu@1.0.18
+	same-file@1.0.6
+	schannel@0.1.27
+	scopeguard@1.2.0
+	sec1@0.7.3
+	security-framework-sys@2.14.0
+	security-framework@3.2.0
+	semver@1.0.24
+	serde-untagged@0.1.6
+	serde-value@0.7.0
+	serde@1.0.217
+	serde_derive@1.0.217
+	serde_fmt@1.0.3
+	serde_ignored@0.1.10
+	serde_json@1.0.135
+	serde_spanned@0.6.8
+	sha1@0.10.6
+	sha1_smol@1.0.1
+	sha2@0.10.8
+	sharded-slab@0.1.7
+	shell-escape@0.1.5
+	shell-words@1.1.0
+	shlex@1.3.0
+	signature@2.2.0
+	sized-chunks@0.6.5
+	smallvec@1.13.2
+	socket2@0.5.8
+	spki@0.7.3
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	strsim@0.11.1
+	subtle@2.6.1
+	supports-hyperlinks@3.1.0
+	supports-unicode@3.0.0
+	sval@2.13.2
+	sval_buffer@2.13.2
+	sval_dynamic@2.13.2
+	sval_fmt@2.13.2
+	sval_json@2.13.2
+	sval_nested@2.13.2
+	sval_ref@2.13.2
+	sval_serde@2.13.2
+	syn@2.0.96
+	synstructure@0.13.1
+	tar@0.4.43
+	tempfile@3.15.0
+	terminal_size@0.4.1
+	thiserror-impl@1.0.69
+	thiserror-impl@2.0.11
+	thiserror@1.0.69
+	thiserror@2.0.11
+	thread_local@1.1.8
+	time-core@0.1.2
+	time-macros@0.2.19
+	time@0.3.37
+	tinystr@0.7.6
+	tinyvec@1.8.1
+	tinyvec_macros@0.1.1
+	toml@0.8.19
+	toml_datetime@0.6.8
+	toml_edit@0.22.22
+	tracing-attributes@0.1.28
+	tracing-chrome@0.7.2
+	tracing-core@0.1.33
+	tracing-log@0.2.0
+	tracing-subscriber@0.3.19
+	tracing@0.1.41
+	typeid@1.0.2
+	typenum@1.17.0
+	unicase@2.8.1
+	unicode-bom@2.0.3
+	unicode-ident@1.0.14
+	unicode-normalization@0.1.24
+	unicode-width@0.2.0
+	unicode-xid@0.2.6
+	url@2.5.4
+	utf16_iter@1.0.5
+	utf8_iter@1.0.4
+	utf8parse@0.2.2
+	valuable@0.1.0
+	value-bag-serde1@1.10.0
+	value-bag-sval2@1.10.0
+	value-bag@1.10.0
+	vcpkg@0.2.15
+	version_check@0.9.5
+	walkdir@2.5.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.99
+	wasm-bindgen-macro-support@0.2.99
+	wasm-bindgen-macro@0.2.99
+	wasm-bindgen-shared@0.2.99
+	wasm-bindgen@0.2.99
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.9
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-sys@0.59.0
+	windows-targets@0.48.5
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.6
+	winnow@0.6.24
+	write16@1.0.0
+	writeable@0.5.5
+	yoke-derive@0.7.5
+	yoke@0.7.5
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+	zerofrom-derive@0.1.5
+	zerofrom@0.1.5
+	zeroize@1.8.1
+	zerovec-derive@0.10.3
+	zerovec@0.10.4
+"
+
+RUST_MIN_VER="1.82.0"
+
+inherit cargo
+
+DESCRIPTION="Helper program to build and install c-like libraries"
+HOMEPAGE="https://github.com/lu-zero/cargo-c"
+if [[ -z ${MY_P} ]] ; then
+	SRC_URI="https://github.com/lu-zero/cargo-c/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+else
+	S="${WORKDIR}/${MY_P}"
+fi
+
+SRC_URI+=" ${CARGO_CRATE_URIS}"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0 MPL-2.0 Unicode-3.0 ZLIB
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	=dev-libs/libgit2-1.8*:=
+	dev-libs/openssl:=
+	net-libs/libssh2:=
+	net-misc/curl[ssl]
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/cargo-capi usr/bin/cargo-cbuild usr/bin/cargo-ctest usr/bin/cargo-cinstall"
+
+src_configure() {
+	# Some crates will auto-build and statically link C libraries(!)
+	# Tracker bug #709568
+	export LIBSSH2_SYS_USE_PKG_CONFIG=1
+	export LIBGIT2_NO_VENDOR=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+}
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 29dbfb22d465..424a39e5d867 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -6,6 +6,7 @@ DIST anstyle-wincon-3.0.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c5
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf
 DIST cbindgen-0.27.0.tar.gz 229354 BLAKE2B 9ebf8891ae7196ef5e3cc9edd2b4601b1e70408cadef4b110dc4ee3f0c403aef30553124ba8ab7806e086334ee8548bd747127cf8b6302f560ac10356a3782a3 SHA512 966f8a5503200dc5f0e478c6d8f8ec1d335daa7f22c0dfa1fa4a891c6785fd7720685174b768f756b2feccc44f4d34b39afdf2b38a1abc0d8f8050a0be0709ab
+DIST cbindgen-0.28.0.tar.gz 237495 BLAKE2B b9e50d238debbb62ed9d09d707458d6e5cdcf9e8c15c11d0f507d37cdb672a9fc1196c6f9f8caecd14252ccf513752488bdca3ad232b7cd2200c5e71436940eb SHA512 d53ed0b867309b703a077729963f077c3c5d0a88c994e358fb1cfad68342c8ea604735ba2e71f35164968a46411202da3cd7d432938f07a24bef31144b4c806e
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-4.5.15.crate 56612 BLAKE2B f5f34a6d3e84731de7dc1b54d8576e8e9e573fa1381e9bbcba8e2b66f8cc693ce51c7a876c34705ed705de7a793bfd2f4922fb86f8764adb7a4dacd03af06ff7 SHA512 a0bd102065cb29eb565e65408ce5bf37e3404b7496959614d10ff2f9bb2e29c1abf8f5a3716aa85994a49bce4ac12d63586c8ec8187c0d3a6f696a4804fb446b
 DIST clap_builder-4.5.15.crate 163717 BLAKE2B 795fa9c6de6a3f4d9a1288c3340613c14b11a5346e314f5f486bee76346f5f88396e54d95d051bd84184a91bb1f2d3575f870fca56a4b9b590ea2d9939beb415 SHA512 52efd99bce20bb8ff2187c4cef8bc27bef6cdc52598f00b47639b797683f18c76a79a6ebf34d1d250621a49cab0e9ec9e7824d323516f1ed3fa721cfd34cd713
@@ -46,6 +47,7 @@ DIST serial_test_derive-2.0.0.crate 5638 BLAKE2B 72fcbc0a6903b0ac82af3334048eab8
 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
 DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c
 DIST syn-2.0.72.crate 267069 BLAKE2B b0b979f78937a10a6db45f96d5d93c595427a4e158d658a2186419d89b219a4a405ade488d88d9ebdbd605ce4b706aba7088ab39a77294f3cf9847bf032d8f91 SHA512 c3d26bf9787555bc6fd8bd789855d252e80ad28a413593e13bad174adf86087ff195a6b4227bdeb6d1a1c87b0af8e965d6f2d04b8d45e7383b6de49990b92e89
+DIST syn-2.0.85.crate 275231 BLAKE2B e7679e81bcef87920bc0ed707c997563844ffa1e9d470675ae6ec11d1e045e04ee2ad5744d423b8bc16def1c197ebecd874f468c1e12244838d1b4f34f9c1a30 SHA512 14b1402d2cd91456eb32dcffd494592eb3bd848ae22571f7ef0686493f91b82d23ba41428f9d31686fd24ea6ebca4b239b6c5099302a32014dffbc4ff9afeec1
 DIST tempfile-3.12.0.crate 34423 BLAKE2B a8b84f54a54be636f5b69791ca567e8b692d6a8485ef37e5a8340d26b32b1b0f9f8e9fcd9a2da90ec2fbd39c281d364dfc5723d06892832edb79ea5cf45d069c SHA512 1a27513548060984be894e6f8fc215831e4b2054b2244c6188bee76c477c001f294c762f2f4a14488c58c04e5d1473806d589c7bba1eaa2cc02d97656709be66
 DIST toml-0.8.19.crate 50974 BLAKE2B f68987353837b74421256fd9a76134bfbfe93887cfb25145b65b7e6b31ad2c3a3384829a06f50c771a2a0be0c5467c856cc631af69f586ea056c4f15af9e3b7c SHA512 16fdc58d14516e81badbe8c9a4506db75b559b377c9c4fecee79e76007b31a4abfc8c8868bf9159f79c6f7c0218f93bdcfb92b669b0917db7da42b51ec155751
 DIST toml_datetime-0.6.8.crate 12028 BLAKE2B 62113366771f22b437b2ed0d3bb2489ae9078cb589cfad2ad2e92c81ddbda48f689e5a573366eea4f54c2b3cbc6b37eaa8b442b6d935b631a992de4917268757 SHA512 d38b98db3b2d4eebd3001d88e2135b6fdbae63b200f7e900c6bb9c121dd3f170e557332bd26f237312c1cbef61666716b0cf550c2d730f86fa7cd9eb5f64a16f
diff --git a/dev-util/cbindgen/cbindgen-0.28.0.ebuild b/dev-util/cbindgen/cbindgen-0.28.0.ebuild
new file mode 100644
index 000000000000..16c3f7423c75
--- /dev/null
+++ b/dev-util/cbindgen/cbindgen-0.28.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.10
+
+EAPI=8
+
+CRATES="
+	anstream@0.6.15
+	anstyle-parse@0.2.5
+	anstyle-query@1.1.1
+	anstyle-wincon@3.0.4
+	anstyle@1.0.8
+	autocfg@1.3.0
+	bitflags@2.6.0
+	cfg-if@1.0.0
+	clap@4.5.15
+	clap_builder@4.5.15
+	clap_lex@0.7.2
+	colorchoice@1.0.2
+	dashmap@5.5.3
+	diff@0.1.13
+	equivalent@1.0.1
+	errno@0.3.9
+	fastrand@2.1.0
+	hashbrown@0.14.5
+	heck@0.4.1
+	indexmap@2.3.0
+	is_terminal_polyfill@1.70.1
+	itoa@1.0.11
+	lazy_static@1.5.0
+	libc@0.2.155
+	linux-raw-sys@0.4.14
+	lock_api@0.4.12
+	log@0.4.22
+	memchr@2.7.4
+	once_cell@1.19.0
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	pretty_assertions@1.4.0
+	proc-macro2@1.0.86
+	quote@1.0.36
+	redox_syscall@0.5.3
+	rustix@0.38.34
+	ryu@1.0.18
+	scopeguard@1.2.0
+	serde@1.0.205
+	serde_derive@1.0.205
+	serde_json@1.0.122
+	serde_spanned@0.6.7
+	serial_test@2.0.0
+	serial_test_derive@2.0.0
+	smallvec@1.13.2
+	strsim@0.11.1
+	syn@2.0.85
+	tempfile@3.12.0
+	toml@0.8.19
+	toml_datetime@0.6.8
+	toml_edit@0.22.20
+	unicode-ident@1.0.12
+	utf8parse@0.2.2
+	windows-sys@0.52.0
+	windows-sys@0.59.0
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.52.6
+	winnow@0.6.18
+	yansi@0.5.1
+"
+
+inherit cargo
+
+DESCRIPTION="A tool for generating C bindings to Rust code"
+HOMEPAGE="https://github.com/mozilla/cbindgen/"
+SRC_URI="${CARGO_CRATE_URIS}
+	https://github.com/mozilla/cbindgen/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+# Dependent crate licenses
+LICENSE+="
+	MIT Unicode-DFS-2016
+	|| ( Apache-2.0 Boost-1.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+# Needs debugging enabled and lots of other problems.
+# https://github.com/mozilla/cbindgen/issues?q=is%3Aissue+is%3Aopen+test
+RESTRICT="test"
+
+BDEPEND="test? ( dev-build/cmake )"
+
+QA_FLAGS_IGNORED="usr/bin/cbindgen"
diff --git a/dev-util/ccls/ccls-0.20241108.ebuild b/dev-util/ccls/ccls-0.20241108.ebuild
index 3096200e66e5..4dfa5a1ba9b1 100644
--- a/dev-util/ccls/ccls-0.20241108.ebuild
+++ b/dev-util/ccls/ccls-0.20241108.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/MaskRay/ccls"
 
 if [[ ${PV} != *9999 ]] ; then
 	SRC_URI="https://github.com/MaskRay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-util/clazy/clazy-1.13.ebuild b/dev-util/clazy/clazy-1.13.ebuild
index 908a731edf37..cd91ecd602c3 100644
--- a/dev-util/clazy/clazy-1.13.ebuild
+++ b/dev-util/clazy/clazy-1.13.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 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/clinfo/clinfo-3.0.23.01.25.ebuild b/dev-util/clinfo/clinfo-3.0.23.01.25.ebuild
index c13992cb82cc..91ed3d5fd933 100644
--- a/dev-util/clinfo/clinfo-3.0.23.01.25.ebuild
+++ b/dev-util/clinfo/clinfo-3.0.23.01.25.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
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://github.com/Oblomov/clinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~loong ~ppc64 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
 fi
 
 DESCRIPTION="A tool to display info about the system's OpenCL capabilities"
diff --git a/dev-util/clion/clion-2024.1-r1.ebuild b/dev-util/clion/clion-2024.1-r1.ebuild
index 27d1cc31d90c..a915eaf7fcd5 100644
--- a/dev-util/clion/clion-2024.1-r1.ebuild
+++ b/dev-util/clion/clion-2024.1-r1.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
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-debug/gdb
 	dev-libs/expat
 	dev-libs/glib:2
-	~dev-util/lttng-ust-2.12.1
+	dev-util/lttng-ust:0/2.12
 	dev-libs/nspr
 	dev-libs/nss
 	dev-libs/wayland
diff --git a/dev-util/colm/colm-0.14.7-r4.ebuild b/dev-util/colm/colm-0.14.7-r4.ebuild
index 99c32aa91d80..1a78eacc012f 100644
--- a/dev-util/colm/colm-0.14.7-r4.ebuild
+++ b/dev-util/colm/colm-0.14.7-r4.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,6 +47,9 @@ src_prepare() {
 		sed -i -e 's/libcolm\.so/libcolm.dylib/' src/main.cc || die
 	fi
 
+	# Test fails w/ modern C (bug #944324)
+	rm test/colm.d/ext1.lm || die
+
 	eautoreconf
 }
 
@@ -69,7 +72,8 @@ src_test() {
 	# Build tests
 	default
 
-	# Run them
+	# Run them (and make sure we use just-built libraries, bug #941565)
+	local -x LD_LIBRARY_PATH="${S}/src/.libs:${S}/src:${LD_LIBRARY_PATH}"
 	cd test || die
 	./runtests || die
 }
diff --git a/dev-util/cpputest/cpputest-4.0-r1.ebuild b/dev-util/cpputest/cpputest-4.0-r1.ebuild
new file mode 100644
index 000000000000..4d8d165e77c2
--- /dev/null
+++ b/dev-util/cpputest/cpputest-4.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Unit testing and mocking framework for C/C++"
+HOMEPAGE="https://cpputest.github.io/ https://github.com/cpputest/cpputest"
+SRC_URI="https://github.com/cpputest/cpputest/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( >=dev-cpp/gtest-1.8.0 )"
+
+DOCS=( AUTHORS README.md README_CppUTest_for_C.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-autoconf.patch
+	"${FILESDIR}"/${P}-replace-UB-by-abort.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/dev-util/cpputest/cpputest-4.0.ebuild b/dev-util/cpputest/cpputest-4.0.ebuild
deleted file mode 100644
index 0b624814f4ae..000000000000
--- a/dev-util/cpputest/cpputest-4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Unit testing and mocking framework for C/C++"
-HOMEPAGE="https://cpputest.github.io/ https://github.com/cpputest/cpputest"
-SRC_URI="https://github.com/cpputest/cpputest/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( >=dev-cpp/gtest-1.8.0 )"
-
-DOCS=( AUTHORS README.md README_CppUTest_for_C.txt )
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/dev-util/cpputest/files/cpputest-4.0-autoconf.patch b/dev-util/cpputest/files/cpputest-4.0-autoconf.patch
new file mode 100644
index 000000000000..fe171d7a5582
--- /dev/null
+++ b/dev-util/cpputest/files/cpputest-4.0-autoconf.patch
@@ -0,0 +1,46 @@
+patch submitted to upstream at https://github.com/cpputest/cpputest/pull/1837
+
+From 2ba7e10e73a1daf7194b83e952df58ce1c985644 Mon Sep 17 00:00:00 2001
+From: "Z. Liu" <zhixu.liu@gmail.com>
+Date: Sun, 12 Jan 2025 23:04:59 +0800
+Subject: [PATCH] configure.ac: fix call of AC_LANG_PROGRAM & unexpected
+ compilation errors
+
+1. multiple line should be enclosed by [[ ]], otherwise compilation of
+   conftest.cpp will failed with:
+     error: extra tokens at end of #include directive [-Werror,-Wextra-tokens]
+2. add #include <cstdint>
+3. size_t -> std::size_t
+
+Signed-off-by: Z. Liu <zhixu.liu@gmail.com>
+---
+ configure.ac | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b19c9eb6..e91c4a27 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -325,13 +325,17 @@ AC_LANG_PUSH([C++])
+ # Can we use operator delete without exception handling specifier? (clang warns on this!)
+ CXXFLAGS="-Werror"
+ AC_MSG_CHECKING([whether CXX supports operator delete without exception handling specifier])
+-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <new>\nvoid operator delete(void* mem);])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); UT_DELETE_MUST_HAVE_EXCEPTION_SPECIFIER="yes"])
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <cstdint>
++#include <new>
++void operator delete(void* mem);]])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); UT_DELETE_MUST_HAVE_EXCEPTION_SPECIFIER="yes"])
+ CXXFLAGS="$saved_cxxflags"
+ 
+ # Can we use operator new with exception specifier (g++4.7 on MacOSX is broken here)
+ CXXFLAGS="-Werror"
+ AC_MSG_CHECKING([whether CXX supports operator new with exception handling specifier])
+-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <new>\nvoid* operator new(size_t size) throw(std::bad_alloc);;])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); UT_NEW_CANT_HAVE_EXCEPTION_SPECIFIER="yes"])
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <cstdint>
++#include <new>
++void* operator new(std::size_t size) throw(std::bad_alloc);;]])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); UT_NEW_CANT_HAVE_EXCEPTION_SPECIFIER="yes"])
+ CXXFLAGS="$saved_cxxflags"
+ 
+ # Flag -Wno-missing-exception-spec
+-- 
+2.45.2
+
diff --git a/dev-util/cpputest/files/cpputest-4.0-replace-UB-by-abort.patch b/dev-util/cpputest/files/cpputest-4.0-replace-UB-by-abort.patch
new file mode 100644
index 000000000000..54dbf24c9411
--- /dev/null
+++ b/dev-util/cpputest/files/cpputest-4.0-replace-UB-by-abort.patch
@@ -0,0 +1,33 @@
+fix tests hang with clang as reported in https://bugs.gentoo.org/924958
+
+patch from upstream PR at https://github.com/cpputest/cpputest/pull/1679
+commit https://github.com/cpputest/cpputest/commit/094df52c8f6dae1dccb30d0d39dd1eb832ded85c
+adapt to v4.0
+
+diff --git a/src/CppUTest/Utest.cpp b/src/CppUTest/Utest.cpp
+index d078bdf..3cbbcdf 100644
+--- a/src/CppUTest/Utest.cpp
++++ b/src/CppUTest/Utest.cpp
+@@ -153,7 +153,7 @@ UtestShell::~UtestShell()
+ // LCOV_EXCL_START - actually covered but not in .gcno due to race condition
+ static void defaultCrashMethod()
+ {
+-    UtestShell* ptr = (UtestShell*) NULLPTR; ptr->countTests();
++    abort();
+ }
+ // LCOV_EXCL_STOP
+ 
+diff --git a/tests/CppUTest/UtestTest.cpp b/tests/CppUTest/UtestTest.cpp
+index cf6ad1c..a26fb41 100644
+--- a/tests/CppUTest/UtestTest.cpp
++++ b/tests/CppUTest/UtestTest.cpp
+@@ -222,8 +222,7 @@ TEST(UtestShell, TestDefaultCrashMethodInSeparateProcessTest)
+     fixture.runAllTests();
+     fixture.assertPrintContains("Failed in separate process - killed by signal");
+ 
+-    /* Signal 11 usually happens, but with clang3.7 on Linux, it produced signal 4 */
+-    CHECK(fixture.getOutput().contains("signal 11") || fixture.getOutput().contains("signal 4"));
++    CHECK(fixture.getOutput().contains("signal 6"));
+ }
+ 
+ #endif
diff --git a/dev-util/cpputest/metadata.xml b/dev-util/cpputest/metadata.xml
index 8b0fb96a6593..d07ac8206d58 100644
--- a/dev-util/cpputest/metadata.xml
+++ b/dev-util/cpputest/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>zhixu.liu@gmail.com</email>
+		<name>Z. Liu</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">cpputest/cpputest</remote-id>
 	</upstream>
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index 9bf73d8174c9..50e34f487056 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,4 +1,2 @@
-DIST ctags-20211017.0.tar.gz 2542128 BLAKE2B cade7149cb2fd0645f9b7ecd37c8b9acdeae7037fde2bb74aa94d67f04963327429b83dcf5cd658f082bd8ce4c407f69f4924da5f768bec029b4075997bbd882 SHA512 85bfb4d40c1d9045b4ba4dc280ee7108ee2fd4572c92794d5bdc854f3511dad1ecf282428e61161773f7bfaca725d774593a0e83fc767a1bb2e12b229a19bec0
-DIST ctags-20220828.0.tar.gz 2952276 BLAKE2B 2ec3a01646cfb89446604af65387bb5cbf17188177505000f5803a9a535f59799961e8144d3ab36b23114fc093cb487589f52e7186b60041ff3bf2a439f77dab SHA512 4c1289dab24edded85c7ae31c06b0cad5b8f08f7f709a0bdacdf5f9d8ccf722c820d6fef6d46298bb06c48256e80f594dbf2456b91d1c50b3509ce4d3fe3ae9c
 DIST ctags-20230423.0.tar.gz 3038197 BLAKE2B 4b6114526e9dc94c95dcf1b27136fe1fde185aadcd3f880459314b6567f4ec935da10f87aaad590f4c16999adea8b15b3a153f4e80b3b9e57d9a04ecee377a09 SHA512 7a4b3ffcc4906765dda381ad637981f5ce8c6fc24d4141b8b0e9997b71767dda307dab4d2c2aa0e5ba003774c100d8f85e494e368cedbef12c8f415a13b85554
 DIST ctags-20240609.0.tar.gz 3158634 BLAKE2B fe662dc0c48a0ac484bf3fc7ba7d0a31285398cd5da111a96f14b3637045fa0b0245119da034ab467e43b776849f47891e829af86a1889548f410070df6395d4 SHA512 60ebc506a04aabd7ada13801ab3ac662a9798960cf2aaa90270e6d5df82850b4e709a15a7523eb2e1e347a08b458ff2b85a99c787ab08b3c2599232492ef0ebc
diff --git a/dev-util/ctags/ctags-20211017.0.ebuild b/dev-util/ctags/ctags-20211017.0.ebuild
deleted file mode 100644
index 77941cccaf9f..000000000000
--- a/dev-util/ctags/ctags-20211017.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
-HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
-if [[ ${PV} == *99999999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
-else
-	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-p5.9.${PV}"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="json xml yaml"
-
-DEPEND="
-	json? ( dev-libs/jansson:= )
-	xml? ( dev-libs/libxml2:2 )
-	yaml? ( dev-libs/libyaml )
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-ctags
-"
-BDEPEND="
-	dev-python/docutils
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Ignore check-genfile test (calls git which errors out)
-	sed -i 's/man-test check-genfile/man-test/' makefiles/testing.mak || die
-
-	default
-
-	#./misc/dist-test-cases > makefiles/test-cases.mak || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable json) \
-		$(use_enable xml) \
-		$(use_enable yaml) \
-		--disable-etags \
-		--enable-tmpdir="${EPREFIX}"/tmp
-}
-
-src_install() {
-	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
-
-	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
-	# rename ctags to exuberant-ctags (Mandrake does this also).
-	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
-	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
-}
-
-pkg_postinst() {
-	eselect ctags update
-
-	if [[ -z "$REPLACING_VERSIONS" ]]; then
-		elog "You can set the version to be started by /usr/bin/ctags through"
-		elog "the ctags eselect module. \"man ctags.eselect\" for details."
-	fi
-}
-
-pkg_postrm() {
-	eselect ctags update
-}
diff --git a/dev-util/ctags/ctags-20220828.0-r1.ebuild b/dev-util/ctags/ctags-20220828.0-r1.ebuild
deleted file mode 100644
index 624a93782316..000000000000
--- a/dev-util/ctags/ctags-20220828.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools python-any-r1
-
-DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
-HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
-
-if [[ ${PV} == *99999999* ]] ; then
-	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-p5.9.${PV}
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="json pcre seccomp test xml yaml"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	json? ( dev-libs/jansson:= )
-	pcre? ( dev-libs/libpcre2 )
-	seccomp? ( sys-libs/libseccomp )
-	xml? ( dev-libs/libxml2:2 )
-	yaml? ( dev-libs/libyaml )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-python/docutils
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-IDEPEND="app-eselect/eselect-ctags"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Ignore check-genfile test (calls git which errors out)
-	sed -i 's/man-test check-genfile/man-test/' makefiles/testing.mak || die
-
-	default
-
-	#./misc/dist-test-cases > makefiles/test-cases.mak || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable json) \
-		$(use_enable pcre pcre2) \
-		$(use_enable seccomp) \
-		$(use_enable xml) \
-		$(use_enable yaml) \
-		--disable-etags \
-		--enable-tmpdir="${EPREFIX}"/tmp
-}
-
-src_install() {
-	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
-
-	# Namepace collision with X/Emacs-provided /usr/bin/ctags -- we
-	# rename ctags to exuberant-ctags (Mandrake does this also).
-	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
-	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
-}
-
-pkg_postinst() {
-	eselect ctags update
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "You can set the version to be started by ${EROOT}/usr/bin/ctags through"
-		elog "the ctags eselect module. \"man ctags.eselect\" for details."
-	fi
-}
-
-pkg_postrm() {
-	eselect ctags update
-}
diff --git a/dev-util/ctags/ctags-20230423.0.ebuild b/dev-util/ctags/ctags-20230423.0.ebuild
deleted file mode 100644
index 983e0f59d665..000000000000
--- a/dev-util/ctags/ctags-20230423.0.ebuild
+++ /dev/null
@@ -1,94 +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} )
-inherit autotools python-any-r1
-
-DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
-HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
-
-if [[ ${PV} == *99999999* ]] ; then
-	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p6.0.${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-p6.0.${PV}
-
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="json pcre seccomp test xml yaml"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	json? ( dev-libs/jansson:= )
-	pcre? ( dev-libs/libpcre2 )
-	seccomp? ( sys-libs/libseccomp )
-	xml? ( dev-libs/libxml2:2 )
-	yaml? ( dev-libs/libyaml )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-python/docutils
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-IDEPEND="app-eselect/eselect-ctags"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# manual check for function in a library that doesn't exist, passes -liconv
-	# which either fails to link anyway (glibc) or passes this check (musl)
-	libiconv_open
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Ignore check-genfile test (calls git which errors out)
-	sed -i 's/man-test check-genfile/man-test/' makefiles/testing.mak || die
-
-	default
-
-	#./misc/dist-test-cases > makefiles/test-cases.mak || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable json) \
-		$(use_enable pcre pcre2) \
-		$(use_enable seccomp) \
-		$(use_enable xml) \
-		$(use_enable yaml) \
-		--disable-etags \
-		--enable-tmpdir="${EPREFIX}"/tmp
-}
-
-src_install() {
-	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
-
-	# Namepace collision with X/Emacs-provided /usr/bin/ctags -- we
-	# rename ctags to exuberant-ctags (Mandrake does this also).
-	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
-	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
-}
-
-pkg_postinst() {
-	eselect ctags update
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "You can set the version to be started by ${EROOT}/usr/bin/ctags through"
-		elog "the ctags eselect module. \"man ctags.eselect\" for details."
-	fi
-}
-
-pkg_postrm() {
-	eselect ctags update
-}
diff --git a/dev-util/ctags/ctags-20240609.0.ebuild b/dev-util/ctags/ctags-20240609.0.ebuild
index 4fed92a43de5..8297e0548743 100644
--- a/dev-util/ctags/ctags-20240609.0.ebuild
+++ b/dev-util/ctags/ctags-20240609.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
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p6.1.${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${PN}-p6.1.${PV}
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2+"
@@ -55,6 +55,8 @@ src_prepare() {
 
 	default
 
+	# Don't automagically use Valgrind
+	sed -i -e '/if type valgrind/s:valgrind:valgrind-falseified:' Tmain/optscript.d/run.sh || die
 	#./misc/dist-test-cases > makefiles/test-cases.mak || die
 
 	eautoreconf
diff --git a/dev-util/ctags/ctags-99999999.ebuild b/dev-util/ctags/ctags-99999999.ebuild
index 4fed92a43de5..d7133379a221 100644
--- a/dev-util/ctags/ctags-99999999.ebuild
+++ b/dev-util/ctags/ctags-99999999.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
@@ -55,6 +55,8 @@ src_prepare() {
 
 	default
 
+	# Don't automagically use Valgrind
+	sed -i -e '/if type valgrind/s:valgrind:valgrind-falseified:' Tmain/optscript.d/run.sh || die
 	#./misc/dist-test-cases > makefiles/test-cases.mak || die
 
 	eautoreconf
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 6533c9546b5b..982f63393c76 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,2 +1,3 @@
 DIST cucumber-8.0.0.tar.gz 412254 BLAKE2B 8e86ca726a85afeb6d80799c3b2cf633e4949bacb9ad65b41d3baf37f642b9032d57b4e66cca15cbababcdbe5541ce2cd0d23b113897dedbd7cbfb5c85283a00 SHA512 33e9abeb33c7924c3eedfcf477019a782cd813a004e35dcdeb0878b6dea920ba870023b6c8a60c8de810ff231378fa67969208611ce8e9199ae2611d3f6f1f99
 DIST cucumber-9.2.0.tar.gz 425211 BLAKE2B 4bbd9b0ecf2d3e3a06d9ca36f512b67b7f776185c1888987cd247fdf457150f96a30b1d33d2b76605efe71a51e1866ae595b77458dcf63eabac2974db0932027 SHA512 4685647167268621488fc0144f24f44cc4dd684206298cd20b9a2efbbbcc43f5b05223e4d1e9c8b6b29c552eac31d8471c12c59d5fec7463a28c8f8ebd20159a
+DIST cucumber-9.2.1.tar.gz 425480 BLAKE2B f573c9731cb155daf7c5aecb0b86fe57273b607846006949b76e78e16a96d4a9bd44fc702c070ac35441f0c4913f55c77a77c098532042122ff955ea77d68abd SHA512 9278a0c1b747a580445d2ac0fab1c451c6745d653aa91d050ac4a055b569d0281a25df287141f7a56dc97c13e6721ffa84875244d78e41deb8002dba59279d32
diff --git a/dev-util/cucumber/cucumber-9.2.1.ebuild b/dev-util/cucumber/cucumber-9.2.1.ebuild
new file mode 100644
index 000000000000..bc993a0cb6ca
--- /dev/null
+++ b/dev-util/cucumber/cucumber-9.2.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
+
+RUBY_FAKEGEM_BINWRAP="cucumber"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://cucumber.io/"
+SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cucumber-ruby-${PV}"
+LICENSE="Ruby"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		dev-ruby/rspec:3
+		>=dev-ruby/nokogiri-1.12.5
+		>=dev-ruby/syntax-1.0.0
+		dev-ruby/json
+		>=dev-util/cucumber-3
+		dev-util/cucumber-compatibility-kit:14
+	)"
+
+ruby_add_rdepend "
+	|| ( dev-ruby/builder:3.3 dev-ruby/builder:3.2 )
+	dev-util/cucumber-ci-environment:10
+	dev-util/cucumber-core:13
+	dev-util/cucumber-cucumber-expressions:17
+	dev-util/cucumber-gherkin:27
+	dev-util/cucumber-html-formatter:21
+	dev-util/cucumber-messages:22
+	>=dev-ruby/diff-lcs-1.5.0:0
+	>=dev-ruby/mini_mime-1.1.5:0
+	>=dev-ruby/multi_test-1.1.0:1
+	>=dev-ruby/sys-uname-1.2.3:1
+"
+
+all_ruby_prepare() {
+	# Remove development dependencies from the gemspec that we don't
+	# need or can't satisfy.
+	sed -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|rubyzip\)/d' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on unpackaged packages
+	sed -i -e '/\(cucumber-pro\|webrick\)/ s:^:#:' Gemfile || die
+
+	# Avoid specs that call out to an installed cucumber version
+	rm -f spec/cck/cck_spec.rb || die
+
+	# Avoid specs failing due to differing deprecation message
+	# rm -f spec/cucumber/deprecate_spec.rb || die
+
+	# Avoid failing features on new delegate and forwardable behavior in ruby
+#	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
+
+	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
+
+	rm -f Gemfile.lock || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib \
+		${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+	fi
+}
diff --git a/dev-util/cutter/cutter-2.3.4-r2.ebuild b/dev-util/cutter/cutter-2.3.4-r2.ebuild
new file mode 100644
index 000000000000..9284cd3bf102
--- /dev/null
+++ b/dev-util/cutter/cutter-2.3.4-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake flag-o-matic toolchain-funcs xdg-utils python-single-r1
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A Qt and C++ GUI for rizin reverse engineering framework"
+HOMEPAGE="https://cutter.re https://github.com/rizinorg/cutter/"
+SRC_URI="https://github.com/rizinorg/${PN}/releases/download/v${PV}/${MY_P}-src.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CC-BY-SA-3.0 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-qt/qtbase:6[gui,network,opengl,widgets]
+	dev-qt/qt5compat:6
+	dev-qt/qtsvg:6
+	>=dev-util/rizin-0.7.1:=
+	graphviz? ( media-gfx/graphviz )"
+RDEPEND="${DEPEND}
+	!net-analyzer/cutter" # https://bugs.gentoo.org/897738
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/925901
+	# https://github.com/rizinorg/cutter/pull/3317
+	#
+	# Fixed in git dev. Remove as part of next version bump.
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
+		-DCMAKE_C_COMPILER="$(tc-getCC)"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCUTTER_ENABLE_GRAPHVIZ="$(usex graphviz)"
+		-DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=OFF
+		-DCUTTER_ENABLE_PYTHON=ON
+		-DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
+		-DCUTTER_USE_BUNDLED_RIZIN=OFF
+		-DCUTTER_QT6=ON
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-util/cutter/metadata.xml b/dev-util/cutter/metadata.xml
index bffad81d9f9e..32c51c041b1b 100644
--- a/dev-util/cutter/metadata.xml
+++ b/dev-util/cutter/metadata.xml
@@ -6,6 +6,6 @@
 		<name>John Helmert III</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">radareorg/cutter</remote-id>
+		<remote-id type="github">rizinorg/cutter</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/debugedit/debugedit-5.1-r2.ebuild b/dev-util/debugedit/debugedit-5.1-r2.ebuild
index 13eb85bbf54f..ec949b336685 100644
--- a/dev-util/debugedit/debugedit-5.1-r2.ebuild
+++ b/dev-util/debugedit/debugedit-5.1-r2.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 @@ SRC_URI="
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 #KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
diff --git a/dev-util/debugedit/debugedit-5.1-r3.ebuild b/dev-util/debugedit/debugedit-5.1-r3.ebuild
index a982466deed6..5d3984ed10fc 100644
--- a/dev-util/debugedit/debugedit-5.1-r3.ebuild
+++ b/dev-util/debugedit/debugedit-5.1-r3.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 @@ SRC_URI="
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 #KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index ef3dd15f8ece..6a64ef52340d 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,2 +1,3 @@
 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
diff --git a/dev-util/diffoscope/diffoscope-284.ebuild b/dev-util/diffoscope/diffoscope-284.ebuild
index f4b47770300a..d64cbed20f1c 100644
--- a/dev-util/diffoscope/diffoscope-284.ebuild
+++ b/dev-util/diffoscope/diffoscope-284.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+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
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/difftastic/difftastic-0.61.0-r1.ebuild b/dev-util/difftastic/difftastic-0.61.0-r1.ebuild
index 4f9224cf6950..5c47cc323130 100644
--- a/dev-util/difftastic/difftastic-0.61.0-r1.ebuild
+++ b/dev-util/difftastic/difftastic-0.61.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Autogenerated by pycargoebuild 0.13.3
@@ -151,7 +151,7 @@ CRATES="
 	zerocopy@0.7.32
 "
 
-inherit cargo
+inherit cargo flag-o-matic
 
 DESCRIPTION="A structural diff that understands syntax."
 HOMEPAGE="http://difftastic.wilfred.me.uk/"
@@ -183,6 +183,14 @@ src_prepare() {
 	default
 }
 
+src_configure() {
+	# Workaround for old bundled mimalloc in mimalloc crate, see
+	# bug #944110, but updating it should be done with caution, see
+	# https://github.com/purpleprotocol/mimalloc_rust/issues/109.
+	append-cflags -std=gnu17
+	cargo_src_configure
+}
+
 src_install() {
 	cargo_src_install
 	dodoc -r "${DOCS[@]}"
diff --git a/dev-util/directx-headers/directx-headers-1.614.1.ebuild b/dev-util/directx-headers/directx-headers-1.614.1.ebuild
index 4766cc43b9ea..6eb9e68a7536 100644
--- a/dev-util/directx-headers/directx-headers-1.614.1.ebuild
+++ b/dev-util/directx-headers/directx-headers-1.614.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
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/microsoft/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/dwdiff/Manifest b/dev-util/dwdiff/Manifest
index dccebf17fc54..a75ce182addd 100644
--- a/dev-util/dwdiff/Manifest
+++ b/dev-util/dwdiff/Manifest
@@ -1,2 +1 @@
-DIST dwdiff-2.1.3.tar.bz2 79862 BLAKE2B 72eb07071de413526b70ebfd30030394c8bc4958bd14128b9a8b87a76561e4bfbd61064def314a4b989da027664d999cfb9a4ac9ab6f1b06cbe3f38f271e538e SHA512 e4375658ddb919d763bedacd122e5597a4c3cd40ddff2c954c6cc88e5047d20d4d3b18eaf75c6835be21e1f72e2622e25b212ae9882d8eaa36874af3f6de4b3f
 DIST dwdiff-2.1.4.tar.bz2 79857 BLAKE2B b4b54c82137097c7e3e3438b08dcc9da83aa127f72dd30b995a18b2b11ed3f419dce44762872407f4070b6b9dbca6a2d33dc24e0ed1363405fdaa638852d036f SHA512 8a2bffcf5f170a5a1fc2885a04d8e7cd054cebeed98a5e2695b609d3199c8c8bdeda6f3a9497888237e6cbfb570a4699aa66f4e062cb6aa109cbb7792a75a5f3
diff --git a/dev-util/dwdiff/dwdiff-2.1.3.ebuild b/dev-util/dwdiff/dwdiff-2.1.3.ebuild
deleted file mode 100644
index 51adb419f8cc..000000000000
--- a/dev-util/dwdiff/dwdiff-2.1.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="diff-like program operating at word level instead of line level"
-HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
-SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-libs/icu:=
-	sys-apps/diffutils"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${P}-C99-fix.patch )
-
-src_prepare() {
-	default
-	sed -i -e '/INSTALL/s:COPYING::' Makefile.in || die
-}
-
-src_configure() {
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		$(use_with nls gettext) || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
diff --git a/dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch b/dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch
deleted file mode 100644
index 9d6d9ae2bca5..000000000000
--- a/dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/definitions.h
-+++ b/src/definitions.h
-@@ -43,11 +43,11 @@
- 
- /*==== Misc definitions ====*/
- /* Define a bool type if not already defined (C++ and C99 do)*/
--#if !(defined(__cplusplus) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 19990601L))
-+#if !(defined(__cplusplus) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L))
- /*@-incondefs@*/
- typedef enum {false, true} bool;
- /*@+incondefs@*/
--#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 19990601L
-+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
- #include <stdbool.h>
- #endif
diff --git a/dev-util/flatpak-builder/Manifest b/dev-util/flatpak-builder/Manifest
index ad0664fdf489..df9045c8cc33 100644
--- a/dev-util/flatpak-builder/Manifest
+++ b/dev-util/flatpak-builder/Manifest
@@ -1 +1 @@
-DIST flatpak-builder-1.3.3.tar.xz 522332 BLAKE2B 6b870ecdd92a7fb0eca85162a49a48f5bae83ba8a86a5e6663743e3a957240b2059e24ae7f15a9621aa784bb6d394620d58e9e9e3c1c1f5bcdac89b610e8cf3c SHA512 7b46382e559184ae57cffa082a0617013e59428b65ad064e741e357bf165029da91c8d527be6fc7349812edf8dd1e92f42480e6b0f3f6639e3cd88ccfb2bf3e7
+DIST flatpak-builder-1.4.4.tar.xz 530300 BLAKE2B ffc956cb60ddc085c478a3da78a2d0eb5f13e7add9d4246a316cb37a405a02e21e547ee3dd13a78a0cd1d90789ef6c0eeefdc7c2735c6c7147451997a2f38c70 SHA512 7ccc6c9cf464f1637063d2f7ca32464c81c148b50f5479a49c80fc364781ba82ab2e57135e4902f9e00dad25ac70000658c20c7e8c0a10a519eb1d3a86dad35a
diff --git a/dev-util/flatpak-builder/flatpak-builder-1.3.3.ebuild b/dev-util/flatpak-builder/flatpak-builder-1.3.3.ebuild
deleted file mode 100644
index 21434455c033..000000000000
--- a/dev-util/flatpak-builder/flatpak-builder-1.3.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Tool to build flatpaks from source"
-HOMEPAGE="http://flatpak.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="doc +yaml"
-
-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:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt
-	)
-"
-
-PATCHES=("${FILESDIR}/flatpak-builder-1.2.2-musl.patch")
-
-src_configure() {
-	econf \
-		$(use_enable doc documentation) \
-		$(use_enable doc docbook-docs) \
-		$(use_with yaml)
-}
diff --git a/dev-util/flatpak-builder/flatpak-builder-1.4.4.ebuild b/dev-util/flatpak-builder/flatpak-builder-1.4.4.ebuild
new file mode 100644
index 000000000000..63c98370e206
--- /dev/null
+++ b/dev-util/flatpak-builder/flatpak-builder-1.4.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
+DESCRIPTION="Tool to build flatpaks from source"
+HOMEPAGE="http://flatpak.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc +yaml"
+
+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(-)]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.18.2
+	virtual/pkgconfig
+	doc? (
+		app-text/xmlto
+		dev-libs/libxslt
+	)
+"
+
+PATCHES=("${FILESDIR}/flatpak-builder-1.2.2-musl.patch")
+
+src_configure() {
+	econf \
+		$(use_enable doc documentation) \
+		$(use_enable doc docbook-docs) \
+		$(use_with yaml)
+}
diff --git a/dev-util/github-cli/Manifest b/dev-util/github-cli/Manifest
index 9792f27ce619..7b0dc01e0fd1 100644
--- a/dev-util/github-cli/Manifest
+++ b/dev-util/github-cli/Manifest
@@ -1,12 +1,4 @@
-DIST github-cli-2.27.0-deps.tar.xz 106343228 BLAKE2B ac99c816089dd7cc309dcb0984d87477e8b733ce938ac4b75c86357d63145ed4d4635d8c344fb68c806241636c7a84da372e228d8c074ad08b695c266b5c83ec SHA512 caa52b8c4216f2cde4bfd33df3240b79401e91574061d6417cf78c8049e617996aa20b6dd09aa7ab8e7f9f5ebaa55b2f997da47d153d95e6d413707c1a7fc3c3
-DIST github-cli-2.27.0.tar.gz 828409 BLAKE2B 1c543dbf8caf39198107a71bcde159996e6a333c9a0949d4a8862e72255246d558e72e35e13947bbc4a3122a101a623c45681c6ddf127d1f4a425b7ff03ad3d6 SHA512 ea475e828ac28dca3ba5a12a5340df697c4dad2d76140eb591b822e438a78511d82e4786b6949fb52396d8b1ef07d70b7d0b2a5a378785cf4b35d084829d1bea
-DIST github-cli-2.31.0-deps.tar.xz 106505536 BLAKE2B cfd4fd3b11839edeef86382b15a2adc561d9d8377b3fe75d896914820e70708cf9781966e25afed3538c284a17efb82da4087613ab74c1a4acb2fb62d76b7f67 SHA512 e9f339d400841541d6aefb8b1725d36a5b6351edcdd4bc7ec25eb75cb8d15041a995e1bbcf9506ce5d96ea2bdaccf02077e37f593917ea3157937ea466e7f5a3
-DIST github-cli-2.31.0.tar.gz 888221 BLAKE2B ad1d0125ca043f180d1cb46eb4413ea654e3ab23ea72cac10c04c40f5858fda825b6cfa2022454293018416a1ef12b8182fe1bdfaf6fea977145503689a062a0 SHA512 e0dbdba446666d8a4ce9edb1b7387f26b8a865cf35d1006e86547ff44b7bffe78b29885b4e5e9654f966a6121d67e0097f4fc759405ffc9d34ca430032ed556a
-DIST github-cli-2.32.1-deps.tar.xz 100042076 BLAKE2B d362088e2fd24938c52c352ca88a2af76f31c8f4048bd0845043668cfe5d438921623ddf99f54d4239dc2cce927d147e1a4ba16fceef4f824b9a2e34540854e2 SHA512 7964719eed7383169496c6f156320eb2c9aa2b7fae374c025bad2dad2215e0502662a0a7da3722cfb660132e6cf5620cb4189ce8aaf9cf6a36f0cda29d28d12b
-DIST github-cli-2.32.1.tar.gz 897387 BLAKE2B 0a46b501958b3fc1b5d3e5467292dd3a3e4cc721d5ac822f637e26f345654bed01bdb27283a86351460c5f2650a54b635abf839e312bfe9b98b794eb60880aff SHA512 4b5b56809110c6b7c19dec344c7171df0eed0bcf5388bc0c63ce5ac4a3b6f4606f1e8de207f5b6889834013059013e8a4b6701b82b933322ed4fcf0e48144b72
-DIST github-cli-2.33.0-deps.tar.xz 100032668 BLAKE2B bffaed49d2724951a34e37632ff131f47f66fb79516a42482d2e0d7399b29266cad5b8519912feb33e279d5b7d39b76efaeaaa48ff462db9912e063b41ce8dc3 SHA512 aefdb7c12507dbf02acccc943be9074f7eac12beefd7a5f8a7a08bbacbbaa46cd91f46262258b3fc0a00b41fb0ccf4816621e9ebe4f2bb10b5f6c5e6260ac003
-DIST github-cli-2.33.0.tar.gz 898066 BLAKE2B 0af992e0687c1e5c2c3552e35419a65af348f76eee91f38377396eb7e7713e8c982b4677a9c35f329380d0281b443e342bb6470b0eade85118248e41333266db SHA512 76a5490964828e375eb3cc0a625c25e6005f9cd44ae40ec04432fd7672bed4628b4db4ffdc713ec2cb59f00c6308e5cf2141a3c932d08ccef4fe5ef676b09916
-DIST github-cli-2.42.0-deps.tar.xz 101578632 BLAKE2B 54153cd48dac9b2f3fc094b5060cca3d9911bda33dfd7e1b42f23b74f97597a664c8e490bec70c6e1215c2310aa6862398da035c3f662e819e158802b915d216 SHA512 4e7c0ac720ef8e2c5ab4c6d0918abc0e8a6c17df31566f4b0e49b74f90225093b792ec6d60ffb98db1a53eaa7a52e2fbcb1a059c57972e344522216a85736f90
-DIST github-cli-2.42.0.tar.gz 825997 BLAKE2B dadb64c62f55ed02c48b56ad02762b806fd4eb0c26c5d9509c9976b6fbddfc542fe46bc54c1790394ac7874e7632f655c001fdcd6cc629fa1fa1b4fc984211b3 SHA512 b8e76ea0bda9f9e78d9b8d5ff57326c1fa77f280688948facd83549d88f3d2259516ad9bb0f0455cecfa34168ef317f01683383cbe1b41e150b5ea9ab8c2fa2b
 DIST github-cli-2.52.0-deps.tar.xz 89577956 BLAKE2B 5259f324843c92ea1781d14e948893c3632438d46cc05469edac4557e9977c6df889c796fe4f7b1bcb4b6d64830b8c5c5b5cb2b37a21757990ede84a0fbe4c75 SHA512 bb9b28a8b9251d8cb4082ea5a040bd7d844fa2fa4243f8933502dccbb0673349dd1b0b6191c60905266eab88bdb1e3f7df6e53a3bea13e98236a36e6c0dfab7b
 DIST github-cli-2.52.0.tar.gz 988293 BLAKE2B 383a6e88a509cbe25544088f7260335b264d36f0acfc1ca4dbd648b911671d1fe0a4b85d678225bc81ba4a236de8acc2ba57bc55b19cfc53c5dcb746d3ab1a76 SHA512 bb43f4160eebfa61c56d1272f379689f33e115d9b00cc0af40212cdb2964fb9953f25cee777baef95dc751e80a64e5b374c98e07ac5118963a43f8b29100c27b
+DIST github-cli-2.65.0-deps.tar.xz 68106872 BLAKE2B cc32318356dda4c703721243f57e1cefa7d6baec6e08fe02b14fca3f4e4adcbc576b3561be8046e63af800f0a1421fe71d476b0b4b6e0df0adec7f108b7f98ee SHA512 81684d9c810098a922d604fa52e5e849bff78625b72afc55b4823d8b8d0ba0eca200a53f390637e305c3acef8c4b77ca90e423f196047d84dc264a7ebeba6b8a
+DIST github-cli-2.65.0.tar.gz 12939630 BLAKE2B 9d4f5ab0ae8d2b2638a2aeeedefd7fcca7b526dcc71595e22fc8a1a834ed613959999dc7590a8799cb2682b9710c8701a94e7d4cd5a469d6e88b0a551e030f3d SHA512 801d98427e0c58961840e6f6be5fd0a4863da6da1aa31d3af43eb440f2a9dda930d8e7226ba69ebfb04393928092924de913ecb582c0588682773b6e4c76165b
diff --git a/dev-util/github-cli/github-cli-2.27.0.ebuild b/dev-util/github-cli/github-cli-2.27.0.ebuild
deleted file mode 100644
index 4484ca69c4ef..000000000000
--- a/dev-util/github-cli/github-cli-2.27.0.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
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="GitHub CLI"
-HOMEPAGE="https://github.com/cli/cli"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cli/cli.git"
-else
-	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
-	S="${WORKDIR}/cli-${PV}"
-fi
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
-SLOT="0"
-
-RDEPEND=">=dev-vcs/git-1.7.3"
-
-RESTRICT="test"
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		go-module_src_unpack
-	fi
-}
-
-src_compile() {
-	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
-	# Once we set up cross compiling, this line will need to be adjusted
-	# to compile for the target.
-	# Everything else in this function happens on the host.
-	emake
-
-	einfo "Building man pages"
-	emake manpages
-
-	einfo "Building completions"
-	go run ./cmd/gh completion -s bash > gh.bash-completion || die
-	go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
-}
-
-src_install() {
-	dobin bin/gh
-	dodoc README.md
-
-	doman share/man/man?/gh*.?
-
-	newbashcomp gh.bash-completion gh
-	insinto /usr/share/zsh/site-functions
-	newins gh.zsh-completion _gh
-}
diff --git a/dev-util/github-cli/github-cli-2.31.0.ebuild b/dev-util/github-cli/github-cli-2.31.0.ebuild
deleted file mode 100644
index 4484ca69c4ef..000000000000
--- a/dev-util/github-cli/github-cli-2.31.0.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
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="GitHub CLI"
-HOMEPAGE="https://github.com/cli/cli"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cli/cli.git"
-else
-	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
-	S="${WORKDIR}/cli-${PV}"
-fi
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
-SLOT="0"
-
-RDEPEND=">=dev-vcs/git-1.7.3"
-
-RESTRICT="test"
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		go-module_src_unpack
-	fi
-}
-
-src_compile() {
-	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
-	# Once we set up cross compiling, this line will need to be adjusted
-	# to compile for the target.
-	# Everything else in this function happens on the host.
-	emake
-
-	einfo "Building man pages"
-	emake manpages
-
-	einfo "Building completions"
-	go run ./cmd/gh completion -s bash > gh.bash-completion || die
-	go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
-}
-
-src_install() {
-	dobin bin/gh
-	dodoc README.md
-
-	doman share/man/man?/gh*.?
-
-	newbashcomp gh.bash-completion gh
-	insinto /usr/share/zsh/site-functions
-	newins gh.zsh-completion _gh
-}
diff --git a/dev-util/github-cli/github-cli-2.32.1.ebuild b/dev-util/github-cli/github-cli-2.32.1.ebuild
deleted file mode 100644
index 4484ca69c4ef..000000000000
--- a/dev-util/github-cli/github-cli-2.32.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
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="GitHub CLI"
-HOMEPAGE="https://github.com/cli/cli"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cli/cli.git"
-else
-	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
-	S="${WORKDIR}/cli-${PV}"
-fi
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
-SLOT="0"
-
-RDEPEND=">=dev-vcs/git-1.7.3"
-
-RESTRICT="test"
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		go-module_src_unpack
-	fi
-}
-
-src_compile() {
-	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
-	# Once we set up cross compiling, this line will need to be adjusted
-	# to compile for the target.
-	# Everything else in this function happens on the host.
-	emake
-
-	einfo "Building man pages"
-	emake manpages
-
-	einfo "Building completions"
-	go run ./cmd/gh completion -s bash > gh.bash-completion || die
-	go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
-}
-
-src_install() {
-	dobin bin/gh
-	dodoc README.md
-
-	doman share/man/man?/gh*.?
-
-	newbashcomp gh.bash-completion gh
-	insinto /usr/share/zsh/site-functions
-	newins gh.zsh-completion _gh
-}
diff --git a/dev-util/github-cli/github-cli-2.33.0.ebuild b/dev-util/github-cli/github-cli-2.33.0.ebuild
deleted file mode 100644
index 4484ca69c4ef..000000000000
--- a/dev-util/github-cli/github-cli-2.33.0.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
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="GitHub CLI"
-HOMEPAGE="https://github.com/cli/cli"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cli/cli.git"
-else
-	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
-	S="${WORKDIR}/cli-${PV}"
-fi
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
-SLOT="0"
-
-RDEPEND=">=dev-vcs/git-1.7.3"
-
-RESTRICT="test"
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		go-module_src_unpack
-	fi
-}
-
-src_compile() {
-	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
-	# Once we set up cross compiling, this line will need to be adjusted
-	# to compile for the target.
-	# Everything else in this function happens on the host.
-	emake
-
-	einfo "Building man pages"
-	emake manpages
-
-	einfo "Building completions"
-	go run ./cmd/gh completion -s bash > gh.bash-completion || die
-	go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
-}
-
-src_install() {
-	dobin bin/gh
-	dodoc README.md
-
-	doman share/man/man?/gh*.?
-
-	newbashcomp gh.bash-completion gh
-	insinto /usr/share/zsh/site-functions
-	newins gh.zsh-completion _gh
-}
diff --git a/dev-util/github-cli/github-cli-2.42.0.ebuild b/dev-util/github-cli/github-cli-2.42.0.ebuild
deleted file mode 100644
index 4484ca69c4ef..000000000000
--- a/dev-util/github-cli/github-cli-2.42.0.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
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="GitHub CLI"
-HOMEPAGE="https://github.com/cli/cli"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cli/cli.git"
-else
-	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
-	S="${WORKDIR}/cli-${PV}"
-fi
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
-SLOT="0"
-
-RDEPEND=">=dev-vcs/git-1.7.3"
-
-RESTRICT="test"
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		go-module_src_unpack
-	fi
-}
-
-src_compile() {
-	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
-	# Once we set up cross compiling, this line will need to be adjusted
-	# to compile for the target.
-	# Everything else in this function happens on the host.
-	emake
-
-	einfo "Building man pages"
-	emake manpages
-
-	einfo "Building completions"
-	go run ./cmd/gh completion -s bash > gh.bash-completion || die
-	go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
-}
-
-src_install() {
-	dobin bin/gh
-	dodoc README.md
-
-	doman share/man/man?/gh*.?
-
-	newbashcomp gh.bash-completion gh
-	insinto /usr/share/zsh/site-functions
-	newins gh.zsh-completion _gh
-}
diff --git a/dev-util/github-cli/github-cli-2.65.0.ebuild b/dev-util/github-cli/github-cli-2.65.0.ebuild
new file mode 100644
index 000000000000..cd54bf0e7d58
--- /dev/null
+++ b/dev-util/github-cli/github-cli-2.65.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="GitHub CLI"
+HOMEPAGE="https://github.com/cli/cli"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cli/cli.git"
+else
+	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
+	S="${WORKDIR}/cli-${PV}"
+fi
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
+SLOT="0"
+
+RDEPEND=">=dev-vcs/git-1.7.3"
+
+RESTRICT="test"
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		go-module_src_unpack
+	fi
+}
+
+src_compile() {
+	[[ ${PV} != 9999 ]] && export GH_VERSION="v${PV}"
+	emake prefix=/usr bin/gh manpages completions
+}
+
+src_install() {
+	emake prefix=/usr DESTDIR="${D}" install
+	dodoc README.md
+}
diff --git a/dev-util/github-cli/github-cli-9999.ebuild b/dev-util/github-cli/github-cli-9999.ebuild
index 2ec1463144a6..cd54bf0e7d58 100644
--- a/dev-util/github-cli/github-cli-9999.ebuild
+++ b/dev-util/github-cli/github-cli-9999.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
-inherit bash-completion-r1 go-module
+inherit go-module
 
 DESCRIPTION="GitHub CLI"
 HOMEPAGE="https://github.com/cli/cli"
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-	KEYWORDS="~amd64 ~loong ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
 	S="${WORKDIR}/cli-${PV}"
 fi
 
@@ -34,27 +34,11 @@ src_unpack() {
 }
 
 src_compile() {
-	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
-	# Once we set up cross compiling, this line will need to be adjusted
-	# to compile for the target.
-	# Everything else in this function happens on the host.
-	emake
-
-	einfo "Building man pages"
-	emake manpages
-
-	einfo "Building completions"
-	go run ./cmd/gh completion -s bash > gh.bash-completion || die
-	go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
+	[[ ${PV} != 9999 ]] && export GH_VERSION="v${PV}"
+	emake prefix=/usr bin/gh manpages completions
 }
 
 src_install() {
-	dobin bin/gh
+	emake prefix=/usr DESTDIR="${D}" install
 	dodoc README.md
-
-	doman share/man/man?/gh*.?
-
-	newbashcomp gh.bash-completion gh
-	insinto /usr/share/zsh/site-functions
-	newins gh.zsh-completion _gh
 }
diff --git a/dev-util/gitlab-cli/Manifest b/dev-util/gitlab-cli/Manifest
index 7f03d7a2d567..607efb5c5f7a 100644
--- a/dev-util/gitlab-cli/Manifest
+++ b/dev-util/gitlab-cli/Manifest
@@ -1,8 +1,2 @@
-DIST gitlab-cli-1.44.1-deps.tar.xz 18136428 BLAKE2B 9fafde045efac7a00029170ee3b9fad61b2d4cf8facb61ae11c1b6e922f5a88627e5c9dc9d127e232c7ad635b2e7a58c65a29f26b5953d5b252580596ac72030 SHA512 aa5b97b361b18cbbb03abf33ee4249ea66e4374f2ca000dcd037758770b62b3fd45d9f2837b98cf2a6507fb509a1f5e1917456663159e0238d30d743a3ec2052
-DIST gitlab-cli-1.44.1.tar.bz2 16841236 BLAKE2B 3a9ab7b0ca02c6a4a0652a268364785a6514c7bda688137947f11add4688e30ea547fe211b92a2543b765b8a82dc9ac85a7e189697bdc51c39cf62e82eaef42f SHA512 8b4bc19f78054104ae4551efacade8c2a1e86cf538dba2b31a9e7127cd6a792b8bf00d788a93aa26ba3f9a03684db0dbf67968e66d6048168cec6a512d90b18c
-DIST gitlab-cli-1.46.0-deps.tar.xz 21625028 BLAKE2B c4c5c38f505e0812e2ab5490d5064815fb6b8b2d65fe21016db886959b6dee2c5ed3e2abf51a00a40b70927a9d4562e4330075809e0c2d413652f5cc33ba4be2 SHA512 9a04a6ba82c8c00124b53adfefaf4b22dbd59d085823ed44e26d7a0436c359b2e966987258206030881373302627a40b800675efbf05ed4c3558f20830aabe94
-DIST gitlab-cli-1.46.0.tar.bz2 16845037 BLAKE2B b1bbfffb0968b5245fae91a7ba0c29f7c278de06006a79f8d5b9c64acb577b5cead2a3587eb770a35d5b0fd75fc9917c078918cb51541e677b739d38ec9510e3 SHA512 c6a1a854019f21cb172dba1ce01c8a4e94d6af7ada52c1bf182bb3444fcb8f7d593eb009a2c89c078f09f7abde57443a95d2a81aa11619ebecb75bfb5ace6ada
-DIST gitlab-cli-1.48.0-deps.tar.xz 21543860 BLAKE2B 7193a39b845a2afc999100f5936a9a5e8565597b51c37c9717fd38ff4799fba53ba74eb4acf9d02cd6d7247270e794976e8c0e57949881a3183f692cd32dfb96 SHA512 15c294669b61288bf9f23c312b5d29e3fb53c6dd9b2bbc4877bbcb42ad8b06cac1cb5f8b4252749bebb774f5d374b63e9e7ee89e5fefd452a81e6082c0d7091f
-DIST gitlab-cli-1.48.0.tar.bz2 16863481 BLAKE2B d7ffaca8b63772dc3394d7205044f2c43c8bb58b08f3e892bd4ab169c10151dd67337847b850b7e625b4d32bf674162851664cfb81af76bb9636432439758f12 SHA512 e59d31b6fb3ebbbe989c1198b9e33bc639a46d68fffa24b5df3c1b4fe8391a5c7a9fb84a7d9dcf1989d63375ef92d964e6474203be31a2fc82509959b28075a2
 DIST gitlab-cli-1.51.0-deps.tar.xz 21574644 BLAKE2B ab3309e6e1bd413a306e3c1aec172b191cd223bee3b941e1e21811951311e477e8d4118f20a89a8ee9a898eaf30d7f5ce8fc30f4eadc7ac07d7a76fe86288361 SHA512 2628b65c1f1c4c9207eba14e3c36656a724bbce48ad371a264d361fe52499eb206b35ebd43eee25e80b896d40250643d3b69dc954b70ef30ff8227fc0658c845
 DIST gitlab-cli-1.51.0.tar.bz2 16865378 BLAKE2B 65091d664ec3a2148c670407c5c92dd2b64d92662255b8ba6f3911d6eb79a55ee9e5c83da2b48615de6bb996aaa361b259b359230070198250d959e2b2060e0e SHA512 dc587d8574c924c2c69502bd6028b40533f662f1ec79f93ef42e78fca41c7cde7c30fd5cbf7cd99f8d3311802048d957553082df16368608815f637d9a362af9
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.44.1.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.44.1.ebuild
deleted file mode 100644
index 206794345fdb..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.44.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=bd628d4c3a01800afb00ef8586dd29904340bb68/
-
-DESCRIPTION="the official gitlab command line interface"
-HOMEPAGE="https://gitlab.com/gitlab-org/cli"
-SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# tests communicate with gitlab.com and require a personal access token
-RESTRICT="test"
-
-S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}"
-
-src_compile() {
-	emake \
-		GLAB_VERSION=v${PV} \
-		build manpage
-}
-
-src_install() {
-	dobin bin/glab
-	dodoc README.md
-	doman share/man/man1/*
-}
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.46.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.46.0.ebuild
deleted file mode 100644
index 34441e2b6f86..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.46.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=16dc43a8f0ae5c8c5310891117efaadfaa5743aa
-
-DESCRIPTION="the official gitlab command line interface"
-HOMEPAGE="https://gitlab.com/gitlab-org/cli"
-SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND=">=dev-lang/go-1.23.0"
-
-# tests communicate with gitlab.com and require a personal access token
-RESTRICT="test"
-
-src_compile() {
-	emake \
-		GLAB_VERSION=v${PV} \
-		build manpage
-}
-
-src_install() {
-	dobin bin/glab
-	dodoc README.md
-	doman share/man/man1/*
-}
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.48.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.48.0.ebuild
deleted file mode 100644
index 2a677734fe73..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.48.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=2db471edb1eb73439eecc04e0a6ab5acc1f32c80
-
-DESCRIPTION="the official gitlab command line interface"
-HOMEPAGE="https://gitlab.com/gitlab-org/cli"
-SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND=">=dev-lang/go-1.23.2"
-
-# tests communicate with gitlab.com and require a personal access token
-RESTRICT="test"
-
-src_compile() {
-	emake \
-		GLAB_VERSION=v${PV} \
-		build manpage
-}
-
-src_install() {
-	dobin bin/glab
-	dodoc README.md
-	doman share/man/man1/*
-}
diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest
index 5b3e61eb2fac..0a6c213a7e53 100644
--- a/dev-util/gitlab-runner/Manifest
+++ b/dev-util/gitlab-runner/Manifest
@@ -1,6 +1,6 @@
-DIST gitlab-runner-17.4.2-deps.tar.xz 104738856 BLAKE2B 4ee77d51927e0ba869b146b2a85dc321aff70d55d9081553c30ef0745f3a97a43dfe0db3c66b9657ee01d84a6566c093989c94940ccea0e4019dbc58546be88b SHA512 92d9f04cfd1e33434ad3620f79e156074f4bc3a689ae682587254f983cec549f6d0e1255958d6e973cb16c0c94c9d2ed28234a08b18637509037c8bbd0ef5980
-DIST gitlab-runner-17.4.2.tar.bz2 1407513 BLAKE2B 5a1aec519e7a23fe4480ba07a506622c1300459ea04c0d9f5dffbd51e9db78595d5b3bc3c9646cffa7408c973311fab54c541c99796e271ffb8cf451a897c671 SHA512 9b99f3e38afa0cda9a555b5353e1cb0b6dfedee69c4da4994d419096edd7c83a2c1811a95185d8b0f4ca5706144838737873f373564be4bc0d326d13a8071f95
-DIST gitlab-runner-17.5.4-deps.tar.xz 108479468 BLAKE2B c060c4a4e17b9e9a2ba9bf0b8eb15f2cca8546118bfd3e94fc19862a5c1578d1c9e9414ede859406a5ae713cc487f44306b2230dc044262c323d8380ce79f0ca SHA512 226ced14c0e8513d11e120f0b8673d59d8d18db7f54602ecc273bbf9cb1b1d540d0e360a3f211bf7500c43ee8b9ead1ac96d7ce462dac2243e441a8232c8da41
-DIST gitlab-runner-17.5.4.tar.bz2 1726499 BLAKE2B 98f5ab8260853ac399b9872599ec0a4e34c53d5c99a32231848eeba89ee9e16caafd1c5b49f00e3ece1c3eb1a0ff215d72b5e26a8ff18aa77e3b78effa0c7d9f SHA512 bf9d1a0803c922898e873edabd576fcd3a801885e5cb27acfab48b2f3cf0d6dc6976cdd0c0154401758bdf45e9b6991b5b311183c233b69ae611b18db22a71a3
-DIST gitlab-runner-17.6.0-deps.tar.xz 108556780 BLAKE2B 539bdb456b6788a384fccd5fed3ab510be91e11172e66aedd90eb972b442ad3835a3dff6ffebfca1f428dc47ccd26519acd8fe05c545de01108f6606e5cdea97 SHA512 592fc6d10a5342ecfbe56d5c40e9cd4df450b44a1b6655b858c6e1c6ed82e50d4db282f8ac68985707c4983958830f021ee2e9f9aa55576e161c3746f4964f17
-DIST gitlab-runner-17.6.0.tar.bz2 1744529 BLAKE2B 17bd3d06da237890ff8e08add9b9147292728bb51edd0517e9f99fbe14c5030cf16b0809b621f21099438d72669643a93cc0dc5455640ef00117b8bc55440515 SHA512 f43baf6b3f510316d06ee9edcfc9a87182921da6e2f91169fbe80d3e1887c728e729219f6ee07f73030c4c82ecf809857fb448d2f8829fa0e5829861bf9e1367
+DIST gitlab-runner-17.5.5-deps.tar.xz 108491680 BLAKE2B 6443e183ac037ac4ab6db4c255fc0fc963a4bc7997d3581848a6e13936c66f9bcd7a6244013e0ae58543e2cd171e77df4235119dcc619a90c75383bf8f89164a SHA512 dfc6898b0b7f52f41695ffe23a682cea9c551b89aa24a8cd979ebc1bd24e5dfbe311502bfc46e7696c91c8b06a2c7da3d41ee0984d18cfe7d111ded46c2bcfd7
+DIST gitlab-runner-17.5.5.tar.bz2 1726240 BLAKE2B 5770a5f297f3c07a14b42169bfcf7df1a8fe4d4f98bc23a319f323815bc0cb582ffb2e415e65452d980435a2b586bcc1c17a1cfd755fec4df30eff5d93d1df24 SHA512 a6f3c0e25e10b3d34bf58013275e547141260e67d69344317ec568ae407789dff535075dfb716c70b567beb141fa3b50779ec1a5228060df91a7ff3a36f199dd
+DIST gitlab-runner-17.6.1-deps.tar.xz 108538744 BLAKE2B 67a89a4d10d7cac07cc6c0328960b46a54360b73b69f82b09320fceec2d849bf661f8c8bb4c9e349f9827f90edee182e169c089f4677cd9ce05f743553d9c80d SHA512 8382b42ac69af665dba632495fc543cbfd97674a5e88b271bf1862e1bbb382f30a461410cc93d615b5a3114ff28cfa376f30b6186313485ec3353fce34aee96b
+DIST gitlab-runner-17.6.1.tar.bz2 1744419 BLAKE2B c56ce5e2f9185efe0068faa39ba305d0dc2ec036d83c86445151d90d230351c2a5b2e1124f9e7d6109bf7c04c8ff0d0fc72b920ad675975a9f840c72267d75c1 SHA512 21e73bf3d99f2d5e500bb3a1c2b95534c96f673ff51eae086a06386ae954f23fd7cb5950e347b97ee52d15824bde2b4e8999d27660602f8803383d748cc86c03
+DIST gitlab-runner-17.7.0-deps.tar.xz 108544204 BLAKE2B 0e9049a8a56e705dc2d6d1585d75fa356b3aa3b9eb0ff14cea76adf6021636dcc2a6989e75f4ba1cb64be17cf3b4417a31db73b8d3b73eb92f0d12b8659343d2 SHA512 be76825ddcb22ead48338f9023777f4a610fd468e4020ab4455881ec1b4b02cd594c7fbffd29d9f79645551e075f150090f75ac21b2250b8c73381f67ae866dd
+DIST gitlab-runner-17.7.0.tar.bz2 1758329 BLAKE2B 942ce344664ee7067e98e5ce50d011180c2189cde14a7dff517af5fb64b60892404bc367031aeeb7320aece993ae4674808548436e8d077172075d183b9e69e0 SHA512 57b5b0882d1190ed88b01b729b577531a2a8c9831a7037437ff16343bd9582b3d7e436e13f3e1cee0aa5457ff95e78f2ddd81d4df8a57589ffe71c0a68642a38
diff --git a/dev-util/gitlab-runner/gitlab-runner-17.4.2.ebuild b/dev-util/gitlab-runner/gitlab-runner-17.4.2.ebuild
deleted file mode 100644
index 188a187d91ad..000000000000
--- a/dev-util/gitlab-runner/gitlab-runner-17.4.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd tmpfiles
-
-# make sure this gets updated for every bump
-GIT_COMMIT=24b8e03b
-
-DESCRIPTION="The official GitLab Runner, written in Go"
-HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
-SRC_URI="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv"
-
-COMMON_DEPEND="acct-group/gitlab-runner
-	acct-user/gitlab-runner"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="dev-go/gox"
-
-DOCS=( docs CHANGELOG.md README.md config.toml.example )
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_compile() {
-	emake \
-		BUILT="$(date -u '+%Y-%m-%dT%H:%M:%S%:z')" \
-		GOX="${EPREFIX}/usr/bin/gox" \
-		REVISION=${GIT_COMMIT} \
-		VERSION=${PV} \
-		runner-bin-host
-}
-
-src_test() {
-	CI=0 ego test
-}
-
-src_install() {
-	dobin out/binaries/gitlab-runner
-	einstalldocs
-
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-	keepdir /{etc,var/log}/${PN}
-	fperms 0700 /{etc,var/log}/gitlab-runner
-	fowners gitlab-runner:gitlab-runner /{etc,var/log}/${PN}
-}
-
-pkg_postinst() {
-	tmpfiles_process gitlab-runner.conf
-	[[ -f ${EROOT}/etc/gitlab-runner/config.toml ]] && return
-	elog
-	elog "To use the runner, you need to register it with this command:"
-	elog "# gitlab-runner register"
-	elog "This will also create the configuration file in /etc/gitlab-runner/config.toml"
-}
diff --git a/dev-util/gitlab-runner/gitlab-runner-17.5.4.ebuild b/dev-util/gitlab-runner/gitlab-runner-17.5.4.ebuild
deleted file mode 100644
index d7776438632d..000000000000
--- a/dev-util/gitlab-runner/gitlab-runner-17.5.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd tmpfiles
-
-# make sure this gets updated for every bump
-GIT_COMMIT=d8d88d9e
-
-DESCRIPTION="The official GitLab Runner, written in Go"
-HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
-SRC_URI="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv"
-
-COMMON_DEPEND="acct-group/gitlab-runner
-	acct-user/gitlab-runner"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="dev-go/gox"
-
-DOCS=( docs CHANGELOG.md README.md config.toml.example )
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_compile() {
-	emake \
-		BUILT="$(date -u '+%Y-%m-%dT%H:%M:%S%:z')" \
-		GOX="${EPREFIX}/usr/bin/gox" \
-		REVISION=${GIT_COMMIT} \
-		VERSION=${PV} \
-		runner-bin-host
-}
-
-src_test() {
-	CI=0 ego test
-}
-
-src_install() {
-	dobin out/binaries/gitlab-runner
-	einstalldocs
-
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-	keepdir /{etc,var/log}/${PN}
-	fperms 0700 /{etc,var/log}/gitlab-runner
-	fowners gitlab-runner:gitlab-runner /{etc,var/log}/${PN}
-}
-
-pkg_postinst() {
-	tmpfiles_process gitlab-runner.conf
-	[[ -f ${EROOT}/etc/gitlab-runner/config.toml ]] && return
-	elog
-	elog "To use the runner, you need to register it with this command:"
-	elog "# gitlab-runner register"
-	elog "This will also create the configuration file in /etc/gitlab-runner/config.toml"
-}
diff --git a/dev-util/gitlab-runner/gitlab-runner-17.5.5.ebuild b/dev-util/gitlab-runner/gitlab-runner-17.5.5.ebuild
new file mode 100644
index 000000000000..e474091b7516
--- /dev/null
+++ b/dev-util/gitlab-runner/gitlab-runner-17.5.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd tmpfiles
+
+# make sure this gets updated for every bump
+GIT_COMMIT=2684a23d
+
+DESCRIPTION="The official GitLab Runner, written in Go"
+HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
+SRC_URI="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 ~riscv"
+
+COMMON_DEPEND="acct-group/gitlab-runner
+	acct-user/gitlab-runner"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-go/gox"
+
+DOCS=( docs CHANGELOG.md README.md config.toml.example )
+
+src_compile() {
+	emake \
+		BUILT="$(date -u '+%Y-%m-%dT%H:%M:%S%:z')" \
+		GOX="${EPREFIX}/usr/bin/gox" \
+		REVISION=${GIT_COMMIT} \
+		VERSION=${PV} \
+		runner-bin-host
+}
+
+src_test() {
+	CI=0 ego test
+}
+
+src_install() {
+	dobin out/binaries/gitlab-runner
+	einstalldocs
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+	keepdir /{etc,var/log}/${PN}
+	fperms 0700 /{etc,var/log}/gitlab-runner
+	fowners gitlab-runner:gitlab-runner /{etc,var/log}/${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process gitlab-runner.conf
+	[[ -f ${EROOT}/etc/gitlab-runner/config.toml ]] && return
+	elog
+	elog "To use the runner, you need to register it with this command:"
+	elog "# gitlab-runner register"
+	elog "This will also create the configuration file in /etc/gitlab-runner/config.toml"
+}
diff --git a/dev-util/gitlab-runner/gitlab-runner-17.6.0.ebuild b/dev-util/gitlab-runner/gitlab-runner-17.6.0.ebuild
deleted file mode 100644
index 6305a4035230..000000000000
--- a/dev-util/gitlab-runner/gitlab-runner-17.6.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd tmpfiles
-
-# make sure this gets updated for every bump
-GIT_COMMIT=374d34fd
-
-DESCRIPTION="The official GitLab Runner, written in Go"
-HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
-SRC_URI="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv"
-
-COMMON_DEPEND="acct-group/gitlab-runner
-	acct-user/gitlab-runner"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="dev-go/gox"
-
-DOCS=( docs CHANGELOG.md README.md config.toml.example )
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_compile() {
-	emake \
-		BUILT="$(date -u '+%Y-%m-%dT%H:%M:%S%:z')" \
-		GOX="${EPREFIX}/usr/bin/gox" \
-		REVISION=${GIT_COMMIT} \
-		VERSION=${PV} \
-		runner-bin-host
-}
-
-src_test() {
-	CI=0 ego test
-}
-
-src_install() {
-	dobin out/binaries/gitlab-runner
-	einstalldocs
-
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-	keepdir /{etc,var/log}/${PN}
-	fperms 0700 /{etc,var/log}/gitlab-runner
-	fowners gitlab-runner:gitlab-runner /{etc,var/log}/${PN}
-}
-
-pkg_postinst() {
-	tmpfiles_process gitlab-runner.conf
-	[[ -f ${EROOT}/etc/gitlab-runner/config.toml ]] && return
-	elog
-	elog "To use the runner, you need to register it with this command:"
-	elog "# gitlab-runner register"
-	elog "This will also create the configuration file in /etc/gitlab-runner/config.toml"
-}
diff --git a/dev-util/gitlab-runner/gitlab-runner-17.6.1.ebuild b/dev-util/gitlab-runner/gitlab-runner-17.6.1.ebuild
new file mode 100644
index 000000000000..6c46d20ec9df
--- /dev/null
+++ b/dev-util/gitlab-runner/gitlab-runner-17.6.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd tmpfiles
+
+# make sure this gets updated for every bump
+GIT_COMMIT=6826a62f
+
+DESCRIPTION="The official GitLab Runner, written in Go"
+HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
+SRC_URI="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 ~riscv"
+
+COMMON_DEPEND="acct-group/gitlab-runner
+	acct-user/gitlab-runner"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-go/gox"
+
+DOCS=( docs CHANGELOG.md README.md config.toml.example )
+
+src_compile() {
+	emake \
+		BUILT="$(date -u '+%Y-%m-%dT%H:%M:%S%:z')" \
+		GOX="${EPREFIX}/usr/bin/gox" \
+		REVISION=${GIT_COMMIT} \
+		VERSION=${PV} \
+		runner-bin-host
+}
+
+src_test() {
+	CI=0 ego test
+}
+
+src_install() {
+	dobin out/binaries/gitlab-runner
+	einstalldocs
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+	keepdir /{etc,var/log}/${PN}
+	fperms 0700 /{etc,var/log}/gitlab-runner
+	fowners gitlab-runner:gitlab-runner /{etc,var/log}/${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process gitlab-runner.conf
+	[[ -f ${EROOT}/etc/gitlab-runner/config.toml ]] && return
+	elog
+	elog "To use the runner, you need to register it with this command:"
+	elog "# gitlab-runner register"
+	elog "This will also create the configuration file in /etc/gitlab-runner/config.toml"
+}
diff --git a/dev-util/gitlab-runner/gitlab-runner-17.7.0.ebuild b/dev-util/gitlab-runner/gitlab-runner-17.7.0.ebuild
new file mode 100644
index 000000000000..3af23ee4cc0d
--- /dev/null
+++ b/dev-util/gitlab-runner/gitlab-runner-17.7.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd tmpfiles
+
+# make sure this gets updated for every bump
+GIT_COMMIT=3153ccc6
+
+DESCRIPTION="The official GitLab Runner, written in Go"
+HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
+SRC_URI="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 ~riscv"
+
+COMMON_DEPEND="acct-group/gitlab-runner
+	acct-user/gitlab-runner"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-go/gox"
+
+DOCS=( docs CHANGELOG.md README.md config.toml.example )
+
+src_compile() {
+	emake \
+		BUILT="$(date -u '+%Y-%m-%dT%H:%M:%S%:z')" \
+		GOX="${EPREFIX}/usr/bin/gox" \
+		REVISION=${GIT_COMMIT} \
+		VERSION=${PV} \
+		runner-bin-host
+}
+
+src_test() {
+	CI=0 ego test
+}
+
+src_install() {
+	dobin out/binaries/gitlab-runner
+	einstalldocs
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+	keepdir /{etc,var/log}/${PN}
+	fperms 0700 /{etc,var/log}/gitlab-runner
+	fowners gitlab-runner:gitlab-runner /{etc,var/log}/${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process gitlab-runner.conf
+	[[ -f ${EROOT}/etc/gitlab-runner/config.toml ]] && return
+	elog
+	elog "To use the runner, you need to register it with this command:"
+	elog "# gitlab-runner register"
+	elog "This will also create the configuration file in /etc/gitlab-runner/config.toml"
+}
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 774bd7a6685e..e664caa4dc22 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,2 +1,3 @@
 DIST glslang-1.3.290.0.tar.gz 3854382 BLAKE2B 02f781c318fe8ec47dae646c45ec6567e7cdd266ca8f8cacfd165fe29b5cd37b4d44f8b7b46d4b0175b2cb63ddc29d20652b27a78194c3922441744b45e5a8b3 SHA512 1dbea2d90864c02e4cd95eef0577bc7954a10608dffb19e49f803195153d082e67e71da4ba673dcd857d3c8e12628a9504385eaa3241f3f06c4de12cbdb3dc1e
 DIST glslang-1.3.296.0.tar.gz 3868046 BLAKE2B c68b5e59e5490d2102d084a7d852a818c05eb0d496866796567a7606cb4685b378a4a15a0d2bc196c6ca035cd6f023ffdcf9a6e5cf0b450e340b5f4e97052793 SHA512 5c6ad0fc14c3a1d3282d692da77f2e155e7a9e5e84c89a3dbb3d64f9a0e5803c9db49085e05c6e2581f3448567ff35b85eff363047b67620bf153b7c02598af4
+DIST glslang-1.4.304.0.tar.gz 3917406 BLAKE2B 6d5beec94c5daafe905dabd6a4031e1c010cc9b395c5d8a8b4fdafd265a076251519056236b8f98fff613f21a0af6d4a2562c4c3c8255731642a6b887f3c4d24 SHA512 dae98afbea27b518e6230ebae5207c67b4f1a695b8f65033159bcf0064ec6546c8db4f2d52bd028353c15e4d7d9409c1f7dffc589639bfd8ee07d98ea7c73b12
diff --git a/dev-util/glslang/glslang-1.4.304.0.ebuild b/dev-util/glslang/glslang-1.4.304.0.ebuild
new file mode 100644
index 000000000000..122554318d47
--- /dev/null
+++ b/dev-util/glslang/glslang-1.4.304.0.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} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
+	inherit git-r3
+else
+	GIT_COMMIT="vulkan-sdk-${PV}"
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+fi
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
+
+LICENSE="BSD"
+SLOT="0/15.1"
+
+# Bug 698850
+RESTRICT="test"
+
+BDEPEND="${PYTHON_DEPS}
+	~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]
+"
+
+DEPEND="~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PCH=OFF
+		-DALLOW_EXTERNAL_SPIRV_TOOLS=ON
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index b5d0179ef351..122554318d47 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-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
@@ -20,7 +20,7 @@ DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V ge
 HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
 
 LICENSE="BSD"
-SLOT="0/15"
+SLOT="0/15.1"
 
 # Bug 698850
 RESTRICT="test"
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 71997b031cf0..cfd0e40f7c34 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-builder-44.2.tar.xz 9788192 BLAKE2B 3e31997a840ea288db37d942aa5b5ff92dce6754a9fe5984e9e20334c7e0323835d279bee0744277cbe2f111076a932efa692d3e0e229230da3c0d782faa7442 SHA512 0e0bdf57b1467789b6fe221e484e2cce5e37dae0fe3c190db51ec0f150a0ced1eca574bebceefe4ca33d31b4f09f472a0853fce24b1ef3f5de82256fa01f6090
 DIST gnome-builder-46.3.tar.xz 9102324 BLAKE2B 3c03eab7e60e4e8a4f10e165b5ae8bbc764fb102df3b594160def47720b94787f6b8d25479e0148c5369b7cf3256d5c8455cf54cf0f42c78424a5e1e17028682 SHA512 1d765f9a4da17d6c1cda688c0590d34b9fc8da8c2d427e4fde57e35b4b78b13905792da065d630d1b351d90ca25a276cc7a680c3b02fd9d5ba4c236a150325cc
+DIST gnome-builder-47.2.tar.xz 10652952 BLAKE2B 93356472ff321766dec00eb26f7f5e44e66f61661f5d5d67ace2290cf1e176925e05334769665ef381fd1469d8f04c297c01d97877357e349e4f5b5ee9f3f1c1 SHA512 fa26efcede1b44bf0a7e48dffb02fb80d11399386c2be65ac39207816191fe1c59900a1200c987a9077e64caf8a8ece60899b49019452caf66dc2076de75c5ea
diff --git a/dev-util/gnome-builder/files/44.2-fix-gtk-4.12.5-build.patch b/dev-util/gnome-builder/files/44.2-fix-gtk-4.12.5-build.patch
deleted file mode 100644
index eccf90851fb7..000000000000
--- a/dev-util/gnome-builder/files/44.2-fix-gtk-4.12.5-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 43a7c586b7291b5cf82febdaa80b4fe4efea8f54 Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@redhat.com>
-Date: Mon, 15 Jan 2024 11:54:38 -0800
-Subject: [PATCH] libide/tweaks: remove autoptr cleanup
-
-This is not needed now with recent GTK changes merged this morning.
----
- src/libide/tweaks/ide-tweaks-window.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/libide/tweaks/ide-tweaks-window.c b/src/libide/tweaks/ide-tweaks-window.c
-index f2553a396..dcb55bb35 100644
---- a/src/libide/tweaks/ide-tweaks-window.c
-+++ b/src/libide/tweaks/ide-tweaks-window.c
-@@ -32,8 +32,6 @@
- #include "ide-tweaks-panel-list-private.h"
- #include "ide-tweaks-window.h"
- 
--G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkStackPage, g_object_unref)
--
- struct _IdeTweaksWindow
- {
-   AdwWindow               parent_instance;
--- 
-2.43.0
-
diff --git a/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild b/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild
deleted file mode 100644
index 6471a24d65e3..000000000000
--- a/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-
-inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="An IDE for writing GNOME-based software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder"
-
-# FIXME: Review licenses at some point
-LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	flatpak? ( git )
-"
-
-# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
-# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
-# The listed RDEPEND order should roughly match that output as well, with toplevel one first then sorted by file path.
-# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
-# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
-# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
-
-# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
-# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
-
-# >=gtk-4.12.5 for relying on GtkStackPage autoptr cleanup added in that version
-
-# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
-RDEPEND="
-	>=dev-libs/glib-2.75.0:2
-	>=gui-libs/gtk-4.12.5:4[introspection]
-	>=gui-libs/libadwaita-1.3.0:1
-	>=gui-libs/libpanel-1.1.2:1
-	>=gui-libs/gtksourceview-5.7.2:5[introspection]
-	>=dev-libs/json-glib-1.2.0
-	>=dev-libs/jsonrpc-glib-3.43.0:=
-	>=dev-libs/libdex-0.1.1:=
-	>=dev-libs/libpeas-1.34.0:0[python,${PYTHON_SINGLE_USEDEP}]
-	dev-libs/libportal:=[gtk,introspection]
-	>=dev-libs/template-glib-3.36.1:=[introspection]
-	>=gui-libs/vte-0.70.0:2.91-gtk4[introspection]
-	>=dev-libs/libxml2-2.9.0
-	webkit? ( >=net-libs/webkit-gtk-2.38.0:6=[introspection] )
-	>=app-text/cmark-0.29.0:0=
-	d-spy? ( >=dev-debug/d-spy-1.4.0:1 )
-	app-text/editorconfig-core-c
-	flatpak? (
-		dev-util/ostree
-		>=net-libs/libsoup-3:3.0
-		>=sys-apps/flatpak-1.10.2
-	)
-	git? (
-		dev-libs/libgit2:=[ssh,threads]
-		>=dev-libs/libgit2-glib-1.1.0[ssh]
-	)
-
-	>=dev-libs/gobject-introspection-1.54.0:=
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}
-	clang? ( llvm-core/clang:= )
-	spell? (
-		app-text/enchant:2
-		dev-libs/icu:=
-	)
-	sysprof? (
-		>=dev-util/sysprof-capture-3.46.0:4
-		>=dev-util/sysprof-3.46.0:0/4
-	)
-"
-DEPEND="${RDEPEND}"
-# TODO: runtime ctags path finding..
-
-# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
-# appstream-glib needed for validation with appstream-util with FEATURES=test
-BDEPEND="
-	doc? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-		')
-	)
-	gtk-doc? (
-		dev-util/gi-docgen
-		app-text/docbook-xml-dtd:4.3
-	)
-	test? (
-		dev-libs/appstream-glib
-		sys-apps/dbus
-	)
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
-extra capabilities beyond these expressed via USE flags. Some of these
-that are currently available with packages include:
-
-* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
-  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
-  highlighting and symbol resolving support.
-* dev-python/python-lsp-server for more accurate Python
-  autocompletion support.
-* dev-debug/valgrind for integration with valgrind.
-* dev-build/meson for integration with the Meson build system.
-* dev-lang/rust{,-bin} for integration with the Rust Cargo build system.
-* dev-build/cmake for integration with the CMake build system.
-* net-libs/nodejs[npm] for integration with the NPM package system.
-'
-# FIXME: Package codespell and mention here
-# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
-# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
-# jhbuild support
-# rust support via rust-analyzer; Go via go-langserver
-# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
-# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
-# stylelint for stylesheet (CSS and co) linting
-# gvls for vala language-server integration
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-fix-gtk-4.12.5-build.patch
-)
-
-llvm_check_deps() {
-	has_version "llvm-core/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Fails with clang due to `environ` variable name shadowing unistd.h one
-	sed -i -e '/-Werror=shadow/d' meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dchannel=other
-
-		-Ddevelopment=false
-		-Dtracing=false
-		-Dprofiling=false # not passing -pg to CFLAGS
-		-Dtcmalloc=false
-		-Dwith_safe_path=''
-		-Dgnome_sdk_version=master
-		$(meson_use doc help)
-		$(meson_use gtk-doc docs)
-		-Dnetwork_tests=false
-		-Dctags_path=''
-		$(meson_feature webkit)
-
-		-Dplugin_autotools=true
-		-Dplugin_bash_language_server=true
-		-Dplugin_blueprint=true
-		-Dplugin_buildstream=true
-		-Dplugin_c_pack=true
-		-Dplugin_cargo=true
-		$(meson_use clang plugin_clang)
-		$(meson_use clang plugin_clangd)
-		$(meson_use clang plugin_clang_format)
-		-Dplugin_cmake=true
-		-Dplugin_codesearch=true
-		-Dplugin_codeshot=true
-		-Dplugin_codespell=true
-		-Dplugin_code_index=true
-		-Dplugin_copyright=true
-		-Dplugin_ctags=true
-		-Dplugin_deviced=false # libdeviced not packaged?
-		$(meson_use d-spy plugin_dspy)
-		-Dplugin_dub=true
-		-Dplugin_editorconfig=true
-		-Dplugin_eslint=true
-		-Dplugin_file_search=true
-		$(meson_use flatpak plugin_flatpak)
-		-Dplugin_gdb=true
-		-Dplugin_gdiagnose=true
-		-Dplugin_gettext=true
-		$(meson_use git plugin_git)
-		-Dplugin_glsl_language_server=true
-		-Dplugin_golang=true
-		-Dplugin_gopls=true
-		-Dplugin_gradle=true
-		-Dplugin_grep=true
-		-Dplugin_hadolint=true
-		-Dplugin_html_completion=true
-		$(meson_use webkit plugin_html_preview)
-		-Dplugin_intelephense=true
-		-Dplugin_jdtls=true
-		-Dplugin_jedi_language_server=false
-		-Dplugin_jhbuild=true
-		-Dplugin_lua_language_server=true
-		-Dplugin_make=true
-		-Dplugin_make_templates=true
-		$(meson_use webkit plugin_markdown_preview)
-		$(meson_use webkit plugin_markdown_indenter)
-		-Dplugin_maven=true
-		-Dplugin_meson=true
-		-Dplugin_meson_templates=true
-		-Dplugin_modelines=true
-		-Dplugin_mono=true
-		-Dplugin_newcomers=true
-		-Dplugin_notification=true
-		-Dplugin_npm=true
-		-Dplugin_phpize=true
-		-Dplugin_podman=true
-		-Dplugin_pygi=true
-		-Dplugin_python_lsp_server=true
-		-Dplugin_qemu=true
-		-Dplugin_quick_highlight=true
-		-Dplugin_retab=true
-		-Dplugin_rstcheck=true
-		-Dplugin_rubocop=true
-		-Dplugin_rust_analyzer=false # rust-analyzer not packaged
-		-Dplugin_serve_d=true
-		-Dplugin_shellcheck=true
-		-Dplugin_shellcmd=true
-		-Dplugin_sourcekit_lsp=true
-		$(meson_use spell plugin_spellcheck)
-		$(meson_use webkit plugin_sphinx_preview)
-		-Dplugin_stylelint=true
-		-Dplugin_swift=true
-		-Dplugin_swiftformat=true
-		-Dplugin_swiftlint=true
-		$(meson_use sysprof plugin_sysprof)
-		-Dplugin_todo=true
-		-Dplugin_ts_language_server=true
-		-Dplugin_update_manager=true
-		-Dplugin_valac=true
-		-Dplugin_vala_indenter=true
-		-Dplugin_vala_language_server=true
-		-Dplugin_valgrind=true
-		-Dplugin_waf=true
-		-Dplugin_words=true
-		-Dplugin_xml_pack=true
-		-Dplugin_zls=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_optimize
-	if use doc; then
-		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
-		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
-		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
-		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
-		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
-		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-
-	optfeature_header "Language support"
-	optfeature "Rust's Cargo build system" dev-lang/rust dev-lang/rust-bin
-	optfeature "CMake" dev-build/cmake
-	optfeature "Java Maven build system" dev-java/maven-bin
-	optfeature "Meson Build system" dev-build/meson
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-
-src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/dev-util/gnome-builder/gnome-builder-47.2.ebuild b/dev-util/gnome-builder/gnome-builder-47.2.ebuild
new file mode 100644
index 000000000000..339ac0b1696b
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-47.2.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://apps.gnome.org/Builder/ https://gitlab.gnome.org/GNOME/gnome-builder"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	flatpak? ( git )
+"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order should roughly match that output as well, with toplevel one first then sorted by file path.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+RDEPEND="
+	>=dev-libs/glib-2.75:2
+	>=gui-libs/gtk-4.15.5:4[introspection]
+	>=gui-libs/libadwaita-1.6_alpha:1
+	>=gui-libs/libpanel-1.7.0:1
+	>=gui-libs/gtksourceview-5.8:5[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.43.0:=
+	>=dev-libs/libdex-0.7:=
+	>=dev-libs/libpeas-1.99.0:2[python,${PYTHON_SINGLE_USEDEP}]
+	dev-libs/libportal:=[gtk,introspection]
+	>=dev-libs/template-glib-3.36.1:=[introspection]
+	>=gui-libs/vte-0.75.0:2.91-gtk4[introspection]
+	>=dev-libs/libxml2-2.9.0
+	webkit? ( >=net-libs/webkit-gtk-2.38.0:6=[introspection] )
+	>=app-text/cmark-0.29.0:0=
+	app-text/editorconfig-core-c
+	flatpak? (
+		dev-util/ostree
+		>=net-libs/libsoup-3:3.0
+		>=sys-apps/flatpak-1.10.2
+	)
+	git? (
+		dev-libs/libgit2:=[ssh,threads]
+		>=dev-libs/libgit2-glib-1.1.0[ssh]
+	)
+
+	>=dev-libs/gobject-introspection-1.74.0:=
+	${PYTHON_DEPS}
+	clang? ( llvm-core/clang:= )
+	spell? (
+		>=app-text/libspelling-0.3
+	)
+	sysprof? (
+		>=dev-util/sysprof-45.0[gtk]
+	)
+"
+DEPEND="${RDEPEND}"
+# TODO: runtime ctags path finding..
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+BDEPEND="
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+		')
+	)
+	gtk-doc? (
+		dev-util/gi-docgen
+		app-text/docbook-xml-dtd:4.3
+	)
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus
+	)
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/python-lsp-server for more accurate Python
+  autocompletion support.
+* dev-debug/valgrind for integration with valgrind.
+* dev-build/meson for integration with the Meson build system.
+* dev-lang/rust{,-bin} for integration with the Rust Cargo build system.
+* dev-build/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package codespell and mention here
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust support via rust-analyzer; Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+# stylelint for stylesheet (CSS and co) linting
+# gvls for vala language-server integration
+
+llvm_check_deps() {
+	has_version "llvm-core/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dchannel=other
+
+		-Ddevelopment=false
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dtcmalloc=false
+		-Dwith_safe_path=''
+		-Dgnome_sdk_version=master
+		$(meson_use doc help)
+		$(meson_use gtk-doc docs)
+		-Dnetwork_tests=false
+		-Dctags_path=''
+		$(meson_feature webkit)
+
+		-Dplugin_autotools=true
+		-Dplugin_bash_language_server=true
+		-Dplugin_blueprint=true
+		-Dplugin_buildstream=true
+		-Dplugin_c_pack=true
+		-Dplugin_cargo=true
+		$(meson_use clang plugin_clang)
+		$(meson_use clang plugin_clangd)
+		$(meson_use clang plugin_clang_format)
+		-Dplugin_cmake=true
+		-Dplugin_codesearch=true
+		-Dplugin_codeshot=true
+		-Dplugin_codespell=true
+		-Dplugin_code_index=true
+		-Dplugin_copyright=true
+		-Dplugin_ctags=true
+		-Dplugin_deviced=false # libdeviced not packaged?
+		$(meson_use d-spy plugin_dspy)
+		-Dplugin_dub=true
+		-Dplugin_editorconfig=true
+		-Dplugin_elixir_ls=true
+		-Dplugin_eslint=true
+		-Dplugin_file_search=true
+		$(meson_use flatpak plugin_flatpak)
+		-Dplugin_flake8=true
+		-Dplugin_gdb=true
+		-Dplugin_gdiagnose=true
+		-Dplugin_gettext=true
+		$(meson_use git plugin_git)
+		-Dplugin_glsl_language_server=true
+		-Dplugin_golang=true
+		-Dplugin_gopls=true
+		-Dplugin_gradle=true
+		-Dplugin_grep=true
+		-Dplugin_hadolint=true
+		-Dplugin_html_completion=true
+		$(meson_use webkit plugin_html_preview)
+		-Dplugin_intelephense=true
+		-Dplugin_jdtls=true
+		-Dplugin_jedi_language_server=false
+		-Dplugin_jhbuild=true
+		-Dplugin_lua_language_server=true
+		-Dplugin_make=true
+		-Dplugin_make_templates=true
+		-Dplugin_manuals=false
+		$(meson_use webkit plugin_markdown_preview)
+		$(meson_use webkit plugin_markdown_indenter)
+		-Dplugin_maven=true
+		-Dplugin_meson=true
+		-Dplugin_mesonlsp=true
+		-Dplugin_meson_templates=true
+		-Dplugin_modelines=true
+		-Dplugin_mono=true
+		-Dplugin_newcomers=true
+		-Dplugin_notification=true
+		-Dplugin_npm=true
+		-Dplugin_phpize=true
+		-Dplugin_podman=true
+		-Dplugin_pygi=true
+		-Dplugin_python_lsp_server=true
+		-Dplugin_qemu=true
+		-Dplugin_quick_highlight=true
+		-Dplugin_retab=true
+		-Dplugin_rstcheck=true
+		-Dplugin_rubocop=true
+		-Dplugin_rust_analyzer=false # rust-analyzer not packaged
+		-Dplugin_serve_d=true
+		-Dplugin_shellcheck=true
+		-Dplugin_shellcmd=true
+		-Dplugin_sourcekit_lsp=true
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use webkit plugin_sphinx_preview)
+		-Dplugin_stylelint=true
+		-Dplugin_swift=true
+		-Dplugin_swiftformat=true
+		-Dplugin_swiftlint=true
+		$(meson_use sysprof plugin_sysprof)
+		-Dplugin_todo=true
+		-Dplugin_ts_language_server=true
+		-Dplugin_update_manager=true
+		-Dplugin_valac=true
+		-Dplugin_vala_indenter=true
+		-Dplugin_vala_language_server=true
+		-Dplugin_valgrind=true
+		-Dplugin_waf=true
+		-Dplugin_words=true
+		-Dplugin_xml_pack=true
+		-Dplugin_zls=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+
+	optfeature_header "Language support"
+	optfeature "Rust's Cargo build system" dev-lang/rust dev-lang/rust-bin
+	optfeature "CMake" dev-build/cmake
+	optfeature "Java Maven build system" dev-java/maven-bin
+	optfeature "Meson Build system" dev-build/meson
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index a2c2e5e9f33e..0bd282af0262 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1 +1,2 @@
 DIST gtk-doc-1.33.2.tar.xz 507852 BLAKE2B dea3030060ecec89433fe3783dfacc2f58373780c49560a48ab1a32bedfe888692183de8396c92414255e4c8f537358cbc373fd307638ab8e7dbfd9ae44de58f SHA512 f50f68ab6b4bc59f55e84b49c1481f05700171cbf79eca9ba8f3a142a30a4ba88fe096983ebb8d117a9ef8bcea40934674096683d956f5c54cae457d31f651ab
+DIST gtk-doc-1.34.0.tar.xz 494116 BLAKE2B cb8550debed9f32b967de9d4ebdde8dbe83551eb8527221d2d788355431f34e62a4beedda3e7f5722516ae8e23794a56b97a4f761ede0f7f2c0ef288624b5f7a SHA512 d962fe31949b5f7c70122c7ebbd98f4d21725697804bf5dd75fd7a6662753a91c9350fd1e8bed22a58a957b173f35e200fcbb4c7c2ebc45ccbc0db2e916b27ea
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.34.0-mkhtml-test.patch b/dev-util/gtk-doc/files/gtk-doc-1.34.0-mkhtml-test.patch
new file mode 100644
index 000000000000..982b5bd11f7a
--- /dev/null
+++ b/dev-util/gtk-doc/files/gtk-doc-1.34.0-mkhtml-test.patch
@@ -0,0 +1,33 @@
+From 951743698610eaaa0cc9030f7d7d02437419ac24 Mon Sep 17 00:00:00 2001
+From: Neil Hanlon <neil@shrug.pw>
+Date: Fri, 9 Feb 2024 15:32:38 -0500
+Subject: [PATCH] Add gobject example source code to path for mkhtml test
+
+Fixes #150
+
+I'm not really sure why this is required, but I suspect it has to do
+with changes in how GCC handles path traversal due to recent (ish)
+security issues, as the code here is evaluated to
+`../xml/../../examples/gobject.c` which probably looks unhealthy to
+automatically include.
+
+Signed-off-by: Neil Hanlon <neil@shrug.pw>
+---
+ tests/gobject/docs/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/gobject/docs/meson.build b/tests/gobject/docs/meson.build
+index a1dd66c..236a1cc 100644
+--- a/tests/gobject/docs/meson.build
++++ b/tests/gobject/docs/meson.build
+@@ -119,6 +119,7 @@ test(
+     '--path=@0@'.format(':'.join([
+       gobject_test_docs_dir,
+       srcdir,
++      join_paths(srcdir, 'tests/gobject/examples'),
+       ])
+     ),
+   ],
+-- 
+GitLab
+
diff --git a/dev-util/gtk-doc/gtk-doc-1.34.0.ebuild b/dev-util/gtk-doc/gtk-doc-1.34.0.ebuild
new file mode 100644
index 000000000000..49e15e21f1e3
--- /dev/null
+++ b/dev-util/gtk-doc/gtk-doc-1.34.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit elisp-common gnome.org meson python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="GTK+ Documentation Generator"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gtk-doc"
+
+LICENSE="GPL-2+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+
+IUSE="emacs test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.38:2
+	dev-libs/libxslt
+	>=dev-libs/libxml2-2.3.6:2
+	~app-text/docbook-xml-dtd-4.3
+	app-text/docbook-xsl-stylesheets
+	~app-text/docbook-sgml-dtd-3.0
+	>=app-text/docbook-dsssl-stylesheets-1.40
+	emacs? ( >=app-editors/emacs-23.1:* )
+	$(python_gen_cond_dep '
+		dev-python/pygments[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/parameterized[${PYTHON_USEDEP}]
+		')
+	)
+"
+BDEPEND="
+	~dev-build/gtk-doc-am-${PV}
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Remove global Emacs keybindings, bug #184588
+	"${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch
+
+	# https://gitlab.gnome.org/GNOME/gtk-doc/-/issues/150
+	"${FILESDIR}"/${PN}-1.34.0-mkhtml-test.patch
+)
+
+pkg_setup() {
+	DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs.
+		You may set your own key bindings for \"gtk-doc-insert\" and
+		\"gtk-doc-insert-section\" in your ~/.emacs file."
+	SITEFILE=61${PN}-gentoo.el
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Requires the unpackaged Python "anytree" module
+	sed -i -e '/mkhtml2/d' "${S}"/tests/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dautotools_support=true
+		-Dcmake_support=true
+		-Dyelp_manual=true
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+	use emacs && elisp-compile tools/gtk-doc.el
+}
+
+src_install() {
+	meson_src_install
+
+	# The meson build system configures the shebangs to the temporary python
+	# used during the build. We need to fix it.
+	sed -i -e 's:^#!.*python3:#!/usr/bin/env python3:' "${ED}"/usr/bin/* || die
+	python_fix_shebang "${ED}"/usr/bin
+
+	# Don't install this file, it's in gtk-doc-am now
+	rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
+	rmdir "${ED}"/usr/share/aclocal || die
+
+	if use emacs; then
+		elisp-install ${PN} tools/gtk-doc.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		readme.gentoo_create_doc
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		readme.gentoo_print_elog
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/heaptrack/Manifest b/dev-util/heaptrack/Manifest
index 08cdd294b831..953a3fdd2edc 100644
--- a/dev-util/heaptrack/Manifest
+++ b/dev-util/heaptrack/Manifest
@@ -1 +1 @@
-DIST heaptrack-1.5.0.tar.xz 5447668 BLAKE2B f4a69311267daf9439e264bf8bb9802db41abb3fa766e5dfc8fcfe39c58feab2d0fe32710c6b5a2d63715e8b013e4a81e2984de425be871e253b1b2567a1dca2 SHA512 b52cc63a29d67dade85f40a7f9abb43e104762b9c853385f501d37fcbcef90fdcdfc93e2900c71b5a47c773bf98fe75f66f8b6a9e31a12610b6deec20d9736aa
+DIST heaptrack-1.5.80_pre20250110-5d8bfe44.tar.gz 9485092 BLAKE2B 86c04c9892a845c382b8c28248c6230517fff3ed536f773e8cd24b73c1655e08d571bb351b606aca4f0147141256f2496f119d5406a04f8da89f58de29c969db SHA512 019882341d4e046b5a1f7f8873227f455995ce1c837efa1f934c17578b41e13fa8dd4c6a20edaaea4e2e9659b43e9631c1cb3d4ccd87108f5c4342889374dff1
diff --git a/dev-util/heaptrack/files/heaptrack-1.5.0-c99.patch b/dev-util/heaptrack/files/heaptrack-1.5.0-c99.patch
deleted file mode 100644
index 4d88af050d5c..000000000000
--- a/dev-util/heaptrack/files/heaptrack-1.5.0-c99.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://invent.kde.org/sdk/heaptrack/-/merge_requests/24
-
-From ce0e0d218e76b1b724f4e10b9da2d8f33e4156b6 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Fri, 15 Dec 2023 22:53:19 +0100
-Subject: [PATCH] cmake: Fix C compatibility of libunwind probes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Future compilers such as GCC 14 are likely to enforce C type
-compatibility rules by default and report errors like this one:
-
-…/TryCompile-aAxUZn/src.c: In function ‘main’:
-…/TryCompile-aAxUZn/src.c:3:43: error: passing argument 1 of ‘unw_backtrace’ from incompatible pointer type
-    3 | int main() { void* buf[10]; unw_backtrace(&buf, 10); return 0; }
-      |                                           ^~~~
-      |                                           |
-      |                                           void * (*)[10]
-In file included from /usr/include/libunwind-x86_64.h:129,
-                 from /usr/include/libunwind.h:23,
-                 from …/TryCompile-aAxUZn/src.c:2:
-/usr/include/libunwind-common.h:318:27: note: expected ‘void **’ but argument is of type ‘void * (*)[10]’
-  318 | extern int unw_backtrace (void **, int);
-      |                           ^~~~~~~
-
-Removing the address operator ensures that the array type decays to
-a pointer, and that the types are compatible.
---- a/cmake/FindLibunwind.cmake
-+++ b/cmake/FindLibunwind.cmake
-@@ -57,8 +57,8 @@ if (LIBUNWIND_LIBRARY)
-                           LIBUNWIND_HAS_UNW_GETCONTEXT)
-   check_c_source_compiles("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { unw_context_t context; unw_cursor_t cursor; unw_getcontext(&context); unw_init_local(&cursor, &context); return 0; }"
-                           LIBUNWIND_HAS_UNW_INIT_LOCAL)
--  check_c_source_compiles("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { void* buf[10]; unw_backtrace(&buf, 10); return 0; }" LIBUNWIND_HAS_UNW_BACKTRACE)
--  check_c_source_compiles ("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { void* buf[10]; unw_backtrace_skip(&buf, 10, 2); return 0; }" LIBUNWIND_HAS_UNW_BACKTRACE_SKIP)
-+  check_c_source_compiles("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { void* buf[10]; unw_backtrace(buf, 10); return 0; }" LIBUNWIND_HAS_UNW_BACKTRACE)
-+  check_c_source_compiles ("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { void* buf[10]; unw_backtrace_skip(buf, 10, 2); return 0; }" LIBUNWIND_HAS_UNW_BACKTRACE_SKIP)
-   check_c_source_compiles ("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { return unw_set_cache_size(unw_local_addr_space, 1024, 0); }" LIBUNWIND_HAS_UNW_SET_CACHE_SIZE)
-   check_c_source_compiles ("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { return unw_set_caching_policy(unw_local_addr_space, UNW_CACHE_PER_THREAD); }" LIBUNWIND_HAS_UNW_CACHE_PER_THREAD)
-   set(CMAKE_REQUIRED_QUIET ${CMAKE_REQUIRED_QUIET_SAVE})
--- 
-GitLab
diff --git a/dev-util/heaptrack/heaptrack-1.5.0.ebuild b/dev-util/heaptrack/heaptrack-1.5.0.ebuild
deleted file mode 100644
index eb794b0466ad..000000000000
--- a/dev-util/heaptrack/heaptrack-1.5.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake kde.org xdg-utils
-
-DESCRIPTION="Fast heap memory profiler"
-HOMEPAGE="https://apps.kde.org/heaptrack/
-https://milianw.de/blog/heaptrack-a-heap-memory-profiler-for-linux"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gui test zstd"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/boost:=[zstd?,zlib]
-	sys-libs/libunwind:=
-	sys-libs/zlib
-	gui? (
-		dev-libs/kdiagram:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kconfigwidgets:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kitemmodels:5
-		kde-frameworks/kwidgetsaddons:5
-		kde-frameworks/threadweaver:5
-	)
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}
-	gui? ( >=kde-frameworks/kf-env-4 )
-"
-BDEPEND="gui? ( kde-frameworks/extra-cmake-modules:0 )"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# This doesn't exist in libunwind (bug #898768).
-	unw_backtrace_skip
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-c99.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	rm -rf 3rdparty/boost-zstd || die # ensure no bundling
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHEAPTRACK_BUILD_GUI=$(usex gui)
-		-DBUILD_TESTING=$(usex test)
-		$(cmake_use_find_package zstd ZSTD)
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}
diff --git a/dev-util/heaptrack/heaptrack-1.5.80_pre20250110.ebuild b/dev-util/heaptrack/heaptrack-1.5.80_pre20250110.ebuild
new file mode 100644
index 000000000000..f4c9330b0834
--- /dev/null
+++ b/dev-util/heaptrack/heaptrack-1.5.80_pre20250110.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=5d8bfe4441be81ff3ced10114bb012d24ec0ab86
+inherit cmake kde.org xdg-utils
+
+DESCRIPTION="Fast heap memory profiler"
+HOMEPAGE="https://apps.kde.org/heaptrack/
+https://milianw.de/blog/heaptrack-a-heap-memory-profiler-for-linux"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+gui test zstd"
+
+RESTRICT="!test? ( test )"
+
+# TODO: unbundle robin-map
+DEPEND="
+	dev-libs/boost:=[zstd?,zlib]
+	sys-libs/libunwind:=
+	sys-libs/zlib
+	gui? (
+		dev-libs/kdiagram:6
+		dev-qt/qtbase:6[gui,widgets]
+		kde-frameworks/kconfig:6
+		kde-frameworks/kconfigwidgets:6
+		kde-frameworks/kcoreaddons:6
+		kde-frameworks/ki18n:6
+		kde-frameworks/kio:6
+		kde-frameworks/kitemmodels:6
+		kde-frameworks/kwidgetsaddons:6
+		kde-frameworks/threadweaver:6
+	)
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}
+	gui? ( >=kde-frameworks/kf-env-4 )
+"
+BDEPEND="gui? ( kde-frameworks/extra-cmake-modules:0 )"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# This doesn't exist in libunwind (bug #898768).
+	unw_backtrace_skip
+)
+
+src_prepare() {
+	cmake_src_prepare
+	rm -rf 3rdparty/boost-zstd || die # ensure no bundling
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHEAPTRACK_USE_QT6=ON
+		-DHEAPTRACK_BUILD_GUI=$(usex gui)
+		-DBUILD_TESTING=$(usex test)
+		$(cmake_use_find_package zstd ZSTD)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
index c6ff0634e3b6..414978813b6f 100644
--- a/dev-util/hip/Manifest
+++ b/dev-util/hip/Manifest
@@ -2,10 +2,10 @@ DIST hip-5.1.3-update-header.patch.gz 3406 BLAKE2B 805539c3396a9cdcc4b807afd96ea
 DIST hip-5.7.1.tar.gz 553774 BLAKE2B f88c235f688d3a662ec6cb4ad7fe3f82c0015015997871609cc30ab5b2f7fcb9709a08683d77194e45a6dbbe1d24c6355b128d2ecf655f1dea3468711c64e0a3 SHA512 68fa8753725b53c999d102d254c6b1dba53af4e00d6a48db93d10213cc02eec30b4a39c66e773d4f625dd9636cf8b0c5faa05b69fac27cf5a6b19dd3ddd2b905
 DIST hip-6.1.1.tar.gz 247192 BLAKE2B c40bb483fb61b3037693f456e546046598df7e0dd81a1f1c8d222ab0d9c0752092ce85c8533bd355f883dda5ce1f32f7ff2b2a58cebac50d53e0e7f4d85ca3ae SHA512 3e6162938294a74af51bc2161ada38dc4ba19614e182238f320f2052a9025be6ea413e40f00cb80f4e86696793d6c4431e2417ea798a2330886a3f3e66aedf0d
 DIST hip-6.1.2.tar.gz 247193 BLAKE2B e343bdf233752e40cdefa0c2bbd56858bbb471155045ae1adcf651ddff2ed40dc7c7069998a35e9b26324fdf1c972e13e1222406bc52ae2591c23a45611864c5 SHA512 771f6494c7ff0ddb7d22193dfdbb3fb9461f6e4be347ecb879bb84c5a01a95fb4c4d3f7a0f039265d5369f6c6a5b66949af7bc91ed220f5e81a5b15ec98a68eb
-DIST hip-6.2.4.tar.gz 1482993 BLAKE2B 5ba367305505109631941d89f0b0566fddd73d9f7722216b9a42f9f863490fbbe3f817075ea3739005fc2b0c6c757dbe043823d9d1ec62416a5319992dd1b447 SHA512 1415770bec17cb93aee51683efe17b2bafb625300dd5dbf8e0dbb609a98ef875810dc40f4a3923c8a28f3cecd118d4c58bce61d1334197bca33dfa01336f62fd
+DIST hip-6.3.0.tar.gz 1486630 BLAKE2B 97759fa9cbedf9c87dba85b7e3caf030a6f72429aaf63651bfb9fd208a6f6b03e564f5dd973b94dfc07c6b6aea8296c1f9de6a049565a010c14319dc29f2db7a SHA512 86f7c1c18d3ebd14b4e0f6a5b662017145634dd672142ed9d60b4c2310f356b0d7480748b273f3652a4e2fdeaa6a4185a69cd6d45a462c73028a6741c11f092d
 DIST hip-test-6.1.1.tar.gz 1080605 BLAKE2B 7eddf648be31365479baa0cd4fd1c060a682a6b44d923cac1c4840c0768782db2fef4e5d97318ef0423be1e5c85b1a0cc6b9d324db789dad28be17f64ab38cae SHA512 0dd679c5b94a59e192bea5789f4448b53ac23c8a03b24a347758b1d70ff692483fd4aaea0b19345eb6ffb82a4492ed21958398b53ae6244a244a660dfa33412f
 DIST hip-test-6.1.2.tar.gz 1080493 BLAKE2B ff501ab92c1d3207e330f5e9630e3300aa52f7c2acfae2173a964a2843952db90eea2b4ecf5db1ec6ba65d7764750b9eae3f2a9641d1a3fc71d5172e3a7264a8 SHA512 09fa4243c8b73ddbe163ff4c60f0f8f4182f1a37071e9747bf95ecdc219ba3a0407bdf1e2391481f537b223565a38f16e918667194666558a469d94f88a1e236
-DIST hip-test-6.2.4.tar.gz 1403884 BLAKE2B edd19e1cd44eeea6c8df9eb3a8af96f12d5296149b7167a0754c79ca494881f76a0ed04ea7c0ff686cb54384c10ee457d367b645624c836024556da3453a6097 SHA512 8b28f07dcece8cb25d6ec2aed63b02feca91c5f48cecd5ae545b058317b6ed59a6300689a398cfb3310ac4e1eb52a83f03f5a671fe0c1a0bca57c49399dc782d
+DIST hip-test-6.3.0.tar.gz 1446413 BLAKE2B c24c352eb16fc54099329edd94a88f59270c92d87b12f86ca4728ae0afdefe6b774bb59927d7c9ec74bd291ef3754a676ad446574abc01170dd7bdc3e5fcb084 SHA512 b10a437a1eb7a8caa80234b9f9d21fbd1442e9f5c0d0bcb237c10743f40a40aef2675128c97f9592af256bad08c93fcc3288e4a289a7efcc626302aba77f149f
 DIST rocclr-5.1.3.tar.gz 618606 BLAKE2B 02b7732ddd03c0883bee49c56466cd21c649159f801bfb2537eea6e640c65613eb57b37d942f465a9deb83d65735f51212dde5e4f77ba8239d1a6b7037e1800c SHA512 89fd2eca39ed84a1cf525b2c606089ef39f64c1f997c4880e10722da6de4864110752640e1508db1aeb9d15c48ba4e6fe5dbe7a9e56718853ece42548028b2ca
 DIST rocclr-5.3.3.tar.gz 625944 BLAKE2B 0cdbc1415a355e1d56628834846aaa8587c9827eeea59f4312b788e868265dcb42197181fd5ef411416da2e11662c7f665f578aa750ab88c3a5405bcc58ee449 SHA512 3f85532cffc09c2ca8e7cd1770263d1c1a38633ed2bc5cfe62072e12a6f8f669db400519950718be31f6b77693d372e2ef905f06c7f02e126aa9ff7d2da97924
 DIST rocclr-5.4.3.tar.gz 640557 BLAKE2B 9ab91bab7ffb06c9c0d1c2ae79533fccc597071dda289ac375e32eb2965c638a7029951d2a49d46eeead9d7d242fe3a0cedb3e444d877af1bbf0e2d801c91e11 SHA512 c1d1a2ca08c2d762a221c04d394469aa7aff46086151333b145e0db9a7c7eb3dbbf8b9693e50d816aa9a13c16b4ebacf5ff3d5d8ff3393a8a764728ef5172d3a
@@ -14,7 +14,7 @@ DIST rocm-5.7.0.tar.gz 845881 BLAKE2B 08255edc1407e5ef85895336b11496319695318fce
 DIST rocm-clr-5.7.1.tar.gz 2008647 BLAKE2B 3db0760d6f83504e60caf88a2dd5e0bc02c7db9d6f263ad0eb2cfc79aa0f88a3699c412844a0158a796d9d02e79660287e791edad787d814eefffea4fd2298b4 SHA512 d79323481d82fc02c12a32cdcc0d14437d512af023e7737db0387b7eecb27fe6e4ae7c71d6adce57932a04bb24c880440d9dc10aeb5af11a4f2ca64d44330965
 DIST rocm-clr-6.1.1.tar.gz 2031034 BLAKE2B b0485bb015d31986f4988d1db0c029c826856e50b5bb1b58fac2097c14b3966668f1b8d41ec198889e27ac860497a8b3c081ec31d52390d5c9ff5db092bf7cce SHA512 86925e8b9a9e77b06a57daefbc7279887b4ef7c6a79c3717bc2f2d3bf29926281c60063fd17e21c65d7def520d9f579bf88f69051d053a38750ba968f69ca3fc
 DIST rocm-clr-6.1.2.tar.gz 2031283 BLAKE2B d51d32a77794ea97f1a3817786c9fd6b482106b665eea6e2c9b4c11e4dce19a3486386eb5ba111554c2d82c30e2a93add7502eed5768caf3fb709fb5fbb2e71b SHA512 e97224451864efe0084c4117f54893c9624a6a9f365a0b4abad08fd9635f008dea742dc589429fbb714e1b8177d06362c0f5a741f6c4a050d0fd4d48da72d54b
-DIST rocm-clr-6.2.4.tar.gz 2078004 BLAKE2B 28fdd2a81a5b831e157d781d6d869c02a288d9b8dc47a8a1d0a9f3b7ed99393c06f9b2bbc8d7dc2b2173a1b8c57fa1328b0fd6a7f24e759ace77e8c1ae777442 SHA512 74a198595929003248a3684fb5d83c20a8769eef237fcc07371f4385380f347917d6beaca15527334d06ea19bc446a03fca7251e5b2782f05547a36ccd1dfa49
+DIST rocm-clr-6.3.0.tar.gz 2093572 BLAKE2B 14f75f9f5dc4000a2abf28e523659def8cd96112c9c8b95abb634c33433077faa3ddab3fbe659e0ed2e1f309f63a93b7eb03fa6f246b4cea06ca8c512c13308a SHA512 f005baaf2a8f63946811db990e2d373906b31a4085a51427d407c9e4c1d877a14aeb713190a285953cadb960b5517570941c60e2f998adb2b1f9833f1d2f5925
 DIST rocm-hip-5.1.3.tar.gz 967696 BLAKE2B 15cb52b5934b84acf515fe9c83b7c8982e00a23e20af933bdd2c4bc5b56fd42b08c8a08e840c85d2e0a8386d5a0e9c110504f68499989de1aaad00e9a5efcf43 SHA512 6b6fd6c12d73788df1711b12326b97fc7a184f319e0db114947b7967b75f2ee131f81e42e43a4981456b507221a6013133731120409f90214e13304299ccbc24
 DIST rocm-hip-5.3.3.tar.gz 1151858 BLAKE2B 5f460b2078c850b3eb4414fcec4a6f951a3b282aa9828f77ba5d5adfdc0ee8d2e62c856e112a154c340daaf7dad49f4871412edd7b38f7fae2e6b17840ee144b SHA512 e747cc10e78cd09009cac762f0e060be13f3447af7ec2a4a2889cbdc09cd76ecb1b5b58c89f09a3b45a8296c2c71e1c55baf113e58a5a12434af3de7168b8d87
 DIST rocm-hip-5.4.3.tar.gz 1195173 BLAKE2B 7452ee7a874bc4703b0d3aaaf9fa2a51e223d5650c65c34982a9981dbe14e8ec70c93d7e70c5ad36a8d02c3d2214fa6a393e20502a01418fb3320d8cfe363feb SHA512 1f4100e114576dcbad83aae453e21ab85cf25bd8a6ada380bb11cfc30e5f92ba903055b7257a099321a84b65adb444dd52b8258e82567f4bc882e65d89369b43
diff --git a/dev-util/hip/files/hip-6.2.4-libcxx.patch b/dev-util/hip/files/hip-6.2.4-libcxx.patch
new file mode 100644
index 000000000000..9f11bae1cd20
--- /dev/null
+++ b/dev-util/hip/files/hip-6.2.4-libcxx.patch
@@ -0,0 +1,25 @@
+Fix for: class template specialization of '__numeric_type' not in a namespace enclosing '__hip'
+
+Backports https://github.com/ROCm/clr/pull/109
+--- a/hipamd/include/hip/amd_detail/amd_math_functions.h
++++ b/hipamd/include/hip/amd_detail/amd_math_functions.h
+@@ -41,19 +41,6 @@ THE SOFTWARE.
+ #include <stdint.h>
+ #endif // !defined(__HIPCC_RTC__)
+ 
+-#if _LIBCPP_VERSION && __HIP__
+-namespace std {
+-template <>
+-struct __numeric_type<_Float16>
+-{
+-   static _Float16 __test(_Float16);
+-
+-   typedef _Float16 type;
+-   static const bool value = true;
+-};
+-}
+-#endif // _LIBCPP_VERSION
+-
+ #pragma push_macro("__DEVICE__")
+ #pragma push_macro("__RETURN_TYPE")
+ 
diff --git a/dev-util/hip/files/hip-6.3.0-clr-fix-libcxx.patch b/dev-util/hip/files/hip-6.3.0-clr-fix-libcxx.patch
new file mode 100644
index 000000000000..3052e254daba
--- /dev/null
+++ b/dev-util/hip/files/hip-6.3.0-clr-fix-libcxx.patch
@@ -0,0 +1,30 @@
+Fix compilation with libc++ (ROCM/clr part)
+--- a/hipamd/include/hip/amd_detail/amd_hip_runtime.h
++++ b/hipamd/include/hip/amd_detail/amd_hip_runtime.h
+@@ -386,15 +386,26 @@ hc_get_workitem_absolute_id(int dim)
+ #pragma push_macro("__CUDA__")
+ #define __CUDA__
+ #include <__clang_cuda_math_forward_declares.h>
++// __clang_cuda_complex_builtins wants ::max
++#include <__clang_hip_math.h>
+ #include <__clang_cuda_complex_builtins.h>
+ // Workaround for using libc++ with HIP-Clang.
+ // The following headers requires clang include path before standard C++ include path.
+ // However libc++ include path requires to be before clang include path.
+ // To workaround this, we pass -isystem with the parent directory of clang include
+ // path instead of the clang include path itself.
++
++// libc++: <include/cuda_wrappers/complex> transitively includes <queue>, which uses __local
++#define ORIGINAL__LOCAL __local
++#undef __local
++
+ #include <include/cuda_wrappers/algorithm>
+ #include <include/cuda_wrappers/complex>
+ #include <include/cuda_wrappers/new>
++
++#define __local ORIGINAL__LOCAL
++#undef ORIGINAL__LOCAL
++
+ #undef __CUDA__
+ #pragma pop_macro("__CUDA__")
+ #endif // !_OPENMP || __HIP_ENABLE_CUDA_WRAPPER_FOR_OPENMP__
diff --git a/dev-util/hip/files/hip-6.3.0-hip-fix-libcxx.patch b/dev-util/hip/files/hip-6.3.0-hip-fix-libcxx.patch
new file mode 100644
index 000000000000..01409cb5a6d1
--- /dev/null
+++ b/dev-util/hip/files/hip-6.3.0-hip-fix-libcxx.patch
@@ -0,0 +1,27 @@
+Fix compilation with libc++ (ROCm/HIP part)
+--- a/include/hip/hip_runtime.h
++++ b/include/hip/hip_runtime.h
+@@ -49,10 +49,6 @@ THE SOFTWARE.
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <assert.h>
+-
+-#if __cplusplus > 199711L
+-#include <thread>
+-#endif
+ #endif // !defined(__HIPCC_RTC__)
+ 
+ #include <hip/hip_version.h>
+@@ -67,6 +63,12 @@ THE SOFTWARE.
+ #endif
+ 
+ #if !defined(__HIPCC_RTC__)
++// libc++ transitively includes thread->string_view->cuda_wrappers/algorithm,
++// which uses __host__, which is included via hip runtime above
++#if __cplusplus > 199711L
++#include <thread>
++#endif
++
+ #include <hip/hip_runtime_api.h>
+ #include <hip/library_types.h>
+ #endif // !defined(__HIPCC_RTC__)
diff --git a/dev-util/hip/files/hip-6.3.0-install.patch b/dev-util/hip/files/hip-6.3.0-install.patch
new file mode 100644
index 000000000000..40b88f4fcc51
--- /dev/null
+++ b/dev-util/hip/files/hip-6.3.0-install.patch
@@ -0,0 +1,12 @@
+hipcc files are already installed by dev-util/hipcc, which is a runtime dep
+--- a/hipamd/CMakeLists.txt
++++ b/hipamd/CMakeLists.txt
+@@ -393,7 +393,7 @@ endif()
+ install(FILES ${PROJECT_BINARY_DIR}/include/hip/hip_version.h
+         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hip)
+ 
+-if (NOT ${HIPCC_BIN_DIR} STREQUAL "")
++if (INSTALL_HIPCC AND NOT ${HIPCC_BIN_DIR} STREQUAL "")
+   file(TO_CMAKE_PATH "${HIPCC_BIN_DIR}" HIPCC_BIN_DIR)
+   if(EXISTS ${HIPCC_BIN_DIR})
+     install(PROGRAMS ${HIPCC_BIN_DIR}/${HIPCC_EXECUTABLE} DESTINATION bin)
diff --git a/dev-util/hip/files/hip-6.3.0-no-isystem-usr-include.patch b/dev-util/hip/files/hip-6.3.0-no-isystem-usr-include.patch
new file mode 100644
index 000000000000..973de0826c4f
--- /dev/null
+++ b/dev-util/hip/files/hip-6.3.0-no-isystem-usr-include.patch
@@ -0,0 +1,17 @@
+Prevent HIP targets from adding -isystem /usr/include, which breaks <cmath>
+--- a/hipamd/hip-config-amd.cmake.in
++++ b/hipamd/hip-config-amd.cmake.in
+@@ -135,13 +135,11 @@ set_target_properties(hip::host PROPERTIES
+ 
+ set_target_properties(hip::amdhip64 PROPERTIES
+   INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+-  INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+ )
+ 
+ if(NOT WIN32)
+   set_target_properties(hip::device PROPERTIES
+     INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+-    INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+   )
+ endif()
+ 
diff --git a/dev-util/hip/files/hip-test-6.3.0-hipcc-system-install.patch b/dev-util/hip/files/hip-test-6.3.0-hipcc-system-install.patch
new file mode 100644
index 000000000000..291da5a9ba69
--- /dev/null
+++ b/dev-util/hip/files/hip-test-6.3.0-hipcc-system-install.patch
@@ -0,0 +1,12 @@
+In Gentoo rocm_agent_enumerator is installed by rocminfo and is in PATH.
+--- a/hipTestMain/hip_test_context.cc
++++ b/hipTestMain/hip_test_context.cc
+@@ -37,7 +37,7 @@ std::string TestContext::substringFound(
+ 
+ std::string TestContext::getCurrentArch() {
+ #if HT_LINUX
+-  const char* cmd = "/opt/rocm/bin/rocm_agent_enumerator | sort -u | xargs | sed -e 's/ /;/g'";
++  const char* cmd = "rocm_agent_enumerator | sort -u | xargs | sed -e 's/ /;/g'";
+   std::array<char, 1024> buffer;
+   std::string result;
+   std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd, "r"), pclose);
diff --git a/dev-util/hip/hip-6.1.2.ebuild b/dev-util/hip/hip-6.1.2.ebuild
index 119be35a396a..f2a1872917fb 100644
--- a/dev-util/hip/hip-6.1.2.ebuild
+++ b/dev-util/hip/hip-6.1.2.ebuild
@@ -39,7 +39,7 @@ REQUIRED_USE="
 
 DEPEND="
 	video_cards_amdgpu? (
-		>=dev-util/rocminfo-5
+		dev-util/rocminfo:${SLOT}
 		$(llvm_gen_dep '
 			llvm-core/clang:${LLVM_SLOT}
 		')
@@ -67,8 +67,8 @@ RDEPEND="${DEPEND}
 	)
 	video_cards_amdgpu? (
 		dev-util/hipcc:${SLOT}[${LLVM_USEDEP}]
-		>=dev-libs/rocm-device-libs-${PV}
-		>=dev-libs/roct-thunk-interface-5
+		dev-libs/rocm-device-libs:${SLOT}
+		dev-libs/roct-thunk-interface:${SLOT}
 	)
 "
 
diff --git a/dev-util/hip/hip-6.2.4.ebuild b/dev-util/hip/hip-6.2.4.ebuild
deleted file mode 100644
index 9671c5fb225b..000000000000
--- a/dev-util/hip/hip-6.2.4.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="media-gfx/graphviz"
-ROCM_SKIP_GLOBALS=1
-
-LLVM_COMPAT=( 18 )
-
-inherit cmake docs flag-o-matic llvm-r1 rocm
-
-TEST_PV=${PV}
-
-DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
-HOMEPAGE="https://github.com/ROCm/clr"
-SRC_URI="
-	https://github.com/ROCm/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz
-	https://github.com/ROCm/HIP/archive/refs/tags/rocm-${PV}.tar.gz -> hip-${PV}.tar.gz
-	test? (
-		https://github.com/ROCm/hip-tests/archive/refs/tags/rocm-${TEST_PV}.tar.gz -> hip-test-${TEST_PV}.tar.gz
-	)
-"
-S="${WORKDIR}/clr-rocm-${PV}/"
-TEST_S="${WORKDIR}/hip-tests-rocm-${TEST_PV}/catch"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE="debug +hip opencl test video_cards_amdgpu video_cards_nvidia"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	|| ( hip opencl )
-	^^ ( video_cards_amdgpu video_cards_nvidia )
-"
-
-DEPEND="
-	video_cards_amdgpu? (
-		>=dev-util/rocminfo-5
-		$(llvm_gen_dep '
-			llvm-core/clang:${LLVM_SLOT}
-		')
-		dev-libs/rocm-comgr:${SLOT}
-		dev-libs/rocr-runtime:${SLOT}
-	)
-	video_cards_nvidia? (
-		dev-libs/hipother:${SLOT}
-	)
-	x11-base/xorg-proto
-	virtual/opengl
-"
-BDEPEND="
-	video_cards_amdgpu? (
-		dev-util/hipcc:${SLOT}[${LLVM_USEDEP}]
-	)
-"
-RDEPEND="${DEPEND}
-	llvm-core/clang-runtime:=
-	opencl? (
-		!dev-libs/opencl-icd-loader
-		!dev-libs/rocm-opencl-runtime
-		!dev-util/clinfo
-		!dev-util/opencl-headers
-	)
-	video_cards_amdgpu? (
-		dev-util/hipcc:${SLOT}[${LLVM_USEDEP}]
-		>=dev-libs/rocm-device-libs-${PV}
-		>=dev-libs/roct-thunk-interface-5
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.7.1-no_asan_doc.patch"
-	"${FILESDIR}/${PN}-6.1.0-install.patch"
-	"${FILESDIR}/${PN}-6.1.1-fix-musl.patch"
-)
-
-hip_test_wrapper() {
-	local CMAKE_USE_DIR="${TEST_S}"
-	local BUILD_DIR="${TEST_S}_build"
-	cd "${TEST_S}" || die
-	"${@}"
-}
-
-src_prepare() {
-	# NOTE We do this head stand to safe the patch size.
-	# NOTE Adjust when we drop 5.7.1
-	sed \
-		-e 's:kAmdgcnTargetTriple:AMDGCN_TARGET_TRIPLE:g' \
-		-i hipamd/src/hip_code_object.cpp || die
-	eapply "${FILESDIR}/${PN}-5.7.1-extend-isa-compatibility-check.patch"
-	sed \
-		-e 's:AMDGCN_TARGET_TRIPLE:kAmdgcnTargetTriple:g' \
-		-i hipamd/src/hip_code_object.cpp || die
-
-	# hipamd is itself built by cmake, and should never provide a
-	# FindHIP.cmake module. But the reality is some package relies on it.
-	# Set HIP and HIP Clang paths directly, don't search using heuristics
-	sed -e "s:# Search for HIP installation:set(HIP_ROOT_DIR \"${EPREFIX}/usr\"):" \
-		-e "s:#Set HIP_CLANG_PATH:set(HIP_CLANG_PATH \"$(get_llvm_prefix -d)/bin\"):" \
-		-i "${WORKDIR}/HIP-rocm-${PV}/cmake/FindHIP.cmake" || die
-
-	cmake_src_prepare
-
-	# With Clang>17 -amdgpu-early-inline-all=true causes OOMs in dependencies
-	# https://github.com/llvm/llvm-project/issues/86332
-	if [ "$LLVM_SLOT" -le "17" ]; then
-		sed -e "s/-mllvm=-amdgpu-early-inline-all=true //" -i hipamd/hip-config-amd.cmake || die
-		sed -e "s/-mllvm=-amdgpu-early-inline-all=true;//" -i "${WORKDIR}/HIP-rocm-${PV}/hip-lang-config.cmake.in"
-	fi
-
-	if use test; then
-		local PATCHES=(
-			"${FILESDIR}"/hip-test-6.0.2-hipcc-system-install.patch
-			"${FILESDIR}"/hip-test-5.7.1-remove-incompatible-flag.patch
-			"${FILESDIR}"/hip-test-6.1.1-fix-musl.patch
-		)
-		hip_test_wrapper cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/858383
-	# https://github.com/ROCm/clr/issues/64
-	#
-	# Do not trust it for LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	use debug && CMAKE_BUILD_TYPE="Debug"
-
-	# Fix ld.lld linker error: https://github.com/ROCm/HIP/issues/3382
-	# See also: https://github.com/gentoo/gentoo/pull/29097
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	local mycmakeargs=(
-		-DCMAKE_PREFIX_PATH="$(get_llvm_prefix)"
-		-DCMAKE_SKIP_RPATH=ON
-		-D__HIP_ENABLE_PCH="no"
-
-		-DCLR_BUILD_HIP="$(usex hip)"
-		-DCLR_BUILD_OCL="$(usex opencl)"
-
-		-DHIP_COMMON_DIR="${WORKDIR}/HIP-rocm-${PV}"
-		-DHIPCC_BIN_DIR="${EPREFIX}/usr/bin"
-		-DROCM_PATH="${EPREFIX}/usr"
-		-DUSE_PROF_API="no"
-		-DFILE_REORG_BACKWARD_COMPATIBILITY="no"
-
-		-DOpenGL_GL_PREFERENCE="GLVND"
-		-DCMAKE_DISABLE_FIND_PACKAGE_Git="yes"
-	)
-
-	if use video_cards_amdgpu; then
-		mycmakeargs+=(
-			-DHIP_PLATFORM="amd"
-		)
-	elif use video_cards_nvidia; then
-		mycmakeargs+=(
-			-DHIPNV_DIR="${EPREFIX}/usr"
-			-DHIP_PLATFORM="nvidia"
-		)
-	fi
-
-	cmake_src_configure
-
-	if use test; then
-		local mycmakeargs=(
-			-DCMAKE_MODULE_PATH="${TEST_S}/external/Catch2/cmake/Catch2"
-		)
-		if use video_cards_amdgpu; then
-			mycmakeargs+=(
-				-DROCM_PATH="${BUILD_DIR}/hipamd"
-				-DHIP_PLATFORM="amd"
-			)
-		elif use video_cards_nvidia; then
-			mycmakeargs+=(
-				-DROCM_PATH="${BUILD_DIR}/hipother"
-				-DHIP_PLATFORM="nvidia"
-			)
-		fi
-		HIP_PATH="${EPREFIX}/usr" hip_test_wrapper cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use test; then
-		HIP_PATH="${BUILD_DIR}"/hipamd \
-			hip_test_wrapper cmake_src_compile build_tests
-	fi
-}
-
-src_test() {
-	check_amdgpu
-	export LD_LIBRARY_PATH="${BUILD_DIR}/hipamd/lib"
-
-	# TODO: research how to test Vulkan-related features.
-	local CMAKE_SKIP_TESTS=(
-		Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Positive_Read_Write
-		Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Negative_Parameters
-		Unit_hipImportExternalMemory_Vulkan_Negative_Parameters
-		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Positive_Binary_Semaphore
-		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Positive_Multiple_Semaphores
-		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Negative_Parameters
-		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Positive_Binary_Semaphore
-		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Positive_Multiple_Semaphores
-		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Negative_Parameters
-		Unit_hipImportExternalSemaphore_Vulkan_Negative_Parameters
-		Unit_hipDestroyExternalSemaphore_Vulkan_Negative_Parameters
-	)
-
-	MAKEOPTS="-j1" hip_test_wrapper cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# add version file that is required by some libraries
-	mkdir "${ED}"/usr/include/rocm-core || die
-	cat <<-EOF > "${ED}"/usr/include/rocm-core/rocm_version.h || die
-		#pragma once
-		#define ROCM_VERSION_MAJOR $(ver_cut 1)
-		#define ROCM_VERSION_MINOR $(ver_cut 2)
-		#define ROCM_VERSION_PATCH $(ver_cut 3)
-		#define ROCM_BUILD_INFO "$(ver_cut 1-3).0-9999-unknown"
-	EOF
-
-	dosym -r /usr/include/rocm-core/rocm_version.h /usr/include/rocm_version.h
-
-	if use video_cards_nvidia; then
-		newenvd - 99hipconfig <<-EOF
-			HIP_PLATFORM="nvidia"
-			HIP_RUNTIME="cuda"
-			CUDA_PATH="${EPREFIX}/opt/cuda"
-		EOF
-	fi
-}
diff --git a/dev-util/hip/hip-6.3.0.ebuild b/dev-util/hip/hip-6.3.0.ebuild
new file mode 100644
index 000000000000..44e28cebea57
--- /dev/null
+++ b/dev-util/hip/hip-6.3.0.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DEPEND="media-gfx/graphviz"
+ROCM_SKIP_GLOBALS=1
+
+LLVM_COMPAT=( 19 )
+
+inherit cmake docs flag-o-matic llvm-r1 rocm
+
+TEST_PV=${PV}
+
+DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
+HOMEPAGE="https://github.com/ROCm/clr"
+SRC_URI="
+	https://github.com/ROCm/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz
+	https://github.com/ROCm/HIP/archive/refs/tags/rocm-${PV}.tar.gz -> hip-${PV}.tar.gz
+	test? (
+		https://github.com/ROCm/hip-tests/archive/refs/tags/rocm-${TEST_PV}.tar.gz -> hip-test-${TEST_PV}.tar.gz
+	)
+"
+S="${WORKDIR}/clr-rocm-${PV}/"
+TEST_S="${WORKDIR}/hip-tests-rocm-${TEST_PV}/catch"
+HIP_S="${WORKDIR}/HIP-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="debug +hip opencl test video_cards_amdgpu video_cards_nvidia"
+
+# some tests are broken
+RESTRICT="test"
+
+REQUIRED_USE="
+	|| ( hip opencl )
+	^^ ( video_cards_amdgpu video_cards_nvidia )
+"
+
+DEPEND="
+	video_cards_amdgpu? (
+		dev-util/rocminfo:${SLOT}
+		dev-libs/rocm-comgr:${SLOT}
+		dev-libs/rocr-runtime:${SLOT}
+	)
+	video_cards_nvidia? (
+		dev-libs/hipother:${SLOT}
+	)
+	x11-base/xorg-proto
+	virtual/opengl
+"
+BDEPEND="
+	video_cards_amdgpu? (
+		dev-util/hipcc:${SLOT}[${LLVM_USEDEP}]
+	)
+	test? (
+		media-libs/freeglut
+	)
+"
+RDEPEND="${DEPEND}
+	opencl? (
+		!dev-libs/opencl-icd-loader
+		!dev-libs/rocm-opencl-runtime
+		!dev-util/clinfo
+		!dev-util/opencl-headers
+	)
+	video_cards_amdgpu? (
+		dev-util/hipcc:${SLOT}[${LLVM_USEDEP}]
+		dev-libs/rocm-device-libs:${SLOT}
+		dev-libs/roct-thunk-interface:${SLOT}
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7.1-no_asan_doc.patch"
+	"${FILESDIR}/${PN}-6.3.0-install.patch"
+	"${FILESDIR}/${PN}-6.1.1-fix-musl.patch"
+	"${FILESDIR}/${PN}-6.2.4-libcxx.patch"
+	"${FILESDIR}/${PN}-6.3.0-no-isystem-usr-include.patch"
+	"${FILESDIR}/${PN}-6.3.0-clr-fix-libcxx.patch"
+)
+
+hip_test_wrapper() {
+	local CMAKE_USE_DIR="${TEST_S}"
+	local BUILD_DIR="${TEST_S}_build"
+	cd "${TEST_S}" || die
+	"${@}"
+}
+
+src_prepare() {
+	# NOTE We do this head stand to safe the patch size.
+	# NOTE Adjust when we drop 5.7.1
+	sed \
+		-e 's:kAmdgcnTargetTriple:AMDGCN_TARGET_TRIPLE:g' \
+		-i hipamd/src/hip_code_object.cpp || die
+	eapply "${FILESDIR}/${PN}-5.7.1-extend-isa-compatibility-check.patch"
+	sed \
+		-e 's:AMDGCN_TARGET_TRIPLE:kAmdgcnTargetTriple:g' \
+		-i hipamd/src/hip_code_object.cpp || die
+
+	pushd "${HIP_S}" >/dev/null || die
+	eapply "${FILESDIR}/${PN}-6.3.0-hip-fix-libcxx.patch"
+
+	# hipamd is itself built by cmake, and should never provide a
+	# FindHIP.cmake module. But the reality is some package relies on it.
+	# Set HIP and HIP Clang paths directly, don't search using heuristics
+	sed -e "s:# Search for HIP installation:set(HIP_ROOT_DIR \"${EPREFIX}/usr\"):" \
+		-e "s:#Set HIP_CLANG_PATH:set(HIP_CLANG_PATH \"$(get_llvm_prefix -d)/bin\"):" \
+		-i "cmake/FindHIP.cmake" || die
+	popd >/dev/null || die
+
+	sed -e "s/ -Werror//g" -i "hipamd/src/CMakeLists.txt" || die
+
+	cmake_src_prepare
+
+	if use test; then
+		local PATCHES=(
+			"${FILESDIR}"/hip-test-6.3.0-hipcc-system-install.patch
+			"${FILESDIR}"/hip-test-5.7.1-remove-incompatible-flag.patch
+			"${FILESDIR}"/hip-test-6.1.1-fix-musl.patch
+		)
+		sed -e "s/-Werror //" -e "s/-Wall -Wextra //" -i "${TEST_S}/CMakeLists.txt" || die
+
+		hip_test_wrapper cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/858383
+	# https://github.com/ROCm/clr/issues/64
+	#
+	# Do not trust it for LTO either
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	use debug && CMAKE_BUILD_TYPE="Debug"
+
+	# Fix ld.lld linker error: https://github.com/ROCm/HIP/issues/3382
+	# See also: https://github.com/gentoo/gentoo/pull/29097
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	local mycmakeargs=(
+		-DCMAKE_PREFIX_PATH="$(get_llvm_prefix)"
+		-DCMAKE_SKIP_RPATH=ON
+		-D__HIP_ENABLE_PCH=OFF
+
+		-DCLR_BUILD_HIP="$(usex hip)"
+		-DCLR_BUILD_OCL="$(usex opencl)"
+
+		-DHIP_COMMON_DIR="${HIP_S}"
+		-DHIP_ENABLE_ROCPROFILER_REGISTER=OFF
+		-DHIPCC_BIN_DIR="${EPREFIX}/usr/bin"
+		-DROCM_PATH="${EPREFIX}/usr"
+		-DUSE_PROF_API=OFF
+		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
+
+		-DOpenGL_GL_PREFERENCE="GLVND"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+	)
+
+	if use video_cards_amdgpu; then
+		mycmakeargs+=(
+			-DHIP_PLATFORM="amd"
+		)
+	elif use video_cards_nvidia; then
+		mycmakeargs+=(
+			-DHIPNV_DIR="${EPREFIX}/usr"
+			-DHIP_PLATFORM="nvidia"
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local mycmakeargs=(
+			-DCMAKE_MODULE_PATH="${TEST_S}/external/Catch2/cmake/Catch2"
+			-DROCM_PATH="${EPREFIX}/usr"
+			-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON
+			-Wno-dev
+
+			# 1) Use custom build of hipamd instead of system one
+			# 2) Build fails with libc++: https://github.com/llvm/llvm-project/issues/119076
+			-DCMAKE_CXX_FLAGS="-I${BUILD_DIR}/hipamd/include -stdlib=libstdc++"
+			-DCMAKE_EXE_LINKER_FLAGS="-L${BUILD_DIR}/hipamd/lib"
+		)
+		if use video_cards_amdgpu; then
+			mycmakeargs+=(
+				-DHIP_PLATFORM="amd"
+			)
+		elif use video_cards_nvidia; then
+			mycmakeargs+=(
+				-DHIP_PLATFORM="nvidia"
+			)
+		fi
+		hip_test_wrapper cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use test; then
+		hip_test_wrapper cmake_src_compile build_tests
+	fi
+}
+
+src_test() {
+	check_amdgpu
+	export LD_LIBRARY_PATH="${BUILD_DIR}/hipamd/lib"
+
+	# TODO: research how to test Vulkan-related features.
+	local CMAKE_SKIP_TESTS=(
+		Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Positive_Read_Write
+		Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Negative_Parameters
+		Unit_hipImportExternalMemory_Vulkan_Negative_Parameters
+		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Positive_Binary_Semaphore
+		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Positive_Multiple_Semaphores
+		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Negative_Parameters
+		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Positive_Binary_Semaphore
+		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Positive_Multiple_Semaphores
+		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Negative_Parameters
+		Unit_hipImportExternalSemaphore_Vulkan_Negative_Parameters
+		Unit_hipDestroyExternalSemaphore_Vulkan_Negative_Parameters
+	)
+
+	MAKEOPTS="-j1" hip_test_wrapper cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# add version file that is required by some libraries
+	mkdir "${ED}"/usr/include/rocm-core || die
+	cat <<-EOF > "${ED}"/usr/include/rocm-core/rocm_version.h || die
+		#pragma once
+		#define ROCM_VERSION_MAJOR $(ver_cut 1)
+		#define ROCM_VERSION_MINOR $(ver_cut 2)
+		#define ROCM_VERSION_PATCH $(ver_cut 3)
+		#define ROCM_BUILD_INFO "$(ver_cut 1-3).0-9999-unknown"
+	EOF
+
+	dosym -r /usr/include/rocm-core/rocm_version.h /usr/include/rocm_version.h
+
+	if use video_cards_nvidia; then
+		newenvd - 99hipconfig <<-EOF
+			HIP_PLATFORM="nvidia"
+			HIP_RUNTIME="cuda"
+			CUDA_PATH="${EPREFIX}/opt/cuda"
+		EOF
+	fi
+}
diff --git a/dev-util/hipcc/Manifest b/dev-util/hipcc/Manifest
index 7fb7607d6de7..5ca0ea5e9189 100644
--- a/dev-util/hipcc/Manifest
+++ b/dev-util/hipcc/Manifest
@@ -1,4 +1,4 @@
 DIST hipcc-5.7.1.tar.gz 36589 BLAKE2B a8ae6bd9f0f985d78119223b67b5b35b8d1ee38edb7e43c1e77752d203fe2c8b669b3bcff0cec661054d8cb24f799e7784a49eb0664bdd1dc2bf024ce026c175 SHA512 2d232c8dd4a47de6e0cff9d37b4e63a26cb1809ef2ff3a119c15e992cae96ffc2f4d8c1ddffd8732dea3a3d589a93e177f424a6174f982908aa50904e265432a
 DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6ff8aaff44751f9b380addfae73a18dc388093c0535f230b0cc7528724bc43f6992e2ae6decd3d0d3c700893ca95a6166b7b8dc SHA512 e320d4eeaa6f61ed1cdbf653d67fe887d3ce9dc0d6743b4713502e1cb5318ab8afbe1ee71f8cba07635c54ce532df6683de40ade0e5be4a52e50ce25a9b70818
 DIST llvm-project-rocm-6.1.2.tar.gz 195992927 BLAKE2B d821f29f2f1f7c1ff414c63a710281f16d2a394b21f3365d01b86710cc09ed27e514b49fb744bf6a36b38815afa56cc26d44f0238f38479a0c2db9bf9989f389 SHA512 5f7e5dbe5976141de35e96e603624bd9d5a2c08b0690ba9fcd81d1b32f540f94bb9f4b74539e2838fd60ae1312dbe5e0b429ba80a03871782cdf3bd834940ce0
-DIST llvm-project-rocm-6.2.4.tar.gz 206742705 BLAKE2B e4d40c900b56a3d31003295c517fcb8fdc5cb0954f298d541d545c6d142746eecfa70a44bfdcb9044d70284f15af612c27dbd55d51e94e638e03bf21c1d3bc06 SHA512 5c5784c318c607168c9d2227ce1150e92fdc6aa457a9e64d62745a70f6fce92c4d4b1202422940f1ccc37a4bccf1efb220d8be39ec2ffdba7591d17e54ec8a5f
+DIST llvm-project-rocm-6.3.0.tar.gz 206677330 BLAKE2B f3e68a8c94599e3a938d3e761af163b9f010a06421680ee70aaaaf8073fb18da9151729c311fc4bd12b281b3afdd15e61cea31c970f0e4d36bb97838fa17ca5f SHA512 674fc3242c6dbb6962f1002dc34ccbd618da6adeb640bac15265d22fdcedf9de16ea3d79899891734ccc1099cb5b5ed9110b1162f4515c4cbc0d847810682b59
diff --git a/dev-util/hipcc/hipcc-6.2.4.ebuild b/dev-util/hipcc/hipcc-6.2.4.ebuild
deleted file mode 100644
index 29809b8ce6c2..000000000000
--- a/dev-util/hipcc/hipcc-6.2.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 18 )
-inherit cmake perl-functions llvm-r1
-
-DESCRIPTION="Radeon Open Compute hipcc"
-HOMEPAGE="https://github.com/ROCm/hipcc"
-
-MY_P=llvm-project-rocm-${PV}
-components=( "amd/hipcc" )
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ROCm/llvm-project"
-	inherit git-r3
-	S="${WORKDIR}/${P}/${components[0]}"
-else
-	SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}/${components[0]}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	$(llvm_gen_dep '
-		llvm-runtimes/compiler-rt:${LLVM_SLOT}=
-		llvm-core/llvm:${LLVM_SLOT}=
-		llvm-core/clang:${LLVM_SLOT}=
-	')
-"
-RDEPEND="${DEPEND}
-	!<dev-util/hip-5.7"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.7.1-hipcc-hip-version.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-r3_fetch
-		git-r3_checkout '' . '' "${components[@]}"
-	else
-		archive="${MY_P}.tar.gz"
-		ebegin "Unpacking from ${archive}"
-		tar -x -z -o \
-			-f "${DISTDIR}/${archive}" \
-			"${components[@]/#/${MY_P}/}" || die
-		eend ${?}
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "s:\$ROCM_PATH/llvm/bin:$(get_llvm_prefix)/bin:" \
-		-e "s:/opt/rocm:/usr:" \
-		-e "s:$ROCM_PATH/lib/llvm/bin:$ROCM_PATH/lib64/llvm/18/bin:" \
-		-i bin/hipvars.pm || die
-
-	sed -e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \
-		-e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \
-		-e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \
-		-i bin/hipcc.pl || die
-
-	# With Clang>17 -amdgpu-early-inline-all=true causes OOMs in dependencies
-	# https://github.com/llvm/llvm-project/issues/86332
-	if [ "$LLVM_SLOT" != "17" ]; then
-		sed -e "s/-mllvm -amdgpu-early-inline-all=true //g" -i bin/hipcc.pl || die
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	# rm unwanted copy
-	rm -rf "${ED}/usr/hip" || die
-	# Handle hipvars.pm
-	rm "${ED}/usr/bin/hipvars.pm" || die
-	perl_domodule "${S}"/bin/hipvars.pm
-}
diff --git a/dev-util/hipcc/hipcc-6.3.0.ebuild b/dev-util/hipcc/hipcc-6.3.0.ebuild
new file mode 100644
index 000000000000..38ef6f66380a
--- /dev/null
+++ b/dev-util/hipcc/hipcc-6.3.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 19 )
+inherit cmake perl-functions llvm-r1
+
+DESCRIPTION="Radeon Open Compute hipcc"
+HOMEPAGE="https://github.com/ROCm/llvm-project/tree/amd-staging/amd/hipcc"
+
+MY_P=llvm-project-rocm-${PV}
+components=( "amd/hipcc" )
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/llvm-project"
+	inherit git-r3
+	S="${WORKDIR}/${P}/${components[0]}"
+else
+	SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}/${components[0]}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	$(llvm_gen_dep '
+		llvm-runtimes/compiler-rt:${LLVM_SLOT}=
+		llvm-core/llvm:${LLVM_SLOT}=
+		llvm-core/clang:${LLVM_SLOT}=
+	')
+"
+RDEPEND="${DEPEND}
+	!<dev-util/hip-5.7
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7.1-hipcc-hip-version.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		git-r3_fetch
+		git-r3_checkout '' . '' "${components[@]}"
+	else
+		archive="${MY_P}.tar.gz"
+		ebegin "Unpacking from ${archive}"
+		tar -x -z -o \
+			-f "${DISTDIR}/${archive}" \
+			"${components[@]/#/${MY_P}/}" || die
+		eend ${?}
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s:lib/llvm/bin:lib/llvm/${LLVM_SLOT}/bin:" \
+		-e "s:/opt/rocm:/usr:g" \
+		-i bin/hipvars.pm \
+		-i src/hipBin_base.h \
+		-i src/hipBin_amd.h || die
+
+	sed -e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \
+		-e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \
+		-i bin/hipcc.pl || die
+
+	# With Clang>17 -amdgpu-early-inline-all=true causes OOMs in dependencies
+	# https://github.com/llvm/llvm-project/issues/86332
+	sed -e "s/-mllvm -amdgpu-early-inline-all=true //g" \
+		-i bin/hipcc.pl \
+		-i src/hipBin_amd.h || die
+}
+
+src_install() {
+	cmake_src_install
+	# rm unwanted copy
+	rm -rf "${ED}/usr/hip" || die
+	# Handle hipvars.pm
+	rm "${ED}/usr/bin/hipvars.pm" || die
+	perl_domodule "${S}"/bin/hipvars.pm
+}
diff --git a/dev-util/hipify-clang/Manifest b/dev-util/hipify-clang/Manifest
index 21ddfce17d12..6291d9b71cfe 100644
--- a/dev-util/hipify-clang/Manifest
+++ b/dev-util/hipify-clang/Manifest
@@ -1,2 +1,3 @@
 DIST HIPIFY-5.7.1.tar.gz 673452 BLAKE2B e0293c1b7f9ea028efc8d712ddedae4ec933c5bcfba524e13816bd999e67bcf06097f9fe0e4d1f4fa6a38df133be694e92adeefd92f77301d8537b6880b1a1fe SHA512 0cc75fdbcb6278d319cfe8ee3c8547dc75ea494a007d2159c64312c3411627905e0d6c7d7f0032cbc4c727a90723325aa2705db2fd473dbeb41e60f276d1c9a7
 DIST HIPIFY-6.1.1.tar.gz 813425 BLAKE2B accc661431f11796d0c8bcf638537a6035020b2a36ebe66c1b8c10bb63b762418d5fd1f256f3a3e51d2ace224a6492abfe72838bef859b1da68c2126cc3521be SHA512 29c45e312c8e2f0d06916b57f24eba27ba7beae3bd860850b57cfe27c87df22aabe9fdcf3d12671b81e68b61c3974aaf0064e96ae68392d181148aaeef14f1c7
+DIST HIPIFY-6.3.0.tar.gz 941586 BLAKE2B 032629962cd16a5f6d61153ae874706230745cec89709409601f0df12e75870d3a5269e2a669bae4e3b672484e9067cb418e77f7e5a69afc052523905460a696 SHA512 69e9e9d7cb3f63449aac66b55ece745c593dd6387e066a42c028764ac81ecba31fb5b3c9f98b46bb079b67181962aad323a735bdbb382c68c1b9e8e6169d3430
diff --git a/dev-util/hipify-clang/hipify-clang-6.3.0.ebuild b/dev-util/hipify-clang/hipify-clang-6.3.0.ebuild
new file mode 100644
index 000000000000..dae54a407cfb
--- /dev/null
+++ b/dev-util/hipify-clang/hipify-clang-6.3.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 19 )
+
+inherit cmake flag-o-matic llvm-r1
+
+DESCRIPTION="A set of tools to translate CUDA source code into portable HIP C++"
+HOMEPAGE="https://github.com/ROCm/HIPIFY"
+SRC_URI="https://github.com/ROCm/HIPIFY/archive/rocm-${PV}.tar.gz -> HIPIFY-${PV}.tar.gz"
+S="${WORKDIR}/HIPIFY-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+BDEPEND=">=dev-build/cmake-3.22"
+DEPEND="
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}=
+		llvm-core/llvm:${LLVM_SLOT}=
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7.1-fix-clang-libs.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i 's:/../libexec/hipify::' \
+		bin/hipconvertinplace.sh bin/hipconvertinplace-perl.sh \
+		bin/hipexamine-perl.sh bin/hipexamine.sh || die
+}
+
+src_configure() {
+	# 928906: CMakeLists.txt ignores CC/CXX, switches compiler to clang
+	# and fails if non-compatible CFLAGS/CXXFLAGS are used
+	strip-unsupported-flags
+
+	local mycmakeargs=(
+		-DCMAKE_PREFIX_PATH="$(get_llvm_prefix)/$(get_libdir)/cmake/llvm"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	fperms +x /usr/bin/hipconvertinplace-perl.sh
+	fperms +x /usr/bin/hipconvertinplace.sh
+	fperms +x /usr/bin/hipexamine-perl.sh
+	fperms +x /usr/bin/hipexamine.sh
+	fperms +x /usr/bin/hipify-perl
+}
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 2003bf691f0a..a3986993cbf4 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,2 +1,2 @@
-DIST idea-community-2024.3.1.1-aarch64.tar.gz 929400203 BLAKE2B 86a92f1ae4650a48c47745039bb7ba176c035e0a520598746ec26ea33dd3e0f1bf5c9cb4a8bd1964dd1abb90fa7f65641eb554e65d95197753ca9f9422c2d9be SHA512 43f1922a4d992a0079df5ec1cd90d1fa080ebcb9a2e95d32e1a2330089c6c501654edb3bd288f80039ded6f800e91b9c88a22e6f68154b584e3476466fb7c097
-DIST idea-community-2024.3.1.1-amd64.tar.gz 929518676 BLAKE2B 214ff1696785f85b48613ae1aba2ba4a70ec838e96693a4e12c5ec26012f233fe1501fc4717f847fb152dcab3330e3c8fa4321fa7c8e75b2ca63e28331e8356f SHA512 88103ce5f66dbdda68e5679f9119ba1350c86e95194039acabfb43b33b869540ebeee6e4fa7340a6f4546b21171258d746f4786d0e629715f7c0b37c81101b02
+DIST idea-community-2024.3.2-aarch64.tar.gz 988714849 BLAKE2B f702ec984020a88b84b0eddc2f44285cf99431935ee1e32c4b883930c31f415e67a8fb3db00761829b715cfb997080684808e0521a19f08e87cc612b28461202 SHA512 c6c21ffc71c760cc9ec64cb98c8f53c724b8beb8d3605275f362fd600eb84dc6efb862201e710e720f005aa3bfed14e14ad89e36828fff9d4cf8439213ef0dfc
+DIST idea-community-2024.3.2-amd64.tar.gz 988831095 BLAKE2B ff39e4f95f15adbc944d9d2a09de22904f6ef06edbf8ee148a771141b8ffed7809d352a8cd18c7f658765f45e91aa5f5463e0bffff1811bd46b2fa216002af02 SHA512 9f81ec6d00bb29408d666375842c4095da1d571cd0503b3175237428a734093b060870c41f69a0315edc0dd98ec5289ef1d2f61fcc0625412c7055a1101569e0
diff --git a/dev-util/idea-community/idea-community-2024.3.1.1.ebuild b/dev-util/idea-community/idea-community-2024.3.1.1.ebuild
deleted file mode 100644
index 860ca1e04792..000000000000
--- a/dev-util/idea-community/idea-community-2024.3.1.1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit desktop wrapper
-
-MY_PV=$(ver_cut 1-4)
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-SRC_URI="
-	amd64? ( https://download.jetbrains.com/idea/ideaIC-${MY_PV}.tar.gz -> ${P}-amd64.tar.gz )
-	arm64? ( https://download.jetbrains.com/idea/ideaIC-${MY_PV}-aarch64.tar.gz -> ${P}-aarch64.tar.gz )
-	"
-
-S="${WORKDIR}/idea-IC-${PV}"
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
-	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
-	GPL-2 GPL-2-with-classpath-exception ISC
-	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
-	MPL-1.0 MPL-1.1 OFL-1.1 ZLIB"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="experimental wayland"
-REQUIRED_USE="experimental? ( wayland )"
-
-DEPEND="
-	|| (
-		>=dev-java/openjdk-17.0.8.1_p1:17
-		>=dev-java/openjdk-bin-17.0.8.1_p1:17
-	)"
-
-RDEPEND="${DEPEND}
-	sys-libs/glibc
-	media-libs/harfbuzz
-	dev-java/jansi-native
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXrender
-	media-libs/freetype
-	x11-libs/libXext
-	dev-libs/wayland
-	x11-libs/libXi
-	x11-libs/libXtst
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXrandr
-	media-libs/alsa-lib
-	app-accessibility/at-spi2-core
-	x11-libs/cairo
-	net-print/cups
-	x11-libs/libdrm
-	media-libs/mesa
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/libdbusmenu
-	x11-libs/libxkbcommon
-	x11-libs/libXcursor
-	x11-libs/pango"
-
-QA_PREBUILT="opt/${PN}/*"
-
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-
-src_unpack() {
-
-	default_src_unpack
-	if [ ! -d "$S" ]; then
-		einfo "Renaming source directory to predictable name..."
-		mv $(ls "${WORKDIR}") "idea-IC-${PV}" || die
-	fi
-}
-
-src_prepare() {
-
-	default_src_prepare
-
-	if use amd64; then
-		JRE_DIR=jre64
-		rm -vf "${S}"/plugins/cwm-plugin/quiche-native/linux-aarch64/libquiche.so
-	else
-		JRE_DIR=jre
-		rm -vf "${S}"/plugins/cwm-plugin/quiche-native/linux-x86-64/libquiche.so
-	fi
-
-	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
-
-	# rm LLDBFrontEnd after licensing questions with Gentoo License Team
-	rm -vf "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend
-	rm -vf ${PLUGIN_DIR}/libavplugin*
-	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
-	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
-	rm -vf "${S}"/bin/libdbm64*
-	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
-
-	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
-		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
-		do
-			if [[ -f "$file" ]]; then
-			  patchelf --set-rpath '$ORIGIN' $file || die
-			fi
-		done
-	fi
-
-	rm -vf "${S}"/lib/pty4j-native/linux/x86-64/libpty.so
-
-	sed -i \
-		-e "\$a\\\\" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
-		-e "\$a# package manager. See bug #704494" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
-
-	patchelf --set-rpath '$ORIGIN' "jbr/lib/libjcef.so" || die
-	patchelf --set-rpath '$ORIGIN' "jbr/lib/libcef.so" || die
-	patchelf --set-rpath '$ORIGIN' "jbr/lib/jcef_helper" || die
-
-	if ! use elibc_musl; then
-		rm plugins/platform-ijent-impl/ijent-aarch64-unknown-linux-musl-release
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-	local dst="${D}${dir}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea,idea.sh,inspect.sh,restarter,fsnotifier}
-
-	if [[ -d jbr ]]; then
-		fperms 755 "${dir}"/jbr/bin/{java,javac,javadoc,jcmd,jdb,jfr,jhsdb,jinfo,jmap,jps,jrunscript,jstack,jstat,jwebserver,keytool,rmiregistry,serialver}
-
-		# Fix #763582
-		fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
-	fi
-
-	if use amd64; then
-		JRE_DIR=jre
-		JRE_DIR=jre
-	fi
-
-	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
-	if [[ -d ${JRE_DIR} ]]; then
-		for jrebin in $JRE_BINARIES; do
-			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
-		done
-	fi
-
-	# bundled script is always lowercase, and doesn't have -ultimate, -professional suffix.
-	local bundled_script_name="${PN%-*}.sh"
-	make_wrapper "${PN}" "${dir}/bin/$bundled_script_name" || die
-
-	local pngfile="$(find ${dst}/bin -maxdepth 1 -iname '*.png')"
-	newicon $pngfile "${PN}.png" || die "we died"
-
-	if use experimental; then
-		make_desktop_entry "/opt/idea-community/bin/idea -Dawt.toolkit.name=WLToolkit" \
-			"IntelliJ Idea Community Edition" "${PN}" "Development;IDE;"
-
-		ewarn "You have enabled the experimental USE flag."
-		ewarn "This is a Wayland support preview. Expect instability."
-	else
-		make_desktop_entry "/opt/idea-community/bin/idea" \
-			"IntelliJ Idea Community Edition" "${PN}" "Development;IDE;"
-	fi
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-
-	# remove bundled harfbuzz
-	rm -f "${D}"/lib/libharfbuzz.so || die "Unable to remove bundled harfbuzz"
-}
diff --git a/dev-util/idea-community/idea-community-2024.3.2.ebuild b/dev-util/idea-community/idea-community-2024.3.2.ebuild
new file mode 100644
index 000000000000..41f034fdb482
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2024.3.2.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop wrapper
+
+MY_PV=$(ver_cut 1-3)
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+SRC_URI="
+	amd64? ( https://download.jetbrains.com/idea/ideaIC-${MY_PV}.tar.gz -> ${P}-amd64.tar.gz )
+	arm64? ( https://download.jetbrains.com/idea/ideaIC-${MY_PV}-aarch64.tar.gz -> ${P}-aarch64.tar.gz )
+	"
+
+S="${WORKDIR}/idea-IC-${PV}"
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
+	GPL-2 GPL-2-with-classpath-exception ISC
+	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+	MPL-1.0 MPL-1.1 OFL-1.1 ZLIB"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="experimental wayland"
+REQUIRED_USE="experimental? ( wayland )"
+
+DEPEND="
+	|| (
+		>=dev-java/openjdk-17.0.8.1_p1:17
+		>=dev-java/openjdk-bin-17.0.8.1_p1:17
+	)"
+
+RDEPEND="${DEPEND}
+	sys-libs/glibc
+	media-libs/harfbuzz
+	dev-java/jansi-native
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXrender
+	media-libs/freetype
+	x11-libs/libXext
+	dev-libs/wayland
+	x11-libs/libXi
+	x11-libs/libXtst
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXrandr
+	media-libs/alsa-lib
+	app-accessibility/at-spi2-core
+	x11-libs/cairo
+	net-print/cups
+	x11-libs/libdrm
+	media-libs/mesa
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/libdbusmenu
+	x11-libs/libxkbcommon
+	x11-libs/libXcursor
+	x11-libs/pango"
+
+QA_PREBUILT="opt/${PN}/*"
+
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+
+src_unpack() {
+
+	default_src_unpack
+	if [ ! -d "$S" ]; then
+		einfo "Renaming source directory to predictable name..."
+		mv $(ls "${WORKDIR}") "idea-IC-${PV}" || die
+	fi
+}
+
+src_prepare() {
+
+	default_src_prepare
+
+	if use amd64; then
+		JRE_DIR=jre64
+		rm -vf "${S}"/plugins/cwm-plugin/quiche-native/linux-aarch64/libquiche.so
+	else
+		JRE_DIR=jre
+		rm -vf "${S}"/plugins/cwm-plugin/quiche-native/linux-x86-64/libquiche.so
+	fi
+
+	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+
+	# rm LLDBFrontEnd after licensing questions with Gentoo License Team
+	rm -vf "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend
+	rm -vf ${PLUGIN_DIR}/libavplugin*
+	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+	rm -vf "${S}"/bin/libdbm64*
+	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
+
+	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+		do
+			if [[ -f "$file" ]]; then
+			  patchelf --set-rpath '$ORIGIN' $file || die
+			fi
+		done
+	fi
+
+	rm -vf "${S}"/lib/pty4j-native/linux/x86-64/libpty.so
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
+
+	patchelf --set-rpath '$ORIGIN' "jbr/lib/libjcef.so" || die
+	patchelf --set-rpath '$ORIGIN' "jbr/lib/libcef.so" || die
+	patchelf --set-rpath '$ORIGIN' "jbr/lib/jcef_helper" || die
+
+	if ! use elibc_musl; then
+		rm plugins/platform-ijent-impl/ijent-aarch64-unknown-linux-musl-release
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+	local dst="${D}${dir}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,idea,idea.sh,inspect.sh,restarter,fsnotifier}
+
+	if [[ -d jbr ]]; then
+		fperms 755 "${dir}"/jbr/bin/{java,javac,javadoc,jcmd,jdb,jfr,jhsdb,jinfo,jmap,jps,jrunscript,jstack,jstat,jwebserver,keytool,rmiregistry,serialver}
+
+		# Fix #763582
+		fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+	fi
+
+	if use amd64; then
+		JRE_DIR=jre
+		JRE_DIR=jre
+	fi
+
+	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	if [[ -d ${JRE_DIR} ]]; then
+		for jrebin in $JRE_BINARIES; do
+			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+		done
+	fi
+
+	# bundled script is always lowercase, and doesn't have -ultimate, -professional suffix.
+	local bundled_script_name="${PN%-*}.sh"
+	make_wrapper "${PN}" "${dir}/bin/$bundled_script_name" || die
+
+	local pngfile="$(find ${dst}/bin -maxdepth 1 -iname '*.png')"
+	newicon $pngfile "${PN}.png" || die "we died"
+
+	if use experimental; then
+		make_desktop_entry "/opt/idea-community/bin/idea -Dawt.toolkit.name=WLToolkit" \
+			"IntelliJ Idea Community Edition" "${PN}" "Development;IDE;"
+
+		ewarn "You have enabled the experimental USE flag."
+		ewarn "This is a Wayland support preview. Expect instability."
+	else
+		make_desktop_entry "/opt/idea-community/bin/idea" \
+			"IntelliJ Idea Community Edition" "${PN}" "Development;IDE;"
+	fi
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+
+	# remove bundled harfbuzz
+	rm -f "${D}"/lib/libharfbuzz.so || die "Unable to remove bundled harfbuzz"
+}
diff --git a/dev-util/imediff/Manifest b/dev-util/imediff/Manifest
new file mode 100644
index 000000000000..d06d3c4740f7
--- /dev/null
+++ b/dev-util/imediff/Manifest
@@ -0,0 +1,2 @@
+DIST imediff-3.3.1.tar.gz 98813 BLAKE2B af578358bd8670b15378879487cb7ee2096d0984251d39d4bb3cdd025794035a8a7e3f633afe80bf5805681614269abf6e03dae248b91470450d93e06256c885 SHA512 598cd499b757bd5f0255c5db909ffccce5ece3979af25a7919b9ad187744e89f321d6a97634dba3fa29fe7f0712212e3d16b7dabf9abf3d84893a7d30feec71b
+DIST imediff2_1.1.2.1.orig.tar.gz 20393 BLAKE2B 560eef8600bac8ad302907563bd8520ef7881009c8a35c74427d0d5d9e8d4303446f1eb39c01fec201c798f286023765776a84b1e1aaa9e2d585a45870375f16 SHA512 ad0e22f5f2f16efb976a0d6d16c34798cc8aace4251a99cb7764df6841f93c2a6bb9dc8cbb59d8f3ae5a5ad7c161a05b9c3c7b36cc7bdf98eac3ef3b735ef6c4
diff --git a/dev-util/imediff2/files/1.1.2.1-python-3.patch b/dev-util/imediff/files/1.1.2.1-python-3.patch
index aa26ad7f9dbb..aa26ad7f9dbb 100644
--- a/dev-util/imediff2/files/1.1.2.1-python-3.patch
+++ b/dev-util/imediff/files/1.1.2.1-python-3.patch
diff --git a/dev-util/imediff/imediff-1.1.2.1.ebuild b/dev-util/imediff/imediff-1.1.2.1.ebuild
new file mode 100644
index 000000000000..6afd7b40665a
--- /dev/null
+++ b/dev-util/imediff/imediff-1.1.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="ncurses"
+
+inherit python-single-r1
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}_${PV}"
+
+DESCRIPTION="2-way/3-way merge tool (CLI, Ncurses)"
+HOMEPAGE="https://github.com/osamuaoki/imediff"
+SRC_URI="mirror://debian/pool/main/i/${MY_PN}/${MY_P}.orig.tar.gz"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=( "${FILESDIR}/${PV}-python-3.patch" )
+
+src_compile() {
+	# Otherwise the docs get regenerated :)
+	:
+}
+
+src_install() {
+	python_doscript imediff2
+	dobin git-ime
+	dodoc AUTHORS README.md
+	doman imediff2.1 git-ime.1
+}
diff --git a/dev-util/imediff/imediff-3.3.1.ebuild b/dev-util/imediff/imediff-3.3.1.ebuild
new file mode 100644
index 000000000000..e4c8e702aa50
--- /dev/null
+++ b/dev-util/imediff/imediff-3.3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="2-way/3-way merge tool (CLI, Ncurses)"
+HOMEPAGE="https://github.com/osamuaoki/imediff"
+SRC_URI="https://github.com/osamuaoki/${PN}/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-upstream-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+distutils_enable_tests unittest
+
+src_install() {
+	distutils-r1_src_install
+	rm "${ED}"/usr/bin/imediff_install || die
+	python_doscript "${ED}"/usr/bin/imediff
+	newbin usr/bin/git-ime.in git-ime
+	doman usr/share/man/man1/imediff.1 usr/share/man/man1/git-ime.1
+}
diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff/metadata.xml
index c27b2d8278c5..c27b2d8278c5 100644
--- a/dev-util/imediff2/metadata.xml
+++ b/dev-util/imediff/metadata.xml
diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest
deleted file mode 100644
index 90751ecabb58..000000000000
--- a/dev-util/imediff2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST imediff2_1.1.2.1.orig.tar.gz 20393 BLAKE2B 560eef8600bac8ad302907563bd8520ef7881009c8a35c74427d0d5d9e8d4303446f1eb39c01fec201c798f286023765776a84b1e1aaa9e2d585a45870375f16 SHA512 ad0e22f5f2f16efb976a0d6d16c34798cc8aace4251a99cb7764df6841f93c2a6bb9dc8cbb59d8f3ae5a5ad7c161a05b9c3c7b36cc7bdf98eac3ef3b735ef6c4
diff --git a/dev-util/imediff2/imediff2-1.1.2.1.ebuild b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
deleted file mode 100644
index e2e1bb5b5818..000000000000
--- a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses"
-
-inherit python-single-r1
-
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
-HOMEPAGE="https://github.com/osamuaoki/imediff"
-SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-#S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PV}-python-3.patch" )
-
-src_compile() {
-	# Otherwise the docs get regenerated :)
-	:
-}
-
-src_install() {
-	python_doscript imediff2
-	dobin git-ime
-	dodoc AUTHORS README.md
-	doman imediff2.1 git-ime.1
-}
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index f4d34aef0257..83619959904e 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1 +1,3 @@
 DIST intel-graphics-compiler-1.0.17657.8.tar.gz 10690533 BLAKE2B e1b3dc3fbd1515abb030c1da791cdc91d83648cfd1a9f8dce8ed087cefdd30a4413b6b534bb67902424c8ee67e84c7d85283cf548fb6ecd413e13639f883d0c3 SHA512 3dd0a6e5aa80ea0cad3608a6940cb563fcfce72e33b2284634903319ec984d6659f6a8ea51d31dfd35b1f3ebf6b89e78c5524d3f10735f52c09f52d13ea42e7a
+DIST intel-graphics-compiler-1.0.17791.18.tar.gz 10746999 BLAKE2B d85c7888e4be962fc90ba6e2686aeba14d7ebe32c7dececdfddb0ba3726df82e43167dfc1bd0a2c4a0f72a6de481a270a4dcb6b4d5a40d785dac6c4628a27e2d SHA512 c814f667c558eebfbe1af68614c4eff7259b2d3626e317eb936e185b33b4aba7b225f33276ab09e9582164e5573b6cc52c230ab82e4689db41b3b2f4368367ec
+DIST intel-graphics-compiler-2.5.7.tar.gz 11055255 BLAKE2B 5aba91cb083b8a94cd7182f25a6a4b24832816a07aad2f0583717213a5b752c32140e47fea9a0f48523227157239e519ccf2f708e3b3398fd8f15448dc202cc5 SHA512 520e4d1b9db993a90a8933f64c00da8fa785f7f7064d9f8d48aa9791a92d75e9a5d1d49509db6d81bd5a7645cdcb542dc261f5c653001fdc05033753b06dcba6
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17791.18.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17791.18.ebuild
new file mode 100644
index 000000000000..a0e4b5f88d76
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17791.18.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_COMPAT=( 15 )
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake flag-o-matic llvm-r1 python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0/1.0.1"
+KEYWORDS="~amd64"
+IUSE="debug vc"
+
+DEPEND="
+	dev-libs/opencl-clang:15[${LLVM_USEDEP}]
+	dev-util/spirv-tools
+	$(llvm_gen_dep '
+		llvm-core/lld:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+	')
+	vc? (
+		>=dev-libs/intel-vc-intrinsics-0.21.0[${LLVM_USEDEP}]
+		dev-util/spirv-llvm-translator:15=
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	$(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	python_has_version "dev-python/mako[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+)
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Don't hardcode FORTIFY_SOURCE
+	sed -e '/-D_FORTIFY_SOURCE=2/d' -i IGC/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Get LLVM version
+	local llvm_version="$(best_version -d llvm-core/llvm:${LLVM_SLOT})"
+	local llvm_version="${llvm_version%%-r*}"
+
+	# See https://github.com/intel/intel-graphics-compiler/issues/212
+	append-ldflags -Wl,-z,undefs
+
+	# See bug #893370 and https://github.com/intel/intel-graphics-compiler/issues/282
+	append-flags -U_GLIBCXX_ASSERTIONS
+
+	# See https://bugs.gentoo.org/718824
+	! use debug && append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS="OFF"
+		-DCCLANG_FROM_SYSTEM="ON"
+		-DCCLANG_SONAME_VERSION="${LLVM_SLOT}"
+		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix)/$(get_libdir)"
+		-DIGC_BUILD__VC_ENABLED="$(usex vc)"
+		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+		-DIGC_OPTION__CLANG_MODE="Prebuilds"
+		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+		-DIGC_OPTION__LLD_MODE="Prebuilds"
+		-DIGC_OPTION__LLDELF_H_DIR="$(get_llvm_prefix)/include/lld/Common"
+		-DIGC_OPTION__LLVM_MODE="Prebuilds"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+		-DIGC_OPTION__OPENCL_HEADER_PATH="/usr/lib/clang/${llvm_version##*-}/include/opencl-c.h"
+		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+		-DIGC_OPTION__USE_KHRONOS_SPIRV_TRANSLATOR_IN_SC="ON"
+		-DIGC_OPTION__USE_PREINSTALLED_SPIRV_HEADERS="ON"
+		$(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DINSTALL_GENX_IR="ON"
+		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/include/LLVMSPIRVLib"
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-2.5.7-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-2.5.7-r1.ebuild
new file mode 100644
index 000000000000..fec7fad0e8b5
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-2.5.7-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_COMPAT=( 15 )
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake flag-o-matic llvm-r1 python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/2.5.0"
+KEYWORDS="~amd64"
+IUSE="debug vc"
+
+DEPEND="
+	dev-libs/opencl-clang:15[${LLVM_USEDEP}]
+	dev-util/spirv-tools
+	$(llvm_gen_dep '
+		llvm-core/lld:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+	')
+	vc? (
+		>=dev-libs/intel-vc-intrinsics-0.21.0[${LLVM_USEDEP}]
+		dev-util/spirv-llvm-translator:15=
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	$(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	python_has_version "dev-python/mako[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+)
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Don't hardcode FORTIFY_SOURCE
+	sed -e '/-D_FORTIFY_SOURCE=2/d' -i IGC/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Get LLVM version
+	local llvm_version="$(best_version -d llvm-core/llvm:${LLVM_SLOT})"
+	local llvm_version="${llvm_version%%-r*}"
+
+	# See https://github.com/intel/intel-graphics-compiler/issues/212
+	append-ldflags -Wl,-z,undefs
+
+	# See bug #893370 and https://github.com/intel/intel-graphics-compiler/issues/282
+	append-flags -U_GLIBCXX_ASSERTIONS
+
+	# See https://bugs.gentoo.org/718824
+	! use debug && append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS="OFF"
+		-DCCLANG_FROM_SYSTEM="ON"
+		-DCCLANG_SONAME_VERSION="${LLVM_SLOT}"
+		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix)/$(get_libdir)"
+		-DIGC_BUILD__VC_ENABLED="$(usex vc)"
+		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+		-DIGC_OPTION__CLANG_MODE="Prebuilds"
+		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+		-DIGC_OPTION__LLD_MODE="Prebuilds"
+		-DIGC_OPTION__LLDELF_H_DIR="$(get_llvm_prefix)/include/lld/Common"
+		-DIGC_OPTION__LLVM_MODE="Prebuilds"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+		-DIGC_OPTION__OPENCL_HEADER_PATH="/usr/lib/clang/${llvm_version##*-}/include/opencl-c.h"
+		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+		-DIGC_OPTION__USE_KHRONOS_SPIRV_TRANSLATOR_IN_SC="ON"
+		-DIGC_OPTION__USE_PREINSTALLED_SPIRV_HEADERS="ON"
+		$(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/include/LLVMSPIRVLib"
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/intel_clc/Manifest b/dev-util/intel_clc/Manifest
index 2e84d6fc801b..63f2007fe59d 100644
--- a/dev-util/intel_clc/Manifest
+++ b/dev-util/intel_clc/Manifest
@@ -2,3 +2,4 @@ DIST mesa-24.1.7.tar.xz 29206724 BLAKE2B b3102fcf96c032d07826186c2d60dc93e5c17b2
 DIST mesa-24.2.8.tar.xz 29622208 BLAKE2B f71a1663f9637883b4c442ba8c68f7960c48c4f8a02412738404386bfb962052923b40c1412198bd29f2ab6cf11654f8c63d4c14a400b89d99229680bc96eaae SHA512 3aa1051a72e1428e42f9537d8f6a26f2ebddc78894e0f71d2cdcc9ed555ea4d6489ad8e74d4c59b8cdf7ea1c629fa725ac2fe1e385db5d3a582d8fe8186392d6
 DIST mesa-24.3.1.tar.xz 30611028 BLAKE2B d3efc322388e29f651b15b0396fef8a6acc0cf24881165900845e429dd6cb53d51511f174d6a4017f48962b764b9a42f069825196af9f4ca969a4b46e1108a0e SHA512 deecf58e2c31e35d7c1943bb21184b52133a83fa472925128d3a03a57b26c92a476a6d3f7140ef2b78475b66affdabf97436ee8b324be204ce5bb940f78119c8
 DIST mesa-24.3.2.tar.xz 30640276 BLAKE2B d5973506983a23a95c360801a591e13945695e9a0c6f9f3bbb953865aa39ccfabaae624f4cd1edc8ecf479710856f5cc08e4f6374b107a06870906e934ecc5b8 SHA512 ea1065f7b466f1b2b3570c87585d6de15e3784a60d920c9f991c22720197d5947b598ac2c76773bed8150c91360ee5bbc77f3b48780a19502a8c4224baa728b9
+DIST mesa-24.3.3.tar.xz 30657916 BLAKE2B b973227885b3fd5fa6267c150a5e174f5e8a1c6378cf9326845ba75332084d7c914917c8e3b6d7b89f49ede0f5a5b453eb1ce42591e98b0cbad3f85bd3040035 SHA512 280d7a6dd64503ec398d449430270c78b5558c03bfeed3a42346573fd2db1aa3f96f5a212e49288718a7fe27447ee40235b066517622d68b0dfdd7b251a4e85f
diff --git a/dev-util/intel_clc/intel_clc-24.3.3.ebuild b/dev-util/intel_clc/intel_clc-24.3.3.ebuild
new file mode 100644
index 000000000000..87573bd206de
--- /dev/null
+++ b/dev-util/intel_clc/intel_clc-24.3.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {16..19} )
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit llvm-r1 meson python-any-r1
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V"
+HOMEPAGE="https://mesa3d.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}/intel_clc-${MY_PV}"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/mesa-${MY_PV}"
+	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+	dev-util/spirv-tools
+	>=sys-libs/zlib-1.2.8:=
+	x11-libs/libdrm
+	$(llvm_gen_dep '
+		dev-util/spirv-llvm-translator:${LLVM_SLOT}
+		llvm-core/clang:${LLVM_SLOT}=
+		=llvm-core/libclc-${LLVM_SLOT}*
+		llvm-core/llvm:${LLVM_SLOT}=
+	')
+"
+DEPEND="${RDEPEND}
+	dev-libs/expat
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep "
+		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
+		dev-python/packaging[\${PYTHON_USEDEP}]
+		dev-python/pyyaml[\${PYTHON_USEDEP}]
+	")
+	virtual/pkgconfig
+"
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
+}
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
+
+	use debug && EMESON_BUILDTYPE=debug
+
+	local emesonargs=(
+		-Dllvm=enabled
+		-Dshared-llvm=enabled
+		-Dintel-clc=enabled
+
+		-Dgallium-drivers=''
+		-Dvulkan-drivers=''
+
+		# Set platforms empty to avoid the default "auto" setting. If
+		# platforms is empty meson.build will add surfaceless.
+		-Dplatforms=''
+
+		-Dglx=disabled
+		-Dlibunwind=disabled
+		-Dzstd=disabled
+
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc
+}
diff --git a/dev-util/intel_clc/intel_clc-9999.ebuild b/dev-util/intel_clc/intel_clc-9999.ebuild
index fcc63b3f4a53..b577e985b4b4 100644
--- a/dev-util/intel_clc/intel_clc-9999.ebuild
+++ b/dev-util/intel_clc/intel_clc-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
@@ -29,12 +29,12 @@ IUSE="debug"
 
 RDEPEND="
 	dev-util/spirv-tools
-	llvm-core/libclc
 	>=sys-libs/zlib-1.2.8:=
 	x11-libs/libdrm
 	$(llvm_gen_dep '
 		dev-util/spirv-llvm-translator:${LLVM_SLOT}
 		llvm-core/clang:${LLVM_SLOT}=
+		=llvm-core/libclc-${LLVM_SLOT}*
 		llvm-core/llvm:${LLVM_SLOT}=
 	')
 "
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 6466fc6b8e1e..7e12e4cb377d 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,5 +1,3 @@
-DIST jenkins-bin-2.462.3.war 93358397 BLAKE2B 57c659aa48824144b4e685aadc4928369a10ce7ffba8715f15a4d5c267c6cf99e233e8e1a26679dc5ce711c3dc2a98e7f388635bfb79bc8e4473efe30b120dd2 SHA512 3647d09249d00b4ffc81bb4b22a51ca48f02cb0dfdb4abd0aac2930f02db0b9727f2634d11349b597ec87e2ebdfafeb412f09249517d843fd437b9f61100ea01
-DIST jenkins-bin-2.479.1.war 96008718 BLAKE2B 7e175b57dbaefbb92a03ccd0bb2420ac76b76b85ca4411195cb1f68a4f8a97be0be0f1aadf067d70ac5193b85271cc9e1d540d9cd4acd33e4b4edac30091d767 SHA512 09cda6b84a4f99d6c60688daa5f317e2283a9f36c12d88d55497d71fb70f26562ba3de2a96f2bace2e800acda67cfa658c4c6890da77537c953330c3c0a16d01
 DIST jenkins-bin-2.479.2.war 96015918 BLAKE2B fae14385c909128025cfb274254d70f62d1901c8cf86913385edc4c0cd8da06642582adbd8d46dba715aad8beb942312972d3085f4576a60b8e346049d31c7f6 SHA512 2e1645da57019919fd5dfab91b10ff2e3268257f9d81452ba6fba7e410c807e1d84fab06d886e3282411587d9e1a15850e07216104fc4ee04e7930677606ac39
-DIST jenkins-bin-2.479.war 95988810 BLAKE2B 830a544c502fd77289d870dcd9ce7bff2606be1968b58880fa69548279b7d4fe6e6842e1993a41615d54fcc2f9f8e562c3c55ad232b3af8b0b62bab3d9a58786 SHA512 3b3a3328d9d1992e0980463e37bdd7cc6e4c5115bef07252965bef29ac59d49b4a2db924dc256f0288e7034ef93ddd79965eac85d8eb6d7c189ca8c641995d3d
+DIST jenkins-bin-2.479.3.war 96806970 BLAKE2B 325402cab7cab3dbae0276abd731b84049229a42883f261fb96ed0a697dd41286ccd99d16329b5221475f89ab4148d54a1ddada24bdf80bdfa108cc600cdf31c SHA512 1cbfc32ada6303145c65794f9dacc9af7d79d4d0cc12ff49b3a0dd69c5fb543ec3d39b3f07bfdf6c4dcba080cbd81aae8eacbb415f90a9c8b17d103ef882fe9a
 DIST jenkins-bin-2.487.war 96349804 BLAKE2B ce2eaf2962e09bccdc29f7f018f7fab92e69580ac520604c9f42b43d080535ee0b93215cec20eda8e19bbd7c4a406619913554e6a436df30b1752172f74a08b1 SHA512 d6bb81200d2273b391b316119178f0ac042271bff680b1345e07a10f6ced3677923101081c02349700bff96a2dc4c70c9e60d6188c0904fec68053209003b31f
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.462.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.462.3.ebuild
deleted file mode 100644
index 1d9da3e913d7..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.462.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="The leading open source automation server"
-HOMEPAGE="https://jenkins.io/"
-SRC_URI="https://get.jenkins.io/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-S="${WORKDIR}"
-LICENSE="MIT"
-SLOT="lts"
-
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux"
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	|| ( virtual/jre:17 virtual/jre:11 )"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r3.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}-r3.init jenkins
-	newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}-r5.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.479.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.479.1.ebuild
deleted file mode 100644
index 52f625f58d2a..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.479.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="The leading open source automation server"
-HOMEPAGE="https://jenkins.io/"
-SRC_URI="https://get.jenkins.io/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-S="${WORKDIR}"
-LICENSE="MIT"
-SLOT="lts"
-
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	|| ( virtual/jre:21 virtual/jre:17 )"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r3.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}-r3.init jenkins
-	newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}-r5.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.479.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.479.3.ebuild
new file mode 100644
index 000000000000..30365fc44ded
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.479.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="The leading open source automation server"
+HOMEPAGE="https://jenkins.io/"
+SRC_URI="https://get.jenkins.io/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+S="${WORKDIR}"
+LICENSE="MIT"
+SLOT="lts"
+
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+
+DEPEND="acct-group/jenkins
+	acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+	acct-user/jenkins
+	media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	|| ( virtual/jre:21 virtual/jre:17 )"
+
+src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r3.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}-r3.init jenkins
+	newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r5.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.479.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.479.ebuild
deleted file mode 100644
index 912caa1bb080..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.479.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="The leading open source automation server"
-HOMEPAGE="https://jenkins.io/"
-SRC_URI="https://get.jenkins.io/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	|| ( virtual/jre:21 virtual/jre:17 )"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r3.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}-r3.init jenkins
-	newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}-r5.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index dcfd57c2696a..54f1b026c460 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,2 +1,2 @@
 DIST kdev-php-24.08.3.tar.xz 1093972 BLAKE2B 54b4e3a3f5fa83989f5692a0a2c2ad10b5d7b16e30be8c2754d1c0a17df9eef4909aa59fd1519d3b6a3eff29f0b1bba32d542618db32a95c353e2cf9482da3e6 SHA512 ef9f115c07a4c0021d797740888dfc0ad2889d87a45bcc44bcbbb55ac4de6960a2f997e67c64f57d225b0e721e643920d0043e7ac710337e83a5fa8e17106e61
-DIST kdev-php-24.12.0.tar.xz 1094416 BLAKE2B df3f1ce1b848974fda15ab323bf060e21d21d6272a61db6fc549aa65f665d8a4860f3bab0ffc2c7ac3462b0d1ce9cdc8e934e636890f3f9eb3599498550ded55 SHA512 5e6c770a5bc386fb16754bbd1d90da48a016640806fd8b548258200e03911e13eb5a95c8549b091242eedb3d72d85dcf24fcabe882837927f45bc994dea6e912
+DIST kdev-php-24.12.1.tar.xz 1094352 BLAKE2B 6742f7008a241d8c1155ec148213e4e5618f8d1c596e8a29a1e6b23722893193107cae878c98998e95e67734b3ecd5454ca06a26fbd8df1e7e61ad291c27604d SHA512 fe22b2943977efdf63819aaffe6465ca59a4be29eb866c950412983a6f97f16c944504369c6eb557eadac8ae14aee127a165573a7229f8b6d258c4eceef8d07b
diff --git a/dev-util/kdevelop-php/kdevelop-php-24.12.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-24.12.0.ebuild
deleted file mode 100644
index dd445596a575..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-24.12.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_HANDBOOK_DIR="docs"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="kdevelop"
-KDE_ORG_NAME="kdev-php"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="PHP plugin for KDevelop"
-HOMEPAGE="https://kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-# remaining tests fail for some, bug 668530
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	dev-util/kdevelop:6=
-	>=dev-util/kdevelop-pg-qt-2.3.0:0
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/ktexteditor-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/threadweaver-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-util/kdevelop:6[test] )"
-
-src_test() {
-	# tests hang, bug 667922
-	local myctestargs=(
-		-E "(completionbenchmark|duchain_multiplefiles)"
-	)
-	ecm_src_test
-}
diff --git a/dev-util/kdevelop-php/kdevelop-php-24.12.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-24.12.1.ebuild
new file mode 100644
index 000000000000..81243859e088
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-24.12.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_NAME="kdev-php"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="PHP plugin for KDevelop"
+HOMEPAGE="https://kdevelop.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+# remaining tests fail for some, bug 668530
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	dev-util/kdevelop:6=
+	>=dev-util/kdevelop-pg-qt-2.3.0:0
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/threadweaver-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-util/kdevelop:6[test] )"
+
+src_test() {
+	# tests hang, bug 667922
+	local myctestargs=(
+		-E "(completionbenchmark|duchain_multiplefiles)"
+	)
+	ecm_src_test
+}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 1cae6633cf04..409966b1c693 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,2 +1,2 @@
 DIST kdev-python-24.08.3.tar.xz 1101720 BLAKE2B 13e21a9b43b2a4fbd12224910fc33a26b6f6c4c32a9049a53d4726bcfca8d4f463fef92a802fd6249410c050000c0be9a228750fc7cea31370a9399e7323acc7 SHA512 a5459b00a1e2f2a86c87ecad2a12abb23e070838f7f802c1106371182feb1b2f2deca1a9864c3aafb3edf9dfd3c9f6b9120e552d46bb60c09c81c524fb590eed
-DIST kdev-python-24.12.0.tar.xz 1102952 BLAKE2B 2a545383e0983dbcd48b706c4a6dd141587429879bd4dedefcf95398f56807ea73f55c6d63beb30900ddb0f5525b597bde3dda43ed3b2ddd7abba5da42ca020b SHA512 2a632637accd3e08524766574544d5f2fbd178e86819fea8a6665ef8ab6ad1116c1167bd52cf9db933e9a7ec41878da858846691c2edf28e1131b16acf8bdf34
+DIST kdev-python-24.12.1.tar.xz 1103176 BLAKE2B 67f8c5e2b665f29591f04ed4c70418b1106524b34f6af2e81185eebdc132aeaffada808d8c8cffa8b2e5f6e5eca2c7cf27249dcc1faf4beeac77f69a56a4e55a SHA512 98ccee793c0ed6bb0d2fce1ca426bd4ea2577cdfdb25f601f9d1c99adf58a101677948634596c1726e3ad95809ae9fc2d54883ff375d5f4d1942c5f8b19f913e
diff --git a/dev-util/kdevelop-python/kdevelop-python-24.12.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-24.12.0.ebuild
deleted file mode 100644
index e283a3d10c12..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-24.12.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KDE_ORG_CATEGORY="kdevelop"
-KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{10..12} )
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org python-single-r1
-
-DESCRIPTION="Python plugin for KDevelop"
-HOMEPAGE="https://kdevelop.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	dev-util/kdevelop:6=
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktexteditor-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/threadweaver-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-	')
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
diff --git a/dev-util/kdevelop-python/kdevelop-python-24.12.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-24.12.1.ebuild
new file mode 100644
index 000000000000..ec3e77b4aa45
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-24.12.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_NAME="kdev-python"
+PYTHON_COMPAT=( python3_{10..12} )
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org python-single-r1
+
+DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://kdevelop.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	dev-util/kdevelop:6=
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/threadweaver-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+	')
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 53f08f7377ec..4764861bd07e 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,2 +1,2 @@
 DIST kdevelop-24.08.3.tar.xz 8819060 BLAKE2B e15dc7ac0808c04e2d7752b6ceb984286be5ba43a183acafd68d60a53308d02cbf3e9b281bb2029754e41f107237c811395a8b9e27cb5b8b13141536cf3207ae SHA512 1a1ffc4186efec19e7dfca403c6b327bfda0ed96793186a44aaf52e0f8eab2e070dc4452c632f112f0a296f4182bd8d1ab38dbdd5fbd2a1c982ec694a10eae2a
-DIST kdevelop-24.12.0.tar.xz 8833432 BLAKE2B 04c7601aa87ed2203db7f9710b3af9278632693f12d7065bb238dcae7ce994d83a73226e894dd3fa9898c65a237f09412177ed6f3ea2a863a8505d0877a3770d SHA512 c4b12eb6c53564874306760d3bcbd80d4d3a2577360c3d0a6efd8a81a7f432a5b57e9f526b7a1396ebc41c50a021362c5c65004181e2717e3a5269dcbfe4ad5c
+DIST kdevelop-24.12.1.tar.xz 8833356 BLAKE2B 8d09891a7e65869b29b99f459bd858b1348c3bde1676b31e88e909ca3660733af5c1d313305f7934126fe29d4d9ce8dc9457236e548faeb8292db4720d31b1d7 SHA512 e0cb6c6a10ba5a7bfcba73032bf9bc77b88adb3254d783c7ea78c0ac9a00077b3a86597e4572d00a1489fc029c27daf069dd4a726db24e57549e4abb815e2418
diff --git a/dev-util/kdevelop/kdevelop-24.12.0.ebuild b/dev-util/kdevelop/kdevelop-24.12.0.ebuild
deleted file mode 100644
index 09adc8a5f99e..000000000000
--- a/dev-util/kdevelop/kdevelop-24.12.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="kdevelop"
-KFMIN=6.5.0
-LLVM_COMPAT=( 15 16 17 18 )
-QTMIN=6.7.2
-inherit ecm gear.kde.org llvm-r1 optfeature
-
-DESCRIPTION="Integrated Development Environment, supporting KF6/Qt, C/C++ and much more"
-HOMEPAGE="https://kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="6/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64"
-IUSE="gdbui plasma +qmake +share subversion"
-
-# see bug 366471
-RESTRICT="test"
-
-# UPSTREAM: not ported yet, check plugins/CMakeLists.txt
-# IUSE="hex"
-# 	hex? ( app-editors/okteta:6 )
-COMMON_DEPEND="
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
-	>=dev-qt/qttools-${QTMIN}:6[assistant]
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=dev-util/astyle-3.1:=
-	kde-apps/libkomparediff2:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktexteditor-${KFMIN}:6
-	>=kde-frameworks/ktexttemplate-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6
-	>=kde-frameworks/threadweaver-${KFMIN}:6
-	$(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}')
-	gdbui? ( kde-plasma/libksysguard:6= )
-	plasma? (
-		>=kde-frameworks/krunner-${KFMIN}:6
-		kde-plasma/libplasma:6
-	)
-	qmake? ( >=dev-util/kdevelop-pg-qt-2.3.0:0 )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-build/ninja
-	>=dev-debug/gdb-7.0[python]
-	>=dev-qt/qttools-${QTMIN}:6[qdbus]
-	kde-apps/kapptemplate:*
-	kde-apps/kio-extras:6
-"
-
-pkg_setup() {
-	ecm_pkg_setup
-	llvm-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_ROOT="$(get_llvm_prefix)"
-		$(cmake_use_find_package gdbui KSysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake_use_find_package plasma Plasma)
-		$(cmake_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake_use_find_package share KF6Purpose)
-		$(cmake_use_find_package subversion SubversionLibrary)
-	)
-#		$(cmake_use_find_package hex OktetaKastenControllers)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "konsole view" "kde-apps/konsole:6"
-		optfeature "static C++ Qt code analysis" dev-util/clazy
-		optfeature "static C/C++ code analysis" dev-util/cppcheck
-		optfeature "heap memory profiling" "dev-util/heaptrack[gui]"
-		optfeature "meson project manager plugin" dev-build/meson
-		optfeature "formatting configurations via customscript plugin" dev-util/indent
-		optfeature "formatting configurations via customscript plugin" dev-util/uncrustify
-	fi
-	ecm_pkg_postinst
-}
diff --git a/dev-util/kdevelop/kdevelop-24.12.1.ebuild b/dev-util/kdevelop/kdevelop-24.12.1.ebuild
new file mode 100644
index 000000000000..a513e337e076
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-24.12.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KFMIN=6.7.0
+LLVM_COMPAT=( 15 16 17 18 )
+QTMIN=6.7.2
+inherit ecm gear.kde.org llvm-r1 optfeature
+
+DESCRIPTION="Integrated Development Environment, supporting KF6/Qt, C/C++ and much more"
+HOMEPAGE="https://kdevelop.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="6/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64"
+IUSE="gdbui plasma +qmake +share subversion"
+
+# see bug 366471
+RESTRICT="test"
+
+# UPSTREAM: not ported yet, check plugins/CMakeLists.txt
+# IUSE="hex"
+# 	hex? ( app-editors/okteta:6 )
+COMMON_DEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qttools-${QTMIN}:6[assistant]
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=dev-util/astyle-3.1:=
+	kde-apps/libkomparediff2:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/ktexttemplate-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	>=kde-frameworks/threadweaver-${KFMIN}:6
+	$(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}')
+	gdbui? ( kde-plasma/libksysguard:6= )
+	plasma? (
+		>=kde-frameworks/krunner-${KFMIN}:6
+		kde-plasma/libplasma:6
+	)
+	qmake? ( >=dev-util/kdevelop-pg-qt-2.3.0:0 )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-build/ninja
+	>=dev-debug/gdb-7.0[python]
+	>=dev-qt/qttools-${QTMIN}:6[qdbus]
+	kde-apps/kapptemplate:*
+	kde-apps/kio-extras:6
+"
+
+pkg_setup() {
+	ecm_pkg_setup
+	llvm-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_ROOT="$(get_llvm_prefix)"
+		$(cmake_use_find_package gdbui KSysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
+		$(cmake_use_find_package plasma Plasma)
+		$(cmake_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake_use_find_package share KF6Purpose)
+		$(cmake_use_find_package subversion SubversionLibrary)
+	)
+#		$(cmake_use_find_package hex OktetaKastenControllers)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "konsole view" "kde-apps/konsole:6"
+		optfeature "static C++ Qt code analysis" dev-util/clazy
+		optfeature "static C/C++ code analysis" dev-util/cppcheck
+		optfeature "heap memory profiling" "dev-util/heaptrack[gui]"
+		optfeature "meson project manager plugin" dev-build/meson
+		optfeature "formatting configurations via customscript plugin" dev-util/indent
+		optfeature "formatting configurations via customscript plugin" dev-util/uncrustify
+	fi
+	ecm_pkg_postinst
+}
diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index 5db8967c1806..8b5b574471d2 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1,3 +1,2 @@
-DIST kernelshark-2.2.0.tar.gz 4100601 BLAKE2B e68275b91a5a629a868e95c9b5f807c46e445e9d6e131093eb38b5a350af47dec5da9d4ec24a4b60a90ac6b3c70438236f6cd7d80fabccf420bae1603fc13338 SHA512 a2d2d2c9494189322ddb45eabe3aded8db9c72eca3d5afefc8d97b4b5011e9f93a3324aeabe19bc1917c3dbf67c75dcefbda831a2e82722bde5599f01e88c047
-DIST kernelshark-2.2.1.tar.gz 4100400 BLAKE2B a11e61660cbf98bbbb7c5060014b4de8e05f6957f2eb5519c3a109d91e5297a4532af3c958471ab181ddc8cbb061d1a493b3f40b71efb3abe3d47640a4ab87cc SHA512 1e0b17de02b82a20f6f78ebbfe61c63550947c3275e1262ae6edfd4675f7d1f976955ed37b14f2a214675a83e43135e605c244b4a5f920ebcdeaabcda7510d10
 DIST kernelshark-2.3.1.tar.gz 4100178 BLAKE2B 818448c3d2e01412e12fc3406b13ffd4d6ab7d442aef7867048913996edbc7f64b2c2c9e88810d6c0bd9e8a6ee9726369ab097d2164ec9966660f098e123c702 SHA512 ba5e7ebc713d296bef211174869445ccb3dffb8a96d0634776bd28c183487225e7c8082c8be5957795973833d6ac67851fb46f75cf68aae66eb3e5e06c081f5f
+DIST kernelshark-2.3.2.tar.gz 4100186 BLAKE2B 7a8814c1c47bae7f869561f7296cd7f829bffdb388508dd6a58727672bb9b6538b75c3bfee34abb01b83f416278e589d819a4756bbbddc2623e65a7a85c181d1 SHA512 52765091bdc0a0ab4a1eb60d8b054682c538a864dd49f06d8f38c67f3e1bf62de106ef121549b1c76a08b023fe43aee83e0b7d2afaa6693a5a59bfc3885940df
diff --git a/dev-util/kernelshark/kernelshark-2.2.0.ebuild b/dev-util/kernelshark/kernelshark-2.2.0.ebuild
deleted file mode 100644
index b90ab79d56d5..000000000000
--- a/dev-util/kernelshark/kernelshark-2.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic cmake
-
-DESCRIPTION="Graphical reader for trace-cmd output"
-HOMEPAGE="https://kernelshark.org/"
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/kernel-shark"
-
-else
-	MY_P="kernel-shark-${PN}-v${PV}"
-	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="custom-optimization doc"
-
-DEPEND="
-	>=dev-util/trace-cmd-3.0.2
-	dev-libs/json-c:=
-	dev-qt/qtcore:5=
-	dev-qt/qtnetwork:5=
-	dev-qt/qtwidgets:5=
-	>=media-libs/freeglut-3.0.0:=
-	x11-libs/libXmu:=
-	x11-libs/libXi:=
-	>=dev-libs/libtracefs-1.3
-	>=dev-libs/libtraceevent-1.5
-	media-fonts/freefont
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	doc? (
-		media-gfx/graphviz
-		app-text/doxygen
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-no-ldconfig.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-D_INSTALL_PREFIX="${EPREFIX}/usr"
-		-D_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		-D_DOXYGEN_DOC=$(usex doc)
-	)
-	use custom-optimization || replace-flags -O? -O3
-	cmake_src_configure
-}
diff --git a/dev-util/kernelshark/kernelshark-2.2.1-r2.ebuild b/dev-util/kernelshark/kernelshark-2.2.1-r2.ebuild
deleted file mode 100644
index 130c9a4d430f..000000000000
--- a/dev-util/kernelshark/kernelshark-2.2.1-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic cmake
-
-DESCRIPTION="Graphical reader for trace-cmd output"
-HOMEPAGE="https://kernelshark.org/"
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/kernel-shark"
-
-else
-	MY_P="kernel-shark-${PN}-v${PV}"
-	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="custom-optimization doc"
-
-DEPEND="
-	|| ( >=dev-libs/libtracecmd-1.1.2 <dev-util/trace-cmd-3.2 )
-	dev-libs/json-c:=
-	dev-qt/qtcore:5=
-	dev-qt/qtnetwork:5=
-	dev-qt/qtwidgets:5=
-	dev-util/trace-cmd
-	>=media-libs/freeglut-3.0.0:=
-	x11-libs/libXmu:=
-	x11-libs/libXi:=
-	>=dev-libs/libtracefs-1.3
-	>=dev-libs/libtraceevent-1.5
-	media-fonts/freefont
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	doc? (
-		media-gfx/graphviz
-		app-text/doxygen
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-no-ldconfig.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-D_INSTALL_PREFIX="${EPREFIX}/usr"
-		-D_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		-D_DOXYGEN_DOC=$(usex doc)
-	)
-	use custom-optimization || replace-flags -O? -O3
-	cmake_src_configure
-}
diff --git a/dev-util/kernelshark/kernelshark-2.3.2.ebuild b/dev-util/kernelshark/kernelshark-2.3.2.ebuild
new file mode 100644
index 000000000000..391400270b4d
--- /dev/null
+++ b/dev-util/kernelshark/kernelshark-2.3.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic cmake
+
+DESCRIPTION="Graphical reader for trace-cmd output"
+HOMEPAGE="https://kernelshark.org/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/kernel-shark"
+
+else
+	MY_P="kernel-shark-${PN}-v${PV}"
+	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="custom-optimization doc"
+
+DEPEND="
+	dev-libs/libtracecmd
+	dev-libs/json-c:=
+	dev-qt/qtbase:6=[network,opengl,widgets]
+	dev-qt/qtscxml:6=
+	>=media-libs/freeglut-3.0.0:=
+	x11-libs/libXmu:=
+	x11-libs/libXi:=
+	>=dev-libs/libtracefs-1.3
+	>=dev-libs/libtraceevent-1.5
+	media-fonts/freefont
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? (
+		media-gfx/graphviz
+		app-text/doxygen
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-no-ldconfig.patch
+	"${FILESDIR}"/${PN}-2.3.1-algorithm.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-D_INSTALL_PREFIX="${EPREFIX}/usr"
+		-D_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		-D_DOXYGEN_DOC=$(usex doc)
+	)
+	use custom-optimization || replace-flags -O? -O3
+	cmake_src_configure
+}
diff --git a/dev-util/kio-perldoc/Manifest b/dev-util/kio-perldoc/Manifest
index 583dc00510e5..d7d2a4f72271 100644
--- a/dev-util/kio-perldoc/Manifest
+++ b/dev-util/kio-perldoc/Manifest
@@ -1,2 +1,2 @@
 DIST kdesdk-kio-24.08.3.tar.xz 41764 BLAKE2B 2b42795d14dca876fd16590afff3ab93c868956b8f670ab3c4c4a652c5f0322bcbb4b515adac332a52d32cc5456762117ef94a1dd63e43c03b7432a61739eea3 SHA512 9851ca4a2b14c7f82c4b40e432b146b56d672bac8c5fef7047b8874fd511fc70388731f946c7b5250f0117eba8e09f9d9a5b878b7bc0aea8697ae7b4f53f9c8a
-DIST kdesdk-kio-24.12.0.tar.xz 41768 BLAKE2B 058ef097b5a608b1eb77585aec93cb8fbcf305fa25559b5098d4563b5a122698dc447f9373573c5f4e2837be072b79f40f6202fb7152d9649e66476444ed4998 SHA512 8052b1bbeb2f588696479468f31c9a547dbd95490dc74acb73758db98b80b761db1da7b9b9379b9374e2e3373bedc08a54f59765bbf69744f0d883bd1d8d1c67
+DIST kdesdk-kio-24.12.1.tar.xz 41780 BLAKE2B 0181505d8d7592191e8f23ea3e63f195746df4a9a3108943086de567c5479fafdc2f820bc07ac0e6c7a61e44dab8a7b07fc501229135c464804cc148630bea79 SHA512 1eebeb159a1f483ea7732c290bb766ac906bb582142b4a54e477a148b9097ac96fe0c2c564061519dc54804bdb3ef076bc69f79431dcaeac232c80ef9cd95cb7
diff --git a/dev-util/kio-perldoc/kio-perldoc-24.12.0.ebuild b/dev-util/kio-perldoc/kio-perldoc-24.12.0.ebuild
deleted file mode 100644
index a50ec345e017..000000000000
--- a/dev-util/kio-perldoc/kio-perldoc-24.12.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
-
-KDE_ORG_NAME="kdesdk-kio"
-KFMIN=6.5.0
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO worker interface to browse Perl documentation"
-
-LICENSE="GPL-2+ || ( Artistic GPL-1+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	dev-lang/perl
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/kio-perldoc/kio-perldoc-24.12.1.ebuild b/dev-util/kio-perldoc/kio-perldoc-24.12.1.ebuild
new file mode 100644
index 000000000000..6633f4511d4f
--- /dev/null
+++ b/dev-util/kio-perldoc/kio-perldoc-24.12.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdesdk-kio"
+KFMIN=6.7.0
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO worker interface to browse Perl documentation"
+
+LICENSE="GPL-2+ || ( Artistic GPL-1+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	dev-lang/perl
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-util/kyua/Manifest b/dev-util/kyua/Manifest
index c4aa44b8733f..58291e254294 100644
--- a/dev-util/kyua/Manifest
+++ b/dev-util/kyua/Manifest
@@ -1 +1,2 @@
 DIST kyua-0.13.tar.gz 663776 BLAKE2B 5bb6b2a7723567395baeace0b70085a631856ac98ddb304bb5300f26bc89a1a1add589486cd08f1569ca9c7534fd5071a62cdcbb519a10d59221df63c0aef932 SHA512 80ecf4fd888d4759122f3c1d1d5b06a19135e06f7bca1ef8458c7a5e78c1b6baff54969c863c93f11c40611ca256fc0334402531397b16788fb3ec701dd278ae
+DIST kyua-0.14.tar.gz 522124 BLAKE2B b211b987c9526bbf486b9d1429c83432907015a39bb68322674e3650473b97b74b88839913571d6e5df6f2c6671913feb2a5e555c2d304c164c89cf292efbad4 SHA512 38f6b4c6bce4aea8f8b257b9799e585311e9f8cfe154a277f5b520ee29bc04cabdd0d531cdf9c09cc6ee2e0e470db498071210e23732d2f55e1ae551c71a2c06
diff --git a/dev-util/kyua/kyua-0.14.ebuild b/dev-util/kyua/kyua-0.14.ebuild
new file mode 100644
index 000000000000..6a1d218752d9
--- /dev/null
+++ b/dev-util/kyua/kyua-0.14.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2017-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Testing framework for infrastructure software"
+HOMEPAGE="https://github.com/freebsd/kyua"
+SRC_URI="https://github.com/freebsd/kyua/archive/refs/tags/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-lua/lutok-0.5
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( >=dev-libs/atf-0.22 )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# bug #948053
+	filter-lto
+
+	# Skip coredump tests; they fail when sudo sets RLIMIT_CORE = 0.
+	cat >"${T}/kyua.conf" <<-EOF || die
+	syntax(2)
+	test_suites.kyua.run_coredump_tests = "false"
+	EOF
+	local -x KYUA_CONFIG_FILE_FOR_CHECK="${T}/kyua.conf"
+
+	econf $(use_enable test atf)
+}
+
+src_install() {
+	default
+	rm -rf "${ED}"/usr/tests || die
+}
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index 1c6be2a9078c..3584f0e85e2c 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -1 +1,2 @@
 DIST lcov-2.0.tar.gz 391695 BLAKE2B 737d6104ebedf90ba2c3bf0c439dd7e2d18724d7267c3bd79897140785246d9ed6334eec9eabc888e361f5e22515da9756e946e1097777fb88c140398b0b078a SHA512 b19b6debc93c0de0e7e5b2aaffa6c74d20a1313ea4d20d8731c6a5ea7f4cc40933316d28ef791c91fdc12ca77c9449a388405f3dc0793588e366b72f596ab49b
+DIST lcov-2.3.tar.gz 848329 BLAKE2B dbb0f0296efb25254f46f54dd1cade6afe5c4f974a144e1f636568729f5c9098c3bb0de281c6c0c0c8254058253c508f799b2074f214316b1766ed07c61afca6 SHA512 ee6880e12393e4b142ba777f70e70f56736acb2516f1e6a8711fb7c8a1b808c603966c6c75937d5151047410483f5fa34c9558d9df3fa2a3fc5ca1c886963c2b
diff --git a/dev-util/lcov/lcov-2.0-r2.ebuild b/dev-util/lcov/lcov-2.0-r2.ebuild
deleted file mode 100644
index 42e4040bcb47..000000000000
--- a/dev-util/lcov/lcov-2.0-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit optfeature prefix python-any-r1
-
-DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
-HOMEPAGE="https://github.com/linux-test-project/lcov"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/linux-test-project/lcov/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Python is used for spreadsheet.py
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Capture-Tiny
-	dev-perl/DateTime
-	|| (
-		dev-perl/JSON-XS
-		dev-perl/Cpanel-JSON-XS
-		virtual/perl-JSON-PP
-		dev-perl/JSON
-	)
-	dev-perl/PerlIO-gzip
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-perl/GD
-		$(python_gen_any_dep '
-			dev-python/xlsxwriter[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-wrong-error-code.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/xlsxwriter[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify bin/*.{pl,sh}
-	fi
-}
-
-src_compile() { :; }
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	emake -j1 \
-		DESTDIR="${D}" \
-		CFG_DIR="${EPREFIX}/etc" \
-		PREFIX="${EPREFIX}/usr" \
-		LCOV_PERL_PATH="${EPREFIX}/usr/bin/perl" \
-		install
-}
-
-pkg_postinst() {
-	optfeature_header "Optional outuput support:"
-	optfeature "png output support" dev-perl/GD[png]
-	optfeature "spreadsheet output support" dev-python/xlsxwriter
-	optfeature_header "Optional language support:"
-	optfeature "Python code coverage support" dev-python/coverage
-	optfeature "Perl code coverage support" dev-perl/Devel-Cover
-}
diff --git a/dev-util/lcov/lcov-2.0-r3.ebuild b/dev-util/lcov/lcov-2.0-r3.ebuild
new file mode 100644
index 000000000000..c4a7d3538752
--- /dev/null
+++ b/dev-util/lcov/lcov-2.0-r3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit optfeature prefix python-any-r1
+
+DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
+HOMEPAGE="https://github.com/linux-test-project/lcov"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/linux-test-project/lcov/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Python is used for spreadsheet.py
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Capture-Tiny
+	dev-perl/DateTime
+	|| (
+		dev-perl/JSON-XS
+		dev-perl/Cpanel-JSON-XS
+		virtual/perl-JSON-PP
+		dev-perl/JSON
+	)
+	dev-perl/TimeDate
+	dev-perl/PerlIO-gzip
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-perl/GD
+		dev-perl/JSON
+		$(python_gen_any_dep '
+			dev-python/xlsxwriter[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-wrong-error-code.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/xlsxwriter[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify bin/*.{pl,sh}
+	fi
+}
+
+src_compile() { :; }
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	emake -j1 \
+		DESTDIR="${D}" \
+		CFG_DIR="${EPREFIX}/etc" \
+		PREFIX="${EPREFIX}/usr" \
+		LCOV_PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		install
+}
+
+pkg_postinst() {
+	optfeature_header "Optional outuput support:"
+	optfeature "png output support" dev-perl/GD[png]
+	optfeature "spreadsheet output support" dev-python/xlsxwriter
+	optfeature_header "Optional language support:"
+	optfeature "Python code coverage support" dev-python/coverage
+	optfeature "Perl code coverage support" dev-perl/Devel-Cover
+}
diff --git a/dev-util/lcov/lcov-2.0-r4.ebuild b/dev-util/lcov/lcov-2.0-r4.ebuild
new file mode 100644
index 000000000000..a378009d2bfb
--- /dev/null
+++ b/dev-util/lcov/lcov-2.0-r4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit optfeature prefix python-any-r1
+
+DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
+HOMEPAGE="https://github.com/linux-test-project/lcov"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/linux-test-project/lcov/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Python is used for spreadsheet.py
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Capture-Tiny
+	dev-perl/DateTime
+	|| (
+		dev-perl/JSON-XS
+		dev-perl/Cpanel-JSON-XS
+		virtual/perl-JSON-PP
+		dev-perl/JSON
+	)
+	dev-perl/Memory-Process
+	dev-perl/TimeDate
+	dev-perl/PerlIO-gzip
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-perl/GD
+		dev-perl/JSON
+		$(python_gen_any_dep '
+			dev-python/xlsxwriter[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-wrong-error-code.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/xlsxwriter[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify bin/*.{pl,sh}
+	fi
+}
+
+src_compile() { :; }
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	emake -j1 \
+		DESTDIR="${D}" \
+		CFG_DIR="${EPREFIX}/etc" \
+		PREFIX="${EPREFIX}/usr" \
+		LCOV_PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		install
+}
+
+pkg_postinst() {
+	optfeature_header "Optional outuput support:"
+	optfeature "png output support" dev-perl/GD[png]
+	optfeature "spreadsheet output support" dev-python/xlsxwriter
+	optfeature_header "Optional language support:"
+	optfeature "Python code coverage support" dev-python/coverage
+	optfeature "Perl code coverage support" dev-perl/Devel-Cover
+}
diff --git a/dev-util/lcov/lcov-2.3.ebuild b/dev-util/lcov/lcov-2.3.ebuild
new file mode 100644
index 000000000000..8c7362d6b572
--- /dev/null
+++ b/dev-util/lcov/lcov-2.3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit optfeature prefix python-any-r1
+
+DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
+HOMEPAGE="https://github.com/linux-test-project/lcov"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/linux-test-project/lcov/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Python is used for spreadsheet.py
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Capture-Tiny
+	dev-perl/DateTime
+	dev-perl/Devel-Cover
+	|| (
+		dev-perl/JSON-XS
+		dev-perl/Cpanel-JSON-XS
+		virtual/perl-JSON-PP
+		dev-perl/JSON
+	)
+	dev-perl/Memory-Process
+	dev-perl/TimeDate
+	dev-perl/PerlIO-gzip
+	virtual/perl-Module-Load-Conditional
+	virtual/perl-Scalar-List-Utils
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-perl/GD
+		$(python_gen_any_dep '
+			dev-python/coverage[${PYTHON_USEDEP}]
+			dev-python/xlsxwriter[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/coverage[${PYTHON_USEDEP}]" \
+		&& \
+	python_has_version "dev-python/xlsxwriter[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable failing tests for now
+	# https://github.com/linux-test-project/lcov/issues/378
+	# https://github.com/linux-test-project/lcov/issues/380
+	sed \
+		-e 's, extract/,,' \
+		-e 's, mcdc$,,' \
+		-i.bak tests/lcov/Makefile || die
+	# https://github.com/linux-test-project/lcov/issues/381
+	sed \
+		-e 's, gendiffcov,,' \
+		-e 's, py2lcov,,' \
+		-i.bak tests/Makefile || die
+
+	default
+	if use prefix; then
+		hprefixify bin/*.{pl,sh}
+	fi
+}
+
+src_compile() { :; }
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	emake -j1 \
+		DESTDIR="${D}" \
+		CFG_DIR="${EPREFIX}/etc" \
+		PREFIX="${EPREFIX}/usr" \
+		LCOV_PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		install
+}
+
+pkg_postinst() {
+	optfeature_header "Optional outuput support:"
+	optfeature "png output support" dev-perl/GD[png]
+	optfeature "spreadsheet output support" dev-python/xlsxwriter
+	optfeature_header "Optional language support:"
+	optfeature "Python code coverage support" dev-python/coverage
+	optfeature "Perl code coverage support" dev-perl/Devel-Cover
+}
diff --git a/dev-util/lcov/lcov-9999.ebuild b/dev-util/lcov/lcov-9999.ebuild
index 5ec804295fa7..015ee60eec8d 100644
--- a/dev-util/lcov/lcov-9999.ebuild
+++ b/dev-util/lcov/lcov-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
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit optfeature prefix python-any-r1
 
 DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/linux-test-project/lcov/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2+"
@@ -27,25 +27,33 @@ RDEPEND="
 	dev-lang/perl
 	dev-perl/Capture-Tiny
 	dev-perl/DateTime
+	dev-perl/Devel-Cover
 	|| (
 		dev-perl/JSON-XS
 		dev-perl/Cpanel-JSON-XS
 		virtual/perl-JSON-PP
 		dev-perl/JSON
 	)
+	dev-perl/Memory-Process
+	dev-perl/TimeDate
 	dev-perl/PerlIO-gzip
+	virtual/perl-Module-Load-Conditional
+	virtual/perl-Scalar-List-Utils
 "
 BDEPEND="
 	test? (
 		${RDEPEND}
 		dev-perl/GD
 		$(python_gen_any_dep '
+			dev-python/coverage[${PYTHON_USEDEP}]
 			dev-python/xlsxwriter[${PYTHON_USEDEP}]
 		')
 	)
 "
 
 python_check_deps() {
+	python_has_version "dev-python/coverage[${PYTHON_USEDEP}]" \
+		&& \
 	python_has_version "dev-python/xlsxwriter[${PYTHON_USEDEP}]"
 }
 
diff --git a/dev-util/lttng-modules/Manifest b/dev-util/lttng-modules/Manifest
index bae1fa95767c..396849d84480 100644
--- a/dev-util/lttng-modules/Manifest
+++ b/dev-util/lttng-modules/Manifest
@@ -1,4 +1,2 @@
-DIST lttng-modules-2.12.5.tar.bz2 317002 BLAKE2B 9f42f8641dca7ce55e7445495c747ce340919458a23b4d471998fe2a28dd26bc7dfa5edbccf0b11877176091dee0c4d63fdda919c03afc8dad3fcfb7e9529c33 SHA512 81524dac513384852555a6f5619dc10286a2f7d4e3032ee9ca33705e830ee3bc3dc8c96b89a9c09dd5df2bf29944e3e566d1ac1a6cd6be83718af9836e043991
-DIST lttng-modules-2.12.8.tar.bz2 319450 BLAKE2B 0ce5c6675598c1a4b6fbc0dfaf51d36638f12fe2e07095c37a811db8d7ee65bb242164cf02b1854c27b6894f0b4c73867e8ee1b80dd007290e0db203ea429f9e SHA512 5918a54d08a12cec567cdad2909846ba529d5e665a3592a69384d9546f6f3e23e7975876fc11feaef65604d36889b0598b1cf7b5f2badb4e2b11b255a2e7ca99
-DIST lttng-modules-2.13.14.tar.bz2 355555 BLAKE2B 477947e83daf4f838453d82292f73cb24030639b1394fa586271285e0d1604d8098b1869c5cdcf2a1f55f9916e98a2f2e0dd005ca2d17c76db5362e38a29e993 SHA512 521c19cbdfa8e6f9d06f1a06312aee201823e1a7d1987f3de5d9dae08163cc8b51daff1bcbcbe79261ed8ded7232857136e7d0d4ebc05a3380b7377d43c1ee38
 DIST lttng-modules-2.13.15.tar.bz2 355980 BLAKE2B 96ebeaac275151464cc8dea1de209f034dde1b26426bc23669f36f026f140c4b5613e10b91b0fc16dc18e26c05e7c0e67e7fc86af00d8f70b87bfaf49e5b7fdb SHA512 1c9091306d95339b5a09f0ef6141e9e6a96461aa9801f264c44780eb2130137fca6fe544ea0c18e84d3cb784d82107419286272b37f53d292ca8b664c06c242b
+DIST lttng-modules-2.13.16.tar.bz2 356182 BLAKE2B aee4c7f602a403ac319ed07eeb2dd079a91707b64b8e7ff948027e05ba1db51416b8922e7a623dd32a81cbd16c68c8406b59a76cbc91421b623b19aeb8631a1b SHA512 98dddfc4aa739081b03c355f212f143a249b90b1a26c34c2af8e7502643f388990bc9b5a37bab02c1a562246219a9b7bd8a1daa0bacf6ec4afef9a3b93415d70
diff --git a/dev-util/lttng-modules/lttng-modules-2.12.5.ebuild b/dev-util/lttng-modules/lttng-modules-2.12.5.ebuild
deleted file mode 100644
index 9ea9002311ea..000000000000
--- a/dev-util/lttng-modules/lttng-modules-2.12.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="LTTng Kernel Tracer Modules"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BUILD_TARGETS="default"
-
-CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
-	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
-
-MODULE_NAMES="true"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is lt 3 0; then
-		eerror "${PN} require Linux kernel >= 3.0"
-		die "Please update your kernel!"
-	fi
-}
-
-src_compile() {
-	BUILD_FIXES="KERNELDIR=$KERNEL_DIR" linux-mod_src_compile
-}
-
-src_install() {
-	for i in $(find "${S}" -name "*.ko" -print); do
-		local val=${i##${S}/}
-		local modules+="${val%%.ko}(misc:) "
-	done
-	MODULE_NAMES=${modules}
-
-	linux-mod_src_install
-	dodoc ChangeLog README.md TODO
-}
diff --git a/dev-util/lttng-modules/lttng-modules-2.12.8.ebuild b/dev-util/lttng-modules/lttng-modules-2.12.8.ebuild
deleted file mode 100644
index 674dde397d1a..000000000000
--- a/dev-util/lttng-modules/lttng-modules-2.12.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="LTTng Kernel Tracer Modules"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BUILD_TARGETS="default"
-
-CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
-	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
-
-MODULE_NAMES="true"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if kernel_is lt 3 0; then
-		eerror "${PN} require Linux kernel >= 3.0"
-		die "Please update your kernel!"
-	fi
-}
-
-src_compile() {
-	BUILD_FIXES="KERNELDIR=$KERNEL_DIR" linux-mod_src_compile
-}
-
-src_install() {
-	for i in $(find "${S}" -name "*.ko" -print); do
-		local val=${i##${S}/}
-		local modules+="${val%%.ko}(misc:) "
-	done
-	MODULE_NAMES=${modules}
-
-	linux-mod_src_install
-	dodoc ChangeLog README.md TODO
-}
diff --git a/dev-util/lttng-modules/lttng-modules-2.13.14-r1.ebuild b/dev-util/lttng-modules/lttng-modules-2.13.14-r1.ebuild
deleted file mode 100644
index 3309c26ea9f4..000000000000
--- a/dev-util/lttng-modules/lttng-modules-2.13.14-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump the following packages together:
-# dev-util/lttng-modules
-# dev-util/lttng-tools
-# dev-util/lttng-ust
-
-inherit linux-mod-r1
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="LTTng Kernel Tracer Modules"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-S="${WORKDIR}/${MY_P}"
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-
-KEYWORDS="~amd64 ~x86"
-
-CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
-	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
-MODULES_KERNEL_MIN=3.0
-
-src_compile() {
-	MODULES_MAKEARGS+=(
-		KERNELDIR="${KV_OUT_DIR}"
-	)
-	emake "${MODULES_MAKEARGS[@]}"
-}
-
-src_install() {
-	emake "${MODULES_MAKEARGS[@]}" INSTALL_MOD_PATH="${ED}" modules_install
-	modules_post_process
-
-	dodoc ChangeLog README.md
-}
diff --git a/dev-util/lttng-modules/lttng-modules-2.13.15.ebuild b/dev-util/lttng-modules/lttng-modules-2.13.15.ebuild
index 3309c26ea9f4..30ada94262c5 100644
--- a/dev-util/lttng-modules/lttng-modules-2.13.15.ebuild
+++ b/dev-util/lttng-modules/lttng-modules-2.13.15.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
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
 	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
diff --git a/dev-util/lttng-modules/lttng-modules-2.13.16.ebuild b/dev-util/lttng-modules/lttng-modules-2.13.16.ebuild
new file mode 100644
index 000000000000..296203d71428
--- /dev/null
+++ b/dev-util/lttng-modules/lttng-modules-2.13.16.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump the following packages together:
+# dev-util/lttng-modules
+# dev-util/lttng-tools
+# dev-util/lttng-ust
+
+inherit linux-mod-r1
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="LTTng Kernel Tracer Modules"
+HOMEPAGE="https://lttng.org"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+S="${WORKDIR}/${MY_P}"
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+
+KEYWORDS="~amd64 ~x86"
+
+CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
+	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
+MODULES_KERNEL_MIN=3.0
+
+src_compile() {
+	MODULES_MAKEARGS+=(
+		KERNELDIR="${KV_OUT_DIR}"
+	)
+	emake "${MODULES_MAKEARGS[@]}"
+}
+
+src_install() {
+	emake "${MODULES_MAKEARGS[@]}" INSTALL_MOD_PATH="${ED}" modules_install
+	modules_post_process
+
+	dodoc ChangeLog README.md
+}
diff --git a/dev-util/lttng-tools/Manifest b/dev-util/lttng-tools/Manifest
index 37eb8eb98551..f1d95490141e 100644
--- a/dev-util/lttng-tools/Manifest
+++ b/dev-util/lttng-tools/Manifest
@@ -1,2 +1 @@
 DIST lttng-tools-2.13.14.tar.bz2 1932238 BLAKE2B f079051502d01ffc67c4f8f0bbcdf3a4428546c652dcc352918c4908a37aeb510dd66309306cec835297c8d2f276e5cbd22ea4efef6866d3c0c0cf8651d68ef8 SHA512 61bdebb539cfb4eb61c9806e98742f39dc032d849b03d90cdb98d1891bd5bfbd0cb1f54bbc7bf79a11505ce7fee558497312d650bb41f11f739884e7cb8a750f
-DIST lttng-tools-2.13.9.tar.bz2 1892293 BLAKE2B 51c4824435164196a77c8b6b3072810df83caf488c5fb692f9990b8d743ced2b07bffffa1e5a671149c75f3d96267f9c92f042c6c13503e03894f4c352c1733b SHA512 ff7a395d9af3fc44561be24163a84ce27ddd1338f7df2805037645b98c4ad17496553f17b8f0ede7bee967d630b53000c080a91ea8e1ced25ce86b010941b94e
diff --git a/dev-util/lttng-tools/files/lttng-tools-2.13.9-slibtool.patch b/dev-util/lttng-tools/files/lttng-tools-2.13.9-slibtool.patch
deleted file mode 100644
index 634bd388b44c..000000000000
--- a/dev-util/lttng-tools/files/lttng-tools-2.13.9-slibtool.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-https://github.com/lttng/lttng-tools/pull/169
-https://github.com/lttng/lttng-tools/commit/bb1c9fc3f89c2faffb0228c0b77e32653e018a23
-
-From bb1c9fc3f89c2faffb0228c0b77e32653e018a23 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Fri, 8 Mar 2024 08:17:37 -0800
-Subject: [PATCH] Fix: baddr-statedump: use $(LIBTOOL) --mode=execute
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GNU libtool inconsistently places the compiled executable in the source
-directory or in the .libs directory where a libtool wrapper script is
-placed in the source directory.
-
-While slibtool will always place the compiled executable in the .libs
-directory and a wrapper script in the source directory.
-
-This will result with a build error when using slibtool since objcopy
-needs the executable and not the shell wrapper script, but this can be
-solved for both implementations by using $(LIBTOOL) --mode=execute on all
-commands that operate on the libtool compiled executables.
-
-Gentoo issue: https://bugs.gentoo.org/858095
-
-The GNU libtool --mode=excute is documented upstream.
-
-https://www.gnu.org/software/libtool/manual/html_node/Execute-mode.html
-https://www.gnu.org/software/libtool/manual/html_node/Debugging-executables.html
-
-And the GNU libtool behavior of when to create a wrapper script is
-documented in the 'Linking Executables' section.
-
-  "Notice that the executable, hell, was actually created in the .libs
-  subdirectory. Then, a wrapper script (or, on certain platforms, a
-  wrapper executable see Wrapper executables) was created in the current
-  directory.
-
-  Since libtool created a wrapper script, you should use libtool to
-  install it and debug it too. However, since the program does not depend
-  on any uninstalled libtool library, it is probably usable even without
-  the wrapper script."
-
-https://www.gnu.org/software/libtool/manual/html_node/Linking-executables.html
-
-And the inconsistency between GNU libtool and slibtool is documented at
-the Gentoo wiki.
-
-  "One difference between GNU libtool and slibtool is that the former will
-  conditionally place the compiled executable or a shell wrapper script in
-  the build directory, depending on whether or not the executable depends
-  on a build-local libtool library (e.g. libfoo.la). Where slibtool will
-  always place a compatible wrapper script in the build directory where
-  GNU libtool would have conditionally placed the executable. When the
-  wrapper script is created both GNU libtool and slibtool will place the
-  executable in the .libs directory within the build directory.
-  Consequently build systems, ebuilds, and other users should take care to
-  avoid scenarios like installing the wrapper script to the system instead
-  of the executable. In these cases ideally the executable would be
-  installed by the same libtool implementation that compiled it."
-
-https: //wiki.gentoo.org/wiki/Slibtool#Installing_or_using_binaries_created_by_libtool_manually
-Signed-off-by: orbea <orbea@riseup.net>
-Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
-Change-Id: I03102ed78af835daa9b9a5836c2979a5f5d4bd8c
----
- tests/regression/ust/baddr-statedump/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/regression/ust/baddr-statedump/Makefile.am b/tests/regression/ust/baddr-statedump/Makefile.am
-index f8fe26395..d37dbb6dd 100644
---- a/tests/regression/ust/baddr-statedump/Makefile.am
-+++ b/tests/regression/ust/baddr-statedump/Makefile.am
-@@ -19,11 +19,11 @@ EXTRA_DIST = test_baddr-statedump test_baddr-statedump.py
- 
- # Extract debug symbols
- prog.debug: prog
--	$(objcopy_verbose)$(OBJCOPY) --only-keep-debug prog prog.debug
-+	$(objcopy_verbose)$(LIBTOOL) --mode=execute $(OBJCOPY) --only-keep-debug prog prog.debug
- 
- # Strip and add debuglink
- prog.strip: prog.debug
--	@cp -f prog prog.strip
-+	@$(LIBTOOL) --mode=execute cp -f prog prog.strip
- 	$(objcopy_verbose)$(OBJCOPY) --strip-debug --add-gnu-debuglink=prog.debug prog.strip
- 
- all-local: prog.strip
diff --git a/dev-util/lttng-tools/lttng-tools-2.13.14.ebuild b/dev-util/lttng-tools/lttng-tools-2.13.14.ebuild
index 77e87b71801b..16f06a6d8acb 100644
--- a/dev-util/lttng-tools/lttng-tools-2.13.14.ebuild
+++ b/dev-util/lttng-tools/lttng-tools-2.13.14.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
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+ust"
 
 DEPEND="
diff --git a/dev-util/lttng-tools/lttng-tools-2.13.9.ebuild b/dev-util/lttng-tools/lttng-tools-2.13.9.ebuild
deleted file mode 100644
index d24f0b3772ae..000000000000
--- a/dev-util/lttng-tools/lttng-tools-2.13.9.ebuild
+++ /dev/null
@@ -1,63 +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
-
-# Please bump the following packages together:
-# dev-util/lttng-modules
-# dev-util/lttng-tools
-# dev-util/lttng-ust
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - next generation"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="amd64 x86"
-IUSE="+ust"
-
-DEPEND="
-	>=dev-libs/userspace-rcu-0.11.0:=
-	dev-libs/popt
-	>=dev-libs/libxml2-2.7.6
-	ust? ( >=dev-util/lttng-ust-${MY_SLOT}.0:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	pthread_get_name_np # different from pthread_getname_*, not on linux
-	pthread_set_name_np # different from pthread_setname_*, not on linux
-)
-
-PATCHES=(
-	# https://bugs.gentoo.org/858095
-	# https://github.com/lttng/lttng-tools/pull/169
-	"${FILESDIR}"/${PN}-2.13.9-slibtool.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# bug 906928
-	use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE
-
-	econf \
-		$(usex ust "" --without-lttng-ust) \
-		--disable-Werror
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/lttng-tools/metadata.xml b/dev-util/lttng-tools/metadata.xml
index 70a66c71a336..83683ac4848f 100644
--- a/dev-util/lttng-tools/metadata.xml
+++ b/dev-util/lttng-tools/metadata.xml
@@ -10,5 +10,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">lttng/lttng-tools</remote-id>
+		<changelog>https://github.com/lttng/lttng-tools/releases</changelog>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index 9cb46eed5c4c..a398c767a940 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -1,5 +1,4 @@
-DIST lttng-ust-2.12.0.tar.bz2 853127 BLAKE2B 6a6655a4aa33ec6318255d05d0e000c19fb66d4049873f091b8e19f3f9ea0c15731db70af77dbab1d597edcafcd745f1dae2670cd38759c9b54ea38b1135b590 SHA512 d69772170f57b9669b99cea372ca537777151a31b82002e1e5ec80da3ceb302c23f0f85d63a2c95c90a375b879e266aa5297e7d6444050dd40feb1253d863801
-DIST lttng-ust-2.12.1.tar.bz2 859667 BLAKE2B 474d03ac0d3c1102ef085230659545f3e12bc0847cebab598f2998741741cb98ac139812a296992614dd90ed9478040ee0567822eb20e960e0a6489836274394 SHA512 6d5116a88be601f96513535ef7dfda409780cbacaab0831dc76b86070da60d5eac719d7020f70a6821e1c6dbbfae05ddf5a431662ef5a714fc200c2216eeb80e
+DIST lttng-ust-2.12.10.tar.bz2 801458 BLAKE2B f9dd2242e0979334c3bfaf5146af1b473245112d828021e93d747a1b1ddcc18db131f4d5f517f7c330278a986c5770f5338d15275ecc656acb1a19ad399e5047 SHA512 f5c05024fcbef6f0f634fb53c86e61b663a9859ba28c0c800e519756f68204062c1d9c930a960c35fb0c4de079e2c09b43eb556ea2fc269090736034251043c1
 DIST lttng-ust-2.12.9.tar.bz2 800795 BLAKE2B 467500f7fd0f473a5cd7af6c23e8f0f83516d57ad573f92c48354bbe1ea1d2fea08bd20d7675e7698adf2284a5069fd23d3a929bc11df0ba157a99091b543777 SHA512 5edaa6c015bccd710e7bfea136398e8bc784946c22933a011f4b31b9c13fa772c4f03d0c42543bf0d08a810922498ff1fa56d4bccd9c5b8c4b14925c849c6c9b
 DIST lttng-ust-2.13.6.tar.bz2 1351915 BLAKE2B c350a7302e38035ef7c6727ea942907ec606c88862ae875bed0a7c833f233b4159405bcb7a41549dccf3d79491151066d593c52d9f06b95b61c345ccbace62f5 SHA512 15458f8dd0ad6fa96a9cf7569ffabadfddcaa70b822b69b39d4d7dfba3701c9489706b06f12f9d7e376147299fb3cfc6fe1213d46d510bdb7b3dc834271da55f
 DIST lttng-ust-2.13.8.tar.bz2 1358168 BLAKE2B f4f623c9c1a37395312270803c7e845ba76d6075c10cc6bdcfdd6f35d0cb6db9c303a9fb8c33a50e201c84fd772ed60611bfce9e962e27c4d5820b6ef0ac2d66 SHA512 f61f7e1633051a4d515ba28d4945b96a84eab8a8143ef698bbb6857cbaad1acbe238041e43f04d9818bac43f59023be3f3c2154ecf75f180d8233c9d7f65c555
diff --git a/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
deleted file mode 100644
index 687858e63cf2..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="examples numa"
-
-DEPEND="
-	dev-libs/userspace-rcu:=
-	numa? ( sys-process/numactl )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	default
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable numa)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/lttng-ust/lttng-ust-2.12.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.12.1.ebuild
deleted file mode 100644
index 7990a6a9c15b..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.12.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="examples numa"
-
-DEPEND="
-	dev-libs/userspace-rcu:=
-	numa? ( sys-process/numactl )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	default
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable numa)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/lttng-ust/lttng-ust-2.12.10.ebuild b/dev-util/lttng-ust/lttng-ust-2.12.10.ebuild
new file mode 100644
index 000000000000..8c09f4a06a7d
--- /dev/null
+++ b/dev-util/lttng-ust/lttng-ust-2.12.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="Linux Trace Toolkit - UST library"
+HOMEPAGE="https://lttng.org
+	https://github.com/lttng/lttng-ust/"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples numa"
+
+DEPEND="
+	dev-libs/userspace-rcu:=
+	numa? ( sys-process/numactl )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_prepare() {
+	default
+
+	if ! use examples ; then
+		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable numa)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/lttng-ust/lttng-ust-2.12.9.ebuild b/dev-util/lttng-ust/lttng-ust-2.12.9.ebuild
index 2c87b95758a9..8d12f9a4f415 100644
--- a/dev-util/lttng-ust/lttng-ust-2.12.9.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.12.9.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="examples numa"
 
 DEPEND="
diff --git a/dev-util/lttng-ust/lttng-ust-2.13.8.ebuild b/dev-util/lttng-ust/lttng-ust-2.13.8.ebuild
index 21876345d14f..df4c1d42dbf9 100644
--- a/dev-util/lttng-ust/lttng-ust-2.13.8.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.13.8.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}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc ~x86"
 IUSE="examples numa test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/massif-visualizer/Manifest b/dev-util/massif-visualizer/Manifest
index f9ef5244b7f7..b4ab5f4abfc4 100644
--- a/dev-util/massif-visualizer/Manifest
+++ b/dev-util/massif-visualizer/Manifest
@@ -1,2 +1,2 @@
 DIST massif-visualizer-24.08.3.tar.xz 279480 BLAKE2B 7ce98cc243f78f41b5df36d50d0493682e4931f7f433da44f363978dbeec8ed2d9b6e5ec51403a31b88201911274b4a4c3073d48a97060ea5092901d7ada9ed0 SHA512 42c27437ed12f9d3f21f5a3dd65e049bb417151f55f552135d3bc5083522ed35c793923f6edcd62f337887fd63194f253f27e46c3d40199d41f59d87e567a25f
-DIST massif-visualizer-24.12.0.tar.xz 279588 BLAKE2B 0327d8c2bc155b3ff9e9b53067a4d64195e7a832d17198d504043ebb7e35ed12b26e93aceeb326712070629206f59e26a788776f144ee7227dc28ccfab5ce2e9 SHA512 3e09c07ead7c5df973b5549fb4fc5b70aacc10e02a1dc22cbfaef6b5bbfeec1f9f245f6d06b190eee5b8c2dd7965f0e3821eb1a18bc03becda0089be5bc4d9be
+DIST massif-visualizer-24.12.1.tar.xz 279640 BLAKE2B f108525f37abb46ab106a95084aec4eee8fec6702089c893561c64548031723f34bf40f726934ad5bf4bd7e21a5338fde5badd95f579c209754acb8aaab030cf SHA512 4c06bc2541516bf6e7f77be7a120bb7399a793de097f70c4ce5509beb40656ccbf2e1e6f2bb97b2f48dbe75cadbd2147380737fa39be6b5406772c32ba324496
diff --git a/dev-util/massif-visualizer/massif-visualizer-24.12.0.ebuild b/dev-util/massif-visualizer/massif-visualizer-24.12.0.ebuild
deleted file mode 100644
index a7e325591ca3..000000000000
--- a/dev-util/massif-visualizer/massif-visualizer-24.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Tool visualising massif data"
-HOMEPAGE="https://apps.kde.org/massif_visualizer/"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+callgraph"
-
-DEPEND="
-	dev-libs/kdiagram:6
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	callgraph? ( >=media-gfx/kgraphviewer-2.5.0:0 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package callgraph KGraphViewerPart)
-	)
-	ecm_src_configure
-}
diff --git a/dev-util/massif-visualizer/massif-visualizer-24.12.1.ebuild b/dev-util/massif-visualizer/massif-visualizer-24.12.1.ebuild
new file mode 100644
index 000000000000..8f249f66c29c
--- /dev/null
+++ b/dev-util/massif-visualizer/massif-visualizer-24.12.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Tool visualising massif data"
+HOMEPAGE="https://apps.kde.org/massif_visualizer/"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+callgraph"
+
+DEPEND="
+	dev-libs/kdiagram:6
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	callgraph? ( >=media-gfx/kgraphviewer-2.5.0:0 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package callgraph KGraphViewerPart)
+	)
+	ecm_src_configure
+}
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index defad02b97e3..52f5a7c1a765 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -43,15 +43,12 @@ DIST cab-0.6.0.crate 28390 BLAKE2B 7eb33501c8f3715bf7a3b4d83839d4e44235441e6a633
 DIST camino-1.1.7.crate 36204 BLAKE2B ea87922e77401a23f25d66af303f39c568f37377e4f0cd6d206cb7b175a51528680bf67897e3b9830d276acb1b156b7c66e149b75370be202cb99fbbcea54233 SHA512 b82c809bd52549d16e286d514b5dbb1d640633b7ff05412ce3539e543de9c69d99bc3f62597b94fc0cedd7c8034ebf73663a6f647e46409b778baa4877928c45
 DIST camino-1.1.9.crate 37552 BLAKE2B 28b21517730db408598f83e269ee8aa4dc5388c4b491779ebb6e76c478d407f929bda6906d88d429828d7f01be1762c72ecbb6d8c7aa4a1d1906109a17b45df1 SHA512 27a6a3cf72c46f15a6017aea44a048f2a8eb577aa9d2a088141b1cb7479106152ef0bc00a6cea9332c4df4d0c54aa6bd3dc21159f15640e347407c15a1bbf7ea
 DIST cargo-config2-0.1.26.crate 63535 BLAKE2B 9cfe8842ecb8085240adb5a428ffc3a7260d4227c11edab3bc280dd8a9ba7f08f5ad3600224fe7d1b7d6fa4b2a19125656c06546bc5a3398b4e5722ae96bd9ad SHA512 4e30355eb26e796098803df43f199f2ebfbe510f467e32cf39b3784c9b03156551d183eb46c5f05cceb41f9761979aac11746be6b2473a53e49cd066794771d1
-DIST cargo-config2-0.1.30.crate 67686 BLAKE2B 1c50df37b71d66e0576a6494438586cb6ebff69019daf16b962d36c3b28c0e4ad53feb77ea74814354e8fee0e28d2f57dc6a38f087996cb7571f935143dd4339 SHA512 c2a0d910f974356ebd995d1e0a687c7cf5a8a76d52cb085a1d753f15b4c358e4f76c2182570a6c59eeb0fb46785e81fa787dfb9fd5734202f07df29043010fe3
 DIST cargo-options-0.7.4.crate 18149 BLAKE2B 0ab8537b5c6d05f80e78209f9656dbc8cbaef0d2ad14de561886d573ce7ac6d1357d082177d6ea83809ffe5b85795ae8f1ce1529d063ef916b30598c16b71499 SHA512 241799e4d60bdcbbdf45fd203851165b84fc571179bc209b877153b83f83d9913203276ffbd5de378abacacfa4d1b41f84e3cec9cd78520e24b36c5e5e673580
 DIST cargo-platform-0.1.8.crate 11813 BLAKE2B b074b49e08b2b93e93e08276f2a79546fe1f9ba0a52b3b4ef0ecdd28fa3fe5e842c0291fed158a1a12b90804e0172d5419b7603fd0d5f87f062f44dcaf3428f6 SHA512 187acf1b8cc81078ede3353997bec9010df32aba82f56f9479d4c8eaa13436590a16f3ab6ea11ed2b31d1d1d2299d824d9ad10f04bf5281c92372cc8334b0dd2
 DIST cargo-xwin-0.16.5.crate 28602 BLAKE2B 2077c64cd3ec649f9b74a024e6ea6818a212f12ab85301de462d556c0f06d959e7af3efb4a2d1ae2cca8ead95954c52b89b41dc1f63e8fded6a9a6f7bc1676f5 SHA512 bc1288ada6deb3bca456f5c382d4249c42ded462b9bb9f63f088553acfd3dd38f757ced4fbf1d77887ad3867ca10793a3ef8a97e17652869147fc37608ab1365
 DIST cargo-xwin-0.17.5.crate 31188 BLAKE2B 79956f9cdc57ff5f798b85851214accb882c33c8e06c9e22afcf6a05c494f7ec983ec5bff34e3f6baf4a9ddcc5ccd95844ed3d91af89946b48c66114595ed2f5 SHA512 e5a3a3ad704bc738b1eb4aa44bc5eebc8b944f89f57e8297fc4978a3c921314294b48d6f347025812ca683ea3ed12737dfd245444be92a7d8a8252bf86654a91
-DIST cargo-xwin-0.18.3.crate 35638 BLAKE2B 0f969099f611b6d6154f9c6aee1d4a807e84cb18574c6bec14135d1ccd128fc7f94db7ef66a980aef7898ae20c969cff8407a13875ec136d7d253b7cafe23b28 SHA512 23a3f612695dee7c7fb191c54ae9bde845555530803b80f4e72295e9f73c01c8e6543ea1454c3fbe49d6aa23dc069a5ceec7d1862f56d41efa1547629cc5bd54
 DIST cargo-zigbuild-0.19.3.crate 41006 BLAKE2B 655e209d108efb665df0aaa45806e28d10a9fd7a0b64c864c0c610b82eb5e62b6007593da04215cd4299279ed77ed5e227b323fa485369934733797183c892fa SHA512 0d26df1706ab21f520a29725719b3815e82bc92e99dcb967f2bc8e8a3d9da854469beb3e943ca9e23f72638093f21d488af150498755ad5ad1938c585960f741
 DIST cargo-zigbuild-0.19.5.crate 43145 BLAKE2B 359d69b730b333222f938f735510eebc790a9108d7a94f6905afc550dfe5c4bf7532a67bfd7083f28cca490fc26ba1f56b743d43d361937aa3869bf37c0f35a3 SHA512 e01846ece4e235ff08c4ddaedfe96ffeba70c8a9d83406d717193317e902a3a67560552ef6f92ad5eaa5fdabaaebdd17b07355c6983f6b771aa2f97045c599e0
-DIST cargo-zigbuild-0.19.7.crate 43219 BLAKE2B 8c38d585963d3293d25359b33fd7357ff2789dc558a0c38a2accea6b33ad86f4149fddcd723f6dc89db3fa24cda43c99fd041b339a05f5d37c815b8d0c20c566 SHA512 fc0af4029fac51f0c483f540c5ad10ab7c669a3642b4bbf701cd0ca48c018a3dba7f415f315efc0ea828c63ecba6718e695d80c58da89a94e549f8a668cf99d3
 DIST cargo_metadata-0.15.4.crate 19993 BLAKE2B 33bb182a4fbf453be323cd657e0927d7ae8f4cada172c482d96ba959155aa0bd5fc392d4e0a6d4a869456be5de8756c92a4ee0642d60db992aca6d8adadb8f0a SHA512 dae54e7d21642a12fe967d832769f2310a18903a0a46694dd441974f037d8a53e148bae2668a177478b91629c5da736ce56aca3e140d442267ff0bc65bb984a0
 DIST cargo_metadata-0.18.1.crate 24535 BLAKE2B 9d0018e28a3941e269dbd30291054a882a960905a43d4818c874250356a6c203bf08ed77a8041f08607390b2a382864701c519d71a0b88818ee59c6322c74e86 SHA512 43f87d2b84597ec9a27e9fccf06ec5f2630a0147a9c85779622c25493bd61268c266643f8206a17d76a16329af85f0cc563a9af7e17ca77024c0eaf788555f7d
 DIST cargo_metadata-0.19.0.crate 25876 BLAKE2B 5c0fc4e977e52729304d5b99fc03c577916c9997535b083524b95625c9ba6ad073f56e3ce32b547eee11f242cc18b3a91ebe5f2ca9ecaec81317f5ecda6cf7d7 SHA512 1ff4b48369427a186245e4dbf6d516eb110a37331ebd3c344fad716a920f62e900f6b7e98bd0809139693326647cfa5c630566c24124422290bc8498d3f43b1c
@@ -125,7 +122,6 @@ DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d7705
 DIST fs-err-2.11.0.crate 20449 BLAKE2B 8ffe7c49f4733edcd30ade9b75064e9fcf4ed1c87620d629fcd44dbf87e85e28d23fbaad05a50d8baca877f3eb9e088d8dd744d2ca092c443735fa7129609c9c SHA512 a8bf948b94e7325c583035a04d30c8ecf33d543ac366a550d757d65a0d7575d501e01dd1a80c8b0c278f80b9f3298f8dcd03c3c636810fbfe6a4a910ee8915a7
 DIST fs-err-3.0.0.crate 21040 BLAKE2B 73f885b5065b3e35ca1c31c2bb0fc7cb9febf9ddad271d15f566b2bca2d2fe21c9826b8cd790eafbdb6c7a94cc2ffb6c08eb6464431d49409079653cd69718a7 SHA512 83ebecef63401a0c3d4cee93de0436f52886fc6d9be02fb2020152e52d0f40bcc32f5042c3d607b16182e92d9aa7acaeb7c15f77040b990e893dff93cd8458b7
 DIST fs4-0.11.1.crate 19443 BLAKE2B 5006e20b3695ae422c7c3d5b7fa3a0856346e5b8b35120b8237d645103c9c7833ef4ec60af8e77ef1b1fc65fecdd20141067d8359a992ad285d09dceeec34a27 SHA512 0020cabab9bf3f3bff6400f9bcf5e763d434ea96d25b4c4e4a7dd0420d71a6a9ea3d532dfe363370a0b69f8bbe60f499ed3b56e23e142e2398ea53b413ecd15f
-DIST fs4-0.12.0.crate 19854 BLAKE2B 3c0c9624e4fbcad2d885179a4798b8110d2286a6f970f08dda35876d9cc776262975870b98419e1199a157cb0b32135867a4aa872d0f9de4b786227ea8cd4352 SHA512 f75e8f00831eee1aa2d22172a2f3bbaf28c2bea526f3a48dcefb659bcc0010fe8dc2480b94794b421adf32dd1d6b43f33827a998bca004a74958985d9d76c0a2
 DIST futures-0.3.30.crate 53828 BLAKE2B 4e595639500f7147ceb994359ef1656ed096ea679409a5721c05ff84ba439fe4e82563a7cf8dca9aed4cd16b03e89ba1385b0a34feed9d4923871225e131b91e SHA512 98fc67bf1047609c8bb0763c00ab9cb39b6a6d0cb7d993bce4966ddc2492a6578b789e98095981b207ddd73ac4b1dfcd5224b352a0e970eed347537c6fbea43e
 DIST futures-channel-0.3.30.crate 31736 BLAKE2B 57461dbb723fd53daa07b2fe6164125508cc3901e0138d2a60da5c814ade415a3611baa45c71487f1853812282ef358c132785ff40c630408e8544d57eee3483 SHA512 689531748821529c528772a6dd0f27362078ff5803d2e0b431ee5a0ecf8787b5a15262d65d52f48486ded46b88f7a9c477ad95cc2c5a3e8f5f9b9f53f367832c
 DIST futures-channel-0.3.31.crate 31971 BLAKE2B 2a59ebb73f998ec307bef01e997bf2922556d6dea10e2e6e8da9e1b4cd05a8bcfeef01bc1cc57d79c39bbd98b8a0d26871dca5c7641a9d4e9c2bacbb3feb4eeb SHA512 87e49e661cb12c1e03a07d3c94ca9bf5954344a51fa11639a118f5a49877c883387343af54639ad80e7196062a77fa7c9b9aff9804fb1e6ea3d0eb09efc53c69
@@ -157,19 +153,7 @@ DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a
 DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST humantime-serde-1.1.1.crate 7886 BLAKE2B 4c66a483276e0cc5f4bd82fd49cfa0ee40c8ceda753919cfb7a8c794d098e9e4e851643fbc42a209d6ab00c5c62d9edc81c3bb1f6da218a09eafc96da9b566f6 SHA512 0bd72554e700f89506d2d1c8191832aed0065ea02aacb99e27139a60c883d3dbabb1fc3d60f499f5aeb20bd155fdcf21dc671aec1ca68d4041bf98ddf324248d
-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 ignore-0.4.23.crate 55901 BLAKE2B 8c5138e723cbccffe84aa215b2e73daa18d8b2d39136a901ba1514def3a67437f79d932e4762578dd1b28dd8360a397aaba29ab8bb67a93a587a1c71cf5d1aa1 SHA512 ae354b00994ae8570751bc5c09167edd0e2891709d4c4878cf75b24619421d23a1b83e28886d54ed9d31aa427f49153e9a5fc42b5de7262abda20c1c0061b299
 DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
 DIST indexmap-2.5.0.crate 85919 BLAKE2B 766da0a2ddc406e3fb1a70a0bee00141045ff72b52cc412adf05972ccef59d416f502c429dada111461cb522a5c442087e01d8fb235c2f1fd5493adea00e79dc SHA512 c4627d43b1bc5c5fd64861d1a7ed66255ec3f790367028b2758a40751286d6677da7170cfb04dd88ca4c2d163df621583d2e0dc4e9db6d7ed9bd0cbea42b1729
@@ -200,12 +184,12 @@ DIST lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe88
 DIST lockfree-object-pool-0.1.6.crate 12309 BLAKE2B 47c4b3ade2102e8c5154404d6eb8bab943f0173bab01764192a2ba76e4dc454a7763a7e2c6a3df6a72f2d0971c419bf69af4f81a50636c75cac2dd4c692a7962 SHA512 d4a51c7e92184ded686ebeb06467e26905b12dfda6b4da28f230e73901d7406d611798d823c0e1fb5e2c9efec5ab3eabfcd8aadbfe9e319046b3cd0d31008e90
 DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
 DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
-DIST lzma-sys-0.1.20.crate 760045 BLAKE2B 1f66d32008178c218575fba12df95a2cdc448e080c0a81ef4617f35dde09f0d56c86c28050db61c2ae7b464d0eaed7dd8c59a1fa605b39ff8c329e49165cd922 SHA512 393908b4e3006e4d9948a077d84ba7f5004765c4cc0f854e04847e504a246ab9a8e761fa48d4f211a7ac08dc119d950481da1ed1a480778d6b6e9b446a697279
 DIST lzxd-0.2.5.crate 22728 BLAKE2B 5822d0d453def5b937e7414e055b637e6aa018a4ced08c10e88566c951552e5f8b01b1a08f25dd585b9d1eed4c34885f4eeec37c8b9e2472bb83ceb428cb3ffe SHA512 0a558d347f1101e82c861f3f6b8d3976ca57a4dc577e328b916ddfa4949e5a4695c89693f191c8a6664c15d4da8caee10d44ab0a79974cb2eb5e4e73785e17a2
 DIST mailparse-0.15.0.crate 37293 BLAKE2B 3ef9c0f3e65288066a1a792b3ad5bf4ca08126573fd15d9360b2d7748ba623ee0bf3eff1073b3244f1ca5007c2ea9c4e88310dc3809826ae940b13091df47134 SHA512 85899a2a65d195778615e3cebd2e5b6ad2ea3fd2b5a8929caab7fbd3e50306a5c99328deb7ffad9b3135f3fafca4c4e74f372e42a88d2785ade215334b92b416
 DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
 DIST maturin-1.7.4.gh.tar.gz 511488 BLAKE2B 008b2d67d553479040fcd3062b93ca12dc6f2b98c3d6cb43cac7ff0d8e4772417b99fbf2a73ed96cfcc8a7372b37d845e8485ba0afc80342943a10d716492377 SHA512 72fb43a10d3cdf35eca224232c59723bff5b9230c7d40ff01537e1ba869254b4b6e9a0c52e8b7154f7b74f0f0b5bace4e7bb9ac5257c9fbc04750160791c35e3
 DIST maturin-1.7.8.gh.tar.gz 526856 BLAKE2B 0fcd40dbf20cd961aa97e936b58ea79aceddfe6175ba4c1d1b413c224c889f393719dffe583859c35894173801cbd5303093802c5a4986038eb00a1f4ff3f3d4 SHA512 11dd229bc0a240fe915ae4aa69d5dd10032ea41782cb2bf76e77e58a8d474543b133a78d6b24a0383ef281f83122f34e1e0c332227720643b63226c18e318445
+DIST maturin-1.8.1-vendor.tar.xz 28014132 BLAKE2B 0fdaa5c2005645a964594431ea29faeed2aa703f8e33776fe1c02f865a36a11793e8aad5c18f295e97085e7c1e2fb26ada8968703920455c78327b23a9338182 SHA512 3bf23cf509ba416002d8a7b2a0cd2e6b2b6ec98ab335fcdade501a99b068cbf6db5a3665ca918b1192839cc0377ede0d150a657a104a98cc85e90a83d030d174
 DIST maturin-1.8.1.gh.tar.gz 542041 BLAKE2B 0ded1146c03d1139cc826bff520dbed4f27f4c0d2fa58a1336b075d222bb73881ec455d9b8480206c9f25756d6680a3918db4b4043fb6a63a023d94d23c5ea48 SHA512 2f07ced149fd59035c3acddbc4449cdfa59f8680d1784a68fbb71414a8a6309d3e138b10a7aeb3ca1f35f52ffe04c0e557e4636c84b7d8c60cd012798e3ec041
 DIST memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
@@ -267,30 +251,23 @@ DIST psm-0.1.21.crate 23126 BLAKE2B 5972b4bad729d3c8842d4d616b1a469fd59ac7cecac5
 DIST pyo3-0.22.0.crate 535742 BLAKE2B 772a4f8b718bbec32faa3dac4cad07a5b452fb366280753c3316d932663bf367192483fb5cd0bd405321128e67157b982eaa89264685739a141e021f0f7e2b72 SHA512 44e0237fd3a8d4c7b082c48a5c8a52d8f4cc4673d134f680e29504bb46d870015fa210da34de4c1998defbcd4afdf2aaea4e148fbe093e4b2c8b0d064cd48da4
 DIST pyo3-0.22.2.crate 538342 BLAKE2B faf347695117f9fe0ebe5cd7f6aa1b0dcfe718343875d6c06438046deccc1075f104d2a2413dcda41ae9827bc363aa147057b45968f6634f577a6a4510a4bb8e SHA512 e8bae09059f50ffe477dad44499cedeaf3a734665f0fd8e8bd4b44f48578d21e4bdb8d55ceea00c5a27da750761842ddf89cfcecdecb2e7a4a17ab192259be9c
 DIST pyo3-0.23.1.crate 1072552 BLAKE2B 1d83f3d853eada9d10e7502c76ba665ccd75afe51ad8f09e6b72d076aba4eab5da535bcd9f0d636d9a5a120dd632d67bf89b65fc4372511b042a74bb697be56b SHA512 6f0f457669c0d5d54196e4d7f10a78c8ef1f576ffaf01e11fd142634949e9b1e12c8e4dcf041f9bbe21f7e9b4779ff7ac1b625b3d0ecaf8e448b468aaef7b3f5
-DIST pyo3-0.23.3.crate 1073838 BLAKE2B 5e1ce6a5c5232ebf0399b1b969e737cca12f978f445efec9408ea80b8bc6ac1047125dbefa36149c8a904882d6a64dd24a9bd50f1e8de7afe3a3271e1a0f2d6f SHA512 c80377e8673de8b8e51e2423d102dbcc46605a783c13127215916d69fc600efd67ba5f9cca420cb6859124165ec97fde40eb0a0566d8b4b60708e20b8e6e9b6d
 DIST pyo3-build-config-0.18.3.crate 29137 BLAKE2B 5fa645b64f50a078f38cc10a27ed52bd7e7aadd8a069c05ec2963f0b7c869b94d29eddda97cc31d200cf749ab8e2cd9cd1ea00e75620287e9187745ae0e100a5 SHA512 7ccad5f245e84895e147389f05270f32d12f81aba46bcd0dc184b8d62af2ea579efc50383502efda40601c981c4dbcf911aa7d8192364caa2e177ad939062cdb
 DIST pyo3-build-config-0.22.0.crate 31205 BLAKE2B 6b9a0de5f431bfc123628c67da040e146e39353d7b42d8d083e1911929dc420622f8a1276229d89b7780bccd02a8e653bcb85bfa51281e72ddfacebadef5277a SHA512 50341f4e5134a275610a5b86e833d1963a0726c2ddc14f4742053c60ad336ee209e73441aca46c8670920ee47a81c76bbd3f9e6412d253a5b389692ff8f3c1f3
 DIST pyo3-build-config-0.22.2.crate 31225 BLAKE2B c2e6a3d3d23b7f2f51bcbf1214ab20a298a1e62f85c9af3dab1e77b09f20b657b576feefffb18eb49d438f0ffab525b6bcd1086d500601c327ffd4fd24a719ee SHA512 644c82d30bb27051557efcc9789a81380a64e29bc62abf97de88f42c3791dac74228c7a7d09e0d46d14f07c0475f0bc03fac6ed1367b9a616153e8820b94cbc8
 DIST pyo3-build-config-0.23.1.crate 31755 BLAKE2B 7cac76855763159f61c26bf401545d12a95d8d0970ce4a0ae90e5b7ad1d67747af5414c02b8848042b4e2c2aa773d8cfe3b3db077895d12305097457dbd0ea60 SHA512 ec7b47db39e910760373adf3c035d7bef0cf48595562bf8c70d6ecf98ae3a676f19c94302bcf29dae60797b0dcd180498bf41faa65d6a6a268a0e2b14a309e42
-DIST pyo3-build-config-0.23.3.crate 32509 BLAKE2B 9e77701712589dec4ad74b3d0e66ae82c7a01b6f29ed36231d999aaf909f80def59d17916e1900bfff10b1d36a0a48ed4bf9757c817eb6c6269549f3d04bd6d4 SHA512 db8b0aa86e96eeb30a8ab36a8a1ba917b7b9e6918c2193d7466841ef38e689908f7719a5390d35fb9a156aa6bd84348fa99ea8d5a784faf5c5cc4635d9a3fac9
 DIST pyo3-ffi-0.18.3.crate 64474 BLAKE2B 32bedfb4c7d88e539e958af0dd48af311934a817282a01f860af7cd824fa1e3825c505463b78cda57541bea8ccbbedacdc0f67bef686e6775fab3787c26c6d2c SHA512 55240c7824ad1e5c69e05a31ec03e2064290c89c4c98f06c3ebc38c311a10b1690571c977a103790ddcc9623ac42fbf525fb028e910baedb9acafe39fd6e4a82
 DIST pyo3-ffi-0.22.0.crate 67420 BLAKE2B 65e4ed1a1ce854f37380aa23637a494226b98941b9e3f13eae8f627db0fea248c3cc93c7e594090407ab169cfdb27ab20c47f7004f2b4646103ee34da9a55f31 SHA512 cede32dc8025badcdd6d00b4a1204c6ceb5ad30fa0b637deecca669f2ee2b8961f88d9d867caa8cae59f498dc4e1c15f3b4049c5f47615e215b0f289fc560bce
 DIST pyo3-ffi-0.22.2.crate 67749 BLAKE2B 0a4357d5f4fbcab9717d58b7a80b63a63bc329267d4725136c4eac7c0101095a50e5f840638dde79034e5df99c4f46664cfdc2ad437837643db5d475c5705cb3 SHA512 bf8b83b4790832d99de8c6a61a15a43fc189505dd843011933305f7f93c4f5f4849fb00cc2a6fa410b788645f8ed8c0df61799cf801966a925abb9756b1ab579
 DIST pyo3-ffi-0.23.1.crate 73993 BLAKE2B 4b16d423f6aec1a4b99aad79976dd17a8039e9a37ec35badb50cbd12001f12b88b7223e2dc6bb67257e821ffc935a3f23876f93941f2495e63ac88e631be51d9 SHA512 7533fdd016afb71a482cec07a61b04b0eaee10eb131e11d9c6d650e090a575896fb5ea243880341a2500b0b8442c36ac7792cb6ed39a2f9bd29645556cdc807e
-DIST pyo3-ffi-0.23.3.crate 74064 BLAKE2B ec3cc59e047f780041a05e2bf9fac9d65a6f8ccfb5a3e1c35d7c7918da6ded7e65676888a743d3b4d0fe7b0996e441b722c159eed67360c1e3c5b598160a46cc SHA512 fe4678d4cfe81f065554f0d454345f5f8fde927af1afec9212bb49a67be5080dcc9be84e088612208b7732d2283c2c9168a31b0b6fbd32496520d500e372e161
 DIST pyo3-macros-0.22.0.crate 7889 BLAKE2B 0b61caaed415023341dfd675c578e39cc3e5b2a08eb8c439857c81cf6cb895837f5df28decd7c08a3aa365411ff33a97eb5fe2f20e18427bda133f7df53349ba SHA512 ed9e9d6322fb8d3fd11114899c3ad84ebbc5b5eba58e5aabfc7f9691f02ec053f1c2804cea93d21f2ac9332f5b719b7fee9878faa95f21eb2a2d86f9050c7339
 DIST pyo3-macros-0.22.2.crate 8136 BLAKE2B 9dc97d2f60581db1b8ddb562dac917069525f297fe2cbb9aff3ed34d5a08ea43c112c9c7a450539da3536d753778b5ca506dd1b18e1d6b8a3649fc098e7af439 SHA512 f4f4f6af8dc3aa4bcc1698661990ab2112391ef9502e9f71d86e35bd10dc4e1be309102ebb1b7b32751817a6033168dc0486fdb16b35c626101e69f0de807a4a
 DIST pyo3-macros-0.23.1.crate 8064 BLAKE2B 26f0c07d230c6a749848094e84e1cd86d151b1d7639aa17debef73a49c9d15210a6f5ddf20d832f1175ba9fca690edc2be3244aef286112d2d097677558348e2 SHA512 2897b64b1e6695526a74822adc2e6bd6fccd0185918ab5e87561341c5e37382e77094a9e102bd6c817cddc919ed45c1a133cdc1e947ecab2c851328fecf14508
-DIST pyo3-macros-0.23.3.crate 8085 BLAKE2B bf9ea45a8afe7c663da4f3f5c09c23039bbcf9a9ae350eac2b6581a227864d259b1e5c5ea36f9d6f302c26cd957bb4564562b98785eac49233515d7d54453fdf SHA512 23bfcff285db1276f2dcca9895f7672ec6e5aec118039e2cef3cabca0a85eb97f138391cea4da26eb887dff09c65947b165ca83392edcc8640cb283df2929901
 DIST pyo3-macros-backend-0.22.0.crate 64837 BLAKE2B 4961b8c8720bfc2bbd11089a658d64cb2b1e43e150e622d53490faec3b905344d256b2092238ebb1dd92290583ee7d04a12eb5759bd55276e7042e1c948c71bd SHA512 09496c7285b9faaad820cfea237ef602569de3adeaa3362727182b0cd1c8377ef55c0c28f14eb703ea73a86c94acbdfb1384b44ef32b318a76c730a0430ca233
 DIST pyo3-macros-backend-0.22.2.crate 65620 BLAKE2B 37fba9ff384373418d3a7341acafb8e33308a64e30026f828693a37c32ab4a74d058f2db84d00467a20f9f267c96fe54c0f154d1ebbae92490e8dfc0d29c042f SHA512 0517080c0d5d4ed8136521fd37aa3a192c2eb8cab58545d8543ee4df9cd0dcea19fe0678d5ab90f05fe3eb0f4a86fc2f07b76f2e12ac1fcf7e7c195c2ffa4fd8
 DIST pyo3-macros-backend-0.23.1.crate 70118 BLAKE2B df6e7db9f88bc0fd039c2b0553c3371fcde654bad4528320e0e8cb8ee5ae98b541bf7fe800a872fb5ee43562e07a5b0cd9543f4b5c66b482818107a53e6e49ea SHA512 bb6df78ad712ab6c85535c60d3d5d8aa1b012b175845c6e073ca7b174c558e4a546fed5e62453bc3ce7f46dfaf3b016c01b88e13c8516b18d5024565464c1bf8
-DIST pyo3-macros-backend-0.23.3.crate 70098 BLAKE2B f8ee9c39f743960fc8093bfd53c043fca03b973192e1ab24b48066634e57ea7e74b3ba825ae72380e10569855eec9cb4f0d54f5f8c88dc60e67793257bef8d43 SHA512 9b22e975480f9afc2037587ba85889868a1b543069c2280c65f4cf98e5537708d098bb4885e881c1c9427740c8259988d82176b974900551a4e51097cefb8708
 DIST pyproject-toml-0.11.0.crate 6083 BLAKE2B 187c00dbf90bb32081088efd986d2072d8f8f35eefec683403f5a0a509e4673f443293051b7d828a1d917fd0f7bc308852a77c8bc9b4832d361e32135e9c0a79 SHA512 05a2529bf3ff5aab74ed86c71e1a0a2e8247404e2fab2dd24c04a7e832325c30da915d43a1c2e47ed5143824c24d4c961e19bf078e60687faedcec3a43e53b08
 DIST python-pkginfo-0.6.3.crate 212171 BLAKE2B b943b04300cdb75011aeb2eb6eccbc21eebc7f5ba17780442d990e76797de81f01b1f550dbb3cc4cecd555ec6c7e66c7d1155b2d4bf8d985bcaf4ab06bb6f427 SHA512 71c8a51860459f0a63ba21d2c9da54a7aba0c65d8c5e7edce695ae1b220e33209b43b058ea8f064d56954dc099c0bca495eb7ba6d4458d582383014af94e1bab
-DIST python-pkginfo-0.6.5.crate 212185 BLAKE2B ffade3e84a62714a5bbd41bcdf90c92591ecc345afd305ef46a6789cfb0aa073795e929852beb48c332a0ad06253b6d04d8a17110b91b3f8e271561920994b10 SHA512 15425127fcebbbb14b64ffafe3fbe900185675e4892f60c14d81759aedb0d365d8889e47083e357c8db1ccab04e924e94d4ab963bff031611a0023e72912fa78
 DIST python3-dll-a-0.2.11.crate 83622 BLAKE2B 4bb801097422fc59be57b64edebeaee851dbad6ccb334d2fb672d279458d8925a08ae5a00c8603c8ab51e4210753483dba81bde189724ec47d1019bd9c4f4dee SHA512 3a5bee1eaec72650fc093105a4139f14c1f65012903a1311aa4ab754fbf7104936f743f0e7c69ee6d7b8d344ec25746c1fd415bdcd0a959c3828a28f9b63ce52
-DIST python3-dll-a-0.2.12.crate 83731 BLAKE2B 2ae21b085e7a7aae2c17584fa5feacfe35e974f1bf96673027cb6b6f382241d115df7c9cd009b0346840b6366163c08a62e1695b0834385e182d250390e446e2 SHA512 4d9860f7ecf689b8e5c865f4f2d2486baae0d6765ecedef08234973e921461a3af56f007dce178de6539053eab28dec0870c9f110c3c66dbf7b076e18d2e1fd7
 DIST python3-dll-a-0.2.6.crate 56866 BLAKE2B e8a83d0e02c281d8a626565fe1cde1158726c9ff718afb0888298454762832d47117d7a1bfd4e3e471e82ce684cd8c36d8d7ee036b07748cbf09aa915c2e046f SHA512 f64be4ed3b217d6905df5787afb3d403580eed1bffc17a251e2c8eab61aee6a187460894b568140c4d38369e77fb51c4d49f6df9127786f344b460951df249d5
 DIST python3-dll-a-0.2.9.crate 66092 BLAKE2B 2c4baa31df7f55da8f1c6073525b4498bae7207ee38ef0eba4dbe58088609937a7d7b851c603ae62e5eb5361881e67a05d8c112d0a76aba5d99b13cdccd59d59 SHA512 1914d3ce67284f13551a4efefaeb9c11138fcca3d5082746282f64b7a36f732c6834766d981f27d862a61410eed09b3d281e0cab8cc1a46d424d04823ffaee35
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
@@ -311,7 +288,6 @@ DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a8
 DIST regex-syntax-0.8.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed
 DIST relative-path-1.9.3.crate 22400 BLAKE2B c6bd04b060013de042079a741a864150632c02cdc493ca1cfd746bcc12f6ad903f8f0748ec68261c979d833089c0fc091f7c9da2b2936e8f75dad8d4638a7b10 SHA512 fd5c88d370865870570859a110245e009eba557225e4297783a606227b13b42abf0c7e69a4beb5093a5a9dabac1545afd988f4c831abe912c21ccd8013c30382
 DIST rfc2047-decoder-1.0.5.crate 14393 BLAKE2B 530a3921f2c4ea59485e30665170c946da5869af50c4de5ca072980e98dc58e6e6a8077a037b99b91fe8bf8c21311cd8c0719a8b3aa22ceb4fddadc6292fd936 SHA512 9cb031b9edcd47ca5dd6154afc99a8050768f98fb915a540b2d3c1aca28894bec8e92044f335ebf1c2fd439cf9c384700037d76d21cc04b5d0a1ac3a3988fa7b
-DIST rfc2047-decoder-1.0.6.crate 14674 BLAKE2B d50da7093fa0da2ea9fc3dedab266e976cabfb79431a8272f838d38fbfc28a269cabe09075cc4eb29956c8debe529c1a2d05a272c251432deb28a05c13e4d8cb SHA512 77912c6fe0784e38595538798cc9dcfc9202c24a1fa0f5dd05eb4d78ee788067450c902d52ecc3122e158ea09537229a8e6e96578e694ea334d240f1700d7d3e
 DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd026027ef2c42f2d8bdba0eb1665621fc98db618252f6a131bd54b1493987a0285bf2b9a22eba4c9409ee1cab SHA512 e4966409a4078ee43bfc9cc659d08ad28419effe2a729c8c275361a7fe0620a3c727009bcfb1d0bab265af2bc107b50c19d868a4e80da7a8bb55f97e8b214358
 DIST rstest-0.22.0.crate 44425 BLAKE2B 1660650c95cfbe1a0bc5ff5f660481eccbd61cca3a1c36c169fbaac5b243da475af3dedd83c011bf679a8b63223a9f2bc9edb863dd8af14675ebb921f9b10dc0 SHA512 cf0509ba9e2aa638b1e56c75a29ed28bb4b208c19d625d0b4ce339292e1ae3d7dd9edcf7024abd0e0fc53284f936bb69521724099bb2a1c75c58289e2666ac13
 DIST rstest_macros-0.22.0.crate 58923 BLAKE2B bb4c1d95eabdf3cf25ad455b9f7781c6254c896139bfd408584153ffa43fee35baf101a2c3db691f3a1f0023e6fe4fcac40bc215d070250ff2a9b3137aae3ec2 SHA512 57d96487c8a230e681bad99c1ca379a41119828daee8807b1ad87a90520a4beb3ba319019f0680af577bb07e46f1a30b00e013be7c407e4071667ab33f050080
@@ -340,16 +316,13 @@ DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743
 DIST serde-1.0.203.crate 77935 BLAKE2B 3d3dd4f81f7d74b60483d6759879a9f87c0c7d615aec308bad1bc575fac4e2071dc86551c2789e87331dbf8089e923ae56fff82e6f5a9992cf850121b052ce1d SHA512 a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec
 DIST serde-1.0.209.crate 78364 BLAKE2B f6b4c2bd931a8067482ca033211c4e85c0dfd6084cb599c38a9ba666cce30489685a3a6a8a539eb6e41141a52328943dccbfe25dbd857af16665094fdf7c3f45 SHA512 25d2236eedc08fa3b9d078a1971df705c4f428b7a4e6a2d28d9f0f9893c19de745bffffe3fa9f3c08074bf4359aaf09cc28770e4b14c21c66d6a0b9411738f7b
 DIST serde-1.0.210.crate 78338 BLAKE2B b3621d1313312177a346313e6e384fe9660f74eefb18e6cffa39fc2aadc0ab73be84b9037c59b716e5feafcd73f4f054f83e6d17d82746984b3064bf8d3ed338 SHA512 0d853ca51543ae8b4a0c70204ff4e559a4eec77af3d3bdcfc75c5905c80d4ffd1bd9eb8258ea4f6ecfbdd26477ecac7dd698d84d86759fa32e03a9cce02fa4ae
-DIST serde-1.0.216.crate 79000 BLAKE2B 98c0f5cee2f9212c6b7620d2068665379471ceb7557d1454cab9b1c2120b526ef597fbb642f65440e70f92a4764cad33613b478bacf99138dd5bd51fdbdbee6b SHA512 baabf4c7aac4a540c9ed18b336662087258b71c9cb0e547c8d83a2734818ab2cbbe62f910d812eb61d3d46e653c41a3eebc99b1d679bfc51f95710c71a8ecc20
 DIST serde_derive-1.0.203.crate 55867 BLAKE2B 1bc8aa96328bb83e4e4ff527b1df855bbcefd333f0c43c96d1e0b93f98a46273dd88a21653bccc8f517c4fc06d17b9b44332a963d024796e0a2c18a5bfecc824 SHA512 b2aeeab33395ac11ebdbd922fcdbda29f2592e7a20e78aef250713baf269cacf497271be7aa407f657aba33da132df0e035be046fef070f915f234097d1dd392
 DIST serde_derive-1.0.209.crate 56023 BLAKE2B 752bc9f46b880d0ed8a4f7e29ffde1343c63c4be1e9740afb1a28dcbff5bedfe077eb51c7052adecfbdbd9942c30b63a27914deb6401a2ecaf70fef0f64cd80a SHA512 22c4eb76412bd73814d0b86209b110b9e59626f64b41cbc250755144e545ff30fa69972ac93d74f988a3a6a239d9138f4e8a23b283c746a0aa5fcddfbe077cd6
 DIST serde_derive-1.0.210.crate 56020 BLAKE2B b346e574c99b6a8b12dfc29b20a4fd2daf8abfabd3714ccfde059a3a1f14a5628d4acf6a03f8076174fd28adfdb7cb9bbdb8ac0d4403aa2f43e917eed4b08028 SHA512 1c54d70a55007c00d3ff3d8c2096f4f9966431ba7bfd9195bcf41932de71b71c4ab934f9a8c5067cb56a042742cf0efab07377dbabf12feb1af6d20399de00b5
-DIST serde_derive-1.0.216.crate 57674 BLAKE2B 12a9228679c16288c08c8b256707e276aec79f84ac7af0c4cfd1f109500dfea80438df17d798acdd30a9743c753e70093b22bd324217529bac483f257682a3e2 SHA512 80fcb552279ac7562297df878f2f5e9ac09241701f5cf1088fcbf473b638f58cd3092a7930d8937ca0df9a47b9ae1a42d490cd46a275259cd8089fe8f5426469
 DIST serde_derive_internals-0.29.1.crate 26189 BLAKE2B 09d2fd10c73ab114efe244749678c166afcc3e6217f2a4c08c01a44e546471c5f7cbb7e79ef908fb306975852fe1ae32b7988e04df3741ca82db1e3a3d6979f8 SHA512 ee7c8a35094b8ee1d8958f4aa177e5c536c6c7706d446e875f1ae1b5249738ecee053a0239e1508114b747797fcd080ee33ed88929ff1f4903988f64f038b771
 DIST serde_json-1.0.118.crate 146962 BLAKE2B b85f17cbef0cb9fcc8af5d8d18a74850804de631f8ac94193bdb0ff8c95d4c8507876e4802005e0bc8fc4745d52c79be153d825e106090b680b620acc5b1add4 SHA512 1fa7e01d849684e3ed6f9bd67ba9862f822dcecdcb9110a43182367225f559416f855d59f2b8bd943756957932710b930244963a1f47a3d7d530be19dd412f20
 DIST serde_json-1.0.127.crate 149465 BLAKE2B da5048f70a0b7594be0112efbfccf8d6575a77b324d59321cbd34d355978aadb2ceea1bbcb182412547587235f58873ddd2232822f020e2db85c1599cb0bca8b SHA512 f14f5eeebe07261daded47c3cbb6d511da4633bfcc46ea1b0600063730dd4211a0c310959e4f8731a688d18d60a46f6dc1c1a1f052f170b6207877b93742a88b
 DIST serde_json-1.0.128.crate 149520 BLAKE2B 246eb865f64a0f161b79f3d4f783dbadbc930c4a19edb6c0fe8f0c6145c7c47be4b692d3e084b1b500820ece8e94214820978cf898926dd805bd431fb411bbc9 SHA512 9e6290d3a6a971b3c37bbc97097b8179e64c655779b43c7b75303a35ef7030f5401b3a5f62cbc95a7bd5f42ecbefb0b469234d78a76c8c1597726d8e08908a7d
-DIST serde_json-1.0.133.crate 150739 BLAKE2B 7891eb5b8edcc7fd09ab1e15d3881ffdcb629aa39f2bd758c0505700a5f2dfabd85b1b66c3b094268bc1627b346e204c792f4ca61efa76c54ab9cd5744fb0ee2 SHA512 20e65ec87bff319897a141960d13deb5cadcf821209c1ee8799f1dc7f458ce432bc62c16df5bdada1c8d3cc01ff23b8125e8fa0a03545d4614f32efd687dc69f
 DIST serde_spanned-0.6.6.crate 9120 BLAKE2B 6748b04f30cc63297fe01cacdef743b688aa0777b600d603919d05676913133450c97a179c6cbd4a62534431b74c4bcf63a60c1185ba89cd8266411d3824aff9 SHA512 e07254723645c80d10c1ab9a7282251fcafa0b5144991568b1b1f85e7c8c8bbd82b5992f2ed73fc7a988f6a0175fd79fc927c6b28b7420e83269c3364d7ead4f
 DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785
 DIST sharded-slab-0.1.7.crate 58227 BLAKE2B 9b4c4e4849ed324cf48c2b905f21139d1d65aa5ab13e7fb11817cac9a32ad09f8dbb1e50a93d40cafa0aba872792bc92f7bd2e219f62f80695409e949c07978b SHA512 3be7438d4a75debb14463477f34de6db1ac38abe958ada5d5dae7ae8d5993e245da69fcb989d91aaaffda5f2b085d4bcc88d10e07ec567b7f40a21437de6d4cb
@@ -377,13 +350,10 @@ DIST syn-2.0.76.crate 268798 BLAKE2B 5446965c6331fbb445a313ca8da9d8e7454e31d9a36
 DIST syn-2.0.79.crate 268981 BLAKE2B 2bf4bde1890ce4ee91fbacca81bd298d15f0111fedb27b9cf8d675dc2489f46026c1804f9e4e24afbd0718539820096cd5c4ed2c2da02e598370dbfd2b18c293 SHA512 1ee073fa3428c031e53bff8ff305bcd6b37ac142bee3955dcdb44fec1c77c733eb78760c8bfb30b83fc3dacdad8a384e2b6f9f31a89c4cc300359e33457fd433
 DIST syn-2.0.87.crate 278076 BLAKE2B 93385f64103fdb482bec34c7912474ae7a5935948715e6eb9a54907e0db5c39f089f6cd393bab33c935c59a1bbb0f4099431f206343811c1a450554d96a35756 SHA512 bcfff545d6dfefd81e09f8f30a86bdd85759b3a7d4093ef3365ed02718e10dbd604c52b94c9d7fa955d339fdc5b6c079940c6f345b5a48c52b5c8607794ca6f2
 DIST syn-2.0.89.crate 289852 BLAKE2B 4e2b06d2a0ea9b8970338ab61f8c5569cb7c10466dcf139576d0618c3690cfd23c98b66f0714c34839364dee72df6a6d8571f73dbf03ecc347fb1effb118fc2f SHA512 d172936f04a383b7b5e79dad328e70ea3c4faba4a88d0b6d186645413e8698434d30f53012cc9d3813f617c8bef75e95a2d064fdabae7867678abbed22bcd910
-DIST synstructure-0.13.1.crate 18327 BLAKE2B b29ee88c559a2d58fa46b7af155b448f001649ea79a1898f0ac87e69108b87c65cbd287d8f9001f360df7fef06ff39c937b48d33e487a30c8eec6a46c639c0c2 SHA512 09024193b44fc9a8901bda845b9f86c57dad65d0f53e309b2e7e968538fab6f67db1c86e5e52a2eb8fd116dc073e3ad10983bd60764662ec6ba94fee22a958aa
 DIST tar-0.4.42.crate 58998 BLAKE2B e3730ff969052b328abdee9c1413540a6cb7829ae08154e2ffa6105876b459eb610c7e9f1ec51a1b64ef64e4d550d102bdd1a0a1a7526600c92726cd6be3097a SHA512 f7ec32f1d5b5b944159d07c0ff0fdc03efcab07f3874a368dedce2920d53c075df131dd41fbbe1acb315a2093de7a5d9564ee382c19b77c528ebd4c2710f5340
-DIST tar-0.4.43.crate 60181 BLAKE2B 0c517cd0ccf1aca093136985513f5ee90312f0b99e34fef9ec8ef21c9537469c3ed31591434a9509ebc6887861e768f52e8dbc1858f0dc1ac5fbcb7d45e805e5 SHA512 d54953e0c7f7e34eb30d85c44527af620e673426592d896261dc2638a9b8a34e2486d0f56dcf93ab3a104c0a43aa3d3478db98fa86fe44ac5be6a10de145447e
 DIST target-lexicon-0.12.11.crate 24594 BLAKE2B cf06720caecb5b5758f05c6375fa600da9260aac04017458060406a042dc578d51a2c5b6f189345d45dacea42ba01fbe46853d07f70d7b37cba17d87aa101f9a SHA512 f38701a8e9dd17b7db591b1b4c82c3b75d317e003262bb7b09b9cabd3afab5ab79c02a7dd524910b6941ada3a8f1378ea9e199b2b5938f8f01ee75bb0eae8718
 DIST target-lexicon-0.12.14.crate 25508 BLAKE2B 5ebb6b49e5c3b0057959557651287d4bf5ffe5b499340019ff64d5fc3b64e780e344982e358c94b1b25a20bf0f526a584aeecc704695b50a55cc268dd65edb97 SHA512 3410ecc0faf854f49c41c99f83972960e67065b1e0e78557a7c4996d996109bfd167d2121a019f5256f996c896cd45af032038ab7918fdcc6ee6311693ce951a
 DIST target-lexicon-0.12.16.crate 26488 BLAKE2B e7950e4a302059a1bfc9bc15618a3c1b971a17cffae117a6e8f5f63a0d82fd2bd02680301d15338612d5426d349dd24cfee30ee787a15a7d3187f2a6825e69ce SHA512 092639957c4a0391560b6442b31c47159c04d12e971010f730a6ec9cb5389e4be903ef3d7daa06db95e64dc78b6970731fb647179ebaad2b12e9ed5e9b24da27
-DIST target-lexicon-0.13.0.crate 27916 BLAKE2B 8ff606ed7707a3437fb61164d8837970222afc1c6bbc875424676c39f2f87f06d7537dd7cbf836e20d7bad96ea3349557adeed6149d6dd2312b2c41210a71d7f SHA512 8770f4456ac01dfe730a5bfe145222da4c4dc803ea2d74ae79cffc282cd0c5789fc85b900b0ec9fa06436d3ec592da9efe5129c62870b15313577b42d4dda594
 DIST tempfile-3.11.0.crate 34153 BLAKE2B 3a89580e05600ff2ef5637d2ed76ad8f1a769f6dae40cbd23f7bc2cb9d0807d03713ce1571df54c866c8fd9a4fb073990e4e98cc8ffee33aa4d8343c2d39733c SHA512 47d4c48c4f90d116a2f7d5ebf29ea623fb0a0fbfb1192aaaa53a83218ac910b6c836d6d4d8233b07d06e14de70fbf30d243152b7ac22a03d180905c53b6ad9e6
 DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a
 DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
@@ -400,7 +370,6 @@ DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f0638
 DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
 DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
 DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
-DIST tinystr-0.7.6.crate 16971 BLAKE2B 33a248261c4cded41a81f0d6e6c8df55437f042b37f235c39787986ec562f0dbff50b282ad0f1483daaf49c4b33e6618e139a6677d1238c21f4e12082562b4ae SHA512 a33051848de248cac0a2d151760a78cb3aa62c787d84ff7aac38b11c0660e9188e4d43d43a77fb8676e49ac6102015e9c3db057848d809e71981851875d0fb25
 DIST tinyvec-1.7.0.crate 46743 BLAKE2B ec9741aaf6900ed2651c222d80688176353fd2ba99ef54db18059bc527b638fea1e9d0ed03b18a8c2f3a4732f94dcfbdf1411050f1d744da5d88cbab569b88de SHA512 9628e5a8861d01e22f00161b3cee58861a2801cd0c64016872bc0c6fb49899a553abd0bbed61064ed91e3a8fbd93e311b2a622fd21d74345e80ec27c1e2f36db
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST toml-0.5.11.crate 54910 BLAKE2B 9ecd5103b33ab47d4be23c897c7095ca381cb79bedcaac4918cddc36fc7cf5d34ab664da52c2273d935f04486e9325241d6b66785d50aac78453c219aab49e1e SHA512 eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317
@@ -452,10 +421,7 @@ DIST untrusted-0.9.0.crate 14447 BLAKE2B 8e9c3ae09435af0885bc4a6e3c8943805b48cfc
 DIST ureq-2.11.0.crate 115223 BLAKE2B d02d0c0f56995766f06d1488caa9a987ac62e39946f946f443fac6dec0ce64df203733ca0b1ed7de3ef3cb402e162c9bb6b6d56e771699bc3a467376f3b07894 SHA512 3f6b77f6c5267bf4139c03b7494e207a0da983394baf85d4bd8a615bfc79fd83ebb3ab4da9af47328b8668e58a47fddbfe3dc901e0bf54096b07bb10cc4c76f0
 DIST ureq-2.9.7.crate 113834 BLAKE2B e80ea64d610ab01d129527a120878ac3eb38248885c772aead6fb983f777b7469f7debd042ce93c0bfb6adeeb7ed476f7dd96c62de386ec2d64dbed28973a829 SHA512 33893aa1df316b5987571ce6b46373c625ed89e452a313f9490d63896f144e56ee0c35c1eaec77eb8d2a66e7726f3dae6e96bd2ee0db7c0604485105fc69bef4
 DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d9183478cf501c26fb5f22d7704ef1313ba6d355e849cbf8ab7980310c1aae85e253a2b28d59099e23af29 SHA512 2515903e41c0659cb226f9bb049ef80f2a49d1b609b6ac480e570a84e899088ffe3be4fb58f41a1fa7f5288eb5f97ab513f331aeb6d56979df783d48e2ace28a
-DIST url-2.5.4.crate 81097 BLAKE2B 74943c63809ca41a526a146bedae66f91f390fbd2ccbd90f9397d8074ee7ec26535f0f67170eb1d7232e139d8d795fde99be37f53f1bc32c6a6a4d46aad1369f SHA512 8f1d62bfdd45f52fa12ad657a521a3478d0ab54d187346a29dd59cc66a0f140ca96d850948e09f6316f08b44b3fc68526c58bd620fed5d065b7e8528df3cd46d
 DIST urlencoding-2.1.3.crate 6538 BLAKE2B 65777b0990aa6b3d27a47f36114da8622026ac8946b5ffb6e04172b666ec7244a55c250a7fb626472bb2b636eb32ee945599cee5ce7351c3cef2322366db15ff SHA512 035848d9243ed6a4528377b56edd7f8bcb5f824381b420dc8f5c4bfc3f1246655c54eaa7de0e4aaa7138e0b08fd796b9ace140ab919aed2d94f6952b577386ac
-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.8.0.crate 44043 BLAKE2B 6a5e3008f0399d5606ea4ef51e5932aedf2a02e747b9bee4b4c2c6646cd959a720373c346a734c00554ff0359fe42bdf471dea5029e23a9e70164e20895cacee SHA512 fe254f0bf6b863538ce568405569a4c755b33bce561148661b10985bf4485fa7ee7a6ec650d93656552b3cdead46b2074ebfd45b040edef19cd1648300f68ed5
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
@@ -507,22 +473,15 @@ DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cac
 DIST winnow-0.5.40.crate 159316 BLAKE2B aae5076d59b3459c901d918d8aaa97ba8bfcc993b8484344f52e45f1f37deb96d6cd3a1663a67f3c367be2b05d633286f270274c621bda9f3ab72b98bb652cc2 SHA512 525156f08514b0110697360be6e331a68d08f0cb65ee4ba3ac9d101dd2d42a8c89601e7409bdb5652c5b05145626506651010f58a854c47712065334c61ff39c
 DIST winnow-0.6.13.crate 162649 BLAKE2B f088396ccdc6e96e56b822c20ea483eaead57794e101bff3df6ea35fe039fa2dcf2eac98dabebc3decb4129c200490633f05ba5dd4325cec29d28c78887c3de1 SHA512 a8a94c26afc4cc4db6ec2e65e7bff325fbe6816d4a80fb97e2014e202af0f549a77518f0435157985822aa9fd8642b95258b6cf87a9e695f4b9a11b5fe514d86
 DIST winsafe-0.0.19.crate 492820 BLAKE2B 4eba26861f85f668e134b08c60e9522b698aed61eaa5e6d4e89ef31c1b97953fa08a5157add52d9a306075df4ad97e9aaf1767eea4208b72401ec0bc1c3eb0e9 SHA512 0555ec74c5acbb69ab08e54d920094e806258079bffaff3f90297bb94a000c7da36d6eba0eae445d425c781465235dd70a198437cf83a1f113438bfd9baf4c21
-DIST write16-1.0.0.crate 7218 BLAKE2B 548796314339463e4b71f8af3d344e45dc89480e103180b6d56c90fcb816ad1a37ab2ba20766c4b9754f2cc686752eb1f3a5a12ec1ed4369a9cef749ad4f3e97 SHA512 655a207b8082bb88e462f992ecb4833cef9d590da06d6356b41d109df2862b49ee5705189c78a607b549e7343035119d158020d58fcad49608e51659357a83c1
-DIST writeable-0.5.5.crate 22354 BLAKE2B e4ff9862c070b413568ce0c75d1eccafcf1db8578eee4795ea9046dadd643f8a77258b437be288b93af247199d63455298ac2cff909226bc432f91c0aa863921 SHA512 818b2546c8ec25816aeaf5e31a1ded927d197bf7256e7c5073738c2709bc58a95d382a0256eb38a99235ae83729b578701261866d42ea3357a26024906e196c1
 DIST xattr-1.3.1.crate 12580 BLAKE2B 25c414d761a7fcd23bbe057add62c6da971cf33149066aa024320ab80e0ec8e8e8d5d3d0506e8de954b8f8c178d34c52a00a5fa9aa109510678098a3e3564b7f SHA512 4047abda42b949cf58f820e15ee99850de483857bbaaef737eeee48e1a2132972470f15bb2ddda56438f6a934918be96607a8de518a5a3dcec7c8ee6c00ad280
 DIST xwin-0.5.1.crate 65009 BLAKE2B 91403c2d890b2ab48a94356eab78f3bae08d18d98746824be64c9be6f6af5e1856ab7c7ba1faaf3ef4a2e92e4767cb45ed69c3d24bf668082db22ca988adb805 SHA512 2bbd5336155f7a4dca1671f5018965f875c26eb71b34806664d9a2051d875886eaaaa9b9a989fbca6d22b4a29bf8acaa453b006724102717d2c57c1636ab972e
 DIST xwin-0.6.5.crate 67313 BLAKE2B b6e8a616c410b4eb3a446fa9f70d70fcf69ba335c14cadeedd9adba353e8eac45f06056118a5e56081cc70834e1aec3186ce0e7c649b5ed0464d9dec94433006 SHA512 5b88cb3b4db7164d90312c9af2fa232ae13122780fedccb580171c1a52b6995b4ff6717110684fc9772542f604397a54cc906c0dfec1b1183157f51618616a20
-DIST xz2-0.1.7.crate 23892 BLAKE2B fd4b65cc82405f28a3d9fcc3db9dbffac41ae8ec7e767f3405bc9c7e45000b529cd571f72a76e41f2fb9866e7af8ab37d9f1ab8e6f14652495d306ba0a745879 SHA512 9969ae958b157f3d49708bd00640e57fe7c3826add2871575bdac03e6064aabd28392e3062bfbb833752df374195c50b19dc6b6c08ac41455c492213fb91fc74
 DIST yansi-1.0.1.crate 75497 BLAKE2B c0d396c93a733ed6ec12aca3385d816f39b1f1fbed75da460f491f0cbfc30ba462842ebd1627fa8e5d2b7c0f37913a23747e5f5e23df1cb7c85d965e6c37159b SHA512 182c8c6c60a30a727d8f8b90bbf0527d91fa8ae9d8eb20e5414614b43ee6dc532f4b19241adbfb9299cb0004b39fe627036269b60b0c3860d9e1ea4413aca541
 DIST yoke-0.7.4.crate 27781 BLAKE2B 42d6176af3e8d046b42fa89eacc0bb249eb0a6e13dbe7e97890b0cae98c3cc0059255f15314bbc343610d60605bf2d13869402c17d36cbf7f495956496572212 SHA512 b3d1456e28d53723470644ae15a4298fa96a79593d90729221ca4e45a6f09de4d7c554703425c61595c4e78959652122db95865c0337cc0cd6a4ec57d7bea84d
-DIST yoke-derive-0.7.5.crate 7525 BLAKE2B 9b6b97eaf3c50f0f5ce8cebf685a1a17d4c21eb9b26d38eac99e0a4c0f9d592e95a7843b7a0b897945a14c4eb78ffdf2c0972b448d31d7bc7b077f27aad81d9a SHA512 e30b06b020aa283080905004295fb643c539b130d0d53bda51927b95e79ba562336aad30d8a6202d9a0c62d5b64559a01218c6f02f3faada6003d4b03c205cd6
 DIST zerocopy-0.7.34.crate 151177 BLAKE2B 30b65131370dfa4f41d3c2705d3b75da9b76f2a4ed723dec66345939de8bafe2c181ab6c98036c25a30739cae1720d927e27e5fa5587442d5cfb7f39a7018c8f SHA512 4d27b1230ebcea4e9d4c15f38a979aa3fe8b23833e95df781a0a67054e920637642b89345596fe331907edc27abab83c766967f2a04399a6fe0a4e89fa0dd148
 DIST zerocopy-derive-0.7.34.crate 37907 BLAKE2B 23a698c3c892187307007cbc76c9338dbe163e4f14d4ea73969ba834f5c6732d16f5bc26e2e85c5e3df2100b28e6e72ae6473b2159f5160ee19befdef3615f98 SHA512 1bd93062b0d2c699066f8a991326b4470426aae0517d33748a8f0e52b009fc46e6b0b238abe97462a2e13c870fa3d0d070615870e6dbbf8b6991c0e3fb5c3e63
 DIST zerofrom-0.1.4.crate 5044 BLAKE2B 8ad9a14b8b0c251cffb420f7ac673669fd29b74bc2f5e220c8e86d592f58cbb2c7be88d906b7dac8803dbd76ec459c4a249b7d1ede75a055454a1626b387f128 SHA512 11f37a67108185a8090cda71338b02492fabd15e6cfe018833a165cd869ed65338e12d7c5680ffb0b763fc3acbdff6fe4df30457653dfe4d79ecc864b69d780f
-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
 DIST zip-0.6.6.crate 65789 BLAKE2B acefc076297468d72cb20d8c6234fe5406875056fbf78fc0eac3ac430af78f320ed839f8683bd96fa1a03c457d6ac568d42bd703a902bc37bd126791d8b4c709 SHA512 affd46c17ceaa0545a155250dfd16756f8706dda43bae8a322ec0481dbfb41e4cf3166bf9662fc139ef9d0ab3b0f9f158535b21d2a61b21d38b8b2407813eeef
 DIST zip-2.1.6.crate 107876 BLAKE2B 2e1f3f5dd3ec3911361e0b32227a0622fc40e12a84d1eec51b1cc6ce8b402e6530fb7c3a3d5b4ebe19a975a698ef3acde895d009e660cddb27c4d87c2d01b777 SHA512 f0c7ca518faa8b353a83e485c1522247e1e2054ae2b480c188ae0b80192223b1ea89b3163efe87ee8cb2912f20748ea6e835c1abbe67ef426f1a7a31bb967f95
 DIST zopfli-0.8.1.crate 50972 BLAKE2B 27cde48858dc65ec8082d4e0d81e2758f92d3dcc7a1c1f08aa6448e99f2995a865ac3259353b26e787f108c2f88ce3c7610413ea9d3daae6f864900d74565de6 SHA512 799e25c0cc9f0bf2119a7c03225b11ed94e7c3ac83f872a27da8ae15c90206245121c38f5e2b78fece131f5bb428f01fabbfd1b1e18ea456957940042d38f38d
diff --git a/dev-util/maturin/maturin-1.8.1.ebuild b/dev-util/maturin/maturin-1.8.1.ebuild
index f475fea8bb01..f9a362883ee6 100644
--- a/dev-util/maturin/maturin-1.8.1.ebuild
+++ b/dev-util/maturin/maturin-1.8.1.ebuild
@@ -1,477 +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
 
-CRATES="
-	adler2@2.0.0
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	allocator-api2@0.2.18
-	anstream@0.6.14
-	anstyle-parse@0.2.4
-	anstyle-query@1.1.0
-	anstyle-wincon@3.0.3
-	anstyle@1.0.7
-	anyhow@1.0.89
-	arbitrary@1.4.1
-	autocfg@1.3.0
-	automod@1.0.14
-	base64@0.21.7
-	base64@0.22.1
-	bitflags@1.3.2
-	bitflags@2.5.0
-	block-buffer@0.10.4
-	bstr@1.10.0
-	bumpalo@3.16.0
-	byteorder@1.5.0
-	bytesize@1.3.0
-	bytes@1.7.1
-	bzip2-sys@0.1.11+1.0.8
-	bzip2@0.4.4
-	cab@0.6.0
-	camino@1.1.9
-	cargo-config2@0.1.30
-	cargo-options@0.7.4
-	cargo-platform@0.1.8
-	cargo-xwin@0.18.3
-	cargo-zigbuild@0.19.7
-	cargo_metadata@0.19.0
-	cbindgen@0.27.0
-	cc@1.1.21
-	cfb@0.10.0
-	cfg-if@1.0.0
-	charset@0.1.5
-	chumsky@0.9.3
-	clap@4.5.7
-	clap_builder@4.5.7
-	clap_complete@4.5.5
-	clap_complete_command@0.6.1
-	clap_complete_nushell@4.5.2
-	clap_derive@4.5.5
-	clap_lex@0.7.1
-	cli-table@0.4.7
-	colorchoice@1.0.1
-	configparser@3.1.0
-	console@0.15.8
-	content_inspector@0.2.4
-	core-foundation-sys@0.8.6
-	core-foundation@0.9.4
-	cpufeatures@0.2.12
-	crc32fast@1.4.2
-	crc-catalog@2.4.0
-	crc@3.2.1
-	crossbeam-channel@0.5.13
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-utils@0.8.20
-	crypto-common@0.1.6
-	data-encoding@2.6.0
-	deranged@0.3.11
-	derivative@2.2.0
-	derive_arbitrary@1.4.1
-	dialoguer@0.11.0
-	diff@0.1.13
-	digest@0.10.7
-	dirs-sys@0.4.1
-	dirs@5.0.1
-	displaydoc@0.2.5
-	dissimilar@1.0.9
-	dunce@1.0.5
-	dyn-clone@1.0.17
-	either@1.13.0
-	encode_unicode@0.3.6
-	encoding_rs@0.8.34
-	equivalent@1.0.1
-	errno@0.3.9
-	expect-test@1.5.0
-	fastrand@2.1.0
-	fat-macho@0.4.9
-	filetime@0.2.23
-	flate2@1.0.33
-	fnv@1.0.7
-	foreign-types-shared@0.1.1
-	foreign-types@0.3.2
-	form_urlencoded@1.2.1
-	fs4@0.12.0
-	fs-err@3.0.0
-	futures-channel@0.3.31
-	futures-core@0.3.31
-	futures-executor@0.3.30
-	futures-io@0.3.31
-	futures-macro@0.3.31
-	futures-sink@0.3.31
-	futures-task@0.3.31
-	futures-timer@3.0.3
-	futures-util@0.3.31
-	futures@0.3.30
-	generic-array@0.14.7
-	getrandom@0.2.15
-	globset@0.4.15
-	glob@0.3.1
-	goblin@0.9.2
-	hashbrown@0.14.5
-	heck@0.4.1
-	heck@0.5.0
-	home@0.5.9
-	humantime-serde@1.1.1
-	humantime@2.1.0
-	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
-	ignore@0.4.23
-	indexmap@2.5.0
-	indicatif@0.17.8
-	indoc@2.0.5
-	instant@0.1.13
-	is_terminal_polyfill@1.70.0
-	itertools@0.12.1
-	itoa@1.0.11
-	keyring@2.3.3
-	lazy_static@1.4.0
-	lddtree@0.3.7
-	libc@0.2.158
-	libmimalloc-sys@0.1.38
-	libredox@0.1.3
-	linux-keyutils@0.2.4
-	linux-raw-sys@0.4.14
-	litemap@0.7.3
-	lockfree-object-pool@0.1.6
-	lock_api@0.4.12
-	log@0.4.21
-	lzma-sys@0.1.20
-	lzxd@0.2.5
-	mailparse@0.15.0
-	matchers@0.1.0
-	memchr@2.7.2
-	mimalloc@0.1.42
-	mime@0.3.17
-	mime_guess@2.0.4
-	minijinja@2.5.0
-	minimal-lexical@0.2.1
-	miniz_oxide@0.8.0
-	msi@0.8.0
-	multipart@0.18.0
-	native-tls@0.2.12
-	nom@7.1.3
-	normalize-line-endings@0.3.0
-	normpath@1.2.0
-	number_prefix@0.4.0
-	num-conv@0.1.0
-	nu-ansi-term@0.46.0
-	once_cell@1.19.0
-	openssl-macros@0.1.1
-	openssl-probe@0.1.5
-	openssl-sys@0.9.103
-	openssl@0.10.66
-	option-ext@0.2.0
-	os_pipe@1.2.0
-	overload@0.1.1
-	parking_lot@0.12.3
-	parking_lot_core@0.9.10
-	paste@1.0.15
-	path-slash@0.2.1
-	pep440_rs@0.6.6
-	pep508_rs@0.6.1
-	percent-encoding@2.3.1
-	pin-project-lite@0.2.14
-	pin-utils@0.1.0
-	pkg-config@0.3.30
-	plain@0.2.3
-	platform-info@2.0.3
-	portable-atomic@1.6.0
-	powerfmt@0.2.0
-	ppv-lite86@0.2.17
-	pretty_assertions@1.4.1
-	proc-macro2@1.0.85
-	proc-macro-crate@3.1.0
-	psm@0.1.21
-	pyproject-toml@0.11.0
-	python-pkginfo@0.6.5
-	quoted_printable@0.5.0
-	quote@1.0.36
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rayon-core@1.12.1
-	rayon@1.10.0
-	redox_syscall@0.4.1
-	redox_syscall@0.5.1
-	redox_users@0.4.5
-	regex-automata@0.1.10
-	regex-automata@0.4.7
-	regex-syntax@0.6.29
-	regex-syntax@0.8.4
-	regex@1.10.6
-	relative-path@1.9.3
-	rfc2047-decoder@1.0.6
-	ring@0.17.8
-	rstest@0.22.0
-	rstest_macros@0.22.0
-	rustc_version@0.4.1
-	rustflags@0.1.6
-	rustix@0.38.34
-	rustls-pemfile@2.1.3
-	rustls-pki-types@1.10.0
-	rustls-webpki@0.102.8
-	rustls@0.23.19
-	rustversion@1.0.17
-	ryu@1.0.18
-	same-file@1.0.6
-	schannel@0.1.23
-	schemars@0.8.21
-	schemars_derive@0.8.21
-	scopeguard@1.2.0
-	scroll@0.12.0
-	scroll_derive@0.12.0
-	security-framework-sys@2.11.0
-	security-framework@2.11.0
-	semver@1.0.23
-	serde@1.0.216
-	serde_derive@1.0.216
-	serde_derive_internals@0.29.1
-	serde_json@1.0.133
-	serde_spanned@0.6.6
-	sha2@0.10.8
-	sharded-slab@0.1.7
-	shell-words@1.1.0
-	shlex@1.3.0
-	simd-adler32@0.3.7
-	similar@2.5.0
-	slab@0.4.9
-	smallvec@1.13.2
-	smawk@0.3.2
-	snapbox-macros@0.3.10
-	snapbox@0.6.16
-	socks@0.3.4
-	spin@0.9.8
-	stable_deref_trait@1.2.0
-	stacker@0.1.15
-	static_assertions@1.1.0
-	strsim@0.11.1
-	subtle@2.5.0
-	synstructure@0.13.1
-	syn@1.0.109
-	syn@2.0.87
-	target-lexicon@0.13.0
-	tar@0.4.43
-	tempfile@3.11.0
-	termcolor@1.4.1
-	terminal_size@0.3.0
-	textwrap@0.16.1
-	thiserror-impl@1.0.64
-	thiserror-impl@2.0.3
-	thiserror@1.0.64
-	thiserror@2.0.3
-	thread_local@1.1.8
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tinystr@0.7.6
-	toml@0.8.15
-	toml_datetime@0.6.6
-	toml_edit@0.21.1
-	toml_edit@0.22.16
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing-log@0.2.0
-	tracing-serde@0.1.3
-	tracing-subscriber@0.3.18
-	tracing@0.1.40
-	trycmd@0.15.6
-	twox-hash@1.6.3
-	typenum@1.17.0
-	unicase@2.7.0
-	unicode-ident@1.0.12
-	unicode-linebreak@0.1.5
-	unicode-width@0.1.13
-	unicode-xid@0.2.6
-	unscanny@0.1.0
-	untrusted@0.9.0
-	ureq@2.11.0
-	urlencoding@2.1.3
-	url@2.5.4
-	utf8parse@0.2.2
-	utf8_iter@1.0.4
-	utf16_iter@1.0.5
-	uuid@1.8.0
-	valuable@0.1.0
-	vcpkg@0.2.15
-	versions@6.2.0
-	version_check@0.9.4
-	wait-timeout@0.2.0
-	walkdir@2.5.0
-	wasi@0.11.0+wasi-snapshot-preview1
-	webpki-roots@0.26.2
-	which@7.0.0
-	wild@2.2.1
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.8
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-targets@0.48.5
-	windows-targets@0.52.6
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.6
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.6
-	windows_i686_gnullvm@0.52.6
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.6
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.6
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.6
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.6
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.6
-	winnow@0.5.40
-	winnow@0.6.13
-	winsafe@0.0.19
-	write16@1.0.0
-	writeable@0.5.5
-	xattr@1.3.1
-	xwin@0.6.5
-	xz2@0.1.7
-	yansi@1.0.1
-	yoke-derive@0.7.5
-	yoke@0.7.4
-	zerocopy-derive@0.7.34
-	zerocopy@0.7.34
-	zerofrom-derive@0.1.5
-	zerofrom@0.1.4
-	zeroize@1.8.1
-	zerovec-derive@0.10.3
-	zerovec@0.10.4
-	zip@2.1.6
-	zopfli@0.8.1
-"
-# additional crates used by test-crates/* test packages,
-# `grep test-crates tests/run.rs` to see which are needed
-CRATES_TEST="
-	anstream@0.6.15
-	anstyle-parse@0.2.5
-	anstyle-query@1.1.1
-	anstyle-wincon@3.0.4
-	anstyle@1.0.8
-	anyhow@1.0.86
-	askama@0.12.1
-	askama_derive@0.12.5
-	askama_escape@0.10.3
-	askama_parser@0.2.1
-	autocfg@1.1.0
-	autocfg@1.4.0
-	basic-toml@0.1.9
-	bincode@1.3.3
-	bytes@1.6.0
-	camino@1.1.7
-	cargo_metadata@0.15.4
-	cc@1.0.73
-	cc@1.0.81
-	cc@1.0.83
-	clap@4.5.16
-	clap_builder@4.5.15
-	clap_derive@4.5.13
-	clap_lex@0.7.2
-	colorchoice@1.0.2
-	fs-err@2.11.0
-	getrandom@0.2.10
-	goblin@0.8.2
-	indoc@2.0.4
-	is_terminal_polyfill@1.70.1
-	libc@0.2.134
-	libc@0.2.147
-	libc@0.2.149
-	libc@0.2.155
-	libc@0.2.161
-	log@0.4.22
-	memchr@2.7.4
-	memoffset@0.9.0
-	memoffset@0.9.1
-	mime_guess@2.0.5
-	once_cell@1.15.0
-	once_cell@1.18.0
-	once_cell@1.20.2
-	portable-atomic@1.7.0
-	portable-atomic@1.9.0
-	proc-macro2@1.0.86
-	proc-macro2@1.0.88
-	proc-macro2@1.0.92
-	pyo3-build-config@0.18.3
-	pyo3-build-config@0.23.3
-	pyo3-ffi@0.18.3
-	pyo3-ffi@0.23.3
-	pyo3-macros-backend@0.23.3
-	pyo3-macros@0.23.3
-	pyo3@0.23.3
-	python3-dll-a@0.2.12
-	quote@1.0.37
-	serde@1.0.203
-	serde@1.0.209
-	serde_derive@1.0.203
-	serde_derive@1.0.209
-	serde_json@1.0.118
-	serde_json@1.0.127
-	siphasher@0.3.11
-	syn@2.0.68
-	syn@2.0.72
-	syn@2.0.79
-	syn@2.0.89
-	target-lexicon@0.12.11
-	target-lexicon@0.12.14
-	target-lexicon@0.12.16
-	thiserror-impl@1.0.61
-	thiserror-impl@1.0.63
-	thiserror@1.0.61
-	thiserror@1.0.63
-	toml@0.5.11
-	unicode-ident@1.0.5
-	unicode-ident@1.0.11
-	unicode-ident@1.0.13
-	unicode-ident@1.0.14
-	uniffi@0.28.0
-	uniffi@0.28.1
-	uniffi_bindgen@0.28.0
-	uniffi_bindgen@0.28.1
-	uniffi_build@0.28.0
-	uniffi_build@0.28.1
-	uniffi_checksum_derive@0.28.0
-	uniffi_checksum_derive@0.28.1
-	uniffi_core@0.28.0
-	uniffi_core@0.28.1
-	uniffi_macros@0.28.0
-	uniffi_macros@0.28.1
-	uniffi_meta@0.28.0
-	uniffi_meta@0.28.1
-	uniffi_testing@0.28.0
-	uniffi_testing@0.28.1
-	uniffi_udl@0.28.0
-	uniffi_udl@0.28.1
-	unindent@0.2.3
-	version_check@0.9.5
-	weedle2@5.0.0
-	windows-targets@0.52.5
-	windows_aarch64_gnullvm@0.52.5
-	windows_aarch64_msvc@0.52.5
-	windows_i686_gnullvm@0.52.5
-	windows_i686_gnu@0.52.5
-	windows_i686_msvc@0.52.5
-	windows_x86_64_gnullvm@0.52.5
-	windows_x86_64_gnu@0.52.5
-	windows_x86_64_msvc@0.52.5
-"
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( pypy3 python3_{10..13} )
 RUST_MIN_VER=1.75.0
@@ -482,18 +13,18 @@ HOMEPAGE="https://www.maturin.rs/"
 SRC_URI="
 	https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-	test? ( $(cargo_crate_uris ${CRATES_TEST}) )
+	https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
 "
+# ^ tarball also includes test-crates' Cargo.lock(s) crates for tests
 
-# note: rustls+ring is unused, so openssl license can be skipped
+# rustls+ring is unused, so openssl license can be skipped
 LICENSE="|| ( Apache-2.0 MIT ) doc? ( CC-BY-4.0 OFL-1.1 )"
 LICENSE+="
 	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 ISC
-	MIT MPL-2.0 openssl Unicode-3.0 Unicode-DFS-2016
+	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/nihtest/Manifest b/dev-util/nihtest/Manifest
index 4854ad1a2ee5..b09f500395b7 100644
--- a/dev-util/nihtest/Manifest
+++ b/dev-util/nihtest/Manifest
@@ -1,4 +1,2 @@
-DIST nihtest-1.5.2.tar.gz 39901 BLAKE2B c6b71b457ec7ff2d154061d31f009e44b4208901bfaf7ff16c3b70d4da7e0790238ed21c310651e89ac7a8a335c9d5131b974a945ad41bff74da5ba14ecbf581 SHA512 7f7e29e6c1320cb2f1886b6a73c43e11a672bd42471d01a47d0941970b478361b3e463d7d64b4275ed707d87fe27773b34c0f79f398494393330d7091f9f2f53
-DIST nihtest-1.7.0.tar.gz 40925 BLAKE2B c21a5de44c3739b8e9dceac2391f1dc53ad276759389cfbf93e4cc0688ae7170f3cd56423f3c0be3b12ca7ea07f7168b78f3a0e3ad7c6a959019253360b57ed1 SHA512 2f84a4e3491fff64f9ae41c69cb79cd917c9c3ce7f6912d54e2110e1221b62c1a129c2e31ebac077d635f5cd788e97c4d9465eb3fb414bb054e5ceed32260ddd
 DIST nihtest-1.8.0.tar.gz 41036 BLAKE2B 79e78b81e7bfbc4f8cdfbb518ece417acd15e37fae4988785f9ec6c16ab5a9374d0464eb8564a6461c0283589d40777c94032f612d3b8b34f94e11222a82d500 SHA512 fdef4ce9f5990f44eda54115767fe01e2f894c0b9b398060d31a424a00d1a8df15c9f12f0d6864b3686a82875294e2c837cc481e3cda130497de6ba6d3a5f620
 DIST nihtest-1.9.1.tar.gz 43132 BLAKE2B f863ad9c8fc9c12e4ccc317cecc97d21a4586675cff35e5dfd38ef22e61f0622ddcd00517618eab9a0c32db84d094a6d64c48fa100cdd55bf88cc9bffdb94d0e SHA512 5897551fe1d5be0c3a10408aae44c2a7090f2ca7edd99b361699c85173473ef7474da3da9daa5aa9cc04a7e9215aee781971ecdbb604799d617160bf1be3b858
diff --git a/dev-util/nihtest/nihtest-1.5.2.ebuild b/dev-util/nihtest/nihtest-1.5.2.ebuild
deleted file mode 100644
index 2f04bae2a2cb..000000000000
--- a/dev-util/nihtest/nihtest-1.5.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake distutils-r1 pypi
-
-DESCRIPTION="A testing tool for command line utilities"
-HOMEPAGE="
-	https://nih.at/nihtest/
-	https://github.com/nih-at/nihtest
-	https://pypi.org/project/nihtest/
-"
-SRC_URI+="
-	https://nih.at/nihtest/${P}.tar.gz
-	https://github.com/nih-at/nihtest/releases/download/v${PV}/${P}.tar.gz
-"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/python-dateutil[${PYTHON_USEDEP}]')
-"
-BDEPEND="test? ( ${RDEPEND} )"
-
-DOCS=( NEWS.md README.md TODO.md )
-
-src_prepare() {
-	distutils-r1_src_prepare
-	if use test; then
-		CMAKE_USE_DIR=${S}/tests
-		BUILD_DIR=${WORKDIR}/tests_build cmake_src_prepare
-	fi
-}
-
-python_test() {
-	local BUILD_DIR=${WORKDIR}/tests_build
-	local mycmakeargs=( -DNIHTEST=nihtest )
-	cmake_src_configure
-	cmake_src_compile
-	cmake_src_test
-}
-
-src_install() {
-	distutils-r1_src_install
-	newman manpages/nihtest.man nihtest.1
-	newman manpages/nihtest.conf.man nihtest.conf.5
-	newman manpages/nihtest-case.man nihtest-case.5
-}
diff --git a/dev-util/nihtest/nihtest-1.7.0.ebuild b/dev-util/nihtest/nihtest-1.7.0.ebuild
deleted file mode 100644
index 5a10bd927b4a..000000000000
--- a/dev-util/nihtest/nihtest-1.7.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit cmake distutils-r1 pypi
-
-DESCRIPTION="A testing tool for command line utilities"
-HOMEPAGE="
-	https://nih.at/nihtest/
-	https://github.com/nih-at/nihtest
-	https://pypi.org/project/nihtest/
-"
-SRC_URI+="
-	https://nih.at/nihtest/${P}.tar.gz
-	https://github.com/nih-at/nihtest/releases/download/v${PV}/${P}.tar.gz
-"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/python-dateutil[${PYTHON_USEDEP}]')
-"
-BDEPEND="test? ( ${RDEPEND} )"
-
-DOCS=( NEWS.md README.md TODO.md )
-
-src_prepare() {
-	distutils-r1_src_prepare
-	if use test; then
-		CMAKE_USE_DIR=${S}/tests
-		BUILD_DIR=${WORKDIR}/tests_build cmake_src_prepare
-	fi
-}
-
-python_test() {
-	local BUILD_DIR=${WORKDIR}/tests_build
-	local mycmakeargs=( -DNIHTEST=nihtest )
-	cmake_src_configure
-	cmake_src_compile
-	cmake_src_test
-}
-
-src_install() {
-	distutils-r1_src_install
-	newman manpages/nihtest.mdoc nihtest.1
-	newman manpages/nihtest.conf.mdoc nihtest.conf.5
-	newman manpages/nihtest-case.mdoc nihtest-case.5
-}
diff --git a/dev-util/nihtest/nihtest-1.9.1.ebuild b/dev-util/nihtest/nihtest-1.9.1.ebuild
index 1849d849b7f6..5d78346333e1 100644
--- a/dev-util/nihtest/nihtest-1.9.1.ebuild
+++ b/dev-util/nihtest/nihtest-1.9.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
@@ -21,7 +21,7 @@ SRC_URI+="
 "
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 71f1ff67447d..4a7ce773d49a 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,2 +1,2 @@
-DIST opencl-headers-2023.12.14.tar.gz 75698 BLAKE2B 2ff040112bf8a9be7bc8c8ecbf29cec1c9c718574582e7e065f3391856d3cb70d6c46b5e770d3d2e3aabb2a0040855e2b3f73cda8c9b547d4faaeedafca0bc3c SHA512 71a21f32cc2d956ef52ea197a95f21a3df5cf4e6888b533eb8cc66be0025fafe9b6477d3de813cb1ae6303032c80bc10b5e5ab1c71074f1662a6b5296fffd3d3
 DIST opencl-headers-2024.05.08.tar.gz 76977 BLAKE2B cd4e0464e2613912134946b43b8b69ccd61f0ba850825c8182e46dcb042478338fda5d993e9e48612ba42152a007be172e6da9afcfda3eb51c71e52dd2f15793 SHA512 2f1a46d58a5a9329470bab4c3662f17e81aab9558bfd9e1aafa14d3e1ab129513ab9493eeeb3cc48f0f91f0bc6b61bd54e28d7083eed58af9f34cd973cc93de1
+DIST opencl-headers-2024.10.24.tar.gz 85151 BLAKE2B d35c2ea06a1162e1716d5973b3587bd8c50420cf15cb7c13c61d16df9b94ec1df9b3e4621291d0384de40672f2f919b8df3edb5067755df2e236e596c82acfd5 SHA512 9d2ed2a8346bc3f967989091d8cc36148ffe5ff13fe30e12354cc8321c09328bbe23e74817526b99002729c884438a3b1834e175a271f6d36e8341fd86fc1ad5
diff --git a/dev-util/opencl-headers/opencl-headers-2023.12.14.ebuild b/dev-util/opencl-headers/opencl-headers-2023.12.14.ebuild
deleted file mode 100644
index 405d917bc351..000000000000
--- a/dev-util/opencl-headers/opencl-headers-2023.12.14.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PN="OpenCL-Headers"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Unified C language headers for the OpenCL API"
-HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~loong ppc64 ~riscv x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/opencl-headers/opencl-headers-2024.05.08.ebuild b/dev-util/opencl-headers/opencl-headers-2024.05.08.ebuild
index ef72c924692b..359715508939 100644
--- a/dev-util/opencl-headers/opencl-headers-2024.05.08.ebuild
+++ b/dev-util/opencl-headers/opencl-headers-2024.05.08.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
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-util/opencl-headers/opencl-headers-2024.10.24.ebuild b/dev-util/opencl-headers/opencl-headers-2024.10.24.ebuild
new file mode 100644
index 000000000000..529df253e94d
--- /dev/null
+++ b/dev-util/opencl-headers/opencl-headers-2024.10.24.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="OpenCL-Headers"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Unified C language headers for the OpenCL API"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index 2ac0b3a282d0..64086d8b9f7f 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,6 +1,2 @@
-DIST ostree-2023.1.tar.xz 2079904 BLAKE2B 993570624cb43684d81fff9f3789a9cee3b998f945a78bc6eb99330eed45739d1e6fb66589cefba10eea608c5cd389cc121a890c27efa773a405a5d8b1f117d9 SHA512 a6a6e47d6cb9ec6826d48a50a2abac69e4a040f2b5830d39e8a006c738a163fb15fde8630bf271d92cec9470601281669cd4bf942e4b7c4d42441bd5d1730572
-DIST ostree-2023.2.tar.xz 2081320 BLAKE2B f773bf979b4bc97b9b8f96dc4385745bc386c29952a36c07cdd33a7db7802876ce154b5ac1f3669605ab3949a539aa8e2b3a3d94608557eb65249b5188f9d012 SHA512 549a2bdf8cef93d421aaf990e2d1c534063f0314b5933db7ce123bdd138229e24cc171d541296e45a7546a91d35149c1c8f29ea90949876200c574e7ec297b98
-DIST ostree-2023.3.tar.xz 2075168 BLAKE2B 6e699420a89b36520e60a5682a421fd8f10eb20702abe6af97be9ee78a04be98e8d164157d29726de9e63b869051f7e60f199776ea3d959d4f0ad4165ff780c6 SHA512 af3b80d55e15b515e860ab0ee5f061f1a4d649b21441d5cde66e71ff4349ef480565cb795838ebce2f42784d53e349c2443159d9ee452277001d930ba814fe40
-DIST ostree-2023.5.tar.xz 2115184 BLAKE2B ac1fa6764e1b7e5cd6656f2977b2605e3d2c612e6ee426fc8dbd7c84d6aebe72159943d7c2e53a2898aee6c085814228df772edc35b93daa23cb14bbb5642a6f SHA512 0bb19f199344d8db7299cf710f2ba0b2657cdcb5b1fc6d85446cef9538b069e470b47fc0c2c1029e12b8b9adb978f32a6f44f48949ff5c97a01051a425a9f2d5
 DIST ostree-2024.3.tar.xz 2141876 BLAKE2B 5a2639b99697eaf3f0a94d619c5121cb095bd21813af800041a9a4a077240ed4508c96fb67387f850a42bc4058c99d2d260ff66b0cee2fc89df64dae0b9b0508 SHA512 717e74bdaffe839acad68169d4a0290b3d81f2fb31329d02c507168b00b0b02928e2bb29c8c8fcef65a6581b98d9bad991adcde1579597b4be94822546c66573
 DIST ostree-2024.8.tar.xz 2107348 BLAKE2B 933f85b122b92cf8656698bbe7cfbce8a918aca0e779185049ed6c808f194c8fb9163a08b6cf1d6b368e2bcb0f45d434d83f243fbebf06a86afefa01247dab71 SHA512 6faed3daebce443134141bbf98add459c6f0c8239cc0e050cf2517d1127f3fd6aededd4af5d8400f869683b96aea2abb93bab8869dbf2f9a4ba02324c3005e5d
diff --git a/dev-util/ostree/files/ostree-2022.6-musl-allperms.patch b/dev-util/ostree/files/ostree-2022.6-musl-allperms.patch
deleted file mode 100644
index 9f4f2a21eb14..000000000000
--- a/dev-util/ostree/files/ostree-2022.6-musl-allperms.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/879321
-
-From: ernsteiswuerfel <erhard_f@mailbox.org>
-
---- a/src/libostree/ostree-repo-checkout.c
-+++ b/src/libostree/ostree-repo-checkout.c
-@@ -37,6 +37,10 @@
- 
- #define OVERLAYFS_WHITEOUT_PREFIX ".ostree-wh."
- 
-+#if !defined(ALLPERMS)
-+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */
-+#endif
-+
- /* Per-checkout call state/caching */
- typedef struct {
-   GString *path_buf; /* buffer for real path if filtering enabled */
diff --git a/dev-util/ostree/files/ostree-2023.3-libgpg-error-underlinked-lld.patch b/dev-util/ostree/files/ostree-2023.3-libgpg-error-underlinked-lld.patch
deleted file mode 100644
index f96cb83a1e74..000000000000
--- a/dev-util/ostree/files/ostree-2023.3-libgpg-error-underlinked-lld.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/905623
-https://github.com/ostreedev/ostree/pull/2880
-
-From c3bd439d3e9c8cfad40a8080d35c5d6b29041039 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 12 Jun 2023 14:04:44 -0700
-Subject: [PATCH] libostree: Link with libgpg-error for gpg_strerror_r API
-
-With f461c02bb55bf2853a3b81ed5c8618040ab54e98 use of gpg_strerror_r
-was added this symbol comes from libgpg-error however, therefore its
-needed to add -lgpg-error to cmdline to resolve this symbol especially
-with gold and lld linker. Fixes
-
-aarch64-yoe-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: gpg_strerror_r
->>> referenced by ./.libs/libostree-1.so
---- a/configure.ac
-+++ b/configure.ac
-@@ -243,8 +243,7 @@ AC_ARG_WITH(gpgme,
- 	    [], [with_gpgme=yes])
- AS_IF([test x$with_gpgme != xno], [
-     have_gpgme=yes
--    PKG_CHECK_MODULES([OT_DEP_GPGME], gpgme >= $LIBGPGME_DEPENDENCY, [], have_gpgme=no)
--    PKG_CHECK_MODULES([OT_DEP_GPG_ERROR], [gpg-error], [], have_gpgme=no)
-+    PKG_CHECK_MODULES([OT_DEP_GPGME], [gpgme >= $LIBGPGME_DEPENDENCY gpg-error], [have_gpgme=yes], [have_gpgme=no])
-     ]
- )
- AS_IF([test x$with_gpgme != xno && test x$have_gpgme != xyes], [
diff --git a/dev-util/ostree/metadata.xml b/dev-util/ostree/metadata.xml
index 568d3a47f758..12322e128394 100644
--- a/dev-util/ostree/metadata.xml
+++ b/dev-util/ostree/metadata.xml
@@ -34,7 +34,6 @@
 		<flag name="dracut">Install dracut module</flag>
 		<flag name="gpg">Enable GPG support</flag>
 		<flag name="grub">Enable grub configuration generator</flag>
-		<flag name="httpd">Enable ostree trivial-httpd entrypoint</flag>
 		<flag name="libmount">Use libmount</flag>
 		<flag name="sodium">Use libsodium for ed25519</flag>
 		<flag name="soup">Use libsoup for networking</flag>
diff --git a/dev-util/ostree/ostree-2023.1-r1.ebuild b/dev-util/ostree/ostree-2023.1-r1.ebuild
deleted file mode 100644
index 80a7ccd04806..000000000000
--- a/dev-util/ostree/ostree-2023.1-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="Operating system and container binary deployment and upgrades"
-HOMEPAGE="https://ostreedev.github.io/ostree/"
-SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
-
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
-RESTRICT="test"
-REQUIRED_USE="
-	dracut? ( systemd )
-	http2? ( curl )
-	httpd? ( || ( curl soup ) )
-"
-
-COMMON_DEPEND="
-	app-arch/xz-utils
-	dev-libs/libassuan:=
-	dev-libs/glib:2
-	sys-fs/fuse:3
-	sys-libs/zlib
-	archive? ( app-arch/libarchive:= )
-	curl? ( net-misc/curl )
-	dracut? ( sys-kernel/dracut )
-	gpg? (
-		app-crypt/gpgme:=
-		dev-libs/libgpg-error
-	)
-	grub? ( sys-boot/grub:2= )
-	introspection? ( dev-libs/gobject-introspection )
-	libmount? ( sys-apps/util-linux )
-	selinux? ( sys-libs/libselinux )
-	sodium? ( >=dev-libs/libsodium-1.0.14:= )
-	soup? ( net-libs/libsoup:2.4 )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	doc? ( dev-util/gtk-doc )"
-
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig"
-
-S="${WORKDIR}/lib${P}"
-
-PATCHES=(
-	"${FILESDIR}"/ostree-2022.6-musl-allperms.patch
-)
-
-src_prepare() {
-	default
-
-	sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
-		-i Makefile.in Makefile-man.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Needs Bison (bug #884289)
-	unset YACC
-
-	local econfargs=(
-		--enable-man
-		--enable-shared
-		--with-grub2-mkconfig-path=grub-mkconfig
-		--with-modern-grub
-		$(use_with archive libarchive)
-		$(use_with curl)
-		$(use_with dracut dracut yesbutnoconf) #816867
-		$(use_enable doc gtk-doc)
-		$(usex introspection --enable-introspection={,} yes no)
-		$(use_with gpg gpgme)
-		$(use_enable http2)
-		$(use_enable httpd trivial-httpd-cmdline)
-		$(use_with selinux )
-		$(use_with soup)
-		$(use_with libmount)
-		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
-		$(use_with sodium ed25519-libsodium)
-		$(use_with systemd libsystemd)
-		$(use_with zeroconf avahi)
-	)
-
-	if use systemd; then
-		econfargs+=(--with-systemdsystemunitdir="$(systemd_get_systemunitdir)")
-	fi
-
-	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process ostree-tmpfiles.conf
-}
diff --git a/dev-util/ostree/ostree-2023.2-r1.ebuild b/dev-util/ostree/ostree-2023.2-r1.ebuild
deleted file mode 100644
index 5a4ceedad43a..000000000000
--- a/dev-util/ostree/ostree-2023.2-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="Operating system and container binary deployment and upgrades"
-HOMEPAGE="https://ostreedev.github.io/ostree/"
-SRC_URI="
-	https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz
-		-> ${P}.tar.xz
-"
-S="${WORKDIR}/lib${P}"
-
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
-RESTRICT="test"
-REQUIRED_USE="
-	dracut? ( systemd )
-	http2? ( curl )
-	httpd? ( || ( curl soup ) )
-"
-
-RDEPEND="
-	app-arch/xz-utils
-	dev-libs/libassuan:=
-	dev-libs/glib:2
-	sys-fs/fuse:3
-	sys-libs/zlib
-	archive? ( app-arch/libarchive:= )
-	curl? ( net-misc/curl )
-	dracut? ( sys-kernel/dracut )
-	gpg? (
-		app-crypt/gpgme:=
-		dev-libs/libgpg-error
-	)
-	grub? ( sys-boot/grub:2= )
-	introspection? ( dev-libs/gobject-introspection )
-	libmount? ( sys-apps/util-linux )
-	selinux? ( sys-libs/libselinux )
-	sodium? ( >=dev-libs/libsodium-1.0.14:= )
-	soup? ( net-libs/libsoup:2.4 )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	doc? ( dev-util/gtk-doc )
-"
-BDEPEND="
-	dev-util/glib-utils
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/ostree-2022.6-musl-allperms.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Needs Bison (bug #884289)
-	unset YACC
-
-	local econfargs=(
-		--enable-man
-		--enable-shared
-		--with-grub2-mkconfig-path=grub-mkconfig
-		--with-modern-grub
-		$(use_with archive libarchive)
-		$(use_with curl)
-		$(use_with dracut dracut yesbutnoconf) #816867
-		$(use_enable doc gtk-doc)
-		$(usex introspection --enable-introspection={,} yes no)
-		$(use_with gpg gpgme)
-		$(use_enable http2)
-		$(use_enable httpd trivial-httpd-cmdline)
-		$(use_with selinux )
-		$(use_with soup)
-		$(use_with libmount)
-		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
-		$(use_with sodium ed25519-libsodium)
-		$(use_with systemd libsystemd)
-		$(use_with zeroconf avahi)
-	)
-
-	if use systemd; then
-		econfargs+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-	fi
-
-	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process ostree-tmpfiles.conf
-}
diff --git a/dev-util/ostree/ostree-2023.3-r2.ebuild b/dev-util/ostree/ostree-2023.3-r2.ebuild
deleted file mode 100644
index 5a4ceedad43a..000000000000
--- a/dev-util/ostree/ostree-2023.3-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="Operating system and container binary deployment and upgrades"
-HOMEPAGE="https://ostreedev.github.io/ostree/"
-SRC_URI="
-	https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz
-		-> ${P}.tar.xz
-"
-S="${WORKDIR}/lib${P}"
-
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
-RESTRICT="test"
-REQUIRED_USE="
-	dracut? ( systemd )
-	http2? ( curl )
-	httpd? ( || ( curl soup ) )
-"
-
-RDEPEND="
-	app-arch/xz-utils
-	dev-libs/libassuan:=
-	dev-libs/glib:2
-	sys-fs/fuse:3
-	sys-libs/zlib
-	archive? ( app-arch/libarchive:= )
-	curl? ( net-misc/curl )
-	dracut? ( sys-kernel/dracut )
-	gpg? (
-		app-crypt/gpgme:=
-		dev-libs/libgpg-error
-	)
-	grub? ( sys-boot/grub:2= )
-	introspection? ( dev-libs/gobject-introspection )
-	libmount? ( sys-apps/util-linux )
-	selinux? ( sys-libs/libselinux )
-	sodium? ( >=dev-libs/libsodium-1.0.14:= )
-	soup? ( net-libs/libsoup:2.4 )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	doc? ( dev-util/gtk-doc )
-"
-BDEPEND="
-	dev-util/glib-utils
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/ostree-2022.6-musl-allperms.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Needs Bison (bug #884289)
-	unset YACC
-
-	local econfargs=(
-		--enable-man
-		--enable-shared
-		--with-grub2-mkconfig-path=grub-mkconfig
-		--with-modern-grub
-		$(use_with archive libarchive)
-		$(use_with curl)
-		$(use_with dracut dracut yesbutnoconf) #816867
-		$(use_enable doc gtk-doc)
-		$(usex introspection --enable-introspection={,} yes no)
-		$(use_with gpg gpgme)
-		$(use_enable http2)
-		$(use_enable httpd trivial-httpd-cmdline)
-		$(use_with selinux )
-		$(use_with soup)
-		$(use_with libmount)
-		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
-		$(use_with sodium ed25519-libsodium)
-		$(use_with systemd libsystemd)
-		$(use_with zeroconf avahi)
-	)
-
-	if use systemd; then
-		econfargs+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-	fi
-
-	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process ostree-tmpfiles.conf
-}
diff --git a/dev-util/ostree/ostree-2023.3-r3.ebuild b/dev-util/ostree/ostree-2023.3-r3.ebuild
deleted file mode 100644
index 48eb2de51fc0..000000000000
--- a/dev-util/ostree/ostree-2023.3-r3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="Operating system and container binary deployment and upgrades"
-HOMEPAGE="https://ostreedev.github.io/ostree/"
-SRC_URI="
-	https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz
-		-> ${P}.tar.xz
-"
-S="${WORKDIR}/lib${P}"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
-RESTRICT="test"
-REQUIRED_USE="
-	dracut? ( systemd )
-	http2? ( curl )
-	httpd? ( || ( curl soup ) )
-"
-
-RDEPEND="
-	app-arch/xz-utils
-	dev-libs/libassuan:=
-	dev-libs/glib:2
-	sys-fs/fuse:3
-	sys-libs/zlib
-	archive? ( app-arch/libarchive:= )
-	curl? ( net-misc/curl )
-	dracut? ( sys-kernel/dracut )
-	gpg? (
-		app-crypt/gpgme:=
-		dev-libs/libgpg-error
-	)
-	grub? ( sys-boot/grub:2= )
-	introspection? ( dev-libs/gobject-introspection )
-	libmount? ( sys-apps/util-linux )
-	selinux? ( sys-libs/libselinux )
-	sodium? ( >=dev-libs/libsodium-1.0.14:= )
-	soup? ( net-libs/libsoup:2.4 )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	doc? ( dev-util/gtk-doc )
-"
-BDEPEND="
-	dev-util/glib-utils
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/ostree-2023.3-libgpg-error-underlinked-lld.patch
-	"${FILESDIR}"/ostree-2023.3-dont-force-clang-introspection.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Needs Bison (bug #884289)
-	unset YACC
-
-	local econfargs=(
-		--enable-man
-		--enable-shared
-		--with-grub2-mkconfig-path=grub-mkconfig
-		--with-modern-grub
-		$(use_with archive libarchive)
-		$(use_with curl)
-		$(use_with dracut dracut yesbutnoconf) #816867
-		$(use_enable doc gtk-doc)
-		$(usex introspection --enable-introspection={,} yes no)
-		$(use_with gpg gpgme)
-		$(use_enable http2)
-		$(use_enable httpd trivial-httpd-cmdline)
-		$(use_with selinux )
-		$(use_with soup)
-		$(use_with libmount)
-		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
-		$(use_with sodium ed25519-libsodium)
-		$(use_with systemd libsystemd)
-		$(use_with zeroconf avahi)
-	)
-
-	if use systemd; then
-		econfargs+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-	fi
-
-	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process ostree-tmpfiles.conf
-}
diff --git a/dev-util/ostree/ostree-2023.5.ebuild b/dev-util/ostree/ostree-2023.5.ebuild
deleted file mode 100644
index bd78accab71b..000000000000
--- a/dev-util/ostree/ostree-2023.5.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="Operating system and container binary deployment and upgrades"
-HOMEPAGE="https://ostreedev.github.io/ostree/"
-SRC_URI="
-	https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz
-		-> ${P}.tar.xz
-"
-S="${WORKDIR}/lib${P}"
-
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
-RESTRICT="test"
-REQUIRED_USE="
-	dracut? ( systemd )
-	http2? ( curl )
-	httpd? ( || ( curl soup ) )
-"
-
-RDEPEND="
-	app-arch/xz-utils
-	dev-libs/glib:2
-	sys-fs/fuse:3
-	sys-libs/zlib
-	archive? ( app-arch/libarchive:= )
-	curl? ( net-misc/curl )
-	dracut? ( sys-kernel/dracut )
-	gpg? (
-		app-crypt/gpgme:=
-		dev-libs/libgpg-error
-	)
-	grub? ( sys-boot/grub:2= )
-	introspection? ( dev-libs/gobject-introspection )
-	libmount? ( sys-apps/util-linux )
-	selinux? ( sys-libs/libselinux )
-	sodium? ( >=dev-libs/libsodium-1.0.14:= )
-	soup? ( net-libs/libsoup:3.0 )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3
-	)
-"
-BDEPEND="
-	dev-libs/libxslt
-	dev-util/glib-utils
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/ostree-2023.3-dont-force-clang-introspection.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Needs Bison (bug #884289)
-	unset YACC
-
-	local econfargs=(
-		--enable-man
-		--enable-shared
-		--with-grub2-mkconfig-path=grub-mkconfig
-		--with-modern-grub
-		$(use_with archive libarchive)
-		$(use_with curl)
-		$(use_with dracut dracut yesbutnoconf) #816867
-		$(use_enable doc gtk-doc)
-		$(usex introspection --enable-introspection={,} yes no)
-		$(use_with gpg gpgme)
-		$(use_enable http2)
-		$(use_enable httpd trivial-httpd-cmdline)
-		$(use_with selinux )
-		$(use_with soup soup3)
-		--without-soup # libsoup:2.4
-		$(use_with libmount)
-		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
-		$(use_with sodium ed25519-libsodium)
-		$(use_with systemd libsystemd)
-		$(use_with zeroconf avahi)
-	)
-
-	if use systemd; then
-		econfargs+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-	fi
-
-	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process ostree-tmpfiles.conf
-}
diff --git a/dev-util/ostree/ostree-2024.3.ebuild b/dev-util/ostree/ostree-2024.3.ebuild
deleted file mode 100644
index bc45f57a3635..000000000000
--- a/dev-util/ostree/ostree-2024.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="Operating system and container binary deployment and upgrades"
-HOMEPAGE="https://ostreedev.github.io/ostree/"
-SRC_URI="
-	https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz
-		-> ${P}.tar.xz
-"
-S="${WORKDIR}/lib${P}"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="archive +curl doc dracut gnutls +gpg grub +http2 introspection libmount selinux sodium ssl +soup systemd zeroconf"
-RESTRICT="test"
-REQUIRED_USE="
-	dracut? ( systemd )
-	http2? ( curl )
-"
-
-RDEPEND="
-	app-arch/xz-utils
-	dev-libs/glib:2
-	sys-fs/fuse:3
-	sys-libs/zlib
-	archive? ( app-arch/libarchive:= )
-	curl? ( net-misc/curl )
-	dracut? ( sys-kernel/dracut )
-	gpg? (
-		app-crypt/gpgme:=
-		dev-libs/libgpg-error
-	)
-	grub? ( sys-boot/grub:2= )
-	introspection? ( dev-libs/gobject-introspection )
-	libmount? ( sys-apps/util-linux )
-	selinux? ( sys-libs/libselinux )
-	sodium? ( >=dev-libs/libsodium-1.0.14:= )
-	soup? ( net-libs/libsoup:3.0 )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3
-	)
-"
-BDEPEND="
-	dev-libs/libxslt
-	dev-util/glib-utils
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/ostree-2023.3-dont-force-clang-introspection.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Needs Bison (bug #884289)
-	unset YACC
-
-	local econfargs=(
-		--enable-man
-		--enable-shared
-		--with-grub2-mkconfig-path=grub-mkconfig
-		--with-modern-grub
-		$(use_with archive libarchive)
-		$(use_with curl)
-		$(use_with dracut dracut yesbutnoconf) #816867
-		$(use_enable doc gtk-doc)
-		$(usex introspection --enable-introspection={,} yes no)
-		$(use_with gpg gpgme)
-		$(use_enable http2)
-		$(use_with selinux )
-		$(use_with soup soup3)
-		--without-soup # libsoup:2.4
-		$(use_with libmount)
-		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
-		$(use_with sodium ed25519-libsodium)
-		$(use_with systemd libsystemd)
-		$(use_with zeroconf avahi)
-	)
-
-	if use systemd; then
-		econfargs+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-	fi
-
-	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process ostree-tmpfiles.conf
-}
diff --git a/dev-util/pahole/Manifest b/dev-util/pahole/Manifest
index 34d4bcd44086..b8ff3e471184 100644
--- a/dev-util/pahole/Manifest
+++ b/dev-util/pahole/Manifest
@@ -1,7 +1,2 @@
-DIST dwarves-1.24.tar.xz 875744 BLAKE2B 6766b5a5ecbf64013227e7cd459af662fc213f230b5b1279354fcaaccebfa3d74f9a2254542dc4f3f1bb4a5def1d4c77e2445fa8b531fa8b9e331cdfc23155fe SHA512 3cdca183cf68ec46fd9a0301ae4a8a30b23a8139c65ffba64ae11f85f9e942f7341dca6f88a4a3b49f32bfd880927193a80fa011726e4a33d3e5a1a146326c06
-DIST dwarves-1.25.tar.xz 2244876 BLAKE2B 1926fa1fa123fc3ad0f7f063406260b1e1e2611c563fedebee4c837e491164571fdb40408421c0c4ea2fd24e89c54a7a1ea669313b6dd6d7dcfa4934e2c1336e SHA512 104bfb8712d863e04d0c827c008b23ebc49543b17bfb5b44ce276a5b3d39f12cf71f721055ae2e5f430aa77a3c70f85f6eeaf72fd8c1cdf547260488bc5b5070
-DIST dwarves-1.26.tar.sign 228 BLAKE2B 211f73da11d6ed61383fc0470c298360e7acae5fbeb2f963533fd3a984257f35b5626f04de9de92326723f06bea95a38903cee7f602146b12b1333cea2b720d0 SHA512 2f92951019847cddbfe90cd0e49a5746ca4886e25a9f8e26697688bec25d667255556bdc1ab897021eaa739d067a8d3e4fbbd0d7c9f7f56934676616fa11bce8
-DIST dwarves-1.26.tar.xz 2250036 BLAKE2B cb86bf964f22633432e80d335937379c2096877c6130f49dbe03f2653b7c932bb1c5d87621ac93383be9e4f35294a4f95aadb6392491fb782812db519b39b666 SHA512 72e3c708ac6304d28daaab1c4365b66252d016987cbf33ec6d18456718478d7b96d6916dc3686069a386e97a9db355bb1e5e078c0c7b40e93bd7e8bd0b0380be
 DIST dwarves-1.27.tar.sign 228 BLAKE2B c15de74840aac809912b4b8bdd4c9171ba909bf6ad5d1466b33e67371455c19182e713d1a6abe134205cef909be5a5c1dcf8a24964b9e17fe1903963e7682e20 SHA512 4f46766f4d0bdd2d6b5409a62d59eb4f27473bd78aa2a9e03b44f13f740dab94e41ce565a44428f042f1b9eaf465392c136398aebc532b339db2a6d0b147fdfa
 DIST dwarves-1.27.tar.xz 2254968 BLAKE2B 0a0f8ec8bf26240e17dc3319e76e16299514d662a79b25c4c962f723127f55d185d557adba7230d23b2e2b38fc62044aaa3474a458dc3df2000260637f995121 SHA512 4eae00e2e5b636fce6c6b38f59ac561b0e613c23af1bc6e16d9e9df2b71323e090d4101dde7e5020e30c2251c364cb731c82865fd0c65c4aa417b7cc706cfe25
-DIST pahole-1.24_p20221024-patches.tar.xz 22088 BLAKE2B b39458400411dd7da0f568257f42164952e170b952e4893a92d769e17ce4cf0de88b727808a38195438fe10e5537f245bf101f647f383b6df7642c5446fa5d45 SHA512 93f160f01023c5402535a34d59005f0a3e056662a2764722480d71b6e522f3bfef0d642084467d1fbea96e23386b4cbb708243713d59eb84f4f767c1ac5ab3f5
diff --git a/dev-util/pahole/pahole-1.24_p20221024.ebuild b/dev-util/pahole/pahole-1.24_p20221024.ebuild
deleted file mode 100644
index 5fd761b5e9be..000000000000
--- a/dev-util/pahole/pahole-1.24_p20221024.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-inherit cmake python-single-r1
-
-MY_PN=dwarves
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
-	inherit git-r3
-elif [[ ${PV} == *_p* ]] ; then
-	# Snapshots
-	#SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-
-	# Patch rollups from git format-patch. Sometimes there are important
-	# fixes in git which haven't been released (and no release in sight).
-	# Patch rollups are a bit better for understanding where changes have
-	# come from for users.
-	SRC_URI="
-		http://fedorapeople.org/~acme/${MY_PN}/${MY_P%%_p*}.tar.xz
-		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz
-	"
-	S="${WORKDIR}"/${MY_P%%_p*}
-else
-	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz"
-	S="${WORKDIR}"/${MY_P}
-fi
-
-LICENSE="GPL-2" # only
-SLOT="0"
-IUSE="debug"
-if [[ ${PV} != 9999 ]] ; then
-	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-fi
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_prepare() {
-	[[ -d "${WORKDIR}"/${P}-patches ]] && PATCHES+=( "${WORKDIR}"/${P}-patches )
-
-	cmake_src_prepare
-	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
-}
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake_src_configure
-}
diff --git a/dev-util/pahole/pahole-1.25.ebuild b/dev-util/pahole/pahole-1.25.ebuild
deleted file mode 100644
index 4c97be0cc661..000000000000
--- a/dev-util/pahole/pahole-1.25.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-inherit cmake python-single-r1
-
-MY_PN=dwarves
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
-	inherit git-r3
-elif [[ ${PV} == *_p* ]] ; then
-	# Snapshots
-	#SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-
-	# Patch rollups from git format-patch. Sometimes there are important
-	# fixes in git which haven't been released (and no release in sight).
-	# Patch rollups are a bit better for understanding where changes have
-	# come from for users.
-	SRC_URI="
-		http://fedorapeople.org/~acme/${MY_PN}/${MY_P%%_p*}.tar.xz
-		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz
-	"
-	S="${WORKDIR}"/${MY_P%%_p*}
-else
-	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz"
-	S="${WORKDIR}"/${MY_P}
-fi
-
-LICENSE="GPL-2" # only
-SLOT="0"
-IUSE="debug"
-if [[ ${PV} != 9999 ]] ; then
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-fi
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_prepare() {
-	[[ -d "${WORKDIR}"/${P}-patches ]] && PATCHES+=( "${WORKDIR}"/${P}-patches )
-
-	cmake_src_prepare
-	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
-}
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake_src_configure
-}
diff --git a/dev-util/pahole/pahole-1.26-r1.ebuild b/dev-util/pahole/pahole-1.26-r1.ebuild
deleted file mode 100644
index d55f767254cb..000000000000
--- a/dev-util/pahole/pahole-1.26-r1.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
-
-PYTHON_COMPAT=( python3_{9..12} )
-inherit cmake python-single-r1
-
-MY_PN=dwarves
-MY_P=${MY_PN}-${PV%%_p*}
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/arnaldocarvalhodemelo.asc
-	inherit verify-sig
-	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz
-		verify-sig? ( http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.sign )"
-	if [[ ${PV} == *_p* ]] ; then
-		# Patch rollups from git format-patch. Sometimes there are important
-		# fixes in git which haven't been released (and no release in sight).
-		# Patch rollups are a bit better for understanding where changes have
-		# come from for users.
-		SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz"
-	fi
-	S="${WORKDIR}"/${MY_P}
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-arnaldocarvalhodemelo )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="GPL-2" # only
-SLOT="0"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		return
-	fi
-
-	# Upstream sign the decompressed .tar
-	if use verify-sig; then
-		einfo "Unpacking ${MY_P}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	[[ -d "${WORKDIR}"/${P}-patches ]] && PATCHES+=( "${WORKDIR}"/${P}-patches )
-
-	cmake_src_prepare
-	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
-}
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake_src_configure
-}
diff --git a/dev-util/pahole/pahole-1.26.ebuild b/dev-util/pahole/pahole-1.26.ebuild
deleted file mode 100644
index 0f86a6f9090d..000000000000
--- a/dev-util/pahole/pahole-1.26.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=( python3_{9..12} )
-inherit cmake python-single-r1
-
-MY_PN=dwarves
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
-	inherit git-r3
-elif [[ ${PV} == *_p* ]] ; then
-	# Snapshots
-	#SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-
-	# Patch rollups from git format-patch. Sometimes there are important
-	# fixes in git which haven't been released (and no release in sight).
-	# Patch rollups are a bit better for understanding where changes have
-	# come from for users.
-	SRC_URI="
-		http://fedorapeople.org/~acme/${MY_PN}/${MY_P%%_p*}.tar.xz
-		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz
-	"
-	S="${WORKDIR}"/${MY_P%%_p*}
-else
-	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz"
-	S="${WORKDIR}"/${MY_P}
-fi
-
-LICENSE="GPL-2" # only
-SLOT="0"
-IUSE="debug"
-if [[ ${PV} != 9999 ]] ; then
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_prepare() {
-	[[ -d "${WORKDIR}"/${P}-patches ]] && PATCHES+=( "${WORKDIR}"/${P}-patches )
-
-	cmake_src_prepare
-	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
-}
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake_src_configure
-}
diff --git a/dev-util/pahole/pahole-1.27.ebuild b/dev-util/pahole/pahole-1.27.ebuild
deleted file mode 100644
index d55f767254cb..000000000000
--- a/dev-util/pahole/pahole-1.27.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
-
-PYTHON_COMPAT=( python3_{9..12} )
-inherit cmake python-single-r1
-
-MY_PN=dwarves
-MY_P=${MY_PN}-${PV%%_p*}
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/arnaldocarvalhodemelo.asc
-	inherit verify-sig
-	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz
-		verify-sig? ( http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.sign )"
-	if [[ ${PV} == *_p* ]] ; then
-		# Patch rollups from git format-patch. Sometimes there are important
-		# fixes in git which haven't been released (and no release in sight).
-		# Patch rollups are a bit better for understanding where changes have
-		# come from for users.
-		SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz"
-	fi
-	S="${WORKDIR}"/${MY_P}
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-arnaldocarvalhodemelo )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="GPL-2" # only
-SLOT="0"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		return
-	fi
-
-	# Upstream sign the decompressed .tar
-	if use verify-sig; then
-		einfo "Unpacking ${MY_P}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	[[ -d "${WORKDIR}"/${P}-patches ]] && PATCHES+=( "${WORKDIR}"/${P}-patches )
-
-	cmake_src_prepare
-	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
-}
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake_src_configure
-}
diff --git a/dev-util/pixi/Manifest b/dev-util/pixi/Manifest
new file mode 100644
index 000000000000..99a8d85104b8
--- /dev/null
+++ b/dev-util/pixi/Manifest
@@ -0,0 +1,6 @@
+DIST pixi-0.39.5-crates.tar.xz 48798324 BLAKE2B 0ae0d903dab4d35cf71b9dc32c8c42213c9452472248ad01be0153914d3d4740eab2f425306c6cd5fff5730d1c5c70a138087f9d30e30452b71b354fe0163911 SHA512 509e77f7500c2ed1328ad0d27d6749bb1e46d7fc0b2eddcde3fef04b7b5d7941215724e0aa364eebd20672b2f62d5a1fc695d42450b3b2b89b77a49c4edaba5b
+DIST pixi-0.39.5.tar.gz 6767808 BLAKE2B f464422d99c1afb8b8c70b50a664fe473152e05bd8f5ca3013ecbe30a02b07430428d0363c31e5203ed0c1af9ec65e62d72902e62d4cd70d74754e62c8c3bbc7 SHA512 44f55a824c252903659568c57d0be644791924b867838660b546d53e2612859d76561a0a9edb02215b5dd71de837a6d799f9846e8da50e6e26471ba41b4f897a
+DIST pubgrub-57832d0588fbb7aab824813481104761dc1c7740.gh.tar.gz 95600 BLAKE2B 8bdf971091d6816c326925c4603aa9296d6a92c2ede6a6245e0e5e64b741863e5d93aac03990004c13bd592d3d6ca2c662500e4c8d33e9959d6df9e1023a41e5 SHA512 8eae3c00928d921ca7cfdeff124962e477ae32387fb4b1ebfecd968181ec6bb2c2d96c918d8a9f521f1b9666eb6272c9f982b444d22a432f9471414f081694ee
+DIST rs-async-zip-c909fda63fcafe4af496a07bfda28a5aae97e58d.gh.tar.gz 51763 BLAKE2B 59d053bc6692014d884a9247dea1b57a8789469ba2abbcc92ec21bb0022cbd74874afc463082156ab697aa6c80635019857a5d7e2dc150274e8b04d720518c36 SHA512 3a309566f4925b02496fcf19bc2865968edf6fb65082ca4079d2cee79e6b0353a1910c079f2afe656da0d0f6ddde5102052a221ea35a7dabc6d690a11218b20a
+DIST tl-6e25b2ee2513d75385101a8ff9f591ef51f314ec.gh.tar.gz 37106 BLAKE2B c30d1c33f6f52e2bc83823eb6319f8a3e462b7c7408fb6a08f995747857ef234f81db4135a04f9d183095fe473a4087f8f0cb89d8f87ef4400285d2ce034ec22 SHA512 4abbc4240ed129c92da8d616e27a6df0f24cdc85a0803acfdae588ca91f9e5b8d482e3ac88b2e657ff68917b1b43cef1e7ef3c887f624659b231fa5a13fcae68
+DIST uv-878234ba6b9a3b143e079ca9baa4bec99af93600.gh.tar.gz 2954714 BLAKE2B 93ccda78c9f3302eacbf074ec011f476e2093e8cbe89c4d8b697fadeb00055f1e2a0fb20d7c108a53fd5e47ad12702ea230b45b61d580aebbaeadfeda2fb605a SHA512 cde1ddb6355abfa8529a32b16fb468d31066c38ebf2723e3927427c319a1782118889823e4faebd906802a67cb6b285423c59f9463d6780724751f9d1aab4ac6
diff --git a/dev-util/pixi/files/pixi-0.39.5-offline-tests.patch b/dev-util/pixi/files/pixi-0.39.5-offline-tests.patch
new file mode 100644
index 000000000000..e01a35c196c1
--- /dev/null
+++ b/dev-util/pixi/files/pixi-0.39.5-offline-tests.patch
@@ -0,0 +1,81 @@
+From 6158a713bf285b7817f74e4d4844cc00ee840a4a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 11 Jan 2025 11:34:49 +0100
+Subject: [PATCH] test: add `online_tests` feature to control Internet use
+
+Add an `online_tests` feature that specifically covers tests accessing
+the Internet.  It is enabled by default to preserve the existing
+behavior, but can be explicitly disabled when running the test suite
+entirely offline.
+
+I have not added the respective feature checks to
+`slow_integration_tests`, as they all seem to require Internet, so that
+seems redundant.
+
+Fixes #2880
+---
+ Cargo.toml                                  | 4 +++-
+ tests/integration_rust/solve_group_tests.rs | 4 ++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 26a527eb..ddcc4602 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -167,7 +167,7 @@ repository.workspace = true
+ version = "0.39.5"
+ 
+ [features]
+-default = ["rustls-tls"]
++default = ["online_tests", "rustls-tls"]
+ native-tls = [
+   "reqwest/native-tls",
+   "reqwest/native-tls-alpn",
+@@ -175,6 +175,8 @@ native-tls = [
+   "rattler/native-tls",
+   "pixi_utils/native-tls",
+ ]
++# run tests connecting to remote Internet services
++online_tests = []
+ rustls-tls = [
+   "reqwest/rustls-tls",
+   "reqwest/rustls-tls-native-roots",
+diff --git a/tests/integration_rust/solve_group_tests.rs b/tests/integration_rust/solve_group_tests.rs
+index 5f945bfd..efc5e9e9 100644
+--- a/tests/integration_rust/solve_group_tests.rs
++++ b/tests/integration_rust/solve_group_tests.rs
+@@ -163,6 +163,7 @@ async fn test_purl_are_added_for_pypi() {
+ }
+ 
+ #[tokio::test]
++#[cfg_attr(not(feature = "online_tests"), ignore)]
+ async fn test_purl_are_missing_for_non_conda_forge() {
+     let pixi = PixiControl::new().unwrap();
+     pixi.init().await.unwrap();
+@@ -206,6 +207,7 @@ async fn test_purl_are_missing_for_non_conda_forge() {
+ }
+ 
+ #[tokio::test]
++#[cfg_attr(not(feature = "online_tests"), ignore)]
+ async fn test_purl_are_generated_using_custom_mapping() {
+     let pixi = PixiControl::new().unwrap();
+     pixi.init().await.unwrap();
+@@ -250,6 +252,7 @@ async fn test_purl_are_generated_using_custom_mapping() {
+ }
+ 
+ #[tokio::test]
++#[cfg_attr(not(feature = "online_tests"), ignore)]
+ async fn test_compressed_mapping_catch_not_pandoc_not_a_python_package() {
+     let pixi = PixiControl::new().unwrap();
+     pixi.init().await.unwrap();
+@@ -290,6 +293,7 @@ async fn test_compressed_mapping_catch_not_pandoc_not_a_python_package() {
+ }
+ 
+ #[tokio::test]
++#[cfg_attr(not(feature = "online_tests"), ignore)]
+ async fn test_dont_record_not_present_package_as_purl() {
+     let pixi = PixiControl::new().unwrap();
+     pixi.init().await.unwrap();
+-- 
+2.47.1
+
diff --git a/dev-util/pixi/metadata.xml b/dev-util/pixi/metadata.xml
new file mode 100644
index 000000000000..8d4e3d5944d6
--- /dev/null
+++ b/dev-util/pixi/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>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">prefix-dev/pixi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/pixi/pixi-0.39.5.ebuild b/dev-util/pixi/pixi-0.39.5.ebuild
new file mode 100644
index 000000000000..cdf78e0eb0be
--- /dev/null
+++ b/dev-util/pixi/pixi-0.39.5.ebuild
@@ -0,0 +1,121 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;57832d0588fbb7aab824813481104761dc1c7740;pubgrub-%commit%'
+	[tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
+	[uv-auth]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-auth'
+	[uv-build-frontend]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-build-frontend'
+	[uv-cache-info]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-cache-info'
+	[uv-cache-key]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-cache-key'
+	[uv-cache]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-cache'
+	[uv-client]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-client'
+	[uv-configuration]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-configuration'
+	[uv-console]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-console'
+	[uv-dirs]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-dirs'
+	[uv-dispatch]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-dispatch'
+	[uv-distribution-filename]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-distribution-filename'
+	[uv-distribution-types]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-distribution-types'
+	[uv-distribution]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-distribution'
+	[uv-extract]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-extract'
+	[uv-fs]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-fs'
+	[uv-git]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-git'
+	[uv-install-wheel]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-install-wheel'
+	[uv-installer]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-installer'
+	[uv-macros]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-macros'
+	[uv-metadata]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-metadata'
+	[uv-normalize]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-normalize'
+	[uv-once-map]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-once-map'
+	[uv-options-metadata]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-options-metadata'
+	[uv-pep440]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-pep440'
+	[uv-pep508]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-pep508'
+	[uv-platform-tags]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-platform-tags'
+	[uv-pypi-types]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-pypi-types'
+	[uv-python]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-python'
+	[uv-requirements-txt]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-requirements-txt'
+	[uv-requirements]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-requirements'
+	[uv-resolver]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-resolver'
+	[uv-shell]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-shell'
+	[uv-state]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-state'
+	[uv-static]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-static'
+	[uv-trampoline-builder]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-trampoline-builder'
+	[uv-types]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-types'
+	[uv-version]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-version'
+	[uv-virtualenv]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-virtualenv'
+	[uv-warnings]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-warnings'
+	[uv-workspace]='https://github.com/wolfv/uv;878234ba6b9a3b143e079ca9baa4bec99af93600;uv-%commit%/crates/uv-workspace'
+	[version-ranges]='https://github.com/astral-sh/pubgrub;57832d0588fbb7aab824813481104761dc1c7740;pubgrub-%commit%/version-ranges'
+)
+
+inherit cargo
+
+CRATE_P=${P}
+DESCRIPTION="A package management and workflow tool"
+HOMEPAGE="
+	https://pixi.sh/
+	https://github.com/prefix-dev/pixi/
+"
+SRC_URI="
+	https://github.com/prefix-dev/pixi/releases/download/v${PV}/source.tar.gz
+		-> ${P}.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/${CRATE_P}-crates.tar.xz
+	"
+fi
+
+LICENSE="BSD"
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0
+	ISC MIT MPL-2.0 MPL-2.0 Unicode-3.0 ZLIB
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-arch/zstd:=
+	dev-libs/openssl:=
+"
+
+PATCHES=(
+	# https://github.com/prefix-dev/pixi/pull/2881
+	"${FILESDIR}/${P}-offline-tests.patch"
+)
+
+src_configure() {
+	local myfeatures=(
+		native-tls
+	)
+	cargo_src_configure --no-default-features
+
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+
+	# bzip2-sys requires a pkg-config file
+	# https://github.com/alexcrichton/bzip2-rs/issues/104
+	mkdir "${T}/pkg-config" || die
+	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
+	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
+		Name: bzip2
+		Version: 9999
+		Description:
+		Libs: -lbz2
+	EOF
+}
+
+src_test() {
+	# tests use it to test preserving envvars, apparently assuming
+	# it will be always set
+	local -x USER=${USER}
+	cargo_src_test --no-fail-fast
+}
diff --git a/dev-util/pkgcruft/Manifest b/dev-util/pkgcruft/Manifest
index 1bee93613f44..57e7e39a3123 100644
--- a/dev-util/pkgcruft/Manifest
+++ b/dev-util/pkgcruft/Manifest
@@ -1,3 +1,4 @@
 DIST pkgcruft-0.0.4.tar.xz 24507420 BLAKE2B 89e127bd6f22686c4e0335817ed050bf3edcd8b0247a372531ab5daf020e526721d6e10080c8e1230026d87762e769535187d30a9ff86bbfe4c2f1865a322324 SHA512 464eef7c19313e97eac59367e286181c441e04a76deaa75f551b3866da5dcdb7bfa7703552143b6b32afee5beac85df72af48fe627f8a3838cb823f672f50d84
 DIST pkgcruft-0.0.6.tar.xz 24528884 BLAKE2B 88b476920661076dbe70bd0ba0fd84d355dc77d579496702c43f8e55384ea6dce3fe305ef861ecc5c4bcd4e1046d8b672ce1ca0dbc83c7560191c1818761e63a SHA512 f978e1d398c00580990a8026ea6cec5d32825e2e0e831ea059462a3a808899b7a94064bcc91ee6901f55d1085641ccb96211603cac3a30e32a8567706f339fd1
 DIST pkgcruft-0.0.8.tar.xz 30828500 BLAKE2B 1e20bd2029d03f56d7454daccbf06e327a5f95b56dbec52c12713f3b32b3423aac89d40c6bb7a0677b5977a06bb2a708bcea669056d78664f605278a0253c82e SHA512 4f791b2d1570fd0b68ca16cd4dd129b6fcfec825a748e2bf80c731eb2f70689ca515b640ca2f65c61673b0d5b766eae64ecbff05e8ad629b65ed38cf43590820
+DIST pkgcruft-0.0.9.tar.xz 30898984 BLAKE2B 72b3a86f58b7e2d15fff933a34e99462d58a29041120bef5bcfcdd50582127c2a35e432546bbd6513512b328cc6bec6ca2f5cd4aa57db97f1249b71ce9766668 SHA512 9d39d4db90ca1b8be7a1b6712f6ff731f4bfd681022d8f91a200f3563a6c5c0db3432b8dec8e09f912e2dbe2bfba82cf524107d83a6c26660da8e062140186dd
diff --git a/dev-util/pkgcruft/pkgcruft-0.0.4.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.4.ebuild
index e97e461b06d5..7e174520f16f 100644
--- a/dev-util/pkgcruft/pkgcruft-0.0.4.ebuild
+++ b/dev-util/pkgcruft/pkgcruft-0.0.4.ebuild
@@ -1,12 +1,13 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 CRATES=" "
+LLVM_COMPAT=( {17..19} )
 RUST_MIN_VER="1.80.0"
 
-inherit cargo edo flag-o-matic toolchain-funcs
+inherit cargo edo flag-o-matic llvm-r2 toolchain-funcs
 
 DESCRIPTION="QA library and tools based on pkgcraft"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -33,12 +34,19 @@ RESTRICT="!test? ( test )"
 
 # clang needed for bindgen
 BDEPEND+="
-	llvm-core/clang
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+	')
 	test? ( dev-util/cargo-nextest )
 "
 
 QA_FLAGS_IGNORED="usr/bin/pkgcruft"
 
+pkg_setup() {
+	llvm-r2_pkg_setup
+	rust_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack
diff --git a/dev-util/pkgcruft/pkgcruft-0.0.6.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.6.ebuild
index e97e461b06d5..7e174520f16f 100644
--- a/dev-util/pkgcruft/pkgcruft-0.0.6.ebuild
+++ b/dev-util/pkgcruft/pkgcruft-0.0.6.ebuild
@@ -1,12 +1,13 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 CRATES=" "
+LLVM_COMPAT=( {17..19} )
 RUST_MIN_VER="1.80.0"
 
-inherit cargo edo flag-o-matic toolchain-funcs
+inherit cargo edo flag-o-matic llvm-r2 toolchain-funcs
 
 DESCRIPTION="QA library and tools based on pkgcraft"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -33,12 +34,19 @@ RESTRICT="!test? ( test )"
 
 # clang needed for bindgen
 BDEPEND+="
-	llvm-core/clang
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+	')
 	test? ( dev-util/cargo-nextest )
 "
 
 QA_FLAGS_IGNORED="usr/bin/pkgcruft"
 
+pkg_setup() {
+	llvm-r2_pkg_setup
+	rust_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack
diff --git a/dev-util/pkgcruft/pkgcruft-0.0.8.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.8.ebuild
index 85344d2bb45f..f48c110f0cab 100644
--- a/dev-util/pkgcruft/pkgcruft-0.0.8.ebuild
+++ b/dev-util/pkgcruft/pkgcruft-0.0.8.ebuild
@@ -1,12 +1,13 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 CRATES=" "
+LLVM_COMPAT=( {17..19} )
 RUST_MIN_VER="1.82.0"
 
-inherit cargo edo flag-o-matic shell-completion toolchain-funcs
+inherit cargo edo flag-o-matic llvm-r2 shell-completion toolchain-funcs
 
 DESCRIPTION="QA library and tools based on pkgcraft"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -33,12 +34,19 @@ RESTRICT="!test? ( test )"
 
 # clang needed for bindgen
 BDEPEND+="
-	llvm-core/clang
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+	')
 	test? ( dev-util/cargo-nextest )
 "
 
 QA_FLAGS_IGNORED="usr/bin/pkgcruft"
 
+pkg_setup() {
+	llvm-r2_pkg_setup
+	rust_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack
diff --git a/dev-util/pkgcruft/pkgcruft-0.0.9.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.9.ebuild
new file mode 100644
index 000000000000..77a30535553a
--- /dev/null
+++ b/dev-util/pkgcruft/pkgcruft-0.0.9.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=" "
+LLVM_COMPAT=( {17..19} )
+RUST_MIN_VER="1.82.0"
+
+inherit cargo edo llvm-r2 shell-completion toolchain-funcs
+
+DESCRIPTION="QA library and tools based on pkgcraft"
+HOMEPAGE="https://pkgcraft.github.io/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft"
+	inherit git-r3
+
+	S="${WORKDIR}"/${P}/crates/${PN}
+else
+	SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD-2 BSD CC0-1.0 GPL-3+ ISC MIT MPL-2.0 Unicode-DFS-2016
+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# clang needed for bindgen
+BDEPEND+="
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+	')
+	test? ( dev-util/cargo-nextest )
+"
+
+QA_FLAGS_IGNORED="usr/bin/pkgcruft"
+
+pkg_setup() {
+	llvm-r2_pkg_setup
+	rust_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_compile() {
+	# For scallop building bash
+	tc-export AR CC
+
+	cargo_src_compile
+}
+
+src_test() {
+	unset CLICOLOR CLICOLOR_FORCE
+
+	edo cargo nextest run $(usev !debug '--release') --color always --all-features --tests
+}
+
+src_install() {
+	cargo_src_install
+
+	newbashcomp shell/pkgcruft.bash ${PN}
+	dozshcomp shell/_pkgcruft
+	dofishcomp shell/pkgcruft.fish
+}
diff --git a/dev-util/pkgcruft/pkgcruft-9999.ebuild b/dev-util/pkgcruft/pkgcruft-9999.ebuild
index 85344d2bb45f..df5d0d4e8e53 100644
--- a/dev-util/pkgcruft/pkgcruft-9999.ebuild
+++ b/dev-util/pkgcruft/pkgcruft-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 CRATES=" "
+LLVM_COMPAT=( {17..19} )
 RUST_MIN_VER="1.82.0"
 
-inherit cargo edo flag-o-matic shell-completion toolchain-funcs
+inherit cargo edo llvm-r2 shell-completion toolchain-funcs
 
 DESCRIPTION="QA library and tools based on pkgcraft"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -33,12 +34,19 @@ RESTRICT="!test? ( test )"
 
 # clang needed for bindgen
 BDEPEND+="
-	llvm-core/clang
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+	')
 	test? ( dev-util/cargo-nextest )
 "
 
 QA_FLAGS_IGNORED="usr/bin/pkgcruft"
 
+pkg_setup() {
+	llvm-r2_pkg_setup
+	rust_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack
@@ -52,10 +60,8 @@ src_compile() {
 	# For scallop building bash
 	tc-export AR CC
 
-	# scallop uses modified bash-5.2 which relies on unprotoyped functions
-	append-cflags -std=gnu17
-
 	cargo_src_compile
+	edo cargo run --features shell --bin pkgcruft-shell-comp -p pkgcruft
 }
 
 src_test() {
diff --git a/dev-util/pkgdiff/Manifest b/dev-util/pkgdiff/Manifest
index 1fff2bd7d3be..8a4767641521 100644
--- a/dev-util/pkgdiff/Manifest
+++ b/dev-util/pkgdiff/Manifest
@@ -1 +1,2 @@
 DIST pkgdiff-1.7.2.tar.gz 56592 BLAKE2B 6190a8c1e018766802e12234890629efb356680dee84afdea1f989bc91196edc5460c3af3cba5229116ddcafac81f728d1d4eb52f009f9dc5f711a7718f2b0a9 SHA512 2369488e9705280be9b326b07aa9ef0e211440921b9cce5c35560a14d1ad4ac0040eb54024a88a4a5f8f831208b43124c17a817a44840500b490c89bf877b904
+DIST pkgdiff-1.8.tar.gz 105385 BLAKE2B c1c3f8199ad24d7f57839e9536cd8d0903d7ff1e61e12dd422a276f7653321d830e631e215637e32459d576fa9d1cda42714cd07643898fc5b1b61c81a015caf SHA512 da8e4bcdacc210747ee4dcd30393535f56110e93eba4e9a6071e1498309ebed0f352a6655e0e3032cc06b4324da5990680f2d744d8c3e3fbb6c201860d809304
diff --git a/dev-util/pkgdiff/metadata.xml b/dev-util/pkgdiff/metadata.xml
index 9b75c3b51a9c..5328241cdf62 100644
--- a/dev-util/pkgdiff/metadata.xml
+++ b/dev-util/pkgdiff/metadata.xml
@@ -5,4 +5,7 @@
 	<email>fordfrog@gentoo.org</email>
 	<name>Miroslav Ĺ ulc</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">lvc/pkgdiff</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-util/pkgdiff/pkgdiff-1.8.ebuild b/dev-util/pkgdiff/pkgdiff-1.8.ebuild
new file mode 100644
index 000000000000..29642f9e14b1
--- /dev/null
+++ b/dev-util/pkgdiff/pkgdiff-1.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Package Changes Analyzer (pkgdiff)"
+HOMEPAGE="https://github.com/lvc/pkgdiff"
+SRC_URI="https://github.com/lvc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-lang/perl-5"
+RDEPEND="${DEPEND}
+	app-text/wdiff
+	dev-perl/File-LibMagic
+	sys-apps/diffutils
+	sys-apps/gawk
+	sys-devel/binutils
+"
+
+src_compile() {
+	:
+}
+
+PREFIX="/usr"
+
+src_install() {
+	dodir ${PREFIX}
+	perl Makefile.pl -install --destdir "${ED}" || die "install failed"
+}
diff --git a/dev-util/pkgdiff/pkgdiff-9999.ebuild b/dev-util/pkgdiff/pkgdiff-9999.ebuild
index 9812bb968dec..cb3983eadd73 100644
--- a/dev-util/pkgdiff/pkgdiff-9999.ebuild
+++ b/dev-util/pkgdiff/pkgdiff-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit git-r3
 
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
index 6641596d933d..2628c70151c9 100644
--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@@ -1,2 +1 @@
 DIST plan9port-a2567fcac9851e5cc965a236679f568b0e79cff2.tar.gz 23415383 BLAKE2B e2c6ea86fdc77e72778df227b3b3519b1f973f5ae042389bd1637e799cfaf461b9e921def8ae4e1761f2292dabbc7f8265061d3344bf80f884b9d19c18e4dadc SHA512 fecc317d80155dd5f07346ab2a448a0ab336a615c7f9877daeff1d010545a0360bce53b4fc5d60e3466e7db760d84657b89ff4e803f75c7129d86af99c005a7e
-DIST plan9port-cc4571fec67407652b03d6603ada6580de2194dc.tar.gz 23411459 BLAKE2B 439ea7dcddfc466a7fe8bea8b75a7e73558e5cdbd7f0adf9b3367d6eab9eaab8afa8e9fb60bcf83a4a614abbd52a85ddfa65b5dd757fdd2b725f554bf66f3c90 SHA512 e347ffd04c92508b3bc324d93837c831af40b5eb11583f6c61e15c0e861067c76945a1a65929c1e725f18760035a1a14a6cd16a7b8b6a14fd2422750cef1e4d4
diff --git a/dev-util/plan9port/plan9port-0_pre20230331-r1.ebuild b/dev-util/plan9port/plan9port-0_pre20230331-r1.ebuild
deleted file mode 100644
index 2b558154c3ee..000000000000
--- a/dev-util/plan9port/plan9port-0_pre20230331-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multiprocessing toolchain-funcs readme.gentoo-r1
-
-MY_HASH="cc4571fec67407652b03d6603ada6580de2194dc"
-MY_P="${PN}-${MY_HASH}"
-
-DESCRIPTION="Port of many Plan 9 programs and libraries"
-HOMEPAGE="https://9fans.github.io/plan9port/ https://github.com/9fans/plan9port"
-SRC_URI="https://github.com/9fans/${PN}/archive/${MY_HASH}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="
-	MIT RSA Apache-2.0 public-domain BitstreamVera BZIP2
-	!freefonts? ( BigelowHolmes )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="X aqua freefonts"
-REQUIRED_USE="?? ( X aqua )"
-
-DEPEND="
-	X? (
-		media-libs/freetype
-		media-libs/fontconfig
-		x11-apps/xauth
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-noexecstack.patch"
-	"${FILESDIR}/${PN}-cflags.patch"
-	"${FILESDIR}/${PN}-builderr.patch"
-)
-
-PLAN9="/opt/plan9"
-EPLAN9="${EPREFIX}${PLAN9}"
-QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
-
-DOC_CONTENTS="Plan 9 from User Space has been successfully installed into
-${PLAN9}. Your PLAN9 and PATH environment variables have
-also been appropriately set, please use env-update and
-source /etc/profile to bring that into immediate effect.
-
-Please note that ${PLAN9}/bin has been appended to the
-*end* or your PATH to prevent conflicts. To use the Plan9
-versions of common UNIX tools, use the absolute path:
-${PLAN9}/bin or the 9 command (eg: 9 troff)
-
-Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
-DISABLE_AUTOFORMATTING="yes"
-
-src_prepare() {
-	default
-
-	if use freefonts; then
-		pushd font || die
-		rm -r big5 fixed jis luc{,m,sans} misc naga10 pelm shinonome || die
-		popd || die
-		rm -r postscript/font/luxi || die
-	fi
-
-	case "${CHOST}" in
-	*apple*)
-		sed -i 's/--noexecstack/-noexecstack/' src/mkhdr ||
-			die "Failed to sed AFLAGS" ;;
-	*)
-		rm -rf mac || die
-	esac
-
-	# don't hardcode /bin and /usr/bin in PATH
-	sed -i '/PATH/s,/bin:/usr/bin:,,' INSTALL || die "sed on INSTALL failed"
-
-	# don't hardcode /usr/{,local/}include and prefix /usr/include/*
-	sed -Ei -e 's,-I/usr(|/local)/include ,,g' \
-		-e "s,-I/usr(|/local)/include,-I${EPREFIX}/usr\1/include,g" \
-		src/cmd/fontsrv/freetyperules.sh INSTALL $(find -name makefile) ||
-		die "sed failed"
-
-	# Fix paths, done in place of ./INSTALL -c
-	einfo "Fixing hard-coded /usr/local/plan9 paths"
-	sed -i "s,/usr/local/plan9,${EPLAN9},g" $(grep -lr /usr/local/plan9) ||
-		die "sed failed"
-}
-
-src_configure() {
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/858452
-	# https://github.com/9fans/plan9port/issues/646
-	filter-lto
-
-	local -a myconf=(
-		CC9="$(tc-getCC)"
-		CC9FLAGS="'${CFLAGS} ${LDFLAGS}'"
-	)
-
-	if use X; then
-		myconf+=(
-			WSYSTYPE=x11
-			FONTSRV=fontsrv
-		)
-	elif use aqua; then
-		local wsystype="$(awk '{if ($1 > 10.5) print "osx-cocoa"; else print "osx"}' \
-			<<< "${MACOSX_DEPLOYMENT_TARGET}")"
-		myconf+=( WSYSTYPE="${wsystype}" )
-	else
-		myconf+=( WSYSTYPE=nowsys )
-	fi
-
-	printf '%s\n' "${myconf[@]}" >> LOCAL.config ||
-		die "cannot create configuration"
-}
-
-src_compile() {
-	# The INSTALL script builds mk then [re]builds everything using that
-	einfo "Compiling Plan 9 from User Space can take a very long time"
-	einfo "depending on the speed of your computer. Please be patient!"
-	NPROC="$(makeopts_jobs)" ./INSTALL -b ||
-		die "Please report bugs to bugs.gentoo.org, NOT Plan9Port."
-}
-
-src_install() {
-	readme.gentoo_create_doc
-
-	rm -rf src || die
-
-	# do* plays with the executable bit, and we should not modify them
-	dodir "${PLAN9}"
-	cp -a * "${ED}${PLAN9}" || die "cp failed"
-
-	# build the environment variables and install them in env.d
-	newenvd - 60plan9 <<-EOF
-		PLAN9="${EPLAN9}"
-		PATH="${EPLAN9}/bin"
-		ROOTPATH="${EPLAN9}/bin"
-		MANPATH="${EPLAN9}/man"
-	EOF
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/poke/poke-4.2.ebuild b/dev-util/poke/poke-4.2.ebuild
index 97d66346c37a..22d0f7a6ffb8 100644
--- a/dev-util/poke/poke-4.2.ebuild
+++ b/dev-util/poke/poke-4.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
@@ -25,7 +25,7 @@ elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then
 	REGEN_BDEPEND=""
 else
 	SRC_URI="mirror://gnu/poke/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	REGEN_BDEPEND=""
 fi
 
diff --git a/dev-util/premake/files/premake-5.0.0-c99.patch b/dev-util/premake/files/premake-5.0.0-c99.patch
new file mode 100644
index 000000000000..49f9f70e5160
--- /dev/null
+++ b/dev-util/premake/files/premake-5.0.0-c99.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/895842#c6
+diff '--color=auto' -burN premake-core-5.0.0-beta2-orig/contrib/libzip/config.h premake-core-5.0.0-beta2/contrib/libzip/config.h
+--- premake-core-5.0.0-beta2-orig/contrib/libzip/config.h	2022-09-02 21:11:21.000000000 +0200
++++ premake-core-5.0.0-beta2/contrib/libzip/config.h	2024-05-17 14:07:31.072971328 +0200
+@@ -25,6 +25,7 @@
+ #endif
+ /* #undef HAVE_STRINGS_H */
+ /* #undef HAVE_UNISTD_H */
++#define HAVE_UNISTD_H 1
+ #define __INT8_LIBZIP 1
+ #define INT8_T_LIBZIP 1
+ #define UINT8_T_LIBZIP 1
+diff '--color=auto' -burN premake-core-5.0.0-beta2-orig/contrib/libzip/mkstemp.c premake-core-5.0.0-beta2/contrib/libzip/mkstemp.c
+--- premake-core-5.0.0-beta2-orig/contrib/libzip/mkstemp.c	2022-09-02 21:11:21.000000000 +0200
++++ premake-core-5.0.0-beta2/contrib/libzip/mkstemp.c	2024-05-17 14:07:31.073971328 +0200
+@@ -31,6 +31,8 @@
+  * SUCH DAMAGE.
+  */
+ 
++#include "zipint.h"
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+@@ -43,13 +45,14 @@
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ 
+ #ifndef O_BINARY
+ #define O_BINARY 0
+ #endif
+ 
+-
+-
+ int
+ _zip_mkstemp(char *path)
+ {
+diff '--color=auto' -burN premake-core-5.0.0-beta2-orig/contrib/libzip/zip_fdopen.c premake-core-5.0.0-beta2/contrib/libzip/zip_fdopen.c
+--- premake-core-5.0.0-beta2-orig/contrib/libzip/zip_fdopen.c	2022-09-02 21:11:21.000000000 +0200
++++ premake-core-5.0.0-beta2/contrib/libzip/zip_fdopen.c	2024-05-17 14:06:29.441972020 +0200
+@@ -31,11 +31,10 @@
+   IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+ 
+-
+-
+ #include "zipint.h"
+-
+-
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ 
+ ZIP_EXTERN struct zip *
+ zip_fdopen(int fd_orig, int _flags, int *zep)
diff --git a/dev-util/premake/premake-5.0.0_beta2.ebuild b/dev-util/premake/premake-5.0.0_beta2.ebuild
index 0e2a5f82c593..3128380832df 100644
--- a/dev-util/premake/premake-5.0.0_beta2.ebuild
+++ b/dev-util/premake/premake-5.0.0_beta2.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
@@ -16,7 +16,10 @@ LICENSE="BSD"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ppc x86"
 
-PATCHES=( "${FILESDIR}/${PN}-5.0.0-remove-hardcoded-libpath.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.0-remove-hardcoded-libpath.patch"
+	"${FILESDIR}/${PN}-5.0.0-c99.patch"
+)
 
 src_compile() {
 	# bug #773505
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-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-6.patch b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-6.patch
new file mode 100644
index 000000000000..fe182b7e2f31
--- /dev/null
+++ b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-6.patch
@@ -0,0 +1,454 @@
+From 4d90f45d6c204ad87b2198791fe522be092bed98 Mon Sep 17 00:00:00 2001
+From: Alexander Lopatin <alopatindev@codonaft.com>
+Date: Tue, 14 Jan 2025 23:52:00 +0800
+Subject: [PATCH] Port to Qt 6
+
+https://bugs.gentoo.org/948065
+---
+ qdevicemonitor/StringRingBuffer.h             |  1 +
+ qdevicemonitor/devices/AndroidDevice.cpp      | 24 +++++++++++--------
+ qdevicemonitor/devices/AndroidDevice.h        |  8 +++----
+ qdevicemonitor/devices/BaseDevice.cpp         | 10 +++++---
+ qdevicemonitor/devices/BaseDevice.h           |  5 ++--
+ qdevicemonitor/devices/IOSDevice.cpp          | 24 ++++++++++++-------
+ qdevicemonitor/devices/IOSDevice.h            |  2 +-
+ qdevicemonitor/devices/TextFileDevice.cpp     | 16 +++++++------
+ qdevicemonitor/devices/TextFileDevice.h       |  2 +-
+ .../trackers/AndroidDevicesTracker.cpp        |  4 ++++
+ .../devices/trackers/IOSDevicesTracker.cpp    |  4 ++++
+ qdevicemonitor/ui/DeviceWidget.cpp            | 10 +++++---
+ qdevicemonitor/ui/DeviceWidget.h              |  4 ++--
+ qdevicemonitor/ui/MainWindow.cpp              |  3 +--
+ 14 files changed, 73 insertions(+), 44 deletions(-)
+
+diff --git a/qdevicemonitor/StringRingBuffer.h b/qdevicemonitor/StringRingBuffer.h
+index 5c6537b..76dee9d 100644
+--- a/qdevicemonitor/StringRingBuffer.h
++++ b/qdevicemonitor/StringRingBuffer.h
+@@ -18,6 +18,7 @@
+ #ifndef RINGBUFFER_H
+ #define RINGBUFFER_H
+ 
++#include <QObject>
+ #include <QPointer>
+ #include <QString>
+ #include <QVector>
+diff --git a/qdevicemonitor/devices/AndroidDevice.cpp b/qdevicemonitor/devices/AndroidDevice.cpp
+index e0785e9..a11e79f 100644
+--- a/qdevicemonitor/devices/AndroidDevice.cpp
++++ b/qdevicemonitor/devices/AndroidDevice.cpp
+@@ -146,7 +146,11 @@ void AndroidDevice::startLogger()
+         m_logFile.setFileName(currentLogAbsFileName);
+         m_logFile.open(QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate);
+         m_logFileStream = QSharedPointer<QTextStream>::create(&m_logFile);
++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+         m_logFileStream->setCodec("UTF-8");
++#else
++        m_logFileStream->setEncoding(QStringConverter::Utf8);
++#endif
+ 
+         startLogProcess();
+ 
+@@ -230,13 +234,13 @@ void AndroidDevice::filterAndAddToTextEdit(const QString& line)
+     const QRegularExpressionMatch match = re.match(line);
+     if (match.hasMatch())
+     {
+-        const QStringRef date = match.capturedRef("date");
+-        const QStringRef time = match.capturedRef("time");
+-        const QStringRef pid = match.capturedRef("pid");
+-        const QStringRef tid = match.capturedRef("tid");
+-        const QStringRef verbosity = match.capturedRef("verbosity");
+-        const QStringRef tag = match.capturedRef("tag").trimmed();
+-        const QStringRef text = line.midRef(match.capturedEnd("tag") + 1);
++        const QStringView date = match.captured("date");
++        const QStringView time = match.captured("time");
++        const QStringView pid = match.captured("pid");
++        const QStringView tid = match.captured("tid");
++        const QStringView verbosity = match.captured("verbosity");
++        const QStringView tag = match.captured("tag").trimmed();
++        const QStringView text = line.mid(match.capturedEnd("tag") + 1);
+ 
+         const auto verbosityLevel = static_cast<VerbosityEnum>(Utils::verbosityCharacterToInt(verbosity.at(0).toLatin1()));
+ 
+@@ -261,7 +265,7 @@ void AndroidDevice::filterAndAddToTextEdit(const QString& line)
+         checkFilters(filtersMatch, m_filtersValid);
+         if (filtersMatch)
+         {
+-            m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringRef(&line));
++            m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringView(line));
+             m_deviceWidget->flushText();
+         }
+     }
+@@ -269,7 +273,7 @@ void AndroidDevice::filterAndAddToTextEdit(const QString& line)
+     m_deviceWidget->highlightFilterLineEdit(!m_filtersValid);
+ }
+ 
+-void AndroidDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const VerbosityEnum verbosityLevel, const QStringRef& pid, const QStringRef& tid, const QStringRef& tag, const QStringRef& text)
++void AndroidDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const VerbosityEnum verbosityLevel, const QStringView pid, const QStringView tid, const QStringView tag, const QStringView text)
+ {
+     filtersMatch = verbosityLevel <= m_deviceWidget->getVerbosityLevel();
+ 
+@@ -283,7 +287,7 @@ void AndroidDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const V
+ 
+     for (auto it = m_filters.constBegin(); it != m_filters.constEnd(); ++it)
+     {
+-        const QStringRef filter(&(*it));
++        const QStringView filter(*it);
+         bool columnFound = false;
+         if (!columnMatches("pid:", filter, pid, filtersValid, columnFound) ||
+             !columnMatches("tid:", filter, tid, filtersValid, columnFound) ||
+diff --git a/qdevicemonitor/devices/AndroidDevice.h b/qdevicemonitor/devices/AndroidDevice.h
+index 1012c43..f908d07 100644
+--- a/qdevicemonitor/devices/AndroidDevice.h
++++ b/qdevicemonitor/devices/AndroidDevice.h
+@@ -77,10 +77,10 @@ private:
+     void checkFilters(bool& filtersMatch,
+                       bool& filtersValid,
+                       const VerbosityEnum verbosityLevel = Verbose,
+-                      const QStringRef& pid = QStringRef(),
+-                      const QStringRef& tid = QStringRef(),
+-                      const QStringRef& tag = QStringRef(),
+-                      const QStringRef& text = QStringRef());
++                      const QStringView pid = QStringView(),
++                      const QStringView tid = QStringView(),
++                      const QStringView tag = QStringView(),
++                      const QStringView text = QStringView());
+ };
+ 
+ #endif // ANDROIDDEVICE_H
+diff --git a/qdevicemonitor/devices/BaseDevice.cpp b/qdevicemonitor/devices/BaseDevice.cpp
+index 21ee82c..628d7a4 100644
+--- a/qdevicemonitor/devices/BaseDevice.cpp
++++ b/qdevicemonitor/devices/BaseDevice.cpp
+@@ -47,7 +47,11 @@ BaseDevice::BaseDevice(
+ {
+     qDebug() << "new BaseDevice; type" << type << "; id" << id;
+ 
++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+     m_tempStream.setCodec("UTF-8");
++#else
++    m_tempStream.setEncoding(QStringConverter::Utf8);
++#endif
+     m_tempStream.setString(&m_tempBuffer, QIODevice::ReadWrite | QIODevice::Text);
+ 
+     updateLogBufferSpace();
+@@ -195,12 +199,12 @@ void BaseDevice::filterAndAddFromLogBufferToTextEdit()
+     }
+ }
+ 
+-bool BaseDevice::columnMatches(const QString& column, const QStringRef& filter, const QStringRef& originalValue, bool& filtersValid, bool& columnFound)
++bool BaseDevice::columnMatches(const QString& column, const QStringView filter, const QStringView originalValue, bool& filtersValid, bool& columnFound)
+ {
+     if (filter.startsWith(column))
+     {
+         columnFound = true;
+-        const QStringRef value = filter.mid(column.length());
++        const QStringView value = filter.mid(column.length());
+         if (value.isEmpty())
+         {
+             filtersValid = false;
+@@ -213,7 +217,7 @@ bool BaseDevice::columnMatches(const QString& column, const QStringRef& filter,
+     return true;
+ }
+ 
+-bool BaseDevice::columnTextMatches(const QStringRef& filter, const QString& text)
++bool BaseDevice::columnTextMatches(const QStringView filter, const QString& text)
+ {
+     if (filter.isEmpty() || text.contains(filter))
+     {
+diff --git a/qdevicemonitor/devices/BaseDevice.h b/qdevicemonitor/devices/BaseDevice.h
+index 504b78d..2990b02 100644
+--- a/qdevicemonitor/devices/BaseDevice.h
++++ b/qdevicemonitor/devices/BaseDevice.h
+@@ -28,7 +28,6 @@
+ #include <QRegularExpression>
+ #include <QSharedPointer>
+ #include <QString>
+-#include <QStringRef>
+ #include <QTabWidget>
+ #include <QTextStream>
+ #include <QTimer>
+@@ -93,8 +92,8 @@ public:
+ 
+     void updateLogBufferSpace();
+     void filterAndAddFromLogBufferToTextEdit();
+-    bool columnMatches(const QString& column, const QStringRef& filter, const QStringRef& originalValue, bool& filtersValid, bool& columnFound);
+-    bool columnTextMatches(const QStringRef& filter, const QString& text);
++    bool columnMatches(const QString& column, const QStringView filter, const QStringView originalValue, bool& filtersValid, bool& columnFound);
++    bool columnTextMatches(const QStringView filter, const QString& text);
+ 
+     void scheduleLogReady();
+     void stopLogReadyTimer();
+diff --git a/qdevicemonitor/devices/IOSDevice.cpp b/qdevicemonitor/devices/IOSDevice.cpp
+index 98fca1c..d47d200 100644
+--- a/qdevicemonitor/devices/IOSDevice.cpp
++++ b/qdevicemonitor/devices/IOSDevice.cpp
+@@ -38,7 +38,11 @@ IOSDevice::IOSDevice(
+ {
+     qDebug() << "IOSDevice::IOSDevice";
+ 
++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+     m_tempErrorsStream.setCodec("UTF-8");
++#else
++    m_tempErrorsStream.setEncoding(QStringConverter::Utf8);
++#endif
+     m_tempErrorsStream.setString(&m_tempErrorsBuffer, QIODevice::ReadWrite | QIODevice::Text);
+ 
+     m_deviceWidget->getFilterLineEdit().setToolTip(tr("Search for messages. Accepts<ul><li>Plain Text</li><li>Prefix <b>text:</b> with Plain Text</li><li>Regular Expressions</li></ul>"));
+@@ -160,7 +164,11 @@ void IOSDevice::startLogger()
+         m_logFile.setFileName(currentLogAbsFileName);
+         m_logFile.open(QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate);
+         m_logFileStream = QSharedPointer<QTextStream>::create(&m_logFile);
++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+         m_logFileStream->setCodec("UTF-8");
++#else
++        m_logFileStream->setEncoding(QStringConverter::Utf8);
++#endif
+ 
+         startLogProcess();
+ 
+@@ -193,14 +201,14 @@ void IOSDevice::onUpdateFilter(const QString& filter)
+     maybeAddCompletionAfterDelay(filter);
+ }
+ 
+-void IOSDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const QStringRef& text)
++void IOSDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const QStringView text)
+ {
+     QString textString;
+     bool textStringInitialized = false;
+ 
+     for (auto it = m_filters.constBegin(); it != m_filters.constEnd(); ++it)
+     {
+-        const QStringRef filter(&(*it));
++        const QStringView filter(*it);
+         bool columnFound = false;
+         if (!columnMatches("text:", filter, text, filtersValid, columnFound))
+         {
+@@ -242,9 +250,9 @@ void IOSDevice::filterAndAddToTextEdit(const QString& line)
+     const QRegularExpressionMatch match = re.match(line);
+     if (match.hasMatch())
+     {
+-        const QStringRef prefix = match.capturedRef("prefix");
+-        const QStringRef deviceName = match.capturedRef("deviceName");
+-        const QStringRef text = line.midRef(match.capturedEnd("deviceName") + 1);
++        const QStringView prefix = match.captured("prefix");
++        const QStringView deviceName = match.captured("deviceName");
++        const QStringView text = QStringView(line).mid(match.capturedEnd("deviceName") + 1);
+ 
+         checkFilters(filtersMatch, m_filtersValid, text);
+ 
+@@ -258,11 +266,11 @@ void IOSDevice::filterAndAddToTextEdit(const QString& line)
+     }
+     else
+     {
+-        checkFilters(filtersMatch, m_filtersValid, QStringRef(&line));
++        checkFilters(filtersMatch, m_filtersValid, QStringView(line));
+ 
+         if (filtersMatch)
+         {
+-            m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringRef(&line));
++            m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringView(line));
+             m_deviceWidget->flushText();
+         }
+     }
+@@ -323,7 +331,7 @@ void IOSDevice::maybeReadErrorsPart()
+         if (m_tempErrorsStream.readLineInto(&line))
+ #endif
+         {
+-            m_deviceWidget->addText(ColorTheme::VerbosityAssert, QStringRef(&line));
++            m_deviceWidget->addText(ColorTheme::VerbosityAssert, QStringView(line));
+             m_deviceWidget->flushText();
+         }
+     }
+diff --git a/qdevicemonitor/devices/IOSDevice.h b/qdevicemonitor/devices/IOSDevice.h
+index e9ba086..cca3a15 100644
+--- a/qdevicemonitor/devices/IOSDevice.h
++++ b/qdevicemonitor/devices/IOSDevice.h
+@@ -62,7 +62,7 @@ private:
+     void stopInfoProcess();
+     void startLogger();
+     void stopLogger();
+-    void checkFilters(bool& filtersMatch, bool& filtersValid, const QStringRef& text);
++    void checkFilters(bool& filtersMatch, bool& filtersValid, const QStringView text);
+ 
+     void maybeReadErrorsPart();
+     void maybeReadLogPart();
+diff --git a/qdevicemonitor/devices/TextFileDevice.cpp b/qdevicemonitor/devices/TextFileDevice.cpp
+index 353d162..bd11b45 100644
+--- a/qdevicemonitor/devices/TextFileDevice.cpp
++++ b/qdevicemonitor/devices/TextFileDevice.cpp
+@@ -90,7 +90,7 @@ void TextFileDevice::onUpdateFilter(const QString& filter)
+     maybeAddCompletionAfterDelay(filter);
+ }
+ 
+-void TextFileDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const QStringRef& text)
++void TextFileDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const QStringView text)
+ {
+     filtersValid = true;
+ 
+@@ -98,7 +98,7 @@ void TextFileDevice::checkFilters(bool& filtersMatch, bool& filtersValid, const
+ 
+     for (auto it = m_filters.constBegin(); it != m_filters.constEnd(); ++it)
+     {
+-        const QStringRef filter(&(*it));
++        const QStringView filter(*it);
+         if (!columnTextMatches(filter, textString))
+         {
+             filtersMatch = false;
+@@ -113,14 +113,16 @@ void TextFileDevice::filterAndAddToTextEdit(const QString& line)
+         "(?<prefix>[A-Za-z]{3} +[\\d]{1,2} [\\d:]{8}) (?<hostname>.+) ",
+         QRegularExpression::InvertedGreedinessOption | QRegularExpression::DotMatchesEverythingOption
+     );
++    static const QString prefixPattern("prefix");
++    static const QString hostnamePattern("hostname");
+ 
+     bool filtersMatch = true;
+     const QRegularExpressionMatch match = re.match(line);
+     if (match.hasMatch())
+     {
+-        const QStringRef prefix = match.capturedRef("prefix");
+-        const QStringRef hostname = match.capturedRef("hostname");
+-        const QStringRef text = line.midRef(match.capturedEnd("hostname") + 1);
++        const QStringView prefix = match.capturedView(QStringView(prefixPattern));
++        const QStringView hostname = match.capturedView(QStringView(hostnamePattern));
++        const QStringView text = QStringView(line).mid(match.capturedEnd("hostname") + 1);
+ 
+         checkFilters(filtersMatch, m_filtersValid, text);
+ 
+@@ -134,10 +136,10 @@ void TextFileDevice::filterAndAddToTextEdit(const QString& line)
+     }
+     else
+     {
+-        checkFilters(filtersMatch, m_filtersValid, QStringRef(&line));
++        checkFilters(filtersMatch, m_filtersValid, QStringView(line));
+         if (filtersMatch)
+         {
+-            m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringRef(&line));
++            m_deviceWidget->addText(ColorTheme::VerbosityVerbose, QStringView(line));
+             m_deviceWidget->flushText();
+         }
+     }
+diff --git a/qdevicemonitor/devices/TextFileDevice.h b/qdevicemonitor/devices/TextFileDevice.h
+index b943ff2..23622d7 100644
+--- a/qdevicemonitor/devices/TextFileDevice.h
++++ b/qdevicemonitor/devices/TextFileDevice.h
+@@ -51,7 +51,7 @@ private:
+     void startLogger();
+     void stopLogger();
+ 
+-    void checkFilters(bool& filtersMatch, bool& filtersValid, const QStringRef& text);
++    void checkFilters(bool& filtersMatch, bool& filtersValid, const QStringView text);
+ 
+ private slots:
+     void onLogReady() override;
+diff --git a/qdevicemonitor/devices/trackers/AndroidDevicesTracker.cpp b/qdevicemonitor/devices/trackers/AndroidDevicesTracker.cpp
+index e83d598..713805b 100644
+--- a/qdevicemonitor/devices/trackers/AndroidDevicesTracker.cpp
++++ b/qdevicemonitor/devices/trackers/AndroidDevicesTracker.cpp
+@@ -21,7 +21,11 @@
+ 
+ AndroidDevicesTracker::AndroidDevicesTracker()
+ {
++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+     m_codecStream.setCodec("UTF-8");
++#else
++    m_codecStream.setEncoding(QStringConverter::Utf8);
++#endif
+     m_codecStream.setString(&m_buffer, QIODevice::ReadWrite | QIODevice::Text);
+ }
+ 
+diff --git a/qdevicemonitor/devices/trackers/IOSDevicesTracker.cpp b/qdevicemonitor/devices/trackers/IOSDevicesTracker.cpp
+index e66a21d..da64678 100644
+--- a/qdevicemonitor/devices/trackers/IOSDevicesTracker.cpp
++++ b/qdevicemonitor/devices/trackers/IOSDevicesTracker.cpp
+@@ -21,7 +21,11 @@
+ 
+ IOSDevicesTracker::IOSDevicesTracker()
+ {
++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+     m_codecStream.setCodec("UTF-8");
++#else
++    m_codecStream.setEncoding(QStringConverter::Utf8);
++#endif
+     m_codecStream.setString(&m_buffer, QIODevice::ReadWrite | QIODevice::Text);
+ }
+ 
+diff --git a/qdevicemonitor/ui/DeviceWidget.cpp b/qdevicemonitor/ui/DeviceWidget.cpp
+index a665ab2..e317434 100644
+--- a/qdevicemonitor/ui/DeviceWidget.cpp
++++ b/qdevicemonitor/ui/DeviceWidget.cpp
+@@ -39,7 +39,11 @@ DeviceWidget::DeviceWidget(QPointer<QWidget> parent, QPointer<DeviceFacade> devi
+     m_redPalette = QPalette(Qt::red);
+     m_redPalette.setColor(QPalette::Highlight, Qt::red);
+ 
++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+     m_textStream.setCodec("UTF-8");
++#else
++    m_textStream.setEncoding(QStringConverter::Utf8);
++#endif
+     m_textStream.setString(&m_stringStream, QIODevice::ReadWrite | QIODevice::Text);
+ 
+     //ui->textEdit->setFontFamily(m_deviceFacade->getFont());
+@@ -97,12 +101,12 @@ void DeviceWidget::maybeScrollTextEditToEnd()
+     }
+ }
+ 
+-void DeviceWidget::addText(const ColorTheme::ColorType color, const QStringRef& text)
++void DeviceWidget::addText(const ColorTheme::ColorType color, const QStringView text)
+ {
+     addText(m_deviceFacade->getThemeColor(color), text);
+ }
+ 
+-void DeviceWidget::addText(const QColor& color, const QStringRef& text)
++void DeviceWidget::addText(const QColor& color, const QStringView text)
+ {
+     m_textStream
+         << "<font style=\"font-family: " << m_deviceFacade->getFont()
+@@ -187,7 +191,7 @@ void DeviceWidget::focusFilterInput()
+ 
+ void DeviceWidget::on_markLogButton_clicked()
+ {
+-    addText(ColorTheme::VerbosityVerbose, QStringRef(&MARK_LINE));
++    addText(ColorTheme::VerbosityVerbose, QStringView(MARK_LINE));
+     m_deviceFacade->writeToLogFile(m_id, MARK_LINE);
+     flushText();
+ }
+diff --git a/qdevicemonitor/ui/DeviceWidget.h b/qdevicemonitor/ui/DeviceWidget.h
+index 9dcd608..9dcd7b4 100644
+--- a/qdevicemonitor/ui/DeviceWidget.h
++++ b/qdevicemonitor/ui/DeviceWidget.h
+@@ -55,8 +55,8 @@ public:
+     inline int getVerbosityLevel() const { return m_ui->verbositySlider->value(); }
+     void highlightFilterLineEdit(bool red);
+     void maybeScrollTextEditToEnd();
+-    void addText(const ColorTheme::ColorType color, const QStringRef& text);
+-    void addText(const QColor& color, const QStringRef& text);
++    void addText(const ColorTheme::ColorType color, const QStringView text);
++    void addText(const QColor& color, const QStringView text);
+     void flushText();
+     void clearTextEdit();
+     void onLogFileNameChanged(const QString& logFileName);
+diff --git a/qdevicemonitor/ui/MainWindow.cpp b/qdevicemonitor/ui/MainWindow.cpp
+index 69d4433..56ffb40 100644
+--- a/qdevicemonitor/ui/MainWindow.cpp
++++ b/qdevicemonitor/ui/MainWindow.cpp
+@@ -23,7 +23,6 @@
+ #include <cstdlib>
+ #include <QApplication>
+ #include <QDebug>
+-#include <QDesktopWidget>
+ #include <QDir>
+ #include <QFileDialog>
+ #include <QFileInfo>
+@@ -162,7 +161,7 @@ void MainWindow::keyReleaseEvent(QKeyEvent* event)
+ 
+ void MainWindow::mouseReleaseEvent(QMouseEvent* event)
+ {
+-    if (event->button() == Qt::MidButton)
++    if (event->button() == Qt::MiddleButton)
+     {
+         const QTabBar& tabBar = *(m_ui->tabWidget->tabBar());
+         const QPoint mousePos = tabBar.mapFrom(this, event->pos());
+-- 
+2.45.2
+
diff --git a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r2.ebuild b/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r2.ebuild
deleted file mode 100644
index edf5f5dbf0ce..000000000000
--- a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils
-
-DESCRIPTION="Crossplatform log viewer for Android, iOS and text files"
-HOMEPAGE="https://github.com/alopatindev/qdevicemonitor"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/alopatindev/${PN}"
-else
-	SRC_URI="https://github.com/alopatindev/qdevicemonitor/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	app-pda/usbmuxd
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-util/android-tools"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-qt-5.11.patch
-	"${FILESDIR}"/${P}-crash-after-fresh-install.patch
-	"${FILESDIR}"/${P}-screen-geometry-is-deprecated.patch
-	"${FILESDIR}"/${P}-endl-is-deprecated.patch
-	"${FILESDIR}"/${P}-disable-warnings-as-errors.patch
-	"${FILESDIR}"/${P}-disable-pedantic-errors.patch
-)
-
-src_configure() {
-	cd "${PN}" || die
-	export VERSION_WITH_BUILD_NUMBER="${PV}"
-	eqmake5
-}
-
-src_compile() {
-	cd "${PN}" || die
-	emake
-}
-
-src_install() {
-	dobin "${PN}/${PN}"
-	dodoc README.md
-	newicon -s scalable "icons/app_icon.svg" "${PN}.svg"
-	domenu "icons/${PN}.desktop"
-}
diff --git a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r3.ebuild b/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r3.ebuild
new file mode 100644
index 000000000000..4021c398400d
--- /dev/null
+++ b/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils
+
+DESCRIPTION="Crossplatform log viewer for Android, iOS and text files"
+HOMEPAGE="https://github.com/alopatindev/qdevicemonitor"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alopatindev/${PN}"
+else
+	SRC_URI="https://github.com/alopatindev/qdevicemonitor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	app-pda/usbmuxd
+	dev-qt/qtbase:6[gui,widgets]
+	dev-util/android-tools"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-qt-5.11.patch
+	"${FILESDIR}"/${P}-crash-after-fresh-install.patch
+	"${FILESDIR}"/${P}-screen-geometry-is-deprecated.patch
+	"${FILESDIR}"/${P}-endl-is-deprecated.patch
+	"${FILESDIR}"/${P}-disable-warnings-as-errors.patch
+	"${FILESDIR}"/${P}-disable-pedantic-errors.patch
+	"${FILESDIR}"/${P}-qt-6.patch
+)
+
+src_configure() {
+	cd "${PN}" || die
+	export VERSION_WITH_BUILD_NUMBER="${PV}"
+	eqmake6
+}
+
+src_compile() {
+	cd "${PN}" || die
+	emake
+}
+
+src_install() {
+	dobin "${PN}/${PN}"
+	dodoc README.md
+	newicon -s scalable "icons/app_icon.svg" "${PN}.svg"
+	domenu "icons/${PN}.desktop"
+}
diff --git a/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild b/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild
index 0dd22c27ff48..7eaed85fcca5 100644
--- a/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild
+++ b/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,15 +22,14 @@ IUSE=""
 
 RDEPEND="
 	app-pda/usbmuxd
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
+	dev-qt/qtbase:6[gui,widgets]
 	dev-util/android-tools"
 DEPEND="${RDEPEND}"
 
 src_configure() {
 	cd "${PN}" || die
 	export VERSION_WITH_BUILD_NUMBER="${PV}"
-	eqmake5
+	eqmake6
 }
 
 src_compile() {
diff --git a/dev-util/rgbds/Manifest b/dev-util/rgbds/Manifest
index 7c4baea7b1c2..92ffb1ba5496 100644
--- a/dev-util/rgbds/Manifest
+++ b/dev-util/rgbds/Manifest
@@ -1,3 +1,2 @@
-DIST rgbds-0.6.1.tar.gz 8041890 BLAKE2B cd5483e6fa5e2ca3bc9a6e3de44fdf7dc92289d558ac72d8922c0cf21b9dc576b878bfd7610cb41f791ad16cc415e446c925ee0dbc77ec4370d6ef4549935681 SHA512 b4a111e3d98a190d3c9b500dc59585fe68a8e6febc79b6716b406b96714e401bac427336388409ae456ee0f1e5a2c285bfe7b4bfa10e0d148ffc161adefe435b
-DIST rgbds-0.7.0.tar.gz 8053662 BLAKE2B 07f6901eeaade45125acce5c33430bdefc5a4228d2fe952d55ca254c0fc17dc5248262ecc7df5e9dd0a73aab29a39a2b38988a7ae93ad739609397a286e96aa9 SHA512 82d799f9639cb3a4c110f84f5184f46a371e66428e7d3b4f3f0229473d472dea1b381268df92736f2d1d4f5e8e2c83b61888c3ab4055768f9472b834f66f2f68
 DIST rgbds-0.8.0.tar.gz 8052350 BLAKE2B 46edb43a530169d03e026070b61272e95357213747296658e4ceb821f8e420979ceffcbc07b41b6778187a1f6a614d3587416d5ad3596f19bacc6c9067051837 SHA512 1c36e0fc7ecfd930c9cbc9f9772d2c7268148e2d456c56c92265ba45b9108c531fc412669d980f6c621b4d89d367458f01a2e0cf20443f13b83f841585f3edac
+DIST rgbds-0.9.0.tar.gz 8093242 BLAKE2B b6ee19b4e4ce0e4d77f3b3ec11115a389b8debd71477478dbef72065ae17caae10e53b49b45dbc822443392c27023948cc3033117f13a7c1340d8ca90f1ff6b5 SHA512 d86a478dfcfb007e095696c32a4fa098eb9818d3bdac90d7c61bbac8901346acb6f9371ee3285b2adcf71e3c199f731b7b6c60a99be06e64b463ea7aef0f4901
diff --git a/dev-util/rgbds/files/rgbds-0.7.0-fix-nan-tests.patch b/dev-util/rgbds/files/rgbds-0.7.0-fix-nan-tests.patch
deleted file mode 100644
index 9cee354a810e..000000000000
--- a/dev-util/rgbds/files/rgbds-0.7.0-fix-nan-tests.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-https://bugs.gentoo.org/928268
-https://github.com/gbdev/rgbds/issues/1387
-https://github.com/gbdev/rgbds/pull/1388
-https://github.com/gbdev/rgbds/commit/9ab3446d1a3d84d6b34062b8287be9169fbe663b
-
-From 1afbaa3cf2b667c33ae02e899ad7a833e3b71292 Mon Sep 17 00:00:00 2001
-From: Sylvie <35663410+Rangi42@users.noreply.github.com>
-Date: Sun, 31 Mar 2024 12:53:20 -0400
-Subject: [PATCH] Fix two bugs with RGBASM fixed-point math (#1388)
-
-- Fixed-point formulas are implemented using IEEE-754 floating-point
-  internally, which could give infinity or NaN values whose conversion
-  to fixed-point integer was platform-dependent.
-- Formatting fixed-point $8000_0000 (INT32_MIN, -2147483648) was
-  not putting the negative sign in front.
----
- src/asm/fixpoint.cpp         | 10 +++++++++-
- src/asm/format.cpp           | 22 +++++++++++++---------
- test/asm/format-extremes.asm |  8 ++++++++
- test/asm/format-extremes.out |  4 ++++
- test/asm/math.asm            |  8 ++++++--
- 5 files changed, 40 insertions(+), 12 deletions(-)
- create mode 100644 test/asm/format-extremes.asm
- create mode 100644 test/asm/format-extremes.out
-
-diff --git a/src/asm/fixpoint.cpp b/src/asm/fixpoint.cpp
-index 97a091af..9334bbba 100644
---- a/src/asm/fixpoint.cpp
-+++ b/src/asm/fixpoint.cpp
-@@ -15,7 +15,6 @@
- #endif
- 
- #define fix2double(i, q)	((double)((i) / pow(2.0, q)))
--#define double2fix(d, q)	((int32_t)round((d) * pow(2.0, q)))
- 
- // 2*pi radians == 1 turn
- #define turn2rad(f)	((f) * (M_PI * 2))
-@@ -33,6 +32,15 @@ double fix_PrecisionFactor(void)
- 	return pow(2.0, fixPrecision);
- }
- 
-+static int32_t double2fix(double d, int32_t q)
-+{
-+	if (isnan(d))
-+		return 0;
-+	if (isinf(d))
-+		return d < 0 ? INT32_MIN : INT32_MAX;
-+	return (int32_t)round(d * pow(2.0, q));
-+}
-+
- int32_t fix_Sin(int32_t i, int32_t q)
- {
- 	return double2fix(sin(turn2rad(fix2double(i, q))), q);
-diff --git a/src/asm/format.cpp b/src/asm/format.cpp
-index 553e5c77..2b8b8a8a 100644
---- a/src/asm/format.cpp
-+++ b/src/asm/format.cpp
-@@ -180,11 +180,10 @@ void fmt_PrintNumber(char *buf, size_t bufLen, struct FormatSpec const *fmt, uin
- 	char sign = fmt->sign; // 0 or ' ' or '+'
- 
- 	if (fmt->type == 'd' || fmt->type == 'f') {
--		int32_t v = value;
--
--		if (v < 0 && v != INT32_MIN) {
-+		if (int32_t v = value; v < 0) {
- 			sign = '-';
--			value = -v;
-+			if (v != INT32_MIN)
-+				value = -v;
- 		}
- 	}
- 
-@@ -229,15 +228,20 @@ void fmt_PrintNumber(char *buf, size_t bufLen, struct FormatSpec const *fmt, uin
- 			fracWidth = 255;
- 		}
- 
--		snprintf(valueBuf, sizeof(valueBuf), "%.*f", (int)fracWidth,
--			 value / fix_PrecisionFactor());
-+		double fval = fabs(value / fix_PrecisionFactor());
-+		snprintf(valueBuf, sizeof(valueBuf), "%.*f", (int)fracWidth, fval);
-+	} else if (fmt->type == 'd') {
-+		// Decimal numbers may be formatted with a '-' sign by `snprintf`, so `abs` prevents that,
-+		// with a special case for `INT32_MIN` since `labs(INT32_MIN)` is UB. The sign will be
-+		// printed later from `signChar`.
-+		uint32_t uval = value != (uint32_t)INT32_MIN ? labs((int32_t)value) : value;
-+		snprintf(valueBuf, sizeof(valueBuf), "%" PRIu32, uval);
- 	} else {
--		char const *spec = fmt->type == 'd' ? "%" PRId32
--				 : fmt->type == 'u' ? "%" PRIu32
-+		char const *spec = fmt->type == 'u' ? "%" PRIu32
- 				 : fmt->type == 'X' ? "%" PRIX32
- 				 : fmt->type == 'x' ? "%" PRIx32
- 				 : fmt->type == 'o' ? "%" PRIo32
--				 : "%" PRId32;
-+				 : "%" PRIu32;
- 
- 		snprintf(valueBuf, sizeof(valueBuf), spec, value);
- 	}
-diff --git a/test/asm/format-extremes.asm b/test/asm/format-extremes.asm
-new file mode 100644
-index 00000000..19ddb677
---- /dev/null
-+++ b/test/asm/format-extremes.asm
-@@ -0,0 +1,8 @@
-+MACRO test
-+	def v = \1
-+	println "{#09x:v} = {#012o:v} = {#033b:v} = {u:v}U = {+d:v} = {+.16f:v}"
-+ENDM
-+	test $7fff_ffff ; INT32_MAX
-+	test $8000_0000 ; INT32_MIN
-+	test $0000_0000 ; UINT32_MIN
-+	test $ffff_ffff ; UINT32_MAX
-diff --git a/test/asm/format-extremes.out b/test/asm/format-extremes.out
-new file mode 100644
-index 00000000..9e19b2f4
---- /dev/null
-+++ b/test/asm/format-extremes.out
-@@ -0,0 +1,4 @@
-+$7fffffff = &17777777777 = %01111111111111111111111111111111 = 2147483647U = +2147483647 = +32767.9999847412109375
-+$80000000 = &20000000000 = %10000000000000000000000000000000 = 2147483648U = -2147483648 = -32768.0000000000000000
-+$00000000 = &00000000000 = %00000000000000000000000000000000 = 0U = +0 = +0.0000000000000000
-+$ffffffff = &37777777777 = %11111111111111111111111111111111 = 4294967295U = -1 = -0.0000152587890625
-diff --git a/test/asm/math.asm b/test/asm/math.asm
-index b189fca8..9f87a11b 100644
---- a/test/asm/math.asm
-+++ b/test/asm/math.asm
-@@ -19,14 +19,18 @@ ENDM
- 
- 	assert DIV(5.0, 2.0) == 2.5
- 	assert DIV(-5.0, 2.0) == -2.5
--	assert DIV(-5.0, 0.0) == $8000_0000
-+	assert DIV(5.0, 0.0) == $7fff_ffff ; +inf => INT32_MAX
-+	assert DIV(-5.0, 0.0) == $8000_0000 ; -inf => INT32_MIN
-+	assert DIV(0.0, 0.0) == $0000_0000 ; nan => 0
- 
- 	assert MUL(10.0, 0.5) == 5.0
- 	assert MUL(10.0, 0.0) == 0.0
- 
- 	assert FMOD(5.0, 2.0) == 1.0
- 	assert FMOD(-5.0, 2.0) == -1.0
--	assert FMOD(-5.0, 0.0) == $8000_0000
-+	assert FMOD(5.0, 0.0) == 0 ; nan
-+	assert FMOD(-5.0, 0.0) == 0 ; nan
-+	assert FMOD(0.0, 0.0) == 0 ; nan
- 
- 	assert POW(10.0, 2.0) == 100.0
- 	assert POW(100.0, 0.5) == 10.0
diff --git a/dev-util/rgbds/rgbds-0.6.1.ebuild b/dev-util/rgbds/rgbds-0.6.1.ebuild
deleted file mode 100644
index 91276f0bb814..000000000000
--- a/dev-util/rgbds/rgbds-0.6.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Rednex Game Boy Development System"
-HOMEPAGE="https://rgbds.gbdev.io/"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gbdev/${PN}.git"
-else
-	SRC_URI="https://github.com/gbdev/${PN}/archive/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-DEPEND="media-libs/libpng"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-src_compile() {
-	append-flags -DNDEBUG
-
-	emake Q= \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr Q= STRIP= install
-	dodoc README.rst
-}
diff --git a/dev-util/rgbds/rgbds-0.7.0-r1.ebuild b/dev-util/rgbds/rgbds-0.7.0-r1.ebuild
deleted file mode 100644
index 052429ca8c57..000000000000
--- a/dev-util/rgbds/rgbds-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Rednex Game Boy Development System"
-HOMEPAGE="https://rgbds.gbdev.io/"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gbdev/${PN}.git"
-else
-	SRC_URI="https://github.com/gbdev/${PN}/archive/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-DEPEND="media-libs/libpng"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugs.gentoo.org/928268
-	"${FILESDIR}"/${P}-fix-nan-tests.patch
-)
-
-src_compile() {
-	append-flags -DNDEBUG
-
-	emake Q= \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_test() {
-	local dir
-	for dir in asm link fix gfx; do
-		pushd "test/${dir}" >/dev/null || die
-		einfo "Running ${dir} tests."
-		./test.sh || die
-		popd >/dev/null || die
-	done
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr Q= STRIP= install
-	dodoc README.rst
-}
diff --git a/dev-util/rgbds/rgbds-0.9.0.ebuild b/dev-util/rgbds/rgbds-0.9.0.ebuild
new file mode 100644
index 000000000000..7f24c27d44dd
--- /dev/null
+++ b/dev-util/rgbds/rgbds-0.9.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Rednex Game Boy Development System"
+HOMEPAGE="https://rgbds.gbdev.io/"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gbdev/${PN}.git"
+else
+	SRC_URI="https://github.com/gbdev/${PN}/archive/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="media-libs/libpng"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+src_compile() {
+	append-flags -DNDEBUG
+
+	emake Q= \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_test() {
+	local dir
+	for dir in asm link fix gfx; do
+		pushd "test/${dir}" >/dev/null || die
+		einfo "Running ${dir} tests."
+		./test.sh || die
+		popd >/dev/null || die
+	done
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr Q= STRIP= install
+	dodoc README.md
+}
diff --git a/dev-util/rizin/rizin-0.7.3-r2.ebuild b/dev-util/rizin/rizin-0.7.3-r2.ebuild
index c86058324b43..859c1d86e625 100644
--- a/dev-util/rizin/rizin-0.7.3-r2.ebuild
+++ b/dev-util/rizin/rizin-0.7.3-r2.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
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 
 # Need to audit licenses of the binaries used for testing
diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest
index e559d20e5876..1ccff480d6c9 100644
--- a/dev-util/rocm-smi/Manifest
+++ b/dev-util/rocm-smi/Manifest
@@ -1,3 +1,4 @@
 DIST rocm-smi-5.4.2.tar.gz 1553259 BLAKE2B 0560e115028caafb1d5dd8892cfa677431b792714ecd8c75f31451fa7685d1c7070cbd687c894d7eefd112de5e2df9aa7895aa57821db207dffc4e8890898638 SHA512 0fd651593df0ebbcb2c2327d030d2674efacdb6e883daa5a8adf733db2bde3e5d16dc304856221f4bb07a3cd834944ffcc7ebd689624f7ba24ffd6c262ba74b8
 DIST rocm-smi-5.7.1.tar.gz 801646 BLAKE2B b4799bbdaeb7203c16117cd30511d589a2b96e15801bb9f1382fe7a4d87d43e1d4b458d6923b6ebd602fdccba74bd65bcb98766dbd83c48fc3e02219be8c1022 SHA512 ad364278f137228a39108c93d482635137ea2724a5a39debb5b32329493ebf5c706dcf3863e2e24b6f0b6286f3877942277f5ae447446f155518972b957f7d9d
 DIST rocm-smi-6.1.1.tar.gz 872628 BLAKE2B 35830fd0eb36688b3803bed2059f29ba4d8613112ae4cfff2e0a3b1d7afef9f0d77ec16771e2205ba351df0aa678c3b0d2436940b76d10d020f1a30d14d760e9 SHA512 3e31ff0d94e7f0ea650c985973b27107e3f7293b92857fbf2fe196b61632c530e95c3228ad7550d44f8ee9f5f1abfd17e5c2b19164759728fb6d4b0995455fa7
+DIST rocm-smi-6.3.0.tar.gz 902989 BLAKE2B d17a60fd7ea39b2a18828891f50f22efe6a3f875d4f68efd204c49e1f761c690420218852464856f80a6a82eb68cae58c0cb0353c277a621a0a037b1d1a14055 SHA512 2e5079f8387872c126908211f2ceea1d5ba6e4e3e7dc487c1e45387f57e158b0e3ea071cbeaba2f8ffdf70fc6708c33fa19305812e81dbe13335bd7c99638b0e
diff --git a/dev-util/rocm-smi/files/rocm-smi-6.3.0-fix-flags.patch b/dev-util/rocm-smi/files/rocm-smi-6.3.0-fix-flags.patch
new file mode 100644
index 000000000000..1eb96594a968
--- /dev/null
+++ b/dev-util/rocm-smi/files/rocm-smi-6.3.0-fix-flags.patch
@@ -0,0 +1,34 @@
+Fix cxx/linker flags
+Upstream PR: https://github.com/ROCm/rocm_smi_lib/pull/211
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -95,7 +95,7 @@ set(CMAKE_CXX_FLAGS
+ 
+ # Clang does not set the build-id
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+-    set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--build-id=sha1")
++    set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--build-id=sha1")
+ endif()
+ 
+ # Use this instead of above for 32 bit
+@@ -129,10 +129,16 @@ else ()
+     set(CMAKE_CXX_FLAGS
+       "${CMAKE_CXX_FLAGS} -DFORTIFY_SOURCE=2 -fstack-protector-all -Wcast-align")
+     ## More security breach mitigation flags
+-    set(CMAKE_CXX_FLAGS
+-      "${CMAKE_CXX_FLAGS} -Wl,-z,noexecstack -Wl,-znoexecheap -Wl,-z,relro ")
+-    set(CMAKE_CXX_FLAGS
+-      "${CMAKE_CXX_FLAGS} -Wtrampolines -Wl,-z,now")
++    set(HARDENING_LDFLAGS
++      "${HARDENING_LDFLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")
++    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${HARDENING_LDFLAGS}")
++    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${HARDENING_LDFLAGS}")
++
++    include(CheckCXXCompilerFlag)
++    check_cxx_compiler_flag("-Wtrampolines" CXX_SUPPORTS_WTRAMPOLINES)
++    if (CXX_SUPPORTS_WTRAMPOLINES)
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wtrampolines")
++    endif ()
+ endif ()
+ 
+ set(COMMON_SRC_DIR "${PROJECT_SOURCE_DIR}/src")
diff --git a/dev-util/rocm-smi/files/rocm-smi-6.3.0-set-soversion.patch b/dev-util/rocm-smi/files/rocm-smi-6.3.0-set-soversion.patch
new file mode 100644
index 000000000000..3ababf997828
--- /dev/null
+++ b/dev-util/rocm-smi/files/rocm-smi-6.3.0-set-soversion.patch
@@ -0,0 +1,104 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,20 +33,17 @@ set(SHARE_INSTALL_PREFIX
+     "share/${ROCM_SMI}"
+     CACHE STRING "Tests and Example install directory")
+ 
+-# provide git to utilities
+-find_program (GIT NAMES git)
+-
+-## Setup the package version based on git tags.
+-set(PKG_VERSION_GIT_TAG_PREFIX "rsmi_pkg_ver")
+-get_package_version_number("7.3.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT)
+-message("Package version: ${PKG_VERSION_STR}")
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_MAJOR "${CPACK_PACKAGE_VERSION_MAJOR}")
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_MINOR "${CPACK_PACKAGE_VERSION_MINOR}")
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}")
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_BUILD "0")
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_HASH "${PKG_VERSION_HASH}")
+-
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_STRING "${${ROCM_SMI_LIBS_TARGET}_VERSION_MAJOR}.${${ROCM_SMI_LIBS_TARGET}_VERSION_MINOR}.${${ROCM_SMI_LIBS_TARGET}_VERSION_PATCH}+${${ROCM_SMI_LIBS_TARGET}_VERSION_HASH}")
++set(VERSION_MAJOR "@VERSION_MAJOR@")
++set(VERSION_MINOR "@VERSION_MINOR@")
++set(VERSION_PATCH "@VERSION_PATCH@")
++set(PKG_VERSION_STR "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
++set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}")
++set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
++set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
++set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
++set(rocm_smi_VERSION_MAJOR "${VERSION_MAJOR}")
++set(rocm_smi_VERSION_MINOR "${VERSION_MINOR}")
++set(rocm_smi_VERSION_PATCH "${VERSION_PATCH}")
+ 
+ # The following default version values should be updated as appropriate for
+ # ABI breaks (update MAJOR and MINOR), and ABI/API additions (update MINOR).
+--- a/oam/CMakeLists.txt
++++ b/oam/CMakeLists.txt
+@@ -29,17 +29,6 @@ set(OAM_NAME "oam")
+ set(OAM_COMPONENT "lib${OAM_NAME}")
+ set(OAM_TARGET "${OAM_NAME}")
+ 
+-################# Determine the library version #########################
+-set(SO_VERSION_GIT_TAG_PREFIX "oam_so_ver")
+-
+-# VERSION_* variables should be set by get_version_from_tag
+-message("Package version: ${PKG_VERSION_STR}")
+-
+-# Debian package specific variables
+-# Set a default value for the package version
+-get_version_from_tag("1.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT)
+-
+-# VERSION_* variables should be set by get_version_from_tag
+ if ( ${ROCM_PATCH_VERSION} )
+     set ( VERSION_PATCH ${ROCM_PATCH_VERSION})
+     set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+--- a/python_smi_tools/rsmiBindingsInit.py.in
++++ b/python_smi_tools/rsmiBindingsInit.py.in
+@@ -26,17 +26,7 @@ def initRsmiBindings(silent=False):
+     if (rocm_smi_lib_path != None):
+         path_librocm = rocm_smi_lib_path
+     else:
+-        path_librocm = os.path.dirname(os.path.realpath(__file__)) + '/../../@CMAKE_INSTALL_LIBDIR@/librocm_smi64.so.@VERSION_MAJOR@'
+-
+-    if not os.path.isfile(path_librocm):
+-        print_silent('Unable to find %s . Trying /opt/rocm*' % path_librocm)
+-        for root, dirs, files in os.walk('/opt', followlinks=True):
+-            if 'librocm_smi64.so.@VERSION_MAJOR@' in files:
+-                path_librocm = os.path.join(os.path.realpath(root), 'librocm_smi64.so.@VERSION_MAJOR@')
+-        if os.path.isfile(path_librocm):
+-            print_silent('Using lib from %s' % path_librocm)
+-        else:
+-            print('Unable to find librocm_smi64.so.@VERSION_MAJOR@')
++        path_librocm = 'librocm_smi64.so'
+ 
+     # ----------> TODO: Support static libs as well as SO
+     try:
+@@ -44,7 +34,7 @@ def initRsmiBindings(silent=False):
+         return CDLL(path_librocm)
+     except OSError:
+         print('Unable to load the rocm_smi library.\n'\
+-              'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so.@VERSION_MAJOR@\n'\
++              'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so\n'\
+               '{0}Please refer to https://github.com/'\
+               'RadeonOpenCompute/rocm_smi_lib for the installation guide.{1}'\
+               .format('\33[33m', '\033[0m'))
+--- a/rocm_smi/CMakeLists.txt
++++ b/rocm_smi/CMakeLists.txt
+@@ -31,17 +31,6 @@ set(ROCM_SMI_TARGET "${ROCM_SMI}64")
+ ## Include common cmake modules
+ include(utils)
+ 
+-################# Determine the library version #########################
+-set(SO_VERSION_GIT_TAG_PREFIX "rsmi_so_ver")
+-
+-# VERSION_* variables should be set by get_version_from_tag
+-message("Package version: ${PKG_VERSION_STR}")
+-
+-# Debian package specific variables
+-# Set a default value for the package version
+-get_version_from_tag("1.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT)
+-
+-# VERSION_* variables should be set by get_version_from_tag
+ if ( ${ROCM_PATCH_VERSION} )
+     set ( VERSION_PATCH ${ROCM_PATCH_VERSION})
+     set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
diff --git a/dev-util/rocm-smi/rocm-smi-6.3.0.ebuild b/dev-util/rocm-smi/rocm-smi-6.3.0.ebuild
new file mode 100644
index 000000000000..e555519ada9c
--- /dev/null
+++ b/dev-util/rocm-smi/rocm-smi-6.3.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} python3_13t )
+
+inherit cmake python-r1
+
+DESCRIPTION="ROCm System Management Interface Library"
+HOMEPAGE="https://github.com/ROCm/rocm_smi_lib"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ROCm/rocm_smi_lib"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://github.com/ROCm/rocm_smi_lib/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm_smi_lib-rocm-${PV}"
+fi
+
+LICENSE="MIT NCSA-AMD"
+SLOT="0/$(ver_cut 1-2)"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.1-no-strip.patch
+	"${FILESDIR}"/${PN}-5.7.1-remove-example.patch
+	"${FILESDIR}"/${PN}-6.3.0-set-soversion.patch
+	"${FILESDIR}"/${PN}-6.3.0-fix-flags.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s/@VERSION_MAJOR@/$(ver_cut 1)/" \
+		-e "s/@VERSION_MINOR@/$(ver_cut 2)/" \
+		-e "s/@VERSION_PATCH@/$(ver_cut 3)/" \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi
+	python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py
+	python_foreach_impl python_domodule python_smi_tools/rsmiBindingsInit.py
+
+	mv "${ED}"/usr/share/doc/rocm_smi "${ED}/usr/share/doc/${PF}" || die
+}
diff --git a/dev-util/rocm-smi/rocm-smi-9999.ebuild b/dev-util/rocm-smi/rocm-smi-9999.ebuild
deleted file mode 100644
index bc4f8b802371..000000000000
--- a/dev-util/rocm-smi/rocm-smi-9999.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-r1
-
-DESCRIPTION="ROCm System Management Interface Library"
-HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocm_smi_lib-rocm-${PV}"
-fi
-
-LICENSE="MIT NCSA-AMD"
-SLOT="0/$(ver_cut 1-2)"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}"
-BDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.2-gcc12-memcpy.patch
-	"${FILESDIR}"/${PN}-5.4.2-detect-builtin-amdgpu.patch
-)
-
-src_prepare() {
-	sed -e "/LICENSE.txt/d" -i CMakeLists.txt || die
-	sed -e "/^path_librocm = /c\path_librocm = '${EPREFIX}/usr/lib64/librocm_smi64.so'" \
-		-i python_smi_tools/rsmiBindings.py || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON
-		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi
-	python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py
-}
diff --git a/dev-util/rocm_bandwidth_test/Manifest b/dev-util/rocm_bandwidth_test/Manifest
index 94ecfa527492..02500cc8f0e8 100644
--- a/dev-util/rocm_bandwidth_test/Manifest
+++ b/dev-util/rocm_bandwidth_test/Manifest
@@ -1,3 +1,4 @@
 DIST rocm_bandwidth_test-5.3.3.tar.gz 38681 BLAKE2B 02a09ae869b507ad117e40e2daadd6e2acb2a365b12e5f601a4c8d6e55d3fb51de32feef9122bd532700b46843310ed83088842728a814f55695a3572e83d1d1 SHA512 155480284cdd1b0e42c62ab49f536ef12f2b9cbfcf0e8d076938cf0cf86872b536506a81e283b656ef1896d7d6e691e06145b2021593542755dd7460d08002c9
 DIST rocm_bandwidth_test-5.4.3.tar.gz 38761 BLAKE2B ab3c8fd15039081f7b42e1c5c82e06f2cf3f5c70c0868bf0c195507dd97669f199ecdaa895d292d225bce7aa069d14836923ff9ffd43d13749ca312ed07d3402 SHA512 676ba7aa26fd5eb2858ff61c8cf49ea3c5d51e87f5fa3bd6389c7c53e02561281d2d4a751369ccc66270f1d04b5ec9e55048ba23e758f0be8ef8e2abfd2026c2
 DIST rocm_bandwidth_test-5.7.1.tar.gz 38769 BLAKE2B 5880c4bb50d4daf87581424c2fb208363d2d34f848d3ced163b3809e5dff4e56996abf3edc6f8c8ca75f55d95b92604de6ee0c333930d32c7c52c8bcdb6562e6 SHA512 7da08b7a9bbde34e3b2b799e47e490d34dc69225b9d5efe103fd23f3a417fc7a48dcc813d2669ee4506f6699c4576c549f982a4a76a92d83447d6fab709f5042
+DIST rocm_bandwidth_test-6.3.0.tar.gz 45547 BLAKE2B 114d0ef78e90008dc67721a19d12723368eb50b16fb606e8d61597906f64144b66786de61a3e0951d4366c79bcf1150709acee3b21c22640d43ed6878cbff4bf SHA512 482b712d030b826146076e39fd0c27e60b8952879c3f81b5f89cfef388662593bb0007306f1dddbaed36e8b88b11a30171c1695c5f751a671aa230e7bffe694d
diff --git a/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-6.3.0.ebuild b/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-6.3.0.ebuild
new file mode 100644
index 000000000000..46c298e87d73
--- /dev/null
+++ b/dev-util/rocm_bandwidth_test/rocm_bandwidth_test-6.3.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Bandwidth test for ROCm"
+HOMEPAGE="https://github.com/ROCm/rocm_bandwidth_test"
+SRC_URI="https://github.com/ROCm/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-rocm-${PV}"
+LICENSE="NCSA-AMD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+DEPEND="dev-libs/rocr-runtime:="
+RDEPEND="${DEPEND}"
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index 79c3f1de2ae4..0b0230786833 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -1,3 +1,4 @@
 DIST rocminfo-5.7.1.tar.gz 17302 BLAKE2B 395c695ed0b79c771c4240310c457aec893ffd889ddd551866753d2a0c8d4e98399672d74a7114a89faf8b1960dd54fbb0425ea00f7d15e5c740e33ce4046d0b SHA512 38726bc52bd045b6281cccd702706fd6ea5b57cdc421ad23106d5447a002f4b530e8d4e4430d2bb8eb30803af3bacdaf34646a965cea26f42d726bf7f6aafbab
 DIST rocminfo-6.1.1.tar.gz 17740 BLAKE2B 6331054e1c8a59f2d4246c3fcb999afc28a8cabea9d5faf2b95d767f7153ab0930a633ee630cabc4472413a8a54fd9ef798516baa77e94aabda7687a36bf312f SHA512 d2982874ad09bfbe15418a88c2d3360f9bce262674d50f5858a08e52dd266e255f95116c85e069d7e8d28cb323164fb6999c5834163105f33e0c773aede4efdf
 DIST rocminfo-6.1.2.tar.gz 17734 BLAKE2B d92816dc0657a2ec0f04024311b5a7851a3cd487d73b496bfdb32ffe69cae957798f49622e477e5d0b47ac4ff86c2bba9a46e86228823f85da2d9f5376b6aef9 SHA512 fa1890797a89d67d18f29d73d213d68bcd31c7fd2b2cee89148b8dbd6fe7552e270af0582c7a50e80adc399197b3dc1cb5e858b1e983411079d088fc947c8c88
+DIST rocminfo-6.3.0.tar.gz 27543 BLAKE2B e922ffe8394cad903f0ce3a2fafda37dc3836403e399a2ce2d14b1deb52db312381cb23b8dd6a3fc084fd005546d000df41e5ebbe02395046844efc4882f236b SHA512 4466385f79db88ccdeadc8f950a529d983f59c0fd8bc8ac2c1ba79b1f4ef833782cf645f6176b2c2369a54702649daffa595aaae81cf1f30178c5a99f69bbe61
diff --git a/dev-util/rocminfo/rocminfo-6.3.0.ebuild b/dev-util/rocminfo/rocminfo-6.3.0.ebuild
new file mode 100644
index 000000000000..44cec861c829
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-6.3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} python3_13t )
+inherit cmake python-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/rocminfo/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ROCm/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocminfo-rocm-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/ROCm/rocminfo"
+LICENSE="UoI-NCSA"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.0.0-detect-builtin-amdgpu.patch"
+)
+
+src_prepare() {
+	sed -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i CMakeLists.txt || die
+	sed -e "/num_change_since_prev_pkg(/cset(NUM_COMMITS 0)" \
+		-i cmake_modules/utils.cmake || die # Fix QA issue on "git not found"
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=( -DROCRTST_BLD_TYPE=Release )
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	rm "${ED}/usr/bin/rocm_agent_enumerator" || die
+	python_foreach_impl python_doexe rocm_agent_enumerator "${BUILD_DIR}"/rocm_agent_enumerator
+}
diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 60f2f32705d5..325362547862 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -4,3 +4,4 @@ DIST rocm-tracer-5.3.3.tar.gz 353041 BLAKE2B b7614707ae3af2f5a46d058dacadfb0ef3b
 DIST rocprofiler-5.1.3.tar.gz 1402172 BLAKE2B 16e9b127ede94a3f96056e84a2942b6c9f3aec90579fb12796ab8ba385160aa020e3dc77f7a475dadbc0a813a823ae733ca9560f6a09e55c4c82b13dd792dfa4 SHA512 6e9932a425eaaa2a1e1741280d7525c6360700f85edb3bcf4967fe9be4fed662bae0d2ba609701f0d9733769c340e93e32076024b27bab3303449c1d68d9e1ce
 DIST roctracer-5.7.1.tar.gz 354686 BLAKE2B 2e72d8df5cf53a913102a715dab55f7c6d33b2d4a9cad7647a61824deba0363cf3dbf96d8de3469a78d6b5c8e517c163c303bf6aa12eeaf8e43f82ac8381ef97 SHA512 62cf62fc505955426596bd6d539c92f4d730d90d820d817343525f1b7be693290727c8c447ca98b1a0e46d1d188b62b3f4fafcf6bffbf2479fc5d937fb354e13
 DIST roctracer-6.1.1.tar.gz 396688 BLAKE2B e332c3a6056d1678e3da511878fd2710a4eaa02526cd1e7353dd1dbcba776cb77e6e431d90daf5f238ec7793fc8e9f51afd7f09992f70b26c7e3aab28bb319a9 SHA512 d59c367953b1d5df0daae96746095e2e19f706f43b5ebed3d45c15d23697e9c99c1623bbb8dfa001648fdeda172a3c1d820d884b6da3946addec8f4b9a86e5dc
+DIST roctracer-6.3.0.tar.gz 397368 BLAKE2B 450e99cd90df80f60ec455a94148258b8fcef4adb1babb795c3e66bca648b51cd0b67a9e8f413e601c5f77d0292e70c443d3695198f2e4dcd6058c9e21485198 SHA512 6f29e5f12e1c499ab57ed3c869801742bf71d645852bebd3a887e34f382e6da6df910ab7921232887ea10e95eafa085794e7795e08d3e73cbe225d5967c59620
diff --git a/dev-util/roctracer/files/roctracer-6.3.0-fix-prettyprinter.patch b/dev-util/roctracer/files/roctracer-6.3.0-fix-prettyprinter.patch
new file mode 100644
index 000000000000..d6f5191de6d4
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-6.3.0-fix-prettyprinter.patch
@@ -0,0 +1,67 @@
+--- a/script/gen_ostream_ops.py
++++ b/script/gen_ostream_ops.py
+@@ -242,7 +242,15 @@ def gen_cppheader(infilepath, outfilepath, rank):
+         if c == 'max_align_t' or c == '__fsid_t': # Skipping as it is defined in multiple domains
+           continue
+         if len(cppHeader.classes[c]["properties"]["public"]) != 0:
+-          output_filename_h.write("inline static std::ostream& operator<<(std::ostream& out, const " + c + "& v)\n")
++          print_c = ("typename " + c) if '>::' in c else c
++
++          if '<T' in c:
++            output_filename_h.write("template <typename T>\n")
++          elif c == 'HIP_vector_type':
++            output_filename_h.write("template<typename T, unsigned int rank>\n")
++            print_c = 'HIP_vector_type<T, rank>'
++
++          output_filename_h.write("inline static std::ostream& operator<<(std::ostream& out, const " + print_c + "& v)\n")
+           output_filename_h.write("{\n")
+           output_filename_h.write("  std::operator<<(out, '{');\n")
+           output_filename_h.write("  " + apiname.upper() + "_depth_max_cnt++;\n")
+@@ -257,7 +265,13 @@ def gen_cppheader(infilepath, outfilepath, rank):
+           output_filename_h.write("  return out;\n")
+           output_filename_h.write("}\n")
+           global_str = ''
+-          global_ops += "inline static std::ostream& operator<<(std::ostream& out, const " + c + "& v)\n" + "{\n" + "  roctracer::" + apiname.lower() + "_support::detail::operator<<(out, v);\n" + "  return out;\n" + "}\n\n"
++
++          if '<T' in c:
++            global_ops += "template <typename T>\n"
++          elif c == 'HIP_vector_type':
++            global_ops += "template<typename T, unsigned int rank>\n"
++
++          global_ops += "inline static std::ostream& operator<<(std::ostream& out, const " + print_c + "& v)\n" + "{\n" + "  roctracer::" + apiname.lower() + "_support::detail::operator<<(out, v);\n" + "  return out;\n" + "}\n\n"
+ 
+     if rank == 1 or rank == 2:
+       footer = '// end ostream ops for '+ apiname + ' \n'
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -61,11 +61,19 @@ add_custom_command(
+           "${HSA_RUNTIME_INC_PATH}/hsa_ext_image.h" "${HSA_RUNTIME_INC_PATH}/hsa_api_trace.h"
+   COMMENT "Generating hsa_prof_str.h,hsa_prof_str.inline.h...")
+ 
++set(SYSTEM_HEADERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/system-headers)
++
++execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory "${SYSTEM_HEADERS_DIR}")
++execute_process(COMMAND ${CMAKE_COMMAND} -E touch "${SYSTEM_HEADERS_DIR}/array")
++execute_process(COMMAND ${CMAKE_COMMAND} -E touch "${SYSTEM_HEADERS_DIR}/iosfwd")
++execute_process(COMMAND ${CMAKE_COMMAND} -E touch "${SYSTEM_HEADERS_DIR}/type_traits")
++
++
+ ## Generate the HSA pretty printers
+ add_custom_command(
+   OUTPUT hsa_ostream_ops.h
+-  COMMAND ${CMAKE_C_COMPILER} -E "${HSA_RUNTIME_INC_PATH}/hsa.h" -o hsa.h.i
+-  COMMAND ${CMAKE_C_COMPILER} -E "${HSA_RUNTIME_INC_PATH}/hsa_ext_amd.h" -o hsa_ext_amd.h.i
++  COMMAND ${CMAKE_C_COMPILER} -nostdinc++ -isystem ${SYSTEM_HEADERS_DIR} -E "${HSA_RUNTIME_INC_PATH}/hsa.h" -o hsa.h.i
++  COMMAND ${CMAKE_C_COMPILER} -nostdinc++ -isystem ${SYSTEM_HEADERS_DIR} -E "${HSA_RUNTIME_INC_PATH}/hsa_ext_amd.h" -o hsa_ext_amd.h.i
+   BYPRODUCTS hsa.h.i hsa_ext_amd.h.i
+   COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/script/gen_ostream_ops.py
+           -in hsa.h.i,hsa_ext_amd.h.i -out hsa_ostream_ops.h  > /dev/null
+@@ -83,7 +91,7 @@ find_file(HIP_RUNTIME_API_H hip_runtime_api.h
+ ## Generate the HIP pretty printers
+ add_custom_command(
+   OUTPUT hip_ostream_ops.h
+-  COMMAND ${CMAKE_C_COMPILER} "$<$<BOOL:${HIP_INCLUDE_DIRECTORIES}>:-I$<JOIN:${HIP_INCLUDE_DIRECTORIES},$<SEMICOLON>-I>>"
++  COMMAND ${CMAKE_C_COMPILER} -nostdinc++ -isystem ${SYSTEM_HEADERS_DIR} "$<$<BOOL:${HIP_INCLUDE_DIRECTORIES}>:-I$<JOIN:${HIP_INCLUDE_DIRECTORIES},$<SEMICOLON>-I>>"
+           -E "${CMAKE_CURRENT_SOURCE_DIR}/roctracer/hip_full_api.h" -D__HIP_PLATFORM_AMD__=1 -D__HIP_ROCclr__=1 -o hip_runtime_api.h.i
+   BYPRODUCTS hip_runtime_api.h.i
+   COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/script/gen_ostream_ops.py
diff --git a/dev-util/roctracer/roctracer-6.3.0.ebuild b/dev-util/roctracer/roctracer-6.3.0.ebuild
new file mode 100644
index 000000000000..5f78918de05c
--- /dev/null
+++ b/dev-util/roctracer/roctracer-6.3.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+ROCM_VERSION=${PV}
+
+inherit cmake flag-o-matic prefix python-any-r1 rocm toolchain-funcs
+
+DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
+HOMEPAGE="https://github.com/ROCm/roctracer"
+SRC_URI="https://github.com/ROCm/roctracer/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/roctracer-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/hip:${SLOT}
+	dev-libs/rocr-runtime
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep '
+	dev-python/cppheaderparser[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7.1-with-tests.patch"
+	"${FILESDIR}/${PN}-6.3.0-fix-prettyprinter.patch"
+)
+
+python_check_deps() {
+	python_has_version "dev-python/cppheaderparser[${PYTHON_USEDEP}]" \
+		"dev-python/ply[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	hprefixify script/*.py
+	eapply $(prefixify_ro "${FILESDIR}/${PN}"-5.3.3-rocm-path.patch)
+
+	# Install libs directly into /usr/lib64
+	sed -e "s:\${CMAKE_INSTALL_LIBDIR}/\${PROJECT_NAME}:\${CMAKE_INSTALL_LIBDIR}:g" \
+		-i src/CMakeLists.txt plugin/file/CMakeLists.txt || die
+
+	# Remove all install commands for tests
+	sed -E '/^ *install\(.+/d' -i test/CMakeLists.txt || die
+
+	# Test fails: https://github.com/ROCm/roctracer/issues/109
+	sed '/load_unload_reload_test/d' -i test/run.sh || die
+
+	# Fix search path for HIP cmake
+	sed -e "s,\${ROCM_PATH}/lib/cmake,/usr/$(get_libdir)/cmake,g" -i test/CMakeLists.txt || die
+
+	# bug #892732
+	sed -e 's/-Werror//' -i CMakeLists.txt || die
+
+	# libc++ may have no experimental/filesystem
+	sed -e 's|experimental/||' -e 's|experimental::||' \
+		-i plugin/file/file.cpp src/hip_stats/hip_stats.cpp \
+		src/roctracer/loader.h src/tracer_tool/tracer_tool.cpp || die
+}
+
+src_configure() {
+	rocm_use_hipcc
+
+	if [[ $(tc-get-cxx-stdlib) == "libc++" ]] ; then
+		# https://releases.llvm.org/9.0.0/projects/libcxx/docs/UsingLibcxx.html#using-filesystem
+		append-libs "-lc++fs"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/cmake/hip"
+		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DWITH_TESTS=$(usex test)
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DHIP_ROOT_DIR="${EPREFIX}/usr"
+		-DGPU_TARGETS="$(get_amdgpu_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}" || die
+	# if LD_LIBRARY_PATH not set, dlopen cannot find correct lib
+	LD_LIBRARY_PATH="${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}" bash run.sh || die
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove unneeded copy
+	rm -r "${ED}/usr/share/doc/${PF}-asan" || die
+}
diff --git a/dev-util/ruff/Manifest b/dev-util/ruff/Manifest
index 61f6a74c0f52..bb64388cacf8 100644
--- a/dev-util/ruff/Manifest
+++ b/dev-util/ruff/Manifest
@@ -13,6 +13,7 @@ DIST anstyle-query-1.0.2.crate 8739 BLAKE2B c06643e8616f1f4469a32f9c0512941ce53a
 DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931
 DIST anyhow-1.0.93.crate 47490 BLAKE2B 1c64b24d3df3307430deb8189ded345ee2858c1990fc343f2400bd67b6d79ee2cf90876326fb29ea311bd857a941fc8319dccbe6c81f2cca2c085dc0c1fffb27 SHA512 237b36bdefeaf8dd2f7d4c5c92d8f7627a5206ded5fa3dafd5710f2fbd3dd7d7187d4a8ae917ae03d0cf06bc8d101a7663bb7bb022507ac1ec88577a37475efc
 DIST anyhow-1.0.94.crate 51731 BLAKE2B 2b8b7ed7506f31a434ff8af198256816bb196f3434925ad688820237893b54b14f3731d34a3968277f532a3b67c39e3c4aaffef43b42b13bb1c6d3cae50e9ae8 SHA512 61209bb1a81104ea86375bff12e6654047a596fd5282fdaa590301c4bcdafcdd8bc83201811063d565bbfab6be42544e43047ec88d2b0b41f7c5f2712f3a3b90
+DIST anyhow-1.0.95.crate 52155 BLAKE2B fc9cebdfae0afed86f2dfb7faf62f5a108000895317dd0cab9c83d6e48c891558fc3a1d8b9940b623b4c6fd861631a0f0344a9915517a9bc39dbfbe48ec6b45b SHA512 8c5c176381c3e861c3c4451f7cd3d9e2447c0a55735ececfd3199288d65d36dc5fdc4a19a0798f62a0b9d6ca2c155a616c7eab8bcd53e6ece743aed57ec3d0fa
 DIST append-only-vec-0.1.5.crate 6810 BLAKE2B 28dbbbde3d8642251740eec1a04a28b6bb64eb1af9f47021c6c3bad7beeea11fdbb26f94298fdf424b3ea3cd5db293f6b589b9784792f0b32b67dec96929c8b1 SHA512 e5f965d4f178beac62796dc6453b439e99b18887be41501e7759ed0e7df33677bfcd2605ed77ea477468c6067316a0ede0eb54d5b9c70401458a536a3a24709f
 DIST arc-swap-1.7.1.crate 68512 BLAKE2B 5ddeffd2ae8af4125a5b43d4a0a1afc7948533bf037d8cd3e47603c13b57b156618280d99b840bf318b25b6eb29400ad68499695e182acdc05bc5f621c42ee16 SHA512 070fa8dd17b380b6d7d72f6f45c84e591de9a9770b9662351e7a41af03798bf5e34d185a5fcb948f4d8ac5e210a33acd465c39eff6097662c2442b34ee3dbdff
 DIST argfile-0.2.1.crate 9058 BLAKE2B 19a094f43f1dcc6874c4f10604bb0b29da93ef346127cadb76fa1c9ae90c598e2e91bb98c683c4c31b7dee56d20971cede5d0785df45244a9bef157a1d6a0889 SHA512 ca0d8f5dd7748443b131c63ed0cac31857f090ff8f3616167290b1ac491495ffec26aaafa258c02492e0fe4447e3ae398089afe0e06daa5556520866e527e6e5
@@ -28,6 +29,7 @@ DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58
 DIST boxcar-0.2.7.crate 10454 BLAKE2B 803910bc77d968764c7e985b97231fcd85c63577a9c3819a62ae8a9e3601e4ebb273111e838f650c0a7fc35fb97d964a29bdf6d52aa0330346d50421a7006cbd SHA512 c84051590f8c7f493bfc0e8a9eb8364a46f853ce9a32e13a1eb5ddcfc5088900bed7b714d34b02341721653d6c313edbcd9fae3747f502f7743d4ec86f660ba2
 DIST bstr-1.11.0.crate 380721 BLAKE2B f0fac00b83cab351f8b7e02cfd20a2aaf04de853878b8c1a667159ea444093eb3fdebe4bd893e9b3723070fb4b1d2646b7c560987b640bf3f5a4923fe9accf72 SHA512 e4534db9f27184134264dfb16ffc79b7d2374e79ef50400cee4cf44c1e9d7d0b9f7ab8fa034493b5a1ef835c797214bfb399ae95d4b670b3283180fded414ba9
 DIST bstr-1.11.1.crate 351485 BLAKE2B 639c2e610e088120674a70dc5dac0b9c437f7454fdcb385b7ec9e66184b8d016f7190c864f7c8e25fdbfe5f884a9b4cf8815c1a0bb94efb03028fa966b4207cb SHA512 04c28eab447ee13e8d3af12fd165947c26086e8cb990840226197c16b4716bc018a48c6dbdd055f837a7d64eeb3c594b0b3629103ce7f910af0c3c7d3cc79edb
+DIST bstr-1.11.3.crate 351536 BLAKE2B 72a4fcc236942d121f76f42135c332fda2b1ad778d993ee69855c4eb6f909c91491fe6aa68daa0e2d602aea1bce61b1fcf03d03787f84ebb4d63b2bd3f4295fd SHA512 f1082ac8f121c6f9eab4b41c5f60aafe4623696c9f800f9d59f6726efc74f86071910f7749fbcdc8f1c20c83416d58f3ff507978775f602e18ae3d1bb027944d
 DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
 DIST cachedir-0.3.1.crate 8668 BLAKE2B 94b624651fad1acb2b82d7d886449db2b5558e672ad220396c190d155fd1ba8d46fcb26eed6b15aadae91011c7c44ae32c8257696b3e3f0568c3f0e4c95442d0 SHA512 af060f442ce5e101493e99545befe0f7e4bee8a07fae4cd0eb20d5e1cb10957e4a93cf768c8bd21f60f7bb826d1278f20095ea869d9c006fba1261cc1288829e
@@ -56,12 +58,14 @@ DIST clap_derive-4.5.18.crate 30131 BLAKE2B ff962e52d8d8afcc9639365e27753c6c6943
 DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036
 DIST clap_lex-0.7.4.crate 12858 BLAKE2B a5ecd50cc503157dd69746f3b6e9c288e0fe4f6d5d82271499f657134fd401fbe076255e2be6a23ed0b69daf3941c6429dad8b288223b0ad390a2c435575cdd1 SHA512 a2566868f4619679d3b74b70592ffa6a04b13e38e3196c56bb1dae8bea0c711bddbccd778d2aba3cc0ee074c9b1cc0335222818f0d47fb3cc8109cbc35bb992e
 DIST clearscreen-3.0.0.crate 152311 BLAKE2B 9f84217c5174b1b9e4c97b53dd9dddf7557766d9cc80c80973dbf10c4a166435d1433ddf3687889bd490a535c1c5729e668189c0757b5bffd61ae65fa4ea3a95 SHA512 2b5338a7944b44fdb40a79e87aa8cdb8ff3e47b9e4d8ebb757b1b3fb10f8b066183abd79f5ae634e7e9464377a33711694796bb5d52dec0201f863119923af65
+DIST clearscreen-4.0.1.crate 153878 BLAKE2B c5780e2fb59d5ca6797ba7fd36cb2c5b84d642107d9f905748ad655d4f4809f2cea9f9095680bccb8b7adefa5bdff0c8dfd4dffe59d39d396fd51f4dafb8d44b SHA512 2c0a1b9534d617a8fc2b994b968535c1a8a0e2a68bafd79d5cc9c9a02af553f1f5b75771e0111384e3fa29d4c2f920cda5f2979cc36e9e697f6237a6ba4bdb7a
 DIST codspeed-2.7.2.crate 4832 BLAKE2B fbacc9f6ea2a8b6d67ebcfb31b980aed15f8d3bcac910c919316cafe7932dcd44a0a2e28063e1cedd1a155ea8bdf3cc2d20892d341f8bf86853829ab70abea41 SHA512 f658b26687561e5a424f5676cf08ff4d5564f338fb5f8c6a7e19a6b6b7ae35b427e0faa44a86e62c59349cfca563418e9a17b6f80e0926d17d870a11f2e24647
 DIST codspeed-criterion-compat-2.7.2.crate 10324 BLAKE2B a30b067803b5678d63c3a3eb13631da2349eff8cdfbcabae89b8705e912458dcf0b9340e976406ff283d31d2222f0b366e80716067959d28e0f59ed73a1b833a SHA512 5ff119eec6c946bbef3a3b90f4be0649487f8d6a8a27fb8f66cc0a4c314fe118bcc140d8b84417b9c918000f844528a16aef0dea8476bcdf4132e34f9f5ee280
 DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
 DIST colored-2.1.0.crate 23348 BLAKE2B e2778d83b28571501adb4e9ec3fa95d684faf5730f093f6e608ec631e58b883d2b9f17ed7e2c1612da285a58251f479a365aa90fa7be24a2adbb69e426e0fc89 SHA512 fa70f18fb29f6870a727d8243808c96e9497f8302f5f2b1748f9d9e396031e9c53a025b8edc9c8c9a0f8cfca12e5da73250a71e382b3074e9415b85bc004769e
 DIST colored-2.2.0.crate 35062 BLAKE2B 60c397914f6a1ed2c8e04a7e1cd96f90fda10e8fe6233dbe31424c0ef46ec41fdee7779d2f5d6968662de23434b7cb7f717c5abdf29022e09ab59b9f8d92ee80 SHA512 4e3266c498a18a464b6640c0b735519f91b30fc1e001236badd4885a7fad80fe230e262fed4a8d07d54b4eb7dd24df4daebce84cfc0a4f29b6582153e11df5ea
 DIST compact_str-0.8.0.crate 70994 BLAKE2B 27ab4163d71915f9cfc160fdfa4ed049c98b06d0060def8c4bdd29e8ca37716a1c53877f70d1eb38260d44003e833c538b20bb4960f0b28a7becca5c9b29984e SHA512 5a236c501222b577fef7d7190882e20e85cc6deacf9d1f6a1d710893654b53a91c7d47373f0d10e9bfe138dbb2f4e99802deb2a92001bae7e130f6558ed9d1fd
+DIST compact_str-0.8.1.crate 71371 BLAKE2B de7fd2b980a4b34b323010fe559a94e8b1aafa30456debc039aefcdaaefa48439353139a071e440b3bb136df166aabe096774bf3f6a7b91669cd5d80e4a24408 SHA512 146e2a6be6cf948981d51f9034f0aaa1a1563debef58ca7fd3110093b0f4333a9a6a3c5dc7cde25b936d8dfba72254bfacb7814f86167043431ded9c5797417a
 DIST console-0.15.8.crate 36364 BLAKE2B 467de2c2fbfe31688cea20b338558ae9671e50ba1fd07983d21f32d7eacb73e565ebdd6ec5e78b2ae04446f09615c70983c0ee534e25ca5a28fd1b408acfdf34 SHA512 b05e49ed145785e29631d481885788f0cc5574d4d7c4d90280dfedaee7f8c1515072c9c4cfe6bd2e017230cd228157222af7e7d41a9fce697cd1888095df4de9
 DIST console_error_panic_hook-0.1.7.crate 507196 BLAKE2B 90f2855b54c78258f9e4983849a0c0b41f842990d622bef0ea16ae5e3a93914919022d21b1437bb2ce644333d4e0c6e7b55d960452c4fa437e23bcd0da83a4dd SHA512 49f4fb2175c0068981678f291422ace3737dab7033b1a49d78fd821512c92fdd023c3fe28c7daed88c8f338c30a9c7f82f18bb4583c3fe7839ad8dcd0addd6b9
 DIST console_log-1.0.0.crate 28943 BLAKE2B 1717f161a7d3a92d5161119cb7ffc477b763716e5022e8cd528caf6e8d28eff9ec4bf53a7c45a68956d61109b4d50dcc582051e697c7a5e4a591e6e67e054510 SHA512 e44e2acf873fb86822474c6e2a7dc2964384db096b3ee13673bb57990dc0a930a306f53360f9d1145faa31bcbd194f8fcc1674bdbc2f6b236e7eefb4bc43a06a
@@ -104,7 +108,9 @@ DIST dyn-clone-1.0.17.crate 11848 BLAKE2B 1f90492639630036e1e877537328e46ee3fa69
 DIST either-1.11.0.crate 18973 BLAKE2B 31ece6eb44a367926b5f9ee817f6ac9d93746f5b95c95fab360361f6b3a02160c682d298d115f39615e5b4758953f3f29ece22a72fe4285875dce03483f87486 SHA512 f62a3859afdba762b004d4c766090a25d3bd81e4a14509c3bd0f39b0d433aeff997b39759f7dbc5a012bf3b680fc4510a4b2643d63dda8171bad7403554905ff
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST env_filter-0.1.0.crate 11553 BLAKE2B 8e358517c0aeda431239f14610925bcfd6be3bd346c7628e1818cdbaa1796bfdf2454db99cd06bc6ffdca95e7ff47c0a621d1f4c3bb50ecd1641f9d19efe4b4d SHA512 a0ab51c2b905466d23c75fd77b430dff2956556b7687ea434050c78a497cbe63018c5730be950724c0ca6aefe29bbc379ac01c8a7cd2779a69c5a03e92a21bf1
+DIST env_home-0.1.0.crate 9006 BLAKE2B 3737d6a3c2c750271d67727a2f7f3466a20ffe2e88998c104416f4814643f929af744b91c2c89ef3db5353faaf8a5daf34430f9e413b0d09c79cee3d10863399 SHA512 5c79ed50e48f35bef62a1135d661ba15b3b30fe93c27d0854f58e9397058579ece4b7083bd2ecdfdf6d7ada6c84c1710c07cdc57fa638d758cc3f54afc46f22f
 DIST env_logger-0.11.5.crate 30683 BLAKE2B 9dd2b461be5c5cb3411ebba8bcdb53a78fff28c54fafd21a0f8c3fe578ebc3882ed5df63a5ef9adf62bce00fb6360de895457baf75fd2ed1a6730429478c32cc SHA512 e2ab1f117227ebf8840daaff971c2533830c0e481797cdcaa055a4506ffef78fc0830bfa13295275c604273d494278d43440b987132f97ed6bc1cf705e05cd8a
+DIST env_logger-0.11.6.crate 31105 BLAKE2B 536f7b02bc6bd4f186061d55d2c5fb0d57aa91adc73d0c2521e0136573283147d5d336228fa7b64306daec9f488a2a83c83b96f06d648f45c3b52d04699b15d9 SHA512 1ec41e4c4eee4ea6bea38d40e739b1f324ef236fc786553fd77c6bacf6303f13d35c1626d3408a18346d42ebf5c896869deba133ef34b8cccf3729957c72de0e
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
 DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
 DIST etcetera-0.8.0.crate 13295 BLAKE2B 33069c496eb846bc3e602812cd2ed182c660ae06b8a33ecea294a5ec9e37a1fc15391cadc9fde23f3e885e506031cbfb6b7d036b94cc4f94d42b8dfa8ad0ec7b SHA512 857151a9af143c7149feff2aecee8fceec45a7a2ff64a8c1a482aef89ce2f91de05123afd7d22d67cd664d9ec3800652c7800affdde4ec317437f5d925883b3a
@@ -121,6 +127,7 @@ DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281e
 DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
 DIST getrandom-0.2.14.crate 37307 BLAKE2B 5904388869335ea904d950ee83ad1867a0d3f6831b7139102b53f4bb4a2c12371c9396f1f1cbcc44e3ce69a4ea316651b1674722071bfa7562385ad4b6a88c33 SHA512 6c334415e09f570e3123e3c6c6eed1727533ac6c9c4142e16ae995c237a16effe146832a891be9fdde4335bd02b454e0fdd9160f20dc02f107ad106756221658
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
+DIST glob-0.3.2.crate 22359 BLAKE2B 564b72e2738cce5311aee12d8d6147631cb571f7b96d8d3823098d3dd449bcc23ffed5a6584f8979402bef95536b0e73fe9772f273295a0079782b9f7d88d19f SHA512 d15389441e337e3fab9c30102fe7b4b1b3e68d8cbb5d14162d2fd7e7d01a9812b2d6d6d2a24a60116418be41e2075e70becd6994c13b34365d512521e8debb02
 DIST globset-0.4.15.crate 25177 BLAKE2B 5556f4cd7c311b2ead3a83fb2c84280a48e493f024bfd7269c91cde6ab81315d2d7f051f7cee9d7d34e6c8563c2452f0ec04a9d5a8ba5273bce66f5ff8f9054b SHA512 b9281b8bf48d2e297be533aa31c701c0115978b4e580b684b78a385eb2ecb4125187605368a6858311d6cdf5caae7d733cf1406c79241b7d19e7193f5a111dad
 DIST globwalk-0.9.1.crate 12572 BLAKE2B 3518672646219e391aa0f157ae6597c78603bbef776d92403b874f848846d60ff8734e75b117dc76b1be91f830157cfce698058f445773748b9dda9cdaf3afce SHA512 9c95d6832950b35cf6ac87bd986116a75c847f11dd2e96ec0cbeb6c223ff901c949429669698cd75c4244a60c3de7df9adec648bc531303cdfba889e09f29448
 DIST half-2.4.1.crate 50892 BLAKE2B c275a9ec70d2fc0c50cb63421399202d31252b0dbf463798ed0a12a17493817c66b8933811d483b348f8f945cb05aab7cc2a4d952bd16009c3da4860202e28dc SHA512 0bce235583ca128723186e1fb50f636b519bf826c942f02c5b969db4117baa87c644665c541991c16d1f1dd97c7233c017a513d45075fc72c5d99ccc7c1ac193
@@ -155,6 +162,7 @@ DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd401
 DIST inotify-0.10.2.crate 26200 BLAKE2B 8080cace302b0e5aca8ed4188126992fed5b5b4f3624d0e5de70dfb426583428890513faae2fa32c31afbe1051aea03acb7a7f22d0720a24569f020a2a5ec940 SHA512 79692a043787daa67284f9b94892a09a2bebb12feaa5be2e1bcfa213b710af5499a4fb62b837d45793efdc19ed1eee00a014a7a620b5bfc9a594fe0571e96929
 DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
 DIST insta-1.41.1.crate 93609 BLAKE2B 876dce069d97d69417af63d00a2c41954ce5945c936831d1ea273c23739971ce246010e54f2405a2e913a93f17b8da695f8bc25ff8f921cb98c0e97119b91c9c SHA512 6526c9f14c7f86b1592464e5e260722a53b13c367917c36ee55fba1d237cd51fab9d39ba1ea7b76497e08896c2c175cf7d18756891ba9bda0a2233232e7fe178
+DIST insta-1.42.0.crate 93945 BLAKE2B 7520d02ac89199c6985c0d8cea8174abd106cc66466bd252f277705de73d21408347b9e3cc815a7b5373037403d98ed1e6b04aec96c28114ec71d042dfbbcfe6 SHA512 306c250b7365df151cd78c5ca49b987a6e83207f933828471b1e7b8a1e598bf3afa3e9b77825bed8e15b0f2c02ad0a9ea9df7b1a66996034b8e48d2d7e7c4080
 DIST insta-cmd-0.6.0.crate 12385 BLAKE2B 0b3d57dbee4d2c55e29e6310dfc1fbe55a5fd7cd034aaf72c7619c7de48d56473b7ab76cda42bae9ed43c113a2a07755497f2ee030c2d6be9dbcab4557745e79 SHA512 fa2415e328976b97488501b4d9a17f650e29585b2c50ab83e6dcb109abd0889d553a26074dbf695625799c81ca4b23209f317b55e344e0dd97806c73fb07b916
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST is-docker-0.2.0.crate 2664 BLAKE2B 6c3b10a805bb077b9d0c54155fb9e72a15304fb3d6f0ebfc3efea8b42e02b99737d22c16a5352ee0c1f820699f765673bf0ca8f46c6a49b45796796c01015b84 SHA512 759e00292710b685954df031ef96bb650993cc3384cf03760ebaec377524cadc929c6561dde5fd3e14d71f9f122c86495dcf9893d1216d99055048542123ff06
@@ -163,6 +171,7 @@ DIST is-terminal-0.4.12.crate 7470 BLAKE2B 6d1db6148198299d0775539734dc62a3c7e45
 DIST is-wsl-0.4.0.crate 3264 BLAKE2B bb9842ea007d5ff132c77b719c877c370eb5cdf63aebea8f3165ab49fbf6c68d624a3809de2b374cc4c6c86dfd0fb23b9dc32c2e7cc5f2378b2efc918dd710c5 SHA512 69ffd419eb4de2e50ef4e61efca76ec4547216957d5422ac7b2bde85264080c2f522714aa40b5a6566c25eaf791d12ec0df09afe3060cc43087d18510f33d049
 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
 DIST itertools-0.13.0.crate 146261 BLAKE2B b23d59a87f80d24925bc868c0ac7abb6b9d05aad5ca08833634ef760ce228a1b753062ec4bd22237d0e74727edecd7ba3df9789cee896345b69780d7de66866c SHA512 c6cb8f93a93b6ac1a2cbb3033e66fc81a39f83be773b734bea3311332b96bc71bbb518aae3e6b40cb537590c23de1ca4964361c336795c3985bde63232d410c4
+DIST itertools-0.14.0.crate 152715 BLAKE2B 3c075b735a6ae4b66980b1f7ca0ccf4237286b140268ea179e4ac01b1349105da227f03ea9ea721d3e762c3cf8b736cc48b6902148eae73addd864b9c79aa219 SHA512 bb168e21281ef3e43f9c93a079fc1938d79b6db2366fe17e26a90f7ce6fa55df73e54a06334cdb2a7b208b0a64473b5af9de76827a9ecb49378a5f9073d2e645
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST jobserver-0.1.32.crate 27549 BLAKE2B 5f6556788d10af992fafcb578ecfd2c81698eea31b636d3adb7544e12155796082623735c8b10ac4c04d891d1acc307fb4e4ac3f88b2006e181013006f51c8cb SHA512 d4528113dd5a5d4a3765d55599a07e0998c69c7d21a90d2872679755ec4bd7726e9721af9220c36e1179b153ad8a39214a422af63aea15eaafd7cefc828ddff4
 DIST jod-thread-0.1.2.crate 6322 BLAKE2B 8e27300e03c4d34265be761212b8d23dbea90fa6f443a55437a23df8b769e76a341f060c6ced8dd5a036d4142b08461b9d0a68a46b593fcf772fb0d3a7e78cec SHA512 fe3a3feb983b273bf86ec26dcf4edbb1fc0c5f583c3115cedcc63279cb72f0b40bf4134f95d673d5f3e532bcbeafff09759509f55543c98850e750aea39711e2
@@ -172,6 +181,7 @@ DIST kqueue-sys-1.0.4.crate 7160 BLAKE2B d75e152cfccbdf7ae000be14e0f84c6d1fd0729
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.167.crate 757723 BLAKE2B 38f1657dea6d13cb6cc87c8cbededa9f0ac280e4f141f780719164451c941ef873cf6348fef7ab249ba7eed1cbf6768c6a8dc9a51796007c8ce31cdd2f90ecaa SHA512 f6690776266836371e5f9e20ec3a93bb17bc4296219755750e4e70e745016245dab9e247fe564e0f21d10d0c7c97ae97bf54da5068464a48ebfac244cf699166
 DIST libc-0.2.168.crate 757025 BLAKE2B 2597fdf5a77345754b8c9168d9f07f83ebaa0413262b94ebb19f976f49cc2c47893e788ee2abb3d00a995bc8f99b6ebcf24abbdb320e18037e779e1241599b44 SHA512 499f7273ab5eac0961fd927d5204ff4d5b3b290c20d00ac99054ee596b6d3ec4d6712772c52b09c84554f0514a8f66b41995ceb5b0ec38a7295a4fccf0e94349
+DIST libc-0.2.169.crate 757901 BLAKE2B 1012cf93d8975aa20fc3f2332e253426ff66be6aed63ace5292cc8568ee419b0f1a4b5b39ddbb78d9c2dfd8d72eb0d068c98faa229ab55556da5e674429f0e97 SHA512 c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce
 DIST libcst-1.5.1.crate 110499 BLAKE2B 8847cfc309d2c3fb7c99fb1ea092c7cb9f7f42e1dba6ddab3349c9609b5d699b24292edfed77ca746ab39e2109b21ceedbb15177e8159253102f6ee762a46937 SHA512 a017251bb6026547b9852a4de80b4b1539aea492118e67a0fd77ba325a5d255c217ad623815d85003351317a6bc563f1e240989c7a39027b71b36c7ba5983738
 DIST libcst_derive-1.4.0.crate 9303 BLAKE2B 4f6f05578fd57328b80913cb594b3cc6944b8ac62bbee747598a0502c044dc77e781836ef7b7e01046d92990514b5168c553f87ccafe2197c328bdd833b3c613 SHA512 6095719fbd5931d1e8e9e60ae7c03b03b9110ecc6054396e1a086e7fc7f1642a6085deff0d90d857ae8f0037aa8bf396a9b5a5660941c0de4cc659664a41034a
 DIST libmimalloc-sys-0.1.39.crate 198523 BLAKE2B 371751d8eabd682d879a4d85b163d3c2f3dc3968232241cd2d7b573a5b78164efa6cd90c2b81d350c69354fee5676edb3e37f75f676731fccc913a83878c7358 SHA512 db578da8722b82eafac3b587b2db24cbf95fbd85a25b7ce30286deb9eda6820b5d452ece7c3126a2d8c96400941dc3946b4cb2f46172241861405aa09a3a2451
@@ -182,10 +192,12 @@ DIST litemap-0.7.3.crate 28728 BLAKE2B 00a04ca0e4e774b317218ab990da4c6ca1f342bbf
 DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3
 DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
 DIST lsp-server-0.7.7.crate 16815 BLAKE2B 9aef875617f871b2bd32ab0ce9634426e53153980a4b8d0dbf490cd799d849c12bf5eae7c4ce4595aa601b36986a7af4f4c728e8036032b6c968a325214f4b9f SHA512 c7e6d08cc34c26b26c4f092d96dbba78baa1e310de1c29a4d780767942788094837ae795494741a1708a3a315f71d9233b6ad6ee9669d11fafb2ae8ff39de094
+DIST lsp-server-0.7.8.crate 16836 BLAKE2B 9775b7c913b639c85ef7acf88dfbd244e4b663fd29246c686bea26511e3f63469488f08fc1397f4c94f5f9a47c4b5283bfd9c3afd96c397d316b6802848b2d86 SHA512 25cfc2805c8e123b4a785cb2984d402cb17c7632dd817368058c63b6c787e46ff32aaacb2f44a389788c4850fd8a6567cc681c7749dfd4abaf622bfdbb375fac
 DIST lsp-types-3512a9f33eadc5402cfab1b8f7340824c8ca1439.gh.tar.gz 71124 BLAKE2B b2ea1c8fdd96dcc78ea48be71d1a4870fe1ff7f6a03dfe96479e0cba5f6b13ea68381d0a85fcb79a1ec2345eab7032c76cf567a813885128f94ac0c47c3de7bf SHA512 3362f9db4e78261825ae17b3429f9c54dc1b32a8b6a275ecff7bbe457c610d27ac37e68be3e9e27378f5f54c786dee787fd87b33c102f2507a46cf7290390ab5
 DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
 DIST matches-0.1.10.crate 2592 BLAKE2B 6e9e8ce8ade3fa0f144a1befae104f63764f8346fe864395be44f99d40ff0fbaeb45b6f2fafb2e7822d1ca72f1cbeaee4c5f9bc3e2485cfef2b8de2a4183ec04 SHA512 2248c6192238a8eda2dc389a5c27357555607b726d195c36c4cf647f793a4a9e17ecdf5145b5a4d8fe6eba7f9b23c7b2db1cbd553f5610d25976e3709bc2fe4d
 DIST matchit-0.8.5.crate 35166 BLAKE2B 7a19b43b107e17ae8c390b00949946e685a9adccf9575695d639f856c5d0554b54feb3673912190a6631e1a06cc8f7a99ddd7ad382f3e3e938577f74cac690b6 SHA512 71aaffddd2e9b29a9b9b0e9fddbdd9c216eae58c0579940072f07f4a66a9088e9065899051c2b0ee7e56c0f36ce477c1117de7c904c76480577d57b9784964a4
+DIST matchit-0.8.6.crate 38353 BLAKE2B a595a0fac61cae09dab99462566e09bbb61688fc84de9d8232f765a50d580ab22fce7cbe7d2bc582d03f5b326e269d335b5889d7773b5a3d85b4b765a2a26749 SHA512 ec6570478593d98060800c962c53c1c351df61424cf8540cb06ee5f0366c2f323f5a6ab36f9dc9d3f7b675ee2e000ffa1763ab35f58a11d3470a366a73b2995a
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST mimalloc-0.1.43.crate 4075 BLAKE2B f22e0d10c34319125ffbac904894e0e9623d56a1fe488c95d76a706bab047aadd8c511419ebb20136ede67bf6297019b3ec7f263a324f1dabb45aa4f257a6cca SHA512 f018df422932d5eb0bcc4c0bd91318a86ea09d6e3de51e76d8a65eb833f9f5185c759c1d734e78d3f46d9043d3642882ed3398354fe4b79a5fef05d346c002b9
 DIST minicov-0.3.5.crate 41333 BLAKE2B 11082bdfd25351c54eb1205f791db0f47828bd729a722fe5b0e0a559dc9cc23669c04194adf16319fe45c0e7927ca3bcb0e56074e91657d772606278c71a9830 SHA512 4640d5e0011b0b759050d0d824b712b742b2fec68c515110d073a2169eb2e5b8362b7626a31703d602d495478c35d7a76248baf14d4d0efa7c2cf3de35176027
@@ -246,6 +258,7 @@ DIST quick-xml-0.37.1.crate 187839 BLAKE2B 1d2a47f497bfbd7d32216527804731f7183e5
 DIST quickcheck-1.0.3.crate 28069 BLAKE2B 5f0ddc8e22fec55e879745a95024abaa03d7bcfc6453286eec072663b36a5d6ae247b3c1622c4743e1ca9b7c4bb21da0d095aa5247f32b0bedc393f92cda6bc0 SHA512 07dd707c9d3fd0b9cedbba545bc8b4fc1ca2770d169e444f8c96f8306d3161a6a3e9189cc5d0d6b3dc4221f7dbc05887dfe2dedc914f88d5e69ab2b94179185a
 DIST quickcheck_macros-1.0.0.crate 5275 BLAKE2B 1681fbc5a476c627da442d601d9f24dfeaa147dbad7c8d6989ad73cf5a204963c29b2b5bf68513ba74c322f74ef5ceea92594953e9034921a2c8132150252779 SHA512 f7de86f76a53fc36063f10f5405979677a2e48a96d13c439a4aa98e89ec7f3c3cae324b8dd789a5236630110ac9a1763f28361442cca08d1a1ef458c7bfadd55
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
+DIST quote-1.0.38.crate 31252 BLAKE2B a3836efbe5c21dec70c684002b47b8fc7cef643c82ee903b537a48bc0707a28106c4b33d98e60ff81e04c7520f7404b1dc4d49446e8d91dded517e476c36e1c2 SHA512 530c47c5e6372b508bf5b2b88a138408a7afa5ef52c47280ed20eccf39f8e97dfc1e0a18c1bd5472efcdc49a7a1e69566333a0a1b4c0b4f0e11e6a7a85bfe8af
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
@@ -263,6 +276,8 @@ DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd0
 DIST ron-0.7.1.crate 53572 BLAKE2B acd1d93fcc8a3567d2ba8ca582955c391b2f33a5674e9b4724976bf9708221b9cda4c10e9fe9fee97e41c36e00b06232a7f091958ab9867082d933b33fbd95b1 SHA512 02298f035304e791c99fb16c6301d040e3a348180aacf31ddd00abc0a694901bd1820c8479fadd72028fda8681c45ff6a203c6100ae9037c845cba74b7f9f8c8
 DIST ruff-0.8.2.gh.tar.gz 5496307 BLAKE2B e7a66dff4aacdcf85b9a9299c43453dc7ac8887880c02565ef8bc74a7552179716d187042bb12f260b6a7301aeee59fd7b69598a421d2edbf2b7d1f2ef041240 SHA512 63bdcb38182fc6104d996f8b48c8406e3e1aa79b41ebbd7399a7f1380d1292fd0008ad47aa38238711205b495ea4cfcb85dd47e7859576afffa70820bd99aa79
 DIST ruff-0.8.4.gh.tar.gz 5583531 BLAKE2B efd852c9289fbb720f9704705331970638f73ca10399a9d2941c0aed48bd43a5a51179fdae752b43373c035f34a38743af1b0ed55c295faa7108f2a7ca3139ba SHA512 d651a33798958ac7bdc646fcdfe9eace7f6c08bf7b45e199937beb7c67e210591c0821c3add679229ae8132adffdbe7bee90e92ea0e1933f61db0e5b8c92cacf
+DIST ruff-0.8.6.gh.tar.gz 5677977 BLAKE2B 95b65bbb4ef7be4d838bd8d6e5d789bbebed77411927692427224eb57b7c327072da3b78f6a74d16dbc068a582ddcd39bf8f69688a133e68632e026cedead351 SHA512 cdfc15141c9f38df4b2923d023d988d18622ac083e5b822360184223273cb96cca807b690e77d708e12f11e2d0d8e8692c08504b167974765da05888b4fee000
+DIST ruff-0.9.1.gh.tar.gz 5718787 BLAKE2B 73761ef6996ababe37c8d819f6e1c6411b4ac0422214084b2474e77b9409fe27bf24f5da5688388917ae415af7782abe6ce784670ce958dd1ee89f76ac756799 SHA512 fb4e8760e917859a637491f57150451c67d66c03efbff83340a31650cdbff1cb61d2927c1caa5e42184f9baacad138b1487348e676b240507fe69eecf795c285
 DIST rust-stemmers-1.2.0.crate 2351301 BLAKE2B d633c0d7091fd05e55a521670104831bed89deef7a2fb7c1eed3528246e65b67a97888fed48b134b10c477e7b95c034e8bbad70500c779b1ff7b0c334de0b37b SHA512 b9453a0984d41e5a692e5ea1a8a7bc6142de30f7b345a269489b8d4ebe3b3d442e7fe5f338c72a790521dea7a2ad9605c0ca8218a6b76d8bc5e19ae02cf711d7
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustc-hash-2.1.0.crate 13316 BLAKE2B 3e93739234cd36f3cda5d71522e3d2204e98b1d134cf01cae5a93a93e6c4340a7b1b0485c339f312145c723185fb83f6aa87ae2a0b9b726a34cd29c19d3ede56 SHA512 6f6a40586fd7a99016efd53888970c745888a06bb6b9d32eeb4936bcd16906c90ba22fad82a4a6b547df4b6c9cf6d73eaa8d36af097d65d3d6de18a0669d5ad2
@@ -274,6 +289,7 @@ DIST rustversion-1.0.15.crate 17406 BLAKE2B ef68a3a83e11f6734be94117e5170f92f9e1
 DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4
 DIST salsa-254c749b02cde2fd29852a7463a33e800b771758.gh.tar.gz 601630 BLAKE2B 987d867b17f7bcacea2a30944027e7fdb2a5c1cbc797794f3610060817a5174249c689175f923b24e6085dfc050eb16aa6e8f05a1b88b997bb241e1440df9c84 SHA512 d0efdc6c10fcc4e6dca900bf5a1445e1d9a739c4135229591a3dd19a147f40ddd44eedfb2a6a839811cf736fbff681f649bb5f1deaba88888f9032a7927d157c
 DIST salsa-3c7f1694c9efba751dbeeacfbc93b227586e316a.gh.tar.gz 605275 BLAKE2B a04c31a58651d767d451ff55aaf97e0b1aeed44a677525222797b5fd64cbfde2f40d9697b6e6ca95f315247630a3a534f9738ee1fbd1d8ec5d8070372647c34a SHA512 177458c41635c274383bbfdb69a89bc066be4f3fe8236103a15d17a76709e52eeb8d2b100e227a9d62c01bfa1550559cb5699b043b43023a6659fef75cc5a382
+DIST salsa-88a1d7774d78f048fbd77d40abca9ebd729fd1f0.gh.tar.gz 606602 BLAKE2B c8e5be6c56fa461aa8fe9dc3af39d4fd3531bbec0c70f8fd2d1a9a2b934fddf7e153edc3791b49287fd56f8d30798495978165bd7cc57fd20134d52c7b2139b5 SHA512 7ec9139f296ef01c14dbcb1adaf91839b8c21ff15854c34e35c89c4480e10bdcb1efa150fcb7db2e86f7cbf08807806d2e3ece288c4fbf2f72eb44df4f345ef1
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST schemars-0.8.21.crate 58475 BLAKE2B dc3e96140728a9aa2a4ec5a4a46e12f016635d818dbd78865dc0281b6f0fc05174fe7dc0ddf085f0ed5fe26d4a4e6b1bfecd6909236cfcd83c9471b876d2d01a SHA512 23a794ec52d83ce045c8b2d633913b3b29e4cfc9d0a29f76aca8cd5b31a9c707ffc04c94390ab719b3c8109f37c11a00dae73ec1719087dfe7b3c4007beb066d
 DIST schemars_derive-0.8.21.crate 18703 BLAKE2B 62cca4add2d8282e0461d52026a3d7b58cf6a8b34819179336648300b8618056c6a1eba49b6bbac098a101d73ddf577bf9e6e8afab225ba67cf519126c6f9d06 SHA512 2e24af9e86aa1c04921608a7ff8a62ac1c3e7971591db9c8488b6e701f289fe56931ad208bd73f2542fc1d95863fdda2cef9561585b7e760eb99e187661ee102
@@ -282,16 +298,21 @@ DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb9
 DIST seahash-4.1.0.crate 31976 BLAKE2B f553bcff7af9da9b024efd8db4ec8cbe4100dcf4ccd8f627c724fe4a34b678ef0be8da44e92ea55c4622b9f9f37228792a22c8bcdd54e652ca926eb3c7d37655 SHA512 4d9111dd2e491c7f6d49e0b79a3c23628c02d6603ac46e88ed137ca737830003b549ccb38087679de2cf0b02a53065b89f8d79e0ac9ddb66844d970cc6383f8b
 DIST serde-1.0.215.crate 78527 BLAKE2B ca8e1175839ca45a4d78a155f5943396211408a85e0840b065c52948188010653d68fc4fc7b63bf2c39a11a6988abb7f6f3c6d878ca1373596e0a5d62186e109 SHA512 3da13f1a74393f1fcb6d659b5e060a11ecae358f55cdf4a2fd05bfc863fea6f75d3140d3bc74902f8feba8cddf7dae71a3f4e4e78e78e1b08ed46b3e4900281f
 DIST serde-1.0.216.crate 79000 BLAKE2B 98c0f5cee2f9212c6b7620d2068665379471ceb7557d1454cab9b1c2120b526ef597fbb642f65440e70f92a4764cad33613b478bacf99138dd5bd51fdbdbee6b SHA512 baabf4c7aac4a540c9ed18b336662087258b71c9cb0e547c8d83a2734818ab2cbbe62f910d812eb61d3d46e653c41a3eebc99b1d679bfc51f95710c71a8ecc20
+DIST serde-1.0.217.crate 79019 BLAKE2B a0aacff795d34583365ddd469fa14c58a6cccf8afbb248210aaff3134c7ce6e34b3d03f437326d7c01b3e78f82a5d19c37ed9fa4372970d8b2793f2889288e1c SHA512 f97b3b54b9e99c9a027390405cc054c3072f49c92803a4ed5f5f69e76a179deda9d77993b645b3581437085912d881da88d0451b9e0da423c64033a23fdd8054
 DIST serde-wasm-bindgen-0.6.5.crate 21098 BLAKE2B 34b7a66752422c21031fb21202c8405c43a1e6758eb067b4fafeb24f812280e70bf16c27bbcfa4b4b5723e369bca81e42020677787a79277f32f71eaab6822fd SHA512 c457b1e8c83760d94eaf8eb49169cd620cc1fd8246af8953503c2bea9c4ae916f3de3b9070bfd4102a713f8d843b6ee96404e27b21a48c589b444aae0f9303b1
 DIST serde_derive-1.0.215.crate 57092 BLAKE2B f28bb66017599afdcd8d45c514b8e07854eb944c1dcf931e052a01ce421e0de6c20c13b3867da5922e2153e25ce88bf9fa27e2e68ddc9d212977f71fa0bd6352 SHA512 cae686bdf10c683149956ffe1c64fcf3e9b9bf0cd6e33b4ce7429d0ca35b9fdb55443693866c1202fa79348c6ea0f49ab3be3d5f857de4ae0818d2b4c8c67d9b
 DIST serde_derive-1.0.216.crate 57674 BLAKE2B 12a9228679c16288c08c8b256707e276aec79f84ac7af0c4cfd1f109500dfea80438df17d798acdd30a9743c753e70093b22bd324217529bac483f257682a3e2 SHA512 80fcb552279ac7562297df878f2f5e9ac09241701f5cf1088fcbf473b638f58cd3092a7930d8937ca0df9a47b9ae1a42d490cd46a275259cd8089fe8f5426469
+DIST serde_derive-1.0.217.crate 57749 BLAKE2B 63b4930122d80d64492ba2718630513012202e42bbaa74510729ee66a0e72b8a1ad123784b479697ba562db43868f4bddfdf5e94bb3d744cd68a547471ba40aa SHA512 31020f4533d04b31ae125580a3c5093fad36438d324e2d9b063923aa8c125c654102ae7fbc3b3df892bb41db6b321962a23e0a37950e080055d715d15b18af76
 DIST serde_derive_internals-0.29.0.crate 26065 BLAKE2B 522b09f139554a52201ac397323f0124b809e9e9ff6329b34afa99f90cdf65fb3cac8370d6ecb712b72dd8b5a1d96f7f7c4ffc9ac6718eaa8a66e1aaaa28d891 SHA512 ee6e53fc58aaefb2ff953bf58ef90af3c74151f5193fe7a75d8afbc6e3dfb83d54c514ee1403b5283bb7d25ff71d24c1d8622bf1bbe940e2ab8821938d4dff21
 DIST serde_json-1.0.133.crate 150739 BLAKE2B 7891eb5b8edcc7fd09ab1e15d3881ffdcb629aa39f2bd758c0505700a5f2dfabd85b1b66c3b094268bc1627b346e204c792f4ca61efa76c54ab9cd5744fb0ee2 SHA512 20e65ec87bff319897a141960d13deb5cadcf821209c1ee8799f1dc7f458ce432bc62c16df5bdada1c8d3cc01ff23b8125e8fa0a03545d4614f32efd687dc69f
+DIST serde_json-1.0.134.crate 154351 BLAKE2B 546f8ffe9373444e8c9e81910476da281dcef10498dceabc8bec9f9063c55f4a9033b83586a09b0f410369515882c37712a2bd75ff1fff05815d904f37386124 SHA512 ab6323799bf19da8ec6e6c428370d37cd230192b45ef54d2c65c7d83907b2dde71d51650e44f1fcca1084e75e0e195e97b28437f53a331bf48effed3d59b58a5
 DIST serde_repr-0.1.19.crate 9997 BLAKE2B 1bfc8e94b8c3cf897813f4749d6a1112c1097c2c257821eb366073a41ac46084a21bdc0ee4e3b99d82444619a894472e24fccb60cbd8a41ab7d5b0469cad7c41 SHA512 678216a62702b3300fef850f10ee60d88f31de1fbeb7300e3fbbdc4e4a9cbc95c6890c8e7b9385223ec837d9504edd53e69b620f80609e54579c0994ed1ab0a1
 DIST serde_spanned-0.6.7.crate 9164 BLAKE2B 559a62c0ac00a1559947224bd268842f35c52f65d0d52102c98b5e683dfe4c36acb015edf97c5f79ff818dc575b3ae43c3f100d18eb7afc3ab9c96e348ba6794 SHA512 d0ef413867a705080fa68f84a059b4d04b604bec59323329ded7ae03e0caec49c89fc53640c1e58c27bb23b5c9f260ed176ac52f3a93d25d8d7643252dba037f
 DIST serde_test-1.0.177.crate 18671 BLAKE2B 85efeedf5465ba9258f7138667cf547b4e3934b5b3cf36ceb09be04ec6ab32c77c43e7130cb1302a642586f0554c66ddaa5633f9644f9250c9db0b978993f8c3 SHA512 11be2b5f2f8e18ae5b787f26517cfd0be4750b021f792ec90f74425c54292c7b8e1525758b7fd9459d764fc1c104e6def95c14fe685261425aa162582074bc6c
 DIST serde_with-3.11.0.crate 145979 BLAKE2B 83c6cbbe14d44179321ef51a3b53e6c9044c81c24512c67b1bb0c95d51f364da71ff919d4bf517c7372998e2c8a7c373688c9c8ca0973e380df4ff69428d6df2 SHA512 d2a6d5e8075194f82e42ca676307b1456dbf75cf59172a7abe84f5398ba37f7217c86c8f71b954161a5f7c7f5163ab10ac322eef4b5fe6fbbf86550f3f37ea0b
+DIST serde_with-3.12.0.crate 148666 BLAKE2B 244377aa9de46c77d12f0348a2656848ab44bda4bbac2f14a607ccfb532cbc33597e0b3336b9fff5242e8b907f59cbe093eac7e1aa9cc82e320bce011f5d177a SHA512 243b4aacf9f0aa9c3915274650c2b70ebb389ef0b1e607afba35f0144199073b573703f8b66bcaa875aeb434301ec2ad209c3d54160f6fe25dc2e4a9fe48a53d
 DIST serde_with_macros-3.11.0.crate 32054 BLAKE2B 4d4710b41c2b441d28f8ae95d95c74f3bdbb2306873dc66b1cd7de17daac257b19ca80c5d240b521353f3b67ca8c746ec709b6db65942b6289560367897e1c08 SHA512 222aec6c50a7b758ea15e1192c71dc19fbde3a99062beee12e24ff7691e0858fb84a0245ac86d96d818a877a89834c188f864dab1aaaeab22ae6cdd7bb416036
+DIST serde_with_macros-3.12.0.crate 32089 BLAKE2B 667db574c1a7850917a6738ba55447285085e87826b04da22b6be92ecf32ade3f0e99f63c738262f822820674b09be742778223f28507daf75324f4c62195e98 SHA512 feb186b9c51325a19643217ca2bfafc6f7e5433e2e059683ac2f271d11641a7feab728c5e7e37a99310ef259faf862b6a42ec41e77ff9b3349cb04333e008907
 DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785
 DIST sharded-slab-0.1.7.crate 58227 BLAKE2B 9b4c4e4849ed324cf48c2b905f21139d1d65aa5ab13e7fb11817cac9a32ad09f8dbb1e50a93d40cafa0aba872792bc92f7bd2e219f62f80695409e949c07978b SHA512 3be7438d4a75debb14463477f34de6db1ac38abe958ada5d5dae7ae8d5993e245da69fcb989d91aaaffda5f2b085d4bcc88d10e07ec567b7f40a21437de6d4cb
 DIST shellexpand-3.1.0.crate 25591 BLAKE2B ba395d9d98fed37979e97609689f909b264ddb44dae56ae4958da9a0e85aa382a00bbca42530cda2701e934233aa1d44509495235ba0512beb33a827cee5c9f0 SHA512 9b20074425db359cf92f29c52be91a3a58a91e6f3116b210913f24dc31b5371ef9d77fe46e7da39e42eac87fa4ccb8ebf9175d7bd5fe6b520d12b9d3b31cc65e
@@ -310,10 +331,13 @@ DIST strum_macros-0.26.4.crate 27531 BLAKE2B 7f7d57c957a1591054288fcae6590a5e669
 DIST subtle-2.5.0.crate 13909 BLAKE2B 660c3a472ca54c9843ce3feea74b802e27fd7f62dd37a30e2a4ba82e4b3a71df63562e8865d5fc675d31d0900998a8730503f91a61450884446a3bdd6af0041b SHA512 f150b1e2037554f8cd3213a54ddbc258f8f670cc4f39e7084cdea4b47538dbc58b834bc93b443d58a4b9087224efc003234042aaf366687dbd32b1e7174082a0
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-2.0.90.crate 290584 BLAKE2B 9f469001c1439ffe57c578119653d3021c2709767e8e881441459a190402679f4fb78aa65e7822ff20913801c3be00d9b8f115189ea8e63ed94ed359b40fc9e1 SHA512 44606124f113c259c19edcb2adc1378d8292b422d800604c0e0d1ba89bd2d13d518cf4a6afa58daded54da9cb285464aadb113815406a0f09c5e18f865789ae0
+DIST syn-2.0.93.crate 293925 BLAKE2B c36aabae91b4d25149d03d58576dcc067a481ba456ebd6ec9ebe2ab5606e0dc1aff3c6aa714e6a0dd40dd8b8e01d3f48243b6e831f68ed2c12c799b25a347ddb SHA512 0f76fb495402b9d4eda239d65fd4697f77231b702ad4aa1c4d2991b899a092b892c30d1dace92bb54a53f5a7d2baf7637ed3c1804d11c6708987cb1e2b50450b
+DIST syn-2.0.95.crate 297136 BLAKE2B 5f0ec2d11613e7c172ba25302e4303b09c8d81813735a1ac6d368c7aad5171198dd276365ddd2fa3fc9f3cedf4951cace0c56831c7cd40d71ecbdeed9a47886f SHA512 2c1ebc62893830c34815b29fd6788b3a3b80cfddd5e303fa438569262da1bacd9fe3b892881b544e022f10a4f0c2fa9df1569a73418ce003cc7c8cd8c7420035
 DIST synstructure-0.13.1.crate 18327 BLAKE2B b29ee88c559a2d58fa46b7af155b448f001649ea79a1898f0ac87e69108b87c65cbd287d8f9001f360df7fef06ff39c937b48d33e487a30c8eec6a46c639c0c2 SHA512 09024193b44fc9a8901bda845b9f86c57dad65d0f53e309b2e7e968538fab6f67db1c86e5e52a2eb8fd116dc073e3ad10983bd60764662ec6ba94fee22a958aa
 DIST tempfile-3.14.0.crate 35065 BLAKE2B d155a39f6ed6e846bfd572ffdc73f306d30942642e07f2b497963ae150b8ef774dd046bfb3ce410fa326c8e1df27b0cada804100215e01d02272d6059d5294e3 SHA512 98c1ab70eb3efd2d8b16ed58c8c83f8599663af7ef269304e908a04c38334f659a4d0b1647a13dc0d1eb90a293f1b37ec8ff0b9b45ef5b7ff1b4452bbfcdcb15
 DIST terminal_size-0.4.0.crate 10036 BLAKE2B 2f910a6ecd80a3fba12811eff425fe2d1a7c474d8db7f673037c1088ef468e96d41fd13fd3175c84c20da12195a07bbd4354767bdbc64d757feef86f86e384ec SHA512 b1a66cdf4e94997b5291f3becfac1e2a838f6c3f6c068faa1ff1aa775b2a97d41be2aff5460d88928786cfd7dc8dac5e2d46a62b475d40343e1fd517c6299897
 DIST terminfo-0.8.0.crate 46407 BLAKE2B 8ade6d7b6a1ccb7317f6d30ac5612754c8d324ab4614ab771d6cab692d191d658e9782d2a7f63f12bb30c7164438535b9a7e1cc37fa9daa691634f47c0e5517b SHA512 77b9abe815145962d40a502d04a62c393d97ba8c721c79ebd8f71eb23fc9bc4ab0d6a4b8b8b90ad5b716894ad53249c24270e54a9785f5f66918beb3e656d01d
+DIST terminfo-0.9.0.crate 45420 BLAKE2B db73b1857fff94a86aa8b840759dcbc7521bc30cfcf021c55aa6dcffb265042ed698b2a249ab3142c1761602984f510073d7cd73f818685153f0793c99e0593c SHA512 f22b16f93b2b7758b41ad393d580eeef067daada996e41056f21e110bf53fcc9a4bdd309518d338c5afcdc7484e2d36b2947d9c49b0ac0709448ceb00525e849
 DIST termtree-0.4.1.crate 4557 BLAKE2B d4300b0e6e908c519a0a76f5e08167f4467f428b2926e7739614cef5d3e294dfac15ae8576f7011a852745713c16da93346660ff96520a2bb90a4dd4c23d889c SHA512 ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062
 DIST test-case-3.3.1.crate 8797 BLAKE2B bad61b52f7865882cf6f1ad9448335a8c2eb725629858d62675ed5c10e3a160f5b2cf28cea1179a0c1fea1b33668a70f294b8a2252db460490f3c0bdb705e7d9 SHA512 9d6836759dcd71a61ab4e395db7c1a75a14ac3102a36c39b09868ba96d28a2265d8ded385942e55cf95dafc7f4b53fc498b30b6473cedc9b558977878e831b3c
 DIST test-case-core-3.3.1.crate 14327 BLAKE2B cdca628ed77b8d7bbdf50c775268f733e125fdcdb4425d228691d9650558c3797876f5d8e900a7afc330f61c2be588452ced646248bd676fe4da1a4f8000decd SHA512 2c58aa3c9051b99c269168d5d321c73314188501fd33170a8a5d44e860354f5a399545abbdf50478a43d13e15ee9ed53d4a9c800b263a5e42b97416f96e2c0e3
@@ -321,9 +345,11 @@ DIST test-case-macros-3.3.1.crate 4961 BLAKE2B c3cab2832fbcf3deab12b13bfbb32bbe7
 DIST thiserror-1.0.67.crate 22006 BLAKE2B 5be4e67c37f64ec8e3d69f0600953d0d0a2e492cc620f46556ab219661c5a3a8bac44bd26a8e3ab5f1552ad235698052a951d6202456f973373ac3b8d8a23088 SHA512 fac1a707f72d68a511012329bde62e3f616000ec8823172124e2fa2d29519fe412c0c62865fe92511a86c82e4dc3cfbfc627f403ad6b2c1dcfb9e043550eb54a
 DIST thiserror-2.0.3.crate 25559 BLAKE2B 4222d28be8ee9b2e74d647587b9a79a1584b158a0eb9fc6bf642a1f008bc2004698d3aefdd0ad8305052bd225eb75e57d7040768ace9b0839ccc135c92ddba1b SHA512 f6a8e8e1bb6d6e10edc07c35f3141b4b3ecb46b943b4879dd8f8bef0306feaa5446d8e47b24cffeb4cd6c57b4715b86b2bc0716b4ef7dfdaeb080ecd29646c9a
 DIST thiserror-2.0.7.crate 28456 BLAKE2B d0b40d33c4700b7c6a8a6330f6c4766eb4553040a62754059d84f86cd8e875c4ccf8ab7197aa6fdb2b6b27d78fcdd256ede79a22e89ad8304730a470aa20b718 SHA512 0ec2374ec19397d4764e01d46e6a8d1a6b8beb2c1e92bc88bef9309348934bff58fe7cb876e67258ca0d2ca488bffb96538efd24767fac13f1d65cc22b4ea7ca
+DIST thiserror-2.0.9.crate 28531 BLAKE2B 7789458ffcb381e2cf02f182248396c5e6c20a818e4c5a2c7da8a8f50099c548646b51dbfe0630a242f24e9aff65e215a4473e13f63bbffbd80a3429237c65c7 SHA512 b7b5f54cde87c21e8fac3526d5a140c0d64116e700d07eb28714df3db372a42fba30bb37817282d0ee1b5333f1998d1f628d43054e59fc39393fb567c3df4cb0
 DIST thiserror-impl-1.0.67.crate 18285 BLAKE2B 3c61ec3911b04eb4db2c22c3f2e6475f80c1d6605f8fd46711c4076b8b265cf38c4003e8b685e93972e84dd89f0edcbf0be01dfb404fa0cc5eed1d3e100fe657 SHA512 e2b0cd6f53680eadded7889a87c8b564c15bf52c1f9c6ba9d9aa84b82625ccd1d86b25409e408e7c4d45f2d41ff26b86e8f5c0dd2ace964c0168a6c684885164
 DIST thiserror-impl-2.0.3.crate 20283 BLAKE2B 3b9b162b46a0fc6e816b3dd6c09b6ba38224c4dba9fb41e4048cc4543c6c2735ee34a94ba205be0b193debd7cc42210be5f78d9150711c9058416e41e56ba2ee SHA512 50bb722db6bff4f18975312be61fbf201b8edb29a2c6420d8a2a1f2817403aa09c6de1269e7f952c4d4583f0dd2ab1eec45b26e5391b6bd69c6450c8e42019c1
 DIST thiserror-impl-2.0.7.crate 20954 BLAKE2B f6e81f9c969fd278f9f2a6052c6a3b35066728580cef96370a4be17fddc17384653c1e07158945b1eb2bbe71d24dbabd1b98547f58924a594b1a3cb8f0a79f4d SHA512 ec15231e3e8eb3dadbdb9e972d7e46ab8fb32c21a8292bf438914b2078b96d0dbaf611f63592d5e44e62d6e228f3dc28ede0d1dd18a34748b499fe39a22fecf4
+DIST thiserror-impl-2.0.9.crate 21023 BLAKE2B c2def0cfe9b9854ce33075fc246a2baba386d8f3a70f26516124f5ff4f7dbb0cd0b8887882c491f37652b565ee4fb3e7895a39cf34564a21e96890fa6e3ce125 SHA512 408f6a4c0f6cee36f69fff5a2f08cbd349db44753e6b6ac730c418fa1fc06ba7f69fbf248182af947843ae49d5cb5ff53980cdb18cb850ea8d7d9ac7dc8d67fa
 DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492
 DIST tikv-jemalloc-sys-0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7.crate 897133 BLAKE2B de23ef41550ab10a30da4ea1037a5f027c23dedc71e0aa491f11cfa104d0fc6144baa0efe65991b85793719b185aa24290f26f1072a479caf8807f8a7e46287a SHA512 411c6b21fc259f3345fb6890f71de1a178f392e75351c6e38c8c9b70dfe9c607d2efd7f083152c913c395e5a041429eae731d5a34df924481c35c0691978dcf3
 DIST tikv-jemallocator-0.6.0.crate 13700 BLAKE2B 86a14c00a953991da2abb96c379ddaa03cdd403810fa0468ee60a0234db03b3651ad87533221f4812389b8ad03730d8dfa16c75f0d6dee640a4594bbe81fe700 SHA512 411e172ef702a3dc3022c8d672806b8a0f4d0c9c2db95f8c5fbe4949d3235504ef748793225186f6311c17e170d88bcf03e49be37657336520d06b75bf97f07c
@@ -388,6 +414,7 @@ DIST web-sys-0.3.74.crate 635737 BLAKE2B 4bbf98cf87d4c0f6097b4525d61a4893f21ae77
 DIST web-time-1.1.0.crate 18026 BLAKE2B cd72e384aca90c79e587448160587531c417f31a32e9ded23e6b78d492d0e517520170fd03177f28870c313b9302b28c32069a2408acccc076a1e4939a2c8f8d SHA512 73e4ef9851de089fde9381a595cb9e37a434f563f1fd350e345f2617b701caf57a9aef739b922b5b10cda131cdf2fd0af42c55603f8973a623a8b6ae70f6cc9f
 DIST webpki-roots-0.26.1.crate 249748 BLAKE2B 6a2468eb2f868c65c599d2f6664798f75e77cb7a7228a2c7285ee5256cb01d110709474feb389991f12ba0d143211770c6922932c7fab01b4b0e37b612cbd453 SHA512 89ac53267d850953aa78550a60f58f5bcb0f9e885c4c448911dc55bbb8dbc3fb845cd7545fc40ff26998b0c360756de85206adcb148ca6190e50bc2daea7f61f
 DIST which-6.0.1.crate 16542 BLAKE2B 20fc6e56405a9774569f315703b2d8f20029c225e7839ad620121aca7e1e0ee3a0295e402b6a0f504d18774f3266b98b56ffcafbda153321b1947f44205ae51e SHA512 6a80b7bf46a7fde1fd4ec6cddb7bafdf9b9878a493fc5fb6ed425827206100bb45850541b42113be43aa7b336a30f98e14a5fa20d09a6411e3f420b96f7273af
+DIST which-7.0.1.crate 18596 BLAKE2B 6680c091eb2cefa54d7a5f0b1a039819a0bd5c7abd059ee41b62e0d6132d06824eec352f2bdb973f4ff116b2920619f750aaa7ad9c7932d0dbeb0fe5afd7d7ff SHA512 def4242d6e84c2738692ea1c2dcb73c5204c36b124f6b5903197fc39c29caa46b8c1ad180a3ad0045bf58ede95902cb4c55f0e2eac3537a62afd44aada3eb4c3
 DIST wild-2.2.1.crate 8080 BLAKE2B 489a2a625aa8091fdef9f4d49747db7816d82c01384672bd12ff9e4c906f3418fa5a5fa8951b625f6d22a9c1977c523f1b54d7c4252c241413ef6f63d327cb29 SHA512 8f92b83cb2568fed7841ad372111138d9ea5806c21a0affaecc639f0556ab879ca42fe205fe3c1e55a1b5c1c4fb0b705a5566b06bad5c119a1d41df9c01ed2c9
 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
diff --git a/dev-util/ruff/ruff-0.8.6.ebuild b/dev-util/ruff/ruff-0.8.6.ebuild
new file mode 100644
index 000000000000..0cfc3746afb7
--- /dev/null
+++ b/dev-util/ruff/ruff-0.8.6.ebuild
@@ -0,0 +1,533 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.4
+
+EAPI=8
+
+CRATES="
+	adler@1.0.2
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anes@0.1.6
+	annotate-snippets@0.6.1
+	annotate-snippets@0.9.2
+	anstream@0.6.13
+	anstyle-parse@0.2.3
+	anstyle-query@1.0.2
+	anstyle-wincon@3.0.2
+	anstyle@1.0.8
+	anyhow@1.0.95
+	append-only-vec@0.1.5
+	arc-swap@1.7.1
+	argfile@0.2.1
+	arrayvec@0.7.4
+	assert_fs@1.1.2
+	autocfg@1.2.0
+	base64@0.13.1
+	base64@0.22.0
+	bincode@1.3.3
+	bitflags@1.3.2
+	bitflags@2.6.0
+	block-buffer@0.10.4
+	boxcar@0.2.7
+	bstr@1.11.1
+	bumpalo@3.16.0
+	byteorder@1.5.0
+	cachedir@0.3.1
+	camino@1.1.9
+	cast@0.3.0
+	castaway@0.2.3
+	cc@1.2.2
+	cfg-if@1.0.0
+	cfg_aliases@0.1.1
+	cfg_aliases@0.2.1
+	chic@1.2.2
+	chrono@0.4.39
+	ciborium-io@0.2.2
+	ciborium-ll@0.2.2
+	ciborium@0.2.2
+	clap@4.5.23
+	clap_builder@4.5.23
+	clap_complete@4.5.2
+	clap_complete_command@0.6.1
+	clap_complete_nushell@4.5.2
+	clap_derive@4.5.18
+	clap_lex@0.7.4
+	clearscreen@3.0.0
+	codspeed-criterion-compat@2.7.2
+	codspeed@2.7.2
+	colorchoice@1.0.0
+	colored@2.2.0
+	compact_str@0.8.1
+	console@0.15.8
+	console_error_panic_hook@0.1.7
+	console_log@1.0.0
+	core-foundation-sys@0.8.6
+	countme@3.0.1
+	cpufeatures@0.2.13
+	crc32fast@1.4.0
+	criterion-plot@0.5.0
+	criterion@0.5.1
+	crossbeam-channel@0.5.12
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-queue@0.3.11
+	crossbeam-utils@0.8.19
+	crossbeam@0.8.4
+	crunchy@0.2.2
+	crypto-common@0.1.6
+	ctrlc@3.4.5
+	darling@0.20.8
+	darling_core@0.20.8
+	darling_macro@0.20.8
+	dashmap@5.5.3
+	dashmap@6.1.0
+	diff@0.1.13
+	difflib@0.4.0
+	digest@0.10.7
+	dir-test-macros@0.4.1
+	dir-test@0.4.1
+	dirs-sys@0.3.7
+	dirs-sys@0.4.1
+	dirs@4.0.0
+	dirs@5.0.1
+	displaydoc@0.2.5
+	doc-comment@0.3.3
+	drop_bomb@0.1.5
+	dunce@1.0.5
+	dyn-clone@1.0.17
+	either@1.11.0
+	encode_unicode@0.3.6
+	env_filter@0.1.0
+	env_logger@0.11.6
+	equivalent@1.0.1
+	errno@0.3.8
+	etcetera@0.8.0
+	fastrand@2.1.1
+	fern@0.7.1
+	filetime@0.2.25
+	flate2@1.0.28
+	fnv@1.0.7
+	form_urlencoded@1.2.1
+	fs-err@2.11.0
+	fsevent-sys@4.1.0
+	generic-array@0.14.7
+	getopts@0.2.21
+	getrandom@0.2.14
+	glob@0.3.2
+	globset@0.4.15
+	globwalk@0.9.1
+	half@2.4.1
+	hashbrown@0.14.5
+	hashbrown@0.15.2
+	hashlink@0.9.1
+	heck@0.5.0
+	hermit-abi@0.3.9
+	home@0.5.9
+	humantime@2.1.0
+	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
+	ident_case@1.0.1
+	idna@1.0.3
+	idna_adapter@1.2.0
+	ignore@0.4.23
+	imara-diff@0.1.7
+	imperative@1.0.6
+	indexmap@2.7.0
+	indicatif@0.17.9
+	indoc@2.0.5
+	inotify-sys@0.1.5
+	inotify@0.10.2
+	insta-cmd@0.6.0
+	insta@1.41.1
+	instant@0.1.12
+	is-docker@0.2.0
+	is-macro@0.3.7
+	is-terminal@0.4.12
+	is-wsl@0.4.0
+	itertools@0.10.5
+	itertools@0.13.0
+	itoa@1.0.11
+	jobserver@0.1.32
+	jod-thread@0.1.2
+	js-sys@0.3.74
+	kqueue-sys@1.0.4
+	kqueue@1.0.8
+	lazy_static@1.4.0
+	libc@0.2.169
+	libcst@1.5.1
+	libcst_derive@1.4.0
+	libmimalloc-sys@0.1.39
+	libredox@0.1.3
+	linked-hash-map@0.5.6
+	linux-raw-sys@0.4.14
+	litemap@0.7.3
+	lock_api@0.4.11
+	log@0.4.22
+	lsp-server@0.7.8
+	matchers@0.1.0
+	matches@0.1.10
+	matchit@0.8.5
+	memchr@2.7.4
+	mimalloc@0.1.43
+	minicov@0.3.5
+	minimal-lexical@0.2.1
+	miniz_oxide@0.7.2
+	mio@1.0.2
+	natord@1.0.9
+	newtype-uuid@1.1.3
+	nix@0.28.0
+	nix@0.29.0
+	nom@7.1.3
+	notify-types@1.0.0
+	notify@7.0.0
+	nu-ansi-term@0.46.0
+	nu-ansi-term@0.50.1
+	num-traits@0.2.18
+	number_prefix@0.4.0
+	once_cell@1.20.2
+	oorandom@11.1.3
+	option-ext@0.2.0
+	ordermap@0.5.4
+	os_str_bytes@7.0.0
+	overload@0.1.1
+	parking_lot@0.12.3
+	parking_lot_core@0.9.9
+	paste@1.0.15
+	path-absolutize@3.1.1
+	path-dedot@3.1.1
+	path-slash@0.2.1
+	pathdiff@0.2.3
+	peg-macros@0.8.4
+	peg-runtime@0.8.3
+	peg@0.8.4
+	pep440_rs@0.7.3
+	pep508_rs@0.9.1
+	percent-encoding@2.3.1
+	pest@2.7.11
+	pest_derive@2.7.11
+	pest_generator@2.7.11
+	pest_meta@2.7.11
+	phf@0.11.2
+	phf_codegen@0.11.2
+	phf_generator@0.11.2
+	phf_shared@0.11.2
+	pin-project-lite@0.2.14
+	pkg-config@0.3.30
+	portable-atomic@1.6.0
+	ppv-lite86@0.2.17
+	predicates-core@1.0.8
+	predicates-tree@1.0.11
+	predicates@3.1.2
+	pretty_assertions@1.4.1
+	proc-macro2@1.0.92
+	pyproject-toml@0.13.4
+	quick-junit@0.5.1
+	quick-xml@0.37.1
+	quickcheck@1.0.3
+	quickcheck_macros@1.0.0
+	quote@1.0.38
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rayon-core@1.12.1
+	rayon@1.10.0
+	redox_syscall@0.4.1
+	redox_syscall@0.5.3
+	redox_users@0.4.5
+	regex-automata@0.1.10
+	regex-automata@0.4.8
+	regex-syntax@0.6.29
+	regex-syntax@0.8.5
+	regex@1.11.1
+	ring@0.17.8
+	ron@0.7.1
+	rust-stemmers@1.2.0
+	rustc-hash@1.1.0
+	rustc-hash@2.1.0
+	rustix@0.38.40
+	rustls-pki-types@1.10.0
+	rustls-webpki@0.102.8
+	rustls@0.23.19
+	rustversion@1.0.15
+	ryu@1.0.17
+	same-file@1.0.6
+	schemars@0.8.21
+	schemars_derive@0.8.21
+	scoped-tls@1.0.1
+	scopeguard@1.2.0
+	seahash@4.1.0
+	serde-wasm-bindgen@0.6.5
+	serde@1.0.217
+	serde_derive@1.0.217
+	serde_derive_internals@0.29.0
+	serde_json@1.0.134
+	serde_repr@0.1.19
+	serde_spanned@0.6.7
+	serde_test@1.0.177
+	serde_with@3.12.0
+	serde_with_macros@3.12.0
+	sha2@0.10.8
+	sharded-slab@0.1.7
+	shellexpand@3.1.0
+	shlex@1.3.0
+	similar@2.6.0
+	siphasher@0.3.11
+	smallvec@1.13.2
+	spin@0.9.8
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	strip-ansi-escapes@0.2.0
+	strsim@0.10.0
+	strsim@0.11.1
+	strum@0.26.3
+	strum_macros@0.26.4
+	subtle@2.5.0
+	syn@1.0.109
+	syn@2.0.93
+	synstructure@0.13.1
+	tempfile@3.14.0
+	terminal_size@0.4.0
+	terminfo@0.8.0
+	termtree@0.4.1
+	test-case-core@3.3.1
+	test-case-macros@3.3.1
+	test-case@3.3.1
+	thiserror-impl@1.0.67
+	thiserror-impl@2.0.9
+	thiserror@1.0.67
+	thiserror@2.0.9
+	thread_local@1.1.8
+	tikv-jemalloc-sys@0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7
+	tikv-jemallocator@0.6.0
+	tinystr@0.7.6
+	tinytemplate@1.2.1
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	toml@0.8.19
+	toml_datetime@0.6.8
+	toml_edit@0.22.20
+	tracing-attributes@0.1.28
+	tracing-core@0.1.33
+	tracing-flame@0.2.0
+	tracing-indicatif@0.3.8
+	tracing-log@0.2.0
+	tracing-subscriber@0.3.19
+	tracing-tree@0.4.0
+	tracing@0.1.41
+	typed-arena@2.0.2
+	typenum@1.17.0
+	ucd-trie@0.1.6
+	unic-char-property@0.9.0
+	unic-char-range@0.9.0
+	unic-common@0.9.0
+	unic-ucd-category@0.9.0
+	unic-ucd-version@0.9.0
+	unicode-ident@1.0.14
+	unicode-normalization@0.1.24
+	unicode-width@0.1.13
+	unicode-width@0.2.0
+	unicode_names2@1.3.0
+	unicode_names2_generator@1.3.0
+	unscanny@0.1.0
+	untrusted@0.9.0
+	ureq@2.12.1
+	url@2.5.4
+	urlencoding@2.1.3
+	utf16_iter@1.0.5
+	utf8_iter@1.0.4
+	utf8parse@0.2.1
+	uuid-macro-internal@1.11.0
+	uuid@1.11.0
+	valuable@0.1.0
+	version-ranges@0.1.1
+	version_check@0.9.4
+	vt100@0.15.2
+	vte@0.11.1
+	vte_generate_state_changes@0.1.1
+	walkdir@2.5.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.97
+	wasm-bindgen-futures@0.4.47
+	wasm-bindgen-macro-support@0.2.97
+	wasm-bindgen-macro@0.2.97
+	wasm-bindgen-shared@0.2.97
+	wasm-bindgen-test-macro@0.3.47
+	wasm-bindgen-test@0.3.47
+	wasm-bindgen@0.2.97
+	web-sys@0.3.74
+	web-time@1.1.0
+	webpki-roots@0.26.1
+	which@6.0.1
+	wild@2.2.1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.8
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-core@0.52.0
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-sys@0.59.0
+	windows-targets@0.48.5
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.6
+	winnow@0.6.18
+	winsafe@0.0.19
+	write16@1.0.0
+	writeable@0.5.5
+	yansi-term@0.1.2
+	yansi@1.0.1
+	yoke-derive@0.7.4
+	yoke@0.7.4
+	zerocopy-derive@0.7.32
+	zerocopy@0.7.32
+	zerofrom-derive@0.1.4
+	zerofrom@0.1.4
+	zeroize@1.7.0
+	zerovec-derive@0.10.3
+	zerovec@0.10.4
+	zip@0.6.6
+	zstd-safe@5.0.2+zstd.1.5.2
+	zstd-sys@2.0.11+zstd.1.5.6
+	zstd@0.11.2+zstd.1.5.2
+"
+
+declare -A GIT_CRATES=(
+	[lsp-types]='https://github.com/astral-sh/lsp-types;3512a9f33eadc5402cfab1b8f7340824c8ca1439;lsp-types-%commit%'
+	[salsa-macro-rules]='https://github.com/salsa-rs/salsa;88a1d7774d78f048fbd77d40abca9ebd729fd1f0;salsa-%commit%/components/salsa-macro-rules'
+	[salsa-macros]='https://github.com/salsa-rs/salsa;88a1d7774d78f048fbd77d40abca9ebd729fd1f0;salsa-%commit%/components/salsa-macros'
+	[salsa]='https://github.com/salsa-rs/salsa;88a1d7774d78f048fbd77d40abca9ebd729fd1f0;salsa-%commit%'
+)
+
+RUST_MIN_VER="1.80.0"
+
+inherit shell-completion cargo
+
+DESCRIPTION="An extremely fast Python linter, written in Rust"
+HOMEPAGE="
+	https://docs.astral.sh/ruff/
+	https://github.com/astral-sh/ruff
+"
+SRC_URI="
+	${CARGO_CRATE_URIS}
+	https://github.com/astral-sh/ruff/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD CC0-1.0 ISC MIT MPL-2.0 PSF-2 Unicode-3.0
+	Unicode-DFS-2016 WTFPL-2
+"
+# libcst_derive
+LICENSE+="
+	MIT PSF-2 Apache-2.0
+"
+# ring
+LICENSE+="
+	ISC SSLeay openssl MIT
+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+
+RDEPEND="
+	!elibc_musl? ( !elibc_Darwin? ( !elibc_bionic? ( dev-libs/jemalloc:= ) ) )
+	app-arch/zstd
+"
+DEPEND="
+	${RDEPEND}
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+DOCS=(
+	BREAKING_CHANGES.md
+	CODE_OF_CONDUCT.md
+	CONTRIBUTING.md
+	README.md
+	assets
+	docs
+)
+
+src_prepare() {
+	default
+
+	# Experimental cruft cleaner. These crates are not used by the ruff binary,
+	# and when they are removed in the git repo, the lockfile is regenerated
+	# and gets quite a bit smaller. Hence pycargoebuild also produces much
+	# smaller CRATES= variables. Less for the user to download, fewer distfiles
+	# to mirror.
+	pushd crates >/dev/null || die
+	rm -r ruff_{benchmark,dev} red_knot{,_server,_workspace} *_wasm || die
+	popd > /dev/null || die
+}
+
+src_configure() {
+	export RUSTFLAGS="${RUSTFLAGS}"
+	cargo_src_configure
+}
+
+src_compile() {
+	local -x ZSTD_SYS_USE_PKG_CONFIG=1
+	# Gentoo bug #927338
+	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
+		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
+		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
+	fi
+	cargo_src_compile --bin ruff
+
+	local releasedir
+	releasedir=$(cargo_target_dir)
+
+	${releasedir}/ruff generate-shell-completion bash > ruff-completion.bash || die
+	${releasedir}/ruff generate-shell-completion zsh > ruff-completion.zsh || die
+}
+
+src_test() {
+	local -x ZSTD_SYS_USE_PKG_CONFIG=1
+	# Gentoo bug #927338
+	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
+		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
+		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
+	fi
+	cargo_src_test --target-dir "${PWD}"/tested-target/
+}
+
+src_install() {
+	local releasedir=$(cargo_target_dir)
+
+	dobin ${releasedir}/ruff
+
+	newbashcomp ruff-completion.bash ruff
+	newzshcomp ruff-completion.zsh _ruff
+
+	dodoc -r "${DOCS[@]}"
+}
diff --git a/dev-util/ruff/ruff-0.9.1.ebuild b/dev-util/ruff/ruff-0.9.1.ebuild
new file mode 100644
index 000000000000..717a755af114
--- /dev/null
+++ b/dev-util/ruff/ruff-0.9.1.ebuild
@@ -0,0 +1,531 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.4
+
+EAPI=8
+
+CRATES="
+	adler@1.0.2
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anes@0.1.6
+	annotate-snippets@0.6.1
+	annotate-snippets@0.9.2
+	anstream@0.6.13
+	anstyle-parse@0.2.3
+	anstyle-query@1.0.2
+	anstyle-wincon@3.0.2
+	anstyle@1.0.8
+	anyhow@1.0.95
+	append-only-vec@0.1.5
+	arc-swap@1.7.1
+	argfile@0.2.1
+	arrayvec@0.7.4
+	assert_fs@1.1.2
+	autocfg@1.2.0
+	base64@0.13.1
+	base64@0.22.0
+	bincode@1.3.3
+	bitflags@1.3.2
+	bitflags@2.6.0
+	block-buffer@0.10.4
+	boxcar@0.2.7
+	bstr@1.11.3
+	bumpalo@3.16.0
+	byteorder@1.5.0
+	cachedir@0.3.1
+	camino@1.1.9
+	cast@0.3.0
+	castaway@0.2.3
+	cc@1.2.2
+	cfg-if@1.0.0
+	cfg_aliases@0.2.1
+	chic@1.2.2
+	chrono@0.4.39
+	ciborium-io@0.2.2
+	ciborium-ll@0.2.2
+	ciborium@0.2.2
+	clap@4.5.23
+	clap_builder@4.5.23
+	clap_complete@4.5.2
+	clap_complete_command@0.6.1
+	clap_complete_nushell@4.5.2
+	clap_derive@4.5.18
+	clap_lex@0.7.4
+	clearscreen@4.0.1
+	codspeed-criterion-compat@2.7.2
+	codspeed@2.7.2
+	colorchoice@1.0.0
+	colored@2.2.0
+	compact_str@0.8.1
+	console@0.15.8
+	console_error_panic_hook@0.1.7
+	console_log@1.0.0
+	core-foundation-sys@0.8.6
+	countme@3.0.1
+	cpufeatures@0.2.13
+	crc32fast@1.4.0
+	criterion-plot@0.5.0
+	criterion@0.5.1
+	crossbeam-channel@0.5.12
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-queue@0.3.11
+	crossbeam-utils@0.8.19
+	crossbeam@0.8.4
+	crunchy@0.2.2
+	crypto-common@0.1.6
+	ctrlc@3.4.5
+	darling@0.20.8
+	darling_core@0.20.8
+	darling_macro@0.20.8
+	dashmap@5.5.3
+	dashmap@6.1.0
+	diff@0.1.13
+	difflib@0.4.0
+	digest@0.10.7
+	dir-test-macros@0.4.1
+	dir-test@0.4.1
+	dirs-sys@0.4.1
+	dirs@5.0.1
+	displaydoc@0.2.5
+	doc-comment@0.3.3
+	drop_bomb@0.1.5
+	dunce@1.0.5
+	dyn-clone@1.0.17
+	either@1.11.0
+	encode_unicode@0.3.6
+	env_filter@0.1.0
+	env_home@0.1.0
+	env_logger@0.11.6
+	equivalent@1.0.1
+	errno@0.3.8
+	etcetera@0.8.0
+	fastrand@2.1.1
+	fern@0.7.1
+	filetime@0.2.25
+	flate2@1.0.28
+	fnv@1.0.7
+	form_urlencoded@1.2.1
+	fs-err@2.11.0
+	fsevent-sys@4.1.0
+	generic-array@0.14.7
+	getopts@0.2.21
+	getrandom@0.2.14
+	glob@0.3.2
+	globset@0.4.15
+	globwalk@0.9.1
+	half@2.4.1
+	hashbrown@0.14.5
+	hashbrown@0.15.2
+	hashlink@0.9.1
+	heck@0.5.0
+	hermit-abi@0.3.9
+	home@0.5.9
+	humantime@2.1.0
+	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
+	ident_case@1.0.1
+	idna@1.0.3
+	idna_adapter@1.2.0
+	ignore@0.4.23
+	imara-diff@0.1.7
+	imperative@1.0.6
+	indexmap@2.7.0
+	indicatif@0.17.9
+	indoc@2.0.5
+	inotify-sys@0.1.5
+	inotify@0.10.2
+	insta-cmd@0.6.0
+	insta@1.42.0
+	instant@0.1.12
+	is-docker@0.2.0
+	is-macro@0.3.7
+	is-terminal@0.4.12
+	is-wsl@0.4.0
+	itertools@0.10.5
+	itertools@0.13.0
+	itertools@0.14.0
+	itoa@1.0.11
+	jobserver@0.1.32
+	jod-thread@0.1.2
+	js-sys@0.3.74
+	kqueue-sys@1.0.4
+	kqueue@1.0.8
+	lazy_static@1.4.0
+	libc@0.2.169
+	libcst@1.5.1
+	libcst_derive@1.4.0
+	libmimalloc-sys@0.1.39
+	libredox@0.1.3
+	linked-hash-map@0.5.6
+	linux-raw-sys@0.4.14
+	litemap@0.7.3
+	lock_api@0.4.11
+	log@0.4.22
+	lsp-server@0.7.8
+	matchers@0.1.0
+	matches@0.1.10
+	matchit@0.8.6
+	memchr@2.7.4
+	mimalloc@0.1.43
+	minicov@0.3.5
+	minimal-lexical@0.2.1
+	miniz_oxide@0.7.2
+	mio@1.0.2
+	natord@1.0.9
+	newtype-uuid@1.1.3
+	nix@0.29.0
+	nom@7.1.3
+	notify-types@1.0.0
+	notify@7.0.0
+	nu-ansi-term@0.46.0
+	nu-ansi-term@0.50.1
+	num-traits@0.2.18
+	number_prefix@0.4.0
+	once_cell@1.20.2
+	oorandom@11.1.3
+	option-ext@0.2.0
+	ordermap@0.5.4
+	os_str_bytes@7.0.0
+	overload@0.1.1
+	parking_lot@0.12.3
+	parking_lot_core@0.9.9
+	paste@1.0.15
+	path-absolutize@3.1.1
+	path-dedot@3.1.1
+	path-slash@0.2.1
+	pathdiff@0.2.3
+	peg-macros@0.8.4
+	peg-runtime@0.8.3
+	peg@0.8.4
+	pep440_rs@0.7.3
+	pep508_rs@0.9.1
+	percent-encoding@2.3.1
+	pest@2.7.11
+	pest_derive@2.7.11
+	pest_generator@2.7.11
+	pest_meta@2.7.11
+	phf@0.11.2
+	phf_codegen@0.11.2
+	phf_generator@0.11.2
+	phf_shared@0.11.2
+	pin-project-lite@0.2.14
+	pkg-config@0.3.30
+	portable-atomic@1.6.0
+	ppv-lite86@0.2.17
+	predicates-core@1.0.8
+	predicates-tree@1.0.11
+	predicates@3.1.2
+	pretty_assertions@1.4.1
+	proc-macro2@1.0.92
+	pyproject-toml@0.13.4
+	quick-junit@0.5.1
+	quick-xml@0.37.1
+	quickcheck@1.0.3
+	quickcheck_macros@1.0.0
+	quote@1.0.38
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rayon-core@1.12.1
+	rayon@1.10.0
+	redox_syscall@0.4.1
+	redox_syscall@0.5.3
+	redox_users@0.4.5
+	regex-automata@0.1.10
+	regex-automata@0.4.8
+	regex-syntax@0.6.29
+	regex-syntax@0.8.5
+	regex@1.11.1
+	ring@0.17.8
+	ron@0.7.1
+	rust-stemmers@1.2.0
+	rustc-hash@1.1.0
+	rustc-hash@2.1.0
+	rustix@0.38.40
+	rustls-pki-types@1.10.0
+	rustls-webpki@0.102.8
+	rustls@0.23.19
+	rustversion@1.0.15
+	ryu@1.0.17
+	same-file@1.0.6
+	schemars@0.8.21
+	schemars_derive@0.8.21
+	scoped-tls@1.0.1
+	scopeguard@1.2.0
+	seahash@4.1.0
+	serde-wasm-bindgen@0.6.5
+	serde@1.0.217
+	serde_derive@1.0.217
+	serde_derive_internals@0.29.0
+	serde_json@1.0.134
+	serde_repr@0.1.19
+	serde_spanned@0.6.7
+	serde_test@1.0.177
+	serde_with@3.12.0
+	serde_with_macros@3.12.0
+	sha2@0.10.8
+	sharded-slab@0.1.7
+	shellexpand@3.1.0
+	shlex@1.3.0
+	similar@2.6.0
+	siphasher@0.3.11
+	smallvec@1.13.2
+	spin@0.9.8
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	strip-ansi-escapes@0.2.0
+	strsim@0.10.0
+	strsim@0.11.1
+	strum@0.26.3
+	strum_macros@0.26.4
+	subtle@2.5.0
+	syn@1.0.109
+	syn@2.0.95
+	synstructure@0.13.1
+	tempfile@3.14.0
+	terminal_size@0.4.0
+	terminfo@0.9.0
+	termtree@0.4.1
+	test-case-core@3.3.1
+	test-case-macros@3.3.1
+	test-case@3.3.1
+	thiserror-impl@1.0.67
+	thiserror-impl@2.0.9
+	thiserror@1.0.67
+	thiserror@2.0.9
+	thread_local@1.1.8
+	tikv-jemalloc-sys@0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7
+	tikv-jemallocator@0.6.0
+	tinystr@0.7.6
+	tinytemplate@1.2.1
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	toml@0.8.19
+	toml_datetime@0.6.8
+	toml_edit@0.22.20
+	tracing-attributes@0.1.28
+	tracing-core@0.1.33
+	tracing-flame@0.2.0
+	tracing-indicatif@0.3.8
+	tracing-log@0.2.0
+	tracing-subscriber@0.3.19
+	tracing-tree@0.4.0
+	tracing@0.1.41
+	typed-arena@2.0.2
+	typenum@1.17.0
+	ucd-trie@0.1.6
+	unic-char-property@0.9.0
+	unic-char-range@0.9.0
+	unic-common@0.9.0
+	unic-ucd-category@0.9.0
+	unic-ucd-version@0.9.0
+	unicode-ident@1.0.14
+	unicode-normalization@0.1.24
+	unicode-width@0.1.13
+	unicode-width@0.2.0
+	unicode_names2@1.3.0
+	unicode_names2_generator@1.3.0
+	unscanny@0.1.0
+	untrusted@0.9.0
+	ureq@2.12.1
+	url@2.5.4
+	urlencoding@2.1.3
+	utf16_iter@1.0.5
+	utf8_iter@1.0.4
+	utf8parse@0.2.1
+	uuid-macro-internal@1.11.0
+	uuid@1.11.0
+	valuable@0.1.0
+	version-ranges@0.1.1
+	version_check@0.9.4
+	vt100@0.15.2
+	vte@0.11.1
+	vte_generate_state_changes@0.1.1
+	walkdir@2.5.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.97
+	wasm-bindgen-futures@0.4.47
+	wasm-bindgen-macro-support@0.2.97
+	wasm-bindgen-macro@0.2.97
+	wasm-bindgen-shared@0.2.97
+	wasm-bindgen-test-macro@0.3.47
+	wasm-bindgen-test@0.3.47
+	wasm-bindgen@0.2.97
+	web-sys@0.3.74
+	web-time@1.1.0
+	webpki-roots@0.26.1
+	which@7.0.1
+	wild@2.2.1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.8
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-core@0.52.0
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-sys@0.59.0
+	windows-targets@0.48.5
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.6
+	winnow@0.6.18
+	winsafe@0.0.19
+	write16@1.0.0
+	writeable@0.5.5
+	yansi-term@0.1.2
+	yansi@1.0.1
+	yoke-derive@0.7.4
+	yoke@0.7.4
+	zerocopy-derive@0.7.32
+	zerocopy@0.7.32
+	zerofrom-derive@0.1.4
+	zerofrom@0.1.4
+	zeroize@1.7.0
+	zerovec-derive@0.10.3
+	zerovec@0.10.4
+	zip@0.6.6
+	zstd-safe@5.0.2+zstd.1.5.2
+	zstd-sys@2.0.11+zstd.1.5.6
+	zstd@0.11.2+zstd.1.5.2
+"
+
+declare -A GIT_CRATES=(
+	[lsp-types]='https://github.com/astral-sh/lsp-types;3512a9f33eadc5402cfab1b8f7340824c8ca1439;lsp-types-%commit%'
+	[salsa-macro-rules]='https://github.com/salsa-rs/salsa;88a1d7774d78f048fbd77d40abca9ebd729fd1f0;salsa-%commit%/components/salsa-macro-rules'
+	[salsa-macros]='https://github.com/salsa-rs/salsa;88a1d7774d78f048fbd77d40abca9ebd729fd1f0;salsa-%commit%/components/salsa-macros'
+	[salsa]='https://github.com/salsa-rs/salsa;88a1d7774d78f048fbd77d40abca9ebd729fd1f0;salsa-%commit%'
+)
+
+RUST_MIN_VER="1.80.0"
+
+inherit shell-completion cargo
+
+DESCRIPTION="An extremely fast Python linter, written in Rust"
+HOMEPAGE="
+	https://docs.astral.sh/ruff/
+	https://github.com/astral-sh/ruff
+"
+SRC_URI="
+	${CARGO_CRATE_URIS}
+	https://github.com/astral-sh/ruff/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD CC0-1.0 ISC MIT MPL-2.0 PSF-2 Unicode-3.0
+	Unicode-DFS-2016 WTFPL-2
+"
+# libcst_derive
+LICENSE+="
+	MIT PSF-2 Apache-2.0
+"
+# ring
+LICENSE+="
+	ISC SSLeay openssl MIT
+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+
+RDEPEND="
+	!elibc_musl? ( !elibc_Darwin? ( !elibc_bionic? ( dev-libs/jemalloc:= ) ) )
+	app-arch/zstd
+"
+DEPEND="
+	${RDEPEND}
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+DOCS=(
+	BREAKING_CHANGES.md
+	CODE_OF_CONDUCT.md
+	CONTRIBUTING.md
+	README.md
+	assets
+	docs
+)
+
+src_prepare() {
+	default
+
+	# Experimental cruft cleaner. These crates are not used by the ruff binary,
+	# and when they are removed in the git repo, the lockfile is regenerated
+	# and gets quite a bit smaller. Hence pycargoebuild also produces much
+	# smaller CRATES= variables. Less for the user to download, fewer distfiles
+	# to mirror.
+	pushd crates >/dev/null || die
+	rm -r ruff_{benchmark,dev} red_knot{,_server,_workspace} *_wasm || die
+	popd > /dev/null || die
+}
+
+src_configure() {
+	export RUSTFLAGS="${RUSTFLAGS}"
+	cargo_src_configure
+}
+
+src_compile() {
+	local -x ZSTD_SYS_USE_PKG_CONFIG=1
+	# Gentoo bug #927338
+	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
+		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
+		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
+	fi
+	cargo_src_compile --bin ruff
+
+	local releasedir
+	releasedir=$(cargo_target_dir)
+
+	${releasedir}/ruff generate-shell-completion bash > ruff-completion.bash || die
+	${releasedir}/ruff generate-shell-completion zsh > ruff-completion.zsh || die
+}
+
+src_test() {
+	local -x ZSTD_SYS_USE_PKG_CONFIG=1
+	# Gentoo bug #927338
+	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
+		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
+		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
+	fi
+	cargo_src_test --target-dir "${PWD}"/tested-target/
+}
+
+src_install() {
+	local releasedir=$(cargo_target_dir)
+
+	dobin ${releasedir}/ruff
+
+	newbashcomp ruff-completion.bash ruff
+	newzshcomp ruff-completion.zsh _ruff
+
+	dodoc -r "${DOCS[@]}"
+}
diff --git a/dev-util/sccache/Manifest b/dev-util/sccache/Manifest
index 36fa11e8d864..ea8f72706567 100644
--- a/dev-util/sccache/Manifest
+++ b/dev-util/sccache/Manifest
@@ -11,17 +11,14 @@ DIST anstyle-query-1.0.0.crate 8620 BLAKE2B 2d296b5066fd6284a2410923215571e6df65
 DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931
 DIST anyhow-1.0.86.crate 46741 BLAKE2B 21b1f3acd1c1b659e6e9a53693178de67c806d7dbad30dedea0fb7078b2388baa196d1e7240a7dc88ed9dc93ee4c00bca8e608dad1b6bfb5bfa4f4c5ab51f0d3 SHA512 3853da32a2c53d73969bb29a1e622f3a6d5832d8888dc6bc8eedb76394b392f983aa3fcb1f542933e238841486106f0f38e9a2400c12c7699baba0ebe1d8193a
 DIST ar-0.9.0.crate 14636 BLAKE2B 969106d12ea0aceeced14f42a6b71dbd10f4216c2111d4ea2d1c2c4d136741ac27ab8b0c59cf8304a33c0e2788321f5ba23b6b053eaf6f6142538714133a4b8c SHA512 437ba014dd01cfb69837a12db2104119ac1c76ffe89436421aa4f671dc109a1f4f39271a12d08979dddeca89ffe8bd967efbd31592f8f3421a0391208a6ea781
-DIST arc-swap-1.6.0.crate 67342 BLAKE2B 6afd6570c3cef4ae722d4168c3320be1343c4f6043892e5e5b52879b8210a896e083d720797b41a41db04a08eefdcfbacbfdee1a7f2180e9755c868d6fded872 SHA512 5e09cef9fa12d1204db24f3397158a3f45d12dd0fa61eadd691bba120a43fdaa916ab09997e7a63d61a3fb7dada4e3266181f4ef413850c4bc5e59d2c6c5b9df
 DIST arc-swap-1.7.1.crate 68512 BLAKE2B 5ddeffd2ae8af4125a5b43d4a0a1afc7948533bf037d8cd3e47603c13b57b156618280d99b840bf318b25b6eb29400ad68499695e182acdc05bc5f621c42ee16 SHA512 070fa8dd17b380b6d7d72f6f45c84e591de9a9770b9662351e7a41af03798bf5e34d185a5fcb948f4d8ac5e210a33acd465c39eff6097662c2442b34ee3dbdff
 DIST arrayref-0.3.7.crate 9620 BLAKE2B 69d25ca9c15c188ca954a862f320869a448a5d8ed5765a6fc26309abb030e1d846d12800d960c8a97aa3ab422e8d2b883bd154781ed219a858e02b20cc803613 SHA512 dcf1c7de6d1d4b921e26a39cd70070bd460cd27f0a38be9099e41fc8b05fb60ba4f9aa91f92401cdcd0847bad08bffa7db4dca8d7cc84a3c8a1416d1758838ce
 DIST arrayvec-0.7.4.crate 29856 BLAKE2B 81ffac1db340e919618351819def3880ab1ef70d0acc47d680f15298eb749bcbc3bf7944ba14159be46b1e734c91b4c0f8cbaf774fd864c17caa3c9fb1fc2e9b SHA512 91e8f70330c515c966d78ae235e890594f9607381ac738a2c3586b53f01411e98d1687494f39ccc365948ae60497df3dfb2be18e26ab7e69bc0966b6c250e1ac
 DIST ascii-1.1.0.crate 36075 BLAKE2B 7e68e7b3d5e6aef132c52db8c078fdf2e70462d9238b637015d7964312737fc09b35719143ce1fbd3e5b8072c21717f33e5061adf4da1913a9b9f11ac9c453ec SHA512 d74982ad87796f0d745bfd654450dc74174fdc6aa2a0047e5d250f76dd6079189dc0f05d02a73a85b1d3a86c163524d1f43f5d014de0153cd69fad4de26cf0ec
 DIST assert_cmd-2.0.13.crate 23917 BLAKE2B 72fbb8afc12429a96c89b07dce8b2a969a1c2656aedf19ac9cd2bd1e5d5f29b3c558616858ad01a86807b787c88efc556ad432a55b59b0df5b4bdbeb9b6ab05e SHA512 3599483d28f1893945b63d693f38d656724f382ac7a0c2cb0773d72e6bba3dcc9137cca51575fca984c2435b081cd6ad68ed5d1fa04e606484926528cc41a305
-DIST async-trait-0.1.80.crate 28775 BLAKE2B d95384a8828c9273e0f295d3c3826b3a8716cd0c4ab39bdb43d65ec57fe886f7c5926c1666a76ca25b1536eedef61b0d92c78ff9c8a52a0515900360b66b0f13 SHA512 3e92bc8d38feea49ebb5011303e55853bbbf5d0fb7c4f6ed6aa471b9000a2a0ea5475619f98831641e8ee484beaa6fd8880770a96b8a5a7df26e392c1b4b3a19
 DIST async-trait-0.1.83.crate 29054 BLAKE2B 4991f79abd8b9260b9541e754c30d3e0731ff786fcf65cc3f3eb75a5fcedcb37be147222778e1a0fa6c68d8fb872144b2b55b43cf6f8f4de371f24175cef405d SHA512 15969eafbdbe51e80433b53196962293daed2a70d3d9bac91c58e5e7359f60fc99ef519ceb1fd54e34d627c94f821329474a602f25f85179318d10c3147b5649
 DIST atomic-waker-1.1.2.crate 12422 BLAKE2B fc6632f3c9d719b1d24a1c8e05947d94028909d1c629b80576e176e567636dd4cca699c7e91cae2df63541da574146b3ce766374e93f0ee429bb5bc89a4d3cae SHA512 e07e58db7955791259d0ec00fc4d53318aefb4506e062914819c4220c6dc75fa11a7af0289b4653aa1f9041eb975a025635190de68b4800a0e91e33cdb0ba11c
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST backon-0.4.4.crate 25265 BLAKE2B 6fa1de26ae6c681c499a4133ed8378d2c60e119573e37a9a607c009efa0550e7eebc2c51824f9dba11b04dbbc4f14d5892a90d994b65242b5b32aaf1738719f1 SHA512 7598b40d8864e5c6667a94a8c0d3ce0c7705481dbe2793aa2d6d5bb2b2f97d394110e04cca2bab4d1071ecf74e6675478782ab280d5b943b05504c32202f7644
 DIST backon-1.2.0.crate 15241 BLAKE2B 953678096eb6164b780aed818ee15a8fbe1122471ee22adec92c02094ec45ca5a23908c62aa205192c4308ec5217ee12addd9d4e7ef479d38095ada8f282aa3e SHA512 3f5293fc1cd01c8f6bae97809161e243db29dcd9d9dac70029f467c09f25ce558b4c051f3a85a59fa6e2fd4cbb40921669cf5ea7ad0ef910fa868984c67b0035
 DIST backtrace-0.3.69.crate 77299 BLAKE2B 594358f1d9171fc369f50cacffab03b8a10a8fe3da5b915611cb74b0dbad0e048c7dc79c53569d89827db583e0f61fb7269147b6258781a1599a811e642414a8 SHA512 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244
 DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
@@ -42,6 +39,7 @@ DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc
 DIST bytes-1.6.0.crate 60605 BLAKE2B 3e4cd094443969c6062b51917ad9df314b61ec9ddcb0336cf2621d8966c568d5b1fdbf16b11b5e2fab01b43ea76f6609f753eb5c2380a5e4aa8fb6e807a2ff5d SHA512 6507bc4274204d0a19b6a95c3284c52245c71cbf5f2dfb5cd372193d989e49869ec557c0c4e449e96ed4e3028c90606dfb0dcdc1d72bb234a36bc5f344c0a7a8
 DIST cbc-0.1.2.crate 23501 BLAKE2B c0d537af0323a92cd01a9ec197bbe46507835348e16dcec7360072226647abe2eaa4823023930da93885347fe1429acc2f9c079b7bcac686c1293ef73b91bf0a SHA512 d3b33deff64d839ad25141f1c3b5fbeaa21f71aee7b58dbed91e7d257f93e68073c8d4a63d4c4eb9775c20f00bb0ceeee714a8218e85a231f30cd7423022f820
 DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7
+DIST cc-1.1.10.crate 82159 BLAKE2B 81168fd673e065a3ecc5b3aea8b288c5353bdf5ff82e9dc1c0970225ab7f51dc2be00bc977690934af1df094f89c7e57e35702950849a9a2a07b1876ef950cec SHA512 8c72753166fdb0d9d4b326938c5423d996dac82b5af65c8fb16734bb3ddbbc31a9254a18f1ef5f06a770261ab947d06757acbc60af9486496d3562dab30b3733
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cfg_aliases-0.1.1.crate 6009 BLAKE2B 6acfae9a89d3479f7ce1f0b5dbb13bfe27c006b936a96685606a61a06f69d17ab754a8a0d96c54213f758281c2fb32ac74d03a34e0f836dc7e438387955aac37 SHA512 238828445c5b48ca41ff88825af0a1ad30494e423bb6f89b6d5e4d26042afaa1ceb0e32041f7cddd79c3e15c6c82a1ddb9469c4b63a1ac52d4bcc1174900f880
@@ -114,7 +112,6 @@ DIST h2-0.3.26.crate 168315 BLAKE2B 81c65e519bacc8570a28b82808828044d1c94f8cf911
 DIST h2-0.4.5.crate 174166 BLAKE2B 17344c381a45c525dc701236a3e0a0015818f36c6c09507da4c340be35ca1544240a035df789854a6c24e3cfc0e57d08d33a925d4907634d7b82df793102cee1 SHA512 3241dd8dbabb12e09ebd4acc05d9868395b51b4514262d4caa9f7af8b4219a8bffb3589398d3dfd86949783b8b2ac968b9ddc9644ac741da5d516b68402f0eef
 DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356
 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
-DIST hermit-abi-0.3.3.crate 14253 BLAKE2B 9ed8b40a1cc894addcba2a45562d74359ba55156e2c3a547afce139324b1345df2f158f58978ccd7d343fac5e5d2cda86e2e0a9dafc77af36d4cd8aa0a6d4c03 SHA512 eb162d085e8e0db72571aca925fdb6094d1e5d091766dd62d6a116957459bfadc8d51f1acc67f4da3cf6a8802c0ff445f3ad2516c1df8fcdca0b751632e150a1
 DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST hmac-0.12.1.crate 42657 BLAKE2B 5d432a666dbcf9077a98e1f8a4aaa3afc88f3d88553cf7a2356d117c66f38efafe686c148598ad67ae89d64ee3edf56387a6f89b75dd9ab5eee63e13953dcead SHA512 77d4bf51f4633a8c36712ce3178945141df31cd645eafcf4bd130b8ecd7cb498bf1ee6f2d9c8dfbbc9f97ac638919fcc81bd3ee600a1b27c3be3fa87313aa0b8
@@ -163,7 +160,6 @@ DIST memmap2-0.9.4.crate 32752 BLAKE2B 1b21af908061e6fe09484ce5f84d31ed1751301df
 DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1
 DIST mime_guess-2.0.4.crate 26399 BLAKE2B 667f9b8009bac2e1d8b835ae8825afaaa2ea6eddd4cebbf18de8f8fcde9318eacaeeb08066bdd611883bef5f8a53fa2506b57dffff543c3a57316e07b525f7f5 SHA512 acfbbfdc5bd725edde43e4915858b8d016e90a5b483664f0bcd5e8d2b0b3684bf0f6020aea147b5bf429f218a7af8080761cea4c5c04b68fa66fd6a676376908
 DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c
-DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
 DIST mio-1.0.2.crate 102777 BLAKE2B 9b87abd99269c62e48c6be4fa197d2b12527b672c435d5f1f623f986c60ed391597dbde7d5b73a624a4df0eeaf9c9cedcd56cfd7ce4239757d59e67e9892c59f SHA512 77eae1170a318d4a53550dda3462ae070d25656cda51db4cb2dbcb28210802f9b7e279900e6d6eba68314a0c814c90eb4af7acc561f611535cb364f75ad4e317
 DIST multipart-0.18.0.crate 62797 BLAKE2B 438abdd6041c3a52e836b7627bb0a490494b6a0c4ab47d27905480fcdde27e7c18497ef4cae550c14b8c4c34e661176ee640806cc427e3b2e570c38be31d868e SHA512 a34036e1c05c241f130ed30eb7a2d96c2590ea8c0cb7e6cf98c160ca0fc6e0f1227192b45d8166abd7221633c36c57718fdb0ccfa8ff4254d4eeb3abb5210704
 DIST nanorand-0.7.0.crate 18437 BLAKE2B f4aaf18b7cf32b385d97842cee234f0781bc2e55ca5662031204b999293d417e0ab2726eacff084dc6681ea5e46ce01335a1a5cfaa5e8bc6e602aacb1fd25252 SHA512 3ac650451d629852236eeb45dfee808acbea616036025676b47310100982d7e8317df647fe8649e7753dd0f57c501dcb3f7401c3d804af52ff2a2f50ace8cc69
@@ -171,21 +167,17 @@ DIST native-tls-0.2.11.crate 29008 BLAKE2B 594511c364e639e309f32f37ae20ecfc5ddee
 DIST nix-0.14.1.crate 185227 BLAKE2B ecd12ae7580879c960cd828a22109e5a7f209a24c4208bc04d4392f36726886b66b147dbd3a1f3705edd35e53187553c125dfd47589a326c032aab0a3d3c9ba2 SHA512 c6393f47cdff2134cd51ca3d6becf0309697a11ac9956e3979a2d6cd00a86545d1af4efd63f6d5e417a80b2d9b247a7416b7182156d9966e00c6da25a3bfdcb3
 DIST nix-0.28.0.crate 311086 BLAKE2B a07023566f04896fdb3ef8b2a1ae8dd64adaa5eb48217c58588e1b41733642e03e0637350c0ee83ac47e663c02b24d5668be751f8d199aa773de6df8b2213894 SHA512 73c0c94b360f4fc81ff07a13692b2a5b5ceda3a7203bdf1e526facabd36cdf160f0ae8fa479e31a4e4237c09bde11e9bf821aa496311cac8614f9c5626f8d69a
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
-DIST num-bigint-0.4.4.crate 99369 BLAKE2B 09a44754e3a3d4f949b3714d96ddd7f3915164d611036675e3df421d6c0863e368eb0180978a4ec27fbfff529b4999d2593e411903516670c24c08fbed6a79de SHA512 0dcef3344a933509fdfe87d6adb0bb1bf67af3c692ccaeec5663a8f18ad0a251199ef9c7a24c25b95d1b255b413947e70f0a205669d549b13e54b6f4864ab3b5
 DIST num-bigint-0.4.6.crate 102801 BLAKE2B 0460e7dfdbd44b6c68fc8ead6bff4353e549127158dab8bb5d217ee33104fe9ad5f58b63a01d56fffa8d7c4df1a87dcf5b536e436a0ef98dc4418a4690c4cc15 SHA512 19d14a7755de2b559026547d9e3e1775e636781bdfdd418f2e1d962c51411a0973a46d84d0356e30c0f708a7c7b2097926611960043f71391919cab1aeb6aa04
 DIST num-bigint-dig-0.8.4.crate 123825 BLAKE2B 9710266116ea15d0e56792b7c8e217931765dcf2377bc05f23bd386625087eb6a7d7aca7b8f0beeb78ace9f280895565a6de3b14ffda7721e35c741ff64b71c0 SHA512 88ea682c5aabc61c0cab9234e31a2dccdb5458d3bc018e1f9ccbbf0a9f09ed0053341e93bc53f65b5bee55bafe71d50bbcd48fd085ac723ef4662e15664925b8
 DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100
-DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
 DIST num-integer-0.1.46.crate 22331 BLAKE2B d88c9f84e5d803a3aa8f44dfc1bd6d9b5e336e7cbf47231cb3a7de30dfe263c41c62c586d31f0029459c8c240475cd329b3fce79f355be7643bdccf8d56dcbba SHA512 e27986d91f6c6dc3d5a0900defe28ab5f47905cde3f84d0914b7acee076dca8fec6fdb7b631ac94d3a31eb01ecbc5854e51afc3187cd1abfa21e1bfafdc700ae
 DIST num-iter-0.1.43.crate 10655 BLAKE2B 41ee6d80f38f0767e134835ac84dacee8b50395b29c3e620b74cf4a843cfedfa71dc690e787b291a2b08750cd8386f1dad768e1b506ce088df33cf9e51b90a8e SHA512 97ac20f16d4518c8cbe944e5c80089fa6bb75d4632fb9f3c9d9891aaddb0e0f2209f6e854317f3d3b41bfb330c9d3ed830f3797f0120d4b1863b1d6fa3b9c07b
-DIST num-traits-0.2.17.crate 50190 BLAKE2B a549ef00c749dc7f276c4817477d1f9dab70cba01b6a3afa5743f16f16353bc50d992d7446a54859cf750a410d66c8cd3440708a6b91fd89d3b8889f8fff1668 SHA512 4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e
 DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956
 DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
 DIST num_threads-0.1.6.crate 7334 BLAKE2B 416efdf395b0299b6b01e1508823afdda08cf67ca54e1d644fc5accbb0490945a492a34bc5ba70c3e838e6405d17ddce164ef87468bd9da27097de8994ad9577 SHA512 b2d9897e29e59353379b6372a629fc7f9afc89f777b4410eaeac7b4729527948a8dbecb175f056899f9076693ef855cc0d40e725cc54f28af588fbac5f7ce3b6
 DIST number_prefix-0.4.0.crate 6922 BLAKE2B 81bd3b588c788e6865104e5ce87119b5e0c5a526042963d52cd582ff23c2f8c9f32b4c445ef0397fc402b6d047e031d8e2c67ac97e191bde22e17662eec3a554 SHA512 a43b668d7314218b86ca7451daa9dfef71f6c9f6616bc34c12d94ae6030f182bcca9da83905cb46f3d49d0aa81385a787e92e4f3ae239658067adc249f8174df
 DIST object-0.32.2.crate 286994 BLAKE2B b9085200fe0107ab0f8ddd5c5ac82bc681dc6266c6503e4a803ae4dbdec775ae84ca4a736754b770d858ebb058342af45d485d4c9a41f57966ca1466de40a4c5 SHA512 5d03d998f06dc592c3be141f7163bd72a0e73396f95d22ef1e0ffbfc66489bf727a6f6fb813a32739609b619b8e34a471974b2231dcfa23df8bff52007c25a96
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
-DIST opendal-0.48.0.crate 640667 BLAKE2B 66717687581f9a89a0fc7a8c95ceb8843911b1ce454a4d9cea1b0ad44327bdb10eadfa36f80c148df4258234c235c8b6a3f2be7896a4a23762e4b58b3c3a82b3 SHA512 055756a27a26b2f4a226db8dc05cca6fd1792b6675cf394c157207c59d817224e9fe38108b734684511b08ca0c08dd525a3c34afb558f87ea2845de45f064b6f
 DIST opendal-0.50.1.crate 672504 BLAKE2B 0f4044e7ae8d5e41e57b65024ea0cf1d0365f121462d29c721757f364f3b9059f50e3848e5dba7c285a749601d4f821aaf37c2c1b63453ca53a9448fc77b9152 SHA512 75d8c0e3dc33ccdc5e1dbd5d46b145e687e5733dd0267c847fd5fbdef3ecbc5fa50477b4eef6ed6c213e21963cbd2227d38152e34a06bcc73167c45c3c188b24
 DIST openssl-0.10.64.crate 272306 BLAKE2B a8b618aa403cdb06a7f135cd966775f21c99739365c55aabde2680a6154d03c7d554bfae6c62a069841c70ed82ece6c3f0cd589da8c26022b7022c3c4d79a6d8 SHA512 a1fa9f71cfebbb37ed9d4a902360f2cc95a78f55b5da5d51eef69db38cef016fc03236485158d689ccf054e04937b8cddf88e3f0f31672997fb30c6cac73cbf6
 DIST openssl-macros-0.1.1.crate 5601 BLAKE2B 69dc1c1f3b7bc4f934cae0dce64c3efa501162e5279efd6af3b74f7a7716c04b6996b306b310f1c045cfa2eff2895314a47ecbb020a817e461c6d77d0bc11e92 SHA512 57e75c84f78fb83f884eeaedb0dd135ecb40192dad2facd908e6a575c9b65b38a2c93bca4630e09ea5a82c77d8bc8364cb2f5778cbfe9d8f484cafe3346b883c
@@ -200,9 +192,7 @@ DIST pbkdf2-0.12.2.crate 13906 BLAKE2B 062731ec8623719543e497dbfc23b909c8cc62a52
 DIST pem-3.0.3.crate 13035 BLAKE2B a9a5b7f9860ad9ee7b355e54c7e885126790e5298715234cc8247ceef8b997311bd1f916d113358cdfb22cbaa3fdae2ed4e3ee139bb1eb969185dbf468148c86 SHA512 7bc100eb0494ef2a86fcc4ba67c328d0cd791718f0c4eb67e66ac998d13e5624dfb6a1919862f684052bf61c7169c5065bde23b30640fe56651cf377fa573b30
 DIST pem-rfc7468-0.7.0.crate 24159 BLAKE2B 478d355dd970b9705ebcf44d74d61ae0694db6de16b2018548fda88546f53e35b965ff72d939def399a49fe97d3c8317a10385ace94b3d552797ec64ace1eb8f SHA512 f47d3b6c7c8bf4547916acc2a3d6671f6c1308e74641419c8f1df810d8bd940aba8f94d361e4cbef3eae3b7f11587cd3996a11be3be41d19111abfcde7a9272a
 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
-DIST pin-project-1.1.3.crate 57740 BLAKE2B 5201a01cee2e98caa0d3ed1ff25d4af8c4a74bb0a6f5a4382c3e2d90bfd5a2cc588759867e77553225f5bef547bd6be8bf1f613516748ecb26da9181d4460b85 SHA512 91b5e0a66e620dbad6b189cc45c41dfe2493d5ce09783f1bd556cee0ac1b3b103507c39c77a393c45fb6eb93dc1f1b9efd4ba5e2a9d4507240978f1020f12aaf
 DIST pin-project-1.1.7.crate 55438 BLAKE2B c7cc110f906d29e25325ce1fee00777917d0d07a4b53e65bd6e25d54df96bcd8fbab0ec33a8b994f8e0574ad78fc3c590ce46eab296653af560b629a5b93d51d SHA512 ca3cb06148fe20d64d37f6f115f838da2e8fd0836b8f08b316518f4f5e679b3776cc0fddc393add0f147bfc74756c03a2273dba7000e218698f9b6cf4b2eb093
-DIST pin-project-internal-1.1.3.crate 27824 BLAKE2B 23b59024481710102677ba35aa8db8e27f6ce0973941addc11bc8a994031c2a4fe04cac197f04fb13c61110e554953883f50b4df15dd632e4c59fc8422fb26b0 SHA512 d2aef23074cdce910fbed47130636dfe3fcb6ab255c6fb4ff822d364d54d181f007c80755ae6f8c7519054888c1a763738d523217a8157542aa35007a77f2288
 DIST pin-project-internal-1.1.7.crate 28549 BLAKE2B cf09f51caeab7b9bdc8e21e9a4b711666ba4f1fef47b9168fca4ed4cbfa1fd4a2d1a258c3c9ec9c5538e38c454e03b54f6c03d3dff976d0156418d7ae7f5dcbc SHA512 7ebeb0cebc01fefa327e40470df1d0bf40aa3c8f5e3ece8786bec5bde0df7bce3a12039267e731f56964fb8b45d38f2e8971be0e3753159ab47b99fa5176fb29
 DIST pin-project-lite-0.2.13.crate 29141 BLAKE2B c434a336716c9cdd16ebc297fed393e9106ef167a693c4aa0b12c681e03141b8ba3cdf64c310916cb7d5cc43cbbfcaaeb39bb5fb1e8b3efb9e94a3f72af914eb SHA512 7f12595d751d315de6c0d380e2f501b74154661eb676987d2cab6fdc956091a68c9cac658df45dbff73615e982e6ae2ea138c09ebb708cd6c351f0d18dbbdbee
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
@@ -226,7 +216,6 @@ DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
-DIST redis-0.25.4.crate 222280 BLAKE2B 5a72ff83694b6b3e390133889a88827a474294f88bc0c7b770dd992b67e79cdaf90f80131592c8307fc82343ead72a49337450e4d63a397ac39640b05d45ae39 SHA512 afa552c2782078b9fe844367487a36de259ccc6f4b8ffa795679899c0c60ec271d518d46e41ab71fd211d506eeb4090300fe7c812f769ace338fda3e091e89a8
 DIST redis-0.27.5.crate 265280 BLAKE2B e97d9364cb610dae332f79b7f3734d5fb25c4aec492f769e5bb48e2b34cc148b2cbfb4779799e34e2ddcff9fdf1afae66be655786fe40342684d577c961e7411 SHA512 e16cc5422f4dc2614df7552375547c83810442b70ff5f56f0972b76174cf06efafa1410b9be526b50ee331cb054dcf23f0b17d1e1d52514fbe3d56b1248c1a49
 DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
 DIST redox_users-0.4.4.crate 15438 BLAKE2B 5f44e9ef20f1a6c8b22239838f8f6a6648dbebd5b4386b3a2c417e39add8c4a0dc32e4369b8bb4e0ea17678140f596b9bc981b1d56f06de6a38a503600420481 SHA512 7c208116d1171b1f52f22aedcf8ad00076a3d1f062f4018f4a9f5fb2c38d7ed83258589062d1559f64e43f3e2a9ddf789799f57cf87a49ad8a37463ea09aa269
@@ -246,7 +235,6 @@ DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e78
 DIST rustc-hash-2.0.0.crate 12691 BLAKE2B b6a619f681e897c8a9167bb88d6ba78715010ac6c1ef9a7a9e115fe8aab10fcd9d4f5e1893e89a36a59118819dbf67de3d261a190fe37948137f097bc99b3fd2 SHA512 996ad683db2e6839ee28fdc4a31293aecce7baefaf6051220a633a00beddef1be41aef0995d7501e5b92dbc85350ced920bc980d05f5ba235e9a5d1a13464339
 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.22.4.crate 333681 BLAKE2B 01f84b7f44883c807d8651b6058647180d6e9d48deb51fab0e76d7b587ad11face13215170db3bb7d0216505eb108438dcc3bc08ed2080816401f3955f73fbab SHA512 0b62c741b73dd49dd9d5531c9ae749fc8eedd4a396c5b4c02b1b33062d56c84e327e12f5a984b9ca22c7984103896d4ac69899032397dd6eac1b737e0647e2da
 DIST rustls-0.23.10.crate 424689 BLAKE2B 9258b0cb14b7f10b583e3a1cae5b3a645c2f79cc6aec445432a52ef75b35607760977089ccbf62d62a60d18f5908400d9960484aba8864e634d52c2b7372cbe5 SHA512 eeabefd525abeb1b87024494bc0691832eececf8a39a6207efef096f1d061aa99403bf09568a2de95d1cf11b51a67834e418f4d761d64eedc9da73ffab67e278
 DIST rustls-native-certs-0.7.0.crate 25071 BLAKE2B c851127d71f5704d251bc687dd9078db0a7f32be1a2b16ed66fba906e3ef2d1767b54ba3076d9373d4aeebd03c37a673255f10c0a4499e8330f9e1fa9beeb801 SHA512 458d3739be07082c7a519e536779b844669f54bcf74353fce307ba468de26ae42e41f26295df4139b81eea9a7c8b39a58fff0f1228e521d5daed761308ed3872
 DIST rustls-pemfile-2.1.2.crate 25928 BLAKE2B 790545dd6347badda8f67bbe67b8d4d7de9f24c134857840d7ba2335f2755cf03c05b26c16c8b1e397b3257cd39a6d3a333103c2c3ea32ccf4118bc3d42995c2 SHA512 35127c68250c31f2fd6924355ec37d5318d8a86ad38da48e68b3ea6e241deeb019eb967c510e95230be6d6c3357b0a85aa022942d21a50423632f8e2496177cb
@@ -258,8 +246,8 @@ DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f81
 DIST salsa20-0.10.2.crate 12780 BLAKE2B 9627985a2b5583e91cdbefff2a71af02009b1905b05d58ced99eac357c27c3b363ef9dc40afd3d19c39a6fd5b19fab7f7149b1fcd85f3e2f63edf7cb1e8990ee SHA512 9066143f6f503fbd6e85434e9dcbe0f0ed4e71e363c599d90968f6f9517dc749798f3e4cae6ed45e4ec429495a103ff4fc9ec564397c947ea63a6c32773c90f0
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scc-2.1.0.crate 122739 BLAKE2B 12508415de1d856cac46ac042ff8ec738fdf234dc34b54b848cb5964a29d12f6ae705fa47e467ae72b4dac3289ab1168490050aaa25cc9e992a077f4f4c5f4a3 SHA512 8ac3754d63e350d43404bcaf1ef79657194e4188fd026f0f504196b5f27552dd380614966bb75d43282d57f0d1bc050d5417abd7774353088eeecc84201d5bdd
-DIST sccache-0.8.2.tar.gz 358026 BLAKE2B 39ddadd8efab23937443eb39b441fa339f7ade5b908bd67cc05194a352fdfce0ed698becc44c226f935e7a966748aa5980a06a46a4101c7f247d7f55c4f150f4 SHA512 4418f650d75fa1cffc4bd6831ef5cf2f4d9d2d3e82ebf64efee69fb4650bf754ba5b73bc1979163ba747edb3515e9f40203e2f355d8feaa57fd6c457f9922b44
 DIST sccache-0.9.0.tar.gz 387733 BLAKE2B 39d14a3ff06dd69f55be006273b84cb19223f42f85b396019297dae3f20bde9b291716e8de275f4cf09665cc7004af3c4d986a9ad7982a653d175c913e6c241f SHA512 4e806bff4fd7496024743faa06963fd6e64f452ddc702f02ae3eeab65a44c7d37ff4f4600d6f845f080f6cf5a29bde1cb51c6f50b8b9cca4329d1e78b1065327
+DIST sccache-0.9.1.tar.gz 390867 BLAKE2B b9fbdc629812a9c9ffea628984c7965585112fde9cf11fb1c8dfa51236b9600041d87032fbd9df3eb7bc8a2a933fec6404b626abf0a84cc0e7eed6c1682ba3c8 SHA512 3296aecf0c49c7171f6c65004001bc80fd259f7b85c3e52527c74b24549b677eb3056cf74f574fc645df0cab41b08e0bf8416b478b606d3f90b62f2f709f1969
 DIST schannel-0.1.23.crate 41667 BLAKE2B 3f34ecf4cc519f5302f0ab5207907a275c68e6fcbb47630aec4ed5d5f1a1cc7475f6d7a8c22361e9878002f9f54314c1f630ab0c1f77ea309714bdb7ada6c9af SHA512 dfce25e3b8bc09d8dd1fce2783fe02ec83f74697cb24aa212ef9369a628685ba488f821cb3e5f863798e0e59995038c8d748f74b89f7929eb8cfd804d5066b84
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST scrypt-0.11.0.crate 13440 BLAKE2B c2378aaa8e81c5b18fa5954b7b72fd3c4e02f61e4f8c8472de4822279d3cdbabf26200492c332581e1d6397e6b4a2e62e38bc09e5472871501c1883de7649894 SHA512 d7910b277ef814a470361c12a7f2c90ef5b1df56cba9b62662f52a36f076872cf21d18f6c81d33d5a7e94184625753e8a6224d6559ab3cf82ae1a0b7f704e544
@@ -320,14 +308,10 @@ DIST tiny-keccak-2.0.2.crate 20129 BLAKE2B 105a2d2af36cc053cd95721ea563108f33b8a
 DIST tiny_http-0.12.0.crate 51330 BLAKE2B d296b90b4e13d29cf16954c01bed353897740e37d6117208f8a52214d722778be7e326508f6e2a5b21e7f3cfba6f65de7a2c1bc52dbe57efe2fcf6b235fe7234 SHA512 c74efe5a0cad88ef0d569329bd633a9ed09365854aa5ef601c97f7f20a7869253b53f8945b998146ff1d97e7301fd59ea76a497fb0f1866c6b9bb76b87561fb0
 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.37.0.crate 764297 BLAKE2B 725f3b62c52ae962623df84c690db7c54438581b8d2108dda76f05bfabdf1688f2de8b4fed2ab0db5c04c7659af8d95a7e19702654a12fd498d85a1d030c7a45 SHA512 fc3c070ed0c09e57205b76618a93b8b00f4d74c2ad89df3295254ec2a984f4fdfa9ed5472ff935e1644e89cf2abc44354742603c0e006f14861deab2b873cd85
 DIST tokio-1.41.0.crate 805168 BLAKE2B caefbbbb03450cec3f3d5e445464254c14d24b2a905b1affe54ca7c89765e91a2bac0d35bd5794e7fe1e78a7de25d6d84bd3aa1bb59c98eae0e11f143ebdec48 SHA512 62f31b33cbd595f20c3b3169895163fc2bfb1b4f5ec2f6e554c7f238a0b63c8431675843fcd1be0e9d1d8de734aac69e41bcb8b5355516b1a239cfac1e9c62c2
-DIST tokio-macros-2.2.0.crate 11520 BLAKE2B b688669f8bcb44967fe0d3db51fc5d5f86da3cd0c7eb7b5803feb250ea3444d134ecc7f79345f0b947cd3479a46659f3a158a04e0edaaa52deb8d343deac4761 SHA512 7e33fa62e0cf4b829638553a51f849242788d217264437444b3bf478fb40be26800d5cfd954b1bcdca1e5191b3c6c60879050f0f7e707461f7b090ae5025e0c6
 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-retry-0.3.0.crate 6146 BLAKE2B 4c597ebd990d63699e7cdd0f69e1292283611b03011bc2baddbf663f1198d97859342d3a217a8625caf0be4205ed0bcf46635795b27616e0380b91bf05293a70 SHA512 6c56f8902af6d40afb06900d863880c9f470d9d2cbccf4fda3be315b73b04fdfecbb8a0092fc6168abfaf9363527eefbc3ec7c913a37951388210b4094b7d5d9
 DIST tokio-retry2-0.5.6.crate 14429 BLAKE2B f94ba76f0576930158897cc3e5d922d62cc8d4fe9321a3612121162b0dafbcad64eed5bae80726f9b2906d6ee01a404c9c750eb5aa5d5ed9a416ab670c1ba6af SHA512 7e45a43292e61f800fb3c37441048c50aaa47a8a26c64a23b6899f2a5af87deabcf4ebb6650f80f8a33f6f1a798b891d2c1eff76f0aa920dd91114225ac4f21b
-DIST tokio-rustls-0.25.0.crate 30541 BLAKE2B fc85306724dbb91efee7924340e0cbf4557cfeb149cf11dca84e37ca96e6ca54cbe774edaffdaf313da11af98ac03cca23bb7c2ff6ea551f5328a3bf3ee9aa02 SHA512 4e04669ecdd8235edd438075e6b125f6473e117adc2ae13ceaee7668705e81a87f97242253f51dea204fa1bb3b9f8f9f21b587b4edc7c2e58e375f5537ee5f95
 DIST tokio-rustls-0.26.0.crate 34253 BLAKE2B faec8cf5b55c5b68549659e82e656d63181b8384d170690b8a22e00b9b7bf4f63cf3f2a0c7a78ed7adc9122253765cf8aa0adebfe620f642f08268ba66ba610e SHA512 101f2083e04feffec48204388c4be3d51fd6dc45bdd04bb75bdfaba48cbdd89529e14dda194ef45b2d78530cc74f128a763fb09165a52d738eb17adff7c56664
 DIST tokio-serde-0.8.0.crate 15720 BLAKE2B 6da7a38ca7195738baad2b22c7bc0ea407612d4bbc90d284fa6318b8824cb00f49dc4b2df3c492aef79856bbee15a0a5badaf720849d67042146621f6c5645a8 SHA512 3716743676e5ae3f8e44c2cd7c5144b3212622f843081b164da992640babc3c743792e611d894f90e8b204ee6d7fb53cc32b7879eca8565b5fdec25c7cf79c35
 DIST tokio-util-0.7.10.crate 110508 BLAKE2B 073b25e1484d54911bc15fc2a4b3fb7658f24f7f77a2382f9f84c5122871cf8c5d6097d5c784cd75b17a79aa63eca80644ff54bb496b52e53bb89650ce35cab0 SHA512 d77db36cfa5a2ace3090874d8996b9e94058ac31648308da8dd92a7bdc9b9b61adb703dbd2131adfef0b428cd61b4de76fbdb674f718e89b297f762af11ec50c
diff --git a/dev-util/sccache/sccache-0.8.2.ebuild b/dev-util/sccache/sccache-0.8.2.ebuild
deleted file mode 100644
index e03a75245df0..000000000000
--- a/dev-util/sccache/sccache-0.8.2.ebuild
+++ /dev/null
@@ -1,482 +0,0 @@
-# Copyright 2017-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.7
-
-EAPI=8
-
-CRATES="
-	addr2line@0.21.0
-	adler@1.0.2
-	aes@0.8.4
-	aho-corasick@1.1.2
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	anstream@0.6.11
-	anstyle-parse@0.2.1
-	anstyle-query@1.0.0
-	anstyle-wincon@3.0.2
-	anstyle@1.0.2
-	anyhow@1.0.86
-	ar@0.9.0
-	arc-swap@1.6.0
-	arrayref@0.3.7
-	arrayvec@0.7.4
-	ascii@1.1.0
-	assert_cmd@2.0.13
-	async-trait@0.1.80
-	atomic-waker@1.1.2
-	autocfg@1.1.0
-	backon@0.4.4
-	backtrace@0.3.69
-	base64@0.13.1
-	base64@0.21.7
-	base64@0.22.1
-	base64ct@1.6.0
-	bb8@0.8.1
-	bincode@1.3.3
-	bitflags@1.3.2
-	bitflags@2.4.1
-	blake3@1.5.0
-	block-buffer@0.10.4
-	block-padding@0.3.3
-	bstr@1.9.0
-	buf_redux@0.8.4
-	bumpalo@3.14.0
-	byteorder@1.5.0
-	bytes@1.6.0
-	cbc@0.1.2
-	cc@1.0.83
-	cfg-if@0.1.10
-	cfg-if@1.0.0
-	cfg_aliases@0.1.1
-	chrono@0.4.38
-	chunked_transfer@1.5.0
-	cipher@0.4.4
-	clap@4.4.18
-	clap_builder@4.4.18
-	clap_derive@4.4.7
-	clap_lex@0.6.0
-	colorchoice@1.0.0
-	combine@4.6.6
-	const-oid@0.9.6
-	const-random-macro@0.1.16
-	const-random@0.1.17
-	constant_time_eq@0.3.0
-	core-foundation-sys@0.8.6
-	core-foundation@0.9.4
-	core_affinity@0.8.1
-	cpufeatures@0.2.12
-	crc16@0.4.0
-	crc32c@0.6.8
-	crc32fast@1.3.2
-	crossbeam-utils@0.8.18
-	crunchy@0.2.2
-	crypto-common@0.1.6
-	daemonize@0.5.0
-	der@0.7.8
-	deranged@0.3.11
-	derive_more@0.99.17
-	difflib@0.4.0
-	digest@0.10.7
-	directories@5.0.1
-	dirs-sys@0.4.1
-	displaydoc@0.1.7
-	dlv-list@0.5.2
-	doc-comment@0.3.3
-	either@1.9.0
-	encoding_rs@0.8.34
-	env_logger@0.10.2
-	equivalent@1.0.1
-	errno@0.3.8
-	error-chain@0.12.4
-	fastrand@2.0.1
-	filetime@0.2.23
-	flagset@0.4.4
-	flate2@1.0.28
-	float-cmp@0.9.0
-	flume@0.10.14
-	fnv@1.0.7
-	foreign-types-shared@0.1.1
-	foreign-types@0.3.2
-	form_urlencoded@1.2.1
-	fs-err@2.11.0
-	futures-channel@0.3.30
-	futures-core@0.3.30
-	futures-executor@0.3.30
-	futures-io@0.3.30
-	futures-macro@0.3.30
-	futures-sink@0.3.30
-	futures-task@0.3.30
-	futures-util@0.3.30
-	futures@0.3.30
-	generic-array@0.14.7
-	getrandom@0.2.11
-	gimli@0.28.1
-	gzp@0.11.3
-	h2@0.3.26
-	h2@0.4.5
-	hashbrown@0.14.3
-	heck@0.4.1
-	hermit-abi@0.3.3
-	hex@0.4.3
-	hmac@0.12.1
-	home@0.5.9
-	hostname@0.3.1
-	http-body-util@0.1.1
-	http-body@0.4.6
-	http-body@1.0.0
-	http@0.2.11
-	http@1.1.0
-	httparse@1.8.0
-	httpdate@1.0.3
-	humantime@2.1.0
-	hyper-rustls@0.27.2
-	hyper-tls@0.5.0
-	hyper-tls@0.6.0
-	hyper-util@0.1.3
-	hyper@0.14.28
-	hyper@1.1.0
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.59
-	idna@0.5.0
-	indexmap@2.2.5
-	inout@0.1.3
-	ipnet@2.9.0
-	is-terminal@0.4.12
-	itertools@0.12.0
-	itoa@0.3.4
-	itoa@1.0.10
-	jobserver@0.1.32
-	js-sys@0.3.66
-	jsonwebtoken@9.2.0
-	lazy_static@1.4.0
-	libc@0.2.155
-	libm@0.2.8
-	libmount@0.1.15
-	libredox@0.0.1
-	linked-hash-map@0.5.6
-	linux-raw-sys@0.4.12
-	lock_api@0.4.11
-	log@0.4.22
-	match_cfg@0.1.0
-	md-5@0.10.6
-	memchr@2.7.1
-	memmap2@0.9.4
-	mime@0.3.17
-	mime_guess@2.0.4
-	miniz_oxide@0.7.1
-	mio@0.8.11
-	multipart@0.18.0
-	nanorand@0.7.0
-	native-tls@0.2.11
-	nix@0.14.1
-	nix@0.28.0
-	normalize-line-endings@0.3.0
-	num-bigint-dig@0.8.4
-	num-bigint@0.4.4
-	num-conv@0.1.0
-	num-integer@0.1.45
-	num-iter@0.1.43
-	num-traits@0.2.17
-	num_cpus@1.16.0
-	num_threads@0.1.6
-	number_prefix@0.4.0
-	object@0.32.2
-	once_cell@1.19.0
-	opendal@0.48.0
-	openssl-macros@0.1.1
-	openssl-probe@0.1.5
-	openssl-src@300.2.1+3.2.0
-	openssl-sys@0.9.101
-	openssl@0.10.64
-	option-ext@0.2.0
-	ordered-multimap@0.7.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.9
-	pbkdf2@0.12.2
-	pem-rfc7468@0.7.0
-	pem@3.0.3
-	percent-encoding@2.3.1
-	pin-project-internal@1.1.3
-	pin-project-lite@0.2.13
-	pin-project@1.1.3
-	pin-utils@0.1.0
-	pkcs1@0.7.5
-	pkcs5@0.7.1
-	pkcs8@0.10.2
-	pkg-config@0.3.28
-	powerfmt@0.2.0
-	ppv-lite86@0.2.17
-	predicates-core@1.0.6
-	predicates-tree@1.0.9
-	predicates@3.1.0
-	proc-macro2@1.0.75
-	quick-error@1.2.3
-	quick-xml@0.35.0
-	quick-xml@0.36.1
-	quinn-proto@0.11.8
-	quinn-udp@0.5.2
-	quinn@0.11.2
-	quote@1.0.35
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	redis@0.25.4
-	redox_syscall@0.4.1
-	redox_users@0.4.4
-	regex-automata@0.4.5
-	regex-syntax@0.8.2
-	regex@1.10.3
-	reqsign@0.16.0
-	reqwest@0.11.23
-	reqwest@0.12.5
-	retry@2.0.0
-	ring@0.17.7
-	rouille@3.6.2
-	rsa@0.9.6
-	rust-ini@0.21.0
-	rustc-demangle@0.1.23
-	rustc-hash@1.1.0
-	rustc-hash@2.0.0
-	rustc_version@0.4.0
-	rustix@0.38.34
-	rustls-native-certs@0.7.0
-	rustls-pemfile@2.1.2
-	rustls-pki-types@1.7.0
-	rustls-webpki@0.102.4
-	rustls@0.22.4
-	rustls@0.23.10
-	ruzstd@0.5.0
-	ryu@1.0.16
-	safemem@0.3.3
-	salsa20@0.10.2
-	same-file@1.0.6
-	scc@2.1.0
-	schannel@0.1.23
-	scopeguard@1.2.0
-	scrypt@0.11.0
-	sdd@0.2.0
-	security-framework-sys@2.9.1
-	security-framework@2.9.2
-	semver@1.0.23
-	serde@1.0.201
-	serde_derive@1.0.201
-	serde_json@1.0.114
-	serde_repr@0.1.18
-	serde_spanned@0.6.5
-	serde_urlencoded@0.7.1
-	serial_test@3.1.0
-	serial_test_derive@3.1.0
-	sha1@0.10.6
-	sha1_smol@1.0.0
-	sha2@0.10.8
-	signal-hook-registry@1.4.1
-	signature@2.2.0
-	simple_asn1@0.6.2
-	slab@0.4.9
-	smallvec@1.11.2
-	socket2@0.5.5
-	spin@0.5.2
-	spin@0.9.8
-	spki@0.7.3
-	static_assertions@1.1.0
-	stringmatch@0.3.3
-	strip-ansi-escapes@0.2.0
-	strsim@0.10.0
-	subtle@2.5.0
-	syn@1.0.109
-	syn@2.0.48
-	sync_wrapper@1.0.1
-	syslog@6.1.0
-	system-configuration-sys@0.5.0
-	system-configuration@0.5.1
-	tar@0.4.40
-	temp-env@0.3.6
-	tempfile@3.10.1
-	termcolor@1.4.0
-	terminal_size@0.3.0
-	termtree@0.4.1
-	test-case-core@3.3.1
-	test-case-macros@3.3.1
-	test-case@3.3.1
-	thirtyfour@0.27.3
-	thirtyfour_sync@0.27.1
-	thiserror-impl@1.0.56
-	thiserror@1.0.56
-	threadpool@1.8.1
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tiny-keccak@2.0.2
-	tiny_http@0.12.0
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	tokio-macros@2.2.0
-	tokio-native-tls@0.3.1
-	tokio-retry@0.3.0
-	tokio-rustls@0.25.0
-	tokio-rustls@0.26.0
-	tokio-serde@0.8.0
-	tokio-util@0.7.10
-	tokio@1.37.0
-	toml@0.8.10
-	toml_datetime@0.6.5
-	toml_edit@0.22.6
-	tower-layer@0.3.2
-	tower-service@0.3.2
-	tower@0.4.13
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing@0.1.40
-	trim-in-place@0.1.7
-	try-lock@0.2.5
-	twoway@0.1.8
-	twox-hash@1.6.3
-	typenum@1.17.0
-	unicase@2.7.0
-	unicode-bidi@0.3.14
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.22
-	untrusted@0.9.0
-	url@2.5.0
-	urlparse@0.7.3
-	utf8parse@0.2.1
-	uuid@1.9.0
-	vcpkg@0.2.15
-	version-compare@0.1.1
-	version_check@0.9.4
-	void@1.0.2
-	vte@0.11.1
-	vte_generate_state_changes@0.1.1
-	wait-timeout@0.2.0
-	walkdir@2.5.0
-	want@0.3.1
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-backend@0.2.89
-	wasm-bindgen-futures@0.4.39
-	wasm-bindgen-macro-support@0.2.89
-	wasm-bindgen-macro@0.2.89
-	wasm-bindgen-shared@0.2.89
-	wasm-bindgen@0.2.89
-	wasm-streams@0.4.0
-	web-sys@0.3.66
-	webpki-roots@0.26.2
-	which@6.0.3
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.8
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-core@0.52.0
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-targets@0.48.5
-	windows-targets@0.52.0
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.0
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.0
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.0
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.0
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.0
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.0
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.0
-	winnow@0.6.1
-	winreg@0.50.0
-	winreg@0.52.0
-	winsafe@0.0.19
-	xattr@1.2.0
-	zeroize@1.7.0
-	zip@0.6.6
-	zstd-safe@7.1.0
-	zstd-sys@2.0.10+zstd.1.5.6
-	zstd@0.13.1
-"
-
-# https://github.com/mozilla/sccache?tab=readme-ov-file#build-requirements
-RUST_MIN_VER="1.75.0"
-
-inherit cargo optfeature systemd
-
-DESCRIPTION="ccache/distcc like tool with support for rust and cloud storage"
-HOMEPAGE="https://github.com/mozilla/sccache/"
-SRC_URI="
-	https://github.com/mozilla/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="Apache-2.0"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD-2 BSD CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="azure dist-client dist-server gcs memcached redis s3 webdav"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	app-arch/zstd
-	sys-libs/zlib:=
-	dist-server? ( dev-libs/openssl:= )
-	gcs? ( dev-libs/openssl:= )
-"
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED="usr/bin/sccache*"
-
-pkg_setup() {
-	export OPENSSL_NO_VENDOR=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-	export ZSTD_SYS_USE_PKG_CONFIG=1
-	rust_pkg_setup
-}
-
-src_configure() {
-	local myfeatures=(
-		$(usev azure)
-		$(usev dist-client)
-		$(usev dist-server)
-		$(usev gcs)
-		$(usev memcached)
-		$(usev redis)
-		$(usev s3)
-	)
-
-	cargo_src_configure --no-default-features
-}
-
-src_test() {
-	# Make sure to include itoa@0.3.4 (^0.3.4) manually in `CRATES` or disable
-	# `test_adv_cache_hit_rate` and `test_cache_hit_rate`.
-	cargo_src_test
-}
-
-src_install() {
-	cargo_src_install
-
-	keepdir /etc/sccache
-
-	dodoc -r docs
-
-	if use dist-server; then
-		newinitd "${FILESDIR}"/server.initd sccache-server
-		newconfd "${FILESDIR}"/server.confd sccache-server
-
-		newinitd "${FILESDIR}"/scheduler.initd sccache-scheduler
-		newconfd "${FILESDIR}"/scheduler.confd sccache-scheduler
-
-		systemd_dounit "${FILESDIR}"/sccache-server.service
-		systemd_dounit "${FILESDIR}"/sccache-scheduler.service
-	fi
-}
-
-pkg_postinst() {
-	use memcached && optfeature "memcached backend support" net-misc/memcached
-	use redis && optfeature "redis backend support" dev-db/redis
-}
diff --git a/dev-util/sccache/sccache-0.9.1.ebuild b/dev-util/sccache/sccache-0.9.1.ebuild
new file mode 100644
index 000000000000..ee839eb86813
--- /dev/null
+++ b/dev-util/sccache/sccache-0.9.1.ebuild
@@ -0,0 +1,482 @@
+# Copyright 2017-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.7
+
+EAPI=8
+
+CRATES="
+	addr2line@0.21.0
+	adler@1.0.2
+	aes@0.8.4
+	aho-corasick@1.1.2
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anstream@0.6.11
+	anstyle-parse@0.2.1
+	anstyle-query@1.0.0
+	anstyle-wincon@3.0.2
+	anstyle@1.0.2
+	anyhow@1.0.86
+	ar@0.9.0
+	arc-swap@1.7.1
+	arrayref@0.3.7
+	arrayvec@0.7.4
+	ascii@1.1.0
+	assert_cmd@2.0.13
+	async-trait@0.1.83
+	atomic-waker@1.1.2
+	autocfg@1.1.0
+	backon@1.2.0
+	backtrace@0.3.69
+	base64@0.13.1
+	base64@0.21.7
+	base64@0.22.1
+	base64ct@1.6.0
+	bb8@0.8.1
+	bincode@1.3.3
+	bitflags@1.3.2
+	bitflags@2.4.1
+	blake3@1.5.0
+	block-buffer@0.10.4
+	block-padding@0.3.3
+	bstr@1.9.0
+	buf_redux@0.8.4
+	bumpalo@3.14.0
+	byteorder@1.5.0
+	bytes@1.6.0
+	cbc@0.1.2
+	cc@1.1.10
+	cfg-if@0.1.10
+	cfg-if@1.0.0
+	cfg_aliases@0.1.1
+	chrono@0.4.38
+	chunked_transfer@1.5.0
+	cipher@0.4.4
+	clap@4.4.18
+	clap_builder@4.4.18
+	clap_derive@4.4.7
+	clap_lex@0.6.0
+	colorchoice@1.0.0
+	combine@4.6.6
+	const-oid@0.9.6
+	const-random-macro@0.1.16
+	const-random@0.1.17
+	constant_time_eq@0.3.0
+	core-foundation-sys@0.8.6
+	core-foundation@0.9.4
+	core_affinity@0.8.1
+	cpufeatures@0.2.12
+	crc16@0.4.0
+	crc32c@0.6.8
+	crc32fast@1.3.2
+	crossbeam-utils@0.8.18
+	crunchy@0.2.2
+	crypto-common@0.1.6
+	daemonize@0.5.0
+	der@0.7.8
+	deranged@0.3.11
+	derive_more@0.99.17
+	difflib@0.4.0
+	digest@0.10.7
+	directories@5.0.1
+	dirs-sys@0.4.1
+	displaydoc@0.1.7
+	dlv-list@0.5.2
+	doc-comment@0.3.3
+	either@1.9.0
+	encoding_rs@0.8.34
+	env_logger@0.10.2
+	equivalent@1.0.1
+	errno@0.3.8
+	error-chain@0.12.4
+	fastrand@2.0.1
+	filetime@0.2.23
+	flagset@0.4.4
+	flate2@1.0.28
+	float-cmp@0.9.0
+	flume@0.10.14
+	fnv@1.0.7
+	foreign-types-shared@0.1.1
+	foreign-types@0.3.2
+	form_urlencoded@1.2.1
+	fs-err@2.11.0
+	futures-channel@0.3.30
+	futures-core@0.3.30
+	futures-executor@0.3.30
+	futures-io@0.3.30
+	futures-macro@0.3.30
+	futures-sink@0.3.30
+	futures-task@0.3.30
+	futures-util@0.3.30
+	futures@0.3.30
+	generic-array@0.14.7
+	getrandom@0.2.11
+	gimli@0.28.1
+	gloo-timers@0.3.0
+	gzp@0.11.3
+	h2@0.3.26
+	h2@0.4.5
+	hashbrown@0.14.3
+	heck@0.4.1
+	hermit-abi@0.3.9
+	hex@0.4.3
+	hmac@0.12.1
+	home@0.5.9
+	hostname@0.3.1
+	http-body-util@0.1.1
+	http-body@0.4.6
+	http-body@1.0.0
+	http@0.2.11
+	http@1.1.0
+	httparse@1.8.0
+	httpdate@1.0.3
+	humantime@2.1.0
+	hyper-rustls@0.27.2
+	hyper-tls@0.5.0
+	hyper-tls@0.6.0
+	hyper-util@0.1.3
+	hyper@0.14.28
+	hyper@1.1.0
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.59
+	idna@0.5.0
+	indexmap@2.2.5
+	inout@0.1.3
+	ipnet@2.9.0
+	is-terminal@0.4.12
+	itertools@0.12.0
+	itoa@0.3.4
+	itoa@1.0.10
+	jobserver@0.1.32
+	js-sys@0.3.66
+	jsonwebtoken@9.2.0
+	lazy_static@1.4.0
+	libc@0.2.155
+	libm@0.2.8
+	libmount@0.1.15
+	libredox@0.0.1
+	linked-hash-map@0.5.6
+	linux-raw-sys@0.4.12
+	lock_api@0.4.11
+	log@0.4.22
+	match_cfg@0.1.0
+	md-5@0.10.6
+	memchr@2.7.1
+	memmap2@0.9.4
+	mime@0.3.17
+	mime_guess@2.0.4
+	miniz_oxide@0.7.1
+	mio@1.0.2
+	multipart@0.18.0
+	nanorand@0.7.0
+	native-tls@0.2.11
+	nix@0.14.1
+	nix@0.28.0
+	normalize-line-endings@0.3.0
+	num-bigint-dig@0.8.4
+	num-bigint@0.4.6
+	num-conv@0.1.0
+	num-integer@0.1.46
+	num-iter@0.1.43
+	num-traits@0.2.19
+	num_cpus@1.16.0
+	num_threads@0.1.6
+	number_prefix@0.4.0
+	object@0.32.2
+	once_cell@1.19.0
+	opendal@0.50.1
+	openssl-macros@0.1.1
+	openssl-probe@0.1.5
+	openssl-src@300.2.1+3.2.0
+	openssl-sys@0.9.101
+	openssl@0.10.64
+	option-ext@0.2.0
+	ordered-multimap@0.7.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.9
+	pbkdf2@0.12.2
+	pem-rfc7468@0.7.0
+	pem@3.0.3
+	percent-encoding@2.3.1
+	pin-project-internal@1.1.7
+	pin-project-lite@0.2.13
+	pin-project@1.1.7
+	pin-utils@0.1.0
+	pkcs1@0.7.5
+	pkcs5@0.7.1
+	pkcs8@0.10.2
+	pkg-config@0.3.28
+	powerfmt@0.2.0
+	ppv-lite86@0.2.17
+	predicates-core@1.0.6
+	predicates-tree@1.0.9
+	predicates@3.1.0
+	proc-macro2@1.0.75
+	quick-error@1.2.3
+	quick-xml@0.35.0
+	quick-xml@0.36.1
+	quinn-proto@0.11.8
+	quinn-udp@0.5.2
+	quinn@0.11.2
+	quote@1.0.35
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	redis@0.27.5
+	redox_syscall@0.4.1
+	redox_users@0.4.4
+	regex-automata@0.4.5
+	regex-syntax@0.8.2
+	regex@1.10.3
+	reqsign@0.16.0
+	reqwest@0.11.23
+	reqwest@0.12.5
+	retry@2.0.0
+	ring@0.17.7
+	rouille@3.6.2
+	rsa@0.9.6
+	rust-ini@0.21.0
+	rustc-demangle@0.1.23
+	rustc-hash@1.1.0
+	rustc-hash@2.0.0
+	rustc_version@0.4.0
+	rustix@0.38.34
+	rustls-native-certs@0.7.0
+	rustls-pemfile@2.1.2
+	rustls-pki-types@1.7.0
+	rustls-webpki@0.102.4
+	rustls@0.23.10
+	ruzstd@0.5.0
+	ryu@1.0.16
+	safemem@0.3.3
+	salsa20@0.10.2
+	same-file@1.0.6
+	scc@2.1.0
+	schannel@0.1.23
+	scopeguard@1.2.0
+	scrypt@0.11.0
+	sdd@0.2.0
+	security-framework-sys@2.9.1
+	security-framework@2.9.2
+	semver@1.0.23
+	serde@1.0.201
+	serde_derive@1.0.201
+	serde_json@1.0.114
+	serde_repr@0.1.18
+	serde_spanned@0.6.5
+	serde_urlencoded@0.7.1
+	serial_test@3.1.0
+	serial_test_derive@3.1.0
+	sha1@0.10.6
+	sha1_smol@1.0.0
+	sha2@0.10.8
+	shlex@1.3.0
+	signal-hook-registry@1.4.1
+	signature@2.2.0
+	simple_asn1@0.6.2
+	slab@0.4.9
+	smallvec@1.11.2
+	socket2@0.5.5
+	spin@0.5.2
+	spin@0.9.8
+	spki@0.7.3
+	static_assertions@1.1.0
+	stringmatch@0.3.3
+	strip-ansi-escapes@0.2.0
+	strsim@0.10.0
+	subtle@2.5.0
+	syn@1.0.109
+	syn@2.0.48
+	sync_wrapper@1.0.1
+	syslog@6.1.0
+	system-configuration-sys@0.5.0
+	system-configuration@0.5.1
+	tar@0.4.40
+	temp-env@0.3.6
+	tempfile@3.10.1
+	termcolor@1.4.0
+	terminal_size@0.3.0
+	termtree@0.4.1
+	test-case-core@3.3.1
+	test-case-macros@3.3.1
+	test-case@3.3.1
+	thirtyfour@0.27.3
+	thirtyfour_sync@0.27.1
+	thiserror-impl@1.0.56
+	thiserror@1.0.56
+	threadpool@1.8.1
+	time-core@0.1.2
+	time-macros@0.2.18
+	time@0.3.36
+	tiny-keccak@2.0.2
+	tiny_http@0.12.0
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	tokio-macros@2.4.0
+	tokio-native-tls@0.3.1
+	tokio-retry2@0.5.6
+	tokio-rustls@0.26.0
+	tokio-serde@0.8.0
+	tokio-util@0.7.10
+	tokio@1.41.0
+	toml@0.8.10
+	toml_datetime@0.6.5
+	toml_edit@0.22.6
+	tower-layer@0.3.2
+	tower-service@0.3.2
+	tower@0.4.13
+	tracing-attributes@0.1.27
+	tracing-core@0.1.32
+	tracing@0.1.40
+	trim-in-place@0.1.7
+	try-lock@0.2.5
+	twoway@0.1.8
+	twox-hash@1.6.3
+	typenum@1.17.0
+	unicase@2.7.0
+	unicode-bidi@0.3.14
+	unicode-ident@1.0.12
+	unicode-normalization@0.1.22
+	untrusted@0.9.0
+	url@2.5.0
+	urlparse@0.7.3
+	utf8parse@0.2.1
+	uuid@1.9.0
+	vcpkg@0.2.15
+	version-compare@0.1.1
+	version_check@0.9.4
+	void@1.0.2
+	vte@0.11.1
+	vte_generate_state_changes@0.1.1
+	wait-timeout@0.2.0
+	walkdir@2.5.0
+	want@0.3.1
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.89
+	wasm-bindgen-futures@0.4.39
+	wasm-bindgen-macro-support@0.2.89
+	wasm-bindgen-macro@0.2.89
+	wasm-bindgen-shared@0.2.89
+	wasm-bindgen@0.2.89
+	wasm-streams@0.4.0
+	web-sys@0.3.66
+	webpki-roots@0.26.2
+	which@6.0.3
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.8
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-core@0.52.0
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.0
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.0
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.0
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.0
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.0
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.0
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.0
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.0
+	winnow@0.6.1
+	winreg@0.50.0
+	winreg@0.52.0
+	winsafe@0.0.19
+	xattr@1.2.0
+	zeroize@1.7.0
+	zip@0.6.6
+	zstd-safe@7.1.0
+	zstd-sys@2.0.10+zstd.1.5.6
+	zstd@0.13.1
+"
+
+# https://github.com/mozilla/sccache?tab=readme-ov-file#build-requirements
+RUST_MIN_VER="1.75.0"
+
+inherit cargo optfeature systemd
+
+DESCRIPTION="ccache/distcc like tool with support for rust and cloud storage"
+HOMEPAGE="https://github.com/mozilla/sccache/"
+SRC_URI="
+	https://github.com/mozilla/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD-2 BSD CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="azure dist-client dist-server gcs memcached redis s3 webdav"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	app-arch/zstd
+	sys-libs/zlib:=
+	dist-server? ( dev-libs/openssl:= )
+	gcs? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/sccache*"
+
+pkg_setup() {
+	export OPENSSL_NO_VENDOR=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+	rust_pkg_setup
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usev azure)
+		$(usev dist-client)
+		$(usev dist-server)
+		$(usev gcs)
+		$(usev memcached)
+		$(usev redis)
+		$(usev s3)
+	)
+
+	cargo_src_configure --no-default-features
+}
+
+src_test() {
+	# NOTE: Make sure to include itoa@0.3.4 (^0.3.4) manually in `CRATES` or disable
+	# `test_adv_cache_hit_rate` and `test_cache_hit_rate`.
+	cargo_src_test
+}
+
+src_install() {
+	cargo_src_install
+
+	keepdir /etc/sccache
+
+	dodoc -r docs
+
+	if use dist-server; then
+		newinitd "${FILESDIR}"/server.initd sccache-server
+		newconfd "${FILESDIR}"/server.confd sccache-server
+
+		newinitd "${FILESDIR}"/scheduler.initd sccache-scheduler
+		newconfd "${FILESDIR}"/scheduler.confd sccache-scheduler
+
+		systemd_dounit "${FILESDIR}"/sccache-server.service
+		systemd_dounit "${FILESDIR}"/sccache-scheduler.service
+	fi
+}
+
+pkg_postinst() {
+	use memcached && optfeature "memcached backend support" net-misc/memcached
+	use redis && optfeature "redis backend support" dev-db/redis
+}
diff --git a/dev-util/seer/Manifest b/dev-util/seer/Manifest
index b3c0d829197b..2edd2f8133c7 100644
--- a/dev-util/seer/Manifest
+++ b/dev-util/seer/Manifest
@@ -1,3 +1,2 @@
-DIST seer-1.17.tar.gz 410347 BLAKE2B 6ac10aecc862a669cf9c0a2f25104604bddb3791d48cf8653483edb14a913f8214e7a316f335e115e0df80703610c97d395f6b896406cc19814701f234e319cf SHA512 93a0b148685dcd52eb567c1d58848e65c43208af9505b3bc02202c1be02ed7f94af500a1b5fdb295f0d3cd13dd88e3d6d9a524396c9c37c74435532d3dfbec2d
-DIST seer-2.3.tar.gz 434273 BLAKE2B 31b32a36b4f15bedc791eb450f440865b6e443a30cd53c0c90e12e086c329d4dcac1d6cf2e7ee293b6d156bed55e4b3a31633755e5f3f07080b1c4cdd9da2c1a SHA512 155e3772cad3aef32f96a0f8dbff93450f4f38cb85deb9ceb31068f430beb192a371a0dd49baba8acbdf753228ca952b5c41fbefc23b711b0b36630d40c92b8f
 DIST seer-2.4.tar.gz 659705 BLAKE2B e88a3de2efd07df0964289596c8266e269f1e0c03ac21fc4847a87a7d844daf153ec48dd37dfa6dcf5e2ae6dcdef80a22c51902e5b5f15e0843521d5471f6576 SHA512 a461b771e7057b7ab67ab8fab7c3e1e9086e99baabda7c435c9d0760a37789c57f0474e5e8d8a8d035db8e1291597ddd7e3a57bc6094ca8f609c75bf576499b0
+DIST seer-2.5.tar.gz 678263 BLAKE2B 2355da25e00246aa49fb157317038a830c3bdc8cccb5af92549c32314a5f31f44624b80ad1f34969188ed2826f81dad819709806e53452d3df84bc95e517918c SHA512 bc2831ba05854c1eb8d8c6755650fea0032f9ef44dfc0d864d4ea82941d9abb150e4e650adb4af3b4c61bc74ba71e842de28b1409af930deafa2d85cdcc1ea8b
diff --git a/dev-util/seer/seer-1.17.ebuild b/dev-util/seer/seer-1.17.ebuild
deleted file mode 100644
index 1097a55a591a..000000000000
--- a/dev-util/seer/seer-1.17.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-DESCRIPTION="A GUI frontend to gdb"
-HOMEPAGE="https://github.com/epasveer/seer"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/epasveer/seer"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/epasveer/seer/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
-fi
-
-S="${WORKDIR}"/${P}/src
-
-# Upstream keep 'debian/copyright' up to date
-# https://github.com/epasveer/seer/issues/86
-LICENSE="GPL-3+ CC-BY-3.0 CC-BY-4.0"
-SLOT="0"
-
-DEPEND="
-	dev-qt/qtcharts:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="
-	${DEPEND}
-	dev-debug/gdb
-"
-
-src_install() {
-	cmake_src_install
-
-	domenu resources/seergdb.desktop
-
-	local size
-	for size in 32 64 128 256 512 ; do
-		newicon -s ${size} resources/seergdb_${size}x${size}.png seergdb.png
-	done
-}
diff --git a/dev-util/seer/seer-2.3.ebuild b/dev-util/seer/seer-2.3.ebuild
deleted file mode 100644
index cd746172a5fc..000000000000
--- a/dev-util/seer/seer-2.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-DESCRIPTION="A GUI frontend to gdb"
-HOMEPAGE="https://github.com/epasveer/seer"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/epasveer/seer"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/epasveer/seer/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-S="${WORKDIR}"/${P}/src
-
-# Upstream keep 'debian/copyright' up to date
-# https://github.com/epasveer/seer/issues/86
-LICENSE="GPL-3+ CC-BY-3.0 CC-BY-4.0"
-SLOT="0"
-
-DEPEND="
-	dev-qt/qtbase:6[gui,widgets]
-	dev-qt/qtcharts:6
-	dev-qt/qtsvg:6
-"
-RDEPEND="
-	${DEPEND}
-	dev-debug/gdb
-"
-
-src_configure() {
-	local mycmakeargs=(
-		# Upstream don't really support Qt 5 for >= 2.0:
-		# https://github.com/epasveer/seer/wiki/Building-Seer---Qt5.
-		-DQTVERSION=QT6
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	domenu resources/seergdb.desktop
-
-	local size
-	for size in 32 64 128 256 512 ; do
-		newicon -s ${size} resources/seergdb_${size}x${size}.png seergdb.png
-	done
-}
diff --git a/dev-util/seer/seer-2.4.ebuild b/dev-util/seer/seer-2.4.ebuild
index d600490eb0c2..d361c7e5b93c 100644
--- a/dev-util/seer/seer-2.4.ebuild
+++ b/dev-util/seer/seer-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/epasveer/seer/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
 fi
 
 S="${WORKDIR}"/${P}/src
diff --git a/dev-util/seer/seer-2.5.ebuild b/dev-util/seer/seer-2.5.ebuild
new file mode 100644
index 000000000000..d361c7e5b93c
--- /dev/null
+++ b/dev-util/seer/seer-2.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+DESCRIPTION="A GUI frontend to gdb"
+HOMEPAGE="https://github.com/epasveer/seer"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/epasveer/seer"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/epasveer/seer/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+fi
+
+S="${WORKDIR}"/${P}/src
+
+# Upstream keep 'debian/copyright' up to date
+# https://github.com/epasveer/seer/issues/86
+LICENSE="GPL-3+ CC-BY-3.0 CC-BY-4.0 MIT"
+SLOT="0"
+
+DEPEND="
+	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtcharts:6
+	dev-qt/qtsvg:6
+"
+RDEPEND="
+	${DEPEND}
+	dev-debug/gdb
+"
+
+src_configure() {
+	local mycmakeargs=(
+		# Upstream don't really support Qt 5 for >= 2.0:
+		# https://github.com/epasveer/seer/wiki/Building-Seer---Qt5.
+		-DQTVERSION=QT6
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	domenu resources/seergdb.desktop
+
+	local size
+	for size in 32 64 128 256 512 ; do
+		newicon -s ${size} resources/seergdb_${size}x${size}.png seergdb.png
+	done
+}
diff --git a/dev-util/seer/seer-9999.ebuild b/dev-util/seer/seer-9999.ebuild
index cd746172a5fc..d361c7e5b93c 100644
--- a/dev-util/seer/seer-9999.ebuild
+++ b/dev-util/seer/seer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,14 +13,14 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/epasveer/seer/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
 fi
 
 S="${WORKDIR}"/${P}/src
 
 # Upstream keep 'debian/copyright' up to date
 # https://github.com/epasveer/seer/issues/86
-LICENSE="GPL-3+ CC-BY-3.0 CC-BY-4.0"
+LICENSE="GPL-3+ CC-BY-3.0 CC-BY-4.0 MIT"
 SLOT="0"
 
 DEPEND="
diff --git a/dev-util/selenium-manager/Manifest b/dev-util/selenium-manager/Manifest
index 3806f515026a..fb926e68238d 100644
--- a/dev-util/selenium-manager/Manifest
+++ b/dev-util/selenium-manager/Manifest
@@ -1,3 +1,5 @@
 DIST selenium-manager-4.26.0-crates.tar.xz 25659608 BLAKE2B 35c8c7aab560a16424580a79245bf096112b3eaa2a5a64a08535e5ad523331c905e1391138c5ee9555cb74169c758ffc6a1ef0ec36eba9754b883c66ae313321 SHA512 114c880feeead5cc37d57197b8d9eeefde428d9f8ed1f8c946f86064ec633e6f925c250114f91de8ed5fae6b1a25424754f008210f4f897a972c11a80a03eaf0
+DIST selenium-manager-4.28.0-crates.tar.xz 25281624 BLAKE2B 1026f45f2b12c709235e4e998e80dd3d13ddba47f71fe327ada9ecd3bc9e97c39fe5000e3c61082881099fbb0c0fa18116edf0c512e507f31922b6b4534aa9f9 SHA512 ea48e79973333d97edcd4444b7725ca6f152b64045ec28e2886a812040f9274e19c6f2e5b80350ef184e8b12b060d652794330cd8485176662d3e4016ddfe92d
 DIST selenium-selenium-4.26.0.gh.tar.gz 77107740 BLAKE2B d4e466dbdb9a12126ae8ee9e311d5d997228da3b22620ead3dbf1a553232503fbd8c19470419d6ad5862acfc19f0012c4c48b3a5e1ccecaf0f7c4171f35904fb SHA512 03197215c04e8f6e151631d769975e70b5140d2d7635443c07e43e63b1c0cc3bc99b0694300ca4dbfea6178af9d037d28699a756ef74926a357f7a3030086182
 DIST selenium-selenium-4.27.0.gh.tar.gz 77154097 BLAKE2B 7555ef2cf1667aa6d890c3f78a50d641b5f1474f05f2d34f2b7c1a7927688d4598636ca24a50e33a34ee0810ff037478c9924c38ca1b20f09dc224ff9f3a8651 SHA512 6e4298ce81cbbdddb0d5b851c1b6d55ecaa9f2abda28562e6ceaa3930be954a67710f233b70909836c7388a8672f71c3e46fc5e8a4ffe84a06e50e4badf2401e
+DIST selenium-selenium-4.28.0.gh.tar.gz 52440665 BLAKE2B c954745ffc62d05c7686dfad8be2963dc520d831849a3ff50e75d6b3bf6f14e985932026b61bd6c4df37a1cd50d877bd6b52d0ee35df3b0763d4f5d2f08b8b6a SHA512 02316b264a25888116070f697be59094139114ce3388013da8e907dc55ac4e0d60b773b35ae5a786fbd94ee59c3afc7ff9344aeec709c160960a343337f42d8c
diff --git a/dev-util/selenium-manager/selenium-manager-4.28.0.ebuild b/dev-util/selenium-manager/selenium-manager-4.28.0.ebuild
new file mode 100644
index 000000000000..4ba153032551
--- /dev/null
+++ b/dev-util/selenium-manager/selenium-manager-4.28.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+inherit cargo
+
+TAG=selenium-${PV}
+MY_P=selenium-${TAG}
+CRATES_P=${PN}-4.28.0
+DESCRIPTION="CLI tool that manages the browser/driver infrastructure required by Selenium"
+HOMEPAGE="
+	https://www.selenium.dev/
+	https://github.com/SeleniumHQ/selenium/
+"
+SRC_URI="
+	https://github.com/SeleniumHQ/selenium/archive/selenium-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/${CRATES_P}-crates.tar.xz
+	"
+fi
+S="${WORKDIR}/${MY_P}/rust"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-3.0 Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="telemetry test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-arch/zstd:=
+	sys-libs/zlib:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		|| (
+			www-client/firefox
+			www-client/firefox-bin
+		)
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_prepare() {
+	default
+
+	sed -i -e '/strip/d' Cargo.toml || die
+	if ! use telemetry; then
+		sed -i -e '/avoid-stats/s:false:true:' src/config.rs || die
+	fi
+
+	# Avoid tests requiring Internet or specific browsers (or trying
+	# to fetch them, whatever).
+	rm tests/browser_download_tests.rs || die
+	rm tests/cache_tests.rs || die
+	rm tests/exec_driver_tests.rs || die
+	rm tests/grid_tests.rs || die
+	rm tests/browser_tests.rs || die
+	rm tests/config_tests.rs || die
+	rm tests/iexplorer_tests.rs || die
+	rm tests/mirror_tests.rs || die
+	rm tests/output_tests.rs || die
+	rm tests/stable_browser_tests.rs || die
+	rm tests/webview_tests.rs || die
+
+	# enable system libraries where supported
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+	sed -i -e '/features.*static/d' "${ECARGO_VENDOR}"/apple-xar-*/Cargo.toml || die
+
+	# remove unbundled sources, just in case
+	# (smoke.c is actually used to test system -lz, sigh)
+	find "${ECARGO_VENDOR}"/*-sys-*/ \
+		\( -name '*.c' -a -not -name 'smoke.c' \) -delete || die
+
+	# bzip2-sys requires a pkg-config file
+	# https://github.com/alexcrichton/bzip2-rs/issues/104
+	mkdir "${T}/pkg-config" || die
+	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
+	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
+		Name: bzip2
+		Version: 9999
+		Description:
+		Libs: -lbz2
+	EOF
+}
+
+src_test() {
+	local -x PATH=${T}/bin:${PATH}
+
+	mkdir "${T}/bin" || die
+	if ! has_version "www-client/firefox"; then
+		# upstream expects "firefox" rather than "firefox-bin"
+		ln -s "$(type -P firefox-bin)" "${T}/bin/firefox" || die
+	fi
+
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+	dodoc README.md
+
+	newenvd - 70selenium-manager <<-EOF || die
+		SE_MANAGER_PATH="${EPREFIX}/usr/bin/selenium-manager"
+	EOF
+}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index c2a450caf903..091b0e20c869 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,2 +1,3 @@
 DIST spirv-headers-1.3.290.0.tar.gz 521685 BLAKE2B f6179e8666a66c2f512153a3574ea252925020903739956f06eb24972ab5dc063dc19692b5c5eee96a3106db6bce652b625209cbcfd587ee73cd95a960ddffdd SHA512 d3328cd4ddf87d075afacfb7ada01dbd16a3ff39b831e9ebe4ce3c32af0ff0c8822811b0e0d273a54b4acaba29b63b099efcf0150424bd9074d24d04a9974d89
 DIST spirv-headers-1.3.296.0.tar.gz 523647 BLAKE2B 2ebda8006e83223620a9600973162b5ce4580442fab44edb5fa177642f61907385feeba5e33e29b2acda4527b523bc74e60b1b75b5c71111a606bb192e8baa9b SHA512 b4f975d3051eda41ef5c3a6efc832607a165adfd6f43d7af171d2c0446b227bdcb5de0017a081fa9e7a3d2710ba8583fadbc06c0a364043b2778b02818d01040
+DIST spirv-headers-1.4.304.0.tar.gz 532015 BLAKE2B c2b4fcc61c4d6c6134c19ddd31722fd2a87820621ce46fd8f5c810c53b0d671b40d4c5b2cef7ec54e273b17518778ea6059f5ff7f06049799457b8c4586a73ef SHA512 09d6a2e4f7758e8e6bd0c5036d8895befc96ea049b655d2786df4092a6f4ad4185a70ca83bd38683afb9b5e1ec45d8699a38d19774ca39c09f4f199fa1085946
diff --git a/dev-util/spirv-headers/spirv-headers-1.4.304.0.ebuild b/dev-util/spirv-headers/spirv-headers-1.4.304.0.ebuild
new file mode 100644
index 000000000000..f30b78d207c2
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-1.4.304.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=SPIRV-Headers
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Machine-readable files for the SPIR-V Registry"
+HOMEPAGE="https://registry.khronos.org/SPIR-V/ https://github.com/KhronosGroup/SPIRV-Headers"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSPIRV_HEADERS_ENABLE_TESTS=OFF
+		-DSPIRV_HEADERS_ENABLE_INSTALL=ON
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/spirv-llvm-translator/metadata.xml b/dev-util/spirv-llvm-translator/metadata.xml
index 73175b2ae00b..fc2f688de28d 100644
--- a/dev-util/spirv-llvm-translator/metadata.xml
+++ b/dev-util/spirv-llvm-translator/metadata.xml
@@ -9,6 +9,9 @@
 		<email>x11@gentoo.org</email>
 		<name>X11</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>llvm@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">KhronosGroup/SPIRV-LLVM-Translator</remote-id>
 	</upstream>
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.4-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.4-r1.ebuild
index 57c49c326325..387a8f7a6471 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.4-r1.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.4-r1.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.8.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.8.ebuild
index 4d629410521c..86bce5e11561 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.8.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.8.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.4-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.4-r1.ebuild
index cb749f2628eb..6f2cd0f9be8f 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.4-r1.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.4-r1.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.8.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.8.ebuild
index 723c1ef1fe7e..a6c60fea8258 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.8.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.8.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.8.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.8.ebuild
index 0810f90d634d..5a674d71655b 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.8.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.8.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.8.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.8.ebuild
index a3aea49b3f4b..ba9377ad0949 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.8.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.8.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.2.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.2.ebuild
index 26434b7cf7b2..02976684014e 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.2.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.3.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.3.ebuild
index 492566abb9e8..85cef1cef39b 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.3.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-20.0.0.9999.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-20.0.0.9999.ebuild
new file mode 100644
index 000000000000..0a336d807734
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-20.0.0.9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 20 )
+
+inherit cmake-multilib flag-o-matic git-r3 llvm-r1 multiprocessing
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+EGIT_REPO_URI="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/spirv-tools[${MULTILIB_USEDEP}]
+	llvm-core/llvm:${SLOT}=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-util/spirv-headers-1.3.280
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lit
+		llvm-core/clang:${SLOT}
+	)
+"
+
+src_prepare() {
+	append-flags -fPIC
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
+		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
+}
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 97546c517dd3..7e7c97ac500b 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,2 +1,3 @@
 DIST spirv-tools-1.3.290.0.tar.gz 3170780 BLAKE2B 37609534f77e411ffb90e2904e847b2baec80332b5f3d3d3fb6950d835f9526fb95778d4c903574cf8be142370a69cace50d2e69d41e2eccf5f74a764464c148 SHA512 d4e8440c0843fb084dde4a576b95442783ab8204670b199798bd87f754d77f3c258bb69ab1d4dd7859c1d2c681ed8813309c76c6f70b5a7d8d21b6a48ef63b67
 DIST spirv-tools-1.3.296.0.tar.gz 3195963 BLAKE2B ea20efe36090a0e8d46c2fab0c6d08b4f5dc02dce176b88331cbddd8a8bc2fe507abb07e98bcdd15295a311480366d83837e3de2f7d175013b1518682e88b5a4 SHA512 62f0a6034bd016aedfb8975bbd3bb134ef928bd6bafbb61d9f73c46760019597b9841b80243c86e5e5e0576824cd20255067e447590eb0d2d51593439152215e
+DIST spirv-tools-1.4.304.0.tar.gz 3203635 BLAKE2B e4a80a5de07d62f3544d165ea5f7fe4c0bdaf389e56e93cd2b6ccbcaff759dbda90be99fd07a136112e7e53b7c220819fe4da56f46bc68ab84b441748c74e6aa SHA512 5824e8ee1360fccab6f41afb0d1f297fd044f4237448de49906349f745522f3208f2960e7ddf5396c3e2ea4e35b6e0e3e61e7855f4599ee22a0c9829daab3156
diff --git a/dev-util/spirv-tools/spirv-tools-1.4.304.0.ebuild b/dev-util/spirv-tools/spirv-tools-1.4.304.0.ebuild
new file mode 100644
index 000000000000..6d90e4eed0bc
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-1.4.304.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=SPIRV-Tools
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="vulkan-sdk-${PV}"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests fail upon finding symbols that do not match a regular expression
+# in the generated library. Easily hit with non-standard compiler flags
+RESTRICT="test"
+
+DEPEND="~dev-util/spirv-headers-${PV}"
+# RDEPEND=""
+BDEPEND="${PYTHON_DEPS}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSPIRV-Headers_SOURCE_DIR="${ESYSROOT}"/usr/
+		-DSPIRV_WERROR=OFF
+		-DSPIRV_TOOLS_BUILD_STATIC=OFF
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/stressapptest/Manifest b/dev-util/stressapptest/Manifest
index 8ee802f008d7..c974817001d1 100644
--- a/dev-util/stressapptest/Manifest
+++ b/dev-util/stressapptest/Manifest
@@ -1,2 +1 @@
 DIST stressapptest-1.0.11.tar.gz 230797 BLAKE2B 0b1a3cb999c3f7042ecdfc49e118d8abfb28367e9e53a646fe1c89441446b725231997321ecc599b78313a1100df31bf2057f9a60092234597cf633b8520ecd5 SHA512 4d4a1d018e03a857af16773238323a1fddaf2babde491249e80e2644bffa2673bee9a9f2c97931eda04cb9481bffe4434c0986d3660bd5d922955e7c76376597
-DIST stressapptest-1.0.9.tar.gz 219517 BLAKE2B 58fdb60b924bedd526cf31ed47a56cf4cca288abb43054fc6de5379ec2c6ea705c92eec1ef657274949009e40e8fa82ee9cc6e1bda2ef160a894ba95519fcfd8 SHA512 2680b9a4e148a2fe0cb7758ffde7624c8874bbae1e7650bb4df6916512be5949996da16d52f530b237fe4c6122fa9bb2d35b11092d106f59d614b44eec250595
diff --git a/dev-util/stressapptest/stressapptest-1.0.9-r1.ebuild b/dev-util/stressapptest/stressapptest-1.0.9-r1.ebuild
deleted file mode 100644
index 7a237d62e478..000000000000
--- a/dev-util/stressapptest/stressapptest-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,24 +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="Stressful Application Test"
-HOMEPAGE="https://github.com/stressapptest/stressapptest"
-SRC_URI="https://github.com/stressapptest/stressapptest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/libaio"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	# Matches the configure & sat.cc logic
-	use debug || append-cppflags -DNDEBUG -DCHECKOPTS
-	econf --disable-default-optimizations
-}
diff --git a/dev-util/sysprof-capture/sysprof-capture-46.0.ebuild b/dev-util/sysprof-capture/sysprof-capture-46.0.ebuild
index 0404f4afe544..5778f007b2db 100644
--- a/dev-util/sysprof-capture/sysprof-capture-46.0.ebuild
+++ b/dev-util/sysprof-capture/sysprof-capture-46.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
@@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/"
 
 LICENSE="GPL-3+ GPL-2+"
 SLOT="4"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/dev-util/volk/Manifest b/dev-util/volk/Manifest
index f80aeea8e684..bc65814d8a38 100644
--- a/dev-util/volk/Manifest
+++ b/dev-util/volk/Manifest
@@ -1,2 +1,3 @@
 DIST volk-1.3.290.0.tar.gz 62571 BLAKE2B be7495fa0b5509f10259842b5394a651a2b57eb6d607a04b69a43faac2ab10ccc259acbd8445970d12d4111362806b20bf9acc2459438ff15c903d3978f395d7 SHA512 1af3933ab18120ab9418282069ee5a1ba86e8333b6fb1cfc04c85132f9c54ba1d21bbd833fa9e35cfd08edf2867982f19c536c0744569c6a91b0be8b54986e09
 DIST volk-1.3.296.0.tar.gz 63986 BLAKE2B 72cf4178028ead0c604b30fc8d24a988e32382ddee7851c3ce70f17868396105a5dddf773879fed6235208c66c96ca1f0040c753d113a26af4b6f4a6caa7871b SHA512 b9c305db98d931d5bb8580f415262522d97f7041fe351afd8198b5d26a31aaaf573dd651e6e5b3ceb86b67bb74850ac6b237c89dca6de9d423de631160316b31
+DIST volk-1.4.304.0.tar.gz 65511 BLAKE2B 31e9faf00a3abba7f226e1c08b924d6b3575b670b51cad157a02bf4594ebad64483d88dae9bd4ddae8b8766214db47ed4aab1b14ba0f5cec6d29910628fb7b98 SHA512 de7c58e7242e7c876cf40ef87c7e65b1baf1d73759fe3d98c5bfafd81e5ef56d9a7421c782d04c3180673e502cbbf430bcf14e4ebe12ec9634f400446937602c
diff --git a/dev-util/volk/volk-1.4.304.0.ebuild b/dev-util/volk/volk-1.4.304.0.ebuild
new file mode 100644
index 000000000000..994cfbec26f1
--- /dev/null
+++ b/dev-util/volk/volk-1.4.304.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/zeux/volk.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="vulkan-sdk-${PV}"
+	SRC_URI="https://github.com/zeux/volk/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
+	S="${WORKDIR}"/${PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Meta loader for Vulkan API"
+HOMEPAGE="https://github.com/zeux/volk"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	~dev-util/vulkan-headers-${PV}
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DVOLK_INSTALL=on
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index b805772a816a..cbcc9fac7e85 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,2 +1,3 @@
 DIST vulkan-headers-1.3.290.0.tar.gz 2284263 BLAKE2B d0013a88fd6336fcd191931952a44b543647f70b1b8b4fc656e271468e94b3aa1f12b7031aac9750cb2792c55f17b520a2c5c93920802449c2e7a1eb114361d7 SHA512 2bba1b9f3b97e22066ad89bce48a999dd253baf47ed3c76575777e7fc03199c67b1f8b301c1e152eaf4ce63351af9901bcea3a34f2d8cdcea81c25648bfb4706
 DIST vulkan-headers-1.3.296.0.tar.gz 2358781 BLAKE2B 39c7f643591ea4914f5912a7576190252a63388e6bc496f1a115545563e83fb7552a4355f9ec6312fe3fbe162c6d87391ebd1a2bfe6727238063e136abf05937 SHA512 475cd0c3249c7998e5e85390651a6652e229d65e42adf3b4d18f9f7509037d217e87de01632c9b4142d26ab295cd2272c2e88f897a5420d693a82ff7e4003157
+DIST vulkan-headers-1.4.304.0.tar.gz 2443240 BLAKE2B ab8db5100fe80292bda1f243591435d128a2e4b0045c5168400e5fda19ef5f120d0cb68902db0734fe4bb4846218eab21957ef949426aec33bb378b415779c80 SHA512 25a1afe5383e640c28d56d4b04e80be80d8db248ee38e7c7e1a7cb2d5052a505cf4ea0c6b2c5c12b6616f7f391d2a729e9a3b497ad1b0f39ce049846da5de946
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.4.304.0.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.4.304.0.ebuild
new file mode 100644
index 000000000000..65eb0c96786e
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.4.304.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Headers
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Vulkan Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+src_configure() {
+	local mycmakeargs=(
+		-DVULKAN_HEADERS_ENABLE_MODULE=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 46334006003a..a425daa1f90b 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,2 +1,3 @@
 DIST vulkan-tools-1.3.290.0.tar.gz 754806 BLAKE2B 322763f930660b52ac1fd4b56f5b7cd133b49da7a5ecf4f6d36712029dfba44edaa61ab65eaf4f9771ec5e5fac159e8d30b46b0f057b3d9b61220e58dab07ff8 SHA512 e5f6daa12ba2e8098f939cc06e732efd89f616fd9babf00d2fb8b9a73671143961a4c5b84879a4f9c4a7312bb393874f065222602e3619db5ad7fb9f8b868422
 DIST vulkan-tools-1.3.296.0.tar.gz 757355 BLAKE2B b5fa5ad2cc1aacd1f31361a85eb4df95701c7dd0207092722941ace9d5b215c1a094982f3713b3a8e77dc4ffb46e0cbbf7957bdf7ff089d2174e697dafdd9a0b SHA512 66bc89272f150198cd52f2971ad67a2fd6c922ac4bafb420c0d54788ca6bab2246e8a153a09eccce15a87e1fe16fdeef16af1c6b6b13386bff79dd73858f3cae
+DIST vulkan-tools-1.4.304.0.tar.gz 758609 BLAKE2B 81a55a4d84d3bd95c033e790b823a19b1c2776675061be37e325ef5bd98ad77afc328bce8372b0d87028922241c48a975f34f8d199cc2876659ac02f2133b7bd SHA512 9ef9fdda000977f913869419702b3e2ea2a6e41525c47711bc9aad9df5b538b7fad164c3ae43b87f183146f2f27c928b600eadc5ac2bb0e6c81f12a3487cb21c
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.4.304.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.4.304.0.ebuild
new file mode 100644
index 000000000000..1492f1179004
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.4.304.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Tools
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cube wayland X"
+
+BDEPEND="${PYTHON_DEPS}
+	cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	~dev-util/volk-${PV}:=[${MULTILIB_USEDEP}]
+	~media-libs/vulkan-loader-${PV}[${MULTILIB_USEDEP},wayland?,X?]
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libxcb:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	~dev-util/vulkan-headers-${PV}
+	X? ( x11-libs/libXrandr[${MULTILIB_USEDEP}] )
+"
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/vulkaninfo
+	)
+
+	use cube && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkcube
+		/usr/bin/vkcubepp
+	)
+
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_VULKANINFO=ON
+		-DBUILD_CUBE=$(usex cube)
+		-DBUILD_WERROR=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	if use cube; then
+		einfo "As of version 1.4.304.0, the window system for 'vkcube' and 'vkcubepp'"
+		einfo "can be selected at runtime using the '--wsi' runtime argument."
+		einfo "For example, Wayland can be selected using '--wsi wayland'."
+		einfo "As such, 'vkcube-wayland' has been removed and the runtime argument"
+		einfo "must be used instead. See 'vkcube --help' for more information."
+	fi
+}
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 1c19288ef980..1492f1179004 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-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
@@ -50,9 +50,6 @@ pkg_setup() {
 		/usr/bin/vkcube
 		/usr/bin/vkcubepp
 	)
-	use cube && use wayland && MULTILIB_CHOST_TOOLS+=(
-		/usr/bin/vkcube-wayland
-	)
 
 	python-any-r1_pkg_setup
 }
@@ -71,15 +68,15 @@ multilib_src_configure() {
 		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
 	)
 
+	cmake_src_configure
+}
+
+pkg_postinst() {
 	if use cube; then
-		if use X; then
-			mycmakeargs+=(-DCUBE_WSI_SELECTION=XCB)
-		elif use wayland; then
-			mycmakeargs+=(-DCUBE_WSI_SELECTION=WAYLAND)
-		else
-			mycmakeargs+=(-DCUBE_WSI_SELECTION=DISPLAY)
-		fi
+		einfo "As of version 1.4.304.0, the window system for 'vkcube' and 'vkcubepp'"
+		einfo "can be selected at runtime using the '--wsi' runtime argument."
+		einfo "For example, Wayland can be selected using '--wsi wayland'."
+		einfo "As such, 'vkcube-wayland' has been removed and the runtime argument"
+		einfo "must be used instead. See 'vkcube --help' for more information."
 	fi
-
-	cmake_src_configure
 }
diff --git a/dev-util/vulkan-utility-libraries/Manifest b/dev-util/vulkan-utility-libraries/Manifest
index c007a400a0cb..9d5cc2d5e16c 100644
--- a/dev-util/vulkan-utility-libraries/Manifest
+++ b/dev-util/vulkan-utility-libraries/Manifest
@@ -1,2 +1,3 @@
 DIST vulkan-utility-libraries-1.3.290.0.tar.gz 542854 BLAKE2B 669cb85d05fff69aa14461feb84848ef3f1667e79fc740d20ed1209f58a8972aba547f9dedffce4e304c157d6fb8bd63e270c796d927c00729c5c5a62ed638b5 SHA512 73637d7fb511aa00b267d415e4bef780f8b3ffc206a6da4c3447472fbb3e358de6c1ea15601e4c951b6bfb49b736c2449d58dd257f2870388b5b3f9fd396dc62
 DIST vulkan-utility-libraries-1.3.296.0.tar.gz 556437 BLAKE2B d0b401318f03cde83f046a835b8a6e8a65cbcd6cd6325ccf9e23d47d3a015a2ccf2cdc936a60aef4ea654cc3a6cbda44b801788c9c518fc6be478c4194ccadae SHA512 03466c78fbd43461990014a02deb06d2c4668c6230f336d3d9710e93aefa56d0ffadf959892c6d85c409088705e8ecf5fdd0a037b99af767b832f17fe4a44454
+DIST vulkan-utility-libraries-1.4.304.0.tar.gz 572128 BLAKE2B 013c4321ca53475e9a503c4c8d879c8f8a2bc2ef0ab4b038c10ed3e1cd0bdd986d1b72e1999e1c4c4b7acc4fa94b9ce9ab2d486151ad16571bc05511b6e291bb SHA512 8c6348342d66a7fc4c531e39beb2254649dbb7d02dda4301b2e339bb162692f3a84f1003136ef17d51bd918218339f974087bc18945bdab45c056cd2def4c771
diff --git a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.4.304.0.ebuild b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.4.304.0.ebuild
new file mode 100644
index 000000000000..258528f9ef26
--- /dev/null
+++ b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.4.304.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Utility-Libraries
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="vulkan-sdk-${PV}"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Share code across various Vulkan repositories"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Utility-Libraries"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="~dev-util/vulkan-headers-${PV}
+	test? (
+		dev-cpp/gtest
+		>=dev-cpp/magic_enum-0.9.2
+	)"
+BDEPEND="${PYTHON_DEPS}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-9999.ebuild b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-9999.ebuild
index 82dd22dc1006..258528f9ef26 100644
--- a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-9999.ebuild
+++ b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-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
@@ -31,7 +31,6 @@ DEPEND="~dev-util/vulkan-headers-${PV}
 		dev-cpp/gtest
 		>=dev-cpp/magic_enum-0.9.2
 	)"
-RDEPEND="!<media-libs/vulkan-layers-1.3.268"
 BDEPEND="${PYTHON_DEPS}"
 
 multilib_src_configure() {
diff --git a/dev-util/wasmer/Manifest b/dev-util/wasmer/Manifest
deleted file mode 100644
index 3297aa461b9f..000000000000
--- a/dev-util/wasmer/Manifest
+++ /dev/null
@@ -1,163 +0,0 @@
-DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
-DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST arrayref-0.3.5.crate 7644 BLAKE2B d1dae7b54208b842155dc77c226236bfa3fd671fad39a101246f4b1496d28608e657fcb96fc8447ba5b0835260484b46ff35e2fdac8e092a0b5b79646ff39d18 SHA512 6417e092a896e118a69e219f4e40f94756748986769e24ac233ea33a3a0a6e15fbebec5f4d6dc3592da7eb5b2e572cb28ad330838875323c6e925275b5a3f5b8
-DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
-DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
-DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
-DIST bincode-1.2.0.crate 15433 BLAKE2B a0940c61c37b09308ce58be6137cf05a351081e88ff32a14af351fdcb36998c2f4d260b80edbc03115c67534b35f422e25961fec3d2c1bf6963be0179ff8ac11 SHA512 9b599115ff33531eaad003e2c928e83211373101a5ad6cac0dcc09af0b97a0cb157abfc432c1a8c68f303e07732ebd6e0ab776c771250356da9f50187e92b1d9
-DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST blake2b_simd-0.5.9.crate 33575 BLAKE2B f5bd6efad39b7727bdf033bea9796eb0eb24ffdcccf9d9682c22942a5acfac6c566377f635e3030d2ec9cea05129632627c1906031a1c395744c787354e4948c SHA512 cb7ea3db1911976e48fbf64df4c9dd071d26f54b95d4f14adae2767bd18e5b7948a4f908bf9e5fbecc6e17d4849b878262cd8144d07c04e2d0745fa644ecd19e
-DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
-DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
-DIST c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538
-DIST cargo_toml-0.6.4.crate 7356 BLAKE2B 4e6eb03bd62f86598a1675a4c4c693d3599f098c2995492cb4ffdecb0640b4803dadbd3d535fc59ceaa9181de62d4a575e0e37aee5572bf16529a1c0726eedee SHA512 55540e282b0097ee337013f93fe87f38755206fc48ee0b5629dceef415d6bb038d55f886272bcfb2b305817fd1a47fc97930ed1036a003f93c8c22369cf7bf4e
-DIST cast-0.2.2.crate 10318 BLAKE2B da2f8327bc3c2d884bcfaad9d4b2a79e009d060501be98cfe344598da66306940134c28f96eac39578ac98cfc26fd754b68707fa17adab233b371a79eda8a54e SHA512 7b0e860a3c6c809799a9fc733bb0303cff819bc2b884cf77e1517aa9824c819c259edda7793be2fa5fa6573de4f07c0ff95f90a03d0d38c5905260e291ff9786
-DIST cbindgen-0.9.1.crate 129676 BLAKE2B 12315522938e941c4a53033f276f6065d6e19ba7cab3ce8aabb17b2ae5fe0c7231e51be33828434d6ca039d79c9414fe8d310a12b07ef1c544ed9b5d8cee74c6 SHA512 0e32563db42363dc82e8aca2f36bdafcdf0ec9156e7238937295c9369d306c2bfa590ea7a9afd61d8b915fc383bb7af8bbb78cde71f6ab30b0c576262c74232b
-DIST cc-1.0.47.crate 49645 BLAKE2B 39771b601b37a9695a6d49e6d7bba2fa97ff5c1fab11a1a94115d5427a3bfb57cb1501e6b29fe64aa331942a99a9ded88fc8fe21693be697fc7200d919a4e448 SHA512 92bfe74600a43c9d59581641fe0d2aabecb6060b3cbcaac8c8e0fb4f0a21f1099d2887c7b00f205e6c5e972b7aba50e68c360dbcc1090aba942a30199e3cd86c
-DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
-DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
-DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
-DIST cmake-0.1.42.crate 14266 BLAKE2B eab3de3a5a482f58dcf72809f63109605d71e1376e4ae2695345abad556eab86fc946c080602671b748fc79e6757478b5b4398a9985128d6189d5fa13ba8a89d SHA512 eb91ecb665924e433369bac77060e44950cefe73eb250463b0e0346e58b6545114e39f995f24c8dea2bb663db2b177cb9f1a8646b286906b3060effd6691e4f7
-DIST constant_time_eq-0.1.4.crate 4654 BLAKE2B fbceff4653396f9ee4c6d184d60fe78b77acd9b90986e83183b25acbf44d92b6d936df8ccbb1e7aef5c7487703058b93078fd90cee5eab4d14796886e3c6a863 SHA512 65b72c522f7ff0abfe0e562476bbbcbeb1271bc9cf61f9663ea5c08730787242b30df472e7b74a2ea9979466c251030c35f36c916d20e0c6b99826fbecbd8f96
-DIST cranelift-bforest-0.44.0.crate 30852 BLAKE2B 6eff4fec0cf9548f4f32e602d7bf0620d7c6705958ba0d07745391107e0e53ce93792acb2beda2c3180b7653113071753dfc6122a56ca5b2c84a6fa3e6aa74ed SHA512 2770c06c8b9d6747ba4319acce9c67023e4dc84afc68f701470b1658ef08aec5f25221e5534560b0afff711bc045e428f15c1b77b7271cb5b02ac8fda0d7b216
-DIST cranelift-codegen-0.44.0.crate 323814 BLAKE2B 3d9c3f561e4009817fd2889c6e141f5d2f720e53b24013bc61c1c48a49a0168210079e3760426e974e886d933d14f5926eef0a7da1e8486dfccb53acd9610017 SHA512 e8e18180e7952161a376acaef6279204e06461c5382064a30b08607a623f09d68ace8b2af9cecf229c2040f1e8c93a630ba2fa11e245bb7ee4b0b0a61d976137
-DIST cranelift-codegen-meta-0.44.0.crate 151983 BLAKE2B 9fd0f17da4e2a5263ee424e9184bc7e91101591224ae246d5644557f19655677bcefd67752da215dc2ecf4b7fbb3408c21b366add8541c7515964bf2b2381ac2 SHA512 b10e6e3c62b311b14291088ae87ac53695833026183575f2fa8da368d71645eb420c46b6e0a7d4bc22a78610ce7e406fc127a339b8a5d057b4e9ed88737466ea
-DIST cranelift-codegen-shared-0.44.0.crate 7742 BLAKE2B 14b8084a125ed99c8bc8f0bdf8d77de8c5c3ba6ecad69997462d7aefe2425d1c76e9aaea74918faa32e3876053f64efacad9dee086787c455b1be02f6dd64c5c SHA512 293520237fb2282100f50b27553585088bd15941ceefc67d153e873153b1e300ea1ee8b565f797f51aac3d1bc69856a961c22230a7a83d6ea0cdee32707b1010
-DIST cranelift-entity-0.44.0.crate 24256 BLAKE2B 829e0854f7edb945808e588b5b970f8d2f557760987ea803729515b22341b1c1a1a4d15bc25469b224e0ae150cd8cc1cacfd6e30516fdfa670a5f5fc4af81ba9 SHA512 718975ed9f1f831c83f95b83e274db859d82ae0e7d4d307950cc341e2f17cb4951df03ecddbdb9f7fde12bf039fb3082589a28f59506479240335932a7a61c57
-DIST cranelift-native-0.44.0.crate 6759 BLAKE2B bccd10b5b2b8613179255f1b2aab9e6f8654f6499ef7513eb1c9ac9a61b8310841d24edbb69d94846579212a92be2d8fb7bf103a1f99f09054b41343d0c6957a SHA512 6eebadc694a56aec858996a61e262211b0e62f6c5c1c7802d7aeca63e0eb75e60622aca38768d90ecc5589d8ef6d6bcbdc580872e6d650560903c6d1e698446a
-DIST criterion-0.2.11.crate 78216 BLAKE2B f60f4e833ffceb391c95d3eca65aa81a1c3b07c4220eb1a401dfe0e53b49d7ecb8e71159271bad090773a48ec5121ff1158f648b8ff7bee88d0faf957ea6f6d0 SHA512 b2bbf3053392db8fe74b6da9da25bcf2eca5b4c6c72e393f485c4cd9aa978cdff88383d95562e0cc542497aa8e71f45f2c315441b0e1d486d842d34066929cbe
-DIST criterion-plot-0.3.1.crate 17097 BLAKE2B d22112f69b7309fa08100958a88ae9616c2fc15d7e456274252f8422a241123aadc1dd008d101f403dff5738f558210d5b2a71d91bc288af0bb0e4f99c58c6e2 SHA512 52b95d4e8c9909324547b00eb4ae98c274ce22a8494730f117c5530f3cfadd600aa22484730489c5e5202dc248ef40502a9768f172d5303919e430bcc0625b5c
-DIST crossbeam-deque-0.7.2.crate 19557 BLAKE2B d0be481c85d0a9e22b6b85ad109aecfa227ee2c7748774805d3f487f39540c5620dbef6c89a35459afdbab2df9ba28a48a741fc4f9dd79fb9325dd4523a7bf37 SHA512 1ac3112c3904751ff3540e14740b04b23f8e64b5dc1097deeffd4e7c39af76626bc4b7d1f402cd44f7ab4ab33b275048f5c2d48f941a6bc555b0d98a53d64551
-DIST crossbeam-epoch-0.8.0.crate 38711 BLAKE2B 97fea09cab0da60998f640b7cd13cf4f3c07081f0ca569418c0565d8e87f2c6f1da036c3acb318dd12ec56ba2109f74600cd2ae6b4362afeed39b1076b02fca8 SHA512 e7eca59128d5ae6fefdbd34e912e10b08783436858636c0905d65f651a3af8cb6a2b6d872f4136e31d242d05019391d31ba1be424e8ed5c951f15dfd46162892
-DIST crossbeam-queue-0.1.2.crate 14104 BLAKE2B b084846e3adaefb33991770d53130b361f2dfa76ac9f4793618643afff09c4ebeae1545c33c59211d09427bf8d13d13d3ed0965211568884b0b2042e5542327d SHA512 f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444
-DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
-DIST crossbeam-utils-0.7.0.crate 34202 BLAKE2B 7a080ce1cbb33f28788738ab9c0a68ad9f535075633de1bcf9267f52759c679bd4d013bfab8e316294dabedbdf8c3b4b902b082a9993600db7bf6c98126fd1db SHA512 260d4f2e209172128da1470be16fee4ada3f6675649c681c0e311ef7da273cd6f04671cd06483e906948f4c0b505c403622456e9fe68d77e0c8b56ff4bb35c3c
-DIST csv-1.1.1.crate 890406 BLAKE2B 51759338676d882ea1ec0f953ad6b67b2c29f0a5fe77c0bd316f3f3c92f41b6c325f49e631c35498db8bd292fe118e1c44cf016fbf73f9f16a79e2528b0e8811 SHA512 de89d7243b24b0b85c4b6520f2ada446e32561d58e9bb116d76bbd0465a647825e8dd0125f3d693ade5b9f5f41ad2c65016d958c9c3112cbadec92c26947e9c6
-DIST csv-core-0.1.6.crate 25593 BLAKE2B 9784db836f17e350f2500e90d0d9d73d20274cb8b0c11613db0d1094eebeced4230c11df1c4c6fd15af59b444fb081c7b1103481b765a936ec582a9ca980e394 SHA512 91f46405b7b8e214d918ba1bd00e866bd05a7296b8220d2041817d53feec05b62d12fa19142ebab1cc7e05518f1353f6560b2811877c5e3d3dd94f7f4d50a9b8
-DIST ctor-0.1.12.crate 4740 BLAKE2B ac7ea1286f0757f310a29d18077c1dd02289fca420e955be2bf6758c58781882bb974c0b332d3d40df22714a0f8f4412c213df9112d4e0a016019543f02764f3 SHA512 b73f9b9470c75aab8368accf179dbc42ccc0530f5e18ceceef6f2206bf1d9016862d578f720ddc97dac9a52cdae6da019599cacf06a44a13817d1cc0390a4b75
-DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
-DIST dynasm-0.5.1.crate 102339 BLAKE2B 460749bcc16b4dd860df395ac4d4341ce28a1dfbad03325492a812e09f4146d8936d0e7197a548c781ca14245d96bec49b21322d95b1c70ec03436d671d1f4a8 SHA512 787f1400094781d74ad97d3324f42a4a590e5cd7411d80f344c48f0863b611a40a907ce9219bdcf0ca5372e8fe90ce8e30f33cc35ea91d1ff150591efc4fff91
-DIST dynasmrt-0.5.1.crate 15850 BLAKE2B d69a16f2abf2dccf130d75c29f805046c76d942db06f4d3a143f7adc94365a90bd0094f70d22a2895a6c7959e054ac383d345d8b964713cd6ef2223ca9e705b6 SHA512 762b2d6844c1c6477c03c63f607522360907a50e1d66122c46aa32ff04ff927a69999c334a46b5f27b41a3075386e34d30587db07cb0b61af43f5d24f0c76f3a
-DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
-DIST enum-methods-0.0.8.crate 10127 BLAKE2B 35ca4579a33d787155f4de2a7847360d49bc67522027ef41daf420bf2ced64ca35c9df15459bf7fce9a7b9b4e653fb2aeaa1b2c229c677f4987e441732fd38f9 SHA512 b59de357086288c1f4b6f4ab6788b2f7b956afb911ff0481d9652a92a9b0a49b60bc8595a304c2e2a47855481b5229140437f8866f8a9e8266022189ba9e9d2c
-DIST erased-serde-0.3.9.crate 20561 BLAKE2B 1f2512d148a17ac48196d90a6c5d08e0aca3c54facd8b15efdcff76112b26e1a36801cfb57c0902acc8d9e0ab34504016689f7e49565961511300cd33c471938 SHA512 8226554d5606088dd11f68414e10e822b54caee6ec051fde2267be41de1f06485a47639e910ac1d8a32c72c3212738734dd58aa6958a0f0a96c8c178bf31f3af
-DIST errno-0.2.4.crate 8486 BLAKE2B 4d23c0a68604bd4fbbc05a557b3d449bdcb56b54d8506e9641f6d2775b41db403f93cf34ea7c446f4a2514ba7b2ee6570cf2029150f44d466d3e12102210bb20 SHA512 039b7bcaed996bb6f48b28aaf44e7008d4b2f6b08213542aaa5fa82e3be87f29e9bc17fdefbf0f159473d292f37464d6888ac8da0a9aec418b1be2de7e2eeab7
-DIST errno-dragonfly-0.1.1.crate 1370 BLAKE2B 8cc4cec5a33af40aa3578ed95d097acf532f3a0a774c653111763a955c90682089f65ca422bf2d22e1fec1a3a053860a0cffc5b44d40745042d167cdd933ded3 SHA512 04d2db15d92ed8e770ff4fd0e200c78ee9235d0f856c163373fdc3fbc063e01daa91f958db212b977c49406e2287dda34e98901f1b1516a6a467ea2cc501d074
-DIST failure-0.1.6.crate 37950 BLAKE2B e203ce20e1e0276a779407b43aee8479d620ce097b6264fd092e3911b2a771c393c931426f48e98fac5a2bfb8331cdc0c7acc6a8c6c6e056a5a0934dfa82dd27 SHA512 9f962b30c3d242e59b22aa0df59524ab8a996e9f1c9c32677d22208edc37f0f9d4727e9e6e8f1841270d3ac1e1bf8057085e067bff23478b7e5f020f475690b8
-DIST failure_derive-0.1.6.crate 4902 BLAKE2B ffbdaf135c6baf66d5ac37cee6050bbad6f1cf6399ac4635a96ffb9f8b9cc80ed8533573a3c8ffd63f207b9ed809ce1ba7825da256c264b558673fdb6e563cef SHA512 5134df91747949e5f697ea98ea17716d1fd11f67fdb94230739d57bd8abba367474d45a1409319973a96bbfa0204d6f6854524ae41e9377e44f6eef66a5dfcc3
-DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
-DIST gcc-0.3.55.crate 37262 BLAKE2B 3341dc7136c14fa822a67fdeb72f7ea50b1264823e695e189d69604b8b8cce898ee2d40d8a536d0f520f5e190576afde16afa5d9cbe0a2c4b8600cf50bbd1447 SHA512 b045b60cf65c1deae44e4f40d0f511dab05c82be5065390dfbdaf5b51ee2d0653c3a6d8d1e7606e4bb6d234adfd22a8c68bde724406f3edb4bb6366617d46a86
-DIST generational-arena-0.2.4.crate 19112 BLAKE2B 2e1e638461a8dc650037691488170c6da293083067787a0db81ed411b3cd052d2947ec0facc29856fb93dfc28568d4e198656bda1d45e79f5404466330bd4b6d SHA512 c0260114f37ac874ab407f17462d9b4da863e03612b73cb99652e9373979b5e9ba8319a11b95abcb808a65a57aff178fe015d4b8153a38e48db6b365bbd539d7
-DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
-DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
-DIST ghost-0.1.1.crate 11605 BLAKE2B eb3e9b2f03b479578350813b24293965ceb51d0c5008eef4627068fda38ba1ffcc3e1a750c410c0512f9832e49caf4211cf8bac03f53a43c789941ed6c65dbc0 SHA512 7cebfc5bd4908a57266ddbcf29aba948fcdefa0a6f72947f8bba80a50634516f3ff054fea8d7c404c7ce987e2b689acb05b99108b033f39d2e6768bc7e28bad0
-DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
-DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
-DIST goblin-0.0.24.crate 146434 BLAKE2B fde5fccc7ace8f426978aa48d9cd57483d192d4e4c9bb2c3f299348e45a0777f369fbd876a3c4e6a1533dfdc6c21a19e748535236b6a165335d740c910daf998 SHA512 22469aa14a9ba749b2499cfd1b7fff8fd2f62e08c4307f8d15324c4caf090838cea75ae8b9338292c582280c6131fb8c3ec0803523ca97b2dc8f86c3c434b520
-DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
-DIST hermit-abi-0.1.3.crate 6741 BLAKE2B 0a7edada6e7c834fdd20b804237d29558b9b413ab99b538de5647e485d36864749fba6b8f46b4a6de4c620cdaa2d711bcc6759b53f8d57438ec5c9b78da71ea8 SHA512 ca85d69192ddd2c1cf0f12d6abc7eaa70a71956df5b55aaf1d3780c6e40207c33bb188a92a5f4769478c4ce13bd93cfd6b4134a21e245781b4ab4e3cb3eabe87
-DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
-DIST indexmap-1.3.0.crate 47086 BLAKE2B b05b127c459c3107123037e6044eed24fa58bba492b230ffb9df7b8bb84f6c86f2241e87afa7c43e133957845b1092d7450534ab74b507eb187b0e509045f18e SHA512 41c933a78a5cd5e62aac2c4c8aaf20bd3fb394b9fa41fb9c59a69afa9b4039dfab82b3d1fb1b0c67f28f0cc7657cea6310db126dd4d84e3473d2c231fecc2331
-DIST inventory-0.1.4.crate 10140 BLAKE2B cf8fdc1ae6972d58b8797d2b20ba1b75a92b3f33cf5cb9cd1b46c39efcbd3e6e5ba4107da1f35294b22aeedb2beef78e76ead1b6eed35e2d132cfc54b7aff8e7 SHA512 647875cf9a1cec8051ca47f3457e9390e5b920845669377c2aa65e55284a31380e0c29e93d578227252dd52b32b5d8df36ecc3479fe58466f208d0ea3c2a74e5
-DIST inventory-impl-0.1.4.crate 1806 BLAKE2B 016e9c8f2834e1a54d5240391252d99a75e47e950c28033d5c437380bd05d1a28c4cdc2c0619e14c16404d772f8785a5f0f2f7b47cefef1edd9664a172af26dd SHA512 da152696a465465f088556a95a718407d2e8e94cd6f71d274d8e660fad3eaa2f299249f6cf5f3a2f4dede43ef3a9b283f21766d136a38396c8a4354cf0f65812
-DIST itertools-0.8.1.crate 89098 BLAKE2B 4b8a68d1ec9e1d15cb5b8fa7bea628b241140b4402c5f2a9e165b2d845d41612237d5181446e0969b2ee23d920aed90236b5a70cb3c48000e4f85c655b5e894f SHA512 b72127032011eca5475552fda55d6c2a87c56e5afd486d2c05296c0117ce3bc48799fc23da6ea4f17eab79bbff2940ade38207dc8a2c4e62bab12f6092b4e188
-DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
-DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.65.crate 439610 BLAKE2B a6390172ac5a76bb13860ffe0793a40fd6a74c7947c164ab1a033401473caaf77cc85bd578a37411d5f40bdeb13358a4810ac358a76799b24f7b797b2bde9915 SHA512 a5df4f7efae9dfdedeb140e3fec545135c7533f665f4eec61f071d01f40a2079e104c6a837c2b385aac4b306e4ddde34aa857fabb4a7ea7d7780159bc0b83c40
-DIST llvm-sys-80.1.1.crate 41677 BLAKE2B 79d048d3c50962c6b7a4c3773d3b938bc0c446e3ab0fe7ce92b5fe7da0aff822cce20dfcdfb24d5cc01746d13d1338e1e44449d86a53821ead4ce8f475a39d1b SHA512 5a523cffb314c573f291035d284a71a1c6cfab40cb7e83c582d89eb8a17d207d6cec6d3df95d20da4cb8c6493d0404f4255e446d4beda70ef6cb422afd0214c0
-DIST lock_api-0.3.1.crate 18060 BLAKE2B ebfdef093ab9f1baa78b71b9f80e53b18ecd498ff9171f49ea84fbcd7f24ca564cf5d77dca30166759b3e4ce22d1a6cb5edcb08b0e33bd120cc9bd25d271094e SHA512 2180d07e06be22c02e4133b5436c4805ec791865a775a5deb7bcfd54130cb759b02a31e081d082bed418b066b9bcdafd36edcf44b5ac58120d1a6d2956fd9bdd
-DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
-DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
-DIST md5-0.6.1.crate 6574 BLAKE2B 10b0f6d84aa5d90da374227d3aa5ea606e9ca41e711b7847e4290fcdd787a74fddf0ac516795d0654a02f331c131386c29a95532bab8a72c958587699992dc09 SHA512 b2d399ee2e7f0777ab891e356b1010a4cdd4a5c5b7013e59289cf4462ca7f744066f26ed97921988f913ce3de340db3514f47df5858fdd57d6a0101fa51eafb2
-DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
-DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa
-DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c
-DIST nix-0.15.0.crate 188640 BLAKE2B e217fc7329cbf49e53f1770da4e4eb15fa84718c265e323cd43b5744aaec2686d3ab93fc8cd52a585341588ee1c76f3d3bf7e25b0a8cb0e876111d12fee3a3c8 SHA512 1b65fcf1701939b85a95dec1483c3ee3e86bcd3ee65b175cd9ba0fc951220594ed9368dca082ef0da566463143d7234a275c15d6b66a724beab128b287c26b3b
-DIST num-traits-0.2.8.crate 39965 BLAKE2B 58b2c432e8523efd95724e01ed80d61b2c4a798fc451e1c7257a392f78617d0ecbab9b1c1d799dde8593cc69f1dbf30d2e966330766992ebd43d8626926f12ee SHA512 a3019e45744245837b2f146ab4213746c93a1ad701958dd418272af89451b843f9b643eac673c1397f6079da7709c7e9ff46e0e829a4cf6092772c9d77bbc534
-DIST num_cpus-1.11.0.crate 11776 BLAKE2B 00d57b8a05807837fefc6596463d6bd3e7815833189142b361f932fc25c78c7910c6d6c37ba43a56201f4ee0f3a27ee9ade7d00f22dc05974aba683273f5e8eb SHA512 b2a04b41c3f9aced42e23fa16db872afbb0a456b22b967e98826d22b4866da066633903d4a29d6e4af810513238062846c82e38989c74aee4607255c09929468
-DIST owning_ref-0.4.0.crate 12233 BLAKE2B c50343d2bbc99c4c8035e1251c2ab31609e8209fe5b6bbdca8bdb0cc5fe7749ce29ef2aae77c90798e2f2f201e12ad81e6607c34c2797195890b5587178dd194 SHA512 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba
-DIST page_size-0.4.1.crate 8379 BLAKE2B 248eb460a1537a5b416d7377820eb029a77d8736792e4a7a3ba16af50863445f5a992badee9208810ca1521d1e5726e919f745491e0ea56d547654321dd42540 SHA512 c2814fa76f6575aeb32990cb7d844054b54d55910e50616999352f95be2aa7443bb0dd1960538f1ee405307416e9dd82aa15c692ae7662595ac8f508476a2d47
-DIST parking_lot-0.9.0.crate 35170 BLAKE2B 3de9050c5dbbc7a0b98a5cad05dd485142bb2a22e65216a20f6e87deb6d124b4502cdb3837dbdc992ff5ea62c67e1545bab269237988832d365fba265149d245 SHA512 148da5edc08da3b27bfcc94a1c0578f228ccfbdf7a7a6f3aa73ac34e290d795f4169553bc7c2b20227e095e8ac75446db51979b595e4d77fa7c76f743138a331
-DIST parking_lot_core-0.6.2.crate 30598 BLAKE2B 048e87b1a785da927afc368290c2e1dd762d98239d862a1aad4850d9498b91e8d64c399bfda0586c23f02fd8839723af1d5e2ef3e714cd932ac11a111b978543 SHA512 5de5d9cac290d7d6e6a3e1fbba2784cce8b4ed163481e1cc6ec36498884b5e3cf0225c718551289be164d1a4e192de390201a083560898e4a42a4068661c0689
-DIST plain-0.2.3.crate 10664 BLAKE2B b0ea38fcf6d4f4e3ff91d572b5639f01eac4f19b2c451d27bca49d994a07c6f46118cd58a1b86b3d2a61b7ac9e17e8236f1cc98414738d8c86086d37e0fe4d35 SHA512 6909e4b4b4a0a49e6a226d7393b121ec04beb8a13b1652c23337eb09b3c2e5f202b53a7663dfe7828dcb32c3d18135b514e9a982967c188e127a63b6cbeda252
-DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
-DIST proc-macro-error-0.2.6.crate 7963 BLAKE2B 702391b17acb0daaec650e39033e563683cf7ec7c6339402dd288807bbfbe534883bb1dbe9f79eca660cce2e1327d04c24786d78bc886061897da23da96776ae SHA512 7db38f6b5f7e0697c1d6a14de1d0e3d67670dfc1005f74a9993d9c4ec31a4d1165375735711edda2a35e92d6f03619f4e139ac9d5197014853c8333d879d665d
-DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
-DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
-DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
-DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
-DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
-DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
-DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
-DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
-DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
-DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
-DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
-DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
-DIST rand_xoshiro-0.1.0.crate 14829 BLAKE2B f1c416dbd614d810971f98d86e8ca816621920e3ec3adc3300ef808ddbfb7aa611779ffc0b386dafdb3f95a0d1a6858a27b9aa484c100fb8a0a7abc9bf41c38e SHA512 56f11cd4d287ad30c945c725dd1bd33bdbaa334d50b02c9aa7eb63cc8e29c7cd2bf189eafbf97ad8386cfd0328de2837f8341f811ac5375f82af2186db7f2358
-DIST raw-cpuid-6.1.0.crate 35072 BLAKE2B 259b89da2314476d33f5b18f0592d7b24172609b7cd1b3a3c4ae87e5d1489e528379d50ba8705db0b05b98028ac5b8f51386dcb7f4bfa4bc5b9fc062ec0779e7 SHA512 d8183555b462e6ce76da33f62e420d30860c50edbb4fd62b52aa0ab9af37a8b8fa2ce697a8aa80e9c858e1be99083e278b78a4782bebe56cbdc0ef8fdde1f948
-DIST rayon-1.2.0.crate 144769 BLAKE2B 9614fb6db62dec788da66305bd84a5bc2d3793921ca343a924443abc97ab9e5e113b50506d65f5e219a64bda4759b8f6eca901796746b026b03a1761c80451e4 SHA512 351f7ddd2600001ef9655f290b743034402a56dcb04a25ac25afeaa549da5e399a8be72cd318d3d4a558d1a190bca7ce03386f3320e9909db48d9d1152154a52
-DIST rayon-core-1.6.0.crate 62221 BLAKE2B a7cca9fa19d0af21752458b58e22268dae9d8078d338714e30eec59e6b53dfbb717af9a919795828a165b42c8545414aa969875d216021632b7435304b8d72ad SHA512 78f231633fb2382fd38a89b967f5a2f38e611293a19db342039e63fd0c7cffd33a78d18b8f0788089b157373ebf20eae0c88365be9668f48abc3a390130be36c
-DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
-DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
-DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
-DIST regex-automata-0.1.8.crate 92234 BLAKE2B eb26c91f5c2ed5b08ff68d316a55a6a23e8b8392d74fd9de5850df38c39304aa3ccb1dca1271ea906602798b132ec49be0623c20f4f2cdb41ce699967dd8815a SHA512 41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a
-DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
-DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
-DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
-DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
-DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
-DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
-DIST scroll-0.9.2.crate 23522 BLAKE2B 48de922d9348708c63c8d83f1849aa903ca78b5988b6bb5ff56ccc1e28677922bd2eac2a7cdf1bafd5eda9b1d460d89c3f732d4b4dbd5696eff9a91df9efb7d0 SHA512 6fd5d72267b1b2840a524f2177f92d240b05b35bc345f2018569c692af8c1deda35fae25230d4652132b3003d740abb4d395aa26cabf958c9544cc5118e335fe
-DIST scroll_derive-0.9.5.crate 4314 BLAKE2B eae8b18aa6e35cc1c003870974b64114817415a4d1e45da6068e11c5132003cc9eb2ce9b538d02709fcc7f137a6c6b1058e4d5f2cdf5b443127eddc55523a81b SHA512 8db648782f4235a0eba142d37e5b60a999874b74c57009e10f4f3bca2a4f26d8eaa0cae4202b1613a98d6e70830b6d2827fb5aa6cd08c510c78079e8eb6b8ccd
-DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
-DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.102.crate 73356 BLAKE2B 1ac078a443f6afc7bfb31f485f1dfab71e61a8978981a88184b79a87b1b238afd1317dd1825f27fa59c762b98d68322ad9d9ea17629f639ed3c088b556ab180e SHA512 76ba1647a896aa907448e496392359c5de727be14b85352d84e6271ca51da77cbcfc99ff77656eb5897e1a99b1e17aee0cbc35ab4b13201a14b8b2a38ce6b6e8
-DIST serde-bench-0.0.7.crate 4421 BLAKE2B 4326fac6cf462da339c8ff29b88e66a197e477042282c1d71b6c453f261be9130ae6d612003d2276af2ce8d8f4520c5e151c6610e0d2e199e8c425d7499fc88b SHA512 00a230c494f0204c3e278000c18783ec8a85beda69f604684c55788c5932211777973c31b21de75765185bc526edf4e0a461171c40fb96420a373b5912eaaa08
-DIST serde_bytes-0.11.2.crate 9983 BLAKE2B d8b2f0b35911a83ecf5b50611d4f37d0f1d2bd6aac0952769525d2311e4c6c2b1733ad52c42ffd0ca7cbdcb70fd5a026a8e67571c31868eb4d285e2acf6ae926 SHA512 ada69e07bfd19739fce25612958db2a398803f5cff89998e6b902defb0ea8f161b43dfcf4a756503a8e5d54fb751f50ea51778e163c989b5fe4320679aa3bcd4
-DIST serde_derive-1.0.102.crate 49693 BLAKE2B 814ca6dc47ddaad2276a0c2ec8f3be9be4001c57294c350f54c86774df7fe6d92404fd4bc5efd87bee2e15745b2b0760481a81125df2e2a01eac5b958599d5d7 SHA512 159cf3b0c9c38fb82ffdf923e9d80abe58eb155da182aa63d7cf94a66507cb533071cb87f89d027c556a08d7560ca5e91e20267341ba0721aefa88b307fe9182
-DIST serde_json-1.0.41.crate 69870 BLAKE2B 328935ee765889b82cd88ac7eab921e279ea8ad41445a8344b194605e1571b30b6204add7dc4de1f87994d8162428eaf4d825e9744c9971349e8fee19507265f SHA512 63ac513a4813a65962d8f63476ce8e63ce71d1e6643da7443d774078e4a743835276c50c04ce535b2e43251383c537365581838a0bd5d4893a644e396eeec55b
-DIST smallvec-0.6.13.crate 22760 BLAKE2B 83e573aadf1742122bbe1897bee09867d9225624474cf8c9a1bdd087a8e69eecf9567e8bdd2bcecdc8cc08f5f4c4f081bcf718ab062ee399c9a09b7f8c54948f SHA512 497e1a77414d545b44f099a69529c6c9a8be8cbc80a84bdc9e85428263518e6949b81498b9ce6ab2795508b1c3beb5e7e5aaa3623bbed2c041f8c3f4a0adfe33
-DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
-DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST structopt-0.3.4.crate 41301 BLAKE2B 9a7883faff72d748dccaaa888d37b6e2a9b1a9b1fd7aacc9958f9a96dc8df54cdbd722af57117f3b58680e41d9d812ed4513dcd01c5894912823ac1e10e62476 SHA512 90ccf78031f0c6d1071e1e2925e4b0444760ccb45b611190fe22a653943d4337da88a6403b18a869c97cf956744d220427a01996321a62918a1fa66fbe64cc64
-DIST structopt-derive-0.3.4.crate 16500 BLAKE2B b5c30c0f99c368063ad31fb30f80e87a14ef5699e365d6721b7bae80059a89ed78f9f149c4e694b0b61ddfd2681bfba997d5b94f6739de4afd6fbc5a42c0e3ec SHA512 8cb0a6e0173bb94747a9c7176134ded12feeded597bb8e027ce08e8d5b3200db3cbfc68137c96ba691037195bc634417ce83fdcf30f68dc43b8fd93e2ee974bb
-DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc30054f76536c1cf537b8fa0d990c78f86b1e5187392b31c5d7364ad5767ae96de5844e252c9c7c41ec962 SHA512 285bdc1f9b53fe791bd35b10a06fc106231c4eca908244f7ba7366a865452ec2dc8bbff275a52725d29c48d2065790ff6eb37c6eb9c1968aeb0af38c028d173e
-DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
-DIST syn-1.0.8.crate 191978 BLAKE2B 9c4f925cf437c8baec1d0bc347454096124e996f1c26ef27fbb0ccbef087ba7a5eb780f4e1f87037568e93c7b7fea2963e2782621c0ab04e5c33ef98349e97fc SHA512 314229610133a1c1db1d60b549846e7b9f9c50ac345ca59d6fbfb263b828653be7fac0f56fd88312162138d85b915dc994ea651c1f9ac591c9c56c53a1738093
-DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
-DIST synstructure-0.12.2.crate 17501 BLAKE2B 6344ece1be98a941be9107bc9a29ff30b635fc8d65f1d2c33a36d1e8a68ffffebd5e1ef946cf43b2d13d41d92f65069368b25b63fa77b968eda75ca89b53221e SHA512 63c1fa9fc1daf63cd259f0f14a29678bd989023a3798bd356010685e45b1a866df7f5a6a743648f9c3ce53eca88f4c0ea05a74c7a5051b48adcbf3dda7988efe
-DIST target-lexicon-0.8.1.crate 18961 BLAKE2B eccb6c4b43e3acda5a20cfc7c4cc90d6a953d29ea76f125d774a857ea04581778800e009cfd551c4db6f4c3ab99a837f78c1180d24bb3299942efaf6925edff6 SHA512 d662d77620bfd1be63e3827acfc4041fdfbd8f4b5a30f1448ee016198822f5e7c2815af730cd625ab0a37cefaf2632073d03438aeb3930c0f8a492657b33d495
-DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
-DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
-DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
-DIST tinytemplate-1.0.2.crate 24614 BLAKE2B 503faf7917be09f1b061f23375cfc4f0d819aaec54ae8c9873d0f9afbd8598229639690260e81d4298f9873890405091821776e78ea904eb6c0684dc49e9c0df SHA512 e6bfc944f3174d4162bf27a80fff2c1e83aca0c9d936fe469c39077b02ede8c9b7e41d145a048cf2cc68d1efbacc919ad1a0708757b7a49bff4dfe4d51675ecf
-DIST toml-0.4.10.crate 47534 BLAKE2B 853aee7f7d9261d2d0daa755e6c158e2b3a173a6e9d8d96cd0d78d75f2ecb1eea341cb8be8b3df9ef1ec34129b77e4f45b4aa849e8c33e6a1f07a3f832993a4f SHA512 15bc40159478207d204e46ff2459dd3146d8f5508f07399f310ec8266190df8a1375e860fc8a7b3fb372b01e9d0f65eaecdc1b896ac2a921070ce76fde82f160
-DIST toml-0.5.5.crate 54805 BLAKE2B 2b319f37165164793866bc4a470ed99447fdccb59242c94e5311906dc764f54131f2bc14921caab56bf84706d12800fb26a58210e3e58728f4076edc9a66e771 SHA512 8f6a04dc24ea775a9a28cc948039f20540ec983c46b287ebfa820e29cc5867803765ce099283f79d3b4a22c513b386603dbd8130808cb3354bc63b5d4706cb33
-DIST typenum-1.11.2.crate 31853 BLAKE2B 1781840c29726a8df614fdcd620924b4cb5a11ad8b5af7c633e70b459b4cdcb9d6a7ccb02b08b78a0cfb3f73382d3ce9d93c56296f93ad588546aeb81a74540c SHA512 c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a
-DIST typetag-0.1.4.crate 24183 BLAKE2B fc17c0a40c8fa4f4df111156c1185e7d0ad2d7e7624e16a494670ead3c2a889efc97064b32e8093fa24b3f2262d9e4a1eabf4ad4bc1ad54a9480c3df2578bd8c SHA512 2207065e68a748b0d410c8e4d56195eea15d63e6ffd3c312d01ff9ca557e63b0a905398bdac49d501bcb8175c886739ae6c6efdf31f8d583def3dc6d3c586924
-DIST typetag-impl-0.1.4.crate 4333 BLAKE2B 5695a7f3cbab35bbf22a877bfd08302046f08b61e3d73e9e0b85c7d0fb5c86d2e58aaa359c8f1a8da52c0d5d0200415b822587987e279691e2ad676ce657337e SHA512 d3abc3a35528e598f08662c958cb9a17009fec61b28019be79fbfdeebdccffa92eb5bfddccf435e7f6b86db2fba71c177e270f115baf552474022db4e0ff0ce3
-DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
-DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
-DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091
-DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
-DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
-DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
-DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
-DIST wabt-0.9.2.crate 18385 BLAKE2B fe242c8c1b6be41bf2108d6b1e1a2bdf68c1bc762e295b9c6fb7d160fa1f978c6a02b052f236729c64aed39ebacade2dea4ea24d30148a21345cc4037ceebfcb SHA512 a4d4ed163991d9b4426a623150eb9c08b02d6cd3e8afdf7124793082755079ffd8f8df0b46a301b4c7848bdcf960612a30b08c1044b88b536786bf0f7cf64662
-DIST wabt-sys-0.7.0.crate 2330587 BLAKE2B e56178aa24e17e5b964acdea364d38049e05282e35e8f25151480dba43a775c1ed46fdcb2ecbc2a86d6bc9f2bb3cc0ee8af2a48fd784fa9321babe6090d91ec6 SHA512 d907063a6915e6e9df484c39b81e12f0f9bb2162ba43151de6b6f43cfd59e061867d540669a6cb36138643fa3c71f17492542cd156cbdfed9b61a9a361fe6b2b
-DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
-DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
-DIST wasmer-0.11.0-git-deps.tar.xz 5696224 BLAKE2B 406a477a2ff91bf42cc4f72aa04949b38db49bec142dd4cc9ad30270c6f311f862f0fa6cbc50b7317efc0c65daf9d235e5ad0c1eeff809621c82f2156c815168 SHA512 bcad8ba613cdea430fc9e26860a6bdaecb58d18bdb7e851259aa643603bb456ac18d7fb5cbe7bd3b97e7d7905ecd5415660cd81c79c8fe4c9b0792d868c3d001
-DIST wasmer-0.11.0.tar.gz 12188261 BLAKE2B 484666a73608cc6e373769d8ec3498d5f01886c55d4225b8aa7b03c5a6abac38ead9f652e9be481865e5d50523f48bd776d7ba35cfed398d2c7e567eb07dc679 SHA512 ec98b60b27d1c1d450ba4e375b36831bacf90c085d3ef1a48ffc23ea97efcb4ec54e45e97c16c3b742bd86b67278660db0f227dd2fed9e8b58b612c91a930b15
-DIST wasmer-clif-fork-frontend-0.44.0.crate 31131 BLAKE2B a98eef814df6e4186f2818fbcf9db1a46595f198c725e449810f6c805dd98a0fa51110087f253a4f4ab8b94e17c9bf4af1ef5de4d35141ff0e572c8751ffffc4 SHA512 02290bec5cc0a2126bd00dbcf628a3695172b011447b4e249e5896b13dae596369145976b60ab6a77de9fd108ba30a2c052cd9669ec642e279888cc3555f09fc
-DIST wasmer-clif-fork-wasm-0.44.0.crate 37579 BLAKE2B 1704a26b21117e866d0d25a6e4d54ca3c0aacdd66bfb1fba95052a68313cfa33a8f6c4d329d5edecee3ec53dd08e27443846d5c4dee76b60c48dcb19d3646410 SHA512 ef1bbcb578932faa4e157c5e787840cef8a44fe1ad39a7e601751a25a5fdf4c083db57b5d285535026d7476b0f8d495e09f75299df9e68e8ddb0d93896e057b0
-DIST wasmparser-0.39.2.crate 60213 BLAKE2B e3dca21bdf831f95b261394b49d39aecba152ebf79ba59e525ea7a758248dfd149c8583de2bad6f9139213675e99400c0f3267d3e5f143236a3dbbe0ce76b971 SHA512 c934884cbacea6302f6ae8518d660170ea13ef6f645084d14b1b856d718d8e2b86b0de10c52dd0789bc8055b5536046692e854d4a87931b1f37a219dcd4caf93
-DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
-DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
-DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
-DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
diff --git a/dev-util/wasmer/metadata.xml b/dev-util/wasmer/metadata.xml
deleted file mode 100644
index db463f3eeb66..000000000000
--- a/dev-util/wasmer/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/wasmer/wasmer-0.11.0.ebuild b/dev-util/wasmer/wasmer-0.11.0.ebuild
deleted file mode 100644
index 39cd6a7aee90..000000000000
--- a/dev-util/wasmer/wasmer-0.11.0.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 2017-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	aho-corasick@0.7.6
-	ansi_term@0.11.0
-	arrayref@0.3.5
-	arrayvec@0.5.1
-	atty@0.2.13
-	autocfg@0.1.7
-	bincode@1.2.0
-	bitflags@1.2.1
-	blake2b_simd@0.5.9
-	bstr@0.2.8
-	byteorder@1.3.2
-	c2-chacha@0.2.3
-	cargo_toml@0.6.4
-	cast@0.2.2
-	cbindgen@0.9.1
-	cc@1.0.47
-	cfg-if@0.1.10
-	clap@2.33.0
-	cloudabi@0.0.3
-	cmake@0.1.42
-	constant_time_eq@0.1.4
-	cranelift-bforest@0.44.0
-	cranelift-codegen@0.44.0
-	cranelift-codegen-meta@0.44.0
-	cranelift-codegen-shared@0.44.0
-	cranelift-entity@0.44.0
-	cranelift-native@0.44.0
-	criterion@0.2.11
-	criterion-plot@0.3.1
-	crossbeam-deque@0.7.2
-	crossbeam-epoch@0.8.0
-	crossbeam-queue@0.1.2
-	crossbeam-utils@0.6.6
-	crossbeam-utils@0.7.0
-	csv@1.1.1
-	csv-core@0.1.6
-	ctor@0.1.12
-	digest@0.8.1
-	dynasm@0.5.1
-	dynasmrt@0.5.1
-	either@1.5.3
-	enum-methods@0.0.8
-	erased-serde@0.3.9
-	errno@0.2.4
-	errno-dragonfly@0.1.1
-	failure@0.1.6
-	failure_derive@0.1.6
-	fuchsia-cprng@0.1.1
-	gcc@0.3.55
-	generational-arena@0.2.4
-	generic-array@0.12.3
-	getrandom@0.1.13
-	ghost@0.1.1
-	glob@0.2.11
-	glob@0.3.0
-	goblin@0.0.24
-	heck@0.3.1
-	hermit-abi@0.1.3
-	hex@0.3.2
-	indexmap@1.3.0
-	inventory@0.1.4
-	inventory-impl@0.1.4
-	itertools@0.8.1
-	itoa@0.4.4
-	kernel32-sys@0.2.2
-	lazy_static@1.4.0
-	libc@0.2.65
-	llvm-sys@80.1.1
-	lock_api@0.3.1
-	log@0.4.8
-	maybe-uninit@2.0.0
-	md5@0.6.1
-	memchr@2.2.1
-	memmap@0.7.0
-	memoffset@0.5.3
-	nix@0.15.0
-	num_cpus@1.11.0
-	num-traits@0.2.8
-	owning_ref@0.4.0
-	page_size@0.4.1
-	parking_lot@0.9.0
-	parking_lot_core@0.6.2
-	plain@0.2.3
-	ppv-lite86@0.2.6
-	proc-macro2@0.4.30
-	proc-macro2@1.0.6
-	proc-macro-error@0.2.6
-	quote@0.3.15
-	quote@0.6.13
-	quote@1.0.2
-	rand@0.7.2
-	rand_chacha@0.2.1
-	rand_core@0.3.1
-	rand_core@0.4.2
-	rand_core@0.5.1
-	rand_hc@0.2.0
-	rand_os@0.1.3
-	rand_xoshiro@0.1.0
-	raw-cpuid@6.1.0
-	rayon@1.2.0
-	rayon-core@1.6.0
-	rdrand@0.4.0
-	redox_syscall@0.1.56
-	regex@1.3.1
-	regex-automata@0.1.8
-	regex-syntax@0.6.12
-	remove_dir_all@0.5.2
-	rustc_version@0.2.3
-	ryu@1.0.2
-	same-file@1.0.5
-	scopeguard@1.0.0
-	scroll@0.9.2
-	scroll_derive@0.9.5
-	semver@0.9.0
-	semver-parser@0.7.0
-	serde@1.0.102
-	serde-bench@0.0.7
-	serde_bytes@0.11.2
-	serde_derive@1.0.102
-	serde_json@1.0.41
-	smallvec@0.6.13
-	stable_deref_trait@1.1.1
-	strsim@0.8.0
-	structopt@0.3.4
-	structopt-derive@0.3.4
-	syn@0.11.11
-	syn@0.15.44
-	syn@1.0.8
-	synom@0.11.3
-	synstructure@0.12.2
-	target-lexicon@0.8.1
-	tempfile@3.1.0
-	textwrap@0.11.0
-	thread_local@0.3.6
-	time@0.1.42
-	tinytemplate@1.0.2
-	toml@0.4.10
-	toml@0.5.5
-	typenum@1.11.2
-	typetag@0.1.4
-	typetag-impl@0.1.4
-	unicode-segmentation@1.6.0
-	unicode-width@0.1.6
-	unicode-xid@0.0.4
-	unicode-xid@0.1.0
-	unicode-xid@0.2.0
-	vec_map@0.8.1
-	void@1.0.2
-	wabt@0.9.2
-	wabt-sys@0.7.0
-	walkdir@2.2.9
-	wasi@0.7.0
-	wasmer-clif-fork-frontend@0.44.0
-	wasmer-clif-fork-wasm@0.44.0
-	wasmparser@0.39.2
-	winapi@0.2.8
-	winapi@0.3.8
-	winapi-build@0.1.1
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.2
-	winapi-x86_64-pc-windows-gnu@0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="Universal web assembly runtime"
-HOMEPAGE="https://wasmer.io"
-SRC_URI="https://github.com/wasmerio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-https://dev.gentoo.org/~williamh/dist/${P}-git-deps.tar.xz
-	${CARGO_CRATE_URIS}"
-
-LICENSE="MIT Apache-2.0 BSD-2 ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	dev-build/cmake
-"
-
-src_prepare() {
-	[[ "${PV}" == *9999* ]] || ln -s ../${P}-git-deps "${ECARGO_HOME}"/git
-	default
-}
-
-src_install() {
-	cargo_src_install
-	einstalldocs
-}
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index f60d83496dc1..5013c30fd704 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1,2 +1 @@
-DIST wayland-1.23.0.tar.xz 237900 BLAKE2B efb80e3c67db7a707a6d2ea66e7a5132173550bc13fdff447925ec3d33bfba8131532f819d5ab0dd80924cb4339b58b7ca83d9e70a436cea8268167476355bd8 SHA512 9c525231a7ea3e68d3178230d476285a960d23e38571ac96d885f86c0588c52ef01460bff6833db5adb9456ce8db7b996613611187aac972736748ba91b8fd81
 DIST wayland-1.23.1.tar.xz 238212 BLAKE2B 74784b537a6e28610466ff1549286cea9ff8b9ca914afa26a07f177bbe0be56b80de037d5eb5d07a38bf02a9041c32e62c896facd5417c1435571640ad8f87b2 SHA512 818eda003e3f7aa15690eedb1ff227a6056b2ce54bf23d45ffe573dc40a914623c5a1358218b59444dcdc483db0503324f0d27091d0ea954412a8b290de5f50a
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.23.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.23.0.ebuild
deleted file mode 100644
index 31e70ffe9985..000000000000
--- a/dev-util/wayland-scanner/wayland-scanner-1.23.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/wayland-${PV}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	S="${WORKDIR}/wayland-${PV}"
-fi
-inherit meson
-
-DESCRIPTION="wayland-scanner tool"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
-
-LICENSE="MIT"
-SLOT="0"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	!<dev-libs/wayland-${PV}
-	>=dev-libs/expat-2.1.0-r3
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=false
-		-Ddtd_validation=false
-		-Dlibraries=false
-		-Dscanner=true
-		-Dtests=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	mv "${ED}"/usr/$(get_libdir)/pkgconfig "${ED}"/usr/share/pkgconfig
-}
diff --git a/dev-vcs/bfg/Manifest b/dev-vcs/bfg/Manifest
index ea18407007ce..e219567480a4 100644
--- a/dev-vcs/bfg/Manifest
+++ b/dev-vcs/bfg/Manifest
@@ -1 +1,2 @@
 DIST bfg-1.13.0.jar 13465496 BLAKE2B 1f9eaa44f032c182a8d50dfebaee668a2d7de2361ea48336932e5168a6a3b6970bbca742943917d4ecc392586f03d19add1d1cd9772e023389b9711874871c53 SHA512 e037be1dd52bd122a57fed18ebc4923238666e9985ad2d40174344a1ca45a05abd9a59f1c2ea743be49d094fd76a5794a0e3160a9d3be04a7986c3a444df4fa8
+DIST bfg-1.14.0.jar 14483456 BLAKE2B b4cf4b893937c83c1ce3bff7901d8522a77e1c5b988938b93deefe0099dc09de7da4cef0f6ff7f55c5621629d40072ce57d039d57b836664d83440258fd5a164 SHA512 086f5dcbb39ba769802a28c2f698236aae27b5a67aa6c25fe9206ce37ac410810a03c1068ca75f5ba3d7d9500f5cb6300653e26e30c2f75c8d9e9a12993476f2
diff --git a/dev-vcs/bfg/bfg-1.13.0-r1.ebuild b/dev-vcs/bfg/bfg-1.13.0-r1.ebuild
new file mode 100644
index 000000000000..7d6ce17a73d4
--- /dev/null
+++ b/dev-vcs/bfg/bfg-1.13.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="A faster alternative to git-filter-branch for removing bad data from git repos"
+HOMEPAGE="https://rtyley.github.io/bfg-repo-cleaner/"
+SRC_URI="https://repo1.maven.org/maven2/com/madgag/${PN}/${PV}/${P}.jar"
+
+S="${WORKDIR}"
+LICENSE="GPL-3+"
+SLOT="0"
+
+KEYWORDS="amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+src_install() {
+	java-pkg_newjar "${DISTDIR}"/${P}.jar
+	java-pkg_dolauncher ${PN}
+}
diff --git a/dev-vcs/bfg/bfg-1.13.0.ebuild b/dev-vcs/bfg/bfg-1.13.0.ebuild
deleted file mode 100644
index 90b1cc8cd116..000000000000
--- a/dev-vcs/bfg/bfg-1.13.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-DESCRIPTION="A faster alternative to git-filter-branch for removing bad data from git repos"
-HOMEPAGE="https://rtyley.github.io/bfg-repo-cleaner/"
-SRC_URI="https://repo1.maven.org/maven2/com/madgag/${PN}/${PV}/${P}.jar"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_install() {
-	java-pkg_newjar "${DISTDIR}"/${P}.jar
-	java-pkg_dolauncher ${PN}
-}
diff --git a/dev-vcs/bfg/bfg-1.14.0.ebuild b/dev-vcs/bfg/bfg-1.14.0.ebuild
new file mode 100644
index 000000000000..f0d12847f2f8
--- /dev/null
+++ b/dev-vcs/bfg/bfg-1.14.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="A faster alternative to git-filter-branch for removing bad data from git repos"
+HOMEPAGE="https://rtyley.github.io/bfg-repo-cleaner/"
+SRC_URI="https://repo1.maven.org/maven2/com/madgag/${PN}/${PV}/${P}.jar"
+
+S="${WORKDIR}"
+LICENSE="GPL-3+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+src_install() {
+	java-pkg_newjar "${DISTDIR}"/${P}.jar
+	java-pkg_dolauncher ${PN}
+}
diff --git a/dev-vcs/bfg/metadata.xml b/dev-vcs/bfg/metadata.xml
index 85e4ed814fa2..eac00bbdda44 100644
--- a/dev-vcs/bfg/metadata.xml
+++ b/dev-vcs/bfg/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">rtyley/bfg-repo-cleaner</remote-id>
+		<changelog>https://github.com/rtyley/bfg-repo-cleaner/releases</changelog>
+		<bugs-to>https://github.com/rtyley/bfg-repo-cleaner/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/git-absorb/Manifest b/dev-vcs/git-absorb/Manifest
index 4c7fd301ee53..ee765cce7eff 100644
--- a/dev-vcs/git-absorb/Manifest
+++ b/dev-vcs/git-absorb/Manifest
@@ -24,9 +24,10 @@ DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53f
 DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9
 DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
 DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee
-DIST git-absorb-0.6.15.tar.gz 29061 BLAKE2B eaf562d7afdab01863989cae2ab9b4813cc73e8c0d44127eb97f5a728cef9f176fc6da14c41de5c76e893e8a693a8bb44bf102416a45bd49a0c28180eff81771 SHA512 290ad9ba918284627c8407992bf9b17d15e53d77c57a0b54e526b99bf0329ebfeb3646e93b2971f30201ec0e8b456a5ca298195d33d8e877c92aa18578fbb39a
 DIST git-absorb-0.6.16.tar.gz 29086 BLAKE2B cfa00dc0f3b339269af7360199f357ee0e787c7cff8cd16d452f9bb46dcedec95e7360fe02a3061bd74a6c6b2ba7a01b739e44da197c42dd995fb5aca2878a1f SHA512 fe335d97b5c8e45046365da7830a8582763465e5d779dc1729fa3eba21949638eb339db9ca9178af9b2a487bf45bab796312c726f44b624a65eb3a07de337ddf
+DIST git-absorb-0.6.17.tar.gz 29449 BLAKE2B 4633066d8e1316378e5d7902d007fc40a55fcbfdbda201887de9686ffb5b5c5ce7bc0719ad0d67b559b465ae67f6572de356a6b4ae71b49b3898c6f711325b39 SHA512 45dd0f25731e4109dd92a3619e33230740beb442fe4ded40b83c66ceaeca8872c18869d0c63e603777ad9533b5411fc2f88e933a201ffde15e10bee498f712e4
 DIST git2-0.19.0.crate 215910 BLAKE2B e6dfbc292dd580dfe2b5964745d73c29ab4e43d91af37893eb2b915c7967d557940284c388b5693c8f366d98979cfb43f184627319799a359b2ec40c6d875a83 SHA512 9d868ba1594ace291002c4a10dcd43f192dbb8c2070abd74883e57a7f53825c7a29080ecbe4279f6c7ee845c261bcbc93b10004b99df27de41cd29bd48e137e8
+DIST git2-0.20.0.crate 219198 BLAKE2B ecc6e070ef2a431ead9c2f0aef774dadcc08db0985ff1d0b3cf002926cd6dbbbba5bd740c8ed9e4bc4da47b85b7d741698f18a7ce47c9b4ee76f32af55b46a1f SHA512 ca86f70b2b1aea95906618791f8093abb6366896c2c7a1db3c054ed3719081c73581f02ba1cdfb58f047df2eccea7108ba933bb9dd9b255d48e1f8159666278d
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
 DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c
@@ -35,6 +36,7 @@ DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda73
 DIST jobserver-0.1.28.crate 25543 BLAKE2B 90fb1d8696b575b16b5b12d6fa4e7bc7890f5f09110b147d65eef8888a16ace1446a789f8079a3706f0252be8a04061d989bc8fc53e6c004d6b8a4094baf1642 SHA512 8ffb33b8c162935de1226e0ca4048f36e6e90bd1731cc7f06110bc97e2adef904f777df0ca4ed48b3b8ee4f2c243b2f883f6897427867904aa3385098abcbcee
 DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
 DIST libgit2-sys-0.17.0+1.8.1.crate 1812997 BLAKE2B 91f61437450398c24a7dbb85803665a0cba268615a0e9d8176e094a192b9e8441d5d985a430722ebdf8c003acd47d40dc5b9e464fb7dae8d9c12b3adbad796fe SHA512 4c37c30426dbba1d9981d65ee42210ec07e2dae73ce2d18beee17b161eb96de0c7b1696cc8b97fa514eb9fdcb8b853713cd19174fc55f033b6a9c1e25520f75b
+DIST libgit2-sys-0.18.0+1.9.0.crate 1853724 BLAKE2B 4c591315d4d425641630084fd4b8d8c26027db1a480f3f721987ae4cd61338f4c538f65c1b0af8db02f4aa1ed9351a1671eb1f5360dee8ed7d78c581a743fcb3 SHA512 b880031974589458cf4361d494326da1a86cade4092c49a9cfd721870d0c53beed35d4ca0a50fe1d86c463abd63beb3c8b0f0e650cc656e31e83e6fea685bee8
 DIST libredox-0.0.1.crate 4212 BLAKE2B fecbb90e2842a69f3967bb2a09b0181dce1720b60c5d762a334a279b52c00a9b4b52de72c6484603981c0c3e1cd8e173ef5e15fa290ce8b8888739204956be92 SHA512 31a9234201f5128f1519e108f7424d1740a67699828265cc725304a70f6a51e139f1d0c0e626b487857a7b421f25ad93e81b95b65cf0d3e0ad912388deecfb41
 DIST libz-sys-1.1.16.crate 3958920 BLAKE2B 1780cfc7181a3c33dd8f693ee93e46bf0f70c1958503e8eb866d6ecb6732c8ab7bec56397c5384d582680fdbd8762ae37ccca7063616f266c59a7eff7801c0db SHA512 1d6b65b5a5293d470cf8ed48293a6f8273828a0cdf096d286e777d438b2c4d076360b5492ee3c2c83b27605d51389e6a3eda7eaebfb09a6041a877a48540aef1
 DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62
diff --git a/dev-vcs/git-absorb/git-absorb-0.6.15-r1.ebuild b/dev-vcs/git-absorb/git-absorb-0.6.15-r1.ebuild
deleted file mode 100644
index c3b68e62d3d7..000000000000
--- a/dev-vcs/git-absorb/git-absorb-0.6.15-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.13.2
-
-EAPI=8
-
-CRATES="
-	anstream@0.6.13
-	anstyle-parse@0.2.3
-	anstyle-query@1.0.2
-	anstyle-wincon@3.0.2
-	anstyle@1.0.6
-	anyhow@1.0.81
-	bitflags@1.3.2
-	bitflags@2.5.0
-	cc@1.0.90
-	cfg-if@1.0.0
-	clap@4.5.3
-	clap_builder@4.5.2
-	clap_complete@4.5.1
-	clap_complete_nushell@4.5.1
-	clap_derive@4.5.3
-	clap_lex@0.7.0
-	colorchoice@1.0.0
-	crossbeam-channel@0.5.12
-	crossbeam-utils@0.8.19
-	deranged@0.3.11
-	dirs-next@2.0.0
-	dirs-sys-next@0.1.2
-	errno@0.3.8
-	fastrand@2.0.1
-	form_urlencoded@1.2.1
-	getrandom@0.2.12
-	git2@0.19.0
-	heck@0.5.0
-	hermit-abi@0.3.9
-	idna@0.5.0
-	is-terminal@0.4.12
-	itoa@1.0.10
-	jobserver@0.1.28
-	libc@0.2.155
-	libgit2-sys@0.17.0+1.8.1
-	libredox@0.0.1
-	libz-sys@1.1.16
-	linux-raw-sys@0.4.13
-	log@0.4.21
-	memchr@2.7.1
-	num-conv@0.1.0
-	once_cell@1.19.0
-	percent-encoding@2.3.1
-	pkg-config@0.3.30
-	powerfmt@0.2.0
-	proc-macro2@1.0.79
-	quote@1.0.35
-	redox_syscall@0.4.1
-	redox_users@0.4.4
-	rustix@0.38.32
-	rustversion@1.0.14
-	serde@1.0.197
-	serde_derive@1.0.197
-	slog-async@2.8.0
-	slog-term@2.9.1
-	slog@2.7.0
-	strsim@0.11.0
-	syn@2.0.53
-	take_mut@0.2.2
-	tempfile@3.10.1
-	term@0.7.0
-	terminal_size@0.3.0
-	thiserror-impl@1.0.58
-	thiserror@1.0.58
-	thread_local@1.1.8
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	url@2.5.0
-	utf8parse@0.2.1
-	vcpkg@0.2.15
-	wasi@0.11.0+wasi-snapshot-preview1
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-targets@0.48.5
-	windows-targets@0.52.4
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.4
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.4
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.4
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.4
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.4
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.4
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.4
-"
-
-inherit cargo shell-completion
-
-DESCRIPTION="Automatically absorb staged changes into git current branch"
-HOMEPAGE="https://github.com/tummychow/git-absorb"
-SRC_URI="${CARGO_CRATE_URIS}"
-SRC_URI+=" https://github.com/tummychow/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-# Dependent crate licenses
-LICENSE+=" MIT Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	>=dev-libs/libgit2-1.8:=
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_compile() {
-	export LIBGIT2_NO_VENDOR=1
-
-	cargo_src_compile
-
-	GIT_ABSORB_BIN="$(cargo_target_dir)/${PN}"
-
-	# Prepare shell completion generation
-	mkdir completions || die
-	local shell
-	for shell in bash fish zsh; do
-		"${GIT_ABSORB_BIN}" --gen-completions \
-					 ${shell} \
-					 > completions/${PN}.${shell} \
-			|| die
-	done
-}
-
-src_install() {
-	cargo_src_install
-	doman Documentation/${PN}.1
-
-	newbashcomp "completions/${PN}.bash" "${PN}"
-	dofishcomp "completions/${PN}.fish"
-	dozshcomp "completions/${PN}.zsh"
-
-	default
-}
diff --git a/dev-vcs/git-absorb/git-absorb-0.6.16-r1.ebuild b/dev-vcs/git-absorb/git-absorb-0.6.16-r1.ebuild
new file mode 100644
index 000000000000..0b767704df93
--- /dev/null
+++ b/dev-vcs/git-absorb/git-absorb-0.6.16-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.3
+
+EAPI=8
+
+CRATES="
+	anstream@0.6.13
+	anstyle-parse@0.2.3
+	anstyle-query@1.0.2
+	anstyle-wincon@3.0.2
+	anstyle@1.0.6
+	anyhow@1.0.81
+	bitflags@1.3.2
+	bitflags@2.5.0
+	cc@1.0.90
+	cfg-if@1.0.0
+	clap@4.5.3
+	clap_builder@4.5.2
+	clap_complete@4.5.1
+	clap_complete_nushell@4.5.1
+	clap_derive@4.5.3
+	clap_lex@0.7.0
+	colorchoice@1.0.0
+	crossbeam-channel@0.5.12
+	crossbeam-utils@0.8.19
+	deranged@0.3.11
+	dirs-next@2.0.0
+	dirs-sys-next@0.1.2
+	errno@0.3.8
+	fastrand@2.0.1
+	form_urlencoded@1.2.1
+	getrandom@0.2.12
+	git2@0.19.0
+	heck@0.5.0
+	hermit-abi@0.3.9
+	idna@0.5.0
+	is-terminal@0.4.12
+	itoa@1.0.10
+	jobserver@0.1.28
+	libc@0.2.155
+	libgit2-sys@0.17.0+1.8.1
+	libredox@0.0.1
+	libz-sys@1.1.16
+	linux-raw-sys@0.4.13
+	log@0.4.21
+	memchr@2.7.1
+	num-conv@0.1.0
+	once_cell@1.19.0
+	percent-encoding@2.3.1
+	pkg-config@0.3.30
+	powerfmt@0.2.0
+	proc-macro2@1.0.79
+	quote@1.0.35
+	redox_syscall@0.4.1
+	redox_users@0.4.4
+	rustix@0.38.32
+	rustversion@1.0.14
+	serde@1.0.197
+	serde_derive@1.0.197
+	slog-async@2.8.0
+	slog-term@2.9.1
+	slog@2.7.0
+	strsim@0.11.0
+	syn@2.0.53
+	take_mut@0.2.2
+	tempfile@3.10.1
+	term@0.7.0
+	terminal_size@0.3.0
+	thiserror-impl@1.0.58
+	thiserror@1.0.58
+	thread_local@1.1.8
+	time-core@0.1.2
+	time-macros@0.2.18
+	time@0.3.36
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	unicode-bidi@0.3.15
+	unicode-ident@1.0.12
+	unicode-normalization@0.1.23
+	url@2.5.0
+	utf8parse@0.2.1
+	vcpkg@0.2.15
+	wasi@0.11.0+wasi-snapshot-preview1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.4
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.4
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.4
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.4
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.4
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.4
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.4
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.4
+"
+
+inherit cargo shell-completion
+
+DESCRIPTION="Automatically absorb staged changes into git current branch"
+HOMEPAGE="https://github.com/tummychow/git-absorb"
+SRC_URI="${CARGO_CRATE_URIS}"
+SRC_URI+=" https://github.com/tummychow/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+# Dependent crate licenses
+LICENSE+=" MIT Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	>=dev-libs/libgit2-1.8:=
+	<dev-libs/libgit2-1.9
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_compile() {
+	export LIBGIT2_NO_VENDOR=1
+
+	cargo_src_compile
+
+	GIT_ABSORB_BIN="$(cargo_target_dir)/${PN}"
+
+	# Prepare shell completion generation
+	mkdir completions || die
+	local shell
+	for shell in bash fish zsh; do
+		"${GIT_ABSORB_BIN}" --gen-completions \
+					 ${shell} \
+					 > completions/${PN}.${shell} \
+			|| die
+	done
+}
+
+src_install() {
+	cargo_src_install
+	doman Documentation/${PN}.1
+
+	newbashcomp "completions/${PN}.bash" "${PN}"
+	dofishcomp "completions/${PN}.fish"
+	dozshcomp "completions/${PN}.zsh"
+
+	default
+}
diff --git a/dev-vcs/git-absorb/git-absorb-0.6.16.ebuild b/dev-vcs/git-absorb/git-absorb-0.6.16.ebuild
deleted file mode 100644
index c032fdba1197..000000000000
--- a/dev-vcs/git-absorb/git-absorb-0.6.16.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.13.3
-
-EAPI=8
-
-CRATES="
-	anstream@0.6.13
-	anstyle-parse@0.2.3
-	anstyle-query@1.0.2
-	anstyle-wincon@3.0.2
-	anstyle@1.0.6
-	anyhow@1.0.81
-	bitflags@1.3.2
-	bitflags@2.5.0
-	cc@1.0.90
-	cfg-if@1.0.0
-	clap@4.5.3
-	clap_builder@4.5.2
-	clap_complete@4.5.1
-	clap_complete_nushell@4.5.1
-	clap_derive@4.5.3
-	clap_lex@0.7.0
-	colorchoice@1.0.0
-	crossbeam-channel@0.5.12
-	crossbeam-utils@0.8.19
-	deranged@0.3.11
-	dirs-next@2.0.0
-	dirs-sys-next@0.1.2
-	errno@0.3.8
-	fastrand@2.0.1
-	form_urlencoded@1.2.1
-	getrandom@0.2.12
-	git2@0.19.0
-	heck@0.5.0
-	hermit-abi@0.3.9
-	idna@0.5.0
-	is-terminal@0.4.12
-	itoa@1.0.10
-	jobserver@0.1.28
-	libc@0.2.155
-	libgit2-sys@0.17.0+1.8.1
-	libredox@0.0.1
-	libz-sys@1.1.16
-	linux-raw-sys@0.4.13
-	log@0.4.21
-	memchr@2.7.1
-	num-conv@0.1.0
-	once_cell@1.19.0
-	percent-encoding@2.3.1
-	pkg-config@0.3.30
-	powerfmt@0.2.0
-	proc-macro2@1.0.79
-	quote@1.0.35
-	redox_syscall@0.4.1
-	redox_users@0.4.4
-	rustix@0.38.32
-	rustversion@1.0.14
-	serde@1.0.197
-	serde_derive@1.0.197
-	slog-async@2.8.0
-	slog-term@2.9.1
-	slog@2.7.0
-	strsim@0.11.0
-	syn@2.0.53
-	take_mut@0.2.2
-	tempfile@3.10.1
-	term@0.7.0
-	terminal_size@0.3.0
-	thiserror-impl@1.0.58
-	thiserror@1.0.58
-	thread_local@1.1.8
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	url@2.5.0
-	utf8parse@0.2.1
-	vcpkg@0.2.15
-	wasi@0.11.0+wasi-snapshot-preview1
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-targets@0.48.5
-	windows-targets@0.52.4
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.4
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.4
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.4
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.4
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.4
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.4
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.4
-"
-
-inherit cargo shell-completion
-
-DESCRIPTION="Automatically absorb staged changes into git current branch"
-HOMEPAGE="https://github.com/tummychow/git-absorb"
-SRC_URI="${CARGO_CRATE_URIS}"
-SRC_URI+=" https://github.com/tummychow/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-# Dependent crate licenses
-LICENSE+=" MIT Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	>=dev-libs/libgit2-1.8:=
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_compile() {
-	export LIBGIT2_NO_VENDOR=1
-
-	cargo_src_compile
-
-	GIT_ABSORB_BIN="$(cargo_target_dir)/${PN}"
-
-	# Prepare shell completion generation
-	mkdir completions || die
-	local shell
-	for shell in bash fish zsh; do
-		"${GIT_ABSORB_BIN}" --gen-completions \
-					 ${shell} \
-					 > completions/${PN}.${shell} \
-			|| die
-	done
-}
-
-src_install() {
-	cargo_src_install
-	doman Documentation/${PN}.1
-
-	newbashcomp "completions/${PN}.bash" "${PN}"
-	dofishcomp "completions/${PN}.fish"
-	dozshcomp "completions/${PN}.zsh"
-
-	default
-}
diff --git a/dev-vcs/git-absorb/git-absorb-0.6.17-r2.ebuild b/dev-vcs/git-absorb/git-absorb-0.6.17-r2.ebuild
new file mode 100644
index 000000000000..802d167d6c45
--- /dev/null
+++ b/dev-vcs/git-absorb/git-absorb-0.6.17-r2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.4
+
+EAPI=8
+
+CRATES="
+	anstream@0.6.13
+	anstyle-parse@0.2.3
+	anstyle-query@1.0.2
+	anstyle-wincon@3.0.2
+	anstyle@1.0.6
+	anyhow@1.0.81
+	bitflags@1.3.2
+	bitflags@2.5.0
+	cc@1.0.90
+	cfg-if@1.0.0
+	clap@4.5.3
+	clap_builder@4.5.2
+	clap_complete@4.5.1
+	clap_complete_nushell@4.5.1
+	clap_derive@4.5.3
+	clap_lex@0.7.0
+	colorchoice@1.0.0
+	deranged@0.3.11
+	dirs-next@2.0.0
+	dirs-sys-next@0.1.2
+	errno@0.3.8
+	fastrand@2.0.1
+	form_urlencoded@1.2.1
+	getrandom@0.2.12
+	git2@0.20.0
+	heck@0.5.0
+	hermit-abi@0.3.9
+	idna@0.5.0
+	is-terminal@0.4.12
+	itoa@1.0.10
+	jobserver@0.1.28
+	libc@0.2.155
+	libgit2-sys@0.18.0+1.9.0
+	libredox@0.0.1
+	libz-sys@1.1.16
+	linux-raw-sys@0.4.13
+	log@0.4.21
+	memchr@2.7.1
+	num-conv@0.1.0
+	once_cell@1.19.0
+	percent-encoding@2.3.1
+	pkg-config@0.3.30
+	powerfmt@0.2.0
+	proc-macro2@1.0.79
+	quote@1.0.35
+	redox_syscall@0.4.1
+	redox_users@0.4.4
+	rustix@0.38.32
+	rustversion@1.0.14
+	serde@1.0.197
+	serde_derive@1.0.197
+	slog-term@2.9.1
+	slog@2.7.0
+	strsim@0.11.0
+	syn@2.0.53
+	tempfile@3.10.1
+	term@0.7.0
+	terminal_size@0.3.0
+	thiserror-impl@1.0.58
+	thiserror@1.0.58
+	thread_local@1.1.8
+	time-core@0.1.2
+	time-macros@0.2.18
+	time@0.3.36
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	unicode-bidi@0.3.15
+	unicode-ident@1.0.12
+	unicode-normalization@0.1.23
+	url@2.5.0
+	utf8parse@0.2.1
+	vcpkg@0.2.15
+	wasi@0.11.0+wasi-snapshot-preview1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.4
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.4
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.4
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.4
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.4
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.4
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.4
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.4
+"
+
+inherit cargo shell-completion
+
+DESCRIPTION="Automatically absorb staged changes into git current branch"
+HOMEPAGE="https://github.com/tummychow/git-absorb"
+SRC_URI="${CARGO_CRATE_URIS}"
+SRC_URI+=" https://github.com/tummychow/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+# Dependent crate licenses
+LICENSE+=" MIT Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	>=dev-libs/libgit2-1.9:=
+	<dev-libs/libgit2-1.10
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_compile() {
+	export LIBGIT2_NO_VENDOR=1
+
+	cargo_src_compile
+
+	GIT_ABSORB_BIN="$(cargo_target_dir)/${PN}"
+
+	# Prepare shell completion generation
+	mkdir completions || die
+	local shell
+	for shell in bash fish zsh; do
+		"${GIT_ABSORB_BIN}" --gen-completions \
+					 ${shell} \
+					 > completions/${PN}.${shell} \
+			|| die
+	done
+}
+
+src_install() {
+	cargo_src_install
+	doman Documentation/${PN}.1
+
+	newbashcomp "completions/${PN}.bash" "${PN}"
+	dofishcomp "completions/${PN}.fish"
+	dozshcomp "completions/${PN}.zsh"
+
+	default
+}
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 752f9ea15f4f..70a903e42a7b 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,3 +1,3 @@
-DIST git-cola-4.5.0.tar.gz 1233372 BLAKE2B da9bbe2d1e49b5ebc49ae6ddecf72a73b4b262de2de6c5a9ef77d9946a338bb393154e91e8431dc11fc08f72e3fcfd19d424d68c2b846d05c0a87393f8cc33ac SHA512 99a17bf0398dc3049417b6af6f3fc3bc20682186859879c6fc3d2b8f9a8b3599612c555b40f76dd226323cefab0dec0b4424a566dc74637449743f675cb56817
+DIST git-cola-4.10.1.tar.gz 1265278 BLAKE2B 3c2ff0f25b5f75340f24577b5109fcbc3ce89122df88a097b1578c193bf37e832c2825ec25dcac720145230c879ba473a7db35ea2e9e1f476c937b14e3649c7c SHA512 582842a861726b4ed6e9f966afc47cb4817cecd82740bb446e39b6f3d03fb96523401267ebdef64960ef60b55cc3e7f42d8023a738b9ff660b9f0d9ea07f201b
 DIST git-cola-4.8.2.tar.gz 1251173 BLAKE2B 758b34e271883c5493e9a219e7f9970c1ca2e0cdb97bbab50828ea53ae2bae223692a06c353d0b017af2e82b3855708ebd2937d9656b373b8d45ab457ac50b7b SHA512 0b924837e8e5dcaa9687ffdff779bd3ed9f629713826f6c537d6470fdaed84bab3cec793aa9f1cf0e7bce3c4dae60c838822005efa93236b5964c8be74ef33cc
 DIST git-cola-4.9.0.tar.gz 1261512 BLAKE2B 51994539e79d1f3db5876b64c10bf84fd2ac7f90cab05227c23831b0f0a6771cead11bf3bcb76863eb0e6e26c245a735143306d55f1773a697036652d7a1084e SHA512 8abb30c8263170c185dc66061b8271dfb73a0173a29337ef704cc0d206a218bfb5ede528966ea55c64fc68121162973f9345ff112b7f8d7093f602a7774b72e0
diff --git a/dev-vcs/git-cola/git-cola-4.10.1.ebuild b/dev-vcs/git-cola/git-cola-4.10.1.ebuild
new file mode 100644
index 000000000000..17c5e8352a84
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-4.10.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_PEP517=setuptools
+inherit desktop distutils-r1 optfeature readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/polib[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/qtpy[pyqt6,gui,network,${PYTHON_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="
+	sys-devel/gettext
+	$(python_gen_cond_dep "
+		dev-python/setuptools-scm[\${PYTHON_USEDEP}]
+		test? (
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/qtpy[pyqt6,gui,network,\${PYTHON_USEDEP}]
+		)
+	")
+"
+
+distutils_enable_sphinx docs \
+	'dev-python/rst-linker'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove bundled qtpy and polib
+	rm -Rf qtpy cola/polib.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	cd "${T}" || die
+	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
+	epytest "${S}"/test
+}
+
+src_compile() {
+	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	domenu share/applications/*.desktop
+	doicon -s scalable cola/icons/git-cola.svg
+
+	# patch the binaries to use desired qtpy backend
+	sed -i "s|import sys|import sys\nimport os\nos.environ['QT_API'] = 'pyqt6'\n|" "${D}"/usr/bin/* || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "enable desktop notifications" dev-python/notify2
+	optfeature "enables Send to Trash feature" dev-python/send2trash
+}
diff --git a/dev-vcs/git-cola/git-cola-4.5.0.ebuild b/dev-vcs/git-cola/git-cola-4.5.0.ebuild
deleted file mode 100644
index a7284e2ed744..000000000000
--- a/dev-vcs/git-cola/git-cola-4.5.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_SINGLE_IMPL=true
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pyqt5[${PYTHON_USEDEP},gui,widgets]
-		dev-python/qtpy[gui,network,${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git
-"
-BDEPEND="
-	sys-devel/gettext
-	$(python_gen_cond_dep "
-		dev-python/setuptools-scm[\${PYTHON_USEDEP}]
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pyqt5[\${PYTHON_USEDEP},gui,widgets]
-		)
-	")
-"
-
-distutils_enable_sphinx docs \
-	'dev-python/rst-linker'
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	cd "${T}" || die
-	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
-	epytest "${S}"/test
-}
-
-src_compile() {
-	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
diff --git a/dev-vcs/git-credential-manager/Manifest b/dev-vcs/git-credential-manager/Manifest
index 0728d6c59fd9..5e5d6a51920e 100644
--- a/dev-vcs/git-credential-manager/Manifest
+++ b/dev-vcs/git-credential-manager/Manifest
@@ -1,70 +1,38 @@
-DIST avalonia.11.0.11.nupkg 14423697 BLAKE2B 220b0e537950909fa1a753d2dc5be1dc3f1eaffd3606e21968fef097e1cd8027479d1bca5e60f5db2705237d0caadf8591a9e079509b14f04207dfc20c2d0b64 SHA512 cb3d093b3422ea99fb1e48d8de327b840b5d37af5aa771bcc6c5448ae1c75990851168d2e22d459aa1f2464a23e8450146b464c1bbc4398742de2ed97448d4ef
 DIST avalonia.11.1.3.nupkg 11997919 BLAKE2B cf78716e92459025843701717cd92c4445501affb3f6bc320dc83510d286788f42f971ee1445f54c6d7977b6eff8ee907ba4bde5d0d57e76440d9b8fac4b78fd SHA512 5b535b64d65eb8aa3316711a7f5a3d4b5807e0f8fe056c2839787820b1dd118d218413aceb5358dd3eeb8cad0c89633236442dc1fb4244321ba1572f74ae8330
-DIST avalonia.angle.windows.natives.2.1.0.2023020321.nupkg 4391179 BLAKE2B 36fd6dd6d9af3d9210b687d1407c61ffa938621137ee53960e04ca2eca44c655e566fd834664b1667d92d0031e62593a593b17c798de8e808665a3f7f1af6393 SHA512 4ec227f1c4da9cffbcccf2273171b51792c52f3e83f2a808904c559563a73f0ad63e6199c5fd82474101e03ac10718aab1877c1b4b051cf80d3ed88d41de7d06
 DIST avalonia.angle.windows.natives.2.1.22045.20230930.nupkg 4554358 BLAKE2B 97c4a59a4c5ba56c7b8c119e18768708559e08a0f25143b4a17912e162a9d936e0279a0e9d969b088190d0fb0b82d2e303c4f885bc695f576b0fa811dd1ca34f SHA512 82bb927cff47738cd13ee87f93664eed203fe0586c807c0fb2215e743b01d787c1ab8285512c82a3f891dbd303a20eb1feb24fdfe09a9edd91d9de65ce96f4d7
 DIST avalonia.buildservices.0.0.29.nupkg 37078 BLAKE2B 3d23f0050f6112c89ce100c3c1b88c04414c095ab6fadc1de74ec4b059e1edd3d7930a715e53c19dd4285ebb634e40f13965fddf81143465a5d056965b4e8d22 SHA512 9485e64c84b087beaf0803c049e9c057216b889bb8d452f0339149dbde65b2c9f1cca2f2b119c3d1eb8c6eb135f582edc72516095bb6be9a2d3b530d3aa3d639
-DIST avalonia.controls.colorpicker.11.0.11.nupkg 241211 BLAKE2B 4dcff36f5497be0f86e17b6c0e972799f36701d16ba621b39ef13af6935be9b247468690bc9d32dedd6e2b17f919b4b41b774c75c5bcba1993d6952850fb5002 SHA512 a4ff391285bbfded3fef57db04302ed275cf6b6234b369fa23ee9a412831033b66452744115bec71477986c87dec4ad7a5540eadb8d4e381e41356efb2758094
 DIST avalonia.controls.colorpicker.11.1.3.nupkg 343964 BLAKE2B f6ee21bdd262fad6fcce3ca6fa2f1b15dbf89760763115710765d99c96be5b334a9c2af70c5c601263c7d7738c1b25a9f4a994e52c498d623036e8767c3ab20d SHA512 bbf8a502cba0123647c5b68097d74c0f2a45aa2c3f145f9301cdf70f015cc2603defecf3ef88b549ddd22a3bfccbe9adf4ce61624293b3b7c4295a528cb91a14
-DIST avalonia.controls.datagrid.11.0.11.nupkg 388949 BLAKE2B 5994839e5e3d0450f5395e18d04c0839cc1dd9fd660453cbc90bb8bf3cc5ee1863167b99e628dedcd81c1f909bdd19996db4f7aeaae4936a5d86f0d2e44bff54 SHA512 ee1416f381a553edb35a15a069be8f535ca31a5d08b1c8fbaa7c84e072703cfeb0bda88d94b35fa18533bb991fa93d761ad70f40f9a5d8753df6a2a01533a144
 DIST avalonia.controls.datagrid.11.1.3.nupkg 568522 BLAKE2B 84399fd0ddf02246fcf1aef11a46f25aa64f1b0bc9f60b4ec6c68a9f4a09d6045a000e9e041aae84e0be4002b912e0ccab3726b095a35acb1428da703a37418d SHA512 93a7c4b9cb47acf4cadabd9d83e0ea19aed9dda660fdc363c7bf64424ba9899b0722497385202032936f9376fa8aee683dd22af00bfdcd9e47a97f62b407caa7
-DIST avalonia.desktop.11.0.11.nupkg 38600 BLAKE2B 9381e6a1193d4566ab2fb52509261b68d7a6e96807062cdd9cfcbc0a4c2b9f5ae245f5d9f0f7da0716d264e73175fdba89eef03313ff3b59251a7b28adc572b4 SHA512 c77ac27834bd40875bfa03c80a550d92baac0e7fc4f640d301b10d96e585e90bc9922f7a7f88a673673f87d16c65ae8d90078314c11d8249a0643e75d13cd37e
 DIST avalonia.desktop.11.1.3.nupkg 42991 BLAKE2B 9933fc4ce1f683fa1b989bc5838d18811ac93c60f65032389035bfd82da8732706cf00dfa1738e5a0d813b62315288da0912319b0818a5fd3c0714b53eecbd84 SHA512 f4eec8215a7634e500918061dc66eb10c12825e775fa5b78408b8dcba54e20b52fcffbe58dff2cea646e4b5333b6bc86dc05f8695aa26a94c484517bc3589cd4
-DIST avalonia.diagnostics.11.0.11.nupkg 231505 BLAKE2B 2a7cde50a2cd61b6e64ce13e7be2c623fc691658047305b9692462255c86bdf5c6f0a8ece0a5fdb522433aba357b47c4bb135fa50a84f61ff96066427295af24 SHA512 580db0ad32c46eae7a53116a0688c23af6b7f0db6483fa8721e27c43133c34a125197081fbe45d3be764b90f77be728f29702571a0fcf6009cb8924918c827f5
 DIST avalonia.diagnostics.11.1.3.nupkg 328999 BLAKE2B 810816f6c5699b9708922c39b1e9ca95ba6e0a7f7c16ff75efcfc08375a8c4c81cebd32c73862cfa988ecc83173b7cf5c4036e06251820fb70a889ae1ff2d97d SHA512 9e7766d4e38a1107a8abbe7fedc852d5106614c4a63b708bc3a4c96db58b7039bc31e6a112effed05aa625b6c84e689ce5f9a3fd79d542c243b865bcbb9b7ceb
-DIST avalonia.freedesktop.11.0.11.nupkg 179720 BLAKE2B 467fefddcd65fa24c16c71c3e89eea7af2067e1144f9fbf116837134dd8699bf84563dfc75eaae7eb885eeeff4ee5d1ff51eee47862590f747a6e80f2464cc35 SHA512 66b9590258d724667060abb22dd47ec511ab709f93d688c4b8c7dca0a1d4848ff9709dcea2b4a1fa21e9b20fff17623f3e5cee8c289732d7e398b655fb8aa081
 DIST avalonia.freedesktop.11.1.3.nupkg 256735 BLAKE2B 756204a71a55194d40262ec24e8f1f1a75bbba02c112be82da3dc25f37bbe6af69224d902cef5100d1758a3dbfd4fdcba293a199965baab120cdcc2cc347756e SHA512 54b70d69e0a73c52d68cb2baa780344c04fdbae607fa6356d3c729b1e33b00e6eeab17cc8f0243ee11d25e6eabf76b0370305efd27cb11a07fd1f29961ddceeb
-DIST avalonia.native.11.0.11.nupkg 552533 BLAKE2B cca2e0a75f17aabff5650df03148ec7dbc3bcfdf2b1f6ce3e23b98fa3d1094f2b1424ea8ca882f2100cb144bf44495c956d2ebb1241f2b7888861ea040ad1474 SHA512 bbf05b54cb3b7d510ac0d5a9009c960743df96152df3822eb74860b7a514c843b8524041fd034b3374c8fda72c64a83530ae746ad41b77e060677c51f3b2cc94
 DIST avalonia.native.11.1.3.nupkg 651422 BLAKE2B b7fa097a900c52845ff309b1435a37494906d8a2fa90bd1c61ad9e9161e9035bbd7acba58a6c8c333bf77b83a612aee48c8408c58b83bc5095bffe51a6ae3bcd SHA512 38bf69666fd1f25312e3d081ff8bf71b56a41496b00289d77eab09e967ab4fc4ce1bc8864f5f90e1e3810d141e6b9d02ba0ee229bf366da2a8019fdf9ed3d0a9
-DIST avalonia.remote.protocol.11.0.11.nupkg 103996 BLAKE2B c7889f861806e15f6e60cdcc5d2ff1f57cc726dec6c0dfe4263877a4ddbaeb41ee95c93286d6bb3cc91fb32aa9b0e9872b25ad51ac59bdb12d3bc7a19fd05689 SHA512 576977894f1a386b8b4bc4275cba3a24c15e6e10471e5b92d69858ea4913633cb25015de682bc72d505802d3582abcc491ad7b525bcac0746fddae59667e7ac6
 DIST avalonia.remote.protocol.11.1.3.nupkg 142229 BLAKE2B 4b48167be390a1af6392e0d53af3ccf4d9e4d45406cb3f8dd89d0ad67457b41535166d66e466a3426167023fed450d165241b5f95ea80a54800d7a9f0d65f488 SHA512 4bd62bf45ad15c0773714547464c387dd298ca748b3e3505b363dd2add867f5d3a9246d1f36142e91370891091047bc0a828841d7e8f7447d33b6ecfefebc483
-DIST avalonia.skia.11.0.11.nupkg 140938 BLAKE2B d2179ec323159b7800dbd9863c06a3946f5fe75908deb581fe1783f212918c5d52d2dcf5aae0af6f371a987234d281ae98509b2210095c084281d2c4074377e8 SHA512 677bfb5e5e230e9581bc9dc1db2433f08879a94b538ee81508aabd59317ad7042da130c7cc0830ebcb6c4359db97e8a5d3c1d081e1207f5d24ea912edf425981
 DIST avalonia.skia.11.1.3.nupkg 219768 BLAKE2B a8fa8b7836361accfdc6a9ea522f076247c1db8d70613b2c94c548c9169a355faebcb277a5545e5483d5d73e304d3152dc979f2dfe8c4f60d18f4965a1025c8c SHA512 a85137f2c7b3f8fd5fd3b444592c57fc575590fc243928084f0c19d5d8cc5da03bfccdd05b6bfd4a9636fabc5f80e0ad3ff3b2cb2528fff45dfaea895106fb68
-DIST avalonia.themes.fluent.11.0.11.nupkg 256062 BLAKE2B 39c770dd6bc94748d6ce4c0f098dc2ea996bf317761e95035a64bcb6f9e21840551d30d67db40a2134d5ce49e416476885e28ccfd110cc07bc4972d52faaadba SHA512 35b4149efe1c42a783417ab4574fd87bc260097765a8c451caecd6a9cb5df4361eb8366014416ee5af9d46eb4a11375ecc021c995779386cea05de490411b93a
 DIST avalonia.themes.fluent.11.1.3.nupkg 321257 BLAKE2B 6f7bb03dd084229d87f39ecc0eed9e368e5ea47033c844e31c3ef649d3d2088c14c57655ce4a0d6d6e87b5a3433dd003baeef47430866fc599dec61681eed3c7 SHA512 6e56332c1c92caf800b611931af87db3028d0148135c4f7bc86744941b045a14bacdda2ed0adc01dbb398820843aeb4b889008d4d5ff0586b9070a1e1751bda8
-DIST avalonia.themes.simple.11.0.11.nupkg 150106 BLAKE2B 8b79c3cca99a44dcc49e85ad9bce52a0d5e172c66e661667f8ae539300e516be48d210fc9f69d826c050ad00545d23f68e97603f1b703b12e788784fc2c68773 SHA512 c2a418e40cdfd7ce7e48d73d2351f0222aef63bea684bd6503d4c10218abdeeed0d95e5aa210a755037fbc0c32eb09f30ef83bb9e4773e42464a57256029da7e
 DIST avalonia.themes.simple.11.1.3.nupkg 198972 BLAKE2B 8831be1adc1c10ee2bf39084190f673c8232eb8266192b735a581c60071f5bfc22275f8e0342b3c292ecccf362170d0b36bf60b972ff83c519c0db37c8eee384 SHA512 6fe59b837455864d1c77c8f81fcae1219ef66af5dd8a2897c96ea8518bba7d20ec0e69c5f76a0085553f8ef087f31c536c681ab21fc543dc7d603a9c15b500ca
-DIST avalonia.win32.11.0.11.nupkg 477539 BLAKE2B 9041bff0c5e6d5493666819496e3fd2fc590a849cf764a3ca0979bcdcdcbef691cfc19bd7170b761e002b865cb1a1f2177fa1a45eb3d49471cd68deb0575e678 SHA512 ebcc9bc25b34863525a6f32d53048d3912eb33324f783bd2a2d53b85471597f86c7f475b5e62a89ef93c1afaf66848decb9ef2d293b1d2c5a088885b497c8475
 DIST avalonia.win32.11.1.3.nupkg 756265 BLAKE2B 7743ccd6ee6bd09404b29a987939e29073391842baa2552667e847a6d4c63e2d1ee5924de036882aa098df87323ecd4760165f09bc03cf3a928ae4626027c380 SHA512 3c51eb1aa1a601ac7103c68c1445d6672a041c3529dda80fc8eb4c3add458f379adb18401d276952a675ea32958eac910c262797fc34a513d5549d659ba13897
-DIST avalonia.x11.11.0.11.nupkg 286486 BLAKE2B 70966ad5826f080e1e513cb6493f75969fbe4e671e4e6f51451634bf84108d976f9dba2adfb331da8d05f839bae9a55c2921a67ce776b6c71033e5cea163df33 SHA512 c744896f31c559293dfa2a75e36581e99e69d800b445ecd3c494833ca45bd64175c2b8dbdb4e295c7d117115add35b7820f07f7390501e04bfd72610376b61d8
 DIST avalonia.x11.11.1.3.nupkg 422657 BLAKE2B 098edd086ac82642f67177edc7255a781f035a4693fb44ac06e9617923236b743a3f8b86e717bed15be85eef012d3a52d51a5b11201284b7d9fd1bad00eb1e7b SHA512 8fade4d8283bcef946f355d1ffa86b58950baa9629ad7425ab5cabb4ebe010f059042d2f7310f41035beb6298b6aa299570a066e1c7923b8ddbdfa4ccbe65941
-DIST castle.core.4.3.1.nupkg 898530 BLAKE2B ffe226762b38773de5d4345fa2e1730864cada0bde31b5f866d30143ace85f5d691f1ced2d82edf4e6e768e63e17fa8cde1c40bf637715b548a3d137d5159700 SHA512 0f1f7403bc737726226aad5a327dd099b9691406958430a266449b96df7aa5ff10a293a32f109cb39b9f289035cf28362fe1f18e7cf1dc936b99f2bc64c447bc
 DIST castle.core.5.1.1.nupkg 800128 BLAKE2B 28c469b65fa9898e0dd87a416b015462db1761f11429654f613541245b213ce62f77257a63770468f8019d635bef20e50e60f620359d0e39ceafbcc7bf88214c SHA512 378a149ebfaa12d00cb35bcaee8806803df7bc75980c9e0c67f36e3e057d6af2abaead24cd8274a9595c7ac74cb9597c9d6913b1125b86e6b156a66f7a1ac2fa
-DIST coverlet.collector.3.1.0.nupkg 2075305 BLAKE2B d393b04b2b66c94cfe127b5c04fab77f251591fbfabcc682a4d4e2d92371a1313ed8c825ffc2e76424687913fc533b315d1e96246ba45bdc937ee07b480220ea SHA512 bb026d43a8098db572492c94eafa3be9c44fe08743a75b93697a91c2f5956196b8a534df15e395190d5d67d40cd6cc5337ef4045ebf38a245dc1e9c1847100ea
 DIST coverlet.collector.6.0.2.nupkg 2243339 BLAKE2B 6c169dee185f31b9b47b2ab042fad4f2386c6b8e5843f208d3e7d878820483d9387963ec61a90ab4c29512889f1a94d9c918d4da450040fdd9e226bafa638cf6 SHA512 9060ec586906992aa906154d05e8af0592b145d46b40cfbbfc097236e81faf48d9ec6a437c5642cc094f7eaff2642dd036d58f7823c65cdf10e13705e1a3d904
 DIST dotnet-xunit.2.3.1.nupkg 774955 BLAKE2B 338a47a377be9bb1edc7bebd765d2d9e740307358bd03ab3f18153f21ad00a7a3cbbb7de0341ae96c0b4355e6f3a41b0e40692d73bd1bfb67d531f054ee0c60c SHA512 2f0ee05b38a7674b4e1826a1284dbf18e2d122ae3f5f741150b318669ad1ebedb03e22a7c5c35d8b43c3a7a1a70ec8253eeb0b74915eb81309bcd998218dcdb8
-DIST git-credential-manager-2.5.1.tar.gz 2189860 BLAKE2B 395e525ff0682022e2cbca37280542b1cdaf0ac3e87aeb9097b5f6d183faca48237641f9ad3860853d4f34d4d1a62099c6747f286083f3d336c87d1e9de2ebf4 SHA512 a7c0f9ab91e46a594390ecc673e747bebbbb6db290e0081f4ecd00215a15823f8a7d37ec06c463fe78d03353ec107057983e8ab15410336f19a035b0f2fef703
-DIST git-credential-manager-2.6.0.tar.gz 2191166 BLAKE2B bdb2b2179ae94bc6ecea7707ad8e42be4db9e816fa4958875a385f2fe54d433cfd89ebac6dc06577bf3418c5f4f3e8f3deef586c0a1cf5606de36a78604f4091 SHA512 cd26beca6130ef4d85637b90342fa934b207e9b4adece2c97800c7da1d3e4fec920adda7069d6b418c1ea4405a29cd7a27b442cf453711f70e41916c1e90781e
+DIST git-credential-manager-2.6.1.tar.gz 2194084 BLAKE2B 6e9e7c171db825a111fba75c28c8f2d2c2d030459302f8d3b4a6567591c6d73df54f121d0ac0e4b718253b6109f8f891e07176d8df056f774db204aad2836f13 SHA512 df08ffcfb9063fba6a8d178d558abf1919a72d5a4dde414e7af1e13304c59651901953fc45a773a5e9f484bb38959f5cf522f64e04baf51947e3b1d0abb5bd5f
 DIST harfbuzzsharp.7.3.0.2.nupkg 1584803 BLAKE2B 66c03bc427576c960ed1b7794dd71bf0909d2fc55d88ea70f1f2c8c88761e9d9dcc82761208f4bd7645cd643825f309d5adfdba327a5767c9ce7ea3694044f76 SHA512 9628aeb042563ce1640a79a2577af8f6e3c0bd0a6b6de89a530a44b21ffa7deacf256c86d368221199811ec7f6f18683383bbfe8ebe07ce4236dbdda229c2572
-DIST harfbuzzsharp.7.3.0.nupkg 1585804 BLAKE2B 172b03127ade1a57620016a5881f747e128ea0f73db170e5b5ccb63e69759536c875baf0a47862278c161621191d4d1167a7b2d8cd562804d5bf7c0410c17b05 SHA512 5d1887b3cdc22334132f8fff8b2ac1f57cb54e9fcd25d21d32f8f86c7c694e86739c067e8b1ae3da10c1b1b3417f27b640b0e7890101ee2d420fba3feba580b5
 DIST harfbuzzsharp.nativeassets.linux.7.3.0.2.nupkg 3369865 BLAKE2B b02034cb2d94834427dda89f29c680fc21b53771c49a3992e293ecbff7b6cff70afee7ec16cfcb63192409956195f3161a18764faee6bd8b7851ef3f1e43bc06 SHA512 0ea026b5cc9b52b8bc44139ea22cbb58d2613b660ffc3410bf90c08aff5fd1c32b71db33602892c633e370fc72af85810fb0128d9c1ca81ddad079c98d160c3f
-DIST harfbuzzsharp.nativeassets.linux.7.3.0.nupkg 3368458 BLAKE2B c9eb05c423490a802d511492ef0fc9c657764dd2dbdc5aa5c9e0a74550eb1a55bc08935c4990b9205ad08922beb78d4b0b0fe5e87cd3859fa0a14c6e16676aab SHA512 48a4bf98b9f59181ef1885a3d4d3ee605b63aeab3b49248a3e49a6bbbdcdae4bcb974073492319789f17eb92edebc1ddf050c5d0724eddc5ea3277d5c2054731
 DIST harfbuzzsharp.nativeassets.macos.7.3.0.2.nupkg 1198303 BLAKE2B 60ab9286633b12f1afbeac7044854b70a40bed27ab942ddadd2c992ced7f59fe036cfc2cdff266c8e7964885dbf515cd9ccdaf5a021ae10329ad0d26ab1963b7 SHA512 8a97410cd28f2613f67cea9236d6f2921165e5644fce5a3fcd05ca11b670fc596ba4b422871ad0792cf59572ea6f05ae68028cb10983f1547b4edfe81caecb1a
-DIST harfbuzzsharp.nativeassets.macos.7.3.0.nupkg 1196900 BLAKE2B 9a6a3388b04da5243e5ab2e08d2846b41e8401f9f8fd6c528efa57ac5af27ded2952f6ab8b81a83d538928f356d293325b6d9e4a1021a2ccdd5158fe54abb944 SHA512 803ace4c95a3ae0c69e30003d3f6dc1b409ff0390b94c37d8dbc1a5321dca74b5d7b2a8aefaab0a792cd47d4e3c2d24e733ed313e0597d80a7ef81b67bc413ee
 DIST harfbuzzsharp.nativeassets.webassembly.7.3.0.2.nupkg 9134066 BLAKE2B 7ab54a0176c82fbd64d4e42959333f8d3fa67021b2afd3822c1eb720772e3dcb802ef212f2e9963b72b1ca83261169d0bbaa2129def82a5bd4217f741facd22b SHA512 e1f9c5b14f915b943b129dc0ac2638cb8077a585431e67607a211534c5fbc6b85ca9d9b441e287fa9b0dda0f04077f4b69a5efca3d3a3c393387649039b5684c
-DIST harfbuzzsharp.nativeassets.webassembly.7.3.0.nupkg 9132654 BLAKE2B e5140ce11cc76c65d5f3a5dd799ec8437872d9a6d122114b4373311ed7400a674df4ba954d8035d33161d94dce41afea5002df8dd39ba0d0b0546bc544c515e5 SHA512 eb0925b18271e435f1b90fabbefef4d01bf4d1443628509f66b4f4ecf8603bba91abac29b3b19a09170f491986c89d7a37d43f854d15379d9e74b27cbad6fae8
 DIST harfbuzzsharp.nativeassets.win32.7.3.0.2.nupkg 2227412 BLAKE2B b6b65f31ff7d97378ca54363c315301b1729d37bcd21ad7b5d5266178ad0cd8ecf3406ee2947908e66360208c30426673c49978cb9307d2cecbbd31c74b7c7be SHA512 88c7980861dfe3dd50e1e4730fa152ba37386def115ed2aee2a859c2bf9f33c9612d750982c093cb9e09893047d0f5bd20168f83914a09c311ebb5c5b37136cd
-DIST harfbuzzsharp.nativeassets.win32.7.3.0.nupkg 2225736 BLAKE2B e8beb066e903e05c926bfb3220a34c57dd52afea8148862fb0637562379cd1b14edc8fed097d4ea368a162191762834be620b23a72d38211eb019333e2dabc9b SHA512 3f477b5cb4d70df1333f69272c885c31dc43118ebf4edc990ae6ea8f29db0a3d4886a74b6d7ad2778d1db6bf7660bf0ae0eb23030c0b9c65710c5baa2389b00c
 DIST libuv.1.9.0.nupkg 1270373 BLAKE2B c20e78a6c8cac53a66968af0eabeb270c84987f2e1e118325034ab07e7d08784c58b60c5ee70b3fc0cae05410da66b446e94b112eda9957bcabce1417394c053 SHA512 75fc28894498f492bdf5db6c599e40059e7a8c5417ba71bd6b4a87416b0f669611f6dd98dae1da4c0b1e076598724914514c87d4cc92ed51197e5a251b94ecc3
 DIST microcom.runtime.0.11.0.nupkg 28122 BLAKE2B 7cd123dc53de44201e691b808212d641fdcae4589dbc598a4ebc3491284044881b5bd4cf805dffa773f1c0cc12b14f1df853490a92e50e5b9c745d4d7b9a2111 SHA512 c00731176e34ea7b936ad58a38639843c790b027b714ed5d3ea828b85ea94b14a502ded52ca7f60bb10c0ac0e744bd6e62fdcce0108ebaaf9731c408eece031e
 DIST microsoft.codeanalysis.analyzers.1.1.0.nupkg 102426 BLAKE2B a0b94d8d6036e8d1da75d12c60db77f5166aadb04e179607ad850782d3a602a62f3612798120ba29edb40588ccd277f1c400f87887c42933470eb7f5454ff6f6 SHA512 12d7a033ec66d072c9249677fb0712446290991a587b180e6d18ffef0eb97b738443fe69098370984ee56eba9f6ca0bbe57d11ac59d41a32d137c7f9a6734aac
-DIST microsoft.codeanalysis.analyzers.3.0.0.nupkg 887910 BLAKE2B 486aad9a22a77f4dde4fae3c5521c2fc066e9121aff7c7557af53b72469318fb0c16c30ccdde853fcabca3c493d9ac1297a00d7e6445d83c65e3618ecc94a15b SHA512 4c9e880c1c84f79b038c065cacbe090d50be18bda894904dcf03e030cee960928a749c16df849766f06a77697b90ff9391cf6b31820dc5762aad8ccffcf43e88
 DIST microsoft.codeanalysis.common.1.3.0.nupkg 3145733 BLAKE2B 22695ee9f2a6cd1bdb7f9a68fd9d8c1c8610580eac96b1f031c11629fdb44ebde10d3394b70af4dfc798c9e3dbd658a46af3c9abc8308eb8f5c03c53e653071b SHA512 ae29716477d0f7a34fc43298a8e71685362cef144def7d1554dcdac5efcd49686e8e03aaad411d972ebb087bd4529106683258ea201826d81aca1b8071ab218e
-DIST microsoft.codeanalysis.common.3.8.0.nupkg 3740041 BLAKE2B 2db6a9ef5d5c16ef456276498354c500d81ec09d265500b0451bf0fe4852cf1965d25f070e2410f32f0c16cb75ce403111eeb8bcdf06faeff0499d47db29716c SHA512 b5be5c0e92aef06fe9a117b0cb6632b100f5f2d52445cd6ab6aa290b6c45237e6a55dfc3477b5559cd44b0b54f2ef4854db3870ed35b93c53aa78aa1c493d97b
 DIST microsoft.codeanalysis.csharp.1.3.0.nupkg 5754312 BLAKE2B 6e1197a35a17c6c81dd58fe787555429a2af3b3bd832b951f2434e565704d8cce6f10692c79f21b74ad66773c60e144bdef7bfc4ed090c650534b30f4e68b2fe SHA512 1f08f8902b8e21c0e72ffa7d40946a028c843e1a1d510f9038304a2a8c7feefb2dcfb94697210ee28cb98c3283a06cb45751458f87e5c6fcb86fe02d1e4113c0
-DIST microsoft.codeanalysis.csharp.3.8.0.nupkg 9204716 BLAKE2B cd51c5c29579ff55a20d92762c9e933bc11014abd261759744da14d091bed3ba4ce7c018e2731d75ab0f475c3d58c60da5fc00e28b450db6f920a015458c4e66 SHA512 9d9c0575a9219e6daed7660e4ab6ef0d7ab2dfd6bab3a436400a23d3db119c46f237c04fa8359dde8f9d4c593ceb1cd694c2e9aa001e5d4075490b0e08c665d2
-DIST microsoft.codeanalysis.csharp.scripting.3.8.0.nupkg 306322 BLAKE2B 02abfc477e53bca397e657102eca88afb646a0baf40ed556cfccbef050eb71ae8fe266d2f8b58ce66cc95fade71ed4c5f6525f136f3dbc2748fc70d29ebe6d92 SHA512 e76771d3c4c6a32d896a4b5304b64078098b8027d3ede1810ab8567e89799d138ef9359304cc6d2057a08f2e3d6a14f5bc15fd7b75722ba952f179edb2daa323
-DIST microsoft.codeanalysis.scripting.common.3.8.0.nupkg 478765 BLAKE2B 2347a9c64a282746674173ef25476e059082904445c581dc52a552d0a6ab12fedc2c2b08da71e9886f824daa32dc5d82c612cae8a8bf98e2f91a9b195f5c2a4b SHA512 e2b6c33af7fb275e88bda7dcc5c8b3331261b1295d590a7602ce0af9e0ce387a4dea9e29896c5bd1460adc9c1be6ba3589fe0b8161a82dafdc0702bbddf237cc
 DIST microsoft.codeanalysis.visualbasic.1.3.0.nupkg 6956584 BLAKE2B e2f7f898c319742e71ee02494c3fde394dfbc1773e597892f558804f322cdcd01f803fb48f80fda82ca168be0526c52fb692e3b30dac53f8d6b704af15c984a5 SHA512 141b616d7a6c7b533083271d56ce0adf23003c3328d7637e31b09a2bdd33a8357108555be7926d6486671a1bceca059e0d90bec8db8588d9673b70b1c91136c4
-DIST microsoft.codecoverage.17.1.0.nupkg 7323516 BLAKE2B 180dee79c4e252fc066ba9d15d9cf5f0267668d3c2f31d8bda59b13b263a7fbaf0ca26700cd04e3dbaf84f24d56cc8ca03ee1cf8c51fc91ada47df2a432a28c8 SHA512 385d2c29f2c28f35f438973182f5c48b33a18fccdf59ab9141b6fd8138d114d493bd7fcf7a33448022445e07ce5c5332b85a914aade079656c2a34c0e761c7e4
 DIST microsoft.codecoverage.17.11.1.nupkg 9139653 BLAKE2B d94c2b63216980d3e40f651004de73a8b704677db8e00d6b777bd699847bf4e9991af08c3cd9f1ce93d95a34c0599710d908f95cc8722fca074a41ae73b21bdd SHA512 649e02875bbb01e988ccda5cd016cba32b09d1d26295d22f0326cbdaf0547dbaa1a3ce8dd95ab35fd3c635cf5af697a667fff563a00e27b489c62fe90af2e11c
 DIST microsoft.csharp.4.0.1.nupkg 462346 BLAKE2B 209ccebc9103b803d26ea1f0232245c3cd231078b03a83a0011a2a79a1a8a324a72c5b3fda94b2686fff170932f366e165f81a36a70df590a39c45d70778e4be SHA512 c0e75a9162f28ba4c4572c8fac4fd4c8c97d6d3505a37683646ba5f7e5f6ac0da69d5200d2646054de90e8e08f893a10e514591b69b8273640842b2cf90bddec
-DIST microsoft.csharp.4.3.0.nupkg 462324 BLAKE2B c6cbdfc136e3895429e8d941ff1fd401f2a6652249c920f98267f4c454d6dc6c148d00cc156d904019af16b6f4b3fe6c308146a08a52c477e16e54cb1d1489bc SHA512 30c440b34652c8af000557a50286b75579dd5311bf5b9da24e8e572f46a311a747cd46b7e0279607010f34e2c5ee8393041b536366c0770aea8a97c101e2d91a
-DIST microsoft.identity.client.4.61.3.nupkg 3304870 BLAKE2B bf82dc7edc0473d55038e33ee45bb3b303f22a06b7acc420e7adef5b6619858338fa785ebc3332d8d9530690b96e5ffa08221b7254cda86aa4da43638352636b SHA512 80b625744cde675b39f36ead1171d9ee6fe27e636e429127b08c32f53ac52eff5b2b81954424bbc09c1f93887748aa52b40530485f35094c674057201785fb1d
 DIST microsoft.identity.client.4.65.0.nupkg 4034890 BLAKE2B 2f7974b83c151bf2dadf1fd5170bf574c3720e41144a8d31afac3426f77227d78348c12f2efdb86d44a3c01cdcce8261cf418ed617e1b1daeebea414233189b4 SHA512 a4dada0d3e1f9e2362b2924181dffa724c463b39ec480043b06beaccbac50c0b5f2f95540a80b9e85d73127a5f5eff883849bec5df7ecfacd45d5c7950be271f
-DIST microsoft.identity.client.extensions.msal.4.61.3.nupkg 103864 BLAKE2B 2bf64c02525921f619d4e897679fd8b82dacd0f2b246cc5fc7a4b5ebde6a4adc0b65c0af55a13243c2fc9dc34f36155e42e0b735368050ce92748ec181ac12bc SHA512 dd2b40a501281d5ba9452cc72f3d5881a2b4dfe2f44053cc7838fa1494dacdfb88b21a20ef8b1883ea40510456c48389a45548d9f30238e86587198470f39bd0
 DIST microsoft.identity.client.extensions.msal.4.65.0.nupkg 106536 BLAKE2B 7f5b0005a9222a51ced66072f8a079f8c22f00a64f7a57b3584f73461d3514bebe1ed32392403ac2aad0a938815f325887e2cf2fde56b440774a44e86ce3e982 SHA512 0d387368c6473fc9e9fb086a7fbebcfe7966a449a55860e5e449831a57520a9581e21215a8050313fb40bef2352ee2204487680589c09137c7b25e1231bacac2
 DIST microsoft.identitymodel.abstractions.6.35.0.nupkg 108821 BLAKE2B d1bca6db2af22cf1af9febebb1f3154b0c5e26e81f9f45a4db271246893869bcdd7f7b07aed90f534f204f36b7fda00b2962bd7bffb06f4e3a7652af4aced6cf SHA512 5549d4e6c222a47761c18243215161ae7be31efcbb26179a1e1a69e65c60bdeb61755515f0485f2e89a320c368b8a92e9f66a3d7e5d21df188486232c4d9e102
-DIST microsoft.net.test.sdk.17.1.0.nupkg 40382 BLAKE2B 920cc0c21b9646f9370c0ea321bd96ba1ef8f96857ea01633063e19a4f0cd48130abc62cff65e662344ce53194a77ae33aef9c187b118dc77625ad8635697632 SHA512 9b3e18fe936d2f2dbbf33929a9a83f89ac6a680a59d3f90b7c96f0323207f10b71714e42272651af2d93316bd659708e3cff14599f1042c76cbeae944475bc64
 DIST microsoft.net.test.sdk.17.11.1.nupkg 34301 BLAKE2B 94ae92b39b0df518f67cf73a6f5d701ad65a1daf0352d5e65b6c6c43ddfc4a981df6b3a79ee96d6f851e7ab88f821543bfb113fd38411e044e5d06b65a0cf15b SHA512 93750bae9cab4c72a155e2aa745c225033b0a8a551b554dcca399f2aa2b0fcdac81c9e789a44da1a553901151a9030bcf785f5c13c97b5d9b3cda0d9a9e96588
 DIST microsoft.netcore.app.1.0.0.nupkg 17356 BLAKE2B 8144d7867739e8da6069353339c4d03d670a97b9d70538284ab63e6f0462e0e316c9cac59d236156328ef751e7c1ffd5f249a366891f789bd8e175ce6292d0aa SHA512 a1158ddafdb4d391b426c35a7162cf92894f9d3cf364666efe9ec1aa1dcae45b348bac4c99ecc6d13e9f0043cdd352506985b31c34fbdc2c521adfd01cff19e4
 DIST microsoft.netcore.dotnethost.1.0.1.nupkg 16977 BLAKE2B 3e30d365fa0e0ff1e9420d1ca2383db89017ecb95a84aedc594f16ab0c6d1f1f6a4f76324d6dc1db8a73d8b1a221b4708542f12b073aea37a4090f4c45a153f5 SHA512 7998499a697f483bbebb7ba360e7aae3b03edcc530af1391a009c648279566dfdced9720cfdc0466a13b9d15ec349402fc1b3e6738ab0fed64a7018e741e9d1d
@@ -72,276 +40,133 @@ DIST microsoft.netcore.dotnethostpolicy.1.0.1.nupkg 17064 BLAKE2B 79dd4b5796bb7e
 DIST microsoft.netcore.dotnethostresolver.1.0.1.nupkg 17025 BLAKE2B a7faa8e8160c339c9e0da1214e8baaa38a1300b5ca8acee835d7193da2088c9b3688f2274988d5bb1a60e2515bca3b7b92ccc6548cf94f6b0eefd72e6fd6f849 SHA512 dc32b37174efdc173121db21bd26858992913f0ce7a7c9e6c2427aa690fb6494c69cb0e911ff5950a7994b5c6a86961fe9a8e8291a5387de1f926ee101dd64b6
 DIST microsoft.netcore.jit.1.0.2.nupkg 16774 BLAKE2B ac03120e9ec09723f4e016e903cbea68fc24d00d2ea030fbb0e184f8a1b4bfd8d61313c6dfbe05e3951e843e472608b6d8d7429f0bab539893c1db1489d9ae4c SHA512 6b7ff88a95ab3df176c61b671509f964b2d6212ef5a96cf8c1ec19eedc13bba57d65c4b87c3923fc8ab981a7dec04db83ba498061b823a09958fc2742926ed84
 DIST microsoft.netcore.platforms.1.0.1.nupkg 17876 BLAKE2B 13250226ef4869ad62b8acbe8b8f791f9bca1932562cb7a7e8162c3fa502c02200673cc9839f79953cb2d3a75f64f92d43ed1dcd9081732e4917197483188163 SHA512 5f3622dafd8fe8f3406c7a7ee506a7363c9955b28819ae1f2b067c38eae7ab6e620eb63442929b967c94fc511e47a2b7547ab62b6f1aafe37daa222499c9bb19
-DIST microsoft.netcore.platforms.1.1.0.nupkg 17960 BLAKE2B 6a9fa22d75f5a1c65746dd71a63c3d4e37c393e99c23007c10f5ecce248a04863bf26e7562c7751177a6985eaac266c29cc6a5443a4a853e773f88994ad2a3fd SHA512 6bf892c274596fe2c7164e3d8503b24e187f64d0b7bec6d9b05eb95f04086fceb7a85ea6b2685d42dc465c52f6f0e6f636c0b3fddac48f6f0125dfd83e92d106
-DIST microsoft.netcore.platforms.2.1.2.nupkg 31064 BLAKE2B 6b28f015a1c3c2dbad93fac315a896c4ad116befd618f28b89d451b92f2ab642e414bdd372f46858daa52e72978ad6e4862b6a431d121e331296b0f6a08a1c02 SHA512 ec9eef7881fb32eeb37389655a733b611813bfdf84c3e2569240e3d0aedc11ef30b8503a1d1b7a493b70bb1da0faa8e90d7798796b0ad14437b8881189360722
 DIST microsoft.netcore.runtime.coreclr.1.0.2.nupkg 17068 BLAKE2B 16aa55dc072c4c99929fc6005ddee2d2944ad16d431d13521ec64b72150058d582dd99c34ee1ac03ea5dda2550adc574edc3fed4e65ff9dcedc807fba14e9dc1 SHA512 53f43d3d75fac3e899d67f70d7e7bcf1e51a115d0595ec49ba3a409b048290a1e7f6d692e264cac3402460a0b696c89c3a10db1a33ec08852e5305c3a4fdd21b
 DIST microsoft.netcore.targets.1.0.1.nupkg 18189 BLAKE2B d43a064d4c6f836be5164708ff0401913b32fc3340cad7c8fd08f421ea553805ac150a134a0d60a55d41eec124514a5e5197eebcc85aa6595cc6b91e33025d61 SHA512 6ed8e75f945a18651066fe9ee31cf6c8257a5974340fe4d262438903c4959a479f4a515a4d1389e6d3d3ab34f09a3c7bc2009aada2e8a7f697b6655a82d3bfc9
-DIST microsoft.netcore.targets.1.1.0.nupkg 18162 BLAKE2B 419d19e0da934ab4b9db75dd66cc22b83a003f34e93cf7a92feccf4f32d3d695e18b826b1aba13073dd4ec53aa7905a67346921d1055516647ddcde0d79009f1 SHA512 1ef033a68688aab9997ec1c0378acb1638b4afb618e533fcaf749d93389737ba94f4a0a94481becdf701c7e988ae2fe390136a8eae225887ee60db45063490fe
 DIST microsoft.netcore.windows.apisets.1.0.1.nupkg 17111 BLAKE2B 617169cecc24f0b79a1ee6f46bf70eb7cc9f5a0260afbbc4fd91f6c73caec4a6dda9e9478a77badafe6d184ec38bf7039a990f516d8d533b8580fdeae25dc746 SHA512 dded90be87a317a63be78ef9920a8a8d76c80e3466cf3aeeccfc4d795d5e2556a119dd05efebe6dedcc37d6d7aacaa2644ebfbda6c4f6b541f4cabeb9cdb2eff
-DIST microsoft.testplatform.objectmodel.17.1.0.nupkg 3191688 BLAKE2B 26be3f32f39257044cf0947aaf68b486befeded4901e5344fc7d1df1bba1f8d8e564d310fc946e5d5d4b3462aba1734bb44274f6f471bc27f1a493e2e0480dac SHA512 fb7333c71906dc2a13a3bdb33363e926d0c6066addd1ef43b2b5067a616b754798f32f515cadc58bc2a9c6e157c05e6d36ef79bf602e9da9b37089644933240a
 DIST microsoft.testplatform.objectmodel.17.11.1.nupkg 1660096 BLAKE2B 56fe5a0804398596106d2ecd5318c00e8e1f869f321160ffda0635b78c270934fbc2b85264792501cc571ba821f2dcce19e77c717e087a6304746092823a9ec3 SHA512 f6127a19b7f721a3f038fdaa81d00360b124f4d5ed02ca79cb7b330688007b4963ef3681594d27f06882571a492fc45aa0f79ee3aaa52417d972ed73f4342000
-DIST microsoft.testplatform.testhost.17.1.0.nupkg 7692160 BLAKE2B 4df352512bf2c7ca38e3fdb351dec4e7c9307bc88d83e242e34a1139a8f37fa60e0d4af58cc52d74ac0b82b557917c90057d30a83b06a5d8c7e7db17771bd285 SHA512 c661a1581faa059af1886e6dd2d02fb4d9417655758fe73c3dd594f6c6f944ea1a81921379fb02c5832a97c50f8124d0032aa99130bc204481707e76d47dd0de
 DIST microsoft.testplatform.testhost.17.11.1.nupkg 2882099 BLAKE2B fa222efcc2d92358df360c5d9093c678fc7c0489e90749d3108f2bbaf89e750df3c4e9b3163569ecd81402775056ae46dd96866bebe359fa17d6409d2560249b SHA512 75e4476514731d459b0aedf56a816616df6a7a53240e6b81b202778e0a90b7c284223d93c7447541eee70d167761417ce1818808c5cc05df81001b56470dd6c6
 DIST microsoft.visualbasic.10.0.1.nupkg 338094 BLAKE2B 9ec325fc69141e52e446eecd2cea1f4c4916705f8ba3bcf955c74b5828ec9aba13fa72194242c94d47ec26722cc75eea7554c3ab0ebbe2b9addc3d002aa5b512 SHA512 6ba8407fc013e5bea5614036f889fcf2983af3dc0a74a42d8d20498f9146cacba5cb7c236399ef58dde9c0a3612d0d95e8ab43fb42bb9fa427895e8d68dc8347
 DIST microsoft.win32.primitives.4.0.1.nupkg 63261 BLAKE2B cdb464bbbe34381e16193cb797776858b582db1530a88556f932e8bac1c065611eaf37405c7eb5369de2dbc31bc50579fd7d3564674b2e3c6d921b565ed3f449 SHA512 382bd3a66349e077fdf622a69a2d9e2a07d15143cf238f4fa21c74f2c1e5592f8ba97e6fb956c1c69ca0cf4eba91ca4a7d3c8ef195289c5a0e95bcac52e794be
-DIST microsoft.win32.primitives.4.3.0.nupkg 63333 BLAKE2B 132ec29940d4b716110980c4f9a06ba15183d29de638379d09998124605165e51652b2727e3892b57dbc7cacfdc71f9e1b59c9dd5463a524657351f5385d896d SHA512 366f07a79d72f6d61c2b7c43eaa938dd68dfb6b83599d1f6e02089b136fa82bec74b6d54d6e03e08a3c612d51c5596e3535cbc2b29f39b97a827b3e7c79826f0
 DIST microsoft.win32.registry.4.0.0.nupkg 183394 BLAKE2B 5febb98cf99e900b73158c90e850c452bbfcd41131dbd76a4f4ee1ea7717e64f9dd02cce394e0e3b673630eea317ec3ec42ff96cefe7f1abf9a7af32b81bd04b SHA512 5224a9ee54f11adb05e89f7ac3012b15e3348f2823fdb5962af6eac2d44fdade8ea21813ed3093a63bd0d7eec32d02c7dc347bd22ebe791197ff2f39585bb3d5
-DIST moq.4.10.1.nupkg 534500 BLAKE2B 52563761731e569b38e975007b4f346e634b539c60252b15678d5a14af346615ec8a5976dc40b7fd9b0d3982c5be482818a29f03fc3997f877542f5407ea9247 SHA512 6e1207f634bc16ecb9afea7bfb2d0ce7045b2646e13dbb1a70e00577b856c2357cfdeef5cd939f837dc5545dd1ec7fea393575bc4ac883ecd29c6973267d6c3c
 DIST moq.4.20.72.nupkg 646905 BLAKE2B 2f8caa57893d2f4182d6292bd61783fdb6953007ed3f71c2e15169703181847193a94b2ff8351d360224b1f8d06e864e50e5513ed7a9de2f73f8b3edbdbb75e7 SHA512 1de2dd00acc57b61b87d483eb546b55917ff3327bdcdb922bf9ee31d149be48562ec65d53e059b6c46943fc49a3a9b78dc9245465598f4de58ae8df6fed811a5
 DIST netstandard.library.1.6.0.nupkg 17404 BLAKE2B fba4c1e7a034a8fc5d7eaf051eda3c11aa4165c32cf39cfb1d5f61760fa646c92d9495f99e00d6f8482ffbf702449a3a9f6baf2f555167a6c359c8e418ecd5c7 SHA512 9838af4e2a3621de24d117c7fa58e5e8f170e50ea4e0ae3fe3d3401dfadbefd6eb5ecc3b64532c8340f6340727822eed305ef3bc21629f2bb6d76c639d054925
-DIST netstandard.library.1.6.1.nupkg 17360 BLAKE2B 02badd3473451f83997f0b66d05f1541c741e65b9127b8b27ab391260df7939f235eb6648b11c7c11cc5400489ddf1cd26820b7bdf6fd9f1d8f0dfdfeef96acc SHA512 0972dc2dbb4925e896f62bce2e59d4e48639320ee38ad3016dcd485fbd6936a0ed08073ad5eef2a612dff05dfc390f3930fff9e79d87a06070eeb8128277cbd0
 DIST newtonsoft.json.13.0.1.nupkg 2065787 BLAKE2B 000c38ce26a2a00bb25a9c1d6fb069ada521ff089bb624a5c1255b25767c10616cc51821524e7bc3d8b45eb8f8ee54c97454db1db9ae5e5c78eb6300a99f979d SHA512 83731b662eaf05379a23f8446ef47bbc111349dd4358b7bd8b51383fe9cf637e2fe62f78cea52a0d7bdd582dc6fbbb5837d4a7b1d53dcf37a0ae7473e21ee7b1
-DIST newtonsoft.json.9.0.1.nupkg 1613054 BLAKE2B 56918db57c3786cff0548b642195521ef203246a6b2ed010186ccae230af3b0c913ace4b2a3319bf94c6e47647b9c5ad7b017e3b50d35e6654b4d5b987643739 SHA512 da8917a5347051c8106f4ea9bade4bc300a3b60a05a3be3390f92c8dcbcea67223c7b4da8065b9228042000e25b99c75fad7e2221a0daa8888ed8ef3c161b228
-DIST nuget.frameworks.5.11.0.nupkg 217001 BLAKE2B da1d47fc7a368b03995b311848aac87b5f0336182bf8479615e56042c363e150f3ecbc0a618ecaaa158c682041fc22e3b9efba9ff72849051ae996be6787b2e0 SHA512 1b3b1ad7813654c84d6c0b48d81a60c2eb060307693d993323cd563fac5462b1deba931a1a59e07b67e8208ca42d62a1ffd66349d5d34fabb2790484ed854944
-DIST reportgenerator.5.1.9.nupkg 13851715 BLAKE2B 8eba0774bfd82f482b4dce4465efb79537bda974b6fa68369998963ab01db65316f9f006c82164d878ccc7e8cf9bfc33fd15706760d3e25dbb621d7f8ec6b66c SHA512 c5a9a113d508dc4e4f72d74c9e1263e82a8248fe36fbcef9e94f444224d0136a2457619d6b3f934bdd359378d30792837a52a4bf3de266778fe4555109b1bb2b
 DIST reportgenerator.5.3.10.nupkg 9720716 BLAKE2B f1f1643584d8f74c162d28024534b90a3e635350d8e8d856c9b231ec6411abd6b6fd4b5e017949b07cfd26e46f9cf00caf21af2138bc14bad4f8bed4a9de980d SHA512 068c5894ba3e4447941f3924e6d647c26ce98d0d3f7c1e7d18292dfbf07744c3707f58043551bc72abf7460e9e44c1efedad86c102b8d857c9259fe583ec7a75
-DIST runtime.any.system.collections.4.3.0.nupkg 107990 BLAKE2B 802e2ae919a4834150d825ac086d8f47e2185e31b60b45f3dbe5f63b1d714953d9faaa7d8fe4cc25a1ea8495c4f8fd925bb198eea0b67e594a8558238b18196c SHA512 9f8833176c139b71a58694ae401c5aec209a63227be07c7ab559bef772082bd1f6cc38ba2949cb1c8e5c5514ad9f4ff51859838dc2f28191f8bb7ae611a50239
-DIST runtime.any.system.diagnostics.tools.4.3.0.nupkg 43707 BLAKE2B 33d1c57eb4e50c06488da02ab2bb1b8dba9948026053e662986af05b74045c014e76815edbb588f10d6a904de22e4c50177f31f3fac36d159b9af361a4cb2b62 SHA512 bd257401e179d4b836a4a2f7236a0e303ae997d2453c946bf272036620a0b14e85e5f42c229332930a954655ab4cae359d191a3e3d9746df09535a651367764c
-DIST runtime.any.system.diagnostics.tracing.4.3.0.nupkg 49844 BLAKE2B e35998e1369bacc9fa90f74825e021c62b9c671ac9b7cfad4e9b455656bd40e968f348ba8943ed670c74c22bddb1c94ccf5058885233607e3c73a5c7d2a56688 SHA512 0b480d21e23c38965222be7fa1e1a0c7e444cebdf400d1db8d3ac609f893b82d78c5d8b271da61808b7b179dd6466a0090bd807fc2d35020f93a00f0213bb436
-DIST runtime.any.system.globalization.4.3.0.nupkg 43718 BLAKE2B d6f90f72f080afc0dbaaf487e2966d2569ec8dd51d573ba2afd1d705cc8c1f5d47ea77beb63ffe4fbc75dd6aae869a9b52e9e293b737ab32321420f635113d80 SHA512 3aac1a076212fae7d0ac81d2b5fdf216b064a1d890577307f89c9a4984c239838c3bdfac4dea052027de090704839319231eef49ce542f3e8bb2f85ba23d28dc
-DIST runtime.any.system.globalization.calendars.4.3.0.nupkg 43456 BLAKE2B 6453e347e796d426fe00afa28c182e53d764e58e52a21eea8d71661029608de957bcc9a6d9f073f2897d4b5d601f1e056a8d2334fd7cd708461148549454fbc9 SHA512 19053b502b7160af6f6b0bc5b334a8d124f77f6b4418993294fb485d0bb318cd6e97cdbda9bf8c9927366288413cad7209c9d8156a5425a6320c453a8804fb3d
-DIST runtime.any.system.io.4.3.0.nupkg 54553 BLAKE2B 0066bcf13ad4f769cced6704e3d5bce057138e35650699df8c84fb67aad1dd0f2b9ac62eec023fd1b2845e3e2038d1a56602e0cbe59795219b34b9b47d0aa880 SHA512 7e0d4a238322d434a19afc79ea988d3727c1687fdd5bcd1c4c39cb6201073caabb924cc201c70545d60acf8b94cde8b783d0c268743e040c357d100677e4c5ed
-DIST runtime.any.system.reflection.4.3.0.nupkg 43499 BLAKE2B dbfed54ebbe3c7814773dc60e586bc6442024c4565dc7579c2a3dea9ecb7fa6eb554bb7d8da7d2603fb455d38caffab9ce553e6cb82f8c6202700e2a3c80d6db SHA512 293d3dd8be87e1c5cd76ece4ed64ebb5ae6b50be95a39bee401eeed64355e34641905f8c14392fbc3acf8609f5d6fca731f39ce7607962eb5951f09516480015
-DIST runtime.any.system.reflection.extensions.4.3.0.nupkg 44123 BLAKE2B 77dd6ebec2090e9902b5fb9a0505d07f953baedf9ae30bb823f18867b0e4096af08175203efc2205a5439d53eb264b085615978c782969ac8e051b5c7ac8b516 SHA512 8de7a4c53fc0324e766bfec360342ee4a4b99a5975a9d61faab0a715ef71ff97aa83383a5a8affb354c02a4e2fbbb91e1b4ae6b282d2880108cb489f06aba500
-DIST runtime.any.system.reflection.primitives.4.3.0.nupkg 43106 BLAKE2B 9be774d083220f790c2710bf0add5f186c30da37cdab7abe6fd084e8b3e43926350cbde084ddbab58295b9bdfff34f63de6f24d72c9333c8f0dc0fd6b04b9ddb SHA512 a2f374276290ad9b799d3e49cd8fe7839c07b52f22894bcd77b9470841564319fb2ebbd7503e76feef42db4e8a362af8648cf0842a1cb0b5d9a60a58ef8b205e
-DIST runtime.any.system.resources.resourcemanager.4.3.0.nupkg 42939 BLAKE2B f0a3df9518b008cdfa62fa7b7aae3d419bdd8f77e7b400cd06f03bfd20d2ac7abf570b26c63ab32329cb47f7b9763db786e4e397ad958dd81e55d9ee8926bcd0 SHA512 39fab03cbade2b3848d62e137313530c06b37216e24cd58c70ed6ae54bdaf9d9613a3b410375ee167c87ff935a558b1f8766ee016b8b244fde99c38fcf42a49b
-DIST runtime.any.system.runtime.4.3.0.nupkg 55302 BLAKE2B 2de44260ec821b818b3c0cb3517be7ade5c16f29e0ced086460dfabc29479743947134214c037df83b9646724cad004f55c2f518cd4bc2079853f2f6e1cd70fe SHA512 bfee3c68312296860e5459af5e770c2e9fcd4ac134361fd569a9ce1e6574b9ae3978aad403f89639a4b5bac8ee5bb0ee1b8edb819e9a60f13ca5bd1812889bbd
-DIST runtime.any.system.runtime.handles.4.3.0.nupkg 30945 BLAKE2B 27f615ec387f75416d05d0d545f1f90bda9cd7ace1e7370cf935735ae7e6ecec9c8d54b0b267aa42c041981b7d4ff22603f8a12e18290e0f354e7656f4271d81 SHA512 95cdae2867a2182535bd0f4d01dc3eff70319dff044b070ab7791fa2bf8688a69b00a279ed569b7f0c5f3e26bf705303dc344ecf7d1ea014c579436d8e7b7389
-DIST runtime.any.system.runtime.interopservices.4.3.0.nupkg 71496 BLAKE2B 56aea647e26b0b6fe2e8786732100a20b66dcda904df76d0463c5cd048d842e9899be7482f819bd8d4a62dd6b8d9f2f8289efa99ef6c76d2cbfd0fabe6c5b36b SHA512 70eeb2469726d092bb95568e51ba5cfdd1cc07a9e65077e2b6dd5b7c8b164d4b45c749ef4a52f45928f63a27e8accdb83b861ea73c9ad3d42dc38e6afdbd0e8c
-DIST runtime.any.system.text.encoding.4.3.0.nupkg 43396 BLAKE2B 99ea1ca2da0e85683e240129d4adba28eee337d0a3ca937b61123d775255f738b27f00db4b08e1fa9242bf29ad916828552639ab3b55eea05e0f307bdb1bb58b SHA512 cbe6df98acd50e2251d3343620c408af56cfe7c1979277a8ec65b5eef093e93ed93c05980902a7152ed83302d5a625d7058921baa7f446c5e67194fa4c06f20a
-DIST runtime.any.system.text.encoding.extensions.4.3.0.nupkg 43296 BLAKE2B eb16dfc6e2fafe299fe49dcc5cd1d2d18180d18caee2b0e65fe5c75b6b4206260e18f4e2bf509fe1d2dc3366541bb38de219929db6e7e12f08b64b3a5d3abac3 SHA512 656aa8bd9d7e19534964ac7b8405615f00359779e322d4cfe1f18c132fec4a4f52c5588bfe61cec9966a9142a73315f5d2b9e5a7c524b418364f0322b20961c3
-DIST runtime.any.system.threading.tasks.4.3.0.nupkg 47940 BLAKE2B 950e0a58dcda7dcb15167d028380ae4ba1ac576b141d95ba8eda08e0d346a9e0452e64ceff1169959eb9f4435231466be209fd6e9d17f8dae05254443f0ffe1e SHA512 5f37a56f5d6c7fc198c7ef76b822b85284f9d7d1c06583c26a698793ade65da1b273d5fb03c20be1eb91a9c835f7122ad2775f4e51dffb2758fabac2a30f8c23
-DIST runtime.any.system.threading.timer.4.3.0.nupkg 43098 BLAKE2B ed9d0f7aa58934bb099bc750d7d433cf82a3b54369143ae4e3b27178213ae3d3c79c17463b2a4a2f1dc2e55a9130b7a8349c0832549a404b82c2b08b9016e9ce SHA512 c0a1fc3661b4e21f329f88a8d2cbf7152698427778add9f850476fc9abe7cdf9b86df79362d6df025f7e15d53f5eb7937d8ac49bdef13fd9eca973a284929fcf
-DIST runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 44390 BLAKE2B 60483871cb9b81514f5b63f1f9ab9cf1c7a6ddb1d33a2a65608b47a2cf8cc3b7eee8e087250a1c49eb2893f36f29410e897387346fa4c3fc5c71e41046f13673 SHA512 b2cf809fe50c4b46bd6f2372265cd3059622550123afceb5dbb2410906c07a7f47bae4273584d29253d5e7a63a17c68c7ba0434608bbc8fd4d00e479b2f128ff
-DIST runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 42827 BLAKE2B d2b79a9b83e0bdf569a5c333ba4f86ccb1d5b532d2e1cff3ba7bb597688ac78268a515be4c35a025c66727070100634a4bc946e02ae7b93061be968fab241bed SHA512 fd8e32d7d3e9a465202e391b0ab8b95e212900879bc4d8ac22954fd2d0f98fa579e9d25f88885ac2a4bf1eba755db940f8d131250a3ffec34dbe77431a379cab
-DIST runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 42833 BLAKE2B be9197f3008b3dda19a45e5b5df2ce3604f58a98045a122aa77f082708de67ad953fba761c39ec419e945155ad74d5800638feb581e5d84424ba104f32541640 SHA512 4afac5cc1734330a6103880e790d639e825bfb1b34dbd42083762c47db5e5dab6c03efd16049ac03861d7d87746caed09c7534241d51b7341d47ba6af7e8dd31
 DIST runtime.native.system.4.0.0.nupkg 16852 BLAKE2B 6914c7090188cc27789c962931875892dde24e1fc43080935d337840164d361e4410d8228c576a3eb1c0eacb82603f2015c05b39516893cabc718d8ce67467f7 SHA512 55ff3eafa406ec3d8e33d8be44d0d06352ce746abffdec1378716b275d634e133fc1bc56fc312bf0d921efc59e8de4ac811022cc34a77fc1f1abc982c931932b
-DIST runtime.native.system.4.3.0.nupkg 16854 BLAKE2B be46e3bd8781915572308ed7d4d8a0338a5c79b901a27c7e7c7fb7fb25788cf00968a40f96cc43b1202e56e5bbb2f87602d247295d8c98f2c143a0ad3a8d7664 SHA512 299c5a96fffdcaf1972e3e3d1c727837d18ac9e88cb79c09914f12ff1de7280dff10c9232a49a1c1d3ba7785a5cf76f28c9dce414f0a2a567688de7fd5331dc8
 DIST runtime.native.system.io.compression.4.1.0.nupkg 16918 BLAKE2B fa843b70a55667cdacbf59b08a634aeaad6394f53504c4751fc58a758f550c35cde734d6a7134d35c0db78d09d8b423b53aaf5fb9f8c2a8acbab0b62116aa3d8 SHA512 453e16348b435b0d8bc5c4db85d77c99f6e4a79f62e8168eb91c972d6e788c8f1f965ba6e46c1b42f71dee4618373ac70499024f6a4d1462c040fe4989f68283
-DIST runtime.native.system.io.compression.4.3.0.nupkg 16918 BLAKE2B a158ea64e917d9117684a9974482172fa2450cbc3e41a2918cae1ccbe004988fa31d975c8f06fd9a3bd320bf9b5a0e329eed36491b928df6db242507162dc3b3 SHA512 bff1f0cac94327014bb07c1ebee06c216e6e4951b1ddaa0c8a753a4a0338be621fd15ec621503490dbca54a75809abc4f420669b33052b28d24d726ac79c9891
 DIST runtime.native.system.net.http.4.0.1.nupkg 16894 BLAKE2B 22f9eecae135562c88061969182e0299f535e34f085c33c1cc8e04956435b7dade756bf6af75d12ec25dc2ac30d5cb9caf1948e250562f3e7b2678f1cd5424c7 SHA512 ad933eb14740a111a81b5de6837dd0fc9390dde308fedf4338a498f97cd40ecfc65c745802e92c8ec8543d75dd262ebfef476df2e646b63cd99c609258d1bbd9
-DIST runtime.native.system.net.http.4.3.0.nupkg 16894 BLAKE2B c803da4a0e31f509b83e061c0dde9b990188418ee29efe9bb0b7f5873fb2b14990560b4191d78ad16e9ecd53ec701a4fdbec3ff66b88c3e49b5f41b57ae11df1 SHA512 ddd1e5b67545477f7c72b5883666de40e89efb0836d91e7a349e2f3d4ac05ce1125e6add3cb09c39cbdfe7ab7c5dc8fdaeaf6ac25acd92f6de3d8ce2d6db7918
 DIST runtime.native.system.net.security.4.0.1.nupkg 16909 BLAKE2B 77555d966823db2b55e67480f98593bb7261292954e77bb13b4d62225340d1c91724ad7203ecd92cbad0ec3657fe283780a42e260f2f7d23409184d61669731e SHA512 a67044668bce06b249169fb639102cf9b62e11015c3b689804d6cdc110aacd9f54ed5bbaeaaa1325a7a4bce1a00b22a6b25bdc7af0152f19fbfcaf5773a97097
 DIST runtime.native.system.security.cryptography.4.0.0.nupkg 16946 BLAKE2B fdc0eb894da0f1421926e99cc6ef89c2b19ccda00b7b4669c684870aeb8bb535057c3bee0a88e89df7b6df805d859b6e9c81492b5690ee1714cf92564def6c19 SHA512 83b8befe1f76e75346ea2e49cf27aa86489813034dd6e2845ac700ddb155602968a7c1d9806770418c0426e304aef1efc24b3abd4c57f792cb32449c2adf1310
-DIST runtime.native.system.security.cryptography.apple.4.3.0.nupkg 16967 BLAKE2B 4ce2983bbf2c2c6a30c2433151458e4790f43b289e9faecf38e07505e5519bc042f85a46a331ead5f31419971a5af3ad4ca5f18b477c4dfd7e4e7f33cb8a3eb4 SHA512 23c6a99b323cd71cdcb28c6faa71f099f69ff0972d5125607ae8bbc99ba7c08513571d14526e8c2805ab3a8b70d3d3a6dd76dfa193320393ecb05906ee91f37d
-DIST runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 17048 BLAKE2B f3d49c45e52d4e317fd5750de6dbd6628b414d127ef38f9fb4e2ebe447b13a0f93f38c91850c9df4c0a6a3fa738f58daf2c440827bcf7c7d3436a8174b5d212d SHA512 ee5d047908b99b776ff9bb54856454b24b09a0f9271b127239543b1f5faa3381a032d9eeb4d813d01b5a4b7d183b6a16250f159fdc450d5314a7eace1550bea3
-DIST runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 44200 BLAKE2B 30ee247fc53f9de0147a5c5666bcfbfb674ebf03ceaa4ea3c73671154caa6ccee2c9254c0fca588e9a21f98e27ad86f387255b554ce37d7e36f8a69502049e71 SHA512 81bdb93c1c86c560343df6cc367499fb2a01a9b3016617be416874a23c4355a8d95c7be34f175510f3fdea4872302a87c8efab98a328dfa39422db520c3f291c
-DIST runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 44118 BLAKE2B f89226f71e042a6bf70a45db59dddf06fb5083da2ccc1cbc17e8b3381a1462c36e0ddee7cb38a2003ccd07ec4f2a987a9e69ab143054a3a106ec314e3ac4947e SHA512 6de9544b4da49f127680cf5b3b4afea96bfcac3293038a1b0a12eea0ad60be368af31ee1dfd66d48d458b40200738c04aa0c71adcc54ae2dddbea2cd50d6f28d
-DIST runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg 19581 BLAKE2B b8bbe11bed19360bb221715acff84d41f7f6cf871e66b09517a3932ce6a4ff454d548dd58c75561a18dcd6395f4ad11eb1e5106330fb702330b8ccee6618d8d1 SHA512 9929942914071e0ea0944a952ff9ad3c296be39e719a2f4bb3eac298d41829b4468b332fba880ebe242871a02145e1c26dc7660021375d12c7efcae4d200278a
-DIST runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 37682 BLAKE2B 0fd5229c9394741456079a6eed8efb2c99e4211cb7be1873882ae6708c5e87a4f5116a9cdd6fda005896d2af4237779f1bd3c2332a1fcc993690e2ef6f5d889c SHA512 61da1667a5dd1e53a5d19fbe90abbfe332d84fe755fb811a080668a47d41a97db44539e3174fd1d2a0770ff1bd83afa68c82ce06df5775da65a6054ccc12c4be
-DIST runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 42668 BLAKE2B be90c86ebb383a1d7e037d0a0b24aeb8a7e9974388ded41964a82a2d2a4dce0e62feae830fe7dcd29c0fa19584c0b15281f1959d326fd6b7e17c6e70bf125c1b SHA512 e65a6a1f1928cfb760c395a399542dc7f9087399c53874376604504ae60abd2da24ed735ebd148d335000a5e35c8108ea55404685e902df392eac2e8d38fb665
-DIST runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 43118 BLAKE2B 242cc78b2b335d3c15e798c81cb19654b44ecb79e29e6babdc404bcbffd1691b07e0640143cde2d03a0640d6e1851228188eb91cc6b8b9f8759d13e8aa258e52 SHA512 c9f219515e268cf40e16b135bd64cba95c35e866dd9bc34954159562314d01d2f9ea7eb8b0db94acf6bdac83d651d90bad7890cb657ffe40fa3440ec662c9944
-DIST runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 42901 BLAKE2B c62ae072f63c79e2fbd080688852a545df160e6be41c68365508d6bc96c85927feb6859b32c2d8450b07058c2955aa94d4763600f12efdc76fb4d161081cdc81 SHA512 4981b2d7a106703b185e176ad35bfda149156f3b752778fa71c56b3686407765fd2b6625de352bd563aac1e1e8769d7886cc59a0d5d0bfb41ed60277360beb81
-DIST runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 42939 BLAKE2B f166d9c0b266e7c7fa6d6ac61201a755ddca3ca6d3f13e52e4a04575c7143af5bfda9929d3701ac7cacb0e61d8debedae4419fc202d8cef73c8c1496776ffe28 SHA512 5dbe6bc007a9b46491e5299602291f5dbf8cc8d51e6c1b08db2fa0efd365990b41b6e181ed6bf82e873a659396427bc0e33e85b47d645d273fef8bf8ec643631
-DIST runtime.unix.microsoft.win32.primitives.4.3.0.nupkg 31929 BLAKE2B 18ff9482cae737a7098f352f59948119b4f9982eefc1d835245c5336ee6fecdb7fdb92445d0c1fefd4e4c7cc4e64fec3d317e8b5dc160320781a3f820cf34da7 SHA512 93e6d3db61f9c2ca2048f25990dda92acd5ec74561e0c776d2c6dd8d1d55128f2c953f33d6832fb6a72bd9edca304a2551085bdeafe6e18af87619c9ba943c32
-DIST runtime.unix.system.console.4.3.0.nupkg 62174 BLAKE2B 5e0394b879ea85a36c22948a006d41d6d77e2283139265ce5fa6089faf209e447a90a02965dd576c20c28ead4faa232eaf4073343be69c70f4913a3b52f340ab SHA512 7c5cbda7d12315fff6b1e036d55ea27140de8b849f1a9705fd2710a00a2b70f06f534eb0d3e3c8ffb019e1a47d96c559ac61d5fc9d840e48f6e56542fdaccb83
-DIST runtime.unix.system.diagnostics.debug.4.3.0.nupkg 38808 BLAKE2B c7bc02cd3fcc7f547c9d1786fd12da492bea65cf9e01a385e40366614c6e90bbb2a46103096ab491ef6765af5f5ffbad9506f0bae8e68b6d33c40f7672bba0e9 SHA512 a8ce331953b1f4424aa7f4b6dfedfce9ad138940bc92f332de2bc6d05185830ec6eb832e752f62eaf425f749caadd4ea1789121cb7ed79740fa5868eba55c838
-DIST runtime.unix.system.io.filesystem.4.3.0.nupkg 62460 BLAKE2B 6431b1bbf73d43f5d49afcfdac3f4e6a21b4d6c86db7a99f339d97c86fd9f98fe64d2a4873350076a42d1f7faf479fe744220d14d1badaa56370e1c615afb4de SHA512 6d4c80aceffac60e1560fda34c5984bbfa2e1bd106bde2c6d3540905cc30c58e6f5f2eaf5703cef5e68e3d25a4b97982193b2db8130a50c622a498e43eb9bdca
-DIST runtime.unix.system.net.primitives.4.3.0.nupkg 125060 BLAKE2B 76f760a4fe1f14bf65ecad43c73f51b819cae80b259d32cc9d5af74cd559dfc86267ba58cf15c577de697c9e1add532da380b267bff5487a2974904fba1e2813 SHA512 c2a0ecf5c72b226b4776eb6281f00267827d6086a0ad758ebf6e6c64a1c148d2056fe99c87ab4207add5fa67f1db73dd1ed3dca81141fc896be6b6e98795c97e
-DIST runtime.unix.system.net.sockets.4.3.0.nupkg 105673 BLAKE2B 06119cfdac3ce590b2f12f5587c75b6799fa876d7def559a78a1ccf53e34e6e1bf79410bfd676b04f1ab3f34a887eb919078a55cf79dc75faa75fc62094c2cbe SHA512 31b62be088315ead04d89f452a6c49a656b88f0668f7dadb2790511675d48705e01c9df24dbed3a0095157875c208ab6e6b5b6afc82bac13e4d6cdd3026f8424
-DIST runtime.unix.system.private.uri.4.3.0.nupkg 75969 BLAKE2B 82611545be3eba44ccfbef1f104e9b5afade845fd3b30c6cb40171368330f9d4bb2ad8752e415aa3b1678ec140c40f8e72cd4cc3731f42ca64016c1a1dce70cf SHA512 203ebe272791d79ab0c40afe9d0543852ee91b9fb4ae5bc15524d97728bc8bc9d7e0cbcf65d1fab8cfb0aa7a4ae37e7938933eef127aa5ea46f60e57b6ad2d91
-DIST runtime.unix.system.runtime.extensions.4.3.0.nupkg 54075 BLAKE2B f81d86cc15c63aa0b4a3d03546a07649587af7a0285af0de4123734e719fc023fa4227b7abb18307d4fc060e2952c157ec72b3bb85d49ab8508d8167b1aeedd7 SHA512 54b81784c08e934389c59e6e155af6b1855e4bbc41678b01a702c94e6daba87c6ddfd16fe9e2cb61f3097bfa4950dbc37781454d027ce5ba6c50a393cc91b888
-DIST skiasharp.2.88.7.nupkg 7129802 BLAKE2B cfcf2b48d28196a5d568cea059f8a9c2a7901e5611fe01ec10d8aa7e2838d44e5a750de188ffe4faf51b9fa48f0b22f90dfbd09abb81dc9f096f206e45886e04 SHA512 4a54db99f245742231c208c455b6f29a96ee79672e3eab7f7dbd6b352aeaa3b6a87d6946017d899887b4026d5b4ceca6297230dbaacf1725a9726f796ee72303
 DIST skiasharp.2.88.8.nupkg 7144605 BLAKE2B f6540164e90e0046a6a90519d15157afc6f87d86b5484c7c7efed5b0772cc1c2c5370323b2872189179a8bd2a7d68d40ac601ede16a66bc02df9814e2adc45d9 SHA512 52b0661b38146357ee5f92153d9223b03d4e043db8c811773470725a81f4ec0171fc22a644ee70636f8793ac60432222a5395777615ca63b4d44d5095a331b35
-DIST skiasharp.nativeassets.linux.2.88.7.nupkg 15617600 BLAKE2B 41a71f3388a7441e1fcf956aa76b5661d7aa763a8eaec3fe36bfbbf831840184c774c9cb3ed3d3d50e69557c766397262b2ba7675e421e6c8d3e22cb46d8b929 SHA512 4f7db81ee10c07db2d824813dacf0189bafd0e30dcb3087ffebfab9927976f67c2cde71c1a22345718d83fa32193303cf9d578e7d9d6fa30964ca1bf8c8127d7
 DIST skiasharp.nativeassets.linux.2.88.8.nupkg 15619001 BLAKE2B ead9f6184a2aba2faf1449bbbed4060e4b86bd9c8e0c9d5ab9de55e27aa7da4cdd50db5e69bf3617cb93b4c89dc72587cc14f28ce9059fe401d9f589139a64b7 SHA512 c1cee7bb4adfd02c023804d312c59326e37859b012ff00ff245882e77f5da62df79672e0bc82b5576d8fcb23296d69e4309dcb65f44cc4474be5bc2e4be005ce
-DIST skiasharp.nativeassets.macos.2.88.7.nupkg 6820383 BLAKE2B c79a5a2a180bbad87baeb9164ac3e9d0ca3a5258663fb2f358fc51080b55d51479aa59b2e4438c992a6de9fb7de002b8306b9e48139158dc685011a2ca8c835e SHA512 52ce6db283f366aa8f469f80564586c4d09fdbdbc4442fe24bf159fca803b92bdf2e209f537f9b30948a289e063fced46232b44a5c686168e33322e6314f1d5e
 DIST skiasharp.nativeassets.macos.2.88.8.nupkg 6821808 BLAKE2B d378296cdf4e7ab47f5d8465a2ee66a7c7c99ebaf797f0ca040f5ba7ddb21d9a573fb3610bb1ac5bfa8e00d1e1eee673a09132a1f08e9c3d2cb53417ecf83765 SHA512 eac30f293b6da9cb2260b59abc99ffc4124669be585a26080b333ac3decce150afd490133c595cbea33cb63c34e6565d3bed28c2630c8431aac5ddc3acf1f1df
-DIST skiasharp.nativeassets.webassembly.2.88.7.nupkg 52646352 BLAKE2B e659cdfc59874ca55d7af97b5bcd8733a877e0a89c6f70645e9e762f0c7e3c7a90e22a944b07304afece8aa2cd9a946d399d8dc73f21bc39c39bbc1c9c7e29fe SHA512 bee40d258b80a0ea1e849d77c8fd7d594643ac24c666aa9575473462009cdfd1c33e1d4148848187bebc239ced3eb37652b3c7558a597c6959604aabf44498a4
 DIST skiasharp.nativeassets.webassembly.2.88.8.nupkg 52734847 BLAKE2B 415a13d0907ee2867c9e89948a0206ff0a176b130dcd3f2edf967692b817595635f1c0685356707f3e4348f4e101bc5856278896a5b56d4133b539f7b65211c6 SHA512 18f19a940f21e458c78fb65d3988fcf7fa3ef87ac266568d938a4c47f89806b6790da851a0db49bf412df9b43d0a8ae461d067def875602bff2670a7d7bf1b89
-DIST skiasharp.nativeassets.win32.2.88.7.nupkg 10916239 BLAKE2B b3790e274d0e763152a8ad8d61754eca0c84908b3414979e0a7b7c55e59c953f4158b592e8687ca12fac9b7a0f3092afc2a4a03731c7e3680d90075076c86f79 SHA512 3476a2b19745b1ece35858a8534a02f7196ea0b30971d96b4d6219d2e8de4068f9ad83b5e0527519facd88fc64b46c69ac43b45a0f26c01e36885c3c54872324
 DIST skiasharp.nativeassets.win32.2.88.8.nupkg 10918061 BLAKE2B 5cd3273f99d994c19463685d8834d18f9062f7a6f39e22b5858a7103817a6d55d333d1a109590448ccbdf5633a10166fc1b3b6c4eb86854b90df33a4c61b616a SHA512 cf469d9b57e03bd775035db8da878241c7bfca0917195665fccf8f73de4d8b5bdf95613421c2fc3dc12c88d05163fa7e8f4cc7ca382cb4288302258ccfe88be8
 DIST system.appcontext.4.1.0.nupkg 146990 BLAKE2B 7881a5a903a358e19b0de72fe800c70ac9233e7c5e1e4115d69be6f8dbc4fbe86debb79bcd453295730e803ff1da974075c999f52e4c721e085676746c2f9b58 SHA512 f724af13eb14aa57255f82841683a93b427de172b8d31b9fe2c6bc8c21a795e60ecf211b4e49e1c2e285fe1ad498e6bd9c843e109a60a3dc27b49df560106e96
-DIST system.appcontext.4.3.0.nupkg 147030 BLAKE2B fafd6d050e77a265cf41c6d00a3ab3d8db47f2258e10a6cb556031ab183a01a508a986bb495b68c5e8610c05b92b2f3c7b0718f68f508111fd262291684f84c3 SHA512 0d6ea63006304708feae2cc0590d2cdd99327b682210822bb2803ac842fdf4d8d57170d7947c006eec4b5687c942768478a7ec109745472f3946d230732483e8
 DIST system.buffers.4.0.0.nupkg 35190 BLAKE2B fee35456dd7fde57a978d20526e4136f50764307ab2db6edf2c9d990992f4d2520531687885764ba2fb54f2a26640da699abb8ee538cda2015d65382d01128d5 SHA512 0663f4639c4e37c9dff12717cdeaebf30e38d91e986d6a99f9f16ba88189873e0399e418659e732a18c674d8875f8f41a1cf60319604173ca8430960759fddf2
-DIST system.buffers.4.3.0.nupkg 35171 BLAKE2B 3b274a048ce14845ca957019b3670db00338972f6e11279e47f59ca6b4326aaecab1d11317694ed98e8a27f3de7ef6f90de94d4711ab224f805388d468728392 SHA512 3dcbf66f6edf7e9bb4f698cddcf81b9d059811d84e05c7ac618b2640efed642f089b0ef84c927c5f58feffe43bb96a6bcf4fec422529b82998b18d70e4648cbe
 DIST system.collections.4.0.11.nupkg 810001 BLAKE2B 7f20413de51be3416862a8e3624fe575740aa35fd0983a694b128587fe05d7a3f869afb893106b02866bd6811dd045e35d0c3f43b55e06ba9f92758f21aa507e SHA512 f61b75329ba5d7c0e688aa9d110b2200c8934c3a1888f6b1b5f198baa7ab93f23835e8380853e8c046f257172b5060578ed86df26e5fe0ef34d8c4408a02c33f
-DIST system.collections.4.3.0.nupkg 810001 BLAKE2B 0079d5834bb3857c002cc686313646895b47be1079e10cf365ce9e67c05f14c2e70e782b122b07a7cd9d5090b57334d0cb2336503cf5059cdbafeb3ef3cc8220 SHA512 ca7b952d30da1487ca4e43aa522817b5ee26e7e10537062810112fc67a7512766c39d402f394bb0426d1108bbcf9bbb64e9ce1f5af736ef215a51a35e55f051b
 DIST system.collections.concurrent.4.0.12.nupkg 502657 BLAKE2B 39d39b111bb1dbf282a42d0b7cf0cfc64509d1805beec3a10c216946b21f090e2d1f94227035de2c17442b463a1985a65ce4de203356381e88eec036b26e893a SHA512 a46bd40b8cc7afeaea14c80ee6ab99a5ef6d27e9e897cfe842e9ab5ca04b9de8d7192a310225b1040d57d4870921487acf5df993ab81301d49994048e1341e85
-DIST system.collections.concurrent.4.3.0.nupkg 502676 BLAKE2B 0d98ffad345254596133bad8a487bb91bd235f2a757573c3ab7999184fac6685b4ec33316bee9b4a4e588ba96aa745a681077cb2e2d2b0a7f5cc113aa75efc2c SHA512 35c1aa3e636216fe5dc2ebeb504293e69ad6355d26e22453af060af94d8279faa93bdcfe127aecb0b316c7e7d9185bcac72e994984efdb7f2d8515f1f55cf682
 DIST system.collections.immutable.1.2.0.nupkg 310324 BLAKE2B 286b222589e1a312d93cead33344b932bca357ed0ce542941e0037ae9f92bc38000c43953cc0219536aac5f1f24b01b0fa65386213875686440c949c32bb99f4 SHA512 0021795a155f67f1247e6572f70a5cde82422bb9288751a59d74385975bd378ae26f363c68a17a56be7a8c3d2b353b94cc5bd15836c7b9827f427aedaddffb54
-DIST system.collections.immutable.5.0.0.nupkg 623075 BLAKE2B 14724fcb8654455184f8f16f8ac56b7b3c995e632af36e91f307331620b4e9f515a13bc4625d898fbb4b57ff9f017b43cb91ab40b0cebcd7d5eefe32979afa4a SHA512 726f8db7d179714cf0efeb0fc02fcebe7b4755762902e391e77cf78671dd5d5f364c7cf4ce3545b51cc7f37327d12d1500ba19f4b934f0e8bb69a6a347c0bbfd
-DIST system.collections.nongeneric.4.3.0.nupkg 239265 BLAKE2B cc987578ab9b0c1dfc8925f2c946876f8c8d6f335d8d6a6a0a30848c6c812a24774d059fe28aa83887b45d924705abe88fd96451dba7b2253dc9b99afc7a75e8 SHA512 dc6abfe778b3ea08e99f50b79112a51728e689f353b082234351b9f5b1be4b601a0b6d38a04c2138d05b5bdd83d6f3d91b53ee86ed119225c15e4683c38bf98c
-DIST system.collections.specialized.4.3.0.nupkg 183462 BLAKE2B 9297ea15b3d8880a719e4608622793e8883f68887ed2422b287897ad389b41f5301c69707434868c3db88ba3b8819c4cc22b7f5cbb09d2729b0f5e121ddb6921 SHA512 c7a257cbda812d6c0c44b29d8bb5cc4f5cf2d3cb81574eb1dc94a7efde980ac26c5ffadb7cc3521fe7b19437766a046c83cbf2e7ea59a36435c288add8142b57
 DIST system.commandline.2.0.0-beta4.22272.1.nupkg 616636 BLAKE2B 5252560598c4cd67348520cea086c37b4151b984a61238de1984838975340247b16050113422b1765931bdfc1dee38e226789b6427e56ab7c3a36bf07d0bcc20 SHA512 979a7e66ba29e17bc5bec42e926ed15362e23ae403e498c955e09dffc4d3baa14777a06f95e25d591fc9757a0eaa18deb9e4662a1ca1663fa300f509a4a0383c
 DIST system.componentmodel.4.0.1.nupkg 95272 BLAKE2B 91bdd30bca847f0a48608e9cee642cba2bdc356661cf95e906e269a99f0679bf2497c88c770a93eb59cb9cb68aff68ed1f5322a62aee3ec658b01af17976eff4 SHA512 b4de433cc620eb214ee651792f9845e932190dc450ffe7f561c5c63fccb6632e3def55e8c4f38b1f896490bdb4bfacdbe1a015b29fb1ae4470ccc15e479647ab
-DIST system.componentmodel.4.3.0.nupkg 95320 BLAKE2B 8c03f003539d1c0920c4d1a2d0b57a19f93c9c1d7f2e0004035b758b56915da1ba0207d1506cc0cf8af71bb2e58408fb824674941230a0465249752b1dc0df93 SHA512 7c638ac92a132e1553a089c6a711ffb7431b22fecca322ce748d6684ae2baaf161bab2f71704750bd15ec6fda11e795f2ab8491ac769b89341bde77aa9212d59
 DIST system.componentmodel.annotations.4.1.0.nupkg 609969 BLAKE2B 8d441bd869666d722cdd13cd719b3be1ccd453e03cd956be99735ed85a5fd244d592da6c8fd6b68a962aa71cb200142c49026d6c15ffefdb67a7b6a3aac8c86c SHA512 ef92333f99ca0626e0409100b6f5077fa814a51c78dc558ab1313a74ae69090e05dbfaf764418ba51b979beebd563065e4ba432e0d1181afd0ae1ddaecbf5924
-DIST system.componentmodel.annotations.4.5.0.nupkg 691299 BLAKE2B 38a889831cef09c372c64fbb244dbe7e7f44d4a8b136516bc1d7a02b97d02f62f897b820ed16e67445c7168465ef77d62206d6d1123e52571cb92d57727fd63e SHA512 7f5029507196abf9490bc3d913b26a6c0ded898ed99e06503b699b61f086d0995055552aaa654c032d1f32f03012e1badfd338ec42dd3fa3d0c5ce4e228ea2e8
-DIST system.componentmodel.primitives.4.3.0.nupkg 93137 BLAKE2B abc810f534c991a46cef506df47b66abde687ad65ce16fa8739a05a5c6cd8338ade9961e035f38c559f964c469e47398f537285b63552fb80b4d6b9421993f07 SHA512 ab26d413abce9cfc31b860765d91b21d4048976016d853ce8969f7ba79c039d8846b3c4e2986530f20b62dcb23ff0a769ae5ee37fc078d69eaa962832f2035ef
-DIST system.componentmodel.typeconverter.4.3.0.nupkg 292985 BLAKE2B 732b3362abf534f3a28d6afdf010d9cc52960edbacd19fd70ad49ff1813d31a7f840206773dd5d8661575a0a5b4053a51d58e23fff803e6726bebaf3bedd158d SHA512 0a2b2f3c25de4a6429c6cb9fbb37409e86168921ea71ec58889912742e39e1b67f5cbe764affc3580aa0ef167c7f73a55332a0abf7b043e89185293029d8b087
 DIST system.console.4.0.0.nupkg 102388 BLAKE2B 9cadd0e2a0256da6c777eed3550c399df1bb936daab99dce3025d5781334b4583acddde3a0f8edf617ccb3e2b9f72158c791d63ccce7cbb2645882fb7d8efbe9 SHA512 44937dfe632127d3a7c89ca77502eeb6f66201ef135384e04b570a90a3eee3d72497869344c759c35295d6a4b46afd561ba19562dfff9896ecf2d4b07e96fb9b
-DIST system.console.4.3.0.nupkg 102397 BLAKE2B c21bc97bbcda781257473768239f775a16fcc399e933df35a5f5c00f75c5088462ea01ecec2d711a803581d5499c8cb15518e790d6c9e74b15a36c3a1f237d19 SHA512 a08a684a583c9b3278ce32be1007dae495f9d87254666392f794ef1203079f333cd7d388c28944ffa36fb49f0c8bb21f42c70f6e1d7c1c03920df6d0d1130c82
 DIST system.diagnostics.debug.4.0.11.nupkg 149779 BLAKE2B 337beed5f06441a09fb704ffdcc3c277e2f99d7b4931e86419e4d4d0925ad44c86276aae0ee1e29f94ecd37257953731e9607bd00de716d3195dc994dbe189c2 SHA512 02f4d0bf969eb1a876def21c1ffd75f8ed5f979aed9a1169f409e60a6e07016854e2154da5c0164fabaeaf6527a18d8e67282db1b69327a1b3581e9c0c742f58
-DIST system.diagnostics.debug.4.3.0.nupkg 149774 BLAKE2B bdb6d5ee3b8ca4f28b241b098281b7d2957d0996f9345aa086a54b1a981822962e5cc319687849ee52445db47b439b6cd4e99a4c71595f6227f78160aa31724b SHA512 6c58fe1e3618e7f87684c1cea7efc7d3b19bd7df8d2535f9e27b62c52f441f11b67b21225d6bcd62f409e02c2a16231c4db19be33b8fab5b9b0a5c8660ddab24
 DIST system.diagnostics.diagnosticsource.4.0.0.nupkg 118325 BLAKE2B 4a066e6d77ee8ccb165a3771a927e78f279ec52890eb13875b3a1ef94a41860231b5769d2b1de9b5b33f89c1303f0c17f9f427dcada4e1282b93346326617eb8 SHA512 199e2a85b5cb0ea6c2ce13e12444af61e80da7625c4f7d0dcc97dcc363b21f2bee48c7bcfd85d99d0a23aeb1ea35f94dd7ff8fd22ab50f2481e472a749765471
-DIST system.diagnostics.diagnosticsource.4.3.0.nupkg 120125 BLAKE2B 33f203d8ffc39e0c38599eee625053beae160a0aebe6fbfaaafdc85b570c7b82e3aae281092014e90d10fad7083f37afbb546ad5a0c74a94843ae9b1e9fe85f1 SHA512 8f54df5ff382b6650e2e10d1043863a24bf49ff0714e779e837cd7073e46fb2635bcfcdcf99d7c4a9d95f35ebffd86ab0ca068305f4b245072e08303b917b34d
 DIST system.diagnostics.diagnosticsource.6.0.1.nupkg 384347 BLAKE2B c79153eaed2238224d93e4351ea024988083f2bde5834620c5a84fdf4a7bcbaaec408ed105e440340a81be93cd6430484a05ac52207b02a6ceaa7feeb5b661a2 SHA512 80a0f9bf3a7afdb28d9f00e1f301feeacb39c34fe4ac8f55a392377e2e018fb546fc3fc56e2fe4336dea222b7ab3f4bab58a0b8d86eb18c71951ef2e1c752789
 DIST system.diagnostics.eventlog.6.0.0.nupkg 296510 BLAKE2B b1f7d78b0c5a4c46898972f5d9c086daaf2d825e6b08f4150d5ddd99d355fbe7f43e13b9a0b24a66adb4eaa1279a58621f3d2b15c8957c528ebd7bb99bef3b6e SHA512 40103d5b7cb2b41c7cafca629c112c5526bb773d11367ca62918d8864fba8dac2b48151f37671bcf50499d8f8b268489ee1cade2fb8947cc06e205a1fac6784c
 DIST system.diagnostics.fileversioninfo.4.0.0.nupkg 137948 BLAKE2B d34faed0fa541f67f854ac397f070be94040816c29442dd9301272aa13ee48fd405253abeab7e69a367d385720aa6f225816fcc8ff71a16412a274aee0dc3f51 SHA512 b6fb4fb753787c36114807039d0fa1f406d9e6a1b5cb6aca3f309d226565ad415cc0aa8247ff4ee8a60cf56ce8d656ba4ca7748c53bb3fd0e3ca4ca4a808e0e1
 DIST system.diagnostics.process.4.1.0.nupkg 543262 BLAKE2B 0b9b75918218a8e5dcbbd5d36a286bc47ff9f363b02672c59e3ba2d76310ca8b377481882b3b78652d4fd39c80b3f787ffe3d636ac71deb842ded661250c9b71 SHA512 4b6602f8cc29599e9eee1da5a8d71efee6cc8c3e2f7f611afee3849dc60d1f5fdf15769794a0ccf6283fcc2135ad1fb0c18cc4f055edbe3fb53729a1ea867d6e
 DIST system.diagnostics.stacktrace.4.0.1.nupkg 101951 BLAKE2B 6f4b943fa0853865f9d16a9b932f640a4656c178d5e6f9ec1483373ddfbebceb42cdb6cd805e2fe687d09c4fe15bea376a0480ddc0bc73b7373ff5b2a4b18e89 SHA512 3abedfd73dfdd40d8b6b594f5fb5748696d69f34b464546d4689d2be3370f0f7d2f9e645018f78ffc678db319b24ead35eee5ab62d2d1d26ae0db84224632b6e
 DIST system.diagnostics.tools.4.0.1.nupkg 67228 BLAKE2B b2b74a8c3164181513c960e79bb2cfd9673af3d864c681d379051361743459ee0604806c09e9154913d016963f20a59aa8b45b4b3c30275709878405085ca690 SHA512 a812ccbbdd0a66eb57075121ea6332a526803ef883ca9f8b06431d6668ad50efd13624fa87dfaf6aed03c652f795c2ffb9fa9d9895a2fafa96eca614cbf86cdb
-DIST system.diagnostics.tools.4.3.0.nupkg 67227 BLAKE2B f03928755ec84fd360b2a8a0de3f39e57322cafc4be9e7fa6b7a67d606de9c0869688f62f6b7c9a2ee2915c424ab20779ac87ff510637a9bba740ba0361e6041 SHA512 164d6977e721cbceb44ede7bfd75b03b8d9771e0426aefa5d40c71867e964092fdc6a6808bcbc5559ed73ec2c532ca657d6476af79a49ca3ad879b8366f13d90
-DIST system.diagnostics.tracesource.4.3.0.nupkg 227705 BLAKE2B a94d8a907a729dd4aa296f1f3bfd924865bc73530552d446e301dfe18632880e6800b1d3eb397c59144424896edb8346021a3254201ac6f647ee4ceba412f8b5 SHA512 0655962fdabf1ca334281cee3923aa7211606b932a9ef90ae666fe214edfe1e7089d2ca0865b3047789bde7c30d6bb8198baed748e5ca02041d87d8096d4c5c8
 DIST system.diagnostics.tracing.4.1.0.nupkg 581838 BLAKE2B f7b28bb2adec08583617e0c6133cdfadda6e1ae4cb1b3bb83175199f1dcca28c9c1540af5a560e076d7a3120c509576f9c550a0d80481a740e2e09f78c9e57ee SHA512 0c64f255836cb629587b117bd8de5e70bfe7e4c6d7d138bff10b9e85f4883fba250ae07118c21d5e9130ba3cf120a9a2bf581a17577d3a7ec09260933c7b4d47
-DIST system.diagnostics.tracing.4.3.0.nupkg 581864 BLAKE2B e09e616dff7879932b358746a62b530499aa61726c4490c56d2d7a0bf888db5b42d75d89cc5befc9fdb6af231beff998b6b243c2b2a08084da089709e0c82a75 SHA512 d0a5d30e261cd45b7dfab02b7ffbd76b64e0c9b892ed826ea61481c983c0208b05b69981cd79e91cd4e5811e1cd4c3cea06a1afce05811ece58be5e4c20169ea
 DIST system.dynamic.runtime.4.0.11.nupkg 547813 BLAKE2B a59d9fa95313f269033f7e25e39e499ca4910da5c2c1307a1d3d4d96b07fa25fc6b9223755597727b60a26280e1dd4a8bba0b165c3fae9a3d3d9732b77f3e1e8 SHA512 0b2189a6f50effab44a8b1f883f2a1f9b9b32c448123190e8946a877c28ff46a235aa90af0898d1ccd6da2f3155aa2cf26e57f7f61ee7e3c50dfde2190d781ab
-DIST system.dynamic.runtime.4.3.0.nupkg 548103 BLAKE2B 42ac34ffe9b9b6fe69c984aa2b22f0715f7979685730de048490ca05feefd800349df39aeb2bc6b4c3608cd042abc018714fbdc49475a11b46077a2638824c8b SHA512 54446fee94f432cb8fd38ec10c929a87b307a76f152a2e9da11ba99c41ceb0f65913cf218944990f0e122d4f858945091e9806c84c0285ada1fcc939337d30ea
 DIST system.globalization.4.0.11.nupkg 589139 BLAKE2B a4ee2d6848c249b34a67192dfd32f78d842f4b12f8be137804966d00b2e15dd8b2f9ecc6427f9074c35802d9bc13674c912c80ba405e610324772f9b640dea46 SHA512 66bc21667f5f839bc711eda3b0463863d70e0ad86770fd5410e0123006d6f031755cf7220187fb7cefed69b3f4a9eab8f0868cae765cb1425c8bf60427f395e6
-DIST system.globalization.4.3.0.nupkg 589136 BLAKE2B 7b07f9b68f0744ddcfa3f0db6190c1a0696c2f89f8c5e92922ac20fc4155e22d97e7191bf7866c9b58acec056bff08531b0adacccaec7d4301e1d4b149fa511f SHA512 823d2ba308cb073b40a3146ecccd0d9fd7b1615ac3fbefb16f73d873e411fd81c3bdc87df206d3dc7e2f14c9cd53aafca684a3570c25471280aada8de805ece2
 DIST system.globalization.calendars.4.0.1.nupkg 177634 BLAKE2B 9ecc74331495d4e10bf0b7bec8fd577c207771387465939db39cc3711e14bacf7ca9876710715cae4378a6b957e335ed68bd38b73b43297171bf699a3997c766 SHA512 e6f3f0fc443c52cbe754ccfe6c7752206557db7603187b0f1ab7e21fcb466248ee20844d9ce9f5f114e6daa5944a3293cca47f3c02a2e735a7b494f29f2278c0
-DIST system.globalization.calendars.4.3.0.nupkg 177689 BLAKE2B b70b5d9e545835e5a3fe4c703b2bd7c857968ba1fcae5299c9c41d550338914f2ad9d168948018fa7da7271d62a3b9d2ad1e696d334ee7d3fdaefd25395aa64c SHA512 e97190231402b393774b925efc02a2bfa41d1d117a17fb87da6e399f5234546962767e9cd8f39970efa408e4f453cd1e6751a2a61e366bc97406e1b0b8a4be86
 DIST system.globalization.extensions.4.0.1.nupkg 142766 BLAKE2B 28344f900c32045cf4f6d168e02dd1df501fee3a5d0ede8ee35034e96cea6655ecb0f0d722eaeed78c500535b0795e7cd0f067e286cf65ca083fc4c37477efd5 SHA512 415ab44aa3e46b59ad1d314ceda11f9dc78f85adede3daece96c83c98448e2a0cad7e79045edeeeaca8618115c38517364b00cdd9a0a7228e7da1ebc342b0116
-DIST system.globalization.extensions.4.3.0.nupkg 142949 BLAKE2B 4eb77d4ce5af01136145ea867e9d6cc81181b36a178ff487905dd7d7c6a4986c518675af68eac0e854347503e11513056173a93e6803683f3fddee7677b88e05 SHA512 a4d360003f95e0c31edf39c0b91e1c73850a60ac5d0032b17db888a3c7d7134cef9acd97219d14174ad213b7c044f49b364cc5720073ebfcb6e1bf6e4ec24ce5
 DIST system.io.4.1.0.nupkg 703645 BLAKE2B b0df16bf1368571d6755f88cc8fcce330d1dd5b478a009363e87f463e12eed7722d4bcd66a1e70de63d1b31ae2793b80c735e19a63e80ad4bc4c45f107e94ce6 SHA512 e01b432f3d715f3c88d5d7f3e7cc1ceee78caf99407a11c3306f9103aee78963f818417f14eec52f0096fa247900a31e53bd3226e06f0c0f93870db0b2b78331
-DIST system.io.4.3.0.nupkg 703652 BLAKE2B b5b2627ace4cc49f35a0caf5c064c4c8262ff0fe3df79bb1bd3529b3e306c8b1e77ea9e5948de343ee786a50e12be822ca89b5ea3f16347b9c0bce6bd8071127 SHA512 bfca5a21e3e1986b9765b13dc6fbcd6f8b89e4c1383855d1d7ef256bf1bf2f51889769db5365859dd7606fbf6454add4daeb3bab56994ffb98fd1d03fe8bc1e6
 DIST system.io.compression.4.1.0.nupkg 413984 BLAKE2B f0b7116d6502f9179935d4c00ee9542d302c17472ffefe4b44e97c3d8bd2fdaf9483e06f7809b5621a7d7d20d6b5336726e0b2f75aa2a8a5f924332f5052d1c2 SHA512 2402b7ba4f0b43bb916cbfd608f9efdb9f60406d2a19cd9e7a677867806962c30b5666b6270b873ff9748b4fc3f7fd6e0451f2a5214d5478593f57d4d8430979
-DIST system.io.compression.4.3.0.nupkg 485197 BLAKE2B d813f11d1eafa9c5bae049c2e6d7081edbb264520e253bc03441fbc1ea62b75760dd31c038a5a376d41df59c8be55fe1085d7dc012f611731b72040c8c41430b SHA512 f540ee51a3bb6941cdfbaace9a9738d7f7986a2f94770db61f45a88ecb7ef36b571d4c07417dc89cdbe9655a262b7cc599b0a4b78effea91819e186121b44807
 DIST system.io.compression.zipfile.4.0.1.nupkg 113696 BLAKE2B 9b325bd23a5b4584742783b63f821365c74273b35737710c10580fda6beaac1ecfecd59b4c69a3885f28f653cc7c30e31d77a0453f63e49f4c0161438b6828e5 SHA512 49322ce411efafb4b55d43b0d7a52bc334990e1e45b321d01f0f394cf1aaba15845603d6f08a12c8f09454a03518e6c0ab7996ba73b1116c5c7f685d768bc62c
-DIST system.io.compression.zipfile.4.3.0.nupkg 113746 BLAKE2B 0622b6c3b6ce841b3c3c1df620ffb68f995ac02d7540d7128ef2831cf08deaa60aaf46059cee0c98624ed5402c8d746128ecfd674acb90ed665d834eb879960b SHA512 1860634672767f818f0192ec2b2750693f0d39390f3b7d400cc6fd4f6e74a5cbed27bf49e5980ec85ff3e161c30f6190f700e339a1040c1699b87eb4aa7b6792
 DIST system.io.filesystem.4.0.1.nupkg 274255 BLAKE2B e5beb1350bea00cf6d533de221129bc3bb799f4e041b23e45304ea39000d9b70cc63fafcbd302046793bac360d431e3dde5c432fb19b0e1af7a1e1bf8e9fb0d1 SHA512 a6478b17f5d52fc5b9517458e93e1a69b92575c170f44046b3f4e25c7e67c9d4126ab486f5a3c51abcb279d05a057bd53aa8f49a1e51eae69563ae39214b72d3
-DIST system.io.filesystem.4.3.0.nupkg 274316 BLAKE2B 4ba513b503cfcad068c23a82423f9900c648fa2bc4fc16555bec717b6c5cfeac6c7708b28009c7a089f80c77ff744f573d72e4dcbeaa14acafb9fd3e8b5100d5 SHA512 4fb581d6f85b9529a091a0e974633752aa39e50b2be6c8a9e5eca8c2bc225cea07064ccec7778f77df9987deebf4dccec050b1a97edac0ee9107142e6a8ee7ee
 DIST system.io.filesystem.primitives.4.0.1.nupkg 94921 BLAKE2B 32311ebb93e758016ba0971c99f5010080597b630bd6b1aacef03e39d7693c66b7d2531a6af05c7b14cd2dad34b1cd485aa19d77ccbe53e512c4e021e3291f9a SHA512 dce1c4074938391ea4ea01226812982a893bfc910e66ac99ecfe31c9b6fe635f3fbff11dcab222ed5036eb21c4f49cd3f121c310adbf87d22cf3d512bf6a9d73
-DIST system.io.filesystem.primitives.4.3.0.nupkg 94996 BLAKE2B 95fa6178164a7cc6a29c5a3fc55e415419c433b3b74abbcfa4fa5ae1bef40141b9515076b6869e8ed771b0ba6800bdb2fe6fa5d1f773ce52c40753efc0a82be9 SHA512 5885953d09582cffd973d23a21a929064d72f2bc9518af3732d671fffcc628a8b686f1d058a001ee6a114023b3e48b3fc0d0e4b22629a1c7f715e03795ee9ee5
 DIST system.io.filesystem.watcher.4.0.0.nupkg 193224 BLAKE2B 88c42ed69eb005d2b67972f342c8fa36d83fe8855b42ef9152a7207523c8ae3b782212d53ea6e41a731f8b42a397ec185bd26dbb1f9a425f423d367a0fb78288 SHA512 8f260e535c69de59c4e18cdeef9e5523b06701f76d3ffb5b93ec05abbd69c5f68ca83f09c5c43bd40f6ddeef407526a8dca2a7a7ce0901561240ca5faec077fd
 DIST system.io.memorymappedfiles.4.0.0.nupkg 196850 BLAKE2B 1efae5ffb9298afb52da81905f6404639604ac46d4c65be86c1340883591e3366a27a640801166859b904471345aa1642682930c7eaae8fbe3ff47f6b3f38f6d SHA512 a1e30430cc3362849a6ba741d703e9a03fc8b52590d225d0689ac624f9da7af02fcac992891e51a7ed5a007482bdc8e55ed322c8eda7fbf784450deaafb69c75
 DIST system.io.pipelines.6.0.0.nupkg 221298 BLAKE2B 344160cc3e08c0a9004eac9672b89d8aa9fc726a0dbcb2aecd677f995157f90354d3c704862422bdf8a0195918a7411b6ad9315c2f68b01c0c24ca666f4dee53 SHA512 c5983b4510bc8ae4116133ffb9b280fe61d99d47ef52dd78e5bfd03e090901896d5d5fd738dae57006b971840a4d9422bded33ddefa5e927d75d309ef1f70dea
 DIST system.io.unmanagedmemorystream.4.0.1.nupkg 126379 BLAKE2B e6e107aef337cc704aaec3d3bb621ee717977b8a7c88f3ab1b25eaedf6b33bf8333a3cbb1cfa7a82dcc99d4ac453d3d9a93630c72548f714a0c034f7b7a3fe1d SHA512 e15b96f0a2b835a6e470ef5f85b890172bc4e85afd8e80e61b344de8006af5e5f6d63fcd7fcf0f28efcf3173adb43f9af6b473cda6a79c45dfd7d194543ce135
 DIST system.linq.4.1.0.nupkg 511874 BLAKE2B 3f5941e6fdc731ab7acb58aaad0340695ba2c1ad285ee5eefd9c4ad3972e278d74cabb0d5480f29697b8c9ebf839c3c8064436be4c508ad406f0b3ab2b6366fc SHA512 53e53220e5fdd6ad44f498e4657503780bca1f73be646009134150f06a76b0873753db3aae97398054bd1e8cc0c1c4cdd2db773f65a26874ab94110edb0cddb1
-DIST system.linq.4.3.0.nupkg 512550 BLAKE2B cc6cbb532575bfcfde7ac897970dcd49067186547108f46449f9f819e7910ad32496df3663d4db8eff48224b8ee95b27f7bb442bb477ad47f44da2f6fa893078 SHA512 eacc7fe1ec526f405f5ba0e671f616d0e5be9c1828d543a9e2f8c65df4099d6b2ea4a9fa2cdae4f34b170dc37142f60e267e137ca39f350281ed70d2dc620458
 DIST system.linq.expressions.4.1.0.nupkg 1929236 BLAKE2B a804c6741afed5fdc918c046092f8a526668fdeca8712f750efade8f1f272fcd2c58b1d1493f20528ff7006e189fddd21f8a2220c15d689c8de2ad2bea21b1d6 SHA512 04605a091d3aea404bc97cb7ffc154708b3bec886562d9e36aecd4d2ed130afbb45f54cd16a3f714f0ccb3f27c5bc7707e55fbc3e81681a783e9396930058acc
-DIST system.linq.expressions.4.3.0.nupkg 1928029 BLAKE2B 1add363cc651e551fd7abcb797252785e2617159b197ec081de605d7c7dd829e7653e7693495a87909f46575b6619e95fef6e3132532110b3c1e74157ff096a6 SHA512 61b90ef9ae6f779fbc8a7b6483ee8f5449cdd05c81b05235f70447e656a73b2aab7c341784b999f7532374744a72e2c3a5cd13800ea23417fac32ccfae5cde6d
 DIST system.linq.parallel.4.0.1.nupkg 522506 BLAKE2B 39d8376d24a2233d592756c0c01d0497c0956acbceb4f106137b2241ed12179be6f015a8e68677bd66043f2bfcb4a47bd1c41061766d6ae8bbc963432f3ed07a SHA512 f74824d2b288ef26e33855894bfb13d09674848f00850b1e6e4f7199dc377afe5e9c96a9127d0e757540c05342ea8bf1e0cd1f4983ecadef2a91c432a47f50cf
 DIST system.linq.queryable.4.0.1.nupkg 275516 BLAKE2B e8987dee457125c1e6992574f90805d726c95ae262424f268324bd7e465ea4e5e453f2a104d6f8ac598ada779a7625a086a33b2fd09d41fba16d3d458cf11159 SHA512 e658e45e86fe826988cb0e053a78ef85b8ba8ea348173979b7d705a35d7e993c3e7c1bbb2aacd139511e3e305a0d4a4b87a4fd299038e9543e6338fe31c07fe3
-DIST system.linq.queryable.4.3.0.nupkg 275542 BLAKE2B e2e0b8f46bd2b93ee0123b13b080ae25df5997a93eb5279126daaaf9824eaf2a88086349ad9f5c60ddf582b4b2fb5c07e6848bfed81bb51c2269dcf708149a44 SHA512 c1d6d08333228f20e4050c92baa6270dc2bf57bd15e8a214510757a645d28476e04119f46e7f706376abd159ec0f009cc2ef2283a5c1ae90b6114db12be4ee42
-DIST system.memory.4.5.4.nupkg 205467 BLAKE2B c5b66e68917fc14d5b94aef9aef53087756c59473a2580448f20233e559b3ac9d691b2c063d129083593a1b610252acb01016ef078ed21b390615bf5a6e04dc0 SHA512 8ece5491eb0fe332bc190f40cf76b3beee0c5f996325034861be221fdb0ff02fd59e4f7020b3c4a1f29a457f76ff76c4c95d46d38555e4f48c7a3bf172d87966
 DIST system.net.http.4.1.0.nupkg 1372881 BLAKE2B 95aaf095ec258e9a8737c3bf608a887c11a3b28850ccf2d19a4ffb3615db638d56aa57143a4f4de5e7968492f506a5c5dd5baced6ce395b24b208050ff80defa SHA512 55ef2f727784e744ba069bc0cdd1586ed714cb9239ab724c650629055f4f2e9f88493afd176e833d46d1493974a8e95c805c4ed4d989f095d6def8d39322fd7c
-DIST system.net.http.4.3.0.nupkg 1371903 BLAKE2B c0b56398662d8f149eba439ce16ec254bd5a64cee0faf251af07d89ec130953d8865d537b52b432ee19df9ed7405318119d301743bf84f98179c1cd7e6615731 SHA512 e8105ce8151aee95852fb29423f73cc1bd7c2286d36474ed7102a4b31248e45f434434a176d3af0442738398c96c5753965ee0444fb9c97525abbd9c88b13e41
 DIST system.net.nameresolution.4.0.0.nupkg 178900 BLAKE2B 378b837232dd720825a14189ff4ec95127611d665def11fb6df4346406cfcee3cfe782f1912b1b0dcb6d34fca3297e9c0f9868e85f54b197d984b3c619488463 SHA512 b737933f4afcb8c7f5d0b56b6f0ba30e24124d7349ce3968d8baae455ddbe451de13638dc1ef84657f715661be28561a27214d6f6b133411c0d64d6d7d252097
-DIST system.net.nameresolution.4.3.0.nupkg 177639 BLAKE2B c3d666f33577682ba43292ccca908cbd81971ab53eaeb904438a378997903e80d5d3789b3c76db6c50f0411fb17b227db973bc09eadfc0f98ebed88ac0209057 SHA512 40d39e131fe7a392e58e9f58b516b5db88383de91c05b771f5e509acf46cc874271e90623d327ab039003ab8f2714144694390261278de324e1aee228a828ab4
 DIST system.net.primitives.4.0.11.nupkg 769354 BLAKE2B 5c2a6b46cd7eac3bd02e8791264f6bc04abc7a93352db986f363e6800cae19b52ead304ab74d49d9fbd249ac44b92331cccf156d86d91da798ac5d274ad51c93 SHA512 50d5a977a4926fbfaf47bc4656111ed6edb8bb6acfff0cc5c2ee9c104628a255c8298a649f33ca2abdf9c7dacf4bfbf15e48ab7f92bd797b7d50ca328fac48b9
-DIST system.net.primitives.4.3.0.nupkg 769347 BLAKE2B 070d9aaecf9c4ec485850954c425d6d6af23fdb8a50fe40c305657654fcaf58d366f29f62bca6ae32c8604dfd7f5217f822ebe03c68446d4fbc4ee7e44b07852 SHA512 9f7fdece330a81f3312ea7c804927852413bee2c929f3066b736993803df47cc0692fbca236c222bf19dc8f59b42f54f2a4c00da9a4d624e458da5874d127ce6
 DIST system.net.requests.4.0.11.nupkg 382487 BLAKE2B 5551aaa6ac034dbe7dc6c9dc6513a3e3d2125bea6a997e63a0604c378ed5c41a62c3cba2e86e442ebe426aaec489c0fdb81c6404b38b74fdf12b8ad301a4e307 SHA512 22f38b1934f3276cb91a94a7d1ec20ca90b9d930820fab5853c31d2de76d6505b455c3f6e356fab11276acb84514f9f99fe6e24d75ee6067da4f24f709551ff1
 DIST system.net.security.4.0.0.nupkg 313984 BLAKE2B 0e48770d578870400dfd07f8dfca5595d78dd332e0644526f517883353391493cfd8baff47305e80b613095edfbcb126e02a87f3d44a9e2ec79d8e53f393cf24 SHA512 7bbcbff7603be37eb0277dd53a751fe576c896e6c68071fbf9c38369091e630534c5777f7c1fe3e8a88e752e95bc77117c15d46083ecbc139dcf7592344d6c89
 DIST system.net.sockets.4.1.0.nupkg 135660 BLAKE2B f36e7d4191bdca249dad820e1d0a142fee23b77e27394ee7b980c085db23a3db8b09bd3d06c9168c221f264cd0e119c7d18bf9e7fb100bd66c9d96d6ff127ad5 SHA512 b231a1ca9d281923ffa1b8dbafa2cc074ce679fc2d473ad7c7192cdc3b51c8ab125c606cbbe0248e02b415e384bfba1bdbc59b28a139589c78aa3687e0236019
-DIST system.net.sockets.4.3.0.nupkg 135695 BLAKE2B 17f58a8445cae9ef2ad17bbd7dda092e66bc8be07d767e971fabf14da98f549924cd6a7abf54e8a5a7557710612a151f2f27dd35e559b81f2f06dd71fd43c9f7 SHA512 e32ed9518e9630e99edcf1963c3d0e7047ea8252853c9260eb5403a4206170ae28fd27eb239f39da4d2db766f830b3ebdc9e4da2e697be20241d928082200955
 DIST system.net.webheadercollection.4.0.1.nupkg 85078 BLAKE2B 4c080c1157d172340b94b1eb406d340dabecbe279ad8b896b24d53eb87bd566e83d03ce0ce1188c419b05db2330b40ec1d977fd61a71356efd4750f21949a80c SHA512 d1a2e5f3269a1fefe3c88d1fd4c9fdc4ebc1596c3239a266fe947648f00dd91bf18530ffcb1c4f699b7977ed8a5c065d3e424e69f4b8410d4669785970c375ea
 DIST system.numerics.vectors.4.1.1.nupkg 234884 BLAKE2B dfbdd164e434ef1f98574b1f252c524776a73a70061d003bae8cd44d8a53f2792164885d4dfea17bc434cee21261baf8eb63520142802ef09fff573c2e127710 SHA512 dd3cfd6017028fd348f96b898a756909f24530cd0754af04d40c8ceff75676fcefa7b5dba4d7e713735622712a991c7610385785252c56287ed238f6dfd1a453
 DIST system.numerics.vectors.4.5.0.nupkg 382792 BLAKE2B a97284a76a6729052d3a127e1875e2012ae5b90a40533783dc799b543d44cc084035374799e9e1b894083cb61f2639711f18b76ff31145140519a9674dd9d2aa SHA512 9c04ec0530f608aaf801837a791b33857e2ca6d2265a6049c01fd4e972825967e709cad3070f174829b7400f608e9a641d3afc3a45d4636d4c47dd43dd0657b3
 DIST system.objectmodel.4.0.12.nupkg 321648 BLAKE2B 7a008caf5f7f38f34d62037e5e3505dc237356246103d00be5b07423829fc4f2a763fa841673ebdeb0d6caa79dea8d7fb9f56cf078addddb3cc853e63101f03a SHA512 f5191cdb360bd2624abd7454c66862540f97aa19df92ea0854786b9d3cb9549e95c6194cfe8adc01589203c4feb1673a129c4929486bcb5f8db83ea535477c53
-DIST system.objectmodel.4.3.0.nupkg 321655 BLAKE2B bd1110665321034ec27635077ba7f9f1a18cf2f813d7a99f511a91fb6c95827b3b10108bf8a5b4a9e32685a8754e1eeca7d1afb2dcd02ad5ce3ef9db61fcc114 SHA512 409bca3d2139bd1d003c711400ba2db5e576bb54d593aa541ec3576e7b2029b60159ab1c5b2c4e7389267b1b95ebcd8c2f064dc6e1f53e693aacb1737f066123
-DIST system.private.uri.4.3.0.nupkg 16869 BLAKE2B 7a407e16b35e4a5f405029e80749f7ae1c907707d9f72657016667ccf1255463011497b09b7d9e23fb3ccfd4de508dea48b33b13267775619f63134897e54c61 SHA512 5989a57ef273b689a663e961a0fe09d9b1d88438e5478358efc4b165de3b2674fa9579c301ce12d2d2fa5f33295f2acb42eceea2ebebf70c733da6364ceaf94d
 DIST system.reflection.4.1.0.nupkg 700819 BLAKE2B 7d98a07245ceb46e777b904b66ebd5d85067ed9a5e7ca10bc0838f115cfd5f7da1b6420b2126e56310b47b533fcd22ce020e046d03423ccdeb9392609783ce56 SHA512 67143ef8f6fb1044830c70c66e9a2b4f1850f50df5dadfaa5177338362ea7b9e9fe4b0ba59cd4eac6e1c8db4e0c285c239e4c2b3ce61391618b411aaff45f7c2
-DIST system.reflection.4.3.0.nupkg 700821 BLAKE2B a6aaf054f27be81f1a8251241deaddd6d35aa9ff1cd1b35a65c75201c3305ca0481d8f7a6de52a85736b0477332c404573db300f324e6301365f14fd59784225 SHA512 2325b67ed60dce0302807064f25422cbe1b7fb275b539b44fba3c4a8ce4926f21d78529a5c34b31c03d80d110f7bace9af9589d457266beac014220057af8333
 DIST system.reflection.dispatchproxy.4.0.1.nupkg 68266 BLAKE2B 14a1be86f528c7a01cfac51553a0522f0192dbf0b6e2a5d3e9114ddfa1bca854d73629897d717e16705b6cd8052cfcd2925026a18c5a931850bb15784a3d357c SHA512 da76cbd8e9c688233bfe56e20063a04f785754794b75f6078b1affd66e8678805de37c0b20b03c24dcd856f2c29dee2e68b4a95d45e4686cfa9e31e70935f5d6
 DIST system.reflection.emit.4.0.1.nupkg 219037 BLAKE2B 032654f464c65df895878e3e726c7f14c8c380fdb29a092b3ab99b57cd5b4c2a094df9a579b6a0b8ab416244a98b7bb2efe4a3e56792bd62f35d7077eeae33dc SHA512 ff7766886b945148ea65a49e4ddc648336340def2c2e94b8277b584444ec9126d96918f0bcbeb62016a530623a89ccd9eae749d62065b01058387b5d09fc7dd1
-DIST system.reflection.emit.4.3.0.nupkg 219534 BLAKE2B dddeaced247da3ced46ad776c3560d886db0581d10d2a32df3827c275a895f474933c528b637439831e7f69cabf70bcec544ed1d16069ef11cb047126f2c3b57 SHA512 be45051467a36ab965410f112a475fb81510a5595347d1cc0c46b028e0436a339218dd3c073f048c2d338b67dc13b45742290b6c46f55982503f74a8f2698818
 DIST system.reflection.emit.ilgeneration.4.0.1.nupkg 123128 BLAKE2B 784130af9ff312b8757308a16ef704a66b70f60461eaac1c39f54db4b3d4ca0ff066e495374c6899b4f65f4bd3454d2f252b4b404cc9c04e9ea44e896167849f SHA512 c3819cd3a58f609ff579652536f9f414481caa4d9e7dc277e0d3c8c8fe8e0ff90806fa94f7c6436d4af853c6fccd26d5af57f0a49c5baceef4e0daaa39e26773
-DIST system.reflection.emit.ilgeneration.4.3.0.nupkg 124567 BLAKE2B 4495327d565f0ef5935bb2ff6f71e25132abda4c8ffeb51195bd4b96d1d5c885e344519287dbb22d28957f0fbad2af0cc977c2fe4650206f7b72ee5dec45a08c SHA512 e9be5f62bf64b1947a49857337306a5d0980686b58d665989e94006ab04aa7e0bbf4d8543d1b57d5bb38079052f275f339b73054a7357e4fa357208a0ac85d69
 DIST system.reflection.emit.lightweight.4.0.1.nupkg 82989 BLAKE2B 80372b79e7e12b1945f6f178a9d427e32dda82998609dad684e9ebd806039869cbec3561a836b20b3988a4579049e1f39a04c9e4fbef4085a2e54f02dbb9c120 SHA512 542863fa085a31705b0b294b64744c11617a098beae4d5664beb53189148d19246c9a112de30f2d597e0888069a414f2aed8e94a2b369294a81b24b991bc2149
-DIST system.reflection.emit.lightweight.4.3.0.nupkg 84426 BLAKE2B 370e3b74a769e2a8043287ae93804d726ae0704440e3fea9cf5fd1ee46222cdd293d35896349719e87123ac24b05042665148023185ffb89ab8e00820820590c SHA512 ad58af07296bd084907a089f92026fa3898b764eb9d6a07c9414b550a83ac60456f32a34127c29bb93a9633fb07ba9fd828f7b41a31dce5ff019a7cf1ab29435
 DIST system.reflection.extensions.4.0.1.nupkg 99743 BLAKE2B bb72501a2dd11ecdb1f0ee41f022d7a20635cfb8858f8570ee52d15f7c0a7bd167ebc420ff164acf9a5e763e2dabdb7c7571e9155289fa8d9569ba1e42071dd5 SHA512 3e2f07c29836735be6247e75f760de90783d5ece64e8cce4e23eceb777da8975a35130804d87ddd26449c13d2ca34180e3f6b844b0fdd2dc594bbec6e7272098
-DIST system.reflection.extensions.4.3.0.nupkg 99740 BLAKE2B 15554874193bbddbb2a7a769a239923ea039b117d9f8ba5ae634b82fdc8f04fcdc871bdf328b0b4e418c9f0c987dfd71546c778a99453ba6b5e754e6939b3c28 SHA512 06cfd992c8d7fd9ab6432ab02be981a01b6558285a6e26a7825a064d4efcce08d9e7344f03fa19b033a2459d42b0b80e8c1400ce39b47a1752869ab8825b0475
 DIST system.reflection.metadata.1.3.0.nupkg 434051 BLAKE2B 4ce1ed90775327f7e7136ae04f427c39b5d38dc9d1b45464fc39e86e8a1aee8f078e810e6b60ef665a8cb69cb7b409151306a0c3657d7dbe30e093389b40cad2 SHA512 a62b9a3b2d191f5fe734731dc05ac73f6ed3a18ed255b94ca9cfaef281157f8df821ca4c996a6e53d6975a10257916239ca99f077548bc6b301308b0a6db9e5e
 DIST system.reflection.metadata.1.6.0.nupkg 852113 BLAKE2B 4d15704a1fe00501c1bd8c945d02cd2e2d77c12ce86aa628edd18383838c9dbbfc449b8026707bb1ac570e55369e988aa6068f57acdea28f519bd3bdfd5b9304 SHA512 f5227666edc6bb1da78b8a8e86a68e9bd647caa2ec6a1580c14a4a5e1fe5cfde3bdaf0d8c23dc210c405a55f83ceb6add1a9adab149dc065b38cfddc9b01ba20
-DIST system.reflection.metadata.5.0.0.nupkg 1006081 BLAKE2B 2b10bc13e07d904270e3661435d372008ab9aee0c0dfd409251867273c3e9541392413018306900b0d9c114843756828c946801f65912e27f7a3d351c9061c52 SHA512 3b74e3e491eee87a8410f5b9a2e556233d9919267f6a054da7a4c9c34b6916b07c77ea9ef8cceb5b7c3361e7394e502cc3c9a09247c6a06bb58509e82554e527
 DIST system.reflection.primitives.4.0.1.nupkg 281678 BLAKE2B 3aba0904b106e846cc9ff3fec98a6cc4acba2d2dd3296248303bb02b2e32bdafa7fa095f1c29636fd1c85ca5ef4d972a7b6218834e458ec9f41f275eb195cb4d SHA512 08ad6f78c5f68af95a47b0854b4ee4360c4bad6e83946c2e45eaa88b48d27d06618c6b7479bd813eb5f30a2db486590d17645e9c0e06a72dbe12ffd37730707e
-DIST system.reflection.primitives.4.3.0.nupkg 281679 BLAKE2B 36dc0fb5e7a6927ab2f54bc9ccb2e032cce0284c3aa9b83cf2ded8bab5fc7918553b06b16bef69161a7d9a0548b3e9159ab582533578cd28a661225559bd2b1d SHA512 d4b9cc905f5a5cab900206338e889068bf66c18ee863a29d68eff3cde2ccca734112a2a851f2e2e5388a21ec28005fa19317c64d9b23923b05d6344be2e49eaa
 DIST system.reflection.typeextensions.4.1.0.nupkg 187836 BLAKE2B d9cf37002f9c37bd11c43df97fd2e8234993f34c97e9a0606ef28164f1c587cc55ad2f2d66dc62de304ccae90f4d5636d163bbbc86fc00b4bb258a5dc91f4068 SHA512 5b1875ae86f76f60307fbe261c7471e996d4d4eade0c4783cb35a5aad7fec4f01be01cb1f1f78af22d483ecce12096f6ed431d69c4a66c7bf235008bcac30cb7
-DIST system.reflection.typeextensions.4.3.0.nupkg 187842 BLAKE2B 2cec73bd787cc6b4bee793782ff0db98aaced7e7a0645cefb60e6e47d353e1959eed7a48db24e9c7ea6ad7b87648c11c3588d43028c4e0d14c695c38356943a2 SHA512 68ae81a635b9af2aee9fc8fc8fe7da0356ef4da4eb32f81a89fb75613b96714e8f1a1f4c12bd0d335efbb03408cc7a744314837f13564d5fb262ca272055677f
-DIST system.reflection.typeextensions.4.5.1.nupkg 268021 BLAKE2B 0ee3359f23d0544ff5742fc09eff3c7db36471c78c26c69958db7a870955fa754cfc366aa8ac5ebedc7c9039d7d4cbdfbfe74ea0da3fc87537b1d6c35d96f0cb SHA512 a110b82018f8cbb81c63d517c53708bc12e1449ba7b4be827cf59acd39ad638757a17a514baa48d98fadbb4efea766d49f969bc9de707f92efa67cab0d9753b1
 DIST system.resources.reader.4.0.0.nupkg 34410 BLAKE2B 808f6bfe97ae42d67f763d97829830113d4016614c5624073cd40babe6832f94fdca74764ab71848830b0acd924954b98ae60d5da994936e32ef5dde715cb4cd SHA512 cf88c486ea14ab083f0b78c040d7ffefdbd07ba3b20fb0fb335867a0c4fa0f79185a983f710f60ff9b36a1b442ae0fb80f1682fcade80347c2b0150a46bca093
 DIST system.resources.resourcemanager.4.0.1.nupkg 85915 BLAKE2B 11b7c350695fee892052fadccc4f24f6cdc9bbdae8e51122115dbdb357f584a6392ad4fc10a4be59c123a018e0ec559f5ba035fe5e5d7fd868f5878c7b00e306 SHA512 5165916e258dd38fa83278fb98dce271a95e0091c1274b8cf5f17d88b9e6284f7a7bf145194afe4f20250cc31ad714141f9e0687cf235ff05460fb47cea0c525
-DIST system.resources.resourcemanager.4.3.0.nupkg 85908 BLAKE2B 002ba25bb953e5a9162214338b50abcecfd8183c68c7b5de8bbc1780e57322b6aa225e13436ffda54b4013fb77540df7428d8c3c89c1a21622ab124d8ca174cd SHA512 9067db28f1c48d08fc52ad40a608f88c14ad9112646741ddaf426fdfe68bed61ab01954b179461e61d187371600c1e6e5c36c788993f5a105a64f5702a6b81d4
 DIST system.runtime.4.1.0.nupkg 7263653 BLAKE2B 0a6699d985304a5072c7c283a42c100cb8f13ae61e95f93463ed57438ef3d7c655c3c4aed43b1d8fed4057933e924ca1e6b9a5987f1328fe4e2e172861572593 SHA512 4b05eb68bb485846707c4fe3393f9616d3ffb6c5f62a121d81142ddf7d0241c931fe96d193b7bf02281a9368458e0764466766557cfa9709035dc76d8fdd7706
-DIST system.runtime.4.3.0.nupkg 7263712 BLAKE2B 6cf2c6704f2a5639bffe2db645fd6ac935e341a5d50f1be97969bfba15e7fd93c94a2ddbb75a3538cefc05142fd72331185ca7ed175141102e8f977649f3bf1f SHA512 92ab2249f08073cfafdc4cfbd7db36d651ad871b8d8ba961006982187de374bf4a30af93f15f73b05af343f7a70cbd484b04d646570587636ae72171eb0714fb
-DIST system.runtime.compilerservices.unsafe.4.7.1.nupkg 106815 BLAKE2B 75dc584026b4bc589ec1bdaeb7ee8933a147391f7ecb71e69c9397d517368f5c1acb22d1a1a2f10a853baaf9fb659b59d5827baf70ce882792ce93cc3be09b13 SHA512 c8d781feacf79f3effc1c231a84beb0fa1e869fbeaa1d94ba3e84db75afe915e045c39ce059331fe48956534dcebdcd54fd97ab199e6a090bddc5250e208ee52
 DIST system.runtime.compilerservices.unsafe.6.0.0.nupkg 84343 BLAKE2B aea2f833d6da80dbc275c47bfb207d77a1f2dd203a29352ff5a6e96d8b52752ee3c5bde38117c5ecc5dfbad66d8b47b2001efa1e2d564e14cbbf58d0d1fe208e SHA512 d4057301be4ec4936f24b9ce003b5ec4d99681ab6d9b65d5393dd38d04cdec37784aaa12c1a8b50ac3767ed878dae425749490773fec01e734f93cf1045822b3
 DIST system.runtime.extensions.4.1.0.nupkg 1060307 BLAKE2B 5426e4a8e6d9ebaa6c88ca7dc495c120b848602f15f102d3c65105c8a03ee35136d5eb2e04a3eb2452dea96a36af70e42cb7a317e269bf4ef8a1d3a5f33f9784 SHA512 42d009be57d6497aa0724924891289f3decd916d0432c1c865cc0494092f5e59287f632a70c5060b3c78e361ab04510d75dfb3c2d2853f54201f735eb6e2dea6
-DIST system.runtime.extensions.4.3.0.nupkg 1060357 BLAKE2B e58c5c36d42228a507fba876d43f064b872c93dc4a48e9a7475a77c27e00f2added1dbb8dd5d6516a4c5652ef2b01f5fa31aa611360b38a0b66a0b1a2e479699 SHA512 680a32b19c2bd5026f8687aa5382aea4f432b4f032f8bde299facb618c56d57369adef7f7cc8e60ad82ae3c12e5dd50772491363bf8044c778778628a6605bbc
 DIST system.runtime.handles.4.0.1.nupkg 54854 BLAKE2B 396943fd119a2ca9b91d1e8059ec1854ec4eedda6b73699042f8ae761bde1b6dde5f7a92a2066220d4c8f7d872741939ba198cde2154d62ff0350ed867ad0d09 SHA512 966a943195b66118277a340075609676e951216d404478ac55196760f0b7b2bd9314bfbb38051204a1517c53097bd656e588e8ab1ec336ce264957956695848a
-DIST system.runtime.handles.4.3.0.nupkg 54854 BLAKE2B e68360382f2c625e3b1526dddb1d49c6bddc9b78d38041801f0df876f1b06d429c608ff3b28a0c1415495eb38fcd70aafa9fe8dc0bb323790e8a85718a9f93f9 SHA512 0a5baf1dd554bf9e01bcb4ce082cb26ee82b783364feb47cba730faeecd70edc528efad0394dcce11f37d7f9507f8608f15629ebaf051906bfd3513e46af0f11
 DIST system.runtime.interopservices.4.1.0.nupkg 2542509 BLAKE2B 3ecf490aacb98e44dd952301828ab27f5cbe6b2053dfdd745737cfe1d7a847691e13b3a7df558daa2a1747e50e7045145a90f51e26f108fe9826814a0c60b7c0 SHA512 e8511e6a4cd40f3c603df4ffbbf6a4aac4d10be79bcfd0249a9af90d55cf2a02543ad9b82e607a4665d58f28c7ce9bdb0f7f3ff9bc8ded8a252213916a771bd2
-DIST system.runtime.interopservices.4.3.0.nupkg 2597020 BLAKE2B 4753b772f9d3596eae34b10497af40bc6e7cd63e9319e5789378cd148b009ae9fd5bde5e5757954ef06826bd4f4b79a3f8d8ea07766238407f26f3e222cdb2cf SHA512 650799c3e654efbb9ad67157c9c60ce46f288a81597be37ce2a0bf5d4835044065ef3f65b997328cbbbbfb81f4c89b8d7e7d61380880019deee6eb3f963f70d9
 DIST system.runtime.interopservices.runtimeinformation.4.0.0.nupkg 165972 BLAKE2B 0a4e21adbb275fded46ae04ccda695b9fcb29d4f199979b914a55d0cdc4457a6a7dfa8bbd82a5a46048d052a7e852cb935a1d4a7c6bf7e462f7b14327a52dc9d SHA512 462d35e66cbdd21dc007f06c6ef129ab57e810fa0f0416bd2fc6fb7eed55138780d4d31e31ee6267a82e2e3a1607e5c642bd6efeb130b57a1baa87e3141b0080
-DIST system.runtime.interopservices.runtimeinformation.4.3.0.nupkg 179546 BLAKE2B 780a92196ee216c1175768b32c04e88cfbc453bd9fdd6e5645c4ccc98f2c5ad62fd5cb158117df9391b1cdc3130a2cddca49304d2579434597350097960ce013 SHA512 6f4905329a3cc9e62d274c885f275ee31c5af57a6c9fd1a5080d039cb748e0277bef3dc8ce42863cac78365084e00a032279bf3d2b7254a49f3fb1566a29ad1b
 DIST system.runtime.loader.4.0.0.nupkg 47372 BLAKE2B b6f7f4f74a8f36791eea44a32bc40df679a83ff586c92316af37e64a2c212bfec2557b403e3c40f1fce9d0273aaf074cfdf27ad1b9f3adced2fc11e7456a09f4 SHA512 0065abcb02c8d81d79fdd9cbb859e51d61635e6ab54e5d248d668a4c76da27c4fd908c6243c6064ed88c41cf2b52be3d9762637d96bb418d0a2aa972cc0ecd36
 DIST system.runtime.numerics.4.0.1.nupkg 283710 BLAKE2B f5ed3b1296fabe1bae02feed0585c171fa6c040f7ddd234034a36e87053a2a0016784adbf6b8b1d86da4bce7291107830ff8ac55fe3859d47f845c8b6ac93676 SHA512 333a3ba974e80ee66d33a9d8412e0bd585350bd30ecc65ed35e9d7c69284dbb90bc8b8d019c40476f3277049e0c7ae9b05a7d1e27614f057f39a141132304cd4
-DIST system.runtime.numerics.4.3.0.nupkg 283763 BLAKE2B b9e2ffc7e974fb4824ed174be43e664d0fcbe1e996640b8f66a17503c8af24d106e883092fd61b2990c32472423bcad943e07b7e25d126563a219e1b617446ee SHA512 3e347faa8e7ec484d481e53b1c219fe1ce346ae8278a214b4508cf0e233c1627bd9c6c6c7c654e8c1f4143271838ddd9593f63a1043577ad87c40e392af7fd34
-DIST system.runtime.serialization.primitives.4.1.1.nupkg 222353 BLAKE2B c53253fbc44b119c29e3cc5a049919d293600182543e6b0b39d0abbaa7853b4b025937d5e5df9e89630a74dfd22bea4c0da826ce2b37211b8db3cb4aeb18ba6a SHA512 fa6a90aeb26c0f1e72c48abec0b60a1ebea955cd3c1133b3245c04dd0bd6984c0ce0253944d28676abb8edb93e1c649c693e7c6425459a3c29a74381531cb540
 DIST system.security.claims.4.0.1.nupkg 147903 BLAKE2B 62b16ac0f1730d9d7a10eee470661d991afe6ee8b8adb762d9ed06f49d11c5e130adee1ce7898ec0337a9d05571f9b6c44386cfa975831bbaa484decc021e0ee SHA512 45e4bc0836dfc76089f9ed5949c69a04e35b67d073f0ad43605387af94397be28affcfca591d10f6407d02133577d12a9ed0a8ee227f27962b6665c82afbdea7
-DIST system.security.claims.4.3.0.nupkg 147933 BLAKE2B bd00c65069b23415c146861ba7ba768a0da69f9f0a4496fb1f43780222f899ae62ed35cd0bc5a0953d8b13920800b59414cccad7e6bf6614ee675680c06e27cb SHA512 ab72b90801f6c051a2b31645448eebfca74642b3cfa1d51f80e21a0d0d7ad44d3366dea139347e2852781b7f3bae820df16c3eb188a2c96244df05394ed72c86
 DIST system.security.cryptography.algorithms.4.2.0.nupkg 357563 BLAKE2B ac5ed2bb8ca463a248b7ff84492fb8c2f0eca535d299369948b731f574eab7a62fa0789f4475651c5f9f673316dd098440800d0ee0faf0097cda4df76b96fe77 SHA512 93d1e6394afc506b58bd26a9b3ccd64901bc2d48dbb8825ba1f927c17311cad607e6f8a9794cc41aee83b98eed08a23a7c58390b9b852f894735392342f37a3d
-DIST system.security.cryptography.algorithms.4.3.0.nupkg 402204 BLAKE2B 3bed21fdd12f005b6a7eb225623e71880a37c79cfdaa770971b6563d8e7f613a64617c73deedc2c6c31fd8e908f9ac95903a1004f1376bd914431f89c9dcc8f0 SHA512 7641d70c2ba6f37bf429d5d949bda427f078098c2dcb8924fd79b23bb22c4b956ef14235422d8b1cc5720cbbcc6cfee8943d5ff87ce7abf0d54c5e8bce2aa5e2
 DIST system.security.cryptography.cng.4.2.0.nupkg 289992 BLAKE2B 61250b78551d119e7299ba5b64c2bba94d455fbe26c25919a5da12f66ea1a5976bd3fd7749f91af5f48578a7d2fddaa0d972a6bf375bca1b2adc98a791109f4e SHA512 4ed77501662e6d18733f507077de9d277b61b3d2dacee791e0b3a56c9a604bd2acfb81334c51660ba33bb7a6e24ed46c2da02716f6613a937152ea4806540bf1
-DIST system.security.cryptography.cng.4.3.0.nupkg 290620 BLAKE2B aaa7b495dd7a8884b125f05b62d3e641cfb04e82f8f376f1e1839cdf124de4643dcf1e6de02e0296768db5f430a33d75cd2003261a815059055ffd5f050c65c4 SHA512 6272273414eaa777e78dca1b5ecbbdf65e9659908082aea924df0975e71f4c1b47f85617edf90ead57078c29513a160ca62f123be9f9f339dfb9c9386844f5ea
 DIST system.security.cryptography.csp.4.0.0.nupkg 117365 BLAKE2B 9153851bb878bb339ea2ad715b24d4fc9f17d8b2448985466afefd528fdaca5a18e68da4a686e867cdb9d498df6141367bb2dec005e682f9447817e2ae1d6aa2 SHA512 6f3fb8256086a16ed7fe339e0f09d42a081c4f783b0f8626bb7eec08261532ecf517f6c7a41bfbb8e2b99b8f1c79ef99ef7c724d8719e287fe7981ebe8b6aa8e
-DIST system.security.cryptography.csp.4.3.0.nupkg 117553 BLAKE2B 93f32c719f999c566ac7ebc486854778051ca885632a3ecf5b50af05a700df092a0e13ce08f16c854aee3ef06bc27fc61e6b03f79f3170eeb2bcce7e22d9728f SHA512 43317591747a18f52f683187e09adfe0e03573e6dac430bf3ba13f440cdb1c7bb1f9205369d5f3b2a0f3fdf9604d5ba1e6d94a899a25d2c533e453338578f351
 DIST system.security.cryptography.encoding.4.0.0.nupkg 144164 BLAKE2B 7231fc3c8d9899063cd547273dd50d4b29526d7a6c0dfdb081e9c0ca3af621ad98f98a792fb4a350f0cc737e9fc315820a965bc09760bc8f4333f414e470d929 SHA512 f20d60a5f9affcb49995d1bf27a1c09173ad601147241c4ca504e13324d35f7d6618e8a92d04e174d5d3d9821a03e122fd3b0f8fc1d512d105b6afd73b496c5f
-DIST system.security.cryptography.encoding.4.3.0.nupkg 144382 BLAKE2B 9f8e6a4ce5fe2a4de2be0c827e914a02a257011b508e97e289b9de4657b598fdbba4e64dcf23a29af6e4910af41e62f3b3f0d6a2156ab691e2e00ad76c6499ef SHA512 5c26add23e63542f37506f5fa1f72e8980f03743d529cd8e583d1054b8d8a579fb773fa035a00d9073db84db6be4f47cac340d1ebc6d23dd761dbdbd600075e0
 DIST system.security.cryptography.openssl.4.0.0.nupkg 72038 BLAKE2B bb546c03ca8926bb113f590dbc08f99bad81b9dbdd3a58ad086c34e91f59748587af1323eb38073c0d77a8cd2ade1cbbc919983b93d35c3498438a7322b0127d SHA512 432629e457c7061a7d207fb60597a5a8a806fab8c62574833e509afa3c4ac8fed529dbc7f21d69e16dc9fdd091aaa575191e9fb552eedcf28aaa8b5954d32e9b
-DIST system.security.cryptography.openssl.4.3.0.nupkg 71949 BLAKE2B ec1654bbd09e1244d260d1ddbefcbdeed207816a2719f3bb0f055a7a140d466f186667b1f202e0d1a3eda97f247d2c1776ad6f38f50de58960da5f0dfd2a2d08 SHA512 64530a19489730f873f8c68e6b245135ea260c02d68591880261768358d0145795132ba5ee877741822ff05dcd0c61edca27696ef99e8f9302a21cadf3b1329f
 DIST system.security.cryptography.primitives.4.0.0.nupkg 81324 BLAKE2B fb247eb8938baee8c4a862994e7eb237a0dd5f54a5d3f288ce44a986bac042f4c2397a023f57cd9b05ade5013dbe3187365fc4264a8c4f38bfbcc5cbaa8794cc SHA512 a11562f4fd90ff39c12af2078aa3743e323d8a70fe98cfe3d7e0ec182a2166d353c1ed8d76dd2a9525a80287d7dea228f04982edef6584b89f32f72647b2822f
-DIST system.security.cryptography.primitives.4.3.0.nupkg 81382 BLAKE2B 55bcbe3143e85d24f47c72ec5e1f0ad38a1f931932b3a8a03dc00028668fc085d070dfcded55654e09328a745b208b9f15928aaff1087d8906bad41d7cfb23e0 SHA512 5ad8273f998ebb9cca2f7bd03143d3f6d57b5d560657b26d6f4e78d038010fb30c379a23a27c08730f15c9b66f4ba565a06984ec246dfc79acf1a741b0dd4347
 DIST system.security.cryptography.protecteddata.4.5.0.nupkg 196314 BLAKE2B 339b54677832460b51a2dde8496defe0df3f255dd6fd2c2e919513f7f31bf3660e79984c82b93b9962f692a6ddbac9b06e3d9c22909d7725e1e68cdfdddaea69 SHA512 b3f3052bc06f82d7a3663e5af2a00f0d710606d5a4a455fdf2ac103ffc2a55af428080bb2eb287c4315d94de71e9a7c601bd195415462199427412e73b642367
 DIST system.security.cryptography.x509certificates.4.1.0.nupkg 702294 BLAKE2B e628b9c28a01eb4551ca5446c70f4621de0ab1f5224a2afe92c19935467ab1ad40eb4170eb044e021bcfc972e579961036b90a3d287667b571735f8a60d01254 SHA512 6171106ffefaea916a72abf17af038e0203b4e779b7bb75f6fe6cec04c6de3316a7ad4eda8fd3ce7dc0bd8375a0f5e45387456499b24ba22224538cf08a0cae6
-DIST system.security.cryptography.x509certificates.4.3.0.nupkg 706727 BLAKE2B 67c777394c982267c08dba232dd75aba6e924784d14388f7f8e347293c8f3a67ef9490a078b3f56f649a1ab352a4c924630f384850e3d5f1510dceae45fd0af1 SHA512 318d86ab5528e2b444ec3e4b9824c1be82bb93db513eab34b238e486f886c4d74310ed82c2110401fe5cd790e4d97f4a023a0b2d5c2e29952d3fd02e42734d00
 DIST system.security.principal.4.0.1.nupkg 94549 BLAKE2B c93adde0fb765f5930c78d8c057db6517db0fb6db411e0d0154523dab8d36553089f2c4c5b1851920f361749efd5e2ce14d3544ad5e3f3289f47f21ee05a2374 SHA512 92b8b4c8b10c54f3d79c849b2169a1d012efd2151e5a864d6b1f0babec7ae4e96467f992cbdab922cbdc1f74539f222d1b3ee6725a6c4a5073cb1b3e27305d0e
-DIST system.security.principal.4.3.0.nupkg 94590 BLAKE2B c6fc5d6944a44b3ab125af5d59493aada6e8c73857311b8118adf197b9db3bf77fc8de9f320dcc0d55c6e529106b36307e14baab75766296bf804289de800a26 SHA512 db8a1ed0d189637d9ef83147550ce5da890cf6ec189a7d006ba9de86ab55679e7f025e18bdaed2dc137ddf82a7e6a0131fb4d54d4264831862b1d7c5ee62837e
 DIST system.security.principal.windows.4.0.0.nupkg 220965 BLAKE2B c06a2bb77d0c20027887624b1caec077a23c65f3bbb7f5888f1a0579dd524b4d3c59d1f86f6edb9597e21d0372cc5a977b2f55771cd6218cf344e769f711b420 SHA512 55c673485e9274db630b40c41ba5de3f477671220ac9a79b0230cd1a5cf6fa51062b7cc47d98908ed412de363f2fc73cbc030c1f064c5d4ab743a82d106c532a
-DIST system.security.principal.windows.4.3.0.nupkg 220931 BLAKE2B dcf84627ab57c5e72e0f1828b48c6e9bfa2ea2ead7b9c02bff03b9819f4057cb9d4a8821cfd0a98a381f2d7a2471df04041567de970f9d60557923e6e09317aa SHA512 66c1d5a9d649b964e1653fa2cd41d8f80515b7cd727fcd7f0890552070da1099ecd1032560f259a108e0d1d6a6da23fa07bc5c922f426a91f33b667f7c004019
 DIST system.text.encoding.4.0.11.nupkg 327286 BLAKE2B ec08fe2bfd3eaedc7a50d823ae424268d1f51f8816d9b3645b4210e10b8cf89e801f5f7d831a565e31cbf795952ee5a6a60a45d6432e0593727f0e0e213818ed SHA512 f974335143f36b318abf040ed535887f28089d749b1fa55056345df5243dfbd56d27b74c6e4d87a737fdbb8e699c5291bd25f1e5db4700bb00bf53330c7e3e9a
-DIST system.text.encoding.4.3.0.nupkg 327281 BLAKE2B e153609b257919932499a013337b8b2a4087ebff7e8ffe6854ad1c70fbd058aaabc4e974313dfb3cf1a9355b0ced87bd97cd39f6a4962b8a4a87003d3a66c53c SHA512 6ff7feec7313a7121f795ec7d376e4b8728c17294219fafdfd4ea078f9df1455b4685f0b3962c3810098e95d68594a8392c0b799d36ec8284cd6fcbd4cfe2c67
 DIST system.text.encoding.codepages.4.0.1.nupkg 1615060 BLAKE2B 158ad633b1dda45136413ecb49741d8f5c60217d4ccb8af0cbe49be5260298e44fa4f5d041677a2cbac0d521089869cfe1f6623fa1686bf84b0bd3a8fbf6e83c SHA512 da68445fffcffa0a8b8f2bdab880ec4cbe51dd66209ab455cf6f16166efdf31b47498e852f616b3b7ba0dd11209e05a2625cca6fb07fafa20a945cc501282026
-DIST system.text.encoding.codepages.4.5.1.nupkg 4234891 BLAKE2B d06be022d76a5793999248baa82db37adc262da2e74531d75f5f5e1a6c29b0ca702694b19c3254ab2e955f5b70959ff22f35d43593a2072af6ba5b7952155dc2 SHA512 12edddc9452a0c592eb24aeb2b9e152d60b8d44540349368e6fce3a239c6029847f8557adcd260df3b39c744ef45a6034d9db2fbce9e20e2b8dc78363578b0ef
 DIST system.text.encoding.extensions.4.0.11.nupkg 244203 BLAKE2B 957201548c8629ab5111cbbcae3518b7c07bef93ac972b557e4f9f729dfd2519ef4523d5f6ea23b22eb19f93a3b17dbf7f1b6bed105f89b9219d53d8ed1534f7 SHA512 b2ba1f2a96bf14466fb31e4ac1fad25e7032688357340ad8976b8aafe7cbe39c061835a4e17d7cf6ae291d3155f07d3371f6b65ffc1c15474c3c86dbb7735e82
-DIST system.text.encoding.extensions.4.3.0.nupkg 244195 BLAKE2B 9dc2fbf672e07c5302bbb8435e8c09bc91febb96f22b85b57b09b2046fca224c786f8710b634559de2722f3dbece7b30e6a3c6a78e98e77f955d550e440beb60 SHA512 e648c5dc781e35cf00c5cc8e7e42e815b963cf8fb788e8a817f9b53e318b2b42e2f7a556e9c3c64bf2f6a2fd4615f26ab4f0d4eb713a0151e71e0af3fe9c3eed
 DIST system.text.regularexpressions.4.1.0.nupkg 514882 BLAKE2B 864d70cdb65bf87b684561f98d2d5193e2d66015e4cd770ab823a6ba966b3813d75f0ed6aaec82012a3d5f66ef9be182e7773b4c3b94407ab10c9e5dcd9e9f2e SHA512 9b612027e43c33cc256e016e0b400547c5923e93ab6ed1a40d2b97292cb18a1195fa79aba2b0166a6b11842a0fef6685d31b848375daffdf6d2acf297af40bbe
-DIST system.text.regularexpressions.4.3.0.nupkg 530523 BLAKE2B fc77aa0a92658cfac1b3fc00b87fabbec1be5c79776b0b2680775615b273a5a49ff8d5000f97415b85fc0283ff95569ba9a5a72917828455646053033088b49b SHA512 80353c148df30d9a2c03ee10a624d91b64d7ccc3218cb966344cfa70657f0b59c867fed2ab94057f64ab281ad9318353f25c23375c00e1376b6589ae0a70aad3
 DIST system.threading.4.0.11.nupkg 708036 BLAKE2B 6b85f9c80dfddd5faa9799fdd64379c4c066b076596cd0008c46114b91025a20e00cb8b626b6fa5d139af6aeb8a3f6781ca7e55c4f7d147eae2f38e14d7a63c2 SHA512 05c0dd1bbcfcedb6fc6c5f311c41920a4775f8a28a61ca246b6c65ad8afd9b04881d3357880af000ac056fd121fc5c3ec0b56d6fd607e0c27e7a639157c85e3e
-DIST system.threading.4.3.0.nupkg 708088 BLAKE2B 004d01762fad35a4607522d974a0cdc3d0049c82fe704f2f86fb98ee81059ebb56d13c290fcd273d1067a1a7c7f17bf3259d4d7e802c1d09a95e3c5fa29ef3f3 SHA512 97a2751bdce69faaf9c54f834a9fd5c60c7a786faa52f420769828dbc9b5804c1f3721ba1ea945ea1d844835d909810f9e782c9a44d0faaecccb230c4cd95a88
 DIST system.threading.overlapped.4.0.1.nupkg 167694 BLAKE2B 03144d288128fe3c456f2380a5b32a62d70615a4d444778e32851daca88dbbd13d6f8e9ff5d9b97be9566ec96deb34f6adfb6cc8993a6fda794d7270f54fbba1 SHA512 e74b5cc0dd9e446d3509bdeaf6f9717f447b1909d9c88e1ce2e5e9ad5135dc9a6fd4883098c6c0c165ae9e8e0404afb630f9b0651a493ffa6a2cc31a14c8289d
 DIST system.threading.tasks.4.0.11.nupkg 840020 BLAKE2B ec5b6bbd3c912d3552922acd338611baa992dca6bf07b97b391e47b5b41ab718c373551dacffc7b4b67870287e93eb6e70ed184213e800fd9b424bf3e02cd8cb SHA512 fb66c496a5b4c88c5cb6e9d7b7d220e10f2fc0aed181420390f12f8d9986a1bd2829e9f1bf080bb6361cd8b8b4ffc9b622288dfa42124859e1be1e981b5cfa7b
-DIST system.threading.tasks.4.3.0.nupkg 840017 BLAKE2B 1cf4a8cc833da0a38304757db3808df5c217518c817d5807bf6f35393725a31223129fd1c4c964a36a60c65b686d24fc25d1777fa12ee622bddbb0f7c1772bec SHA512 7d488ff82cb20a3b3cef6380f2dae5ea9f7baa66bf75ad711aade1e3301b25993ccf2694e33c847ea5b9bdb90ff34c46fcd8a6ba7d6f95605ba0c124ed7c5d13
 DIST system.threading.tasks.dataflow.4.6.0.nupkg 307650 BLAKE2B 5e67c7adaf5c07a6c6fd1ba01696a09bdaa8b909397f9bb885a5339b161337d2b5fdc9282244a4962968a34ee312b5bf0d5a0d3e7e2a6a8123087d8dec70fde7 SHA512 53e595bfe324522e53ecf337c890fb5ac5f4a6797335c334f2bfae6b63f9329bc65efebd0c4fb76c17e1773f14e99c6f3ed864bc3beacbf01a23166128a81477
 DIST system.threading.tasks.extensions.4.0.0.nupkg 49355 BLAKE2B 898f05110ec79e3518937d10df244782ae19e36a11228b427785f367e1974135836046a6a0445c87b206550c11fd23b6d22b0dd399992ae5ac20b3d5c3060056 SHA512 f294f1a4179f53d59f91f01a372cc7896bf8c322e9827299cb1aa3ae2b1f809e98034834f5ccd4cb3fa1c30735082d244fff6584dab6e8870ad409b55e8a4986
-DIST system.threading.tasks.extensions.4.3.0.nupkg 52499 BLAKE2B 3e6532ad1936859e2713e2e864831efe0af00a5ce561bd7f8723845bf285b8c15de00cb1fc246504f99599d183b400746cea987db883f0e61283db1fb2725a1e SHA512 2c33900ff7f544d6db31ad11b6baee1c9ecb40d5a54f51e5dd5bbbb37f4c50ee35ed481615cbf7c1da61a31ae3333c4454bfbeee4ae32241789e72ce3f910db6
-DIST system.threading.tasks.extensions.4.5.1.nupkg 123132 BLAKE2B 8ac2939bb7269557784b6c657d8724972f598520d9ad276a8bb5b314e97e679f91325018232825e186620f550733a72b4a93664bc23334f97f01cabd4360f3da SHA512 2f566ddb35e0b0a622b2d2d9761a1ddaaa9daa5cb74f6414059381ae8226e15ea50f5eff241cdf85cd337c1ce0dc0b36118850bc43ea51685c27ef66e7bd203e
-DIST system.threading.tasks.extensions.4.5.4.nupkg 89582 BLAKE2B 728fc5794745b706a7e3a7d05186f34e2a8c1837cafdc7fc9a1bd8fc6fd42025448cbdfa53415a05d872aa08db1deb31d104054630c9ac7ecd29a2ddd973fd5c SHA512 68052086e77d3c7198737a3da163d67740b7c44f93250c39659b3bf21b6547a9abf64cbf40481f5c78f24361af3aaf47d52d188b371554a0928a7f7665c1fc14
 DIST system.threading.tasks.parallel.4.0.1.nupkg 176864 BLAKE2B 155f442714b86372fd66e6ba58d7c3e49609743b08c4202941ba1179919df86677177d1cffe8a12d3874e050206ba463ad5ba716071b6e3141300887ee28f57a SHA512 ce0508e835a5ccbe43cc5408f7faba9820b7580e8f728f81eadc8b963cef7998ac89a5228195cae541a6d0a283a824cf8c6e2151110d049d8433a563407b8c6c
 DIST system.threading.thread.4.0.0.nupkg 98848 BLAKE2B 1a9cbcbf3741449d45077c9a7a2b4d497104509c809737f72485dba4777f327950569904228d253f33d74c93ff7c08142067794017faa0ee5783bb0c21edca48 SHA512 9ee52992ea7615b0785dfeb69f058046d9b5c10e39edf13247d2af2ec0b30528f5c904ed2aeaa6952830fdee9a8b00770a25040146d9d48804bf36bf9b6498c4
 DIST system.threading.threadpool.4.0.10.nupkg 89891 BLAKE2B bb769060b570d163fd4288b6c9fb821d77029cdbd19e93b931ad771be5289a01f9ffe1f49fa31a97bc4123e7eb6b6fb8b56945308b25ce97dc01e593a463733a SHA512 76ea4b3a95414976f71bf01bf6eb4b55b398c59fa19eae44c55cfa0e4f42065cd79ba667c3518020ebf91c48e5904099273e3423cce18716891d656c58ee3ce1
-DIST system.threading.threadpool.4.3.0.nupkg 89926 BLAKE2B ec4210a5862c0704b118e4055785c7094ff8c3586800fcae109fa60e77565d8288089c64bce105e9cab08f8bb107dca340e72ae1d39d19f6118538ed32f449d6 SHA512 450a40f94a48e9396979e764e494ad624d8333f3378b91ea69b23fc836df8f5c43bbd6c8cfd91da2ab95a476e1ff042338968e09b720447f2241c014bfc75159
 DIST system.threading.timer.4.0.1.nupkg 77056 BLAKE2B 6ba72241aaf4d35e499421f1beca01066f918a3b1ad587538b36ba8a29bb0ed80ae510660ce598a4b8f4575b0028f339e7a8d24c2138eb711a5b0585bc07072c SHA512 6aa43dc5b3914050850b8ddafcc2256e60670d51c0f1b38b0d26d80f36e76cf5b40d6053bf92b4abecce5f786de5b13daa70eddf541865509c7a73fe3785de4b
-DIST system.threading.timer.4.3.0.nupkg 77054 BLAKE2B be1665b86776f2f7e780de889e363a3c10da581eaf9a414da5ae5d059564281d78691142281d31b48c47b9efc084f1826165763097273f77e58699742c8c93da SHA512 d5ce8e258b7be7be268f944e21621195948106f57e6c46e69b2887c46f567760368b14e84046b4be4466ecd08ecd4cb04016a2ff7948cb4640960befc7aa1739
 DIST system.xml.readerwriter.4.0.11.nupkg 1363068 BLAKE2B b151c0560022d796720ce342c6c47189d5cb5d292bdc62eb0439deb87b05e80d9c57cb38267a9e153e0d4513e8edf503d88926e9956eba118b5d00d488e2fc78 SHA512 d40d6e9d55e57acdf04132bcb8ae8abf1abb3483620cde969c78c6c393a9936abf742c1dcf66288e6e9dffcb399a880ee3c11540ac140cb32e20b41365aaf35e
-DIST system.xml.readerwriter.4.3.0.nupkg 1388897 BLAKE2B ae51b8fe4492dec1e4e3584d05b0f477fd4e75e79dddb46d8077ae5311245d6fc6213d0655025f25db56f1370cb0e88bd60a83dc937bb53db1db0262390281f2 SHA512 991101497fbd39e43fc306ca280a465318868afa8db1f34bb87c266fe61f0c81a0ec34a797b236ee823bd60d1149b7592def96fe044abb511858efffe890c2e6
 DIST system.xml.xdocument.4.0.11.nupkg 591353 BLAKE2B 8373fa19c6aafbe6e347db7bb1ec304dd8ce77df415acf0c3ee04ea2dcfce050f59d6e72cdeb14c4e54d29c1c07fc9eb0ef8045fb09830b48fb1a8e90dcb09a8 SHA512 f8ae902901963f2636f39c0652d82daa9df3fb3e3d5a60493c39f6cf01ed07c7d57f175a2d2895f4a872d4e92527e5131522218d1a67da2fd491e162273a8527
-DIST system.xml.xdocument.4.3.0.nupkg 591350 BLAKE2B 86f910cef36c056f4a9ea9dc26eea6e01070467d27ac80fb8a0af5e1a572ad5d2169e4f1297cd362fddc9e0309458dbd413fca85ef8e56f97781c218e594604a SHA512 c2d9236a696daf23a29b530b9aa510fb813041685a1bb9a95845a51e61d870a0615e988b150f5be0d0896ef94b123e97f96c8a43ee815cf5b9897593986b1113
 DIST system.xml.xmldocument.4.0.1.nupkg 285151 BLAKE2B a58a4b04d21e6de8fc5f662949983fb72c260596db149c228097d37a578fdd3b2f074abed98bc53eb0b672a8f41d36e485a324ec78bcf0951e2c9ec03d30918b SHA512 bf29bec129c8ea3fca70ff8357adcd24ade2db855c57c16459832c6e4489427f2959c70ae64fc860d2d3d41e3fe6d4df77c751fbbe8106099a8a0cd5fb38af7d
-DIST system.xml.xmldocument.4.3.0.nupkg 285212 BLAKE2B 0d96ca356543e8e915597e0624dca42f0c7032a2ae9e380a6fba3fbee0dacb9e5f06017893b2b7a8b937dbb4de7d5665fa6648e3bf8df12e0d34e4075c125109 SHA512 22251b3f16de9aa06e091b24baea1b8c95752f0d22266faf34e1fb76b347b23f7910cdaf567058e23d06b7079961090ca70805070a2491add5da4d0271afd133
 DIST system.xml.xpath.4.0.1.nupkg 250135 BLAKE2B d6f211f98f33f6b8959b918cff8e676a0ee19505d11d096a92840c935a76ca70acfe111e40d5aa80d0d2db74c0db25db503d5f1f8a0e96b592d16e2715a0591c SHA512 af1b4150aff0f6e20bf4a73889d9b3e12b282d87ec6be88681cb78a8958eadaaadbc907ddad0856850fa4eee165e76b176e42ea866aeefbd6e323bfad6f26d64
 DIST system.xml.xpath.xdocument.4.0.1.nupkg 89837 BLAKE2B f92f7152b2b562d4f15641129e18b109c783203154eaa02618ebcebc96468b979c3b14fdceff6b44e218e507f33deb419094c6de81b3983a347bb2f67890fd99 SHA512 237e12e54077b7bbb26a656925ce75360f0f426f12a0ddba628cc869a876558eb04247d857d6649c017dc84e3e5c734397bcb3b28da27d7fe1c97f79ecff50fa
-DIST tmds.dbus.protocol.0.15.0.nupkg 215793 BLAKE2B 18608e7a9998e2ea89e6d725404c51fffaf1044ea03706396d58799c27839bf419f535b531c4f4342d14e71557c4628e5e1ed0c96088ab28188e732e391cc663 SHA512 45958a88536d1daa769934986b3ac514cdc1104a936bc404dbdec550c958847e7408af621350c09fa51bc4b837fb88471ec6e6056c4aaa2cebf30f044cd834e9
 DIST tmds.dbus.protocol.0.16.0.nupkg 241531 BLAKE2B 186c927cbe193005849196ab8d6415790d8ec3435be9fa17f4c2fd50e33fdf5236a5c62679f383b68b37d855dc497208094493d10cb96a97d50ccb94aac2c567 SHA512 1e6e1bf8ea7c652e5502e96323984157e060ac728843f2104ff8dcab755483ff93ef4df7cc4e7dd4b56047ba42bf349c2681e2fb8d6518328eab002e63d371b2
 DIST validation.2.4.18.nupkg 90984 BLAKE2B 3f319bd60a0b1d6b6d08188b1132c01fd417d7e205bc587edd7ffa0dfba4dc01b9e956df46ef03b0f909ff5b9a859a9620d1ededd8eef21fb6522aab2f12f1f2 SHA512 b49e4b992b40bb656821a7a6dd67fe464af14f0781cf677f58412d108678963f9f9347bd2e1091343c1aa522148ea187a25b45ef0eae5e7ffeb8f833396fcff2
-DIST xunit.2.4.1.nupkg 20733 BLAKE2B ee83156610dc4ade1f15c05d97725e1913a9dde04e474c11fe396c37df5d438ab934776e4660d3d139fe34949eb890dae67c0145d3815a8a25cc976b9d2cca7b SHA512 3b0061a5ecfd49166f123aa27375956c00aedb0b22f6ee6a8be629cd583a0532f7476e51ffacad3385245139f1f9d4990c9dc850fc7ef7d097fd85e7c6b40058
 DIST xunit.2.9.2.nupkg 31616 BLAKE2B f5b5ad0651d2f54993e9f216898e7be51f2a61d0d0e32adf4d8b1a9b0062253d1a5f7fd9e5c5480d115983478d3dcc43a86607ef6539f88beec391f1022ea3f7 SHA512 6ece1c72995aa824fbfa3740261b6def9b8aabda80dc97a5775ba088e8061064a7ceaf209286b4554a8d10a90c3e407057908e9409653491ad1817e0c68643ac
 DIST xunit.abstractions.2.0.2.nupkg 75852 BLAKE2B 13a214201e5756c0a3eddb7e93a91a19c828bee293e9dffea514bb7bd3f10e823c5489155707b17f58c23ddd24aa987eac0858632c5a55dcf84bdb44c5546a7a SHA512 957d3a0c6d048f30ba53e4155424e16838c6047324f6a6289a7128b4aee8c6382f5b78f1156e201164af45edbf1a5c818c8d08086076d55826bd2e4be4c33a5a
 DIST xunit.abstractions.2.0.3.nupkg 75155 BLAKE2B 8cfecf557dbe20e0e14b1d8b413acd7516b6538cb543a12708910311fa76b7dcd9d060c7be70a05b0af5ef3b8bd5f819104025afe9796e240c28fcae1c7460c1 SHA512 3ca26b8b97f4a8440f16f818e82651f571bc2513a5592742fd960b9240d0b880fef84827fb25a307e61fe7b019f14e864653fbcf7dee0d0e3faf90593deaf624
-DIST xunit.analyzers.0.10.0.nupkg 107050 BLAKE2B 2e79dab696767d34536ee6ba08fba2e4113b3e41073d1f07757113f0ce24766e8cbe801f06f3abe58eb46399fbe28ece6908a364b73023948450adc81a0f016d SHA512 530e84aa43a6b74232b2d52dce453853c8b1084cfea62aa0733ca83d3d344703c3b161ed5b0cde763b014134ba3f5876faec0317ac3952962de7f49213b79ec5
 DIST xunit.analyzers.1.16.0.nupkg 263548 BLAKE2B 453489fb24358957855d9c9ef89e69f0fae2678b5a73dc99d7ac676bccd4a4be13ed93aef28ae6b59bfee8cc411356c497b3e2d650f1e7998246fc4caf315b49 SHA512 eb940bc674683aaa409f684c9e323514b990123cd4c9eda1e0cc1155ed64d79d4af94146d4486bfecfcc2f0349ea908da32a098cea0db85ece196e261f66dd69
-DIST xunit.assert.2.4.1.nupkg 67341 BLAKE2B a7f697049d3c24076857e4bec56afb43bace649c10a0731425b6e6652509b3ae5cd45e855230a6669322023d5c82a3e3a5d23f7db6058f286ac6e95b0eef23c4 SHA512 c5680265048178cf42ec093e56ecc6b10afb2b93832d5b172b7836b030f7f3fdcb8e89b621b5893ee746f3e22cb2982f7e91a1d20f4e7b9bcb73c53e8b38e279
 DIST xunit.assert.2.9.2.nupkg 244587 BLAKE2B a2eeb6be1d1c6e6383342e1303e191c3f206572293d4882e75dc641663f7285d58fe6ae8a919a058d76fa9d7fada606e852265b8b89f80c3310cf981b1f3545e SHA512 86e35f20d2c7e479f288f2268a62afee5888249d8c811749613ee4cb7e3ae3347ad921fba3d263b2032249945785ae3a9204c236329234dd55bdcb42f944a9ef
-DIST xunit.core.2.4.1.nupkg 22659 BLAKE2B f810cae28847f7f6bc1dc5866c2526cc496f8f48f774545050d9ac41324fc42acd6a9204b0b0cf0836dacee3eb5a4246f21cebda074437cf59f4562588a5ee87 SHA512 f2d68c940432f6a43b4db8aaaf64c0c06914f97d2c72443ef7a8fb47d397fd4b758261c46b841822b23c735e63de22938f75f3c90315a219133166bcd0145feb
 DIST xunit.core.2.9.2.nupkg 33509 BLAKE2B 37c104f7b13ffa684ca6e547d58095e234fcc8589bc55e2c6389be2f43de39a81a248aafbfc324eb5a5cf14b80111a0be56ea5fd853ee70a35c45c8dbe5474e0 SHA512 916e3c77b60beebc93e33b964e324de3dd5c27063c6988880310da5c945e6e0308c38d0f9a54448a2688cf7dd05059a095c7cb95aa11c99708e2c97bd240118b
 DIST xunit.extensibility.core.2.4.0.nupkg 278959 BLAKE2B 58457d747683eabf4fc8aadeda9918297bb2113bfeb5aea97b858f77ee66540aa88cc36d6eff08ea70e947e5e94bd7b4f10a111e39b7e953f6471d93979ddb55 SHA512 4d3c560932a8b0785fbc7d7de47e8d848bf8d265d9a5a88153904822378c1c378a4f776bce00b8dfa1c7e1314728cf6135518c9d81b87fe8d48c4b6020bd03ef
-DIST xunit.extensibility.core.2.4.1.nupkg 238957 BLAKE2B ba1d6a3ba13da385fad20d09b7ca0bbe1c32d7ada1a4932e3e2100fbb8c049b9abfb15a2a8064022f7367ad0b804e9c5a6af9986155c7e31fed922061d51acd6 SHA512 aa477119fc5db00bab105b2bf33e8b7e805155be1571b7b2935c05f8c46b39baeec0eb65ecefa28505041d7f1f9d99e5505b18ea447ef6d7307a898bb28711d4
 DIST xunit.extensibility.core.2.9.2.nupkg 298693 BLAKE2B b5eebe5e056f0f633d618f9191d98f5f13fcd688ea0b15ec462fc92c8c7a5b8bae2efefb7a61a8f5d7efc4f5a3879cf2e5ba43f6792e801e9f014fb16ebaa7bf SHA512 b28b24f9d8390a7e0df4c28e8d0d70153bdf81dbaa897d432d16471185c868b3ae4c96c225e5df9fb5e10150c663ecde07c697de308a2fc05c0e9e042427595f
 DIST xunit.extensibility.execution.2.4.0.nupkg 481651 BLAKE2B 8cd2bef58356196059e1236080186774af4f71d384533e01e16c33521628e9993fc2b5f3b0f35e68ee4b45690183df2c3bc2681689eb47c73b79d3a9ccdcbcc4 SHA512 adc865d290201f1dbdd5bbe678ed880f9dd39da42ad3a90db09dda95a0448a7bf3cf23ad92f9a8c463ecd408042e383d4914d394eba10077494d325ed0ddb361
-DIST xunit.extensibility.execution.2.4.1.nupkg 328138 BLAKE2B 963aae4c76cbb5d7d36fae036f5c6a50643588019639d358295d2298e2dbcf1890da459dc69db9b0eade5a7d779b5e13f2762e1e9b2b96c8ec00979491a5dc7f SHA512 81cf13c553dec37f87cbaa894ecef42478abb52b79932dfcd20c42f1017e56658eb3a11d586968f719b7511926fa03db13dae85557e7af0e40baa14daf8479d9
 DIST xunit.extensibility.execution.2.9.2.nupkg 379785 BLAKE2B aeea9e3f5feeaffb864f3907a72d3bd866444e2b491f15ee884a4e8f1f87f712cbf0db444950163348e298f715fbf26c4f52ac621cb963414d491c35de0d9fe4 SHA512 a0e9c6dc6b269ed619a9995e28c1c5940c710b19fe650adc63b18428314fd19a63c7fb1313ad5c11b9499380e49781ded2dd360cde20989e21b100e82d3768ee
-DIST xunit.runner.visualstudio.2.3.1.nupkg 685817 BLAKE2B b9d7114631004f82556eb09eaccf4d100e02864e59711ae2042153bafb73b0677e750ad191bd388342308f98b3a86ef983e4d1f0320fac8bd46cdd0298d4ddd0 SHA512 b5b940f21c5705cc873006828f00fe6d099be04b8da0adfb141d62bf815592ce418a7650636e12a78e15ac68cfaa36d2f5993e4f6307a8af90b458f21e448915
 DIST xunit.runner.visualstudio.2.8.2.nupkg 595969 BLAKE2B d1ef775c4234177fcca64dc44144fecc2d613976c7afe58ddfba0a204bd36b932cb8adaa3619e47922218306b487de1f256611f5d1448798afc393a91b896c13 SHA512 cfe133857c4b9609ff9fb150e49d032716c69ecff5bf1d643c987852af8e3c2851a5d4b2df1fcc0aa43f8ed91ba1cec144cb61cf5e24ee92f40f78aafdee1dd0
 DIST xunit.skippablefact.1.4.13.nupkg 46061 BLAKE2B 1c362ebed9d8f88fb8f3728194b7b406f05aaac3776ea8b1167722b82799a6acd589771044aee37d045d45e7760cdde1a555b80cb8a92c5d55e0cc3ead6e66c5 SHA512 d3cf30ada4d447fd4737143554f9c9be1aabe502e1c5e2614e13100bda71f3ed9eab03805c7d3475936a9ed6730bf86ce2212f6da6ccf5306553fc1352bcd5ba
diff --git a/dev-vcs/git-credential-manager/git-credential-manager-2.5.1.ebuild b/dev-vcs/git-credential-manager/git-credential-manager-2.5.1.ebuild
deleted file mode 100644
index 32c95b13c444..000000000000
--- a/dev-vcs/git-credential-manager/git-credential-manager-2.5.1.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOTNET_PKG_COMPAT=8.0
-NUGETS="
-avalonia.angle.windows.natives@2.1.0.2023020321
-avalonia.buildservices@0.0.29
-avalonia.controls.colorpicker@11.0.11
-avalonia.controls.datagrid@11.0.11
-avalonia.desktop@11.0.11
-avalonia.diagnostics@11.0.11
-avalonia.freedesktop@11.0.11
-avalonia.native@11.0.11
-avalonia.remote.protocol@11.0.11
-avalonia.skia@11.0.11
-avalonia.themes.fluent@11.0.11
-avalonia.themes.simple@11.0.11
-avalonia.win32@11.0.11
-avalonia.x11@11.0.11
-avalonia@11.0.11
-castle.core@4.3.1
-coverlet.collector@3.1.0
-dotnet-xunit@2.3.1
-harfbuzzsharp.nativeassets.linux@7.3.0
-harfbuzzsharp.nativeassets.macos@7.3.0
-harfbuzzsharp.nativeassets.webassembly@7.3.0
-harfbuzzsharp.nativeassets.win32@7.3.0
-harfbuzzsharp@7.3.0
-libuv@1.9.0
-microcom.runtime@0.11.0
-microsoft.codeanalysis.analyzers@1.1.0
-microsoft.codeanalysis.analyzers@3.0.0
-microsoft.codeanalysis.common@1.3.0
-microsoft.codeanalysis.common@3.8.0
-microsoft.codeanalysis.csharp.scripting@3.8.0
-microsoft.codeanalysis.csharp@1.3.0
-microsoft.codeanalysis.csharp@3.8.0
-microsoft.codeanalysis.scripting.common@3.8.0
-microsoft.codeanalysis.visualbasic@1.3.0
-microsoft.codecoverage@17.1.0
-microsoft.csharp@4.0.1
-microsoft.csharp@4.3.0
-microsoft.identity.client.extensions.msal@4.61.3
-microsoft.identity.client@4.61.3
-microsoft.identitymodel.abstractions@6.35.0
-microsoft.net.test.sdk@17.1.0
-microsoft.netcore.app@1.0.0
-microsoft.netcore.dotnethost@1.0.1
-microsoft.netcore.dotnethostpolicy@1.0.1
-microsoft.netcore.dotnethostresolver@1.0.1
-microsoft.netcore.jit@1.0.2
-microsoft.netcore.platforms@1.0.1
-microsoft.netcore.platforms@1.1.0
-microsoft.netcore.platforms@2.1.2
-microsoft.netcore.runtime.coreclr@1.0.2
-microsoft.netcore.targets@1.0.1
-microsoft.netcore.targets@1.1.0
-microsoft.netcore.windows.apisets@1.0.1
-microsoft.testplatform.objectmodel@17.1.0
-microsoft.testplatform.testhost@17.1.0
-microsoft.visualbasic@10.0.1
-microsoft.win32.primitives@4.0.1
-microsoft.win32.primitives@4.3.0
-microsoft.win32.registry@4.0.0
-moq@4.10.1
-netstandard.library@1.6.0
-netstandard.library@1.6.1
-newtonsoft.json@9.0.1
-nuget.frameworks@5.11.0
-reportgenerator@5.1.9
-runtime.any.system.collections@4.3.0
-runtime.any.system.diagnostics.tools@4.3.0
-runtime.any.system.diagnostics.tracing@4.3.0
-runtime.any.system.globalization.calendars@4.3.0
-runtime.any.system.globalization@4.3.0
-runtime.any.system.io@4.3.0
-runtime.any.system.reflection.extensions@4.3.0
-runtime.any.system.reflection.primitives@4.3.0
-runtime.any.system.reflection@4.3.0
-runtime.any.system.resources.resourcemanager@4.3.0
-runtime.any.system.runtime.handles@4.3.0
-runtime.any.system.runtime.interopservices@4.3.0
-runtime.any.system.runtime@4.3.0
-runtime.any.system.text.encoding.extensions@4.3.0
-runtime.any.system.text.encoding@4.3.0
-runtime.any.system.threading.tasks@4.3.0
-runtime.any.system.threading.timer@4.3.0
-runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.native.system.io.compression@4.1.0
-runtime.native.system.io.compression@4.3.0
-runtime.native.system.net.http@4.0.1
-runtime.native.system.net.http@4.3.0
-runtime.native.system.net.security@4.0.1
-runtime.native.system.security.cryptography.apple@4.3.0
-runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.native.system.security.cryptography@4.0.0
-runtime.native.system@4.0.0
-runtime.native.system@4.3.0
-runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple@4.3.0
-runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.unix.microsoft.win32.primitives@4.3.0
-runtime.unix.system.console@4.3.0
-runtime.unix.system.diagnostics.debug@4.3.0
-runtime.unix.system.io.filesystem@4.3.0
-runtime.unix.system.net.primitives@4.3.0
-runtime.unix.system.net.sockets@4.3.0
-runtime.unix.system.private.uri@4.3.0
-runtime.unix.system.runtime.extensions@4.3.0
-skiasharp.nativeassets.linux@2.88.7
-skiasharp.nativeassets.macos@2.88.7
-skiasharp.nativeassets.webassembly@2.88.7
-skiasharp.nativeassets.win32@2.88.7
-skiasharp@2.88.7
-system.appcontext@4.1.0
-system.appcontext@4.3.0
-system.buffers@4.0.0
-system.buffers@4.3.0
-system.collections.concurrent@4.0.12
-system.collections.concurrent@4.3.0
-system.collections.immutable@1.2.0
-system.collections.immutable@5.0.0
-system.collections.nongeneric@4.3.0
-system.collections.specialized@4.3.0
-system.collections@4.0.11
-system.collections@4.3.0
-system.commandline@2.0.0-beta4.22272.1
-system.componentmodel.annotations@4.1.0
-system.componentmodel.annotations@4.5.0
-system.componentmodel.primitives@4.3.0
-system.componentmodel.typeconverter@4.3.0
-system.componentmodel@4.0.1
-system.componentmodel@4.3.0
-system.console@4.0.0
-system.console@4.3.0
-system.diagnostics.debug@4.0.11
-system.diagnostics.debug@4.3.0
-system.diagnostics.diagnosticsource@4.0.0
-system.diagnostics.diagnosticsource@4.3.0
-system.diagnostics.diagnosticsource@6.0.1
-system.diagnostics.fileversioninfo@4.0.0
-system.diagnostics.process@4.1.0
-system.diagnostics.stacktrace@4.0.1
-system.diagnostics.tools@4.0.1
-system.diagnostics.tools@4.3.0
-system.diagnostics.tracesource@4.3.0
-system.diagnostics.tracing@4.1.0
-system.diagnostics.tracing@4.3.0
-system.dynamic.runtime@4.0.11
-system.dynamic.runtime@4.3.0
-system.globalization.calendars@4.0.1
-system.globalization.calendars@4.3.0
-system.globalization.extensions@4.0.1
-system.globalization.extensions@4.3.0
-system.globalization@4.0.11
-system.globalization@4.3.0
-system.io.compression.zipfile@4.0.1
-system.io.compression.zipfile@4.3.0
-system.io.compression@4.1.0
-system.io.compression@4.3.0
-system.io.filesystem.primitives@4.0.1
-system.io.filesystem.primitives@4.3.0
-system.io.filesystem.watcher@4.0.0
-system.io.filesystem@4.0.1
-system.io.filesystem@4.3.0
-system.io.memorymappedfiles@4.0.0
-system.io.pipelines@6.0.0
-system.io.unmanagedmemorystream@4.0.1
-system.io@4.1.0
-system.io@4.3.0
-system.linq.expressions@4.1.0
-system.linq.expressions@4.3.0
-system.linq.parallel@4.0.1
-system.linq.queryable@4.0.1
-system.linq.queryable@4.3.0
-system.linq@4.1.0
-system.linq@4.3.0
-system.memory@4.5.4
-system.net.http@4.1.0
-system.net.http@4.3.0
-system.net.nameresolution@4.0.0
-system.net.nameresolution@4.3.0
-system.net.primitives@4.0.11
-system.net.primitives@4.3.0
-system.net.requests@4.0.11
-system.net.security@4.0.0
-system.net.sockets@4.1.0
-system.net.sockets@4.3.0
-system.net.webheadercollection@4.0.1
-system.numerics.vectors@4.1.1
-system.numerics.vectors@4.5.0
-system.objectmodel@4.0.12
-system.objectmodel@4.3.0
-system.private.uri@4.3.0
-system.reflection.dispatchproxy@4.0.1
-system.reflection.emit.ilgeneration@4.0.1
-system.reflection.emit.ilgeneration@4.3.0
-system.reflection.emit.lightweight@4.0.1
-system.reflection.emit.lightweight@4.3.0
-system.reflection.emit@4.0.1
-system.reflection.emit@4.3.0
-system.reflection.extensions@4.0.1
-system.reflection.extensions@4.3.0
-system.reflection.metadata@1.3.0
-system.reflection.metadata@1.6.0
-system.reflection.metadata@5.0.0
-system.reflection.primitives@4.0.1
-system.reflection.primitives@4.3.0
-system.reflection.typeextensions@4.1.0
-system.reflection.typeextensions@4.3.0
-system.reflection.typeextensions@4.5.1
-system.reflection@4.1.0
-system.reflection@4.3.0
-system.resources.reader@4.0.0
-system.resources.resourcemanager@4.0.1
-system.resources.resourcemanager@4.3.0
-system.runtime.compilerservices.unsafe@4.7.1
-system.runtime.compilerservices.unsafe@6.0.0
-system.runtime.extensions@4.1.0
-system.runtime.extensions@4.3.0
-system.runtime.handles@4.0.1
-system.runtime.handles@4.3.0
-system.runtime.interopservices.runtimeinformation@4.0.0
-system.runtime.interopservices.runtimeinformation@4.3.0
-system.runtime.interopservices@4.1.0
-system.runtime.interopservices@4.3.0
-system.runtime.loader@4.0.0
-system.runtime.numerics@4.0.1
-system.runtime.numerics@4.3.0
-system.runtime.serialization.primitives@4.1.1
-system.runtime@4.1.0
-system.runtime@4.3.0
-system.security.claims@4.0.1
-system.security.claims@4.3.0
-system.security.cryptography.algorithms@4.2.0
-system.security.cryptography.algorithms@4.3.0
-system.security.cryptography.cng@4.2.0
-system.security.cryptography.cng@4.3.0
-system.security.cryptography.csp@4.0.0
-system.security.cryptography.csp@4.3.0
-system.security.cryptography.encoding@4.0.0
-system.security.cryptography.encoding@4.3.0
-system.security.cryptography.openssl@4.0.0
-system.security.cryptography.openssl@4.3.0
-system.security.cryptography.primitives@4.0.0
-system.security.cryptography.primitives@4.3.0
-system.security.cryptography.protecteddata@4.5.0
-system.security.cryptography.x509certificates@4.1.0
-system.security.cryptography.x509certificates@4.3.0
-system.security.principal.windows@4.0.0
-system.security.principal.windows@4.3.0
-system.security.principal@4.0.1
-system.security.principal@4.3.0
-system.text.encoding.codepages@4.0.1
-system.text.encoding.codepages@4.5.1
-system.text.encoding.extensions@4.0.11
-system.text.encoding.extensions@4.3.0
-system.text.encoding@4.0.11
-system.text.encoding@4.3.0
-system.text.regularexpressions@4.1.0
-system.text.regularexpressions@4.3.0
-system.threading.overlapped@4.0.1
-system.threading.tasks.dataflow@4.6.0
-system.threading.tasks.extensions@4.0.0
-system.threading.tasks.extensions@4.3.0
-system.threading.tasks.extensions@4.5.1
-system.threading.tasks.extensions@4.5.4
-system.threading.tasks.parallel@4.0.1
-system.threading.tasks@4.0.11
-system.threading.tasks@4.3.0
-system.threading.thread@4.0.0
-system.threading.threadpool@4.0.10
-system.threading.threadpool@4.3.0
-system.threading.timer@4.0.1
-system.threading.timer@4.3.0
-system.threading@4.0.11
-system.threading@4.3.0
-system.xml.readerwriter@4.0.11
-system.xml.readerwriter@4.3.0
-system.xml.xdocument@4.0.11
-system.xml.xdocument@4.3.0
-system.xml.xmldocument@4.0.1
-system.xml.xmldocument@4.3.0
-system.xml.xpath.xdocument@4.0.1
-system.xml.xpath@4.0.1
-tmds.dbus.protocol@0.15.0
-validation@2.4.18
-xunit.abstractions@2.0.2
-xunit.abstractions@2.0.3
-xunit.analyzers@0.10.0
-xunit.assert@2.4.1
-xunit.core@2.4.1
-xunit.extensibility.core@2.4.0
-xunit.extensibility.core@2.4.1
-xunit.extensibility.execution@2.4.0
-xunit.extensibility.execution@2.4.1
-xunit.runner.visualstudio@2.3.1
-xunit.skippablefact@1.4.13
-xunit@2.4.1
-"
-
-inherit dotnet-pkg
-
-DESCRIPTION="Secure Git credential storage supporing GitHub, Azure Repos, and other services"
-HOMEPAGE="https://github.com/git-ecosystem/git-credential-manager"
-SRC_URI="
-	https://github.com/git-ecosystem/git-credential-manager/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	${NUGET_URIS}
-"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOTNET_PKG_PROJECTS=(
-	"${S}"/src/shared/Git-Credential-Manager
-)
diff --git a/dev-vcs/git-credential-manager/git-credential-manager-2.6.0.ebuild b/dev-vcs/git-credential-manager/git-credential-manager-2.6.0.ebuild
deleted file mode 100644
index 17623bc6b5c0..000000000000
--- a/dev-vcs/git-credential-manager/git-credential-manager-2.6.0.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOTNET_PKG_COMPAT=8.0
-NUGETS="
-avalonia.angle.windows.natives@2.1.22045.20230930
-avalonia.buildservices@0.0.29
-avalonia.controls.colorpicker@11.1.3
-avalonia.controls.datagrid@11.1.3
-avalonia.desktop@11.1.3
-avalonia.diagnostics@11.1.3
-avalonia.freedesktop@11.1.3
-avalonia.native@11.1.3
-avalonia.remote.protocol@11.1.3
-avalonia.skia@11.1.3
-avalonia.themes.fluent@11.1.3
-avalonia.themes.simple@11.1.3
-avalonia.win32@11.1.3
-avalonia.x11@11.1.3
-avalonia@11.1.3
-castle.core@5.1.1
-coverlet.collector@6.0.2
-dotnet-xunit@2.3.1
-harfbuzzsharp.nativeassets.linux@7.3.0.2
-harfbuzzsharp.nativeassets.macos@7.3.0.2
-harfbuzzsharp.nativeassets.webassembly@7.3.0.2
-harfbuzzsharp.nativeassets.win32@7.3.0.2
-harfbuzzsharp@7.3.0.2
-libuv@1.9.0
-microcom.runtime@0.11.0
-microsoft.codeanalysis.analyzers@1.1.0
-microsoft.codeanalysis.common@1.3.0
-microsoft.codeanalysis.csharp@1.3.0
-microsoft.codeanalysis.visualbasic@1.3.0
-microsoft.codecoverage@17.11.1
-microsoft.csharp@4.0.1
-microsoft.identity.client.extensions.msal@4.65.0
-microsoft.identity.client@4.65.0
-microsoft.identitymodel.abstractions@6.35.0
-microsoft.net.test.sdk@17.11.1
-microsoft.netcore.app@1.0.0
-microsoft.netcore.dotnethost@1.0.1
-microsoft.netcore.dotnethostpolicy@1.0.1
-microsoft.netcore.dotnethostresolver@1.0.1
-microsoft.netcore.jit@1.0.2
-microsoft.netcore.platforms@1.0.1
-microsoft.netcore.runtime.coreclr@1.0.2
-microsoft.netcore.targets@1.0.1
-microsoft.netcore.windows.apisets@1.0.1
-microsoft.testplatform.objectmodel@17.11.1
-microsoft.testplatform.testhost@17.11.1
-microsoft.visualbasic@10.0.1
-microsoft.win32.primitives@4.0.1
-microsoft.win32.registry@4.0.0
-moq@4.20.72
-netstandard.library@1.6.0
-newtonsoft.json@13.0.1
-reportgenerator@5.3.10
-runtime.native.system.io.compression@4.1.0
-runtime.native.system.net.http@4.0.1
-runtime.native.system.net.security@4.0.1
-runtime.native.system.security.cryptography@4.0.0
-runtime.native.system@4.0.0
-skiasharp.nativeassets.linux@2.88.8
-skiasharp.nativeassets.macos@2.88.8
-skiasharp.nativeassets.webassembly@2.88.8
-skiasharp.nativeassets.win32@2.88.8
-skiasharp@2.88.8
-system.appcontext@4.1.0
-system.buffers@4.0.0
-system.collections.concurrent@4.0.12
-system.collections.immutable@1.2.0
-system.collections@4.0.11
-system.commandline@2.0.0-beta4.22272.1
-system.componentmodel.annotations@4.1.0
-system.componentmodel@4.0.1
-system.console@4.0.0
-system.diagnostics.debug@4.0.11
-system.diagnostics.diagnosticsource@4.0.0
-system.diagnostics.diagnosticsource@6.0.1
-system.diagnostics.eventlog@6.0.0
-system.diagnostics.fileversioninfo@4.0.0
-system.diagnostics.process@4.1.0
-system.diagnostics.stacktrace@4.0.1
-system.diagnostics.tools@4.0.1
-system.diagnostics.tracing@4.1.0
-system.dynamic.runtime@4.0.11
-system.globalization.calendars@4.0.1
-system.globalization.extensions@4.0.1
-system.globalization@4.0.11
-system.io.compression.zipfile@4.0.1
-system.io.compression@4.1.0
-system.io.filesystem.primitives@4.0.1
-system.io.filesystem.watcher@4.0.0
-system.io.filesystem@4.0.1
-system.io.memorymappedfiles@4.0.0
-system.io.pipelines@6.0.0
-system.io.unmanagedmemorystream@4.0.1
-system.io@4.1.0
-system.linq.expressions@4.1.0
-system.linq.parallel@4.0.1
-system.linq.queryable@4.0.1
-system.linq@4.1.0
-system.net.http@4.1.0
-system.net.nameresolution@4.0.0
-system.net.primitives@4.0.11
-system.net.requests@4.0.11
-system.net.security@4.0.0
-system.net.sockets@4.1.0
-system.net.webheadercollection@4.0.1
-system.numerics.vectors@4.1.1
-system.numerics.vectors@4.5.0
-system.objectmodel@4.0.12
-system.reflection.dispatchproxy@4.0.1
-system.reflection.emit.ilgeneration@4.0.1
-system.reflection.emit.lightweight@4.0.1
-system.reflection.emit@4.0.1
-system.reflection.extensions@4.0.1
-system.reflection.metadata@1.3.0
-system.reflection.metadata@1.6.0
-system.reflection.primitives@4.0.1
-system.reflection.typeextensions@4.1.0
-system.reflection@4.1.0
-system.resources.reader@4.0.0
-system.resources.resourcemanager@4.0.1
-system.runtime.compilerservices.unsafe@6.0.0
-system.runtime.extensions@4.1.0
-system.runtime.handles@4.0.1
-system.runtime.interopservices.runtimeinformation@4.0.0
-system.runtime.interopservices@4.1.0
-system.runtime.loader@4.0.0
-system.runtime.numerics@4.0.1
-system.runtime@4.1.0
-system.security.claims@4.0.1
-system.security.cryptography.algorithms@4.2.0
-system.security.cryptography.cng@4.2.0
-system.security.cryptography.csp@4.0.0
-system.security.cryptography.encoding@4.0.0
-system.security.cryptography.openssl@4.0.0
-system.security.cryptography.primitives@4.0.0
-system.security.cryptography.protecteddata@4.5.0
-system.security.cryptography.x509certificates@4.1.0
-system.security.principal.windows@4.0.0
-system.security.principal@4.0.1
-system.text.encoding.codepages@4.0.1
-system.text.encoding.extensions@4.0.11
-system.text.encoding@4.0.11
-system.text.regularexpressions@4.1.0
-system.threading.overlapped@4.0.1
-system.threading.tasks.dataflow@4.6.0
-system.threading.tasks.extensions@4.0.0
-system.threading.tasks.parallel@4.0.1
-system.threading.tasks@4.0.11
-system.threading.thread@4.0.0
-system.threading.threadpool@4.0.10
-system.threading.timer@4.0.1
-system.threading@4.0.11
-system.xml.readerwriter@4.0.11
-system.xml.xdocument@4.0.11
-system.xml.xmldocument@4.0.1
-system.xml.xpath.xdocument@4.0.1
-system.xml.xpath@4.0.1
-tmds.dbus.protocol@0.16.0
-validation@2.4.18
-xunit.abstractions@2.0.2
-xunit.abstractions@2.0.3
-xunit.analyzers@1.16.0
-xunit.assert@2.9.2
-xunit.core@2.9.2
-xunit.extensibility.core@2.4.0
-xunit.extensibility.core@2.9.2
-xunit.extensibility.execution@2.4.0
-xunit.extensibility.execution@2.9.2
-xunit.runner.visualstudio@2.8.2
-xunit.skippablefact@1.4.13
-xunit@2.9.2
-"
-
-inherit dotnet-pkg
-
-DESCRIPTION="Secure Git credential storage supporing GitHub, Azure Repos, and other services"
-HOMEPAGE="https://github.com/git-ecosystem/git-credential-manager"
-SRC_URI="
-	https://github.com/git-ecosystem/git-credential-manager/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	${NUGET_URIS}
-"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOTNET_PKG_PROJECTS=(
-	"${S}"/src/shared/Git-Credential-Manager
-)
diff --git a/dev-vcs/git-credential-manager/git-credential-manager-2.6.1.ebuild b/dev-vcs/git-credential-manager/git-credential-manager-2.6.1.ebuild
new file mode 100644
index 000000000000..85cc01a223a2
--- /dev/null
+++ b/dev-vcs/git-credential-manager/git-credential-manager-2.6.1.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOTNET_PKG_COMPAT=8.0
+NUGETS="
+avalonia.angle.windows.natives@2.1.22045.20230930
+avalonia.buildservices@0.0.29
+avalonia.controls.colorpicker@11.1.3
+avalonia.controls.datagrid@11.1.3
+avalonia.desktop@11.1.3
+avalonia.diagnostics@11.1.3
+avalonia.freedesktop@11.1.3
+avalonia.native@11.1.3
+avalonia.remote.protocol@11.1.3
+avalonia.skia@11.1.3
+avalonia.themes.fluent@11.1.3
+avalonia.themes.simple@11.1.3
+avalonia.win32@11.1.3
+avalonia.x11@11.1.3
+avalonia@11.1.3
+castle.core@5.1.1
+coverlet.collector@6.0.2
+dotnet-xunit@2.3.1
+harfbuzzsharp.nativeassets.linux@7.3.0.2
+harfbuzzsharp.nativeassets.macos@7.3.0.2
+harfbuzzsharp.nativeassets.webassembly@7.3.0.2
+harfbuzzsharp.nativeassets.win32@7.3.0.2
+harfbuzzsharp@7.3.0.2
+libuv@1.9.0
+microcom.runtime@0.11.0
+microsoft.codeanalysis.analyzers@1.1.0
+microsoft.codeanalysis.common@1.3.0
+microsoft.codeanalysis.csharp@1.3.0
+microsoft.codeanalysis.visualbasic@1.3.0
+microsoft.codecoverage@17.11.1
+microsoft.csharp@4.0.1
+microsoft.identity.client.extensions.msal@4.65.0
+microsoft.identity.client@4.65.0
+microsoft.identitymodel.abstractions@6.35.0
+microsoft.net.test.sdk@17.11.1
+microsoft.netcore.app@1.0.0
+microsoft.netcore.dotnethost@1.0.1
+microsoft.netcore.dotnethostpolicy@1.0.1
+microsoft.netcore.dotnethostresolver@1.0.1
+microsoft.netcore.jit@1.0.2
+microsoft.netcore.platforms@1.0.1
+microsoft.netcore.runtime.coreclr@1.0.2
+microsoft.netcore.targets@1.0.1
+microsoft.netcore.windows.apisets@1.0.1
+microsoft.testplatform.objectmodel@17.11.1
+microsoft.testplatform.testhost@17.11.1
+microsoft.visualbasic@10.0.1
+microsoft.win32.primitives@4.0.1
+microsoft.win32.registry@4.0.0
+moq@4.20.72
+netstandard.library@1.6.0
+newtonsoft.json@13.0.1
+reportgenerator@5.3.10
+runtime.native.system.io.compression@4.1.0
+runtime.native.system.net.http@4.0.1
+runtime.native.system.net.security@4.0.1
+runtime.native.system.security.cryptography@4.0.0
+runtime.native.system@4.0.0
+skiasharp.nativeassets.linux@2.88.8
+skiasharp.nativeassets.macos@2.88.8
+skiasharp.nativeassets.webassembly@2.88.8
+skiasharp.nativeassets.win32@2.88.8
+skiasharp@2.88.8
+system.appcontext@4.1.0
+system.buffers@4.0.0
+system.collections.concurrent@4.0.12
+system.collections.immutable@1.2.0
+system.collections@4.0.11
+system.commandline@2.0.0-beta4.22272.1
+system.componentmodel.annotations@4.1.0
+system.componentmodel@4.0.1
+system.console@4.0.0
+system.diagnostics.debug@4.0.11
+system.diagnostics.diagnosticsource@4.0.0
+system.diagnostics.diagnosticsource@6.0.1
+system.diagnostics.eventlog@6.0.0
+system.diagnostics.fileversioninfo@4.0.0
+system.diagnostics.process@4.1.0
+system.diagnostics.stacktrace@4.0.1
+system.diagnostics.tools@4.0.1
+system.diagnostics.tracing@4.1.0
+system.dynamic.runtime@4.0.11
+system.globalization.calendars@4.0.1
+system.globalization.extensions@4.0.1
+system.globalization@4.0.11
+system.io.compression.zipfile@4.0.1
+system.io.compression@4.1.0
+system.io.filesystem.primitives@4.0.1
+system.io.filesystem.watcher@4.0.0
+system.io.filesystem@4.0.1
+system.io.memorymappedfiles@4.0.0
+system.io.pipelines@6.0.0
+system.io.unmanagedmemorystream@4.0.1
+system.io@4.1.0
+system.linq.expressions@4.1.0
+system.linq.parallel@4.0.1
+system.linq.queryable@4.0.1
+system.linq@4.1.0
+system.net.http@4.1.0
+system.net.nameresolution@4.0.0
+system.net.primitives@4.0.11
+system.net.requests@4.0.11
+system.net.security@4.0.0
+system.net.sockets@4.1.0
+system.net.webheadercollection@4.0.1
+system.numerics.vectors@4.1.1
+system.numerics.vectors@4.5.0
+system.objectmodel@4.0.12
+system.reflection.dispatchproxy@4.0.1
+system.reflection.emit.ilgeneration@4.0.1
+system.reflection.emit.lightweight@4.0.1
+system.reflection.emit@4.0.1
+system.reflection.extensions@4.0.1
+system.reflection.metadata@1.3.0
+system.reflection.metadata@1.6.0
+system.reflection.primitives@4.0.1
+system.reflection.typeextensions@4.1.0
+system.reflection@4.1.0
+system.resources.reader@4.0.0
+system.resources.resourcemanager@4.0.1
+system.runtime.compilerservices.unsafe@6.0.0
+system.runtime.extensions@4.1.0
+system.runtime.handles@4.0.1
+system.runtime.interopservices.runtimeinformation@4.0.0
+system.runtime.interopservices@4.1.0
+system.runtime.loader@4.0.0
+system.runtime.numerics@4.0.1
+system.runtime@4.1.0
+system.security.claims@4.0.1
+system.security.cryptography.algorithms@4.2.0
+system.security.cryptography.cng@4.2.0
+system.security.cryptography.csp@4.0.0
+system.security.cryptography.encoding@4.0.0
+system.security.cryptography.openssl@4.0.0
+system.security.cryptography.primitives@4.0.0
+system.security.cryptography.protecteddata@4.5.0
+system.security.cryptography.x509certificates@4.1.0
+system.security.principal.windows@4.0.0
+system.security.principal@4.0.1
+system.text.encoding.codepages@4.0.1
+system.text.encoding.extensions@4.0.11
+system.text.encoding@4.0.11
+system.text.regularexpressions@4.1.0
+system.threading.overlapped@4.0.1
+system.threading.tasks.dataflow@4.6.0
+system.threading.tasks.extensions@4.0.0
+system.threading.tasks.parallel@4.0.1
+system.threading.tasks@4.0.11
+system.threading.thread@4.0.0
+system.threading.threadpool@4.0.10
+system.threading.timer@4.0.1
+system.threading@4.0.11
+system.xml.readerwriter@4.0.11
+system.xml.xdocument@4.0.11
+system.xml.xmldocument@4.0.1
+system.xml.xpath.xdocument@4.0.1
+system.xml.xpath@4.0.1
+tmds.dbus.protocol@0.16.0
+validation@2.4.18
+xunit.abstractions@2.0.2
+xunit.abstractions@2.0.3
+xunit.analyzers@1.16.0
+xunit.assert@2.9.2
+xunit.core@2.9.2
+xunit.extensibility.core@2.4.0
+xunit.extensibility.core@2.9.2
+xunit.extensibility.execution@2.4.0
+xunit.extensibility.execution@2.9.2
+xunit.runner.visualstudio@2.8.2
+xunit.skippablefact@1.4.13
+xunit@2.9.2
+"
+
+inherit dotnet-pkg
+
+DESCRIPTION="Secure Git credential storage supporing GitHub, Azure Repos, and other services"
+HOMEPAGE="https://github.com/git-ecosystem/git-credential-manager"
+SRC_URI="
+	https://github.com/git-ecosystem/git-credential-manager/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${NUGET_URIS}
+"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOTNET_PKG_PROJECTS=(
+	"${S}"/src/shared/Git-Credential-Manager
+)
diff --git a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.2.ebuild b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.2.ebuild
index 33ddb9d11f84..2cbad0f88b14 100644
--- a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.2.ebuild
+++ b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.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
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hartwork/git-delete-merged-branches"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="full-name-executable test"
 
 COMMON_DEPEND="
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index b472fd0fce4a..6246880f3664 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -1,4 +1,4 @@
 DIST git-lfs-3.5.1-deps.tar.xz 21401028 BLAKE2B a011061ebae15c7d80d908d46051c95462b617073623be83c067cfc9b028eb8f803f53dcb17a6e19d8e1bfd9c2349db9f7a000d91008b1c375bfc73de4793b25 SHA512 1879624ee84e5d138f8dcb9cb626822d0a2e063705cb424db5c9f9d609af496104655ebb878ec950112b8b39d147141ff86b6474ad8210384dd93318034c19a4
 DIST git-lfs-3.5.1.tar.gz 683872 BLAKE2B c99d85474cb8544ea2fca7daa6fc57affeabeb7bde517366c885360f613012c3b852d95abd647adfda806f0a057c6df355db0cf49f8d408460c0e2498b836ab5 SHA512 7755f8fbf18d5870eb95d13e1af763e9c8b127ecace67c95d54100eb9d735df41b649d1777f7051ba018eacba34f732a51b3bf5f1376dedf4778b5ae0c81cf40
-DIST git-lfs-3.6.0-deps.tar.xz 21227652 BLAKE2B 40418960f2d63c0f1eed7b3de77d532e3c7fd9437e584b3f6aa1e699f13b133b0dbe489bfcc776de63f2420f3f9b00ea96b6129cae450ee7bdfd65c534bcf7e1 SHA512 568c8a625620529c4a2a47cc12943f3929c7a4d54aa8f8d3ea5c93a8ab27f72518d1a252d3e048231eeda08126c5665aaa618e0e535b0b254ed81500d8594def
-DIST git-lfs-3.6.0.tar.gz 694653 BLAKE2B 3d04b43b5c06c4b9270116a49b156fbf4435a407b7b35c9d96279fe3360efc7310e64ad91bf3347ccd2f61f27cf3e39687de4f3387d196f1e053cbeb8306f298 SHA512 27ee4413f66b60094e1a2bdc47e621013d8c7ef72ac96bd9705226237619701a8e382510c166ec91bf5590acfc7c01b01a3ff53970128f343f7474625a47ff2e
+DIST git-lfs-3.6.1-deps.tar.xz 21227652 BLAKE2B 40418960f2d63c0f1eed7b3de77d532e3c7fd9437e584b3f6aa1e699f13b133b0dbe489bfcc776de63f2420f3f9b00ea96b6129cae450ee7bdfd65c534bcf7e1 SHA512 568c8a625620529c4a2a47cc12943f3929c7a4d54aa8f8d3ea5c93a8ab27f72518d1a252d3e048231eeda08126c5665aaa618e0e535b0b254ed81500d8594def
+DIST git-lfs-3.6.1.tar.gz 696263 BLAKE2B 5e70adea5e41b07f4f68423abf54afc6181be364f002d43dc456b80d0ddb89049f8427a1e968a8c4337e9dd67725b063268dd6fa03c171ff9926e10b36757f89 SHA512 d0ddee7c0bca68f66d88a66f9e3b46bba160c0ae82fbc208e55f74e79c223242ce4de3cfc5af78066acbf6a5dccac53bc592f99596ea51c71f099f21eee7d40f
diff --git a/dev-vcs/git-lfs/git-lfs-3.6.0.ebuild b/dev-vcs/git-lfs/git-lfs-3.6.0.ebuild
deleted file mode 100644
index 9450b9a36dbe..000000000000
--- a/dev-vcs/git-lfs/git-lfs-3.6.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 2017-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-EGO_PN=github.com/git-lfs/git-lfs
-# Update the ID as it's included in each build.
-COMMIT_ID="6340befc60876f4f039f215479d9d5a945f817e1"
-
-inherit go-module shell-completion
-
-DESCRIPTION="Command line extension and specification for managing large files with git"
-HOMEPAGE="
-	https://git-lfs.com
-	https://github.com/git-lfs/git-lfs
-"
-
-if [[ "${PV}" = 9999* ]]; then
-	EGIT_REPO_URI="https://${EGO_PN}"
-	inherit git-r3
-else
-	SRC_URI="https://${EGO_PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
-	# Add the manually vendored tarball.
-	# 1) Create a tar archive optimized to reproduced by other users or devs.
-	# 2) Compress the archive using XZ limiting decompression memory for
-	#    pretty constraint systems.
-	# Use something like:
-	# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-	# tar cf $P-deps.tar go-mod \
-	#	--mtime="1970-01-01" --sort=name --owner=portage --group=portage
-	# xz -k -9eT0 --memlimit-decompress=256M $P-deps.tar
-	SRC_URI+=" https://files.holgersson.xyz/gentoo/distfiles/golang-pkg-deps/${P}-deps.tar.xz"
-fi
-
-LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-BDEPEND="
-	doc? ( dev-ruby/asciidoctor )
-"
-RDEPEND="dev-vcs/git"
-
-RESTRICT+=" !test? ( test )"
-
-DOCS=(
-	CHANGELOG.md
-	CODE-OF-CONDUCT.md
-	CONTRIBUTING.md
-	README.md
-	SECURITY.md
-)
-
-src_compile() {
-	export CGO_ENABLED=0
-
-	# Flags -w, -s: Omit debugging information to reduce binary size,
-	# see https://golang.org/cmd/link/.
-	local mygobuildargs=(
-		-ldflags="-X ${EGO_PN}/config.GitCommit=${COMMIT_ID} -s -w"
-		-gcflags=" "
-		-trimpath
-		-v -work -x
-	)
-	ego build "${mygobuildargs[@]}" -o git-lfs git-lfs.go
-
-	if use doc; then
-		for doc in docs/man/*adoc;
-			do asciidoctor -b manpage ${doc} || die "man building failed"
-		done
-	fi
-
-	# Generate auto-completion scripts.
-	# bug 914542
-	./git-lfs completion bash > "${PN}.bash" || die
-	./git-lfs completion fish > "${PN}.fish" || die
-	./git-lfs completion zsh > "${PN}.zsh" || die
-}
-
-src_install() {
-	dobin git-lfs
-	einstalldocs
-
-	# Install auto-completion scripts generated earlier.
-	# bug 914542
-	newbashcomp "${PN}.bash" "${PN}"
-	dofishcomp "${PN}.fish"
-	newzshcomp "${PN}.zsh" "_${PN}"
-
-	use doc && doman docs/man/*.1
-}
-
-src_test() {
-	local mygotestargs=(
-		-ldflags="-X ${EGO_PN}/config.GitCommit=${COMMIT_ID}"
-	)
-	go test "${mygotestargs[@]}" ./... || die
-}
-
-pkg_postinst () {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog ""
-		elog "Run 'git lfs install' once for each user account manually."
-		elog "For more details see https://bugs.gentoo.org/show_bug.cgi?id=733372."
-	fi
-}
diff --git a/dev-vcs/git-lfs/git-lfs-3.6.1.ebuild b/dev-vcs/git-lfs/git-lfs-3.6.1.ebuild
new file mode 100644
index 000000000000..0f20ac164765
--- /dev/null
+++ b/dev-vcs/git-lfs/git-lfs-3.6.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 2017-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+EGO_PN=github.com/git-lfs/git-lfs
+# Update the ID as it's included in each build.
+COMMIT_ID="ea47a34bde1ba1ecf9eb8dc6d44fcf7aef42f5e3"
+
+inherit go-module shell-completion
+
+DESCRIPTION="Command line extension and specification for managing large files with git"
+HOMEPAGE="
+	https://git-lfs.com
+	https://github.com/git-lfs/git-lfs
+"
+
+if [[ "${PV}" = 9999* ]]; then
+	EGIT_REPO_URI="https://${EGO_PN}"
+	inherit git-r3
+else
+	SRC_URI="https://${EGO_PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	# Add the manually vendored tarball.
+	# 1) Create a tar archive optimized to reproduced by other users or devs.
+	# 2) Compress the archive using XZ limiting decompression memory for
+	#    pretty constraint systems.
+	# Use something like:
+	# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+	# tar cf $P-deps.tar go-mod \
+	#	--mtime="1970-01-01" --sort=name --owner=portage --group=portage
+	# xz -k -9eT0 --memlimit-decompress=256M $P-deps.tar
+	SRC_URI+=" https://files.holgersson.xyz/gentoo/distfiles/golang-pkg-deps/${P}-deps.tar.xz"
+fi
+
+LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+BDEPEND="
+	doc? ( dev-ruby/asciidoctor )
+"
+RDEPEND="dev-vcs/git"
+
+RESTRICT+=" !test? ( test )"
+
+DOCS=(
+	CHANGELOG.md
+	CODE-OF-CONDUCT.md
+	CONTRIBUTING.md
+	README.md
+	SECURITY.md
+)
+
+src_compile() {
+	export CGO_ENABLED=0
+
+	# Flags -w, -s: Omit debugging information to reduce binary size,
+	# see https://golang.org/cmd/link/.
+	local mygobuildargs=(
+		-ldflags="-X ${EGO_PN}/config.GitCommit=${COMMIT_ID} -s -w"
+		-gcflags=" "
+		-trimpath
+		-v -work -x
+	)
+	ego build "${mygobuildargs[@]}" -o git-lfs git-lfs.go
+
+	if use doc; then
+		for doc in docs/man/*adoc;
+			do asciidoctor -b manpage ${doc} || die "man building failed"
+		done
+	fi
+
+	# Generate auto-completion scripts.
+	# bug 914542
+	./git-lfs completion bash > "${PN}.bash" || die
+	./git-lfs completion fish > "${PN}.fish" || die
+	./git-lfs completion zsh > "${PN}.zsh" || die
+}
+
+src_install() {
+	dobin git-lfs
+	einstalldocs
+
+	# Install auto-completion scripts generated earlier.
+	# bug 914542
+	newbashcomp "${PN}.bash" "${PN}"
+	dofishcomp "${PN}.fish"
+	newzshcomp "${PN}.zsh" "_${PN}"
+
+	use doc && doman docs/man/*.1
+}
+
+src_test() {
+	local mygotestargs=(
+		-ldflags="-X ${EGO_PN}/config.GitCommit=${COMMIT_ID}"
+	)
+	go test "${mygotestargs[@]}" ./... || die
+}
+
+pkg_postinst () {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog ""
+		elog "Run 'git lfs install' once for each user account manually."
+		elog "For more details see https://bugs.gentoo.org/show_bug.cgi?id=733372."
+	fi
+}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 8fc74a095af8..162e1a837938 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,15 +1,9 @@
-DIST git-2.44.2.tar.xz 7435020 BLAKE2B 625071528e6575af86aa51d7d5baeaa9b1b8be0e9f2b13f9f1c948a6dc0e9e03e227462c6ed9e8b80c413f02840f4f6b5d73487e0722d30835233480ea93caf3 SHA512 4dc70065fb1f47678cbed0d055f7734fce5cc26eeb627bda928056a80253053b230200db4b2936319df5b5b577eaaa1186a8bb041a205ac600d691e5663117ed
 DIST git-2.45.2.tar.xz 7487680 BLAKE2B 477acc786c26e0b04843ad6d07333607b2274d587263d72c6d036cade725e6f62f8c773903f401c799de71527d0473589afc507eec02f445e0c148dd7cbf407c SHA512 dce30d0d563f3f76ef49c8dc88105e0cf0941c8cd70303418d9d737f840ffba36bcc575c380c75080edf64af74487e1a680db146ec5f527a32104e887d4ceb73
-DIST git-2.46.2.tar.xz 7581344 BLAKE2B 1ea2a166bd2717d581020a9921cf7e82dc2c77e2a9bd6bc70f4b6396c214c74b30e8ae6815eba33bd2995f7a6e2570b96c51acbfce25ab85e05d5fdbd09d870c SHA512 d8d1cec9a4ddc7b1892b7f5b3c808d235bcd4bfb1714ce0ce0e721242acc94f9ae7c2ae3181311feb5b458b04e89cd32acd3e9c90adbc4e86e05e7d5589d8a00
-DIST git-2.47.0.tar.xz 7652728 BLAKE2B f1d767aad6a917efe0c2e7f52163daca796640fb7f7ac8c1d6ead91ce3019f9a5ddd7ce8890ff37aaff1320d1b0b59399469fc9cb0f66cfc6893d2b3bbeee56e SHA512 58683aa59dba25ffec9fe2c185267c77b34d573e9738c133a15d25071e37095e99486c231c35b8f71aabe3c1e305238b56d2c10039318bfc08f137919bad66ec
-DIST git-2.47.1.tar.xz 7654244 BLAKE2B 5dd5d1bde226469d8de0952456dbaa408739f8613cfefdd76715e6a2bc1fdf8695740f005cc3b2caab876fccfbff0609201a827e0bd9837ec68056ba2a41da34 SHA512 6abe551c464b307bc3f6f474257e0be3e1a9eba1406af6463216b796c55a35356009c2f7bd9b4fa2d1798da5f885a3843f6ad8750ab69595f748f9ea8ed76fea
-DIST git-htmldocs-2.44.2.tar.xz 1559412 BLAKE2B 9a62ab1d70b009a9bc29250c49ca835a46928703a73ec004ea57e7dc74212c5a29d7e0784cd752c8d2c1e23b70702e2c2f280904dfedefb3d4a687002a950596 SHA512 2a82e3c37aaca91643976d21fac3bd82b23fe2374856d73b0ba726339450ea6f8a5e8e38326546292f83923e28da280ca3bed549afff1aad684ebfb3926e4992
+DIST git-2.45.3.tar.xz 7492256 BLAKE2B 51c08789487070c33ff7c6c2135203010f12641eaf9908bf70724255e72bed24a7f0b7cc0b5c947081dad22041d0ee80c53971e5634510d35d797747338cd2d8 SHA512 b5b98bcc886f6a015b54193a9481092d4bfdc3689c479a8751e63529ce1dd1db226f2da38d26f25f54b81fe2c3c48d8edbe18af534fff65f6fcaa4c50923f93b
+DIST git-2.48.1.tar.xz 7723580 BLAKE2B 092ed16fab3b3e56c81cb91db48e4db1f41b6d91d4855a7c73fb642f1fd0272823a92b8963644ef33517c61956bca89a95e4b4dc3e9237cb0520aa37c0770966 SHA512 75c89ab4ca83adc46989a4b05a9b482b40a7ba69d15aa1c1f27d0cee37c2908e154a75d59b0a0a540647352b9c55020f1a5ad309f0eff78e9fd8e631ef9e4606
 DIST git-htmldocs-2.45.2.tar.xz 1569148 BLAKE2B 5013a13da54d87728f621a09d04dee1cba7b44d230360394b86e04269bf276399cf44de74ffc14a76ec1724e1015b630300d551b3a268273a768e0edc1a7fa45 SHA512 272bb31d8d43b270d5281c5d1beadea8e5a580c738ece2580d2c6ba7e7fe6fdbca71b672a2811273119495e62613f7a4d34764b4dfbc26e4dbf9dee5797fb440
-DIST git-htmldocs-2.46.2.tar.xz 1553104 BLAKE2B 9a7b784c1a01153dc660b4fe6eaa3ceac2d30eeb96015ab4ec73296811d27cc84715abd19f723ad16c64028114c2aceee2727380e7c9f8ff220ae4538dcc9c62 SHA512 51c5363ac48f04118071218ea095dae97676ac299a482511ef55e9267724f08e7c021ffa15418d9e32e676333ba31643c9049860f154f58a67d9604e141376c3
-DIST git-htmldocs-2.47.0.tar.xz 1564012 BLAKE2B 9d9d234ac8c7eb6861a2ee1bd9000ae7150b33346adf8e830712c0fa2c068e5173a52ff0f937f64a2f2a2270853ca7d62965361d124a98bfe4e39d63a8e0aae6 SHA512 4e8cfabfcdfaa12d23ba21ee3612a841e1731c174cb1d73c9fee12a345e5ee792c1ad0f5c15b4f73ad6eb4496a1e3450aaacdd65e5f875e60c9eb355cc4134fe
-DIST git-htmldocs-2.47.1.tar.xz 1564776 BLAKE2B ff8c313e00867423ddb122572e730868541ab22c76cb73aad54ee5dab298c4a8fdc29d50ebdceb658d7799132258dad9ffcaa582439a74463a8c212c3d82005c SHA512 7df2c572413d42f954c0ca01577f9324a60810dd712a8a36b0b503708d9795a90ffa95ee96b13c082796e276bcbc65094de32ade0f71ff744f6e45869cbbb4d7
-DIST git-manpages-2.44.2.tar.xz 574316 BLAKE2B ecfca8e05ca682097376ce6a1e8b9de8fcc36472860321987be12291a53d1a92befb950fd856775df65f28300b267b80975775cba046cfb89159887e8cba5516 SHA512 2ad6d922acf46028b3b7dd5a686c0396e5452e4d50b32ba9af0cc51cc3431003524b91279e2a795065a179af3d760ce72530580295ed09a53673274cf9567cc6
+DIST git-htmldocs-2.45.3.tar.xz 1527700 BLAKE2B 1baf8df995d6a31b550d91425c94ac63425eb4efc5a334dd5a312cf1c8da84e132c30dbbb192d9bcdfcabfa9f7b758ff2445ed8d634ad31723d3835bef2ca49c SHA512 4e8b16e77f7606c279e7793cbd6f8e18973213339f56a379dbf1fc074b7d1f032783bb956de0ebb58fad7e8954b7a75ab990b265f1858b32321e7c33de414601
+DIST git-htmldocs-2.48.1.tar.xz 1580120 BLAKE2B 4d57fc0ab8256d4cf5984696485610329f63bccce8ad6bcda20bca9abbaac0725dfac0aef385a62371c2c8e7d26e86c62e0de36321f40a3da667fa2b92e43ef4 SHA512 703f237c129d3d54cea9104dc1d47ad8881400a1c90e1a55153e63912c8e7d03e1000fef5cd1962933e8a600d71e11f28a94214853047ac8e748dc53ba906ac5
 DIST git-manpages-2.45.2.tar.xz 576428 BLAKE2B c89ebd25c0caf391fcd29cc8609252daf2cf742a8cc78ce5b64931befb126c951ebb7504bc8ccbee06b81727dc3e4ded67c69adf8d737f4df38dfda758e3c734 SHA512 d39a5c92c1cfcae145713b8ff1a84258947392a3cf1490e3f7d4f87836d05e79dc4fecbff16b7c1bc314572d6d32aa2c29e7fcde993b549b2fab71620734c19b
-DIST git-manpages-2.46.2.tar.xz 584812 BLAKE2B dd5592a1fd61b6eda0afa4f9292ce86dd14bca6a88016f96c53617f6505f27cc9a2ba9437c6330bb8003b3f57cd1e75bf441bf2a2168554bbda9c26db37db4cb SHA512 ce7a2a1fbb9376182b8ce3ed772fbeeef2cf338bc06bf9bcf3c07a65419e41b3754d6851a44886d0b07dfd82f8eefe7b8b1d9f5c28ed6b6a0ea4168ed457e121
-DIST git-manpages-2.47.0.tar.xz 586352 BLAKE2B 87a1de077672e3246df26d2603221bcd06ed1844bf43a092afb630335a7da62866f497144b97106aec8565fd847010aa20e64ee24a87fc05d3e24884047e9a89 SHA512 898bf91b88910a8046fc4eefc1bfb98910d38db28846e4e04c44664f34723e406566622fd443ff332556545ca90c6519557389b75f159bbaf07044ab0cc83ac5
-DIST git-manpages-2.47.1.tar.xz 586432 BLAKE2B df4eafa03ba235202c361d16fd6db1c6b2a4fea5501f62dcd7b53e3764542a2b70ab44e1525d5f4437dad9505c507ba88aa14b1e8e828713b81cb66b6d9a73c2 SHA512 9acd5207e6c2751ec87708eedc4f060ee6bed0841564f787cd3fd5dbce712c4c2afbb9ce4e85a466fb52a8f399420ca24c7cd4eb8e14edb7ea7a5c06e3c82a5e
+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
diff --git a/dev-vcs/git/files/git-2.47.0-maintenance.patch b/dev-vcs/git/files/git-2.47.0-maintenance.patch
deleted file mode 100644
index 085d4adac33f..000000000000
--- a/dev-vcs/git/files/git-2.47.0-maintenance.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-https://lore.kernel.org/git/CAG=Um+0mJW-oAH+YLC3dWEU64JwS-zMkkTiFWYBe4g6HMbe-iA@mail.gmail.com/
-https://github.com/git/git/commit/c95547a394a35dc26afa686454086d2db6e51ea4
-
-From c95547a394a35dc26afa686454086d2db6e51ea4 Mon Sep 17 00:00:00 2001
-From: Patrick Steinhardt <ps@pks.im>
-Date: Thu, 10 Oct 2024 07:33:01 +0200
-Subject: [PATCH] builtin/gc: fix crash when running `git maintenance start`
-
-It was reported on the mailing list that running `git maintenance start`
-immediately segfaults starting with b6c3f8e12c (builtin/maintenance: fix
-leak in `get_schedule_cmd()`, 2024-09-26). And indeed, this segfault is
-trivial to reproduce up to a point where one is scratching their head
-why we didn't catch this regression in our test suite.
-
-The root cause of this error is `get_schedule_cmd()`, which does not
-populate the `out` parameter in all cases anymore starting with the
-mentioned commit. Callers do assume it to always be populated though and
-will e.g. call `strvec_split()` on the returned value, which will of
-course segfault when the variable is uninitialized.
-
-So why didn't we catch this trivial regression? The reason is that our
-tests always set up the "GIT_TEST_MAINT_SCHEDULER" environment variable
-via "t/test-lib.sh", which allows us to override the scheduler command
-with a custom one so that we don't accidentally modify the developer's
-system. But the faulty code where we don't set the `out` parameter will
-only get hit in case that environment variable is _not_ set, which is
-never the case when executing our tests.
-
-Fix the regression by again unconditionally allocating the value in the
-`out` parameter, if provided. Add a test that unsets the environment
-variable to catch future regressions in this area.
-
-Reported-by: Shubham Kanodia <shubham.kanodia10@gmail.com>
-Signed-off-by: Patrick Steinhardt <ps@pks.im>
-Signed-off-by: Junio C Hamano <gitster@pobox.com>
---- a/builtin/gc.c
-+++ b/builtin/gc.c
-@@ -1794,7 +1794,7 @@ static const char *get_frequency(enum schedule_priority schedule)
-  *     | Input |                     Output                      |
-  *     | *cmd  | return code |       *out        | *is_available |
-  *     +-------+-------------+-------------------+---------------+
-- *     | "foo" |    false    | NULL              |  (unchanged)  |
-+ *     | "foo" |    false    | "foo" (allocated) |  (unchanged)  |
-  *     +-------+-------------+-------------------+---------------+
-  *
-  *   GIT_TEST_MAINT_SCHEDULER set to “foo:./mock_foo.sh,bar:./mock_bar.sh”
-@@ -1812,8 +1812,11 @@ static int get_schedule_cmd(const char *cmd, int *is_available, char **out)
- 	struct string_list_item *item;
- 	struct string_list list = STRING_LIST_INIT_NODUP;
- 
--	if (!testing)
-+	if (!testing) {
-+		if (out)
-+			*out = xstrdup(cmd);
- 		return 0;
-+	}
- 
- 	if (is_available)
- 		*is_available = 0;
---- a/t/t7900-maintenance.sh
-+++ b/t/t7900-maintenance.sh
-@@ -646,6 +646,22 @@ test_expect_success !MINGW 'register and unregister with regex metacharacters' '
- 		maintenance.repo "$(pwd)/$META"
- '
- 
-+test_expect_success 'start without GIT_TEST_MAINT_SCHEDULER' '
-+	test_when_finished "rm -rf systemctl.log script repo" &&
-+	mkdir script &&
-+	write_script script/systemctl <<-\EOF &&
-+	echo "$*" >>../systemctl.log
-+	EOF
-+	git init repo &&
-+	(
-+		cd repo &&
-+		sane_unset GIT_TEST_MAINT_SCHEDULER &&
-+		PATH="$PWD/../script:$PATH" git maintenance start --scheduler=systemd
-+	) &&
-+	test_grep -- "--user list-timers" systemctl.log &&
-+	test_grep -- "enable --now git-maintenance@" systemctl.log
-+'
-+
- test_expect_success 'start --scheduler=<scheduler>' '
- 	test_expect_code 129 git maintenance start --scheduler=foo 2>err &&
- 	test_grep "unrecognized --scheduler argument" err &&
-
diff --git a/dev-vcs/git/files/git-2.48.0-doc-deps.patch b/dev-vcs/git/files/git-2.48.0-doc-deps.patch
new file mode 100644
index 000000000000..847e96368f08
--- /dev/null
+++ b/dev-vcs/git/files/git-2.48.0-doc-deps.patch
@@ -0,0 +1,42 @@
+https://lore.kernel.org/git/79de1bcf31f708960a889066ce3d986e55155ad8.1736577530.git.sam@gentoo.org/
+
+From 79de1bcf31f708960a889066ce3d986e55155ad8 Mon Sep 17 00:00:00 2001
+Message-ID: <79de1bcf31f708960a889066ce3d986e55155ad8.1736577546.git.sam@gentoo.org>
+From: Sam James <sam@gentoo.org>
+Date: Sat, 11 Jan 2025 06:37:48 +0000
+Subject: [PATCH] meson: fix perl dependencies for Documentation
+
+We need an explicit `depends: documentation_deps` so that all of our
+Documentation targets know they require asciidoc.conf. This shows up
+as parallel build failures with it not yet being available.
+
+Other targets look OK already.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ Documentation/technical/meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Documentation/technical/meson.build b/Documentation/technical/meson.build
+index 21dfb8b5c9..8c93da3566 100644
+--- a/Documentation/technical/meson.build
++++ b/Documentation/technical/meson.build
+@@ -42,6 +42,7 @@ api_index = custom_target(
+     '@OUTPUT@',
+   ],
+   env: script_environment,
++  depends: documentation_deps,
+   input: api_docs,
+   output: 'api-index.txt',
+ )
+@@ -60,6 +61,7 @@ foreach article : api_docs + articles
+     command: asciidoc_html_options,
+     input: article,
+     output: fs.stem(article) + '.html',
++    depends: documentation_deps,
+     install: true,
+     install_dir: get_option('datadir') / 'doc/git-doc/technical',
+   )
+-- 
+2.48.0.rc2
+
diff --git a/dev-vcs/git/git-2.44.2.ebuild b/dev-vcs/git/git-2.44.2.ebuild
deleted file mode 100644
index 11889906c180..000000000000
--- a/dev-vcs/git/git-2.44.2.ebuild
+++ /dev/null
@@ -1,647 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd
-
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
-
-	inherit git-r3
-	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-	# See https://git-scm.com/docs/gitworkflows#_graduation
-	# In order of stability:
-	# 9999-r0: maint
-	# 9999-r1: master
-	# 9999-r2: next
-	# 9999-r3: seen
-	case ${PVR} in
-		9999) EGIT_BRANCH=maint ;;
-		9999-r1) EGIT_BRANCH=master ;;
-		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=seen ;;
-	esac
-fi
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER="${MY_PV}"
-
-DESCRIPTION="Stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="https://www.git-scm.com/"
-
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
-
-	[[ ${PV/rc} != ${PV} ]] && SRC_URI_KORG+='/testing'
-
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
-	SRC_URI+=" ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}"
-	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"
-	fi
-fi
-
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
-
-# Common to both DEPEND and RDEPEND
-DEPEND="
-	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:= )
-"
-RDEPEND="
-	${DEPEND}
-	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_DEPS} )
-	selinux? ( sec-policy/selinux-git )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-BDEPEND="
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		app-text/xmlto
-		sys-apps/texinfo
-	)
-	keyring? ( virtual/pkgconfig )
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)
-"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	BDEPEND+=" app-text/asciidoc"
-fi
-
-SITEFILE="50${PN}-gentoo.el"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	perforce? ( ${PYTHON_REQUIRED_USE} )
-	subversion? ( perl )
-	webdav? ( curl )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# Avoid automagic CVS, bug #350330
-	"${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch
-
-	# Make submodule output quiet
-	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned!"
-	fi
-
-	if use perforce ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local extlibs myopts
-
-	myopts=(
-		ASCIIDOC_NO_ROFF=YesPlease
-
-		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-
-		$(usev elibc_musl NO_REGEX=NeedsStartEnd)
-		$(usev !cvs NO_CVS=YesPlease)
-		$(usev !iconv NO_ICONV=YesPlease)
-		$(usev !nls NO_GETTEXT=YesPlease)
-		$(usev !perforce NO_PYTHON=YesPlease)
-		$(usev !subversion NO_SVN_TESTS=YesPlease)
-		$(usev !tk NO_TCLTK=YesPlease)
-	)
-
-	if use blksha1 ; then
-		myopts+=( BLK_SHA1=YesPlease )
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=( NO_EXPAT=YesPlease )
-	else
-		myopts+=( NO_CURL=YesPlease )
-	fi
-
-	# Broken assumptions because of static build system
-	myopts+=(
-		NO_FINK=YesPlease
-		NO_DARWIN_PORTS=YesPlease
-		INSTALL=install
-		TAR=tar
-		SHELL_PATH="${EPREFIX}/bin/sh"
-		SANE_TOOL_PATH=
-		OLD_ICONV=
-		NO_EXTERNAL_GREP=
-	)
-
-	# Can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-	if use pcre; then
-		myopts+=( USE_LIBPCRE2=YesPlease )
-		extlibs+=( -lpcre2-8 )
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=(
-			NEEDS_LIBICONV=YesPlease
-			HAVE_CLOCK_MONOTONIC=1
-		)
-
-		if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then
-			myopts+=( HAVE_GETDELIM=1 )
-		fi
-	fi
-
-	myopts+=( ASCIIDOC8=YesPlease )
-
-	export MY_MAKEOPTS="${myopts[@]}"
-	export EXTLIBS="${extlibs[@]}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]] ; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-
-		cd "${S}" || die
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-
-		if use doc ; then
-			pushd "${S}"/Documentation &>/dev/null || die
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			popd &>/dev/null || die
-		fi
-	else
-		git-r3_src_unpack
-		#cp "${FILESDIR}"/GIT-VERSION-GEN . || die
-	fi
-
-}
-
-src_prepare() {
-	if ! use safe-directory ; then
-		# This patch neuters the "safe directory" detection.
-		# bugs #838271, #838223
-		PATCHES+=(
-			"${FILESDIR}"/git-2.37.2-unsafe-directory.patch
-		)
-	fi
-
-	default
-
-	if use prefix ; then
-		# bug #757309
-		sed -i \
-			-e 's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \
-			-e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \
-			config.mak.uname || die
-	fi
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile || die
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die
-}
-
-git_emake() {
-	# bug #320647: PYTHON_PATH
-	local PYTHON_PATH=""
-	use perforce && PYTHON_PATH="${PYTHON}"
-
-	local mymakeargs=(
-		${MY_MAKEOPTS}
-
-		prefix="${EPREFIX}"/usr
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		perllibdir="$(use perl && perl_get_raw_vendorlib)"
-		sysconfdir="${EPREFIX}"/etc
-
-		CC="$(tc-getCC)"
-		CFLAGS="${CFLAGS}"
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-
-		# TODO: --verbose?
-		GIT_TEST_OPTS="--no-color"
-
-		OPTAR="$(tc-getAR)"
-		OPTCC="$(tc-getCC)"
-		OPTCFLAGS="${CFLAGS}"
-		OPTLDFLAGS="${LDFLAGS}"
-
-		PERL_PATH="${EPREFIX}/usr/bin/perl"
-		PERL_MM_OPT=""
-
-		PYTHON_PATH="${PYTHON_PATH}"
-
-		V=1
-		"$@"
-	)
-
-	emake "${mymakeargs[@]}"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake
-
-	if use perl && use cgi ; then
-		git_emake gitweb
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
-		git_emake -C contrib/credential/osxkeychain
-	fi
-
-	pushd Documentation &>/dev/null || die
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man
-		if use doc ; then
-			git_emake info html
-		fi
-	else
-		if use doc ; then
-			git_emake info
-		fi
-	fi
-	popd &>/dev/null || die
-
-	if use keyring ; then
-		git_emake -C contrib/credential/libsecret
-	fi
-
-	pushd contrib/subtree &>/dev/null || die
-	git_emake git-subtree
-	# git-subtree.1 requires the full USE=doc dependency stack
-	use doc && git_emake git-subtree.html git-subtree.1
-	popd &>/dev/null || die
-
-	git_emake -C contrib/diff-highlight
-
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git
-	fi
-}
-
-src_test() {
-	local disabled=(
-		# We make safe-directory optional
-		t0033-safe-directory.sh
-	)
-
-	local tests_cvs=(
-		t9200-git-cvsexportcommit.sh
-		t9400-git-cvsserver-server.sh
-		t9401-git-cvsserver-crlf.sh
-		t9402-git-cvsserver-refs.sh
-		t9600-cvsimport.sh
-		t9601-cvsimport-vendor-branch.sh
-		t9602-cvsimport-branches-tags.sh
-		t9603-cvsimport-patchsets.sh
-		t9604-cvsimport-timestamps.sh
-	)
-
-	local tests_perl=(
-		t3701-add-interactive.sh
-		t5502-quickfetch.sh
-		t5512-ls-remote.sh
-		t5520-pull.sh
-		t7106-reset-unborn-branch.sh
-		t7501-commit.sh
-	)
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot=(
-		t0001-init.sh
-		t0004-unwritable.sh
-		t0070-fundamental.sh
-		t1004-read-tree-m-u-wf.sh
-		t3700-add.sh
-		t7300-clean.sh
-	)
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn=( t9100-git-svn-basic.sh )
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled+=( t5000-tar-tree.sh )
-	fi
-
-	local cvs=0
-	use cvs && let cvs=${cvs}+1
-	if [[ ${EUID} -eq 0 ]] ; then
-		if [[ ${cvs} -eq 1 ]] ; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled+=( ${tests_nonroot[@]} )
-	else
-		if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -lt 3 ]] ; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled+=( ${tests_perl[@]} )
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled+=( ${test_svn[@]} )
-
-	# Reset all previously disabled tests
-	pushd t &>/dev/null || die
-	local i
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled[@]} ; do
-		if [[ -f "${i}" ]] ; then
-			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
-		fi
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
-
-	# Clean old results first, must always run
-	nonfatal git_emake clean
-	popd &>/dev/null || die
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	local rc
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	pushd t &>/dev/null || die
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!"
-}
-
-src_install() {
-	git_emake DESTDIR="${D}" install
-
-	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	local d
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	pushd contrib/subtree &>/dev/null || die
-	git_emake DESTDIR="${D}" install
-	if use doc ; then
-		# Do not move git subtree install-man outside USE=doc!
-		git_emake DESTDIR="${D}" install-man install-html
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	popd &>/dev/null || die
-
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		dobin git-credential-libsecret
-		popd &>/dev/null || die
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - removed upstream
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hg-to-git
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	local i
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym ../gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
-			if [[ -d "${d}" ]] ; then
-				find "${d}" -name .packlist -delete || die
-			fi
-		done
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if ! use prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	plocale_for_each_disabled_locale rm_loc
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
-		elog "completion."
-		elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-		elog "Note that the prompt bash code is now in that separate script"
-	fi
-
-	optfeature_header "Some scripts require additional dependencies:"
-	optfeature git-quiltimport dev-util/quilt
-	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
-}
diff --git a/dev-vcs/git/git-2.45.3.ebuild b/dev-vcs/git/git-2.45.3.ebuild
new file mode 100644
index 000000000000..c56d4cad545b
--- /dev/null
+++ b/dev-vcs/git/git-2.45.3.ebuild
@@ -0,0 +1,650 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
+
+	inherit git-r3
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: seen
+	case ${PVR} in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=seen ;;
+	esac
+fi
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER="${MY_PV}"
+
+DESCRIPTION="Stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
+
+	[[ ${PV/rc} != ${PV} ]] && SRC_URI_KORG+='/testing'
+
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
+	SRC_URI+=" ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}"
+	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"
+	fi
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+	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:= )
+"
+RDEPEND="
+	${DEPEND}
+	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_DEPS} )
+	selinux? ( sec-policy/selinux-git )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		app-text/xmlto
+		sys-apps/texinfo
+	)
+	keyring? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND+=" app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# Avoid automagic CVS, bug #350330
+	"${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch
+
+	# Make submodule output quiet
+	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned!"
+	fi
+
+	if use perforce ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local extlibs myopts
+
+	myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+
+		$(usev elibc_musl NO_REGEX=NeedsStartEnd)
+		$(usev !cvs NO_CVS=YesPlease)
+		$(usev !iconv NO_ICONV=YesPlease)
+		$(usev !nls NO_GETTEXT=YesPlease)
+		$(usev !perforce NO_PYTHON=YesPlease)
+		$(usev !subversion NO_SVN_TESTS=YesPlease)
+		$(usev !tk NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# Broken assumptions because of static build system
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# Can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		myopts+=( USE_LIBPCRE2=YesPlease )
+		extlibs+=( -lpcre2-8 )
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+
+		if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then
+			myopts+=( HAVE_GETDELIM=1 )
+		fi
+	fi
+
+	myopts+=( ASCIIDOC8=YesPlease )
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs[@]}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]] ; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN . || die
+	fi
+
+}
+
+src_prepare() {
+	if ! use safe-directory ; then
+		# This patch neuters the "safe directory" detection.
+		# bugs #838271, #838223
+		PATCHES+=(
+			"${FILESDIR}"/git-2.37.2-unsafe-directory.patch
+		)
+	fi
+
+	default
+
+	if use prefix ; then
+		# bug #757309
+		sed -i \
+			-e 's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \
+			-e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \
+			config.mak.uname || die
+	fi
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use perforce && PYTHON_PATH="${PYTHON}"
+
+	local mymakeargs=(
+		${MY_MAKEOPTS}
+
+		prefix="${EPREFIX}"/usr
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		perllibdir="$(use perl && perl_get_raw_vendorlib)"
+		sysconfdir="${EPREFIX}"/etc
+
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+
+		# TODO: --verbose?
+		GIT_TEST_OPTS="--no-color"
+
+		OPTAR="$(tc-getAR)"
+		OPTCC="$(tc-getCC)"
+		OPTCFLAGS="${CFLAGS}"
+		OPTLDFLAGS="${LDFLAGS}"
+
+		CURL_CONFIG="${ESYSROOT}/usr/bin/curl-config"
+		CURL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libcurl)"
+		CURL_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libcurl)"
+
+		PERL_PATH="${EPREFIX}/usr/bin/perl"
+		PERL_MM_OPT=""
+
+		PYTHON_PATH="${PYTHON_PATH}"
+
+		V=1
+		"$@"
+	)
+
+	emake "${mymakeargs[@]}"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake
+
+	if use perl && use cgi ; then
+		git_emake gitweb
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		git_emake -C contrib/credential/osxkeychain
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man
+		if use doc ; then
+			git_emake info html
+		fi
+	else
+		if use doc ; then
+			git_emake info
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use keyring ; then
+		git_emake -C contrib/credential/libsecret
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake git-subtree
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake git-subtree.html git-subtree.1
+	popd &>/dev/null || die
+
+	git_emake -C contrib/diff-highlight
+
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git
+	fi
+}
+
+src_test() {
+	local disabled=(
+		# We make safe-directory optional
+		t0033-safe-directory.sh
+	)
+
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]] ; then
+		if [[ ${cvs} -eq 1 ]] ; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then
+			let cvs=${cvs}+1
+		fi
+
+		if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then
+			let cvs=${cvs}+1
+		fi
+
+		if [[ ${cvs} -lt 3 ]] ; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		if [[ -f "${i}" ]] ; then
+			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+		fi
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!"
+}
+
+src_install() {
+	git_emake DESTDIR="${D}" install
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	local d
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake DESTDIR="${D}" install
+	if use doc ; then
+		# Do not move git subtree install-man outside USE=doc!
+		git_emake DESTDIR="${D}" install-man install-html
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - removed upstream
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	local i
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym ../gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+			if [[ -d "${d}" ]] ; then
+				find "${d}" -name .packlist -delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if ! use prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	plocale_for_each_disabled_locale rm_loc
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+		elog "completion."
+		elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+		elog "Note that the prompt bash code is now in that separate script"
+	fi
+
+	optfeature_header "Some scripts require additional dependencies:"
+	optfeature git-quiltimport dev-util/quilt
+	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
+}
diff --git a/dev-vcs/git/git-2.46.2.ebuild b/dev-vcs/git/git-2.46.2.ebuild
deleted file mode 100644
index 17a8afd1ac8b..000000000000
--- a/dev-vcs/git/git-2.46.2.ebuild
+++ /dev/null
@@ -1,667 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd
-
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
-
-	inherit git-r3
-	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-	# See https://git-scm.com/docs/gitworkflows#_graduation
-	# In order of stability:
-	# 9999-r0: maint
-	# 9999-r1: master
-	# 9999-r2: next
-	# 9999-r3: seen
-	case ${PVR} in
-		9999) EGIT_BRANCH=maint ;;
-		9999-r1) EGIT_BRANCH=master ;;
-		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=seen ;;
-	esac
-fi
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER="${MY_PV}"
-
-DESCRIPTION="Stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="https://www.git-scm.com/"
-
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
-
-	[[ ${PV/rc} != ${PV} ]] && SRC_URI_KORG+='/testing'
-
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
-	SRC_URI+=" ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}"
-	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"
-	fi
-fi
-
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
-
-# Common to both DEPEND and RDEPEND
-DEPEND="
-	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:= )
-"
-RDEPEND="
-	${DEPEND}
-	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_DEPS} )
-	selinux? ( sec-policy/selinux-git )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-BDEPEND="
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		app-text/xmlto
-		sys-apps/texinfo
-	)
-	keyring? ( virtual/pkgconfig )
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)
-"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	BDEPEND+=" app-text/asciidoc"
-fi
-
-SITEFILE="50${PN}-gentoo.el"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	perforce? ( ${PYTHON_REQUIRED_USE} )
-	subversion? ( perl )
-	webdav? ( curl )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# Avoid automagic CVS, bug #350330
-	"${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch
-
-	# Make submodule output quiet
-	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned!"
-	fi
-
-	if use perforce ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local extlibs myopts
-
-	myopts=(
-		ASCIIDOC_NO_ROFF=YesPlease
-
-		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-
-		$(usev elibc_musl NO_REGEX=NeedsStartEnd)
-		$(usev !cvs NO_CVS=YesPlease)
-		$(usev !iconv NO_ICONV=YesPlease)
-		$(usev !nls NO_GETTEXT=YesPlease)
-		$(usev !perforce NO_PYTHON=YesPlease)
-		$(usev !subversion NO_SVN_TESTS=YesPlease)
-		$(usev !tk NO_TCLTK=YesPlease)
-	)
-
-	if use blksha1 ; then
-		myopts+=( BLK_SHA1=YesPlease )
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=( NO_EXPAT=YesPlease )
-	else
-		myopts+=( NO_CURL=YesPlease )
-	fi
-
-	# Broken assumptions because of static build system
-	myopts+=(
-		NO_FINK=YesPlease
-		NO_DARWIN_PORTS=YesPlease
-		INSTALL=install
-		TAR=tar
-		SHELL_PATH="${EPREFIX}/bin/sh"
-		SANE_TOOL_PATH=
-		OLD_ICONV=
-		NO_EXTERNAL_GREP=
-	)
-
-	# Can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-	if use pcre; then
-		myopts+=( USE_LIBPCRE2=YesPlease )
-		extlibs+=( -lpcre2-8 )
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=(
-			NEEDS_LIBICONV=YesPlease
-			HAVE_CLOCK_MONOTONIC=1
-		)
-
-		if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then
-			myopts+=( HAVE_GETDELIM=1 )
-		fi
-	fi
-
-	myopts+=( ASCIIDOC8=YesPlease )
-
-	export MY_MAKEOPTS="${myopts[@]}"
-	export EXTLIBS="${extlibs[@]}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]] ; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-
-		cd "${S}" || die
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-
-		if use doc ; then
-			pushd "${S}"/Documentation &>/dev/null || die
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			popd &>/dev/null || die
-		fi
-	else
-		git-r3_src_unpack
-		#cp "${FILESDIR}"/GIT-VERSION-GEN . || die
-	fi
-
-}
-
-src_prepare() {
-	if ! use safe-directory ; then
-		# This patch neuters the "safe directory" detection.
-		# bugs #838271, #838223
-		PATCHES+=(
-			"${FILESDIR}"/git-2.46.2-unsafe-directory.patch
-		)
-	fi
-
-	default
-
-	if use prefix ; then
-		# bug #757309
-		sed -i \
-			-e 's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \
-			-e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \
-			config.mak.uname || die
-	fi
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile || die
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die
-}
-
-git_emake() {
-	# bug #320647: PYTHON_PATH
-	local PYTHON_PATH=""
-	use perforce && PYTHON_PATH="${PYTHON}"
-
-	local mymakeargs=(
-		${MY_MAKEOPTS}
-
-		prefix="${EPREFIX}"/usr
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		perllibdir="$(use perl && perl_get_raw_vendorlib)"
-		sysconfdir="${EPREFIX}"/etc
-
-		CC="$(tc-getCC)"
-		CFLAGS="${CFLAGS}"
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-
-		# TODO: --verbose?
-		GIT_TEST_OPTS="--no-color"
-
-		OPTAR="$(tc-getAR)"
-		OPTCC="$(tc-getCC)"
-		OPTCFLAGS="${CFLAGS}"
-		OPTLDFLAGS="${LDFLAGS}"
-
-		CURL_CONFIG="${ESYSROOT}/usr/bin/curl-config"
-		CURL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libcurl)"
-		CURL_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libcurl)"
-
-		PERL_PATH="${EPREFIX}/usr/bin/perl"
-		PERL_MM_OPT=""
-
-		PYTHON_PATH="${PYTHON_PATH}"
-
-		V=1
-		"$@"
-	)
-
-	emake "${mymakeargs[@]}"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake
-
-	if use perl && use cgi ; then
-		git_emake gitweb
-	fi
-
-	if use perl ; then
-		git_emake -C contrib/credential/netrc
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
-		git_emake -C contrib/credential/osxkeychain
-	fi
-
-	pushd Documentation &>/dev/null || die
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man
-		if use doc ; then
-			git_emake info html
-		fi
-	else
-		if use doc ; then
-			git_emake info
-		fi
-	fi
-	popd &>/dev/null || die
-
-	if use keyring ; then
-		git_emake -C contrib/credential/libsecret
-	fi
-
-	pushd contrib/subtree &>/dev/null || die
-	git_emake git-subtree
-	# git-subtree.1 requires the full USE=doc dependency stack
-	use doc && git_emake git-subtree.html git-subtree.1
-	popd &>/dev/null || die
-
-	git_emake -C contrib/diff-highlight
-
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git
-	fi
-}
-
-src_test() {
-	local disabled=(
-		# We make safe-directory optional
-		t0033-safe-directory.sh
-	)
-
-	local tests_cvs=(
-		t9200-git-cvsexportcommit.sh
-		t9400-git-cvsserver-server.sh
-		t9401-git-cvsserver-crlf.sh
-		t9402-git-cvsserver-refs.sh
-		t9600-cvsimport.sh
-		t9601-cvsimport-vendor-branch.sh
-		t9602-cvsimport-branches-tags.sh
-		t9603-cvsimport-patchsets.sh
-		t9604-cvsimport-timestamps.sh
-	)
-
-	local tests_perl=(
-		t3701-add-interactive.sh
-		t5502-quickfetch.sh
-		t5512-ls-remote.sh
-		t5520-pull.sh
-		t7106-reset-unborn-branch.sh
-		t7501-commit.sh
-	)
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot=(
-		t0001-init.sh
-		t0004-unwritable.sh
-		t0070-fundamental.sh
-		t1004-read-tree-m-u-wf.sh
-		t3700-add.sh
-		t7300-clean.sh
-	)
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn=( t9100-git-svn-basic.sh )
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled+=( t5000-tar-tree.sh )
-	fi
-
-	local cvs=0
-	use cvs && let cvs=${cvs}+1
-	if [[ ${EUID} -eq 0 ]] ; then
-		if [[ ${cvs} -eq 1 ]] ; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled+=( ${tests_nonroot[@]} )
-	else
-		if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -lt 3 ]] ; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled+=( ${tests_perl[@]} )
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled+=( ${test_svn[@]} )
-
-	# Reset all previously disabled tests
-	pushd t &>/dev/null || die
-	local i
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled[@]} ; do
-		if [[ -f "${i}" ]] ; then
-			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
-		fi
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
-
-	# Clean old results first, must always run
-	nonfatal git_emake clean
-	popd &>/dev/null || die
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	local rc
-	# t0610-reftable-basics.sh uses $A
-	local -x A=
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	pushd t &>/dev/null || die
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!"
-
-	popd &>/dev/null || die
-	if use perl ; then
-		emake -C contrib/credential/netrc testverbose
-	fi
-}
-
-src_install() {
-	git_emake DESTDIR="${D}" install
-
-	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	local d
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	pushd contrib/subtree &>/dev/null || die
-	git_emake DESTDIR="${D}" install
-	if use doc ; then
-		# Do not move git subtree install-man outside USE=doc!
-		git_emake DESTDIR="${D}" install-man install-html
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	popd &>/dev/null || die
-
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		dobin git-credential-libsecret
-		popd &>/dev/null || die
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - removed upstream
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	local i
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym ../gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
-			if [[ -d "${d}" ]] ; then
-				find "${d}" -name .packlist -delete || die
-			fi
-		done
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if use perl ; then
-		pushd contrib/credential/netrc &>/dev/null || die
-		dobin git-credential-netrc
-		popd &>/dev/null || die
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if ! use prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	plocale_for_each_disabled_locale rm_loc
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
-		elog "completion."
-		elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-		elog "Note that the prompt bash code is now in that separate script"
-	fi
-
-	optfeature_header "Some scripts require additional dependencies:"
-	optfeature git-quiltimport dev-util/quilt
-	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
-}
diff --git a/dev-vcs/git/git-2.47.0-r1.ebuild b/dev-vcs/git/git-2.47.0-r1.ebuild
deleted file mode 100644
index 6ffa3da84ef2..000000000000
--- a/dev-vcs/git/git-2.47.0-r1.ebuild
+++ /dev/null
@@ -1,673 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit flag-o-matic toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd
-
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
-
-	inherit git-r3
-	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-	# See https://git-scm.com/docs/gitworkflows#_graduation
-	# In order of stability:
-	# 9999-r0: maint
-	# 9999-r1: master
-	# 9999-r2: next
-	# 9999-r3: seen
-	case ${PVR} in
-		9999) EGIT_BRANCH=maint ;;
-		9999-r1) EGIT_BRANCH=master ;;
-		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=seen ;;
-	esac
-fi
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER="${MY_PV}"
-
-DESCRIPTION="Stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="https://www.git-scm.com/"
-
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
-
-	[[ ${PV/rc} != ${PV} ]] && SRC_URI_KORG+='/testing'
-
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
-	SRC_URI+=" ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}"
-	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"
-	fi
-fi
-
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
-
-# Common to both DEPEND and RDEPEND
-DEPEND="
-	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:= )
-"
-RDEPEND="
-	${DEPEND}
-	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_DEPS} )
-	selinux? ( sec-policy/selinux-git )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-BDEPEND="
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		app-text/xmlto
-		sys-apps/texinfo
-	)
-	keyring? ( virtual/pkgconfig )
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)
-"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	BDEPEND+=" app-text/asciidoc"
-fi
-
-SITEFILE="50${PN}-gentoo.el"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	perforce? ( ${PYTHON_REQUIRED_USE} )
-	subversion? ( perl )
-	webdav? ( curl )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# Avoid automagic CVS, bug #350330
-	"${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch
-
-	# Make submodule output quiet
-	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-
-	# Backport fix for git-maintenance
-	"${FILESDIR}"/${P}-maintenance.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned!"
-	fi
-
-	if use perforce ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local extlibs myopts
-
-	myopts=(
-		ASCIIDOC_NO_ROFF=YesPlease
-
-		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-
-		$(usev elibc_musl NO_REGEX=NeedsStartEnd)
-		$(usev !cvs NO_CVS=YesPlease)
-		$(usev !iconv NO_ICONV=YesPlease)
-		$(usev !nls NO_GETTEXT=YesPlease)
-		$(usev !perforce NO_PYTHON=YesPlease)
-		$(usev !subversion NO_SVN_TESTS=YesPlease)
-		$(usev !tk NO_TCLTK=YesPlease)
-	)
-
-	if use blksha1 ; then
-		myopts+=( BLK_SHA1=YesPlease )
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=( NO_EXPAT=YesPlease )
-	else
-		myopts+=( NO_CURL=YesPlease )
-	fi
-
-	# Broken assumptions because of static build system
-	myopts+=(
-		NO_FINK=YesPlease
-		NO_DARWIN_PORTS=YesPlease
-		INSTALL=install
-		TAR=tar
-		SHELL_PATH="${EPREFIX}/bin/sh"
-		SANE_TOOL_PATH=
-		OLD_ICONV=
-		NO_EXTERNAL_GREP=
-	)
-
-	# Can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-	if use pcre; then
-		myopts+=( USE_LIBPCRE2=YesPlease )
-		extlibs+=( -lpcre2-8 )
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=(
-			NEEDS_LIBICONV=YesPlease
-			HAVE_CLOCK_MONOTONIC=1
-		)
-
-		if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then
-			myopts+=( HAVE_GETDELIM=1 )
-		fi
-	fi
-
-	myopts+=( ASCIIDOC8=YesPlease )
-
-	export MY_MAKEOPTS="${myopts[@]}"
-	export EXTLIBS="${extlibs[@]}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]] ; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-
-		cd "${S}" || die
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-
-		if use doc ; then
-			pushd "${S}"/Documentation &>/dev/null || die
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			popd &>/dev/null || die
-		fi
-	else
-		git-r3_src_unpack
-		#cp "${FILESDIR}"/GIT-VERSION-GEN . || die
-	fi
-
-}
-
-src_prepare() {
-	if ! use safe-directory ; then
-		# This patch neuters the "safe directory" detection.
-		# bugs #838271, #838223
-		PATCHES+=(
-			"${FILESDIR}"/git-2.46.2-unsafe-directory.patch
-		)
-	fi
-
-	default
-
-	if use prefix ; then
-		# bug #757309
-		sed -i \
-			-e 's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \
-			-e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \
-			config.mak.uname || die
-	fi
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile || die
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die
-}
-
-git_emake() {
-	# bug #320647: PYTHON_PATH
-	local PYTHON_PATH=""
-	use perforce && PYTHON_PATH="${PYTHON}"
-
-	local mymakeargs=(
-		${MY_MAKEOPTS}
-
-		prefix="${EPREFIX}"/usr
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		perllibdir="$(use perl && perl_get_raw_vendorlib)"
-		sysconfdir="${EPREFIX}"/etc
-
-		CC="$(tc-getCC)"
-		CFLAGS="${CFLAGS}"
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-
-		# TODO: --verbose?
-		GIT_TEST_OPTS="--no-color"
-
-		OPTAR="$(tc-getAR)"
-		OPTCC="$(tc-getCC)"
-		OPTCFLAGS="${CFLAGS}"
-		OPTLDFLAGS="${LDFLAGS}"
-
-		CURL_CONFIG="${ESYSROOT}/usr/bin/curl-config"
-		CURL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libcurl)"
-		CURL_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libcurl)"
-
-		PERL_PATH="${EPREFIX}/usr/bin/perl"
-		PERL_MM_OPT=""
-
-		PYTHON_PATH="${PYTHON_PATH}"
-
-		V=1
-		"$@"
-	)
-
-	emake "${mymakeargs[@]}"
-}
-
-src_configure() {
-	# https://lore.kernel.org/git/87ed3apy2u.fsf@gentoo.org/
-	append-cflags $(test-flags-CC -std=gnu17)
-
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake
-
-	if use perl && use cgi ; then
-		git_emake gitweb
-	fi
-
-	if use perl ; then
-		git_emake -C contrib/credential/netrc
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
-		git_emake -C contrib/credential/osxkeychain
-	fi
-
-	pushd Documentation &>/dev/null || die
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man
-		if use doc ; then
-			git_emake info html
-		fi
-	else
-		if use doc ; then
-			git_emake info
-		fi
-	fi
-	popd &>/dev/null || die
-
-	if use keyring ; then
-		git_emake -C contrib/credential/libsecret
-	fi
-
-	pushd contrib/subtree &>/dev/null || die
-	git_emake git-subtree
-	# git-subtree.1 requires the full USE=doc dependency stack
-	use doc && git_emake git-subtree.html git-subtree.1
-	popd &>/dev/null || die
-
-	git_emake -C contrib/diff-highlight
-
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git
-	fi
-}
-
-src_test() {
-	local disabled=(
-		# We make safe-directory optional
-		t0033-safe-directory.sh
-	)
-
-	local tests_cvs=(
-		t9200-git-cvsexportcommit.sh
-		t9400-git-cvsserver-server.sh
-		t9401-git-cvsserver-crlf.sh
-		t9402-git-cvsserver-refs.sh
-		t9600-cvsimport.sh
-		t9601-cvsimport-vendor-branch.sh
-		t9602-cvsimport-branches-tags.sh
-		t9603-cvsimport-patchsets.sh
-		t9604-cvsimport-timestamps.sh
-	)
-
-	local tests_perl=(
-		t3701-add-interactive.sh
-		t5502-quickfetch.sh
-		t5512-ls-remote.sh
-		t5520-pull.sh
-		t7106-reset-unborn-branch.sh
-		t7501-commit.sh
-	)
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot=(
-		t0001-init.sh
-		t0004-unwritable.sh
-		t0070-fundamental.sh
-		t1004-read-tree-m-u-wf.sh
-		t3700-add.sh
-		t7300-clean.sh
-	)
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn=( t9100-git-svn-basic.sh )
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled+=( t5000-tar-tree.sh )
-	fi
-
-	local cvs=0
-	use cvs && let cvs=${cvs}+1
-	if [[ ${EUID} -eq 0 ]] ; then
-		if [[ ${cvs} -eq 1 ]] ; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled+=( ${tests_nonroot[@]} )
-	else
-		if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -lt 3 ]] ; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled+=( ${tests_perl[@]} )
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled+=( ${test_svn[@]} )
-
-	# Reset all previously disabled tests
-	pushd t &>/dev/null || die
-	local i
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled[@]} ; do
-		if [[ -f "${i}" ]] ; then
-			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
-		fi
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
-
-	# Clean old results first, must always run
-	nonfatal git_emake clean
-	popd &>/dev/null || die
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	local rc
-	# t0610-reftable-basics.sh uses $A
-	local -x A=
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	pushd t &>/dev/null || die
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!"
-
-	popd &>/dev/null || die
-	if use perl ; then
-		emake -C contrib/credential/netrc testverbose
-	fi
-}
-
-src_install() {
-	git_emake DESTDIR="${D}" install
-
-	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	local d
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	pushd contrib/subtree &>/dev/null || die
-	git_emake DESTDIR="${D}" install
-	if use doc ; then
-		# Do not move git subtree install-man outside USE=doc!
-		git_emake DESTDIR="${D}" install-man install-html
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	popd &>/dev/null || die
-
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		dobin git-credential-libsecret
-		popd &>/dev/null || die
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - removed upstream
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	local i
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym ../gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
-			if [[ -d "${d}" ]] ; then
-				find "${d}" -name .packlist -delete || die
-			fi
-		done
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if use perl ; then
-		pushd contrib/credential/netrc &>/dev/null || die
-		dobin git-credential-netrc
-		popd &>/dev/null || die
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if ! use prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	plocale_for_each_disabled_locale rm_loc
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
-		elog "completion."
-		elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-		elog "Note that the prompt bash code is now in that separate script"
-	fi
-
-	optfeature_header "Some scripts require additional dependencies:"
-	optfeature git-quiltimport dev-util/quilt
-	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
-}
diff --git a/dev-vcs/git/git-2.47.0.ebuild b/dev-vcs/git/git-2.47.0.ebuild
deleted file mode 100644
index 17a8afd1ac8b..000000000000
--- a/dev-vcs/git/git-2.47.0.ebuild
+++ /dev/null
@@ -1,667 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd
-
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
-
-	inherit git-r3
-	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-	# See https://git-scm.com/docs/gitworkflows#_graduation
-	# In order of stability:
-	# 9999-r0: maint
-	# 9999-r1: master
-	# 9999-r2: next
-	# 9999-r3: seen
-	case ${PVR} in
-		9999) EGIT_BRANCH=maint ;;
-		9999-r1) EGIT_BRANCH=master ;;
-		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=seen ;;
-	esac
-fi
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER="${MY_PV}"
-
-DESCRIPTION="Stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="https://www.git-scm.com/"
-
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
-
-	[[ ${PV/rc} != ${PV} ]] && SRC_URI_KORG+='/testing'
-
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
-	SRC_URI+=" ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}"
-	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"
-	fi
-fi
-
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
-
-# Common to both DEPEND and RDEPEND
-DEPEND="
-	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:= )
-"
-RDEPEND="
-	${DEPEND}
-	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_DEPS} )
-	selinux? ( sec-policy/selinux-git )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-BDEPEND="
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		app-text/xmlto
-		sys-apps/texinfo
-	)
-	keyring? ( virtual/pkgconfig )
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)
-"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	BDEPEND+=" app-text/asciidoc"
-fi
-
-SITEFILE="50${PN}-gentoo.el"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	perforce? ( ${PYTHON_REQUIRED_USE} )
-	subversion? ( perl )
-	webdav? ( curl )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# Avoid automagic CVS, bug #350330
-	"${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch
-
-	# Make submodule output quiet
-	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned!"
-	fi
-
-	if use perforce ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local extlibs myopts
-
-	myopts=(
-		ASCIIDOC_NO_ROFF=YesPlease
-
-		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-
-		$(usev elibc_musl NO_REGEX=NeedsStartEnd)
-		$(usev !cvs NO_CVS=YesPlease)
-		$(usev !iconv NO_ICONV=YesPlease)
-		$(usev !nls NO_GETTEXT=YesPlease)
-		$(usev !perforce NO_PYTHON=YesPlease)
-		$(usev !subversion NO_SVN_TESTS=YesPlease)
-		$(usev !tk NO_TCLTK=YesPlease)
-	)
-
-	if use blksha1 ; then
-		myopts+=( BLK_SHA1=YesPlease )
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=( NO_EXPAT=YesPlease )
-	else
-		myopts+=( NO_CURL=YesPlease )
-	fi
-
-	# Broken assumptions because of static build system
-	myopts+=(
-		NO_FINK=YesPlease
-		NO_DARWIN_PORTS=YesPlease
-		INSTALL=install
-		TAR=tar
-		SHELL_PATH="${EPREFIX}/bin/sh"
-		SANE_TOOL_PATH=
-		OLD_ICONV=
-		NO_EXTERNAL_GREP=
-	)
-
-	# Can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-	if use pcre; then
-		myopts+=( USE_LIBPCRE2=YesPlease )
-		extlibs+=( -lpcre2-8 )
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=(
-			NEEDS_LIBICONV=YesPlease
-			HAVE_CLOCK_MONOTONIC=1
-		)
-
-		if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then
-			myopts+=( HAVE_GETDELIM=1 )
-		fi
-	fi
-
-	myopts+=( ASCIIDOC8=YesPlease )
-
-	export MY_MAKEOPTS="${myopts[@]}"
-	export EXTLIBS="${extlibs[@]}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]] ; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-
-		cd "${S}" || die
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-
-		if use doc ; then
-			pushd "${S}"/Documentation &>/dev/null || die
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			popd &>/dev/null || die
-		fi
-	else
-		git-r3_src_unpack
-		#cp "${FILESDIR}"/GIT-VERSION-GEN . || die
-	fi
-
-}
-
-src_prepare() {
-	if ! use safe-directory ; then
-		# This patch neuters the "safe directory" detection.
-		# bugs #838271, #838223
-		PATCHES+=(
-			"${FILESDIR}"/git-2.46.2-unsafe-directory.patch
-		)
-	fi
-
-	default
-
-	if use prefix ; then
-		# bug #757309
-		sed -i \
-			-e 's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \
-			-e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \
-			config.mak.uname || die
-	fi
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile || die
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die
-}
-
-git_emake() {
-	# bug #320647: PYTHON_PATH
-	local PYTHON_PATH=""
-	use perforce && PYTHON_PATH="${PYTHON}"
-
-	local mymakeargs=(
-		${MY_MAKEOPTS}
-
-		prefix="${EPREFIX}"/usr
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		perllibdir="$(use perl && perl_get_raw_vendorlib)"
-		sysconfdir="${EPREFIX}"/etc
-
-		CC="$(tc-getCC)"
-		CFLAGS="${CFLAGS}"
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-
-		# TODO: --verbose?
-		GIT_TEST_OPTS="--no-color"
-
-		OPTAR="$(tc-getAR)"
-		OPTCC="$(tc-getCC)"
-		OPTCFLAGS="${CFLAGS}"
-		OPTLDFLAGS="${LDFLAGS}"
-
-		CURL_CONFIG="${ESYSROOT}/usr/bin/curl-config"
-		CURL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libcurl)"
-		CURL_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libcurl)"
-
-		PERL_PATH="${EPREFIX}/usr/bin/perl"
-		PERL_MM_OPT=""
-
-		PYTHON_PATH="${PYTHON_PATH}"
-
-		V=1
-		"$@"
-	)
-
-	emake "${mymakeargs[@]}"
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake
-
-	if use perl && use cgi ; then
-		git_emake gitweb
-	fi
-
-	if use perl ; then
-		git_emake -C contrib/credential/netrc
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
-		git_emake -C contrib/credential/osxkeychain
-	fi
-
-	pushd Documentation &>/dev/null || die
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man
-		if use doc ; then
-			git_emake info html
-		fi
-	else
-		if use doc ; then
-			git_emake info
-		fi
-	fi
-	popd &>/dev/null || die
-
-	if use keyring ; then
-		git_emake -C contrib/credential/libsecret
-	fi
-
-	pushd contrib/subtree &>/dev/null || die
-	git_emake git-subtree
-	# git-subtree.1 requires the full USE=doc dependency stack
-	use doc && git_emake git-subtree.html git-subtree.1
-	popd &>/dev/null || die
-
-	git_emake -C contrib/diff-highlight
-
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git
-	fi
-}
-
-src_test() {
-	local disabled=(
-		# We make safe-directory optional
-		t0033-safe-directory.sh
-	)
-
-	local tests_cvs=(
-		t9200-git-cvsexportcommit.sh
-		t9400-git-cvsserver-server.sh
-		t9401-git-cvsserver-crlf.sh
-		t9402-git-cvsserver-refs.sh
-		t9600-cvsimport.sh
-		t9601-cvsimport-vendor-branch.sh
-		t9602-cvsimport-branches-tags.sh
-		t9603-cvsimport-patchsets.sh
-		t9604-cvsimport-timestamps.sh
-	)
-
-	local tests_perl=(
-		t3701-add-interactive.sh
-		t5502-quickfetch.sh
-		t5512-ls-remote.sh
-		t5520-pull.sh
-		t7106-reset-unborn-branch.sh
-		t7501-commit.sh
-	)
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot=(
-		t0001-init.sh
-		t0004-unwritable.sh
-		t0070-fundamental.sh
-		t1004-read-tree-m-u-wf.sh
-		t3700-add.sh
-		t7300-clean.sh
-	)
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn=( t9100-git-svn-basic.sh )
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled+=( t5000-tar-tree.sh )
-	fi
-
-	local cvs=0
-	use cvs && let cvs=${cvs}+1
-	if [[ ${EUID} -eq 0 ]] ; then
-		if [[ ${cvs} -eq 1 ]] ; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled+=( ${tests_nonroot[@]} )
-	else
-		if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -lt 3 ]] ; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled+=( ${tests_perl[@]} )
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled+=( ${test_svn[@]} )
-
-	# Reset all previously disabled tests
-	pushd t &>/dev/null || die
-	local i
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled[@]} ; do
-		if [[ -f "${i}" ]] ; then
-			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
-		fi
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
-
-	# Clean old results first, must always run
-	nonfatal git_emake clean
-	popd &>/dev/null || die
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	local rc
-	# t0610-reftable-basics.sh uses $A
-	local -x A=
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	pushd t &>/dev/null || die
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!"
-
-	popd &>/dev/null || die
-	if use perl ; then
-		emake -C contrib/credential/netrc testverbose
-	fi
-}
-
-src_install() {
-	git_emake DESTDIR="${D}" install
-
-	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	local d
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	pushd contrib/subtree &>/dev/null || die
-	git_emake DESTDIR="${D}" install
-	if use doc ; then
-		# Do not move git subtree install-man outside USE=doc!
-		git_emake DESTDIR="${D}" install-man install-html
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	popd &>/dev/null || die
-
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		dobin git-credential-libsecret
-		popd &>/dev/null || die
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - removed upstream
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	local i
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym ../gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
-			if [[ -d "${d}" ]] ; then
-				find "${d}" -name .packlist -delete || die
-			fi
-		done
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if use perl ; then
-		pushd contrib/credential/netrc &>/dev/null || die
-		dobin git-credential-netrc
-		popd &>/dev/null || die
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if ! use prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	plocale_for_each_disabled_locale rm_loc
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
-		elog "completion."
-		elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-		elog "Note that the prompt bash code is now in that separate script"
-	fi
-
-	optfeature_header "Some scripts require additional dependencies:"
-	optfeature git-quiltimport dev-util/quilt
-	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
-}
diff --git a/dev-vcs/git/git-2.47.1.ebuild b/dev-vcs/git/git-2.47.1.ebuild
deleted file mode 100644
index 9701a056aae7..000000000000
--- a/dev-vcs/git/git-2.47.1.ebuild
+++ /dev/null
@@ -1,670 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit flag-o-matic toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd
-
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
-
-	inherit git-r3
-	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-	# See https://git-scm.com/docs/gitworkflows#_graduation
-	# In order of stability:
-	# 9999-r0: maint
-	# 9999-r1: master
-	# 9999-r2: next
-	# 9999-r3: seen
-	case ${PVR} in
-		9999) EGIT_BRANCH=maint ;;
-		9999-r1) EGIT_BRANCH=master ;;
-		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=seen ;;
-	esac
-fi
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER="${MY_PV}"
-
-DESCRIPTION="Stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="https://www.git-scm.com/"
-
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
-
-	[[ ${PV/rc} != ${PV} ]] && SRC_URI_KORG+='/testing'
-
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
-	SRC_URI+=" ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}"
-	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"
-	fi
-fi
-
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
-
-# Common to both DEPEND and RDEPEND
-DEPEND="
-	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:= )
-"
-RDEPEND="
-	${DEPEND}
-	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_DEPS} )
-	selinux? ( sec-policy/selinux-git )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-BDEPEND="
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		app-text/xmlto
-		sys-apps/texinfo
-	)
-	keyring? ( virtual/pkgconfig )
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)
-"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	BDEPEND+=" app-text/asciidoc"
-fi
-
-SITEFILE="50${PN}-gentoo.el"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	perforce? ( ${PYTHON_REQUIRED_USE} )
-	subversion? ( perl )
-	webdav? ( curl )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# Avoid automagic CVS, bug #350330
-	"${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch
-
-	# Make submodule output quiet
-	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned!"
-	fi
-
-	if use perforce ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local extlibs myopts
-
-	myopts=(
-		ASCIIDOC_NO_ROFF=YesPlease
-
-		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-
-		$(usev elibc_musl NO_REGEX=NeedsStartEnd)
-		$(usev !cvs NO_CVS=YesPlease)
-		$(usev !iconv NO_ICONV=YesPlease)
-		$(usev !nls NO_GETTEXT=YesPlease)
-		$(usev !perforce NO_PYTHON=YesPlease)
-		$(usev !subversion NO_SVN_TESTS=YesPlease)
-		$(usev !tk NO_TCLTK=YesPlease)
-	)
-
-	if use blksha1 ; then
-		myopts+=( BLK_SHA1=YesPlease )
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=( NO_EXPAT=YesPlease )
-	else
-		myopts+=( NO_CURL=YesPlease )
-	fi
-
-	# Broken assumptions because of static build system
-	myopts+=(
-		NO_FINK=YesPlease
-		NO_DARWIN_PORTS=YesPlease
-		INSTALL=install
-		TAR=tar
-		SHELL_PATH="${EPREFIX}/bin/sh"
-		SANE_TOOL_PATH=
-		OLD_ICONV=
-		NO_EXTERNAL_GREP=
-	)
-
-	# Can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-	if use pcre; then
-		myopts+=( USE_LIBPCRE2=YesPlease )
-		extlibs+=( -lpcre2-8 )
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=(
-			NEEDS_LIBICONV=YesPlease
-			HAVE_CLOCK_MONOTONIC=1
-		)
-
-		if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then
-			myopts+=( HAVE_GETDELIM=1 )
-		fi
-	fi
-
-	myopts+=( ASCIIDOC8=YesPlease )
-
-	export MY_MAKEOPTS="${myopts[@]}"
-	export EXTLIBS="${extlibs[@]}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]] ; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-
-		cd "${S}" || die
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-
-		if use doc ; then
-			pushd "${S}"/Documentation &>/dev/null || die
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			popd &>/dev/null || die
-		fi
-	else
-		git-r3_src_unpack
-		#cp "${FILESDIR}"/GIT-VERSION-GEN . || die
-	fi
-
-}
-
-src_prepare() {
-	if ! use safe-directory ; then
-		# This patch neuters the "safe directory" detection.
-		# bugs #838271, #838223
-		PATCHES+=(
-			"${FILESDIR}"/git-2.46.2-unsafe-directory.patch
-		)
-	fi
-
-	default
-
-	if use prefix ; then
-		# bug #757309
-		sed -i \
-			-e 's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \
-			-e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \
-			config.mak.uname || die
-	fi
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile || die
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die
-}
-
-git_emake() {
-	# bug #320647: PYTHON_PATH
-	local PYTHON_PATH=""
-	use perforce && PYTHON_PATH="${PYTHON}"
-
-	local mymakeargs=(
-		${MY_MAKEOPTS}
-
-		prefix="${EPREFIX}"/usr
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		perllibdir="$(use perl && perl_get_raw_vendorlib)"
-		sysconfdir="${EPREFIX}"/etc
-
-		CC="$(tc-getCC)"
-		CFLAGS="${CFLAGS}"
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-
-		# TODO: --verbose?
-		GIT_TEST_OPTS="--no-color"
-
-		OPTAR="$(tc-getAR)"
-		OPTCC="$(tc-getCC)"
-		OPTCFLAGS="${CFLAGS}"
-		OPTLDFLAGS="${LDFLAGS}"
-
-		CURL_CONFIG="${ESYSROOT}/usr/bin/curl-config"
-		CURL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libcurl)"
-		CURL_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libcurl)"
-
-		PERL_PATH="${EPREFIX}/usr/bin/perl"
-		PERL_MM_OPT=""
-
-		PYTHON_PATH="${PYTHON_PATH}"
-
-		V=1
-		"$@"
-	)
-
-	emake "${mymakeargs[@]}"
-}
-
-src_configure() {
-	# https://lore.kernel.org/git/87ed3apy2u.fsf@gentoo.org/
-	append-cflags $(test-flags-CC -std=gnu17)
-
-	exportmakeopts
-}
-
-src_compile() {
-	git_emake
-
-	if use perl && use cgi ; then
-		git_emake gitweb
-	fi
-
-	if use perl ; then
-		git_emake -C contrib/credential/netrc
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
-		git_emake -C contrib/credential/osxkeychain
-	fi
-
-	pushd Documentation &>/dev/null || die
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man
-		if use doc ; then
-			git_emake info html
-		fi
-	else
-		if use doc ; then
-			git_emake info
-		fi
-	fi
-	popd &>/dev/null || die
-
-	if use keyring ; then
-		git_emake -C contrib/credential/libsecret
-	fi
-
-	pushd contrib/subtree &>/dev/null || die
-	git_emake git-subtree
-	# git-subtree.1 requires the full USE=doc dependency stack
-	use doc && git_emake git-subtree.html git-subtree.1
-	popd &>/dev/null || die
-
-	git_emake -C contrib/diff-highlight
-
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git
-	fi
-}
-
-src_test() {
-	local disabled=(
-		# We make safe-directory optional
-		t0033-safe-directory.sh
-	)
-
-	local tests_cvs=(
-		t9200-git-cvsexportcommit.sh
-		t9400-git-cvsserver-server.sh
-		t9401-git-cvsserver-crlf.sh
-		t9402-git-cvsserver-refs.sh
-		t9600-cvsimport.sh
-		t9601-cvsimport-vendor-branch.sh
-		t9602-cvsimport-branches-tags.sh
-		t9603-cvsimport-patchsets.sh
-		t9604-cvsimport-timestamps.sh
-	)
-
-	local tests_perl=(
-		t3701-add-interactive.sh
-		t5502-quickfetch.sh
-		t5512-ls-remote.sh
-		t5520-pull.sh
-		t7106-reset-unborn-branch.sh
-		t7501-commit.sh
-	)
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot=(
-		t0001-init.sh
-		t0004-unwritable.sh
-		t0070-fundamental.sh
-		t1004-read-tree-m-u-wf.sh
-		t3700-add.sh
-		t7300-clean.sh
-	)
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn=( t9100-git-svn-basic.sh )
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled+=( t5000-tar-tree.sh )
-	fi
-
-	local cvs=0
-	use cvs && let cvs=${cvs}+1
-	if [[ ${EUID} -eq 0 ]] ; then
-		if [[ ${cvs} -eq 1 ]] ; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled+=( ${tests_nonroot[@]} )
-	else
-		if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -lt 3 ]] ; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled+=( ${tests_perl[@]} )
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled+=( ${test_svn[@]} )
-
-	# Reset all previously disabled tests
-	pushd t &>/dev/null || die
-	local i
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled[@]} ; do
-		if [[ -f "${i}" ]] ; then
-			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
-		fi
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
-
-	# Clean old results first, must always run
-	nonfatal git_emake clean
-	popd &>/dev/null || die
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	local rc
-	# t0610-reftable-basics.sh uses $A
-	local -x A=
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	pushd t &>/dev/null || die
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!"
-
-	popd &>/dev/null || die
-	if use perl ; then
-		emake -C contrib/credential/netrc testverbose
-	fi
-}
-
-src_install() {
-	git_emake DESTDIR="${D}" install
-
-	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	local d
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	pushd contrib/subtree &>/dev/null || die
-	git_emake DESTDIR="${D}" install
-	if use doc ; then
-		# Do not move git subtree install-man outside USE=doc!
-		git_emake DESTDIR="${D}" install-man install-html
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	popd &>/dev/null || die
-
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		dobin git-credential-libsecret
-		popd &>/dev/null || die
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - removed upstream
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	local i
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym ../gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
-			if [[ -d "${d}" ]] ; then
-				find "${d}" -name .packlist -delete || die
-			fi
-		done
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if use perl ; then
-		pushd contrib/credential/netrc &>/dev/null || die
-		dobin git-credential-netrc
-		popd &>/dev/null || die
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if ! use prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	plocale_for_each_disabled_locale rm_loc
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
-		elog "completion."
-		elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-		elog "Note that the prompt bash code is now in that separate script"
-	fi
-
-	optfeature_header "Some scripts require additional dependencies:"
-	optfeature git-quiltimport dev-util/quilt
-	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
-}
diff --git a/dev-vcs/git/git-2.48.1.ebuild b/dev-vcs/git/git-2.48.1.ebuild
new file mode 100644
index 000000000000..f90f10f55f15
--- /dev/null
+++ b/dev-vcs/git/git-2.48.1.ebuild
@@ -0,0 +1,475 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd meson
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
+
+	inherit git-r3
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: seen
+	case ${PVR} in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=seen ;;
+	esac
+fi
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER="${MY_PV}"
+
+DESCRIPTION="Stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
+
+	[[ ${PV/rc} != ${PV} ]] && SRC_URI_KORG+='/testing'
+
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
+	SRC_URI+=" ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}"
+	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"
+	fi
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion test tk +webdav xinetd"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+	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:= )
+"
+RDEPEND="
+	${DEPEND}
+	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_DEPS} )
+	selinux? ( sec-policy/selinux-git )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		app-text/xmlto
+		sys-apps/texinfo
+	)
+	keyring? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	test? (
+		app-arch/unzip
+		app-crypt/gnupg
+		dev-lang/perl
+	)
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND+=" app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.48.0-doc-deps.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned!"
+	fi
+
+	if use perforce ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]] ; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+	fi
+
+}
+
+src_prepare() {
+	if ! use safe-directory ; then
+		# This patch neuters the "safe directory" detection.
+		# bugs #838271, #838223
+		PATCHES+=(
+			"${FILESDIR}"/git-2.46.2-unsafe-directory.patch
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature curl)
+		$(meson_feature cgi gitweb)
+		$(meson_feature webdav expat)
+		$(meson_feature iconv)
+		$(meson_feature nls gettext)
+		$(meson_feature pcre pcre2)
+		$(meson_feature perl)
+		$(meson_feature perforce python)
+		$(meson_use test tests)
+		-Dperl_cpan_fallback=false
+	)
+
+	# For non-live, we use a downloaded docs tarball instead.
+	if [[ ${PV} == *9999 ]] || use doc ; then
+		emesonargs+=(
+			-Ddocs="man$(usev doc ',html')"
+		)
+	fi
+
+	meson_src_configure
+}
+
+git_emake() {
+	local mymakeargs=(
+		prefix="${EPREFIX}"/usr
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		sysconfdir="${EPREFIX}"/etc
+		perllibdir="$(use perl && perl_get_raw_vendorlib)"
+
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		OPTAR="$(tc-getAR)"
+		OPTCC="$(tc-getCC)"
+		OPTCFLAGS="${CFLAGS}"
+		OPTLDFLAGS="${LDFLAGS}"
+
+		PERL_PATH="${EPREFIX}/usr/bin/perl"
+		PERL_MM_OPT=""
+
+		V=1
+
+		"$@"
+	)
+
+	emake "${mymakeargs[@]}"
+}
+
+src_compile() {
+	meson_src_compile
+
+	if use perl ; then
+		git_emake -C contrib/credential/netrc
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		git_emake -C contrib/credential/osxkeychain
+	fi
+
+	if use keyring ; then
+		git_emake -C contrib/credential/libsecret
+	fi
+
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git
+	fi
+
+	if use tk ; then
+		git_emake -C gitk-git
+		git_emake -C git-gui
+	fi
+
+	if use doc ; then
+		# Workaround fragments that still use the Makefile and can't
+		# find the bits from Meson's out-of-source build
+		ln -s "${BUILD_DIR}"/Documentation/asciidoc.conf "${S}"/Documentation/asciidoc.conf || die
+	fi
+
+	git_emake -C contrib/diff-highlight
+	git_emake -C contrib/subtree git-subtree
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1
+}
+
+src_test() {
+	# t0610-reftable-basics.sh uses $A
+	local -x A=
+
+	meson_src_test
+
+	# TODO: Needs help finding built git with meson
+	#if use perl ; then
+	#	git_emake -C contrib/credential/netrc testverbose
+	#fi
+}
+
+src_install() {
+	meson_src_install
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	if use doc ; then
+		cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die
+		rm -rf "${ED}"/usr/share/doc/git-doc/ || die
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+
+	use doc && dodir /usr/share/doc/${PF}/html
+	local d
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake DESTDIR="${D}" install
+	if use doc ; then
+		# Do not move git subtree install-man outside USE=doc!
+		git_emake DESTDIR="${D}" install-man install-html
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use keyring ; then
+		dobin contrib/credential/libsecret/git-credential-libsecret
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - removed upstream
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	local i
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}"
+	done
+
+	if use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym ../gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+			if [[ -d "${d}" ]] ; then
+				find "${d}" -name .packlist -delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if use perl ; then
+		dodir "$(perl_get_vendorlib)"
+		mv "${ED}"/usr/share/perl5/Git.pm "${ED}/$(perl_get_vendorlib)" || die
+		mv "${ED}"/usr/share/perl5/Git "${ED}/$(perl_get_vendorlib)" || die
+
+		dobin contrib/credential/netrc/git-credential-netrc
+	fi
+
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if ! use prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	if use tk ; then
+		git_emake -C gitk-git DESTDIR="${D}" install
+		git_emake -C git-gui DESTDIR="${D}" install
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	plocale_for_each_disabled_locale rm_loc
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+		elog "completion."
+		elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+		elog "Note that the prompt bash code is now in that separate script"
+	fi
+
+	optfeature_header "Some scripts require additional dependencies:"
+	optfeature git-quiltimport dev-util/quilt
+	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
+}
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 17a8afd1ac8b..f90f10f55f15 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.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,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd
+inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd meson
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 
@@ -58,7 +58,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
+IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion test tk +webdav xinetd"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -122,7 +122,11 @@ BDEPEND="
 	)
 	keyring? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)
+	test? (
+		app-arch/unzip
+		app-crypt/gnupg
+		dev-lang/perl
+	)
 "
 
 # Live ebuild builds man pages and HTML docs, additionally
@@ -144,11 +148,7 @@ REQUIRED_USE="
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	# Avoid automagic CVS, bug #350330
-	"${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch
-
-	# Make submodule output quiet
-	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+	"${FILESDIR}"/${PN}-2.48.0-doc-deps.patch
 )
 
 pkg_setup() {
@@ -163,72 +163,6 @@ pkg_setup() {
 	fi
 }
 
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local extlibs myopts
-
-	myopts=(
-		ASCIIDOC_NO_ROFF=YesPlease
-
-		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-
-		$(usev elibc_musl NO_REGEX=NeedsStartEnd)
-		$(usev !cvs NO_CVS=YesPlease)
-		$(usev !iconv NO_ICONV=YesPlease)
-		$(usev !nls NO_GETTEXT=YesPlease)
-		$(usev !perforce NO_PYTHON=YesPlease)
-		$(usev !subversion NO_SVN_TESTS=YesPlease)
-		$(usev !tk NO_TCLTK=YesPlease)
-	)
-
-	if use blksha1 ; then
-		myopts+=( BLK_SHA1=YesPlease )
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=( NO_EXPAT=YesPlease )
-	else
-		myopts+=( NO_CURL=YesPlease )
-	fi
-
-	# Broken assumptions because of static build system
-	myopts+=(
-		NO_FINK=YesPlease
-		NO_DARWIN_PORTS=YesPlease
-		INSTALL=install
-		TAR=tar
-		SHELL_PATH="${EPREFIX}/bin/sh"
-		SANE_TOOL_PATH=
-		OLD_ICONV=
-		NO_EXTERNAL_GREP=
-	)
-
-	# Can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-	if use pcre; then
-		myopts+=( USE_LIBPCRE2=YesPlease )
-		extlibs+=( -lpcre2-8 )
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=(
-			NEEDS_LIBICONV=YesPlease
-			HAVE_CLOCK_MONOTONIC=1
-		)
-
-		if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then
-			myopts+=( HAVE_GETDELIM=1 )
-		fi
-	fi
-
-	myopts+=( ASCIIDOC8=YesPlease )
-
-	export MY_MAKEOPTS="${myopts[@]}"
-	export EXTLIBS="${extlibs[@]}"
-}
-
 src_unpack() {
 	if [[ ${PV} != *9999 ]] ; then
 		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
@@ -243,7 +177,6 @@ src_unpack() {
 		fi
 	else
 		git-r3_src_unpack
-		#cp "${FILESDIR}"/GIT-VERSION-GEN . || die
 	fi
 
 }
@@ -258,80 +191,61 @@ src_prepare() {
 	fi
 
 	default
+}
 
-	if use prefix ; then
-		# bug #757309
-		sed -i \
-			-e 's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \
-			-e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \
-			config.mak.uname || die
+src_configure() {
+	local emesonargs=(
+		$(meson_feature curl)
+		$(meson_feature cgi gitweb)
+		$(meson_feature webdav expat)
+		$(meson_feature iconv)
+		$(meson_feature nls gettext)
+		$(meson_feature pcre pcre2)
+		$(meson_feature perl)
+		$(meson_feature perforce python)
+		$(meson_use test tests)
+		-Dperl_cpan_fallback=false
+	)
+
+	# For non-live, we use a downloaded docs tarball instead.
+	if [[ ${PV} == *9999 ]] || use doc ; then
+		emesonargs+=(
+			-Ddocs="man$(usev doc ',html')"
+		)
 	fi
 
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile || die
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die
+	meson_src_configure
 }
 
 git_emake() {
-	# bug #320647: PYTHON_PATH
-	local PYTHON_PATH=""
-	use perforce && PYTHON_PATH="${PYTHON}"
-
 	local mymakeargs=(
-		${MY_MAKEOPTS}
-
 		prefix="${EPREFIX}"/usr
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		perllibdir="$(use perl && perl_get_raw_vendorlib)"
 		sysconfdir="${EPREFIX}"/etc
+		perllibdir="$(use perl && perl_get_raw_vendorlib)"
 
 		CC="$(tc-getCC)"
 		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS}"
 		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-
-		# TODO: --verbose?
-		GIT_TEST_OPTS="--no-color"
-
 		OPTAR="$(tc-getAR)"
 		OPTCC="$(tc-getCC)"
 		OPTCFLAGS="${CFLAGS}"
 		OPTLDFLAGS="${LDFLAGS}"
 
-		CURL_CONFIG="${ESYSROOT}/usr/bin/curl-config"
-		CURL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libcurl)"
-		CURL_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libcurl)"
-
 		PERL_PATH="${EPREFIX}/usr/bin/perl"
 		PERL_MM_OPT=""
 
-		PYTHON_PATH="${PYTHON_PATH}"
-
 		V=1
+
 		"$@"
 	)
 
 	emake "${mymakeargs[@]}"
 }
 
-src_configure() {
-	exportmakeopts
-}
-
 src_compile() {
-	git_emake
-
-	if use perl && use cgi ; then
-		git_emake gitweb
-	fi
+	meson_src_compile
 
 	if use perl ; then
 		git_emake -C contrib/credential/netrc
@@ -341,170 +255,61 @@ src_compile() {
 		git_emake -C contrib/credential/osxkeychain
 	fi
 
-	pushd Documentation &>/dev/null || die
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man
-		if use doc ; then
-			git_emake info html
-		fi
-	else
-		if use doc ; then
-			git_emake info
-		fi
-	fi
-	popd &>/dev/null || die
-
 	if use keyring ; then
 		git_emake -C contrib/credential/libsecret
 	fi
 
-	pushd contrib/subtree &>/dev/null || die
-	git_emake git-subtree
-	# git-subtree.1 requires the full USE=doc dependency stack
-	use doc && git_emake git-subtree.html git-subtree.1
-	popd &>/dev/null || die
-
-	git_emake -C contrib/diff-highlight
-
 	if use mediawiki ; then
 		git_emake -C contrib/mw-to-git
 	fi
-}
-
-src_test() {
-	local disabled=(
-		# We make safe-directory optional
-		t0033-safe-directory.sh
-	)
 
-	local tests_cvs=(
-		t9200-git-cvsexportcommit.sh
-		t9400-git-cvsserver-server.sh
-		t9401-git-cvsserver-crlf.sh
-		t9402-git-cvsserver-refs.sh
-		t9600-cvsimport.sh
-		t9601-cvsimport-vendor-branch.sh
-		t9602-cvsimport-branches-tags.sh
-		t9603-cvsimport-patchsets.sh
-		t9604-cvsimport-timestamps.sh
-	)
-
-	local tests_perl=(
-		t3701-add-interactive.sh
-		t5502-quickfetch.sh
-		t5512-ls-remote.sh
-		t5520-pull.sh
-		t7106-reset-unborn-branch.sh
-		t7501-commit.sh
-	)
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot=(
-		t0001-init.sh
-		t0004-unwritable.sh
-		t0070-fundamental.sh
-		t1004-read-tree-m-u-wf.sh
-		t3700-add.sh
-		t7300-clean.sh
-	)
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn=( t9100-git-svn-basic.sh )
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled+=( t5000-tar-tree.sh )
+	if use tk ; then
+		git_emake -C gitk-git
+		git_emake -C git-gui
 	fi
 
-	local cvs=0
-	use cvs && let cvs=${cvs}+1
-	if [[ ${EUID} -eq 0 ]] ; then
-		if [[ ${cvs} -eq 1 ]] ; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled+=( ${tests_nonroot[@]} )
-	else
-		if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -lt 3 ]] ; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled+=( ${tests_perl[@]} )
+	if use doc ; then
+		# Workaround fragments that still use the Makefile and can't
+		# find the bits from Meson's out-of-source build
+		ln -s "${BUILD_DIR}"/Documentation/asciidoc.conf "${S}"/Documentation/asciidoc.conf || die
 	fi
 
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled+=( ${test_svn[@]} )
-
-	# Reset all previously disabled tests
-	pushd t &>/dev/null || die
-	local i
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled[@]} ; do
-		if [[ -f "${i}" ]] ; then
-			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
-		fi
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
-
-	# Clean old results first, must always run
-	nonfatal git_emake clean
-	popd &>/dev/null || die
+	git_emake -C contrib/diff-highlight
+	git_emake -C contrib/subtree git-subtree
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1
+}
 
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	local rc
+src_test() {
 	# t0610-reftable-basics.sh uses $A
 	local -x A=
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
 
-	# Display nice results, now print the results
-	pushd t &>/dev/null || die
-	nonfatal git_emake aggregate-results
+	meson_src_test
 
-	# And bail if there was a problem
-	[[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!"
-
-	popd &>/dev/null || die
-	if use perl ; then
-		emake -C contrib/credential/netrc testverbose
-	fi
+	# TODO: Needs help finding built git with meson
+	#if use perl ; then
+	#	git_emake -C contrib/credential/netrc testverbose
+	#fi
 }
 
 src_install() {
-	git_emake DESTDIR="${D}" install
+	meson_src_install
 
 	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 
+	if use doc ; then
+		cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die
+		rm -rf "${ED}"/usr/share/doc/git-doc/ || die
+	fi
+
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
 	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+
 	use doc && dodir /usr/share/doc/${PF}/html
 	local d
 	for d in / /howto/ /technical/ ; do
@@ -516,8 +321,6 @@ src_install() {
 		fi
 	done
 	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
 
 	newbashcomp contrib/completion/git-completion.bash ${PN}
 	bashcomp_alias git gitk
@@ -543,10 +346,6 @@ src_install() {
 	dodoc git-subtree.txt
 	popd &>/dev/null || die
 
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
-	fi
-
 	# diff-highlight
 	dobin contrib/diff-highlight/diff-highlight
 	newdoc contrib/diff-highlight/README README.diff-highlight
@@ -562,9 +361,7 @@ src_install() {
 	dodoc contrib/contacts/git-contacts.txt
 
 	if use keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		dobin git-credential-libsecret
-		popd &>/dev/null || die
+		dobin contrib/credential/libsecret/git-credential-libsecret
 	fi
 
 	dodir /usr/share/${PN}/contrib
@@ -596,7 +393,7 @@ src_install() {
 		cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}"
 	done
 
-	if use perl && use cgi ; then
+	if use cgi ; then
 		# We used to install in /usr/share/${PN}/gitweb
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
@@ -618,9 +415,15 @@ src_install() {
 	fi
 
 	if use perl ; then
-		pushd contrib/credential/netrc &>/dev/null || die
-		dobin git-credential-netrc
-		popd &>/dev/null || die
+		dodir "$(perl_get_vendorlib)"
+		mv "${ED}"/usr/share/perl5/Git.pm "${ED}/$(perl_get_vendorlib)" || die
+		mv "${ED}"/usr/share/perl5/Git "${ED}/$(perl_get_vendorlib)" || die
+
+		dobin contrib/credential/netrc/git-credential-netrc
+	fi
+
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
 	fi
 
 	if ! use subversion ; then
@@ -640,6 +443,11 @@ src_install() {
 		systemd_dounit "${FILESDIR}/git-daemon.socket"
 	fi
 
+	if use tk ; then
+		git_emake -C gitk-git DESTDIR="${D}" install
+		git_emake -C git-gui DESTDIR="${D}" install
+	fi
+
 	perl_delete_localpod
 
 	# Remove disabled linguas
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 17a8afd1ac8b..f90f10f55f15 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.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,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd
+inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd meson
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 
@@ -58,7 +58,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
+IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion test tk +webdav xinetd"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -122,7 +122,11 @@ BDEPEND="
 	)
 	keyring? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)
+	test? (
+		app-arch/unzip
+		app-crypt/gnupg
+		dev-lang/perl
+	)
 "
 
 # Live ebuild builds man pages and HTML docs, additionally
@@ -144,11 +148,7 @@ REQUIRED_USE="
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	# Avoid automagic CVS, bug #350330
-	"${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch
-
-	# Make submodule output quiet
-	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+	"${FILESDIR}"/${PN}-2.48.0-doc-deps.patch
 )
 
 pkg_setup() {
@@ -163,72 +163,6 @@ pkg_setup() {
 	fi
 }
 
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local extlibs myopts
-
-	myopts=(
-		ASCIIDOC_NO_ROFF=YesPlease
-
-		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-
-		$(usev elibc_musl NO_REGEX=NeedsStartEnd)
-		$(usev !cvs NO_CVS=YesPlease)
-		$(usev !iconv NO_ICONV=YesPlease)
-		$(usev !nls NO_GETTEXT=YesPlease)
-		$(usev !perforce NO_PYTHON=YesPlease)
-		$(usev !subversion NO_SVN_TESTS=YesPlease)
-		$(usev !tk NO_TCLTK=YesPlease)
-	)
-
-	if use blksha1 ; then
-		myopts+=( BLK_SHA1=YesPlease )
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=( NO_EXPAT=YesPlease )
-	else
-		myopts+=( NO_CURL=YesPlease )
-	fi
-
-	# Broken assumptions because of static build system
-	myopts+=(
-		NO_FINK=YesPlease
-		NO_DARWIN_PORTS=YesPlease
-		INSTALL=install
-		TAR=tar
-		SHELL_PATH="${EPREFIX}/bin/sh"
-		SANE_TOOL_PATH=
-		OLD_ICONV=
-		NO_EXTERNAL_GREP=
-	)
-
-	# Can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-	if use pcre; then
-		myopts+=( USE_LIBPCRE2=YesPlease )
-		extlibs+=( -lpcre2-8 )
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=(
-			NEEDS_LIBICONV=YesPlease
-			HAVE_CLOCK_MONOTONIC=1
-		)
-
-		if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then
-			myopts+=( HAVE_GETDELIM=1 )
-		fi
-	fi
-
-	myopts+=( ASCIIDOC8=YesPlease )
-
-	export MY_MAKEOPTS="${myopts[@]}"
-	export EXTLIBS="${extlibs[@]}"
-}
-
 src_unpack() {
 	if [[ ${PV} != *9999 ]] ; then
 		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
@@ -243,7 +177,6 @@ src_unpack() {
 		fi
 	else
 		git-r3_src_unpack
-		#cp "${FILESDIR}"/GIT-VERSION-GEN . || die
 	fi
 
 }
@@ -258,80 +191,61 @@ src_prepare() {
 	fi
 
 	default
+}
 
-	if use prefix ; then
-		# bug #757309
-		sed -i \
-			-e 's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \
-			-e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \
-			config.mak.uname || die
+src_configure() {
+	local emesonargs=(
+		$(meson_feature curl)
+		$(meson_feature cgi gitweb)
+		$(meson_feature webdav expat)
+		$(meson_feature iconv)
+		$(meson_feature nls gettext)
+		$(meson_feature pcre pcre2)
+		$(meson_feature perl)
+		$(meson_feature perforce python)
+		$(meson_use test tests)
+		-Dperl_cpan_fallback=false
+	)
+
+	# For non-live, we use a downloaded docs tarball instead.
+	if [[ ${PV} == *9999 ]] || use doc ; then
+		emesonargs+=(
+			-Ddocs="man$(usev doc ',html')"
+		)
 	fi
 
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile || die
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die
+	meson_src_configure
 }
 
 git_emake() {
-	# bug #320647: PYTHON_PATH
-	local PYTHON_PATH=""
-	use perforce && PYTHON_PATH="${PYTHON}"
-
 	local mymakeargs=(
-		${MY_MAKEOPTS}
-
 		prefix="${EPREFIX}"/usr
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		perllibdir="$(use perl && perl_get_raw_vendorlib)"
 		sysconfdir="${EPREFIX}"/etc
+		perllibdir="$(use perl && perl_get_raw_vendorlib)"
 
 		CC="$(tc-getCC)"
 		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS}"
 		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-
-		# TODO: --verbose?
-		GIT_TEST_OPTS="--no-color"
-
 		OPTAR="$(tc-getAR)"
 		OPTCC="$(tc-getCC)"
 		OPTCFLAGS="${CFLAGS}"
 		OPTLDFLAGS="${LDFLAGS}"
 
-		CURL_CONFIG="${ESYSROOT}/usr/bin/curl-config"
-		CURL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libcurl)"
-		CURL_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libcurl)"
-
 		PERL_PATH="${EPREFIX}/usr/bin/perl"
 		PERL_MM_OPT=""
 
-		PYTHON_PATH="${PYTHON_PATH}"
-
 		V=1
+
 		"$@"
 	)
 
 	emake "${mymakeargs[@]}"
 }
 
-src_configure() {
-	exportmakeopts
-}
-
 src_compile() {
-	git_emake
-
-	if use perl && use cgi ; then
-		git_emake gitweb
-	fi
+	meson_src_compile
 
 	if use perl ; then
 		git_emake -C contrib/credential/netrc
@@ -341,170 +255,61 @@ src_compile() {
 		git_emake -C contrib/credential/osxkeychain
 	fi
 
-	pushd Documentation &>/dev/null || die
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man
-		if use doc ; then
-			git_emake info html
-		fi
-	else
-		if use doc ; then
-			git_emake info
-		fi
-	fi
-	popd &>/dev/null || die
-
 	if use keyring ; then
 		git_emake -C contrib/credential/libsecret
 	fi
 
-	pushd contrib/subtree &>/dev/null || die
-	git_emake git-subtree
-	# git-subtree.1 requires the full USE=doc dependency stack
-	use doc && git_emake git-subtree.html git-subtree.1
-	popd &>/dev/null || die
-
-	git_emake -C contrib/diff-highlight
-
 	if use mediawiki ; then
 		git_emake -C contrib/mw-to-git
 	fi
-}
-
-src_test() {
-	local disabled=(
-		# We make safe-directory optional
-		t0033-safe-directory.sh
-	)
 
-	local tests_cvs=(
-		t9200-git-cvsexportcommit.sh
-		t9400-git-cvsserver-server.sh
-		t9401-git-cvsserver-crlf.sh
-		t9402-git-cvsserver-refs.sh
-		t9600-cvsimport.sh
-		t9601-cvsimport-vendor-branch.sh
-		t9602-cvsimport-branches-tags.sh
-		t9603-cvsimport-patchsets.sh
-		t9604-cvsimport-timestamps.sh
-	)
-
-	local tests_perl=(
-		t3701-add-interactive.sh
-		t5502-quickfetch.sh
-		t5512-ls-remote.sh
-		t5520-pull.sh
-		t7106-reset-unborn-branch.sh
-		t7501-commit.sh
-	)
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot=(
-		t0001-init.sh
-		t0004-unwritable.sh
-		t0070-fundamental.sh
-		t1004-read-tree-m-u-wf.sh
-		t3700-add.sh
-		t7300-clean.sh
-	)
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn=( t9100-git-svn-basic.sh )
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled+=( t5000-tar-tree.sh )
+	if use tk ; then
+		git_emake -C gitk-git
+		git_emake -C git-gui
 	fi
 
-	local cvs=0
-	use cvs && let cvs=${cvs}+1
-	if [[ ${EUID} -eq 0 ]] ; then
-		if [[ ${cvs} -eq 1 ]] ; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled+=( ${tests_nonroot[@]} )
-	else
-		if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -lt 3 ]] ; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled+=( ${tests_perl[@]} )
+	if use doc ; then
+		# Workaround fragments that still use the Makefile and can't
+		# find the bits from Meson's out-of-source build
+		ln -s "${BUILD_DIR}"/Documentation/asciidoc.conf "${S}"/Documentation/asciidoc.conf || die
 	fi
 
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled+=( ${test_svn[@]} )
-
-	# Reset all previously disabled tests
-	pushd t &>/dev/null || die
-	local i
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled[@]} ; do
-		if [[ -f "${i}" ]] ; then
-			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
-		fi
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
-
-	# Clean old results first, must always run
-	nonfatal git_emake clean
-	popd &>/dev/null || die
+	git_emake -C contrib/diff-highlight
+	git_emake -C contrib/subtree git-subtree
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1
+}
 
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	local rc
+src_test() {
 	# t0610-reftable-basics.sh uses $A
 	local -x A=
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
 
-	# Display nice results, now print the results
-	pushd t &>/dev/null || die
-	nonfatal git_emake aggregate-results
+	meson_src_test
 
-	# And bail if there was a problem
-	[[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!"
-
-	popd &>/dev/null || die
-	if use perl ; then
-		emake -C contrib/credential/netrc testverbose
-	fi
+	# TODO: Needs help finding built git with meson
+	#if use perl ; then
+	#	git_emake -C contrib/credential/netrc testverbose
+	#fi
 }
 
 src_install() {
-	git_emake DESTDIR="${D}" install
+	meson_src_install
 
 	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 
+	if use doc ; then
+		cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die
+		rm -rf "${ED}"/usr/share/doc/git-doc/ || die
+	fi
+
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
 	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+
 	use doc && dodir /usr/share/doc/${PF}/html
 	local d
 	for d in / /howto/ /technical/ ; do
@@ -516,8 +321,6 @@ src_install() {
 		fi
 	done
 	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
 
 	newbashcomp contrib/completion/git-completion.bash ${PN}
 	bashcomp_alias git gitk
@@ -543,10 +346,6 @@ src_install() {
 	dodoc git-subtree.txt
 	popd &>/dev/null || die
 
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
-	fi
-
 	# diff-highlight
 	dobin contrib/diff-highlight/diff-highlight
 	newdoc contrib/diff-highlight/README README.diff-highlight
@@ -562,9 +361,7 @@ src_install() {
 	dodoc contrib/contacts/git-contacts.txt
 
 	if use keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		dobin git-credential-libsecret
-		popd &>/dev/null || die
+		dobin contrib/credential/libsecret/git-credential-libsecret
 	fi
 
 	dodir /usr/share/${PN}/contrib
@@ -596,7 +393,7 @@ src_install() {
 		cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}"
 	done
 
-	if use perl && use cgi ; then
+	if use cgi ; then
 		# We used to install in /usr/share/${PN}/gitweb
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
@@ -618,9 +415,15 @@ src_install() {
 	fi
 
 	if use perl ; then
-		pushd contrib/credential/netrc &>/dev/null || die
-		dobin git-credential-netrc
-		popd &>/dev/null || die
+		dodir "$(perl_get_vendorlib)"
+		mv "${ED}"/usr/share/perl5/Git.pm "${ED}/$(perl_get_vendorlib)" || die
+		mv "${ED}"/usr/share/perl5/Git "${ED}/$(perl_get_vendorlib)" || die
+
+		dobin contrib/credential/netrc/git-credential-netrc
+	fi
+
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
 	fi
 
 	if ! use subversion ; then
@@ -640,6 +443,11 @@ src_install() {
 		systemd_dounit "${FILESDIR}/git-daemon.socket"
 	fi
 
+	if use tk ; then
+		git_emake -C gitk-git DESTDIR="${D}" install
+		git_emake -C git-gui DESTDIR="${D}" install
+	fi
+
 	perl_delete_localpod
 
 	# Remove disabled linguas
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 17a8afd1ac8b..f90f10f55f15 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.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,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd
+inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd meson
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 
@@ -58,7 +58,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
+IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion test tk +webdav xinetd"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -122,7 +122,11 @@ BDEPEND="
 	)
 	keyring? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)
+	test? (
+		app-arch/unzip
+		app-crypt/gnupg
+		dev-lang/perl
+	)
 "
 
 # Live ebuild builds man pages and HTML docs, additionally
@@ -144,11 +148,7 @@ REQUIRED_USE="
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	# Avoid automagic CVS, bug #350330
-	"${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch
-
-	# Make submodule output quiet
-	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+	"${FILESDIR}"/${PN}-2.48.0-doc-deps.patch
 )
 
 pkg_setup() {
@@ -163,72 +163,6 @@ pkg_setup() {
 	fi
 }
 
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local extlibs myopts
-
-	myopts=(
-		ASCIIDOC_NO_ROFF=YesPlease
-
-		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-
-		$(usev elibc_musl NO_REGEX=NeedsStartEnd)
-		$(usev !cvs NO_CVS=YesPlease)
-		$(usev !iconv NO_ICONV=YesPlease)
-		$(usev !nls NO_GETTEXT=YesPlease)
-		$(usev !perforce NO_PYTHON=YesPlease)
-		$(usev !subversion NO_SVN_TESTS=YesPlease)
-		$(usev !tk NO_TCLTK=YesPlease)
-	)
-
-	if use blksha1 ; then
-		myopts+=( BLK_SHA1=YesPlease )
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=( NO_EXPAT=YesPlease )
-	else
-		myopts+=( NO_CURL=YesPlease )
-	fi
-
-	# Broken assumptions because of static build system
-	myopts+=(
-		NO_FINK=YesPlease
-		NO_DARWIN_PORTS=YesPlease
-		INSTALL=install
-		TAR=tar
-		SHELL_PATH="${EPREFIX}/bin/sh"
-		SANE_TOOL_PATH=
-		OLD_ICONV=
-		NO_EXTERNAL_GREP=
-	)
-
-	# Can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-	if use pcre; then
-		myopts+=( USE_LIBPCRE2=YesPlease )
-		extlibs+=( -lpcre2-8 )
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=(
-			NEEDS_LIBICONV=YesPlease
-			HAVE_CLOCK_MONOTONIC=1
-		)
-
-		if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then
-			myopts+=( HAVE_GETDELIM=1 )
-		fi
-	fi
-
-	myopts+=( ASCIIDOC8=YesPlease )
-
-	export MY_MAKEOPTS="${myopts[@]}"
-	export EXTLIBS="${extlibs[@]}"
-}
-
 src_unpack() {
 	if [[ ${PV} != *9999 ]] ; then
 		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
@@ -243,7 +177,6 @@ src_unpack() {
 		fi
 	else
 		git-r3_src_unpack
-		#cp "${FILESDIR}"/GIT-VERSION-GEN . || die
 	fi
 
 }
@@ -258,80 +191,61 @@ src_prepare() {
 	fi
 
 	default
+}
 
-	if use prefix ; then
-		# bug #757309
-		sed -i \
-			-e 's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \
-			-e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \
-			config.mak.uname || die
+src_configure() {
+	local emesonargs=(
+		$(meson_feature curl)
+		$(meson_feature cgi gitweb)
+		$(meson_feature webdav expat)
+		$(meson_feature iconv)
+		$(meson_feature nls gettext)
+		$(meson_feature pcre pcre2)
+		$(meson_feature perl)
+		$(meson_feature perforce python)
+		$(meson_use test tests)
+		-Dperl_cpan_fallback=false
+	)
+
+	# For non-live, we use a downloaded docs tarball instead.
+	if [[ ${PV} == *9999 ]] || use doc ; then
+		emesonargs+=(
+			-Ddocs="man$(usev doc ',html')"
+		)
 	fi
 
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile || die
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die
+	meson_src_configure
 }
 
 git_emake() {
-	# bug #320647: PYTHON_PATH
-	local PYTHON_PATH=""
-	use perforce && PYTHON_PATH="${PYTHON}"
-
 	local mymakeargs=(
-		${MY_MAKEOPTS}
-
 		prefix="${EPREFIX}"/usr
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		perllibdir="$(use perl && perl_get_raw_vendorlib)"
 		sysconfdir="${EPREFIX}"/etc
+		perllibdir="$(use perl && perl_get_raw_vendorlib)"
 
 		CC="$(tc-getCC)"
 		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS}"
 		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-
-		# TODO: --verbose?
-		GIT_TEST_OPTS="--no-color"
-
 		OPTAR="$(tc-getAR)"
 		OPTCC="$(tc-getCC)"
 		OPTCFLAGS="${CFLAGS}"
 		OPTLDFLAGS="${LDFLAGS}"
 
-		CURL_CONFIG="${ESYSROOT}/usr/bin/curl-config"
-		CURL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libcurl)"
-		CURL_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libcurl)"
-
 		PERL_PATH="${EPREFIX}/usr/bin/perl"
 		PERL_MM_OPT=""
 
-		PYTHON_PATH="${PYTHON_PATH}"
-
 		V=1
+
 		"$@"
 	)
 
 	emake "${mymakeargs[@]}"
 }
 
-src_configure() {
-	exportmakeopts
-}
-
 src_compile() {
-	git_emake
-
-	if use perl && use cgi ; then
-		git_emake gitweb
-	fi
+	meson_src_compile
 
 	if use perl ; then
 		git_emake -C contrib/credential/netrc
@@ -341,170 +255,61 @@ src_compile() {
 		git_emake -C contrib/credential/osxkeychain
 	fi
 
-	pushd Documentation &>/dev/null || die
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man
-		if use doc ; then
-			git_emake info html
-		fi
-	else
-		if use doc ; then
-			git_emake info
-		fi
-	fi
-	popd &>/dev/null || die
-
 	if use keyring ; then
 		git_emake -C contrib/credential/libsecret
 	fi
 
-	pushd contrib/subtree &>/dev/null || die
-	git_emake git-subtree
-	# git-subtree.1 requires the full USE=doc dependency stack
-	use doc && git_emake git-subtree.html git-subtree.1
-	popd &>/dev/null || die
-
-	git_emake -C contrib/diff-highlight
-
 	if use mediawiki ; then
 		git_emake -C contrib/mw-to-git
 	fi
-}
-
-src_test() {
-	local disabled=(
-		# We make safe-directory optional
-		t0033-safe-directory.sh
-	)
 
-	local tests_cvs=(
-		t9200-git-cvsexportcommit.sh
-		t9400-git-cvsserver-server.sh
-		t9401-git-cvsserver-crlf.sh
-		t9402-git-cvsserver-refs.sh
-		t9600-cvsimport.sh
-		t9601-cvsimport-vendor-branch.sh
-		t9602-cvsimport-branches-tags.sh
-		t9603-cvsimport-patchsets.sh
-		t9604-cvsimport-timestamps.sh
-	)
-
-	local tests_perl=(
-		t3701-add-interactive.sh
-		t5502-quickfetch.sh
-		t5512-ls-remote.sh
-		t5520-pull.sh
-		t7106-reset-unborn-branch.sh
-		t7501-commit.sh
-	)
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot=(
-		t0001-init.sh
-		t0004-unwritable.sh
-		t0070-fundamental.sh
-		t1004-read-tree-m-u-wf.sh
-		t3700-add.sh
-		t7300-clean.sh
-	)
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn=( t9100-git-svn-basic.sh )
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled+=( t5000-tar-tree.sh )
+	if use tk ; then
+		git_emake -C gitk-git
+		git_emake -C git-gui
 	fi
 
-	local cvs=0
-	use cvs && let cvs=${cvs}+1
-	if [[ ${EUID} -eq 0 ]] ; then
-		if [[ ${cvs} -eq 1 ]] ; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled+=( ${tests_nonroot[@]} )
-	else
-		if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -lt 3 ]] ; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled+=( ${tests_perl[@]} )
+	if use doc ; then
+		# Workaround fragments that still use the Makefile and can't
+		# find the bits from Meson's out-of-source build
+		ln -s "${BUILD_DIR}"/Documentation/asciidoc.conf "${S}"/Documentation/asciidoc.conf || die
 	fi
 
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled+=( ${test_svn[@]} )
-
-	# Reset all previously disabled tests
-	pushd t &>/dev/null || die
-	local i
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled[@]} ; do
-		if [[ -f "${i}" ]] ; then
-			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
-		fi
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
-
-	# Clean old results first, must always run
-	nonfatal git_emake clean
-	popd &>/dev/null || die
+	git_emake -C contrib/diff-highlight
+	git_emake -C contrib/subtree git-subtree
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1
+}
 
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	local rc
+src_test() {
 	# t0610-reftable-basics.sh uses $A
 	local -x A=
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
 
-	# Display nice results, now print the results
-	pushd t &>/dev/null || die
-	nonfatal git_emake aggregate-results
+	meson_src_test
 
-	# And bail if there was a problem
-	[[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!"
-
-	popd &>/dev/null || die
-	if use perl ; then
-		emake -C contrib/credential/netrc testverbose
-	fi
+	# TODO: Needs help finding built git with meson
+	#if use perl ; then
+	#	git_emake -C contrib/credential/netrc testverbose
+	#fi
 }
 
 src_install() {
-	git_emake DESTDIR="${D}" install
+	meson_src_install
 
 	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 
+	if use doc ; then
+		cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die
+		rm -rf "${ED}"/usr/share/doc/git-doc/ || die
+	fi
+
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
 	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+
 	use doc && dodir /usr/share/doc/${PF}/html
 	local d
 	for d in / /howto/ /technical/ ; do
@@ -516,8 +321,6 @@ src_install() {
 		fi
 	done
 	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
 
 	newbashcomp contrib/completion/git-completion.bash ${PN}
 	bashcomp_alias git gitk
@@ -543,10 +346,6 @@ src_install() {
 	dodoc git-subtree.txt
 	popd &>/dev/null || die
 
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
-	fi
-
 	# diff-highlight
 	dobin contrib/diff-highlight/diff-highlight
 	newdoc contrib/diff-highlight/README README.diff-highlight
@@ -562,9 +361,7 @@ src_install() {
 	dodoc contrib/contacts/git-contacts.txt
 
 	if use keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		dobin git-credential-libsecret
-		popd &>/dev/null || die
+		dobin contrib/credential/libsecret/git-credential-libsecret
 	fi
 
 	dodir /usr/share/${PN}/contrib
@@ -596,7 +393,7 @@ src_install() {
 		cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}"
 	done
 
-	if use perl && use cgi ; then
+	if use cgi ; then
 		# We used to install in /usr/share/${PN}/gitweb
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
@@ -618,9 +415,15 @@ src_install() {
 	fi
 
 	if use perl ; then
-		pushd contrib/credential/netrc &>/dev/null || die
-		dobin git-credential-netrc
-		popd &>/dev/null || die
+		dodir "$(perl_get_vendorlib)"
+		mv "${ED}"/usr/share/perl5/Git.pm "${ED}/$(perl_get_vendorlib)" || die
+		mv "${ED}"/usr/share/perl5/Git "${ED}/$(perl_get_vendorlib)" || die
+
+		dobin contrib/credential/netrc/git-credential-netrc
+	fi
+
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
 	fi
 
 	if ! use subversion ; then
@@ -640,6 +443,11 @@ src_install() {
 		systemd_dounit "${FILESDIR}/git-daemon.socket"
 	fi
 
+	if use tk ; then
+		git_emake -C gitk-git DESTDIR="${D}" install
+		git_emake -C git-gui DESTDIR="${D}" install
+	fi
+
 	perl_delete_localpod
 
 	# Remove disabled linguas
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 17a8afd1ac8b..f90f10f55f15 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-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
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd
+inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd meson
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 
@@ -58,7 +58,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
+IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion test tk +webdav xinetd"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -122,7 +122,11 @@ BDEPEND="
 	)
 	keyring? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)
+	test? (
+		app-arch/unzip
+		app-crypt/gnupg
+		dev-lang/perl
+	)
 "
 
 # Live ebuild builds man pages and HTML docs, additionally
@@ -144,11 +148,7 @@ REQUIRED_USE="
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	# Avoid automagic CVS, bug #350330
-	"${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch
-
-	# Make submodule output quiet
-	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+	"${FILESDIR}"/${PN}-2.48.0-doc-deps.patch
 )
 
 pkg_setup() {
@@ -163,72 +163,6 @@ pkg_setup() {
 	fi
 }
 
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local extlibs myopts
-
-	myopts=(
-		ASCIIDOC_NO_ROFF=YesPlease
-
-		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-
-		$(usev elibc_musl NO_REGEX=NeedsStartEnd)
-		$(usev !cvs NO_CVS=YesPlease)
-		$(usev !iconv NO_ICONV=YesPlease)
-		$(usev !nls NO_GETTEXT=YesPlease)
-		$(usev !perforce NO_PYTHON=YesPlease)
-		$(usev !subversion NO_SVN_TESTS=YesPlease)
-		$(usev !tk NO_TCLTK=YesPlease)
-	)
-
-	if use blksha1 ; then
-		myopts+=( BLK_SHA1=YesPlease )
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=( NO_EXPAT=YesPlease )
-	else
-		myopts+=( NO_CURL=YesPlease )
-	fi
-
-	# Broken assumptions because of static build system
-	myopts+=(
-		NO_FINK=YesPlease
-		NO_DARWIN_PORTS=YesPlease
-		INSTALL=install
-		TAR=tar
-		SHELL_PATH="${EPREFIX}/bin/sh"
-		SANE_TOOL_PATH=
-		OLD_ICONV=
-		NO_EXTERNAL_GREP=
-	)
-
-	# Can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-	if use pcre; then
-		myopts+=( USE_LIBPCRE2=YesPlease )
-		extlibs+=( -lpcre2-8 )
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=(
-			NEEDS_LIBICONV=YesPlease
-			HAVE_CLOCK_MONOTONIC=1
-		)
-
-		if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then
-			myopts+=( HAVE_GETDELIM=1 )
-		fi
-	fi
-
-	myopts+=( ASCIIDOC8=YesPlease )
-
-	export MY_MAKEOPTS="${myopts[@]}"
-	export EXTLIBS="${extlibs[@]}"
-}
-
 src_unpack() {
 	if [[ ${PV} != *9999 ]] ; then
 		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
@@ -243,7 +177,6 @@ src_unpack() {
 		fi
 	else
 		git-r3_src_unpack
-		#cp "${FILESDIR}"/GIT-VERSION-GEN . || die
 	fi
 
 }
@@ -258,80 +191,61 @@ src_prepare() {
 	fi
 
 	default
+}
 
-	if use prefix ; then
-		# bug #757309
-		sed -i \
-			-e 's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \
-			-e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \
-			config.mak.uname || die
+src_configure() {
+	local emesonargs=(
+		$(meson_feature curl)
+		$(meson_feature cgi gitweb)
+		$(meson_feature webdav expat)
+		$(meson_feature iconv)
+		$(meson_feature nls gettext)
+		$(meson_feature pcre pcre2)
+		$(meson_feature perl)
+		$(meson_feature perforce python)
+		$(meson_use test tests)
+		-Dperl_cpan_fallback=false
+	)
+
+	# For non-live, we use a downloaded docs tarball instead.
+	if [[ ${PV} == *9999 ]] || use doc ; then
+		emesonargs+=(
+			-Ddocs="man$(usev doc ',html')"
+		)
 	fi
 
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile || die
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die
+	meson_src_configure
 }
 
 git_emake() {
-	# bug #320647: PYTHON_PATH
-	local PYTHON_PATH=""
-	use perforce && PYTHON_PATH="${PYTHON}"
-
 	local mymakeargs=(
-		${MY_MAKEOPTS}
-
 		prefix="${EPREFIX}"/usr
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		perllibdir="$(use perl && perl_get_raw_vendorlib)"
 		sysconfdir="${EPREFIX}"/etc
+		perllibdir="$(use perl && perl_get_raw_vendorlib)"
 
 		CC="$(tc-getCC)"
 		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS}"
 		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-
-		# TODO: --verbose?
-		GIT_TEST_OPTS="--no-color"
-
 		OPTAR="$(tc-getAR)"
 		OPTCC="$(tc-getCC)"
 		OPTCFLAGS="${CFLAGS}"
 		OPTLDFLAGS="${LDFLAGS}"
 
-		CURL_CONFIG="${ESYSROOT}/usr/bin/curl-config"
-		CURL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libcurl)"
-		CURL_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libcurl)"
-
 		PERL_PATH="${EPREFIX}/usr/bin/perl"
 		PERL_MM_OPT=""
 
-		PYTHON_PATH="${PYTHON_PATH}"
-
 		V=1
+
 		"$@"
 	)
 
 	emake "${mymakeargs[@]}"
 }
 
-src_configure() {
-	exportmakeopts
-}
-
 src_compile() {
-	git_emake
-
-	if use perl && use cgi ; then
-		git_emake gitweb
-	fi
+	meson_src_compile
 
 	if use perl ; then
 		git_emake -C contrib/credential/netrc
@@ -341,170 +255,61 @@ src_compile() {
 		git_emake -C contrib/credential/osxkeychain
 	fi
 
-	pushd Documentation &>/dev/null || die
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man
-		if use doc ; then
-			git_emake info html
-		fi
-	else
-		if use doc ; then
-			git_emake info
-		fi
-	fi
-	popd &>/dev/null || die
-
 	if use keyring ; then
 		git_emake -C contrib/credential/libsecret
 	fi
 
-	pushd contrib/subtree &>/dev/null || die
-	git_emake git-subtree
-	# git-subtree.1 requires the full USE=doc dependency stack
-	use doc && git_emake git-subtree.html git-subtree.1
-	popd &>/dev/null || die
-
-	git_emake -C contrib/diff-highlight
-
 	if use mediawiki ; then
 		git_emake -C contrib/mw-to-git
 	fi
-}
-
-src_test() {
-	local disabled=(
-		# We make safe-directory optional
-		t0033-safe-directory.sh
-	)
 
-	local tests_cvs=(
-		t9200-git-cvsexportcommit.sh
-		t9400-git-cvsserver-server.sh
-		t9401-git-cvsserver-crlf.sh
-		t9402-git-cvsserver-refs.sh
-		t9600-cvsimport.sh
-		t9601-cvsimport-vendor-branch.sh
-		t9602-cvsimport-branches-tags.sh
-		t9603-cvsimport-patchsets.sh
-		t9604-cvsimport-timestamps.sh
-	)
-
-	local tests_perl=(
-		t3701-add-interactive.sh
-		t5502-quickfetch.sh
-		t5512-ls-remote.sh
-		t5520-pull.sh
-		t7106-reset-unborn-branch.sh
-		t7501-commit.sh
-	)
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot=(
-		t0001-init.sh
-		t0004-unwritable.sh
-		t0070-fundamental.sh
-		t1004-read-tree-m-u-wf.sh
-		t3700-add.sh
-		t7300-clean.sh
-	)
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn=( t9100-git-svn-basic.sh )
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled+=( t5000-tar-tree.sh )
+	if use tk ; then
+		git_emake -C gitk-git
+		git_emake -C git-gui
 	fi
 
-	local cvs=0
-	use cvs && let cvs=${cvs}+1
-	if [[ ${EUID} -eq 0 ]] ; then
-		if [[ ${cvs} -eq 1 ]] ; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled+=( ${tests_nonroot[@]} )
-	else
-		if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then
-			let cvs=${cvs}+1
-		fi
-
-		if [[ ${cvs} -lt 3 ]] ; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled+=( ${tests_cvs[@]} )
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled+=( ${tests_perl[@]} )
+	if use doc ; then
+		# Workaround fragments that still use the Makefile and can't
+		# find the bits from Meson's out-of-source build
+		ln -s "${BUILD_DIR}"/Documentation/asciidoc.conf "${S}"/Documentation/asciidoc.conf || die
 	fi
 
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled+=( ${test_svn[@]} )
-
-	# Reset all previously disabled tests
-	pushd t &>/dev/null || die
-	local i
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled[@]} ; do
-		if [[ -f "${i}" ]] ; then
-			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
-		fi
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
-
-	# Clean old results first, must always run
-	nonfatal git_emake clean
-	popd &>/dev/null || die
+	git_emake -C contrib/diff-highlight
+	git_emake -C contrib/subtree git-subtree
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1
+}
 
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	local rc
+src_test() {
 	# t0610-reftable-basics.sh uses $A
 	local -x A=
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
 
-	# Display nice results, now print the results
-	pushd t &>/dev/null || die
-	nonfatal git_emake aggregate-results
+	meson_src_test
 
-	# And bail if there was a problem
-	[[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!"
-
-	popd &>/dev/null || die
-	if use perl ; then
-		emake -C contrib/credential/netrc testverbose
-	fi
+	# TODO: Needs help finding built git with meson
+	#if use perl ; then
+	#	git_emake -C contrib/credential/netrc testverbose
+	#fi
 }
 
 src_install() {
-	git_emake DESTDIR="${D}" install
+	meson_src_install
 
 	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 
+	if use doc ; then
+		cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die
+		rm -rf "${ED}"/usr/share/doc/git-doc/ || die
+	fi
+
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
 	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+
 	use doc && dodir /usr/share/doc/${PF}/html
 	local d
 	for d in / /howto/ /technical/ ; do
@@ -516,8 +321,6 @@ src_install() {
 		fi
 	done
 	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
 
 	newbashcomp contrib/completion/git-completion.bash ${PN}
 	bashcomp_alias git gitk
@@ -543,10 +346,6 @@ src_install() {
 	dodoc git-subtree.txt
 	popd &>/dev/null || die
 
-	if use mediawiki ; then
-		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
-	fi
-
 	# diff-highlight
 	dobin contrib/diff-highlight/diff-highlight
 	newdoc contrib/diff-highlight/README README.diff-highlight
@@ -562,9 +361,7 @@ src_install() {
 	dodoc contrib/contacts/git-contacts.txt
 
 	if use keyring ; then
-		pushd contrib/credential/libsecret &>/dev/null || die
-		dobin git-credential-libsecret
-		popd &>/dev/null || die
+		dobin contrib/credential/libsecret/git-credential-libsecret
 	fi
 
 	dodir /usr/share/${PN}/contrib
@@ -596,7 +393,7 @@ src_install() {
 		cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}"
 	done
 
-	if use perl && use cgi ; then
+	if use cgi ; then
 		# We used to install in /usr/share/${PN}/gitweb
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
@@ -618,9 +415,15 @@ src_install() {
 	fi
 
 	if use perl ; then
-		pushd contrib/credential/netrc &>/dev/null || die
-		dobin git-credential-netrc
-		popd &>/dev/null || die
+		dodir "$(perl_get_vendorlib)"
+		mv "${ED}"/usr/share/perl5/Git.pm "${ED}/$(perl_get_vendorlib)" || die
+		mv "${ED}"/usr/share/perl5/Git "${ED}/$(perl_get_vendorlib)" || die
+
+		dobin contrib/credential/netrc/git-credential-netrc
+	fi
+
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
 	fi
 
 	if ! use subversion ; then
@@ -640,6 +443,11 @@ src_install() {
 		systemd_dounit "${FILESDIR}/git-daemon.socket"
 	fi
 
+	if use tk ; then
+		git_emake -C gitk-git DESTDIR="${D}" install
+		git_emake -C git-gui DESTDIR="${D}" install
+	fi
+
 	perl_delete_localpod
 
 	# Remove disabled linguas
diff --git a/dev-vcs/pre-commit/pre-commit-4.0.1.ebuild b/dev-vcs/pre-commit/pre-commit-4.0.1.ebuild
index 27a86ca9beb6..32e43af70750 100644
--- a/dev-vcs/pre-commit/pre-commit-4.0.1.ebuild
+++ b/dev-vcs/pre-commit/pre-commit-4.0.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
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-vcs/sourcegit/Manifest b/dev-vcs/sourcegit/Manifest
index 743a3a6711d4..9907d63698dd 100644
--- a/dev-vcs/sourcegit/Manifest
+++ b/dev-vcs/sourcegit/Manifest
@@ -1,108 +1,73 @@
 DIST avalonia.11.0.0.nupkg 18684264 BLAKE2B 8ea36246c185ca8aace8ad7229fccbfc37ea1e420787360a265787806ec5c31d5c107815dcc57a9536bdb85f748c90f79f334d458e5e181585b4ce13b6be8e33 SHA512 86d2827bd65ae364dba920221a66bcffece977d5688833e7a1b16e13a3c5a56b5c0719f7e04876ece3f43963c41efe54b57e0a6375c258f816037dab95dc7f3f
-DIST avalonia.11.1.4.nupkg 11997514 BLAKE2B 0ee5de5d40d623c191f9f8e9101d11eebcf7d5fb1a88d13788e2767060765eac285eaa19821b65e0be383f2905ef9dabcf4e32df3975be07476dbcab8b086945 SHA512 422bedd1341ca18cde0cdcf7f31d0a96433109fb1348f3512a3e8f15d85aaf4b136f23d3394f4c98c8311408d04768d5e0e72abaf14cc722c4cc75407e03bb9c
 DIST avalonia.11.2.1.nupkg 12386795 BLAKE2B 54835da0408197e85b2df6bb3cd1ee43883c4d2af5fd27ec9a7add4730716ee6114517fe6399b90c39a08556d406bc4b3e17543fb99caeb75927e907c16f617d SHA512 dd71712d377b1e62d1987ff2d7d6ae37ad77a296d84ca6c748e96773fbc35e347f9f20ba702e0eef1ab79babd51c70406e68dbb219f7c1da392cada095456c15
 DIST avalonia.11.2.3.nupkg 12392407 BLAKE2B 0ed02b9779be599c8bc7b154eba8c952916fb664db1e7e69f6816ac0ae8cdf96947e758ed3587f5b47cf088ba0343488b556c9ed1042d5d21a10f34e7ebc7c77 SHA512 3e1c9a278588d40820b0230762b16ec138c9a94b376d4da5069ec6b9d1bad472f2b47af1d26f4da1507360e66be130edb3b1da057874863f1a9b4dd3acce7911
 DIST avalonia.angle.windows.natives.2.1.22045.20230930.nupkg 4554358 BLAKE2B 97c4a59a4c5ba56c7b8c119e18768708559e08a0f25143b4a17912e162a9d936e0279a0e9d969b088190d0fb0b82d2e303c4f885bc695f576b0fa811dd1ca34f SHA512 82bb927cff47738cd13ee87f93664eed203fe0586c807c0fb2215e743b01d787c1ab8285512c82a3f891dbd303a20eb1feb24fdfe09a9edd91d9de65ce96f4d7
 DIST avalonia.avaloniaedit.11.1.0.nupkg 485500 BLAKE2B 0aa18b5088053a73363c5488da9ca5476129dbfd00addc366da4b74b64c9954ba9c0e0ffb86f7241316e9fbf7ee3d74e2f4b8061effe418c1986337c690d1340 SHA512 b3adc4d346f434c3d78d766d49a3671751f8a8d91da4d66d83d311455a52fa1bafc0db691ef964f3d3c2940abc5f8b7019457745efa9b182096f68fd219c84a2
 DIST avalonia.buildservices.0.0.29.nupkg 37078 BLAKE2B 3d23f0050f6112c89ce100c3c1b88c04414c095ab6fadc1de74ec4b059e1edd3d7930a715e53c19dd4285ebb634e40f13965fddf81143465a5d056965b4e8d22 SHA512 9485e64c84b087beaf0803c049e9c057216b889bb8d452f0339149dbde65b2c9f1cca2f2b119c3d1eb8c6eb135f582edc72516095bb6be9a2d3b530d3aa3d639
-DIST avalonia.controls.colorpicker.11.1.4.nupkg 343955 BLAKE2B 0c9924ff6d603a2020c3b3a1ac57af285844dfe3da2bd0b4770f681befbd54b050291bc153df76b0424dc62f9baee2b51d00a12dc8c74b3c358bbf96e6196560 SHA512 9989e5fbbfb545e66485e50948915733d4f1572c91b2b05188e28b15bb4c9b55c797a768d337811e1910ff5254eff27f83a22d052da7ba12bda546e66507cde3
 DIST avalonia.controls.colorpicker.11.2.1.nupkg 343989 BLAKE2B a940a4825e314afe71961ec56722a662a4619e2c2696f13e50a0f74931c99f4649ea5ddcc157305352640d1317ed262608bd85d39d99fd7cadddb4c798e30bed SHA512 ada85a9e31a83fc5deb9bdd798bf1c830b2d58d20efded672e12dd2e4192a7248aa8151d1d14ef5a66dfb07270f7ca673dc1a2910b7efb1388ce72f966a3dea2
 DIST avalonia.controls.colorpicker.11.2.3.nupkg 343970 BLAKE2B a2081ea207b4a1a9b98648af036056abbe4eebad18d3c1106d055b63b2126e616e0d815b822ec7a4e5ae4eb6f80b9df3fb56dab3587a388986b865f75a4da7de SHA512 be150c2a4f9dbafad8bd152743c3b4b4d3cae127e490f29af0179915a7bfaad1a28fbf91fb52a3a072d461ad24d9c2dc272658b2db4d4767f29b1945166a9939
-DIST avalonia.controls.datagrid.11.1.4.nupkg 568089 BLAKE2B cb3316f84502d2a37586d421c2f2e3250612b308c8214255198a4c31c4e8ed85cd5d8e9f489be7ae04b15c46d6e18a28e9586d04cd5655291f45a6674cb7f2c1 SHA512 a9bbb732e3f87dd9373c68052846535a3bceffae9c6a9cbdf39825094cf4fec641d211c0f68238afbaf8ca71ec48860ebe8ac3750ad63ca3ec7a4f2b57052dc6
 DIST avalonia.controls.datagrid.11.2.1.nupkg 569326 BLAKE2B 56bb9b4c0177e75fb23ab84acf406de78eb5da94bda990e403ad8ff793cc83abf0d3f874e6bc7548fe4a2155cba407ff11d6e18a7a7a941ad53bf7c4dc2a57a1 SHA512 9eccb42aed7d8bba54150ece9f70adfcb5ea0bbeb8c46570d7297b7dc93b1af5bad7e15beb4c0ecdee50891da329d1ad852d71329e2524ce0c80281ba6a13273
 DIST avalonia.controls.datagrid.11.2.3.nupkg 569337 BLAKE2B 4c2b6c1fd3783b552acd4c831a869075df1ffa3260c8daae15509c0d71a62b4ed23df041a9e3c9472e58c5237bd722aa9824295ce3ed1c659a6452441cc1047d SHA512 c7875253dec9f27e9ba410eaf46dc7d7f298fce838301379b42365be3a71d68b4a6725e41d7ca65563b4463ac414baa75eedbe7116fd369427a6a430256a0edb
-DIST avalonia.desktop.11.1.4.nupkg 42984 BLAKE2B 02c1394e25beb8012ae16c7311103267ee43449fceb979121a1261918b685395f5d61837adc200a363ac83f2b7f4333d5eb4686b6b05e7837972918a5ec1fc80 SHA512 cf43266c9303d9f1d24d62339d203984b9363f77f4676fd785ba5cc27d70c97c2e07e21a9f45364f5ebad9fab81dcd26a188863b0a2697e211fe8da6e3f1caa2
 DIST avalonia.desktop.11.2.1.nupkg 43059 BLAKE2B dd68164084ec395f9ab2a770d66924c1eb922672ba6753a4ce682190944d75be771a1da5f0241d891638ba89ff5166b2303c0669cc9cfdaa0eee80dab0fcf19d SHA512 30cbcda4f049aed1bec105701a9eb949989224b9052bec9cd80cde599d409c9713706d7c389bc25c5ae5b86d7afae53daf97c4a5d1b692be9eb6f4ef909ecc56
 DIST avalonia.desktop.11.2.3.nupkg 43061 BLAKE2B 0767cc18b6a17e8b25f405be4a1f19fd187b3aae323d838becafb1dc3acad833d2e77c767267b3690a2020becd797a5e8bd3b404738330ddad0b29f58a8911ea SHA512 d4571946343ea7c19cf5ea7ed4dc9996eb6143522a043ee08910e12522646af63e75bae77d9fd58bf2231d58c4fc4a0e46d1f7b7fa4b9a4ff57e92a1e1de9bdf
-DIST avalonia.diagnostics.11.1.4.nupkg 328979 BLAKE2B 143c3ed86418168bc6b882a06a5465bcab0438f2dbc35dfcb084142721134ecacc5119f276f9e7d52008015652e3ada5d4efe5b2656c79a18653cce55126082c SHA512 03ec119e83c102e4a0d4b3bd072545169e6f3953b20027a7449edd2593fa0caaa5ea841e743688ec77b00355d2cba740197882d0ca0505bbbfd608e059b1b70f
 DIST avalonia.diagnostics.11.2.1.nupkg 340087 BLAKE2B 270e08ae105ef33b601919d21a7a8f63385f01e46fce3cbc9ffd61e8d1897d7492dffc3208e08e3445bf6dbe70fde799dd98612d666f854b9a66f9a011f7e2be SHA512 818df3ea6bbc42f5beba1448d26df2b6c984fc643d9fd5b5cd16d03f1fdc27ed693fd838f332200e8ffaec64a3f9b62476c475bcb9a11ce427ec5aef21a8c618
 DIST avalonia.diagnostics.11.2.3.nupkg 340078 BLAKE2B c5936a2913d25019d8f8ca8e9cd6065083354eb2790589e97590082273491d5a15df819a7875ac8242cb482f2f456eb925cd59a198aebd81126505323cc2c81c SHA512 d41b4845854a98186149712c2b56ed4795981e31ef407b973901044c9364e062ce7cffda188caec10068f805e49d299750b9c7aa12c9af8ce983d4a42fa36d4a
-DIST avalonia.fonts.inter.11.1.4.nupkg 3347515 BLAKE2B 5f3363e76b16380dd66891a7260f93c3484625a26358c93c0bfeda95d3aff5c41065b2f313cbe3cca0345f3197b7660222be2a8b8fce972074d088d461472427 SHA512 b24a3c45293362f6602a14864e3005a583196fb18c934da782693e91ba5643ba14a3e225ca94b53ce86280383ef3a957a0a8d1daefd738781e813cd2942fc979
 DIST avalonia.fonts.inter.11.2.1.nupkg 3347591 BLAKE2B 74056ff4e08f6b7f92ff9277b04d9a86cf2de481e48b4d5eda6625ed154d724e569ee17b98febcaffbf20549f0432c1b84e56c4c9e7c9281ba4388693a4de11d SHA512 3f905813f43fe18d4cdb4edeff5c23b2bac99cde616b29697ca4218b441d1cc0822865065f0b2953f38bc06b154f52469b9eb9a32189b5f063bb11b3cbd31ad0
 DIST avalonia.fonts.inter.11.2.3.nupkg 3347604 BLAKE2B 1b5a0edd4973b5ef92ec8c9431b11e0d7cf7722c2936e3067f569f4bb74010e9f61bbfb4d25b81011b7300a0a47ec2de3e856e657c8fb6f4590c2cc53e62aaf0 SHA512 68f0e05995c9f9d9ba75ad6ee2d2a90fec06de2921707040767b18a822d7e1a224cb90d5df4fbb333eec207e917de74d0e20c661092082683d7731aaccb3c987
-DIST avalonia.freedesktop.11.1.4.nupkg 256717 BLAKE2B 10cabe907880a8fa267fad2c5e364be7c3d910f390a5d3b5eee06d27e1e771319f8c46e9c50bee2dd1e3d90791a82cff224485a196545d9b5d7a92148662e2a2 SHA512 ad87e8e45abaea422aab3cf85eb4479c399409de94454510e7a58590e991c1f3725c3d2e5838ef9c2b9a3ff6123150d8d547e5a0a54f15e9b94ad7efd4d9bd6a
 DIST avalonia.freedesktop.11.2.1.nupkg 255770 BLAKE2B 0500d371f968b27872af724dbf76506206ddb5d29fa0011b438d4d274e8a74291043c0cd48809b103bf235a150e5734e66fc8c92e2876c2bb54cb0a1257808a4 SHA512 1fcf2871766a38b5d6b0a8024ee1ea4deade68be9752e7c25a73c7431730dab10cf786ccc58b3fe2f21b5880f5185a95b9b7fdb1cfc8225c71bd2bdc85377bc8
 DIST avalonia.freedesktop.11.2.3.nupkg 255764 BLAKE2B 940ae4acdfba3702a369081f2243fa4d275a9f749349dd900d41c432a0ba8eac07e04811162b3cfabdd354261724fd5650beeab26f007ddb65688157c0053647 SHA512 5b2ca181dcfeb768ea9bf3ece7a445b4b0f80bbd54c2c36355bdde8a842c5f1385ae6896ccca1898bd01d43cc08c7b2a4ebfb0ca2204c21e681c69de849a1ace
-DIST avalonia.native.11.1.4.nupkg 652714 BLAKE2B 3b1f2c6877cbbc11b9cc0d7bd93afa756e36dcb100bc744187d02945d96533438e72cb6b97d8b79ac873e647561488f21c2b556bac28e7668ed33c0f15a196af SHA512 4eb647fb6e5a636f95a68808b276f3b6c5d0dcecc7ea1cc4d851a86f5d463e03abbc9a8a3df5612d41e97161bb1b98d7a978870e95fcc4dc70db0b00bc825d8a
 DIST avalonia.native.11.2.1.nupkg 725133 BLAKE2B a431d00b3feef758a890f436da32d576424c12a232798cccc3e65f0c1033d1f9273b6c2b2c37602d95c5883d65989bba593f8f0b429a180015d60eb522648fb9 SHA512 697285763eff374d2434d28bc8eb3450af9f2d0516764e09762d60e7c67f10677a3cd4368fa9c3ac7c0450fa1d78b1e6b4431bb0d77959756398595c9bd2519c
 DIST avalonia.native.11.2.3.nupkg 725817 BLAKE2B 10f78c2c068d393c04386816ab790327ec2a3021d6fcff26f68951f5a56b22346ec1e92a370231b2601387060dd0e98b9505f8a055383a139456620c00f8761e SHA512 55b82bb16653841002bd1f6ad45e90c945c0b92976df7e5b4c6aa7dfe96aae18a2798c38f3e23b2586bc29c799912362d010233d29db9caa24c5f75fc2d6eeba
-DIST avalonia.remote.protocol.11.1.4.nupkg 142212 BLAKE2B 8db401e43a3bcdc4d54c27bc71c07272277ee57fdfcdeb6a20652e4a5858f1ced5e54312ab27972921e318e1acc6bddcf60448727036950c7f41b1c9300eba6c SHA512 bfbbdfbadc582b80ef074732c1a5ee7c9894415f0830a3721ef5666ee2d566c2d8c7e0f598b15e7a4b4d79fcba25ad6bf79e7d071ffbe273b6b2df852896b807
 DIST avalonia.remote.protocol.11.2.1.nupkg 142032 BLAKE2B 013b4d87d64817e1e25ea57bb9dfcccbefb419b38a2fe906d53f214ad7ecf76b9eb61e8e50ef6aa46ddfb25ff93bcde7a6d25415762ba2725dd7c4a6401a1cd0 SHA512 c385cfb2d1fe978705f6529b7d4b53c4a8412e7ac7a667e5fbfd16fe3057885a150e4b8be07b79689d6a3ae99a32c3487adfc31fe8e518951d1ee29571e22a10
 DIST avalonia.remote.protocol.11.2.3.nupkg 142028 BLAKE2B 24bed16bfcafa6550a079be721bdb7b17ca60e23f5dc27df8824548a3e539fac5bf6ff87a566978382715cf5cf36edaacd352dfc75d7a8a6182e9da4702e739c SHA512 94f5a03b3810a1c6df15e5f1c6bd95b32b99d13856e0270834e15cf0846966e6f3ed8175d7cad59723a1d00a0a11e4097eaf015597a95096728e5f9a2fd6443a
 DIST avalonia.skia.11.0.0.nupkg 187203 BLAKE2B 4cec64d8de662e4fb724b4b94d51a2a0bb88637cf4aaefb90ccf837b7e2650794758ec17e0daefbb78bfd92cf411dd496c50d083660ba62428f12f6ad305c06c SHA512 6fe1db10ed9422decd24fb60801d9b63651f0bd3f046a9e9d566d0816e7f3fb70eb4cf23db173537a5d5d8e1b75c2999793e5503648fa200a31806c6591b2723
-DIST avalonia.skia.11.1.4.nupkg 219729 BLAKE2B fbf9d054f3a3c12b5f75a6b47a5ea3f55f496dbc5a0ed0ae7f25181db628abdb162878400fef69a7c205be198adb9f7bb56694f084f1a5cd7e11c2bdfe31870c SHA512 421b2017114f8e024ecb9e98d9a3ebe5e330afeda0e93049ec6d0f7864796a581bccba39bee44bdf32aa74c7053af5b21ea02be515140b02b9d7ec4b1fefb649
 DIST avalonia.skia.11.2.1.nupkg 223993 BLAKE2B f1d6efaba51426ef1677e288c98a15b20c0a0acfa5bd36f4f67796624873de3869759f22b6a0796940351d4679f74260979bb6d6dd3d1a6da0e923504147d08d SHA512 17227d7756938e8228312036d71501a8990c5e467badea824a4f7568064c6cc7d6a43c61132907abac18e241acb94cc180476ffacfc38a27abe9e82e4cc016ec
 DIST avalonia.skia.11.2.3.nupkg 224947 BLAKE2B 37c97051c2781415d808b2c35df75391ec5cf26bdefa2074a2220299a19fa56f62fdf828723f518767ee4752db3a88387bd1180c67ae6ac3d0c948466aa69ba5 SHA512 3a1fb97d0b24b774e464313d11bca01d05d06072e9642d65ff356e1a6d87dff7c1a067a64b0098a23e5e6a9fa26d837f2a5ba0aa144afa10e4542597eb07262b
-DIST avalonia.themes.fluent.11.1.4.nupkg 321241 BLAKE2B d8627698e65cd70994cd1fd7c45df740edcebcd36533c5ff17cfe323c49c4bd4cf2e7d92646a9ca84a99bc33ee815e0927745ef20cc736f3c5bd0cffdc4dcf93 SHA512 26caa90c1a60bba541bb5692e728721089b114e8efa0f9ec5bccdda4f23bc6583278c7ca88e7cb9cfba6038113c28b76d361a445fbdc42e08a2252dcbd33082b
 DIST avalonia.themes.fluent.11.2.1.nupkg 323303 BLAKE2B 4da615f94984cc01e7d38991542bfc8c9b645e1560650ff765d904725c7072c1790cca4a97b3470e2fde0176d7d5da9040e8713b94337a3968d6feec966fec24 SHA512 c079f1f720276ef3a52b7d97934072ec4e3d4f593abf24e3884d1160015722934201592f719144e8969b7bba68a62ac2dd82e286c24c41a6d5a36bf3de5cb3e5
 DIST avalonia.themes.fluent.11.2.3.nupkg 323296 BLAKE2B e27b7cf6c403b65c19e7984ac3bba3c1e6b3e3ea10865226595cadff79b329ec2140c687f7a7f5404d07516982a55b3c479b239583b0fdba6e9404b2b6bdfc32 SHA512 2252378e9a0a69fe751fe8387dea46da4eac9b594631b5e6ff5c53b997211551fd74759ef7fb1083729d19520b86f60eff31f2fd1a8d8ccceb796cc2aaa2b7e4
-DIST avalonia.themes.simple.11.1.4.nupkg 198937 BLAKE2B 93f9ec73f97346f87930ef92acbb27329d682abc13861e812223fc44672e63fdf2f7ef6fae843f62b359d99e93d24c3af305b95d12746fc55ff276a528434136 SHA512 54ebfb8740fcbd02b25d699b3b508a0f02687ba7ff6e9680e0f5531af816b59715fa6cf082557b17a45a8cab4376e4eaa9402a81e117fb369728ca2b5b7e51c4
 DIST avalonia.themes.simple.11.2.1.nupkg 199668 BLAKE2B 1d34b78b7769deea701e9958ef061576ee4ba5cb182ede8bfab9e460ea3e89327eb890d721ef742cbe3a7c93f65dbeee9d2c4b39f7ed97dcc4f8f4e441b6dbd9 SHA512 62f103342845e63404cbf9f00ba3394f4d8bb861ff5531de1a2d1ef52799ed144ff1a1ecb84f90e812ccbfc5198e1c03d6d27522a096e876e03cdbdd5714598d
 DIST avalonia.themes.simple.11.2.3.nupkg 199676 BLAKE2B 0e94845f70a183ada4e297e2cd090224f74098be15b863d1ab5bf2abcebd01dd7f80554992a2c716cd11611013d1f72f71a719d13c0b0bbcc5fa00de3eae3a6b SHA512 db2ee573a40fdf69c2967139db5c6e1b33fc1a241f5c4578d9583b4c2b2fd1fa0c6ae61e6c30f93289331d4e120701f1caeef19b6a7c133f4cd82f9fbf777cc8
-DIST avalonia.win32.11.1.4.nupkg 756229 BLAKE2B d640542c43c6869f2f9032952d3c8da180546ac1dda4a0a2130c86afbe80cec9ab2b5b2562f1dceb6ea54a21ca33b5d9082927b4d0c40353dba02c984dcd556e SHA512 f18faace130690533bcc3908e59980de199d8845f9939ce958b8dd1340deca101799392ffc46ee259363488315c80e9389ff668297069fe1ac5520fb69ee9080
 DIST avalonia.win32.11.2.1.nupkg 1007308 BLAKE2B 903c77da79876a70ad034379c26b527b32905438a92cb1f23ffa983d30351eda87a64e73caa92020efa49bebe3f1e3683b610a6720b7d0b9a16f156a4f710543 SHA512 2c681480ce7a8b5998761ae9842311e45e1292052ddceb8f0aa9c9a7581f493cca0380db158ddcfa9858c7c85468a105875c4f90c131121b95bded0e4c036971
 DIST avalonia.win32.11.2.3.nupkg 1007233 BLAKE2B 50c4c9545efedc2619b27393a052284519c11256b341b2600e55dc8bb1cbd1a6967448e40a3c96ab35180fd1b9bf11a9ba1eff715dc2c958704b8542d68d4437 SHA512 1a163f2342ec1f5de731ebeca8598735f0b4c236ec4dbd68056b8f9665206ba631e795e779147285f32b2165b5704a53221244137b0dae156f7302b3eaeb50ae
-DIST avalonia.x11.11.1.4.nupkg 422631 BLAKE2B b74bc93d7816b6dc73d554cbd425bfa3899698f54513e3710b2be137e92be972ffcb9a3e0986c66f4b6556824f990c4fded379b5a814d4c1c7f6fdf19d4c675f SHA512 f4401da25ac9fd8838a569a2200f50836cb5a27eaca4e5c4164ba5165fb899b0dd698e0961e7da3c2e57bc40d6108b00b9defb2e22fb1b83322e7e93f82e3230
 DIST avalonia.x11.11.2.1.nupkg 436838 BLAKE2B 7299f212eeba4e05394347ff59a39df1e491c31c58e876c048541c4d992aa7ac9c4050b468c36e230f301f57917228d114e20c2b2c1714393400b5ada43343d3 SHA512 34bfc5694273ff9377f5b3f340493f8de1167ac0ce6eb0e3e670ae8f6aadf472935f4618df89e3c3bdd2869d2232c27b03d818f26a285e0d920192717a38c808
 DIST avalonia.x11.11.2.3.nupkg 448583 BLAKE2B 9defb55ed3b8a7cb3405b6ba6dd17ee9b031d85269db6d805a2fe88beecc22dd09cf03d2789fe1cdbe233b1feb306dfc64750d523c21e2cfb30ed868c38cca3d SHA512 cbac07377f5c424fcc49ee8ebfd0b128d7411825dfefc66164644673c8fd1dfd4ed00b510a06bd990c6cbd22cbdf7cc57f7ae35e84f9fdab57d6a08ce089f0b9
 DIST avaloniaedit.textmate.11.1.0.nupkg 49331 BLAKE2B 0cecd9cff2f7c6301b37bb9a0b56f9bfe8d2bfe506ab15da599f688a456d36153be910fb56fa209972f9a212f834dc8c4b84b3e2fca74ba3b5fc38ca881045c4 SHA512 431d7547ed746036f3f720b64ed8650bc5291a7f116a9441f5916adac350292d21da349ec37402baf7bd4eb5397cf02c4104328b00fbcd980be4640b5793f3dc
 DIST communitytoolkit.mvvm.8.3.2.nupkg 885961 BLAKE2B 9f7e957fa3243d107f25fb821a2b046a9fd5792edbf61a4352dbbfd06ba9799cf86126577ed7c90bd7316358eb0293f90668c7f92b190e25888f76178a360816 SHA512 87193041fb6a6e30c8e1e519d6ebed0dd3e29f04fbfe62f9eb5cf25edb1d0cc4ce82f042dc0fcf215db1f8aaa035a02b9902325e7fea736c1120839b68d21889
-DIST harfbuzzsharp.2.8.2.3.nupkg 1667068 BLAKE2B 6990ce1bd0167c90b05b5f2b154a134ef272e340a98ada261a25ba17450fffede9d9db1696b6f5fa4a63350a08da78a0b2ce66f33cb39c5b18dfcddedbb927df SHA512 44cdcfa570a075d28338f3b720ddc61c9eb3421ef14dabbcb751bd2103fb192d3fd0dff55ebac192db711c02b4d361bb652f55fa3e52c922110f3d3bacc8a173
 DIST harfbuzzsharp.7.3.0.2.nupkg 1584803 BLAKE2B 66c03bc427576c960ed1b7794dd71bf0909d2fc55d88ea70f1f2c8c88761e9d9dcc82761208f4bd7645cd643825f309d5adfdba327a5767c9ce7ea3694044f76 SHA512 9628aeb042563ce1640a79a2577af8f6e3c0bd0a6b6de89a530a44b21ffa7deacf256c86d368221199811ec7f6f18683383bbfe8ebe07ce4236dbdda229c2572
 DIST harfbuzzsharp.7.3.0.3.nupkg 1584872 BLAKE2B d76bd6b9aa72eebc0924162ddec0c617520164b7a1b4a290e9517afef174ab63f0e8c1e2a0ff1a7520e431baa1949d67627594bfa714acf0ccbaa20970179ded SHA512 bed625c58228c404f860fb3e247fb6ca3209c93fea62da498ba43419500bd40944b2e117f50f587f860101a6c6478ad1d18075f655376d1749d238d74b6a0bd3
-DIST harfbuzzsharp.nativeassets.linux.2.8.2.3.nupkg 2708683 BLAKE2B 73823b7f2c3cc89394e0b561c0102643591d4ebed59cbf06a73d3a2da1fdae535c51862f7a0ff4d4ba73e1cc312f96847e53ce0c59b8a01f1616233cfe298b70 SHA512 fde70d49dc1e90c9ac171b643f6e3939071cb2197bc8101ede4c3ce7f1ab7581d945d4c91d103bc63243c017ec2688d791880e348c24908bb7651e983f0f0b13
 DIST harfbuzzsharp.nativeassets.linux.7.3.0.2.nupkg 3369865 BLAKE2B b02034cb2d94834427dda89f29c680fc21b53771c49a3992e293ecbff7b6cff70afee7ec16cfcb63192409956195f3161a18764faee6bd8b7851ef3f1e43bc06 SHA512 0ea026b5cc9b52b8bc44139ea22cbb58d2613b660ffc3410bf90c08aff5fd1c32b71db33602892c633e370fc72af85810fb0128d9c1ca81ddad079c98d160c3f
 DIST harfbuzzsharp.nativeassets.linux.7.3.0.3.nupkg 3369933 BLAKE2B 068e7e6888cd159eaa3582f5d80ece056a4e6b580c0d3f2d494e92d4711193a276ba339d858f61f36e279cdbd6461173fc8eaa5646af93559cb17c100c1631ab SHA512 cf94e5693c4c475a702c342163f1ee28d2d9c3a13939a8334bb7133d13ffc5ed95d9dbb6145e7ac004cfd6e626a16280df7f1a4c7e3687569eced58b8890a1b5
-DIST harfbuzzsharp.nativeassets.macos.2.8.2.3.nupkg 970842 BLAKE2B f099a6c0bdbf2e191fdec2ddac7990885ad5ab1dc30bfb3820d56768531d70f85678824349c98705e8993c33adef3c0527b04a21b60f91c91cd2ff720fbeabaa SHA512 6f371912b52eba613883bb1403f5d9be271662fb15f33fb27b332fa8a33cd0944ec86a24b8272f80ca82fbbf04287ac745aa245571a7bf49970db83a0d61376e
 DIST harfbuzzsharp.nativeassets.macos.7.3.0.2.nupkg 1198303 BLAKE2B 60ab9286633b12f1afbeac7044854b70a40bed27ab942ddadd2c992ced7f59fe036cfc2cdff266c8e7964885dbf515cd9ccdaf5a021ae10329ad0d26ab1963b7 SHA512 8a97410cd28f2613f67cea9236d6f2921165e5644fce5a3fcd05ca11b670fc596ba4b422871ad0792cf59572ea6f05ae68028cb10983f1547b4edfe81caecb1a
 DIST harfbuzzsharp.nativeassets.macos.7.3.0.3.nupkg 1204601 BLAKE2B 8b903cadbf082f8a9397ebfcda7cf9b617d0cd83bf6b90dc1e13198d9896f5eaef91e3502aa33e957f5ae7c9986e157b768da5e189bc453ff5bcfedbabc1c7f0 SHA512 a6dac2eb2c536f25734e5358aaae9263f568871fa31169e816d8617c5b6e933d78e2956ea9e01ac37e0022bf243e63124956804b46f6a0d00826aa02320ef22b
-DIST harfbuzzsharp.nativeassets.webassembly.2.8.2.3.nupkg 3037958 BLAKE2B de95d41ea156f6f35e39278d46db85f4fffb5a3505f072bc57483e1b6364c156e6710e30aa80282bc69f8cb656cf48eb41bb09a25ad09e8cdf338f773383d224 SHA512 9d0521518020b38f05b206c146102c8441b3f1c2ee604b26bb733382449bf45cc24d3a11320ebb3ccc396d86c64a5d1de37f0622a712f2a590c2c2ea2098e262
-DIST harfbuzzsharp.nativeassets.webassembly.7.3.0.2.nupkg 9134066 BLAKE2B 7ab54a0176c82fbd64d4e42959333f8d3fa67021b2afd3822c1eb720772e3dcb802ef212f2e9963b72b1ca83261169d0bbaa2129def82a5bd4217f741facd22b SHA512 e1f9c5b14f915b943b129dc0ac2638cb8077a585431e67607a211534c5fbc6b85ca9d9b441e287fa9b0dda0f04077f4b69a5efca3d3a3c393387649039b5684c
 DIST harfbuzzsharp.nativeassets.webassembly.7.3.0.3-preview.2.2.nupkg 12379692 BLAKE2B 962df231f95f2b88467bbc3bd362477c10bfbc109d633fd2168a2434501d4204052772b92e3f6a1a2fd0b893fa8127db41cce83a8ad0c26a328840ef70ce668b SHA512 576cd59d109a8a2c2c83eb6d674f44c47a21b74d379f9894f1be7c268e332732c2cf2106bb24c86dfd470941d46fa16c007b4923ef38feb7d97d9209b0d4df44
 DIST harfbuzzsharp.nativeassets.webassembly.7.3.0.3.nupkg 12379670 BLAKE2B d4fb8c9b0ec1958358bcc435cff3a6bfa2ae5278f203d4ecbcf6d86446f7813c2e99a159f60b0a55c0b5595d052c6b0d9147f5aa3db67aaae8f32f8efc49babe SHA512 87ad62fc8471b12ecce7284ff8f69fe681ae1010e6e44e6ac66807b061213d8b8f5537ff4fe34195107c6ba1bc3bff1c2db0abe7bd51520820e7b6f2addfdf63
-DIST harfbuzzsharp.nativeassets.win32.2.8.2.3.nupkg 1253348 BLAKE2B f205a8d8cfd299df84de58d63aab892dc5cbd0a95e78bb6e01efc7b35006947b988fbbb30b165c0924b5a7e9fd85b0abbd61c563e635326ababf383bc132faf6 SHA512 f51176b5bf944d8cee7b17269a43d43bd2297506ced8d16c87d3e8d421d68d71f85e8eb20982e5af902f53e20382709a9a0500140e5a74b758af35193f1bb771
 DIST harfbuzzsharp.nativeassets.win32.7.3.0.2.nupkg 2227412 BLAKE2B b6b65f31ff7d97378ca54363c315301b1729d37bcd21ad7b5d5266178ad0cd8ecf3406ee2947908e66360208c30426673c49978cb9307d2cecbbd31c74b7c7be SHA512 88c7980861dfe3dd50e1e4730fa152ba37386def115ed2aee2a859c2bf9f33c9612d750982c093cb9e09893047d0f5bd20168f83914a09c311ebb5c5b37136cd
 DIST harfbuzzsharp.nativeassets.win32.7.3.0.3.nupkg 2227482 BLAKE2B db475218c0fe7b3bcf4fe366ff4b36474effb280789e2e25be8a7d4df9c9eba6a8ea0ec2caaa3a08cae5ca3c79f118c6aae6bbb981288a76809d2f6cd08776a6 SHA512 dd940d3b3085996b4e5961a0e42bb1a86daad360e3377602fafd60b0cb4d3d5ed9c3f4293a8551df75f38111b3a9f4dbbea4cb27b3e0632a6d48239b606d13c9
-DIST livechartscore.2.0.0-rc3.3.nupkg 3620511 BLAKE2B d38fa3084dbf10638712bdcc144102acec2ec35c9bc3ed4ae78b84a14b915abc7470ea20f73a91beddb32b2ec2edbd7bbd0d1c36af63c4f261ba3c60e78aa1c3 SHA512 7fb7f1668bb0e0711d2d6f74f80f36c57a7a2d9e9b30323ae2fbc5c66476961adbb9ddf1ef639223b90ce46a63efa7f6c70093eee78209466f54bc63e3fddd1e
 DIST livechartscore.2.0.0-rc4.5.nupkg 3286742 BLAKE2B 6edc73eae7de01835043b1b7a875032c41466b1d954501ae32150e7d5830e1b85c1cb308e38d0082bc3513857c7d49f1c056ca65bc17332412080712ff6167ed SHA512 cf89730936174f5443523450f1f421ed30c58ad01c6b7fa8d329172ecd7413014dae2f7f3b6d637fe8751c06c1b6990dc6e3c4fe728a1b7bbe999401b3e664c9
-DIST livechartscore.skiasharpview.2.0.0-rc3.3.nupkg 995034 BLAKE2B 3fd9beebf2ee402d7f9cbe94f1095a9dfd41342f0a96815842ac63204c805fac3a1856250bcc860eb176ffab31eedf3970aee1729b3eab6652eeaab5d6f0718c SHA512 6579b318e74a6481d0f5f6142313d2d9eda7ff66eaa9603657a7b79b9ac2ae47270aaeff9336b5b3799b71216a33e4bfc6d4d4b222b8dc610a018582abbbf1d2
 DIST livechartscore.skiasharpview.2.0.0-rc4.5.nupkg 894172 BLAKE2B 3b88ee3a3c667451f199d0eab2e394ef7a88021216ec081ba6815f031a7f4c473b02e4cf9b06fe7d56a8a326fa7922920f4aa8114c2296268c1ec988dc9e5f90 SHA512 2783a70b1c9bf8d320823f56911ee5782a80820b259b62eca714e20448548fda67bccf16fe0108b6032c7057c924b368f694f225b1f866dcbc4129d97613c826
-DIST livechartscore.skiasharpview.avalonia.2.0.0-rc3.3.nupkg 155631 BLAKE2B d6a178cfbed2d221423672505c79276da5934664c16ab4b2fd36e41d8bf7b57a7b27165524dc546aa1c336175a0d64d03b58e9cf011ed48b8c72665e627e58cb SHA512 6e631ac70456098f341a5384b2f343aec8a7403e39c9d47a376ffd087f06376ae53e0decdb384c44d5350743d6d3e2723089dcd1a0d19fd911cae11ea496fdef
 DIST livechartscore.skiasharpview.avalonia.2.0.0-rc4.5.nupkg 149575 BLAKE2B a21767d5612b74b4ad8dc9589a8d03df6713030886b3eb796ee4fd3edad6c39ad1101f037b4fd7613cec53d745495a83595957b41f5952f88131b63483faf6a1 SHA512 9fbc9192e59e2f047053679f6c07988a2bc254b6ea086c6f72cbb6139303a25b262f9e75b05251c3ce838ab5642684875244b4317dbb51e8c44a42708f2b78b4
 DIST microcom.runtime.0.11.0.nupkg 28122 BLAKE2B 7cd123dc53de44201e691b808212d641fdcae4589dbc598a4ebc3491284044881b5bd4cf805dffa773f1c0cc12b14f1df853490a92e50e5b9c745d4d7b9a2111 SHA512 c00731176e34ea7b936ad58a38639843c790b027b714ed5d3ea828b85ea94b14a502ded52ca7f60bb10c0ac0e744bd6e62fdcce0108ebaaf9731c408eece031e
 DIST onigwrap.1.0.6.nupkg 2733981 BLAKE2B 0ccc084877be21f1c2c4a11fe4f0a5f75bb1f9fe579a1914fd5861bdbf88b9aba2cf87355297c39361cdb92eaa3b6d8eab1df25f8118512519f8d7ec3b01d3b2 SHA512 2c49c166d8d8620382bd2c87e0448fd809a7f5283ec889957f049a0f37cd6653e0a865ee25d8de02ce5f05369948916bbd121ca73bf8ea5b1c293f4ed5326532
-DIST skiasharp.2.88.3.nupkg 7478514 BLAKE2B 7b0dceaf5ae0fff7984dabddaa8057ed84e57db780198ce2430338483f0930ee4d49eafb1bd9e93d0ba302482a83afa203f648a9c4122fd125bda03fb0fd2dd3 SHA512 90e78bb2a0c377a7c72f750e6f9c122aaa24e66b4739930ae473466ca3aa1d03ee241d6b6041627f86a9a518e91d6839db31e1684e73190d968067da6488b743
 DIST skiasharp.2.88.8.nupkg 7144605 BLAKE2B f6540164e90e0046a6a90519d15157afc6f87d86b5484c7c7efed5b0772cc1c2c5370323b2872189179a8bd2a7d68d40ac601ede16a66bc02df9814e2adc45d9 SHA512 52b0661b38146357ee5f92153d9223b03d4e043db8c811773470725a81f4ec0171fc22a644ee70636f8793ac60432222a5395777615ca63b4d44d5095a331b35
 DIST skiasharp.2.88.9.nupkg 7150003 BLAKE2B 293da099e97d3eb057cdf20dd5832a9a0e5dab561e7831ecbcfa2cf1bc3d53b4160cff3459aca50f6123a440f1bc11b52eec4357214b7b53e90d04639bf0047a SHA512 3a2ffa5e05f45cdb80e6735ee947e91e08ff145fc50c7882e75d44b6ae0c2cd733420d15b6a4274a186b3a79d463a1273e27ff7fd79a51d0937251ebb6ef761d
 DIST skiasharp.harfbuzz.2.88.8.nupkg 153987 BLAKE2B 9a6112dd28afe5cac142e2df5901f3c1a707141972149bf27fcc440bd2efb11f35796a4cb7bdf034e25bdc1317607b35c07720f53592854db18bc29f23b1a04d SHA512 84286faa7cc0eba7ad05b3e8fcf8ecceb9c47ec69e628b586fda269f4c63bc9e5be16f03b693f93e642a8fdba7e2e8ccc093d8a21f5500e092f062695232cd37
-DIST skiasharp.nativeassets.linux.2.88.3.nupkg 15604929 BLAKE2B efd797fb607e655307ab70e861287364bad07864120b67859aa05a3671f0318c9933506f34c87056ab5b8e5a318acaf9594183183c6b2f45c0c891e341d6479e SHA512 544ef5b9e0a9d97214e743a93b0147364a767e5a31374dfb8dcd069f14a424b54db56fce85f28d14157b7493930d7408f99afbc383994cd2243e9bb27bf57813
 DIST skiasharp.nativeassets.linux.2.88.8.nupkg 15619001 BLAKE2B ead9f6184a2aba2faf1449bbbed4060e4b86bd9c8e0c9d5ab9de55e27aa7da4cdd50db5e69bf3617cb93b4c89dc72587cc14f28ce9059fe401d9f589139a64b7 SHA512 c1cee7bb4adfd02c023804d312c59326e37859b012ff00ff245882e77f5da62df79672e0bc82b5576d8fcb23296d69e4309dcb65f44cc4474be5bc2e4be005ce
 DIST skiasharp.nativeassets.linux.2.88.9.nupkg 15619648 BLAKE2B d7d34379fd376528f5b700b70e0de7590b1f902fed66a672c8930002044f5270a4554e2eaec02cd06925f6022f6c71536f2f6456607d0eb319ec619e92ddb1da SHA512 5c6a3e93a18e70e6adcd548bd2f76fa311114346ce4d812e520f250d33342d5ad8d05ea285433bd15cb19bbc48d9bbf2ef7d1f1725dd71705accefaba3f46892
-DIST skiasharp.nativeassets.macos.2.88.3.nupkg 6906838 BLAKE2B 93b37a50f1b468b16f3062c9132acb5e669d2bbc156a619aa3f229abf8aed19fe17a10af9d49ab9650f31fb1d29a1db06e5f62e87d882f06aabf60cad1140c50 SHA512 db5781df92e44449f8cee9fa816c6f6d952e5be3d4890031316a138f9a9aaa98c71d770908401f3d80ef5026400c61c52d55f67646e5f304ef93b688ab5fa60d
 DIST skiasharp.nativeassets.macos.2.88.8.nupkg 6821808 BLAKE2B d378296cdf4e7ab47f5d8465a2ee66a7c7c99ebaf797f0ca040f5ba7ddb21d9a573fb3610bb1ac5bfa8e00d1e1eee673a09132a1f08e9c3d2cb53417ecf83765 SHA512 eac30f293b6da9cb2260b59abc99ffc4124669be585a26080b333ac3decce150afd490133c595cbea33cb63c34e6565d3bed28c2630c8431aac5ddc3acf1f1df
 DIST skiasharp.nativeassets.macos.2.88.9.nupkg 6830677 BLAKE2B fc82e2c7c60bdf8eb36b4c192c42d897f44a718762b29e71023badf377a2534b3a547d18b1a6cf699b3ac609737b5ebbde711c3dbdbb7d918ed4a48dbacf6b0f SHA512 74cfb865746f2911935290bfb92469b331e50415d5abeda87598ebdb4049c52af84a5daeda41ebcb0bbaec6a7debb42d83cdc6c9f61cea55d43c720a78c3ebce
-DIST skiasharp.nativeassets.webassembly.2.88.3.nupkg 23950637 BLAKE2B 70846c24bccfc967831d67bd3a646ae7b06636305f2ae6f42574e76c641af26cab17d066da3c20312a2b9b831c98340d5a34d058e960018b8c57f1463b6fea42 SHA512 243ef57a09f88cfa086acd74419ba7c39b041cd113d4de2e72192ca8a40d7ecc74b5ab60f6a80195b89b7dff249650d48f44cbd25450b264cde79a7034600faa
 DIST skiasharp.nativeassets.webassembly.2.88.8.nupkg 52734847 BLAKE2B 415a13d0907ee2867c9e89948a0206ff0a176b130dcd3f2edf967692b817595635f1c0685356707f3e4348f4e101bc5856278896a5b56d4133b539f7b65211c6 SHA512 18f19a940f21e458c78fb65d3988fcf7fa3ef87ac266568d938a4c47f89806b6790da851a0db49bf412df9b43d0a8ae461d067def875602bff2670a7d7bf1b89
 DIST skiasharp.nativeassets.webassembly.2.88.9.nupkg 71804127 BLAKE2B eaff9d3f88a5a3a6281467bd2bd48a0c156e9b9ae23de4f6a1b84e052ab31170dcd61816f5565d189d2d8f50d37de27b7757af200bfa5a6022758d11f0148cb6 SHA512 c1815d86904c25e1bc3e43b22cc4b2db0ec931c13dd4d9505a2b6cb0ca1d24329f725bce650af1b0dc12bc70d8352cc19f2ac452aab462e7af4787d4601e0e0a
-DIST skiasharp.nativeassets.win32.2.88.3.nupkg 10909359 BLAKE2B b9a7e8d30508f78a051f2d9dead01d9513f07b004830ef3d1ddb0f54dc5611b04e31b0f4ea6618dc82ca1e6dade57b8f279104f162830cee77bdf92558af5d85 SHA512 91711dda228905361393a39754dd08611b69b556af4725cbe9aef92ec8f11dac822338108aaeb1866e149c1e8b9dfc2dbd70c8f64fef11686ad59f69fc7f4420
 DIST skiasharp.nativeassets.win32.2.88.8.nupkg 10918061 BLAKE2B 5cd3273f99d994c19463685d8834d18f9062f7a6f39e22b5858a7103817a6d55d333d1a109590448ccbdf5633a10166fc1b3b6c4eb86854b90df33a4c61b616a SHA512 cf469d9b57e03bd775035db8da878241c7bfca0917195665fccf8f73de4d8b5bdf95613421c2fc3dc12c88d05163fa7e8f4cc7ca382cb4288302258ccfe88be8
 DIST skiasharp.nativeassets.win32.2.88.9.nupkg 10918525 BLAKE2B 39a607a2b9e51659080c2ca9d2129156308c7a1857bdd6d4228f3fc900d40eb70d9409ad6c11ab49ac1b4a962894b229e9db26e54ceb38bd236b8e5dfd8a4f92 SHA512 d18bd8194041c7ffb79302d4f1be584e8c024e88b12cb4669a738cae551da3d3e3924087bb0aa42d34a9003cfb35037d73637894e67d02223d100a1b4215eeec
-DIST sourcegit-8.37.tar.gz 2779046 BLAKE2B a581a71889681b8bcf6d531fa947e0cf2f6c891204224c9df3f69ee8f169f198deba57a6513af7ef3f0eef6f36324dd0ab8c9594e3957763f9257e6b63515fdd SHA512 2c3973b4c3b19eaa8cec7c5fd5817ed6573f2d68a61f3835796ed788cc7cb9621a4975ab6a4e3f53fdcaa49d38a9e48673a46a9ddf15671707f6cd7c63f5a901
 DIST sourcegit-8.40.tar.gz 2796422 BLAKE2B e2606d0bc52ebcf3db501eb09b052cdafa83b020bf9f6ee3bf46370a59a43e6eaaef6a8fca82baa1cc61d19f975685bafeb2e2a2b5ddba4328ad52cf4f5de0c2 SHA512 64f0a097264e62f337d0abdd290daa541eba4297bb94ac74322906dcc935e3ec186e56a4b45b11ee2729e26b39876822dd0d9358dbad52017f42415565e4b042
 DIST sourcegit-8.44.tar.gz 2829968 BLAKE2B 58836c75a542861585ab6bff0188adfa0dca6508bad33cd028b63fd20398fb77e5263edb7a28f86d26c3652666df6934d3177f2ecdef72c3609df81dc812391f SHA512 4dcfc55f0705ab6fdfc9e2c9be8be0400f3070ea7f89e9d048f6e9e189687cc739ebf813e77065158e7bcaf42645091d8fce79e2e004b28615cd06c9c394a202
-DIST system.io.pipelines.6.0.0.nupkg 221298 BLAKE2B 344160cc3e08c0a9004eac9672b89d8aa9fc726a0dbcb2aecd677f995157f90354d3c704862422bdf8a0195918a7411b6ad9315c2f68b01c0c24ca666f4dee53 SHA512 c5983b4510bc8ae4116133ffb9b280fe61d99d47ef52dd78e5bfd03e090901896d5d5fd738dae57006b971840a4d9422bded33ddefa5e927d75d309ef1f70dea
+DIST sourcegit-8.45.tar.gz 2830345 BLAKE2B f07dd6cf8b416418324c2ad5f85e9256d7293db6578f7a5af807a74e52c75cd8ce36e11972965cc242a3765a46f1a7f6a53914f9224d662647ab3abe7abb36e1 SHA512 d39405054f24f9ea983f9d66041da35fb516555a438ece22b3d3c567412f01d59c126d4d0fb823217c0c1b593a533be24a3225b36d8589b1d15a3ebd384b1475
 DIST system.io.pipelines.8.0.0.nupkg 267394 BLAKE2B 612570554ee41ae37c8987df6ec797583c95b38160aa70b1c2fba9af23f4bd85ac0ba5b7036abfc1ee3cecdbfbdaa83b861e9c017e5fdf3e726478b24e83d957 SHA512 57eb6a11e84f40a48b57b1dc5786a01aa9852122b7d15363490d8a12c9a458bf99a8ddf4c0c0247be98559c2b42e769a10bda2c5a9817735484d960dc652eb12
-DIST system.numerics.vectors.4.5.0.nupkg 382792 BLAKE2B a97284a76a6729052d3a127e1875e2012ae5b90a40533783dc799b543d44cc084035374799e9e1b894083cb61f2639711f18b76ff31145140519a9674dd9d2aa SHA512 9c04ec0530f608aaf801837a791b33857e2ca6d2265a6049c01fd4e972825967e709cad3070f174829b7400f608e9a641d3afc3a45d4636d4c47dd43dd0657b3
-DIST system.text.encodings.web.8.0.0.nupkg 374440 BLAKE2B 97211e710df3dcd17932f168e254806d7c8692ac01d667a2e89a5ddc956b24fba8467fbc2d451057757b5c502442d2c91bcaf0f867da7e95456b2aa18136b354 SHA512 ba0822c38c3b658aba9495642d269e882b827e3be4ad2dc1426d8a97d3cbc5a2277c5f80847d0cb9381078af01523328c4992caa058146d5d8ee6b8a08609c32
-DIST system.text.json.8.0.4.nupkg 1981785 BLAKE2B 32eaece9756c948453589d13f596d2481e8d7150f1c970f2cbc04aa9ab8ab399795e6ead5c16b47198113f10f43ef4407e613286fd55538de3f172885dd6be93 SHA512 9f87ee2a39ba4f602a2b3ec7584b8aa2c03a7f6db1e303f48224dbc139ddbf3cb10190be04efe1d1592b0bf5b2fd97f6d8f88fd492a45f778b84fd3e613acb00
 DIST system.text.json.8.0.5.nupkg 1986315 BLAKE2B bc96765a19fd097c5aed6605f83f5236adbf75204a9da6a9ee2ce28372ca84abe87c8e0e0885d0b4d66e7937a14c582752ea353b7d53c5817e2738d1c2e5f8ae SHA512 13589021ae3e81f54c877abf613ce931cc24ca57bf127af1063ccc1eb4dc57a6cc223a61e6452207f5d0dce453b6627430e31e4143c78e71e9b5dd647f680abf
 DIST textmatesharp.1.0.59.nupkg 1163235 BLAKE2B d8ba9ad3068e979feb7bd6fd7ffbda6e23b140cf57e9df727dcc93ac372619eafc033611b16605628ab9ae31c6b0830c29001ac7e694d5c7836fcb0c5120cdcc SHA512 d8339b5085335f80c86c40be907e6e49d5bf8eaf7841b7e3c34cf2ed462058d9c623e4129a042fbd07a7c4ced49190176a370192e499fc519dba9db95bfa9df9
-DIST textmatesharp.1.0.63.nupkg 84136 BLAKE2B d727385f349767a082d28f2e8db088b2b00a39b9e7b1fcd3fef8fb1e83299b22a497c33c76c7e049f5774b357a1c9944bbe294246009dd79e799b1bbd638fb05 SHA512 be831797d046f0f043335608149e22757306027803a8f8b6c76d3c98c045a9ea453b292298c23c22da871c7dd1d651d80f2253e43e813a275da128cc9c02aa9e
 DIST textmatesharp.1.0.64.nupkg 84143 BLAKE2B 129fcadc2b00bf2e0bcfa3615d0d50ac8f15ac421888d9e8fdd1acea2a0cebe6bea11a0a10d19c776fdbe20de1582955df47ce6c16cebfee2f2d19f630c620cd SHA512 59d3942b422ae08a3b8e1905d7438bb7f4e673e61aca166f2f257372d460ca587eb586e4336260f5da55f45a67f653ded97d0850767bc7ac1653d2fb1431eb2d
 DIST textmatesharp.1.0.65.nupkg 84001 BLAKE2B eabbe918bcaf0ceb2e163b80d444f8ea2b79e05c5070250337c7bb8c14bfadf0ce51c38cf2a6d072af09f80629d2e43388287ec05fbebbf75e9d96bd17ea96d6 SHA512 65556800a198f27537bed11f7d6463d6f5f14de83c68c9ebd4672d6f4954b3a96a5cf70db77307980949503860e0e6c3a38bb80e708f7bde3f4a02f844defbb5
 DIST textmatesharp.grammars.1.0.59.nupkg 866879 BLAKE2B 4ac85ed846d6488adf7c15c7ce82599d31ec76bfd137cb1e192a84e056c828d7eff6a4506083703d8db3232a97943f3b817a01778b92b7522ded11dc456faea2 SHA512 780e416700fe2ce4f5d7bf52dcf26ed994e43f18a48564c5010dc69075df62cb832139f0b93e88a4a9aba4322e9de900ce178fb4b1622c138f1d0bf9b75b3835
-DIST textmatesharp.grammars.1.0.63.nupkg 866866 BLAKE2B 4ab3615f3d73d9ebde33ca6a41e42eb31e6a838ebf01cc117507413188778f006a03b28c075ef13a5d1f87c9c4b9ced2cba7e550dd2f2fc3cae88866cbe5cba9 SHA512 bbcb83e0697c4a673d9b0e0e7d0f263ad19a0d2b9a0aa6e4d6c7d004ad3789268880c496f7baea0f5109691a5a8db7a012d9c0f51047a32850b08045c13c35c1
 DIST textmatesharp.grammars.1.0.64.nupkg 885532 BLAKE2B d783aecc4741efadd7fb1729ba016c8a984709c7be20fbf1481a72f2b0c6b7ac5adb5c6730c77812bc3c742927134e6cd4ff2bda5cae20cea291736bdf1056b4 SHA512 97ed22048ce2585756e9e73f4d6e4a43d95aa73a6c19dfebb6deccca48343bfdd5a81781151726cbe5fbccdd642a1d3ac11e57e5d9e5fef3561b6cd447c64c02
 DIST textmatesharp.grammars.1.0.65.nupkg 885335 BLAKE2B ec62cde4cfc22daceeb6c03dc786295a5f279feb38be847c8887a4256605812e91a0565b851e22d3db149068a4aa48d103cd31671e9213d9d2a33dcb0ccd7fe0 SHA512 dcd5243b6857385e50fb08cf18217e8fd3d8a773e726e4179e4566ea4857e84c99ef3ffe9bf1b79570e59e6e54171068210fde8c9644ccafeca93487099d19fc
-DIST tmds.dbus.protocol.0.16.0.nupkg 241531 BLAKE2B 186c927cbe193005849196ab8d6415790d8ec3435be9fa17f4c2fd50e33fdf5236a5c62679f383b68b37d855dc497208094493d10cb96a97d50ccb94aac2c567 SHA512 1e6e1bf8ea7c652e5502e96323984157e060ac728843f2104ff8dcab755483ff93ef4df7cc4e7dd4b56047ba42bf349c2681e2fb8d6518328eab002e63d371b2
 DIST tmds.dbus.protocol.0.20.0.nupkg 340088 BLAKE2B f4a724a6674253d0066406df1c6b1d2011f8b090a647b7f07e6a816b7e05b95ae7d74664c0eac10b494fe29f4e6f3e0aeef9e8c03dd713063c96329736bc3940 SHA512 602cf251f034d41a4feef63f0d77c3005553f88abd5ba9cf941d0f731369aa1c0a8844e89686f7fd3a1ad8e02068b5c3b4dd3e719fdb40cb603b9ca3b0e22e8e
diff --git a/dev-vcs/sourcegit/sourcegit-8.37.ebuild b/dev-vcs/sourcegit/sourcegit-8.37.ebuild
deleted file mode 100644
index 1b39f5abd75e..000000000000
--- a/dev-vcs/sourcegit/sourcegit-8.37.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOTNET_PKG_COMPAT="8.0"
-NUGETS="
-avalonia.angle.windows.natives@2.1.22045.20230930
-avalonia.avaloniaedit@11.1.0
-avalonia.buildservices@0.0.29
-avalonia.controls.colorpicker@11.1.4
-avalonia.controls.datagrid@11.1.4
-avalonia.desktop@11.1.4
-avalonia.diagnostics@11.1.4
-avalonia.fonts.inter@11.1.4
-avalonia.freedesktop@11.1.4
-avalonia.native@11.1.4
-avalonia.remote.protocol@11.1.4
-avalonia.skia@11.0.0
-avalonia.skia@11.1.4
-avalonia.themes.fluent@11.1.4
-avalonia.themes.simple@11.1.4
-avalonia.win32@11.1.4
-avalonia.x11@11.1.4
-avalonia@11.1.4
-avaloniaedit.textmate@11.1.0
-communitytoolkit.mvvm@8.3.2
-harfbuzzsharp.nativeassets.linux@2.8.2.3
-harfbuzzsharp.nativeassets.linux@7.3.0.2
-harfbuzzsharp.nativeassets.macos@2.8.2.3
-harfbuzzsharp.nativeassets.macos@7.3.0.2
-harfbuzzsharp.nativeassets.webassembly@2.8.2.3
-harfbuzzsharp.nativeassets.webassembly@7.3.0.2
-harfbuzzsharp.nativeassets.win32@2.8.2.3
-harfbuzzsharp.nativeassets.win32@7.3.0.2
-harfbuzzsharp@2.8.2.3
-harfbuzzsharp@7.3.0.2
-livechartscore.skiasharpview.avalonia@2.0.0-rc3.3
-livechartscore.skiasharpview@2.0.0-rc3.3
-livechartscore@2.0.0-rc3.3
-microcom.runtime@0.11.0
-onigwrap@1.0.6
-skiasharp.harfbuzz@2.88.8
-skiasharp.nativeassets.linux@2.88.3
-skiasharp.nativeassets.linux@2.88.8
-skiasharp.nativeassets.macos@2.88.3
-skiasharp.nativeassets.macos@2.88.8
-skiasharp.nativeassets.webassembly@2.88.3
-skiasharp.nativeassets.webassembly@2.88.8
-skiasharp.nativeassets.win32@2.88.3
-skiasharp.nativeassets.win32@2.88.8
-skiasharp@2.88.3
-skiasharp@2.88.8
-system.io.pipelines@6.0.0
-system.numerics.vectors@4.5.0
-system.text.encodings.web@8.0.0
-system.text.json@8.0.4
-textmatesharp.grammars@1.0.63
-textmatesharp@1.0.63
-tmds.dbus.protocol@0.16.0
-"
-
-inherit check-reqs dotnet-pkg desktop xdg
-
-DESCRIPTION="Open Source Git GUI client using .NET AvaloniaUI"
-HOMEPAGE="https://github.com/sourcegit-scm/sourcegit/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/sourcegit-scm/${PN}.git"
-else
-	SRC_URI="https://github.com/sourcegit-scm/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="amd64"
-fi
-
-SRC_URI+=" ${NUGET_URIS} "
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	app-arch/brotli
-	app-arch/bzip2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libpcre2
-	dev-vcs/git
-	media-gfx/graphite2
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/harfbuzz
-	media-libs/libpng
-"
-
-CHECKREQS_DISK_BUILD="1G"
-DOTNET_PKG_PROJECTS=( src/SourceGit.csproj )
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	dotnet-pkg_pkg_setup
-}
-
-src_unpack() {
-	dotnet-pkg_src_unpack
-
-	if [[ -n "${EGIT_REPO_URI}" ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	sed -i "./build/resources/_common/applications/${PN}.desktop"	\
-		-e "s|/opt/sourcegit/sourcegit|sourcegit|g"	\
-		-e "s|/usr/share/icons/sourcegit.png|sourcegit|g"	\
-		|| die
-
-	dotnet-pkg_src_prepare
-}
-
-src_install() {
-	dotnet-pkg-base_install
-	dotnet-pkg-base_dolauncher "/usr/share/${P}/SourceGit" "${PN}"
-
-	doicon "./build/resources/_common/icons/${PN}.png"
-	domenu "./build/resources/_common/applications/${PN}.desktop"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-vcs/sourcegit/sourcegit-8.45.ebuild b/dev-vcs/sourcegit/sourcegit-8.45.ebuild
new file mode 100644
index 000000000000..466e576ac669
--- /dev/null
+++ b/dev-vcs/sourcegit/sourcegit-8.45.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOTNET_PKG_COMPAT="9.0"
+NUGETS="
+avalonia.angle.windows.natives@2.1.22045.20230930
+avalonia.avaloniaedit@11.1.0
+avalonia.buildservices@0.0.29
+avalonia.controls.colorpicker@11.2.3
+avalonia.controls.datagrid@11.2.3
+avalonia.desktop@11.2.3
+avalonia.diagnostics@11.2.3
+avalonia.fonts.inter@11.2.3
+avalonia.freedesktop@11.2.3
+avalonia.native@11.2.3
+avalonia.remote.protocol@11.2.3
+avalonia.skia@11.0.0
+avalonia.skia@11.2.3
+avalonia.themes.fluent@11.2.3
+avalonia.themes.simple@11.2.3
+avalonia.win32@11.2.3
+avalonia.x11@11.2.3
+avalonia@11.0.0
+avalonia@11.2.3
+avaloniaedit.textmate@11.1.0
+communitytoolkit.mvvm@8.3.2
+harfbuzzsharp.nativeassets.linux@7.3.0.3
+harfbuzzsharp.nativeassets.macos@7.3.0.3
+harfbuzzsharp.nativeassets.webassembly@7.3.0.3
+harfbuzzsharp.nativeassets.win32@7.3.0.3
+harfbuzzsharp@7.3.0.2
+harfbuzzsharp@7.3.0.3
+livechartscore.skiasharpview.avalonia@2.0.0-rc4.5
+livechartscore.skiasharpview@2.0.0-rc4.5
+livechartscore@2.0.0-rc4.5
+microcom.runtime@0.11.0
+onigwrap@1.0.6
+skiasharp.harfbuzz@2.88.8
+skiasharp.nativeassets.linux@2.88.9
+skiasharp.nativeassets.macos@2.88.9
+skiasharp.nativeassets.webassembly@2.88.9
+skiasharp.nativeassets.win32@2.88.9
+skiasharp@2.88.8
+skiasharp@2.88.9
+system.io.pipelines@8.0.0
+system.text.json@8.0.5
+textmatesharp.grammars@1.0.59
+textmatesharp.grammars@1.0.65
+textmatesharp@1.0.59
+textmatesharp@1.0.65
+tmds.dbus.protocol@0.20.0
+"
+
+inherit check-reqs dotnet-pkg desktop xdg
+
+DESCRIPTION="Open Source Git GUI client using .NET AvaloniaUI"
+HOMEPAGE="https://github.com/sourcegit-scm/sourcegit/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/sourcegit-scm/${PN}.git"
+else
+	SRC_URI="https://github.com/sourcegit-scm/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+SRC_URI+=" ${NUGET_URIS} "
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	app-arch/brotli
+	app-arch/bzip2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libpcre2
+	dev-vcs/git
+	media-gfx/graphite2
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/harfbuzz
+	media-libs/libpng
+"
+
+CHECKREQS_DISK_BUILD="1G"
+DOTNET_PKG_PROJECTS=( src/SourceGit.csproj )
+DOTNET_PKG_BUILD_EXTRA_ARGS=(
+	-p:DisableUpdateDetection="true"
+)
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	dotnet-pkg_pkg_setup
+}
+
+src_unpack() {
+	dotnet-pkg_src_unpack
+
+	if [[ -n "${EGIT_REPO_URI}" ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	sed -i "./build/resources/_common/applications/${PN}.desktop"	\
+		-e "s|/opt/sourcegit/sourcegit|sourcegit|g"	\
+		-e "s|/usr/share/icons/sourcegit.png|sourcegit|g"	\
+		|| die
+
+	dotnet-pkg_src_prepare
+}
+
+src_install() {
+	dotnet-pkg-base_install
+	dotnet-pkg-base_dolauncher "/usr/share/${P}/SourceGit" "${PN}"
+
+	doicon "./build/resources/_common/icons/${PN}.png"
+	domenu "./build/resources/_common/applications/${PN}.desktop"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index 41ee9c5eef62..51b3261bb3e7 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -13,8 +13,8 @@ DIST anstyle-query-1.1.2.crate 9969 BLAKE2B 179b8dd6dd709c2ca67f4eb5c9a502b2867c
 DIST anstyle-wincon-3.0.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c57b22b57e32a5c75847f2e2bd68a52b33c24797db662aa5fd7e799b9644075c8c939d93b0cf8598b16ee80fc817b77f SHA512 24b3a9a44382609ad449425a657d4b42a792d4703c36e0953f09a03817759c266a2f0ff4ecc9e8b93ea8403df2badef1f1af6a6e50af56205176c41b13501ae6
 DIST anstyle-wincon-3.0.6.crate 12271 BLAKE2B d9f4d9d46fa93a1168ca340562681718be852ffa94e30c9ea208af53af9d6697ca84921837a325ddc36681caab2b866b7f574901c80b5c0d862dcb765b81b68b SHA512 59ec6f5a53bd68b6344d82e923eb8c45ddac481dd0d270a7b452dc5b0540ee1656705697c1508942ecc131e7c075248c85d8f4159f27d97ea94f22469ce2eeb5
 DIST anyhow-1.0.86.crate 46741 BLAKE2B 21b1f3acd1c1b659e6e9a53693178de67c806d7dbad30dedea0fb7078b2388baa196d1e7240a7dc88ed9dc93ee4c00bca8e608dad1b6bfb5bfa4f4c5ab51f0d3 SHA512 3853da32a2c53d73969bb29a1e622f3a6d5832d8888dc6bc8eedb76394b392f983aa3fcb1f542933e238841486106f0f38e9a2400c12c7699baba0ebe1d8193a
-DIST anyhow-1.0.87.crate 46831 BLAKE2B 8d277aef9dfb9e28d6fbbb840fc3dde385ae29df8fdaf76913c39ccdfac487c8a7599783c6bf4271cd7466a06bcb4b3b1459b317c0f531634a4b4b8ccc1d6174 SHA512 1ed272eb20bd28d361d71b8dd1279bb3ab3a722c6a68e0f7bf4fb0a196f8a5d9f5ed9874d231ba7cf93e6a6f2551e96411d1fcb26908c79ee76919214637816f
 DIST anyhow-1.0.94.crate 51731 BLAKE2B 2b8b7ed7506f31a434ff8af198256816bb196f3434925ad688820237893b54b14f3731d34a3968277f532a3b67c39e3c4aaffef43b42b13bb1c6d3cae50e9ae8 SHA512 61209bb1a81104ea86375bff12e6654047a596fd5282fdaa590301c4bcdafcdd8bc83201811063d565bbfab6be42544e43047ec88d2b0b41f7c5f2712f3a3b90
+DIST anyhow-1.0.95.crate 52155 BLAKE2B fc9cebdfae0afed86f2dfb7faf62f5a108000895317dd0cab9c83d6e48c891558fc3a1d8b9940b623b4c6fd861631a0f0344a9915517a9bc39dbfbe48ec6b45b SHA512 8c5c176381c3e861c3c4451f7cd3d9e2447c0a55735ececfd3199288d65d36dc5fdc4a19a0798f62a0b9d6ca2c155a616c7eab8bcd53e6ece743aed57ec3d0fa
 DIST arc-swap-1.7.1.crate 68512 BLAKE2B 5ddeffd2ae8af4125a5b43d4a0a1afc7948533bf037d8cd3e47603c13b57b156618280d99b840bf318b25b6eb29400ad68499695e182acdc05bc5f621c42ee16 SHA512 070fa8dd17b380b6d7d72f6f45c84e591de9a9770b9662351e7a41af03798bf5e34d185a5fcb948f4d8ac5e210a33acd465c39eff6097662c2442b34ee3dbdff
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST autocfg-1.4.0.crate 17712 BLAKE2B 7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6 SHA512 3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c
@@ -23,15 +23,13 @@ DIST bstr-1.10.0.crate 380426 BLAKE2B 19330a5a293430c09908d2174ff814351b16419f60
 DIST bstr-1.11.1.crate 351485 BLAKE2B 639c2e610e088120674a70dc5dac0b9c437f7454fdcb385b7ec9e66184b8d016f7190c864f7c8e25fdbfe5f884a9b4cf8815c1a0bb94efb03028fa966b4207cb SHA512 04c28eab447ee13e8d3af12fd165947c26086e8cb990840226197c16b4716bc018a48c6dbdd055f837a7d64eeb3c594b0b3629103ce7f910af0c3c7d3cc79edb
 DIST bzip2-rs-0.1.2.crate 253906 BLAKE2B 75a60bd49deaa8df0a91e291c619a392f55aa56ed8fe8e6f0a1dbd79c14266baf058e4e904cfb64762511f4a9c16c60af3c919a1943a2783907e8eac86f7f0d9 SHA512 00683e16f06a3c5589fbb6cb215ecccba4a8619916de80024a917f98f10bab4c663036fa3f922783ca19bb04a1653ec2ab593c1f36f587e931bd80cb11a79765
 DIST cc-1.1.14.crate 83005 BLAKE2B 777ebbe65b71b62e435b03e1749ebf6ce4664b07dda1635c454a59d3308fca0b27937b53227010ed1a7120ae7b21336e9481a4a08942e5a27e3a74bfbc8380ef SHA512 acc5b071c7be4ea1e70609574582686363f9811e03029857cddb7c6a6d4e01c32fc71bf50ee3d7da8ba88c0ed2ac4da7f66963dde69ee3ecffbf52ae1ba88c4a
-DIST cc-1.1.18.crate 83315 BLAKE2B a97d24ffdf44f80795f67f7721ed4d2524d92342bfb4ba39e00a1d3351945c904ba84cc7e245c637453e70d19b1584a400e8422e185d42c036ef44d3f2135663 SHA512 af525791c6ba731d688d3f5bf898c0ff86bbd81b127454d7f933491cea1e921d171cb819d04e460e759c6ae0f6da2188ede6bbe94c940c47c6d9d9f991925401
 DIST cc-1.2.4.crate 99823 BLAKE2B f05e52fd921578f14907911730f1c5bd7cf2c03e83f2d5ebaae9c2710025f5e5ea7c8f713888bd75d80abfed1b8e932a2047410f043f0b62e296389c9bf695a4 SHA512 76274e9676f09277a22e4cfb8c53a08bf562f98b710b479af6f95d590d3762fca1d6ec34791a219d59e3184774f13f624e84733f7c90c13c48707b75d75c0ec9
+DIST cc-1.2.6.crate 99923 BLAKE2B 61e091267c5b18d3c2886ee50870ccd3aced59d9f5eea31967e8739a49523226e2d1f0f383c7b5c3c9b6dc19d65bee319efb081f0c05c9d25847063d7f628081 SHA512 a9a2a00c58e0625aef2023c0c84827f17ee260bcde7e9407c98b38300ecaa5df852babbe896d857920c3455089e3608b54014812da88e597c500017bdd9a52ab
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cfg_aliases-0.2.1.crate 6355 BLAKE2B a758d9c88527f0e6e7cfd6d4c83eda1bcb4d6e2438189fe08e8ecbcaa78d56afc5a4873f3b82bf7da96afd690b44cdf1e44466b6da0f37c358b340481017103e SHA512 74969d12d5d24002a29e08d52e30fbce014dd481a7c35ee0162e69333c5f2d7755f3b02439b31522e12444cf1ac8e65880ce33fe6778dac03757e362cbf8a72c
 DIST clap-4.5.16.crate 56627 BLAKE2B 83a6a9ad12b826affa68df179dc1cb534f58b6ae505f4794ca6dfaa8f8a9e33d93b9babd7931bf48bc13da31cb3078b442c4a2a2e84a8f2e675b5d620100c50d SHA512 d13bfda2c3f77cf194acd87763d5f2fea83ec2135504b173af2941547a7d3dcf75c3757532c60b53c57600bf4859395ddc94a7dd92b17f44c60d3e781741f928
-DIST clap-4.5.17.crate 56802 BLAKE2B fcdd23d66ecd27ee3820c4abe681bc997dd6cfd69948e11603aa8c4ca39513d5de901373959328986ef81c046318f240ea87a2f19b38921faf76b6c93d0e4f67 SHA512 69f0fe213007a2e0a564945bf58794b891a345c34747e92ec16877253ff60c1a30fab24031b5f56d6e31ea7b0d8c9dc0c815fd1489b2c0df1e2d24b4a2be6406
 DIST clap-4.5.23.crate 56460 BLAKE2B 5c0ff6ecc072368022b8dc08703d87802160817e40228fccbf9cbdc15d86dfaf0eec141dec4e8f1327e5a6d1622df9b334e94797027372dbe8765a12b918961e SHA512 4a8ef8731c9768844debcd1ba83a79a607fd32d9fbfe7411abefb8939c5c442e8a206738bb54dddd136117d3992f519ffd1640694ad7796c4e0aae3f95502c7c
 DIST clap_builder-4.5.15.crate 163717 BLAKE2B 795fa9c6de6a3f4d9a1288c3340613c14b11a5346e314f5f486bee76346f5f88396e54d95d051bd84184a91bb1f2d3575f870fca56a4b9b590ea2d9939beb415 SHA512 52efd99bce20bb8ff2187c4cef8bc27bef6cdc52598f00b47639b797683f18c76a79a6ebf34d1d250621a49cab0e9ec9e7824d323516f1ed3fa721cfd34cd713
-DIST clap_builder-4.5.17.crate 163559 BLAKE2B 10731513f76c64027116ec97aa7dcbfbff74e649c64bd32db1a14ed1ec00e81a3b7c8e3ca478e5f077fa49eae9ae48dca4810190924b9af5dccea9cb0f883b5d SHA512 86411378aefae1eeec1128d797a21697d9470fad7ba2e109e00e8ae20d4da218e909d56a2f7065a4b2651d6c5d76d14a7394d747b2a4313c739abe0c9b046492
 DIST clap_builder-4.5.23.crate 164180 BLAKE2B 90948ac5e8ea620be3e1ec1334677b0ae9dc227a00354fcd3d78e2cf23a1c101e009e6cc96fc19c0a2395e1b9ac6272fd9615abc1acf1a5d60392e337cfc961b SHA512 0889876990f0a361cc6b6d41f2a8f4b1decd376987a02fe69888455c92f3e583d6ff70880c6f0ea154ba62f4be7d2e7b18cdc4e0e2f243e6b17f250c3e8d1c2a
 DIST clap_lex-0.7.2.crate 12805 BLAKE2B 952bf3f3885ae7bedd0e8add236590da5fce72a7ccd88ebda063410aef337ce7ccdb5e5e929cb870bc993891610edc0197150a3aa82a62fadc4bbfd96324fcdf SHA512 a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380
 DIST clap_lex-0.7.4.crate 12858 BLAKE2B a5ecd50cc503157dd69746f3b6e9c288e0fe4f6d5d82271499f657134fd401fbe076255e2be6a23ed0b69daf3941c6429dad8b288223b0ad390a2c435575cdd1 SHA512 a2566868f4619679d3b74b70592ffa6a04b13e38e3196c56bb1dae8bea0c711bddbccd778d2aba3cc0ee074c9b1cc0335222818f0d47fb3cc8109cbc35bb992e
@@ -62,6 +60,7 @@ DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca
 DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
 DIST gix-0.66.0.crate 276687 BLAKE2B 2b2c0b64448fc03bad28dca4ed492aaaa9518458c739083de88775de68ec4d7886adcbcf95ff61ad1a24d15413e7d886e3a39108423e76e794f439a2740b470d SHA512 3f898bec95bd37551bd471c982abe8450377e43421bfc23b6064e884b0f137e85ce270fb416e66aaf0303c0ad9c6cb16e13204849856f1718787f24fa3566b22
 DIST gix-0.68.0.crate 294935 BLAKE2B 10bf9b5784f1c6829529c7f96d7b7c0007e025cc281db237b253a1ef51134cd146e2be40f8f045bc5257f1fb4a2ff8bf3ef63895f4da7d4ebabd2384e5f119ee SHA512 69dead3c2d74e695f33eb1751236c58203d36fdaacb660b4490a8b491e9024a8f5ab670ebf19bfa6a0017010a36a3eb88932944573e9d1aedfb3d32b4694017f
+DIST gix-0.69.1.crate 283914 BLAKE2B 8024c931523ace0375817c8c94df04d2fb0de754b74dc68d09dcfae1ed39fc145c0c7aa7170b689f0ac0dbf135b1ba1ec114dea41ec5de263a5f9e3007e2b4fa SHA512 49cc671a251939f0433224e20f96fd0078634a8a56c9959c0da369f5c5f5d1435e30002ebd4ba8e6d40147bca4f55518fcef56957651cd78e9c08ebf7608d2ac
 DIST gix-actor-0.32.0.crate 9327 BLAKE2B 7e407e0863659070529ba67320f4fc3c6f6b27f761f35f7364cccc06dddd0eba77a349a60dcf39d7038a84f15da22679ee17a85282d97b06f296a73315347216 SHA512 e3b06012b97fb6551f6382b027769767db739a063bca2f442f7acadbc82148427e7a053da32141f10cd21e82116c6f5424a319ad7d56b8b69b02949c6f9e84fa
 DIST gix-actor-0.33.1.crate 10085 BLAKE2B 807e2d1a9f7c84c515838f0bde3942557bcf2fbeab11855e5b42c91f64be48efb8e1daa2e3f2abdf82476a5478b1fbf1c7ff0ca688851b841436f2e7919908f8 SHA512 cc852e6a4abbeab7059d83b175271c88a79528e039e4995145bacd50c26db143c27a9986b86309cb8824890c791ebf7b74d3275249e684c4b03fca725fb6f6ff
 DIST gix-bitmap-0.2.11.crate 6920 BLAKE2B eebacb07d6150bc16d4068fb0d5d1646f78cac93ab6cc82b64f3fd9d4ec928f5e904a3ab2bb66f697df2ca51c17eb586d873bec73380e894b66f05b94b7ed690 SHA512 889e0195b9c16f6cafe6d66a7d18da1dcc5f3aaebeb63415665102d838bf702eabe142fcbbebc28f3b69372eec5f51a9dace3d333caa6f5fe8158df89eddc40b
@@ -70,6 +69,7 @@ DIST gix-chunk-0.4.10.crate 10131 BLAKE2B 3dd2d7d0a2196ab8dca8575ec1c579e4b91b95
 DIST gix-chunk-0.4.8.crate 9358 BLAKE2B 6034c836716906e7b8cf490c9f066ea6a995d384be6b931df3db96c6e71ee53dc4e2efc065d1eaae130528f23ebbddda27608f0d08afb9a8cabb106bf053dd5b SHA512 3c0bf0b9aa998907f1f2c3e610f86f250c4f9bcc9384f4c636d3c8d637e9011b48f7ee33f21dd8b91fa66c01209410886ac68c2f04fcd4262c37fca0ff9ea6cf
 DIST gix-command-0.3.11.crate 11669 BLAKE2B 748c3fe00475638906aac4d873ed7dad05d6b65152c0ba45c8d9e788f5fb3855b115db71e0631734740b372bd5f759753b1ee1aa679ca998021d5b0375a54d71 SHA512 42d8503314100a4eb057f2f6dd1bd4f24d707a51d6aa85d6f46d7819227c3d8fff8afa0f8404f9c7478ca7335adc83769c076e14c8c2217e83c470fa2a1102a9
 DIST gix-command-0.3.9.crate 10938 BLAKE2B 0f771ad9f51d4203e54984e71e2c29e2ed13f3dc145dc9e157f8cf2f9db604a973932c1379fbfea9d1caa00498bfe6507d6ee231ad72e73781575f705af81630 SHA512 9a42c1513ce33a874bf0a43fded2025fa1040c1235635159d875275df6bdb2c2853ac535483ffd80b07bd849da5bc7f38ba5228b5ed0ac27fba85059d8db83ef
+DIST gix-command-0.4.0.crate 11815 BLAKE2B 0c8ff68055bba36b7478a1ee677c0ef5fdc2bd254b04a1846723b389f09c504e89b45257e0e39aa88b42aa2f7a03e1af5091e0820dbb9d19fe370ea09f4406d0 SHA512 2e4673e1f1fafb4fe602891848d4a72902cc9d1d242e9ec56bdf1aea1d9921e35bd94811a5e77ae9c20870857548e342ca18705e8c5b90c12c7c585bfdb51186
 DIST gix-commitgraph-0.24.3.crate 18242 BLAKE2B ef37235c7258ef6603b122f9ac9bb527be29f1b4cf7dfb02a484ad77986220499633789466bef94508949ebfae50568493f216d532fdbbb84861e9f04aefc38f SHA512 270edf30cdd8ff90bab02d941d741ab6cf6a85d6c2adc25b41298637153e641307e15db9ad54fbf0ac4008497c77980202b067f48c2eef88a7fc1673e022ae47
 DIST gix-commitgraph-0.25.1.crate 18945 BLAKE2B 65c69910ffaa374ca1c1737d8d04c6c01ae9e5e8bbea31299d1be00d4ffd768f46f3425ca5acff20558d74248f005ea1c3cecd77f0ee8d36fd058b0d3fbc1708 SHA512 27c617d2b81184ef012fb9ced3d05e621f07ff58947132db615bd1059ade26acecf1e6203188c570f253d03196fabe167619f810110459adfc4359c08c5a2014
 DIST gix-config-0.40.0.crate 63360 BLAKE2B 5206d0d761cd0f23170c16ee5ca41ac876a0d8dbe1b0d9b1d230441ad2845e5c2b4bffda9d4e6b77acc552771616e4337d4e9916216459658614b3fc42eff892 SHA512 c124f4e460f1288b3d374903acafbb212e5dcf7a15bf8af326ccfe8ed54aeaabc4debd709e94ced4a2d23f207af40d237e67efd894c3872830a931327cc5a7c5
@@ -78,14 +78,17 @@ DIST gix-config-value-0.14.10.crate 13604 BLAKE2B 79acdf7ee7769fd0ae666b534c03b0
 DIST gix-config-value-0.14.8.crate 12828 BLAKE2B 3d08b92b6a5b9468ed5f6bec47a9a7d968cc0727ea7819e1059d518943ac91c2dd34c9c1cec0f520b6dd2c4dab8d0a5db1683bf0a215dd4c9d6965c6e6c83a2b SHA512 2bc52ecb47aee3178f6ca0d02ab325afe6080fc80f85eb2d7150e72b8b46dc4396ec8a9c70e7dd7bcd901357663962888941de382740313eaf82daaf159c5303
 DIST gix-date-0.9.0.crate 10501 BLAKE2B 70ff61b0177f442e3d262008f65529c28a58ca5fd7ee2ba1a7a02f7861e1ae11efb9ed29f6e396885b9c7c21ebb23f574c22c6f5668d7dc1b8f3d766b368b6f3 SHA512 bf620acf06ca58b7990dba33f61ebf8df9e64cbc7ce82ed8b0aa61b495e8e0ed3d4d6b013118aea8b6f8c3890e58c04756e2878072516b4bc4838f90dcd5d0ce
 DIST gix-date-0.9.2.crate 11289 BLAKE2B 5cee9f0e8199a6fc04278a823f8214ba898308657664aa659f7fe18e45426d9ae21a20bf0e9f13da7139cdc31a9cdd174e122bfb902296e93b9a285744f27bc1 SHA512 b2fa1a721eefe97be673ece330be476313225c8f3c13884941620875084956f671187734bf87d0095cbc6e3bd6e90dab17a0460aeaaaff37a2d390e3e243ecf2
+DIST gix-date-0.9.3.crate 11299 BLAKE2B 5a15e00418ac01c9174e2d4c776d1a04fc32c7269396b5de44b5c89f4ac3bc2a721618b4bc59e2e66982d40214168d6022174adece227c85de53c546389ae7f8 SHA512 c75a0108f5289ff82df7cf4f003d3c501b6c8cffa713e0b8d1628ae54744474324e9c9e77c839b94e4a7c9a2ce8d9e5662796d46dfd4cb31a208c6c3ed25a790
 DIST gix-diff-0.46.0.crate 32657 BLAKE2B b7030adb15068c4e4ad86588dedbe1ffb8bf5fdbdf5a3a79188a41051053cccd7105b74a274ac3a8262e3effd5e5509bec50d8148616b6eedddbd51877d67394 SHA512 0a243466cfe64f07ed389fb1215e67e636c9c96503ca0680a88c54ad5daea74ea2616ce606d09d0b8367987faca9fa1d3b91278cf7ce8524649bfd0a9760ddef
 DIST gix-diff-0.48.0.crate 40943 BLAKE2B 5595bcee57acfbc3113054ab0c49dff0ad20c04613de57a29c84e119c59e539d53e3fa59516edaf96cc424f55f58b275756521ef0bdb1eea1f3f1b296c3d2281 SHA512 3b951dff75e00e3cb563592d79c0b9fd7a17ebbfec9ba6076fb5697653ff86f975f18384370d9ddb9258cdc169dde7595f98b56fc9befb3e38ed752ccb93b677
+DIST gix-diff-0.49.0.crate 41572 BLAKE2B 3a54efcebcd19aa22c2cea8e18e8b98f6a54161764a5d0e9190e522b14c3690dc447abbd26446b64517d24488313bd6688fceacc6374a3bf5de16cab086f2ec0 SHA512 c448813d14328ad3ae65df4507223701823b6d0d39a74e757335a02755e29b7f6cd69f9f246541004407e874659cbfe092c76559ca101ae39acfa82a3de12413
 DIST gix-discover-0.35.0.crate 16625 BLAKE2B a9b46b89f35f7f16d2388a15bcfd7de95f07667e9b08f5285c47f0f176b7aaf7d59c0815b461ab82a47acd7858538497f2c61722c9d893e70607efe986615770 SHA512 dceac4c190ce9cc4fdf4b66a36489185ced44782c9c1abafe5aa52f8a1d18ca90b63bccc79a5191703015ea9d582180813a47472bedb79aadbe6f165e11d7e85
 DIST gix-discover-0.37.0.crate 16673 BLAKE2B 8e57fe5e44192c2929228969ca16f3c7d88d8a8c2fded00837c7aa8c561397d9798448f0e5e205ac979f246a37c23ad13b6b90684e11192fd2bc9dc8ea243483 SHA512 e26869a2700a972ed6714a0fa29f2302a74e2a1d8d57e78d20e373779601b4ef367aab2f5c5c866a9b506a76b1faaa13bbbbbcbe10b507969a30c23aa9bc0c0e
 DIST gix-features-0.38.2.crate 30604 BLAKE2B 68bb0154bc444a84dd20bdd1a56d770a8c68a816389dc8ba0a94ae71da9c9955974cf7a154de5548f65e547a5e25303efc19b5e225664ce8f827cdb661bb17d8 SHA512 d82f70bd8831701b2c17a761b306e4b630fd5b558e4b936aa8b2f87440e53127b48f024c392b487af23e0c541de4b064c27c35ee57005a81352eba0e6bcf79a1
 DIST gix-features-0.39.1.crate 31228 BLAKE2B b41a71cb0eaebc6139e2b8dcdde9377144bb508f5eee48e2202dc9e3d9c98ed5807963b1c4bd16da1b00d064ecb0e75a4b66a9ef4ef82a93188e9bebc690fc59 SHA512 a150d723b5bf223adc8bcf7faa2eab8f5c5a35ae706dd09d940c6232c9f62c9c36b2ad255f5c4c6fddfa41c4bd301d46b044953e5ce5cdc57790fb234fa81546
 DIST gix-fs-0.11.3.crate 14867 BLAKE2B 71495a8f84c1dddef477ff6bb19343e58e8f0b0e3786d327750bcec04a1971237ba328061505810943e0c8a864ebfb36fd47c01dd51fc48b9d18e0a0ac329070 SHA512 7d420a8cd322561808f84913c5c6880031a07005f535bf4e379673707feaeb8fcff4c2a41b455fe76ab7af6fdf0a934c471290d828e8416c26ad49cbda1f235f
 DIST gix-fs-0.12.0.crate 15577 BLAKE2B c23d6b6e1ce0270859d9f23ccf2336ad2aeb232fdbb4cad099779cdc3ba292bba8bc3fa3f16cc39e630cd6cfb98d68c28e7ed58f9e7f1f7b7dbfb9552c0916bd SHA512 8ebbdd069d11a99a3b05d342c42a6b84c155e1c9bf9b6d1ba9e12b3cb1b96f351aa1d5ff267258c7a192e25127dcee1874a287d60ee8157ad72d438f694c259c
+DIST gix-fs-0.12.1.crate 15734 BLAKE2B 03263ccd2107c89ca87568fa670d5d9f5f1a186d4b47e9d5fb76fa25e10d0825c1a60226f65562c0cbc8a5f0711f3d5b58bf35cb39f33134b5bb111cc2386155 SHA512 e795cea9077ac74480d848ab3d8287a4e14a3f5718e329e28915547304ab415d55b193d91dfa9b97cc09fd32cb7570faa2dd33f6b464c94e996c29e8ee90b390
 DIST gix-glob-0.16.5.crate 13425 BLAKE2B 233ebbd4e1993f5139478b1d482f54b47992686ab175bbb01fb95591934735d93681d8b888e85e7e2b6c256afeaedb7f6cd4fd666bb2a3c8f3e206b34e50a29a SHA512 6b8a22c5225a18645ef673fe73f7da73fc519650d03990f7fa43bf8f0df58d4c1a39a0da297ff5e76557b07f89f1aba5955a82a997bc29e52ca9dad808858b2b
 DIST gix-glob-0.17.1.crate 14136 BLAKE2B 9d8a147de57b7406539b117db96ca8aad91eefa85d2da212a152026f315cfbf8120bc4a54ec7c0dbbc42991353f81dd73aa69a07a1b2b3205ccbb7d3e8162913 SHA512 3eec32350076b5a8257b447c8d683fcb38a7c171cf6187c30186ebf02f12ddc487bbf18c8c260c3721fe69ca84b861bfb003ec8b26fbd00b5056e543a4d8905a
 DIST gix-hash-0.14.2.crate 12759 BLAKE2B 033f46ba342fea5e2a7b5b91eeeac06aabaae527d10ed665ef1d2d7f34362ae7ea27df652012c5ae25872ab18175aefe15de3e981647086d8008a32bdffb2d0e SHA512 32ba5cc7805146fa858501bdf0cd75bd000550aacee258fdd63572323cdd06e54c78b4a71761d410c46471dc1bcf856e5564586f24ca2cca03c60b9e08b4386d
@@ -98,34 +101,43 @@ DIST gix-lock-14.0.0.crate 9795 BLAKE2B fd6c378bdf904be22182ae48e7898e9b8d5ee5e3
 DIST gix-lock-15.0.1.crate 10515 BLAKE2B 2969f4019b48a312c5a0adc23b614424e09b75706ea4d18159f8a30bf20e03312b11d95bba6703034af99a4901d036a4a0d964b7b3ae52aa6dcd024f6468fcc1 SHA512 8ffd3cce4d0952cb6a2fced4a6ab407b4a32184a2b10ac1f5302132d2d7d3e4c285dc50f007141cfdd658352381f66aa79b64cf4f63f0a18a2cfe367b7bb5830
 DIST gix-object-0.44.0.crate 32479 BLAKE2B e7656eb7b44a4f555541cabd19b0a04a9f2ac4f0e48ee41dfb49941133c2deec9e6a5682c410b29eb991e12d2480ff3927796391f8eb0c0d83c52b74ec36cfc0 SHA512 8971f0949fad9eae9285e2216b84d90014de55d3459cd0cf0adb5db5019d8b151842efec0499a44e3bee5cd53fb4ed48d742903ce2417da2021bd3bfb7875b36
 DIST gix-object-0.46.0.crate 39738 BLAKE2B 629d95a05e4d1851c0d8366e4ffe5de741c5b7aceecd6d4cc4aeeb268c146534c1cdaa05c792644c15c059e6d31c382722435b123622b45005f6d62aecbfb8f5 SHA512 6cd5bb8b048032b1984c8bcc952c9b0ccdcec6152bc98b11d939496c0ab2ef3fbcbff57454abbf0c016f7082bc73bf735f82c02900c553a653019a831a3340b0
+DIST gix-object-0.46.1.crate 40544 BLAKE2B e7996db68fbffb0e66e2d7e9859eeb829c5d409edcfc1e585c71badb9036298e846a545ccf24534c211a9cd303769c87b98ffb9b44055748da3d3eeca1035217 SHA512 fc85dc59a4494787d00e39a9a4b8fdedfba2b0963f08a9f2de720d36e3eb63ced683622dc127fb6492c1311a40ae5f6978d99bf92a0f4660a172ee725e39dd90
 DIST gix-odb-0.63.0.crate 54304 BLAKE2B 71ff5e546632a7ce7e4b9ae28ec96c9c22028e756a6aa48694ffaed4c3269d52e47959e3eebbd19c72b4a4675704b11b42c2f643843835b203359f34bc268e78 SHA512 6f17d5d12095b51071ce83f4fbcf6d5cacb567b77ae870e38e5d3cfd8a9f00507c6d0136374b6b7b4dbcd2810b1b1f58b077b98feff893db403ebc525491d1b5
 DIST gix-odb-0.65.0.crate 56297 BLAKE2B 18314d69f45679a47b70dfa4e3a3cde434457f0740b0388d900d1b18457ff82413766924ef3f8d51a4b1ecb35b2f4531f5d3a5f0a98749735c8bd51a0b358376 SHA512 da72e4389ebf670238bbcce1a30dbdbdfd48b2b5ba31a6d3c2d78a42a1092ba23015194f62abe7c23417e662f8dc557f6f6e8a875746c6abdc792653f0eaa99a
+DIST gix-odb-0.66.0.crate 56319 BLAKE2B ea576c9f5560ade09cadf1e17d296823e6713f5433c7e626a1a4407fd02c29b494331cbacb12e2c07f02d6579331ff1db2ad3ff15ac163e1a2652761e05e2947 SHA512 ea092c6f669ecbe21726d7fd0399135810e4dcb6f5646c19dac179f919c602a6a2d9a1f7fce17b10ae5ff58f5421e7965349a183278613347ca8c0368cedb40c
 DIST gix-pack-0.53.0.crate 96726 BLAKE2B be3846b23a12622ee4e2d47abc11b061fa4681134fefcdfdefc40581da2bee60feee695fcd96dce64ef8c27cc7d0da6b5f99b270de94540ab839596a1f140c8a SHA512 d7297d16b3a1aa5754a998f8c98733ef0bc498b76c2093585c6447b979bf63c343454e4dc9f37bc3afdaf8a1b5173cf16d60854c7f56fc382f27fe95d735ac2d
 DIST gix-pack-0.55.0.crate 97447 BLAKE2B 3d996cd8b5a0de78327b1bcbc90d639cbb61ad72c99f24398ace1467fb069be951de144e4faacf9939a18729964bfa9eb9af1338607bccb33f866c5705a814c2 SHA512 315c93bb976728fce776d8c3319627a10a8affb70c75a4d3ac92c0738e6b08b834ffc22c677c643eca8fde4135918918dfa442e88d3041ee187199a07bf4bb80
+DIST gix-pack-0.56.0.crate 97454 BLAKE2B 2a57d84a02c95faae740c29b4a87f86fc17255e57659ab794602ea4ab783c4eeabb898ef489a2660c0db50fd2baea222d2a2b85cd6226292d7d2d460e3b5eecd SHA512 23e23f19d7284eec66d21d5965c277e28a1e243a51b38f59971dd41046535524bf30cb743247681c06b23d202a9894e2068a4da31de5af3352845710179b6686
+DIST gix-packetline-0.18.2.crate 21148 BLAKE2B ccff09892d256ca930a8b589294a66eb13d922dd4ce7288440d1639b34b50c1a2b650105bf483b44d2bfa89edee3bbbd7953f5ad6301f9ba1e8325d1dc8cc0c1 SHA512 6a68f9af368f607218a4885d401e4f0bddbc65e5eb4e2addff32766d9ddf6ce804efb07bb67af48b60539787d979196cf426f8b4389aab4f99ceb79ee621fb1a
 DIST gix-path-0.10.10.crate 19714 BLAKE2B 332b2ded54a1355ad1c4f9a36775339bdb1e81e9948b58a39178ece96afe7ff32fb1263337321bb07a6749953c571fa63f047088b6b0d0d5757f812f4de94c57 SHA512 f38c3d12e4be24c7ae436136ad61db2461308dd1a2c58af136b5bd73658c46432faa1d3de88a83ae9763d81a809fb9189a7dbe5e62c9ec4e9954b560e42dc390
-DIST gix-path-0.10.11.crate 22554 BLAKE2B 8b16554acbedff39d7dc83ab0b15c5162377af41ad27a612f1fcc4d55ed5dde5a7c018609c922ff6b928c9c259b29090ec13a8f37ed39dc0207d6ebc6c8b798d SHA512 de21b58ab2a5a0b22175776ae9bc5b313e3fdb4194df74d21bb95f4af68b2df279fccbd6df640fea95d631cf349f8b717afd9056852ab92bf28d6f82153ca191
 DIST gix-path-0.10.13.crate 22831 BLAKE2B 23d0d228000362771349cbad65804b2248de1b42e202ba26cbdce4bfb2087b25def13012069d163b273574a1734999928109bcc400afdcf2e2d89c87deec4886 SHA512 7bbe2ff099523869fb8c3d3522988919798ae2ae77188876ef1aa86f2ad484f15ab8f7563eacbee9787c88dd23695601982b9574474f9c1258be2a271c737dad
+DIST gix-protocol-0.47.0.crate 44961 BLAKE2B 68d8ab6ff855bfc8ed9e160be2b850d32728a482a73204174c21d89ef095dfd6677ca291b6a6df9f4033e761bcfe03f72a9a25b77212763e699c56835e1d2193 SHA512 e4d1288b4a31da830d35bb173483fd3357288b391fdae7422663cac090a49e6a92dcae96b3320afb5d1f9b8fd1bc82cb47d8c3464c3bd887135cb563a2e1bef7
 DIST gix-quote-0.4.12.crate 7055 BLAKE2B e3bbcc1bc1ec169a4d9b36b1fa23caf559bf70bef14a485c2652d59b4562c514457c14ee4d2178e0f564560c310e5d304af993c587d6d352d0d6906dde4e4bbf SHA512 904da737aca01dfda12453b3593410e9aa49b852b91a7d25298ca885be0922d9498fd622e36f0601de0fbc7b2706e73e79f8281e74417b3b7084dbcefaa3cbec
 DIST gix-quote-0.4.14.crate 7828 BLAKE2B cfae180c1fb14e2461453a7ffe83644673cfe99ee473d7788f3202cf68a36bf75ed6d08827d8e12ccaa9517bb6240d64bf63e68a19775b93ac21dd4578a669e9 SHA512 e88ce5f3c6712c3026336115f02628ba35aaff78e39b65ea4749a26851c22cd8ad3da859744559f9fd6d89cd54075b18b28868397d50b6be30048a6a80e5b8f9
 DIST gix-ref-0.47.0.crate 56887 BLAKE2B fdde0491933bdafb55d5fd4286437ba5b2ffeb2a367612941c999a9e6c89ae2ba86a3e715107729ab421fe1088cf97243e087cd99c56de74ed6bd1d19029a762 SHA512 cad699ff3dc647ab3d9766ba6cccd2b041d1b889955f22eee12e49bb2cfdb28be423646c93fb5b4717280e4655274f3308805c9cf96c46ccc67249f3f57ddebc
 DIST gix-ref-0.49.0.crate 57854 BLAKE2B e6ac781567602736e81a83ce7d95e505e7a52c614b723b66af747fe6d55387f5a756f422d634506553348b11eb5eb203928ed8ef83656e31d5f781ede2cd45d3 SHA512 17f619a5d85ea4df82584b2b014403a1fd16f35aa2d449113422de816bf66bbacd3d0e7cac17886973b1617525dbdcbdcf6cf9d6a4f9760aaaef07ab86bcfe2f
+DIST gix-ref-0.49.1.crate 58105 BLAKE2B 2a5514d296d63451a21750c5156d0f2dd5ddd5ceb03aaae89f644c9c54d8e4eef348661c0c516db12675b502b894d5726e555b69790d1103c2dcde4e0c3fc68b SHA512 4554a81fc260e09f783463ec49f7b298fb38ef3db131ee6bb8fde02a23769e6510c324a1da68b3c26b4425833b57deadd9df24898f9435ff1b7e8adc765eac15
 DIST gix-refspec-0.25.0.crate 16162 BLAKE2B e59fcd54c754b7a480a82906f88ed3a7a3c7a94e9905f78b17bacda98843df8512183773f148cc2d43615ea19d68de1648bd8f76aacdc491cf1526873d86f3ba SHA512 01e05e76304dab410633853462b533ebb3db768267eba3649c417c3f0e512c315433981973a613f38c172f024f1c2517a8a842aaabe6e7258af0b7bf916e5f97
 DIST gix-refspec-0.27.0.crate 16887 BLAKE2B 70661821ed339396c9822c71fefd368976c60bb0b44a0a92cfdaf2ecb7a81ea86007cba8b7fc8ae15b4e8595ad17b64494df7c203205b4fc4e3f259d07be2055 SHA512 6ce8515d40a159e1a69bbacece67fe86e1a5b41e4a7bbe3a4f772e91cf19bbf759a63ea4f39c102d7d26c76f590eb291c7228ec7b4dce84b5a859ac92523953b
 DIST gix-revision-0.29.0.crate 19189 BLAKE2B ba34323b5f2d465a791ae1135ed9ce1b2801b60e93b4757a1a5b407062326640eb44bb79324053f62c3f6c84ac5dda7cb9f54c50cbacd368a13ce6ae0ce76919 SHA512 85d87440b8028ce17125b3dd30ded2785fb3d810c58ddec727c72fe5270248d7b9f321ccf46d274bdd05e2d238084c6b6e54ca7e3e2a7d9e44e091a05c961f24
 DIST gix-revision-0.31.0.crate 22599 BLAKE2B adf1207cdf3ad11627b7b710f078db7e0cac8a659971767928c7d2af43f49b21dad31f1c50e8c857f8a34dcc897616ea88f3ea9ba2257d0f69975648f0731c22 SHA512 c845796524dfd18e0f8cf65fa46ce6bf1515cd5c1461746ad06982e3ed1b7bfbc17fa28ada547246be76a5c0f5663746c681bc1f79c484862337015a0ea04783
+DIST gix-revision-0.31.1.crate 22665 BLAKE2B e6df6851dfe9a2cc50d6008b47712d5377fb2953ba80f86d2fa4808b5a2468e6f5502e5c4f5e32eea65cea8b8c9f936f1d5e34e0c3a7d20d6eb20b8942dcccd0 SHA512 78184de8151dc892b59aaed72ac0ff985601e60c40086a2b693ce03e8ebc990fb8d39f66f38ce952fb1caa928e71ea7caa2927f9a582e607455ef3fb4e5a95d4
 DIST gix-revwalk-0.15.0.crate 11849 BLAKE2B 341884c206f5e1674d5b07411369cbea74c154e5b98bd26395a1986e6cfb84c9b361504b1bb52fb8d43176df98af91e5165810ed88d4e451c90a0d779b021178 SHA512 c9fc3a3c16892743ed7b65c35f3f22150f7b5c6cc2c77d92a7c1ff25c8cf3a0d6236f0462de5c2122fd1db7d92914a5841ac56b7090ea3629632e3c1e7f76b00
 DIST gix-revwalk-0.17.0.crate 13323 BLAKE2B 8c83a8a0b27a889ffdfedad5a1705adcad8cf47259d99bc2e78da67b728f2d7c63a6da3347f18740c90e49dc04b2d2cf5af420988e98c7d69c9a7bf392c21a34 SHA512 f25491da946632fa1ea973c794aff88ec8edfa16a929e1453f8f009547c71299d829feeb1dcf4e5f7e3016f0380460030c5cf7f1422f004d65461d911d4ea99c
 DIST gix-sec-0.10.10.crate 10205 BLAKE2B ba1a7e2f955a54c6bb16fda361e4f7b59ac2ceaa044aaad09893d913e3520f4d40dcef62d457143280b3dfb76ccc24426badd38c4a0e19f35f2505dcbdfbc906 SHA512 0a5733e321e05ca0774518bdf2f171fcc8c63986269184a96ac9faf3d8b14b87c3cb31d731f80e84f098e7419f278d9dbd3b952fcf1150eb952e38e85d799189
 DIST gix-sec-0.10.8.crate 9400 BLAKE2B 1d7be29c2a510c6c5cad62f54ff1b53fd3f9df5c0075a86cb9e7ad578e8962a9ce6e5ad138873605fe80ef42349ad2cf087988b621bf96dbcbcc63a1f2fe713e SHA512 21d244b71abc5ca3b61b05b60aba61e86d5f674fa738f82ea34e0f04c21462683a505e3d692eb323c60a8c532bc639798b1b1cd7fbbf9cba2636c2efdd40abba
+DIST gix-shallow-0.1.0.crate 7545 BLAKE2B 76761739708eb5e0dae211cbd10c7523dca2635a94a152c59e14cc3487ebfb2d2449775af510b7e0d64aa9b48dc1a05833f4bc64ae292bf5c414f49447aac183 SHA512 0f8c2fac75bf1082d51059d955e572aa5986a1a1ddad0430b707cb6f1a61d913284ae3c701aaafabc5de01b87fc55492d4e556cac3b504cb0e9f02f0996c8ca9
 DIST gix-tempfile-14.0.2.crate 17489 BLAKE2B eb333777a1389e189b1951fdbab987e4e39c44428fdb5a4cf6bd75e1e963ebb9fe47143be4cb4892ae6524c269e58105bed6463f9dd28d8fdfa57ac7e938f38a SHA512 1baf8a34eacf5df9125dcf0a03b804c5d44f12bbaa93498478bec2a99a7fd64d052a69ecd5e568fb88ca0113c3b8c72e1e5cd8ad062acad94e97ee122898c3c8
 DIST gix-tempfile-15.0.0.crate 18426 BLAKE2B 11d5484b4593191f2579da85f20cd2dee4527e056a9f5dfb35873ea09476b1fcc0ecac821c75e99249938b4ede627d153aca6c1a43e31f46f605ce20265ecca1 SHA512 cc21ef833ee087e6b49fc74da11da3e4bca55fd808952e1283db11f97e38b2318044e1704e78dca2e4eae9e5b66eca039343d78bde7b4b5d4a417190c62c3ad2
-DIST gix-trace-0.1.10.crate 10403 BLAKE2B cb0e81e52e4711d77e1f0a2e1df5053fef8e1a520a38d5b929e28f0c9410212d67e169f007426434b63728a0165c0a67fbddfe934c0c867c147f8213f6fc2a79 SHA512 2ae0c76e563976d491a4ed7ec198e06559d68fe8d4b5e6ffb1381931aa0a8ffd3752249f9c030f13be0587324ee5e4d6ed09f9090d8161b24c15fb2a4b3bacb7
 DIST gix-trace-0.1.11.crate 10424 BLAKE2B 3a8fd50adfa33200691d9bd4143906e78ecd0a6ab2aeab69f3b797f7c55f650032f99e7501247373acaea1da36d86cbfb5a9d0ac3cec0fb89c1c75b98f02881f SHA512 11c626d81d73d21a4cd5b0bbc6d60c839331ebcf3c83850e7acdcbe8968b87bbe5ac57290fc33a2477843a9dce07903a86c519987b68ab1c7dc474016ccabe14
 DIST gix-trace-0.1.9.crate 9659 BLAKE2B ce18f59e91f4fb33346869beb2b6f69721d8b374a3a6f583ff77f27b21126f359c812449ea5fff9da00f688bc59e1f32004564a49c2a179a33d4fc184b8ebd22 SHA512 bbff4a4ec60e639238ab0f2623bca6c56914eefa321c8f45ca37507faa431f15d743832facd026dd3a9e3d9aeaf21aa3dd6987284a1876e20000888243cfc0a9
+DIST gix-transport-0.44.0.crate 50856 BLAKE2B df16a043abe38db0e6d983f5376ad24ac604a9e3b39fe76133670147de08bf5b8790ac585d12439602c04fb22f356715767facde63fc568611fedccdf8fd712c SHA512 a4f990e44054d760773b8377b648fe2757bc30fc17193046049ec4f23b88f9e715678ec689f9db0627245b9daea83e29866f145bca7cece9e4c5b149748b9ffc
 DIST gix-traverse-0.41.0.crate 17286 BLAKE2B 539dbac0c545a85123356627d0e3a43c65e8d9bb5efd06b631c84e8efb611f8221b4701562806df00e1276d3c85566c975209e3f2d190f04ffbe65aa4dbc0422 SHA512 1f817abce2b390a517f9ed192ee94c15f11bee56cd0409a911eb0fea1c1ba97af475d308fa15f4b07a0ad3f3f8ccfa54fb67d29e1780b67d3386df3dd7edc627
 DIST gix-traverse-0.43.0.crate 18410 BLAKE2B ed542395a5645181d982e716ef787908edb0a8c598ae1ce80dcbcd57a66c4f3bee4e58f12e6d9811df2c64b4d06fea4491a75a8fc3363d695b4fdd9002cc58be SHA512 f2b1c37d57295c98717c6da7f0bd3369defddde0f0c559660f2c647cc83cfe0ebe49ff8811d37ba7a71b502b1972597d40ceadd1e022c026d92f3369b1f7bfee
+DIST gix-traverse-0.43.1.crate 18569 BLAKE2B f168f568e281d266d09e37a3a696e0f58898b28841840ad31a8a01c4ea2165f5b35a45e39def84a3dbfb4842ee280a27078176145188ad0a8273ac536056ebd6 SHA512 a1c9ec18788cce7ff2a93a3686dfd546bd83dea6abd0131509ecdf4bb643b62558b51f1deaa479a1ff86902dfd32ce80ee031f5fbe87e78ad119040308218402
 DIST gix-url-0.27.5.crate 14367 BLAKE2B bb66a9e9cb4ac227f52aeae0cadc01d53de785fc75b618ef6639ca9cfbacd13a9dd63a8eed8152c4b75bdbb6f9760285b157bd4984ea7e995e3177806177695f SHA512 a007a074ca98dec95ed88e19414e55dbfaf7aa5c7b219af2d54785061c761642a3f88dddc52eed85d2a32e2eb36b371ffc6df16e12de2159c5ef2f20ffb4e85c
 DIST gix-url-0.28.1.crate 15075 BLAKE2B 2d1e78445d38d7317a98871717751b0b95d6b1244562aad1d8308f68a45be8e02b88db79d9d2e944b6a65190419ed2a8018bb6ab9c1453659f047dee16d40543 SHA512 0c1a65af5653564ee717665a6deac45d8215852d8bc0189c07ba2ceea41edd897e325b43c248eb3c94445c4c8824395cee090b22b14c9b1d1973aef7467688c2
+DIST gix-url-0.28.2.crate 15297 BLAKE2B dad48c6e518a8a2bdba4ad665badb9935b352cfca7d1540c9f652e9ad450c556a0416056dd153e8f6a2e418845b6296b1a66881b0499aba8485e357a2a329534 SHA512 39b56a5636ec1a490bda88cbb7c0cdbeac2b6cec1f0b2ccafee7a58ecd3e412e61a14747a4176c09e25a666127e7a4bf8f3e9e4945f5af2715a5b9f52b8322bf
 DIST gix-utils-0.1.12.crate 9418 BLAKE2B bb51d3d56670350b9512f7ab8e0646a9390fe2da4b4e2888e312c4ee0a5c935d8e2540dab2883159d5bf164276cf29505914451b5761777fc5e770ff2fe403bf SHA512 5cd4a93a6080eca6e84a13f9e2d63c7c6215cc86c6662f1204fb8d6feafd94cdc6b0bb3b6343e24157b10edb9504d89fd479e707a4c7a017372f1f1530e6d672
 DIST gix-utils-0.1.13.crate 10194 BLAKE2B f9cd4133cc98548d3b4d3c8b43f62f1b84a3725e5de1e3875c6a989e5d3b6fd7086329ba2bb034634414900980345958b0d91a94c87a703956877b9ff787728a SHA512 b30d983b14a7350b4d644a84afda108df34bfc94fdbdd643a68c9d8dbe7c2186de5f6d87e7b31277c24c38ab106508d8dd95a253e232f3356fb9c2ac8705688a
 DIST gix-validate-0.9.0.crate 11204 BLAKE2B 5e6090fde2f6c60233b51f40458a06c8c62eee55d0ad9cd1da5d27ab71959a9b243eab8bc21f02c34c764255094f87b8d3c496231e8405ac8805e6eb19bb9903 SHA512 4f8eb8bd2c08c7ff07f523930f37c29d47be24d921da2d9cbf78364478d2044ff0fde1233d0c5b881a6a2018fb1270121707351f2ba4f630932bac08b596b822
@@ -133,6 +145,7 @@ DIST gix-validate-0.9.2.crate 11923 BLAKE2B 5f49496903a0ac439a6cbbab0593eea90ed5
 DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
 DIST hashbrown-0.15.2.crate 138478 BLAKE2B 453888ce68b10cd6e93d787986603fceb29b83fe2dc417e7e57316b9e0060d0bba51ec7fb71d46a038662c99f60deac8237a8f349297208d1d223bcc13f0d0ea SHA512 d6fc0613623f9313533dfcab1240e97f652f78f05baa21419f7edb2eff030c4a2c5f426d3eaae747923cffdd8aa9cc2648340e5fc229395b5eacc6fae087c8cd
 DIST hermit-abi-0.4.0.crate 16310 BLAKE2B efcd1dee7bcd6d185cbe0051c7bc7e2776857ffcfd2adc3fb101febd7c1bd75994b7e4a4a0a59c5b4628cc2521b4c1f043e98a0c44935d0180e7499667690ab8 SHA512 b1a21f6d54598185a8e8c29565ffc2e1bc5da57cf1c9d87ba643d23d7c23d53e8ad36ee2f5c1ec8a504334b6f98b0f17a832ff37877c7b7f9238b196f4034e6f
+DIST home-0.5.11.crate 9926 BLAKE2B d9c0d3660aa7784f3a26f3930a5ee35dd50cd15b7e252d930240ff9bcb70fdb0169f78c02b5fd82318af8c398d7139be18d2e9675a1b85c7845c90266945da1f SHA512 cd107c4cee793b6db8b29157c3aa2629b5ef1b9fe129fd903fe414faadfa06a881a1b685f1c66fa5aa1deefd3013a210603c952bfa4bf02d5d1f90f75ba9ff18
 DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
 DIST icu_collections-1.5.0.crate 82762 BLAKE2B ab89336790ceafe62dd72f0aaef16a6eb47fa5e41424ed990e6c059ad431cdb3dcea943436aed0bf9c6eabd7aba12d255a2233fbbcf9cf5f666ef1dfd5b79a16 SHA512 127f1c91101ba69405b10a2590579606df766166fcf1fe6aa9a74c4900296425cba5c47a391a53a01b02026af5581f068fce4a7a400179809f7ed9922b94c0db
 DIST icu_locid-1.5.0.crate 55131 BLAKE2B cde2b988f0af200b8e7851a66b8ae08881670ad6ff79c5caf5135a04c200e5ecd0acf27d8856fb0fce46d502527d506095f469c28f325b9b9d21d2a3657149be SHA512 4b85f0e7cc73166a542b2e502b3ffae1f30d2a9609ab83acf98e90b0edb37fa8ae4592f61ecf48a0ae0779fdd376abeff59e1d5cb97475012eda99ce2a97da57
@@ -148,31 +161,33 @@ DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e51
 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.4.0.crate 83544 BLAKE2B f4b3e1b877c9355a491e33d10e3ef730f943b54bb14f33ed476120e2a8f0cd3550f6aeee1a56e1868881e1853b3d41283ab803faf5afbf32c86b36e08e7f2026 SHA512 9c7f2b495f0568ce56e2fa8d3355948783b490b23b46a83acade2864e41eb31a50cf372d818b2a1d3d24327282a9866e690348134a20ee481d748bdc581145ec
-DIST indexmap-2.5.0.crate 85919 BLAKE2B 766da0a2ddc406e3fb1a70a0bee00141045ff72b52cc412adf05972ccef59d416f502c429dada111461cb522a5c442087e01d8fb235c2f1fd5493adea00e79dc SHA512 c4627d43b1bc5c5fd64861d1a7ed66255ec3f790367028b2758a40751286d6677da7170cfb04dd88ca4c2d163df621583d2e0dc4e9db6d7ed9bd0cbea42b1729
 DIST indexmap-2.7.0.crate 85335 BLAKE2B c7430ef510738ac5fc4658f3e4d927ca5cde780774a07848791ea87503be09fb4677c52803f6cdaaed73eee600f47e0595ac3db74a498947d0e180cbd10fb7aa SHA512 efac370b9f365a49489aa2c5406eb503044a4df7d6ceb772e0191b02244b6c2c1bf6c43ad4c8924160c1a2bd76d46c630b500a1c4252fc52366295d1cb04b48d
 DIST is-terminal-0.4.13.crate 7665 BLAKE2B 47a024e135ca4931a04a8dc8151f999f816ab50c924f17321af4295dd84fd51bf98ff057de967e646a461c1cc9ffbfd7ae245a9021b3a77f3812f43707b44aa2 SHA512 ea5b18dbfc965b96a27086eabc070747fdc557a6a9acd06203164e846c2f390c4bebedb29211ec008e060dc80b10f53de6d6cdc822d4f51a543057736fe33448
 DIST is_terminal_polyfill-1.70.1.crate 7492 BLAKE2B fa663f858ab8e5fd56202d731b572bfdd4ab0e8262100424e27360a9ffd2820182bc57d6718a305ef82d04c3798111841c0d9f9dcfe219765c0f63edb560dc1e SHA512 4730fa09401cb4e69c92b38b2b43afd74699c61f5bd7b37605efbc0c08ca7a1318d43e4a844e46e0f84f83f42432f01e33771be2b18eb5977702ab9f894837e1
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST itoa-1.0.14.crate 11210 BLAKE2B b2d33dc384757963eab3ae7d80bb672d828a549967986e3af8c70fe71a0ad46c4a278da2db4dfccef99e804e6cd4934067e97c0697a33ac3302cafbc46eeb416 SHA512 ea2d38df373652ddacccd11e610dfdad4e3ae7f0d476514e6ac58092733c817bd834e8cd88c3bc4178dd5a646ba628ae626195e0aa407e8534ae3c2a7b049987
 DIST jiff-0.1.10.crate 597545 BLAKE2B 0c8051630e0500a3a2562049ddf187f7d4e50415313550a3b8e11a68e2020286c51d7e087626b323d13234714889f3e5b6d3295679857dfd8ec82d07cfdc4dc1 SHA512 1ea189b54a6541c0782d250122d86759014c629df13defdc2516e003d0ca1c11cab54540cbe0c9dfc9a8441c5ea68718c1d2ecad04136a49590e93736a9b2131
-DIST jiff-0.1.13.crate 604330 BLAKE2B b49600f8fde014e6705cb792075b1492c816107161af5d74577de5c9f95db4362d2e8e4493969852c665da5dd72de9c05d42e81cd5ed2869a7245997b14a827b SHA512 70025484872505d2ea50e59c463343280cf2ef5041a1a166f499802022d8ebd1f7ad2fc6ed569688a7bea097988941f21ccb1bae690c3924a6828381fe05c35d
 DIST jiff-0.1.15.crate 608038 BLAKE2B 7d70e9591a5915ffb7ebeb1038888e27f12c58973fa0aace40f23e9ec81628501a00c214c8cbe47a34cedc7347cc660a37db96b7a5f54fafbd98d8b129f8cf85 SHA512 42f173c8f9b819c400325c9c50aa5a0808617d900a97bb3f61d55cdffc0a013cff356ae61ab15a39917bc366221968e1479ca072330af8bd145710195c47404c
+DIST jiff-0.1.18.crate 664063 BLAKE2B a12bb8f9fcbb232258ae3bb6ac21722d58a3b99ee039bdef829adbecd39520a2767ab3f48dfb8d0d0bc53ce8b1b5e2faca73d762735a3520b9fbd9faa1c096eb SHA512 76338a44d4edc7e0a2a99ff07da572b6d5891a962754ab55842a081e963506521a4f4392883d2def67a9d7588607d15fe9d053765b47d34305f27539eafecfd5
 DIST jiff-tzdb-0.1.0.crate 81551 BLAKE2B 2c9018e13f1b641795929611c01ade24754157604d1953b8fab334444c454848d68bc89c07ff9a4d6ca6b4a4d1c94e93de3caf9bfc962f99ab95686aead6a249 SHA512 a8804be90937fc0ee5db685f29403b497ba95354fde06c9984a464eef6edc785c11b4b177f5f05a05b0acecbdfa6163d24f2e2ff60b4144aad976ca2354f8cad
 DIST jiff-tzdb-0.1.1.crate 82030 BLAKE2B 2d1b7931608ceb547962987f7f7abbe4d0eb90bc1c3d62c8dabe7f0836126ca58044a459d55e5dc51899f118b4c17cb08b8dc48f49b6a95c468446918c941fad SHA512 97717db33d0a1399e69077ff4c41af06abeeadbd3dde60ba8dbd649413f6f14c35248cb93ed166a4d5ce7c5133c6ae9aaec9d9ec19d7b25f3272c76c6f1596cf
 DIST jiff-tzdb-platform-0.1.0.crate 2949 BLAKE2B 0035af0307068797dcdd2db75f016135ce288ece6a7441009165925242361e5974afcf2c4b16175d2a496d9b4890e2f355682a101b197d3888598fed1b2e7afe SHA512 eaafaeef311538e1162cc9ac2174c31ab56ece0a8e7fcc7de536e66ff1687193dc6f697dae111c60989a230dc303404a3d30dbc11eaee1eb639fce52809e49a4
 DIST jiff-tzdb-platform-0.1.1.crate 2945 BLAKE2B 848926e0a950c7667779242e31773a8972643999a12576cb7debea7bf7f08860a3df1d77f800ad074f32308ab8a3382d402f330551f27acd90c70c7c68785cae SHA512 2a9f58e5318665cfb9864232dc9dd28bc816a27e48d06578bf44e41ee99524efde6471ef6268b99383caeabb2c8bf37f69f6c6b126d35fbc3ba9944aa6777f2d
 DIST libc-0.2.158.crate 751340 BLAKE2B a67318ab24bb86c4df682cdf846d51f5f0a69504567acff43cc6e724f2641521945dc75dddc10c1c265fda960cb28b528575b5d39ce321073844dbddbc77bdb8 SHA512 c2d90d58480cca3464db475d7c70cd66bc1492239d8183038b48def8f5d8a437a1e2a2f084cb2bd9456889221b10aa07981cd5e9bcbb6bea28a2bde3c76f1105
 DIST libc-0.2.168.crate 757025 BLAKE2B 2597fdf5a77345754b8c9168d9f07f83ebaa0413262b94ebb19f976f49cc2c47893e788ee2abb3d00a995bc8f99b6ebcf24abbdb320e18037e779e1241599b44 SHA512 499f7273ab5eac0961fd927d5204ff4d5b3b290c20d00ac99054ee596b6d3ec4d6712772c52b09c84554f0514a8f66b41995ceb5b0ec38a7295a4fccf0e94349
+DIST libc-0.2.169.crate 757901 BLAKE2B 1012cf93d8975aa20fc3f2332e253426ff66be6aed63ace5292cc8568ee419b0f1a4b5b39ddbb78d9c2dfd8d72eb0d068c98faa229ab55556da5e674429f0e97 SHA512 c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce
 DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
 DIST libz-sys-1.1.20.crate 830422 BLAKE2B 26265b1faf04f7d0cfd751ddf003585b1be59fcf8fde3ddfd86f18cc3e2d5c3b62a808f47c01329a57759d14fe6283cd94a72eda46d5c5031249df0f1696ab03 SHA512 9b537e7c01553e782be145223c6d174601ade3a950bfd0eb4ea09658da5b8910cf0d0c5984672f9d198f73d5aa63d21e0c20c4c44ff7d0a017ee11ae4ecf4859
 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 lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe884dd69c61c54dec978733b95a853c3e5af26f237e48ebb4ee9dbebfce0f6c06067f74a3d122e92f5ace40e22d7 SHA512 525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7
 DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
+DIST maybe-async-0.2.10.crate 22107 BLAKE2B 2b8bea636cc271574bad08313b86d5b3a2163199addb0b6320630655a8b238d811db302f1c9c7168bed5963f0b55a90554627c48f59ec2ccfd5674303b1cb344 SHA512 c41fc42385a47706167fa9c51fbd2e4dac74683c362d66f71705de4125dd639a518207a2ae4cc3e5f913279ea205d260b0ed3fe2edbce68f27ddaa9e9989e59b
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST memmap2-0.9.4.crate 32752 BLAKE2B 1b21af908061e6fe09484ce5f84d31ed1751301dffb6439512b38c53f9f090cef7541b591b968d0207c6d8351ee4d5949007caef7832ce130ffda1b3716b5454 SHA512 8bba078dba73253e8ee88f0bd2202dcd2afd0b7b800d08af8af593b882cb4acff7e297a3f299e253f5adf103893fc390dcd73e882a2e7d93ca96099fc2eace4a
 DIST memmap2-0.9.5.crate 33280 BLAKE2B cffb232e313c40c6a698ad6c9e6bf140193cf1cd4dc003ea6da08d748f11001c5426786f741dfe23490841350363db3b9adea927f3e40138b36f2f4558c7a113 SHA512 947eeaf7ded7241a256fc2b288013585f5034a77a18c8621ab01a4b47c0ae6e9b9414c5e9e2f2d47b661f8c6966b1ed0d159342cae80cf45e51629949c3b1337
 DIST miniz_oxide-0.8.0.crate 56343 BLAKE2B e4abcacab4c8698d0489faca8556faa7bff53d272ea0c80e2e7843dc0f6f9229b7d5b0a17ae210344722a379853e7f14212505ee05da4e60549081cf77717c1b SHA512 044b641ce6d98d1968c1ee0906f91963f9f524d6f3fdf3059708177a759e1d498c63e595d3a3f0f9f3210c45c828b9b70274134ba078b899d7fefc2bbddbeee6
+DIST miniz_oxide-0.8.2.crate 59068 BLAKE2B 22808b2137b4afae29cc5cf25d9f643d24824293524542e2cbac3ed0fb0341417c052310602a6f0a003843abdbe7715a95a6068c807cc0c843ed867958650215 SHA512 e58802e332a72123954ba1751cdb59509789bf930ad74da3d06e2c1c3737547fc0b9848be816a66b6585830786b7a0fce7c9fb574789e15f3b540709563cf854
 DIST nix-0.29.0.crate 318248 BLAKE2B 3a13a88375a359cf77b28d7f77f47f178bd31ef74b7627b6701bc6fc601024706be4e9ac1a076c7cba26b64d3bac4de17aab45fe3c045aa7a36e2d9232e872ca SHA512 86c05084aa0e6238f8d48df0f5ce6e6d7661b589f4f3fbdad43387c59c0d6afafea4badf25d31db1611615de19a0b9ef18ce614846b79a47cad4e2c9367dbe7f
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
 DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
@@ -184,33 +199,34 @@ DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac002
 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
 DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
 DIST pkg-config-0.3.31.crate 20880 BLAKE2B ab7676e810751f89639b60ae70bdebe1d57edc76319f83077c3680049a701a26e72e8cc485fe77cdc4346fe3571d32c59e7384c8c86fef17e00d7d81df5daf43 SHA512 ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4
+DIST portable-atomic-1.10.0.crate 174760 BLAKE2B 9a05d6162c95f5140709cbd005c1997449fb6373700e8ed3966e3379898e95f3cbdb90b387f1c7deb3f1eb33125378852a7168d0d22b433813f6c082112b0365 SHA512 fb47ab53fe240d5b0824dd068c6dda473d3e71ae6f5dfccaa17262a8b6de0e1dde05d83975e53bbfcf43f10ef5c634fc024f94613937927ae93f1adad1dadb19
+DIST portable-atomic-util-0.2.4.crate 47043 BLAKE2B 6a8e122bb2b9eb8262e9eb790f336dbb602f6c086f8ac025740c043170360d5474af578b3842b06ec51535535de3f4d1b6753ec54a6871dd0396f5c1012b0bd4 SHA512 f2266e78576181123aaf68e7b5d3523a368fa8136d447bac68a08d65c7051dea677cea84491a1a03b9decb4704b2f9392574d68dda9427092a2ac92cfa0affe8
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST proc-macro2-1.0.92.crate 52353 BLAKE2B 9aa29fa6f1c56c0392a94a81b4c61953f4d185012cdca37e356817845535da79d7094bf43472ce63109ce479a2fd0cbef4d802afd61daf92c4db303bcac60e7e SHA512 e614f08acc0a7e97ef580479cf5b682378df1ca16f09bfb2296ebb3490a435229dea9d682c621c54ce57e8e1d3b7803eb8ff83c88bd02e07228dba6d02f14aee
 DIST prodash-28.0.0.crate 90695 BLAKE2B c4a78e86174003e2aa18899fc9214acfeb04637d2b90d64eed17d5dd2569fdb4a58991c23f6e6fc21549e4412eacfab9dccc50a8e62683e8d91a922075968f4a SHA512 36a9099fdb61f604d902d28f7082195891056af916727f7d7b78986dca35539238de0c4816c96ca2c3e74fd04f503c59599988e95be46f0ed87af70ae8ef3c70
 DIST prodash-29.0.0.crate 90594 BLAKE2B d35c31cdc949591e81e73e5cbdbdf52a46d3bf2d7b05058c28d7924a9a8432ce377876a310cb0e49b3e7fb27fcecc294717def09810865e621014d0d1092ee8d SHA512 d7d625c4679864183da78c3c036f84805957db10f63c52480e9defca3bf4df23476e65dcfb5a9cffc46983db96a97a9dde7aca119ea0e6e9b1889770f7072705
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
+DIST quote-1.0.38.crate 31252 BLAKE2B a3836efbe5c21dec70c684002b47b8fc7cef643c82ee903b537a48bc0707a28106c4b33d98e60ff81e04c7520f7404b1dc4d49446e8d91dded517e476c36e1c2 SHA512 530c47c5e6372b508bf5b2b88a138408a7afa5ef52c47280ed20eccf39f8e97dfc1e0a18c1bd5472efcdc49a7a1e69566333a0a1b4c0b4f0e11e6a7a85bfe8af
 DIST redox_syscall-0.5.3.crate 23830 BLAKE2B 0a38235ec277144f0c3e7bcb1d273c7f357d85aef33dbd06328ef16bab7df0a07b523431590899ea58d55e8e1d84c32392478530200cca3a9483e8a47b29e233 SHA512 777d1208004b7756887d6c5745ea408972670e59430e1d299d01a463ae41b98e0920ee77aefef8755fc949d4799dca679afaaae9c1a7d060f76f69af5b90427e
 DIST redox_syscall-0.5.8.crate 26319 BLAKE2B bd69a69e2a0f3d84843a8f76199ef6b3991698ebac58b23f69c26d02f5f3e24e77a9d5e8259e9fbff3887f06d15ced94ff23b5a3272ab475918e6e3e753dcde6 SHA512 5f9632f1f89f4963c36ede4da9b955c3474b673c3414d81cdbb61f46c08eff67167f703a0b06b239beeb2d720f8fa592a5493c0f7e872728b5b95f561ff11348
 DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3
 DIST regex-automata-0.4.9.crate 618525 BLAKE2B ee3fc41c8c445be4c1aa3e5b19a3e61efd641b1a24e7a1ed55f837c1fba9c816272cb4645c13232b66b170bc7c413802928beb22e3891500141ad4ede65b60b0 SHA512 40bde0ec91cc27bc0c3fa237a37ecee5a1f023dbe006a999c5888f8f578ee2c4c64d9edfe1827546cea8e92ca3c10f8b4d494d81f3d0422b40d90bca9cf598d2
 DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
-DIST rustix-0.38.36.crate 370932 BLAKE2B 0c4b963c9045fbb6fd2e4fc91888f574de531074a4a131aec9d8d2f44f3839778bce601050848d9edb2ce4019a94d3226835f7a776af682daf73e5cc52eb6f5b SHA512 2874bbb5fbba8b9fe883cdf21e9662e84f32a3fdf50c8662a908754436d16d177c4c01810fd08a01b2690c79bfeaf8abf29e5efa0987348d93671499cb2fd550
 DIST rustix-0.38.42.crate 378683 BLAKE2B 4071e1118ab8111bab9efef39c6e35f8a3030cb230cb3643df7ae09ffc750b18becf1f069c2714b0b6d13e334c12446433057fd015c9dec04d7a1372a354ae05 SHA512 438bf1e4663cacbc7c0af23b10ecc11c8b01c53e18c2e82a740c46b4a61f06cdd25d926aff27a9c39084c39d9c950c222a1a3a6d5878dd240554fa593fa762a5
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST schannel-0.1.23.crate 41667 BLAKE2B 3f34ecf4cc519f5302f0ab5207907a275c68e6fcbb47630aec4ed5d5f1a1cc7475f6d7a8c22361e9878002f9f54314c1f630ab0c1f77ea309714bdb7ada6c9af SHA512 dfce25e3b8bc09d8dd1fce2783fe02ec83f74697cb24aa212ef9369a628685ba488f821cb3e5f863798e0e59995038c8d748f74b89f7929eb8cfd804d5066b84
-DIST schannel-0.1.24.crate 41728 BLAKE2B 37c702a78572c845602e2481946b166b8a9f0bb08c0426f491f02ba98d358539a0039168c2a97a68fc5da2f870057b4ede3ada895b9483f687750319e139c8e9 SHA512 4e8085e9320befa3841981de5b58b214e053933fb5ac507156b1f22fd8e88142aabd42d40f52c3bf7d3864245672dadc4da3d9976ac07c75dcc8172cd9de1335
 DIST schannel-0.1.27.crate 42772 BLAKE2B 55b3cdf596d6d490fdbc10298eed7cb1b1bb8d6349ac8700ac2e7db66e1d75f0a5bea5b1b322bf30cc0f982262e96aa421998151a8ee1e620b5a09d25ad4263f SHA512 f469d03c2be014c248e7b6408f541584f250a9d58bc8dd8ff4d1e63f5720cadba1c0579b1e5d97b58844fadaeff10e9cfae6d5cd33c5de0fa4ebe699a8ead4a8
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST serde-1.0.209.crate 78364 BLAKE2B f6b4c2bd931a8067482ca033211c4e85c0dfd6084cb599c38a9ba666cce30489685a3a6a8a539eb6e41141a52328943dccbfe25dbd857af16665094fdf7c3f45 SHA512 25d2236eedc08fa3b9d078a1971df705c4f428b7a4e6a2d28d9f0f9893c19de745bffffe3fa9f3c08074bf4359aaf09cc28770e4b14c21c66d6a0b9411738f7b
-DIST serde-1.0.210.crate 78338 BLAKE2B b3621d1313312177a346313e6e384fe9660f74eefb18e6cffa39fc2aadc0ab73be84b9037c59b716e5feafcd73f4f054f83e6d17d82746984b3064bf8d3ed338 SHA512 0d853ca51543ae8b4a0c70204ff4e559a4eec77af3d3bdcfc75c5905c80d4ffd1bd9eb8258ea4f6ecfbdd26477ecac7dd698d84d86759fa32e03a9cce02fa4ae
 DIST serde-1.0.216.crate 79000 BLAKE2B 98c0f5cee2f9212c6b7620d2068665379471ceb7557d1454cab9b1c2120b526ef597fbb642f65440e70f92a4764cad33613b478bacf99138dd5bd51fdbdbee6b SHA512 baabf4c7aac4a540c9ed18b336662087258b71c9cb0e547c8d83a2734818ab2cbbe62f910d812eb61d3d46e653c41a3eebc99b1d679bfc51f95710c71a8ecc20
+DIST serde-1.0.217.crate 79019 BLAKE2B a0aacff795d34583365ddd469fa14c58a6cccf8afbb248210aaff3134c7ce6e34b3d03f437326d7c01b3e78f82a5d19c37ed9fa4372970d8b2793f2889288e1c SHA512 f97b3b54b9e99c9a027390405cc054c3072f49c92803a4ed5f5f69e76a179deda9d77993b645b3581437085912d881da88d0451b9e0da423c64033a23fdd8054
 DIST serde_derive-1.0.209.crate 56023 BLAKE2B 752bc9f46b880d0ed8a4f7e29ffde1343c63c4be1e9740afb1a28dcbff5bedfe077eb51c7052adecfbdbd9942c30b63a27914deb6401a2ecaf70fef0f64cd80a SHA512 22c4eb76412bd73814d0b86209b110b9e59626f64b41cbc250755144e545ff30fa69972ac93d74f988a3a6a239d9138f4e8a23b283c746a0aa5fcddfbe077cd6
-DIST serde_derive-1.0.210.crate 56020 BLAKE2B b346e574c99b6a8b12dfc29b20a4fd2daf8abfabd3714ccfde059a3a1f14a5628d4acf6a03f8076174fd28adfdb7cb9bbdb8ac0d4403aa2f43e917eed4b08028 SHA512 1c54d70a55007c00d3ff3d8c2096f4f9966431ba7bfd9195bcf41932de71b71c4ab934f9a8c5067cb56a042742cf0efab07377dbabf12feb1af6d20399de00b5
 DIST serde_derive-1.0.216.crate 57674 BLAKE2B 12a9228679c16288c08c8b256707e276aec79f84ac7af0c4cfd1f109500dfea80438df17d798acdd30a9743c753e70093b22bd324217529bac483f257682a3e2 SHA512 80fcb552279ac7562297df878f2f5e9ac09241701f5cf1088fcbf473b638f58cd3092a7930d8937ca0df9a47b9ae1a42d490cd46a275259cd8089fe8f5426469
+DIST serde_derive-1.0.217.crate 57749 BLAKE2B 63b4930122d80d64492ba2718630513012202e42bbaa74510729ee66a0e72b8a1ad123784b479697ba562db43868f4bddfdf5e94bb3d744cd68a547471ba40aa SHA512 31020f4533d04b31ae125580a3c5093fad36438d324e2d9b063923aa8c125c654102ae7fbc3b3df892bb41db6b321962a23e0a37950e080055d715d15b18af76
 DIST serde_json-1.0.127.crate 149465 BLAKE2B da5048f70a0b7594be0112efbfccf8d6575a77b324d59321cbd34d355978aadb2ceea1bbcb182412547587235f58873ddd2232822f020e2db85c1599cb0bca8b SHA512 f14f5eeebe07261daded47c3cbb6d511da4633bfcc46ea1b0600063730dd4211a0c310959e4f8731a688d18d60a46f6dc1c1a1f052f170b6207877b93742a88b
-DIST serde_json-1.0.128.crate 149520 BLAKE2B 246eb865f64a0f161b79f3d4f783dbadbc930c4a19edb6c0fe8f0c6145c7c47be4b692d3e084b1b500820ece8e94214820978cf898926dd805bd431fb411bbc9 SHA512 9e6290d3a6a971b3c37bbc97097b8179e64c655779b43c7b75303a35ef7030f5401b3a5f62cbc95a7bd5f42ecbefb0b469234d78a76c8c1597726d8e08908a7d
 DIST serde_json-1.0.133.crate 150739 BLAKE2B 7891eb5b8edcc7fd09ab1e15d3881ffdcb629aa39f2bd758c0505700a5f2dfabd85b1b66c3b094268bc1627b346e204c792f4ca61efa76c54ab9cd5744fb0ee2 SHA512 20e65ec87bff319897a141960d13deb5cadcf821209c1ee8799f1dc7f458ce432bc62c16df5bdada1c8d3cc01ff23b8125e8fa0a03545d4614f32efd687dc69f
+DIST serde_json-1.0.134.crate 154351 BLAKE2B 546f8ffe9373444e8c9e81910476da281dcef10498dceabc8bec9f9063c55f4a9033b83586a09b0f410369515882c37712a2bd75ff1fff05815d904f37386124 SHA512 ab6323799bf19da8ec6e6c428370d37cd230192b45ef54d2c65c7d83907b2dde71d51650e44f1fcca1084e75e0e195e97b28437f53a331bf48effed3d59b58a5
 DIST sha1_smol-1.0.1.crate 9809 BLAKE2B 954039c19b4c9faad6cd9f3f83edce220afb6970cb6628e69a1dd914a945a7b9466a8d46c41a650d505a3c01f406210ad59ed56504db18aa45125df3f2369cce SHA512 d0a67ca75b0617a39d28fdd73ae9aae3d3bf01ba24f6cc579b26da6f06125a304be90d446d17775959ab96ab165145657a54173679e6c0f42562a61c0e932b79
 DIST shell-words-1.1.0.crate 9871 BLAKE2B 7923b36f0ba50c17ac4eebfdda34566b615291253b7b41879b3f64b3fc1325e63948d3d44801e40748b11ddd2ab201b81d238af2a2007c7a57d71f5dcd0667f6 SHA512 05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00
 DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
@@ -219,12 +235,12 @@ DIST socket2-0.5.7.crate 55758 BLAKE2B 148d2e2b6610895ec555b1357b340576984eb76cb
 DIST socket2-0.5.8.crate 56309 BLAKE2B 309e5a0e46d0b9debbbd6049a138e56b82df4fc0e9d1115745ed935eb40c81b004ad748844f641934e13b5b88773db5cc4a57fc9e61dc82b5322fa0232110864 SHA512 b7d03608a3d4cf3e2d1539b5a375412effcc96279e8f57668fa8cf67b3f0a3a6b611ea5e2e72f282460582954acbb5364320611f7798a11ec9e4833e53830b60
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
 DIST stgit-2.4.11.tar.gz 607393 BLAKE2B 881bf25b3f7c3c53e1128c8fd29e72234c431f9e594032485fa84d09f6a86a3a00832187249cc5b561bce451bd8ad9277cd01d2d77edfa04b367b4011a449f46 SHA512 aa59f8bbe33eb2f85f9b9b121cf33c0d2dc542eb1995cbf962820f352ddbfcf29f017e6a7c2857a059dedbaeccef0eefed8a31bc13da41c48d65f43932785270
-DIST stgit-2.4.12.tar.gz 607457 BLAKE2B 6807c3a50cda0a72cd2a645f9669332cc6869f427b9c29ad864583b24729689cff8ab75548aa6adb9cf401e8823fd7bba6514656ce67d5d2191cc46ef78efc7a SHA512 7d36e273b7c1fd58134ed1abd165da4260ecfd6c35a3224cb960db43dbd9ea55d03ab1068b6b7b4f8dd089545900b9333b63d786b5a33dde56a91d1d4a615f48
 DIST stgit-2.4.13.tar.gz 609006 BLAKE2B ac38824e98722af23b13b0ac737cba142a6694c5f83087250c2bf8bbaae4761dbbe0d9a7d77b2e2b633d844dcfee4c3bf07c33fea12396fe655d8f0cbc195d59 SHA512 4eb653fdc7dbe9a302a0529886bb04db9fe8ad7b50897cafc0a4d34127493b9ae401f5df9dc13c31d094a4e6cb64f83afde8a2ff395b4e7471657b4021e72588
+DIST stgit-2.5.0.tar.gz 611896 BLAKE2B 59224648d914b521a3e270f9ad4986ca469143ccfc5a7ec528589bbf139ae99d71cbd88f376b4dff935598693a0f2009dd91164c487bf1f02a096bdb39e7cdca SHA512 2661b5a6558ca6bef15ec2d3982fbb319b5bc13a2fbd8ee750d0ba5fb6ec6c617f9e7088f09ba79fb57312505c06e2962013d0eb8cc0b0e785fdbd10f4512d59
 DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c
 DIST syn-2.0.76.crate 268798 BLAKE2B 5446965c6331fbb445a313ca8da9d8e7454e31d9a36c2f595747edc65c0d2a05e9d8e4e9fb6dbb30da8264c7db36b1cea14110201bb06e40bca69b25c3f79f1c SHA512 c633b9f68e67b3cbf2432d3648e42f8d92403877a0128becd22cb108c0cfab9f1bc6b941b9cde225d8b727890e9f86457fad05b544fd07be4c01c2e60a2cdeaa
-DIST syn-2.0.77.crate 268784 BLAKE2B adf14ddc4b284ad78dae3c05be7e63a58a85a2ef16c1051b991aa278843ba7231f0da3cf2adc65eb95762d4c88b4e1440cb616c651d3bb568392bb036399304c SHA512 f8030332c3c4ab34fc1e86196eb0eeda9700e5438f2a339591a5968d8bdd3373b523dba4bd998bf578e4247e0019d999d4e9c6d062a1dedcafe18d27b6c9f6d4
 DIST syn-2.0.90.crate 290584 BLAKE2B 9f469001c1439ffe57c578119653d3021c2709767e8e881441459a190402679f4fb78aa65e7822ff20913801c3be00d9b8f115189ea8e63ed94ed359b40fc9e1 SHA512 44606124f113c259c19edcb2adc1378d8292b422d800604c0e0d1ba89bd2d13d518cf4a6afa58daded54da9cb285464aadb113815406a0f09c5e18f865789ae0
+DIST syn-2.0.94.crate 297667 BLAKE2B 5edcd33596b147a01ffee8fef6ed0b3c084e6082bb65a9e67641944ffd3f0f7b3e806d63f7850ea8859327044fce0ac2a6f7bc8ce4fea81db2122c658eb1d468 SHA512 5d345b71945f7904a3f88d15dfa63397e82df113a655739ccc7430eb8716fe25ad096a75d019aed587f9e1b4374e8999d55ed1e2df4d0b8ee986469f64ea65f0
 DIST synstructure-0.13.1.crate 18327 BLAKE2B b29ee88c559a2d58fa46b7af155b448f001649ea79a1898f0ac87e69108b87c65cbd287d8f9001f360df7fef06ff39c937b48d33e487a30c8eec6a46c639c0c2 SHA512 09024193b44fc9a8901bda845b9f86c57dad65d0f53e309b2e7e968538fab6f67db1c86e5e52a2eb8fd116dc073e3ad10983bd60764662ec6ba94fee22a958aa
 DIST tar-0.4.41.crate 51871 BLAKE2B 7b24e1d923089cff48e7f5be141838f5a3db78477ba58304b7a076d5d2eb31525f307d674546e0023e78836f992566646724870eee556db50e96d5a0c851cbcb SHA512 547d4a10cca5b593a04e3775bfc175a3a4de27f3c4dede305c6d50b63b4eb38152c6f06280098f14c4fadcca4cc9aa98626ea50aebe9bab2cb7b7f4e0c4d2b92
 DIST tar-0.4.43.crate 60181 BLAKE2B 0c517cd0ccf1aca093136985513f5ee90312f0b99e34fef9ec8ef21c9537469c3ed31591434a9509ebc6887861e768f52e8dbc1858f0dc1ac5fbcb7d45e805e5 SHA512 d54953e0c7f7e34eb30d85c44527af620e673426592d896261dc2638a9b8a34e2486d0f56dcf93ab3a104c0a43aa3d3478db98fa86fe44ac5be6a10de145447e
@@ -235,10 +251,13 @@ DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f111
 DIST terminal_size-0.4.1.crate 10037 BLAKE2B 1d99577917b88498902d85718b4ba71ddcd7a1daca4f1b38f4b5ea4c34533eab9cda2cc344cdec5a31ffe0152fbcc5d499ccb40dc73f985f083a3ea21b0b1226 SHA512 e07bdbdf695bf9a607ea7c7c4c5b22a8637b0871877114aa305717a04d31a6b7670e2a79435810aefefe25db8c9a655e4c4ba6075d4ec76322a30cdf71ff03be
 DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
 DIST thiserror-2.0.7.crate 28456 BLAKE2B d0b40d33c4700b7c6a8a6330f6c4766eb4553040a62754059d84f86cd8e875c4ccf8ab7197aa6fdb2b6b27d78fcdd256ede79a22e89ad8304730a470aa20b718 SHA512 0ec2374ec19397d4764e01d46e6a8d1a6b8beb2c1e92bc88bef9309348934bff58fe7cb876e67258ca0d2ca488bffb96538efd24767fac13f1d65cc22b4ea7ca
+DIST thiserror-2.0.9.crate 28531 BLAKE2B 7789458ffcb381e2cf02f182248396c5e6c20a818e4c5a2c7da8a8f50099c548646b51dbfe0630a242f24e9aff65e215a4473e13f63bbffbd80a3429237c65c7 SHA512 b7b5f54cde87c21e8fac3526d5a140c0d64116e700d07eb28714df3db372a42fba30bb37817282d0ee1b5333f1998d1f628d43054e59fc39393fb567c3df4cb0
 DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102
 DIST thiserror-impl-2.0.7.crate 20954 BLAKE2B f6e81f9c969fd278f9f2a6052c6a3b35066728580cef96370a4be17fddc17384653c1e07158945b1eb2bbe71d24dbabd1b98547f58924a594b1a3cb8f0a79f4d SHA512 ec15231e3e8eb3dadbdb9e972d7e46ab8fb32c21a8292bf438914b2078b96d0dbaf611f63592d5e44e62d6e228f3dc28ede0d1dd18a34748b499fe39a22fecf4
+DIST thiserror-impl-2.0.9.crate 21023 BLAKE2B c2def0cfe9b9854ce33075fc246a2baba386d8f3a70f26516124f5ff4f7dbb0cd0b8887882c491f37652b565ee4fb3e7895a39cf34564a21e96890fa6e3ce125 SHA512 408f6a4c0f6cee36f69fff5a2f08cbd349db44753e6b6ac730c418fa1fc06ba7f69fbf248182af947843ae49d5cb5ff53980cdb18cb850ea8d7d9ac7dc8d67fa
 DIST tinystr-0.7.6.crate 16971 BLAKE2B 33a248261c4cded41a81f0d6e6c8df55437f042b37f235c39787986ec562f0dbff50b282ad0f1483daaf49c4b33e6618e139a6677d1238c21f4e12082562b4ae SHA512 a33051848de248cac0a2d151760a78cb3aa62c787d84ff7aac38b11c0660e9188e4d43d43a77fb8676e49ac6102015e9c3db057848d809e71981851875d0fb25
 DIST tinyvec-1.8.0.crate 46796 BLAKE2B 720d0e6d881855a36779e12f5ffa708d3a8b96e6d0de9056cb33c9b8ce0d408f99b22f5b2bb9d64bee72a011fef846dbebbea2ccd238d7b951eb5ef0c4866e05 SHA512 b7b32e38229645965900f80f298685f13e6d13e58cfd6945409a6643ca9c9adc2621456956d5998ab9dd91c2db4ae79638b156ca0d9c7c5505023fd9b28414df
+DIST tinyvec-1.8.1.crate 47269 BLAKE2B d72ec2417520fa0481b8447e6d75e1f24731d38f9083a711185785174a8567c81f6416468b9eabf426f9d32683231e7c5e80202292d1e424f9e4ac9cc8b3e765 SHA512 db32a6beb1c86eb3e9f5ff2732a4acc03d1d684f0e54df5de2ecbfd08399639f47396ae8b17eb5f0122a09ba0c313f39bd73a6f7c44cc38d1891d1bdf3f2d176
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8
 DIST unicode-bom-2.0.3.crate 10773 BLAKE2B 0c47796f83faa4eb5c4405fa385c245fe7b8b6d9eb6ce422738f7aa1788604ed3df22810afc6ce6da78c1592f7f68b41311914ff04d5e49ba4f719310ffa9afd SHA512 3a756761198be468776511ff7b899ee7adf214a678b13b31f42ef3cb3e0320894d8ff0df23bfa02a057727d83082f16b465ff25efa8dbef362977bf308bccffd
@@ -277,6 +296,7 @@ DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d2789
 DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
 DIST winnow-0.6.18.crate 163357 BLAKE2B 7a43eba294c43b187211c6eabc449775081f44405045ec4786c5f10290639e18d002e872f9db14caa94e26fd99079c7ce2f99e70dcb20d842c0886ac203d8ca8 SHA512 3a146d9dc8fe3fcc855f7766852cd69c49a28f9048d553d3952d7722d49216cb44652d98b15ae1ddee99b2bbc3caefb107a9b85c309242dac943deeca65a81dc
 DIST winnow-0.6.20.crate 163617 BLAKE2B b47ba6cd94ec80a72b51ad09c5cb9de350d2243295d3997732d5d3d9f8d08bd83e3129150fb24992243949120da1bd6091d580db5ff10258fd745afaa944c791 SHA512 3347fdfb5b15ec73a40614ecd0cce60f41d3f2d083f49aaafceeaf5db52d5c677dc3eb39fcc2595999fc9f864d1fde81e180e09dc86a6f6124878e16e86e8bc8
+DIST winnow-0.6.21.crate 164981 BLAKE2B 7621e7a0af704ad0295c210d7c9d32c4f2a93e56117dbccc50de4049eada9b908ff366bd5f6d58de04d2fe4601a2ffacc78d34a24089cca9a087c074de14a99c SHA512 0905430fc2c080be002cc41ea737c182e1b5100b699a3bdc45e58bbdf9fb3448cf0c3da99c033545deb3b983ccd938d300675260ca1fae51096b6faab9d10800
 DIST write16-1.0.0.crate 7218 BLAKE2B 548796314339463e4b71f8af3d344e45dc89480e103180b6d56c90fcb816ad1a37ab2ba20766c4b9754f2cc686752eb1f3a5a12ec1ed4369a9cef749ad4f3e97 SHA512 655a207b8082bb88e462f992ecb4833cef9d590da06d6356b41d109df2862b49ee5705189c78a607b549e7343035119d158020d58fcad49608e51659357a83c1
 DIST writeable-0.5.5.crate 22354 BLAKE2B e4ff9862c070b413568ce0c75d1eccafcf1db8578eee4795ea9046dadd643f8a77258b437be288b93af247199d63455298ac2cff909226bc432f91c0aa863921 SHA512 818b2546c8ec25816aeaf5e31a1ded927d197bf7256e7c5073738c2709bc58a95d382a0256eb38a99235ae83729b578701261866d42ea3357a26024906e196c1
 DIST xattr-1.3.1.crate 12580 BLAKE2B 25c414d761a7fcd23bbe057add62c6da971cf33149066aa024320ab80e0ec8e8e8d5d3d0506e8de954b8f8c178d34c52a00a5fa9aa109510678098a3e3564b7f SHA512 4047abda42b949cf58f820e15ee99850de483857bbaaef737eeee48e1a2132972470f15bb2ddda56438f6a934918be96607a8de518a5a3dcec7c8ee6c00ad280
diff --git a/dev-vcs/stgit/stgit-2.4.12-r1.ebuild b/dev-vcs/stgit/stgit-2.4.12-r1.ebuild
deleted file mode 100644
index 84fa72cec8d1..000000000000
--- a/dev-vcs/stgit/stgit-2.4.12-r1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.13.3
-
-EAPI=8
-
-CRATES="
-	adler2@2.0.0
-	ahash@0.8.11
-	allocator-api2@0.2.18
-	anstream@0.6.15
-	anstyle-parse@0.2.5
-	anstyle-query@1.1.1
-	anstyle-wincon@3.0.4
-	anstyle@1.0.8
-	anyhow@1.0.87
-	arc-swap@1.7.1
-	autocfg@1.3.0
-	bitflags@2.6.0
-	bstr@1.10.0
-	bzip2-rs@0.1.2
-	cc@1.1.18
-	cfg-if@1.0.0
-	cfg_aliases@0.2.1
-	clap@4.5.17
-	clap_builder@4.5.17
-	clap_lex@0.7.2
-	clru@0.6.2
-	colorchoice@1.0.2
-	crc32fast@1.4.2
-	ctrlc@3.4.5
-	curl-sys@0.4.74+curl-8.9.0
-	curl@0.4.46
-	dunce@1.0.5
-	encoding_rs@0.8.34
-	equivalent@1.0.1
-	errno@0.3.9
-	faster-hex@0.9.0
-	fastrand@2.1.1
-	filetime@0.2.25
-	flate2@1.0.33
-	fnv@1.0.7
-	form_urlencoded@1.2.1
-	gix-actor@0.32.0
-	gix-bitmap@0.2.11
-	gix-chunk@0.4.8
-	gix-command@0.3.9
-	gix-commitgraph@0.24.3
-	gix-config-value@0.14.8
-	gix-config@0.40.0
-	gix-date@0.9.0
-	gix-diff@0.46.0
-	gix-discover@0.35.0
-	gix-features@0.38.2
-	gix-fs@0.11.3
-	gix-glob@0.16.5
-	gix-hash@0.14.2
-	gix-hashtable@0.5.2
-	gix-index@0.35.0
-	gix-lock@14.0.0
-	gix-object@0.44.0
-	gix-odb@0.63.0
-	gix-pack@0.53.0
-	gix-path@0.10.11
-	gix-quote@0.4.12
-	gix-ref@0.47.0
-	gix-refspec@0.25.0
-	gix-revision@0.29.0
-	gix-revwalk@0.15.0
-	gix-sec@0.10.8
-	gix-tempfile@14.0.2
-	gix-trace@0.1.10
-	gix-traverse@0.41.0
-	gix-url@0.27.5
-	gix-utils@0.1.12
-	gix-validate@0.9.0
-	gix@0.66.0
-	hashbrown@0.14.5
-	hermit-abi@0.4.0
-	home@0.5.9
-	idna@0.5.0
-	indexmap@2.5.0
-	is-terminal@0.4.13
-	is_terminal_polyfill@1.70.1
-	itoa@1.0.11
-	jiff-tzdb-platform@0.1.1
-	jiff-tzdb@0.1.1
-	jiff@0.1.13
-	libc@0.2.158
-	libredox@0.1.3
-	libz-sys@1.1.20
-	linux-raw-sys@0.4.14
-	lock_api@0.4.12
-	memchr@2.7.4
-	memmap2@0.9.4
-	miniz_oxide@0.8.0
-	nix@0.29.0
-	once_cell@1.19.0
-	openssl-probe@0.1.5
-	openssl-sys@0.9.103
-	parking_lot@0.12.3
-	parking_lot_core@0.9.10
-	percent-encoding@2.3.1
-	pkg-config@0.3.30
-	proc-macro2@1.0.86
-	prodash@28.0.0
-	quote@1.0.37
-	redox_syscall@0.5.3
-	regex-automata@0.4.7
-	rustix@0.38.36
-	ryu@1.0.18
-	same-file@1.0.6
-	schannel@0.1.24
-	scopeguard@1.2.0
-	serde@1.0.210
-	serde_derive@1.0.210
-	serde_json@1.0.128
-	sha1_smol@1.0.1
-	shell-words@1.1.0
-	shlex@1.3.0
-	smallvec@1.13.2
-	socket2@0.5.7
-	strsim@0.11.1
-	syn@2.0.77
-	tar@0.4.41
-	tempfile@3.12.0
-	termcolor@1.4.1
-	terminal_size@0.3.0
-	thiserror-impl@1.0.63
-	thiserror@1.0.63
-	tinyvec@1.8.0
-	tinyvec_macros@0.1.1
-	unicode-bidi@0.3.15
-	unicode-bom@2.0.3
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	url@2.5.2
-	utf8parse@0.2.2
-	vcpkg@0.2.15
-	version_check@0.9.5
-	walkdir@2.5.0
-	winapi-util@0.1.9
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-sys@0.59.0
-	windows-targets@0.48.5
-	windows-targets@0.52.6
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.6
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.6
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.6
-	windows_i686_gnullvm@0.52.6
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.6
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.6
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.6
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.6
-	winnow@0.6.18
-	xattr@1.3.1
-	zerocopy-derive@0.7.35
-	zerocopy@0.7.35
-"
-
-inherit cargo flag-o-matic
-
-DESCRIPTION="Stack-based patch management for Git"
-HOMEPAGE="https://stacked-git.github.io/"
-SRC_URI="${CARGO_CRATE_URIS}"
-SRC_URI+=" https://github.com/stacked-git/stgit/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0 BSD MIT Unicode-DFS-2016"
-SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc"
-
-DEPEND="doc? ( app-text/asciidoc )"
-
-# rust does not use *FLAGS from make.conf, silence portage warning
-# update with proper path to binaries this crate installs, omit leading /
-QA_FLAGS_IGNORED="usr/bin/stg"
-
-src_configure() {
-	filter-lto #bug 897692
-}
-
-src_compile() {
-	cargo_src_compile
-	emake completion
-	emake contrib
-	use doc && emake doc
-}
-
-src_install() {
-	cargo_src_install
-	emake DESTDIR="${D}" prefix="/usr" install-completion
-	emake DESTDIR="${D}" prefix="/usr" install-contrib
-	if use doc; then
-		emake DESTDIR="${D}" prefix="/usr" install-man
-		emake DESTDIR="${D}" prefix="/usr" \
-			htmldir="/usr/share/doc/${PF}"  \
-			install-html
-	fi
-}
diff --git a/dev-vcs/stgit/stgit-2.5.0.ebuild b/dev-vcs/stgit/stgit-2.5.0.ebuild
new file mode 100644
index 000000000000..8d53905d08a7
--- /dev/null
+++ b/dev-vcs/stgit/stgit-2.5.0.ebuild
@@ -0,0 +1,236 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.4
+
+EAPI=8
+
+CRATES="
+	adler2@2.0.0
+	ahash@0.8.11
+	allocator-api2@0.2.21
+	anstream@0.6.18
+	anstyle-parse@0.2.6
+	anstyle-query@1.1.2
+	anstyle-wincon@3.0.6
+	anstyle@1.0.10
+	anyhow@1.0.95
+	arc-swap@1.7.1
+	autocfg@1.4.0
+	bitflags@2.6.0
+	bstr@1.11.1
+	bzip2-rs@0.1.2
+	cc@1.2.6
+	cfg-if@1.0.0
+	cfg_aliases@0.2.1
+	clap@4.5.23
+	clap_builder@4.5.23
+	clap_lex@0.7.4
+	clru@0.6.2
+	colorchoice@1.0.3
+	crc32fast@1.4.2
+	ctrlc@3.4.5
+	curl-sys@0.4.78+curl-8.11.0
+	curl@0.4.47
+	displaydoc@0.2.5
+	dunce@1.0.5
+	encoding_rs@0.8.35
+	equivalent@1.0.1
+	errno@0.3.10
+	faster-hex@0.9.0
+	fastrand@2.3.0
+	filetime@0.2.25
+	flate2@1.0.35
+	fnv@1.0.7
+	form_urlencoded@1.2.1
+	gix-actor@0.33.1
+	gix-bitmap@0.2.13
+	gix-chunk@0.4.10
+	gix-command@0.4.0
+	gix-commitgraph@0.25.1
+	gix-config-value@0.14.10
+	gix-config@0.42.0
+	gix-date@0.9.3
+	gix-diff@0.49.0
+	gix-discover@0.37.0
+	gix-features@0.39.1
+	gix-fs@0.12.1
+	gix-glob@0.17.1
+	gix-hash@0.15.1
+	gix-hashtable@0.6.0
+	gix-index@0.37.0
+	gix-lock@15.0.1
+	gix-object@0.46.1
+	gix-odb@0.66.0
+	gix-pack@0.56.0
+	gix-packetline@0.18.2
+	gix-path@0.10.13
+	gix-protocol@0.47.0
+	gix-quote@0.4.14
+	gix-ref@0.49.1
+	gix-refspec@0.27.0
+	gix-revision@0.31.1
+	gix-revwalk@0.17.0
+	gix-sec@0.10.10
+	gix-shallow@0.1.0
+	gix-tempfile@15.0.0
+	gix-trace@0.1.11
+	gix-transport@0.44.0
+	gix-traverse@0.43.1
+	gix-url@0.28.2
+	gix-utils@0.1.13
+	gix-validate@0.9.2
+	gix@0.69.1
+	hashbrown@0.14.5
+	hashbrown@0.15.2
+	hermit-abi@0.4.0
+	home@0.5.11
+	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.7.0
+	is-terminal@0.4.13
+	is_terminal_polyfill@1.70.1
+	itoa@1.0.14
+	jiff-tzdb-platform@0.1.1
+	jiff-tzdb@0.1.1
+	jiff@0.1.18
+	libc@0.2.169
+	libredox@0.1.3
+	libz-sys@1.1.20
+	linux-raw-sys@0.4.14
+	litemap@0.7.4
+	lock_api@0.4.12
+	log@0.4.22
+	maybe-async@0.2.10
+	memchr@2.7.4
+	memmap2@0.9.5
+	miniz_oxide@0.8.2
+	nix@0.29.0
+	once_cell@1.20.2
+	openssl-probe@0.1.5
+	openssl-sys@0.9.104
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	percent-encoding@2.3.1
+	pkg-config@0.3.31
+	portable-atomic-util@0.2.4
+	portable-atomic@1.10.0
+	proc-macro2@1.0.92
+	prodash@29.0.0
+	quote@1.0.38
+	redox_syscall@0.5.8
+	regex-automata@0.4.9
+	rustix@0.38.42
+	ryu@1.0.18
+	same-file@1.0.6
+	schannel@0.1.27
+	scopeguard@1.2.0
+	serde@1.0.217
+	serde_derive@1.0.217
+	serde_json@1.0.134
+	sha1_smol@1.0.1
+	shell-words@1.1.0
+	shlex@1.3.0
+	smallvec@1.13.2
+	socket2@0.5.8
+	stable_deref_trait@1.2.0
+	strsim@0.11.1
+	syn@2.0.94
+	synstructure@0.13.1
+	tar@0.4.43
+	tempfile@3.14.0
+	termcolor@1.4.1
+	terminal_size@0.4.1
+	thiserror-impl@2.0.9
+	thiserror@2.0.9
+	tinystr@0.7.6
+	tinyvec@1.8.1
+	tinyvec_macros@0.1.1
+	unicode-bom@2.0.3
+	unicode-ident@1.0.14
+	unicode-normalization@0.1.24
+	url@2.5.4
+	utf16_iter@1.0.5
+	utf8_iter@1.0.4
+	utf8parse@0.2.2
+	vcpkg@0.2.15
+	version_check@0.9.5
+	walkdir@2.5.0
+	winapi-util@0.1.9
+	windows-sys@0.52.0
+	windows-sys@0.59.0
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.52.6
+	winnow@0.6.21
+	write16@1.0.0
+	writeable@0.5.5
+	xattr@1.3.1
+	yoke-derive@0.7.5
+	yoke@0.7.5
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+	zerofrom-derive@0.1.5
+	zerofrom@0.1.5
+	zerovec-derive@0.10.3
+	zerovec@0.10.4
+"
+
+inherit cargo flag-o-matic
+
+DESCRIPTION="Stack-based patch management for Git"
+HOMEPAGE="https://stacked-git.github.io/"
+SRC_URI="${CARGO_CRATE_URIS}"
+SRC_URI+=" https://github.com/stacked-git/stgit/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD MIT Unicode-DFS-2016"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( app-text/asciidoc )"
+
+# rust does not use *FLAGS from make.conf, silence portage warning
+# update with proper path to binaries this crate installs, omit leading /
+QA_FLAGS_IGNORED="usr/bin/stg"
+
+src_configure() {
+	filter-lto #bug 897692
+}
+
+src_compile() {
+	cargo_src_compile
+	emake completion
+	emake contrib
+	use doc && emake doc
+}
+
+src_install() {
+	cargo_src_install
+	emake DESTDIR="${D}" prefix="/usr" install-completion
+	emake DESTDIR="${D}" prefix="/usr" install-contrib
+	if use doc; then
+		emake DESTDIR="${D}" prefix="/usr" install-man
+		emake DESTDIR="${D}" prefix="/usr" \
+			htmldir="/usr/share/doc/${PF}"  \
+			install-html
+	fi
+}
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index b3f699d32cb7..113522baa5b4 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -1 +1,2 @@
 DIST subversion-1.14.3.tar.bz2 8569985 BLAKE2B bc366a611f77d7dc3a5dc6015ea50b8daae0cffc20f8830de04a7f310a26ab9e955db343e7902475079d31d7984cb6b03f7810e71feae9a5374e1cb690933b49 SHA512 40b172492005fd3b0cd9e457b4444af8ea5d8ff8fc161a9a0c6dc3a7314c6ad4ff75a4676f68a1919ae6273ae03e34d04eba8c1c37b8c0b4ec70d6731b527b41
+DIST subversion-1.14.5.tar.bz2 8675355 BLAKE2B d5650c50b345938bb012bc942958a7a23cc6de030f2f005b6caa43afe39f0ba6f3ad4d733b13eb746ab08bf8de491f0a56cc5700dd64e02e6f74f393a5dd293b SHA512 e4800564d0cc68be98f19aa58d89181de83f237f0ccff10824d9237f8c65eb0071f7176ac54e9e8f8ecbf685849bd3e94be48f678f4c23ed6a5fd7fb6edd0321
diff --git a/dev-vcs/subversion/subversion-1.14.5.ebuild b/dev-vcs/subversion/subversion-1.14.5.ebuild
new file mode 100644
index 000000000000..4cdfaa3c5724
--- /dev/null
+++ b/dev-vcs/subversion/subversion-1.14.5.ebuild
@@ -0,0 +1,447 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE="none"
+GENTOO_DEPEND_ON_PERL="no"
+# no py3.12 yet as many tests have invalid escape sequence warnings
+PYTHON_COMPAT=( python3_{10..11} )
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2
+inherit libtool multilib multiprocessing perl-module prefix python-any-r1 ruby-single xdg-utils
+
+MY_P="${P/_/-}"
+DESCRIPTION="Advanced version control system"
+HOMEPAGE="https://subversion.apache.org/"
+SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 BSD MIT BSD-2 FSFAP unicode"
+SLOT="0"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+IUSE="apache2 berkdb debug doc extras keyring java kwallet nls perl plaintext-password-storage ruby sasl test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	app-arch/lz4
+	>=dev-db/sqlite-3.7.12
+	>=dev-libs/apr-1.5:1
+	>=dev-libs/apr-util-1.5:1
+	dev-libs/expat
+	>=dev-libs/libutf8proc-2.5.0:=
+	>=net-libs/serf-1.3.4
+	sys-apps/file
+	sys-libs/zlib
+	berkdb? ( >=sys-libs/db-4.0.14:= )
+	keyring? (
+		dev-libs/glib:2
+		app-crypt/libsecret
+		sys-apps/dbus
+	)
+	kwallet? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kwallet:5
+		sys-apps/dbus
+	)
+	perl? ( dev-lang/perl:= )
+	ruby? ( ${RUBY_DEPS} )
+	sasl? ( dev-libs/cyrus-sasl )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	apache2? (
+		acct-group/apache
+		acct-user/apache
+		www-servers/apache[apache2_modules_dav]
+	)
+	!apache2? (
+		acct-group/svnusers
+		acct-user/svn
+	)
+	java? ( >=virtual/jre-1.8:* )
+	nls? ( virtual/libintl )
+	perl? ( dev-perl/URI )
+"
+# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
+DEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.8:* )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+	nls? ( sys-devel/gettext )
+	perl? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	test? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.6-aix-dso.patch
+	"${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch
+	"${FILESDIR}"/${PN}-1.8.16-javadoc-nolint.patch
+)
+
+want_apache
+
+pkg_setup() {
+	if use berkdb ; then
+		local apu_bdb_version="$("${EPREFIX}"/usr/bin/apu-1-config --includes \
+			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
+			| sed 's:.*b::')"
+		einfo
+		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
+			if [[ -n "${apu_bdb_version}" ]] ; then
+				SVN_BDB_VERSION="${apu_bdb_version}"
+				einfo "Matching db version to apr-util"
+			else
+				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
+				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
+			fi
+		fi
+		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
+		einfo
+
+		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
+			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
+			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
+			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
+			eerror "Aborting to avoid possible run-time crashes."
+			die "Berkeley DB version mismatch"
+		fi
+	fi
+
+	depend.apache_pkg_setup
+
+	java-pkg-opt-2_pkg_setup
+
+	# https://issues.apache.org/jira/browse/SVN-4813#comment-16813739
+	append-cppflags -P
+
+	if use debug ; then
+		append-cppflags -DSVN_DEBUG -DAP_DEBUG
+	fi
+
+	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
+	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
+
+	# Allow for custom repository locations.
+	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
+
+	if use ruby ; then
+		local rbslot
+		RB_VER=""
+		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
+			# No break here as we want to pick the best (latest)
+			if has_version "dev-lang/ruby:${rbslot}" && has_version "virtual/rubygems[ruby_targets_ruby${rbslot/.}(-)]" ; then
+				RB_VER="${rbslot/.}"
+			fi
+		done
+		[[ -z "${RB_VER}" ]] && die "No usable ruby version found"
+	fi
+}
+
+src_prepare() {
+	default
+
+	chmod +x build/transform_libtool_scripts.sh || die
+
+	sed -i \
+		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
+		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
+
+	# this bites us in particular on Solaris
+	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
+		die "/bin/sh is not POSIX shell!"
+
+	hprefixify build/ac-macros/svn-macros.m4
+
+	eautoconf
+	elibtoolize
+
+	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
+		-i build-outputs.mk || die "sed failed"
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	local myconf=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		$(use_with apache2 apache-libexecdir)
+		$(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
+		$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
+		--without-ctypesgen
+		--disable-runtime-module-search
+		$(use_with keyring gnome-keyring)
+		$(use_enable java javahl)
+		$(use_with java jdk "${JAVA_HOME}")
+		$(use_enable nls)
+		$(use_enable plaintext-password-storage)
+		$(use_with sasl)
+		--with-serf
+		--with-apr="${EPREFIX}/usr/bin/apr-1-config"
+		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config"
+		--disable-experimental-libtool
+		--without-jikes
+		--disable-mod-activation
+		--disable-static
+		--enable-svnxx
+		--without-swig-python
+	)
+
+	if use kwallet ; then
+		myconf+=( "--with-kwallet=/usr/include/:/usr/$(get_libdir)/" )
+	else
+		myconf+=( --without-kwallet )
+	fi
+
+	if use perl; then
+		myconf+=( --with-swig-perl )
+	else
+		myconf+=( --without-swig-perl )
+	fi
+
+	if use ruby; then
+		# bug #932536 (workaround for swig w/ older ruby)
+		append-flags -std=gnu17
+
+		myconf+=( --with-swig-ruby="${EPREFIX}/usr/bin/ruby${RB_VER}" )
+	else
+		myconf+=( --without-swig-ruby )
+	fi
+
+	if use java ; then
+		myconf+=( --without-junit )
+	fi
+
+	case ${CHOST} in
+		*-solaris*)
+			# need -lintl to link
+			use nls && append-libs intl
+			# this breaks installation, on x64 echo replacement is 32-bits
+			myconf+=( --disable-local-library-preloading )
+		;;
+		*)
+			# inject LD_PRELOAD entries for easy in-tree development
+			myconf+=( --enable-local-library-preloading )
+		;;
+	esac
+
+	# version 1.7.7 again tries to link against the older installed version and fails, when trying to
+	# compile for x86 on amd64, so workaround this issue again
+	# check newer versions, if this is still/again needed
+	#myconf+=( --disable-disallowing-of-undefined-references )
+
+	# for build-time scripts
+	if use test; then
+		python_setup
+	fi
+
+	ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
+	ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake local-all
+
+	if use perl ; then
+		emake swig-pl
+	fi
+
+	if use ruby ; then
+		emake swig-rb
+	fi
+
+	if use java ; then
+		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
+	fi
+
+	if use extras ; then
+		emake tools
+	fi
+
+	if use doc ; then
+		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
+
+		if use java; then
+			emake doc-javahl
+		fi
+	fi
+}
+
+src_test() {
+	# TODO: Maybe run swig tests for each language?
+	#if has_version ~${CATEGORY}/${P} ; then
+		emake -Onone PARALLEL="$(makeopts_jobs)" check
+	#else
+	#	ewarn "The test suite shows errors when there is an older version of"
+	#	ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
+	#	ewarn "before running the test suite."
+	#	ewarn "Test suite skipped."
+	#fi
+
+	if [[ -f "${S}/fails.log" ]] ; then
+		echo "====== contents of fails.log follow ======"
+		cat "${S}/fails.log" || die
+		echo "====== contents of fails.log end    ======"
+	fi
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" local-install
+
+	if use perl ; then
+		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
+		perl_delete_localpod
+		find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die
+	fi
+
+	if use ruby ; then
+		emake DESTDIR="${D}" install-swig-rb
+	fi
+
+	if use java ; then
+		emake DESTDIR="${D}" install-javahl
+		java-pkg_regso "${ED}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
+		java-pkg_dojar "${ED}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
+		rm -fr "${ED}"/usr/$(get_libdir)/svn-javahl/*.jar
+	fi
+
+	# Install Apache module configuration.
+	if use apache2 ; then
+		keepdir "${APACHE_MODULES_CONFDIR}"
+		insinto "${APACHE_MODULES_CONFDIR}"
+		doins "${FILESDIR}/47_mod_dav_svn.conf"
+	fi
+
+	# Install bash completion, bug #43179.
+	newbashcomp tools/client-side/bash_completion svn
+	bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
+	rm -f tools/client-side/bash_completion || die
+
+	# Install hot backup script, bug #54304.
+	newbin tools/backup/hot-backup.py svn-hot-backup
+	rm -fr tools/backup || die
+
+	# Install svnserve init-script and xinet.d snippet, bug #43245.
+	newinitd "${FILESDIR}"/svnserve.initd3 svnserve
+	newconfd "${FILESDIR}"/svnserve.confd svnserve
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/svnserve.xinetd svnserve
+
+	# Adjust default user and group with disabled apache2 USE flag, bug #381385
+	if ! use apache2 ; then
+		sed -e "s\USER:-apache\USER:-svn\g" \
+			-e "s\GROUP:-apache\GROUP:-svnusers\g" \
+			-i "${ED}"/etc/init.d/svnserve || die
+		sed -e "0,/apache/s//svn/" \
+			-e "s:apache:svnusers:" \
+			-i "${ED}"/etc/xinetd.d/svnserve || die
+	fi
+
+	# Install documentation.
+	dodoc CHANGES COMMITTERS README
+	dodoc tools/xslt/svnindex.{css,xsl}
+	rm -fr tools/xslt
+
+	# Install extra files.
+	if use extras ; then
+		cat <<- EOF > 80subversion-extras
+			PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+			ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+		EOF
+		doenvd 80subversion-extras
+
+		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
+
+		find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr
+		rm -fr tools/client-side/svnmucc
+		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
+		rm -fr tools/{buildbot,dev,diff,po}
+	fi
+
+	if use doc ; then
+		docinto html
+		dodoc -r doc/doxygen/html/*
+
+		if use java ; then
+			java-pkg_dojavadoc doc/javadoc
+		fi
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	cd "${ED}"/usr/share/locale
+	for i in * ; do
+		if [[ ${i} != *${LINGUAS}* ]] ; then
+			rm -r ${i} || die
+		fi
+	done
+}
+
+pkg_preinst() {
+	# Compare versions of Berkeley DB, bug #122877.
+	if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then
+		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		NEW_BDB_VERSION="$(scanelf -nq "${ED}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
+			CHANGED_BDB_VERSION="1"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
+		ewarn "You upgraded from an older version of Berkeley DB and may experience"
+		ewarn "problems with your repository. Run the following commands as root to fix it:"
+		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
+		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
+	fi
+
+	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
+}
+
+pkg_postrm() {
+	:
+}
+
+pkg_config() {
+	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
+	# already has EPREFIX in it
+	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
+	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
+		echo "A Subversion repository already exists and I will not overwrite it."
+		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
+	else
+		mkdir -p "${SVN_REPOS_LOC}/conf"
+
+		einfo "Populating repository directory..."
+		# Create initial repository.
+		"${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
+
+		einfo "Setting repository permissions..."
+		SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
+		SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
+		if use apache2 ; then
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
+		else
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
+		fi
+		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
+		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
+		chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} "${SVN_REPOS_LOC}/repos"
+	fi
+}
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 212a41c70d1b..67b36e111bae 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1 +1,2 @@
 DIST tortoisehg-6.6.3.tar.gz 8857342 BLAKE2B 166d1305ed3ee54496b3e0b08fc92a34a56a9398aa618a0f2266e7413fafc371be3c308debc3260a15b59c147a00bbe0773df52a838c4a4f0028b29c1cb05090 SHA512 8de8a68a753e8554dcb9936f6ba237e0598df65e6039f7c608e692bc375258e64a443e27e63c337f361fc32c0076b79bd98a972c220089902ff4489ab3507928
+DIST tortoisehg-6.9.tar.gz 8862668 BLAKE2B b7f917a8c9f0ca575e27ab1670bfe940e6257940691c53fca464b4012417283c9915fe5f604b0c1a5cb7f620ce20b47e945bb9e88b301f7ac036c19fcb4508b5 SHA512 f9f7ed9c3a1cdf633c453a12c7f68505027975fbd858c4e9cd4ce09920126f22043c1621a5d949391d31a9a13331cee2466d718635aa16dc8558bac5536d14fb
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/eclass/cargo.eclass b/eclass/cargo.eclass
index b1285e13a5b2..0bc24feea222 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -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
 
 # @ECLASS: cargo.eclass
@@ -527,6 +527,12 @@ cargo_src_unpack() {
 		done < <(sha256sum -z "${crates[@]}" || die)
 
 		popd >/dev/null || die
+
+		if [[ ${#crates[@]} -ge 300 ]]; then
+			eqawarn "This package uses a very large number of CRATES.  Please provide"
+			eqawarn "a crate tarball instead and fetch it via SRC_URI.  You can use"
+			eqawarn "'pycargoebuild --crate-tarball' to create one."
+		fi
 	fi
 
 	cargo_gen_config
diff --git a/eclass/dotnet-pkg-base.eclass b/eclass/dotnet-pkg-base.eclass
index d9abff3859f6..b266c1b5dffc 100644
--- a/eclass/dotnet-pkg-base.eclass
+++ b/eclass/dotnet-pkg-base.eclass
@@ -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
 
 # @ECLASS: dotnet-pkg-base.eclass
@@ -32,6 +32,23 @@ _DOTNET_PKG_BASE_ECLASS=1
 
 inherit edo multiprocessing nuget
 
+# @ECLASS_VARIABLE: DOTNET_VERBOSITY
+# @USER_VARIABLE
+# @DESCRIPTION:
+# Controls verbosity of the dotnet restore/build/test processes.
+#
+# Defaults to "minimal" - this only reports which projects are being built
+# and warnings/errors, if any. All the possible values are: "quiet", "minimal",
+# "normal", "detailed" and "diagnostic". For more information on verbosity
+# levels, see the official .NET SDK documentation on:
+# * https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet
+# * https://learn.microsoft.com/en-us/dotnet/api/microsoft.build.framework.loggerverbosity
+#
+# This variable can be used to debug package build process (by selecting
+# anything above "minimal") but generally warnings/errors provide all
+# the necessary info.
+: "${DOTNET_VERBOSITY:=minimal}"
+
 # @ECLASS_VARIABLE: DOTNET_PKG_COMPAT
 # @REQUIRED
 # @PRE_INHERIT
@@ -385,6 +402,7 @@ dotnet-pkg-base_restore() {
 	local -a restore_args=(
 		--runtime "${DOTNET_PKG_RUNTIME}"
 		--source "${NUGET_PACKAGES}"
+		--verbosity "${DOTNET_VERBOSITY}"
 		-maxCpuCount:$(makeopts_jobs)
 		"${@}"
 	)
@@ -407,6 +425,7 @@ dotnet-pkg-base_restore-tools() {
 
 	local -a tool_restore_args=(
 		--add-source "${NUGET_PACKAGES}"
+		--verbosity "${DOTNET_VERBOSITY}"
 	)
 
 	if [[ -n "${1}" ]] ; then
@@ -447,6 +466,7 @@ dotnet-pkg-base_build() {
 		--no-self-contained
 		--output "${DOTNET_PKG_OUTPUT}"
 		--runtime "${DOTNET_PKG_RUNTIME}"
+		--verbosity "${DOTNET_VERBOSITY}"
 		-maxCpuCount:$(makeopts_jobs)
 	)
 
@@ -482,6 +502,7 @@ dotnet-pkg-base_test() {
 	local -a test_args=(
 		--configuration "${DOTNET_PKG_CONFIGURATION}"
 		--no-restore
+		--verbosity "${DOTNET_VERBOSITY}"
 		-maxCpuCount:$(makeopts_jobs)
 		"${@}"
 	)
diff --git a/eclass/dotnet.eclass b/eclass/dotnet.eclass
index aeaee2f58e94..3a65626032cb 100644
--- a/eclass/dotnet.eclass
+++ b/eclass/dotnet.eclass
@@ -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
 
 # @ECLASS: dotnet.eclass
@@ -6,6 +6,7 @@
 # maintainer-needed@gentoo.org
 # @SUPPORTED_EAPIS: 7
 # @BLURB: common settings and functions for mono and dotnet related packages
+# @DEPRECATED: none
 # @DESCRIPTION:
 # The dotnet eclass contains common environment settings that are useful for
 # dotnet packages.  Currently, it provides no functions, just exports
diff --git a/eclass/gstreamer-meson.eclass b/eclass/gstreamer-meson.eclass
index 937c86a0f15b..15b0a6390a42 100644
--- a/eclass/gstreamer-meson.eclass
+++ b/eclass/gstreamer-meson.eclass
@@ -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
 
 # @ECLASS: gstreamer-meson.eclass
@@ -38,11 +38,6 @@ esac
 PYTHON_COMPAT=( python3_{10..12} )
 [[ ${EAPI} == 8 ]] && inherit python-any-r1
 
-# TODO: Remove after all older versions are gone from tree
-if ver_test ${PV} -lt 1.22.10 ; then
-	inherit virtualx
-fi
-
 # multilib-minimal goes last
 inherit meson multilib toolchain-funcs xdg-utils multilib-minimal
 
@@ -133,10 +128,7 @@ gstreamer_system_package() {
 			pc=${tuple#*:}-${SLOT}
 			sed -e "1i${dependency} = dependency('${pc}', required : true)" \
 				-i "${pdir}"/meson.build || die
-			# TODO: Remove conditional applying once older versions are all gone
-			if ver_test ${PV} -gt 1.22.5 ; then
-				sed -e "/meson\.override_dependency[(]pkg_name, ${dependency}[)]/d" -i "${S}"/gst-libs/gst/*/meson.build || die
-			fi
+			sed -e "/meson\.override_dependency[(]pkg_name, ${dependency}[)]/d" -i "${S}"/gst-libs/gst/*/meson.build || die
 		done
 	done
 }
@@ -207,8 +199,14 @@ S="${WORKDIR}/${GST_ORG_MODULE}-${PV}"
 LICENSE="GPL-2"
 SLOT="1.0"
 
+if ver_test ${GST_ORG_PVP} -ge 1.24 ; then
+	GLIB_VERSION=2.64.0
+else
+	GLIB_VERSION=2.62.0
+fi
+
 RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-${GLIB_VERSION}:2[${MULTILIB_USEDEP}]
 "
 BDEPEND="
 	virtual/pkgconfig
diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index eebdec584ccc..0b35490e0365 100644
--- a/eclass/java-pkg-2.eclass
+++ b/eclass/java-pkg-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Gentoo Authors
+# Copyright 2004-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-pkg-2.eclass
@@ -6,7 +6,7 @@
 # java@gentoo.org
 # @AUTHOR:
 # Thomas Matthijs <axxo@gentoo.org>
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 8
 # @PROVIDES: java-utils-2
 # @BLURB: Eclass for Java Packages
 # @DESCRIPTION:
@@ -17,7 +17,7 @@ if [[ -z ${_JAVA_PKG_2_ECLASS} ]] ; then
 _JAVA_PKG_2_ECLASS=1
 
 case ${EAPI} in
-	7|8) ;;
+	8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
index aae55d9e3ac5..65433d9fc9c0 100644
--- a/eclass/kernel-build.eclass
+++ b/eclass/kernel-build.eclass
@@ -137,6 +137,9 @@ fi
 kernel-build_pkg_setup() {
 	python-any-r1_pkg_setup
 	if [[ ${KERNEL_IUSE_MODULES_SIGN} && ${MERGE_TYPE} != binary ]]; then
+		# inherits linux-info to check config values for keys
+		# ensure KV_FULL will not be set globally, that breaks configure
+		local KV_FULL
 		secureboot_pkg_setup
 
 		if use modules-sign && [[ -n ${MODULES_SIGN_KEY} ]]; then
@@ -444,6 +447,11 @@ kernel-build_src_install() {
 
 	# Copy built key/certificate files
 	cp -p build/certs/* "${ED}${kernel_dir}/certs/" || die
+	# If a key was generated, exclude it from the binpkg
+	local generated_key=${ED}${kernel_dir}/certs/signing_key.pem
+	if [[ -r ${generated_key} ]]; then
+		mv "${generated_key}" "${T}/signing_key.pem" || die
+	fi
 
 	# building modules fails with 'vmlinux has no symtab?' if stripped
 	use ppc64 && dostrip -x "${kernel_dir}/${image_path}"
@@ -587,14 +595,18 @@ kernel-build_src_install() {
 			done
 
 			if [[ ${KERNEL_IUSE_MODULES_SIGN} ]] && use secureboot; then
+				# --pcrpkey is appended as is. If the certificate and key
+				# are in the same file, we could accidentally leak the key
+				# into the UKI. Pass the certificate through openssl to ensure
+				# that it truly contains *only* the certificate.
 				openssl x509 \
 					-in "${SECUREBOOT_SIGN_CERT}" -inform PEM \
-					-out ${T}/pcrpkey.der -outform DER ||
-						die "Failed to convert certificate to DER format"
+					-out "${T}/pcrpkey.pem" -outform PEM ||
+						die "Failed to extract certificate"
 				ukify_args+=(
 					--secureboot-private-key="${SECUREBOOT_SIGN_KEY}"
 					--secureboot-certificate="${SECUREBOOT_SIGN_CERT}"
-					--pcrpkey="${T}/pcrpkey.der"
+					--pcrpkey="${T}/pcrpkey.pem"
 					--measure
 				)
 				if [[ ${SECUREBOOT_SIGN_KEY} == pkcs11:* ]]; then
@@ -647,7 +659,6 @@ kernel-build_pkg_postinst() {
 			ewarn "MODULES_SIGN_KEY was not set, this means the kernel build system"
 			ewarn "automatically generated the signing key. This key was installed"
 			ewarn "in ${EROOT}/usr/src/linux-${KV_FULL}/certs"
-			ewarn "and will also be included in any binary packages."
 			ewarn "Please take appropriate action to protect the key!"
 			ewarn
 			ewarn "Recompiling this package causes a new key to be generated. As"
diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index 6ca39e551110..cf34007844a8 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -204,6 +204,7 @@ if [[ ${KERNEL_IUSE_GENERIC_UKI} ]]; then
 	"
 	IDEPEND="
 		generic-uki? (
+			app-crypt/sbsigntools
 			>=sys-kernel/installkernel-14[-dracut(-),-ugrd(-),-ukify(-)]
 		)
 		!generic-uki? (
@@ -607,6 +608,15 @@ kernel-install_pkg_preinst() {
 	[[ ! -d ${kernel_dir} ]] &&
 		die "Kernel directory ${kernel_dir} not installed!"
 
+	# We moved this in order to omit it from the binpkg, move it back
+	if [[ -r "${T}/signing_key.pem" ]]; then
+		# cp instead of mv to set owner to root in one go
+		(
+			umask 066 &&
+				cp "${T}/signing_key.pem" "${kernel_dir}/certs/signing_key.pem"
+		) || die
+	fi
+
 	# perform the version check for release ebuilds only
 	if [[ ${PV} != *9999 ]]; then
 		local expected_ver=$(dist-kernel_PV_to_KV "${PV}")
@@ -651,13 +661,65 @@ kernel-install_extract_from_uki() {
 	local extract_type=${1}
 	local uki=${2}
 	local out=${3}
+	local out_temp=${T}/${extract_type}-section-dumped
 
 	# objcopy overwrites input if there is no output, dump the output in T.
 	# We unfortunately cannot use /dev/null here
 	$(tc-getOBJCOPY) "${uki}" "${T}/dump.efi" \
-		--dump-section ".${extract_type}=${out}" ||
-		die "Failed to extract ${extract_type}"
-	chmod 644 "${out}" || die
+		--dump-section ".${extract_type}=${out_temp}" ||
+			die "Failed to extract ${extract_type}"
+
+	# Sanity checks for kernel images
+	if [[ ${extract_type} == linux ]] &&
+		{ ! in_iuse secureboot || use secureboot ;}
+	then
+		# Extract the used SECUREBOOT_SIGN_CERT to verify the kernel image
+		local cert=${T}/pcrpkey
+		kernel-install_extract_from_uki pcrpkey "${uki}" "${cert}"
+		if [[ $(head -n1 "${cert}") != "-----BEGIN CERTIFICATE-----" ]]; then
+			# This is a DER format certificate, convert it to PEM
+			openssl x509 \
+				-inform DER -in "${cert}" \
+				-outform PEM -out "${cert}" ||
+					die "Failed to convert pcrpkey to PEM format"
+		fi
+
+		# Check if the signature on the UKI is valid
+		sbverify --cert "${cert}" "${uki}" ||
+			die "ERROR: UKI signature is invalid"
+
+		# Check if the signature on the kernel image is valid
+		local sbverify_err=$(
+			sbverify --cert "${cert}" "${out_temp}" 2>&1 >/dev/null
+		)
+
+		# Check if there was a padding warning
+		if [[ ${sbverify_err} == "warning: data remaining"*": gaps between PE/COFF sections?"* ]]
+		then
+			# https://github.com/systemd/systemd/issues/35851
+			local proper_size=${sbverify_err#"warning: data remaining["}
+			proper_size=${proper_size%" vs"*}
+			# Strip the padding
+			head "${out_temp}" --bytes "${proper_size}" \
+				>"${out_temp}_trimmed" || die
+			# Check if the signature verifies now
+			sbverify_err=$(
+				sbverify --cert "${cert}" "${out_temp}_trimmed" 2>&1 >/dev/null
+			)
+			[[ -z ${sbverify_err} ]] && out_temp=${out_temp}_trimmed
+		fi
+
+		# Something has gone wrong, stop here to prevent installing a kernel
+		# with an invalid signature or a completely broken kernel image.
+		if [[ -n ${sbverify_err} ]]; then
+			eerror "${sbverify_err}"
+			die "ERROR: Kernel image signature is invalid"
+		else
+			einfo "Signature verification OK"
+		fi
+	fi
+
+	install -m 644 "${out_temp}" "${out}" || die
 }
 
 # @FUNCTION: kernel-install_install_all
@@ -738,9 +800,9 @@ kernel-install_pkg_postinst() {
 kernel-install_pkg_postrm() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	if [[ ! ${KERNEL_IUSE_GENERIC_UKI} ]]; then
-		local kernel_dir=${EROOT}/usr/src/linux-${KV_FULL}
-		local image_path=$(dist-kernel_get_image_path)
+	local kernel_dir=${EROOT}/usr/src/linux-${KV_FULL}
+	local image_path=$(dist-kernel_get_image_path)
+	if [[ ! ${KERNEL_IUSE_GENERIC_UKI} && -d ${kernel_dir} ]]; then
 		ebegin "Removing initramfs"
 		rm -f "${kernel_dir}/${image_path%/*}"/{initrd,uki.efi} &&
 			find "${kernel_dir}" -depth -type d -empty -delete
diff --git a/eclass/linux-mod-r1.eclass b/eclass/linux-mod-r1.eclass
index f6a5d4f187d8..16c280219ef8 100644
--- a/eclass/linux-mod-r1.eclass
+++ b/eclass/linux-mod-r1.eclass
@@ -333,7 +333,7 @@ linux-mod-r1_pkg_setup() {
 	_MODULES_GLOBAL[ran:pkg_setup]=1
 	_modules_check_function ${#} 0 0 || return 0
 
-	if [[ -z ${ROOT} && ${MODULES_INITRAMFS_IUSE} ]] &&
+	if [[ ${MODULES_INITRAMFS_IUSE} ]] &&
 		use dist-kernel && use ${MODULES_INITRAMFS_IUSE#+}
 	then
 		# Check, but don't die because we can fix the problem and then
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index 9b5be08eb1bb..7d7774cfb027 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: llvm.org.eclass
@@ -72,20 +72,11 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then
 			_LLVM_SOURCE_TYPE=snapshot
 
 			case ${PV} in
-				20.0.0_pre20241227)
-					EGIT_COMMIT=ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a
+				20.0.0_pre20250118)
+					EGIT_COMMIT=c3a935e3f967f8f22f5db240d145459ee621c1e0
 					;;
-				20.0.0_pre20241221)
-					EGIT_COMMIT=665d79f2e967a5eee6fff93685e45f50cf24cab2
-					;;
-				20.0.0_pre20241215)
-					EGIT_COMMIT=49a5ad8e5714fd404210279303acc97b495d66d0
-					;;
-				20.0.0_pre20241207)
-					EGIT_COMMIT=32f7f0010bca99ee4bd917f57272733fb2bf3bd9
-					;;
-				20.0.0_pre20241130)
-					EGIT_COMMIT=a348f223cab54b21a7b1c38dec7bc6aa2f81c949
+				20.0.0_pre20250111)
+					EGIT_COMMIT=8af4d206e0f979f68925a08f9dffd60a98ce97e2
 					;;
 				*)
 					die "Unknown snapshot: ${PV}"
diff --git a/eclass/mono.eclass b/eclass/mono.eclass
index c096acc8c40e..d4f45e5acf70 100644
--- a/eclass/mono.eclass
+++ b/eclass/mono.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: mono.eclass
@@ -6,7 +6,7 @@
 # maintainer-needed@gentoo.org
 # @SUPPORTED_EAPIS: 7
 # @BLURB: common settings and functions for mono and dotnet related packages
-# @DEPRECATED: mono-env
+# @DEAD
 # @DESCRIPTION:
 # The mono eclass contains common environment settings that are useful for
 # dotnet packages.  Currently, it provides no functions, just exports
diff --git a/eclass/optfeature.eclass b/eclass/optfeature.eclass
index c8b4911320d3..b82ac893addd 100644
--- a/eclass/optfeature.eclass
+++ b/eclass/optfeature.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: optfeature.eclass
@@ -79,7 +79,7 @@ optfeature_header() {
 # @CODE
 # pkg_postinst() {
 # 	optfeature "foo support" app-misc/foo
-# 	optfeature "bar support" app-misc/bar app-misc/baz[bar]
+# 	optfeature "bar support" app-misc/bar "app-misc/baz[bar]"
 # 	optfeature "alphabet support" "app-misc/a app-misc/b" app-misc/c
 # }
 # @CODE
diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index f8161447074a..ca6c63081053 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -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
 
 # @ECLASS: qt6-build.eclass
@@ -296,7 +296,7 @@ _qt6-build_sanitize_cpu_flags() {
 	# extras only needed by chromium in qtwebengine
 	# (see also chromium's ebuild wrt bug #530248,#544702,#546984,#853646)
 	[[ ${PN} == qtwebengine ]] && cpuflags+=(
-		mmx xop
+		avx512vnni mmx xop
 
 		# unclear if these two are really needed given (current) chromium
 		# does not pass these flags, albeit it may side-disable something
diff --git a/eclass/rust.eclass b/eclass/rust.eclass
index 30b6468d2a9b..0630d5973854 100644
--- a/eclass/rust.eclass
+++ b/eclass/rust.eclass
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: rust.eclass
@@ -67,6 +67,7 @@ fi
 # @DESCRIPTION:
 # Definitive list of Rust slots and the associated LLVM slot, newest first.
 declare -A -g -r _RUST_LLVM_MAP=(
+	["1.84.0"]=19
 	["1.83.0"]=19
 	["1.82.0"]=19
 	["1.81.0"]=18
@@ -88,6 +89,7 @@ declare -A -g -r _RUST_LLVM_MAP=(
 # While _RUST_LLVM_MAP stores useful info about the relationship between Rust and LLVM slots,
 # this array is used to store the Rust slots in a more convenient order for iteration.
 declare -a -g -r _RUST_SLOTS_ORDERED=(
+	"1.84.0"
 	"1.83.0"
 	"1.82.0"
 	"1.81.0"
diff --git a/eclass/secureboot.eclass b/eclass/secureboot.eclass
index a854061719a9..7361465ee2d3 100644
--- a/eclass/secureboot.eclass
+++ b/eclass/secureboot.eclass
@@ -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
 
 # @ECLASS: secureboot.eclass
@@ -57,6 +57,13 @@ BDEPEND="
 # @DESCRIPTION:
 # Used with USE=secureboot.  Should be set to the path of the private
 # key in PEM format to use, or a PKCS#11 URI.
+# If unspecified the following locations are tried in order:
+# - /etc/portage/secureboot.pem
+# - /var/lib/sbctl/keys/db/db.{key,pem} (from app-crypt/sbctl)
+# - the MODULES_SIGN_KEY (and MODULES_SIGN_CERT if set)
+# - the contents of CONFIG_MODULE_SIG_KEY in the current kernel
+# If none of these exist, a new key will be generated at
+# /etc/portage/secureboot.pem.
 
 # @ECLASS_VARIABLE: SECUREBOOT_SIGN_CERT
 # @USER_VARIABLE
@@ -64,36 +71,13 @@ BDEPEND="
 # @DESCRIPTION:
 # Used with USE=secureboot.  Should be set to the path of the public
 # key certificate in PEM format to use.
+# If unspecified the SECUREBOOT_SIGN_KEY is assumed to also contain the
+# certificate belonging to it.
 
 if [[ -z ${_SECUREBOOT_ECLASS} ]]; then
 _SECUREBOOT_ECLASS=1
 
-# @FUNCTION: _secureboot_die_if_unset
-# @INTERNAL
-# @DESCRIPTION:
-# If USE=secureboot is enabled die if the required user variables are unset
-# and die if the keys can't be found.
-_secureboot_die_if_unset() {
-	debug-print-function ${FUNCNAME} "$@"
-	use secureboot || return
-
-	if [[ -z ${SECUREBOOT_SIGN_KEY} || -z ${SECUREBOOT_SIGN_CERT} ]]; then
-		die "USE=secureboot enabled but SECUREBOOT_SIGN_KEY and/or SECUREBOOT_SIGN_CERT not set."
-	fi
-
-	# Sanity check: fail early if key/cert in DER format or does not exist
-	local openssl_args=(
-		-inform PEM -in "${SECUREBOOT_SIGN_CERT}"
-		-noout -nocert
-	)
-	if [[ ${SECUREBOOT_SIGN_KEY} == pkcs11:* ]]; then
-		openssl_args+=( -engine pkcs11 -keyform ENGINE -key "${SECUREBOOT_SIGN_KEY}" )
-	else
-		openssl_args+=( -keyform PEM -key "${SECUREBOOT_SIGN_KEY}" )
-	fi
-	openssl x509 "${openssl_args[@]}" ||
-		die "Secure Boot signing certificate or key not found or not PEM format."
-}
+inherit linux-info
 
 # @FUNCTION: secureboot_pkg_setup
 # @DESCRIPTION:
@@ -105,7 +89,114 @@ secureboot_pkg_setup() {
 	# If we are merging a binary then the files in this binary
 	# are already signed, no need to check the variables.
 	if [[ ${MERGE_TYPE} != binary ]]; then
-		_secureboot_die_if_unset
+		if [[ -z ${SECUREBOOT_SIGN_KEY} ]]; then
+			# No key specified, try some usual suspects
+			linux-info_pkg_setup
+			local module_sig_key=
+			if linux_config_exists MODULE_SIG_KEY; then
+				: "$(linux_chkconfig_string MODULE_SIG_KEY)"
+				module_sig_key=${_//\"}
+				# Convert to absolute path if required
+				if [[ ${module_sig_key} != pkcs11:* &&
+					${module_sig_key} != /* ]]
+				then
+					module_sig_key=${KV_OUT_DIR}/${module_sig_key}
+				fi
+			fi
+
+			# Check both the SYSROOT and ROOT, like linux-info.eclass
+			ewarn "No Secure Boot signing key specified."
+			if [[ -r ${SYSROOT}/etc/portage/secureboot.pem ]]; then
+				ewarn "Using ${SYSROOT}/etc/portage/secureboot.pem as signing key"
+				export SECUREBOOT_SIGN_KEY=${SYSROOT}/etc/portage/secureboot.pem
+				export SECUREBOOT_SIGN_CERT=${SYSROOT}/etc/portage/secureboot.pem
+			elif [[ -r ${ROOT}/etc/portage/secureboot.pem ]]; then
+				ewarn "Using ${ROOT}/etc/portage/secureboot.pem as signing key"
+				export SECUREBOOT_SIGN_KEY=${ROOT}/etc/portage/secureboot.pem
+				export SECUREBOOT_SIGN_CERT=${ROOT}/etc/portage/secureboot.pem
+			elif [[ -r ${SYSROOT}/var/lib/sbctl/keys/db/db.key &&
+				-r ${SYSROOT}/var/lib/sbctl/keys/db/db.pem ]]
+			then
+				ewarn "Using keys maintained by app-crypt/sbctl"
+				export SECUREBOOT_SIGN_KEY=${SYSROOT}/var/lib/sbctl/keys/db/db.key
+				export SECUREBOOT_SIGN_CERT=${SYSROOT}/var/lib/sbctl/keys/db/db.pem
+			elif [[ -r ${ROOT}/var/lib/sbctl/keys/db/db.key &&
+				-r ${ROOT}/var/lib/sbctl/keys/db/db.pem ]]
+			then
+				ewarn "Using keys maintained by app-crypt/sbctl"
+				export SECUREBOOT_SIGN_KEY=${ROOT}/var/lib/sbctl/keys/db/db.key
+				export SECUREBOOT_SIGN_CERT=${ROOT}/var/lib/sbctl/keys/db/db.pem
+			elif [[ -r ${MODULES_SIGN_KEY} ]]; then
+				ewarn "Using the kernel module signing key"
+				export SECUREBOOT_SIGN_KEY=${MODULES_SIGN_KEY}
+				if [[ -r ${MODULES_SIGN_CERT} ]]; then
+					export SECUREBOOT_SIGN_CERT=${MODULES_SIGN_CERT}
+				else
+					export SECUREBOOT_SIGN_CERT=${MODULES_SIGN_KEY}
+				fi
+			elif [[ -r ${KV_OUT_DIR}/certs/signing_key.x509 ]] &&
+				[[ -r ${module_sig_key} || ${module_sig_key} == pkcs11:* ]]
+			then
+				ewarn "Using keys maintained by the kernel"
+				openssl x509 \
+					-in "${KV_OUT_DIR}/certs/signing_key.x509" -inform DER \
+					-out "${T}/secureboot.pem" -outform PEM ||
+						die "Failed to convert kernel certificate to PEM format"
+				export SECUREBOOT_SIGN_KEY=${module_sig_key}
+				export SECUREBOOT_SIGN_CERT=${T}/secureboot.pem
+			else
+				ewarn "No candidate keys found, generating a new key"
+				local openssl_gen_args=(
+					req -new -batch -nodes -utf8 -sha256 -days 36500 -x509
+					-outform PEM -out "${SYSROOT}/etc/portage/secureboot.pem"
+					-keyform PEM -keyout "${SYSROOT}/etc/portage/secureboot.pem"
+					)
+				if [[ -r ${KV_OUT_DIR}/certs/x509.genkey ]]; then
+					openssl_gen_args+=(
+						-config "${KV_OUT_DIR}/certs/x509.genkey"
+					)
+				elif [[ -r ${KV_OUT_DIR}/certs/default_x509.genkey ]]; then
+					openssl_gen_args+=(
+						-config "${KV_OUT_DIR}/certs/default_x509.genkey"
+					)
+				else
+					openssl_gen_args+=(
+						-subj '/CN=Build time autogenerated kernel key'
+					)
+				fi
+				(
+					umask 066
+					openssl "${openssl_gen_args[@]}" ||
+						die "Failed to generate new signing key"
+					# Generate DER format key as well for easy inclusion in
+					# either the UEFI dB or MOK list.
+					openssl x509 \
+						-in "${SYSROOT}/etc/portage/secureboot.pem" -inform PEM \
+						-out "${ROOT}/etc/portage/secureboot.x509" -outform DER ||
+							die "Failed to convert signing certificate to DER format"
+				)
+				export SECUREBOOT_SIGN_KEY=${SYSROOT}/etc/portage/secureboot.pem
+				export SECUREBOOT_SIGN_CERT=${SYSROOT}/etc/portage/secureboot.pem
+			fi
+		elif [[ -z ${SECUREBOOT_SIGN_CERT} ]]; then
+			ewarn "A SECUREBOOT_SIGN_KEY was specified but no SECUREBOOT_SIGN_CERT"
+			ewarn "was set. Assuming the certificate is in the same file as the key."
+			export SECUREBOOT_SIGN_CERT=${SECUREBOOT_SIGN_KEY}
+		fi
+
+		# Sanity check: fail early if key/cert in DER format or does not exist
+		local openssl_args=(
+			-inform PEM -in "${SECUREBOOT_SIGN_CERT}"
+			-noout -nocert
+		)
+		if [[ ${SECUREBOOT_SIGN_KEY} == pkcs11:* ]]; then
+			openssl_args+=( -engine pkcs11 -keyform ENGINE -key "${SECUREBOOT_SIGN_KEY}" )
+		else
+			openssl_args+=( -keyform PEM -key "${SECUREBOOT_SIGN_KEY}" )
+		fi
+
+		openssl x509 "${openssl_args[@]}" ||
+			die "Secure Boot signing certificate or key not found or not PEM format."
 	fi
 }
 
@@ -123,8 +214,6 @@ secureboot_sign_efi_file() {
 	local input_file=${1}
 	local output_file=${2:-${1}}
 
-	_secureboot_die_if_unset
-
 	ebegin "Signing ${input_file}"
 	local return=1
 	if sbverify "${input_file}" --cert "${SECUREBOOT_SIGN_CERT}" &> /dev/null; then
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index d85994855704..a52fd268c8e8 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -3153,21 +3153,24 @@ XGCC() { get_make_var GCC_FOR_TARGET ; }
 
 has toolchain_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" toolchain_death_notice"
 toolchain_death_notice() {
+	# TODO: For bootstrap comparison failures, include the stage2 & stage3
+	# differing objects to avoid having to ask reporters to manually collect...
 	local dir
 	for dir in "${WORKDIR}"/build-jit "${WORKDIR}"/build ; do
 		if [[ -e "${dir}" ]] ; then
 			pushd "${WORKDIR}" >/dev/null
 			(echo '' | $(tc-getCC ${CTARGET}) ${CFLAGS} -v -E - 2>&1) > "${dir}"/gccinfo.log
 			[[ -e "${T}"/build.log ]] && cp "${T}"/build.log "${dir}"
-			tar -arf "${WORKDIR}"/gcc-build-logs.tar.xz \
-				"${dir#${WORKDIR}/}"/gccinfo.log "${dir#${WORKDIR}/}"/build.log $(find -name "${dir}"/config.log)
-			rm "${dir}"/gccinfo.log "${dir}"/build.log
+			tar -rf "${WORKDIR}"/gcc-build-logs.tar \
+				"${dir#${WORKDIR}/}"/gccinfo.log "${dir#${WORKDIR}/}"/build.log $(find "${dir#${WORKDIR}/}" -type f -name "config.log")
+			rm "${dir#${WORKDIR}/}"/gccinfo.log "${dir#${WORKDIR}/}"/build.log
 			eerror
 			eerror "Please include ${WORKDIR}/gcc-build-logs.tar.xz in your bug report."
 			eerror
 			popd >/dev/null
 		fi
 	done
+	xz -9e "${WORKDIR}"/gcc-build-logs.tar
 }
 
 fi
diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass
index 0e6b9b43e557..12b689f0f4b2 100644
--- a/eclass/verify-sig.eclass
+++ b/eclass/verify-sig.eclass
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: verify-sig.eclass
@@ -48,6 +48,8 @@ esac
 if [[ -z ${_VERIFY_SIG_ECLASS} ]]; then
 _VERIFY_SIG_ECLASS=1
 
+inherit eapi9-pipestatus
+
 IUSE="verify-sig"
 
 # @ECLASS_VARIABLE: VERIFY_SIG_METHOD
@@ -423,6 +425,36 @@ verify-sig_verify_signed_checksums() {
 	esac
 }
 
+# @FUNCTION: verify-sig_uncompress_verify_unpack
+# @USAGE: <compressed-tar> <sig-file> [<key-file>]
+# @DESCRIPTION:
+# Uncompress the <compressed-tar> tarball, verify the uncompressed
+# archive against the signature in <sig-file> and unpack it.  This is
+# useful for kernel.org packages that sign the uncompressed tarball
+# instead of the compressed archive.  <key-file> can either be passed
+# directly, or it defaults to VERIFY_SIG_OPENPGP_KEY_PATH.  The function
+# dies if verification or any of the unpacking steps fail.
+verify-sig_uncompress_verify_unpack() {
+	local file=${1}
+	local unpacker
+
+	# TODO: integrate with unpacker.eclass somehow?
+	case ${file} in
+		*.tar.xz)
+			unpacker=( xz -cd )
+			;;
+		*)
+			die "${FUNCNAME}: only .tar.xz archives are supported at the moment"
+			;;
+	esac
+
+	einfo "Unpacking ${file} ..."
+	verify-sig_verify_detached - "${@:2}" < <(
+		"${unpacker[@]}" "${file}" | tee >(tar -xf - || die)
+		pipestatus || die
+	)
+}
+
 # @FUNCTION: verify-sig_src_unpack
 # @DESCRIPTION:
 # Default src_unpack override that verifies signatures for all
diff --git a/eclass/zig-utils.eclass b/eclass/zig-utils.eclass
index ca72e89ed6ea..5502d997935e 100644
--- a/eclass/zig-utils.eclass
+++ b/eclass/zig-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: zig-utils.eclass
@@ -54,6 +54,14 @@ inherit edo flag-o-matic linux-info
 # and most likely changed to more common in other eclasses ZIG_MIN/
 # ZIG_MAX form.
 
+# @ECLASS_VARIABLE: ZIG_NEEDS_LLVM
+# @PRE_INHERIT
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# If set to a non-empty value, the package will BDEPEND on a Zig package
+# with LLVM enabled.  This is currently required for packages that require
+# C/C++ source files to be compiled with Zig.
+
 # @ECLASS_VARIABLE: ZIG_OPTIONAL
 # @PRE_INHERIT
 # @DEFAULT_UNSET
@@ -69,9 +77,15 @@ inherit edo flag-o-matic linux-info
 # For zig.eclass users: see documentation in zig.eclass
 # instead.
 if [[ ! ${ZIG_OPTIONAL} ]]; then
+	_ZIG_USEDEP=""
+	if [[ ${ZIG_NEEDS_LLVM} ]]; then
+		_ZIG_USEDEP="[llvm(+)]"
+	fi
+
+	# NOTE: zig-bin is always built with LLVM support, so no USE needed.
 	BDEPEND="
 		|| (
-			dev-lang/zig:${ZIG_SLOT}
+			dev-lang/zig:${ZIG_SLOT}${_ZIG_USEDEP}
 			dev-lang/zig-bin:${ZIG_SLOT}
 		)
 	"
@@ -440,6 +454,10 @@ zig-utils_find_installation() {
 
 	local base_path="${BROOT}/usr/bin"
 
+	local -x ZIG_GLOBAL_CACHE_DIR="${T}/zig-detect"
+	mkdir -p "${ZIG_GLOBAL_CACHE_DIR}" || die
+	touch "${ZIG_GLOBAL_CACHE_DIR}/empty.zig" || die
+
 	local selected_path selected_ver
 	for selected_ver in "${zig_supported_versions[@]}"; do
 		# Check if candidate satisfies ZIG_SLOT condition.
@@ -451,6 +469,9 @@ zig-utils_find_installation() {
 		local candidate_path
 		for candidate_path in "${base_path}"/zig{,-bin}-"${selected_ver}"; do
 			if [[ -x "${candidate_path}" ]]; then
+				if [[ ${ZIG_NEEDS_LLVM} ]]; then
+					"${candidate_path}" test -fllvm -OReleaseSmall "${ZIG_GLOBAL_CACHE_DIR}/empty.zig" &> /dev/null || continue
+				fi
 				selected_path="${candidate_path}"
 				break 2
 			fi
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-arcade/gnome-nibbles/Manifest b/games-arcade/gnome-nibbles/Manifest
index ba8d3f524772..405ffb099d7e 100644
--- a/games-arcade/gnome-nibbles/Manifest
+++ b/games-arcade/gnome-nibbles/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-nibbles-4.0.2.tar.xz 418992 BLAKE2B d94e0c11c683765ff50ec4c72669b6ccdac405a107d1f68675b95ae386ff3ae825e0783ce45f26e974675a243d98a00bb1be224ae29e5f25e3735cf1bbf25990 SHA512 a0f82e4860cc05f9b2fdd2037a59088ef1747e17f660778ba68d6eed328b962e27606dfe2e7a9b0a8f46c68bb5f6ff26f7048fae24ab17fe8d63685656e85025
 DIST gnome-nibbles-4.0.4.tar.xz 419784 BLAKE2B 5ddecac8818fe512d84a4d007aa91b2bb747686f3d8471ed4f57b02584755ab0b87f4b479ab445e1197187a7d9a429e6489dd57a9434f7a1a7b7b3d02bee34ba SHA512 751dc492d5facd769e81478e93c55afe7c9a8e64a31e224568d67188cdd07fe568709ee211fe18452e10aa7224d5104284c53b95b52f8721a8e0ec28fe7823cc
+DIST gnome-nibbles-4.1.0.tar.xz 406808 BLAKE2B f50cdcdffdd9847b02f44c50118cb1c3093e30efb8cded142c7c202dffe805867df7544bd8e13289ae6e4599cf6c115f3c0ee634688c8f335c128987f4aa6751 SHA512 bd7cffd267036145997e2845c55420bf687c37713b6f4f97164a5a7d826ae3b7daaa4f610379eaeaa4b13b9cf4cf353156ddf42b3662afc0cf22fbd62b85a510
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-4.0.2.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-4.0.2.ebuild
deleted file mode 100644
index fed88c796bfc..000000000000
--- a/games-arcade/gnome-nibbles/gnome-nibbles-4.0.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Nibbles clone for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles https://gitlab.gnome.org/GNOME/gnome-nibbles"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.78.0:2
-	dev-libs/libgee:0.8=
-	>=media-libs/gsound-1.0.2
-	>=gui-libs/gtk-4.6:4
-	x11-libs/pango
-	>=dev-libs/libgnome-games-support-2.0.0:2=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	media-libs/gsound[vala]
-"
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-4.1.0.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-4.1.0.ebuild
new file mode 100644
index 000000000000..b190bbe669b2
--- /dev/null
+++ b/games-arcade/gnome-nibbles/gnome-nibbles-4.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Nibbles clone for GNOME"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-nibbles"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+RDEPEND="
+	>=dev-libs/glib-2.78.0:2
+	dev-libs/libgee:0.8=
+	>=media-libs/gsound-1.0.2
+	>=gui-libs/gtk-4.6:4
+	>=gui-libs/libadwaita-1.5:1
+	x11-libs/pango
+	>=dev-libs/libgnome-games-support-2.0.0:2=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	media-libs/gsound[vala]
+"
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/games-arcade/osu-lazer/Manifest b/games-arcade/osu-lazer/Manifest
index 998998e8dfa2..a0af0810ef87 100644
--- a/games-arcade/osu-lazer/Manifest
+++ b/games-arcade/osu-lazer/Manifest
@@ -1,4 +1,5 @@
 DIST automapper.12.0.1.nupkg 138533 BLAKE2B 181a6bf239470e3b15cd597436a0125f6f8796de2a6330e73dc02cf9a457053a5e9fc3f42f545ae5e53287625f367d34d487cd7a8f9fbf9a5e9ac328496177b2 SHA512 3c9f6a91bea1634363542be8210a976191685db6864c16d1e743076e7a451e668ee62d0289a653d6fd2ea2e8aab08499ae1da8c7e5963b59b977cda007bbdbcb
+DIST automapper.13.0.1.nupkg 143069 BLAKE2B c38c52f66717a55b40cff148a54b71a8b5803f7255bd551a0aae5339d321c0205018b3630818aba86ffe1430dcee18dcb389c22616a0224e2c51c8972bdc75f8 SHA512 86c21a303f4725f738f4318e448cabdab8c27770d00508f1079e218a2f308dc709329d32fb6ac7576b7ba6c2748c882a6c2883523f9d26943c3b09435a8f82f4
 DIST castle.core.5.1.1.nupkg 800128 BLAKE2B 28c469b65fa9898e0dd87a416b015462db1761f11429654f613541245b213ce62f77257a63770468f8019d635bef20e50e60f620359d0e39ceafbcc7bf88214c SHA512 378a149ebfaa12d00cb35bcaee8806803df7bc75980c9e0c67f36e3e057d6af2abaead24cd8274a9595c7ac74cb9597c9d6913b1125b86e6b156a66f7a1ac2fa
 DIST deepequal.4.2.1.nupkg 94059 BLAKE2B e06beaee7e528c0f62cafa823c78f59e29cbb4be729814172a460d1d1eaefe8af07cf7c01dd561333fe508034e7833aa5b98a995fd7f00162945d02eb9854f5c SHA512 3630a356b877119de77de42943078adf182397ac17e75fa925d2facc5bd3f013d416317cca343cd9ae3276c86c37d73f8076c9bf52bee9b98b6bd8e8e2404c87
 DIST diffplex.1.7.2.nupkg 92255 BLAKE2B dc735fc95dad6a62d97e0aacf27f3b6cf2c094cfa8d490c125f67f93fc7ef416665033bbdcc778109a08b7cf2adc9440e314235796c290e3d156e1a75ee27348 SHA512 24fb44832dc3c975afa54eee2558a43a1c14e5ae0dfdbde80a155f61efe8f25a9cc8a290a8c24916a8db648afb90a91ceec800ea24edb0a9af0c37074c864d99
@@ -7,6 +8,7 @@ DIST ffmpeg.autogen.4.3.0.1.nupkg 1537629 BLAKE2B 2be0069229ef94461919476076c248
 DIST fody.6.8.0.nupkg 843254 BLAKE2B f1ef8deadd1e2f4b8bf489664dd5763eb92bc13c232ff540b62821eae6d30f62e9d4eaffcd890510414c58c03d874e5242c033225a25b297ee8b7f198f4bf3df SHA512 c0a2079cc17a50dadd7f000e98317b25e133ff8a7eb5c8e15b3cbe107f1a4dcd46f5d052db193722667d85bbec3b36c6ac169329356ac4d7e3ea68a282a64e33
 DIST hidsharpcore.1.2.1.1.nupkg 111978 BLAKE2B 73e57a3e9af3a9b221a857fa7f015704824fc073c9bbc75898d5b88611322d64e3383b8993e8333c839e019860ad0dda5328ec2c43a83da3f17115c75bf8c8af SHA512 7234be491380eeb0f9c0725b54907821013227a72e4a5324845be4d4cc0fe438a46764d0f662e4cb5beda5db4991d50a41c4ecef43e3736ccc78693092000726
 DIST htmlagilitypack.1.11.59.nupkg 1502019 BLAKE2B 231efb7cdfab35570ccc3b0954cddc953b476f97dc1a13733336a344cb7c97aff2219ad1a36788f6ba973d279e1acbf310edc0eca746faeb184dc9c514333350 SHA512 b9a90421515551ca5f982af0d49b119a7035dc99908dc13979065ed909cf31bf0276b08092f47f8c4d980918f2da026ca2c0ab961d734b9f066114030ab508c9
+DIST htmlagilitypack.1.11.70.nupkg 1511795 BLAKE2B 2f1dae28e05154cfb499ed96f5dd6856de94a128c22a91479b2201594981cbcd242ee69c93413bd6128a9c0a94370d54d06ccd42c45d265baccbdc309369d714 SHA512 c57de568d5882f350cb1c9969a6ad83d5a565aa22106f83d9f2c5c41db79d46dfaee233ec84b4da962c4cc2e56642e5ce780c476fd14a88d4437336742d1e027
 DIST humanizer.2.14.1.nupkg 28677 BLAKE2B af00a07cc6f4067d00ec44056985d101867eaa167485c4288aae39d7ac5b0f4247473388079216a474ee134dd0f9c5e60ae5b496d68fd19196cfd3e623f4d8d8 SHA512 c167af0a6287547e3d4e0d16b31f15742816d0284acafb21dde5e5c8baade8b8ae92343687d311cdcd9fe8991a96ba24c1cdf2eb7bc4d4910feee1a6e454158a
 DIST humanizer.core.2.14.1.nupkg 538179 BLAKE2B c3e3c3c7d3fb3484dc85f5eaf25ff4f4428cd36b3458c5664fa7c29cb62ea291aded48a369823459d684ff79ce63a16650dcd37e8cd123c23ab943faea92cfd7 SHA512 cb3a8653f1ca34b67d52fafa92f49cdf0615fd2e4efc8be4948516e5617b32e8af18b63cc12e486672cf92dec3d4a5bc12dd849e5d08dcbce0daf196336e17b3
 DIST humanizer.core.af.2.14.1.nupkg 54985 BLAKE2B 137f8080650b0ab2de922adc5aa26b85925625fe6d6928651bda111c534772075f55d8304289d35b3b91d4e750633a7d969feebf5914d9986a449077eefe9dd3 SHA512 ab9dc8bc4382544e4dd36c069babac009c5b801bcd6fa9ce7a12340e593e8d95736a661016bb628db7b5ce3ce5648776b3896cbc4b24cef6d6b07c8950f1d2b8
@@ -60,42 +62,68 @@ DIST humanizer.core.zh-hant.2.14.1.nupkg 54889 BLAKE2B 4a36cc884794d7ef9952e33fd
 DIST jetbrains.annotations.2023.3.0.nupkg 178167 BLAKE2B 33d0925118b20ecace0cf491ad5533ffdc282fa395e41f030fe49438d8753e9c244eeb65950e5c1abbeb1f8383526fe780cbb4f7df001a260358ac2fce84482e SHA512 29dae1d9dd6197048e0ad1d41749ec19e2b4a0a94c280f29cd48af3d507857cc8343b8693504c646a9f42ddfda69ee3e60fc8a65c0c7ce5463d5b8a12d7e455c
 DIST managed-midi.1.10.1.nupkg 1575444 BLAKE2B 880343891e7dc3d48a5c673fa7929399f1cd01471d4701348ecbb9d4772dfab07e3cf6de12a4f041e8c9697d95e06fa9eb8a45055c202c69658eb5a44dd9efff SHA512 66649487408286ae66014a9b85283c77652ebb9d70c48b34bc40e3e825bd76bd93052d291ade3fc6ebfee2a69df6796b231e3e41242c2fb9492e4b4764892b94
 DIST markdig.0.23.0.nupkg 967616 BLAKE2B 0957fcbcec7f3c5324384bbf7f15f1d6604c9698a0f09daf6f352c33c7f82a19692d51bebc8b14e8ca740e3d3cdf7b384fe12376905d0a1872393c070b9becba SHA512 0360f8993ddc9b54c8309e3a1ffaa4f09009f94f3ce0f9b02422cf2c3d72f7f5730d8aa25c89eb164bee126d0b8b98ac080009ed26d1e830fe5622bafc88a1b2
+DIST messagepack.2.5.108.nupkg 326216 BLAKE2B b593c5150773aca28aefc2a8b34e24587907e4bfaa73857f3c3117b40a30458058e85f03a3dc3a02b6d7698a67ade141bb3b0c4b8570393a7a46a5ce43ae73d7 SHA512 e2ffda229151542f8f7e14102dd38dadbece62e9818fcda5dd25f7102facc14896d04a310e4c5f201edc59658bbaabb9d15f97ed73bbdfdfc1bef809012f5487
 DIST messagepack.2.5.140.nupkg 326288 BLAKE2B 6c45d4d6e0295db62ac5840c5ff7d23bdd265850ead1d7b7f7f4a54fb2b686b364f26e1dfd5d8d663ffebe9de27548a55af8c44f4fcc54d815cf5648625ac8b1 SHA512 36388453fb55da0f9a2ff523d60a8d6677ba3f19b10742641a5051a23559f8ff89c521937b7d928e14052f786cf5dc613d98174185d64015520a1c0c577bf030
+DIST messagepack.2.5.187.nupkg 493345 BLAKE2B 194c1a4541e2798c99676cc6e2ebd5596289c3b93a9bb9d7e8e5a32e82bfe3c7ec5b38b93dcb05a42da5661c410283bc92bec693d1a8f5eeb323043be2aca6aa SHA512 819e902f28a99e01ebfa7fd75969bb4ccdba8fdbe433af81e915c1baffa26bf0e326c1baa496906d5bb3ffe441149ad277df1e4e4f82a87c2b1350ed1724756f
 DIST messagepack.annotations.2.5.140.nupkg 19490 BLAKE2B cd920507ff9afec7bc5a6088ef027298d259e7c56f206e36e7987ec3450854766c3038669a8a167a89859184acf523b3c917fdc626bbf48e32de35be8e54c349 SHA512 042e41e299fe9c9ada907c99e791bf7e4e3f24cc5c9ee693b79290bb5c1c200a352cf124e2dfa94b9ce1ed61160ac5d1c0c99452678b4eb888f3364a271d89d6
+DIST messagepack.annotations.2.5.187.nupkg 20904 BLAKE2B ab0c7118597f7fcc0b91eb86c1d5be6ece59ea0c191ee4e78aed9301df1d7f1f1819527012a994612589fde63988ac90b04956e70c0ad13ea425d43125f872ef SHA512 d484e11e76ccc3a021f4c6ff6d97d6130643a3765bb14f6eb0600e782b3fa0f5ac925addc550cd6478c883a9b2be3950bcbee83216a011e6fed3b9232f8d7469
 DIST microsoft.aspnetcore.connections.abstractions.7.0.15.nupkg 142084 BLAKE2B 4d4d77dc236c63e2ed967205b97b17191b1845ca549a740728f0e156111c7972fef05039b37b8f7ac32e853f6baf1bbd13667c40cc009bb5b41c7134693f2472 SHA512 a1d68cb1b333f0740ae3e0ca03e0324ef59e6ece8ae1148a2b9c0611a45b95ad874ae9d62144197e780ec139817b2a5d203f4d661116ca10a6e1bffa58fe3cd2
+DIST microsoft.aspnetcore.connections.abstractions.8.0.10.nupkg 158002 BLAKE2B e1fcbad4e3f39e4ec1409248ac6f5b8fbc5a67ae87e86f02258a75501acb55957d25f4f12b1979c9d85dae2e58af74cb66967a320a3c3441fce154038bd29388 SHA512 910cae02b82bd9ab233d876aff7d9f8684fbe7731dd22e6eeb99a3159e891367c42c3b31507f10e2b457947023d0fdc8ab42e96bce9cc66112a8efe34bd4827a
 DIST microsoft.aspnetcore.http.connections.client.7.0.15.nupkg 246918 BLAKE2B 46e1db194997b114c08977982c7a95b69dab31f51d21a49f097c235d3e6f8c9a8b5ba69f347bdb93eea94ee7f503ed2c4683a994cb1566b2dc191baae8c6a8f4 SHA512 4fe8f2d8970a44cfd44e25ea278548dc38690eec07b64eb11861128b8d3a92c8e093c40f57de3a5913e5b9bdec0bfb5b24dc6165213cdec1e4a0fbfa6b237b6f
+DIST microsoft.aspnetcore.http.connections.client.8.0.10.nupkg 264833 BLAKE2B 73a486176b657afed8b32a60cd90986482f2f50a0d392b7ce0aea9b6caae1d5da3b32024a52615b414b3ef7cdaa3dd44e05cfddae86b13f680ff5ae5f7b027ab SHA512 034512d32b2421c4384c524f2417da46c3dfa5646a61f2bbbd200e03df6ad5a6deb9bb69ac4a0e9145b74fa8ed1cadc2fdac0d516c1ae30e43ba0e9d5c800228
 DIST microsoft.aspnetcore.http.connections.common.7.0.15.nupkg 89255 BLAKE2B e3c253c0f88923c8db3bf46711216e2b891cdf86130647786f9706714cbd17c61d507183ff1b333c5a8cf043383045b8eacd8e97d7a8b83afb7aae3c569612df SHA512 41b891d41389b1ccba4d0320a08d0e63c7d3a1a1d46b18d36222f5709f27dc904face73ed7b874d06afbebb1e3fc979fa5dc4f1ad3dbe78f362942d1af729151
+DIST microsoft.aspnetcore.http.connections.common.8.0.10.nupkg 98064 BLAKE2B d05722757f08e90636e544b77aaec4677f9c126c52ba11e5fac8c7a182826a0b08550f659907137829e1ade518cbf0edff5858fd3e77ee45fbcd41578bec5179 SHA512 41678bb54161c6fdd4417d2b49ebcd7c7c073090f8aceca88c7e0d2f952defa790e9a77fff9aded559c12b6cfc34b33cfc8b283e67df3be976c406b5a177be2d
 DIST microsoft.aspnetcore.signalr.client.7.0.15.nupkg 75274 BLAKE2B c48acfe35bfd6791905e6436a55ae8aec11af8962ed97ed2d79725bc443893210b24f251a48b78a9e46408b7243bd50562b54576ef3cff9d8e05ed3c2f3a6860 SHA512 f19cbb610108182b9d7bba220a8ad05281a9e5fbf326f967ac37700dfe710cdad6e5c0d49b74ef1c6e015c0e60f715107cc9e63018f3662c02ec98e1b72ea2ec
+DIST microsoft.aspnetcore.signalr.client.8.0.10.nupkg 86431 BLAKE2B 4245cc157db47257c0dc2865d2b69eb630a92fe169fd50a6c24c1268cf3c7dc9a15f9b12b9687d69494038e4c8f7dab8ea7940be98b4d82fc1b196c89138d5d2 SHA512 0bf1bf445946b5f2ff6d19039159c4db9a93b33886c8be8be09a4b2877fa9ba0ee36d04a7b5db285c58829c1210859812f0008118f18e0d4a1397251e6c7655d
 DIST microsoft.aspnetcore.signalr.client.core.7.0.15.nupkg 345287 BLAKE2B debe24730130febe00c9126453da141296085a6be59d4fc58c018ee3d2a376249432221f7b98e456f7cdc524b497c2e884d594f0c2d89e30b84185f2faff118d SHA512 52408d148663bd8b40524b4cf8dd9b418fafd5f8a87059e21fe537f648da235f159ab5c1f2ecc6528cf19ab6fc5ddfec6d21a530d16d7e6839fa523836ee8df1
+DIST microsoft.aspnetcore.signalr.client.core.8.0.10.nupkg 382185 BLAKE2B b9cb342a587721fec4743948109e0e5aa1f468f001b669bf76e3c1e021505a5ee7be61ccce55418d3e34b0c12b2e33aacad01db2c6b9595bf83a8eb0aaf837f2 SHA512 33622a0741bbeba38bb3efab8dda2a4a7bf449102684451c083ab16627f6f34a06d2276620fef7908cbec82e3eeedfaa1b2958632c19a709567eded7dc9a965b
 DIST microsoft.aspnetcore.signalr.common.7.0.15.nupkg 117149 BLAKE2B 266f890ae7040ea590e7bffc8f4f73d5843d6876e830b1964404959e99054f4ddbe855dbe19485e74aa8eefbe6e9cdad266f0b01723b3e54f3177ac4a35ccb93 SHA512 4046bd2e12d79732e6f105d3a5d3cb41a7740a5ffdef0ca6dcdf37a1a73588858bdf2e01edc8ce57cdfe3b214056d809ee23021e0b7fdab34eba89d7f60fb5f8
+DIST microsoft.aspnetcore.signalr.common.8.0.10.nupkg 127734 BLAKE2B d590b17334532dd69acb8436414463488b8c026989d82a40a7ea5e65cc74d0f7053e7487593c1408c39a51f2884b89973b4ab9343f295fba9a23863e8c716a3d SHA512 39082d0d86d6e564f1e747c10f5c9ac0ebb96e7ed362d3d18f7d0c416544526ec16881892344989a015413303c77259916cebb0a4c789677162c4e3c10af5d26
 DIST microsoft.aspnetcore.signalr.protocols.json.7.0.15.nupkg 101258 BLAKE2B 04fd04a121230c0a1d23d5197bf993c468048ff03679aa90380b91a658ca75d72e1c5eaff8ad94aa9c4ec5a1978ed2ba45589ae1c2c19f06c41f7d0d33b473e6 SHA512 ac0cad57a727c1d55821a733e80a251492325ff0f77c6dc54d92a00bed874d35a3cb0a8dfb9d48db75b674625858a2e0933b387868c3c4cc503c0c580a901e8a
+DIST microsoft.aspnetcore.signalr.protocols.json.8.0.10.nupkg 109560 BLAKE2B 221ae1817f8aa2352e647e40b57c3479b0f954ecf6fef4dbdf171d84d07adda0dfd024078c1129b8ff4ceca2a009932a16fa8e5e235aed594e9084e90acbd7af SHA512 3389b73f67b14bc697d0ae77239a7249d59e77488151b09d51b6f4e10b52a7dec541ac7153f673dbbcbd17f22f4f59f97903bc0a73a25ee018ab9ac3a6ae0e4b
 DIST microsoft.aspnetcore.signalr.protocols.messagepack.7.0.15.nupkg 104024 BLAKE2B aadc76cab45feb774829628b944ab6ac331eca93ea0e0f9cdbcad28bf46416107231d66e7201bda9905803f751d84b9e20245b3cd04c8e212ffe8e13174a6494 SHA512 289c7f3355c179ebc39a49397943e83e11943cc624f326a45e7debb91f3c6d6539021ebaca5e58b821b3c5e3c2a21e01ed95ccb683fdcc4d9f43c4df08fe9d70
+DIST microsoft.aspnetcore.signalr.protocols.messagepack.8.0.10.nupkg 113660 BLAKE2B 15ecd97560953f6ed891ffe213e2a118f6fd024dae7bc83fbe38f5e788dc7ba61a985d12197185adbeab28a594078575475850cff8c5af89e3aaefbef48d5284 SHA512 bf2672bd009c362c3663942a15249677af451a1ba9ad9ec56bf86c9ac89df0c913dc8493734993eb0a158e99bdf57d628cd276971d8364517c74f9af743f99d5
 DIST microsoft.aspnetcore.signalr.protocols.newtonsoftjson.7.0.15.nupkg 112551 BLAKE2B 5ec40d6c1615d199175d48cd760c6f5e873fb5ef5097fbdd33b7f3dbc4c3dce695ab70e79f7e2e2f5df634babe9698cae307b3f4d8a8a0616fe12d2c74ba965c SHA512 629906d99e1a2b0590e9833fad32c6b895c6e84f5d6a390adcf423a6c43c8e61487f87d88b4f58fe195ef64615bf31b8fe7fc846fa5c9b0349da9da20587816e
+DIST microsoft.aspnetcore.signalr.protocols.newtonsoftjson.8.0.10.nupkg 120681 BLAKE2B 8a85c969730990144dafe3f80f9c8c07a62583cedcafa63d372bbb35368cc0927d1ad09ff397a0d22f0e3ed9334b113ff336757accfca4e81d07338fac19c821 SHA512 fd41d91c17531d7686a5b89f6963c906b5eef0f6c5ae923fcf325c501631966bdda2905dd1054f29139dcec89da4e4a6dc37ee8423fc39815825a4b5190590b0
 DIST microsoft.codeanalysis.bannedapianalyzers.3.3.4.nupkg 637301 BLAKE2B 827a5670efb7256d3db4de82742cb72cf5b0fb28b0f639bfbd7ade7a520e6b1c535eb29cdcc907d3494db7f6ce3ca29c03161c9119eb3b6693853d880629711b SHA512 0b8e5e7aa98142864edd0073512f11c899f9b5aad535012726477cc1189de63252895a829c7ffc5730d09e5df8a6db7ccd9d0c6a17007bc94ca0ca5a36e04042
+DIST microsoft.codecoverage.17.11.1.nupkg 9139653 BLAKE2B d94c2b63216980d3e40f651004de73a8b704677db8e00d6b777bd699847bf4e9991af08c3cd9f1ce93d95a34c0599710d908f95cc8722fca074a41ae73b21bdd SHA512 649e02875bbb01e988ccda5cd016cba32b09d1d26295d22f0326cbdaf0547dbaa1a3ce8dd95ab35fd3c635cf5af697a667fff563a00e27b489c62fe90af2e11c
 DIST microsoft.codecoverage.17.7.2.nupkg 9116095 BLAKE2B 2646e030cff43543d271b79eeca75b8b3d62dec1eb2b32b4f7984720b0d124684b9d3002f5167f4d8cc95b4c9cd81206940dafd952e9b74264f6607a5a576af2 SHA512 791aaef8ade199e2f88302544d81db8c04074b455ea35e33d941d2d3e6f60f14397725290283baaef3afe6fa591173debbb66c5afe5d193da622d669a6365da1
 DIST microsoft.csharp.4.5.0.nupkg 627579 BLAKE2B 38a3fc28ff01a1af2a368b1a3d6d17b37dc78dc2efcc426a70a70893815ebfbf22a918ad04694e8c123985521e295b4bb93d130d372e731ea35e11a290488a0a SHA512 c9659e4db182cc13a544f583088c624d95b579c66231b6a8d194fdeca28459d061acbbd4a94f11773921cee091433be8c73c6547bbf2b4ee3738e805764c6fea
 DIST microsoft.csharp.4.7.0.nupkg 627100 BLAKE2B 114a5af7151feb80785619d54caf5f928558a034254b5c2e185820a441f017705c933b0d66a31d395ce516a81f97655cfeca46e37397082b1b5d6ac6f507301a SHA512 2c96988515f95714d4b83f5650f183dc6a564e0b3cf5255fa0e3ef48476debab4bde542f9f2f6c47f6620b7a71d6a515e4415e6d2e388b60817a29621d5690df
 DIST microsoft.data.sqlite.core.7.0.12.nupkg 203984 BLAKE2B 3ba36a3cd7722fbf5d044c7a61c1840907dace308b5556fce65f5274b7d41a85d13e08a0beaf32b261d04f7d4e325f9f065a4ccc4c9a81c09412c5f3ad3fc139 SHA512 4c0a8239cced13a1d22b9166dab97996546ef3b0f7a45948d7f123f5b2421b91d8f53199790a9e56cff79831b032221094af742b4a67a6cf2da3baf3cbcd8183
+DIST microsoft.data.sqlite.core.8.0.10.nupkg 294862 BLAKE2B ef4c42e858d2a852f26fe256958b07201d184aa6e1582b589fdab8dbee9bf5cf013bdeb6d2fb5328a65dc49aff685198f37a1b6e527bc491dae517bcc606fe29 SHA512 64a77435f8580f11d8f76d000d0f1b3c9ba2c5c2fe116e07243fcdf3583e3d9e2007e5e81595c528e73bb567acf879137ef53cbcb37ffceabb8331bd94cc454b
 DIST microsoft.diagnostics.netcore.client.0.2.61701.nupkg 55078 BLAKE2B 5a6ea1105815d11353b3400f65bee8716a1387f3caafe6a44acd8aa7561f2f4a04a1aead5bb21785d8a988cadee3ef43d9c36402a86775b24d9bf70b047a2de5 SHA512 c3075fc37ca749ea9785b37bb0d4dd99fa37d0d1549fb94f5ad27d8fd114f0091584ac9a095aa2e8eb1738e9a47125891e3906267e25ce92cc1f562b7028c350
 DIST microsoft.diagnostics.runtime.2.0.161401.nupkg 1342678 BLAKE2B 4926898fc6ab1611190a130f35e553ac7a9e6235f82815fafb14771dc0e1640c4d3f166216ba8c86ee8cc305a5503f9bbe7a3b066f8f58b23f3d1f4d6cb22936 SHA512 ee761f2be554068e9318a8fa1db087985064270db46d752f89119ae1ba8abc87ad55b4925930f78fc032356b8bd22a7e6851c71e416c69ab31ee70f80ab24b5c
 DIST microsoft.dotnet.platformabstractions.2.0.3.nupkg 38880 BLAKE2B f1289ea431cfb99f8ead92d777da1133ddcc2cce35308cb6afd0671d4aebd96f99ef0c356d111542dee1e1a9e3bca1b9019de53f721f08faf4bdb89aa9b09d2a SHA512 4a33f381937a429e15edf0ad579810d9b5f8489c051d069cd935d197fccdf99e942caba8980b7f3dc960094f58818b165af2829cdd2f3263fb53bd5d9d782db5
 DIST microsoft.extensions.configuration.abstractions.7.0.0.nupkg 124609 BLAKE2B 149d147fef9bc0f2ee18cfa850ff5d057043b14f236914dc372827a7d1da67b6522660979a3bc29b23dce64901a903430834993068206fc4d35547e940e91cb0 SHA512 7871e5c4031dc57220f78749ad7427542e1ff7e7149e5859ac9f3e7aea2ae2dbb159c9ebaaacaece83427df317d7357530428f1a680082cdabcafe08d9128d0b
+DIST microsoft.extensions.configuration.abstractions.8.0.0.nupkg 149230 BLAKE2B e3d49a61ded7a88e0ffeccf5901f1fb021d66ef9914a5e5e7e43e69a193253f1009a55cfb2199579e017dc547050b77f7e777f5fe944dde609def9f66be3217c SHA512 3316170910a94290c8df4fed26fa884a47dd9bf974eb7ad22368d5a63308660a01d2dab4a44662061dacaeccf4ba09cdabfccd4636f76ab3178becec5ad31a2f
 DIST microsoft.extensions.dependencyinjection.6.0.0-rc.1.21451.13.nupkg 198627 BLAKE2B 385ea8935b27604db8602fa2aeca84772f60be864872e2e6138f9c867309793ba43ecfca19c6fb53bbcdabb583ba182d83c84ad77333d45400e9586db08d00b4 SHA512 cd6cf1b59b8c9030a0d892006d8a72cc95f5d6c0427dc7cf9d98dc00e11b83167abe54247e9a10ecaeb16121e66a94cdaaf4ac5e3d35e25c2c71fbfc03966245
 DIST microsoft.extensions.dependencyinjection.7.0.0.nupkg 272235 BLAKE2B 70d1cc2e591c82a83343589e61b000599ad2ae2f6a0d7ff492e5413cf03dbec857ae113950d36d95611bae1e42d3d9eaeacb7d7e332bc444efc38339b333431d SHA512 db7584ae7dd6e47fe1c450ee6f01f567847f744a4f86ffa7eeeba04a0e573c88e371c89440323c281c6d2260d73015fe085d4ad5fb97d41136fe683dfed4a9dd
+DIST microsoft.extensions.dependencyinjection.8.0.1.nupkg 344439 BLAKE2B b42bd86439e56ede6a9e35145484159867cdbd6251d1056a3b531f90a03c7a8820dae944d5dfc2a57579afc293d324d645147f1b237c2817b675de0cbd99a2df SHA512 b6d2c496ce68bf91ac7499eb2a8aae34347e648b9be853e535a36044afcf8173561650aba33068346f458062f29c8e0c1f5859f73800d512ec0f464dd467d00f
 DIST microsoft.extensions.dependencyinjection.abstractions.6.0.0-rc.1.21451.13.nupkg 138519 BLAKE2B 5a7cb5f01aeaab67492cbe2ed0ea7ba605040867ce6c60623a4a6804ff3d3d6a0e3c5a36a800d242ae12c66163629c40d824ff30a8aadf13b30ecc5458bba86e SHA512 7e764cec76616ede23c006221e6da4f7591cd037c4c76aa61f8db8828c0dd08474a2f95d3a297ef41cf259553810fd0784ba1148f30a12551a450838449ce614
+DIST microsoft.extensions.dependencyinjection.abstractions.6.0.0.nupkg 149541 BLAKE2B 0113d06e60abee710275fe7d9addf5297952f8c8759755ecf6c17265d303bd5d2e19a8213d6a023374cd8e8439dd05a8625f48af688fd3bc2abe25fab16e8d59 SHA512 015a392a362c81b35143b19c5da4eac0928cc2f2e13329ab2e945a15a5c9dea077cd66b0c467c75f2dfe6f90c3e0bf2ecdc059d75096bac39b4156a53f997bd2
 DIST microsoft.extensions.dependencyinjection.abstractions.7.0.0.nupkg 197491 BLAKE2B 9da47aa9c537dab4a8ef449d87a55f984dde479c5fcce8d2b6b7b1928f2905f6bbf0ae188b7345fdc03e35d3c0ed584611879a4de8d7def3d1bde991d34d3454 SHA512 a1cf52b01f5de43fe9de6055ec4c7b7f8247669e8dd049be9626df36e3163e0769d47843eac5d09fa3f9aab41bda228bbd51946c9350b6e24d45d86cc92eb317
 DIST microsoft.extensions.dependencyinjection.abstractions.8.0.0.nupkg 276886 BLAKE2B af87cb01e181a5f75df78f59639d4b7dae4fc0b930c7ace4a3ed506c43a98edd447f7359ae964aea1824cfce9213b8f225fd67e9240205a1630d67cd0a274415 SHA512 94bc05ed29755109565d9cdfc901087ee1fa08302dda393106bc9a0bd7384f0dc2b6c2f123c1bd53fce06babdbfa845dc6d22a163c4b0646c5251dcc5aeac282
+DIST microsoft.extensions.dependencyinjection.abstractions.8.0.2.nupkg 278862 BLAKE2B 695bd3aeb51ce3b5caf2132882e6dea3be6bc2d150cc9a6ffb46b5ea5261f4deaf46d1c0f0d1749c2c04bdab246afd79b65944fb7da7910bcae1d86a3e46a7ef SHA512 ba1960ef110ac7387a2a06eefc02c59ce57b0fe58b3e0cccb79b1c8f2150105c5d1f4b65e0ed95ff50d70f28142917c6a735b83f4e5406bb1d8f9dd1f9635d7d
 DIST microsoft.extensions.dependencymodel.2.0.3.nupkg 95922 BLAKE2B b2c852c6c0493f61aeb52ef02295abe65247589cabdb4d4b4e7c00ada92f907bd6b881c999436c2606a76db7a436607c2f4f59bcb2e583067e3664dc9a798cb8 SHA512 854453a101c1ddfe65ac0cdd0c5b5c995fdbfea83ba3c2dd9e3de253af3fba75c4ce61140b0857364a9e20d6faecbfeb6e89849017f06cbe8b5ae9aff60fcb70
 DIST microsoft.extensions.features.7.0.15.nupkg 82953 BLAKE2B 85659ba0810f4c69f060cc10191cf564d6113f9d10eeede931ae8a512aa0d966fa08f4c7191d569fd418b418f81b819f462aa06bb11ccdfd1f430b1317cca8ba SHA512 b6c732425fdd07f140859c33ffef10d15bd79e3a1d9efd3b24db751c3b0615f2c1450780ef8fc88c9459038a48f0bdb0942008e41c0e095f550054e44b2d58dd
+DIST microsoft.extensions.features.8.0.10.nupkg 95949 BLAKE2B 90b695cc6b46c5a847039dc39ff6037a890db1f63e791a6fdc07c40972911097e8922364a4f9a9ff8b31b6a291776ecaeb227d5fdcf278982e147881f4f6f5cc SHA512 9b9ff88f0b7f7ecd1e7386a286bad33c8b2da18288f02ab6a512b70a9446cf94fbca3e666f9dcb26ab4e68389ef9d5274d61af11a8cf10d299bb7e0186296171
 DIST microsoft.extensions.logging.7.0.0.nupkg 189995 BLAKE2B 13bf2797d854549a94df6b2fd1c9559eb204d1986528acd9d60a78b6bace7bb4e58d8e7da8a1161d0488848b0e2478f46df11b92bf4c1271789030e46e1383cd SHA512 7759baf5e8e7147474ff2ec7bc829b071bd34ba25a521ce215190634f25612d1bd588f499356358a27fc0e97e6d85a903a979d03fa1936fb9fcf413c473fb341
+DIST microsoft.extensions.logging.8.0.1.nupkg 233885 BLAKE2B 42efdd995df22c880a255fdd96d0c129096796ced1bf3495a9056a4f3f9ce3e7e422fd9516018e66a963b7229ef2707eb0a69710dad937f84dbad1c9af5caf5b SHA512 ab3363c4e103963ee5013ada55fddcd771961e48e5124f41e70589e589dacf27d20cff7e04bfc214db79fd937cbad80e99cef565f72e0cc10b84d9b3ac0619fd
 DIST microsoft.extensions.logging.abstractions.7.0.0.nupkg 728062 BLAKE2B bd169af34879f6bd79dff6c139b5fc1160f16dfc2e8c37d39d90794f214767d852d29bfe61d4fb4233d40186203eb138893215e9d12124e817b8cf0a9d79d3d7 SHA512 8f648f6f9e11e2ddd6a2a963e95e6f40fb71fb152bdcb5685c2688d305df037994a2c88a580dbb85720f79eb63c91d671c5369a24268c3f7e6e141accfb91b45
 DIST microsoft.extensions.logging.abstractions.7.0.1.nupkg 720591 BLAKE2B 3d9f635b40362091c43ce612c642f27769f7dcf1e5cfdb446d3f2f48bd0cce3acaad9206f0aedccb990410a402b41b388c88e03374c8f1075b333fbe9e7bb344 SHA512 a8cc3d2377f31d75ae973c3eaa385251e51d3bd70eec80003d7860527098b0b77200046c7b1af8882aeea8ccbfab401c8bf5391afe615cb15d95bbd304f2bbf0
 DIST microsoft.extensions.logging.abstractions.8.0.0.nupkg 795935 BLAKE2B c27db06351766972dd55b3ebf927ba7594aefaa0239fd00e0a8ea9ba6b8acc3c1e040512cd07a9849af5ed066c69450d1ab4d7fc231103db2981d2264f515dcf SHA512 50a0add96d30d90580fb8e02a25cea0aa15f4d22744279b5acfe18cc8568b74402aa062d5db13cc5887a08bfd24e07cbc88b2fc10ee8eec2c37edf3bcda7f8a7
+DIST microsoft.extensions.logging.abstractions.8.0.2.nupkg 801164 BLAKE2B a445b6fdbb3aa92e63c8a4efc1fe39b3f0c0328bd297af67e306d5aa2fa346b79a76741f190db3a3f2fe83efa58a529810b3aa3baff9bdfd4e2b0a0131fa1e69 SHA512 f8b9df3fa7b837cb5f2fa53a86bfd47279f81bc332db55b8bb7ea14f55dfe2158f351d35199c0cc0e01c735f394ded2a3a8f1c85c3ff6ea1c3ab785bfbf362fd
 DIST microsoft.extensions.objectpool.5.0.11.nupkg 71100 BLAKE2B a9fe9211e333ca7b2be52faee494e810ea88c6c7ff1fcba7f0266e1713804e81000eff17c709954806724cca8c4641ecfa695b8df7ce21884c2cbb05e59db8aa SHA512 1c1bdc3b7124e0dd33e20c285d001177a22b1b64a80517d9eb09d502f443f21a46012f7b003a10f0344498448074f8833401c35122267ed928cb7a24727f1150
+DIST microsoft.extensions.options.6.0.0.nupkg 140038 BLAKE2B 16df4c4c02eaf0cb07515ce2e82ef40ad7da8b4f2202f207c30bb5b1fd5e84d2e1613e17a940391a88e61083fce3899d187af9c4d66b9a95b4788defffc8c689 SHA512 3c34452bac02193264b0563654ba5282a74b03ede2b675ad25fa85ebd915bdcca857158153eb4a4a024065eb4e9d7bc1ebbd23485493cd895c4d049aba4a5dd2
 DIST microsoft.extensions.options.7.0.0.nupkg 234729 BLAKE2B 89828768394c4d3c1eefaf7546844072c14594ad73384a42defa760416c80ca5f6aede650f601dc520d8d0f2c2a9de5974f91887ec0e7d2230524928cdfc2461 SHA512 358e45ecf7c0085ed19c628126261cb2d4db7ab0636df6e1ae00e0f50d46614fb1d0c48f07b192b76654399a93f5efdf6a6df36b38dbc0a6f5341c8d3576add1
 DIST microsoft.extensions.options.7.0.1.nupkg 235132 BLAKE2B 23cc348510e1bf6d122165e07ee94872d32ae87db8d0e7593e8c3ce65f9672e02c3ad36900c893874fc278f85272885ba3bd621fafffca5fb2d83cf3fdf28abc SHA512 63c171089486edaa21d5e7fa333242f5bb88be4038128ce2585920a03aa4096548f757b6f9f63a143c6347195246d729476a468930ecee034ba1cfb75d6ca840
+DIST microsoft.extensions.options.8.0.2.nupkg 494417 BLAKE2B 05ba97879b2bb3c5a8c9296da11f6ea1ca365fe9856574f03b1c76e775510c25602ebbead9c8109de70fd3b3c65fc5794e90440698c311d17a2bc1de5db384b8 SHA512 cc0c10336580c9519740a042b1e42d391bcb32b63732163ae1161e1c5b55a4cd4a736e1902eb2a4dbb89d784b0acf584b5042b4f3481a61dd30a4e229fb523c5
+DIST microsoft.extensions.primitives.6.0.0.nupkg 144250 BLAKE2B 690d4b002a62d241d98968a16ae61ba731276eb08c234ce9d56bdf525ce952232b969bbfd1153361061ac5a5cb12acb74610fe050b6f3fa9a06bbd0b4e0bdcce SHA512 0b2697f35557aeff0784b10ae6a4eafd7601bf706121ed6584a61879ec6e494514ec7a3e0da0aa6baa99f3f716f69030ec7c4c82f657c8dfdbacb637bac4547f
 DIST microsoft.extensions.primitives.7.0.0.nupkg 165808 BLAKE2B 8ded108d7d9b15377e6cfd150cff4e17676a21502f3c37f43bde5b12de49f018783deecea6e72052c433ef29be26816d2ef056eb15a270a0f5cfca33869c9df2 SHA512 786f9e1ab7e2997b43e6d400444e2e43e84911ed3a9d38ead247125263d225e7932a9c8bf0089dec150977400a108b612d575916fb76fcda4d4ac0886f0aa4d9
+DIST microsoft.extensions.primitives.8.0.0.nupkg 209772 BLAKE2B 46a3392933c0b901d1c535d534f0f9501b63659fee1f83bed47e48b49aa0162da5af1b3190af401d709fa0d4b8bcde3f17f7e4e28f0141328a1a7446e4f81b45 SHA512 1f5475ca3d3ce18463456dd135afac502d6f82fea6e4e4814a61f86616c348decf28b73d15c2bb276d1a3c039ea6064f75e1329f6f3a64caa3520d70ab92c32d
 DIST microsoft.net.stringtools.17.6.3.nupkg 172754 BLAKE2B 6283bf695f9d1123b89a435361d139d4fb5f1c6e907fe41c532a2d290468657c82d3a7ac6c783b4be57ecc3101941cee3d4c206efa2acbf5a08bffd07f073827 SHA512 87935c5de9971a39e62e39f09655cf1e8b0b7e90b9f8fcb8241369417083329fb3f265a71823dd3cae6982a33516c84fa123d5a4dcdd0cf93f30cbaaa825c56b
+DIST microsoft.net.test.sdk.17.11.1.nupkg 34301 BLAKE2B 94ae92b39b0df518f67cf73a6f5d701ad65a1daf0352d5e65b6c6c43ddfc4a981df6b3a79ee96d6f851e7ab88f821543bfb113fd38411e044e5d06b65a0cf15b SHA512 93750bae9cab4c72a155e2aa745c225033b0a8a551b554dcca399f2aa2b0fcdac81c9e789a44da1a553901151a9030bcf785f5c13c97b5d9b3cda0d9a9e96588
 DIST microsoft.net.test.sdk.17.7.2.nupkg 39430 BLAKE2B c7d00e93daf1cb4180104c2111b3a286819ef8d692b90d8157877794087357aeffb34640bbf9bcd5e04cf25512db4fa2f41d24cbfdb01e17a1db6e3f23b1973d SHA512 e0ebd2dff0bc55e5aac59b300ea0558aa5110d08caeedf513c441ef98ffffd6d92e8e5a9ca1a1ec7e1fc2e661efc57b1f74d5bb8068b5120cb49e4c11998180c
 DIST microsoft.netcore.platforms.1.0.1.nupkg 17876 BLAKE2B 13250226ef4869ad62b8acbe8b8f791f9bca1932562cb7a7e8162c3fa502c02200673cc9839f79953cb2d3a75f64f92d43ed1dcd9081732e4917197483188163 SHA512 5f3622dafd8fe8f3406c7a7ee506a7363c9955b28819ae1f2b067c38eae7ab6e620eb63442929b967c94fc511e47a2b7547ab62b6f1aafe37daa222499c9bb19
 DIST microsoft.netcore.platforms.1.1.0.nupkg 17960 BLAKE2B 6a9fa22d75f5a1c65746dd71a63c3d4e37c393e99c23007c10f5ecce248a04863bf26e7562c7751177a6985eaac266c29cc6a5443a4a853e773f88994ad2a3fd SHA512 6bf892c274596fe2c7164e3d8503b24e187f64d0b7bec6d9b05eb95f04086fceb7a85ea6b2685d42dc465c52f6f0e6f636c0b3fddac48f6f0125dfd83e92d106
@@ -103,7 +131,9 @@ DIST microsoft.netcore.platforms.2.0.0.nupkg 19181 BLAKE2B c784d2315e721a847facc
 DIST microsoft.netcore.platforms.5.0.0.nupkg 39826 BLAKE2B a122f0d2afb77455c005740fe5096c055f72eb658b0d1f10e6a17f9d07c3bf91ad0010ff472ee1d05b84bfbb75c9de3c46d2a2d33fdcaa245d64d6c3a956f233 SHA512 8493fe11648c7ecc20b6530490d30fd63744961345c0501a7a10b11046661da09b783ddceb8b3208ae52a72a8a94cafdce8dc1bd6073c32081e30d0e7407f174
 DIST microsoft.netcore.targets.1.0.1.nupkg 18189 BLAKE2B d43a064d4c6f836be5164708ff0401913b32fc3340cad7c8fd08f421ea553805ac150a134a0d60a55d41eec124514a5e5197eebcc85aa6595cc6b91e33025d61 SHA512 6ed8e75f945a18651066fe9ee31cf6c8257a5974340fe4d262438903c4959a479f4a515a4d1389e6d3d3ab34f09a3c7bc2009aada2e8a7f697b6655a82d3bfc9
 DIST microsoft.netcore.targets.1.1.0.nupkg 18162 BLAKE2B 419d19e0da934ab4b9db75dd66cc22b83a003f34e93cf7a92feccf4f32d3d695e18b826b1aba13073dd4ec53aa7905a67346921d1055516647ddcde0d79009f1 SHA512 1ef033a68688aab9997ec1c0378acb1638b4afb618e533fcaf749d93389737ba94f4a0a94481becdf701c7e988ae2fe390136a8eae225887ee60db45063490fe
+DIST microsoft.testplatform.objectmodel.17.11.1.nupkg 1660096 BLAKE2B 56fe5a0804398596106d2ecd5318c00e8e1f869f321160ffda0635b78c270934fbc2b85264792501cc571ba821f2dcce19e77c717e087a6304746092823a9ec3 SHA512 f6127a19b7f721a3f038fdaa81d00360b124f4d5ed02ca79cb7b330688007b4963ef3681594d27f06882571a492fc45aa0f79ee3aaa52417d972ed73f4342000
 DIST microsoft.testplatform.objectmodel.17.7.2.nupkg 1494924 BLAKE2B ed237ca748d969242f48044bf33eacb8e03a8fcbc78cc36d45233e92b82d150425258c0805631d3d58ae0a1eb66f0dd678007470ec3ef49ab53431885b336a4f SHA512 821050a26c80e5328f6cc5f4b1720e43b293365a956a76f6d9555d047423d416ebde0bc7c62183ca4be4d17beb74c0ff39f37744019fa939b9f0b4b94341bbcb
+DIST microsoft.testplatform.testhost.17.11.1.nupkg 2882099 BLAKE2B fa222efcc2d92358df360c5d9093c678fc7c0489e90749d3108f2bbaf89e750df3c4e9b3163569ecd81402775056ae46dd96866bebe359fa17d6409d2560249b SHA512 75e4476514731d459b0aedf56a816616df6a7a53240e6b81b202778e0a90b7c284223d93c7447541eee70d167761417ce1818808c5cc05df81001b56470dd6c6
 DIST microsoft.testplatform.testhost.17.7.2.nupkg 2808650 BLAKE2B 7f091133b02f319e1d8bee440cd7ce4ec4fc8382a81bc30c62d5c4769bdeb32534d776db64acd146defa34a1b4322fb04025604342795564546c7ed7ee48f317 SHA512 cf2885c5a91aedec09bcc4f15662096340d7b37351db368de98b0569b35e8238ce6dd86c60706fb021f37ecbc3e4b35b405e44b18b4e1adb8cf404076345c3f7
 DIST microsoft.toolkit.highperformance.7.1.2.nupkg 702514 BLAKE2B beb1b809081f4ae7b488ef896590c01285166e6eeb87f6444e59974cfa1f9c20ad71222067a0a60d996d65c17b604747adc97c4b87f54283f8cc069124c232bc SHA512 613214ca320e1af4a3c4c33f1255d7b5e3d9918111bec4edf6644fd044c116a941d7f3db686537d8516a22115b953bef0f1be51ea52cd4d01f978c0414850211
 DIST microsoft.win32.primitives.4.3.0.nupkg 63333 BLAKE2B 132ec29940d4b716110980c4f9a06ba15183d29de638379d09998124605165e51652b2727e3892b57dbc7cacfdc71f9e1b59c9dd5463a524657351f5385d896d SHA512 366f07a79d72f6d61c2b7c43eaa938dd68dfb6b83599d1f6e02089b136fa82bec74b6d54d6e03e08a3c612d51c5596e3535cbc2b29f39b97a827b3e7c79826f0
@@ -116,6 +146,7 @@ DIST netstandard.library.1.6.1.nupkg 17360 BLAKE2B 02badd3473451f83997f0b66d05f1
 DIST netstandard.library.2.0.0.nupkg 3143842 BLAKE2B 7e3fc865e7893fb531b21e2ca791b788af01481316e49a79c4676050c2b8ad413fd8a4ef9890557582ec8b9741c8aa01b080b8d2caa16e02bfff2a7b38777989 SHA512 e3d64072b9cd9f9e86209c06a22688ecda7070427c9a35327d2a9560824c0e1381ccf7bc1d21d2ef8b301761f4bfc7f38fba712df7188d2f4fe4f748aac4d0c7
 DIST newtonsoft.json.13.0.1.nupkg 2065787 BLAKE2B 000c38ce26a2a00bb25a9c1d6fb069ada521ff089bb624a5c1255b25767c10616cc51821524e7bc3d8b45eb8f8ee54c97454db1db9ae5e5c78eb6300a99f979d SHA512 83731b662eaf05379a23f8446ef47bbc111349dd4358b7bd8b51383fe9cf637e2fe62f78cea52a0d7bdd582dc6fbbb5837d4a7b1d53dcf37a0ae7473e21ee7b1
 DIST newtonsoft.json.13.0.3.nupkg 2441966 BLAKE2B 0c83cd81b9eb647fd9106c5b8b7af4ff6b35eae4fa24712f16cef1db070857b072b9e40a52ed006a82125c860dc48b89ac54224baa24bfdedfa573183e19d169 SHA512 99b252bc77d1c5f5f7b51fd4ea7d5653e9961d7b3061cf9207f8643a9c7cc9965eebc84d6467f2989bb4723b1a244915cc232a78f894e8b748ca882a7c89fb92
+DIST newtonsoft.json.9.0.1.nupkg 1613054 BLAKE2B 56918db57c3786cff0548b642195521ef203246a6b2ed010186ccae230af3b0c913ace4b2a3319bf94c6e47647b9c5ad7b017e3b50d35e6654b4d5b987643739 SHA512 da8917a5347051c8106f4ea9bade4bc300a3b60a05a3be3390f92c8dcbcea67223c7b4da8065b9228042000e25b99c75fad7e2221a0daa8888ed8ef3c161b228
 DIST nito.asyncex.5.1.2.nupkg 20938 BLAKE2B 92b97e3120c0ac882acd469b6da0294527c8d9aba20ffb823cc23fb87a1a36ee490c35d494452776176fd7a9051bde0a62bee7aa9ec04e4aac048946cf2e67f1 SHA512 d82eadfc5c8ae3f40235187b45d48eedea69b54f32ea338cd0e624d8795006083e76186556b6f39c0ae866ad51f740836d9b7a16be21cef4d6af29c536c533c0
 DIST nito.asyncex.context.5.1.2.nupkg 48885 BLAKE2B 5d9e3f3074e979e4cf78129c8658b58034bceb0fa7b443fe83c52c58867a683c9d1cb080d0a2dcf62ebc104088699f96a0e3424c90234d8e1d5eebedf668cacb SHA512 7aea1aa716988b16cfe06d6499fd75545772086e998daaa7cf65d252ceeb8bcc7e4b86e90f84a088a9765cb192a2da4af984a5f5dc9e4a6fd5608067dfbc41e6
 DIST nito.asyncex.coordination.5.1.2.nupkg 97039 BLAKE2B 892b3b1bc98b1d19bc0357c93573e161013c0931320ab54ec948dc229861573431f54830a2a28751f5304ea901a3e74df402d008a91cdc49a3e062a76b7876c1 SHA512 0293f5fa5f33c1bcfcf44fc53119fca4fa5421853091eb1d11465538fa73ced049fa7a9a2d6dbd727208bdab646deb97d152897c52381dc6c8df3e0fc9a485d7
@@ -136,28 +167,40 @@ DIST nuget.projectmodel.5.11.0.nupkg 332316 BLAKE2B 642ae5f0d928fc26280620e5f97f
 DIST nuget.protocol.5.11.0.nupkg 1011800 BLAKE2B 4b4f4a0c25db1f62d6dd8ebe113ce429a94e98d73f405c266e98c31119d1d110ee1515305737928b2d236b74f193f7ce63c7bc108b4deeb6f1fcca1208b8ad18 SHA512 7cf6735e1261ce23400cebbb0f3d5e53cc463beb1fc3d6596426ce418f81c6f99c1c799d1efdb7309bbae6a05a01068ceccc646f0f1e82768a9aa8e6ec7ddcb3
 DIST nuget.versioning.5.11.0.nupkg 147699 BLAKE2B f7990d276194783be10679880131a3b07e737957b3a264c985ecec8d422aee8e6c2a4e53cbc51b7324ea5ebaf9e5d6c2305d6740785dc9549fd3cc6d014b0e8d SHA512 f3e7c8d1df68f058a2a73dc5a2fb618f9e6995a2481b23439ebc575a552364dfa059f01cf00c570f7c5fe4124c467921588d391e840506184e50d6250e172b74
 DIST nuget.versioning.6.10.1.nupkg 100616 BLAKE2B b45b75b6966fccb1ceebec91cc079cbcefc11228176bad1b7d4d5c390657d7c3cc9aaae8f6b7fa087ff2e617a4a30519d158c4b379e3678d61bc95b9efcab9f5 SHA512 68f549b6fecd08bf39bc68e911f0b311746b688be4ddba7895e6a13eba2c8d06f77f8c475602844d77ef2b230c076d3c80c8235e198216a5d5c4f6fe498284d8
+DIST nuget.versioning.6.12.1.nupkg 138856 BLAKE2B 85f47edcff43bf7c674cd1031455268bd5723acb33cff1bd38dde028b89662b70bddde79a1fd067b5931a4a98724f66f039b026219bbc0593016c2092c10fc99 SHA512 eb88483c97ff088ea028fcad1c91b361592f7ed7c03a04bddb7df3a29d439641b445c4d82d1045c6537a447c72e352f0a4bde2b568a6caa9c421283b08bd98d4
+DIST nunit.3.13.3.nupkg 1307336 BLAKE2B 45475c312fe17bdc60d5999f29a81f64fd19bb125bced63a73eee9bf4f158920adc4bd2d97164954af624c5bd480a99d2f3da56797127acecac1e6d753754b12 SHA512 09dfca502d636c3123adf93331732db354e9e280935d1bbd7923d710f5b29adf82d41efc763e2ce8781dde01d81bbb21af168d897d5820a53c15a0f9bcf11f20
 DIST nunit.3.14.0.nupkg 1318234 BLAKE2B 4891e0c5bd367bddf1318fb4a1825b7833d46dfab5b5ecded69812a247acdf0e057b8ff0f27236c6ad5c655370bb9867547d4a44475a30aab07b98277f3513c9 SHA512 5d711925b947c9e4a9f53f6b5d769bc4a702efd72bcff6b4fe4fe51a724544a5266d02317fdb5fe5e312f924cebe31549e5eeb2c5781c9c2f35c3e4e31ae3484
 DIST nunit3testadapter.4.5.0.nupkg 504560 BLAKE2B 8fb18358909ef9b5828b2b6c2a5bb1c234b2041cef7d57f22319a287bb187621c6e8e40e33b7e1e23f17b9e5ff01a2cc41f932d54e7affc935edf275f0d397d6 SHA512 be32fd672c3ab18bc948f7a6d9c41f79bdabc1fd8d2b6ad9106c14499b35a613ebf05a720959aae4507c2cc10adab45e79f48aa731c6506c716d300193d69154
 DIST opentabletdriver.0.6.4.nupkg 40202 BLAKE2B f9a48d9f38ce94ed762cda14338d2f6ef5fd7ad26481b08a1075542aa19a6b6cb479d25b5e8e188608277f67fda7b33d9762d64e43084c64d42499a7d1dff6fe SHA512 443b79d417ed68ee935bef5287036b6d21ffb9521c094bcde29de53bc4b25521ea45d24057ebce7d78a52243f55398e31e85b3b9e042d233c204011353886c6c
+DIST opentabletdriver.0.6.5.nupkg 44817 BLAKE2B c3c05e0b33890eec4a32e0a3d80ebd8809332f9aa2e08287027a40a29a8d732bbdb39bd89e42d8e2d4af64f1417204f19839f77831591e520654215e52506412 SHA512 403e123089c00eba0b33b7f14a6964f389ed357c3b51bd3b7ad1dd19877e3fb9f046102e8ce9da35c12fdfc94a57d7d5fe5e5050cd2c84079bf0fffd4b877289
 DIST opentabletdriver.configurations.0.6.4.nupkg 47609 BLAKE2B d2864dbce1e92d36bf84f2889ce00b8a545aed0f629d96db4a68fa6d8daa64ef05bae50cf2a953d778e03225878f6567fcd465a285fdfe767c757b41bcac266e SHA512 7cc68e55c98badf577df4539b02add627dcf23092583aa17e324b358631a3a562069f258348fd0df5a251a19b1bf547235fcdcf42c564f4efad42c6fa9c1cac3
+DIST opentabletdriver.configurations.0.6.5.nupkg 54646 BLAKE2B c1455da4ebbc4719c14d1f3c0620290f44f4b34722f69647127fd594405df2b7ce3623d6c2a03e2140d9a12373c0059f064d108a20019ded5857c982ca26f5be SHA512 4e6167e00331bb05d9f9bccdc70fd6b4d5da512aed2ac68ed729a0e74c0621fbee707965b541d86ded5b78b991394d3758ef802ca388c0376e3ad3b2dddb95c7
 DIST opentabletdriver.native.0.6.4.nupkg 40942 BLAKE2B ae7d2c2190d26df1339f7d91b70826c0d722bb175a936b1dde5585066e70d16a65a4e1648d439f876a00f9ef052da8aa95e0a8de99936ef47c17def429f01bf4 SHA512 ca209a3786d4243ffe039f34156ec3d74e29eb626fb0a3c1097381166e622cfd8ae6be01e3cef594e2d31d28d868ae6ad968876f916a5ab01c5f56a04b942bd5
+DIST opentabletdriver.native.0.6.5.nupkg 46820 BLAKE2B 123563742c179514a2b6087d0f48d7fb52164277f4f1e1047e391a94b46d2b454e1e1dcea8174a9b7488b09f44235732a43ed617f652a3ac8c440e1d43b1480f SHA512 b99c897fe30aec92662799a172e062627da80e5eba5033630116c43b0a6b68b463b7a8ee1a6ba554ba3414d0b71160192bc837961ac017200e2883d98525c103
 DIST opentabletdriver.plugin.0.6.4.nupkg 34047 BLAKE2B e191c615c9c88ee485af6dbec6190e982f71379b8754fc6edabba76019cad076a6c6499b578bf5aa665d1ba84a34e186d69d91e97b5d9955fe97adb4bde21cd0 SHA512 0109ea27459058d876a365f42e5cb5380974b7dd1686f53dd47d85723a2560c1a9a74725ef3c61a70b893780e6276729cc9e27bfbddc9263a6ff5f3dab3fbe6d
+DIST opentabletdriver.plugin.0.6.5.nupkg 38356 BLAKE2B d8957e466068d87e007515c4ee6b1c5f1d9d8bc4055fe1d305cca74886562250fadc5645d98624758958c99faab2642d4cb4c4bf698d538426878cb450566718 SHA512 c1242a3ea72798c59a8c200b027038b94f1670edd4e6aa54cb373eaec18837572999de20d16f184f6c0f15de83092e48fbb32dc54dced88bc563d489184a27ab
 DIST osu-lazer-2024.906.2.tar.gz 20155540 BLAKE2B eb62e96f7808841dca175fcce07a1f06c298eee1778796d47d180ae65b193cc9e648c92add5eca28bb828c6d0f871022cb85436ce606d149b36a60a8aa37dfe9 SHA512 b3f99e2e411f8a6c40a17c824e84a882cc3f213353d03dd93bf33f69626fa357d34c2aa69c971d58e14bc63e1a947c37246d139780c8596127b59b159294bae7
+DIST osu-lazer-2025.101.0.gh.tar.gz 20438166 BLAKE2B 27ba34727a1628a2ecb79f410fd64efc94aae593e228d475d2e029bd1e31995bded1d2968a417717343069dd3421f94d051769d62d3256cb6f1a388cabf8d7ca SHA512 f230dbc0d32c0f38cc440ae744ae6ee9cd9ff4aaab8e383eae5689634f616ef58694262c6fa51d96799e0f1f2b58b668c7932b704685449ccfa192578c7ebd3c
 DIST polysharp.1.10.0.nupkg 87007 BLAKE2B e373583de452f1e29e2e658d869e075fdb384b8e49e89544abd9b1a921daea79625788676f661642a7357ce2858809690ffc6e35d0130920b9ea85fdf6bcf3f5 SHA512 12217bca03ef305a7032047fa9cc3d7dc8a11b678af3c0b7cf4a573b7764a423b9878949feff3761e2b9cb1d4ea15853a89e9459942b5a8544da8e041e7a1188
 DIST ppy.localisationanalyser.2024.802.0.nupkg 44574 BLAKE2B ec6f1ec5d8c92ca070d0e3b537ad186ea95c95cffbd21beea981900c5a34e4f6d3a48b34d8ec9161a247c803202d666b7df25fc19a2f13278fb0d758a09bb69f SHA512 41b9ecbd94e16de0974da2ab85a89ee58bf70190b6149eb8f2dff08cfb8ef746329471c97346d659728d08aba96c73c4fc5dacb741c6dd7855c943f2327ef71a
 DIST ppy.managedbass.2022.1216.0.nupkg 422053 BLAKE2B b615d9b24f7b40ced1ad27174181ea2c750d49171bd6a0ad689a6c438bbdea585db6068e0e9c8adedf0b9e1daf7897e49bc785f110031dc20006f697a14dc5bd SHA512 c4245e3143a75cc1e00f32da4a6252b9fe64dacbfef7bd8a107746b73301a993723af299c292ca28579955e3e425adf7eaffbe3866d7c10b270c63688b82d6e7
 DIST ppy.managedbass.fx.2022.1216.0.nupkg 45721 BLAKE2B 3d9d11cba7dacaa89b71aea386a5a2b5cb6d6b595ef953706faca272f2a9c7e112f5a847951e1037345b07d083c78a0d29d17e7763dce54e2702cdc054ab85f8 SHA512 1a4b704bd536384f1b3575cde15c0d0b92bcfc73c64e7be432a775658411d8fac60be134057ada0fbae12337fb5e01daf802706f6dc6a00a506905096595fec3
 DIST ppy.managedbass.mix.2022.1216.0.nupkg 44531 BLAKE2B 271bf75a79deae367c14e341727dc183e8353e9e3198b955d221fd247497aa7d48412c05d5ba78880fb66155428a80361113ab0df6739154d74e6c0874a1632d SHA512 b55cd9a613cee8bbc3f81d5b11ec1ed228bbb03bb4ffd6d48fa109019a65c20aec4ffd6e3025db74d430d7d0a77704f54105a192840d1bc33e78c5dafcca6698
 DIST ppy.managedbass.wasapi.2022.1216.0.nupkg 43664 BLAKE2B e925d9ced6e8c59c6a584a2fd2a490819c25663becb6d8ac60323f83a8c40724a6bf6a4d2dd4cbefbb047057824e7837ae4915dacffee7643fb93c7cfa4fa8c9 SHA512 972da5c7b75b86418736d10fce9a944446ba9fcfb30ee3eb489d41291b2fed7e2dd9736f2db32b9802de74a9bbd2755770dc7c37d1beaef0ce8e05e73c752053
+DIST ppy.osu.framework.2024.1224.0.nupkg 2657909 BLAKE2B 130ff889ecd1cf82b4b85d30d379e47cdae88965f77556cee56de9ba1766e692aedaa05b2e4c9bf2a719f94cc135fc3857088324d0fcbe1fff0671f3757ae059 SHA512 782944fc38156698fe8ec7856980dc002a4dd6ecb07128ecd1074759d6e634cb7d9a70a7d1eb99caa8bacb478a28b284b910941d64a6fc2df263f5bcf5483ffc
 DIST ppy.osu.framework.2024.907.1.nupkg 2650025 BLAKE2B 78a55ff5316ddf68ca5d782a4bf047e6c9423e4b197267a0b03d86a685e4bb868c2b1e3058cd78691c1bf1c66d59b8661c82fa87218a6c25cf96e976724cf4df SHA512 645dad429f89fe9b89a8282a0ea557555c985f5242942bd325633fdf447586b3c721f92a90ca161b59f6e65d4f9bd9305f192aa7cb79d1b0d2feeb189f53772c
 DIST ppy.osu.framework.2024.916.0.nupkg 2651241 BLAKE2B 4f9989db7014bd8bce3ca9962ac10fd431153e84aeef59f97d12a8bcc498f616480f9828405f096600cd20a4133b718a3e321c83de703ed09d0d863db479e190 SHA512 9e75578a1700a3d7e8521151a89d5033b3954698a50b3ad9705bfb90610aaedd90cc12fcb41be208df92e8d2812aefeaa49ac404b2365a006decf00ad3f0c91f
 DIST ppy.osu.framework.nativelibs.2024.809.1-nativelibs.nupkg 15390094 BLAKE2B 899ddac21ce14d59fb5fd924a8240a100c129192c612772e6ab98928960c9fcf8a0548fb2f9a2e86c3c8a37849eea91577e563977afae09b8c0889f3e028a5fd SHA512 b5a6558fa942bb09070cee8f877ea0b304f659ad8d06483551e28bdd5f7e85e42ffa606e2c8eb43fca8bf3a004b61bda81d77286140c21eda389e869a20ee378
 DIST ppy.osu.framework.sourcegeneration.2023.720.0.nupkg 56224 BLAKE2B 5fb3ffb670c6f4ff0eea236280dfc00b2fabe8594b0416f26648e9a6a914d5da8facfdf56571df518dc434f9544be472b9c1a17fbabc17fd2d8efda19c123cdf SHA512 c4927d7e4f675b48fa87cf51feb7ef5145abe1454eeb3bfa2bc0105c37b62c4fd529015b038abf6dc19c2e917ab8e132fd01b4556981d10133363e3a44196e77
+DIST ppy.osu.framework.sourcegeneration.2024.1128.0.nupkg 57800 BLAKE2B 48c6ee0067a50349ce730dbc9316e8fa98233ec66127626059bfc032385cd3e18ca9bb2fe69558bbcaf62f3b77f026d51c5a13bbb3727177a57d1fc9c730e551 SHA512 afc5490b44fb964ed06b95e421f93283eada206a76ce0bd325c63ac4cb8e2ae7086b726eb62c9f2cc5a1539d9a434a25308de4d66dd116419bf3f2f2a568aa96
+DIST ppy.osu.game.resources.2024.1224.0.nupkg 92856723 BLAKE2B d83b9b3f68c3e820ab675e137d8f5b0b416399460f37e2241661300370aee56fb7fabd15f495e26b188d520f6edf6a98e93ab6438887311b9602ea1617c22b5f SHA512 67446251fee995ef8a2941a8a30d9b3aefa0929019f9313d7e1b2187d1d13b5a0a16504d9446d027070300bf00a21c8caefcf259b859f650491cc31e7760e0a8
 DIST ppy.osu.game.resources.2024.904.0.nupkg 89533362 BLAKE2B 451944889da9d90e8866c31249e0010681af05db204426afdfd29541c662069a9ea08bd1d41b9021ad144038a459f12a37bddeaf38f8b23619fe059dc0a203b0 SHA512 9dbbd65462a61acebdee1635d32aa96b1445446c22747859e9814df80e064b994a4c164e8c005e35044e3ce81e602eb4725a86cac78054f55ccc6c697384283f
 DIST ppy.osutk.ns20.1.0.211.nupkg 1439892 BLAKE2B 2e8078af58005af01670368873e062afb5a67b19049c214c76aad227463537fce9fd2b347f453d051c802203e2e091b1df231cb271286512c11895d6430bedc1 SHA512 613fa5cda6437bd1ecf369f3a7090d9f250b944e50d6151f0a8a85e7a47d9b650901510adf8e9629e17d1e5147a0430ce09053f10467667fd740ec31fc99534d
 DIST ppy.sdl2-cs.1.0.741-alpha.nupkg 6639058 BLAKE2B 3741ed016a1b28560d6c3ad3ba6dbae7548617d18a148a3ca81a0ce592a2231d5765d54499f0bc8cfbbeb44d790ff1cee25e990c079fa17b26026ea9d38635c7 SHA512 ab7306ef58ca3098f0d57c1a98caaa9d9f1fb7f0c4650bee6f03dd7e322a279dc99c88616bfab0b8be1e42ac6d3d55a4232410fbb8c33b99a330e21a32d81a2a
+DIST ppy.sdl3-cs.2024.1128.0.nupkg 14496951 BLAKE2B 34951d9076683cc3bfbfd56d496791421f508fd267f10fcfa44b5fe2095689459057c425680f45206eea984b18896085d527e7f8fbfdc9e8c48106fc129e99dc SHA512 77edfd402b0e8234570c552fa36b9ba0fbfb9566aaff1da9cd14b733519c145456c23afae5d76413af8af3f5ca9ae06a2302c0e6112e760a5203bda068aeb9a9
 DIST ppy.sdl3-cs.2024.807.1.nupkg 12851234 BLAKE2B 4eb19a3a5bfd72dd264b8cc3ccf0514dafc8e039fb358c72e9d1f777657972c7a7ab9e323ee92847d32c4942b86ce88bc1feeb0f04d05c3154d940de16fb30c6 SHA512 0d5eb5a68942f43fe3f2a1b27343819f910812a8376547b8f18c13ae700685eb6b3eb36a20d99d09d76c6a41cabd14469751b0d0b6ab31371fe27034fcef2c81
 DIST ppy.sdl3-cs.2024.916.0.nupkg 14027766 BLAKE2B 5564db2d482de9e5adc00652dd2db303616c53185d4eff583d97489963af2bb3170f34804f7370f66d6f7379461e13e781d23c774c94172cdb2d92a0048c48fc SHA512 26a56132ee3477e620d8a3c3808c8017d8b02818da3fa555c44672aff62df7ca8dd545c1b4de38e00583d1a39f7c3be681b38ff359493c18b6b0fbabc6ba7dd8
+DIST ppy.veldrid.4.9.3-g91ce5a6cda.nupkg 663650 BLAKE2B c04d31331fe0bc3c83f7631406e9094ab393fc258a1249e2658b9657501f5a52ed3b1e9608c21b3c5273dbbed4d4410b9b1f9f1ae06ba541cb5c859053b0811d SHA512 f3c46c8b2480e156c7ff5a043b50654ad6a3334a10053ff245364a058a86a9474e58a06effb8551dbd00a25df036d99dc8673c8d92ec35458d8f5b61c25f1af2
 DIST ppy.veldrid.4.9.62-gca0239da6b.nupkg 327138 BLAKE2B 9b925e9f8232d7ababfc9d66a2a2f2a9747712d14d75b60e2e1d32caa89c5cc7f487eaa158bc559b2ce86268c3896c47a790ea656af1a2242fbeea5f86ea4caf SHA512 cab2414d3ffab6f085da5dae8b9f2e5760433f642733e20334ef970f2bef93e9715c9c526ed1706d474f80c09822014a0bd650812c89092957f7256d5d1ec4a9
 DIST ppy.veldrid.metalbindings.4.9.62-gca0239da6b.nupkg 63888 BLAKE2B 6afbcd57e9dbae67ab754ad701bf77e1c8a7f38c2d5de4bec3188a93369617aa9a1680c913e59847fa1b632dabc7953a673ed20fc674980285479f1cd27812f3 SHA512 c375b883b33742341a98cc7dc3f8ef8280eb5e3e5ba1d865f107178332624f022b59f0c59abf1cef350a8ec36d8f57c5e7a3db246a4ea7740d66647e8330e537
 DIST ppy.veldrid.openglbindings.4.9.62-gca0239da6b.nupkg 70610 BLAKE2B 5b02d4e1ca0a6319b5df0ace08858677d14b2ce82e63781e19ba33505f15bfe89484d4f463f0268a1b6f6e6d995ec6061a5b05253510e76ac7c4f1cf5dbfa25c SHA512 30697a788aee444ebfcd3b47ce25e6aa2d446075549fb3fc7fa1e3d9ed71a178007d562b824fa9d0fd491500e4b6541c8691cfc264d764512e872cfed869c3d4
@@ -209,16 +252,23 @@ DIST runtime.unix.system.net.primitives.4.3.0.nupkg 125060 BLAKE2B 76f760a4fe1f1
 DIST runtime.unix.system.net.sockets.4.3.0.nupkg 105673 BLAKE2B 06119cfdac3ce590b2f12f5587c75b6799fa876d7def559a78a1ccf53e34e6e1bf79410bfd676b04f1ab3f34a887eb919078a55cf79dc75faa75fc62094c2cbe SHA512 31b62be088315ead04d89f452a6c49a656b88f0668f7dadb2790511675d48705e01c9df24dbed3a0095157875c208ab6e6b5b6afc82bac13e4d6cdd3026f8424
 DIST runtime.unix.system.private.uri.4.3.0.nupkg 75969 BLAKE2B 82611545be3eba44ccfbef1f104e9b5afade845fd3b30c6cb40171368330f9d4bb2ad8752e415aa3b1678ec140c40f8e72cd4cc3731f42ca64016c1a1dce70cf SHA512 203ebe272791d79ab0c40afe9d0543852ee91b9fb4ae5bc15524d97728bc8bc9d7e0cbcf65d1fab8cfb0aa7a4ae37e7938933eef127aa5ea46f60e57b6ad2d91
 DIST runtime.unix.system.runtime.extensions.4.3.0.nupkg 54075 BLAKE2B f81d86cc15c63aa0b4a3d03546a07649587af7a0285af0de4123734e719fc023fa4227b7abb18307d4fc060e2952c157ec72b3bb85d49ab8508d8167b1aeedd7 SHA512 54b81784c08e934389c59e6e155af6b1855e4bbc41678b01a702c94e6daba87c6ddfd16fe9e2cb61f3097bfa4950dbc37781454d027ce5ba6c50a393cc91b888
+DIST sentry.4.13.0.nupkg 37917859 BLAKE2B f9b6950e4e395bf687dbe224939d04a0076557d3906c7f9b19009f6504daaf34918436796902725fb341a88c22705e4662fa828b58a2757d308e6a7d5a24c0f1 SHA512 90c0a9770aba34594ac7ce9f560b4bc8108a955265f51580f25fd724551a4db1422a28ae58b6ca13f28fbd8bbce4c04fb4eadbf8aebf9e4a7b7c6e1b96c1c65e
 DIST sentry.4.3.0.nupkg 33336821 BLAKE2B 2cc05d19d82c5dbb43c77488ec4f2ff67ed3d324a2eafcf20f062ef512c1e8c318c0b17d11a0caecdf5593289eafce93f2005699ffd57073666128fce08883d9 SHA512 a4a3245aea1e493b31fe8f672ca024f123947995d6710628932359f0671d093651b1edf273fba6ccdfa50406ddac8b8ff9460eb725ac58f05fe08402032b3c24
 DIST sharpcompress.0.36.0.nupkg 1448511 BLAKE2B 9d7a112b87641097cd38010de25e8c0e8083bf927367403c769cb389ce5f97ceb7f88b187e9141e8cbc7e0cc25a08445e8b2f96689c5909ac60dbd0224e44709 SHA512 0fe8ecabc685498ff3226b6b1599520edc19151df8fa4b22f29916df8761d8c45590b0298a3c5e382d39b2b0202272d60b83a9de818b083cb57bc7ecbc2b7690
+DIST sharpcompress.0.38.0.nupkg 1939231 BLAKE2B 9ef6f143fd0a08458ef475ec9a780951d577d5c4514a5ed9487b444904669b4792dd1add5ce240c18850e5b108d75c04817dfc0604eb9e640960b8447cf85679 SHA512 9107c6cf7b5d0633a31496634c388e41870e5f25a99c4eaa44f0bb5e1ffa24307c186ef63e6b54983571cde9f0558a44f51c6b743943162668beb6dadd438278
 DIST sharpfnt.2.0.0.nupkg 25880 BLAKE2B 2a463ce1c717fee54be8bdcf5c0c7c3931f9570f0b99c62d8ddb96da2a559709c15a2a48842bfc3143f0a0084cad7951f158b67505fb59c911f6179b927bdb30 SHA512 82c0ab078468bc3bc4501772ba7ff6d50e32d095e7d127ef99a512d630b6df08b75c01814daec221ff3af615b53c8d2c6865b1dc57149dbd43075a1a6f5be87a
 DIST sharpgen.runtime.2.0.0-beta.13.nupkg 267678 BLAKE2B 65935f595eb9295e3ffb5659f9892e47f4f16fd0eaf82b16edf3e0ef95733ddcf98bb4c8e2c883363085fa1cb905f70f03c44a32f5c8c0633092cfd73df92a71 SHA512 ab45430585b7ed8ec39f644fc1cc18d4a7b88106f07d0008768b776d49c90f8089871426e2f6a66550143d87142e42c1fc75e98b02a9b3f5cf1e65daa2354827
 DIST sharpgen.runtime.com.2.0.0-beta.13.nupkg 519850 BLAKE2B e1647dbf2b507086f1bbd2e2710ba8d02d31419df78b515b88250f3b537fd43347846bfd76b03f3f3a0542ddc83f292c99123167dafdc1c50ca8fea1714776ea SHA512 c5ef144366c4755b9ba7eaa2fa82097b4b86f92e4f2535b6dc5e5749b4dbe3bc14aa33e7a685bfbb472cd65d9e6198acbdcc86b1fee0ff9f36cd61802b5bb51c
 DIST sixlabors.imagesharp.3.1.5.nupkg 1040923 BLAKE2B 6ba96ed284a5fe50467cca80cd30a56830f248cf37883b27225811a48cb890dd67e4a3389273ca4b57cac4b52a223678b55f72f5a5788d124e812df55b801433 SHA512 88621a2fac5501d0a3b89387b213791b08448075a8d81666c52a35627754c59d760ee6c54f1dca39a897ae870f32bcd2594a51beb721b2de4af482d0b6762442
+DIST sqlitepclraw.bundle_e_sqlite3.2.1.10.nupkg 39260 BLAKE2B 18ebc5017aef0ff6a76e5bf4b3af0087282ab43a84e98a6da45c6d583fe15d3ba3879493d418ba699bbbfd0a7ffdca070b016e37643938a9a759d90ba0d8dc74 SHA512 adad8c846a8cde3999b3d8bc4b15940c4cb3ffff78eea5b92cd2aacb573c5eef28a03d1892c1a1ad82286472674bf25f798a8d7f52097c6c5915a99c66d8d0fe
 DIST sqlitepclraw.bundle_e_sqlite3.2.1.8.nupkg 37805 BLAKE2B 19c0b6f6423fc17de76211f18a4550ff6306f0ef2cd662a890633ee396ddd3d58f469ddf86907432730dd0e4d4020bcfc077a806e45f5545266a22136100b079 SHA512 ee9c19210d1e6eb3af0c5bb4e54eeae836b70e0956785eb769ca6fe3ec63d52b519c75dca863506b2972b9749ce781d8aa0cad2b46cf0606646ee99aa356ea09
+DIST sqlitepclraw.core.2.1.10.nupkg 36195 BLAKE2B ae9b26d383ab2be9a715d85883af46d1b2b2452412c434a42a6e48394522161e19bbb91a8cdba73c2f629a4fada81fa815ec9fb12d4c5106509d70e89295621d SHA512 a9439e45617ebecb888a5c3246c8a0aee3f3b803ba80021257c58d0835475338f38f589bd3fda3fa7a7eed84f40d9f96e12fac2a62514e0543dc48c8cc17b6ea
 DIST sqlitepclraw.core.2.1.4.nupkg 34506 BLAKE2B 9e95ae78116a78a8463cf6a820a3d76480d769af24b392cd8a553c8e7b035f33d911bef7badbe33f09337a5b8fb697a71cbd124fb77ac308767fe57ca9cc7fc8 SHA512 4a654a227445d97e0c3c00223f819b90d64746e7b2483c4ff0b69ae02d6d3f22a68df7d6c00245aed6f2c51610dc29714fbe6765a8fbe42795f90448c04909d2
+DIST sqlitepclraw.core.2.1.6.nupkg 34519 BLAKE2B 8b72e1e2147e11887dad341a643b91304404c391d908a4d0e330b05c2f516c2c95be2d43ff3c99705c0bde59b3670f60729ba178fc767c1775c4ac743e7601e1 SHA512 16bc39cd5325dea37e1564fc328a35966d6d820878290d945dc57496b716d4935b534285989af32fa7bd25ef9a8ac795b63e6a19044d3f84a104d643319473be
 DIST sqlitepclraw.core.2.1.8.nupkg 34771 BLAKE2B 9cd1832bf5cf69934199d989ff96c2ed408d249c9ba973bfe8ae73ab6435c09ec51b853f17c65ee98da097cf92798a5221b9a71e31967d5dbda497b46194fbb2 SHA512 44f6379ec6f00e6df247714726f008df0a905f7b933c62178c9a53bd71ecf003529d710db3ee99ab4c19dbde82e0e64d74356f95f48f857e1639893706826217
+DIST sqlitepclraw.lib.e_sqlite3.2.1.10.nupkg 19597545 BLAKE2B d840f1b28762e34a0f4a460b7e7e463c4b9de78cd0f2a5eb00fa4bf625dbb21548bd9b6e46488acd1728d020dc00d9a12749b5312e971c6aa5b82e730510436c SHA512 6aa065e9abdd77a4df4bd9c7ec4fa147d0e1ad85841270795bc6c6fbb31c40ad259fe6856edbc2bcbcd8a0c1d508cea00ca79b90f6d2683654910de65cbc2c5c
 DIST sqlitepclraw.lib.e_sqlite3.2.1.8.nupkg 18131960 BLAKE2B b3fe7fa9d8a9fc193c7df1f9bb42db0ef9dc62d00f6b1e25f9bd469d84e7834fa37efef52eb3350003d03d298ecf1080f88bab8e4960756b6bc745f9193fa5bd SHA512 aaf14bf6aca64043ad190c6a6f07afbfbfcd529cd08fe609fbc8f97b00830a4ca6837e779e1b18f95a948695019ae599391840b9b3e14e26f781bbdc5c2ec53c
+DIST sqlitepclraw.provider.e_sqlite3.2.1.10.nupkg 60832 BLAKE2B dd28f7458605ed006ab8110b3af068f023f1c4eb06438ab26353da53fb13da68f31f9bbe283ae64bab43f4fdc60c3eaa2bf48d8134b903a464ae0b3b7024a3fe SHA512 1f14f046642c68c82af61a46fbb26f9c1b8bce2187ac5c3a4086f5a511fca9840319e3cc3883f45442e5a9d365f8f1f47eb3a5c29c7d1e64d5d560dee671ebf6
 DIST sqlitepclraw.provider.e_sqlite3.2.1.8.nupkg 59396 BLAKE2B c17aa76191dc7b53bd702503504125331f81cefe45cdcb9c035adeef42ceabd911244211acb21ecf1052868de21e488601bd3ebb945ca0dc43fd6b16a0955dd4 SHA512 1871da4e903ec6a4e93be469c6d4b20cd2d6d09655615d303907a7a9192ea4c27083b259290f0a343cd4df4b983e781fa13beb40c02c1399ba2923a09c76bab2
 DIST stbisharp.1.1.0.nupkg 283683 BLAKE2B 54d8d069db62a007b901735de62c0dbf720f486b29533f9d567fc0fedc7904b895b524eca823e4f222a5cd4a579478927bc878977445934d51b70718d2c9d0db SHA512 aedfa54d21b4c0dd9bac03e69afb576fa5bb1b62692b127c126f5e8662670a1263b0e768afb80306906834a7727a4d9e0dad2c0325396c5100f433b411f127c8
 DIST system.appcontext.4.1.0.nupkg 146990 BLAKE2B 7881a5a903a358e19b0de72fe800c70ac9233e7c5e1e4115d69be6f8dbc4fbe86debb79bcd453295730e803ff1da974075c999f52e4c721e085676746c2f9b58 SHA512 f724af13eb14aa57255f82841683a93b427de172b8d31b9fe2c6bc8c21a795e60ecf211b4e49e1c2e285fe1ad498e6bd9c843e109a60a3dc27b49df560106e96
@@ -252,7 +302,9 @@ DIST system.io.filesystem.4.0.1.nupkg 274255 BLAKE2B e5beb1350bea00cf6d533de2211
 DIST system.io.filesystem.4.3.0.nupkg 274316 BLAKE2B 4ba513b503cfcad068c23a82423f9900c648fa2bc4fc16555bec717b6c5cfeac6c7708b28009c7a089f80c77ff744f573d72e4dcbeaa14acafb9fd3e8b5100d5 SHA512 4fb581d6f85b9529a091a0e974633752aa39e50b2be6c8a9e5eca8c2bc225cea07064ccec7778f77df9987deebf4dccec050b1a97edac0ee9107142e6a8ee7ee
 DIST system.io.filesystem.primitives.4.3.0.nupkg 94996 BLAKE2B 95fa6178164a7cc6a29c5a3fc55e415419c433b3b74abbcfa4fa5ae1bef40141b9515076b6869e8ed771b0ba6800bdb2fe6fa5d1f773ce52c40753efc0a82be9 SHA512 5885953d09582cffd973d23a21a929064d72f2bc9518af3732d671fffcc628a8b686f1d058a001ee6a114023b3e48b3fc0d0e4b22629a1c7f715e03795ee9ee5
 DIST system.io.packaging.8.0.0.nupkg 344967 BLAKE2B ef7599ea0953dee0d3bb7f674112e98b2ecac30ce26f436a9bcf92632a212563decaec293323e6923be601dab3ffd63f3455864a0269d8bd4e2d80c0f1ff9fd0 SHA512 141585b1465966c7d9a6cef56100659054cf60330d1637fc76a7fbcea9616195509081094b93de3e5e01210ea8e5e90023e66c684392074aaa9b5bad077fb15e
+DIST system.io.packaging.8.0.1.nupkg 348230 BLAKE2B 52ed5fc020202cb4cb0edc220ce393cd353e655d5185429ab6b1b060bbdae2a1367ef05ce7c6904b968c2aea2e80c93da0f77825c5416de20d2b8fdbd4cb2eb8 SHA512 559920e9de1958ebcd41e130587c655b14e453b133c32d0f5a5b2cdf58312c070ec31f225e7e0dc1b498ee291ac3954afbc5608bd198c0a167e0ddda3a337f2a
 DIST system.io.pipelines.7.0.0.nupkg 239541 BLAKE2B a61c39e8e9cbc36822ea8a66df6ee8116e6e2d9840907bfb016bb479a291875e1941c81420f93247a2fab85ede30c470ca4512cb334d6f3ba7a69f2e97c00952 SHA512 4da90b7d0b15a454decdc23b2fef8f1ad1596c8b230f1afeeba7393ef5334db559c9c0c8834cd216ce797b09386f4224a5329900adfdb9fd26eb784e12a169fd
+DIST system.io.pipelines.8.0.0.nupkg 267394 BLAKE2B 612570554ee41ae37c8987df6ec797583c95b38160aa70b1c2fba9af23f4bd85ac0ba5b7036abfc1ee3cecdbfbdaa83b861e9c017e5fdf3e726478b24e83d957 SHA512 57eb6a11e84f40a48b57b1dc5786a01aa9852122b7d15363490d8a12c9a458bf99a8ddf4c0c0247be98559c2b42e769a10bda2c5a9817735484d960dc652eb12
 DIST system.linq.4.1.0.nupkg 511874 BLAKE2B 3f5941e6fdc731ab7acb58aaad0340695ba2c1ad285ee5eefd9c4ad3972e278d74cabb0d5480f29697b8c9ebf839c3c8064436be4c508ad406f0b3ab2b6366fc SHA512 53e53220e5fdd6ad44f498e4657503780bca1f73be646009134150f06a76b0873753db3aae97398054bd1e8cc0c1c4cdd2db773f65a26874ab94110edb0cddb1
 DIST system.linq.4.3.0.nupkg 512550 BLAKE2B cc6cbb532575bfcfde7ac897970dcd49067186547108f46449f9f819e7910ad32496df3663d4db8eff48224b8ee95b27f7bb442bb477ad47f44da2f6fa893078 SHA512 eacc7fe1ec526f405f5ba0e671f616d0e5be9c1828d543a9e2f8c65df4099d6b2ea4a9fa2cdae4f34b170dc37142f60e267e137ca39f350281ed70d2dc620458
 DIST system.linq.expressions.4.1.0.nupkg 1929236 BLAKE2B a804c6741afed5fdc918c046092f8a526668fdeca8712f750efade8f1f272fcd2c58b1d1493f20528ff7006e189fddd21f8a2220c15d689c8de2ad2bea21b1d6 SHA512 04605a091d3aea404bc97cb7ffc154708b3bec886562d9e36aecd4d2ed130afbb45f54cd16a3f714f0ccb3f27c5bc7707e55fbc3e81681a783e9396930058acc
@@ -294,11 +346,13 @@ DIST system.resources.resourcemanager.4.3.0.nupkg 85908 BLAKE2B 002ba25bb953e5a9
 DIST system.runtime.4.1.0.nupkg 7263653 BLAKE2B 0a6699d985304a5072c7c283a42c100cb8f13ae61e95f93463ed57438ef3d7c655c3c4aed43b1d8fed4057933e924ca1e6b9a5987f1328fe4e2e172861572593 SHA512 4b05eb68bb485846707c4fe3393f9616d3ffb6c5f62a121d81142ddf7d0241c931fe96d193b7bf02281a9368458e0764466766557cfa9709035dc76d8fdd7706
 DIST system.runtime.4.3.0.nupkg 7263712 BLAKE2B 6cf2c6704f2a5639bffe2db645fd6ac935e341a5d50f1be97969bfba15e7fd93c94a2ddbb75a3538cefc05142fd72331185ca7ed175141102e8f977649f3bf1f SHA512 92ab2249f08073cfafdc4cfbd7db36d651ad871b8d8ba961006982187de374bf4a30af93f15f73b05af343f7a70cbd484b04d646570587636ae72171eb0714fb
 DIST system.runtime.compilerservices.unsafe.4.7.1.nupkg 106815 BLAKE2B 75dc584026b4bc589ec1bdaeb7ee8933a147391f7ecb71e69c9397d517368f5c1acb22d1a1a2f10a853baaf9fb659b59d5827baf70ce882792ce93cc3be09b13 SHA512 c8d781feacf79f3effc1c231a84beb0fa1e869fbeaa1d94ba3e84db75afe915e045c39ce059331fe48956534dcebdcd54fd97ab199e6a090bddc5250e208ee52
+DIST system.runtime.compilerservices.unsafe.5.0.0.nupkg 130329 BLAKE2B 661dc87cbbfceb67d13b0bdbcf3a035609213e4b99afac13ac773128b4a4428272e84f17e70fc84218fe1569f9ea9f28152c239713580ef5a75d4fbd6a87f08c SHA512 23226c503b06abecee5a9604a6e4dd3dabcdf921f55d6aa6dad2bab1ca12a001c7866af5a6de01cc9b4ace54e5c8ee1d5c2fd29dd9dfd7eda3ed86f9b35fa59f
 DIST system.runtime.compilerservices.unsafe.6.0.0-rc.1.21451.13.nupkg 84184 BLAKE2B d2928ff08753ea19952efcfa0f353b8a56bc0c9c485af20f3fc5108e36c882aec950eb074a007bf05b2de609e43a656389e25cf8ed3b8091073b8d1c71fb6d47 SHA512 a3b1623336497fdc6ad2c0a531aebe8368b162a44c92b5a0d71e993a8106fd082aec63491ecce3ddf664dec0a429dddeb39a2e94b29516fbe1ed4bfe32291069
 DIST system.runtime.compilerservices.unsafe.6.0.0.nupkg 84343 BLAKE2B aea2f833d6da80dbc275c47bfb207d77a1f2dd203a29352ff5a6e96d8b52752ee3c5bde38117c5ecc5dfbad66d8b47b2001efa1e2d564e14cbbf58d0d1fe208e SHA512 d4057301be4ec4936f24b9ce003b5ec4d99681ab6d9b65d5393dd38d04cdec37784aaa12c1a8b50ac3767ed878dae425749490773fec01e734f93cf1045822b3
 DIST system.runtime.extensions.4.1.0.nupkg 1060307 BLAKE2B 5426e4a8e6d9ebaa6c88ca7dc495c120b848602f15f102d3c65105c8a03ee35136d5eb2e04a3eb2452dea96a36af70e42cb7a317e269bf4ef8a1d3a5f33f9784 SHA512 42d009be57d6497aa0724924891289f3decd916d0432c1c865cc0494092f5e59287f632a70c5060b3c78e361ab04510d75dfb3c2d2853f54201f735eb6e2dea6
 DIST system.runtime.extensions.4.3.0.nupkg 1060357 BLAKE2B e58c5c36d42228a507fba876d43f064b872c93dc4a48e9a7475a77c27e00f2added1dbb8dd5d6516a4c5652ef2b01f5fa31aa611360b38a0b66a0b1a2e479699 SHA512 680a32b19c2bd5026f8687aa5382aea4f432b4f032f8bde299facb618c56d57369adef7f7cc8e60ad82ae3c12e5dd50772491363bf8044c778778628a6605bbc
 DIST system.runtime.handles.4.3.0.nupkg 54854 BLAKE2B e68360382f2c625e3b1526dddb1d49c6bddc9b78d38041801f0df876f1b06d429c608ff3b28a0c1415495eb38fcd70aafa9fe8dc0bb323790e8a85718a9f93f9 SHA512 0a5baf1dd554bf9e01bcb4ce082cb26ee82b783364feb47cba730faeecd70edc528efad0394dcce11f37d7f9507f8608f15629ebaf051906bfd3513e46af0f11
+DIST system.runtime.interopservices.4.1.0.nupkg 2542509 BLAKE2B 3ecf490aacb98e44dd952301828ab27f5cbe6b2053dfdd745737cfe1d7a847691e13b3a7df558daa2a1747e50e7045145a90f51e26f108fe9826814a0c60b7c0 SHA512 e8511e6a4cd40f3c603df4ffbbf6a4aac4d10be79bcfd0249a9af90d55cf2a02543ad9b82e607a4665d58f28c7ce9bdb0f7f3ff9bc8ded8a252213916a771bd2
 DIST system.runtime.interopservices.4.3.0.nupkg 2597020 BLAKE2B 4753b772f9d3596eae34b10497af40bc6e7cd63e9319e5789378cd148b009ae9fd5bde5e5757954ef06826bd4f4b79a3f8d8ea07766238407f26f3e222cdb2cf SHA512 650799c3e654efbb9ad67157c9c60ce46f288a81597be37ce2a0bf5d4835044065ef3f65b997328cbbbbfb81f4c89b8d7e7d61380880019deee6eb3f963f70d9
 DIST system.runtime.interopservices.runtimeinformation.4.0.0.nupkg 165972 BLAKE2B 0a4e21adbb275fded46ae04ccda695b9fcb29d4f199979b914a55d0cdc4457a6a7dfa8bbd82a5a46048d052a7e852cb935a1d4a7c6bf7e462f7b14327a52dc9d SHA512 462d35e66cbdd21dc007f06c6ef129ab57e810fa0f0416bd2fc6fb7eed55138780d4d31e31ee6267a82e2e3a1607e5c642bd6efeb130b57a1baa87e3141b0080
 DIST system.runtime.interopservices.runtimeinformation.4.3.0.nupkg 179546 BLAKE2B 780a92196ee216c1175768b32c04e88cfbc453bd9fdd6e5645c4ccc98f2c5ad62fd5cb158117df9391b1cdc3130a2cddca49304d2579434597350097960ce013 SHA512 6f4905329a3cc9e62d274c885f275ee31c5af57a6c9fd1a5080d039cb748e0277bef3dc8ce42863cac78365084e00a032279bf3d2b7254a49f3fb1566a29ad1b
@@ -328,6 +382,7 @@ DIST system.threading.4.0.11.nupkg 708036 BLAKE2B 6b85f9c80dfddd5faa9799fdd64379
 DIST system.threading.4.3.0.nupkg 708088 BLAKE2B 004d01762fad35a4607522d974a0cdc3d0049c82fe704f2f86fb98ee81059ebb56d13c290fcd273d1067a1a7c7f17bf3259d4d7e802c1d09a95e3c5fa29ef3f3 SHA512 97a2751bdce69faaf9c54f834a9fd5c60c7a786faa52f420769828dbc9b5804c1f3721ba1ea945ea1d844835d909810f9e782c9a44d0faaecccb230c4cd95a88
 DIST system.threading.channels.6.0.0.nupkg 181030 BLAKE2B 39e46b792436d972c61fe0e35d0375622488290de97ec9f7b905349faa5152d38f6104eab5f16511fc51bbe50164f42d3cd1ce073ba024e25859b19f114424be SHA512 32adff895c57ab9ef864cf89660403f041b07841be7c44a0c3c2c8451a1da076a8c1b4dcf1c993b585304ad7549afa408a0f797ad6814d0f14eb748a1fc9ce03
 DIST system.threading.channels.7.0.0.nupkg 195276 BLAKE2B 8c01d1fedda99b4874a4623f8567984391214fc2f86fb1ab7a697614519f4a01e146ba0fae7d4d6e2ef04231e1d6f4caf4bc594694b69307f0695ff7b66a0e13 SHA512 5d79a97496f25426a05a0ddb19f506353c4aa7810aff70b806df295e12956192b01cf8de1cf3a0d2edb076a1c5b288d4e2ee22f4a0720094f2cea2c232ac2952
+DIST system.threading.channels.8.0.0.nupkg 245743 BLAKE2B 1c7af0153bc68398a9e8c4daf142e41904c952e18c575d851d12217e11d1e308ceab8e15eb29db3533556b0e14545ce2996838ab830a3528be6a3d35ce0ffae3 SHA512 335b37eb97f594e73ab36e7ce7f0135be291445167688e89bd249d135e27f592a0bd69d91e8246a1c72a578d57bed443ac7302311365c16160b7dc974eedf141
 DIST system.threading.tasks.4.0.11.nupkg 840020 BLAKE2B ec5b6bbd3c912d3552922acd338611baa992dca6bf07b97b391e47b5b41ab718c373551dacffc7b4b67870287e93eb6e70ed184213e800fd9b424bf3e02cd8cb SHA512 fb66c496a5b4c88c5cb6e9d7b7d220e10f2fc0aed181420390f12f8d9986a1bd2829e9f1bf080bb6361cd8b8b4ffc9b622288dfa42124859e1be1e981b5cfa7b
 DIST system.threading.tasks.4.3.0.nupkg 840017 BLAKE2B 1cf4a8cc833da0a38304757db3808df5c217518c817d5807bf6f35393725a31223129fd1c4c964a36a60c65b686d24fc25d1777fa12ee622bddbb0f7c1772bec SHA512 7d488ff82cb20a3b3cef6380f2dae5ea9f7baa66bf75ad711aade1e3301b25993ccf2694e33c847ea5b9bdb90ff34c46fcd8a6ba7d6f95605ba0c124ed7c5d13
 DIST system.threading.tasks.extensions.4.3.0.nupkg 52499 BLAKE2B 3e6532ad1936859e2713e2e864831efe0af00a5ce561bd7f8723845bf285b8c15de00cb1fc246504f99599d183b400746cea987db883f0e61283db1fb2725a1e SHA512 2c33900ff7f544d6db31ad11b6baee1c9ecb40d5a54f51e5dd5bbbb37f4c50ee35ed481615cbf7c1da61a31ae3333c4454bfbeee4ae32241789e72ce3f910db6
@@ -337,9 +392,11 @@ DIST system.xml.readerwriter.4.3.0.nupkg 1388897 BLAKE2B ae51b8fe4492dec1e4e3584
 DIST system.xml.xdocument.4.3.0.nupkg 591350 BLAKE2B 86f910cef36c056f4a9ea9dc26eea6e01070467d27ac80fb8a0af5e1a572ad5d2169e4f1297cd362fddc9e0309458dbd413fca85ef8e56f97781c218e594604a SHA512 c2d9236a696daf23a29b530b9aa510fb813041685a1bb9a95845a51e61d870a0615e988b150f5be0d0896ef94b123e97f96c8a43ee815cf5b9897593986b1113
 DIST taglibsharp.2.3.0.nupkg 1378355 BLAKE2B 219f809b22bfeab2b2a16759f77c04912e4af8565b6fb0e55024a3d4cc6c80c9f0f3c61d9f0aa9771dbbe0feb17415142243f8564e81b548d067b1be44a15996 SHA512 9be37f6431f6ead36babe78dc6527340d7b4b0fe444736aaeae5aef3651191d4e0421d9d671106aea544888695d7841000fb12f8a44aab1b5fe93fb7c90d983f
 DIST velopack.0.0.598-g933b2ab.nupkg 545903 BLAKE2B e22dd4b0a53ebc1f24206306758790ad24c7f11b8eb1a624fc6a519f2fff2622746d2193b9f9fd10c350cbdd50150e0c8479629cc5e7a6a286b245c3c55447fa SHA512 21ae7eb8276e0cec17124f69becbaf7ec5ba8c75cabcacbf9a0052b3b8ad3023ce8a6af9adc9f8a8f3717c0e37e4434a300b84d6a0a61965eccf559d1ee4517b
+DIST velopack.0.0.915.nupkg 742781 BLAKE2B 8c662d7bbfb96bc6a4dbc177fa705a2962d6b7ba39c73be94f0bf866544684bafee464773c7b452205b18aee9a82e76cfc72383c2574f22f4e716ba6754fa310 SHA512 249f9b933011795f022a030666ca48fcfc596920ddefb2f235a009180a1947ca39255e18a9d5e8862c205542cb16b183c1e2ed9e4eb7f5683fbd6e56da62f473
 DIST vortice.d3dcompiler.2.4.2.nupkg 79944 BLAKE2B 63fdcc96ef6b97cf273bcd2f62087895fddaa104356c2893e1bf041e0eadc60004d254f0922bb6c09deaaa39a7ccf9fe8b2799f6254d5513f098aa799681eab0 SHA512 59bd5960ebb4d74465a91aab9a2ff498a6285601c8deb21748c056b64c07408e80dae27b453095985fedb5985e1ac7b1d32d00dd935782696c66ed328117ea19
 DIST vortice.direct3d11.2.4.2.nupkg 994958 BLAKE2B df582b08a96dab905085a49d01831717a94f2ce5c3b9e35360cd47311c6c9fbf46488014f92820ee6d74474e883b7dfb6a69e98e8a67fd5053bdf6e601a5d877 SHA512 aa8d460e006b9e49e3db2db51303b9acf9cb9a66d721c677183838fd9baea216701c14bbefd1a8d3151b79ca5a932abfac832abac04a61ed8619c77262801a5a
 DIST vortice.directx.2.4.2.nupkg 1127577 BLAKE2B 258053e60145f3d3178159b5b8d45aea73078829c5802dab2be5c8669732f528116708a2b173172f33621a65239da8c6da07b6d27419a7e8367eeabab14a5765 SHA512 f1f5e14ef3fb3246030b3b722ddad7ddfd5de986d45285a34212fc4b26c1a8073ff7761846210cf94b5fb2e0854010343012a9a60b7a28931999392bc3b5a9de
 DIST vortice.dxgi.2.4.2.nupkg 348799 BLAKE2B e425f8ff7545bcde8d962f9dbaf26a8dfe21a271928072c9998cd6b2453ef626912b490186bdd39e396a5cafef19442cb74ff151f25d712f6ddc93fd5de3fd68 SHA512 ef2b8c9021013ba6232ac93f852db66a9d884782acdbc1f26d070e9592e29be273d3571b7ecf3f6ab69f194dd5d8beddb8f7b89f0c94541c5ac070392dd8ae09
 DIST vortice.mathematics.1.4.25.nupkg 360426 BLAKE2B 31780297d1e2e5bcdae92f34a93982c63bcf42ebbbb5ac848c4fbaea6d9340724ae83826fa20d0b1e82456f1f66d0332dd2e85f5f623d03fb53b5d4b7d6eb86b SHA512 4721b4514028384405e213a33b152a2760794e62d62f7078352486d43636f428c8a815d18d02f4cdca6168ef44898da85ec55760b25f240f0c074e3ea978f0db
 DIST zstdsharp.port.0.7.4.nupkg 1128850 BLAKE2B 08d8f66898594e3f78315721c9c19d8d052e689df2986c68ea6577602afd7efdc1b4db7a56556a85f03ac005a30a1b28faeee116b969d5e82dc1f2a5988fbd91 SHA512 6931f1d35f7dec666e1061483fe70646615281163ed2731e335e36b7cbfd71a29fc548837d5de5d7b322bd4f2e5a73f7e2186312ff0a13a013f2404a0d7958b0
+DIST zstdsharp.port.0.8.1.nupkg 1211068 BLAKE2B 9a1e4cdf40adcff2acd7a730463cfa2bea12664a6a05c0ae410fbdbdf4b0ad03bc09efa1acf519d1fdfb961dc6f9484250cfc467442d1fb8891867c497327e7b SHA512 b1efdf27e2c4ef13387695318701d2f0344e4195b364cb373061766dc8269d7276adc0a2282c80d900e987bb2812b62884725878409abeeba5f796cd81395d85
diff --git a/games-arcade/osu-lazer/osu-lazer-2025.101.0.ebuild b/games-arcade/osu-lazer/osu-lazer-2025.101.0.ebuild
new file mode 100644
index 000000000000..4805abfd0a15
--- /dev/null
+++ b/games-arcade/osu-lazer/osu-lazer-2025.101.0.ebuild
@@ -0,0 +1,414 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOTNET_PKG_COMPAT="8.0"
+NUGETS="
+automapper@13.0.1
+castle.core@5.1.1
+deepequal@4.2.1
+diffplex@1.7.2
+discordrichpresence@1.2.1.24
+ffmpeg.autogen@4.3.0.1
+fody@6.8.0
+hidsharpcore@1.2.1.1
+htmlagilitypack@1.11.70
+humanizer.core.af@2.14.1
+humanizer.core.ar@2.14.1
+humanizer.core.az@2.14.1
+humanizer.core.bg@2.14.1
+humanizer.core.bn-bd@2.14.1
+humanizer.core.cs@2.14.1
+humanizer.core.da@2.14.1
+humanizer.core.de@2.14.1
+humanizer.core.el@2.14.1
+humanizer.core.es@2.14.1
+humanizer.core.fa@2.14.1
+humanizer.core.fi-fi@2.14.1
+humanizer.core.fr-be@2.14.1
+humanizer.core.fr@2.14.1
+humanizer.core.he@2.14.1
+humanizer.core.hr@2.14.1
+humanizer.core.hu@2.14.1
+humanizer.core.hy@2.14.1
+humanizer.core.id@2.14.1
+humanizer.core.is@2.14.1
+humanizer.core.it@2.14.1
+humanizer.core.ja@2.14.1
+humanizer.core.ko-kr@2.14.1
+humanizer.core.ku@2.14.1
+humanizer.core.lv@2.14.1
+humanizer.core.ms-my@2.14.1
+humanizer.core.mt@2.14.1
+humanizer.core.nb-no@2.14.1
+humanizer.core.nb@2.14.1
+humanizer.core.nl@2.14.1
+humanizer.core.pl@2.14.1
+humanizer.core.pt@2.14.1
+humanizer.core.ro@2.14.1
+humanizer.core.ru@2.14.1
+humanizer.core.sk@2.14.1
+humanizer.core.sl@2.14.1
+humanizer.core.sr-latn@2.14.1
+humanizer.core.sr@2.14.1
+humanizer.core.sv@2.14.1
+humanizer.core.th-th@2.14.1
+humanizer.core.tr@2.14.1
+humanizer.core.uk@2.14.1
+humanizer.core.uz-cyrl-uz@2.14.1
+humanizer.core.uz-latn-uz@2.14.1
+humanizer.core.vi@2.14.1
+humanizer.core.zh-cn@2.14.1
+humanizer.core.zh-hans@2.14.1
+humanizer.core.zh-hant@2.14.1
+humanizer.core@2.14.1
+humanizer@2.14.1
+jetbrains.annotations@2023.3.0
+managed-midi@1.10.1
+markdig@0.23.0
+messagepack.annotations@2.5.187
+messagepack@2.5.108
+messagepack@2.5.187
+microsoft.aspnetcore.connections.abstractions@8.0.10
+microsoft.aspnetcore.http.connections.client@8.0.10
+microsoft.aspnetcore.http.connections.common@8.0.10
+microsoft.aspnetcore.signalr.client.core@8.0.10
+microsoft.aspnetcore.signalr.client@8.0.10
+microsoft.aspnetcore.signalr.common@8.0.10
+microsoft.aspnetcore.signalr.protocols.json@8.0.10
+microsoft.aspnetcore.signalr.protocols.messagepack@8.0.10
+microsoft.aspnetcore.signalr.protocols.newtonsoftjson@8.0.10
+microsoft.codeanalysis.bannedapianalyzers@3.3.4
+microsoft.codecoverage@17.11.1
+microsoft.csharp@4.5.0
+microsoft.data.sqlite.core@8.0.10
+microsoft.diagnostics.netcore.client@0.2.61701
+microsoft.diagnostics.runtime@2.0.161401
+microsoft.dotnet.platformabstractions@2.0.3
+microsoft.extensions.configuration.abstractions@8.0.0
+microsoft.extensions.dependencyinjection.abstractions@6.0.0
+microsoft.extensions.dependencyinjection.abstractions@8.0.0
+microsoft.extensions.dependencyinjection.abstractions@8.0.2
+microsoft.extensions.dependencyinjection@6.0.0-rc.1.21451.13
+microsoft.extensions.dependencyinjection@8.0.1
+microsoft.extensions.dependencymodel@2.0.3
+microsoft.extensions.features@8.0.10
+microsoft.extensions.logging.abstractions@8.0.0
+microsoft.extensions.logging.abstractions@8.0.2
+microsoft.extensions.logging@8.0.1
+microsoft.extensions.objectpool@5.0.11
+microsoft.extensions.options@6.0.0
+microsoft.extensions.options@8.0.2
+microsoft.extensions.primitives@6.0.0
+microsoft.extensions.primitives@8.0.0
+microsoft.net.stringtools@17.6.3
+microsoft.net.test.sdk@17.11.1
+microsoft.netcore.platforms@1.0.1
+microsoft.netcore.platforms@1.1.0
+microsoft.netcore.platforms@5.0.0
+microsoft.netcore.targets@1.0.1
+microsoft.netcore.targets@1.1.0
+microsoft.testplatform.objectmodel@17.11.1
+microsoft.testplatform.testhost@17.11.1
+microsoft.toolkit.highperformance@7.1.2
+microsoft.win32.primitives@4.3.0
+microsoft.win32.registry@4.5.0
+microsoft.win32.registry@5.0.0
+mongodb.bson@2.19.1
+moq@4.18.4
+nativelibraryloader@1.0.13
+netstandard.library@1.6.1
+netstandard.library@2.0.0
+newtonsoft.json@13.0.1
+newtonsoft.json@13.0.3
+newtonsoft.json@9.0.1
+nito.asyncex.context@5.1.2
+nito.asyncex.coordination@5.1.2
+nito.asyncex.interop.waithandles@5.1.2
+nito.asyncex.oop@5.1.2
+nito.asyncex.tasks@5.1.2
+nito.asyncex@5.1.2
+nito.cancellation@1.1.2
+nito.collections.deque@1.1.1
+nito.disposables@2.2.1
+nuget.versioning@6.12.1
+nunit3testadapter@4.5.0
+nunit@3.13.3
+nunit@3.14.0
+opentabletdriver.configurations@0.6.5
+opentabletdriver.native@0.6.5
+opentabletdriver.plugin@0.6.5
+opentabletdriver@0.6.5
+polysharp@1.10.0
+ppy.localisationanalyser@2024.802.0
+ppy.managedbass.fx@2022.1216.0
+ppy.managedbass.mix@2022.1216.0
+ppy.managedbass.wasapi@2022.1216.0
+ppy.managedbass@2022.1216.0
+ppy.osu.framework.nativelibs@2024.809.1-nativelibs
+ppy.osu.framework.sourcegeneration@2024.1128.0
+ppy.osu.framework@2024.1224.0
+ppy.osu.game.resources@2024.1224.0
+ppy.osutk.ns20@1.0.211
+ppy.sdl2-cs@1.0.741-alpha
+ppy.sdl3-cs@2024.1128.0
+ppy.veldrid.metalbindings@4.9.62-gca0239da6b
+ppy.veldrid.openglbindings@4.9.62-gca0239da6b
+ppy.veldrid.spirv@1.0.15-gfbb03d21c2
+ppy.veldrid@4.9.3-g91ce5a6cda
+ppy.veldrid@4.9.62-gca0239da6b
+ppy.vk@1.0.26
+realm.platformhelpers@11.5.0
+realm@11.5.0
+remotion.linq@2.2.0
+runtime.any.system.collections@4.3.0
+runtime.any.system.diagnostics.tracing@4.3.0
+runtime.any.system.globalization.calendars@4.3.0
+runtime.any.system.globalization@4.3.0
+runtime.any.system.io@4.3.0
+runtime.any.system.reflection.extensions@4.3.0
+runtime.any.system.reflection.primitives@4.3.0
+runtime.any.system.reflection@4.3.0
+runtime.any.system.resources.resourcemanager@4.3.0
+runtime.any.system.runtime.handles@4.3.0
+runtime.any.system.runtime.interopservices@4.3.0
+runtime.any.system.runtime@4.3.0
+runtime.any.system.text.encoding.extensions@4.3.0
+runtime.any.system.text.encoding@4.3.0
+runtime.any.system.threading.tasks@4.3.0
+runtime.any.system.threading.timer@4.3.0
+runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.native.system.net.http@4.3.0
+runtime.native.system.net.security@4.3.0
+runtime.native.system.security.cryptography.apple@4.3.0
+runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.native.system@4.0.0
+runtime.native.system@4.3.0
+runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple@4.3.0
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.unix.microsoft.win32.primitives@4.3.0
+runtime.unix.system.diagnostics.debug@4.3.0
+runtime.unix.system.io.filesystem@4.3.0
+runtime.unix.system.net.primitives@4.3.0
+runtime.unix.system.net.sockets@4.3.0
+runtime.unix.system.private.uri@4.3.0
+runtime.unix.system.runtime.extensions@4.3.0
+sentry@4.13.0
+sharpcompress@0.38.0
+sharpfnt@2.0.0
+sharpgen.runtime.com@2.0.0-beta.13
+sharpgen.runtime@2.0.0-beta.13
+sixlabors.imagesharp@3.1.5
+sqlitepclraw.bundle_e_sqlite3@2.1.10
+sqlitepclraw.core@2.1.10
+sqlitepclraw.core@2.1.6
+sqlitepclraw.lib.e_sqlite3@2.1.10
+sqlitepclraw.provider.e_sqlite3@2.1.10
+stbisharp@1.1.0
+system.appcontext@4.1.0
+system.buffers@4.3.0
+system.buffers@4.5.1
+system.collections.concurrent@4.3.0
+system.collections.immutable@1.7.1
+system.collections@4.0.11
+system.collections@4.3.0
+system.componentmodel.annotations@5.0.0
+system.diagnostics.debug@4.0.11
+system.diagnostics.debug@4.3.0
+system.diagnostics.eventlog@6.0.0
+system.diagnostics.tracing@4.3.0
+system.dynamic.runtime@4.0.11
+system.dynamic.runtime@4.3.0
+system.globalization.calendars@4.3.0
+system.globalization.extensions@4.3.0
+system.globalization@4.0.11
+system.globalization@4.3.0
+system.io.filesystem.primitives@4.3.0
+system.io.filesystem@4.0.1
+system.io.filesystem@4.3.0
+system.io.packaging@8.0.1
+system.io.pipelines@8.0.0
+system.io@4.1.0
+system.io@4.3.0
+system.linq.expressions@4.1.0
+system.linq.expressions@4.3.0
+system.linq.queryable@4.0.1
+system.linq@4.1.0
+system.linq@4.3.0
+system.memory@4.5.3
+system.memory@4.5.4
+system.memory@4.5.5
+system.net.nameresolution@4.3.0
+system.net.primitives@4.3.0
+system.net.security@4.3.0
+system.net.sockets@4.3.0
+system.net.webheadercollection@4.3.0
+system.net.websockets.client@4.3.2
+system.net.websockets@4.3.0
+system.numerics.tensors@8.0.0
+system.objectmodel@4.0.12
+system.objectmodel@4.3.0
+system.private.uri@4.3.0
+system.reflection.emit.ilgeneration@4.0.1
+system.reflection.emit.ilgeneration@4.3.0
+system.reflection.emit.lightweight@4.0.1
+system.reflection.emit.lightweight@4.3.0
+system.reflection.emit@4.0.1
+system.reflection.emit@4.3.0
+system.reflection.extensions@4.0.1
+system.reflection.extensions@4.3.0
+system.reflection.metadata@1.6.0
+system.reflection.metadata@1.8.1
+system.reflection.primitives@4.0.1
+system.reflection.primitives@4.3.0
+system.reflection.typeextensions@4.1.0
+system.reflection.typeextensions@4.3.0
+system.reflection@4.1.0
+system.reflection@4.3.0
+system.resources.resourcemanager@4.0.1
+system.resources.resourcemanager@4.3.0
+system.runtime.compilerservices.unsafe@4.7.1
+system.runtime.compilerservices.unsafe@5.0.0
+system.runtime.compilerservices.unsafe@6.0.0
+system.runtime.extensions@4.1.0
+system.runtime.extensions@4.3.0
+system.runtime.handles@4.3.0
+system.runtime.interopservices.runtimeinformation@4.0.0
+system.runtime.interopservices@4.1.0
+system.runtime.interopservices@4.3.0
+system.runtime.numerics@4.3.0
+system.runtime@4.1.0
+system.runtime@4.3.0
+system.security.accesscontrol@4.5.0
+system.security.accesscontrol@5.0.0
+system.security.claims@4.3.0
+system.security.cryptography.algorithms@4.3.0
+system.security.cryptography.cng@4.3.0
+system.security.cryptography.csp@4.3.0
+system.security.cryptography.encoding@4.3.0
+system.security.cryptography.openssl@4.3.0
+system.security.cryptography.primitives@4.3.0
+system.security.cryptography.x509certificates@4.3.0
+system.security.principal.windows@4.3.0
+system.security.principal.windows@4.5.0
+system.security.principal.windows@5.0.0
+system.security.principal@4.3.0
+system.text.encoding.extensions@4.3.0
+system.text.encoding@4.3.0
+system.threading.channels@6.0.0
+system.threading.channels@8.0.0
+system.threading.tasks@4.0.11
+system.threading.tasks@4.3.0
+system.threading.threadpool@4.3.0
+system.threading.timer@4.3.0
+system.threading@4.0.11
+system.threading@4.3.0
+taglibsharp@2.3.0
+velopack@0.0.915
+vortice.d3dcompiler@2.4.2
+vortice.direct3d11@2.4.2
+vortice.directx@2.4.2
+vortice.dxgi@2.4.2
+vortice.mathematics@1.4.25
+zstdsharp.port@0.8.1
+"
+
+inherit check-reqs desktop dotnet-pkg xdg-utils
+
+DESCRIPTION="A free-to-win rhythm game and a final iteration of the osu! game client"
+HOMEPAGE="https://osu.ppy.sh/
+	https://github.com/ppy/osu/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ppy/osu"
+else
+	SRC_URI="https://github.com/ppy/osu/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+	S="${WORKDIR}/osu-${PV}"
+
+	KEYWORDS="~amd64"
+fi
+
+SRC_URI+=" ${NUGET_URIS} "
+
+# "all-rights-reserved" - ships a copy of proprietary BASS lib - https://www.un4seen.com
+LICENSE="Apache-2.0 BSD-2 LGPL-2.1 LGPL-3+ MIT all-rights-reserved"
+SLOT="0"
+IUSE="+pipewire"
+RESTRICT="test" # > The active test run was aborted. Reason: Test host process crashed
+
+RDEPEND="
+	pipewire? (
+		media-video/pipewire[pipewire-alsa]
+	)
+"
+
+CHECKREQS_DISK_BUILD="3G"
+DOTNET_PKG_PROJECTS=(
+	osu.Desktop/osu.Desktop.csproj
+)
+DOTNET_PKG_BAD_PROJECTS=(
+	osu.Game.Benchmarks
+	osu.Game.Rulesets.Catch.Tests.{Android,iOS}
+	osu.Game.Rulesets.Mania.Tests.{Android,iOS}
+	osu.Game.Rulesets.Osu.Tests.{Android,iOS}
+	osu.Game.Rulesets.Taiko.Tests.{Android,iOS}
+	osu.Game.Tests.{Android,iOS}
+	osu.{Android,iOS}
+)
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	dotnet-pkg_pkg_setup
+}
+
+src_test() {
+	local -a test_projects=(
+		osu.Game.Rulesets.Mania.Tests
+		osu.Game.Rulesets.Osu.Tests
+		osu.Game.Tests
+	)
+	local test_project=""
+	for test_project in "${test_projects[@]}" ; do
+		nonfatal \
+			dotnet-pkg-base_test "${test_project}"
+	done
+}
+
+src_install() {
+	dotnet-pkg-base_install
+	dotnet-pkg-base_append-launchervar "OSU_EXTERNAL_UPDATE_PROVIDER='1'"
+	dotnet-pkg-base_dolauncher "/usr/share/${P}/osu!" "${PN}"
+
+	newicon -s 128 assets/lazer-nuget.png "${PN}.png"
+	newicon -s 1024 assets/lazer.png "${PN}.png"
+	make_desktop_entry "${PN}"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+
+	if ! use pipewire ; then
+		ewarn "osu!'s sound comes from the BASS driver, such driver requires"
+		ewarn "a connection to ALSA. You might now have sound in your game."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/games-board/chessx/Manifest b/games-board/chessx/Manifest
index 887c6e39fcaa..bbae7a2229c7 100644
--- a/games-board/chessx/Manifest
+++ b/games-board/chessx/Manifest
@@ -1 +1 @@
-DIST chessx-1.5.4.tgz 3663299 BLAKE2B 3a0f222d2c122e70f66600f15a2b9a9606e56407db364a616515ebc1b7f333e260c131e61e22f59fb3cbd340555bb8c238bfd560fbc23f4c173288cd4b7e7369 SHA512 9f112b185ed8af3690cb50eafead7dfbd7896d3baebc9b10c3d32103a51cc49834703c232c159dffe24fd09601f2b41db02598c435ca56fc1031195fb9762a42
+DIST chessx-1.6.2.tgz 11024855 BLAKE2B cdb836491f0567e885425f12230f4da69b5c03f6a4f02370064ae3bf8455c5ef035f8e177732602d3eaf865f0e16e8661243f42daa3aa3dd2166860fc25d771d SHA512 d9d92c9a36998497696ad84dd60f3dc5243fbcd29ee78a3c05d7812bc90be103349042f794060c3ef803199cc5b315d055b2a5e10c0b355a89b55dbc4a6c5241
diff --git a/games-board/chessx/chessx-1.5.4-r4.ebuild b/games-board/chessx/chessx-1.5.4-r4.ebuild
deleted file mode 100644
index 09e2228aa3c3..000000000000
--- a/games-board/chessx/chessx-1.5.4-r4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Qt5-based Chess Database Utility"
-HOMEPAGE="https://chessx.sourceforge.net/"
-SRC_URI="https://sourceforge.net/projects/chessx/files/chessx/${PV}/${P}.tgz"
-
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-libs/quazip-0.9.1:0=[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtspeech:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-system-quazip.patch
-	"${FILESDIR}"/${P}-missing-translations.patch
-	"${FILESDIR}"/${P}-install.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	if has_version "<dev-libs/quazip-1.0"; then
-		sed -e "/^PKGCONFIG/s/quazip1-qt5/quazip/" -i chessx.pro || die
-	fi
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/games-board/chessx/chessx-1.6.2.ebuild b/games-board/chessx/chessx-1.6.2.ebuild
new file mode 100644
index 000000000000..5640be58ee04
--- /dev/null
+++ b/games-board/chessx/chessx-1.6.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop qmake-utils xdg
+
+DESCRIPTION="Qt-based Chess Database Utility"
+HOMEPAGE="https://chessx.sourceforge.net/"
+SRC_URI="https://sourceforge.net/projects/chessx/files/chessx/${PV}/${P}.tgz"
+S="${WORKDIR}/${PN}-master"
+
+LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-libs/quazip-1.3-r2:0=[qt6(+)]
+	dev-qt/qt5compat:6
+	dev-qt/qtbase:6[gui,network,widgets,xml]
+	dev-qt/qtmultimedia:6
+	dev-qt/qtspeech:6
+	dev-qt/qtsvg:6
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtbase:6[concurrent]
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-system-quazip-zlib.patch
+	"${FILESDIR}"/${P}-install.patch
+)
+
+src_configure() {
+	eqmake6 PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	doicon -s 256 data/images/${PN}.png
+	for x in 32 64; do
+		newicon -s ${x} data/images/${PN}-${x}.png ${PN}.png
+	done
+	einstalldocs
+}
diff --git a/games-board/chessx/files/chessx-1.5.4-install.patch b/games-board/chessx/files/chessx-1.5.4-install.patch
deleted file mode 100644
index c017b3ea1535..000000000000
--- a/games-board/chessx/files/chessx-1.5.4-install.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: chessx-1.5.4/chessx.pro
-===================================================================
---- chessx-1.5.4.orig/chessx.pro
-+++ chessx-1.5.4/chessx.pro
-@@ -546,6 +546,22 @@ macx {
-     data/timeseal/mac/timeseal
- }
- 
-+unix:!macx {
-+  isEmpty(PREFIX) {
-+    PREFIX = /usr
-+  }
-+  target.path = $$PREFIX/bin
-+  desktop.path = $$PREFIX/share/applications
-+  desktop.files = unix/chessx.desktop
-+  icon.path = $$PREFIX/share/pixmaps
-+  icon.files = data/images/chessx.png
-+  data.path = $$PREFIX/share/chessx
-+  data.files = data
-+  lang.path = $$PREFIX/share/chessx/data/lang
-+  lang.files = i18n/*.qm
-+  INSTALLS += target desktop icon data lang
-+}
-+
- win32 {
-   OTHER_FILES += \
-     src/chessx.rc \
diff --git a/games-board/chessx/files/chessx-1.5.4-missing-translations.patch b/games-board/chessx/files/chessx-1.5.4-missing-translations.patch
deleted file mode 100644
index 7c874e16508b..000000000000
--- a/games-board/chessx/files/chessx-1.5.4-missing-translations.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: resources.qrc
-===================================================================
---- a/resources.qrc
-+++ b/resources.qrc
-@@ -12,11 +12,7 @@
-         <file alias="help/about4.html">data/help/about4.html</file>
-         <file alias="help/about5.html">data/help/about5.html</file>
-         <file alias="help/about6.html">data/help/about6.html</file>
--        <file alias="i18n/chessx_da.qm">i18n/chessx_da.qm</file>
-         <file alias="i18n/chessx_de.qm">i18n/chessx_de.qm</file>
--        <file alias="i18n/chessx_fr.qm">i18n/chessx_fr.qm</file>
--        <file alias="i18n/chessx_it.qm">i18n/chessx_it.qm</file>
--        <file alias="i18n/chessx_cz.qm">i18n/chessx_cz.qm</file>
-         <file alias="images/accept.png">data/images/accept.png</file>
-         <file alias="images/annotate.png">data/images/annotate.png</file>
-         <file alias="images/arrow_green.png">data/images/arrow_green.png</file>
-@@ -180,7 +176,6 @@
-         <file alias="themes/shadow/leipzig.png">data/themes/shadow/leipzig.png</file>
-         <file alias="themes/shadow/merida.png">data/themes/shadow/merida.png</file>
-         <file alias="themes/shadow/spatial.png">data/themes/shadow/spatial.png</file>
--        <file alias="i18n/chessx_ru.qm">i18n/chessx_ru.qm</file>
-         <file alias="images/threat_black.png">data/images/threat_black.png</file>
-         <file alias="images/threat_white.png">data/images/threat_white.png</file>
-         <file alias="images/black_wall.png">data/images/black_wall.png</file>
diff --git a/games-board/chessx/files/chessx-1.5.4-system-quazip.patch b/games-board/chessx/files/chessx-1.5.4-system-quazip.patch
deleted file mode 100644
index 6610d3c8e420..000000000000
--- a/games-board/chessx/files/chessx-1.5.4-system-quazip.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Index: chessx.pro
-===================================================================
---- a/chessx.pro
-+++ b/chessx.pro
-@@ -39,7 +39,6 @@ static { # Everything below takes effect
-     message("Static build.")
- }
- 
--DEFINES += QUAZIP_STATIC
- DEFINES += QT_NO_CAST_TO_ASCII
- DEFINES *= QT_USE_QSTRINGBUILDER
- 
-@@ -156,22 +155,6 @@ HEADERS += src/database/board.h \
-     src/gui/engineoptionlist.h \
-     src/gui/helpbrowser.h \
-     src/database/downloadmanager.h \
--    src/quazip/zip.h \
--    src/quazip/unzip.h \
--    src/quazip/quazipnewinfo.h \
--    src/quazip/quazipfileinfo.h \
--    src/quazip/quazipfile.h \
--    src/quazip/quazipdir.h \
--    src/quazip/quazip.h \
--    src/quazip/quazip_global.h \
--    src/quazip/quaziodevice.h \
--    src/quazip/quagzipfile.h \
--    src/quazip/quacrc32.h \
--    src/quazip/quachecksum32.h \
--    src/quazip/quaadler32.h \
--    src/quazip/JlCompress.h \
--    src/quazip/ioapi.h \
--    src/quazip/crypt.h \
-     src/gui/toolmainwindow.h \
-     src/gui/playerlistwidget.h \
-     src/gui/qled.h \
-@@ -321,16 +304,6 @@ SOURCES += src/database/board.cpp \
-     src/gui/engineoptionlist.cpp \
-     src/gui/helpbrowser.cpp \
-     src/database/downloadmanager.cpp \
--    src/quazip/quazipnewinfo.cpp \
--    src/quazip/quazipfile.cpp \
--    src/quazip/quazipdir.cpp \
--    src/quazip/quazip.cpp \
--    src/quazip/quaziodevice.cpp \
--    src/quazip/quagzipfile.cpp \
--    src/quazip/quacrc32.cpp \
--    src/quazip/quaadler32.cpp \
--    src/quazip/qioapi.cpp \
--    src/quazip/JlCompress.cpp \
-     src/gui/toolmainwindow.cpp \
-     src/gui/playerlistwidget.cpp \
-     src/gui/qled.cpp \
-@@ -401,8 +374,6 @@ SOURCES += src/database/board.cpp \
-     src/gui/historylabel.cpp \
-     src/database/streamdatabase.cpp \
-     src/database/refcount.cpp \
--    src/quazip/unzip.cpp \
--    src/quazip/zip.cpp \
-     src/database/arenabook.cpp \
-     src/gui/gamelistsortmodel.cpp \
-     src/gui/listwidgetex.cpp
-@@ -412,8 +383,9 @@ INCLUDEPATH += src/database
- INCLUDEPATH += src/guess
- INCLUDEPATH += src/gui
- INCLUDEPATH += src/dialogs
--INCLUDEPATH += src/quazip
--INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib
-+
-+CONFIG += link_pkgconfig
-+PKGCONFIG += quazip1-qt5
- 
- win32 {
-     # DEFINES += ZLIB_WINAPI
diff --git a/games-board/chessx/files/chessx-1.6.2-install.patch b/games-board/chessx/files/chessx-1.6.2-install.patch
new file mode 100644
index 000000000000..9218f61f25c6
--- /dev/null
+++ b/games-board/chessx/files/chessx-1.6.2-install.patch
@@ -0,0 +1,22 @@
+--- a/chessx.pro	2024-09-06 00:12:14.000000000 +0200
++++ b/chessx.pro	2025-01-03 22:31:22.225021206 +0100
+@@ -67,18 +67,13 @@
+     BINDIR = $$PREFIX/bin
+     DATADIR = $$PREFIX/share
+ 
+-    INSTALLS += appdata desktop icons binfiles
++    INSTALLS += appdata desktop binfiles
+ 
+     appdata.files = unix/io.sourceforge.ChessX.metainfo.xml
+     appdata.path = $$DATADIR/metainfo
+     desktop.files = unix/chessx.desktop
+     desktop.path = $$DATADIR/applications
+ 
+-    icons.path = $$DATADIR/icons/hicolor
+-    icons.commands = install -Dm644 data/images/chessx.png    $${icons.path}/128x128/apps/chessx.png; \
+-                     install -Dm644 data/images/chessx-32.png $${icons.path}/32x32/apps/chessx.png; \
+-                     install -Dm644 data/images/chessx-64.png $${icons.path}/64x64/apps/chessx.png;
+-
+     binfiles.files = release/chessx
+     binfiles.path = $$BINDIR
+ 
diff --git a/games-board/chessx/files/chessx-1.6.2-system-quazip-zlib.patch b/games-board/chessx/files/chessx-1.6.2-system-quazip-zlib.patch
new file mode 100644
index 000000000000..f17383a3dee5
--- /dev/null
+++ b/games-board/chessx/files/chessx-1.6.2-system-quazip-zlib.patch
@@ -0,0 +1,66 @@
+--- a/chessx.pro	2024-09-06 00:12:14.000000000 +0200
++++ b/chessx.pro	2025-01-03 21:51:05.872265212 +0100
+@@ -41,7 +41,6 @@
+   QT += multimedia
+ }
+ 
+-DEFINES += QUAZIP_STATIC
+ DEFINES += QT_NO_CAST_TO_ASCII
+ DEFINES *= QT_USE_QSTRINGBUILDER
+ 
+@@ -342,23 +341,7 @@
+   src/gui/textbrowserex.h \
+   src/gui/textedit.h \
+   src/gui/toolmainwindow.h \
+-  src/gui/translatingslider.h \
+-  src/quazip/JlCompress.h \
+-  src/quazip/crypt.h \
+-  src/quazip/ioapi.h \
+-  src/quazip/quaadler32.h \
+-  src/quazip/quachecksum32.h \
+-  src/quazip/quacrc32.h \
+-  src/quazip/quagzipfile.h \
+-  src/quazip/quaziodevice.h \
+-  src/quazip/quazip.h \
+-  src/quazip/quazip_global.h \
+-  src/quazip/quazipdir.h \
+-  src/quazip/quazipfile.h \
+-  src/quazip/quazipfileinfo.h \
+-  src/quazip/quazipnewinfo.h \
+-  src/quazip/unzip.h \
+-  src/quazip/zip.h
++  src/gui/translatingslider.h
+ 
+ SOURCES += \
+   src/database/analysis.cpp \
+@@ -512,26 +495,15 @@
+   src/gui/testadapter.cpp \
+   src/gui/textedit.cpp \
+   src/gui/toolmainwindow.cpp \
+-  src/gui/translatingslider.cpp \
+-  src/quazip/JlCompress.cpp \
+-  src/quazip/qioapi.cpp \
+-  src/quazip/quaadler32.cpp \
+-  src/quazip/quacrc32.cpp \
+-  src/quazip/quagzipfile.cpp \
+-  src/quazip/quaziodevice.cpp \
+-  src/quazip/quazip.cpp \
+-  src/quazip/quazipdir.cpp \
+-  src/quazip/quazipfile.cpp \
+-  src/quazip/quazipnewinfo.cpp \
+-  src/quazip/unzip.cpp \
+-  src/quazip/zip.cpp
++  src/gui/translatingslider.cpp
+ 
+ INCLUDEPATH += src/database
+ INCLUDEPATH += src/guess
+ INCLUDEPATH += src/gui
+ INCLUDEPATH += src/dialogs
+-INCLUDEPATH += src/quazip
+-INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib
++
++CONFIG += link_pkgconfig
++PKGCONFIG += quazip1-qt6
+ 
+ win32 {
+   # DEFINES += ZLIB_WINAPI
diff --git a/games-board/gnome-chess/Manifest b/games-board/gnome-chess/Manifest
index af17d94f0862..3b7b302547b7 100644
--- a/games-board/gnome-chess/Manifest
+++ b/games-board/gnome-chess/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-chess-43.2.tar.xz 743344 BLAKE2B 755d70ef964f6337acf852edc6fdbe69fbf3b566dfc36fa697d4c4ecdeeae5df5d1979e54e3304e89963fab01655979a55ac4f827bb1f1b506ab3cea8d147117 SHA512 e10439dd39e61436e3174e1d599d30d06955e65b696b9c37a0e9a8f1a41d19f71f33cca83ec9cc8fe2d8b516c2ec113f22bf3ddd1f1f465286cbe5bde8bcc0a2
 DIST gnome-chess-46.0.tar.xz 782212 BLAKE2B dec141cac14b59b02a3c4e0f10b09e450bf962ff5b688a7cfb31b274e1b92bd0c09a6afa3a32bb21a137114edb349ff3ac7aa88918481374fe2d4baeeca7cef2 SHA512 e605b9750fdc77a0d2b6973f127fb2cf5fadb15080add728c80a8be5ce02035ff6cadb0351751a0612f09632602fe532405d62c68828fd0ec4bf83b9bd11301a
+DIST gnome-chess-47.0.tar.xz 825264 BLAKE2B 6fdbfe37daa437f2220969306ffbf46f7ce6bd53c02a5def4da0a4c7b705ba839299612289d5e5fb8f10624fe7981129b28566c7df5f5eec30e28186620c310c SHA512 3989d22b6b2c9ec9efec35deb4304176e8fe79d87623809bd6a926cf4b77a9ac866d2c059b8d07bda9179632891112124e1b657f930dbaac3e03e9ee6d5da090
diff --git a/games-board/gnome-chess/gnome-chess-43.2.ebuild b/games-board/gnome-chess/gnome-chess-43.2.ebuild
deleted file mode 100644
index c9335dbc4a95..000000000000
--- a/games-board/gnome-chess/gnome-chess-43.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 vala xdg
-
-DESCRIPTION="Play the classic two-player boardgame of chess"
-HOMEPAGE="https://wiki.gnome.org/Apps/Chess https://gitlab.gnome.org/GNOME/gnome-chess"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	gui-libs/gtk:4
-	>=gui-libs/libadwaita-1.0.0:1
-	>=gnome-base/librsvg-2.46.0:2
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}
-	gnome-base/librsvg:2[vala]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-util/itstool
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="To be able to play against a computer you will need
-to install a chess engine package, for example games-board/gnuchess"
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-board/gnome-chess/gnome-chess-47.0.ebuild b/games-board/gnome-chess/gnome-chess-47.0.ebuild
new file mode 100644
index 000000000000..5af7622368f2
--- /dev/null
+++ b/games-board/gnome-chess/gnome-chess-47.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 vala xdg
+
+DESCRIPTION="Play the classic two-player boardgame of chess"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-chess"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=gui-libs/gtk-4.10:4
+	>=gui-libs/libadwaita-1.5:1
+	>=gnome-base/librsvg-2.46.0:2
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}
+	gnome-base/librsvg:2[vala]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-util/itstool
+	dev-libs/appstream-glib
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="To be able to play against a computer you will need
+to install a chess engine package, for example games-board/gnuchess"
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/games-board/gnome-mahjongg/Manifest b/games-board/gnome-mahjongg/Manifest
index 6fa97c5e574c..ecd13b33f08d 100644
--- a/games-board/gnome-mahjongg/Manifest
+++ b/games-board/gnome-mahjongg/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-mahjongg-3.40.0.tar.xz 3156788 BLAKE2B 3a8dd05001d75a7fa7663556dcad135b89786333c4c89ee131e7d63dafaee2a738f0c573199a69e6bc015036270a94c8be6cd6d48630faddba297710f48931d0 SHA512 9102d48d7a1cd2808a4de86cb3cb73c30bbe769bdc58f2a69914700218972a8c96cf18b5165cc20eb9a33866a70c5b2daee43cbecf758526d89a0b8720ef5c9a
 DIST gnome-mahjongg-3.40.1.tar.xz 3200016 BLAKE2B bae6e0aa496918aa47c1f89626a01bdbc24405b4435cd66ec6374f26e2a96da3d397605a5535e80a76e13beb0ada612d80882f65594090aca8dd56cee3b1b4cc SHA512 051439dccc5723a07e57bdba80cc0a3893b1b515c0bdda0289eeb9851ecbed4440042d452f5d057a90a53c71be0b810ad932b7c62e549c2bc5e24ba6c174abc1
+DIST gnome-mahjongg-47.0.tar.xz 2384408 BLAKE2B 0f3960488526a6d288421fe22201acec3df5a605ffb0b9b972a02a49d917207ccb20c9b0942c4f54a9831de4b61c874497f9261e1f0dd9abf74e256fcdbc40ff SHA512 b80d496be4dedec32afd66ede02849ab12c9d9dcf98b5062736539fd54c149665520e73b53346209eb3fe65d09a1fa4df7e11af7654bc51cc3792d308c99d8ea
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.40.0.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.40.0.ebuild
deleted file mode 100644
index c8a8d04a8532..000000000000
--- a/games-board/gnome-mahjongg/gnome-mahjongg-3.40.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Disassemble a pile of tiles by removing matching pairs"
-HOMEPAGE="https://wiki.gnome.org/Apps/Mahjongg"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	>=gui-libs/gtk-4.5.0:4
-	gui-libs/libadwaita:1
-	>=gnome-base/librsvg-2.46.0:2
-"
-DEPEND="${RDEPEND}
-	gnome-base/librsvg:2[vala]
-"
-BDEPEND="
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-47.0.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-47.0.ebuild
new file mode 100644
index 000000000000..b301a07b5aa2
--- /dev/null
+++ b/games-board/gnome-mahjongg/gnome-mahjongg-47.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 gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Disassemble a pile of tiles by removing matching pairs"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-mahjongg"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	>=gui-libs/gtk-4.14.0:4
+	>=gui-libs/libadwaita-1.5.0:1
+	>=gnome-base/librsvg-2.46.0:2
+"
+DEPEND="${RDEPEND}
+	gnome-base/librsvg:2[vala]
+"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-util/itstool
+	gui-libs/libadwaita:1[vala]
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/games-board/jja/jja-0.9.1-r2.ebuild b/games-board/jja/jja-0.9.1-r2.ebuild
index d715f6a6852b..5e3f7a7f27db 100644
--- a/games-board/jja/jja-0.9.1-r2.ebuild
+++ b/games-board/jja/jja-0.9.1-r2.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
@@ -244,7 +244,7 @@ CRATES="
 	zstd@0.13.1
 "
 
-LLVM_COMPAT=( {16..18} )
+LLVM_COMPAT=( {16..19} )
 
 inherit cargo llvm-r1
 
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 7730538a400e..99d2614d0e16 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,6 +1,7 @@
 DIST Vulkan-Headers-05fe2cc910a68c9ba5dac07db46ef78573acee72.tar.gz 2288519 BLAKE2B bd11ba3ecac3bf0f6df255a4b87556092b9630c85b97cbcc2c0901d5293882da6f996e326cce8f410f8503f9e29454f0a2994c4adceb4565490d435b307d4495 SHA512 3679a087ea024a15b2d30730834345d2af3869ae012bcc5a996eed90558516d16b762010d887b9c762b5177bfc0a21b3bd29dbc4e236e067132623482068b058
 DIST VulkanMemoryAllocator-009ecd192c1289c7529bff248a16cfe896254816.tar.gz 904841 BLAKE2B 64966d40b86197a18f86c9715acb2ea649ea6b69d3de38d9385a8130e35519036eca49b7503886123284be58d5c248dd9d7c5cb16a489c64d385439c382dcd30 SHA512 3a47a4bc81562b96f598f357b803d2219fa167e6eb87779837efa6e85fc6eaff8e1cfbdea0935117a7b3c630cc99944b94e91823eafa8a94d80b2c459f33c317
 DIST dolphin-2407.tar.gz 19773792 BLAKE2B a6de162479d45e6b1cba5444df5abdeafd92773d1e49cc837dfc6c1ab45ed11d7a3f72a582ddb56d0ecc6b550d03c1a02a9389852ba438d8a9235d5ea3285d4b SHA512 8bb8459d8b653708e34d5df184d96ba9705e8c50b00d066862d4012f78b7e71938207979b3bd900dd14c35c3b6c0258bb5c8fad9ba73267188e98d8a2edfb73f
+DIST dolphin-2412.tar.gz 19926717 BLAKE2B 89036561987283067a1f116aa38a94c92d0c8e3114d28a0545787f63b389cb204b265bdd4c2452ec02ca3fe90fccf5fc0fd55be3acb9b8bd346e3738f3f96767 SHA512 3025e24b4cdc8cf3493e23a7968064cb9090d622a3a830b0a964fc87af840227125de8c0f69243c7d3975fc5ea2dd0c485d870301c25e8fa078abe83ae88bca9
 DIST dolphin-5.0_p20220520.tar.gz 34880474 BLAKE2B 925cddfe8a5d6febced5721bea6ced7c8d2855619f74ca8940b95dc78ea523b4a1083b9ef6efe3561d833b8e9ecb742cb2adf5a1864c06b629b3ecd9e92cc871 SHA512 4993cb10061b142f6627c96493885a5f9d88857d8949c2e8e8d5df5ba6e19b4f98d199da5e641d3d61294884e1cbbe8191bc5b4445c60bf80723046b2524aad5
 DIST implot-cc5e1daa5c7f2335a9460ae79c829011dc5cef2d.tar.gz 137924 BLAKE2B c830275b05a74e8a60a7164f22c01dd9a5a35f9219736785c9cc17830dae809eb8cba65604b0388c3966d7658c9fe71cb9a8468c23d3ed17b7890581a2222cb8 SHA512 ab9935e759f38d19e6f60ed195c22018929ba46fccf783f4486346d7ffb7040b6097bc4c3d3b3577cc91f0c413684e07449a24bebf3db9c937638092c181de92
 DIST mgba-40d4c430fc36caeb7ea32fd39624947ed487d2f2.tar.gz 12921593 BLAKE2B 8c5cf7b9b53f897f6248ad6bc51efafaa8a9d5df137d42d30f4b042b6d1527049644595938626c8cae1385d329bc45bf42db8dcc4424b963a3899e0df53246eb SHA512 26d7b60cbc7415652bb9ca2a42ccd532856867db57bf6dd91d8204551970109b6b9f4a96c42d643ea96b9d071d6aec924d3c1bb79c251c95183b7fb8536456c9
diff --git a/games-emulation/dolphin/dolphin-2407-r1.ebuild b/games-emulation/dolphin/dolphin-2407-r1.ebuild
new file mode 100644
index 000000000000..175fc3b388ce
--- /dev/null
+++ b/games-emulation/dolphin/dolphin-2407-r1.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 )
+LLVM_OPTIONAL=1
+
+inherit cmake llvm-r1 pax-utils xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
+	EGIT_SUBMODULES=(
+		Externals/mGBA/mgba
+		Externals/implot/implot
+		Externals/tinygltf/tinygltf
+		Externals/Vulkan-Headers
+		Externals/VulkanMemoryAllocator
+		Externals/zlib-ng/zlib-ng
+		Externals/minizip-ng/minizip-ng
+	)
+else
+	MGBA_COMMIT=8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51
+	IMPLOT_COMMIT=cc5e1daa5c7f2335a9460ae79c829011dc5cef2d
+	TINYGLTF_COMMIT=c5641f2c22d117da7971504591a8f6a41ece488b
+	VULKAN_HEADERS_COMMIT=05fe2cc910a68c9ba5dac07db46ef78573acee72
+	VULKANMEMORYALLOCATOR_COMMIT=009ecd192c1289c7529bff248a16cfe896254816
+	ZLIB_NG_COMMIT=ce01b1e41da298334f8214389cc9369540a7560f
+	MINIZIP_NG_COMMIT=3eed562ef0ea3516db30d1c8ecb0e1b486d8cb70
+	SRC_URI="
+		https://github.com/dolphin-emu/dolphin/archive/${PV}.tar.gz
+			-> ${P}.tar.gz
+		https://github.com/epezent/implot/archive/${IMPLOT_COMMIT}.tar.gz
+			-> implot-${IMPLOT_COMMIT}.tar.gz
+		https://github.com/syoyo/tinygltf/archive/${TINYGLTF_COMMIT}.tar.gz
+			-> tinygltf-${TINYGLTF_COMMIT}.tar.gz
+		https://github.com/KhronosGroup/Vulkan-Headers/archive/${VULKAN_HEADERS_COMMIT}.tar.gz
+			-> Vulkan-Headers-${VULKAN_HEADERS_COMMIT}.tar.gz
+		https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/archive/${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz
+			-> VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz
+		https://github.com/zlib-ng/zlib-ng/archive/${ZLIB_NG_COMMIT}.tar.gz
+			-> zlib-ng-${ZLIB_NG_COMMIT}.tar.gz
+		https://github.com/zlib-ng/minizip-ng/archive/${MINIZIP_NG_COMMIT}.tar.gz
+			-> minizip-ng-${MINIZIP_NG_COMMIT}.tar.gz
+		mgba? (
+			https://github.com/mgba-emu/mgba/archive/${MGBA_COMMIT}.tar.gz
+				-> mgba-${MGBA_COMMIT}.tar.gz
+		)
+	"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+DESCRIPTION="Gamecube and Wii game emulator"
+HOMEPAGE="https://dolphin-emu.org/"
+
+LICENSE="GPL-2+ BSD BSD-2 LGPL-2.1+ MIT ZLIB"
+SLOT="0"
+IUSE="
+	alsa bluetooth discord-presence doc egl +evdev ffmpeg +gui llvm log mgba
+	profile pulseaudio sdl systemd telemetry test upnp vulkan
+"
+REQUIRED_USE="
+	mgba? ( gui )
+	llvm? ( ${LLVM_REQUIRED_USE} )
+"
+RESTRICT="!test? ( test )"
+
+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-11.1:=
+	>=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_gen_dep 'llvm-core/llvm:${LLVM_SLOT}=') )
+	profile? ( dev-util/oprofile )
+	pulseaudio? ( media-libs/libpulse )
+	sdl? ( media-libs/libsdl2 )
+	systemd? ( sys-apps/systemd:0= )
+	upnp? ( net-libs/miniupnpc:= )
+"
+DEPEND="
+	${RDEPEND}
+	egl? ( media-libs/libglvnd )
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# vulkan-loader required for vulkan backend which can be selected
+# at runtime.
+RDEPEND+="
+	vulkan? ( media-libs/vulkan-loader )
+"
+
+# [directory]=license
+declare -A KEEP_BUNDLED=(
+	# please keep this list in CMakeLists.txt order
+
+	# TODO: use system libraries
+	[zlib-ng]=ZLIB
+	[minizip-ng]=ZLIB
+
+	[Bochs_disasm]=LGPL-2.1+
+	[cpp-optparse]=MIT
+	[imgui]=MIT
+	[implot]=MIT
+	[glslang]=BSD
+
+	[tinygltf]=MIT
+
+	[FreeSurround]=GPL-2+
+	[soundtouch]=LGPL-2.1+
+
+	# FIXME: discord-rpc not packaged
+	[discord-rpc]=MIT
+
+	[mGBA]=MPL-2.0
+
+	[picojson]=BSD-2
+	[expr]=MIT
+	[rangeset]=ZLIB
+	[FatFs]=FatFs
+	[Vulkan-Headers]="|| ( Apache-2.0 MIT )"
+	[VulkanMemoryAllocator]=MIT
+)
+
+PATCHES=(
+	"${FILESDIR}"/dolphin-2407-libfmt-11-fix.patch
+	"${FILESDIR}"/dolphin-2407-minizip.patch
+	"${FILESDIR}"/dolphin-2407-fix-llvm-build.patch
+)
+
+add_bundled_licenses() {
+	for license in ${KEEP_BUNDLED[@]}; do
+		LICENSE+=" ${license}"
+	done
+}
+add_bundled_licenses
+
+pkg_setup() {
+	use llvm && llvm-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != *9999 ]]; then
+		mv -T "${WORKDIR}/implot-${IMPLOT_COMMIT}" Externals/implot/implot || die
+		mv -T "${WORKDIR}/tinygltf-${TINYGLTF_COMMIT}" Externals/tinygltf/tinygltf || die
+		mv -T "${WORKDIR}/Vulkan-Headers-${VULKAN_HEADERS_COMMIT}" Externals/Vulkan-Headers || die
+		mv -T "${WORKDIR}/VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}" Externals/VulkanMemoryAllocator || die
+		mv -T "${WORKDIR}/zlib-ng-${ZLIB_NG_COMMIT}" Externals/zlib-ng/zlib-ng || die
+		mv -T "${WORKDIR}/minizip-ng-${MINIZIP_NG_COMMIT}" Externals/minizip-ng/minizip-ng || die
+		if use mgba; then
+			mv -T "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die
+		fi
+	fi
+
+	cmake_src_prepare
+
+	local s remove=()
+	for s in Externals/*; do
+		[[ -f ${s} ]] && continue
+		if ! has "${s#Externals/}" "${!KEEP_BUNDLED[@]}"; then
+			remove+=( "${s}" )
+		fi
+	done
+
+	einfo "removing sources: ${remove[*]}"
+	rm -r "${remove[@]}" || die
+
+	# About 50% compile-time speedup
+	if ! use vulkan; then
+		sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die
+	fi
+
+	# Remove dirty suffix: needed for netplay
+	sed -i -e 's/--dirty/&=""/' CMake/ScmRevGen.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDSPTOOL=ON
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_ANALYTICS=$(usex telemetry)
+		-DENABLE_AUTOUPDATE=OFF
+		-DENABLE_BLUEZ=$(usex bluetooth)
+		-DENABLE_CLI_TOOL=ON
+		-DENABLE_EGL=$(usex egl)
+		-DENABLE_EVDEV=$(usex evdev)
+		-DENABLE_LLVM=$(usex llvm)
+		-DENABLE_LTO=OFF # just adds -flto, user can do that via flags
+		-DENABLE_NOGUI=$(usex !gui)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_QT=$(usex gui)
+		-DENABLE_SDL=$(usex sdl)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_VULKAN=$(usex vulkan)
+		-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
+		-DFASTLOG=$(usex log)
+		-DOPROFILING=$(usex profile)
+		-DSTEAM=OFF
+		-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
+		-DUSE_MGBA=$(usex mgba)
+		-DUSE_RETRO_ACHIEVEMENTS=OFF
+		-DUSE_UPNP=$(usex upnp)
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_SYSTEMD=$(usex !systemd)
+
+		# Use system libraries
+		-DUSE_SYSTEM_FMT=ON
+		-DUSE_SYSTEM_PUGIXML=ON
+		-DUSE_SYSTEM_ENET=ON
+		-DUSE_SYSTEM_XXHASH=ON
+		-DUSE_SYSTEM_BZIP2=ON
+		-DUSE_SYSTEM_LIBLZMA=ON
+		-DUSE_SYSTEM_ZSTD=ON
+		-DUSE_SYSTEM_ZLIB=OFF
+		-DUSE_SYSTEM_MINIZIP=OFF
+		-DUSE_SYSTEM_LZO=ON
+		-DUSE_SYSTEM_LZ4=ON
+		-DUSE_SYSTEM_SPNG=ON
+		-DUSE_SYSTEM_CUBEB=ON
+		-DUSE_SYSTEM_LIBUSB=ON
+		-DUSE_SYSTEM_SFML=ON
+		-DUSE_SYSTEM_MBEDTLS=ON
+		-DUSE_SYSTEM_CURL=ON
+		-DUSE_SYSTEM_ICONV=ON
+		-DUSE_SYSTEM_HIDAPI=ON
+
+		# Use ccache only when user did set FEATURES=ccache (or similar)
+		# not when ccache binary is present in system (automagic).
+		-DCCACHE_BIN=CCACHE_BIN-NOTFOUND
+
+		# Undo cmake.eclass's defaults.
+		# All dolphin's libraries are private
+		# and rely on circular dependency resolution.
+		-DBUILD_SHARED_LIBS=OFF
+
+		# Avoid warning spam around unset variables.
+		-Wno-dev
+	)
+
+	# System installed git shouldnt affect non live builds
+	[[ ${PV} != *9999 ]] && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON )
+
+	use test && mycmakeargs+=( -DUSE_SYSTEM_GTEST=ON )
+	use mgba && mycmakeargs+=( -DUSE_SYSTEM_LIBMGBA=OFF )
+	use sdl && mycmakeargs+=( -DUSE_SYSTEM_SDL2=ON )
+	use upnp && mycmakeargs+=( -DUSE_SYSTEM_MINIUPNPC=ON )
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build unittests
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc Readme.md
+	if use doc; then
+		dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
+	fi
+
+	# Add pax markings for hardened systems
+	pax-mark -m "${ED}"/usr/bin/"${PN}"{-emu{,-nogui},-tool}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/games-emulation/dolphin/dolphin-2407.ebuild b/games-emulation/dolphin/dolphin-2407.ebuild
deleted file mode 100644
index acaf54505d6e..000000000000
--- a/games-emulation/dolphin/dolphin-2407.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 18 )
-LLVM_OPTIONAL=1
-
-inherit cmake llvm-r1 pax-utils xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
-	EGIT_SUBMODULES=(
-		Externals/mGBA/mgba
-		Externals/implot/implot
-		Externals/tinygltf/tinygltf
-		Externals/Vulkan-Headers
-		Externals/VulkanMemoryAllocator
-		Externals/zlib-ng/zlib-ng
-		Externals/minizip-ng/minizip-ng
-	)
-else
-	MGBA_COMMIT=8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51
-	IMPLOT_COMMIT=cc5e1daa5c7f2335a9460ae79c829011dc5cef2d
-	TINYGLTF_COMMIT=c5641f2c22d117da7971504591a8f6a41ece488b
-	VULKAN_HEADERS_COMMIT=05fe2cc910a68c9ba5dac07db46ef78573acee72
-	VULKANMEMORYALLOCATOR_COMMIT=009ecd192c1289c7529bff248a16cfe896254816
-	ZLIB_NG_COMMIT=ce01b1e41da298334f8214389cc9369540a7560f
-	MINIZIP_NG_COMMIT=3eed562ef0ea3516db30d1c8ecb0e1b486d8cb70
-	SRC_URI="
-		https://github.com/dolphin-emu/dolphin/archive/${PV}.tar.gz
-			-> ${P}.tar.gz
-		https://github.com/epezent/implot/archive/${IMPLOT_COMMIT}.tar.gz
-			-> implot-${IMPLOT_COMMIT}.tar.gz
-		https://github.com/syoyo/tinygltf/archive/${TINYGLTF_COMMIT}.tar.gz
-			-> tinygltf-${TINYGLTF_COMMIT}.tar.gz
-		https://github.com/KhronosGroup/Vulkan-Headers/archive/${VULKAN_HEADERS_COMMIT}.tar.gz
-			-> Vulkan-Headers-${VULKAN_HEADERS_COMMIT}.tar.gz
-		https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/archive/${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz
-			-> VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz
-		https://github.com/zlib-ng/zlib-ng/archive/${ZLIB_NG_COMMIT}.tar.gz
-			-> zlib-ng-${ZLIB_NG_COMMIT}.tar.gz
-		https://github.com/zlib-ng/minizip-ng/archive/${MINIZIP_NG_COMMIT}.tar.gz
-			-> minizip-ng-${MINIZIP_NG_COMMIT}.tar.gz
-		mgba? (
-			https://github.com/mgba-emu/mgba/archive/${MGBA_COMMIT}.tar.gz
-				-> mgba-${MGBA_COMMIT}.tar.gz
-		)
-	"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-DESCRIPTION="Gamecube and Wii game emulator"
-HOMEPAGE="https://dolphin-emu.org/"
-
-LICENSE="GPL-2+ BSD BSD-2 LGPL-2.1+ MIT ZLIB"
-SLOT="0"
-IUSE="
-	alsa bluetooth discord-presence doc egl +evdev ffmpeg +gui llvm log mgba
-	profile pulseaudio sdl systemd telemetry test upnp vulkan
-"
-REQUIRED_USE="
-	mgba? ( gui )
-	llvm? ( ${LLVM_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-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-11.1:=
-	>=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:=
-	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_gen_dep 'llvm-core/llvm:${LLVM_SLOT}=') )
-	profile? ( dev-util/oprofile )
-	pulseaudio? ( media-libs/libpulse )
-	sdl? ( media-libs/libsdl2 )
-	systemd? ( sys-apps/systemd:0= )
-	upnp? ( net-libs/miniupnpc:= )
-"
-DEPEND="
-	${RDEPEND}
-	egl? ( media-libs/libglvnd )
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# vulkan-loader required for vulkan backend which can be selected
-# at runtime.
-RDEPEND+="
-	vulkan? ( media-libs/vulkan-loader )
-"
-
-# [directory]=license
-declare -A KEEP_BUNDLED=(
-	# please keep this list in CMakeLists.txt order
-
-	# TODO: use system libraries
-	[zlib-ng]=ZLIB
-	[minizip-ng]=ZLIB
-
-	[Bochs_disasm]=LGPL-2.1+
-	[cpp-optparse]=MIT
-	[imgui]=MIT
-	[implot]=MIT
-	[glslang]=BSD
-
-	[tinygltf]=MIT
-
-	[FreeSurround]=GPL-2+
-	[soundtouch]=LGPL-2.1+
-
-	# FIXME: discord-rpc not packaged
-	[discord-rpc]=MIT
-
-	[mGBA]=MPL-2.0
-
-	[picojson]=BSD-2
-	[expr]=MIT
-	[rangeset]=ZLIB
-	[FatFs]=FatFs
-	[Vulkan-Headers]="|| ( Apache-2.0 MIT )"
-	[VulkanMemoryAllocator]=MIT
-)
-
-PATCHES=(
-	"${FILESDIR}"/dolphin-2407-libfmt-11-fix.patch
-	"${FILESDIR}"/dolphin-2407-minizip.patch
-	"${FILESDIR}"/dolphin-2407-fix-llvm-build.patch
-)
-
-add_bundled_licenses() {
-	for license in ${KEEP_BUNDLED[@]}; do
-		LICENSE+=" ${license}"
-	done
-}
-add_bundled_licenses
-
-pkg_setup() {
-	use llvm && llvm-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != *9999 ]]; then
-		mv -T "${WORKDIR}/implot-${IMPLOT_COMMIT}" Externals/implot/implot || die
-		mv -T "${WORKDIR}/tinygltf-${TINYGLTF_COMMIT}" Externals/tinygltf/tinygltf || die
-		mv -T "${WORKDIR}/Vulkan-Headers-${VULKAN_HEADERS_COMMIT}" Externals/Vulkan-Headers || die
-		mv -T "${WORKDIR}/VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}" Externals/VulkanMemoryAllocator || die
-		mv -T "${WORKDIR}/zlib-ng-${ZLIB_NG_COMMIT}" Externals/zlib-ng/zlib-ng || die
-		mv -T "${WORKDIR}/minizip-ng-${MINIZIP_NG_COMMIT}" Externals/minizip-ng/minizip-ng || die
-		if use mgba; then
-			mv -T "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die
-		fi
-	fi
-
-	cmake_src_prepare
-
-	local s remove=()
-	for s in Externals/*; do
-		[[ -f ${s} ]] && continue
-		if ! has "${s#Externals/}" "${!KEEP_BUNDLED[@]}"; then
-			remove+=( "${s}" )
-		fi
-	done
-
-	einfo "removing sources: ${remove[*]}"
-	rm -r "${remove[@]}" || die
-
-	# About 50% compile-time speedup
-	if ! use vulkan; then
-		sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die
-	fi
-
-	# Remove dirty suffix: needed for netplay
-	sed -i -e 's/--dirty/&=""/' CMake/ScmRevGen.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDSPTOOL=ON
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_ANALYTICS=$(usex telemetry)
-		-DENABLE_AUTOUPDATE=OFF
-		-DENABLE_BLUEZ=$(usex bluetooth)
-		-DENABLE_CLI_TOOL=ON
-		-DENABLE_EGL=$(usex egl)
-		-DENABLE_EVDEV=$(usex evdev)
-		-DENABLE_LLVM=$(usex llvm)
-		-DENABLE_LTO=OFF # just adds -flto, user can do that via flags
-		-DENABLE_NOGUI=$(usex !gui)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_QT=$(usex gui)
-		-DENABLE_SDL=$(usex sdl)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_VULKAN=$(usex vulkan)
-		-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
-		-DFASTLOG=$(usex log)
-		-DOPROFILING=$(usex profile)
-		-DSTEAM=OFF
-		-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
-		-DUSE_MGBA=$(usex mgba)
-		-DUSE_RETRO_ACHIEVEMENTS=OFF
-		-DUSE_UPNP=$(usex upnp)
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_SYSTEMD=$(usex !systemd)
-
-		# Use system libraries
-		-DUSE_SYSTEM_FMT=ON
-		-DUSE_SYSTEM_PUGIXML=ON
-		-DUSE_SYSTEM_ENET=ON
-		-DUSE_SYSTEM_XXHASH=ON
-		-DUSE_SYSTEM_BZIP2=ON
-		-DUSE_SYSTEM_LIBLZMA=ON
-		-DUSE_SYSTEM_ZSTD=ON
-		-DUSE_SYSTEM_ZLIB=OFF
-		-DUSE_SYSTEM_MINIZIP=OFF
-		-DUSE_SYSTEM_LZO=ON
-		-DUSE_SYSTEM_LZ4=ON
-		-DUSE_SYSTEM_SPNG=ON
-		-DUSE_SYSTEM_CUBEB=ON
-		-DUSE_SYSTEM_LIBUSB=ON
-		-DUSE_SYSTEM_SFML=ON
-		-DUSE_SYSTEM_MBEDTLS=ON
-		-DUSE_SYSTEM_CURL=ON
-		-DUSE_SYSTEM_ICONV=ON
-		-DUSE_SYSTEM_HIDAPI=ON
-
-		# Use ccache only when user did set FEATURES=ccache (or similar)
-		# not when ccache binary is present in system (automagic).
-		-DCCACHE_BIN=CCACHE_BIN-NOTFOUND
-
-		# Undo cmake.eclass's defaults.
-		# All dolphin's libraries are private
-		# and rely on circular dependency resolution.
-		-DBUILD_SHARED_LIBS=OFF
-
-		# Avoid warning spam around unset variables.
-		-Wno-dev
-	)
-
-	# System installed git shouldnt affect non live builds
-	[[ ${PV} != *9999 ]] && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON )
-
-	use test && mycmakeargs+=( -DUSE_SYSTEM_GTEST=ON )
-	use mgba && mycmakeargs+=( -DUSE_SYSTEM_LIBMGBA=OFF )
-	use sdl && mycmakeargs+=( -DUSE_SYSTEM_SDL2=ON )
-	use upnp && mycmakeargs+=( -DUSE_SYSTEM_MINIUPNPC=ON )
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build unittests
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc Readme.md
-	if use doc; then
-		dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
-	fi
-
-	# Add pax markings for hardened systems
-	pax-mark -m "${ED}"/usr/bin/"${PN}"{-emu{,-nogui},-tool}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/games-emulation/dolphin/dolphin-2412-r1.ebuild b/games-emulation/dolphin/dolphin-2412-r1.ebuild
new file mode 100644
index 000000000000..c93526544485
--- /dev/null
+++ b/games-emulation/dolphin/dolphin-2412-r1.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 )
+LLVM_OPTIONAL=1
+
+inherit cmake llvm-r1 pax-utils xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
+	EGIT_SUBMODULES=(
+		Externals/mGBA/mgba
+		Externals/implot/implot
+		Externals/tinygltf/tinygltf
+		Externals/Vulkan-Headers
+		Externals/VulkanMemoryAllocator
+		Externals/zlib-ng/zlib-ng
+		Externals/minizip-ng/minizip-ng
+	)
+else
+	MGBA_COMMIT=8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51
+	IMPLOT_COMMIT=cc5e1daa5c7f2335a9460ae79c829011dc5cef2d
+	TINYGLTF_COMMIT=c5641f2c22d117da7971504591a8f6a41ece488b
+	VULKAN_HEADERS_COMMIT=05fe2cc910a68c9ba5dac07db46ef78573acee72
+	VULKANMEMORYALLOCATOR_COMMIT=009ecd192c1289c7529bff248a16cfe896254816
+	ZLIB_NG_COMMIT=ce01b1e41da298334f8214389cc9369540a7560f
+	MINIZIP_NG_COMMIT=3eed562ef0ea3516db30d1c8ecb0e1b486d8cb70
+	SRC_URI="
+		https://github.com/dolphin-emu/dolphin/archive/${PV}.tar.gz
+			-> ${P}.tar.gz
+		https://github.com/epezent/implot/archive/${IMPLOT_COMMIT}.tar.gz
+			-> implot-${IMPLOT_COMMIT}.tar.gz
+		https://github.com/syoyo/tinygltf/archive/${TINYGLTF_COMMIT}.tar.gz
+			-> tinygltf-${TINYGLTF_COMMIT}.tar.gz
+		https://github.com/KhronosGroup/Vulkan-Headers/archive/${VULKAN_HEADERS_COMMIT}.tar.gz
+			-> Vulkan-Headers-${VULKAN_HEADERS_COMMIT}.tar.gz
+		https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/archive/${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz
+			-> VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz
+		https://github.com/zlib-ng/zlib-ng/archive/${ZLIB_NG_COMMIT}.tar.gz
+			-> zlib-ng-${ZLIB_NG_COMMIT}.tar.gz
+		https://github.com/zlib-ng/minizip-ng/archive/${MINIZIP_NG_COMMIT}.tar.gz
+			-> minizip-ng-${MINIZIP_NG_COMMIT}.tar.gz
+		mgba? (
+			https://github.com/mgba-emu/mgba/archive/${MGBA_COMMIT}.tar.gz
+				-> mgba-${MGBA_COMMIT}.tar.gz
+		)
+	"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+DESCRIPTION="Gamecube and Wii game emulator"
+HOMEPAGE="https://dolphin-emu.org/"
+
+LICENSE="GPL-2+ BSD BSD-2 LGPL-2.1+ MIT ZLIB"
+SLOT="0"
+IUSE="
+	alsa bluetooth discord-presence doc egl +evdev ffmpeg +gui llvm log mgba
+	profile pulseaudio sdl systemd telemetry test upnp vulkan
+"
+REQUIRED_USE="
+	mgba? ( gui )
+	llvm? ( ${LLVM_REQUIRED_USE} )
+"
+RESTRICT="!test? ( test )"
+
+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_gen_dep 'llvm-core/llvm:${LLVM_SLOT}=') )
+	profile? ( dev-util/oprofile )
+	pulseaudio? ( media-libs/libpulse )
+	sdl? ( >=media-libs/libsdl2-2.30.9 )
+	systemd? ( sys-apps/systemd:0= )
+	upnp? ( net-libs/miniupnpc:= )
+"
+DEPEND="
+	${RDEPEND}
+	egl? ( media-libs/libglvnd )
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# vulkan-loader required for vulkan backend which can be selected
+# at runtime.
+RDEPEND+="
+	vulkan? ( media-libs/vulkan-loader )
+"
+
+# [directory]=license
+declare -A KEEP_BUNDLED=(
+	# please keep this list in CMakeLists.txt order
+
+	# TODO: use system libraries
+	# bug #873952
+	# https://github.com/dolphin-emu/dolphin/pull/13089
+	[zlib-ng]=ZLIB
+	[minizip-ng]=ZLIB
+
+	[Bochs_disasm]=LGPL-2.1+
+	[cpp-optparse]=MIT
+	[imgui]=MIT
+	[implot]=MIT
+	[glslang]=BSD
+
+	[tinygltf]=MIT
+
+	[FreeSurround]=GPL-2+
+	[soundtouch]=LGPL-2.1+
+
+	# FIXME: discord-rpc not packaged
+	[discord-rpc]=MIT
+
+	[mGBA]=MPL-2.0
+
+	[picojson]=BSD-2
+	[expr]=MIT
+	[rangeset]=ZLIB
+	[FatFs]=FatFs
+	[Vulkan-Headers]="|| ( Apache-2.0 MIT )"
+	[VulkanMemoryAllocator]=MIT
+)
+
+PATCHES=(
+	"${FILESDIR}"/dolphin-2407-minizip.patch
+	"${FILESDIR}"/dolphin-2412-fix-libfmt-11.1.patch
+	"${FILESDIR}"/dolphin-2412-fix-build-without-retro-achievements.patch
+)
+
+add_bundled_licenses() {
+	for license in ${KEEP_BUNDLED[@]}; do
+		LICENSE+=" ${license}"
+	done
+}
+add_bundled_licenses
+
+pkg_setup() {
+	use llvm && llvm-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != *9999 ]]; then
+		mv -T "${WORKDIR}/implot-${IMPLOT_COMMIT}" Externals/implot/implot || die
+		mv -T "${WORKDIR}/tinygltf-${TINYGLTF_COMMIT}" Externals/tinygltf/tinygltf || die
+		mv -T "${WORKDIR}/Vulkan-Headers-${VULKAN_HEADERS_COMMIT}" Externals/Vulkan-Headers || die
+		mv -T "${WORKDIR}/VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}" Externals/VulkanMemoryAllocator || die
+		mv -T "${WORKDIR}/zlib-ng-${ZLIB_NG_COMMIT}" Externals/zlib-ng/zlib-ng || die
+		mv -T "${WORKDIR}/minizip-ng-${MINIZIP_NG_COMMIT}" Externals/minizip-ng/minizip-ng || die
+		if use mgba; then
+			mv -T "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die
+		fi
+	fi
+
+	cmake_src_prepare
+
+	local s remove=()
+	for s in Externals/*; do
+		[[ -f ${s} ]] && continue
+		if ! has "${s#Externals/}" "${!KEEP_BUNDLED[@]}"; then
+			remove+=( "${s}" )
+		fi
+	done
+
+	einfo "removing sources: ${remove[*]}"
+	rm -r "${remove[@]}" || die
+
+	# Remove dirty suffix: needed for netplay
+	sed -i -e 's/--dirty/&=""/' CMake/ScmRevGen.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDSPTOOL=ON
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_ANALYTICS=$(usex telemetry)
+		-DENABLE_AUTOUPDATE=OFF
+		-DENABLE_BLUEZ=$(usex bluetooth)
+		-DENABLE_CLI_TOOL=ON
+		-DENABLE_EGL=$(usex egl)
+		-DENABLE_EVDEV=$(usex evdev)
+		-DENABLE_LLVM=$(usex llvm)
+		-DENABLE_LTO=OFF # just adds -flto, user can do that via flags
+		-DENABLE_NOGUI=$(usex !gui)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_QT=$(usex gui)
+		-DENABLE_SDL=$(usex sdl)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_VULKAN=$(usex vulkan)
+		-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
+		-DFASTLOG=$(usex log)
+		-DOPROFILING=$(usex profile)
+		-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
+		-DUSE_MGBA=$(usex mgba)
+		-DUSE_RETRO_ACHIEVEMENTS=OFF
+		-DUSE_UPNP=$(usex upnp)
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_SYSTEMD=$(usex !systemd)
+
+		# Use system libraries
+		-DUSE_SYSTEM_FMT=ON
+		-DUSE_SYSTEM_PUGIXML=ON
+		-DUSE_SYSTEM_ENET=ON
+		-DUSE_SYSTEM_XXHASH=ON
+		-DUSE_SYSTEM_BZIP2=ON
+		-DUSE_SYSTEM_LIBLZMA=ON
+		-DUSE_SYSTEM_ZSTD=ON
+		-DUSE_SYSTEM_MINIZIP=OFF
+		-DUSE_SYSTEM_LZO=ON
+		-DUSE_SYSTEM_LZ4=ON
+		-DUSE_SYSTEM_SPNG=ON
+		-DUSE_SYSTEM_CUBEB=ON
+		-DUSE_SYSTEM_LIBUSB=ON
+		-DUSE_SYSTEM_SFML=ON
+		-DUSE_SYSTEM_MBEDTLS=ON
+		-DUSE_SYSTEM_CURL=ON
+		-DUSE_SYSTEM_ICONV=ON
+		-DUSE_SYSTEM_HIDAPI=ON
+
+		# Use ccache only when user did set FEATURES=ccache (or similar)
+		# not when ccache binary is present in system (automagic).
+		-DCCACHE_BIN=CCACHE_BIN-NOTFOUND
+
+		# Undo cmake.eclass's defaults.
+		# All dolphin's libraries are private
+		# and rely on circular dependency resolution.
+		-DBUILD_SHARED_LIBS=OFF
+
+		# Avoid warning spam around unset variables.
+		-Wno-dev
+	)
+
+	# System installed git shouldnt affect non live builds
+	[[ ${PV} != *9999 ]] && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON )
+
+	use test && mycmakeargs+=( -DUSE_SYSTEM_GTEST=ON )
+	use mgba && mycmakeargs+=( -DUSE_SYSTEM_LIBMGBA=OFF )
+	use sdl && mycmakeargs+=( -DUSE_SYSTEM_SDL2=ON )
+	use upnp && mycmakeargs+=( -DUSE_SYSTEM_MINIUPNPC=ON )
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build unittests
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc Readme.md
+	if use doc; then
+		dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
+	fi
+
+	# Add pax markings for hardened systems
+	pax-mark -m "${ED}"/usr/bin/"${PN}"{-emu{,-nogui},-tool}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520-r3.ebuild b/games-emulation/dolphin/dolphin-5.0_p20220520-r3.ebuild
deleted file mode 100644
index 37564db0dd8f..000000000000
--- a/games-emulation/dolphin/dolphin-5.0_p20220520-r3.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop flag-o-matic xdg-utils pax-utils
-
-if [[ ${PV} == *9999 ]]
-then
-	EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
-	EGIT_SUBMODULES=( Externals/mGBA/mgba )
-	inherit git-r3
-else
-	EGIT_COMMIT=0f2540a0d1133950467845f20b1e003181147781
-	MGBA_COMMIT=40d4c430fc36caeb7ea32fd39624947ed487d2f2
-	SRC_URI="
-		https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz
-			-> ${P}.tar.gz
-		mgba? (
-			https://github.com/mgba-emu/mgba/archive/${MGBA_COMMIT}.tar.gz
-				-> mgba-${MGBA_COMMIT}.tar.gz
-		)
-	"
-	S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-	KEYWORDS="amd64 ~arm64"
-fi
-
-DESCRIPTION="Gamecube and Wii game emulator"
-HOMEPAGE="https://dolphin-emu.org/"
-
-LICENSE="GPL-2+ BSD BSD-2 LGPL-2.1+ MIT ZLIB"
-SLOT="0"
-IUSE="
-	alsa bluetooth discord-presence doc +evdev ffmpeg +gui log mgba
-	profile pulseaudio systemd upnp vulkan
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-libfmt-9.0.0-fix-build.patch"
-	# https://github.com/dolphin-emu/dolphin/pull/12575
-	"${FILESDIR}/${P}-gcc-14.patch"
-)
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-arch/zstd:=
-	dev-libs/hidapi:=
-	<dev-libs/libfmt-10:=
-	dev-libs/lzo:=
-	dev-libs/pugixml:=
-	media-libs/cubeb:=
-	media-libs/libpng:=
-	media-libs/libsfml:=
-	media-libs/mesa[egl(+)]
-	net-libs/enet:1.3
-	net-libs/mbedtls:=
-	net-misc/curl:=
-	sys-libs/readline:=
-	sys-libs/zlib:=[minizip]
-	x11-libs/libXext
-	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/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	profile? ( dev-util/oprofile )
-	pulseaudio? ( media-sound/pulseaudio )
-	systemd? ( sys-apps/systemd:0= )
-	upnp? ( net-libs/miniupnpc )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# vulkan-loader required for vulkan backend which can be selected
-# at runtime.
-RDEPEND+="
-	vulkan? ( media-libs/vulkan-loader )
-"
-
-# [directory]=license
-declare -A KEEP_BUNDLED=(
-	# please keep this list in CMakeLists.txt order
-
-	[Bochs_disasm]=LGPL-2.1+
-	[cpp-optparse]=MIT
-	[imgui]=MIT
-	[glslang]=BSD
-
-	# FIXME: xxhash can't be found by cmake
-	[xxhash]=BSD-2
-
-	# FIXME: requires minizip-ng
-	#[minizip]=ZLIB
-
-	[FreeSurround]=GPL-2+
-	[soundtouch]=LGPL-2.1+
-
-	# FIXME: discord-rpc not packaged
-	[discord-rpc]=MIT
-
-	[mGBA]=MPL-2.0
-
-	[picojson]=BSD-2
-	[rangeset]=ZLIB
-	[gtest]= # (build-time only)
-)
-
-src_prepare() {
-	if use mgba && [[ ${PV} != *9999 ]]; then
-		rmdir Externals/mGBA/mgba || die
-		mv "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die
-	fi
-
-	cmake_src_prepare
-
-	local s remove=()
-	for s in Externals/*; do
-		[[ -f ${s} ]] && continue
-		if ! has "${s#Externals/}" "${!KEEP_BUNDLED[@]}"; then
-			remove+=( "${s}" )
-		fi
-	done
-
-	einfo "removing sources: ${remove[*]}"
-	rm -r "${remove[@]}" || die
-
-	# About 50% compile-time speedup
-	if ! use vulkan; then
-		sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die
-	fi
-
-	# Allow regular minizip.
-	sed -i -e '/minizip/s:>=2[.]0[.]0::' CMakeLists.txt || die
-
-	# Remove dirty suffix: needed for netplay
-	sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die
-
-	# Force Qt5 rather than automagic until support is properly handled here
-	sed -i -e '/NAMES Qt6 COMP/d' Source/Core/DolphinQt/CMakeLists.txt || die
-}
-
-src_configure() {
-	# bug #891225 (https://bugs.dolphin-emu.org/issues/11481, QTBUG-61710)
-	use gui && filter-lto
-
-	local mycmakeargs=(
-		# Use ccache only when user did set FEATURES=ccache (or similar)
-		# not when ccache binary is present in system (automagic).
-		-DCCACHE_BIN=CCACHE_BIN-NOTFOUND
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AUTOUPDATE=OFF
-		-DENABLE_BLUEZ=$(usex bluetooth)
-		-DENABLE_EVDEV=$(usex evdev)
-		-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
-		-DENABLE_LLVM=OFF
-		# just adds -flto, user can do that via flags
-		-DENABLE_LTO=OFF
-		-DUSE_MGBA=$(usex mgba)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_QT=$(usex gui)
-		-DENABLE_SDL=OFF # not supported: #666558
-		-DENABLE_VULKAN=$(usex vulkan)
-		-DFASTLOG=$(usex log)
-		-DOPROFILING=$(usex profile)
-		-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
-		-DUSE_SHARED_ENET=ON
-		-DUSE_UPNP=$(usex upnp)
-
-		# Undo cmake.eclass's defaults.
-		# All dolphin's libraries are private
-		# and rely on circular dependency resolution.
-		-DBUILD_SHARED_LIBS=OFF
-
-		# Avoid warning spam around unset variables.
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build unittests
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc Readme.md
-	if use doc; then
-		dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
-	fi
-
-	doicon -s 48 Data/dolphin-emu.png
-	doicon -s scalable Data/dolphin-emu.svg
-	doicon Data/dolphin-emu.svg
-}
-
-pkg_postinst() {
-	# Add pax markings for hardened systems
-	pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520-r4.ebuild b/games-emulation/dolphin/dolphin-5.0_p20220520-r4.ebuild
new file mode 100644
index 000000000000..4294f15f1643
--- /dev/null
+++ b/games-emulation/dolphin/dolphin-5.0_p20220520-r4.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop flag-o-matic xdg-utils pax-utils
+
+if [[ ${PV} == *9999 ]]
+then
+	EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
+	EGIT_SUBMODULES=( Externals/mGBA/mgba )
+	inherit git-r3
+else
+	EGIT_COMMIT=0f2540a0d1133950467845f20b1e003181147781
+	MGBA_COMMIT=40d4c430fc36caeb7ea32fd39624947ed487d2f2
+	SRC_URI="
+		https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz
+			-> ${P}.tar.gz
+		mgba? (
+			https://github.com/mgba-emu/mgba/archive/${MGBA_COMMIT}.tar.gz
+				-> mgba-${MGBA_COMMIT}.tar.gz
+		)
+	"
+	S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+	KEYWORDS="amd64 ~arm64"
+fi
+
+DESCRIPTION="Gamecube and Wii game emulator"
+HOMEPAGE="https://dolphin-emu.org/"
+
+LICENSE="GPL-2+ BSD BSD-2 LGPL-2.1+ MIT ZLIB"
+SLOT="0"
+IUSE="
+	alsa bluetooth discord-presence doc +evdev ffmpeg +gui log mgba
+	profile pulseaudio systemd upnp vulkan
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-libfmt-9.0.0-fix-build.patch"
+	# https://github.com/dolphin-emu/dolphin/pull/12575
+	"${FILESDIR}/${P}-gcc-14.patch"
+)
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-arch/zstd:=
+	dev-libs/hidapi:=
+	<dev-libs/libfmt-10:=
+	dev-libs/lzo:=
+	dev-libs/pugixml:=
+	media-libs/cubeb:=
+	media-libs/libpng:=
+	media-libs/libsfml:=
+	media-libs/mesa[egl(+)]
+	net-libs/enet:1.3
+	net-libs/mbedtls:0=
+	net-misc/curl:=
+	sys-libs/readline:=
+	sys-libs/zlib:=[minizip]
+	x11-libs/libXext
+	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/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	profile? ( dev-util/oprofile )
+	pulseaudio? ( media-sound/pulseaudio )
+	systemd? ( sys-apps/systemd:0= )
+	upnp? ( net-libs/miniupnpc )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# vulkan-loader required for vulkan backend which can be selected
+# at runtime.
+RDEPEND+="
+	vulkan? ( media-libs/vulkan-loader )
+"
+
+# [directory]=license
+declare -A KEEP_BUNDLED=(
+	# please keep this list in CMakeLists.txt order
+
+	[Bochs_disasm]=LGPL-2.1+
+	[cpp-optparse]=MIT
+	[imgui]=MIT
+	[glslang]=BSD
+
+	# FIXME: xxhash can't be found by cmake
+	[xxhash]=BSD-2
+
+	# FIXME: requires minizip-ng
+	#[minizip]=ZLIB
+
+	[FreeSurround]=GPL-2+
+	[soundtouch]=LGPL-2.1+
+
+	# FIXME: discord-rpc not packaged
+	[discord-rpc]=MIT
+
+	[mGBA]=MPL-2.0
+
+	[picojson]=BSD-2
+	[rangeset]=ZLIB
+	[gtest]= # (build-time only)
+)
+
+src_prepare() {
+	if use mgba && [[ ${PV} != *9999 ]]; then
+		rmdir Externals/mGBA/mgba || die
+		mv "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die
+	fi
+
+	cmake_src_prepare
+
+	local s remove=()
+	for s in Externals/*; do
+		[[ -f ${s} ]] && continue
+		if ! has "${s#Externals/}" "${!KEEP_BUNDLED[@]}"; then
+			remove+=( "${s}" )
+		fi
+	done
+
+	einfo "removing sources: ${remove[*]}"
+	rm -r "${remove[@]}" || die
+
+	# About 50% compile-time speedup
+	if ! use vulkan; then
+		sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die
+	fi
+
+	# Allow regular minizip.
+	sed -i -e '/minizip/s:>=2[.]0[.]0::' CMakeLists.txt || die
+
+	# Remove dirty suffix: needed for netplay
+	sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die
+
+	# Force Qt5 rather than automagic until support is properly handled here
+	sed -i -e '/NAMES Qt6 COMP/d' Source/Core/DolphinQt/CMakeLists.txt || die
+}
+
+src_configure() {
+	# bug #891225 (https://bugs.dolphin-emu.org/issues/11481, QTBUG-61710)
+	use gui && filter-lto
+
+	local mycmakeargs=(
+		# Use ccache only when user did set FEATURES=ccache (or similar)
+		# not when ccache binary is present in system (automagic).
+		-DCCACHE_BIN=CCACHE_BIN-NOTFOUND
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AUTOUPDATE=OFF
+		-DENABLE_BLUEZ=$(usex bluetooth)
+		-DENABLE_EVDEV=$(usex evdev)
+		-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
+		-DENABLE_LLVM=OFF
+		# just adds -flto, user can do that via flags
+		-DENABLE_LTO=OFF
+		-DUSE_MGBA=$(usex mgba)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_QT=$(usex gui)
+		-DENABLE_SDL=OFF # not supported: #666558
+		-DENABLE_VULKAN=$(usex vulkan)
+		-DFASTLOG=$(usex log)
+		-DOPROFILING=$(usex profile)
+		-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
+		-DUSE_SHARED_ENET=ON
+		-DUSE_UPNP=$(usex upnp)
+
+		# Undo cmake.eclass's defaults.
+		# All dolphin's libraries are private
+		# and rely on circular dependency resolution.
+		-DBUILD_SHARED_LIBS=OFF
+
+		# Avoid warning spam around unset variables.
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build unittests
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc Readme.md
+	if use doc; then
+		dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
+	fi
+
+	doicon -s 48 Data/dolphin-emu.png
+	doicon -s scalable Data/dolphin-emu.svg
+	doicon Data/dolphin-emu.svg
+}
+
+pkg_postinst() {
+	# Add pax markings for hardened systems
+	pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index 5b6fcbbb843a..b18e0c26a48b 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-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
@@ -72,8 +72,7 @@ RDEPEND="
 	app-arch/xz-utils
 	>=app-arch/zstd-1.4.0:=
 	dev-libs/hidapi
-	<dev-libs/libfmt-11.1:=
-	>=dev-libs/libfmt-10.1
+	>=dev-libs/libfmt-10.1:=
 	dev-libs/lzo:2
 	dev-libs/pugixml
 	dev-libs/xxhash
@@ -81,7 +80,7 @@ RDEPEND="
 	media-libs/libsfml:=
 	media-libs/libspng
 	>=net-libs/enet-1.3.18:1.3=
-	net-libs/mbedtls:=
+	net-libs/mbedtls:0=
 	net-misc/curl
 	x11-libs/libX11
 	x11-libs/libXi
@@ -127,6 +126,8 @@ declare -A KEEP_BUNDLED=(
 	# please keep this list in CMakeLists.txt order
 
 	# TODO: use system libraries
+	# bug #873952
+	# https://github.com/dolphin-emu/dolphin/pull/13089
 	[zlib-ng]=ZLIB
 	[minizip-ng]=ZLIB
 
@@ -155,7 +156,6 @@ declare -A KEEP_BUNDLED=(
 )
 
 PATCHES=(
-	"${FILESDIR}"/dolphin-2407-libfmt-11-fix.patch
 	"${FILESDIR}"/dolphin-2407-minizip.patch
 )
 
@@ -196,11 +196,6 @@ src_prepare() {
 	einfo "removing sources: ${remove[*]}"
 	rm -r "${remove[@]}" || die
 
-	# About 50% compile-time speedup
-	if ! use vulkan; then
-		sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die
-	fi
-
 	# Remove dirty suffix: needed for netplay
 	sed -i -e 's/--dirty/&=""/' CMake/ScmRevGen.cmake || die
 }
@@ -226,7 +221,6 @@ src_configure() {
 		-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
 		-DFASTLOG=$(usex log)
 		-DOPROFILING=$(usex profile)
-		-DSTEAM=OFF
 		-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
 		-DUSE_MGBA=$(usex mgba)
 		-DUSE_RETRO_ACHIEVEMENTS=OFF
@@ -242,7 +236,6 @@ src_configure() {
 		-DUSE_SYSTEM_BZIP2=ON
 		-DUSE_SYSTEM_LIBLZMA=ON
 		-DUSE_SYSTEM_ZSTD=ON
-		-DUSE_SYSTEM_ZLIB=OFF
 		-DUSE_SYSTEM_MINIZIP=OFF
 		-DUSE_SYSTEM_LZO=ON
 		-DUSE_SYSTEM_LZ4=ON
diff --git a/games-emulation/dolphin/files/dolphin-2412-fix-build-without-retro-achievements.patch b/games-emulation/dolphin/files/dolphin-2412-fix-build-without-retro-achievements.patch
new file mode 100644
index 000000000000..01575fb551c3
--- /dev/null
+++ b/games-emulation/dolphin/files/dolphin-2412-fix-build-without-retro-achievements.patch
@@ -0,0 +1,68 @@
+https://github.com/dolphin-emu/dolphin/pull/13226
+
+https://github.com/dolphin-emu/dolphin/commit/84ab15e020a993286329e1fc0b0e47ffc3c0a536
+From 84ab15e020a993286329e1fc0b0e47ffc3c0a536 Mon Sep 17 00:00:00 2001
+From: JosJuice <josjuice@gmail.com>
+Date: Sun, 15 Dec 2024 18:00:14 +0100
+Subject: [PATCH 1/2] AchievementManager: Add required forward declarations
+
+This was causing compilation errors when building without
+USE_RETRO_ACHIEVEMENTS.
+--- a/Source/Core/Core/AchievementManager.h
++++ b/Source/Core/Core/AchievementManager.h
+@@ -275,11 +275,21 @@ class AchievementManager
+ 
+ #include <string>
+ 
++namespace ActionReplay
++{
++struct ARCode;
++}
++
+ namespace DiscIO
+ {
+ class Volume;
+ }
+ 
++namespace Gecko
++{
++class GeckoCode;
++}
++
+ class AchievementManager
+ {
+ public:
+
+https://github.com/dolphin-emu/dolphin/commit/ad24ddb6bb01ddaba19bf72e8eda5cae354701ae
+From ad24ddb6bb01ddaba19bf72e8eda5cae354701ae Mon Sep 17 00:00:00 2001
+From: JosJuice <josjuice@gmail.com>
+Date: Sun, 15 Dec 2024 18:15:57 +0100
+Subject: [PATCH 2/2] VerifyTool: Add missing USE_RETRO_ACHIEVEMENTS ifdefs
+
+--- a/Source/Core/DolphinTool/VerifyCommand.cpp
++++ b/Source/Core/DolphinTool/VerifyCommand.cpp
+@@ -133,8 +133,10 @@ int VerifyCommand(const std::vector<std::string>& args)
+       hashes_to_calculate.md5 = true;
+     else if (algorithm == "sha1")
+       hashes_to_calculate.sha1 = true;
++#ifdef USE_RETRO_ACHIEVEMENTS
+     else if (algorithm == "rchash")
+       rc_hash_calculate = true;
++#endif
+   }
+ 
+   if (!hashes_to_calculate.crc32 && !hashes_to_calculate.md5 && !hashes_to_calculate.sha1 &&
+@@ -163,11 +165,13 @@ int VerifyCommand(const std::vector<std::string>& args)
+   verifier.Finish();
+   const DiscIO::VolumeVerifier::Result& result = verifier.GetResult();
+ 
++#ifdef USE_RETRO_ACHIEVEMENTS
+   // Calculate rcheevos hash
+   if (rc_hash_calculate)
+   {
+     rc_hash_result = AchievementManager::CalculateHash(input_file_path);
+   }
++#endif
+ 
+   // Print the report
+   if (!algorithm_is_set)
diff --git a/games-emulation/dolphin/files/dolphin-2412-fix-libfmt-11.1.patch b/games-emulation/dolphin/files/dolphin-2412-fix-libfmt-11.1.patch
new file mode 100644
index 000000000000..0f5c3fd91c41
--- /dev/null
+++ b/games-emulation/dolphin/files/dolphin-2412-fix-libfmt-11.1.patch
@@ -0,0 +1,75 @@
+https://github.com/dolphin-emu/dolphin/commit/22dc21cca42b2eaf373ac9e1b5128c566615aa71
+https://github.com/dolphin-emu/dolphin/pull/13262
+
+From 825092ad33a2e7466e79520c1338d0bed56ca299 Mon Sep 17 00:00:00 2001
+From: Ferdinand Bachmann <ferdinand.bachmann@yrlf.at>
+Date: Sat, 4 Jan 2025 18:45:32 +0100
+Subject: [PATCH 1/2] BBA/HLE: Fix incorrect fmt format string
+
+--- a/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp
++++ b/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp
+@@ -686,7 +686,7 @@ bool CEXIETHERNET::BuiltInBBAInterface::SendFrame(const u8* frame, u32 size)
+   }
+
+   default:
+-    ERROR_LOG_FMT(SP1, "Unsupported EtherType {#06x}", *ethertype);
++    ERROR_LOG_FMT(SP1, "Unsupported EtherType {:#06x}", *ethertype);
+     return false;
+   }
+
+
+From b79bdb13c05b4fcef23cd30b210d40662d28373b Mon Sep 17 00:00:00 2001
+From: Ferdinand Bachmann <ferdinand.bachmann@yrlf.at>
+Date: Sat, 4 Jan 2025 18:46:04 +0100
+Subject: [PATCH 2/2] Common: Fix compile failure with fmt>=11
+
+--- a/Source/Core/Common/Logging/Log.h
++++ b/Source/Core/Common/Logging/Log.h
+@@ -99,7 +99,13 @@ void GenericLogFmt(LogLevel level, LogType type, const char* file, int line, con
+   static_assert(NumFields == sizeof...(args),
+                 "Unexpected number of replacement fields in format string; did you pass too few or "
+                 "too many arguments?");
+-  GenericLogFmtImpl(level, type, file, line, format, fmt::make_format_args(args...));
++
++#if FMT_VERSION >= 110000
++  auto&& format_str = fmt::format_string<Args...>(format);
++#else
++  auto&& format_str = format;
++#endif
++  GenericLogFmtImpl(level, type, file, line, format_str, fmt::make_format_args(args...));
+ }
+ }  // namespace Common::Log
+
+--- a/Source/Core/Common/MsgHandler.h
++++ b/Source/Core/Common/MsgHandler.h
+@@ -41,12 +41,17 @@ bool MsgAlertFmt(bool yes_no, MsgType style, Common::Log::LogType log_type, cons
+   static_assert(NumFields == sizeof...(args),
+                 "Unexpected number of replacement fields in format string; did you pass too few or "
+                 "too many arguments?");
+-#if FMT_VERSION >= 90000
++#if FMT_VERSION >= 110000
++  static_assert(std::is_base_of_v<fmt::detail::compile_string, S>);
++  auto&& format_str = fmt::format_string<Args...>(format);
++#elif FMT_VERSION >= 90000
+   static_assert(fmt::detail::is_compile_string<S>::value);
++  auto&& format_str = format;
+ #else
+   static_assert(fmt::is_compile_string<S>::value);
++  auto&& format_str = format;
+ #endif
+-  return MsgAlertFmtImpl(yes_no, style, log_type, file, line, format,
++  return MsgAlertFmtImpl(yes_no, style, log_type, file, line, format_str,
+                          fmt::make_format_args(args...));
+ }
+
+@@ -60,7 +65,9 @@ bool MsgAlertFmtT(bool yes_no, MsgType style, Common::Log::LogType log_type, con
+   static_assert(NumFields == sizeof...(args),
+                 "Unexpected number of replacement fields in format string; did you pass too few or "
+                 "too many arguments?");
+-#if FMT_VERSION >= 90000
++#if FMT_VERSION >= 110000
++  static_assert(std::is_base_of_v<fmt::detail::compile_string, S>);
++#elif FMT_VERSION >= 90000
+   static_assert(fmt::detail::is_compile_string<S>::value);
+ #else
+   static_assert(fmt::is_compile_string<S>::value);
diff --git a/games-emulation/melonds/Manifest b/games-emulation/melonds/Manifest
index 74568d66e233..793f86ba9ac5 100644
--- a/games-emulation/melonds/Manifest
+++ b/games-emulation/melonds/Manifest
@@ -1,2 +1,2 @@
-DIST melonDS-0.9.5_p20240815.tar.gz 3400066 BLAKE2B c2e530ee12e1ba6cb9d7bc1ac233be984a00a9b182b4f8cab3082dad3b6e0449239455f422113ca8efcbcfafd8a4b8bca3b3dc84c79936e467f001b21b90f79d SHA512 7845be503f272aa2b7e070b19c46893274fc3d44ace3ae1ce11e33da8e58766127cb1c89dcb92bd8084f33a8cc7c0241b7416423ec93fe45858211cd69e1766e
 DIST melonDS-0.9.5_p20241113.tar.gz 3410057 BLAKE2B 6c4e5e8aa1a519a11308d42168c22d6fde8176fe46e96d00edcc34112e16d65aad77d1925b9f1966c198035cccae092902428081f1cf56d40eac30c369477433 SHA512 25b18547899e18e915cfdc0c437472fb39eeac520c478e232783fc5d57430e84b2cd0be1b2bcddfe9f5132877c8278ebb29893e7a104d7731974aa5e44f79914
+DIST melonds-1.0_rc.gh.tar.gz 3594949 BLAKE2B cb4cc8e8d38bc544084c8a22aeba1a6284ef36ed808a84c890a8bcc946bce3fa27622ef965f48bed2808b12e9727b4df21d1e31b1c8ed0ce1ee9a24955d2de5b SHA512 3b7efe02be2aa058a3364c52f20ee528cea70940f9d81c4db5c936da8bf46226a2eadfa7b65c5acbf0dc8253b8108995cf0b55d79f0c70bf6222ac14c9e6e382
diff --git a/games-emulation/melonds/melonds-0.9.5_p20240815.ebuild b/games-emulation/melonds/melonds-0.9.5_p20240815.ebuild
deleted file mode 100644
index 90c40826835f..000000000000
--- a/games-emulation/melonds/melonds-0.9.5_p20240815.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-REAL_PN="melonDS"
-REAL_P="${REAL_PN}-${PV}"
-
-[[ "${PV}" == *p20240815 ]] && COMMIT="0e6235a7c4d3e69940a6deae158a5a91dfbfa612"
-
-inherit cmake flag-o-matic readme.gentoo-r1 toolchain-funcs xdg
-
-DESCRIPTION="Nintendo DS emulator, sorta"
-HOMEPAGE="http://melonds.kuribo64.net
-	https://github.com/Arisotura/melonDS"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/Arisotura/${REAL_PN}.git"
-else
-	SRC_URI="https://github.com/Arisotura/${REAL_PN}/archive/${COMMIT}.tar.gz
-		-> ${REAL_P}.tar.gz"
-	S="${WORKDIR}/${REAL_PN}-${COMMIT}"
-
-	KEYWORDS="amd64"
-fi
-
-LICENSE="BSD-2 GPL-2 GPL-3 Unlicense"
-SLOT="0"
-IUSE="+jit +opengl wayland"
-
-RDEPEND="
-	app-arch/libarchive
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-libs/libsdl2[sound,video]
-	net-libs/enet:=
-	net-libs/libpcap
-	net-libs/libslirp
-	wayland? (
-		dev-libs/wayland
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	wayland? (
-		kde-frameworks/extra-cmake-modules:0
-	)
-"
-
-# used for JIT recompiler
-QA_EXECSTACK="usr/bin/melonDS"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You need the following files in order to run melonDS:
-- bios7.bin
-- bios9.bin
-- firmware.bin
-- romlist.bin
-Place them in ~/.config/melonDS
-Those files can be extracted from devices or found somewhere on the Internet ;-)"
-
-src_prepare() {
-	filter-lto
-	append-flags -fno-strict-aliasing
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DBUILD_SHARED_LIBS="OFF"
-		-DENABLE_JIT="$(usex jit)"
-		-DENABLE_OGLRENDERER="$(usex opengl)"
-		-DENABLE_WAYLAND="$(usex wayland)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	tc-export AR
-	cmake_src_compile
-}
-
-src_install() {
-	readme.gentoo_create_doc
-	cmake_src_install
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/games-emulation/melonds/melonds-1.0_rc.ebuild b/games-emulation/melonds/melonds-1.0_rc.ebuild
new file mode 100644
index 000000000000..0c99dd96ef21
--- /dev/null
+++ b/games-emulation/melonds/melonds-1.0_rc.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2019-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+REAL_PN="melonDS"
+REAL_PV="${PV/_rc/rc}"
+REAL_P="${REAL_PN}-${REAL_PV}"
+
+inherit cmake readme.gentoo-r1 toolchain-funcs xdg
+
+DESCRIPTION="Nintendo DS emulator, sorta"
+HOMEPAGE="http://melonds.kuribo64.net
+	https://github.com/Arisotura/melonDS"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/Arisotura/${REAL_PN}"
+else
+	SRC_URI="https://github.com/Arisotura/${REAL_PN}/archive/${REAL_PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+	S="${WORKDIR}/${REAL_P}"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD-2 GPL-2 GPL-3 Unlicense"
+SLOT="0"
+IUSE="+jit +opengl wayland"
+
+RDEPEND="
+	app-arch/libarchive[zstd]
+	dev-qt/qtbase:6[network,opengl,widgets]
+	dev-qt/qtmultimedia:6
+	dev-qt/qtsvg:6
+	media-libs/libsdl2[sound,video]
+	net-libs/enet:=
+	net-libs/libpcap
+	net-libs/libslirp
+	x11-libs/libxkbcommon
+	wayland? (
+		dev-libs/wayland
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	wayland? (
+		kde-frameworks/extra-cmake-modules:0
+	)
+"
+
+# Used for JIT recompiler.
+QA_EXECSTACK="usr/bin/melonDS"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You need the following files in order to run melonDS:
+- bios7.bin
+- bios9.bin
+- firmware.bin
+- romlist.bin
+Place them in ~/.config/melonDS
+Those files can be extracted from devices or found somewhere on the Internet ;-)"
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DBUILD_SHARED_LIBS="OFF"
+		-DUSE_SYSTEM_LIBSLIRP="ON"
+
+		-DENABLE_JIT="$(usex jit)"
+		-DENABLE_OGLRENDERER="$(usex opengl)"
+		-DENABLE_WAYLAND="$(usex wayland)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	tc-export AR
+	cmake_src_compile
+}
+
+src_install() {
+	readme.gentoo_create_doc
+	cmake_src_install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 959842c7dfee..3470bf45e307 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,2 +1 @@
-DIST mgba-0.10.3.tar.gz 14350721 BLAKE2B 2109c53455ece7beba0af30787cd75cad85db334be44e41b51f579f813393f8d83c5c9537832b190bb8b0ac1c28d78e92adb6af23191b17b463847df3360f656 SHA512 de92725a18f00ec8645a75cf434a667bfc5aba954d0ae8be188241371a4a310214123be2cec13d20dbff4f660b401364efb51c43c7bdc24eea40454949062a52
 DIST mgba-0.10.4.tar.gz 14355132 BLAKE2B 1f99fd1f79e1645f2de8c1fbd07bdc4996fbc12263fd14b3588e0dcccff910780be73ed92084e53ed873f5e55eef70a983afee2f3f0bd166c578a03bcf57ea0b SHA512 300c09ae8d6dc9677aabb6771345da42b78dc2e4e63e14f1fc404b89737e5161f412f4903488fd222fcf3ac9b0161ba5947a099cd9b5095137d100ce14a14aa3
diff --git a/games-emulation/mgba/files/mgba-0.10.3-rapidjson-gcc14-const.patch b/games-emulation/mgba/files/mgba-0.10.3-rapidjson-gcc14-const.patch
deleted file mode 100644
index 516c81199bda..000000000000
--- a/games-emulation/mgba/files/mgba-0.10.3-rapidjson-gcc14-const.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/924019
-(same as https://bugs.gentoo.org/914583 given rapidjson is bundled)
-
-https://github.com/Tencent/rapidjson/issues/718
-https://github.com/Tencent/rapidjson/commit/3b2441b87f99ab65f37b141a7b548ebadb607b96
-From: Janusz Chorko <janusz.chorko@apdu.pl>
-Date: Fri, 26 Aug 2016 21:17:38 +0200
-Subject: [PATCH] Removed non-compiling assignment operator. Fixed #718
---- a/src/third-party/discord-rpc/include/rapidjson/document.h
-+++ b/src/third-party/discord-rpc/include/rapidjson/document.h
-@@ -317,6 +317,4 @@
-     GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
- 
--    GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
--
-     //! implicit conversion to plain CharType pointer
-     operator const Ch *() const { return s; }
diff --git a/games-emulation/mgba/mgba-0.10.3.ebuild b/games-emulation/mgba/mgba-0.10.3.ebuild
deleted file mode 100644
index 0e746e84b175..000000000000
--- a/games-emulation/mgba/mgba-0.10.3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{3..4} )
-inherit cmake lua-single xdg
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
-else
-	SRC_URI="https://github.com/mgba-emu/mgba/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ppc64 x86"
-fi
-
-DESCRIPTION="Game Boy Advance Emulator"
-HOMEPAGE="https://mgba.io/"
-
-LICENSE="MPL-2.0 BSD LGPL-2.1+ public-domain discord? ( MIT )"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="
-	debug discord elf ffmpeg gles2 gles3 gui libretro
-	lua +opengl +sdl +sqlite test
-"
-REQUIRED_USE="
-	gui? ( || ( gles2 gles3 opengl ) sqlite )
-	lua? ( ${LUA_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/libpng:=
-	sys-libs/zlib:=[minizip]
-	debug? ( dev-libs/libedit )
-	elf? ( dev-libs/elfutils )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gles2? ( media-libs/libglvnd )
-	gles3? ( media-libs/libglvnd )
-	lua? ( ${LUA_DEPS} )
-	opengl? ( media-libs/libglvnd )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-	)
-	sdl? ( media-libs/libsdl2[sound,joystick,gles2?,opengl?,video] )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cmocka )
-"
-BDEPEND="
-	gui? ( dev-qt/linguist-tools:5 )
-	lua? ( virtual/pkgconfig )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.10.0-optional-updater.patch
-	"${FILESDIR}"/${PN}-0.10.3-rapidjson-gcc14-const.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CINEMA=$(usex test)
-		-DBUILD_GL=$(usex opengl)
-		-DBUILD_GLES2=$(usex gles2)
-		-DBUILD_GLES3=$(usex gles3)
-		-DBUILD_LIBRETRO=$(usex libretro)
-		-DBUILD_QT=$(usex gui)
-		-DBUILD_ROM_TEST=yes #918855
-		-DBUILD_SDL=$(usex sdl) # also used for gamepads in QT build
-		-DBUILD_SUITE=$(usex test)
-		-DBUILD_UPDATER=no
-		-DENABLE_SCRIPTING=$(usex lua)
-		-DMARKDOWN=no #752048
-		-DUSE_DEBUGGERS=$(usex debug)
-		-DUSE_DISCORD_RPC=$(usex discord)
-		-DUSE_EDITLINE=$(usex debug)
-		-DUSE_ELF=$(usex elf)
-		-DUSE_EPOXY=no
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_GDB_STUB=$(usex debug)
-		-DUSE_LIBZIP=no
-		-DUSE_LZMA=yes
-		-DUSE_MINIZIP=yes
-		-DUSE_PNG=yes
-		-DUSE_SQLITE3=$(usex sqlite)
-		-DUSE_ZLIB=yes
-		$(usev libretro -DLIBRETRO_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/libretro)
-	)
-	use lua && mycmakeargs+=( -DUSE_LUA=$(ver_cut 1-2 $(lua_get_version)) )
-
-	cmake_src_configure
-}
-
-src_test() {
-	# CMakeLists.txt forces SKIP_RPATH=yes when PREFIX=/usr
-	local -x LD_LIBRARY_PATH=${BUILD_DIR}:${LD_LIBRARY_PATH}
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	use !test || rm "${ED}"/usr/bin/mgba-cinema || die
-
-	rm -r "${ED}"/usr/share/doc/${PF}/{LICENSE,licenses} || die
-}
diff --git a/games-emulation/mgba/mgba-0.10.4.ebuild b/games-emulation/mgba/mgba-0.10.4.ebuild
index 250ae543e894..578c796fa9a6 100644
--- a/games-emulation/mgba/mgba-0.10.4.ebuild
+++ b/games-emulation/mgba/mgba-0.10.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
 else
 	SRC_URI="https://github.com/mgba-emu/mgba/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ppc64 x86"
+	KEYWORDS="amd64 arm64 ppc64 x86"
 fi
 
 DESCRIPTION="Game Boy Advance Emulator"
diff --git a/games-emulation/pcsx2/pcsx2-2.2.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..6acafc7fc8cf
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-2.2.0-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop fcaps flag-o-matic optfeature toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
+else
+	SRC_URI="
+		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
+	"
+	KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/"
+
+LICENSE="
+	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+# dlopen: libglvnd, qtsvg, shaderc, vulkan-loader, wayland
+COMMON_DEPEND="
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-qt/qtbase:6[concurrent,gui,widgets]
+	dev-qt/qtsvg:6
+	media-libs/freetype
+	media-libs/libglvnd[X]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsdl2[haptic,joystick]
+	media-libs/libwebp:=
+	media-video/ffmpeg:=
+	net-libs/libpcap
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	sndio? ( media-sound/sndio:= )
+	vulkan? (
+		media-libs/shaderc
+		media-libs/vulkan-loader
+	)
+	wayland? ( dev-libs/wayland )
+"
+# patches is a optfeature but always pull given PCSX2 complaints if it
+# is missing and it is fairly small (installs a ~1.5MB patches.zip)
+RDEPEND="
+	${COMMON_DEPEND}
+	>=games-emulation/pcsx2_patches-0_p20241020
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	clang? ( llvm-core/clang:* )
+	wayland? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
+	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
+	"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
+	"${FILESDIR}"/${PN}-1.7.5835-musl-header.patch
+	"${FILESDIR}"/${PN}-1.7.5913-musl-cache.patch
+	"${FILESDIR}"/${PN}-2.2.0-missing-header.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${PV} != 9999 ]]; then
+		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
+			-i cmake/Pcsx2Utils.cmake || die
+	fi
+
+	# relax Qt6 and SDL2 version requirements which often get restricted
+	# without a specific need, please report a bug to Gentoo (not upstream)
+	# if a still-available older version is really causing issues
+	sed -e '/find_package(\(Qt6\|SDL2\)/s/ [0-9.]*//' \
+		-i cmake/SearchForStuff.cmake || die
+}
+
+src_configure() {
+	# note that upstream only supports clang and ignores gcc issues, e.g.
+	# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
+	# (CMakeLists.txt also gives a big warning if compiler is not clang)
+	if use clang && ! tc-is-clang; then
+		local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# pthread_attr_setaffinity_np is not supported on musl, may be possible
+	# to remove if bundled lzma code is updated like 7zip did (bug #935298)
+	use elibc_musl && append-cppflags -DZ7_AFFINITY_DISABLE
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_ADVANCE_SIMD=yes
+		-DENABLE_TESTS=$(usex test)
+		-DPACKAGE_MODE=yes
+		-DUSE_BACKTRACE=no # not packaged (bug #885471)
+		-DUSE_LINKED_FFMPEG=yes
+		-DUSE_VTUNE=no # not packaged
+		-DUSE_VULKAN=$(usex vulkan)
+
+		# note that upstream hardly support native wayland, may or may not work
+		# https://github.com/PCSX2/pcsx2/pull/10179
+		-DWAYLAND_API=$(usex wayland)
+		# not optional given libX11 is hard-required either way and upstream
+		# seemingly has no intention to drop the requirement at the moment
+		# https://github.com/PCSX2/pcsx2/issues/11149
+		-DX11_API=yes
+
+		# bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch
+		-DCHECK_ALSA=$(usex alsa)
+		-DCHECK_JACK=$(usex jack)
+		-DCHECK_PULSE=$(usex pulseaudio)
+		-DCHECK_SNDIO=$(usex sndio)
+		-DLAZY_LOAD_LIBS=no
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build unittests
+}
+
+src_install() {
+	cmake_src_install
+
+	newicon bin/resources/icons/AppIconLarge.png pcsx2.png
+	make_desktop_entry pcsx2-qt PCSX2
+
+	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
+}
+
+pkg_postinst() {
+	fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/bin/pcsx2-qt
+
+	# calls aplay or gst-play/launch-1.0 as fallback
+	# https://github.com/PCSX2/pcsx2/issues/11141
+	optfeature "UI sound effects support" \
+		media-sound/alsa-utils \
+		media-libs/gst-plugins-base:1.0
+
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 2.2.0
+	then
+		elog
+		elog "Note that the 'pcsx2' executable was renamed to 'pcsx2-qt' with this version."
+	fi
+}
diff --git a/games-emulation/pcsx2/pcsx2-2.2.0.ebuild b/games-emulation/pcsx2/pcsx2-2.2.0.ebuild
deleted file mode 100644
index 7efe14908bd3..000000000000
--- a/games-emulation/pcsx2/pcsx2-2.2.0.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop fcaps flag-o-matic optfeature toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
-else
-	SRC_URI="
-		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
-			-> ${P}.tar.gz
-	"
-	KEYWORDS="-* ~amd64"
-fi
-
-DESCRIPTION="PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/"
-
-LICENSE="
-	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
-	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
-"
-SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-# dlopen: libglvnd, qtsvg, shaderc, vulkan-loader, wayland
-COMMON_DEPEND="
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-qt/qtbase:6[concurrent,gui,widgets]
-	dev-qt/qtsvg:6
-	media-libs/freetype
-	media-libs/libglvnd[X]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/libsdl2[haptic,joystick]
-	media-libs/libwebp:=
-	media-video/ffmpeg:=
-	net-libs/libpcap
-	net-misc/curl
-	sys-apps/dbus
-	sys-libs/zlib:=
-	virtual/libudev:=
-	x11-libs/libXrandr
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	pulseaudio? ( media-libs/libpulse )
-	sndio? ( media-sound/sndio:= )
-	vulkan? (
-		media-libs/shaderc
-		media-libs/vulkan-loader
-	)
-	wayland? ( dev-libs/wayland )
-"
-# patches is a optfeature but always pull given PCSX2 complaints if it
-# is missing and it is fairly small (installs a ~1.5MB patches.zip)
-RDEPEND="
-	${COMMON_DEPEND}
-	>=games-emulation/pcsx2_patches-0_p20241020
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/qttools:6[linguist]
-	clang? ( llvm-core/clang:* )
-	wayland? (
-		dev-util/wayland-scanner
-		kde-frameworks/extra-cmake-modules
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
-	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
-	"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
-	"${FILESDIR}"/${PN}-1.7.5835-musl-header.patch
-	"${FILESDIR}"/${PN}-1.7.5913-musl-cache.patch
-	"${FILESDIR}"/${PN}-2.2.0-missing-header.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${PV} != 9999 ]]; then
-		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
-			-i cmake/Pcsx2Utils.cmake || die
-	fi
-
-	# relax Qt6 and SDL2 version requirements which often get restricted
-	# without a specific need, please report a bug to Gentoo (not upstream)
-	# if a still-available older version is really causing issues
-	sed -e '/find_package(\(Qt6\|SDL2\)/s/ [0-9.]*//' \
-		-i cmake/SearchForStuff.cmake || die
-}
-
-src_configure() {
-	# note that upstream only supports clang and ignores gcc issues, e.g.
-	# https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047
-	# (CMakeLists.txt also gives a big warning if compiler is not clang)
-	if use clang && ! tc-is-clang; then
-		local -x CC=${CHOST}-clang CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# pthread_attr_setaffinity_np is not supported on musl, may be possible
-	# to remove if bundled lzma code is updated like 7zip did (bug #935298)
-	use elibc_musl && append-cppflags -DZ7_AFFINITY_DISABLE
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=no
-		-DDISABLE_ADVANCE_SIMD=yes
-		-DENABLE_TESTS=$(usex test)
-		-DPACKAGE_MODE=yes
-		-DUSE_BACKTRACE=no # not packaged (bug #885471)
-		-DUSE_LINKED_FFMPEG=yes
-		-DUSE_VTUNE=no # not packaged
-		-DUSE_VULKAN=$(usex vulkan)
-
-		# note that upstream hardly support native wayland, may or may not work
-		# https://github.com/PCSX2/pcsx2/pull/10179
-		-DWAYLAND_API=$(usex wayland)
-		# not optional given libX11 is hard-required either way and upstream
-		# seemingly has no intention to drop the requirement at the moment
-		# https://github.com/PCSX2/pcsx2/issues/11149
-		-DX11_API=yes
-
-		# bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch
-		-DCHECK_ALSA=$(usex alsa)
-		-DCHECK_JACK=$(usex jack)
-		-DCHECK_PULSE=$(usex pulseaudio)
-		-DCHECK_SNDIO=$(usex sndio)
-		-DLAZY_LOAD_LIBS=no
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build unittests
-}
-
-src_install() {
-	cmake_src_install
-
-	newicon bin/resources/icons/AppIconLarge.png pcsx2-qt.png
-	make_desktop_entry pcsx2-qt PCSX2
-
-	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
-}
-
-pkg_postinst() {
-	fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/bin/pcsx2-qt
-
-	# calls aplay or gst-play/launch-1.0 as fallback
-	# https://github.com/PCSX2/pcsx2/issues/11141
-	optfeature "UI sound effects support" \
-		media-sound/alsa-utils \
-		media-libs/gst-plugins-base:1.0
-
-	if [[ ${REPLACING_VERSIONS##* } ]] &&
-		ver_test ${REPLACING_VERSIONS##* } -lt 2.2.0
-	then
-		elog
-		elog "Note that the 'pcsx2' executable was renamed to 'pcsx2-qt' with this version."
-	fi
-}
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 9b34ff9cc355..08e6cf5fee2d 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-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
@@ -144,7 +144,7 @@ src_test() {
 src_install() {
 	cmake_src_install
 
-	newicon bin/resources/icons/AppIconLarge.png pcsx2-qt.png
+	newicon bin/resources/icons/AppIconLarge.png pcsx2.png
 	make_desktop_entry pcsx2-qt PCSX2
 
 	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
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/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index ab9b022374bb..dbfaa77dc0be 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-sudoku-45.5.tar.xz 395164 BLAKE2B 4c310a769d2ebdac1bb811d39f0cef8aad9cc424c39b7f84d64e4954c967e4d8ad7de59bbd92f84080dd75e0cbd104d71e0201b8be54611c29dd8c5cccc2ad18 SHA512 13d47ee3f85f3a481721cee98bcf7c552d3b5110544b5ba52b0e0014f55199e4840745c925eb4848f7609d3f9e6379c31138ac08894e8394c31ace722b8a796d
-DIST gnome-sudoku-46.3.tar.xz 396856 BLAKE2B ec2f0e11837dbba26b0ea5d31dd0c404d1193c43aa272d67f0e67bad4037e8d0544b89061c28ad356ddb4afeb80bfa39aaef02733cfde087643a88083b9c1489 SHA512 3a1e5607dcbc2841d9c0506da221affc2e8a64b2c96f5cf6744747be07445f6418ca853ae324caec3265882ba65f66b8dd5b06c185d334b47c64d7be65a41ac3
 DIST gnome-sudoku-46.4.tar.xz 396828 BLAKE2B ae2a7369f01af054458e34b2023a3d736f7940de5c7aac924f87acceaf46faec57b84908754b49cd79082754492d6bf8bc27cae17fdce60d95470eb24d069260 SHA512 439752b6d963f5ae19ce15914d21159ff051c6fddea1590767f8661d40dc7ad4b4ddee730f3a2f76f6651b12b946043708c648e6d3a367788be8ce7e507b939a
+DIST gnome-sudoku-47.1.1.tar.xz 420024 BLAKE2B 0d55bce403da7b9e813b01c955d69e54412afc7c183f5801a1fe45ac13e2a0009f7451824558582902507c47016f6335d00a18efc3d8767f9840540f47d19f0b SHA512 864d6838f0842c9be946ec6ed43d0c76d00c3b579952097f88aaca5d94cff5211c65d8a67c09bdb65cc0ff0f37be304077745afa0db64d299f2f61d0580b46cc
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-45.5.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-45.5.ebuild
deleted file mode 100644
index 6392ba4c303b..000000000000
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-45.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Test your logic skills in this number grid puzzle"
-HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku https://gitlab.gnome.org/GNOME/gnome-sudoku"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libgee:0.8=[introspection]
-	>=gui-libs/gtk-4.10.0[introspection]
-	>=gui-libs/libadwaita-1.4_alpha[introspection,vala]
-	dev-libs/json-glib
-	>=dev-libs/qqwing-1.3.4:=
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-46.3.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-46.3.ebuild
deleted file mode 100644
index 16fef17ca527..000000000000
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-46.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Test your logic skills in this number grid puzzle"
-HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku https://gitlab.gnome.org/GNOME/gnome-sudoku"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libgee:0.8=[introspection]
-	>=gui-libs/gtk-4.10.0[introspection]
-	>=gui-libs/libadwaita-1.4_alpha[introspection,vala]
-	dev-libs/json-glib
-	>=dev-libs/qqwing-1.3.4:=
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-47.1.1.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-47.1.1.ebuild
new file mode 100644
index 000000000000..15ff28650d46
--- /dev/null
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-47.1.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Test your logic skills in this number grid puzzle"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-sudoku"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.76:2
+	dev-libs/libgee:0.8=[introspection]
+	>=gui-libs/gtk-4.15.2[introspection]
+	>=gui-libs/libadwaita-1.6[introspection,vala]
+	dev-libs/json-glib
+	>=dev-libs/qqwing-1.3.4:=
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/games-puzzle/skladnik/Manifest b/games-puzzle/skladnik/Manifest
index 49ad86898501..7b667c5f36f2 100644
--- a/games-puzzle/skladnik/Manifest
+++ b/games-puzzle/skladnik/Manifest
@@ -1,2 +1,2 @@
 DIST skladnik-24.08.3.tar.xz 409780 BLAKE2B 6a98d068abcd84f906411b51ae030214df448df3017ae7251d363800f05db243c075be4173e05d841babea659afea3cc8c72e91389be7659a3ed5077549c8d1f SHA512 f06e061576d953e7bdc5bb1eb1eb571452585b76380a4ddde11403b55d81e58e4fb3c7cb464b715e7e0370e13ae96ca00dbb477e58d5493c175843676932e964
-DIST skladnik-24.12.0.tar.xz 413040 BLAKE2B f8d829ebd2615c2089bbe42f9c49db6554fa5bc4f7a7772699309dff694903e1d481130b7c5c37a2d8b1c03e4b467876fc4a3d1e12ca8d51a28617359b12e24c SHA512 a247a176e70218f9e4cc94a854f79cd7a4eb7e4cc4329b19a1f2cbcfd95417c64067d7e3ebb49cb6ef14aee6a4f604274e59a58edfc100399e3635165ad0a3b5
+DIST skladnik-24.12.1.tar.xz 413004 BLAKE2B 8235d94a4aa3eeab2af3cac677be973dc2b15f4d51e0693414bd3dae9adb60db4591be7e9297f872c50d6d1d280b05be9f196316f61aceaf2f92325ddb5fd1d2 SHA512 60dcacd1cfda8960c0c0459d8fc5411defa892f22157c8aed2c77638a647da6f0b8114621bb050b2e3bf15368043ce4556d999a05233125885ac41798be7da85
diff --git a/games-puzzle/skladnik/skladnik-24.12.0.ebuild b/games-puzzle/skladnik/skladnik-24.12.0.ebuild
deleted file mode 100644
index db53201cea58..000000000000
--- a/games-puzzle/skladnik/skladnik-24.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="The Japanese warehouse keeper sokoban game"
-HOMEPAGE="https://apps.kde.org/skladnik/ https://invent.kde.org/games/skladnik"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-DEPEND="${RDEPEND}"
-BDEPEND="media-gfx/povray"
diff --git a/games-puzzle/skladnik/skladnik-24.12.1.ebuild b/games-puzzle/skladnik/skladnik-24.12.1.ebuild
new file mode 100644
index 000000000000..9149a1216672
--- /dev/null
+++ b/games-puzzle/skladnik/skladnik-24.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="The Japanese warehouse keeper sokoban game"
+HOMEPAGE="https://apps.kde.org/skladnik/ https://invent.kde.org/games/skladnik"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+DEPEND="${RDEPEND}"
+BDEPEND="media-gfx/povray"
diff --git a/games-rpg/xu4/Manifest b/games-rpg/xu4/Manifest
index 41735b7c63e1..559f0ae8278e 100644
--- a/games-rpg/xu4/Manifest
+++ b/games-rpg/xu4/Manifest
@@ -1,3 +1,3 @@
 DIST u4upgrad.zip 632072 BLAKE2B 3691f1cbac940021ef6043dd5e2ee26dcee5f8d7181ed525179211a6984f5ab498b84533d28146129c3e747f0af8946f7d691b7cb817a5a4ecb39e71e2df7b9a SHA512 4832d8cfd266d3ccc5eab5184bd2b6b9acd4c0203478873fb5e11704d95104dd9285a7752bad77f873d4f8603673184ae9421964509b948ec69944a4ceadd083
 DIST ultima4.zip 529099 BLAKE2B 62a7e6e05344d0c3496ee3240d6cd98c61f1ff8b8f5d869a8cecec8f786b76c8a42e1bef40fa63861d5652352c00ba67708e49b5e6c9ddfdebbb3ae47ae01e2e SHA512 efc65a53492c0f68c9e2f1507afed4da925992cdfec7a699095e6369725af8156331000c575778121e04ef6ca252af2eef97f8f7183b8378f22a4e7e509fb9a5
-DIST xu4-1.4.gh.tar.gz 8053080 BLAKE2B 3d098c426bce5b9e6c7665007388be9f189d2fc780b575fa586418e77196027f23092201bc566d41b1d9725180b85f1a7fcbb811a274c19f94d907adb6df4f43 SHA512 2061db91727fe372007c7a79c9f23f9bc78fcc6e1359e2e14ed2e7277e745e3e2a9a8fd7a16e7b42f8bd85ca692115ef22ba95122f8fbfe67c72c2cbed39c95b
+DIST xu4-1.4.2.gh.tar.gz 8069084 BLAKE2B 6150427c202597b730bfc1c44b0e92d60c90997804fc66b2d108247b7a8578f26ca5fb49acf8afd438437d544141871ff5dc437f00edc74473a500065a21aa43 SHA512 d2ae3fdf47809d4238f986594f182326538d2bbfcd0bacade859a70b8ad91d7b387a3f3d4561361cc3cbd715cc4d54c73c01ad61dcdf10948e715e714e5147f0
diff --git a/games-rpg/xu4/xu4-1.4.2.ebuild b/games-rpg/xu4/xu4-1.4.2.ebuild
new file mode 100644
index 000000000000..740be0fe0cdb
--- /dev/null
+++ b/games-rpg/xu4/xu4-1.4.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A remake of the computer game Ultima IV"
+HOMEPAGE="https://xu4.sourceforge.net/"
+SRC_URI="https://github.com/xu4-engine/u4/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	https://ultima.thatfleminggent.com/ultima4.zip
+	https://downloads.sourceforge.net/xu4/u4upgrad.zip"
+S="${WORKDIR}/u4-${PV}/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/boron
+	media-libs/allegro:5[opengl]
+	>=media-libs/faun-0.2.1
+	media-libs/libglvnd
+	media-libs/libpng:=
+	sys-libs/zlib:=[minizip]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}/1.4-system-minizip.patch"
+)
+
+src_unpack() {
+	# xu4 will read the data files right out of the zip files
+	# but we want the docs from the original.
+	unpack ${P}.gh.tar.gz
+	unpack ultima4.zip
+	# Place zips where make install expects them
+	cp "${DISTDIR}/ultima4.zip" "${DISTDIR}/u4upgrad.zip" "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# rm as part of using system minizip patch
+	rm -f src/unzip.{c,h} || die
+	sed -i -e '/CXXFLAGS+=-O3 -DNDEBUG/d' src/Makefile || die
+	# Don't strip executable
+	sed -i -e 's:-s src/xu4:src/xu4:g' Makefile || die
+}
+
+src_configure() {
+	# custom configure
+	./configure --allegro || die
+}
+
+src_install() {
+	emake DESTDIR="${D}/usr" install
+	dodoc AUTHORS README.md doc/*.txt "${WORKDIR}"/*.txt
+	insinto "/usr/share/xu4"
+	doins "${DISTDIR}/ultima4.zip"
+}
diff --git a/games-rpg/xu4/xu4-1.4.ebuild b/games-rpg/xu4/xu4-1.4.ebuild
deleted file mode 100644
index be0cd21ecb06..000000000000
--- a/games-rpg/xu4/xu4-1.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A remake of the computer game Ultima IV"
-HOMEPAGE="https://xu4.sourceforge.net/"
-SRC_URI="https://github.com/xu4-engine/u4/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	https://ultima.thatfleminggent.com/ultima4.zip
-	https://downloads.sourceforge.net/xu4/u4upgrad.zip"
-S="${WORKDIR}/u4-${PV}/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/boron
-	media-libs/allegro:5[opengl]
-	media-libs/faun
-	media-libs/libglvnd
-	media-libs/libpng:=
-	sys-libs/zlib:=[minizip]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
-	"${FILESDIR}/1.4-system-minizip.patch"
-)
-
-src_unpack() {
-	# xu4 will read the data files right out of the zip files
-	# but we want the docs from the original.
-	unpack ${P}.gh.tar.gz
-	unpack ultima4.zip
-	# Place zips where make install expects them
-	cp "${DISTDIR}/ultima4.zip" "${DISTDIR}/u4upgrad.zip" "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# rm as part of using system minizip patch
-	rm -f src/unzip.{c,h} || die
-	sed -i -e '/CXXFLAGS+=-O3 -DNDEBUG/d' src/Makefile || die
-	# Don't strip executable
-	sed -i -e 's:-s src/xu4:src/xu4:g' Makefile || die
-}
-
-src_configure() {
-	# custom configure
-	./configure --allegro || die
-}
-
-src_install() {
-	emake DESTDIR="${D}/usr" install
-	dodoc AUTHORS README.md doc/*.txt "${WORKDIR}"/*.txt
-	insinto "/usr/share/xu4"
-	doins "${DISTDIR}/ultima4.zip"
-}
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 06e890ecd980..945efd9bf68c 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,7 +1,8 @@
 DIST openrct2-0.4.16.tar.gz 22266650 BLAKE2B 19efa7f08d2f1b82dc3643d6627a1e4758dd679c44d6f49992969b1e75dd5edfe2ab4fce7652dfebcc2e1574a6a404fa2abbf4dc281fb36a26c25ec40024ccc5 SHA512 523ecb6c1358b7d2ee51e862b96fd72215ba5151b888af2878baec099492e097c3d7a99525041e803c5f647eb97c9082751ccf97a468fb7e071d050a9c5fa4c7
 DIST openrct2-0.4.17.tar.gz 22624136 BLAKE2B 6b38ec8fa4f6bdedc047c8e70792b17242b68f92f4a084bf1c3ee93a3990d47750c5867339c497ddb2ee3686be0b2fb92b464373ae2304d719ec35d573e948cc SHA512 b376304693209039845b439a594c5d403f5696854f086a0340c328bdae7e2fb0e54c4cb1af599d59cc128985e9f281b073bea22017b0d5cfcccfecfacfc5ddcd
+DIST openrct2-0.4.18.tar.gz 22955683 BLAKE2B 5e19ebbf021753e402bb00bf33f79eda254bb2b0c4d22113ab7cdc802cbee2f4a37a5142b238b5eeb0a3d6fce919f60dc0ab2b9c73c628cf273137aa88902878 SHA512 236fa52b9136e6ac329c9c7e4bf415a6c50588e8c30d8973b9da44ab83da3a75177092f8d7492535ea9f82ffa710d8484245c662531d7e3230e2daf69d56c4a2
 DIST openrct2-objects-1.4.10.zip 7495378 BLAKE2B d59f17a419abc935c781075d526ba5e8d6c90d5a524fd314a8c9da3cbd211f87340d615f3a9fe292e2b28cc260734ed344cf2da1e8c76e7310076c2ad163adb0 SHA512 a137a81f6c627ac5d7222c34009d92a24e65bea9b8e0108e59fdf393f1000caee99b9dc9947f824241c055796112d11609b1bcae50ddc33f419723a06b708f64
-DIST openrct2-objects-1.4.11.zip 7522312 BLAKE2B 9957796663b80085b4ebf33cc33fca796635481540df9a7e33fa2e4a06a3acf871fb6c30d816e9ddc58cd7c99dbe740226b44685e3a12a597a478af5f651f905 SHA512 94400c9ee086207d3c92ef23da4fdd9d9c7b1e6a11a3323d5b45f1065071976d560c07d0388f3381f9efd5a230de6a8f27b194c728eb51a9b4d030a7dbba5ead
+DIST openrct2-objects-1.4.12.zip 7599482 BLAKE2B 896c54e873a7cc143335e8b73dd3115def8fb5205de0028120dee63589db1644b9ba37e390d15cea0cac31014682ac8901e88b519684a03c686b93a702ada579 SHA512 b37984ec5578f4d7f9a43359ade30a621a22474ddbf46614de98e505ed16a62e8621d8c58a6470d66d0e0876db03a4181b259f7fc9468b883422d094c4a8af91
 DIST openrct2-openmusic-1.6.zip 42921141 BLAKE2B fff3ac6d944ed2021645c064de3daf88c11930bf8817e9c8620cfa73f2da076745dd5b5da36b616c8ee7b2ee0272228a88e264bf1ce948509dc90d77a7a87d5d SHA512 88e3242da45f372e06de04e58d03fc3d256b1485467a25a3f8878c03eb2570eea2c787a9e0416c1b040c15886723ced1379d762f941a23e4bd2fce81416123b0
 DIST openrct2-opensound-1.0.5.zip 4012384 BLAKE2B 7ddb1437d7e68373f05bd60d77f03971b8a1d6f4280d008d5bf3e86b5d2cb46001a04edddeeb04a06a37801c3afbd35926beb54fe5a72c7fa88b50d0a0b18535 SHA512 fc46ffb3f6243b3d783a280481ce373a8ddc8cf1fd28bfeceecf6223b72b38f1d49d0c95eea3376308a61a77c50c7a06252b6d72248cfecc493b63b65bd6512a
 DIST openrct2-replays-0.0.83.zip 1829681 BLAKE2B fd3a6ff457d45b0b429b667173c95753bdbf9ecd136a7ce16b516c701d88e436e1796c32d1aa5dc7837dd35ea8db5a89a2c42a99dcd5744b826ab32f98030f98 SHA512 43877cd8452049d4519f0d3fd49d9234195a3d3e38af9a880d43509f0a578e1fef0d428673fea1a9a8307d9917be3e3c4ca9d9e466584b6abd5193a366d5f569
diff --git a/games-simulation/openrct2/openrct2-0.4.18.ebuild b/games-simulation/openrct2/openrct2-0.4.18.ebuild
new file mode 100644
index 000000000000..ec8cfa5ba64b
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.4.18.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake readme.gentoo-r1 xdg-utils
+
+MY_PN="OpenRCT2"
+MY_PN_MSX="openmusic"
+MY_PN_OBJ="objects"
+MY_PN_RPL="replays"
+MY_PN_SFX="opensound"
+MY_PN_TS="title-sequences"
+MY_PV_MSX="1.6"
+MY_PV_OBJ="1.4.12"
+MY_PV_RPL="0.0.84"
+MY_PV_SFX="1.0.5"
+MY_PV_TS="0.4.14"
+
+DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
+HOMEPAGE="https://openrct2.org/"
+SRC_URI="
+	https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/${MY_PN}/${MY_PN_MSX}/releases/download/v${MY_PV_MSX}/${MY_PN_MSX}.zip -> ${PN}-${MY_PN_MSX}-${MY_PV_MSX}.zip
+	https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip
+	https://github.com/${MY_PN}/OpenSoundEffects/releases/download/v${MY_PV_SFX}/${MY_PN_SFX}.zip -> ${PN}-${MY_PN_SFX}-${MY_PV_SFX}.zip
+	https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip
+	test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip )
+"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="dedicated +flac +opengl scripting test +truetype +vorbis"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/icu:=
+	dev-libs/jansson:=
+	dev-libs/libzip:=
+	media-libs/libpng:=
+	net-misc/curl[ssl]
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl2
+		media-libs/speexdsp
+		flac? ( media-libs/flac:= )
+		opengl? ( virtual/opengl )
+		vorbis? ( media-libs/libvorbis )
+	)
+	dev-libs/openssl:0=
+	scripting? ( dev-lang/duktape:= )
+	truetype? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	dedicated? (
+		acct-group/openrct2
+		acct-user/openrct2
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-cpp/nlohmann_json
+	test? ( dev-cpp/gtest )
+"
+
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
+	"${FILESDIR}/${PN}-0.4.16-include-additional-paths.patch"
+)
+
+src_unpack() {
+	unpack "${P}".tar.gz
+
+	mkdir -p "${S}"/data || die
+	cd "${S}"/data
+	unpack "${PN}-${MY_PN_MSX}-${MY_PV_MSX}".zip
+	unpack "${PN}-${MY_PN_SFX}-${MY_PV_SFX}".zip
+
+	mkdir -p "${S}"/data/object || die
+	cd "${S}"/data/object || die
+	unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip
+
+	mkdir -p "${S}"/data/sequence || die
+	cd "${S}"/data/sequence || die
+	unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
+
+	if use test; then
+		mkdir -p "${S}"/testdata/replays || die
+		cd "${S}"/testdata/replays || die
+		unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Don't treat warnings as errors.
+	sed -e 's/-Werror//' -i CMakeLists.txt || die
+}
+
+src_configure() {
+	# Note: There is currently no support for Disord-RPC and Google Benchmark,
+	# as both packages do not exist in Gentoo, so support for them has been disabled.
+	local mycmakeargs=(
+		-DDISABLE_DISCORD_RPC=ON
+		$(usex !dedicated "-DDISABLE_FLAC=$(usex !flac)" "")
+		-DDISABLE_GOOGLE_BENCHMARK=ON
+		-DDISABLE_GUI=$(usex dedicated)
+		-DDISABLE_HTTP=OFF
+		-DDISABLE_IPO=ON
+		-DDISABLE_NETWORK=OFF
+		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
+		-DDISABLE_TTF=$(usex !truetype)
+		$(usex !dedicated "-DDISABLE_VORBIS=$(usex !vorbis)" "")
+		-DDOWNLOAD_OBJECTS=OFF
+		-DDOWNLOAD_OPENMSX=OFF
+		-DDOWNLOAD_OPENSFX=OFF
+		-DDOWNLOAD_REPLAYS=OFF
+		-DDOWNLOAD_TITLE_SEQUENCES=OFF
+		-DENABLE_SCRIPTING=$(usex scripting)
+		-DOPENRCT2_USE_CCACHE=OFF
+		-DPORTABLE=OFF
+		-DSTATIC=OFF
+		-DWITH_TESTS=$(usex test)
+		-DUSE_MMAP=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Since the tests need the OpenRCT2 data,
+	# we need to symlink them into the build directory,
+	# otherwise some tests will fail, as they don't find the OpenRCT2 data.
+	# It is currently not possible to override that path.
+	# See: https://github.com/OpenRCT2/OpenRCT2/issues/6473
+	ln -s "${S}"/data "${BUILD_DIR}" || die
+
+	cmake_src_test
+}
+
+src_install() {
+	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
+
+	cmake_src_install
+
+	if use dedicated; then
+		newinitd "${FILESDIR}"/openrct2.initd openrct2
+		newconfd "${FILESDIR}"/openrct2.confd openrct2
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index f8d36fc9b259..1e3b549e339b 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-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
@@ -15,7 +15,7 @@ MY_PN_RPL="replays"
 MY_PN_SFX="opensound"
 MY_PN_TS="title-sequences"
 MY_PV_MSX="1.6"
-MY_PV_OBJ="1.4.11"
+MY_PV_OBJ="1.4.12"
 MY_PV_RPL="0.0.84"
 MY_PV_SFX="1.0.5"
 MY_PV_TS="0.4.14"
diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
index 0e8c5a3fa7a6..cd15fa4679c8 100644
--- a/games-strategy/naev/Manifest
+++ b/games-strategy/naev/Manifest
@@ -1,3 +1,2 @@
-DIST naev-0.11.5-source.tar.xz 453774708 BLAKE2B 36debc50b54c8f8c47851484cba7768242f70eebe1ef24f789c1435ee421ace4767b8be2ffda281162b796100c45882d6d7d8e005415ebbd81f56530831ca827 SHA512 de4896f705d020ab2f2c3ffd6c16599365caa8b87dbca6288f9dbcec114e97ee775a03819b958fdd697b1232295c6f6339a89e1b5c6671942efe26ec2d439755
-DIST naev-0.12.0-source.tar.xz 463484668 BLAKE2B 4fc7a71625090d0b7f846933a26d768adc6ce05bddb6b49b829773c5bcea5ae1ec87026d9f07c1b7ba786f0b80bad9d01a6597e45b1d5f42faa4a371dff3b01c SHA512 1e0700f4ce58740490173f0b2a7e460b43fb269ebeeae54ffc3c8bada73b72fc0860083d2987868dee01b60ec110e7f39099b60367654d4bec04bf9b88ca57e2
 DIST naev-0.12.1-source.tar.xz 463479836 BLAKE2B 5643e66d88e078d242642d0010e2f001a29d248633f624364196749aa59ec32787bf23e1960784b9e81acf1c4309e7f0987f5afe2a2c12c257208822bc1cd174 SHA512 d6bbe25d930723fec1786f7160ef72091d1480714bdec2032a8d194aec281ca352eaab0a4b8af538b79068be972cf28fc81d681ff5659733cdc2044ad250a9df
+DIST naev-0.12.2-source.tar.xz 465301164 BLAKE2B 1a9af216a66677dbbdcf381eff9b638df47610e7a7e1ffe881234805594b40ebdf76adf413458b936a487a807f7238e1e45f2479fd8ae1fcca352cc584d48493 SHA512 898a1c4e820f1bad5b3abfdbf255d6a54363462e3eaf6bbcffd9f806398094100fa3776fb4bcbc8510b2a159cf73e49d9909213e671f979cbf7b4983e2f43b3e
diff --git a/games-strategy/naev/files/naev-0.12.0-nfd.patch b/games-strategy/naev/files/naev-0.12.0-nfd.patch
deleted file mode 100644
index 0a79232b1750..000000000000
--- a/games-strategy/naev/files/naev-0.12.0-nfd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/naev/naev/commit/b63510d4c7aa7126e6472a1f7a2b743000e6f476
-From: Jack Greiner <jack@emoss.org>
-Date: Mon, 23 Dec 2024 16:01:59 -0500
-Subject: [PATCH] meson.build: Fix using local installs of
- nativefiledialog-extended when building
-
---- a/meson.build
-+++ b/meson.build
-@@ -111,7 +111,7 @@ int main (void) { return 0; }''')
-    yaml = dependency('yaml-0.1', required: true, version: '>=0.2.5', fallback: ['libyaml', 'yaml_dep'], static: get_option('steamruntime'))
- 
-    # TODO replace nfd with SDL3 native functions when possible
--   nfd = dependency('nativefiledialog-extended', required: true, fallback: ['nativefiledialog-extended'], static: true)
-+   nfd = dependency('nfd', required: true, fallback: ['nativefiledialog-extended'], static: true)
- 
-    libxml2 = dependency('libxml-2.0', required: false)
-    if not libxml2.found()
diff --git a/games-strategy/naev/naev-0.11.5.ebuild b/games-strategy/naev/naev-0.11.5.ebuild
deleted file mode 100644
index da1c44d6a2ad..000000000000
--- a/games-strategy/naev/naev-0.11.5.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit lua-single meson python-any-r1 virtualx xdg
-
-DESCRIPTION="2D space trading and combat game, in a similar vein to Escape Velocity"
-HOMEPAGE="https://naev.org/"
-SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}-source.tar.xz"
-
-LICENSE="
-	GPL-3+
-	Apache-2.0 BSD BSD-2 CC-BY-2.0 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-3.0
-	CC-BY-SA-4.0 CC0-1.0 GPL-2+ MIT OFL-1.1 public-domain
-"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-# tests are very basic, equivalent of just starting the game and checking if
-# can see the main menu -- but this breaks easily with software rendering and
-# some Xorg/mesa versions, simpler to do manually than try to keep this working
-RESTRICT="test"
-
-# dlopen: libglvnd
-RDEPEND="
-	${LUA_DEPS}
-	dev-games/physfs
-	dev-libs/libpcre2:=
-	dev-libs/libunibreak:=
-	dev-libs/libxml2
-	media-libs/freetype:2
-	media-libs/libglvnd
-	media-libs/libsdl2[joystick,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	media-libs/sdl2-image[png,webp]
-	net-libs/enet:1.3=
-	sci-libs/cholmod
-	sci-libs/cxsparse
-	sci-libs/openblas
-	sci-libs/suitesparse
-	sci-mathematics/glpk:=
-	virtual/libintl
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-games/physfs[zip]
-		media-libs/libsdl2[X]
-	)
-"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	sys-devel/gettext
-	doc? (
-		app-text/doxygen
-		dev-lua/ldoc
-		media-gfx/graphviz
-	)
-	test? (
-		media-libs/mesa[llvm]
-		x11-base/xorg-server[-minimal]
-	)
-"
-
-python_check_deps() {
-	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	lua-single_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# use eclass' generated lua.pc first rather than as fallback
-	sed -i "s/'lua51'/'lua'/" meson.build || die
-
-	# don't probe OpenGL for tests (avoids sandbox violations, bug #829369)
-	sed -i "/subdir('glcheck')/d" test/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature doc docs_c)
-		$(meson_feature doc docs_lua)
-		$(meson_feature lua_single_target_luajit luajit)
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	local DOCS=( CHANGELOG Readme.md )
-	meson_src_install
-
-	if use doc; then
-		dodir /usr/share/doc/${PF}/html
-		mv -- "${ED}"/usr/{doc/naev/{c,lua},share/doc/${PF}/html} || die
-		rm -r -- "${ED}"/usr/doc || die
-	fi
-
-	rm -r -- "${ED}"/usr/share/doc/naev || die
-}
diff --git a/games-strategy/naev/naev-0.12.0.ebuild b/games-strategy/naev/naev-0.12.0.ebuild
deleted file mode 100644
index 31298e490603..000000000000
--- a/games-strategy/naev/naev-0.12.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit lua-single meson python-any-r1 virtualx xdg
-
-DESCRIPTION="2D space trading and combat game, in a similar vein to Escape Velocity"
-HOMEPAGE="https://naev.org/"
-SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}-source.tar.xz"
-
-LICENSE="
-	GPL-3+
-	Apache-2.0 BSD BSD-2 CC-BY-2.0 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-3.0
-	CC-BY-SA-4.0 CC0-1.0 GPL-2+ MIT OFL-1.1 public-domain
-"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-# tests are very basic, equivalent of just starting the game and checking if
-# can see the main menu -- but this breaks easily with software rendering and
-# some Xorg/mesa versions, simpler to do manually than try to keep this working
-RESTRICT="test"
-
-# dlopen: libglvnd
-RDEPEND="
-	${LUA_DEPS}
-	app-text/cmark:=
-	dev-games/physfs
-	dev-libs/libpcre2:=
-	dev-libs/libunibreak:=
-	dev-libs/libxml2
-	dev-libs/libyaml
-	dev-libs/nativefiledialog-extended
-	media-libs/freetype:2
-	media-libs/libglvnd
-	media-libs/libsdl2[joystick,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	media-libs/sdl2-image[png,webp]
-	net-libs/enet:1.3=
-	sci-libs/cholmod
-	sci-libs/cxsparse
-	sci-libs/openblas
-	sci-libs/suitesparse
-	sci-mathematics/glpk:=
-	virtual/libintl
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-games/physfs[zip]
-		media-libs/libsdl2[X]
-	)
-"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	sys-devel/gettext
-	doc? (
-		app-text/doxygen
-		dev-lua/ldoc
-		media-gfx/graphviz
-	)
-	test? (
-		media-libs/mesa[llvm]
-		x11-base/xorg-server[-minimal]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-nfd.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	lua-single_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# don't probe OpenGL for tests (avoids sandbox violations, bug #829369)
-	sed -i "/subdir('glcheck')/d" test/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		# *can* do lua5-1 but upstream uses+test luajit most (bug #946881)
-		-Dluajit=enabled
-		$(meson_feature doc docs_c)
-		$(meson_feature doc docs_lua)
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	local DOCS=( CHANGELOG Readme.md )
-	meson_src_install
-
-	if use doc; then
-		dodir /usr/share/doc/${PF}/html
-		mv -- "${ED}"/usr/{doc/naev/{c,lua},share/doc/${PF}/html} || die
-		rm -r -- "${ED}"/usr/doc || die
-	fi
-
-	rm -r -- "${ED}"/usr/share/doc/naev || die
-}
diff --git a/games-strategy/naev/naev-0.12.2.ebuild b/games-strategy/naev/naev-0.12.2.ebuild
new file mode 100644
index 000000000000..bd285077a6fe
--- /dev/null
+++ b/games-strategy/naev/naev-0.12.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{10..13} )
+inherit lua-single meson python-any-r1 xdg
+
+DESCRIPTION="2D space trading and combat game, in a similar vein to Escape Velocity"
+HOMEPAGE="https://naev.org/"
+SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}-source.tar.xz"
+
+LICENSE="
+	GPL-3+
+	Apache-2.0 BSD BSD-2 CC-BY-2.0 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-3.0
+	CC-BY-SA-4.0 CC0-1.0 GPL-2+ MIT OFL-1.1 public-domain
+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+# tests are very basic, equivalent to just starting the game and checking if
+# can see the main menu -- but this breaks easily with software rendering and
+# some Xorg/mesa versions, simpler to do manually than try to keep this working
+RESTRICT="test"
+
+# dlopen: libglvnd
+RDEPEND="
+	${LUA_DEPS}
+	app-text/cmark:=
+	dev-games/physfs
+	dev-libs/libpcre2:=
+	dev-libs/libunibreak:=
+	dev-libs/libxml2
+	dev-libs/libyaml
+	dev-libs/nativefiledialog-extended
+	media-libs/freetype:2
+	media-libs/libglvnd
+	media-libs/libsdl2[joystick,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/sdl2-image[png,webp]
+	net-libs/enet:1.3=
+	sci-libs/cholmod
+	sci-libs/cxsparse
+	sci-libs/openblas
+	sci-libs/suitesparse
+	sci-mathematics/glpk:=
+	virtual/libintl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	sys-devel/gettext
+	doc? (
+		app-text/doxygen
+		dev-lua/ldoc
+		media-gfx/graphviz
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	lua-single_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# don't probe OpenGL for tests (avoids sandbox violations, bug #829369)
+	sed -i "/subdir('glcheck')/d" test/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		# *can* do lua5-1 but upstream uses+test luajit most (bug #946881)
+		-Dluajit=enabled
+		$(meson_feature doc docs_c)
+		$(meson_feature doc docs_lua)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	local DOCS=( CHANGELOG Readme.md )
+	meson_src_install
+
+	if use doc; then
+		dodir /usr/share/doc/${PF}/html
+		mv -- "${ED}"/usr/{doc/naev/{c,lua},share/doc/${PF}/html} || die
+		rm -r -- "${ED}"/usr/doc || die
+	fi
+
+	rm -r -- "${ED}"/usr/share/doc/naev || die
+}
diff --git a/games-util/cartridges/Manifest b/games-util/cartridges/Manifest
index c5e78b84480f..3c23e499d789 100644
--- a/games-util/cartridges/Manifest
+++ b/games-util/cartridges/Manifest
@@ -1 +1,2 @@
+DIST cartridges-2.11.tar.gz 2303903 BLAKE2B dbb6b0349e9301585dede3a07d254258d4559bbc88f1451e498fe9f98ebcf95db91e15feaab362d67f0afec4f31e0ee18a3ee327318c1cb1f5a104ea2854a807 SHA512 ba1b23c1a2c3e73fd293c33c4ace804bb464df5c26e435c7ad9a1b8fc2f46be7ad1a46478919cd11274c69589acf06a8f0d65efcd2e0bfb90c3e2633c32417f3
 DIST cartridges-2.9.3.tar.gz 2290701 BLAKE2B 0e9700e7ab78b303e6f8a50654053233f72a4e684cbee529af252a027ade1dd7d9496c6d7539c177959fd55628b9b35d785daa1152f192edf2f477e11f08d0bf SHA512 9fa9c2492b05e03379e6ead44273f1a566ad3aa25365eb5137fef6d6bc50a3e8c4937ac732609a9e72bb6cbd6d139df075ac1ebf3bfd8e2a17883f69352dbd75
diff --git a/games-util/cartridges/cartridges-2.11.ebuild b/games-util/cartridges/cartridges-2.11.ebuild
new file mode 100644
index 000000000000..8bcb60addec5
--- /dev/null
+++ b/games-util/cartridges/cartridges-2.11.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit gnome2-utils python-single-r1 meson xdg
+
+DESCRIPTION="Simple game launcher written in Python using GTK4 and Libadwaita"
+HOMEPAGE="https://github.com/kra-mo/cartridges/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/kra-mo/${PN}.git"
+else
+	SRC_URI="https://github.com/kra-mo/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+RESTRICT="test"             # Just appstream file validation that uses network.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=gui-libs/gtk-4.16.12:4[introspection]
+	>=gui-libs/libadwaita-1.6.2:1[introspection]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	dev-libs/appstream-glib
+	dev-util/blueprint-compiler
+	dev-util/desktop-file-utils
+"
+
+src_install() {
+	meson_src_install
+
+	python_fix_shebang "${ED}/usr/bin"
+	python_optimize "${ED}/usr"
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
diff --git a/games-util/lgogdownloader/lgogdownloader-3.16-r1.ebuild b/games-util/lgogdownloader/lgogdownloader-3.16-r1.ebuild
index 77314984dd49..e231df5f2241 100644
--- a/games-util/lgogdownloader/lgogdownloader-3.16-r1.ebuild
+++ b/games-util/lgogdownloader/lgogdownloader-3.16-r1.ebuild
@@ -38,8 +38,8 @@ DEPEND="
 "
 
 BDEPEND="
-	dev-qt/qtbase:6
 	virtual/pkgconfig
+	gui? ( dev-qt/qtbase:6 )
 "
 
 src_configure() {
diff --git a/games-util/lgogdownloader/lgogdownloader-9999.ebuild b/games-util/lgogdownloader/lgogdownloader-9999.ebuild
index 77314984dd49..e231df5f2241 100644
--- a/games-util/lgogdownloader/lgogdownloader-9999.ebuild
+++ b/games-util/lgogdownloader/lgogdownloader-9999.ebuild
@@ -38,8 +38,8 @@ DEPEND="
 "
 
 BDEPEND="
-	dev-qt/qtbase:6
 	virtual/pkgconfig
+	gui? ( dev-qt/qtbase:6 )
 "
 
 src_configure() {
diff --git a/games-util/xpadneo/xpadneo-0.9.7.ebuild b/games-util/xpadneo/xpadneo-0.9.7.ebuild
index 3327d7fff523..1daeda7486f6 100644
--- a/games-util/xpadneo/xpadneo-0.9.7.ebuild
+++ b/games-util/xpadneo/xpadneo-0.9.7.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 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_MIN_CLONE_TYPE="single"
 else
 	SRC_URI="https://github.com/atar-axis/xpadneo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Advanced Linux Driver for Xbox One Wireless Controller"
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 1aa61d901059..0d1035162c04 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,3 +1,3 @@
 DIST gsettings-desktop-schemas-45.0.tar.xz 750056 BLAKE2B b65c846654fac5a104ad9a7d67546c6fb3d54aada178d58c575d22a8c2adc0057c1f1dc177562740f7ae94d0e17743789ca902db7c2fcc42c844bb66e401eaec SHA512 b3e00164aa47cf19b53bf8fd9cd9526c0a4f3d770e8c77953dba0bdf49b85d56f87f45254d18260e7a7b0ec7e24fc049fde503a1ea93e87946dbbd53b5dfc0f2
-DIST gsettings-desktop-schemas-46.0.tar.xz 767460 BLAKE2B 537b37640c17aa8338e2bb520fb1a8184c74a5cb28d6b7d9fa35393c0a76a4a144f6518b58546393c39a9f57889bcb99decc0e9bfbf4a1969c44ecf89462c4ee SHA512 04d43ce3885741afdda2d971ef61332474a114e2b7f82d28e5fb7c831992f95359e3edb1bf60f39d29b5ad509a77d65b76d482c9659cbdd1f7bb1e07c86da912
 DIST gsettings-desktop-schemas-46.1.tar.xz 779204 BLAKE2B dd422905dc029967f452080b2c605937518637c65d0a6eb4ce7ca32d9622fe4f64337416cd3396e25365c3969cafc0c4ccf7cf73cb8defd471d13dfac3b0aec6 SHA512 365ab5501450653cf11730dc1b6428f76549d8733d4d8d4f88fa84ff5c114c2a8883edae20c70280d0022974cb0813c2b6b66c359a6de7d79151d0a59d5aa408
+DIST gsettings-desktop-schemas-47.1.tar.xz 806272 BLAKE2B 8a67f6da435c30b87c172ae12b1cce7d614f2804eb3135d6c36d144adce697aec13f9861ff15edf6a55c20f96cf51b0a9bbdcbdd6de65c327bc8cd13888fe389 SHA512 8c4575958f6dd351e4a1a60d61f9080933979942b2fcef5c1211ab508b99a91325c857a9ac8d92e372968fad4736d55aa7b746f185aae9ecd1f691ced9ff53a0
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-46.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-46.0.ebuild
deleted file mode 100644
index 01c317aa9299..000000000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-46.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+introspection"
-
-BDEPEND="
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases
-	"${FILESDIR}"/3.32.0-default-fonts.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-47.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-47.1.ebuild
new file mode 100644
index 000000000000..86ea349bde57
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-47.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+introspection"
+
+BDEPEND="
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases
+	"${FILESDIR}"/3.32.0-default-fonts.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index e8b743374957..4401cc675e3e 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-calculator-45.0.2.tar.xz 1100744 BLAKE2B a013985dc6227ae1a3bff30d92740ea4b18765ce5486171a0d0aaf3feae89357f1fe47ede26175a546a01e5b49206a2768de9f5cd62de8f1ee01645bae213614 SHA512 93248846f285badd4ef4303a31cfa6926deb1d37b0ba8ef7b1971795e092c115004c6bb666469a9e8e02a8e55e8f44d34cff6b88c0816888dc42c36fa1148b2e
 DIST gnome-calculator-46.1.tar.xz 1121236 BLAKE2B b6dbd7b0d7cb38f0f9081fcf409b5e7df0d45cfcee5220880d9971066ac9984cb439e74ebc8fa6c73c6c9b7e2ece6aa4db3503da4f5ecab7c5d6fd5b5ca452a3 SHA512 b859a35e614ea5415fbb7a03663f1bf184e7f108882c2093511142d8c067e42f6dd11973cc047552bdd9a74d8ee7e39a00ca42009bea739d2b088b2f90affde1
+DIST gnome-calculator-47.1.tar.xz 1107576 BLAKE2B 9a14df81609c6cd4c002761ea27acbf0e4c64443c9e2b786886fff981eccf1f582bd4c20b5f519036a536b472b832e7b19e816fba8281ea69f8e97b0ea8b6cf2 SHA512 674e34ab29fb18c98a1db3391ab0e95bbb81fac4692bff6d69c4aea3678cfcea65bbbd903ef937d3eba30148124de73c07a5e41d67d40571a2ab1f1287739a13
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-45.0.2.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-45.0.2.ebuild
deleted file mode 100644
index 9a46335c529e..000000000000
--- a/gnome-extra/gnome-calculator/gnome-calculator-45.0.2.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 gnome.org gnome2-utils meson vala virtualx xdg
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+introspection test"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-
-# gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
-# altogether, thus we need them installed by gtksourceview[vala]
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	dev-libs/libxml2:2
-	net-libs/libsoup:3.0
-	>=dev-libs/libgee-0.20.0:0.8=
-	dev-libs/mpc:=
-	dev-libs/mpfr:0=
-	>=gui-libs/gtk-4.4.1:4
-	>=gui-libs/libadwaita-1.4_alpha:1
-	>=gui-libs/gtksourceview-5.3.0:5
-	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	net-libs/libsoup:3.0[vala]
-	gui-libs/gtksourceview:5[vala]
-	gui-libs/libhandy:1[vala]
-"
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddisable-ui=false
-		#-Dvala-version # doesn't do anything in 3.34
-		$(meson_use !introspection disable-introspection)
-		$(meson_use test ui-tests)
-		-Dgcalc=true
-		-Dgci=true
-		-Dapp=true
-		-Ddoc=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	XDG_SESSION_TYPE=x11 virtx dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-47.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-47.1.ebuild
new file mode 100644
index 000000000000..c9f5cc6578a3
--- /dev/null
+++ b/gnome-extra/gnome-calculator/gnome-calculator-47.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson vala virtualx xdg
+
+DESCRIPTION="A calculator application for GNOME"
+HOMEPAGE="https://apps.gnome.org/Calculator/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+introspection test"
+
+# gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
+# altogether, thus we need them installed by gtksourceview[vala]
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-3.4.0:3.0
+	>=dev-libs/libgee-0.20.0:0.8=
+	dev-libs/mpc:=
+	dev-libs/mpfr:0=
+	>=gui-libs/gtk-4.15.2:4
+	>=gui-libs/libadwaita-1.6_beta:1
+	>=gui-libs/gtksourceview-5.3.0:5
+	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	net-libs/libsoup:3.0[vala]
+	gui-libs/gtksourceview:5[vala]
+	gui-libs/libadwaita:1[vala]
+"
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddisable-ui=false
+		#-Dvala-version # doesn't do anything in 3.34
+		$(meson_use !introspection disable-introspection)
+		$(meson_use test ui-tests)
+		-Dgcalc=true
+		-Dgci=true
+		-Dapp=true
+		-Ddoc=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	XDG_SESSION_TYPE=x11 virtx dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index 524eac6d72ff..d851450339de 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-calendar-45.1.tar.xz 456436 BLAKE2B 7d095314887c055834c6cbba13a6070eedf521b737976b46c184f09d1fd40ac1f07a436fd8d72174d0ea4cf070bc6acd6e0d81e2630839bd3774cdf751cdf1a4 SHA512 372abcf94c7b49980c9d1a5f7ee6cea1e34760337f2ab8886fdb3207fd3d87f4c45feecfa9156f6f8596f395af8d02469c2db53acf6b718735db94221af8c623
 DIST gnome-calendar-46.1.tar.xz 492432 BLAKE2B 768a68563343de209b90a04301ff67246fa16f493187c781f70278c5560c89fdda4e926afd840a6b7ad3b1c7ce98af486b2e1dacfb8a72e0a12a0c7828557a8a SHA512 79e863d7bd1e31eab16b5da77cac956886be10ded99de97875e118641a8582c245cb30e9872fb7abde2f434e4b559f43e18a5ecf6d52cdce5d7de84f6f9e06b8
+DIST gnome-calendar-47.0.tar.xz 513128 BLAKE2B dc83b102c0b73138ffbecea0519e2519815708048f58ecb018af3a1e45bb3411a9f734f78babdb54e4daf6017f1024db5073b888c767cedfd03bfe4fbbe57889 SHA512 6cc6eca2642580b8ce9c49f7924f565f82bc5ffca41718b1db7358001f71ee2b06ed6f354b068d2629dc30b229822dc2c9ca425cafa96958524dd8116ff5a79f
diff --git a/gnome-extra/gnome-calendar/files/gnome-calendar-45.1-c99.patch b/gnome-extra/gnome-calendar/files/gnome-calendar-45.1-c99.patch
deleted file mode 100644
index 1a3411d335fa..000000000000
--- a/gnome-extra/gnome-calendar/files/gnome-calendar-45.1-c99.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/926638
-https://gitlab.gnome.org/GNOME/gnome-calendar/-/commit/2c33d98d82386b0d5e9057c8ba532efc6e202818
-
-From 2c33d98d82386b0d5e9057c8ba532efc6e202818 Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Mon, 26 Feb 2024 11:55:29 +0000
-Subject: [PATCH] weather-service: Fix incompatible pointer types
-
---- a/src/weather/gcal-weather-service.c
-+++ b/src/weather/gcal-weather-service.c
-@@ -486,8 +486,8 @@ preprocess_gweather_reports (GcalWeatherService *self,
-   GSList *iter = NULL;    /* unowned */
-   GDate cur_gdate;
-   glong first_tomorrow_dtime = -1;
--  glong today_unix;
--  glong unix_now;
-+  gint64 today_unix;
-+  gint64 unix_now;
-   guint i;
- 
-   /*
--- 
-GitLab
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-45.1-r1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-45.1-r1.ebuild
deleted file mode 100644
index b66fe322a3fd..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-45.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Manage your online calendars with simple and modern interface"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
-
-DEPEND="
-	>=dev-libs/libical-1.0.1:0=
-	>=gnome-base/gsettings-desktop-schemas-3.21.2
-	>=gnome-extra/evolution-data-server-3.45.1:=[gtk]
-	net-libs/libsoup:3.0
-	>=gui-libs/libadwaita-1.4_alpha:1
-	>=dev-libs/glib-2.67.5:2
-	>=gui-libs/gtk-4.11.2:4
-	>=dev-libs/libgweather-4.2.0:4=
-	>=app-misc/geoclue-2.4:2.0
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/gnome-calendar-45.1-c99.patch
-)
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-47.0.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-47.0.ebuild
new file mode 100644
index 000000000000..9d8710cfec52
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-47.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 gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Manage your calendars with simple and modern interface"
+HOMEPAGE="https://apps.gnome.org/Calendar/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-libs/libical-1.0.1:0=
+	>=gnome-base/gsettings-desktop-schemas-3.21.2
+	>=gnome-extra/evolution-data-server-3.45.1:=[gtk]
+	net-libs/libsoup:3.0
+	>=gui-libs/libadwaita-1.6_alpha:1
+	>=dev-libs/glib-2.67.5:2
+	>=gui-libs/gtk-4.15.2:4
+	>=dev-libs/libgweather-4.2.0:4=
+	>=app-misc/geoclue-2.4:2.0
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index 4316fe0e5e44..0465b65b6859 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-characters-45.0.tar.xz 590000 BLAKE2B 65c05381ae12ea934c09b91d8e58342ca76087703ca5ede0dadfe8c739f4d3152acad1bfa4fc8c5f169fe069fbe12c59f3f70ee242d06ffddfa496535180ef0b SHA512 e7fa6c6caa684ab13c61d6fbf9dee69c0b67f8680dd27b130aaa2248a490e7b234ee541af56fdc6a5d56158636760b25da30a0d479d7f7f5403c35916f93a8ce
 DIST gnome-characters-46.0.tar.xz 592080 BLAKE2B 0c368b2fb59a2fc3e93afb69a2471fd2342640eaa546d4a1e069f94d42bfabb4e6b42668a468010e694a9ca93c164ea8f853347873b43b36dd39d8b12b51f1af SHA512 a68f0c50ffd0beef38423e8a2a2d28ffeee5f001877e77cbb7558dbba53151ceac9545c961f4523ec0e7a7d93cb20da92199b6901b53464f25505c81462eb942
+DIST gnome-characters-47.0.tar.xz 601256 BLAKE2B 038439f6bbe7ccfe432fce628b35912b3b98fc499a8ec9a6fd6c48c9bd17005737a0ab614fc2e96c9ecc4e9151d3e9386af18bc10a25b5acfafb75de133385f1 SHA512 b869788bdb12e0401c56a54bd2c15b7adfb59962593bed7085788fa98591663769ce8d8ee038b541fbef479c6d73556376cb12c95f8a1bb5ebb23793507e2d3c
diff --git a/gnome-extra/gnome-characters/gnome-characters-45.0-r1.ebuild b/gnome-extra/gnome-characters/gnome-characters-45.0-r1.ebuild
deleted file mode 100644
index c83c0a806230..000000000000
--- a/gnome-extra/gnome-characters/gnome-characters-45.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
-
-LICENSE="GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/gjs-1.50
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=gui-libs/gtk-4.6:4[introspection]
-	>=gui-libs/libadwaita-1.2:1=
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.36[introspection]
-	gnome-base/gnome-desktop:4
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/glib
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( x11-misc/xvfb-run )
-"
-
-src_test() {
-	meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-characters/gnome-characters-47.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-47.0.ebuild
new file mode 100644
index 000000000000..2852c832cf46
--- /dev/null
+++ b/gnome-extra/gnome-characters/gnome-characters-47.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://apps.gnome.org/Characters/"
+
+LICENSE="GPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/gjs-1.50
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=gui-libs/gtk-4.6:4[introspection]
+	>=gui-libs/libadwaita-1.5_alpha:1=
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.36[introspection]
+	gnome-base/gnome-desktop:4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/glib
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( x11-misc/xvfb-run )
+"
+
+src_test() {
+	meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index 8f851d727098..3fd70bed3bd3 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-clocks-45.0.tar.xz 456820 BLAKE2B c88472cec03246192dbc765cb7896d2771c0cae49249687a06e8382289339cd24a7fe65266d0d2a8834d0956a043c14c4b60c646cab4183e9530ea74915d95d8 SHA512 c030947bbba03ed3815a2ed62356a8aa54ec130bf8a7fe17e028af3b27fa8c6f02d365267e466867fea6e4daa36907193e0fb07c04ce0c390f20e01d4a6e716f
 DIST gnome-clocks-46.0.tar.xz 461960 BLAKE2B 102099e5098e7677a7f65324523c26fd5253f4b992a5b8a1f40b298c5f878bf564f55955f1c14db8993fb9323934b8dbb392c23d2f1c1c7f45ef5bfeab94c3e2 SHA512 37e91c6355d21be94386f5ad7266998c87f138ab5d4274d5caf08a9941499944d8c3ee2d44fb6654a227cb48665ad9ee2ed0f919cb03a1122d7c1ed935cfc353
+DIST gnome-clocks-47.0.tar.xz 461340 BLAKE2B 6c60740cc2afcef57d18447702d3bbfef9bdf21b5150aad1dc6d678153c5d7fd76e4d6d616a7234610563576864e18a970e354a617b3b8a8a6c73a974fb1f932 SHA512 325e1804a80e73f95c8b016e78778c81cd177644694de071d5d7d227494ed7a92f1021179c47001415ddd69883eea081733ca592389626977d7fa9f2fe98a6f8
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-45.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-45.0.ebuild
deleted file mode 100644
index 6a8e8df83afc..000000000000
--- a/gnome-extra/gnome-clocks/gnome-clocks-45.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Clocks application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Clocks https://gitlab.gnome.org/GNOME/gnome-clocks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.72:2
-	>=gui-libs/gtk-4.5:4
-	>=dev-libs/libgweather-4.2.0:4=
-	gnome-base/gnome-desktop:4=
-	>=sci-geosciences/geocode-glib-1:2
-	>=app-misc/geoclue-2.4:2.0
-	>=gui-libs/libadwaita-1.4_alpha:1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	>=dev-libs/libgweather-4.2.0:4[vala]
-	gui-libs/libadwaita:1[vala]
-"
-
-DOCS=( AUTHORS.md CONTRIBUTING.md README.md )
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dprofile=default
-		-Ddocs=false
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-47.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-47.0.ebuild
new file mode 100644
index 000000000000..005eb87a2bf3
--- /dev/null
+++ b/gnome-extra/gnome-clocks/gnome-clocks-47.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Clocks application for GNOME"
+HOMEPAGE="https://apps.gnome.org/Clocks/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.72:2
+	>=gui-libs/gtk-4.5:4
+	>=dev-libs/libgweather-4.2.0:4=
+	gnome-base/gnome-desktop:4=
+	>=sci-geosciences/geocode-glib-1:2
+	>=app-misc/geoclue-2.4:2.0
+	>=gui-libs/libadwaita-1.5:1
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	>=dev-libs/libgweather-4.2.0:4[vala]
+	gui-libs/libadwaita:1[vala]
+"
+
+DOCS=( AUTHORS.md CONTRIBUTING.md README.md )
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dprofile=default
+		-Ddocs=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 98b40f2b486a..5fbde73ae748 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-contacts-45.1.tar.xz 402748 BLAKE2B 02cb3fd3ebcfd4e33add4706b1746940a14d680697ddaf54f9e006a14c15e7a11f791af2704b40573b59c6348ba3f1e1e216b514b1bc5fed990f0e8eaf1dc45b SHA512 87fc5b235e955ca347950306d37d0d8aea71dbcdb0f8d5c45d96da3a316f5e40da6004d6c5ab3674acdf7237f81bd508486c90130d01b045ee0c0582b04ba8aa
 DIST gnome-contacts-46.0.tar.xz 410040 BLAKE2B bff36046bf6a37d5550458d55078ec2dfc0704c31365e925788ed64cf03af88ae73be45e256c770fdbc43e65dba5487812fafe169168c2ef625853eaeff17e90 SHA512 adadbb4038053e402f131f530b61fa1c33008eac819d2c03e0a024080bc7e5e24b022a0e9d773ffa03e20324296338d1c3115d25a39f6a3fddd4480de3c8980e
+DIST gnome-contacts-47.1.1.tar.xz 423676 BLAKE2B 49e43b2bb634e1158799056797e55ae6248fe0518dcdd1d5975810f278b149db75469d48e1f0c02b39e8bfe918b5b0578956149180c1665b323325d6eede55aa SHA512 e03588a82a6ce12d81cb7e346dee59a8e6b56365425c6ff172d4f4ce0b08cfae521dd279aca299d0c9938a832bfbe631a87e83d4a83daff8c5464d6173ae7ea3
diff --git a/gnome-extra/gnome-contacts/files/45.1-clang.patch b/gnome-extra/gnome-contacts/files/45.1-clang.patch
deleted file mode 100644
index a708f8f926a5..000000000000
--- a/gnome-extra/gnome-contacts/files/45.1-clang.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-From a6ad56a6151f29ceaf6fda3c547c143645e1060f Mon Sep 17 00:00:00 2001
-From: Niels De Graef <nielsdegraef@gmail.com>
-Date: Sun, 18 Feb 2024 11:49:32 +0100
-Subject: [PATCH] Avoid using return*_if_fail/reached() macros in Vala
-
-`g_return_if_fail()`, `g_return_val_if_fail()` (and similarly
-`g_return_if_reached()` are often used in GLib C to denote a
-precondition or soft assertion for a specific place in the code, often
-pointing to a programmer error if the condition fails.
-
-Vala also binds to these methods, but unfortunately, they're a bit less
-useful: the error message it prints only shows the "compiled" temporary
-variable (e.g. `_tmp4_ != NULL`) rather than the actual value, and more
-importantly, it skips some type strictness checks when compiling to C
-(for example, allowing to return nothing in a function that expects a
-boolean return value).
-
-This commit avoids those macros in several ways:
-- Throwing an error for unsupported code paths
-- Using the `requires()` construct in Vala, which is a similar construct
-  to that of GLib, but specific to Vala (but can only be used at the
-  function signature level)
-- For other points in the code, we fall back to `warn_if_fail()`, which
-  still suffers from the problem of printing temporary variables, but at
-  least doesn't fail any type checks.
-
-Fixes: https://gitlab.gnome.org/GNOME/gnome-contacts/-/issues/340
----
- src/contacts-contact-editor.vala        |  4 ++--
- src/contacts-contact-sheet.vala         |  6 +++---
- src/contacts-import-operation.vala      |  2 +-
- src/contacts-main-window.vala           | 19 +++++++++----------
- src/contacts-persona-filter.vala        |  6 +++---
- src/contacts-query-filter.vala          |  6 +++---
- src/core/contacts-bin-chunk.vala        |  2 +-
- src/core/contacts-chunk.vala            |  3 +--
- src/io/contacts-io-parse-operation.vala |  2 +-
- 9 files changed, 24 insertions(+), 26 deletions(-)
-
-diff --git a/src/contacts-contact-editor.vala b/src/contacts-contact-editor.vala
-index 195eaa0e..5ac9b3d7 100644
---- a/src/contacts-contact-editor.vala
-+++ b/src/contacts-contact-editor.vala
-@@ -126,7 +126,7 @@ public class Contacts.PersonaEditor : Gtk.Widget {
-       return ((Chunk) item).persona == this.persona;
-     });
-     var persona_model = new Gtk.FilterListModel (this.contact, (owned) persona_filter);
--    return_if_fail (persona_model.get_n_items () > 0);
-+    warn_if_fail (persona_model.get_n_items () > 0);
- 
-     // Show all properties that we either ...
-     var filter = new Gtk.AnyFilter ();
-@@ -208,7 +208,7 @@ public class Contacts.PersonaEditor : Gtk.Widget {
-     while (current_position < position) {
-       child = child.get_next_sibling ();
-       // If this fails, we somehow have less widgets than items in our model
--      return_if_fail (child != null);
-+      warn_if_fail (child != null);
-       current_position++;
-     }
- 
-diff --git a/src/contacts-contact-sheet.vala b/src/contacts-contact-sheet.vala
-index 2c49bb66..092466ab 100644
---- a/src/contacts-contact-sheet.vala
-+++ b/src/contacts-contact-sheet.vala
-@@ -49,13 +49,13 @@ public class Contacts.ContactSheet : Gtk.Widget {
-     // Get the widget where we'll have to append the item at "position". Note
-     // that we need to take care of the header and the persona store titles
-     unowned var child = get_first_child ();
--    return_if_fail (child != null); // Header is always available
-+    warn_if_fail (child != null); // Header is always available
- 
-     uint current_position = 0;
-     while (current_position < position) {
-       child = child.get_next_sibling ();
-       // If this fails, we somehow have less widgets than items in our model
--      return_if_fail (child != null);
-+      warn_if_fail (child != null);
- 
-       // Ignore persona store labels
-       if (child is Gtk.Label)
-@@ -67,7 +67,7 @@ public class Contacts.ContactSheet : Gtk.Widget {
-     // First, remove the ones that were removed from the model too
-     while (removed != 0) {
-       unowned var to_remove = child.get_next_sibling ();
--      return_if_fail (to_remove != null); // if this happens we're out of sync
-+      warn_if_fail (to_remove != null); // if this happens we're out of sync
-       to_remove.unparent ();
-       removed--;
-     }
-diff --git a/src/contacts-import-operation.vala b/src/contacts-import-operation.vala
-index bf8032da..54a29a3d 100644
---- a/src/contacts-import-operation.vala
-+++ b/src/contacts-import-operation.vala
-@@ -56,6 +56,6 @@ public class Contacts.ImportOperation : Operation {
-   }
- 
-   public override async void _undo () throws GLib.Error {
--    return_if_reached ();
-+    throw new IOError.NOT_SUPPORTED ("Undoing an import operation is not supported");
-   }
- }
-diff --git a/src/contacts-main-window.vala b/src/contacts-main-window.vala
-index 42c51e65..d8ddda2b 100644
---- a/src/contacts-main-window.vala
-+++ b/src/contacts-main-window.vala
-@@ -233,12 +233,11 @@ public class Contacts.MainWindow : Adw.ApplicationWindow {
-     this.actions_bar.reveal_child = (this.state == UiState.SELECTING);
-   }
- 
--  private void edit_contact (GLib.SimpleAction action, GLib.Variant? parameter) {
--    unowned var selected = get_selected_individual ();
--    return_if_fail (selected != null);
-+  private void edit_contact (GLib.SimpleAction action, GLib.Variant? parameter)
-+      requires (get_selected_individual () != null) {
- 
-+    unowned var selected = get_selected_individual ();
-     this.state = UiState.UPDATING;
--
-     var title = _("Editing %s").printf (selected.display_name);
-     this.contact_pane_page.title = title;
-     this.contact_pane.edit_contact ();
-@@ -258,10 +257,10 @@ public class Contacts.MainWindow : Adw.ApplicationWindow {
-     unmark_action.set_enabled (favorite);
-   }
- 
--  private void set_selection_is_favorite (bool favorite) {
--    unowned var selected = get_selected_individual ();
--    return_if_fail (selected != null);
-+  private void set_selection_is_favorite (bool favorite)
-+      requires (get_selected_individual () != null) {
- 
-+    unowned var selected = get_selected_individual ();
-     selected.is_favourite = favorite;
- 
-     update_favorite_actions (favorite);
-@@ -282,10 +281,10 @@ public class Contacts.MainWindow : Adw.ApplicationWindow {
-     this.list_pane_page.title = left_title;
-   }
- 
--  private void unlink_contact (GLib.SimpleAction action, GLib.Variant? parameter) {
--    unowned Individual? selected = get_selected_individual ();
--    return_if_fail (selected != null);
-+  private void unlink_contact (GLib.SimpleAction action, GLib.Variant? parameter)
-+      requires (get_selected_individual () != null) {
- 
-+    unowned var selected = get_selected_individual ();
-     this.selection_model.selected.unselect_all ();
-     this.state = UiState.NORMAL;
- 
-diff --git a/src/contacts-persona-filter.vala b/src/contacts-persona-filter.vala
-index 274f4179..9bf5f913 100644
---- a/src/contacts-persona-filter.vala
-+++ b/src/contacts-persona-filter.vala
-@@ -24,10 +24,10 @@ public class Contacts.PersonaFilter : Gtk.Filter {
-   }
-   private string[] _ignored_store_types = { "key-file", };
- 
--  public override bool match (GLib.Object? item) {
--    unowned var persona = item as Persona;
--    return_val_if_fail (persona != null, false);
-+  public override bool match (GLib.Object? item)
-+      requires (item is Persona) {
- 
-+    unowned var persona = item as Persona;
-     return match_persona_store_type (persona);
-   }
- 
-diff --git a/src/contacts-query-filter.vala b/src/contacts-query-filter.vala
-index ed46f7c5..c1846e05 100644
---- a/src/contacts-query-filter.vala
-+++ b/src/contacts-query-filter.vala
-@@ -69,10 +69,10 @@ public class Contacts.QueryFilter : Gtk.Filter {
-     this.changed (Gtk.FilterChange.DIFFERENT);
-   }
- 
--  public override bool match (GLib.Object? item) {
--    unowned var individual = item as Individual;
--    return_val_if_fail (individual != null, false);
-+  public override bool match (GLib.Object? item)
-+      requires (item is Individual) {
- 
-+    unowned var individual = item as Individual;
-     return this.query.is_match (individual) > this.min_strength;
-   }
- 
-diff --git a/src/core/contacts-bin-chunk.vala b/src/core/contacts-bin-chunk.vala
-index 4a63072e..96bf5de3 100644
---- a/src/core/contacts-bin-chunk.vala
-+++ b/src/core/contacts-bin-chunk.vala
-@@ -38,7 +38,7 @@ public abstract class Contacts.BinChunk : Chunk, GLib.ListModel {
-   public override bool dirty {
-     get {
-       // If we're hitting this, a subclass forgot to set the field
--      return_val_if_fail (this.original_elements_set, false);
-+      warn_if_fail (this.original_elements_set);
- 
-       var non_empty_count = nr_nonempty_children ();
-       if (this.original_elements.length != non_empty_count)
-diff --git a/src/core/contacts-chunk.vala b/src/core/contacts-chunk.vala
-index ba346db5..fdfa8da1 100644
---- a/src/core/contacts-chunk.vala
-+++ b/src/core/contacts-chunk.vala
-@@ -58,8 +58,7 @@ public abstract class Contacts.Chunk : GLib.Object {
-   /**
-    * Calls the appropriate API to save to the persona.
-    */
--  public abstract async void save_to_persona () throws GLib.Error
--      requires (this.persona != null);
-+  public abstract async void save_to_persona () throws GLib.Error;
- 
-   /**
-    * Serializes this chunk into a {@link GLib.Variant} accordding to an
-diff --git a/src/io/contacts-io-parse-operation.vala b/src/io/contacts-io-parse-operation.vala
-index 0e74c144..cfb98a74 100644
---- a/src/io/contacts-io-parse-operation.vala
-+++ b/src/io/contacts-io-parse-operation.vala
-@@ -82,6 +82,6 @@ public class Contacts.Io.ParseOperation : Operation {
-   }
- 
-   public override async void _undo () throws GLib.Error {
--    return_if_reached ();
-+    throw new IOError.NOT_SUPPORTED ("Undoing a parsing operation is not supported");
-   }
- }
--- 
-GitLab
-
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-45.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-45.1.ebuild
deleted file mode 100644
index 3ccf31fc2576..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-45.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="GNOME contact management application"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="+gnome-online-accounts"
-
-VALA_DEPEND="
-	$(vala_depend)
-	>=dev-libs/gobject-introspection-1.54
-	dev-libs/folks[vala(+)]
-	gnome-online-accounts? ( net-libs/gnome-online-accounts[vala] )
-	gnome-extra/evolution-data-server[gtk,vala]
-	>=dev-libs/libportal-0.6:=[gtk,vala]
-"
-RDEPEND="
-	>=dev-libs/folks-0.14.0:=[eds]
-	>=dev-libs/libgee-0.10:0.8=
-	>=dev-libs/glib-2.64:2
-	>=gui-libs/gtk-4.12:4
-	>=gui-libs/libadwaita-1.4_alpha:1
-	>=gnome-extra/evolution-data-server-3.42:=[gnome-online-accounts?]
-	>=dev-libs/libportal-0.6:=
-	>=media-gfx/qrencode-4.1.1:=
-	gnome-online-accounts? ( net-libs/gnome-online-accounts:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	${VALA_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-clang.patch # Upstream commit a6ad56a6151f29
-)
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcamera=true # Ignored
-		-Dmanpage=true
-		-Ddocs=false
-		$(meson_use gnome-online-accounts goa)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-47.1.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-47.1.1.ebuild
new file mode 100644
index 000000000000..0aa8f15481f0
--- /dev/null
+++ b/gnome-extra/gnome-contacts/gnome-contacts-47.1.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="GNOME contact management application"
+HOMEPAGE="https://apps.gnome.org/Contacts/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+gnome-online-accounts"
+
+VALA_DEPEND="
+	$(vala_depend)
+	>=dev-libs/gobject-introspection-1.54
+	dev-libs/folks[vala(+)]
+	gnome-online-accounts? ( net-libs/gnome-online-accounts[vala] )
+	gnome-extra/evolution-data-server[gtk,vala]
+	>=dev-libs/libportal-0.7:=[gtk,vala]
+"
+RDEPEND="
+	>=dev-libs/folks-0.14.0:=[eds]
+	>=dev-libs/libgee-0.10:0.8=
+	>=dev-libs/glib-2.64:2
+	>=gui-libs/gtk-4.15.3:4
+	>=gui-libs/libadwaita-1.6_alpha:1
+	>=gnome-extra/evolution-data-server-3.42:=[gnome-online-accounts?]
+	>=dev-libs/libportal-0.7:=
+	>=media-libs/gstreamer-1
+	>=media-gfx/qrencode-4.1.1:=
+	gnome-online-accounts? ( net-libs/gnome-online-accounts:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	${VALA_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dcamera=true # Ignored
+		-Dmanpage=true
+		-Ddocs=false
+		$(meson_use gnome-online-accounts goa)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index 0120025cfe0f..07070a2d12b3 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-system-monitor-45.0.2.tar.xz 1020000 BLAKE2B 9c35175e9b71fa9ea4689fdd17f8a7b9f251fc9039db6d89d6d05fa6fb2729ecce20c5d0f4a000f2f8a3eaa63026053a14a8681e62d8a5af9e589e230bd18026 SHA512 60c65a4e035d82bdae98622ed113ba26b45491c7e31358a138a6e4029a08448671190bf8eaf9bb1d30468a4cc00de7565ac25f0b93ac9c3ecee2fcb0515c62f7
 DIST gnome-system-monitor-46.0.tar.xz 1041848 BLAKE2B 29d87d6621538f7c0e0778eb7c598ac69bc52d05c5ce481e3d22d87cc540830481d34dccc992e44b59556104f567eeba9375d802418c371501994039065c0838 SHA512 2bba46bf5f03d4b8ad6e45e42b2d7ce21859037a1bd386ea17276d10c0eba506c718ab5bc4c203823cabd830bdaac3d61753dbb3b364eaf4dfea0031fea0ac27
+DIST gnome-system-monitor-47.0.tar.xz 1092424 BLAKE2B 994518563942b4046a10a0750c3062397c682ec38f73146597a595483cbd5f206b510753259603a5dc871f8bdd582674f356503dee43e13340bd7f7038194feb SHA512 900040247879ebad063f3827776781d93ee444ebaec5069347648db17b3047ec6d276f99ca02b5bedc41827f04ae3fc2f7fccdf050a33b86c5bb158c0dbd96b5
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-47.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-47.0.ebuild
new file mode 100644
index 000000000000..e898af853c8b
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-47.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Gnome System Monitor"
+HOMEPAGE="https://apps.gnome.org/SystemMonitor/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="systemd X"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.68:2.68
+	>=dev-libs/glib-2.56.0:2
+	>=gui-libs/gtk-4.12.0:4[X(+)?]
+	>=dev-cpp/gtkmm-4.0.0:4.0
+	>=gnome-base/libgtop-2.41.2:2=
+	>=gui-libs/libadwaita-1.6_alpha:1
+	>=gnome-base/librsvg-2.46:2
+	>=dev-libs/libxml2-2.0:2
+	X? ( >=x11-libs/libwnck-2.91.0:3 )
+	systemd? ( >=sys-apps/systemd-44:0= )
+"
+# eautoreconf requires gnome-base/gnome-common
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	>=sys-auth/polkit-0.114
+" # polkit needed at buildtime for ITS rules of policy files, first available in 0.114
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use X wnck)
+		$(meson_use systemd)
+		-Ddevelopment=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 890072ff8c36..499ce272ef94 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-user-docs-45.5.tar.xz 13176820 BLAKE2B 3f19f8cfe4205707fab12ca5f43efbf4c2b477259237895339dc20a3c2b6994866ff95f89b37c78d9d4fc46857da7dc674195f1f092556ffffdafdfad76960e1 SHA512 b2452fb8093679a2b43ba3a4ce8efa8006c34329522849ab08a6a3f555d5afb6240d4beda9c29a382ccc8cfb246f155de2db6db8b161d4ef88fd4347c2a3634c
-DIST gnome-user-docs-46.1.tar.xz 13232972 BLAKE2B a4c33b2939c674b76f239cd7c94d412e8874d9e672ee35c118d5d4c818bc88c8a024e2424e567528ce823e23ac013d54c7859e5a76765b8ae17abe64c8fe149c SHA512 2520714e46e93ae834a6f1b1ca910f61a56b7b9361af2b16883fe78db441b7fbd616e359b99cbcf300576501cf9c6500578c8fc1040261f02349cdd67c2ceabb
 DIST gnome-user-docs-46.4.tar.xz 13261192 BLAKE2B 7075e904ec789cbab48af5f76fe44fe51c32ef021869b6077ca51c71405d8c41de389a50b35971b94d902748944357891ed92351818b32437f5d0bdcd9311a5a SHA512 5ccf42019603963d09e04c2977835ab6a70f06cbaf3276e53025e853fbf607b0f53000043112df00329dc9eda5b19e5be1b07dd66dc21f4c9db98e09cc454d55
+DIST gnome-user-docs-47.2.tar.xz 15118376 BLAKE2B b9bf6bdd33059c5c3df6176ef4d0fe27123f68f65324c1d44031db43f278730685736f0a492a9268beff4578272f955385ae1e5885f796b540007804524253e8 SHA512 8e3c0b5a4e8b4062b028b361ec46f752b04167913df29d341e80bd84e2389dd3bbcfd62b766c65322a8cb654d421c1173a56171ee8392c1125b788df5003d38b
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-45.5.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-45.5.ebuild
deleted file mode 100644
index 037310d42ec7..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-45.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-
-LICENSE="CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="test"
-
-BDEPEND="test? ( dev-libs/libxml2 )"
-# eautoreconf requires:
-#	app-text/yelp-tools
-# rebuilding translations requires:
-#	app-text/yelp-tools
-#	dev-util/gettext
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip
-	!test? ( test )"
-
-src_configure() {
-	# itstool is only needed for rebuilding translations
-	# xmllint is only needed for tests
-	gnome2_src_configure \
-		$(usex test "" XMLLINT=$(type -P true)) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-46.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-46.1.ebuild
deleted file mode 100644
index 8671258d1ddb..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-46.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-
-LICENSE="CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
-
-BDEPEND="test? ( dev-libs/libxml2 )"
-# eautoreconf requires:
-#	app-text/yelp-tools
-# rebuilding translations requires:
-#	app-text/yelp-tools
-#	dev-util/gettext
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip
-	!test? ( test )"
-
-src_configure() {
-	# itstool is only needed for rebuilding translations
-	# xmllint is only needed for tests
-	gnome2_src_configure \
-		$(usex test "" XMLLINT=$(type -P true)) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-47.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-47.2.ebuild
new file mode 100644
index 000000000000..a02429dac513
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-47.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2
+
+DESCRIPTION="GNOME end user documentation"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
+
+LICENSE="CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+BDEPEND="test? ( dev-libs/libxml2 )"
+# eautoreconf requires:
+#	app-text/yelp-tools
+# rebuilding translations requires:
+#	app-text/yelp-tools
+#	dev-util/gettext
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip
+	!test? ( test )"
+
+src_configure() {
+	# itstool is only needed for rebuilding translations
+	# xmllint is only needed for tests
+	gnome2_src_configure \
+		$(usex test "" XMLLINT=$(type -P true)) \
+		ITSTOOL=$(type -P true)
+}
+
+src_compile() {
+	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
+	# which can take > 2 hours on a Core i7.
+	return
+}
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index e7ed0b16bab0..d93a11c89773 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-weather-45.0.tar.xz 238520 BLAKE2B c1d11e63a01f59f07dab3b59e7b885970fdfefc74179c21afcce097ab7454e07754726f4676b1c9a49415d6a2312a73c4dbf4c0b378aaab741ccaa4146ab59b9 SHA512 decc1d917a9b0dcd4b9feb49c9dce0096f0f22b8da193bb3e913a92687b06f2cee9f7e029653b1af101d6ab682b49f89be37b864804e0f42ea0e249fc77a027c
 DIST gnome-weather-46.0.tar.xz 239644 BLAKE2B 4acf901dbb7ee0240aa371797823c5d2eadfbc869b273e9bf0da45b311b71ea4977c6d0809f7067d79d80326d75c3c0184a463201c6f319573764277480ee23d SHA512 b180b231359e7b1cfa593b9a536d77520d6183aa752a8900bb27a290bc5f6f9676da132897e51e2810baca57196c9328a8cbbbb172068f52409076e39ba87a8b
+DIST gnome-weather-47.0.tar.xz 252112 BLAKE2B 02d69555f66a36127f3d82e4bef3ccf531952544b100b564cf0dcf1eb508921cd052254fb512871c4b42af1f8d8ce87c77610ca941cc66475ee533c3a91840b1 SHA512 9ed6423a3eb68dcbbb5e1651e4c9af1e60897643d2d938812820c61520fe13b4d1a9049656ca4cc02c70d6c6c6511da0cb947c60859f53646fc1e75a4c52649b
diff --git a/gnome-extra/gnome-weather/gnome-weather-45.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-45.0.ebuild
deleted file mode 100644
index de698d2ac1a8..000000000000
--- a/gnome-extra/gnome-weather/gnome-weather-45.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="A weather application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
-
-DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.56:=
-	>=gui-libs/gtk-4.5:4
-	>=dev-libs/gjs-1.71.0
-	>=app-misc/geoclue-2.3.1:2.0
-	>=gui-libs/libadwaita-1.4_alpha:1=
-	>=dev-libs/libgweather-3.90.0:4=
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-# libxml2 required for glib-compile-resources
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-# Tests have a lot of issues, starting with reliance on a system installation,
-# accessing the network and other intermittent failures with network-sandbox disabled
-# https://gitlab.gnome.org/GNOME/gnome-weather/issues/67 (and rest not filed)
-# test dep: $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]')
-# With 3.34, this is now behind a dogtail option we can pass (and have data validation)
-
-src_configure() {
-	meson_src_configure -Dprofile=default -Ddogtail=false
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-weather/gnome-weather-47.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-47.0.ebuild
new file mode 100644
index 000000000000..a0086b366148
--- /dev/null
+++ b/gnome-extra/gnome-weather/gnome-weather-47.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="A weather application for GNOME"
+HOMEPAGE="https://apps.gnome.org/Weather/"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.56:=
+	>=gui-libs/gtk-4.5:4
+	>=dev-libs/gjs-1.71.0
+	>=app-misc/geoclue-2.3.1:2.0
+	>=gui-libs/libadwaita-1.4_alpha:1=
+	>=dev-libs/libgweather-3.90.0:4=
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+# libxml2 required for glib-compile-resources
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+# Tests have a lot of issues, starting with reliance on a system installation,
+# accessing the network and other intermittent failures with network-sandbox disabled
+# https://gitlab.gnome.org/GNOME/gnome-weather/issues/67 (and rest not filed)
+# test dep: $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]')
+# With 3.34, this is now behind a dogtail option we can pass (and have data validation)
+
+src_configure() {
+	meson_src_configure -Dprofile=default -Ddogtail=false
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/tecla/Manifest b/gnome-extra/tecla/Manifest
index bda39fd01563..4dd553d569d8 100644
--- a/gnome-extra/tecla/Manifest
+++ b/gnome-extra/tecla/Manifest
@@ -1,2 +1,2 @@
-DIST tecla-45.0.tar.xz 33404 BLAKE2B 97bbbdf012a91303d86fb1fbb01dcee644ae7e612d88439465abf392c23fc232e33fbcd4403f02bc8193a6a8a9925fb7d45550d803e7835f5bbfded19fe18170 SHA512 ae1f38870c14467ef7a868b60bc1a12ae1584fdd5e158d1cbf6f6639586225c7ffb8cfa00edeefc3930d4225a3865932e7fa724a5dff5f0ece3372363df289ce
 DIST tecla-46.0.tar.xz 35108 BLAKE2B df092709db310df2721bfff97243f1d3ec7f3391a224f6b8d00cfeac5423c98fb045bc3c698e4fcf5437a59c20dce0100747f13ff46fd998bf42fdfe81d5f078 SHA512 140b9e47a850d9764bd810d2f2f283923f5818d11a62fb6739c150f23b36c4e8c63af28c1fbb171466c97d233e36b66732b60c758489515b123b5704e2c5a6a9
+DIST tecla-47.0.tar.xz 38072 BLAKE2B 985152715114cad638e96f1986b7607f724ff82de9212036ca27a1c668652c46143ad7bb6dfbc37acc938dd8316a477d13e9cde9d2b3ec27d8bc7696e7281410 SHA512 82c29b7672d78d0cdb1dccd95c159ba4fbbe2cda36b5b491b0dde530985fa718d382a0d0c78dffacad50e5d817db1874447069f383de8e2895f6d6216cefb8fc
diff --git a/gnome-extra/tecla/tecla-45.0.ebuild b/gnome-extra/tecla/tecla-45.0.ebuild
deleted file mode 100644
index dd7aa164e9f4..000000000000
--- a/gnome-extra/tecla/tecla-45.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
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Tecla is a keyboard layout viewer"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/tecla"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	gui-libs/gtk:4[introspection]
-	>=gui-libs/libadwaita-1.4_alpha:1
-	x11-libs/libxkbcommon
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/glib
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/tecla/tecla-47.0.ebuild b/gnome-extra/tecla/tecla-47.0.ebuild
new file mode 100644
index 000000000000..2fb57e0e1f78
--- /dev/null
+++ b/gnome-extra/tecla/tecla-47.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Tecla is a keyboard layout viewer"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/tecla"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	gui-libs/gtk:4[introspection]
+	>=gui-libs/libadwaita-1.4_alpha:1
+	x11-libs/libxkbcommon
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/glib
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gui-apps/foot-terminfo/Manifest b/gui-apps/foot-terminfo/Manifest
index 57c11ca0e23c..5c3b097504c2 100644
--- a/gui-apps/foot-terminfo/Manifest
+++ b/gui-apps/foot-terminfo/Manifest
@@ -6,3 +6,5 @@ DIST foot-1.18.0.tar.gz 579743 BLAKE2B 5226b2beaafd9609904b1b6c683623d2d618623de
 DIST foot-1.18.1.tar.gz 581146 BLAKE2B 25aa088218c5f1e44fe4cebaa63b933f21fa480446766f91b770b9eedb1ec25f1d1ac7a0519b72b907f0cf90c520d52625d9580fcdd7f8455c349d6c579b1614 SHA512 06744dcf33bdc5a47885b3720f194763fb680b5a21710a9289d9652237c207b70914e3689ffe32c8a6b7578ab0f010117866bddfd99055897c059e6554332bee
 DIST foot-1.19.0.tar.gz 584392 BLAKE2B 39f0382d5d7888b652e6b733e00302eff83e544b81273f800f2b685a6840559faa5626d8bb06233e872dd08dc347472974ff2e737611bb209aca77f0495371b9 SHA512 14c6616acd7de538a02bbe464ee77cddc6196d1387f6818691ffafd00f7379194a37eb3968c1f9976d9d82490be60854295fbfe662a9b658fa6fa8dfa291bac0
 DIST foot-1.20.0.tar.gz 589056 BLAKE2B 021927293c5b4950df33de42e37112bef79f908c44f7d2d47486e42c51096ff2416b3cf7d8dc3837448baa423e574b1ba83391af639e1782480e6370cfd5060f SHA512 8f602c8763f26c0a86efb1e7efb183f13a8ec14e1d618bf16a95185613b7bf36d6091e0057f746425fbe9855e043dd9a07d2ceb774257c4f1eaa20228f4fada5
+DIST foot-1.20.1.tar.gz 590026 BLAKE2B 991935b9b0b40d13914ae9831637a837275918821b70ba49173cccb2b1803c024d26261a75d245cd7bd9f88c8bc1019c462793f374302cfb93500502648502f7 SHA512 c4f0a36d1031915336110bb916f43d5f3ea19093555bc87141d3c3403fea058a7086eee13fed4aaff9b1d55484b9b04d90d75cf801889c205eca6415b9b9a2d5
+DIST foot-1.20.2.tar.gz 590295 BLAKE2B 341bd31690dd77fbf31efa066933fe09679df0b6ac6d949bd6bd7df4053399499d8e30387957d9bc4011ecb4487a3d76aa67bdf3ffbd606fbd9686e4878dc623 SHA512 8ad246a0c28531c969bf4fccaba68984c7f52212682362116f8a7e43ea453daf32eadef3fe6148542ffa62e32ff359486276aa2484017671aa95ce097bc4deb3
diff --git a/gui-apps/foot-terminfo/foot-terminfo-1.20.1.ebuild b/gui-apps/foot-terminfo/foot-terminfo-1.20.1.ebuild
new file mode 100644
index 000000000000..5077aafb19c3
--- /dev/null
+++ b/gui-apps/foot-terminfo/foot-terminfo-1.20.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Terminfo for foot, a fast, lightweight and minimal Wayland terminal emulator"
+HOMEPAGE="https://codeberg.org/dnkl/foot"
+SRC_URI="
+	https://codeberg.org/dnkl/foot/releases/download/${PV}/foot-${PV}.tar.gz
+"
+S="${WORKDIR}/${P/-terminfo/}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+RDEPEND="!>=sys-libs/ncurses-6.3[-minimal]"
+BDEPEND="sys-libs/ncurses"
+
+src_prepare() {
+	default
+	sed -i s/@default_terminfo@/foot/ foot.info || die
+}
+
+src_install() {
+	dodir /usr/share/terminfo/
+	tic -xo "${ED}"/usr/share/terminfo foot.info || die
+}
diff --git a/gui-apps/foot-terminfo/foot-terminfo-1.20.2.ebuild b/gui-apps/foot-terminfo/foot-terminfo-1.20.2.ebuild
new file mode 100644
index 000000000000..5077aafb19c3
--- /dev/null
+++ b/gui-apps/foot-terminfo/foot-terminfo-1.20.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Terminfo for foot, a fast, lightweight and minimal Wayland terminal emulator"
+HOMEPAGE="https://codeberg.org/dnkl/foot"
+SRC_URI="
+	https://codeberg.org/dnkl/foot/releases/download/${PV}/foot-${PV}.tar.gz
+"
+S="${WORKDIR}/${P/-terminfo/}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+RDEPEND="!>=sys-libs/ncurses-6.3[-minimal]"
+BDEPEND="sys-libs/ncurses"
+
+src_prepare() {
+	default
+	sed -i s/@default_terminfo@/foot/ foot.info || die
+}
+
+src_install() {
+	dodir /usr/share/terminfo/
+	tic -xo "${ED}"/usr/share/terminfo foot.info || die
+}
diff --git a/gui-apps/foot/Manifest b/gui-apps/foot/Manifest
index 893f1315dd9a..76f9854f9cc9 100644
--- a/gui-apps/foot/Manifest
+++ b/gui-apps/foot/Manifest
@@ -6,3 +6,5 @@ DIST foot-1.18.0.tar.gz 579743 BLAKE2B 5226b2beaafd9609904b1b6c683623d2d618623de
 DIST foot-1.18.1.tar.gz 581146 BLAKE2B 25aa088218c5f1e44fe4cebaa63b933f21fa480446766f91b770b9eedb1ec25f1d1ac7a0519b72b907f0cf90c520d52625d9580fcdd7f8455c349d6c579b1614 SHA512 06744dcf33bdc5a47885b3720f194763fb680b5a21710a9289d9652237c207b70914e3689ffe32c8a6b7578ab0f010117866bddfd99055897c059e6554332bee
 DIST foot-1.19.0.tar.gz 584392 BLAKE2B 39f0382d5d7888b652e6b733e00302eff83e544b81273f800f2b685a6840559faa5626d8bb06233e872dd08dc347472974ff2e737611bb209aca77f0495371b9 SHA512 14c6616acd7de538a02bbe464ee77cddc6196d1387f6818691ffafd00f7379194a37eb3968c1f9976d9d82490be60854295fbfe662a9b658fa6fa8dfa291bac0
 DIST foot-1.20.0.tar.gz 589056 BLAKE2B 021927293c5b4950df33de42e37112bef79f908c44f7d2d47486e42c51096ff2416b3cf7d8dc3837448baa423e574b1ba83391af639e1782480e6370cfd5060f SHA512 8f602c8763f26c0a86efb1e7efb183f13a8ec14e1d618bf16a95185613b7bf36d6091e0057f746425fbe9855e043dd9a07d2ceb774257c4f1eaa20228f4fada5
+DIST foot-1.20.1.tar.gz 590026 BLAKE2B 991935b9b0b40d13914ae9831637a837275918821b70ba49173cccb2b1803c024d26261a75d245cd7bd9f88c8bc1019c462793f374302cfb93500502648502f7 SHA512 c4f0a36d1031915336110bb916f43d5f3ea19093555bc87141d3c3403fea058a7086eee13fed4aaff9b1d55484b9b04d90d75cf801889c205eca6415b9b9a2d5
+DIST foot-1.20.2.tar.gz 590295 BLAKE2B 341bd31690dd77fbf31efa066933fe09679df0b6ac6d949bd6bd7df4053399499d8e30387957d9bc4011ecb4487a3d76aa67bdf3ffbd606fbd9686e4878dc623 SHA512 8ad246a0c28531c969bf4fccaba68984c7f52212682362116f8a7e43ea453daf32eadef3fe6148542ffa62e32ff359486276aa2484017671aa95ce097bc4deb3
diff --git a/gui-apps/foot/foot-1.19.0.ebuild b/gui-apps/foot/foot-1.19.0.ebuild
index 2cde236bf381..9aedc9c61320 100644
--- a/gui-apps/foot/foot-1.19.0.ebuild
+++ b/gui-apps/foot/foot-1.19.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
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="~amd64 ~arm64 ppc64 ~riscv"
 IUSE="+grapheme-clustering test"
 RESTRICT="!test? ( test )"
 
diff --git a/gui-apps/foot/foot-1.20.0.ebuild b/gui-apps/foot/foot-1.20.0.ebuild
index d90c8a50a131..970ad3152ef5 100644
--- a/gui-apps/foot/foot-1.20.0.ebuild
+++ b/gui-apps/foot/foot-1.20.0.ebuild
@@ -76,9 +76,4 @@ src_install() {
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	if [[ ${REPLACING_VERSIONS} ]]; then
-		ewarn "The menu entries foot installs have been renamed."
-		ewarn "This might result in shortcuts (in, for instance, KDE)"
-		ewarn "being forgotten."
-	fi
 }
diff --git a/gui-apps/foot/foot-1.20.1-r1.ebuild b/gui-apps/foot/foot-1.20.1-r1.ebuild
new file mode 100644
index 000000000000..1f184cc3a99b
--- /dev/null
+++ b/gui-apps/foot/foot-1.20.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg systemd
+
+DESCRIPTION="Fast, lightweight and minimalistic Wayland terminal emulator"
+HOMEPAGE="https://codeberg.org/dnkl/foot"
+SRC_URI="
+	https://codeberg.org/dnkl/foot/releases/download/${PV}/${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="+grapheme-clustering test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/wayland
+	media-libs/fcft
+	media-libs/fontconfig
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	grapheme-clustering? (
+		dev-libs/libutf8proc:=[-cjk]
+		media-libs/fcft[harfbuzz]
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-libs/tllist-1.1.0
+	>=dev-libs/wayland-protocols-1.32
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	|| (
+		>=sys-libs/ncurses-6.3[-minimal]
+		~gui-apps/foot-terminfo-${PV}
+	)
+"
+BDEPEND="
+	app-text/scdoc
+	dev-util/wayland-scanner
+"
+
+src_prepare() {
+	default
+	# disable the systemd dep, we install the unit file manually
+	sed -i "s/systemd', required: false)$/', required: false)/" "${S}"/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature grapheme-clustering)
+		$(meson_use test tests)
+		-Dthemes=true
+		-Dime=true
+		-Dterminfo=disabled
+	)
+	meson_src_configure
+
+	sed 's|@bindir@|/usr/bin|g' "${S}"/foot-server.service.in > foot-server.service || die
+}
+
+src_install() {
+	local DOCS=( CHANGELOG.md README.md LICENSE )
+	meson_src_install
+
+	# foot unconditionally installs CHANGELOG.md, README.md and LICENSE.
+	# we handle this via DOCS and dodoc instead.
+	rm -r "${ED}/usr/share/doc/${PN}" || die
+	systemd_douserunit foot-server.service "${S}"/foot-server.socket
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
diff --git a/gui-apps/foot/foot-1.20.2.ebuild b/gui-apps/foot/foot-1.20.2.ebuild
new file mode 100644
index 000000000000..1f184cc3a99b
--- /dev/null
+++ b/gui-apps/foot/foot-1.20.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg systemd
+
+DESCRIPTION="Fast, lightweight and minimalistic Wayland terminal emulator"
+HOMEPAGE="https://codeberg.org/dnkl/foot"
+SRC_URI="
+	https://codeberg.org/dnkl/foot/releases/download/${PV}/${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="+grapheme-clustering test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/wayland
+	media-libs/fcft
+	media-libs/fontconfig
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	grapheme-clustering? (
+		dev-libs/libutf8proc:=[-cjk]
+		media-libs/fcft[harfbuzz]
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-libs/tllist-1.1.0
+	>=dev-libs/wayland-protocols-1.32
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	|| (
+		>=sys-libs/ncurses-6.3[-minimal]
+		~gui-apps/foot-terminfo-${PV}
+	)
+"
+BDEPEND="
+	app-text/scdoc
+	dev-util/wayland-scanner
+"
+
+src_prepare() {
+	default
+	# disable the systemd dep, we install the unit file manually
+	sed -i "s/systemd', required: false)$/', required: false)/" "${S}"/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature grapheme-clustering)
+		$(meson_use test tests)
+		-Dthemes=true
+		-Dime=true
+		-Dterminfo=disabled
+	)
+	meson_src_configure
+
+	sed 's|@bindir@|/usr/bin|g' "${S}"/foot-server.service.in > foot-server.service || die
+}
+
+src_install() {
+	local DOCS=( CHANGELOG.md README.md LICENSE )
+	meson_src_install
+
+	# foot unconditionally installs CHANGELOG.md, README.md and LICENSE.
+	# we handle this via DOCS and dodoc instead.
+	rm -r "${ED}/usr/share/doc/${PN}" || die
+	systemd_douserunit foot-server.service "${S}"/foot-server.socket
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
diff --git a/gui-apps/qt6ct/qt6ct-0.9-r1.ebuild b/gui-apps/qt6ct/qt6ct-0.9-r1.ebuild
new file mode 100644
index 000000000000..2f798cf51885
--- /dev/null
+++ b/gui-apps/qt6ct/qt6ct-0.9-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Qt6 Configuration Tool (for DE/WM without Qt integration)"
+HOMEPAGE="https://github.com/trialuser02/qt6ct/"
+SRC_URI="https://github.com/trialuser02/qt6ct/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64"
+
+# uses Qt private APIs wrt :=
+# dlopen: qtsvg
+DEPEND="
+	dev-qt/qtbase:6=[gui,widgets]
+"
+RDEPEND="
+	${DEPEND}
+	dev-qt/qtsvg:6
+"
+BDEPEND="
+	dev-qt/qtbase:6
+	dev-qt/qttools:6[linguist]
+"
+
+src_install() {
+	cmake_src_install
+
+	# can replace after qt5ct is gone
+#	newenvd - 98${PN} <<<'QT_QPA_PLATFORMTHEME=qt6ct'
+	newenvd - 98${PN} <<-EOF
+		# 'qt5ct' is recognized by both qt5ct and qt6ct to allow simultaneous usage
+		QT_QPA_PLATFORMTHEME=qt5ct
+	EOF
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "QT_QPA_PLATFORMTHEME has been set to enable ${PN} usage by"
+		elog "default. This will only come into effect after re-login into"
+		elog "the current desktop session(s)."
+		elog
+		elog "Note that ${PN} should not be used with DEs that do their own"
+		elog "integration (e.g. Plasma/KDE). Qt also has special handling"
+		elog "for Gnome which may or may not be better."
+	fi
+
+	# not a very important warning (at most could surprise users that had it
+	# installed but weren't really using it), can likely cleanup next version
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 0.9-r1
+	then
+		ewarn
+		ewarn "Note that ${PF} newly sets QT_QPA_PLATFORMTHEME globally"
+		ewarn "by default to use ${PN} (or qt5ct if it is installed)."
+	fi
+}
diff --git a/gui-apps/qt6ct/qt6ct-0.9.ebuild b/gui-apps/qt6ct/qt6ct-0.9.ebuild
deleted file mode 100644
index bb92d244d751..000000000000
--- a/gui-apps/qt6ct/qt6ct-0.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Qt6 Configuration Tool (for DE/WM without Qt integration)"
-HOMEPAGE="https://github.com/trialuser02/qt6ct/"
-SRC_URI="https://github.com/trialuser02/qt6ct/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64"
-
-# uses Qt private APIs wrt :=
-DEPEND="dev-qt/qtbase:6=[gui,widgets]"
-RDEPEND="
-	${DEPEND}
-	dev-qt/qtsvg:6
-"
-BDEPEND="
-	dev-qt/qtbase:6
-	dev-qt/qttools:6[linguist]
-"
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "Note need to export QT_QPA_PLATFORMTHEME=qt6ct in the used environment"
-		elog "for theming to take effect (not done automatically, may want to set in"
-		elog "the HOME's shell initialization scripts, or use /etc/env.d followed by"
-		elog "running env-update then re-login)."
-		elog
-		elog "If also using x11-misc/qt5ct, =qt5ct is alternatively recognized so it"
-		elog "can be activated for both Qt5 and Qt6 at once."
-		elog
-		elog "Try disabling if experience startup crashes for some applications,"
-		elog "may still be unstable (especially with newly released Qt versions)."
-	fi
-}
diff --git a/gui-apps/railway/Manifest b/gui-apps/railway/Manifest
index 5f3d20712897..dd2b446a99d2 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,29 +271,55 @@ 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
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-apps/waybar/metadata.xml b/gui-apps/waybar/metadata.xml
index b672f3d72644..f5aa99ba21fe 100644
--- a/gui-apps/waybar/metadata.xml
+++ b/gui-apps/waybar/metadata.xml
@@ -28,8 +28,9 @@
 		<flag name="wifi">Enable support for wifi/rfkill</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">Alexays/Waybar</remote-id>
 		<bugs-to>https://github.com/Alexays/Waybar/issues</bugs-to>
 		<changelog>https://github.com/Alexays/Waybar/releases</changelog>
+		<doc>https://github.com/Alexays/Waybar/wiki</doc>
+		<remote-id type="github">Alexays/Waybar</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/gui-apps/xwaylandvideobridge/xwaylandvideobridge-0.4.0-r1.ebuild b/gui-apps/xwaylandvideobridge/xwaylandvideobridge-0.4.0-r1.ebuild
index 3d553cedcf81..de41e7f84236 100644
--- a/gui-apps/xwaylandvideobridge/xwaylandvideobridge-0.4.0-r1.ebuild
+++ b/gui-apps/xwaylandvideobridge/xwaylandvideobridge-0.4.0-r1.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 @@ https://invent.kde.org/system/xwaylandvideobridge"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/gui-libs/greetd/greetd-0.10.3-r1.ebuild b/gui-libs/greetd/greetd-0.10.3-r1.ebuild
index 30f9a98e47b8..5b0c04452bf7 100644
--- a/gui-libs/greetd/greetd-0.10.3-r1.ebuild
+++ b/gui-libs/greetd/greetd-0.10.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2024 Gentoo Authors
+# Copyright 2017-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -79,7 +79,7 @@ LICENSE="GPL-3+"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 MIT Unicode-DFS-2016 Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 ~riscv ~x86"
 IUSE="man selinux"
 
 DEPEND="
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index 778cd0fb700c..a63520edbb99 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,3 +1,4 @@
 DIST gtk-4.12.5.tar.xz 17314760 BLAKE2B ce6a88d2c3ecfa2a9773682645ff00a61fd932b9a6de764794ef8abd10c5c75df386801143c32d10fec110029e997a16c4cdcb0ef050905562c6dd9fdc46039d SHA512 813758f4fe23b99b2ea1cf22156b86b22df30024717ae3b30bbe36111f9b1363bbd4da5fe8e5f69268c43794ea165e12c1c5bc52fd64bcbb1f9ccd3121540ac4
 DIST gtk-4.14.3.tar.xz 18340444 BLAKE2B 20238e061c6500a8b253617010ac017e84ec2cacd9f10a7d2e982e9d72b72d78ee46abb3eb836d853d1d10736c697fc7468b2700b16ce5477a34400e8758e2b8 SHA512 2502fff3e98cb45f2293c94d86c32ff9b7c88d72eb7500a19fc9e589e1eda69af94c4eae78c044dcf5cf345cb99537d264250115d633034d9552cadc67f71e8e
 DIST gtk-4.14.4.tar.xz 18306548 BLAKE2B 352831cb6373488593831e0d3489d425ca19b2b6c5541e269e251bb4f0455b435d73d24befef441fe09537838446eb773f33cbca746a9aeeed2204c413535ac0 SHA512 33a983f4ebac9088eaf9d3794a171d1619632bbcb27d9f46d894305dc15f83615a18443598b3c62a553b9596438b58226560ba17c41e539c76c3ee8a2b62c651
+DIST gtk-4.16.12.tar.xz 14620652 BLAKE2B 298c6f41e6100f9ebf7b51bf93c55102c82b4eac53bb834744ae545b2ee2ac83c7bd271e0c64ff03031d61042259695528ea36e8a1efac704bbe73dac77e7f7f SHA512 ca6deabe0447524ef021ddf367e28a40f7571d1efcd11890dc54e20d944a4c6173c6c98da6a5902ddd8b393369f9f5e843deda667b7333916ac103daf2e283d1
diff --git a/gui-libs/gtk/gtk-4.16.12.ebuild b/gui-libs/gtk/gtk-4.16.12.ebuild
new file mode 100644
index 000000000000..c8e20f2e99ec
--- /dev/null
+++ b/gui-libs/gtk/gtk-4.16.12.ebuild
@@ -0,0 +1,269 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+inherit gnome.org gnome2-utils meson optfeature python-any-r1 toolchain-funcs virtualx xdg
+
+DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
+HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
+
+LICENSE="LGPL-2+"
+SLOT="4"
+IUSE="aqua broadway cloudproviders colord cups examples gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	test? ( introspection )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# TODO: Optional gst build dep on >=gst-plugins-base-1.23.1, so depend on it once we can
+COMMON_DEPEND="
+	>=dev-libs/glib-2.76.0:2
+	>=x11-libs/cairo-1.18.0[aqua?,glib,svg(+),X?]
+	>=x11-libs/pango-1.52.0[introspection?]
+	>=dev-libs/fribidi-1.0.6
+	>=media-libs/harfbuzz-2.6.0:=
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
+	media-libs/libpng:=
+	media-libs/tiff:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libepoxy-1.4[egl(+),X(+)?]
+	>=media-libs/graphene-1.10.0[introspection?]
+	app-text/iso-codes
+	x11-misc/shared-mime-info
+
+	cloudproviders? ( net-libs/libcloudproviders )
+	colord? ( >=x11-misc/colord-0.1.9:0= )
+	cups? ( >=net-print/cups-2.0 )
+	examples? ( gnome-base/librsvg:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.24.0:1.0
+		>=media-libs/gst-plugins-bad-1.24.0:1.0
+		|| (
+			>=media-libs/gst-plugins-base-1.24.0:1.0[gles2]
+			>=media-libs/gst-plugins-base-1.24.0:1.0[opengl]
+		)
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.76:= )
+	vulkan? ( >=media-libs/vulkan-loader-1.3:= )
+	wayland? (
+		>=dev-libs/wayland-1.21.0
+		>=dev-libs/wayland-protocols-1.36
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2
+	)
+	X? (
+		media-libs/fontconfig
+		media-libs/mesa[X(+)]
+		x11-libs/libX11
+		>=x11-libs/libXi-1.8
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.5
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	kernel_linux? (
+		x11-libs/libdrm
+		sys-kernel/linux-headers
+	)
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep on wd40 profiles with librsvg[tools]), bug #547710
+PDEPEND="
+	gnome-base/librsvg:2
+	>=x11-themes/adwaita-icon-theme-3.14
+"
+BDEPEND="
+	dev-libs/gobject-introspection-common
+	introspection? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+	)
+	dev-python/docutils
+	dev-libs/glib
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+	vulkan? ( media-libs/shaderc )
+	wayland? (
+		dev-util/wayland-scanner
+	)
+	test? (
+		dev-libs/glib:2
+		media-fonts/cantarell
+		wayland? ( dev-libs/weston[headless] )
+	)
+"
+
+PATCHES=(
+	# Gentoo-specific patch to add a "poison" macro support, allowing other ebuilds
+	# with USE="-wayland -X" to trick gtk into claiming that it wasn't built with
+	# such support.
+	# https://bugs.gentoo.org/624960
+	"${FILESDIR}"/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+}
+
+pkg_setup() {
+	use introspection && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	# Nothing should use gtk4-update-icon-cache and an unversioned one is shipped by dev-util/gtk-update-icon-cache
+	sed -i \
+		-e '/gtk4-update-icon-cache/d' \
+		docs/reference/gtk/meson.build \
+		tools/meson.build \
+		|| die
+
+	# The border-image-excess-size.ui test is known to fail on big-endian platforms
+	# See https://gitlab.gnome.org/GNOME/gtk/-/issues/5904
+	if [[ $(tc-endian) == big ]]; then
+		sed -i \
+			-e "/border-image-excess-size.ui/d" \
+			-e "/^xfails =/a 'border-image-excess-size.ui'," \
+			testsuite/reftests/meson.build || die
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		# GDK backends
+		$(meson_use X x11-backend)
+		$(meson_use wayland wayland-backend)
+		$(meson_use broadway broadway-backend)
+		-Dwin32-backend=false
+		$(meson_use aqua macos-backend)
+
+		# Media backends
+		$(meson_feature gstreamer media-gstreamer)
+
+		# Print backends
+		-Dprint-cpdb=disabled
+		$(meson_feature cups print-cups)
+
+		# Optional dependencies
+		$(meson_feature vulkan)
+		$(meson_feature cloudproviders)
+		$(meson_feature sysprof)
+		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
+		$(meson_feature colord)
+		# Expected to fail with GCC < 11
+		# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
+		$(meson_feature cpu_flags_x86_f16c f16c)
+
+		# Introspection
+		$(meson_feature introspection)
+
+		# Documentation
+		-Ddocumentation=false # we ship pregenerated API docs from tarball
+		-Dscreenshots=false
+		-Dman-pages=true
+
+		# Demos, examples, and tests
+		-Dprofile=default
+		$(meson_use examples build-demos)
+		$(meson_use test build-testsuite)
+		$(meson_use examples build-examples)
+		-Dbuild-tests=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+	# Note that skipping gsk-compare entirely means we do run *far*
+	# fewer tests, but a reliable testsuite for us is more important
+	# than absolute-maximum coverage if we can't trust the results and
+	# dismiss any failures as "probably font related" and so on.
+	if use X; then
+		einfo "Running tests under X"
+		GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --timeout-multiplier=130 \
+			--setup=x11 \
+			--no-suite=failing \
+			--no-suite=x11_failing \
+			--no-suite=flaky \
+			--no-suite=headless \
+			--no-suite=gsk-compare \
+			--no-suite=gsk-compare-broadway \
+			--no-suite=needs-udmabuf
+	fi
+
+	if use wayland; then
+		einfo "Running tests under Weston"
+
+		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+		weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
+		compositor=$!
+		export WAYLAND_DISPLAY=wayland-5
+
+		GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --timeout-multiplier=130 \
+			--setup=wayland \
+			--no-suite=failing \
+			--no-suite=wayland_failing \
+			--no-suite=flaky \
+			--no-suite=headless \
+			--no-suite=gsk-compare \
+			--no-suite=gsk-compare-broadway \
+			--no-suite=needs-udmabuf
+
+		exit_code=$?
+		kill ${compositor}
+	fi
+}
+
+src_install() {
+	meson_src_install
+
+	# TODO: Seems that HTML docs are no longer in the tarball after
+	# upstream switched to CI-generated releases? bug #947514
+	#insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to X11 and wayland regardless of USE flags, but this is intentional
+	#doins -r "${S}"/docs/reference/{gtk/gtk4,gsk/gsk4,gdk/gdk4{,-wayland,-x11}}
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+
+	if use examples ; then
+		optfeature "syntax highlighting in gtk4-demo" app-text/highlight
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gui-libs/gtksourceview/Manifest b/gui-libs/gtksourceview/Manifest
index 0fc457c1606c..7da2f50a53be 100644
--- a/gui-libs/gtksourceview/Manifest
+++ b/gui-libs/gtksourceview/Manifest
@@ -1,2 +1,2 @@
-DIST gtksourceview-5.10.0.tar.xz 1255564 BLAKE2B a105d118716f8e61beb4bb17b8e64dacdc42f1fcfac805a9b517431a4db4da92aea82ba7b042556bc222d8a6406cbe00281c5513c6e55b7517048dae17cf83a5 SHA512 c8fb377c0f65fff35fe764c98d40a399b2f3982bfb7e25512b50f4f3c31b226d4775e136fc4be682b2e44a3b643cefd01d195c9a61f5c3ca81d15bef0093e47a
 DIST gtksourceview-5.12.1.tar.xz 1265500 BLAKE2B a9200d97cda514c62a181e3d07a0c71719710299d06e1cbc29c6b7817eb6167e7b7bdc64f32121fc54bd7093a918600c0fba70b5cb4b93906f6aaf80fd6521ed SHA512 64c347df505c640feb2d5885a3fa047a3a5dc6bf86b031ec9f8eec5544bc9d996ca3bfd41aea78ebfa9171a206a64d88773d53f1bc8d0f2171429c1ee788cd40
+DIST gtksourceview-5.14.2.tar.xz 1263508 BLAKE2B 049be85f6dca2f8209efb1ec2aa66908261b9f3e44df02734cc12f6bceca7e192f2e5773cbc71f39edb1319613ef95104407fa743c8e8512d33c00d0520a57a0 SHA512 cbdfaf3db9873302e2d38adb3fd63515b713139fb195a6135367b57f024094a6ecf581b046efbdc6417690455c88bc89b49dad4f36ec32ccddf7218ecfe87652
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.10.0.ebuild b/gui-libs/gtksourceview/gtksourceview-5.10.0.ebuild
deleted file mode 100644
index 4347c8a85a20..000000000000
--- a/gui-libs/gtksourceview/gtksourceview-5.10.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 gnome.org meson vala virtualx xdg
-
-DESCRIPTION="A text widget implementing syntax highlighting and other features"
-HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-
-IUSE="gtk-doc +introspection sysprof +vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.72:2
-	>=gui-libs/gtk-4.6:4[introspection?]
-	>=dev-libs/libxml2-2.6:2
-	introspection? ( >=dev-libs/gobject-introspection-1.70.0:= )
-	>=dev-libs/fribidi-0.19.7
-	media-libs/fontconfig
-	x11-libs/pango[introspection?]
-	>=dev-libs/libpcre2-10.21:=[-recursion-limit(-)]
-	sysprof? ( dev-util/sysprof-capture:4 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( dev-util/gi-docgen )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dinstall_tests=false
-		$(meson_feature introspection)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use sysprof)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# Tests fail in test-regex with libpcre2[recursion-limit] - https://gitlab.gnome.org/GNOME/gtksourceview/-/issues/255
-	# Ensured OK via USE dep, as it would mean issues in real usage for syntax highlighting as well
-	virtx meson_src_test --timeout-multiplier=5
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/${PN}-5/language-specs
-	newins "${FILESDIR}"/5-gentoo.lang gentoo.lang
-
-	if use gtk-doc ; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/${PN}${SLOT} "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-}
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/gui-libs/gtksourceview/gtksourceview-5.14.2.ebuild b/gui-libs/gtksourceview/gtksourceview-5.14.2.ebuild
new file mode 100644
index 000000000000..8fa41056cb10
--- /dev/null
+++ b/gui-libs/gtksourceview/gtksourceview-5.14.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson vala virtualx xdg
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gtksourceview"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk-doc +introspection sysprof +vala"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.72:2
+	>=gui-libs/gtk-4.6:4[introspection?]
+	>=dev-libs/libxml2-2.6:2
+	introspection? ( >=dev-libs/gobject-introspection-1.70.0:= )
+	>=dev-libs/fribidi-0.19.7
+	media-libs/fontconfig
+	x11-libs/pango[introspection?]
+	>=dev-libs/libpcre2-10.21:=[-recursion-limit(-)]
+	sysprof? ( dev-util/sysprof-capture:4 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( dev-util/gi-docgen )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dinstall-tests=false
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc documentation)
+		$(meson_use sysprof)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# Tests fail in test-regex with libpcre2[recursion-limit] - https://gitlab.gnome.org/GNOME/gtksourceview/-/issues/255
+	# Ensured OK via USE dep, as it would mean issues in real usage for syntax highlighting as well
+	virtx meson_src_test --timeout-multiplier=5
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/${PN}-5/language-specs
+	newins "${FILESDIR}"/5-gentoo.lang gentoo.lang
+
+	if use gtk-doc ; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/${PN}${SLOT} "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
diff --git a/gui-libs/libadwaita/Manifest b/gui-libs/libadwaita/Manifest
index db5766e313d0..df1387316b48 100644
--- a/gui-libs/libadwaita/Manifest
+++ b/gui-libs/libadwaita/Manifest
@@ -1,2 +1,4 @@
 DIST libadwaita-1.5.2.tar.xz 4456060 BLAKE2B 671f169f645a2ff06d707bd35c30a839b20d1dd37f0a3c8f1ea5970b7a4692989a36e4b770f544a65f6a658f16bf3682209f2b7f9f49985d5dee24d518ae74db SHA512 34655efe515711e131e5c1c5e1c16c40b3fa76d84ecda2d9c529b060ef2801858f963fd647d9be7e736d3ff01aca7bdc983e076163c4740a928e234ef4aee453
 DIST libadwaita-1.5.3.tar.xz 4457392 BLAKE2B f852f94bb61424aae7aef1219b7354d90bb41175ea0cb3e55fa50609a0b5c6ab8c8a689819dadb0d4f55471655549542142412fae9a5ff18eeea04c0da5b1541 SHA512 0b92cd9376a97c1683248a39eb42f1ddfe8b1dcb0f013e8c8b8d63e0d6bafebd63e429353471d378d9fb80db17627b407d0e789794e45c665a56b1536ff6afc0
+DIST libadwaita-1.5.5.tar.xz 4460668 BLAKE2B 30174e5b911b7583505f4103d4586e3cfa4f9d6cef6518f3fe5223700a4a520ce8c99561bfe54ba1b2f9bb4471b18896e7f7a3e4fb8a5bcdb2a15d5faa410e6c SHA512 0474b5152c42e114b78025e0cf0cee56d8195e5d5b69901149510165feef6d41772c334460fc07a9146254009e9419213ab6b6fbf45a6a242f6f448da5c09fbb
+DIST libadwaita-1.6.2.tar.xz 4740588 BLAKE2B 91197a072a3763c03e05635505719a3cee0b5f80c5b93a938a6693c084927f6b1d06041ac5a27baa7ea568a8b83224d56016e4d9d0433b426af7b37f28c91b04 SHA512 033b3bd40798108df31ad5196b178b09f8e61687594323cfcbbd4c4e6a532fbd29ec0366a3379e06790ad9c3620079d8f27b8e38d539adba1c78c9ab297f2757
diff --git a/gui-libs/libadwaita/libadwaita-1.5.5.ebuild b/gui-libs/libadwaita/libadwaita-1.5.5.ebuild
new file mode 100644
index 000000000000..785ec42cc6ac
--- /dev/null
+++ b/gui-libs/libadwaita/libadwaita-1.5.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit gnome.org meson python-any-r1 vala virtualx
+
+DESCRIPTION="Building blocks for modern GNOME applications"
+HOMEPAGE="https://gnome.pages.gitlab.gnome.org/libadwaita/ https://gitlab.gnome.org/GNOME/libadwaita"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="+introspection test +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.76:2
+	>=gui-libs/gtk-4.13.4:4[introspection?]
+	dev-libs/appstream:=
+	dev-libs/fribidi
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	${PYTHON_DEPS}
+	vala? ( $(vala_depend) )
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		# Never use gi-docgen subproject
+		--wrap-mode nofallback
+
+		-Dprofiling=false
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		-Dgtk_doc=false # we ship pregenerated docs
+		$(meson_use test tests)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test --timeout-multiplier 2
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install libadwaita API docs unconditionally, but this is intentional
+	doins -r "${S}"/doc/libadwaita-1
+}
diff --git a/gui-libs/libadwaita/libadwaita-1.6.2.ebuild b/gui-libs/libadwaita/libadwaita-1.6.2.ebuild
new file mode 100644
index 000000000000..38195bc0ea78
--- /dev/null
+++ b/gui-libs/libadwaita/libadwaita-1.6.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit gnome.org meson python-any-r1 vala virtualx
+
+DESCRIPTION="Building blocks for modern GNOME applications"
+HOMEPAGE="https://gnome.pages.gitlab.gnome.org/libadwaita/ https://gitlab.gnome.org/GNOME/libadwaita"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="+introspection test +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.76:2
+	>=gui-libs/gtk-4.15.2:4[introspection?]
+	dev-libs/appstream:=
+	dev-libs/fribidi
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	${PYTHON_DEPS}
+	vala? ( $(vala_depend) )
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		# Never use gi-docgen subproject
+		--wrap-mode nofallback
+
+		-Dprofiling=false
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		-Dgtk_doc=false # we ship pregenerated docs
+		$(meson_use test tests)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test --timeout-multiplier 2
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install libadwaita API docs unconditionally, but this is intentional
+	doins -r "${S}"/doc/libadwaita-1
+}
diff --git a/gui-libs/libpanel/Manifest b/gui-libs/libpanel/Manifest
index 8624f70d6c20..e3ed6568e12f 100644
--- a/gui-libs/libpanel/Manifest
+++ b/gui-libs/libpanel/Manifest
@@ -1,2 +1,2 @@
-DIST libpanel-1.4.1.tar.xz 160208 BLAKE2B 01f4a8a77ac4c6d26c05eea9fda88461d8c688f0c80cbb3cc119260814c3766989b6eb9d7893729eca2239670b3a9d089000b5f1185b7650b0bdcf604c7195cf SHA512 44efb5dd29c83471acd64701320b2cb6057c6165c5b7602d2e0b7a40690a493c42ff3b28bc7924569d81c6e6a8ddc784b0df1c351919924807d61c9fdd2a4263
 DIST libpanel-1.6.0.tar.xz 162584 BLAKE2B 1da55961a9f993d2d31a2dab51a687b7b0fe72aa02e0f045bd361db2b67ae3c07dde28b8df031d40b8da73009f721e19eae4a0e4c37c34c8dac4704ffbdd06a9 SHA512 e836941edcff416c5205d5c97b3c9d20b28d7cb7148b342f34dd768b93e3c317b1aa9b97435602c00c3bdbe763d56b112936a8d15117b448fa8bd0fd19204cfb
+DIST libpanel-1.8.1.tar.xz 166860 BLAKE2B 515685ae2142d3159ea3ca02b945d33f0f9e438a40810a7992e4163d78200d9ada86b80fdef3383b571d599fffb5bc7fe26d51c963a0f1060f1dee418e05216b SHA512 321285c4388d69e5a2b827a2a4722602a2915a4f6a3b3ff26130e38c2436fe1145420634fe421e46ea25014843e8ed284d95d079854708d139c460728278021e
diff --git a/gui-libs/libpanel/libpanel-1.4.1.ebuild b/gui-libs/libpanel/libpanel-1.4.1.ebuild
deleted file mode 100644
index 61e3ba1d33ba..000000000000
--- a/gui-libs/libpanel/libpanel-1.4.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson vala xdg
-
-DESCRIPTION="A dock/panel library for GTK 4"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libpanel"
-
-LICENSE="LGPL-3+"
-SLOT="1"
-KEYWORDS="amd64 ~arm64"
-
-IUSE="examples gtk-doc +introspection +vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.75:2
-	>=gui-libs/gtk-4.8:4[introspection?]
-	>=gui-libs/libadwaita-1.2:1
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use examples install-examples)
-		$(meson_feature introspection)
-		$(meson_feature gtk-doc docs)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use gtk-doc; then
-		mkdir "${ED}"/usr/share/gtk-doc || die
-		mv "${ED}"/usr/share/doc/panel-1.0 "${ED}"/usr/share/gtk-doc/ || die
-	fi
-}
diff --git a/gui-libs/libpanel/libpanel-1.8.1.ebuild b/gui-libs/libpanel/libpanel-1.8.1.ebuild
new file mode 100644
index 000000000000..ae4993e809a3
--- /dev/null
+++ b/gui-libs/libpanel/libpanel-1.8.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="A dock/panel library for GTK 4"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libpanel"
+
+LICENSE="LGPL-3+"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="examples gtk-doc +introspection +vala"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.80:2
+	>=gui-libs/gtk-4.15:4[introspection?]
+	>=gui-libs/libadwaita-1.6:1
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use examples install-examples)
+		$(meson_feature introspection)
+		$(meson_feature gtk-doc docs)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use gtk-doc; then
+		mkdir "${ED}"/usr/share/gtk-doc || die
+		mv "${ED}"/usr/share/doc/panel-1.0 "${ED}"/usr/share/gtk-doc/ || die
+	fi
+}
diff --git a/gui-wm/gamescope/Manifest b/gui-wm/gamescope/Manifest
index c22f99550ee1..efab8730e014 100644
--- a/gui-wm/gamescope/Manifest
+++ b/gui-wm/gamescope/Manifest
@@ -1,4 +1,4 @@
-DIST gamescope-3.15.13.tar.gz 575288 BLAKE2B 295b510611495f96f31c8e350a2ff592ac45497e5e2393a44c375729e106f06ab006a58eea34f9cc748a3f7c082b618122570338c17614493e0cc6d90d26d25e SHA512 f85da5a4cc3893d2f7d9a0d817ead0f314b5c2852409954349955cc4e7c19c32946822b12ca0824696186c2e9789412c659027b2a20eeb1e0ab1a2b559db15c2
+DIST gamescope-3.16.1.tar.gz 748201 BLAKE2B 9ad60fa0387baa6a182590d4289f6fc0ae8d4e3d25e3df6906a6ff0000d5e5ffe297ff5a09d541765edbf4b35828cbd156689fd8abc13e4e02850d510b1222b0 SHA512 c47629a6ebd15f0d62ba7283bf0df6d92344d9c7a4b4ea42f2974ad46db60caf0a71b668939b175188b762ee456d54756eb8c64114d779d7efa25773f675efee
 DIST libliftoff-0.5.0.tar.gz 39076 BLAKE2B a5c35c734a5ba4049661ce336401bd88d393001d7c49786d486146998d39530c364f7752b53968f5ab48f5eb774fa9c4245087bdb016f459a729991377023f61 SHA512 ce808f6a087f1f629cfebef95bfc7e216a09fb409b96b3c9f6b84d9d986ce50c5d7bf5b45c68e8baa99566b3627d754c269855b6f4ec3be63ae7b9f5109d5f08
 DIST reshade-696b14cd6006ae9ca174e6164450619ace043283.tar.gz 1684777 BLAKE2B 3b2fcd1ed53dd6a8c459cf716697eec8a21f6fd9c25e4f6baa752e4226eaf35837e0f1595eef065a064bb0d76b1b067f643cd14ef896875448c99f57e10e6fb9 SHA512 7fe1fe07622efd90bd94e1755019ca47657acd07137669e00b97bf70017a58c1f699e3dec1c720caafd1296275c7a25fd2f4d6e478cebbdf48bd69f985a00cdf
 DIST vkroots-5106d8a0df95de66cc58dc1ea37e69c99afc9540.tar.gz 352651 BLAKE2B bc6c7a4f5b4f810c4d87a6cef46e73adb292bc22ae9a40666a6c7c8ab0cbc1973af405b32a5c7a3d38623c92e5d41e8472dabb744fcf31cf29118b9684dcfc32 SHA512 726e65dd0bb322d537e985ba2e504c68ef1b474574f11a5b102edcb8a7b74a6d86dea132c3b11417399a00beff9163e7aad413a389cf6073ec44d5ce6175ffc5
diff --git a/gui-wm/gamescope/gamescope-3.15.13.ebuild b/gui-wm/gamescope/gamescope-3.15.13.ebuild
deleted file mode 100644
index ea1b20937239..000000000000
--- a/gui-wm/gamescope/gamescope-3.15.13.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps meson
-
-MY_PV=$(ver_rs 3 -)
-MY_PV="${MY_PV//_/-}"
-
-DESCRIPTION="Efficient micro-compositor for running games"
-HOMEPAGE="https://github.com/ValveSoftware/gamescope"
-EGIT_SUBMODULES=( src/reshade subprojects/{libliftoff,vkroots,wlroots} )
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/ValveSoftware/${PN}.git"
-	inherit git-r3
-else
-	RESHADE_COMMIT="696b14cd6006ae9ca174e6164450619ace043283"
-	LIBLIFTOFF_COMMIT="0.5.0" # Upstream points at this release.
-	VKROOTS_COMMIT="5106d8a0df95de66cc58dc1ea37e69c99afc9540"
-	WLROOTS_COMMIT="4bc5333a2cbba0b0b88559f281dbde04b849e6ef"
-	SRC_URI="
-		https://github.com/ValveSoftware/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz
-		https://gitlab.freedesktop.org/emersion/libliftoff/-/releases/v${LIBLIFTOFF_COMMIT}/downloads/libliftoff-${LIBLIFTOFF_COMMIT}.tar.gz
-		https://github.com/Joshua-Ashton/reshade/archive/${RESHADE_COMMIT}.tar.gz -> reshade-${RESHADE_COMMIT}.tar.gz
-		https://github.com/Joshua-Ashton/vkroots/archive/${VKROOTS_COMMIT}.tar.gz -> vkroots-${VKROOTS_COMMIT}.tar.gz
-		https://github.com/Joshua-Ashton/wlroots/archive/${WLROOTS_COMMIT}.tar.gz -> wlroots-${WLROOTS_COMMIT}.tar.gz
-	"
-	KEYWORDS="~amd64"
-fi
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="avif libei pipewire +sdl +wsi-layer"
-
-RDEPEND="
-	>=dev-libs/wayland-1.23
-	gui-libs/libdecor
-	<media-libs/libdisplay-info-0.3:=
-	media-libs/vulkan-loader
-	sys-apps/hwdata
-	sys-libs/libcap
-	>=x11-libs/libdrm-2.4.109
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxkbcommon
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXres
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	avif? ( >=media-libs/libavif-1.0.0:= )
-	libei? ( dev-libs/libei )
-	pipewire? ( >=media-video/pipewire-0.3:= )
-	sdl? ( media-libs/libsdl2[video,vulkan] )
-	wsi-layer? ( x11-libs/libxcb )
-"
-# For bundled wlroots.
-RDEPEND+="
-	>=dev-libs/libinput-1.14.0:=
-	media-libs/libglvnd
-	media-libs/mesa[egl(+),gles2(+)]
-	sys-auth/seatd:=
-	virtual/libudev
-	x11-base/xwayland
-	x11-libs/libxcb:=
-	>=x11-libs/pixman-0.42.0
-	x11-libs/xcb-util-wm
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-libs/wayland-protocols-1.34
-	>=dev-libs/stb-20240201-r1
-	dev-util/vulkan-headers
-	media-libs/glm
-	dev-util/spirv-headers
-	wsi-layer? ( >=media-libs/vkroots-0_p20240430 )
-"
-BDEPEND="
-	dev-util/glslang
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-deprecated-stb.patch
-)
-
-FILECAPS=(
-	cap_sys_nice usr/bin/${PN}
-)
-
-src_prepare() {
-	default
-
-	# ReShade is bundled as a git submodule, but it references an unofficial
-	# fork, so we cannot unbundle it. Upstream have requested that we do not
-	# unbundle libliftoff, vkroots, or wlroots. Symlink to the extracted sources
-	# when not using the git submodules in 9999.
-	if [[ ${PV} != "9999" ]]; then
-		local dir name commit
-		for dir in "${EGIT_SUBMODULES[@]}"; do
-			rmdir "${dir}" || die
-			name=${dir##*/}
-			commit=${name^^}_COMMIT
-			ln -snfT "../../${name}-${!commit}" "${dir}" || die
-		done
-	fi
-
-	# SPIRV-Headers is required by ReShade. It is bundled as a git submodule but
-	# not wrapped with Meson, so we can symlink to our system-wide headers.
-	# For 9999, this submodule is not included.
-	mkdir -p thirdparty/SPIRV-Headers/include || die
-	ln -snf "${ESYSROOT}"/usr/include/spirv thirdparty/SPIRV-Headers/include/ || die
-}
-
-src_configure() {
-	# Disabling DRM backend is currently broken.
-	# https://github.com/ValveSoftware/gamescope/issues/1347
-	local emesonargs=(
-		$(meson_feature pipewire)
-		-Ddrm_backend=enabled
-		$(meson_feature sdl sdl2_backend)
-		$(meson_feature avif avif_screenshots)
-		$(meson_feature libei input_emulation)
-		$(meson_use wsi-layer enable_gamescope_wsi_layer)
-		-Denable_openvr_support=false
-		-Dbenchmark=disabled
-
-		-Dwlroots:xcb-errors=disabled
-		-Dwlroots:examples=false
-		-Dwlroots:renderers=gles2,vulkan
-		-Dwlroots:xwayland=enabled
-		-Dwlroots:backends=libinput
-		-Dwlroots:session=enabled
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install --skip-subprojects
-}
diff --git a/gui-wm/gamescope/gamescope-3.16.1.ebuild b/gui-wm/gamescope/gamescope-3.16.1.ebuild
new file mode 100644
index 000000000000..6fae2a06c02b
--- /dev/null
+++ b/gui-wm/gamescope/gamescope-3.16.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps meson
+
+MY_PV=$(ver_rs 3 -)
+MY_PV="${MY_PV//_/-}"
+
+DESCRIPTION="Efficient micro-compositor for running games"
+HOMEPAGE="https://github.com/ValveSoftware/gamescope"
+EGIT_SUBMODULES=( src/reshade subprojects/{libliftoff,vkroots,wlroots} )
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/ValveSoftware/${PN}.git"
+	inherit git-r3
+else
+	RESHADE_COMMIT="696b14cd6006ae9ca174e6164450619ace043283"
+	LIBLIFTOFF_COMMIT="0.5.0" # Upstream points at this release.
+	VKROOTS_COMMIT="5106d8a0df95de66cc58dc1ea37e69c99afc9540"
+	WLROOTS_COMMIT="4bc5333a2cbba0b0b88559f281dbde04b849e6ef"
+	SRC_URI="
+		https://github.com/ValveSoftware/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://gitlab.freedesktop.org/emersion/libliftoff/-/releases/v${LIBLIFTOFF_COMMIT}/downloads/libliftoff-${LIBLIFTOFF_COMMIT}.tar.gz
+		https://github.com/Joshua-Ashton/reshade/archive/${RESHADE_COMMIT}.tar.gz -> reshade-${RESHADE_COMMIT}.tar.gz
+		https://github.com/Joshua-Ashton/vkroots/archive/${VKROOTS_COMMIT}.tar.gz -> vkroots-${VKROOTS_COMMIT}.tar.gz
+		https://github.com/Joshua-Ashton/wlroots/archive/${WLROOTS_COMMIT}.tar.gz -> wlroots-${WLROOTS_COMMIT}.tar.gz
+	"
+	KEYWORDS="~amd64"
+fi
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="avif libei pipewire +sdl +wsi-layer"
+
+RDEPEND="
+	dev-lang/luajit:2=
+	>=dev-libs/wayland-1.23
+	gui-libs/libdecor
+	<media-libs/libdisplay-info-0.3:=
+	media-libs/vulkan-loader
+	sys-apps/hwdata
+	sys-libs/libcap
+	>=x11-libs/libdrm-2.4.109
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxkbcommon
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXres
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	avif? ( >=media-libs/libavif-1.0.0:= )
+	libei? ( dev-libs/libei )
+	pipewire? ( >=media-video/pipewire-0.3:= )
+	sdl? ( media-libs/libsdl2[video,vulkan] )
+	wsi-layer? ( x11-libs/libxcb )
+"
+# For bundled wlroots.
+RDEPEND+="
+	>=dev-libs/libinput-1.14.0:=
+	media-libs/libglvnd
+	media-libs/mesa[egl(+),gles2(+)]
+	sys-auth/seatd:=
+	virtual/libudev
+	x11-base/xwayland
+	x11-libs/libxcb:=
+	>=x11-libs/pixman-0.42.0
+	x11-libs/xcb-util-wm
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-libs/wayland-protocols-1.34
+	>=dev-libs/stb-20240201-r1
+	dev-util/vulkan-headers
+	media-libs/glm
+	dev-util/spirv-headers
+	wsi-layer? ( >=media-libs/vkroots-0_p20240430 )
+"
+BDEPEND="
+	dev-util/glslang
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-deprecated-stb.patch
+)
+
+FILECAPS=(
+	cap_sys_nice usr/bin/${PN}
+)
+
+src_prepare() {
+	default
+
+	# ReShade is bundled as a git submodule, but it references an unofficial
+	# fork, so we cannot unbundle it. Upstream have requested that we do not
+	# unbundle libliftoff, vkroots, or wlroots. Symlink to the extracted sources
+	# when not using the git submodules in 9999.
+	if [[ ${PV} != "9999" ]]; then
+		local dir name commit
+		for dir in "${EGIT_SUBMODULES[@]}"; do
+			rmdir "${dir}" || die
+			name=${dir##*/}
+			commit=${name^^}_COMMIT
+			ln -snfT "../../${name}-${!commit}" "${dir}" || die
+		done
+	fi
+
+	# SPIRV-Headers is required by ReShade. It is bundled as a git submodule but
+	# not wrapped with Meson, so we can symlink to our system-wide headers.
+	# For 9999, this submodule is not included.
+	mkdir -p thirdparty/SPIRV-Headers/include || die
+	ln -snf "${ESYSROOT}"/usr/include/spirv thirdparty/SPIRV-Headers/include/ || die
+}
+
+src_configure() {
+	# Disabling DRM backend is currently broken.
+	# https://github.com/ValveSoftware/gamescope/issues/1347
+	local emesonargs=(
+		$(meson_feature pipewire)
+		-Ddrm_backend=enabled
+		$(meson_feature sdl sdl2_backend)
+		$(meson_feature avif avif_screenshots)
+		$(meson_feature libei input_emulation)
+		$(meson_use wsi-layer enable_gamescope_wsi_layer)
+		-Denable_openvr_support=false
+		-Dbenchmark=disabled
+
+		-Dwlroots:xcb-errors=disabled
+		-Dwlroots:examples=false
+		-Dwlroots:renderers=gles2,vulkan
+		-Dwlroots:xwayland=enabled
+		-Dwlroots:backends=libinput
+		-Dwlroots:session=enabled
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install --skip-subprojects
+}
diff --git a/kde-apps/akonadi-calendar-tools-common/Manifest b/kde-apps/akonadi-calendar-tools-common/Manifest
index 179c3cdcaef0..c6e85cbf15b7 100644
--- a/kde-apps/akonadi-calendar-tools-common/Manifest
+++ b/kde-apps/akonadi-calendar-tools-common/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-calendar-tools-24.08.3.tar.xz 264972 BLAKE2B 42ac0a8451ac363d08b0ea322259c31423ced43aab36814b88e49adea48593a9806c36450ee5ca194f59ca6ecb621912890087d315e44b20438ebf5dec8b92d4 SHA512 0f7a5f7ef5939191b5a834a80f6b4f0bc32125dde62135eeb1a55235bbffeb7905b8e3c22b1aa57648e132a5f5a5172060c91025a0bbd4693bc363dfcefd36ef
-DIST akonadi-calendar-tools-24.12.0.tar.xz 269360 BLAKE2B 5fadc86b2788e3d0c21dc8c2ba258b964e65a49e676a9fe1d6f197b43c8b7ce4bedf70d08d1794149903f9516079546350ce45727bdc0c12fde988161bf262e9 SHA512 dbfcb7282f48cf3bd88d2f896bb6220d8ab5bfcb5cf86068e0b791b272e8d8e2957a89f3e12390baa408a9bee8a650f4cdc97d514a4ee34af1db749ce308f411
+DIST akonadi-calendar-tools-24.12.1.tar.xz 269344 BLAKE2B 1e23f31c2de6c9ba74ec2a547702666218226443b2258a6b11c2e3aad63690fe69b5038419a25fd316ca1b389a100574fed3a090f0eeae6a691bf37f8255fadd SHA512 ffd91a886a8b94d22fb1102cff28aa1e64b21bf3b1af4aad9b844df3d6cacbac6fcbf8413682c2d7d2067dbfab2d1a1dfbec47f4bf751b9fe0a8b328db317477
diff --git a/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.12.0-r1.ebuild b/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.12.0-r1.ebuild
deleted file mode 100644
index 0a0bb03bd6c4..000000000000
--- a/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="true"
-KDE_ORG_NAME="${PN/-common/}"
-inherit ecm-common gear.kde.org
-
-LICENSE="GPL-2 handbook? ( FDL-1.2+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	!<kde-apps/calendarjanitor-24.07.90-r1
-	!<kde-apps/konsolekalendar-24.07.90-r1
-"
diff --git a/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.12.1.ebuild b/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.12.1.ebuild
new file mode 100644
index 000000000000..bbddd935b6c5
--- /dev/null
+++ b/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.12.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+KDE_ORG_NAME="${PN/-common/}"
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2 handbook? ( FDL-1.2+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	!<kde-apps/calendarjanitor-24.07.90-r1
+	!<kde-apps/konsolekalendar-24.07.90-r1
+"
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index 07eb92eecef0..5d8f6c6ee9eb 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-calendar-24.08.3.tar.xz 522188 BLAKE2B b42b8405e40f938d7cc9ee3e1d75ec40fa7d1bd438fc0a8a813ea13610155b3facd291fe2b2edf099d15f0ad5b64c7052ba7120fb2c9462c7b83ae3a6eb2d7f7 SHA512 d8f656ef675abe7d778ae6ffe92e49d37625c1420948ff97b10fa12505448565ed2104dda3c13b37e13c17af44f5c98fd6fe4b229423ab1f7d199257b597deea
-DIST akonadi-calendar-24.12.0.tar.xz 524592 BLAKE2B 74892e00eda8e9abd0b1254087030c362020f776ce3f9c93c999abb34a4ccc3254335ce5946c21256e6e47f11055b078a38125d109ace68ffaefdbb1ee933d69 SHA512 a26e5ef14a5a9c10b4be6cd8b1a6c1e760b5910bf3e9a3b98c14fa3add97d59450bafa0e733755e34eb02adf9717947562f0db48691a93baf37dba9f90e43f92
+DIST akonadi-calendar-24.12.1.tar.xz 524552 BLAKE2B 5367103ef2f69d1b5ed0acf7246b29303447498cc34a03bb3db04dc6cb18f24176619e009320cba6a91a4c5da70f5e76421bf5a013b036736c438b46d22afa54 SHA512 1767249c197aba4ee79464f57b7635e4361fb0dcc311bf7b4cb23ec1e3918e677579025a153c20f2988826d3e91191292f4cd0ada49b19ecec645c0f1c8a0525
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-24.12.0-r1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-24.12.0-r1.ebuild
deleted file mode 100644
index 01455ab03597..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for akonadi calendar integration"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkleo-${PVCUT}:6
-	>=kde-apps/messagelib-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-24.12.1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-24.12.1.ebuild
new file mode 100644
index 000000000000..718e18f4d446
--- /dev/null
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-24.12.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for akonadi calendar integration"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkleo-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index 0da72165d153..9b458e73e76c 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-contacts-24.08.3.tar.xz 436188 BLAKE2B d9c91e39efb4ec98ce0c57668399454ce0f515b6256c134f1adb356ee437f206f1c793e973e17b485f4c5570f56aeb896e9eebf8ef5564aee362e45c0f87dff5 SHA512 a6a42c9219fa9bfbb5474d45b64daaca00bb6e551f5f655af6625096704458d40242d099e330d0390bac2126ed1cc54412f6222ba7d4a39f5e955de58fb6f92f
-DIST akonadi-contacts-24.12.0.tar.xz 436684 BLAKE2B d309b0c059bf60f5b0e8c92b88c849558d4b87f57babfd6ccf8a725031fd515205d8ed79a80e94d0ea05b82fc9b1fdd0b5d6d17001f964ea08367838d36d8b05 SHA512 e48a081384314f393480ace7541c7208e5036036f19f31c0b028a90feda891efd1b4e9bab942ee9d2138051cc9ee06def3085eeab243a554548a799f2c5292fa
+DIST akonadi-contacts-24.12.1.tar.xz 436708 BLAKE2B 86af240ef6d8bbb3f16658d49e5262ce55267226ee735ba77c9228150e8a9ba07c273405a6be5d75ca49955d5de4cc2625034b72348e7a83538586b67ba9ad78 SHA512 a06052b59b6f8637113e713cd5b3bea421878253c9a4386069b59475b10b27d633832c391dd334d725a07d09b99d7f501cd9fddbafb242b0068411b11b806315
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-24.12.0-r1.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-24.12.0-r1.ebuild
deleted file mode 100644
index c32c4fdafd2b..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for akonadi contact integration"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/grantleetheme-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktexttemplate-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/prison-${KFMIN}:6
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-24.12.1.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-24.12.1.ebuild
new file mode 100644
index 000000000000..2477cf6e53c8
--- /dev/null
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-24.12.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for akonadi contact integration"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/grantleetheme-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexttemplate-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/prison-${KFMIN}:6
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index 0183964023d2..4a08734d24bf 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-import-wizard-24.08.3.tar.xz 490288 BLAKE2B b8b768cdc6f2de51d44069a5b8e16d19dcc1c796fcc2e6601b8bfc94841070a58cc690ceb966c9b51f0d418c9c4d0b8f001c41f095a9e35464aee67840d30274 SHA512 4f5c5e34f155a55ac1f063c2506d39cfaca1890456de1d6d7eebafd58fa5e9d94dcdf29fd2e65bc45f6c1ec098a02709c944871f6deb0474968c0e8fe12ce4e9
-DIST akonadi-import-wizard-24.12.0.tar.xz 491896 BLAKE2B 48ff8daf1515125c61efd38dd62aa19a32fd40ce1d4b4dfd6067d0370f29870d133ca61dca1f61c5450390a93cf8818080d84c0c4366746df23c69db1fb821f8 SHA512 d5217a4fb33d5829b3c3ad3b259ed6478aa6f626a445e177e79ea5e12dff4070823d38c39034b49a21723bb40fc9906b5635262f1234b6886d0fc3c0576223c2
+DIST akonadi-import-wizard-24.12.1.tar.xz 492024 BLAKE2B 6c8ed233f713aa1a5da5e699f93a7acbd24879e458492a9cb3dc87c93b3f2dbc549b91fc9acfbb4b2a200c74c4fbf3efd9077dbeb64ee8c2d3dd77e039be915f SHA512 07cf475a5b8ff7d480564ebddfcf79f3707135d5101c9645b42a10498be3eb5dda0f45817747a27bda8b2005a32c060fe9554d686a17c26a5c503fbe5419dfb4
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.12.0-r1.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.12.0-r1.ebuild
deleted file mode 100644
index 7d9516d0e3d3..000000000000
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
-HOMEPAGE+=" https://userbase.kde.org/KMail/Import_Options"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/mailcommon-${PVCUT}:6
-	>=kde-apps/mailimporter-${PVCUT}:6
-	>=kde-apps/messagelib-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.12.1.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.12.1.ebuild
new file mode 100644
index 000000000000..77eb7d25e818
--- /dev/null
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
+HOMEPAGE+=" https://userbase.kde.org/KMail/Import_Options"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/mailcommon-${PVCUT}:6
+	>=kde-apps/mailimporter-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index b6757f4b2d76..c046bde6c9ea 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-mime-24.08.3.tar.xz 174924 BLAKE2B 1977519c5ab63be610fd7c68a28f073cc28e4b42c72dc059d69520d51ee4cddb8e55b788838c976996eb1d8104c2cd12140374430f2f1b510d370b8d6f6b8d47 SHA512 bb3068fc13312569bf2c2be8c32f7c1e0ebc16b8bfe0cf65ff2335f5b07560261834754115aabf6c904acda3a8f74ba36087f90a8b6ca1be67dd50ad67018b25
-DIST akonadi-mime-24.12.0.tar.xz 175360 BLAKE2B 38cff3c0e72d855e156bb3c98ecab58316d35a1d8e72fce63ccb8e9031c01bc7a69cbc17a4b01c1ea0eca3b06704d7bbea9067351c6af63fd79bbd1d1660b14a SHA512 a1a182bdc8999379c2163b60ee0ac19a65a8a32811fcd7af2ca36d11f88280d8851a6443635f1b95a9e9fc8c8cb61a00d3006cc4d113660caad8588acbc32089
+DIST akonadi-mime-24.12.1.tar.xz 175396 BLAKE2B 3b15940ffb3f6c4a4e05714faa37d487a514f660e0071e177b8f003b6adcc28e2fc5509c4ad82ab5a0afd05b3da26de31d227cb1cf53f1910f60303fe3728750 SHA512 14120f1c6b85d331d97b99be6464818feff44af81837a7a294cd6b4ee9604c3ec696bdfc7d27b19b5ffed7e6a3269f9b2f8ca95ab1b5c164999459d98a49673b
diff --git a/kde-apps/akonadi-mime/akonadi-mime-24.12.0-r1.ebuild b/kde-apps/akonadi-mime/akonadi-mime-24.12.0-r1.ebuild
deleted file mode 100644
index 50af438d0ea0..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for akonadi mime types"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-libs/libxslt"
diff --git a/kde-apps/akonadi-mime/akonadi-mime-24.12.1.ebuild b/kde-apps/akonadi-mime/akonadi-mime-24.12.1.ebuild
new file mode 100644
index 000000000000..b8a53145d522
--- /dev/null
+++ b/kde-apps/akonadi-mime/akonadi-mime-24.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for akonadi mime types"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-libs/libxslt"
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index ffbe47b09219..234e32f54b1e 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-search-24.08.3.tar.xz 113136 BLAKE2B c00f94bea69ff2d5b7bb9d91038a60320551e3a09d32a8577b5bd8e927fa7fc1a362e06a36d309ada4149412afb92f22325f27d6a1a3908e948f3863b4274a0a SHA512 ba35e8632703b22398c7221b98c01dc010fb2aba066fb89e74da1665380f2029aaee73532addcf99bdf149c024f6dd8846ebfa5af1cf4d62e574496164fe6efa
-DIST akonadi-search-24.12.0.tar.xz 113184 BLAKE2B 0c698e0eefb8fa5a568f4359474930c0bbaba5f34d91bf91db886a67c4b70cc15722f66ef1813c94ec12df4ceb07f74ff4ee36274ab7adb42a2a182f99e78819 SHA512 545f67b68425461af8c084e18778759903b982011645fa8e15c72432365dda00229a5f5637d427e62d5324e6ac26c79f9829f43a650739dbd47f97068fd32b97
+DIST akonadi-search-24.12.1.tar.xz 113216 BLAKE2B fff56af941f14f7172f5e1719f286af46ddad7d8d51eceec9ae4ce5b6f45b750f1b828cff2ee261e7e716ac807f917a82cf3972f6b4610e8c4c97c483b0fd0e4 SHA512 9fe215172f8cfefa3ab676110cbe1cbfbf95663fe4742e795135b0a2d54453eb35015128becff91bc80d7f0c5008bf880423f3376f82d97ca5afcc71fc967fff
diff --git a/kde-apps/akonadi-search/akonadi-search-24.12.0-r1.ebuild b/kde-apps/akonadi-search/akonadi-search-24.12.0-r1.ebuild
deleted file mode 100644
index 4ba23f417155..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-24.12.0-r1.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
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
-HOMEPAGE="https://invent.kde.org/pim/akonadi-search"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test" # perpetually broken, bug 662378
-
-RDEPEND="
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-libs/xapian-1.3:=[chert(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/krunner-${KFMIN}:6
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	test? ( kde-apps/akonadi-config[mysql,postgres,sqlite] )
-"
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
-"
-
-src_configure() {
-	# not packaged (bug 911819), but if present leads to rust shenanigans (bug 927072)
-	local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Corrosion=ON )
-	ecm_src_configure
-}
diff --git a/kde-apps/akonadi-search/akonadi-search-24.12.1.ebuild b/kde-apps/akonadi-search/akonadi-search-24.12.1.ebuild
new file mode 100644
index 000000000000..385461344d21
--- /dev/null
+++ b/kde-apps/akonadi-search/akonadi-search-24.12.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
+HOMEPAGE="https://invent.kde.org/pim/akonadi-search"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test" # perpetually broken, bug 662378
+
+RDEPEND="
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-libs/xapian-1.3:=[chert(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/krunner-${KFMIN}:6
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	test? ( kde-apps/akonadi-config[mysql,postgres,sqlite] )
+"
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
+"
+
+src_configure() {
+	# not packaged (bug 911819), but if present leads to rust shenanigans (bug 927072)
+	local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Corrosion=ON )
+	ecm_src_configure
+}
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index c36ddbb42688..513601ecdcd3 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-24.08.3.tar.xz 1705408 BLAKE2B c209d3edda626f0768e05d5f63060068b06113cd2d31c53b9e335b4fb815d97280614d161ba4619795ab2c8604270dd613f036f9bdff1bcc3c86740194e48047 SHA512 efed4b344ab25ba986269b79b9157e3c5d1542fe93c4cd037a030b6740d564baf651de1e2db206cb996a46a6d007c787cdae8eef32df9ed70d1eee5d537b2167
-DIST akonadi-24.12.0.tar.xz 1710188 BLAKE2B d4ed95eb1d0e70db3eec9566c885d935f45265e6348a102fc4c8f6121ee37f330fd4c5700b9b82f058cae86bce6444be3814ad937e53e3276b41f80d54bc2bff SHA512 c440a8def80f66332f383b84987ed972456ff8a5b8f86bbca13c2d213d610f831020d90041a994a7a39b40fd39ebcb4c414796d92a33e62072f9b1abaccdf384
+DIST akonadi-24.12.1.tar.xz 1711160 BLAKE2B 5c41a004e81a9e0ce3bb66387cb848b1c697daf3e9a1f90c417a1f8d441902f600c9a515c672504a40ebbd9f852d34992b013ddaf033b4e560e944f5dbbacd48 SHA512 d49fb9b0fc5c36989644b284958c2398b0454da5d43753bcba59879ff54d88c730853e27e8ca3f173109c471e3391a9e4261d114d274ca8679aeecead3b205ee
diff --git a/kde-apps/akonadi/akonadi-24.12.0-r1.ebuild b/kde-apps/akonadi/akonadi-24.12.0-r1.ebuild
deleted file mode 100644
index a24ee7c7e6e5..000000000000
--- a/kde-apps/akonadi/akonadi-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-KFMIN=6.7.0
-QTMIN=6.7.2
-VIRTUALDBUS_TEST="true"
-inherit ecm gear.kde.org
-
-DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
-HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
-
-LICENSE="LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="tools +webengine xml"
-
-REQUIRED_USE="test? ( tools )"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT="test"
-
-COMMON_DEPEND="
-	app-arch/xz-utils
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets,xml]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	webengine? (
-		kde-apps/kaccounts-integration:6
-		>=net-libs/accounts-qt-1.17[qt6(+)]
-	)
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
-	kde-apps/akonadi-config
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TOOLS=$(usex tools)
-		$(cmake_use_find_package webengine AccountsQt6)
-		$(cmake_use_find_package webengine KAccounts6)
-		$(cmake_use_find_package xml LibXml2)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/akonadi/akonadi-24.12.1.ebuild b/kde-apps/akonadi/akonadi-24.12.1.ebuild
new file mode 100644
index 000000000000..ccdf00085d06
--- /dev/null
+++ b/kde-apps/akonadi/akonadi-24.12.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+VIRTUALDBUS_TEST="true"
+inherit ecm gear.kde.org
+
+DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
+HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="tools +webengine xml"
+
+REQUIRED_USE="test? ( tools )"
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-arch/xz-utils
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets,xml]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	webengine? (
+		kde-apps/kaccounts-integration:6
+		>=net-libs/accounts-qt-1.17[qt6(+)]
+	)
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${COMMON_DEPEND}
+	kde-apps/akonadi-config
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TOOLS=$(usex tools)
+		$(cmake_use_find_package webengine AccountsQt6)
+		$(cmake_use_find_package webengine KAccounts6)
+		$(cmake_use_find_package xml LibXml2)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 70772453b16a..5b7efabe4a75 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,2 +1,2 @@
 DIST akonadiconsole-24.08.3.tar.xz 304556 BLAKE2B 665295a2c220ec3898dac88c162959f907628a152902de4047d2b13500d654ee9ff4d7930e99451a8602c2b1a7234a7324ebabe7f08a6827c151a9715a43f4be SHA512 88a0874b32e1ba36d5e748414a37cd018dbb9c6b62f3f50da651be74fee4454045045d2b41f0a0a712294dd030eb60b50bce3342b1a9e3cc9bd91a976ed2ef61
-DIST akonadiconsole-24.12.0.tar.xz 313788 BLAKE2B 3d6d3a152091be25dd15d3ff1e4aaf3988ffbe3efe8dfd2938da85d1cfee8fb669ab9baa99ea9695667e0870d8e2994675dea8268215cb5734b0f22daae2de36 SHA512 889b3b63ee651188abc3632ad63f44394367a8f0330e0df7b7b4e3e898ceb2dd236defac48b88da48a3fc418abb18a36b76fdddf8380c49f59f3a20ba55a0241
+DIST akonadiconsole-24.12.1.tar.xz 313952 BLAKE2B 31b2a3b8b9deb78f3a2fad1d1099a2908c4dbd49609f31e4829f2d4d3971679be4ace2e8d70a194bcdd2166f88a4a8cfd762e68cbb4f3eabb01ee89d643b8a1c SHA512 df04efff1c6654f0718c7bcf2238ad191ec5bce6e1ee716ca398d136d84355def62db7c3f1b603fbfdd76a990886b1e1bf95324cdc1307f329c3190e69fdf005
diff --git a/kde-apps/akonadiconsole/akonadiconsole-24.12.0-r1.ebuild b/kde-apps/akonadiconsole/akonadiconsole-24.12.0-r1.ebuild
deleted file mode 100644
index 2dca39b528fb..000000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Application for debugging Akonadi Resources"
-HOMEPAGE="https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools"
-
-LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	dev-libs/xapian:=
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/akonadi-search-${PVCUT}:6
-	>=kde-apps/calendarsupport-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/messagelib-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadiconsole/akonadiconsole-24.12.1.ebuild b/kde-apps/akonadiconsole/akonadiconsole-24.12.1.ebuild
new file mode 100644
index 000000000000..580613890a8f
--- /dev/null
+++ b/kde-apps/akonadiconsole/akonadiconsole-24.12.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Application for debugging Akonadi Resources"
+HOMEPAGE="https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools"
+
+LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	dev-libs/xapian:=
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/akonadi-search-${PVCUT}:6
+	>=kde-apps/calendarsupport-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 34cdf6f7ce2c..dd567d4b27a9 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,2 +1,2 @@
 DIST akregator-24.08.3.tar.xz 2126716 BLAKE2B 212116876d2abd34584af7cc7ffb15ab7d1c2158c097ae7c12897bbb254dd2b303d0f8f9511b47a88f390ac1f250a404af7c98053f78476fa0e9447ba21a8294 SHA512 21226b7fad775e0ac4cb271e5040f0c426103ea76624bbe015c50b1f88dd2c0f35918aaf7efb3669a999aadbfd9633c0a324d10989b26f9b2aaba9034613a892
-DIST akregator-24.12.0.tar.xz 2134208 BLAKE2B 52f299bd73abdf94e03075a2b2bf33a9fd68d1b7bdbd25a32cc88ae579b5ff3e807f570267212f5928fc0a9d16283e439e47dc595833167eacd3546d7e03c88b SHA512 3683ff788243b73178b762815b511de939f51ce98f03e96bcb084dafab6cf2251b256eded8abfdc5c48ee73ea1395ac1f38ec1f39277e977b9f5913a1079fb57
+DIST akregator-24.12.1.tar.xz 2134288 BLAKE2B 03966ab95946d5865d26da6b764e76e4a22b3e5f4a00270cc6f6dc6c1b618a7362175a494e29a5b5c1002a09e79f2d69b1d62fadc548cb63d11718c64aac9bc9 SHA512 e7f21526af650a619f850c5338b66cb97495573cd1c04afe96d14acfd52529d039d95f012e34a8a42679ac08750f11cd04f28fab04029737fc9c78f494c48675
diff --git a/kde-apps/akregator/akregator-24.12.0-r1.ebuild b/kde-apps/akregator/akregator-24.12.0-r1.ebuild
deleted file mode 100644
index cd35476b4026..000000000000
--- a/kde-apps/akregator/akregator-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://apps.kde.org/akregator/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="activities speech telemetry"
-
-RDEPEND="
-	>=dev-libs/ktextaddons-1.5.4:6[speech?]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-apps/grantleetheme-${PVCUT}:6
-	>=kde-apps/kontactinterface-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/messagelib-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/syndication-${KFMIN}:6
-	activities? ( kde-plasma/plasma-activities:6 )
-	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
-		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
-		$(cmake_use_find_package telemetry KF6UserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/akregator/akregator-24.12.1.ebuild b/kde-apps/akregator/akregator-24.12.1.ebuild
new file mode 100644
index 000000000000..0fe5a531db13
--- /dev/null
+++ b/kde-apps/akregator/akregator-24.12.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="News feed aggregator"
+HOMEPAGE="https://apps.kde.org/akregator/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities speech telemetry"
+
+RDEPEND="
+	>=dev-libs/ktextaddons-1.5.4:6[speech?]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-apps/grantleetheme-${PVCUT}:6
+	>=kde-apps/kontactinterface-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/syndication-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
+		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index c7e81c738458..a09018a682d1 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,2 +1,3 @@
 DIST analitza-24.08.3.tar.xz 359932 BLAKE2B 4fb190be849c36379dc89a0eb098ca10894afa38ae2d53ca88863fe4a04587daff14f378a127a70c3aed6ab4f44f0df8c3149fc6ccd831e5cc6cee9101547a2c SHA512 3ec18dfb0f15577fb7f4d233723bc20da8cf0fddf01f289962f86b4b1af4766add16499eae91d40f6e77f920b07d620a0edc00bac2e179831412d7c58a7351b8
 DIST analitza-24.12.0.tar.xz 359960 BLAKE2B 0caf1e3371acaa3030881fc05d6801200adc99a4b7bbe538a316d7b633acf8a5f75e309caa6be297741a3e6be27998b296abf4ae1d1300c1239b939f314dfc13 SHA512 fcee0187c1a4bf4964140cce9a00d49897e72b14d5d5fe352a4c09c20890af6b71756bbc60c751c4a8190cb77054b54f6d3e9db13d03b3237a2285f655bac952
+DIST analitza-24.12.1.tar.xz 359992 BLAKE2B 08a0e2898ca1f22bb52ed592e3835b364c06babd4955930967492a3f17c7da2991805d84d9f1f7fbb422f30c0a23f5d4d217815d8a5ae8b45bccccb736bd55e3 SHA512 a43200449de93070284f665304206a6bbe5b02db5fd390e545c456466f7300b79ae15e37d442fcbb8f3c7ac33e41212b2b0d95ef9ace18841ebb082e385cc605
diff --git a/kde-apps/analitza/analitza-24.12.0.ebuild b/kde-apps/analitza/analitza-24.12.0.ebuild
index e23c1d2a0192..9a1a98605d09 100644
--- a/kde-apps/analitza/analitza-24.12.0.ebuild
+++ b/kde-apps/analitza/analitza-24.12.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
@@ -12,7 +12,7 @@ DESCRIPTION="KDE library for mathematical features"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 IUSE="eigen"
 
 DEPEND="
diff --git a/kde-apps/analitza/analitza-24.12.1.ebuild b/kde-apps/analitza/analitza-24.12.1.ebuild
new file mode 100644
index 000000000000..1db2f37d7ef1
--- /dev/null
+++ b/kde-apps/analitza/analitza-24.12.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE library for mathematical features"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="eigen"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[-gles2-only,gui,opengl,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	eigen? ( dev-cpp/eigen:3 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use test; then
+		sed -i \
+			-e "/add_subdirectory(examples)/ s/^/#DONT/" \
+			analitzaplot/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package eigen Eigen3)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index 817a19a64b2d..ab38a8f71b27 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,2 +1,2 @@
 DIST ark-24.08.3.tar.xz 3008292 BLAKE2B 1d80e62f7af2e6d6e2f20f23e1def108f1bed35b812521d662d2e1bc7eba3dc77b760e6c72e9f02b7ec10acc14653e18e9c8578981c00156e2fc3cddab497cb2 SHA512 163aab6ef3c0d5027e78558bfb5500111ec96cb0a3bca6a614f7f88b2980e42221be476898fec6a414d6a6af3769a03c6962fcb340b00a2aee3346089b8111e2
-DIST ark-24.12.0.tar.xz 3010228 BLAKE2B d65975412c9bbfbd04fee717e191c67202ad81c6383fd049bb4114b28dd8782793382714a17fef65d35138e889c7475be4861c45f5967c0e2da9f18151f05779 SHA512 4762a92bc85895ab4a6c8c3c5cb146f8f86f0f3508b624b24e2c9e6cc04edd5c317e6654a83931b1343d7569d018bd9cee531790204649b4dcf08816124e43e9
+DIST ark-24.12.1.tar.xz 3010180 BLAKE2B 6b724057c407dd0173fc9569fc092b1895fd71c0ff4630c91d163d2287a1c8c6af60747337c6b4ae351c406f03fcea1ef8673af8def0d19bac0e3dfd1e1affd0 SHA512 1375377085204f2c775393a0aee590dc1801787272f2ac2e2ff3b81f7f89631941908d1b7a113d2c13ee82ba616b321049e65b768c33647c13a19721c61109e8
diff --git a/kde-apps/ark/ark-24.12.0.ebuild b/kde-apps/ark/ark-24.12.0.ebuild
deleted file mode 100644
index 74d4475a83cf..000000000000
--- a/kde-apps/ark/ark-24.12.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org optfeature
-
-DESCRIPTION="File archiver by KDE"
-HOMEPAGE="https://apps.kde.org/ark/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="zip"
-
-RDEPEND="
-	>=app-arch/libarchive-3.5.3:=[bzip2,lzma]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kfilemetadata-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kpty-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	sys-libs/zlib
-	zip? ( >=dev-libs/libzip-1.6.0:= )
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
-	test? ( >=dev-libs/libzip-1.6.0:= )
-"
-# app-arch/rar is binary only
-BDEPEND="
-	sys-devel/gettext
-	elibc_glibc? ( test? ( amd64? ( app-arch/rar ) x86? ( app-arch/rar ) ) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package zip LibZip)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# bug 822177: kerfuffle-addtoarchivetest: may segfault or hang indefinitely
-		# bug 827840: plugins-clirartest: continuously broken with translations installed
-		-E "(kerfuffle-addtoarchivetest|plugins-clirartest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "rar archive creation/extraction" "app-arch/rar"
-		optfeature "rar archive extraction only" "app-arch/unar" "app-arch/unrar"
-		optfeature "7-Zip archive support" "app-arch/p7zip"
-		optfeature "lrz archive support" "app-arch/lrzip"
-		optfeature "Markdown support in text previews" "kde-misc/markdownpart:${SLOT}"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/ark/ark-24.12.1.ebuild b/kde-apps/ark/ark-24.12.1.ebuild
new file mode 100644
index 000000000000..846e26868163
--- /dev/null
+++ b/kde-apps/ark/ark-24.12.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="File archiver by KDE"
+HOMEPAGE="https://apps.kde.org/ark/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="zip"
+
+RDEPEND="
+	>=app-arch/libarchive-3.5.3:=[bzip2,lzma]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kfilemetadata-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kpty-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	sys-libs/zlib
+	zip? ( >=dev-libs/libzip-1.6.0:= )
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+	test? ( >=dev-libs/libzip-1.6.0:= )
+"
+# app-arch/rar is binary only
+BDEPEND="
+	sys-devel/gettext
+	elibc_glibc? ( test? ( amd64? ( app-arch/rar ) x86? ( app-arch/rar ) ) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package zip LibZip)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# bug 822177: kerfuffle-addtoarchivetest: may segfault or hang indefinitely
+		# bug 827840: plugins-clirartest: continuously broken with translations installed
+		-E "(kerfuffle-addtoarchivetest|plugins-clirartest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "rar archive creation/extraction" "app-arch/rar"
+		optfeature "rar archive extraction only" "app-arch/unar" "app-arch/unrar"
+		optfeature "7-Zip archive support" "app-arch/p7zip"
+		optfeature "lrz archive support" "app-arch/lrzip"
+		optfeature "Markdown support in text previews" "kde-misc/markdownpart:${SLOT}"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index ebe8bab6b267..37203241d8a0 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,2 +1,2 @@
 DIST artikulate-24.08.3.tar.xz 1054336 BLAKE2B f5351b33cfdb316e33eddd8c88f1f16082fa4322461ad421561bbdc907e07716e43f158b5592a8c9973f83ad4fc799129725f2604da240a01a3a90d6ec78818c SHA512 a7ea1543824fd46c7c11c63eaec49a9eb955bfbc59da5e3060e13fb3e91ee3f729c200ad7034479b1922d14072a25e67a01e7839aa5c2ae72cedea1769b566e6
-DIST artikulate-24.12.0.tar.xz 1054704 BLAKE2B 75d9e928eb6224c0c7c9cd5f7aee8143350343da8845c7e944b06a0914ffa0a50221a405077a2ab7737e30b2c26c2e5a19321036718208a14526ee117113924e SHA512 b7217a5f29b0a9e39d594d5dacd777c681ccf0f50e26305221552a665ffeca2530fa2c921646243f69005368199ae4906a2272014ac151402f499a9565b1233f
+DIST artikulate-24.12.1.tar.xz 1054320 BLAKE2B 4ad1d50ece45ce377ddad269aa3763dd18525636a412e03e272412624e6e8efc91e6260804e60ef74fe28f0aa66343de2235dfe528c55b409f4343e6321f2599 SHA512 6bbc9fd2f780e4469d108064797712e6e8a8f4fc4a31334ad108d44489b8b03257ca5ad2dcbff1093bb7a0046051b665ae26da1b3a5f7cd53e080ffab43b48c5
diff --git a/kde-apps/artikulate/artikulate-24.12.0.ebuild b/kde-apps/artikulate/artikulate-24.12.0.ebuild
deleted file mode 100644
index c6ef1061765d..000000000000
--- a/kde-apps/artikulate/artikulate-24.12.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="Language learning application that helps improving pronunciation skills"
-HOMEPAGE="https://apps.kde.org/artikulate/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_autotests=$(usex test)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/artikulate/artikulate-24.12.1.ebuild b/kde-apps/artikulate/artikulate-24.12.1.ebuild
new file mode 100644
index 000000000000..b61d367d5a2e
--- /dev/null
+++ b/kde-apps/artikulate/artikulate-24.12.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="Language learning application that helps improving pronunciation skills"
+HOMEPAGE="https://apps.kde.org/artikulate/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_autotests=$(usex test)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index 78c9182b8a7d..b32e35d6f701 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,2 +1,2 @@
 DIST audiocd-kio-24.08.3.tar.xz 575276 BLAKE2B 18da82364554c861167e8021abc406289aa9852b43312f4eca39f974c7c299f0d72695da92cd4ebed5f53f3f53903156d4521d799b89fcde279dbb15f485d88b SHA512 0fc3f12eada5389709cafb402eb3be0e13e4dda1bdb999aa176d424b31338c5fef78e7db510e6612dc87cd6b128eec772c3e27570567063eb14216667f96e6bb
-DIST audiocd-kio-24.12.0.tar.xz 580120 BLAKE2B 3f791c5063a82edd5923ef0900a57d741a7ae7b4775c84dd4f1668559cd695ec7fb96633b90b520a55aae2a8c9e0daf1e330f3b5abbbad580a8187fece59712e SHA512 145ffbfd369c98da615474849af20f81bd47916679ea22bb6e954857e66472beb8b72907bc51c3ef26a7616bcc3720743a6e7c8c6615ae48fd11d909f0225125
+DIST audiocd-kio-24.12.1.tar.xz 580136 BLAKE2B 5aaee3ccf58f0667c87b27926c42522dc41614c2dc7e0210d4101f925ae82c7ff7ffd2a8d2edfc0c220868744424b96077ef59627f01070f96913435c151821c SHA512 7de42de54cdc1fba5bc6a59f1e506c973fe11e6f1a6fcb4e59f1ee1c3e682b4f13fc5447e9e21614907dd4b1e7512b3cc13676153dd26d39fe12cd72b5c84c95
diff --git a/kde-apps/audiocd-kio/audiocd-kio-24.12.0.ebuild b/kde-apps/audiocd-kio/audiocd-kio-24.12.0.ebuild
deleted file mode 100644
index 0187895a6a7e..000000000000
--- a/kde-apps/audiocd-kio/audiocd-kio-24.12.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO worker for accessing audio CDs"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="flac vorbis"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[widgets]
-	>=kde-apps/libkcddb-${PVCUT}:6
-	>=kde-apps/libkcompactdisc-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	media-sound/cdparanoia
-	flac? ( >=media-libs/flac-1.1.2:= )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-19.04.0-handbook.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package flac FLAC)
-		$(cmake_use_find_package vorbis OggVorbis)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/audiocd-kio/audiocd-kio-24.12.1.ebuild b/kde-apps/audiocd-kio/audiocd-kio-24.12.1.ebuild
new file mode 100644
index 000000000000..015b0fddec4a
--- /dev/null
+++ b/kde-apps/audiocd-kio/audiocd-kio-24.12.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO worker for accessing audio CDs"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="flac vorbis"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[widgets]
+	>=kde-apps/libkcddb-${PVCUT}:6
+	>=kde-apps/libkcompactdisc-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	media-sound/cdparanoia
+	flac? ( >=media-libs/flac-1.1.2:= )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-19.04.0-handbook.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package flac FLAC)
+		$(cmake_use_find_package vorbis OggVorbis)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index ad91fdee5546..705573fc541b 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,2 +1,2 @@
 DIST baloo-widgets-24.08.3.tar.xz 277404 BLAKE2B b2fdce21593901dcfa141012113918044a3cc7f172bf7a840553ecaa389fa60caf701b67b5b285a65d592590c0deded482372ef485c90ac1f2895e5c3b8df3ff SHA512 7ec90dbb07e10de292b8ec88b602b406a658d913459466a0108303f52dc8f2084125b78cdfbc3cabf73356ebaf29d7b2f58a9c020590399f558af7f6bb06058b
-DIST baloo-widgets-24.12.0.tar.xz 277992 BLAKE2B 0cc53ec910670505ed364802bb6bef647229c0015cd0a13315cfdcf63ff9d7ba2f521c87eef4e28956e046dc8cc74c808649fa2aced805670b995b5f52678d7c SHA512 b2ef087e06d068240d8059016e25a2c163148089ddf88e5246a57496a8aed8cf1969d7a0ae9c21f7df363e10e0bb482ebd828d74e8ef37b3a6240f7568d5b03e
+DIST baloo-widgets-24.12.1.tar.xz 277972 BLAKE2B 08330c25ec29050872421c4c1f12c6b784c7d1cf00db93dd1679c0f645cbfe9c02a2dcaa5fac9a37a05d35db13e03581f01e28dc82f62349cb50ea797f6773a2 SHA512 28ebf18bee49b29c67c866cc0c7ab827be3840ee826e0dd480b821d6fbf009bd74d101871e9c04bcfb23843b34f7c00d13801ab0c9c81b6030f6eda8ff64a0c8
diff --git a/kde-apps/baloo-widgets/baloo-widgets-24.12.0.ebuild b/kde-apps/baloo-widgets/baloo-widgets-24.12.0.ebuild
deleted file mode 100644
index 2acdd9901ce6..000000000000
--- a/kde-apps/baloo-widgets/baloo-widgets-24.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Widget library for baloo"
-
-LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/baloo-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kfilemetadata-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kservice-${KFMIN}:6
-"
diff --git a/kde-apps/baloo-widgets/baloo-widgets-24.12.1.ebuild b/kde-apps/baloo-widgets/baloo-widgets-24.12.1.ebuild
new file mode 100644
index 000000000000..7002502a0dd6
--- /dev/null
+++ b/kde-apps/baloo-widgets/baloo-widgets-24.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Widget library for baloo"
+
+LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/baloo-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kfilemetadata-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kservice-${KFMIN}:6
+"
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index 6d4ff93b7eb9..89fce0e01c89 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,2 +1,2 @@
 DIST blinken-24.08.3.tar.xz 2594776 BLAKE2B f8a7d6dcdde022284e2501883b1b2bb33abc5b5ae04167cd96f9bd3741529f9ca7eef8cff00f9b9ba752f4f28ee0ce8ea91a1c944c47db40386a901452c640b1 SHA512 547a9367181a090f517178b78ab367ccd42dfa5b66510f09828496969874494741d67d3bf007103930e9aceec008b25df1f553fa81b40afe1706155dea3977ce
-DIST blinken-24.12.0.tar.xz 2676028 BLAKE2B 4d1b045b585ea11eb9a9f98d53efa2ae51597f5b29013c152b396d18de2fdac2834305b942e3b081d915ae6b6682b750814d619bdbf98b4bd0fec8931f692fab SHA512 46b33567f3ba1d6fc857eb646ff43f20c6bca7eb684addc9e93b5f0ce4db9da34afcb6cbbddab363dc184124ef8859ede188842f03a042a2ec6e5e4dc3773b34
+DIST blinken-24.12.1.tar.xz 2676020 BLAKE2B 22ba790e8db13236363c5bfc9b16d5dc59a80d43bdfbaa28c88f866edd1dfef79ecfd3d287dde0d9926185a1836687c6a18149ad109c1d2cffa2477f5dd75283 SHA512 b7c1703ec405b114e6ea1792b3fcc829b2eb39df2ea44c90b18e5c9bf8e30b873b9a86a3564496008326bb18ed4e6d1e2f082786bd0322994350e0217c554156
diff --git a/kde-apps/blinken/blinken-24.12.0.ebuild b/kde-apps/blinken/blinken-24.12.0.ebuild
deleted file mode 100644
index 5a4cd0d8d591..000000000000
--- a/kde-apps/blinken/blinken-24.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Memory enhancement game based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/blinken/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=media-libs/phonon-4.12.0[qt6(+)]
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	ecm_src_install
-	rm "${ED}"/usr/share/${PN}/README.packagers || die
-}
diff --git a/kde-apps/blinken/blinken-24.12.1.ebuild b/kde-apps/blinken/blinken-24.12.1.ebuild
new file mode 100644
index 000000000000..a6fd9a5298f7
--- /dev/null
+++ b/kde-apps/blinken/blinken-24.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Memory enhancement game based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/blinken/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=media-libs/phonon-4.12.0[qt6(+)]
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	ecm_src_install
+	rm "${ED}"/usr/share/${PN}/README.packagers || die
+}
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index e591744064ed..aa3f15d7a21c 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,2 +1,2 @@
 DIST bomber-24.08.3.tar.xz 839448 BLAKE2B bc43dece36f3a2c9492230fb3572962e8b2f719a83d4f1948016dc1a5a133dcc31e7a64599ab589092af1305d449d5ab20d223ceabc9fc76f5bada10a65325ce SHA512 f79dbae5e01ae7c7234a0a2594435546a6670e0644b4ca224e02a9851cbd34dd4a4c66a01cfea90e2071204d0b2e341c4225a3e9a5b2f5e8a3fceca9582fc83f
-DIST bomber-24.12.0.tar.xz 838920 BLAKE2B 2c27a2e30c035278d33a3a002cdef40dec7e4bd138a9950819647ed43df6c897b5e1cf6cb20f1e74d9bab735bf522be6d1258a0503f52111753e1b38823b0a96 SHA512 167fbf3f5cff1b4cb39fec7a30c92eaa032c9accd1c6707a7a9a5c71180c8f25b28d56abca297d28551d5db274fc31dcb4194363f9e81c0a4fdce1c9be3b54d1
+DIST bomber-24.12.1.tar.xz 839236 BLAKE2B dd6aecf8af33fed022d0eea6bbbfa45e18cc27c9b9f1111689c659af179a4741e0174798f672a2705e238d128953eaaa562fb8b20eb59348dae004e09bbe2e39 SHA512 3d22dd72bf282d10dd63d6778275ae153b90cada08939c02ea0a01e15843f7b32692041bf2fde3ed274532b7bd35dacb47bcc35a97cbafe2cff48eeb2f26200c
diff --git a/kde-apps/bomber/bomber-24.12.0.ebuild b/kde-apps/bomber/bomber-24.12.0.ebuild
deleted file mode 100644
index ec9924045eb5..000000000000
--- a/kde-apps/bomber/bomber-24.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Single player arcade bombing game"
-HOMEPAGE="https://apps.kde.org/bomber/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	!games-action/xbomber
-"
diff --git a/kde-apps/bomber/bomber-24.12.1.ebuild b/kde-apps/bomber/bomber-24.12.1.ebuild
new file mode 100644
index 000000000000..06dd1ee691eb
--- /dev/null
+++ b/kde-apps/bomber/bomber-24.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Single player arcade bombing game"
+HOMEPAGE="https://apps.kde.org/bomber/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!games-action/xbomber
+"
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index faba82626721..0acd89a91ba1 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,2 +1,2 @@
 DIST bovo-24.08.3.tar.xz 220000 BLAKE2B 131695f11b8b3320bdd659e97a66e79d93faaa562d96df893d229c08c2ef3106fc6abc7aed18d6a3455958f4344c79acee185dbbf5a7e8620e067cd2da6960da SHA512 21ffbf49a4394f5bf71154fdf353f770cfc87de9955cd893aede80e90e5c35ec11982beafa2cf589856a2a5db13d74c1b292d5b61716f67885ce2f1cae872d76
-DIST bovo-24.12.0.tar.xz 220320 BLAKE2B 51829bb43abcd054342dbff6ecfabc22ae79166803b9336a405d65d04091d850600dad0cd75dc795b6109cb837c0c37a7f04746f31922498a886f3228add1e9c SHA512 db445f1036d1b9a449931b73e03774068970388a70a8477d62fdbb1b91830543853a328b85c76245f66586443c92bfe9d97c0f45b8b214c7b543f141fb4773d7
+DIST bovo-24.12.1.tar.xz 220320 BLAKE2B 0a09011e7c9974bebf0f269dc47b2cf52fab8c445d7ae7a3640ba0bfa7a24049ccc41aa806ad84f0d48834f7c72d937c650a7465efbffbc92e230fa848465866 SHA512 86a79b936a1f4e5f7168fc25fd368b1a301a79deb8961406cb1887be52c7f60146df41e8202902492c2b6eb1dfffc0ea7712cd832e3281f6aefd504d6742e9c4
diff --git a/kde-apps/bovo/bovo-24.12.0.ebuild b/kde-apps/bovo/bovo-24.12.0.ebuild
deleted file mode 100644
index 1052502fc3e3..000000000000
--- a/kde-apps/bovo/bovo-24.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Five-in-a-row Board Game"
-HOMEPAGE="https://apps.kde.org/bovo/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent,gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS HISTORY TODO )
diff --git a/kde-apps/bovo/bovo-24.12.1.ebuild b/kde-apps/bovo/bovo-24.12.1.ebuild
new file mode 100644
index 000000000000..2b38954cf53f
--- /dev/null
+++ b/kde-apps/bovo/bovo-24.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Five-in-a-row Board Game"
+HOMEPAGE="https://apps.kde.org/bovo/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS HISTORY TODO )
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index 179c3cdcaef0..c6e85cbf15b7 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-calendar-tools-24.08.3.tar.xz 264972 BLAKE2B 42ac0a8451ac363d08b0ea322259c31423ced43aab36814b88e49adea48593a9806c36450ee5ca194f59ca6ecb621912890087d315e44b20438ebf5dec8b92d4 SHA512 0f7a5f7ef5939191b5a834a80f6b4f0bc32125dde62135eeb1a55235bbffeb7905b8e3c22b1aa57648e132a5f5a5172060c91025a0bbd4693bc363dfcefd36ef
-DIST akonadi-calendar-tools-24.12.0.tar.xz 269360 BLAKE2B 5fadc86b2788e3d0c21dc8c2ba258b964e65a49e676a9fe1d6f197b43c8b7ce4bedf70d08d1794149903f9516079546350ce45727bdc0c12fde988161bf262e9 SHA512 dbfcb7282f48cf3bd88d2f896bb6220d8ab5bfcb5cf86068e0b791b272e8d8e2957a89f3e12390baa408a9bee8a650f4cdc97d514a4ee34af1db749ce308f411
+DIST akonadi-calendar-tools-24.12.1.tar.xz 269344 BLAKE2B 1e23f31c2de6c9ba74ec2a547702666218226443b2258a6b11c2e3aad63690fe69b5038419a25fd316ca1b389a100574fed3a090f0eeae6a691bf37f8255fadd SHA512 ffd91a886a8b94d22fb1102cff28aa1e64b21bf3b1af4aad9b844df3d6cacbac6fcbf8413682c2d7d2067dbfab2d1a1dfbec47f4bf751b9fe0a8b328db317477
diff --git a/kde-apps/calendarjanitor/calendarjanitor-24.12.0-r1.ebuild b/kde-apps/calendarjanitor/calendarjanitor-24.12.0-r1.ebuild
deleted file mode 100644
index 4c816de40e8c..000000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoff"
-ECM_TEST="false"
-KDE_ORG_NAME="akonadi-calendar-tools"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Tool to scan calendar data for buggy instances"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-calendar-${PVCUT}:6
-	>=kde-apps/calendarsupport-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/akonadi-calendar-tools-common-${PV}
-"
-
-PATCHES=( "${FILESDIR}/${PN}-24.05.2-loggingcategory.patch" )
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-	cmake_comment_add_subdirectory konsolekalendar
-}
diff --git a/kde-apps/calendarjanitor/calendarjanitor-24.12.1.ebuild b/kde-apps/calendarjanitor/calendarjanitor-24.12.1.ebuild
new file mode 100644
index 000000000000..0068ad4fd4ee
--- /dev/null
+++ b/kde-apps/calendarjanitor/calendarjanitor-24.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoff"
+ECM_TEST="false"
+KDE_ORG_NAME="akonadi-calendar-tools"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Tool to scan calendar data for buggy instances"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-calendar-${PVCUT}:6
+	>=kde-apps/calendarsupport-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/akonadi-calendar-tools-common-${PV}
+"
+
+PATCHES=( "${FILESDIR}/${PN}-24.05.2-loggingcategory.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+	cmake_comment_add_subdirectory konsolekalendar
+}
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index 6ddc9970dc5c..7f9178509ea6 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,2 +1,2 @@
 DIST calendarsupport-24.08.3.tar.xz 1000872 BLAKE2B 7712b5960972f6d498258ac123bd2f31bbec4f9986bb764f3386974daa8caa29b49b998d00b8c8cbb6a2708931b240c98a7b476b72b66f9240f58ec6325abcfb SHA512 20429b65941dac523577c30489319fe3ef1c40f4802433f7783c58dcbf95e7b9a5b48c826899bdcebe7fe028e460f84addc86a26efddcf95b2828f785ab45564
-DIST calendarsupport-24.12.0.tar.xz 997704 BLAKE2B 60a3c2e7a97243034d906175f56f17ffbba0f4053fe74b42df5bdda490869bfb23599c2ea3b3c1cded96b17dd6861256a1058826528de7e3ef05cd1ced4779f2 SHA512 64f9e177a2014fa160c85c6716cacfab7fc4a9bbe99d3e5059ebc2a5832a8e4d54fba1dd82021983734836783dc50a38073521eb4451b3205edb834d58b433dd
+DIST calendarsupport-24.12.1.tar.xz 997740 BLAKE2B 3c0b13d1bc6a7ce94eb08f61ffce70edb8b3bd9c3fa8ba2ba772036c9c038068fd98739165392e7c8673feb4bbcf5e3608833206733e29581c55ac79acc570c1 SHA512 484cd22f42c374c051652d7b54e62c8ea3c1c5d2ae54bacb4e9f0b0d06cc273f5ae66ba4eea615edb2d0bbd38e674f6ca700c036fc083e5c290959c4709b9f74
diff --git a/kde-apps/calendarsupport/calendarsupport-24.12.0-r1.ebuild b/kde-apps/calendarsupport/calendarsupport-24.12.0-r1.ebuild
deleted file mode 100644
index 3aceefdaf3ae..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="false"
-KFMIN=6.7.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Calendar support library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	dev-libs/libical
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-calendar-${PVCUT}:6
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/kholidays-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/calendarsupport/calendarsupport-24.12.1.ebuild b/kde-apps/calendarsupport/calendarsupport-24.12.1.ebuild
new file mode 100644
index 000000000000..f9a5ed9f3eaa
--- /dev/null
+++ b/kde-apps/calendarsupport/calendarsupport-24.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="false"
+KFMIN=6.7.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Calendar support library"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	dev-libs/libical
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-calendar-${PVCUT}:6
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/kholidays-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index b164a3ef451c..852f702d6aee 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,2 +1,3 @@
 DIST cantor-24.08.3.tar.xz 10848148 BLAKE2B 723b6ff5b8b232458656230353cc0645e604d35db0072a342de2b0d56ba34ccf0ce26aa24f797e877b198696d404fae0542f31f2cb1e93adcf492950476edee5 SHA512 26cf90f30bc4c43dff928db3b3e3d38456caa2f96915d24aa65539ecebc79b93f84207528f4436d421c33e76e863658310d5bb6de3f0930ba1fdbe01da1a9c62
 DIST cantor-24.12.0.tar.xz 10869424 BLAKE2B 73621a802c76f8307ce724d4e95e7a284802864aad30dc7dd4c5b8fcac16944cfa397d97062d29475b816648aec09d6e3490dd0a0258ee2e914d3235232adb5a SHA512 85b0f061e67439e4cd477976df8f481a8c92c98cc499114f603260897876c2bb9a249613b0b13255328f4f0e60a0d1f55016935a97d0a85ff253752a7cbdf3eb
+DIST cantor-24.12.1.tar.xz 10872328 BLAKE2B eba68eff91057aa7b56a176192c79bed099bf25b66222ee0984f700cb60a7832378ab139fe4b6c535afc53cab86664fef17642fa18e46cb27dc9e401cd2c39d2 SHA512 6df646331c6e67e421fb95ddd6c52587c5c2ce3df1030409c0263b6648fbc792321b48b2048879d7b546ed2bd5b0511b487a4724e142f44caf7bce9cfbf6ef1a
diff --git a/kde-apps/cantor/cantor-24.12.0.ebuild b/kde-apps/cantor/cantor-24.12.0.ebuild
index df231c8f17f2..b07c42884348 100644
--- a/kde-apps/cantor/cantor-24.12.0.ebuild
+++ b/kde-apps/cantor/cantor-24.12.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 @@ HOMEPAGE="https://apps.kde.org/cantor/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="+analitza julia lua postscript python qalculate R webengine"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-apps/cantor/cantor-24.12.1.ebuild b/kde-apps/cantor/cantor-24.12.1.ebuild
new file mode 100644
index 000000000000..7ecc2dbe9cfa
--- /dev/null
+++ b/kde-apps/cantor/cantor-24.12.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{10..12} )
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org lua-single optfeature python-single-r1
+
+DESCRIPTION="Interface for doing mathematics and scientific computing"
+HOMEPAGE="https://apps.kde.org/cantor/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+analitza julia lua postscript python qalculate R webengine"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+# TODO Add Sage Mathematics Software backend (https://www.sagemath.org)
+DEPEND="
+	>=app-text/poppler-23.12.0[qt6]
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+	analitza? ( >=kde-apps/analitza-${PVCUT}:6 )
+	julia? ( dev-lang/julia )
+	lua? ( ${LUA_DEPS} )
+	qalculate? (
+		sci-libs/cln
+		sci-libs/libqalculate:=
+	)
+	postscript? ( app-text/libspectre )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-qt/qtbase-${QTMIN}:6[dbus]
+	)
+	R? ( dev-lang/R )
+	webengine? (
+		>=dev-qt/qttools-${QTMIN}:6[assistant]
+		>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	)
+"
+# !analitza?
+RDEPEND="${DEPEND}
+	!analitza? ( !julia? ( !lua? ( !python? ( !qalculate? ( !R? (
+		|| (
+			sci-mathematics/maxima
+			sci-mathematics/octave
+		)
+	) ) ) ) ) )
+"
+BDEPEND="x11-misc/shared-mime-info"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	use julia && addpredict /proc/self/mem # bug 602894
+
+	local mycmakeargs=(
+		$(cmake_use_find_package analitza Analitza6)
+		$(cmake_use_find_package julia Julia)
+		$(cmake_use_find_package lua LuaJIT)
+		-DUSE_LIBSPECTRE=$(usex postscript)
+		$(cmake_use_find_package python Python3)
+		$(cmake_use_find_package qalculate Qalculate)
+		$(cmake_use_find_package R R)
+		-DENABLE_EMBEDDED_DOCUMENTATION=$(usex webengine)
+	)
+	use lua && mycmakeargs+=(
+		-DLUAJIT_INCLUDEDIR="${EPREFIX}/$(lua_get_include_dir)"
+		-DLUAJIT_LIBDIR="${EPREFIX}/$(lua_get_cmod_dir)"
+	)
+	ecm_src_configure
+}
+
+src_compile() {
+	# -j1 for bug #919576
+	MAKEOPTS="-j1" ecm_src_compile
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Maxima backend" sci-mathematics/maxima
+		optfeature "Octave backend" sci-mathematics/octave
+		optfeature "LaTeX support" virtual/latex-base
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index 6f3129139989..7e0e4a9c8def 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,2 +1,2 @@
 DIST cervisia-24.08.3.tar.xz 1810124 BLAKE2B 1adcb313f802c8c77562d27e0f5fc171641d1d35008222509179619ebb42a7f3651c6fb64980a8f56d8ce9f737722ddea2e0d3949e8b2decda569118f0886549 SHA512 f3e73bf2a9b4530db869ce4eb9d301ad4dca6ea0e98f3a12746bc8c45907bfdade5958c9b18b4771f159b8810c37d1a5c11c0b6c0fd8507596a9766918fdcb35
-DIST cervisia-24.12.0.tar.xz 1809936 BLAKE2B 17467bc87ebdc741d34b2278e55944f8a435d51d3c2822315dfc93d7d5d4ad099fa1c42636c00fb6957ddfe16a832e4cf1ba0419a456ea67f2757f01d752e520 SHA512 df3561a20fa9b8253815956e0fc0024f957e78e3ce3a3eb6491a2dfc82b12ada417f9fa21309255a991dedd521cd7fb01539388d60b6149ea54d463dc7a60170
+DIST cervisia-24.12.1.tar.xz 1809908 BLAKE2B 629aa2494b4369b324f35ed033de89fa031764e9f6b65855305daa5a42bc36f986f57ad4760554cde1dae65530b6022633d9eaa755b9b9df7e27c6d1d626cdc9 SHA512 721cd28142df8f32c8cdd5e41ce4f07361afefb25729d0c070b105ee6bd52b550f589e7430d06d097aaaa8b95b55a8ddbd0c3e82919d57df24962339596013de
diff --git a/kde-apps/cervisia/cervisia-24.12.0.ebuild b/kde-apps/cervisia/cervisia-24.12.0.ebuild
deleted file mode 100644
index 4e9d09e450d7..000000000000
--- a/kde-apps/cervisia/cervisia-24.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="CVS frontend by KDE"
-HOMEPAGE="https://apps.kde.org/cervisia/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdesu-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	dev-vcs/cvs
-"
diff --git a/kde-apps/cervisia/cervisia-24.12.1.ebuild b/kde-apps/cervisia/cervisia-24.12.1.ebuild
new file mode 100644
index 000000000000..0916e8c47a4d
--- /dev/null
+++ b/kde-apps/cervisia/cervisia-24.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="CVS frontend by KDE"
+HOMEPAGE="https://apps.kde.org/cervisia/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdesu-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	dev-vcs/cvs
+"
diff --git a/kde-apps/dolphin-plugins-common/Manifest b/kde-apps/dolphin-plugins-common/Manifest
index 9f9e5c795e45..774bb947d928 100644
--- a/kde-apps/dolphin-plugins-common/Manifest
+++ b/kde-apps/dolphin-plugins-common/Manifest
@@ -1,2 +1,2 @@
 DIST dolphin-plugins-24.08.3.tar.xz 317540 BLAKE2B 54fa2e13be2cceb53b12b1edb2d6d7c1793f6ba2bbec67e9e00121b33683aa6bd4895392cbdf5aa7627958c6323984ae3db8b5bbf6b14faba86b13181e0a2614 SHA512 05da7ac7b3ebe085cf0808d8e1eba49372bfeb1488800f40c1d0b9025e743efede1200095a1e660c1d538b2cc1b19f0f717f3d0723043517859f5c2015f961ce
-DIST dolphin-plugins-24.12.0.tar.xz 319128 BLAKE2B c793b10b882029eb7b2b681f15220fa065c2f59e4a1aa35ecf6ebfee253c4bd68aaf32c6555a8e03dad0ec8de7fba824834f1c0cbcb88c0c702b731b3d9b78d8 SHA512 94b4f8cd785c380b915da0e4a8efb9521d3a8440246466e4903746a2eb44188f1ae8cf3b483ec901f70c49c60a391de7c09d567e9a1a905b4229378c2623ee42
+DIST dolphin-plugins-24.12.1.tar.xz 319152 BLAKE2B afb5d587e38d1fc24117a083eedc5d970ceeed93e0bbfe13fb991a85046224730c5a1490337ac82a04b613c216f1dd6be07de514c664c80e2e5a0f70bd7615cc SHA512 ebae4d9d363f6928eb89ceede74ca0cc3e0707f81fe782b07fb4d4e3c06bcb266f4981bc5f0374b76bf55b8e86d427bbab0a0fbf82552a288ab8ddb9916f5df9
diff --git a/kde-apps/dolphin-plugins-common/dolphin-plugins-common-24.12.0.ebuild b/kde-apps/dolphin-plugins-common/dolphin-plugins-common-24.12.0.ebuild
deleted file mode 100644
index 8ccb9ea4b634..000000000000
--- a/kde-apps/dolphin-plugins-common/dolphin-plugins-common-24.12.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN/-common/}"
-inherit ecm-common gear.kde.org
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	!<app-cdr/dolphin-plugins-mountiso-24.07.90-r1
-	!<kde-apps/dolphin-plugins-dropbox-24.07.90-r1
-	!<kde-apps/dolphin-plugins-git-24.07.90-r1
-	!<kde-apps/dolphin-plugins-mercurial-24.07.90-r1
-	!<kde-apps/dolphin-plugins-subversion-24.07.90-r1
-"
diff --git a/kde-apps/dolphin-plugins-common/dolphin-plugins-common-24.12.1.ebuild b/kde-apps/dolphin-plugins-common/dolphin-plugins-common-24.12.1.ebuild
new file mode 100644
index 000000000000..24b4ac878137
--- /dev/null
+++ b/kde-apps/dolphin-plugins-common/dolphin-plugins-common-24.12.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN/-common/}"
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	!<app-cdr/dolphin-plugins-mountiso-24.07.90-r1
+	!<kde-apps/dolphin-plugins-dropbox-24.07.90-r1
+	!<kde-apps/dolphin-plugins-git-24.07.90-r1
+	!<kde-apps/dolphin-plugins-mercurial-24.07.90-r1
+	!<kde-apps/dolphin-plugins-subversion-24.07.90-r1
+"
diff --git a/kde-apps/dolphin-plugins-dropbox/Manifest b/kde-apps/dolphin-plugins-dropbox/Manifest
index 9f9e5c795e45..774bb947d928 100644
--- a/kde-apps/dolphin-plugins-dropbox/Manifest
+++ b/kde-apps/dolphin-plugins-dropbox/Manifest
@@ -1,2 +1,2 @@
 DIST dolphin-plugins-24.08.3.tar.xz 317540 BLAKE2B 54fa2e13be2cceb53b12b1edb2d6d7c1793f6ba2bbec67e9e00121b33683aa6bd4895392cbdf5aa7627958c6323984ae3db8b5bbf6b14faba86b13181e0a2614 SHA512 05da7ac7b3ebe085cf0808d8e1eba49372bfeb1488800f40c1d0b9025e743efede1200095a1e660c1d538b2cc1b19f0f717f3d0723043517859f5c2015f961ce
-DIST dolphin-plugins-24.12.0.tar.xz 319128 BLAKE2B c793b10b882029eb7b2b681f15220fa065c2f59e4a1aa35ecf6ebfee253c4bd68aaf32c6555a8e03dad0ec8de7fba824834f1c0cbcb88c0c702b731b3d9b78d8 SHA512 94b4f8cd785c380b915da0e4a8efb9521d3a8440246466e4903746a2eb44188f1ae8cf3b483ec901f70c49c60a391de7c09d567e9a1a905b4229378c2623ee42
+DIST dolphin-plugins-24.12.1.tar.xz 319152 BLAKE2B afb5d587e38d1fc24117a083eedc5d970ceeed93e0bbfe13fb991a85046224730c5a1490337ac82a04b613c216f1dd6be07de514c664c80e2e5a0f70bd7615cc SHA512 ebae4d9d363f6928eb89ceede74ca0cc3e0707f81fe782b07fb4d4e3c06bcb266f4981bc5f0374b76bf55b8e86d427bbab0a0fbf82552a288ab8ddb9916f5df9
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-24.12.0.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-24.12.0.ebuild
deleted file mode 100644
index 9f135973ebef..000000000000
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-24.12.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="dropbox"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Dolphin plugin for Dropbox service integration"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
-	>=kde-apps/dolphin-${PVCUT}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/dolphin-plugins-common-${PV}
-	net-misc/dropbox-cli
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-	# qtconcurrent only required by git
-	ecm_punt_qt_module Concurrent
-	# solid, qtdbus only required by mountiso
-	ecm_punt_qt_module DBus
-	ecm_punt_kf_module Solid
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_makefileactions=OFF
-		-DBUILD_mountiso=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-24.12.1.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-24.12.1.ebuild
new file mode 100644
index 000000000000..b96423e28134
--- /dev/null
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-24.12.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="dolphin-plugins"
+MY_PLUGIN_NAME="dropbox"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Dolphin plugin for Dropbox service integration"
+HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=kde-apps/dolphin-${PVCUT}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/dolphin-plugins-common-${PV}
+	net-misc/dropbox-cli
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+	# qtconcurrent only required by git
+	ecm_punt_qt_module Concurrent
+	# solid, qtdbus only required by mountiso
+	ecm_punt_qt_module DBus
+	ecm_punt_kf_module Solid
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_bazaar=OFF
+		-DBUILD_git=OFF
+		-DBUILD_hg=OFF
+		-DBUILD_makefileactions=OFF
+		-DBUILD_mountiso=OFF
+		-DBUILD_svn=OFF
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/dolphin-plugins-git/Manifest b/kde-apps/dolphin-plugins-git/Manifest
index 9f9e5c795e45..774bb947d928 100644
--- a/kde-apps/dolphin-plugins-git/Manifest
+++ b/kde-apps/dolphin-plugins-git/Manifest
@@ -1,2 +1,2 @@
 DIST dolphin-plugins-24.08.3.tar.xz 317540 BLAKE2B 54fa2e13be2cceb53b12b1edb2d6d7c1793f6ba2bbec67e9e00121b33683aa6bd4895392cbdf5aa7627958c6323984ae3db8b5bbf6b14faba86b13181e0a2614 SHA512 05da7ac7b3ebe085cf0808d8e1eba49372bfeb1488800f40c1d0b9025e743efede1200095a1e660c1d538b2cc1b19f0f717f3d0723043517859f5c2015f961ce
-DIST dolphin-plugins-24.12.0.tar.xz 319128 BLAKE2B c793b10b882029eb7b2b681f15220fa065c2f59e4a1aa35ecf6ebfee253c4bd68aaf32c6555a8e03dad0ec8de7fba824834f1c0cbcb88c0c702b731b3d9b78d8 SHA512 94b4f8cd785c380b915da0e4a8efb9521d3a8440246466e4903746a2eb44188f1ae8cf3b483ec901f70c49c60a391de7c09d567e9a1a905b4229378c2623ee42
+DIST dolphin-plugins-24.12.1.tar.xz 319152 BLAKE2B afb5d587e38d1fc24117a083eedc5d970ceeed93e0bbfe13fb991a85046224730c5a1490337ac82a04b613c216f1dd6be07de514c664c80e2e5a0f70bd7615cc SHA512 ebae4d9d363f6928eb89ceede74ca0cc3e0707f81fe782b07fb4d4e3c06bcb266f4981bc5f0374b76bf55b8e86d427bbab0a0fbf82552a288ab8ddb9916f5df9
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.12.0.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.12.0.ebuild
deleted file mode 100644
index a60d133d4705..000000000000
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.12.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="git"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Dolphin plugin for Git integration"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent,gui,widgets]
-	>=kde-apps/dolphin-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	dev-vcs/git
-	>=kde-apps/dolphin-plugins-common-${PV}
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-	# solid, qtdbus only required by mountiso
-	ecm_punt_qt_module DBus
-	ecm_punt_kf_module Solid
-	# kxmlgui, qtnetwork only required by dropbox
-	ecm_punt_qt_module Network
-	ecm_punt_kf_module XmlGui
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_makefileactions=OFF
-		-DBUILD_mountiso=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.12.1.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.12.1.ebuild
new file mode 100644
index 000000000000..980de67b637e
--- /dev/null
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.12.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="dolphin-plugins"
+MY_PLUGIN_NAME="git"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Dolphin plugin for Git integration"
+HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,gui,widgets]
+	>=kde-apps/dolphin-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	dev-vcs/git
+	>=kde-apps/dolphin-plugins-common-${PV}
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+	# solid, qtdbus only required by mountiso
+	ecm_punt_qt_module DBus
+	ecm_punt_kf_module Solid
+	# kxmlgui, qtnetwork only required by dropbox
+	ecm_punt_qt_module Network
+	ecm_punt_kf_module XmlGui
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_bazaar=OFF
+		-DBUILD_dropbox=OFF
+		-DBUILD_hg=OFF
+		-DBUILD_makefileactions=OFF
+		-DBUILD_mountiso=OFF
+		-DBUILD_svn=OFF
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/dolphin-plugins-mercurial/Manifest b/kde-apps/dolphin-plugins-mercurial/Manifest
index 9f9e5c795e45..774bb947d928 100644
--- a/kde-apps/dolphin-plugins-mercurial/Manifest
+++ b/kde-apps/dolphin-plugins-mercurial/Manifest
@@ -1,2 +1,2 @@
 DIST dolphin-plugins-24.08.3.tar.xz 317540 BLAKE2B 54fa2e13be2cceb53b12b1edb2d6d7c1793f6ba2bbec67e9e00121b33683aa6bd4895392cbdf5aa7627958c6323984ae3db8b5bbf6b14faba86b13181e0a2614 SHA512 05da7ac7b3ebe085cf0808d8e1eba49372bfeb1488800f40c1d0b9025e743efede1200095a1e660c1d538b2cc1b19f0f717f3d0723043517859f5c2015f961ce
-DIST dolphin-plugins-24.12.0.tar.xz 319128 BLAKE2B c793b10b882029eb7b2b681f15220fa065c2f59e4a1aa35ecf6ebfee253c4bd68aaf32c6555a8e03dad0ec8de7fba824834f1c0cbcb88c0c702b731b3d9b78d8 SHA512 94b4f8cd785c380b915da0e4a8efb9521d3a8440246466e4903746a2eb44188f1ae8cf3b483ec901f70c49c60a391de7c09d567e9a1a905b4229378c2623ee42
+DIST dolphin-plugins-24.12.1.tar.xz 319152 BLAKE2B afb5d587e38d1fc24117a083eedc5d970ceeed93e0bbfe13fb991a85046224730c5a1490337ac82a04b613c216f1dd6be07de514c664c80e2e5a0f70bd7615cc SHA512 ebae4d9d363f6928eb89ceede74ca0cc3e0707f81fe782b07fb4d4e3c06bcb266f4981bc5f0374b76bf55b8e86d427bbab0a0fbf82552a288ab8ddb9916f5df9
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-24.12.0.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-24.12.0.ebuild
deleted file mode 100644
index bd403335c58e..000000000000
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-24.12.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="hg"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Dolphin plugin for Mercurial integration"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/dolphin-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktexteditor-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	dev-vcs/mercurial
-	>=kde-apps/dolphin-plugins-common-${PV}
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-	# qtconcurrent only required by git
-	ecm_punt_qt_module Concurrent
-	# solid, qtdbus only required by mountiso
-	ecm_punt_qt_module DBus
-	ecm_punt_kf_module Solid
-	# kxmlgui, qtnetwork only required by dropbox
-	ecm_punt_qt_module Network
-	ecm_punt_kf_module XmlGui
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_makefileactions=OFF
-		-DBUILD_mountiso=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-24.12.1.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-24.12.1.ebuild
new file mode 100644
index 000000000000..ce98880a685c
--- /dev/null
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-24.12.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="dolphin-plugins"
+MY_PLUGIN_NAME="hg"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Dolphin plugin for Mercurial integration"
+HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/dolphin-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	dev-vcs/mercurial
+	>=kde-apps/dolphin-plugins-common-${PV}
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+	# qtconcurrent only required by git
+	ecm_punt_qt_module Concurrent
+	# solid, qtdbus only required by mountiso
+	ecm_punt_qt_module DBus
+	ecm_punt_kf_module Solid
+	# kxmlgui, qtnetwork only required by dropbox
+	ecm_punt_qt_module Network
+	ecm_punt_kf_module XmlGui
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_bazaar=OFF
+		-DBUILD_dropbox=OFF
+		-DBUILD_git=OFF
+		-DBUILD_makefileactions=OFF
+		-DBUILD_mountiso=OFF
+		-DBUILD_svn=OFF
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest
index 9f9e5c795e45..774bb947d928 100644
--- a/kde-apps/dolphin-plugins-subversion/Manifest
+++ b/kde-apps/dolphin-plugins-subversion/Manifest
@@ -1,2 +1,2 @@
 DIST dolphin-plugins-24.08.3.tar.xz 317540 BLAKE2B 54fa2e13be2cceb53b12b1edb2d6d7c1793f6ba2bbec67e9e00121b33683aa6bd4895392cbdf5aa7627958c6323984ae3db8b5bbf6b14faba86b13181e0a2614 SHA512 05da7ac7b3ebe085cf0808d8e1eba49372bfeb1488800f40c1d0b9025e743efede1200095a1e660c1d538b2cc1b19f0f717f3d0723043517859f5c2015f961ce
-DIST dolphin-plugins-24.12.0.tar.xz 319128 BLAKE2B c793b10b882029eb7b2b681f15220fa065c2f59e4a1aa35ecf6ebfee253c4bd68aaf32c6555a8e03dad0ec8de7fba824834f1c0cbcb88c0c702b731b3d9b78d8 SHA512 94b4f8cd785c380b915da0e4a8efb9521d3a8440246466e4903746a2eb44188f1ae8cf3b483ec901f70c49c60a391de7c09d567e9a1a905b4229378c2623ee42
+DIST dolphin-plugins-24.12.1.tar.xz 319152 BLAKE2B afb5d587e38d1fc24117a083eedc5d970ceeed93e0bbfe13fb991a85046224730c5a1490337ac82a04b613c216f1dd6be07de514c664c80e2e5a0f70bd7615cc SHA512 ebae4d9d363f6928eb89ceede74ca0cc3e0707f81fe782b07fb4d4e3c06bcb266f4981bc5f0374b76bf55b8e86d427bbab0a0fbf82552a288ab8ddb9916f5df9
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.12.0.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.12.0.ebuild
deleted file mode 100644
index 4341c6306b10..000000000000
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.12.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="svn"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Dolphin plugin for Subversion integration"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/dolphin-${PVCUT}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	dev-vcs/subversion
-	>=kde-apps/dolphin-plugins-common-${PV}
-	>=kde-apps/kompare-${PVCUT}:*
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-	# qtconcurrent only required by git
-	ecm_punt_qt_module Concurrent
-	# solid, qtdbus only required by mountiso
-	ecm_punt_qt_module DBus
-	ecm_punt_kf_module Solid
-	# kxmlgui, qtnetwork only required by dropbox
-	ecm_punt_qt_module Network
-	ecm_punt_kf_module XmlGui
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_makefileactions=OFF
-		-DBUILD_mountiso=OFF
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.12.1.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.12.1.ebuild
new file mode 100644
index 000000000000..381bb2b35f1d
--- /dev/null
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.12.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="dolphin-plugins"
+MY_PLUGIN_NAME="svn"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Dolphin plugin for Subversion integration"
+HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/dolphin-${PVCUT}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	dev-vcs/subversion
+	>=kde-apps/dolphin-plugins-common-${PV}
+	>=kde-apps/kompare-${PVCUT}:*
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+	# qtconcurrent only required by git
+	ecm_punt_qt_module Concurrent
+	# solid, qtdbus only required by mountiso
+	ecm_punt_qt_module DBus
+	ecm_punt_kf_module Solid
+	# kxmlgui, qtnetwork only required by dropbox
+	ecm_punt_qt_module Network
+	ecm_punt_kf_module XmlGui
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_bazaar=OFF
+		-DBUILD_dropbox=OFF
+		-DBUILD_git=OFF
+		-DBUILD_hg=OFF
+		-DBUILD_makefileactions=OFF
+		-DBUILD_mountiso=OFF
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index e36c3ab516fa..2aaa0f14753f 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,2 +1,2 @@
 DIST dolphin-24.08.3.tar.xz 5645348 BLAKE2B 043d3f5ebf3e186298a13d00509c6f3c523d710af856f71c23a84b35130b7a960e9595ded47d35cdcc52b55b7c092c0254424be37ffb993d9c44985b33b93adf SHA512 d65098bdc2dc4e0b8b2e0b2167ffdcbfea63a1062d58a26db52f1dbeaa22ed1da3a8a0a9d438f8d120f08cdb1291ee9f7c22a914a8e85d10073369455e7db47b
-DIST dolphin-24.12.0.1.tar.xz 5694572 BLAKE2B 56c4d1c8a520a533d36afed61cecdee4abe94b79a0604e885145cd0f9fe95d1965e876d88fe835e7127c80086fe014fd31f743a84783cb8304ace0b11fef8c54 SHA512 0f286846a50da658c83a97718287ac6ffe1e85cd49d7cdc36ecb364415a7ebb3193d02ff7602a6388e99862b72454566f1c716f605e46019cd76a7b52c71897c
+DIST dolphin-24.12.1.tar.xz 5694896 BLAKE2B b6ede4efbf507170bc35ea4cb7e3a55cf5e776f7a7e9f5bc9a51ca769f70a6d30b53081d2382611d688ebbf800fa1debf61e4740f8b2927428f1519d021eed87 SHA512 6a5e369836dd54b27adb9b880938421dc92f53d5a5a4f4ee89e2d066a395184e004c3423f6776dae6a944ee2ffce7e1365a0dfd84f719d9f017b0afeedba06c9
diff --git a/kde-apps/dolphin/dolphin-24.12.0.1.ebuild b/kde-apps/dolphin/dolphin-24.12.0.1.ebuild
deleted file mode 100644
index d98d08a9abf2..000000000000
--- a/kde-apps/dolphin/dolphin-24.12.0.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org optfeature
-
-DESCRIPTION="Plasma filemanager focusing on usability"
-HOMEPAGE="https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin"
-SRC_URI="mirror://kde/stable/release-service/${PVCUT}/src/${KDE_ORG_TAR_PN}-${PV}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="semantic-desktop telemetry"
-
-# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,widgets,X,xml]
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kfilemetadata-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6=
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-	>=media-libs/phonon-4.12.0[qt6(+)]
-	semantic-desktop? (
-		>=kde-apps/baloo-widgets-${PVCUT}:6
-		>=kde-frameworks/baloo-${KFMIN}:6
-	)
-	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kio-extras-${PVCUT}:6
-	>=kde-apps/thumbnailers-${PVCUT}:6
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON
-		$(cmake_use_find_package semantic-desktop KF6Baloo)
-		$(cmake_use_find_package semantic-desktop KF6BalooWidgets)
-		$(cmake_use_find_package telemetry KF6UserFeedback)
-	)
-	use test && mycmakeargs+=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_SeleniumWebDriverATSPI=ON # not packaged
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# servicemenuinstaller requires ruby, no thanks
-		# dolphinmainwindowtest, kitemlistcontrollertest, kfileitemlistviewtest, kfileitemmodeltest hang forever
-		# placesitemmodeltest requires DBus
-		-E "(servicemenuinstaller|dolphinmainwindowtest|kfileitemlistviewtest|kfileitemmodeltest|kitemlistcontrollertest|placesitemmodeltest)"
-	)
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "compress/extract and other actions" "kde-apps/ark:${SLOT}"
-		optfeature "crypto actions" "kde-apps/kleopatra:${SLOT}"
-		optfeature "'Share' context menu actions" "kde-frameworks/purpose:${SLOT}"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/dolphin/dolphin-24.12.1.ebuild b/kde-apps/dolphin/dolphin-24.12.1.ebuild
new file mode 100644
index 000000000000..226e3686f7f8
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-24.12.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Plasma filemanager focusing on usability"
+HOMEPAGE="https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="semantic-desktop telemetry"
+
+# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,widgets,X,xml]
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kfilemetadata-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6=
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=media-libs/phonon-4.12.0[qt6(+)]
+	semantic-desktop? (
+		>=kde-apps/baloo-widgets-${PVCUT}:6
+		>=kde-frameworks/baloo-${KFMIN}:6
+	)
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kio-extras-${PVCUT}:6
+	>=kde-apps/thumbnailers-${PVCUT}:6
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON
+		$(cmake_use_find_package semantic-desktop KF6Baloo)
+		$(cmake_use_find_package semantic-desktop KF6BalooWidgets)
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+	)
+	use test && mycmakeargs+=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_SeleniumWebDriverATSPI=ON # not packaged
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# servicemenuinstaller requires ruby, no thanks
+		# dolphinmainwindowtest, kitemlistcontrollertest, kfileitemlistviewtest, kfileitemmodeltest hang forever
+		# placesitemmodeltest requires DBus
+		-E "(servicemenuinstaller|dolphinmainwindowtest|kfileitemlistviewtest|kfileitemmodeltest|kitemlistcontrollertest|placesitemmodeltest)"
+	)
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "compress/extract and other actions" "kde-apps/ark:${SLOT}"
+		optfeature "crypto actions" "kde-apps/kleopatra:${SLOT}"
+		optfeature "'Share' context menu actions" "kde-frameworks/purpose:${SLOT}"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index ff06085fdc7b..5b9c22f1adf2 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,2 +1,2 @@
 DIST dragon-24.08.3.tar.xz 1830576 BLAKE2B 412ad835b4f97997ae85335a4e40bfd30ee67c16a29d87c266f3415d2c4e1316e952e0396ee7506c2427c9bb6b39ef0f178bb6654f5aebfdb3fa1531c076fde4 SHA512 c1b9406ac0d17b48c10dabb1ba4bcbe00c9b7cd0314b15a8350c68ca57f49e51edad5e3e1cf26cd58e6887bf0e9b752ec445b9aec90a745d4d14c89424d5e33a
-DIST dragon-24.12.0.tar.xz 1830472 BLAKE2B 31471265b60b60a9f90fcacd8d7d0ab6920033fe72401a6cd9ea0bf226a24aa27678439dba3fdfee2cc5da72ff9b78f7eed3f62198eba0861e6db7c7c50c8848 SHA512 bf3e5c877a420773dc9ad609ca77cc6534900d496d1a47a243df832d8b96f0e69aa967a394f82ba426018c9adeb23efc0176746bd6345a33df05ead92f47767d
+DIST dragon-24.12.1.tar.xz 1830476 BLAKE2B 73ce22114ffcaf110d571eb3b02d7dc6e381a8b3f438e7437942f1d64f499065b24e64dd3da0ec37954b3d779273d25419e643d3c54fc5a464b83d5c046d845b SHA512 7786771240e50dd4bf1349e4da2e2d775af14c8ccc3a09ab3b466aff0368d422540e15f408215012db8a85f9a2a9d262dd0a6787b505ecaa63c0ebdeadcb835f
diff --git a/kde-apps/dragon/dragon-24.12.0.ebuild b/kde-apps/dragon/dragon-24.12.0.ebuild
deleted file mode 100644
index 0c3238729137..000000000000
--- a/kde-apps/dragon/dragon-24.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Simple video player"
-HOMEPAGE="https://apps.kde.org/dragonplayer/"
-
-LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-	>=media-libs/phonon-4.12.0[qt6(+)]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/gettext"
diff --git a/kde-apps/dragon/dragon-24.12.1.ebuild b/kde-apps/dragon/dragon-24.12.1.ebuild
new file mode 100644
index 000000000000..e2be94c636e8
--- /dev/null
+++ b/kde-apps/dragon/dragon-24.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Simple video player"
+HOMEPAGE="https://apps.kde.org/dragonplayer/"
+
+LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=media-libs/phonon-4.12.0[qt6(+)]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/gettext"
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index a3b95d68d29b..a35274a5ccf4 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,2 +1,2 @@
 DIST eventviews-24.08.3.tar.xz 490544 BLAKE2B 5a5059044a5236b8512944b05b98f609e628816640fdd97d0c0dd60c942b91fd1ab99342265f39e8872d9f6e7647535087791c23959f6450c04d16a9f79a83c5 SHA512 fc9ca5f2f180e5a5a7e2232e4e73082d4df200a6be1c1cc737911dcf74f0be9abdda1dd73ba1bbff1a29cbbcb65e3e4023caab10e1ce088299930e4bccaab1c1
-DIST eventviews-24.12.0.tar.xz 497620 BLAKE2B ebb5536f0f905747d308124b38283862a7b0705c2832e35c147a1a446bb86d494bf3988abd7e9f48a919886c13d79bdc2afd2dada90039a603309898ce1ac8b7 SHA512 2df48f8c051f5131d277a7da73e561df7e70b2c92819a114e37d94b3351efdd97e2f23d756a73e3e68eb0f72b65d297644ff9efa5ef031d383ddee679e29374a
+DIST eventviews-24.12.1.tar.xz 497600 BLAKE2B 307ea4baa1018d7a29ae00d9a13b28fc457da2859f785f71728871baee0ab7415f0c6daae3df2242dfff04a1b450e5e7ca61fa452c941654c4928abb087e99b3 SHA512 d742aa7e7c75be33f7af879201e4ebeac36b715ebe8b5e58e09b87d52598e18737d2158deab4c35bbb09528d3b51cb2fbcda9b68593e5aa348e77e913386678b
diff --git a/kde-apps/eventviews/eventviews-24.12.0-r1.ebuild b/kde-apps/eventviews/eventviews-24.12.0-r1.ebuild
deleted file mode 100644
index ebe6249fc0af..000000000000
--- a/kde-apps/eventviews/eventviews-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	dev-libs/kdiagram:6
-	dev-libs/libical
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-calendar-${PVCUT}:6
-	>=kde-apps/calendarsupport-${PVCUT}:6
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/kholidays-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/eventviews/eventviews-24.12.1.ebuild b/kde-apps/eventviews/eventviews-24.12.1.ebuild
new file mode 100644
index 000000000000..502e5134c1ea
--- /dev/null
+++ b/kde-apps/eventviews/eventviews-24.12.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Calendar viewer for KDE PIM"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	dev-libs/kdiagram:6
+	dev-libs/libical
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-calendar-${PVCUT}:6
+	>=kde-apps/calendarsupport-${PVCUT}:6
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/kholidays-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ffmpegthumbs-common/Manifest b/kde-apps/ffmpegthumbs-common/Manifest
index 09512a055876..333fde9f16cd 100644
--- a/kde-apps/ffmpegthumbs-common/Manifest
+++ b/kde-apps/ffmpegthumbs-common/Manifest
@@ -1,2 +1,2 @@
 DIST ffmpegthumbs-24.08.3.tar.xz 33208 BLAKE2B 6f007484989e66889f94f28b2bcb6eb34ec8a4314dfcc16a12199d59a163959a5caa78c777c4a1f6607dbde70e0ffc4fb4d54f023b1fc6fd4b81ff44aed441c3 SHA512 3614c45d33e2b8bbed957afdcf0192f57dc5a03e93bf5917f52053539459ec3f4778c18b0ce40502a4667b2a46520f2835889a0d79b6c3cdeb0b733e1a6e275b
-DIST ffmpegthumbs-24.12.0.tar.xz 33176 BLAKE2B 6e4183b24a251ccb2f403f3af753144e64b0683d78933182dc5aa434790d895142721e6e028438b5c6cffa8d040a62e6a50c1bb2b83af1f96131cf178a7c61d4 SHA512 6742ed0af00a62863c1e52ac341ccfbd9399a0dcdffef067846de7f34100144f2ade57ea84e4d2846dc2df9d1bd47d8f89eefab6c89e7b7ce8ae6ee451db9fd4
+DIST ffmpegthumbs-24.12.1.tar.xz 33176 BLAKE2B 3c59aceb2ff1f112c75ef102ff69f093bf1d9a194aaee4106ed4042dcd28b4f7748f24a2bdb4efcea625e7d39c3a0776a0fc6e6fd29262664188f66ac8a4ba20 SHA512 9c1f6faa48273b77efe1371e1a1516a73d71938291103086e356ffcbcc05455302339d4dac9ddf8113d994f10a5ce929aaf4943bf5ea2f33d0773df14021fcb7
diff --git a/kde-apps/ffmpegthumbs-common/ffmpegthumbs-common-24.12.0.ebuild b/kde-apps/ffmpegthumbs-common/ffmpegthumbs-common-24.12.0.ebuild
deleted file mode 100644
index 928d370615bc..000000000000
--- a/kde-apps/ffmpegthumbs-common/ffmpegthumbs-common-24.12.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
-
-ECM_I18N="false"
-KDE_ORG_NAME="${PN/-common/}"
-KFMIN=5.115.0
-inherit ecm-common gear.kde.org
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	!<kde-apps/ffmpegthumbs-23.08.5-r1:5
-	!<kde-apps/ffmpegthumbs-24.05.2-r1:6
-"
-
-ECM_INSTALL_FILES=(
-	ffmpegthumbnailersettings5.kcfg:\${KDE_INSTALL_KCFGDIR}
-	org.kde.ffmpegthumbs.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
-)
diff --git a/kde-apps/ffmpegthumbs-common/ffmpegthumbs-common-24.12.1.ebuild b/kde-apps/ffmpegthumbs-common/ffmpegthumbs-common-24.12.1.ebuild
new file mode 100644
index 000000000000..1d8435cb595e
--- /dev/null
+++ b/kde-apps/ffmpegthumbs-common/ffmpegthumbs-common-24.12.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_I18N="false"
+KDE_ORG_NAME="${PN/-common/}"
+KFMIN=5.115.0
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	!<kde-apps/ffmpegthumbs-23.08.5-r1:5
+	!<kde-apps/ffmpegthumbs-24.05.2-r1:6
+"
+
+ECM_INSTALL_FILES=(
+	ffmpegthumbnailersettings5.kcfg:\${KDE_INSTALL_KCFGDIR}
+	org.kde.ffmpegthumbs.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
+)
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 09512a055876..333fde9f16cd 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,2 +1,2 @@
 DIST ffmpegthumbs-24.08.3.tar.xz 33208 BLAKE2B 6f007484989e66889f94f28b2bcb6eb34ec8a4314dfcc16a12199d59a163959a5caa78c777c4a1f6607dbde70e0ffc4fb4d54f023b1fc6fd4b81ff44aed441c3 SHA512 3614c45d33e2b8bbed957afdcf0192f57dc5a03e93bf5917f52053539459ec3f4778c18b0ce40502a4667b2a46520f2835889a0d79b6c3cdeb0b733e1a6e275b
-DIST ffmpegthumbs-24.12.0.tar.xz 33176 BLAKE2B 6e4183b24a251ccb2f403f3af753144e64b0683d78933182dc5aa434790d895142721e6e028438b5c6cffa8d040a62e6a50c1bb2b83af1f96131cf178a7c61d4 SHA512 6742ed0af00a62863c1e52ac341ccfbd9399a0dcdffef067846de7f34100144f2ade57ea84e4d2846dc2df9d1bd47d8f89eefab6c89e7b7ce8ae6ee451db9fd4
+DIST ffmpegthumbs-24.12.1.tar.xz 33176 BLAKE2B 3c59aceb2ff1f112c75ef102ff69f093bf1d9a194aaee4106ed4042dcd28b4f7748f24a2bdb4efcea625e7d39c3a0776a0fc6e6fd29262664188f66ac8a4ba20 SHA512 9c1f6faa48273b77efe1371e1a1516a73d71938291103086e356ffcbcc05455302339d4dac9ddf8113d994f10a5ce929aaf4943bf5ea2f33d0773df14021fcb7
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-24.12.0.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.12.0.ebuild
deleted file mode 100644
index e8faeeb49976..000000000000
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-24.12.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
-
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="FFmpeg based thumbnail generator for video files"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	media-video/ffmpeg:0=
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/${PN}-common-${PV}
-"
-BDEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	virtual/pkgconfig
-"
-
-# Shipped by kde-apps/ffmpegthumbs-common package for shared use w/ SLOT 5
-ECM_REMOVE_FROM_INSTALL=(
-	/usr/share/config.kcfg/ffmpegthumbnailersettings5.kcfg
-	/usr/share/metainfo/org.kde.ffmpegthumbs.metainfo.xml
-)
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-24.12.1.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.12.1.ebuild
new file mode 100644
index 000000000000..a8d01af83be7
--- /dev/null
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.12.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="FFmpeg based thumbnail generator for video files"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	media-video/ffmpeg:0=
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/${PN}-common-${PV}
+"
+BDEPEND="
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	virtual/pkgconfig
+"
+
+# Shipped by kde-apps/ffmpegthumbs-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/config.kcfg/ffmpegthumbnailersettings5.kcfg
+	/usr/share/metainfo/org.kde.ffmpegthumbs.metainfo.xml
+)
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index 495be40d59c5..7b67ecb2ca9b 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,2 +1,2 @@
 DIST filelight-24.08.3.tar.xz 685168 BLAKE2B 605f92c90e9cbc9dfc0e4647e691cfbe0b58e4c63a760f4a77268eb0ec067da36bf5047e19f0246179cebd61dd17e5eeff998227398918919919cd2da59b4bd0 SHA512 5bec3181402c14896509e082ab0cdde117258b17325187be724ac8812873d5245fc5d54b8c60b394798457876e9428e1e74db4ab324c8832b20db7c01a3f697f
-DIST filelight-24.12.0.tar.xz 686512 BLAKE2B 0068b3d641f4ba180d267ea70bcf8e767f14c75baa654ae10efd270f21d47696e5555506718f5a75598e796e237e0cd61275f0e83a972d39573d900aad91d417 SHA512 f3901cbbb74e3a2c32fd333e5048b9575b6946a2489bae5bccd18c7c5823e177d985a7e9203332b8e1ff5338f075d62f66674db1c186b7405e599abf3e3cccea
+DIST filelight-24.12.1.tar.xz 686692 BLAKE2B 5b38aa3570122415175ec049f329ea30cae9becc99bb01ada67c9695b27ee4c86462fcfaf0939538f882962ec3836f3fa10180d713dfe84bff125067419fdec7 SHA512 caa362fea1e761bc20f81ddf93f3d16bc9c6ba2dff2f6f9b2bab0d48efdbb545238eb70f1c18655db68996a0890036cd8fc3aa9939c24f45e53e22083aaac447
diff --git a/kde-apps/filelight/filelight-24.12.0.ebuild b/kde-apps/filelight/filelight-24.12.0.ebuild
deleted file mode 100644
index 698b56799a80..000000000000
--- a/kde-apps/filelight/filelight-24.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
-HOMEPAGE="https://apps.kde.org/filelight/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6[qml]
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
-"
-
-CMAKE_SKIP_TESTS=(
-	# bug 911856
-	scanManagerTest
-)
diff --git a/kde-apps/filelight/filelight-24.12.1.ebuild b/kde-apps/filelight/filelight-24.12.1.ebuild
new file mode 100644
index 000000000000..15d4e4ea225f
--- /dev/null
+++ b/kde-apps/filelight/filelight-24.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
+HOMEPAGE="https://apps.kde.org/filelight/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6[qml]
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+"
+
+CMAKE_SKIP_TESTS=(
+	# bug 911856
+	scanManagerTest
+)
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index a8e1465f8b36..b6eb0c911ad5 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,2 +1,2 @@
 DIST granatier-24.08.3.tar.xz 2013960 BLAKE2B 4ea6f505d4e38ff475400ceffb8fcba39b93614db93371b9743141a6804d6f7d159855878d77871026df40ac510eca67ac620aab195a159807a01809d6dfc9ea SHA512 623c0d539f32ea0be98d3d9b4167c447b0781728675dabe10af7dcf79e1aa9ad1ec5c542aa5a1d13cde35c1c308ad100f92a4935a447948607094a9ccb6c3444
-DIST granatier-24.12.0.tar.xz 2014060 BLAKE2B 8d573ab2ff5fec776003e2ac80e9ce009dfa784ae0ab1ba02dfe905c6df8947248d20a8b468e7aa2a2c0a7d6a423ee28ee46de4bc84e0e542c39eab996fb2a95 SHA512 95ba8183dbcb0f0b7d90d0814103fe9f338cc03a52d9646bcf022c3ebf656a48d6c4944c404b2aa9b95e08789fa6d238cd735b5d8ff1e60ae35e10f3a0166200
+DIST granatier-24.12.1.tar.xz 2014064 BLAKE2B 1705c8ea7427a13002a1ea6c939b908efb20db51fc441e68d44c8e7aa7077fb20d955b2c6d1feb0be5f69ec2e1f9bee81385f8758d18034619e47c909c504096 SHA512 3e3254506d99bb52574bb27b0f847cde06bc036dc5ab20ea13ecc2d70778325d6cb1620fbce8656718f15876af288cfff81256efe0f77b1615bb6a75d2bf6a0b
diff --git a/kde-apps/granatier/granatier-24.12.0.ebuild b/kde-apps/granatier/granatier-24.12.0.ebuild
deleted file mode 100644
index b782fe24fbb9..000000000000
--- a/kde-apps/granatier/granatier-24.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE Bomberman game"
-HOMEPAGE="https://apps.kde.org/granatier/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/granatier/granatier-24.12.1.ebuild b/kde-apps/granatier/granatier-24.12.1.ebuild
new file mode 100644
index 000000000000..4113b67b7a43
--- /dev/null
+++ b/kde-apps/granatier/granatier-24.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE Bomberman game"
+HOMEPAGE="https://apps.kde.org/granatier/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 0b3751c1a9dd..8703fd13bc81 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,2 +1,2 @@
 DIST grantlee-editor-24.08.3.tar.xz 124416 BLAKE2B 39db3ecffa124c89936254df5b69925e6e3f4f6d2a9d00ea0be195a9a343648a2fdc0ed0a346159752a8f3cbd89a06341770c380f48ebcac00b26f3b334729ef SHA512 e6cf9e9a4c371fa4d3589de67732faff3853351a7c3649940c209655a016766c1c46a0aa3572440adac0237a854335d23474fc03776ca02c54da63059a071642
-DIST grantlee-editor-24.12.0.tar.xz 124352 BLAKE2B c809ac205c3e309092a1c96907f240d08aeb14f1caeb5bad17c05ff8fa505cffc5bb7cdd06786571cf14c6743d90ef2144fe1bc71ca6804ca40a6bbb0ed6f0a0 SHA512 be30d1b3b8d2233f651f16cd69af55a5bbc868c3c2e9521aa77aa0ae28cfe6f3c737da64cb4dc39a0925452c0a0c7e0ebc8eaa6c3b945222da61de01b16ee046
+DIST grantlee-editor-24.12.1.tar.xz 124360 BLAKE2B f753df5cd82c0cce0396fdb405f9916ea238cc875761d42a75dc9d57a5745643265eed37e23c9aa4964e1ba8516bdc765279259ad3e291c46ab752fd35b90ac1 SHA512 64cba2ebe5b80eabe16fa3174d3199e7e2cb12743c648108a2c0bf2327ce969d0a28656b39b0bbb68bb5dd5bf6ee014c167cfb444594e0648554630953cb07b1
diff --git a/kde-apps/grantlee-editor/grantlee-editor-24.12.0-r1.ebuild b/kde-apps/grantlee-editor/grantlee-editor-24.12.0-r1.ebuild
deleted file mode 100644
index df1c9d5d34d6..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/messagelib-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantlee-editor/grantlee-editor-24.12.1.ebuild b/kde-apps/grantlee-editor/grantlee-editor-24.12.1.ebuild
new file mode 100644
index 000000000000..b874c188da53
--- /dev/null
+++ b/kde-apps/grantlee-editor/grantlee-editor-24.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index b4e14f81f807..15ca64937994 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,2 +1,2 @@
 DIST grantleetheme-24.08.3.tar.xz 63420 BLAKE2B cb6b0af35b69d218d605f328dbb649932c2e6c502c6d4d7ca74c6301a2302cacd031fd306a61cd13b5247df085e4ec46e137beb2c17b31da174bddb5e13cf047 SHA512 a114e4cb90450edc106a799ddb858022c8fdeb48c644768806d20d58b34fa8a85e40ca3a989532f649d670675c8a7518d5129595b8cb694e50de3556a61fd374
-DIST grantleetheme-24.12.0.tar.xz 63504 BLAKE2B f7e64b154a21c2473627913371095f7bcf3b0a784281019c633816dcb737e6c3aa8637e1c2fae4b745ef85505e7eeb43e6fd0eba419ed218682a51862395725b SHA512 78ce30fdcc4fdeafc3e99c39e17a9947c8f64962200f548fed181a66f115c2a334f3f2458bd96881366f16fa6e57925d517a7cf753a0fa012c9917cbf3e81552
+DIST grantleetheme-24.12.1.tar.xz 63492 BLAKE2B f91f5410a57ba9c8e3431bf0c036e81751fc3fdec0687dd993bbc704831e199596a84ccd23b37728acd418057f4c0ac860a897a9c75359f7f7a0b22863b32dbc SHA512 205412c1bb404ae38ee29a39a0b874132f254c6712847546676513f5ac334bb6cee9bb970484ac248df29ef71c34ae5c44aa8ae7ebee6f9199b5cd1ad51837f1
diff --git a/kde-apps/grantleetheme/grantleetheme-24.12.0-r1.ebuild b/kde-apps/grantleetheme/grantleetheme-24.12.0-r1.ebuild
deleted file mode 100644
index 5e9b8df3b32e..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for Grantlee plugins"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-# fails if package not already installed
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/ktexttemplate-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtbase-${QTMIN}:6[network]
-"
diff --git a/kde-apps/grantleetheme/grantleetheme-24.12.1.ebuild b/kde-apps/grantleetheme/grantleetheme-24.12.1.ebuild
new file mode 100644
index 000000000000..a4307be44061
--- /dev/null
+++ b/kde-apps/grantleetheme/grantleetheme-24.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for Grantlee plugins"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+# fails if package not already installed
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/ktexttemplate-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[network]
+"
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 1a2df395e131..1e56ed5d53b8 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,2 +1,2 @@
 DIST gwenview-24.08.3.tar.xz 6522052 BLAKE2B e2108151b81dd2666d169e745785400acf4a0c4b307f3b124f4d27ae504dc124cfe737d92cead833309ec935442cd4fe34bda88aa2aa692a76d74acc2eb8f6d3 SHA512 0777f9c79c817e3df97df2d5694594e6a6ad0d9f553737076f9f5a2f83810131899f1a3069b603ab2427a6faf0230f84918146da6bf68583edc8de432cf67a0a
-DIST gwenview-24.12.0.tar.xz 6525836 BLAKE2B 6b26a1a9db06b28d901bea87f758d73d4fc585081030e400fd00434d94f962bed51fb7c164bc4c8fd38ee8f73b4be409dde5803127b51f29ee681df4f7142ef3 SHA512 3e5b88c18a2d6d49653be411a71d2d163d9b0cd92867e73f936807aa4e0425ef7dfae4329e68ad87ec675902b5b19e4aee656f38e1bbf935ea6aacf31951019a
+DIST gwenview-24.12.1.tar.xz 6525788 BLAKE2B fcf1d135a5ebb654a236efdd657561a1eddc91e5a4f80ef5b205cf9e41751d688320c803c331dbcfa814ae39376cf225a1d7d93bffb112a6b80838fe9d6e0e4b SHA512 631fce8dafbcc2a1d122fc44227fef8a85c42a9d4f0b9ca3be66a773a5d6d49fbb9d52d55818029ddbb1a64cb10893e00e1cca73e1dadb6b8d82441eec804848
diff --git a/kde-apps/gwenview/gwenview-24.12.0.ebuild b/kde-apps/gwenview/gwenview-24.12.0.ebuild
deleted file mode 100644
index 173e0aebddcc..000000000000
--- a/kde-apps/gwenview/gwenview-24.12.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org optfeature
-
-DESCRIPTION="Image viewer by KDE"
-HOMEPAGE="https://apps.kde.org/gwenview/ https://userbase.kde.org/Gwenview"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="activities fits +mpris raw semantic-desktop share X"
-
-# requires running environment
-RESTRICT="test"
-
-# slot op: includes qpa/qplatformnativeinterface.h, qtx11extras_p.h
-COMMON_DEPEND="
-	dev-libs/wayland
-	>=dev-qt/qtbase-${QTMIN}:6=[gui,opengl,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=dev-qt/qtwayland-${QTMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-	media-gfx/exiv2:=
-	>=media-libs/kcolorpicker-0.3.1
-	>=media-libs/kimageannotator-0.7.1
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/phonon-4.12.0[qt6(+)]
-	media-libs/tiff:=
-	activities? ( kde-plasma/plasma-activities:6 )
-	fits? ( sci-libs/cfitsio )
-	mpris? ( >=dev-qt/qtbase-${QTMIN}:6[dbus] )
-	raw? ( >=kde-apps/libkdcraw-${PVCUT}:6 )
-	semantic-desktop? (
-		>=kde-frameworks/baloo-${KFMIN}:6
-		>=kde-frameworks/kfilemetadata-${KFMIN}:6
-	)
-	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
-	X? (
-		>=dev-qt/qtbase-${QTMIN}:6=[X]
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/wayland-protocols
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtimageformats-${QTMIN}:6
-	>=kde-apps/thumbnailers-${PVCUT}:6
-	>=kde-frameworks/kimageformats-${KFMIN}:6
-"
-BDEPEND="
-	>=dev-qt/qtwayland-${QTMIN}:6
-	dev-util/wayland-scanner
-"
-
-src_prepare() {
-	ecm_src_prepare
-	if ! use mpris; then
-		# FIXME: upstream a better solution
-		sed -e "/set(HAVE_QTDBUS/s/\${Qt6DBus_FOUND}/0/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities PlasmaActivities)
-		$(cmake_use_find_package fits CFitsio)
-		$(cmake_use_find_package raw KDcrawQt6)
-		-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo None)
-		$(cmake_use_find_package share KF6Purpose)
-		-DWITHOUT_X11=$(usex !X)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "SVG support" "kde-apps/svgpart:${SLOT}"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/gwenview/gwenview-24.12.1.ebuild b/kde-apps/gwenview/gwenview-24.12.1.ebuild
new file mode 100644
index 000000000000..b39ab6023b2c
--- /dev/null
+++ b/kde-apps/gwenview/gwenview-24.12.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Image viewer by KDE"
+HOMEPAGE="https://apps.kde.org/gwenview/ https://userbase.kde.org/Gwenview"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="activities fits +mpris raw semantic-desktop share X"
+
+# requires running environment
+RESTRICT="test"
+
+# slot op: includes qpa/qplatformnativeinterface.h, qtx11extras_p.h
+COMMON_DEPEND="
+	dev-libs/wayland
+	>=dev-qt/qtbase-${QTMIN}:6=[gui,opengl,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	media-gfx/exiv2:=
+	>=media-libs/kcolorpicker-0.3.1
+	>=media-libs/kimageannotator-0.7.1
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/phonon-4.12.0[qt6(+)]
+	media-libs/tiff:=
+	activities? ( kde-plasma/plasma-activities:6 )
+	fits? ( sci-libs/cfitsio )
+	mpris? ( >=dev-qt/qtbase-${QTMIN}:6[dbus] )
+	raw? ( >=kde-apps/libkdcraw-${PVCUT}:6 )
+	semantic-desktop? (
+		>=kde-frameworks/baloo-${KFMIN}:6
+		>=kde-frameworks/kfilemetadata-${KFMIN}:6
+	)
+	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
+	X? (
+		>=dev-qt/qtbase-${QTMIN}:6=[X]
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/wayland-protocols
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtimageformats-${QTMIN}:6
+	>=kde-apps/thumbnailers-${PVCUT}:6
+	>=kde-frameworks/kimageformats-${KFMIN}:6
+"
+BDEPEND="
+	>=dev-qt/qtwayland-${QTMIN}:6
+	dev-util/wayland-scanner
+"
+
+src_prepare() {
+	ecm_src_prepare
+	if ! use mpris; then
+		# FIXME: upstream a better solution
+		sed -e "/set(HAVE_QTDBUS/s/\${Qt6DBus_FOUND}/0/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package activities PlasmaActivities)
+		$(cmake_use_find_package fits CFitsio)
+		$(cmake_use_find_package raw KDcrawQt6)
+		-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo None)
+		$(cmake_use_find_package share KF6Purpose)
+		-DWITHOUT_X11=$(usex !X)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "SVG support" "kde-apps/svgpart:${SLOT}"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index bcd3dc9a212d..07a847514f6a 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,2 +1,2 @@
 DIST incidenceeditor-24.08.3.tar.xz 587876 BLAKE2B e0b36876c25988521997c23ee8a474612aec8abb66ffe6367818813ee0ccdca61d0c9f929b08993081655423814ba95fb99c8d643357c134b4819ce8026eafc1 SHA512 863f96496eb35c4d600e7c9de8aedebbb9c3b7c272db70cd159e186a8a17208a084e50da6423df8dd0d7ece7933201c035b3a376612ad69fc6b4aec80d45b624
-DIST incidenceeditor-24.12.0.tar.xz 587748 BLAKE2B 7aa4b4104678d5c451852c7482d43fbba6973f0fdc234044165d15d9ed976b787f541650b5f6486a6a8b85fa8bf987d38dc145cca9d2af0fee0febbbf3dcfce7 SHA512 6aa6bed93cb02692d59581ed13e49fbc4fb8b09c0aa3766041d35143f305e91f5683f99471f0ac31007262cf694676a255278a847907b2ee51c87ac9eb18c9d4
+DIST incidenceeditor-24.12.1.tar.xz 587836 BLAKE2B e5ff7faa96650275ab6724ce5ae26fe26cc12180e6b2da56085ec182ae867ffa6f028f47b9e60f2aa2e5e3ba589be0ccaff671f4977198cf891f60e31de5ea13 SHA512 12e674ede656a599c6be66e1bc3aa33af70eaab77356a84fb49918e3c2ecc06cbc2a7df7378cb1f81530557af9e1bf6e9e391bc36bc169d0f2143855673ca38f
diff --git a/kde-apps/incidenceeditor/incidenceeditor-24.12.0-r1.ebuild b/kde-apps/incidenceeditor/incidenceeditor-24.12.0-r1.ebuild
deleted file mode 100644
index 6a99bf4483fd..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Incidence editor for KOrganizer"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RDEPEND="
-	dev-libs/kdiagram:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-calendar-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/calendarsupport-${PVCUT}:6
-	>=kde-apps/eventviews-${PVCUT}:6
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kldap-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-DEPEND="${RDEPEND}
-	test? ( kde-apps/akonadi-config[mysql,postgres,sqlite] )
-"
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
-"
-
-src_test() {
-	# Paths exceed unix domain socket limit, bugs 770775 and 837182
-	local myctestargs=(
-		-E "(akonadi-mysql-incidencedatetimetest|akonadi-pgsql-incidencedatetimetest|akonadi-sqlite-incidencedatetimetest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/incidenceeditor/incidenceeditor-24.12.1.ebuild b/kde-apps/incidenceeditor/incidenceeditor-24.12.1.ebuild
new file mode 100644
index 000000000000..57e6d5176a1f
--- /dev/null
+++ b/kde-apps/incidenceeditor/incidenceeditor-24.12.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Incidence editor for KOrganizer"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RDEPEND="
+	dev-libs/kdiagram:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-calendar-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/calendarsupport-${PVCUT}:6
+	>=kde-apps/eventviews-${PVCUT}:6
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+DEPEND="${RDEPEND}
+	test? ( kde-apps/akonadi-config[mysql,postgres,sqlite] )
+"
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
+"
+
+src_test() {
+	# Paths exceed unix domain socket limit, bugs 770775 and 837182
+	local myctestargs=(
+		-E "(akonadi-mysql-incidencedatetimetest|akonadi-pgsql-incidencedatetimetest|akonadi-sqlite-incidencedatetimetest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index 331e55860beb..cbe5a8614ecd 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,2 +1,2 @@
 DIST juk-24.08.3.tar.xz 1909616 BLAKE2B 2553581fa6ac4dfee94e863b1035e58d459696505297324c7734d44783438db61558fb158f68df75a6dc9f598b9cb9c2789452decdaddc2ae536b6cb76339551 SHA512 5d65213f927ad9c4ed346e3ba7bcade921b7b6a55d110d257346b9f3d6f7c39a07e5d31fabac35b74225a39727f7a7a8969c34d56c0577ad7435abeac32c56d1
-DIST juk-24.12.0.tar.xz 1910264 BLAKE2B 2ee62252f58bf2f8758dbd9bbe91b0e96dfbe39e03e9833f7ab93d5516867d17571de76d60bff389090321da2b993899ee86d4531b08a2f46c767c7be49cacfa SHA512 169ae2bcff2050ff4ceb2a98938013246e361d045c43510b86eb30c6f66c7c734805f3e50df2e892390e16be46a623892fb6e7abe91a28f0dc124e2b21944b6d
+DIST juk-24.12.1.tar.xz 1910908 BLAKE2B 81b56da41c7b0b0d2fa137971ce50bba36eb4e9a96e979e8f2d58fb69b18dc1c4920a6501dcf54c9b33c1019712c31f404623f2707093e69579686ac6bc993bd SHA512 93e6c8511e7066884e54c3619c88bfa8d360d62af17ed8104b01a90a6b8ecf5a1df192e8a9944ed782e229ed952bdc6b56e7a6490c72e94a88edd13a2b110ff8
diff --git a/kde-apps/juk/juk-24.12.0.ebuild b/kde-apps/juk/juk-24.12.0.ebuild
deleted file mode 100644
index eb4ff6e1f187..000000000000
--- a/kde-apps/juk/juk-24.12.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Jukebox and music manager by KDE"
-HOMEPAGE="https://apps.kde.org/juk/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kglobalaccel-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=media-libs/phonon-4.12.0[qt6(+)]
-	>=media-libs/taglib-1.6:=
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
-"
diff --git a/kde-apps/juk/juk-24.12.1.ebuild b/kde-apps/juk/juk-24.12.1.ebuild
new file mode 100644
index 000000000000..25c15b704628
--- /dev/null
+++ b/kde-apps/juk/juk-24.12.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Jukebox and music manager by KDE"
+HOMEPAGE="https://apps.kde.org/juk/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=media-libs/phonon-4.12.0[qt6(+)]
+	>=media-libs/taglib-1.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index 7b23bba2315f..a9efb019eeba 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,2 +1,2 @@
 DIST k3b-24.08.3.tar.xz 10691232 BLAKE2B 8928572eae9b4a19c2df79c9ad47826eb563db3506cf9a88d2bf27f2ecce1c935809672941ec166c1e54cebcf642e9e4f6ee98c236d8503dd4a34db69023467c SHA512 534f97bc62270fe2722830d301ca7b131fb4a1bfc5dbd32b5df3fe7a054d1918c1a37682c1256a956661dac817fe6972083071ac5fcfc196ed38ea4bdcea1750
-DIST k3b-24.12.0.tar.xz 10696880 BLAKE2B 9f91b638898500a68a263dc931d878438f06f03358315b7ad6cb4e5e68cbe784ca78e1a3b71934ee6351d46a052215c58fd964090794f6fab8a60ce4a63e9536 SHA512 e312233ca2bdb5ef3654fb4d62f3e411d808c37223ad190d4bb4a2ce143c002f6033c794174b0cd3d7078d010a4433d11fa06bf6d022f33594188c64a2730e66
+DIST k3b-24.12.1.tar.xz 10697284 BLAKE2B 29bba35cc2ee08c0ab9d315bd844079e4fb3e116250ef45de932a3ca3872436912bbb0074c62bf6d1be2b2652cbbbd565c2c58ad74680bf3ebb192680dd95b52 SHA512 91be9a8ae4e2046fef225d77e2e00b0a52a0f0f85f23261d47a1b5fb1c9aa53936622d70f58e721086c9e8e8e012a66531ec7a9f175fd4cd8674bccf278220ee
diff --git a/kde-apps/k3b/k3b-24.12.0.ebuild b/kde-apps/k3b/k3b-24.12.0.ebuild
deleted file mode 100644
index aae01d054b74..000000000000
--- a/kde-apps/k3b/k3b-24.12.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm flag-o-matic gear.kde.org
-
-DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="dvd ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis webengine"
-
-REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
-	>=kde-apps/libkcddb-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kfilemetadata-${KFMIN}:6[taglib?]
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-	media-libs/libsamplerate
-	dvd? ( media-libs/libdvdread:= )
-	ffmpeg? ( >=media-video/ffmpeg-4.4.0:0= )
-	flac? ( >=media-libs/flac-1.2:=[cxx] )
-	lame? ( media-sound/lame )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	sndfile? ( media-libs/libsndfile )
-	taglib? ( >=media-libs/taglib-1.5:= )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6 )
-"
-RDEPEND="${DEPEND}
-	app-cdr/cdrdao
-	app-cdr/cdrtools
-	dev-libs/libburn
-	media-sound/cdparanoia
-	dvd? ( >=app-cdr/dvd+rw-tools-7 )
-	sox? ( media-sound/sox )
-	vcd? ( media-video/vcdimager )
-"
-
-DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
-
-src_configure() {
-	# -Werror=odr, -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/924376
-	# https://bugs.kde.org/show_bug.cgi?id=492571
-	filter-lto
-
-	local mycmakeargs=(
-		-DK3B_BUILD_API_DOCS=OFF
-		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=ON
-		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
-		-DK3B_ENABLE_HAL_SUPPORT=OFF
-		-DK3B_DEBUG=$(usex debug)
-		-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
-		-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
-		-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
-		-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex lame)
-		-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
-		-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
-		-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
-		-DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox)
-		-DK3B_ENABLE_TAGLIB=$(usex taglib)
-		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
-		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
-		$(cmake_use_find_package webengine Qt6WebEngineWidgets)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	elog "If you get warnings on start-up, uncheck the \"Check system"
-	elog "configuration\" option in the \"Misc\" settings window."
-	elog
-	local group=cdrom
-	use kernel_linux || group=operator
-	elog "Make sure you have proper read/write permissions on optical device(s)."
-	elog "Usually, it is sufficient to be in the ${group} group."
-}
diff --git a/kde-apps/k3b/k3b-24.12.1.ebuild b/kde-apps/k3b/k3b-24.12.1.ebuild
new file mode 100644
index 000000000000..7f03ff3c05fc
--- /dev/null
+++ b/kde-apps/k3b/k3b-24.12.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm flag-o-matic gear.kde.org
+
+DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="dvd ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis webengine"
+
+REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=kde-apps/libkcddb-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kfilemetadata-${KFMIN}:6[taglib?]
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	media-libs/libsamplerate
+	dvd? ( media-libs/libdvdread:= )
+	ffmpeg? ( >=media-video/ffmpeg-4.4.0:0= )
+	flac? ( >=media-libs/flac-1.2:=[cxx] )
+	lame? ( media-sound/lame )
+	mad? ( media-libs/libmad )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	sndfile? ( media-libs/libsndfile )
+	taglib? ( >=media-libs/taglib-1.5:= )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	app-cdr/cdrdao
+	app-cdr/cdrtools
+	dev-libs/libburn
+	media-sound/cdparanoia
+	dvd? ( >=app-cdr/dvd+rw-tools-7 )
+	sox? ( media-sound/sox )
+	vcd? ( media-video/vcdimager )
+"
+
+DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
+
+src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/924376
+	# https://bugs.kde.org/show_bug.cgi?id=492571
+	filter-lto
+
+	local mycmakeargs=(
+		-DK3B_BUILD_API_DOCS=OFF
+		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=ON
+		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
+		-DK3B_ENABLE_HAL_SUPPORT=OFF
+		-DK3B_DEBUG=$(usex debug)
+		-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
+		-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
+		-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
+		-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex lame)
+		-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
+		-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
+		-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
+		-DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox)
+		-DK3B_ENABLE_TAGLIB=$(usex taglib)
+		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
+		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
+		$(cmake_use_find_package webengine Qt6WebEngineWidgets)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	elog "If you get warnings on start-up, uncheck the \"Check system"
+	elog "configuration\" option in the \"Misc\" settings window."
+	elog
+	local group=cdrom
+	use kernel_linux || group=operator
+	elog "Make sure you have proper read/write permissions on optical device(s)."
+	elog "Usually, it is sufficient to be in the ${group} group."
+}
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index 3065bee3aee1..a9d0feb8a8aa 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,2 +1,2 @@
 DIST kaccounts-integration-24.08.3.tar.xz 92380 BLAKE2B 1c702ee847ffc03db964a34199cc8d3ffb5bd3d759908f3171b1ae21589f5bec341f7c4a5874fc3eee74ce79e646eac823cb7034fe769bda3882bf665a24ea01 SHA512 8432c08bf8b7207ea2bf16b13f12e04c27a939dd1b45c3ea71ac8d4cb1b0e81d87784753bf8e89b9dba7993987be7935f4b5529b183e6cd601565ae24efb5663
-DIST kaccounts-integration-24.12.0.tar.xz 93484 BLAKE2B 85adcb69b5fa12ebaa7cc4191f97095e78bb984c54ab98b50821909ba71671a058996f4a112c5ffd28c07967311997b6d433b420e9651325f995ba9f0240bd84 SHA512 d6ec7c7b6d1eb8d6b63e7f0eb2d3d3b4c31106e19a928392f8e3b3078d230f0f7a3cb9e969a7875bce1602df30f4a47883fb6004e27cd3f9bfc675983d31c66b
+DIST kaccounts-integration-24.12.1.tar.xz 93568 BLAKE2B 8cfd28c381437fea0d7dc8bcbb79f94702581fefc2618a30b2071906be0f17cd9f08fda6518ac9bdb3f4afb5b60bdf9b36582ed358ef23f8088dd735162d9abf SHA512 3f29cabf3aafbbb6966efea1cbbfab881c359bcb7636cfc4ed1a3a78a76b421758a522528da05f22dd272aaadcd2617c69876d598f82f40af867b465dc3ab0c3
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-24.12.0-r1.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-24.12.0-r1.ebuild
deleted file mode 100644
index 3060bceed041..000000000000
--- a/kde-apps/kaccounts-integration/kaccounts-integration-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=6.5.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=6.7.2
-VIRTUALDBUS_TEST="true"
-inherit ecm gear.kde.org
-
-DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-# bug #549444
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
-	>=net-libs/accounts-qt-1.17-r2
-	>=net-libs/signond-8.61-r102
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/qcoro
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-"
-RDEPEND="${COMMON_DEPEND}
-	kde-apps/signon-kwallet-extension:6
-"
-BDEPEND="sys-devel/gettext"
-PDEPEND=">=kde-apps/kaccounts-providers-${PVCUT}:6"
-
-src_configure() {
-	local mycmakeargs=( -DKF6_COMPAT_BUILD=OFF )
-	ecm_src_configure
-}
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-24.12.1.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-24.12.1.ebuild
new file mode 100644
index 000000000000..a4026282334a
--- /dev/null
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-24.12.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=6.7.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+VIRTUALDBUS_TEST="true"
+inherit ecm gear.kde.org
+
+DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
+HOMEPAGE="https://community.kde.org/KTp"
+
+LICENSE="LGPL-2.1"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+# bug #549444
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=net-libs/accounts-qt-1.17-r2
+	>=net-libs/signond-8.61-r102
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/qcoro
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+"
+RDEPEND="${COMMON_DEPEND}
+	kde-apps/signon-kwallet-extension:6
+"
+BDEPEND="sys-devel/gettext"
+PDEPEND=">=kde-apps/kaccounts-providers-${PVCUT}:6"
+
+src_configure() {
+	local mycmakeargs=( -DKF6_COMPAT_BUILD=OFF )
+	ecm_src_configure
+}
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index ea4ea3286a85..e4208701e439 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,2 +1,2 @@
 DIST kaccounts-providers-24.08.3.tar.xz 68940 BLAKE2B be60671efab50e51ad2578760cfa50c565df1a4b9372d122c5a5486fb0c9f1dea0ef7ccc61c3b54b1581b70fa76cfea31017563da380b2a71ce045cf1a470a23 SHA512 0c035faa1bc5eb1ec80fe9eb32c597222f80b06b4033793d9368342218ace22ecaa2eec3de3f0699ca4b268b1997af982b3b28d278315b6f579ef866e6541707
-DIST kaccounts-providers-24.12.0.tar.xz 68876 BLAKE2B 3228e3d8fa0c63d6b3df03116b0e2cc49e24dea462e86fb3121fcebb39ec01e166115fa91d265d463826b1ab8f69f20b90cd51daa2a5cab14645eaa696923797 SHA512 cf617ab1233c464ea321f328fa1432dd098fc87fbe57c7423b474bbe0e4c52fe25c6d49470feb0972bf266ed58cdbe7d09782616c387bfbdb0a4bb57efdc4ff5
+DIST kaccounts-providers-24.12.1.tar.xz 68872 BLAKE2B ea94c2a5ac7bde6bd08354a927c68699ce7161f60ef798d2e8972226a6c4334643c31d0ab9ac8e6bc2b084b7589b339fbacf2c761fddeb04627e7a09591848c3 SHA512 f4adedf0a2395fdb00d22f73f35f9a4ddf3e1a94531ac3540a4dc5bc91491491c3ddf85a516df821237739059a74974aaf16ea18a43e8fb4ba6311c1767490aa
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-24.12.0.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-24.12.0.ebuild
deleted file mode 100644
index f051e1547798..000000000000
--- a/kde-apps/kaccounts-providers/kaccounts-providers-24.12.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
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE accounts providers"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtwebengine-${QTMIN}:6[qml]
-	>=kde-apps/kaccounts-integration-${PVCUT}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kpackage-${KFMIN}:6
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/qcoro[network]
-"
-RDEPEND="${COMMON_DEPEND}
-	>=net-libs/signon-oauth2-0.25_p20210102[qt6(+)]
-	>=net-libs/signon-ui-0.15_p20231016
-"
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-24.12.1.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-24.12.1.ebuild
new file mode 100644
index 000000000000..af88f2338af7
--- /dev/null
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-24.12.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE accounts providers"
+HOMEPAGE="https://community.kde.org/KTp"
+
+LICENSE="LGPL-2.1"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6[qml]
+	>=kde-apps/kaccounts-integration-${PVCUT}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kpackage-${KFMIN}:6
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/qcoro[network]
+"
+RDEPEND="${COMMON_DEPEND}
+	>=net-libs/signon-oauth2-0.25_p20210102[qt6(+)]
+	>=net-libs/signon-ui-0.15_p20231016
+"
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 0d5aaaae3475..71141d5ac0b7 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,2 +1,2 @@
 DIST kaddressbook-24.08.3.tar.xz 3425176 BLAKE2B 2af3ba9ba771fae52602950d234203e501c601aa54f0597145328f70fedd33b2e038a69cff395b5f4264662ed2e80115e50c3339636dcfa89ab429fc9969df13 SHA512 c281e6127de0d3eb617da204c143d298a876f24779d11f12b3c49b0182c430c78ce44bf147a9e547e7ad14f5dba8897b68ba83b470225755f92c7fee3c386c60
-DIST kaddressbook-24.12.0.tar.xz 3429604 BLAKE2B 3e491ed0bc66c745776f2777479956c6f47dda97c21c8594c292eaa8386a5ecb4ef2c1b0ea42c207373df4aabfe787e4df1bf3a379e971c899d6bc0680363ac8 SHA512 c8fe729f2b3baa5aba2e7c804fe85d04dfb8183ccf317263a9c5069c81abce8afc3ec2444d460c3d2474d321f8ea7e6a11308116888b5ec95fea5817d3ecc45d
+DIST kaddressbook-24.12.1.tar.xz 3430008 BLAKE2B a70c530ba62201a6b422392eb85ae95f3e094d072226e09925678e46633397496952188726de5fe4c482b3b3261df333b6070d001882b6b60d4519ef02dbe0c1 SHA512 747b85027efac27312b34adb3dfebad8e1a69e810271342a47d409981a9722ba5a9eac0e3e130630cf8fc86ee45cf8e859b3bb297eada260943048c05b1ee93e
diff --git a/kde-apps/kaddressbook/kaddressbook-24.12.0-r1.ebuild b/kde-apps/kaddressbook/kaddressbook-24.12.0-r1.ebuild
deleted file mode 100644
index 35de1a84a528..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org optfeature
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kaddressbook/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="activities telemetry"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-search-${PVCUT}:6
-	>=kde-apps/grantleetheme-${PVCUT}:6
-	>=kde-apps/kldap-${PVCUT}:6
-	>=kde-apps/kontactinterface-${PVCUT}:6
-	>=kde-apps/libgravatar-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	activities? ( kde-plasma/plasma-activities:6 )
-	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:6
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
-		$(cmake_use_find_package telemetry KF6UserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Postal addresses" "kde-apps/kdepim-addons:${SLOT}"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kaddressbook/kaddressbook-24.12.1.ebuild b/kde-apps/kaddressbook/kaddressbook-24.12.1.ebuild
new file mode 100644
index 000000000000..8ac99492f62c
--- /dev/null
+++ b/kde-apps/kaddressbook/kaddressbook-24.12.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Address book application based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/kaddressbook/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities telemetry"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-search-${PVCUT}:6
+	>=kde-apps/grantleetheme-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	>=kde-apps/kontactinterface-${PVCUT}:6
+	>=kde-apps/libgravatar-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kdepim-runtime-${PVCUT}:6
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Postal addresses" "kde-apps/kdepim-addons:${SLOT}"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index 3369a9ece34f..afbe52fab14d 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,2 +1,2 @@
 DIST kajongg-24.08.3.tar.xz 4618488 BLAKE2B 1e4d7439db1858b7053f748f9184272b86facfcfc2e2775516e31982d48628a58ff2b9b5eecdb0356932720eddbf5598ca03197234b777a871568921cc812a85 SHA512 166e9fd09c469f2c8c040d442c27ca4fb78a62dc29b2d96649f265175038918f6fd324709f800799a8c5cb49af02a3c5641334b0fd1ead034b4a9786954ca525
-DIST kajongg-24.12.0.tar.xz 4618292 BLAKE2B a7bbc3ff31754f82c067ae10ddf851afc19409adea9885b4115850f90acaad4fd959bcbf5275d56e719fe8cde30d5e9ecc23ccebd3e06f10bba07f3a0dd18916 SHA512 082236f61873dfe16d1499f654420319c5b7c368565b1c8b5106a725c15e28cca7a048b8ba2f8babaa77ecca94e94cc48863509cbb7ad6bde3826eac878721cd
+DIST kajongg-24.12.1.tar.xz 4618596 BLAKE2B b6f5938d7148bad5acdef556fb241c59766aa13325859a31123903f1b2f4663470d9f59a0c426ab1d360f45ff7d5e35db6040bfdf516761e8b77f60c715965ff SHA512 eb64dc321ef846d2ffa00eb01377258f69a3186b5f4539ef5976b5b10b1a97e7586894b1aaad960481fe3a10316041d43097e441bc56e9e88a9327759e1e3e73
diff --git a/kde-apps/kajongg/kajongg-24.12.0.ebuild b/kde-apps/kajongg/kajongg-24.12.0.ebuild
deleted file mode 100644
index 8d698fd40558..000000000000
--- a/kde-apps/kajongg/kajongg-24.12.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{10..12} )
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit python-single-r1 ecm gear.kde.org
-
-DESCRIPTION="Classical Mah Jongg for four players"
-HOMEPAGE="https://apps.kde.org/kajongg/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-db/sqlite:3
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	|| ( dev-python/qtpy[pyqt6] dev-python/qtpy[pyside6] )
-	$(python_gen_cond_dep '
-		dev-python/qtpy[gui,svg,widgets,${PYTHON_USEDEP}]
-		>=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/libkmahjongg-${PVCUT}:6
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang src
-	ecm_src_prepare
-}
diff --git a/kde-apps/kajongg/kajongg-24.12.1.ebuild b/kde-apps/kajongg/kajongg-24.12.1.ebuild
new file mode 100644
index 000000000000..93d39f75c92f
--- /dev/null
+++ b/kde-apps/kajongg/kajongg-24.12.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python3_{10..12} )
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit python-single-r1 ecm gear.kde.org
+
+DESCRIPTION="Classical Mah Jongg for four players"
+HOMEPAGE="https://apps.kde.org/kajongg/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-db/sqlite:3
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	|| ( dev-python/qtpy[pyqt6] dev-python/qtpy[pyside6] )
+	$(python_gen_cond_dep '
+		dev-python/qtpy[gui,svg,widgets,${PYTHON_USEDEP}]
+		>=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/libkmahjongg-${PVCUT}:6
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang src
+	ecm_src_prepare
+}
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 012d93170abb..de988f5dd499 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,2 +1,2 @@
 DIST kalarm-24.08.3.tar.xz 2619400 BLAKE2B f927a613da45e29ffe0f35c093c126cf97d067e4de5a43331332dcbab75cc17575a789c7fdb2b4a897336bbb17402461323425512ebefcf46691432581b6e966 SHA512 bb3ed33df9961b48681293e7adb1f65b0fec69f54bcb7bc76d219f941b97d8df448ed8f0bfc916178ecd05288de5f5401d503851d8a7b3a336c74d7ef55753f7
-DIST kalarm-24.12.0.tar.xz 2635624 BLAKE2B 1583ae42784e80e379d6e40b0b421d99ebc177ea50c4557534442fcf6c725d5dc21f768d0fbd172a4025703429c0b6461a4aabd392bb4c301d85543a28109985 SHA512 b992ec74ad3177a93a88ecb29971e69183c8e21316572a8675d88e99585004681658775130615a76174d4a8e093c0f74b19eb23ea0905c3dd68d7748a620e334
+DIST kalarm-24.12.1.tar.xz 2636020 BLAKE2B dba05c25c6cd4642dd361015c35c1fa5924e1239b48cbc800d72efb4449765b5520fdc93a78d282f422c8c6a69a352b90500b13a935f54277d1897afb264c23e SHA512 72a0635ad3231706b101f42552f7e3fa089acd9a271bcb952662ce0c1a7d6a9380a6282b4fdc6d4a127baae8a70e988896c3b60d42072c2bbbb22a885bf25938
diff --git a/kde-apps/kalarm/kalarm-24.12.0-r1.ebuild b/kde-apps/kalarm/kalarm-24.12.0-r1.ebuild
deleted file mode 100644
index 99400aaaa437..000000000000
--- a/kde-apps/kalarm/kalarm-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
-HOMEPAGE="https://apps.kde.org/kalarm/ https://userbase.kde.org/KAlarm"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="mpv +pim speech X"
-
-COMMON_DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-frameworks/kauth-${KFMIN}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kglobalaccel-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/kholidays-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	mpv? ( >=media-video/mpv-0.37.0:=[libmpv] )
-	!mpv? ( media-video/vlc:= )
-	pim? (
-		>=kde-apps/akonadi-${PVCUT}:6
-		>=kde-apps/akonadi-contacts-${PVCUT}:6
-		>=kde-apps/akonadi-mime-${PVCUT}:6
-		>=kde-apps/kmailtransport-${PVCUT}:6
-	)
-	speech? ( >=dev-libs/ktextaddons-1.5.4:6[speech] )
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${COMMON_DEPEND}
-	pim? ( >=kde-apps/kdepim-runtime-${PVCUT}:6 )
-"
-DEPEND="${COMMON_DEPEND}
-	speech? ( kde-apps/kpimtextedit[speech] )
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_LIBMPV=$(usex mpv)
-		-DENABLE_LIBVLC=$(usex !mpv)
-		-DENABLE_AKONADI_PLUGIN=$(usex pim)
-		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
-		-DWITHOUT_X11=$(usex !X)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# LC_TIME bug 665626, 857012
-	# TZ bug https://bugs.kde.org/show_bug.cgi?id=445734
-	LC_TIME="C" TZ=UTC ecm_src_test
-}
diff --git a/kde-apps/kalarm/kalarm-24.12.1.ebuild b/kde-apps/kalarm/kalarm-24.12.1.ebuild
new file mode 100644
index 000000000000..77fe5d939c97
--- /dev/null
+++ b/kde-apps/kalarm/kalarm-24.12.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
+HOMEPAGE="https://apps.kde.org/kalarm/ https://userbase.kde.org/KAlarm"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="mpv +pim speech X"
+
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/kholidays-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	mpv? ( >=media-video/mpv-0.37.0:=[libmpv] )
+	!mpv? ( media-video/vlc:= )
+	pim? (
+		>=kde-apps/akonadi-${PVCUT}:6
+		>=kde-apps/akonadi-contacts-${PVCUT}:6
+		>=kde-apps/akonadi-mime-${PVCUT}:6
+		>=kde-apps/kmailtransport-${PVCUT}:6
+	)
+	speech? ( >=dev-libs/ktextaddons-1.5.4:6[speech] )
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${COMMON_DEPEND}
+	pim? ( >=kde-apps/kdepim-runtime-${PVCUT}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	speech? ( kde-apps/kpimtextedit[speech] )
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_LIBMPV=$(usex mpv)
+		-DENABLE_LIBVLC=$(usex !mpv)
+		-DENABLE_AKONADI_PLUGIN=$(usex pim)
+		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
+		-DWITHOUT_X11=$(usex !X)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# LC_TIME bug 665626, 857012
+	# TZ bug https://bugs.kde.org/show_bug.cgi?id=445734
+	LC_TIME="C" TZ=UTC ecm_src_test
+}
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index efaeded3fc65..0d1a89aa8657 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,2 +1,2 @@
 DIST kalgebra-24.08.3.tar.xz 948660 BLAKE2B e6bdffa8fddf283dc9118eb5af4534b0c7dc859ffa0e7e86cbe30c36aaa6de278df43d428d09fb9f28fa731e6051d8b95f91f1773f73645552f329543d0f0239 SHA512 b37146437621ab89d588aa76c350e645ca0a21da7272e5aec31b919655e92db6ce731078d919f50fb03c67621d71131744c1e0237109573d7c0629ff7deeacc4
-DIST kalgebra-24.12.0.tar.xz 948732 BLAKE2B e8bf05512cfc1ac0d12ff58d3d939df167490aed9de4842bea1f430e4b5123bb89dbb78b400e1fb3e5ef5a603e1dcd22d9bb366bacc308aebf28b46aa74686f3 SHA512 202390af293071d1e4bbf2a272dc2216b121ff788c91c8aa8b9c806bf046c00c759dec416c4f2caf6e45b124d501acac90271d6c72804dc31669491b6524b49f
+DIST kalgebra-24.12.1.tar.xz 948828 BLAKE2B 2c905153640e163dcb5eb8cc479704b4932878a343692deadbaec14e022b7fa2ec7f7ae4039407d0fcaac476ef642ac7274c74c307881fff8edcf4848b52b7f9 SHA512 9a9cec5feec235df7633126afa1f999af39d1de7a08347e449182aa0f67186fc855a6bba3ca4e5fdff5a876da2e3d2d457f82b2cc096172aef85ec13728888e8
diff --git a/kde-apps/kalgebra/kalgebra-24.12.0.ebuild b/kde-apps/kalgebra/kalgebra-24.12.0.ebuild
deleted file mode 100644
index 5f9cd6c37db3..000000000000
--- a/kde-apps/kalgebra/kalgebra-24.12.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm flag-o-matic gear.kde.org
-
-DESCRIPTION="MathML-based 2D and 3D graph calculator by KDE"
-HOMEPAGE="https://apps.kde.org/kalgebra/"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="readline"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,opengl,widgets]
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-apps/analitza-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	kde-plasma/libplasma:6
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${KFMIN}:6
-"
-
-src_configure() {
-	replace-flags "-Os" "-O2" # bug 829323
-
-	local mycmakeargs=(
-		$(cmake_use_find_package readline Readline)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kalgebra/kalgebra-24.12.1.ebuild b/kde-apps/kalgebra/kalgebra-24.12.1.ebuild
new file mode 100644
index 000000000000..9d884b2ad2a8
--- /dev/null
+++ b/kde-apps/kalgebra/kalgebra-24.12.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm flag-o-matic gear.kde.org
+
+DESCRIPTION="MathML-based 2D and 3D graph calculator by KDE"
+HOMEPAGE="https://apps.kde.org/kalgebra/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="readline"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,opengl,widgets]
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-apps/analitza-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	kde-plasma/libplasma:6
+	readline? ( sys-libs/readline:0= )
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:6
+"
+
+src_configure() {
+	replace-flags "-Os" "-O2" # bug 829323
+
+	local mycmakeargs=(
+		$(cmake_use_find_package readline Readline)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index b90f1a542dcc..3491599cd322 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,2 +1,3 @@
 DIST kalzium-24.08.3.tar.xz 22682884 BLAKE2B 3595c192266359c0642ea34f1ae147bd44f7ef3464414e5cf673f1139d152c663081eec143d9f7cae22a181f57c5726dfb70135d0195ff19a8166c1f6c59c672 SHA512 bf12651db02625c4df64d634d4b110feb83b7a7472be8272d0a1b505251ee9f65667b814094defb6ab0e1410922e88aa2075e684e751b04892baeaa7d45e935c
 DIST kalzium-24.12.0.tar.xz 22682696 BLAKE2B 842e01df1db9de3fcbbe3907c80c8d520da678985dd5de8bd3c90b59f87d329576437a35e38c3b3df6ffb80e39d58d7baf987470f587fa80b1fe8570e8ffc656 SHA512 63be4ec6423823473c94d4da4e557e97a2b387286b14e6103af402428e5f4186b02dfc7facde0e6d0d9b6c4132227f0daf534ed7d7a527635132df6e6ec33849
+DIST kalzium-24.12.1.tar.xz 22682996 BLAKE2B cc9aba168eafd965788c5896ea9b79a5486b39f8629a2d0e6b4eb490bb434ea676238dd1704ad023982f4a59faf759115772695b0f5604c0d300ee7aa6fc5bbd SHA512 598d856bcab0f5e2774a5f1d7c33d7800808bd6e499d791643f92a48d8dd1459105fbc0210b1308d01d5660abca951269141d99f63c2a2a157f697b2a74c3a6f
diff --git a/kde-apps/kalzium/kalzium-24.12.0.ebuild b/kde-apps/kalzium/kalzium-24.12.0.ebuild
index 3e227b0839bd..c1f3cc4005f6 100644
--- a/kde-apps/kalzium/kalzium-24.12.0.ebuild
+++ b/kde-apps/kalzium/kalzium-24.12.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
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kalzium/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="solver"
 
 # TODO: IUSE="editor"
diff --git a/kde-apps/kalzium/kalzium-24.12.1.ebuild b/kde-apps/kalzium/kalzium-24.12.1.ebuild
new file mode 100644
index 000000000000..1a7dec9902e1
--- /dev/null
+++ b/kde-apps/kalzium/kalzium-24.12.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org flag-o-matic
+
+DESCRIPTION="Periodic table of the elements"
+HOMEPAGE="https://apps.kde.org/kalzium/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="solver"
+
+# TODO: IUSE="editor"
+# 	editor? (
+# 		dev-cpp/eigen:3
+# 		>=dev-qt/qtopengl-${QTMIN}:6
+# 		>=kde-frameworks/knewstuff-${KFMIN}:6
+# 		sci-chemistry/openbabel:=
+# 		>=sci-libs/avogadrolibs-1.93[qt6]
+# 	)
+DEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=dev-qt/qtscxml-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kplotting-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kunitconversion-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	solver? ( dev-ml/facile:=[ocamlopt] )
+"
+RDEPEND="${DEPEND}
+	sci-chemistry/chemical-mime-data
+"
+
+PATCHES=( "${FILESDIR}/${PN}-21.03.90-cmake.patch" )
+
+src_configure() {
+	# Fix missing finite()
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
+
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_OpenBabel3=ON # TODO: bug 823101
+		-DCMAKE_DISABLE_FIND_PACKAGE_Eigen3=ON
+# 		$(cmake_use_find_package editor Eigen3)
+# 		$(cmake_use_find_package editor AvogadroLibs)
+# 		$(cmake_use_find_package editor OpenBabel2)
+# 		$(cmake_use_find_package solver OCaml)
+# 		$(cmake_use_find_package solver Libfacile)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index ec9a8ad81b56..bd343cbc6940 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,2 +1,2 @@
 DIST kamera-24.08.3.tar.xz 131608 BLAKE2B a330ff4bbe69ad31a102d636a43f7bcc1abf11e80743dcdff42f696ddb31c0352c438195e39f5cfda26267bfca4a8ba1d0ffc37c06d3124b1fd161c79d88f539 SHA512 29acc10b1d81ef3f2883805d687f674ee99cebda4ae9e6c7d4138ff7d008ea3fafc8a91cae246633f6a743ab39f7c0c9222324eaf9daea110d3908f38852418e
-DIST kamera-24.12.0.tar.xz 131624 BLAKE2B f3d69e2d45ebad50b58be78bab460833ca712ddc609595dee5d0ff1f62598391afd7f90b6e37b40a3bce28c7ab903d435e01bceb91f132387df4309b3d8a0cd1 SHA512 aa5502093e3d7078c53cdd09e8cb328fc9310be7db0df996c1e46bebf915a084d9788a6b8b93155e3d22b404cc97fce9739569088000e794d1a7f82f0d63c585
+DIST kamera-24.12.1.tar.xz 131624 BLAKE2B e29159c67264df973b6728fc4879fabe9c92e80e665684c6fcadbfbf481de624ba1d5a5c7026439afd1e93086c8ac063ab08f336cc443262a91529edc53742cd SHA512 36dcde55ce14eca2f7a8adfd5d292c229e3552b79f4e29657e2a5e201c385314d15079cc15416b088e19a34cc1fa03e5428fd399453c50a1dd068bca1ef93818
diff --git a/kde-apps/kamera/kamera-24.12.0.ebuild b/kde-apps/kamera/kamera-24.12.0.ebuild
deleted file mode 100644
index ecfdf9149dd9..000000000000
--- a/kde-apps/kamera/kamera-24.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Plasma integration for gphoto2 cameras"
-HOMEPAGE="https://apps.kde.org/kamera/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=media-libs/libgphoto2-2.5.0:=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	sys-devel/gettext
-"
diff --git a/kde-apps/kamera/kamera-24.12.1.ebuild b/kde-apps/kamera/kamera-24.12.1.ebuild
new file mode 100644
index 000000000000..1813f05efde5
--- /dev/null
+++ b/kde-apps/kamera/kamera-24.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Plasma integration for gphoto2 cameras"
+HOMEPAGE="https://apps.kde.org/kamera/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=media-libs/libgphoto2-2.5.0:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	sys-devel/gettext
+"
diff --git a/kde-apps/kamoso/Manifest b/kde-apps/kamoso/Manifest
index 5ed80bfcd141..c9d75f56f2be 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1,2 +1,2 @@
 DIST kamoso-24.08.3.tar.xz 233756 BLAKE2B 99ed45061d63d8b10db5302bb80d0c9814a84f84053b986fb4b94fa25487fddab076222f3cd6644c4b26e5eaa89622e164deaaaae95315dd9916d5ac34773cd9 SHA512 4e1a896f6a40b464aa8054d6c403f65ab9a7346de5bb5f4915069216f9d7675d148dced4df2467b7f114674274b47cc19e9bbb2e428c65e815933eeade077a0c
-DIST kamoso-24.12.0.tar.xz 234548 BLAKE2B 0ed24ac2d83b5f916ffc00a34937b3b16a7666a87fe0b8fbc5caa1c4e67c855d1540e1570d5d8dafeba62a0aaea033f369883ef9df7976f9bae2992a37a9277e SHA512 221b86ee3626c93d00df940018b28a773d2561c5aa252405dbaae3a639654f640d6a8f0adddd8a789f44d2b95b7000e363efac3dd3f68fdc0c4b34b4592d21cd
+DIST kamoso-24.12.1.tar.xz 234496 BLAKE2B 77ae6d59f728c1659aeae3cb58991ed0f45d733eba3fe33e7412dedb144d0934c994e08bea249a4443d017c5f9c7b1d3ab13c3680c6f51eb807c8892c5fd6b2a SHA512 bcfbf65bfe4de22bc530b281362ab71f2d0e7246141cba01a1b3dd07e183a074dd65d648e60e4d236bb670431751b3916e69c0c2b48ce273771630be61ad741b
diff --git a/kde-apps/kamoso/kamoso-24.12.0.ebuild b/kde-apps/kamoso/kamoso-24.12.0.ebuild
deleted file mode 100644
index ded7553ebef5..000000000000
--- a/kde-apps/kamoso/kamoso-24.12.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
-HOMEPAGE="https://apps.kde.org/kamoso/ https://userbase.kde.org/Kamoso"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RESTRICT="test" # bug 653674
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-	media-libs/gst-plugins-base:1.0
-	virtual/opengl
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-qt/qtopengl-${QTMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	media-plugins/gst-plugins-jpeg:1.0
-	media-plugins/gst-plugins-libpng:1.0
-	media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
-"
-BDEPEND="virtual/pkgconfig"
diff --git a/kde-apps/kamoso/kamoso-24.12.1.ebuild b/kde-apps/kamoso/kamoso-24.12.1.ebuild
new file mode 100644
index 000000000000..d10bce851b56
--- /dev/null
+++ b/kde-apps/kamoso/kamoso-24.12.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
+HOMEPAGE="https://apps.kde.org/kamoso/ https://userbase.kde.org/Kamoso"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test" # bug 653674
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/purpose-${KFMIN}:5
+	media-libs/gst-plugins-base:1.0
+	virtual/opengl
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=dev-qt/qtopengl-${QTMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	media-plugins/gst-plugins-jpeg:1.0
+	media-plugins/gst-plugins-libpng:1.0
+	media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
+"
+BDEPEND="virtual/pkgconfig"
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index 0014c0147f34..b5eb60e08bbd 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,2 +1,2 @@
 DIST kanagram-24.08.3.tar.xz 7782140 BLAKE2B e41ddae94cff5162f5ac92e903ae9874bc8ec7adbb7577b99dae906b932858c3670701d2b0e9d6b9e3a8e6083d6ce0bde15d46e7e9f5b4862dd819abd48d7191 SHA512 f52a5c48b743124fde42ae7b298f7d7cb3dbdcdcd2b0e830c79759ecae00b6044f48d2a611e8a839f780f9826bdd1928ed6376a6117b720bb952cfe64efb143e
-DIST kanagram-24.12.0.tar.xz 7783652 BLAKE2B 8216c55e9b4abd3914efec24468cb5a53dbd8b9d16686240de30b2b0453ad8bdc6a08f34363a0a8d9f352e86bacc08d6de2901292235ff894d6d785f2b658d8a SHA512 40593d2b5a473a8249487947b2c7871e65a30522a95f44b8cc6737b616d5521c718717c59f2ef27140d06fea872fa79ed21698b6cc61a8b32f8d3a3c17f3e591
+DIST kanagram-24.12.1.tar.xz 7783552 BLAKE2B 77d82aa06db8292221f388d841eb3644377ef2ea7f14173d87bce17263eeed8bb453635b88f54507f2ac8b3eb0a176e1aa8c7567dc04a07e37247247283e556f SHA512 72e2bcf97e77c77f3ebc023e0182189c146f266171b004f31c3306af60a923b0890960086786d742c809e44b608d4c23391da7cfbf80b7fa5c55ffdff697240e
diff --git a/kde-apps/kanagram/kanagram-24.12.0.ebuild b/kde-apps/kanagram/kanagram-24.12.0.ebuild
deleted file mode 100644
index 0658a6704d6f..000000000000
--- a/kde-apps/kanagram/kanagram-24.12.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Game based on anagrams of words"
-HOMEPAGE="https://apps.kde.org/kanagram/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="speech"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-apps/libkeduvocdocument-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
-	>=kde-apps/kdeedu-data-${PVCUT}:*
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech Qt6TextToSpeech)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kanagram/kanagram-24.12.1.ebuild b/kde-apps/kanagram/kanagram-24.12.1.ebuild
new file mode 100644
index 000000000000..cebd1d2f654c
--- /dev/null
+++ b/kde-apps/kanagram/kanagram-24.12.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Game based on anagrams of words"
+HOMEPAGE="https://apps.kde.org/kanagram/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="speech"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-apps/libkeduvocdocument-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+	>=kde-apps/kdeedu-data-${PVCUT}:*
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package speech Qt6TextToSpeech)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index a509e4e9797e..4796e2d516ac 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,2 +1,2 @@
 DIST kapman-24.08.3.tar.xz 2148156 BLAKE2B 2bfaf48adc2fb4813b3560ec6c79f8dddba7dda103bd759278917e11cbf54d3d50448fb69b99285d2ca25699f32f854620764689e3d6534ac50e50507428292e SHA512 1b29f08b00cd7e2c2c01f90f6f1501e177c7d401190a426a61739beaaa0a395731e7268aec9197e24c5ae14b589f61415eb37072ba09d50d29fd2d9602f1c7c6
-DIST kapman-24.12.0.tar.xz 2148180 BLAKE2B a410f6556ec6f684d867ce499f462fa2dfa61d8e9a81187c887e6e6c36305c9c61464a8da39fd939b2724e6716b95c48429cc6c677a3013f39e68dda7ac3acbc SHA512 0ffe9ddd7a0343000ad55ab4f70d4259771c207b0826b584e55d3da9ef65ced3f8d2677054c825d50c0c626e67b70c2d767c762689ec101be62c230e49e5ec09
+DIST kapman-24.12.1.tar.xz 2148212 BLAKE2B ed7f8c8980a58e7372ddc8d1e2a2aa127d75c60d98f7e267da32610fc7f9ad307b262ceb6fbb3c14d341013c0c613fb084e82c9342921a6e1675319cae495900 SHA512 92b12ccc71dc7defa1905a5f19c2b64ccc2b78cde9940e685e5c946a9b613388a18e5453a9428f0f2449689ca3278205b61e25f4cd6eccf64c7c7b83e51b4268
diff --git a/kde-apps/kapman/kapman-24.12.0.ebuild b/kde-apps/kapman/kapman-24.12.0.ebuild
deleted file mode 100644
index 41002fd5818c..000000000000
--- a/kde-apps/kapman/kapman-24.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Pac-Man clone by KDE"
-HOMEPAGE="https://apps.kde.org/kapman/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapman/kapman-24.12.1.ebuild b/kde-apps/kapman/kapman-24.12.1.ebuild
new file mode 100644
index 000000000000..074f43f0c2bb
--- /dev/null
+++ b/kde-apps/kapman/kapman-24.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Pac-Man clone by KDE"
+HOMEPAGE="https://apps.kde.org/kapman/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index fb68344c8ca2..8c1392ebab16 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,2 +1,2 @@
 DIST kapptemplate-24.08.3.tar.xz 343980 BLAKE2B 13faaae48d7f29c507deb6869b58492a7e9323d689f8b73b86ede64000398fdd4a681c612f298c90ff7197bdf348774318ef966ee7b8d8c8de9530c0ad10b095 SHA512 d1e207258ee9475c0bf6422cbf34ce0ace21d34afc29d535dd6e6fd9968f25bcda88eeb08708186a0f1eba8520f3261887fe7e584523c03604f01a1be83a263d
-DIST kapptemplate-24.12.0.tar.xz 476172 BLAKE2B 76863a1a20fcc2f876f0fd85d02326477f29aaba7162cb94b230ca918cc74b91bf1b710fcebefef90d9697bbb0ec784f062d795f7e66fb691228e690c07ed549 SHA512 074fb5af56a924ce01a94b9f54226fc86126b843ee982bd9fa622f1735a6cf6a433e0df2a4b308ff4ac2728ddb19c7abf198076cd7ba7d73063eb4e047801af0
+DIST kapptemplate-24.12.1.tar.xz 476540 BLAKE2B 4ed414a21ff761d21220b53cf55de031cb6089a61fd22a19b47d9afc610c5dbed3957641880d6e713cb70113cd43eac6199a32886298d4bba5fa613d82a8bae6 SHA512 0d8a9cac95117dc59b4601af34a72c5d44f8509bdd1920d6b0b10eeb7022b9648452dfd8286f01d7204eadc6932a5745b74ec9830a28de36d9fadc237ff52534
diff --git a/kde-apps/kapptemplate/kapptemplate-24.12.0.ebuild b/kde-apps/kapptemplate/kapptemplate-24.12.0.ebuild
deleted file mode 100644
index 589822fb150a..000000000000
--- a/kde-apps/kapptemplate/kapptemplate-24.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Shell script to create the necessary framework to develop KDE applications"
-HOMEPAGE="https://apps.kde.org/kapptemplate/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/kirigami-addons-1.4.0:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapptemplate/kapptemplate-24.12.1.ebuild b/kde-apps/kapptemplate/kapptemplate-24.12.1.ebuild
new file mode 100644
index 000000000000..5fbc9eddd797
--- /dev/null
+++ b/kde-apps/kapptemplate/kapptemplate-24.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Shell script to create the necessary framework to develop KDE applications"
+HOMEPAGE="https://apps.kde.org/kapptemplate/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/kirigami-addons-1.4.0:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kate-addons/Manifest b/kde-apps/kate-addons/Manifest
index 79c2f8060eb6..5e98c4bd07dd 100644
--- a/kde-apps/kate-addons/Manifest
+++ b/kde-apps/kate-addons/Manifest
@@ -1,2 +1,2 @@
 DIST kate-24.08.3.tar.xz 8248700 BLAKE2B ffcf39ef4ae280666ea31e4400463da12cdb2eb6f7f075044c4063ba5c05e0bc2400498f1d9eeb20342eb4157dd209121e737791eacf83b750bb685b0329141b SHA512 31f406d8a61c62f384642044380798d47a41f56cb504a69a37948c6961682c0883f942c45cd7739e907f2f502b3af617422ef59ae017d59edb25ca4abfecf67f
-DIST kate-24.12.0.tar.xz 8300640 BLAKE2B 18d57c30fd797649293a8034d6b85f6961860b724481052a3bb2e9665d77efe075e2e129f3bd2a0387051cfc6fe4625eb08c545aa697afacd8631f1e2bc9c56f SHA512 a9e0a22c3acbb021d018d1e99ece87da925b97a725df4779948d3d5be0db5eb8e73203190de0d34bd65749c4ec3c06c85eef19d80aafce9335dca595aecc377e
+DIST kate-24.12.1.tar.xz 8303660 BLAKE2B 4893907b29166e0005b20fdf641264635b6dfb1276bcd5e8f498cddb04689448379c4c84c7c1294e5f9926eb20d2c9f3132252d7a7d8948ee91985609032b537 SHA512 227671f6e7a5e2893623daae1a696a54b86561f1780d7e435bc585cfc3cfe6ecf8975604b92bd4febaa0dde3c28dad60a4297a653a2b759360248448c44cc687
diff --git a/kde-apps/kate-addons/kate-addons-24.12.0.ebuild b/kde-apps/kate-addons/kate-addons-24.12.0.ebuild
deleted file mode 100644
index ca09b93c8132..000000000000
--- a/kde-apps/kate-addons/kate-addons-24.12.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="utilities"
-KDE_ORG_NAME="kate"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm flag-o-matic gear.kde.org optfeature
-
-DESCRIPTION="Addons used by Kate"
-HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/kate/"
-
-LICENSE="LGPL-2 LGPL-2+ MIT"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+filebrowser lspclient +projects +snippets sql"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,network,widgets,xml]
-	~kde-apps/kate-lib-${PV}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktexteditor-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
-	filebrowser? ( >=kde-frameworks/kbookmarks-${KFMIN}:6 )
-	lspclient? ( >=kde-frameworks/kitemmodels-${KFMIN}:6 )
-	projects? (
-		>=kde-frameworks/knewstuff-${KFMIN}:6
-		>=kde-frameworks/threadweaver-${KFMIN}:6
-	)
-	snippets? ( >=kde-frameworks/knewstuff-${KFMIN}:6 )
-	sql? (
-		>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-		>=dev-qt/qtbase-${QTMIN}:6[sql]
-		>=kde-frameworks/kwallet-${KFMIN}:6
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kate-common-${PV}
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-
-	# these tests are run in kde-apps/kate-lib
-	cmake_run_in apps/lib cmake_comment_add_subdirectory autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_kate=FALSE
-		-DBUILD_kwrite=FALSE
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF6DocTools=ON # docs in kate/kwrite
-		-DBUILD_filebrowser=$(usex filebrowser)
-		-DBUILD_lspclient=$(usex lspclient)
-		-DBUILD_project=$(usex projects)
-		-DBUILD_snippets=$(usex snippets)
-		-DBUILD_katesql=$(usex sql)
-	)
-
-	# provided by kde-apps/kate-lib
-	append-libs -lkateprivate
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# provided by kde-apps/kate-lib
-	rm -v "${ED}"/usr/$(get_libdir)/libkateprivate.so.* || die
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Markdown text previews" "kde-misc/markdownpart:${SLOT}"
-		optfeature "DOT graph file previews" "media-gfx/kgraphviewer"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kate-addons/kate-addons-24.12.1.ebuild b/kde-apps/kate-addons/kate-addons-24.12.1.ebuild
new file mode 100644
index 000000000000..c5b88a0c31e5
--- /dev/null
+++ b/kde-apps/kate-addons/kate-addons-24.12.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="utilities"
+KDE_ORG_NAME="kate"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm flag-o-matic gear.kde.org optfeature
+
+DESCRIPTION="Addons used by Kate"
+HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/kate/"
+
+LICENSE="LGPL-2 LGPL-2+ MIT"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+filebrowser lspclient +projects +snippets sql"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,network,widgets,xml]
+	~kde-apps/kate-lib-${PV}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+	filebrowser? ( >=kde-frameworks/kbookmarks-${KFMIN}:6 )
+	lspclient? ( >=kde-frameworks/kitemmodels-${KFMIN}:6 )
+	projects? (
+		>=kde-frameworks/knewstuff-${KFMIN}:6
+		>=kde-frameworks/threadweaver-${KFMIN}:6
+	)
+	snippets? ( >=kde-frameworks/knewstuff-${KFMIN}:6 )
+	sql? (
+		>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+		>=dev-qt/qtbase-${QTMIN}:6[sql]
+		>=kde-frameworks/kwallet-${KFMIN}:6
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kate-common-${PV}
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+
+	# these tests are run in kde-apps/kate-lib
+	cmake_run_in apps/lib cmake_comment_add_subdirectory autotests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_kate=FALSE
+		-DBUILD_kwrite=FALSE
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF6DocTools=ON # docs in kate/kwrite
+		-DBUILD_filebrowser=$(usex filebrowser)
+		-DBUILD_lspclient=$(usex lspclient)
+		-DBUILD_project=$(usex projects)
+		-DBUILD_snippets=$(usex snippets)
+		-DBUILD_katesql=$(usex sql)
+	)
+
+	# provided by kde-apps/kate-lib
+	append-libs -lkateprivate
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# provided by kde-apps/kate-lib
+	rm -v "${ED}"/usr/$(get_libdir)/libkateprivate.so.* || die
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Markdown text previews" "kde-misc/markdownpart:${SLOT}"
+		optfeature "DOT graph file previews" "media-gfx/kgraphviewer"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/kate-common/Manifest b/kde-apps/kate-common/Manifest
index 79c2f8060eb6..5e98c4bd07dd 100644
--- a/kde-apps/kate-common/Manifest
+++ b/kde-apps/kate-common/Manifest
@@ -1,2 +1,2 @@
 DIST kate-24.08.3.tar.xz 8248700 BLAKE2B ffcf39ef4ae280666ea31e4400463da12cdb2eb6f7f075044c4063ba5c05e0bc2400498f1d9eeb20342eb4157dd209121e737791eacf83b750bb685b0329141b SHA512 31f406d8a61c62f384642044380798d47a41f56cb504a69a37948c6961682c0883f942c45cd7739e907f2f502b3af617422ef59ae017d59edb25ca4abfecf67f
-DIST kate-24.12.0.tar.xz 8300640 BLAKE2B 18d57c30fd797649293a8034d6b85f6961860b724481052a3bb2e9665d77efe075e2e129f3bd2a0387051cfc6fe4625eb08c545aa697afacd8631f1e2bc9c56f SHA512 a9e0a22c3acbb021d018d1e99ece87da925b97a725df4779948d3d5be0db5eb8e73203190de0d34bd65749c4ec3c06c85eef19d80aafce9335dca595aecc377e
+DIST kate-24.12.1.tar.xz 8303660 BLAKE2B 4893907b29166e0005b20fdf641264635b6dfb1276bcd5e8f498cddb04689448379c4c84c7c1294e5f9926eb20d2c9f3132252d7a7d8948ee91985609032b537 SHA512 227671f6e7a5e2893623daae1a696a54b86561f1780d7e435bc585cfc3cfe6ecf8975604b92bd4febaa0dde3c28dad60a4297a653a2b759360248448c44cc687
diff --git a/kde-apps/kate-common/kate-common-24.12.0.ebuild b/kde-apps/kate-common/kate-common-24.12.0.ebuild
deleted file mode 100644
index 2a382f188ff9..000000000000
--- a/kde-apps/kate-common/kate-common-24.12.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="true"
-KDE_ORG_NAME="${PN/-common/}"
-inherit ecm-common gear.kde.org
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	!<kde-apps/kate-24.07.90-r1
-	!<kde-apps/kate-addons-24.07.90-r1
-	!<kde-apps/kate-lib-24.07.90-r1
-	!<kde-apps/kwrite-24.07.90-r1
-"
diff --git a/kde-apps/kate-common/kate-common-24.12.1.ebuild b/kde-apps/kate-common/kate-common-24.12.1.ebuild
new file mode 100644
index 000000000000..5b668f591111
--- /dev/null
+++ b/kde-apps/kate-common/kate-common-24.12.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+KDE_ORG_NAME="${PN/-common/}"
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	!<kde-apps/kate-24.07.90-r1
+	!<kde-apps/kate-addons-24.07.90-r1
+	!<kde-apps/kate-lib-24.07.90-r1
+	!<kde-apps/kwrite-24.07.90-r1
+"
diff --git a/kde-apps/kate-lib/Manifest b/kde-apps/kate-lib/Manifest
index 79c2f8060eb6..5e98c4bd07dd 100644
--- a/kde-apps/kate-lib/Manifest
+++ b/kde-apps/kate-lib/Manifest
@@ -1,2 +1,2 @@
 DIST kate-24.08.3.tar.xz 8248700 BLAKE2B ffcf39ef4ae280666ea31e4400463da12cdb2eb6f7f075044c4063ba5c05e0bc2400498f1d9eeb20342eb4157dd209121e737791eacf83b750bb685b0329141b SHA512 31f406d8a61c62f384642044380798d47a41f56cb504a69a37948c6961682c0883f942c45cd7739e907f2f502b3af617422ef59ae017d59edb25ca4abfecf67f
-DIST kate-24.12.0.tar.xz 8300640 BLAKE2B 18d57c30fd797649293a8034d6b85f6961860b724481052a3bb2e9665d77efe075e2e129f3bd2a0387051cfc6fe4625eb08c545aa697afacd8631f1e2bc9c56f SHA512 a9e0a22c3acbb021d018d1e99ece87da925b97a725df4779948d3d5be0db5eb8e73203190de0d34bd65749c4ec3c06c85eef19d80aafce9335dca595aecc377e
+DIST kate-24.12.1.tar.xz 8303660 BLAKE2B 4893907b29166e0005b20fdf641264635b6dfb1276bcd5e8f498cddb04689448379c4c84c7c1294e5f9926eb20d2c9f3132252d7a7d8948ee91985609032b537 SHA512 227671f6e7a5e2893623daae1a696a54b86561f1780d7e435bc585cfc3cfe6ecf8975604b92bd4febaa0dde3c28dad60a4297a653a2b759360248448c44cc687
diff --git a/kde-apps/kate-lib/kate-lib-24.12.0.ebuild b/kde-apps/kate-lib/kate-lib-24.12.0.ebuild
deleted file mode 100644
index 634c862a61eb..000000000000
--- a/kde-apps/kate-lib/kate-lib-24.12.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="utilities"
-KDE_ORG_NAME="kate"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Shared library used by Kate/Kwrite and Kate-Addons"
-HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/kate/"
-
-LICENSE="LGPL-2 LGPL-2+ MIT"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="telemetry"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktexteditor-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
-	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kate-common-${PV}
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_addons=FALSE
-		-DBUILD_kate=FALSE
-		-DBUILD_kwrite=FALSE
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF6DocTools=ON
-		$(cmake_use_find_package telemetry KF6UserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# tests hang
-	local myctestargs=(
-		-E "(session_manager_test|sessions_action_test)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/kate-lib/kate-lib-24.12.1.ebuild b/kde-apps/kate-lib/kate-lib-24.12.1.ebuild
new file mode 100644
index 000000000000..34f650a7d590
--- /dev/null
+++ b/kde-apps/kate-lib/kate-lib-24.12.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="utilities"
+KDE_ORG_NAME="kate"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Shared library used by Kate/Kwrite and Kate-Addons"
+HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/kate/"
+
+LICENSE="LGPL-2 LGPL-2+ MIT"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="telemetry"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kate-common-${PV}
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_addons=FALSE
+		-DBUILD_kate=FALSE
+		-DBUILD_kwrite=FALSE
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF6DocTools=ON
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# tests hang
+	local myctestargs=(
+		-E "(session_manager_test|sessions_action_test)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 79c2f8060eb6..5e98c4bd07dd 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,2 +1,2 @@
 DIST kate-24.08.3.tar.xz 8248700 BLAKE2B ffcf39ef4ae280666ea31e4400463da12cdb2eb6f7f075044c4063ba5c05e0bc2400498f1d9eeb20342eb4157dd209121e737791eacf83b750bb685b0329141b SHA512 31f406d8a61c62f384642044380798d47a41f56cb504a69a37948c6961682c0883f942c45cd7739e907f2f502b3af617422ef59ae017d59edb25ca4abfecf67f
-DIST kate-24.12.0.tar.xz 8300640 BLAKE2B 18d57c30fd797649293a8034d6b85f6961860b724481052a3bb2e9665d77efe075e2e129f3bd2a0387051cfc6fe4625eb08c545aa697afacd8631f1e2bc9c56f SHA512 a9e0a22c3acbb021d018d1e99ece87da925b97a725df4779948d3d5be0db5eb8e73203190de0d34bd65749c4ec3c06c85eef19d80aafce9335dca595aecc377e
+DIST kate-24.12.1.tar.xz 8303660 BLAKE2B 4893907b29166e0005b20fdf641264635b6dfb1276bcd5e8f498cddb04689448379c4c84c7c1294e5f9926eb20d2c9f3132252d7a7d8948ee91985609032b537 SHA512 227671f6e7a5e2893623daae1a696a54b86561f1780d7e435bc585cfc3cfe6ecf8975604b92bd4febaa0dde3c28dad60a4297a653a2b759360248448c44cc687
diff --git a/kde-apps/kate/kate-24.12.0.ebuild b/kde-apps/kate/kate-24.12.0.ebuild
deleted file mode 100644
index c934381d887a..000000000000
--- a/kde-apps/kate/kate-24.12.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoff"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm flag-o-matic gear.kde.org
-
-DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more"
-HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/kate/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
-# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
-# TODO: replace HAVE_X11 and __has_include with explicit WITH_X11 option
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,network,widgets,X]
-	~kde-apps/kate-lib-${PV}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
-	virtual/libintl
-"
-RDEPEND="${DEPEND}
-	~kde-apps/kate-addons-${PV}:6
-	>=kde-apps/kate-common-${PV}
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-
-	# these tests are run in kde-apps/kate-lib
-	cmake_run_in apps/lib cmake_comment_add_subdirectory autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_addons=FALSE
-		-DBUILD_kwrite=FALSE
-	)
-
-	# provided by kde-apps/kate-lib
-	append-libs -lkateprivate
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# provided by kde-apps/kate-lib
-	rm -v "${ED}"/usr/$(get_libdir)/libkateprivate.so.* || die
-}
diff --git a/kde-apps/kate/kate-24.12.1.ebuild b/kde-apps/kate/kate-24.12.1.ebuild
new file mode 100644
index 000000000000..63352355184d
--- /dev/null
+++ b/kde-apps/kate/kate-24.12.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoff"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm flag-o-matic gear.kde.org
+
+DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more"
+HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/kate/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+# TODO: replace HAVE_X11 and __has_include with explicit WITH_X11 option
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,network,widgets,X]
+	~kde-apps/kate-lib-${PV}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	virtual/libintl
+"
+RDEPEND="${DEPEND}
+	~kde-apps/kate-addons-${PV}:6
+	>=kde-apps/kate-common-${PV}
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+
+	# these tests are run in kde-apps/kate-lib
+	cmake_run_in apps/lib cmake_comment_add_subdirectory autotests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_addons=FALSE
+		-DBUILD_kwrite=FALSE
+	)
+
+	# provided by kde-apps/kate-lib
+	append-libs -lkateprivate
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# provided by kde-apps/kate-lib
+	rm -v "${ED}"/usr/$(get_libdir)/libkateprivate.so.* || die
+}
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index f48e5b7a780d..3ac13d117708 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,2 +1,2 @@
 DIST katomic-24.08.3.tar.xz 1447904 BLAKE2B 92660bd047c59ff8dd873f3a10d91597526ad72bde8f361d17a777866e4fd805f1cc8f81057cf9406ca6070bcc573c2d901f8eab88f5163ed101443ca69781e4 SHA512 54ee670426161a3517f9349d69a9113a8f6baac23971b147a2c01b5354953f855d3075d5881b1b3b84c07b715b97646c849f450441507b17dcee79d193abc190
-DIST katomic-24.12.0.tar.xz 1448016 BLAKE2B 2447ecc948837bf4e48cee2e803e8f8b5fe120e07aa8474a2dfefeb87cec89123ed337cee4c78305b6dd5ed2c534a86921ddccf293073d79cc285e4688a6dee6 SHA512 e11c6e415e81f637aabfd6c2b66b75fc581c68bc027cb9e39adf10951374e2a7e0874ae1f8ee4fa579569a7a13dbfd7b4dd1f06b8ad9689f996dfb1fc77a9763
+DIST katomic-24.12.1.tar.xz 1447980 BLAKE2B da24065cfcb7148536f2fbf8f92eecbda1be2e418fc4f6c3a16d9a6a6be3aee1371d7b3fb400994d6229c3156f161eba36551cfffbb44f79a026b5cfba79e023 SHA512 98f2f314e6d439b8206a5246955de3aa7950b6b58e89277a531661920af95622af1d0530af4b1da898c1a36a02ba84cb9c991d14c9024aa55fe50e2b8a39d61a
diff --git a/kde-apps/katomic/katomic-24.12.0.ebuild b/kde-apps/katomic/katomic-24.12.0.ebuild
deleted file mode 100644
index bea3ffde6bbd..000000000000
--- a/kde-apps/katomic/katomic-24.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE Atomic Entertainment Game"
-HOMEPAGE="https://apps.kde.org/katomic/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/katomic/katomic-24.12.1.ebuild b/kde-apps/katomic/katomic-24.12.1.ebuild
new file mode 100644
index 000000000000..a027672474ff
--- /dev/null
+++ b/kde-apps/katomic/katomic-24.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE Atomic Entertainment Game"
+HOMEPAGE="https://apps.kde.org/katomic/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbackup/Manifest b/kde-apps/kbackup/Manifest
index 085bddd565fd..beb42b8a298c 100644
--- a/kde-apps/kbackup/Manifest
+++ b/kde-apps/kbackup/Manifest
@@ -1,2 +1,2 @@
 DIST kbackup-24.08.3.tar.xz 388444 BLAKE2B 15319ebbc7c53bf60c5d29daa44dce06772c9fa4dabfd721df45a6bd552b6fabc426360bfda9ed05184f65755691b0c765c78062277f6a70e4cf9113e76aa009 SHA512 6922e77acbcbd2873450d16ff76a02256828ea5af6a9f5714e0b0342af0a2162c4cd0cb145d84d1a03e4de214c368b0c4c16ee55d7c53f3a1187d48bb3b799ea
-DIST kbackup-24.12.0.tar.xz 388492 BLAKE2B 15a70bfcf3fd043c4e12086be2b66c6fce917389eefdcae2c3b1310c2cf9e361de8622ee73ecf478294c820d83860ea5c23d09365ddc24c5fc6c980a2acec7d5 SHA512 c8579f4bedb17fa1f6d2fc1d2cae341ee3b6846974baafea41159e71c9cc34421b94d125874d3b8056608551abec9f0ed738748b9b2efc85c855a1d7ca889f09
+DIST kbackup-24.12.1.tar.xz 388588 BLAKE2B 4053a981f73efcec176042f62fbdb049bb040271f261822533ebee83321d1f68647a4c1dc640c71b3f29bfc368105969c822907c6a98759690825bdf87fb6c23 SHA512 400616d68ba633c65c185d1df2db368f45741ac3e38891db77346f8730c49e1ab84a178e10b3e70cbb1bb653782f8d9f9703e547301e68b01fbab86aba4c1fe6
diff --git a/kde-apps/kbackup/kbackup-24.12.0.ebuild b/kde-apps/kbackup/kbackup-24.12.0.ebuild
deleted file mode 100644
index 3f8c52718415..000000000000
--- a/kde-apps/kbackup/kbackup-24.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Program that lets you back up any directories or files"
-HOMEPAGE="https://apps.kde.org/kbackup/"
-
-LICENSE="GPL-2"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	app-arch/libarchive:=
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbackup/kbackup-24.12.1.ebuild b/kde-apps/kbackup/kbackup-24.12.1.ebuild
new file mode 100644
index 000000000000..2ab76db3814a
--- /dev/null
+++ b/kde-apps/kbackup/kbackup-24.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Program that lets you back up any directories or files"
+HOMEPAGE="https://apps.kde.org/kbackup/"
+
+LICENSE="GPL-2"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	app-arch/libarchive:=
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index ebee6ff9c6bf..89736b7b19f7 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,2 +1,2 @@
 DIST kblackbox-24.08.3.tar.xz 550944 BLAKE2B 1d6b6515d6d66c5b199d56c7041ec011a27d768bd75d99fb437169eea0bdf3faf5b351b7b614e21da5cde5c48a90b399d8fbf5f1f4aaa8c7281be0ad5fe645ce SHA512 97094fdb4295afe360ffff9e8c556d75e2671da917a7766bf1c19ccd48232ce7f1d80b93333d689d40cb79ca51c568223dc7dd43ae220ff5a0089a800de8ff2a
-DIST kblackbox-24.12.0.tar.xz 550984 BLAKE2B 90cd5c22a56e2778bd9d471a34e38e5721ee0d79468cf475ce367c210523f1ea0407041a117c0fd1f45baf6a02f15203d1b96634e105f5a86009a3ed86b04a20 SHA512 f7812b8d820221d07da089e3825a580bb0c9040d88a2ed491241fb7d2542c6639bad155fa6e92fbe5b19a6b5447bbf5bd464979935d1aa9c6e0caa8dd1606346
+DIST kblackbox-24.12.1.tar.xz 551116 BLAKE2B 4b26975d630c6881e59050b00968bb079f7847638a5e3ec5a6c812a83b78acdd5c5ee00047f40cce4627c2a15e574aa551c9a6410ee7dc570874b4471d31270a SHA512 e3888b590dac307536ce94f66d1cb5dfdbf6e45cda6759b247bbeef71b0f86e72be028d9b8dfd01dd368bf78ac8589d3afd8337e96f34a72ad59695d6c31b6b3
diff --git a/kde-apps/kblackbox/kblackbox-24.12.0.ebuild b/kde-apps/kblackbox/kblackbox-24.12.0.ebuild
deleted file mode 100644
index 5b8eea13384e..000000000000
--- a/kde-apps/kblackbox/kblackbox-24.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Game of hide and seek played on a grid of boxes"
-HOMEPAGE="https://apps.kde.org/kblackbox/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblackbox/kblackbox-24.12.1.ebuild b/kde-apps/kblackbox/kblackbox-24.12.1.ebuild
new file mode 100644
index 000000000000..6c60f79c2cb3
--- /dev/null
+++ b/kde-apps/kblackbox/kblackbox-24.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Game of hide and seek played on a grid of boxes"
+HOMEPAGE="https://apps.kde.org/kblackbox/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index 4f12c99fc929..d2203b587d24 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,2 +1,2 @@
 DIST kblocks-24.08.3.tar.xz 2102600 BLAKE2B bb67a7c9e5e6ccdb635c57155feebcf24c8874faa1a41307700694d423026cba87a95af026c9b6076f945bd5e580f7ce8b0774854845a7d55c2b2a2749eae7e7 SHA512 929769e2eadbfec4355dc9262c8d13794ba53f9e020228e0d2627155c4ceb311dcaababe7002ce95b7e5e45e52551a75deef3b61b95790e2a2e0862176990cd1
-DIST kblocks-24.12.0.tar.xz 2102608 BLAKE2B 0dfb31faa69a1fc373778f7b4dfceeed5cf50f79d4aee81a6e2901d86d95d745a33dc52e064c75f1d772d0d35717b4c17704001f1a696400f93513f0a6f2f7a4 SHA512 04858919df47323ee44ab6974528419ae3720d12b7cb7a94a8377d0fa9adf8f48c91c8cdd1ffd5451b9409bc68c4c3e63b3790c7f11b627f991cd10bf49f66db
+DIST kblocks-24.12.1.tar.xz 2102780 BLAKE2B 429d7c1ce4220c238831b0eb760429725a4acb9de26acf3c5dca3498be2b09f01c795e25f2806b85f4fdbc78ee781a8408e1f1d91956d37b6ada7ea8845536f8 SHA512 5d05f9e794fc127401b83ae80d14accb6f4a4a9949983733f40b26ebe6d42bd0a8974f0a7082961574441d05fb91f0a55cb8a8ed97881b7fe7bcd788f44e0aa8
diff --git a/kde-apps/kblocks/kblocks-24.12.0.ebuild b/kde-apps/kblocks/kblocks-24.12.0.ebuild
deleted file mode 100644
index 3c15a2a8e2ed..000000000000
--- a/kde-apps/kblocks/kblocks-24.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Single-player Tetris-like KDE game"
-HOMEPAGE="https://apps.kde.org/kblocks/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblocks/kblocks-24.12.1.ebuild b/kde-apps/kblocks/kblocks-24.12.1.ebuild
new file mode 100644
index 000000000000..23763144dd77
--- /dev/null
+++ b/kde-apps/kblocks/kblocks-24.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Single-player Tetris-like KDE game"
+HOMEPAGE="https://apps.kde.org/kblocks/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index 031111361e87..46534ca9bd37 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,2 +1,2 @@
 DIST kbounce-24.08.3.tar.xz 3324224 BLAKE2B a9070bf00673b170ede4ce826e6544762501234996b4e88049796bbd0edd8eb7e2491007b1ee0a3142af942e4a94ec6f64417b41c7bb19ea0d147145729df456 SHA512 edf0217d1bb60df43f2f23b2256e084b2a0587878fb441893edac9fdd909dd261a11e6fc291c2849c3269e5f33adc1cce717b52789e612204dedefa13cdd22dd
-DIST kbounce-24.12.0.tar.xz 3322648 BLAKE2B 698c4948397d1824adf62cc2e66423630675e89018c93c843b3bde663faf5186fc0638c33aff6da866aefa06b8ed9c14b0b51075981288595f6537fdab9f7680 SHA512 c3aa1358e5e41b8963303888b5134d480711671ffb0edb42f10371fb513b5e73b730dbd2d4feba3e930b1404f6fcd25d0a2d3bf291002481bb9a9d68ec912e2e
+DIST kbounce-24.12.1.tar.xz 3323416 BLAKE2B 42a0cf435e66eb005983b6bcdf32682a52ccc5c823c2b86c1ce9b9625ddb6a66509d3ffa4548cc87eb1a2ed61c3b76d89811a1144abe535933a72ec90b54cd84 SHA512 ae9352054453bfaac6840c3c0adae5ad11240e43cd0dbf4c67551109e97c212db66f64a06817ec8246712c5c6ca806504fa2b009e4c04a514fca1991a34b89be
diff --git a/kde-apps/kbounce/kbounce-24.12.0.ebuild b/kde-apps/kbounce/kbounce-24.12.0.ebuild
deleted file mode 100644
index c50112413e43..000000000000
--- a/kde-apps/kbounce/kbounce-24.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE Bounce Ball Game"
-HOMEPAGE="https://apps.kde.org/kbounce/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbounce/kbounce-24.12.1.ebuild b/kde-apps/kbounce/kbounce-24.12.1.ebuild
new file mode 100644
index 000000000000..741044567c0b
--- /dev/null
+++ b/kde-apps/kbounce/kbounce-24.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE Bounce Ball Game"
+HOMEPAGE="https://apps.kde.org/kbounce/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index de233c35e27e..e70337d1c92b 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,2 +1,2 @@
 DIST kbreakout-24.08.3.tar.xz 2556340 BLAKE2B 477146444ba479172db2ed5522bad6ea396f2ec9b36e22e75c87b91848a57b32b6d82fb1a218898e691dedf0d35caf14431e075831dfcc70dff72d44d15a5150 SHA512 a42a09537a1ea91030eb1a99a7b5ae1550b7269b89f6adbd191249a6b784cfed02b34b35f574220ee63ebbdbb327485265c7387c81e34f82c5f35b1f0627f9d7
-DIST kbreakout-24.12.0.tar.xz 2555924 BLAKE2B 162a1e4ed5e66a5aae4f1346081566167c077a3bd51e297620e80333607f3002a9cdad259e9f2d6bffed1c8ab0ed0b6cbd0b09eafe9a448b829be49f5561001c SHA512 5e5e1a556c49b22ccc8b38f72c5a6eac07f34d56446dd858355acfda1e2f6548db528dab0bd6e2827dd6c084ecf68ae022e7b79dc7219496d09a67fce923f1f5
+DIST kbreakout-24.12.1.tar.xz 2556028 BLAKE2B d790d1d5ed47defcc49d6eb9310c94d88ca4930f9552532449af93f23031e0fd2ef750dbe24da210d3698831b6b75ddd90515f4ca12ccbec63b66ab883445eab SHA512 bd9fbb8a1e3e171c33ded26f0015c47ea5f7c20571950fdc3e6b3225cb682a660b55fdf72d65563156188df7491f21ef6c97fddd4cf58dc43b8c0035644b2960
diff --git a/kde-apps/kbreakout/kbreakout-24.12.0.ebuild b/kde-apps/kbreakout/kbreakout-24.12.0.ebuild
deleted file mode 100644
index 873bd4773e6b..000000000000
--- a/kde-apps/kbreakout/kbreakout-24.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Breakout-like game by KDE"
-HOMEPAGE="https://apps.kde.org/kbreakout/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbreakout/kbreakout-24.12.1.ebuild b/kde-apps/kbreakout/kbreakout-24.12.1.ebuild
new file mode 100644
index 000000000000..42b02013a8cb
--- /dev/null
+++ b/kde-apps/kbreakout/kbreakout-24.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Breakout-like game by KDE"
+HOMEPAGE="https://apps.kde.org/kbreakout/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index ade6292ce29a..9c8cfb97072a 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,2 +1,2 @@
 DIST kbruch-24.08.3.tar.xz 5157796 BLAKE2B ef2690226aef331cfcd3b6444c47dc37f3db4bf9697c55a2db00ec7fc7d07731caa31edd95bfe0c2f89460e6e490ce9fc6355e404cb060b75a4e0ea5e9a1dda2 SHA512 7f2fdf4879c766f143da84e77cff42fcde160288a5ca86f3983dab303610bd646ee644a497e63a057d21a73f078a84995ed165cbd2a6947b5e631845f26d8197
-DIST kbruch-24.12.0.tar.xz 5157772 BLAKE2B e89024eb98955a566ef5d10a40aa9167d7bf96b9545630775d239e7f45d46bcd84393f7c0e31d4d8f7fca76e92bfc191f791f5ae65b15f36f2c09d479cfd5294 SHA512 dcc48e477ae56895b1ba5238b10686db52d1a64426eb8560fac599627c4cf2497c8ce2bb943cc4fcaec8938e4554ae01cc6269c49aa46f8fb435ecdeac77611a
+DIST kbruch-24.12.1.tar.xz 5157952 BLAKE2B b22f6a9f3575310a5dbdd802448e296d43a6056ab7e560fdd23d6a83cbe376843c5e76d668918ef8deed878cce52ec4bbeb496a80d4d7c8aaca61560f23afc6b SHA512 efbbe651f5e0903fc48f9ae5a8770df927cc9c9e13b563419b868a59f240ffb25281eb97644ff6fa86d9c2fa46a46d0fbac5b36f75b0c47cc0801ab62522cba1
diff --git a/kde-apps/kbruch/kbruch-24.12.0.ebuild b/kde-apps/kbruch/kbruch-24.12.0.ebuild
deleted file mode 100644
index fe19784e5e5f..000000000000
--- a/kde-apps/kbruch/kbruch-24.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Educational application to learn calculating with fractions"
-HOMEPAGE="https://apps.kde.org/kbruch/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbruch/kbruch-24.12.1.ebuild b/kde-apps/kbruch/kbruch-24.12.1.ebuild
new file mode 100644
index 000000000000..19f21bf428e0
--- /dev/null
+++ b/kde-apps/kbruch/kbruch-24.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Educational application to learn calculating with fractions"
+HOMEPAGE="https://apps.kde.org/kbruch/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index 188a460ba616..698158776c9b 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,2 +1,2 @@
 DIST kcachegrind-24.08.3.tar.xz 945640 BLAKE2B e4310c993ddf7aa35dd5e09522e3f64ffbc3f8303cfccde07b71eebd5b6899fa517fa19627ac66a965bc7f3f77a633ba8fe82bca9f29014b956c5f1a8dcd29c0 SHA512 94ddeec2a96d80e877301cd2a701f904a940de5b4bf8db193c67b02eb4aeeb9b8c4a3533974de16bacc19ab93a50b7e34769eeb476cb23fe9e6eea36cca62b4b
-DIST kcachegrind-24.12.0.tar.xz 976688 BLAKE2B d694a4a98e8ab7fe376b03711125d6a18d38495c701c53d552d2ccc4371b1a57c86e488085740f617955f90ccb1703c15a76c75cea48109132e8377ab503ebb7 SHA512 5debaeb66a492c51611b24c1b1538cb42f8b9a8ea1867426368ae1093cc73005513648cb06a8943c3236c2ab7753bbee5578ca233b3fa498c6d022ff281c00d8
+DIST kcachegrind-24.12.1.tar.xz 977216 BLAKE2B 75155f99e3f79343cb288990deec83b483c7afae42e44e423d62b39d6fd46d894bde07a8f50e481d868ca0dff45b986332a2540bed785077b34765bf1f95c678 SHA512 fc000b0b4796b72de66be016a4cc10ea476f76f2cf90e1033f619736b91e6ba6ddec6cab36db43854c9a77b0d5a21c46bfb12b48b191cb52779093bda1890094
diff --git a/kde-apps/kcachegrind/kcachegrind-24.12.0.ebuild b/kde-apps/kcachegrind/kcachegrind-24.12.0.ebuild
deleted file mode 100644
index 430f964aaacf..000000000000
--- a/kde-apps/kcachegrind/kcachegrind-24.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Frontend for Cachegrind by KDE"
-HOMEPAGE="https://apps.kde.org/kcachegrind/
-https://kcachegrind.github.io/html/Home.html"
-
-LICENSE="GPL-2"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	media-gfx/graphviz
-"
-BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
diff --git a/kde-apps/kcachegrind/kcachegrind-24.12.1.ebuild b/kde-apps/kcachegrind/kcachegrind-24.12.1.ebuild
new file mode 100644
index 000000000000..7fe7db90b991
--- /dev/null
+++ b/kde-apps/kcachegrind/kcachegrind-24.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Frontend for Cachegrind by KDE"
+HOMEPAGE="https://apps.kde.org/kcachegrind/
+https://kcachegrind.github.io/html/Home.html"
+
+LICENSE="GPL-2"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	media-gfx/graphviz
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index 2cf8cb0befcd..2a3ea63c6a04 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,2 +1,2 @@
 DIST kcalc-24.08.3.tar.xz 472684 BLAKE2B 39ece1dfb46295b0df2720641a5c5a5a4d9d009bcc1c3410f2fa337d0c5be97c6da7e430e9bbd7a826b6e1750b124b348aeb439b46eb3117220eee1def619f49 SHA512 8571522437757ab2928717d1977ce7eb13942695f178f448121b47a4a8b15d4b7adaa3b82a9e28305cedb99648a30a62ddd1c96b908a767d7cd14012edca90fb
-DIST kcalc-24.12.0.tar.xz 470944 BLAKE2B af8d8923ae62956213a445a4802c4b5485c3f0348fe2b3e755ca267db9c79e80958dd84aba5ef9121d36ce6a4cba7990c60d52b04d2ab9dcf082da083748a662 SHA512 f486f02adccd741f1ad24253d0ce524f3cbbef75086005b2d5714a254826b677863770d4e8b2923bbddddff4248025c2da7c277bb1ea61dcd41551dd8fb4fda9
+DIST kcalc-24.12.1.tar.xz 470976 BLAKE2B 4c4e5c993a8f88624575df4dfcddc731321361fc11a21a3d8773827870be84ec6240d09be4a1e13dc3894e14fca84a0e9c24e83002754b3a7b71c8d5a7fbd7dd SHA512 af66f763949c7e7120ccb63b6229b14fbfc6b0cbb17074854c64ed60ca73100acbb1df3ac894cbaf81a8123cfa1d36db8c1054d8d1b0903abd0b47a45d2ebf7a
diff --git a/kde-apps/kcalc/kcalc-24.12.0.ebuild b/kde-apps/kcalc/kcalc-24.12.0.ebuild
deleted file mode 100644
index aa669c160c3c..000000000000
--- a/kde-apps/kcalc/kcalc-24.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE calculator"
-HOMEPAGE="https://apps.kde.org/kcalc/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/gettext"
diff --git a/kde-apps/kcalc/kcalc-24.12.1.ebuild b/kde-apps/kcalc/kcalc-24.12.1.ebuild
new file mode 100644
index 000000000000..81f85da2d710
--- /dev/null
+++ b/kde-apps/kcalc/kcalc-24.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE calculator"
+HOMEPAGE="https://apps.kde.org/kcalc/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/mpfr:0=
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/gettext"
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index e425bc682298..261f4f29b593 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,2 +1,2 @@
 DIST kcalutils-24.08.3.tar.xz 355356 BLAKE2B bda9f737222b69b82276741716fbacdcba15c3a31cc5f7bae46f25a4d99f617034c3d1d69c89fd2278b8eeecbebc2e3ad6b99b909513a49d017c15e135c017a5 SHA512 bfaeb7ab2f3f3a9f46922fc72337d84de302dd04a4ad3c51e6f0f6fc386fdb40c8c7818ccbe80a77d1de3b3fa5fb15baa9e82face305eaf993ad4772e869c876
-DIST kcalutils-24.12.0.tar.xz 355396 BLAKE2B 49df2c70a95960da04acfc9ab63435409c0ef70a93cea24f01cd12cbd375fb22374fb60b12993cbf5d8c6e97dd0b612a3c883744c881f6da4ab4bb270da66f11 SHA512 069630b7064a558791bdd14a86cf93a3a1bffdb0db01f23550d3dded3f71d9bd865952967d82106cb9effe556a1d5d038d1216a5276d50bf1558cdfa8e067c69
+DIST kcalutils-24.12.1.tar.xz 355384 BLAKE2B 5e5c900f485763bd41bd00b23ec5cf4a2b472094ca9a6aa6e190eab66bb6d0c6c238aad6963bb20d03682ce066bd7be7041631006cc0465f1caee202247acdd4 SHA512 85b51738886d4ed48d9c652bc216e459fc3e2079352cf4d1ad84aa752398f210a1f56897e00595844e0b8127255085edd017bb5f10a5b6eb148ac76cf534ee27
diff --git a/kde-apps/kcalutils/kcalutils-24.12.0-r1.ebuild b/kde-apps/kcalutils/kcalutils-24.12.0-r1.ebuild
deleted file mode 100644
index ad91e2cbe837..000000000000
--- a/kde-apps/kcalutils/kcalutils-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library providing utility functions for the handling of calendar data"
-HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test" # bugs 653616, 711666
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/ktexttemplate-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcalutils/kcalutils-24.12.1.ebuild b/kde-apps/kcalutils/kcalutils-24.12.1.ebuild
new file mode 100644
index 000000000000..ba4cbb569e95
--- /dev/null
+++ b/kde-apps/kcalutils/kcalutils-24.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library providing utility functions for the handling of calendar data"
+HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test" # bugs 653616, 711666
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/ktexttemplate-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index bddb751faaa8..1556d6c6652d 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,2 +1,2 @@
 DIST kcharselect-24.08.3.tar.xz 477000 BLAKE2B e63ec0003a268205157d0dca1f1507f61b8302323e30b77e15e56da5ee19bb3709661515957a27aa5feda7340a52eca67d2c8de5290071150aa4a4be48e602d4 SHA512 27b88f1a16c4d393d846349d49a59b2bcbe3c414535c8adc25b6720709c32d0bfb34b1eabc758ad36ba0bf342d40b34c5c371723da469392ac04de0b8fa5fd43
-DIST kcharselect-24.12.0.tar.xz 477080 BLAKE2B 7e5bb87fc31b775bdf03cf664309b967a2a407d503d41280e2a98f07f1844809b1dcd683d35a5b4945952024fb33dd5b75cb9a1962910a2d2ecddbaf46b4b258 SHA512 a9d78640e1c10785ee483c2b51ec0739d4be86d26bb04980aa157e0bae83b59ea7e52351b64c990ab4d493fa5bc4db6e6d0a64e4001f0a038e8951a0c2ca3b54
+DIST kcharselect-24.12.1.tar.xz 477140 BLAKE2B ab0a197f4e0d7efa97291ef689affde48b2f1783ae958440823ce393e7653b3741dd8b25c18913a28a6690382d4ab34797fb024a7bc17feb0ee0c25a9339db4c SHA512 d2589d6e7f631b461de418b1f9029566b76a2bdb4235c9f50c64614264ca215fe3abf9cb378c86f32c4874fa76383f6b83b4df2911d502b1953fb27f2494e922
diff --git a/kde-apps/kcharselect/kcharselect-24.12.0.ebuild b/kde-apps/kcharselect/kcharselect-24.12.0.ebuild
deleted file mode 100644
index 7ccf4253662b..000000000000
--- a/kde-apps/kcharselect/kcharselect-24.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE character selection utility"
-HOMEPAGE="https://apps.kde.org/kcharselect/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcharselect/kcharselect-24.12.1.ebuild b/kde-apps/kcharselect/kcharselect-24.12.1.ebuild
new file mode 100644
index 000000000000..fb2e7f67f6d2
--- /dev/null
+++ b/kde-apps/kcharselect/kcharselect-24.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE character selection utility"
+HOMEPAGE="https://apps.kde.org/kcharselect/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index af542248a0b7..34f6f3148074 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,2 +1,2 @@
 DIST kcolorchooser-24.08.3.tar.xz 36148 BLAKE2B 7d05585f9c952716837f1fdff94fc0ae89bf98a49d0b6b70d5913c3df99db74433608dfeddfa1ba10f8bdc63f35e177fc7fdfe654c4b675d02c13eb6318df75d SHA512 58fee23e053b2e6243ffadac49fa245d0bd533a8bf0e29be835600c2ca7c021dbb16cca5233fb5a85ed397307ca499911f77328b04b6dea91f7aa591d2f77e6a
-DIST kcolorchooser-24.12.0.tar.xz 36228 BLAKE2B 7867d4604d85348442ad5170556d38882a6ac224770d655ffd750337e4aa96625a9f66cdba9006710038311dc042cc48dded3d27e3792c24f148db10db2dbaad SHA512 a9f6f25fe9e9ce4fec4a5f112e0cb8172feea96bbb695b4acde8ff51f1cdb4949bcff48117819095b7ce46e942c73066b1cef147ec29107e99a1341554dcab70
+DIST kcolorchooser-24.12.1.tar.xz 36244 BLAKE2B fcea6efa8d62068b988cc77cdbd758940b06f0ccc93205b1ed3c8bcea8c032fc4e33416176f870346290749b09284b9ac2e4e7d4095d540ea46099a1b072c1c8 SHA512 f8216e4450c5576c18773e9b6cb3420b739075490a2520c668f0765cce9cd5bdb064f39633c2824d56d32de4437daaa9657eb04f1f437716431c77d33e05edf8
diff --git a/kde-apps/kcolorchooser/kcolorchooser-24.12.0.ebuild b/kde-apps/kcolorchooser/kcolorchooser-24.12.0.ebuild
deleted file mode 100644
index 1d61bae5e817..000000000000
--- a/kde-apps/kcolorchooser/kcolorchooser-24.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE color selector/editor"
-HOMEPAGE="https://apps.kde.org/kcolorchooser/"
-
-LICENSE="MIT"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcolorchooser/kcolorchooser-24.12.1.ebuild b/kde-apps/kcolorchooser/kcolorchooser-24.12.1.ebuild
new file mode 100644
index 000000000000..4843addb2915
--- /dev/null
+++ b/kde-apps/kcolorchooser/kcolorchooser-24.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE color selector/editor"
+HOMEPAGE="https://apps.kde.org/kcolorchooser/"
+
+LICENSE="MIT"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index 961111f972f7..afc881180ea1 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,2 +1,2 @@
 DIST kcron-24.08.3.tar.xz 877448 BLAKE2B 4490f6a93f6675758177fe0185a2187bf9f1b43e51e940ac771ab660de36138cfe7969b9f6640035f6f72dd5f5f42bbf9f40fc9a015959427d0291b30197080b SHA512 ab74ff636048b69cddf47dc1d774b3ece18167d997cc2e7136a954bf51b796470e45cf5970d5fac912d6a7fc4ee7ef10c753d7fb2e9531da5469d58a791ff049
-DIST kcron-24.12.0.tar.xz 896404 BLAKE2B 34d1841f8d2377ce9e3aebb6e5294629f4ecb9a99dd606aab764b3b6b3ee89da0e4473724e6894230c8658830faf52bcd8d4f6f0197041393b47f743834578ac SHA512 daba10dbbc5bd248ad8db83cec8ed7e7b52e1918836aabe128e80b652f8126b4867ffba2cb9ea1b01cd3a5423f5967057a2316508ab11ab6557b61df9ede6c9b
+DIST kcron-24.12.1.tar.xz 896688 BLAKE2B 2d7c5d371e210b111e456842e3b0ee1363937dc335ba677ad02febd5e325d544da8e6eb44581b831ee9741668adfa951c87f57c68b806bc8250e9e048018b5e6 SHA512 9992292176a3b2186028e2fa25097e42641d513d9642c146bed299097179d3d3e88e313401c41260d8fa53c880ef300ae998c068b7def75094f973323abf4e78
diff --git a/kde-apps/kcron/kcron-24.12.0.ebuild b/kde-apps/kcron/kcron-24.12.0.ebuild
deleted file mode 100644
index b7f4e0c13629..000000000000
--- a/kde-apps/kcron/kcron-24.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE Task Scheduler"
-HOMEPAGE="https://apps.kde.org/kcron/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/kirigami-addons:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-frameworks/kauth-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdeclarative-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	virtual/cron
-"
diff --git a/kde-apps/kcron/kcron-24.12.1.ebuild b/kde-apps/kcron/kcron-24.12.1.ebuild
new file mode 100644
index 000000000000..441825b37085
--- /dev/null
+++ b/kde-apps/kcron/kcron-24.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE Task Scheduler"
+HOMEPAGE="https://apps.kde.org/kcron/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/kirigami-addons:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdeclarative-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	virtual/cron
+"
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-24.12.0.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-24.12.0.ebuild
deleted file mode 100644
index 0743b66b6198..000000000000
--- a/kde-apps/kde-apps-meta/kde-apps-meta-24.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Meta package for the KDE Release Service collection"
-HOMEPAGE="https://apps.kde.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="accessibility +admin +education +games +graphics +multimedia +network pim sdk +utils"
-
-RDEPEND="
-	>=kde-apps/kdecore-meta-${PV}:*
-	accessibility? ( >=kde-apps/kdeaccessibility-meta-${PV}:* )
-	admin? ( >=kde-apps/kdeadmin-meta-${PV}:* )
-	education? ( >=kde-apps/kdeedu-meta-${PV}:* )
-	games? ( >=kde-apps/kdegames-meta-${PV}:* )
-	graphics? ( >=kde-apps/kdegraphics-meta-${PV}:* )
-	multimedia? ( >=kde-apps/kdemultimedia-meta-${PV}:* )
-	network? ( >=kde-apps/kdenetwork-meta-${PV}:* )
-	pim? ( >=kde-apps/kdepim-meta-${PV}:* )
-	sdk? ( >=kde-apps/kdesdk-meta-${PV}:* )
-	utils? ( >=kde-apps/kdeutils-meta-${PV}:* )
-"
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-24.12.1.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-24.12.1.ebuild
new file mode 100644
index 000000000000..3679950a2a3e
--- /dev/null
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-24.12.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Meta package for the KDE Release Service collection"
+HOMEPAGE="https://apps.kde.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="accessibility +admin +education +games +graphics +multimedia +network pim sdk +utils"
+
+RDEPEND="
+	>=kde-apps/kdecore-meta-${PV}:*
+	accessibility? ( >=kde-apps/kdeaccessibility-meta-${PV}:* )
+	admin? ( >=kde-apps/kdeadmin-meta-${PV}:* )
+	education? ( >=kde-apps/kdeedu-meta-${PV}:* )
+	games? ( >=kde-apps/kdegames-meta-${PV}:* )
+	graphics? ( >=kde-apps/kdegraphics-meta-${PV}:* )
+	multimedia? ( >=kde-apps/kdemultimedia-meta-${PV}:* )
+	network? ( >=kde-apps/kdenetwork-meta-${PV}:* )
+	pim? ( >=kde-apps/kdepim-meta-${PV}:* )
+	sdk? ( >=kde-apps/kdesdk-meta-${PV}:* )
+	utils? ( >=kde-apps/kdeutils-meta-${PV}:* )
+"
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index de4e70c2d11a..ab37b7a26a0f 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,2 +1,2 @@
 DIST kde-dev-scripts-24.08.3.tar.xz 376248 BLAKE2B c505ec233760423fbc42322ef003a1d4c482b83ddb7c5d4cd6c7f1f995b77a30b03c85224aea60a84f541ff1a35001046bc990192ba4bded413b4a1fca8760ca SHA512 326511a34d7af6a7c52c8561dac63790c6ee8e57be01bd0d04a3e7a602eb318474217784e2af110dc2b0d3569d0c4bbfccaf319a486ade3b98186bfc4f882cc3
-DIST kde-dev-scripts-24.12.0.tar.xz 376196 BLAKE2B 981842fc2643432464882509fcb64ff82447f3bba72b6d9dd779299169e37f58fb74a8e2372b49e53c2b728b8c88c3bd22277a9035a07be43f45123e10bfc519 SHA512 a39810c8649e37007b21af4c5662bad7b3861af7021b2eec1668d5f331e37b30b6cbf53abb8b54807b15d8c1736f7245354f2450c7aefb908092c8b7b4efa4b1
+DIST kde-dev-scripts-24.12.1.tar.xz 376164 BLAKE2B 45ee2ac7d13fd7ee048372648e7972053fd2cf7c8ea042eb34a571cd6ca275ad4ae127aea2d2b0b13054e5f42537ee532142ffdab5b109e90ad8ad48427f8a32 SHA512 67a1a35edd7bbafa31344e5a7f04db9d508f410d078425a7a8d845158ef48b71fff2e35b70e0820d1bdce5f64aeb86d8c2403a6e1fbb73e7aa3b37bdb33d52a9
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-24.12.0.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-24.12.0.ebuild
deleted file mode 100644
index 8c5f0c4f1edb..000000000000
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-24.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=6.5.0
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE Development Scripts"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	app-arch/advancecomp
-	dev-perl/XML-DOM
-	media-gfx/optipng
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# bug 275069
-	sed -e 's:colorsvn::' -i CMakeLists.txt || die
-}
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-24.12.1.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-24.12.1.ebuild
new file mode 100644
index 000000000000..e67be16dbeee
--- /dev/null
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-24.12.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.7.0
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE Development Scripts"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	app-arch/advancecomp
+	dev-perl/XML-DOM
+	media-gfx/optipng
+"
+
+src_prepare() {
+	ecm_src_prepare
+
+	# bug 275069
+	sed -e 's:colorsvn::' -i CMakeLists.txt || die
+}
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index 15ff69be969f..a0630c50b6b2 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,2 +1,2 @@
 DIST kde-dev-utils-24.08.3.tar.xz 75204 BLAKE2B 5e00c6eff98375702232dae20922d326b9e3ca8100bef511297865c73bc8d1670ff50880dd5b78e16b8947f98253fd5050470c6ea5845859d9f4caea22d95aa3 SHA512 aab4b2b6c3aa7a88e2b5f785c8762fdecde41ddb8fdc6d18a055baa67beba0d4f530b3783715bf877d9bd12a41420d39a05bfa05d502e4eb78b4c21b43b2ce8c
-DIST kde-dev-utils-24.12.0.tar.xz 75616 BLAKE2B 88bb9fe0aa589e9b308f904f3aac5483acad57aa82957f869501f4971de54dc4e183980eebb3bafcdc548858a1b2b887416490007f43bffee62b10903bb0458f SHA512 a9811809d27c906f1790f49ee72237b46870d0c8184ae2198e70c517abd753d148f59d70256567ca0557319ebd38bc715f7b9f89b34674710b565bc1c7a99f93
+DIST kde-dev-utils-24.12.1.tar.xz 75632 BLAKE2B 57a9c29107a3781e138db37fabd51506c792eb07c4421feb323c90a277e487c5deee42f88111c9eeaa3f23c350b1119f9989687cd90787a3977b63f84d95d33e SHA512 9a4838927d99ab508133d009a22c13e31f695b2b7bec3815e249c3247e9e8c38e9faeb4ec47a288985430329ed99adcd70297394dfd2e363f90852237f7bd281
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-24.12.0.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-24.12.0.ebuild
deleted file mode 100644
index 60c3d150729d..000000000000
--- a/kde-apps/kde-dev-utils/kde-dev-utils-24.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE Development Utilities"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qttools-${QTMIN}:6[designer,widgets]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-24.12.1.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-24.12.1.ebuild
new file mode 100644
index 000000000000..33e4e1760c9f
--- /dev/null
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-24.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE Development Utilities"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qttools-${QTMIN}:6[designer,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-24.12.0.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-24.12.0.ebuild
deleted file mode 100644
index 15249438700f..000000000000
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-24.12.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
-HOMEPAGE="https://apps.kde.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-accessibility/kontrast-${PV}:*
-	>=kde-apps/kmag-${PV}:*
-	>=kde-apps/kmousetool-${PV}:*
-	>=kde-apps/kmouth-${PV}:*
-"
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-24.12.1.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-24.12.1.ebuild
new file mode 100644
index 000000000000..808b2312b403
--- /dev/null
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-24.12.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
+HOMEPAGE="https://apps.kde.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-accessibility/kontrast-${PV}:*
+	>=kde-apps/kmag-${PV}:*
+	>=kde-apps/kmousetool-${PV}:*
+	>=kde-apps/kmouth-${PV}:*
+"
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-24.12.0.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-24.12.0.ebuild
deleted file mode 100644
index d52496adaa38..000000000000
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-24.12.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-HOMEPAGE="https://apps.kde.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+cron"
-
-RDEPEND="
-	>=app-admin/kio-admin-${PV}:*
-	>=kde-apps/ksystemlog-${PV}:*
-	cron? ( >=kde-apps/kcron-${PV}:* )
-"
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-24.12.1.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-24.12.1.ebuild
new file mode 100644
index 000000000000..970318091e45
--- /dev/null
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-24.12.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
+HOMEPAGE="https://apps.kde.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+cron"
+
+RDEPEND="
+	>=app-admin/kio-admin-${PV}:*
+	>=kde-apps/ksystemlog-${PV}:*
+	cron? ( >=kde-apps/kcron-${PV}:* )
+"
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index ec7e2bd31891..dbc3458c103f 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,2 +1,2 @@
 DIST kdebugsettings-24.08.3.tar.xz 115592 BLAKE2B 36b907b83b964ac86228cd8e1396c47cbeec83d5a8b6990ac4e53b119700ed05e2fd88d1f99c8fc370bd459e5bfcc8d701400e34ece915d4d485700a8113df16 SHA512 a2d976be74500166b26a93c9ac9cd537ba109ceae5b1c4a98e1e4ee633058987517988d5ebabd9cb70bacb4e4fd8116f01d0f1fc22d260ca837a80eaa6b73615
-DIST kdebugsettings-24.12.0.tar.xz 116796 BLAKE2B 866d32a65ffc274e380bc470357c167afe9623ed1ee095881ef71c7dbc94a31dd68f57f813b2183d68be2294798fe2259015d14be21e17eb6092133407fed75b SHA512 6c721ec4b71f6eda056af9f4b9b3364c98f224a50b5c6f4d7cccde06e420089fe7c6408e63b635eab9fb1998ee51137834817d5584b0a95cab3b83e43a2455b9
+DIST kdebugsettings-24.12.1.tar.xz 116692 BLAKE2B 6daa4a026ed410f70aab7fa748e3f8b1751f07b25e4d908953013d7f4b315e93606a728ba24555cffabec13e1f0b51fddd1a2f460d7ab3ea512adc6ba93657ba SHA512 9fc96ba4cee0f9d105ab77a2294c337d8cc5fd753905a0034458dc1d230c9104b43fa8d0161a059738647416cf7c84dc4c32c5b68b8a9e89e0312c55c2a79d70
diff --git a/kde-apps/kdebugsettings/kdebugsettings-24.12.0.ebuild b/kde-apps/kdebugsettings/kdebugsettings-24.12.0.ebuild
deleted file mode 100644
index 75fe0482d9e3..000000000000
--- a/kde-apps/kdebugsettings/kdebugsettings-24.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Application to enable/disable qCDebug"
-HOMEPAGE="https://apps.kde.org/kdebugsettings/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdebugsettings/kdebugsettings-24.12.1.ebuild b/kde-apps/kdebugsettings/kdebugsettings-24.12.1.ebuild
new file mode 100644
index 000000000000..92453a36d022
--- /dev/null
+++ b/kde-apps/kdebugsettings/kdebugsettings-24.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Application to enable/disable qCDebug"
+HOMEPAGE="https://apps.kde.org/kdebugsettings/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdecore-meta/kdecore-meta-24.12.0.ebuild b/kde-apps/kdecore-meta/kdecore-meta-24.12.0.ebuild
deleted file mode 100644
index 21765cbcdc58..000000000000
--- a/kde-apps/kdecore-meta/kdecore-meta-24.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="kdecore - merge this to pull in the most basic applications"
-HOMEPAGE="https://apps.kde.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+share +webengine"
-
-RDEPEND="
-	>=kde-apps/dolphin-${PV}:*
-	>=kde-apps/kdialog-${PV}:*
-	>=kde-apps/keditbookmarks-${PV}:*
-	>=kde-apps/kfind-${PV}:*
-	>=kde-apps/konsole-${PV}:*
-	>=kde-apps/kwrite-${PV}:*
-	webengine? (
-		>=kde-apps/khelpcenter-${PV}:*
-		|| (
-			>=www-client/falkon-${PV}
-			>=kde-apps/konqueror-${PV}:*
-		)
-	)
-"
-# Optional runtime deps: kde-apps/dolphin
-RDEPEND="${RDEPEND}
-	share? ( kde-frameworks/purpose:6 )
-"
diff --git a/kde-apps/kdecore-meta/kdecore-meta-24.12.1.ebuild b/kde-apps/kdecore-meta/kdecore-meta-24.12.1.ebuild
new file mode 100644
index 000000000000..b089ad7e5229
--- /dev/null
+++ b/kde-apps/kdecore-meta/kdecore-meta-24.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="kdecore - merge this to pull in the most basic applications"
+HOMEPAGE="https://apps.kde.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
+IUSE="+share +webengine"
+
+RDEPEND="
+	>=kde-apps/dolphin-${PV}:*
+	>=kde-apps/kdialog-${PV}:*
+	>=kde-apps/keditbookmarks-${PV}:*
+	>=kde-apps/kfind-${PV}:*
+	>=kde-apps/konsole-${PV}:*
+	>=kde-apps/kwrite-${PV}:*
+	webengine? (
+		>=kde-apps/khelpcenter-${PV}:*
+		|| (
+			>=www-client/falkon-${PV}
+			>=kde-apps/konqueror-${PV}:*
+		)
+	)
+"
+# Optional runtime deps: kde-apps/dolphin
+RDEPEND="${RDEPEND}
+	share? ( kde-frameworks/purpose:6 )
+"
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index 51873307f123..9e440fcbc806 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,2 +1,2 @@
 DIST kdeedu-data-24.08.3.tar.xz 338792 BLAKE2B 8856d763b11f8716f6323fb661c2c01d10ea5243cf9cd357fdc1105933de6cb58ae9ac83bc7cbbe960970a356cc6b8daa5458a4a78a1e8ae2f5e409f9deef0eb SHA512 c5903b1370f9d0dfafce78b047072378f07df2185fb56a07ecdceeeda478736dd90c1847936bcd99e5c5f4975c979fa626814caf2570049f2f8874d823ebefbc
-DIST kdeedu-data-24.12.0.tar.xz 338808 BLAKE2B f7de8450590d4cc989646809e93e14cabb7f630c3ba0b1ce95da828b2607e1afe91632cd2a8416a917ed01e5fec06ad2794bda4e06c347a8316504ccd2f71909 SHA512 76837dbc200d90e06962965da7e6e01f9028702929125318047145227fe3bc8e1266ee46105672a6c1d8fd73febcfd47b6b1c1865cac08e46c5b19ea5e3b7dcb
+DIST kdeedu-data-24.12.1.tar.xz 338768 BLAKE2B 2288f9d4cd39e0a5cca6e7b6831be1ef42ffe59bfebe0569608f5db503dd895e6692ffae053b57090cc9bf65af62a2ddcb50e029e4d48d5cc05e4741a5b4222e SHA512 28a322cd44f94e927a2507936e8998a5fd1a13078911e559e01e70b5df04672fd0e9d625d8e75a8d093ba39830fb3daa5b431777b60735a5289e2d81e5f3571d
diff --git a/kde-apps/kdeedu-data/kdeedu-data-24.12.0.ebuild b/kde-apps/kdeedu-data/kdeedu-data-24.12.0.ebuild
deleted file mode 100644
index 9ae81c95eb47..000000000000
--- a/kde-apps/kdeedu-data/kdeedu-data-24.12.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake gear.kde.org
-
-DESCRIPTION="Shared icons, artwork and data files for educational applications"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-qt/qtbase:6
-	>=kde-frameworks/extra-cmake-modules-6.0:0
-"
diff --git a/kde-apps/kdeedu-data/kdeedu-data-24.12.1.ebuild b/kde-apps/kdeedu-data/kdeedu-data-24.12.1.ebuild
new file mode 100644
index 000000000000..af409ddf26b6
--- /dev/null
+++ b/kde-apps/kdeedu-data/kdeedu-data-24.12.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake gear.kde.org
+
+DESCRIPTION="Shared icons, artwork and data files for educational applications"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-qt/qtbase:6
+	>=kde-frameworks/extra-cmake-modules-6.0:0
+"
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-24.12.0.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-24.12.0.ebuild
deleted file mode 100644
index 3e3506b80b9b..000000000000
--- a/kde-apps/kdeedu-meta/kdeedu-meta-24.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
-HOMEPAGE="https://apps.kde.org/categories/education/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="+webengine"
-
-RDEPEND="
-	>=kde-apps/analitza-${PV}:*
-	>=kde-apps/artikulate-${PV}:*
-	>=kde-apps/blinken-${PV}:*
-	>=kde-apps/cantor-${PV}:*
-	>=kde-apps/kalzium-${PV}:*
-	>=kde-apps/kanagram-${PV}:*
-	>=kde-apps/kbruch-${PV}:*
-	>=kde-apps/kdeedu-data-${PV}:*
-	>=kde-apps/kgeography-${PV}:*
-	>=kde-apps/khangman-${PV}:*
-	>=kde-apps/kig-${PV}:*
-	>=kde-apps/kiten-${PV}:*
-	>=kde-apps/klettres-${PV}:*
-	>=kde-apps/kmplot-${PV}:*
-	>=kde-apps/kqtquickcharts-${PV}:*
-	>=kde-apps/ktouch-${PV}:*
-	>=kde-apps/kturtle-${PV}:*
-	>=kde-apps/kwordquiz-${PV}:*
-	>=kde-apps/libkeduvocdocument-${PV}:*
-	>=kde-apps/marble-${PV}:*
-	>=kde-apps/minuet-${PV}:*
-	>=kde-apps/rocs-${PV}:*
-	>=kde-apps/step-${PV}:*
-	webengine? (
-		>=kde-apps/kalgebra-${PV}:*
-		>=kde-apps/parley-${PV}:*
-	)
-"
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-24.12.1.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-24.12.1.ebuild
new file mode 100644
index 000000000000..2ee1d9b39e80
--- /dev/null
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-24.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
+HOMEPAGE="https://apps.kde.org/categories/education/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+webengine"
+
+RDEPEND="
+	>=kde-apps/analitza-${PV}:*
+	>=kde-apps/artikulate-${PV}:*
+	>=kde-apps/blinken-${PV}:*
+	>=kde-apps/cantor-${PV}:*
+	>=kde-apps/kalzium-${PV}:*
+	>=kde-apps/kanagram-${PV}:*
+	>=kde-apps/kbruch-${PV}:*
+	>=kde-apps/kdeedu-data-${PV}:*
+	>=kde-apps/kgeography-${PV}:*
+	>=kde-apps/khangman-${PV}:*
+	>=kde-apps/kig-${PV}:*
+	>=kde-apps/kiten-${PV}:*
+	>=kde-apps/klettres-${PV}:*
+	>=kde-apps/kmplot-${PV}:*
+	>=kde-apps/kqtquickcharts-${PV}:*
+	>=kde-apps/ktouch-${PV}:*
+	>=kde-apps/kturtle-${PV}:*
+	>=kde-apps/kwordquiz-${PV}:*
+	>=kde-apps/libkeduvocdocument-${PV}:*
+	>=kde-apps/marble-${PV}:*
+	>=kde-apps/minuet-${PV}:*
+	>=kde-apps/rocs-${PV}:*
+	>=kde-apps/step-${PV}:*
+	webengine? (
+		>=kde-apps/kalgebra-${PV}:*
+		>=kde-apps/parley-${PV}:*
+	)
+"
diff --git a/kde-apps/kdegames-meta/kdegames-meta-24.12.0.ebuild b/kde-apps/kdegames-meta/kdegames-meta-24.12.0.ebuild
deleted file mode 100644
index e1ee899e52ab..000000000000
--- a/kde-apps/kdegames-meta/kdegames-meta-24.12.0.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
-
-DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
-HOMEPAGE="https://apps.kde.org/categories/games/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="opengl python"
-
-RDEPEND="
-	>=games-puzzle/skladnik-${PV}
-	>=kde-apps/bomber-${PV}:*
-	>=kde-apps/bovo-${PV}:*
-	>=kde-apps/granatier-${PV}:*
-	>=kde-apps/kapman-${PV}:*
-	>=kde-apps/katomic-${PV}:*
-	>=kde-apps/kblackbox-${PV}:*
-	>=kde-apps/kblocks-${PV}:*
-	>=kde-apps/kbounce-${PV}:*
-	>=kde-apps/kbreakout-${PV}:*
-	>=kde-apps/kdiamond-${PV}:*
-	>=kde-apps/kfourinline-${PV}:*
-	>=kde-apps/kgoldrunner-${PV}:*
-	>=kde-apps/kigo-${PV}:*
-	>=kde-apps/killbots-${PV}:*
-	>=kde-apps/kiriki-${PV}:*
-	>=kde-apps/kjumpingcube-${PV}:*
-	>=kde-apps/klickety-${PV}:*
-	>=kde-apps/klines-${PV}:*
-	>=kde-apps/kmahjongg-${PV}:*
-	>=kde-apps/kmines-${PV}:*
-	>=kde-apps/knavalbattle-${PV}:*
-	>=kde-apps/knetwalk-${PV}:*
-	>=kde-apps/knights-${PV}:*
-	>=kde-apps/kolf-${PV}:*
-	>=kde-apps/kollision-${PV}:*
-	>=kde-apps/konquest-${PV}:*
-	>=kde-apps/kpat-${PV}:*
-	>=kde-apps/kreversi-${PV}:*
-	>=kde-apps/kshisen-${PV}:*
-	>=kde-apps/ksirk-${PV}:*
-	>=kde-apps/ksnakeduel-${PV}:*
-	>=kde-apps/kspaceduel-${PV}:*
-	>=kde-apps/ksquares-${PV}:*
-	>=kde-apps/ktuberling-${PV}:*
-	>=kde-apps/libkdegames-${PV}:*
-	>=kde-apps/libkmahjongg-${PV}:*
-	>=kde-apps/lskat-${PV}:*
-	>=kde-apps/palapeli-${PV}:*
-	>=kde-apps/picmi-${PV}:*
-	opengl? (
-		>=kde-apps/ksudoku-${PV}:*
-		>=kde-apps/kubrick-${PV}:*
-	)
-	python? ( >=kde-apps/kajongg-${PV}:* )
-"
diff --git a/kde-apps/kdegames-meta/kdegames-meta-24.12.1.ebuild b/kde-apps/kdegames-meta/kdegames-meta-24.12.1.ebuild
new file mode 100644
index 000000000000..bd2f85942fa2
--- /dev/null
+++ b/kde-apps/kdegames-meta/kdegames-meta-24.12.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
+HOMEPAGE="https://apps.kde.org/categories/games/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE="opengl python"
+
+RDEPEND="
+	>=games-puzzle/skladnik-${PV}
+	>=kde-apps/bomber-${PV}:*
+	>=kde-apps/bovo-${PV}:*
+	>=kde-apps/granatier-${PV}:*
+	>=kde-apps/kapman-${PV}:*
+	>=kde-apps/katomic-${PV}:*
+	>=kde-apps/kblackbox-${PV}:*
+	>=kde-apps/kblocks-${PV}:*
+	>=kde-apps/kbounce-${PV}:*
+	>=kde-apps/kbreakout-${PV}:*
+	>=kde-apps/kdiamond-${PV}:*
+	>=kde-apps/kfourinline-${PV}:*
+	>=kde-apps/kgoldrunner-${PV}:*
+	>=kde-apps/kigo-${PV}:*
+	>=kde-apps/killbots-${PV}:*
+	>=kde-apps/kiriki-${PV}:*
+	>=kde-apps/kjumpingcube-${PV}:*
+	>=kde-apps/klickety-${PV}:*
+	>=kde-apps/klines-${PV}:*
+	>=kde-apps/kmahjongg-${PV}:*
+	>=kde-apps/kmines-${PV}:*
+	>=kde-apps/knavalbattle-${PV}:*
+	>=kde-apps/knetwalk-${PV}:*
+	>=kde-apps/knights-${PV}:*
+	>=kde-apps/kolf-${PV}:*
+	>=kde-apps/kollision-${PV}:*
+	>=kde-apps/konquest-${PV}:*
+	>=kde-apps/kpat-${PV}:*
+	>=kde-apps/kreversi-${PV}:*
+	>=kde-apps/kshisen-${PV}:*
+	>=kde-apps/ksirk-${PV}:*
+	>=kde-apps/ksnakeduel-${PV}:*
+	>=kde-apps/kspaceduel-${PV}:*
+	>=kde-apps/ksquares-${PV}:*
+	>=kde-apps/ktuberling-${PV}:*
+	>=kde-apps/libkdegames-${PV}:*
+	>=kde-apps/libkmahjongg-${PV}:*
+	>=kde-apps/lskat-${PV}:*
+	>=kde-apps/palapeli-${PV}:*
+	>=kde-apps/picmi-${PV}:*
+	opengl? (
+		>=kde-apps/ksudoku-${PV}:*
+		>=kde-apps/kubrick-${PV}:*
+	)
+	python? ( >=kde-apps/kajongg-${PV}:* )
+"
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-24.12.0.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-24.12.0.ebuild
deleted file mode 100644
index 7bdafa087ef2..000000000000
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-24.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
-HOMEPAGE="https://apps.kde.org/graphics/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="color-management scanner +screencast +webengine"
-
-RDEPEND="
-	>=kde-apps/gwenview-${PV}:*
-	>=kde-apps/kamera-${PV}:*
-	>=kde-apps/kcolorchooser-${PV}:*
-	>=kde-apps/kdegraphics-mobipocket-${PV}:*
-	>=kde-apps/kolourpaint-${PV}:*
-	>=kde-apps/kruler-${PV}:*
-	>=kde-apps/libkdcraw-${PV}:*
-	>=kde-apps/libkexiv2-${PV}:*
-	>=kde-apps/okular-${PV}:*
-	>=kde-apps/svgpart-${PV}:*
-	>=kde-apps/thumbnailers-${PV}:*
-	>=media-gfx/kgraphviewer-${PV}:*
-	color-management? ( >=kde-misc/colord-kde-${PV}:* )
-	scanner? (
-		>=kde-apps/libksane-${PV}:*
-		>=kde-misc/skanlite-${PV}:*
-		webengine? ( >=media-gfx/skanpage-${PV}:* )
-	)
-	screencast? ( >=kde-apps/spectacle-${PV}:* )
-"
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-24.12.1.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-24.12.1.ebuild
new file mode 100644
index 000000000000..e79d870d9d01
--- /dev/null
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-24.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
+HOMEPAGE="https://apps.kde.org/graphics/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="color-management scanner +screencast +webengine"
+
+RDEPEND="
+	>=kde-apps/gwenview-${PV}:*
+	>=kde-apps/kamera-${PV}:*
+	>=kde-apps/kcolorchooser-${PV}:*
+	>=kde-apps/kdegraphics-mobipocket-${PV}:*
+	>=kde-apps/kolourpaint-${PV}:*
+	>=kde-apps/kruler-${PV}:*
+	>=kde-apps/libkdcraw-${PV}:*
+	>=kde-apps/libkexiv2-${PV}:*
+	>=kde-apps/okular-${PV}:*
+	>=kde-apps/svgpart-${PV}:*
+	>=kde-apps/thumbnailers-${PV}:*
+	>=media-gfx/kgraphviewer-${PV}:*
+	color-management? ( >=kde-misc/colord-kde-${PV}:* )
+	scanner? (
+		>=kde-apps/libksane-${PV}:*
+		>=kde-misc/skanlite-${PV}:*
+		webengine? ( >=media-gfx/skanpage-${PV}:* )
+	)
+	screencast? ( >=kde-apps/spectacle-${PV}:* )
+"
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index 6e8f75f916a5..0146a114258e 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,2 +1,2 @@
 DIST kdegraphics-mobipocket-24.08.3.tar.xz 13056 BLAKE2B e31c5ccf03e9625d6d0faf3c132df572645c50d13a6b5d766efc20fea721d7e2faae8fdff31ca165eaf99408a180d9f8e53b84970d1172ddf06dd86582cf1626 SHA512 b6e28c74175b7bf26db0f2efb86ac531fb3f5076c76317c2fb3f9ffa0e2a53750413439134b82b9b1295ae9c12a028633cb75114efdd21113961ce042ccd0d0e
-DIST kdegraphics-mobipocket-24.12.0.tar.xz 13056 BLAKE2B 868b410ecc8a248d0ae4b7d3826ff8ca49f4c4e01293f39df5c900a828cdc8cc051bfa3804ff9f13af42349967ef2c2559aeeb273572bb97c7e9a3fccb1d2685 SHA512 7e0a67b72f528db6035251e249940cea3def9a898d7292c0ea4268bb040eb6a954ebd4ae97eb8d73db5342f286253f4266c2e270b36962ad2fd7eeb8b6b382b2
+DIST kdegraphics-mobipocket-24.12.1.tar.xz 13064 BLAKE2B f17a1589d80674c5ca23ada863805b17e8d5e9f4bc9026dde591fdf3a661aa025db14452ca9a5b3602b0392985156ce20e9c7ebba1b461c5c7247efb5192da80 SHA512 3cfc7e6b4811eb8b68f64d000d8197e719e73943836974a351c174cc893cd760d98808db412f4a8a5dce40c109856b6a716509d3bd6b4064ea8704f436bdc89e
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-24.12.0.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-24.12.0.ebuild
deleted file mode 100644
index db69c3213507..000000000000
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-24.12.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library to support mobipocket ebooks"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-24.12.1.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-24.12.1.ebuild
new file mode 100644
index 000000000000..11da8c36ca9d
--- /dev/null
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-24.12.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library to support mobipocket ebooks"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-24.12.0.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-24.12.0.ebuild
deleted file mode 100644
index fcb0e51e8cb6..000000000000
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-24.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-HOMEPAGE="https://apps.kde.org/categories/multimedia/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+cdrom +ffmpeg gstreamer"
-
-RDEPEND="
-	>=kde-apps/dragon-${PV}:*
-	>=kde-apps/juk-${PV}:*
-	>=kde-apps/kdenlive-${PV}:*
-	>=kde-apps/kmix-${PV}:*
-	>=kde-apps/kwave-${PV}:*
-	>=media-sound/elisa-${PV}:*
-	>=media-sound/kasts-${PV}
-	>=media-sound/krecorder-${PV}
-	cdrom? (
-		>=media-sound/audex-${PV}
-		>=kde-apps/audiocd-kio-${PV}:*
-		>=kde-apps/k3b-${PV}:*
-		>=kde-apps/libkcddb-${PV}:*
-		>=kde-apps/libkcompactdisc-${PV}:*
-	)
-	ffmpeg? ( >=kde-apps/ffmpegthumbs-${PV}:* )
-	gstreamer? ( >=kde-apps/kamoso-${PV}:* )
-"
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-24.12.1.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-24.12.1.ebuild
new file mode 100644
index 000000000000..04aba1422443
--- /dev/null
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-24.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
+HOMEPAGE="https://apps.kde.org/categories/multimedia/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+cdrom +ffmpeg gstreamer"
+
+RDEPEND="
+	>=kde-apps/dragon-${PV}:*
+	>=kde-apps/juk-${PV}:*
+	>=kde-apps/kdenlive-${PV}:*
+	>=kde-apps/kmix-${PV}:*
+	>=kde-apps/kwave-${PV}:*
+	>=media-sound/elisa-${PV}:*
+	>=media-sound/kasts-${PV}
+	>=media-sound/krecorder-${PV}
+	cdrom? (
+		>=media-sound/audex-${PV}
+		>=kde-apps/audiocd-kio-${PV}:*
+		>=kde-apps/k3b-${PV}:*
+		>=kde-apps/libkcddb-${PV}:*
+		>=kde-apps/libkcompactdisc-${PV}:*
+	)
+	ffmpeg? ( >=kde-apps/ffmpegthumbs-${PV}:* )
+	gstreamer? ( >=kde-apps/kamoso-${PV}:* )
+"
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index bfb197fbca84..d1084d0edfb1 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,2 +1,2 @@
 DIST kdenetwork-filesharing-24.08.3.tar.xz 498960 BLAKE2B 42854facda43af839e36effeba7ab4e1dd9b325ddc4f8923ae04ebbdc1275ffe44f06932563c7513e85c790b2a0728687f3201a342d37bc381985747581772a3 SHA512 633e18c829a86baa4ddc4d0a4c5164a4393856161a596f965ab212e6247196d352286ef327e32ee103c72c6c9cc6a8fea065fec94638c0a50ddedf426260b249
-DIST kdenetwork-filesharing-24.12.0.tar.xz 500780 BLAKE2B 5dae316541caf1f2d43169512a5feb2c35575226c8e4f1e00bf630e032253294bdd7bf210b51c7055d0cd987fb4768c85e133a15800ba33fea0fdd4db04dd8d3 SHA512 46bfbdbb05a9f5b3a93e2529273a8a2ec456319d154e620a9abfecd775229a16ebb6ff8b1a6a01033ee11841ce49d424095fe2a5f141ef8a0dc55619eaa1d6ad
+DIST kdenetwork-filesharing-24.12.1.tar.xz 500716 BLAKE2B b688f5058e7165c7bb2078caffcf9ea2ecdf8499148f3083e3e7d0799d2cb3fd29c97ce6f4bcf0dcae342c86c005ef76854b4cc0b76e0ed7e1d1ddad7f9cce07 SHA512 dee475e82520593861cebf19fe3766434fe311969a16e749dc86b4b410dd6d471150ed507305f4469bcc1f1be01f1aa89137886694dcbbe53d4d2a586ba4dc72
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-24.12.0.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-24.12.0.ebuild
deleted file mode 100644
index f1705f1ce30f..000000000000
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-24.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Samba filesharing plugin for file properties"
-HOMEPAGE="https://apps.kde.org/kdenetwork_filesharing/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/qcoro
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	net-fs/samba
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-24.12.1.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-24.12.1.ebuild
new file mode 100644
index 000000000000..bb88fba5c8cb
--- /dev/null
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-24.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Samba filesharing plugin for file properties"
+HOMEPAGE="https://apps.kde.org/kdenetwork_filesharing/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/qcoro
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	net-fs/samba
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-24.12.0.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-24.12.0.ebuild
deleted file mode 100644
index 72e182fac7cd..000000000000
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-24.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-HOMEPAGE="https://apps.kde.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+bittorrent dropbox samba +screencast +webengine"
-
-RDEPEND="
-	>=kde-apps/kget-${PV}:*
-	>=kde-apps/krdc-${PV}:*
-	>=kde-misc/kdeconnect-${PV}:*
-	>=net-im/tokodon-${PV}
-	>=net-irc/konversation-${PV}:*
-	>=net-misc/kio-zeroconf-${PV}:*
-	>=net-news/alligator-${PV}
-	bittorrent? (
-		>=net-libs/libktorrent-${PV}:*
-		>=net-p2p/ktorrent-${PV}:*
-	)
-	dropbox? ( >=kde-apps/dolphin-plugins-dropbox-${PV}:* )
-	samba? ( >=kde-apps/kdenetwork-filesharing-${PV}:* )
-	screencast? ( >=kde-apps/krfb-${PV}:* )
-	webengine? (
-		>=kde-apps/kaccounts-integration-${PV}:*
-		>=kde-apps/kaccounts-providers-${PV}:*
-		>=kde-apps/signon-kwallet-extension-${PV}:*
-		>=kde-misc/kio-gdrive-${PV}:*
-		>=net-im/neochat-${PV}
-	)
-"
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-24.12.1.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-24.12.1.ebuild
new file mode 100644
index 000000000000..fad5b7ed8c0b
--- /dev/null
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-24.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
+HOMEPAGE="https://apps.kde.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+bittorrent dropbox samba +screencast +webengine"
+
+RDEPEND="
+	>=kde-apps/kget-${PV}:*
+	>=kde-apps/krdc-${PV}:*
+	>=kde-misc/kdeconnect-${PV}:*
+	>=net-im/tokodon-${PV}
+	>=net-irc/konversation-${PV}:*
+	>=net-misc/kio-zeroconf-${PV}:*
+	>=net-news/alligator-${PV}
+	bittorrent? (
+		>=net-libs/libktorrent-${PV}:*
+		>=net-p2p/ktorrent-${PV}:*
+	)
+	dropbox? ( >=kde-apps/dolphin-plugins-dropbox-${PV}:* )
+	samba? ( >=kde-apps/kdenetwork-filesharing-${PV}:* )
+	screencast? ( >=kde-apps/krfb-${PV}:* )
+	webengine? (
+		>=kde-apps/kaccounts-integration-${PV}:*
+		>=kde-apps/kaccounts-providers-${PV}:*
+		>=kde-apps/signon-kwallet-extension-${PV}:*
+		>=kde-misc/kio-gdrive-${PV}:*
+		>=net-im/neochat-${PV}
+	)
+"
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index 4382534720f7..2bede99577cf 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,2 +1,2 @@
 DIST kdenlive-24.08.3.tar.xz 12991336 BLAKE2B f566abb08becbc755b70fdd331ab61432eab89a18cf593adc31ca68293e8e6dc0c790b3c3a4aa57b4db2064069a5f3150f77f44e50f60485e490310a445476f0 SHA512 9a679c83f664b24447a40838146e81902c77d3dbceb9c4b3077adf04564c05c249c5de9647aaf69466664fa0054aa220dc9ea349026ad3890c037376c848ff13
-DIST kdenlive-24.12.0.tar.xz 13127724 BLAKE2B 89cdd72659d7631dd3b703f7d5bb29c05036070dfe010fe37ebd547df002d97bd4ba93fb91f5ca1e2ccf6029004843d537fc9b5e64fe159c81e32ad0b9cfd70e SHA512 662b73f3a2da5446615391c4c6a3211ae4a40bdd529077bb0fce8b9d0c75b8c9c820de4b2143d369cf6dfe90245f37afa8826abd50709e963173e1ed6a5eb5f0
+DIST kdenlive-24.12.1.tar.xz 13141220 BLAKE2B 088f382acbad8c959358b89e86c83dc2e9d78fd48f39e7e76f51a6996cfcedbe25f7f96b1cddaaf343718a4bf04e221fc84450aa504cf305d67410daf14e7ec9 SHA512 a3c0cc6ba9c8d57bd369a6447a5d907402e601c0c7473698054ba8bb91dc6151d651ccaf05eee818c663bd3584ae7d4f248b2edba95a770b3d2125301d344653
diff --git a/kde-apps/kdenlive/kdenlive-24.12.0.ebuild b/kde-apps/kdenlive/kdenlive-24.12.0.ebuild
deleted file mode 100644
index b1b36a4a852b..000000000000
--- a/kde-apps/kdenlive/kdenlive-24.12.0.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
-
-ECM_DESIGNERPLUGIN="true"
-ECM_HANDBOOK="optional"
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org optfeature
-
-DESCRIPTION="Non-linear video editing suite by KDE"
-HOMEPAGE="https://kdenlive.org/en/"
-
-LICENSE="GPL-3"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="gles2-only semantic-desktop v4l"
-
-RESTRICT="test" # segfaults, bug 684132
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gles2-only=,gui,network,widgets,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
-	>=dev-qt/qtmultimedia-${QTMIN}:6
-	>=dev-qt/qtnetworkauth-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kfilemetadata-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/purpose-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-	>=media-libs/mlt-7.28.0[ffmpeg,frei0r,qt6,sdl,xml]
-	v4l? ( media-libs/libv4l )
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
-	media-video/ffmpeg[encode,libass,sdl,X]
-	media-video/mediainfo
-"
-BDEPEND="sys-devel/gettext"
-DEPEND+=" virtual/os-headers"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package v4l LibV4L2)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	optfeature "VP8 and VP9 codec support" "media-video/ffmpeg[vpx]"
-}
diff --git a/kde-apps/kdenlive/kdenlive-24.12.1.ebuild b/kde-apps/kdenlive/kdenlive-24.12.1.ebuild
new file mode 100644
index 000000000000..32ce5e30f40d
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-24.12.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="optional"
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Non-linear video editing suite by KDE"
+HOMEPAGE="https://kdenlive.org/en/"
+
+LICENSE="GPL-3"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only semantic-desktop v4l"
+
+RESTRICT="test" # segfaults, bug 684132
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gles2-only=,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=dev-qt/qtnetworkauth-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kfilemetadata-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/purpose-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=media-libs/mlt-7.28.0[ffmpeg,frei0r,qt6,sdl,xml]
+	v4l? ( media-libs/libv4l )
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+	media-video/ffmpeg[encode,libass,sdl,X]
+	media-video/mediainfo
+"
+BDEPEND="sys-devel/gettext"
+DEPEND+=" virtual/os-headers"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package v4l LibV4L2)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	optfeature "VP8 and VP9 codec support" "media-video/ffmpeg[vpx]"
+}
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 0f8273656040..28f3d264d5df 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,2 +1,2 @@
 DIST kdepim-addons-24.08.3.tar.xz 2611624 BLAKE2B 8b22be76cb97c7d64019d4926ebad07e344ae7f5f0933848ba3bd71126bb8ae80842e76c786896cdfdd850fcf0ef17f1eb7738b9b428f5a32446625ff4ffff30 SHA512 a4ef7c07cf0930c4ca683144dc7f64fab4ff65371b98d6ab7f90c361c8e3d19cf1821bfdc7faf3c6a8f295b55d3e603d0b6a12c14981b71f5eb5320316e8ccf5
-DIST kdepim-addons-24.12.0.tar.xz 2617728 BLAKE2B 04f1c5825d806a1cf9c0bc640c62df7b507a0efb5abe498b60a4b302773f62fe84ba38a17893a6a59590b163b6e19d1c84c8e8aaa140813346f00792d88f64d0 SHA512 dbf7708a3fee0d256319fcb84f3c110da53a25ebd545ba96e90aa7e977a867420d38f11263d58f0ccfec8e435190627892ed39c6edc7691b6d33eba50c646386
+DIST kdepim-addons-24.12.1.tar.xz 2617760 BLAKE2B 1aea1644b00681b31da0fb20ec839866ac2077741334edc51b78f22806978bf912b7083f27d3c517b3fc2f40ee7e54fe09891fc91edcf728faf17a18409e3962 SHA512 d1744854b02693413933c604fbe1e6b4198ad8fb015cb3aac235d4de51dae118561e56eb403d4fcc70d19a8d2285f5d365ac3cac19ab2712ddf98afbf683a430
diff --git a/kde-apps/kdepim-addons/kdepim-addons-24.12.0-r1.ebuild b/kde-apps/kdepim-addons/kdepim-addons-24.12.0-r1.ebuild
deleted file mode 100644
index a543aea752db..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org optfeature
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="activities importwizard markdown"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/calendarsupport-${PVCUT}:6
-	>=kde-apps/grantleetheme-${PVCUT}:6
-	>=kde-apps/incidenceeditor-${PVCUT}:6
-	>=kde-apps/kaddressbook-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kimap-${PVCUT}:6
-	>=kde-apps/kitinerary-${PVCUT}:6
-	>=kde-apps/kldap-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/kpkpass-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/libkleo-${PVCUT}:6
-	>=kde-apps/libksieve-${PVCUT}:6
-	>=kde-apps/libktnef-${PVCUT}:6
-	>=kde-apps/mailcommon-${PVCUT}:6
-	>=kde-apps/messagelib-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/ktexttemplate-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/prison-${KFMIN}:6
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
-	activities? ( kde-plasma/plasma-activities:6 )
-	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:6 )
-	markdown? ( app-text/discount:= )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		# not packaged (bug 911819), but if present leads to rust shenanigans
-		-DCMAKE_DISABLE_FIND_PACKAGE_Corrosion=ON # for adblock support, bug 940898
-		-DCMAKE_DISABLE_FIND_PACKAGE_KLLMCore=ON # utilities/alpaka, not packaged
-		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
-		$(cmake_use_find_package importwizard KPim6ImportWizard)
-		$(cmake_use_find_package markdown Discount)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "regex support for Sieve editor plugin" kde-misc/kregexpeditor
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kdepim-addons/kdepim-addons-24.12.1.ebuild b/kde-apps/kdepim-addons/kdepim-addons-24.12.1.ebuild
new file mode 100644
index 000000000000..e9aa4397ae74
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-24.12.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Plugins for KDE Personal Information Management Suite"
+HOMEPAGE="https://apps.kde.org/kontact/"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities importwizard markdown"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/calendarsupport-${PVCUT}:6
+	>=kde-apps/grantleetheme-${PVCUT}:6
+	>=kde-apps/incidenceeditor-${PVCUT}:6
+	>=kde-apps/kaddressbook-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kimap-${PVCUT}:6
+	>=kde-apps/kitinerary-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/kpkpass-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/libkleo-${PVCUT}:6
+	>=kde-apps/libksieve-${PVCUT}:6
+	>=kde-apps/libktnef-${PVCUT}:6
+	>=kde-apps/mailcommon-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/ktexttemplate-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/prison-${KFMIN}:6
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6 )
+	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:6 )
+	markdown? ( app-text/discount:= )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		# not packaged (bug 911819), but if present leads to rust shenanigans
+		-DCMAKE_DISABLE_FIND_PACKAGE_Corrosion=ON # for adblock support, bug 940898
+		-DCMAKE_DISABLE_FIND_PACKAGE_KLLMCore=ON # utilities/alpaka, not packaged
+		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
+		$(cmake_use_find_package importwizard KPim6ImportWizard)
+		$(cmake_use_find_package markdown Discount)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "regex support for Sieve editor plugin" kde-misc/kregexpeditor
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/kdepim-meta/kdepim-meta-24.12.0-r1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-24.12.0-r1.ebuild
deleted file mode 100644
index 9d92898550b4..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="bogofilter clamav spamassassin"
-
-RDEPEND="
-	>=app-office/merkuro-${PV}:*
-	>=kde-apps/akonadi-${PV}:*
-	>=kde-apps/akonadiconsole-${PV}:*
-	>=kde-apps/akonadi-calendar-${PV}:*
-	>=kde-apps/akonadi-contacts-${PV}:*
-	>=kde-apps/akonadi-import-wizard-${PV}:*
-	>=kde-apps/akonadi-mime-${PV}:*
-	>=kde-apps/akonadi-search-${PV}:*
-	>=kde-apps/akregator-${PV}:*
-	>=kde-apps/calendarjanitor-${PV}:*
-	>=kde-apps/calendarsupport-${PV}:*
-	>=kde-apps/eventviews-${PV}:*
-	>=kde-apps/grantlee-editor-${PV}:*
-	>=kde-apps/grantleetheme-${PV}:*
-	>=kde-apps/incidenceeditor-${PV}:*
-	>=kde-apps/kaddressbook-${PV}:*
-	>=kde-apps/kalarm-${PV}:*
-	>=kde-apps/kcalutils-${PV}:*
-	>=kde-apps/kdepim-addons-${PV}:*
-	>=kde-apps/kdepim-runtime-${PV}:*
-	>=kde-apps/kidentitymanagement-${PV}:*
-	>=kde-apps/kimap-${PV}:*
-	>=kde-apps/kitinerary-${PV}:*
-	>=kde-apps/kldap-${PV}:*
-	>=kde-apps/kleopatra-${PV}:*
-	>=kde-apps/kmail-${PV}:*
-	>=kde-apps/kmail-account-wizard-${PV}:*
-	>=kde-apps/kmailtransport-${PV}:*
-	>=kde-apps/kmbox-${PV}:*
-	>=kde-apps/kmime-${PV}:*
-	>=kde-apps/konsolekalendar-${PV}:*
-	>=kde-apps/kontact-${PV}:*
-	>=kde-apps/kontactinterface-${PV}:*
-	>=kde-apps/korganizer-${PV}:*
-	>=kde-apps/kpimtextedit-${PV}:*
-	>=kde-apps/kpkpass-${PV}:*
-	>=kde-apps/ksmtp-${PV}:*
-	>=kde-apps/libgravatar-${PV}:*
-	>=kde-apps/libkdepim-${PV}:*
-	>=kde-apps/libkgapi-${PV}:*
-	>=kde-apps/libkleo-${PV}:*
-	>=kde-apps/libksieve-${PV}:*
-	>=kde-apps/libktnef-${PV}:*
-	>=kde-apps/mailcommon-${PV}:*
-	>=kde-apps/mailimporter-${PV}:*
-	>=kde-apps/mbox-importer-${PV}:*
-	>=kde-apps/messagelib-${PV}:*
-	>=kde-apps/mimetreeparser-${PV}:*
-	>=kde-apps/pim-data-exporter-${PV}:*
-	>=kde-apps/pim-sieve-editor-${PV}:*
-	>=kde-apps/pimcommon-${PV}:*
-	>=kde-misc/zanshin-${PV}:*
-"
-# Optional runtime dependencies: kde-apps/kmail
-RDEPEND="${RDEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	clamav? ( app-antivirus/clamav )
-	spamassassin? ( mail-filter/spamassassin )
-"
diff --git a/kde-apps/kdepim-meta/kdepim-meta-24.12.1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-24.12.1.ebuild
new file mode 100644
index 000000000000..2035e6f882f2
--- /dev/null
+++ b/kde-apps/kdepim-meta/kdepim-meta-24.12.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
+HOMEPAGE="https://apps.kde.org/kontact/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="bogofilter clamav spamassassin"
+
+RDEPEND="
+	>=app-office/merkuro-${PV}:*
+	>=kde-apps/akonadi-${PV}:*
+	>=kde-apps/akonadiconsole-${PV}:*
+	>=kde-apps/akonadi-calendar-${PV}:*
+	>=kde-apps/akonadi-contacts-${PV}:*
+	>=kde-apps/akonadi-import-wizard-${PV}:*
+	>=kde-apps/akonadi-mime-${PV}:*
+	>=kde-apps/akonadi-search-${PV}:*
+	>=kde-apps/akregator-${PV}:*
+	>=kde-apps/calendarjanitor-${PV}:*
+	>=kde-apps/calendarsupport-${PV}:*
+	>=kde-apps/eventviews-${PV}:*
+	>=kde-apps/grantlee-editor-${PV}:*
+	>=kde-apps/grantleetheme-${PV}:*
+	>=kde-apps/incidenceeditor-${PV}:*
+	>=kde-apps/kaddressbook-${PV}:*
+	>=kde-apps/kalarm-${PV}:*
+	>=kde-apps/kcalutils-${PV}:*
+	>=kde-apps/kdepim-addons-${PV}:*
+	>=kde-apps/kdepim-runtime-${PV}:*
+	>=kde-apps/kidentitymanagement-${PV}:*
+	>=kde-apps/kimap-${PV}:*
+	>=kde-apps/kitinerary-${PV}:*
+	>=kde-apps/kldap-${PV}:*
+	>=kde-apps/kleopatra-${PV}:*
+	>=kde-apps/kmail-${PV}:*
+	>=kde-apps/kmail-account-wizard-${PV}:*
+	>=kde-apps/kmailtransport-${PV}:*
+	>=kde-apps/kmbox-${PV}:*
+	>=kde-apps/kmime-${PV}:*
+	>=kde-apps/konsolekalendar-${PV}:*
+	>=kde-apps/kontact-${PV}:*
+	>=kde-apps/kontactinterface-${PV}:*
+	>=kde-apps/korganizer-${PV}:*
+	>=kde-apps/kpimtextedit-${PV}:*
+	>=kde-apps/kpkpass-${PV}:*
+	>=kde-apps/ksmtp-${PV}:*
+	>=kde-apps/libgravatar-${PV}:*
+	>=kde-apps/libkdepim-${PV}:*
+	>=kde-apps/libkgapi-${PV}:*
+	>=kde-apps/libkleo-${PV}:*
+	>=kde-apps/libksieve-${PV}:*
+	>=kde-apps/libktnef-${PV}:*
+	>=kde-apps/mailcommon-${PV}:*
+	>=kde-apps/mailimporter-${PV}:*
+	>=kde-apps/mbox-importer-${PV}:*
+	>=kde-apps/messagelib-${PV}:*
+	>=kde-apps/mimetreeparser-${PV}:*
+	>=kde-apps/pim-data-exporter-${PV}:*
+	>=kde-apps/pim-sieve-editor-${PV}:*
+	>=kde-apps/pimcommon-${PV}:*
+	>=kde-misc/zanshin-${PV}:*
+"
+# Optional runtime dependencies: kde-apps/kmail
+RDEPEND="${RDEPEND}
+	bogofilter? ( mail-filter/bogofilter )
+	clamav? ( app-antivirus/clamav )
+	spamassassin? ( mail-filter/spamassassin )
+"
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 0ae2333a6194..399fa4e2f95b 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,2 +1,2 @@
 DIST kdepim-runtime-24.08.3.tar.xz 1665232 BLAKE2B 71327b74c7c0c52d1998ab08b55cabb433776c6238370a9bf08c14b9f6f8b6965ae4bbe5947625e1e041f89271beb0ec67750265e4940eb1b854cb5e86a207fb SHA512 498b5f5dfee4678a1daab505ab4e98645107ba71752bee2cb858d78283b0ffc9e7091b54652aa2c5d9174512d46f6247fd3fb0fc75007c93bf97910f2a529d9e
-DIST kdepim-runtime-24.12.0.tar.xz 1664668 BLAKE2B a787e5319e04f7189f12832174228ebad6f99bba565c778d990e634df7af87fcb08f7f0c59b8b3f7d402b8c7b59ef6a52aade5884fcb95243f72d55670c9a548 SHA512 37577abc4d305a4a034ac2af7e84e55765cf63d0479a080e678cceba607bff8df89e6a46bd766987321af3f6fb1cd5568346f2f47cd160101106b484a38b843e
+DIST kdepim-runtime-24.12.1.tar.xz 1665144 BLAKE2B 63c2ec118749c0644a96584a90c41b8bebfeb27db3d6c57b895eb5024de092735c1a757da9a12c5c49aef6fa3a9818c113921bea8c650ee2162f9e5ae38d5b54 SHA512 3188752deefa02ec0882ee60a46c25340e7ffabcb553c700789522ad15481ce7d2d30a01715ec99a30982ec518cc1d0e97d1438b370de6c9cb8e471f4ed2737b
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-24.12.0-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-24.12.0-r1.ebuild
deleted file mode 100644
index 0490ef41efc4..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="activities speech"
-
-RESTRICT="test"
-
-# TODO kolab
-RDEPEND="
-	>=app-crypt/qca-2.3.7:2[qt6(+)]
-	dev-libs/cyrus-sasl:2
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,network,widgets,xml]
-	>=dev-qt/qtnetworkauth-${QTMIN}:6
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-calendar-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kimap-${PVCUT}:6
-	>=kde-apps/kldap-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmbox-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkgapi-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdav-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	activities? ( kde-plasma/plasma-activities:6 )
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=kde-apps/akonadi-${PVCUT}:6[tools]
-		>=kde-apps/kimap-${PVCUT}:6[test]
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
-		$(cmake_use_find_package speech Qt6TextToSpeech)
-		-DKDEPIM_RUN_AKONADI_TEST=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Etebase=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-24.12.1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-24.12.1.ebuild
new file mode 100644
index 000000000000..8627bfa35f99
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-24.12.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
+HOMEPAGE="https://apps.kde.org/kontact/"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities speech"
+
+RESTRICT="test"
+
+# TODO kolab
+RDEPEND="
+	>=app-crypt/qca-2.3.7:2[qt6(+)]
+	dev-libs/cyrus-sasl:2
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,network,widgets,xml]
+	>=dev-qt/qtnetworkauth-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-calendar-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kimap-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmbox-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkgapi-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdav-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6 )
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=kde-apps/akonadi-${PVCUT}:6[tools]
+		>=kde-apps/kimap-${PVCUT}:6[test]
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
+		$(cmake_use_find_package speech Qt6TextToSpeech)
+		-DKDEPIM_RUN_AKONADI_TEST=$(usex test)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Etebase=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-24.12.0.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-24.12.0.ebuild
deleted file mode 100644
index 3ec351220a24..000000000000
--- a/kde-apps/kdesdk-meta/kdesdk-meta-24.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
-HOMEPAGE="https://apps.kde.org/categories/development/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="cvs git mercurial perl php python subversion webengine"
-
-RDEPEND="
-	>=dev-build/dolphin-plugins-makefileactions-${PV}:*
-	>=dev-util/massif-visualizer-${PV}:*
-	>=kde-apps/kapptemplate-${PV}:*
-	>=kde-apps/kcachegrind-${PV}:*
-	>=kde-apps/kde-dev-scripts-${PV}:*
-	>=kde-apps/kde-dev-utils-${PV}:*
-	>=kde-apps/kdesdk-thumbnailers-${PV}:*
-	>=kde-apps/kompare-${PV}:*
-	>=kde-apps/libkomparediff2-${PV}:*
-	>=kde-apps/poxml-${PV}:*
-	>=kde-apps/umbrello-${PV}:*
-	cvs? ( >=kde-apps/cervisia-${PV}:* )
-	git? ( >=kde-apps/dolphin-plugins-git-${PV}:* )
-	mercurial? ( >=kde-apps/dolphin-plugins-mercurial-${PV}:* )
-	perl? ( >=dev-util/kio-perldoc-${PV}:* )
-	python? ( >=kde-apps/lokalize-${PV}:* )
-	subversion? ( >=kde-apps/dolphin-plugins-subversion-${PV}:* )
-	webengine? (
-		>=dev-util/kdevelop-${PV}:*
-		php? ( >=dev-util/kdevelop-php-${PV}:* )
-		python? ( >=dev-util/kdevelop-python-${PV}:* )
-	)
-"
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-24.12.1.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-24.12.1.ebuild
new file mode 100644
index 000000000000..8a2b9ec6428f
--- /dev/null
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-24.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
+HOMEPAGE="https://apps.kde.org/categories/development/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cvs git mercurial perl php python subversion webengine"
+
+RDEPEND="
+	>=dev-build/dolphin-plugins-makefileactions-${PV}:*
+	>=dev-util/massif-visualizer-${PV}:*
+	>=kde-apps/kapptemplate-${PV}:*
+	>=kde-apps/kcachegrind-${PV}:*
+	>=kde-apps/kde-dev-scripts-${PV}:*
+	>=kde-apps/kde-dev-utils-${PV}:*
+	>=kde-apps/kdesdk-thumbnailers-${PV}:*
+	>=kde-apps/kompare-${PV}:*
+	>=kde-apps/libkomparediff2-${PV}:*
+	>=kde-apps/poxml-${PV}:*
+	>=kde-apps/umbrello-${PV}:*
+	cvs? ( >=kde-apps/cervisia-${PV}:* )
+	git? ( >=kde-apps/dolphin-plugins-git-${PV}:* )
+	mercurial? ( >=kde-apps/dolphin-plugins-mercurial-${PV}:* )
+	perl? ( >=dev-util/kio-perldoc-${PV}:* )
+	python? ( >=kde-apps/lokalize-${PV}:* )
+	subversion? ( >=kde-apps/dolphin-plugins-subversion-${PV}:* )
+	webengine? (
+		>=dev-util/kdevelop-${PV}:*
+		php? ( >=dev-util/kdevelop-php-${PV}:* )
+		python? ( >=dev-util/kdevelop-python-${PV}:* )
+	)
+"
diff --git a/kde-apps/kdesdk-thumbnailers-common/Manifest b/kde-apps/kdesdk-thumbnailers-common/Manifest
index ef5cf890767b..8bdaed34aad5 100644
--- a/kde-apps/kdesdk-thumbnailers-common/Manifest
+++ b/kde-apps/kdesdk-thumbnailers-common/Manifest
@@ -1,2 +1,2 @@
 DIST kdesdk-thumbnailers-24.08.3.tar.xz 27172 BLAKE2B 6875c84272b0117ab71570ca5cbc2fef8805c8379efa72e9534e0f5eb4c90aa6032453c127c6878bb2f0ad41338f65387125375f71e489f951a1907cfed7af57 SHA512 2dfab42ed2519cd914b29e9cbbdd90698aa30bf64902d51613188865d2333f5886deb5ae1d7b183d7a1e6a7edaae10068af3b23f229f207d1122c8ec73d8fb08
-DIST kdesdk-thumbnailers-24.12.0.tar.xz 27272 BLAKE2B 938369923edec06c922b5d0b481bcc747f1f35801dddb2a04607b9602fa5df533ed221345c3c0c5c159f10067961d36c3fb492c7773565cf1703111417fbdefe SHA512 78d2f232e955220d02fb729be15a324592fd7dba8418459ae60bc7f1980d54a8074ee7cb99039099b387c9ac12b99fab4d378dc29e9ab8dc062fd87ccfd2f732
+DIST kdesdk-thumbnailers-24.12.1.tar.xz 27272 BLAKE2B 6d9e6a2545b5feb14bf433d3d3d68fdce391d09ce9e28239dac874ead386fecd8dad1bbcf8facfeb41b1eafbe2f7ceb3ed01ee39e746ca409ffe0abf785a79de SHA512 924608f22fd89d865ad49c21540315f7060530393e50ab63eb80d67f20c77e214d038e048a371a5fb53956c57a3bc068eb6e73e952548d9029a30cba6981faf4
diff --git a/kde-apps/kdesdk-thumbnailers-common/kdesdk-thumbnailers-common-24.12.0.ebuild b/kde-apps/kdesdk-thumbnailers-common/kdesdk-thumbnailers-common-24.12.0.ebuild
deleted file mode 100644
index db6e416df16b..000000000000
--- a/kde-apps/kdesdk-thumbnailers-common/kdesdk-thumbnailers-common-24.12.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN/-common/}"
-KFMIN=5.115.0
-inherit ecm-common gear.kde.org
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	!<kde-apps/kdesdk-thumbnailers-24.05.2-r1:5
-	!<kde-apps/kdesdk-thumbnailers-24.05.2-r10:6
-"
-
-ECM_INSTALL_FILES=(
-	po_thumbnailer/pocreatorsettings.kcfg:\${KDE_INSTALL_KCFGDIR}
-)
diff --git a/kde-apps/kdesdk-thumbnailers-common/kdesdk-thumbnailers-common-24.12.1.ebuild b/kde-apps/kdesdk-thumbnailers-common/kdesdk-thumbnailers-common-24.12.1.ebuild
new file mode 100644
index 000000000000..10506bb4900c
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers-common/kdesdk-thumbnailers-common-24.12.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN/-common/}"
+KFMIN=5.115.0
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	!<kde-apps/kdesdk-thumbnailers-24.05.2-r1:5
+	!<kde-apps/kdesdk-thumbnailers-24.05.2-r10:6
+"
+
+ECM_INSTALL_FILES=(
+	po_thumbnailer/pocreatorsettings.kcfg:\${KDE_INSTALL_KCFGDIR}
+)
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index ef5cf890767b..8bdaed34aad5 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,2 +1,2 @@
 DIST kdesdk-thumbnailers-24.08.3.tar.xz 27172 BLAKE2B 6875c84272b0117ab71570ca5cbc2fef8805c8379efa72e9534e0f5eb4c90aa6032453c127c6878bb2f0ad41338f65387125375f71e489f951a1907cfed7af57 SHA512 2dfab42ed2519cd914b29e9cbbdd90698aa30bf64902d51613188865d2333f5886deb5ae1d7b183d7a1e6a7edaae10068af3b23f229f207d1122c8ec73d8fb08
-DIST kdesdk-thumbnailers-24.12.0.tar.xz 27272 BLAKE2B 938369923edec06c922b5d0b481bcc747f1f35801dddb2a04607b9602fa5df533ed221345c3c0c5c159f10067961d36c3fb492c7773565cf1703111417fbdefe SHA512 78d2f232e955220d02fb729be15a324592fd7dba8418459ae60bc7f1980d54a8074ee7cb99039099b387c9ac12b99fab4d378dc29e9ab8dc062fd87ccfd2f732
+DIST kdesdk-thumbnailers-24.12.1.tar.xz 27272 BLAKE2B 6d9e6a2545b5feb14bf433d3d3d68fdce391d09ce9e28239dac874ead386fecd8dad1bbcf8facfeb41b1eafbe2f7ceb3ed01ee39e746ca409ffe0abf785a79de SHA512 924608f22fd89d865ad49c21540315f7060530393e50ab63eb80d67f20c77e214d038e048a371a5fb53956c57a3bc068eb6e73e952548d9029a30cba6981faf4
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.12.0.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.12.0.ebuild
deleted file mode 100644
index 9c9c9ee62ca3..000000000000
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Thumbnail generator for PO files"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	sys-devel/gettext
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/${PN}-common-${PV}
-"
-
-ECM_REMOVE_FROM_INSTALL=(
-	/usr/share/config.kcfg/pocreatorsettings.kcfg
-)
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-}
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.12.1.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.12.1.ebuild
new file mode 100644
index 000000000000..ba24fd7c6222
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Thumbnail generator for PO files"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	sys-devel/gettext
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/${PN}-common-${PV}
+"
+
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/config.kcfg/pocreatorsettings.kcfg
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-24.12.1.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-24.12.1.ebuild
new file mode 100644
index 000000000000..2f4244c0777d
--- /dev/null
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-24.12.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
+HOMEPAGE="https://apps.kde.org/categories/utilities/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="7zip gpg lrz plasma rar +webengine"
+
+RDEPEND="
+	>=app-cdr/dolphin-plugins-mountiso-${PV}:*
+	>=app-cdr/isoimagewriter-${PV}:*
+	>=app-crypt/keysmith-${PV}
+	>=app-misc/francis-${PV}
+	>=dev-libs/kweathercore-${PV}:*
+	>=kde-apps/ark-${PV}:*
+	>=kde-apps/filelight-${PV}:*
+	>=kde-apps/kate-${PV}:*
+	>=kde-apps/kbackup-${PV}:*
+	>=kde-apps/kcalc-${PV}:*
+	>=kde-apps/kcharselect-${PV}:*
+	>=kde-apps/kdebugsettings-${PV}:*
+	>=kde-apps/kdf-${PV}:*
+	>=kde-apps/kteatime-${PV}:*
+	>=kde-apps/ktimer-${PV}:*
+	>=kde-apps/kwalletmanager-${PV}:*
+	>=kde-apps/sweeper-${PV}:*
+	>=kde-apps/yakuake-${PV}:*
+	>=kde-misc/kweather-${PV}:*
+	>=kde-misc/markdownpart-${PV}:*
+	>=sys-block/partitionmanager-${PV}:*
+	>=sys-libs/kpmcore-${PV}:*
+	gpg? ( >=kde-apps/kgpg-${PV}:* )
+	plasma? ( >=kde-misc/kclock-${PV} )
+	webengine? (
+		>=app-editors/ghostwriter-${PV}
+		>=kde-apps/kimagemapeditor-${PV}:*
+	)
+"
+# Optional runtime deps: kde-apps/ark
+RDEPEND="${RDEPEND}
+	7zip? ( app-arch/p7zip )
+	lrz? ( app-arch/lrzip )
+	rar? ( || (
+		app-arch/rar
+		app-arch/unrar
+		app-arch/unar
+	) )
+"
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index 391823e47868..61a3f794180c 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,2 +1,2 @@
 DIST kdf-24.08.3.tar.xz 480060 BLAKE2B 8b385a868f4582a8c25d218d0f53c78e1d3d3080dde5145f72b3897ceeb0fffa8760addcde87bedb70f0489b0640bde3e1cd7f85c6260a8b25552cbed8841bc9 SHA512 2b88b28dfd19950a37ceec6067548419fc884e034bdc77a9739b3b668a8b6a4762f1d19689e60163f85537724287bfb24f1916e4632cd7427ecccd491082f1f4
-DIST kdf-24.12.0.tar.xz 479492 BLAKE2B 7368bf0e3553221f420ad4bc420846b6a83472caa9f258bf266e69bec21afc1e2a81a528a03c52edf381a0019c9a9e0a5cda47976b6d9e8974d737fff2109ed2 SHA512 cd77f486d53f30877e4c31a8ca59da71642112cd543546aee02c5de6869ea49c1bb167f5bef6c69180fa5b3198595162dba005837a0556f84e5804a9c6de9153
+DIST kdf-24.12.1.tar.xz 479600 BLAKE2B c12fea866a832b357b4acff6b29045821fa3fa6d9e5cebdc79f47a1cf1214277417e53e26d783a0a0506e9e9c2458799634523a595aaf44421a07dfea18190a3 SHA512 cf1f0312fa36211422e653c85783e59a05bfab6517b588e5bdaa3ee5da5d32ab060b9740240b728735d94b0df18c85819b4c8f8632685a4c5ff7ce78adf773ea
diff --git a/kde-apps/kdf/kdf-24.12.0.ebuild b/kde-apps/kdf/kdf-24.12.0.ebuild
deleted file mode 100644
index f6027ab906d0..000000000000
--- a/kde-apps/kdf/kdf-24.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE free disk space utility"
-HOMEPAGE="https://apps.kde.org/kdf/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-"
-BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
diff --git a/kde-apps/kdf/kdf-24.12.1.ebuild b/kde-apps/kdf/kdf-24.12.1.ebuild
new file mode 100644
index 000000000000..8d990bb281f9
--- /dev/null
+++ b/kde-apps/kdf/kdf-24.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE free disk space utility"
+HOMEPAGE="https://apps.kde.org/kdf/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index 2b517621977c..ecccfae77896 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,2 +1,2 @@
 DIST kdialog-24.08.3.tar.xz 146700 BLAKE2B 10257d5a3707bb17f1b3ded7a82aee3f1521af77e25824c9e9d57317dd71077f8d49221eced3ed4ef0b446309f490ad85a2d7d11334c25f4f0f5d92ea0c4a7f3 SHA512 3f38994abbbe8b6bb84063c1261dbd2221037f28a86cebd0cf30e355478bffa3da0fb1b32ed0a6b1d7da01197629c21d0a849332d66b0bb3ca82f91da8e73a0f
-DIST kdialog-24.12.0.tar.xz 146932 BLAKE2B 019e4edb9f90d13188cf239f2ddb7362e70297f5c60f52cd66b7a3223a4587b9820a59608435d7dba685a76e13a1203bc2dd2c83b08f41ed49e64649af57b218 SHA512 44489c175776353c50fe3afdda8ba2a27f05d62cf1b74a16971160994ecd547d78fe7d9ec60e525d38a04bafd8e9a60b57c968947abbfb42315d525df4246925
+DIST kdialog-24.12.1.tar.xz 146932 BLAKE2B f9cecd69bfad45494c11062fce4941f8356b31c448ba03d7cf998b6d6f8f7f2b9a55383d334c200621af28e42ca4f82eca499022a64c4cfabb1bde5589c016f0 SHA512 8d389e0ab7602e63baedd6408013f05ec7731c1a6b356c8c5f875a848265876c20cc5c9efbc1fafbd2903ff6efafe3c01fd1114a4cc1ed049a33e98af261230a
diff --git a/kde-apps/kdialog/kdialog-24.12.0.ebuild b/kde-apps/kdialog/kdialog-24.12.0.ebuild
deleted file mode 100644
index 4b7991d9e954..000000000000
--- a/kde-apps/kdialog/kdialog-24.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
-HOMEPAGE="
-	https://develop.kde.org/docs/administration/kdialog/
-	https://invent.kde.org/utilities/kdialog
-"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="X"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITHOUT_X11=$(usex !X)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kdialog/kdialog-24.12.1.ebuild b/kde-apps/kdialog/kdialog-24.12.1.ebuild
new file mode 100644
index 000000000000..db0bfda63e80
--- /dev/null
+++ b/kde-apps/kdialog/kdialog-24.12.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
+HOMEPAGE="
+	https://develop.kde.org/docs/administration/kdialog/
+	https://invent.kde.org/utilities/kdialog
+"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITHOUT_X11=$(usex !X)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index 333b6026250b..9756f2cfa47b 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,2 +1,2 @@
 DIST kdiamond-24.08.3.tar.xz 4672828 BLAKE2B dd367223545ce6da6a0da034ff46d8113454633d0d3e9a0cb10538cc361df597bb58b7c9dc79172f2637d24b2f9861c5b479b736fa9bcc70e246ce132e4954ff SHA512 9c14ddcf3b240e73cba6419562cbb006b5fe84b5bd956fc0b17bff55fa68cf8df73de99b40037798b2c1c388f65fe0961b7b651a9844e0ebe0ad772f9ffefed7
-DIST kdiamond-24.12.0.tar.xz 4672644 BLAKE2B 538df7cadf87fdc7859dcdcf517b81338e64ad1d75ddd098b4f24c16cb1caa08ed6c6bbe017f1a83382c4b1f0ea3f6dd2afd834c39aa9005ecc16103841f5507 SHA512 9378c9098f88bb2b97d7204703b2296f08c955a0c82c03073246866b1bc833a6a5bcdd7fa087fb35bbc153aed14992420a34c8f1c669e1bc3d5ddf3772c60b70
+DIST kdiamond-24.12.1.tar.xz 4672888 BLAKE2B 54a5ba41281e20594f207cfad560408474d827684fbb6df9b02267437a4d0e4f503570579755de1566a587e5eb77e8077da51e949b283307a781a932d17fc527 SHA512 7fdbadd855461d6e9ecfcd709cae19d3f71765684520c36fcb3c1cda201bb7e2c287b3bf0562850661af6219e6db09f713d8a4d73f3dc1ab027f7e0763501c91
diff --git a/kde-apps/kdiamond/kdiamond-24.12.0.ebuild b/kde-apps/kdiamond/kdiamond-24.12.0.ebuild
deleted file mode 100644
index 534923d8d0a6..000000000000
--- a/kde-apps/kdiamond/kdiamond-24.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Single player three-in-a-row game"
-HOMEPAGE="https://apps.kde.org/kdiamond/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdiamond/kdiamond-24.12.1.ebuild b/kde-apps/kdiamond/kdiamond-24.12.1.ebuild
new file mode 100644
index 000000000000..cd8580b17e1c
--- /dev/null
+++ b/kde-apps/kdiamond/kdiamond-24.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Single player three-in-a-row game"
+HOMEPAGE="https://apps.kde.org/kdiamond/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index cfb3a5fc9853..040cced4e4ec 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,2 +1,2 @@
 DIST keditbookmarks-24.08.3.tar.xz 260512 BLAKE2B a7dc93ccc05b0b6ccbbf6982a68622305f1e359b2568e388d2e76bca8c6279cb78d60e966fc121b4a409c91bade2cadc9a2402f015c2a43bfcfcd8b8f4dcd096 SHA512 38aac584a84d9c2434dfe20d35ae2df13d2b085612182d2c665107a328aef014003e6f7ba44871cf80e1b72892981f29af7980f92e33e89292998d086f54b827
-DIST keditbookmarks-24.12.0.tar.xz 260580 BLAKE2B 143da719943fae4a7843e0c8ed989bace0e81caa775803f2015b5bb9634f7b7daeebf342ae74ac536f6c73fcaf39f9beec3ffbe5afdb5f12f468bc56299745fc SHA512 380f02a30b0037dffc89b935aa7284af2da53fb085e08bb94ae4e52aefa83f5d1977e93fefa2772b8350b66e2a1256d482c9ef025d8e5ba220f6b1ef3c6858b4
+DIST keditbookmarks-24.12.1.tar.xz 260600 BLAKE2B 39452b9dec47d7d93b07f46502d956be32538686663dd512a0079cc213aaee426c414480f4451ceb3558a03f0a3aa8f64ac0c4ed0d9714e89cb65b2a93a972d9 SHA512 9d140c679a60f4ba89685c85f8737673fdb3b513d80cc0b38b44056849c41ce588651dc3ee8c12f3f5ce86265c0ba801c8263e3be7a1ef4c4ff3dc3272ce233e
diff --git a/kde-apps/keditbookmarks/keditbookmarks-24.12.0.ebuild b/kde-apps/keditbookmarks/keditbookmarks-24.12.0.ebuild
deleted file mode 100644
index e23f9cddb67c..000000000000
--- a/kde-apps/keditbookmarks/keditbookmarks-24.12.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Bookmarks editor based on KDE Frameworks"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+man"
-
-# TODO: X handling?
-# 51228bab29102d03f2f973ca5c34500de8d908a8
-# fa227b2f1c94c11486cc696c728c8ac4781d4ed8
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use man ; then
-		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
-	fi
-}
diff --git a/kde-apps/keditbookmarks/keditbookmarks-24.12.1.ebuild b/kde-apps/keditbookmarks/keditbookmarks-24.12.1.ebuild
new file mode 100644
index 000000000000..8459473a9893
--- /dev/null
+++ b/kde-apps/keditbookmarks/keditbookmarks-24.12.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Bookmarks editor based on KDE Frameworks"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+man"
+
+# TODO: X handling?
+# 51228bab29102d03f2f973ca5c34500de8d908a8
+# fa227b2f1c94c11486cc696c728c8ac4781d4ed8
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use man ; then
+		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
+	fi
+}
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index f428125d1bb1..f3937e977391 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,2 +1,2 @@
 DIST kfind-24.08.3.tar.xz 329148 BLAKE2B 534eb1724424db1f02d00f8eac6f26767782387c5db6aeb8457a58238a7ff74202ed74864bad959ae718c339e77351a9f6c298ba016ea474fdaa5b979c83fd98 SHA512 bc8324c93f0188180e8a0f45db9c4bf14c12c9300663b0b1e8dfa31c3abb148a5879e5b96520444e80ab71fb82e98f2dc18a7d55d6357b4bf3929e68c31960a4
-DIST kfind-24.12.0.tar.xz 330376 BLAKE2B 34c85270fc588620aa3d2fa1f37ed6e664d6fa60be907f8204cbd9db22031e03f3a036c439e362b140da9d5e4f8c18e3d69842761ae40cdd1d3e2e2bd53f5ed3 SHA512 a12eb2a64f066a7904365637d0bbb4ab24869684a1499b13820fd3ad6d8f5d3c7c5cd7fc732f08146b788d31ff84fe1cf7fc3d85f9cad067c855b643587c665d
+DIST kfind-24.12.1.tar.xz 330468 BLAKE2B e9d37930623aa450d88d0d19174334a42543d89b0510d88a78207b6b9646a96bf3f66fcad5a9c050a88237a6b8817e92c8d7d16d4d7166581db08059978440e5 SHA512 1407c449e47bd393b7472657d7db99b2be255cd820fd815f4121f1f533087954f433ae6ee588e04751aa4ed46b4fd1989c34b0d1e5111b27dad93799506dff64
diff --git a/kde-apps/kfind/kfind-24.12.0.ebuild b/kde-apps/kfind/kfind-24.12.0.ebuild
deleted file mode 100644
index eacdaeb0399d..000000000000
--- a/kde-apps/kfind/kfind-24.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="File finder utility based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kfind/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kfilemetadata-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
-"
diff --git a/kde-apps/kfind/kfind-24.12.1.ebuild b/kde-apps/kfind/kfind-24.12.1.ebuild
new file mode 100644
index 000000000000..3827fcdf04fd
--- /dev/null
+++ b/kde-apps/kfind/kfind-24.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="File finder utility based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/kfind/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kfilemetadata-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index 2e0ac097db70..161c8218fbb3 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1 +1,2 @@
 DIST kfloppy-23.04.3.tar.xz 245236 BLAKE2B 688f802d2f7458231b1047cff4a938f9d9de48ff0d578e597ecbaee34aff354bc7508779615f5e088015fb8c6d1dcae6d982763d748468206fa36d37430a2b7e SHA512 550784b7c08ff71e6154f8d14b4d16d2987b7a32d0c27b185c8ede7d077b3125bc9c6f9a969af074f1f16b0f41e7bc4cfc667a7be93861d78e3e759dec1f8424
+DIST kfloppy-23.07.70_pre20241222-7bc87b6b.tar.gz 375802 BLAKE2B a209f173859312a1a71e07d8c33338ce63ec99fe006c7549d5e86a75015e1b5fd48098146a967bc202dea6ac64d7492df4f9c269e6dad72eddf49d33f548ce8c SHA512 d7e2c7f101b569992586bf3134e4b275c24d2e667241c3b07b35ba7c4e8591fab25c480bc3a9ab55c8e74afe66a177bba46077eea953e0bc66cea3e0b40a851a
diff --git a/kde-apps/kfloppy/kfloppy-23.07.70_pre20241222.ebuild b/kde-apps/kfloppy/kfloppy-23.07.70_pre20241222.ebuild
new file mode 100644
index 000000000000..c25e6e367058
--- /dev/null
+++ b/kde-apps/kfloppy/kfloppy-23.07.70_pre20241222.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=7bc87b6bb62ad143e98f0d2c18d8a9a59039d25c
+ECM_HANDBOOK="optional"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Straightforward graphical means to format 3.5\" and 5.25\" floppy disks"
+HOMEPAGE="https://apps.kde.org/kfloppy/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5
+"
diff --git a/kde-apps/kfloppy/metadata.xml b/kde-apps/kfloppy/metadata.xml
index febef5a49b75..e3be2d951e35 100644
--- a/kde-apps/kfloppy/metadata.xml
+++ b/kde-apps/kfloppy/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=kfloppy</bugs-to>
 		<remote-id type="kde-invent">utilities/kfloppy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index 8701a1b0bcbe..8cd368dbefa7 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,2 +1,2 @@
 DIST kfourinline-24.08.3.tar.xz 745988 BLAKE2B ce7b97e40d1b8728c3f2c41c32f8f873e584c4c8b303e86972b36b70e152459f17c91275e7346e17c912cb6ed57dcfa35cd8ab4c103c55366d2b2f2b7d76a877 SHA512 fc8a77ac09b95e5190b230fb1dc3ee9e76477387c7d8197c67383b87d81b3eab311da7b8bd1e31e23ac4e81709d1c947ed44717d67f401f4d50d7f8ad3a7b7f2
-DIST kfourinline-24.12.0.tar.xz 746016 BLAKE2B bccb97fa519d5bb1d73eefd7338d4e59276f50df8a396b72943462cca1fbb4d047f5c4ada266928a064ac67d284f4d2a0742a13a495f50d34a363fb739d82edf SHA512 0f94e4af4dee33ac6001b072c93cfb1b9949b6f0fee5b7896cdddcb00157b0516e26cd26ee9532835aaa8acff59a70393550a22bc540570f549a173271956a52
+DIST kfourinline-24.12.1.tar.xz 746068 BLAKE2B 065914fe9272bc92453c377942b24a63c0f2c2a80032c389c8c7e77d4a3642188d6e2ccfdef487f4510d662d2dd22fbbc16ab386781099e2779dc3a6e56f7e7b SHA512 34daacd1735ae158b89fc745e4b1da4821151f90112e5f772c05fc79db0231add2a79449d2decc02f67be6b9473e216b5bcc2a75930a89bb3db7237e1742626d
diff --git a/kde-apps/kfourinline/kfourinline-24.12.0.ebuild b/kde-apps/kfourinline/kfourinline-24.12.0.ebuild
deleted file mode 100644
index 542b15894f84..000000000000
--- a/kde-apps/kfourinline/kfourinline-24.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE four-in-a-row game"
-HOMEPAGE="https://apps.kde.org/kfourinline/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kdnssd-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfourinline/kfourinline-24.12.1.ebuild b/kde-apps/kfourinline/kfourinline-24.12.1.ebuild
new file mode 100644
index 000000000000..3af00b3a851b
--- /dev/null
+++ b/kde-apps/kfourinline/kfourinline-24.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE four-in-a-row game"
+HOMEPAGE="https://apps.kde.org/kfourinline/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdnssd-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index 39be60640dd1..8af47ab5040d 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,2 +1,2 @@
 DIST kgeography-24.08.3.tar.xz 12425088 BLAKE2B 510378e4b65aff770e4b206f03b5e8560fb36a1c4bc918d3d94ee53bc3283eec8861f5e5f8e15d99d6e61aa163b0c3b178b75d8b04bd5e48b6681dc7843f8cb9 SHA512 4dd04394c934e34086ab84d0487f7b0be1de399de213fa04b83bc9304e0a9358b67502bb576e60eddc09237b558587c61b3868404869b47588ca00dacd604b34
-DIST kgeography-24.12.0.tar.xz 12424768 BLAKE2B 49df93a8ef134b29f9ec7d67b93c3847a540743608c51991d86b025c8226b20c446d38cf6f515ed579240e5a0d60f8bbd5e9a7539a8ec2fc2fcc454b5e50f2fb SHA512 b27ead81d74cedbd6e3ac4f40a59b7ba6044d77c3541ad00902d6de7bd8ed534061034ffaead3037dbea802f88fec5940ac663781396adb518a34c852497d458
+DIST kgeography-24.12.1.tar.xz 12425672 BLAKE2B 1793e28f3377d7a74381a6a04066857a433a67a15920d6ef7519c0f7a28c5248c6a958693f62945765aa2ca35d643c9bd37fa7a1441d89bbb9e6965932b8b09e SHA512 a05b2af8ee647e7161c6dbf75fff6a27f8092d6f50c656649d7b1a290f221c65c86ca22f36a648a9cde0ae3720e8b3af18bc5976f00c128bd673b5e3469de98b
diff --git a/kde-apps/kgeography/kgeography-24.12.0.ebuild b/kde-apps/kgeography/kgeography-24.12.0.ebuild
deleted file mode 100644
index f54b9c49a648..000000000000
--- a/kde-apps/kgeography/kgeography-24.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Geography learning tool"
-HOMEPAGE="https://apps.kde.org/kgeography/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kgeography/kgeography-24.12.1.ebuild b/kde-apps/kgeography/kgeography-24.12.1.ebuild
new file mode 100644
index 000000000000..b3b730da7230
--- /dev/null
+++ b/kde-apps/kgeography/kgeography-24.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Geography learning tool"
+HOMEPAGE="https://apps.kde.org/kgeography/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index d09dae6330c7..c45d12eeb438 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,2 +1,2 @@
 DIST kget-24.08.3.tar.xz 4914932 BLAKE2B d47049e0ef6fa3f71c190b64629cf6679211f7f53e4d274d84f4b600a4540ff3eeafba28054a80fee946aded8d11a94f85cb53778b85a92c274e8ccce732b7ce SHA512 9dc0e9d868e4816c501a1c5bd772532dff07836889f64d1a678de4d8488d6359c2ddeea38cddc15ade103dbed1b410d4c242ea7b18d6674c596798bb018fd723
-DIST kget-24.12.0.tar.xz 4913388 BLAKE2B 3766dc2c9c2c999496c4854369bfcf5c7e75acd9121929748306026c155ca60594fd5f7f0fab9df1004459fd8cd772594c685adcb57d16678c44faa25a33af3e SHA512 a72e943e72f59f117c6096c0fa20bcc7e1adc3791464c8d6ae1785c0fb9b041b3a4a969ab223a45b6242947c8ba7438e51ac327ffc871909c370d0bcfdb0800e
+DIST kget-24.12.1.tar.xz 4913560 BLAKE2B 1be3eb1eb004752b5ed1fb6e5a8d5c52a8a6f5103321cc87db4ae911db5c4b4fea680b66ab2c377886e6129a9e15261c74ee308d291aeaa6fd2fbe565c470020 SHA512 262050771ed534e9e286dc87bb73f5c7d2f225ed2c121095d8dd978f39a8806b5655e3cf25e81545afd416dc89fc53b32cb528d1510b34fa20be9faeb4573e3e
diff --git a/kde-apps/kget/kget-24.12.0.ebuild b/kde-apps/kget/kget-24.12.0.ebuild
deleted file mode 100644
index 17d57841b4c6..000000000000
--- a/kde-apps/kget/kget-24.12.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Advanced download manager by KDE"
-HOMEPAGE="https://apps.kde.org/kget/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="bittorrent gpg mms sqlite"
-
-RDEPEND="
-	>=app-crypt/qca-2.3.7:2[qt6(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets,xml]
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-	bittorrent? ( net-libs/libktorrent:6 )
-	gpg? ( >=app-crypt/gpgme-1.23.1-r1:=[qt6] )
-	mms? ( media-libs/libmms )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package bittorrent KTorrent6)
-		$(cmake_use_find_package gpg Gpgmepp)
-		$(cmake_use_find_package gpg QGpgmeQt6)
-		$(cmake_use_find_package mms LibMms)
-		$(cmake_use_find_package sqlite SQLite3)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 756817: schedulertest fails, see also upstream commit 45735cfa
-	# filedeletertest hangs.
-	local myctestargs=(
-		-E "(schedulertest|filedeletertest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/kget/kget-24.12.1.ebuild b/kde-apps/kget/kget-24.12.1.ebuild
new file mode 100644
index 000000000000..919c7e1663f4
--- /dev/null
+++ b/kde-apps/kget/kget-24.12.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Advanced download manager by KDE"
+HOMEPAGE="https://apps.kde.org/kget/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="bittorrent gpg mms sqlite"
+
+RDEPEND="
+	>=app-crypt/qca-2.3.7:2[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets,xml]
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	bittorrent? ( net-libs/libktorrent:6 )
+	gpg? ( >=app-crypt/gpgme-1.23.1-r1:=[qt6] )
+	mms? ( media-libs/libmms )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package bittorrent KTorrent6)
+		$(cmake_use_find_package gpg Gpgmepp)
+		$(cmake_use_find_package gpg QGpgmeQt6)
+		$(cmake_use_find_package mms LibMms)
+		$(cmake_use_find_package sqlite SQLite3)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 756817: schedulertest fails, see also upstream commit 45735cfa
+	# filedeletertest hangs.
+	local myctestargs=(
+		-E "(schedulertest|filedeletertest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index 50e89f89757f..0ee3717f3d2f 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,2 +1,2 @@
 DIST kgoldrunner-24.08.3.tar.xz 4342380 BLAKE2B 06d0e47330107fe92254c4a3b926ddcf282720e0d505b7a43bd855747b4b03e6afddece7f4285cb951d74d9bece4aff0f564b4aa91b1afdb5a28d2677834ac61 SHA512 1e841ccb215b92b944c1e63f23ab70ab177ddfdcfafb8d81e823ebd8c6bb6c21fbca7c59ffbc0f6fd285d53ef0eb0c3e7fd3b45fe68c63150d4b3145ba0531d3
-DIST kgoldrunner-24.12.0.tar.xz 4343972 BLAKE2B c5abd69d6f8ec170d7648d90a6cdc67fed94ac601e6e58f63500450e27ea9bc5717a864da0a6a433166e73fdef9d4d18e3ec4f0ccdc8b53b2560658d25836c62 SHA512 b9f5bab3cec667849048e57e85b29ee9cfd09e38fadbf0a9e57de3b2c25c82375c0774ab4df55fe1ffd9912e8609a907b1c8bf1fbcab6c3babdc3807647d11b5
+DIST kgoldrunner-24.12.1.tar.xz 4345264 BLAKE2B d991a1f58c2d2150788bd8c14b84c76eefcdeb1c3d275cf25b0724d52e226c5f1efd8bfb46845a7bc9bfb9be6a0711670fcac69e997e199b26371d93d89a7a57 SHA512 a2e066c09b1230269088a96e1a693012f276a4558ba4b01e9515751e7ffb744413da71dae480be0e4f633b57e2b545c29b81f871bbf561ac65f2083f725ea03d
diff --git a/kde-apps/kgoldrunner/kgoldrunner-24.12.0.ebuild b/kde-apps/kgoldrunner/kgoldrunner-24.12.0.ebuild
deleted file mode 100644
index 16d7abcf02b4..000000000000
--- a/kde-apps/kgoldrunner/kgoldrunner-24.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Game of action and puzzle solving by KDE"
-HOMEPAGE="https://apps.kde.org/kgoldrunner/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtsvg-${QTMIN}:6
-"
-# TODO: 7zip
-BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/kgoldrunner/kgoldrunner-24.12.1.ebuild b/kde-apps/kgoldrunner/kgoldrunner-24.12.1.ebuild
new file mode 100644
index 000000000000..676687295b88
--- /dev/null
+++ b/kde-apps/kgoldrunner/kgoldrunner-24.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Game of action and puzzle solving by KDE"
+HOMEPAGE="https://apps.kde.org/kgoldrunner/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	media-libs/libsndfile
+	media-libs/openal
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtsvg-${QTMIN}:6
+"
+# TODO: 7zip
+BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index ca825ac9851b..f745336a402d 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,2 +1,2 @@
 DIST kgpg-24.08.3.tar.xz 3029480 BLAKE2B f989ef6035ee4bb5b10071257f31d8b250e24de1656130a58972e98a958408c61c532461ba0391e722cd1850ba414c213c630d2ddcc2fac5d88ea0c1bd5fb7be SHA512 f974c9bf6ede4766478bffccf5f5b9e6e33e60ecc91ecb1d11cb281001453725f0314e13c98102752c985c2acdbeea83c1d7ce2b6f41a69075867a96d82be0bb
-DIST kgpg-24.12.0.tar.xz 3032072 BLAKE2B b6ddf1581056d4df740a4a968242ba64c2947ee44659abade6a9e4f3fb234bae7d931afb9a5ae0846535f97607079a57aabba54eeb76f5bcdd80559778206845 SHA512 efb3d8173a422820e6c829def86673dd08a7f1b143e4fb4b607c7a5f46ee88ffc55529fa1eff3e2e9732b883a49ce06e7b09c5e19d49f721a15a9e24d1a5a3bc
+DIST kgpg-24.12.1.tar.xz 3031780 BLAKE2B 635f844370abe74140b395b6a7b659ac53eaa375ed0666a10d4ac8df8a657e48b30d0fe7e118b20c0a450b9e07d8eda3868d7e8d513324c1215e85d629f684cc SHA512 724830cc3059ae00accc7974e243c45a1bf098deb719d9f3790c5550b33e9042df017e86c7850af246d27462838f40b52abbcdd3c14f090dd92e1e9ed53668e6
diff --git a/kde-apps/kgpg/kgpg-24.12.0.ebuild b/kde-apps/kgpg/kgpg-24.12.0.ebuild
deleted file mode 100644
index 2ab06456ceab..000000000000
--- a/kde-apps/kgpg/kgpg-24.12.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="gpg"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
-HOMEPAGE="https://apps.kde.org/kgpg/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-DEPEND="${COMMON_DEPEND}
-	app-crypt/gpgme
-"
-RDEPEND="${COMMON_DEPEND}
-	app-crypt/gnupg
-"
diff --git a/kde-apps/kgpg/kgpg-24.12.1.ebuild b/kde-apps/kgpg/kgpg-24.12.1.ebuild
new file mode 100644
index 000000000000..ea8d2daa334d
--- /dev/null
+++ b/kde-apps/kgpg/kgpg-24.12.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="gpg"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
+HOMEPAGE="https://apps.kde.org/kgpg/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+DEPEND="${COMMON_DEPEND}
+	app-crypt/gpgme
+"
+RDEPEND="${COMMON_DEPEND}
+	app-crypt/gnupg
+"
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index 7e9cc793bdc5..4883d68e8ac3 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,2 +1,2 @@
 DIST khangman-24.08.3.tar.xz 7015276 BLAKE2B 65ea564958495a2a3669b5b8ac17de1190c613b222be1ca2cbc09a3d6074901e1c820a256eee64698541b5e5e35fe6c70c5127f8b173bce7ee579b8eef89ccdd SHA512 df77df8a1961fa5faa9cc01ae0cfa898c4e51b46e678fc258fe0840dbf43dded8cae42e55e693a71f5841cfe77c922a93ac528839cc747d0ce60cc3d5b7195f9
-DIST khangman-24.12.0.tar.xz 7022316 BLAKE2B dbf7709c8b0ee6a8234df13039fe4e9a38177833874937bcb9f26bcb211089c2d81caa28ab76dad41be8501c0dbb3e152b69df77ad528dcacc41fb24ca3af5f7 SHA512 4e525ecdf38f6482e6a973bd7c627a8940025cc7eebe04c4c99b9843c4825c0e9d6603604e533399328d0a70cd495efe5be2ae0b134c3db737e9187a15b160ed
+DIST khangman-24.12.1.tar.xz 7022688 BLAKE2B b2cbfc9d8dedd8285ba7b6a734c9f7d8de692e7b70723baf96942440cb0a79c24e3c0f7c4e55f1fb0e540c7b5f53832b92130f366246a06d27719ac110a62f57 SHA512 3fbf81f9cbb3e08abba4c89769023ed9b3ff8a28ca610f87fc22785300917194cc8794f03b26cc53f5f019a4e3bd3b9ab91d7b2ac761714715fd89a0e24c0cc2
diff --git a/kde-apps/khangman/khangman-24.12.0.ebuild b/kde-apps/khangman/khangman-24.12.0.ebuild
deleted file mode 100644
index b3ec089f7c7f..000000000000
--- a/kde-apps/khangman/khangman-24.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Classical hangman game by KDE"
-HOMEPAGE="https://apps.kde.org/khangman/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkeduvocdocument-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtmultimedia-${QTMIN}:6
-	>=kde-apps/kdeedu-data-${PVCUT}:*
-"
diff --git a/kde-apps/khangman/khangman-24.12.1.ebuild b/kde-apps/khangman/khangman-24.12.1.ebuild
new file mode 100644
index 000000000000..95ffe8993c54
--- /dev/null
+++ b/kde-apps/khangman/khangman-24.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Classical hangman game by KDE"
+HOMEPAGE="https://apps.kde.org/khangman/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkeduvocdocument-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=kde-apps/kdeedu-data-${PVCUT}:*
+"
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index 0bf463bd941f..662cb935a0fe 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,2 +1,2 @@
 DIST khelpcenter-24.08.3.tar.xz 4240520 BLAKE2B 845e9408d0c5382e7503f84340bd34e0b91b9b726503607c0922f32c4135de90cd36c75ddd04304d5c66b992b0745bb5aa6d02c7342cf585742370d0413f142f SHA512 96eb7954ee77c6146882e89ea172d7b6912474cb31d526b28ed12d3db14724c2ea51ce2d380895fe49bff73081ea02c2541ddaf31e94542903c9930a60fbdf48
-DIST khelpcenter-24.12.0.tar.xz 4239432 BLAKE2B 386dc678263287b972674305874075b882a20112abd7792ba932951ebfbf31f54ac9a63a934269f5d53c40c6475f0b5956c848bdc4412027f3afa9f31b61ea11 SHA512 3b1f8ec2e066ac270455f743786c35fcf2085c0a8966de1484c4c46b02f9fa1c5cf1d97a0f58875edd5f5eb13c1910d08158de5a5cf353058e59537bbd49f5bc
+DIST khelpcenter-24.12.1.tar.xz 4239380 BLAKE2B ff517f68da5fb262500d5ae5cc3bad1bd36ec164d5a66743a5e28982a95beeab810caf02f1fae14df6e163b5cd99cbedd0b5558fa5bbb590f00d37925dd92fd0 SHA512 383251b337d4b5cda00dd3b20b5ed257ad45255ee2aa03343cd7b2734931becaf9222c3bd4eb683d6cbe287ed58479ed209ef553e7824cc47f2fb8f7fbec56bf
diff --git a/kde-apps/khelpcenter/khelpcenter-24.12.0.ebuild b/kde-apps/khelpcenter/khelpcenter-24.12.0.ebuild
deleted file mode 100644
index eaf475822cd6..000000000000
--- a/kde-apps/khelpcenter/khelpcenter-24.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Application to read documentation for KDE Plasma, Applications, Utilities"
-HOMEPAGE="https://apps.kde.org/khelpcenter/ https://userbase.kde.org/KHelpCenter"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	dev-libs/libxml2
-	dev-libs/xapian:=
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kdoctools-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6[handbook]
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktexttemplate-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/khelpcenter/khelpcenter-24.12.1.ebuild b/kde-apps/khelpcenter/khelpcenter-24.12.1.ebuild
new file mode 100644
index 000000000000..96bcc51a0385
--- /dev/null
+++ b/kde-apps/khelpcenter/khelpcenter-24.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Application to read documentation for KDE Plasma, Applications, Utilities"
+HOMEPAGE="https://apps.kde.org/khelpcenter/ https://userbase.kde.org/KHelpCenter"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	dev-libs/libxml2
+	dev-libs/xapian:=
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdoctools-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6[handbook]
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexttemplate-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index 1056f2a0b9e7..7add619c16cc 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,2 +1,2 @@
 DIST kidentitymanagement-24.08.3.tar.xz 195592 BLAKE2B f4e191eba245dacc0d0dfad538d97822623ec4fd7f31b3be0c1549001a777c4687c2dc7ae413f200d55b5a408aa38e0786f1d104db2369919909cd623f34ce0b SHA512 ac241507ee2741f6be37a4371d1073c2c3d04a71012671c9bb63bfcbb85bbe332592aa44a55751c49c40a8af6d34604f4dee0f31e13c8dabe0e8267c5fba3925
-DIST kidentitymanagement-24.12.0.tar.xz 196792 BLAKE2B 4ec8de4a347714679340b695f3c3fa27ad12d8963b5b02c87f6ab13cb6e6d634870de7a270a0539bbf1c02a67628a2c8c68d56d3de46b3118f5cb930d9fe4471 SHA512 5ae4f093e45979b4338110245dfa9767c0430e692d38fe87c29a33417cfa519963646a6d43e7a02e04cc98f5c5163a486bb6138880e3328580c0df71464493fa
+DIST kidentitymanagement-24.12.1.tar.xz 196784 BLAKE2B a82edcc08b5a0bc2e94708a21e73332bb79306453c3879d71cf8ced49944a45c8f08c309e06e877e5788b1418556d71e019c6ee98f2700568fe3eec4f7be6df8 SHA512 fe5f41a8478fba1982c7a5e58d38944a0bfeb7ab9577850f2a035632ec60c58c333d25ec8ae9b79c7362bc922d9e974ea3b8e6d098e21e74c9c5df9a7e5d1e43
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-24.12.0-r1.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-24.12.0-r1.ebuild
deleted file mode 100644
index 5dc75c495d60..000000000000
--- a/kde-apps/kidentitymanagement/kidentitymanagement-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for managing identitites"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="
-	>=dev-libs/kirigami-addons-1.0:6
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-apps/kpimtextedit-${PVCUT}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-24.12.1.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-24.12.1.ebuild
new file mode 100644
index 000000000000..e797db5e44b5
--- /dev/null
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-24.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for managing identitites"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-libs/kirigami-addons-1.0:6
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-apps/kpimtextedit-${PVCUT}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index 3e590963574d..7c74031548b0 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,2 +1,2 @@
 DIST kig-24.08.3.tar.xz 3246660 BLAKE2B 4cde22746e9aa6a0830c9029c02642a04d493c1fbbc3b2a3394d1d43fbe6e84e887b40ef3f6bb3de671a3c12d2906177d2a8cf1cf6eefedcf4a8ed899b95b56e SHA512 1a75e110ae395ae3467678cd97e6a076f8adac3e2d8ba389e58da44a539cdfe02c5a21a7d13f0ef67e5720a1d1f910516a49ccf9d4e2f0bc9dec361992405fd3
-DIST kig-24.12.0.tar.xz 3246700 BLAKE2B da7e958d9bf42c176c840478607075032ba786308e49a7aa98d96a99b34f726c95d6fe7f3e248ec352816b3818dd2a9a8d0d1a74e7fc49d89e5876625a15017a SHA512 928d8f41394853328fb68be44ebcb708e9d20f65a4d6e85864c6ed1e11c5486762fed906dca26fdf465b45d61cc4565da29e76a4648dc584d5bd18813069dcb0
+DIST kig-24.12.1.tar.xz 3253576 BLAKE2B 8c42c657c88a68a168968edcec83a7aac67cd2c197880a39b78bca42504c823105291f3d9c8ad4a9177a7cf07a24bc297e029dd74a94ebdc9d0ce3e49c8111e2 SHA512 fdfd77a28d63a75338ae2d35ec8eccf43b086e927599550869b500f0b3f3303a13ec77c4640c10114d5164f654c029776336fc6896439c6e8a45ef922ea4d31e
diff --git a/kde-apps/kig/kig-24.12.0.ebuild b/kde-apps/kig/kig-24.12.0.ebuild
deleted file mode 100644
index b167d96a3b19..000000000000
--- a/kde-apps/kig/kig-24.12.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{10..13} )
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit python-single-r1 ecm gear.kde.org
-
-DESCRIPTION="KDE Interactive Geometry tool"
-HOMEPAGE="https://apps.kde.org/kig/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="geogebra scripting"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
-	scripting? (
-		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-20.08.70-cmake-boostpython.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON}
-		$(cmake_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake_use_find_package scripting Boost)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kig/kig-24.12.1.ebuild b/kde-apps/kig/kig-24.12.1.ebuild
new file mode 100644
index 000000000000..e78e3cbb7a3b
--- /dev/null
+++ b/kde-apps/kig/kig-24.12.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{10..13} )
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit python-single-r1 ecm gear.kde.org
+
+DESCRIPTION="KDE Interactive Geometry tool"
+HOMEPAGE="https://apps.kde.org/kig/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="geogebra scripting"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
+	scripting? (
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-20.08.70-cmake-boostpython.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_prepare() {
+	ecm_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON}
+		$(cmake_use_find_package geogebra Qt5XmlPatterns)
+		$(cmake_use_find_package scripting Boost)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index b5a46759b68f..4395ed94019d 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,2 +1,2 @@
 DIST kigo-24.08.3.tar.xz 4832520 BLAKE2B a4685748619f2c9771ec62e130d38fe357af54e24eeb4703897457b5315ceefb5c1ca4dd0d8df889c0e6144bb4bd9264ea40869898026c999bde2a98226524c3 SHA512 cb318e47e73a6cae8e90caacdd993d5184f064ce8bbd9f7de12cf667eedd5412266f2b0770c382e737f1e2c0a1047d4b1802f4f52e63d03339f6856affdce695
-DIST kigo-24.12.0.tar.xz 4833052 BLAKE2B 701bc4836c24e92e9160d6e51eaebb9f4e7afd044b69258d63fbfca5bb96b1da1f114265dcc9086a77a2c48b8b5f041525afde6f0098c32cf20d64b4af70bb4b SHA512 cd83cdc5972760725a7f6779556422beca4e788eeb7f018d5c18c7b4c2d08f7c0121cb64576fe20c4227232168fc041c39ca43a981d9b1bdd33d8ec707fdfd42
+DIST kigo-24.12.1.tar.xz 4833176 BLAKE2B 163db91617df5b921ed0c39be8a68979e03da16353b003b4b2774de53906eb2149d10dbdac3b9860325ddf4627b4d65f1129e3aa9c34cdb3b1b19941117730aa SHA512 a1a8c38e791449d3b76377503914f0c6dcf4da6bbdf9494bbdb532d0d0642b4930c900a40b4fe0b5314e1bd8b744a6c3efa462c5a95cc2c85962528cb29b4244
diff --git a/kde-apps/kigo/kigo-24.12.0.ebuild b/kde-apps/kigo/kigo-24.12.0.ebuild
deleted file mode 100644
index 5d54ef71585e..000000000000
--- a/kde-apps/kigo/kigo-24.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Go game by KDE"
-HOMEPAGE="https://apps.kde.org/kigo/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	games-board/gnugo
-"
-# TODO: 7zip
-BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/kigo/kigo-24.12.1.ebuild b/kde-apps/kigo/kigo-24.12.1.ebuild
new file mode 100644
index 000000000000..427bc154ec7e
--- /dev/null
+++ b/kde-apps/kigo/kigo-24.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Go game by KDE"
+HOMEPAGE="https://apps.kde.org/kigo/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	games-board/gnugo
+"
+# TODO: 7zip
+BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index 9406f9114bd7..9d95c56d3aee 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,2 +1,2 @@
 DIST killbots-24.08.3.tar.xz 1173236 BLAKE2B 66ab122cdbc2fd4b097b026aa80fe0dd926c4f4722a28ff8674f2d1ea555a18e429502ca019655c1a09794b6dbce324631a64700743f97060783af13fad3ae92 SHA512 b09a0dabf52432ab749176f62cfb7167edd6f5cabba0c2f7fda06f5c174ad552f008fdd02611819315ea075b753163ee823978d65dd9ce68091700eec98bd7ac
-DIST killbots-24.12.0.tar.xz 1173108 BLAKE2B 8608743c25e0016aa18849b8539df23cbc442d36461b684e8fe67831dad9663005464ec3503d269ae36906df64acb784f392e6d16d6f76824a2f5ed5bd628e96 SHA512 a5fd7fe76a83b035f10909b313b45729d2e70782be768ecb7b43451fa4200c0aa6130c3c2e4e6eca7082d1b2613e2d4c1cf531c1df512bc58cca62fef367bcdf
+DIST killbots-24.12.1.tar.xz 1173124 BLAKE2B 277ee8ad2d766273a59eb51ac89d288d85fc1e5765a0a97202e3b84bdfd6e975f6253f30a9cc047aff30d9c0e61243e02a8c8be5536140445ac6210f7782cffc SHA512 c5f0ebaff53b2e720fb3e6ba40c86d5c146c28795d1741aa6142ff2182cdf4b8216eb4b4476b6961feb757059b58b69db5d138977a45bd013d28085b83ffb436
diff --git a/kde-apps/killbots/killbots-24.12.0.ebuild b/kde-apps/killbots/killbots-24.12.0.ebuild
deleted file mode 100644
index 5cdd308ee5d7..000000000000
--- a/kde-apps/killbots/killbots-24.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Kill the bots or they kill you!"
-HOMEPAGE="https://apps.kde.org/killbots/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-# TODO: || ( 7zip gzip )
-BDEPEND="app-alternatives/gzip"
-
-DOCS=()
diff --git a/kde-apps/killbots/killbots-24.12.1.ebuild b/kde-apps/killbots/killbots-24.12.1.ebuild
new file mode 100644
index 000000000000..51482d2e3794
--- /dev/null
+++ b/kde-apps/killbots/killbots-24.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Kill the bots or they kill you!"
+HOMEPAGE="https://apps.kde.org/killbots/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+# TODO: || ( 7zip gzip )
+BDEPEND="app-alternatives/gzip"
+
+DOCS=()
diff --git a/kde-apps/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index b882f42c5ff3..9ee6b9bf7b3e 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,2 +1,2 @@
 DIST kimagemapeditor-24.08.3.tar.xz 1073944 BLAKE2B 8f108a66176c0a16cce2bd5fbfa5041e81b02b2fa82763ae27d6203fb126585a8d8ded759a0100c9637994da620ac5659a044856ca6b68efeb36d9532eee6b6b SHA512 0280ed128f534e8e86de263010ef2a2d83f2ff2e1a37f05381a985adad4155399ebc8e84bf67167f29365ed70ad0bbca4a84e85a428ade360eeb0a87e2ed3e1e
-DIST kimagemapeditor-24.12.0.tar.xz 1074232 BLAKE2B 83835f5c6c5700c945336b5b1954dba90d166ff5f747585c564f66a1d9e28198579192adb68d6083ea558ca4d34db937abca9bef04942eb71f301820c38f400f SHA512 eaa5846251f2d50911a4a17518e34eb5421fe786556b63146cbb481f5972b56190375065b455bff2aae8a6e1766133ad00d10f16032b6032c488a1efd80ae430
+DIST kimagemapeditor-24.12.1.tar.xz 1074732 BLAKE2B 0a5ef6ab10bd9464dc968ed54189d1b2223251e4c3ad51b2a986fb44b33556834a6d56bd90157cfb33a4438ae9fba4c687b82f819f392ab4f219e422e27fa6bf SHA512 d4487da579dc1ab66e02e09cd6008e246ec8742fb8966083d6030a7302ce5503c585efdea5cb9ef2e105460c1b788f81ee18be29a48340665d9bd0c764127025
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-24.12.0.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-24.12.0.ebuild
deleted file mode 100644
index 04521c203ab3..000000000000
--- a/kde-apps/kimagemapeditor/kimagemapeditor-24.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Generator of HTML image maps"
-HOMEPAGE="https://apps.kde.org/kimagemapeditor/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtwebengine-${QTMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-24.12.1.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-24.12.1.ebuild
new file mode 100644
index 000000000000..c67090d7e6e5
--- /dev/null
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-24.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Generator of HTML image maps"
+HOMEPAGE="https://apps.kde.org/kimagemapeditor/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtwebengine-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index 0a85172bb46e..37b189aeab8f 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,2 +1,2 @@
 DIST kimap-24.08.3.tar.xz 132356 BLAKE2B 1f9001d933415edc39c29c1d1baa21322520f9d08f88a22291dabf302f8c6fc13cdecf5752395feada310968b7636ab980e46f523eddadabed7a724f38ba0809 SHA512 97d76ba2c8656273028e90d88ca8668ed6f7122096a945278d7edd476f050d97e9f818a300cfb51e81a30d68c669619d834bd264a5aae6798594dac296047a6a
-DIST kimap-24.12.0.tar.xz 132396 BLAKE2B 067b184e57bba1cf3a2a3ee13340496a1ff049efad2bca08ce3cca0e631e2f4ccdd6d4e48192379a1e30bd0f9cb6bc20f21355a1422e711c50d0870685507f1d SHA512 fc8fea3b7f9e046d26a4fc4b7d6f64b18950e6eff6baebcd6749c6d9b7f47a45e0e11ca7b10d78a1ef5b29569a9afca2425bb46e3e2065093809a77ac463fe88
+DIST kimap-24.12.1.tar.xz 132376 BLAKE2B 53d799107f7b7b0a0e32d292f4fdc91658b64611014273a8bfd8e64d6135ade7ad8bff88393d0b6ef72b5c8c9b949459ac052524fe1589f2d46ce047bc89f57e SHA512 4138db2fe2541da05c4aa8e17d625faa965fed9a719095e81992b5eaf90e8988cb523b04aa56dfc805838b25e4d9ec589d88a6ac40786b93f744d7318dc245f7
diff --git a/kde-apps/kimap/kimap-24.12.0-r1.ebuild b/kde-apps/kimap/kimap-24.12.0-r1.ebuild
deleted file mode 100644
index 0755210e579a..000000000000
--- a/kde-apps/kimap/kimap-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for interacting with IMAP servers"
-HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RDEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-"
-# TODO: Convince upstream not to install stuff with tests
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtbase-${QTMIN}:6[network] )
-"
-
-src_test() {
-	# tests cannot be run in parallel #605586
-	local myctestargs=(
-		-j1
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/kimap/kimap-24.12.1.ebuild b/kde-apps/kimap/kimap-24.12.1.ebuild
new file mode 100644
index 000000000000..2b2eacfa7797
--- /dev/null
+++ b/kde-apps/kimap/kimap-24.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for interacting with IMAP servers"
+HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RDEPEND="
+	dev-libs/cyrus-sasl
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+# TODO: Convince upstream not to install stuff with tests
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtbase-${QTMIN}:6[network] )
+"
+
+src_test() {
+	# tests cannot be run in parallel #605586
+	local myctestargs=(
+		-j1
+	)
+	ecm_src_test
+}
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 3a4f5f6ed383..c56c02af9944 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,2 +1,2 @@
 DIST kio-extras-24.08.3.tar.xz 3482788 BLAKE2B 43db34b60e64106b99a68743bb9c22f0435e50b1983ac82edead74bbf1ae685884d193a8555692db9e7521c608043f9347267af52fd7bfe61e0ddc2552732fe7 SHA512 a4f570e39273ed004949a2b647cd7ece316097d28d7d7a49bb87c0ed275dcfd9ff3893628dfd0c7a9bf1f1fd8f506dd1f0c885b7b8aa768978ed1f649cea1253
-DIST kio-extras-24.12.0.tar.xz 3514376 BLAKE2B e6c680eded58317cd82ed40233ac9b4f5eee5f2522bdc7e1697bddec2e6c845f4354689a7cd76d81c240b6757749f86ecde95da3eddb7214c675a8b51b7ca32f SHA512 3652480badc91d01f3faf2ae86d86d9dbc69c6ae7c3b16acd5c2d7434398e56910b7bb27cdb5a1661fafe470a03bd55ea24e70047a740f682da45ca395bfc719
+DIST kio-extras-24.12.1.tar.xz 3515000 BLAKE2B 03fb943a2e2a6c2899b974088a09002a16a58662245c0db383dfeaf0cad8813c4cf1c760ce689498e94f32b0720327e363ea7007122c0baa51f6d8fec0dd9947 SHA512 2a6cd80e04d1559806fffe86c91d56d74e3e2751907a4c748ba12000466da5e11eecc243e03f43a1062ff2962b70bf52e5171cdc214b31714c44fbc3030c30bd
diff --git a/kde-apps/kio-extras/kio-extras-24.12.0.ebuild b/kde-apps/kio-extras/kio-extras-24.12.0.ebuild
deleted file mode 100644
index 892cd21fded8..000000000000
--- a/kde-apps/kio-extras/kio-extras-24.12.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org optfeature
-
-DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
-HOMEPAGE="https://invent.kde.org/network/kio-extras"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="activities ios +man mtp openexr phonon samba +sftp taglib X"
-
-# requires running Plasma environment
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/qcoro
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	kde-apps/libkexiv2:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kdnssd-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
-	activities? (
-		>=dev-qt/qtbase-${QTMIN}:6[sql]
-		kde-plasma/plasma-activities:6
-		kde-plasma/plasma-activities-stats:6
-	)
-	ios? (
-		app-pda/libimobiledevice:=
-		app-pda/libplist:=
-	)
-	mtp? ( >=media-libs/libmtp-1.1.16:= )
-	openexr? ( media-libs/openexr:= )
-	phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] )
-	samba? (
-		net-fs/samba[client]
-		>=net-libs/kdsoap-2.2.0:=[qt6(+)]
-		>=net-libs/kdsoap-ws-discovery-client-0.3.0
-	)
-	sftp? ( net-libs/libssh:=[sftp] )
-	taglib? ( >=media-libs/taglib-1.11.1:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcursor
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kio-extras:5[-kf6compat(-)]
-	!kde-apps/kio-extras-kf5:5
-	!<kde-frameworks/kio-5.116.0-r2:5
-	!kde-frameworks/kio-trash-desktop-file:5
-	>=kde-frameworks/kded-${KFMIN}:6
-"
-BDEPEND="man? ( dev-util/gperf )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_ACTIVITIES=$(usex activities)
-		$(cmake_use_find_package ios IMobileDevice)
-		$(cmake_use_find_package ios PList)
-		$(cmake_use_find_package man Gperf)
-		$(cmake_use_find_package mtp Libmtp)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package phonon Phonon4Qt6)
-		$(cmake_use_find_package samba Samba)
-		$(cmake_use_find_package sftp libssh)
-		$(cmake_use_find_package taglib Taglib)
-		-DWITHOUT_X11=$(usex !X)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	optfeature "alternative filename search backend" sys-apps/ripgrep
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kio-extras/kio-extras-24.12.1.ebuild b/kde-apps/kio-extras/kio-extras-24.12.1.ebuild
new file mode 100644
index 000000000000..1838978668a1
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-24.12.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
+HOMEPAGE="https://invent.kde.org/network/kio-extras"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="activities ios +man mtp openexr phonon samba +sftp taglib X"
+
+# requires running Plasma environment
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/qcoro
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	kde-apps/libkexiv2:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdnssd-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+	activities? (
+		>=dev-qt/qtbase-${QTMIN}:6[sql]
+		kde-plasma/plasma-activities:6
+		kde-plasma/plasma-activities-stats:6
+	)
+	ios? (
+		app-pda/libimobiledevice:=
+		app-pda/libplist:=
+	)
+	mtp? ( >=media-libs/libmtp-1.1.16:= )
+	openexr? ( media-libs/openexr:= )
+	phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] )
+	samba? (
+		net-fs/samba[client]
+		>=net-libs/kdsoap-2.2.0:=[qt6(+)]
+		>=net-libs/kdsoap-ws-discovery-client-0.3.0
+	)
+	sftp? ( net-libs/libssh:=[sftp] )
+	taglib? ( >=media-libs/taglib-1.11.1:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kio-extras:5[-kf6compat(-)]
+	!kde-apps/kio-extras-kf5:5
+	!<kde-frameworks/kio-5.116.0-r2:5
+	!kde-frameworks/kio-trash-desktop-file:5
+	>=kde-frameworks/kded-${KFMIN}:6
+"
+BDEPEND="man? ( dev-util/gperf )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ACTIVITIES=$(usex activities)
+		$(cmake_use_find_package ios IMobileDevice)
+		$(cmake_use_find_package ios PList)
+		$(cmake_use_find_package man Gperf)
+		$(cmake_use_find_package mtp Libmtp)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package phonon Phonon4Qt6)
+		$(cmake_use_find_package samba Samba)
+		$(cmake_use_find_package sftp libssh)
+		$(cmake_use_find_package taglib Taglib)
+		-DWITHOUT_X11=$(usex !X)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	optfeature "alternative filename search backend" sys-apps/ripgrep
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index d044a4f726f1..b4c88783cfa4 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,2 +1,2 @@
 DIST kiriki-24.08.3.tar.xz 374536 BLAKE2B 88bbeebbdb161b5563623023be2de8f64d931d13257d5b7a15eb1ca591856316eccf1ae452b4ccbeec691d5e0f7a6eb73c8e561121006aaf4f90b46ea7ac7f80 SHA512 2d31178359fe0d78b5cf5ad2611d80455776da549165fd28c34304761e7d7cd4369877f57d31a6e9380b2204a88b8646907305ec1fe5b952a8f7ed7f5554e478
-DIST kiriki-24.12.0.tar.xz 374484 BLAKE2B a04e8c35f1b8477e57726775a1983dccec538b1dac1dfa33cd6a5d6c7d4d009f602ba5cf5eeec850969f1557763f758cf5f69e5efc0ce01e2887c6a057ef1e52 SHA512 58d1e845ec91740cdf632390d1c55595909f0a3d80d2774d9e2d385f68f7de3e6c6831a4345739096efd47087f5cf06dc49e4d6a5f5b217b8aa911e0302043f7
+DIST kiriki-24.12.1.tar.xz 374472 BLAKE2B b1741ad4b31883ee9cc6476e1075419c9464b7ddf924e6370b846d39dd373fc9d67b7daf4ffd48be0a35b7e33dc0f62d62b7a6fe5abd396ca203afe16a9b490b SHA512 5a69558fe3ce4cc6ab7a8ec9ca221941ab27d2ff2fe0d3a7f510f50ad6df3d60375fb4dcbdaf8e8148c80b94c40ea882fe1c13587e8443ffedb4a3280eedc7c0
diff --git a/kde-apps/kiriki/kiriki-24.12.0.ebuild b/kde-apps/kiriki/kiriki-24.12.0.ebuild
deleted file mode 100644
index b3656aa758df..000000000000
--- a/kde-apps/kiriki/kiriki-24.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="An addictive and fun dice game"
-HOMEPAGE="https://apps.kde.org/kiriki/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kiriki/kiriki-24.12.1.ebuild b/kde-apps/kiriki/kiriki-24.12.1.ebuild
new file mode 100644
index 000000000000..b6bb82f297be
--- /dev/null
+++ b/kde-apps/kiriki/kiriki-24.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="An addictive and fun dice game"
+HOMEPAGE="https://apps.kde.org/kiriki/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index 532f401daa34..97adf53b2818 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,2 +1,2 @@
 DIST kiten-24.08.3.tar.xz 11313104 BLAKE2B 39d90da84f7277278c17846187f93a9cfed5946de44c813a0d75cca112acf86f80e9ff4f338c33d47f7659a11d81dae8cb16eae45908ed3c926035756910d503 SHA512 1d38bf7d17a594d9493c13b119f92328b7cdbc343201008f414a93b6acd7f0d288264859a91379abf5a8abdff17b1b354cf6b4643ad7b6e9537894ed20b1caf6
-DIST kiten-24.12.0.tar.xz 11316240 BLAKE2B 6354a6d9ffd8db2c602520f083e75a84b7141f600f2e3051585d8681f078583b21633b7a0a075eb9e94a0128977ea04a98eb9f181e995bbc1e96cd1f5723f9b0 SHA512 979da1d799931bd35989fb126d1b66a58adbe12c3b303015d6a2b032954383e7646735a3fb658ff093ae4d1a2d8abcbfb4b125216a997fa0112809a1f77d950c
+DIST kiten-24.12.1.tar.xz 11313488 BLAKE2B 373596c8f5739abff6fbd018fbbaf8b3ef59173a9206be8a9c3105279fd4197519d17a808235bdff3a388f215cfa87483c7bc392d47d758192168ae896d0f05e SHA512 16eb9fcfd6c545e669f5561dfc1d516f0ef06149a0978ce8c8102d79324842ddcd5bfb84ada300cfb623b1b993575290574699403c1065b2c8446bb6e6f4bc89
diff --git a/kde-apps/kiten/kiten-24.12.0.ebuild b/kde-apps/kiten/kiten-24.12.0.ebuild
deleted file mode 100644
index 2927ab857f37..000000000000
--- a/kde-apps/kiten/kiten-24.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE Japanese dictionary and reference"
-HOMEPAGE="https://apps.kde.org/kiten/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	media-fonts/kanjistrokeorders
-"
-
-src_prepare() {
-	ecm_src_prepare
-	cmake_comment_add_subdirectory data/font
-}
diff --git a/kde-apps/kiten/kiten-24.12.1.ebuild b/kde-apps/kiten/kiten-24.12.1.ebuild
new file mode 100644
index 000000000000..05a16213e9d2
--- /dev/null
+++ b/kde-apps/kiten/kiten-24.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE Japanese dictionary and reference"
+HOMEPAGE="https://apps.kde.org/kiten/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	media-fonts/kanjistrokeorders
+"
+
+src_prepare() {
+	ecm_src_prepare
+	cmake_comment_add_subdirectory data/font
+}
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index 158920e6145d..43373520658e 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,2 +1,2 @@
 DIST kitinerary-24.08.3.tar.xz 1992056 BLAKE2B b1e146c3056debd184fc7ca25c401be6de79fb02300b83681d6d8c4d0455de27e829a9305c435b48ba38699eecb24015dc49a1f3854c21591b332a24abf0757d SHA512 6f4fbe88a7ac14e90e2811661c2f8d747f4789e588ccbc109aefb2a5c958efb49e5d30fe2faf8b6384d8dd7ed5b2d7720872209d624be21c11a1e3c19942da0f
-DIST kitinerary-24.12.0.tar.xz 2004820 BLAKE2B 1de13a4b888e56f060ed918b284fa72667e8c174a26ae6199d707e7eeca95493f5a80645125ff51b75af221e490315b3f0e8687a5019bbdccdeeda886b195397 SHA512 7a019ab55b7c165f58fac7e1bc42f08a8e0fea3273ddf578c714c6cf8b1280259789ea899187c3836d1493ec816e8f6244734a8fca8c2549c96e9db46dc34f9d
+DIST kitinerary-24.12.1.tar.xz 2001520 BLAKE2B 8e69cd5d327ba967e9e88169525078fa8f660a6a1f9bedc8e72cca5c17b20bca87ffb93eb5f0c455cc8405fe816184258063e5dc58829259eb647b70e2bfad94 SHA512 e309f3fcf5bf644889f5d0f9ec6a190a325bc075b99f3ba6b809ef43d2167c12cb48252c73dda8c9bc085de4befb08e1b6ff233d489949a18adc7bfb5647a709
diff --git a/kde-apps/kitinerary/kitinerary-24.12.0-r1.ebuild b/kde-apps/kitinerary/kitinerary-24.12.0-r1.ebuild
deleted file mode 100644
index 510f004dc353..000000000000
--- a/kde-apps/kitinerary/kitinerary-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test" # bug 907957, 851000, 739732...
-
-DEPEND="
-	>=app-text/poppler-23.12.0:=[qt6]
-	dev-libs/libphonenumber
-	dev-libs/libxml2:2
-	dev-libs/openssl:=
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/kpkpass-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=media-libs/zxing-cpp-1.1.1:=
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-BDEPEND="x11-misc/shared-mime-info"
-
-src_configure() {
-	local mycmakeargs=(
-		# sci-geosciences/osmctools; TODO: useful at all?
-		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kitinerary/kitinerary-24.12.1.ebuild b/kde-apps/kitinerary/kitinerary-24.12.1.ebuild
new file mode 100644
index 000000000000..9c1784845da6
--- /dev/null
+++ b/kde-apps/kitinerary/kitinerary-24.12.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
+HOMEPAGE="https://apps.kde.org/kontact/"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test" # bug 907957, 851000, 739732...
+
+DEPEND="
+	>=app-text/poppler-23.12.0:=[qt6]
+	dev-libs/libphonenumber
+	dev-libs/libxml2:2
+	dev-libs/openssl:=
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/kpkpass-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=media-libs/zxing-cpp-1.1.1:=
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+BDEPEND="x11-misc/shared-mime-info"
+
+src_configure() {
+	local mycmakeargs=(
+		# sci-geosciences/osmctools; TODO: useful at all?
+		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index 0df9a8934e14..21ec08d8e46b 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,2 +1,2 @@
 DIST kjumpingcube-24.08.3.tar.xz 346412 BLAKE2B c1b5d9b9b03c25ec58bc05d2404536eec409359472bb673678357ac25c7d66ef4d5a4a128049c28a34cfcd3bd214dd361b467c76682348b51c0bd1f239b7224e SHA512 ca4d0bb7da5ee2312b3e9acf8ce844b7581967fad6ef805de83e7817d04fd9c31b270782ccbfaa5da38036de17ab68d19968cd9b1a52ff1f20909af7156065ac
-DIST kjumpingcube-24.12.0.tar.xz 346572 BLAKE2B f0552dac4dc0fef988eea093a6f12ec72b304a24971270bc452566d2f3a3761bb35d7051135cbf6464dc6c177f6919a4b1eea07db94c45783d20ecd42e2cef40 SHA512 1b2917b4f1b54df33833e43f08fdd418dbb71dc2fea0f80735651c036897df57bb35b017d73d118c2f72edf27c08a672df1f8a2c4da6f4975ebcc80009c99c7c
+DIST kjumpingcube-24.12.1.tar.xz 346496 BLAKE2B 8fbbf3c78ae634d773a0d5c43a603ff0087f2ab366e4f6076b26591b519f43dee3479dc6f95d119cfd3793b7e9e58a4e107fb5206542cc1bc194d9a9c6f2badd SHA512 da2f08fbeea3e3f4bc129c6dcb09d862001e7317cbb12a5c583a42393e13a0d92c2196844d23587a5556416713cc3494aad9f4e7b54f4581e65c3de7f4b3eb53
diff --git a/kde-apps/kjumpingcube/kjumpingcube-24.12.0.ebuild b/kde-apps/kjumpingcube/kjumpingcube-24.12.0.ebuild
deleted file mode 100644
index dab5931559cf..000000000000
--- a/kde-apps/kjumpingcube/kjumpingcube-24.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Tactical one or two player game"
-HOMEPAGE="https://apps.kde.org/kjumpingcube/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-# TODO: || ( 7zip gzip )
-BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/kjumpingcube/kjumpingcube-24.12.1.ebuild b/kde-apps/kjumpingcube/kjumpingcube-24.12.1.ebuild
new file mode 100644
index 000000000000..99318ce58d10
--- /dev/null
+++ b/kde-apps/kjumpingcube/kjumpingcube-24.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Tactical one or two player game"
+HOMEPAGE="https://apps.kde.org/kjumpingcube/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+# TODO: || ( 7zip gzip )
+BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index 3d3b8ec2504f..c6ec9589fd07 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,2 +1,2 @@
 DIST kldap-24.08.3.tar.xz 189696 BLAKE2B f0579501df748587bb38524387c117b6e1825417d5741191f28d88f71023a2e0e8c1113e675127efeeeac732f777f32414283a3cda99855af8deac214ac6edda SHA512 ca77c2e7048fb873174509414251f2a5ac717fd7d093183a1b9b4f14086ad832b354a1ae72da9830c4a6ed4261a804f1662f25ee485394cfded4a702f21cc047
-DIST kldap-24.12.0.tar.xz 190344 BLAKE2B ddc249853f4ca3a7aef38a5d16de3a8f699480a6b56b2eac2e2ab02abdab8baf0c610db033eb86a00b96234fe1f7679e417eb7d64248ac9d420610057cce4be0 SHA512 df59f93e54f7f36f8ad0152ba4c051f7af3a88e6eb0de9944979a8025b45d72e4c72be939178af576620a160fe9e376689f1a9a6ead97999b74dcae95d962891
+DIST kldap-24.12.1.tar.xz 190440 BLAKE2B 28034496dea182e2d1226ef072e4b173d7b888b93bce3d02761649b22db63eef82e75b13f44b81711cad5377d96c5a9175b666450874e772cbc4eb8eb93650d5 SHA512 bcd9293458a29569ecc275400985aa3c54159bed164b17a489967868176202a9c9f6233ee9a44ebe29f4ef8dca20a1a38e927b9f1a69fff9f3217642e109e765
diff --git a/kde-apps/kldap/kldap-24.12.0-r1.ebuild b/kde-apps/kldap/kldap-24.12.0-r1.ebuild
deleted file mode 100644
index 4718a926aa35..000000000000
--- a/kde-apps/kldap/kldap-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for interacting with LDAP servers"
-HOMEPAGE="https://api.kde.org/kdepim/kldap/html/index.html"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	net-nds/openldap:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kldap/kldap-24.12.1.ebuild b/kde-apps/kldap/kldap-24.12.1.ebuild
new file mode 100644
index 000000000000..0a01f5fe85f5
--- /dev/null
+++ b/kde-apps/kldap/kldap-24.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for interacting with LDAP servers"
+HOMEPAGE="https://api.kde.org/kdepim/kldap/html/index.html"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	dev-libs/cyrus-sasl
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	net-nds/openldap:=
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 7807f433f8d0..414606605414 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,2 +1,2 @@
 DIST kleopatra-24.08.3.tar.xz 2983256 BLAKE2B 162a77493f25a81fe04901c6823870a4f80c51b30bde807502ec1390dbebba838b05718feafd559c3493554a46021d75eb74a7ffdca6e58a7b13247005a1c5ee SHA512 8fd5e8d08c23ccf5559d0cf7b14e7b013b9d13791869f564c624db39156550cbb4e45fa7ce63c076890d938e8c0342b90cbbd53ea98a2eeec167d5f13b551871
-DIST kleopatra-24.12.0.tar.xz 2785572 BLAKE2B ffd9620424651e82738710a6ccbd7ee990391b8332552a956c9efa57fe1e02508819d6c270fe446efb88962322d5a045374ed6ec56c291c65cafa5d56ed5f854 SHA512 da8faf28264cc42d684278739bddf6db9c8384c09b947965c4114b236c75697851fbeb6ca27d0332310f5cf3c94d0432cc30ef7ba0bdc1562701bdb08a622cf3
+DIST kleopatra-24.12.1.tar.xz 2793440 BLAKE2B 3c9c327b88f35f37987085904d61af0a8b27f9ec92e21df88b59f140ba1f4f3bad773db051fa1d74b3b1d46d6d25a1ca88a3b36cf8f4eaeb007f3d3f2cd7573b SHA512 a38f70ae8e81c525ff235d2dedb18be91fe189d7b9357663cc553e69168cd6bdb13f0b6f7b73f4a5c0b6eb75d03d53d6231eb69c87f57458e3439cfcd49970bd
diff --git a/kde-apps/kleopatra/kleopatra-24.12.0-r1.ebuild b/kde-apps/kleopatra/kleopatra-24.12.0-r1.ebuild
deleted file mode 100644
index 6ed5f9e80f2f..000000000000
--- a/kde-apps/kleopatra/kleopatra-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
-HOMEPAGE="https://apps.kde.org/kleopatra/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="pim"
-
-# tests completely broken, bug #641720
-RESTRICT="test"
-
-DEPEND="
-	>=app-crypt/gpgme-1.23.2:=[cxx,qt6]
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkleo-${PVCUT}:6
-	>=kde-apps/mimetreeparser-${PVCUT}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	pim? (
-		>=kde-apps/akonadi-mime-${PVCUT}:6
-		>=kde-apps/kidentitymanagement-${PVCUT}:6
-		>=kde-apps/kmailtransport-${PVCUT}:6
-	)
-"
-RDEPEND="${DEPEND}
-	>=app-crypt/gnupg-2.1
-	app-crypt/paperkey
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package pim KPim6AkonadiMime)
-		$(cmake_use_find_package pim KPim6IdentityManagementCore)
-		$(cmake_use_find_package pim KPim6MailTransport)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kleopatra/kleopatra-24.12.1.ebuild b/kde-apps/kleopatra/kleopatra-24.12.1.ebuild
new file mode 100644
index 000000000000..a4d817f58e03
--- /dev/null
+++ b/kde-apps/kleopatra/kleopatra-24.12.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
+HOMEPAGE="https://apps.kde.org/kleopatra/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="pim"
+
+# tests completely broken, bug #641720
+RESTRICT="test"
+
+DEPEND="
+	>=app-crypt/gpgme-1.23.2:=[cxx,qt6]
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkleo-${PVCUT}:6
+	>=kde-apps/mimetreeparser-${PVCUT}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	pim? (
+		>=kde-apps/akonadi-mime-${PVCUT}:6
+		>=kde-apps/kidentitymanagement-${PVCUT}:6
+		>=kde-apps/kmailtransport-${PVCUT}:6
+	)
+"
+RDEPEND="${DEPEND}
+	>=app-crypt/gnupg-2.1
+	app-crypt/paperkey
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package pim KPim6AkonadiMime)
+		$(cmake_use_find_package pim KPim6IdentityManagementCore)
+		$(cmake_use_find_package pim KPim6MailTransport)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index db62d40cef23..fd83db134822 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,2 +1,2 @@
 DIST klettres-24.08.3.tar.xz 47184752 BLAKE2B fa7eac60a1f152f80a642e366afa587752f322a23857eb9b63419053cf5bc9b23577c5bc86f428ad03192b3a13db1d1acb2365de36587dadf3dd5545392b1530 SHA512 d2adf3908bfb29a6012d5267232a03caff1eeb5619c6e2d04274f02d122380c3ff637dde37c0271926644d448fb702466ef2c3c73a03286c56faeebb33c1ce81
-DIST klettres-24.12.0.tar.xz 47185064 BLAKE2B eef4709c201c04393e8d4e35f3cd8d874bac10f697f633d1983c6cf675b8f47e16e7efcfd627e3063c0bce369311b328cc5568541dd8bbbdc881619c2025b156 SHA512 ca3b83d734e7e87b305f96628fcc7f3725f3069c156ee8e91cf44444a9eed7a6b19382022f5ed8943f8b58837348659c6409e8bf604035770d466a3bf5ddbe5a
+DIST klettres-24.12.1.tar.xz 47190968 BLAKE2B 74c0e4c165278ff9f39dbbabfc6699ee2d3f180c28aeb41470941732f6ac60be1edbd133cc6881f341bf3f5b78af982777684434ca0f4b709ff1373332152cd7 SHA512 4a328fa14414a1a5898677d871221b8d4eb30b4504cdd952ae1c39cf1f16ace906ca926c32a33392067e745f22e6911150f5772b43afa0202a41eb19192a857a
diff --git a/kde-apps/klettres/klettres-24.12.0.ebuild b/kde-apps/klettres/klettres-24.12.0.ebuild
deleted file mode 100644
index 71316f28e218..000000000000
--- a/kde-apps/klettres/klettres-24.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Alphabet learning application"
-HOMEPAGE="https://apps.kde.org/klettres/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=media-libs/phonon-4.12.0[qt6(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/klettres/klettres-24.12.1.ebuild b/kde-apps/klettres/klettres-24.12.1.ebuild
new file mode 100644
index 000000000000..5aa654e72e73
--- /dev/null
+++ b/kde-apps/klettres/klettres-24.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Alphabet learning application"
+HOMEPAGE="https://apps.kde.org/klettres/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=media-libs/phonon-4.12.0[qt6(+)]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index d2e8575deae8..25266995462c 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,2 +1,2 @@
 DIST klickety-24.08.3.tar.xz 1387092 BLAKE2B cf5c76ba0c9660cdb2dafdfacfa85358fd247f4dd4d4cefa824bc785bc703db245a6c62f32137d0f9e963c8d269f18b04faa73e5afaf0028131ce7ff89cff705 SHA512 62e88fc3c416a4cba6230f4cfb2db87068e4fecc45f6fb3fd5ca6475e986df24605fdd8fb0f5eb1adcae7ec9548173fe1ad034559e0edbdde82450937b6a4f76
-DIST klickety-24.12.0.tar.xz 1387332 BLAKE2B 14647a63eaa5d865f4a66e8d62a9ea503b6aaf30db75814d37ad1b1164a4b90b0168e3f863278577e2180ba4d2ec4ca06b94e8dea9f8870fb7667e53d713b6e2 SHA512 31f4043104cd49bce3ad26378996906d95403a08c94f3a3912d562390c7bda069f5139e030ee81081936b7d4bf5a91abab9d39fbeedb432476b9b790bbff5549
+DIST klickety-24.12.1.tar.xz 1387056 BLAKE2B 9f69f782bd74e37b3f666dfefbc079f138a38b35dc69b2f10d0ecdcc8058414e7bea0b26c702d1666f5e2b2766efe317b28f26dda74de429fbc6a1810d5291b8 SHA512 36757fbbc05f658e842a08c6ab6799d728ed6a6f3cb1da8c1f5a2d2d4eb835d02f8f46cf0017ed7568f3e11ddf24a99ea735234826a62b104c6e48d04b010725
diff --git a/kde-apps/klickety/klickety-24.12.0.ebuild b/kde-apps/klickety/klickety-24.12.0.ebuild
deleted file mode 100644
index 8e54c64cc0d3..000000000000
--- a/kde-apps/klickety/klickety-24.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="An adaptation of the Clickomania game"
-HOMEPAGE="https://apps.kde.org/klickety/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-# TODO: || ( 7zip gzip )
-BDEPEND="app-alternatives/gzip"
-
-DOCS=()
diff --git a/kde-apps/klickety/klickety-24.12.1.ebuild b/kde-apps/klickety/klickety-24.12.1.ebuild
new file mode 100644
index 000000000000..11b2c95d1897
--- /dev/null
+++ b/kde-apps/klickety/klickety-24.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="An adaptation of the Clickomania game"
+HOMEPAGE="https://apps.kde.org/klickety/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+# TODO: || ( 7zip gzip )
+BDEPEND="app-alternatives/gzip"
+
+DOCS=()
diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index eef4bfae92cf..358f9395b41d 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,2 +1,2 @@
 DIST klines-24.08.3.tar.xz 1673668 BLAKE2B 9669765a7e6f6a81c86f521e7801e528b4b838fcc61ff7c4167e6fcad62a83eccb8280a633fb1c24666687973454f7af6554b003e6116b0a175d81ef8c87a10c SHA512 3c9d85cd0b2385973fadc250cdd88c07752ac1bbe1b9c4098600a7f5e470fa805a8babcc0ac2b48deb59966fe6ba9e55103211e5565c0754a6e94e6436413786
-DIST klines-24.12.0.tar.xz 1673788 BLAKE2B 42d21b2de075a5a88169d69fe23218961c8f1811759564ff56fcd2ffa99d81ad5577e7cd7c6a7b9ffd9e81b12b83e87881690f1a7d9eb7d395e342253bb68896 SHA512 81ba08bbed03c77ab63d0e2de50de411915c25cff1b19f459d38ed7eb6573d9c66626bca45c447b02f88a907c061dcbf66af72b14c88e80ed6acb70d91a60130
+DIST klines-24.12.1.tar.xz 1673612 BLAKE2B ad9945b170f3f5c5d95b6f8e6b07137022f92690a57016d766e59e623b1723798b3f154eaf65a0bc0a3d2cff44712d39860f15f2605da19c54eeddeaaf191701 SHA512 9c372fa588ad778dfb0cce3bf0439af533ad6b191d9bc118084916d1790061afd3e242438db9adabe55be987175bf64e3cfe977885b528c7884b0206c98670b1
diff --git a/kde-apps/klines/klines-24.12.0.ebuild b/kde-apps/klines/klines-24.12.0.ebuild
deleted file mode 100644
index d803f21c5e07..000000000000
--- a/kde-apps/klines/klines-24.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="A little KDE game about balls and how to get rid of them"
-HOMEPAGE="https://apps.kde.org/klines/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-# TODO: || ( 7zip gzip )
-BDEPEND="app-alternatives/gzip"
-
-DOCS=( AUTHORS )
diff --git a/kde-apps/klines/klines-24.12.1.ebuild b/kde-apps/klines/klines-24.12.1.ebuild
new file mode 100644
index 000000000000..d088934cd765
--- /dev/null
+++ b/kde-apps/klines/klines-24.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="A little KDE game about balls and how to get rid of them"
+HOMEPAGE="https://apps.kde.org/klines/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+# TODO: || ( 7zip gzip )
+BDEPEND="app-alternatives/gzip"
+
+DOCS=( AUTHORS )
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index 9d41c6617572..485a0892d013 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,2 +1,2 @@
 DIST kmag-24.08.3.tar.xz 677024 BLAKE2B d42e002659e2eef519e1f1594004ecf33d125ead4fd64fba7eba6982c6980aee2f449ed8dde64938d208e031446b0f421ae8e342683ec64a420972639b812416 SHA512 aa12adae982118ec786c43cbaccd96548a62b49f4c445e1881f79954c4a1752b07925e68f6478d48f0ba96419ebb01df06d2ac61ceeba9ee5e921378fb6e2e27
-DIST kmag-24.12.0.tar.xz 677776 BLAKE2B 7bfc1488b4404f55a74a186ee39ea51d407b0ab64794b8e4ad36bb7cf351505199ff515cf1ed3c0c45c718e9fb4657300049b126b61543136df85f4b2462ab18 SHA512 576d1362d618f786279e62d906c1e7e69b4a1ea19b867622885211294a5ce1cbb38d93a32586c425b75ba4882fddbf4c964df08ea9dfc7a70119dad7defd92b6
+DIST kmag-24.12.1.tar.xz 677796 BLAKE2B 07e43e4d71b1c0d9dfd5395ab49d015568f258ad4e457ccba9de8387b19474b1242f42dd08275214f62466d8e403f9886952254c2a7de27569a6a83a94c4b564 SHA512 c0ee72269945c38a557e5e25d3efbd96f829e8649d4ccff256fce8eca3ced6073df38316e963179e2b92d85cf4caea66737b57d788000d8e5a35e845575682b0
diff --git a/kde-apps/kmag/kmag-24.12.0.ebuild b/kde-apps/kmag/kmag-24.12.0.ebuild
deleted file mode 100644
index cf9efaeeedba..000000000000
--- a/kde-apps/kmag/kmag-24.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE screen magnifier"
-HOMEPAGE="https://apps.kde.org/kmag/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="keyboardfocus"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.6:6 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package keyboardfocus QAccessibilityClient6)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kmag/kmag-24.12.1.ebuild b/kde-apps/kmag/kmag-24.12.1.ebuild
new file mode 100644
index 000000000000..39771ada0867
--- /dev/null
+++ b/kde-apps/kmag/kmag-24.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE screen magnifier"
+HOMEPAGE="https://apps.kde.org/kmag/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE="keyboardfocus"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.6:6 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package keyboardfocus QAccessibilityClient6)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index ae750f2d1e59..6b8f4f019c0b 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,2 +1,2 @@
 DIST kmahjongg-24.08.3.tar.xz 3719756 BLAKE2B 54b796c75138f7203ab6453f3f7bd63fc825a8e31552b736d0d43daad3b8d9661e00d4fe0de858daf5c9900d5ecd064e3d1d069d01685bee037c5047a744b85a SHA512 e3bca77c7cdf583096542204165f9633da74b3fd107d7289188b169ca6acd9648e4323c9fc7bb796e34423bc1cb6b3d36c7ac8bc853af1f0a8b2ef01457c9af6
-DIST kmahjongg-24.12.0.tar.xz 3719808 BLAKE2B 4e978edced1b1593e185345eed06e15ec6af85aef73ca8f5e15631bd891a06ac9ac912e2deb117f4ec7fe9067d542c6c068c2d623493aef9a00cca3bf64c7848 SHA512 4a674c64566492f1f0c4b0ff3430a86de84d7f032f666d971c5dcb0e5869151e89f75c88beed2faf87a44021b739549ef0e20e22d9a88f5e8a5c7c95238c1da1
+DIST kmahjongg-24.12.1.tar.xz 3721812 BLAKE2B e61e77e6e9d71c2fbe69f17a29b44576a700665a87ae9dae07cdad449f6d12a44fe2c987b8cb8623a003b8bbbf1d13cc2a1d8d950c61f92701dcec5834989a25 SHA512 1d6c98b07f225854bce5fb1eeac02b1c3a2b62543955aa0814f78150de045e9a6ad5b47d0f09446449070e8984ce32b6dba72c56faa54c5595eb747c27a85d0a
diff --git a/kde-apps/kmahjongg/kmahjongg-24.12.0.ebuild b/kde-apps/kmahjongg/kmahjongg-24.12.0.ebuild
deleted file mode 100644
index 65c2087e059f..000000000000
--- a/kde-apps/kmahjongg/kmahjongg-24.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="A tile matching game for one or two players"
-HOMEPAGE="https://apps.kde.org/kmahjongg/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-apps/libkmahjongg-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmahjongg/kmahjongg-24.12.1.ebuild b/kde-apps/kmahjongg/kmahjongg-24.12.1.ebuild
new file mode 100644
index 000000000000..755d04087315
--- /dev/null
+++ b/kde-apps/kmahjongg/kmahjongg-24.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="A tile matching game for one or two players"
+HOMEPAGE="https://apps.kde.org/kmahjongg/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-apps/libkmahjongg-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 937908d06772..fcf492b21a2f 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,2 +1,2 @@
 DIST kmail-account-wizard-24.08.3.tar.xz 166356 BLAKE2B b2a8c13846a2ba7c1ac658f5ec278415032eee7b335ec87356d9d2ede4e99bdf7f0874e65f165456dad4e4fe06dcf46e0cfde03efbfc4025ffc3cb656329b6db SHA512 cfe4bb7d1536cad4fa6d441431ac8f3df6c849de2cdd6cf8c9a80080329d4a271b09b70615f96a783e241aa333bf6fd164853e027198777be5ed936a144f53de
-DIST kmail-account-wizard-24.12.0.tar.xz 167652 BLAKE2B dc4723f67b57dbcefc4d68f15075f9e5011528edec85443c68bd87975b3a5abf1f88767bfc0e983f4e537f00498967ab81312934aa09900bfd4ac24a9f8af7c0 SHA512 712571bb6cff329db446b49bd7a2f59d2862d876199c7084bfd85e55a798dc45011248f29055a4a17fa1a0cefdf91c505bb4cfbee97e733a82a02ba312ffa611
+DIST kmail-account-wizard-24.12.1.tar.xz 167668 BLAKE2B 22420db190b234687b438e1acd9dd482a00e3bb2f5e3dbe62d61b85a55a14701cff2c14fc752be3842ec5d70d307ae4de3a27b632def8f3a033d223ff4e352a4 SHA512 21e24980aacadc5c7ad77d1c2d36cb1bb2bf8f99bb5c848f2badbfc090c68c6e8ba7ca115fee734513fd5115f8998a8c1e1f7756d5cc58f8530bae42018129cc
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-24.12.0-r1.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-24.12.0-r1.ebuild
deleted file mode 100644
index 2e2d5c691bea..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Assistant for KMail accounts configuration"
-HOMEPAGE+=" https://userbase.kde.org/KMail/Account_Wizard"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test" # bug 926456; requires akonadi server
-
-DEPEND="
-	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktexteditor-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-24.12.1.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-24.12.1.ebuild
new file mode 100644
index 000000000000..fadb65b5a077
--- /dev/null
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-24.12.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Assistant for KMail accounts configuration"
+HOMEPAGE+=" https://userbase.kde.org/KMail/Account_Wizard"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test" # bug 926456; requires akonadi server
+
+DEPEND="
+	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 23641a9331d4..8205299b0b3a 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,2 +1,2 @@
 DIST kmail-24.08.3.tar.xz 7742152 BLAKE2B 2fde35b83d4e0924bfe7321f085dd7e6f9caa3a51c5163829b4d41410a9e5e1388c0db7e6dac109cdb2999d3a93693dfc5987dcca8d6eef1aa4ee12cfa005084 SHA512 7d61b49423ba8d0b9630022d63ef4c4efd3c63f74d94d80841b96a92928e2f61e0e16997bacb962f25d49a683868d2a94b35e069c0435e88f86bb728d959af48
-DIST kmail-24.12.0.tar.xz 7771708 BLAKE2B f4760eecdbd60164f019ca882c174d573cc1177bd2afe10169df0e563334c52fecaa24da0bd9e2a014f1cc26ac0b1e3fb81b2a9a797ed90b9c16c91100b4ca67 SHA512 bf4d73347357dfd1abb9c5a2721f43cd3969eafa7f0a76bd79fc6a93b70255cb59bdec79a90ada02938f3c766296267585dcd7a12d0b58f478f50efcf8e4a86f
+DIST kmail-24.12.1.tar.xz 7772380 BLAKE2B da7217afeda8c448b400fb367478527eae89d22eab8a78e1a1e5e7691d15de3131498cbb6585397e8effba2ec957cbc4b5702ac411e2e99dce8eb67088b31335 SHA512 2134c668e838af41a1e821245d1bac1985e24b23436c3596d2891655872253fa03b8dde5925eba3857137d1ba4fae6d6e2c47af088b0fcce9a431efd91971eef
diff --git a/kde-apps/kmail/kmail-24.12.0-r1.ebuild b/kde-apps/kmail/kmail-24.12.0-r1.ebuild
deleted file mode 100644
index 7ea605bd4506..000000000000
--- a/kde-apps/kmail/kmail-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org optfeature
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes"
-HOMEPAGE="https://apps.kde.org/kmail2/
-https://kontact.kde.org/components/kmail/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="activities pch speech telemetry"
-
-RESTRICT="test" # bug 616878
-
-# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
-	>=dev-libs/ktextaddons-1.5.4:6[speech?]
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/akonadi-search-${PVCUT}:6
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kldap-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/kontactinterface-${PVCUT}:6
-	>=kde-apps/kpimtextedit-${PVCUT}:6[speech=]
-	>=kde-apps/libgravatar-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/libkleo-${PVCUT}:6
-	>=kde-apps/libksieve-${PVCUT}:6
-	>=kde-apps/libktnef-${PVCUT}:6
-	>=kde-apps/mailcommon-${PVCUT}:6
-	>=kde-apps/messagelib-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6
-	activities? ( kde-plasma/plasma-activities:6 )
-	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kldap-${PVCUT}:6
-	test? ( kde-apps/akonadi-config[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:6
-	>=kde-apps/kmail-account-wizard-${PVCUT}:6
-"
-BDEPEND="
-	dev-libs/libxslt
-	test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
-		-DUSE_PRECOMPILED_HEADERS=$(usex pch)
-		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
-		$(cmake_use_find_package telemetry KF6UserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "virus detection" app-antivirus/clamav
-		optfeature "spam filtering" mail-filter/bogofilter mail-filter/spamassassin
-		optfeature "fancy e-mail headers and useful plugins" "kde-apps/kdepim-addons:${SLOT}"
-		optfeature "crypto config and certificate details GUI" "kde-apps/kleopatra:${SLOT}"
-		optfeature "import PIM data from other applications" "kde-apps/akonadi-import-wizard:${SLOT}"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kmail/kmail-24.12.1.ebuild b/kde-apps/kmail/kmail-24.12.1.ebuild
new file mode 100644
index 000000000000..346f366ec3a8
--- /dev/null
+++ b/kde-apps/kmail/kmail-24.12.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes"
+HOMEPAGE="https://apps.kde.org/kmail2/
+https://kontact.kde.org/components/kmail/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities pch speech telemetry"
+
+RESTRICT="test" # bug 616878
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
+	>=dev-libs/ktextaddons-1.5.4:6[speech?]
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/akonadi-search-${PVCUT}:6
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/kontactinterface-${PVCUT}:6
+	>=kde-apps/kpimtextedit-${PVCUT}:6[speech=]
+	>=kde-apps/libgravatar-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/libkleo-${PVCUT}:6
+	>=kde-apps/libksieve-${PVCUT}:6
+	>=kde-apps/libktnef-${PVCUT}:6
+	>=kde-apps/mailcommon-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	test? ( kde-apps/akonadi-config[sqlite] )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-apps/kdepim-runtime-${PVCUT}:6
+	>=kde-apps/kmail-account-wizard-${PVCUT}:6
+"
+BDEPEND="
+	dev-libs/libxslt
+	test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
+"
+
+src_prepare() {
+	ecm_src_prepare
+	use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
+		-DUSE_PRECOMPILED_HEADERS=$(usex pch)
+		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "virus detection" app-antivirus/clamav
+		optfeature "spam filtering" mail-filter/bogofilter mail-filter/spamassassin
+		optfeature "fancy e-mail headers and useful plugins" "kde-apps/kdepim-addons:${SLOT}"
+		optfeature "crypto config and certificate details GUI" "kde-apps/kleopatra:${SLOT}"
+		optfeature "import PIM data from other applications" "kde-apps/akonadi-import-wizard:${SLOT}"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index e4763555b7a1..2e62167eac6e 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,2 +1,2 @@
 DIST kmailtransport-24.08.3.tar.xz 187928 BLAKE2B 376048249b7a3a1b7ae27d1d500f78157e37013734f787921c6ec3b2bf998c3eb7b1dafe90e30b0f04abbd2464479807ce62f8fba09cd1adb6458707b574df8c SHA512 769fb75a37a12968e0d9c0ec48aa691a80ee67a4b462269d9ad35ee2765b405f313eb6a4d662a263af851c1501f9829a3b88561fe94440d9a7260799f152ba63
-DIST kmailtransport-24.12.0.tar.xz 189076 BLAKE2B 14d0f715e7e21aed1a476ec74e0263f3359cd879b841e5a12c1f9237d17ec89c1fa0ac08c2165ad3ac5522ec548648bc45f8df6c65e6d53d4e9a9dd46a24463f SHA512 ecbe5eadf4fb29f2cb8aedce8d3084a12223e1c84f8877d6af1781da7931f073788536e1e06f5c818fc1c22d1d0cd003e4537dd3d6548608ebfc7e18e890a967
+DIST kmailtransport-24.12.1.tar.xz 189024 BLAKE2B 40a356e570f522445ba2af4e7216b43d05d191756463108129cc28f7ce43d6194ffe11c31eb7e085239c174bec653a69795e28f01c0032d1068398fb738c626f SHA512 bd12777af2b02ca4f395839c8f7996a3a59a1682a3d278a1af41f61377bb007750bc3aa504fe7260a90c678be53cea0f7808905ef70fb78c7cbaf073e0070cc4
diff --git a/kde-apps/kmailtransport/kmailtransport-24.12.0-r1.ebuild b/kde-apps/kmailtransport/kmailtransport-24.12.0-r1.ebuild
deleted file mode 100644
index 0b4f3ece3a70..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Mail transport service"
-
-LICENSE="LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
-	>=kde-apps/ksmtp-${PVCUT}:6
-	>=kde-apps/libkgapi-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-DEPEND="${RDEPEND}
-	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:6 )
-"
diff --git a/kde-apps/kmailtransport/kmailtransport-24.12.1.ebuild b/kde-apps/kmailtransport/kmailtransport-24.12.1.ebuild
new file mode 100644
index 000000000000..c6c42324a3e1
--- /dev/null
+++ b/kde-apps/kmailtransport/kmailtransport-24.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Mail transport service"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=kde-apps/ksmtp-${PVCUT}:6
+	>=kde-apps/libkgapi-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+DEPEND="${RDEPEND}
+	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:6 )
+"
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index e5af601fe0f5..3bedefe051b6 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,2 +1,2 @@
 DIST kmbox-24.08.3.tar.xz 29184 BLAKE2B ce7142776598e77a741a4ea5f7f5ff98e35f6acc88122a88f019cb92a6ba8727a2bde633f190bc5f9dd5c3c3c1fd39fe7407ab3b62f1f2fe2c5950c1f6811c4c SHA512 07dbae5a0d88a4ec476ff7e1df2864618c7e2bbaab48a612fadfee76f27c2f6a7c075d0cb23137bd84528cbb6e41cd26ef656768a6d06d24da6d31f7d9d6564f
-DIST kmbox-24.12.0.tar.xz 29248 BLAKE2B 7ce79635dff3587e5bcfe8c5f1a3e460c65f999c9122f32e4bc622c9aba7a367cb4dd78f11bda6d674085256c72a3663ecaa2915b0185a9cb6eac05697206683 SHA512 ee357c273bcd5ab73e3f21cc0d1ce0d10025c2ce0563989083c400594eea1067954bf333ba5f771d9e99858e253349ad8d99f976be36de2e3543ba96a6062fad
+DIST kmbox-24.12.1.tar.xz 29252 BLAKE2B d8239ce2bae25be9b0579a45430078136f179b256cae3f405ae1fb08f46e175fb4cea172e32488887173d4f5a9fa5dd88ffd99a3fb08e2d13cc910d6cacfcf88 SHA512 26b2500a2939580c8f365f543213586b94e56bc628d902efcfc50a70d4df5fb80f4caade2452d24a07d9f87c6c6d111fdf0ebe5017a62e23cb6223cf5b1d026c
diff --git a/kde-apps/kmbox/kmbox-24.12.0-r1.ebuild b/kde-apps/kmbox/kmbox-24.12.0-r1.ebuild
deleted file mode 100644
index fdfadb588cdc..000000000000
--- a/kde-apps/kmbox/kmbox-24.12.0-r1.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
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.7.0
-PVCUT=$(ver_cut 1-3)
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for accessing MBox format mail storages"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND=">=kde-apps/kmime-${PVCUT}:6"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmbox/kmbox-24.12.1.ebuild b/kde-apps/kmbox/kmbox-24.12.1.ebuild
new file mode 100644
index 000000000000..b25a2b9ff45e
--- /dev/null
+++ b/kde-apps/kmbox/kmbox-24.12.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+PVCUT=$(ver_cut 1-3)
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for accessing MBox format mail storages"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND=">=kde-apps/kmime-${PVCUT}:6"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index 210c6fbc7a1a..9f417e6d12b7 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,2 +1,2 @@
 DIST kmime-24.08.3.tar.xz 166120 BLAKE2B 961b9beb6e83cc73322d76dc0346da2a8b50a379be513b0ef3323096a3e8433e680ccd0e3a48d2b98d380cb1232b59862cb321d5c2fa71fccd3ec12fbce6ec72 SHA512 38792d68c934150f4abc30589752902eff36e00f9b104c92bcdbeefb9c58b90bfb39ec63a65d1c6483fe1b8ae3fcccae9c4dbd3daaf873046921dd11735409c5
-DIST kmime-24.12.0.tar.xz 164956 BLAKE2B 8684190d1fe233ef20659aef610ca86efb73c4f608287da1efa6e6b6f93625ee357c4ac368b447b1f281406ea6e73c6ca3d645838ffb1a8fa60cb70373f5076f SHA512 c33e8822c13f525bc72aba80af9f22a0c66568809c3702fafab0703643582a2d74484e4464df2b5030e9aabfca7cd7e68a96a6d006ef06008dd50019fdc5f895
+DIST kmime-24.12.1.tar.xz 164976 BLAKE2B ac056720346f032d3c6021abd8d5cc1bb90ce7a3c19889f65faed4f31ae710ca89899db3188ba2e062c1f3b7ce7374c419ae532c4799024e8d6b3b260c4c32fb SHA512 fc71f7950674f89965f7852120c81a45c1b38391bcd0e7ac6fde78ddec9f74f089c71538255c7072182ca31af6b4782169d1600c3a8c0495feb64d2fe51d47a6
diff --git a/kde-apps/kmime/kmime-24.12.0-r1.ebuild b/kde-apps/kmime/kmime-24.12.0-r1.ebuild
deleted file mode 100644
index 4ae4d89fd3b3..000000000000
--- a/kde-apps/kmime/kmime-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.7.0
-inherit ecm gear.kde.org
-
-DESCRIPTION="Libary for handling mail messages and newsgroup articles"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND=">=kde-frameworks/kcodecs-${KFMIN}:6"
-RDEPEND="${DEPEND}"
-
-CMAKE_SKIP_TESTS=(
-	# bug 924507
-	kmime-{header,message}test
-)
diff --git a/kde-apps/kmime/kmime-24.12.1.ebuild b/kde-apps/kmime/kmime-24.12.1.ebuild
new file mode 100644
index 000000000000..0cb18c55b74b
--- /dev/null
+++ b/kde-apps/kmime/kmime-24.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+inherit ecm gear.kde.org
+
+DESCRIPTION="Libary for handling mail messages and newsgroup articles"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND=">=kde-frameworks/kcodecs-${KFMIN}:6"
+RDEPEND="${DEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	# bug 924507
+	kmime-{header,message}test
+)
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index e624ed72a5e9..45dfb4c9db2d 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,2 +1,2 @@
 DIST kmines-24.08.3.tar.xz 948984 BLAKE2B fa26b03008dce9fc527131b6ebbe5ef2deecee93b356af7d2c23ebdd88ddca17ef2778753350d789dda562c15269001ba760046c218fbf15a4f0e6a7a6e05487 SHA512 f8d8de709e56febf0595dcd619dbe9f26a7bc09b925a81a3b35fd15a892b31401c39a18514adb67cf6a11235ac9c0eff991daf8ac3547754830ba951fae7fd85
-DIST kmines-24.12.0.tar.xz 948816 BLAKE2B eee42b14410a34c8744fef80b617756d449456be4b3e43cf8f2b813fccfb5a51d02bbcda28aa0a488759c966ebb34810b6eee0eace26d096aecafbd28d7436e9 SHA512 99fdc16310f5c22a6b4fe38068752dd56e4d0f10c03d8ab6c29d42d848bbc2187bf798be9c5b88516003d815191facc3c2799aaf461746979e6a567791202613
+DIST kmines-24.12.1.tar.xz 949596 BLAKE2B 4b4843ea05c7072ffd49b2a8ea8d08697c25923e4635e6334c7cf95043d4939c13e9a5dc30e5443ac66123161f7dd42868f04c905e5e514ed0c3f2848b7d0c1e SHA512 c4dd169b36464d23eafd36ec236bff10aa37da8fb4956d7e62141a6f7a84259a913548026e8d75dc9404047cc390c9467e210dba68291c340e282d59a7fe7b26
diff --git a/kde-apps/kmines/kmines-24.12.0.ebuild b/kde-apps/kmines/kmines-24.12.0.ebuild
deleted file mode 100644
index ed317e7b7d8a..000000000000
--- a/kde-apps/kmines/kmines-24.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Classic mine sweeper game"
-HOMEPAGE="https://apps.kde.org/kmines/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-# TODO: || ( 7zip gzip )
-BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/kmines/kmines-24.12.1.ebuild b/kde-apps/kmines/kmines-24.12.1.ebuild
new file mode 100644
index 000000000000..dcd3d956bb35
--- /dev/null
+++ b/kde-apps/kmines/kmines-24.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Classic mine sweeper game"
+HOMEPAGE="https://apps.kde.org/kmines/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+# TODO: || ( 7zip gzip )
+BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index b46fc6123ef5..59b1fefd4df0 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,2 +1,3 @@
 DIST kmix-24.08.3.tar.xz 1165348 BLAKE2B 92245222971622d9e83821d92bcbfb3d37e00fafd008f20767883f2066fbbb2cf524bc5b902dad6684365a63914f8b9f735c74769920bc12de9f7f1b86a4977e SHA512 bde6df3707e10f4f1f3bdaf9553184ba6cc455d9063c6cd762c5dcb514be53f703c7a982c75383756f1c117a94839c19ce8161df833f505953a182ed306a793c
 DIST kmix-24.12.0.tar.xz 1166316 BLAKE2B 4d26c51a79b34e73281c3553cd686c5da069bc388a444a74d3469dd9f1c0ef9df5028483d3c1ac148306a8609e09f05ca5386ff9f02859f00982be72c9019cf5 SHA512 60c3ec568568c936eaf63258474b63cf4dc509bd871f8e82cc8b8c2e53d3ed0f7bf7f517dd7d7ba13b76cad475e7f7025406e7e6db499148598bbb1318597d39
+DIST kmix-24.12.1.tar.xz 1167696 BLAKE2B 632818aa612bcbebcefea0e772eaee42e807495befcddf6a2bc1013341e61dc53c699daa8ebd83def1bc834259fd021092f0cb63f28a59ef192f33a5366e465c SHA512 fc089dc3afeb5a80b2742dba2f3e46bdc2c63c0e9393adac10854107492d34ddbc86d3ba02fcda6e0cc06494631afa8c05ce1800c17d797c0936823374310e69
diff --git a/kde-apps/kmix/kmix-24.12.0.ebuild b/kde-apps/kmix/kmix-24.12.0.ebuild
index 16a9bf5aa12e..b69e170d0664 100644
--- a/kde-apps/kmix/kmix-24.12.0.ebuild
+++ b/kde-apps/kmix/kmix-24.12.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 @@ HOMEPAGE="https://apps.kde.org/kmix/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="alsa pulseaudio"
 
 # kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
diff --git a/kde-apps/kmix/kmix-24.12.1.ebuild b/kde-apps/kmix/kmix-24.12.1.ebuild
new file mode 100644
index 000000000000..7eeb00ced8fe
--- /dev/null
+++ b/kde-apps/kmix/kmix-24.12.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="false"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Volume control gui based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/kmix/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="alsa pulseaudio"
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	alsa? ( >=media-libs/alsa-lib-1.0.14a )
+	pulseaudio? (
+		media-libs/libcanberra
+		media-libs/libpulse
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" ) # TODO: upstream
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package alsa ALSA)
+		$(cmake_use_find_package pulseaudio Canberra)
+		$(cmake_use_find_package pulseaudio PulseAudio)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if use pulseaudio && has_version kde-plasma/plasma-pa; then
+		elog "In KDE Plasma, kde-plasma/plasma-pa is the default audio volume handler,"
+		elog "therefore, autostart by default was disabled for KMix."
+		elog
+		elog "Should you prefer to still use kde-apps/kmix instead, do the following:"
+		elog " - In system tray, right click on [Show hidden items]"
+		elog " - Select [Configure System Tray]"
+		elog " - In [Entries],  search for [Audio Volume] and set it to [Disabled]"
+		elog
+	fi
+	elog "KMix will be shown as [Volume Control] after manually starting it once"
+	elog "and will be autostarted after configuring such in KMix startup settings."
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index b98fda955eac..da345ab20ba0 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,2 +1,2 @@
 DIST kmousetool-24.08.3.tar.xz 133752 BLAKE2B e9f83fa25fc01814aac525cc25fbcfab55dda476616f5e3e57dc18f80cce5c9dad6d389250adebc2439860cd50361f28ae73847408e24d817026a98533f3293a SHA512 94ef18279cb448520adc1afa19679bf87541893ff4b065a4e15723a2ac139441f7a87cbf20652f504c855a62cf3431f4d384b952dac98c246e55e86ad66a3a63
-DIST kmousetool-24.12.0.tar.xz 134508 BLAKE2B 251a213200b35f4fea35b878667d59f0759e9d071a12eb9a753a83b04e0473581e411d3da6e42091c3419a2f9620ce633503ead2f4facff6c81b71dae9e77f9f SHA512 e152c73e5d270b2e88b82c416fc503e2e21ec5aab924081b8bae17ec91146d382bdc1ecfb072398b07b44b1bea06c61ca4f28744a0d93fec0a61f8dd28ee8da5
+DIST kmousetool-24.12.1.tar.xz 134528 BLAKE2B b3e220aadc53edd06dbab4dd89e482987008e2fcf44cb03e4c96ba41448e5d0b1e591e8ac1429ead91b0232c03a100aa7d0dc622c8766ece13cfc7e5269646e8 SHA512 b995e704fe1bb12ce98091341b99c7705ded3e8e24cd3c73e0fe46925a5ddddf727b2dad88e1786c3806f45c20bb39468ab936a521e4d140d2da4d81844d27f8
diff --git a/kde-apps/kmousetool/kmousetool-24.12.0.ebuild b/kde-apps/kmousetool/kmousetool-24.12.0.ebuild
deleted file mode 100644
index 0dd62050e1ab..000000000000
--- a/kde-apps/kmousetool/kmousetool-24.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE program that clicks the mouse for you"
-HOMEPAGE="https://apps.kde.org/kmousetool/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtmultimedia-${QTMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXext
-	x11-libs/libXt
-"
diff --git a/kde-apps/kmousetool/kmousetool-24.12.1.ebuild b/kde-apps/kmousetool/kmousetool-24.12.1.ebuild
new file mode 100644
index 000000000000..6333705ad745
--- /dev/null
+++ b/kde-apps/kmousetool/kmousetool-24.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE program that clicks the mouse for you"
+HOMEPAGE="https://apps.kde.org/kmousetool/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXext
+	x11-libs/libXt
+"
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index 281cb6e31e34..eae884abcbe4 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,2 +1,2 @@
 DIST kmouth-24.08.3.tar.xz 1940356 BLAKE2B 62bdb6d78b7167d55172326a3abb0b40c1a909a893b542385326dd57ae8d22595eae623112e069db41146570501ac42019db294ae036b9068a21ae04e8ee79f0 SHA512 4d5beea2efddbee0dc7d58d52e273b361f6f5cbe08d4d9fce5e35b33c0f5c14126882e04c4c71d3cf556ae9083f2be20677993671e5af336d5b9be479dc5c928
-DIST kmouth-24.12.0.tar.xz 1940336 BLAKE2B 5748f833702266bc3046c69a6e48ae6ff750e445974406a76f914e1a83d34013f7f081a8f33262d874f2516bc2f611698899e3fb4a9042a4e978de447fec96fc SHA512 de5c91dae98dfc1ba041f214ef74abf38d1e49db1f5cffd39120b8a1f3a79feea482f14c996b4ea24e902beba703c661d73295fe6b6c4bf4e628a55780059784
+DIST kmouth-24.12.1.tar.xz 1940344 BLAKE2B 2200a5d59e839c60fb8ea89f7c4861101ff7a62b0f382b7458773406498129f3a0c868a873049c6abfe84b25b387115937893deea8aae8f9769b1666e31945e0 SHA512 6e1b19fac97d00b3c9b2d40c7f3ddd976fcd55630d49fb3d549ffd0cb8192f0ec2dd340bf8639480f095697d80edddb25907af34b767baed1cce1a73f5fb6bf0
diff --git a/kde-apps/kmouth/kmouth-24.12.0.ebuild b/kde-apps/kmouth/kmouth-24.12.0.ebuild
deleted file mode 100644
index d3e9e0b71d9a..000000000000
--- a/kde-apps/kmouth/kmouth-24.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Text-to-speech synthesizer front end"
-HOMEPAGE="https://apps.kde.org/kmouth/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=dev-qt/qtspeech-${QTMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmouth/kmouth-24.12.1.ebuild b/kde-apps/kmouth/kmouth-24.12.1.ebuild
new file mode 100644
index 000000000000..eb555c8fef74
--- /dev/null
+++ b/kde-apps/kmouth/kmouth-24.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Text-to-speech synthesizer front end"
+HOMEPAGE="https://apps.kde.org/kmouth/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=dev-qt/qtspeech-${QTMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 8c074b59e731..4b4e9ffe4682 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,2 +1,2 @@
 DIST kmplot-24.08.3.tar.xz 3022216 BLAKE2B 6a27936931bf04f919f0bb486185c1ca082905bb80bdfb5eafef3cf118b3d5e9378ec00f83b53d084175cc95eccf66a05142a10648b95255e6c703b4c92c1eae SHA512 8fa5480eef6195e3b9a32162ea888491104807d3648ea5bf70c59d8cb7ac936ea3b224b90d847a3ecd4924d9de9f2840d5b073d6edb1e4d2e6631f71347cc179
-DIST kmplot-24.12.0.tar.xz 3022248 BLAKE2B 78d7185759d2f3caa705a1f8fee104cc158722d024149fcde556ccc6bfb85f152d42dbc6808ab0534ee595431b8195b9d27573645b9cc8254cef908d43f42972 SHA512 7bd731a28750f9526c5f4186c0cf176d81934da8f5d8ddd35379db932ec843f0c729e3afe12617efc708a35f65bb91ca2cc32d3a7d3950834133613d9724c72a
+DIST kmplot-24.12.1.tar.xz 3022304 BLAKE2B 237bbdc37637d3ace2cc8ca8560738e0cd2e087c5320ad92a96ffd4598da79e2cf729c66e4f4479a6ccd1ec6dbdbec171747f4ee3686a946ba91627d252c28ca SHA512 9173263ffc20e4d521d0fcfc4215fc1ebe5e5c77f303e14529bbc5fe3d010bf37dd7b5c7097e65ef48ce749c9437e72bc3313fec8e48acd4c934c793a0ae2bb9
diff --git a/kde-apps/kmplot/kmplot-24.12.0.ebuild b/kde-apps/kmplot/kmplot-24.12.0.ebuild
deleted file mode 100644
index abef220d6cf9..000000000000
--- a/kde-apps/kmplot/kmplot-24.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Mathematical function plotter"
-HOMEPAGE="https://apps.kde.org/kmplot/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmplot/kmplot-24.12.1.ebuild b/kde-apps/kmplot/kmplot-24.12.1.ebuild
new file mode 100644
index 000000000000..739773c69773
--- /dev/null
+++ b/kde-apps/kmplot/kmplot-24.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Mathematical function plotter"
+HOMEPAGE="https://apps.kde.org/kmplot/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index d408a89fd2f9..ef71b38c3597 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,2 +1,2 @@
 DIST knavalbattle-24.08.3.tar.xz 1048236 BLAKE2B af8e560d3b1935f59d5c8f7deac1d8195f0276d9ba3b28f40081674d1b714b29daf677401ed357e271b350ffcf337af3ec6ad781225d2b25bdb51e33a85bf558 SHA512 7cc179af37458fa401e6ce7dffaa60e05f7321c42109f5f698b30009b7a8307fe82685e98222abb7aaa901419143614c0f272233d5e6b96a40f309655c1b70f5
-DIST knavalbattle-24.12.0.tar.xz 1047940 BLAKE2B 9fbeb8d79de0d943b46e301ec0ec7ac517166708c787974ae8b92afa3d61835b2296af5de6c58e5029ff982f67d077c8553ef5339ad44094be06a666f64ac02e SHA512 eea5179e62c255c8cad13466c6e58daeb0d51ee5cdf2c0f631a9db7735f2f77368cc7fb1db39ad49f9f23e0e89b77c9e3069a4a09f97fb31e76f4492c9646c97
+DIST knavalbattle-24.12.1.tar.xz 1048020 BLAKE2B 537ec5223edfe405881e71fe5d80b20d89265c2ddcd6384ee51be2c0405e64e856a1ce1c12f46a090c7942d9d6aa2c723c28fb0eb20e17ee5835ec3565edd231 SHA512 82c25fe40b28eadd9fff462e1f7a1b3c8f946258653abd4128a21c05b45ebba86ca5872ce5c6416b5eec53e9fff539ffd03af21e58a7f68e0995858c00fb757f
diff --git a/kde-apps/knavalbattle/knavalbattle-24.12.0.ebuild b/kde-apps/knavalbattle/knavalbattle-24.12.0.ebuild
deleted file mode 100644
index 978e97fb1a46..000000000000
--- a/kde-apps/knavalbattle/knavalbattle-24.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Battleship clone by KDE"
-HOMEPAGE="https://apps.kde.org/knavalbattle/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kdnssd-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-# TODO: || ( 7zip gzip )
-BDEPEND="app-alternatives/gzip"
-
-DOCS=( AUTHORS )
diff --git a/kde-apps/knavalbattle/knavalbattle-24.12.1.ebuild b/kde-apps/knavalbattle/knavalbattle-24.12.1.ebuild
new file mode 100644
index 000000000000..0ae6775554d7
--- /dev/null
+++ b/kde-apps/knavalbattle/knavalbattle-24.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Battleship clone by KDE"
+HOMEPAGE="https://apps.kde.org/knavalbattle/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdnssd-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+# TODO: || ( 7zip gzip )
+BDEPEND="app-alternatives/gzip"
+
+DOCS=( AUTHORS )
diff --git a/kde-apps/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index d2eac855dc39..9f66e4ac5620 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,2 +1,2 @@
 DIST knetwalk-24.08.3.tar.xz 1010148 BLAKE2B 85ca1e54c1191d3e951f47301bb26a316fa1e5d9cdc543730bc608fdd40b21925d798ccd14e47b29c2b76ade6a1a72b539ee11d462ef7b703fcc7c2576f10401 SHA512 79180afc8bd0a09af4907ba3a664f68bccd5279cd817f2fef690ee690aa6c215cfc67b3497164b57ab1b5f66b0ff3439c840003f43c59b0b24c0a76effeeab75
-DIST knetwalk-24.12.0.tar.xz 1010352 BLAKE2B 75b1d4cd4408409a921acc6ad8268ffff0bce5e0353c92d6eb77ec6889ac85fc376914db73ba7f34d5d151ea955384d1612a179aa8b357df44d35509f7a5398b SHA512 27ff15dcacf634d245810d6b92c985a1a25e3176d29c983f4f2190e50ac54681469e770d9202ac686b146913ece55c4f31296d51a67e4425a7fbba6ce30b8a70
+DIST knetwalk-24.12.1.tar.xz 1010268 BLAKE2B 6c9f5409d7b065fab283285da8b68a7a473ca7b01388993582c641cd4d380e5bbf8147d60edfb23a538f647f5cd4e38e89db10f200f3e741f9fdf282657dad28 SHA512 b512086986ad43669998c35bdec7d39a3b03382219945392f8096a7d3f1961ffe37b9cdcdfdf24e72b6d3460463d8b41d69e4c514ce0d57fc17f8f69d047bdb7
diff --git a/kde-apps/knetwalk/knetwalk-24.12.0.ebuild b/kde-apps/knetwalk/knetwalk-24.12.0.ebuild
deleted file mode 100644
index dd408b12aa38..000000000000
--- a/kde-apps/knetwalk/knetwalk-24.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE version of the popular NetWalk game for system administrators"
-HOMEPAGE="https://apps.kde.org/knetwalk/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-# TODO: || ( 7zip gzip )
-BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/knetwalk/knetwalk-24.12.1.ebuild b/kde-apps/knetwalk/knetwalk-24.12.1.ebuild
new file mode 100644
index 000000000000..294d4bef90af
--- /dev/null
+++ b/kde-apps/knetwalk/knetwalk-24.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE version of the popular NetWalk game for system administrators"
+HOMEPAGE="https://apps.kde.org/knetwalk/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+# TODO: || ( 7zip gzip )
+BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/knights/Manifest b/kde-apps/knights/Manifest
index c1bc71151976..f1d89ddd4dc8 100644
--- a/kde-apps/knights/Manifest
+++ b/kde-apps/knights/Manifest
@@ -1,2 +1,2 @@
 DIST knights-24.08.3.tar.xz 2491700 BLAKE2B 8ae953262f258d763ce6ca7b7a5920b9ac93508764bd604e3f104a9f11a8a5cbac22e96a567072f1a7fcf74a72fb9f5da2fe86d9c7165428a248800f1b3c7441 SHA512 cd42377312536a9fe507bb1b3f77e98a795d70320dc37cd78f17da3f488bf1a5e36804e862f9a4ae946d45ce7e6c8f887292d710db4faa1a368cb57c9438244c
-DIST knights-24.12.0.tar.xz 2490152 BLAKE2B 2fbcfb56d46a56741df173cdfb77adc6d2ad92fbe6863a660525cf4ddcdc40342359f837cc183d48aef584cf45600b0ee5fc3b1a0475bed85734c5c698f85ed6 SHA512 a08c498acdb71c8c940fbb8ee6ced13cc4d5c9e892af84190ddbbe0ec89ab253bc3e12382c87a3219e9926ce09f79a621f3b232c24fa69288a7e5fd835077518
+DIST knights-24.12.1.tar.xz 2490712 BLAKE2B 919e671479b6ac27112c78171ef7735b5ab4e088b61310e62675f643661ed6cb63b6d55a6ce581a0f3cdb3aa2fcd79294646d841ea7889e63ab7162add344fce SHA512 bf01b0b770b8bcc3644356c2eadd12a6509b95a1e565a22aac9ac7467c3078359d6fec65275b7dff605600b2f7463df5a2db2451d89b74da48216c59f5647683
diff --git a/kde-apps/knights/knights-24.12.0.ebuild b/kde-apps/knights/knights-24.12.0.ebuild
deleted file mode 100644
index efcc122ef59a..000000000000
--- a/kde-apps/knights/knights-24.12.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Simple chess board based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/knights/"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="speech"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,network,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kplotting-${KFMIN}:6
-	>=kde-frameworks/ksvg-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	kde-plasma/libplasma:6
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
-"
-RDEPEND="${DEPEND}
-	|| (
-		games-board/gnuchess
-		games-board/crafty
-		games-board/stockfish
-		games-board/sjeng
-	)
-"
-# TODO: || ( 7zip gzip )
-BDEPEND="app-alternatives/gzip"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech Qt6TextToSpeech)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/knights/knights-24.12.1.ebuild b/kde-apps/knights/knights-24.12.1.ebuild
new file mode 100644
index 000000000000..d769585d2439
--- /dev/null
+++ b/kde-apps/knights/knights-24.12.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Simple chess board based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/knights/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE="speech"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,network,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kplotting-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	kde-plasma/libplasma:6
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	|| (
+		games-board/gnuchess
+		games-board/crafty
+		games-board/stockfish
+		games-board/sjeng
+	)
+"
+# TODO: || ( 7zip gzip )
+BDEPEND="app-alternatives/gzip"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package speech Qt6TextToSpeech)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
deleted file mode 100644
index 6f0ecdce8f6b..000000000000
--- a/kde-apps/knotes/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST knotes-24.07.80.tar.xz 383020 BLAKE2B 4494a599ecc93fb074d4638f2826bdb759bae8289b51d875396bc92a9ef4fc8d83f734dbad62db9d35fc524c141d0835faf193e333625a0da859f5bc9daa4f27 SHA512 66c46e0c31150e3db1e9a1731449be8ff6af85a71157d1334984583eaeb24da9484a2b4538c9b60a67f5e53098c212f498e76a9fb8842f367de8ba9d33b22472
diff --git a/kde-apps/knotes/knotes-24.07.80_p20240826.ebuild b/kde-apps/knotes/knotes-24.07.80_p20240826.ebuild
deleted file mode 100644
index 3337d2c37870..000000000000
--- a/kde-apps/knotes/knotes-24.07.80_p20240826.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm kde.org
-
-DESCRIPTION="Note taking application"
-HOMEPAGE="https://apps.kde.org/knotes/
-https://kontact.kde.org/components/knotes/"
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P/_p*/}.tar.xz"
-S="${WORKDIR}/${P/_p*/}"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="amd64 arm64"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/ktextaddons-1.5.4:6
-	dev-libs/libxslt
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
-	=kde-apps/akonadi-24.08*:6
-	=kde-apps/akonadi-notes-24.08*:6
-	=kde-apps/akonadi-search-24.08*:6
-	=kde-apps/grantleetheme-24.08*:6
-	=kde-apps/kcalutils-24.08*:6
-	=kde-apps/kmime-24.08*:6
-	=kde-apps/kontactinterface-24.08*:6
-	=kde-apps/libkdepim-24.08*:6
-	=kde-apps/pimcommon-24.08*:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdnssd-${KFMIN}:6
-	>=kde-frameworks/kglobalaccel-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	x11-libs/libX11
-"
-RDEPEND="${COMMON_DEPEND}
-	=kde-apps/kdepim-runtime-24.08*:6
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
diff --git a/kde-apps/knotes/metadata.xml b/kde-apps/knotes/metadata.xml
deleted file mode 100644
index d925f2439758..000000000000
--- a/kde-apps/knotes/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index 8a91bd62a23c..73492b8abe99 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,2 +1,2 @@
 DIST kolf-24.08.3.tar.xz 1078708 BLAKE2B fe4451ba5b025cb696dc5fe28d6df98687739adbfc4bd0d13cf8e74b5a64efaa2bbf78fd71a9f5dbc2379d33800e724f84cee184b257b0c92091938ccc6ab68d SHA512 7c0aeabe383e26d85ca6dc27c0f98a141a5b36e1ec4dcf0741f6ce741ad9984e1891c12e58a30c00f9c192747cdcb58dcff8247677c546eff1d4921d1f2370c8
-DIST kolf-24.12.0.tar.xz 1080020 BLAKE2B 9a23fa1e2ec3c7e2b6cc2c9eafa93679cd3a0acb930bb307e4bfcad9bbdc391f790a50cd1fbef52d5da2cc936e3eb09a8131beabdca625a11d99c00e3d4f272d SHA512 1b59c81e79fa1a3a520554aa2f92b10f3c66490f8d4b3b648dc54507b124e675a44c1d87710d671881e10b0cbdebe5c5b435652464a15f2dbee3d48e0c38e0b0
+DIST kolf-24.12.1.tar.xz 1078916 BLAKE2B feb7e4a890d8e632217fb42b602117bbc0960fbcd761f524341300b62fde68292ff5d3866719300f127e0088db7903beb5732e7ab1f2ee2ebd467fce170d9cab SHA512 b0832161bf71537fe2f2458916f5d9848aaa0e1ee69f1a1181f8a0252074aa214774f9d0acc71367de4f15c39a66cedc4bad8d4a010acb133845c4f49616eadc
diff --git a/kde-apps/kolf/kolf-24.12.0.ebuild b/kde-apps/kolf/kolf-24.12.0.ebuild
deleted file mode 100644
index 7352ebb59a0b..000000000000
--- a/kde-apps/kolf/kolf-24.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Minigolf game by KDE"
-HOMEPAGE="https://apps.kde.org/kolf/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-# TODO: || ( 7zip gzip )
-BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/kolf/kolf-24.12.1.ebuild b/kde-apps/kolf/kolf-24.12.1.ebuild
new file mode 100644
index 000000000000..d71552470330
--- /dev/null
+++ b/kde-apps/kolf/kolf-24.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Minigolf game by KDE"
+HOMEPAGE="https://apps.kde.org/kolf/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+# TODO: || ( 7zip gzip )
+BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index fc87cdcd3d44..20ba011e05b2 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,2 +1,2 @@
 DIST kollision-24.08.3.tar.xz 310884 BLAKE2B 4364802a0d2a30d6020f75c73378ba60ce999941538d58092ea66ee88efde0cab3cfe2f171b71e7e58e83d93629a96c68d7a3e7f3c62d07c5e9b340d3f82ec94 SHA512 005d3e32e334776a12f22e7d9a593a29cacfd858b8e3a01cdcea4f67666e4f22d5aa553cd2c832dc7973f8d11d17cf434f3591873c6cb5346bc48158d64918c3
-DIST kollision-24.12.0.tar.xz 312000 BLAKE2B 423716062c9abbf075713728c3974e57891d9d9579da480ae33c6d2cfa7100f268d1b3648b8d6faeb0a00ec5a0306fd37e5b91504c12ebcfba9f154a4c2d5932 SHA512 b17739963450a3cf5797514e0092b9b3ab5c54a5f638fac8acc7eef2e9881ac0328cb399987d1f1f7e212be464abbdcf0e67fbbb60a1914eddc69c45f76535af
+DIST kollision-24.12.1.tar.xz 312024 BLAKE2B a018bf6c6396f14cc4a4598e78dcf2f59e16d05dabafbafff90f2658b6d7538732a962557d5844a63190f3d7a202f7c5d0a16d300e4ca9748b04bb9cbc8eecf7 SHA512 3b8d6013751caa7d9fcbb0164a7655c2c2216953f41322dc4de9acdbd10fe434845e74620b953de77e647d9239a20b71e809f7eada2e56afd4d19f941f955c75
diff --git a/kde-apps/kollision/kollision-24.12.0.ebuild b/kde-apps/kollision/kollision-24.12.0.ebuild
deleted file mode 100644
index f18bef55498f..000000000000
--- a/kde-apps/kollision/kollision-24.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Simple ball dodging game"
-HOMEPAGE="https://apps.kde.org/kollision/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-# TODO: || ( 7zip gzip )
-BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/kollision/kollision-24.12.1.ebuild b/kde-apps/kollision/kollision-24.12.1.ebuild
new file mode 100644
index 000000000000..6ed93277e2c0
--- /dev/null
+++ b/kde-apps/kollision/kollision-24.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Simple ball dodging game"
+HOMEPAGE="https://apps.kde.org/kollision/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+# TODO: || ( 7zip gzip )
+BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index fd2d4b429c03..b400419af806 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,2 +1,2 @@
 DIST kolourpaint-24.08.3.tar.xz 5301908 BLAKE2B f8debc39fc9e98480fb2d96a9611656295f88f5b2c174995aad4369e1ba33b56fc36b9126450a9db73bad3462fad581dd75e1c93bdc88b63ddaa1a7f9a94df81 SHA512 a72973a725c422fd595114c6831e31f1a7e66773cd05df79cb21c52e0eb9d3c17d69dc8dc8a761bf7450e41defe3d9ca2bfa62729a7953d8a0ca99ff04b6d1ec
-DIST kolourpaint-24.12.0.tar.xz 5310004 BLAKE2B 5827a98758cab8dc006a380a567cac848dfb7313277ef65d14ff84e55c21576e8ed66f2f34ab36578d5adadc24c8b4b712a4f64a9dedc0c634eed2a235455a59 SHA512 8f575948d46464ede3b5b942beb23440de47226c24fc53b56add222cd1ae24e134c8882a8c4d616e3fe303aa12c7dc3a096b91502c88650f320bb47a22933137
+DIST kolourpaint-24.12.1.tar.xz 5309924 BLAKE2B 7993cbb5594defd21cd4d2a86989b884234136596bdc5b0bbdcd5b794ff5f83c4ec014b09c0ff1a33cea056c8a1703eac1e07e058bdf733b45476f76217be102 SHA512 2f1755305f17d533effed13f47d25dee8a80b924fec66101751b418c02e560bbc4961d0adda587edd9d1fc540b32dcdc39904d18293a5728c35e75c7ea2c4803
diff --git a/kde-apps/kolourpaint/kolourpaint-24.12.0.ebuild b/kde-apps/kolourpaint/kolourpaint-24.12.0.ebuild
deleted file mode 100644
index 9f72c793ede8..000000000000
--- a/kde-apps/kolourpaint/kolourpaint-24.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Paint Program by KDE"
-HOMEPAGE="https://apps.kde.org/kolourpaint/"
-
-LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="scanner"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	scanner? ( >=kde-apps/libksane-${PVCUT}:6 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package scanner KSaneWidgets6)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kolourpaint/kolourpaint-24.12.1.ebuild b/kde-apps/kolourpaint/kolourpaint-24.12.1.ebuild
new file mode 100644
index 000000000000..67200f327581
--- /dev/null
+++ b/kde-apps/kolourpaint/kolourpaint-24.12.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Paint Program by KDE"
+HOMEPAGE="https://apps.kde.org/kolourpaint/"
+
+LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="scanner"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	scanner? ( >=kde-apps/libksane-${PVCUT}:6 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package scanner KSaneWidgets6)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index 40a944781608..a736a8a3144b 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,2 +1,2 @@
 DIST kompare-24.08.3.tar.xz 947796 BLAKE2B 5d8336dd51e69a2a5ce4fc498332b86f05584f8335891f4a0441530cb8f88a6fafe75c370b283bbf16aeb8012c69306b233043a0ba8e4b4e0e409158a36b7d1a SHA512 06b898ed3d8392db7d7cf93d43fbd8d8300bf1b4a177f181272bc052451d17fd039e2b2e8c5b3ecfeae8119654f492819a6939981b7ddcba008267e03c323561
-DIST kompare-24.12.0.tar.xz 959692 BLAKE2B 279368f8cc6a42cff0cb946ac94c940657badef09085d9c330b1a25e62d2d8f5d6a146d9fa2db4aa44c9b857954b677c7166cb2bbbebae743b057a98a2942f7e SHA512 8bafe298a5d0855b4f2d19f278cb67aa43c33b9068807cfc9ddc28d30fb27433d4f037ef3e42d51d84c809388b082116840492708482683a5261ad89691a2feb
+DIST kompare-24.12.1.tar.xz 959668 BLAKE2B 4681aeac9abd2ca83f26bbae8cdd447d155f13375f8ca97b0b4916195b3e48c178b9787e4feda1ecc6f6dd9bfa09e4b2861352eaff5db62b1cbee8dd3a7ae310 SHA512 06dca0e17063c02871a9b6876a10b696cf2bf08d3f590f53f31a398fa8da43d9431384f163ebe169718d4cd1526e7cdf9fe4cf9133f280212e9bd9856778ebdd
diff --git a/kde-apps/kompare/kompare-24.12.0.ebuild b/kde-apps/kompare/kompare-24.12.0.ebuild
deleted file mode 100644
index 459ee19bca8f..000000000000
--- a/kde-apps/kompare/kompare-24.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Graphical File Differences Tool"
-HOMEPAGE="https://apps.kde.org/kompare/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/libkomparediff2-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktexteditor-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kompare/kompare-24.12.1.ebuild b/kde-apps/kompare/kompare-24.12.1.ebuild
new file mode 100644
index 000000000000..4efd582d9e79
--- /dev/null
+++ b/kde-apps/kompare/kompare-24.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Graphical File Differences Tool"
+HOMEPAGE="https://apps.kde.org/kompare/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/libkomparediff2-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 044d6f3780d1..f7d31a4ade5b 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,2 +1,2 @@
 DIST konqueror-24.08.3.tar.xz 9716468 BLAKE2B 982ae56c48ca97b6faef75fe18801ea05b805dcfe4b087982f2e13261f4a505fe82ce3d2fc04cf722db9f932e3c2ae6d4e1b8d8892a005d1377f5577ab5ed0fb SHA512 a801cdfa8e874d4a623f28b7b64b69672ae82c907cf3267a75c733c334a8591ec6c566b7840ef4b217da0074ff336828729dac6266a4c46920334209d6d11b05
-DIST konqueror-24.12.0.tar.xz 9748480 BLAKE2B 3d0c3a3fc51ed24da0d9be69bc0814f7f0b4526c8cf529610dc8e573a09ffa94c7702bd21e76e72f4c172334600f6c9eb2fd65fc7cfcd4eeb05518158a04f004 SHA512 24a7320b6259160a7e17744eda9631617aed228db1705a3582d282102159fb3677cc3fcee28c0f1e42f5fc51d417f4d4e3c19cbf56400d0a96e687855f611ac2
+DIST konqueror-24.12.1.tar.xz 9750764 BLAKE2B 0f636ad3ff3f39b3d01a93e8a5805cffe94f1cb6376e4465d5e724163827130362701c1f211ccbf26dd8b1774efb1722a0f6087f535ea24c30a7abc8edd8c1d7 SHA512 a401651eb206076f33ad4adaff310fbec6ba7c29c948470a86de33a71ff84245defa5d11a6ffc6377f14beb7fbf2ef66a1e9fb3898e5910373f9d61a750265ce
diff --git a/kde-apps/konqueror/konqueror-24.12.0.ebuild b/kde-apps/konqueror/konqueror-24.12.0.ebuild
deleted file mode 100644
index 4a52232b3f21..000000000000
--- a/kde-apps/konqueror/konqueror-24.12.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit flag-o-matic ecm gear.kde.org optfeature
-
-DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/konqueror/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="activities speech"
-
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT="test"
-
-# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
-COMMON_DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,X,xml]
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kdesu-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6
-	sys-libs/zlib
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
-"
-DEPEND="${COMMON_DEPEND}
-	activities? ( kde-plasma/plasma-activities:6 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kio-extras-23.08.5-r100:5
-	kde-apps/kfind:6
-"
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	ecm_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 634122
-		$(cmake_use_find_package activities PlasmaActivities)
-		$(cmake_use_find_package speech QtTextToSpeech)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "bookmarks support" "kde-apps/keditbookmarks:${SLOT}"
-		optfeature "filemanager component" "kde-apps/dolphin:${SLOT}"
-		optfeature "SVG support" "kde-apps/svg:${SLOT}"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/konqueror/konqueror-24.12.1.ebuild b/kde-apps/konqueror/konqueror-24.12.1.ebuild
new file mode 100644
index 000000000000..7ab3afe8aa4f
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-24.12.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit flag-o-matic ecm gear.kde.org optfeature
+
+DESCRIPTION="Web browser and file manager based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/konqueror/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities speech"
+
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT="test"
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,X,xml]
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdesu-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	sys-libs/zlib
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	activities? ( kde-plasma/plasma-activities:6 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kio-extras-23.08.5-r100:5
+	kde-apps/kfind:6
+"
+
+src_prepare() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+
+	ecm_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 634122
+		$(cmake_use_find_package activities PlasmaActivities)
+		$(cmake_use_find_package speech QtTextToSpeech)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "bookmarks support" "kde-apps/keditbookmarks:${SLOT}"
+		optfeature "filemanager component" "kde-apps/dolphin:${SLOT}"
+		optfeature "SVG support" "kde-apps/svg:${SLOT}"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/konquest/Manifest b/kde-apps/konquest/Manifest
index 5ff289f60494..55ae7c700da6 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,2 +1,2 @@
 DIST konquest-24.08.3.tar.xz 861236 BLAKE2B 7ad22d376d29dd908582085f8e0f76fc3fa16001b08514d43d990dca86e4fb42c702764f3340ea8e0605598e36cc526e94c08c2bbe99814d269748694f383fc0 SHA512 5fff01aa4b8ce37347516feabc0517c66aa4187efe67191bde03db8743c8122b93b135b0afd51de34e00b27d98463b6909e819a7c307c91b13ff057f90fdd0e2
-DIST konquest-24.12.0.tar.xz 861264 BLAKE2B fd632af2efcb7b68be479ac0be8d2a62c0838a0c948a52e7c52d5630b58d1ae80369a1e6c02343b61d5dca920af224d16ad093e4fec64da1a8304b370b6003da SHA512 fa114f93e09d2f1a8271cb3a698d797cbe16d374d33a5fa1454d2f940e87e714c21914ce58349aaace99fbf2951408fc4626160cbfc49219d68aa0cf5dff37d7
+DIST konquest-24.12.1.tar.xz 861260 BLAKE2B 73d0916964523484d80acdbac0f7c585c00b6ce95bdd820aace4a0678ae65b510cdbc142aee1cf45540666dd9400b3c549788efd4abde5d22f9be47f542e2e8b SHA512 fcdcc130573f136df0d6f68e1dd43997b8428a12889dd5436dc37f9f7005efc4d3179901f5ca55a8b9681c224f3b6fbced706745ca32ab3cb1c971186c385733
diff --git a/kde-apps/konquest/konquest-24.12.0.ebuild b/kde-apps/konquest/konquest-24.12.0.ebuild
deleted file mode 100644
index 09ea67a6f980..000000000000
--- a/kde-apps/konquest/konquest-24.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Galactic Strategy KDE Game"
-HOMEPAGE="https://apps.kde.org/konquest/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtscxml-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/konquest/konquest-24.12.1.ebuild b/kde-apps/konquest/konquest-24.12.1.ebuild
new file mode 100644
index 000000000000..bd7ffd3bf448
--- /dev/null
+++ b/kde-apps/konquest/konquest-24.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Galactic Strategy KDE Game"
+HOMEPAGE="https://apps.kde.org/konquest/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtscxml-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index db2d71ed5fae..d16044b9aa5f 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,2 +1,2 @@
 DIST konsole-24.08.3.tar.xz 1803744 BLAKE2B efdebf8879c4908ff177bbf4961c5da4dd0b0d31eb965eba657011d472b12c181e07d89baf4e176b76fe7a749b2a3cec78760bc11685b751a6e1e9c1e60328fd SHA512 39f012c233517b2185c440b03548502e044b0a6561587e40227ef339637e2fa6b8a635873da028e9356dc99fe2cc76d5dc8d957189f2a4b5eb561543c2ab5cba
-DIST konsole-24.12.0.tar.xz 1818624 BLAKE2B b446cbfbb746b62a2945af0c8d30d8d268def380b644ae1e59d9f18b4892d688fe8472805c16e40f3969b1490a21e2ba1d2d884b73a3d5ae2371c30eab99547c SHA512 f9b1fb2bc9c0e233c0663a9d8964bff29e8c7cbcb322753e60a5b315bbaaf05c1b38b26af882a2a267f258450cd304a3c8a817425a1e9653d850a53cc530cbe4
+DIST konsole-24.12.1.tar.xz 1818916 BLAKE2B 59cf838249490d8461ca0e8d31eed8026637cac35df1d38a1f6fb50340e975f4cdcf4245105425a609976578dac5538201909688f73b924ddf504683439effd3 SHA512 62ef5c4ce7fa24d02f61f1a487d0a07ee6bae6102295b6f382063b09a28246b10c3ca01b8b545d871aba33f8f8e492b603b13cf9de598ae758c84be7a5f67357
diff --git a/kde-apps/konsole/konsole-24.12.0.ebuild b/kde-apps/konsole/konsole-24.12.0.ebuild
deleted file mode 100644
index da8629fa24ec..000000000000
--- a/kde-apps/konsole/konsole-24.12.0.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
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="X"
-
-DEPEND="
-	dev-libs/icu:=
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=dev-qt/qtmultimedia-${QTMIN}:6
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kglobalaccel-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kpty-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_X11=$(usex X)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# DBusTest: drkonqi process interferes. bug 702690
-	# TerminalInterfaceTest: unbelievably flaky, bug 862594 and bug 662756
-	local myctestargs=(
-		-E "(DBusTest|TerminalInterfaceTest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/konsole/konsole-24.12.1.ebuild b/kde-apps/konsole/konsole-24.12.1.ebuild
new file mode 100644
index 000000000000..f39aa68fbda5
--- /dev/null
+++ b/kde-apps/konsole/konsole-24.12.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+DEPEND="
+	dev-libs/icu:=
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kpty-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# DBusTest: drkonqi process interferes. bug 702690
+	# TerminalInterfaceTest: unbelievably flaky, bug 862594 and bug 662756
+	local myctestargs=(
+		-E "(DBusTest|TerminalInterfaceTest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 179c3cdcaef0..c6e85cbf15b7 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,2 +1,2 @@
 DIST akonadi-calendar-tools-24.08.3.tar.xz 264972 BLAKE2B 42ac0a8451ac363d08b0ea322259c31423ced43aab36814b88e49adea48593a9806c36450ee5ca194f59ca6ecb621912890087d315e44b20438ebf5dec8b92d4 SHA512 0f7a5f7ef5939191b5a834a80f6b4f0bc32125dde62135eeb1a55235bbffeb7905b8e3c22b1aa57648e132a5f5a5172060c91025a0bbd4693bc363dfcefd36ef
-DIST akonadi-calendar-tools-24.12.0.tar.xz 269360 BLAKE2B 5fadc86b2788e3d0c21dc8c2ba258b964e65a49e676a9fe1d6f197b43c8b7ce4bedf70d08d1794149903f9516079546350ce45727bdc0c12fde988161bf262e9 SHA512 dbfcb7282f48cf3bd88d2f896bb6220d8ab5bfcb5cf86068e0b791b272e8d8e2957a89f3e12390baa408a9bee8a650f4cdc97d514a4ee34af1db749ce308f411
+DIST akonadi-calendar-tools-24.12.1.tar.xz 269344 BLAKE2B 1e23f31c2de6c9ba74ec2a547702666218226443b2258a6b11c2e3aad63690fe69b5038419a25fd316ca1b389a100574fed3a090f0eeae6a691bf37f8255fadd SHA512 ffd91a886a8b94d22fb1102cff28aa1e64b21bf3b1af4aad9b844df3d6cacbac6fcbf8413682c2d7d2067dbfab2d1a1dfbec47f4bf751b9fe0a8b328db317477
diff --git a/kde-apps/konsolekalendar/konsolekalendar-24.12.0-r1.ebuild b/kde-apps/konsolekalendar/konsolekalendar-24.12.0-r1.ebuild
deleted file mode 100644
index b7b0a359dfa9..000000000000
--- a/kde-apps/konsolekalendar/konsolekalendar-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoff"
-KDE_ORG_NAME="akonadi-calendar-tools"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-inherit ecm gear.kde.org
-
-DESCRIPTION="Command line interface to KDE calendars"
-HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-calendar-${PVCUT}:6
-	>=kde-apps/calendarsupport-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/akonadi-calendar-tools-common-${PV}
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-	cmake_comment_add_subdirectory calendarjanitor
-}
diff --git a/kde-apps/konsolekalendar/konsolekalendar-24.12.1.ebuild b/kde-apps/konsolekalendar/konsolekalendar-24.12.1.ebuild
new file mode 100644
index 000000000000..069c7a0e6d79
--- /dev/null
+++ b/kde-apps/konsolekalendar/konsolekalendar-24.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoff"
+KDE_ORG_NAME="akonadi-calendar-tools"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+inherit ecm gear.kde.org
+
+DESCRIPTION="Command line interface to KDE calendars"
+HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-calendar-${PVCUT}:6
+	>=kde-apps/calendarsupport-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/akonadi-calendar-tools-common-${PV}
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+	cmake_comment_add_subdirectory calendarjanitor
+}
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 7e3b06c6f884..054fa2a5e67b 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,2 +1,2 @@
 DIST kontact-24.08.3.tar.xz 868664 BLAKE2B cd7c317c1b16fe2090c4fb176e62cfbadb13c5a16aa7f2762ba03e353a1c8b9d2be34902009be8be63e864e5eafb5c85c6aed0d21ccbbb998c49b4813d2ebc8a SHA512 20e8ad2aad370746a8ecd4277ffd66c786386023fde19199eb15423c84d0c9c90084dcfdc9818bd4cc3093232ad9cfced6a5264ff69c34951610c594e4a52c31
-DIST kontact-24.12.0.tar.xz 868648 BLAKE2B 28ffc8f01aa124762a47abdcd4d4f58fcb86bbf554dd78617a744bbdd59dc8fae23c19add3d9222fc0ff5d87dbc88e1d89333c1b9c06ba2c47b94de8cbe29baa SHA512 e6c3d9a89aa42f87045361c13f98cc8a00b86865e5dc12eca65b2311e3edce53520cc9415dd80d1426ddb5a46f81d70151c9fe6274a107f10b8873be22a574a0
+DIST kontact-24.12.1.tar.xz 868680 BLAKE2B f3cc2bed95079afbdfc4ad66f7068b5c67e3c795291d2372ed9ea893bb9b2a29a67f129d80b207d1deb6391198b9666b0111ea21233060cdaa2c224d95c0d109 SHA512 cb194c7977afe3b303b2242a97121c7ecd3ac1c472a7fdbb6844ee4a1aa2118a53c4414be1ed466c66533a1e4c9ba15777abc6a5500438fcdaafc749f5d995d5
diff --git a/kde-apps/kontact/kontact-24.12.0-r1.ebuild b/kde-apps/kontact/kontact-24.12.0-r1.ebuild
deleted file mode 100644
index b3c7eff0fbf1..000000000000
--- a/kde-apps/kontact/kontact-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Container application to unify several major PIM applications within one"
-HOMEPAGE="https://kontact.kde.org/ https://apps.kde.org/kontact/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-apps/grantleetheme-${PVCUT}:6
-	>=kde-apps/kontactinterface-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/mailcommon-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontact/kontact-24.12.1.ebuild b/kde-apps/kontact/kontact-24.12.1.ebuild
new file mode 100644
index 000000000000..92f55d7b69fa
--- /dev/null
+++ b/kde-apps/kontact/kontact-24.12.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Container application to unify several major PIM applications within one"
+HOMEPAGE="https://kontact.kde.org/ https://apps.kde.org/kontact/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-apps/grantleetheme-${PVCUT}:6
+	>=kde-apps/kontactinterface-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/mailcommon-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index 8199e614baf9..4dc83e0bfe6f 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,2 +1,2 @@
 DIST kontactinterface-24.08.3.tar.xz 40704 BLAKE2B 5f7f534cf53a6f66bab54a666cea7d457040184ddf6015286fc41456696a30b942e4e14bc6ec4ae1d33c1073a2f71fa3c70d9254815ddd3a62695b7ad0055de5 SHA512 cabe78c820b1d98a3ea9931f223746064271fc34547642c6f3198806242e4edf49be9ce0d4e4765cd39833bcfc20e9f29077f4cf1ea71868c16b4d4cfaf545fd
-DIST kontactinterface-24.12.0.tar.xz 40736 BLAKE2B fd3c4d49b32f367a496550d5b272860cf039144bb5851fa175f31b1b3493b3a361bf1dbfa053b3d10345e9f44c0d7166ff6686a8bbbf71170b9be7ef58de3949 SHA512 1457a6a7065bc8d22670b9fe156ebe393339db3b476fdd64b792e5e5241220712a2a5fc7cd7f7e5e14ace6e204c9eb6248b99fe525988d469e774f8e8d9a0776
+DIST kontactinterface-24.12.1.tar.xz 40736 BLAKE2B cc8beeb20386178fb24b23df6475d498fb351888a0774a7d67daea10c0c7649b250920d0e2c3f92c1e07859fbdc9b58219acf4ca89729ecbfa82cca76085e381 SHA512 91b0933fb16403402b18ae05621e5210fac1a6185644df82af2616a2528c92beb98dd645c487964f8d581cf015bb00c97a2d05ac61908b61252377d37d26035c
diff --git a/kde-apps/kontactinterface/kontactinterface-24.12.0-r1.ebuild b/kde-apps/kontactinterface/kontactinterface-24.12.0-r1.ebuild
deleted file mode 100644
index 30425afe867e..000000000000
--- a/kde-apps/kontactinterface/kontactinterface-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for embedding KParts in a Kontact component"
-HOMEPAGE="https://api.kde.org/kdepim/kontactinterface/html/index.html"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,X,xml]
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontactinterface/kontactinterface-24.12.1.ebuild b/kde-apps/kontactinterface/kontactinterface-24.12.1.ebuild
new file mode 100644
index 000000000000..d8b2d2d38c94
--- /dev/null
+++ b/kde-apps/kontactinterface/kontactinterface-24.12.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for embedding KParts in a Kontact component"
+HOMEPAGE="https://api.kde.org/kdepim/kontactinterface/html/index.html"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,X,xml]
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index f9281b97c0a0..2111b43c8d04 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,2 +1,2 @@
 DIST korganizer-24.08.3.tar.xz 2938660 BLAKE2B 23f4294c4e657e1dc7f9d69a37378d8c49f584f67ccd41d5e5cbf5462b108e2388cc85a36163fd6a3a09c7c268daa3d27dd6b931286ac39524b0122172ca82db SHA512 dfcf2725f1c0b626aeee1b4050798eece465cb8660f7bf64bbb9c49852109d1dd5891332b2c17c78e3147d451eff35edb5ae675f7152cacd8e78f5a84242cf6f
-DIST korganizer-24.12.0.tar.xz 2940220 BLAKE2B 097737d76d7609776043a5dd9eb4c206029d7f7271f04698b750e85cf15427ed309c1cb6fe1a5d5c84c929a34bb6eb792957422827f4a110b33410b4e73bd836 SHA512 fe66102bf00c34571a329895e4dcbb45c2cbdf3927e3c8127467913ae3d054cd78b1dff460d290b0e14607f9d87a030656954d2418adadeb0c56013192a8c538
+DIST korganizer-24.12.1.tar.xz 2945392 BLAKE2B 219a518b1da08520f92b27236df7851179ea8c7b24ae89f88ead5bf6902602dfa06919163d6275115123eb7af356e15c21a5e42fee5cefdc3176a7d6a238f774 SHA512 b77ee962dfa7a584c0cc356dc1266236f6303d6cde06a5f61ad6a39f978dd7133e056640f2b1e3b38826b4c52720cfcaa45c288dfd18490c9b5941a0dc864e28
diff --git a/kde-apps/korganizer/korganizer-24.12.0-r1.ebuild b/kde-apps/korganizer/korganizer-24.12.0-r1.ebuild
deleted file mode 100644
index 3f45f20bf9e4..000000000000
--- a/kde-apps/korganizer/korganizer-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
-HOMEPAGE="https://apps.kde.org/korganizer/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="activities telemetry"
-
-# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=dev-qt/qttools-${QTMIN}:6[widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-calendar-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/calendarsupport-${PVCUT}:6
-	>=kde-apps/eventviews-${PVCUT}:6
-	>=kde-apps/incidenceeditor-${PVCUT}:6
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/kontactinterface-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kholidays-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	x11-libs/libX11
-	activities? ( kde-plasma/plasma-activities:6 )
-	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-apps/kldap-${PVCUT}:6
-	test? ( kde-apps/akonadi-config[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kdepim-addons-24.07.50:*
-	>=kde-apps/kdepim-runtime-${PVCUT}:6
-"
-BDEPEND="test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
-		$(cmake_use_find_package telemetry KF6UserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/korganizer/korganizer-24.12.1.ebuild b/kde-apps/korganizer/korganizer-24.12.1.ebuild
new file mode 100644
index 000000000000..a2903c21a9c8
--- /dev/null
+++ b/kde-apps/korganizer/korganizer-24.12.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
+HOMEPAGE="https://apps.kde.org/korganizer/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities telemetry"
+
+# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qttools-${QTMIN}:6[widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-calendar-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/calendarsupport-${PVCUT}:6
+	>=kde-apps/eventviews-${PVCUT}:6
+	>=kde-apps/incidenceeditor-${PVCUT}:6
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/kontactinterface-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kholidays-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	x11-libs/libX11
+	activities? ( kde-plasma/plasma-activities:6 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-apps/kldap-${PVCUT}:6
+	test? ( kde-apps/akonadi-config[sqlite] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kdepim-addons-24.07.50:*
+	>=kde-apps/kdepim-runtime-${PVCUT}:6
+"
+BDEPEND="test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index c0ad8dac7472..5c11ada28e65 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,2 +1,2 @@
 DIST kpat-24.08.3.tar.xz 3735564 BLAKE2B c79d4aa215618f1b3ca20ed25b159c4678eb0ef8833c7afcb18c47b9b96cb1c74c69b277d7c4bf77c29ae27afd2489f6c6fbf28baa246252340451c121f3aae1 SHA512 9f9f9328549a18d40691c772c04d364c7aa98232b579a79949776e86cffe051eea575375e8cd8130126721c9a8c792cc124164983d7c22bd2a896c5af61413c6
-DIST kpat-24.12.0.tar.xz 3736404 BLAKE2B 85f59af2d30e231b77a1deb18243b62fbfde31618d164e79c18853d2b59473382fc205adbf1ca122a9a792c1355cc2f4f7843bfbd7c72ce20d7ac0f31609d766 SHA512 e175a8fe94c6a2899427a1057ab52460dca886567de755fb5aa76c08ec03933ee72758775666a4d8c9288d241c8acae1260f3201a1046653309a35aa24cd0625
+DIST kpat-24.12.1.tar.xz 3738316 BLAKE2B d9bba1009c64c0e9d6d110c439aa2ad8268b84fcf302e92801c2802593c44335d7fe5e2767a72506ee7dc00ae4b5c12fa497ec7408e3839a23896656ec6a97b8 SHA512 d85878d56c1b2eb615df3049a3ab71f9b32896633c21532ca84339fd41b93cbdd577f2a470d9d15d25c48debe24d05b7c28cbd15b0950bc8274c6c48722a1061
diff --git a/kde-apps/kpat/kpat-24.12.0.ebuild b/kde-apps/kpat/kpat-24.12.0.ebuild
deleted file mode 100644
index a909eca128b6..000000000000
--- a/kde-apps/kpat/kpat-24.12.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE patience game"
-HOMEPAGE="https://apps.kde.org/kpat/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	dev-games/freecell-solver
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-# TODO: || ( 7zip gzip )
-BDEPEND="app-alternatives/gzip"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_BH_SOLVER=OFF # bug 733502, requires unpackaged dependency
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kpat/kpat-24.12.1.ebuild b/kde-apps/kpat/kpat-24.12.1.ebuild
new file mode 100644
index 000000000000..285a43af7026
--- /dev/null
+++ b/kde-apps/kpat/kpat-24.12.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE patience game"
+HOMEPAGE="https://apps.kde.org/kpat/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	dev-games/freecell-solver
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+# TODO: || ( 7zip gzip )
+BDEPEND="app-alternatives/gzip"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_BH_SOLVER=OFF # bug 733502, requires unpackaged dependency
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index ed97f3510a3f..ed58742dc35f 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,2 +1,2 @@
 DIST kpimtextedit-24.08.3.tar.xz 176384 BLAKE2B abebd9233ecd9c02b4697bd74a21443f64a75194041215078d0b6d74eaf137c90baa3f8e9511fd5402c3b18820d34a2db854d7ae961a65900d69a6205b8d6118 SHA512 9de055ef7f12bc65411f901c9b694e07c51bfdb388f294cc7d64affcc3e899d31f2af39765e207bd2d3b6eaea33473c1f67449ed55fdd04eed691d5f1b6409e7
-DIST kpimtextedit-24.12.0.tar.xz 176660 BLAKE2B e8c276eb469c4e399b3e6163ec316826e9294d4ff4414f53bf3e27d60a8a56b382428872088ab407d2c6405a5852248b2d254a7cfe14412dc68c6448970eaae1 SHA512 402e34bdc93bd4f5fe3647cbb9363d706b8dd95cd7364aec4e1152a16646fe4e1e542ee5ecb8f8a5c3ef1bfb0fc999aec42f2dee1871a12283ad199c2eaaa196
+DIST kpimtextedit-24.12.1.tar.xz 176660 BLAKE2B 5ef994c37605cfe9eb4412084562a2836fc103bd75891f8e83381e746c354885ef6799c0bf577a314b01ea7412cd012c717de6917ea539109944761e7b9b77d3 SHA512 267b0340ee7a944c05f665f3ad30920244082842988452cd84db8fae8e07e9618348548b974906e09343b301bb12c5c81da358e92c57d52551c7d7d82b0cfe60
diff --git a/kde-apps/kpimtextedit/kpimtextedit-24.12.0-r1.ebuild b/kde-apps/kpimtextedit/kpimtextedit-24.12.0-r1.ebuild
deleted file mode 100644
index 0d90f7ea031c..000000000000
--- a/kde-apps/kpimtextedit/kpimtextedit-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Extended text editor for PIM applications"
-
-LICENSE="LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="speech"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/ktextaddons-1.5.4:6[speech?]
-	>=dev-qt/qtbase-${QTMIN}:6[widgets]
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kpimtextedit/kpimtextedit-24.12.1.ebuild b/kde-apps/kpimtextedit/kpimtextedit-24.12.1.ebuild
new file mode 100644
index 000000000000..cffb2279f7c5
--- /dev/null
+++ b/kde-apps/kpimtextedit/kpimtextedit-24.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Extended text editor for PIM applications"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="speech"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/ktextaddons-1.5.4:6[speech?]
+	>=dev-qt/qtbase-${QTMIN}:6[widgets]
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kpkpass/Manifest b/kde-apps/kpkpass/Manifest
index bca2d67f5210..5bca0cf44c4d 100644
--- a/kde-apps/kpkpass/Manifest
+++ b/kde-apps/kpkpass/Manifest
@@ -1,2 +1,2 @@
 DIST kpkpass-24.08.3.tar.xz 29428 BLAKE2B 5a86af1f6ffb1c0ec2bf6aa21942a01fe7ddf50e9096b8bf6a91dac545c60a076125dc5c8a827ae08875eac75637e880212e4acb4c9ce51a33a05e9a4e2b7add SHA512 41604ac1db4571d6119e1673648b02c5ac2d42e311153042be9bab1e4ed9755bffaf454a6e4ee1582de6d0cceb170c98d7af18fccce2ac1d93c339839e27aa2b
-DIST kpkpass-24.12.0.tar.xz 29480 BLAKE2B 573852f5ccc7eaf9fa01d40842b47fcf3d4e99b3c67b374d559f8ab0870cbd90f651368934d01876ba72c56a59c756d5a133a5aca9ed1d2d6d612c684efbdf56 SHA512 b84840ab20b3725f36e6f9f4a7fa32f179e86d015c9b9cdd2dca4359b469dd618b472d9117008d25d58f93f827080729031bd8bcf699015504f3d598a28049f4
+DIST kpkpass-24.12.1.tar.xz 29504 BLAKE2B 494ab967742bc373d2ad800e4640f290193767e5046eb4bc822191fc91a8886bb4dd9aa7663b6aa8cd710ed500cf46c03f46af2f8d247138dfb373296325850f SHA512 d62fe22744ce8e45fa346d1384c48cb2e750c9400fef084db0a8c55f92746369d3b1a762f028c35360f372427eadb782e6bac4e08a52fe52a550dfee0798a55a
diff --git a/kde-apps/kpkpass/kpkpass-24.12.0-r1.ebuild b/kde-apps/kpkpass/kpkpass-24.12.0-r1.ebuild
deleted file mode 100644
index 0f3ac7c222de..000000000000
--- a/kde-apps/kpkpass/kpkpass-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library to deal with Apple Wallet pass files"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
-	>=kde-frameworks/karchive-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kpkpass/kpkpass-24.12.1.ebuild b/kde-apps/kpkpass/kpkpass-24.12.1.ebuild
new file mode 100644
index 000000000000..a0b77f37a798
--- /dev/null
+++ b/kde-apps/kpkpass/kpkpass-24.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library to deal with Apple Wallet pass files"
+HOMEPAGE="https://apps.kde.org/kontact/"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-frameworks/karchive-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index e6251d80ee80..c31379f37458 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,2 +1,2 @@
 DIST kqtquickcharts-24.08.3.tar.xz 30872 BLAKE2B f1e72b8d526f88edb44e078ec27007ddfee535e3ab34d01d77769804490b25617e2c02f3ad2388b9b42eb504f87eb94b18c4d210989f8997fe8fbb7de5cea78a SHA512 b67e205c97e1b52fc38dc11a7ce6eb4570adec87d408b79c4c45eac636b4795d68a329e3f14fd105a5f924f8b57286f358fc1cb1ea4b9f98f48cf57daa87f37b
-DIST kqtquickcharts-24.12.0.tar.xz 30864 BLAKE2B b93c4d38001f41314f0f5a21e3f5eab97bf198c19fc563180fd79cdb642a6b2882f74cc9df7853a3253b47a31ec8d463c8a890fe43e9bbb04555b086dbfffc60 SHA512 5c0c24dcc769d0b8c82a4eeabcececcc874018d9931159a3efffa61fbd4c59e3cd0eda9d6c21e7ea834adc4b613238d313efd52d61c663cc4035c2f54225ffd2
+DIST kqtquickcharts-24.12.1.tar.xz 30856 BLAKE2B 24cdaa9d2dd9154a3d93390fa582876cc5466587d149095a7d364d8c734d9732ba4e87407db3fda0a7ee31427926ec68dba61db37e84c0fa0d68ca9b364523c4 SHA512 1748b4fee5276c93ac658bfef816bba38b97e58fd1d473304f2b4531fc9a97f91ad94b477503c959df615c54489dde82aa947ef7d427d84e68df6cd57b0f33b4
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-24.12.0.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-24.12.0.ebuild
deleted file mode 100644
index 48d9e3c001bd..000000000000
--- a/kde-apps/kqtquickcharts/kqtquickcharts-24.12.0.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
-
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-24.12.1.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-24.12.1.ebuild
new file mode 100644
index 000000000000..818f31f2d9f4
--- /dev/null
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-24.12.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index 2c44b6ee546f..999ac28ac5ac 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,2 +1,2 @@
 DIST krdc-24.08.3.tar.xz 1555504 BLAKE2B fb4c974da9fce57ad1c054095463084ba11fc3f66025a88388845a05630f738ba796a018a3387d5e70c26c8bae2fbe9803d9981ca2c387bbe6b90529bd38527b SHA512 e3ee023c7aaa01f725321086753c5ef470ec32f2994a78baec0a9b2627f224e6b631a205dbacbbb73d118fa626425f179d124db7992d06237e473efc440da572
-DIST krdc-24.12.0.tar.xz 1558292 BLAKE2B c0f6d2b6153e7e4ab92bbbb6d35adcf89bfbc7149ebc0c73c57389fc04f2e44b34ef2944390215f4028d45071edc8443dfa9f25a457a1bd0b73cfddc6748c8a8 SHA512 149d18c8178cbd75bf9d40afb581188dd35b266306c10a92df41d594b77ee90286d52fc84a23073df49841b71df447b40db29aac5c69d359b14c83c18b084f4c
+DIST krdc-24.12.1.tar.xz 1558504 BLAKE2B 471af2fbefae43c1e77fce9a3989db0b94f1973bc94871b1e1d6ecdd779655e8a9a95b379d790283a2606ca79a11f16aabe1c810871ce2da06d953364e8439dd SHA512 fc823573f9206e9b3529f78bcb844e020b8b2e35a96def130b18de1e7da39e9edaafaae76b684c79014be383ed25dd23b221e40dde55607e3159700ad70a9525
diff --git a/kde-apps/krdc/krdc-24.12.0.ebuild b/kde-apps/krdc/krdc-24.12.0.ebuild
deleted file mode 100644
index f4348cb59627..000000000000
--- a/kde-apps/krdc/krdc-24.12.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Remote desktop connection (RDP and VNC) client"
-HOMEPAGE="https://apps.kde.org/krdc/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="activities +rdp +vnc"
-
-#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=dev-qt/qtwayland-${QTMIN}:6
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdnssd-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	activities? ( kde-plasma/plasma-activities:6 )
-	rdp? (
-		>=kde-frameworks/kio-${KFMIN}:6
-		>=net-misc/freerdp-2.1.0:2=
-	)
-	vnc? (
-		net-libs/libssh:=
-		>=net-libs/libvncserver-0.9
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="x11-misc/shared-mime-info"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities PlasmaActivities)
-		-DWITH_RDP=$(usex rdp)
-		-DWITH_VNC=$(usex vnc)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/krdc/krdc-24.12.1.ebuild b/kde-apps/krdc/krdc-24.12.1.ebuild
new file mode 100644
index 000000000000..9fb140c28f87
--- /dev/null
+++ b/kde-apps/krdc/krdc-24.12.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Remote desktop connection (RDP and VNC) client"
+HOMEPAGE="https://apps.kde.org/krdc/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="activities +rdp +vnc"
+
+#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdnssd-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6 )
+	rdp? (
+		>=kde-frameworks/kio-${KFMIN}:6
+		>=net-misc/freerdp-2.1.0:2=
+	)
+	vnc? (
+		net-libs/libssh:=
+		>=net-libs/libvncserver-0.9
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="x11-misc/shared-mime-info"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package activities PlasmaActivities)
+		-DWITH_RDP=$(usex rdp)
+		-DWITH_VNC=$(usex vnc)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index d5afe05a2111..7cf4bfe5e57d 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,2 +1,2 @@
 DIST kreversi-24.08.3.tar.xz 1032744 BLAKE2B d518ef238415757dd12a24e7b8281b89e8dfd260d1aa38cd26fd7a179baf1922fe4e51edf293cfd33e2e57c84679619b15bd713b885306c20be0034d0c9e78ea SHA512 707e227af089c9b88bb8ab7d6656d0bca612e9563a54b76f97ca0088bdacd8241f2fb892831bfc32a99a1b7ffd60b66976f8c165bfa2e75dda0b4de612df0841
-DIST kreversi-24.12.0.tar.xz 1033560 BLAKE2B 717c38bd97eacb21346c6a07e75f5f318c841dd568b383e6917c73be00549393f19644e87cc7b03fce72487d2a6a9edd254cae3f2fe66938dcd1d20e78b855a3 SHA512 f47b0516e128520dc5e69ac74cf4c13aad4e8a277be366c7af77865039a26d6d22d51b71bd11e53b8fd036cfa3c15b5733deedb1143138269eb2030f119df7b5
+DIST kreversi-24.12.1.tar.xz 1033572 BLAKE2B 037df0ccb76604b9572ce035d737c6d88688e89ea75c1d6860c95b2eec94bf51c75696faa95a23454362d72e3e2e606705c31a9e9627cb03807a613f3b8fa285 SHA512 bca89915d69d64882f5c2488331ac6037e7e5b58e7a426aeffe7683f31415713f5eacfbc11e39feefd18ecc5d9f11121d67c4508386e5ce49939499d088d7cfc
diff --git a/kde-apps/kreversi/kreversi-24.12.0.ebuild b/kde-apps/kreversi/kreversi-24.12.0.ebuild
deleted file mode 100644
index c4b8c9fe5f0f..000000000000
--- a/kde-apps/kreversi/kreversi-24.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Board game by KDE"
-HOMEPAGE="https://apps.kde.org/kreversi/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-# TODO: || ( 7zip gzip )
-BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/kreversi/kreversi-24.12.1.ebuild b/kde-apps/kreversi/kreversi-24.12.1.ebuild
new file mode 100644
index 000000000000..a6919f271826
--- /dev/null
+++ b/kde-apps/kreversi/kreversi-24.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Board game by KDE"
+HOMEPAGE="https://apps.kde.org/kreversi/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+# TODO: || ( 7zip gzip )
+BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 773d8ac98800..93ec53525600 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,2 +1,2 @@
 DIST krfb-24.08.3.tar.xz 1202804 BLAKE2B 6ac06db67509452041e969e04ec42ca735dd352d391bd7c97cf6f6ac5dc80cc9d85b1c6133a26170f62b194e4b4e0fb241f1206b85c745630468b30e098ad9a8 SHA512 c5279b8d740f9d12f1f064de2b333a9b47f4ea7768bca51831aa6386e39056f58240cee2ac3c9cc01a2fdb2fc9cde915ced71196d2cd3761e54b2860826fd763
-DIST krfb-24.12.0.tar.xz 1217900 BLAKE2B 57286b3e34abc4c9a83ac0e1d7a445882c0dfb4507d8773f12f0dc7f3f31255274110b9ec4617d4a68d76a05be4ef809fa447c227121fff518091ae9b44c5d3d SHA512 bed11c2fb1a4c0f65e4f7ef7ecb7cf65a66c11ea684609b5e8afde0fb2c7e376392e84a195f8b37ce5905838cc3a63e3bf10aef76db39aee6fde0a9490e32a1c
+DIST krfb-24.12.1.tar.xz 1217928 BLAKE2B 2ff8edc0462494756b9bdbf9651b0c99141081e2905fde42251a5fa1c65ce87b7590fdd8c5c90a18ca9a475ed3d332e2ae106082bdac3ac7c53186345d0c512e SHA512 9c62afaed44795ba541769219b18ef6509eb8a9778b332b78fdd57a4058f28866228500f1d95b80618be073ff0225377c5b29d5cdde012add2e1f3f0dacbb621
diff --git a/kde-apps/krfb/krfb-24.12.0.ebuild b/kde-apps/krfb/krfb-24.12.0.ebuild
deleted file mode 100644
index 6316503ab1ce..000000000000
--- a/kde-apps/krfb/krfb-24.12.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="VNC-compatible server to share Plasma desktops"
-HOMEPAGE="https://apps.kde.org/krfb/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="wayland"
-
-# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
-COMMON_DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6=[dbus,network,widgets,X]
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kdnssd-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=net-libs/libvncserver-0.9.9
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-	wayland? (
-		dev-libs/wayland
-		>=dev-qt/qtwayland-${QTMIN}:6
-		kde-plasma/kpipewire:6
-		kde-plasma/kwayland:6
-		>=media-video/pipewire-0.3
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	wayland? ( >=dev-libs/plasma-wayland-protocols-1.5.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	wayland? ( sys-apps/xdg-desktop-portal[screencast(+)] )
-"
-BDEPEND="wayland? ( >=dev-qt/qtwayland-${QTMIN}:6 )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_PIPEWIRE=$(usex !wayland)
-		$(cmake_use_find_package wayland PlasmaWaylandProtocols)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/krfb/krfb-24.12.1.ebuild b/kde-apps/krfb/krfb-24.12.1.ebuild
new file mode 100644
index 000000000000..7d448aa5f5cf
--- /dev/null
+++ b/kde-apps/krfb/krfb-24.12.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="VNC-compatible server to share Plasma desktops"
+HOMEPAGE="https://apps.kde.org/krfb/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="wayland"
+
+# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,network,widgets,X]
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdnssd-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=net-libs/libvncserver-0.9.9
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXtst
+	x11-libs/xcb-util-image
+	wayland? (
+		dev-libs/wayland
+		>=dev-qt/qtwayland-${QTMIN}:6
+		kde-plasma/kpipewire:6
+		kde-plasma/kwayland:6
+		>=media-video/pipewire-0.3
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	wayland? ( >=dev-libs/plasma-wayland-protocols-1.5.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	wayland? ( sys-apps/xdg-desktop-portal[screencast(+)] )
+"
+BDEPEND="wayland? ( >=dev-qt/qtwayland-${QTMIN}:6 )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_PIPEWIRE=$(usex !wayland)
+		$(cmake_use_find_package wayland PlasmaWaylandProtocols)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 435034bb0d18..ff0a08e8812f 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,2 +1,2 @@
 DIST kruler-24.08.3.tar.xz 285700 BLAKE2B abd87acde399d5a38105f55444abbffc147bb0851a6f7fc68f193f4f13ad238d86175b47bafb53824da6cb0647f6e0913c225e618d718d05775dbb0fefa5bfc4 SHA512 1b4f761bc577a458d9eac9ae4fcb238c25c456f2d4c732f89d66be641eeef471054888a259e049db20eec62a28a8b5210e7b5aa96b127b97308b8a29513bf67a
-DIST kruler-24.12.0.tar.xz 286464 BLAKE2B 425db71aaf20f465b2fce750fe8b464cbc6ac23079ed9c550334628e4df0177a9f8dcf67bd526e63056a2662eac76707059fd23a9d900806ded2f6d31892cb12 SHA512 fee4a4c2e9bb550508069f0c67fbc6eea21b0af990eebd6486de7f3eff588df1bc4e4dfa2ebfd485d1b0377c7232e33c743d4bef933f03f825743db575f9d3dc
+DIST kruler-24.12.1.tar.xz 286436 BLAKE2B 9787f78e1cb49ea73f492953b2f98ebe0a291f4a64dd45b699882c402037d459beb9628ffd36eb5445b9a6840110eedf127bbb8cd135c64a558ed56784a7b174 SHA512 c20d0b8292696dbb1f9eba30f69e4676a9f1c9adfcd35f978703371bdc548382a49a3f2698ed0c0e0a72c92ec2af72523f978492eee0eb6d2d208d2308062f41
diff --git a/kde-apps/kruler/kruler-24.12.0.ebuild b/kde-apps/kruler/kruler-24.12.0.ebuild
deleted file mode 100644
index 870dba738def..000000000000
--- a/kde-apps/kruler/kruler-24.12.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Screen ruler for Plasma"
-HOMEPAGE="https://apps.kde.org/kruler/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="X"
-
-# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	X? (
-		>=dev-qt/qtbase-${QTMIN}:6=[X]
-		x11-libs/libxcb
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITHOUT_X11=$(usex !X)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kruler/kruler-24.12.1.ebuild b/kde-apps/kruler/kruler-24.12.1.ebuild
new file mode 100644
index 000000000000..987a871a6c5d
--- /dev/null
+++ b/kde-apps/kruler/kruler-24.12.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Screen ruler for Plasma"
+HOMEPAGE="https://apps.kde.org/kruler/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	X? (
+		>=dev-qt/qtbase-${QTMIN}:6=[X]
+		x11-libs/libxcb
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITHOUT_X11=$(usex !X)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kshisen/Manifest b/kde-apps/kshisen/Manifest
index 42766066efdc..1536bd130e59 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,2 +1,2 @@
 DIST kshisen-24.08.3.tar.xz 971516 BLAKE2B 3a91d7f5a4200114e21cbeed23b453811d1ff94614ef31abbbf6c3e8bc2289e2e259be3d9c156886661f2eab8b3d83056a2514cfea5c39cf402da77876c94fac SHA512 136320a6f8e0e0b124b5de3e355697d35b27a784c3149efcd177c9fd3a5f0af8d0407e845193e1d25757791a6c3021cd29f0a1c5e02bc92b9bf347b086b07697
-DIST kshisen-24.12.0.tar.xz 972480 BLAKE2B e4100f055a03bf9dba8eee9535fe49f148e3ad091a9bc4f9f0edd7fe7254c65058a64302f381239f6a9256428de05d43e16daf45d99985c5ed4618fb2ba3aa69 SHA512 888333812f1a314f09ad08c5c1bf25af201ebf21cd4d000575de1b8b8d24e470abad53c54dc3ec7f7d59112b085fb1afb4906ebb75d6342bf1992f34ac8b3ccc
+DIST kshisen-24.12.1.tar.xz 972516 BLAKE2B 88dfd24b1cf604277b52a035882b35492eb9c76cc5360a1edc614d0369d18873a3545a9aa985d2663a1d4b3e556f3a62110412a3a54109d781c62eee377f11cc SHA512 8be8e8742f8315d5722345fd502d1d2bbb05806087b447e6b1c8e4db63edf202c12634095fc35febfc43d4bd148888bb9f98cd0444f3c5467ee75174c8b7304f
diff --git a/kde-apps/kshisen/kshisen-24.12.0.ebuild b/kde-apps/kshisen/kshisen-24.12.0.ebuild
deleted file mode 100644
index e3d694f78882..000000000000
--- a/kde-apps/kshisen/kshisen-24.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Solitaire-like game played using the standard set of Mahjong tiles"
-HOMEPAGE="https://apps.kde.org/kshisen/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-apps/libkmahjongg-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kshisen/kshisen-24.12.1.ebuild b/kde-apps/kshisen/kshisen-24.12.1.ebuild
new file mode 100644
index 000000000000..6976e47a9247
--- /dev/null
+++ b/kde-apps/kshisen/kshisen-24.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Solitaire-like game played using the standard set of Mahjong tiles"
+HOMEPAGE="https://apps.kde.org/kshisen/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-apps/libkmahjongg-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index af04a8f7974c..ebf1020908ac 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,2 +1,2 @@
 DIST ksirk-24.08.3.tar.xz 6700788 BLAKE2B 1bfe023a7decf4fd4620f51ad956c579d52e448c0b557fb350fc1fc954504a6f3aaa20252ee99e4da245264f5baeff1685ab3566e9a78018db8ad8bd28c027e0 SHA512 aa5b681932a651ad652e2c05f6d22ced554d2e6df1a665414611e71e4acc661020f14376ec0fcbea80f7a8e596fbb26a54d48bdb98fac2e38c55da8a9c27185f
-DIST ksirk-24.12.0.tar.xz 6704232 BLAKE2B 5d1f6d426a1a0e829b1b6c10aead91b968fb5f206dd5c644f85387d125bdf0937191f4640b276bfa8073bd159a05a56bcd88ddeb802adafc8bd043aab2c44196 SHA512 4c3b99ef96a37db61c5d8d9eee9a40f3afad9a9b224a3d8833942fe4a9b16b25fb1fd09cf28c9123f38d004bcdec3feed3697eacfd5285268434bd79fd49997b
+DIST ksirk-24.12.1.tar.xz 6704624 BLAKE2B 0df6ac16705197000a77ff7d10f65fa461837b3aa28486520172b042d1bedc5c225464d9fc1044e0fc3ccb90f881f391daad49fd75789d42d882689d644d2164 SHA512 61ce072c0f7fd421df594c5d6752045bb6ef927808d46b8f30bed8c64065d40d6e1ea2f19f1f09b5f88ff2f787dd9d11451bb5f95af52d9fe9513c8a7363e300
diff --git a/kde-apps/ksirk/ksirk-24.12.0.ebuild b/kde-apps/ksirk/ksirk-24.12.0.ebuild
deleted file mode 100644
index 012a462f8da7..000000000000
--- a/kde-apps/ksirk/ksirk-24.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Port of the board game Risk"
-HOMEPAGE="https://apps.kde.org/ksirk/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
-	>=dev-qt/qtmultimedia-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksirk/ksirk-24.12.1.ebuild b/kde-apps/ksirk/ksirk-24.12.1.ebuild
new file mode 100644
index 000000000000..e625c114bf53
--- /dev/null
+++ b/kde-apps/ksirk/ksirk-24.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Port of the board game Risk"
+HOMEPAGE="https://apps.kde.org/ksirk/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index 0f91fc426e27..b138550c3d33 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,2 +1,2 @@
 DIST ksmtp-24.08.3.tar.xz 53096 BLAKE2B 200291395bfc2058c6d3a23e7edf1c693d9e315810c25f95418389ccf974428bb3b8d29a6189c1199969cf2184fa359aba7d09fdfaa2663a8043b1c1a21308b7 SHA512 5af330e3ac610d8c4beb5f7c9cdebea69c646f374540721d00309692d20b34c190c1ae284a322fe0f6e933884c3ba635e6ba46dd17fa66e4593a82f0cf1d340a
-DIST ksmtp-24.12.0.tar.xz 53216 BLAKE2B 562d884a95a6187292df78822e1eb741a46a8111b86a06a461d85190e02af92b3f6573016f617d5082fad50e594045342f608feb4955eea1f488bac8022cd7ef SHA512 2067d7392a5bed5d393e90b26d458f4f395abc443380611236a651c74b18439847555d77d2772f6fae2cdf02677854ce96d4e4e1bbc0da0a20326c7723ff8ea7
+DIST ksmtp-24.12.1.tar.xz 53224 BLAKE2B a26c2ef0f2a9c7c5c40a4e0522c5607724b946b6b1b3c447c877da6a258fe53abc8bad068776826632a12510e7915c2329911d1dd8db475c041877d5dbafa207 SHA512 ec885cc408834cf86fba916a256be62aa0b8a7330f642eda1633796287ecc492210961655955e94c5b8a0672218228241d3a2c1d7f7f787be4d517bd99af270e
diff --git a/kde-apps/ksmtp/ksmtp-24.12.0-r1.ebuild b/kde-apps/ksmtp/ksmtp-24.12.0-r1.ebuild
deleted file mode 100644
index 5771bd688ee1..000000000000
--- a/kde-apps/ksmtp/ksmtp-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Job-based library to send email through an SMTP server"
-HOMEPAGE="https://api.kde.org/kdepim/ksmtp/html/index.html"
-
-LICENSE="LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test" # bug 642410
-
-DEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtbase-${QTMIN}:6[network]
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksmtp/ksmtp-24.12.1.ebuild b/kde-apps/ksmtp/ksmtp-24.12.1.ebuild
new file mode 100644
index 000000000000..f3240566f2fe
--- /dev/null
+++ b/kde-apps/ksmtp/ksmtp-24.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Job-based library to send email through an SMTP server"
+HOMEPAGE="https://api.kde.org/kdepim/ksmtp/html/index.html"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test" # bug 642410
+
+DEPEND="
+	dev-libs/cyrus-sasl
+	>=dev-qt/qtbase-${QTMIN}:6[network]
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index fac6f09aaf75..367007939629 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,2 +1,2 @@
 DIST ksnakeduel-24.08.3.tar.xz 577728 BLAKE2B b422ad6fe59e1d10e7aa9211a31b4d1bb947480d2cd7caab70026c6b0c2fe8d78908d7244ed599b2f6135afea8763b58d1a9a3ed377e33022e0705136008f33b SHA512 1a8ca580b345821cba68cd7e7a145b989912e8b4f40750ca2ae5a2ddac96cf9fb15d55f43ea76e0616aa7628afdca78e87879c152a9cefc098115afbc75ce6cd
-DIST ksnakeduel-24.12.0.tar.xz 578516 BLAKE2B 18ace47d1dfee89d99e869d39db30e633328e1cae5bba9d7d9fe331b0a2fc19ebed8a9775bc6dc3c6a879fa76d1f5e6aa4dfb3103c4d74daeeda4c039c167827 SHA512 f30d2c1b0ed39cd120099fa602391045544a561d6e9cea13c4dc220e32bce78013378baa0ff1ff4cf26f76ce96073f8fb84f12cc7117ebdd2c56584963c43c41
+DIST ksnakeduel-24.12.1.tar.xz 578516 BLAKE2B 426f09e7e678d9388a3aa926d352a38e49212cbb4d2fa32554d54ec0d68cf1933daa7ee88a891cdce194f26c8a7d1d3e4ff1634d6f2c17615eae3a893f80a122 SHA512 6638e79cacc41d201f96cc9a8fed502864fb0867aa62e3fcc759b7a5350f8363a03732487bcf8bb32b321b4ad8c83c78c597b8e37bfe61d290bdb31f81e8786a
diff --git a/kde-apps/ksnakeduel/ksnakeduel-24.12.0.ebuild b/kde-apps/ksnakeduel/ksnakeduel-24.12.0.ebuild
deleted file mode 100644
index 1876c9552ee7..000000000000
--- a/kde-apps/ksnakeduel/ksnakeduel-24.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE Tron game"
-HOMEPAGE="https://apps.kde.org/ksnakeduel/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-# TODO: || ( 7zip gzip )
-BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/ksnakeduel/ksnakeduel-24.12.1.ebuild b/kde-apps/ksnakeduel/ksnakeduel-24.12.1.ebuild
new file mode 100644
index 000000000000..71edf4684676
--- /dev/null
+++ b/kde-apps/ksnakeduel/ksnakeduel-24.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE Tron game"
+HOMEPAGE="https://apps.kde.org/ksnakeduel/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+# TODO: || ( 7zip gzip )
+BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index 1bd1d910044b..3eaea00dc336 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,2 +1,2 @@
 DIST kspaceduel-24.08.3.tar.xz 635460 BLAKE2B 5e6c297773ec68f56ebb0fbd25f336ec271458e4d67792484ddb95a59b0444409245c24237aa0beadd25a76dd410fc0117fd62482d8beac27c732e33e89bfb83 SHA512 7f8fc86ab22b7c8384ccba6050a3ab40d3e270d9d030df97a08e21cf9c58000e503e35ffe011bdefa5756928b87d39c6cd4e67de7881b4a2cca47ffbc17ab2fa
-DIST kspaceduel-24.12.0.tar.xz 635408 BLAKE2B d74cb53bbfab151680b91fa646f3cb8eb6f89dc284d1511348e0548dd90aaf8ba30afb8ac3d1838c590b9298832212162b001c4b7ffb3fb3e8d90a784977354f SHA512 4eda73740cbe9b517c156fe2846b4d88864d7f3f4956927b8403982d3fba9f6dee287e4df956b880bca6fb92a2a019a2a4c0459c07a1514c6eb32cf7fd345a41
+DIST kspaceduel-24.12.1.tar.xz 635396 BLAKE2B 37fdb20620d107e50d708f438d7425583673d1c05a3fedb799f927f1aef1480016f3fd8b5b5bb2dffa487973b2902de162a7115ca40737ce10e9a81e910812e8 SHA512 bbf81757dd80e2050644ea83e45e5d388ba3a25bc9f8ffd71ab0c439686e367c8d7117482fe758c48952379e58ff73074c4072468d05b038a961e120e13e0c34
diff --git a/kde-apps/kspaceduel/kspaceduel-24.12.0.ebuild b/kde-apps/kspaceduel/kspaceduel-24.12.0.ebuild
deleted file mode 100644
index baf8da6ea22d..000000000000
--- a/kde-apps/kspaceduel/kspaceduel-24.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Space Game by KDE"
-HOMEPAGE="https://apps.kde.org/kspaceduel/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kspaceduel/kspaceduel-24.12.1.ebuild b/kde-apps/kspaceduel/kspaceduel-24.12.1.ebuild
new file mode 100644
index 000000000000..978b5750b742
--- /dev/null
+++ b/kde-apps/kspaceduel/kspaceduel-24.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Space Game by KDE"
+HOMEPAGE="https://apps.kde.org/kspaceduel/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index 8cdadd6fb17a..2eba7cc3bfca 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,2 +1,2 @@
 DIST ksquares-24.08.3.tar.xz 322056 BLAKE2B d38c41aeff5008cd5e114f0fec0a4297721f73218d294d3d21bd5d33b55542b614ef89f8783a7b24d58df30eaed0738dd2a7fc580fa65bc335fc0f0f0146c8ef SHA512 11365a8f3b52a9eb36def4f7a3097a96aed53105af9456ac76165e1f6c9c761bd872aac6f5c8801f560a744808e41e6dba2363bfeadc56793ce625f23955b761
-DIST ksquares-24.12.0.tar.xz 322360 BLAKE2B d4d6784612f78ed362c48fbddf083f1891b78cdfbb9b3b8a3f8c2638a7a1fb716133e31f496d2305946eb8373449bd8e781b31537628f3fbb22d4f1795d4d424 SHA512 6cfe09eaa9eebb39a20cd996ed375bd1a767734fabb87620c6243b2070111d4ec44e6f442276518a8316744f4c12ba826be4d94aa9050f6e2096119d7d0557a1
+DIST ksquares-24.12.1.tar.xz 322380 BLAKE2B 2209d338cc5e94ac58388c6fea9fd6c44785c119023c580db9e96507c680ee4974d1404045a6a9fe93f46628720219911e54a51c827f9ebb86e046956714f924 SHA512 78e9a051981d96cb152d92c0ab1bc36ea6b72a49c8420a2d887a926b3d8237d6af8a0a7b1a45e4f95c8e3e54d551770945e3a3e02639a751c6ae4678b741570f
diff --git a/kde-apps/ksquares/ksquares-24.12.0.ebuild b/kde-apps/ksquares/ksquares-24.12.0.ebuild
deleted file mode 100644
index a5e0443ed1a9..000000000000
--- a/kde-apps/ksquares/ksquares-24.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE clone of the game squares"
-HOMEPAGE="https://apps.kde.org/ksquares/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksquares/ksquares-24.12.1.ebuild b/kde-apps/ksquares/ksquares-24.12.1.ebuild
new file mode 100644
index 000000000000..613e2a236d33
--- /dev/null
+++ b/kde-apps/ksquares/ksquares-24.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE clone of the game squares"
+HOMEPAGE="https://apps.kde.org/ksquares/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index 9da27fa93338..efda0c16cbc9 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,2 +1,2 @@
 DIST ksudoku-24.08.3.tar.xz 1728884 BLAKE2B 909b1600bc2923c135268b05499d06bcd4a6da4ee0ddf5072bfb653c677f190922f800f85be4fda83eb5ec2fa3907591faf7606db508632a1a94cf63e4e382e9 SHA512 686b84991ce43bc05a1cd07736361765b4e758be5995d54516f6f1b3a4b7a889ead4952c716e0ecbea20a419cf88893a146b31ea5339b5d3139a5ad511cff864
-DIST ksudoku-24.12.0.tar.xz 1729156 BLAKE2B a54b6d675adcff487b890b6a337c7c1a4a0aa3535361c3e359460309f591a04664746bb98ec5b335be630ca4e0ef8387c67b27ad20e14e493b7d6e025a76ec33 SHA512 65381bfa79818aff4ad09591c42dcd8b6c62b3a318251a3fd627263c87770fa79838e1f3555a68637f6b343606818f59b3d40f2a329d738120caeb498ca87d6a
+DIST ksudoku-24.12.1.tar.xz 1728624 BLAKE2B 78246a9984f7644212b1eb41abc5619f4ecd625f835c87fd8a996a46da0a705aa4b3c2e31fa39f6863da035b567e2a0d29d41235e50e4eef6a89417f82d841c9 SHA512 7926182893911dbef5f3f852ce24c1b9c4376e14a66fc7120325e6d57ae3941e0544ebc032a65382c59388ff1f33c831260b21bbd480613c4a371f8a27bc38c0
diff --git a/kde-apps/ksudoku/ksudoku-24.12.0.ebuild b/kde-apps/ksudoku/ksudoku-24.12.0.ebuild
deleted file mode 100644
index 578aadfa0a97..000000000000
--- a/kde-apps/ksudoku/ksudoku-24.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Logic-based symbol placement puzzle by KDE"
-HOMEPAGE="https://apps.kde.org/ksudoku/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,opengl,widgets,xml]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	media-libs/libglvnd
-	virtual/glu
-"
-RDEPEND="${DEPEND}"
-# TODO: || ( 7zip gzip )
-BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/ksudoku/ksudoku-24.12.1.ebuild b/kde-apps/ksudoku/ksudoku-24.12.1.ebuild
new file mode 100644
index 000000000000..1fe4b93dc693
--- /dev/null
+++ b/kde-apps/ksudoku/ksudoku-24.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Logic-based symbol placement puzzle by KDE"
+HOMEPAGE="https://apps.kde.org/ksudoku/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,opengl,widgets,xml]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	media-libs/libglvnd
+	virtual/glu
+"
+RDEPEND="${DEPEND}"
+# TODO: || ( 7zip gzip )
+BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 659cce43be00..2e60d79ab810 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,2 +1,2 @@
 DIST ksystemlog-24.08.3.tar.xz 1857664 BLAKE2B 4f7973b8de0155816cc82899fe358d3b9f1c7f91df7c73f76120fd3ee40eb21b3029065f9f703c81932466debad256c1c60a2fb360733066e3bd1b075f2d6783 SHA512 0226f923bf593cfd5d815a8e3cff32627f62911cb113125e095b95c383c7f78a22f5d5c3a7935f1320b6093c17db8415f1b5a5ff1fccf21c16db20928b3b1cad
-DIST ksystemlog-24.12.0.tar.xz 1858392 BLAKE2B 62444d63ae60386df57150054a725dc77ad3ded50c3c356fc3fc9f94eb1e56e52659286779c31f919f3c4e20fed03a3b891777164a59dc62fb490ba9e9b57850 SHA512 9f3ca0def47a7e43f13cb9348cce97cd43406fd012d9e69910869577a8ed62e0fb6110d583bb6389c8daec1127f062331597b18b94cbce4e69378dec890cf1cf
+DIST ksystemlog-24.12.1.tar.xz 1858592 BLAKE2B e2a520b13479d68c43781e90ea93b9cf72085c133af046e672e1fb561399618eb59801d4cd009357ab96a47a6c0fddf7ee0851bbff556107f4c35d6d5e088860 SHA512 dcfe87a34139ea88e9a4e57e5dfc415f48a0472c5015521532322c623f1c9fb9b209c840c5368ffb6af06dc0be571dfda8d1f41f526dc58e4eca733b3349eab9
diff --git a/kde-apps/ksystemlog/ksystemlog-24.12.0.ebuild b/kde-apps/ksystemlog/ksystemlog-24.12.0.ebuild
deleted file mode 100644
index 9dccb064755d..000000000000
--- a/kde-apps/ksystemlog/ksystemlog-24.12.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="System log viewer by KDE"
-HOMEPAGE="https://apps.kde.org/ksystemlog/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="audit kdesu systemd"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	audit? ( sys-process/audit )
-	systemd? (
-		>=dev-qt/qtbase-${QTMIN}:6[network]
-		sys-apps/systemd:=
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-	if ! use kdesu; then
-		sed -e "/^X-KDE-SubstituteUID/s:true:false:" \
-			-i src/org.kde.ksystemlog.desktop || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package audit Audit)
-		$(cmake_use_find_package systemd Journald)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	use kdesu || elog "Will show only user readable logs without USE=kdesu (only in X)."
-	use kdesu && elog "Cannot be launched from application menu in Wayland with USE=kdesu."
-}
diff --git a/kde-apps/ksystemlog/ksystemlog-24.12.1.ebuild b/kde-apps/ksystemlog/ksystemlog-24.12.1.ebuild
new file mode 100644
index 000000000000..cc00486bccbb
--- /dev/null
+++ b/kde-apps/ksystemlog/ksystemlog-24.12.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="System log viewer by KDE"
+HOMEPAGE="https://apps.kde.org/ksystemlog/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="audit kdesu systemd"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	audit? ( sys-process/audit )
+	systemd? (
+		>=dev-qt/qtbase-${QTMIN}:6[network]
+		sys-apps/systemd:=
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	ecm_src_prepare
+	if ! use kdesu; then
+		sed -e "/^X-KDE-SubstituteUID/s:true:false:" \
+			-i src/org.kde.ksystemlog.desktop || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package audit Audit)
+		$(cmake_use_find_package systemd Journald)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	use kdesu || elog "Will show only user readable logs without USE=kdesu (only in X)."
+	use kdesu && elog "Cannot be launched from application menu in Wayland with USE=kdesu."
+}
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index 42c513db4cff..a085a0a2aa1f 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,2 +1,2 @@
 DIST kteatime-24.08.3.tar.xz 309208 BLAKE2B bd7074fec16daed7e52efa0caac5cecaae1c88951c94e7f013b30be8711a47836018e470a2ed254d7685039067fc937fb831c3f38559683c31f781efce513bca SHA512 158f03e6d9242b0c2229b73b34346eedc2ad83e932d30d6fee78469c1275d42b2a65528a4325e1f48fb79169ba20572ef519e9eccab32a8da4f7debc56b15667
-DIST kteatime-24.12.0.tar.xz 310268 BLAKE2B 77147f3156cb2151e71d5f908741f4fbca38945a25ddcdaffbfe78db1f62b8603cd62b485e3dbadef63606e81c90056cbf8ce5ba8b2b652c26a1a18fd125df55 SHA512 3bab8a6cc693a67e29f7ca9aab85aee5262357de5a2741c2b713bfadcf90c9c8cd88a234c8dd0b06cf5407654ac0530993009d7ae1168130682e502f0585fc56
+DIST kteatime-24.12.1.tar.xz 310276 BLAKE2B 7220d1fb5f6d12bf816320a87368df63a1fd34484371933ddff0ee51deb0cc07607f550ea32d90cc050a9cad2f65976e5be27ace8167417137041905428e6688 SHA512 a7d7d3eb4f0ca5bd0d1fb58d578ed019c9879a6d22c6b56c57fe467d7f096b66865c1d6891f95d146f914a1e503217d7b02462216cf130e1c4821afa424006e1
diff --git a/kde-apps/kteatime/kteatime-24.12.0.ebuild b/kde-apps/kteatime/kteatime-24.12.0.ebuild
deleted file mode 100644
index 47fd1519bd9d..000000000000
--- a/kde-apps/kteatime/kteatime-24.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE timer for making a fine cup of tea"
-HOMEPAGE="https://apps.kde.org/kteatime/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kteatime/kteatime-24.12.1.ebuild b/kde-apps/kteatime/kteatime-24.12.1.ebuild
new file mode 100644
index 000000000000..135f187e27e3
--- /dev/null
+++ b/kde-apps/kteatime/kteatime-24.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE timer for making a fine cup of tea"
+HOMEPAGE="https://apps.kde.org/kteatime/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index 034e6b0d7748..5aaf57979dde 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,2 +1,2 @@
 DIST ktimer-24.08.3.tar.xz 452572 BLAKE2B cf178c9c45843418e41c7deca6927707875d8ee40a3129d35f5746b5237c86e70abfb12892d62d5aa198a9eb85038ec97241fb3c353029254dd361caf9c375a4 SHA512 9ba32f3898240e5a6893a5fe49187674a824cea92b40fb9c281c269527262f3196af1639260b2fa2dd6999327e4796880f289a90f6425ac5d8218e0347c1c863
-DIST ktimer-24.12.0.tar.xz 453188 BLAKE2B 85e65af6e3ad4fdcc6edc860427212c392ebde5ae9fc29325773ccec1ebd3eb3599cfd379053d9bf6bc73fd01f10a727fb1e972fa0a1f52ffc03232acdc77f4a SHA512 1259f3536aa33137cdd37c8e3aca47e0ea1d8bc972c92f1460f9962580c16620e1d510723f967c168d8142c9e8e218742f11c0794fecc993066d90cd967a5770
+DIST ktimer-24.12.1.tar.xz 453232 BLAKE2B 58822f6c56769192a6ae0d1d47f7e7eba5ad95ee77541087116ff0fc82974683cd16ed0e9d882645f310c5b9094babed7a2e6da5a19125ca4ac3ad3096b21d0e SHA512 59c25f6b6fee3144c859baf26dc678bdcbc49ff43aeec72538d18346695c0ad5b076eb221f669d9a50dde0fbf9a54ba87c76d38996f9c65c2b1882dee368f647
diff --git a/kde-apps/ktimer/ktimer-24.12.0.ebuild b/kde-apps/ktimer/ktimer-24.12.0.ebuild
deleted file mode 100644
index e7cdf08bd596..000000000000
--- a/kde-apps/ktimer/ktimer-24.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Little tool to execute programs after some time"
-HOMEPAGE="https://apps.kde.org/ktimer/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktimer/ktimer-24.12.1.ebuild b/kde-apps/ktimer/ktimer-24.12.1.ebuild
new file mode 100644
index 000000000000..4352cae4e07e
--- /dev/null
+++ b/kde-apps/ktimer/ktimer-24.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Little tool to execute programs after some time"
+HOMEPAGE="https://apps.kde.org/ktimer/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index 5f56213b3938..637f99c0cea7 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,2 +1,2 @@
 DIST ktouch-24.08.3.tar.xz 4783636 BLAKE2B 2cf94f83b275df9564e57b855b89c452811acd891651e442d671dc65c159c103a31d7c79ba643772c2b3406be6523a5fcf5ac13b8a332dbd401d7c6c9872ff9c SHA512 a700ba2a2745b4db184ce9a0fe4d2d8108d915fa3b1db4649dff88f7ea7db896105d980e7cb5d08aa8ad2d48b0ddadb54ca4c3b6610a8d52420bea45637c4786
-DIST ktouch-24.12.0.tar.xz 4786684 BLAKE2B 674ac1980b19499f26dc6bc4e705b09b5b2aacf768d584afb29fc03f39a50341ec789f4700ea88186a8bfbab2d4beeb7d1b49b6598b6d6f842e6991e8c31e51d SHA512 fd1dc536a15f38efae5e01c12c651de6d5f48d359206d478aceff65c1d3f4361b229318c6119b392d4e8468c1a9e3b51b84cbffd520c8c22cafa2f0641fc3db5
+DIST ktouch-24.12.1.tar.xz 4789316 BLAKE2B 50220151b3452115e1fc6e0154137a3d1705a70291c17747cf93f99267d61147a1c357ab13587d2b4b49d1da02fd348a792fa25005b1429257e430fec331dcd2 SHA512 e882b9eccb2a9c3c11f354a09ba89eac46a52f6c112c4bc72ce8235cdf28ab89efd03960973cbf0b1ef73c400547515ae982f6d4aea7d8c54b53476af4d00886
diff --git a/kde-apps/ktouch/ktouch-24.12.0.ebuild b/kde-apps/ktouch/ktouch-24.12.0.ebuild
deleted file mode 100644
index f1a7acd6e26a..000000000000
--- a/kde-apps/ktouch/ktouch-24.12.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="Program that helps to learn and practice touch typing"
-HOMEPAGE="https://apps.kde.org/ktouch/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=kde-apps/kqtquickcharts-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCOMPILE_QML=OFF
-		-DWITHOUT_X11=$(usex !X)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/ktouch/ktouch-24.12.1.ebuild b/kde-apps/ktouch/ktouch-24.12.1.ebuild
new file mode 100644
index 000000000000..fac70cfdb915
--- /dev/null
+++ b/kde-apps/ktouch/ktouch-24.12.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="Program that helps to learn and practice touch typing"
+HOMEPAGE="https://apps.kde.org/ktouch/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="X"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=kde-apps/kqtquickcharts-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCOMPILE_QML=OFF
+		-DWITHOUT_X11=$(usex !X)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index ee60e879a138..8aa8670d6878 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,2 +1,2 @@
 DIST ktuberling-24.08.3.tar.xz 71544736 BLAKE2B 4ec21dbc992b391f9fea77de3398167796aa1c321ae9e97320b5e12e8a03ad1185a65b04b8456ba1cb03736f25000e828b02926f57bbfbe5a4a393d0e4a3e5ca SHA512 0d37ca7b601d2c73c3cd704452515fe7bcf213ac2f1bd0c66710c9a24039c3306f70f2f00c882c5dc165180ecece9ebf6a5383a4b716ab5dfd70c02437284469
-DIST ktuberling-24.12.0.tar.xz 71565140 BLAKE2B c60fd602f4e60193ab03a42bd930d25955e789a157f0a3d416b5c688e3b939bcde64a868bdc0c2f9adc80c1b5d91fdf52fdcb8430c9f8e9fae0294582ce4c745 SHA512 736a3b77cbcdbd632cf3139b1850947819a8686a1fbb176cd2184e89f305a382d9eb320b9691484737b33700f73c249dde3380cf3190eb999859a512c5379fdb
+DIST ktuberling-24.12.1.tar.xz 71569216 BLAKE2B 6dbea05bb01a55e3f79c0eb600a8a4b2a93199f0e06f88d17e7a334d6a8dc2c05c3c66406a67fdfaa12d49313c84cae12b24bf6ca226d26b9ee74c9c6f2fada0 SHA512 1654671258a19586df492a664581d736ea86fc49c8eebe5729fb5585c1c75dea6f3e4e7289cb07ee55131ea13f52d6c6765bc313145bcc5fff5dc317dbcda117
diff --git a/kde-apps/ktuberling/ktuberling-24.12.0.ebuild b/kde-apps/ktuberling/ktuberling-24.12.0.ebuild
deleted file mode 100644
index 205baf9fa917..000000000000
--- a/kde-apps/ktuberling/ktuberling-24.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Potato game for kids by KDE"
-HOMEPAGE="https://apps.kde.org/ktuberling/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=dev-qt/qtmultimedia-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktuberling/ktuberling-24.12.1.ebuild b/kde-apps/ktuberling/ktuberling-24.12.1.ebuild
new file mode 100644
index 000000000000..8eb04f6d838d
--- /dev/null
+++ b/kde-apps/ktuberling/ktuberling-24.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Potato game for kids by KDE"
+HOMEPAGE="https://apps.kde.org/ktuberling/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index ff76c2562201..438396c95e7d 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,2 +1,2 @@
 DIST kturtle-24.08.3.tar.xz 2095020 BLAKE2B a38e698349824d8fcdb3abc876e5efbcd52517f41d63310fe9de583a059ee09709fe87628729bd483764c57101a239689410cc1ae98b206b6d0815b7f1e17f03 SHA512 03d53eda8d8c3f12f1f27e14ebd7d29ecdcb2c7b7e0df044aed9fccbcb7c5685660a9893a21a081178428ad697ccdbb1398264796894445003be4f40eb3cfce7
-DIST kturtle-24.12.0.tar.xz 2096032 BLAKE2B 54f1e4caa6e515bef8b3e770c6d23ad4c05c425b2c52bcfdc79cf0687e804967189718ff77f2104caecc42c8cb3c47f5a4b3ae3fa94b3e78c557c215cf07ad0b SHA512 3e5f69360ea12f04d00d3fd236248347bfbca647140065fb52954705556a771c5e6e768aaa79bef4d755ce4424d6ba76df5019fff662f75fdc7644bd8fd8b4b1
+DIST kturtle-24.12.1.tar.xz 2096968 BLAKE2B 58beb7679abd72f750c8e7bf05422567098b738dea0ab1c31063f61ada5eec062f763b6b4f6807105a9e07c59afd4edf736beb92c65fc6a307dbb4124db81470 SHA512 c8c60ebd669193cf5f34b667e0a464f5ea4837f0c08a88f1acac3cc7e60455cc5a8bd29e9ca35c5ead558c3ecead2af518e6f8a3a1aee8bb88b01593119b37e9
diff --git a/kde-apps/kturtle/kturtle-24.12.0.ebuild b/kde-apps/kturtle/kturtle-24.12.0.ebuild
deleted file mode 100644
index 7941fc616005..000000000000
--- a/kde-apps/kturtle/kturtle-24.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Educational programming environment using the Logo programming language"
-HOMEPAGE="https://apps.kde.org/kturtle/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kturtle/kturtle-24.12.1.ebuild b/kde-apps/kturtle/kturtle-24.12.1.ebuild
new file mode 100644
index 000000000000..8c6b04d33537
--- /dev/null
+++ b/kde-apps/kturtle/kturtle-24.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Educational programming environment using the Logo programming language"
+HOMEPAGE="https://apps.kde.org/kturtle/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index 27ddce83725a..3cd1cb663714 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,2 +1,2 @@
 DIST kubrick-24.08.3.tar.xz 374376 BLAKE2B 40d25f56254ba2f01795dce6bcaaea8ef5e7acd196920e415ab37c219578471b702d9b34340f2d13b0587804b1529bd987072f34e91e2e0974d6cde180281c14 SHA512 1ee7dc92ee2717d9febf5cfdbcb00f8f016fc8177702a368f150a9e18d242962dd7bd50f7fa03bff8e5309655a036f615d7f4b5d4ad62884f6771a741bc133a6
-DIST kubrick-24.12.0.tar.xz 375492 BLAKE2B 92f0322892ee740f53c91c4eb9e2eb7e9c5e88888b6e976458f8b1a3fc6a79696afe888806e64e65509665b0a6030a32834f835615df6ef03fe61f6b2a751eb5 SHA512 7d127f8f7a86c3cbb2ef0015b5ab4748618dfe405d3add40fea53aaf1dc9f3b564c64475beea8f4f72502d20a50f3195f660a48e55cc704dd1176c2cf2ab6405
+DIST kubrick-24.12.1.tar.xz 375436 BLAKE2B 749fe83547ce747e078c157a5a5b27cc3bf03fad44e0a9f419cadcdd4bacd5a70aeaf5355b10d79117778f8b38cd6493a7564623f75fd736bdd1f55679f1aa62 SHA512 cee414663d3c312f3faa0f4d19e3ae73230c45dff99434514416b6d3fd8cff88792431f32aa8d15de47bb9c34cca513d3d4e470921e6348ee6eb6311cb011325
diff --git a/kde-apps/kubrick/kubrick-24.12.0.ebuild b/kde-apps/kubrick/kubrick-24.12.0.ebuild
deleted file mode 100644
index ecb6943e24d0..000000000000
--- a/kde-apps/kubrick/kubrick-24.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
-HOMEPAGE="https://apps.kde.org/kubrick/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,opengl,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	virtual/glu
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-# TODO: || ( 7zip gzip )
-BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/kubrick/kubrick-24.12.1.ebuild b/kde-apps/kubrick/kubrick-24.12.1.ebuild
new file mode 100644
index 000000000000..04b8139ed27d
--- /dev/null
+++ b/kde-apps/kubrick/kubrick-24.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
+HOMEPAGE="https://apps.kde.org/kubrick/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,opengl,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	virtual/glu
+	virtual/opengl
+"
+RDEPEND="${DEPEND}"
+# TODO: || ( 7zip gzip )
+BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index 05ed94765b30..de87b0efd42f 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,2 +1,2 @@
 DIST kwalletmanager-24.08.3.tar.xz 1046640 BLAKE2B 190ca0c9fdccc0c805fb2c12d69970f727303e8c775b70d5131c882c0a79023fd3de5062bbdc5e13082d7aacc7a5584359215151e9325cd69b83a9fcb4b757f8 SHA512 f90de3e1a71e96da99581e842c3922a1b05f24dc83d2341ed3404e2ae4588e3668954c81fd250e4aac3bd87a9eb8f6614611ae9830abd1dbd15f0ed4ee55df20
-DIST kwalletmanager-24.12.0.tar.xz 1048876 BLAKE2B f207a5a9ff45884723036ca63239889e3cc7a8f9a2da7b5446407fa3a3af1c4a32ebd33c5192abcee82b97c9842ec8f54ceb3731c826765a6928052295ce3940 SHA512 7798deb7e78c15f0cb78f1679281c5517b9d1394138488c75c770f4b196c335fb4fe2e1a28e6a8016cc8c34192b6cb4d444cfdae5a90c3ac0057c452bb1735b8
+DIST kwalletmanager-24.12.1.tar.xz 1049128 BLAKE2B f8fa7129ebf487dd9f815e8264782570bfe42d9e7e834d9af0b6f56ed62760b2d0cfbd75f2112ce1f79bf88e91b1280db4e805b9fa92d7f0b674c1f5ea2e21f3 SHA512 06450fa55a7f06d0a5df2398b9ce86f4dddd8387fe91b1224475d6d5d32578665f687867a85c4583369f59c7d9352351837f93290c9edc7bf8e74516e0356530
diff --git a/kde-apps/kwalletmanager/kwalletmanager-24.12.0.ebuild b/kde-apps/kwalletmanager/kwalletmanager-24.12.0.ebuild
deleted file mode 100644
index b63fd34e0247..000000000000
--- a/kde-apps/kwalletmanager/kwalletmanager-24.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Tool to manage the passwords on your system using KDE Wallet"
-HOMEPAGE="https://apps.kde.org/kwalletmanager5/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kauth-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kwalletmanager/kwalletmanager-24.12.1.ebuild b/kde-apps/kwalletmanager/kwalletmanager-24.12.1.ebuild
new file mode 100644
index 000000000000..e26098950678
--- /dev/null
+++ b/kde-apps/kwalletmanager/kwalletmanager-24.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Tool to manage the passwords on your system using KDE Wallet"
+HOMEPAGE="https://apps.kde.org/kwalletmanager5/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index 8e5027fc4c2f..eee529f0ac95 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,2 +1,3 @@
 DIST kwave-24.08.3.tar.xz 6551844 BLAKE2B d4982637cc41ad7179f14c045c55066ed14a95fb7320c7c58e5f1bab86c8ed004fe114a50497a78203be0d39c67ece157860f5ad6c35adbd4feeb4cfb7504b62 SHA512 a50ff3cfb8c789fd8278d475c6c6ba1be808f9e1a369ce0712c6541d438fd23855260495a17581034acfb54f079a296a8bbd10b8865fabb34f983b9991461761
 DIST kwave-24.12.0.tar.xz 6468636 BLAKE2B 932d9bf6ae6bed4e1a48486862dd2ab0af1951f958abc6bee4b957536acec3df9c947f869fb79c3f5323e3cb6c0d4c5eb9a109de2e8d6243b79899a3c3ed4892 SHA512 ba0f38b7a4d625773573588fed954bf421bddce9477e554f6f465aa14d31cbeab07982436acdd05f74f4ba10ccca673b1207849ba6e914fb21e579bbe2947766
+DIST kwave-24.12.1.tar.xz 6477896 BLAKE2B 38f9eefc0e0806480aa7fdaf1f5dc2e2649d31d07bd2e374736a817ab9237eaa2df5a9862aa6447a099b93d85ba8f991ba6ef1a7626d80c8ccf743fb4ac8a9ed SHA512 43b9c979e5d96aa2da4bcc7289d67fd9c34bc2d2f5f0634446847b937f2fd185d8ccd9d202eb461b0fe9eda6a3cfa5ea23e2d601c678bf625a1cc7cd1c989b5f
diff --git a/kde-apps/kwave/kwave-24.12.0.ebuild b/kde-apps/kwave/kwave-24.12.0.ebuild
index 5fdc40cabe65..ab87edc38ff3 100644
--- a/kde-apps/kwave/kwave-24.12.0.ebuild
+++ b/kde-apps/kwave/kwave-24.12.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 @@ HOMEPAGE="https://apps.kde.org/kwave/"
 
 LICENSE="CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
 
 RDEPEND="
diff --git a/kde-apps/kwave/kwave-24.12.1.ebuild b/kde-apps/kwave/kwave-24.12.1.ebuild
new file mode 100644
index 000000000000..6883619ba11c
--- /dev/null
+++ b/kde-apps/kwave/kwave-24.12.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Sound editor built on KDE Frameworks that can edit many types of audio files"
+HOMEPAGE="https://apps.kde.org/kwave/"
+
+LICENSE="CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	media-libs/audiofile:=
+	>=sci-libs/fftw-3:=
+	media-libs/libsamplerate
+	alsa? ( media-libs/alsa-lib )
+	flac? ( media-libs/flac:=[cxx] )
+	mp3? (
+		media-libs/id3lib
+		media-libs/libmad
+		|| (
+			media-sound/lame
+			media-sound/toolame
+			media-sound/twolame
+		)
+	)
+	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:6 )
+	opus? (
+		media-libs/libogg
+		media-libs/opus
+	)
+	pulseaudio? ( media-libs/libpulse )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+BDEPEND="
+	sys-devel/gettext
+	handbook? ( || (
+		gnome-base/librsvg
+		virtual/imagemagick-tools[png,svg]
+	) )
+"
+
+DOCS=( AUTHORS CHANGES LICENSES README.md TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDEBUG=$(usex debug)
+		-DWITH_ALSA=$(usex alsa)
+		-DWITH_DOC=$(usex handbook)
+		-DWITH_FLAC=$(usex flac)
+		-DWITH_MP3=$(usex mp3)
+		-DWITH_OGG_VORBIS=$(usex vorbis)
+		-DWITH_OGG_OPUS=$(usex opus)
+		-DWITH_OSS=$(usex oss)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_QT_AUDIO=$(usex qtmedia)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index b1af60a3e735..2c996293edba 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,2 +1,2 @@
 DIST kwordquiz-24.08.3.tar.xz 3777112 BLAKE2B 62812c2c67e9bf267cd804449d16cccfda58832d937725de7ea99c5dea2382d25751fc314c9ee6d8ea12945e0fd3ed74448cd644a1f8273fc788c35b403c09c9 SHA512 d2b4e84ba9a7bec6c8f086d0e834b92d42abf2d35ddc384172c24fe103dca5eb38748fee82d7ba93c9e79acccb897c22443e14a136906beda5ab957295a27c40
-DIST kwordquiz-24.12.0.tar.xz 3777076 BLAKE2B 8b28e29049069fc96f0b4bed177cf93e3c33c147367843f620b0a385045b27647f371823dc0a74a3fd2a82cc5e6f504dffd73c9f3f8b817840c889eb2edff8bd SHA512 7d0a671e4e482b1d9846d24c61c4e0cbd0ed3c2b4bf0974f09265be3bb5b6e36770fc75f934063e19a9bc84412f09e0f6bf25f6bfca8bd9448244f59fe4e597c
+DIST kwordquiz-24.12.1.tar.xz 3782448 BLAKE2B 1273a80abf7984d148e9887fd1e2057744a63e323172b21ae84bdcd8ea144a2405938198d282126ba2c44dfe46b1bc7821080e3b7a9204ad19b1b8e99e3638c4 SHA512 f8864ff9800aee2d4a18c5f4db417357cc15c205acdec41b9fcaa8652730c33c7fcd6c1e146c5d917f69db10c8dc03b066f56c0985d72d9b103e8fb6c9b3e4ab
diff --git a/kde-apps/kwordquiz/kwordquiz-24.12.0.ebuild b/kde-apps/kwordquiz/kwordquiz-24.12.0.ebuild
deleted file mode 100644
index 789da34f08d7..000000000000
--- a/kde-apps/kwordquiz/kwordquiz-24.12.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
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Powerful flashcard and vocabulary learning program"
-HOMEPAGE="https://apps.kde.org/kwordquiz/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/kirigami-addons-0.9.0:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkeduvocdocument-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kwordquiz/kwordquiz-24.12.1.ebuild b/kde-apps/kwordquiz/kwordquiz-24.12.1.ebuild
new file mode 100644
index 000000000000..038d385f2305
--- /dev/null
+++ b/kde-apps/kwordquiz/kwordquiz-24.12.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Powerful flashcard and vocabulary learning program"
+HOMEPAGE="https://apps.kde.org/kwordquiz/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/kirigami-addons-0.9.0:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkeduvocdocument-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index 79c2f8060eb6..5e98c4bd07dd 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,2 +1,2 @@
 DIST kate-24.08.3.tar.xz 8248700 BLAKE2B ffcf39ef4ae280666ea31e4400463da12cdb2eb6f7f075044c4063ba5c05e0bc2400498f1d9eeb20342eb4157dd209121e737791eacf83b750bb685b0329141b SHA512 31f406d8a61c62f384642044380798d47a41f56cb504a69a37948c6961682c0883f942c45cd7739e907f2f502b3af617422ef59ae017d59edb25ca4abfecf67f
-DIST kate-24.12.0.tar.xz 8300640 BLAKE2B 18d57c30fd797649293a8034d6b85f6961860b724481052a3bb2e9665d77efe075e2e129f3bd2a0387051cfc6fe4625eb08c545aa697afacd8631f1e2bc9c56f SHA512 a9e0a22c3acbb021d018d1e99ece87da925b97a725df4779948d3d5be0db5eb8e73203190de0d34bd65749c4ec3c06c85eef19d80aafce9335dca595aecc377e
+DIST kate-24.12.1.tar.xz 8303660 BLAKE2B 4893907b29166e0005b20fdf641264635b6dfb1276bcd5e8f498cddb04689448379c4c84c7c1294e5f9926eb20d2c9f3132252d7a7d8948ee91985609032b537 SHA512 227671f6e7a5e2893623daae1a696a54b86561f1780d7e435bc585cfc3cfe6ecf8975604b92bd4febaa0dde3c28dad60a4297a653a2b759360248448c44cc687
diff --git a/kde-apps/kwrite/kwrite-24.12.0.ebuild b/kde-apps/kwrite/kwrite-24.12.0.ebuild
deleted file mode 100644
index 891c37d3bf07..000000000000
--- a/kde-apps/kwrite/kwrite-24.12.0.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
-
-KDE_ORG_NAME="kate"
-ECM_HANDBOOK="forceoff"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm flag-o-matic gear.kde.org
-
-DESCRIPTION="Simple text editor based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kwrite/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	~kde-apps/kate-lib-${PV}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	virtual/libintl
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kate-common-${PV}
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-
-	# these tests are run in kde-apps/kate-lib
-	cmake_run_in apps/lib cmake_comment_add_subdirectory autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_addons=FALSE
-		-DBUILD_kate=FALSE
-	)
-
-	# provided by kde-apps/kate-lib
-	append-libs -lkateprivate
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# provided by kde-apps/kate-lib
-	rm -v "${ED}"/usr/$(get_libdir)/libkateprivate.so.* || die
-}
diff --git a/kde-apps/kwrite/kwrite-24.12.1.ebuild b/kde-apps/kwrite/kwrite-24.12.1.ebuild
new file mode 100644
index 000000000000..3a16c79f8925
--- /dev/null
+++ b/kde-apps/kwrite/kwrite-24.12.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kate"
+ECM_HANDBOOK="forceoff"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm flag-o-matic gear.kde.org
+
+DESCRIPTION="Simple text editor based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/kwrite/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	~kde-apps/kate-lib-${PV}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	virtual/libintl
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kate-common-${PV}
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+
+	# these tests are run in kde-apps/kate-lib
+	cmake_run_in apps/lib cmake_comment_add_subdirectory autotests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_addons=FALSE
+		-DBUILD_kate=FALSE
+	)
+
+	# provided by kde-apps/kate-lib
+	append-libs -lkateprivate
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# provided by kde-apps/kate-lib
+	rm -v "${ED}"/usr/$(get_libdir)/libkateprivate.so.* || die
+}
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index 79dbd9c7a65c..2c2d753b9bd6 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,2 +1,2 @@
 DIST libgravatar-24.08.3.tar.xz 38056 BLAKE2B 8b765c749ac877269a8cdea30d90cafe1fd4d0e1217e1b30aac273a3985b09e78cc5042f73c490a30da3c87986c40c7cfcc0c4843bd12be0fae4f25164982383 SHA512 90e14c4a6b8c07267bc606c91f3db9b70efc43691e89b7ec51317d0f063e7b503b9b3bf0f5307b13a08e8914aee9b908e4bb17dae48cdcc04510f8e9551c8d4b
-DIST libgravatar-24.12.0.tar.xz 38628 BLAKE2B 0ba5d76e6696a2542e75c6118f75f391ea30a159c08a5cfd6bd437baf9eceefc9ab15f050f6c710e8d2b0e3cb8a224bf934a163f0bf686d29f720dddb6cb213d SHA512 8e40458ccfa8ec9045d58e71ceca14a59122326207b87f9aaa2da71f4c03a43302287175ac1a509ecf618cec7af8fe2d50a2b722f629d917cd453453a6045609
+DIST libgravatar-24.12.1.tar.xz 38616 BLAKE2B aca1e9ed40b6ee5cedea98c8de7fbac39c3e11c894871f32ac241ba3b4343f2ae5b81c27e01dbd165a3c3ffb4e2f1e3f5d6e2294b5e735540b9943cd4be4c375 SHA512 014c3c6913f90fcab5295cf075f7535e5e23ff7b63942e799b775228c9abac1032c072e7d0143bbcb32174036262f06496d4d14632b1d95c969aa9764cf4b61e
diff --git a/kde-apps/libgravatar/libgravatar-24.12.0-r1.ebuild b/kde-apps/libgravatar/libgravatar-24.12.0-r1.ebuild
deleted file mode 100644
index effa9da4eaf9..000000000000
--- a/kde-apps/libgravatar/libgravatar-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for gravatar integration"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# bug 624584 - needs internet connection
-	local myctestargs=(
-		-E "(gravatarresolvurljobtest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/libgravatar/libgravatar-24.12.1.ebuild b/kde-apps/libgravatar/libgravatar-24.12.1.ebuild
new file mode 100644
index 000000000000..706bb2f2c1a1
--- /dev/null
+++ b/kde-apps/libgravatar/libgravatar-24.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for gravatar integration"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# bug 624584 - needs internet connection
+	local myctestargs=(
+		-E "(gravatarresolvurljobtest)"
+	)
+	ecm_src_test
+}
diff --git a/kde-apps/libkcddb-common/Manifest b/kde-apps/libkcddb-common/Manifest
index dd4451b4a6bd..f5eee0903712 100644
--- a/kde-apps/libkcddb-common/Manifest
+++ b/kde-apps/libkcddb-common/Manifest
@@ -1,2 +1,2 @@
 DIST libkcddb-24.08.3.tar.xz 449156 BLAKE2B 22e03309c32714381ace45a6a5fdb9379aec59b5a7dd2424fbee6b2a79a10aa93b5ab558d7760aec8f6d2a18a5e148ea0ae0b1f32fb1b1c3f35d0bfa52f2ecb8 SHA512 9f7d08f8aa786171cbf3e3fab1feb10606aeec9320419184bfcc6bdcb3b7b3f9d1e26365b44bd762964b396392db48a2ce5e1b1a7aaf5edcc51ab1e58e154c6b
-DIST libkcddb-24.12.0.tar.xz 450032 BLAKE2B da38dc109e2a72a096412d266671ac09a15880b71fb828a22380f81a2a5b8853fa6b4eea29eb3c281f67f280d5b839addcc51cf584eb9cad20baeb20b19459e4 SHA512 4f7c69468e976cf0cea4f65457226dc339d3da53665b18c943542ed1a1af87ee287e8c2e8aac11c63bb5d83550cbb603332e6e2f87d55f37214b28a5359a2539
+DIST libkcddb-24.12.1.tar.xz 450052 BLAKE2B 3f356e96f75ee50dd53c6feef2ba470482f2ed291dd27a16aeead8a9df6b53fb5ab9b5848e99421ee11ec0cac3dd0aee643113741757a74bdbb50f484e019ebb SHA512 3db7ae5c11953681ee3d5bd0ac87b13e4ddbfa86e8cc853b8cc57eea5ec2c29b58751915e0c4d422e5f8e83e7063eda7440135caaa5a8654048f86612f124307
diff --git a/kde-apps/libkcddb-common/libkcddb-common-24.12.0.ebuild b/kde-apps/libkcddb-common/libkcddb-common-24.12.0.ebuild
deleted file mode 100644
index 422b5adcdc5c..000000000000
--- a/kde-apps/libkcddb-common/libkcddb-common-24.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="true"
-ECM_HANDBOOK_DIR=( kcmcddb/doc )
-ECM_KCM_TARGETS=( kcm_cddb:kcmcddb/ )
-KDE_ORG_NAME="${PN/-common/}"
-KFMIN=5.115.0
-inherit ecm-common gear.kde.org
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	!<kde-apps/libkcddb-23.08.5-r1:5
-	!<kde-apps/libkcddb-24.05.2-r1:6
-"
-
-ECM_INSTALL_FILES=(
-	libkcddb/libkcddb5.kcfg:\${KDE_INSTALL_KCFGDIR}
-)
diff --git a/kde-apps/libkcddb-common/libkcddb-common-24.12.1.ebuild b/kde-apps/libkcddb-common/libkcddb-common-24.12.1.ebuild
new file mode 100644
index 000000000000..09707e3d3960
--- /dev/null
+++ b/kde-apps/libkcddb-common/libkcddb-common-24.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+ECM_HANDBOOK_DIR=( kcmcddb/doc )
+ECM_KCM_TARGETS=( kcm_cddb:kcmcddb/ )
+KDE_ORG_NAME="${PN/-common/}"
+KFMIN=5.115.0
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	!<kde-apps/libkcddb-23.08.5-r1:5
+	!<kde-apps/libkcddb-24.05.2-r1:6
+"
+
+ECM_INSTALL_FILES=(
+	libkcddb/libkcddb5.kcfg:\${KDE_INSTALL_KCFGDIR}
+)
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index dd4451b4a6bd..f5eee0903712 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,2 +1,2 @@
 DIST libkcddb-24.08.3.tar.xz 449156 BLAKE2B 22e03309c32714381ace45a6a5fdb9379aec59b5a7dd2424fbee6b2a79a10aa93b5ab558d7760aec8f6d2a18a5e148ea0ae0b1f32fb1b1c3f35d0bfa52f2ecb8 SHA512 9f7d08f8aa786171cbf3e3fab1feb10606aeec9320419184bfcc6bdcb3b7b3f9d1e26365b44bd762964b396392db48a2ce5e1b1a7aaf5edcc51ab1e58e154c6b
-DIST libkcddb-24.12.0.tar.xz 450032 BLAKE2B da38dc109e2a72a096412d266671ac09a15880b71fb828a22380f81a2a5b8853fa6b4eea29eb3c281f67f280d5b839addcc51cf584eb9cad20baeb20b19459e4 SHA512 4f7c69468e976cf0cea4f65457226dc339d3da53665b18c943542ed1a1af87ee287e8c2e8aac11c63bb5d83550cbb603332e6e2f87d55f37214b28a5359a2539
+DIST libkcddb-24.12.1.tar.xz 450052 BLAKE2B 3f356e96f75ee50dd53c6feef2ba470482f2ed291dd27a16aeead8a9df6b53fb5ab9b5848e99421ee11ec0cac3dd0aee643113741757a74bdbb50f484e019ebb SHA512 3db7ae5c11953681ee3d5bd0ac87b13e4ddbfa86e8cc853b8cc57eea5ec2c29b58751915e0c4d422e5f8e83e7063eda7440135caaa5a8654048f86612f124307
diff --git a/kde-apps/libkcddb/libkcddb-24.12.0.ebuild b/kde-apps/libkcddb/libkcddb-24.12.0.ebuild
deleted file mode 100644
index c3e83eb4fc18..000000000000
--- a/kde-apps/libkcddb/libkcddb-24.12.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoff"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE library for CDDB"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="musicbrainz"
-
-# tests require network access and compare static data with online data
-# bug 280996
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	musicbrainz? ( media-libs/musicbrainz:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/libkcddb-common-${PV}
-"
-BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
-
-# Shipped by kde-apps/libkcddb-common package for shared use w/ SLOT 5
-ECM_REMOVE_FROM_INSTALL=(
-	/usr/share/applications/kcm_cddb.desktop
-	/usr/share/config.kcfg/libkcddb5.kcfg
-)
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-	cmake_run_in kcmcddb cmake_comment_add_subdirectory doc
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package musicbrainz MusicBrainz5)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/libkcddb/libkcddb-24.12.1.ebuild b/kde-apps/libkcddb/libkcddb-24.12.1.ebuild
new file mode 100644
index 000000000000..385de7bc8d2e
--- /dev/null
+++ b/kde-apps/libkcddb/libkcddb-24.12.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoff"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE library for CDDB"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="musicbrainz"
+
+# tests require network access and compare static data with online data
+# bug 280996
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	musicbrainz? ( media-libs/musicbrainz:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/libkcddb-common-${PV}
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+# Shipped by kde-apps/libkcddb-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/applications/kcm_cddb.desktop
+	/usr/share/config.kcfg/libkcddb5.kcfg
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+	cmake_run_in kcmcddb cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package musicbrainz MusicBrainz5)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index 6c7688ec2d74..14a2a9b28b2a 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,2 +1,2 @@
 DIST libkcompactdisc-24.08.3.tar.xz 99748 BLAKE2B aa542aeca77663dc6f76aa7bc20f0cd72480f1873a6b681ffe5531642cf43d3d3c0d63a3a0b7f1474f0a46668de29a1af08bac7468cfe8ae8accfa7d4cc06e14 SHA512 9303e7b9f9ec6222063b7f7edc332a86ddf5376084e48631e1d45559453e4834e46079a9c43673b9f3b31c128870d8d8196210605918a0030175b367bc5168c7
-DIST libkcompactdisc-24.12.0.tar.xz 100592 BLAKE2B b38d9932513ff817cdba0c8b436bb532a5dc04730a5b7705c94398d76f92954406340bbdf01291104e22f35bfb0d486a032bff9f680067d531596e6afa2d31d9 SHA512 ba7c6a1458724111641d7878846b850cdd668d04236763af4b6e46c92260fbaa39af42bffd9564bc7874bd6381799203578effee0481bf200febfb2905660d5d
+DIST libkcompactdisc-24.12.1.tar.xz 100576 BLAKE2B d7ea1fb06ab3628d58cb0128a478df87d119d98c5d07236651f9a4cf4426f0cf45e0528f360c0c75cf851f6be4651d1385730d5c01fe741c04750dd0b0f20406 SHA512 c030b2767f115a5058f2a386413054be3d80ac3376ff3efb55b0ed237615d87b9b435def016c9ac356d7e23e97371b21e235a5a4f92619f8586d917adcf73c81
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-24.12.0.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-24.12.0.ebuild
deleted file mode 100644
index d8be9ca9429c..000000000000
--- a/kde-apps/libkcompactdisc/libkcompactdisc-24.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for playing & ripping CDs"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="alsa"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus]
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-	>=media-libs/phonon-4.12.0[qt6(+)]
-	alsa? ( media-libs/alsa-lib )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package alsa ALSA)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-24.12.1.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-24.12.1.ebuild
new file mode 100644
index 000000000000..9f5bfceb1d8e
--- /dev/null
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-24.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for playing & ripping CDs"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="alsa"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus]
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=media-libs/phonon-4.12.0[qt6(+)]
+	alsa? ( media-libs/alsa-lib )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package alsa ALSA)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index 093c66e3b6b6..da3302a9a9a5 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,3 +1,3 @@
 DIST libkdcraw-23.08.5.tar.xz 37500 BLAKE2B 03f192f09485dbdb2361d9553b067211825f3862a07661f3494b03cc12db66823af539ee29f04a2ef2874c61c42c129b5116428b0cfc9994022b0c079ca0ecee SHA512 76b5b5ee83dfb20f5bb857b7b1d654388066da70413f58319d8ba0b143d0ae8bbd1f2a1ff26d205742fe57f7cf76a81687419787498c72a6faa9d21f92836059
 DIST libkdcraw-24.08.3.tar.xz 37332 BLAKE2B 1837b940a4ab62485eee8c9deb3063e3410189bff51f1c7c9d38c089a4a2a15dab78b377fb1259d311bd13ea8f953829c6f7a377424e52db37f8cff07737a4f0 SHA512 32b468fb342993385b66de79a7136e3c00575687bd32c0d05962346a32d9799d3d94fd56869aefed3735468e60f5761c3056c5376c375615dc373efefe8ce9cb
-DIST libkdcraw-24.12.0.tar.xz 37308 BLAKE2B 2d34e2510ae99d7a2a16746420ed78750868f931a4a592b97dde3dac61e11f8382850ac7d5f77ce57c09052f7e3eb38d74fec2a486a282731ed2234fbfe39f57 SHA512 4a2ea36554b8df0d3938aca5423d03685c8a84c2a593e4135307df2e905b56f08c3e99d232b3245a44dd3d01f90170480756268b1b40f874396b43420459744d
+DIST libkdcraw-24.12.1.tar.xz 37320 BLAKE2B e76b8aa012cd944ddf7691c659821c0e314e563a6ba37e18cbb1446d5346eeb5757538a6ce02f8b8865af22f5cf42cd648d1b38feb7772a6b635c2d55ff191ba SHA512 6abe1845a99a6869235d470d6290bfaf2945263e0479c13604d2e1e97b1efad4a206ef3b623a1f24e8fff5ccff9c2e579c5792cc6adf1fb79a8d09346b2eb029
diff --git a/kde-apps/libkdcraw/libkdcraw-24.12.0.ebuild b/kde-apps/libkdcraw/libkdcraw-24.12.0.ebuild
deleted file mode 100644
index 78ba0bdb0ac2..000000000000
--- a/kde-apps/libkdcraw/libkdcraw-24.12.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Digital camera raw image library wrapper"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
-	>=media-libs/libraw-0.16:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdcraw/libkdcraw-24.12.1.ebuild b/kde-apps/libkdcraw/libkdcraw-24.12.1.ebuild
new file mode 100644
index 000000000000..0e558967cf73
--- /dev/null
+++ b/kde-apps/libkdcraw/libkdcraw-24.12.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Digital camera raw image library wrapper"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=media-libs/libraw-0.16:=
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index 8ddec322cdf4..4b12133761e1 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,2 +1,2 @@
 DIST libkdegames-24.08.3.tar.xz 5995092 BLAKE2B 07367401824a74636e5246660b66bb3ccb7ebc10d6a06ecc257943956405ce54021a49d879dec6df4056fc9c402c321dff182c5af5271fd739b4e857b86812fa SHA512 b2962414d71955f71176889e92106a528b686b5e31fcd7c25222e7731cfe8ed9f41234e7c480c589ec9edd24bb434f4678b3cf5971dd2fdf759c8f10fd64dc6f
-DIST libkdegames-24.12.0.tar.xz 5973656 BLAKE2B e3248367b61fd43411f214179918537438550be036303dd8b5433433e93eacedc8f2e1bde61ba41bc12b4f5e465897cf7a418316b7c002e8610d11b766801e1e SHA512 1a193847528fb74d6f5ece58321344897238b181ed8467c71037d2bc10df1bf49854096cdfcd0e06bc5090f698eaeedcf99f25def1fb5618e75b8482b9564757
+DIST libkdegames-24.12.1.tar.xz 5977036 BLAKE2B 51e3471d09adfa777a8a41abd42b60e7d3bbce46bb970f7a6bb6acf04fff377cf6d44e33ce1b9889cf6d0a49245afd5ed49f12a0dc08ee73d6017ca5727a0005 SHA512 6103967eb2fa1f38278a96db79190221a14b921b28502657c44cbc0270e0ba709e8786abac0dfa811f7a2dd3d19714d36dc92060a68a4e4da58257dee3ed0062
diff --git a/kde-apps/libkdegames/libkdegames-24.12.0.ebuild b/kde-apps/libkdegames/libkdegames-24.12.0.ebuild
deleted file mode 100644
index 0fa365ddc5e0..000000000000
--- a/kde-apps/libkdegames/libkdegames-24.12.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Base library common to many KDE games"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kdnssd-${KFMIN}:6
-	>=kde-frameworks/kglobalaccel-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdegames/libkdegames-24.12.1.ebuild b/kde-apps/libkdegames/libkdegames-24.12.1.ebuild
new file mode 100644
index 000000000000..8f96f0fdeb44
--- /dev/null
+++ b/kde-apps/libkdegames/libkdegames-24.12.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Base library common to many KDE games"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdnssd-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	media-libs/libsndfile
+	media-libs/openal
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index 6471be7aa8ca..68f1b2ca0f2f 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,2 +1,2 @@
 DIST libkdepim-24.08.3.tar.xz 282868 BLAKE2B cb3ec7257c1d721a2ec26256441482d3dffe577fcc7727bc1411f2c3b89c85daf030d01481ed391857e85c9aa901f4f140c1a2cc4ac17545de18458d9800685f SHA512 5690f1d28e4c654c5ac00de7cd3f16659715155aa2ea74fc5cf6bb409348a437f38c66ac74798aff7de9c65430dbab6aafdd85e8329b8d9b84e1ba32a5ca9ed8
-DIST libkdepim-24.12.0.tar.xz 282920 BLAKE2B 87eb8f36948f92ddc141b68e25b53b49731ad61476a93097b2e60a9e8c42928e09f4c174fa3ea724b993d7cef616a4ca20e3eef0d005d6f40c2bccce5e17cc19 SHA512 26a3674b7df0a7c381377f292a1c177a8c05f10fa1a50f24e5ad1cb0a65886b0fa237e5bf80dd1615f2cb97b7236561af68a3d7438fb41bf97fd219dfe894b0b
+DIST libkdepim-24.12.1.tar.xz 282932 BLAKE2B ce22c401be3f5f191634549e4d6585a11f210126606216ab918ff88ae0613948780d579cb09d9d4432e8aacc305183be36db3bf1e3da0a946c4c30659a94e334 SHA512 4bf70a5b9b79f2186e7c762436cfdc84854011df24157f58721397c469c80894dd85201e536248cd7b6f2c9d5452ab856afe1c209c9f35a186210959e128e62c
diff --git a/kde-apps/libkdepim/libkdepim-24.12.0-r1.ebuild b/kde-apps/libkdepim/libkdepim-24.12.0-r1.ebuild
deleted file mode 100644
index fa6715522cda..000000000000
--- a/kde-apps/libkdepim/libkdepim-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdepim/libkdepim-24.12.1.ebuild b/kde-apps/libkdepim/libkdepim-24.12.1.ebuild
new file mode 100644
index 000000000000..b59ce08e96a3
--- /dev/null
+++ b/kde-apps/libkdepim/libkdepim-24.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Common PIM libraries"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index cbe3b41ad076..cec7f4a7a626 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,2 +1,2 @@
 DIST libkeduvocdocument-24.08.3.tar.xz 228284 BLAKE2B 8c177b6a0393f47170f94094653707cd44d302bc82488aa398ca1f54dc5bf9a43b59dd6e4b08f51e8514b8c3305d24168b01b04e2d7bbd441f383fe657b04a3c SHA512 64260f98f70dd5613e2d63eccc2c4880c35d765a76174d854d7e463e5612c057a599e8fd2d111bcfb556942ccbb60736a919554ca723757c379298f83af4c10a
-DIST libkeduvocdocument-24.12.0.tar.xz 228488 BLAKE2B 2191161e894005df906151a18eaa667d83a64ca7b8e769b596c1bb18236fafa1da733cb6dd1c4cb16551354e5d1c74ab488780ba5cbb357a6bcb66288d449d88 SHA512 00ab401112ab23ae3be84ca11992a00fdd6d04e62888209c83bc2d25db64a2c2b703c13e80f9cc2fc4b948462fd695a467553b70c3f3982005599458a1c7d6be
+DIST libkeduvocdocument-24.12.1.tar.xz 228488 BLAKE2B a33b3e1230526759ef06ead5f4605f064e58b1f70307ead5094a610f34ccebc6ad3508d78c5e8e8aedf3027d21deca22aa2dc348b1e70ce59e077eb80d1ac366 SHA512 e7bb8f2eb76760da7b31b29192363372b3bc719b6363c39baa98a25a3e0b8f9028f4584777746053418812d6ba9f87af5074bca2947ff248cbcfff95ae08b509
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-24.12.0.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-24.12.0.ebuild
deleted file mode 100644
index 41f893fe7093..000000000000
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-24.12.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for reading/writing KVTML"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[xml]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-24.12.1.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-24.12.1.ebuild
new file mode 100644
index 000000000000..043e4ed9a3cf
--- /dev/null
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-24.12.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for reading/writing KVTML"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[xml]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index c36c27da256f..e8a4dd042179 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,3 +1,3 @@
 DIST libkexiv2-23.08.5.tar.xz 60688 BLAKE2B b5b004a1eecd1e24542f41088b9cf04107d11e5cc2f4c80728c6bd1fccc06dee6f83ccf466f8fed7e1037c7f5fcd00eaf6519ed993f18affe77c839de60a9183 SHA512 e6535c24fea7c4a640433f6b1064d2058ba96a5908d08980ff978da8a4eb177aa26dd75a25c8ab44bb619b7a8e7ecfce8670ed3a67812806e9b587aeb48bcd16
 DIST libkexiv2-24.08.3.tar.xz 60636 BLAKE2B 67ae214f2f8326cb0ac2db12013a7be4d297e464b3ff9d82c9ae4202f6e983bc7c7058ea05e529da7ec68c016e698ce34b45f55742d6ce7d6e7d374c49853f9e SHA512 98c1cedec7ef26ed05b8b542ff54728155a1d18cb240bdb57001168db83fe6c16d7fdd2e67b305cb0dd64879dc267e0cac4d413f934b4003410b80742cf711e4
-DIST libkexiv2-24.12.0.tar.xz 60652 BLAKE2B ebc7db71002573d4105c58b35500c907241a100983c8fc0cd0be44ada559f68bb078bd46f0fefaeb159b7c8d29dafb55b41aa599be3b76161c206d9264c1b9b3 SHA512 d242bad819d86c5dbc1b0cd160dcc9f2780404bb0de038d569523b49fbe78aae4b74bb5cbfcedca75c2de36dfa184b327edb2128906bab3fe8350b2718c32a9a
+DIST libkexiv2-24.12.1.tar.xz 60624 BLAKE2B dd625de416793a302609880352ce1be9cba18330a4038976e07dc364fd9f0f368bbfe2f246bc4d8c0f0670c41c584bf2fb6a84ea1051de6a798a0a6db9756b4e SHA512 13f09eb360bce7c89fdc11c25f89d01f584721e4b1088928cc20de45d6b31a1e8517991d5f8ac2f0189a69838b3f591d673e0148f0c10a6e71f42a14a7860cd1
diff --git a/kde-apps/libkexiv2/libkexiv2-24.12.0.ebuild b/kde-apps/libkexiv2/libkexiv2-24.12.0.ebuild
deleted file mode 100644
index bf9f7bb06217..000000000000
--- a/kde-apps/libkexiv2/libkexiv2-24.12.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Wrapper around exiv2 library"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+xmp"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
-	>=media-gfx/exiv2-0.25:=[xmp=]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkexiv2/libkexiv2-24.12.1.ebuild b/kde-apps/libkexiv2/libkexiv2-24.12.1.ebuild
new file mode 100644
index 000000000000..2e6b2601329a
--- /dev/null
+++ b/kde-apps/libkexiv2/libkexiv2-24.12.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Wrapper around exiv2 library"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+xmp"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=media-gfx/exiv2-0.25:=[xmp=]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 87177da27777..4a4b139e484d 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,2 +1,2 @@
 DIST libkgapi-24.08.3.tar.xz 339412 BLAKE2B 91d4f43b2bf2485f64d9c66caededa21f8805a6bfd7c61393057afb8c2f93391cc3ffec48642b0c8f6d812a7947a9caeab4b4b8da99494319fb5bb761bfb1116 SHA512 157bc17e44135dcdcb322ed12dbad1f996dbc8a8a7311b02c2164a8b1bcde4ef1b3f77ba7aa6e125447bab1a0ddd7c6ef5b71452191920a5ce80df245e844885
-DIST libkgapi-24.12.0.tar.xz 339456 BLAKE2B a70d746d4ac9cd390712e0f668b15472ce40058b7f65b667b978c914fb5cb0c3d114d81a582884918a1d0503e2eff6d6f74c2cd8236784233c00b4826d678e13 SHA512 d6751e103ea87ae6f9353f3aa2c490a22bbc7ca394731cf992e8ab688c516d102fb2500a7524adb6367f9520136432872510ca9032c7c37b4bb7fa043c2c4d21
+DIST libkgapi-24.12.1.tar.xz 339404 BLAKE2B 51e5cd71cbbfeccd4d88fa2fa23ccf454060cfb821779ab42ae8d59d9f5d72aad2cb2d7d80629343bb9d00cbe8178b9afbd04639961f3c9db0c99ddd19e2463c SHA512 5f6e9753a4595fb55d67287cb59c48b55360a9a5658b253ee3fe2948ea1c036276b35e99c8a0ae90ee9374e1719e510d7f801740047828f402c32969606dad5e
diff --git a/kde-apps/libkgapi/libkgapi-24.12.0-r1.ebuild b/kde-apps/libkgapi/libkgapi-24.12.0-r1.ebuild
deleted file mode 100644
index a4bb5a0961ee..000000000000
--- a/kde-apps/libkgapi/libkgapi-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for accessing Google calendar and contact resources"
-HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
-
-LICENSE="LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	dev-libs/cyrus-sasl:2
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
-"
-BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
-
-CMAKE_SKIP_TESTS=(
-	# Failures not specific to Gentoo, bug #852593, KDE-bug #440648:
-	calendar-event{create,fetch,modify}jobtest
-	# bug 924625
-	tasks-task{create,modify}jobtest
-)
diff --git a/kde-apps/libkgapi/libkgapi-24.12.1.ebuild b/kde-apps/libkgapi/libkgapi-24.12.1.ebuild
new file mode 100644
index 000000000000..9734e329c445
--- /dev/null
+++ b/kde-apps/libkgapi/libkgapi-24.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for accessing Google calendar and contact resources"
+HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	dev-libs/cyrus-sasl:2
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+CMAKE_SKIP_TESTS=(
+	# Failures not specific to Gentoo, bug #852593, KDE-bug #440648:
+	calendar-event{create,fetch,modify}jobtest
+	# bug 924625
+	tasks-task{create,modify}jobtest
+)
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index 20b0a17001fd..0c38cdf45a17 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,2 +1,2 @@
 DIST libkleo-24.08.3.tar.xz 605864 BLAKE2B df2e9691b8fdcd30a1f50c4c912c8564318c1324e9b96c50429757893abbc6f2940994b48f034cfe7b8513d0abf1ec9af5171539259c54bae46341fd62b57bdc SHA512 fd1ba8060a0859decb8f7cc6ab0815a0a733b10a13f8db0e186252ad48d630180883ef2735ae2a4343161087424dd32e08321e63fcbe5160245b16d821e47b77
-DIST libkleo-24.12.0.tar.xz 638100 BLAKE2B a859c5b7b05c73c0c24373cc47f8c3ecf34be9d82224aa6c7479f3f99a466df8935911da3d0e852e8b4fbeac99a350d0a7c72813fe167595f676469451c5b91b SHA512 7b9721ac905d6a5a9bacb56771832eebc0e71788804f67f2fe6d503b43805c7b4f6dd5b4835b498bc5c2795a52e5f69247d6d9940d08dbc022644b30b8d5c4a4
+DIST libkleo-24.12.1.tar.xz 643168 BLAKE2B 6677eb7a35d3453d709925260899111129dfb9a050acc1fa80d53dc140a41c56779978d77d16cc135e46f53babba862d3cef894b30d2e7ddc2bfe9bd07815996 SHA512 c68300f41f056f4ac60a7bee60c3064f9ac69cb6b92954206a3e38cc66e6ed6b70676d5c087a8dc9457fd90e7139cb2185cb6afa602387d24e3593f8d1d2e745
diff --git a/kde-apps/libkleo/libkleo-24.12.0-r1.ebuild b/kde-apps/libkleo/libkleo-24.12.0-r1.ebuild
deleted file mode 100644
index f4387b8ccfe1..000000000000
--- a/kde-apps/libkleo/libkleo-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for encryption handling"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/gpgme-1.23.2:=[cxx,qt6]
-	>=dev-libs/libgpg-error-1.36
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
diff --git a/kde-apps/libkleo/libkleo-24.12.1.ebuild b/kde-apps/libkleo/libkleo-24.12.1.ebuild
new file mode 100644
index 000000000000..be043cfb400d
--- /dev/null
+++ b/kde-apps/libkleo/libkleo-24.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for encryption handling"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/gpgme-1.23.2:=[cxx,qt6]
+	>=dev-libs/libgpg-error-1.36
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index 27f47dc12a21..37f7d15d7618 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,2 +1,2 @@
 DIST libkmahjongg-24.08.3.tar.xz 1693260 BLAKE2B 4e296b386ddb23dfa7820ddf98607b4f39a8616a7dfc5d86149f5fad5fadcddb6c4a009b09702bb46776596605974310a996fb1d1e9c900e4c0a1cc5399b37d4 SHA512 0150f9b6089cac432452305616e838716a1607975f0e973447521700501ebf2fe31b0896fe1aba9fd204d526088ee161651fbc2a0ce1982cfd68643aab683d5a
-DIST libkmahjongg-24.12.0.tar.xz 1693744 BLAKE2B aa45ed4a7cc65fdc722106553f1083ac92e9f16b2d4747feff85784cc54acd94a24f69e45bf947f408f89efb3086305d44b54f46751b8fee15fa1ab27ba7510b SHA512 52c6af90cbeb7821f99cb6822bb9496353c3141e67dd366de32b681fedcd0c48098bdc94a075cc3397d34f4ba2f385ab01f7e3a217812bfa173c7628b9584d2f
+DIST libkmahjongg-24.12.1.tar.xz 1693020 BLAKE2B 6e678fa763816be8d2c4044926f533779757b47ff06f7e083660a65d4b922c1f18b32093907c5a8717a14f017a1ca32ae61af3b6e2eed19442f5bc8dca418e45 SHA512 6a731806855d3fd9069c18ae95dff645107024dbb9d67156e2deba155d0ea227f4c35a1112c3cce5a092c89b531b694d697e5e915d2182c3cbd1f2386d132c31
diff --git a/kde-apps/libkmahjongg/libkmahjongg-24.12.0.ebuild b/kde-apps/libkmahjongg/libkmahjongg-24.12.0.ebuild
deleted file mode 100644
index b89f8912c906..000000000000
--- a/kde-apps/libkmahjongg/libkmahjongg-24.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-# TODO: 7zip
-BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/libkmahjongg/libkmahjongg-24.12.1.ebuild b/kde-apps/libkmahjongg/libkmahjongg-24.12.1.ebuild
new file mode 100644
index 000000000000..7c52a9cb0e75
--- /dev/null
+++ b/kde-apps/libkmahjongg/libkmahjongg-24.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+# TODO: 7zip
+BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index 8025c4620ba2..d24ad790f851 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,2 +1,2 @@
 DIST libkomparediff2-24.08.3.tar.xz 187768 BLAKE2B be1cb7dfee3d1417ede3fa6a620d914644bd2c6abfd6412488f6e0d55381b220fe313743bf2bc86a4963c58afbbd50069c28e1ef8fc15026cd2f6a54572b453a SHA512 aced611a93c64647cd2aa8b05d14d319be8600f708aa03a370d20996050c473f10d45dcaf8bf3a777f9be63392e6b60577ff6c48f412c4f70b95cce79cc2f925
-DIST libkomparediff2-24.12.0.tar.xz 188224 BLAKE2B 25db20d12a54a0b17c487d02f4f558d4fbb96dcd81267adbd0647d6422b382fd132471847df81970e8f521a7ed8c4c54fd3a6d45684357520091083169ad6b7c SHA512 7158614268e8872c5b55ccd9bf212779d5b6e6e41b16624b39c4e1f45cc28976796de37fade5ff28c4b925958d2a8932f888700735ec4bf24f6ceca4009d964a
+DIST libkomparediff2-24.12.1.tar.xz 188448 BLAKE2B 30f247e2ace2469f9f25809ed1a6cb9f690d280f6c3f10b9d1269f5f4c6b029c13b3e63566030f5c66d66df7ac1978e8f0d974f00b24b875a673ef105466e29a SHA512 d364256c4e505d7bcb6c7c4f3b04ca5a54f38c2b25189426edfc416826e8eb3c514eddfe93b72b1f35b0c2a974e3d041a8e1613df7b8373510c4b7734c9d45a9
diff --git a/kde-apps/libkomparediff2/libkomparediff2-24.12.0.ebuild b/kde-apps/libkomparediff2/libkomparediff2-24.12.0.ebuild
deleted file mode 100644
index c3777d97ef92..000000000000
--- a/kde-apps/libkomparediff2/libkomparediff2-24.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library to compare files and strings"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkomparediff2/libkomparediff2-24.12.1.ebuild b/kde-apps/libkomparediff2/libkomparediff2-24.12.1.ebuild
new file mode 100644
index 000000000000..1f9180f29d1e
--- /dev/null
+++ b/kde-apps/libkomparediff2/libkomparediff2-24.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library to compare files and strings"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libksane-common/Manifest b/kde-apps/libksane-common/Manifest
index a1da34e7473e..12400c8020a5 100644
--- a/kde-apps/libksane-common/Manifest
+++ b/kde-apps/libksane-common/Manifest
@@ -1,2 +1,2 @@
 DIST libksane-24.08.3.tar.xz 153628 BLAKE2B 53733c905d4f6a6c8b29f042ae3d976ec68957763ae6f9e621edba0a8ab5f0b7154a19847bb70c9735d607f83e49e04ee72fc0a7b6ffe705aab6ef32dcff5513 SHA512 a6f1cddd437ab9b322b2aebf6a4308eab9056127ee4a635f0f00ee0a1282850714be9ef10a8dad79ab791ba9698646fc82790113a5b9af8a15f21f9799ebea36
-DIST libksane-24.12.0.tar.xz 155428 BLAKE2B e5d57930064d144fc2554ad86a241caa9232b23d55bfed5282f9a536a8a36fc0fcfa6793acd62ee1a5afea08d71f2100d3c3031fb390ac94d16dde320959b04a SHA512 338686163b7432718dd22adec68ff50e7444da1a06813b91fddbda13caa39615318644492e209923629e0a754e76d366fb5ca6578cc09b6bd21677d722884d6f
+DIST libksane-24.12.1.tar.xz 155412 BLAKE2B e75eb176f88ddfd45b4730ed93ddb073f8c292e3c0be71cffd6d3a6fbb08b846eedd629c38e2e21d8621770ef5e090e7a67f09da904f48fb78c9eeb35a00656b SHA512 51a18f78c98e9d1235529646087086002be52bb5bc517cc5ee33ed2dd7238503a80705a79e608d6f18aa24b9f2fddf69352a72617d23ff16368dcf76c959cf85
diff --git a/kde-apps/libksane-common/libksane-common-24.12.0.ebuild b/kde-apps/libksane-common/libksane-common-24.12.0.ebuild
deleted file mode 100644
index 582564bb6b69..000000000000
--- a/kde-apps/libksane-common/libksane-common-24.12.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
-
-KDE_ORG_NAME="${PN/-common/}"
-KFMIN=5.115.0
-inherit ecm-common gear.kde.org
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	!<kde-apps/libksane-24.02.2-r2:5
-	!<kde-apps/libksane-24.05.2-r1:6
-"
-
-ECM_INSTALL_ICONS=(
-	src/16-actions-black-white.png:\${KDE_INSTALL_ICONDIR}
-	src/16-actions-color.png:\${KDE_INSTALL_ICONDIR}
-	src/16-actions-gray-scale.png:\${KDE_INSTALL_ICONDIR}
-)
diff --git a/kde-apps/libksane-common/libksane-common-24.12.1.ebuild b/kde-apps/libksane-common/libksane-common-24.12.1.ebuild
new file mode 100644
index 000000000000..784e39df79ea
--- /dev/null
+++ b/kde-apps/libksane-common/libksane-common-24.12.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN/-common/}"
+KFMIN=5.115.0
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	!<kde-apps/libksane-24.02.2-r2:5
+	!<kde-apps/libksane-24.05.2-r1:6
+"
+
+ECM_INSTALL_ICONS=(
+	src/16-actions-black-white.png:\${KDE_INSTALL_ICONDIR}
+	src/16-actions-color.png:\${KDE_INSTALL_ICONDIR}
+	src/16-actions-gray-scale.png:\${KDE_INSTALL_ICONDIR}
+)
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index a1da34e7473e..12400c8020a5 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,2 +1,2 @@
 DIST libksane-24.08.3.tar.xz 153628 BLAKE2B 53733c905d4f6a6c8b29f042ae3d976ec68957763ae6f9e621edba0a8ab5f0b7154a19847bb70c9735d607f83e49e04ee72fc0a7b6ffe705aab6ef32dcff5513 SHA512 a6f1cddd437ab9b322b2aebf6a4308eab9056127ee4a635f0f00ee0a1282850714be9ef10a8dad79ab791ba9698646fc82790113a5b9af8a15f21f9799ebea36
-DIST libksane-24.12.0.tar.xz 155428 BLAKE2B e5d57930064d144fc2554ad86a241caa9232b23d55bfed5282f9a536a8a36fc0fcfa6793acd62ee1a5afea08d71f2100d3c3031fb390ac94d16dde320959b04a SHA512 338686163b7432718dd22adec68ff50e7444da1a06813b91fddbda13caa39615318644492e209923629e0a754e76d366fb5ca6578cc09b6bd21677d722884d6f
+DIST libksane-24.12.1.tar.xz 155412 BLAKE2B e75eb176f88ddfd45b4730ed93ddb073f8c292e3c0be71cffd6d3a6fbb08b846eedd629c38e2e21d8621770ef5e090e7a67f09da904f48fb78c9eeb35a00656b SHA512 51a18f78c98e9d1235529646087086002be52bb5bc517cc5ee33ed2dd7238503a80705a79e608d6f18aa24b9f2fddf69352a72617d23ff16368dcf76c959cf85
diff --git a/kde-apps/libksane/libksane-24.12.0.ebuild b/kde-apps/libksane/libksane-24.12.0.ebuild
deleted file mode 100644
index c2f9fa8a3efe..000000000000
--- a/kde-apps/libksane/libksane-24.12.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.5.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="SANE Library interface based on KDE Frameworks"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="kwallet"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=media-libs/ksanecore-${PVCUT}:6
-	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:6 )
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/libksane-common-${PV}
-"
-
-# Shipped by kde-apps/libksane-common package for shared use w/ SLOT 5
-ECM_REMOVE_FROM_INSTALL=(
-	/usr/share/icons/hicolor/16x16/actions
-)
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kwallet KF6Wallet)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/libksane/libksane-24.12.1.ebuild b/kde-apps/libksane/libksane-24.12.1.ebuild
new file mode 100644
index 000000000000..ae2cdecee628
--- /dev/null
+++ b/kde-apps/libksane/libksane-24.12.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="SANE Library interface based on KDE Frameworks"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="kwallet"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=media-libs/ksanecore-${PVCUT}:6
+	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/libksane-common-${PV}
+"
+
+# Shipped by kde-apps/libksane-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/icons/hicolor/16x16/actions
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kwallet KF6Wallet)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 06e1509beb63..d0882cf82315 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,2 +1,2 @@
 DIST libksieve-24.08.3.tar.xz 602368 BLAKE2B 51fb70e4cd112dfb43f0cc9b9459e374210043b557511e5d2d8e0529a0a1db1b05f3d94ee4cf462adf6a5d31c6ecb28688e26aa434109e632a48e03086c9c1a8 SHA512 15788acc3c28afc8738f95f68e9367b900c6e199cd5d08255d462a438e798786ebd6b5ce54dd3793737b1466faecded6980abe160a4166f9435df0724334c950
-DIST libksieve-24.12.0.tar.xz 603588 BLAKE2B 0d6bbe9a43900e856076e977b1105e1fe97dc9335cef739d3d625a58f8e4845cce808ed9e276555a775935b5db34f3d85134649f021b4b10411676c162288d2b SHA512 08a7c0daa649527a4612011b7b17e0e4dd0fae89457ce9f8c6f885d147dfc2f823f5d715e871ba30d3bdbc9b728868fb34a56b8cc629cd63557d5c8b169d88d0
+DIST libksieve-24.12.1.tar.xz 603500 BLAKE2B 827ea9fced735d89d7c7435952d09ad5d4de8e684ef6970a4981269e63737268e623c0648bbdccc73eb7d156e1a2207d9696ee174e01a614a273e1495b4c8fe1 SHA512 185f4777557ba1c24e2f20ad581a384e8c34cd65d3c8ef74b3a0dc2b63d764e4aa261fd0287d0fcc9db1b7cd9e6a60090c10ded7fda029430e7e1d07de735a16
diff --git a/kde-apps/libksieve/libksieve-24.12.0-r1.ebuild b/kde-apps/libksieve/libksieve-24.12.0-r1.ebuild
deleted file mode 100644
index 2bf8f21d85e8..000000000000
--- a/kde-apps/libksieve/libksieve-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="speech"
-
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-libs/ktextaddons-1.5.4:6[speech?]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
-"
-DEPEND="${RDEPEND}
-	>=kde-apps/kimap-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/libksieve/libksieve-24.12.1.ebuild b/kde-apps/libksieve/libksieve-24.12.1.ebuild
new file mode 100644
index 000000000000..2f5948a694e3
--- /dev/null
+++ b/kde-apps/libksieve/libksieve-24.12.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Common PIM libraries"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="speech"
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/cyrus-sasl
+	>=dev-libs/ktextaddons-1.5.4:6[speech?]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+"
+DEPEND="${RDEPEND}
+	>=kde-apps/kimap-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 9383e68345a0..f4a1afdbf7bd 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,2 +1,2 @@
 DIST ktnef-24.08.3.tar.xz 313236 BLAKE2B d67f20587cef41bf42442f727e1c17313abf458bd921242df0d62a7489cbca8baa805140011bd7eb7d0f4dc2ea7d8bcde7ea467bfb2445186d8353a762dea8f7 SHA512 817195fe825cf287390a4e3300f80fef741bd8f5f0285583054374ec1952585c6559c5da140983b43112b4a1e09d8da93a32f6a3fe45cf83301ac0633872bd47
-DIST ktnef-24.12.0.tar.xz 313476 BLAKE2B 2ba6344e2e1a18f5c6267b9550024289b7c71b6432b56df0078e8300dbce1d9a28972ae9552fae4949e404cba67b4b6ccbb91f8ccc12726541bb0a9cb98256db SHA512 651027d38e96920b572f6703b30bdb0351271cba33a537cc32c5c1fb11bd16b818ebcff21f33faaa06a93550ac0561e749e46f0732deb59bcd40d4269f7d2b1b
+DIST ktnef-24.12.1.tar.xz 313544 BLAKE2B 0032d7eee6fd0a1975b68b64ac5654794efd483aa5ab752db2bd9cdfa4eafb5f0ec454497f992be344028895aa67a4d31ffd20bbdc8a2aea1d9174111e6d3d72 SHA512 a858874d6a420eccb3329201d8e96e8841067359fed9edeeb8f619f5cf7096dc60c4c85ea4d7859196189e224735e4ba49a6cc59d33ed8ee1f060d77e422acdd
diff --git a/kde-apps/libktnef/libktnef-24.12.0-r1.ebuild b/kde-apps/libktnef/libktnef-24.12.0-r1.ebuild
deleted file mode 100644
index f85aa37fc92b..000000000000
--- a/kde-apps/libktnef/libktnef-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KDE_ORG_NAME="ktnef"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for handling TNEF data"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[widgets]
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libktnef/libktnef-24.12.1.ebuild b/kde-apps/libktnef/libktnef-24.12.1.ebuild
new file mode 100644
index 000000000000..2c2e2a478ada
--- /dev/null
+++ b/kde-apps/libktnef/libktnef-24.12.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KDE_ORG_NAME="ktnef"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for handling TNEF data"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[widgets]
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index d1fa5e9a9229..326fb47505e3 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,2 +1,2 @@
 DIST lokalize-24.08.3.tar.xz 2054468 BLAKE2B c78a6a970a38ba224ebfb6819a369c95ae71b7fcd33830f76e99d8fdf0df9aac706ce607a0b76fa2e2551b36d504e5c16084d1a4d3ebef8df44191a59b2889c7 SHA512 e844c5874b3dd4343e5298134721caed5c701772eadf7a886f0d02bb6ce8ac468143ebef3626e82162bfa64e3f82149e1917e9c4ed8d11095ee3679e69d6e3d1
-DIST lokalize-24.12.0.tar.xz 2059536 BLAKE2B 80590e024b161f6368ad698b49d757ab057d430f63846549b0df55c5549fe5a867af9d8df09f88ccaea6908f9cf90f002aa9a7b2784b4f7509d48719ea1db936 SHA512 8564d36542e7cf0a137ccd9546e3e5273eab377240f14da4a57547d5e149c85dcf72e589a8b2f1b20fcccf284609f0415eef362027f4ea6fca9e024e813d603c
+DIST lokalize-24.12.1.tar.xz 2059700 BLAKE2B 28a1b5f5191c2ce4812bb1b95468b55d9d20577780985877717d89cbb72a99396b8ca74c0573ee3a9b0df0eb378554deed71267f27f4b6ef68653b67b66d5901 SHA512 bc227ff16897f3cc9af4a9df05ad2d9607fc4bb9a93997afccb5496a7fb060d2688b950ff7084c6b8d220c11613758af0630172c00fa19b31434c8ac3dc76aaa
diff --git a/kde-apps/lokalize/lokalize-24.12.0.ebuild b/kde-apps/lokalize/lokalize-24.12.0.ebuild
deleted file mode 100644
index 9a7b676624ba..000000000000
--- a/kde-apps/lokalize/lokalize-24.12.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{10..12} )
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit python-single-r1 ecm gear.kde.org optfeature
-
-DESCRIPTION="Localization tool for KDE software and other free and open source software"
-HOMEPAGE="https://apps.kde.org/lokalize/ https://l10n.kde.org/tools/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test" # tests are broken, bug 739734
-
-DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.2.8:=
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets,xml]
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/translate-toolkit[${PYTHON_USEDEP}]
-	')
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_install() {
-	ecm_src_install
-	rm "${ED}"/usr/share/lokalize/scripts/msgmerge.{py,rc} || die
-	python_fix_shebang "${ED}"/usr/share/${PN}
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "autofetch kde.org translations in new project wizard" dev-vcs/subversion
-		optfeature "spell and grammar checking" app-text/languagetool
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/lokalize/lokalize-24.12.1.ebuild b/kde-apps/lokalize/lokalize-24.12.1.ebuild
new file mode 100644
index 000000000000..2d99a935e2ee
--- /dev/null
+++ b/kde-apps/lokalize/lokalize-24.12.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{10..12} )
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit python-single-r1 ecm gear.kde.org optfeature
+
+DESCRIPTION="Localization tool for KDE software and other free and open source software"
+HOMEPAGE="https://apps.kde.org/lokalize/ https://l10n.kde.org/tools/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test" # tests are broken, bug 739734
+
+DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.2.8:=
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets,xml]
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/translate-toolkit[${PYTHON_USEDEP}]
+	')
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_install() {
+	ecm_src_install
+	rm "${ED}"/usr/share/lokalize/scripts/msgmerge.{py,rc} || die
+	python_fix_shebang "${ED}"/usr/share/${PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "autofetch kde.org translations in new project wizard" dev-vcs/subversion
+		optfeature "spell and grammar checking" app-text/languagetool
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index c9164ab18f89..6c8ba5318451 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,2 +1,2 @@
 DIST lskat-24.08.3.tar.xz 1226960 BLAKE2B 7ef12f329cb38b6cf2e92734d9bf2c1b5ba2ecdd11fee7bcab4c51ac1bfa991c7da5b796fda27f6c73973e8691e6948bd21e28bf0017b9b71ef75c7fcb5219ce SHA512 a11910db4ba4e345b411c0370a73701dfdfe1a2ae241bf704978510140d1164277080c0126fdc369fab718aca1ff0d13aa7a35fffc7deb1ff80793b81d4ac10d
-DIST lskat-24.12.0.tar.xz 1226912 BLAKE2B 9eff1df7df5fb39688eb1ebe9808be4945c27b5c866052ec3f75b5419281c930ee6664ae120a2773eb51f1e16d1bb411b89ecfcf9d5e2640bda23b97540763e2 SHA512 1626b3c89d94cb2a55da71c8b7868fab2cb43f21d6f91eaed7c31da26f241c659cf4e07d98c4978576ea66d58b53af4264322e4e63ab9da120e1015164cd16d4
+DIST lskat-24.12.1.tar.xz 1227280 BLAKE2B 4221c851f69f6f15de8df70a3823f892ef438198d3c0f1480753409a0572daf75b128c97be4dcb3eb32af772d1f71ead4801f08d3e2576f1a8292d2ede690d8a SHA512 7ad3ab66c75ff4be3680269dfb37b9aa56b04cfe5d0f024deb08228c096ec35eb9289ed0c498283e0fcb70ab3ae8539d16ae33ca0b9067e1b3d9121ddb492168
diff --git a/kde-apps/lskat/lskat-24.12.0.ebuild b/kde-apps/lskat/lskat-24.12.0.ebuild
deleted file mode 100644
index 52fdb8c34d32..000000000000
--- a/kde-apps/lskat/lskat-24.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Skat game by KDE"
-HOMEPAGE="https://apps.kde.org/lskat/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-# TODO: || ( 7zip gzip )
-BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/lskat/lskat-24.12.1.ebuild b/kde-apps/lskat/lskat-24.12.1.ebuild
new file mode 100644
index 000000000000..062e8c5fa00d
--- /dev/null
+++ b/kde-apps/lskat/lskat-24.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Skat game by KDE"
+HOMEPAGE="https://apps.kde.org/lskat/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+# TODO: || ( 7zip gzip )
+BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index e3c0c6d5140a..27aa7a3bf818 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,2 +1,2 @@
 DIST mailcommon-24.08.3.tar.xz 782720 BLAKE2B 57e40394fc3ee63e5948173a76b2bd2c609fbf0c8d784f944d99b09642b5cda1aed5a3c6edf76361f1811adda066e99ae08e1b1b9f9629db6faa1d41b6df99c7 SHA512 59c2aad3a44a2f52d9609a29fb178085adb6e8008c3a617bfa793431e5cf323e4d0c6ba3c83ead6588a8cc9f3b3f3412ad24c23a1f9704ef0e0ac9f02da74730
-DIST mailcommon-24.12.0.tar.xz 789620 BLAKE2B f35c38529df8df25365649750990b52d573781b14a6fc11fce4b95afbe60acce9521eddc12fb3486eda080aaa636bdf53ecb5b5adea62911a153d47cf72592ca SHA512 cdad87e77e0494281ff265dfd6f2fc5128d784e74773129177cf3af904939effec55aa6245d7d1fdc8f8024fff418f88024f1ca79d8781e155c8fe025d2cb3d5
+DIST mailcommon-24.12.1.tar.xz 789808 BLAKE2B 81078f966bdedf9e42be1e8784544069cd0556adebf96ea759d6cfe876893039801aed6b19224a29f36fd5b3fa9e58d5d5791530e56cf318a9bf77d5a96fd71b SHA512 e3cd6ecd95b9e3029662b1829241da6fe52d38d2fb09510f86188c25cace19d76547f511ae3cb339db75b60440b94f8bb0a99a88febc9016536dfa10059f6913
diff --git a/kde-apps/mailcommon/mailcommon-24.12.0-r1.ebuild b/kde-apps/mailcommon/mailcommon-24.12.0-r1.ebuild
deleted file mode 100644
index b0c2f46eb736..000000000000
--- a/kde-apps/mailcommon/mailcommon-24.12.0-r1.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
-
-ECM_DESIGNERPLUGIN="true"
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Common mail library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="activities"
-
-RESTRICT="test"
-
-DEPEND="
-	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
-	>=dev-qt/qtmultimedia-${QTMIN}:6
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/kpimtextedit-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/mailimporter-${PVCUT}:6
-	>=kde-apps/messagelib-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
-	>=media-libs/phonon-4.12.0[qt6(+)]
-	activities? ( kde-plasma/plasma-activities:6 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/mailcommon/mailcommon-24.12.1.ebuild b/kde-apps/mailcommon/mailcommon-24.12.1.ebuild
new file mode 100644
index 000000000000..7a6381383af2
--- /dev/null
+++ b/kde-apps/mailcommon/mailcommon-24.12.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Common mail library"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities"
+
+RESTRICT="test"
+
+DEPEND="
+	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/kpimtextedit-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/mailimporter-${PVCUT}:6
+	>=kde-apps/messagelib-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6[activities?]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+	>=media-libs/phonon-4.12.0[qt6(+)]
+	activities? ( kde-plasma/plasma-activities:6 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 3441704ab7be..6ff5459e8d63 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,2 +1,2 @@
 DIST mailimporter-24.08.3.tar.xz 595968 BLAKE2B cf1f0b37bcb3cb52d7e58faaf8aab3bad4eadee454555b5fcfc200bec2100db8bf6d8d234ea375aa56760342f3e0d883676e5b8cafbb7dbcde80108e8bd98e7a SHA512 402c5dcea63cee1388170cfd5458f12942b0d96d256b0113934975cfece934b43b3316b26efb799349bdeab4bfb01f7e33966b60f7f7f21c650a17429505e8d4
-DIST mailimporter-24.12.0.tar.xz 596632 BLAKE2B 1865f0f5d655a54b099cf905a75a92babd4f46cac09a6cece25113dd81817bd13b31475f9e3051eb07d3bf92248917db797bd26539732723fed60f308fc47bf9 SHA512 233130c73c2d6c8fed2dea87f49437a19b078efa16af4f968270cce6416feb83834db7e564868e7c28dc2a019575295bfe6c3c58ab7db14d99ba94c0f4d81e27
+DIST mailimporter-24.12.1.tar.xz 596688 BLAKE2B 83492e60b3fa16b0acb81d512bb8f4f088e8290e217082293342889b8a367280fbd9f56dfc72f6a2a544fa70f7b684974dce41e227ab74278ae7c1ff0599225e SHA512 cd4b5765fd22217130bc78e1812c05e1dd9f9a45acc299a72c8dc791b82400b92f1718421a0766e4d110c76b0097b5efad98c44f3ec8269840d86ac6dba0a9a1
diff --git a/kde-apps/mailimporter/mailimporter-24.12.0-r1.ebuild b/kde-apps/mailimporter/mailimporter-24.12.0-r1.ebuild
deleted file mode 100644
index 4ebff533e9bd..000000000000
--- a/kde-apps/mailimporter/mailimporter-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library to import mail from various sources"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/mailimporter/mailimporter-24.12.1.ebuild b/kde-apps/mailimporter/mailimporter-24.12.1.ebuild
new file mode 100644
index 000000000000..f4ba2119875c
--- /dev/null
+++ b/kde-apps/mailimporter/mailimporter-24.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library to import mail from various sources"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index fbca323b6249..f6ca413ca2b2 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,2 +1,3 @@
 DIST marble-24.08.3.tar.xz 52449740 BLAKE2B 8d2712b0aad3dd092245d6e3a6a5df5cb883fa0fbfb928e172bb6c43fe6ad5021a663b6f4e08e83666bc10d5dafd8a4e932d60b2b0381e3ae067a7410cde3f4c SHA512 8b39bfe6622c0a8377fdc0dc83b73453f877289717d0b8bada637001da7bf4ead26532c6bc2754647ff680a72b89ed217afdd80d3efb17aa5dda9be786a9d763
 DIST marble-24.12.0.tar.xz 53635296 BLAKE2B 96a54ec1d94bb2dbeab24c4d69baa5917a6d729c7992a00b5c0cfae5192a2815c344aa88f26efaa7a4f8c79c2a2682fbbfa94b8cfd2251a409acdac74799ee71 SHA512 196b4fde279bf05f50fc4cce40153d2be47e0d69ef7a7e6eefa97a13d4163fac92748759981f7f76a11014fbeb9c02c363f3c1bd35a9deac88bbff258b457fdd
+DIST marble-24.12.1.tar.xz 53605040 BLAKE2B 680f86527cb1bffc4a00a5f472ca87b40a78cd32c4eb29b51e689d9a8900c0355d425b345ce824c88451f89bc81102376b8236b9f8216fbb41212dff6d80da3a SHA512 6a5e8feb8bf2be189aa449f28eca6e7b82638c7343569b208975c418544e4c2bdcb8af317b4b3fd6d5fcc19f8389e56a2f6c33accf6f3bdb41352d0c6cb403f5
diff --git a/kde-apps/marble/marble-24.12.0-r1.ebuild b/kde-apps/marble/marble-24.12.0-r1.ebuild
deleted file mode 100644
index 28c09b6f130a..000000000000
--- a/kde-apps/marble/marble-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
-HOMEPAGE="https://marble.kde.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine"
-
-# bug 588320
-RESTRICT="test"
-
-# FIXME (new package): libwlocate, WLAN-based geolocation
-DEPEND="
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus?,gui,network,sql,widgets,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	sys-libs/zlib
-	aprs? ( >=dev-qt/qtserialport-${QTMIN}:6 )
-	designer? ( >=dev-qt/qttools-${QTMIN}:6[designer] )
-	geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:6 )
-	gps? ( sci-geosciences/gpsd:= )
-	kde? (
-		>=kde-frameworks/kconfig-${KFMIN}:6
-		>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-		>=kde-frameworks/kcoreaddons-${KFMIN}:6
-		>=kde-frameworks/kcrash-${KFMIN}:6
-		>=kde-frameworks/ki18n-${KFMIN}:6
-		>=kde-frameworks/kio-${KFMIN}:6
-		>=kde-frameworks/kparts-${KFMIN}:6
-		>=kde-frameworks/krunner-${KFMIN}:6
-	)
-	pbf? ( dev-libs/protobuf:= )
-	phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] )
-	shapefile? ( sci-libs/shapelib:= )
-	webengine? (
-		>=dev-qt/qtwebchannel-${QTMIN}:6
-		>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	)
-"
-RDEPEND="${DEPEND}
-	kde? (
-		dev-libs/kirigami-addons:6
-		>=dev-qt/qt5compat-${QTMIN}:6[qml]
-		>=kde-frameworks/kirigami-${KFMIN}:6
-	)
-"
-BDEPEND="
-	>=dev-qt/qttools-${QTMIN}:6[linguist]
-	aprs? ( dev-lang/perl )
-"
-
-PATCHES=( # bug 946470
-	"${FILESDIR}/${P}-cmake-drop-qt_policy.patch"
-	"${FILESDIR}/${P}-cmake-behaim-marble-maps-kf6-conditional.patch"
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	rm -r src/3rdparty/zlib || die "Failed to remove bundled libs"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package aprs Perl)
-		$(cmake_use_find_package geolocation Qt6Positioning)
-		-DBUILD_WITH_DBUS=$(usex dbus)
-		-DWITH_DESIGNER_PLUGIN=$(usex designer)
-		-DWITH_libgps=$(usex gps)
-		$(cmake_use_find_package pbf Protobuf)
-		-DWITH_Phonon4Qt6=$(usex phonon)
-		-DWITH_libshp=$(usex shapefile)
-		$(cmake_use_find_package webengine Qt6WebEngineWidgets)
-		-DWITH_libwlocate=OFF
-		# bug 608890
-		-DKDE_INSTALL_CONFDIR="/etc/xdg"
-	)
-	# KF6KIO: src/thumbnailer/CMakeLists.txt
-	# KF6Runner: src/plasmarunner/CMakeLists.txt
-	for x in CoreAddons I18n Config Crash KIO Parts Runner; do
-		mycmakeargs+=( $(cmake_use_find_package kde KF6${x}) )
-	done
-	ecm_src_configure
-}
diff --git a/kde-apps/marble/marble-24.12.0-r2.ebuild b/kde-apps/marble/marble-24.12.0-r2.ebuild
new file mode 100644
index 000000000000..0e1b719fb40f
--- /dev/null
+++ b/kde-apps/marble/marble-24.12.0-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
+ECM_TEST="true"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
+HOMEPAGE="https://marble.kde.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6/$(ver_cut 1-2)"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine"
+
+# bug 588320
+RESTRICT="test"
+
+# FIXME (new package): libwlocate, WLAN-based geolocation
+DEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus?,gui,network,sql,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	sys-libs/zlib
+	aprs? ( >=dev-qt/qtserialport-${QTMIN}:6 )
+	designer? ( >=dev-qt/qttools-${QTMIN}:6[designer] )
+	geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:6 )
+	gps? ( sci-geosciences/gpsd:= )
+	kde? (
+		>=kde-frameworks/kconfig-${KFMIN}:6
+		>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+		>=kde-frameworks/kcoreaddons-${KFMIN}:6
+		>=kde-frameworks/kcrash-${KFMIN}:6
+		>=kde-frameworks/ki18n-${KFMIN}:6
+		>=kde-frameworks/kio-${KFMIN}:6
+		>=kde-frameworks/kparts-${KFMIN}:6
+		>=kde-frameworks/krunner-${KFMIN}:6
+		webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[qml] )
+	)
+	pbf? ( dev-libs/protobuf:= )
+	phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] )
+	shapefile? ( sci-libs/shapelib:= )
+	webengine? (
+		>=dev-qt/qtwebchannel-${QTMIN}:6
+		>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	)
+"
+RDEPEND="${DEPEND}
+	kde? (
+		dev-libs/kirigami-addons:6
+		>=dev-qt/qt5compat-${QTMIN}:6[qml]
+		>=kde-frameworks/kirigami-${KFMIN}:6
+	)
+"
+BDEPEND="
+	>=dev-qt/qttools-${QTMIN}:6[linguist]
+	aprs? ( dev-lang/perl )
+"
+
+PATCHES=( # bug 946470
+	"${FILESDIR}/${P}-cmake-drop-qt_policy.patch"
+	"${FILESDIR}/${P}-cmake-behaim-marble-maps-kf6-conditional.patch"
+)
+
+src_prepare() {
+	ecm_src_prepare
+
+	rm -r src/3rdparty/zlib || die "Failed to remove bundled libs"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package aprs Perl)
+		$(cmake_use_find_package geolocation Qt6Positioning)
+		-DBUILD_WITH_DBUS=$(usex dbus)
+		-DWITH_DESIGNER_PLUGIN=$(usex designer)
+		-DWITH_libgps=$(usex gps)
+		$(cmake_use_find_package pbf Protobuf)
+		-DWITH_Phonon4Qt6=$(usex phonon)
+		-DWITH_libshp=$(usex shapefile)
+		$(cmake_use_find_package webengine Qt6WebEngineWidgets)
+		-DWITH_libwlocate=OFF
+		# bug 608890
+		-DKDE_INSTALL_CONFDIR="/etc/xdg"
+	)
+	# KF6KIO: src/thumbnailer/CMakeLists.txt
+	# KF6Runner: src/plasmarunner/CMakeLists.txt
+	for x in CoreAddons I18n Config Crash KIO Parts Runner; do
+		mycmakeargs+=( $(cmake_use_find_package kde KF6${x}) )
+	done
+	ecm_src_configure
+}
diff --git a/kde-apps/marble/marble-24.12.1-r1.ebuild b/kde-apps/marble/marble-24.12.1-r1.ebuild
new file mode 100644
index 000000000000..34419e4a3239
--- /dev/null
+++ b/kde-apps/marble/marble-24.12.1-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
+HOMEPAGE="https://marble.kde.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine"
+
+# bug 588320
+RESTRICT="test"
+
+# FIXME (new package): libwlocate, WLAN-based geolocation
+DEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus?,gui,network,sql,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	sys-libs/zlib
+	aprs? ( >=dev-qt/qtserialport-${QTMIN}:6 )
+	designer? ( >=dev-qt/qttools-${QTMIN}:6[designer] )
+	geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:6 )
+	gps? ( sci-geosciences/gpsd:= )
+	kde? (
+		>=kde-frameworks/kconfig-${KFMIN}:6
+		>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+		>=kde-frameworks/kcoreaddons-${KFMIN}:6
+		>=kde-frameworks/kcrash-${KFMIN}:6
+		>=kde-frameworks/ki18n-${KFMIN}:6
+		>=kde-frameworks/kio-${KFMIN}:6
+		>=kde-frameworks/kparts-${KFMIN}:6
+		>=kde-frameworks/krunner-${KFMIN}:6
+		webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[qml] )
+	)
+	pbf? ( dev-libs/protobuf:= )
+	phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] )
+	shapefile? ( sci-libs/shapelib:= )
+	webengine? (
+		>=dev-qt/qtwebchannel-${QTMIN}:6
+		>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	)
+"
+RDEPEND="${DEPEND}
+	kde? (
+		dev-libs/kirigami-addons:6
+		>=dev-qt/qt5compat-${QTMIN}:6[qml]
+		>=kde-frameworks/kirigami-${KFMIN}:6
+	)
+"
+BDEPEND="
+	>=dev-qt/qttools-${QTMIN}:6[linguist]
+	aprs? ( dev-lang/perl )
+"
+
+src_prepare() {
+	ecm_src_prepare
+
+	rm -r src/3rdparty/zlib || die "Failed to remove bundled libs"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package aprs Perl)
+		$(cmake_use_find_package geolocation Qt6Positioning)
+		-DBUILD_WITH_DBUS=$(usex dbus)
+		-DWITH_DESIGNER_PLUGIN=$(usex designer)
+		-DWITH_libgps=$(usex gps)
+		$(cmake_use_find_package pbf Protobuf)
+		-DWITH_Phonon4Qt6=$(usex phonon)
+		-DWITH_libshp=$(usex shapefile)
+		$(cmake_use_find_package webengine Qt6WebEngineWidgets)
+		-DWITH_libwlocate=OFF
+		# bug 608890
+		-DKDE_INSTALL_CONFDIR="/etc/xdg"
+	)
+	# KF6KIO: src/thumbnailer/CMakeLists.txt
+	# KF6Runner: src/plasmarunner/CMakeLists.txt
+	for x in CoreAddons I18n Config Crash KIO Parts Runner; do
+		mycmakeargs+=( $(cmake_use_find_package kde KF6${x}) )
+	done
+	ecm_src_configure
+}
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index 2d012227bb07..fee174ec40c9 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,2 +1,2 @@
 DIST mbox-importer-24.08.3.tar.xz 31860 BLAKE2B 392f2e01da1de3683557bd0d3dbe16186b5181f86a88608b4690564c7be081e99fd327d890e8864969a823a360494ec092db423181be241f823122a82489cbbe SHA512 be1a662a37151ff093c750fceb3e6dd032323946b53ad6c7dfb157235260073261b4a3b222102a061bc3b30ca451097815567ca197a94793a970e252d3081c9f
-DIST mbox-importer-24.12.0.tar.xz 31936 BLAKE2B 073069646081cc3bb084c5673d1a57761faf585183f215ed204bdb00dea93447aa8d54ce7a613076725b1ec61fb829ffde2ab9a66ad5cbd9fb35c890fb45a302 SHA512 b0239e814eafb444eac50b0ce942900773f98f335295faf28899910a437bcaa3be43a750a925088fa18c878ae018674d1b5f3e773c4983220484893d91f7ec26
+DIST mbox-importer-24.12.1.tar.xz 31940 BLAKE2B 6f5df25f66cc532ec96fe9db8c68abe846011c6edadfeb88f420d26a169682be8de5806d41dce1e0bd1afbeef9e15e10393630c8c768c62b29a65137897941cd SHA512 97d7f89d49bd8bfe54dd7f930c4ebde960e6342ea0e036efe8ba3c70944c4b542ab7ac69c9b280b74911f2df55d04879bef8799b5dae695d8d1e070767877abd
diff --git a/kde-apps/mbox-importer/mbox-importer-24.12.0-r1.ebuild b/kde-apps/mbox-importer/mbox-importer-24.12.0-r1.ebuild
deleted file mode 100644
index 7deb3694b236..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Import mbox email archives from various sources into Akonadi"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/mailcommon-${PVCUT}:6
-	>=kde-apps/mailimporter-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/mbox-importer/mbox-importer-24.12.1.ebuild b/kde-apps/mbox-importer/mbox-importer-24.12.1.ebuild
new file mode 100644
index 000000000000..88774bfa3f8a
--- /dev/null
+++ b/kde-apps/mbox-importer/mbox-importer-24.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Import mbox email archives from various sources into Akonadi"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/mailcommon-${PVCUT}:6
+	>=kde-apps/mailimporter-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 6be269a498ba..fddf9d3ba6e0 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,2 +1,2 @@
 DIST messagelib-24.08.3.tar.xz 7369236 BLAKE2B ed5f07c79404843fde5fe4f6c95c7ed031879836c5c327a2ed37870023baf85fd00a784711a50647b3b5dc59b590555683717c9f87abc65ee5f10783cbc940e7 SHA512 b45c6ec26118fe0ade5f839e524da28b7f9ec1397031054fcff558f27eb03c853b61d3fa77c0c3aa1b9c14db6dd81ce072f7713af68ab5e24549e9d467684ac9
-DIST messagelib-24.12.0.tar.xz 7418952 BLAKE2B 2c96632d8b15f7a4adc4a551913cc1460ffb5f45a117fa1210fa64c74e099a78a3ba4cb10e1d20416b8eb09f721f348239122a84f01c57c906f62ea59ac16c8d SHA512 b3c9fb1e3d9858e522f8ccb735d50ea2f0059a28522ba57aa5540ccd0c4040ff65f77187fb7453d4e5d1bbc781ad3690bd8b523e53ac6b7db6d89842afc0fd7d
+DIST messagelib-24.12.1.tar.xz 7461532 BLAKE2B e9bfc646fba458806b666f4314ee84bb007cf06c3dbfbab64016d948f6a1b6dfb14ca0499e31963bd5cac29390f1996acfe56343b1b3a038238d83c192896de6 SHA512 73f1078945c1783cfd710415b1af1f15510e19ba9e81076cf9ab153d81fea5c7e1a86bbd6c02ca14ce4f8a108a7a44a0206a0d36c7830402dc0045cd1a2d4a80
diff --git a/kde-apps/messagelib/messagelib-24.12.0-r1.ebuild b/kde-apps/messagelib/messagelib-24.12.0-r1.ebuild
deleted file mode 100644
index 7b96f1eb6da5..000000000000
--- a/kde-apps/messagelib/messagelib-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Libraries for messaging functions"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="speech"
-
-# bug 579630
-RESTRICT="test"
-
-DEPEND="
-	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
-	>=dev-libs/openssl-3.0.0:=
-	>=dev-libs/ktextaddons-1.5.4:6[speech?]
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/akonadi-search-${PVCUT}:6
-	>=kde-apps/grantleetheme-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kldap-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmbox-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/kpimtextedit-${PVCUT}:6[speech=]
-	>=kde-apps/libgravatar-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/libkleo-${PVCUT}:6
-	>=kde-apps/mimetreeparser-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktexttemplate-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/messagelib/messagelib-24.12.1.ebuild b/kde-apps/messagelib/messagelib-24.12.1.ebuild
new file mode 100644
index 000000000000..0e57e04c8383
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-24.12.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Libraries for messaging functions"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="speech"
+
+# bug 579630
+RESTRICT="test"
+
+DEPEND="
+	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
+	>=dev-libs/openssl-3.0.0:=
+	>=dev-libs/ktextaddons-1.5.4:6[speech?]
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/akonadi-search-${PVCUT}:6
+	>=kde-apps/grantleetheme-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmbox-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/kpimtextedit-${PVCUT}:6[speech=]
+	>=kde-apps/libgravatar-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/libkleo-${PVCUT}:6
+	>=kde-apps/mimetreeparser-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexttemplate-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package speech KF6TextEditTextToSpeech)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/mimetreeparser/Manifest b/kde-apps/mimetreeparser/Manifest
index 42209770d5e3..66857fc8e102 100644
--- a/kde-apps/mimetreeparser/Manifest
+++ b/kde-apps/mimetreeparser/Manifest
@@ -1,2 +1,2 @@
 DIST mimetreeparser-24.08.3.tar.xz 646032 BLAKE2B e3611b9cdf68f1cc51b43c5a1bcde101bd94a383500a9c488fb68ac1ea4737fa92278e1a0cb076bee938c02cdcf28a57d81c97040812ae4bde730858731fed1f SHA512 121b0d90de7407c9ae57c1640a4dc33cdd18a51ea6112c4ead7f182774b664952fa434b2921c3456e2d26b91d24a948b47d1a334f51b20fff0ff2a820242d35c
-DIST mimetreeparser-24.12.0.tar.xz 646928 BLAKE2B 55c9171adc9b8aafbfefa782f9246eeee5219f6fd289e550643ac94ad4e50063f01a4fb27e74996d88a0920b36eb92b4c66ea147a2d1b8d4445280dd9ce07b46 SHA512 741cd2dce17f34c157892891596c17f73b659ff21ace37c029848c918b569058e4c954e7cc4a358050bdf10642121de071da282777f45a1705c2ce00d18f165e
+DIST mimetreeparser-24.12.1.tar.xz 646836 BLAKE2B caec0bad37dbabd2335707f4c5bcdbf20a1f7176ec89133c3feed2903efad95bb628e81fe22ffb38c94a7ad51cb10b5fbc392e92c13adde60add9076a606d258 SHA512 34beefe5b8f43dc4632b881c0f216f395c1ff0965c24c27410b07b877ab22ea95a22003b32953fc5c9531003dea819271ed653b377458a5f671d6ebc44b60794
diff --git a/kde-apps/mimetreeparser/mimetreeparser-24.12.0-r1.ebuild b/kde-apps/mimetreeparser/mimetreeparser-24.12.0-r1.ebuild
deleted file mode 100644
index e195b9d6af0d..000000000000
--- a/kde-apps/mimetreeparser/mimetreeparser-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="pim"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Libraries for messaging functions"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test" # bug 926482, needs gpg-agent
-
-DEPEND="
-	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-apps/kmbox-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkleo-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/mimetreeparser/mimetreeparser-24.12.1.ebuild b/kde-apps/mimetreeparser/mimetreeparser-24.12.1.ebuild
new file mode 100644
index 000000000000..0a416e2043a9
--- /dev/null
+++ b/kde-apps/mimetreeparser/mimetreeparser-24.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="pim"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Libraries for messaging functions"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test" # bug 926482, needs gpg-agent
+
+DEPEND="
+	>=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-apps/kmbox-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkleo-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index 13ec0a6e5609..50dd6580b8e4 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,2 +1,3 @@
 DIST minuet-24.08.3.tar.xz 27696340 BLAKE2B 76284dfcc68080b4801877319b51c4415e07e9c6a5389b0b6dc80d42866b0af49143ebbff837dce62485ff73b393dbb9a68d9c532f9b7466bd735ccc4b75fe09 SHA512 661784b119e57ea86a2c84f4e976cc6ef37d4e7908aaba44a789d86d0289b4ab88f641e0ef577cca2f83648a125da4930320d9236ebf68b4e22ec55e3e79ad71
 DIST minuet-24.12.0.tar.xz 27695716 BLAKE2B 1ee10b9fbb8451d8951030aa9c7fd0cc895b2fe2c9ec6a87f4cf3709ae127f681dec4990a46d4d087835185eca2aa745a80a1727c090e8e3ab5d6c7d4fa1465a SHA512 892fab468974d191b8f8f73f80a71a3e7620dff8860580d4052661e613e33ccf6a29d6c39ea931abb99abbf22a9fd06a9508de44495169bf993c60e1f5243bef
+DIST minuet-24.12.1.tar.xz 27694896 BLAKE2B c79c25e0320ee79cedde99b58ce8a005e3b9036656ae54379e3e0a4a33a002f1d381d9a13f38b6410bed244013acdab40e3f70b2180e3b73512f1ab12f400a64 SHA512 49bec339deb64611922034f3169aea0bc5a4926932e897615c1682270395913b17861aee763bace2de54f674e50758cba74bad68608f04b6f79dc9da1572382c
diff --git a/kde-apps/minuet/minuet-24.12.0.ebuild b/kde-apps/minuet/minuet-24.12.0.ebuild
index b263b4e9e551..52dff31ba898 100644
--- a/kde-apps/minuet/minuet-24.12.0.ebuild
+++ b/kde-apps/minuet/minuet-24.12.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
@@ -13,7 +13,7 @@ HOMEPAGE="https://minuet.kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/minuet/minuet-24.12.1.ebuild b/kde-apps/minuet/minuet-24.12.1.ebuild
new file mode 100644
index 000000000000..48c4b34ae379
--- /dev/null
+++ b/kde-apps/minuet/minuet-24.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Music Education software by KDE"
+HOMEPAGE="https://minuet.kde.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	media-sound/fluidsynth:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 23c604d2305b..dd29d6486da4 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,2 +1,2 @@
 DIST okular-24.08.3.tar.xz 8050372 BLAKE2B bf2697ae7fdca75c5a1ee3ee1bb3f44b1f79bdf60356e9e966f519502c39f0fa1be952a5a9a4455a7547252b1bf4167a48467b217f5f9229bc33f8563d2d3d0e SHA512 5f8b2c1a0353180bad6a0c706a4ce4db2a5b897e91d4c0baa24daff17ba8e789d70b8be2e5d95eab2b5f104f87dd24065178a27106b22ff2f4f73c61e5d91872
-DIST okular-24.12.0.tar.xz 8056456 BLAKE2B 509534868a3326778cf533c1a88eeb703facf417ca1814273c320c7374f92b7d606b6ed2a8252c330c7c26cbfbb562b4fcdca125cfbcb3f9dba02be31c7fdc60 SHA512 9f1249ded76482444571038a0e9155e85fea81c2e3ee513ae3e8df74a09f8035e6f1eba182e281756868fdb6f3a56e042d5570d0d5f82cceb9b19b43c1f96b33
+DIST okular-24.12.1.tar.xz 8056680 BLAKE2B 3dc96385f293f9b55cd5856e72265a9594bac29b441c39de69e8f076c180eede1cf9b1fe6a4991baf5a9dc3faee0cda2424a4e29a6233ea54399a925d02d6e05 SHA512 2d23d000fd633553f754da79df06c9f82eea592bccd8e8a5276d6174f9afe61f9e2bbff1c39c158cbc555b31322436032ba77e990aecd49a860bad2f72fcb52b
diff --git a/kde-apps/okular/okular-24.12.0.ebuild b/kde-apps/okular/okular-24.12.0.ebuild
deleted file mode 100644
index 04e61792712b..000000000000
--- a/kde-apps/okular/okular-24.12.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Universal document viewer based on KDE Frameworks"
-HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="crypt djvu epub markdown mobi +pdf phonon +postscript qml share speech +tiff"
-
-# slot op: Uses Qt6::CorePrivate
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,X,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkexiv2-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kpty-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/threadweaver-${KFMIN}:6
-	kde-plasma/plasma-activities:6
-	media-libs/freetype
-	sys-libs/zlib
-	crypt? ( >=kde-frameworks/kwallet-${KFMIN}:6 )
-	djvu? ( app-text/djvu )
-	epub? ( app-text/ebook-tools )
-	markdown? ( >=app-text/discount-2.2.7-r1:= )
-	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:6 )
-	pdf? ( >=app-text/poppler-24.10.0[nss,qt6] )
-	phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] )
-	postscript? ( app-text/libspectre )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
-	tiff? ( media-libs/tiff:= )
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kimageformats-${KFMIN}:6
-	qml? ( >=kde-frameworks/kirigami-${KFMIN}:6 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # downstream; avoid same-name entry
-	"${FILESDIR}/${PN}-23.08.5-implicit-vasprintf.patch" # bug 922345; pending upstream
-	"${FILESDIR}/${PN}-24.11.80-tests.patch" # git master; bug 734138
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DFORCE_NOT_REQUIRED_DEPENDENCIES="KF6DocTools;KF6Wallet;DjVuLibre;EPub;Discount;QMobipocket6;Poppler;LibSpectre;KF6Purpose;Qt6TextToSpeech;TIFF;"
-		-DOKULAR_UI=$(usex qml "both" "desktop")
-		$(cmake_use_find_package crypt KF6Wallet)
-		$(cmake_use_find_package djvu DjVuLibre)
-		$(cmake_use_find_package epub EPub)
-		$(cmake_use_find_package markdown Discount)
-		$(cmake_use_find_package mobi QMobipocket6)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package phonon Phonon4Qt6)
-		$(cmake_use_find_package postscript LibSpectre)
-		$(cmake_use_find_package share KF6Purpose)
-		$(cmake_use_find_package speech Qt6TextToSpeech)
-		$(cmake_use_find_package tiff TIFF)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# mainshelltest hangs, bug #603116
-	# parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640
-	# signunsignedfieldtest fails, whatever. bug #852749
-	local myctestargs=(
-		-E "(mainshelltest|parttest|annotationtoolbartest|signunsignedfieldtest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/okular/okular-24.12.1.ebuild b/kde-apps/okular/okular-24.12.1.ebuild
new file mode 100644
index 000000000000..fad3e9692803
--- /dev/null
+++ b/kde-apps/okular/okular-24.12.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Universal document viewer based on KDE Frameworks"
+HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="crypt djvu epub markdown mobi +pdf phonon +postscript qml share speech +tiff"
+
+# slot op: Uses Qt6::CorePrivate
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,X,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkexiv2-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kpty-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/threadweaver-${KFMIN}:6
+	kde-plasma/plasma-activities:6
+	media-libs/freetype
+	sys-libs/zlib
+	crypt? ( >=kde-frameworks/kwallet-${KFMIN}:6 )
+	djvu? ( app-text/djvu )
+	epub? ( app-text/ebook-tools )
+	markdown? ( >=app-text/discount-2.2.7-r1:= )
+	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:6 )
+	pdf? ( >=app-text/poppler-24.10.0[nss,qt6] )
+	phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] )
+	postscript? ( app-text/libspectre )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
+	tiff? ( media-libs/tiff:= )
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kimageformats-${KFMIN}:6
+	qml? ( >=kde-frameworks/kirigami-${KFMIN}:6 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # downstream; avoid same-name entry
+	"${FILESDIR}/${PN}-23.08.5-implicit-vasprintf.patch" # bug 922345; pending upstream
+	"${FILESDIR}/${PN}-24.11.80-tests.patch" # git master; bug 734138
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DFORCE_NOT_REQUIRED_DEPENDENCIES="KF6DocTools;KF6Wallet;DjVuLibre;EPub;Discount;QMobipocket6;Poppler;LibSpectre;KF6Purpose;Qt6TextToSpeech;TIFF;"
+		-DOKULAR_UI=$(usex qml "both" "desktop")
+		$(cmake_use_find_package crypt KF6Wallet)
+		$(cmake_use_find_package djvu DjVuLibre)
+		$(cmake_use_find_package epub EPub)
+		$(cmake_use_find_package markdown Discount)
+		$(cmake_use_find_package mobi QMobipocket6)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package phonon Phonon4Qt6)
+		$(cmake_use_find_package postscript LibSpectre)
+		$(cmake_use_find_package share KF6Purpose)
+		$(cmake_use_find_package speech Qt6TextToSpeech)
+		$(cmake_use_find_package tiff TIFF)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# mainshelltest hangs, bug #603116
+	# parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640
+	# signunsignedfieldtest fails, whatever. bug #852749
+	local myctestargs=(
+		-E "(mainshelltest|parttest|annotationtoolbartest|signunsignedfieldtest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index 1a18bb3270c6..fecda99adedc 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,2 +1,2 @@
 DIST palapeli-24.08.3.tar.xz 2122832 BLAKE2B f9457043836542ca644e181324a9245d28f27e8a5e8f6c43699f4f96dad1e8015ef83aaedf6bba55ac4ac1b633d432a677ceb1bb9ae89173df0c8220e8844d8e SHA512 2e762343c4b0d5152f00bdb03ac4c4c330a2b0cacfd5f92cdb4fe88d429522cfa9d7e03f107495d090539e3a3cbe96ed4c373808056bf3689dc36cedcb97e602
-DIST palapeli-24.12.0.tar.xz 2122380 BLAKE2B dfa864fe1745cac699cefa02ddc43daed4c8388f1abcdf6e61c243fe91084f9c7700aca90bf6598a6e14d2d730abf40b5d6e1cda19e9d0bbd38c04a1f12841b4 SHA512 405e878b5063711a79680f9d3e3b5c0d67dcee79cbbafa6247e79b8a69a1e910e93ffd95f8c0b138303f2fbe713b7c7a7428f0b9cf90c025c73b4bfe555e66de
+DIST palapeli-24.12.1.tar.xz 2122468 BLAKE2B f26a7a71b334448adfc6450a35c5b2be24dc49804848171d3b345b77fe547f46f93095c74c0ee4707871bd0b4168ae67f7622920a08583fceb9dbd3becf536aa SHA512 cacb74146281178e5dffabc02fbd9b83f1b70c8955565f121e340dcc420ba1d81d1cdf27e55bdcb364349468a9ec8230f41d3ae438eef2c51adc6bb25d17d9c2
diff --git a/kde-apps/palapeli/palapeli-24.12.0.ebuild b/kde-apps/palapeli/palapeli-24.12.0.ebuild
deleted file mode 100644
index eeceb3c73ec2..000000000000
--- a/kde-apps/palapeli/palapeli-24.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Jigsaw puzzle game by KDE"
-HOMEPAGE="https://apps.kde.org/palapeli/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-apps/palapeli/palapeli-24.12.1.ebuild b/kde-apps/palapeli/palapeli-24.12.1.ebuild
new file mode 100644
index 000000000000..8f48e935bfde
--- /dev/null
+++ b/kde-apps/palapeli/palapeli-24.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Jigsaw puzzle game by KDE"
+HOMEPAGE="https://apps.kde.org/palapeli/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index 59e6b0af268a..c139562e07df 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,2 +1,2 @@
 DIST parley-24.08.3.tar.xz 8433820 BLAKE2B e54bdf23a25ad08fcac9f076f041254f42081d1c66d278b90bbe2c3b81552246b76f084d2355238374310199e613454ba94ed6bda2b4a99564d1f2075d50b3e0 SHA512 a97247a81aeab5a6f141a3cc433faf24035891e386908c9a6525837d0e33eda749360bbcd1f2f471d4ea197388d6f72ea5811949f5c1ec0ed6fa17ef122186f4
-DIST parley-24.12.0.tar.xz 8434548 BLAKE2B 818da5950cca3b30a6c7c9cafdc697c4851f8ca808517bb93c740d882124f1549f5a8be136c301f4c57c13ef95b4c6b1f8e7ce20ef53852e1b79ae82364d1cb6 SHA512 c397e8bf56a70c3a1e9d39f889cb569b44641aff237d7ea2ef2772a11ea5a334bc3efb4db6d8dd1268e32afb06f5b8d272364a62c5f51c4aa13c2a2d49e69de7
+DIST parley-24.12.1.tar.xz 8434660 BLAKE2B 231c14dfd00367abfc47122c2c1d32a88a2be09f307308694d0ecf2ad8a5831667dcf9d05b7811138f888aec76652bcba4f2e8956b59076a9de89fc018423bdd SHA512 76770c243fc616ee8505c953e9916a34d7c6b64978cccbb3a0bb5f04f2bcd9142b808d0bbcf91bac7d964b86636ef82224036dbaf87617dd855e61b75439b68d
diff --git a/kde-apps/parley/parley-24.12.0.ebuild b/kde-apps/parley/parley-24.12.0.ebuild
deleted file mode 100644
index 2521c80f03e5..000000000000
--- a/kde-apps/parley/parley-24.12.0.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
-
-ECM_HANDBOOK="forceoptional"
-ECM_HANDBOOK_DIR="docs"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org optfeature
-
-DESCRIPTION="Vocabulary trainer to help you memorize things"
-HOMEPAGE="https://apps.kde.org/parley/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="webengine"
-
-DEPEND="
-	app-i18n/translate-shell
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,widgets]
-	>=dev-qt/qtmultimedia-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkeduvocdocument-${PVCUT}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] )
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdeedu-data-${PVCUT}:*
-"
-
-src_prepare() {
-	ecm_src_prepare
-	cmake_comment_add_subdirectory plugins
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_BROWSERINTEGRATION=$(usex webengine)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	optfeature "online access to translations" app-i18n/translate-shell
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/parley/parley-24.12.1.ebuild b/kde-apps/parley/parley-24.12.1.ebuild
new file mode 100644
index 000000000000..2e375407c346
--- /dev/null
+++ b/kde-apps/parley/parley-24.12.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK_DIR="docs"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Vocabulary trainer to help you memorize things"
+HOMEPAGE="https://apps.kde.org/parley/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="webengine"
+
+DEPEND="
+	app-i18n/translate-shell
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,widgets]
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkeduvocdocument-${PVCUT}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] )
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kdeedu-data-${PVCUT}:*
+"
+
+src_prepare() {
+	ecm_src_prepare
+	cmake_comment_add_subdirectory plugins
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_BROWSERINTEGRATION=$(usex webengine)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	optfeature "online access to translations" app-i18n/translate-shell
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/picmi/Manifest b/kde-apps/picmi/Manifest
index 2276dacf97c7..7cf21eb40657 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,2 +1,2 @@
 DIST picmi-24.08.3.tar.xz 1519088 BLAKE2B 66fb50c65eb04f57446a178513c7ce94917010275042d5b2b39b787df97c95b26034fa8a20fb2e01f41a88d2a324b46fbf2e2af31841394b73703708dd889916 SHA512 af4e211067624ad00948e4e2e8b89bb316f6c6c0d4dae96fd8a0f7412526433bcade05296817429a5046c5f7be3beda3c6bfe12d103b5cffd938a0e5200ad48a
-DIST picmi-24.12.0.tar.xz 1519096 BLAKE2B bb005362d57dfc16fd01457de4a5f9609d72083b23595928029d59b175af9d57587d6e272ee52a11c0d3f7f1e792212122ce2d1357cfaf6f15fe6544a7db8c45 SHA512 14cff5aa0a22e2be915ef1c6224be5730e9c7228a479e4d7ae9951132d99b7ea8458137af578d70e2c5eeeb694a998ba374ca9401d5529b1aebc6fe169be44a2
+DIST picmi-24.12.1.tar.xz 1519008 BLAKE2B 501e4ff6604de46c087510ec0efa8e58f2441b8dcb87d0f80df48b87fd606575eccc690689e48433d6828fd7394a175dbc120bc88f235699a6ee76ee3c16fed5 SHA512 077a151b989dea806aae9cf3512582b46972471cbcda669a867ecfc441b7caf009e0ae195bd607590d903780a7b295c4044e38a7eb2e565ba102fbb3bf06cc22
diff --git a/kde-apps/picmi/picmi-24.12.0.ebuild b/kde-apps/picmi/picmi-24.12.0.ebuild
deleted file mode 100644
index a8871ae653d9..000000000000
--- a/kde-apps/picmi/picmi-24.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Nonogram logic game by KDE"
-HOMEPAGE="https://apps.kde.org/picmi/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/libkdegames-${PVCUT}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
-# TODO: || ( 7zip gzip )
-BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/picmi/picmi-24.12.1.ebuild b/kde-apps/picmi/picmi-24.12.1.ebuild
new file mode 100644
index 000000000000..93b82d898132
--- /dev/null
+++ b/kde-apps/picmi/picmi-24.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Nonogram logic game by KDE"
+HOMEPAGE="https://apps.kde.org/picmi/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/libkdegames-${PVCUT}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+# TODO: || ( 7zip gzip )
+BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index 97381c121a03..4e2e89fb2d22 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,2 +1,2 @@
 DIST pim-data-exporter-24.08.3.tar.xz 426472 BLAKE2B 8c032c2c4b6b76047a713b32a0da9d35d3012692ba55b7270bec5380f84c5f14c5d589367977e66c45896b80ddd89a0837db5b1b83dd2c286617b6f14aefe3d7 SHA512 4690af4ec9d758ccdeedcd51495c3ae96d2c9542b20fb031a79225ad75d40e30b29ae0ffcd9e14bf017144b7c493b0eeb2a90cc6a4500a2ae9fa4da69a3960c1
-DIST pim-data-exporter-24.12.0.tar.xz 421368 BLAKE2B 76c506687b9c8820e19ec31f2e9ff32e65159241efeca7081d78f425689504476db3fdef3cf1656ca82b0c1e30552e3fd55a78c17c5d51ee058bd8e30935a010 SHA512 835e9694dceb2d592bdc23e4c9e056b08c15eeeb63b91a334e33c985e79024291dadebba26db5ef5a17d607878faade16bf851c089e6e590db286be690046075
+DIST pim-data-exporter-24.12.1.tar.xz 421676 BLAKE2B 819c07d23e34785118047afa9344f0c9557c46a97ef0ea8cf5989bda9168e2ebda1fede40583a129477245f3013e9d0a4fab8964e976173ceb99514047bc9511 SHA512 f1471ada6318dc22b110e099dcff4955cb22eccac38425ca3255fe7b6b95a5d3be3e5c9470b1d13681a679367203e5d31d8ca9f52839d835a6877a138bd782c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-24.12.0-r1.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-24.12.0-r1.ebuild
deleted file mode 100644
index e9dec14f4cc0..000000000000
--- a/kde-apps/pim-data-exporter/pim-data-exporter-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Assistant to backup and archive PIM data and configuration"
-HOMEPAGE="https://apps.kde.org/pimdataexporter/
-https://userbase.kde.org/KMail/Backup_Options"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="telemetry"
-
-RESTRICT="test" # 11 out of 21 tests fail...
-
-DEPEND="
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/kidentitymanagement-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/mailcommon-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KF6UserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-24.12.1.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-24.12.1.ebuild
new file mode 100644
index 000000000000..1ea91a8ca2af
--- /dev/null
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-24.12.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Assistant to backup and archive PIM data and configuration"
+HOMEPAGE="https://apps.kde.org/pimdataexporter/
+https://userbase.kde.org/KMail/Backup_Options"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="telemetry"
+
+RESTRICT="test" # 11 out of 21 tests fail...
+
+DEPEND="
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/kidentitymanagement-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-apps/mailcommon-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index 2ee2145f097d..535ce39280f4 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,2 +1,2 @@
 DIST pim-sieve-editor-24.08.3.tar.xz 470068 BLAKE2B 841b0cacc8ebcaf0a54588ae6b4e82ef1fd385b781aa307f00fce680944deb1a4db2aca92b2d4b27504f97d1f337583fa8fd049726c37ef5fc98dc46bcfbdbbf SHA512 036dcd11de5057c6c2887ac7eaa925a370a9b35d6facba96e044ee82fb6428e596b528c006c1fe7e48bbb43acc922e3d9733a6260eef1a85d236405be989102b
-DIST pim-sieve-editor-24.12.0.tar.xz 470480 BLAKE2B 570d6e22e1867c9b356c46c4500860574248fffec21c06248f887dba99fa8a094e3c0f5f6de977a25893628d035c539a56f7403636baa27b78e8be9f6fa939b4 SHA512 7c1758af596d13b26edf495f9244ef62471c76811717540399cb7c473e8972c13ffa37e553901942912785ae16cdcb4f524f828f90e4d8b64e14fc847198c55b
+DIST pim-sieve-editor-24.12.1.tar.xz 470472 BLAKE2B 9873d5d3bcc9c62ac9aa8f1374c19ef2809bf4b610a5f0f92063c50486bcc74e31fa2fc83217c2bf57e1ab5ebf68004500525b23483c13b3503ae6973c34ff93 SHA512 93ff42145ecaad2a5977f26d8b97fa59c1c39c342a215dc2cc98cf8bc8fa047cc9f047fd6aea8bdd3cd1ed086bec11c845f566e75a0bb30fa8db199eebee34ad
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-24.12.0-r1.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-24.12.0-r1.ebuild
deleted file mode 100644
index 1bba17628264..000000000000
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Assistant for editing IMAP Sieve filters"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="telemetry"
-
-DEPEND="
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-mime-${PVCUT}:6
-	>=kde-apps/calendarsupport-${PVCUT}:6
-	>=kde-apps/kmailtransport-${PVCUT}:6
-	>=kde-apps/libksieve-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}:6
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KF6UserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-24.12.1.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-24.12.1.ebuild
new file mode 100644
index 000000000000..9d67ba41ea0a
--- /dev/null
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-24.12.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Assistant for editing IMAP Sieve filters"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="telemetry"
+
+DEPEND="
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-mime-${PVCUT}:6
+	>=kde-apps/calendarsupport-${PVCUT}:6
+	>=kde-apps/kmailtransport-${PVCUT}:6
+	>=kde-apps/libksieve-${PVCUT}:6
+	>=kde-apps/pimcommon-${PVCUT}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index 1e7df0597b20..17138e6758d0 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,2 +1,2 @@
 DIST pimcommon-24.08.3.tar.xz 351164 BLAKE2B 7cc03932a9cc67285de4e40baec693bb24b3323d6d780b69d8cc8f7152c49b010b3560f5fd2b2934f89144d888f5c12cf5150fcfd37dfa928cf339113ef23f7b SHA512 000aca6f02dca149ea5b2e10cf805a45f0e7855a6953f58b6bca63903add877715625c484d6d00deed8eb41589fce05e5c2b55d05e460d5f9a18fd619a970d2c
-DIST pimcommon-24.12.0.tar.xz 365608 BLAKE2B 7a5e69b06b583b591855ce22ded334205d71a32937ed7d8e31d353fa767ddea5b8cbe5383a7661f84be0e17c932c0b28e94d813712c06600b24354eab9c3e254 SHA512 dc60d3fd36c13c0046414dec0663c96e706e234f8c349621664b8d64410f1212503a0f9647d71e90cf81d80ce10653999dfe381487bfc1ccc2107ac538717cf5
+DIST pimcommon-24.12.1.tar.xz 365608 BLAKE2B a4ca1e395e565c00c98f2c6eb80a6e9848a8764749e493a380fd528385afa011a8afdc463ba08e528f3cb5c27fdc47f1d6c92fbb0fe2aa31b84ef46102ea774e SHA512 4146958e92427cb4f27a229fa22ca40cde164ee7a8c3c0b6880f1979878fa683e946c2dc52e0309ebf707cc552624d8b4f9cd94cbf5c5abb9c26f23f910f0d03
diff --git a/kde-apps/pimcommon/pimcommon-24.12.0-r1.ebuild b/kde-apps/pimcommon/pimcommon-24.12.0-r1.ebuild
deleted file mode 100644
index 189b36cc82be..000000000000
--- a/kde-apps/pimcommon/pimcommon-24.12.0-r1.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
-
-ECM_DESIGNERPLUGIN="true"
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="activities"
-
-RDEPEND="
-	>=dev-libs/ktextaddons-1.5.4:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/akonadi-search-${PVCUT}:6
-	>=kde-apps/kimap-${PVCUT}:6
-	>=kde-apps/kldap-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/purpose-${KFMIN}:6
-	activities? ( kde-plasma/plasma-activities:6 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bugs 641730, 661330
-	local myctestargs=(
-		-E "(autocorrectiontest|pimcommon-translator-translatorwidgettest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/pimcommon/pimcommon-24.12.1.ebuild b/kde-apps/pimcommon/pimcommon-24.12.1.ebuild
new file mode 100644
index 000000000000..77dc2953d33c
--- /dev/null
+++ b/kde-apps/pimcommon/pimcommon-24.12.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Common PIM libraries"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="activities"
+
+RDEPEND="
+	>=dev-libs/ktextaddons-1.5.4:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/akonadi-search-${PVCUT}:6
+	>=kde-apps/kimap-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	>=kde-apps/libkdepim-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/purpose-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6 )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPTION_USE_PLASMA_ACTIVITIES=$(usex activities)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bugs 641730, 661330
+	local myctestargs=(
+		-E "(autocorrectiontest|pimcommon-translator-translatorwidgettest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index b82ef865253a..2f53f0407fd3 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,2 +1,2 @@
 DIST poxml-24.08.3.tar.xz 45212 BLAKE2B 31afd069987d0c5a5a3317a1015dd9f184b2c073dc0b9a5b90dd918e90c5d7c267d232e468c453ee6736f36d387c34acdb8ef998dfd8838c05f14a23203cb9d8 SHA512 b87832a291a8282f557837e5bf2042be6bdff6c8fceb314cf64082008aa344d7ff47925e24b79e6a574aeaedb7ab0757dcbcf87cf44611b9904da05bdaa05a16
-DIST poxml-24.12.0.tar.xz 45188 BLAKE2B 904256d6cda1439cd909d2a0365f9e95fbc1103b11624a28aca3b813dae7670fa69f66614a48d7a0c14681e3701cf3a380d88cd9ddbd1542bb84342805f59245 SHA512 3d86d3a812c48ffcbebf9542ed5a71e9a57c6910a0ca1e3a43b320d5cd3993f015eafc3cf9f452d3d2a2d0b85323cf7c5ce16353cabf5e12266f8ecdf6b59b28
+DIST poxml-24.12.1.tar.xz 45200 BLAKE2B d16e23bd30e55e5568c541bbbf24038d98cd9552a66366f2b07a30a420bc58a6dea54eaec6a679beb87897c85c50e12c87ffbd05a1c8709cd21030b1d11a12e6 SHA512 d70b25ec5ec08e0076d7de1770ed5315d0dc0c7427cd3462dd35214fce74ec4b5e9f45ed376b6f1906cac36646251023bb6d79c5663f049183202aa68ad88eaa
diff --git a/kde-apps/poxml/poxml-24.12.0.ebuild b/kde-apps/poxml/poxml-24.12.0.ebuild
deleted file mode 100644
index 84b513673108..000000000000
--- a/kde-apps/poxml/poxml-24.12.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[xml]
-	sys-devel/gettext
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/poxml/poxml-24.12.1.ebuild b/kde-apps/poxml/poxml-24.12.1.ebuild
new file mode 100644
index 000000000000..70342ea2efd2
--- /dev/null
+++ b/kde-apps/poxml/poxml-24.12.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[xml]
+	sys-devel/gettext
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index b7d7ec7b854e..02141613a3f8 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,2 +1,2 @@
 DIST rocs-24.08.3.tar.xz 1566592 BLAKE2B f03401b78e228a3921598969c50908b19481711bc21129a498ca17e9ba0cad0b0c051267ca1b71598338d8807b9b776421c6910de3327a5ba94c7af194554df6 SHA512 e356c1a009dbc3eb0ed196d91acd90d210ebdfefc1c8c2c96e84105890a5fe2d6d21a0e97598dd542fe7af69dc24947c06622d30451449ff5e2df212e885b8e3
-DIST rocs-24.12.0.tar.xz 1567436 BLAKE2B f4fdc926151e92a02d556ab8ec89b26c5cd6b094f225933e23210a6b3f7d0a716ab7221721131cefee1df4f0b6aa5b20bd2d65442203b263866513c03e9d0a72 SHA512 5a216fbec0fa51ef8a96610a0f6af35b3be10b6b23d7cde1352f64b229b5eaa6de159926977f2ba1e2bf5e51db6f026c73a8081a03218b6096374dd6296bda00
+DIST rocs-24.12.1.tar.xz 1565592 BLAKE2B c231664e4d7301fb94edf01185922a3a7ab20c27bee6cf8a6128a390b83dec60e8467de375fa0aadb4b19920c32e2ca17e6bf70871ef11a6d85f67f69216bc22 SHA512 fb36b041bf1837e6609e84b3f3518ec0ef98fb63552fbbf12933d3847bb63192619392e58f42d8449517251001b4044870e388a40d8c8642abd129e7fa5f4e89
diff --git a/kde-apps/rocs/rocs-24.12.0.ebuild b/kde-apps/rocs/rocs-24.12.0.ebuild
deleted file mode 100644
index fffe26049964..000000000000
--- a/kde-apps/rocs/rocs-24.12.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="Interface to work with Graph Theory"
-HOMEPAGE="https://apps.kde.org/rocs/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-libs/grantlee:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.49
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-"
diff --git a/kde-apps/rocs/rocs-24.12.1.ebuild b/kde-apps/rocs/rocs-24.12.1.ebuild
new file mode 100644
index 000000000000..df190c3cdcea
--- /dev/null
+++ b/kde-apps/rocs/rocs-24.12.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="Interface to work with Graph Theory"
+HOMEPAGE="https://apps.kde.org/rocs/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-libs/grantlee:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.49
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+"
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index 528f455a6bcf..4f13e24a565f 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,2 +1,2 @@
 DIST signon-kwallet-extension-24.08.3.tar.xz 11296 BLAKE2B cae327e75ac85d4b1ed5a4eeb5643c2b6a32919aa969a537906183bb2785f2e2b01ab037182f90ec7b2c6d085b09d17c60f88bb3c9b51e07101bb7f2e72667bb SHA512 e01d8fdac86114faa2799084fc32dc6c8d919dd86d6b8d53ad70753a8f085ffd6e15f0f30e1c8e22436b08bf2ba38638495f339206842f5b3151d139214221a1
-DIST signon-kwallet-extension-24.12.0.tar.xz 11296 BLAKE2B 2e9caf1127bd15da5b27aea486fa7ccad00e26615de6c895c064c9f732b02bac00ce62062276281b13752695a0ac4c388ab31852282c35d83688045d75475495 SHA512 2d55f87b015a8f1c924c3e0841792f69893662653b85b63a538b29826bac350dd9c1ab504ce9078b6a1837abc00daa50aa5fa32785149d7714efa78dae83b0e8
+DIST signon-kwallet-extension-24.12.1.tar.xz 11296 BLAKE2B 6f3958e1d743dbcc95a3aeac8b4dd8bbf8b489417df92315362695216979b91ad71a9e03816ab6114d0d76676a3492c1858c20eee969ba55dff0a9c44fcfac8c SHA512 bf698c629bb7aa50501a45fe01a785b7d3ed4dc595660824ff5cb5ebd5ffd37dd1c92e86290dda5816c4640862c21c3b5183612681a213d211d4686a00ad28cf
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-24.12.0.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-24.12.0.ebuild
deleted file mode 100644
index 603239249591..000000000000
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-24.12.0.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
-
-KFMIN=6.5.0
-inherit ecm gear.kde.org
-
-DESCRIPTION="KWallet extension for signond"
-HOMEPAGE="https://accounts-sso.gitlab.io/"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-
-DEPEND="
-	>=kde-frameworks/kwallet-${KFMIN}:6
-	>=net-libs/signond-8.61-r100[qt6(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-24.12.1.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-24.12.1.ebuild
new file mode 100644
index 000000000000..0c32509adc4a
--- /dev/null
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-24.12.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+inherit ecm gear.kde.org
+
+DESCRIPTION="KWallet extension for signond"
+HOMEPAGE="https://accounts-sso.gitlab.io/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+
+DEPEND="
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=net-libs/signond-8.61-r100[qt6(+)]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index 24c578dc3d87..5da2e6ef47d0 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,2 +1,2 @@
 DIST spectacle-24.08.3.tar.xz 1555616 BLAKE2B a4ee6b274fe86888858876e7cde76816b80441b77a5f83f6ce650a5518df12febae5cfecc21f578d84bd766527ad3f1186fb94036827e4252c185d4529ae7664 SHA512 0f1a3672616f40e92788b676b8ce8a26c52824582cb117cb948030773efaf5405532418cf55095fe6a48dd3a8bbe54cf3eb93a5e5ee685c8c4d7f205cf2bc3e0
-DIST spectacle-24.12.0.tar.xz 1561540 BLAKE2B 7387844e1b875b3f8505c43249a3d75e6f289d9fe29a67e3d58547f689e59ab944ba065ab561942b7d4ffe263ed3ad65b6bfe7c55be6bfae57cc031944017696 SHA512 dec74d829ce283bba58d17202166daea534fd30f377539ceeea4ac200406d1ae017ffd0d55c2069276f3b27ddade7e4ac6769e0e95d1170b0b27b97ff26953a6
+DIST spectacle-24.12.1.tar.xz 1562108 BLAKE2B 2e54b1387051ceaddc97b1dd2e25c3cb188599382222f778fa025ea1b8306a525dbacbd4f86879fcd781ff522da27293ae3e1ecb3d6f2dd135263ba94ae81ce2 SHA512 bf57074631df3c24c67c126dfbbf07b47c6739c6ab211ff95eea6bb0c9c78a423c250e7b41f783702db64d89a9cda9cf409f511791d16af1b69908515e2e1666
diff --git a/kde-apps/spectacle/spectacle-24.12.0.ebuild b/kde-apps/spectacle/spectacle-24.12.0.ebuild
deleted file mode 100644
index a5a521e10d47..000000000000
--- a/kde-apps/spectacle/spectacle-24.12.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Screenshot capture utility"
-HOMEPAGE="https://apps.kde.org/spectacle/"
-
-LICENSE="LGPL-2+ handbook? ( FDL-1.3 )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="share"
-
-# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
-COMMON_DEPEND="
-	dev-libs/wayland
-	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,widgets,X]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtimageformats-${QTMIN}:6
-	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
-	>=dev-qt/qtwayland-${QTMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kglobalaccel-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/prison-${KFMIN}:6
-	kde-plasma/kpipewire:6
-	kde-plasma/layer-shell-qt:6
-	media-libs/opencv:=
-	x11-libs/libxcb
-	x11-libs/libXrandr
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.11.1
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtsvg-${QTMIN}:6
-"
-BDEPEND="
-	>=dev-qt/qtwayland-${QTMIN}:6
-	dev-util/wayland-scanner
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package share KF6Purpose)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/spectacle/spectacle-24.12.1.ebuild b/kde-apps/spectacle/spectacle-24.12.1.ebuild
new file mode 100644
index 000000000000..729d99a51735
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-24.12.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Screenshot capture utility"
+HOMEPAGE="https://apps.kde.org/spectacle/"
+
+LICENSE="LGPL-2+ handbook? ( FDL-1.3 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="share"
+
+# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
+COMMON_DEPEND="
+	dev-libs/wayland
+	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,widgets,X]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtimageformats-${QTMIN}:6
+	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/prison-${KFMIN}:6
+	kde-plasma/kpipewire:6
+	kde-plasma/layer-shell-qt:6
+	media-libs/opencv:=
+	x11-libs/libxcb
+	x11-libs/libXrandr
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.11.1
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtsvg-${QTMIN}:6
+"
+BDEPEND="
+	>=dev-qt/qtwayland-${QTMIN}:6
+	dev-util/wayland-scanner
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package share KF6Purpose)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index f31df4b34c77..02b1d5702fb4 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,2 +1,3 @@
 DIST step-24.08.3.tar.xz 987736 BLAKE2B 8479d670d1bbcea91682ed41f7bf7079032e42989c6a60b1c641169fbab5b61a21fed35d413a792a1b517b5b48e6ae1e81dedca9a7de7e033807d289b86f5d23 SHA512 59aaa5cfc0c1d1237f75b44e8ac1ef310422df2a1c282c896d56f443e6131d91fea3859c9ebdf71b796c6429365e700e27bc797bdbed7817648bfbf158df773d
 DIST step-24.12.0.tar.xz 988548 BLAKE2B f6fcf280ec41fb54aa6167990b649029c46617289a23125833d82d194df0cb352fd141746c60ded16209ca48428cefbf03d49c97da13493884dcb89752524cad SHA512 5d7209b197082b6bb721a8a392e47ed9ed65ec57525956139432a2da472e3802df1b27b60b4a78226b34f2e494270b675529bef510ca4140ed2f0145ee974ca0
+DIST step-24.12.1.tar.xz 987780 BLAKE2B ce6d25414008a8f244279960ecd6179738fe76a0865c92ad40cca9399e2ee9ba2a3aeef1b723e4033a55889983ba5b94e39971bdd29c3faf8827e02f7b32776a SHA512 75016486a460afd3201ffe41bc1ce803c175df01c92373a451283fe5cc738978c7a7a742a8b1f67e6d3408c1dc6b9203f7a11743091a56eee5ac6d888f89d65d
diff --git a/kde-apps/step/step-24.12.0-r1.ebuild b/kde-apps/step/step-24.12.0-r1.ebuild
index 4f5d5ebb9bbb..51174f10192e 100644
--- a/kde-apps/step/step-24.12.0-r1.ebuild
+++ b/kde-apps/step/step-24.12.0-r1.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 @@ HOMEPAGE="https://apps.kde.org/step/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 IUSE="+gsl +qalculate"
 
 DEPEND="
diff --git a/kde-apps/step/step-24.12.1.ebuild b/kde-apps/step/step-24.12.1.ebuild
new file mode 100644
index 000000000000..bdc5dc0fc36b
--- /dev/null
+++ b/kde-apps/step/step-24.12.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Interactive physics simulator"
+HOMEPAGE="https://apps.kde.org/step/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+gsl +qalculate"
+
+DEPEND="
+	>=dev-cpp/eigen-3.2:3
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kplotting-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	sci-libs/cln
+	gsl? ( sci-libs/gsl:= )
+	qalculate? ( >=sci-libs/libqalculate-0.9.5:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package gsl GSL)
+		$(cmake_use_find_package qalculate Qalculate)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index 41bc2b4cda59..6be4ae566b20 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,2 +1,2 @@
 DIST svgpart-24.08.3.tar.xz 30292 BLAKE2B 269e3aca4e87449595241f3b9308278f5a1a1d8617d061783513bdf70a9857ab7f1b990ad68a156254e29119c345b319118e0ec24d43eb023912a1857a44dde1 SHA512 ed45c7f03d61520d2f70f71534916aa3b36fed2f30b51ca497ab5d2e63c5323090dbf043926f672a52cf3958cf628e003c5be5b2a17b5657f1113e96cff984ff
-DIST svgpart-24.12.0.tar.xz 30212 BLAKE2B a763bfeca42ca7cb8fee65c9ff3d957abdc69158000141a1aabaa0ab33ee2438e9fd0ad029efcfb522767d356d231fd1799dacbb94494ee38a247653e4befc9e SHA512 4661dd942c823703c6a5f5ba4165014f1d7cd4e55f24ef08b575b67b9261d5825fd6981617262a8fbd3d41b1f0cd039c88a969829c33a474dcf2c2660ee468df
+DIST svgpart-24.12.1.tar.xz 30204 BLAKE2B 263e9fdfb3fcb46ee6809543f4664213b93d7b5ff56f3d45cbe16744f85c45d3a933d86149161ffe42a98f32d363f8f1f0cdf4e8a145cba340cdca87fb219ffa SHA512 acc0f43f5ebaa603ee83c2a8760a1030f5e7495f65f0b49889d39ef47f986437167688fb987d0615e4da12d688d3e0974eec24adffe64d60d1ba4eed137de41a
diff --git a/kde-apps/svgpart/svgpart-24.12.0.ebuild b/kde-apps/svgpart/svgpart-24.12.0.ebuild
deleted file mode 100644
index d01149414c71..000000000000
--- a/kde-apps/svgpart/svgpart-24.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Kpart for viewing SVGs"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/svgpart/svgpart-24.12.1.ebuild b/kde-apps/svgpart/svgpart-24.12.1.ebuild
new file mode 100644
index 000000000000..33a985a7fea5
--- /dev/null
+++ b/kde-apps/svgpart/svgpart-24.12.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Kpart for viewing SVGs"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index 3757acd3390b..a8db22bf5092 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,2 +1,2 @@
 DIST sweeper-24.08.3.tar.xz 383096 BLAKE2B ce978d0af87ec8bd268feec0218fe889d247ba68476bda97d35322d4a8565baea08c92b8c30e7709bdc3d9122b386f874105564e8d9cbb4c49bf475c863c2e4c SHA512 1f486dc230f438b57a5f14c191be2698253ce540d8c63d5043a5fe8f3a580c2521ff6326bb46e4acce3499c4bf09fece35a9f5a9260b19b1882c7cd2846d2534
-DIST sweeper-24.12.0.tar.xz 384460 BLAKE2B dcca02294fb6b752b533c8351b6d13fb0f67715eef426f4a50a1f8fa8cd09d6467167b6f14c7d75c16631439b115eade4bfa68acb4a4bb88b0a42cb88330893d SHA512 580f580181ee71de7b79d434fcaea3d271300cfdc24b8891fea50ef54a672832d9e9437dbe389da94c619f60202c9f354a8d530bcd7c422e1af59359d86abcfa
+DIST sweeper-24.12.1.tar.xz 384484 BLAKE2B 4f411cb4bac3d04d9568949d31121389e0bb2381a257c3757358a1e68ef587437d2a7f129b6b93b92632e62e17b65aee090948321d0b81a27433e6cab9888ab0 SHA512 bc12d86b553fb1a13daff9d4837f3f6b30a304c33b0d6fb2adeb2c025cf8bf56a3502a9c94b6a7155dc290d7c42d7766e66e9dbe81cbe1635dca48aba2687990
diff --git a/kde-apps/sweeper/sweeper-24.12.0.ebuild b/kde-apps/sweeper/sweeper-24.12.0.ebuild
deleted file mode 100644
index e9e264d4a043..000000000000
--- a/kde-apps/sweeper/sweeper-24.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Privacy settings widget to clean unwanted traces on the system"
-HOMEPAGE="https://apps.kde.org/sweeper/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	kde-plasma/plasma-activities-stats:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/sweeper/sweeper-24.12.1.ebuild b/kde-apps/sweeper/sweeper-24.12.1.ebuild
new file mode 100644
index 000000000000..d8930faad323
--- /dev/null
+++ b/kde-apps/sweeper/sweeper-24.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Privacy settings widget to clean unwanted traces on the system"
+HOMEPAGE="https://apps.kde.org/sweeper/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	kde-plasma/plasma-activities-stats:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/thumbnailers/thumbnailers-24.12.0.ebuild b/kde-apps/thumbnailers/thumbnailers-24.12.0.ebuild
deleted file mode 100644
index e2b2f769fc3b..000000000000
--- a/kde-apps/thumbnailers/thumbnailers-24.12.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Metapackage for KIO thumbnail generators"
-HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
-
-LICENSE="metapackage"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="blender gettext mobi pdf raw video"
-
-RDEPEND="
-	blender? ( >=media-gfx/kio-blender-thumbnailer-${PV}:6 )
-	gettext? ( >=kde-apps/kdesdk-thumbnailers-${PV}:6 )
-	mobi? ( >=media-gfx/kio-mobi-thumbnailer-${PV}:6 )
-	pdf? ( >=media-gfx/kio-ps-thumbnailer-${PV}:6 )
-	raw? ( >=media-gfx/kio-raw-thumbnailer-${PV}:6 )
-	video? ( >=kde-apps/ffmpegthumbs-${PV}:6 )
-"
diff --git a/kde-apps/thumbnailers/thumbnailers-24.12.1.ebuild b/kde-apps/thumbnailers/thumbnailers-24.12.1.ebuild
new file mode 100644
index 000000000000..512dac40292c
--- /dev/null
+++ b/kde-apps/thumbnailers/thumbnailers-24.12.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Metapackage for KIO thumbnail generators"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="metapackage"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="blender gettext mobi pdf raw video"
+
+RDEPEND="
+	blender? ( >=media-gfx/kio-blender-thumbnailer-${PV}:6 )
+	gettext? ( >=kde-apps/kdesdk-thumbnailers-${PV}:6 )
+	mobi? ( >=media-gfx/kio-mobi-thumbnailer-${PV}:6 )
+	pdf? ( >=media-gfx/kio-ps-thumbnailer-${PV}:6 )
+	raw? ( >=media-gfx/kio-raw-thumbnailer-${PV}:6 )
+	video? ( >=kde-apps/ffmpegthumbs-${PV}:6 )
+"
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 17295e39b985..ab320797c1a2 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,2 +1,2 @@
 DIST umbrello-24.08.3.tar.xz 5609628 BLAKE2B e5a0feac3e136a43dd2ab7101dc9fe428e9856dc670dcd5fb399fcf949b2a1cf27c002043f739f3027bc73488cda387e0adf0048b038d61012530cd94e90a3fb SHA512 ed9c984f23257df74bf84be1d87dea4b2d22779061d6d371165bc6ab4c3309a6b233a7cd02101947fd4bfde043e3aceede8d2e2e52ecb8da7276f6a43a1d81bb
-DIST umbrello-24.12.0.tar.xz 5617524 BLAKE2B 664d40b4ea717e03f7c6b9a69d6d153117f8228fc562974619328dc398d187a9973ac88d023f39a24af7891ca867c293e3bf4cc97efc4878cba3f4cd75f5d136 SHA512 1dec0f3cd4b23099039b478393c9226c536592674e9a5596f890d1e5d7ab60c303179a074a43d9fea07c70525a1bc7ebefd1ace0b286956a20b339c84ab82294
+DIST umbrello-24.12.1.tar.xz 5617328 BLAKE2B a7bcd180f68eea2f9fa8e6d46a8e21a84099db027b6687659942f2df95a6f2c7a10515a4e9eec7cf0e6144af9e0af65393e9e15caff7a4b8b199920f760002d0 SHA512 b1402d74654388ff7bea8a62f571bbdf970cb34b3f5262a402f05f657eff0b2145d23257261cef5194fc72e9d29c8b6f41e0320e605d06b1f1719fa165223f21
diff --git a/kde-apps/umbrello/umbrello-24.12.0.ebuild b/kde-apps/umbrello/umbrello-24.12.0.ebuild
deleted file mode 100644
index b5b576811142..000000000000
--- a/kde-apps/umbrello/umbrello-24.12.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_QTHELP="false" # TODO: figure out install error
-ECM_TEST="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="https://apps.kde.org/umbrello/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# TODO: Re-enable when ported to KF6
-# IUSE="php"
-# 	php? (
-# 		dev-util/kdevelop:5=
-# 		dev-util/kdevelop-pg-qt:5
-# 		dev-util/kdevelop-php:5
-# 	)
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-24.11.80-gentoo-docbundledir.patch # fix hardcoded path
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP
-		-DBUILD_APIDOC=OFF
-		-DBUILD_PHP_IMPORT=OFF # $(usex php)
-	)
-	use test && mycmakeargs+=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Clang=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_CLANG=ON
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/umbrello/umbrello-24.12.1.ebuild b/kde-apps/umbrello/umbrello-24.12.1.ebuild
new file mode 100644
index 000000000000..6b979d0a9bb8
--- /dev/null
+++ b/kde-apps/umbrello/umbrello-24.12.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_QTHELP="false" # TODO: figure out install error
+ECM_TEST="forceoptional"
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE UML Modeller"
+HOMEPAGE="https://apps.kde.org/umbrello/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# TODO: Re-enable when ported to KF6
+# IUSE="php"
+# 	php? (
+# 		dev-util/kdevelop:5=
+# 		dev-util/kdevelop-pg-qt:5
+# 		dev-util/kdevelop-php:5
+# 	)
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-24.11.80-gentoo-docbundledir.patch # fix hardcoded path
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP
+		-DBUILD_APIDOC=OFF
+		-DBUILD_PHP_IMPORT=OFF # $(usex php)
+	)
+	use test && mycmakeargs+=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Clang=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_CLANG=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index 935e3ac814f5..795c9249a098 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,2 +1,2 @@
 DIST yakuake-24.08.3.tar.xz 389980 BLAKE2B c665ac6db9d6c6bbaed08c2c5018bcda16af1740e68b5aca0b396908b494d3b0170bd0f509864eca94ba6fa4479e2af9c2e5ce5f0f3f4bed147e926d7c0d3487 SHA512 2c160641fd9471ec4e1088eb34fcfefbfc5e7875494000b0f6bedb1264073af04abf2f0340cfd4ba2d361bb3403b7a5aea36936cacc02d64f6363b2e81449aea
-DIST yakuake-24.12.0.tar.xz 390128 BLAKE2B 51d1ebf1f263bfd600b6a681f9caa9dc509c09d0f896b43d79fd61d11d7ed7963c07b158e764a3b8944ba6281425ba22ea16babaa1f3485f1207810ce83964b4 SHA512 a35c1d8e1b4d331ee5bb5aae0c7986cd060673b92a2d6360a80b09926f68ef25a91a484abf9464ddd83b2736cd74c5a8feed6c0ad86444ba13502e9ce00e081f
+DIST yakuake-24.12.1.tar.xz 392464 BLAKE2B c124ea261133167f57d57629ed3b77d06ba469f58339aba7bc5a61599e08074cc4e35cb4810b317730386bbb76a5c47c97b34980b2f403f05f1791f892a974c1 SHA512 766db7f9e839c09016ba71ae56815496e4002a58e667b97a75174981e240143df576f4be129d550b6185dbe8bcb25f24d9ab16cac83e87672ddde1281be97c6b
diff --git a/kde-apps/yakuake/yakuake-24.12.0.ebuild b/kde-apps/yakuake/yakuake-24.12.0.ebuild
deleted file mode 100644
index 63ae49fac7ee..000000000000
--- a/kde-apps/yakuake/yakuake-24.12.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Quake-style terminal emulator based on konsole"
-HOMEPAGE="https://apps.kde.org/yakuake/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="absolute-position"
-
-# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
-# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
-RDEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-apps/konsole-${PVCUT}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kglobalaccel-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	x11-libs/libX11
-	absolute-position? ( kde-plasma/kwayland:6 )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-
-src_configure() {
-	# TODO: start to use WITH_X11 option? but there's still the
-	# KX11Extras use...
-	local mycmakeargs=(
-		$(cmake_use_find_package absolute-position KWayland)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/yakuake/yakuake-24.12.1.ebuild b/kde-apps/yakuake/yakuake-24.12.1.ebuild
new file mode 100644
index 000000000000..57fc086cd26e
--- /dev/null
+++ b/kde-apps/yakuake/yakuake-24.12.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Quake-style terminal emulator based on konsole"
+HOMEPAGE="https://apps.kde.org/yakuake/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="absolute-position"
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-apps/konsole-${PVCUT}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	x11-libs/libX11
+	absolute-position? ( kde-plasma/kwayland:6 )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+
+src_configure() {
+	# TODO: start to use WITH_X11 option? but there's still the
+	# KX11Extras use...
+	local mycmakeargs=(
+		$(cmake_use_find_package absolute-position KWayland)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index cf7baa574128..1b5de5a6771d 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,3 +1,4 @@
 DIST attica-5.116.0.tar.xz 69496 BLAKE2B 35fc798b71eb77a33e9f1c7b5a03866d47a970b268e56e6466dcceb61f676d775d6b4d1bacd2fa807005b6b6c9659aaa1065d2e31154b2cadf0431f1781ddb33 SHA512 79a2378d7c8019d16692c7286e079cd29155e5f17256f189aa31e47a6b81e9b7f6ad0d5412388065b309bdc71b4efb72ebb043d587fc41d8ef2a918571c64306
+DIST attica-6.10.0.tar.xz 68596 BLAKE2B aa7dbe30933c66ec9c253b1e53d87a9d1dd24cb61400f5d2fa2f6201acb87505cccc30795b952fb4c4a05c01fa99d086b9ea3dd9740277eb046bc6a08a1827f8 SHA512 b58bc1b81cd75fdce795e4406788712ca546a5e11c11482485d9a02c8db9e55d34ad158459c347f2d5acd8e3c6a58ceffa1bad85fde02d9e6c0106af2947ec05
 DIST attica-6.7.0.tar.xz 68596 BLAKE2B 636a0370986543ba96509fff8ff9f9aabe19097b877562ce3011e377f89f4c3d8959924f33acefd5c44327cf853c5d2ef52bf951b1cb913d2968b045f0e60615 SHA512 acf5eb0db3aa781fe29e51920b81a480844386c541bd7700aeebde63394a1c83eeed5aed970db0afef13dd57878faca8b5c33cd7b41f30abd8c4b86f5ee56a72
 DIST attica-6.9.0.tar.xz 68588 BLAKE2B 00af228e57a3d2adbee336a99cc99f08048fc40e21a8e38576f7ab6fa597aeea2cee80fd6a8af1066e58453191229c4228e8642de3bff55a4f04cb74462a0cf8 SHA512 1c7c9f667cc8b615db09b06e560782bcd837cc316226aeda6f99cae8e917fd5158a7e14a4f383b7e30c771437d599f22f94ce75165893ca3fe170c5a1fe71f28
diff --git a/kde-frameworks/attica/attica-6.10.0.ebuild b/kde-frameworks/attica/attica-6.10.0.ebuild
new file mode 100644
index 000000000000..9042d900eebc
--- /dev/null
+++ b/kde-frameworks/attica/attica-6.10.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing access to Open Collaboration Services"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-qt/qtbase-${QTMIN}:6[network]"
+DEPEND="${RDEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	# requires network access, bug #661230
+	providertest
+)
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index bd99b7ac3f11..20766b763dc2 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,2 +1,3 @@
+DIST baloo-6.10.0.tar.xz 326584 BLAKE2B e6e343d8f526cefc9699f4d85909826d2d495fdd616be737be0b1713dbfe6de6820ad6d65c1afd016ddffdb1ff26443479129a7cbe20d342178f3f9031162215 SHA512 8c963fc565b75dde5eee4c579f0f58d23292781ed7b83934390a10ba9e04fdcf64821e6b8606d032dc63b11d9f2b22ad5ae8ee29cdd885846f95ba06a6ce8d81
 DIST baloo-6.7.0.tar.xz 317016 BLAKE2B fbfcd01582f140eba3e32a73b787be3c4ef1fd06ae934fd0e18ae2d6a55529d96ec9d2b3784690b2b5bb061c068680a619a19256f267a57ba5748b2ba7b3ed5b SHA512 e4c1d986ee284329a3a8781ad839c89bc4157b0c83923a95985652a94604450e7d3454db996b43575cee6d435418b3fe2d8db678a030071b364acd013ab4f3cf
 DIST baloo-6.9.0.tar.xz 319364 BLAKE2B b03d57eb17cc6a527e816f6e9049c4327839650b4ab16487512395704faef425919aa40a281135a3911ec8ea61617faa3672e80bafbbf354d3155d9ee5038030 SHA512 3d50107a447045659e6bc229d281b8bee8311a6c7b2d89c41499f1c9702ab1e8e55ae9fe4f98c28a69296197d7b88b05bf78c90fe7fe1d9923e1eaa3bc68c305
diff --git a/kde-frameworks/baloo/baloo-6.10.0.ebuild b/kde-frameworks/baloo/baloo-6.10.0.ebuild
new file mode 100644
index 000000000000..7a25614db1ed
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-6.10.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for searching and managing metadata"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test" # bug 624250
+
+DEPEND="
+	>=dev-db/lmdb-0.9.17
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/kcrash-${KDE_CATV}*:6
+	=kde-frameworks/kdbusaddons-${KDE_CATV}*:6
+	=kde-frameworks/kfilemetadata-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kidletime-${KDE_CATV}*:6
+	=kde-frameworks/kio-${KDE_CATV}*:6
+	=kde-frameworks/solid-${KDE_CATV}*:6
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index c84589815658..7c0a687e554a 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,3 +1,4 @@
 DIST bluez-qt-5.116.0.tar.xz 114784 BLAKE2B 0b81de0391d46206aca68f70458f69bac6c0b84126756abd8c3ea7cd3a231efd8cfaf624fde428d40d63d4b3582eeba968ed64fbd3826670fff62b748ff3efed SHA512 f5bccdb75d18b2cdc66de76b23acae9821335eeec0b1f53abf009008f7aa6fe9ddee5428f366be9af872666a3a7de79daac5ee930116f554e1c9d1e664fe574b
+DIST bluez-qt-6.10.0.tar.xz 115712 BLAKE2B dbfc229f6a352e1391b5ac5b2fcdb543d46e4c0571de50f3ba219dc86038f2d3682ead3e27f19ebfcdb8c033555b011e65ca12e98ad4dba8b994432952940e63 SHA512 dd728dfec848123abf5f245cb01aa1b7c74709f694b97442d57535104448bd81348f72114989765aee316418919f5e57de51cb47939d170d707c97b969ddd756
 DIST bluez-qt-6.7.0.tar.xz 115764 BLAKE2B 86ce72cdcadac0e6176693eb93fac9dff746a2e8c8c5bd26cced2e5402db4a4d32201661da004632c01f5843a59c1809c66eabc2d9156f472198105a982e1c83 SHA512 0ff2b9482bd2270595d9f8d525c7f0f7e7737f3ff957d302d95df8d10a0a2c058ff7e75286c4774b977c4596c16ee7a3bce42191d400847b36bb582119c9a10b
 DIST bluez-qt-6.9.0.tar.xz 115660 BLAKE2B a6356a25ff24f0f4216cec61ceb38c68b1fedef0b8bdd9a25da75b7865c9683d7fc0c7406ba824d7879e70b11070b3d7407f5b01c12206e7ca1694925bbebffd SHA512 9b450ea813a15129ab909ed29e0828eac749682cb96b18308c6a02ee1f5f5f798421f8661042c6cc33a1a1f817ef3ad8513bf2dff244333c6ac4d7e30e627eff
diff --git a/kde-frameworks/bluez-qt/bluez-qt-6.10.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-6.10.0.ebuild
new file mode 100644
index 000000000000..f937e1e1f4b7
--- /dev/null
+++ b/kde-frameworks/bluez-qt/bluez-qt-6.10.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test" # bugs 668196, 924708; they all hang
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,network]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# parallel tests fail, bug 609248
+	ecm_src_test -j1
+}
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index e28ecd09c16a..bdbc723bd736 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,3 +1,4 @@
 DIST breeze-icons-5.116.0.tar.xz 2173596 BLAKE2B 238d05983fc473771802b1537d73b51d5f6fb2936635cc8ad3e4162166a0ac9d0f5ae66b9fb28b6e3d2f168ff1fbcf3bc1f4a993687520766fa1f682c413a07a SHA512 3b65bd712262eb4aa0e3760d963b5ad480d840bb680ed7516b69d0d0fb6ad52dffe7c81ec2535adb36a34ec00154253570e5da8f97ef7d4d235ef0e9723751b8
+DIST breeze-icons-6.10.0.tar.xz 2255876 BLAKE2B c1f1743e7cd19c1e9c0f3ab499ec233404c33fb76b2b897e5b9d2da9516156c676246f886bee399d886e6222677d18911b681c72c69781a4322250e1bbb619c6 SHA512 e843f5704302db371b9588b2fbdfa82852108b20e7c532ec19afacefd45049e0164c7c2fc7f8af46c22f1446d4a78bbeaa9995bb6d52471a14f52c6ba4d556c3
 DIST breeze-icons-6.7.0.tar.xz 2249188 BLAKE2B 3e8858cb0358e636236f5b117a635a2c98d94cd2f31ea2569c36f5e04350121e94150b9553406d23877148bd1fc0bfb310f411d74e4ab8f3ebecdbc11d11a8cd SHA512 5607049d1a6474672d216255b5c70d9dd8a2066848ddfd19adb8319f45ae01fcea31fe05445fea6b5da362d5b87e031700bfd742fac898b72b08408483b89b88
 DIST breeze-icons-6.9.0.tar.xz 2252596 BLAKE2B 6a4cde327de88077b0bcad08c83ade56b60f3fcf15ad45725e60892d30fe787e9c5069058db7afbde923ff5beb09617e05348987db06fe06892008c4f1b9eb40 SHA512 d9d7c1642cb4d15b5c16b8a50ac4def824f987c241c2cb479f89839a84e760498c428c19122ddcdd09bd5078f046d5f8eb572c664cd7a9527120ae2d8b0451de
diff --git a/kde-frameworks/breeze-icons/breeze-icons-6.10.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-6.10.0.ebuild
new file mode 100644
index 000000000000..e02d7a9a24da
--- /dev/null
+++ b/kde-frameworks/breeze-icons/breeze-icons-6.10.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake frameworks.kde.org python-any-r1 xdg
+
+DESCRIPTION="Breeze SVG icon theme"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!kde-frameworks/${PN}:5
+	!kde-frameworks/${PN}-rcc:5
+	!kde-frameworks/${PN}-rcc:6
+"
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+	dev-qt/qtbase:6[gui]
+	>=kde-frameworks/extra-cmake-modules-${KDE_CATV}:*
+	test? ( app-misc/fdupes )
+"
+
+python_check_deps() {
+	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		-DBINARY_ICONS_RESOURCE=ON # TODO: remove when kexi was ported away
+		-DSKIP_INSTALL_ICONS=OFF
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# bug 770988
+	find "${ED}"/usr/share/icons/ -type d -empty -delete || die
+	find "${ED}"/usr/share/icons/ -xtype l -delete || die
+}
diff --git a/kde-frameworks/countryflags/Manifest b/kde-frameworks/countryflags/Manifest
deleted file mode 100644
index 3cce90ae7f63..000000000000
--- a/kde-frameworks/countryflags/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdelibs4support-5.116.0.tar.xz 3706116 BLAKE2B 35d8ab172c2993cd7f64b1075ddb882a78248383f23a0060889f782f3af65bf3cab9423af380b91e85236b2e8e3036040f6527a3ca7a7a8c309730e01a0d2283 SHA512 87cdc59da0fcaccc48012cf3c34ab3707c2eb159effd17e76b7c24a81feebebef3a27aa1d25dadfb0d5ee7efbc39b2fa7cafc6090476f5ec4cb8e9be616050be
diff --git a/kde-frameworks/countryflags/countryflags-5.116.0.ebuild b/kde-frameworks/countryflags/countryflags-5.116.0.ebuild
deleted file mode 100644
index 0482a7e8be0d..000000000000
--- a/kde-frameworks/countryflags/countryflags-5.116.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-ECM_TEST="false"
-KDE_ORG_NAME="kdelibs4support"
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Icons of flags for various countries"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-
-CMAKE_USE_DIR="${S}/src/l10n"
-
-# https://phabricator.kde.org/T13722
-# https://invent.kde.org/frameworks/breeze-icons/-/issues/1
-PATCHES=( "${FILESDIR}/${PN}-5.90.0-standalone.patch" )
-
-RDEPEND="!<kde-frameworks/kdelibs4support-5.90.0:5"
diff --git a/kde-frameworks/countryflags/files/countryflags-5.90.0-standalone.patch b/kde-frameworks/countryflags/files/countryflags-5.90.0-standalone.patch
deleted file mode 100644
index 777fc622580d..000000000000
--- a/kde-frameworks/countryflags/files/countryflags-5.90.0-standalone.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4abd415bae7dd03cfb30f7db3597e0ab241f19e5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 17 Dec 2021 16:09:12 +0100
-Subject: [PATCH] Standalone install of countryflags (src/l10n)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/l10n/CMakeLists.txt | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/l10n/CMakeLists.txt b/src/l10n/CMakeLists.txt
-index babb57b8..915b6fe4 100644
---- a/src/l10n/CMakeLists.txt
-+++ b/src/l10n/CMakeLists.txt
-@@ -1,3 +1,13 @@
-+cmake_minimum_required(VERSION 3.16)
-+
-+project(CountryFlags)
-+
-+include(FeatureSummary)
-+find_package(ECM 5.89.0 NO_MODULE)
-+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
-+
-+include(KDEInstallDirs)
-+
- install( FILES northafrica.desktop westafrica.desktop southafrica.desktop centralafrica.desktop eastafrica.desktop caribbean.desktop oceania.desktop centralamerica.desktop northamerica.desktop southamerica.desktop easteurope.desktop westeurope.desktop centraleurope.desktop northeurope.desktop southeurope.desktop southasia.desktop southeastasia.desktop eastasia.desktop centralasia.desktop middleeast.desktop  DESTINATION  ${KDE_INSTALL_DATADIR_KF5}/locale/countries )
- 
- set(listLang C epo ad ae af ag ai al am an ao ar as at au aw ax az ba bb bd be bf bg bh bi bj bl bm bn bo br bs bt bw by bz ca cc cd cf cg ch ci ck cl cm cn co cr cu cv cx cy cz de dj dk dm do dz ec ee eg eh er es et fi fj fk fm fo fr ga gb gd ge gf gg gh gi gl gm gn gp gq gr gt gu gw gy hk hn hr ht hu id ie il im in iq ir is it je jm jo jp ke kg kh ki km kn kp kr kw ky kz la lb lc li lk lr ls lt lu lv ly ma mc md me mf mg mh mk ml mm mn mo mp mq mr ms mt mu mv mw mx my mz na nc ne nf ng ni nl no np nr nu nz om pa pe pf pg ph pk pl pm pn pr ps pt pw py qa re ro rs ru rw sa sb sc sd se sg sh si sk sl sm sn so sr ss st sv sy sz tc td tg th tj tk tl tm tn to tp tr tt tv tw tz ua ug us uy uz va vc ve vg vi vn vu wf ws ye yt za zm zw )
--- 
-2.34.1
-
diff --git a/kde-frameworks/countryflags/metadata.xml b/kde-frameworks/countryflags/metadata.xml
deleted file mode 100644
index 506ecf605bc4..000000000000
--- a/kde-frameworks/countryflags/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
-	</upstream>
-	<slots>
-		<subslots>
-			Must only be used by packages that are known to use private parts of the Frameworks API.
-		</subslots>
-	</slots>
-</pkgmetadata>
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index fe3479f35b55..ff332dfbf313 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,2 +1,3 @@
+DIST extra-cmake-modules-6.10.0.tar.xz 324580 BLAKE2B 9c6b3491f30609cd47d056c325e38ab190fd240a5e3018457f545034bc3853f4abcfb5694a6a18734e29614bacb2021a7850e3e3b8663d6bd47ffef361fea77a SHA512 3ebf2cd4bcaa82a90374411f3313f84fa632b73f3c8b8109d545d0289c99d940705e72ded498393738342db4becbe9055eecb673891969652915d75cdcb6368d
 DIST extra-cmake-modules-6.7.0.tar.xz 341336 BLAKE2B 5f63ba006f98527f53cfd989ed26ddafd17ba7666da4b50a3afcbd077037e33b5c52864809ad8f34a07d6d4b0aa15d76db67454c171937f8b7bdefafeef9385d SHA512 f37ce21f32e663e36b9a3f5dd8709b21926b2af08c9dceccd7559ae9ee1a4a1a710a425d5f9d2d8496da70af0258611c9a7ea584ee0f1f4ae4c889262f66d3b0
 DIST extra-cmake-modules-6.9.0.tar.xz 324788 BLAKE2B c91899e2899de4b37e5cbfe8ed90755a4a23d37e0a3cfc23b3c9d97e99d755b7185014708c775027aac2476f4a9f064d943f3956f6c6bebdc66eae58050a7c99 SHA512 58a317bbc060096cfe0598ec6f15cbf9952b063844a19523b15cc8ab34ffbb261f50f6509c3029cdd010b300e27b0d1c295360ee63c47f098bc5e042a77283cc
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.10.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.10.0.ebuild
new file mode 100644
index 000000000000..01ca5c6b6d19
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.10.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+QTMIN=6.7.2
+inherit cmake frameworks.kde.org python-any-r1
+
+DESCRIPTION="Extra modules and scripts for CMake"
+HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-arch/libarchive[bzip2]"
+DEPEND="
+	test? (
+		>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+		>=dev-qt/qtdeclarative-${QTMIN}:6
+	)
+"
+BDEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+		>=dev-qt/qttools-${QTMIN}:6[assistant]
+	)
+	test? (
+		>=dev-qt/qtbase-${QTMIN}:6
+		>=dev-qt/qttools-${QTMIN}:6[linguist]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
+	"${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch"
+	"${FILESDIR}/${PN}-5.245.0-disable-qmlplugindump.patch"
+	"${FILESDIR}/${PN}-6.5.0-disable-appstreamtest.patch"
+	"${FILESDIR}/${PN}-6.5.0-disable-git-commit-hooks.patch"
+)
+
+python_check_deps() {
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
+		-DBUILD_QTHELP_DOCS=$(usex doc)
+		-DBUILD_HTML_DOCS=$(usex doc)
+		-DBUILD_MAN_DOCS=$(usex doc)
+		-DBUILD_TESTING=$(usex test)
+	)
+	if use test; then
+		mycmakeargs+=( -DQT_MAJOR_VERSION=6 ) # bug 938316
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=(
+		# passes, but then breaks src_install
+		ECMToolchainAndroidTest
+		# broken, bug #627806
+		ECMPoQmToolsTest
+		# can not possibly succeed in releases, bug #764953
+		KDEFetchTranslations
+	)
+	# possible race condition with multiple jobs, bug #701854
+	cmake_src_test -j1
+}
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.9.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.9.0.ebuild
index 15428fb1dd55..114bdd5d2257 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.9.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.9.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
@@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 7fb2a7eddcee..c334d2db6e8f 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,3 +1,4 @@
 DIST frameworkintegration-5.116.0.tar.xz 1760428 BLAKE2B 2b9aa2b6776549b333f858eceaa8086adb4e43f67298b1be858e90f6e230027ab1c99693590aa504b70f91dfa725a10872fbda1a104213e8bc9f5d95781ae83b SHA512 425fd38f87b2bba96f68afb8bc8108f9da6011106e33f32b2d91b97b8330d54d0bdc26bec8ecf50c32471d8f8e85af5f6d8b3feee0815225f5dd2075c41c8a83
+DIST frameworkintegration-6.10.0.tar.xz 56144 BLAKE2B 7abf8dec04aadbe542dd4757016aafb2fa59dc8b1aeba55fdd046982526d05ae2b3ee7cbadf843925381787d6d785eff0ffc0ca4b2666f484cd0ae63508c7216 SHA512 72c4c509056020e56f5202fdccbef5410279a90641fe424b2e8e3b9924f7d7c008f7495a69abd04a6ceb21f6706e050a7c9f5b17dda430512fcf92a6d69d00c2
 DIST frameworkintegration-6.7.0.tar.xz 54628 BLAKE2B 0f28685881ef26071b3905794d5d0017876becd7100220b02cc38123efc94c10e688fb320366ac1939417015315416d7146476885c5cc262ef114b07537e9ca4 SHA512 f3fb48a2a60fc54b09424b38dbd265826b16444ab36c7bff3ecab438164490aab60c6d1bb86491f8780c8e9a12829191ad5653cc6398f0a7e4bbe28e49de6910
 DIST frameworkintegration-6.9.0.tar.xz 54632 BLAKE2B 3a16951fd82d9b479edd8d274ab856607a9fb4b03d7f69731f83aed8aadaf486d3d3ba747b7f26d1e9e275a3c2f8f05d29e40957027f9f83552e5bdfa55717ed SHA512 f2ac62bfaca067747da440e7db6a8f702e8626bec850fe398eecc57ef605ce5762b92c95f45c046730cabd914da0c96fd550ae05d5127f9e95e1d16073464e9b
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-6.10.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-6.10.0.ebuild
new file mode 100644
index 000000000000..9f075b8aa0eb
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-6.10.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# requires running Plasma environment
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	=kde-frameworks/kcolorscheme-${KDE_CATV}*:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kiconthemes-${KDE_CATV}*:6
+	=kde-frameworks/knewstuff-${KDE_CATV}*:6
+	=kde-frameworks/knotifications-${KDE_CATV}*:6
+	=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
+"
+DEPEND="${RDEPEND}
+	=kde-frameworks/kpackage-${KDE_CATV}*:6
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt6=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index c0894ba73135..450ed3c0791b 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1 +1 @@
-DIST kapidox-6.9.0.tar.xz 198592 BLAKE2B dff2f58aecdaa06cf8bda0e2e21a9c0a779e114658f95e85175321b0a3a55948c12f741240b8ccaf50e6f83d6ba63f3717a0ab2fa5dfbde0e6f8b2a8fe17bbc8 SHA512 79443b2ba39abe9ece27891ee4c7fbdc16fc012d85d5a44154704d7fc37b0cb5e71d7db06951f26357040f7ef4e3ba79d30041914b59e1e89dfe9620be64e045
+DIST kapidox-6.10.0.tar.xz 198620 BLAKE2B 366e0f15836cc067c6da33f71f7b3d47aee7313acf2a6b3b579af9cf29b43e03bf4e00cda42462f8720d959e68415d66a5e81ddeddc5ceab94e80e5171cf0019 SHA512 b989561240d3a77d03497705fd133d445341f448e32be0184f8e2a57eeef8cfa9a046229269c4bc1f0418ab0a648c2d93f0325f2e2d04aa92a3f1c60f260ec00
diff --git a/kde-frameworks/kapidox/kapidox-6.10.0.ebuild b/kde-frameworks/kapidox/kapidox-6.10.0.ebuild
new file mode 100644
index 000000000000..139e5436ed61
--- /dev/null
+++ b/kde-frameworks/kapidox/kapidox-6.10.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+inherit frameworks.kde.org distutils-r1
+
+DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	app-text/doxygen
+	$(python_gen_cond_dep '
+		dev-python/jinja2[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	media-gfx/graphviz[python,${PYTHON_SINGLE_USEDEP}]
+"
diff --git a/kde-frameworks/kapidox/kapidox-6.9.0.ebuild b/kde-frameworks/kapidox/kapidox-6.9.0.ebuild
deleted file mode 100644
index 15808fd372b5..000000000000
--- a/kde-frameworks/kapidox/kapidox-6.9.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-inherit frameworks.kde.org distutils-r1
-
-DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
-
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	app-text/doxygen
-	$(python_gen_cond_dep '
-		dev-python/jinja2[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	')
-	media-gfx/graphviz[python,${PYTHON_SINGLE_USEDEP}]
-"
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index 7f74988aebe2..20403553ba22 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,3 +1,4 @@
 DIST karchive-5.116.0.tar.xz 1027464 BLAKE2B b0f24191f3ba3ca6078f6661e998f32a9fe66be18846b1c564e648e2e9c1c9160d2cef7841218d96409cdd91eb824b1e4ffe084b6630537bad37c0f0f823e0e6 SHA512 2f14f2998d9e5f73bee71488ab270bf65a989e7a7ff87d68efa685bb14500328d4679c35d8caeb5c65bab255fca4dbb36b449cea08c59a746c721f1d1c318e17
+DIST karchive-6.10.0.tar.xz 1037296 BLAKE2B d65b567522e443c07c60f2cce2759b8e6a4988472b048652dd131c3d9770893eb049f7409790eec3c5e8183dbcffca02f2349bc09096c706f817e3bf48b24a60 SHA512 11f51c7ac9a2cc49d277a584745dbefadf03e216516094b4f35eb3f4190315924fec51e0f5adb01c9938dc34019c26910d4987a7b672a215e38f15b0ca6520e9
 DIST karchive-6.7.0.tar.xz 1033980 BLAKE2B cee9848ced24f4849293730abaa6f501086dab955b64e553fdf2eb5df03cdcca24b7e765501a4787a6ddb5a68329d9d81a1599ae2a836f0ba5afe8e14749d75e SHA512 d4b3a5884c0ac7d895eaaa24107fd8ca4cd1de0a4dd3ce2d3cd09576a8de588bd958ba32e7e7dbd64f7a34a25f652a1fa5a5841acc41295cedc2f96483bc5ba2
 DIST karchive-6.9.0.tar.xz 1033980 BLAKE2B bda92f57e7864a238f7e44588775e43099c28edba85607ed4f178dbc010019a63379bb5f83b65b62f62f1c7801dd11dfcfef895962d2341d64240f21a2bcab81 SHA512 fe80ef3908d61be2e63edfab6815f4df719e53d3cfdf90535860d376591caac1321d44ce1a95497d39d6ae5b2a5c858e98011eefa5fff40711c16c6dbd1b0fcc
diff --git a/kde-frameworks/karchive/karchive-6.10.0.ebuild b/kde-frameworks/karchive/karchive-6.10.0.ebuild
new file mode 100644
index 000000000000..0aadbc4bccf7
--- /dev/null
+++ b/kde-frameworks/karchive/karchive-6.10.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
+
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+zstd"
+
+DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	sys-libs/zlib
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-qt/qttools-${QTMIN}:6[linguist]
+	zstd? ( virtual/pkgconfig )
+"
+
+src_prepare() {
+	ecm_src_prepare
+
+	# TODO: try to get a build switch upstreamed
+	if ! use zstd; then
+		sed -e "s/^pkg_check_modules.*LibZstd/#&/" -i CMakeLists.txt || die
+	fi
+}
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 7641b5892e2d..bc98350c88d0 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,3 +1,4 @@
 DIST kauth-5.116.0.tar.xz 2307868 BLAKE2B 429b7ef6221673d0014be8cbff1acfceee51f1e5c8d14ea87a042de79f4d4bd7b5527021371c140e64995f41ec967f838b68f7a4e60bc508d39833e78d200d12 SHA512 1a640bb2bdc4a4d2a6458becb618a618abfb510bf6286145bb3834373cc8fec4980008d977476f699ad97368b316ccdf5308cea3eee80171a9d051003f45d7c6
+DIST kauth-6.10.0.tar.xz 2296748 BLAKE2B d553bcd9908a4e20a5b418e0a690d98d8254803258b02f296bb04f6c1b787f637d470c779d57a822fb45225540edb3d8735ae162accf1ce9e57869d774d99b9f SHA512 11d7e2a40ab4e74f8c1866dab5bfd6ac5a586ff36098f259782b18e52275138626272637eacd33385b65fd6d51ef49bbda98477913fe38bc7157be8a1ac72a86
 DIST kauth-6.7.0.tar.xz 2296644 BLAKE2B a5d8313bb52815d90df01671d4bee2896f998bf0ca5e3121289e50a601f05e2b33f642d8fb549b1c71c2262263a9b2692f76bfe8e0d91a98da74e6b8368d691b SHA512 7345f50a68a7b5e9e0d95f833328902a6864a2c6c24d816bafa077c85bdbe9594ee932ad85456b36d8f7174d0a50caa2ad000fbe203d498c829db23e5b77e59d
 DIST kauth-6.9.0.tar.xz 2296744 BLAKE2B 77135b5fed671a57a8911be9dd41624f5cffaf308b2a6ff70805041e4c2636c69b6acd10158dfc87999c9b610e59dce87a03cc8dd8e3e9ff0291d9092cd1b50f SHA512 c4f0ba674b6bbc2d03654f0596a6f2fe93ee5966c83dafc3209dcc7879fc2e6b63fe3849dd85ae3b6f48b5809efe5dd53c5295a0d4ad240c5ede51b653bc7f39
diff --git a/kde-frameworks/kauth/kauth-6.10.0.ebuild b/kde-frameworks/kauth/kauth-6.10.0.ebuild
new file mode 100644
index 000000000000..966fa201b876
--- /dev/null
+++ b/kde-frameworks/kauth/kauth-6.10.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework to let applications perform actions as a privileged user"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+policykit"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	policykit? (
+		>=dev-qt/qtbase-${QTMIN}:6[dbus]
+		=kde-frameworks/kwindowsystem-${KDE_CATV}*:6[wayland]
+		>=sys-auth/polkit-qt-0.175.0[qt6(+)]
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtbase-${QTMIN}:6[dbus] )
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+PDEPEND="policykit? ( kde-plasma/polkit-kde-agent:* )"
+
+CMAKE_SKIP_TESTS=(
+	# fails, bug 654842
+	KAuthHelperTest
+	# needs DBus, bug 938505
+	KAuthFdTest
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package policykit PolkitQt6-1)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 30c1579e1df1..4f0372b5a002 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,3 +1,4 @@
 DIST kbookmarks-5.116.0.tar.xz 1100676 BLAKE2B 405d625539d8d2950ed931283ec6abfcd83bfce141c6f7044e19ae15cf127905b823ce617a2baee2590d7e9fa9be09e44ed447c57f70a499550391bf25789939 SHA512 72f19ad40595093fa828ead0553f8d0afc149b77479f75b014e1cab059208fa23607a755f2d4afd2079c047bf6832782664beb07d674cb56b41586d51c5d9933
+DIST kbookmarks-6.10.0.tar.xz 1109500 BLAKE2B ff9d1cf3d9c5f0be991780a3dfd00528da04fd193575e70a2177329cc5422cb6acad9e32931f9daf18f9aa509c12fecb3371fb838140395535103855d8a80140 SHA512 2694e6a537b88bf294bee09bb7b212e1411daede767adf781ec9f8e00eb738ad2a278f5c13a1a441e35d8445e05dfc5452da4e3b60633ca986b975f6c657aeb4
 DIST kbookmarks-6.7.0.tar.xz 1108572 BLAKE2B 7d6936024d0e8a12ef329e8e1760201c4b9ad5e48c0e61ebff3f9765ca94ff0f49975d43991866e2664c1bf584fea55ca5b9b601665a59f0edb0efac3e97e0e0 SHA512 56fadb86758696109a5e58b4ed649aeae579c38628b1369ebd86a638b80bcd1656649659705f800be7ef27e7b75cd4fb269cfb0ea8b16fe23c79cfee517e4dd5
 DIST kbookmarks-6.9.0.tar.xz 1108832 BLAKE2B 4596644892293013a863dca94dd1ed55724957d09002335a0bfd18d3819567d0d32ec539784d2324ec6a6dd65eedeb470410cd0b176b3e8524b303e7b5463e37 SHA512 c875052b5ac34ef893cee2d6ca205b54e8854d39bdfe185d2e5cb486582940820da779ce4813e32a2c60b2b87d0d950af0621b101dae2af71833ca0111da8113
diff --git a/kde-frameworks/kbookmarks/kbookmarks-6.10.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-6.10.0.ebuild
new file mode 100644
index 000000000000..f672964545d9
--- /dev/null
+++ b/kde-frameworks/kbookmarks/kbookmarks-6.10.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/kiconthemes-${KDE_CATV}*:6
+	=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest
index d21eb057d1bd..da0ddc6a300a 100644
--- a/kde-frameworks/kcalendarcore/Manifest
+++ b/kde-frameworks/kcalendarcore/Manifest
@@ -1,3 +1,4 @@
 DIST kcalendarcore-5.116.0.tar.xz 268900 BLAKE2B 63e32662b3af9629248956cb1fa2b2fdbded330b0053526952aa1c784434a8e43723e652700c2ac694bb7b5e0b1380b1b04bb08f7893f7795f138aaf239b7029 SHA512 04fc6b6c00e2a994b47b15e57a531b51439d67155b90c388b4e37efb6428e0215e90ff52bb5afa55d0ee0e7cb75186eac750770c9036824c20b779ef418bd1c0
+DIST kcalendarcore-6.10.0.tar.xz 310916 BLAKE2B be7ad43a3e7354080cd3419b8bc54952e3c1b676b274239a323af6101e0ab1962d8ef5939f886f971843eccc01cc71773d805c7781a0da896bb2ff2e2e24f4dd SHA512 1fc6bd2b6b8e6d41bfb97ddf2c3dc38e249b2bf836271716de15c94b073c1928918ff2f2349adb9bacd992eb764e1df1040fdc455c7faaf3c4601abbf423d42a
 DIST kcalendarcore-6.7.0.tar.xz 311512 BLAKE2B 90ac44b0d8ceadf710a06ec3dffd4a0192c0700b62525b51a885109899df7dc9a0bae6b4217ce42ef09307b19445d33f1cf21b7ead149c681380ed3bebf195e1 SHA512 eefd19b1d88e901dc3ed4d917b87dfea3b80716ce0c8f9aa5d1a22246ad67c09e9365767484cf59522a6df00d8226f1520a18ac4be3c6cc2d95ef533cf0648c6
 DIST kcalendarcore-6.9.0.tar.xz 312120 BLAKE2B 9f9ccf82c1634125d4c3850c28f55a6c680842ce410275e2305716afb9111d46ed2d07b674a473d4c70f849fa555e4f51595ce081489eee1959c0dd48faae690 SHA512 abd7812576a3142675d381ecf9fc8da83301e575028714b21bed7ba44181f7517ea3a3e2cb3550fd3b37254978713c3781c57f9dc5ae61ec3ebcce0bfef7e636
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-6.10.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-6.10.0.ebuild
new file mode 100644
index 000000000000..de303835634f
--- /dev/null
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-6.10.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Library for interfacing with calendars"
+
+LICENSE="GPL-2+ test? ( LGPL-3+ )"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test" # multiple tests fail or hang indefinitely
+
+DEPEND="
+	>=dev-libs/libical-3.0.5:=
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+"
+RDEPEND="${DEPEND}"
+BDEPEND="app-alternatives/yacc"
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index 8fc519ef0b97..8ea1da3d8c8b 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,3 +1,4 @@
 DIST kcmutils-5.116.0.tar.xz 2483612 BLAKE2B 8cf69f90c1fc3ea0fccb7394891140b7ab8cbadbe413a0a48452061519486b2d0f7e7ea95c129a2a63e4be15ada7e259a16f97805a582be2a93e670f07b40ee3 SHA512 05ee74e36f859a7c60d60c5da9bf24923742440b094b3969f56f7cef3ca1d7d7cdc6b3d7bb467db3388e3946f627fcbef29ba0c2f84cd85f041382920b4e3ad8
+DIST kcmutils-6.10.0.tar.xz 2464756 BLAKE2B 87cdd22036938fb9322ebc5bbc1211ee4cc0a002bb9a32329bdbd6d8f1bffb0a6d3412efce4dfb9c2df9658b43d341c5bf4bbf347c62fbf7ab2e8c68645772ca SHA512 f16d74914c2329cea23514c8a413f070dc97381d145da0755dc901af9a44dee672ffe8bda3b195577096f8d4755d8b478ac1cb835e00bdb96c377ece2450cf7a
 DIST kcmutils-6.7.0.tar.xz 2463708 BLAKE2B 9519b86fa2430d4914196c6d064b50703d42d1a4b4f795f8263f65333e4b94858880612191d6e1258b904d053a706ec0514be1ecfb67b4ca101c3b30ba948253 SHA512 1718565ce5e8c62745d753ba362263b5093bad4869e5841c64492344f465a591d592b1417418b8a8b4ded456e887035a1dba9fd5bd316cc961c3c56da099a147
 DIST kcmutils-6.9.0.tar.xz 2463660 BLAKE2B cab3a58730b39b4484e484ef10901dcfd7ce9ebd7f9702578dccec98472db01c74b978f27f9fa96f3e5a272166632ae36bb127eb13587bc7469ac88ee49c1ff2 SHA512 e88972a5f553b6401522ecfc0b7b87030600a4ffd8811cd7b8e2f511aa1b6e31846fbf19ab2ace46862cef0d974780f37adcda91793b7d4edfdacd53d176854d
diff --git a/kde-frameworks/kcmutils/kcmutils-6.10.0.ebuild b/kde-frameworks/kcmutils/kcmutils-6.10.0.ebuild
new file mode 100644
index 000000000000..52142ed389bd
--- /dev/null
+++ b/kde-frameworks/kcmutils/kcmutils-6.10.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework to work with KDE System Settings modules"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kconfigwidgets-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/kguiaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kio-${KDE_CATV}*:6
+	=kde-frameworks/kitemviews-${KDE_CATV}*:6
+	=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
+	=kde-frameworks/kxmlgui-${KDE_CATV}*:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 18be9219ca23..14faa6f59506 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,3 +1,4 @@
 DIST kcodecs-5.116.0.tar.xz 2507116 BLAKE2B 237fcc905031f7496a21cba49f7e2bba87119bfe42a1b422784227b6c6f9690d8a39c0a29eb609ecbf812aafa73e93b280236d0df123b6e5271974af9371c21b SHA512 79d2b5b7a7cd815fa9a00ca4a8cd5fbf2a003521796b21fe3014caaa4506d14a7fbada88ff10b1a16118f2863dc876794e21db6a98f34d5b31d5973c5586da4b
+DIST kcodecs-6.10.0.tar.xz 2492336 BLAKE2B 7976e420fea55ad329b67f2bfc20fd76ab9ab3bd519f890c99b37b4ff01d2e7309d1feace5bc48ca81b43b9f55366ddf3fca576e5e9902ffd3cf19dc0d4d3699 SHA512 57f3d2a688a40316ed340aa0834324e7afa8e0d76a055a6c73264837c8b72783213e906fcf94f86d881aaed7cd93f72e942fdc13bd4fd17b89479276d59fe463
 DIST kcodecs-6.7.0.tar.xz 2491520 BLAKE2B 870720c4973760e4d9afa1ca94ec3433eb79de2bbd323f269d7c8e1707bf369f8feb35cfb0a5473aaf811da736cee7e656995e4229a92722549d48db558f2b0a SHA512 5536fbf54e7405c8a9548151841b4dcfe09250a4d39f7101b18400d4b236283b272dbf3585e429df219fb1284f935c3573f3cfcb2d57534ab1c1478810b3a62e
 DIST kcodecs-6.9.0.tar.xz 2491432 BLAKE2B dc4f7747537e8ec77d4d349a897f6a4281f5587ca2b053c7c465a1ef7195aaa22b3c810a21e3ff296069e343c5c80602dc20732067aec3768ba97f147aeb236b SHA512 20c9283fd3efbb2a35a85d3c92f9ea4f69b50728ce15beb96e665ce816bb83038c12ca27a32bf34f7b75183bb4d4a7a5c9a446f8a47e20cd5c6c11acaedf22f9
diff --git a/kde-frameworks/kcodecs/kcodecs-6.10.0.ebuild b/kde-frameworks/kcodecs/kcodecs-6.10.0.ebuild
new file mode 100644
index 000000000000..37b02ad60ec9
--- /dev/null
+++ b/kde-frameworks/kcodecs/kcodecs-6.10.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for manipulating strings using various encodings"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+BDEPEND="
+	>=dev-qt/qttools-${QTMIN}:6[linguist]
+	dev-util/gperf
+"
+
+CMAKE_SKIP_TESTS=(
+	# bug 938317
+	rfc2047test
+	kemailaddresstest
+)
diff --git a/kde-frameworks/kcolorscheme/Manifest b/kde-frameworks/kcolorscheme/Manifest
index 3165ee9035be..3ed1d2a94c57 100644
--- a/kde-frameworks/kcolorscheme/Manifest
+++ b/kde-frameworks/kcolorscheme/Manifest
@@ -1,2 +1,3 @@
+DIST kcolorscheme-6.10.0.tar.xz 46172 BLAKE2B fae85ebb06407c7f91821e9c379ec14272ec3bcc08c19b67e794704459b47580c1f481eb648161fd32cdf0f1a11fe9bb43273279eb308f5375bacbfbc5ba6af9 SHA512 eca1684d8647302975672213700c7ec28243e2badaf295a3ce5991e9aec791fd7ba22b61268aaefec838b1609c1bf7892bb645aafc4c8b7003db8ba07c28ce69
 DIST kcolorscheme-6.7.0.tar.xz 45928 BLAKE2B 9f4689c76cd13b98cb2014a7a5e7b896f0e6dbbdffe9ac57a71412973eee6d611dbc3f1673fd79de3065667800b27fd7ab3eb0bf0dd584284b1e98f24aa7c3d9 SHA512 7515be6ff00de43182ff7e9217fe45608210e7e7b822066ef5e46607e64a17f2fe77317a650eb84f12aae8ef79f23217066c627f424f55740f5875a3d3e1ff8b
 DIST kcolorscheme-6.9.0.tar.xz 45988 BLAKE2B 36106d6ca12039d174015556ea542e02c187ea13d6c79e86bad18ab016f616a37a61b4145de62e4f92b00b85db10c000632dda62dcf86426df0a216d5461af1c SHA512 9aea556f7561892bc39145e0cca7a18eb8d711446afa9c8b1e100cfc4b6e3857e7c2ff0bda4597f68a0dbb09d9cf85c99961728e3922bf4b423b8cdb3456c014
diff --git a/kde-frameworks/kcolorscheme/kcolorscheme-6.10.0.ebuild b/kde-frameworks/kcolorscheme/kcolorscheme-6.10.0.ebuild
new file mode 100644
index 000000000000..aae2e0d0ecbe
--- /dev/null
+++ b/kde-frameworks/kcolorscheme/kcolorscheme-6.10.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kguiaddons-${KDE_CATV}*:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index 206528c8f065..56b31d42cc06 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,3 +1,4 @@
 DIST kcompletion-5.116.0.tar.xz 2337536 BLAKE2B 9ef6fd52f69deffd9fefec25ece2b95269b3f74e055b9fd0ec677376db301d2c0ed3d4a0957b0edd7a90859ada5dd2a70d0d7961519cf94a8336c4378c2db806 SHA512 5a758b3e037f87e3b011232d0462599cfd0241f2345312a4ffb82e940aad5da023c07be68401febd556e33c38a6ff48ffff1e8ee769314acafbb3409a0c8b730
+DIST kcompletion-6.10.0.tar.xz 2324208 BLAKE2B 87c2bb2bfdfb183173878bc123a45d4a239387fdf0acda749088e95a3f84d057a13314aa1cc8c9ea304b1b45da6050d7e1ef2162f081095f8d81dc7661496c3f SHA512 a243bf0296e6edb0f51e91bf83836a40d39b81c811ceddaf31d6e58a4d1b11cc87a2565f0c9c49be114e9a44a01e351d2be1e65ae2e0a31bfd942a4e5eb10da2
 DIST kcompletion-6.7.0.tar.xz 2324460 BLAKE2B 54a29a4e1aa5ef0c9eacd41f5a9e87e742390796ee4124407b559e8decb2c18265f042423ede8cd72322d8fc2979562a04436cb34852ee0086965156eb68b9e1 SHA512 e3ba8769c3961364cb7829212c76ddc0853fd320baafda6db260679244060e6c823a0f5b52de0a201e70f58100cd4f0dadfec60d253aab8933b5e1a4b190eb5e
 DIST kcompletion-6.9.0.tar.xz 2323940 BLAKE2B d9a83b7f267052af2738dc150418ea832c013cdbf3ad57e1f346057d27a219561510c7c26c825a867ea822b9ee94487ff1d239dfd7ba6f13bfad13c9aa3c0f67 SHA512 c1d5baf232e27f294cbeb4d7a6edcea5da80146a0b7ff28d3acfdce516684220e31de924338bdbb53c4a3a7509c918d1a073ad56b2e15267a24739213672b009
diff --git a/kde-frameworks/kcompletion/kcompletion-6.10.0.ebuild b/kde-frameworks/kcompletion/kcompletion-6.10.0.ebuild
new file mode 100644
index 000000000000..cd82502660cb
--- /dev/null
+++ b/kde-frameworks/kcompletion/kcompletion-6.10.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	=kde-frameworks/kcodecs-${KDE_CATV}*:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index 6404bdccfd20..915e02dbdc13 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,3 +1,4 @@
 DIST kconfig-5.116.0.tar.xz 296716 BLAKE2B ffe6ba551460e07c5dbab37a3f60dcfb113d9a4461f5c69401209b690968a992f97d4b1844d5781e32d0d4a03214ed67a1c715d1cc10dd815f774189b383e650 SHA512 a84f02462f2e7d75488dab6dfb0f438792762f2031cabe8cf7ef143f285e9da8de5e555165d3eb4bc24ae8e3528bc24dde1a6505a55933d98386351493a845d4
+DIST kconfig-6.10.0.tar.xz 349400 BLAKE2B 2ca581543309c00e6d1f4dd5e0ffa0d48a21f9fff127d411df3d88070a4e41458da50ed4e9136043b5c20d8b25a2bb334f2e4250e686a863084886c3deb59d33 SHA512 63b1e54692ce7c73213fad2a0c918a13ba8cf943555d509d165f4f707e7b7ad7f1509f1f54116749de066e235a0ff86d25f8ca7ec09be73ae542c0ec4557fb38
 DIST kconfig-6.7.0.tar.xz 345564 BLAKE2B 77d7e492bfe66908b433fb5e018a69b949540091f8ff9ae96960a753efcdce22c28d51fd4648493522f9e834b80eb8d1f1496747fa5b5750069e64e4f417e39f SHA512 67f1bc481d4fcdc5f6c7c83c6fe06d1111f75ef5fd99740f9f26a06a1f532af722cca2b1ef8d0e2908ecf86f38f6c45540d2f8399c4ca56441a10321712192bb
 DIST kconfig-6.9.0.tar.xz 346672 BLAKE2B 8613f5caea50cbf1ea4a3a7b6564895f02f96c740b4d3e0026b166c38d2a54a3c043affe8e6c365e63b769e4804cb19c3b0726f2fbdf7ce27f2af1e1cf9f598e SHA512 8e2a561291ef903ac724098f9212cf1063ba01bb9329c9028cfaa35439f0304c2e622b33d70818b10bb7425e4920f900c6f8139f825123ee8b9b8c70073b3996
diff --git a/kde-frameworks/kconfig/kconfig-6.10.0.ebuild b/kde-frameworks/kconfig/kconfig-6.10.0.ebuild
new file mode 100644
index 000000000000..673a1dc1b7be
--- /dev/null
+++ b/kde-frameworks/kconfig/kconfig-6.10.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for reading and writing configuration"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="dbus qml"
+REQUIRED_USE="test? ( qml )"
+
+# bug 560086
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus?,gui,xml]
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:6 )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent] )
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+DOCS=( DESIGN docs/{DESIGN.kconfig,options.md} )
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_DBUS=$(usex dbus)
+		-DKCONFIG_USE_QML=$(usex qml)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 920d9741b7bc..6489c5f776bd 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,3 +1,4 @@
 DIST kconfigwidgets-5.116.0.tar.xz 2614488 BLAKE2B d1ec8d4f7afa66a4e468b6c4996ef3437f16f498736ec4a10fca4020058a43ec0d2d3ddaf1e6d6b2356adccd53215ab15f765384ecc1244792d5d0ade6c59d7e SHA512 30325d3b88539d96de97adf8d596bebc6f5f8a5ea0ccc0b272f5e5557aa4ad4dc72ece1491ab2d656efb6ba378a236448a2efb35e4d82ee3dd42f2f9d178ad0b
+DIST kconfigwidgets-6.10.0.tar.xz 2560244 BLAKE2B 00c1faf4c8daef51f7f4a9f7c1b0ad005fffbadba7f0602ed5739cb9af1165a1ee2307fc35744e388fe7f391d8fc8e6c97c9f4d867f843364ff9d8374d1c0738 SHA512 5e69303e07182c6db5ec4f7fca2e2c1efc3a5629965169cc74929bb4b80efc525009fcc1d8a5432195dbbc72543a90a3c14b2feaee068e87df948a4b3d908f9b
 DIST kconfigwidgets-6.7.0.tar.xz 2557852 BLAKE2B 1ab6ac88384c867829180952dbd67be0b03b3047c6e904f721e8fb67d919c5dcd6f71b6f61e2e6f7b282f46f9591804a4d1874cd2e381e9262590edef70fea52 SHA512 303470fd6e76fb6bf41bf87cd0f5ed136acae42dccd1ebe222d6db1887fcccecc778679f68359b70e6668cd8f05118557e5368199fd74705159aff82d199a665
 DIST kconfigwidgets-6.9.0.tar.xz 2557896 BLAKE2B 83f83967cf9c163a9c0a9af220232a4164353dcccfa83ff2abedefceff9f9b46b59caefd44bff672cabcae25192921f4e47ec910e50753fcf014a2c908fa713b SHA512 80d316dfe04149db6aefaf215c67d9315370315426bc7362a16149450cb272193fe1ce5c6d843acf0f4fcc8d9ce688d8220d13480847799601882527f2b142e8
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-6.10.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-6.10.0.ebuild
new file mode 100644
index 000000000000..8e135ecf51f5
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-6.10.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing an assortment of configuration-related widgets"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+CMAKE_SKIP_TESTS=(
+	# bugs: 864250
+	kstandardactiontest
+	# bug 926497
+	klanguagenametest
+)
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	=kde-frameworks/kcodecs-${KDE_CATV}*:6
+	=kde-frameworks/kcolorscheme-${KDE_CATV}*:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/kguiaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
+"
+DEPEND="${RDEPEND}
+	test? ( =kde-frameworks/kconfig-${KDE_CATV}*:6[dbus] )
+"
diff --git a/kde-frameworks/kcontacts/Manifest b/kde-frameworks/kcontacts/Manifest
index 5669c78dfc65..27af051dcccb 100644
--- a/kde-frameworks/kcontacts/Manifest
+++ b/kde-frameworks/kcontacts/Manifest
@@ -1,3 +1,4 @@
 DIST kcontacts-5.116.0.tar.xz 214144 BLAKE2B 6f01e3102e9499e0f1da529c5d073c21c54dbba6d549d2be15686082804ec7da21488e9e631fc4ee6e0d5307d054fa156760644eca8b858123382d14f7fc5b51 SHA512 b33a239bc577a0ff4d7b34e7fc12397fed543ba31a0fb1ebcd55dc5ce52e05e026953128f13c76828dd6723fed9a27153cd8420d5dd940404a4f79cd625499bf
+DIST kcontacts-6.10.0.tar.xz 209376 BLAKE2B 19936b8aefff7a5b3e02ecd1aa6c4689013769c7d4975f25c28a22d2d4a261b738173b63d4f40e80aa3f64a5ec4e06cc59b54ff6dc3c74daf61571a90adac638 SHA512 9736420983bddc8b4bd9706f39661c9dcf3431cad898fd0d720f379dccf33b211ba6a72e4a767e3e849e1ed303eb03799b664beb55eb99be3112fc72922900b9
 DIST kcontacts-6.7.0.tar.xz 208072 BLAKE2B 9d87770031f4e00e7cbf4338c787121709cc960be513825acccf81ceeb5d219b2d303d93819865eabe2b574af23028e0d7fb66961ad7a467c4831a3332f0f351 SHA512 274d049d93c15f1f85bee5afcab494956306b2dfcecb5ab71da6d037d61b9e440d8216e06f38187c317eb7f5cbd1f7d8f8fb389786762a3764b7ced5a8955af2
 DIST kcontacts-6.9.0.tar.xz 208116 BLAKE2B 040b5342563fc27ee4b9601aac2ebfe8aaf795f0d7712932485655904e25f9c7093535ecd8e09395ffbe7a313f71c8ccdea806fd80f000f7bda3679216a283c7 SHA512 4dce5fb0631d841cabe3a5a48d471948fdc2617d3318154cc9f5ef0e9c970bdf6ad1241fab9894e370c1e3f1a270b837a552a8037b6ae39346bf3b6c00b88d9c
diff --git a/kde-frameworks/kcontacts/kcontacts-6.10.0.ebuild b/kde-frameworks/kcontacts/kcontacts-6.10.0.ebuild
new file mode 100644
index 000000000000..7e72ef4b7aa5
--- /dev/null
+++ b/kde-frameworks/kcontacts/kcontacts-6.10.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Address book API based on KDE Frameworks"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	=kde-frameworks/kcodecs-${KDE_CATV}*:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	# bug #566648 (access to /dev/dri/card0 denied)
+	kcontacts-picturetest
+	# bugs #712798, 838502 (again some Qt translations loading related err...)
+	kcontacts-{address,phonenumber}test
+)
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index a95162090820..737422bf4aaf 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,3 +1,4 @@
 DIST kcoreaddons-5.116.0.tar.xz 2611644 BLAKE2B 4a457cb9c0e75fc9d6c7270948de26162e9d51ddaa35a46399d002cbbe9334b8666faeaaa6f7485af339ebf30e833729223c8a2b7b29efe987a1b9ad45f6d924 SHA512 d77a1fcad6576692c6a6d80728acddb818acbc3a8f70fc59f3fa3c433a94c429e4b230840f7df23ae8027289e57fc0c8ae7c42b83ea734b567a640d5e248867d
+DIST kcoreaddons-6.10.0.tar.xz 2553780 BLAKE2B bcf044ec6b2623c53db36532ce6df534059d0758792a77541b5a5036edf3063154397b4209295ee1f81b70eb6e0cfaae6bc3ed6bc8780178f2f3ee3033777b70 SHA512 18b6a3566265daccc25d74c05b1f16b6f26fcffb4e7f9826c718345f61500e17be2bb2503344495968e2bfd62cafdf12518787864cbf8324bd76b88b2fdb9e7f
 DIST kcoreaddons-6.7.0.tar.xz 2567108 BLAKE2B 9c960a3659e3780e633f799a7700dab1ea19c7528b7a8ead3b31b1d7f45e8b505dbe3b66ad9aa28980d312ad668aabb309606e9d86afa2e3a563450774dade71 SHA512 cfe09e2caf103edba07950ca1b4433f96b790926b4fe64e82537c685a41e427205ea1b24cde58f7ade762251b7a56e3a18c9ea61bfe8c978e17129ebea3464f1
 DIST kcoreaddons-6.9.0.tar.xz 2550364 BLAKE2B e2c7e7dd804a1e7336746a87eabba661d892817d80c9dd388d410327e93e511fa9a565e75bb932b728b1d3cd7823a5c4ec08d70552922e0da88cd9293df89a49 SHA512 f8a33c0f8921f4acb79e3b93a960ff64e3ddaeba88cb62a0740a3ad570eb81ad63cd7f16b1c73a5ea45ad4d19684bfd8949ca53a6d325d76f40fc8b3a98cefd2
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-6.10.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-6.10.0.ebuild
new file mode 100644
index 000000000000..2d0cf5247088
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-6.10.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_PYTHON_BINDINGS="off"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org xdg-utils
+
+DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="dbus"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus?,icu,network]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	virtual/libudev:=
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qttranslations-${QTMIN}:6
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKCOREADDONS_USE_QML=ON
+		-DUSE_DBUS=$(usex dbus)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=(
+		# bug 632398
+		kautosavefiletest
+		# bug 647414
+		kdirwatch_qfswatch_unittest
+		kdirwatch_stat_unittest
+		# bugs 665682
+		kformattest
+		# bug 770781
+		kaboutdatatest
+		klistopenfilesjobtest_unix
+	)
+	# bug 619656
+	ecm_src_test -j1
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_mimeinfo_database_update
+}
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 1242fd98e384..f7d1a6c7fd9e 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,3 +1,4 @@
 DIST kcrash-5.116.0.tar.xz 28288 BLAKE2B 28b06fb3e3aaf318ffe47245350edbb5ec200a024934c380c04f6f123714f1197f5b1122c34a6370b657ce13619625e0377eeed795b58d218017d26aa57f01f4 SHA512 051ad694f0db1463c1105d3ff37221633a91c282850b6e295dadf07a323ba610046650c7d2e3b45dcd56214709b58989360b727b16dca0ca44dbc9b143f68e07
+DIST kcrash-6.10.0.tar.xz 27984 BLAKE2B 369c8977f1109bde71b3de1688c142e628556fb41dc540ee40198d2c73ad008c7cda3d78a965d644016a3bd3604e84cc07d731fc5f81c53c4ad8be370601b4be SHA512 599453c143e1f57843b560e34ef9a3cadb2592cf940635eaae8b5d14aeb9c162c34ef32a0a17acb9def04979098fb0cb31d83ec9366555ece7b23e71afd14443
 DIST kcrash-6.7.0.tar.xz 27948 BLAKE2B 140acf6b7acd45842cc6ce786b5da63c5e99ff98ca49ee20736d712e111c82725d3154191f05d24097967b4fc99ef9fb9343f0a8d6e320ddf01d2287961bcd01 SHA512 f3b68434efebf703c1ed687e577a2589763fd1257b5ee4ef96a01e4f7cb20711beea72f4db1b71cdb09357bbd852b8edc3fa143b9aee4b2e1e42367a338bbaac
 DIST kcrash-6.9.0.tar.xz 27984 BLAKE2B dc1523e7e2bf15794c7737f62970602e9afdf04666f758d201520ccae0bbcedb07248792a15067a2a499d7d94fd360476834b28fe3fae0142f016c40abe4cb43 SHA512 beda3c9890a6e3526e8f051039982862c841824ce22115405e9d3454e0056b7c93f2817d7e72517ef987b20d3d635167be3313072a419de062fe46ff659e76c6
diff --git a/kde-frameworks/kcrash/kcrash-6.10.0.ebuild b/kde-frameworks/kcrash/kcrash-6.10.0.ebuild
new file mode 100644
index 000000000000..77f588b0acbf
--- /dev/null
+++ b/kde-frameworks/kcrash/kcrash-6.10.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for intercepting and handling application crashes"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+# requires running Plasma environment
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,opengl]
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] )
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdav/Manifest b/kde-frameworks/kdav/Manifest
index c33ffdb3b0aa..cbc9db578164 100644
--- a/kde-frameworks/kdav/Manifest
+++ b/kde-frameworks/kdav/Manifest
@@ -1,2 +1,3 @@
+DIST kdav-6.10.0.tar.xz 68796 BLAKE2B fc575dd9e7711f62f6b4c252b0fc23d769b610dfb53544390a49462e8729344900306474e3019035c04b3f7c75f372880ac906b69327a01bc07fa99361977cba SHA512 8347ea1a132e8b6fc3842e6a2f68a319416c3ac8a5c12d2d3b1e317a3469f5ae46e1775ca28d80b86bd1cfa584b75877e96de9a7fc989c95e56cbe597a979305
 DIST kdav-6.7.0.tar.xz 68028 BLAKE2B 5ec7e0b32350c0cc0fe5156b9afe903551085ea58932b9dfeab3f34f29f63748a2c3eee5f06c19e24dfa77ff79908f5456b9c19522d3a7712deae29b9ad271ca SHA512 db691aa2b3a3afbb999816e439ab24ee923cfd3436c174a578c655550789695f58b563baaeaa933b74bcea38b591b721b412aad3d25b3da4a8df696daa56c424
 DIST kdav-6.9.0.tar.xz 68208 BLAKE2B c0113cb23c4c710779e3fcf03a4a799c620ad2dd4f775ff5cc85db894c61c191d8f826125c31b5a7c487db767d67424afe9bdeffce843067693ef149528cb6cf SHA512 1f198f4f10d5a4c2afc5a955b811f15f469f6cb12544271f961556ae26f920982b8d80e8020ef1243dfb1cd5fd50580fb05b53f2bc8e2e2b0a9452131e2757f1
diff --git a/kde-frameworks/kdav/kdav-6.10.0.ebuild b/kde-frameworks/kdav/kdav-6.10.0.ebuild
new file mode 100644
index 000000000000..297c12f9fe09
--- /dev/null
+++ b/kde-frameworks/kdav/kdav-6.10.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="DAV protocol implemention with KJobs"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,xml]
+	>=kde-frameworks/kcoreaddons-${KDE_CATV}:6
+	>=kde-frameworks/ki18n-${KDE_CATV}:6
+	>=kde-frameworks/kio-${KDE_CATV}:6
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	# bug 616808: requires D-Bus
+	kdav-davitemfetchjob
+	# bug 653602: mimetypes unsupported
+	kdav-davitemslistjob
+	# bug 765061
+	kdav-davcollectionsmultifetchjobtest
+)
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 9cee0716588b..cbf6bcea5141 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,3 +1,4 @@
 DIST kdbusaddons-5.116.0.tar.xz 48932 BLAKE2B 06cdb322d5951c6d0af5b1b02e9d6adcd51b96f4e241728ed25d28b94cebfea702e95f6123d0d6dae23cae148fe60703f7235b2e494f098c73781ca319a55d82 SHA512 def33859b260b1910769ae241788c2e3adb85003014989415d3127629667a6e7f149519ae1ebed2e91d4db7d2e9d1792db0fbae46c91a163f07b456387a02993
+DIST kdbusaddons-6.10.0.tar.xz 46068 BLAKE2B ae8d8547acd80ad8acfd4d46144d5976f6bf439b7e536f4d1dae985f5a9e4b79145fced043829e84e58e9f5188c9f3bfb3e7ba8cc8ad898ed2178aecb6fbc79f SHA512 7a702701cbc1922474adce3c6baa674b5c468f59770f182de3c96b32f293bce744718650f5d1a7efc9c0ba485f5743e002cba6bfe8dd7893565b1765e7d22523
 DIST kdbusaddons-6.7.0.tar.xz 46124 BLAKE2B 50743928fb406605075a769895f4cb9bcb6f5d0cb464f68fa32ea383c90b1dfa676f47fff84cca79ff17b5dab424d633f1420e4f23004d6ec1efc7f3067fd3da SHA512 56e05e55c1c18f2c7faf61bc89a3da0afa67c98f6c52c1a9d1facbf74761ad567199b7ccd815548dc7fa0ea9f1546058b0774445cfe5bec967d0474eb25f1ae8
 DIST kdbusaddons-6.9.0.tar.xz 46060 BLAKE2B 34ef3d26008b15c6669b27dd37074526efd54751ec679bfe9c31865431e7a2d06d6e3e92efe414313b2168ef574ed41a7c7b9ce4a6c063c1ab307d7c33e20be1 SHA512 f148ec3b1c331edfa5d52734263d8984c17a55ad816f17e4c9a7607c7260b773a1f69f49c93ae55bec9d954d4d4bf6cc38907e3f0466aea98cc1a5ade538606f
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-6.10.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-6.10.0.ebuild
new file mode 100644
index 000000000000..f9023a5dde7b
--- /dev/null
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-6.10.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+VIRTUALDBUS_TEST="true"
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for registering services and applications per freedesktop standards"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus]
+	X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui,X] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_X11=$(usex X)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 3f82fdb90bf2..5e5851561218 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,3 +1,4 @@
 DIST kdeclarative-5.116.0.tar.xz 2492824 BLAKE2B 118ed6f9151ea2545282593b5e95250a708e1aae3c124aa3a49ce1e428d87fa4d4a771788a4ff628e87e39d3ddcd5e506664608b35be957241fb0f88b04f230b SHA512 6118cfc64c5a600cead31deaab79e7e60fef9c24ce5d4b163b581e1bae617979069e1a00cfc610a1e4b3fb80c9ff77fa5b34dace836d1d5326dfc31a2482d4bc
+DIST kdeclarative-6.10.0.tar.xz 2430616 BLAKE2B 5a87fd4989a388bd437976ec579d6c0a47a75a32db69ed0ea857265a105cdaef5ef37312fd3e483140e7a52e6b07d668bb2994803b096729126302f2e9ba2a1c SHA512 9dc02e307cafd11cf1d7ce1d0b2da508f840d318da11f74b45a5f6a05341192f8b74ca05c917573b015123b4e1b95e5eb54def086a16532b751843eef49266e1
 DIST kdeclarative-6.7.0.tar.xz 2430348 BLAKE2B d360e1ed6e88636d327af9b94741961d2de3d84d330f3e61031766757d50dcaea3a98456c62e8c7147a959d415a1fc87fc3f5693e84186654b0c57122d7ba0da SHA512 30e37122da6c66527ceca83960bb76ec795a49df33e561316cb97df1fafd2801a1627525b4acbde7eb414d6acc0b72d30d4f5b012bd74c589eaddd69e4c30634
 DIST kdeclarative-6.9.0.tar.xz 2430796 BLAKE2B 19dd71c7c1f8041343b44bc1473a9f173256c56beb0c635fd604af6ef30dd1b10ade80d5614e1f2e614430a936e9625ac18c10d9a6b800e8b08ca4661e72b72f SHA512 0b2553e6c7fcbf4d72cf74b3bf0c1615df437c9c7f56fcc59b347857a03cd10090524997f7fb15ccdf2abfa563795859f5890884dbadef10034e8c3b3dfe9d76
diff --git a/kde-frameworks/kdeclarative/kdeclarative-6.10.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-6.10.0.ebuild
new file mode 100644
index 000000000000..d9ce9f6cf98d
--- /dev/null
+++ b/kde-frameworks/kdeclarative/kdeclarative-6.10.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing integration of QML and KDE work spaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/kglobalaccel-${KDE_CATV}*:6
+	=kde-frameworks/kguiaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kservice-${KDE_CATV}*:6
+	=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 8fc28e067fdb..41c25cd520d9 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,3 +1,4 @@
 DIST kded-5.116.0.tar.xz 41064 BLAKE2B 78650fdcb2175c868b5966e858edfac65ea18f3da1d36e07772c61c1ec3e357c40caa7ac496ac00e7906bd5201a70c82da1698ca911ce95cc47de58efa9a9695 SHA512 442c90ee2519363dc2e128a8cd6ef34e4e35944036476f98cdd2432a61ca72f8e235e40364a0aa3ced7f3528fa7b876ebfa297386b6f0397d0409faf2a908910
+DIST kded-6.10.0.tar.xz 34976 BLAKE2B 09bfa33965befd1b709eac00a5820027aa1fc236eb0e324a2eee0b466dad4c52fccc21ef818b355d03df422d022072dd224999736567b9b5cff1ffa60fd1dcd7 SHA512 89bc4ed4c65c0b5dc936080ac597b54e8d3c005152e71a213ea4363e9c88bad11c28a9385616992bfaaabbe0fddd0f6348d8b128c3723d843c59fa727a6e27c7
 DIST kded-6.7.0.tar.xz 34972 BLAKE2B 25e38393cbffd7fad6e1e22f1bb3d50bff16a9b30e3eb3e9729b649d4e3f8192ebc61343cadf0d94083206ed2bf9d8ea030d111b621e2de51c08a946f1a0c29f SHA512 f101a17ff95c67cca2c0dd6f090ec3d45b98f6436cdb42908451b35c7d8f9b94bd22d558a3ad7a4d80dcd9ef171c5634f287cb9c2f6ca158628068c6017dc80d
 DIST kded-6.9.0.tar.xz 34984 BLAKE2B 4bdc5321a3e139f834802bfed6aa3f00c51f7d83aefff5e03d4e3c040c9e99892a20394391019d1a7ddf460f97ca802c0b5d5faf339fd2cc3bcb0a7e6471bf9c SHA512 c134baeb7097b158ed49d14f009a45c3c6366e256e086fcd43a0a41db441471556bae302ede5ccf28332b4028935500e0f56eb20557e8aee10159ae0e17d047f
diff --git a/kde-frameworks/kded/kded-6.10.0.ebuild b/kde-frameworks/kded/kded-6.10.0.ebuild
new file mode 100644
index 000000000000..23031414e4a1
--- /dev/null
+++ b/kde-frameworks/kded/kded-6.10.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Central daemon of KDE workspaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+man"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	=kde-frameworks/kconfig-${KDE_CATV}*:6[dbus]
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/kcrash-${KDE_CATV}*:6
+	=kde-frameworks/kdbusaddons-${KDE_CATV}*:6
+	=kde-frameworks/kservice-${KDE_CATV}*:6
+"
+RDEPEND="${DEPEND}"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${KDE_CATV}:6 )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package man KF6DocTools)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
deleted file mode 100644
index 3cce90ae7f63..000000000000
--- a/kde-frameworks/kdelibs4support/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdelibs4support-5.116.0.tar.xz 3706116 BLAKE2B 35d8ab172c2993cd7f64b1075ddb882a78248383f23a0060889f782f3af65bf3cab9423af380b91e85236b2e8e3036040f6527a3ca7a7a8c309730e01a0d2283 SHA512 87cdc59da0fcaccc48012cf3c34ab3707c2eb159effd17e76b7c24a81feebebef3a27aa1d25dadfb0d5ee7efbc39b2fa7cafc6090476f5ec4cb8e9be616050be
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch
deleted file mode 100644
index 1165a531ab02..000000000000
--- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 720711e3a4e69bcc6447c928bea243a81a777a07 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 22 Nov 2020 00:25:06 +0100
-Subject: [PATCH 1/2] Drop KDE4_ADD_WIDGET_FILES macro and KF5DesignerPlugin
- dependency
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt                       |  1 -
- KF5KDELibs4SupportConfig.cmake.in    |  1 -
- cmake/modules/FindKDE4Internal.cmake |  4 ----
- cmake/modules/KDE4Macros.cmake       |  2 --
- src/CMakeLists.txt                   | 19 -------------------
- src/KDEUIMacros.cmake                | 25 -------------------------
- 6 files changed, 52 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a60c88a4..2a432591 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,7 +26,6 @@ find_package(KF5Completion ${KF_DEP_VERSION} REQUIRED)
- find_package(KF5Config ${KF_DEP_VERSION} REQUIRED)
- find_package(KF5ConfigWidgets ${KF_DEP_VERSION} REQUIRED)
- find_package(KF5Crash ${KF_DEP_VERSION} REQUIRED)
--find_package(KF5DesignerPlugin ${KF_DEP_VERSION} REQUIRED)
- find_package(KF5GlobalAccel ${KF_DEP_VERSION} REQUIRED)
- find_package(KF5DocTools ${KF_DEP_VERSION} REQUIRED)
- find_package(KF5Emoticons ${KF_DEP_VERSION} REQUIRED)
-diff --git a/KF5KDELibs4SupportConfig.cmake.in b/KF5KDELibs4SupportConfig.cmake.in
-index 3de7d530..4fe2369e 100644
---- a/KF5KDELibs4SupportConfig.cmake.in
-+++ b/KF5KDELibs4SupportConfig.cmake.in
-@@ -11,7 +11,6 @@ find_dependency(KF5Archive "@KF_DEP_VERSION@")
- find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@")
- find_dependency(KF5CoreAddons "@KF_DEP_VERSION@")
- find_dependency(KF5Crash "@KF_DEP_VERSION@")
--find_dependency(KF5DesignerPlugin "@KF_DEP_VERSION@")
- find_dependency(KF5DocTools "@KF_DEP_VERSION@")
- find_dependency(KF5Emoticons "@KF_DEP_VERSION@")
- find_dependency(KF5GuiAddons "@KF_DEP_VERSION@")
-diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
-index 7e252a70..b9636036 100644
---- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -179,10 +179,6 @@
- #    Use optional USE_RELATIVE_PATH to generate the classes in the build following the given
- #    relative path to the file.
- #
--#  KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
--#    Use this to add widget description files for the makekdewidgets code generator
--#    for Qt Designer plugins.
--#
- #  KDE4_ADD_PLUGIN ( name [WITH_PREFIX] file1 ... fileN )
- #    Create a KDE plugin (KPart, kioslave, etc.) from the given source files.
- #    If WITH_PREFIX is given, the resulting plugin will have the prefix "lib", otherwise it won't.
-diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake
-index ca868ad9..27bb28f9 100644
---- a/cmake/modules/KDE4Macros.cmake
-+++ b/cmake/modules/KDE4Macros.cmake
-@@ -10,7 +10,6 @@
- # KDE4_ADD_KDEINIT_EXECUTABLE
- # KDE4_ADD_UNIT_TEST
- # KDE4_ADD_EXECUTABLE
--# KDE4_ADD_WIDGET_FILES
- # KDE4_UPDATE_ICONCACHE
- # KDE4_INSTALL_ICONS
- # KDE4_REMOVE_OBSOLETE_CMAKE_FILES
-@@ -486,7 +485,6 @@ include("${KF5Auth_DIR}/KF5AuthMacros.cmake")
- include("${CMAKE_CURRENT_LIST_DIR}/KDECoreMacros.cmake")
- include("${CMAKE_CURRENT_LIST_DIR}/KDEUIMacros.cmake")
- include("${KF5DocTools_DIR}/KF5DocToolsMacros.cmake")
--include("${KF5DesignerPlugin_DIR}/KF5DesignerPluginMacros.cmake")
- 
- # functions deprecated, they still should work
- macro (KDE4_AUTH_INSTALL_ACTIONS)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index cb8a3c2d..70829dd6 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -371,25 +371,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES
- )
- 
- 
--########## Designer plugin
--
--kf5designerplugin_add_plugin(kf5deprecatedwidgets
--    kdedeprecated.widgets
--    kdedeprecated.qrc
--    classpreviews.cpp
--)
--
--target_link_libraries(kf5deprecatedwidgets KF5::KDELibs4Support
--                                    Qt5::Widgets
--                                    Qt5::Designer
--                                    KF5::ConfigCore
--                                    KF5::Completion
--                                    KF5::WidgetsAddons
--                                    KF5::Auth
--                                    )
--
--install(TARGETS kf5deprecatedwidgets DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/designer)
--
- ##########
- 
- add_subdirectory(pics)
-diff --git a/src/KDEUIMacros.cmake b/src/KDEUIMacros.cmake
-index 1570df34..e255960d 100644
---- a/src/KDEUIMacros.cmake
-+++ b/src/KDEUIMacros.cmake
-@@ -163,31 +163,6 @@ macro (KDE4_INSTALL_ICONS _defaultpath )
- endmacro (KDE4_INSTALL_ICONS)
- 
- 
--set(KDEWIDGETS_MAKEKDEWIDGETS_EXECUTABLE ${KF5DESIGNERPLUGIN_GENERATOR_EXECUTABLE})
--set(_KDE4_MAKEKDEWIDGETS_DEP ${_KF5DESIGNERPLUGIN_GENERATOR_EXECUTABLE_DEP})
--macro (KDE4_ADD_WIDGET_FILES _sources)
--   foreach (_current_FILE ${ARGN})
--
--      get_filename_component(_input ${_current_FILE} ABSOLUTE)
--      get_filename_component(_basename ${_input} NAME_WE)
--      set(_source ${CMAKE_CURRENT_BINARY_DIR}/${_basename}widgets.cpp)
--      set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}widgets.moc)
--
--      # create source file from the .widgets file
--      add_custom_command(OUTPUT ${_source}
--        COMMAND ${KDEWIDGETS_MAKEKDEWIDGETS_EXECUTABLE}
--        ARGS -o ${_source} ${_input}
--        MAIN_DEPENDENCY ${_input} DEPENDS ${_KDE4_MAKEKDEWIDGETS_DEP})
--
--      # create moc file
--      qt5_generate_moc(${_source} ${_moc} )
--
--      list(APPEND ${_sources} ${_source} ${_moc})
--
--   endforeach (_current_FILE)
--
--endmacro (KDE4_ADD_WIDGET_FILES)
--
- # adds application icon to target source list
- # 'appsources' - the sources of the application
- # 'pngfiles' - specifies the list of icon files
--- 
-2.30.0
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch
deleted file mode 100644
index 8614a8490222..000000000000
--- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b51d32df6a89e559871469178de1c6fd8c8a2882 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 22 Nov 2020 00:27:55 +0100
-Subject: [PATCH 2/2] Drop Qt5Designer dependency
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt                          | 2 +-
- cmake/modules/ECMQt4To5Porting.cmake    | 1 -
- cmake/modules/FindQt5Transitional.cmake | 1 -
- 3 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2a432591..e503999d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,7 +20,7 @@ include(GenerateExportHeader)
- include(CMakeFindFrameworks)
- 
- set(REQUIRED_QT_VERSION 5.15.2)
--find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer)
-+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport)
- 
- find_package(KF5Completion ${KF_DEP_VERSION} REQUIRED)
- find_package(KF5Config ${KF_DEP_VERSION} REQUIRED)
-diff --git a/cmake/modules/ECMQt4To5Porting.cmake b/cmake/modules/ECMQt4To5Porting.cmake
-index 4204fa54..01b8f995 100644
---- a/cmake/modules/ECMQt4To5Porting.cmake
-+++ b/cmake/modules/ECMQt4To5Porting.cmake
-@@ -160,7 +160,6 @@ set(_qt_modules
-   DBus
-   Network
-   Test
--  Designer
-   Concurrent
-   Xml
-   UiTools
-diff --git a/cmake/modules/FindQt5Transitional.cmake b/cmake/modules/FindQt5Transitional.cmake
-index df354fc6..68fa6d47 100644
---- a/cmake/modules/FindQt5Transitional.cmake
-+++ b/cmake/modules/FindQt5Transitional.cmake
-@@ -6,7 +6,6 @@ if (Qt5Core_FOUND)
-       Core
-       Gui
-       DBus
--      Designer
-       Declarative
-       Script
-       ScriptTools
--- 
-2.30.0
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.116.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.116.0.ebuild
deleted file mode 100644
index d76a8b156bcf..000000000000
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.116.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="true"
-ECM_HANDBOOK_DIR="docs"
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.9
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="networkmanager X"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/openssl:0
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	>=kde-frameworks/kded-${PVCUT}:5
-	=kde-frameworks/kdoctools-${PVCUT}*:5
-	=kde-frameworks/kemoticons-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5[X?]
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kunitconversion-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	virtual/libintl
-	networkmanager? ( net-misc/networkmanager )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/countryflags-${PVCUT}:5
-	=kde-frameworks/kinit-${PVCUT}*:5
-	=kde-frameworks/kitemmodels-${PVCUT}*:5
-"
-BDEPEND="
-	dev-lang/perl
-	dev-perl/URI
-"
-
-PATCHES=(
-	# downstream patches
-	"${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch" # bug 755956
-	"${FILESDIR}/${PN}-5.86.0-unused-dep.patch" # bug 755956
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use handbook; then
-		sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
-	fi
-
-	cmake_run_in src cmake_comment_add_subdirectory l10n
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_X11=$(usex X)
-		$(cmake_use_find_package networkmanager NetworkManager)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdelibs4support/metadata.xml b/kde-frameworks/kdelibs4support/metadata.xml
deleted file mode 100644
index 506ecf605bc4..000000000000
--- a/kde-frameworks/kdelibs4support/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
-	</upstream>
-	<slots>
-		<subslots>
-			Must only be used by packages that are known to use private parts of the Frameworks API.
-		</subslots>
-	</slots>
-</pkgmetadata>
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index b0bb86ccf45c..06d8944554ff 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,3 +1,4 @@
 DIST kdesu-5.116.0.tar.xz 57072 BLAKE2B 6891406ddfba6caa6bbf0e5a476b99632e261d884cf882977225eb6876eef261a2f1b9a01cbbcbcb05be811500f6c0e4b387ad066e899a71277c717f57c514a1 SHA512 6426e65af37b4bec97ef2e93a48de25fe2e5d99fa4a4f8da850a6ed91ef428933062ca81455a91f4604fa8552dd0fe46ef835a4408e91a05e4609b09864a25cf
+DIST kdesu-6.10.0.tar.xz 56640 BLAKE2B a4838eb18351480db5fee817543fddfbb03191c611b003da1a362404e399904f1dd0ae4557f2156c2c58ad11aae71ea3d5835da1391db7c9543bb9633d02ce52 SHA512 2a432098fac6b415c2547053c13b5f12f828e8084a4cf73df88af2578c86d1f354e2564ce991d37781f26343f071c387b62294493aa31d7c8d134fef807038e5
 DIST kdesu-6.7.0.tar.xz 56636 BLAKE2B 070b61c9ca6e91323c9e18cc0ead41ffd096853a2ca9b48ca33543e8ce36518d0b2e4c516bc7afa2a2fe3ab5b6ae7f0acaf5d402a07f15e11dbda7db5ed90dfe SHA512 89395bf07e36547ffbe455a996571ee996dec672539a9fa76ff47c5086f7f5b5c187efc77bfcc050ee5db31715a9ab50dd3c200fa610159dff509a779754dddb
 DIST kdesu-6.9.0.tar.xz 56676 BLAKE2B b7b2b5ccc1cb193fecff14014772a349d64d3b99908c9f8548c967c726f38bfe37e367202e7327eb4bd8126161b4ddbb026c92001f90e1fd12cdb86c4dcc13f0 SHA512 6eaa4d7fadb85c58e950040de196f69bc06b048a30dcf92e3ecf7e0f3963c1116da2fe166692f04b2f34728226004cf7fc4ea28cd8dcf0ea04a535fa574572bc
diff --git a/kde-frameworks/kdesu/kdesu-6.10.0.ebuild b/kde-frameworks/kdesu/kdesu-6.10.0.ebuild
new file mode 100644
index 000000000000..1ed73fea24c8
--- /dev/null
+++ b/kde-frameworks/kdesu/kdesu-6.10.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework to handle super user actions"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+RDEPEND="
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kpty-${KDE_CATV}*:6
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index 6517988c56c3..dabfc8fee93f 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,3 +1,4 @@
 DIST kdnssd-5.116.0.tar.xz 2280644 BLAKE2B 38468ea7c4b31787c2eb41ab5a930c2a44138d3cb5492df33748ce7ad80afd462604d6de433a5c23e2070c17ca8abed9427674c33064a841e9aa3d4836bcbf3e SHA512 542b6ff05ea2d0d43b8563136254f54e690fb561b270517df00158e53a5a2eda23e5371292256cd3f3aae0ee108c8d5cd4f611ac1aa22c259ee80b4815850121
+DIST kdnssd-6.10.0.tar.xz 2269536 BLAKE2B 772a97d74bf5029ce0bad42ef8bb105a00baf8c51aca458dcf07758a71c3f3f6a191ee3007852c13abec40805be53da9aed0180048c6cfa853cf472237ea7ec9 SHA512 5185d1afbbe5c3e66c60fe684bcd33b34f1c7f83e83f407e1b99f529862c3641808eebb239663d19b595feaf5f99d0dccd7ebf644830dedbef780c918ddc39ef
 DIST kdnssd-6.7.0.tar.xz 2269744 BLAKE2B 7069ed95f3f5b9f3b1a530a7e48563a60b2216ca5ec6fe0f906ec38b05160615bea3a73a0257bc465cd463887729807c7c6211c1075ac72a3cf38e37471d94a3 SHA512 d829ede75337b9c97139f2ec2cf82198246446f46a6a14f9acdea3e693290d89cd7b00f4198889be17fe6fd09ad857c880a9850a468b0365ebb7cc406fbcefc0
 DIST kdnssd-6.9.0.tar.xz 2269092 BLAKE2B 8ccd1bc5e6337c05119221b45d1ce32c686b1751ce4565472f5f86a56e309f8f1cdde11539791158e65a0c34addf643c858bad76b8c6612fd34d96680e3ee19e SHA512 e39fede7091cf5f53b7afabd83e43abfa65a222a2c6ea068ab3b9b5f1cc0d7f70d2eda5a703d86597630c1062fc325f28f9982e5d4713d0e141d8189bab516ab
diff --git a/kde-frameworks/kdnssd/kdnssd-6.10.0.ebuild b/kde-frameworks/kdnssd/kdnssd-6.10.0.ebuild
new file mode 100644
index 000000000000..7c985c5ef3b6
--- /dev/null
+++ b/kde-frameworks/kdnssd/kdnssd-6.10.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for network service discovery using Zeroconf"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="zeroconf"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[network]
+	zeroconf? (
+		>=dev-qt/qtbase-${QTMIN}:6[dbus]
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package zeroconf Avahi)
+	)
+	use zeroconf || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON )
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 4936a21ad5a4..3b45202d9a5d 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,3 +1,4 @@
 DIST kdoctools-5.116.0.tar.xz 465400 BLAKE2B cc4292a871272b72ec1fc4c4d96e9d6ed796c8959198f3c19448527fb01b03a6e539232989adcd46296a9b589bbcaeb2b29bbe14a2e3a0aec2bc4499533b53cf SHA512 06a9d79f5e449ae606f6c5dba20038ad60202c908bb0f7f1dbc8bb3a955db5b6b34e4caa453a7b562d744f30faa62574425d78552b497227d4b5ca8eac3adaab
+DIST kdoctools-6.10.0.tar.xz 458740 BLAKE2B f056d0d3a47a94166a1803fd0ea5f04ecf2453baee551658f05c2153cefb158e956ceca67c890893ab9337224721d780b3793c7c843da7f4a6911d0d4690c93f SHA512 952a095bee0a189549ddd89b37c0b22b28d1e64a5408a02e97e3465a33dddd706e7423721147f4833329ea8f60c643fd4fee5ee57209e89950ea44e2044f3486
 DIST kdoctools-6.7.0.tar.xz 458392 BLAKE2B 2a19ac6cfc4e5e6bcd8c08eb670610b6f69143227741c8752b78bbe60318467da6f312ef72e710db9f70fd8b0070bb28f56edc8ced5896483606c9a3196bf437 SHA512 1ec5574fb3da3a4762331c8d00d77a117d1170865fd9053b6e45c6ba80388549745bb862a9996685a7f23d15bb93a5a1143ad768be8d065cb1009ea5100bbff3
 DIST kdoctools-6.9.0.tar.xz 458672 BLAKE2B 44b6f045edf4b06bd8794d768f192a1053674ff326ee946c8038c96b1af702ef750d057b55deea13c59f1f02fb7dc0e9017b7c9c651abc8dc5a3ebb8c51d6358 SHA512 0c995038c5e35589e8b460f216d5f4a4b46422c7f901e0682804fe40647dfde1c17c8024d3396ba319e1c059b8c0072d9a1d1151d670dec62595771249d83c1a
diff --git a/kde-frameworks/kdoctools/kdoctools-6.10.0.ebuild b/kde-frameworks/kdoctools/kdoctools-6.10.0.ebuild
new file mode 100644
index 000000000000..26b73e24597a
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-6.10.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="nls"
+
+DEPEND="
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	app-text/sgml-common
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	=kde-frameworks/karchive-${KDE_CATV}*:6
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-perl/URI
+	nls? ( >=kde-frameworks/ki18n-${KDE_CATV}:6 )
+"
+
+CMAKE_SKIP_TESTS=(
+	# bug 665622
+	kdoctools_install
+)
+
+PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package nls KF6I18n)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
deleted file mode 100644
index 6306e457afca..000000000000
--- a/kde-frameworks/kemoticons/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kemoticons-5.116.0.tar.xz 1700844 BLAKE2B d7f99cc648d9f09b468d2c8f6783155198a90161bd0c78414e7c2cc1859fbed8fbb14d01aae2739e5e3589e872d0f0ad02ebf350dbcf389bbb22fedb01b2d88f SHA512 9bf1c7f1c7b0d61a43d12b3af58707d61f3f3ae0f1d817db0e34db6ca25eb8d33a7780d218a44e57b4974e5683e3e26126b45e74a4c8eb764df2cb3d900b27f9
diff --git a/kde-frameworks/kemoticons/kemoticons-5.116.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.116.0.ebuild
deleted file mode 100644
index 350625768951..000000000000
--- a/kde-frameworks/kemoticons/kemoticons-5.116.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.9
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Framework for converting text emoticons to graphical representations"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE=""
-
-# requires running kde environment
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kemoticons/metadata.xml b/kde-frameworks/kemoticons/metadata.xml
deleted file mode 100644
index 506ecf605bc4..000000000000
--- a/kde-frameworks/kemoticons/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
-	</upstream>
-	<slots>
-		<subslots>
-			Must only be used by packages that are known to use private parts of the Frameworks API.
-		</subslots>
-	</slots>
-</pkgmetadata>
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 6daeb007362e..835dec8f46b8 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,3 +1,4 @@
 DIST kfilemetadata-5.116.0.tar.xz 527164 BLAKE2B 9562f6e4d135cc0686fe12c4748198e94ea5d10dc0f52ad72c83cdb33d9a3ef04efe885bd1af94405eedf05fe36e1f20eadd449d1d1228e92b74878db963f75a SHA512 1c5d264ad2bc123ba0d85882461009efc10c268441e33f82810823d1e2c6fb30209336542b4e2c1eabb96b53cc9184fc3982c27922872a9b92cac38bafe2da0e
+DIST kfilemetadata-6.10.0.tar.xz 598076 BLAKE2B 234d4ac70df34a28b870c72f17336e5371fd4994e8b00414c9be4ae49b2cdb0a513f034aef7cb18dcb38f14116793d6397f21b3ab5e4cb1d968f294c353e2abb SHA512 999ac67d34fa68222c2533235ce96716a9a365dfd1d49666db44d7b2d363208c73b8e2fdc2bc67eb151b77789af05f16e786494e9675d6094440bb901e1f1ce7
 DIST kfilemetadata-6.7.0.tar.xz 594612 BLAKE2B a6a022d8fe3424759cf1522d8eb74336a106639a4a65e86dab637753fb0d6eeecfc3197bd831725f3105ba1f7c6750c42b3442588a180ea119c4f47bf71bd527 SHA512 87262420e8358bb7a932ca9f0cfa99574c2beeba3c6277b0e6ff85bd0fd82366445b1c1224735fbf736965127658a8800522378bcc112a90270029f120c9198a
 DIST kfilemetadata-6.9.0.tar.xz 595176 BLAKE2B eeca05c906deb326e7070e05391fcfd85a028369a6d7fcd92628ae47b7f6df69140289fdd5978d386fa99d6cca3db4506cfdc93aa228122b878312ada6ed3641 SHA512 344168f5a8821f9d85a1479352347d829fab6593c5cf08dacb885792214457fda4e8c6bc31565ad12c50c59b07bf21ae73e7e347575075592ec26f5b8369c937
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-6.10.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-6.10.0.ebuild
new file mode 100644
index 000000000000..f10fa05bec12
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-6.10.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org optfeature python-any-r1
+
+DESCRIPTION="Library for extracting file metadata"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="epub exif ffmpeg mobi pdf taglib"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,xml]
+	=kde-frameworks/karchive-${KDE_CATV}*:6
+	=kde-frameworks/kcodecs-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	epub? ( app-text/ebook-tools )
+	exif? ( media-gfx/exiv2:= )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	mobi? ( kde-apps/kdegraphics-mobipocket:6 )
+	pdf? ( app-text/poppler[qt6(-)] )
+	taglib? ( media-libs/taglib:= )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? ( sys-apps/attr )
+"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+CMAKE_SKIP_TESTS=(
+	# FIXME: bug 644650, fails on tmpfs (but not for everyone)
+	usermetadatawritertest
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package epub EPub)
+		$(cmake_use_find_package exif LibExiv2)
+		$(cmake_use_find_package ffmpeg FFmpeg)
+		$(cmake_use_find_package mobi QMobipocket6)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package taglib Taglib)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Microsoft Word/Powerpoint file indexing" app-text/catdoc
+		optfeature "Microsoft Excel file indexing" dev-libs/libxls
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index e0d6011efe63..091a67ac782f 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,3 +1,4 @@
 DIST kglobalaccel-5.116.0.tar.xz 2305972 BLAKE2B f5243fc4f539ef5f8877114e1fd5854c98adc747cc7509c8f3ea4285b85680b06ebd230160c988591beaa0f05ff5c0983eb9c577e8bb4ca450396a337f0a8875 SHA512 76420eb2fa026c0770b8f78c9ff0780056e2126aa4b6efdeb023faf306e7068781fb2885e0fff2d6f47475a73ca01fdf137f329701c7f240bc03f485daafbbeb
+DIST kglobalaccel-6.10.0.tar.xz 2294700 BLAKE2B 611f8d5542ea1b1de34f4d4a8889b56d70748950d2b05fcbfb1f2b72428a5b164950bdd6eab583afa96c56e94c2e965a66eb1514c4b4712b62352872bb8282ac SHA512 8e4101bc5d33df9516954498ca48a5ab17110b4cb46475551117e4b8a0a5c74207f2eac644072b09bc7518a064021243da8a992f9fb278361b13bacfc21caad1
 DIST kglobalaccel-6.7.0.tar.xz 2294660 BLAKE2B 21e1537032e8e37380fe30dea4a6d9179ffbcd115cfa8c568ac01eb9581db639cfc6fd0572b0b023d115e668461e00736cb7049fb5fe7a747a15e827deb388e4 SHA512 c97897ceebea5225719389724b21134c3ee6041999b2242b1de47a6540b0679535b8b82a08176a73a9f16a9279590a02394f3db1275891c8f04eaa0a90c22fa4
 DIST kglobalaccel-6.9.0.tar.xz 2294796 BLAKE2B 54854594f91774c2ef8828e7bf77c1e9d9ece3f7337260aae8ad36f33f6142e57f3d8b4baa057afb18f7c2f16ae97ca638a406c65807dc227a5b40b537602658 SHA512 10a16554ef8b2fbb0f886b6e24b0df3e27e9e8af90368263fc049ca3f8b351f11831ad4bb29d48e0b8d7557c34765c31b065a5654d78c87cf3b15572b130878b
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-6.10.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-6.10.0.ebuild
new file mode 100644
index 000000000000..0f144ec168fe
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-6.10.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework to handle global shortcuts"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+# slot op: WITH_X11 uses Qt6::GuiPrivate for qtx11extras_p.h
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	X? ( >=dev-qt/qtbase-${QTMIN}:6=[X] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index c44eb301c4fd..91e760b2c0fd 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,3 +1,4 @@
 DIST kguiaddons-5.116.0.tar.xz 78472 BLAKE2B 5ebfeeda5ce828dbfb8ca6ccabd35b3a3e67fda861d82e2da7f2d7ff6050ec449c03cf4c09a5407a9955a1f905e369fbdb1badd324e3d37ab95d184037089c7d SHA512 6a09bd6b7a3142827e9e44b1526daf945b6b777d091e0c7926fb48604c1ca586c6acc3282b5c8cabec24fba0be3c78e32141ea3307c79d84465718222bd8af04
+DIST kguiaddons-6.10.0.tar.xz 86304 BLAKE2B ca37743ab51e1321e6ebd6b45413eb5f0602df428b4b3e69e66a38ca5fba7e1a45b4537562e2738d43f11c5fff0aff0e34357a437b18a587051182863d9c84fe SHA512 c28b6708d0d32c8c1a9ed6e10a12e42cf832a98b10855552b8b2fcab5d8b50423c5ebbb8a34f196408fd13a1f3c9755a0ac6c5fa8eb377d2e48b503a9979b149
 DIST kguiaddons-6.7.0.tar.xz 84996 BLAKE2B edccbaef983b8056b37343e1394b21f17b5a2a6755ea4e8e769164a254ad1551bfe523fab27d305380e4019dcfa35f50b5e165dcc2417651e7b8021d61630b4a SHA512 673bc8dca39ec8149c73f3b8f08e401b7590f1dd6cf341dfb018f32c03da4cf8e816478dc6ca239ff7329255484a1b18e9612bd01c387a1558ec251063d3ff01
 DIST kguiaddons-6.9.0.tar.xz 86228 BLAKE2B 401b190912622ce170b9ce89e3b85282908e087c4d5b3dbf7fe73d89d8ab474d0f52777d51126455a21a88ef5fb2c6b3926d2dd9b0508f1bbc84c28b360dd0e9 SHA512 f0ecef4830eb09f963cdfcad9de3044da861dc67bcc7f33861b84cd35299ffb707a2a12d37f68feb0a347ad5178ff1f88e52adea73454a70b9846c40e4b3743c
diff --git a/kde-frameworks/kguiaddons/kguiaddons-6.10.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-6.10.0.ebuild
new file mode 100644
index 000000000000..b3cef27afc75
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-6.10.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_PYTHON_BINDINGS="off"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org xdg
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="dbus wayland X"
+
+# slot op: includes qpa/qplatformnativeinterface.h
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus?,gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	wayland? (
+		dev-libs/wayland
+		>=dev-qt/qtbase-${QTMIN}:6=[wayland]
+		>=dev-qt/qtwayland-${QTMIN}:6
+	)
+	X? (
+		>=dev-qt/qtbase-${QTMIN}:6[X]
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	wayland? ( >=dev-libs/plasma-wayland-protocols-1.15.0 )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libxcb
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
+BDEPEND="
+	wayland? (
+		>=dev-qt/qtwayland-${QTMIN}:6
+		dev-util/wayland-scanner
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GEO_SCHEME_HANDLER=ON
+		-DUSE_DBUS=$(usex dbus)
+		-DWITH_WAYLAND=$(usex wayland)
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kguiaddons/kguiaddons-6.7.0-r1.ebuild b/kde-frameworks/kguiaddons/kguiaddons-6.7.0-r1.ebuild
index f6c0a76675d6..ece7fd6ba26a 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-6.7.0-r1.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-6.7.0-r1.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
@@ -36,7 +36,12 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!${CATEGORY}/${PN}:5[-kf6compat(-)]
 "
-BDEPEND="wayland? ( >=dev-qt/qtwayland-${QTMIN}:6 )"
+BDEPEND="
+	wayland? (
+		>=dev-qt/qtwayland-${QTMIN}:6
+		dev-util/wayland-scanner
+	)
+"
 
 PATCHES=( "${FILESDIR}/${P}-dont-access-QDBusMessage.patch" ) # bug 944927
 
diff --git a/kde-frameworks/kguiaddons/kguiaddons-6.9.0-r1.ebuild b/kde-frameworks/kguiaddons/kguiaddons-6.9.0-r1.ebuild
index 8a4abc5d7402..4a49b2f5766f 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-6.9.0-r1.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-6.9.0-r1.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
@@ -37,7 +37,12 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!${CATEGORY}/${PN}:5[-kf6compat(-)]
 "
-BDEPEND="wayland? ( >=dev-qt/qtwayland-${QTMIN}:6 )"
+BDEPEND="
+	wayland? (
+		>=dev-qt/qtwayland-${QTMIN}:6
+		dev-util/wayland-scanner
+	)
+"
 
 PATCHES=( "${FILESDIR}/${P}-crashfix.patch" ) # KDE-bug 497457
 
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index 71a38bd53bb8..c2b21a60971c 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,3 +1,4 @@
 DIST kholidays-5.116.0.tar.xz 256892 BLAKE2B cce479f01963b41272821ab4ef016eaed4ef4b4248a83f7afa0f05f74fca9a683da709b46f88847e367924a5df9ea7f3f6f7d9b5a05e4f9127c824d66b70e3af SHA512 b12c7a4fd427992d94a79d87d077cf0fbcbd790046ded27afa95b7aaeed1fb0826ec544b555516d7e6dc451577674e6f3151dc0ff80890a3e10753dbc5b861fa
+DIST kholidays-6.10.0.tar.xz 256368 BLAKE2B fd273241e121a09b4ce9ab8c19a72f82883d9b0d6b95d0b899c64045c63238148dde9f029a1a775bd9438fdd377289d7a5dc841df637d1bd658d35c13fc24a53 SHA512 7dd00f18b6f946e0df3584e7b8194ae4cbec74b9cf2c334aac1035a4e5cd9add85a8d2d9354817205412059f4e41d0527a9c7b2fdbed1863508544efcfa0de50
 DIST kholidays-6.7.0.tar.xz 255036 BLAKE2B 5b18435d4538b7347607beb11ad6574b824acb54633cefe5808f1a98c47e5df547c2dee9492c4db9916053f3c58e1c9416aa05505e0d238357e9593ec2d69f77 SHA512 7180b785d3957501c126ed7c9233ddc702c62ea9af0e1c49ce932e1ee219727520f77a214b5ab752c71a3b5325d6541b13da974303290fe1719e7a024513da7c
 DIST kholidays-6.9.0.tar.xz 255332 BLAKE2B 21ab66d689c722dce87fceba3e2872f5bd7636e80fef44ded60c7d5b826e6dd4fb355096a6caaa58149006500e219770ce2b2e801409ce2e88dc7df557bb4fb8 SHA512 02f8041a94812d4f3652a77e9f572e0d2acd3b56629ce4391ceed6b49f32a77406c29784d060f056d2b398e2da6c551760c48fef4bacde5599ef692fb71ea37d
diff --git a/kde-frameworks/kholidays/kholidays-6.10.0.ebuild b/kde-frameworks/kholidays/kholidays-6.10.0.ebuild
new file mode 100644
index 000000000000..b83ee028a6e4
--- /dev/null
+++ b/kde-frameworks/kholidays/kholidays-6.10.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="true"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Library to determine holidays and other special events for a geographical region"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND=">=dev-qt/qtdeclarative-${QTMIN}:6"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+src_test() {
+	# bug 624214
+	mkdir -p "${HOME}/.local/share/kf6/libkholidays" || die
+	cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf6/libkholidays/" || die
+	ecm_src_test
+}
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 81c41ee1148c..0a053f9a2e1e 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,3 +1,4 @@
 DIST ki18n-5.116.0.tar.xz 3129628 BLAKE2B 21f24e6f4dbde362c16c3b8bd32e17409e52edd9d6598de460568597641879ae1cec7596199255948eb58a01c39874e0347c672179da851708d59019cb658004 SHA512 0932336e412c02e23241db11b4c7828f834accea58d6035b4affc3ecdbc7fd0e5a8901d41bf0812ac1cc2ea51ef4a9b3611e234619e77eaec110d8069d0cdbf0
+DIST ki18n-6.10.0.tar.xz 3112804 BLAKE2B 1cb7ed380f60ace60ef5ed6e90ba8d2eae99281533980327d3a6dfc4aaea97670d75887a9fd617ef068e828f3aedb432ae123ef12097622f2d9dfa015c662865 SHA512 7fc0cf301818f01d4d8c20913a38c759778251bee6d1cbf19af1616de584875b48d2c760e31f72111b3130905908a8f66a1038221c8ea271539471f4e057af1f
 DIST ki18n-6.7.0.tar.xz 3110224 BLAKE2B 3a753dbe1a3d4152309bbcb00bf76a2c7b0b79f622a359ced908acd75543555a667b2da2775ccfaf19c1251371f3c03f979393557226373ee1a058aab6d027f7 SHA512 2db078324611ee5dae34bcc844a4217fd38d9588fa1f5e63fb1dee6ca83d5d4ed1b8024e6ccf25b8e1e1d8a1d742a67dc78d60cef5669992b3741f7de3643d53
 DIST ki18n-6.9.0.tar.xz 3112836 BLAKE2B 9da1c9a35ceffb6f6f5ba5d3417315d2ef72b0e5d58cc1e84ea22ae0833c40ee7edca2072772d4f21a1f1a4f402fac098c93382af31103cecb3bdbd6b8ceadeb SHA512 6bc00181147bc4ccefe2368304c4a6da741fc22398cdc4288cab171ef6ecab38e8e77e5d125bd19e41c1a3cfc122a5a97511553049fba488130b0d634e54ac30
diff --git a/kde-frameworks/ki18n/ki18n-6.10.0.ebuild b/kde-frameworks/ki18n/ki18n-6.10.0.ebuild
new file mode 100644
index 000000000000..1e4aa121864a
--- /dev/null
+++ b/kde-frameworks/ki18n/ki18n-6.10.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org python-single-r1
+
+DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtbase-${QTMIN}:6[widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	sys-devel/gettext
+	virtual/libintl
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent] )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/iso-codes
+"
+
+CMAKE_SKIP_TESTS=(
+	# bug 876496
+	kcatalogtest
+	# requires LANG fr_CH. bugs 823816
+	kcountrytest
+	kcountrysubdivisiontest
+)
+
+pkg_setup() {
+	ecm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index cfae767d667d..e6fddd8b1cc5 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,3 +1,4 @@
 DIST kiconthemes-5.116.0.tar.xz 1312172 BLAKE2B a7f0231a298ce665e74f7ec2a739aec3f0c7e5636fe5b0b8c92384f78172f6d175b5ab0dbd88fb31ad51f9b7dbe9eb2c099deb6af7080725315b62c4f2b16716 SHA512 2c34793a8ac925c4a6fe548c26f5444e74e84624848158053e282716e59515981f248c17ec24f48794754db0eafe1b3bd63e6202c4a22fa805621084b643637c
+DIST kiconthemes-6.10.0.tar.xz 1288164 BLAKE2B 9d8c3347f55b7cb25a92c92579529388162929505b24d37f1e1892b1a1d9316f8296b4e52bc96b364ebd27606afc9b59b2bbb6ad5734657fa666e4561463d06f SHA512 97609cc704646b88075e9967f6e4bd0014bd9b450d7f87e860a124f9b9087cedb824cf8da28d3da8e68a02445b6bea44ca4e39d3e97ec3b01eb9e9445017f875
 DIST kiconthemes-6.7.0.tar.xz 1287692 BLAKE2B da3cc59d8d0db8a676bb01b091f366a6cde1dc948df3477edb57ee204f9bd743fb995f21cccf96a92106f9bc1ff8407f616df924ecc655a2c35319160286f5f7 SHA512 65ff78f3b76d76fec885252569bbd0a5fcd097eb306511092ee36a6168e18516584d0a4b145c0c4bce86c2230bfa6106cb87aa8b439bf28f206bb3b9152b5816
 DIST kiconthemes-6.9.0.tar.xz 1287716 BLAKE2B b8483287902aa519925c7563db1cd03c1ea03e752fe63382edbe8297d117dd10d0c304c36bae6dd810ff0a13383da9d25c92f9accd362c3abf5c206447d66c42 SHA512 834c26242a904db3110299efad1554e8840ccdf67b3020b35f5a2f9e14b8caf8ca852c2baf63e8596255492e268e30fbfc7d03af6efd03fb6eaa737c510ce944
diff --git a/kde-frameworks/kiconthemes/kiconthemes-6.10.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-6.10.0.ebuild
new file mode 100644
index 000000000000..2552737baaf0
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-6.10.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for icon theming and configuration"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test" # bug 574770
+
+# slot op: Uses Qt6::GuiPrivate for qiconloader_p.h, qguiapplication_p.h
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	=kde-frameworks/breeze-icons-${KDE_CATV}*:6
+	=kde-frameworks/karchive-${KDE_CATV}*:6
+	=kde-frameworks/kcolorscheme-${KDE_CATV}*:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 472e981b8c9c..0d8a38d217ea 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,3 +1,4 @@
 DIST kidletime-5.116.0.tar.xz 30928 BLAKE2B 7f9984e4011c13ec242f13647eff2c50c5896c0ae5a0232096fb1a6a1fcb0b7b722bd92ce346cfad8d06f78504f41ac6e44b23496c84c79b8e998d01378da0c8 SHA512 a8172a069266e523cc07f37ce1f4c5f65a421c99eb314e26f68cc32630b8f0da783beee9d2ffe2740113d60ae9b4c280ca9de8bb89bd5db8e56c9b31172ec408
+DIST kidletime-6.10.0.tar.xz 30736 BLAKE2B ec280d5498c24a89024d5a48daa56b3ab8843a96885ef9791e804426e29fd557e976ca257ceb228c15095d303c39fd470dd97a6426a17dba5b4e977eef386c87 SHA512 2f2b2d3fad970ec022f2d090a01be2ca3b9cdd3605032eef8bcfebc328c7c4761ad16bc6ee32a29ce2d734c9e2574c0014bad52df3746e63461cba7c948cc43e
 DIST kidletime-6.7.0.tar.xz 30724 BLAKE2B 8e32eec4fac26dbd207d294d71944c02c4a0cde77343b7ad0fc490534a8c052b03d1d015de531148c650519c9ba41c3b8c2ae71fb63e5aeb4d624058c7fd8181 SHA512 36704eb2196f4da0f8822190a9cc45ff94636b036d7f02911604187e3d7810ab7cec055b9780b9899708037a17f1aa9c1a4b3d63aae67b333081ecf1cd180b13
 DIST kidletime-6.9.0.tar.xz 30744 BLAKE2B a7902cd29180172a320bd9bca77ed8002c52b119d3ff863fb9545128e4a84b62d3f46315ecc4b51dabe4ea96e5c08fbab991e9187a4e5130ac88b2eac308f853 SHA512 afde04ac983503b9ac600ada7a5b47f29eb5a3713f6d6892e10f1a3e8f3dfbda69ba5bb41ac00d83b594036c5dc768ba5a84e8b8aa57640438b93d574c88c4ff
diff --git a/kde-frameworks/kidletime/kidletime-6.10.0.ebuild b/kde-frameworks/kidletime/kidletime-6.10.0.ebuild
new file mode 100644
index 000000000000..296b31dfee6e
--- /dev/null
+++ b/kde-frameworks/kidletime/kidletime-6.10.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for detection and notification of device idle time"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="wayland X xscreensaver"
+
+REQUIRED_USE="xscreensaver? ( X )"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	wayland? (
+		dev-libs/wayland
+		>=dev-qt/qtbase-${QTMIN}:6=[wayland]
+		>=dev-qt/qtwayland-${QTMIN}:6
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libXext
+	)
+	xscreensaver? (
+		>=dev-qt/qtbase-${QTMIN}:6[dbus]
+		x11-libs/libXScrnSaver
+	)
+"
+DEPEND="${RDEPEND}
+	wayland? (
+		>=dev-libs/plasma-wayland-protocols-1.11.1
+		>=dev-libs/wayland-protocols-1.27:0
+	)
+"
+BDEPEND="wayland? ( >=dev-qt/qtwayland-${QTMIN}:6 )"
+
+src_prepare() {
+	ecm_src_prepare
+	if ! use xscreensaver; then
+		sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_WAYLAND=$(usex wayland)
+		-DWITH_X11=$(usex X)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 5cedd88c87cc..a5e6877dfd5d 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,4 +1,5 @@
 DIST kimageformats-5.116.0-patchset-1.tar.xz 5120 BLAKE2B 10bfc35b50497ac3b1fac49e8fcf428359ca135b75493a5c841732a4dad4f5d6117bd2bc4193b1e5640487e5f51b3cf41ebaa8bc859bda242c3bfc7caf8aac22 SHA512 7b30b0c39bb0503bd569814fc36ada081b2cb196c36fa4d246b014b8dc20c0ac5021706c561301bdecd2a329727c14acab3b78a725e9b7f93f732b8c2e3381bd
 DIST kimageformats-5.116.0.tar.xz 15758576 BLAKE2B 4df7288d340738eb9555bd0d9430562ec65bb21ea44433e3c8ace1b8c91b343ef4dec79ca6bbc30e2fe0da187ee70fde6dbc1cbf84662dcf55adc51a49307f94 SHA512 2280e0ee39166d99a4d0ad01dc17ccb96f78e05ede4793319849f70b671d3e53238619c99a540a4f32a8297a29b18e06919629c0d84078556fbf388cb29c94ce
+DIST kimageformats-6.10.0.tar.xz 25439292 BLAKE2B 0c7df8d67bea06d0336c4b7155fbd80154ad7b5bbca2d7af97db6f38cccae748d849f031a4629ec719fd221da147769c2e8e76d71f32e98519cadd06d5c32d2b SHA512 8c0a0a392505f1a1626c41833905835da11d615963dd4c58ab51218ad003b65923b7c1db21301030035d453bc11f7b5ffcf39ac9e7b4ea8f2f92889317eccdc1
 DIST kimageformats-6.7.0.tar.xz 18385220 BLAKE2B 5a0d0baf97c299a25e62fb146c11f6c22f7c4651aadf64a88cacc2cb308cd1fbae3aaf4f66af1cf8300d532c06f5a0851c7b0d274c3f7dc5325ec56c5f13d0ed SHA512 8f198bde9f60508ec65d02c2ba6d4816b15b1f88f6059b97cd4c61a7f4f27b7a22576799880254cb423170f30584aff35de854eddfae01499b15fdb895c8b16e
 DIST kimageformats-6.9.0.tar.xz 23531600 BLAKE2B 19e5517f6d11ef729058b5c358cb1973f9dcef35f1872032cd8d839c2f9b76dbe8a74381f77e811990c9b8781982a718c3cf0d9c799ee4c792e17ad648f88d9e SHA512 e8acaa53bad2f77278b06f4dcfa37bc9bf0f880345103146a9a1e5682208c2447d7ca2d044a8ad338efd9b0fffce459b41ad5a8831d022f84778396f4a843cd7
diff --git a/kde-frameworks/kimageformats/kimageformats-6.10.0.ebuild b/kde-frameworks/kimageformats/kimageformats-6.10.0.ebuild
new file mode 100644
index 000000000000..170d8c77661c
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-6.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="avif eps heif jpegxl openexr raw"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	=kde-frameworks/karchive-${KDE_CATV}*:6
+	avif? ( >=media-libs/libavif-0.8.2:= )
+	eps? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] )
+	heif? ( >=media-libs/libheif-1.10.0:= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+	openexr? ( >=media-libs/openexr-3:= )
+	raw? ( media-libs/libraw:= )
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-qt/qtimageformats-${QTMIN}:6
+		heif? ( media-libs/libheif[x265] )
+	)
+"
+
+DOCS=( src/imageformats/AUTHORS )
+
+src_configure() {
+	local mycmakeargs=(
+		-DKIMAGEFORMATS_JXR=OFF # TODO: check if ready upstream
+		$(cmake_use_find_package avif libavif)
+		$(cmake_use_find_package eps Qt6PrintSupport)
+		-DKIMAGEFORMATS_HEIF=$(usex heif)
+		-DKIMAGEFORMATS_JXL=$(usex jpegxl)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package raw LibRaw)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index c74be368d1f0..3668f5a25ba2 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,4 @@
 DIST kio-5.116.0.tar.xz 3800352 BLAKE2B 2197d92589bd6eba360a72fb1902bb1e97d48065834e762e681eb312797f8c54829ee6099e87f316de83913755572e7b9fe4aa1d168fa83ada519cce8980d030 SHA512 a07661717846860db3a64bcead9c2b80192d8c5b8e66a25f0f83ced6b596c4e8af7eb94e68b17770f45b36b22ccbcecaef4f8590d790cf69fceb140ab9e47376
+DIST kio-6.10.0.tar.xz 3423932 BLAKE2B e41e1b196f0bc078ce6fbb02d6279f86a68540b58248c92cf9654593fecb20942f7e25eb7e14756f6a09688fa2f76121c3960b85196e1499c601b2c6fca6bce0 SHA512 08bf8a766e29333a99faeb3394ab2552fcdb585fa8fa61304df5a50130409fa7a68d15a9f3d85e4e129583d578f50ce1b5154a081a3a422c60d447a1cf54bb15
 DIST kio-6.7.0.tar.xz 3359164 BLAKE2B bb7cfa4c85cd4011623992725acfdeb1d8f5c8c28c5fa4905f2ff2f031f0d829eea8a8f6b5c46db6f12efe0bb4f7cc79137bed20d27a426c2fc836be1ff656a3 SHA512 f04ffd647a8d3544776f237f5b1abc771bb968900132c356787ab7fb3b7fcc7636a3b54a7343c695c2530f93b9198f2eacbef5a7aa7e0d61826109fc47f32c6d
 DIST kio-6.9.0.tar.xz 3389616 BLAKE2B d9c2e25df4efc8288cf43960262d4387df4aef71f6ce6a55b3aeee3420cbfec6cb14b1db4a78ee0fe7b8e46fce5b45e5202cef8501428701c31833dd39cc82b9 SHA512 d830229b915eb89f50d4a3caba924279981f68443add8d0d935846944878ca6eceef1c913c097cbf0de1ab253df8c08e308efc4e0efa279624a975be1baf094e
diff --git a/kde-frameworks/kio/kio-6.10.0.ebuild b/kde-frameworks/kio/kio-6.10.0.ebuild
new file mode 100644
index 000000000000..4369537a4b57
--- /dev/null
+++ b/kde-frameworks/kio/kio-6.10.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="optional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="forceoptional"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="acl +kwallet wayland X"
+
+# tests hang
+RESTRICT="test"
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,ssl,widgets,X?]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	=kde-frameworks/kauth-${KDE_CATV}*:6
+	=kde-frameworks/kbookmarks-${KDE_CATV}*:6
+	=kde-frameworks/kcodecs-${KDE_CATV}*:6
+	=kde-frameworks/kcolorscheme-${KDE_CATV}*:6
+	=kde-frameworks/kcompletion-${KDE_CATV}*:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/kcrash-${KDE_CATV}*:6
+	=kde-frameworks/kdbusaddons-${KDE_CATV}*:6
+	=kde-frameworks/kguiaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kiconthemes-${KDE_CATV}*:6
+	=kde-frameworks/kitemviews-${KDE_CATV}*:6
+	=kde-frameworks/kjobwidgets-${KDE_CATV}*:6
+	=kde-frameworks/knotifications-${KDE_CATV}*:6
+	=kde-frameworks/kservice-${KDE_CATV}*:6
+	=kde-frameworks/ktextwidgets-${KDE_CATV}*:6
+	=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
+	=kde-frameworks/kwindowsystem-${KDE_CATV}*:6[wayland?,X?]
+	=kde-frameworks/kxmlgui-${KDE_CATV}*:6
+	=kde-frameworks/solid-${KDE_CATV}*:6
+	sys-power/switcheroo-control
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	handbook? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		=kde-frameworks/karchive-${KDE_CATV}*:6
+		=kde-frameworks/kdoctools-${KDE_CATV}*:6
+	)
+	kwallet? ( =kde-frameworks/kwallet-${KDE_CATV}*:6 )
+	X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[libproxy]
+	sys-power/switcheroo-control
+"
+# bug 944812: File Properties is accessible from KFileWidget (KIO); this
+# provides access to keditfiletype binary via KWidgetsAddons (Tier1)
+# Typical KIO revdeps (dolphin, krusader et al.) can rely on this dep
+PDEPEND="
+	>=kde-frameworks/kded-${KDE_CATV}:6
+	kde-plasma/keditfiletype
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package acl ACL)
+		$(cmake_use_find_package kwallet KF6Wallet)
+		-DWITH_WAYLAND=$(usex wayland)
+		-DWITH_X11=$(usex X)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_desktop_database_update
+}
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index 3e385fbd708e..8b1ed4d8bc26 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,3 +1,4 @@
+DIST kirigami-6.10.0.tar.xz 558268 BLAKE2B c4b5a83500ae4e31479b9c34574c471619919aab08de01cb7a35ef7872c58d71c067ec5eabda1757e64c6787f2916aeaa5a192b8a823c2f22f58ddcbf81709b1 SHA512 02262fbf4e3ac82d56883360093a9a674551f91b65509996289fa96b9fa82366af22e749d32f8e711ffe9f146b204ad8ca5149f2d556b4d7bc74ae7f5f0eae3a
 DIST kirigami-6.7.0.tar.xz 553732 BLAKE2B 8c9f28f0780a57b1769b0e56a80cef755abf3434b36486ecdff81391e8371413bd6038cbb5bc21356011239bb54a5bde6182604ecb3fef0de72b505b29624dda SHA512 9fe39db368eb2f7e753a76777ab40748681438ca06f8953dae3ca621c347c56ae4e7eb4929de89dfee7c888a9741a8fadfde8ff13407914efe7c57a2bde7c883
 DIST kirigami-6.9.0.tar.xz 556004 BLAKE2B 122d616e277be434b2d4ec8bbd5f2afddf072885c7f832896261614fa1f6e7d183697f4688a185342636e18d63e2764d726b7c86653f3c56d569d1d1dc64ca71 SHA512 28bbf3af5bf1d4cfc560859f03894edadaa37ef097cfb7e47762ba58a1171b6513e8889a26170171e96c782bd2d10430564b7859f0a0fa3af2b228966a31a765
 DIST kirigami2-5.116.0.tar.xz 383660 BLAKE2B 80252358b33f1876506738d68f233703c15f955dc020709ffb66b75cc7bb13585ac1bb5a7a2076f42909b8a515f5f8cf64fb14a7536aefe8fd42bfd293c66384 SHA512 bb1f7525cb77dc2849bc9782be9b4522b4559b78e8ad88c9cd9953a6d9736cbe63a33a76fadebd9a1fb04f15007e5141aa465991b99117f7c2f26e09c722b66e
diff --git a/kde-frameworks/kirigami/kirigami-6.10.0.ebuild b/kde-frameworks/kirigami/kirigami-6.10.0.ebuild
new file mode 100644
index 000000000000..d81689186b5c
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-6.10.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org toolchain-funcs
+
+DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
+HOMEPAGE="https://community.kde.org/Kirigami"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="openmp"
+
+# requires package to already be installed
+RESTRICT="test"
+
+# slot op: Uses Qt6::GuiPrivate for qguiapplication_p.h
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+"
+RDEPEND="${DEPEND}
+	examples? ( !${CATEGORY}/${PN}:5[examples(-)] )
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+		$(cmake_use_find_package openmp OpenMP)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 991e155e196f..ae9c6d69dcf5 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,3 +1,4 @@
 DIST kitemmodels-5.116.0.tar.xz 407312 BLAKE2B 9783d84458b3b94ad3195071819851dae777dfb647cbdb939249ae661d0e39ebac7dee2cd614144fd09d611f22aa9dcec6fb8e7e40b7764340c8796ebf08f0cd SHA512 ef3ee4ba45fdf8fac395f3d678421fccb7bfdafec2dacaca203dacf90f65548e31d2d0eb5165c4cb2ce5cf71e4bca289c1af9c9e8dead710f9a19d7831db3bfb
+DIST kitemmodels-6.10.0.tar.xz 396632 BLAKE2B 66a8378489b65f72fce82eeb5e4d44027423469107f23ba1257bd0e5c8eb8e9d63bebba9993f3eb8013e11e97229915fed041f9143bb7b23cb121a16dad7a505 SHA512 82cc70b5c91f3e93f07b096c3884eb18434182974dd5ceb1e54914bf6d67a46448e7aefc8d248df8584ae33c4b0cc012a00a43d76b7924f3a98857d8d66e71cb
 DIST kitemmodels-6.7.0.tar.xz 396644 BLAKE2B f1ddafd2a852a28ad268930a26b9c96e27d9cb386deb016b1aa0a0af143cdb476ac068be02f1cfd10bd04f1861cf2af083530a411de57cf2187925893832a21e SHA512 93b413e8a3ab328f5713c80de313d9e0a957d8017e49c9720ff78da163d1a60c28a6d7005e642a82011c6920017efefa8189763b9d8fcc6cf21c4bf3a1a4ba54
 DIST kitemmodels-6.9.0.tar.xz 396604 BLAKE2B 06efcbea6d08299139d17935ca5af845a4893af8a25df38d12e189bce07d665e4f7aea61f406fe1083939080255b2885b9ee437b20a5e71cde6d0c3a5df2bfb0 SHA512 0c025549b890f294f0f4b6576f13f708f65f5e8a0d7d7de60948c483ad5b5bd657c29ba682bf6f135fb5c7c3946f389c847495052943736aa5dbe232c58eb370
diff --git a/kde-frameworks/kitemmodels/kitemmodels-6.10.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-6.10.0.ebuild
new file mode 100644
index 000000000000..e43cf79e9562
--- /dev/null
+++ b/kde-frameworks/kitemmodels/kitemmodels-6.10.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] )
+"
+
+src_test() {
+	LC_NUMERIC="C" ecm_src_test # bug 708820
+}
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index e25f8f928a14..2a5820f86b47 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,3 +1,4 @@
 DIST kitemviews-5.116.0.tar.xz 2265016 BLAKE2B 0bfa707eaa4f0ba67bb10045fe65482d57de2f644756a216e0406b02812e49969b8c909e5e1a0f2d0d3bb9f4053af6a83e3af53eeaee2b65db728735b7fb497e SHA512 631454b73785d131bcdf7631939db7955f3ec158078787657e74953818e5df1ad7757065ad00336b6efc898e4cf35876541201fac0727875a5ac7f3abfc3e9d7
+DIST kitemviews-6.10.0.tar.xz 2253448 BLAKE2B 069f79c41ebf4657e0a49679937aec446c16aefe669f3b3a6f3d77f357cef8734585a63ce211cbc462a3820231ebe7f39809ea149841793be6c9ad5824e7a442 SHA512 b7e6d0209e2672bb450ec354b936641a9946b99fc283d89102d7eaa1b11e6b22200b80d2e637653794be3c3665d8d07d93a40580055cfe058df52ddb7fc0ef51
 DIST kitemviews-6.7.0.tar.xz 2253440 BLAKE2B 1bb9b989d0cf35af07e5ae6c9f686d5e1e8d0c6526482b0fd2ac4b97fc62c7a8ca0074ab04ccb350941dbfcccf1419e4429fe674a40de56c49333ce590adad92 SHA512 da637fb1d4082f73b95965fbf0c2032bab3ae82cccc82fb52e5ffb1539d776f6d049cc98111a82ca70472d3b6d71c3d758af956792795da063f1e3f09ac10917
 DIST kitemviews-6.9.0.tar.xz 2253156 BLAKE2B 2fdc7c3eccba4988a107729a8b43c86331d9e44710c43693405920ffa169432122cf964405a4389fb0e113eef805a6dfed7c2996897de88902e633af1c59aa45 SHA512 b472565f58b327a18b2f16ffe5585a1eefbf0bbab6c4755aa2a3a1f66872edd6a803ccea894fcfd62e645470f03342b49ce37ade49b505f066e347fadb59067a
diff --git a/kde-frameworks/kitemviews/kitemviews-6.10.0.ebuild b/kde-frameworks/kitemviews/kitemviews-6.10.0.ebuild
new file mode 100644
index 000000000000..8799f49e725c
--- /dev/null
+++ b/kde-frameworks/kitemviews/kitemviews-6.10.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing additional widgets for item models"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND=">=dev-qt/qtbase-${QTMIN}:6[gui,widgets]"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 2add141ac607..e29a4d6bdb9f 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,3 +1,4 @@
 DIST kjobwidgets-5.116.0.tar.xz 2268368 BLAKE2B 1b5a4be3ae68c6f27c0cdf0796de4d72b0639304e8a8db97c690803b2af5b8f2b7aa8620696183ec9b8ed791cf59850082934e7f36d8b7d5c56e7965508142c4 SHA512 1a138fb048f9cf91aba5b512d0be43ed4add3ac7b31a36ad21a447b3dabcaf65ecfedd92660e634b8f4cd7526eb9ba44c806477d153394262437f3d858af8e2d
+DIST kjobwidgets-6.10.0.tar.xz 2257808 BLAKE2B 59bc8c78d84fe885ec943ba694801ba1b2d786cf2d80e3b030da272eaf573b6910796493c1f7928549c69bbe0a6f0e99cbd86add6404201e18792dd79bd81c59 SHA512 5f51d0e9b38483d3c550d79a8f70c1caee2e2eb545eaca5efdf172e3e4497f77b44d70569a2cbb9c6f4c8977ee9d43c58a440abd8aeb5471dcf9860a47ee5725
 DIST kjobwidgets-6.7.0.tar.xz 2256344 BLAKE2B db9441f4fed7435ee6e38810f4debe38710141cddd591eb1f9c4280d8d0c74eec2fb564e98c7c3f978410a2bbd2520f3c5c3f3b04edef98ad06fdf1333dd22e4 SHA512 f7320925fd9f79626e3899a6712672aaf2a1006dc799d748394cdc2afc4441c3ff52c1c7bf6be70c113aa61d7de90492daa5f3693a9e5dbd2e1f1a7c0d7f0e01
 DIST kjobwidgets-6.9.0.tar.xz 2256888 BLAKE2B 880d98cd36fb25624f2f95435b886a8afbe337a81795d95c4fc57fca026c0b08a1ca111bbfb7aa119b591f5eb0f0f2b1c440ee85ee22021382e7b608ed4efde0 SHA512 c1d84487dd11efa2cde5e29731efb3b040f98c704866f83d144efc634c052c1b486e714ad2c2e19eb566ef318dafe8fcdf552e669d08486cebace63dfda52490
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-6.10.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-6.10.0.ebuild
new file mode 100644
index 000000000000..da83276572de
--- /dev/null
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-6.10.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+# slot op: WITH_X11 uses Qt6::GuiPrivate for qtx11extras_p.h
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/knotifications-${KDE_CATV}*:6
+	=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
+	X? ( >=dev-qt/qtbase-${QTMIN}:6=[X] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 106bb2eab6f6..9737cf41eeda 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,3 +1,4 @@
 DIST knewstuff-5.116.0.tar.xz 3359252 BLAKE2B 76df212d33e2ff3a4e47024c8007dcf5e595a892d4ddc5e3579639cc2ec86589392c8a9e53ae5e39d8b71b632a84b1d615291f44635e43514ddb2468c8e4d0d5 SHA512 c66f8905c622964a81609d384ea64c0614714b4d760ee908e2efcdaab4ef146fc2af099625e81b83c2e43e4f97a0f5960dae345cbf9d8453a15b465536c06152
+DIST knewstuff-6.10.0.tar.xz 3111916 BLAKE2B 4e15686b2d22466449a338286ac0403182067d18a8da688151fc02e6bb8fa11a02d356ab63346189c8a3c13ce36d5f968a3eee998baecb95e3e52608f5f7c8ca SHA512 f6ff5cc16aa6adeb3a531065eddf3f3d8137b61c027db6329b1773ef5c58345349f43f5f8d0896d0d9acb06eacec8a050b1e91afb8ab902c7e47e4afea3a0a35
 DIST knewstuff-6.7.0.tar.xz 3101248 BLAKE2B 9e44ad0c2fd3b74252a3aead6f0c17cd1bf883d6e193b986caff1bbe88140fe4e762fbb9ed99c5f0a0418b3278cd3b462708afc259450ce1fd87bd1363d1328c SHA512 41921e155abc05479c9aceb8dc64330b025d6fab073effd186d4f5a6467816d6b415e6b39c4a61e0782f3f4a29295982f9966e40877c96244d2ddea3fc6bc3fa
 DIST knewstuff-6.9.0.tar.xz 3108000 BLAKE2B 6df6faaa28daeef7f519356e3f7704e6b4681ffef279389268497a7f856759a16da1925f094d634ddeded26aa7e1b7be81701453d5455279ed1e6d674f5467c6 SHA512 bfcf95fea0308b9bb44962cbaedbaa762bca7d6c2363de2560e626bc1a795b0ea556881bd9d24ec9ff428b7c176f737006fd9d5e36cde07a1bc1ea0b078c666c
diff --git a/kde-frameworks/knewstuff/knewstuff-6.10.0.ebuild b/kde-frameworks/knewstuff/knewstuff-6.10.0.ebuild
new file mode 100644
index 000000000000..7951045f541d
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-6.10.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="false"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="opds"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	=kde-frameworks/attica-${KDE_CATV}*:6
+	=kde-frameworks/karchive-${KDE_CATV}*:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kpackage-${KDE_CATV}*:6
+	=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
+	opds? ( =kde-frameworks/syndication-${KDE_CATV}*:6 )
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kcmutils-${KDE_CATV}:6
+	>=kde-frameworks/kirigami-${KDE_CATV}:6
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package opds KF6Syndication)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index aa5200ebf152..7208b378a9b7 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,3 +1,4 @@
 DIST knotifications-5.116.0.tar.xz 2373292 BLAKE2B 6eb022449b70cc526d24bfdc9b9bd17222de678b01332b5bbca159961ce608e7d5fe407454cf7ed4676cc73df9db930bb725a1e6d3d736758139908e7132b7b3 SHA512 e49b9930c69581b4498a012483b04588c52e5ba04035dbe01e21dbe6c07e8f69a14f40c0ac07a0299bc1ae182ad47b47ecd5ab5da2fb7a0b5a2f1c90282c289c
+DIST knotifications-6.10.0.tar.xz 2335588 BLAKE2B 14e5092c1e59ae3aea921b18d43f495733f6dcf159b1342939819d14d1e809747d8c757d8250cb94be70fc907eb77e2267c0adb7c05a5817e334d375aa963244 SHA512 2a73e3cd3779bded19c93a375dd0ac99bb3ac2186b36c86ab1cb89e7843908f1a9c2d3bef0f9b3631663edb27d7a89fe66f1e9b6425ec016fa6a81fd41d2ae1e
 DIST knotifications-6.7.0.tar.xz 2334108 BLAKE2B 14f2798e06cdb81de45ba91e776a00b365b0f25ad4dbcaf790b6218923ba4963759d3a101d083f336e6e2d59b453dd98b255054a2c8d8626004147fbf8e67f13 SHA512 b1949fa6036b9db904c2f37473abb64fab8da9f6953165ab2447ce7b58ae244f8954266561e4d08a15fb64dd3dd46de755b1400fd1fb99a4ac68bd7a8ec63e41
 DIST knotifications-6.9.0.tar.xz 2335564 BLAKE2B 7a90e4c310e51d96e3ece6cf361a48a7c97c18c61d304f23fa8716613ef91fab9db79f7d5b75fbfa4be839dcbc413d62fd67882bb3e9b7f489ad5d3eca8649b4 SHA512 fac22cec35829686bf35061cdec58eb491cf794a457db9a701f10dc6bef7ea3e7322ebe9b11f776b966b4ce7580284056847f11158b1b5c7f21e2d115c68257c
diff --git a/kde-frameworks/knotifications/knotifications-6.10.0.ebuild b/kde-frameworks/knotifications/knotifications-6.10.0.ebuild
new file mode 100644
index 000000000000..1e9394109568
--- /dev/null
+++ b/kde-frameworks/knotifications/knotifications-6.10.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_PYTHON_BINDINGS="off"
+ECM_TEST="false"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for notifying the user of an event"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	media-libs/libcanberra
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index aaefdea10e52..e6bf5a93a181 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,3 +1,4 @@
 DIST knotifyconfig-5.116.0.tar.xz 2401664 BLAKE2B 12574922cf245545885af033c4335320de23840748c8d110b429edfcc0c91193d809abe398e29c1285b78c9a949f1439c4c3862b6981f8757932ef955cc508af SHA512 e251964dc5dbc518e5a993e1d6605435f5d858868631d00178484c57e418deba4e688d3ed5dd6e58b9fcda96991ac0043da5ff762ac6038d1187a4625103d038
+DIST knotifyconfig-6.10.0.tar.xz 2385952 BLAKE2B ab032573e83df5bcfc3d504f547c0503ae8b4598f0a3c42e2ee3d941d95f34f00157eeaee7f16c352c00c4369c92ce27692a8ee3c3b563fbbb4c98549d2f8e59 SHA512 488fbdcbcc5bfb86e90e42255bf3e6be90b4bb30f4b2ba396648d0a9aba71fa05b016a1d9c7103a6c522b3b74e326c81fa9ae089ded035852264c4f0cca8ac35
 DIST knotifyconfig-6.7.0.tar.xz 2385744 BLAKE2B 333aa5df6866d2bbb337b883d613f54ab9c26df91adccb571ba774ee03eaabff1b212edc3adf2f6c2c7422270256704fb7cbef9ab3d156ce850f91472eae5cc7 SHA512 0807b723523b43b86a826edac1734cc6bee5fbbdead241e6cb4fd57021c9cd04e3f4ea8c56f311545b25727cfe06687b724812a88c9ba269f5526c730bf43a13
 DIST knotifyconfig-6.9.0.tar.xz 2386004 BLAKE2B fb9f8f3e485a5092e51c9ef8188c93aa705b9f92a2976556e7e9ac045485c6766e4eb816cce76ae14290b0560a6b8e9a82dc0c52d4be1eb2436b24398402b91f SHA512 f78593d99cf67daecbf80e342b30bce1467262eeacc4334855f0f15472f98023d72b4865ec73e7542759287e08bfe99f08d57719a779f724d8553f5ef57d7b5b
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-6.10.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-6.10.0.ebuild
new file mode 100644
index 000000000000..d4685ee7dc23
--- /dev/null
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-6.10.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for configuring desktop notifications"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	=kde-frameworks/kcompletion-${KDE_CATV}*:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kio-${KDE_CATV}*:6
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Canberra=ON
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 3a7bb478b940..9c491c0b4427 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,3 +1,4 @@
 DIST kpackage-5.116.0.tar.xz 188864 BLAKE2B 2ef92134ed59788ea512595bb93ac8996c3df9971c49f8db2ae2dbfe1a17ad35c6076d8838c5f4d3e0cd0eb4aed088c661f8764fdcd44556ddff11faa6e98b4d SHA512 15129fecdf53db1a0fa32fb4ebfc82f7b3d7edd9591032267d80b61458e652813f3d18f406a473ca75c202fb7e401815ee290c3c30d3c54920562bdf00a53632
+DIST kpackage-6.10.0.tar.xz 183008 BLAKE2B 4aa27408acef57167006ffd385d2d8a7c29496b71271defbb978631f831d9b53eab8680562e1074a27acdfece2f09cdb6cbd1c74b1e46f83c7673e6d69476fb3 SHA512 4126e87c6687694b4ed4d8c683850cc8e0aec095cfb212c21e1a07787d17130b6b312c6124e5a3d6309ff7221ecedf4616bd8aea82dd37595076890943481d2b
 DIST kpackage-6.7.0.tar.xz 180620 BLAKE2B 827df8f6f3e8a70b7427f94748c159852d0913438b3aa66f007c55ae4b2ef8c759b94e9ac6928df85e65fdc2487368a932f25e6b8aaef369ec3fb4ac984f029c SHA512 5f178c848d60f51ef7ec61f3f42655136c661799bbfdc9938688e48b7f4784977f7993c656f2c4492fcd5af187024b5a62737a90e078e5b3aa8ed131ed95eb2b
 DIST kpackage-6.9.0.tar.xz 180672 BLAKE2B 3fdd08023b5ddc644d8461eab96b76c2316f4317eb2b0d52a5f1361ed60caad88b9d1ddd0101286a1c59a5872a9e6454f1ca0090330b8190ab279d3000437318 SHA512 c52bd785d479a4a01d23d79b391e9d7daf5556832705233be1ecfd06da23e86bdc24da188fde7c349d838af5658a5ea8111f26ed0d519e78e886221cf334ba75
diff --git a/kde-frameworks/kpackage/kpackage-6.10.0.ebuild b/kde-frameworks/kpackage/kpackage-6.10.0.ebuild
new file mode 100644
index 000000000000..89b707688bc9
--- /dev/null
+++ b/kde-frameworks/kpackage/kpackage-6.10.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework to install and load packages of non binary content"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="man"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus]
+	=kde-frameworks/karchive-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+"
+RDEPEND="${DEPEND}"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${KDE_CATV}:6 )"
+
+CMAKE_SKIP_TESTS=(
+	# bugs 650214, 939041
+	plasmoidpackagetest
+	# requires network access
+	testpackage-appstream
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package man KF6DocTools)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 06a2f88b4523..a7f3b0b4c1d5 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,3 +1,4 @@
 DIST kparts-5.116.0.tar.xz 2473828 BLAKE2B 3b26c04146367f20a1dc5fdad5518a9ea2a8b88e2083d6da64216cebe2e815aaa4c69c3ce901a5a7a0bed76c0eec222e82dcdaf7208d14348d8e095e83af5db1 SHA512 a619168f6e2622c64e4304641da47f91deef49843dfec72a08aa775e24b9319f7b550bc423f6b2516ef0a38bb2c39234d1325f25c62b57c8c6daa5fb7580813e
+DIST kparts-6.10.0.tar.xz 2424624 BLAKE2B 4fedc660af7955cfc4a9e52cd1984775d7c64fb7d703c9ca8dd733d9cfa69aeeeb24842b315a7afda08b0d6bc870296a3392e8518291aa5195a744ae05404787 SHA512 3f7e74aaaeaf995f4969b35382915ebf40a231478c7a65d1f7643ceaefd14e4effd704c67c86b0626786736015caac13d99c4236526ba7d1878bfa46f879c6e8
 DIST kparts-6.7.0.tar.xz 2424608 BLAKE2B 6865497b876eea0e7037a3d0346d1af3548612027634696d0cb2d4d922a9f3934a167dd7a4d69caf5b9c0f685e20618f48cac610f96e40b1ebe14c395438193e SHA512 afd0955446952f35ec1dea45c6e35883fc526c145386003137dd471885875a7ee847a3db0b607fcd4317a93394b6e49e5969b08601aa42bd706af6c31aa14f37
 DIST kparts-6.9.0.tar.xz 2424652 BLAKE2B ce4487a60e82b4489c87a42e6f440fc7678937fc5a773332a62342faf9b8f78e98f9b7ad62131c591a7b7b9814dd29ac329502b41530debd70c02b5091c68bc3 SHA512 9b631cf05801a423dfe3c956f2e20448bd5e71dba4fff6ebb837cdd3db0cc581eb413b64276b2890d8a0e9386e047bf1ec09ad1ae022824be7fe0b3f61c7a805
diff --git a/kde-frameworks/kparts/kparts-6.10.0.ebuild b/kde-frameworks/kparts/kparts-6.10.0.ebuild
new file mode 100644
index 000000000000..3fdc514da802
--- /dev/null
+++ b/kde-frameworks/kparts/kparts-6.10.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing elaborate user-interface components"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kiconthemes-${KDE_CATV}*:6
+	=kde-frameworks/kio-${KDE_CATV}*:6
+	=kde-frameworks/kjobwidgets-${KDE_CATV}*:6
+	=kde-frameworks/kservice-${KDE_CATV}*:6
+	=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
+	=kde-frameworks/kxmlgui-${KDE_CATV}*:6
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 3654d4540f73..15bca8c4a9a1 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,2 +1,3 @@
+DIST kpeople-6.10.0.tar.xz 66680 BLAKE2B 88b990e2b493e438de146062ab084504c4ea8fedcc0f272dd6ab3c4cb63a1ddbccfd8fc2a9c521795bacbd98faf551222f9869fe8ed1accc97634d84372b6fa6 SHA512 a3d13199643af0b891cb0465c7092f83e636f683b7d07f7c02ab83e5149e2bbd43ff4c95b2cfffc9fa7134271e42d229becf14addb9bd25935e39da82dbfe485
 DIST kpeople-6.7.0.tar.xz 66676 BLAKE2B 5ef3f40617d65f0e4381c8360085635c29e59a312eee7fb2c29fa96243e092adc890e7a17b4169756ccabc31dda7a48e0b409a656d616be13844edb8b4da3fe9 SHA512 d46b4151d7924922c66acaffffbb5a6b8c0e0f45c06ba71b0834eb5be260e9d5c43ec93f3d7cb5a8e6ce886a2469479cc904e0762fd435bc43b9d8c5e50ab503
 DIST kpeople-6.9.0.tar.xz 66676 BLAKE2B 5b108f77126f01129f0dfcb2550acd06c2cb12edfc295c5ee40774e1988716fc41151d896459e174c078ee755ee1df3a7a8c1f314ab7780e2767ab96a0c1db25 SHA512 f37f64c8730812b6d1bd25bdc28166e06f83a6748c4e46cd764f4af437b1181e9c9c0f251c4bc1c079fb649368b8a8dc29f37207acba64c9d08d75509f0d580e
diff --git a/kde-frameworks/kpeople/kpeople-6.10.0.ebuild b/kde-frameworks/kpeople/kpeople-6.10.0.ebuild
new file mode 100644
index 000000000000..7f9b3e097916
--- /dev/null
+++ b/kde-frameworks/kpeople/kpeople-6.10.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+VIRTUALX_REQUIRED="test" # bug 816588 (test fails)
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="KDE contact person abstraction library"
+HOMEPAGE="https://invent.kde.org/frameworks/kpeople"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kcontacts-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kitemviews-${KDE_CATV}*:6
+	=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	local CMAKE_SKIP_TESTS=(
+		# bugs 668192, 816588: segfaults w/o virtx
+		personsmodeltest
+	)
+
+	ecm_src_test -j1
+}
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index c1416ed02067..cd685560fb8b 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,3 +1,4 @@
 DIST kplotting-5.116.0.tar.xz 33732 BLAKE2B b58ba3087be6900f3d1d19a6ddb4115cc7f58c49f9bf45663ca2c382b359f3a2e7f7daf3bf053fbc4c27926fa8a4e6ae6f84b811f5351f1f3ef82a2ac4d30c77 SHA512 1a4d8313c57d32c6af41127ce27086d0d357ade8126ff4dc1d1c5306b198f3d1ab24d67105cef3bad318d753210553fe275350a173b18c1d3c485f213de95fe9
+DIST kplotting-6.10.0.tar.xz 33676 BLAKE2B 7e1fac746aef7352547343c0e17704a79cfb2008b60f35ad20284badf7d9dfc749896118b2fbfb28517aab901a9558615ad3b6760cd69a545bcf9baad2005204 SHA512 d3682cc1a405bba1a855480dea8b43a8c14b81114716e2ecee53e74f699da37e4e6570754d12fa7fee5addec7a952df6f6964ee1f18a8ffa48462dbbbe6b7ba5
 DIST kplotting-6.7.0.tar.xz 33688 BLAKE2B 7d9b4aa6a10b4d4d3fc05cfb9620186c334e9f4bdb7d2e9e7a8ea7a2ea4d63a383a3b9f36ac1db747cbff0cb21d7113b73f1a9266216a73baa2ef15299ecf428 SHA512 d612a0f915e367d9d2767f14aba6b0b7ef68afa2ff14f2d69cff32b90c3fdf57b1010e2c50e5454de4aef77eaba5f9305437e9bb4de151082c963ce926b11cdc
 DIST kplotting-6.9.0.tar.xz 33700 BLAKE2B 026f7beb25bbc4f96f5ebc1534c2bf743afa062b8470ade953e5c6933d3084a91323be1dea036ac17278b8d2770dfa43b68ac072af6107e5b59978b60e671abc SHA512 a6294f26324227b03f033afc2255553de95084507031907c3ed0f11553a02f22b300a4611f06d0a696a2b918ee8ec3a5e651a437b43887f9a8ee0070a4b20b6a
diff --git a/kde-frameworks/kplotting/kplotting-6.10.0.ebuild b/kde-frameworks/kplotting/kplotting-6.10.0.ebuild
new file mode 100644
index 000000000000..d87a0d8a9a49
--- /dev/null
+++ b/kde-frameworks/kplotting/kplotting-6.10.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing easy data-plotting functions"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND=">=dev-qt/qtbase-${QTMIN}:6[gui,widgets]"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index 9ffcae714c4e..f13cf652c629 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,3 +1,4 @@
 DIST kpty-5.116.0.tar.xz 2416656 BLAKE2B ef5ae7ca824bd53dbfc083e11656d8caab75509a78acec4656db33d39c5b0fad260988b25cc0fde7362116c729071e3e06770f5faf745338214f1e14490f4525 SHA512 5aebb2a66be19dfadc2896b26864b9b0b4074d8c46ead97c7857b035cfe370a7fbf144c7e1b52725ec20339e64a0d08f6c913fe6c3a1ec614b557b4d950a3f21
+DIST kpty-6.10.0.tar.xz 2407900 BLAKE2B b12f1b5f3175cfa0c6ce5c79ffa91de8c7993d3f1a0bb481172dde3d8435209e0cbf11f4f21247c5634aef8956fdf2885082f13bb771644f268934e12b6856a6 SHA512 db58a31ea1d6da4cc2b141b5b7e42c1c08d59552e5f956e5e73310b883e8961840e23ce1697dd4ec3f691412aa0033d8a6dfafa6b8da73a17e85d6c2d9aabd00
 DIST kpty-6.7.0.tar.xz 2407592 BLAKE2B 713a32d29580a377d145a31e9bbe378674bf7b4f6f3e022c0313c56fd054eabb26e066382d3d409f8794a7f939a8a9662de4aea28f7c5b68f9d39f06d3af5886 SHA512 a54b521c7257a48707fddff51be150409c8c5d82f2fc848a75b8735e538a7413b47a3418e09edff90c0188895779903509b39d3985fb30402d66aa8edcfd4479
 DIST kpty-6.9.0.tar.xz 2407596 BLAKE2B 9e0781f15f1f2450fdce0b1c859c82120c7ba17b0e3eebbaf7385c5d7bf490104723e01f037741d6b73bb41f785947d3c4c2962f854e6d4a6b474c9212941b79 SHA512 2e1c48729da1d20b3427cc9b3bd23c3c84c1f5465d84bc0778a0e47b120eaea5f7518a0358a914e7d5d2b2e6c426cf5614f965946e29a1bdbffce2507c38ee5f
diff --git a/kde-frameworks/kpty/kpty-6.10.0.ebuild b/kde-frameworks/kpty/kpty-6.10.0.ebuild
new file mode 100644
index 000000000000..1c58be7b7a86
--- /dev/null
+++ b/kde-frameworks/kpty/kpty-6.10.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for pseudo terminal devices and running child processes"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	sys-libs/libutempter
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUTEMPTER_EXECUTABLE="${EPREFIX}/usr/sbin/utempter"
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kquickcharts/Manifest b/kde-frameworks/kquickcharts/Manifest
index 62cadd92259d..aee4b2a4b665 100644
--- a/kde-frameworks/kquickcharts/Manifest
+++ b/kde-frameworks/kquickcharts/Manifest
@@ -1,2 +1,3 @@
+DIST kquickcharts-6.10.0.tar.xz 110320 BLAKE2B 0722c59c3ab427eefa3158e28218727ac8b94398690cdbda12a17863655c368d9736b84152dd6867e41e78d898fd26efa812953ff51d8141046164693bfa1e74 SHA512 2938701ef5e794e4a9a770f98834f454f4d55881cf57af39273ebab4753bbd039172231329386c37956ed97283d7664feaa56824a43c0568ea7a29b7842a8dbc
 DIST kquickcharts-6.7.0.tar.xz 110180 BLAKE2B bdc75fe0d872336d6617837acf385fd528e614904cd96727f86a9bf332164a3b9ec85d90b85e7006e4c4855b451cdbadab852c322283edf8fad799be6eddc998 SHA512 3a1bfe21b07f510c71947bf8bdf627baa4032dc7d3b31a7501cf2f52cc608796ef4cd249514dd859ae50bbcab7d1a43b63328cdd3ab7ecee82e3ad8a5e273ca7
 DIST kquickcharts-6.9.0.tar.xz 110304 BLAKE2B afc2f4a22eebeab0f06cf24e73a446329b5a1422eb555ecaf16a49769f45230c4e2eecf48b4431211dd5c5e19bf026ce68708ddbc1eb3af5560760b542988f1a SHA512 e77691429cd58d4fc68ebf1423f1f37d61506d62943e6306a922cb1981d3d6f8112285b6de1290d3c0a0cd4889698950eb06df3722b8274c922fa2a346084be4
diff --git a/kde-frameworks/kquickcharts/kquickcharts-6.10.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-6.10.0.ebuild
new file mode 100644
index 000000000000..142132e6a5d3
--- /dev/null
+++ b/kde-frameworks/kquickcharts/kquickcharts-6.10.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="QtQuick plugin providing high-performance charts"
+HOMEPAGE="https://invent.kde.org/frameworks/kquickcharts"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtshadertools-${QTMIN}:6
+	examples? (
+		>=dev-qt/qtbase-${QTMIN}:6[widgets]
+		=kde-frameworks/kdeclarative-${KDE_CATV}*:6
+		=kde-frameworks/kirigami-${KDE_CATV}*:6
+	)
+"
+RDEPEND="${DEPEND}
+	examples? ( !${CATEGORY}/${PN}:5[examples(-)] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index 71fbccfacc28..8a1ab30a644a 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,2 +1,3 @@
+DIST krunner-6.10.0.tar.xz 131296 BLAKE2B b08bb6ac28a649131cfac7c6e153a9befc055634cc71d7f7f8e76cb13874c21c7a3c93e38abcb4e24e6f8a39e29be3be66c9987d6cc6c8fcf9c3470a61478052 SHA512 a24e42e98cf9009262b1d16f51ec21219f7a10b8845495b61010c9a3830b84dd4ad637c4992ea8e3e6a0a7d6d4a1870ac083d0599a0faa75122b7c99affe65c9
 DIST krunner-6.7.0.tar.xz 131228 BLAKE2B 9fe5945c3319a2900a1af2c5e22e57c585510798b659ce8e0244398de5aaabae81ac9cc1a04ccd276334dff0781da05935066d00cdaa6fe6d4997c0b8fcde8cb SHA512 dd02ad497baaa3b02d0b71fc6d84de1a77b2abde5720d8d60c0cc2058e89124640ba61ae7f0f8a06b8fa9075c5f574d434bb15d59a32c763a4cf0dffdda3b33b
 DIST krunner-6.9.0.tar.xz 131324 BLAKE2B 511a9ddad264c867d0b7730246c115eb2c21d92d8575a9014f46b9b4b3cf0432aa75b942cf393022fcb2d1372c18cde4e11ec9fef123ff1ba78f52423b1ed10a SHA512 c130ce3453e59f9fa7f8bc24577ba0593c066bb1fe924a7e7d1470bbc8a2b710a0363605c3c0a1deef92b1d7ffab607d889831f1664c445dac95aee22a0d7eae
diff --git a/kde-frameworks/krunner/krunner-6.10.0.ebuild b/kde-frameworks/krunner/krunner-6.10.0.ebuild
new file mode 100644
index 000000000000..fe1507de2e43
--- /dev/null
+++ b/kde-frameworks/krunner/krunner-6.10.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for providing different actions given a string query"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kitemmodels-${KDE_CATV}*:6
+"
+RDEPEND="${DEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	# requires virtual dbus, otherwise hangs; bugs #630672
+	dbusrunnertest
+	# bug 789351
+	runnermanagersinglerunnermodetest
+	# bug 838502
+	runnermanagertest
+	# bug 926502, needs dbus
+	threadingtest
+)
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index 029fcbac2a00..699d277749a7 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,3 +1,4 @@
 DIST kservice-5.116.0.tar.xz 2538968 BLAKE2B 7cdc876b130e428139dcc477c9089e0f97c3c501b4619e9c39b67a71ca3f5edb1dc6092d3c1b889fb7c0c740f354bb2c20effcad112fdaadefadfaf1b4fa989f SHA512 daadc5d0bfa2dbfc6ae0c6535f407851d1adc67529d2262d92c2e8dff8a45aa701790d8aa2e6d97d9c433409ffee4767214523f992937e244b02fb27d62ffea8
+DIST kservice-6.10.0.tar.xz 2439968 BLAKE2B 599b916430b097e7ce474365a4467b26333cd5498c35a4c28b17c559d79bc9d90f16231eb5497b5f81db42546ae1c4f534202bca6f33ff13ebd686ef086b2bf4 SHA512 f822b2281f2ccacc5545ffe619c1d4fc48c5b805d737257527b78f9a98804f0005f2015ff80e2eb303173c98c58c23e84069e79ac11939a22f283940ca0ba4dd
 DIST kservice-6.7.0.tar.xz 2439648 BLAKE2B 732cecf3ad8574b4e802374b4886d76c8f56a5c6ba870492d93d6664f642785514526efef3ccdc0f916abb71141134000beef50dd8707873ddeb00771db3fa70 SHA512 caf8127eae2c50d259e116296d1f5b71be277f7a930dfa57cb39eb396462f184d296f72563df3b134cf67a0f563587aa296bb82978aa6f23f33680bff039a9e9
 DIST kservice-6.9.0.tar.xz 2440152 BLAKE2B 3e98aadc26fb0be9319db7b9d912879169c2ac965d879e3f843021040c7401449337d14b3807615c4d4619d4bcc35d7e23f12a9a50d6e9155905e84c6589e04e SHA512 ef0f705c9f7799b06e6bd39a0a3dbeb4149da5f389bf3b3403823587bc48ed746589aac73a9d198594b5ef0443d4f6a8e4bf01b96dfefb12ad19f66aa9692b2a
diff --git a/kde-frameworks/kservice/kservice-6.10.0.ebuild b/kde-frameworks/kservice/kservice-6.10.0.ebuild
new file mode 100644
index 000000000000..37a140c30254
--- /dev/null
+++ b/kde-frameworks/kservice/kservice-6.10.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Advanced plugin and service introspection"
+
+LICENSE="LGPL-2 LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+man"
+
+# requires running kde environment
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,xml]
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/kdbusaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent] )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${KDE_CATV}:6 )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package man KF6DocTools)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kstatusnotifieritem/Manifest b/kde-frameworks/kstatusnotifieritem/Manifest
index 9c76306aa1bf..271b518cc371 100644
--- a/kde-frameworks/kstatusnotifieritem/Manifest
+++ b/kde-frameworks/kstatusnotifieritem/Manifest
@@ -1,2 +1,3 @@
+DIST kstatusnotifieritem-6.10.0.tar.xz 48612 BLAKE2B 707b7b9d30f6c366ffe54db6bca09ad21a10ea72471f44699302bce822fb94d3a0af742296d6873c66873c643a2b8d4f941393390e477be00e69b96ae5533455 SHA512 a110fada38b03f40680d255b17b4900c16030456b50bfa90903ee99c589190d931d4e271c8ade6883b2ccc198d2f249c027d91d3652510da90a93dcd435b57a0
 DIST kstatusnotifieritem-6.7.0.tar.xz 48380 BLAKE2B 888e88652d9e3b4dcfb1b7dae8c0c31e0e326f4091b3ac157b8c170b749345f5b52f0a795979b8294791c93a6ffed6e58bc8987e43d1c0b873e5dd1335b3109d SHA512 833715f69430dbaec6c562a81bfcf15fe66be325b12826280997227f4a179475210ea933099e0a94df2a2256b2df575149a5a00c34012d8ebcfaafaca37218a9
 DIST kstatusnotifieritem-6.9.0.tar.xz 48372 BLAKE2B 7b21fa9f6d6975fedf7bd66ab3a038afb0301db691fa1765de8ed1969879918dc560ddd384093e089288cfe03418b6356b871eae7349242cfa3a3e1cc613a3ff SHA512 84a16f7da6b092c4ce72806de8a25659031040fc205064d9e5d56be1519661314cf1489bed85586e5d3a92f586a9dc6261996cbe31887c60b9950b0d58da4c5b
diff --git a/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.10.0.ebuild b/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.10.0.ebuild
new file mode 100644
index 000000000000..f9d5dc227cdd
--- /dev/null
+++ b/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.10.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Implementation of Status Notifier Items"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+# slot op: Qt6::WidgetsPrivate use
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+	=kde-frameworks/kwindowsystem-${KDE_CATV}*:6[X?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITHOUT_X11=$(usex !X)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/ksvg/Manifest b/kde-frameworks/ksvg/Manifest
index 3a10a86c1e37..66e1cf5e1c4a 100644
--- a/kde-frameworks/ksvg/Manifest
+++ b/kde-frameworks/ksvg/Manifest
@@ -1,2 +1,3 @@
+DIST ksvg-6.10.0.tar.xz 83964 BLAKE2B dd85151687b099b90c6bfcb83e54b2d36634114b42aa7facbdcf6fa196666150e7d692f69bb18bed5cd0f43fc74674731cac0afbd9cd145892431fa3e85692ba SHA512 764b74aa353f869a33c9665d372e75dbe9ca675ec2b4127cc41c96e209b65b6e7db09b5f5b7ca64c6051e59b79a18e91a87bc0f944860e4f3c22c4c5d5f1126a
 DIST ksvg-6.7.0.tar.xz 83724 BLAKE2B 6aa65286839ae1a2261ffb6bd645949b5f27651bc1bfab3037ea4389f18d3eb6aa290bc9bd6fd1e84999980e2ed913a1e35276d33b2cabb20585bbd5e66f1b16 SHA512 cba501029a09feb156bac554d5036fd23ae5040139a86e150d5de23d13c1dbf0d2113ff81cd288fda0a921dd21173b7ee351cbbda6fdd18d2e4714d718995b1c
 DIST ksvg-6.9.0.tar.xz 83712 BLAKE2B 3bd74d93fec27af0d1cc9e276ed3c8ff87912d047902768ef1f725fbb400c907d2f374d4c7b1b77d2ff075f98e2adacfd25a54e2bb5825927a19c8ace3e55dc8 SHA512 b02a653e4b95943b7b7bd8d42f788a30908a9fc298e57185d0a80a93eee622e9598ff7b55cb3f3bc74d7169ccc7d54b18ba063e7d9575c6c67ecd61133864660
diff --git a/kde-frameworks/ksvg/ksvg-6.10.0.ebuild b/kde-frameworks/ksvg/ksvg-6.10.0.ebuild
new file mode 100644
index 000000000000..616f367dc5af
--- /dev/null
+++ b/kde-frameworks/ksvg/ksvg-6.10.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Components for handling SVGs"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	=kde-frameworks/karchive-${KDE_CATV}*:6
+	=kde-frameworks/kcolorscheme-${KDE_CATV}*:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/kguiaddons-${KDE_CATV}*:6
+	=kde-frameworks/kirigami-${KDE_CATV}*:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 4ac6b80d2fa9..826d2ca722c7 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,3 +1,4 @@
 DIST ktexteditor-5.116.0.tar.xz 2791176 BLAKE2B 7fb32bb7d18ccf43e33f66b0401fc086597145e3838e84a4333f99b3725e64c82ea5f78daf5fc58dfb13ea0452e85a64d1d03a503b363bba8247e26c922fd396 SHA512 9d17558e4f7adc5de1dec0af9ba32b2eb086def576dd32d3458b91d9f0424aa86505a57ab092a71f5274197bfd18927b7ccddf221551cd42d2a96f22394495e0
+DIST ktexteditor-6.10.0.tar.xz 2927232 BLAKE2B ca85b14863e9467bc17d31f79dbb10e1e21af63fc680c5a8fb0e698c4d65f26d0f46442b5752d07e837b14579dd600e271e41ed40e82678b37324934afb0699d SHA512 3c2d03ac4993931c3230addeeb650d21950231e4b40b4daed4e81d90ad87fef8d551fc88ab247182097de5ddd05f7c8eab1ea6f9928410671fd06012e372c221
 DIST ktexteditor-6.7.0.tar.xz 2880020 BLAKE2B 96f73b03b7510530a7a1caa4c276ffc9e99ea544d4754a4adb2e09f372d8835a0fafe31c550d902484c4710e2bd87b6c2ba4a7b72634d1984386e51af951c742 SHA512 cfa51dc60d20cdbdf1b88c92c14a12bbb71aa7302376f4670fc940c4c6927dd74836bb66b47c0ac23018af9e5f445f551bf7b9f1623b785b46b7bfe2c496fec1
 DIST ktexteditor-6.9.0.tar.xz 2896588 BLAKE2B 9a5002f7fd5bc02c2c9859e177ec14f634d79462beef4c37dc58d75151441b7d050c89744f9c12f58cc51b8cbdc3e8d4796936f6aa5140024ba9bb4d5e83e12c SHA512 95608360a71e5647428fa6617f4be96b31886171a4586242be1fcaf23258318e4a38105d1f0c5b2be11bf722239fc2d4ce908378c551561868a42721958adc47
diff --git a/kde-frameworks/ktexteditor/ktexteditor-6.10.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-6.10.0.ebuild
new file mode 100644
index 000000000000..f5107d7ba3f3
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-6.10.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing a full text editor component"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+editorconfig"
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtspeech-${QTMIN}:6
+	=kde-frameworks/karchive-${KDE_CATV}*:6
+	=kde-frameworks/kauth-${KDE_CATV}*:6
+	=kde-frameworks/kcodecs-${KDE_CATV}*:6
+	=kde-frameworks/kcompletion-${KDE_CATV}*:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kconfigwidgets-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/kguiaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kiconthemes-${KDE_CATV}*:6
+	=kde-frameworks/kio-${KDE_CATV}*:6
+	=kde-frameworks/kitemviews-${KDE_CATV}*:6
+	=kde-frameworks/kjobwidgets-${KDE_CATV}*:6
+	=kde-frameworks/kparts-${KDE_CATV}*:6
+	=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
+	=kde-frameworks/kwindowsystem-${KDE_CATV}*:6
+	=kde-frameworks/kxmlgui-${KDE_CATV}*:6
+	=kde-frameworks/sonnet-${KDE_CATV}*:6
+	=kde-frameworks/syntax-highlighting-${KDE_CATV}*:6
+	editorconfig? ( app-text/editorconfig-core-c )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( >=kde-frameworks/kservice-${KDE_CATV}:6 )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package editorconfig EditorConfig)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/ktexttemplate/Manifest b/kde-frameworks/ktexttemplate/Manifest
index 34444662f6d8..0365b27d70b6 100644
--- a/kde-frameworks/ktexttemplate/Manifest
+++ b/kde-frameworks/ktexttemplate/Manifest
@@ -1,2 +1,3 @@
+DIST ktexttemplate-6.10.0.tar.xz 849728 BLAKE2B 4aff48b718aa2f9fda20657695afd1dd2874fa9b076c525011cbd9fb835d2bf0500f7b15a88164266f5d227b29479177a287bba94902500badd9bd024f2f7a41 SHA512 a917f1618b3e0b85b7487b18f71a26cc4027ec30cc9a5768e69f62aa7acfae297fb0972aa7f3cc5a1971258233799597891d5adcfcd84ca5354478d4087b0a8b
 DIST ktexttemplate-6.7.0.tar.xz 846052 BLAKE2B d070f10ac37968f450f473011cf4685b28a59eaf17a481bb20808612cb81a7d04538e0854219118220e9b82cbfcdbc57f04db5593d1add4d8dc7fcea737c29f6 SHA512 a4739ac35ee88fa2c41e383fa659c8af4bea60611c9508807e9b78ff535ad9db461561ec97f00143dabd795352cc665ed221f0a82afc6b8fb7caf76cdb941206
 DIST ktexttemplate-6.9.0.tar.xz 849636 BLAKE2B 03d92b64d393ae018a3300399ed9a3cfb8db0c5314a814d83ba497940460b76d69f308bc95ab92fc5d3d4605480e282193d3b2b7cebb5c6e09df300b2d3cb306 SHA512 7e3e906d3c3be72523277aa6c7b9de139466b5d713ff38d36c4b1ad35bf77b7ea852cb6e30452b416f153f197a90b38dcf942abbf75784081187266d53b9bdd8
diff --git a/kde-frameworks/ktexttemplate/ktexttemplate-6.10.0.ebuild b/kde-frameworks/ktexttemplate/ktexttemplate-6.10.0.ebuild
new file mode 100644
index 000000000000..5044e9573e5a
--- /dev/null
+++ b/kde-frameworks/ktexttemplate/ktexttemplate-6.10.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+QTMIN=6.7.2
+inherit ecm flag-o-matic frameworks.kde.org
+
+DESCRIPTION="Library to allow separating the structure of documents from data they contain"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	dev-qt/qtdeclarative:6
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-qt/qttools:6[linguist] )"
+
+src_configure() {
+	# https://gcc.gnu.org/PR116783
+	use arm64 && append-flags $(test-flags-CXX -mno-late-ldp-fusion)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index 5b8fb89563d6..4134a0d5e3ee 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,3 +1,4 @@
 DIST ktextwidgets-5.116.0.tar.xz 2552684 BLAKE2B 4ef07c2cdc480c600164c7b1f6d9c7706f1faddd560072d405466a5ba50c672993097b07f36e48e7259430fbc58c3938d074b7732d0e2402771d92d906997708 SHA512 0534a06529e681da51aac627869de8587e3002a5ad3b460725924454ef66a69cb4b72a8b455aa4bf06b50cf0623f54ba6ba267485e2317659dc5ada295092b4c
+DIST ktextwidgets-6.10.0.tar.xz 2509712 BLAKE2B 6222f2fe8c6a2bdbaf37113eff832c8b15747ac049fe60b29458319c6672844d15fb1e22b4cd29897f65985a04f495ed28b43eb24334aeab6862d364c4ae6e6e SHA512 7ff09b4c96ce2355bf7aaee0c46e2587f51fec0fdc6bee4eae145f8ed41389bf0243c2b0e5d6839e6b4949dd46da442894d341a12c1c9707a493fcf3fc90169e
 DIST ktextwidgets-6.7.0.tar.xz 2507372 BLAKE2B 2fa8e03784a14a0299337b63cd57f9e26435169a3f1cb1f2f255192cc5fe37949a97f2ceac93c8aec268879ffdcd88397a9e262e3a499e0c4cb209e206cb5062 SHA512 908c1758132da75f4170af172b5892c00a611d44a2860b320b72fff6fe19a299547c48a1ece6e09a5e6e0c10e031e9d6a34b9a0350ff38bb7919d17b19681b1d
 DIST ktextwidgets-6.9.0.tar.xz 2507504 BLAKE2B 4d92d1288745d23e2f0036aff739f2600afe5caa4283232e0fbecac742ca411a29a250664e3b8464567895d6b4ba1544a2536e3b02e06a3ef5f60cdbf0c33c73 SHA512 05164ee1a46459b01ad4454a1b12954ac291c387abdd94b9c3289dd246f7ea3fe73a08b0a595bce04a0fcb69228b8a7283f63f4319f5cc0ec3479c8770c399c3
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-6.10.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-6.10.0.ebuild
new file mode 100644
index 000000000000..c16587c1a3e2
--- /dev/null
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-6.10.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
+
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="speech"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	=kde-frameworks/kcompletion-${KDE_CATV}*:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kcolorscheme-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kservice-${KDE_CATV}*:6
+	=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
+	=kde-frameworks/sonnet-${KDE_CATV}*:6
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_TEXT_TO_SPEECH=$(usex speech)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index efc9abd97780..d66ff747e4fc 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,3 +1,4 @@
 DIST kunitconversion-5.116.0.tar.xz 935084 BLAKE2B b30c0fb493efe3ce717ec661a58bef70598c3fc5b763107d3ac1d41b59408823f45f4bbf5a94ae4fbb92d3ed1b2e01966d3588b99acec774009b633435d79a80 SHA512 c0a077d9b1fbdc7a97db82313fd651ab3f896fe54106ea6ac321554e06133ac9e3ff109864d2a16926bb8543ba9f2c6dc6ce1b018138da09b2a3a1c9c01c9a19
+DIST kunitconversion-6.10.0.tar.xz 967128 BLAKE2B 79a31355741cb62de13d49f21b795411880e45857294adabbda2da99b5aec529d8e77205d314e01f7cdeba5fdb2357fdc63d0895a9ab4da7d483aa59f9334a93 SHA512 44d2e7e4159b9876c9bbe7c2e4316c31124310942965a0269d49ea3275ff94a9ccde891bdb4b77d4221435dbca3085b5f1485247eef8ec89adde16fc925b76bf
 DIST kunitconversion-6.7.0.tar.xz 910840 BLAKE2B d7163f0c3559b7142c2b30fb3eef19aaba2fd45703e7be05a41499e87e7d8480af107bb19ea38733a5163488b59fd7897ee2d2e86662d23122f87013d29ba4dc SHA512 b4991828b1d4b9d592748a683ade4568a9d4cfa6824483e29678c48ed0bc38d5a7fc4c2ee532b55672494923d8af2208a0c3fd9d431d5a509c3e109e6e34b37c
 DIST kunitconversion-6.9.0.tar.xz 916560 BLAKE2B 418c4a2d09924f744bf8e9c90accc90b7030b4b217f18b380a745996d598aced6eeb80b84cefeb7d72bf3c992d2dfbb473c8bb41dfa7d5d6c369aa130d82927e SHA512 ef56ebfadba45665afc2b5da35c9fb52a65682bafd13686a9602d61221cec6fbbe709254f3b90e5032f1f92e3d7ac204972b0e3d862ae6dbf500f6b4f40880ae
diff --git a/kde-frameworks/kunitconversion/kunitconversion-6.10.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-6.10.0.ebuild
new file mode 100644
index 000000000000..2902471c3c80
--- /dev/null
+++ b/kde-frameworks/kunitconversion/kunitconversion-6.10.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_PYTHON_BINDINGS="off"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for converting units"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[network]
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	local CMAKE_SKIP_TESTS=(
+		# bug 623938 - needs internet connection
+		convertertest
+		# bug 808216 - needs internet connection
+		categorytest
+		# bug 808216 - unknown, reported upstream
+		currencytableinittest
+	)
+
+	LC_NUMERIC="C" ecm_src_test # bug 694804
+}
diff --git a/kde-frameworks/kuserfeedback/Manifest b/kde-frameworks/kuserfeedback/Manifest
index d56f5fac9944..eb592d5252c0 100644
--- a/kde-frameworks/kuserfeedback/Manifest
+++ b/kde-frameworks/kuserfeedback/Manifest
@@ -1,2 +1,3 @@
+DIST kuserfeedback-6.10.0.tar.xz 266208 BLAKE2B b608892fa759c8998b9b1990342ef0f0456a79b8057df8a3d3141fd5ad977020966c4b13852be91fdc0644e3dfbd4810a009b44e4cb7aeea4b535c2a2713ee0e SHA512 b3d4b0cca69ed80d0bb1e670195dfc3bea9bb9a4d31cf9da49b33fd64e73f428415bbfe4b73b97c93b97fbcd7b291a69cda9e3387b3107ca73af24857cf2af0d
 DIST kuserfeedback-6.7.0.tar.xz 256920 BLAKE2B ab8581712a2ef9e87d21572113ba9ffca1d6c8381a3532d66113aea455e6944b48a8bd5a6e91c7ec5f1baf4eef88aea7d9b460ec769d247dd5ff2c4ee298795e SHA512 969c206f68a9542ed1f0b2cfb5cec8911a521f0c6526331633e19d5d21b2395409d6124f45f4944b44a5bf276544651cc001bd78992d4c139ea59cfa95b232ab
 DIST kuserfeedback-6.9.0.tar.xz 257192 BLAKE2B e7f94f57ebfbd1bd87fc3151ff2ebb67c4635888b0cdd0923db39241a6909acf6731c6581cfaa630b801d3809766f3e30d1ca03df42de65e8c09cc935e62f6c4 SHA512 f0854a095cb30d15b89c5b091e42d7491e28a14b783b378946a3db022b8a2e20c2538eb2af6a31cc5036403f5106a5d8f5cdbc1370584492c97607e2c562bfca
diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-6.10.0.ebuild b/kde-frameworks/kuserfeedback/kuserfeedback-6.10.0.ebuild
new file mode 100644
index 000000000000..53d625b16e16
--- /dev/null
+++ b/kde-frameworks/kuserfeedback/kuserfeedback-6.10.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework to collect user feedback for applications via telemetry and surveys"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="doc"
+
+# FIXME: Qt_6_PRIVATE_API matches UserFeedbackConsole, but where is it coming from?
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=dev-qt/qtcharts-${QTMIN}:6
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
+BDEPEND="
+	app-alternatives/lex
+	app-alternatives/yacc
+	doc? ( >=dev-qt/qttools-${QTMIN}:6[assistant,qdoc,linguist] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		# disable server application
+		-DENABLE_PHP=NO
+		-DENABLE_PHP_UNIT=NO
+		-DENABLE_SURVEY_TARGET_EXPRESSIONS=YES
+		-DENABLE_DOCS=$(usex doc)
+	)
+
+	ecm_src_configure
+}
+
+CMAKE_SKIP_TESTS=(
+	# bugs: 921359, requires virtualx
+	openglinfosourcetest
+)
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index a7488e9977a3..3f9940fca7ef 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,3 +1,4 @@
 DIST kwallet-5.116.0.tar.xz 353948 BLAKE2B d8c38a71e72ea9ce316a9f5af440c502b4e21b69f9ae40e740a209bde3aaa6519dd26079c99ffe1b7441a464c1ebdb34b550f9127be89c0f2baede68003eb462 SHA512 fc96b2e87e565dadb960159c5412cc0862454331824510405f434dfda2146ecf4e2ca133345c0c46608143da10265f154a0225f4d8d82ae6f11a184b222d663d
+DIST kwallet-6.10.0.tar.xz 358140 BLAKE2B 1157f45a3de89056a47677e7d9217619971ea3cc707549a859128c3a1bcc3637e022dad3917b41e388fc236d3b00ffd739993faad5034837927ce88a6c2408a8 SHA512 03a24d9e6eaad2b6c5a3c4e16b2b13847243259637cd0e113ba8c53a97a420f14dccb21f9bae79ad2823b5d6fd2461af40e9c8d6cc44d2d47528cd6106a7ec09
 DIST kwallet-6.7.0.tar.xz 353868 BLAKE2B 3799c6aa0978f4e5e0fb1afc694235e596d2c8df912ef1408455d21c1504e3cd67ae6be078791040edd63dfc8ac2abbf56c0aa7501fab7bd18fc1b8e35e5378e SHA512 acbc02873e8e73c0162f96b508df3ba4a58eb845d5e3970af1a243107701f52a317f350fefd907f27979a6b8ebe27d0d74f740ede395aef29774b25e03a259fe
 DIST kwallet-6.9.0.tar.xz 353824 BLAKE2B fabc528687e1aa101616e8040d7858cf368155c0a62224816139c96000f7b82dfd962a924c0c859b52ce34a653fab20cb4f79797451c9442b3bd86429eef4390 SHA512 6c220a479d4207bb741c1bd268afed8b564ef2cef8fde6b68d3a9e24ebce93b5c2ee5b60d840dd27525b733d6d5bb93b1138d7cde8ca188433959a97685b1c49
diff --git a/kde-frameworks/kwallet/kwallet-6.10.0.ebuild b/kde-frameworks/kwallet/kwallet-6.10.0.ebuild
new file mode 100644
index 000000000000..29b2023ab07e
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-6.10.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org optfeature
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gpg +man X"
+
+DEPEND="
+	>=app-crypt/qca-2.3.9:2[qt6(+)]
+	dev-libs/libgcrypt:0=
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	=kde-frameworks/kcolorscheme-${KDE_CATV}*:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/kcrash-${KDE_CATV}*:6
+	=kde-frameworks/kdbusaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/knotifications-${KDE_CATV}*:6
+	=kde-frameworks/kservice-${KDE_CATV}*:6
+	=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
+	=kde-frameworks/kwindowsystem-${KDE_CATV}*:6[X?]
+	gpg? ( app-crypt/gpgme:=[qt6(-)] )
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${KDE_CATV}:6 )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package gpg Gpgmepp)
+		$(cmake_use_find_package man KF6DocTools)
+		-DWITH_X11=$(usex X)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Auto-unlocking after Plasma login" "kde-plasma/kwallet-pam"
+		optfeature "KWallet management" "kde-apps/kwalletmanager"
+		elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 47baa15c2777..76d21792cfe5 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,3 +1,4 @@
 DIST kwidgetsaddons-5.116.0.tar.xz 4272468 BLAKE2B c81d997ec9337af6b2d18aadc6f397fb522a849e6f07125a7cf99d3f5997c1bc3658dbcea16aa2627e0ea16cd0bdb66f776780806e4e1dc20000f12a64e8f89d SHA512 34d74d9a4c1ce57e1f9306b442fe44975c9d1e7bd9d5d2461750e017331c2746a07d173b769636eb4143e05b4138fd823ab233618742f2599051036b8c5955bc
+DIST kwidgetsaddons-6.10.0.tar.xz 4277788 BLAKE2B 6dbbe35aeb7b356468a90c84b0e0681fbd465cb5610369d97bb8acf8bb155dbb2e3a4419e8715dc6f46bf8320e4430c5be416d3a4406f89f2d63f8b6a0cc7cad SHA512 d1557cec4fbb7f6258d397b9e8a53f11dc8bf76278be9080ee64a3845b0bc32a9ef3840e6ac4684dde72c0a9c350d1398ff14c8edbd6d58ee21c8b76ea4a0409
 DIST kwidgetsaddons-6.7.0.tar.xz 4266496 BLAKE2B 1d9075b5b5b8eb8a683d60e1ff5b3b2c2cf5de9ac07b42ff224216e09b557763a1b4ee7c00a81de11f0ce890d85ac53816ba27353b8b6431317a8a7a4982f0be SHA512 be5669e918bcc27386f60bbccb068f40dd8e697c6d32a408f5960ac093372d60ecb67411a3f029994615f3625b847fecaac7da8e7390d39f90c03b8ee5e1d07c
 DIST kwidgetsaddons-6.9.0.tar.xz 4270948 BLAKE2B de801fffe0643c0a5e3981f03dd1993a7c48a9d6620a5d1935f8ff3ae4242f0bbc729042a5c9a3b92bd4d175a9d4c9ef0d80c7f2d49a6a59d8d4599ccda51493 SHA512 3aa461aa443bbe322642363769337b02d6b862c788a46b897b3bcc602274fcff82598965629584c552cf9f67bf65d4407fb3ff05c5beea57d998e9a13fbd62a4
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.10.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.10.0.ebuild
new file mode 100644
index 000000000000..7bdb569a118e
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.10.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_PYTHON_BINDINGS="off"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="An assortment of high-level widgets for common tasks"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND=">=dev-qt/qtbase-${QTMIN}:6[gui,widgets]"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+CMAKE_SKIP_TESTS=(
+	# bug 650216
+	kdatecomboboxtest
+	# bug 697866
+	ksqueezedtextlabelautotest
+	# bug 926508
+	ktooltipwidgettest
+	# bug 808216
+	ktwofingertaptest
+	ktwofingerswipetest
+)
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index dcceff12c5e5..04134672d2e2 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,3 +1,4 @@
 DIST kwindowsystem-5.116.0.tar.xz 2406688 BLAKE2B 99bb7ec3d3302543bab77a526c860f8c13233c803b92e15a225fbecdd74ca2498b0f9a58a1c310c84eb81b07cf8b586dfb0388cc45da65c38d501a774ecbe637 SHA512 1b8d45ee0a09161b45f62e6ba4f200f3c2ad937c20eedc03bf65c3a788a5311727ec2a1634db9e1b1208b8ecbe4158273d11c97924a86059a06d3a24d1201157
+DIST kwindowsystem-6.10.0.tar.xz 2385816 BLAKE2B e4b604d291618ffdef4ab06452fe588bdce5c91dfd9cab6c052c1bd396040235648be4e0fe106939cf3c1a3ad2e7681218adc78bc05f5aafe66296c2613680a1 SHA512 a336613e76a628f44ba050668b675ee663a919de32de254425611154e5d3da815b3d1ab61277812e41165cb962e76469f889b1ec9d970301cc0f9ee3e8b785f5
 DIST kwindowsystem-6.7.0.tar.xz 2385728 BLAKE2B 2649b58fb50e475fd64fdd750965b20275a11ce04fd9f8c8b801264cd6bbc5e8e138a8907756b01c49e45a9d7a6549b6486f44f917c415b6b0da1fe4399f1392 SHA512 4fc2d7e2788c0491220374bf60793505140d899fa828ab471680efb502b45e3145ea4da311b432939519a88a5eefae1676b5ac72a2151bde7e77fa2dba02326c
 DIST kwindowsystem-6.9.0.tar.xz 2386140 BLAKE2B 055838de6203c8aab19e7955585ee5d420930c964077d26f42b58cb317ef2368e22a65ad11e371ee6fd042c914ea67f2b74a555bf86e03d5e9c8618f110102c7 SHA512 6d9f468c67f6703c2d488cdab07e54dcab58748ce8ad05a2e9681218a568ab3f2b700a3a12ccae60a042c1adae15be7bf220e556fc99d636daa0982c7a832f91
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-6.10.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-6.10.0.ebuild
new file mode 100644
index 000000000000..3b2345106ee5
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-6.10.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing access to properties and features of the window manager"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="wayland X"
+
+RESTRICT="test"
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+# slot op: Uses private/qwayland*_p.h headers
+# x11-base/xorg-proto: X11/Xlib.h included in public header kkeyserver.h,
+#   req. by KF6WindowSystemConfig.cmake; see also bug #939177
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,wayland?]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	wayland? ( >=dev-qt/qtwayland-${QTMIN}:6= )
+	X? (
+		>=dev-qt/qtbase-${QTMIN}:6=[gui,X]
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXfixes
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] )
+	wayland? (
+		dev-libs/plasma-wayland-protocols
+		>=dev-libs/wayland-protocols-1.21
+	)
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+DOCS=( docs/README.kstartupinfo )
+
+src_configure() {
+	local mycmakeargs=(
+		-DKWINDOWSYSTEM_WAYLAND=$(usex wayland)
+		-DKWINDOWSYSTEM_X11=$(usex X)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 6d556379e1a9..629465e1c2f9 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,3 +1,4 @@
 DIST kxmlgui-5.116.0.tar.xz 2953508 BLAKE2B 133ae08dfa3b7f2077530f2164c6a912cfe4681ff41682ba7f76ebbf8b732dab3ee267a98eac46b02e58f87a891312b6dbfeffe65fc1eb290f1bb609e2b293a4 SHA512 e3a205f8eb0dc28869530e73e02ab090c55a5e1a54e3747b2271e34d211e2fb81fc61d07a44fc9ff3b41d37720e2861e4bff04d06419e5813ee526c02681bbef
+DIST kxmlgui-6.10.0.tar.xz 2915712 BLAKE2B 85c79c5ea1bb27e6a0c0cc25d627108ac80e863ffe2159e8fd20186cf1b86bce80e3e5046b82deec55d0ec56cfa7d3d02fa4592f3f53fbba85e990dd739d664c SHA512 bbfe1387c9cd18df1feec6e24ee3f4f00bac021b7473b95b86c64363fd11be5189891f9e919f52995860be98fe6a7f571b669aceb704836befa68111442ee2b0
 DIST kxmlgui-6.7.0.tar.xz 2925688 BLAKE2B c697fd6d4948504392d567cc252319858c6d203f07aaad8fab2cc1635ca8f2362c118a448f445b71b0fe8ba10b7545790bf931a20a186cb156ed59b0fd8d6041 SHA512 f24ecffb8ed6ae203f56fa34cdba9f6d937fc4f611f6244e51e71b10f9494779d77c367a6bf763624a47fb11d2df896ee5d8fb969ae553737514a6d4e8ff0284
 DIST kxmlgui-6.9.0.tar.xz 2906172 BLAKE2B 8a4aac3ae4d0127063f1f31512b8eeab9601b5ca356f237ba2c87753b55cd018e93ff2d83dc8733b9a58473ad44b9ef4a0db1d423a064dcfec72c1fed6a6b453 SHA512 355c2a7114325f86a9e036336be3f2062b82b434ab117cdfe13bf4fdb2f9e1dba3679e8c3f1f00a41a62f6527edaf74d9063a7d2d7406103936899b11cf7ce29
diff --git a/kde-frameworks/kxmlgui/kxmlgui-6.10.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-6.10.0.ebuild
new file mode 100644
index 000000000000..f9b91e2a8f1f
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-6.10.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_PYTHON_BINDINGS="off"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# slot op: includes QtCore/private/qlocale_p.h
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,network,ssl,widgets,xml]
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kconfigwidgets-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/kglobalaccel-${KDE_CATV}*:6
+	=kde-frameworks/kguiaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kiconthemes-${KDE_CATV}*:6
+	=kde-frameworks/kitemviews-${KDE_CATV}*:6
+	=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
+"
+RDEPEND="${DEPEND}"
+
+CMAKE_SKIP_TESTS=(
+	# bug 668198: files are missing; whatever.
+	ktoolbar_unittest
+	# bug 650290
+	kxmlgui_unittest
+	# bug 808216
+	ktooltiphelper_unittest
+)
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index e0b9c5d80701..c8ccea34e85d 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,2 +1,3 @@
+DIST modemmanager-qt-6.10.0.tar.xz 121908 BLAKE2B 7222ac5e20842c7d8e966586e2088abdd39a3982610a2687c84ca368d62a17c81734242ee5e6daa63114d42e41539b60cebda7e8e3caf7a26ff355719c481927 SHA512 54241fc5e9e285ae06d51be74c34d26fe2a08d1d2730927b3159237eae8ec8e532f57c9f52d9631ddfeb07aaebe264fbdff584ad5003dfc93da096c102bc51f4
 DIST modemmanager-qt-6.7.0.tar.xz 121932 BLAKE2B bc6829e936772bc6d3ece1eee72aa238e26da38520436d1681fd2561d8383519aeb7fa7f1c0ed2474f9156d1cb62b72c4a66570c1a32bc1fca06494faecaddbb SHA512 964d3a99cf0aec9f731ecbe229eaf4f408367749fb167e0eb2ca9021c38bd9c1d24a14236d41b3f401b43270470638650d28548599aa6702c6389b59a15e9349
 DIST modemmanager-qt-6.9.0.tar.xz 121928 BLAKE2B 7ddb996af1043c094f74c4fc40513bde1c5f6b0b61397b054674e2a81b26f4871f3c64aaf70cf8d29cbe0b062b0401ef7f1153b29fc14f57e94785bea7032f34 SHA512 447b05b7b6431246399396496b37bc33d3b674f41660272c5ee6d154619fb9191b61e4c12fd9902fc615e93cca4200f4482b49f47f58505884a3512a98a7a6cc
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-6.10.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-6.10.0.ebuild
new file mode 100644
index 000000000000..c5f4ef045501
--- /dev/null
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-6.10.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="ModemManager bindings for Qt"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# requires running environment
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,xml]
+	net-misc/modemmanager
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 76e4c10aec80..90c9617e9d66 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,2 +1,3 @@
+DIST networkmanager-qt-6.10.0.tar.xz 198640 BLAKE2B 5b0a8bcf3131a5e8b79ee18270044e61db336d277776cdbb979605fdd04951041144d5d74be24c35c7513f4983cd473dd17f694e2f78394ba4ca4dae0cdb56be SHA512 5ce1bcaf8bfdb68cbbbe2a66107aba12f16ac655b5ce4d205999ab031ab33f6a14b2bb58085e62608a60502146813957f73aaa01f946db56922f2d69ffd283b3
 DIST networkmanager-qt-6.7.0.tar.xz 198200 BLAKE2B 2b47034ad3e90c3bac526a7e75cfb44ce73e15fa60cfc2ea3301191d238a3737cdc2567cce5720c9cebc0d9db4f2c2c6ff49058d8782bb559a94fdf27465fc7e SHA512 1219a2088f81e85d9cd0e4be8530d939c114c285ac3dd75e8ed9497638b0276b8f64c98887e2788e4ed9a9d2d03564378dd4a1ad723453579623b4858ea617de
 DIST networkmanager-qt-6.9.0.tar.xz 198192 BLAKE2B fc65cbba5a9bbdc84b699d173c475d0e74106e2cb77a7bde3fb2dc4bb22e51535c1214b93355be6f9b263df74414a9601679e8e0a1bec0f0799d07629af3f77a SHA512 9e0f6a17854ffec85713804d12d9d8e8dd4f3089c5c47eb1f385818077dd31ed9efc7cc489f7b611ec58a8a89de71d05ee2b131ec729c5d06fbe389166f2935e
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-6.10.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-6.10.0.ebuild
new file mode 100644
index 000000000000..e02c458e4d31
--- /dev/null
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-6.10.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="NetworkManager bindings for Qt"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="teamd"
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,network]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=net-misc/networkmanager-1.4.0-r1[teamd=]
+"
+RDEPEND="${DEPEND}
+	|| (
+		>=net-misc/networkmanager-1.4.0-r1[elogind]
+		>=net-misc/networkmanager-1.4.0-r1[systemd]
+	)
+"
+BDEPEND="virtual/pkgconfig"
+
+CMAKE_SKIP_TESTS=(
+	# bug: 625276
+	managertest
+	settingstest
+	activeconnectiontest
+)
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index 335ede17e871..917de0074813 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,3 +1,4 @@
 DIST prison-5.116.0.tar.xz 55276 BLAKE2B a45dada4b4c7e6a8f811e37a7241f5399bbeea4f47805b5311a2393a64ef3beaebbf20c5c35bd7fd4e1670a626ea455454a7f46c104302e96399f484457cf33f SHA512 fa7ad2393a25b8b7d7cea60891ab27e114ea069a78479a90a6e7df219963991e89f477c061fea0d6c680cfe72502e4b40fdf05b55858072825543ca52635bfd0
+DIST prison-6.10.0.tar.xz 56580 BLAKE2B d7012395d7f5234bcb43950fb71eaa459805798e0c8463de60334712777ba25fa40a20c677c915ce0f4cd9a62db368f317db67b82e6ca52c96e1ce0a847a7b73 SHA512 8fede61a04a98a883c1136c4dc5c22bd818edd3bedcf9957f960333d9a7398b56112725c0341c282384e9d676ff6f3abc48562a5b94af4560f1d61dbf052df5c
 DIST prison-6.7.0.tar.xz 56564 BLAKE2B e5e8430d3dc08450eb801a5eb438b6506b9de3c5511a8edc2e4d0eebeee8af20dca9486833826b3a0d2b2d403a1797e5668a11b1d42e501b36eae88c2d950328 SHA512 74341064bbe1246b3e69faafecb6182d538dec59c56e0b71b69331e05978d66909431c746a4b3665e1bf3758f809e14977891ef6fa90c503a64f432f5f22f548
 DIST prison-6.9.0.tar.xz 56552 BLAKE2B cde4fa21870e112b07fe08a35daf745ea64561fad928cfb495194aa8e67fa2c8e134071583f956919f190284d7eefd11c1e61eb5ac71a6c56f2d5e4efc062fdc SHA512 5aa2a5e15a198917fe9489c191f287733915f3eeda52e507a1c872b7f63f50f1c7ca9e1a475eaeb993bff8a63e89e2af7410a23e9e74817da1cd25dab5842ee7
diff --git a/kde-frameworks/prison/prison-6.10.0.ebuild b/kde-frameworks/prison/prison-6.10.0.ebuild
new file mode 100644
index 000000000000..6925a4f0eb36
--- /dev/null
+++ b/kde-frameworks/prison/prison-6.10.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="QRCode and data matrix barcode library"
+HOMEPAGE="https://invent.kde.org/frameworks/prison"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="qml"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	media-gfx/qrencode:=
+	media-libs/libdmtx
+	media-libs/zxing-cpp:=
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:6 )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent,widgets] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		# TODO: WITH_MULTIMEDIA?
+		-DWITH_QUICK=$(usex qml)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/purpose-kaccounts-services/Manifest b/kde-frameworks/purpose-kaccounts-services/Manifest
index 7a18829aa2fd..b6ffb1064151 100644
--- a/kde-frameworks/purpose-kaccounts-services/Manifest
+++ b/kde-frameworks/purpose-kaccounts-services/Manifest
@@ -1,2 +1,3 @@
+DIST purpose-6.10.0.tar.xz 188940 BLAKE2B a51200beca1dad78b164f276b1b4333455cc8af8f805fb9be4873789879e1f3edd2cbb69614ca4b192e036fa1bd4746bd7f4114e12cc1751e0877e4914dd6b6f SHA512 b6d847e4715a5779c10da92179db9d0a858c62582b729bcc25fc1d2e9796cfa634d4cb1cf49283c3d0364f96f97fc3420895ab4aad526920d65fcf2518e4b39f
 DIST purpose-6.7.0.tar.xz 177848 BLAKE2B ef67904e26edfec2cf19b461fd3060f134af17260ac483c7f893e6cc61afc12911cb587bcdd48034e0f49c87b46f394a8ad3cbb30f3786984d06312cd00bda02 SHA512 1366cdc84ae063ef07ff86f70f41b54f808b4a06d9a0864ef30c5457511254cc9c63c5521baa9dcfd1cc7ab066fc35c9acc11f41f94c799674a1e75b195d1d3b
 DIST purpose-6.9.0.tar.xz 179568 BLAKE2B fafe0cd546237fc0f295949f3fa26f71126d833169549bb79aa2aba6de882aab931f79ae5620b6dbdbde54801e883b2641d1954be9928c5e98fa67dd6f3f7f88 SHA512 24994cb11b34d9696a67157b0e2b63ed32a8f3f5e26ff8ef82c94ddffc62bf5b39810f985cb2581ce4e15104f96c79cdd8736de2c67fade7cf5f0e415eeab492
diff --git a/kde-frameworks/purpose-kaccounts-services/purpose-kaccounts-services-6.10.0.ebuild b/kde-frameworks/purpose-kaccounts-services/purpose-kaccounts-services-6.10.0.ebuild
new file mode 100644
index 000000000000..82f6491dccd4
--- /dev/null
+++ b/kde-frameworks/purpose-kaccounts-services/purpose-kaccounts-services-6.10.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# this is purely for service file creation
+ECM_I18N="false"
+ECM_HANDBOOK="false"
+KDE_ORG_NAME="${PN/-kaccounts-services/}"
+inherit ecm-common frameworks.kde.org
+
+DESCRIPTION="KAccounts generated service files for nextcloud and google services"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RDEPEND="
+	!<kde-frameworks/purpose-5.116.0-r2:5
+	!<kde-frameworks/purpose-6.5.0-r1:6
+"
+BDEPEND="kde-apps/kaccounts-integration:6"
+
+ecm-common_inject_heredoc() {
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		find_package(KAccounts6 REQUIRED)
+		kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/src/plugins/nextcloud/nextcloud-upload.service.in)
+		kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/src/plugins/youtube/google-youtube.service.in)
+	_EOF_
+}
+
+src_prepare() {
+	ecm-common_src_prepare
+
+	# Safety measure in case new services are added in the future
+	local known_num_of_services=2
+	local found_num_of_services=$(find . -iname "*service.in" | wc -l)
+	if [[ ${found_num_of_services} != ${known_num_of_services} ]]; then
+		eerror "Number of service files mismatch!"
+		eerror "Expected: ${known_num_of_services}"
+		eerror "Found: ${found_num_of_services}"
+		die
+	fi
+}
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index 0f07b33569ee..2d4ef833ad58 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,3 +1,4 @@
 DIST purpose-5.116.0.tar.xz 181148 BLAKE2B 9b4b267128511929fe0e81256f046552a1d70654c9a3e46ca52c2e5035003f96bf42cebf91b2ff0c19d8ca846b3dbd9106d5fd2df5dda11ec17c16bb8c419447 SHA512 3447135ad33c725e0512c6b20a9be81082737146fa0c5a32b0c7d50a21cb5697b2b4796d1cbffc8661dd845ee3ef51bc57af0c94cce0ed14cc1542df822139d5
+DIST purpose-6.10.0.tar.xz 188940 BLAKE2B a51200beca1dad78b164f276b1b4333455cc8af8f805fb9be4873789879e1f3edd2cbb69614ca4b192e036fa1bd4746bd7f4114e12cc1751e0877e4914dd6b6f SHA512 b6d847e4715a5779c10da92179db9d0a858c62582b729bcc25fc1d2e9796cfa634d4cb1cf49283c3d0364f96f97fc3420895ab4aad526920d65fcf2518e4b39f
 DIST purpose-6.7.0.tar.xz 177848 BLAKE2B ef67904e26edfec2cf19b461fd3060f134af17260ac483c7f893e6cc61afc12911cb587bcdd48034e0f49c87b46f394a8ad3cbb30f3786984d06312cd00bda02 SHA512 1366cdc84ae063ef07ff86f70f41b54f808b4a06d9a0864ef30c5457511254cc9c63c5521baa9dcfd1cc7ab066fc35c9acc11f41f94c799674a1e75b195d1d3b
 DIST purpose-6.9.0.tar.xz 179568 BLAKE2B fafe0cd546237fc0f295949f3fa26f71126d833169549bb79aa2aba6de882aab931f79ae5620b6dbdbde54801e883b2641d1954be9928c5e98fa67dd6f3f7f88 SHA512 24994cb11b34d9696a67157b0e2b63ed32a8f3f5e26ff8ef82c94ddffc62bf5b39810f985cb2581ce4e15104f96c79cdd8736de2c67fade7cf5f0e415eeab492
diff --git a/kde-frameworks/purpose/purpose-6.10.0.ebuild b/kde-frameworks/purpose/purpose-6.10.0.ebuild
new file mode 100644
index 000000000000..33ae136e9232
--- /dev/null
+++ b/kde-frameworks/purpose/purpose-6.10.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org optfeature xdg-utils
+
+DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="bluetooth webengine"
+
+# requires running environment
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kcoreaddons-${KDE_CATV}*:6
+	=kde-frameworks/ki18n-${KDE_CATV}*:6
+	=kde-frameworks/kio-${KDE_CATV}*:6
+	=kde-frameworks/kirigami-${KDE_CATV}*:6
+	=kde-frameworks/knotifications-${KDE_CATV}*:6
+	=kde-frameworks/kservice-${KDE_CATV}*:6
+	=kde-frameworks/prison-${KDE_CATV}*:6
+	webengine? (
+		kde-apps/kaccounts-integration:6
+		>=net-libs/accounts-qt-1.17[qt6(+)]
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kdeclarative-${KDE_CATV}:6
+	bluetooth? ( =kde-frameworks/bluez-qt-${KDE_CATV}*:6 )
+	webengine? (
+		>=kde-frameworks/purpose-kaccounts-services-${KDE_CATV}
+		>=net-libs/accounts-qml-0.7_p20231028[qt6(+)]
+	)
+"
+BDEPEND="webengine? ( dev-util/intltool )"
+
+src_prepare() {
+	ecm_src_prepare
+
+	use bluetooth ||
+		cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package webengine KAccounts6)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	# Shipped by kde-frameworks/purpose-kaccounts-services package for shared use w/ SLOT 5
+	use webengine && ECM_REMOVE_FROM_INSTALL=(
+		/usr/share/accounts/services/kde/{google-youtube,nextcloud-upload}.service
+	)
+	ecm_src_install
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Send through KDE Connect" kde-misc/kdeconnect
+	fi
+	ecm_pkg_postinst
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index 1f90506e3488..e589efab838b 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,3 +1,4 @@
 DIST qqc2-desktop-style-5.116.1.tar.xz 73068 BLAKE2B 713b863a08785f8d8a3509aad938818881e71bc2b966d10d823a805733bf2a5382337b7966a5c11c005ddf99a5e9ef377d59658568fc8cdcbdd1c35be41e1b09 SHA512 80520c19717f9150b6b0e91f45e65ef967f7fbadaff5b1f6bdab526822706a361e0094ded93826ea9fb2dc3028f8cd076e03b2067dbfc1d43ff764bc5ae5facb
+DIST qqc2-desktop-style-6.10.0.tar.xz 88972 BLAKE2B 45bf37292339d96531c8fe7abda489e08582d661bfba52b40d5c194788b462444d73eb860d5cc7f500316197e8a1c4f3425f35fcf64884d85ec4dddf946f392a SHA512 0075ed93195623a20fe79ca34d5b87aa8e7de00d8afbc1294804f90eb0a861fc357be5343ef57910ff21b6b6872bc695dd94e5456f4921964e778caff641d7fd
 DIST qqc2-desktop-style-6.7.0.tar.xz 87720 BLAKE2B 10fe8d08c6a01e5a54206186d296229f860d3d102390f6b3e29a5a49a66e444f0991c3d613ef80d2daa101311f39d3dc9757fbcafae9cc4cd08b497b835d02c0 SHA512 4660ee29d33d6140284267ff2cfdf2721fd437f1d4cf953448ed6b1368a9e068c60eb324acf407a7c5a7eb229a3956161162a7033d03bff4341b42080bec9eac
 DIST qqc2-desktop-style-6.9.0.tar.xz 88324 BLAKE2B 8ce9ccbb2bbfbfe08ff6a9bb41a6548be102ed57e79f898154af5d5d7c4d897b95b90f4776467d45efe8fc872ae68cf961e7454d548fb8c21a55c02eb901c167 SHA512 057aa1448393f94dc39edbb3b45fda3d84fb5986a37c5c62ced56ebe08f29d905d28d4d25bcb484e8b264cbab395baf27387a9c62f9f84495d2038d8c0e7bd96
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.10.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.10.0.ebuild
new file mode 100644
index 000000000000..7e980af38591
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.10.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ )"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# Qt_6_PRIVATE_API matches org.kde.desktop.so, see also:
+# https://invent.kde.org/frameworks/qqc2-desktop-style/-/merge_requests/379
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6=
+	=kde-frameworks/kcolorscheme-${KDE_CATV}*:6
+	=kde-frameworks/kconfig-${KDE_CATV}*:6
+	=kde-frameworks/kiconthemes-${KDE_CATV}*:6
+	=kde-frameworks/kirigami-${KDE_CATV}*:6
+	=kde-frameworks/sonnet-${KDE_CATV}*:6[qml]
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qt5compat-${QTMIN}:6
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+CMAKE_SKIP_TESTS=(
+	# bug 926509
+	animationspeedmodifiertest
+)
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 473c3190b834..422fd63e3643 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,3 +1,4 @@
 DIST solid-5.116.0.tar.xz 308000 BLAKE2B 5ed973327c23fb49c4377c4dd434bea2ecf343c9379927ef10ee11fcbef05c419da0423e4436b782dee62ca4d24ef6de25fc751e8014fcc1eb13b8293de4c4ae SHA512 1d6cb0c096bfede35a4b2963cd87e2ef0cb1a6be640d18c737434451e288645f7bbb0657c8ac780f3a60104c153b3b20ed7bd9c90b077d9aa7daea5740947b36
+DIST solid-6.10.0.tar.xz 307236 BLAKE2B f0da2569eff478d47659f478eeab0e48090bcfaf3f4d6062bcb67a103dc425fda6f226bfdcc45e87effa281eefd923c54df0d1b0df0d146a6ae9bb4f641de9e0 SHA512 6898f5fc53ae284b3c9315444dc31cea4cc847e063ab9cdbb98e77c444bf0580e4974bdd18fca275f7ecf90aab7ef467344a87a43bfbc02bb442d74e13e5fa59
 DIST solid-6.7.0.tar.xz 313280 BLAKE2B 421a477b083898aca47c76da5d3b78db731b1b4693c4a4bed612becf478163bab087afa6a73916ebd629480267113055af8564cf0628a2ee1c638807fc9d5774 SHA512 8a5e7670a932d2facccb1a082ff49530d3b16907f90411ba1081c057ce6c5e582aeea63e4e009a9fbf9b50dbe8b21f8af325b3793f8bca99e430cf6b47b32a23
 DIST solid-6.9.1.tar.xz 302320 BLAKE2B a525da8dd684f46b2830ca3bf7d6a5dd2c50d87bc13cd543b11584caaa7b1147fa4e2d6223c63ede7ac78f3956164481b45efe4783b8f25e620523abecc9c7d1 SHA512 4c1d55463a1ff8126e5eecdcabadfdeb284bf5df41b5d1843ec73312db2f0222e265af2c7d85512e8e2d0004775ff829a92074e96354c26d80dd65c105211762
diff --git a/kde-frameworks/solid/solid-6.10.0.ebuild b/kde-frameworks/solid/solid-6.10.0.ebuild
new file mode 100644
index 000000000000..4b2e8f4679b1
--- /dev/null
+++ b/kde-frameworks/solid/solid-6.10.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org optfeature
+
+DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="ios"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	sys-apps/util-linux
+	sys-fs/udisks:2
+	virtual/libudev:=
+	ios? (
+		app-pda/libimobiledevice:=
+		app-pda/libplist:=
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent] )
+"
+BDEPEND="
+	app-alternatives/lex
+	app-alternatives/yacc
+	>=dev-qt/qttools-${QTMIN}:6[linguist]
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package ios IMobileDevice)
+		$(cmake_use_find_package ios PList)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "media player devices support" app-misc/media-player-info
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index 4c9ac070426c..1b673243d423 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,3 +1,4 @@
 DIST sonnet-5.116.0.tar.xz 2406608 BLAKE2B 9ccdcf3ff032182ea5a76de9b2a523c48ada455cda5b997d534042bf25371c95bfc017d6d8c57fc16b49ad41e8049b0f51ea10c392b7bb4ba9d54d9de3ab26c0 SHA512 d40f721679f77d0eef706eddaa4369c63bb28a45852f0ad8f09518762ef249983dcdc1b4fac2b08fa37b2f4d53a6c301ec1abe2aab2af075ee52d442c248e88b
+DIST sonnet-6.10.0.tar.xz 2435832 BLAKE2B 74ba617a8b9048d15d10bc7b46b386b3ea8c29d51953bf38c74eabf08a9679204f21ba285d17873d7c5764641a7ace6a1ddfc82aeadd36d1db971783ab778b13 SHA512 3d9649640017afa4a114876a0e2da9a7d683a588a0e2e6ce97cba4e7103039e66b329eda27166d05d8e6bb43ca5fe4c5f29d77b2373cc7d9627d7fa38eec5275
 DIST sonnet-6.7.0.tar.xz 2433280 BLAKE2B d7c39c98e646c5f44ed2decccf05dcd974188698e225b59df200802092806891b02bfda5fc1e1013f5aa842ea91d9cf1dd8f807ac9b79ea3a763b5190b922aaf SHA512 b2cbf6029bc532d27ef151a4a2332d18840330e08195bcc902a26e1d3ad8d1eff555be17f3a951c03e82a8c144011af606c5ee6c33d2d764fca36d9b92f023a2
 DIST sonnet-6.9.0.tar.xz 2433648 BLAKE2B ccad4b673a61b28dcd3e854b680fd2193f5d1f5be778bd165b12e389592a1e98289aa90d0dba573872913a6cb4cb0ab631d2a0d70add3ef51231e5659c4b18ef SHA512 24c1eda93fb6d4e540f0dd6518eabcc37a00ec4ddc2fedae8b4f53a0618a9b4e1051b20041bd6113de6ea321719ede45d7efdd7f27c1bf0a3f4def11c34598a3
diff --git a/kde-frameworks/sonnet/sonnet-6.10.0.ebuild b/kde-frameworks/sonnet/sonnet-6.10.0.ebuild
new file mode 100644
index 000000000000..5a467857ea1e
--- /dev/null
+++ b/kde-frameworks/sonnet/sonnet-6.10.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
+
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="aspell +hunspell qml"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell:= )
+	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:6 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+CMAKE_SKIP_TESTS=(
+	# bug 779994
+	sonnet-test_autodetect
+	# bug 680032
+	sonnet-test_settings
+	sonnet-test_highlighter
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package aspell ASPELL)
+		$(cmake_use_find_package hunspell HUNSPELL)
+		-DSONNET_USE_QML=$(usex qml)
+	)
+	if ! use aspell && ! use hunspell; then
+		mycmakeargs+=( -DSONNET_NO_BACKENDS=ON )
+	fi
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index bd2c0649e7b1..2689abca2d97 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1,3 +1,4 @@
 DIST syndication-5.116.0.tar.xz 510556 BLAKE2B 76605eba6b7bbbbadeacb730a69655ddfa3d86339932281ee9f845c4e9c761de59ef1dfc92f4bfd11a64be1a97fc2e5e1e8bded7f416a14f469303c5233da199 SHA512 82ca9937286cc9ab525bb078b2c884c368be7d243462a636d50a005e8667666f5cfdc11b324be75269857bf9f143a7b3704fc6411600bbfb60acd30dd772181d
+DIST syndication-6.10.0.tar.xz 569532 BLAKE2B 7e7e1fbda91ca5772ef74142f6e108269df3127244aebf6c926b4d1f4d47a53ad9a26bd62518afbc80d28893c5a826fbb30731172e21dc9cc971678462a06224 SHA512 35f7a5743b0bd1926a3de6a8d4dd702960ce406b025086005e727c48a6f63d012b9e087bd7805c93c3a3133792a5f1a2b6511a7c60120717ddcd8e3265f03405
 DIST syndication-6.7.0.tar.xz 569472 BLAKE2B 2e7c4520a9ce07c1929e1049a0f98b9b5551b547e75910a96fb3d3e877b0a11dd4d982bcdb54ac7d0204fc073a5e487cf9202f99f6a995d2f2f4e84bfecac700 SHA512 5400fb0da49c7169d29181cb7e67d6ba07941b065e3a469d86c2b39959de7ae170738437b7cb2e628af3fe56255724ae1baae939adf3b92dbdd6653c00fa817f
 DIST syndication-6.9.0.tar.xz 569528 BLAKE2B 943a9e28a77c2345ba706ada8fcddd949ddb062f4e1da27f4117a1a875a52c3ace3744d997db11cfce5b4f458933916fa0a6d944d554e9a358b62795eb5a3ca6 SHA512 2c1bcf6b05436a033d2e26db329b59971232197441a76730bb3866591f2d472a6cf117970dc20f3288464668be89851aeeb47bcdd8aa6fa7bacdd099bfdf8cf1
diff --git a/kde-frameworks/syndication/syndication-6.10.0.ebuild b/kde-frameworks/syndication/syndication-6.10.0.ebuild
new file mode 100644
index 000000000000..053e0e279b67
--- /dev/null
+++ b/kde-frameworks/syndication/syndication-6.10.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Library for parsing RSS and Atom feeds"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[xml]
+	=kde-frameworks/kcodecs-${KDE_CATV}*:6
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtbase-${QTMIN}:6[network] )
+"
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index c4faa3677ca7..320a3b2b248e 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,3 +1,4 @@
 DIST syntax-highlighting-5.116.0.tar.xz 3432360 BLAKE2B 588924dfe0192d2538068e5b622ce2f8bec16d4203409dd99d7597024a4dfbcfefac070a022d48bb82717fb47dce9d8683405da818be7c624662b91656b0b86c SHA512 e8d0f424ad0349ef1a97fa6cb6a785ef9f2d20ca116b92ad4455bb87a61f868197cbb40e014a4eb0778aee12f40cf892af12717ebbd3545adf76afc05657d5a5
+DIST syntax-highlighting-6.10.0.tar.xz 3622340 BLAKE2B f21c6fedf5d71aca43fccea8d7e01567a1d86c7a57c8c39e1f84a20fc2db9a39de9965aa80d106dccb3e6844d8371f91e4cb9d60434da8e84c96d50a458ee83c SHA512 c60f9da6b6ae74e6582d7440f65512b3047d804591e947ce314c823f98b9820bd54badb64cca20463b4b6e490b9a4f787866bb1b6a8c666ca1deaa0257d63ef1
 DIST syntax-highlighting-6.7.0.tar.xz 3608988 BLAKE2B 422254bbab5825f42b4eb52276e4ca693a5284065c8c1983e0af1df95f99543583034f2a22e79ac22443838816ed0c81136d2067c09a54d3d066981a044a1b22 SHA512 764de790328c0fd6623740701ff3461f85c68e464b09ba63feb26cae8d33180e20a584589a9671662ef2cf8edb683b64cc4417edbb4a0663b7d34e54def5d697
 DIST syntax-highlighting-6.9.0.tar.xz 3617360 BLAKE2B 79e26b078ab2372d3205d79aea837a6f58a0cad62b1720af9fa51b4a263a3398a58b457a4231922d6f916012e97b7ada10855ab3b0e019706273822a8ae1cea9 SHA512 b12645488f49666f771de0f2d04b1b52505648cd9cbe594ccc9124918fd0c560f6c73800b38b050c162a4aeef4e60cfe03e6246673796e1fded4005d22e31e59
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-6.10.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-6.10.0.ebuild
new file mode 100644
index 000000000000..baf5aa37635b
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-6.10.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for syntax highlighting"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# examples: dev-qt/qtbase[printsupport,widgets]
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+"
+DEPEND="${RDEPEND}
+	dev-libs/xerces-c
+"
+BDEPEND="
+	dev-lang/perl
+	>=dev-qt/qttools-${QTMIN}:6[linguist]
+"
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index f06474ea56e4..d70dffcf7e61 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,3 +1,4 @@
 DIST threadweaver-5.116.0.tar.xz 1413124 BLAKE2B 0bc9d91fb46d53dfe608679f9b4898e9ce9f75a7f3e96cb8201cca260c0f5b7b183376e7498057023784c63f6af512c9dd6bc4f10fa69422991cede5ba3c3e18 SHA512 ef365148a91a54d3252ba831c5a49fe7e369850e5d86c87173c5b621eeb1132af6eb76e33e858499c7a2135073497d05519ca9cdb906881419272387aedc16d3
+DIST threadweaver-6.10.0.tar.xz 1414452 BLAKE2B ff861734613baf290f6d362ba0c638be3d81525ce836aa462791374c31b4c8fd886161eafa99fa6483920c92a7192f81ce58576bd44cd21e0d3290fff2a6ae03 SHA512 e7bec848778111991fff9bda59a653b87f658ab1216290243b84946c5f6b77be400cc712ea8d615ba0713c5a953bdf5ab65f6e33f5ea8d58c81e3f80a0950124
 DIST threadweaver-6.7.0.tar.xz 1414496 BLAKE2B 3e2efb20c08a11445867dfb00ffcaaca64513c4b400ab25c0fbf9ef24e7cfa4e0b5812fcf25944e22ecc39ae1a91a2fc57b7fd44ba17ae22fcfac027e4a529d1 SHA512 046e4e3007cc12d86871e31944232fe2096ef92b53405ce1675addc35383b9816cfb80d682262eef12c29cfeab646cc493baa40a6fb35dee8b879dcacf59428f
 DIST threadweaver-6.9.0.tar.xz 1414480 BLAKE2B 38934d7a2eceb551ca1d582b9f5f54350a9def278fb228b559b96379b48a17899c503bd201f098289b70a3660d83204681b86621e1c51332d883e7084c6e1271 SHA512 061cc831c979ebfc8e8d1432b69110e4f174c6bde572312b4826d7fcad6c0ff1c438664957817c6f39b254160518efb8effd9160eb1dc28f8503a2cf1eaaae9c
diff --git a/kde-frameworks/threadweaver/threadweaver-6.10.0.ebuild b/kde-frameworks/threadweaver/threadweaver-6.10.0.ebuild
new file mode 100644
index 000000000000..21bf55c9644c
--- /dev/null
+++ b/kde-frameworks/threadweaver/threadweaver-6.10.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+src_prepare() {
+	cmake_comment_add_subdirectory benchmarks
+	ecm_src_prepare
+}
diff --git a/kde-misc/colord-kde/Manifest b/kde-misc/colord-kde/Manifest
index 4d8cb4912f32..5a58060de245 100644
--- a/kde-misc/colord-kde/Manifest
+++ b/kde-misc/colord-kde/Manifest
@@ -1,2 +1,2 @@
 DIST colord-kde-24.08.3.tar.xz 117728 BLAKE2B 3da13276e7f4b80de36d0ac4dda1afd5e03d7dc3db8bf2ac5a968f153c3746fb286075259e33267abfec809aa72e8feaffba4056d9a2655e79921c966d8b42ad SHA512 95ad43be7ab43934499bc7879172e83f3503e571ac571a3d60cdb489da3eb5be20a4c9153167ce337473bf938541cdedd0ac4397dd3f93bfd1e708394f6b18b2
-DIST colord-kde-24.12.0.tar.xz 117832 BLAKE2B e5d79cd3e47dd99818a39f56f9be153d770b087297bf3b2f4c9fbad6f1c175f4041192d5170f814e05cff95548da0d8c81c2298bc0550bd1f371ec76f7eab5e5 SHA512 02c3f31d69c8f0b3f2020bd3fb01c88c3e57ad6514016b9dcc77286e65bac73e69b5a2bdb70827623e21a2f35d88690281ea2940095171ee90fe603363cec10e
+DIST colord-kde-24.12.1.tar.xz 117808 BLAKE2B 85735f73e0f365887a3959c2a52d0c5e7b0728fbb12cb23125e1eed4f084055a259e41ef3928f53f21273dec890e690184d6408b62f8d3a75323dc7010cfde75 SHA512 77e426edb6e76502ae2f13373666c60feb99a32ded12d466df8e8265a7c1556e21423be5f488163af6966e9b59983a67e75132be6ddce195ac0031ac105b5bce
diff --git a/kde-misc/colord-kde/colord-kde-24.12.0.ebuild b/kde-misc/colord-kde/colord-kde-24.12.0.ebuild
deleted file mode 100644
index 534c3859c950..000000000000
--- a/kde-misc/colord-kde/colord-kde-24.12.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY=graphics
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Provides interfaces and session daemon to colord"
-HOMEPAGE="https://invent.kde.org/graphics/colord-kde"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	media-libs/lcms:2
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-libs/kirigami-addons:6
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	x11-misc/colord
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITHOUT_X11=$(usex !X)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	if ! has_version "gnome-extra/gnome-color-manager"; then
-		elog "You may want to install gnome-extra/gnome-color-manager to add support for"
-		elog "colorhug calibration devices."
-	fi
-}
diff --git a/kde-misc/colord-kde/colord-kde-24.12.1.ebuild b/kde-misc/colord-kde/colord-kde-24.12.1.ebuild
new file mode 100644
index 000000000000..d2ed4e2e3d15
--- /dev/null
+++ b/kde-misc/colord-kde/colord-kde-24.12.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY=graphics
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Provides interfaces and session daemon to colord"
+HOMEPAGE="https://invent.kde.org/graphics/colord-kde"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	media-libs/lcms:2
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-libs/kirigami-addons:6
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	x11-misc/colord
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITHOUT_X11=$(usex !X)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	if ! has_version "gnome-extra/gnome-color-manager"; then
+		elog "You may want to install gnome-extra/gnome-color-manager to add support for"
+		elog "colorhug calibration devices."
+	fi
+}
diff --git a/kde-misc/kclock/Manifest b/kde-misc/kclock/Manifest
index 9a11c13a2479..10bbee7c4d72 100644
--- a/kde-misc/kclock/Manifest
+++ b/kde-misc/kclock/Manifest
@@ -1,2 +1,2 @@
 DIST kclock-24.08.3.tar.xz 660868 BLAKE2B 03f4f0211d5f69696d1865be80cc540a257777f2ad27bd475952ce7cf2ad620e5cd7bf43cfd66fb83c2abaa3b55fa4cdbebd39324291c86f4d0e32601a35d0f2 SHA512 fb2a827076c110fc2abaa067b7152f686742aedef074da7ffcd739122f992aebeb4cb8e223bb85d791bf94aae833862bd8b415c6794e1898f4c249c825c23d0d
-DIST kclock-24.12.0.tar.xz 662072 BLAKE2B 12cc3878df999f5d3b5c6be744cdda131f253615f33bc99fbc187c98ff320093312a9c6dbfbbf4354610bd78464c75859b85bf6ec01706e86fd44e58cbac40a8 SHA512 776f5f107a8d2a07d919551c783a78916bd832d8b1c2dde45eb9778e85e9c861189e657480aa296b6e68501acf511fad3997e5cf1d9bbae2463a0dbf259fe821
+DIST kclock-24.12.1.tar.xz 662196 BLAKE2B 6d1867e84521be616a555165fd2ae07c67cde253793d73e2a183d7dffd0d93ba0f190863cfcbd9c2e1afc9691e802e5b72c562b1c8299b477ddf5bb50788a60d SHA512 4accb69b526e476e085869d9c91727cd9c396b3dc5cd56cad6f0c707829ed6ac7d76e982cd5eb34e4432b1c80b05514db0a6cf104808e48a3c3118dc0d01627a
diff --git a/kde-misc/kclock/kclock-24.12.0.ebuild b/kde-misc/kclock/kclock-24.12.0.ebuild
deleted file mode 100644
index 641b5cc9d244..000000000000
--- a/kde-misc/kclock/kclock-24.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="utilities"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Convergent clock application for Plasma"
-HOMEPAGE="https://apps.kde.org/kclock/"
-
-LICENSE="CC0-1.0 CC-BY-4.0 GPL-2+ GPL-3+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-DEPEND="
-	dev-libs/kirigami-addons:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	kde-plasma/libplasma:6
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qt5compat-${QTMIN}:6[qml]
-"
diff --git a/kde-misc/kclock/kclock-24.12.1.ebuild b/kde-misc/kclock/kclock-24.12.1.ebuild
new file mode 100644
index 000000000000..24594ecacdb8
--- /dev/null
+++ b/kde-misc/kclock/kclock-24.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="utilities"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Convergent clock application for Plasma"
+HOMEPAGE="https://apps.kde.org/kclock/"
+
+LICENSE="CC0-1.0 CC-BY-4.0 GPL-2+ GPL-3+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	dev-libs/kirigami-addons:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	kde-plasma/libplasma:6
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+"
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index 6e5adedc2992..ec45b588f842 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,2 +1,2 @@
 DIST kdeconnect-kde-24.08.3.tar.xz 707088 BLAKE2B 9efc3d54998e352242bea48bfbfc413288e5344e49c71f93d9dda3f7de04706ef6b2acf004feca70fb573023c9c251c1ef0a804533b83d1636c14b9dbdd3e832 SHA512 10a1fa9db38ab06f8aa4dbe6a8f34082bc14d466d82c900f2946921897eec44085efdb9c78ec34f402f6de7b6e469aee16af031f64098096bdad11310a29e52e
-DIST kdeconnect-kde-24.12.0.tar.xz 714468 BLAKE2B 0e38f743d4cbdce85d53f70a7426a1db351a121f1aab3f41734c432f8b8d4ed5298c36d06d943077d4c9d116eb714d1c06a5a4c71de333446a5a70b02ed0a641 SHA512 506b2d6b037eafb80a1c7db15a880590a6a07b235fc0eba05863d25ffaaf3b8ad17bd3f67f35b99643d3e40bf59f7b747712fe9de08f0dbf1eca68cdb0a1e93d
+DIST kdeconnect-kde-24.12.1.tar.xz 715556 BLAKE2B 0bb5c3b6a4dd423ba4bcc93f1df2b2b1e87d16e7b8e5fa504ed3cc99fc4e4a42ce208ba44d95dab2d308d24a6ac48ee887f603b6ce8db47b2bbca4aa82d7a896 SHA512 68d1e4a9799a09d74f761b0bdf7e96a02c944941a7ce6d10bc1204b4f64bcbb436665b778a485cbfe42634c75331a8d5e578840782cee5dd267fef49d8f0698c
diff --git a/kde-misc/kdeconnect/kdeconnect-24.12.0.ebuild b/kde-misc/kdeconnect/kdeconnect-24.12.0.ebuild
deleted file mode 100644
index 1d8f3a2fc360..000000000000
--- a/kde-misc/kdeconnect/kdeconnect-24.12.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KDE_ORG_NAME="${PN}-kde"
-KDE_SELINUX_MODULE="${PN}"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm flag-o-matic gear.kde.org
-
-DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
-HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect/"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="bluetooth pulseaudio telephony zeroconf X"
-
-RESTRICT="test"
-
-# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
-# TODO: make conditional on X upstream
-COMMON_DEPEND="
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.15.0
-	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,network,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
-	>=dev-qt/qtmultimedia-${QTMIN}:6
-	>=dev-qt/qtwayland-${QTMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6[qml]
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kpeople-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-	sys-apps/dbus
-	x11-libs/libxkbcommon
-	bluetooth? ( >=dev-qt/qtconnectivity-${QTMIN}:6[bluetooth] )
-	pulseaudio? ( >=media-libs/pulseaudio-qt-1.4:= )
-	telephony? ( >=kde-frameworks/modemmanager-qt-${KFMIN}:6 )
-	zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:6 )
-	X? (
-		x11-libs/libfakekey
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/wayland-protocols
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-libs/kirigami-addons:6
-	>=dev-qt/qt5compat-${QTMIN}:6[qml]
-	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
-	|| (
-		>=dev-qt/qttools-${QTMIN}:6[qdbus]
-		dev-qt/qdbus:*
-	)
-	>=kde-frameworks/kdeclarative-${KFMIN}:6
-	kde-plasma/libplasma:6
-	net-fs/sshfs
-"
-BDEPEND="
-	>=dev-qt/qtwayland-${QTMIN}:6
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/921648
-	# https://bugs.kde.org/show_bug.cgi?id=480522
-	filter-lto
-
-	local mycmakeargs=(
-		-DMDNS_ENABLED=$(usex zeroconf)
-		-DBLUETOOTH_ENABLED=$(usex bluetooth)
-		-DWITH_PULSEAUDIO=$(usex pulseaudio)
-		$(cmake_use_find_package telephony KF6ModemManagerQt)
-		-DWITH_X11=$(usex X)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	elog "The Android .apk file is available via"
-	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
-	elog "or via"
-	elog "https://f-droid.org/packages/org.kde.kdeconnect_tp/"
-}
diff --git a/kde-misc/kdeconnect/kdeconnect-24.12.1.ebuild b/kde-misc/kdeconnect/kdeconnect-24.12.1.ebuild
new file mode 100644
index 000000000000..e869e1ea6e37
--- /dev/null
+++ b/kde-misc/kdeconnect/kdeconnect-24.12.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KDE_ORG_NAME="${PN}-kde"
+KDE_SELINUX_MODULE="${PN}"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm flag-o-matic gear.kde.org
+
+DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
+HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="bluetooth pulseaudio telephony zeroconf X"
+
+RESTRICT="test"
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+# TODO: make conditional on X upstream
+COMMON_DEPEND="
+	dev-libs/openssl:=
+	>=dev-libs/wayland-1.15.0
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,network,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6[qml]
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kpeople-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	sys-apps/dbus
+	x11-libs/libxkbcommon
+	bluetooth? ( >=dev-qt/qtconnectivity-${QTMIN}:6[bluetooth] )
+	pulseaudio? ( >=media-libs/pulseaudio-qt-1.4:= )
+	telephony? ( >=kde-frameworks/modemmanager-qt-${KFMIN}:6 )
+	zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:6 )
+	X? (
+		x11-libs/libfakekey
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/wayland-protocols
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-libs/kirigami-addons:6
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+	|| (
+		>=dev-qt/qttools-${QTMIN}:6[qdbus]
+		dev-qt/qdbus:*
+	)
+	>=kde-frameworks/kdeclarative-${KFMIN}:6
+	kde-plasma/libplasma:6
+	net-fs/sshfs
+"
+BDEPEND="
+	>=dev-qt/qtwayland-${QTMIN}:6
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/921648
+	# https://bugs.kde.org/show_bug.cgi?id=480522
+	filter-lto
+
+	local mycmakeargs=(
+		-DMDNS_ENABLED=$(usex zeroconf)
+		-DBLUETOOTH_ENABLED=$(usex bluetooth)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		$(cmake_use_find_package telephony KF6ModemManagerQt)
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	elog "The Android .apk file is available via"
+	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
+	elog "or via"
+	elog "https://f-droid.org/packages/org.kde.kdeconnect_tp/"
+}
diff --git a/kde-misc/kio-fuse/kio-fuse-5.1.0-r1.ebuild b/kde-misc/kio-fuse/kio-fuse-5.1.0-r1.ebuild
index 7f6ecd0ab890..d14a88d8cdb6 100644
--- a/kde-misc/kio-fuse/kio-fuse-5.1.0-r1.ebuild
+++ b/kde-misc/kio-fuse/kio-fuse-5.1.0-r1.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 @@ HOMEPAGE="https://feverfew.home.blog/2019/12/24/kiofuse-beta-4-9-0-released/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/kde-misc/kio-gdrive-common/Manifest b/kde-misc/kio-gdrive-common/Manifest
index 3bc4aeb0efe0..0e5f5a9b3e6e 100644
--- a/kde-misc/kio-gdrive-common/Manifest
+++ b/kde-misc/kio-gdrive-common/Manifest
@@ -1,2 +1,2 @@
 DIST kio-gdrive-24.08.3.tar.xz 82152 BLAKE2B 5fb212bd189f8f1f12572d928654affaa0c28254a436ae3a4f2d03b0ad2db2d2320143c7d3bfcd7822ea461e46f737c0bac163941179fd4dfa59d9118991f3ac SHA512 26c2d647263504b7afd66de84573d5a84f211b901c819368a2823fc95625b3ff81f7d58aefbfba71cf9f2861bdef550e9e3db832ee2b9ddfcb2cc7ab28a10751
-DIST kio-gdrive-24.12.0.tar.xz 80120 BLAKE2B ca0a453e90bb9d738764025e3285ed1f8e193d8e0d7309369e10a807fe4041070b1fbb23d198b8d91c90f08850264a58bac02ea0ce4dabfa7c7fedcf4844def5 SHA512 6361fad1a770cf4b9d9da2a2350842af90d68efe422dbbead21b849b6a5fd49fffd65cb6e6ccda7bb2b3828ef871bd9cd46ff5d041569177471be786ddd777ba
+DIST kio-gdrive-24.12.1.tar.xz 80232 BLAKE2B e151192c1310e5877e21a05e31bb8cefbe6451c32c15d04dfe208d45711835b1f739deb4bd7934a77062fdcb962885f861d03992243101ffdb508472a3285384 SHA512 3f03e803c9bde9465ffaecba353ad451396ac587f36cacbf928360e7a6071d123adcbb17da5df7d775f4bc9e009a07c19cc134b2e556bf073500161806af80e0
diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.12.0.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.12.0.ebuild
deleted file mode 100644
index b26da54ded21..000000000000
--- a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.12.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="true"
-KDE_ORG_CATEGORY="network"
-KDE_ORG_NAME="${PN/-common/}"
-inherit ecm-common gear.kde.org
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	!<kde-misc/kio-gdrive-23.08.5-r2:5
-	!<kde-misc/kio-gdrive-24.05.2-r1:6
-"
-BDEPEND="kde-apps/kaccounts-integration:6"
-
-ECM_INSTALL_FILES=(
-	desktop/gdrive-network.desktop:\${KDE_INSTALL_DATADIR}/remoteview
-	desktop/org.kde.kio_gdrive.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
-)
-
-ecm-common_inject_heredoc() {
-	cat >> CMakeLists.txt <<- _EOF_ || die
-		find_package(KAccounts6 REQUIRED)
-		kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/kaccounts/google-drive.service.in)
-	_EOF_
-}
-
-src_prepare() {
-	ecm-common_src_prepare
-
-	# Safety measure in case new services are added in the future
-	local known_num_of_services=1
-	local found_num_of_services=$(find . -iname "*service.in" | wc -l)
-	if [[ ${found_num_of_services} != ${known_num_of_services} ]]; then
-		eerror "Number of service files mismatch!"
-		eerror "Expected: ${known_num_of_services}"
-		eerror "Found: ${found_num_of_services}"
-		die
-	fi
-}
diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.12.1.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.12.1.ebuild
new file mode 100644
index 000000000000..91327ac4686c
--- /dev/null
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.12.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+KDE_ORG_CATEGORY="network"
+KDE_ORG_NAME="${PN/-common/}"
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	!<kde-misc/kio-gdrive-23.08.5-r2:5
+	!<kde-misc/kio-gdrive-24.05.2-r1:6
+"
+BDEPEND="kde-apps/kaccounts-integration:6"
+
+ECM_INSTALL_FILES=(
+	desktop/gdrive-network.desktop:\${KDE_INSTALL_DATADIR}/remoteview
+	desktop/org.kde.kio_gdrive.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
+)
+
+ecm-common_inject_heredoc() {
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		find_package(KAccounts6 REQUIRED)
+		kaccounts_add_service(\${CMAKE_CURRENT_SOURCE_DIR}/kaccounts/google-drive.service.in)
+	_EOF_
+}
+
+src_prepare() {
+	ecm-common_src_prepare
+
+	# Safety measure in case new services are added in the future
+	local known_num_of_services=1
+	local found_num_of_services=$(find . -iname "*service.in" | wc -l)
+	if [[ ${found_num_of_services} != ${known_num_of_services} ]]; then
+		eerror "Number of service files mismatch!"
+		eerror "Expected: ${known_num_of_services}"
+		eerror "Found: ${found_num_of_services}"
+		die
+	fi
+}
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index 3bc4aeb0efe0..0e5f5a9b3e6e 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,2 +1,2 @@
 DIST kio-gdrive-24.08.3.tar.xz 82152 BLAKE2B 5fb212bd189f8f1f12572d928654affaa0c28254a436ae3a4f2d03b0ad2db2d2320143c7d3bfcd7822ea461e46f737c0bac163941179fd4dfa59d9118991f3ac SHA512 26c2d647263504b7afd66de84573d5a84f211b901c819368a2823fc95625b3ff81f7d58aefbfba71cf9f2861bdef550e9e3db832ee2b9ddfcb2cc7ab28a10751
-DIST kio-gdrive-24.12.0.tar.xz 80120 BLAKE2B ca0a453e90bb9d738764025e3285ed1f8e193d8e0d7309369e10a807fe4041070b1fbb23d198b8d91c90f08850264a58bac02ea0ce4dabfa7c7fedcf4844def5 SHA512 6361fad1a770cf4b9d9da2a2350842af90d68efe422dbbead21b849b6a5fd49fffd65cb6e6ccda7bb2b3828ef871bd9cd46ff5d041569177471be786ddd777ba
+DIST kio-gdrive-24.12.1.tar.xz 80232 BLAKE2B e151192c1310e5877e21a05e31bb8cefbe6451c32c15d04dfe208d45711835b1f739deb4bd7934a77062fdcb962885f861d03992243101ffdb508472a3285384 SHA512 3f03e803c9bde9465ffaecba353ad451396ac587f36cacbf928360e7a6071d123adcbb17da5df7d775f4bc9e009a07c19cc134b2e556bf073500161806af80e0
diff --git a/kde-misc/kio-gdrive/kio-gdrive-24.12.0.ebuild b/kde-misc/kio-gdrive/kio-gdrive-24.12.0.ebuild
deleted file mode 100644
index b2d6dda291ea..000000000000
--- a/kde-misc/kio-gdrive/kio-gdrive-24.12.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoff"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="network"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO worker for Google Drive service"
-HOMEPAGE="https://apps.kde.org/kio_gdrive/"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="+share"
-
-COMMON_DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	kde-apps/kaccounts-integration:6
-	kde-apps/libkgapi:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtbase-${QTMIN}:6[network]
-"
-RDEPEND="${COMMON_DEPEND}
-	kde-apps/kaccounts-providers:6
-	>=kde-misc/${PN}-common-${PV}
-	share? ( !${CATEGORY}/${PN}:5[share,-kf6compat(-)] )
-"
-BDEPEND="dev-util/intltool"
-
-DOCS=( README.md )
-
-ECM_REMOVE_FROM_INSTALL=(
-	/usr/share/accounts/services/kde/google-drive.service
-	/usr/share/metainfo/org.kde.kio_gdrive.metainfo.xml
-	/usr/share/remoteview/gdrive-network.desktop
-)
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package share KF6Purpose)
-	)
-	ecm_src_configure
-}
diff --git a/kde-misc/kio-gdrive/kio-gdrive-24.12.1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-24.12.1.ebuild
new file mode 100644
index 000000000000..93718a4f9092
--- /dev/null
+++ b/kde-misc/kio-gdrive/kio-gdrive-24.12.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoff"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="network"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO worker for Google Drive service"
+HOMEPAGE="https://apps.kde.org/kio_gdrive/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+share"
+
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	kde-apps/kaccounts-integration:6
+	kde-apps/libkgapi:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[network]
+"
+RDEPEND="${COMMON_DEPEND}
+	kde-apps/kaccounts-providers:6
+	>=kde-misc/${PN}-common-${PV}
+	share? ( !${CATEGORY}/${PN}:5[share,-kf6compat(-)] )
+"
+BDEPEND="dev-util/intltool"
+
+DOCS=( README.md )
+
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/accounts/services/kde/google-drive.service
+	/usr/share/metainfo/org.kde.kio_gdrive.metainfo.xml
+	/usr/share/remoteview/gdrive-network.desktop
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package share KF6Purpose)
+	)
+	ecm_src_configure
+}
diff --git a/kde-misc/kweather/Manifest b/kde-misc/kweather/Manifest
index cd882cc9be53..143140b3fc1a 100644
--- a/kde-misc/kweather/Manifest
+++ b/kde-misc/kweather/Manifest
@@ -1,2 +1,2 @@
 DIST kweather-24.08.3.tar.xz 416828 BLAKE2B b820c439298b78c3e22cdb9eeb229abab2cb5f39d41347ee6e6367b3b52aac996153a84895f09e63d54b41a0f5b4bf008496980026670866159ede5c56862bd0 SHA512 51b8488915c871e6c92339583da4f768b1bdc97bfdb823493867c1e70421130507f0105402aa7fb442b012d92e127a6d56deedc4522eb926742932a48f36a4a9
-DIST kweather-24.12.0.tar.xz 362108 BLAKE2B afd88fad3a9675c05b548f3a7e0eb2f12687b575520be656e57b35ba84af7c0358abc06e211364799355b6a90dd8f36aac97c04da0c97f985f623879d8aa85c6 SHA512 596edff49f8f8253f7da7e52573247dbfa50e75dc50e68ff82530d8e22a1e75e274da86ac029ae35cfd9c103d56286e8423f826051bf8f870a52692b38d36145
+DIST kweather-24.12.1.tar.xz 362064 BLAKE2B ab7bfcb1280699896e80b744bc8ee4a6e05ea07782ea4cf566e17a9342322f8320787df3887a03b78363c50febb15a8fba89f1c2091fd9e690f9868679878ee0 SHA512 18700612e00e95016a52efef3ec34b82c29ffe486169ac7e24d722da8be75bd433a970bdf0b1ea2f778881e002e9be44000025bbafe99014463b1874d42ccc69
diff --git a/kde-misc/kweather/kweather-24.12.0.ebuild b/kde-misc/kweather/kweather-24.12.0.ebuild
deleted file mode 100644
index eaf3a274d945..000000000000
--- a/kde-misc/kweather/kweather-24.12.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="utilities"
-ECM_TEST="false"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Weather forecast application for Plasma with flat and dynamic/animated views"
-HOMEPAGE="https://apps.kde.org/kweather/"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-DEPEND="
-	dev-libs/kirigami-addons:6
-	dev-libs/kweathercore:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,opengl,widgets]
-	>=dev-qt/qtcharts-${QTMIN}:6[qml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kholidays-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	kde-plasma/libplasma:6
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qt5compat-${QTMIN}:6[qml]
-	>=dev-qt/qtpositioning-${QTMIN}:6[geoclue]
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	sed -e "/include(ECMCheckOutboundLicense)/s/^/#DONT /" \
-		-e "/ecm_check_outbound_license/s/^/#DONT /" \
-		-i CMakeLists.txt || die # avoid cmake spam about python, reusetool
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PLASMOID=ON
-	)
-	ecm_src_configure
-}
diff --git a/kde-misc/kweather/kweather-24.12.1.ebuild b/kde-misc/kweather/kweather-24.12.1.ebuild
new file mode 100644
index 000000000000..a3e22c315f04
--- /dev/null
+++ b/kde-misc/kweather/kweather-24.12.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="utilities"
+ECM_TEST="false"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Weather forecast application for Plasma with flat and dynamic/animated views"
+HOMEPAGE="https://apps.kde.org/kweather/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	dev-libs/kirigami-addons:6
+	dev-libs/kweathercore:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,opengl,widgets]
+	>=dev-qt/qtcharts-${QTMIN}:6[qml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kholidays-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	kde-plasma/libplasma:6
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtpositioning-${QTMIN}:6[geoclue]
+"
+
+src_prepare() {
+	ecm_src_prepare
+
+	sed -e "/include(ECMCheckOutboundLicense)/s/^/#DONT /" \
+		-e "/ecm_check_outbound_license/s/^/#DONT /" \
+		-i CMakeLists.txt || die # avoid cmake spam about python, reusetool
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PLASMOID=ON
+	)
+	ecm_src_configure
+}
diff --git a/kde-misc/markdownpart/Manifest b/kde-misc/markdownpart/Manifest
index 2dc66594f077..6023014a2de7 100644
--- a/kde-misc/markdownpart/Manifest
+++ b/kde-misc/markdownpart/Manifest
@@ -1,2 +1,2 @@
 DIST markdownpart-24.08.3.tar.xz 34108 BLAKE2B 771df677c9ff46e2cb20053983f7b1c8e41cffdb3c4a6d946113c1d242ed28b7aad3dd973822b3abbfb6f7fbf14d3bef152b80d4117c4fa6bf486f1cbf331679 SHA512 d60b5862c0114b9b63e4bf7ce67a0013a4a26ba58ba90358372153a19c503c151e10525922e02b9f9d9104462ff22c22208fbc38c27c5004bdfd51cc2445f1f5
-DIST markdownpart-24.12.0.tar.xz 34284 BLAKE2B 9927b401dc46a14dbf69f0710ddc58868c887c5b23ced51e4c899a05a78f75592052478f1d8ae9185442c51152d3781d295bf16b9d3336a2a9ba0298720da789 SHA512 c3343e324ee5df031f6317c19ff3dac8091fa2532dac17d827331722ce7136acee977ec705cea8a75e835ff8113efb351cd0490e40d2ca7fa2e41c637b7aa71d
+DIST markdownpart-24.12.1.tar.xz 34316 BLAKE2B 0b06a964abc02aba514cd0a20fb86d9dbb118be4923bd1a2133711ff7f9b711d9fecbede4f10da64eafdc2bcf6a92621d113896f65f2516f127ad52c689a4c46 SHA512 52929eca5330c5c2744e657697bd0795971a6e69ce6033bbb50304cc64fafaff47825c0d3c516e68c8e2fc29213e307a7c376402bc025da1d6334e806442b21b
diff --git a/kde-misc/markdownpart/markdownpart-24.12.0.ebuild b/kde-misc/markdownpart/markdownpart-24.12.0.ebuild
deleted file mode 100644
index 4b5c9ca6cf41..000000000000
--- a/kde-misc/markdownpart/markdownpart-24.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY=utilities
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Markdown viewer KParts plugin based on QTextDocument"
-HOMEPAGE="https://apps.kde.org/markdownpart/"
-
-LICENSE="LGPL-2.1+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-misc/markdownpart/markdownpart-24.12.1.ebuild b/kde-misc/markdownpart/markdownpart-24.12.1.ebuild
new file mode 100644
index 000000000000..82729497496c
--- /dev/null
+++ b/kde-misc/markdownpart/markdownpart-24.12.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY=utilities
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Markdown viewer KParts plugin based on QTextDocument"
+HOMEPAGE="https://apps.kde.org/markdownpart/"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest
index 7bff2208f4db..b046a1741e75 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1,2 +1,2 @@
 DIST skanlite-24.08.3.tar.xz 2383968 BLAKE2B 330ae86800c009b9037eb3011793ca9b94b515bb2c92ced44d1eda0ffbe54ac4296b8b50b4f80f8f96fe6b208ae824f20c618f399f8b284d2fa7e3f996e5e89c SHA512 38fa2e384421c1c99a254670b6829df810ccffef98fb3e6e8787a70519bb6fdb4d8cf2da76dcb0133362cf85895a0e225f52c0e30175d079812e6cde96242359
-DIST skanlite-24.12.0.tar.xz 2390876 BLAKE2B 31ac496c639a9a1baf80f22b94067520bd6574e6c6be725b4cfbe8bb9e743341ad68c5e573ecbba73c27fc37a0cf8a23cd575e0039ec8cd7ccf2fdd20499149a SHA512 9c8016e2c2117386dbdb1addfab81ffbf1336ea637183e18cd81f4b06e7bdd3c72548aaa4dc1e2731d3731ba4d9e0c5363b8cf1eac3d4de569467ee377021bd7
+DIST skanlite-24.12.1.tar.xz 2390912 BLAKE2B 4036636b6cc709f021a6a0726d88dcf53d5dea6853d215a4366e7f333b278a8af545d21a1aa58fafb66229f1b34b5ad1b44f3e74cf6bf1f93b0b11e2a3ca9507 SHA512 41c9db86e8913052140373953072f34fdcee4f0fdb89d9a74d41d3d13c1570ed3fb6ab6dc3e5ef06ffd28eb94c91afbfb9d9b02735876ecff31023dde61c02a7
diff --git a/kde-misc/skanlite/skanlite-24.12.0.ebuild b/kde-misc/skanlite/skanlite-24.12.0.ebuild
deleted file mode 100644
index d627fddd1a85..000000000000
--- a/kde-misc/skanlite/skanlite-24.12.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
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="graphics"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Simple image scanning application based on libksane and KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/skanlite/"
-
-LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-apps/libksane-${PVCUT}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-misc/skanlite/skanlite-24.12.1.ebuild b/kde-misc/skanlite/skanlite-24.12.1.ebuild
new file mode 100644
index 000000000000..e030b4b555ec
--- /dev/null
+++ b/kde-misc/skanlite/skanlite-24.12.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="graphics"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Simple image scanning application based on libksane and KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/skanlite/"
+
+LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-apps/libksane-${PVCUT}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index ea3b34e5c9fd..80814fe4d98b 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1 +1,2 @@
 DIST tellico-4.0.1.tar.xz 6779796 BLAKE2B 0f3fb590a5fc96956de2ce9527f1c866a864b371a8e1cd348bc574004ac08a9f43f73e11c85e45f58bbb778d2f9c7b68f3ddcafcc6bac515468ddd1253e063cd SHA512 d4b54a9c1a65928cf19bd8134723d454950d154bb9eeee47e5cb21fa1e9497192714d4222a02b63627d7d49248f3da794c76ce7dae22cec2496d44ad8cf850ee
+DIST tellico-4.1.tar.xz 6843316 BLAKE2B fbf386d48f7927d920ae858b96ab5d5b114ff1f6c89d094ca4a467cc5e12ce85a97369c17d0e142b6665cd0bb01d50a914763419636872e13004ba7791866142 SHA512 fa72ddcfa9aaf5776bed47edcea4520d40275375abeafce5c936d5e5c18b1495efa7d041abc96cc3d02655c71403fd0889585aeb6c20bed3c9b28297ad467d66
diff --git a/kde-misc/tellico/tellico-4.1.ebuild b/kde-misc/tellico/tellico-4.1.ebuild
new file mode 100644
index 000000000000..af450c7372bf
--- /dev/null
+++ b/kde-misc/tellico/tellico-4.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm kde.org
+
+DESCRIPTION="Collection manager based on KDE Frameworks"
+HOMEPAGE="https://tellico-project.org/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="https://tellico-project.org/files/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+IUSE="bibtex cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
+
+# tests need network access
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=dev-qt/qtcharts-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	bibtex? ( >=dev-perl/Text-BibTeX-0.780.0-r1 )
+	cddb? ( kde-apps/libkcddb:6 )
+	discid? ( dev-libs/libcdio:= )
+	pdf? ( app-text/poppler[qt6] )
+	scanner? ( kde-apps/libksane:6 )
+	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:6 )
+	taglib? ( >=media-libs/taglib-1.5:= )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	xmp? ( >=media-libs/exempi-2:= )
+	yaz? ( >=dev-libs/yaz-2:0= )
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5
+"
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
+		-DENABLE_BTPARSE=$(usex bibtex)
+		$(cmake_use_find_package cddb KCddb6)
+		$(cmake_use_find_package discid CDIO)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package scanner KSaneWidgets6)
+		$(cmake_use_find_package semantic-desktop KF6FileMetaData)
+		$(cmake_use_find_package taglib Taglib)
+		-DENABLE_WEBCAM=$(usex v4l)
+		$(cmake_use_find_package xmp Exempi)
+		$(cmake_use_find_package yaz Yaz)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-misc/zanshin/Manifest b/kde-misc/zanshin/Manifest
index 6325fc7caf8f..70620a3ec270 100644
--- a/kde-misc/zanshin/Manifest
+++ b/kde-misc/zanshin/Manifest
@@ -1,2 +1,2 @@
 DIST zanshin-24.08.3.tar.xz 377088 BLAKE2B b3fed73741873d18c97dabd4fd9eba69280467ea2213fc3a346d2f4f40d38be2f98eb6e23a140f70e6c80c49347190e0d99324f212b8697bd861f2095a1ca3f8 SHA512 3f1d15b8abf9d4c70341a0711f8a2ccdb8ad2dda17b920d401328eb41ac34cd4b175f984b9513ffbdd86c2254f434da4f58baa95a6f72c19831a4c6b2782688c
-DIST zanshin-24.12.0.tar.xz 377568 BLAKE2B 29a7d7c9a135c98ab4c7e5afd3b7086d0123f68b66e0c566bd100c736f204d37e4e4180313a2d957c8ce536db541cc77696409f461cad7908dff7754aeba9280 SHA512 c0fd3ecf3faf07c20f7917bd0c21ce51a6cea70348bedb56f285ff6d378f40ad3d3286bb1d8f3c7d9b2c3e7b85a320b8459861d004b68e716aefe5fee1cc6ad6
+DIST zanshin-24.12.1.tar.xz 380640 BLAKE2B ac737f7011101f04dc1dc22f94fea09289430918f91509aee6f8c265cdb38c313f0259c3d46da1a93b4da8702c4dca0234658909ef4e124b050c6e4522b2f4da SHA512 7ae21af7265bf1a7c2f8557a318a97b4ee51fa8f0c198a7b82e177613dfa8c9fd7d6b5eb824d5cef98886405b4fc227df4b07c19a4ca71d8ca6d57191f0a31ab
diff --git a/kde-misc/zanshin/zanshin-24.12.0-r1.ebuild b/kde-misc/zanshin/zanshin-24.12.0-r1.ebuild
deleted file mode 100644
index 4c84b34374be..000000000000
--- a/kde-misc/zanshin/zanshin-24.12.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KDE_ORG_CATEGORY="pim"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Getting things done application by KDE"
-HOMEPAGE="https://zanshin.kde.org/ https://apps.kde.org/zanshin/
-https://userbase.kde.org/Zanshin"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test" # bug 785844
-
-# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
-COMMON_DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
-	>=kde-apps/akonadi-${PVCUT}:6
-	>=kde-apps/akonadi-calendar-${PVCUT}:6
-	>=kde-apps/akonadi-contacts-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/kontactinterface-${PVCUT}:6
-	>=kde-frameworks/kcalendarcore-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcontacts-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/krunner-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:6
-"
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
-"
diff --git a/kde-misc/zanshin/zanshin-24.12.1.ebuild b/kde-misc/zanshin/zanshin-24.12.1.ebuild
new file mode 100644
index 000000000000..ef0357e60063
--- /dev/null
+++ b/kde-misc/zanshin/zanshin-24.12.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KDE_ORG_CATEGORY="pim"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Getting things done application by KDE"
+HOMEPAGE="https://zanshin.kde.org/ https://apps.kde.org/zanshin/
+https://userbase.kde.org/Zanshin"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test" # bug 785844
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=kde-apps/akonadi-${PVCUT}:6
+	>=kde-apps/akonadi-calendar-${PVCUT}:6
+	>=kde-apps/akonadi-contacts-${PVCUT}:6
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-apps/kontactinterface-${PVCUT}:6
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcontacts-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/krunner-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-apps/kdepim-runtime-${PVCUT}:6
+"
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
+"
diff --git a/kde-plasma/bluedevil/bluedevil-6.2.5.ebuild b/kde-plasma/bluedevil/bluedevil-6.2.5.ebuild
index 7bf84c9dc5ab..13ba09f68603 100644
--- a/kde-plasma/bluedevil/bluedevil-6.2.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-6.2.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
diff --git a/kde-plasma/breeze-grub/breeze-grub-6.2.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-6.2.5.ebuild
index 5f09187bbe74..e06f0d471239 100644
--- a/kde-plasma/breeze-grub/breeze-grub-6.2.5.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-6.2.5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Breeze theme for GRUB"
 
 LICENSE="GPL-3+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 src_prepare() { default; }
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-6.2.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-6.2.5.ebuild
index 9ab1df03565d..41a28fd92f6f 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-6.2.5.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-6.2.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
 
 LICENSE="LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-6.2.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-6.2.5.ebuild
index e679b702a162..8ffb110b3314 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-6.2.5.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-6.2.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Breeze theme for Plymouth"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:0"
diff --git a/kde-plasma/breeze/breeze-6.2.5.ebuild b/kde-plasma/breeze/breeze-6.2.5.ebuild
index e885be2113ab..03d070ece3aa 100644
--- a/kde-plasma/breeze/breeze-6.2.5.ebuild
+++ b/kde-plasma/breeze/breeze-6.2.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="qt5"
 
 # kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
diff --git a/kde-plasma/discover/discover-6.2.5.ebuild b/kde-plasma/discover/discover-6.2.5.ebuild
index 0ac4709903a0..f7bf6d95faac 100644
--- a/kde-plasma/discover/discover-6.2.5.ebuild
+++ b/kde-plasma/discover/discover-6.2.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+firmware flatpak snap telemetry webengine"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
diff --git a/kde-plasma/drkonqi/drkonqi-6.2.5.ebuild b/kde-plasma/drkonqi/drkonqi-6.2.5.ebuild
index 9a9a562e160d..29d01e269bbe 100644
--- a/kde-plasma/drkonqi/drkonqi-6.2.5.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-6.2.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="systemd"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-plasma/flatpak-kcm/flatpak-kcm-6.2.5.ebuild b/kde-plasma/flatpak-kcm/flatpak-kcm-6.2.5.ebuild
index ae33685cc867..e7508ea4db97 100644
--- a/kde-plasma/flatpak-kcm/flatpak-kcm-6.2.5.ebuild
+++ b/kde-plasma/flatpak-kcm/flatpak-kcm-6.2.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/flatpak-kcm"
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.2.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.2.5.ebuild
index 081a05f23d76..8738b8aa4f55 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.2.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.2.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="System service to manage user's activities, track the usage pattern
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
diff --git a/kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.2.5.ebuild b/kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.2.5.ebuild
index 658079f807b9..e062cf05f967 100644
--- a/kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.2.5.ebuild
+++ b/kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.2.5.ebuild
@@ -9,6 +9,6 @@ inherit ecm-common plasma.kde.org
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 RDEPEND="!<${CATEGORY}/${KDE_ORG_NAME}-6.1.4-r2:*"
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-6.2.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-6.2.5.ebuild
index 3aa9ad3e2d4b..dbc5d4f6cbd8 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-6.2.5.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-6.2.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="kdesu X"
 
 # slot op: kstart Uses Qt6::GuiPrivate for qtx11extras_p.h
@@ -33,6 +33,9 @@ RDEPEND="${DEPEND}
 "
 BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
 
+# downstream split
+PATCHES=( "${FILESDIR}/${PN}-6.2.4-unrequire-kf-qt-modules.patch" )
+
 src_prepare() {
 	ecm_src_prepare
 	ecm_punt_po_install
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-6.2.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-6.2.5.ebuild
index d85d555802ee..3c72e4f213ab 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-6.2.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-6.2.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
 
 LICENSE="GPL-3"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdecoration/kdecoration-6.2.5.ebuild b/kde-plasma/kdecoration/kdecoration-6.2.5.ebuild
index dbcb98991517..3c77075e0cdd 100644
--- a/kde-plasma/kdecoration/kdecoration-6.2.5.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-6.2.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plugin based library to create window decorations"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.2.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.2.5.ebuild
index e883fdf7574a..8300714f4c9d 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.2.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.2.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+alternate-calendar share webengine"
 
 RESTRICT="test" # bug 727846, +missing selenium-webdriver-at-spi
diff --git a/kde-plasma/kdesu-gui/kdesu-gui-6.2.5.ebuild b/kde-plasma/kdesu-gui/kdesu-gui-6.2.5.ebuild
index eb74b96ba0d8..f7ceb87de2d3 100644
--- a/kde-plasma/kdesu-gui/kdesu-gui-6.2.5.ebuild
+++ b/kde-plasma/kdesu-gui/kdesu-gui-6.2.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-plasma/keditfiletype/keditfiletype-6.2.5.ebuild b/kde-plasma/keditfiletype/keditfiletype-6.2.5.ebuild
index deccb44cd6cf..f2fc3a2b67d8 100644
--- a/kde-plasma/keditfiletype/keditfiletype-6.2.5.ebuild
+++ b/kde-plasma/keditfiletype/keditfiletype-6.2.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires running Plasma environment
diff --git a/kde-plasma/kgamma/kgamma-6.2.5.ebuild b/kde-plasma/kgamma/kgamma-6.2.5.ebuild
index 24837691b88d..b4768dbea049 100644
--- a/kde-plasma/kgamma/kgamma-6.2.5.ebuild
+++ b/kde-plasma/kgamma/kgamma-6.2.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Screen gamma values kcontrol module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kglobalacceld/kglobalacceld-6.2.5.ebuild b/kde-plasma/kglobalacceld/kglobalacceld-6.2.5.ebuild
index b429e4405284..aeb8ed2fbaa8 100644
--- a/kde-plasma/kglobalacceld/kglobalacceld-6.2.5.ebuild
+++ b/kde-plasma/kglobalacceld/kglobalacceld-6.2.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Daemon providing Global Keyboard Shortcut (Accelerator) functionali
 
 LICENSE="LGPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 REQUIRED_USE="test? ( X )"
diff --git a/kde-plasma/kinfocenter/kinfocenter-6.2.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-6.2.5.ebuild
index e98ce09e9820..80dc0312615c 100644
--- a/kde-plasma/kinfocenter/kinfocenter-6.2.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-6.2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gles2-only usb"
 
 DEPEND="
diff --git a/kde-plasma/kmenuedit/kmenuedit-6.2.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-6.2.5.ebuild
index 24b72c944f3a..8434160ac016 100644
--- a/kde-plasma/kmenuedit/kmenuedit-6.2.5.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-6.2.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kpipewire/kpipewire-6.2.5.ebuild b/kde-plasma/kpipewire/kpipewire-6.2.5.ebuild
index 1fc32160f9fc..4f61dffff4ba 100644
--- a/kde-plasma/kpipewire/kpipewire-6.2.5.ebuild
+++ b/kde-plasma/kpipewire/kpipewire-6.2.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Components relating to Flatpak pipewire use in Plasma"
 
 LICENSE="LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/krdp/krdp-6.2.5.ebuild b/kde-plasma/krdp/krdp-6.2.5.ebuild
index 66ee58e5816b..a019ca3df09b 100644
--- a/kde-plasma/krdp/krdp-6.2.5.ebuild
+++ b/kde-plasma/krdp/krdp-6.2.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE+=" https://quantumproductions.info/articles/2023-08/remote-desktop-usin
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kscreen/kscreen-6.2.5.ebuild b/kde-plasma/kscreen/kscreen-6.2.5.ebuild
index 733c925f3a7e..f02d02722c55 100644
--- a/kde-plasma/kscreen/kscreen-6.2.5.ebuild
+++ b/kde-plasma/kscreen/kscreen-6.2.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 # bug #580440, last checked 5.6.3
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-6.2.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-6.2.5.ebuild
index 3d82e5cc2b47..83bf56a405f4 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-6.2.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-6.2.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test"
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-6.2.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-6.2.5.ebuild
index 24cc28174e67..c103de116c3b 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-6.2.5.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-6.2.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/ksystemstats/ksystemstats-6.2.5.ebuild b/kde-plasma/ksystemstats/ksystemstats-6.2.5.ebuild
index 9852300a918b..4cdfcd83c954 100644
--- a/kde-plasma/ksystemstats/ksystemstats-6.2.5.ebuild
+++ b/kde-plasma/ksystemstats/ksystemstats-6.2.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Plugin-based system monitoring daemon"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-6.2.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-6.2.5.ebuild
index 151d913df8af..0c8ddb7590de 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-6.2.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-6.2.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="PAM module to not enter KWallet password again after login"
 
 LICENSE="LGPL-2.1"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-6.2.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-6.2.5.ebuild
index daf2450c03b8..0757c0eb6b99 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-6.2.5.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-6.2.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 IUSE=""
 
 # dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
diff --git a/kde-plasma/kwayland/kwayland-6.2.5.ebuild b/kde-plasma/kwayland/kwayland-6.2.5.ebuild
index 8e0973c35f15..a4786f837b2e 100644
--- a/kde-plasma/kwayland/kwayland-6.2.5.ebuild
+++ b/kde-plasma/kwayland/kwayland-6.2.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/frameworks/kwayland"
 
 LICENSE="LGPL-2.1"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # All failing, I guess we need a virtual wayland server
diff --git a/kde-plasma/kwin/kwin-6.2.5.ebuild b/kde-plasma/kwin/kwin-6.2.5.ebuild
index 5fc1649cc036..ec2540ff2258 100644
--- a/kde-plasma/kwin/kwin-6.2.5.ebuild
+++ b/kde-plasma/kwin/kwin-6.2.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="accessibility gles2-only lock screencast +shortcuts systemd"
 
 RESTRICT="test"
diff --git a/kde-plasma/kwrited/kwrited-6.2.5.ebuild b/kde-plasma/kwrited/kwrited-6.2.5.ebuild
index 0d7d9775c5ad..2cade498e4f4 100644
--- a/kde-plasma/kwrited/kwrited-6.2.5.ebuild
+++ b/kde-plasma/kwrited/kwrited-6.2.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-6.2.5.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-6.2.5.ebuild
index 94c30d8e5e68..d83489b2cbc5 100644
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-6.2.5.ebuild
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-6.2.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Qt component to allow applications make use of Wayland wl-layer-she
 
 LICENSE="LGPL-3+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # slot op: various private QtWaylandClient headers
diff --git a/kde-plasma/libkscreen/libkscreen-6.2.5.ebuild b/kde-plasma/libkscreen/libkscreen-6.2.5.ebuild
index 1daa7bdec940..a6e2e0dd2892 100644
--- a/kde-plasma/libkscreen/libkscreen-6.2.5.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-6.2.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Plasma screen management library"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6/8"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires running session
diff --git a/kde-plasma/libksysguard/libksysguard-6.2.5.ebuild b/kde-plasma/libksysguard/libksysguard-6.2.5.ebuild
index 6e03ea04db24..3cb0f49c8241 100644
--- a/kde-plasma/libksysguard/libksysguard-6.2.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-6.2.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Task management and system monitoring library"
 
 LICENSE="LGPL-2+"
 SLOT="6/9"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/libplasma/libplasma-6.2.5.ebuild b/kde-plasma/libplasma/libplasma-6.2.5.ebuild
index 50c8152e0710..3c0829c8479b 100644
--- a/kde-plasma/libplasma/libplasma-6.2.5.ebuild
+++ b/kde-plasma/libplasma/libplasma-6.2.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Plasma library and runtime components based upon KF6 and Qt6"
 
 LICENSE="LGPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gles2-only"
 
 RESTRICT="test"
diff --git a/kde-plasma/milou/milou-6.2.5.ebuild b/kde-plasma/milou/milou-6.2.5.ebuild
index 729f17efd374..a4b360b6977e 100644
--- a/kde-plasma/milou/milou-6.2.5.ebuild
+++ b/kde-plasma/milou/milou-6.2.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/milou"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.2.5.ebuild b/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.2.5.ebuild
index 1d3c083150bd..bcdb45eac2df 100644
--- a/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.2.5.ebuild
+++ b/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.2.5.ebuild
@@ -12,4 +12,4 @@ HOMEPAGE="https://invent.kde.org/plasma/ocean-sound-theme"
 
 LICENSE="CC-BY-SA-4.0"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
diff --git a/kde-plasma/oxygen-sounds/oxygen-sounds-6.2.5.ebuild b/kde-plasma/oxygen-sounds/oxygen-sounds-6.2.5.ebuild
index 51790d54e235..5d610214e54f 100644
--- a/kde-plasma/oxygen-sounds/oxygen-sounds-6.2.5.ebuild
+++ b/kde-plasma/oxygen-sounds/oxygen-sounds-6.2.5.ebuild
@@ -12,4 +12,4 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen-sounds"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
diff --git a/kde-plasma/oxygen/oxygen-6.2.5.ebuild b/kde-plasma/oxygen/oxygen-6.2.5.ebuild
index 7f0343b7ec9f..5edcc2b68776 100644
--- a/kde-plasma/oxygen/oxygen-6.2.5.ebuild
+++ b/kde-plasma/oxygen/oxygen-6.2.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="qt5 X"
 
 # slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
diff --git a/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.2.5.ebuild b/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.2.5.ebuild
index 095fc4593130..1dbff623c8d9 100644
--- a/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.2.5.ebuild
+++ b/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.2.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for accessing usage data collected by the activities system
 
 LICENSE="LGPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/plasma-activities/plasma-activities-6.2.5.ebuild b/kde-plasma/plasma-activities/plasma-activities-6.2.5.ebuild
index 8b86e7875abc..aeff8c28d319 100644
--- a/kde-plasma/plasma-activities/plasma-activities-6.2.5.ebuild
+++ b/kde-plasma/plasma-activities/plasma-activities-6.2.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Core components for KDE's Activities System"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.2.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.2.5.ebuild
index 1d1665f3fe98..85137d6235ee 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.2.5.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.2.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration"
 
 LICENSE="GPL-3+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.2.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.2.5.ebuild
index 01fae64d8d46..a6bdf7c97ec1 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-6.2.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-6.2.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="ibus input_devices_wacom scim screencast sdl +semantic-desktop webengine"
 
 RESTRICT="test" # missing selenium-webdriver-at-spi
diff --git a/kde-plasma/plasma-disks/plasma-disks-6.2.5.ebuild b/kde-plasma/plasma-disks/plasma-disks-6.2.5.ebuild
index 89d659421062..b1e48594cadd 100644
--- a/kde-plasma/plasma-disks/plasma-disks-6.2.5.ebuild
+++ b/kde-plasma/plasma-disks/plasma-disks-6.2.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-disks"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-6.2.5.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-6.2.5.ebuild
index 22591e410f2d..10196f23269d 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-6.2.5.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-6.2.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="firewalld +ufw"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )"
diff --git a/kde-plasma/plasma-integration/plasma-integration-6.2.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-6.2.5.ebuild
index a30fea4dc6c7..354a3ba79b7c 100644
--- a/kde-plasma/plasma-integration/plasma-integration-6.2.5.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-6.2.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
 
 LICENSE="LGPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="qt5"
 
 # requires running kde environment
diff --git a/kde-plasma/plasma-login-sessions/plasma-login-sessions-6.2.5.ebuild b/kde-plasma/plasma-login-sessions/plasma-login-sessions-6.2.5.ebuild
index 20b23b38a17d..dedd10ee7194 100644
--- a/kde-plasma/plasma-login-sessions/plasma-login-sessions-6.2.5.ebuild
+++ b/kde-plasma/plasma-login-sessions/plasma-login-sessions-6.2.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE Plasma login sessions"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+wayland X"
 
 REQUIRED_USE="|| ( wayland X )"
diff --git a/kde-plasma/plasma-meta/plasma-meta-6.2.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-6.2.5.ebuild
index 00afa5dcdcd8..42f318fe4663 100644
--- a/kde-plasma/plasma-meta/plasma-meta-6.2.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-6.2.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://kde.org/plasma-desktop/"
 
 LICENSE="metapackage"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
 cups discover +display-manager +elogind +firewall flatpak grub gtk +kwallet
 +networkmanager oxygen-theme plymouth pulseaudio qt5 rdp +sddm sdk +smart systemd
diff --git a/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-1.ebuild b/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-1.ebuild
index a6c7ef69495c..f421f8a857f9 100644
--- a/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-1.ebuild
+++ b/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/kde-plasma/plasma-nm/plasma-nm-6.2.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-6.2.5.ebuild
index 9416e0c9689d..a692ee031f77 100644
--- a/kde-plasma/plasma-nm/plasma-nm-6.2.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-6.2.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE Plasma applet for NetworkManager"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="openconnect teamd"
 
 DEPEND="
diff --git a/kde-plasma/plasma-pa/plasma-pa-6.2.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-6.2.5.ebuild
index b357043aa79c..5a539968f8f0 100644
--- a/kde-plasma/plasma-pa/plasma-pa-6.2.5.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-6.2.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # missing selenium-webdriver-at-spi
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-6.2.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-6.2.5.ebuild
index 8d44bc9827e6..140aad1c28f3 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-6.2.5.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-6.2.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Useful applications for Plasma development"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.2.5.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.2.5.ebuild
index 7dfac4ca090d..dae3313cab5a 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.2.5.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.2.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-6.2.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-6.2.5.ebuild
index a56cf7412772..c5a7cb975e07 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-6.2.5.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-6.2.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
 
 LICENSE="|| ( GPL-2 GPL-3+ )"
 SLOT="6"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 IUSE=""
 
 # tests require DBus
diff --git a/kde-plasma/plasma-vault/plasma-vault-6.2.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-6.2.5.ebuild
index 02702fb75180..df451a3548c8 100644
--- a/kde-plasma/plasma-vault/plasma-vault-6.2.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-6.2.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
 
 LICENSE="LGPL-3"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/plasma-welcome/plasma-welcome-6.2.5.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-6.2.5.ebuild
index 71bd73096375..659a8bbb2186 100644
--- a/kde-plasma/plasma-welcome/plasma-welcome-6.2.5.ebuild
+++ b/kde-plasma/plasma-welcome/plasma-welcome-6.2.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Friendly onboarding wizard for Plasma"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.2.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.2.5.ebuild
index b13104243e2d..161a13cb71ff 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.2.5.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.2.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wallpapers for the Plasma workspace"
 
 LICENSE="GPL-2"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.2.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.2.5.ebuild
index 2fce40ab3ac2..22bf366a90a2 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-6.2.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.2.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="appstream +calendar +fontconfig geolocation gps +policykit
 screencast +semantic-desktop systemd telemetry +wallpaper-metadata"
 
diff --git a/kde-plasma/plasma5support/plasma5support-6.2.5.ebuild b/kde-plasma/plasma5support/plasma5support-6.2.5.ebuild
index 657d79e8ce97..bb4ffc2447c0 100644
--- a/kde-plasma/plasma5support/plasma5support-6.2.5.ebuild
+++ b/kde-plasma/plasma5support/plasma5support-6.2.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Support components for porting from KF5/Qt5 to KF6/Qt6"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # bug 926347
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-6.2.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-6.2.5.ebuild
index 97a7a42eabdb..ff48b035c53a 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-6.2.5.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-6.2.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.2.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.2.5.ebuild
index f8cdf4fe5e17..438a9a6fc9a3 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.2.5.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.2.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/powerdevil/powerdevil-6.2.5.ebuild b/kde-plasma/powerdevil/powerdevil-6.2.5.ebuild
index 628e5acf0a03..dba136f5da9f 100644
--- a/kde-plasma/powerdevil/powerdevil-6.2.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-6.2.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="brightness-control"
 
 RESTRICT="test" # bug 926513
diff --git a/kde-plasma/print-manager/print-manager-6.2.5.ebuild b/kde-plasma/print-manager/print-manager-6.2.5.ebuild
index c32219660b1a..4d7384f27b33 100644
--- a/kde-plasma/print-manager/print-manager-6.2.5.ebuild
+++ b/kde-plasma/print-manager/print-manager-6.2.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Manage CUPS print jobs and printers in Plasma"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+gtk"
 
 DEPEND="
diff --git a/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.2.5.ebuild b/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.2.5.ebuild
index 64d88306b1c1..e6e382a1730a 100644
--- a/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.2.5.ebuild
+++ b/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.2.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Breeze inspired QQC2 Style"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) CC0-1.0"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-6.2.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-6.2.5.ebuild
index 933b29d117cd..0b8e420674a3 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-6.2.5.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-6.2.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/systemsettings/systemsettings-6.2.5.ebuild b/kde-plasma/systemsettings/systemsettings-6.2.5.ebuild
index cecc171436ea..beca1334b78b 100644
--- a/kde-plasma/systemsettings/systemsettings-6.2.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-6.2.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Control Center to configure KDE Plasma desktop"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/wacomtablet/wacomtablet-6.2.5.ebuild b/kde-plasma/wacomtablet/wacomtablet-6.2.5.ebuild
index f8ab8656d733..257d31b8eaf1 100644
--- a/kde-plasma/wacomtablet/wacomtablet-6.2.5.ebuild
+++ b/kde-plasma/wacomtablet/wacomtablet-6.2.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://userbase.kde.org/Wacomtablet"
 
 LICENSE="GPL-2"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.2.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.2.5.ebuild
index d02ffd493232..ba430b0e9d26 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.2.5.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.2.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE
 
 LICENSE="LGPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # dev-qt/qtbase:= slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
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..d535c7be9fe0 100644
--- a/licenses/GPL-2+-with-Pyinstaller-Bootloader-exception
+++ b/licenses/GPL-2+-with-Pyinstaller-Bootloader-exception
@@ -1,16 +1,5 @@
-================================
- The PyInstaller licensing terms
-================================
-
-
-Copyright (c) 2010-2022, PyInstaller Development Team
-Copyright (c) 2005-2009, Giovanni Bajo
-Based on previous work under copyright (c) 2002 McMillan Enterprises, Inc.
-
-
-PyInstaller is licensed 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.
+GNU General Public License, version 2 or any later version.
+See GPL-2 for the full text of this license.
 
 
 Bootloader Exception
@@ -23,580 +12,3 @@ those combinations without any restriction coming from the use of those
 files. (The General Public License restrictions do apply in other respects;
 for example, they cover modification of the files, and distribution when
 not linked into a combined executable.)
-
-
-Bootloader and Related Files
-----------------------------
-
-Bootloader and related files are files which are embedded within the
-final executable. This includes files in directories:
-
-./bootloader/
-./PyInstaller/loader
-
-
-Run-time Hooks
-----------------------------
-
-Run-time Hooks are a different kind of files embedded within the final
-executable. To ease moving them into a separate repository, or into the
-respective project, these files are now licensed under the Apache License,
-Version 2.0.
-
-Run-time Hooks are in the directory
-./PyInstaller/hooks/rthooks
-
-
-About the PyInstaller Development Team
---------------------------------------
-
-The PyInstaller Development Team is the set of contributors
-to the PyInstaller project. A full list with details is kept
-in the documentation directory, in the file
-``doc/CREDITS.rst``.
-
-The core team that coordinates development on GitHub can be found here:
-https://github.com/pyinstaller/pyinstaller.  As of 2021, it consists of:
-
-* Hartmut Goebel
-* Jasper Harrison
-* Bryan Jones
-* Brenainn Woodsend
-* Rok Mandeljc
-
-Our Copyright Policy
---------------------
-
-PyInstaller uses a shared copyright model. Each contributor maintains copyright
-over their contributions to PyInstaller. But, it is important to note that these
-contributions are typically only changes to the repositories. Thus,
-the PyInstaller source code, in its entirety is not the copyright of any single
-person or institution.  Instead, it is the collective copyright of the entire
-PyInstaller Development Team.  If individual contributors want to maintain
-a record of what changes/contributions they have specific copyright on, they
-should indicate their copyright in the commit message of the change, when they
-commit the change to the PyInstaller repository.
-
-With this in mind, the following banner should be used in any source code file
-to indicate the copyright and license terms:
-
-
-#-----------------------------------------------------------------------------
-# Copyright (c) 2005-2022, PyInstaller Development Team.
-#
-# Distributed under the terms of the GNU General Public License (version 2
-# or later) with exception for distributing the bootloader.
-#
-# The full license is in the file COPYING.txt, distributed with this software.
-#
-# SPDX-License-Identifier: (GPL-2.0-or-later WITH Bootloader-exception)
-#-----------------------------------------------------------------------------
-
-
-For run-time hooks, the following banner should be used:
-
-#-----------------------------------------------------------------------------
-# Copyright (c) 2005-2022, PyInstaller Development Team.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-#
-# The full license is in the file COPYING.txt, distributed with this software.
-#
-# SPDX-License-Identifier: Apache-2.0
-#-----------------------------------------------------------------------------
-
-
-================================
-GNU General Public License
-================================
-
-https://gnu.org/licenses/gpl-2.0.html
-
-
-		    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 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.
-
-		    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
-
-================================
-Apache License 2.0
-================================
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.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.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
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/llvm-core/clang-common/Manifest b/llvm-core/clang-common/Manifest
index fef409fa0e6a..b7114fc7aeab 100644
--- a/llvm-core/clang-common/Manifest
+++ b/llvm-core/clang-common/Manifest
@@ -10,4 +10,7 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607 SHA512 d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
+DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/llvm-core/clang-common/clang-common-19.1.7.ebuild b/llvm-core/clang-common/clang-common-19.1.7.ebuild
new file mode 100644
index 000000000000..1c56480336f7
--- /dev/null
+++ b/llvm-core/clang-common/clang-common-19.1.7.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 llvm.org multilib
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
+IUSE="
+	default-compiler-rt default-libcxx default-lld
+	bootstrap-prefix cet hardened llvm-libunwind
+"
+
+PDEPEND="
+	default-compiler-rt? (
+		llvm-core/clang-runtime:${LLVM_MAJOR}[compiler-rt]
+		llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
+		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
+	)
+	!default-compiler-rt? ( sys-devel/gcc )
+	default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
+	!default-libcxx? ( sys-devel/gcc )
+	default-lld? ( >=llvm-core/lld-${PV} )
+	!default-lld? ( sys-devel/binutils )
+"
+IDEPEND="
+	!default-compiler-rt? ( sys-devel/gcc-config )
+	!default-libcxx? ( sys-devel/gcc-config )
+"
+
+LLVM_COMPONENTS=( clang/utils )
+llvm.org_set_globals
+
+pkg_pretend() {
+	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
+
+	local flag missing_flags=()
+	for flag in default-{compiler-rt,libcxx,lld}; do
+		if ! use "${flag}" && has_version "llvm-core/clang[${flag}]"; then
+			missing_flags+=( "${flag}" )
+		fi
+	done
+
+	if [[ ${missing_flags[@]} ]]; then
+		eerror "It seems that you have the following flags set on llvm-core/clang:"
+		eerror
+		eerror "  ${missing_flags[*]}"
+		eerror
+		eerror "The default runtimes are now set via flags on llvm-core/clang-common."
+		eerror "The build is being aborted to prevent breakage.  Please either set"
+		eerror "the respective flags on this ebuild, e.g.:"
+		eerror
+		eerror "  llvm-core/clang-common ${missing_flags[*]}"
+		eerror
+		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
+		die "Mismatched defaults detected between llvm-core/clang and llvm-core/clang-common"
+	fi
+}
+
+_doclang_cfg() {
+	local triple="${1}"
+
+	local tool
+	for tool in ${triple}-clang{,++}; do
+		newins - "${tool}.cfg" <<-EOF
+			# This configuration file is used by ${tool} driver.
+			@gentoo-common.cfg
+			@gentoo-common-ld.cfg
+		EOF
+		if [[ ${triple} == x86_64* ]]; then
+			cat >> "${ED}/etc/clang/${tool}.cfg" <<-EOF || die
+				@gentoo-cet.cfg
+			EOF
+		fi
+	done
+
+	if use kernel_Darwin; then
+		cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
+			-lc++abi
+		EOF
+	fi
+
+	newins - "${triple}-clang-cpp.cfg" <<-EOF
+		# This configuration file is used by the ${triple}-clang-cpp driver.
+		@gentoo-common.cfg
+	EOF
+	if [[ ${triple} == x86_64* ]]; then
+		cat >> "${ED}/etc/clang/${triple}-clang-cpp.cfg" <<-EOF || die
+			@gentoo-cet.cfg
+		EOF
+	fi
+
+	# Install symlinks for triples with other vendor strings since some
+	# programs insist on mangling the triple.
+	local vendor
+	for vendor in gentoo pc unknown; do
+		local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
+		for tool in clang{,++,-cpp}; do
+			if [[ ! -f "${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
+				dosym "${triple}-${tool}.cfg" "/etc/clang/${vendor_triple}-${tool}.cfg"
+			fi
+		done
+	done
+}
+
+doclang_cfg() {
+	local triple="${1}"
+
+	_doclang_cfg ${triple}
+
+	# LLVM may have different arch names in some cases. For example in x86
+	# profiles the triple uses i686, but llvm will prefer i386 if invoked
+	# with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
+	# be used if invoked through ${CHOST}-clang{,++,-cpp} though.
+	#
+	# To make sure the correct triples are installed,
+	# see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
+	# and compare with CHOST values in profiles.
+
+	local abi=${triple%%-*}
+	case ${abi} in
+		armv4l|armv4t|armv5tel|armv6j|armv7a)
+			_doclang_cfg ${triple/${abi}/arm}
+			;;
+		i686)
+			_doclang_cfg ${triple/${abi}/i386}
+			;;
+		sparc)
+			_doclang_cfg ${triple/${abi}/sparcel}
+			;;
+		sparc64)
+			_doclang_cfg ${triple/${abi}/sparcv9}
+			;;
+	esac
+}
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+
+	insinto /etc/clang
+	newins - gentoo-runtimes.cfg <<-EOF
+		# This file is initially generated by llvm-core/clang-runtime.
+		# It is used to control the default runtimes using by clang.
+
+		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
+		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
+		--stdlib=$(usex default-libcxx libc++ libstdc++)
+		-fuse-ld=$(usex default-lld lld bfd)
+	EOF
+
+	newins - gentoo-gcc-install.cfg <<-EOF
+		# This file is maintained by gcc-config.
+		# It is used to specify the selected GCC installation.
+	EOF
+
+	newins - gentoo-common.cfg <<-EOF
+		# This file contains flags common to clang, clang++ and clang-cpp.
+		@gentoo-runtimes.cfg
+		@gentoo-gcc-install.cfg
+		@gentoo-hardened.cfg
+		# bug #870001
+		-include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
+	EOF
+
+	# clang-cpp does not like link args being passed to it when directly
+	# invoked, so use a separate configuration file.
+	newins - gentoo-common-ld.cfg <<-EOF
+		# This file contains flags common to clang and clang++
+		@gentoo-hardened-ld.cfg
+	EOF
+
+	# Baseline hardening (bug #851111)
+	newins - gentoo-hardened.cfg <<-EOF
+		# Some of these options are added unconditionally, regardless of
+		# USE=hardened, for parity with sys-devel/gcc.
+		-Xarch_host -fstack-clash-protection
+		-Xarch_host -fstack-protector-strong
+		-fPIE
+		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
+	EOF
+
+	newins - gentoo-cet.cfg <<-EOF
+		-Xarch_host -fcf-protection=$(usex cet full none)
+	EOF
+
+	if use kernel_Darwin; then
+		newins - gentoo-hardened-ld.cfg <<-EOF
+			# There was -Wl,-z,relro here, but it's not supported on Mac
+			# TODO: investigate whether -bind_at_load or -read_only_stubs will do the job
+		EOF
+	else
+		newins - gentoo-hardened-ld.cfg <<-EOF
+			# Some of these options are added unconditionally, regardless of
+			# USE=hardened, for parity with sys-devel/gcc.
+			-Wl,-z,relro
+			-Wl,-z,now
+		EOF
+	fi
+
+	dodir /usr/include/gentoo
+
+	cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
+	/* __has_include is an extension, but it's fine, because this is only
+	for Clang anyway. */
+	#if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
+	# include <stdc-predef.h>
+	#endif
+	EOF
+
+	local fortify_level=$(usex hardened 3 2)
+	# We have to do this because glibc's headers warn if F_S is set
+	# without optimization and that would at the very least be very noisy
+	# during builds and at worst trigger many -Werror builds.
+	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
+	#ifdef __clang__
+	# pragma clang system_header
+	#endif
+	#ifndef _FORTIFY_SOURCE
+	# if defined(__has_feature)
+	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
+	# else
+	#  define __GENTOO_HAS_FEATURE(x) 0
+	# endif
+	#
+	# if defined(__STDC_HOSTED__) && __STDC_HOSTED__ == 1
+	#  define __GENTOO_NOT_FREESTANDING 1
+	# else
+	#  define __GENTOO_NOT_FREESTANDING 0
+	# endif
+	#
+	# if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 && __GENTOO_NOT_FREESTANDING > 0
+	#  if !defined(__SANITIZE_ADDRESS__) && !__GENTOO_HAS_FEATURE(address_sanitizer) && !__GENTOO_HAS_FEATURE(memory_sanitizer)
+	#   define _FORTIFY_SOURCE ${fortify_level}
+	#  endif
+	# endif
+	# undef __GENTOO_HAS_FEATURE
+	# undef __GENTOO_NOT_FREESTANDING
+	#endif
+	EOF
+
+	# TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
+	# non-hardened?
+	if use hardened ; then
+		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
+			# Options below are conditional on USE=hardened.
+			-Xarch_host -D_GLIBCXX_ASSERTIONS
+
+			# Analogue to GLIBCXX_ASSERTIONS
+			# https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
+			# https://libcxx.llvm.org/Hardening.html#using-hardened-mode
+			-Xarch_host -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
+		EOF
+
+		cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
+			# Options below are conditional on USE=hardened.
+		EOF
+	fi
+
+	# We only install config files for supported ABIs because unprefixed tools
+	# might be used for crosscompilation where e.g. PIE may not be supported.
+	# See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug #912685.
+	local abi
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		doclang_cfg "${abi_chost}"
+	done
+
+	if use kernel_Darwin; then
+		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+			# Gentoo Prefix on Darwin
+			-Wl,-search_paths_first
+		EOF
+		if use bootstrap-prefix ; then
+			# bootstrap-prefix is only set during stage2 of bootstrapping
+			# Prefix, where EPREFIX is set to EPREFIX/tmp.
+			# Here we need to point it at the future lib dir of the stage3's
+			# EPREFIX.
+			cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+				-Wl,-rpath,${EPREFIX}/../usr/lib
+				-Wl,-L,${EPREFIX}/../usr/lib
+				-isystem ${EPREFIX}/../usr/include
+			EOF
+		fi
+		# Using -Wl,-L instead of -L to trick compiler driver to put it
+		# after -isysroot's internal -L
+		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+			-Wl,-rpath,${EPREFIX}/usr/lib
+			-Wl,-L,${EPREFIX}/usr/lib
+			-isystem ${EPREFIX}/usr/include
+			-isysroot ${EPREFIX}/MacOSX.sdk
+		EOF
+	fi
+}
+
+pkg_preinst() {
+	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
+	then
+		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
+		if [[ -n ${gcc_path} ]]; then
+			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
+				--gcc-install-dir="${gcc_path%%:*}"
+			EOF
+		fi
+	fi
+}
diff --git a/llvm-core/clang-common/clang-common-20.0.0_pre20241227.ebuild b/llvm-core/clang-common/clang-common-20.0.0_pre20241227.ebuild
deleted file mode 100644
index 8e66cf2865d9..000000000000
--- a/llvm-core/clang-common/clang-common-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 llvm.org multilib
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="
-	default-compiler-rt default-libcxx default-lld
-	bootstrap-prefix cet hardened llvm-libunwind
-"
-
-PDEPEND="
-	default-compiler-rt? (
-		llvm-core/clang-runtime:${LLVM_MAJOR}[compiler-rt]
-		llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
-		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
-	)
-	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
-	!default-libcxx? ( sys-devel/gcc )
-	default-lld? ( >=llvm-core/lld-${PV} )
-	!default-lld? ( sys-devel/binutils )
-"
-IDEPEND="
-	!default-compiler-rt? ( sys-devel/gcc-config )
-	!default-libcxx? ( sys-devel/gcc-config )
-"
-
-LLVM_COMPONENTS=( clang/utils )
-llvm.org_set_globals
-
-pkg_pretend() {
-	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-	local flag missing_flags=()
-	for flag in default-{compiler-rt,libcxx,lld}; do
-		if ! use "${flag}" && has_version "llvm-core/clang[${flag}]"; then
-			missing_flags+=( "${flag}" )
-		fi
-	done
-
-	if [[ ${missing_flags[@]} ]]; then
-		eerror "It seems that you have the following flags set on llvm-core/clang:"
-		eerror
-		eerror "  ${missing_flags[*]}"
-		eerror
-		eerror "The default runtimes are now set via flags on llvm-core/clang-common."
-		eerror "The build is being aborted to prevent breakage.  Please either set"
-		eerror "the respective flags on this ebuild, e.g.:"
-		eerror
-		eerror "  llvm-core/clang-common ${missing_flags[*]}"
-		eerror
-		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-		die "Mismatched defaults detected between llvm-core/clang and llvm-core/clang-common"
-	fi
-}
-
-_doclang_cfg() {
-	local triple="${1}"
-
-	local tool
-	for tool in ${triple}-clang{,++}; do
-		newins - "${tool}.cfg" <<-EOF
-			# This configuration file is used by ${tool} driver.
-			@gentoo-common.cfg
-			@gentoo-common-ld.cfg
-		EOF
-		if [[ ${triple} == x86_64* ]]; then
-			cat >> "${ED}/etc/clang/${tool}.cfg" <<-EOF || die
-				@gentoo-cet.cfg
-			EOF
-		fi
-	done
-
-	if use kernel_Darwin; then
-		cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
-			-lc++abi
-		EOF
-	fi
-
-	newins - "${triple}-clang-cpp.cfg" <<-EOF
-		# This configuration file is used by the ${triple}-clang-cpp driver.
-		@gentoo-common.cfg
-	EOF
-	if [[ ${triple} == x86_64* ]]; then
-		cat >> "${ED}/etc/clang/${triple}-clang-cpp.cfg" <<-EOF || die
-			@gentoo-cet.cfg
-		EOF
-	fi
-
-	# Install symlinks for triples with other vendor strings since some
-	# programs insist on mangling the triple.
-	local vendor
-	for vendor in gentoo pc unknown; do
-		local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
-		for tool in clang{,++,-cpp}; do
-			if [[ ! -f "${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
-				dosym "${triple}-${tool}.cfg" "/etc/clang/${vendor_triple}-${tool}.cfg"
-			fi
-		done
-	done
-}
-
-doclang_cfg() {
-	local triple="${1}"
-
-	_doclang_cfg ${triple}
-
-	# LLVM may have different arch names in some cases. For example in x86
-	# profiles the triple uses i686, but llvm will prefer i386 if invoked
-	# with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
-	# be used if invoked through ${CHOST}-clang{,++,-cpp} though.
-	#
-	# To make sure the correct triples are installed,
-	# see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
-	# and compare with CHOST values in profiles.
-
-	local abi=${triple%%-*}
-	case ${abi} in
-		armv4l|armv4t|armv5tel|armv6j|armv7a)
-			_doclang_cfg ${triple/${abi}/arm}
-			;;
-		i686)
-			_doclang_cfg ${triple/${abi}/i386}
-			;;
-		sparc)
-			_doclang_cfg ${triple/${abi}/sparcel}
-			;;
-		sparc64)
-			_doclang_cfg ${triple/${abi}/sparcv9}
-			;;
-	esac
-}
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-
-	insinto /etc/clang
-	newins - gentoo-runtimes.cfg <<-EOF
-		# This file is initially generated by llvm-core/clang-runtime.
-		# It is used to control the default runtimes using by clang.
-
-		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
-		--stdlib=$(usex default-libcxx libc++ libstdc++)
-		-fuse-ld=$(usex default-lld lld bfd)
-	EOF
-
-	newins - gentoo-gcc-install.cfg <<-EOF
-		# This file is maintained by gcc-config.
-		# It is used to specify the selected GCC installation.
-	EOF
-
-	newins - gentoo-common.cfg <<-EOF
-		# This file contains flags common to clang, clang++ and clang-cpp.
-		@gentoo-runtimes.cfg
-		@gentoo-gcc-install.cfg
-		@gentoo-hardened.cfg
-		# bug #870001
-		-include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
-	EOF
-
-	# clang-cpp does not like link args being passed to it when directly
-	# invoked, so use a separate configuration file.
-	newins - gentoo-common-ld.cfg <<-EOF
-		# This file contains flags common to clang and clang++
-		@gentoo-hardened-ld.cfg
-	EOF
-
-	# Baseline hardening (bug #851111)
-	newins - gentoo-hardened.cfg <<-EOF
-		# Some of these options are added unconditionally, regardless of
-		# USE=hardened, for parity with sys-devel/gcc.
-		-Xarch_host -fstack-clash-protection
-		-Xarch_host -fstack-protector-strong
-		-fPIE
-		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
-	EOF
-
-	newins - gentoo-cet.cfg <<-EOF
-		-Xarch_host -fcf-protection=$(usex cet full none)
-	EOF
-
-	if use kernel_Darwin; then
-		newins - gentoo-hardened-ld.cfg <<-EOF
-			# There was -Wl,-z,relro here, but it's not supported on Mac
-			# TODO: investigate whether -bind_at_load or -read_only_stubs will do the job
-		EOF
-	else
-		newins - gentoo-hardened-ld.cfg <<-EOF
-			# Some of these options are added unconditionally, regardless of
-			# USE=hardened, for parity with sys-devel/gcc.
-			-Wl,-z,relro
-			-Wl,-z,now
-		EOF
-	fi
-
-	dodir /usr/include/gentoo
-
-	cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
-	/* __has_include is an extension, but it's fine, because this is only
-	for Clang anyway. */
-	#if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
-	# include <stdc-predef.h>
-	#endif
-	EOF
-
-	local fortify_level=$(usex hardened 3 2)
-	# We have to do this because glibc's headers warn if F_S is set
-	# without optimization and that would at the very least be very noisy
-	# during builds and at worst trigger many -Werror builds.
-	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
-	#ifdef __clang__
-	# pragma clang system_header
-	#endif
-	#ifndef _FORTIFY_SOURCE
-	# if defined(__has_feature)
-	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
-	# else
-	#  define __GENTOO_HAS_FEATURE(x) 0
-	# endif
-	#
-	# if !defined(__OPTIMIZE__) || __OPTIMIZE__ == 0
-	# elif !defined(__STDC_HOSTED__) || __STDC_HOSTED__ != 1
-	# elif defined(__SANITIZE_ADDRESS__)
-	# elif __GENTOO_HAS_FEATURE(address_sanitizer)
-	# elif __GENTOO_HAS_FEATURE(hwaddress_sanitizer)
-	# elif __GENTOO_HAS_FEATURE(memory_sanitizer)
-	# elif __GENTOO_HAS_FEATURE(numerical_stability_sanitizer)
-	# elif __GENTOO_HAS_FEATURE(realtime_sanitizer)
-	# elif __GENTOO_HAS_FEATURE(thread_sanitizer)
-	# else
-	#  define _FORTIFY_SOURCE ${fortify_level}
-	# endif
-	#
-	# undef __GENTOO_HAS_FEATURE
-	#endif
-	EOF
-
-	# TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
-	# non-hardened?
-	if use hardened ; then
-		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-			# Options below are conditional on USE=hardened.
-			-Xarch_host -D_GLIBCXX_ASSERTIONS
-
-			# Analogue to GLIBCXX_ASSERTIONS
-			# https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
-			# https://libcxx.llvm.org/Hardening.html#using-hardened-mode
-			-Xarch_host -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
-			# Options below are conditional on USE=hardened.
-		EOF
-	fi
-
-	# We only install config files for supported ABIs because unprefixed tools
-	# might be used for crosscompilation where e.g. PIE may not be supported.
-	# See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug #912685.
-	local abi
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		doclang_cfg "${abi_chost}"
-	done
-
-	if use kernel_Darwin; then
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			# Gentoo Prefix on Darwin
-			-Wl,-search_paths_first
-		EOF
-		if use bootstrap-prefix ; then
-			# bootstrap-prefix is only set during stage2 of bootstrapping
-			# Prefix, where EPREFIX is set to EPREFIX/tmp.
-			# Here we need to point it at the future lib dir of the stage3's
-			# EPREFIX.
-			cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-				-Wl,-rpath,${EPREFIX}/../usr/lib
-				-Wl,-L,${EPREFIX}/../usr/lib
-				-isystem ${EPREFIX}/../usr/include
-			EOF
-		fi
-		# Using -Wl,-L instead of -L to trick compiler driver to put it
-		# after -isysroot's internal -L
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			-Wl,-rpath,${EPREFIX}/usr/lib
-			-Wl,-L,${EPREFIX}/usr/lib
-			-isystem ${EPREFIX}/usr/include
-			-isysroot ${EPREFIX}/MacOSX.sdk
-		EOF
-	fi
-}
-
-pkg_preinst() {
-	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-	then
-		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-		if [[ -n ${gcc_path} ]]; then
-			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-				--gcc-install-dir="${gcc_path%%:*}"
-			EOF
-		fi
-	fi
-}
diff --git a/llvm-core/clang-common/clang-common-20.0.0_pre20250111.ebuild b/llvm-core/clang-common/clang-common-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..1fde60b6b6de
--- /dev/null
+++ b/llvm-core/clang-common/clang-common-20.0.0_pre20250111.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 llvm.org multilib
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="
+	default-compiler-rt default-libcxx default-lld
+	bootstrap-prefix cet hardened llvm-libunwind
+"
+
+PDEPEND="
+	default-compiler-rt? (
+		llvm-core/clang-runtime:${LLVM_MAJOR}[compiler-rt]
+		llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
+		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
+	)
+	!default-compiler-rt? ( sys-devel/gcc )
+	default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
+	!default-libcxx? ( sys-devel/gcc )
+	default-lld? ( >=llvm-core/lld-${PV} )
+	!default-lld? ( sys-devel/binutils )
+"
+IDEPEND="
+	!default-compiler-rt? ( sys-devel/gcc-config )
+	!default-libcxx? ( sys-devel/gcc-config )
+"
+
+LLVM_COMPONENTS=( clang/utils )
+llvm.org_set_globals
+
+pkg_pretend() {
+	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
+
+	local flag missing_flags=()
+	for flag in default-{compiler-rt,libcxx,lld}; do
+		if ! use "${flag}" && has_version "llvm-core/clang[${flag}]"; then
+			missing_flags+=( "${flag}" )
+		fi
+	done
+
+	if [[ ${missing_flags[@]} ]]; then
+		eerror "It seems that you have the following flags set on llvm-core/clang:"
+		eerror
+		eerror "  ${missing_flags[*]}"
+		eerror
+		eerror "The default runtimes are now set via flags on llvm-core/clang-common."
+		eerror "The build is being aborted to prevent breakage.  Please either set"
+		eerror "the respective flags on this ebuild, e.g.:"
+		eerror
+		eerror "  llvm-core/clang-common ${missing_flags[*]}"
+		eerror
+		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
+		die "Mismatched defaults detected between llvm-core/clang and llvm-core/clang-common"
+	fi
+}
+
+_doclang_cfg() {
+	local triple="${1}"
+
+	local tool
+	for tool in ${triple}-clang{,++}; do
+		newins - "${tool}.cfg" <<-EOF
+			# This configuration file is used by ${tool} driver.
+			@gentoo-common.cfg
+			@gentoo-common-ld.cfg
+		EOF
+		if [[ ${triple} == x86_64* ]]; then
+			cat >> "${ED}/etc/clang/${tool}.cfg" <<-EOF || die
+				@gentoo-cet.cfg
+			EOF
+		fi
+	done
+
+	if use kernel_Darwin; then
+		cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
+			-lc++abi
+		EOF
+	fi
+
+	newins - "${triple}-clang-cpp.cfg" <<-EOF
+		# This configuration file is used by the ${triple}-clang-cpp driver.
+		@gentoo-common.cfg
+	EOF
+	if [[ ${triple} == x86_64* ]]; then
+		cat >> "${ED}/etc/clang/${triple}-clang-cpp.cfg" <<-EOF || die
+			@gentoo-cet.cfg
+		EOF
+	fi
+
+	# Install symlinks for triples with other vendor strings since some
+	# programs insist on mangling the triple.
+	local vendor
+	for vendor in gentoo pc unknown; do
+		local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
+		for tool in clang{,++,-cpp}; do
+			if [[ ! -f "${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
+				dosym "${triple}-${tool}.cfg" "/etc/clang/${vendor_triple}-${tool}.cfg"
+			fi
+		done
+	done
+}
+
+doclang_cfg() {
+	local triple="${1}"
+
+	_doclang_cfg ${triple}
+
+	# LLVM may have different arch names in some cases. For example in x86
+	# profiles the triple uses i686, but llvm will prefer i386 if invoked
+	# with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
+	# be used if invoked through ${CHOST}-clang{,++,-cpp} though.
+	#
+	# To make sure the correct triples are installed,
+	# see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
+	# and compare with CHOST values in profiles.
+
+	local abi=${triple%%-*}
+	case ${abi} in
+		armv4l|armv4t|armv5tel|armv6j|armv7a)
+			_doclang_cfg ${triple/${abi}/arm}
+			;;
+		i686)
+			_doclang_cfg ${triple/${abi}/i386}
+			;;
+		sparc)
+			_doclang_cfg ${triple/${abi}/sparcel}
+			;;
+		sparc64)
+			_doclang_cfg ${triple/${abi}/sparcv9}
+			;;
+	esac
+}
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+
+	insinto /etc/clang
+	newins - gentoo-runtimes.cfg <<-EOF
+		# This file is initially generated by llvm-core/clang-runtime.
+		# It is used to control the default runtimes using by clang.
+
+		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
+		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
+		--stdlib=$(usex default-libcxx libc++ libstdc++)
+		-fuse-ld=$(usex default-lld lld bfd)
+	EOF
+
+	newins - gentoo-gcc-install.cfg <<-EOF
+		# This file is maintained by gcc-config.
+		# It is used to specify the selected GCC installation.
+	EOF
+
+	newins - gentoo-common.cfg <<-EOF
+		# This file contains flags common to clang, clang++ and clang-cpp.
+		@gentoo-runtimes.cfg
+		@gentoo-gcc-install.cfg
+		@gentoo-hardened.cfg
+		# bug #870001
+		-include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
+	EOF
+
+	# clang-cpp does not like link args being passed to it when directly
+	# invoked, so use a separate configuration file.
+	newins - gentoo-common-ld.cfg <<-EOF
+		# This file contains flags common to clang and clang++
+		@gentoo-hardened-ld.cfg
+	EOF
+
+	# Baseline hardening (bug #851111)
+	newins - gentoo-hardened.cfg <<-EOF
+		# Some of these options are added unconditionally, regardless of
+		# USE=hardened, for parity with sys-devel/gcc.
+		-Xarch_host -fstack-clash-protection
+		-Xarch_host -fstack-protector-strong
+		-fPIE
+		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
+	EOF
+
+	newins - gentoo-cet.cfg <<-EOF
+		-Xarch_host -fcf-protection=$(usex cet full none)
+	EOF
+
+	if use kernel_Darwin; then
+		newins - gentoo-hardened-ld.cfg <<-EOF
+			# There was -Wl,-z,relro here, but it's not supported on Mac
+			# TODO: investigate whether -bind_at_load or -read_only_stubs will do the job
+		EOF
+	else
+		newins - gentoo-hardened-ld.cfg <<-EOF
+			# Some of these options are added unconditionally, regardless of
+			# USE=hardened, for parity with sys-devel/gcc.
+			-Wl,-z,relro
+			-Wl,-z,now
+		EOF
+	fi
+
+	dodir /usr/include/gentoo
+
+	cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
+	/* __has_include is an extension, but it's fine, because this is only
+	for Clang anyway. */
+	#if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
+	# include <stdc-predef.h>
+	#endif
+	EOF
+
+	local fortify_level=$(usex hardened 3 2)
+	# We have to do this because glibc's headers warn if F_S is set
+	# without optimization and that would at the very least be very noisy
+	# during builds and at worst trigger many -Werror builds.
+	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
+	#ifdef __clang__
+	# pragma clang system_header
+	#endif
+	#ifndef _FORTIFY_SOURCE
+	# if defined(__has_feature)
+	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
+	# else
+	#  define __GENTOO_HAS_FEATURE(x) 0
+	# endif
+	#
+	# if !defined(__OPTIMIZE__) || __OPTIMIZE__ == 0
+	# elif !defined(__STDC_HOSTED__) || __STDC_HOSTED__ != 1
+	# elif defined(__SANITIZE_ADDRESS__)
+	# elif __GENTOO_HAS_FEATURE(address_sanitizer)
+	# elif __GENTOO_HAS_FEATURE(hwaddress_sanitizer)
+	# elif __GENTOO_HAS_FEATURE(memory_sanitizer)
+	# elif __GENTOO_HAS_FEATURE(numerical_stability_sanitizer)
+	# elif __GENTOO_HAS_FEATURE(realtime_sanitizer)
+	# elif __GENTOO_HAS_FEATURE(thread_sanitizer)
+	# else
+	#  define _FORTIFY_SOURCE ${fortify_level}
+	# endif
+	#
+	# undef __GENTOO_HAS_FEATURE
+	#endif
+	EOF
+
+	# TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
+	# non-hardened?
+	if use hardened ; then
+		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
+			# Options below are conditional on USE=hardened.
+			-Xarch_host -D_GLIBCXX_ASSERTIONS
+
+			# Analogue to GLIBCXX_ASSERTIONS
+			# https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
+			# https://libcxx.llvm.org/Hardening.html#using-hardened-mode
+			-Xarch_host -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
+		EOF
+
+		cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
+			# Options below are conditional on USE=hardened.
+		EOF
+	fi
+
+	# We only install config files for supported ABIs because unprefixed tools
+	# might be used for crosscompilation where e.g. PIE may not be supported.
+	# See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug #912685.
+	local abi
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		doclang_cfg "${abi_chost}"
+	done
+
+	if use kernel_Darwin; then
+		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+			# Gentoo Prefix on Darwin
+			-Wl,-search_paths_first
+		EOF
+		if use bootstrap-prefix ; then
+			# bootstrap-prefix is only set during stage2 of bootstrapping
+			# Prefix, where EPREFIX is set to EPREFIX/tmp.
+			# Here we need to point it at the future lib dir of the stage3's
+			# EPREFIX.
+			cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+				-Wl,-rpath,${EPREFIX}/../usr/lib
+				-Wl,-L,${EPREFIX}/../usr/lib
+				-isystem ${EPREFIX}/../usr/include
+			EOF
+		fi
+		# Using -Wl,-L instead of -L to trick compiler driver to put it
+		# after -isysroot's internal -L
+		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+			-Wl,-rpath,${EPREFIX}/usr/lib
+			-Wl,-L,${EPREFIX}/usr/lib
+			-isystem ${EPREFIX}/usr/include
+			-isysroot ${EPREFIX}/MacOSX.sdk
+		EOF
+	fi
+}
+
+pkg_preinst() {
+	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
+	then
+		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
+		if [[ -n ${gcc_path} ]]; then
+			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
+				--gcc-install-dir="${gcc_path%%:*}"
+			EOF
+		fi
+	fi
+}
diff --git a/llvm-core/clang-common/clang-common-20.0.0_pre20250118.ebuild b/llvm-core/clang-common/clang-common-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..1fde60b6b6de
--- /dev/null
+++ b/llvm-core/clang-common/clang-common-20.0.0_pre20250118.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 llvm.org multilib
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="
+	default-compiler-rt default-libcxx default-lld
+	bootstrap-prefix cet hardened llvm-libunwind
+"
+
+PDEPEND="
+	default-compiler-rt? (
+		llvm-core/clang-runtime:${LLVM_MAJOR}[compiler-rt]
+		llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
+		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
+	)
+	!default-compiler-rt? ( sys-devel/gcc )
+	default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
+	!default-libcxx? ( sys-devel/gcc )
+	default-lld? ( >=llvm-core/lld-${PV} )
+	!default-lld? ( sys-devel/binutils )
+"
+IDEPEND="
+	!default-compiler-rt? ( sys-devel/gcc-config )
+	!default-libcxx? ( sys-devel/gcc-config )
+"
+
+LLVM_COMPONENTS=( clang/utils )
+llvm.org_set_globals
+
+pkg_pretend() {
+	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
+
+	local flag missing_flags=()
+	for flag in default-{compiler-rt,libcxx,lld}; do
+		if ! use "${flag}" && has_version "llvm-core/clang[${flag}]"; then
+			missing_flags+=( "${flag}" )
+		fi
+	done
+
+	if [[ ${missing_flags[@]} ]]; then
+		eerror "It seems that you have the following flags set on llvm-core/clang:"
+		eerror
+		eerror "  ${missing_flags[*]}"
+		eerror
+		eerror "The default runtimes are now set via flags on llvm-core/clang-common."
+		eerror "The build is being aborted to prevent breakage.  Please either set"
+		eerror "the respective flags on this ebuild, e.g.:"
+		eerror
+		eerror "  llvm-core/clang-common ${missing_flags[*]}"
+		eerror
+		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
+		die "Mismatched defaults detected between llvm-core/clang and llvm-core/clang-common"
+	fi
+}
+
+_doclang_cfg() {
+	local triple="${1}"
+
+	local tool
+	for tool in ${triple}-clang{,++}; do
+		newins - "${tool}.cfg" <<-EOF
+			# This configuration file is used by ${tool} driver.
+			@gentoo-common.cfg
+			@gentoo-common-ld.cfg
+		EOF
+		if [[ ${triple} == x86_64* ]]; then
+			cat >> "${ED}/etc/clang/${tool}.cfg" <<-EOF || die
+				@gentoo-cet.cfg
+			EOF
+		fi
+	done
+
+	if use kernel_Darwin; then
+		cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
+			-lc++abi
+		EOF
+	fi
+
+	newins - "${triple}-clang-cpp.cfg" <<-EOF
+		# This configuration file is used by the ${triple}-clang-cpp driver.
+		@gentoo-common.cfg
+	EOF
+	if [[ ${triple} == x86_64* ]]; then
+		cat >> "${ED}/etc/clang/${triple}-clang-cpp.cfg" <<-EOF || die
+			@gentoo-cet.cfg
+		EOF
+	fi
+
+	# Install symlinks for triples with other vendor strings since some
+	# programs insist on mangling the triple.
+	local vendor
+	for vendor in gentoo pc unknown; do
+		local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
+		for tool in clang{,++,-cpp}; do
+			if [[ ! -f "${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
+				dosym "${triple}-${tool}.cfg" "/etc/clang/${vendor_triple}-${tool}.cfg"
+			fi
+		done
+	done
+}
+
+doclang_cfg() {
+	local triple="${1}"
+
+	_doclang_cfg ${triple}
+
+	# LLVM may have different arch names in some cases. For example in x86
+	# profiles the triple uses i686, but llvm will prefer i386 if invoked
+	# with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
+	# be used if invoked through ${CHOST}-clang{,++,-cpp} though.
+	#
+	# To make sure the correct triples are installed,
+	# see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
+	# and compare with CHOST values in profiles.
+
+	local abi=${triple%%-*}
+	case ${abi} in
+		armv4l|armv4t|armv5tel|armv6j|armv7a)
+			_doclang_cfg ${triple/${abi}/arm}
+			;;
+		i686)
+			_doclang_cfg ${triple/${abi}/i386}
+			;;
+		sparc)
+			_doclang_cfg ${triple/${abi}/sparcel}
+			;;
+		sparc64)
+			_doclang_cfg ${triple/${abi}/sparcv9}
+			;;
+	esac
+}
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+
+	insinto /etc/clang
+	newins - gentoo-runtimes.cfg <<-EOF
+		# This file is initially generated by llvm-core/clang-runtime.
+		# It is used to control the default runtimes using by clang.
+
+		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
+		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
+		--stdlib=$(usex default-libcxx libc++ libstdc++)
+		-fuse-ld=$(usex default-lld lld bfd)
+	EOF
+
+	newins - gentoo-gcc-install.cfg <<-EOF
+		# This file is maintained by gcc-config.
+		# It is used to specify the selected GCC installation.
+	EOF
+
+	newins - gentoo-common.cfg <<-EOF
+		# This file contains flags common to clang, clang++ and clang-cpp.
+		@gentoo-runtimes.cfg
+		@gentoo-gcc-install.cfg
+		@gentoo-hardened.cfg
+		# bug #870001
+		-include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
+	EOF
+
+	# clang-cpp does not like link args being passed to it when directly
+	# invoked, so use a separate configuration file.
+	newins - gentoo-common-ld.cfg <<-EOF
+		# This file contains flags common to clang and clang++
+		@gentoo-hardened-ld.cfg
+	EOF
+
+	# Baseline hardening (bug #851111)
+	newins - gentoo-hardened.cfg <<-EOF
+		# Some of these options are added unconditionally, regardless of
+		# USE=hardened, for parity with sys-devel/gcc.
+		-Xarch_host -fstack-clash-protection
+		-Xarch_host -fstack-protector-strong
+		-fPIE
+		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
+	EOF
+
+	newins - gentoo-cet.cfg <<-EOF
+		-Xarch_host -fcf-protection=$(usex cet full none)
+	EOF
+
+	if use kernel_Darwin; then
+		newins - gentoo-hardened-ld.cfg <<-EOF
+			# There was -Wl,-z,relro here, but it's not supported on Mac
+			# TODO: investigate whether -bind_at_load or -read_only_stubs will do the job
+		EOF
+	else
+		newins - gentoo-hardened-ld.cfg <<-EOF
+			# Some of these options are added unconditionally, regardless of
+			# USE=hardened, for parity with sys-devel/gcc.
+			-Wl,-z,relro
+			-Wl,-z,now
+		EOF
+	fi
+
+	dodir /usr/include/gentoo
+
+	cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
+	/* __has_include is an extension, but it's fine, because this is only
+	for Clang anyway. */
+	#if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
+	# include <stdc-predef.h>
+	#endif
+	EOF
+
+	local fortify_level=$(usex hardened 3 2)
+	# We have to do this because glibc's headers warn if F_S is set
+	# without optimization and that would at the very least be very noisy
+	# during builds and at worst trigger many -Werror builds.
+	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
+	#ifdef __clang__
+	# pragma clang system_header
+	#endif
+	#ifndef _FORTIFY_SOURCE
+	# if defined(__has_feature)
+	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
+	# else
+	#  define __GENTOO_HAS_FEATURE(x) 0
+	# endif
+	#
+	# if !defined(__OPTIMIZE__) || __OPTIMIZE__ == 0
+	# elif !defined(__STDC_HOSTED__) || __STDC_HOSTED__ != 1
+	# elif defined(__SANITIZE_ADDRESS__)
+	# elif __GENTOO_HAS_FEATURE(address_sanitizer)
+	# elif __GENTOO_HAS_FEATURE(hwaddress_sanitizer)
+	# elif __GENTOO_HAS_FEATURE(memory_sanitizer)
+	# elif __GENTOO_HAS_FEATURE(numerical_stability_sanitizer)
+	# elif __GENTOO_HAS_FEATURE(realtime_sanitizer)
+	# elif __GENTOO_HAS_FEATURE(thread_sanitizer)
+	# else
+	#  define _FORTIFY_SOURCE ${fortify_level}
+	# endif
+	#
+	# undef __GENTOO_HAS_FEATURE
+	#endif
+	EOF
+
+	# TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
+	# non-hardened?
+	if use hardened ; then
+		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
+			# Options below are conditional on USE=hardened.
+			-Xarch_host -D_GLIBCXX_ASSERTIONS
+
+			# Analogue to GLIBCXX_ASSERTIONS
+			# https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
+			# https://libcxx.llvm.org/Hardening.html#using-hardened-mode
+			-Xarch_host -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
+		EOF
+
+		cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
+			# Options below are conditional on USE=hardened.
+		EOF
+	fi
+
+	# We only install config files for supported ABIs because unprefixed tools
+	# might be used for crosscompilation where e.g. PIE may not be supported.
+	# See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug #912685.
+	local abi
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		doclang_cfg "${abi_chost}"
+	done
+
+	if use kernel_Darwin; then
+		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+			# Gentoo Prefix on Darwin
+			-Wl,-search_paths_first
+		EOF
+		if use bootstrap-prefix ; then
+			# bootstrap-prefix is only set during stage2 of bootstrapping
+			# Prefix, where EPREFIX is set to EPREFIX/tmp.
+			# Here we need to point it at the future lib dir of the stage3's
+			# EPREFIX.
+			cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+				-Wl,-rpath,${EPREFIX}/../usr/lib
+				-Wl,-L,${EPREFIX}/../usr/lib
+				-isystem ${EPREFIX}/../usr/include
+			EOF
+		fi
+		# Using -Wl,-L instead of -L to trick compiler driver to put it
+		# after -isysroot's internal -L
+		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+			-Wl,-rpath,${EPREFIX}/usr/lib
+			-Wl,-L,${EPREFIX}/usr/lib
+			-isystem ${EPREFIX}/usr/include
+			-isysroot ${EPREFIX}/MacOSX.sdk
+		EOF
+	fi
+}
+
+pkg_preinst() {
+	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
+	then
+		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
+		if [[ -n ${gcc_path} ]]; then
+			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
+				--gcc-install-dir="${gcc_path%%:*}"
+			EOF
+		fi
+	fi
+}
diff --git a/llvm-core/clang-runtime/clang-runtime-19.1.7.ebuild b/llvm-core/clang-runtime/clang-runtime-19.1.7.ebuild
new file mode 100644
index 000000000000..da17e274d8da
--- /dev/null
+++ b/llvm-core/clang-runtime/clang-runtime-19.1.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+
+LICENSE="metapackage"
+SLOT="${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
+IUSE="+compiler-rt libcxx offload openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+
+RDEPEND="
+	compiler-rt? (
+		~llvm-runtimes/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		sanitize? (
+			~llvm-runtimes/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		)
+	)
+	libcxx? ( >=llvm-runtimes/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? (
+		>=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}]
+		offload? (
+			>=llvm-runtimes/offload-${PV}
+		)
+	)
+"
diff --git a/llvm-core/clang-runtime/clang-runtime-20.0.0_pre20241227.ebuild b/llvm-core/clang-runtime/clang-runtime-20.0.0_pre20241227.ebuild
deleted file mode 100644
index 731f7ca4c926..000000000000
--- a/llvm-core/clang-runtime/clang-runtime-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-build toolchain-funcs
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-
-LICENSE="metapackage"
-SLOT="${PV%%.*}"
-IUSE="+compiler-rt libcxx offload openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-
-RDEPEND="
-	compiler-rt? (
-		~llvm-runtimes/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		sanitize? (
-			~llvm-runtimes/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		)
-	)
-	libcxx? ( >=llvm-runtimes/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? (
-		>=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}]
-		offload? (
-			>=llvm-runtimes/offload-${PV}
-		)
-	)
-"
-
-pkg_pretend() {
-	if tc-is-clang; then
-		ewarn "You seem to be using clang as a system compiler.  As of clang-16,"
-		ewarn "upstream has turned a few warnings that commonly occur during"
-		ewarn "configure script runs into errors by default.  This causes some"
-		ewarn "configure tests to start failing, sometimes resulting in silent"
-		ewarn "breakage, missing functionality or runtime misbehavior.  It is"
-		ewarn "not yet clear whether the change will remain or be reverted."
-		ewarn
-		ewarn "For more information, please see:"
-		ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
-	fi
-}
diff --git a/llvm-core/clang-runtime/clang-runtime-20.0.0_pre20250111.ebuild b/llvm-core/clang-runtime/clang-runtime-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..542c7b28a6f4
--- /dev/null
+++ b/llvm-core/clang-runtime/clang-runtime-20.0.0_pre20250111.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+
+LICENSE="metapackage"
+SLOT="${PV%%.*}"
+IUSE="+compiler-rt libcxx offload openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+
+RDEPEND="
+	compiler-rt? (
+		~llvm-runtimes/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		sanitize? (
+			~llvm-runtimes/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		)
+	)
+	libcxx? ( >=llvm-runtimes/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? (
+		>=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}]
+		offload? (
+			>=llvm-runtimes/offload-${PV}
+		)
+	)
+"
diff --git a/llvm-core/clang-runtime/clang-runtime-20.0.0_pre20250118.ebuild b/llvm-core/clang-runtime/clang-runtime-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..542c7b28a6f4
--- /dev/null
+++ b/llvm-core/clang-runtime/clang-runtime-20.0.0_pre20250118.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+
+LICENSE="metapackage"
+SLOT="${PV%%.*}"
+IUSE="+compiler-rt libcxx offload openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+
+RDEPEND="
+	compiler-rt? (
+		~llvm-runtimes/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		sanitize? (
+			~llvm-runtimes/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		)
+	)
+	libcxx? ( >=llvm-runtimes/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? (
+		>=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}]
+		offload? (
+			>=llvm-runtimes/offload-${PV}
+		)
+	)
+"
diff --git a/llvm-core/clang/Manifest b/llvm-core/clang/Manifest
index 5bfe53e649c1..190d2934f6f6 100644
--- a/llvm-core/clang/Manifest
+++ b/llvm-core/clang/Manifest
@@ -19,4 +19,7 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607 SHA512 d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
+DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/llvm-core/clang/clang-19.1.7.ebuild b/llvm-core/clang/clang-19.1.7.ebuild
new file mode 100644
index 000000000000..d21a4ba71610
--- /dev/null
+++ b/llvm-core/clang/clang-19.1.7.ebuild
@@ -0,0 +1,465 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake llvm.org multilib multilib-minimal
+inherit prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
+IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~llvm-core/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+	>=llvm-core/clang-common-${PV}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? ( ~llvm-core/lld-${PV} )
+	xml? ( virtual/pkgconfig )
+"
+PDEPEND="
+	~llvm-core/clang-runtime-${PV}
+	llvm-core/clang-toolchain-symlinks:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=(
+	clang clang-tools-extra cmake
+)
+LLVM_MANPAGES=1
+LLVM_TEST_COMPONENTS=(
+	llvm/utils
+)
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
+BDEPEND+="
+	$(python_gen_cond_dep '
+		dev-python/myst-parser[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	')
+"
+[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use llvm-core/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+src_prepare() {
+	# create extra parent dir for relative CLANG_RESOURCE_DIR access
+	mkdir -p x/y || die
+	BUILD_DIR=${WORKDIR}/x/y/clang
+
+	llvm.org_src_prepare
+
+	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+	eprefixify \
+		lib/Lex/InitHeaderSearch.cpp \
+		lib/Driver/ToolChains/Darwin.cpp || die
+
+	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
+		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					clang-libraries|distribution)
+						continue
+						;;
+					# tools
+					clang|clangd|clang-*)
+						;;
+					# static libraries
+					clang*|findAllSymbols)
+						continue
+						;;
+					# conditional to USE=doc
+					docs-clang-html|docs-clang-tools-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(${NINJA} -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# common stuff
+		clang-cmake-exports
+		clang-headers
+		clang-resource-headers
+		libclang-headers
+
+		aarch64-resource-headers
+		arm-common-resource-headers
+		arm-resource-headers
+		core-resource-headers
+		cuda-resource-headers
+		hexagon-resource-headers
+		hip-resource-headers
+		hlsl-resource-headers
+		mips-resource-headers
+		opencl-resource-headers
+		openmp-resource-headers
+		ppc-htm-resource-headers
+		ppc-resource-headers
+		riscv-resource-headers
+		systemz-resource-headers
+		utility-resource-headers
+		ve-resource-headers
+		webassembly-resource-headers
+		windows-resource-headers
+		x86-resource-headers
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			amdgpu-arch
+			c-index-test
+			clang
+			clang-format
+			clang-installapi
+			clang-linker-wrapper
+			clang-nvlink-wrapper
+			clang-offload-bundler
+			clang-offload-packager
+			clang-refactor
+			clang-repl
+			clang-rename
+			clang-scan-deps
+			diagtool
+			hmaptool
+			nvptx-arch
+
+			# needed for cross-compiling Clang
+			clang-tblgen
+		)
+
+		if use extra; then
+			out+=(
+				# extra tools
+				clang-apply-replacements
+				clang-change-namespace
+				clang-doc
+				clang-include-cleaner
+				clang-include-fixer
+				clang-move
+				clang-pseudo
+				clang-query
+				clang-reorder-fields
+				clang-tidy
+				clang-tidy-headers
+				clangd
+				find-all-symbols
+				modularize
+				pp-trace
+			)
+		fi
+
+		if llvm_are_manpages_built; then
+			out+=( docs-clang-man )
+			use extra && out+=( docs-clang-tools-man )
+		fi
+
+		if use doc; then
+			out+=( docs-clang-html )
+			use extra && out+=( docs-clang-tools-html )
+		fi
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-build-py
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		-DLLVM_ROOT="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
+		-DCLANG_CONFIG_FILE_USER_DIR="~/.config/clang"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+		-DCLANG_INCLUDE_TESTS=$(usex test)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
+
+		-DCLANG_ENABLE_LIBXML2=$(usex xml)
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+		# TODO: CLANG_ENABLE_HLSL?
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if ! use elibc_musl; then
+		mycmakeargs+=(
+			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
+		)
+	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DLLVM_BUILD_DOCS=ON
+				-DLLVM_ENABLE_SPHINX=ON
+				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+			if use extra; then
+				mycmakeargs+=(
+					-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+				)
+			fi
+		fi
+		mycmakeargs+=(
+			-DCLANG_INCLUDE_DOCS=${build_docs}
+		)
+	fi
+	if multilib_native_use extra; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		has_version -b llvm-core/clang:${LLVM_MAJOR} ||
+			die "llvm-core/clang:${LLVM_MAJOR} is required on the build host."
+		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
+		mycmakeargs+=(
+			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
+			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
+		)
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	local test_targets=( check-clang )
+	if multilib_native_use extra; then
+		test_targets+=(
+			check-clang-tools
+			check-clangd
+		)
+	fi
+	cmake_build "${test_targets[@]}"
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	if use extra; then
+		mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
+	fi
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
+		dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
+		dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${LLVM_MAJOR}" \
+				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
+			dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
+				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
+		done
+	done
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/clang "${ED}"/usr/include/clangrt || die
+	if multilib_native_use extra; then
+		# don't wrap clang-tidy headers, the list is too long
+		# (they're fine for non-native ABI but enabling the targets is problematic)
+		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
+	fi
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+	llvm_install_manpages
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	elog "You can find additional utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
+	if use extra; then
+		elog "Some of them are vim integration scripts (with instructions inside)."
+		elog "The run-clang-tidy.py script requires the following additional package:"
+		elog "  dev-python/pyyaml"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/llvm-core/clang/clang-20.0.0_pre20241227.ebuild b/llvm-core/clang/clang-20.0.0_pre20250111.ebuild
index 67e6515db8b5..67e6515db8b5 100644
--- a/llvm-core/clang/clang-20.0.0_pre20241227.ebuild
+++ b/llvm-core/clang/clang-20.0.0_pre20250111.ebuild
diff --git a/llvm-core/clang/clang-20.0.0_pre20250118.ebuild b/llvm-core/clang/clang-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..67e6515db8b5
--- /dev/null
+++ b/llvm-core/clang/clang-20.0.0_pre20250118.ebuild
@@ -0,0 +1,464 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake llvm.org multilib multilib-minimal
+inherit prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+IUSE="+debug doc +extra ieee-long-double +pie +static-analyzer test xml"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~llvm-core/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+	>=llvm-core/clang-common-${PV}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? ( ~llvm-core/lld-${PV} )
+	xml? ( virtual/pkgconfig )
+"
+PDEPEND="
+	~llvm-core/clang-runtime-${PV}
+	llvm-core/clang-toolchain-symlinks:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=(
+	clang clang-tools-extra cmake
+)
+LLVM_MANPAGES=1
+LLVM_TEST_COMPONENTS=(
+	llvm/utils
+)
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
+BDEPEND+="
+	$(python_gen_cond_dep '
+		dev-python/myst-parser[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	')
+"
+[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use llvm-core/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+src_prepare() {
+	# create extra parent dir for relative CLANG_RESOURCE_DIR access
+	mkdir -p x/y || die
+	BUILD_DIR=${WORKDIR}/x/y/clang
+
+	llvm.org_src_prepare
+
+	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+	eprefixify \
+		lib/Lex/InitHeaderSearch.cpp \
+		lib/Driver/ToolChains/Darwin.cpp || die
+
+	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
+		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					clang-libraries|distribution)
+						continue
+						;;
+					# tools
+					clang|clangd|clang-*)
+						;;
+					# static libraries
+					clang*|findAllSymbols)
+						continue
+						;;
+					# conditional to USE=doc
+					docs-clang-html|docs-clang-tools-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(${NINJA} -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eerror "get_distribution_components() is outdated!"
+			eerror "   Add: ${add[*]}"
+			eerror "Remove: ${remove[*]}"
+			die "Update get_distribution_components()!"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# common stuff
+		clang-cmake-exports
+		clang-headers
+		clang-resource-headers
+		libclang-headers
+
+		aarch64-resource-headers
+		arm-common-resource-headers
+		arm-resource-headers
+		core-resource-headers
+		cuda-resource-headers
+		hexagon-resource-headers
+		hip-resource-headers
+		hlsl-resource-headers
+		mips-resource-headers
+		opencl-resource-headers
+		openmp-resource-headers
+		ppc-htm-resource-headers
+		ppc-resource-headers
+		riscv-resource-headers
+		systemz-resource-headers
+		utility-resource-headers
+		ve-resource-headers
+		webassembly-resource-headers
+		windows-resource-headers
+		x86-resource-headers
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			amdgpu-arch
+			c-index-test
+			clang
+			clang-format
+			clang-installapi
+			clang-linker-wrapper
+			clang-nvlink-wrapper
+			clang-offload-bundler
+			clang-offload-packager
+			clang-refactor
+			clang-repl
+			clang-scan-deps
+			clang-sycl-linker
+			diagtool
+			hmaptool
+			nvptx-arch
+
+			# needed for cross-compiling Clang
+			clang-tblgen
+		)
+
+		if use extra; then
+			out+=(
+				# extra tools
+				clang-apply-replacements
+				clang-change-namespace
+				clang-doc
+				clang-include-cleaner
+				clang-include-fixer
+				clang-move
+				clang-query
+				clang-reorder-fields
+				clang-tidy
+				clang-tidy-headers
+				clangd
+				find-all-symbols
+				modularize
+				pp-trace
+			)
+		fi
+
+		if llvm_are_manpages_built; then
+			out+=( docs-clang-man )
+			use extra && out+=( docs-clang-tools-man )
+		fi
+
+		if use doc; then
+			out+=( docs-clang-html )
+			use extra && out+=( docs-clang-tools-html )
+		fi
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-build-py
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		-DLLVM_ROOT="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
+		-DCLANG_CONFIG_FILE_USER_DIR="~/.config/clang"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+		-DCLANG_INCLUDE_TESTS=$(usex test)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
+
+		-DCLANG_ENABLE_LIBXML2=$(usex xml)
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+		# TODO: CLANG_ENABLE_HLSL?
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if ! use elibc_musl; then
+		mycmakeargs+=(
+			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
+		)
+	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DLLVM_BUILD_DOCS=ON
+				-DLLVM_ENABLE_SPHINX=ON
+				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+			if use extra; then
+				mycmakeargs+=(
+					-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+				)
+			fi
+		fi
+		mycmakeargs+=(
+			-DCLANG_INCLUDE_DOCS=${build_docs}
+		)
+	fi
+	if multilib_native_use extra; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		has_version -b llvm-core/clang:${LLVM_MAJOR} ||
+			die "llvm-core/clang:${LLVM_MAJOR} is required on the build host."
+		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
+		mycmakeargs+=(
+			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
+			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
+		)
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	local test_targets=( check-clang )
+	if multilib_native_use extra; then
+		test_targets+=(
+			check-clang-tools
+			check-clangd
+		)
+	fi
+	cmake_build "${test_targets[@]}"
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	if use extra; then
+		mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
+	fi
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
+		dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
+		dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${LLVM_MAJOR}" \
+				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
+			dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
+				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
+		done
+	done
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/clang "${ED}"/usr/include/clangrt || die
+	if multilib_native_use extra; then
+		# don't wrap clang-tidy headers, the list is too long
+		# (they're fine for non-native ABI but enabling the targets is problematic)
+		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
+	fi
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+	llvm_install_manpages
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	elog "You can find additional utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
+	if use extra; then
+		elog "Some of them are vim integration scripts (with instructions inside)."
+		elog "The run-clang-tidy.py script requires the following additional package:"
+		elog "  dev-python/pyyaml"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/llvm-core/libclc/Manifest b/llvm-core/libclc/Manifest
index fef409fa0e6a..b7114fc7aeab 100644
--- a/llvm-core/libclc/Manifest
+++ b/llvm-core/libclc/Manifest
@@ -10,4 +10,7 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607 SHA512 d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
+DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/llvm-core/libclc/libclc-15.0.7.ebuild b/llvm-core/libclc/libclc-15.0.7.ebuild
index 84067d4bd0e3..a83055c1a39a 100644
--- a/llvm-core/libclc/libclc-15.0.7.ebuild
+++ b/llvm-core/libclc/libclc-15.0.7.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 @@ HOMEPAGE="https://libclc.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 
 LLVM_MAX_SLOT=15
diff --git a/llvm-core/libclc/libclc-16.0.6.ebuild b/llvm-core/libclc/libclc-16.0.6.ebuild
index 9d1f1b85b677..4f97294a38ff 100644
--- a/llvm-core/libclc/libclc-16.0.6.ebuild
+++ b/llvm-core/libclc/libclc-16.0.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://libclc.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 
 LLVM_MAX_SLOT=16
diff --git a/llvm-core/libclc/libclc-18.1.8.ebuild b/llvm-core/libclc/libclc-18.1.8.ebuild
index 32ca404dad96..119172e79c4d 100644
--- a/llvm-core/libclc/libclc-18.1.8.ebuild
+++ b/llvm-core/libclc/libclc-18.1.8.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 @@ HOMEPAGE="https://libclc.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~loong ~riscv x86"
 IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 
 BDEPEND="
diff --git a/llvm-core/libclc/libclc-19.1.6.ebuild b/llvm-core/libclc/libclc-19.1.6.ebuild
index db7ed6718666..2849f6f1f73d 100644
--- a/llvm-core/libclc/libclc-19.1.6.ebuild
+++ b/llvm-core/libclc/libclc-19.1.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
@@ -12,7 +12,7 @@ HOMEPAGE="https://libclc.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 
 BDEPEND="
diff --git a/llvm-core/libclc/libclc-19.1.7.ebuild b/llvm-core/libclc/libclc-19.1.7.ebuild
new file mode 100644
index 000000000000..2849f6f1f73d
--- /dev/null
+++ b/llvm-core/libclc/libclc-19.1.7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {17..19} )
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake llvm.org llvm-r1 python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
+	')
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use spirv && libclc_targets+=(
+		"spirv-mesa3d-"
+		"spirv64-mesa3d-"
+	)
+	use video_cards_nvidia && libclc_targets+=(
+		"nvptx--"
+		"nvptx64--"
+		"nvptx--nvidiacl"
+		"nvptx64--nvidiacl"
+	)
+	use video_cards_r600 && libclc_targets+=(
+		"r600--"
+	)
+	use video_cards_radeonsi && libclc_targets+=(
+		"amdgcn--"
+		"amdgcn-mesa-mesa3d"
+		"amdgcn--amdhsa"
+	)
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+	)
+	cmake_src_configure
+}
diff --git a/llvm-core/libclc/libclc-20.0.0.9999.ebuild b/llvm-core/libclc/libclc-20.0.0.9999.ebuild
index f64d8751be55..f1b5637f6dd9 100644
--- a/llvm-core/libclc/libclc-20.0.0.9999.ebuild
+++ b/llvm-core/libclc/libclc-20.0.0.9999.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
 
-LLVM_COMPAT=( {17..19} )
+LLVM_COMPAT=( {17..20} )
 PYTHON_COMPAT=( python3_{10..13} )
 inherit cmake llvm.org llvm-r1 python-any-r1
 
diff --git a/llvm-core/libclc/libclc-20.0.0_pre20241227.ebuild b/llvm-core/libclc/libclc-20.0.0_pre20241227.ebuild
deleted file mode 100644
index f64d8751be55..000000000000
--- a/llvm-core/libclc/libclc-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {17..19} )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm.org llvm-r1 python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
-	')
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/llvm-core/libclc/libclc-20.0.0_pre20250111.ebuild b/llvm-core/libclc/libclc-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..e20215eee7ff
--- /dev/null
+++ b/llvm-core/libclc/libclc-20.0.0_pre20250111.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {17..19} )
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake llvm.org llvm-r1 python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
+	')
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use spirv && libclc_targets+=(
+		"spirv-mesa3d-"
+		"spirv64-mesa3d-"
+	)
+	use video_cards_nvidia && libclc_targets+=(
+		"nvptx--"
+		"nvptx64--"
+		"nvptx--nvidiacl"
+		"nvptx64--nvidiacl"
+	)
+	use video_cards_r600 && libclc_targets+=(
+		"r600--"
+	)
+	use video_cards_radeonsi && libclc_targets+=(
+		"amdgcn--"
+		"amdgcn-mesa-mesa3d"
+		"amdgcn--amdhsa"
+	)
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+	)
+	cmake_src_configure
+}
diff --git a/llvm-core/libclc/libclc-20.0.0_pre20250118.ebuild b/llvm-core/libclc/libclc-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..e20215eee7ff
--- /dev/null
+++ b/llvm-core/libclc/libclc-20.0.0_pre20250118.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {17..19} )
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake llvm.org llvm-r1 python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
+	')
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use spirv && libclc_targets+=(
+		"spirv-mesa3d-"
+		"spirv64-mesa3d-"
+	)
+	use video_cards_nvidia && libclc_targets+=(
+		"nvptx--"
+		"nvptx64--"
+		"nvptx--nvidiacl"
+		"nvptx64--nvidiacl"
+	)
+	use video_cards_r600 && libclc_targets+=(
+		"r600--"
+	)
+	use video_cards_radeonsi && libclc_targets+=(
+		"amdgcn--"
+		"amdgcn-mesa-mesa3d"
+		"amdgcn--amdhsa"
+	)
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+	)
+	cmake_src_configure
+}
diff --git a/llvm-core/lld/Manifest b/llvm-core/lld/Manifest
index 56e16cb2ed63..ab86c40539b0 100644
--- a/llvm-core/lld/Manifest
+++ b/llvm-core/lld/Manifest
@@ -11,4 +11,7 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607 SHA512 d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
+DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/llvm-core/lld/lld-19.1.7.ebuild b/llvm-core/lld/lld-19.1.7.ebuild
new file mode 100644
index 000000000000..8383bb5ccea5
--- /dev/null
+++ b/llvm-core/lld/lld-19.1.7.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
+IUSE="debug test zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~llvm-core/llvm-${PV}[debug=,zstd=]
+	sys-libs/zlib:=
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="
+	${DEPEND}
+	!llvm-core/lld:0
+"
+BDEPEND="
+	llvm-core/llvm:${LLVM_MAJOR}
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+	)
+"
+PDEPEND="
+	>=llvm-core/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
+llvm.org_set_globals
+
+python_check_deps() {
+	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+
+	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
+	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+	# to existent directory ${WORKDIR}/libunwind/include.
+	mkdir -p "${WORKDIR}/llvm" || die
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_ENABLE_ZLIB=FORCE_ON
+		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	tc-is-cross-compiler &&	mycmakeargs+=(
+		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
diff --git a/llvm-core/lld/lld-20.0.0_pre20241227.ebuild b/llvm-core/lld/lld-20.0.0_pre20241227.ebuild
deleted file mode 100644
index a2c0c2433b44..000000000000
--- a/llvm-core/lld/lld-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,89 +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} )
-inherit cmake flag-o-matic llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-IUSE="+debug test zstd"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~llvm-core/llvm-${PV}[debug=,zstd=]
-	sys-libs/zlib:=
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="
-	${DEPEND}
-	!llvm-core/lld:0
-"
-BDEPEND="
-	llvm-core/llvm:${LLVM_MAJOR}
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-PDEPEND="
-	>=llvm-core/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	llvm.org_src_unpack
-
-	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
-	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
-	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
-	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
-	# to existent directory ${WORKDIR}/libunwind/include.
-	mkdir -p "${WORKDIR}/llvm" || die
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-		-DLLVM_ENABLE_ZLIB=FORCE_ON
-		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	tc-is-cross-compiler &&	mycmakeargs+=(
-		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lld
-}
diff --git a/llvm-core/lld/lld-20.0.0_pre20250111.ebuild b/llvm-core/lld/lld-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..f1e16744d618
--- /dev/null
+++ b/llvm-core/lld/lld-20.0.0_pre20250111.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+IUSE="+debug test zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~llvm-core/llvm-${PV}[debug=,zstd=]
+	sys-libs/zlib:=
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="
+	${DEPEND}
+	!llvm-core/lld:0
+"
+BDEPEND="
+	llvm-core/llvm:${LLVM_MAJOR}
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+PDEPEND="
+	>=llvm-core/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
+llvm.org_set_globals
+
+python_check_deps() {
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+
+	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
+	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+	# to existent directory ${WORKDIR}/libunwind/include.
+	mkdir -p "${WORKDIR}/llvm" || die
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_ENABLE_ZLIB=FORCE_ON
+		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	tc-is-cross-compiler &&	mycmakeargs+=(
+		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
diff --git a/llvm-core/lld/lld-20.0.0_pre20250118.ebuild b/llvm-core/lld/lld-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..f1e16744d618
--- /dev/null
+++ b/llvm-core/lld/lld-20.0.0_pre20250118.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+IUSE="+debug test zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~llvm-core/llvm-${PV}[debug=,zstd=]
+	sys-libs/zlib:=
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="
+	${DEPEND}
+	!llvm-core/lld:0
+"
+BDEPEND="
+	llvm-core/llvm:${LLVM_MAJOR}
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+PDEPEND="
+	>=llvm-core/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
+llvm.org_set_globals
+
+python_check_deps() {
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+
+	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
+	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+	# to existent directory ${WORKDIR}/libunwind/include.
+	mkdir -p "${WORKDIR}/llvm" || die
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_ENABLE_ZLIB=FORCE_ON
+		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	tc-is-cross-compiler &&	mycmakeargs+=(
+		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
diff --git a/llvm-core/lldb/Manifest b/llvm-core/lldb/Manifest
index 840827d9ea61..12b079386e1c 100644
--- a/llvm-core/lldb/Manifest
+++ b/llvm-core/lldb/Manifest
@@ -11,4 +11,7 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607 SHA512 d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
+DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/llvm-core/lldb/lldb-19.1.7.ebuild b/llvm-core/lldb/lldb-19.1.7.ebuild
new file mode 100644
index 000000000000..58920fc67b76
--- /dev/null
+++ b/llvm-core/lldb/lldb-19.1.7.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic llvm.org python-single-r1
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
+IUSE="debug debuginfod +libedit lzma ncurses +python test +xml"
+RESTRICT="test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	debuginfod? (
+		net-misc/curl:=
+		dev-cpp/cpp-httplib:=
+	)
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	xml? ( dev-libs/libxml2:= )
+	~llvm-core/clang-${PV}
+	~llvm-core/llvm-${PV}[debuginfod=]
+"
+RDEPEND="
+	${DEPEND}
+	python? (
+		${PYTHON_DEPS}
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	python? (
+		>=dev-lang/swig-3.0.11
+	)
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		llvm-core/lld
+	)
+"
+
+LLVM_COMPONENTS=( lldb cmake llvm/utils )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+src_configure() {
+	# bug #858389 (https://github.com/llvm/llvm-project/issues/83636)
+	filter-lto
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local mycmakeargs=(
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DClang_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LUA=OFF
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-{shell,unit}
+	# failures + hangs
+	#use python && cmake_build check-lldb-api
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/llvm-core/lldb/lldb-20.0.0_pre20241227.ebuild b/llvm-core/lldb/lldb-20.0.0_pre20241227.ebuild
deleted file mode 100644
index 06c04e9dfe8a..000000000000
--- a/llvm-core/lldb/lldb-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm.org python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
-IUSE="+debug debuginfod +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	debuginfod? (
-		net-misc/curl:=
-		dev-cpp/cpp-httplib:=
-	)
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	xml? ( dev-libs/libxml2:= )
-	~llvm-core/clang-${PV}
-	~llvm-core/llvm-${PV}[debuginfod=]
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	python? (
-		>=dev-lang/swig-3.0.11
-	)
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		llvm-core/lld
-	)
-"
-
-LLVM_COMPONENTS=( lldb cmake llvm/utils )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-src_configure() {
-	# bug #858389 (https://github.com/llvm/llvm-project/issues/83636)
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local mycmakeargs=(
-		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DClang_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
-
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LUA=OFF
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-
-		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/llvm-core/lldb/lldb-20.0.0_pre20250111.ebuild b/llvm-core/lldb/lldb-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..97d14c80551f
--- /dev/null
+++ b/llvm-core/lldb/lldb-20.0.0_pre20250111.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic llvm.org python-single-r1
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${LLVM_SOABI}"
+IUSE="+debug debuginfod +libedit lzma ncurses +python test +xml"
+RESTRICT="test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	debuginfod? (
+		net-misc/curl:=
+		dev-cpp/cpp-httplib:=
+	)
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	xml? ( dev-libs/libxml2:= )
+	~llvm-core/clang-${PV}
+	~llvm-core/llvm-${PV}[debuginfod=]
+"
+RDEPEND="
+	${DEPEND}
+	python? (
+		${PYTHON_DEPS}
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	python? (
+		>=dev-lang/swig-3.0.11
+	)
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		llvm-core/lld
+	)
+"
+
+LLVM_COMPONENTS=( lldb cmake llvm/utils )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+src_configure() {
+	# bug #858389 (https://github.com/llvm/llvm-project/issues/83636)
+	filter-lto
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local mycmakeargs=(
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DClang_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LUA=OFF
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-{shell,unit}
+	# failures + hangs
+	#use python && cmake_build check-lldb-api
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/llvm-core/lldb/lldb-20.0.0_pre20250118.ebuild b/llvm-core/lldb/lldb-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..97d14c80551f
--- /dev/null
+++ b/llvm-core/lldb/lldb-20.0.0_pre20250118.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic llvm.org python-single-r1
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${LLVM_SOABI}"
+IUSE="+debug debuginfod +libedit lzma ncurses +python test +xml"
+RESTRICT="test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	debuginfod? (
+		net-misc/curl:=
+		dev-cpp/cpp-httplib:=
+	)
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	xml? ( dev-libs/libxml2:= )
+	~llvm-core/clang-${PV}
+	~llvm-core/llvm-${PV}[debuginfod=]
+"
+RDEPEND="
+	${DEPEND}
+	python? (
+		${PYTHON_DEPS}
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	python? (
+		>=dev-lang/swig-3.0.11
+	)
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		llvm-core/lld
+	)
+"
+
+LLVM_COMPONENTS=( lldb cmake llvm/utils )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+src_configure() {
+	# bug #858389 (https://github.com/llvm/llvm-project/issues/83636)
+	filter-lto
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local mycmakeargs=(
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DClang_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LUA=OFF
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-{shell,unit}
+	# failures + hangs
+	#use python && cmake_build check-lldb-api
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/llvm-core/llvm-common/Manifest b/llvm-core/llvm-common/Manifest
index fef409fa0e6a..b7114fc7aeab 100644
--- a/llvm-core/llvm-common/Manifest
+++ b/llvm-core/llvm-common/Manifest
@@ -10,4 +10,7 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607 SHA512 d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
+DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/llvm-core/llvm-common/llvm-common-19.1.7.ebuild b/llvm-core/llvm-common/llvm-common-19.1.7.ebuild
new file mode 100644
index 000000000000..135cc3d48049
--- /dev/null
+++ b/llvm-core/llvm-common/llvm-common-19.1.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
+IUSE="emacs"
+
+RDEPEND="
+	!llvm-core/llvm:0
+"
+BDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+
+LLVM_COMPONENTS=( llvm/utils )
+llvm.org_set_globals
+
+SITEFILE="50llvm-gentoo.el"
+BYTECOMPFLAGS="-L emacs"
+
+src_compile() {
+	default
+
+	use emacs && elisp-compile emacs/*.el
+}
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r vim/*/
+	# some users may find it useful
+	newdoc vim/README README.vim
+	dodoc vim/vimrc
+
+	if use emacs ; then
+		elisp-install llvm emacs/*.{el,elc}
+		elisp-make-site-file "${SITEFILE}" llvm
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/llvm-core/llvm-common/llvm-common-20.0.0_pre20241227.ebuild b/llvm-core/llvm-common/llvm-common-20.0.0_pre20241227.ebuild
deleted file mode 100644
index 6555c5369426..000000000000
--- a/llvm-core/llvm-common/llvm-common-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="emacs"
-
-RDEPEND="
-	!llvm-core/llvm:0
-"
-BDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-
-LLVM_COMPONENTS=( llvm/utils )
-llvm.org_set_globals
-
-SITEFILE="50llvm-gentoo.el"
-BYTECOMPFLAGS="-L emacs"
-
-src_compile() {
-	default
-
-	use emacs && elisp-compile emacs/*.el
-}
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r vim/*/
-	# some users may find it useful
-	newdoc vim/README README.vim
-	dodoc vim/vimrc
-
-	if use emacs ; then
-		elisp-install llvm emacs/*.{el,elc}
-		elisp-make-site-file "${SITEFILE}" llvm
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/llvm-core/llvm-common/llvm-common-20.0.0_pre20250111.ebuild b/llvm-core/llvm-common/llvm-common-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..2e0edb2d0ea7
--- /dev/null
+++ b/llvm-core/llvm-common/llvm-common-20.0.0_pre20250111.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="emacs"
+
+RDEPEND="
+	!llvm-core/llvm:0
+"
+BDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+
+LLVM_COMPONENTS=( llvm/utils )
+llvm.org_set_globals
+
+SITEFILE="50llvm-gentoo.el"
+BYTECOMPFLAGS="-L emacs"
+
+src_compile() {
+	default
+
+	use emacs && elisp-compile emacs/*.el
+}
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r vim/*/
+	# some users may find it useful
+	newdoc vim/README README.vim
+	dodoc vim/vimrc
+
+	if use emacs ; then
+		elisp-install llvm emacs/*.{el,elc}
+		elisp-make-site-file "${SITEFILE}" llvm
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/llvm-core/llvm-common/llvm-common-20.0.0_pre20250118.ebuild b/llvm-core/llvm-common/llvm-common-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..2e0edb2d0ea7
--- /dev/null
+++ b/llvm-core/llvm-common/llvm-common-20.0.0_pre20250118.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="emacs"
+
+RDEPEND="
+	!llvm-core/llvm:0
+"
+BDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+
+LLVM_COMPONENTS=( llvm/utils )
+llvm.org_set_globals
+
+SITEFILE="50llvm-gentoo.el"
+BYTECOMPFLAGS="-L emacs"
+
+src_compile() {
+	default
+
+	use emacs && elisp-compile emacs/*.el
+}
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r vim/*/
+	# some users may find it useful
+	newdoc vim/README README.vim
+	dodoc vim/vimrc
+
+	if use emacs ; then
+		elisp-install llvm emacs/*.{el,elc}
+		elisp-make-site-file "${SITEFILE}" llvm
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/llvm-core/llvm/Manifest b/llvm-core/llvm/Manifest
index ce7cd6a08c19..0b2e8b45a78a 100644
--- a/llvm-core/llvm/Manifest
+++ b/llvm-core/llvm/Manifest
@@ -19,4 +19,7 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607 SHA512 d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
+DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/llvm-core/llvm/llvm-19.1.7.ebuild b/llvm-core/llvm/llvm-19.1.7.ebuild
new file mode 100644
index 000000000000..12a58605c798
--- /dev/null
+++ b/llvm-core/llvm/llvm-19.1.7.ebuild
@@ -0,0 +1,548 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
+IUSE="
+	+binutils-plugin debug debuginfod doc exegesis libedit +libffi
+	test xml z3 zstd
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	debuginfod? (
+		net-misc/curl:=
+		dev-cpp/cpp-httplib:=
+	)
+	exegesis? ( dev-libs/libpfm:= )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	binutils-plugin? ( sys-libs/binutils-libs )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		<llvm-runtimes/libcxx-${LLVM_VERSION}.9999
+	)
+	libffi? ( virtual/pkgconfig )
+"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="
+	${RDEPEND}
+	!llvm-core/llvm:0
+"
+PDEPEND="
+	llvm-core/llvm-common
+	llvm-core/llvm-toolchain-symlinks:${LLVM_MAJOR}
+	binutils-plugin? ( >=llvm-core/llvmgold-${LLVM_MAJOR} )
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_MANPAGES=1
+LLVM_USE_TARGETS=provide
+llvm.org_set_globals
+
+[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
+BDEPEND+="
+	$(python_gen_any_dep '
+		dev-python/myst-parser[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	')
+"
+[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
+
+python_check_deps() {
+	llvm_are_manpages_built || return 0
+
+	python_has_version -b "dev-python/myst-parser[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_uptodate() {
+	local prod_targets=(
+		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+			| tail -n +2 | head -n -1)
+	)
+	local all_targets=(
+		lib/Target/*/
+	)
+	all_targets=( "${all_targets[@]#lib/Target/}" )
+	all_targets=( "${all_targets[@]%/}" )
+
+	local exp_targets=() i
+	for i in "${all_targets[@]}"; do
+		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+	done
+
+	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+		eqawarn "Expected: ${exp_targets[*]}"
+		eqawarn
+	fi
+
+	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
+		eqawarn "Expected: ${prod_targets[*]}"
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMTableGen)
+						;;
+					# used by lldb
+					LLVMDebuginfod)
+						;;
+					# testing libraries
+					LLVMTestingAnnotations|LLVMTestingSupport)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(${NINJA} -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# Verify that the ebuild is up-to-date
+	check_uptodate
+
+	llvm.org_src_prepare
+
+	if has_version ">=sys-libs/glibc-2.40"; then
+		# https://github.com/llvm/llvm-project/issues/100791
+		rm -r test/tools/llvm-exegesis/X86/latency || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+
+		# testing libraries
+		llvm_gtest
+		llvm_gtest_main
+		LLVMTestingAnnotations
+		LLVMTestingSupport
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# library used by lldb
+			LLVMDebuginfod
+
+			# utilities
+			llvm-tblgen
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+			UnicodeNameMappingGenerator
+
+			# tools
+			bugpoint
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-bitcode-strip
+			llvm-c-test
+			llvm-cat
+			llvm-cfi-verify
+			llvm-config
+			llvm-cov
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-debuginfo-analyzer
+			llvm-debuginfod-find
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwarfutil
+			llvm-dwp
+			llvm-exegesis
+			llvm-extract
+			llvm-gsymutil
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-jitlink-executor
+			llvm-lib
+			llvm-libtool-darwin
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-ml
+			llvm-modextract
+			llvm-mt
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-opt-report
+			llvm-otool
+			llvm-pdbutil
+			llvm-profdata
+			llvm-profgen
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-readtapi
+			llvm-reduce
+			llvm-remarkutil
+			llvm-rtdyld
+			llvm-sim
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-tli-checker
+			llvm-undname
+			llvm-windres
+			llvm-xray
+			obj2yaml
+			opt
+			reduce-chunk-list
+			sancov
+			sanstats
+			split-file
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-dsymutil-man
+				docs-llvm-dwarfdump-man
+				docs-llvm-man
+			)
+		fi
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use binutils-plugin && out+=(
+			LLVMgold
+		)
+		use debuginfod && out+=(
+			llvm-debuginfod
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	if use ppc && tc-is-gcc && [[ $(gcc-major-version) -lt 14 ]]; then
+		# Workaround for bug #880677
+		append-flags $(test-flags-CXX -fno-ipa-sra -fno-ipa-modref -fno-ipa-icf)
+	fi
+
+	# ODR violations (bug #917536, bug #926529). Just do it for GCC for now
+	# to avoid people grumbling. GCC is, anecdotally, more likely to miscompile
+	# LLVM with LTO anyway (which is not necessarily its fault).
+	tc-is-gcc && filter-lto
+
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_INCLUDE_BENCHMARKS=OFF
+		-DLLVM_INCLUDE_TESTS=ON
+		-DLLVM_BUILD_TESTS=$(usex test)
+		-DLLVM_INSTALL_GTEST=ON
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+		-DLLVM_ENABLE_ZLIB=FORCE_ON
+		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
+		-DLLVM_ENABLE_CURL=$(usex debuginfod)
+		-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm)
+		-DOCAMLFIND=NO
+	)
+
+	local suffix=
+	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
+		# the ABI of the main branch is not stable, so let's include
+		# the commit id in the SOVERSION to contain the breakage
+		suffix+="git${EGIT_VERSION::8}"
+	fi
+	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		suffix+="+libcxx"
+		mycmakeargs+=(
+			-DLLVM_ENABLE_LIBCXX=ON
+		)
+	fi
+	mycmakeargs+=(
+		-DLLVM_VERSION_SUFFIX="${suffix}"
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=${build_docs}
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=${build_docs}
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use binutils-plugin && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	use kernel_Darwin && mycmakeargs+=(
+		# Use our libtool instead of looking it up with xcrun
+		-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+	)
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
+			CMakeCache.txt ||
+		die "Incorrect version, did you update _LLVM_MAIN_MAJOR?"
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	tc-env_build cmake_build distribution
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${LLVM_MAJOR} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+	llvm_install_manpages
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
+	elog "To use these scripts, you will need Python along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/llvm-core/llvm/llvm-20.0.0_pre20241227.ebuild b/llvm-core/llvm/llvm-20.0.0_pre20241227.ebuild
deleted file mode 100644
index 63bcc0f4ae25..000000000000
--- a/llvm-core/llvm/llvm-20.0.0_pre20241227.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} )
-
-inherit cmake flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. xxhash: BSD.
-# 3. MD5 code: public-domain.
-# 4. ConvertUTF.h: TODO.
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-IUSE="
-	+binutils-plugin +debug debuginfod doc exegesis libedit +libffi
-	test xml z3 zstd
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	debuginfod? (
-		net-misc/curl:=
-		dev-cpp/cpp-httplib:=
-	)
-	exegesis? ( dev-libs/libpfm:= )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	binutils-plugin? ( sys-libs/binutils-libs )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<llvm-runtimes/libcxx-${LLVM_VERSION}.9999
-	)
-	libffi? ( virtual/pkgconfig )
-"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="
-	${RDEPEND}
-	!llvm-core/llvm:0
-"
-PDEPEND="
-	llvm-core/llvm-common
-	llvm-core/llvm-toolchain-symlinks:${LLVM_MAJOR}
-	binutils-plugin? ( >=llvm-core/llvmgold-${LLVM_MAJOR} )
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_MANPAGES=1
-LLVM_USE_TARGETS=provide
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-	$(python_gen_any_dep '
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-python_check_deps() {
-	llvm_are_manpages_built || return 0
-
-	python_has_version -b "dev-python/myst-parser[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-check_uptodate() {
-	local prod_targets=(
-		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
-			| tail -n +2 | head -n -1)
-	)
-	local all_targets=(
-		lib/Target/*/
-	)
-	all_targets=( "${all_targets[@]#lib/Target/}" )
-	all_targets=( "${all_targets[@]%/}" )
-
-	local exp_targets=() i
-	for i in "${all_targets[@]}"; do
-		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
-	done
-
-	local outdated
-	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
-		eerror "ALL_LLVM_EXPERIMENTAL_TARGETS are outdated!"
-		eerror "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
-		eerror "Expected: ${exp_targets[*]}"
-		eerror
-		outdated=1
-	fi
-
-	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
-		eerror "ALL_LLVM_PRODUCTION_TARGETS are outdated!"
-		eerror "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
-		eerror "Expected: ${prod_targets[*]}"
-		outdated=1
-	fi
-
-	[[ ${outdated} ]] && die "Update ALL_LLVM*_TARGETS"
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# shared libs
-					LLVM|LLVMgold)
-						;;
-					# TableGen lib + deps
-					LLVMDemangle|LLVMSupport|LLVMTableGen)
-						;;
-					# for mlir-tblgen
-					LLVMCodeGenTypes)
-						;;
-					# used by lldb
-					LLVMDebuginfod)
-						;;
-					# testing libraries
-					LLVMTestingAnnotations|LLVMTestingSupport)
-						;;
-					# static libs
-					LLVM*)
-						continue
-						;;
-					# meta-targets
-					distribution|llvm-libraries)
-						continue
-						;;
-					# used only w/ USE=doc
-					docs-llvm-html)
-						use doc || continue
-						;;
-					# used only w/ USE=debuginfd
-					llvm-debuginfod)
-						use debuginfod || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eerror "get_distribution_components() is outdated!"
-			eerror "   Add: ${add[*]}"
-			eerror "Remove: ${remove[*]}"
-			die "Update get_distribution_components()!"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-src_prepare() {
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# Update config.guess to support more systems
-	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
-
-	# Verify that the ebuild is up-to-date
-	check_uptodate
-
-	llvm.org_src_prepare
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# shared libs
-		LLVM
-		LTO
-		Remarks
-
-		# tools
-		llvm-config
-
-		# common stuff
-		cmake-exports
-		llvm-headers
-
-		# libraries needed for clang-tblgen
-		LLVMDemangle
-		LLVMSupport
-		LLVMTableGen
-		# mlir-tblgen
-		LLVMCodeGenTypes
-
-		# testing libraries
-		llvm_gtest
-		llvm_gtest_main
-		LLVMTestingAnnotations
-		LLVMTestingSupport
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# library used by lldb
-			LLVMDebuginfod
-
-			# utilities
-			llvm-tblgen
-			FileCheck
-			llvm-PerfectShuffle
-			count
-			not
-			yaml-bench
-			UnicodeNameMappingGenerator
-
-			# tools
-			bugpoint
-			dsymutil
-			llc
-			lli
-			lli-child-target
-			llvm-addr2line
-			llvm-ar
-			llvm-as
-			llvm-bcanalyzer
-			llvm-bitcode-strip
-			llvm-c-test
-			llvm-cat
-			llvm-cfi-verify
-			llvm-cgdata
-			llvm-config
-			llvm-cov
-			llvm-ctxprof-util
-			llvm-cvtres
-			llvm-cxxdump
-			llvm-cxxfilt
-			llvm-cxxmap
-			llvm-debuginfo-analyzer
-			llvm-debuginfod-find
-			llvm-diff
-			llvm-dis
-			llvm-dlltool
-			llvm-dwarfdump
-			llvm-dwarfutil
-			llvm-dwp
-			llvm-exegesis
-			llvm-extract
-			llvm-gsymutil
-			llvm-ifs
-			llvm-install-name-tool
-			llvm-jitlink
-			llvm-jitlink-executor
-			llvm-lib
-			llvm-libtool-darwin
-			llvm-link
-			llvm-lipo
-			llvm-lto
-			llvm-lto2
-			llvm-mc
-			llvm-mca
-			llvm-ml
-			llvm-modextract
-			llvm-mt
-			llvm-nm
-			llvm-objcopy
-			llvm-objdump
-			llvm-opt-report
-			llvm-otool
-			llvm-pdbutil
-			llvm-profdata
-			llvm-profgen
-			llvm-ranlib
-			llvm-rc
-			llvm-readelf
-			llvm-readobj
-			llvm-readtapi
-			llvm-reduce
-			llvm-remarkutil
-			llvm-rtdyld
-			llvm-sim
-			llvm-size
-			llvm-split
-			llvm-stress
-			llvm-strings
-			llvm-strip
-			llvm-symbolizer
-			llvm-tli-checker
-			llvm-undname
-			llvm-windres
-			llvm-xray
-			obj2yaml
-			opt
-			reduce-chunk-list
-			sancov
-			sanstats
-			split-file
-			verify-uselistorder
-			yaml2obj
-
-			# python modules
-			opt-viewer
-		)
-
-		if llvm_are_manpages_built; then
-			out+=(
-				# manpages
-				docs-dsymutil-man
-				docs-llvm-dwarfdump-man
-				docs-llvm-man
-			)
-		fi
-		use doc && out+=(
-			docs-llvm-html
-		)
-
-		use binutils-plugin && out+=(
-			LLVMgold
-		)
-		use debuginfod && out+=(
-			llvm-debuginfod
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	if use ppc && tc-is-gcc && [[ $(gcc-major-version) -lt 14 ]]; then
-		# Workaround for bug #880677
-		append-flags $(test-flags-CXX -fno-ipa-sra -fno-ipa-modref -fno-ipa-icf)
-	fi
-
-	# ODR violations (bug #917536, bug #926529). Just do it for GCC for now
-	# to avoid people grumbling. GCC is, anecdotally, more likely to miscompile
-	# LLVM with LTO anyway (which is not necessarily its fault).
-	tc-is-gcc && filter-lto
-
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_INCLUDE_BENCHMARKS=OFF
-		-DLLVM_INCLUDE_TESTS=ON
-		-DLLVM_BUILD_TESTS=$(usex test)
-		-DLLVM_INSTALL_GTEST=ON
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
-		-DLLVM_ENABLE_ZLIB=FORCE_ON
-		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-		-DLLVM_ENABLE_CURL=$(usex debuginfod)
-		-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable OCaml bindings (now in dev-ml/llvm)
-		-DOCAMLFIND=NO
-	)
-
-	local suffix=
-	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
-		# the ABI of the main branch is not stable, so let's include
-		# the commit id in the SOVERSION to contain the breakage
-		suffix+="git${EGIT_VERSION::8}"
-	fi
-	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
-		# Smart hack: alter version suffix -> SOVERSION when linking
-		# against libc++. This way we won't end up mixing LLVM libc++
-		# libraries with libstdc++ clang, and the other way around.
-		suffix+="+libcxx"
-		mycmakeargs+=(
-			-DLLVM_ENABLE_LIBCXX=ON
-		)
-	fi
-	mycmakeargs+=(
-		-DLLVM_VERSION_SUFFIX="${suffix}"
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-		fi
-
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=${build_docs}
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=${build_docs}
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use binutils-plugin && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	use kernel_Darwin && mycmakeargs+=(
-		# Use our libtool instead of looking it up with xcrun
-		-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-	)
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
-			CMakeCache.txt ||
-		die "Incorrect version, did you update _LLVM_MAIN_MAJOR?"
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	tc-env_build cmake_build distribution
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${LLVM_MAJOR} ))
-	newenvd - "60llvm-${revord}" <<-_EOF_
-		PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-	_EOF_
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-}
-
-pkg_postinst() {
-	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
-	elog "To use these scripts, you will need Python along with the following"
-	elog "packages:"
-	elog "  dev-python/pygments (for opt-viewer)"
-	elog "  dev-python/pyyaml (for all of them)"
-}
diff --git a/llvm-core/llvm/llvm-20.0.0_pre20250111.ebuild b/llvm-core/llvm/llvm-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..6db3abfbcc5f
--- /dev/null
+++ b/llvm-core/llvm/llvm-20.0.0_pre20250111.ebuild
@@ -0,0 +1,559 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+IUSE="
+	+binutils-plugin +debug debuginfod doc exegesis libedit +libffi
+	test xml z3 zstd
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	debuginfod? (
+		net-misc/curl:=
+		dev-cpp/cpp-httplib:=
+	)
+	exegesis? ( dev-libs/libpfm:= )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	binutils-plugin? ( sys-libs/binutils-libs )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		<llvm-runtimes/libcxx-${LLVM_VERSION}.9999
+	)
+	libffi? ( virtual/pkgconfig )
+"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="
+	${RDEPEND}
+	!llvm-core/llvm:0
+"
+PDEPEND="
+	llvm-core/llvm-common
+	llvm-core/llvm-toolchain-symlinks:${LLVM_MAJOR}
+	binutils-plugin? ( >=llvm-core/llvmgold-${LLVM_MAJOR} )
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_MANPAGES=1
+LLVM_USE_TARGETS=provide
+llvm.org_set_globals
+
+[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
+BDEPEND+="
+	$(python_gen_any_dep '
+		dev-python/myst-parser[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	')
+"
+[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
+
+python_check_deps() {
+	llvm_are_manpages_built || return 0
+
+	python_has_version -b "dev-python/myst-parser[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_uptodate() {
+	local prod_targets=(
+		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+			| tail -n +2 | head -n -1)
+	)
+	local all_targets=(
+		lib/Target/*/
+	)
+	all_targets=( "${all_targets[@]#lib/Target/}" )
+	all_targets=( "${all_targets[@]%/}" )
+
+	local exp_targets=() i
+	for i in "${all_targets[@]}"; do
+		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+	done
+
+	local outdated
+	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+		eerror "ALL_LLVM_EXPERIMENTAL_TARGETS are outdated!"
+		eerror "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+		eerror "Expected: ${exp_targets[*]}"
+		eerror
+		outdated=1
+	fi
+
+	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
+		eerror "ALL_LLVM_PRODUCTION_TARGETS are outdated!"
+		eerror "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
+		eerror "Expected: ${prod_targets[*]}"
+		outdated=1
+	fi
+
+	[[ ${outdated} ]] && die "Update ALL_LLVM*_TARGETS"
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMTableGen)
+						;;
+					# for mlir-tblgen
+					LLVMCodeGenTypes)
+						;;
+					# used by lldb
+					LLVMDebuginfod)
+						;;
+					# testing libraries
+					LLVMTestingAnnotations|LLVMTestingSupport)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						use doc || continue
+						;;
+					# used only w/ USE=debuginfd
+					llvm-debuginfod)
+						use debuginfod || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(${NINJA} -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eerror "get_distribution_components() is outdated!"
+			eerror "   Add: ${add[*]}"
+			eerror "Remove: ${remove[*]}"
+			die "Update get_distribution_components()!"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# Verify that the ebuild is up-to-date
+	check_uptodate
+
+	llvm.org_src_prepare
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+		# mlir-tblgen
+		LLVMCodeGenTypes
+
+		# testing libraries
+		llvm_gtest
+		llvm_gtest_main
+		LLVMTestingAnnotations
+		LLVMTestingSupport
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# library used by lldb
+			LLVMDebuginfod
+
+			# utilities
+			llvm-tblgen
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+			UnicodeNameMappingGenerator
+
+			# tools
+			bugpoint
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-bitcode-strip
+			llvm-c-test
+			llvm-cat
+			llvm-cfi-verify
+			llvm-cgdata
+			llvm-config
+			llvm-cov
+			llvm-ctxprof-util
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-debuginfo-analyzer
+			llvm-debuginfod-find
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwarfutil
+			llvm-dwp
+			llvm-exegesis
+			llvm-extract
+			llvm-gsymutil
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-jitlink-executor
+			llvm-lib
+			llvm-libtool-darwin
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-ml
+			llvm-modextract
+			llvm-mt
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-opt-report
+			llvm-otool
+			llvm-pdbutil
+			llvm-profdata
+			llvm-profgen
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-readtapi
+			llvm-reduce
+			llvm-remarkutil
+			llvm-rtdyld
+			llvm-sim
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-tli-checker
+			llvm-undname
+			llvm-windres
+			llvm-xray
+			obj2yaml
+			opt
+			reduce-chunk-list
+			sancov
+			sanstats
+			split-file
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-dsymutil-man
+				docs-llvm-dwarfdump-man
+				docs-llvm-man
+			)
+		fi
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use binutils-plugin && out+=(
+			LLVMgold
+		)
+		use debuginfod && out+=(
+			llvm-debuginfod
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	if use ppc && tc-is-gcc && [[ $(gcc-major-version) -lt 14 ]]; then
+		# Workaround for bug #880677
+		append-flags $(test-flags-CXX -fno-ipa-sra -fno-ipa-modref -fno-ipa-icf)
+	fi
+
+	# ODR violations (bug #917536, bug #926529). Just do it for GCC for now
+	# to avoid people grumbling. GCC is, anecdotally, more likely to miscompile
+	# LLVM with LTO anyway (which is not necessarily its fault).
+	tc-is-gcc && filter-lto
+
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_INCLUDE_BENCHMARKS=OFF
+		-DLLVM_INCLUDE_TESTS=ON
+		-DLLVM_BUILD_TESTS=$(usex test)
+		-DLLVM_INSTALL_GTEST=ON
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+		-DLLVM_ENABLE_ZLIB=FORCE_ON
+		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
+		-DLLVM_ENABLE_CURL=$(usex debuginfod)
+		-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm)
+		-DOCAMLFIND=NO
+	)
+
+	local suffix=
+	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
+		# the ABI of the main branch is not stable, so let's include
+		# the commit id in the SOVERSION to contain the breakage
+		suffix+="git${EGIT_VERSION::8}"
+	fi
+	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		suffix+="+libcxx"
+		mycmakeargs+=(
+			-DLLVM_ENABLE_LIBCXX=ON
+		)
+	fi
+	mycmakeargs+=(
+		-DLLVM_VERSION_SUFFIX="${suffix}"
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=${build_docs}
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=${build_docs}
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use binutils-plugin && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	use kernel_Darwin && mycmakeargs+=(
+		# Use our libtool instead of looking it up with xcrun
+		-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+	)
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
+			CMakeCache.txt ||
+		die "Incorrect version, did you update _LLVM_MAIN_MAJOR?"
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	tc-env_build cmake_build distribution
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${LLVM_MAJOR} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+	llvm_install_manpages
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
+	elog "To use these scripts, you will need Python along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/llvm-core/llvm/llvm-20.0.0_pre20250118.ebuild b/llvm-core/llvm/llvm-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..6db3abfbcc5f
--- /dev/null
+++ b/llvm-core/llvm/llvm-20.0.0_pre20250118.ebuild
@@ -0,0 +1,559 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+IUSE="
+	+binutils-plugin +debug debuginfod doc exegesis libedit +libffi
+	test xml z3 zstd
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	debuginfod? (
+		net-misc/curl:=
+		dev-cpp/cpp-httplib:=
+	)
+	exegesis? ( dev-libs/libpfm:= )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	binutils-plugin? ( sys-libs/binutils-libs )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		<llvm-runtimes/libcxx-${LLVM_VERSION}.9999
+	)
+	libffi? ( virtual/pkgconfig )
+"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="
+	${RDEPEND}
+	!llvm-core/llvm:0
+"
+PDEPEND="
+	llvm-core/llvm-common
+	llvm-core/llvm-toolchain-symlinks:${LLVM_MAJOR}
+	binutils-plugin? ( >=llvm-core/llvmgold-${LLVM_MAJOR} )
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_MANPAGES=1
+LLVM_USE_TARGETS=provide
+llvm.org_set_globals
+
+[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
+BDEPEND+="
+	$(python_gen_any_dep '
+		dev-python/myst-parser[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	')
+"
+[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
+
+python_check_deps() {
+	llvm_are_manpages_built || return 0
+
+	python_has_version -b "dev-python/myst-parser[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_uptodate() {
+	local prod_targets=(
+		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+			| tail -n +2 | head -n -1)
+	)
+	local all_targets=(
+		lib/Target/*/
+	)
+	all_targets=( "${all_targets[@]#lib/Target/}" )
+	all_targets=( "${all_targets[@]%/}" )
+
+	local exp_targets=() i
+	for i in "${all_targets[@]}"; do
+		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+	done
+
+	local outdated
+	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+		eerror "ALL_LLVM_EXPERIMENTAL_TARGETS are outdated!"
+		eerror "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+		eerror "Expected: ${exp_targets[*]}"
+		eerror
+		outdated=1
+	fi
+
+	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
+		eerror "ALL_LLVM_PRODUCTION_TARGETS are outdated!"
+		eerror "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
+		eerror "Expected: ${prod_targets[*]}"
+		outdated=1
+	fi
+
+	[[ ${outdated} ]] && die "Update ALL_LLVM*_TARGETS"
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMTableGen)
+						;;
+					# for mlir-tblgen
+					LLVMCodeGenTypes)
+						;;
+					# used by lldb
+					LLVMDebuginfod)
+						;;
+					# testing libraries
+					LLVMTestingAnnotations|LLVMTestingSupport)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						use doc || continue
+						;;
+					# used only w/ USE=debuginfd
+					llvm-debuginfod)
+						use debuginfod || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(${NINJA} -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eerror "get_distribution_components() is outdated!"
+			eerror "   Add: ${add[*]}"
+			eerror "Remove: ${remove[*]}"
+			die "Update get_distribution_components()!"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# Verify that the ebuild is up-to-date
+	check_uptodate
+
+	llvm.org_src_prepare
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+		# mlir-tblgen
+		LLVMCodeGenTypes
+
+		# testing libraries
+		llvm_gtest
+		llvm_gtest_main
+		LLVMTestingAnnotations
+		LLVMTestingSupport
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# library used by lldb
+			LLVMDebuginfod
+
+			# utilities
+			llvm-tblgen
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+			UnicodeNameMappingGenerator
+
+			# tools
+			bugpoint
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-bitcode-strip
+			llvm-c-test
+			llvm-cat
+			llvm-cfi-verify
+			llvm-cgdata
+			llvm-config
+			llvm-cov
+			llvm-ctxprof-util
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-debuginfo-analyzer
+			llvm-debuginfod-find
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwarfutil
+			llvm-dwp
+			llvm-exegesis
+			llvm-extract
+			llvm-gsymutil
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-jitlink-executor
+			llvm-lib
+			llvm-libtool-darwin
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-ml
+			llvm-modextract
+			llvm-mt
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-opt-report
+			llvm-otool
+			llvm-pdbutil
+			llvm-profdata
+			llvm-profgen
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-readtapi
+			llvm-reduce
+			llvm-remarkutil
+			llvm-rtdyld
+			llvm-sim
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-tli-checker
+			llvm-undname
+			llvm-windres
+			llvm-xray
+			obj2yaml
+			opt
+			reduce-chunk-list
+			sancov
+			sanstats
+			split-file
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-dsymutil-man
+				docs-llvm-dwarfdump-man
+				docs-llvm-man
+			)
+		fi
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use binutils-plugin && out+=(
+			LLVMgold
+		)
+		use debuginfod && out+=(
+			llvm-debuginfod
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	if use ppc && tc-is-gcc && [[ $(gcc-major-version) -lt 14 ]]; then
+		# Workaround for bug #880677
+		append-flags $(test-flags-CXX -fno-ipa-sra -fno-ipa-modref -fno-ipa-icf)
+	fi
+
+	# ODR violations (bug #917536, bug #926529). Just do it for GCC for now
+	# to avoid people grumbling. GCC is, anecdotally, more likely to miscompile
+	# LLVM with LTO anyway (which is not necessarily its fault).
+	tc-is-gcc && filter-lto
+
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_INCLUDE_BENCHMARKS=OFF
+		-DLLVM_INCLUDE_TESTS=ON
+		-DLLVM_BUILD_TESTS=$(usex test)
+		-DLLVM_INSTALL_GTEST=ON
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+		-DLLVM_ENABLE_ZLIB=FORCE_ON
+		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
+		-DLLVM_ENABLE_CURL=$(usex debuginfod)
+		-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm)
+		-DOCAMLFIND=NO
+	)
+
+	local suffix=
+	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
+		# the ABI of the main branch is not stable, so let's include
+		# the commit id in the SOVERSION to contain the breakage
+		suffix+="git${EGIT_VERSION::8}"
+	fi
+	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		suffix+="+libcxx"
+		mycmakeargs+=(
+			-DLLVM_ENABLE_LIBCXX=ON
+		)
+	fi
+	mycmakeargs+=(
+		-DLLVM_VERSION_SUFFIX="${suffix}"
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=${build_docs}
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=${build_docs}
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use binutils-plugin && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	use kernel_Darwin && mycmakeargs+=(
+		# Use our libtool instead of looking it up with xcrun
+		-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+	)
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
+			CMakeCache.txt ||
+		die "Incorrect version, did you update _LLVM_MAIN_MAJOR?"
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	tc-env_build cmake_build distribution
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${LLVM_MAJOR} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+	llvm_install_manpages
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
+	elog "To use these scripts, you will need Python along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/llvm-core/mlir/Manifest b/llvm-core/mlir/Manifest
index ecf47aa51ed2..ffe2cec3c25c 100644
--- a/llvm-core/mlir/Manifest
+++ b/llvm-core/mlir/Manifest
@@ -1 +1,2 @@
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/llvm-core/mlir/mlir-20.0.0_pre20241227.ebuild b/llvm-core/mlir/mlir-20.0.0_pre20241227.ebuild
deleted file mode 100644
index 605b641fd141..000000000000
--- a/llvm-core/mlir/mlir-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,196 +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} )
-inherit cmake llvm.org multilib-minimal python-any-r1
-
-DESCRIPTION="Multi-Level Intermediate Representation (library only)"
-HOMEPAGE="https://mlir.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-IUSE="+debug test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~llvm-core/llvm-${PV}[debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	llvm-core/llvm:${LLVM_MAJOR}
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( mlir cmake )
-# tablegen tests use *.td files there
-LLVM_TEST_COMPONENTS=( llvm/include )
-llvm.org_set_globals
-
-python_check_deps() {
-	if use test; then
-		python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	llvm.org_src_prepare
-
-	# https://github.com/llvm/llvm-project/issues/120902
-	sed -i -e '/LINK_LIBS/s:PUBLIC:PRIVATE:' \
-		lib/ExecutionEngine/CMakeLists.txt || die
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# meta-targets
-					mlir-libraries|distribution)
-						continue
-						;;
-					# dylib
-					MLIR)
-						;;
-					# static libraries
-					MLIR*)
-						continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		mlir-cmake-exports
-		mlir-headers
-
-		# the dylib
-		MLIR
-
-		# shared libraries
-		mlir_arm_runner_utils
-		mlir_arm_sme_abi_stubs
-		mlir_async_runtime
-		mlir_c_runner_utils
-		mlir_float16_utils
-		mlir_runner_utils
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# tools
-			mlir-cpu-runner
-			mlir-linalg-ods-yaml-gen
-			mlir-lsp-server
-			mlir-opt
-			mlir-pdll
-			mlir-pdll-lsp-server
-			mlir-query
-			mlir-reduce
-			mlir-rewrite
-			mlir-tblgen
-			mlir-translate
-			tblgen-lsp-server
-			tblgen-to-irdl
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		# this controls building libMLIR.so
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DMLIR_BUILD_MLIR_C_DYLIB=OFF
-		-DMLIR_LINK_MLIR_DYLIB=ON
-		-DMLIR_INCLUDE_TESTS=$(usex test)
-		-DMLIR_INCLUDE_INTEGRATION_TESTS=OFF
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-		# this enables installing mlir-tblgen and mlir-pdll
-		-DLLVM_BUILD_UTILS=ON
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		-DLLVM_BUILD_TOOLS=ON
-		# TODO
-		-DMLIR_ENABLE_CUDA_RUNNER=0
-		-DMLIR_ENABLE_ROCM_RUNNER=0
-		-DMLIR_ENABLE_SYCL_RUNNER=0
-		-DMLIR_ENABLE_SPIRV_CPU_RUNNER=0
-		-DMLIR_ENABLE_VULKAN_RUNNER=0
-		-DMLIR_ENABLE_BINDINGS_PYTHON=0
-		-DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	cmake_build distribution
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-mlir
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-}
diff --git a/llvm-core/mlir/mlir-20.0.0_pre20250111.ebuild b/llvm-core/mlir/mlir-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..b073548f9607
--- /dev/null
+++ b/llvm-core/mlir/mlir-20.0.0_pre20250111.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake llvm.org multilib-minimal python-any-r1
+
+DESCRIPTION="Multi-Level Intermediate Representation (library only)"
+HOMEPAGE="https://mlir.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+IUSE="+debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~llvm-core/llvm-${PV}[debug=,${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	llvm-core/llvm:${LLVM_MAJOR}
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( mlir cmake )
+# tablegen tests use *.td files there
+LLVM_TEST_COMPONENTS=( llvm/include )
+llvm.org_set_globals
+
+python_check_deps() {
+	if use test; then
+		python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	llvm.org_src_prepare
+
+	# https://github.com/llvm/llvm-project/issues/120902
+	sed -i -e '/LINK_LIBS/s:PUBLIC:PRIVATE:' \
+		lib/ExecutionEngine/CMakeLists.txt || die
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					mlir-libraries|distribution)
+						continue
+						;;
+					# dylib
+					MLIR)
+						;;
+					# static libraries
+					MLIR*)
+						continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(${NINJA} -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		mlir-cmake-exports
+		mlir-headers
+
+		# the dylib
+		MLIR
+
+		# shared libraries
+		mlir_arm_runner_utils
+		mlir_arm_sme_abi_stubs
+		mlir_async_runtime
+		mlir_c_runner_utils
+		mlir_float16_utils
+		mlir_runner_utils
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# tools
+			mlir-cpu-runner
+			mlir-linalg-ods-yaml-gen
+			mlir-lsp-server
+			mlir-opt
+			mlir-pdll
+			mlir-pdll-lsp-server
+			mlir-query
+			mlir-reduce
+			mlir-rewrite
+			mlir-tblgen
+			mlir-translate
+			tblgen-lsp-server
+			tblgen-to-irdl
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		# this controls building libMLIR.so
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DMLIR_BUILD_MLIR_C_DYLIB=OFF
+		-DMLIR_LINK_MLIR_DYLIB=ON
+		-DMLIR_INCLUDE_TESTS=$(usex test)
+		-DMLIR_INCLUDE_INTEGRATION_TESTS=OFF
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+		# this enables installing mlir-tblgen and mlir-pdll
+		-DLLVM_BUILD_UTILS=ON
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		-DLLVM_BUILD_TOOLS=ON
+		# TODO
+		-DMLIR_ENABLE_CUDA_RUNNER=0
+		-DMLIR_ENABLE_ROCM_RUNNER=0
+		-DMLIR_ENABLE_SYCL_RUNNER=0
+		-DMLIR_ENABLE_SPIRV_CPU_RUNNER=0
+		-DMLIR_ENABLE_VULKAN_RUNNER=0
+		-DMLIR_ENABLE_BINDINGS_PYTHON=0
+		-DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-mlir
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+}
diff --git a/llvm-core/mlir/mlir-20.0.0_pre20250118.ebuild b/llvm-core/mlir/mlir-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..b073548f9607
--- /dev/null
+++ b/llvm-core/mlir/mlir-20.0.0_pre20250118.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake llvm.org multilib-minimal python-any-r1
+
+DESCRIPTION="Multi-Level Intermediate Representation (library only)"
+HOMEPAGE="https://mlir.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+IUSE="+debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~llvm-core/llvm-${PV}[debug=,${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	llvm-core/llvm:${LLVM_MAJOR}
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( mlir cmake )
+# tablegen tests use *.td files there
+LLVM_TEST_COMPONENTS=( llvm/include )
+llvm.org_set_globals
+
+python_check_deps() {
+	if use test; then
+		python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	llvm.org_src_prepare
+
+	# https://github.com/llvm/llvm-project/issues/120902
+	sed -i -e '/LINK_LIBS/s:PUBLIC:PRIVATE:' \
+		lib/ExecutionEngine/CMakeLists.txt || die
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					mlir-libraries|distribution)
+						continue
+						;;
+					# dylib
+					MLIR)
+						;;
+					# static libraries
+					MLIR*)
+						continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(${NINJA} -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		mlir-cmake-exports
+		mlir-headers
+
+		# the dylib
+		MLIR
+
+		# shared libraries
+		mlir_arm_runner_utils
+		mlir_arm_sme_abi_stubs
+		mlir_async_runtime
+		mlir_c_runner_utils
+		mlir_float16_utils
+		mlir_runner_utils
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# tools
+			mlir-cpu-runner
+			mlir-linalg-ods-yaml-gen
+			mlir-lsp-server
+			mlir-opt
+			mlir-pdll
+			mlir-pdll-lsp-server
+			mlir-query
+			mlir-reduce
+			mlir-rewrite
+			mlir-tblgen
+			mlir-translate
+			tblgen-lsp-server
+			tblgen-to-irdl
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		# this controls building libMLIR.so
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DMLIR_BUILD_MLIR_C_DYLIB=OFF
+		-DMLIR_LINK_MLIR_DYLIB=ON
+		-DMLIR_INCLUDE_TESTS=$(usex test)
+		-DMLIR_INCLUDE_INTEGRATION_TESTS=OFF
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+		# this enables installing mlir-tblgen and mlir-pdll
+		-DLLVM_BUILD_UTILS=ON
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		-DLLVM_BUILD_TOOLS=ON
+		# TODO
+		-DMLIR_ENABLE_CUDA_RUNNER=0
+		-DMLIR_ENABLE_ROCM_RUNNER=0
+		-DMLIR_ENABLE_SYCL_RUNNER=0
+		-DMLIR_ENABLE_SPIRV_CPU_RUNNER=0
+		-DMLIR_ENABLE_VULKAN_RUNNER=0
+		-DMLIR_ENABLE_BINDINGS_PYTHON=0
+		-DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-mlir
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+}
diff --git a/llvm-core/polly/Manifest b/llvm-core/polly/Manifest
index ecf47aa51ed2..ffe2cec3c25c 100644
--- a/llvm-core/polly/Manifest
+++ b/llvm-core/polly/Manifest
@@ -1 +1,2 @@
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/llvm-core/polly/polly-20.0.0_pre20241227.ebuild b/llvm-core/polly/polly-20.0.0_pre20241227.ebuild
deleted file mode 100644
index 17940c9de942..000000000000
--- a/llvm-core/polly/polly-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,59 +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} )
-
-inherit cmake llvm.org python-any-r1
-
-DESCRIPTION="Polyhedral optimizations for LLVM"
-HOMEPAGE="https://polly.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-# vendored isl (fork?)
-LICENSE+=" MIT"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-IUSE="+debug test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~llvm-core/llvm-${PV}:${LLVM_MAJOR}=[debug=]
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( polly cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-polly
-}
diff --git a/llvm-core/polly/polly-20.0.0_pre20250111.ebuild b/llvm-core/polly/polly-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..4762b65ad43d
--- /dev/null
+++ b/llvm-core/polly/polly-20.0.0_pre20250111.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake llvm.org python-any-r1
+
+DESCRIPTION="Polyhedral optimizations for LLVM"
+HOMEPAGE="https://polly.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+# vendored isl (fork?)
+LICENSE+=" MIT"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+IUSE="+debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~llvm-core/llvm-${PV}:${LLVM_MAJOR}=[debug=]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( polly cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-polly
+}
diff --git a/llvm-core/polly/polly-20.0.0_pre20250118.ebuild b/llvm-core/polly/polly-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..4762b65ad43d
--- /dev/null
+++ b/llvm-core/polly/polly-20.0.0_pre20250118.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake llvm.org python-any-r1
+
+DESCRIPTION="Polyhedral optimizations for LLVM"
+HOMEPAGE="https://polly.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+# vendored isl (fork?)
+LICENSE+=" MIT"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+IUSE="+debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~llvm-core/llvm-${PV}:${LLVM_MAJOR}=[debug=]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( polly cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-polly
+}
diff --git a/llvm-runtimes/compiler-rt-sanitizers/Manifest b/llvm-runtimes/compiler-rt-sanitizers/Manifest
index 2109bd8d5961..cea7f2698228 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/Manifest
+++ b/llvm-runtimes/compiler-rt-sanitizers/Manifest
@@ -14,4 +14,7 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607 SHA512 d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
+DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.7.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.7.ebuild
new file mode 100644
index 000000000000..72d94672974d
--- /dev/null
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.7.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
+# base targets
+IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
+# sanitizer targets, keep in sync with config-ix.cmake
+# NB: ubsan, scudo deliberately match two entries
+SANITIZER_FLAGS=(
+	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
+	shadowcallstack gwp-asan
+)
+IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
+REQUIRED_USE="
+	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
+	test? (
+		cfi? ( ubsan )
+		gwp-asan? ( scudo )
+	)
+"
+RESTRICT="
+	!clang? ( test )
+	!test? ( test )
+"
+
+DEPEND="
+	llvm-core/llvm:${LLVM_MAJOR}
+	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
+"
+BDEPEND="
+	clang? (
+		llvm-core/clang:${LLVM_MAJOR}
+		llvm-runtimes/compiler-rt:${LLVM_MAJOR}
+	)
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+LLVM_TEST_COMPONENTS=(
+	llvm/include/llvm/ProfileData llvm/lib/Testing/Support third-party
+)
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	local flag
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if ! use "${flag}"; then
+			local cmake_flag=${flag/-/_}
+			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
+				cmake/config-ix.cmake || die
+		fi
+	done
+
+	# TODO: fix these tests to be skipped upstream
+	if use asan && ! use profile; then
+		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
+	fi
+	if use ubsan && ! use cfi; then
+		> test/cfi/CMakeLists.txt || die
+	fi
+	# hangs, sigh
+	rm test/tsan/getline_nohang.cpp || die
+
+	llvm.org_src_prepare
+}
+
+src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local flag want_sanitizer=OFF
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if use "${flag}"; then
+			want_sanitizer=ON
+			break
+		fi
+	done
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# builtins & crt installed by llvm-runtimes/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		-DCOMPILER_RT_BUILD_CTX_PROFILE=$(usex ctx-profile)
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use amd64; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=$(usex abi_x86_32)
+			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX
+			# This disables i386 for SDK >= 10.15
+			# Will error if has_use tsan and SDK < 10.12
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
+
+	cmake_build check-all
+}
diff --git a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20241227.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20241227.ebuild
deleted file mode 100644
index cea1ae243486..000000000000
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,222 +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} )
-inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
-# base targets
-IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-	shadowcallstack gwp-asan nsan rtsan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-	test? (
-		cfi? ( ubsan )
-		gwp-asan? ( scudo )
-	)
-"
-RESTRICT="
-	!clang? ( test )
-	!test? ( test )
-"
-
-DEPEND="
-	llvm-core/llvm:${LLVM_MAJOR}
-	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-	clang? (
-		llvm-core/clang:${LLVM_MAJOR}
-		llvm-runtimes/compiler-rt:${LLVM_MAJOR}
-	)
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=(
-	llvm/include/llvm/ProfileData llvm/lib/Testing/Support third-party
-)
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-	if use test; then
-		local CHECKREQS_DISK_BUILD=11G
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-	local flag
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if ! use "${flag}"; then
-			local cmake_flag=${flag/-/_}
-			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-				cmake/config-ix.cmake || die
-		fi
-	done
-
-	# TODO: fix these tests to be skipped upstream
-	if use asan && ! use profile; then
-		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-	fi
-	if use ubsan && ! use cfi; then
-		> test/cfi/CMakeLists.txt || die
-	fi
-	# hangs, sigh
-	rm test/tsan/getline_nohang.cpp || die
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	local flag want_sanitizer=OFF
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if use "${flag}"; then
-			want_sanitizer=ON
-			break
-		fi
-	done
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# builtins & crt installed by llvm-runtimes/compiler-rt
-		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_CRT=OFF
-		-DCOMPILER_RT_BUILD_CTX_PROFILE=$(usex ctx-profile)
-		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
-		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			# they are created during src_test()
-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-
-		# same flags are passed for build & tests, so we need to strip
-		# them down to a subset supported by clang
-		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-		strip-unsupported-flags
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX
-			# This disables i386 for SDK >= 10.15
-			# Will error if has_use tsan and SDK < 10.12
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	cmake_src_configure
-
-	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
-		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
-
-		# copy clang over since resource_dir is located relatively to binary
-		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
-		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
-		# we also need LLVMgold.so for gold-based tests
-		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-		fi
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	# disable sandbox to have it stop clobbering LD_PRELOAD
-	local -x SANDBOX_ON=0
-	# wipe LD_PRELOAD to make ASAN happy
-	local -x LD_PRELOAD=
-
-	cmake_build check-all
-}
diff --git a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20250111.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..5efa81abbe9b
--- /dev/null
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20250111.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
+# base targets
+IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
+# sanitizer targets, keep in sync with config-ix.cmake
+# NB: ubsan, scudo deliberately match two entries
+SANITIZER_FLAGS=(
+	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
+	shadowcallstack gwp-asan nsan rtsan
+)
+IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
+REQUIRED_USE="
+	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
+	test? (
+		cfi? ( ubsan )
+		gwp-asan? ( scudo )
+	)
+"
+RESTRICT="
+	!clang? ( test )
+	!test? ( test )
+"
+
+DEPEND="
+	llvm-core/llvm:${LLVM_MAJOR}
+	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
+"
+BDEPEND="
+	clang? (
+		llvm-core/clang:${LLVM_MAJOR}
+		llvm-runtimes/compiler-rt:${LLVM_MAJOR}
+	)
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+LLVM_TEST_COMPONENTS=(
+	llvm/include/llvm/ProfileData llvm/lib/Testing/Support third-party
+)
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	local flag
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if ! use "${flag}"; then
+			local cmake_flag=${flag/-/_}
+			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
+				cmake/config-ix.cmake || die
+		fi
+	done
+
+	# TODO: fix these tests to be skipped upstream
+	if use asan && ! use profile; then
+		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
+	fi
+	if use ubsan && ! use cfi; then
+		> test/cfi/CMakeLists.txt || die
+	fi
+	# hangs, sigh
+	rm test/tsan/getline_nohang.cpp || die
+
+	llvm.org_src_prepare
+}
+
+src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local flag want_sanitizer=OFF
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if use "${flag}"; then
+			want_sanitizer=ON
+			break
+		fi
+	done
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# builtins & crt installed by llvm-runtimes/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		-DCOMPILER_RT_BUILD_CTX_PROFILE=$(usex ctx-profile)
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use amd64; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=$(usex abi_x86_32)
+			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX
+			# This disables i386 for SDK >= 10.15
+			# Will error if has_use tsan and SDK < 10.12
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
+
+	cmake_build check-all
+}
diff --git a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20250118.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..5efa81abbe9b
--- /dev/null
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20250118.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
+# base targets
+IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
+# sanitizer targets, keep in sync with config-ix.cmake
+# NB: ubsan, scudo deliberately match two entries
+SANITIZER_FLAGS=(
+	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
+	shadowcallstack gwp-asan nsan rtsan
+)
+IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
+REQUIRED_USE="
+	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
+	test? (
+		cfi? ( ubsan )
+		gwp-asan? ( scudo )
+	)
+"
+RESTRICT="
+	!clang? ( test )
+	!test? ( test )
+"
+
+DEPEND="
+	llvm-core/llvm:${LLVM_MAJOR}
+	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
+"
+BDEPEND="
+	clang? (
+		llvm-core/clang:${LLVM_MAJOR}
+		llvm-runtimes/compiler-rt:${LLVM_MAJOR}
+	)
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+LLVM_TEST_COMPONENTS=(
+	llvm/include/llvm/ProfileData llvm/lib/Testing/Support third-party
+)
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	local flag
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if ! use "${flag}"; then
+			local cmake_flag=${flag/-/_}
+			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
+				cmake/config-ix.cmake || die
+		fi
+	done
+
+	# TODO: fix these tests to be skipped upstream
+	if use asan && ! use profile; then
+		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
+	fi
+	if use ubsan && ! use cfi; then
+		> test/cfi/CMakeLists.txt || die
+	fi
+	# hangs, sigh
+	rm test/tsan/getline_nohang.cpp || die
+
+	llvm.org_src_prepare
+}
+
+src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local flag want_sanitizer=OFF
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if use "${flag}"; then
+			want_sanitizer=ON
+			break
+		fi
+	done
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# builtins & crt installed by llvm-runtimes/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		-DCOMPILER_RT_BUILD_CTX_PROFILE=$(usex ctx-profile)
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use amd64; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=$(usex abi_x86_32)
+			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX
+			# This disables i386 for SDK >= 10.15
+			# Will error if has_use tsan and SDK < 10.12
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
+
+	cmake_build check-all
+}
diff --git a/llvm-runtimes/compiler-rt/Manifest b/llvm-runtimes/compiler-rt/Manifest
index 79e31fec9ddb..77f09647c744 100644
--- a/llvm-runtimes/compiler-rt/Manifest
+++ b/llvm-runtimes/compiler-rt/Manifest
@@ -13,4 +13,7 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607 SHA512 d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
+DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/llvm-runtimes/compiler-rt/compiler-rt-19.1.7.ebuild b/llvm-runtimes/compiler-rt/compiler-rt-19.1.7.ebuild
new file mode 100644
index 000000000000..c097d0a39f93
--- /dev/null
+++ b/llvm-runtimes/compiler-rt/compiler-rt-19.1.7.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
+IUSE="+abi_x86_32 abi_x86_64 +atomic-builtins +clang debug test"
+REQUIRED_USE="atomic-builtins? ( clang )"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+DEPEND="
+	llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? ( llvm-core/clang:${LLVM_MAJOR} )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+LLVM_TEST_COMPONENTS=( llvm/include/llvm/TargetParser )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	if target_is_not_host || tc-is-cross-compiler ; then
+		# strips vars like CFLAGS="-march=x86_64-v3" for non-x86 architectures
+		CHOST=${CTARGET} strip-unsupported-flags
+		# overrides host docs otherwise
+		DOCS=()
+	fi
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	target_is_not_host && return
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	if use clang && ! is_crosspkg; then
+		# Only do this conditionally to allow overriding with
+		# e.g. CC=clang-13 in case of breakage
+		if ! tc-is-clang ; then
+			local -x CC=${CHOST}-clang
+			local -x CXX=${CHOST}-clang++
+		fi
+
+		strip-unsupported-flags
+	fi
+
+	if ! is_crosspkg && ! test_compiler ; then
+		local nolib_flags=( -nodefaultlibs -lc )
+
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
+			# Avoiding -nostartfiles earlier on for bug #862540,
+			# and set available entry symbol for bug #862798.
+			nolib_flags+=( -nostartfiles -e main )
+
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+
+		-DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=$(usex !atomic-builtins)
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_MEMPROF=OFF
+		-DCOMPILER_RT_BUILD_ORC=OFF
+		-DCOMPILER_RT_BUILD_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use amd64 && ! target_is_not_host; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=$(usex abi_x86_32)
+			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
+		)
+	fi
+
+	if is_crosspkg; then
+		# Needed to target built libc headers
+		export CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
+		mycmakeargs+=(
+			# Without this, the compiler will compile a test program
+			# and fail due to no builtins.
+			-DCMAKE_C_COMPILER_WORKS=1
+			-DCMAKE_CXX_COMPILER_WORKS=1
+
+			# Without this, compiler-rt install location is not unique
+			# to target triples, only to architecture.
+			# Needed if you want to target multiple libcs for one arch.
+			-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
+
+			-DCMAKE_ASM_COMPILER_TARGET="${CTARGET}"
+			-DCMAKE_C_COMPILER_TARGET="${CTARGET}"
+			-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
+		)
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX.
+			# This disables i386 for SDK >= 10.15
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-builtins
+}
diff --git a/llvm-runtimes/compiler-rt/compiler-rt-20.0.0_pre20241227.ebuild b/llvm-runtimes/compiler-rt/compiler-rt-20.0.0_pre20241227.ebuild
deleted file mode 100644
index 7971b744756d..000000000000
--- a/llvm-runtimes/compiler-rt/compiler-rt-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,175 +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} )
-inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-IUSE="+abi_x86_32 abi_x86_64 +atomic-builtins +clang +debug test"
-REQUIRED_USE="atomic-builtins? ( clang )"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-DEPEND="
-	llvm-core/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? ( llvm-core/clang:${LLVM_MAJOR} )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=( llvm/include/llvm/TargetParser )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	if target_is_not_host || tc-is-cross-compiler ; then
-		# strips vars like CFLAGS="-march=x86_64-v3" for non-x86 architectures
-		CHOST=${CTARGET} strip-unsupported-flags
-		# overrides host docs otherwise
-		DOCS=()
-	fi
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	target_is_not_host && return
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	if use clang && ! is_crosspkg; then
-		# Only do this conditionally to allow overriding with
-		# e.g. CC=clang-13 in case of breakage
-		if ! tc-is-clang ; then
-			local -x CC=${CHOST}-clang
-			local -x CXX=${CHOST}-clang++
-		fi
-
-		strip-unsupported-flags
-	fi
-
-	if ! is_crosspkg && ! test_compiler ; then
-		local nolib_flags=( -nodefaultlibs -lc )
-
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
-			# Avoiding -nostartfiles earlier on for bug #862540,
-			# and set available entry symbol for bug #862798.
-			nolib_flags+=( -nostartfiles -e main )
-
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=$(usex !atomic-builtins)
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF
-		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
-		-DCOMPILER_RT_BUILD_MEMPROF=OFF
-		-DCOMPILER_RT_BUILD_ORC=OFF
-		-DCOMPILER_RT_BUILD_PROFILE=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
-		-DCOMPILER_RT_BUILD_XRAY=OFF
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64 && ! target_is_not_host; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if is_crosspkg; then
-		# Needed to target built libc headers
-		export CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
-		mycmakeargs+=(
-			# Without this, the compiler will compile a test program
-			# and fail due to no builtins.
-			-DCMAKE_C_COMPILER_WORKS=1
-			-DCMAKE_CXX_COMPILER_WORKS=1
-
-			# Without this, compiler-rt install location is not unique
-			# to target triples, only to architecture.
-			# Needed if you want to target multiple libcs for one arch.
-			-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
-
-			-DCMAKE_ASM_COMPILER_TARGET="${CTARGET}"
-			-DCMAKE_C_COMPILER_TARGET="${CTARGET}"
-			-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
-		)
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX.
-			# This disables i386 for SDK >= 10.15
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-builtins
-}
diff --git a/llvm-runtimes/compiler-rt/compiler-rt-20.0.0_pre20250111.ebuild b/llvm-runtimes/compiler-rt/compiler-rt-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..c3b2eb0428cd
--- /dev/null
+++ b/llvm-runtimes/compiler-rt/compiler-rt-20.0.0_pre20250111.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+IUSE="+abi_x86_32 abi_x86_64 +atomic-builtins +clang +debug test"
+REQUIRED_USE="atomic-builtins? ( clang )"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+DEPEND="
+	llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? ( llvm-core/clang:${LLVM_MAJOR} )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+LLVM_TEST_COMPONENTS=( llvm/include/llvm/TargetParser )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	if target_is_not_host || tc-is-cross-compiler ; then
+		# strips vars like CFLAGS="-march=x86_64-v3" for non-x86 architectures
+		CHOST=${CTARGET} strip-unsupported-flags
+		# overrides host docs otherwise
+		DOCS=()
+	fi
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	target_is_not_host && return
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	if use clang && ! is_crosspkg; then
+		# Only do this conditionally to allow overriding with
+		# e.g. CC=clang-13 in case of breakage
+		if ! tc-is-clang ; then
+			local -x CC=${CHOST}-clang
+			local -x CXX=${CHOST}-clang++
+		fi
+
+		strip-unsupported-flags
+	fi
+
+	if ! is_crosspkg && ! test_compiler ; then
+		local nolib_flags=( -nodefaultlibs -lc )
+
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
+			# Avoiding -nostartfiles earlier on for bug #862540,
+			# and set available entry symbol for bug #862798.
+			nolib_flags+=( -nostartfiles -e main )
+
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+
+		-DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=$(usex !atomic-builtins)
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_MEMPROF=OFF
+		-DCOMPILER_RT_BUILD_ORC=OFF
+		-DCOMPILER_RT_BUILD_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use amd64 && ! target_is_not_host; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=$(usex abi_x86_32)
+			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
+		)
+	fi
+
+	if is_crosspkg; then
+		# Needed to target built libc headers
+		export CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
+		mycmakeargs+=(
+			# Without this, the compiler will compile a test program
+			# and fail due to no builtins.
+			-DCMAKE_C_COMPILER_WORKS=1
+			-DCMAKE_CXX_COMPILER_WORKS=1
+
+			# Without this, compiler-rt install location is not unique
+			# to target triples, only to architecture.
+			# Needed if you want to target multiple libcs for one arch.
+			-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
+
+			-DCMAKE_ASM_COMPILER_TARGET="${CTARGET}"
+			-DCMAKE_C_COMPILER_TARGET="${CTARGET}"
+			-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
+		)
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX.
+			# This disables i386 for SDK >= 10.15
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-builtins
+}
diff --git a/llvm-runtimes/compiler-rt/compiler-rt-20.0.0_pre20250118.ebuild b/llvm-runtimes/compiler-rt/compiler-rt-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..c3b2eb0428cd
--- /dev/null
+++ b/llvm-runtimes/compiler-rt/compiler-rt-20.0.0_pre20250118.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+IUSE="+abi_x86_32 abi_x86_64 +atomic-builtins +clang +debug test"
+REQUIRED_USE="atomic-builtins? ( clang )"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+DEPEND="
+	llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? ( llvm-core/clang:${LLVM_MAJOR} )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+LLVM_TEST_COMPONENTS=( llvm/include/llvm/TargetParser )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	if target_is_not_host || tc-is-cross-compiler ; then
+		# strips vars like CFLAGS="-march=x86_64-v3" for non-x86 architectures
+		CHOST=${CTARGET} strip-unsupported-flags
+		# overrides host docs otherwise
+		DOCS=()
+	fi
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	target_is_not_host && return
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	if use clang && ! is_crosspkg; then
+		# Only do this conditionally to allow overriding with
+		# e.g. CC=clang-13 in case of breakage
+		if ! tc-is-clang ; then
+			local -x CC=${CHOST}-clang
+			local -x CXX=${CHOST}-clang++
+		fi
+
+		strip-unsupported-flags
+	fi
+
+	if ! is_crosspkg && ! test_compiler ; then
+		local nolib_flags=( -nodefaultlibs -lc )
+
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
+			# Avoiding -nostartfiles earlier on for bug #862540,
+			# and set available entry symbol for bug #862798.
+			nolib_flags+=( -nostartfiles -e main )
+
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+
+		-DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=$(usex !atomic-builtins)
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_MEMPROF=OFF
+		-DCOMPILER_RT_BUILD_ORC=OFF
+		-DCOMPILER_RT_BUILD_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use amd64 && ! target_is_not_host; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=$(usex abi_x86_32)
+			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
+		)
+	fi
+
+	if is_crosspkg; then
+		# Needed to target built libc headers
+		export CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
+		mycmakeargs+=(
+			# Without this, the compiler will compile a test program
+			# and fail due to no builtins.
+			-DCMAKE_C_COMPILER_WORKS=1
+			-DCMAKE_CXX_COMPILER_WORKS=1
+
+			# Without this, compiler-rt install location is not unique
+			# to target triples, only to architecture.
+			# Needed if you want to target multiple libcs for one arch.
+			-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
+
+			-DCMAKE_ASM_COMPILER_TARGET="${CTARGET}"
+			-DCMAKE_C_COMPILER_TARGET="${CTARGET}"
+			-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
+		)
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX.
+			# This disables i386 for SDK >= 10.15
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-builtins
+}
diff --git a/llvm-runtimes/libcxx/Manifest b/llvm-runtimes/libcxx/Manifest
index dd54a1c528ce..9a9e7f49f4a9 100644
--- a/llvm-runtimes/libcxx/Manifest
+++ b/llvm-runtimes/libcxx/Manifest
@@ -12,4 +12,7 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607 SHA512 d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
+DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/llvm-runtimes/libcxx/libcxx-19.1.7.ebuild b/llvm-runtimes/libcxx/libcxx-19.1.7.ebuild
new file mode 100644
index 000000000000..df65ed5f9912
--- /dev/null
+++ b/llvm-runtimes/libcxx/libcxx-19.1.7.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
+IUSE="+clang +libcxxabi +static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libcxxabi? (
+		~llvm-runtimes/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+	)
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+"
+DEPEND="
+	${RDEPEND}
+	llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		llvm-core/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		dev-debug/gdb[python]
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+}
+
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=system-libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES=libcxx
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DLIBCXX_INSTALL_MODULES=ON
+		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
+		# this is broken with standalone builds, and also meaningless
+		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		gen_shared_ldscript
+		use static-libs && gen_static_ldscript
+	fi
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxx
+}
+
+multilib_src_install() {
+	cmake_src_install
+	# since we've replaced libc++.{a,so} with ldscripts, now we have to
+	# install the extra symlinks
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		dolib.so lib/libc++_shared.so
+		use static-libs && dolib.a lib/libc++_static.a
+	fi
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	# Move it first.
+	mv lib/libc++{,_static}.a || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps=(
+		libc++_static.a
+		$(usex libcxxabi libc++abi.a libsupc++.a)
+	)
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=( libpthread.a libdl.a )
+
+	gen_ldscript "${deps[*]}" > lib/libc++.a || die
+}
+
+gen_shared_ldscript() {
+	# Move it first.
+	mv lib/libc++{,_shared}.so || die
+	local deps=(
+		libc++_shared.so
+		# libsupc++ doesn't have a shared version
+		$(usex libcxxabi libc++abi.so libsupc++.a)
+	)
+
+	gen_ldscript "${deps[*]}" > lib/libc++.so || die
+}
diff --git a/llvm-runtimes/libcxx/libcxx-20.0.0_pre20241227.ebuild b/llvm-runtimes/libcxx/libcxx-20.0.0_pre20241227.ebuild
deleted file mode 100644
index 9c07b6d01774..000000000000
--- a/llvm-runtimes/libcxx/libcxx-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,208 +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} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="https://libcxx.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-IUSE="+clang +libcxxabi +static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libcxxabi? (
-		~llvm-runtimes/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
-	)
-	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-"
-DEPEND="
-	${RDEPEND}
-	llvm-core/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		llvm-core/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		dev-debug/gdb[python]
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=(
-	runtimes libcxx{,abi} libc llvm/{cmake,utils/llvm-lit} cmake
-)
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-
-	if ! use libcxxabi && ! tc-is-gcc ; then
-		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
-		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
-		eerror "and try again."
-		die
-	fi
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# note: we need to do this before multilib kicks in since it will
-	# alter the CHOST
-	local cxxabi cxxabi_incs
-	if use libcxxabi; then
-		cxxabi=system-libcxxabi
-		cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
-	else
-		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
-		cxxabi=libsupc++
-		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	# bootstrap: cmake is unhappy if compiler can't link to stdlib
-	local nolib_flags=( -nodefaultlibs -lc )
-	if ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES=libcxx
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXX_CXX_ABI=${cxxabi}
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
-		# we're using our own mechanism for generating linker scripts
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=$(usex test)
-		-DLIBCXX_INSTALL_MODULES=ON
-		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
-		# this is broken with standalone builds, and also meaningless
-		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		gen_shared_ldscript
-		use static-libs && gen_static_ldscript
-	fi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build install-cxx-test-suite-prefix
-	cp "${BUILD_DIR}"/{lib,libcxx/test-suite-install/$(get_libdir)}/libc++_shared.so || die
-	if use static-libs; then
-		cp "${BUILD_DIR}"/{lib,libcxx/test-suite-install/$(get_libdir)}/libc++_static.a || die
-	fi
-	cmake_build check-cxx
-}
-
-multilib_src_install() {
-	cmake_src_install
-	# since we've replaced libc++.{a,so} with ldscripts, now we have to
-	# install the extra symlinks
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		dolib.so lib/libc++_shared.so
-		use static-libs && dolib.a lib/libc++_static.a
-	fi
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_static}.a || die
-	# Generate libc++.a ldscript for inclusion of its dependencies so that
-	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps=(
-		libc++_static.a
-		$(usex libcxxabi libc++abi.a libsupc++.a)
-	)
-	# On Linux/glibc it does not link without libpthread or libdl. It is
-	# fine on FreeBSD.
-	use elibc_glibc && deps+=( libpthread.a libdl.a )
-
-	gen_ldscript "${deps[*]}" > lib/libc++.a || die
-}
-
-gen_shared_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_shared}.so || die
-	local deps=(
-		libc++_shared.so
-		# libsupc++ doesn't have a shared version
-		$(usex libcxxabi libc++abi.so libsupc++.a)
-	)
-
-	gen_ldscript "${deps[*]}" > lib/libc++.so || die
-}
diff --git a/llvm-runtimes/libcxx/libcxx-20.0.0_pre20250111.ebuild b/llvm-runtimes/libcxx/libcxx-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..3bd46e20f1ca
--- /dev/null
+++ b/llvm-runtimes/libcxx/libcxx-20.0.0_pre20250111.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+IUSE="+clang +libcxxabi +static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libcxxabi? (
+		~llvm-runtimes/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+	)
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+"
+DEPEND="
+	${RDEPEND}
+	llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		llvm-core/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		dev-debug/gdb[python]
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=(
+	runtimes libcxx{,abi} libc llvm/{cmake,utils/llvm-lit} cmake
+)
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+}
+
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=system-libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES=libcxx
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DLIBCXX_INSTALL_MODULES=ON
+		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
+		# this is broken with standalone builds, and also meaningless
+		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		gen_shared_ldscript
+		use static-libs && gen_static_ldscript
+	fi
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build install-cxx-test-suite-prefix
+	cp "${BUILD_DIR}"/{lib,libcxx/test-suite-install/$(get_libdir)}/libc++_shared.so || die
+	if use static-libs; then
+		cp "${BUILD_DIR}"/{lib,libcxx/test-suite-install/$(get_libdir)}/libc++_static.a || die
+	fi
+	cmake_build check-cxx
+}
+
+multilib_src_install() {
+	cmake_src_install
+	# since we've replaced libc++.{a,so} with ldscripts, now we have to
+	# install the extra symlinks
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		dolib.so lib/libc++_shared.so
+		use static-libs && dolib.a lib/libc++_static.a
+	fi
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	# Move it first.
+	mv lib/libc++{,_static}.a || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps=(
+		libc++_static.a
+		$(usex libcxxabi libc++abi.a libsupc++.a)
+	)
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=( libpthread.a libdl.a )
+
+	gen_ldscript "${deps[*]}" > lib/libc++.a || die
+}
+
+gen_shared_ldscript() {
+	# Move it first.
+	mv lib/libc++{,_shared}.so || die
+	local deps=(
+		libc++_shared.so
+		# libsupc++ doesn't have a shared version
+		$(usex libcxxabi libc++abi.so libsupc++.a)
+	)
+
+	gen_ldscript "${deps[*]}" > lib/libc++.so || die
+}
diff --git a/llvm-runtimes/libcxx/libcxx-20.0.0_pre20250118.ebuild b/llvm-runtimes/libcxx/libcxx-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..3bd46e20f1ca
--- /dev/null
+++ b/llvm-runtimes/libcxx/libcxx-20.0.0_pre20250118.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+IUSE="+clang +libcxxabi +static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libcxxabi? (
+		~llvm-runtimes/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+	)
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+"
+DEPEND="
+	${RDEPEND}
+	llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		llvm-core/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		dev-debug/gdb[python]
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=(
+	runtimes libcxx{,abi} libc llvm/{cmake,utils/llvm-lit} cmake
+)
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+}
+
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=system-libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES=libcxx
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DLIBCXX_INSTALL_MODULES=ON
+		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
+		# this is broken with standalone builds, and also meaningless
+		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		gen_shared_ldscript
+		use static-libs && gen_static_ldscript
+	fi
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build install-cxx-test-suite-prefix
+	cp "${BUILD_DIR}"/{lib,libcxx/test-suite-install/$(get_libdir)}/libc++_shared.so || die
+	if use static-libs; then
+		cp "${BUILD_DIR}"/{lib,libcxx/test-suite-install/$(get_libdir)}/libc++_static.a || die
+	fi
+	cmake_build check-cxx
+}
+
+multilib_src_install() {
+	cmake_src_install
+	# since we've replaced libc++.{a,so} with ldscripts, now we have to
+	# install the extra symlinks
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		dolib.so lib/libc++_shared.so
+		use static-libs && dolib.a lib/libc++_static.a
+	fi
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	# Move it first.
+	mv lib/libc++{,_static}.a || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps=(
+		libc++_static.a
+		$(usex libcxxabi libc++abi.a libsupc++.a)
+	)
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=( libpthread.a libdl.a )
+
+	gen_ldscript "${deps[*]}" > lib/libc++.a || die
+}
+
+gen_shared_ldscript() {
+	# Move it first.
+	mv lib/libc++{,_shared}.so || die
+	local deps=(
+		libc++_shared.so
+		# libsupc++ doesn't have a shared version
+		$(usex libcxxabi libc++abi.so libsupc++.a)
+	)
+
+	gen_ldscript "${deps[*]}" > lib/libc++.so || die
+}
diff --git a/llvm-runtimes/libcxxabi/Manifest b/llvm-runtimes/libcxxabi/Manifest
index fef409fa0e6a..b7114fc7aeab 100644
--- a/llvm-runtimes/libcxxabi/Manifest
+++ b/llvm-runtimes/libcxxabi/Manifest
@@ -10,4 +10,7 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607 SHA512 d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
+DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/llvm-runtimes/libcxxabi/libcxxabi-19.1.7.ebuild b/llvm-runtimes/libcxxabi/libcxxabi-19.1.7.ebuild
new file mode 100644
index 000000000000..19f58c44f34c
--- /dev/null
+++ b/llvm-runtimes/libcxxabi/libcxxabi-19.1.7.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
+IUSE="+clang +static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
+RDEPEND+="
+	!<llvm-runtimes/libcxx-15
+"
+DEPEND="
+	${RDEPEND}
+	llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		llvm-core/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
+LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+multilib_src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
+
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+		# this is broken with standalone builds, and also meaningless
+		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
+
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_build cxxabi
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxxabi
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" cmake_build install-cxxabi
+}
diff --git a/llvm-runtimes/libcxxabi/libcxxabi-20.0.0_pre20241227.ebuild b/llvm-runtimes/libcxxabi/libcxxabi-20.0.0_pre20241227.ebuild
deleted file mode 100644
index d2226d289eb3..000000000000
--- a/llvm-runtimes/libcxxabi/libcxxabi-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-IUSE="+clang +static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
-RDEPEND+="
-	!<llvm-runtimes/libcxx-15
-"
-DEPEND="
-	${RDEPEND}
-	llvm-core/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		llvm-core/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( libc llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
-
-		# upstream is omitting standard search path for this
-		# probably because gcc & clang are bundling their own unwind.h
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-		# this is broken with standalone builds, and also meaningless
-		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
-
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_build cxxabi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxxabi
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" cmake_build install-cxxabi
-}
diff --git a/llvm-runtimes/libcxxabi/libcxxabi-20.0.0_pre20250111.ebuild b/llvm-runtimes/libcxxabi/libcxxabi-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..412d927e8b49
--- /dev/null
+++ b/llvm-runtimes/libcxxabi/libcxxabi-20.0.0_pre20250111.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+IUSE="+clang +static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
+RDEPEND+="
+	!<llvm-runtimes/libcxx-15
+"
+DEPEND="
+	${RDEPEND}
+	llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		llvm-core/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
+LLVM_TEST_COMPONENTS=( libc llvm/utils/llvm-lit )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+multilib_src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
+
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+		# this is broken with standalone builds, and also meaningless
+		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
+
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_build cxxabi
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxxabi
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" cmake_build install-cxxabi
+}
diff --git a/llvm-runtimes/libcxxabi/libcxxabi-20.0.0_pre20250118.ebuild b/llvm-runtimes/libcxxabi/libcxxabi-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..412d927e8b49
--- /dev/null
+++ b/llvm-runtimes/libcxxabi/libcxxabi-20.0.0_pre20250118.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+IUSE="+clang +static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
+RDEPEND+="
+	!<llvm-runtimes/libcxx-15
+"
+DEPEND="
+	${RDEPEND}
+	llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		llvm-core/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
+LLVM_TEST_COMPONENTS=( libc llvm/utils/llvm-lit )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+multilib_src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
+
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+		# this is broken with standalone builds, and also meaningless
+		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
+
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_build cxxabi
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxxabi
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" cmake_build install-cxxabi
+}
diff --git a/llvm-runtimes/libunwind/Manifest b/llvm-runtimes/libunwind/Manifest
index fef409fa0e6a..b7114fc7aeab 100644
--- a/llvm-runtimes/libunwind/Manifest
+++ b/llvm-runtimes/libunwind/Manifest
@@ -10,4 +10,7 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607 SHA512 d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
+DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/llvm-runtimes/libunwind/libunwind-19.1.7.ebuild b/llvm-runtimes/libunwind/libunwind-19.1.7.ebuild
new file mode 100644
index 000000000000..0cb4acdf755d
--- /dev/null
+++ b/llvm-runtimes/libunwind/libunwind-19.1.7.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
+IUSE="+clang debug static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!sys-libs/libunwind
+"
+DEPEND="
+	llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		llvm-core/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
+LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+multilib_src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	local libdir=$(get_libdir)
+
+	# https://github.com/llvm/llvm-project/issues/56825
+	# also separately bug #863917
+	filter-lto
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	# https://github.com/gentoo/gentoo/pull/21516
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	# Respect upstream build type assumptions (bug #910436) where they do:
+	# -DLIBUNWIND_ENABLE_ASSERTIONS=ON =>
+	#       -DCMAKE_BUILD_TYPE=DEBUG  => -UNDEBUG
+	#       -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG
+	# -DLIBUNWIND_ENABLE_ASSERTIONS=OFF =>
+	#       -UNDEBUG
+	# See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826.
+	use debug || append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES="libunwind"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
+		-DLIBUNWIND_INSTALL_HEADERS=ON
+
+		# support non-native unwinding; given it's small enough,
+		# enable it unconditionally
+		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
+
+		# avoid dependency on libgcc_s if compiler-rt is used
+		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
+
+			-DLIBCXXABI_LIBDIR_SUFFIX=
+			-DLIBCXXABI_ENABLE_SHARED=OFF
+			-DLIBCXXABI_ENABLE_STATIC=ON
+			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+			-DLIBCXXABI_INCLUDE_TESTS=OFF
+
+			-DLIBCXX_LIBDIR_SUFFIX=
+			-DLIBCXX_ENABLE_SHARED=OFF
+			-DLIBCXX_ENABLE_STATIC=ON
+			-DLIBCXX_CXX_ABI=libcxxabi
+			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+			-DLIBCXX_HAS_GCC_S_LIB=OFF
+			-DLIBCXX_INCLUDE_TESTS=OFF
+			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-unwind
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-unwind
+}
diff --git a/llvm-runtimes/libunwind/libunwind-20.0.0_pre20241227.ebuild b/llvm-runtimes/libunwind/libunwind-20.0.0_pre20241227.ebuild
deleted file mode 100644
index 6d8a5629bb47..000000000000
--- a/llvm-runtimes/libunwind/libunwind-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,128 +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} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit toolchain-funcs
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-IUSE="+clang +debug static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!sys-libs/libunwind
-"
-DEPEND="
-	llvm-core/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		llvm-core/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( libc libcxxabi llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local libdir=$(get_libdir)
-
-	# https://github.com/llvm/llvm-project/issues/56825
-	# also separately bug #863917
-	filter-lto
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	# https://github.com/gentoo/gentoo/pull/21516
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	# Respect upstream build type assumptions (bug #910436) where they do:
-	# -DLIBUNWIND_ENABLE_ASSERTIONS=ON =>
-	#       -DCMAKE_BUILD_TYPE=DEBUG  => -UNDEBUG
-	#       -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG
-	# -DLIBUNWIND_ENABLE_ASSERTIONS=OFF =>
-	#       -UNDEBUG
-	# See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826.
-	use debug || append-cppflags -DNDEBUG
-
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libunwind"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
-		-DLIBUNWIND_INSTALL_HEADERS=ON
-
-		# support non-native unwinding; given it's small enough,
-		# enable it unconditionally
-		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-
-		# avoid dependency on libgcc_s if compiler-rt is used
-		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-
-			-DLIBCXXABI_LIBDIR_SUFFIX=
-			-DLIBCXXABI_ENABLE_SHARED=OFF
-			-DLIBCXXABI_ENABLE_STATIC=ON
-			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-			-DLIBCXXABI_INCLUDE_TESTS=OFF
-
-			-DLIBCXX_LIBDIR_SUFFIX=
-			-DLIBCXX_ENABLE_SHARED=OFF
-			-DLIBCXX_ENABLE_STATIC=ON
-			-DLIBCXX_CXX_ABI=libcxxabi
-			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-			-DLIBCXX_HAS_GCC_S_LIB=OFF
-			-DLIBCXX_INCLUDE_TESTS=OFF
-			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-unwind
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-unwind
-}
diff --git a/llvm-runtimes/libunwind/libunwind-20.0.0_pre20250111.ebuild b/llvm-runtimes/libunwind/libunwind-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..4a6714b162db
--- /dev/null
+++ b/llvm-runtimes/libunwind/libunwind-20.0.0_pre20250111.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+IUSE="+clang +debug static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!sys-libs/libunwind
+"
+DEPEND="
+	llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		llvm-core/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
+LLVM_TEST_COMPONENTS=( libc libcxxabi llvm/utils/llvm-lit )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+multilib_src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	local libdir=$(get_libdir)
+
+	# https://github.com/llvm/llvm-project/issues/56825
+	# also separately bug #863917
+	filter-lto
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	# https://github.com/gentoo/gentoo/pull/21516
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	# Respect upstream build type assumptions (bug #910436) where they do:
+	# -DLIBUNWIND_ENABLE_ASSERTIONS=ON =>
+	#       -DCMAKE_BUILD_TYPE=DEBUG  => -UNDEBUG
+	#       -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG
+	# -DLIBUNWIND_ENABLE_ASSERTIONS=OFF =>
+	#       -UNDEBUG
+	# See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826.
+	use debug || append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES="libunwind"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
+		-DLIBUNWIND_INSTALL_HEADERS=ON
+
+		# support non-native unwinding; given it's small enough,
+		# enable it unconditionally
+		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
+
+		# avoid dependency on libgcc_s if compiler-rt is used
+		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
+
+			-DLIBCXXABI_LIBDIR_SUFFIX=
+			-DLIBCXXABI_ENABLE_SHARED=OFF
+			-DLIBCXXABI_ENABLE_STATIC=ON
+			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+			-DLIBCXXABI_INCLUDE_TESTS=OFF
+
+			-DLIBCXX_LIBDIR_SUFFIX=
+			-DLIBCXX_ENABLE_SHARED=OFF
+			-DLIBCXX_ENABLE_STATIC=ON
+			-DLIBCXX_CXX_ABI=libcxxabi
+			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+			-DLIBCXX_HAS_GCC_S_LIB=OFF
+			-DLIBCXX_INCLUDE_TESTS=OFF
+			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-unwind
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-unwind
+}
diff --git a/llvm-runtimes/libunwind/libunwind-20.0.0_pre20250118.ebuild b/llvm-runtimes/libunwind/libunwind-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..4a6714b162db
--- /dev/null
+++ b/llvm-runtimes/libunwind/libunwind-20.0.0_pre20250118.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+IUSE="+clang +debug static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!sys-libs/libunwind
+"
+DEPEND="
+	llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		llvm-core/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
+LLVM_TEST_COMPONENTS=( libc libcxxabi llvm/utils/llvm-lit )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+multilib_src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	local libdir=$(get_libdir)
+
+	# https://github.com/llvm/llvm-project/issues/56825
+	# also separately bug #863917
+	filter-lto
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	# https://github.com/gentoo/gentoo/pull/21516
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	# Respect upstream build type assumptions (bug #910436) where they do:
+	# -DLIBUNWIND_ENABLE_ASSERTIONS=ON =>
+	#       -DCMAKE_BUILD_TYPE=DEBUG  => -UNDEBUG
+	#       -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG
+	# -DLIBUNWIND_ENABLE_ASSERTIONS=OFF =>
+	#       -UNDEBUG
+	# See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826.
+	use debug || append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES="libunwind"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
+		-DLIBUNWIND_INSTALL_HEADERS=ON
+
+		# support non-native unwinding; given it's small enough,
+		# enable it unconditionally
+		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
+
+		# avoid dependency on libgcc_s if compiler-rt is used
+		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
+
+			-DLIBCXXABI_LIBDIR_SUFFIX=
+			-DLIBCXXABI_ENABLE_SHARED=OFF
+			-DLIBCXXABI_ENABLE_STATIC=ON
+			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+			-DLIBCXXABI_INCLUDE_TESTS=OFF
+
+			-DLIBCXX_LIBDIR_SUFFIX=
+			-DLIBCXX_ENABLE_SHARED=OFF
+			-DLIBCXX_ENABLE_STATIC=ON
+			-DLIBCXX_CXX_ABI=libcxxabi
+			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+			-DLIBCXX_HAS_GCC_S_LIB=OFF
+			-DLIBCXX_INCLUDE_TESTS=OFF
+			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-unwind
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-unwind
+}
diff --git a/llvm-runtimes/offload/Manifest b/llvm-runtimes/offload/Manifest
index 1cd538e0369f..822853615b95 100644
--- a/llvm-runtimes/offload/Manifest
+++ b/llvm-runtimes/offload/Manifest
@@ -1,3 +1,6 @@
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607 SHA512 d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
+DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/llvm-runtimes/offload/offload-19.1.7.ebuild b/llvm-runtimes/offload/offload-19.1.7.ebuild
new file mode 100644
index 000000000000..aeded58f646b
--- /dev/null
+++ b/llvm-runtimes/offload/offload-19.1.7.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="OpenMP offloading support"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="+debug ompt test llvm_targets_AMDGPU llvm_targets_NVPTX"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libffi:=
+	~llvm-core/llvm-${PV}
+	~llvm-runtimes/openmp-${PV}[ompt?]
+	llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= )
+"
+DEPEND="
+	${RDEPEND}
+"
+# tests:
+# - dev-python/lit provides the test runner
+# - llvm-core/llvm provide test utils (e.g. FileCheck)
+# - llvm-core/clang provides the compiler to run tests
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	llvm_targets_AMDGPU? ( llvm-core/clang )
+	llvm_targets_NVPTX? ( llvm-core/clang )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+		llvm-core/clang
+	)
+"
+# TODO: can it be fixed to compile with gcc?
+BDEPEND+="
+	llvm-core/clang
+"
+
+LLVM_COMPONENTS=( offload cmake runtimes/cmake )
+LLVM_TEST_COMPONENTS=( openmp/cmake )
+llvm.org_set_globals
+
+pkg_pretend() {
+	if [[ ${LLVM_ALLOW_GPU_TESTING} ]]; then
+		ewarn "LLVM_ALLOW_GPU_TESTING set.  This package will run tests against your"
+		ewarn "GPU if it is supported.  Note that these tests may be flaky, fail or"
+		ewarn "hang, or even cause your GPU to crash (requiring a reboot)."
+	fi
+}
+
+python_check_deps() {
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	if use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	# TODO
+	local -x CC=${CHOST}-clang
+	local -x CXX=${CHOST}-clang++
+	strip-unsupported-flags
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local libdir="$(get_libdir)"
+	local ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+	local ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	local plugins="host"
+	local gpus=
+	local build_devicertl=FALSE
+
+	if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
+		if use llvm_targets_AMDGPU; then
+			plugins+=";amdgpu"
+			build_devicertl=TRUE
+			gpus+=";gfx700;gfx701;gfx801;gfx803;gfx900;gfx902;gfx906"
+			gpus+=";gfx908;gfx90a;gfx90c;gfx940;gfx941;gfx942"
+			gpus+=";gfx1010;gfx1030;gfx1031;gfx1032;gfx1033"
+			gpus+=";gfx1034;gfx1035;gfx1036;gfx1100;gfx1101;gfx1102"
+			gpus+=";gfx1103;gfx1150;gfx1151;gfx1152"
+		fi
+		if use llvm_targets_NVPTX; then
+			plugins+=";cuda"
+			build_devicertl=TRUE
+			gpus+=";sm_35;sm_37;sm_50;sm_52;sm_53;sm_60;sm_61;sm_62"
+			gpus+=";sm_70;sm_72;sm_75;sm_80;sm_86;sm_87;sm_89;sm_90"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DOFFLOAD_LIBDIR_SUFFIX="${libdir#lib}"
+		-DLIBOMPTARGET_PLUGINS_TO_BUILD="${plugins}"
+		-DLIBOMPTARGET_OMPT_SUPPORT="$(usex ompt)"
+		-DLIBOMPTARGET_BUILD_DEVICERTL_BCLIB="${build_devicertl}"
+
+		# this breaks building static target libs
+		-DBUILD_SHARED_LIBS=OFF
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+	)
+
+	[[ ! ${LLVM_ALLOW_GPU_TESTING} ]] && mycmakeargs+=(
+		# prevent trying to access the GPU
+		-DLIBOMPTARGET_AMDGPU_ARCH=LIBOMPTARGET_AMDGPU_ARCH-NOTFOUND
+		-DLIBOMPTARGET_NVPTX_ARCH=LIBOMPTARGET_NVPTX_ARCH-NOTFOUND
+	)
+	[[ -n ${gpus} ]] && mycmakeargs+=(
+		-DLIBOMPTARGET_DEVICE_ARCHITECTURES="${gpus}"
+	)
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+		# requires flang
+		-DOPENMP_TEST_Fortran_COMPILER=
+	)
+
+	cmake_src_configure
+
+	if [[ -z ${gpus} ]]; then
+		# clang requires libomptarget.devicertl.a, but it can be empty
+		> "${BUILD_DIR}"/libomptarget.devicertl.a || die
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-offload
+}
+
+src_install() {
+	cmake_src_install
+
+	if [[ ! -f ${ED}/usr/$(get_libdir)/libomptarget.devicertl.a ]]
+	then
+		dolib.a "${BUILD_DIR}"/libomptarget.devicertl.a
+	fi
+}
diff --git a/llvm-runtimes/offload/offload-20.0.0_pre20241227.ebuild b/llvm-runtimes/offload/offload-20.0.0_pre20241227.ebuild
deleted file mode 100644
index e215172e31f1..000000000000
--- a/llvm-runtimes/offload/offload-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,155 +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} )
-inherit cmake flag-o-matic llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="OpenMP offloading support"
-HOMEPAGE="https://openmp.llvm.org"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0/${LLVM_SOABI}"
-IUSE="+debug ompt test llvm_targets_AMDGPU llvm_targets_NVPTX"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libffi:=
-	~llvm-core/llvm-${PV}
-	~llvm-runtimes/openmp-${PV}[ompt?]
-	llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= )
-"
-DEPEND="
-	${RDEPEND}
-"
-# tests:
-# - dev-python/lit provides the test runner
-# - llvm-core/llvm provide test utils (e.g. FileCheck)
-# - llvm-core/clang provides the compiler to run tests
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	llvm_targets_AMDGPU? ( llvm-core/clang )
-	llvm_targets_NVPTX? ( llvm-core/clang )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/lit[${PYTHON_USEDEP}]
-		')
-		llvm-core/clang
-	)
-"
-# TODO: can it be fixed to compile with gcc?
-BDEPEND+="
-	llvm-core/clang
-"
-
-LLVM_COMPONENTS=( offload cmake runtimes/cmake libc/shared )
-LLVM_TEST_COMPONENTS=( openmp/cmake )
-llvm.org_set_globals
-
-pkg_pretend() {
-	if [[ ${LLVM_ALLOW_GPU_TESTING} ]]; then
-		ewarn "LLVM_ALLOW_GPU_TESTING set.  This package will run tests against your"
-		ewarn "GPU if it is supported.  Note that these tests may be flaky, fail or"
-		ewarn "hang, or even cause your GPU to crash (requiring a reboot)."
-	fi
-}
-
-python_check_deps() {
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	if use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	# TODO
-	local -x CC=${CHOST}-clang
-	local -x CXX=${CHOST}-clang++
-	strip-unsupported-flags
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local libdir="$(get_libdir)"
-	local ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-	local ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	local plugins="host"
-	local gpus=
-	local build_devicertl=FALSE
-
-	if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
-		if use llvm_targets_AMDGPU; then
-			plugins+=";amdgpu"
-			build_devicertl=TRUE
-			gpus+="amdgpu"
-		fi
-		if use llvm_targets_NVPTX; then
-			plugins+=";cuda"
-			build_devicertl=TRUE
-			gpus+="nvptx"
-		fi
-		[[ ${gpus} == amdgpunvptx ]] && gpus=all
-	fi
-
-	local mycmakeargs=(
-		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
-
-		-DOFFLOAD_LIBDIR_SUFFIX="${libdir#lib}"
-		-DLIBOMPTARGET_PLUGINS_TO_BUILD="${plugins}"
-		-DLIBOMPTARGET_OMPT_SUPPORT="$(usex ompt)"
-		-DLIBOMPTARGET_BUILD_DEVICERTL_BCLIB="${build_devicertl}"
-
-		# this breaks building static target libs
-		-DBUILD_SHARED_LIBS=OFF
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-	)
-
-	[[ ! ${LLVM_ALLOW_GPU_TESTING} ]] && mycmakeargs+=(
-		# prevent trying to access the GPU
-		-DLIBOMPTARGET_AMDGPU_ARCH=LIBOMPTARGET_AMDGPU_ARCH-NOTFOUND
-		-DLIBOMPTARGET_NVPTX_ARCH=LIBOMPTARGET_NVPTX_ARCH-NOTFOUND
-	)
-	[[ -n ${gpus} ]] && mycmakeargs+=(
-		-DLIBOMPTARGET_DEVICE_ARCHITECTURES="${gpus}"
-	)
-	use test && mycmakeargs+=(
-		# this project does not use standard LLVM cmake macros
-		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
-
-		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
-		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
-		# requires flang
-		-DOPENMP_TEST_Fortran_COMPILER=
-	)
-
-	cmake_src_configure
-
-	if [[ -z ${gpus} ]]; then
-		# clang requires libomptarget.devicertl.a, but it can be empty
-		> "${BUILD_DIR}"/libomptarget.devicertl.a || die
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-offload
-}
-
-src_install() {
-	cmake_src_install
-
-	if [[ ! -f ${ED}/usr/$(get_libdir)/libomptarget.devicertl.a ]]
-	then
-		dolib.a "${BUILD_DIR}"/libomptarget.devicertl.a
-	fi
-}
diff --git a/llvm-runtimes/offload/offload-20.0.0_pre20250111.ebuild b/llvm-runtimes/offload/offload-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..c862c6448973
--- /dev/null
+++ b/llvm-runtimes/offload/offload-20.0.0_pre20250111.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="OpenMP offloading support"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0/${LLVM_SOABI}"
+IUSE="+debug ompt test llvm_targets_AMDGPU llvm_targets_NVPTX"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libffi:=
+	~llvm-core/llvm-${PV}
+	~llvm-runtimes/openmp-${PV}[ompt?]
+	llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= )
+"
+DEPEND="
+	${RDEPEND}
+"
+# tests:
+# - dev-python/lit provides the test runner
+# - llvm-core/llvm provide test utils (e.g. FileCheck)
+# - llvm-core/clang provides the compiler to run tests
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	llvm_targets_AMDGPU? ( llvm-core/clang )
+	llvm_targets_NVPTX? ( llvm-core/clang )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+		llvm-core/clang
+	)
+"
+# TODO: can it be fixed to compile with gcc?
+BDEPEND+="
+	llvm-core/clang
+"
+
+LLVM_COMPONENTS=( offload cmake runtimes/cmake libc/shared )
+LLVM_TEST_COMPONENTS=( openmp/cmake )
+llvm.org_set_globals
+
+pkg_pretend() {
+	if [[ ${LLVM_ALLOW_GPU_TESTING} ]]; then
+		ewarn "LLVM_ALLOW_GPU_TESTING set.  This package will run tests against your"
+		ewarn "GPU if it is supported.  Note that these tests may be flaky, fail or"
+		ewarn "hang, or even cause your GPU to crash (requiring a reboot)."
+	fi
+}
+
+python_check_deps() {
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	if use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	# TODO
+	local -x CC=${CHOST}-clang
+	local -x CXX=${CHOST}-clang++
+	strip-unsupported-flags
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local libdir="$(get_libdir)"
+	local ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+	local ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	local plugins="host"
+	local gpus=
+	local build_devicertl=FALSE
+
+	if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
+		if use llvm_targets_AMDGPU; then
+			plugins+=";amdgpu"
+			build_devicertl=TRUE
+			gpus+="amdgpu"
+		fi
+		if use llvm_targets_NVPTX; then
+			plugins+=";cuda"
+			build_devicertl=TRUE
+			gpus+="nvptx"
+		fi
+		[[ ${gpus} == amdgpunvptx ]] && gpus=all
+	fi
+
+	local mycmakeargs=(
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DOFFLOAD_LIBDIR_SUFFIX="${libdir#lib}"
+		-DLIBOMPTARGET_PLUGINS_TO_BUILD="${plugins}"
+		-DLIBOMPTARGET_OMPT_SUPPORT="$(usex ompt)"
+		-DLIBOMPTARGET_BUILD_DEVICERTL_BCLIB="${build_devicertl}"
+
+		# this breaks building static target libs
+		-DBUILD_SHARED_LIBS=OFF
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+	)
+
+	[[ ! ${LLVM_ALLOW_GPU_TESTING} ]] && mycmakeargs+=(
+		# prevent trying to access the GPU
+		-DLIBOMPTARGET_AMDGPU_ARCH=LIBOMPTARGET_AMDGPU_ARCH-NOTFOUND
+		-DLIBOMPTARGET_NVPTX_ARCH=LIBOMPTARGET_NVPTX_ARCH-NOTFOUND
+	)
+	[[ -n ${gpus} ]] && mycmakeargs+=(
+		-DLIBOMPTARGET_DEVICE_ARCHITECTURES="${gpus}"
+	)
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+		# requires flang
+		-DOPENMP_TEST_Fortran_COMPILER=
+	)
+
+	cmake_src_configure
+
+	if [[ -z ${gpus} ]]; then
+		# clang requires libomptarget.devicertl.a, but it can be empty
+		> "${BUILD_DIR}"/libomptarget.devicertl.a || die
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-offload
+}
+
+src_install() {
+	cmake_src_install
+
+	if [[ ! -f ${ED}/usr/$(get_libdir)/libomptarget.devicertl.a ]]
+	then
+		dolib.a "${BUILD_DIR}"/libomptarget.devicertl.a
+	fi
+}
diff --git a/llvm-runtimes/offload/offload-20.0.0_pre20250118.ebuild b/llvm-runtimes/offload/offload-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..c862c6448973
--- /dev/null
+++ b/llvm-runtimes/offload/offload-20.0.0_pre20250118.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="OpenMP offloading support"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0/${LLVM_SOABI}"
+IUSE="+debug ompt test llvm_targets_AMDGPU llvm_targets_NVPTX"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libffi:=
+	~llvm-core/llvm-${PV}
+	~llvm-runtimes/openmp-${PV}[ompt?]
+	llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= )
+"
+DEPEND="
+	${RDEPEND}
+"
+# tests:
+# - dev-python/lit provides the test runner
+# - llvm-core/llvm provide test utils (e.g. FileCheck)
+# - llvm-core/clang provides the compiler to run tests
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	llvm_targets_AMDGPU? ( llvm-core/clang )
+	llvm_targets_NVPTX? ( llvm-core/clang )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+		llvm-core/clang
+	)
+"
+# TODO: can it be fixed to compile with gcc?
+BDEPEND+="
+	llvm-core/clang
+"
+
+LLVM_COMPONENTS=( offload cmake runtimes/cmake libc/shared )
+LLVM_TEST_COMPONENTS=( openmp/cmake )
+llvm.org_set_globals
+
+pkg_pretend() {
+	if [[ ${LLVM_ALLOW_GPU_TESTING} ]]; then
+		ewarn "LLVM_ALLOW_GPU_TESTING set.  This package will run tests against your"
+		ewarn "GPU if it is supported.  Note that these tests may be flaky, fail or"
+		ewarn "hang, or even cause your GPU to crash (requiring a reboot)."
+	fi
+}
+
+python_check_deps() {
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	if use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	# TODO
+	local -x CC=${CHOST}-clang
+	local -x CXX=${CHOST}-clang++
+	strip-unsupported-flags
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local libdir="$(get_libdir)"
+	local ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+	local ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	local plugins="host"
+	local gpus=
+	local build_devicertl=FALSE
+
+	if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
+		if use llvm_targets_AMDGPU; then
+			plugins+=";amdgpu"
+			build_devicertl=TRUE
+			gpus+="amdgpu"
+		fi
+		if use llvm_targets_NVPTX; then
+			plugins+=";cuda"
+			build_devicertl=TRUE
+			gpus+="nvptx"
+		fi
+		[[ ${gpus} == amdgpunvptx ]] && gpus=all
+	fi
+
+	local mycmakeargs=(
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DOFFLOAD_LIBDIR_SUFFIX="${libdir#lib}"
+		-DLIBOMPTARGET_PLUGINS_TO_BUILD="${plugins}"
+		-DLIBOMPTARGET_OMPT_SUPPORT="$(usex ompt)"
+		-DLIBOMPTARGET_BUILD_DEVICERTL_BCLIB="${build_devicertl}"
+
+		# this breaks building static target libs
+		-DBUILD_SHARED_LIBS=OFF
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+	)
+
+	[[ ! ${LLVM_ALLOW_GPU_TESTING} ]] && mycmakeargs+=(
+		# prevent trying to access the GPU
+		-DLIBOMPTARGET_AMDGPU_ARCH=LIBOMPTARGET_AMDGPU_ARCH-NOTFOUND
+		-DLIBOMPTARGET_NVPTX_ARCH=LIBOMPTARGET_NVPTX_ARCH-NOTFOUND
+	)
+	[[ -n ${gpus} ]] && mycmakeargs+=(
+		-DLIBOMPTARGET_DEVICE_ARCHITECTURES="${gpus}"
+	)
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+		# requires flang
+		-DOPENMP_TEST_Fortran_COMPILER=
+	)
+
+	cmake_src_configure
+
+	if [[ -z ${gpus} ]]; then
+		# clang requires libomptarget.devicertl.a, but it can be empty
+		> "${BUILD_DIR}"/libomptarget.devicertl.a || die
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-offload
+}
+
+src_install() {
+	cmake_src_install
+
+	if [[ ! -f ${ED}/usr/$(get_libdir)/libomptarget.devicertl.a ]]
+	then
+		dolib.a "${BUILD_DIR}"/libomptarget.devicertl.a
+	fi
+}
diff --git a/llvm-runtimes/openmp/Manifest b/llvm-runtimes/openmp/Manifest
index ad580e309a5c..0f7000d75ee0 100644
--- a/llvm-runtimes/openmp/Manifest
+++ b/llvm-runtimes/openmp/Manifest
@@ -11,4 +11,7 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607 SHA512 d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
+DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/llvm-runtimes/openmp/openmp-19.1.7.ebuild b/llvm-runtimes/openmp/openmp-19.1.7.ebuild
new file mode 100644
index 000000000000..cbd2a6293498
--- /dev/null
+++ b/llvm-runtimes/openmp/openmp-19.1.7.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit flag-o-matic cmake-multilib linux-info llvm.org python-single-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+IUSE="debug gdb-plugin hwloc ompt test"
+REQUIRED_USE="
+	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gdb-plugin? ( ${PYTHON_DEPS} )
+	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
+"
+# tests:
+# - dev-python/lit provides the test runner
+# - llvm-core/llvm provide test utils (e.g. FileCheck)
+# - llvm-core/clang provides the compiler to run tests
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-lang/perl
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+		llvm-core/clang
+	)
+"
+
+LLVM_COMPONENTS=( openmp cmake llvm/include )
+llvm.org_set_globals
+
+pkg_setup() {
+	if use gdb-plugin || use test; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+multilib_src_configure() {
+	# LTO causes issues in other packages building, #870127
+	filter-lto
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+	)
+
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-libomp
+}
diff --git a/llvm-runtimes/openmp/openmp-20.0.0_pre20241227.ebuild b/llvm-runtimes/openmp/openmp-20.0.0_pre20241227.ebuild
deleted file mode 100644
index ea3715dad3ed..000000000000
--- a/llvm-runtimes/openmp/openmp-20.0.0_pre20241227.ebuild
+++ /dev/null
@@ -1,88 +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} )
-inherit flag-o-matic cmake-multilib linux-info llvm.org python-single-r1
-
-DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
-HOMEPAGE="https://openmp.llvm.org"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0/${LLVM_SOABI}"
-IUSE="+debug gdb-plugin hwloc ompt test"
-REQUIRED_USE="
-	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gdb-plugin? ( ${PYTHON_DEPS} )
-	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
-"
-# tests:
-# - dev-python/lit provides the test runner
-# - llvm-core/llvm provide test utils (e.g. FileCheck)
-# - llvm-core/clang provides the compiler to run tests
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/lit[${PYTHON_USEDEP}]
-		')
-		llvm-core/clang
-	)
-"
-
-LLVM_COMPONENTS=( openmp cmake llvm/include )
-llvm.org_set_globals
-
-pkg_setup() {
-	if use gdb-plugin || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	# LTO causes issues in other packages building, #870127
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
-
-		-DLIBOMP_USE_HWLOC=$(usex hwloc)
-		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		# do not install libgomp.so & libiomp5.so aliases
-		-DLIBOMP_INSTALL_ALIASES=OFF
-		# disable unnecessary hack copying stuff back to srcdir
-		-DLIBOMP_COPY_EXPORTS=OFF
-	)
-
-	use test && mycmakeargs+=(
-		# this project does not use standard LLVM cmake macros
-		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
-
-		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
-		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-libomp
-}
diff --git a/llvm-runtimes/openmp/openmp-20.0.0_pre20250111.ebuild b/llvm-runtimes/openmp/openmp-20.0.0_pre20250111.ebuild
new file mode 100644
index 000000000000..6a485191767b
--- /dev/null
+++ b/llvm-runtimes/openmp/openmp-20.0.0_pre20250111.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit flag-o-matic cmake-multilib linux-info llvm.org python-single-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0/${LLVM_SOABI}"
+IUSE="+debug gdb-plugin hwloc ompt test"
+REQUIRED_USE="
+	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gdb-plugin? ( ${PYTHON_DEPS} )
+	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
+"
+# tests:
+# - dev-python/lit provides the test runner
+# - llvm-core/llvm provide test utils (e.g. FileCheck)
+# - llvm-core/clang provides the compiler to run tests
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-lang/perl
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+		llvm-core/clang
+	)
+"
+
+LLVM_COMPONENTS=( openmp cmake llvm/include )
+llvm.org_set_globals
+
+pkg_setup() {
+	if use gdb-plugin || use test; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+multilib_src_configure() {
+	# LTO causes issues in other packages building, #870127
+	filter-lto
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+	)
+
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-libomp
+}
diff --git a/llvm-runtimes/openmp/openmp-20.0.0_pre20250118.ebuild b/llvm-runtimes/openmp/openmp-20.0.0_pre20250118.ebuild
new file mode 100644
index 000000000000..6a485191767b
--- /dev/null
+++ b/llvm-runtimes/openmp/openmp-20.0.0_pre20250118.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit flag-o-matic cmake-multilib linux-info llvm.org python-single-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0/${LLVM_SOABI}"
+IUSE="+debug gdb-plugin hwloc ompt test"
+REQUIRED_USE="
+	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gdb-plugin? ( ${PYTHON_DEPS} )
+	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
+"
+# tests:
+# - dev-python/lit provides the test runner
+# - llvm-core/llvm provide test utils (e.g. FileCheck)
+# - llvm-core/clang provides the compiler to run tests
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-lang/perl
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+		llvm-core/clang
+	)
+"
+
+LLVM_COMPONENTS=( openmp cmake llvm/include )
+llvm.org_set_globals
+
+pkg_setup() {
+	if use gdb-plugin || use test; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+multilib_src_configure() {
+	# LTO causes issues in other packages building, #870127
+	filter-lto
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+	)
+
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-libomp
+}
diff --git a/lxqt-base/lxqt-panel/Manifest b/lxqt-base/lxqt-panel/Manifest
index 479c23618aa4..9a9178192208 100644
--- a/lxqt-base/lxqt-panel/Manifest
+++ b/lxqt-base/lxqt-panel/Manifest
@@ -1,2 +1,2 @@
 DIST lxqt-panel-2.0.1.tar.xz 662616 BLAKE2B d27f99e5ba301ad1d03a8e8e4dad939c4f5ba8e7825fe0ac93d8a3b1649f21bd6614d144322b5355112f44f8b8eebf5f9ed3f8e5b4bac85d27530ba02abe0d31 SHA512 df2cef5f03f65eb20eaf58cf8dc2f390bc4daa67638e301e0df15c82b8332f842d8e1ee9f1f5bc2240a25ce4b2f404aa7aa69a415a41f5cbb17592f8c77a414e
-DIST lxqt-panel-2.1.3.tar.xz 699548 BLAKE2B 235d35135098f76a98a61bd5af8ca4b81f39ff1e82b431efda37c7dda1b5fcf56d2a70d86d84a314ecb9bad5b663dc249ad0c102ee80bb21d94b8457196cba84 SHA512 ee5943f41696101866aef029b40a5a0b03648f5b74eb7277ca8b8b90569cb61653b65634fbb9c6ddf60ebb1fbeeac9d99fd2793b9a22ab209d1901b92a080c6c
+DIST lxqt-panel-2.1.4.tar.xz 711304 BLAKE2B aba4c662ffbc3d9af8845c1520ec876bbbc40478aa6775e01bca08b3cbf2d82a8ca57e3ca25ae8929b360b3ac9275350c0a6e40047513c720cb89d37d8e6e900 SHA512 ccb192ee9e35a397160aae5367dea26ade5bea583e65ee4692a0300bda9fd681e07fcb8b010557bcd2ad208f66c3872b92792ddd837ca995c1e032e3a81efd87
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-2.1.3.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-2.1.3.ebuild
deleted file mode 100644
index 6924bd999bd9..000000000000
--- a/lxqt-base/lxqt-panel/lxqt-panel-2.1.3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="LXQt desktop panel and plugins"
-HOMEPAGE="https://lxqt-project.org/"
-
-MY_PV="$(ver_cut 1-2)"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="LGPL-2.1 LGPL-2.1+"
-SLOT="0"
-IUSE="
-	+alsa colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator
-	+mainmenu +mount networkmonitor pulseaudio +quicklaunch lm-sensors +showdesktop
-	+spacer +statusnotifier sysstat +taskbar tray +volume +worldclock
-"
-
-# Work around a missing header issue: https://bugs.gentoo.org/666278
-REQUIRED_USE="
-	|| ( desktopswitch mainmenu showdesktop taskbar )
-	volume? ( || ( alsa pulseaudio ) )
-"
-
-BDEPEND="
-	>=dev-qt/qttools-6.6:6[linguist]
-	>=dev-util/lxqt-build-tools-2.1.0
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-libs/libqtxdg-4.1.0
-	>=dev-qt/qtbase-6.6:6[dbus,gui,widgets,xml]
-	>=dev-qt/qtsvg-6.6:6
-	kde-frameworks/kwindowsystem:6[X]
-	kde-plasma/layer-shell-qt:6
-	>=lxde-base/menu-cache-1.1.0
-	=lxqt-base/liblxqt-${MY_PV}*:=
-	=lxqt-base/lxqt-globalkeys-${MY_PV}*
-	=lxqt-base/lxqt-menu-data-${MY_PV}*
-	x11-libs/libX11
-	cpuload? ( sys-libs/libstatgrab )
-	kbindicator? ( x11-libs/libxkbcommon )
-	lm-sensors? ( sys-apps/lm-sensors:= )
-	mount? ( kde-frameworks/solid:6 )
-	networkmonitor? ( sys-libs/libstatgrab )
-	statusnotifier? (
-		dev-libs/libdbusmenu-lxqt
-		>=dev-qt/qtbase-6.6:6[concurrent]
-	)
-	sysstat? ( >=lxqt-base/libsysstat-1.1.0 )
-	tray? (
-		x11-libs/libxcb:=
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-	)
-	volume? (
-		alsa? ( media-libs/alsa-lib )
-		pulseaudio? (
-			media-libs/libpulse
-			media-sound/pavucontrol-qt
-		)
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		# Plugins
-		-DCOLORPICKER_PLUGIN=$(usex colorpicker)
-		-DCPULOAD_PLUGIN=$(usex cpuload)
-		-DDESKTOPSWITCH_PLUGIN=$(usex desktopswitch)
-		-DDIRECTORYMENU_PLUGIN=$(usex directorymenu)
-		-DDOM_PLUGIN=$(usex dom)
-		-DKBINDICATOR_PLUGIN=$(usex kbindicator)
-		-DMAINMENU_PLUGIN=$(usex mainmenu)
-		-DMOUNT_PLUGIN=$(usex mount)
-		-DNETWORKMONITOR_PLUGIN=$(usex networkmonitor)
-		-DQUICKLAUNCH_PLUGIN=$(usex quicklaunch)
-		-DSENSORS_PLUGIN=$(usex lm-sensors)
-		-DSHOWDESKTOP_PLUGIN=$(usex showdesktop)
-		-DSPACER_PLUGIN=$(usex spacer)
-		-DSTATUSNOTIFIER_PLUGIN=$(usex statusnotifier)
-		-DSYSSTAT_PLUGIN=$(usex sysstat)
-		-DTASKBAR_PLUGIN=$(usex taskbar)
-		-DTRAY_PLUGIN=$(usex tray)
-		-DVOLUME_PLUGIN=$(usex volume)
-		-DWORLDCLOCK_PLUGIN=$(usex worldclock)
-	)
-
-	if use volume; then
-		mycmakeargs+=(
-			-DVOLUME_USE_ALSA=$(usex alsa)
-			-DVOLUME_USE_PULSEAUDIO=$(usex pulseaudio)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doman panel/man/*.1
-}
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-2.1.4.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-2.1.4.ebuild
new file mode 100644
index 000000000000..d2ebada7c04e
--- /dev/null
+++ b/lxqt-base/lxqt-panel/lxqt-panel-2.1.4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="LXQt desktop panel and plugins"
+HOMEPAGE="https://lxqt-project.org/"
+
+MY_PV="$(ver_cut 1-2)"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1 LGPL-2.1+"
+SLOT="0"
+IUSE="
+	+alsa colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator
+	+mainmenu +mount networkmonitor pulseaudio +quicklaunch lm-sensors +showdesktop
+	+spacer +statusnotifier sysstat +taskbar tray +volume +worldclock
+"
+
+# Work around a missing header issue: https://bugs.gentoo.org/666278
+REQUIRED_USE="
+	|| ( desktopswitch mainmenu showdesktop taskbar )
+	volume? ( || ( alsa pulseaudio ) )
+"
+
+BDEPEND="
+	>=dev-qt/qttools-6.6:6[linguist]
+	>=dev-util/lxqt-build-tools-2.1.0
+	virtual/pkgconfig
+"
+DEPEND="
+	>=dev-libs/libqtxdg-4.1.0
+	>=dev-qt/qtbase-6.6:6[dbus,gui,widgets,xml]
+	>=dev-qt/qtsvg-6.6:6
+	kde-frameworks/kwindowsystem:6[X]
+	kde-plasma/layer-shell-qt:6
+	>=lxde-base/menu-cache-1.1.0
+	=lxqt-base/liblxqt-${MY_PV}*:=
+	=lxqt-base/lxqt-globalkeys-${MY_PV}*
+	=lxqt-base/lxqt-menu-data-${MY_PV}*
+	x11-libs/libX11
+	cpuload? ( sys-libs/libstatgrab )
+	kbindicator? ( x11-libs/libxkbcommon )
+	lm-sensors? ( sys-apps/lm-sensors:= )
+	mount? ( kde-frameworks/solid:6 )
+	networkmonitor? ( sys-libs/libstatgrab )
+	statusnotifier? (
+		dev-libs/libdbusmenu-lxqt
+		>=dev-qt/qtbase-6.6:6[concurrent]
+	)
+	sysstat? ( >=lxqt-base/libsysstat-1.1.0 )
+	tray? (
+		x11-libs/libxcb:=
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/xcb-util
+		x11-libs/xcb-util-image
+	)
+	volume? (
+		alsa? ( media-libs/alsa-lib )
+		pulseaudio? (
+			media-libs/libpulse
+			media-sound/pavucontrol-qt
+		)
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		# Plugins
+		-DCOLORPICKER_PLUGIN=$(usex colorpicker)
+		-DCPULOAD_PLUGIN=$(usex cpuload)
+		-DDESKTOPSWITCH_PLUGIN=$(usex desktopswitch)
+		-DDIRECTORYMENU_PLUGIN=$(usex directorymenu)
+		-DDOM_PLUGIN=$(usex dom)
+		-DKBINDICATOR_PLUGIN=$(usex kbindicator)
+		-DMAINMENU_PLUGIN=$(usex mainmenu)
+		-DMOUNT_PLUGIN=$(usex mount)
+		-DNETWORKMONITOR_PLUGIN=$(usex networkmonitor)
+		-DQUICKLAUNCH_PLUGIN=$(usex quicklaunch)
+		-DSENSORS_PLUGIN=$(usex lm-sensors)
+		-DSHOWDESKTOP_PLUGIN=$(usex showdesktop)
+		-DSPACER_PLUGIN=$(usex spacer)
+		-DSTATUSNOTIFIER_PLUGIN=$(usex statusnotifier)
+		-DSYSSTAT_PLUGIN=$(usex sysstat)
+		-DTASKBAR_PLUGIN=$(usex taskbar)
+		-DTRAY_PLUGIN=$(usex tray)
+		-DVOLUME_PLUGIN=$(usex volume)
+		-DWORLDCLOCK_PLUGIN=$(usex worldclock)
+	)
+
+	if use volume; then
+		mycmakeargs+=(
+			-DVOLUME_USE_ALSA=$(usex alsa)
+			-DVOLUME_USE_PULSEAUDIO=$(usex pulseaudio)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	doman panel/man/*.1
+}
diff --git a/lxqt-base/lxqt-runner/Manifest b/lxqt-base/lxqt-runner/Manifest
index 51ffa69a4ee5..b8284194e683 100644
--- a/lxqt-base/lxqt-runner/Manifest
+++ b/lxqt-base/lxqt-runner/Manifest
@@ -1,2 +1,2 @@
 DIST lxqt-runner-2.0.0.tar.xz 226344 BLAKE2B 3b831d1d1b0226e1785d4ee4fc93055cf01426335001c432cfc099f75c14421f467fa761648e77d826dfd6b36c9867779b88e38d971fe78846b102bcb7c945d1 SHA512 4c9ff79a0a4b7167023bd5447c83692be2e4e79ae48b6069deadae8ab4e5d6d73e6439169ffce87fc8f6000e65ed354fffb58188e9ba4f762b177b1c85c284c5
-DIST lxqt-runner-2.1.0.tar.xz 226756 BLAKE2B a348d8c98e2e7d671fa7801c985c16923442b4a2b65a5124ce5207d5923bd503c41e1c419b4f348a48381f2ff72dbded81ec02feaa0dde4d1cea61c8e4ae333c SHA512 27806c85c0f20217f2beba4a8f8d8512ec6995b7b5573ebf04f1cf7f0bfda74987d879629b00432f20f27cef9d7fa2817909ca47e57a2e40d8dbe55bd22d2231
+DIST lxqt-runner-2.1.1.tar.xz 227132 BLAKE2B a605012e8e4da84e527138345cfade620c6b67da52d82d4b1b37f1afcc987f400ef6ccc4f74c7909700befd4c3c6e8b28f7355bf5fb90ca149712606fbf0ccea SHA512 902a4934dfdb926e27562a333c97c5786828e487a6eed326bbf59435ea873936af92e39c0477f131541a2591a13ecd9f750adac0bb3a437283fc377ce463313a
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-2.1.0.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-2.1.0.ebuild
deleted file mode 100644
index 6df46ab34de1..000000000000
--- a/lxqt-base/lxqt-runner/lxqt-runner-2.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="LXQt quick launcher"
-HOMEPAGE="https://lxqt-project.org/"
-
-MY_PV="$(ver_cut 1-2)"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="LGPL-2.1 LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
-	>=dev-qt/qttools-6.6:6[linguist]
-	>=dev-util/lxqt-build-tools-2.1.0
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-cpp/muParser-2.2.3
-	>=dev-libs/libqtxdg-4.1.0
-	>=dev-qt/qtbase-6.6:6[dbus,gui,widgets,xml]
-	kde-frameworks/kwindowsystem:6
-	>=kde-plasma/layer-shell-qt-6.0:6
-	=lxqt-base/liblxqt-${MY_PV}*:=
-	=lxqt-base/lxqt-globalkeys-${MY_PV}*
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cmake_src_install
-	doman man/*.1
-}
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-2.1.1.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-2.1.1.ebuild
new file mode 100644
index 000000000000..1cd6924ca364
--- /dev/null
+++ b/lxqt-base/lxqt-runner/lxqt-runner-2.1.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="LXQt quick launcher"
+HOMEPAGE="https://lxqt-project.org/"
+
+MY_PV="$(ver_cut 1-2)"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1 LGPL-2.1+"
+SLOT="0"
+
+BDEPEND="
+	>=dev-qt/qttools-6.6:6[linguist]
+	>=dev-util/lxqt-build-tools-2.1.0
+	virtual/pkgconfig
+"
+DEPEND="
+	>=dev-cpp/muParser-2.2.3
+	>=dev-libs/libqtxdg-4.1.0
+	>=dev-qt/qtbase-6.6:6[dbus,gui,widgets,xml]
+	kde-frameworks/kwindowsystem:6
+	>=kde-plasma/layer-shell-qt-6.0:6
+	=lxqt-base/liblxqt-${MY_PV}*:=
+	=lxqt-base/lxqt-globalkeys-${MY_PV}*
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	cmake_src_install
+	doman man/*.1
+}
diff --git a/mail-client/mailx/mailx-8.1.2.20220412.ebuild b/mail-client/mailx/mailx-8.1.2.20220412.ebuild
index fa4b455dc5b4..bfc0bdab70a2 100644
--- a/mail-client/mailx/mailx-8.1.2.20220412.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20220412.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
@@ -19,7 +19,7 @@ S="${WORKDIR}/${DP/_/-}.orig"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="
 	>=net-libs/liblockfile-1.03
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 1f881ce538e3..8653be5a24e1 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,7 +1,6 @@
-DIST neomutt-20231103.tar.gz 3816069 BLAKE2B 5ed767fd0c7a37fc24bebd853d6a6b3cb0c9e15f6e8df89a7a82c79327986db2814024fb43afe78f87565e438544834e8668f6d7e0448db374a46840a4f63152 SHA512 f60911fa479dc2ff99fc90a6d62a6f1c914443d38ef7de055a6bce87808f4682f798f1faef005b0e5fbe9417f4d42588d9b4b1fc56968c02f871d6f3355aa446
-DIST neomutt-20231221.tar.gz 3812682 BLAKE2B 367435e30d7e4259c1e8b6ece9531949465d6ff641065d88982a7bef959a6c7fe1ee9622a1f166fc71ea74099145ae2f88cc28a258821dcc1f3acd493f74273b SHA512 a0670d3a6de6664aefa85718194d14d703b08f38e7b633c9827e6d7ef627c6b242c7279498e98dabe8e76976d79fb207ce6d1fef674462c5939c06b8fa0f0138
 DIST neomutt-20240201.tar.gz 3831010 BLAKE2B 70654b8edb5b6e01585bb3551a7af3722aebc44a70804ec9e16511eec9b892a4bcf68e043699591b2610095558f3893d4d7f5c15e860c7b8c17458a872c3f170 SHA512 431270a093bfa5024f2565aa8921e3482262210ca03c410362b6fa504aa1f2e299d1f6eb63cb05dcaf7b1328051b5d32c4fd719b5cb7ddec83a176a85ff5dc53
 DIST neomutt-20240425.tar.gz 4092419 BLAKE2B 35728b226a3c6d59b95daf7f2af1d155ed15b9f82958f79fc4c012df1014c5995f8e542ca2df2cdb6d79bbc537c13e7e941355dab5e4879c999f23f107db1ace SHA512 bb47aba1aa8ecc824d9d0a8f6be23f2d39f0aac06739920ee349ff96bc27cbe39b6cfa797f648eb683fe49f01fa1873805a3ed2e7cbf4124dae12517591c02c9
 DIST neomutt-20241114.tar.gz 4072339 BLAKE2B 86ca9eefa9649bc7684415213041ae513a17a1a5a6107f7904fa4a7581557f7a9585f6d98f715adee0c93bbe43651055ffca3d7c051f3c8bcff5d633237b0d7d SHA512 3325b27fc09fdb0147abbd17ecc5059ab2460a7537b09fad846a9835c70cd7a1904488c76cb420a8db57b43905ebf81b8a2f0afa6a3c7f7a827c760d63353f00
 DIST neomutt-20241212.tar.gz 4098483 BLAKE2B 2a0d81e2e990864d7330e35dab555e898c0d992b2722fe5dbfc09324377b425c877f081c5944508b14907413891baf19e08936df03cb7dd926c624691805d563 SHA512 cbb82a2fb5943092019e6c538af15dbf83cbb4620310d8a7295a425ef10594a07b0ed64a3e4174f75e9483da08daa36d01c7405b5252a9e074076af7e2023079
+DIST neomutt-20250113.tar.gz 4099632 BLAKE2B 7c36668a1c8608f5ea488966b59263745f0dac98df8061da0442d2dad4afe7d4ea005f7a2c11ff7c505f5830dad4e89ad4ec078b2be8c225b46059d468d8794f SHA512 714a9c8c712b327aa9dc98af776d66a2ba0f584bb09048b464526662e22183c739832bfbe72eb9762862ee209c36d4269cf5ecd528a6026d587c40d221b14178
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3
diff --git a/mail-client/neomutt/neomutt-20231103.ebuild b/mail-client/neomutt/neomutt-20231103.ebuild
deleted file mode 100644
index 56c1c04b2e1a..000000000000
--- a/mail-client/neomutt/neomutt-20231103.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://neomutt.org/"
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
-fi
-
-TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
-SRC_URI+=" test? ( https://github.com/${PN}/neomutt-test-files/archive/${TEST_FILES_COMMIT}.tar.gz -> neomutt-test-files-${TEST_FILES_COMMIT}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4
-	nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
-	test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:5.3
-			sys-libs/db:4.8
-		)
-	)
-	gdbm? ( sys-libs/gdbm:= )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb:= )
-	nls? ( virtual/libintl )
-	qdbm? ( dev-db/qdbm )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	gnutls? ( >=net-libs/gnutls-1.0.17:= )
-	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	idn? ( net-dns/libidn2:= )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch:= )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-DEPEND="${CDEPEND}
-	dev-lang/tcl:=
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| (
-			www-client/lynx
-			www-client/w3m
-			www-client/elinks
-		)
-	)
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-"
-
-RESTRICT="!test? ( test )"
-
-src_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-	fi
-	if [[ ${PV} =~ 99999999$ ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable autocrypt)"
-		"$(use_enable gpgme)"
-		"$(use_enable pgp-classic pgp)"
-		"$(use_enable smime-classic smime)"
-
-		# Database backends.
-		"$(use_enable berkdb bdb)"
-		"$(use_enable gdbm)"
-		"$(use_enable kyotocabinet)"
-		"$(use_enable qdbm)"
-		"$(use_enable tokyocabinet)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		--disable-idn
-		"$(use_enable idn idn2)"
-		"$(use_enable kerberos gss)"
-		"$(use_enable lmdb)"
-		"$(use_enable sasl)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"$(use_enable ssl)"
-		"$(use_enable gnutls)"
-
-		"$(usex test --testing --disable-testing)"
-	)
-
-	if is-flagq -fsanitize=address; then
-		myconf+=( --asan )
-	fi
-	if is-flagq -fsanitize=undefined; then
-		myconf+=( --ubsan )
-	fi
-
-	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${myconf[@]}"
-}
-
-src_test() {
-	local test_dir="$(readlink --canonicalize "${S}"/../neomutt-test-files-${TEST_FILES_COMMIT})"
-	pushd ${test_dir} || die "Could not cd into test_dir"
-	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
-		|| die "Failed to run the setup.sh script"
-	popd || die "Could not cd back"
-	NEOMUTT_TEST_DIR="${test_dir}" emake test
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A man-page is always handy, so fake one - here neomuttrc.5 (neomutt.1
-	# already exists)
-	if use !doc; then
-		sed -n \
-			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
-			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
-			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
-			Makefile > docs/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^docs\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			docs/Makefile.autosetup >> docs/Makefile.fakedoc || die
-		emake -f docs/Makefile.fakedoc docs/neomutt.1
-		emake -f docs/Makefile.fakedoc docs/neomuttrc.5
-		doman docs/neomutt.1 docs/neomuttrc.5
-	fi
-
-	dodoc LICENSE* ChangeLog* README*
-}
-
-pkg_postinst() {
-	if use gpgme && ( use pgp-classic || use smime-classic ); then
-		ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
-		ewarn "  support.  You can probably remove pgp-classic (old crypt)"
-		ewarn "  and smime-classic (old smime) from your USE-flags and"
-		ewarn "  only enable gpgme."
-	fi
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}
diff --git a/mail-client/neomutt/neomutt-20231221.ebuild b/mail-client/neomutt/neomutt-20231221.ebuild
deleted file mode 100644
index 56c1c04b2e1a..000000000000
--- a/mail-client/neomutt/neomutt-20231221.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://neomutt.org/"
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
-fi
-
-TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
-SRC_URI+=" test? ( https://github.com/${PN}/neomutt-test-files/archive/${TEST_FILES_COMMIT}.tar.gz -> neomutt-test-files-${TEST_FILES_COMMIT}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4
-	nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
-	test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:5.3
-			sys-libs/db:4.8
-		)
-	)
-	gdbm? ( sys-libs/gdbm:= )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb:= )
-	nls? ( virtual/libintl )
-	qdbm? ( dev-db/qdbm )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	gnutls? ( >=net-libs/gnutls-1.0.17:= )
-	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	idn? ( net-dns/libidn2:= )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch:= )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-DEPEND="${CDEPEND}
-	dev-lang/tcl:=
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| (
-			www-client/lynx
-			www-client/w3m
-			www-client/elinks
-		)
-	)
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-"
-
-RESTRICT="!test? ( test )"
-
-src_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-	fi
-	if [[ ${PV} =~ 99999999$ ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable autocrypt)"
-		"$(use_enable gpgme)"
-		"$(use_enable pgp-classic pgp)"
-		"$(use_enable smime-classic smime)"
-
-		# Database backends.
-		"$(use_enable berkdb bdb)"
-		"$(use_enable gdbm)"
-		"$(use_enable kyotocabinet)"
-		"$(use_enable qdbm)"
-		"$(use_enable tokyocabinet)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		--disable-idn
-		"$(use_enable idn idn2)"
-		"$(use_enable kerberos gss)"
-		"$(use_enable lmdb)"
-		"$(use_enable sasl)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"$(use_enable ssl)"
-		"$(use_enable gnutls)"
-
-		"$(usex test --testing --disable-testing)"
-	)
-
-	if is-flagq -fsanitize=address; then
-		myconf+=( --asan )
-	fi
-	if is-flagq -fsanitize=undefined; then
-		myconf+=( --ubsan )
-	fi
-
-	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${myconf[@]}"
-}
-
-src_test() {
-	local test_dir="$(readlink --canonicalize "${S}"/../neomutt-test-files-${TEST_FILES_COMMIT})"
-	pushd ${test_dir} || die "Could not cd into test_dir"
-	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
-		|| die "Failed to run the setup.sh script"
-	popd || die "Could not cd back"
-	NEOMUTT_TEST_DIR="${test_dir}" emake test
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A man-page is always handy, so fake one - here neomuttrc.5 (neomutt.1
-	# already exists)
-	if use !doc; then
-		sed -n \
-			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
-			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
-			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
-			Makefile > docs/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^docs\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			docs/Makefile.autosetup >> docs/Makefile.fakedoc || die
-		emake -f docs/Makefile.fakedoc docs/neomutt.1
-		emake -f docs/Makefile.fakedoc docs/neomuttrc.5
-		doman docs/neomutt.1 docs/neomuttrc.5
-	fi
-
-	dodoc LICENSE* ChangeLog* README*
-}
-
-pkg_postinst() {
-	if use gpgme && ( use pgp-classic || use smime-classic ); then
-		ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
-		ewarn "  support.  You can probably remove pgp-classic (old crypt)"
-		ewarn "  and smime-classic (old smime) from your USE-flags and"
-		ewarn "  only enable gpgme."
-	fi
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}
diff --git a/mail-client/neomutt/neomutt-20250113.ebuild b/mail-client/neomutt/neomutt-20250113.ebuild
new file mode 100644
index 000000000000..9fe4076bf4e8
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20250113.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://neomutt.org/"
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+fi
+
+TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
+SRC_URI+=" test? ( https://github.com/${PN}/neomutt-test-files/archive/${TEST_FILES_COMMIT}.tar.gz -> neomutt-test-files-${TEST_FILES_COMMIT}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4
+	nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
+	test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.0
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+		<sys-libs/db-6.3:=
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	lmdb? ( dev-db/lmdb:= )
+	nls? ( virtual/libintl )
+	qdbm? ( dev-db/qdbm )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	gnutls? ( >=net-libs/gnutls-1.0.17:= )
+	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	idn? ( net-dns/libidn2:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+DEPEND="${CDEPEND}
+	dev-lang/tcl:=
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| (
+			www-client/lynx
+			www-client/w3m
+			www-client/elinks
+		)
+	)
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+"
+
+RESTRICT="!test? ( test )"
+
+src_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(use_enable gpgme)"
+		"$(use_enable pgp-classic pgp)"
+		"$(use_enable smime-classic smime)"
+
+		# Database backends.
+		"$(use_enable berkdb bdb)"
+		"$(use_enable gdbm)"
+		"$(use_enable kyotocabinet)"
+		"$(use_enable qdbm)"
+		"$(use_enable tokyocabinet)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		--disable-idn
+		"$(use_enable idn idn2)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	if is-flagq -fsanitize=address; then
+		myconf+=( --asan )
+	fi
+	if is-flagq -fsanitize=undefined; then
+		myconf+=( --ubsan )
+	fi
+
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${myconf[@]}"
+}
+
+src_test() {
+	local test_dir="$(readlink --canonicalize "${S}"/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	pushd ${test_dir} || die "Could not cd into test_dir"
+	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
+		|| die "Failed to run the setup.sh script"
+	popd || die "Could not cd back"
+	NEOMUTT_TEST_DIR="${test_dir}" emake test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A man-page is always handy, so fake one - here neomuttrc.5 (neomutt.1
+	# already exists)
+	if use !doc; then
+		sed -n \
+			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
+			Makefile > docs/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^docs\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			docs/Makefile.autosetup >> docs/Makefile.fakedoc || die
+		emake -f docs/Makefile.fakedoc docs/neomutt.1
+		emake -f docs/Makefile.fakedoc docs/neomuttrc.5
+		doman docs/neomutt.1 docs/neomuttrc.5
+	fi
+
+	dodoc LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use gpgme && ( use pgp-classic || use smime-classic ); then
+		ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+		ewarn "  support.  You can probably remove pgp-classic (old crypt)"
+		ewarn "  and smime-classic (old smime) from your USE-flags and"
+		ewarn "  only enable gpgme."
+	fi
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 361310311d0b..c9f726afdc90 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -62,5 +62,71 @@ DIST thunderbird-128.5.2esr-uz.xpi 592621 BLAKE2B a85e1630a03d1ce8f0c6f54eec9bef
 DIST thunderbird-128.5.2esr-vi.xpi 794034 BLAKE2B ae0d1b8b7c780e421bc567d8ad35972c1083c959dcdc33c41fd39e836e42b9709e95ca408a6e4220248975fc898f68f8143e260462b339acf77a776c797ecc39 SHA512 fd924b279e85096c35707d53519a4aaba150944242f0ab86f313703a2c8a7a07040a466c93bff82793023ccb8b2a39a51277f197d8da42e9a430495000549dca
 DIST thunderbird-128.5.2esr-zh-CN.xpi 794062 BLAKE2B 7690a4514b2ffb7fcf2fc1d26b149ffc7f82d9b7ebe97c6e144f6ac684b2a3e08f00044a3237233e0d17db44dfd58d4859efcd93101f16954bc0027c9700f175 SHA512 fa77d6463508e0da35852625072326ee95d2bb66cc8a184c99187c7facc05a642b3097c6a03ba19e10a793c5f4bad51c6fd7adb3c44ccb96cbb06adbcc625f4a
 DIST thunderbird-128.5.2esr-zh-TW.xpi 797336 BLAKE2B 78b896488e71b1db7990409fe178ec2309d050a7c1b20c9b1e8276fcfd893c59ea4cb77b9241198e54e0d3f34aee8de53c540f2ec9a75cc1112d0f24a203ff3d SHA512 fb6e0c3cfe49494d678252b7d0eb8ef6d19a85502979c3c6965da76cae2c1f8dc1aafa0df1a15c39c9a26f0ecb4a335acdf4d6539a2ed0b35a625eda84994f62
+DIST thunderbird-128.6.0esr-af.xpi 530348 BLAKE2B c291336a6e9eb40b1b8a3f2e64406147afadf8da89c4b479c5030af834899790eb33825338e779691cbd3182825067d49b195ce5b89ba473fd73cf84ce25f1f0 SHA512 b8d4efe5a31aaaf8d1fda0fad64e92014fd9c989a3335af79947d4cba9f49f8c243723ba71494f092c03b14a3df4b51c9e6ecaedf0fc0439df3f4dd870fd6cd0
+DIST thunderbird-128.6.0esr-ar.xpi 686983 BLAKE2B a3c3474888b6a5e0600e11412fe9bedd7992789c730baabfc4043be47c971a46e9e3b8d7b6140f89daf38b7ebd1ee83e3a71c52abb55570702c0c8f99dd42c71 SHA512 cd7d41f5267cbdc6e0c7a397c8340c06cce3a213e6abb63b06e5bdaedf9dcddbbc653691cc1086ba63f45d5b3bea8dbc4e845292c5a5bffc4d40d8c7c735fbae
+DIST thunderbird-128.6.0esr-ast.xpi 561052 BLAKE2B e0a15a2cc6e271182a124261b5bbe394856d8d9547ab23f780cf1dfdbf03e99f02948586b966205dc60bcd71127eaff1a8e65c12c49a530a669b2ec211de9295 SHA512 c57ec7f29b3ff3eff8e94d56be6292cde5edef45e951ae2cb702c54ff9e48d2cff5a3e5dbd8203bc2f6e315ec2cf1050068c0c3b7f642c2ff72dd2d6c49d4e19
+DIST thunderbird-128.6.0esr-be.xpi 772988 BLAKE2B 86cbe59197929b30c6dbe7e359e67d262adb39d0b63b9d7ed8e228e85034c231080ca9a3ce3dd8d00d9f7cef4981c3fdb1e3753d9f2808b1b83cf3e0114a1cde SHA512 2105943491510503cd72a6278c60a6c99c9a70352a1698f07e81e7b618a6d5e77e0c1918c26c582e5538429707dfaade269ed1fa8df6de954d1f59432362ad5c
+DIST thunderbird-128.6.0esr-bg.xpi 812322 BLAKE2B 682041133e3a33c1b517e8846031a9d5c16e4e5d457210bc50aa3d454df319841cebb39bc3582e3281699e7a952876af881d2b07eaaa717f5c1671787b8f9848 SHA512 5765cec6046cae25a11517582b3a254a0e1d0bbcc7fe1ab34cf48b865b34584e598b8548ccc92ae5082c9c411f6ee096a4c758deebb619f1261e66c74c35cf52
+DIST thunderbird-128.6.0esr-br.xpi 655125 BLAKE2B 906f6fe6c588e3be0d8103db89910b47e248ae1c2c8026feaedbd0b94936da456bafb247b4cb7a615abf8934dea7e85639bd0e31b9b3edcc19d87e5ee0a6cc1c SHA512 8227bc3393dfcf8f55f4cd861c64333ee9b75e265b13ed867c4d8eef70c8d92ee8e7408655deb3dc16d54771ea382328ea8004c2a73c7cbe18a723ae533210db
+DIST thunderbird-128.6.0esr-ca.xpi 711075 BLAKE2B 3ede15dd28ebfa6324faea3c7dba21e37a604e5d4de5f4b940b1e583ec37ce7ed1246b84f3480d0720b2478a700560a1aa2331daf1ed0f1a8560420b6e8e2c20 SHA512 967d2f507303d1271845abb2d4ab7c558c6a1b9d9cdb647d59f9e40e922bc6c22203970c6b512a447ee6d494c13cc4af0198c9a863bb205e1edd485e98a4742d
+DIST thunderbird-128.6.0esr-cak.xpi 672193 BLAKE2B 5407232e5309171c30306bc8a191dafccf6ea5dc4e0334e78703c03c169bd0328069aadbfee31d53f8d7169f210dba4b55c95b4afcb1705de83ea09ff9f35a94 SHA512 c33f22f1313c4ba104babe4bd162ff9d8483b71f2eab2912888e2a1dc65042fa8ee890749a82a570c9605efaa1d6bb874b2fee6daef1941a36fe491edd02c73d
+DIST thunderbird-128.6.0esr-cs.xpi 791606 BLAKE2B 0f752dcaf1a9cd1010bf79f10638ea65186660c05b1985aceb97bffe700d6bd166571563fbeb8d2933cf998dacf2b3053b931a49e36e8295afe1a5a913ff2639 SHA512 0d5bd9a69f6314b67745775c58ec8653c2369a5cfd7306af8395d8792230247e518abef5d1859378e52609e963dc645e934bf6b18c3abae4836014792382ba37
+DIST thunderbird-128.6.0esr-cy.xpi 756814 BLAKE2B 8202561c2f83b73d6f73103b3ca759f740be0e4e4dfc8e4e73a59537db26bee7570c54db587876ffee76718c94f5a6ff97c25c80347b4352c6c8b9b0f94626d0 SHA512 315c9a888ce877879a1080c19520315eb7be2b5cf8c0d30f9cc49c382ed97a90bb94caa19d607ebe96d7f97b43f656723346ad3580fe110510fdaae455aa9d5e
+DIST thunderbird-128.6.0esr-da.xpi 740055 BLAKE2B 4ce399c01054949cb0a695f4387d155d7de9e5213d09c71ae5ecc838445c95bddd79b7a564ee2be3ca5c3be2859406d248decc0136ee45148c9b5193b4550221 SHA512 c2871fe936a23fac5f7b876d41dd0500de6359a145d8a4ff11edbd25041623960172af552632b2501a165b1aebc4edf4b88eaffbab70dff2b5e1a9fbcc3d9c75
+DIST thunderbird-128.6.0esr-de.xpi 772205 BLAKE2B 69d3eafdd716b01eeaf71d349e90e354125ed1447519598201bf7437cfa3bd293db1308f65ec5e6c41d1a4b7fc8e4f609325c46af0b46b8207bee827ef0b3318 SHA512 b1a051755bf2b3918386e2b65ce3e43f3b504024d1916510c8a71ff5068e933b0c729c4b1e823d4ab8aa0509e2e187446b5dfca1d6d315e7dfba92df364919d3
+DIST thunderbird-128.6.0esr-dsb.xpi 790366 BLAKE2B cde948d8738ec82efb0a64c3ea30888985424fdadf2a3a4fe2c51035cb033b545e63b78c18238f00bc3fd1e0e2bda541d8643c9b7fc98ad090c2b4b083d300f0 SHA512 d0740b71e3c381f740ef7bb1a4f3fd84ac3dc030b5119b58db5f008fd82f3159f1b19e48f92ed32b599052ab0f8f49a0523d74dc371ed888d76bcd80b208f8d3
+DIST thunderbird-128.6.0esr-el.xpi 895919 BLAKE2B 35ab6d658b40c485be55da4f6f573a28e35425a2c5ef3b48547df41f2902024b7e4c2c1bc2e4dddce110cc2388408c719da1d6820d82d3d5e3343a9638f8a3a7 SHA512 2a119aed7b83de6a2ac7341d00cfe2889bde0ccc6a74b2b25fa8e3542238c13111a31daec13390090af6bcf76fe1baded0065c040a83e6a5dccc5f390e3b798d
+DIST thunderbird-128.6.0esr-en-CA.xpi 705212 BLAKE2B 469e87f31eeb362c0862e07c605ff65037582fbd8436e0fec16ee9357631775066eb09c9527ddc88a754de91d5b170af7a45750bf852a5a6c862fbafd22348d8 SHA512 fb0c861a9f5dc2e2d59dd48c42fd500e37f625dc232cbd5d3e6a23ee0d5cd530c96484436f52ea9f7532b71fafc9c6811d36a7a2f89cca407bc1d4a4b8d86314
+DIST thunderbird-128.6.0esr-en-GB.xpi 709686 BLAKE2B a76b720e9713b146d20814f59247ee86f6e1804495aed6a2683715d48697c5999279b729a289e7caa7d9b23f3ae9d4f4239c118657111f777632c8b2e23b5130 SHA512 400383b2d1808bceec7c3b8a1cfc4fc4c56ec49341145d9a9def64b6f55f99311efe56cefa09fe037d78ed04b355141abc66e0ef048348f614a00efd02e849de
+DIST thunderbird-128.6.0esr-es-AR.xpi 765753 BLAKE2B 9d45331b8dada5cf0d152de94e353b24626ed1e90808d9f81ae620ac97f369ac6643683437721df2721febbe1b05c337812dfca9d0d9c7739e6e175ce1776491 SHA512 963c88d801fb1092a4cca94be64ffb8f467b9dd3fafb3395c7b25bbc377fc9186df086502f25f621f2c43f26ead345234d9553cba5e29e2eb1c332427c4fbde6
+DIST thunderbird-128.6.0esr-es-ES.xpi 733783 BLAKE2B ea67a4d36e8b51a47edc15defc62e598b0497a52dc5a20419ddcbe44ac41a3e8337eef6030e301bcd6a1a3bf4f65d4c21ff3718017855e1616545c18426b5b2a SHA512 6bf64be7c04df40c531682b03f282856f020bc7910ef3a1a4b01e83159506f6afa4085fbba1d5af2c92ded46efb5f36ddbd4fa9ddc4c6da140eaf52af220ca8a
+DIST thunderbird-128.6.0esr-es-MX.xpi 749781 BLAKE2B 4c7fffe3db1a9bc4ee3092474024e8fdf754769601768c5d2d2cac2dc24b4fc1bcfa68d5948adaff0e80dbd18d86ed23a85f9c9eb440b5fe840e81ff4e2f6802 SHA512 70b3104f5c44973d12ca155f155989c944df23f9c2d9d637561a4aebb19db244426ea982b1dda4b58dcdf0c69e575e75b3ad4f451c1203a251622155ae6d7e12
+DIST thunderbird-128.6.0esr-et.xpi 696771 BLAKE2B 212c18f86b802ecd4305e143148746c868f7269a2e23ed3fe407f38fbc8c6c3c0966e29a327a49431a83b8f5de20bb5711c5c70d4ab73875e131631f94c530d7 SHA512 50ecf804139e5fee2b92dc1bfdecf676d0cd3d3ad74cf9a49f23233e4211d8d5dc562911a87080db76d5ec8f3213d626793394220d94d0646567b1c91f135ddd
+DIST thunderbird-128.6.0esr-eu.xpi 740303 BLAKE2B 8d38a900abf02c3b3c9c288d12569cdf638a78c413a2314e473b399ff4aa93f65b3cd47096cee1285241756de8ae3b65ae1848f2c5a1723d6fa8f745fe600c1a SHA512 3eff3d9ae78f416f2292cce32a82ccb1e54ec32c04efc0deeb2fc1bf9d7e0e2aace59607f0275a57e4081748dbb93af50fe345c13e8dec22a6d0d3ca94116e2f
+DIST thunderbird-128.6.0esr-fi.xpi 738929 BLAKE2B ca5110469fb6cff237bdd87757610453043d776cbdd5f80c2b575eda5b336b93230263df199df097334f733498c8ffa15c5f89d1faee7a277fb89bd10eb6751c SHA512 3cee622136e2165184ee7cb43e453483c95d617afba19b49fdd25d15d6050ee7bede17b6b6911333b82a30f07f55ebf49b3c8d265a803484af6fbae111bfb799
+DIST thunderbird-128.6.0esr-fr.xpi 777362 BLAKE2B 93d577d3980bf35406e82db368cab3b58bd5f0d8b527059f1f536bd78fe6374b6ca31c586ba1b4082fe3e775810a28566bd3a7e8c0c79b94970934be0639f7cb SHA512 a29311c5849c371402607a92cab485394b648bab8c753f619a1c68505f50799603c533da42cde4c2a4c208cbf33e9b5596093033d0d665c84112ed7e0b525be1
+DIST thunderbird-128.6.0esr-fy-NL.xpi 759927 BLAKE2B 24d6b2550e335a461976a6536c453f45c01c8486f4196e720e3e0f66501ae9c55fd97529249a86d981e661c8c76d0bfe7819270b07d80e503ed105604b22ec7a SHA512 73904123c62bc4669aa4a4b54059d3da74b12c03a75c5485f72139319c307caea47f58e6626e5b450de5d1f45328099de85999256b90d72977789e14c45290ad
+DIST thunderbird-128.6.0esr-ga-IE.xpi 616367 BLAKE2B 64a6426046876c74375a443af2c8b59e01756a95343d16e5c1c08bcf5b999c9d2b301e91a9f1c8c3a221d2d7e41457761e735a92a45484b90b717e83825e8963 SHA512 4375d6cb7db6aa07acddc73610f791c069ecb88e39685b0443f4f2f5b1c759f68f503f052ac959608248a8b1fc939dcc851d2c3619a61b95c792401f457700cb
+DIST thunderbird-128.6.0esr-gd.xpi 729137 BLAKE2B 803cfc378293b448ad41f82af290708623c7920f65b86aff855e7e0e0783d2906db8a2005a2f83c688d283eefb9e85fa3c59306161790d4718cf40c5a9d6ab8e SHA512 878fef6be1be5e68f570a9845a62080c69cfd1ff7fe265f63806900e30bb72d0491300f7abf777e57c70e211c47ef55a4de5cb7beb2f30efd318264da139bfbf
+DIST thunderbird-128.6.0esr-gl.xpi 742174 BLAKE2B a4f66a7999dd4c94ff8d81fd0638f32d591941d7d922d2d2f8ef8160541833d748289db233b9032768f1f84cd41c3924c08ea6cc70530df983f1a7f3d2d29269 SHA512 ca1650451c1bc9815637201f4fe6f835d20ead6fd869dd65f1fc1740f40c5bd4770d18b9d33f1fe2bfbc6af1538a7feeff627a2daf39f7942b506c54f545980a
+DIST thunderbird-128.6.0esr-he.xpi 703445 BLAKE2B 691e73f8c75b5a3880320c164af4325b6cd9f4f3456067cddc51a094687f3f3b675c1bdeeaca81485bd90e1416bd22de4e116eee75b9a69f17d7e6346d8dcab2 SHA512 380cc758eb9ae27186e07d27ce38f875daf0a8cff17da511e984a8bd2d9b9f90cde973f574672d7b2845b38095e3beeaddeec2e9e907f7f36aee1e9b4d90f36c
+DIST thunderbird-128.6.0esr-hr.xpi 720117 BLAKE2B 3ad821fbb006242b1f8350f182121fbe80aa089c270c82f8e36107d3b58a787e5f654f1b3a6e9be1003f5640a427498003cdaaf58128169f510827f42e6a9f72 SHA512 e75c85d1428d3abf930764d703c2f36e4815a03c946c4d102672ce748015d8a3158f2d72d9d306aaa9b5767bc2b9be91afed3b2b1fd9a8e66cd149364654134f
+DIST thunderbird-128.6.0esr-hsb.xpi 787747 BLAKE2B c0be155089507c003fccd23333168137290cd18027f1d912f51b9be9bc49780442303170d91deadef2828d2ae5cc717003f5e116bfb4d65e8207e0ffcf43968d SHA512 d9e7b5aa7442d5b1f95fa06c379bcc23047836f191143b1c3b42d7ff76a5c89e493602bbccc0a3b5b30ae4abfa661581aeecea495d98ecbd6abf8247aca4167c
+DIST thunderbird-128.6.0esr-hu.xpi 790229 BLAKE2B da5b291250605f6ed4ab574f22c4f30c0ea7e9e110ecd8e581bd81a4117497bce7f3d88acc302a02ec99ab1248bdfcfc82fb93aeef3080a7e929d1c60e1b3f17 SHA512 de2972fa16663da66bc7ece9efd8d22a0625a35fe009d5c6ab60cc841fcd9cdb9afbe39c0fad6b8a2aab56ee36f221676768b6554800d8c728a39d4911276997
+DIST thunderbird-128.6.0esr-id.xpi 710323 BLAKE2B ed29d48c4e4fd40b302f71de3d72f5bedd0ca2df92fe3b5f49f38f4dd557cbf6144d638f4ca98aee47f1bf16bbd964e0b65387b9935ad11739db665b88031787 SHA512 455e198b66a91d033a29d7e61f8af887ae672a8064b771af944548001ec989de2d41a07edec7eb0acf4a3e8118567d14ec0be67570e3d40ab05c7ec25fcd9b98
+DIST thunderbird-128.6.0esr-is.xpi 751185 BLAKE2B 9814f174a21085819e25e96a45f37026ebb6b6e8675e2ca7fccf5895d0ccbb2a379d868d6538cdef089e29fc86a066d0a3a3f499c848f05d0c91892818682c21 SHA512 f602e41899166e92bf68001563a4817a5884b95899ce468f074907adb2e92d3dc76ff76a00f7580309744e05bb4518bdddd5c4ea506079daaa6329c014f815dd
+DIST thunderbird-128.6.0esr-it.xpi 697093 BLAKE2B b8398d2af10539f191a811b2920556637711e6455bcb1dc281fb9e7da840f46363f083cbab7a90c428c4b04bec0a76d42b7219445dae0b4a46e39a0f72f58dcd SHA512 937f1616f8a0dbb2c6c7dbba027efea7c7a452c9a2691b2d03ac114b1484bd8f51eebe5cc907f56779fb00d839d1b115e11de937fa6b0be434645656e9add71e
+DIST thunderbird-128.6.0esr-ja.xpi 817723 BLAKE2B 290f46202d0c1c739049b9f2335bd7817fe1120b88b66e4d86d5fcbe208c3c7e76984d9e92add20fbbaad9a014d7650cc0039c59df32ab8f5b43529f282ef8b7 SHA512 1ef79f1d840b887b7a0569f6d3c7e97eb2322616a727b477474fe669e4bc5e655b7bcf5acbea8be4894e7b2f0e33829d8181517fc4e551d12b7a44f9dc575fa2
+DIST thunderbird-128.6.0esr-ka.xpi 796713 BLAKE2B 36a4b12099b9abafee286179ed3cd5c96186ffc366b3822b1ce5df75606ce8062a5dc4649fd55b7658f053353fbd2b7bd863fa0d5eebf8524b4394d1a6434b8c SHA512 2058f912ad4dd964d661d031fb97e2f3c120188e3467da12dc21b89169f1525b4909dcf8b64b2804e6cbfb56cade85879a8666a98768b5b117e1b8ce073540ce
+DIST thunderbird-128.6.0esr-kab.xpi 735472 BLAKE2B e04f17eca5213be8b60da7ca75bf446e1878e50fb26f0453480808e6a59682219cd6431735c07fe6fc6ac06a754c0d687d14390d32e6fadb7193dad87b13ae02 SHA512 6f221da487dda45b2d8da905a545c60b98cd40788d32d73c7a2d752738b3b8ddd653ae05f2e8a6323a12dad5974584b8b4c73687eb6300c3daded50178006212
+DIST thunderbird-128.6.0esr-kk.xpi 865510 BLAKE2B ea80f0c5831df3850181eb72db6254b62f86714018d817d604706103aa1ae0617984bdc361295a33f4decaf38382245f4e1bc162e077c9f72d01308e6eb22cd9 SHA512 8ec4b88ed4fab840e0040e10fd8db1d4f332de956e970403b538cb7f2563b0a34737c7c1cfc6acf1f2653b259cb1b0631c8b88f2c64e217d618d3659116673cc
+DIST thunderbird-128.6.0esr-ko.xpi 762640 BLAKE2B 11a9acf63f72292d1ee08844d9a0d6d62c04229a253cb18d2469687be1d8af31bce1041e03f5c563aa8c49262d8bf8d2f84216bed29ceac283774e35bc3daddd SHA512 e747dcbcdae386164028a2454a8c4c45419f01d087794f75cdadc09a569e1aca88435f39951ad53ac7b000c3a1f5ce1e522670a94cd937ce8bc6723e0dd76f19
+DIST thunderbird-128.6.0esr-lt.xpi 701408 BLAKE2B c79670b1dff56429825d7bbf50519a6f539923c4e5b17f5ef2edad2c0c3dfc9a48b9d07eed69b52d73ea4aef6c60bf04fcbdbf0855c16a90a6aee920a033d2ae SHA512 78d990650323399c975e41f2fd8f3b7449d34c64ecb93f1c0ae9fe290a1610a354278ca8952ed4e380507a6637203cd24c67d36a9241f7fac811dd170a0cf9b4
+DIST thunderbird-128.6.0esr-lv.xpi 625979 BLAKE2B b6e83c16e4e1daf417ba1dc14c9ce098f9f9ccb82f46fd1c708bcbd4e6e1388809d192364fba3be1c779a2aa947299ac1be2328254c6f83bf270a130c3bf3d3c SHA512 31e3a42b02084293e4728a659abd94ccfc17e97f11cebfa1a52f4a6b0220132ff8e562a16ebb2ba9643c5e358427f37479f6a1e09e0414bb236b65242ff0c7d2
+DIST thunderbird-128.6.0esr-ms.xpi 581572 BLAKE2B 7ec201f640f936ca5ceff810014cc647f4ee59cd137e8ddb300822091998aba85f4332a967eeaca80245e4d10646cbff51b506be8eb6b6daf4d98e73261dc72a SHA512 876e48c0c68cd7f8fe5a001f44a507fcd64288944bfe9c7c84d1103c44303f57b34fade9ed17da73514a724fd203ac8438af3a61c551cfbb324811b4dde5e4fa
+DIST thunderbird-128.6.0esr-nb-NO.xpi 708559 BLAKE2B 2d380eca9b21a6e71b8837ab3e66c6b390fde862a60ed7f70c05028ba2464a59e0e8a59b225ed9814819a06c711ad5342abcc80c4af8e7da956808c4dca3af5f SHA512 99d52606674fd115ba9f5699d797b7019c5e443d8273cf04a91e6f76ea4978606efa6ecfcaf7357c5b0c24a5d949a0ec0c44642ed71ef311f388c016d63eb862
+DIST thunderbird-128.6.0esr-nl.xpi 751613 BLAKE2B 5f01f7da5eb447da566a2c6b34430ef3320caa9dbb9987f500412e47ef15a3191962e3495be111eac38c4bedefae855fd4e101f3edaf4c1f82e6a2506e07601f SHA512 00369570b88f4387f11eaaea1ed0337143b4c2d252b0e5a6d0352c5165c9cbffea1b9580f82f5d6b402adfd1627b637caf107ed47c56e071d5377fa69ba56314
+DIST thunderbird-128.6.0esr-nn-NO.xpi 729656 BLAKE2B 3d255bd5c1179ea1026f12ca772fcf9519a891098eebaada3e9bed1a86c3fbded912e1b554998dc5a405be98347dbef03fb6c4d02bc13acd4ce973e47882e1da SHA512 e98c72b7e11d520f81a60f3115d23cb06812dd5fcf65e61087338459b5d79180b8136b3bb0ff0fa1aef8483e686839bc358c0d9bbce58339387be57c03de68a2
+DIST thunderbird-128.6.0esr-pa-IN.xpi 688137 BLAKE2B b7cbff1b6239564419616ada453c632e9b4c80a4053f86605d472493be0bb4dba5ebbbaf51289835b187a598a64518c90363b394015a7b6f9f460c336925567d SHA512 929f478206ceb94b6a27f7a53738a43e844f200a5ef6e061c3170710a2b5b4bfb12e9106e0306c5f5c3b4bd6d857d6fc3280cd45b019397b9aca290e3af01131
+DIST thunderbird-128.6.0esr-pl.xpi 770778 BLAKE2B 8fdf8b0101e3b73e34a821f4fec508da4f915c0aa96ec91020ed14f5f9fdd3c3f5e19bfddbeae4a831280a3dcd0ff4597c8b843d99cf926d35427d95c27fa11b SHA512 26a2d2cdd1bd21d7e15348849ad95a4f33bf317ac31d8c76b447e4998e0e187a1f87e54eeb5654758054a2b2f5aa89eb3d409de4239447d3167838ef69395d4a
+DIST thunderbird-128.6.0esr-pt-BR.xpi 758843 BLAKE2B 054860421a300456ed5436f31add056cdecd7153ab453dd6c5c6dbd5da8d85d34197c4ddb1cd56fe880b3912cf32bde45c87f1883c3c9f567e9485c86f8d8e33 SHA512 6bf1231fb8c18082d296a9dc9a612047c2f615a6cf47228b64d3d7eb131fc3f60eeb74d5f47c3313d8d19d979c13ae28ba196398a48f38de1a4470b9ee1075b4
+DIST thunderbird-128.6.0esr-pt-PT.xpi 752023 BLAKE2B 2d49880e82a8627f9a3ba311970c2b266071668024886dc6f0a34cff218bd4aef184398e962d93bd59e359da35b259c24e7d4e2f2df042dde5257e1aa392451a SHA512 399a966c6c0151826d9b55d517507d2c039bed846b288621339e416f3f86cd700e86b55c3edd4dc15412fe2aebd5bf7064e6217b30bfb7f63a19e78297ce9459
+DIST thunderbird-128.6.0esr-rm.xpi 754441 BLAKE2B 1747b723e17d56b9418aa070d19e6afa8b67d22188bd77972d0ea08fb4bcd089c7bcd6da572136d15aac1b9b2c9ce498bd5b96d78a3fd208d222b534811387b3 SHA512 767ba60cede87c497823cd75debc73dde92b6185cf1641e9755ccf6a31e1396ecab99d7b35b25eed3e3c25660bced9ef05b3ee3b2a383f42b29e4ddfeb4a9357
+DIST thunderbird-128.6.0esr-ro.xpi 670225 BLAKE2B e00d61a68be5d70eac9958026d4636427eab5cdc17d5525f21beb3d72fa4901cd6a3de16da2ed2dcf8fd47b1f06ea6f9703e01a1ce76c2b92accb29ddc1c4b87 SHA512 304993ef19990310b9cea9f1edbd0bf26bc40de36b29a0cbfc0bf34e5ccfac9345e63fadf1f98d6534a7d1fa66d89d2a1157eb2cfde18643d3432d421b02108e
+DIST thunderbird-128.6.0esr-ru.xpi 880794 BLAKE2B 6230944633c584a6d5996a6f44b0af1df179921bf023f2828e4f690e835f6bfc8a005edfa9a2115b13aeb855de92a93a0e5789653d5e2ca91b78006cd70b7d27 SHA512 004a59985a3b68da9b5b57e5d67f84e4af231d9d79cf09a9b266e926634c098743877ba4496bcbba831929331fad41690dbe2ffad5335746f2863d98c908b464
+DIST thunderbird-128.6.0esr-sk.xpi 792218 BLAKE2B ad6413e15cdb86122458566a4912f5169ea3d3346f498d29a63c887db336a1e028ec25d8a68cbbcdd70380c9329e42721d72052380d7e44910c5b287afe1ec13 SHA512 f809469dab44d024d6fee4c094f7682ce875bc53e45a1441d9656df2691931fa2a8fc599fc14986295cd983062e1455485ce4e0259c46231d34296afe833d268
+DIST thunderbird-128.6.0esr-sl.xpi 751646 BLAKE2B 761b4950ba7ea9a23fa93edf7e192471b99ead7cf0477f930dd7f7d3aa54e0287311aac2e7ba67ff92087680115d3deaa3231807dee7846c44d9d9b65e2a5f42 SHA512 9daa2f3460586204f33ecd64a30482aaa5fb31f0d6a9e53a44aa361bfd1ff802363ea0c5109a089086e8978fe16fcbc8642494a36e294e7c1cef4562118f020e
+DIST thunderbird-128.6.0esr-sq.xpi 774995 BLAKE2B 9038ec651e5048352747ccf3abe5a84354c9fc85b009de3d25e75325f0866ff8881170e933954bd5ad4e8e4e527c2cd6346ca229b5f5c82054332c027204ba5a SHA512 75cb0917997d6eec80560ce0ff45d620061586e5740ad4b8b8b7e4196410f9fb1542f95e8bc40ee7d9c8aa741d909c0088f5338df66c1087431982237d2576c6
+DIST thunderbird-128.6.0esr-sr.xpi 771751 BLAKE2B f147bbff81508fab41a398430879b864bd335db873e8a4b24272913d461de0e4508c583194ba9e970a8e82f685166c40d8ebbd31953c1d94dfe46f07ad5039b5 SHA512 482ddf1d352e2851387de67afe5fa1cf32253d7f0034a61eca799cb4a863dda192b0d70a31e91abdc1245d7e627a676793c2abb0e1dc92f72bd9c0f790201dd9
+DIST thunderbird-128.6.0esr-sv-SE.xpi 754937 BLAKE2B 913bbfa7ec2208053f363d6ced46914107d6e2afe1eab16b1719719fb565af43baa5ad7b3adf860ebce8a5b9ac9c13d7f965ca9375555cfbee9b3c83a7c74e4e SHA512 de455beba43db7aa97dedb9e4b8aeacaf4359a88083df250055d08ceb5e93e30d8f306aa3c7c9283124c8876040a2d0de184eafdd430dcc94f0ef36de7ae08f4
+DIST thunderbird-128.6.0esr-th.xpi 819690 BLAKE2B d5d561d777cb45f583b24eb72a8ad628281055cffb1fcb6204b29dbee5adb0017f51b44f0dcc7d81a805bc9ab8f0f10f8b2b1e9c7b41aa595c78974f228cdfb7 SHA512 1b1e83f1a35a1bcb2e3ad084c922b89d5bf2ab90827eadb315e60d5868dec0fe93b26951a36ca2301083f7878d51c12449abb6292888735a99cf5b20861fb01e
+DIST thunderbird-128.6.0esr-tr.xpi 765547 BLAKE2B bc5772e4e32eb5b5dfdcd8e5b1158d446145a13c822c1fcd453d475a7d4f732d80be17d9ae88e55cbd70723115dbe7cb3dee4f6496295049b1a8f93cfbdf6176 SHA512 92366cf98ed85f114aed2489e3a4d92d6d51949c24c73b0928c3b964edc33134be09e83daa697ab91285c7a46b6f9c8a299eb1545edbdb182bb084fcf753d4be
+DIST thunderbird-128.6.0esr-uk.xpi 871375 BLAKE2B a06e5f41409af4f6c3a62011e54c065d73e4819880d77d4d552d307da1bf8d6dd42314fad2d85917a705f03ea9d8281a76ad4ec06792e71c80a7fb19fa16d9bf SHA512 39e0b2819efe5b7716ce986e9ee362d2d367089f138836aac70b11a4e47ca3043e411e1fa7b7ffa5ba9c85a7422206bd765e43e884b729cf8115beefaec72e87
+DIST thunderbird-128.6.0esr-uz.xpi 592619 BLAKE2B 66ccc9ed026eef75e1b14cb5948a2999d4dc77fb428f9624970d2ffdbb2b8cc4cad6a3b95c5649d745f6ac61363650f996fd43f4c60fae38a443c2752e815333 SHA512 e44844d875378e9b325918fa56470921e782950515f467dd366d20fc6dfa05284e68b60e72bea0c6e0e92b776fd43f07090a63bfbf2a20e0a956bb048ea302aa
+DIST thunderbird-128.6.0esr-vi.xpi 794032 BLAKE2B ea5a6ceff2a399cbc0331fdbe8ad401f0d581f036a6cc9c2f274fcd885c85e2f61654d58e5a6cef361d912eae2b8642ffbb809c51cec9604eed1adf2e931fce4 SHA512 1d4954a691c24b8a097c111c87ef476fcb03ee38eb35429c1b77ffe7732fe24c136f20a8f6d707476471a640a05e3099e8156d2b2ab6c07ee0af5f9fa6d24f89
+DIST thunderbird-128.6.0esr-zh-CN.xpi 794061 BLAKE2B 35c330a426b5c6e39a6257ebdf0f3382b80d73867792663089e5da3fa69309141b0783ba09ba90b1e9ddbced6774637a29a658d1ade289f65801ea73cb78dece SHA512 4448164c809d52efe1e5406117be01bd582fd75c08a59af5f54bdaf885e86e1753ecd69bf910396c70e6f7f6cc9c201bea65201dd99c55942f59bb8fe3926374
+DIST thunderbird-128.6.0esr-zh-TW.xpi 797334 BLAKE2B 517c72d488ae48839959083bc29b19b966bb3c91982f926ed73f2693309677476336650afa63a6c9f8bb1c8e4e335dbd7626d71b826d961a370af851519649db SHA512 6171c002769eb847d96a693440bba6f7246f033357dc22da93858a1a70833aacb28eed95e21592f49652221895fa1ecbefb91d0e24f29ce01d0fe216fdd5fcea
 DIST thunderbird-bin_i686-128.5.2.tar.bz2 89649213 BLAKE2B 066c00f9936563d242cf712ae2f65c4998c585c7cb22f790333d26b460711cae71c9810315eb06703b6246061febf43c583ddf6184537b53b7efbd4582e12b7f SHA512 d7c7cab01b910b221faba14d14fe21302f5bac637149996e18407fc8901b6f84ba71778d3f60f8aa0bcba7f85c226cb1a979aabe092c4cb097a4f883087906f6
+DIST thunderbird-bin_i686-128.6.0.tar.bz2 89815876 BLAKE2B db6150164967f23b5fb8b0f915be3d1c3cef6f2e48eeafeda5450209e903b5eef740f82ffcabc2c8a4a32d45e455d45ee57cede319907da0f4d3d32834cfa5c3 SHA512 27c9995e7f91558edcb799319147b61ef9d41d172256c7a42e6cf2bfcb853f4b35cff38e8dd4a1a33cb3b7b07469cbef11ef9bddc237b51c804e49568819c33c
 DIST thunderbird-bin_x86_64-128.5.2.tar.bz2 87290964 BLAKE2B 8581600ed080dc3265d17a83ef12ee409d94156d0623c3208d5b81152b825931e053f9dd00b12fbec117d74345264ace2f01779c03fb8ca171b0caf8c81eec01 SHA512 41ad745beef03d804d5049243768b20a555380117016d3c88a2779a41f383958c0aca4ca1898a5e5ee324ae860ac2c77956e226be0ba76b5e11c33f82ad16dfd
+DIST thunderbird-bin_x86_64-128.6.0.tar.bz2 87385398 BLAKE2B 9f037c9e90169cb57348da42606946c6f5478c25b4766ae6e7e6b67bafe9d1aff8b323f2af45acb3bc476e72d7b25b106730fac4f160dedea0be077f4a885c32 SHA512 a2d861b070f7d525c514f7196a3a79272bb0e3d453d482eccd9cfcec33d5394074a62a89cb5f5212e2b24b93cd6c389e8c0235a8fd1d31127a8ca1744c82a2ef
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-128.6.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-128.6.0.ebuild
new file mode 100644
index 000000000000..d4d0d9c94582
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-128.6.0.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop optfeature pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}esr"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}esr.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}esr.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.thunderbird.net/"
+
+KEYWORDS="-* amd64 ~x86"
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="${DEPEND}
+	|| (
+		media-libs/libpulse
+		media-sound/apulse
+	)
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	>=dev-libs/glib-2.26:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.11:3[X,wayland?]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libxcb
+	>=x11-libs/pango-1.22.0
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES es-MX et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}esr-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs-r1.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/chrome/icons/default"
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^} (bin)"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Add apulse support through our wrapper shell launcher, patchelf-method broken since 119.0.
+	# See bgo#916230, bgo#941873
+	local apulselib=
+	if has_version -r media-sound/apulse[-sdk] ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		ewarn "media-sound/apulse with -sdk use flag detected!"
+		ewarn "Thunderbird-bin will be installed with a wrapper, that attempts to load"
+		ewarn "apulse instead of pipewire/pulseadio. This may lead to sound issues."
+		ewarn "Please either enable sdk use flag for apulse, or remove apulse"
+		ewarn "completely and re-install thunderbird-bin to utilize pipewire/pulseaudio instead."
+	fi
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${EPREFIX}${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+	optfeature "ffmpeg-based audio/video codec support, required for HTML5 video rendering" media-video/ffmpeg
+	optfeature "encrypted chat support" net-libs/libotr
+	optfeature "desktop notifications" x11-libs/libnotify
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 03cdd7b0a435..8f93dd5cae91 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,4 +1,5 @@
 DIST firefox-128esr-patches-07.tar.xz 18856 BLAKE2B 44d0ddf11518c7eef0a96de4f475a6ae1535e43e5bf89b8f61dc95330f28d6a053d08e6a183cf71432107256c83cd6ee6f742b235ca82babe4dd83698bf80d07 SHA512 60b4f18f5d91fc25f86cceccd561b55f167299908fbf2f9d7d69a8ce299c643f0b538d613d4348e42dd17c3812e4fa315e15004614af1f40fbe2adda417a1a81
+DIST firefox-128esr-patches-08.tar.xz 17564 BLAKE2B d904b74fdae2e76866ded11de5377a7b6883d35996b358ae3419ffb7da53b04b2c7d4bb10d48998a8318a84e8221de39955289cb33a8f278c131b4af2006be62 SHA512 344a2d04dec679cd8ed714dcecc9dd5b56696803cee9267e7c0c45c439d78728e7eae674bb5f0a64f2e5802dc59c1ec25f1703885024d88bda8a02e2b3e0d69e
 DIST thunderbird-128.5.0esr-af.xpi 530351 BLAKE2B 9acc5f6ff8550ea7e8ec4b66eb2d8b1fa5e03a6b1d57284ccc660f0b644ae57b100810a5323a7095e8cb715f7a2658cb6b699bfb78fc0277c0c34b4e547a710d SHA512 53dc9a9acf7eb2690f4c87f9845cdca3ffea5ba0e7fb4322048fd28a819d6dc7aa22be8eb7f2da069535e9c44873f3141176195e86c03ca2673ea886f53ed9a7
 DIST thunderbird-128.5.0esr-ar.xpi 686986 BLAKE2B 0bcff3b9818f9fda817411e6dfd991bc1e7cabf51e0796c83cf2b56855f26954089fff42ef9eb9435e88f01ab75295b0e49c03b3c7cff10bf1ec634d5108de31 SHA512 495b539e3458da7e643d210d6d4171bd9b2eacf1aa1ea7a65a7ce3b9edee503e71f5955bb44d0721b75e9ef54f87ca72375820d19542912f147dec75fd313094
 DIST thunderbird-128.5.0esr-ast.xpi 561056 BLAKE2B fb337bc98db615a407b23ba82cdf72413fbb4267c40791fa15e0e3742fedb44730ab93c7b69cba76c8fdbe0b4217fd7a7f88b54f0d5b7591d2b548ece9b15c78 SHA512 b9795142448137f46823d6468a31bc2c8527657bb8ab51eeacdb87d4edb9d24795fa5e4c6b0de3c46c21284399f9abe05271900f019317af937cec1addeeeb64
@@ -194,3 +195,68 @@ DIST thunderbird-128.5.2esr-vi.xpi 794034 BLAKE2B ae0d1b8b7c780e421bc567d8ad3597
 DIST thunderbird-128.5.2esr-zh-CN.xpi 794062 BLAKE2B 7690a4514b2ffb7fcf2fc1d26b149ffc7f82d9b7ebe97c6e144f6ac684b2a3e08f00044a3237233e0d17db44dfd58d4859efcd93101f16954bc0027c9700f175 SHA512 fa77d6463508e0da35852625072326ee95d2bb66cc8a184c99187c7facc05a642b3097c6a03ba19e10a793c5f4bad51c6fd7adb3c44ccb96cbb06adbcc625f4a
 DIST thunderbird-128.5.2esr-zh-TW.xpi 797336 BLAKE2B 78b896488e71b1db7990409fe178ec2309d050a7c1b20c9b1e8276fcfd893c59ea4cb77b9241198e54e0d3f34aee8de53c540f2ec9a75cc1112d0f24a203ff3d SHA512 fb6e0c3cfe49494d678252b7d0eb8ef6d19a85502979c3c6965da76cae2c1f8dc1aafa0df1a15c39c9a26f0ecb4a335acdf4d6539a2ed0b35a625eda84994f62
 DIST thunderbird-128.5.2esr.source.tar.xz 674696420 BLAKE2B 3dea8ca8a7eb1e155e50a3a476d8b448c2e810eb347731efd078e15227073fb31c43eb8456678df21d834702085f3470248c51929fe01ed8c02735aa64364739 SHA512 cbfd4b1a7245c2a2f6ef9b2cf69d95a8095eba855755d00fd397351b21ad504733084d6f41801f4114be7015332b8db65e5290bec45f5321efc753412b9acecc
+DIST thunderbird-128.6.0esr-af.xpi 530348 BLAKE2B c291336a6e9eb40b1b8a3f2e64406147afadf8da89c4b479c5030af834899790eb33825338e779691cbd3182825067d49b195ce5b89ba473fd73cf84ce25f1f0 SHA512 b8d4efe5a31aaaf8d1fda0fad64e92014fd9c989a3335af79947d4cba9f49f8c243723ba71494f092c03b14a3df4b51c9e6ecaedf0fc0439df3f4dd870fd6cd0
+DIST thunderbird-128.6.0esr-ar.xpi 686983 BLAKE2B a3c3474888b6a5e0600e11412fe9bedd7992789c730baabfc4043be47c971a46e9e3b8d7b6140f89daf38b7ebd1ee83e3a71c52abb55570702c0c8f99dd42c71 SHA512 cd7d41f5267cbdc6e0c7a397c8340c06cce3a213e6abb63b06e5bdaedf9dcddbbc653691cc1086ba63f45d5b3bea8dbc4e845292c5a5bffc4d40d8c7c735fbae
+DIST thunderbird-128.6.0esr-ast.xpi 561052 BLAKE2B e0a15a2cc6e271182a124261b5bbe394856d8d9547ab23f780cf1dfdbf03e99f02948586b966205dc60bcd71127eaff1a8e65c12c49a530a669b2ec211de9295 SHA512 c57ec7f29b3ff3eff8e94d56be6292cde5edef45e951ae2cb702c54ff9e48d2cff5a3e5dbd8203bc2f6e315ec2cf1050068c0c3b7f642c2ff72dd2d6c49d4e19
+DIST thunderbird-128.6.0esr-be.xpi 772988 BLAKE2B 86cbe59197929b30c6dbe7e359e67d262adb39d0b63b9d7ed8e228e85034c231080ca9a3ce3dd8d00d9f7cef4981c3fdb1e3753d9f2808b1b83cf3e0114a1cde SHA512 2105943491510503cd72a6278c60a6c99c9a70352a1698f07e81e7b618a6d5e77e0c1918c26c582e5538429707dfaade269ed1fa8df6de954d1f59432362ad5c
+DIST thunderbird-128.6.0esr-bg.xpi 812322 BLAKE2B 682041133e3a33c1b517e8846031a9d5c16e4e5d457210bc50aa3d454df319841cebb39bc3582e3281699e7a952876af881d2b07eaaa717f5c1671787b8f9848 SHA512 5765cec6046cae25a11517582b3a254a0e1d0bbcc7fe1ab34cf48b865b34584e598b8548ccc92ae5082c9c411f6ee096a4c758deebb619f1261e66c74c35cf52
+DIST thunderbird-128.6.0esr-br.xpi 655125 BLAKE2B 906f6fe6c588e3be0d8103db89910b47e248ae1c2c8026feaedbd0b94936da456bafb247b4cb7a615abf8934dea7e85639bd0e31b9b3edcc19d87e5ee0a6cc1c SHA512 8227bc3393dfcf8f55f4cd861c64333ee9b75e265b13ed867c4d8eef70c8d92ee8e7408655deb3dc16d54771ea382328ea8004c2a73c7cbe18a723ae533210db
+DIST thunderbird-128.6.0esr-ca.xpi 711075 BLAKE2B 3ede15dd28ebfa6324faea3c7dba21e37a604e5d4de5f4b940b1e583ec37ce7ed1246b84f3480d0720b2478a700560a1aa2331daf1ed0f1a8560420b6e8e2c20 SHA512 967d2f507303d1271845abb2d4ab7c558c6a1b9d9cdb647d59f9e40e922bc6c22203970c6b512a447ee6d494c13cc4af0198c9a863bb205e1edd485e98a4742d
+DIST thunderbird-128.6.0esr-cak.xpi 672193 BLAKE2B 5407232e5309171c30306bc8a191dafccf6ea5dc4e0334e78703c03c169bd0328069aadbfee31d53f8d7169f210dba4b55c95b4afcb1705de83ea09ff9f35a94 SHA512 c33f22f1313c4ba104babe4bd162ff9d8483b71f2eab2912888e2a1dc65042fa8ee890749a82a570c9605efaa1d6bb874b2fee6daef1941a36fe491edd02c73d
+DIST thunderbird-128.6.0esr-cs.xpi 791606 BLAKE2B 0f752dcaf1a9cd1010bf79f10638ea65186660c05b1985aceb97bffe700d6bd166571563fbeb8d2933cf998dacf2b3053b931a49e36e8295afe1a5a913ff2639 SHA512 0d5bd9a69f6314b67745775c58ec8653c2369a5cfd7306af8395d8792230247e518abef5d1859378e52609e963dc645e934bf6b18c3abae4836014792382ba37
+DIST thunderbird-128.6.0esr-cy.xpi 756814 BLAKE2B 8202561c2f83b73d6f73103b3ca759f740be0e4e4dfc8e4e73a59537db26bee7570c54db587876ffee76718c94f5a6ff97c25c80347b4352c6c8b9b0f94626d0 SHA512 315c9a888ce877879a1080c19520315eb7be2b5cf8c0d30f9cc49c382ed97a90bb94caa19d607ebe96d7f97b43f656723346ad3580fe110510fdaae455aa9d5e
+DIST thunderbird-128.6.0esr-da.xpi 740055 BLAKE2B 4ce399c01054949cb0a695f4387d155d7de9e5213d09c71ae5ecc838445c95bddd79b7a564ee2be3ca5c3be2859406d248decc0136ee45148c9b5193b4550221 SHA512 c2871fe936a23fac5f7b876d41dd0500de6359a145d8a4ff11edbd25041623960172af552632b2501a165b1aebc4edf4b88eaffbab70dff2b5e1a9fbcc3d9c75
+DIST thunderbird-128.6.0esr-de.xpi 772205 BLAKE2B 69d3eafdd716b01eeaf71d349e90e354125ed1447519598201bf7437cfa3bd293db1308f65ec5e6c41d1a4b7fc8e4f609325c46af0b46b8207bee827ef0b3318 SHA512 b1a051755bf2b3918386e2b65ce3e43f3b504024d1916510c8a71ff5068e933b0c729c4b1e823d4ab8aa0509e2e187446b5dfca1d6d315e7dfba92df364919d3
+DIST thunderbird-128.6.0esr-dsb.xpi 790366 BLAKE2B cde948d8738ec82efb0a64c3ea30888985424fdadf2a3a4fe2c51035cb033b545e63b78c18238f00bc3fd1e0e2bda541d8643c9b7fc98ad090c2b4b083d300f0 SHA512 d0740b71e3c381f740ef7bb1a4f3fd84ac3dc030b5119b58db5f008fd82f3159f1b19e48f92ed32b599052ab0f8f49a0523d74dc371ed888d76bcd80b208f8d3
+DIST thunderbird-128.6.0esr-el.xpi 895919 BLAKE2B 35ab6d658b40c485be55da4f6f573a28e35425a2c5ef3b48547df41f2902024b7e4c2c1bc2e4dddce110cc2388408c719da1d6820d82d3d5e3343a9638f8a3a7 SHA512 2a119aed7b83de6a2ac7341d00cfe2889bde0ccc6a74b2b25fa8e3542238c13111a31daec13390090af6bcf76fe1baded0065c040a83e6a5dccc5f390e3b798d
+DIST thunderbird-128.6.0esr-en-CA.xpi 705212 BLAKE2B 469e87f31eeb362c0862e07c605ff65037582fbd8436e0fec16ee9357631775066eb09c9527ddc88a754de91d5b170af7a45750bf852a5a6c862fbafd22348d8 SHA512 fb0c861a9f5dc2e2d59dd48c42fd500e37f625dc232cbd5d3e6a23ee0d5cd530c96484436f52ea9f7532b71fafc9c6811d36a7a2f89cca407bc1d4a4b8d86314
+DIST thunderbird-128.6.0esr-en-GB.xpi 709686 BLAKE2B a76b720e9713b146d20814f59247ee86f6e1804495aed6a2683715d48697c5999279b729a289e7caa7d9b23f3ae9d4f4239c118657111f777632c8b2e23b5130 SHA512 400383b2d1808bceec7c3b8a1cfc4fc4c56ec49341145d9a9def64b6f55f99311efe56cefa09fe037d78ed04b355141abc66e0ef048348f614a00efd02e849de
+DIST thunderbird-128.6.0esr-es-AR.xpi 765753 BLAKE2B 9d45331b8dada5cf0d152de94e353b24626ed1e90808d9f81ae620ac97f369ac6643683437721df2721febbe1b05c337812dfca9d0d9c7739e6e175ce1776491 SHA512 963c88d801fb1092a4cca94be64ffb8f467b9dd3fafb3395c7b25bbc377fc9186df086502f25f621f2c43f26ead345234d9553cba5e29e2eb1c332427c4fbde6
+DIST thunderbird-128.6.0esr-es-ES.xpi 733783 BLAKE2B ea67a4d36e8b51a47edc15defc62e598b0497a52dc5a20419ddcbe44ac41a3e8337eef6030e301bcd6a1a3bf4f65d4c21ff3718017855e1616545c18426b5b2a SHA512 6bf64be7c04df40c531682b03f282856f020bc7910ef3a1a4b01e83159506f6afa4085fbba1d5af2c92ded46efb5f36ddbd4fa9ddc4c6da140eaf52af220ca8a
+DIST thunderbird-128.6.0esr-es-MX.xpi 749781 BLAKE2B 4c7fffe3db1a9bc4ee3092474024e8fdf754769601768c5d2d2cac2dc24b4fc1bcfa68d5948adaff0e80dbd18d86ed23a85f9c9eb440b5fe840e81ff4e2f6802 SHA512 70b3104f5c44973d12ca155f155989c944df23f9c2d9d637561a4aebb19db244426ea982b1dda4b58dcdf0c69e575e75b3ad4f451c1203a251622155ae6d7e12
+DIST thunderbird-128.6.0esr-et.xpi 696771 BLAKE2B 212c18f86b802ecd4305e143148746c868f7269a2e23ed3fe407f38fbc8c6c3c0966e29a327a49431a83b8f5de20bb5711c5c70d4ab73875e131631f94c530d7 SHA512 50ecf804139e5fee2b92dc1bfdecf676d0cd3d3ad74cf9a49f23233e4211d8d5dc562911a87080db76d5ec8f3213d626793394220d94d0646567b1c91f135ddd
+DIST thunderbird-128.6.0esr-eu.xpi 740303 BLAKE2B 8d38a900abf02c3b3c9c288d12569cdf638a78c413a2314e473b399ff4aa93f65b3cd47096cee1285241756de8ae3b65ae1848f2c5a1723d6fa8f745fe600c1a SHA512 3eff3d9ae78f416f2292cce32a82ccb1e54ec32c04efc0deeb2fc1bf9d7e0e2aace59607f0275a57e4081748dbb93af50fe345c13e8dec22a6d0d3ca94116e2f
+DIST thunderbird-128.6.0esr-fi.xpi 738929 BLAKE2B ca5110469fb6cff237bdd87757610453043d776cbdd5f80c2b575eda5b336b93230263df199df097334f733498c8ffa15c5f89d1faee7a277fb89bd10eb6751c SHA512 3cee622136e2165184ee7cb43e453483c95d617afba19b49fdd25d15d6050ee7bede17b6b6911333b82a30f07f55ebf49b3c8d265a803484af6fbae111bfb799
+DIST thunderbird-128.6.0esr-fr.xpi 777362 BLAKE2B 93d577d3980bf35406e82db368cab3b58bd5f0d8b527059f1f536bd78fe6374b6ca31c586ba1b4082fe3e775810a28566bd3a7e8c0c79b94970934be0639f7cb SHA512 a29311c5849c371402607a92cab485394b648bab8c753f619a1c68505f50799603c533da42cde4c2a4c208cbf33e9b5596093033d0d665c84112ed7e0b525be1
+DIST thunderbird-128.6.0esr-fy-NL.xpi 759927 BLAKE2B 24d6b2550e335a461976a6536c453f45c01c8486f4196e720e3e0f66501ae9c55fd97529249a86d981e661c8c76d0bfe7819270b07d80e503ed105604b22ec7a SHA512 73904123c62bc4669aa4a4b54059d3da74b12c03a75c5485f72139319c307caea47f58e6626e5b450de5d1f45328099de85999256b90d72977789e14c45290ad
+DIST thunderbird-128.6.0esr-ga-IE.xpi 616367 BLAKE2B 64a6426046876c74375a443af2c8b59e01756a95343d16e5c1c08bcf5b999c9d2b301e91a9f1c8c3a221d2d7e41457761e735a92a45484b90b717e83825e8963 SHA512 4375d6cb7db6aa07acddc73610f791c069ecb88e39685b0443f4f2f5b1c759f68f503f052ac959608248a8b1fc939dcc851d2c3619a61b95c792401f457700cb
+DIST thunderbird-128.6.0esr-gd.xpi 729137 BLAKE2B 803cfc378293b448ad41f82af290708623c7920f65b86aff855e7e0e0783d2906db8a2005a2f83c688d283eefb9e85fa3c59306161790d4718cf40c5a9d6ab8e SHA512 878fef6be1be5e68f570a9845a62080c69cfd1ff7fe265f63806900e30bb72d0491300f7abf777e57c70e211c47ef55a4de5cb7beb2f30efd318264da139bfbf
+DIST thunderbird-128.6.0esr-gl.xpi 742174 BLAKE2B a4f66a7999dd4c94ff8d81fd0638f32d591941d7d922d2d2f8ef8160541833d748289db233b9032768f1f84cd41c3924c08ea6cc70530df983f1a7f3d2d29269 SHA512 ca1650451c1bc9815637201f4fe6f835d20ead6fd869dd65f1fc1740f40c5bd4770d18b9d33f1fe2bfbc6af1538a7feeff627a2daf39f7942b506c54f545980a
+DIST thunderbird-128.6.0esr-he.xpi 703445 BLAKE2B 691e73f8c75b5a3880320c164af4325b6cd9f4f3456067cddc51a094687f3f3b675c1bdeeaca81485bd90e1416bd22de4e116eee75b9a69f17d7e6346d8dcab2 SHA512 380cc758eb9ae27186e07d27ce38f875daf0a8cff17da511e984a8bd2d9b9f90cde973f574672d7b2845b38095e3beeaddeec2e9e907f7f36aee1e9b4d90f36c
+DIST thunderbird-128.6.0esr-hr.xpi 720117 BLAKE2B 3ad821fbb006242b1f8350f182121fbe80aa089c270c82f8e36107d3b58a787e5f654f1b3a6e9be1003f5640a427498003cdaaf58128169f510827f42e6a9f72 SHA512 e75c85d1428d3abf930764d703c2f36e4815a03c946c4d102672ce748015d8a3158f2d72d9d306aaa9b5767bc2b9be91afed3b2b1fd9a8e66cd149364654134f
+DIST thunderbird-128.6.0esr-hsb.xpi 787747 BLAKE2B c0be155089507c003fccd23333168137290cd18027f1d912f51b9be9bc49780442303170d91deadef2828d2ae5cc717003f5e116bfb4d65e8207e0ffcf43968d SHA512 d9e7b5aa7442d5b1f95fa06c379bcc23047836f191143b1c3b42d7ff76a5c89e493602bbccc0a3b5b30ae4abfa661581aeecea495d98ecbd6abf8247aca4167c
+DIST thunderbird-128.6.0esr-hu.xpi 790229 BLAKE2B da5b291250605f6ed4ab574f22c4f30c0ea7e9e110ecd8e581bd81a4117497bce7f3d88acc302a02ec99ab1248bdfcfc82fb93aeef3080a7e929d1c60e1b3f17 SHA512 de2972fa16663da66bc7ece9efd8d22a0625a35fe009d5c6ab60cc841fcd9cdb9afbe39c0fad6b8a2aab56ee36f221676768b6554800d8c728a39d4911276997
+DIST thunderbird-128.6.0esr-id.xpi 710323 BLAKE2B ed29d48c4e4fd40b302f71de3d72f5bedd0ca2df92fe3b5f49f38f4dd557cbf6144d638f4ca98aee47f1bf16bbd964e0b65387b9935ad11739db665b88031787 SHA512 455e198b66a91d033a29d7e61f8af887ae672a8064b771af944548001ec989de2d41a07edec7eb0acf4a3e8118567d14ec0be67570e3d40ab05c7ec25fcd9b98
+DIST thunderbird-128.6.0esr-is.xpi 751185 BLAKE2B 9814f174a21085819e25e96a45f37026ebb6b6e8675e2ca7fccf5895d0ccbb2a379d868d6538cdef089e29fc86a066d0a3a3f499c848f05d0c91892818682c21 SHA512 f602e41899166e92bf68001563a4817a5884b95899ce468f074907adb2e92d3dc76ff76a00f7580309744e05bb4518bdddd5c4ea506079daaa6329c014f815dd
+DIST thunderbird-128.6.0esr-it.xpi 697093 BLAKE2B b8398d2af10539f191a811b2920556637711e6455bcb1dc281fb9e7da840f46363f083cbab7a90c428c4b04bec0a76d42b7219445dae0b4a46e39a0f72f58dcd SHA512 937f1616f8a0dbb2c6c7dbba027efea7c7a452c9a2691b2d03ac114b1484bd8f51eebe5cc907f56779fb00d839d1b115e11de937fa6b0be434645656e9add71e
+DIST thunderbird-128.6.0esr-ja.xpi 817723 BLAKE2B 290f46202d0c1c739049b9f2335bd7817fe1120b88b66e4d86d5fcbe208c3c7e76984d9e92add20fbbaad9a014d7650cc0039c59df32ab8f5b43529f282ef8b7 SHA512 1ef79f1d840b887b7a0569f6d3c7e97eb2322616a727b477474fe669e4bc5e655b7bcf5acbea8be4894e7b2f0e33829d8181517fc4e551d12b7a44f9dc575fa2
+DIST thunderbird-128.6.0esr-ka.xpi 796713 BLAKE2B 36a4b12099b9abafee286179ed3cd5c96186ffc366b3822b1ce5df75606ce8062a5dc4649fd55b7658f053353fbd2b7bd863fa0d5eebf8524b4394d1a6434b8c SHA512 2058f912ad4dd964d661d031fb97e2f3c120188e3467da12dc21b89169f1525b4909dcf8b64b2804e6cbfb56cade85879a8666a98768b5b117e1b8ce073540ce
+DIST thunderbird-128.6.0esr-kab.xpi 735472 BLAKE2B e04f17eca5213be8b60da7ca75bf446e1878e50fb26f0453480808e6a59682219cd6431735c07fe6fc6ac06a754c0d687d14390d32e6fadb7193dad87b13ae02 SHA512 6f221da487dda45b2d8da905a545c60b98cd40788d32d73c7a2d752738b3b8ddd653ae05f2e8a6323a12dad5974584b8b4c73687eb6300c3daded50178006212
+DIST thunderbird-128.6.0esr-kk.xpi 865510 BLAKE2B ea80f0c5831df3850181eb72db6254b62f86714018d817d604706103aa1ae0617984bdc361295a33f4decaf38382245f4e1bc162e077c9f72d01308e6eb22cd9 SHA512 8ec4b88ed4fab840e0040e10fd8db1d4f332de956e970403b538cb7f2563b0a34737c7c1cfc6acf1f2653b259cb1b0631c8b88f2c64e217d618d3659116673cc
+DIST thunderbird-128.6.0esr-ko.xpi 762640 BLAKE2B 11a9acf63f72292d1ee08844d9a0d6d62c04229a253cb18d2469687be1d8af31bce1041e03f5c563aa8c49262d8bf8d2f84216bed29ceac283774e35bc3daddd SHA512 e747dcbcdae386164028a2454a8c4c45419f01d087794f75cdadc09a569e1aca88435f39951ad53ac7b000c3a1f5ce1e522670a94cd937ce8bc6723e0dd76f19
+DIST thunderbird-128.6.0esr-lt.xpi 701408 BLAKE2B c79670b1dff56429825d7bbf50519a6f539923c4e5b17f5ef2edad2c0c3dfc9a48b9d07eed69b52d73ea4aef6c60bf04fcbdbf0855c16a90a6aee920a033d2ae SHA512 78d990650323399c975e41f2fd8f3b7449d34c64ecb93f1c0ae9fe290a1610a354278ca8952ed4e380507a6637203cd24c67d36a9241f7fac811dd170a0cf9b4
+DIST thunderbird-128.6.0esr-lv.xpi 625979 BLAKE2B b6e83c16e4e1daf417ba1dc14c9ce098f9f9ccb82f46fd1c708bcbd4e6e1388809d192364fba3be1c779a2aa947299ac1be2328254c6f83bf270a130c3bf3d3c SHA512 31e3a42b02084293e4728a659abd94ccfc17e97f11cebfa1a52f4a6b0220132ff8e562a16ebb2ba9643c5e358427f37479f6a1e09e0414bb236b65242ff0c7d2
+DIST thunderbird-128.6.0esr-ms.xpi 581572 BLAKE2B 7ec201f640f936ca5ceff810014cc647f4ee59cd137e8ddb300822091998aba85f4332a967eeaca80245e4d10646cbff51b506be8eb6b6daf4d98e73261dc72a SHA512 876e48c0c68cd7f8fe5a001f44a507fcd64288944bfe9c7c84d1103c44303f57b34fade9ed17da73514a724fd203ac8438af3a61c551cfbb324811b4dde5e4fa
+DIST thunderbird-128.6.0esr-nb-NO.xpi 708559 BLAKE2B 2d380eca9b21a6e71b8837ab3e66c6b390fde862a60ed7f70c05028ba2464a59e0e8a59b225ed9814819a06c711ad5342abcc80c4af8e7da956808c4dca3af5f SHA512 99d52606674fd115ba9f5699d797b7019c5e443d8273cf04a91e6f76ea4978606efa6ecfcaf7357c5b0c24a5d949a0ec0c44642ed71ef311f388c016d63eb862
+DIST thunderbird-128.6.0esr-nl.xpi 751613 BLAKE2B 5f01f7da5eb447da566a2c6b34430ef3320caa9dbb9987f500412e47ef15a3191962e3495be111eac38c4bedefae855fd4e101f3edaf4c1f82e6a2506e07601f SHA512 00369570b88f4387f11eaaea1ed0337143b4c2d252b0e5a6d0352c5165c9cbffea1b9580f82f5d6b402adfd1627b637caf107ed47c56e071d5377fa69ba56314
+DIST thunderbird-128.6.0esr-nn-NO.xpi 729656 BLAKE2B 3d255bd5c1179ea1026f12ca772fcf9519a891098eebaada3e9bed1a86c3fbded912e1b554998dc5a405be98347dbef03fb6c4d02bc13acd4ce973e47882e1da SHA512 e98c72b7e11d520f81a60f3115d23cb06812dd5fcf65e61087338459b5d79180b8136b3bb0ff0fa1aef8483e686839bc358c0d9bbce58339387be57c03de68a2
+DIST thunderbird-128.6.0esr-pa-IN.xpi 688137 BLAKE2B b7cbff1b6239564419616ada453c632e9b4c80a4053f86605d472493be0bb4dba5ebbbaf51289835b187a598a64518c90363b394015a7b6f9f460c336925567d SHA512 929f478206ceb94b6a27f7a53738a43e844f200a5ef6e061c3170710a2b5b4bfb12e9106e0306c5f5c3b4bd6d857d6fc3280cd45b019397b9aca290e3af01131
+DIST thunderbird-128.6.0esr-pl.xpi 770778 BLAKE2B 8fdf8b0101e3b73e34a821f4fec508da4f915c0aa96ec91020ed14f5f9fdd3c3f5e19bfddbeae4a831280a3dcd0ff4597c8b843d99cf926d35427d95c27fa11b SHA512 26a2d2cdd1bd21d7e15348849ad95a4f33bf317ac31d8c76b447e4998e0e187a1f87e54eeb5654758054a2b2f5aa89eb3d409de4239447d3167838ef69395d4a
+DIST thunderbird-128.6.0esr-pt-BR.xpi 758843 BLAKE2B 054860421a300456ed5436f31add056cdecd7153ab453dd6c5c6dbd5da8d85d34197c4ddb1cd56fe880b3912cf32bde45c87f1883c3c9f567e9485c86f8d8e33 SHA512 6bf1231fb8c18082d296a9dc9a612047c2f615a6cf47228b64d3d7eb131fc3f60eeb74d5f47c3313d8d19d979c13ae28ba196398a48f38de1a4470b9ee1075b4
+DIST thunderbird-128.6.0esr-pt-PT.xpi 752023 BLAKE2B 2d49880e82a8627f9a3ba311970c2b266071668024886dc6f0a34cff218bd4aef184398e962d93bd59e359da35b259c24e7d4e2f2df042dde5257e1aa392451a SHA512 399a966c6c0151826d9b55d517507d2c039bed846b288621339e416f3f86cd700e86b55c3edd4dc15412fe2aebd5bf7064e6217b30bfb7f63a19e78297ce9459
+DIST thunderbird-128.6.0esr-rm.xpi 754441 BLAKE2B 1747b723e17d56b9418aa070d19e6afa8b67d22188bd77972d0ea08fb4bcd089c7bcd6da572136d15aac1b9b2c9ce498bd5b96d78a3fd208d222b534811387b3 SHA512 767ba60cede87c497823cd75debc73dde92b6185cf1641e9755ccf6a31e1396ecab99d7b35b25eed3e3c25660bced9ef05b3ee3b2a383f42b29e4ddfeb4a9357
+DIST thunderbird-128.6.0esr-ro.xpi 670225 BLAKE2B e00d61a68be5d70eac9958026d4636427eab5cdc17d5525f21beb3d72fa4901cd6a3de16da2ed2dcf8fd47b1f06ea6f9703e01a1ce76c2b92accb29ddc1c4b87 SHA512 304993ef19990310b9cea9f1edbd0bf26bc40de36b29a0cbfc0bf34e5ccfac9345e63fadf1f98d6534a7d1fa66d89d2a1157eb2cfde18643d3432d421b02108e
+DIST thunderbird-128.6.0esr-ru.xpi 880794 BLAKE2B 6230944633c584a6d5996a6f44b0af1df179921bf023f2828e4f690e835f6bfc8a005edfa9a2115b13aeb855de92a93a0e5789653d5e2ca91b78006cd70b7d27 SHA512 004a59985a3b68da9b5b57e5d67f84e4af231d9d79cf09a9b266e926634c098743877ba4496bcbba831929331fad41690dbe2ffad5335746f2863d98c908b464
+DIST thunderbird-128.6.0esr-sk.xpi 792218 BLAKE2B ad6413e15cdb86122458566a4912f5169ea3d3346f498d29a63c887db336a1e028ec25d8a68cbbcdd70380c9329e42721d72052380d7e44910c5b287afe1ec13 SHA512 f809469dab44d024d6fee4c094f7682ce875bc53e45a1441d9656df2691931fa2a8fc599fc14986295cd983062e1455485ce4e0259c46231d34296afe833d268
+DIST thunderbird-128.6.0esr-sl.xpi 751646 BLAKE2B 761b4950ba7ea9a23fa93edf7e192471b99ead7cf0477f930dd7f7d3aa54e0287311aac2e7ba67ff92087680115d3deaa3231807dee7846c44d9d9b65e2a5f42 SHA512 9daa2f3460586204f33ecd64a30482aaa5fb31f0d6a9e53a44aa361bfd1ff802363ea0c5109a089086e8978fe16fcbc8642494a36e294e7c1cef4562118f020e
+DIST thunderbird-128.6.0esr-sq.xpi 774995 BLAKE2B 9038ec651e5048352747ccf3abe5a84354c9fc85b009de3d25e75325f0866ff8881170e933954bd5ad4e8e4e527c2cd6346ca229b5f5c82054332c027204ba5a SHA512 75cb0917997d6eec80560ce0ff45d620061586e5740ad4b8b8b7e4196410f9fb1542f95e8bc40ee7d9c8aa741d909c0088f5338df66c1087431982237d2576c6
+DIST thunderbird-128.6.0esr-sr.xpi 771751 BLAKE2B f147bbff81508fab41a398430879b864bd335db873e8a4b24272913d461de0e4508c583194ba9e970a8e82f685166c40d8ebbd31953c1d94dfe46f07ad5039b5 SHA512 482ddf1d352e2851387de67afe5fa1cf32253d7f0034a61eca799cb4a863dda192b0d70a31e91abdc1245d7e627a676793c2abb0e1dc92f72bd9c0f790201dd9
+DIST thunderbird-128.6.0esr-sv-SE.xpi 754937 BLAKE2B 913bbfa7ec2208053f363d6ced46914107d6e2afe1eab16b1719719fb565af43baa5ad7b3adf860ebce8a5b9ac9c13d7f965ca9375555cfbee9b3c83a7c74e4e SHA512 de455beba43db7aa97dedb9e4b8aeacaf4359a88083df250055d08ceb5e93e30d8f306aa3c7c9283124c8876040a2d0de184eafdd430dcc94f0ef36de7ae08f4
+DIST thunderbird-128.6.0esr-th.xpi 819690 BLAKE2B d5d561d777cb45f583b24eb72a8ad628281055cffb1fcb6204b29dbee5adb0017f51b44f0dcc7d81a805bc9ab8f0f10f8b2b1e9c7b41aa595c78974f228cdfb7 SHA512 1b1e83f1a35a1bcb2e3ad084c922b89d5bf2ab90827eadb315e60d5868dec0fe93b26951a36ca2301083f7878d51c12449abb6292888735a99cf5b20861fb01e
+DIST thunderbird-128.6.0esr-tr.xpi 765547 BLAKE2B bc5772e4e32eb5b5dfdcd8e5b1158d446145a13c822c1fcd453d475a7d4f732d80be17d9ae88e55cbd70723115dbe7cb3dee4f6496295049b1a8f93cfbdf6176 SHA512 92366cf98ed85f114aed2489e3a4d92d6d51949c24c73b0928c3b964edc33134be09e83daa697ab91285c7a46b6f9c8a299eb1545edbdb182bb084fcf753d4be
+DIST thunderbird-128.6.0esr-uk.xpi 871375 BLAKE2B a06e5f41409af4f6c3a62011e54c065d73e4819880d77d4d552d307da1bf8d6dd42314fad2d85917a705f03ea9d8281a76ad4ec06792e71c80a7fb19fa16d9bf SHA512 39e0b2819efe5b7716ce986e9ee362d2d367089f138836aac70b11a4e47ca3043e411e1fa7b7ffa5ba9c85a7422206bd765e43e884b729cf8115beefaec72e87
+DIST thunderbird-128.6.0esr-uz.xpi 592619 BLAKE2B 66ccc9ed026eef75e1b14cb5948a2999d4dc77fb428f9624970d2ffdbb2b8cc4cad6a3b95c5649d745f6ac61363650f996fd43f4c60fae38a443c2752e815333 SHA512 e44844d875378e9b325918fa56470921e782950515f467dd366d20fc6dfa05284e68b60e72bea0c6e0e92b776fd43f07090a63bfbf2a20e0a956bb048ea302aa
+DIST thunderbird-128.6.0esr-vi.xpi 794032 BLAKE2B ea5a6ceff2a399cbc0331fdbe8ad401f0d581f036a6cc9c2f274fcd885c85e2f61654d58e5a6cef361d912eae2b8642ffbb809c51cec9604eed1adf2e931fce4 SHA512 1d4954a691c24b8a097c111c87ef476fcb03ee38eb35429c1b77ffe7732fe24c136f20a8f6d707476471a640a05e3099e8156d2b2ab6c07ee0af5f9fa6d24f89
+DIST thunderbird-128.6.0esr-zh-CN.xpi 794061 BLAKE2B 35c330a426b5c6e39a6257ebdf0f3382b80d73867792663089e5da3fa69309141b0783ba09ba90b1e9ddbced6774637a29a658d1ade289f65801ea73cb78dece SHA512 4448164c809d52efe1e5406117be01bd582fd75c08a59af5f54bdaf885e86e1753ecd69bf910396c70e6f7f6cc9c201bea65201dd99c55942f59bb8fe3926374
+DIST thunderbird-128.6.0esr-zh-TW.xpi 797334 BLAKE2B 517c72d488ae48839959083bc29b19b966bb3c91982f926ed73f2693309677476336650afa63a6c9f8bb1c8e4e335dbd7626d71b826d961a370af851519649db SHA512 6171c002769eb847d96a693440bba6f7246f033357dc22da93858a1a70833aacb28eed95e21592f49652221895fa1ecbefb91d0e24f29ce01d0fe216fdd5fcea
+DIST thunderbird-128.6.0esr.source.tar.xz 675443868 BLAKE2B 5cb17164327a222bcbb70f1ff4f5da36e130866e7e4d7c4122d0ed7ad83104fe84039d46b7d638fd4bc3b8cd08e9ca3d7a400f0970014e510b26b6afcfd3c11d SHA512 a561eac0bf0b8c72f3337ccebcde9099c342d1b31ce2b1f31096f1f805a195c49d627cf726cd56d41b21ec292d96fd577e8f226fcb24d8b13e0d773fc334b073
diff --git a/mail-client/thunderbird/thunderbird-128.6.0.ebuild b/mail-client/thunderbird/thunderbird-128.6.0.ebuild
new file mode 100644
index 000000000000..3bb5ae06197e
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-128.6.0.ebuild
@@ -0,0 +1,1163 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-128esr-patches-08.tar.xz"
+
+LLVM_COMPAT=( 17 18 19 )
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+RUST_MIN_VER="1.77.1"
+RUST_NEEDS_LLVM=1
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="manual"
+
+# Thunderbird will have separate release and esr channels, matching Firefox's rapid and esr.
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
+	optfeature pax-utils python-any-r1 rust toolchain-funcs virtualx xdg
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.thunderbird.net/"
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~juippis/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+
+IUSE="+clang +dbus debug eme-free hardened hwaccel jack libproxy lto pgo pulseaudio sndio selinux"
+IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx"
+IUSE+=" system-png +system-webp wayland wifi +X"
+
+# Thunderbird-only USE flags.
+IUSE+=" +rust-extensions +system-librnp"
+
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( lto )
+	rust-extensions? ( dbus )
+	wayland? ( dbus )
+	wifi? ( dbus )"
+
+TB_ONLY_DEPEND="selinux? ( sec-policy/selinux-thunderbird )
+	!system-librnp? ( dev-libs/jsoncpp )
+	system-librnp? ( >=dev-util/librnp-0.17.1 )"
+BDEPEND="${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+		clang? (
+			llvm-core/lld:${LLVM_SLOT}
+			pgo? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[profile] )
+		)
+	')
+	app-alternatives/awk
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.26.0
+	net-libs/nodejs
+	virtual/pkgconfig
+	amd64? ( >=dev-lang/nasm-2.14 )
+	x86? ( >=dev-lang/nasm-2.14 )
+	pgo? (
+		X? (
+			sys-devel/gettext
+			x11-base/xorg-server[xvfb]
+			x11-apps/xhost
+		)
+		!X? (
+			|| (
+				gui-wm/tinywl
+				<gui-libs/wlroots-0.17.3[tinywl(-)]
+			)
+			x11-misc/xkeyboard-config
+		)
+	)"
+COMMON_DEPEND="${TB_ONLY_DEPEND}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libffi:=
+	>=dev-libs/nss-3.101
+	>=dev-libs/nspr-4.35
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa
+	media-video/ffmpeg
+	sys-libs/zlib
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	x11-libs/pixman
+	dbus? ( sys-apps/dbus )
+	jack? ( virtual/jack )
+	pulseaudio? (
+		|| (
+			media-libs/libpulse
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	libproxy? ( net-libs/libproxy )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( >=media-sound/sndio-1.8.0-r1 )
+	system-av1? (
+		>=media-libs/dav1d-1.0.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-gfx/graphite2-1.3.13
+		>=media-libs/harfbuzz-2.8.1:0=
+	)
+	system-icu? ( >=dev-libs/icu-74.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
+	system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wayland? (
+		>=media-libs/libepoxy-1.5.10-r1
+		x11-libs/gtk+:3[wayland]
+	)
+	wifi? (
+		kernel_linux? (
+			|| (
+				net-misc/networkmanager
+				net-misc/connman[networkmanager]
+			)
+			sys-apps/dbus
+		)
+	)
+	X? (
+		virtual/opengl
+		x11-libs/cairo[X]
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXrandr
+		x11-libs/libxcb:=
+	)"
+RDEPEND="${COMMON_DEPEND}
+	jack? ( virtual/jack )"
+DEPEND="${COMMON_DEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libICE
+		x11-libs/libSM
+	)"
+
+llvm_check_deps() {
+	if ! has_version -b "llvm-core/clang:${LLVM_SLOT}" ; then
+		einfo "llvm-core/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && ! tc-ld-is-mold ; then
+		if ! has_version -b "llvm-core/lld:${LLVM_SLOT}" ; then
+			einfo "llvm-core/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+	fi
+
+	if use pgo ; then
+		if ! has_version -b "=llvm-runtimes/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+			einfo "=llvm-runtimes/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
+			einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES es-MX et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json || die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+virtwl() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
+	[[ -n $XDG_RUNTIME_DIR ]] || die "${FUNCNAME} needs XDG_RUNTIME_DIR to be set; try xdg_environment_reset"
+	tinywl -h >/dev/null || die 'tinywl -h failed'
+
+	local VIRTWL VIRTWL_PID
+	coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY; read _; kill $PPID'; }
+	local -x WAYLAND_DISPLAY
+	read WAYLAND_DISPLAY <&${VIRTWL[0]}
+
+	debug-print "${FUNCNAME}: $@"
+	"$@"
+	local r=$?
+
+	[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
+	exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
+	return $r
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use debug ; then
+			CHECKREQS_DISK_BUILD="14300M"
+		elif tc-is-lto ; then
+			CHECKREQS_DISK_BUILD="10600M"
+		else
+			CHECKREQS_DISK_BUILD="6800M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+
+		if tc-is-lto; then
+			use_lto=yes
+			# LTO is handled via configure
+			filter-lto
+		fi
+
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		if [[ ${use_lto} = yes ]] ; then
+			# -Werror=lto-type-mismatch -Werror=odr are going to fail with GCC,
+			# bmo#1516758, bgo#942288
+			filter-flags -Werror=lto-type-mismatch -Werror=odr
+		fi
+
+		if use pgo || use debug ; then
+			CHECKREQS_DISK_BUILD="14300M"
+		elif [[ ${use_lto} == "yes" ]] ; then
+			CHECKREQS_DISK_BUILD="10600M"
+		else
+			CHECKREQS_DISK_BUILD="6800M"
+		fi
+
+		check-reqs_pkg_setup
+		llvm-r1_pkg_setup
+		rust_pkg_setup
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if use pgo ; then
+			# Update 105.0: "/proc/self/oom_score_adj" isn't enough anymore with pgo, but not sure
+			# whether that's due to better OOM handling by Firefox (bmo#1771712), or portage
+			# (PORTAGE_SCHEDULING_POLICY) update...
+			addpredict /proc
+
+			# Clear tons of conditions, since PGO is hardware-dependant.
+			addpredict /dev
+		fi
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+
+	export use_lto
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	if [[ ${use_lto} == "yes" ]]; then
+		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
+	fi
+
+	# Workaround for bgo#917599
+	if has_version ">=dev-libs/icu-74.1" && use system-icu ; then
+		eapply "${WORKDIR}"/firefox-patches/*-bmo-1862601-system-icu-74.patch
+	fi
+	rm -v "${WORKDIR}"/firefox-patches/*-bmo-1862601-system-icu-74.patch || die
+
+	# Workaround for bgo#915651 on musl
+	if use elibc_glibc ; then
+		rm -v "${WORKDIR}"/firefox-patches/*bgo-748849-RUST_TARGET_override.patch || die
+	fi
+
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make cargo respect MAKEOPTS
+	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
+
+	# Workaround for bgo#915651
+	if ! use elibc_glibc ; then
+		if use amd64 ; then
+			export RUST_TARGET="x86_64-unknown-linux-musl"
+		elif use x86 ; then
+			export RUST_TARGET="i686-unknown-linux-musl"
+		elif use arm64 ; then
+			export RUST_TARGET="aarch64-unknown-linux-musl"
+		elif use ppc64 ; then
+			export RUST_TARGET="powerpc64le-unknown-linux-musl"
+		elif use riscv ; then
+			# We can pretty safely rule out any 32-bit riscvs, but 64-bit riscvs also have tons of
+			# different ABIs available. riscv64gc-unknown-linux-musl seems to be the best working
+			# guess right now though.
+			elog "riscv detected, forcing a riscv64 target for now."
+			export RUST_TARGET="riscv64gc-unknown-linux-musl"
+		else
+			die "Unknown musl chost, please post a new bug with your rustc -vV along with emerge --info"
+		fi
+	fi
+
+	# Make LTO respect MAKEOPTS
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure || die "Failed sedding multiprocessing.cpu_count"
+
+	# Make ICU respect MAKEOPTS
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py || die "Failed sedding multiprocessing.cpu_count"
+
+	# Respect MAKEOPTS all around (maybe some find+sed is better)
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/python/mozbuild/mozbuild/base.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/libwebrtc/build/toolchain/get_cpu_count.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/libwebrtc/build/toolchain/get_concurrent_links.py ||
+			die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/python/gyp/pylib/gyp/input.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/python/mozbuild/mozbuild/code_analysis/mach_commands.py || die "Failed sedding multiprocessing.cpu_count"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py || die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py || die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clear checksums from cargo crates we've manually patched.
+	# moz_clear_vendor_checksums xyz
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+
+		local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }')
+		[[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}")
+		[[ -z ${version_clang} ]] && die "Failed to read clang version!"
+
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
+
+		AR=llvm-ar
+		CC=${CHOST}-clang-${version_clang}
+		CXX=${CHOST}-clang++-${version_clang}
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain,
+	# AS is used in a non-standard way by upstream, #bmo1654031
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
+
+	# Configuration tests expect llvm-readelf output, bug 913130
+	READELF="llvm-readelf"
+
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB READELF PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=comm/mail
+	mozconfig_add_options_ac '' --enable-project=comm/mail
+
+	# Set Gentoo defaults
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-disk-remnant-avoidance \
+		--disable-geckodriver \
+		--disable-gpsd \
+		--disable-install-strip \
+		--disable-legacy-profile-creation \
+		--disable-parental-controls \
+		--disable-strip \
+		--disable-tests \
+		--disable-updater \
+		--disable-valgrind \
+		--disable-wmf \
+		--enable-js-shell \
+		--enable-negotiateauth \
+		--enable-new-pass-manager \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--enable-system-policies \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--without-wasm-sandboxed-libraries \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${ESYSROOT}/usr/include" \
+		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	# For future keywording: This is currently (97.0) only supported on:
+	# amd64, arm, arm64 & x86.
+	# Might want to flip the logic around if Firefox is to support more arches.
+	# bug 833001, bug 903411#c8
+	if use ppc64 || use riscv; then
+		mozconfig_add_options_ac '' --disable-sandbox
+	else
+		mozconfig_add_options_ac '' --enable-sandbox
+	fi
+
+	# Enable JIT on riscv64 explicitly, since it's not activated automatically via "known arches" list.
+	# Update 128.1.0: Disable jit on riscv (this line can be blanked to disable by default),
+	# bgo#937867.
+	use riscv && mozconfig_add_options_ac 'Disable JIT for RISC-V 64' --disable-jit
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_enable rust-extensions thunderbird-rust
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-png
+	mozconfig_use_with system-webp
+
+	if use system-librnp; then
+		mozconfig_add_options_ac "+system-librnp" --enable-compile-environment
+		mozconfig_use_with system-librnp
+	else
+		# This controls the backend of the bundled librnp. Choices are "botan" and "openssl".
+		# RNP Upstream recommends to use botan. In Gentoo it's preferred to use system-librnp.
+		mozconfig_add_options_ac "+bundled librnp backend = botan" --with-librnp-backend="botan"
+	fi
+
+	mozconfig_use_enable dbus
+	mozconfig_use_enable libproxy
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+
+		# Increase the FORTIFY_SOURCE value, #910071.
+		sed -i -e '/-D_FORTIFY_SOURCE=/s:2:3:' "${S}"/build/moz.configure/toolchain.configure || die
+	fi
+
+	local myaudiobackends=""
+	use jack && myaudiobackends+="jack,"
+	use sndio && myaudiobackends+="sndio,"
+	use pulseaudio && myaudiobackends+="pulseaudio,"
+	! use pulseaudio && myaudiobackends+="alsa,"
+
+	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use X && use wayland ; then
+		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
+	elif ! use X && use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland-only
+	else
+		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3-x11-only
+	fi
+
+	if [[ ${use_lto} == "yes" ]] ; then
+		if use clang ; then
+			# Upstream only supports lld or mold when using clang.
+			if tc-ld-is-mold ; then
+				# mold expects the -flto line from *FLAGS configuration, bgo#923119
+				append-ldflags "-flto=thin"
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+			fi
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+
+		else
+			# ThinLTO is currently broken, see bmo#1644409.
+			# mold does not support gcc+lto combination.
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# lld is upstream's default
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+			fi
+
+		else
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "linker is set to bfd due to USE=-clang" --enable-linker=bfd
+			fi
+		fi
+	fi
+
+	if use pgo ; then
+		mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+		if use clang ; then
+			# Used in build/pgo/profileserver.py
+			export LLVM_PROFDATA="llvm-profdata"
+		fi
+	fi
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+		mozconfig_add_options_ac '+debug' --enable-jemalloc
+		mozconfig_add_options_ac '+debug' --enable-real-time-tracing
+	else
+		mozconfig_add_options_ac 'Gentoo defaults' --disable-real-time-tracing
+
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# elf-hack
+	# Filter "-z,pack-relative-relocs" and let the build system handle it instead.
+	if use amd64 || use x86 ; then
+		filter-flags "-z,pack-relative-relocs"
+
+		if tc-ld-is-mold ; then
+			# relr-elf-hack is currently broken with mold, bgo#916259
+			mozconfig_add_options_ac 'disable elf-hack with mold linker' --disable-elf-hack
+		else
+			mozconfig_add_options_ac 'relr elf-hack' --enable-elf-hack=relr
+		fi
+	elif use ppc64 || use riscv ; then
+		# '--disable-elf-hack' is not recognized on ppc64/riscv,
+		# see bgo #917049, #930046
+		:;
+	else
+		mozconfig_add_options_ac 'disable elf-hack on non-supported arches' --disable-elf-hack
+	fi
+
+	if ! use elibc_glibc; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# System-av1 fix
+	use system-av1 && append-ldflags "-Wl,--undefined-version"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if [[ ${use_lto} == "yes" ]] && tc-ld-is-mold ; then
+		# increase ulimit with mold+lto, bugs #892641, #907485
+		if ! ulimit -n 16384 1>/dev/null 2>&1 ; then
+			ewarn "Unable to modify ulimits - building with mold+lto might fail due to low ulimit -n resources."
+			ewarn "Please see bugs #892641 & #907485."
+		else
+			ulimit -n 16384
+		fi
+	fi
+
+	if use pgo; then
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+
+		if ! use X; then
+			virtx_cmd=virtwl
+		else
+			virtx_cmd=virtx
+		fi
+	fi
+
+	if ! use X; then
+		local -x GDK_BACKEND=wayland
+	else
+		local -x GDK_BACKEND=x11
+	fi
+
+	${virtx_cmd} ./mach build --verbose || die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from llvm-core/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs-r1.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+
+		if use wayland; then
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
+			pref("gfx.x11-egl.force-enabled",          false);
+			EOF
+		else
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
+			pref("gfx.x11-egl.force-enabled",          true);
+			EOF
+		fi
+	fi
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
+	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^}"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if [[ -n ${MOZ_ESR} ]] ; then
+		local desktop_filename="${PN}-esr.desktop"
+	else
+		local desktop_filename="${PN}.desktop"
+	fi
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" || die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "encrypted chat support" net-libs/libotr
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+}
diff --git a/mail-filter/maildrop/maildrop-3.1.8.ebuild b/mail-filter/maildrop/maildrop-3.1.8.ebuild
index ad7fb0658c25..bf8c3b29ee87 100644
--- a/mail-filter/maildrop/maildrop-3.1.8.ebuild
+++ b/mail-filter/maildrop/maildrop-3.1.8.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P%%_pre}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ppc64 ~s390 sparc x86"
 IUSE="berkdb debug dovecot gdbm ldap mysql postgres static-libs authlib +tools trashquota"
 
 RESTRICT="test" # No more working
diff --git a/mail-filter/postforward/files/postforward_apply-sendmail-path.patch b/mail-filter/postforward/files/postforward-1.1.1-apply-sendmail-path.patch
index c64b76368a39..c64b76368a39 100644
--- a/mail-filter/postforward/files/postforward_apply-sendmail-path.patch
+++ b/mail-filter/postforward/files/postforward-1.1.1-apply-sendmail-path.patch
diff --git a/mail-filter/postforward/postforward-1.1.1-r1.ebuild b/mail-filter/postforward/postforward-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..12417c94def0
--- /dev/null
+++ b/mail-filter/postforward/postforward-1.1.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Postfix Sender Rewriting Scheme forwarding agent"
+HOMEPAGE="https://github.com/zoni/postforward"
+SRC_URI="https://github.com/zoni/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="mail-filter/postsrsd"
+
+PATCHES=(
+	"${FILESDIR}/${P}-apply-sendmail-path.patch"
+)
+
+src_unpack() {
+	# This package has no dependencies, but go-module_src_unpack requires this directory
+	mkdir -p "${S}/vendor" || die
+
+	go-module_src_unpack
+}
+
+src_prepare() {
+	default
+
+	# Dynamically fix EPREFIX lines made by ${PN}_apply-sendmail-path.patch
+	sed -e "s/@GENTOO_PORTAGE_EPREFIX@/${EPREFIX}/" -i ${PN}.go || die
+}
+
+src_compile() {
+	ego build -o ${PN} ${PN}.go
+}
+
+src_install() {
+	einstalldocs
+	dosbin "${PN}"
+}
diff --git a/mail-filter/postforward/postforward-1.1.1.ebuild b/mail-filter/postforward/postforward-1.1.1.ebuild
deleted file mode 100644
index 13e50547a484..000000000000
--- a/mail-filter/postforward/postforward-1.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-build
-
-DESCRIPTION="Postfix Sender Rewriting Scheme forwarding agent"
-EGO_PN="${PN}"
-SRC_URI="https://github.com/zoni/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/zoni/postforward"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-lang/go:0"
-RDEPEND="
-	mail-filter/postsrsd"
-
-PATCHES=( "${FILESDIR}/${PN}_apply-sendmail-path.patch" )
-
-src_prepare() {
-	default
-
-	# Dynamically fix EPREFIX lines made by ${PN}_apply-sendmail-path.patch
-	sed -i -e "s/@GENTOO_PORTAGE_EPREFIX@/${EPREFIX}/" *.go || die
-
-	# go build assumes files will be in src dir, but
-	# source files are in root in this package, so move
-	# them.
-	local new_src_dir="${S}/src/${EGO_PN}"
-	# Freak out if there's already something there because
-	# it means the package has changed and we'll need to
-	# adjust to it.
-	[[ -e "${new_src_dir}" ]] && die "${new_src_dir} already exists"
-	mkdir -p "${new_src_dir}" || die
-	mv *.go "${new_src_dir}" || die
-}
-
-# Standard golang-build src_install complains about pkg not
-# existing, so we go custom.
-src_install() {
-	einstalldocs
-	dosbin "${PN}"
-}
diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest
index a571fc5fcc3d..ea6a69659dde 100644
--- a/mail-filter/pyzor/Manifest
+++ b/mail-filter/pyzor/Manifest
@@ -1,2 +1 @@
-DIST pyzor-1.0.0_p20211223.tar.gz 138500 BLAKE2B 242a7b2df3451f659d820771454e685868792bd2275b6d69d4c4adfd6044c781abe2d72fe1500a6074851faf8e88e95d6578c546d4d95fda03e11609d1a0b436 SHA512 218bea40515a21b1e08b2bad5b7ba339ba84fff2da425dc58df72a967730ebe10e319944e1604ff56bb37f6a8ae7bc0cd974b54b18a4878ba103131b8ea47b67
 DIST pyzor-release-1-1-2.gh.tar.gz 138970 BLAKE2B 07fafe1eee577094525e1c888374c646eb6d56b1f4306669915f926235b8f433b5a5fb64680d6f7744bd835fa4eefc88805302bb312515bc7ccfed5d1f9643f8 SHA512 17cefeeb9a4befde16b3a68e219599d4a85319968b16f8c7352696cdfca9db8e0c18acc83bc0b7a6873be020e91f7dee09389ea9cbde8cdad000c87d5941b702
diff --git a/mail-filter/pyzor/metadata.xml b/mail-filter/pyzor/metadata.xml
index 77c2f9becde8..de2277bb1b6e 100644
--- a/mail-filter/pyzor/metadata.xml
+++ b/mail-filter/pyzor/metadata.xml
@@ -21,6 +21,7 @@
   </use>
   <upstream>
     <remote-id type="github">SpamExperts/pyzor</remote-id>
+    <remote-id type="pypi">pyzor</remote-id>
     <remote-id type="sourceforge">pyzor</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild b/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
deleted file mode 100644
index 9abdf06b3ddd..000000000000
--- a/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-MY_COMMIT="2dbe627c1ec245db206cdc73bf1f9d785f1512d8"
-DESCRIPTION="A distributed, collaborative spam detection and filtering network"
-HOMEPAGE="https://github.com/SpamExperts/pyzor"
-SRC_URI="https://github.com/SpamExperts/pyzor/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc gdbm mysql pyzord redis selinux test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	pyzord? (
-		gdbm? ( $(python_gen_impl_dep 'gdbm') )
-		mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] )
-		redis? ( dev-python/redis[${PYTHON_USEDEP}] )
-	)
-	selinux? ( sec-policy/selinux-pyzor )
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep 'gdbm')
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/redis[${PYTHON_USEDEP}]
-	)
-"
-
-REQUIRED_USE="
-	pyzord? ( || ( gdbm redis ) )
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	epytest -vv tests/unit
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	if use pyzord; then
-		dodir /usr/sbin
-		mv "${ED}"/usr/bin/pyzord* "${ED}/usr/sbin" \
-		   || die "failed to relocate pyzord"
-	else
-		rm "${ED}"/usr/bin/pyzord* || die "failed to remove pyzord"
-	fi
-}
diff --git a/mail-filter/pyzor/pyzor-1.1.2.ebuild b/mail-filter/pyzor/pyzor-1.1.2.ebuild
index d3a1c7d72dd2..907a21b80f9e 100644
--- a/mail-filter/pyzor/pyzor-1.1.2.ebuild
+++ b/mail-filter/pyzor/pyzor-1.1.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
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc gdbm mysql pyzord redis selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index c34fd5aa8384..5f1e9223af1c 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,2 +1,2 @@
-DIST msmtp-1.8.26.tar.xz 419644 BLAKE2B 55373fef589bc0cee8ad6091b4988b622e302ef1720c423b306bbfaa4b44fe59a8c6d7aeb9f32e672873a3f5b0f8f777c1c6c7729e84b3324e5f6812ee9b69a7 SHA512 36fa4a571079b0e1141e645f2a565f3c7699e1899f6ece66e3539bed595473488bdf147ed6ff1bff103c6240e484b2c357122292d5eae65ac4c0f74215eb556c
 DIST msmtp-1.8.27.tar.xz 440000 BLAKE2B 4264d516cbd5126d4ed57c033221b322c1a9bc7af506b96083d988e8d278227c24718773227fc840acbe6e21329c8b2aee3b0f6744546a34aca094238f5a23fc SHA512 1d4cdc1f8942a194f202f89c44d1c1ae035b4f3cdda856427d29021d1b8e923bcee1067973e0dd73495540294b109b0deab52177d03f76d7a74c85ccfb56597d
+DIST msmtp-1.8.28.tar.xz 442768 BLAKE2B ffa9358de02c13ae666c28e5a31e8d03966980ff7946fd8177ecc3fdaec5501b42a679ec2a4b29d1de11a41dd7edb62e7425508ed33ac502f7dab6761d4e11af SHA512 4e02e984bed897d950b4ff66b5b759f05471a19f0074c604a68a8227cd6736ecce2c22ff5e00b12acf1cbd138920c7f032c5456edac9e013a432a8e293a0ae0d
diff --git a/mail-mta/msmtp/msmtp-1.8.26.ebuild b/mail-mta/msmtp/msmtp-1.8.26.ebuild
deleted file mode 100644
index ddec7adefaa4..000000000000
--- a/mail-mta/msmtp/msmtp-1.8.26.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 2004-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps
-
-DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
-HOMEPAGE="https://marlam.de/msmtp/"
-SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="daemon doc keyring +gnutls idn +mta nls sasl ssl"
-
-# fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
-# USE="daemon" in order to set the caps we need.
-REQUIRED_USE="daemon? ( filecaps )"
-
-# Upstream discourages usage of openssl. See also
-# https://marlam.de/msmtp/news/openssl-discouraged/
-DEPEND="
-	idn? ( net-dns/libidn2:= )
-	nls? ( virtual/libintl )
-	keyring? ( app-crypt/libsecret )
-	sasl? ( net-misc/gsasl[client] )
-	ssl? (
-		gnutls? ( net-libs/gnutls[idn?] )
-		!gnutls? ( dev-libs/libretls:= )
-	)
-"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase
-	daemon? (
-		acct-group/msmtpd
-		acct-user/msmtpd
-	)
-	mta? (
-		!mail-mta/courier
-		!mail-mta/esmtp
-		!mail-mta/exim
-		!mail-mta/netqmail
-		!mail-mta/nullmailer
-		!mail-mta/postfix
-		!mail-mta/sendmail
-		!mail-mta/opensmtpd
-		!>=mail-mta/ssmtp-2.64-r2[mta]
-	)
-"
-
-BDEPEND="
-	doc? ( virtual/texi2dvi )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS doc/msmtprc*"
-
-src_prepare() {
-	# Use default Gentoo location for mail aliases
-	sed 's:/etc/aliases:/etc/mail/aliases:' \
-		-i scripts/find_alias/find_alias_for_msmtp.sh || die
-
-	default
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-gai-idn
-		$(use_enable nls)
-		$(use_with daemon msmtpd)
-		$(use_with keyring libsecret)
-		$(use_with idn libidn)
-		$(use_with sasl libgsasl)
-		$(use_with ssl tls $(usex gnutls gnutls libtls))
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -C doc html pdf
-	fi
-}
-
-src_install() {
-	default
-
-	if use daemon ; then
-		fcaps CAP_NET_BIND_SERVICE usr/bin/msmtpd
-		newinitd "${FILESDIR}"/msmtpd.init msmtpd
-		newconfd "${FILESDIR}"/msmtpd.confd msmtpd
-	fi
-
-	if use doc ; then
-		dodoc doc/msmtp.{html,pdf}
-	fi
-
-	if use mta ; then
-		dosym ../bin/msmtp /usr/sbin/sendmail
-		dosym ../bin/msmtp /usr/$(get_libdir)/sendmail
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins scripts/vim/msmtp.vim
-
-	insinto /etc
-	newins doc/msmtprc-system.example msmtprc
-
-	src_install_contrib find_alias find_alias_for_msmtp.sh
-	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
-	src_install_contrib msmtpq "msmtpq msmtp-queue" README.msmtpq
-	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		einfo "Please edit ${EROOT}/etc/msmtprc before first use."
-		einfo "In addition, per user configuration files can be placed"
-		einfo "as '~/.msmtprc'.  See the msmtprc-user.example file under"
-		einfo "/usr/share/doc/${PF}/ for an example."
-	fi
-}
-
-src_install_contrib() {
-	subdir="$1"
-	bins="$2"
-	docs="$3"
-	local dir=/usr/share/${PN}/${subdir}
-	insinto ${dir}
-	exeinto ${dir}
-	for i in ${bins} ; do
-		doexe scripts/${subdir}/${i}
-	done
-	for i in ${docs} ; do
-		newdoc scripts/${subdir}/${i} ${subdir}.${i}
-	done
-}
diff --git a/mail-mta/msmtp/msmtp-1.8.28.ebuild b/mail-mta/msmtp/msmtp-1.8.28.ebuild
new file mode 100644
index 000000000000..6aac73aaba8e
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.8.28.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2004-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps
+
+DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
+HOMEPAGE="https://marlam.de/msmtp/"
+SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="daemon doc keyring +gnutls idn +mta nls sasl ssl"
+
+# fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
+# USE="daemon" in order to set the caps we need.
+REQUIRED_USE="daemon? ( filecaps )"
+
+# Upstream discourages usage of openssl. See also
+# https://marlam.de/msmtp/news/openssl-discouraged/
+DEPEND="
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )
+	keyring? ( app-crypt/libsecret )
+	sasl? ( >=net-misc/gsasl-2.1[client] )
+	ssl? (
+		gnutls? ( net-libs/gnutls[idn?] )
+		!gnutls? ( dev-libs/libretls:= )
+	)
+"
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase
+	daemon? (
+		acct-group/msmtpd
+		acct-user/msmtpd
+	)
+	mta? (
+		!mail-mta/courier
+		!mail-mta/esmtp
+		!mail-mta/exim
+		!mail-mta/netqmail
+		!mail-mta/nullmailer
+		!mail-mta/postfix
+		!mail-mta/sendmail
+		!mail-mta/opensmtpd
+		!>=mail-mta/ssmtp-2.64-r2[mta]
+	)
+"
+
+BDEPEND="
+	doc? ( virtual/texi2dvi )
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS doc/msmtprc*"
+
+src_prepare() {
+	# Use default Gentoo location for mail aliases
+	sed 's:/etc/aliases:/etc/mail/aliases:' \
+		-i scripts/find_alias/find_alias_for_msmtp.sh || die
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-gai-idn
+		$(use_enable nls)
+		$(use_with daemon msmtpd)
+		$(use_with keyring libsecret)
+		$(use_with idn libidn)
+		$(use_with sasl libgsasl)
+		$(use_with ssl tls $(usex gnutls gnutls libtls))
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -C doc html pdf
+	fi
+}
+
+src_install() {
+	default
+
+	if use daemon ; then
+		fcaps CAP_NET_BIND_SERVICE usr/bin/msmtpd
+		newinitd "${FILESDIR}"/msmtpd.init msmtpd
+		newconfd "${FILESDIR}"/msmtpd.confd msmtpd
+	fi
+
+	if use doc ; then
+		dodoc doc/msmtp.{html,pdf}
+	fi
+
+	if use mta ; then
+		dosym ../bin/msmtp /usr/sbin/sendmail
+		dosym ../bin/msmtp /usr/$(get_libdir)/sendmail
+	fi
+
+	for i in syntax ftdetect ftplugin; do
+		insinto /usr/share/vim/vimfiles/$i
+		doins scripts/vim/$i/msmtp.vim
+	done
+
+	insinto /etc
+	newins doc/msmtprc-system.example msmtprc
+
+	src_install_contrib find_alias find_alias_for_msmtp.sh
+	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
+	src_install_contrib msmtpq "msmtpq msmtp-queue" README.msmtpq
+	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		einfo "Please edit ${EROOT}/etc/msmtprc before first use."
+		einfo "In addition, per user configuration files can be placed"
+		einfo "as '~/.msmtprc'.  See the msmtprc-user.example file under"
+		einfo "/usr/share/doc/${PF}/ for an example."
+	fi
+}
+
+src_install_contrib() {
+	subdir="$1"
+	bins="$2"
+	docs="$3"
+	local dir=/usr/share/${PN}/${subdir}
+	insinto ${dir}
+	exeinto ${dir}
+	for i in ${bins} ; do
+		doexe scripts/${subdir}/${i}
+	done
+	for i in ${docs} ; do
+		newdoc scripts/${subdir}/${i} ${subdir}.${i}
+	done
+}
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 5abc13875a30..2d984d560a85 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,3 +1,3 @@
-DIST postfix-3.10-20241202.tar.gz 4963497 BLAKE2B 3c9220d667904593f5ad1aff32fa4f8ecba25ffa62a1689110fdb447f509fa3605d8b31c4989bd9e382ba5bde6bc4c4bdfacf08b78737c502df767805221e9c0 SHA512 1fb966031ac5af96afef6a61e186205b96202ba3809282832f8fecec95d3bb955bbdd6ee9c6752cefcd8e7f9ea2b00f7bd428e0300fa5d243769a6af946d0c04
+DIST postfix-3.10-20250117.tar.gz 5040169 BLAKE2B 42b738b8851da45e52d3942ca280e1cbcbc890ece86f9fa1b9dc964e9f492796d8259685f15010c73a985bd682b73e70131b09776383c2f2e2e095340c2a5d5f SHA512 1b98d0b0d4bf241de20deeaa38e5c6b9963913701f2d8d555cae88902db88e9f836194ba4c717108e4dfa9f4e9dab3e78d03216b6f002243192bf9c4adb37893
 DIST postfix-3.9.0.tar.gz 4953133 BLAKE2B e07a525d9cbea43d3ed11f3d672452cf94f88ca7bbaf3c3254bf5be4ef675a1797a5fff2444c0db60c6eb53e43734a388a91faed72bb2fb4e3e5a353535602b0 SHA512 46faaf529a6d2edc5ea747ee0d73a028f7061a923da0ea4b1e1828d935b15f5782d83f7a8472e7c74b45ea0e96666c871efd352934bead28a88ddd3561ade324
 DIST postfix-3.9.1.tar.gz 4953855 BLAKE2B 78be7bf0f0d9e46429b40f98ddc98cac442cfdb404d77073346c973f3d0d4c52f299fc7f5d64bddaaf2db60dd234c52790f1efe4995faee8e2cd10c6f8e2096f SHA512 79109d9f19e51d9089a0f2b5c6134972148a6e1a7e385aabc79c0a32e09c78715ad94a93ae3eca1171b770c62d6bf3b8e079b94183ae851001db1a0cf21fff15
diff --git a/mail-mta/postfix/postfix-3.10_pre20241202.ebuild b/mail-mta/postfix/postfix-3.10_pre20241202.ebuild
deleted file mode 100644
index dd2d17dc5128..000000000000
--- a/mail-mta/postfix/postfix-3.10_pre20241202.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit flag-o-matic pam systemd toolchain-funcs
-
-MY_PV="${PV/_pre/-}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-S="${WORKDIR}/${MY_SRC}"
-
-LICENSE="|| ( IBM EPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mongodb mysql nis pam postgres sasl selinux sqlite ssl"
-
-DEPEND="
-	acct-group/postfix
-	acct-group/postdrop
-	acct-user/postfix
-	dev-libs/libpcre2:0
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2:* )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
-	eai? ( dev-libs/icu:= )
-	ldap? ( net-nds/openldap:= )
-	ldap-bind? ( net-nds/openldap:=[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.23.0 >=dev-libs/libbson-1.23.0 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nis? ( net-libs/libnsl:= )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:* )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
-	"
-
-RDEPEND="${DEPEND}
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!mail-mta/ssmtp[mta]
-	selinux? ( sec-policy/selinux-postfix )"
-
-# require at least one db implementation for newalias (and postmap)
-# command to function properly
-REQUIRED_USE="
-	|| ( berkdb cdb lmdb )
-	ldap-bind? ( ldap sasl )
-	"
-
-src_prepare() {
-	default
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_configure() {
-	# bug #915670
-	unset LD_LIBRARY_PATH
-
-	# https://marc.info/?l=postfix-users&m=173542420611213&w=2 (bug #945733)
-	append-cflags -std=gnu17
-
-	for name in CDB LDAP LMDB MONGODB MYSQL PCRE PGSQL SDBM SQLITE
-	do
-		local AUXLIBS_${name}=""
-	done
-
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="" mylibs="${LDFLAGS} -ldl"
-
-	# libpcre is EOL. prefer libpcre2
-	mycc=" -DHAS_PCRE=2"
-	AUXLIBS_PCRE="$(pcre2-config --libs8)"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if ! use eai; then
-		mycc="${mycc} -DNO_EAI"
-	fi
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		AUXLIBS_LDAP="-lldap -llber"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		AUXLIBS_LMDB="-llmdb -lpthread"
-	fi
-
-	if use mongodb; then
-		mycc="${mycc} -DHAS_MONGODB $(pkg-config --cflags libmongoc-1.0)"
-		AUXLIBS_MONGODB="-lmongoc-1.0 -lbson-1.0"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		AUXLIBS_MYSQL="$(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
-	fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-		# change default database type
-		if use lmdb; then
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"lmdb\\\""
-		elif use cdb; then
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
-		fi
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			AUXLIBS_CDB="-lcdb"
-		else
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
-			done
-		fi
-	fi
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
-	emake makefiles \
-		shared=yes \
-		dynamicmaps=no \
-		pie=yes \
-		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
-		DEBUG="" \
-		CC="$(tc-getCC)" \
-		OPT="${CFLAGS}" \
-		CCARGS="${mycc}" \
-		AUXLIBS="${mylibs}" \
-		AUXLIBS_CDB="${AUXLIBS_CDB}" \
-		AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
-		AUXLIBS_LMDB="${AUXLIBS_LMDB}" \
-		AUXLIBS_MONGODB="${AUXLIBS_MONGODB}" \
-		AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
-		AUXLIBS_PCRE="${AUXLIBS_PCRE}" \
-		AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
-		AUXLIBS_SDBM="${AUXLIBS_SDBM}" \
-		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install() {
-	LD_LIBRARY_PATH="${S}/lib" \
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape, posttls-finger, collate and tlstype
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-	dobin auxiliary/collate/collate.pl
-	newdoc auxiliary/collate/README README.collate
-	dobin auxiliary/collate/tlstype.pl
-	dodoc auxiliary/collate/README.tlstype
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue,log}
-	fperms 02755 /usr/sbin/post{drop,queue,log}
-
-	keepdir /etc/postfix
-	keepdir /etc/postfix/postfix-files.d
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	LD_LIBRARY_PATH="${S}/lib" \
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	dodoc -r README_FILES/ examples/
-	# postfix set-permissions expects uncompressed man files
-	docompress -x /usr/share/man
-
-	if use pam; then
-		pamd_mimic_system smtp auth account
-	fi
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	# warn if no aliases database
-	# do not assume berkdb
-	if [[ ! -e /etc/mail/aliases.db \
-	   && ! -e /etc/mail/aliases.cdb \
-	   && ! -e /etc/mail/aliases.lmdb ]] ; then
-		ewarn
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-		ewarn
-	fi
-	# run newaliases anyway. otherwise, we might break when switching
-	# default database implementation - from berkdb to cdb for example
-	"${EROOT}"/usr/bin/newaliases
-
-	# check and fix file permissions
-	"${EROOT}"/usr/sbin/postfix set-permissions
-
-	# hint for configuring tls
-	if use ssl ; then
-		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
-			elog "To configure client side TLS settings, please run:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-client
-		fi
-		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
-			elog "To configure server side TLS settings, please run:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-server
-		fi
-	fi
-}
diff --git a/mail-mta/postfix/postfix-3.10_pre20250117.ebuild b/mail-mta/postfix/postfix-3.10_pre20250117.ebuild
new file mode 100644
index 000000000000..e9d3655ef4b6
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.10_pre20250117.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic pam systemd toolchain-funcs
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+S="${WORKDIR}/${MY_SRC}"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mongodb mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND="
+	acct-group/postfix
+	acct-group/postdrop
+	acct-user/postfix
+	dev-libs/libpcre2:0
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap:= )
+	ldap-bind? ( net-nds/openldap:=[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.23.0 >=dev-libs/libbson-1.23.0 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nis? ( net-libs/libnsl:= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	"
+
+RDEPEND="${DEPEND}
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp[mta]
+	selinux? ( sec-policy/selinux-postfix )"
+
+# require at least one db implementation for newalias (and postmap)
+# command to function properly
+REQUIRED_USE="
+	|| ( berkdb cdb lmdb )
+	ldap-bind? ( ldap sasl )
+	"
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+	# bug #915670
+	unset LD_LIBRARY_PATH
+
+	# https://marc.info/?l=postfix-users&m=173542420611213&w=2 (bug #945733)
+	append-cflags -std=gnu17
+
+	for name in CDB LDAP LMDB MONGODB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="" mylibs="${LDFLAGS} -ldl"
+
+	# libpcre is EOL. prefer libpcre2
+	mycc=" -DHAS_PCRE=2"
+	AUXLIBS_PCRE="$(pcre2-config --libs8)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if use mongodb; then
+		mycc="${mycc} -DHAS_MONGODB $(pkg-config --cflags libmongoc-1.0)"
+		AUXLIBS_MONGODB="-lmongoc-1.0 -lbson-1.0"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		# change default database type
+		if use lmdb; then
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"lmdb\\\""
+		elif use cdb; then
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			AUXLIBS_CDB="-lcdb"
+		else
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles \
+		shared=yes \
+		dynamicmaps=no \
+		pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" \
+		CC="$(tc-getCC)" \
+		OPT="${CFLAGS}" \
+		CCARGS="${mycc}" \
+		AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" \
+		AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" \
+		AUXLIBS_MONGODB="${AUXLIBS_MONGODB}" \
+		AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" \
+		AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SDBM="${AUXLIBS_SDBM}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install() {
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger, collate and tlstype
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+	dobin auxiliary/collate/tlstype.pl
+	dodoc auxiliary/collate/README.tlstype
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue,log}
+	fperms 02755 /usr/sbin/post{drop,queue,log}
+
+	keepdir /etc/postfix
+	keepdir /etc/postfix/postfix-files.d
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	dodoc -r README_FILES/ examples/
+	# postfix set-permissions expects uncompressed man files
+	docompress -x /usr/share/man
+
+	if use pam; then
+		pamd_mimic_system smtp auth account
+	fi
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	# warn if no aliases database
+	# do not assume berkdb
+	if [[ ! -e /etc/mail/aliases.db \
+	   && ! -e /etc/mail/aliases.cdb \
+	   && ! -e /etc/mail/aliases.lmdb ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+	# run newaliases anyway. otherwise, we might break when switching
+	# default database implementation - from berkdb to cdb for example
+	"${EROOT}"/usr/bin/newaliases
+
+	# check and fix file permissions
+	"${EROOT}"/usr/sbin/postfix set-permissions
+
+	# hint for configuring tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings, please run:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings, please run:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/mail-mta/proton-mail-bridge/metadata.xml b/mail-mta/proton-mail-bridge/metadata.xml
index 7b0d7b60fb94..aaec162377ff 100644
--- a/mail-mta/proton-mail-bridge/metadata.xml
+++ b/mail-mta/proton-mail-bridge/metadata.xml
@@ -3,11 +3,14 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription>
-		ProtonMail bridge has been Open Source since April 2020. Note that this package
-		is CLI-only for now, as we have run into some problems with Qt vendoring
-		(see https://github.com/ProtonMail/proton-bridge/issues/16).
+		ProtonMail bridge has been Open Source since April 2020.
+		It is a daemon that essentialy is an interface to Proton's servers.
+		It can be built with or without it's QT GUI.
 	</longdescription>
 	<upstream>
+		<bugs-to>https://github.com/ProtonMail/proton-bridge/issues</bugs-to>
+		<changelog>https://github.com/ProtonMail/proton-bridge/blob/master/Changelog.md</changelog>
+		<doc>https://github.com/ProtonMail/proton-bridge/wiki</doc>
 		<remote-id type="github">ProtonMail/proton-bridge</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.15.1-r1.ebuild b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.15.1-r1.ebuild
new file mode 100644
index 000000000000..09ece2bf26ab
--- /dev/null
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.15.1-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop go-env go-module systemd xdg-utils
+
+MY_PN="${PN/-mail/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Serves Proton Mail to IMAP/SMTP clients"
+HOMEPAGE="https://proton.me/mail/bridge https://github.com/ProtonMail/proton-bridge/"
+SRC_URI="https://github.com/ProtonMail/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gui"
+
+# Quite a few tests require Internet access
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	app-crypt/libsecret
+	gui? (
+		>=dev-libs/protobuf-21.12:=
+		>=dev-libs/sentry-native-0.6.5-r1
+		dev-qt/qtbase:6=[gui,icu,widgets]
+		dev-qt/qtdeclarative:6=[widgets]
+		dev-qt/qtsvg:6=
+		media-libs/mesa
+		net-libs/grpc:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.15.1-gui_gentoo.patch
+)
+
+src_unpack() {
+	default
+
+	if [[ -d "${WORKDIR}"/vendor ]]; then # if we ship the dependencies
+		mv "${WORKDIR}"/vendor "${S}"/vendor || die # move them into the tree
+	fi
+
+	go-env_set_compile_environment
+}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	if use gui; then
+		# prepare desktop file
+		local desktopFilePath="${S}"/dist/${MY_PN}.desktop
+		sed -i 's/protonmail/proton-mail/g' ${desktopFilePath} || die
+		sed -i 's/Exec=proton-mail-bridge/Exec=proton-mail-bridge-gui/g' ${desktopFilePath} || die
+
+		# build GUI
+		local PATCHES=()
+		BUILD_DIR="${WORKDIR}"/gui_build \
+			CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
+			cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	if use gui; then
+		local mycmakeargs=(
+			-DBRIDGE_APP_FULL_NAME="Proton Mail Bridge"
+			-DBRIDGE_APP_VERSION="${PV}+git"
+			-DBRIDGE_REPO_ROOT="${S}"
+			-DBRIDGE_TAG="NOTAG"
+			-DBRIDGE_VENDOR="Gentoo Linux"
+			-DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF
+		)
+		BUILD_DIR="${WORKDIR}"/gui_build \
+			CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
+			cmake_src_configure
+	fi
+}
+
+src_compile() {
+	emake -Onone build-nogui
+
+	if use gui; then
+		BUILD_DIR="${WORKDIR}"/gui_build \
+			CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
+			cmake_src_compile
+	fi
+}
+
+src_test() {
+	emake -Onone test
+}
+
+src_install() {
+	exeinto /usr/bin
+	newexe bridge ${PN}
+
+	if use gui; then
+		BUILD_DIR="${WORKDIR}"/gui_build \
+			CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
+			cmake_src_install
+		mv "${ED}"/usr/bin/bridge-gui "${ED}"/usr/bin/${PN}-gui || die
+		newicon {"${S}"/dist/bridge,${PN}}.svg
+		newmenu {dist/${MY_PN},${PN}}.desktop
+	fi
+
+	systemd_newuserunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+
+	einstalldocs
+}
diff --git a/media-fonts/iosevka/Manifest b/media-fonts/iosevka/Manifest
index 59f402a4bf66..de64ec3ebeff 100644
--- a/media-fonts/iosevka/Manifest
+++ b/media-fonts/iosevka/Manifest
@@ -3,118 +3,166 @@ DIST SuperTTC-Iosevka-31.8.0.zip 107598827 BLAKE2B 0aa4c190eb8a1db94bf0193dad909
 DIST SuperTTC-Iosevka-32.0.0.zip 107108400 BLAKE2B f41cdba35845198be5243443af6d9b5abc85b577ad721b244c8b6a4050683a4ff182f339b023eb1a98df0f0cd7c4b70097dd7c9eb28773af3e9939c955933325 SHA512 ef7b932a4c60d4201bd7df4b4b21a7da498c86bc0f7cc0357678038ce7bf9dd7ff19d5dce1c747c0d0c27ad5d8b013f424771196570310bead8ef52830eb2d80
 DIST SuperTTC-Iosevka-32.2.1.zip 110102908 BLAKE2B 4b0f6e51a511b6ecbba3d5dd12f6666a81ee333966cb17314047d1de828a0ede64713795c1107aee284f2d9f8282f6a33f25316fade7fe8602f934c08b5781a2 SHA512 4f277cdaf70491aa61425abbdab5c5f02c9bcd7ac790d02a9f37e06c027799b6e71107ae732b6b5d9863f9bebc8fc82016309965a51a70eeb8d99733f4c8cae4
 DIST SuperTTC-Iosevka-32.3.0.zip 111092914 BLAKE2B 89176841383793a517b9eeed9ec2857544c45fea7a856249d8fac8c71e3c18d56c4711ad865e541553c0dea4c51e2a363b95712182bbda1ac21048a15e97268b SHA512 ffdddc512ff6465dbbe6ed14f41af270f812a4c94a89095dedc1e4f46bbcae6f17d8f54d6a896dc2b399c98ace644bf63284e0066b0327ce3fdfa3d4e4632d79
+DIST SuperTTC-Iosevka-32.3.1.zip 111528176 BLAKE2B d93e1fcc04fd211f444ecebc7e807ec44f26c7957055ee89d99bdf28280e6e59ad10031a0fafd56184bcc81ebd05d9a7122bf8dd24f66084096c082bdd2c2cfd SHA512 b5190181a3b6facacd9aa5910d1f803b7d8cc9276c9a7f8e5c3421783f403adbfc91bc48c69d6788dfe5611ca4b41852beba12dc32b74a2b784c492567561b6c
+DIST SuperTTC-Iosevka-32.4.0.zip 112004435 BLAKE2B ba1df4db1a95e1bf3e8adb0cfea17ab7e58e0a53fb8584887d791542127d91bad5d68deecfd7ee4e1ada344a5a2115b259f3c531a89654c655ba1c171e50be08 SHA512 f4ca346dd63adb2a197ca8be43b8c66686b6f122ef2cefd346186e2d46005dbc9045b8ef81febf9e7cf29c3c53823e04ba1260827f807c916b0cd38ebfe15b46
 DIST SuperTTC-IosevkaAile-30.1.2.zip 44125829 BLAKE2B f6d4393bb3096221967e5b2a78152ea9f8cfefa0dccc7ab6ef97b41075bc48801b415336cece562ef13c9b39cac999ce96317fb05f1478b37324f0e27d21dd91 SHA512 2dd6d87c47b86e58ad57d09be5a0fd74a4abb64170ff84103bef6e1e577ccfb23879ea0d416308412df7e733bebb564480eeb7b6b8b122863ae7ea70bd65efc9
 DIST SuperTTC-IosevkaAile-31.8.0.zip 50808606 BLAKE2B b9edc3782d2a4d0b7c019a2d550f21e476aadd3d5140e677145fba59c204339066cf84182462b180deb12e70e140e0c0c19459a6f840b1fff0214c892fe31053 SHA512 deb3310d6ff50081cca520b2b786c71923a95681dbb450f4abb350d81876667bcfd2921f966e738f88d9f5f9046869c936a163e3e0aaff7b362ed794dc0452d7
 DIST SuperTTC-IosevkaAile-32.0.0.zip 49891938 BLAKE2B 603d2cb8216263bb4b5edd5122407f1fc52162a137fa86493923954a12061409c409ab2311f415e3f5f813b0a00e500de417aa3feb7e971622f47237ef70e2de SHA512 80b444e6353b07bcee9d45ce8495f577380e8f81e15846087f19960f1e71c7d2d80edf0532f6cea6271a6c5c442089039c86dc96671cbd3659860847e4d174be
 DIST SuperTTC-IosevkaAile-32.2.1.zip 50179650 BLAKE2B 635155c837153801ea9ad22e71b2552550da0b6b4ac1d5bfe7f9bf76844b2aa332740707678e190e60d05da05a671945b543b698d609ec48f264f7af22f28099 SHA512 5bdac9628898f06cb2bf1b5d0e3bfe5a40e1dc9f62091ff986764117955b0b07ae6aaff98d55771397ff2cd1c401c89654c364d56b6676b6809c948879cbcf73
 DIST SuperTTC-IosevkaAile-32.3.0.zip 50242852 BLAKE2B d2855316d308bf5d4677cc2f1897fb7842d9fee8103a73a7b948ea90e0b8054952286eafbdb9ec636b8e76ced418edb2ebb5b1a5aeaff30344a5f1cdb66669c4 SHA512 b58727be0fadee48eff63ba12c165955848f71f05b5b8709f421b30d8521a40958260a4b98b199be109bd5fcd76aadf45e966e3f7b1ad5089d57b5ff0f9f58b9
+DIST SuperTTC-IosevkaAile-32.3.1.zip 50462265 BLAKE2B 3d6297bb8ca6f2e942e20234bff7164a05e15c04f9f500ff0db358ff4bed59c02edb600d95fbe00dc681deeb7adc1041a39ddc18708d0e5e2965832102dc5cb9 SHA512 5a5f72b313e0c8b4c54110241f414b90d10c1391a24e76c78e033ef213af834f17545ef8bc8b48b05021e600485fe38e3dda2d54119f77630bd28546e64a2861
+DIST SuperTTC-IosevkaAile-32.4.0.zip 50623573 BLAKE2B 477b304217f5a1d4f0cf364fa4915a8fe41f425eb0c0d9774beaec552cc5d8938450966df0e857c23f822d42f75d786e8934e416534bf6e8672bd5b8e5cb4b3a SHA512 354315ee44d3ebed20e7c23c5bf434ebc64f5656a78f60e28e84ca8f2630b7664aa040de52820592474c0ed8001418cec881f9b1ef660dd100290d1558cec679
 DIST SuperTTC-IosevkaCurly-30.1.2.zip 95645907 BLAKE2B 257f1737ccb3572107d85011304b1070dc2c51c2236859c127a15aa1017358d3bd6193e26099ff5526ff7bdf6064869a7f46ffda0af111026bbb80a1c44371a2 SHA512 d2ea7867b700a63d7e14e3d0a5c10f8da32de78fc4452a67683bcd98e6bfc3e4af87817483c0ec12381841da36394e23ebcfa687db8da0d2802f822e2b70ca06
 DIST SuperTTC-IosevkaCurly-31.8.0.zip 107999900 BLAKE2B b54e09a67b64ecade5da4dee4732af1af12af64849bd7e40fc83798e05f5ef8ef0961ded0f8214ed11ba6a19f99edcc536b3fba2b22cc73bfbafea4cdd7de54e SHA512 fa8dbe7acff64557c49d53007e806c7911918172a97b62e964e9098dd7c652dc909f7cae3706ef81d09a6011b8b00e56b2e56410925801afce9e5699e11a2898
 DIST SuperTTC-IosevkaCurly-32.0.0.zip 107430798 BLAKE2B 8d7d53fb7336f39b690f740da2ed2fbfe8d6ec3e60024b075a770e201dc642cf28a6bd5d8cc02ef1b83b99144783bd292e319f7fb1f5ad62fa15d56b7bafcf9a SHA512 081c29f63661c9f262bb582c173beecf77c87cb9efdec4f4e1981e7e7d4918439680be9fd1baa713e2f439891e4203af81b7dc82f19008f0b61c4a0aef014f10
 DIST SuperTTC-IosevkaCurly-32.2.1.zip 110429288 BLAKE2B 8ad494378217216c2d17275cfa254ca9752836a26127cd999e7fa15b924b72a58e7b6967cfd80168bef67fd9bc8ded5ffbe19a35612d8d6436d7656c9eebdf74 SHA512 9f88272a244af74f4f1ed6863ff6d918c329a385a432eef79859e1f4c95ead5cc4a3c0e5061e5f36589804f20b7b08d180fc0201f27e2f2e1444da17c0b3ab39
 DIST SuperTTC-IosevkaCurly-32.3.0.zip 111417353 BLAKE2B 94adc5d9106723d76336e48900d3cfee245b1eb81ff6e3e5e0056eadf7953ca024a0ff75f34738b60067c0016377d5ee61ff22d08769645474ee334044fe72f3 SHA512 22b2b79d19ce2ec3d47e141b865a24227bef232216a591cd0e6e3701087d53f65e1ee7a91afe7a778fe668773e912845140ead18b794165b352362be5dd69909
+DIST SuperTTC-IosevkaCurly-32.3.1.zip 111848709 BLAKE2B c961e8b4dc7ac5fef7e900b8fad9212d1b3900bc11bffc79d62f640d6d98f07b215b4aeae494534bb258e70a0563535eaa666c660b746b3b1bb3d958ee26f108 SHA512 dbee08c6c6843a39ee101636c3f4befd975c323b8ee07b099df60a36aff28c7af28cfe0dda21cf5ebd81e0497f6966f61ecc5e9314071285ebf2d19dffce1045
+DIST SuperTTC-IosevkaCurly-32.4.0.zip 112338495 BLAKE2B 4bd5a6e4934e6514f18cc3eb64f5dddcfd2d9cf75d3f0164117c37b9a5784baa1a938d3f7c77e4420e22abf485edc99b3726c96cb93f1569a2ae76055992b611 SHA512 b1c60e7ef6d6201f56ee0011d101c4803e1cb0101bda28d0f521f04b1fadc920a7a22db9fdb422153d865387b6e9cf2fe6713df3588f10cc26764c288e6dec50
 DIST SuperTTC-IosevkaCurlySlab-30.1.2.zip 101104290 BLAKE2B 4b8a560cc39df20e10acaff3dc2d9b20a1fbe139fce33309a2d57c8b520f0cc7a57d86b1825a709cd0283ca647b543897d86779cb994df559e2fbad1b886b2f7 SHA512 c35ad466e67aaf9e38fb297385136e92dfa3f2a3f7ddacbe864635da0544c4585e1c7be9224051daf50673fc570a90d4e9b8c283703827aed8ed5ca426b07d2d
 DIST SuperTTC-IosevkaCurlySlab-31.8.0.zip 115621646 BLAKE2B 41628eb070ac3c86eb0be0716b6d4d0af22492a79d87a5fb9630c5d5ab9321a45e2ea3d455f0ee048215655d7868540e9040585f34ee9477f863e6da43af32d5 SHA512 7e7d7c019506c521ca4aacdbcbad2861deb33d8200657ae5fccaf2295775209b0519b46a173ee4b92de793391d66946235a5c3136b0d28ba73de131e78d882d2
 DIST SuperTTC-IosevkaCurlySlab-32.0.0.zip 113489992 BLAKE2B d240cc84c6f83d36fc164c46b5ecf433f243abd955f1707438b8b9b3af025982f4599b56cca369907b8732dd13812fcd8394e6cda46a2d526e2d8cb7d7290ad2 SHA512 462d7348bbbdfe242e1decfa977cad107cb0515a2088c5eb3416a922882c5d7f3c6a6f8fa63cfcc5cf12c2f7c8ce5a9c7faf76a7aed26fe6a3e9366888f2f410
 DIST SuperTTC-IosevkaCurlySlab-32.2.1.zip 113577555 BLAKE2B e95c60f10e7a7c750932512d7b19a6c183cd1db3753dc017cb61ceec1a989d047e5bdcc4db34762002a7c05f7e9c79b950c130e42af4e5007a73378573ef2ccf SHA512 cf0de58ef073fc85a730d6dca10eaecd9e797a3b177ecb22e36cbfc5ff5fac001160d3dc23cfdac5419e83599aa4d4daff42eab1b59f9b97b04095e97e2af001
 DIST SuperTTC-IosevkaCurlySlab-32.3.0.zip 114093933 BLAKE2B 3234358400b075e6f1295b4956566ee4dea35f80c0abe67a80aacef5ca6ad328dd11cf6c5352f70cea3cba64c5c1cb562a3b9021b4e1fbdef3ae1abfd4f8c7d9 SHA512 16ca041900a4bc35e30aa886dc604d04ed59d068b6bf399ec499424afeaa3858d395a1f351b92f531fa1517bbeca3fa4122396f9d1efacfaba79ef8906d32430
+DIST SuperTTC-IosevkaCurlySlab-32.3.1.zip 114545021 BLAKE2B 3d88445df00c88a0f0e64fcabd41c181a60eec6260fb4df6550177d69f785431163c0edbb787f0119a6de69468945a3edea600392d096d8879224855e8f0c5b0 SHA512 2d3b5874bbc147be17cf46036213eeef6ebb4b4a968df9a95370ee417234b72e9e5b41d59227017d3f4e836cf5309426a7a0455d0f7eb6d3ed355e53a339b1f5
+DIST SuperTTC-IosevkaCurlySlab-32.4.0.zip 115015864 BLAKE2B 6e47cbb4c02f6bee84a1344db8203e0aa438af77f5fcab9fd775fcee535791c93d3f0c96717b5af4e03e23b08d540d4171d786e3b8e4f7e83b4f610181b9ed26 SHA512 6b3c68cecc565a3a40c2999a5bff1de8624b4345af9c0dfd5f50c7f03cecac5f604b34f9efa209cd248e71de403db4cdf43574009530f26a61a99db807e81f29
 DIST SuperTTC-IosevkaEtoile-30.1.2.zip 48924061 BLAKE2B 80d2c8db47bae9d4096b6a312d9cdc99f15831873b6c8a9872188abaf93241ee41215c27c1a801dcbb6c8d78f0612ab0f0f992ff63b051fca7a0bc2ba2d88d46 SHA512 aff8cb2754ba4ef2406a6632533d9e0f9d4c2470df85560fa4cc370269b4dada1bc600bac042f53ee75a72d2c953a19fdc8442391de4e8ff0d54874086372f61
 DIST SuperTTC-IosevkaEtoile-31.8.0.zip 55917420 BLAKE2B c686973488ff83b7c559d7585c69b0cdf39e0981f474717bf045edf05961324c80d1de5f6cc5d4f4338137fa9f29ca3991cf555317c48e2dc7f65fb15790280e SHA512 6e39936f5a5100b118111a09072c4dc54c20fa7c1097e0d7f164c5e98bcc7109b07ab7b6a831db3a6e67fb21c7977052ea49ae2c7dc90646f098be0b47277f10
 DIST SuperTTC-IosevkaEtoile-32.0.0.zip 55117453 BLAKE2B 6131ac7471006067f1e3991e226b603be609fedb3e2745ee374269f664324466c9816d3fd06864ce9e4d67ae1441af643a278c41250565aa318178724af77ed4 SHA512 d1cc6deb5a7ce2526ffc64c828e170b6067bbb36b9e3a8dc041e2d659840f03a62d9e75a2e5bfc2f4fac596dbb6e555e8744187b35758cd4ae13d437c1c3aec8
 DIST SuperTTC-IosevkaEtoile-32.2.1.zip 55320513 BLAKE2B a028947797f5445ccef787dcfba168a6614804dad2ae5ba882c9258426a2b7b116cdfa98e54e2e50788f91444353cd758268f476cf34aad0eea0aebfb3d8f0d5 SHA512 8e71408c25db91556380eaa836553aa89e8afe29b9f78ff80094e528e9440acab85c300ed189e2eed7e5828d0f9a064f3d0f80999a682f93f22b0b225314ba90
 DIST SuperTTC-IosevkaEtoile-32.3.0.zip 55882254 BLAKE2B f25ac0316c5f3d5538fbdbf2adddda2929748724d0241d4ffc1eb90caadc140b392fe260c4df143cea2a3ceb9548241982b2b50e0dbb9389cbb6c6638d980df1 SHA512 565c9e0257bd60262900a61a5ed717d5f8e3d3e678f54659fd12314e1dc047613315b120dadbe49cda387ad8da119f11d3f9710664d1f303ce72bfb03f4bb95c
+DIST SuperTTC-IosevkaEtoile-32.3.1.zip 56117069 BLAKE2B ce11e8b2aa85e41350b17dbe125615362d43e73816f518d00b2a5867ef010d9585155e2870b133e8275567a27a09983ed55a7b85f58e850598ae7594b9af9b62 SHA512 05485f7e2d117a584390ee7466ee544de03f46547053165d68d429188a044d5d57f16b4d8f9ceb150f3256e8f6fa031d9d86676fd9c0e04482e832609cb4efca
+DIST SuperTTC-IosevkaEtoile-32.4.0.zip 56320052 BLAKE2B 7cef056c857f7a397e9232aeadd1fce8cbf6d788db1dacf965238f243c1f6c1eb153d104ed54763524caf2e0ce88b5d8634a4616622bf988155a21d6db1cec99 SHA512 18202f6e88770a0a9adc5d103226fdf7459ae27ebafaeaf6be648532c978bd774796e1ba48b3d8303ad290e149186113a6be1c2c3a8a708dc449c31ebcc0a609
 DIST SuperTTC-IosevkaSS01-30.1.2.zip 24582819 BLAKE2B bf18b1906f0cc2e321f12b9160b6ec9986eb0b19267d3437cecf93fac9756390be93f4022e143734046aacb6414d6ecf635568b730daedb145d0d6f020127593 SHA512 0642f74f6edb264894e4772baf1dd5227ae071aed414324c73c47f5a2fc0f03b8d7c2b2c24b7c7fae3b874494bccd454a0869b995b4e891d73a780fb652266ac
 DIST SuperTTC-IosevkaSS01-31.8.0.zip 27988469 BLAKE2B 70141c2853ab690f8baa90b3c23c4eea9d1467e682655a24efb8a602a8a5f80cd5ff81234d24d41894e2bad18487b6440d709fcdcc83d61ce4719a3a61369949 SHA512 8d6ee8621da215b11b3a2a10c6c9de266d6773b9a250f2a5a236ae45e28cb83f1fc206e319bc6074a44e6ea68482903dfef43f87d8eac5b0f3f3b8fcccf2986a
 DIST SuperTTC-IosevkaSS01-32.0.0.zip 27855638 BLAKE2B 10a36593ef3a1896c83699a320f9311d33b015d07af05b1ae8bce733ea97de7c60f8183c0df0711da0eb9808a3616f7b69a94bf227cc02fcfc37b7f70e638f5e SHA512 06a8a119d6e6a005a7201c67ddc64ec310efd3cfdcd44bf9d2db2b629ea01b344091858d41046d2ef9d0570a95d16be7c4c9f29997e89bf538e0b71977f85c3e
 DIST SuperTTC-IosevkaSS01-32.2.1.zip 27606643 BLAKE2B 3d02d8234286852270cf8db8b6079afa14ce65390b31fb9a8878cd8a7bae8e729e24a8bd8ea6ea94f6447c159b1a3403be6247c90f9d9bde46d55b5e3720bf61 SHA512 ba2634ba4ab4891bc32ba367dc677ed1a77a39b8a56c446c144f5212c0b4a04d582435d9a300d980179a973420a8ebad837d3a79f6efd8b8b19655d9761f1492
 DIST SuperTTC-IosevkaSS01-32.3.0.zip 27874070 BLAKE2B 17165f9c231d65f52a5778b36c952ff130d97b8f360fe66c10753ed774af7a46e438f36a17e8a1bce77144edec7eeb3d8fdfdf7e046f9e0f38133ad328f4b58f SHA512 23b03720efb0dda687a16ccbc83fde9e47b1e553d6c2d077d9ac9e4700185d46769c4c410254087a757607df65f2dbb51687c23299fbe1cff3e95975fed1bdc9
+DIST SuperTTC-IosevkaSS01-32.3.1.zip 28300594 BLAKE2B 9b0de620835d5e3bc5e7d897b67f2f933afbc8d4885a06b7a4ddc7feffe588c63a5b9209b8c9fb5d2a83ef1e42e37b95dd7d99dbca826fd448aee89c9ec7af08 SHA512 17b59afab5e02d9871598baf484b19b65bc9b1aa7214e2bc1305f132731c57804e26138cc9b8b14df507e6c57a5beb2ebbf74f19cbb989886fec57a6b3d4c7e9
+DIST SuperTTC-IosevkaSS01-32.4.0.zip 28333920 BLAKE2B 03d8ec6e830ed3614ad7c502bd6a0c1ea704f3823c6b4a5b891a02de232ef4d56eda356f15ba156d8077bb1073f8e59e5f631fc1f712200085ce3269d72099b7 SHA512 cab4c1e81ba40a46b40ebf3ed7b39c3bdb1b0bb77a4610c2f3e8f848cebbb3f757ab3d2a933ea3c0ac20689c7ca378ac766dde6a5f6adb6c7e0ccee8182f4a39
 DIST SuperTTC-IosevkaSS02-30.1.2.zip 24873322 BLAKE2B cb4cca0103d65dcda4116cb976b374e3650da986fc85c39f3db03fd2148f73b45821110b32d5f6eebd670b4be0ff6ae5f5ece91f0e88e296013e9fa0e47bb83e SHA512 54e36b6de7425c4fe224e481dd9ade611163dd65c92ec733b78e82012a07077800ce8781c88a1cb778de76a5f9a33479ba6ef75c5869a00e34dcdbc097b6c26c
 DIST SuperTTC-IosevkaSS02-31.8.0.zip 28084049 BLAKE2B 8e121fb8de7431d023be41446b3687b0bb3ac1b24a2b4bd4eeec1c9aff0e4abfb9ec952387f522abce4592d4bee049371b16f25de67dd43b6d9e341c331f54a1 SHA512 c52a458417a0302e449d4d1cb3214ade51cff16ebd94a6cf642989bbe82021e29f6bf82c8567d94cbec90df5c8dd1351454de2a2df6c854b2399117c2a3a9f18
 DIST SuperTTC-IosevkaSS02-32.0.0.zip 27987627 BLAKE2B 7dbfa90ef5bc0243721828ae8378d85721f97b50cbb248bb7c85a71da12930a6723112eda755d9998f48f9cac1aa2f73b7e324f0d8a988ae41d5436b77db7852 SHA512 e2fd701865ba2aadf7babde754dc3b74e233495a46762e32f3213e6055f4082d28c6754b3d2e56bddc5078c8554d752f37291c9c2d79480d95d1cd98da935757
 DIST SuperTTC-IosevkaSS02-32.2.1.zip 27742069 BLAKE2B 4441073d34900131e6c0985547f26eafcf662e223236faa452c5912751568f2c00f74da47ca63e176f07e2e5dc444fa16f1abe13288d1fd01372b4c8bc9bd693 SHA512 ef2451a745b9a2833cfad79fb31db6195ec5927aee047a96cb9ffe48165749d4510ff2fd2765783a2a05e25915947de1bc11fcce78f8e7074938a379accc617d
 DIST SuperTTC-IosevkaSS02-32.3.0.zip 28006369 BLAKE2B aa44afa629e35482fb9831bbe79824beb85fe0354a55b5e2100debb9e320571dfdbc78ad6a7f7c3509e32fa527e7dcc62b891e1e3913bf7dbaa7cc82335c46c7 SHA512 c1c6f936e8c694f7c85cd8f454a5bd7305a7070fb43d1fd19f7f54953e3a20b44cc9c59536e473b61f44b7853d07ee140e2bfc6fe63bab2652dbbaccc372dd2a
+DIST SuperTTC-IosevkaSS02-32.3.1.zip 28430374 BLAKE2B 071a54a3dbae3d518b669c1b5d90e64c5a012474a5a717019cae4dc38e93aa1821ce354e23d56dcdc3786893558152d3e496dc0d3c750dc6f735705a0dcdb249 SHA512 4a4f0027e97eadae7ead4374d0970a3c4cb32f41220fc1bc8ac8c87e7dd14c71da74c45754e52c4b7c39e1cfc81555282853ccfc05012b4ff308a24f1f0a0a1e
+DIST SuperTTC-IosevkaSS02-32.4.0.zip 28469660 BLAKE2B 1a968af043f8ee43500419d06f9f518b9f2e4ea4f8bd9a66cb536433dc06236d779c2199ff83493baade7ff4c3a571ac4941d49c739b6166ec1f239fb7118e83 SHA512 bb9fe8e79e9fdedfb0fe34459bcadb0f14743e7aef1e610a5b4a49910bcf5cfcd2dd75ef7ca4a172c4816790f8af58afc6bfb410a06bffb74b5c48b393fcaf54
 DIST SuperTTC-IosevkaSS03-30.1.2.zip 25223736 BLAKE2B b7e2a9679bd2318784adafa32acf8c9ae63eea07a92ba77635b9496054cc6c62761f87b6f788dca2d3a61fae80b1f454f325cc9af5d72819dc7e9a328bb2c103 SHA512 18cec021e7010eea7650fe8365c9676aeeef31217f6a4d18ff80ad9f383b4e8646e3a23da77038763f5beb8cb20a86b2d912244c7ce670fb8c1a6b94d55984ce
 DIST SuperTTC-IosevkaSS03-31.8.0.zip 28555076 BLAKE2B 6e8fa5e5bfe67f75d6d7a55eb8ffcf6b2df8d897df17192691e2dfe9a27da89d1cb5ad682ed9b7c5d1c771d837ebc7c4e18008e88b3fbd175df4471d11e5c934 SHA512 4ee94025b6fcd1462c53a4a0e8ea64ff27f887e62ecd63b1d49e99ffc69b5fced413a3a6ff32119dd8c605b08b6ddd54074c855c4833de51f0b1fb633b9ced05
 DIST SuperTTC-IosevkaSS03-32.0.0.zip 28393425 BLAKE2B b2fa71431fd952d3cfa4281b46a3eaca89dc7e48eff43ba9bb456c022f838fb1b70e99baa08831b3e4d0379dfb813711b702ab35043c35cd8611c3195e7a39bd SHA512 d07ede72b0499c07d922dee27e2abf7c506b1e5a98016bf8e86d8682d209d6db367b1b7c4c5d0d83dd3a50c87fb2a15bfa4eb785e6d135ecc79064fb97dcd2a1
 DIST SuperTTC-IosevkaSS03-32.2.1.zip 28116859 BLAKE2B ca6bada0217c26da3bc5333f4f6785cd8efcb2286e7b77ebe25c0214bdf01c2417f30f1fb0e8d73665880354d3846a7435fd4594dd20d3259a4f40e616c4f141 SHA512 3f9128670d5e0b2a894b76f8dc800f4bee26fd9d97ca43d932c8d2c6fb43cad2b9b97e5f8f714c0daf4666496c4982a406122c637d93031e319cf160fa14b821
 DIST SuperTTC-IosevkaSS03-32.3.0.zip 28385564 BLAKE2B 6005648d5fa5f5b11ff7b07b4b57d7a3ee0188f801f1fc7f8bd01cc00164f36255dc7fdd00d56d571bf15865145e0f2bc9512dcf5ab2ca357d13609d4ec092bd SHA512 7b52229d04140e0b03058063ffcfe5fb4a83dfe4f17c03739fc2d74f0de0a4dfadd772711b28129bed50beff0c4dd41f096e3cb0587a0e34d11006e4deabf7cf
+DIST SuperTTC-IosevkaSS03-32.3.1.zip 28810525 BLAKE2B a96339aa85625bd34cb393b0f6355b0c9f1054cf7e2de1b49abc7ddd722dada9f32c0c40957ec7e7891320813a25f8357c0a8b28cc13147b8866536ccaca445c SHA512 f303a8c83d46b06582ccd1aa86ca974afb8dee1be3de13d495c2c7cb4a1f76b4012e1ab5f3bda5a45fb362811c07ffbef6156b453ff8a16dfabaa5b619f22d15
+DIST SuperTTC-IosevkaSS03-32.4.0.zip 28847420 BLAKE2B c352d7354b3c0a90ad94ff8479b4878d7619bd6b7c82a63d28d6d8e3a8d7052eeef533407ab869d80eab6272a9ea785d0dd723d135236d2bfd3489ba1bfdacf1 SHA512 7c031fc4505e9c629cc8dd569cb9e648c26b6ada72d7a7dd481a3177db3bddc9b68a369a2ab4e078ded58db76830ce1d7cdc9faddc474870d32b90247b670dc0
 DIST SuperTTC-IosevkaSS04-30.1.2.zip 24091806 BLAKE2B 9fc0b49dc9507e4e276d65d550417eea0412541fc1c38980fc34d27fe9d63bd79f4a8fd880bcb9de693164c4df2c3939969e16878c111a8e1c26ac78bbe093c6 SHA512 5baa1a1d4afe43bb1ea0aec54f5d9e269b0af74fa257c30b14900a26d2055a47ed5f7f6020dd9ef6307bfbcf04cc84416f4df43b8f74502d43a59cd4f3e7bf23
 DIST SuperTTC-IosevkaSS04-31.8.0.zip 27248239 BLAKE2B ca339f7e60b0b10bc23fefdc24d32df5329e31c8d65e3bdbe879d8cca03ed662e1f8f1c01c98edc23cd77aa26b040bf9ac9d903d7cdc87a1ccb552585aa387f6 SHA512 229b7db2589a0fe0d54f8fee64595d7cc973402fb168a9a8ee051de2868741896667882284d0c13c0c455dc0e5317a75c0278ae4b63e160a2773055c645cb208
 DIST SuperTTC-IosevkaSS04-32.0.0.zip 27157697 BLAKE2B 2bd886cfca66995012773a9a5be7a65b4c80a4e248b1e1e23a287fee8b0424f8d18675f0fd78de5155d833c89f0148f582d49dc593fed48217349eab1b553bf4 SHA512 d0abf0354d49fc5b79547fa2e94986ded14289da48c079870a087d2f6d3e53f0959a5287a0c8bec10eb23de6e583eeef6ea835b30d7a3aaaf30ea4f3bf5130ca
 DIST SuperTTC-IosevkaSS04-32.2.1.zip 26882950 BLAKE2B a33ac338dd5d8251ea5dbd1c72f647f5094a68bdc4c289cfee57820da562ffc003653167e096d6b46747db77f76c9e1f30f8f5b88c2a3c385717a4ac9fa5148a SHA512 181e9be42e120492c67b96bb9011b71508c20eade12c4f4feb243e792bbf24d246170766992b745d19acee5182f19b28617632b4ce0cd80cf1c3bd378326c94c
 DIST SuperTTC-IosevkaSS04-32.3.0.zip 27146246 BLAKE2B 87c8868a11270dcfa04c63c1ac14ce08dbdad3da203457078d2be29cf13449c6d14c8e03cbea4113161cfaf98074fdc03bef322cecce5d67ccf8d09f66cb1a49 SHA512 657fde9373c0323e9128e69a9f0d8944c0b54f88d836f1714ef2cc7ec6e0232d773bdd639cc61db4fdb2f45e4596c0d845067b842d8d3d39fd6faa197d6cab41
+DIST SuperTTC-IosevkaSS04-32.3.1.zip 27570207 BLAKE2B d199a821fad920502a4c68603c166273eb2fa9b0e03783336e49ecf41b0cd76a49794d74b04db13eec4453d33c72dbb7a106c8c468a4b26b7238c1d7a2771201 SHA512 fdd9ed8b5d61f77172b461b0ff30e3a2b566777642308840409c822c31c4664fa72a3478ce8be0aec03a0c42945d9f9ab0f78e39ca4728489985f1dece079611
+DIST SuperTTC-IosevkaSS04-32.4.0.zip 27606168 BLAKE2B c37cc83515e140cddcabc5eeec9b55c1f732b400673f8f0814caf6473eaa084d6fa10a44f28e90f6dbd22eb4cb83002eea7c14c4ffd36693e432f927110e8035 SHA512 c6dfa5c89e4aa64f6ce238b9d24a51abeb88dc71de5180a9fff9c28b6c5f76978c6a1acb98a940321fd628e1af6bce660f7e8aeafefebd85b89a7c0bfa8708e6
 DIST SuperTTC-IosevkaSS05-30.1.2.zip 24832838 BLAKE2B 5ced59f755b9c1121b54ea54f01a6c16a8847ea767447857630688514c614a00992e289ae5192412e838cb7017ed65a0e959a356b221761e208cd15875c826b0 SHA512 20e545a14c59d6392e461748c00852c5ba7b0741049072791523aacfacc013e44ba83b0c6d7da77727fbf5f673a820378eb0c23d0627bca0143405b9d86ad894
 DIST SuperTTC-IosevkaSS05-31.8.0.zip 28322407 BLAKE2B cc723ca2eef5461530efdc4b40394a71cc08093c1d9600c386d04baf977dec30fae45fea922a1ba275eef08e540a6c6d9add85d2ef9ac888d27addcf10cc3e7d SHA512 4372803e8a7ab5740454473fe3fefe658d6e7a4c36b6a99c3f0ba45b43a3d58b935b6d7315ea506885c29076ea3c547b67b864fd4960673e42520d9dfa9eabd3
 DIST SuperTTC-IosevkaSS05-32.0.0.zip 28173724 BLAKE2B 3b80b34aa310c2853430ad4988d0fd858d5ecc5d4d46daee685753abb8969a7f65e8d6bde404a6760d72717aebaa6ec7e7bf371e25312746530f4177a62792ce SHA512 2b1fd15385eab19e98395262b5430ab18862932f78243e874b1e89f63e5987e5621255b4e1abaea6d4539cb52f40f6e9978714bd4ba03948de236ffe705bcf55
 DIST SuperTTC-IosevkaSS05-32.2.1.zip 27926393 BLAKE2B 34328bcf119bae4d3ab4cd4406ec7935621d5cc740445612f9544c5c9c149edb492c97e35f102510dd7072c879676b26cd10f3814722d179d150d74b44435f90 SHA512 02fa3f7f78837b8221fb746b8fcb9120bcf0edeaf66995a6b68ec4a89d0e5bb2dc5b3867881a86de3f883990d9bdc61a3f98d70d104b08888f864b7959ae5d0e
 DIST SuperTTC-IosevkaSS05-32.3.0.zip 28192359 BLAKE2B b9869eb4a65720bca38559a38dd3c0d8d4db56087d8e80cc02437ef2141fd3dd17419374d4ba52c0ae01ff527ffe0f355f439ba4382376d83cb89546199d7bed SHA512 5b3fcd348386ebb47710d5598f2c46b86f64f9088c7a1f0886fbbec6c6d71657cd329cf920947a801c945d12038e7d0e66d0b8e84fd7c8f8c1e873c437cc146f
+DIST SuperTTC-IosevkaSS05-32.3.1.zip 28615168 BLAKE2B 8e0083dd1ea0c63d3cb06c947bf981659b7b876c245514aae91ebcf067e6bc4d6ab6412c2229fdb0127aabcafb67680ee87017b13ecdff34094e4808de9a2583 SHA512 0a5bb0d1e2d080bc7aafd1acf0e0a5042ce72c5c493d0f203894ebd7bbfaf60c1f27d535f1b1b2924d278fcf087406fd23f0500f9684f0f2445f121007106ab3
+DIST SuperTTC-IosevkaSS05-32.4.0.zip 28649381 BLAKE2B df338e386a3c13cf9e3ac4c797a206587f4a79fe2f62fc2a27ab2743b6310bda302a125168483628aaff824d35403a50dbda7297a1c4850ab161b8803af1cfa8 SHA512 682c8a46664c7861f79bc823cd17b6578882b51a326d13b48369703388bdd4c8c42d50f0f12c13ea63e4d22b0692f0cabb1394787d82e4fb34f55b3972f17070
 DIST SuperTTC-IosevkaSS06-30.1.2.zip 24428936 BLAKE2B 73eeb6a639f6496bf00e55b7d4aaad0b3aa76df02d43979c11032c895fcb9158160fbe9cca4eab8d54d3fb4c414b71509d315002c6f49ee66907df90f26921f1 SHA512 8b21e8463e5f601d8471dd6a4a4b20b883cf919242ba72a0c342821e62794b1759a4f006f8843b37428b0fc5953bbc3aced667b04e531f61e66b0a011fe07cfd
 DIST SuperTTC-IosevkaSS06-31.8.0.zip 27891401 BLAKE2B ec17ce215ad85d1549b3321a57c609802dbd98679597936f1339328201d9d9247799cc9adab604b159c28fb0d36db83b03390e62c2df5ddeb4aa8526165ff53c SHA512 36d03984f898a821634cb547319b67798874d92f064c075a91c0aab3d0928ffa5a8bbb007b9c5fd57f4440826810ec4c6d27e10124db6cc942f12068e8ab251b
 DIST SuperTTC-IosevkaSS06-32.0.0.zip 27782479 BLAKE2B 350d96080277effa2950e0bf4501bf3559c19ff2c36b2a12724a869bb39f5f66304dac79ee5611627a2f41fd946b08398dacb90afeecf97788d5cdbd1b63affd SHA512 14571846dd9dae1e0335d1b99859f9ff35751a5efd0032c066adddb1a4a6712e7ae96e7b52db3d49eff27b4534d11ad30fe8ed33208a0353d4754f3fdf405e30
 DIST SuperTTC-IosevkaSS06-32.2.1.zip 27513834 BLAKE2B 9368a164a384c762b1e9cb577bab7521587a7c46652eb068fef858984276bfa2e9e1796f16e51e9c45f6bdb8d2ff946f5b95a4ad0cc2a8866a9201c2155ec4a6 SHA512 66fbea10a868dbc4cf2a00123ce4be17bc18d5368c6a136e4ccbe4fe401213c7d31e6ede037c53d900c6a1249a48a5b9960cb0228e65ccc260bfc1b3a5048c6c
 DIST SuperTTC-IosevkaSS06-32.3.0.zip 27777005 BLAKE2B 3a4c1a8cdb6a2898dbc2be2a89227ce3f159b5e0ed0d847f0a1c607df1a590a7304079c253fe0a7f1b5a932c0fc3850e107fdc0f9e102db26ed0c1a3aac29742 SHA512 eb5ee61cb3102dace712ca86a0872cebfa5369e777a2aaa8410fa0dca86ca1c3b13f6292e981951b78e828b0a5598c312350deb26a7c5dade061f305a353ae1a
+DIST SuperTTC-IosevkaSS06-32.3.1.zip 28201393 BLAKE2B 724927633f47b940d0d55fcf6bb14ec6c1fa7376cd702275ec52c919f4370bd2e574d4dcb702cce9847fb740592763ff30619c846510bd18fe45758dc684721c SHA512 2fa33361e23f767ab2894e0d002163b88720d4b1ed8833e2ad0a6dab708c3a3fb449cb804e51777912c42c024697516fbf4f005b16255014a6811e6559bcea9a
+DIST SuperTTC-IosevkaSS06-32.4.0.zip 28236940 BLAKE2B c648a94cf9b753cb39be3ae041627d597d6e684656ab24f744d8245bdd46c9b4230d0d7d5b7ae3773d6bf470cd84ae9552d85ff97f44704880bc0215820abc01 SHA512 45fea9eedcaa324824e4768f530e67760c3ff2e66ce438fd78eb2d25c957273bef50106be7f17ef4e909d3536bb8e7451ff14b545ef20e0d09b3320d907250aa
 DIST SuperTTC-IosevkaSS07-30.1.2.zip 24293358 BLAKE2B c0a90320175f310c270d10465d563701bf32de0be16a3f822cdacbfed51f056b77cbf83160afdcec3735bfc7801110568b3b148a054ac9d07787633659f1a9d1 SHA512 7e4a8280a9fc9de68302575d5d2f697e22c1ec344b711677c66253ca4a97b656202772851a7379310f5c4a19c7da561f15d0e69e9e4098c10b2853480d079d7d
 DIST SuperTTC-IosevkaSS07-31.8.0.zip 27486237 BLAKE2B 288ba9b14bb9bf2f6884b2afb49ffdc7a793d5b53e0a2d6acd574be66eb85f463285a60c30f242d31ef7dafd23f4c341a3af88f67450aaaa5cc579d846b12f17 SHA512 bcd98c8ace16f532f599cb041563af183aa5b7a1e3a94ef9c4fddcd190e88f023cfc9d4888b5592947db2c9bf7406d365d8e9b2c29dae8d78ee051b812f050b7
 DIST SuperTTC-IosevkaSS07-32.0.0.zip 27351179 BLAKE2B 55573888d4b53c6f4346d19ce261620f70aaaab84d79bd23cc3c993f40a984e83d5f12731e9b4d411462857efa18a9f11165aa0c01160e66a06c050135585fef SHA512 27262c3dd60d1932a15dd2a166cab5a5902eb83cfc35ad99866dbe7c22ba0058aa36bf3a6af723d89bbc3f20eacd67bd2b06f94b31056ccc4609d7d82a836dc0
 DIST SuperTTC-IosevkaSS07-32.2.1.zip 27093113 BLAKE2B f3e6dce72980e8fbe553d4ba936e89fbf40d3e7c39b3b784cdef0b89c01a7280a4c3b96374edbad5862d2231726c7dff07915e618c2737c37c7fd02062ea38c5 SHA512 8d3cf6ad11b2db238f59341a8fe565f894ecb30beacd98e7746017272b8b975e15e6aa93d399a3978293d729f28a933b7e7f20de8300e3dfdcc7f7a7d5b8b7c9
 DIST SuperTTC-IosevkaSS07-32.3.0.zip 27356150 BLAKE2B 1f9c199a1fbdcc62bb0503d2c8cfc2fde4e83eeab686b2a6891e12b4d4b978c836774ce09d98383f615df266997706f6ddb4985f15ad27dc6378244c6a0c13e9 SHA512 9b74ace0e14b65528b779ce57daec99381d13a8c0de0d39a0d04389a4b9900f1c5b2093e6a756305610268dd05ebd8eeac48429b38f9a9918a91ee165a307707
+DIST SuperTTC-IosevkaSS07-32.3.1.zip 27785194 BLAKE2B 7ce6753dc1aae0c658f1277a168e46cfc26ce6cd390edfb8623c246ad2c743958d385c3b5169c22d0ba3792ad991d63478e70ae5ff3bf6b3e1e6b65a7248d8a6 SHA512 eef4b4edf4eb36141b382550347fdd9db56f6be5e2b699f986c7c8c9e71e89a020a949a158816a43f54eefd6d334449f80de8a7797a4219a21886dd946b0546b
+DIST SuperTTC-IosevkaSS07-32.4.0.zip 27818436 BLAKE2B 7445e2b92851db38f1471a343306eee938552455fb4704d92cc60c74c3dfd0a5980708abe8f9893c26580c82103c8c9c58607c64eadf6491117896f9e355fdb6 SHA512 890abf538bc3f7f8d6ab7d240923b2e073d5efef033e19633faaa5235978ed602b37af78e7045d83095235356257d1efb7f4c2fe30060b2cd5f32834f8529d81
 DIST SuperTTC-IosevkaSS08-30.1.2.zip 25166941 BLAKE2B 041beb281fb353db954a1e4585fe3cf4719e010b90d9cf65f72a9d09a0f0899eba8f6a8db464464add7f0b008fad2d64032edcb10a56dd0402524cb30adcf8bc SHA512 0ae712687dcc0090eb2bcc686349888fbe89b8cd817a00177897504e1931b5fd34eb870f861e3ee9b02597a39a138c0b83b535bb1bcb81a443f7492921acd39e
 DIST SuperTTC-IosevkaSS08-31.8.0.zip 28872252 BLAKE2B be0e44cffeb5b2be47ee8329a76e3b9fe65a0e66e381fef2682bbe24efb68512b5e70d1682db3fc23635f6515356fdb7db6ae45b2260abea6539cf237d83e6d0 SHA512 dfe284be2800067a1f610ca65ce88ebfbd5da52d817f56feb27f755e2610f55f42a2abbf8972e7ca4a8538f123d27b83f147074c8fbf0fb8d444feb7a4b20885
 DIST SuperTTC-IosevkaSS08-32.0.0.zip 28641993 BLAKE2B 32a69559424146457bf707e9c36c50ee84591241b9aa5e11c308ff3b2a0816c7eeeee83e92ef753fa54057fea9df9774659c99190fb781b96677438b72527ab1 SHA512 c9884d023644b2819a5f4ba69192aeed43ed7ea66cba9f37055f62d36203441dfb1fb646e3a8a17c7b8a35aecba27d466b0f4da8bd743130781874269275327d
 DIST SuperTTC-IosevkaSS08-32.2.1.zip 28380422 BLAKE2B fc4365ef2c1daf0f6542cbdf6a6e2ee489ed9c7778320b7959925be2b7f6d64ff7a0fd128e54e8c454988ab85d8f71cadbe947ebd334d8403bf67be226f50042 SHA512 2b25eea060c825646059ecf70faa73ec42985ae85def4b9dfe56aae4b090fd44869b07620dcc637d5eb9f0084324eec34b313154e8f7ee1946dbc54cdfdfbe9e
 DIST SuperTTC-IosevkaSS08-32.3.0.zip 28650822 BLAKE2B 78f7b3a0594b8a44fe744a96922ad915f391265c948b6fbbabe84ac27e1147ff6beb187502a17644dd47c99eb1bf6af085767a40d0672278e2fd968c8242c7fb SHA512 fa2790a7598bcfbc1c9504f283b4c442bc4d5d554eb6bf4ef558a1e47b1140bf64c6981f47bcfa425b3b047733bacd224111363290f8121df464d7106c491d79
+DIST SuperTTC-IosevkaSS08-32.3.1.zip 29078552 BLAKE2B c4616162c7b7842668e7532b4a60e76386bbb90143f443f6b1b577657d67be28e2f52e7cd800588f1d12dd399ff88632f3e0f267f7aca887db0e2151a0e8e790 SHA512 39bdb9a96b014b96533ef516313de020a54a4978e7fa1ecbf7343e9d64bdd7433f582d4f192c5e2074a79d77f4378936f7277c59b7f3661b70f9460e282f5c2b
+DIST SuperTTC-IosevkaSS08-32.4.0.zip 29108124 BLAKE2B 6a091e731099dadf2cff1f4208f3e791ebd7599fa1d1d81fee5ede6582a05d2909c1c75603609fe6a514dd525fb1d5766e869d8379c97b775375af6fce7d33c9 SHA512 aa8a2e8b616a0677c606547b7da3b427d60c6a2045f6750ad1d735b930e6d3334ac7b8efd826ede7e05fc13a923b188dbeb05e14306c7203f3e9123133ed7170
 DIST SuperTTC-IosevkaSS09-30.1.2.zip 25101794 BLAKE2B e4fb02aae0628fedb7285fa78a3e35a98074ada69ad01dd49959de25f3605d6a202cc65ef3fb646e7dc3ec5481b194951c1497cff9208506fe244d0612f693a7 SHA512 e4636043c36b131ed2e8d96ee17ffe4c0d4f12c74a406debf7ea61af23e00778bb579045f45bf663db3e512aa13a882c58a263fa60a3e4a62ffc29f291ed5a37
 DIST SuperTTC-IosevkaSS09-31.8.0.zip 28555008 BLAKE2B 530eb7fd0f56045767f8f5fae0507496848d13afa067faba6f162a8db87ae25f21a4d9855647ba46fcc2bc7e0d12b8e80253a736919db2866a73996e16681d96 SHA512 934ffada975ffe63dca0bfa7c130d5eb542d6754dad911b0e3fee2d3cdd15aabe6f00cfeb71740d38f7e4ac5639eded984219370088b7d740e0b6f5276adeeb0
 DIST SuperTTC-IosevkaSS09-32.0.0.zip 28401785 BLAKE2B 41d1dc9a62711086802ec8ee557f114123ac92a6d2bb22c9c90a2a27b371cc5ce6d7a65e0bf75a13301ffb7f1daf12d6c846acf836ac718c1cb9a3649de2b947 SHA512 a613de1e6a0865756180410960f54516c338a2de1be8acbbf2828ca29b4168b9d4f93ae87609667551ecd2b99c2e44d10bd803e6fb1fc374401fd396a78f80da
 DIST SuperTTC-IosevkaSS09-32.2.1.zip 28143130 BLAKE2B f0127e6ca5fbfff8ab56d9af1bb6cba3d725d5b79b8251a4e68ff054029c040886344263efd37c25be43dfc9286b4739d683f5f6f30879535f962093fe2523ef SHA512 931179607ce0eeaeea83aa5211d8846b48e66c19f50571056c7ab24e6f1b4ee9a39dfc211eb688c863073f844a824275c5abdc4b86bf2d7a8f72a7baf205b492
 DIST SuperTTC-IosevkaSS09-32.3.0.zip 28413238 BLAKE2B 55262401188b3f89cbd18c06c4418be8129875ee15817dbad11680fdb620efb87843f099012bbe5bdbe2e48cbf9be6eaf2839cf4e650672fb219758d0cb376b9 SHA512 a789db19181c3962a556dad7a2e7b32616b77c4273572774e54e1ce82608fabafc26ea745b27d5584a19b564eadda4848466ca9438909e8d55ddee9159fcec4d
+DIST SuperTTC-IosevkaSS09-32.3.1.zip 28835836 BLAKE2B cbfcf712632fd51388dc790bb6ce6083b2941692ab28c8fa8d817a94d41422e8f90edcfcdefc8df556433dbd2da57598c7e4c52eb2683a1e1e250042dec364f6 SHA512 78ce75d92f016796f1152b1a434426c7747211660d5089ab708f463712d3bd985a180dcd1d24d21fa138f65bafcea8bdb966f00a8b98dbf3f2a10a36f61522e0
+DIST SuperTTC-IosevkaSS09-32.4.0.zip 28870284 BLAKE2B 282be76a80cf9b23f0bc12f83247a65aa7a03af22ed450e50e3a4743ba468ef9ab128277adea4dcbe8d5a81836c06a723686b52b29f5bc4d4ef7db8f4170566a SHA512 66a6ccbe344b83c143b62ebeca389c917ea4b4ca4d4b6fb9002d2412a5771b7e93d09a9142708309a5cddebdf09e6aa501c71fd09c3cd36c60cb96c54ce38947
 DIST SuperTTC-IosevkaSS10-30.1.2.zip 25864032 BLAKE2B 70d866a5f1bece14b597f0e713058dfab1b91740a241bb3a5623a83304ec805042af9d760d448b96defe312500be4606e00fbe55e28ede05b1b524662ef8ebfe SHA512 ede74c5bfacbd044f6a52de762bfdfefb1fcc3b59248aad09de6bfd9028b1eb10fa75110f73d382da1a128455a9fa77b13aad280a6d971a7e09d820344008f89
 DIST SuperTTC-IosevkaSS10-31.8.0.zip 29390929 BLAKE2B df6149036429b5151b46ffa632f76be4d005f5dab83b8908ce839c6a9700f7bc2220401b4ad3f069a7e576bead8995f1cf125fb54ce9187eb14fa8bc4d05ff59 SHA512 f9eeba01ece516805c920ace22ac297cd6c1627d8c640940d2e884c9a9e01b8b9ed33b2a70d9148e2a6b345feba7427f432af6648fceba1d6b319a76ae4f6d77
 DIST SuperTTC-IosevkaSS10-32.0.0.zip 29226678 BLAKE2B 1873064e707b925d1327d6030218cadbfc005870f904f0341aa0bf95a79aa7fa6e6f6eb1a369a2c70d1fc1f422bc116a36ffc5b2ac635a2a572fec5dbc1756e6 SHA512 74de9071d2181de10cc4baafd2ca269edc9e3bdbca07f2a6a4fe972584fc4616009e987154cec44217150b3fe34544aa6cac3859645b299452f107d8e13b9811
 DIST SuperTTC-IosevkaSS10-32.2.1.zip 29004739 BLAKE2B bb9d960694eca0d9711dc21e7daeacdaf2839c2a304696f5862aff2618d76fed0f235557a8cdcfded45ee5e06a62b5f90870e0b69fa9d468a5ae2cbef4821589 SHA512 1d684301bac5024a6c4d877f726ee41133624680b37fa1e9a93f8d80a1fc3d72a33dc0614af84507d80dfd1f25f5339d9d6ad4af1c6152863f1b0574ebf8f3e2
 DIST SuperTTC-IosevkaSS10-32.3.0.zip 29266504 BLAKE2B b73332082ef1b770d7ff02b2f19ee8e49f33b00905b507625ca8cc91daf93ad1bc0ab379cdf48898da7daac294dae76eaa36f30656ce0f706eb3eb85395a18f6 SHA512 98541064c61ce1ede25b222d98cfd061b2cc34dfd34f79b0fe43c6ef8272c4f8ac97ffe114f0593fb647054a820e5be0956e1d849b96a5e0f43f952bce31b7af
+DIST SuperTTC-IosevkaSS10-32.3.1.zip 29697670 BLAKE2B 0b69d97a83912b262050828657bbdcee88a5cde893274d8bb62c5eb538d02721f69e70d71ce26aab07727fe17aa00c73f30b469ed4bf8cf0f329a6c8969f3bce SHA512 4039c43a1731109582cdef407ca9db40fece98931d5ea3ee26206458a3ceb0b29b686480ee17176376a9f316c5732b868ae10dc446a0ab8f83fa5752a0b050ba
+DIST SuperTTC-IosevkaSS10-32.4.0.zip 29821904 BLAKE2B 333c174f10d0c845b70913b27fe13f4aef64d8011cc5c9c0ac32e72005be5f858427ddd6a02733c60b949707a5535849e069aa396db8e12f39fa1ab5e66319b1 SHA512 11844caa5cf8114bd480b759be5fd3aa4bf0a0c13b14eb05c2a087fe53e83db1414c0578bfa1b27c70cba37d783ad2ae85d3492040f0e321aeb3ea8419d4113b
 DIST SuperTTC-IosevkaSS11-30.1.2.zip 25967120 BLAKE2B 63a6bde4b23b3ea199feacec3a82007fd89c01797a7b347923cf93a27affb9b175ea8a8df0d9a728fa378017355605870d12afe05879b82abb1c1833752837f7 SHA512 3e3380bad13ed4c4085d09ca44d232d9303cbe713df8ad0a395edfba42c1e1146092091fdfaca534d151a43501bfbf828d90f1986d246bc097fd167c342ae0d5
 DIST SuperTTC-IosevkaSS11-31.8.0.zip 29497731 BLAKE2B 9d46659a5c7f374b1d637d62386e35432c272a2a7c7f4ebe9f4c5e579b56aeec273e0cc70fc325c7117f021b52d03bb65da2f885e9317b7dcbe6a2c7cfd170e6 SHA512 e33159859466ee0c48a91ec6c61e1c868f6793d5cdd7bc6dd161b2a937550cae66d467f091dee6a30311a258c1fc7c44fcb8289122273a9ab00208596a7077a0
 DIST SuperTTC-IosevkaSS11-32.0.0.zip 29409608 BLAKE2B bbb0124f3673a4268af275baaad5d17b45077db4dffcf836e78c29d66bfcaf2cab5ae79287a7a1b9533f2f12a9b3b8ced4cae4d84fd74dfa838093f52c503abb SHA512 8ce762ddb6bdfe2ffcc747668b7e388b576fc356f426fd4c42e1e60cab8487fc572157150367ac797cd7bcae6c08cb8a66dbe9c75ee2a0388f07adad3e7e5e37
 DIST SuperTTC-IosevkaSS11-32.2.1.zip 29215521 BLAKE2B 12415615d0b2a4ee8e518e737ed3936054fe638bf95a2fa71d6b9a9eecb55cc4baaa3b68d4402e6f6fb25b2a3fdd606b011d11c5558955bf8cfc3c6bde4582ec SHA512 a4d03862dc6073d5a51abc27c5959c9d86f7f51d6a1e60cf52bbf8729bc6564e187c6fe86d9198c0027910e5d06822b02b5f6ac96bb7dc37dd159cd856d63066
 DIST SuperTTC-IosevkaSS11-32.3.0.zip 29573605 BLAKE2B cbc8a16831d88b2b7ee77cd67402ce823d67f779441d757f8369bbd4c5c3327706bb13b6f474fc642455f6f1af616ed1b6c65495cd4696bb8ae261f61586d2cf SHA512 c07a0bb80fc9fc659121d735ee8e4c74d83f7f7fc929b58a9ce700085b6887f532a59c0acaa9e9e603a40efe56a16b6f36d5482c7720b4ba5e51b3964a60ea96
+DIST SuperTTC-IosevkaSS11-32.3.1.zip 30005905 BLAKE2B 2ae5a0dab2e7287036f2e880bfb43c58d30aa3955d6dd09275b59873d3bf501415c93461e23b5e26bc5df71f8f916edef4c7764681aad6da7ee24be6e4ba5dc1 SHA512 519975c9d6dcbc861c2fbedc616fd79c8dd5f03ae214a99e6dc4bc00398698f6e2b73ffdaf52e05800946d2be42e72e75848d8da7741fd3a1e39d0d821e84edc
+DIST SuperTTC-IosevkaSS11-32.4.0.zip 30036329 BLAKE2B 4bd31785b9966c703d56a892285530f6f32954c50aa9e4306114da5687fe727c954c5157b829f5988e673f0cd80990755947f5172bb85e8882c91949b3ac33f8 SHA512 6f6ea4187e6fe3564959a223f6e3be4600e2ca6e803e532c510300dcc007b31d8425f60c12b57fd82cd9e7e67299706089082978e503d61a1e098b03cf6d3593
 DIST SuperTTC-IosevkaSS12-30.1.2.zip 25403395 BLAKE2B 796fafb18bbedb859498d7c03942c614229b6b7e23dae114cba9a1e45b5fdc23d91a5ff0e2c1f1220c291a4685aaba96faa82f865f3dbc458d69642f720bfd39 SHA512 db51eaef6a208c8e3e86581e9dfd772157abbc4872614849caa9ec3a376141110ac1254a2b2e9d5ca3f2315b5e4b847e3203fab31d918a9209f2167dd140c2cb
 DIST SuperTTC-IosevkaSS12-31.8.0.zip 28890910 BLAKE2B 00169535dd2221571698d43cf8851440a883116120c76744ca3a0b71a1264afb3aba149ce6128a2c2ea9ee987deda3a60a57a91aef605d1724f80f9451007697 SHA512 7d9ce1c9284938cda6f35fbe418484af3c9d28b13bf74df2e962e8217536eba8d8642713daf45216d031a4c31ded162ff34cadcc9a4fe4ab55bf5af810df431c
 DIST SuperTTC-IosevkaSS12-32.0.0.zip 28729895 BLAKE2B f30e9de11ad4b813d29c13cf68180ca86d7f5b6b73c9873dd54ba6cc1325db271bd0a885a60ff8ef31654d564e6c30fe37c9bb93424fc76512660fca34ad21a7 SHA512 ef01723ef7e364e59ace35d684699026072cfa65af819a52d3db38d98e7c92cae03ac6f3fe0ba05937a46b398e299bb40195cbb045e0b82c3753cd594efef9c2
 DIST SuperTTC-IosevkaSS12-32.2.1.zip 28454597 BLAKE2B 369c2ee4edafc39b71479c492a18c48269989731239ad3867decee72a74ec5e574cc7b55aed4a893ff78f8f5cde8562382e152ea5bac517c83d1e0013298997a SHA512 6a9e98ed7244d2a33ee93b3b4a50d906f92912b26313c2bd08016603404670eea7affdb38e5d2b5a0f62f2851bce2dec52d686bdd9fadc155926dd6e63da3e0b
 DIST SuperTTC-IosevkaSS12-32.3.0.zip 28715879 BLAKE2B 9b2df59b535c43a9faeb996046772baf8f41725fe26285b323e2ccfdd5f6ff9647dc3655ddde07288b79f415bf75e802ce0b7841b6d0406f3f374c131500bd53 SHA512 ab39380424c016e508cffccbd1ef15433e2ffb147d516534a72108252edb45f1af7729f1f43166afcbb5100806d79653fbb4c689189615f10341ae4a28d7ce6a
+DIST SuperTTC-IosevkaSS12-32.3.1.zip 29142515 BLAKE2B f7ec1dbfc885f50a540586123933c29ca25ff78ed1e790a301e3d09d54d05a5a61d858526bd0434926a45c9c716aacb0b7d35529c7ba636daa067ac310d6954d SHA512 83cc4195c806ef084490f38e4fc1950f9fc1e4dd82f088ea0023210c99632f9f8a2ef8184a52e575fbadc4ce8c03ee5fc3406f7f222b76b473865072232b5617
+DIST SuperTTC-IosevkaSS12-32.4.0.zip 29169888 BLAKE2B 63938fd1bd637320438d6dae81a9629a14226b70e091a5f7385e25548dc4045b928276e08cb05995ab209afdc8bcec6a5952794fb707c292d296147cc1ee3c47 SHA512 a9774cc954c8efe7a77f4cc47680c93978a5bc44dfc76553c1e7ebe22e987c9a6b9951449aff8019982aef052b2c01b925ed4158e031bb1a295e36f5fd7f4e83
 DIST SuperTTC-IosevkaSS13-30.1.2.zip 24393882 BLAKE2B d9582728327183ef8cff0077eb1050c21a849c2d5fd62841de0ab0d516a25ac87cdee5b57b7caa768278f42ec76dc7a62b7df4937c0718d2543401a5bddbdd58 SHA512 a9765b75f9e509d45d08406fe196dda9a047bb672f9a72b9055d332550cc39b90d919fc84f25280fda8d3d4aee24a69236d2e800944b7de9578990d471705833
 DIST SuperTTC-IosevkaSS13-31.8.0.zip 27801261 BLAKE2B c2f32087b9751375b0e569d91367bb5cd2f1ec8c91c134deae4e71cbd2acd8af8a523a9cf38b0a08cd33e053894cca507d8cc0e151b9a150ab3433cc9bfdf816 SHA512 605375c999191b43f322690e45505dd79ad8e7df275a5f6aad43c72fe7c819fd371ef8a2e2d8d0037d49f7fc6b33c20cc14372b7cb2fd29f67eeb0ec60c8aa4b
 DIST SuperTTC-IosevkaSS13-32.0.0.zip 27695414 BLAKE2B e4031ce0d05e6f45fee09bb877d267be582c9d9dd0c6f9ca6d20e96c38a350a306184a89f0508d11ccea6a7014755e6b7c465994efc614152d6270c7dabf07b1 SHA512 7d6a00b27a9a468274d40d669776660e99de95ffa6aafab14f39d75ebd54bcc2089007b29cdec1e939ca873a00d5f762ae29fe69b05417b006fe75da4f04a124
 DIST SuperTTC-IosevkaSS13-32.2.1.zip 27447936 BLAKE2B ea2069a1f96ae57a6771c7df56066513cd41c0838ae12548147777c48be12cdfb6f581a81555eda3899e80c7db4dc82f58b2d0b22ef0304d8a9294d2d488061b SHA512 be67624f52683178831bb77e32e0d34ad8080d1c19a4941c071964c6a728be4f7820e29e9e163d0f1321af00d2af7b2e2eb7c34506b9f450757d6e241d3014ad
 DIST SuperTTC-IosevkaSS13-32.3.0.zip 27709067 BLAKE2B 6771932ef13eef59a11ab566e59b94e68317b150d85576da78eb4a2666aedca669eaad30d97a1f08cf12d36c177a9e5937aa57e276d17db54fdfa6488613bd66 SHA512 412051617accc3c50f019d0522e4b00349e8e1f8f4d75d63ac34345fc45d94415eec40d1eb171a986714edfe7b42e2485454de4c462046c5403432225b55e01c
+DIST SuperTTC-IosevkaSS13-32.3.1.zip 28135764 BLAKE2B 618281d5f3b655233ddbdb60b3375100bd2fab9fdb56073df42e6b59d82b83e5519638d6dde479b28ed1e3409726e1f7a0ac13a78dba8b35350d3429ec4b352d SHA512 357579b798e2c815186032c6d2325287320720d0aedc2ed9169f4a7f3efb0d7aeb7a2998a6be148015ffd2f761f0919dc08beb08bf25d9b9b6b85c9908569824
+DIST SuperTTC-IosevkaSS13-32.4.0.zip 28168705 BLAKE2B 6f943ed3b328952b3f093ebd1ba91d08520bc84023e4fef647c509b28c8636a9d6a2ff6274b6a26ac0f5e077822b9de53b08d316554b9fbc7eda257acbf09ebd SHA512 915856c8476e6cd24ecf34d414fd9034bc2b09c9d3505e2f59cf958fc552f2d291d23cd27a76430ac53e9e3b3b9fd9364c98a90b52d0ba633f455fb3c1cbefa1
 DIST SuperTTC-IosevkaSS14-30.1.2.zip 24403959 BLAKE2B af9d6189c71a38b82f77e394950816b8dff8453b5ab7b8c302ebc81879b9313e18ef40ce6d7c3f851913629ca602b5642d364869fb765c863d0918d8cfc11250 SHA512 2b9dc5b26c79fa2672a8c938db1ff469b4f333d2f64e3b2fcac760c63ad977ea8a2a4a53a21193b3cf11942b6fa027a8d5138dea01903bcca5f7e20d93ed1dd0
 DIST SuperTTC-IosevkaSS14-31.8.0.zip 27825634 BLAKE2B 113096e485d842885181ffb1b2763fa678428d0bfd24184c2070a94066a98975986b505a4ab6e4d474dc85ffb229b8665eb31ab94d58c65b540feecc4b50cc69 SHA512 8e9bfa4815cabc2ff6d880e79772bef640c941b02fe9e79cb40d0b3070cf3d50ab77477f541f879d7cb2487913c10a5406c21fd6fb16cd1798f0f2471d34e81d
 DIST SuperTTC-IosevkaSS14-32.0.0.zip 27671102 BLAKE2B 1fc4c949870e4ad985c3d68528e04f4112f2a28877a7e1ac0d2cc861069c0c6b9188bbe97abc4ab9018c5c54083eb21a677b4b52bc9e307fc80d605b10b3cdf8 SHA512 3bf723bddb30e7206adbe854a21282ff62623d4dfa5e9de84ccdc6391ff8d48b721f92ca0f9e1cce71571de87a6a44f8cbd294fadca7bb13d27bde2a90b3e354
 DIST SuperTTC-IosevkaSS14-32.2.1.zip 27378317 BLAKE2B 5e784e9b828c636639535761dc01e3102443205cd18700105d019a88d4a00c45f5ef3038f907a1404b27caf26f4bb72940fec93058b724049cf661dcd9e209a3 SHA512 2340ffe5de84e162313e8edb275aba100bae55669563f37230b1d40871b0e1940d2bda488e59729ef1729bd331a9060e95b44a5143133e30493265254371b4af
 DIST SuperTTC-IosevkaSS14-32.3.0.zip 27639820 BLAKE2B b57aaeaf2ffe2f619a13e1d779d4259a54729a84ab45fa124d2496c11fc697dd8c046927b9a945a36f00798be96870616e0cec4dbfa99a9d7d46449ba0a7c8da SHA512 ad1956d300d504aaf4a92262eea734fd8c50ec1137a04aa91409fabb70e16a2eee1960411fb64462288d6529d7f642376af28807a196c885d984dfbcaec4c31b
+DIST SuperTTC-IosevkaSS14-32.3.1.zip 28070170 BLAKE2B 646ad67a0e8929babd41aebf190bce9980801c45905ad3fed8adc6f5670300e77337b648e53e84eb4600f9379e7303d9a0c82768576f78d8fd7cd52fc1938381 SHA512 06f792b1d2ca9b04881283c7dc812328f84877e373181392449b38dbe508e7bdb8c16342b307cf8b98c02aa386ab810d9659b92a5f4a6586216a43c60cc4458c
+DIST SuperTTC-IosevkaSS14-32.4.0.zip 28099431 BLAKE2B daea1f0a62ee00225184dceb0879f307a4059fd76eebec3f616e1f084824a5e6c8e5be4377bc97a3e8106cf81fc4e8c13b5fb29b248e87877f5db935632b22c3 SHA512 d0c3afd3358a7e5022980175d5c7607475c75371b079bd19160a35d37c3602b32ebb81b550d6fe0f2a71af7af92df0fe097b05d55d0b2103b1c631cc082e2ec0
 DIST SuperTTC-IosevkaSS15-30.1.2.zip 28926353 BLAKE2B fc43cbdb035f7e60904709e75a97baf3a02bcade0de7cba3222465579be3f239c0f4ca65bd7e29fe761d4270046ad13f62799d8bd491c5d89b1816e9b6e3b8a4 SHA512 e2c4db2ff27b8b447e2531b9ed67fa4521a7d9baa640cd14581a3d158f6bab7ef9809df3bb024a7eee6a5e6e7e5c21df4dfc45696ba53134d7075b97402b3711
 DIST SuperTTC-IosevkaSS15-31.8.0.zip 32747390 BLAKE2B c7706c85934535fa0b59ee48e0b7990144879e8d1f99818ca98c825d8f0068dda59f5ac277acf270c767f38831ae8a349e8d8e385924bd4c972420ea29a92afe SHA512 6f6fc4f449f13ec179549cb8021b1ea2a1353b4622bd610470166f2c7f88bcb2fe79fa94986623928657554f14129da101f30fcf0787eb0002a5b363337122ee
 DIST SuperTTC-IosevkaSS15-32.0.0.zip 32563063 BLAKE2B 7b02462e18e48db79debb30714ce58eab6a024ef5998e7ebe92ad547c9580d621b6ba792cfe1af47ed9eeb0d625145f08c85d05052839e3d27c9af016a0fca67 SHA512 9f3c3f03a8e5a11f47ca3867145f0288cd788ba5439ce973235269c0fc3875d603450be0d509c8e0e8f3313f5886dff46cf69332a9ff03a2d7808fbf30443aad
 DIST SuperTTC-IosevkaSS15-32.2.1.zip 32555912 BLAKE2B d957abf6dceed01cd74a3d69304d9f7e90e7c6e5464dd516ada2fb79b43fea23482c43bb7cd4111af7c27e1ae5a3922df4809546e0eb07b5637ba78b1260c1f0 SHA512 3a3bc30f10f1df60e3b04d1dda3b6b6256bf337699893584d648a6fe0439983508e92ee38322beccb235785bcbce293807cc9760ffa7ae7960d38e2b0d4255f1
 DIST SuperTTC-IosevkaSS15-32.3.0.zip 32830244 BLAKE2B c379da0a0bdfb7d3c2e45bd810209e0d588709c1f0664bf554768f5b4cdf6ff5091a60df9762bd2ab12a09af318c66d60f003681573190be3a48973a6a922119 SHA512 73ce427df46fcbf638dccb902b659a02c513f756fe6ba23761eecc0234845a9bfe8041725add2abe8ca352d1c9f33ff3b7d7e05ba519681338fb709f60bf001c
+DIST SuperTTC-IosevkaSS15-32.3.1.zip 33262165 BLAKE2B 5f3fce26bc2c9b7e9c5bfa391d2c055bf9d50c8a34467e6c69d8ac9dc1a60635f5a8eca78573e61b5aa6dbf5da6b33d0a03318f811b6ca008574f5fa516c009f SHA512 158410481110476d69ce58a6d0584fbd22110d5ef8a64c042966aebbef470ad120bf97783338e1e3110456dfd0889a7c80a1369500ddd346f0f8464ab604d8ea
+DIST SuperTTC-IosevkaSS15-32.4.0.zip 33293757 BLAKE2B 1963989952b9adaae440aa9cadbf1dd6dfd2ae8cb3a2910ad055c30160b2d0151fc6a39fcea7e59d21715ed975fa2d66138aeeb7777ba21289504490cda2aa25 SHA512 2b00e1f725d9e734141a728ad76541305a577610b072670728579261fab6fa9b9239bc57cd3f36d8b22ecfb753cf95cccae72a97516cb6298d802a85824c7b93
 DIST SuperTTC-IosevkaSS16-30.1.2.zip 24572782 BLAKE2B 4de91ef21060350ddff7b86b11aced6dd4c155e1aa47d7ca21d527764fcc44bc9c3265732060dfc55c7e3111482b07b9fe1bd96e73fef0f1417ba6d37244dae3 SHA512 53daaf0eaaeb38b996e204852195b1988900d70c72c27a693b47191f50f4ffd1c2dd76026eb4e508dd0456956443b3adc7312360447dff31fb73286ed1ede954
 DIST SuperTTC-IosevkaSS16-31.8.0.zip 27738645 BLAKE2B 22714a6da646ae143ffce2951e06e602690e61493ae5b40ac878e04bf40caf118bd852afaaee0ec88f53750d850c463a618bc59722035bc3578d1246b2ee4f2b SHA512 858b70616bcf4dab01e0de657ec5c6d4d8c2d0a5d5745a36bbefa51535f198700a92232e6ceb50d18989f0be017e56ac33fccdc0f32e44ccf1484f4d98c5f1f6
 DIST SuperTTC-IosevkaSS16-32.0.0.zip 27604531 BLAKE2B a0fa2772c44056fee95792c62ad7f23963efcabd6985ce6ff40c25399178409186e613e5c51362cf9bcbb5dd640a2f2aa5f9d081512b63027ecc70ecb3e8c7b4 SHA512 b39f111cf2e8a1f4eeba758ba0692aa09b13ee2cb906ef5cdb941a708021f15f6ba5aac4fe01433e43eb1de4f86e3639a1f0e8ffbf802fed0aee56051d49f226
 DIST SuperTTC-IosevkaSS16-32.2.1.zip 27373090 BLAKE2B 1a4ce448e7aed493635576be445e1099f85f91a0ce0825812a9b77a2331fc4678f3300127890b3b9cd156e4801960c56a5e2769d24f773bffcfc96568035e360 SHA512 415bcb904521bd96d48ccc0e772fcf0ee9b90b0268f9221f171c4e167e7388b8a536b308bc82a3ff83479368311159099c0e3ddd815c0a33021c3fab59fdec08
 DIST SuperTTC-IosevkaSS16-32.3.0.zip 27635535 BLAKE2B ff348ea99982f8157af4f7a940a3aacd40f961300a55895eee5bf400b7d7fa56e706c822ac222b18347e6b341939cfdb07f5cb6b270330b5083fcfde20e7958d SHA512 70eb69a2e18c7d7c29ae391e8f6a48a75e948b7e8fb7e405af6dd68b68d5ada1a053cc6c4666f79653aa582b7f547ac9b493d8489fc99c17ecb0a631205c10b8
+DIST SuperTTC-IosevkaSS16-32.3.1.zip 28067637 BLAKE2B c723a5f18123e07f519c578638ec047985d10b207dd57db3c0e60e56c4b747fd742ebbcbf49a42f86fd6f2b234ac7002f5cc94b2d7e121772a685df734e4936d SHA512 9b405201f522235b92d388693e9061ea411061336a6db51fb0600d1062f2489aa61013f8c3fa26c5747e110be644a826d3827c6105b427172d34cb748b516963
+DIST SuperTTC-IosevkaSS16-32.4.0.zip 28100943 BLAKE2B c7eaa2bfa8c196d3b8a427799ad17753ec3308d7b0db78e1509a2bf3a61d22f67872d310202cd8b7b0b8f27cf8bd0646d676387b943cbd2fe73314f3eef17335 SHA512 83a647d94001a895ef8514db45a0936b407f5fbd8a754380828c913cce3345212aa89d6736ebe5ed98554b595aade1f47a9dc1f4e77f2e014567d8fc51bc9523
 DIST SuperTTC-IosevkaSS17-30.1.2.zip 28810734 BLAKE2B aa0a7379c23b59ae95638268d009bbf665b5f60bbe0a701c04899be9841c118401d9c065d955a2ef71a58454c29fc0ecf56821baeaf081e0d4aeb33f76b0366d SHA512 01dcc80aa924a042b5b1c2931bd4965594572bef84887ba7b9728d5d7db38fc7e2e5b9fe6bd80c940481d63bc7076da2f9bd85b671cb9228fc317fa5c19a5bf7
 DIST SuperTTC-IosevkaSS17-31.8.0.zip 32243123 BLAKE2B d8784dec27cf7cf9fb661804b96da98852afae63cb46b9d8985b0e1f18ffdf3422f2586cb4be2d4941b38cbc284e9d04cd63a746e84470d41dae2495b7368252 SHA512 6bd96eb1ebef558f5b86342246f23e23aa6ec02eb262897b085b530f730c31ab6c7b1b6d6948dfc36faf9c6b36538b3c37c9e4fce87d539faa32b08909cf2493
 DIST SuperTTC-IosevkaSS17-32.0.0.zip 32119156 BLAKE2B 7aafa9ed23340ca70e10c2e8b1038cf6247562cbe6a8b8baea830574ee50c175d0aea517c912bcfffb4c7a6c7e7fd6bbd2c39a8855d70de1eb02af65dd02721a SHA512 a55c961e71fd9682236c08886e28fbb9ef4b6e4fa34a5328f4f1b38aaf0f42be1d105cb675c8d1ac9c02558a4136d241bc5ae5ed700184cb7e327ca5d2c5c621
 DIST SuperTTC-IosevkaSS17-32.2.1.zip 32021408 BLAKE2B a25d0348e5721ff56fe8b135095ffbc49746de0907ef447fbe549546d5163a934610f07917331878203e08b4d3420f998804f1c46af67d67549910290431257e SHA512 610513aec00af3948219f4a4ea3167874a3efcd7e32515e812f58a5c63c41d60246a614f6a95a08ec61300d14c7cefbd98e9c43382ee7b79ac5c432edf5a506a
 DIST SuperTTC-IosevkaSS17-32.3.0.zip 32365441 BLAKE2B 3e5944bdf48e8440ffdf4b88f5a946197f3eb8e06d427f0ed4f973b7b49b752a3087342870aa1fd60dc1e516f20e6da11ec949a28bbb16b7d19b8a66fe20db6d SHA512 f3406d898e6cd97eb671d0428978b46cac965524736b35b17cf003fe0000c04bd8319159e910f246ed356002120736c4384bb1864ea884eec50437d7ab37d0f5
+DIST SuperTTC-IosevkaSS17-32.3.1.zip 32794832 BLAKE2B 3837f4c5797d8df13161ed4700c659b71a3bc5f026d7e6905747d6155a17eee277f0b5e11bc5b1ea0ea4e0c8320be8bf5890f31209239d206629f3293ac0270f SHA512 b2c60d2393a4ab5b8e044fb2a41adfb17e92b1c2c48e474109337d5ce32b1926f0ced5153cf431d9d58a3b315f8057731049bad1642a36c4ae1ec4407a611f28
+DIST SuperTTC-IosevkaSS17-32.4.0.zip 32790237 BLAKE2B e88639f78c71bd9ddf56d2817fe9ec31c563012956f8c4847f74c7e46b474370060c5e4d3e57797852cb6b68d3f1b3c869a354abefdee3cae447164e915171f9 SHA512 a12180edc217fcdc1e14f1787426ae0b3ddea368f76423e203adf3016d2020a95851ce3af3c86224affa7d4422c899f4ca88a6cbaa4ad0819a194650a9a27bd5
 DIST SuperTTC-IosevkaSS18-30.1.2.zip 24807197 BLAKE2B 34ff18d6a8b79f1459db7732ae9659fd53ed9dbf1d5b3279c3822735c7128e84daee9eff660aed7bef08a2e947a35ba5de6e395d95b5c3f326d05f74a75e22d7 SHA512 090be2fd058275e49f73845d7f0a545479abe8525e619097a9f98cbcf00c091ebdf2afffbab2d809c1a4ce5eebc0e6bb8c09237e51a0c0e6a4881c3f249c61a4
 DIST SuperTTC-IosevkaSS18-31.8.0.zip 28235503 BLAKE2B 8e7496fb7c7565859edbe61f0d32f625d10a30249400a0416236f5ec4f457831e1d93d031ab4e7c71f36b0ec3d57cdca24a2181ec4e162bd8acbf1237dcce18c SHA512 d86ac0a9409bb513b568a4a6db659d1af83e1e21433706f547e64bdb095260febaaf5752f1beaa12bd0f7536a57ac8b6db4d88b32599a440906780ab7d611a05
 DIST SuperTTC-IosevkaSS18-32.0.0.zip 28086280 BLAKE2B 50e193e36e8e175cc1b418eaa736f66a235e036178e8e72b1a0b99651e9a3b0a77f6e218929bc986003fb2b1281e7be601dae9fafbacaa22f45e2b5cab2c9a1f SHA512 6fbf7e97b967b4afae4fac11522c86305b3e3de04a53f42c87d52c23cea0bf51f66e29c6a2ba9f59308fc620682cee642cb1362b9fa0613bdca52cd2c98e683b
 DIST SuperTTC-IosevkaSS18-32.2.1.zip 27817438 BLAKE2B 5939fb607b70ef266a2604a6b30848a615ddbd8d48e0eca1045815576025e8dbee6cd821357d4fe2b211dff48df6a0aea1404c1187116a2acadc010f24e66c7a SHA512 8cd40e0d9feea6c0b6479f5f25a1262a6986a74aa8df9e432723695a670448ca8aad912ac5b87204fe1497167e307fe89c96e9a5e81d94008bb9fa28a3d7cbe3
 DIST SuperTTC-IosevkaSS18-32.3.0.zip 28083840 BLAKE2B f0aeed8f707d7b119f9403f57fa88fb2374b89af6773df74c4c1855d44e211d323b18b262d0291aa1f753706eb3ef4df7849bd3b0832e8d66bbb4f5af9400e99 SHA512 f09c0c2317862929006395c6f834251b53c5ab8b95396407a7f4a696d3a1c8da63672a6886c1e25d7838dbbf6b8bec120e0f0f5fa54387edc2ea2a34f57f21ba
+DIST SuperTTC-IosevkaSS18-32.3.1.zip 28508003 BLAKE2B d93d150ff9e804f0f6956031e2cfc733fc163f83b3bfaf4070c1c6c7c1360c959c3f5c2a583b48ea9a18666a08c0debbd02dd4441e8b6fc6d76d583dc302c2a7 SHA512 ae73af2c236256e6745f037d060bfb60e892735341d02e1fc6957a15d6603e5619d36dc949851d89e35fe31bb7dd99ea70af5748c0d1cd17db7a165b3c908fbc
+DIST SuperTTC-IosevkaSS18-32.4.0.zip 28534160 BLAKE2B 82ee33c2d901bc51078bfb78e96a9e466f1be99cb201127750ffdf0479e12352f6b6b91169b4fc492a0289cd65b15736c207db1e78cd742e936a8cc095263e3e SHA512 30097b4fcd48b21188f250cf4f1be690cb418481de8d4d57e437fc1a696eaeabb65d80e5a8ec36f4fdf9679bfea4b1c127a4edf0c318b8180f91d1fea6b8fce2
 DIST SuperTTC-IosevkaSlab-30.1.2.zip 100983379 BLAKE2B 9fe54aeb326bfffc6939405aa7c127dd3db7b08ebe10d3771f21a75bf16f201ec1c4a4c31b4334e1319c710f95f4398b641da89fdebd029ae5379084b0c78ea7 SHA512 77ad777a8c992a0c07c4d4a9ffe0ad74527ba6373a10f20b2b5d142c302783d2be6e1e745df36ab32bdab27842ba6e2d5de5928fa23a2a23a55ce49c2d2fce57
 DIST SuperTTC-IosevkaSlab-31.8.0.zip 115212371 BLAKE2B 10ee65c20fe02c30a5f4cc6b7db47aeabbcd1bfe953b2f586b4ca15cbf6de3cdd01d0b52c77ac8e6390ff369064f410042ded74729c3905d8e6e70868f160624 SHA512 3aecd314740b52a46614c6b63133697ef2eff7e09179e2d50ba5ae230ff9923e43470db65f68dd354360206048e4e085fd2c4dff11b81cbb462bbd9ba4fcd981
 DIST SuperTTC-IosevkaSlab-32.0.0.zip 113289951 BLAKE2B 1db02fbe255aad6d92935cb4f27425291d16593dcf68c8eb28138ec8a838645b8fb3a611442fc268594628bf0308e13be5bcadd2c5fe714a02f511fdcb5c8e06 SHA512 2de7181ceeec46c8bcddd7582d48fb0205debbbb8665751455711dff6ccfddfab42b322449279b0f835f00b7139cc4013ed8870d85b4eac2b0fc28c72deda702
 DIST SuperTTC-IosevkaSlab-32.2.1.zip 113231881 BLAKE2B 64f4b03bac121e0e33ad756d90f9c24e1cff8952b5a7b16872cdbdae95c2a13e3f842cb2c85b9dcfe1df7e5bcd6c122c5ec67d3b001c3ff4cd058974879bd42a SHA512 3414aed947428179b54e9e5a06cff109fdecaa8a60bff58b5c62acbb9a00ea1172d753a9abb5ce2ad1db635c7992ec6ec395cc981004f9daf883dcebe8753109
 DIST SuperTTC-IosevkaSlab-32.3.0.zip 113736170 BLAKE2B c11e046d3e0c54953abec6a19be6cebba769960b44ca407a6274986a0915f7621b2f6f18faf899e5bde23687c6f45765a65489a4c8fe8e38fd632f42c12e603a SHA512 82f751b9b31f5b5080b37f9a1a6e22ad8c8b22c981bfaed04f7b0fd3cd77aa31d8edabecd423b11e9386991574c1e1ce29ab5f1e606db57d3f9b81989ccf2212
+DIST SuperTTC-IosevkaSlab-32.3.1.zip 114186192 BLAKE2B 39d45a8cda45821543dacc30f21a02aeae7cd8bc1d1aee3b47bb9141b7fd65d9232090e07c52382e9f4c7f9d7e5fab6992f8ac7dd91f5bd40d26dcc0a45d9c19 SHA512 6fca1068040bf86640f6658a43eade2d6c855926d65fdf34e6c8b8f1d42a628bc46215a1e4e3a375a0825d0e0b81d8f9a413673aed2746d80999d559614c7586
+DIST SuperTTC-IosevkaSlab-32.4.0.zip 114655541 BLAKE2B 011172da2665084224236321df064509c32a82ea344c156ba62c2188cdf8f8b50e191b2056df7a7031b75ff84390b248efe998d24def8df89a2e3f9099ed47b6 SHA512 4b512713f3f4cd1bb0b75bb3f2832262eab345686f57d21d2278f074ec03c6099c885fd81159d0cc97dbbb12210d414325134bd69eafd166d14c466eea732242
diff --git a/media-fonts/iosevka/iosevka-32.2.1.ebuild b/media-fonts/iosevka/iosevka-32.2.1.ebuild
index f1efa3721bec..5a301ef0c71e 100644
--- a/media-fonts/iosevka/iosevka-32.2.1.ebuild
+++ b/media-fonts/iosevka/iosevka-32.2.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
@@ -71,7 +71,7 @@ unset MY_BASE my_filename variant up_variant
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/iosevka/iosevka-32.3.1.ebuild b/media-fonts/iosevka/iosevka-32.3.1.ebuild
new file mode 100644
index 000000000000..358aafbeea9c
--- /dev/null
+++ b/media-fonts/iosevka/iosevka-32.3.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font
+
+# [...document.querySelectorAll('[colspan="3"] > b')]
+#     .map(x => "[\""
+#          + (x = x.innerText.trim()).toLowerCase().replaceAll("\xa0", "-")
+#          + "\"]=\""
+#          + x
+#          + "\"")
+#     .join("\n\t")
+declare -A MY_FONT_VARIANTS=(
+	["iosevka"]="Iosevka"
+	["iosevka-slab"]="Iosevka Slab"
+	["iosevka-curly"]="Iosevka Curly"
+	["iosevka-curly-slab"]="Iosevka Curly Slab"
+	["iosevka-ss01"]="Iosevka SS01"
+	["iosevka-ss02"]="Iosevka SS02"
+	["iosevka-ss03"]="Iosevka SS03"
+	["iosevka-ss04"]="Iosevka SS04"
+	["iosevka-ss05"]="Iosevka SS05"
+	["iosevka-ss06"]="Iosevka SS06"
+	["iosevka-ss07"]="Iosevka SS07"
+	["iosevka-ss08"]="Iosevka SS08"
+	["iosevka-ss09"]="Iosevka SS09"
+	["iosevka-ss10"]="Iosevka SS10"
+	["iosevka-ss11"]="Iosevka SS11"
+	["iosevka-ss12"]="Iosevka SS12"
+	["iosevka-ss13"]="Iosevka SS13"
+	["iosevka-ss14"]="Iosevka SS14"
+	["iosevka-ss15"]="Iosevka SS15"
+	["iosevka-ss16"]="Iosevka SS16"
+	["iosevka-ss17"]="Iosevka SS17"
+	["iosevka-ss18"]="Iosevka SS18"
+	["iosevka-aile"]="Iosevka Aile"
+	["iosevka-etoile"]="Iosevka Etoile"
+)
+
+DESCRIPTION="Slender typeface for code, from code"
+HOMEPAGE="https://typeof.net/Iosevka/"
+
+SRC_URI=''
+REQUIRED_USE='|| ('
+MY_BASE="https://github.com/be5invis/Iosevka/releases/download/v${PV}"
+for variant in "${!MY_FONT_VARIANTS[@]}"; do
+	up_variant="${variant}"
+	up_variant="${up_variant/iosevka/Iosevka}"
+	up_variant="${up_variant/ss/SS}"
+	up_variant="${up_variant/iosevka/Iosevka}"
+	up_variant="${up_variant/aile/Aile}"
+	up_variant="${up_variant/etoile/Etoile}"
+	up_variant="${up_variant/curly/Curly}"
+	up_variant="${up_variant/slab/Slab}"
+	up_variant="${up_variant//-/}"
+	my_filename="SuperTTC-${up_variant}-${PV}.zip"
+
+	[[ ${SRC_URI} ]] && SRC_URI+=' '
+	SRC_URI+="${variant}? ( ${MY_BASE}/${my_filename} )"
+
+	[[ ${IUSE} ]] && IUSE+=' '
+	[[ ${variant} == iosevka ]] && IUSE+='+'
+	IUSE+="${variant}"
+
+	REQUIRED_USE+=" ${variant} "
+done
+REQUIRED_USE+=')'
+unset MY_BASE my_filename variant up_variant
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+FONT_S="${S}"
+FONT_SUFFIX="ttc"
+
+src_prepare() {
+	default
+
+	FONT_CONF=()
+	local vinternal
+	for vinternal in "${!MY_FONT_VARIANTS[@]}"; do
+		case "${vinternal}" in
+			*-etoile|*-aile)
+				continue
+				;;
+		esac
+		local vname="${MY_FONT_VARIANTS[${vinternal}]}"
+		use "${vinternal}" || continue
+		cat >66-"${vinternal}".conf <<EOF
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- Enable this config to change your monospace font to ${vname} -->
+<fontconfig>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>${vname}</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>${vname}</family>
+		<default>
+			<family>monospace</family>
+		</default>
+	</alias>
+</fontconfig>
+EOF
+		assert "Failed to generate ${vinternal}"
+		FONT_CONF+=( 66-"${vinternal}".conf )
+	done
+}
diff --git a/media-fonts/iosevka/iosevka-32.4.0.ebuild b/media-fonts/iosevka/iosevka-32.4.0.ebuild
new file mode 100644
index 000000000000..358aafbeea9c
--- /dev/null
+++ b/media-fonts/iosevka/iosevka-32.4.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font
+
+# [...document.querySelectorAll('[colspan="3"] > b')]
+#     .map(x => "[\""
+#          + (x = x.innerText.trim()).toLowerCase().replaceAll("\xa0", "-")
+#          + "\"]=\""
+#          + x
+#          + "\"")
+#     .join("\n\t")
+declare -A MY_FONT_VARIANTS=(
+	["iosevka"]="Iosevka"
+	["iosevka-slab"]="Iosevka Slab"
+	["iosevka-curly"]="Iosevka Curly"
+	["iosevka-curly-slab"]="Iosevka Curly Slab"
+	["iosevka-ss01"]="Iosevka SS01"
+	["iosevka-ss02"]="Iosevka SS02"
+	["iosevka-ss03"]="Iosevka SS03"
+	["iosevka-ss04"]="Iosevka SS04"
+	["iosevka-ss05"]="Iosevka SS05"
+	["iosevka-ss06"]="Iosevka SS06"
+	["iosevka-ss07"]="Iosevka SS07"
+	["iosevka-ss08"]="Iosevka SS08"
+	["iosevka-ss09"]="Iosevka SS09"
+	["iosevka-ss10"]="Iosevka SS10"
+	["iosevka-ss11"]="Iosevka SS11"
+	["iosevka-ss12"]="Iosevka SS12"
+	["iosevka-ss13"]="Iosevka SS13"
+	["iosevka-ss14"]="Iosevka SS14"
+	["iosevka-ss15"]="Iosevka SS15"
+	["iosevka-ss16"]="Iosevka SS16"
+	["iosevka-ss17"]="Iosevka SS17"
+	["iosevka-ss18"]="Iosevka SS18"
+	["iosevka-aile"]="Iosevka Aile"
+	["iosevka-etoile"]="Iosevka Etoile"
+)
+
+DESCRIPTION="Slender typeface for code, from code"
+HOMEPAGE="https://typeof.net/Iosevka/"
+
+SRC_URI=''
+REQUIRED_USE='|| ('
+MY_BASE="https://github.com/be5invis/Iosevka/releases/download/v${PV}"
+for variant in "${!MY_FONT_VARIANTS[@]}"; do
+	up_variant="${variant}"
+	up_variant="${up_variant/iosevka/Iosevka}"
+	up_variant="${up_variant/ss/SS}"
+	up_variant="${up_variant/iosevka/Iosevka}"
+	up_variant="${up_variant/aile/Aile}"
+	up_variant="${up_variant/etoile/Etoile}"
+	up_variant="${up_variant/curly/Curly}"
+	up_variant="${up_variant/slab/Slab}"
+	up_variant="${up_variant//-/}"
+	my_filename="SuperTTC-${up_variant}-${PV}.zip"
+
+	[[ ${SRC_URI} ]] && SRC_URI+=' '
+	SRC_URI+="${variant}? ( ${MY_BASE}/${my_filename} )"
+
+	[[ ${IUSE} ]] && IUSE+=' '
+	[[ ${variant} == iosevka ]] && IUSE+='+'
+	IUSE+="${variant}"
+
+	REQUIRED_USE+=" ${variant} "
+done
+REQUIRED_USE+=')'
+unset MY_BASE my_filename variant up_variant
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+FONT_S="${S}"
+FONT_SUFFIX="ttc"
+
+src_prepare() {
+	default
+
+	FONT_CONF=()
+	local vinternal
+	for vinternal in "${!MY_FONT_VARIANTS[@]}"; do
+		case "${vinternal}" in
+			*-etoile|*-aile)
+				continue
+				;;
+		esac
+		local vname="${MY_FONT_VARIANTS[${vinternal}]}"
+		use "${vinternal}" || continue
+		cat >66-"${vinternal}".conf <<EOF
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- Enable this config to change your monospace font to ${vname} -->
+<fontconfig>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>${vname}</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>${vname}</family>
+		<default>
+			<family>monospace</family>
+		</default>
+	</alias>
+</fontconfig>
+EOF
+		assert "Failed to generate ${vinternal}"
+		FONT_CONF+=( 66-"${vinternal}".conf )
+	done
+}
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index ab0883b40537..9dd014d6cffc 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -1,3 +1,3 @@
-DIST noto-20240830.tar.gz 1087158158 BLAKE2B e3b3410fa3c3fbd48e3224f7a22a46377ffa50d36df4027902bd86949579d33ebfb883939feba62ce8520a10d1c982c0c600e7363d5e3a752e76d75059eedf5b SHA512 cf3ac08d2c1fb134194ce6b1211d63ab5fc00adcfc92106afdd872ad9fb75cbf0437d88314a8cc3681fa93974f37c736685f529231ad5e8f8eca429876ee0032
 DIST noto-20241101.tar.gz 1086999253 BLAKE2B 237d96dcd89ed86c6edfb3316d420eb7ca00a4486a7bb54087896330d21ee87307c16b6991b897eb87459c3f0fa1739f879347c9c24f1ef1f2aa953c2051a3a8 SHA512 dfc31ebe3cd5947182ac771e1bcbbc7cd3a1b56b5a9aa74a0fcc94ff6a5060a3cb8bc57a01587d955fc7505e566dd3a7283d7fd521c839b264e55ca2c9297c13
 DIST noto-20241201.tar.gz 1086893249 BLAKE2B 5635c170bcef1c7122003c3cf77945ba394ef962d384f7e311cba2234734e30b4cc54a7860173cf5be5ec1d71793f7470d56def9a8d8956790ad28484867830e SHA512 b25c928f33553b52f4bfbd6c2b597fffafe6316651e2660584f68dd5d5c6f30d297a7ac65ab0a3a4d92aa84002829f213b9d31e6e84f0c959f5c00497d68088c
+DIST noto-20250101.tar.gz 1086857971 BLAKE2B acc68987f5fc770205e7b2c0b56c3c5b69d18e04e2f5a3f2089ffa4d0d44f758aed9e95a628c6665a1c72eb3eacff023423b315d1ef3a6fe550ab9f4c3adbbde SHA512 e58d8d2f73408755473797b6dc04c40faffab9ee21678ee921cd12e6eb837962524fa1bd718d2fa85194ff02a407a1e16a98f9efc25ddef1f06fc011e3e8d647
diff --git a/media-fonts/noto/noto-20240830.ebuild b/media-fonts/noto/noto-20240830.ebuild
deleted file mode 100644
index ae1a7b589fad..000000000000
--- a/media-fonts/noto/noto-20240830.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit font
-
-DESCRIPTION="Google's font family that aims to support all the world's languages"
-HOMEPAGE="https://fonts.google.com/noto https://github.com/notofonts/notofonts.github.io"
-
-COMMIT="eeb71fdda20300eb0891badeed5e64850e2cbc64"
-SRC_URI="https://github.com/notofonts/notofonts.github.io/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/notofonts.github.io-${COMMIT}"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-# Extra allows to optionally reduce disk usage even returning to tofu
-# issue as described in https://fonts.google.com/noto
-IUSE="cjk +extra"
-
-RDEPEND="cjk? ( media-fonts/noto-cjk )"
-
-RESTRICT="binchecks strip"
-
-FONT_SUFFIX="ttf"
-FONT_CONF=(
-	# From ArchLinux
-	"${FILESDIR}/66-noto-serif.conf"
-	"${FILESDIR}/66-noto-mono.conf"
-	"${FILESDIR}/66-noto-sans.conf"
-)
-
-src_install() {
-	mkdir install-hinted || die
-	mv fonts/*/hinted/ttf/*.tt[fc] install-hinted/. || die
-
-	FONT_S="${S}/install-hinted/" font_src_install
-
-	# Allow to drop some fonts optionally for people that want to save
-	# disk space. Following ArchLinux options.
-	use extra || rm -rf "${ED}"/usr/share/fonts/noto/Noto*{Condensed,SemiBold,Extra}*.tt[f,c]
-}
diff --git a/media-fonts/noto/noto-20241201.ebuild b/media-fonts/noto/noto-20241201.ebuild
index bdb1e009b3af..db15df6cf8f9 100644
--- a/media-fonts/noto/noto-20241201.ebuild
+++ b/media-fonts/noto/noto-20241201.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 @@ S="${WORKDIR}/notofonts.github.io-${COMMIT}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 # Extra allows to optionally reduce disk usage even returning to tofu
 # issue as described in https://fonts.google.com/noto
 IUSE="cjk +extra"
diff --git a/media-fonts/noto/noto-20250101.ebuild b/media-fonts/noto/noto-20250101.ebuild
new file mode 100644
index 000000000000..fe6e0a6c623e
--- /dev/null
+++ b/media-fonts/noto/noto-20250101.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit font
+
+DESCRIPTION="Google's font family that aims to support all the world's languages"
+HOMEPAGE="https://fonts.google.com/noto https://github.com/notofonts/notofonts.github.io"
+
+COMMIT="79f1d59698f48bf533ca359388d50aaa23b3edc3"
+SRC_URI="https://github.com/notofonts/notofonts.github.io/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/notofonts.github.io-${COMMIT}"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+# Extra allows to optionally reduce disk usage even returning to tofu
+# issue as described in https://fonts.google.com/noto
+IUSE="cjk +extra"
+
+RDEPEND="cjk? ( media-fonts/noto-cjk )"
+
+RESTRICT="binchecks strip"
+
+FONT_SUFFIX="ttf"
+FONT_CONF=(
+	# From ArchLinux
+	"${FILESDIR}/66-noto-serif.conf"
+	"${FILESDIR}/66-noto-mono.conf"
+	"${FILESDIR}/66-noto-sans.conf"
+)
+
+src_install() {
+	mkdir install-hinted || die
+	mv fonts/*/hinted/ttf/*.tt[fc] install-hinted/. || die
+
+	FONT_S="${S}/install-hinted/" font_src_install
+
+	# Allow to drop some fonts optionally for people that want to save
+	# disk space. Following ArchLinux options.
+	use extra || rm -rf "${ED}"/usr/share/fonts/noto/Noto*{Condensed,SemiBold,Extra}*.tt[f,c]
+}
diff --git a/media-fonts/symbols-nerd-font/Manifest b/media-fonts/symbols-nerd-font/Manifest
index 9459ed3379cf..72868f69d8c1 100644
--- a/media-fonts/symbols-nerd-font/Manifest
+++ b/media-fonts/symbols-nerd-font/Manifest
@@ -1,2 +1 @@
-DIST symbols-nerd-font-3.2.1.zip 2459998 BLAKE2B f13ca414ebe7b49c3c2e5c02b276c4617b76fa34e4a7cccaf7b055fa5b903a2eb55a4f491c0afb0ae14694190f59275bfe8179e60a20f0b4667014454a43d4c8 SHA512 a9aa8b0a5eafe1e04205e824e48c175d63c2e2a15d5cd8441e37603a71d9698efe3cb0f4490e9ce899333d4a2bc3764ca417a9ce93d3120a61c1dcb6f0eace27
 DIST symbols-nerd-font-3.3.0.zip 2696433 BLAKE2B ff46a1ed7aa88af6741e7ec83474208dd038b5f3e3f65fee4f243d9469347591bc1f27067d75d612d7facfad97054e70e83b354600df7129354efe6c59607f75 SHA512 d6ccb193de845c7be26e8d5e67c3aaff50f9176769ab689725d74a573fdaca3765c226334fba4ac77e618b59c0e8e02e89d8be3d73915c4fb3f3429502e9c7a8
diff --git a/media-fonts/symbols-nerd-font/symbols-nerd-font-3.2.1.ebuild b/media-fonts/symbols-nerd-font/symbols-nerd-font-3.2.1.ebuild
deleted file mode 100644
index df13c20b9a81..000000000000
--- a/media-fonts/symbols-nerd-font/symbols-nerd-font-3.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Note: no interest in supporting building or packaging the full suite of
-# fonts, only quickly added because x11-terms/kitty requires it -- if a
-# Gentoo dev wants more, feel free to take over maintenance and re-arrange.
-
-FONT_SUFFIX=ttf
-inherit font
-
-DESCRIPTION="Symbols-only font containing the Nerd Font icons"
-HOMEPAGE="https://www.nerdfonts.com/"
-SRC_URI="
-	https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/NerdFontsSymbolsOnly.zip
-		-> ${P}.zip
-"
-S=${WORKDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-BDEPEND="app-arch/unzip"
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 4810c74e5789..e6378a9716fe 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1 +1,2 @@
 DIST alembic-1.8.6.tar.gz 868945 BLAKE2B 1ac30ffa75a4b8bbb3f32820e6f67cebcd894465f16cd12ee0396c88611af821b13973f46228fd59726c6bc0cc8885afd4de81a0cebaa0f94cb30fd9daba9885 SHA512 6371b830242be90d4ea833248df5fd42d9e713e305d15eb1383d04410319acdae5743d48d65e8f75f1cedce777d2af7d969cde095f678b17322c19f1c69f477b
+DIST alembic-1.8.8.tar.gz 933258 BLAKE2B 4f56f5addcf153407da14d6646255ee35b1126b307179fbcfa2c13398825680652b557772db0a08906d04a9bd46c1fa82862a65367d9ce162f2b9d948ff9b701 SHA512 02b7bf5782e83efb08a8653f130b02565fa997e857dbd8d0523e1b218ff58d929fbf9690db0980e8101a31f01a67341b6000af8794538890ef7d759fe0289e2f
diff --git a/media-gfx/alembic/alembic-1.8.6.ebuild b/media-gfx/alembic/alembic-1.8.6.ebuild
deleted file mode 100644
index de6bc765bcef..000000000000
--- a/media-gfx/alembic/alembic-1.8.6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="Open framework for storing and sharing scene data"
-HOMEPAGE="https://www.alembic.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="examples hdf5 python test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	examples? ( python )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/imath:=
-	python? ( dev-libs/imath:=[python,${PYTHON_SINGLE_USEDEP}] )
-	hdf5? (
-		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
-		>=sys-libs/zlib-1.2.11-r1
-	)
-	python? ( $(python_gen_cond_dep 'dev-libs/boost[python,${PYTHON_USEDEP}]') )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.8.5-set-correct-libdir.patch )
-
-DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
-
-src_prepare() {
-	cmake_src_prepare
-	# Tests are broken with python 3.11.  See also: https://github.com/alembic/alembic/issues/411
-	cmake_run_in "${S}/python/PyAlembic" cmake_comment_add_subdirectory Tests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DALEMBIC_BUILD_LIBS=ON
-		-DALEMBIC_DEBUG_WARNINGS_AS_ERRORS=OFF
-		-DALEMBIC_SHARED_LIBS=ON
-		# currently does nothing but require doxygen
-		-DDOCS_PATH=OFF
-		-DUSE_ARNOLD=OFF
-		-DUSE_BINARIES=ON
-		-DUSE_EXAMPLES=$(usex examples)
-		-DUSE_HDF5=$(usex hdf5)
-		-DUSE_MAYA=OFF
-		-DUSE_PRMAN=OFF
-		-DUSE_PYALEMBIC=$(usex python)
-		-DUSE_TESTS=$(usex test)
-	)
-
-	use python && mycmakeargs+=( -DPython3_EXECUTABLE=${PYTHON} )
-
-	cmake_src_configure
-}
-
-# some tests may fail if run in parallel mode
-# see https://github.com/alembic/alembic/issues/401
-src_test() {
-	cmake_src_test -j1
-}
diff --git a/media-gfx/alembic/alembic-1.8.8.ebuild b/media-gfx/alembic/alembic-1.8.8.ebuild
new file mode 100644
index 000000000000..0a9d7c9073bc
--- /dev/null
+++ b/media-gfx/alembic/alembic-1.8.8.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Open framework for storing and sharing scene data"
+HOMEPAGE="https://www.alembic.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="examples hdf5 python test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	examples? ( python )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/imath-3.1.11-r1:=
+	python? ( dev-libs/imath:=[python,${PYTHON_SINGLE_USEDEP}] )
+	hdf5? (
+		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
+		>=sys-libs/zlib-1.2.11-r1
+	)
+	python? ( $(python_gen_cond_dep 'dev-libs/boost[python,${PYTHON_USEDEP}]') )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.6-py312.patch"
+
+)
+
+DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-DALEMBIC_BUILD_LIBS=ON
+		-DALEMBIC_DEBUG_WARNINGS_AS_ERRORS=OFF
+		-DALEMBIC_SHARED_LIBS=ON
+		# currently does nothing but require doxygen
+		-DDOCS_PATH=OFF
+		-DUSE_ARNOLD=OFF
+		-DUSE_BINARIES=ON
+		-DUSE_EXAMPLES=$(usex examples)
+		-DUSE_HDF5=$(usex hdf5)
+		-DUSE_MAYA=OFF
+		-DUSE_PRMAN=OFF
+		-DUSE_PYALEMBIC=$(usex python)
+		-DUSE_TESTS=$(usex test)
+	)
+
+	use python && mycmakeargs+=( -DPython3_EXECUTABLE=${PYTHON} )
+
+	cmake_src_configure
+}
+
+# some tests may fail if run in parallel mode
+# see https://github.com/alembic/alembic/issues/401
+src_test() {
+	cmake_src_test -j1
+}
diff --git a/media-gfx/blender/blender-3.6.18.ebuild b/media-gfx/blender/blender-3.6.18.ebuild
index 698ccf250f72..bdf6973efd45 100644
--- a/media-gfx/blender/blender-3.6.18.ebuild
+++ b/media-gfx/blender/blender-3.6.18.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
@@ -20,7 +20,7 @@ else
 	# Update these between major releases.
 	TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
 	# SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )"
-	KEYWORDS="~amd64 ~arm ~arm64"
+	KEYWORDS="amd64 ~arm ~arm64"
 fi
 
 LICENSE="GPL-3+ cycles? ( Apache-2.0 )"
diff --git a/media-gfx/clockphoto/clockphoto-1.2-r1.ebuild b/media-gfx/clockphoto/clockphoto-1.2-r1.ebuild
new file mode 100644
index 000000000000..609fa4a2539f
--- /dev/null
+++ b/media-gfx/clockphoto/clockphoto-1.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+DESCRIPTION="Adjusts photo timestamps based on clock photos"
+HOMEPAGE="https://git.zx2c4.com/clockphoto/about/"
+SRC_URI="https://git.zx2c4.com/clockphoto/snapshot/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtbase:6[gui,widgets]
+"
+RDEPEND="${DEPEND}
+	media-gfx/exiv2
+"
+
+src_configure() {
+	eqmake6
+}
+
+src_install() {
+	dobin clockphoto
+}
diff --git a/media-gfx/darktable/darktable-4.8.0-r1.ebuild b/media-gfx/darktable/darktable-4.8.0-r1.ebuild
new file mode 100644
index 000000000000..36af6f4a95c5
--- /dev/null
+++ b/media-gfx/darktable/darktable-4.8.0-r1.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/"
+S="${WORKDIR}/${P/_/~}"
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
+
+	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+	#DOC_PV=$(ver_cut 1-2)
+	DOC_PV="4.6"
+	MY_PV="${PV/_/}"
+	MY_P="${P/_/.}"
+
+	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+		doc? (
+			https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.en.pdf
+			l10n_uk? (
+				https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf
+					-> ${PN}-usermanual-${DOC_PV}.uk.pdf
+			)
+		)"
+
+	KEYWORDS="amd64 ~arm64 -x86"
+	LANGS=" cs de es fi fr hu it ja nl pl pt-BR ru sl sq uk zh-CN zh-TW"
+fi
+
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad geolocation keyring gphoto2 graphicsmagick heif jpeg2k jpegxl kwallet lto lua midi nls opencl openmp openexr test tools webp
+	${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# It is sometimes requested, by both users and certain devs, to have sys-devel/gcc[graphite]
+# in BDEPEND. This has not been done *on purpose*, for the following reason:
+#  - darktable can also be built with llvm-core/clang so we'd have to have that, as an alternative,
+#    in BDEPEND too
+#  - there are at least two darktable dependencies (media-libs/mesa and dev-lang/rust) which
+#    by default pull in llvm-core/clang
+#  - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op
+#    (and curiously enough, empirical observations suggest current versions of Portage are
+#    more likely to pull in Clang to build darktable with than to request enabling USE=graphite
+#    on GCC; that might be a bug though)
+BDEPEND="dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( >=dev-python/jsonschema-3.2.0 )"
+DEPEND="dev-db/sqlite:3
+	dev-libs/icu:=
+	dev-libs/json-glib
+	dev-libs/libxml2:2
+	>=dev-libs/pugixml-1.8:=
+	gnome-base/librsvg:2
+	>=media-gfx/exiv2-0.25-r2:=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/tiff:=
+	net-misc/curl
+	sys-libs/zlib:=
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango
+	avif? ( >=media-libs/libavif-0.8.2:= )
+	colord? ( x11-libs/colord-gtk:= )
+	cups? ( net-print/cups )
+	gamepad? ( media-libs/libsdl2 )
+	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	keyring? ( >=app-crypt/libsecret-0.18 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	heif? ( media-libs/libheif:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	jpegxl? ( media-libs/libjxl:= )
+	lua? ( ${LUA_DEPS} )
+	midi? ( media-libs/portmidi )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:= )
+	webp? ( media-libs/libwebp:= )"
+RDEPEND="${DEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1:* )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
+	"${FILESDIR}"/${PN}-4.2.1_cmake-musl.patch
+	"${FILESDIR}"/${PN}-4.8.0_fix-has-attribute-musl.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug #695658
+		if tc-is-gcc; then
+			if ! test-flags-CC -floop-block &> /dev/null; then
+				eerror "Building ${PN} with GCC requires Graphite support."
+				eerror "Please switch to a version of sys-devel/gcc built with USE=graphite, or use a different compiler."
+				die "Selected compiler is sys-devel/gcc[-graphite]"
+			fi
+		fi
+
+		use openmp && tc-check-openmp
+	fi
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	use cpu_flags_x86_avx && append-flags -mavx
+	use cpu_flags_x86_sse3 && append-flags -msse3
+
+	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE="Release"
+	local mycmakeargs=(
+		-DBUILD_CURVE_TOOLS=$(usex tools)
+		-DBUILD_NOISE_TOOLS=$(usex tools)
+		-DBUILD_PRINT=$(usex cups)
+		-DCUSTOM_CFLAGS=ON
+		-DDONT_USE_INTERNAL_LUA=ON
+		-DRAWSPEED_ENABLE_LTO=$(usex lto)
+		-DRAWSPEED_ENABLE_WERROR=OFF
+		-DRAWSPEED_MUSL_SYSTEM=$(usex elibc_musl)
+		-DTESTBUILD_OPENCL_PROGRAMS=OFF
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+		-DUSE_COLORD=$(usex colord)
+		-DUSE_GMIC=OFF
+		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DUSE_HEIF=$(usex heif)
+		-DUSE_JXL=$(usex jpegxl)
+		-DUSE_KWALLET=$(usex kwallet)
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_LUA=$(usex lua)
+		-DUSE_MAP=$(usex geolocation)
+		-DUSE_NLS=$(usex nls)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENEXR=$(usex openexr)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_PORTMIDI=$(usex midi)
+		-DUSE_SDL2=$(usex gamepad)
+		-DUSE_WEBP=$(usex webp)
+		-DWANT_JSON_VALIDATION=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# This USE flag is masked for -9999
+	if use doc; then
+		dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.en.pdf
+		use l10n_uk && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.uk.pdf
+	fi
+
+	if use nls; then
+		for lang in ${LANGS} ; do
+			if ! use l10n_${lang}; then
+				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog
+	elog "When updating a major version,"
+	elog "please bear in mind that your edits will be preserved during this process,"
+	elog "but it will not be possible to downgrade any more."
+	elog
+	ewarn "It will not be possible to downgrade!"
+	ewarn
+}
diff --git a/media-gfx/darktable/darktable-4.8.0.ebuild b/media-gfx/darktable/darktable-4.8.0.ebuild
deleted file mode 100644
index e8d9a70a68b8..000000000000
--- a/media-gfx/darktable/darktable-4.8.0.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-S="${WORKDIR}/${P/_/~}"
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
-
-	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
-else
-	#DOC_PV=$(ver_cut 1-2)
-	DOC_PV="4.6"
-	MY_PV="${PV/_/}"
-	MY_P="${P/_/.}"
-
-	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-		doc? (
-			https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.en.pdf
-			l10n_uk? (
-				https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf
-					-> ${PN}-usermanual-${DOC_PV}.uk.pdf
-			)
-		)"
-
-	KEYWORDS="amd64 ~arm64 -x86"
-	LANGS=" cs de es fi fr hu it ja nl pl pt-BR ru sl sq uk zh-CN zh-TW"
-fi
-
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad geolocation keyring gphoto2 graphicsmagick heif jpeg2k jpegxl kwallet lto lua midi nls opencl openmp openexr test tools webp
-	${LANGS// / l10n_}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# It is sometimes requested, by both users and certain devs, to have sys-devel/gcc[graphite]
-# in BDEPEND. This has not been done *on purpose*, for the following reason:
-#  - darktable can also be built with llvm-core/clang so we'd have to have that, as an alternative,
-#    in BDEPEND too
-#  - there are at least two darktable dependencies (media-libs/mesa and dev-lang/rust) which
-#    by default pull in llvm-core/clang
-#  - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op
-#    (and curiously enough, empirical observations suggest current versions of Portage are
-#    more likely to pull in Clang to build darktable with than to request enabling USE=graphite
-#    on GCC; that might be a bug though)
-BDEPEND="dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-python/jsonschema-3.2.0 )"
-DEPEND="dev-db/sqlite:3
-	dev-libs/icu:=
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	>=dev-libs/pugixml-1.8:=
-	gnome-base/librsvg:2
-	>=media-gfx/exiv2-0.25-r2:=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/tiff:=
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/zlib:=
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango
-	avif? ( >=media-libs/libavif-0.8.2:= )
-	colord? ( x11-libs/colord-gtk:= )
-	cups? ( net-print/cups )
-	gamepad? ( media-libs/libsdl2 )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	heif? ( media-libs/libheif:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	jpegxl? ( media-libs/libjxl:= )
-	lua? ( ${LUA_DEPS} )
-	midi? ( media-libs/portmidi )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:= )
-	webp? ( media-libs/libwebp:= )"
-RDEPEND="${DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1:* )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
-	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
-	"${FILESDIR}"/${PN}-4.2.1_cmake-musl.patch
-	"${FILESDIR}"/${PN}-4.8.0_fix-has-attribute-musl.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug #695658
-		if tc-is-gcc; then
-			if ! test-flags-CC -floop-block &> /dev/null; then
-				eerror "Building ${PN} with GCC requires Graphite support."
-				eerror "Please switch to a version of sys-devel/gcc built with USE=graphite, or use a different compiler."
-				die "Selected compiler is sys-devel/gcc[-graphite]"
-			fi
-		fi
-
-		use openmp && tc-check-openmp
-	fi
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	use cpu_flags_x86_avx && append-flags -mavx
-	use cpu_flags_x86_sse3 && append-flags -msse3
-
-	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE="Release"
-	local mycmakeargs=(
-		-DBUILD_CURVE_TOOLS=$(usex tools)
-		-DBUILD_NOISE_TOOLS=$(usex tools)
-		-DBUILD_PRINT=$(usex cups)
-		-DCUSTOM_CFLAGS=ON
-		-DDONT_USE_INTERNAL_LUA=ON
-		-DRAWSPEED_ENABLE_LTO=$(usex lto)
-		-DRAWSPEED_ENABLE_WERROR=OFF
-		-DRAWSPEED_MUSL_SYSTEM=$(usex elibc_musl)
-		-DTESTBUILD_OPENCL_PROGRAMS=OFF
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_GMIC=OFF
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_HEIF=$(usex heif)
-		-DUSE_JXL=$(usex jpegxl)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_LUA=$(usex lua)
-		-DUSE_MAP=$(usex geolocation)
-		-DUSE_NLS=$(usex nls)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENEXR=$(usex openexr)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_PORTMIDI=$(usex midi)
-		-DUSE_SDL2=$(usex gamepad)
-		-DUSE_WEBP=$(usex webp)
-		-DWANT_JSON_VALIDATION=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# This USE flag is masked for -9999
-	if use doc; then
-		dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.en.pdf
-		use l10n_uk && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.uk.pdf
-	fi
-
-	if use nls; then
-		for lang in ${LANGS} ; do
-			if ! use l10n_${lang}; then
-				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "When updating a major version,"
-	elog "please bear in mind that your edits will be preserved during this process,"
-	elog "but it will not be possible to downgrade any more."
-	elog
-	ewarn "It will not be possible to downgrade!"
-	ewarn
-}
diff --git a/media-gfx/darktable/darktable-5.0.0-r1.ebuild b/media-gfx/darktable/darktable-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..12f75aea8309
--- /dev/null
+++ b/media-gfx/darktable/darktable-5.0.0-r1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/"
+S="${WORKDIR}/${P/_/~}"
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
+
+	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+	#DOC_PV=$(ver_cut 1-2)
+	DOC_PV="4.6"
+	MY_PV="${PV/_/}"
+	MY_P="${P/_/.}"
+
+	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+		doc? (
+			https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.en.pdf
+			l10n_uk? (
+				https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf
+					-> ${PN}-usermanual-${DOC_PV}.uk.pdf
+			)
+		)"
+
+	KEYWORDS="~amd64 ~arm64 -x86"
+	LANGS=" cs de es fi fr ja nl pt-BR sl sq uk zh-CN zh-TW"
+fi
+
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad geolocation keyring gphoto2 graphicsmagick heif jpeg2k jpegxl kwallet lto lua midi opencl openmp openexr test tools webp
+	${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# It is sometimes requested, by both users and certain devs, to have sys-devel/gcc[graphite]
+# in BDEPEND. This has not been done *on purpose*, for the following reason:
+#  - darktable can also be built with llvm-core/clang so we'd have to have that, as an alternative,
+#    in BDEPEND too
+#  - there are at least two darktable dependencies (media-libs/mesa and dev-lang/rust) which
+#    by default pull in llvm-core/clang
+#  - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op
+#    (and curiously enough, empirical observations suggest current versions of Portage are
+#    more likely to pull in Clang to build darktable with than to request enabling USE=graphite
+#    on GCC; that might be a bug though)
+BDEPEND="dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( >=dev-python/jsonschema-3.2.0 )"
+DEPEND="dev-db/sqlite:3
+	dev-libs/icu:=
+	dev-libs/json-glib
+	dev-libs/libxml2:2
+	>=dev-libs/pugixml-1.8:=
+	gnome-base/librsvg:2
+	>=media-gfx/exiv2-0.25-r2:=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/tiff:=
+	net-misc/curl
+	sys-libs/zlib:=
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango
+	avif? ( >=media-libs/libavif-0.8.2:= )
+	colord? ( x11-libs/colord-gtk:= )
+	cups? ( net-print/cups )
+	gamepad? ( media-libs/libsdl2 )
+	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	keyring? ( >=app-crypt/libsecret-0.18 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	heif? ( media-libs/libheif:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	jpegxl? ( media-libs/libjxl:= )
+	lua? ( ${LUA_DEPS} )
+	midi? ( media-libs/portmidi )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:= )
+	webp? ( media-libs/libwebp:= )"
+RDEPEND="${DEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1:* )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
+	"${FILESDIR}"/${PN}-4.2.1_cmake-musl.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug #695658
+		if tc-is-gcc; then
+			if ! test-flags-CC -floop-block &> /dev/null; then
+				eerror "Building ${PN} with GCC requires Graphite support."
+				eerror "Please switch to a version of sys-devel/gcc built with USE=graphite, or use a different compiler."
+				die "Selected compiler is sys-devel/gcc[-graphite]"
+			fi
+		fi
+
+		use openmp && tc-check-openmp
+	fi
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	use cpu_flags_x86_avx && append-flags -mavx
+	use cpu_flags_x86_sse3 && append-flags -msse3
+
+	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE="Release"
+	local mycmakeargs=(
+		-DBUILD_CURVE_TOOLS=$(usex tools)
+		-DBUILD_NOISE_TOOLS=$(usex tools)
+		-DBUILD_PRINT=$(usex cups)
+		-DCUSTOM_CFLAGS=ON
+		-DDONT_USE_INTERNAL_LUA=ON
+		-DRAWSPEED_ENABLE_LTO=$(usex lto)
+		-DRAWSPEED_ENABLE_WERROR=OFF
+		-DRAWSPEED_MUSL_SYSTEM=$(usex elibc_musl)
+		-DTESTBUILD_OPENCL_PROGRAMS=OFF
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+		-DUSE_COLORD=$(usex colord)
+		-DUSE_GMIC=OFF
+		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DUSE_HEIF=$(usex heif)
+		-DUSE_JXL=$(usex jpegxl)
+		-DUSE_KWALLET=$(usex kwallet)
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_LUA=$(usex lua)
+		-DUSE_MAP=$(usex geolocation)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENEXR=$(usex openexr)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_PORTMIDI=$(usex midi)
+		-DUSE_SDL2=$(usex gamepad)
+		-DUSE_WEBP=$(usex webp)
+		-DWANT_JSON_VALIDATION=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# This USE flag is masked for -9999
+	if use doc; then
+		dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.en.pdf
+		use l10n_uk && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.uk.pdf
+	fi
+
+	for lang in ${LANGS} ; do
+		if ! use l10n_${lang}; then
+			rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
+		fi
+	done
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog
+	elog "When updating a major version,"
+	elog "please bear in mind that your edits will be preserved during this process,"
+	elog "but it will not be possible to downgrade any more."
+	elog
+	ewarn "It will not be possible to downgrade!"
+	ewarn
+}
diff --git a/media-gfx/darktable/darktable-5.0.0.ebuild b/media-gfx/darktable/darktable-5.0.0.ebuild
deleted file mode 100644
index e146fc3771d3..000000000000
--- a/media-gfx/darktable/darktable-5.0.0.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-S="${WORKDIR}/${P/_/~}"
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
-
-	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
-else
-	#DOC_PV=$(ver_cut 1-2)
-	DOC_PV="4.6"
-	MY_PV="${PV/_/}"
-	MY_P="${P/_/.}"
-
-	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-		doc? (
-			https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.en.pdf
-			l10n_uk? (
-				https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf
-					-> ${PN}-usermanual-${DOC_PV}.uk.pdf
-			)
-		)"
-
-	KEYWORDS="~amd64 ~arm64 -x86"
-	LANGS=" cs de es fi fr ja nl pt-BR sl sq uk zh-CN zh-TW"
-fi
-
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad geolocation keyring gphoto2 graphicsmagick heif jpeg2k jpegxl kwallet lto lua midi opencl openmp openexr test tools webp
-	${LANGS// / l10n_}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# It is sometimes requested, by both users and certain devs, to have sys-devel/gcc[graphite]
-# in BDEPEND. This has not been done *on purpose*, for the following reason:
-#  - darktable can also be built with llvm-core/clang so we'd have to have that, as an alternative,
-#    in BDEPEND too
-#  - there are at least two darktable dependencies (media-libs/mesa and dev-lang/rust) which
-#    by default pull in llvm-core/clang
-#  - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op
-#    (and curiously enough, empirical observations suggest current versions of Portage are
-#    more likely to pull in Clang to build darktable with than to request enabling USE=graphite
-#    on GCC; that might be a bug though)
-BDEPEND="dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( >=dev-python/jsonschema-3.2.0 )"
-DEPEND="dev-db/sqlite:3
-	dev-libs/icu:=
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	>=dev-libs/pugixml-1.8:=
-	gnome-base/librsvg:2
-	>=media-gfx/exiv2-0.25-r2:=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/tiff:=
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/zlib:=
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango
-	avif? ( >=media-libs/libavif-0.8.2:= )
-	colord? ( x11-libs/colord-gtk:= )
-	cups? ( net-print/cups )
-	gamepad? ( media-libs/libsdl2 )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	heif? ( media-libs/libheif:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	jpegxl? ( media-libs/libjxl:= )
-	lua? ( ${LUA_DEPS} )
-	midi? ( media-libs/portmidi )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:= )
-	webp? ( media-libs/libwebp:= )"
-RDEPEND="${DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1:* )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
-	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
-	"${FILESDIR}"/${PN}-4.2.1_cmake-musl.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug #695658
-		if tc-is-gcc; then
-			if ! test-flags-CC -floop-block &> /dev/null; then
-				eerror "Building ${PN} with GCC requires Graphite support."
-				eerror "Please switch to a version of sys-devel/gcc built with USE=graphite, or use a different compiler."
-				die "Selected compiler is sys-devel/gcc[-graphite]"
-			fi
-		fi
-
-		use openmp && tc-check-openmp
-	fi
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	use cpu_flags_x86_avx && append-flags -mavx
-	use cpu_flags_x86_sse3 && append-flags -msse3
-
-	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE="Release"
-	local mycmakeargs=(
-		-DBUILD_CURVE_TOOLS=$(usex tools)
-		-DBUILD_NOISE_TOOLS=$(usex tools)
-		-DBUILD_PRINT=$(usex cups)
-		-DCUSTOM_CFLAGS=ON
-		-DDONT_USE_INTERNAL_LUA=ON
-		-DRAWSPEED_ENABLE_LTO=$(usex lto)
-		-DRAWSPEED_ENABLE_WERROR=OFF
-		-DRAWSPEED_MUSL_SYSTEM=$(usex elibc_musl)
-		-DTESTBUILD_OPENCL_PROGRAMS=OFF
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_GMIC=OFF
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_HEIF=$(usex heif)
-		-DUSE_JXL=$(usex jpegxl)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_LUA=$(usex lua)
-		-DUSE_MAP=$(usex geolocation)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENEXR=$(usex openexr)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_PORTMIDI=$(usex midi)
-		-DUSE_SDL2=$(usex gamepad)
-		-DUSE_WEBP=$(usex webp)
-		-DWANT_JSON_VALIDATION=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# This USE flag is masked for -9999
-	if use doc; then
-		dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.en.pdf
-		use l10n_uk && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.uk.pdf
-	fi
-
-	for lang in ${LANGS} ; do
-		if ! use l10n_${lang}; then
-			rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-		fi
-	done
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "When updating a major version,"
-	elog "please bear in mind that your edits will be preserved during this process,"
-	elog "but it will not be possible to downgrade any more."
-	elog
-	ewarn "It will not be possible to downgrade!"
-	ewarn
-}
diff --git a/media-gfx/darktable/files/darktable-4.4.2_fix-has-attribute-musl.patch b/media-gfx/darktable/files/darktable-4.4.2_fix-has-attribute-musl.patch
deleted file mode 100644
index 0aad42605c9e..000000000000
--- a/media-gfx/darktable/files/darktable-4.4.2_fix-has-attribute-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/common/darktable.h
-+++ b/src/common/darktable.h
-@@ -140,7 +140,7 @@ extern "C" {
- /* Create cloned functions for various CPU SSE generations */
- /* See for instructions https://hannes.hauswedell.net/post/2017/12/09/fmv/ */
- /* TL;DR : use only on SIMD functions containing low-level paralellized/vectorized loops */
--#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH)
-+#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) && defined(__GLIBC__)
- # if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)
- #define __DT_CLONE_TARGETS__ __attribute__((target_clones("default", "sse2", "sse3", "sse4.1", "sse4.2", "popcnt", "avx", "avx2", "avx512f", "fma4")))
- # elif defined(__PPC64__)
diff --git a/media-gfx/digikam/digikam-8.5.0-r1.ebuild b/media-gfx/digikam/digikam-8.5.0-r1.ebuild
new file mode 100644
index 000000000000..4c3b3f8ba5ce
--- /dev/null
+++ b/media-gfx/digikam/digikam-8.5.0-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm kde.org toolchain-funcs
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/digiKam-${PV/_/-}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64"
+IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl +lensfun mysql openmp +panorama scanner semantic-desktop spell video"
+
+# bug 366505
+RESTRICT="test"
+
+# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,-gles2-only,gui,mysql?,network,opengl,sql,widgets,X,xml]
+	>=dev-qt/qtnetworkauth-${QTMIN}:6
+	>=dev-qt/qtscxml-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=media-gfx/exiv2-0.27.1:=[xmp]
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/liblqr
+	media-libs/libpng:=
+	>=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
+	media-libs/tiff:=
+	virtual/opengl
+	x11-libs/libX11
+	addressbook? (
+		>=kde-apps/akonadi-contacts-24.05.2:6
+		>=kde-frameworks/kcontacts-${KFMIN}:6
+	)
+	calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:6 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	heif? (
+		media-libs/libheif:=
+		media-libs/x265:=
+	)
+	imagemagick? ( media-gfx/imagemagick:= )
+	jpegxl? ( media-libs/libjxl:= )
+	lensfun? ( media-libs/lensfun )
+	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:6 )
+	scanner? ( >=kde-apps/libksane-24.05.2:6 )
+	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:6 )
+	spell? ( >=kde-frameworks/sonnet-${KFMIN}:6 )
+	video? ( >=dev-qt/qtmultimedia-${QTMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost
+	addressbook? ( >=kde-apps/akonadi-24.05.2:6 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5
+	media-libs/exiftool
+	mysql? ( virtual/mysql[server(+)] )
+	panorama? ( media-gfx/hugin )
+"
+BDEPEND="
+	sys-devel/gettext
+	panorama? (
+		app-alternatives/lex
+		app-alternatives/yacc
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-8.4.0-cmake.patch"
+	"${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch"
+	"${FILESDIR}/${P}-cmake-have_ksane.patch" # bug 947312
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+# TODO: adding IUSE X requires upstreaming WITH_X11 option for libX11,
+#	see core/cmake/rules/RulesX11.cmake; only used in core/libs/dimg/filters/icc
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT6=ON
+		-DBUILD_TESTING=OFF # bug 698192
+		-DENABLE_APPSTYLES=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+		-DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0
+		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+		$(cmake_use_find_package calendar KF6CalendarCore)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake_use_find_package gphoto2 Gphoto2)
+		$(cmake_use_find_package heif Libheif)
+		$(cmake_use_find_package imagemagick ImageMagick)
+		$(cmake_use_find_package jpegxl Libjxl)
+		$(cmake_use_find_package lensfun LensFun)
+		-DENABLE_MYSQLSUPPORT=$(usex mysql)
+		-DENABLE_INTERNALMYSQL=$(usex mysql)
+		$(cmake_use_find_package panorama KF6ThreadWeaver)
+		$(cmake_use_find_package scanner KSaneWidgets6)
+		-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
+		$(cmake_use_find_package spell KF6Sonnet)
+		-DENABLE_MEDIAPLAYER=$(usex video)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/digikam/digikam-8.5.0.ebuild b/media-gfx/digikam/digikam-8.5.0.ebuild
deleted file mode 100644
index 2b603c38c9a3..000000000000
--- a/media-gfx/digikam/digikam-8.5.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.3.0
-QTMIN=6.6.2
-inherit ecm kde.org toolchain-funcs
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/digiKam-${PV/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl +lensfun mysql openmp +panorama scanner semantic-desktop spell video"
-
-# bug 366505
-RESTRICT="test"
-
-# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
-COMMON_DEPEND="
-	dev-libs/expat
-	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,-gles2-only,gui,mysql?,network,opengl,sql,widgets,X,xml]
-	>=dev-qt/qtnetworkauth-${QTMIN}:6
-	>=dev-qt/qtscxml-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-	>=media-gfx/exiv2-0.27.1:=[xmp]
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/liblqr
-	media-libs/libpng:=
-	>=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
-	media-libs/tiff:=
-	virtual/opengl
-	x11-libs/libX11
-	addressbook? (
-		>=kde-apps/akonadi-contacts-24.05.2:6
-		>=kde-frameworks/kcontacts-${KFMIN}:6
-	)
-	calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:6 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	heif? (
-		media-libs/libheif:=
-		media-libs/x265:=
-	)
-	imagemagick? ( media-gfx/imagemagick:= )
-	jpegxl? ( media-libs/libjxl:= )
-	lensfun? ( media-libs/lensfun )
-	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:6 )
-	scanner? ( >=kde-apps/libksane-24.05.2:6 )
-	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:6 )
-	spell? ( >=kde-frameworks/sonnet-${KFMIN}:6 )
-	video? ( >=dev-qt/qtmultimedia-${QTMIN}:6 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost
-	addressbook? ( >=kde-apps/akonadi-24.05.2:6 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!${CATEGORY}/${PN}:5
-	media-libs/exiftool
-	mysql? ( virtual/mysql[server(+)] )
-	panorama? ( media-gfx/hugin )
-"
-BDEPEND="
-	sys-devel/gettext
-	panorama? (
-		app-alternatives/lex
-		app-alternatives/yacc
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-8.4.0-cmake.patch"
-	"${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	ecm_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	ecm_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-# TODO: adding IUSE X requires upstreaming WITH_X11 option for libX11,
-#	see core/cmake/rules/RulesX11.cmake; only used in core/libs/dimg/filters/icc
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=ON
-		-DBUILD_TESTING=OFF # bug 698192
-		-DENABLE_APPSTYLES=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-		-DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0
-		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		$(cmake_use_find_package calendar KF6CalendarCore)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake_use_find_package gphoto2 Gphoto2)
-		$(cmake_use_find_package heif Libheif)
-		$(cmake_use_find_package imagemagick ImageMagick)
-		$(cmake_use_find_package jpegxl Libjxl)
-		$(cmake_use_find_package lensfun LensFun)
-		-DENABLE_MYSQLSUPPORT=$(usex mysql)
-		-DENABLE_INTERNALMYSQL=$(usex mysql)
-		$(cmake_use_find_package panorama KF6ThreadWeaver)
-		$(cmake_use_find_package scanner KSaneWidgets6)
-		-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
-		$(cmake_use_find_package spell KF6Sonnet)
-		-DENABLE_MEDIAPLAYER=$(usex video)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/digikam/files/digikam-8.5.0-cmake-have_ksane.patch b/media-gfx/digikam/files/digikam-8.5.0-cmake-have_ksane.patch
new file mode 100644
index 000000000000..9099b2f37468
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-8.5.0-cmake-have_ksane.patch
@@ -0,0 +1,28 @@
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 2cef54510c..95e33cfc2f 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -201,7 +201,11 @@ MACOS_DEBUG_POLICIES()
+ message(STATUS "--------------------------------------------------")
+ message(STATUS "")
+ 
++if(Qt6_FOUND)
++MACRO_BOOL_TO_01(KSaneWidgets6_FOUND                            HAVE_KSANE)
++else()
+ MACRO_BOOL_TO_01(KF${QT_VERSION_MAJOR}Sane_FOUND                HAVE_KSANE)
++endif()
+ MACRO_BOOL_TO_01(KF${QT_VERSION_MAJOR}FileMetaData_FOUND        HAVE_KFILEMETADATA)
+ MACRO_BOOL_TO_01(KF${QT_VERSION_MAJOR}CalendarCore_FOUND        HAVE_KCALENDAR)
+ MACRO_BOOL_TO_01(KF${QT_VERSION_MAJOR}Notifications_FOUND       HAVE_KNOTIFICATIONS)
+@@ -294,7 +302,11 @@ PRINT_OPTIONAL_LIBRARY_STATUS("libkio"            "https://invent.kde.org/framew
+ PRINT_OPTIONAL_LIBRARY_STATUS("libknotifications" "https://invent.kde.org/frameworks/knotifyconfig"                 "(version >= ${KF${QT_VERSION_MAJOR}_MIN_VERSION})"       "digiKam will be compiled without KDE desktop notifications support."         KF${QT_VERSION_MAJOR}Notifications_FOUND)
+ PRINT_OPTIONAL_LIBRARY_STATUS("libknotifyconfig"  "https://invent.kde.org/frameworks/knotifications"                "(version >= ${KF${QT_VERSION_MAJOR}_MIN_VERSION})"       "digiKam will be compiled without KDE desktop notify configuration support."  KF${QT_VERSION_MAJOR}NotifyConfig_FOUND)
+ PRINT_OPTIONAL_LIBRARY_STATUS("libsonnet"         "https://invent.kde.org/frameworks/sonnet"                        "(version >= ${KF${QT_VERSION_MAJOR}_MIN_VERSION})"       "digiKam will be compiled without spell-checking support."                    KF${QT_VERSION_MAJOR}Sonnet_FOUND)
++if(Qt6_FOUND)
++PRINT_OPTIONAL_LIBRARY_STATUS("libksane"          "https://invent.kde.org/graphics/libksane"                        "(version >= ${KSANE_MIN_VERSION})"     "digiKam will be compiled without flat scanners support."                     KSaneWidgets6_FOUND)
++else()
+ PRINT_OPTIONAL_LIBRARY_STATUS("libksane"          "https://invent.kde.org/graphics/libksane"                        "(version >= ${KSANE_MIN_VERSION})"     "digiKam will be compiled without flat scanners support."                     KF${QT_VERSION_MAJOR}Sane_FOUND)
++endif()
+ PRINT_OPTIONAL_LIBRARY_STATUS("liblensfun"        "https://github.com/lensfun/lensfun"                              "(version >= 0.2.6)"                    "digiKam will be compiled without Lens Auto Correction tool support."         LensFun_FOUND)
+ PRINT_OPTIONAL_LIBRARY_STATUS("libglib2"          "https://developer.gnome.org/glib/"                               "(version >= 2.0.0)"                    "digiKam will be compiled without Contents Aware Resizer tool support."       GLIB2_FOUND)
+ 
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 1a9407e023a9..dba902d19893 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,2 +1,2 @@
-DIST eog-45.3.tar.xz 4656744 BLAKE2B ceebd9890da926ec7caea916ce2e4483fb398f1b5270f0a210bfc97fb844669ca8416a10cc020f145f8e0b1d2e5e2fd85dcaa4d948312e42b40c0850d657f988 SHA512 21693d659a5eb25bdec968266d7e6a1a6988bcec0bf5c3d914b098001ed4a8e64d7ff628181072fb1aabec1b89b56ed5e7c85e3b06ec79be1c9d7cf1c57d3145
 DIST eog-45.4.tar.xz 4657420 BLAKE2B 422e9d9cfffe81fdd3af4948f371c11fcd6a2fba50df78469267747314cdcc840763a7057566c5e43c6eee9a0175e9dfaa1916736cfbef6d879076b9f2c11fcc SHA512 eb49d9c78b6e3d66eb20a714c2ebf5aad5c5547c2ca86e5c51e4b7f3c4c3bae5c4c356cec4c5815cc11d91c38ace58c00ea25c406de8cd9bf39a0ec65188baf8
+DIST eog-47.0.tar.xz 4658256 BLAKE2B 8e1162c3ca5ee89605eb8d6b616f3e2d034725948a32f568e3f1608247d6e35b67ad98351b5a0396b72031c0c3e1bcfa5f9e97f7e159e6020b7c7ba6c23a204a SHA512 5a3907988031360c53d7a2c9ba8c5e1c03c714f41f55bb980414e35591d522f32d9ae1c9e6c0ac6ca58e559074cd060572225417e30f39281a8f93473ec42159
diff --git a/media-gfx/eog/eog-45.3.ebuild b/media-gfx/eog/eog-45.3.ebuild
deleted file mode 100644
index d200bb7d2e69..000000000000
--- a/media-gfx/eog/eog-45.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome https://gitlab.gnome.org/GNOME/eog"
-
-LICENSE="GPL-2+"
-SLOT="1"
-
-IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
-REQUIRED_USE="
-	exif? ( jpeg )
-	gtk-doc? ( introspection )
-"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.73.2:2
-	>=dev-libs/libpeas-0.7.4:0[gtk]
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	>=gnome-base/gsettings-desktop-schemas-42_beta
-	>=x11-misc/shared-mime-info-0.20
-	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
-	>=x11-libs/gtk+-3.24.15:3[introspection,X]
-	>=gui-libs/libhandy-1.5.0:1
-	sys-libs/zlib
-
-	exif? ( >=media-libs/libexif-0.6.14 )
-	lcms? ( media-libs/lcms:2 )
-	xmp? ( media-libs/exempi:2= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	svg? ( >=gnome-base/librsvg-2.44.0:2 )
-
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? (
-		dev-util/gi-docgen
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use exif libexif)
-		$(meson_use lcms cms)
-		$(meson_use xmp)
-		$(meson_use jpeg libjpeg)
-		$(meson_use svg librsvg)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		-Dinstalled_tests=false
-		-Dlibportal=false # As of 40.3, all libportal usages are flatpak-specific
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/eog/eog-47.0.ebuild b/media-gfx/eog/eog-47.0.ebuild
new file mode 100644
index 000000000000..176f838354cb
--- /dev/null
+++ b/media-gfx/eog/eog-47.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/eog"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="
+	exif? ( jpeg )
+	gtk-doc? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.73.2:2
+	>=dev-libs/libpeas-0.7.4:0[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-42_beta
+	>=x11-misc/shared-mime-info-0.20
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-3.24.15:3[introspection,X]
+	>=gui-libs/libhandy-1.5.0:1
+	sys-libs/zlib
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	lcms? ( media-libs/lcms:2 )
+	xmp? ( media-libs/exempi:2= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		dev-util/gi-docgen
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif libexif)
+		$(meson_use lcms cms)
+		$(meson_use xmp)
+		$(meson_use jpeg libjpeg)
+		$(meson_use svg librsvg)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		-Dinstalled_tests=false
+		-Dlibportal=false # As of 40.3, all libportal usages are flatpak-specific
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/fotema/Manifest b/media-gfx/fotema/Manifest
index 549013135e5f..3cfbef6d681d 100644
--- a/media-gfx/fotema/Manifest
+++ b/media-gfx/fotema/Manifest
@@ -1 +1,6 @@
 DIST fotema-1.14.4.tar.xz 78458268 BLAKE2B 4f8cc8f1ba3df27eca16b41e11ae947fe15b83321bc2da23f01a16012d862999a0cf6572353bc74cf2868a91404b199712b4f4d9df63ed87970469d57bb5be16 SHA512 189638c8d7e4466b1318ec06324cd1bfb3eaa36b9b7116b7e44a654d4cd09fb38961c0a5fa02469180f66844614555773e2306becd590eb7b8ba8fb074e9c3cc
+DIST fotema-1.18.3-crates.tar.xz 62354556 BLAKE2B 6b8af1e6edf5efb751f60803b27e8001d916854bd7cdcf4e9a06bc21cfdd856e80ee58cc59fbd7750da5f159f3b231c597f4660534b65cb38dcc7421cd24213f SHA512 811df7a370b500c1e1cb8e9218026bb30b17da3860a88d8972601459c9c54101c18a59885040a2306ccc7c18081a1c3e7148ebb8b9bd48d3dfdba86157345192
+DIST fotema-1.18.3.gh.tar.gz 8947271 BLAKE2B 7e1ba24aa38b1bd8b1e8291fa0bfcb7aad5d36f366bb5a0cc7114c5d72cef3083918f6a28cfcee713bf8e079822ee61146e1ee508dd0740f53591878078534aa SHA512 fa8bee36328b5a261eef7e1ef123dab724fb7521e77c5b8e3e4104d0693d4a16b486cc9f19149b6e4aeae8c598f910214a72c3d5ddb93cc1f74848f2100f66ec
+DIST fotema-1.19.0-crates.tar.xz 62327412 BLAKE2B 099677191ca1634288d9f4e6055ddfaa3e6562d96fcd06dcc51aa1cb49fed648a61f60f2d47ac51c4fd97a8a238a8f064a8f9990768e2160fd9e002b4ffb978a SHA512 11b7510aae15359e0b2bb95a7e5b4b973f1438328f8fea075264bfb16da50876c4bec5bd82c0af965c8fc9bb5c2d1126c03c077ebd0d1cda704e6b89daf504c2
+DIST fotema-1.19.0.gh.tar.gz 8950038 BLAKE2B 131c013515b11ac068944e9d3c7e4ae1809ed75bf6d7d1eebdf10c09498d519363ab2b0d35b07a6f11c3e221d8665adf289ce9ff3f820585dd97b2065a5c1322 SHA512 4750028bd30a46f37a6ca85ff9d005dd99c4d4a0d1c0df60baadc094d9630bafeff21e898543c9ef41c612237fdfbe642f7abbbcb1fbd4c8c6d3dbed369f420f
+DIST fotema-rust-faces-43c0d5acd6f3f4d90c6487708f2e511a73bf7c9e.gh.tar.gz 839519 BLAKE2B 7ba344d55c5d108e63556dda32aaf60cfbd2b14a05e2965ca69e54e2aab578f6ba49f7a7b89d6c32cb5ace4b80f7a84247dcbb43a98d5d709895810798966b0b SHA512 aac99659e2d82d342f52b5860d9f1e284e1658fa9e0986b1c54a81cc33f6391535a2773d79defc6a7bf1e52591dc91d91a1ef3742c38e599baed79975b42de51
diff --git a/media-gfx/fotema/fotema-1.18.3.ebuild b/media-gfx/fotema/fotema-1.18.3.ebuild
new file mode 100644
index 000000000000..33bdf6a09676
--- /dev/null
+++ b/media-gfx/fotema/fotema-1.18.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[rust-faces]='https://github.com/blissd/fotema-rust-faces;43c0d5acd6f3f4d90c6487708f2e511a73bf7c9e;fotema-rust-faces-%commit%'
+)
+
+inherit cargo gnome2-utils meson xdg-utils
+
+CRATE_P=${P}
+DESCRIPTION="Photo gallery for Linux"
+HOMEPAGE="https://github.com/blissd/fotema"
+SRC_URI="
+	https://github.com/blissd/fotema/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/${CRATE_P}-crates.tar.xz
+	"
+fi
+
+# see LICENSES/
+LICENSE="
+	CC-BY-2.0 CC-BY-4.0 CC-BY-NC-SA-4.0 CC-BY-SA-4.0 CC0-1.0
+	FDL-1.3+ GPL-3+ MIT
+"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD CC0-1.0 ISC MIT
+	MPL-2.0 Unicode-3.0 WTFPL-2 ZLIB
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-libs/glib-2.66:2
+	>=gui-libs/gtk-4.16:4
+"
+# indirect deps via crates
+DEPEND+="
+	dev-libs/openssl:=
+	gui-libs/libadwaita
+	media-libs/fontconfig
+	media-libs/graphene
+	media-libs/lcms:2
+	media-libs/libshumate:=
+	media-libs/opencv:=[contribdnn]
+	media-video/ffmpeg:=
+	sci-libs/onnx
+	sys-libs/libseccomp
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+"
+RDEPEND="
+	${DEPEND}
+	media-libs/glycin-loaders
+"
+BDEPEND="
+	dev-libs/glib:2
+"
+
+QA_FLAGS_IGNORED="/usr/bin/fotema"
+
+src_configure() {
+	local emesonargs=(
+		-Dprofile=$(usex debug development default)
+	)
+
+	meson_src_configure
+	ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die
+
+	export ORT_STRATEGY=system
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/fotema/fotema-1.19.0.ebuild b/media-gfx/fotema/fotema-1.19.0.ebuild
new file mode 100644
index 000000000000..33bdf6a09676
--- /dev/null
+++ b/media-gfx/fotema/fotema-1.19.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[rust-faces]='https://github.com/blissd/fotema-rust-faces;43c0d5acd6f3f4d90c6487708f2e511a73bf7c9e;fotema-rust-faces-%commit%'
+)
+
+inherit cargo gnome2-utils meson xdg-utils
+
+CRATE_P=${P}
+DESCRIPTION="Photo gallery for Linux"
+HOMEPAGE="https://github.com/blissd/fotema"
+SRC_URI="
+	https://github.com/blissd/fotema/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/${CRATE_P}-crates.tar.xz
+	"
+fi
+
+# see LICENSES/
+LICENSE="
+	CC-BY-2.0 CC-BY-4.0 CC-BY-NC-SA-4.0 CC-BY-SA-4.0 CC0-1.0
+	FDL-1.3+ GPL-3+ MIT
+"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD CC0-1.0 ISC MIT
+	MPL-2.0 Unicode-3.0 WTFPL-2 ZLIB
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-libs/glib-2.66:2
+	>=gui-libs/gtk-4.16:4
+"
+# indirect deps via crates
+DEPEND+="
+	dev-libs/openssl:=
+	gui-libs/libadwaita
+	media-libs/fontconfig
+	media-libs/graphene
+	media-libs/lcms:2
+	media-libs/libshumate:=
+	media-libs/opencv:=[contribdnn]
+	media-video/ffmpeg:=
+	sci-libs/onnx
+	sys-libs/libseccomp
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+"
+RDEPEND="
+	${DEPEND}
+	media-libs/glycin-loaders
+"
+BDEPEND="
+	dev-libs/glib:2
+"
+
+QA_FLAGS_IGNORED="/usr/bin/fotema"
+
+src_configure() {
+	local emesonargs=(
+		-Dprofile=$(usex debug development default)
+	)
+
+	meson_src_configure
+	ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die
+
+	export ORT_STRATEGY=system
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/fotocx/Manifest b/media-gfx/fotocx/Manifest
index fbc2a2f18eb0..f8d1cd9a224c 100644
--- a/media-gfx/fotocx/Manifest
+++ b/media-gfx/fotocx/Manifest
@@ -1,3 +1,4 @@
 DIST fotocx-24.50-source.tar.gz 16197289 BLAKE2B 468a3cd7ef2cee5a65d2a06283732e0994f9eeb823ed2fd02e319c68f7cb4686a33fbc61e85eaeb8bdd2c7455d1cebada49d0da6004007ad15333b1c39050768 SHA512 3f30b4efb43313980a1be8b92e66c8260484e10a3e50c5351d5462004fe6e5685ecd39be263fbd85bde495a5f1c539bd262124478516d8ddcd40420fa6de699e
 DIST fotocx-24.60-source.tar.gz 15771741 BLAKE2B 89ab212cdaeb414637ad0b3c9833b0caea6c805422e3fccdd027912f1d32ed141cedaeb5826212e36e5b40591e40c85816ecc5d3cff7915693e11e78b962b890 SHA512 6a04e0d749865000b67497b897f691a5882c0d63dda8c64ffe824215582db051f9cc0ca528490112f26db41a58f1673affe2e2e55c90dbb9e6f24cef77e4d5d6
 DIST fotocx-24.70-source.tar.gz 15771508 BLAKE2B 74343ee57a0611b470794ae211ac4923744ab5619895234b50ccf00e88d9fe4f15aa94a83112acbf160a5e0c2befbef070da258500d17f240f8ccd467784c8e5 SHA512 1b7b160ede154a80251ffd6935b8a10767e70fcb87e2071899ee1a8228c8d816323d947a631320d525f6a37768c32bcc2a998a30ee2ac4e1769354a85a0f7f27
+DIST fotocx-25.0-source.tar.gz 15651266 BLAKE2B e6330541a3a0d341055a326b0ab4e3cc7b79bd80ea1cebab7303302e3ec519fb732f1604fe4fce87de4a9690f0da1399a700a5400c7596bf4810c03a469cd768 SHA512 3f4dfdfdd5190599d7294ff10364f382effab5ccc8dde712b467e925c5823cd03bf67a5e85cad2177a194e49431d21b846eed2648a45a8855e922006f69cd4d8
diff --git a/media-gfx/fotocx/fotocx-25.0.ebuild b/media-gfx/fotocx/fotocx-25.0.ebuild
new file mode 100644
index 000000000000..8c904f825206
--- /dev/null
+++ b/media-gfx/fotocx/fotocx-25.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature xdg-utils
+
+DESCRIPTION="Program for improving image files made with a digital camera"
+HOMEPAGE="https://kornelix.net/fotocx/fotocx.html"
+SRC_URI="https://kornelix.net/downloads/downloads/${P}-source.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# For required dependencies read doc/README, for required tools read
+# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
+# alternative to firefox and chromium-browser. `grep '"which ' * -R`
+# is helpful to report some required tools run via the shell.
+
+DEPEND="
+	media-libs/clutter
+	media-libs/clutter-gtk
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/tiff:=
+	media-libs/libchamplain[gtk]
+	x11-libs/gtk+:3"
+RDEPEND="
+	${DEPEND}
+	media-gfx/dcraw
+	media-libs/exiftool
+	x11-misc/xdg-utils
+"
+
+PATCHES=( "${FILESDIR}/${PN}-24.20-documentation.patch" )
+
+DOCS=()
+HTML_DOCS=()
+
+src_prepare() {
+	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
+	sed -i -e "/^Icon/ s/\.png$//" ${PN}.desktop || die
+	default
+}
+
+src_install() {
+	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
+	# and README, changelog, copyright, license, etc. must not be compressed.
+	emake DESTDIR="${D}" PREFIX="/usr" install
+	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
+	docompress -x /usr/share/doc
+}
+
+pkg_postinst() {
+	optfeature "HEIC & AVIF file support" media-libs/libheif
+	optfeature "additional RAW file support" media-gfx/rawtherapee
+	optfeature "additional RAW file support" media-gfx/darktable
+	optfeature "video thumbnails & playback" media-video/ffmpeg
+	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
+	optfeature "WEBP file support" media-libs/libwebp
+
+	elog
+	elog "Please read the Help > User Guide for details. The source location is"
+	elog "/usr/share/fotocx/data/userguide and after running fotocx a copy will"
+	elog "be placed at /home/<user>/.fotocx/userguide."
+	elog
+	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
+	elog
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/freecad/freecad-1.0.0-r1.ebuild b/media-gfx/freecad/freecad-1.0.0-r1.ebuild
deleted file mode 100644
index 5e1a1fb2945b..000000000000
--- a/media-gfx/freecad/freecad-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg
-
-DESCRIPTION="Qt based Computer Aided Design application"
-HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD"
-
-MY_PN=FreeCAD
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-	S="${WORKDIR}/freecad-${PV}"
-else
-	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64"
-	S="${WORKDIR}/FreeCAD-${PV}"
-fi
-
-# code is licensed LGPL-2
-# examples are licensed CC-BY-SA (without note of specific version)
-LICENSE="LGPL-2 CC-BY-SA-4.0"
-SLOT="0"
-IUSE="debug designer +gui netgen pcl +smesh spacenav test X"
-# Modules are found in src/Mod/ and their options defined in:
-# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake
-# To get their dependencies:
-# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
-IUSE+=" addonmgr +bim cam cloud fem idf inspection +mesh openscad points reverse robot surface +techdraw"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bim? ( mesh )
-	cam? ( mesh )
-	gui? ( bim )
-	designer? ( gui )
-	fem? ( smesh )
-	inspection? ( points )
-	mesh? ( smesh )
-	openscad? ( mesh )
-	reverse? ( mesh points )
-	test? ( techdraw )
-"
-# Draft Workbench needs BIM
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-cpp/gtest
-	dev-cpp/yaml-cpp
-	dev-libs/boost:=
-	dev-libs/libfmt:=
-	dev-libs/xerces-c[icu]
-	dev-qt/qtbase:6[concurrent,network,xml]
-	media-libs/freetype
-	sci-libs/opencascade:=[json]
-	sys-libs/zlib
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	')
-	cloud? (
-		dev-libs/openssl:=
-		net-misc/curl
-	)
-	fem? (
-		sci-libs/vtk:=
-		$(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]')
-	)
-	gui? (
-		>=media-libs/coin-4.0.0
-		dev-qt/qtbase:6[gui,opengl,widgets]
-		dev-qt/qtsvg:6
-		dev-qt/qttools:6[designer?,widgets]
-		$(python_gen_cond_dep '
-			dev-python/matplotlib[${PYTHON_USEDEP}]
-			>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
-			<dev-python/pyside6-6.8.0:=[designer,gui,svg,${PYTHON_USEDEP}]
-			<dev-python/shiboken6-6.8.0:=[${PYTHON_USEDEP}]
-		' )
-		virtual/glu
-		virtual/opengl
-		spacenav? ( dev-libs/libspnav[X?] )
-	)
-	netgen? ( media-gfx/netgen[opencascade] )
-	openscad? ( $(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]') )
-	pcl? ( sci-libs/pcl:= )
-	smesh? (
-		sci-libs/hdf5:=[zlib]
-		>=sci-libs/med-4.0.0-r1
-		sci-libs/vtk:=
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-cpp/eigen-3.3.1:3
-	dev-cpp/ms-gsl
-"
-BDEPEND="
-	dev-lang/swig
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch
-	"${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
-	"${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
-)
-
-DOCS=( CODE_OF_CONDUCT.md README.md )
-
-CHECKREQS_DISK_BUILD="2G"
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix desktop file
-	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecad.FreeCAD.desktop || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# -Werror=odr, -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/875221
-	# https://github.com/FreeCAD/FreeCAD/issues/13173
-	filter-lto
-
-	# Fix building tests
-	append-ldflags -Wl,--copy-dt-needed-entries
-
-	local mycmakeargs=(
-		-DBUILD_DESIGNER_PLUGIN=$(usex designer)
-		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
-		-DBUILD_GUI=$(usex gui)
-		-DBUILD_SMESH=$(usex smesh)
-		-DBUILD_VR=OFF
-		-DBUILD_WITH_CONDA=OFF
-
-		# Modules
-		-DBUILD_ADDONMGR=$(usex addonmgr)
-		-DBUILD_ASSEMBLY=OFF					# Requires OndselSolver
-		-DBUILD_BIM=$(usex bim)
-		-DBUILD_CAM=$(usex cam)
-		-DBUILD_CLOUD=$(usex cloud)
-		-DBUILD_DRAFT=ON
-		# see below for DRAWING
-		-DBUILD_FEM=$(usex fem)
-		-DBUILD_FEM_NETGEN=$(usex fem $(usex netgen))
-		-DBUILD_FLAT_MESH=$(usex mesh)			# a submodule of MeshPart
-		-DBUILD_HELP=ON
-		-DBUILD_IDF=$(usex idf)
-		-DBUILD_IMPORT=ON						# import module for various file formats
-		-DBUILD_INSPECTION=$(usex inspection)
-		-DBUILD_JTREADER=OFF					# uses an old proprietary library
-		-DBUILD_MATERIAL=ON
-		-DBUILD_MEASURE=ON
-		-DBUILD_MESH=$(usex mesh)
-		-DBUILD_MESH_PART=$(usex mesh)
-		-DBUILD_OPENSCAD=$(usex openscad)
-		-DBUILD_PART=ON
-		-DBUILD_PART_DESIGN=ON
-		-DBUILD_PLOT=ON
-		-DBUILD_POINTS=$(usex points)
-		-DBUILD_REVERSEENGINEERING=$(usex reverse)
-		-DBUILD_ROBOT=$(usex robot)
-		-DBUILD_SANDBOX=OFF
-		-DBUILD_SHOW=$(usex gui)
-		-DBUILD_SKETCHER=ON						# needed by draft workspace
-		-DBUILD_SPREADSHEET=ON
-		-DBUILD_START=ON
-		-DBUILD_SURFACE=$(usex surface)
-		-DBUILD_TECHDRAW=$(usex techdraw)
-		-DBUILD_TEST=ON							# always build test workbench for run-time testing
-		-DBUILD_TUX=$(usex gui)
-		-DBUILD_WEB=ON							# needed by start workspace
-
-		-DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
-		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
-
-		-DFREECAD_BUILD_DEBIAN=OFF
-
-		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
-		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
-		-DFREECAD_USE_FREETYPE=ON
-		-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
-		-DFREECAD_USE_PCL=$(usex pcl)
-		-DFREECAD_USE_PYBIND11=ON
-		-DFREECAD_USE_QT_FILEDIALOG=ON
-
-		# install python modules to site-packages' dir. True only for the main package,
-		# sub-packages will still be installed inside /usr/lib64/freecad
-		-DINSTALL_TO_SITEPACKAGES=ON
-
-		# Use the version of shiboken2 that matches the selected python version
-		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-		-DPython3_EXECUTABLE=${PYTHON}
-	)
-
-	if use debug; then
-		# BUILD_SANDBOX currently broken, see
-		# https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
-		mycmakeargs+=(
-			-DBUILD_SANDBOX=OFF
-			-DBUILD_TEMPLATE=ON
-		)
-	else
-		mycmakeargs+=(
-			-DBUILD_SANDBOX=OFF
-			-DBUILD_TEMPLATE=OFF
-		)
-	fi
-
-	if use gui; then
-		mycmakeargs+=(
-			-DFREECAD_QT_MAJOR_VERSION=6
-			-DFREECAD_QT_VERSION=6
-			-DQT_DEFAULT_MAJOR_VERSION=6
-			-DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc"
-			-DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc"
-			-DBUILD_QT5=OFF
-			# Drawing module unmaintained and not ported to qt6
-			-DBUILD_DRAWING=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-# We use the FreeCADCmd binary instead of the FreeCAD binary here
-# for two reasons:
-# 1. It works out of the box with USE=-gui as well, not needing a guard
-# 2. We don't need virtualx.eclass and its dependencies
-# The environment variables are needed, so that FreeCAD knows
-# where to save its temporary files, and where to look and write its
-# configuration. Without those, there is a sandbox violation, when it
-# tries to create /var/lib/portage/home/.FreeCAD directory.
-src_test() {
-	cd "${BUILD_DIR}" || die
-
-	local -x FREECAD_USER_HOME="${HOME}"
-	local -x FREECAD_USER_DATA="${T}"
-	local -x FREECAD_USER_TEMP="${T}"
-	./bin/FreeCADCmd --run-test 0 --set-config AppHomePath="${BUILD_DIR}/" || die
-}
-
-src_install() {
-	cmake_src_install
-
-	dobin src/Tools/freecad-thumbnailer
-
-	if use gui; then
-		newbin - freecad <<- _EOF_
-		#!/bin/sh
-		# https://github.com/coin3d/coin/issues/451
-		: "\${QT_QPA_PLATFORM:=xcb}"
-		export QT_QPA_PLATFORM
-		exec /usr/$(get_libdir)/${PN}/bin/FreeCAD "\${@}"
-		_EOF_
-		mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources"
-	fi
-	dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
-
-	rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format"
-
-	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
-	# compile main package in python site-packages as well
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	einfo "You can load a lot of additional workbenches using the integrated"
-	einfo "AddonManager."
-
-	einfo "There are a lot of additional tools, for which FreeCAD has builtin"
-	einfo "support. Some of them are available in Gentoo. Take a look at"
-	einfo "https://wiki.freecad.org/Installing_additional_components"
-	optfeature_header "External programs used by FreeCAD"
-	optfeature "dependency graphs" media-gfx/graphviz
-	optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg
-	optfeature "importing OpenSCAD files, Mesh booleans" media-gfx/openscad
-	use bim && optfeature "working with COLLADA documents" dev-python/pycollada
-	if use fem || use mesh; then
-		optfeature "mesh generation" sci-libs/gmsh
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-gfx/freecad/freecad-1.0.0-r3.ebuild b/media-gfx/freecad/freecad-1.0.0-r3.ebuild
new file mode 100644
index 000000000000..d90bcdea5bf9
--- /dev/null
+++ b/media-gfx/freecad/freecad-1.0.0-r3.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg
+
+DESCRIPTION="Qt based Computer Aided Design application"
+HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD"
+
+MY_PN=FreeCAD
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+	S="${WORKDIR}/freecad-${PV}"
+else
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/FreeCAD-${PV}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="debug designer +gui netgen pcl +smesh spacenav test X"
+# Modules are found in src/Mod/ and their options defined in:
+# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake
+# To get their dependencies:
+# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
+IUSE+=" addonmgr assembly +bim cam cloud fem idf inspection +mesh openscad points reverse robot surface +techdraw"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bim? ( mesh )
+	cam? ( mesh )
+	gui? ( bim )
+	designer? ( gui )
+	fem? ( smesh )
+	inspection? ( points )
+	mesh? ( smesh )
+	openscad? ( mesh )
+	reverse? ( mesh points )
+	test? ( techdraw )
+"
+# Draft Workbench needs BIM
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-cpp/gtest
+	dev-cpp/yaml-cpp
+	dev-libs/boost:=
+	dev-libs/libfmt:=
+	dev-libs/xerces-c[icu]
+	dev-qt/qtbase:6[concurrent,network,xml]
+	media-libs/freetype
+	sci-libs/opencascade:=[json]
+	sys-libs/zlib
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	assembly? ( sci-libs/ondselsolver )
+	cloud? (
+		dev-libs/openssl:=
+		net-misc/curl
+	)
+	fem? (
+		sci-libs/vtk:=
+		$(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]')
+	)
+	gui? (
+		>=media-libs/coin-4.0.0
+		dev-qt/qtbase:6[gui,opengl,widgets]
+		dev-qt/qtsvg:6
+		dev-qt/qttools:6[designer?,widgets]
+		$(python_gen_cond_dep '
+			dev-python/matplotlib[${PYTHON_USEDEP}]
+			>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+			dev-python/pyside6:=[uitools(-),gui,svg,${PYTHON_USEDEP}]
+			dev-python/shiboken6:=[${PYTHON_USEDEP}]
+		' )
+		virtual/glu
+		virtual/opengl
+		spacenav? ( dev-libs/libspnav[X?] )
+	)
+	netgen? ( media-gfx/netgen[opencascade] )
+	openscad? ( $(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]') )
+	pcl? ( sci-libs/pcl:= )
+	smesh? (
+		sci-libs/hdf5:=[zlib]
+		>=sci-libs/med-4.0.0-r1
+		sci-libs/vtk:=
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-cpp/eigen-3.3.1:3
+	dev-cpp/ms-gsl
+"
+BDEPEND="
+	dev-lang/swig
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch
+	"${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
+	"${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
+)
+
+DOCS=( CODE_OF_CONDUCT.md README.md )
+
+CHECKREQS_DISK_BUILD="2G"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix desktop file
+	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecad.FreeCAD.desktop || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/875221
+	# https://github.com/FreeCAD/FreeCAD/issues/13173
+	filter-lto
+
+	# Fix building tests
+	append-ldflags -Wl,--copy-dt-needed-entries
+
+	local mycmakeargs=(
+		-DBUILD_DESIGNER_PLUGIN=$(usex designer)
+		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
+		-DBUILD_GUI=$(usex gui)
+		-DBUILD_SMESH=$(usex smesh)
+		-DBUILD_VR=OFF
+		-DBUILD_WITH_CONDA=OFF
+
+		# Modules
+		-DBUILD_ADDONMGR=$(usex addonmgr)
+		-DBUILD_ASSEMBLY=$(usex assembly)
+		-DBUILD_BIM=$(usex bim)
+		-DBUILD_CAM=$(usex cam)
+		-DBUILD_CLOUD=$(usex cloud)
+		-DBUILD_DRAFT=ON
+		# see below for DRAWING
+		-DBUILD_FEM=$(usex fem)
+		-DBUILD_FEM_NETGEN=$(usex fem $(usex netgen))
+		-DBUILD_FLAT_MESH=$(usex mesh)			# a submodule of MeshPart
+		-DBUILD_HELP=ON
+		-DBUILD_IDF=$(usex idf)
+		-DBUILD_IMPORT=ON						# import module for various file formats
+		-DBUILD_INSPECTION=$(usex inspection)
+		-DBUILD_JTREADER=OFF					# uses an old proprietary library
+		-DBUILD_MATERIAL=ON
+		-DBUILD_MEASURE=ON
+		-DBUILD_MESH=$(usex mesh)
+		-DBUILD_MESH_PART=$(usex mesh)
+		-DBUILD_OPENSCAD=$(usex openscad)
+		-DBUILD_PART=ON
+		-DBUILD_PART_DESIGN=ON
+		-DBUILD_PLOT=ON
+		-DBUILD_POINTS=$(usex points)
+		-DBUILD_REVERSEENGINEERING=$(usex reverse)
+		-DBUILD_ROBOT=$(usex robot)
+		-DBUILD_SANDBOX=OFF
+		-DBUILD_SHOW=$(usex gui)
+		-DBUILD_SKETCHER=ON						# needed by draft workspace
+		-DBUILD_SPREADSHEET=ON
+		-DBUILD_START=ON
+		-DBUILD_SURFACE=$(usex surface)
+		-DBUILD_TECHDRAW=$(usex techdraw)
+		-DBUILD_TEST=ON							# always build test workbench for run-time testing
+		-DBUILD_TUX=$(usex gui)
+		-DBUILD_WEB=ON							# needed by start workspace
+
+		-DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
+		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
+
+		-DFREECAD_BUILD_DEBIAN=OFF
+
+		-DFREECAD_USE_EXTERNAL_ONDSELSOLVER=$(usex assembly)
+		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
+		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
+		-DFREECAD_USE_FREETYPE=ON
+		-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+		-DFREECAD_USE_PCL=$(usex pcl)
+		-DFREECAD_USE_PYBIND11=ON
+		-DFREECAD_USE_QT_FILEDIALOG=ON
+
+		# install python modules to site-packages' dir. True only for the main package,
+		# sub-packages will still be installed inside /usr/lib64/freecad
+		-DINSTALL_TO_SITEPACKAGES=ON
+
+		# Use the version of shiboken2 that matches the selected python version
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+		-DPython3_EXECUTABLE=${PYTHON}
+	)
+
+	if use debug; then
+		# BUILD_SANDBOX currently broken, see
+		# https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=ON
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=OFF
+		)
+	fi
+
+	if use gui; then
+		mycmakeargs+=(
+			-DFREECAD_QT_MAJOR_VERSION=6
+			-DFREECAD_QT_VERSION=6
+			-DQT_DEFAULT_MAJOR_VERSION=6
+			-DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc"
+			-DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc"
+			-DBUILD_QT5=OFF
+			# Drawing module unmaintained and not ported to qt6
+			-DBUILD_DRAWING=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+# We use the FreeCADCmd binary instead of the FreeCAD binary here
+# for two reasons:
+# 1. It works out of the box with USE=-gui as well, not needing a guard
+# 2. We don't need virtualx.eclass and its dependencies
+# The environment variables are needed, so that FreeCAD knows
+# where to save its temporary files, and where to look and write its
+# configuration. Without those, there is a sandbox violation, when it
+# tries to create /var/lib/portage/home/.FreeCAD directory.
+src_test() {
+	cd "${BUILD_DIR}" || die
+
+	local -x FREECAD_USER_HOME="${HOME}"
+	local -x FREECAD_USER_DATA="${T}"
+	local -x FREECAD_USER_TEMP="${T}"
+	./bin/FreeCADCmd --run-test 0 --set-config AppHomePath="${BUILD_DIR}/" || die
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin src/Tools/freecad-thumbnailer
+
+	if use gui; then
+		newbin - freecad <<- _EOF_
+		#!/bin/sh
+		# https://github.com/coin3d/coin/issues/451
+		: "\${QT_QPA_PLATFORM:=xcb}"
+		export QT_QPA_PLATFORM
+		exec /usr/$(get_libdir)/${PN}/bin/FreeCAD "\${@}"
+		_EOF_
+		mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources"
+	fi
+	dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+
+	rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format"
+
+	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+	# compile main package in python site-packages as well
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	einfo "You can load a lot of additional workbenches using the integrated"
+	einfo "AddonManager."
+
+	einfo "There are a lot of additional tools, for which FreeCAD has builtin"
+	einfo "support. Some of them are available in Gentoo. Take a look at"
+	einfo "https://wiki.freecad.org/Installing_additional_components"
+	optfeature_header "External programs used by FreeCAD"
+	optfeature "dependency graphs" media-gfx/graphviz
+	optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg
+	optfeature "importing OpenSCAD files, Mesh booleans" media-gfx/openscad
+	use bim && optfeature "working with COLLADA documents" dev-python/pycollada
+	if use fem || use mesh; then
+		optfeature "mesh generation" sci-libs/gmsh
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 62ffcbe957a1..ed5c07ceb995 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -26,17 +26,18 @@ fi
 # examples are licensed CC-BY-SA (without note of specific version)
 LICENSE="LGPL-2 CC-BY-SA-4.0"
 SLOT="0"
-IUSE="debug designer +gui netgen pcl smesh spacenav test X"
+IUSE="debug designer +gui netgen pcl +smesh spacenav test X"
 # Modules are found in src/Mod/ and their options defined in:
 # cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake
 # To get their dependencies:
 # 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
-IUSE+=" addonmgr bim cam cloud fem idf inspection mesh openscad points reverse robot surface +techdraw"
+IUSE+=" addonmgr assembly +bim cam cloud fem idf inspection +mesh openscad points reverse robot surface +techdraw"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	bim? ( mesh )
 	cam? ( mesh )
+	gui? ( bim )
 	designer? ( gui )
 	fem? ( smesh )
 	inspection? ( points )
@@ -45,6 +46,7 @@ REQUIRED_USE="
 	reverse? ( mesh points )
 	test? ( techdraw )
 "
+# Draft Workbench needs BIM
 
 RESTRICT="!test? ( test )"
 
@@ -64,6 +66,7 @@ RDEPEND="
 		dev-python/pybind11[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	')
+	assembly? ( sci-libs/ondselsolver )
 	cloud? (
 		dev-libs/openssl:=
 		net-misc/curl
@@ -146,12 +149,12 @@ src_configure() {
 
 		# Modules
 		-DBUILD_ADDONMGR=$(usex addonmgr)
-		-DBUILD_ASSEMBLY=OFF					# Requires OndselSolver
+		-DBUILD_ASSEMBLY=$(usex assembly)
 		-DBUILD_BIM=$(usex bim)
 		-DBUILD_CAM=$(usex cam)
 		-DBUILD_CLOUD=$(usex cloud)
 		-DBUILD_DRAFT=ON
-		-DBUILD_DRAWING=OFF						# Unmaintained and not ported to Qt 6
+		# see below for DRAWING
 		-DBUILD_FEM=$(usex fem)
 		-DBUILD_FEM_NETGEN=$(usex fem $(usex netgen))
 		-DBUILD_FLAT_MESH=$(usex mesh)			# a submodule of MeshPart
@@ -189,6 +192,7 @@ src_configure() {
 
 		-DFREECAD_BUILD_DEBIAN=OFF
 
+		-DFREECAD_USE_EXTERNAL_ONDSELSOLVER=$(usex assembly)
 		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
 		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
 		-DFREECAD_USE_FREETYPE=ON
@@ -228,6 +232,8 @@ src_configure() {
 			-DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc"
 			-DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc"
 			-DBUILD_QT5=OFF
+			# Drawing module unmaintained and not ported to qt6
+			-DBUILD_DRAWING=OFF
 		)
 	fi
 
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index 35a605b4e6ef..7cc8bc2a327b 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -14,6 +14,10 @@
 			Build the addon manager module for automatic handling of 3rd 
 			party addons
 		</flag>
+		<flag name="assembly">
+			Build the assembly module to create 3D models composed of several
+			distinguishable parts as a conformed machine.
+		</flag>
 		<flag name="bim">
 			Build the BIM module and workbench
 		</flag>
diff --git a/media-gfx/geeqie/geeqie-2.5.ebuild b/media-gfx/geeqie/geeqie-2.5.ebuild
index 8b572c0532f3..c5d6199a70b2 100644
--- a/media-gfx/geeqie/geeqie-2.5.ebuild
+++ b/media-gfx/geeqie/geeqie-2.5.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
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
 
 RDEPEND="gnome-extra/zenity
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 8dd47f50c0f8..4b9ce4c15704 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-font-viewer-45.0.tar.xz 300420 BLAKE2B 3cc71c056a1254447a9b0c5e838a8950e0414293b9788373b1de90657e364b55784fcef7749abd4e75e29cc6246b081baab66135276744020695ef1e8952a03f SHA512 94289be78831dbc9be8d73348fd423379ebe691b08cf2547acd2648e0e7b1dafcd6c63ffa2c9ec033786b7b65912187c782bb279cc0fb6227d6ee74c1541701e
 DIST gnome-font-viewer-46.0.tar.xz 304092 BLAKE2B 4128c343d5f139ebae6f342b47ef98c39846ce25561411b0b7821be1f9e985aaea4e9a2fd354328b41972df2771db5383cdc68b21cd6a6987aac24596b2b1d1a SHA512 c97e109c16d59b22afa1b8c9736b99cf687284783691e624e331218d39a5ac509e53555416672bf8967ed8611ac25e7817766f8d5c66ca73cd2309b2405c2ebe
+DIST gnome-font-viewer-47.0.tar.xz 201744 BLAKE2B 62370660dc48269eb23b817fbea9a976e5b9ff78ee5e4c80cc96a2a65e32c915beaae2cb9066be21b6cd20ea1bdec5e4482c8397024dae40b27681f8cf0df0ae SHA512 f81624999468d0a3041859623769bef3bc51350328e21bf20e890435dc8308afc620f6580d26f815f33b77994e21cbfc27d934aae33636b970d1fe62f60569d7
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-45.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-45.0.ebuild
deleted file mode 100644
index 37a17d7e48a6..000000000000
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-45.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org meson xdg
-
-DESCRIPTION="Font viewer utility for GNOME"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=gui-libs/gtk-4.5.0:4
-	>=gui-libs/libadwaita-1.4_alpha:1
-	>=media-libs/harfbuzz-0.9.9:=
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	gnome-base/gnome-desktop:4=
-	dev-libs/fribidi
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-window-Fix-function-callback-definition.patch
-)
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-47.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-47.0.ebuild
new file mode 100644
index 000000000000..c27b3be90c14
--- /dev/null
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-47.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org meson xdg
+
+DESCRIPTION="Font viewer utility for GNOME"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=gui-libs/gtk-4.5.0:4
+	>=gui-libs/libadwaita-1.5:1
+	>=media-libs/harfbuzz-0.9.9:=
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	dev-libs/fribidi
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/media-gfx/inkscape/files/inkscape-1.4-poppler-24.12.0.patch b/media-gfx/inkscape/files/inkscape-1.4-poppler-24.12.0.patch
new file mode 100644
index 000000000000..f4e0a8391b78
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.4-poppler-24.12.0.patch
@@ -0,0 +1,53 @@
+From c9046810d899a408bfbd489aad91872b1203ee6d Mon Sep 17 00:00:00 2001
+From: KrIr17 <elendil.krir17@gmail.com>
+Date: Thu, 5 Dec 2024 15:03:47 +0100
+Subject: [PATCH] Fix building with poppler 24.12.0
+
+Fixes https://gitlab.com/inkscape/inkscape/-/issues/5415
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp           | 4 +++-
+ src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index 28000a87b0c..9ea30b90a48 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -2403,6 +2403,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
+     int bits;
+     GBool interpolate;
+     StreamColorSpaceMode csMode;
++    GBool hasAlpha;
+     GBool mask;
+     GBool invert;
+     Object maskObj, smaskObj;
+@@ -2414,7 +2415,8 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
+     // get info from the stream
+     bits = 0;
+     csMode = streamCSNone;
+-    str->getImageParams(&bits, &csMode);
++    hasAlpha = false;
++    str->_POPPLER_GET_IMAGE_PARAMS(&bits, &csMode, &hasAlpha);
+     
+     // get stream dict
+     dict = str->getDict();
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index 8f03aa17779..b7a54828e74 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -39,6 +39,12 @@
+ #define _POPPLER_FUNCTION_TYPE_STITCHING 3
+ #endif
+ 
++#if POPPLER_CHECK_VERSION(24,12,0)
++#define _POPPLER_GET_IMAGE_PARAMS(bits, csMode, hasAlpha) getImageParams(bits, csMode, hasAlpha)
++#else
++#define _POPPLER_GET_IMAGE_PARAMS(bits, csMode, hasAlpha) getImageParams(bits, csMode)
++#endif
++
+ #if POPPLER_CHECK_VERSION(22, 4, 0)
+ #define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
+ #else
+-- 
+GitLab
+
diff --git a/media-gfx/inkscape/inkscape-1.4-r1.ebuild b/media-gfx/inkscape/inkscape-1.4-r1.ebuild
index ad760e5f993d..574250c2b239 100644
--- a/media-gfx/inkscape/inkscape-1.4-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.4-r1.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
@@ -116,6 +116,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.4-gcc15.patch
 	"${FILESDIR}"/${PN}-1.4-poppler-24.10-fix-backport.patch
 	"${FILESDIR}"/${P}-poppler-24.11.0.patch # bug 943499
+	"${FILESDIR}"/${P}-poppler-24.12.0.patch # bug 946597
 )
 
 pkg_pretend() {
diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest
index f1f0008dfc54..99241a3aa8cd 100644
--- a/media-gfx/kgraphviewer/Manifest
+++ b/media-gfx/kgraphviewer/Manifest
@@ -1,2 +1,2 @@
 DIST kgraphviewer-24.08.3.tar.xz 1585380 BLAKE2B fc81b58297565e816ab6b7fae266d0e485b31792ae4796cb3d3ac3b9b51a5494a5209fe8f3176f003d1427cf34587376683c1700c6dc9919fe0caacddf3df4d5 SHA512 2508800733799ce554b929748129610fcc10dae6769de961b58aff4f21fed3260b100004284b472bc4e7b3be2b3bbd860f13215f643a9ff30cef255212f228e6
-DIST kgraphviewer-24.12.0.tar.xz 1590436 BLAKE2B db84f535f9139128e23d9ed69dbd2b1f9e59b57bbca4e8852e0f09832a98d7abdd5e4f076f4b838229e37f96fc7a4638959fd68b271be806633d226d0d0d34cd SHA512 13b37f25a6417e0ff655ff833f8b84060678f0eb91e0333bfab74d81f8759c9a6473cc4332794f531915929101e94bc4aa744288c493c5af15237e69ba2ce805
+DIST kgraphviewer-24.12.1.tar.xz 1590420 BLAKE2B 985b0efcc459de0139ee37cb23f8d6604da1763c00723658274650c8b5121f58a39ee337886d0b7671c85ee3819f1484faa5c62cdca0a5ce7b0c1c45169f1c76 SHA512 652682ba0da3b14a08c4515d0e1d8c32de947eeab248eda3d69bcb0c467e2721acbd0e54bc58313b0793124f943b6b452f7106e5dc23ceac475de14ed5c8918e
diff --git a/media-gfx/kgraphviewer/kgraphviewer-24.12.0.ebuild b/media-gfx/kgraphviewer/kgraphviewer-24.12.0.ebuild
deleted file mode 100644
index 43f762c21ad9..000000000000
--- a/media-gfx/kgraphviewer/kgraphviewer-24.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Graphviz dot graph file viewer"
-HOMEPAGE="https://apps.kde.org/kgraphviewer/"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=media-gfx/graphviz-2.30
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
diff --git a/media-gfx/kgraphviewer/kgraphviewer-24.12.1.ebuild b/media-gfx/kgraphviewer/kgraphviewer-24.12.1.ebuild
new file mode 100644
index 000000000000..c43c182e73d8
--- /dev/null
+++ b/media-gfx/kgraphviewer/kgraphviewer-24.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Graphviz dot graph file viewer"
+HOMEPAGE="https://apps.kde.org/kgraphviewer/"
+
+LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=media-gfx/graphviz-2.30
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
diff --git a/media-gfx/kio-blender-thumbnailer/Manifest b/media-gfx/kio-blender-thumbnailer/Manifest
index b57dd88827b0..4a1930455941 100644
--- a/media-gfx/kio-blender-thumbnailer/Manifest
+++ b/media-gfx/kio-blender-thumbnailer/Manifest
@@ -1,2 +1,2 @@
 DIST kdegraphics-thumbnailers-24.08.3.tar.xz 49092 BLAKE2B c42d05fb1fb3e0660bb247a98b4cf30b055ffcc41ba5a441c63173f4db68b4c357dff9cd60bfdfd1849a31e548cce84b4c0ef83db524f5f2715600e15cac9e0e SHA512 23411e41e12be1c4af78ae621ea61976a99d05bd19dbadff399cdfa51e06182d89337c240d728beda376b2ed16c9fa5ad1641629e80b5da00f3a7dadd48c602d
-DIST kdegraphics-thumbnailers-24.12.0.tar.xz 49144 BLAKE2B bddb56749f58cd19eb4f367af2bc4ef5d78cccf1a98f47650189ca8596ca05d9b789b8b62bcc068c99c1c569386f01f66b1b7cf4ed587644d0f8b19ef50a1ab9 SHA512 fffb185b063a952a225c64ed6be567f916d36b3e7297be0f9549c19da9f12ed813e6c9031396fde43370725fa5addeaa1f551be9413a5387a5f766aa72da9a17
+DIST kdegraphics-thumbnailers-24.12.1.tar.xz 49160 BLAKE2B d41573f1810545164af68af6b51804d49cb2e505fffbc24347e3c364c7629afac18c6bf254f3ee6a85e2aeedcdce9e4dea259d5ceae95236a03cb0575cfa7fee SHA512 b0da43f23b580a1b0a446bd7f96a70bbcf1e2147cb71270de054a0dfcea87a1394732fcc8e35971dd772686ad2c67e487096243ebbb8059431b58b0599d4428b
diff --git a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.12.0.ebuild b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.12.0.ebuild
deleted file mode 100644
index 5ef7e9c0e3d1..000000000000
--- a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="kdegraphics-thumbnailers"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO thumbnail generator for Blender files"
-HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/thumbnailers-24.05.2-r1:6
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_ps=OFF
-		-DDISABLE_MOBIPOCKET=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket6=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON
-	)
-	ecm_src_configure
-}
diff --git a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.12.1.ebuild b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.12.1.ebuild
new file mode 100644
index 000000000000..e852be248b99
--- /dev/null
+++ b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdegraphics-thumbnailers"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO thumbnail generator for Blender files"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/thumbnailers-24.05.2-r1:6
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ps=OFF
+		-DDISABLE_MOBIPOCKET=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket6=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON
+	)
+	ecm_src_configure
+}
diff --git a/media-gfx/kio-mobi-thumbnailer/Manifest b/media-gfx/kio-mobi-thumbnailer/Manifest
index b57dd88827b0..4a1930455941 100644
--- a/media-gfx/kio-mobi-thumbnailer/Manifest
+++ b/media-gfx/kio-mobi-thumbnailer/Manifest
@@ -1,2 +1,2 @@
 DIST kdegraphics-thumbnailers-24.08.3.tar.xz 49092 BLAKE2B c42d05fb1fb3e0660bb247a98b4cf30b055ffcc41ba5a441c63173f4db68b4c357dff9cd60bfdfd1849a31e548cce84b4c0ef83db524f5f2715600e15cac9e0e SHA512 23411e41e12be1c4af78ae621ea61976a99d05bd19dbadff399cdfa51e06182d89337c240d728beda376b2ed16c9fa5ad1641629e80b5da00f3a7dadd48c602d
-DIST kdegraphics-thumbnailers-24.12.0.tar.xz 49144 BLAKE2B bddb56749f58cd19eb4f367af2bc4ef5d78cccf1a98f47650189ca8596ca05d9b789b8b62bcc068c99c1c569386f01f66b1b7cf4ed587644d0f8b19ef50a1ab9 SHA512 fffb185b063a952a225c64ed6be567f916d36b3e7297be0f9549c19da9f12ed813e6c9031396fde43370725fa5addeaa1f551be9413a5387a5f766aa72da9a17
+DIST kdegraphics-thumbnailers-24.12.1.tar.xz 49160 BLAKE2B d41573f1810545164af68af6b51804d49cb2e505fffbc24347e3c364c7629afac18c6bf254f3ee6a85e2aeedcdce9e4dea259d5ceae95236a03cb0575cfa7fee SHA512 b0da43f23b580a1b0a446bd7f96a70bbcf1e2147cb71270de054a0dfcea87a1394732fcc8e35971dd772686ad2c67e487096243ebbb8059431b58b0599d4428b
diff --git a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.12.0.ebuild b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.12.0.ebuild
deleted file mode 100644
index 5333f1b82349..000000000000
--- a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="kdegraphics-thumbnailers"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO thumbnail generator for Mobipocket files"
-HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
-	>=kde-apps/kdegraphics-mobipocket-${PVCUT}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/thumbnailers-24.05.2-r1:6
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_kf_module Archive
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_ps=OFF
-		-DBUILD_blend=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.12.1.ebuild b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.12.1.ebuild
new file mode 100644
index 000000000000..4c05aa88f6cc
--- /dev/null
+++ b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdegraphics-thumbnailers"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO thumbnail generator for Mobipocket files"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-apps/kdegraphics-mobipocket-${PVCUT}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/thumbnailers-24.05.2-r1:6
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_kf_module Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ps=OFF
+		-DBUILD_blend=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/kio-ps-thumbnailer/Manifest b/media-gfx/kio-ps-thumbnailer/Manifest
index b57dd88827b0..4a1930455941 100644
--- a/media-gfx/kio-ps-thumbnailer/Manifest
+++ b/media-gfx/kio-ps-thumbnailer/Manifest
@@ -1,2 +1,2 @@
 DIST kdegraphics-thumbnailers-24.08.3.tar.xz 49092 BLAKE2B c42d05fb1fb3e0660bb247a98b4cf30b055ffcc41ba5a441c63173f4db68b4c357dff9cd60bfdfd1849a31e548cce84b4c0ef83db524f5f2715600e15cac9e0e SHA512 23411e41e12be1c4af78ae621ea61976a99d05bd19dbadff399cdfa51e06182d89337c240d728beda376b2ed16c9fa5ad1641629e80b5da00f3a7dadd48c602d
-DIST kdegraphics-thumbnailers-24.12.0.tar.xz 49144 BLAKE2B bddb56749f58cd19eb4f367af2bc4ef5d78cccf1a98f47650189ca8596ca05d9b789b8b62bcc068c99c1c569386f01f66b1b7cf4ed587644d0f8b19ef50a1ab9 SHA512 fffb185b063a952a225c64ed6be567f916d36b3e7297be0f9549c19da9f12ed813e6c9031396fde43370725fa5addeaa1f551be9413a5387a5f766aa72da9a17
+DIST kdegraphics-thumbnailers-24.12.1.tar.xz 49160 BLAKE2B d41573f1810545164af68af6b51804d49cb2e505fffbc24347e3c364c7629afac18c6bf254f3ee6a85e2aeedcdce9e4dea259d5ceae95236a03cb0575cfa7fee SHA512 b0da43f23b580a1b0a446bd7f96a70bbcf1e2147cb71270de054a0dfcea87a1394732fcc8e35971dd772686ad2c67e487096243ebbb8059431b58b0599d4428b
diff --git a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.12.0.ebuild b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.12.0.ebuild
deleted file mode 100644
index e0ab87727184..000000000000
--- a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="kdegraphics-thumbnailers"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO thumbnail generator for DVI, EPS, PDF and PS files"
-HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
-	>=kde-frameworks/kio-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/thumbnailers-24.05.2-r1:6
-	app-text/dvipsk
-	app-text/ghostscript-gpl
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_kf_module Archive
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_blend=OFF
-		-DDISABLE_MOBIPOCKET=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket6=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.12.1.ebuild b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.12.1.ebuild
new file mode 100644
index 000000000000..d002dcff1a42
--- /dev/null
+++ b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.12.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdegraphics-thumbnailers"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO thumbnail generator for DVI, EPS, PDF and PS files"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/thumbnailers-24.05.2-r1:6
+	app-text/dvipsk
+	app-text/ghostscript-gpl
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_kf_module Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_blend=OFF
+		-DDISABLE_MOBIPOCKET=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket6=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/kio-raw-thumbnailer/Manifest b/media-gfx/kio-raw-thumbnailer/Manifest
index b57dd88827b0..4a1930455941 100644
--- a/media-gfx/kio-raw-thumbnailer/Manifest
+++ b/media-gfx/kio-raw-thumbnailer/Manifest
@@ -1,2 +1,2 @@
 DIST kdegraphics-thumbnailers-24.08.3.tar.xz 49092 BLAKE2B c42d05fb1fb3e0660bb247a98b4cf30b055ffcc41ba5a441c63173f4db68b4c357dff9cd60bfdfd1849a31e548cce84b4c0ef83db524f5f2715600e15cac9e0e SHA512 23411e41e12be1c4af78ae621ea61976a99d05bd19dbadff399cdfa51e06182d89337c240d728beda376b2ed16c9fa5ad1641629e80b5da00f3a7dadd48c602d
-DIST kdegraphics-thumbnailers-24.12.0.tar.xz 49144 BLAKE2B bddb56749f58cd19eb4f367af2bc4ef5d78cccf1a98f47650189ca8596ca05d9b789b8b62bcc068c99c1c569386f01f66b1b7cf4ed587644d0f8b19ef50a1ab9 SHA512 fffb185b063a952a225c64ed6be567f916d36b3e7297be0f9549c19da9f12ed813e6c9031396fde43370725fa5addeaa1f551be9413a5387a5f766aa72da9a17
+DIST kdegraphics-thumbnailers-24.12.1.tar.xz 49160 BLAKE2B d41573f1810545164af68af6b51804d49cb2e505fffbc24347e3c364c7629afac18c6bf254f3ee6a85e2aeedcdce9e4dea259d5ceae95236a03cb0575cfa7fee SHA512 b0da43f23b580a1b0a446bd7f96a70bbcf1e2147cb71270de054a0dfcea87a1394732fcc8e35971dd772686ad2c67e487096243ebbb8059431b58b0599d4428b
diff --git a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.12.0.ebuild b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.12.0.ebuild
deleted file mode 100644
index 369f5f44090d..000000000000
--- a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="kdegraphics-thumbnailers"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO thumbnail generator for RAW files"
-HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
-	>=kde-apps/libkdcraw-${PVCUT}:6
-	>=kde-apps/libkexiv2-${PVCUT}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/thumbnailers-24.05.2-r1:6
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_kf_module Archive
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_blend=OFF
-		-DBUILD_ps=OFF
-		-DDISABLE_MOBIPOCKET=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket6=ON
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.12.1.ebuild b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.12.1.ebuild
new file mode 100644
index 000000000000..339e42401a70
--- /dev/null
+++ b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.12.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kdegraphics-thumbnailers"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO thumbnail generator for RAW files"
+HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-apps/libkdcraw-${PVCUT}:6
+	>=kde-apps/libkexiv2-${PVCUT}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/thumbnailers-24.05.2-r1:6
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_kf_module Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_blend=OFF
+		-DBUILD_ps=OFF
+		-DDISABLE_MOBIPOCKET=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket6=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index c622ac29c778..e7982f11a8e5 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1,2 @@
 DIST kphotoalbum-5.13.0.tar.xz 11477268 BLAKE2B 7127b544822aadb73fc94cc660065bab5ac682d2ce60c92d8e2d436de0fedfc06868c5117645141a9c1a0147abec5440bb91b66d923a3af6c23bd8436a77756a SHA512 0e26d0ee3ac94803427c09375325625122fbda2b1ec0974e9b6d5c5fea33f05c95707bc7e42cfc9ed2403003355c3ba55a8b0ada8c32e85d923c4c499aa28b13
-DIST kphotoalbum-6.0.0.tar.xz 11494344 BLAKE2B dea11859df652248b221cc85bf14062c47fa88de04dbccb3f8575bbd10342c5ba67dc171ec3225b4520ea4eeeef7728263a1d3c9bfbb499b9653f938fde30342 SHA512 5a72b9b0df0ff1a3871d636995ad7085ab9b7a3bb210822281cab8e3a52347ef89da4e5a276653e12d8b4ae137d09f136867e696997e0b3b34bdc5119579c952
+DIST kphotoalbum-6.0.1.tar.xz 11526784 BLAKE2B 2ebeb977ed902a66116305d3774f86820efa0eb1676af1f07847fc9374d1e6f51010e8953eafd9b95efd1f5f866b7ef0d1835c7e1cec8ed777e4b045fa52dc6b SHA512 9d0a9e45f32da3f129688b575021a6fff2dd6c0cdb0f8b8c479c33d5243f251d0598e331b8029a9e95d442a9b63cae8a43f2e1232a82b6c6a86daa5d0d6e7690
diff --git a/media-gfx/kphotoalbum/kphotoalbum-6.0.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-6.0.0.ebuild
deleted file mode 100644
index 85ca068712dc..000000000000
--- a/media-gfx/kphotoalbum/kphotoalbum-6.0.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm kde.org
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0"
-SLOT="0"
-IUSE="+map phonon +raw share +vlc"
-
-REQUIRED_USE="|| ( phonon vlc )"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,sqlite,widgets,xml]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	media-gfx/exiv2:=
-	media-libs/libjpeg-turbo:=
-	map? ( kde-apps/marble:6 )
-	phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] )
-	raw? ( kde-apps/libkdcraw:6 )
-	share? ( >=kde-frameworks/kxmlgui-${KFMIN}:6 )
-	vlc? ( media-video/vlc:= )
-"
-RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:5
-	media-video/ffmpeg
-"
-
-DOCS=( CHANGELOG.{md,old} README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package map Marble)
-		$(cmake_use_find_package phonon Phonon4Qt6)
-		$(cmake_use_find_package raw KDcrawQt6)
-		$(cmake_use_find_package share KF6Purpose)
-		$(cmake_use_find_package vlc LIBVLC)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/kphotoalbum/kphotoalbum-6.0.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-6.0.1.ebuild
new file mode 100644
index 000000000000..5e84b2de7265
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-6.0.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm kde.org
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="+map phonon +raw share +vlc"
+
+REQUIRED_USE="|| ( phonon vlc )"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,sqlite,widgets,xml]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	media-gfx/exiv2:=
+	media-libs/libjpeg-turbo:=
+	map? ( kde-apps/marble:6 )
+	phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] )
+	raw? ( kde-apps/libkdcraw:6 )
+	share? ( >=kde-frameworks/kxmlgui-${KFMIN}:6 )
+	vlc? ( media-video/vlc:= )
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5
+	media-video/ffmpeg
+"
+
+DOCS=( CHANGELOG.{md,old} README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package map Marble)
+		$(cmake_use_find_package phonon Phonon4Qt6)
+		$(cmake_use_find_package raw KDcrawQt6)
+		$(cmake_use_find_package share KF6Purpose)
+		$(cmake_use_find_package vlc LIBVLC)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index 756774fdacc0..b48dbbf9c7f6 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1 +1 @@
-DIST kxstitch-2.2.0.tar.xz 1784360 BLAKE2B 6d06090bb33ccd4db7e8b8a3521b0e1377f253b472cc500862b1b8b0da1abf0d759a85a870b50a1a1f55f385274cdc94761e612a838d93aaffb76191df725150 SHA512 bf09130a35bc605db2bbd6e5e129ac494e8f02b920d4a8d6705b5030a9339306b3b302bd988839e1684da3e5e15e91d655dadf916eb4bf2dc9c1322fd435281d
+DIST kxstitch-3.0.0_pre20250110-073debc5.tar.gz 2407504 BLAKE2B b564193a21094f25356cc2ef90815c90f975d307ef3fed2468ebf5f2a980e1976e5267a8362bb441ca7e67f4f53e3c64e481c285a243d0c0d5a77ee2b7ae0c41 SHA512 e4888f526c113425efad0a7de5705e5e9b28359ef581dc0445be6492754c61ff689233583907d953298532da025769b99ed2e54c3e9b2f4f7c0688c4265e5533
diff --git a/media-gfx/kxstitch/files/kxstitch-2.2.0-drop-xkeylock.patch b/media-gfx/kxstitch/files/kxstitch-2.2.0-drop-xkeylock.patch
deleted file mode 100644
index 805a67ea97c8..000000000000
--- a/media-gfx/kxstitch/files/kxstitch-2.2.0-drop-xkeylock.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From f97d3eaf4c06b4740fcec63c9c0ca64a5bd56281 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Sun, 28 Jun 2020 12:01:49 +0200
-Subject: [PATCH] cmake: require KGuiAddons
-
-It will be used soon.
----
- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 36e3169..7ccf7f0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,6 +32,7 @@ find_package (KF5 REQUIRED COMPONENTS
-     Config
-     ConfigWidgets
-     Completion
-+    GuiAddons
-     I18n
-     KIO
-     TextWidgets
-@@ -145,6 +146,7 @@ target_link_libraries (kxstitch
-     Qt5::X11Extras
-     KF5::Completion
-     KF5::ConfigGui
-+    KF5::GuiAddons
-     KF5::KIOFileWidgets
-     KF5::I18n
-     KF5::TextWidgets
--- 
-GitLab
-
-From 817be56369a25de4dd12f2548f97e4ebcfb73571 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Sun, 28 Jun 2020 12:02:34 +0200
-Subject: [PATCH] Switch from XKeyLock to KModifierKeyInfo
-
-Use KModifierKeyInfo from the KGuiAddons framework to get the status
-of keys. In particular, use it to get the status of the Caps Lock key
-instead of the local XKeyLock implementation.
-
-The KModifierKeyInfo object is kept as class member to avoid recreating
-it at each key press in Alphabet mode.
----
- src/Editor.cpp | 4 +---
- src/Editor.h   | 4 ++++
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/Editor.cpp b/src/Editor.cpp
-index bba0760..163e88e 100644
---- a/src/Editor.cpp
-+++ b/src/Editor.cpp
-@@ -46,7 +46,6 @@
- #include "Scale.h"
- #include "SchemeManager.h"
- #include "TextToolDlg.h"
--#include "XKeyLock.h"
- 
- 
- const Editor::keyPressCallPointer Editor::keyPressCallPointers[] = {
-@@ -858,10 +857,9 @@ void Editor::keyPressText(QKeyEvent *e)
- 
- void Editor::keyPressAlphabet(QKeyEvent *e)
- {
--    XKeyLock keylock(QX11Info::display());
-     Qt::KeyboardModifiers modifiers = e->modifiers();
- 
--    if (keylock.getCapsLock() && Configuration::alphabet_UseCapsLock()) {
-+    if (m_keyInfo.isKeyPressed(Qt::Key_CapsLock) && Configuration::alphabet_UseCapsLock()) {
-         modifiers = static_cast<Qt::KeyboardModifiers>(modifiers ^ Qt::ShiftModifier);
-     }
- 
-diff --git a/src/Editor.h b/src/Editor.h
-index 3189249..8345a38 100644
---- a/src/Editor.h
-+++ b/src/Editor.h
-@@ -16,6 +16,8 @@
- #include <QStack>
- #include <QWidget>
- 
-+#include <KModifierKeyInfo>
-+
- #include "Stitch.h"
- 
- #include "configuration.h"
-@@ -337,6 +339,8 @@ private:
-     QStack<QPoint>  m_cursorStack;
-     QMap<int, int>  m_cursorCommands;
- 
-+    KModifierKeyInfo m_keyInfo;
-+
-     typedef void (Editor::*keyPressCallPointer)(QKeyEvent*);
-     typedef void (Editor::*toolInitCallPointer)();
-     typedef void (Editor::*toolCleanupCallPointer)();
--- 
-GitLab
-
-From 17d6a17830ce190cd21f266dd319e36e4865e30a Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Sun, 28 Jun 2020 12:13:37 +0200
-Subject: [PATCH] Drop XKeyLock & X11 leftovers
-
-XKeyLock is not used anymore, so it can be dropped together with the
-X11 and QX11Extras requirements.
----
- CMakeLists.txt   |   6 --
- src/Editor.cpp   |   1 -
- src/XKeyLock.cpp | 202 -----------------------------------------------
- src/XKeyLock.h   |  70 ----------------
- 4 files changed, 279 deletions(-)
- delete mode 100644 src/XKeyLock.cpp
- delete mode 100644 src/XKeyLock.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7ccf7f0..c225859 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -23,7 +23,6 @@ find_package (Qt5 CONFIG REQUIRED
-     Core
-     PrintSupport
-     Widgets
--    X11Extras
- )
- 
- find_package (KF5DocTools)
-@@ -41,7 +40,6 @@ find_package (KF5 REQUIRED COMPONENTS
- )
- 
- find_package (ImageMagick COMPONENTS MagickCore Magick++ REQUIRED)
--find_package (X11 REQUIRED)
- find_package (Doxygen)
- find_package (SharedMimeInfo)
- 
-@@ -57,7 +55,6 @@ include_directories (BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_D
- # only in older cmake versions, while the latter only in newer ones
- include_directories (${ImageMagick_Magick++_INCLUDE_DIR} ${ImageMagick_MagickCore_INCLUDE_DIR})
- include_directories (${ImageMagick_Magick++_INCLUDE_DIRS} ${ImageMagick_MagickCore_INCLUDE_DIRS})
--include_directories (${X11_INCLUDE_DIR})
- 
- set (kxstitch_SRCS
-     src/BackgroundImage.cpp
-@@ -96,7 +93,6 @@ set (kxstitch_SRCS
-     src/Symbol.cpp
-     src/SymbolLibrary.cpp
-     src/SymbolManager.cpp
--    src/XKeyLock.cpp
- 
-     src/AlphaSelect.cpp
-     src/CalibrateFlossDlg.cpp
-@@ -143,7 +139,6 @@ target_link_libraries (kxstitch
-     Qt5::Core
-     Qt5::PrintSupport
-     Qt5::Widgets
--    Qt5::X11Extras
-     KF5::Completion
-     KF5::ConfigGui
-     KF5::GuiAddons
-@@ -153,7 +148,6 @@ target_link_libraries (kxstitch
-     KF5::WidgetsAddons
-     KF5::XmlGui
-     ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY}
--    ${X11_LIBRARIES}
- )
- 
- set (WITH_PROFILING OFF CACHE BOOL "Build with profiling support")
-diff --git a/src/Editor.cpp b/src/Editor.cpp
-index 163e88e..4d314e4 100644
---- a/src/Editor.cpp
-+++ b/src/Editor.cpp
-@@ -24,7 +24,6 @@
- #include <QScrollArea>
- #include <QStyleOptionRubberBand>
- #include <QToolTip>
--#include <QX11Info>
- 
- #include <KLocalizedString>
- #include <KMessageBox>
--- 
-GitLab
diff --git a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch b/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch
deleted file mode 100644
index bf5d94dae4d6..000000000000
--- a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-hidpi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 44d231b5604480601bedc623ca2f5204bd4a3ac8 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sun, 11 Sep 2022 15:55:44 +0200
-Subject: [PATCH] Enable highdpi scaling and pixmaps
-
----
- src/Main.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/Main.cpp b/src/Main.cpp
-index 0af162a..4088d37 100644
---- a/src/Main.cpp
-+++ b/src/Main.cpp
-@@ -85,6 +85,9 @@
-     */
- int main(int argc, char *argv[])
- {
-+    QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-+    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-+
-     QApplication app(argc, argv);
-     KLocalizedString::setApplicationDomain("kxstitch");
- 
--- 
-GitLab
-
diff --git a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-render-scaled-painter.patch b/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-render-scaled-painter.patch
deleted file mode 100644
index 5b2bc07aa1ed..000000000000
--- a/media-gfx/kxstitch/files/kxstitch-2.2.0-fix-render-scaled-painter.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From c9e6a03c32fe6e6901fad8439bf2235ddb8c288c Mon Sep 17 00:00:00 2001
-From: Steve Allewell <steve.allewell@gmail.com>
-Date: Sun, 3 Jan 2021 13:43:59 +0000
-Subject: [PATCH] Fix for rendering on scaled painter
-
-Fixes for rendering seletion areas on scaled painter in recent versions
-of Qt which were half a square out.
----
- src/Editor.cpp | 74 ++++++++++++++++++++++++++++----------------------
- 1 file changed, 41 insertions(+), 33 deletions(-)
-
-diff --git a/src/Editor.cpp b/src/Editor.cpp
-index 4d314e4..263df1e 100644
---- a/src/Editor.cpp
-+++ b/src/Editor.cpp
-@@ -1388,11 +1388,12 @@ void Editor::renderRubberBandRectangle(QPainter *painter, const QRect&)
-     if (m_rubberBand.isValid()) {
-         painter->setRenderHint(QPainter::Qt4CompatiblePainting, true);
- 
-+        painter->resetTransform();
-         QStyleOptionRubberBand opt;
-         opt.initFrom(this);
-         opt.shape = QRubberBand::Rectangle;
-         opt.opaque = false;
--        opt.rect = m_rubberBand.adjusted(0, 0, 1, 1);
-+        opt.rect = rectToContents(m_rubberBand);
- 
-         style()->drawControl(QStyle::CE_RubberBand, &opt, painter);
-     }
-@@ -1408,14 +1409,15 @@ void Editor::renderRubberBandEllipse(QPainter *painter, const QRect&)
-     if (m_rubberBand.isValid()) {
-         painter->setRenderHint(QPainter::Qt4CompatiblePainting, true);
- 
--        painter->setPen(Qt::NoPen);
--        painter->setBrush(QColor(200,225,255));
--        painter->setOpacity(0.5);
--        painter->drawEllipse(m_rubberBand);
-+        painter->resetTransform();
-+        QStyleOptionRubberBand opt;
-+        opt.initFrom(this);
- 
--        painter->setPen(Qt::darkBlue);
--        painter->setBrush(Qt::NoBrush);
--        painter->drawEllipse(m_rubberBand);
-+        painter->setPen(opt.palette.color(QPalette::WindowText));
-+        painter->setBrush(QBrush(opt.palette.color(QPalette::Highlight), Qt::Dense4Pattern));
-+        painter->setBackground(QBrush(opt.palette.base()));
-+        painter->setBackgroundMode(Qt::TransparentMode);
-+        painter->drawEllipse(rectToContents(m_rubberBand));
-     }
- 
-     painter->restore();
-@@ -1427,7 +1429,10 @@ void Editor::renderFillPolygon(QPainter *painter, const QRect&)
-     QPolygonF polyline;
-     painter->save();
- 
--    painter->setPen(Qt::green);         // use green for the first point
-+    QPen pen(Qt::green);
-+    pen.setWidth(0);
-+
-+    painter->setPen(pen);         // use green for the first point
-     painter->setBrush(Qt::green);
- 
-     QVector<QPoint>::const_iterator i;
-@@ -1435,7 +1440,8 @@ void Editor::renderFillPolygon(QPainter *painter, const QRect&)
-     for (i = m_polygon.constBegin() ; i != m_polygon.constEnd() ; ++i) {
-         QPointF cell = QPointF(*i) + QPointF(0.5, 0.5);
-         painter->drawEllipse(QRectF(-0.5, -0.5, 1, 1).translated(cell));
--        painter->setPen(Qt::blue);      // use blue for subsequent points
-+        pen.setColor(Qt::blue);
-+        painter->setPen(pen);      // use blue for subsequent points
-         painter->setBrush(Qt::blue);
-         polyline.append(cell);
-     }
-@@ -1555,9 +1561,9 @@ void Editor::mouseMoveEvent_Draw(QMouseEvent *e)
- 
-     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
- 
--    m_cellTracking = contentsToCell(p);
--    m_cellEnd = m_cellTracking;
--    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+    m_cellEnd = m_cellTracking = contentsToCell(p);
-+    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
-     update();
- }
- 
-@@ -1703,9 +1709,9 @@ void Editor::mouseMoveEvent_Rectangle(QMouseEvent *e)
- 
-     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
- 
--    m_cellTracking = contentsToCell(p);
--    m_cellEnd = m_cellTracking;
--    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+    m_cellEnd = m_cellTracking = contentsToCell(p);
-+    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
-     update();
- }
- 
-@@ -1757,9 +1763,9 @@ void Editor::mouseMoveEvent_FillRectangle(QMouseEvent *e)
- 
-     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
- 
--    m_cellTracking = contentsToCell(p);
--    m_cellEnd = m_cellTracking;
--    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+    m_cellEnd = m_cellTracking = contentsToCell(p);
-+    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
-     update();
- }
- 
-@@ -1793,9 +1799,9 @@ void Editor::mouseMoveEvent_Ellipse(QMouseEvent *e)
- 
-     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
- 
--    m_cellTracking = contentsToCell(p);
--    m_cellEnd = m_cellTracking;
--    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+    m_cellEnd = m_cellTracking = contentsToCell(p);
-+    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
-     update();
- }
- 
-@@ -1848,9 +1854,9 @@ void Editor::mouseMoveEvent_FillEllipse(QMouseEvent *e)
- 
-     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
- 
--    m_cellTracking = contentsToCell(p);
--    m_cellEnd = m_cellTracking;
--    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+    m_cellEnd = m_cellTracking = contentsToCell(p);
-+    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
-     update();
- }
- 
-@@ -1877,7 +1883,7 @@ void Editor::mouseReleaseEvent_FillEllipse(QMouseEvent*)
-         painter.setRenderHint(QPainter::Antialiasing, !useFractionals);
-         painter.setPen(QPen(Qt::color1));
-         painter.setBrush(Qt::color1);
--        painter.drawEllipse(QRect(m_cellStart, m_cellEnd).normalized());
-+        painter.drawEllipse(QRect(m_cellStart, QSize(1,1)).united(QRect(m_cellEnd, QSize(1, 1))));
-         painter.end();
- 
-         QUndoCommand *cmd = new FillEllipseCommand(m_document);
-@@ -1894,6 +1900,7 @@ void Editor::mousePressEvent_FillPolygon(QMouseEvent *e)
- {
-     m_cellStart = m_cellTracking = m_cellEnd = contentsToCell(e->pos());
-     m_polygon.append(m_cellStart);
-+
-     update();
- }
- 
-@@ -2001,6 +2008,7 @@ void Editor::mouseReleaseEvent_Alphabet(QMouseEvent *e)
- 
-     m_cellStart = m_cellTracking = m_cellEnd = contentsToCell(e->pos());
-     m_cursorStack.push(m_cellEnd);
-+
-     update();
- }
- 
-@@ -2023,9 +2031,9 @@ void Editor::mouseMoveEvent_Select(QMouseEvent *e)
- 
-     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
- 
--    m_cellTracking = contentsToCell(p);
--    m_cellEnd = m_cellTracking;
--    m_rubberBand = QRect(m_cellStart, m_cellEnd).normalized();
-+    m_cellEnd = m_cellTracking = contentsToCell(p);
-+    m_rubberBand = QRect(m_cellStart, QSize(1, 1)).united(QRect(m_cellEnd, QSize(1, 1)));
-+
-     update();
- 
-     QToolTip::showText(QCursor::pos(), QString::fromLatin1("%1,%2 %3 x %4").arg(m_rubberBand.left()).arg(m_rubberBand.top()).arg(m_rubberBand.width()).arg(m_rubberBand.height()));
-@@ -2034,7 +2042,7 @@ void Editor::mouseMoveEvent_Select(QMouseEvent *e)
- 
- void Editor::mouseReleaseEvent_Select(QMouseEvent*)
- {
--    m_selectionArea = QRect(m_cellStart, m_cellEnd).normalized();
-+    m_selectionArea = m_rubberBand;
-     emit(selectionMade(true));
- }
- 
-@@ -2052,9 +2060,9 @@ void Editor::mouseMoveEvent_Backstitch(QMouseEvent *e)
- 
-     dynamic_cast<QScrollArea *>(parentWidget()->parentWidget())->ensureVisible(p.x(), p.y());
- 
--    m_cellTracking = contentsToSnap(p);
--    m_cellEnd = m_cellTracking;
--    m_rubberBand = (snapToCells(m_cellStart).united(snapToCells(m_cellEnd))).normalized();
-+    m_cellEnd = m_cellTracking = contentsToSnap(p);
-+    m_rubberBand = snapToCells(m_cellStart).united(snapToCells(m_cellEnd));
-+
-     update();
- }
- 
--- 
-GitLab
-
diff --git a/media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild b/media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild
deleted file mode 100644
index 927de1cf02ef..000000000000
--- a/media-gfx/kxstitch/kxstitch-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-QTMIN=5.15.5
-inherit ecm kde.org
-
-DESCRIPTION="Program to create cross stitch patterns"
-HOMEPAGE="https://apps.kde.org/kxstitch/ https://userbase.kde.org/KXStitch"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/imagemagick[cxx]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}/${P}-drop-xkeylock.patch"
-	"${FILESDIR}/${P}-fix-render-scaled-painter.patch"
-	"${FILESDIR}/${P}-fix-hidpi.patch"
-)
diff --git a/media-gfx/kxstitch/kxstitch-3.0.0_pre20250110.ebuild b/media-gfx/kxstitch/kxstitch-3.0.0_pre20250110.ebuild
new file mode 100644
index 000000000000..3a9523862ca1
--- /dev/null
+++ b/media-gfx/kxstitch/kxstitch-3.0.0_pre20250110.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=073debc567d0d6e14bbe560b2322dd1571520a96
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm kde.org
+
+DESCRIPTION="Program to create cross stitch patterns"
+HOMEPAGE="https://apps.kde.org/kxstitch/ https://userbase.kde.org/KXStitch"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	media-gfx/imagemagick[cxx]
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 031395d55f0b..9e26725ba860 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1 +1,2 @@
 DIST librecad-2.2.0.2.tar.gz 13645528 BLAKE2B 43a9ada4d6fe8c0cb96dc1003a9e7aa3b4d21619ce9776de1e6d273dd884f2313f9e90abed9cadcd44aaac2131bb62ffb0105bc0d8a097513ac42b9886107021 SHA512 054c6e6cf35a30099e71dd022574864c42d99db8bfa73b544113573723f8e6db2c92f9b7a827b947528f8ad9c743bca73a77a81bc50a9dc66f290480bb38db05
+DIST librecad-2.2.1.tar.gz 14107087 BLAKE2B 44c7960b79348515661fb59ae9c04949e8ff51282e80ce8335ca4679c74880552d229afcd3cc63d36fe75e06ce7d2dfce399c75f3cb1786448b487765b8966db SHA512 6a76d846e812fbed185c87e0e8362f7c429f9bd78bf739f19bcb12f1f88e5be944e48a38427820907826adec8d33204b7ce51ca2fbacecd0f7b39c6cab09687c
diff --git a/media-gfx/librecad/librecad-2.2.1.ebuild b/media-gfx/librecad/librecad-2.2.1.ebuild
new file mode 100644
index 000000000000..c143a61d0fa3
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.2.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PLOCALES="ar ca cs da de el en en_au es es_ar es_bo es_cl es_co es_cr es_do es_ec es_gt es_hn es_mx es_ni es_pa es_pe es_pr es_py es_sv es_us es_uy es_ve et eu fi fr gl he hi hu id_ID it ja ka ko lv mk nl no pa pl pt_br pt_pt ro_ro ru sk sl sq_al sr sv ta th tr uk zh_cn zh_tw"
+
+inherit desktop edo plocale qmake-utils
+
+DESCRIPTION="Generic 2D CAD program"
+HOMEPAGE="https://www.librecad.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/LibreCAD-${PV}"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc tools"
+
+RDEPEND="
+	dev-cpp/muParser
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/freetype:2
+"
+DEPEND="${RDEPEND}
+	dev-qt/qthelp:5
+	dev-qt/qtxml:5
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+
+src_prepare() {
+	default
+
+	# Stock script doesn't work correctly on gentoo (see bug #847394)
+	# and also it compiles all translations regardles of selected locales.
+	# To avoid this just comment out locale building and do it manually
+	sed -i -e '/LRELEASE/s!^!# !' scripts/postprocess-unix.sh || die
+
+	plocale_find_changes 'librecad/ts' 'librecad_' '.ts'
+}
+
+src_configure() {
+	eqmake5 -r
+}
+
+src_compile() {
+	default
+
+	build_locale() {
+		local lrelease="$(qt5_get_bindir)/lrelease"
+		edo "${lrelease}" "librecad/ts/librecad_${1}.ts" \
+			-qm "unix/resources/qm/librecad_${1}.qm"
+		edo "${lrelease}" "plugins/ts/plugins_${1}.ts" \
+			-qm "unix/resources/qm/plugins_${1}.qm"
+	}
+
+	plocale_for_each_locale build_locale
+	# We want the en locale to be always present. Otherwise it could
+	# be impossible to select the English command set which is quite crucial.
+	has en $(plocale_get_locales) || build_locale en
+}
+
+src_install() {
+	dobin unix/librecad
+	use tools && dobin unix/ttf2lff
+	insinto /usr/share/${PN}
+	doins -r unix/resources/*
+	use doc && docinto html && dodoc -r librecad/support/doc/*
+	insinto /usr/share/metainfo
+	doins unix/appdata/org.librecad.librecad.appdata.xml
+	doicon librecad/res/main/${PN}.png
+	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
+}
diff --git a/media-gfx/netgen/Manifest b/media-gfx/netgen/Manifest
index f0b39cad7c0f..e686d01f85c8 100644
--- a/media-gfx/netgen/Manifest
+++ b/media-gfx/netgen/Manifest
@@ -1 +1,2 @@
 DIST netgen-6.2.2302.tar.gz 3398683 BLAKE2B 7cf4626ee8163898864af0346cf2c4fa73dcca3ac2068d67f80b05ee926024b36552b33013c2ef8f74026ab942ae08c0628af0ce0c0dac2d004ba26e18bf4619 SHA512 da6e8e43d73af6b7bfae2e3c771d46e34601ff481c251924673f7330bae032a743fb9d5ff2792855e91ed5addb4d22fd4bf9cd7a9dcfb53f476e22a30f1eedb3
+DIST netgen-6.2.2406.tar.gz 3452436 BLAKE2B 4cb42f20e7627a98e54a9f2e6da5d1b4af174fa7e33c6f72a731b4879c3e4324b20016f1980d2ceb50976fedc2b001a0824e2edd03b03c434c49baa947ded126 SHA512 262e57dca39519c797ea58b32eb886d523926aa48979b31df0c61839f9db09eea76346d3519742b7173a78a80335c16960860772646edd20f365dab1e1a6bed8
diff --git a/media-gfx/netgen/files/netgen-6.2.2406-encoding_h.patch b/media-gfx/netgen/files/netgen-6.2.2406-encoding_h.patch
new file mode 100644
index 000000000000..9d9288412efb
--- /dev/null
+++ b/media-gfx/netgen/files/netgen-6.2.2406-encoding_h.patch
@@ -0,0 +1,121 @@
+From 8504832e746b1581d5b51be7f04f24826440255f Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Thu, 6 Jun 2024 15:59:51 +0200
+Subject: [PATCH 1/2] use std namespace prefix
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+---
+ ng/encoding.hpp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/ng/encoding.hpp b/ng/encoding.hpp
+index 9ea2ffb..498431c 100644
+--- a/ng/encoding.hpp
++++ b/ng/encoding.hpp
+@@ -16,6 +16,8 @@ extern "C" {
+ #include <libswresample/swresample.h>
+ }
+ 
++#include <iostream>
++
+ constexpr int BITRATE = 50000000;
+ 
+ class Mpeg {
+@@ -55,6 +57,8 @@ class Mpeg {
+     int height;
+     bool IsStarted() { return is_started; }
+     int AddFrame() {
++        using std::cerr;
++        using std::endl;
+         int ret;
+         int got_packet = 0;
+         AVPacket pkt = { 0 };
+@@ -113,7 +117,9 @@ class Mpeg {
+         return 0;
+     }
+ 
+-    int Start(string filename) {
++    int Start(std::string filename) {
++        using std::cerr;
++        using std::endl;
+         AVCodec *video_codec;
+         if(is_started) {
+             cerr << "Stream already started" << endl;
+-- 
+2.45.2
+
+
+From 2e52e913603745670cfc5c4a461845a6fb22e118 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Thu, 6 Jun 2024 16:00:40 +0200
+Subject: [PATCH 2/2] av_init_packet is deprecated
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+---
+ ng/encoding.hpp | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/ng/encoding.hpp b/ng/encoding.hpp
+index 498431c..97b9e6a 100644
+--- a/ng/encoding.hpp
++++ b/ng/encoding.hpp
+@@ -61,7 +61,6 @@ class Mpeg {
+         using std::endl;
+         int ret;
+         int got_packet = 0;
+-        AVPacket pkt = { 0 };
+ 
+         glReadPixels (0, 0, width, height, GL_RGB, GL_UNSIGNED_BYTE, rgb_buffer);
+         av_image_fill_arrays(rgb_frame->data, rgb_frame->linesize, rgb_buffer, AV_PIX_FMT_RGB24, width, height, 1);
+@@ -77,8 +76,6 @@ class Mpeg {
+         sws_scale(sws_ctx, flipped_data, flipped_stride, 0, enc->height, frame->data, frame->linesize);
+ 
+ 
+-        av_init_packet(&pkt);
+-
+         got_packet = 0;
+         ret = avcodec_send_frame(enc, frame);
+         if (ret < 0)
+@@ -87,28 +84,35 @@ class Mpeg {
+             return(1);
+         }
+ 
+-        ret = avcodec_receive_packet(enc, &pkt);
++        AVPacket* pkt = av_packet_alloc();
++        ret = avcodec_receive_packet(enc, pkt);
+         if (!ret)
+             got_packet = 1;
+         if (ret == AVERROR(EAGAIN))
++        {
++            av_packet_free(&pkt);
+             return 0;
++        }
+ 
+         if (ret < 0) {
+             cerr << "Error encoding video frame: " << endl;
++            av_packet_free(&pkt);
+             return 1;
+         }
+ 
+         if (got_packet) {
+             /* rescale output packet timestamp values from codec to stream timebase */
+-            av_packet_rescale_ts(&pkt, enc->time_base, st->time_base);
+-            pkt.stream_index = st->index;
++            av_packet_rescale_ts(pkt, enc->time_base, st->time_base);
++            pkt->stream_index = st->index;
+ 
+             /* Write the compressed frame to the media file. */
+-            ret = av_interleaved_write_frame(oc, &pkt);
++            ret = av_interleaved_write_frame(oc, pkt);
+         } else {
+             ret = 0;
+         }
+ 
++        av_packet_free(&pkt);
++
+         if (ret < 0) {
+             cerr << "Error while writing video frame: " << endl;
+             return(1);
+-- 
+2.45.2
+
diff --git a/media-gfx/netgen/files/netgen-6.2.2406-find-libjpeg-turbo-library.patch b/media-gfx/netgen/files/netgen-6.2.2406-find-libjpeg-turbo-library.patch
new file mode 100644
index 000000000000..17bf2ad95f61
--- /dev/null
+++ b/media-gfx/netgen/files/netgen-6.2.2406-find-libjpeg-turbo-library.patch
@@ -0,0 +1,29 @@
+From 49507f7708d72b25fd5e350f7f6b30aa80a50cb4 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Thu, 6 Jun 2024 15:40:10 +0200
+Subject: [PATCH] [PATCH] find libjpeg-turbo library
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+---
+ nglib/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/nglib/CMakeLists.txt b/nglib/CMakeLists.txt
+index b1036ea..78340b6 100644
+--- a/nglib/CMakeLists.txt
++++ b/nglib/CMakeLists.txt
+@@ -13,6 +13,11 @@ if(EMSCRIPTEN)
+   target_link_libraries(nglib PRIVATE ${ZLIB_LIBRARIES} $<BUILD_INTERFACE:$<TARGET_PROPERTY:occ_libs,INTERFACE_LINK_LIBRARIES>>)
+ else(EMSCRIPTEN)
+   target_link_libraries(nglib PUBLIC ngcore)
++  if(TARGET JPEG::JPEG)
++    get_target_property(JPEG_LIBRARIES JPEG::JPEG IMPORTED_LOCATION_RELEASE)
++  else()
++    set(JPEG_LIBRARIES ${JPEG_LIBRARY_RELEASE})
++  endif()
+   target_link_libraries( nglib PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} occ_libs netgen_cgns )
+ endif(EMSCRIPTEN)
+ 
+-- 
+2.45.2
+
diff --git a/media-gfx/netgen/files/netgen-6.2.2406-link-against-ffmpeg.patch b/media-gfx/netgen/files/netgen-6.2.2406-link-against-ffmpeg.patch
new file mode 100644
index 000000000000..c609e06fe94b
--- /dev/null
+++ b/media-gfx/netgen/files/netgen-6.2.2406-link-against-ffmpeg.patch
@@ -0,0 +1,17 @@
+From 69d9c2da29adc9b7a209e78aae950d9834683f58 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 31 Oct 2022 13:07:05 +0100
+Subject: [PATCH] link against ffmpeg
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/ng/CMakeLists.txt
++++ b/ng/CMakeLists.txt
+@@ -28,7 +28,7 @@ if(USE_GUI)
+     if(APPLE)
+         set_target_properties(netgen PROPERTIES OUTPUT_NAME netgen)
+     endif(APPLE)
+-    target_link_libraries( netgen ${Python3_LIBRARIES} ${TCL_LIBRARY} ${TK_LIBRARY})
++    target_link_libraries( netgen ${Python3_LIBRARIES} ${TCL_LIBRARY} ${TK_LIBRARY} ${FFMPEG_LIBRARIES})
+     endif(NOT BUILD_FOR_CONDA)
+ 
+     install(TARGETS nggui ${NG_INSTALL_DIR})
diff --git a/media-gfx/netgen/netgen-6.2.2406.ebuild b/media-gfx/netgen/netgen-6.2.2406.ebuild
new file mode 100644
index 000000000000..35c30b24ff1d
--- /dev/null
+++ b/media-gfx/netgen/netgen-6.2.2406.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake desktop flag-o-matic python-single-r1 xdg
+
+DESCRIPTION="Automatic 3d tetrahedral mesh generator"
+HOMEPAGE="https://ngsolve.org/ https://github.com/NGSolve/netgen"
+SRC_URI="https://github.com/NGSolve/netgen/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ffmpeg gui jpeg mpi +opencascade python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	ffmpeg? ( gui )
+	jpeg? ( gui )
+	python? ( gui )
+"
+
+DEPEND="
+	sys-libs/zlib
+	ffmpeg? ( media-video/ffmpeg:= )
+	gui? (
+		dev-lang/tcl:0/8.6
+		dev-lang/tk:0/8.6
+		media-libs/glu
+		media-libs/libglvnd[X]
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libxcb:=
+	)
+	jpeg? ( media-libs/libjpeg-turbo:0= )
+	mpi? (
+		sci-libs/metis
+		virtual/mpi
+	)
+	opencascade? ( sci-libs/opencascade:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pybind11[${PYTHON_USEDEP}]
+			'
+		)
+		mpi? (
+			$(python_gen_cond_dep 'dev-python/mpi4py[${PYTHON_USEDEP}]' )
+		)
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-apps/lsb-release
+	virtual/pkgconfig
+	gui? ( virtual/imagemagick-tools[png] )
+	test? (
+		<dev-cpp/catch-3:0
+		python? ( $(python_gen_cond_dep '
+			dev-python/pytest-check[${PYTHON_USEDEP}]
+		') )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.2.2204-find-Tk-include-directories.patch"
+	"${FILESDIR}/${PN}-6.2.2406-link-against-ffmpeg.patch"
+	"${FILESDIR}/${PN}-6.2.2204-use-system-catch.patch"
+	"${FILESDIR}/${PN}-6.2.2406-find-libjpeg-turbo-library.patch"
+	"${FILESDIR}/${PN}-6.2.2301-fix-nullptr-deref-in-archive.patch"
+	"${FILESDIR}/${PN}-6.2.2406-encoding_h.patch"
+)
+
+pkg_setup() {
+	if use python; then
+			python-single-r1_pkg_setup
+
+			# NOTE This calls find_package(Python3) without specifying Interpreter in COMPONENTS.
+			# Python3_FIND_UNVERSIONED_NAMES=FIRST is thus never checked and we search the highest python version first.
+			pushd "${T}/${EPYTHON}/bin" > /dev/null || die
+			cp "python-config" "${EPYTHON}-config" || die
+			chmod +x "${EPYTHON}-config" || die
+			popd > /dev/null || die
+	fi
+}
+
+src_prepare() {
+	# # NOTE: need to manually check and update this string on version bumps!
+	# # git describe --tags --match "v[0-9]*" --long --dirty
+	# cat <<- EOF > "${S}/version.txt" || die
+	# 	v${PV}-0-08eec44
+	# EOF
+
+	rm external_dependencies -r || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	filter-lto
+
+	local mycmakeargs=(
+		# currently not working in a sandbox, expects netgen to be installed
+		# see https://github.com/NGSolve/netgen/issues/132
+		-DBUILD_STUB_FILES=OFF
+		-DENABLE_UNIT_TESTS=$(usex test)
+		-DINSTALL_PROFILES=OFF
+		-DNG_INSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
+		-DNG_INSTALL_DIR_INCLUDE="include/${PN}"
+		-DNG_INSTALL_DIR_LIB="$(get_libdir)"
+		-DUSE_CCACHE=OFF
+		# doesn't build with this version
+		-DUSE_CGNS=OFF
+		-DUSE_GUI=$(usex gui)
+		-DUSE_INTERNAL_TCL=OFF
+		-DUSE_JPEG=$(usex jpeg)
+		-DUSE_MPEG=$(usex ffmpeg)
+		# respect users -march= choice
+		-DUSE_NATIVE_ARCH=OFF
+		-DUSE_MPI=$(usex mpi)
+		-DUSE_OCC=$(usex opencascade)
+		-DUSE_PYTHON="$(usex python)"
+		-DUSE_SUPERBUILD=OFF
+		-DNETGEN_VERSION_GIT="v${PV}"
+	)
+	# no need to set this, if we only build the library
+	if use gui; then
+		mycmakeargs+=( -DTK_INCLUDE_PATH="/usr/$(get_libdir)/tk8.6/include" )
+	fi
+	if use python; then
+		mycmakeargs+=(
+			-DPREFER_SYSTEM_PYBIND11=ON
+			# # needed, so the value gets passed to NetgenConfig.cmake instead of ${T}/pythonX.Y
+			# -DPYTHON_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	if use mpi && use python; then
+		mycmakeargs+=( -DUSE_MPI4PY=ON )
+	else
+		mycmakeargs+=( -DUSE_MPI4PY=OFF )
+	fi
+	cmake_src_configure
+}
+
+src_test() {
+	DESTDIR="${T}" cmake_build install
+
+	if use python; then
+		export PYTHONPATH="${T}/$(python_get_sitedir):${T}/usr/$(get_libdir):${BUILD_DIR}/libsrc/core"
+	fi
+
+	CMAKE_SKIP_TESTS=(
+		'^unit_symboltable$'
+		'^pytest$' # SEGFAULT
+	)
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	use python && python_optimize
+
+	local NETGENDIR="/usr/share/${PN}"
+	echo -e "NETGENDIR=${NETGENDIR}" > ./99netgen || die
+	doenvd 99netgen
+
+	if use gui; then
+		mv "${ED}"/usr/bin/{*.tcl,*.ocf} "${ED}${NETGENDIR}" || die
+
+		convert -deconstruct "${S}/windows/${PN}.ico" netgen.png || die
+		newicon -s 32 "${S}"/${PN}-2.png ${PN}.png
+		newicon -s 16 "${S}"/${PN}-3.png ${PN}.png
+		make_desktop_entry ${PN} "Netgen" netgen Graphics
+	fi
+
+	mv "${ED}"/usr/share/${PN}/doc/ng4.pdf "${ED}"/usr/share/doc/${PF} || die
+	dosym -r /usr/share/doc/${PF}/ng4.pdf /usr/share/${PN}/doc/ng4.pdf
+
+	use python || rm -r "${ED}${NETGENDIR}"/py_tutorials || die
+}
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 03d32353cffc..1f822d2c1cc8 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,4 +1,3 @@
-DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128
 DIST openscad-2024.12.30_pre.tar.gz 25338952 BLAKE2B 41baa7f5df30e46611a2ef59dc0aa05ccb85644dddfb979224b5b026f1b9338285eecd50e2078543163621c89fbc81e97b7593b641a223b48ca02029962f8076 SHA512 e63ac792c16852c1bbdf06a3cb044b453e05c20a95158adddbc09239bcf228fd113a6e33f83d5580e615ecab3cdab8436da9e21d2ab3c3f8846f66219218713b
 DIST openscad-20241114.tar.gz 25288312 BLAKE2B 0c1a9b4b15c12f4b3b600e81cdb5eeddb34887c83e2ae67735d7221b6660730dc5e7f97f80b84d187772adfa20d15e20f0cded1b4937e26305434847bbf2af27 SHA512 6c66c09e4b72ec5ef200d077b58fcb7a5a9acd359551a5daebdc3e24cb2cb7ed7d607b04e5563ea6f14d9d929310c3a9194ac889f2530c2c933235271040981a
 DIST openscad-MCAD-bd0a7ba3f042bfbced5ca1894b236cea08904e26.tar.gz 58895 BLAKE2B e154a38e1c36873a34f7c80b8fa484e4bbcb1b0c217e15b977e6cedc9a83fd2e1518791f9a58a4f0e893c2a55947d7eaddb660d8b725eca048c30f0ea41cf14a SHA512 c6208a90f6a58ebdc0477d3e1b6be2f52e4ce976ac619a87818437cb9696b7e83285564fde757d32efaf50033d5217b55f67b6ce342250de838dd09fef334f36
diff --git a/media-gfx/openscad/files/50openscad-gentoo.el b/media-gfx/openscad/files/50openscad-gentoo.el
deleted file mode 100644
index 3cc7c1a7c46f..000000000000
--- a/media-gfx/openscad/files/50openscad-gentoo.el
+++ /dev/null
@@ -1,3 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'scad-mode "scad-mode" "Major mode for editing SCAD code." t)
-(add-to-list 'auto-mode-alist '("\\.scad$" . scad-mode))
diff --git a/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch
deleted file mode 100644
index 6de581078d27..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c138881767262b9f5c64a465a0e1e46ffcfc5899 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sun, 28 Feb 2021 16:51:30 +0100
-Subject: [PATCH] [Gentoo specific] Disable ccache building
-
-On Gentoo, we use a USE flag to determine whether ccache
-should be used for building.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- openscad.pro | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/openscad.pro b/openscad.pro
-index b76ca76..678e08d 100755
---- a/openscad.pro
-+++ b/openscad.pro
-@@ -211,11 +211,6 @@ mdi {
-   DEFINES += ENABLE_MDI
- }
- 
--system("ccache -V >/dev/null 2>/dev/null") {
--  CONFIG += ccache
--  message("Using ccache")
--}
--
- include(common.pri)
- 
- # mingw has to come after other items so OBJECT_DIRS will work properly
--- 
-2.30.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch b/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch
deleted file mode 100644
index 1995bd6e0ac4..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 16847a70cf05484a668d8f79aba4ccec7e16c025 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 6 Mar 2021 22:59:17 +0100
-Subject: [PATCH] fix to find lib3mf-2
-
-The pkgconfig file for lib3mf has been renamed in case
-for lib3mf-2 versions.
-This patch uses the news names.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- features/lib3mf.prf | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/features/lib3mf.prf b/features/lib3mf.prf
-index 2c512da..47be364 100644
---- a/features/lib3mf.prf
-+++ b/features/lib3mf.prf
-@@ -15,8 +15,8 @@ isEmpty(LIB3MF_LIBPATH) {
- }
- 
- isEmpty(LIB3MF_INCLUDEPATH) {
--  LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3MF")
--  LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3MF")
-+  LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3mf")
-+  LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3mf")
-   !isEmpty(LIB3MF_CFLAGS) {
-     ENABLE_LIB3MF=yes
-   }
-@@ -25,8 +25,8 @@ isEmpty(LIB3MF_INCLUDEPATH) {
- }
- 
- isEmpty(LIB3MF_LIBPATH) {
--  LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3MF")
--  LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3MF")
-+  LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3mf")
-+  LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3mf")
-   !isEmpty(LIB3MF_LIBS) {
-     ENABLE_LIB3MF=yes
-   }
--- 
-2.30.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch b/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch
deleted file mode 100644
index 5fea4998683d..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/851189
-From https://github.com/openscad/openscad/commit/abfebc651343909b534ef337aacc7604c99cf0ea Mon Sep 17 00:00:00 2001
-From: Torsten Paul <Torsten.Paul@gmx.de>
-Date: Wed, 2 Feb 2022 02:30:59 +0100
-Subject: [PATCH 09/11] CGAL build fix, v5.4 renames projection traits header
- files and classes.
-
---- a/src/cgalutils-tess.cc
-+++ b/src/cgalutils-tess.cc
-@@ -6,10 +6,12 @@
- #pragma push_macro("NDEBUG")
- #undef NDEBUG
- #include <CGAL/Constrained_Delaunay_triangulation_2.h>
--#if CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(4,11,0)
--  #include <CGAL/Triangulation_2_projection_traits_3.h>
-+#if CGAL_VERSION_NR < 1050401000
-+#include <CGAL/Triangulation_2_projection_traits_3.h>
-+typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
- #else
--  #include <CGAL/Triangulation_2_filtered_projection_traits_3.h>
-+#include <CGAL/Projection_traits_3.h>
-+typedef CGAL::Filtered_projection_traits_3<K> Projection;
- #endif
- #include <CGAL/Triangulation_face_base_with_info_2.h>
- #pragma pop_macro("NDEBUG")
-@@ -19,7 +21,6 @@ struct FaceInfo {
-   bool in_domain() { return nesting_level%2 == 1; }
- };
- 
--typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
- typedef CGAL::Triangulation_face_base_with_info_2<FaceInfo, K> Fbb;
- typedef CGAL::Triangulation_data_structure_2<
- 	CGAL::Triangulation_vertex_base_2<Projection>,
--- 
-2.35.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch b/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch
deleted file mode 100644
index 6c0a9558e3fb..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From https://github.com/openscad/openscad/commit/00a4692989c4e2f191525f73f24ad8727bacdf41 Mon Sep 17 00:00:00 2001
-From: Torsten Paul <Torsten.Paul@gmx.de>
-Date: Sat, 5 Feb 2022 18:38:31 +0100
-Subject: [PATCH 01/11] CVE-2022-0496 Out-of-bounds memory access in DXF
- loader.
-
-Public issue:
-https://github.com/openscad/openscad/issues/4037
-
-Fix in master branch:
-https://github.com/openscad/openscad/pull/4090
---- a/src/dxfdata.cc
-+++ b/src/dxfdata.cc
-@@ -441,6 +441,11 @@ DxfData::DxfData(double fn, double fs, double fa,
- 				auto lv = grid.data(this->points[lines[idx].idx[j]][0], this->points[lines[idx].idx[j]][1]);
- 				for (size_t ki = 0; ki < lv.size(); ++ki) {
- 					int k = lv.at(ki);
-+                    if (k < 0 || k >= lines.size()) {
-+                        LOG(message_group::Warning,Location::NONE,"",
-+                            "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string()));
-+                        continue;
-+                    }
- 					if (k == idx || lines[k].disabled) continue;
- 					goto next_open_path_j;
- 				}
-@@ -466,13 +471,20 @@ DxfData::DxfData(double fn, double fs, double fa,
- 			auto lv = grid.data(ref_point[0], ref_point[1]);
- 			for (size_t ki = 0; ki < lv.size(); ++ki) {
- 				int k = lv.at(ki);
-+                if (k < 0 || k >= lines.size()) {
-+                    LOG(message_group::Warning,Location::NONE,"",
-+                        "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string()));
-+                    continue;
-+                }
- 				if (lines[k].disabled) continue;
--				if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[0]][0], this->points[lines[k].idx[0]][1])) {
-+                auto idk0 = lines[k].idx[0];    // make it easier to read and debug
-+                auto idk1 = lines[k].idx[1];
-+				if (grid.eq(ref_point[0], ref_point[1], this->points[idk0][0], this->points[idk0][1])) {
- 					current_line = k;
- 					current_point = 0;
- 					goto found_next_line_in_open_path;
- 				}
--				if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[1]][0], this->points[lines[k].idx[1]][1])) {
-+				if (grid.eq(ref_point[0], ref_point[1], this->points[idk1][0], this->points[idk1][1])) {
- 					current_line = k;
- 					current_point = 1;
- 					goto found_next_line_in_open_path;
-@@ -501,13 +513,20 @@ DxfData::DxfData(double fn, double fs, double fa,
- 			auto lv = grid.data(ref_point[0], ref_point[1]);
- 			for (size_t ki = 0; ki < lv.size(); ++ki) {
- 				int k = lv.at(ki);
-+                if (k < 0 || k >= lines.size()) {
-+                    LOG(message_group::Warning,Location::NONE,"",
-+                        "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string()));
-+                    continue;
-+                }
- 				if (lines[k].disabled) continue;
--				if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[0]][0], this->points[lines[k].idx[0]][1])) {
-+                auto idk0 = lines[k].idx[0];    // make it easier to read and debug
-+                auto idk1 = lines[k].idx[1];
-+				if (grid.eq(ref_point[0], ref_point[1], this->points[idk0][0], this->points[idk0][1])) {
- 					current_line = k;
- 					current_point = 0;
- 					goto found_next_line_in_closed_path;
- 				}
--					if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[1]][0], this->points[lines[k].idx[1]][1])) {
-+                if (grid.eq(ref_point[0], ref_point[1], this->points[idk1][0], this->points[idk1][1])) {
- 					current_line = k;
- 					current_point = 1;
- 					goto found_next_line_in_closed_path;
--- 
-2.35.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch b/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch
deleted file mode 100644
index 39ef72406f47..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From https://github.com/openscad/openscad/commit/84addf3c1efbd51d8ff424b7da276400bbfa1a4b Mon Sep 17 00:00:00 2001
-From: Torsten Paul <Torsten.Paul@gmx.de>
-Date: Sat, 5 Feb 2022 18:45:29 +0100
-Subject: [PATCH 02/11] CVE-2022-0497 Out-of-bounds memory access in comment
- parser.
-
-Public issue:
-https://github.com/openscad/openscad/issues/4043
-
-Fix in master branch:
-https://github.com/openscad/openscad/pull/4044
---- a/src/comment.cpp
-+++ b/src/comment.cpp
-@@ -92,7 +92,7 @@ static std::string getComment(const std::string &fulltext, int line)
- 	}
- 
- 	int end = start + 1;
--	while (fulltext[end] != '\n') end++;
-+	while (end < fulltext.size() && fulltext[end] != '\n') end++;
- 
- 	std::string comment = fulltext.substr(start, end - start);
- 
--- 
-2.35.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch b/media-gfx/openscad/files/openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch
deleted file mode 100644
index f09954bf01be..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/851189
-From https://github.com/openscad/openscad/commit/9aa0d7e9f2914fe5f547bdde69202161d1c6064d Mon Sep 17 00:00:00 2001
-From: Jordan Brown <github@jordan.maileater.net>
-Date: Sun, 18 Jul 2021 21:01:46 -0700
-Subject: [PATCH 05/11] Fix build failure with "generic_print_polyhedron" on
- CGAL-5.3.
-
---- a/src/cgalutils-polyhedron.cc
-+++ b/src/cgalutils-polyhedron.cc
-@@ -337,19 +337,6 @@ namespace CGALUtils {
-     }
- 	};
- 
--	template <typename Polyhedron>
--	std::string printPolyhedron(const Polyhedron &p) {
--		std::ostringstream sstream;
--		sstream.precision(20);
--
--    Polyhedron_writer writer;
--    generic_print_polyhedron(sstream, p, writer);
--		
--		return sstream.str();
--	}
--
--	template std::string printPolyhedron(const CGAL_Polyhedron &p);
--
- }; // namespace CGALUtils
- 
- #endif /* ENABLE_CGAL */
---- a/src/cgalutils.h
-+++ b/src/cgalutils.h
-@@ -45,7 +45,6 @@ namespace CGALUtils {
- 	bool is_approximately_convex(const PolySet &ps);
- 	Geometry const* applyMinkowski(const Geometry::Geometries &children);
- 
--	template <typename Polyhedron> std::string printPolyhedron(const Polyhedron &p);
- 	template <typename Polyhedron> bool createPolySetFromPolyhedron(const Polyhedron &p, PolySet &ps);
- 	template <typename Polyhedron> bool createPolyhedronFromPolySet(const PolySet &ps, Polyhedron &p);
- 	template <class Polyhedron_A, class Polyhedron_B> 
--- 
-2.35.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch b/media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch
deleted file mode 100644
index 7a70b183d447..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://bugs.gentoo.org/851189
-From https://github.com/openscad/openscad/commit/08bf69b4115c989fc5671254e0d05735d01bcca5 Mon Sep 17 00:00:00 2001
-From: Torsten Paul <Torsten.Paul@gmx.de>
-Date: Wed, 2 Feb 2022 00:50:43 +0100
-Subject: [PATCH 10/11] Fix build issue with overloaded join().
-
---- a/src/openscad.cc
-+++ b/src/openscad.cc
-@@ -65,7 +65,6 @@
- #include <chrono>
- #include <boost/algorithm/string.hpp>
- #include <boost/algorithm/string/split.hpp>
--#include <boost/algorithm/string/join.hpp>
- #include <boost/range/adaptor/transformed.hpp>
- #include <boost/program_options.hpp>
- #include <boost/filesystem.hpp>
-@@ -307,7 +306,7 @@ void set_render_color_scheme(const std::string color_scheme, const bool exit_if_
- 	}
- 
- 	if (exit_if_not_found) {
--		LOG(message_group::None,Location::NONE,"",(boost::join(ColorMap::inst()->colorSchemeNames(), "\n")));
-+		LOG(message_group::None,Location::NONE,"",(boost::algorithm::join(ColorMap::inst()->colorSchemeNames(), "\n")));
- 
- 		exit(1);
- 	} else {
-@@ -885,7 +884,7 @@ struct CommaSeparatedVector
- };
- 
- template <class Seq, typename ToString>
--std::string join(const Seq &seq, const std::string &sep, const ToString &toString)
-+std::string str_join(const Seq &seq, const std::string &sep, const ToString &toString)
- {
-     return boost::algorithm::join(boost::adaptors::transform(seq, toString), sep);
- }
-@@ -947,7 +946,7 @@ int main(int argc, char **argv)
- 		("P,P", po::value<string>(), "customizer parameter set")
- #ifdef ENABLE_EXPERIMENTAL
- 		("enable", po::value<vector<string>>(), ("enable experimental features: " +
--		                                          join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ",
-+		                                          str_join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ",
- 		                                               [](const Feature *feature) {
- 		                                                   return feature->get_name();
- 		                                               }) +
-@@ -964,11 +963,11 @@ int main(int argc, char **argv)
- 		("render", po::value<string>()->implicit_value(""), "for full geometry evaluation when exporting png")
- 		("preview", po::value<string>()->implicit_value(""), "[=throwntogether] -for ThrownTogether preview png")
- 		("animate", po::value<unsigned>(), "export N animated frames")
--		("view", po::value<CommaSeparatedVector>(), ("=view options: " + boost::join(viewOptions.names(), " | ")).c_str())
-+		("view", po::value<CommaSeparatedVector>(), ("=view options: " + boost::algorithm::join(viewOptions.names(), " | ")).c_str())
- 		("projection", po::value<string>(), "=(o)rtho or (p)erspective when exporting png")
- 		("csglimit", po::value<unsigned int>(), "=n -stop rendering at n CSG elements when exporting png")
- 		("colorscheme", po::value<string>(), ("=colorscheme: " +
--		                                      join(ColorMap::inst()->colorSchemeNames(), " | ",
-+		                                      str_join(ColorMap::inst()->colorSchemeNames(), " | ",
- 		                                           [](const std::string& colorScheme) {
- 		                                               return (colorScheme == ColorMap::inst()->defaultColorSchemeName() ? "*" : "") + colorScheme;
- 		                                           }) +
--- 
-2.35.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch b/media-gfx/openscad/files/openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch
deleted file mode 100644
index 20167b910ee4..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From https://github.com/openscad/openscad/commit/45a5e3bdd6c8071cb50b9c3f2b14a62554aafc4a Mon Sep 17 00:00:00 2001
-From: Torsten Paul <Torsten.Paul@gmx.de>
-Date: Thu, 14 Apr 2022 16:07:04 +0200
-Subject: [PATCH 11/11] Remove double quoting of the output file parameter for
- ghostscript.
-
---- a/tests/export_pngtest.py
-+++ b/tests/export_pngtest.py
-@@ -82,7 +82,7 @@ result = subprocess.call(export_cmd, env = fontenv)
- if result != 0:
-     failquit('OpenSCAD failed with return code ' + str(result))
- 
--convert_cmd = gs_cmd + ["-sOutputFile=\"" + pngfile + "\"", exportfile]
-+convert_cmd = gs_cmd + ["-sOutputFile=" + pngfile, exportfile]
- print('Running Converter:', ' '.join(convert_cmd), file=sys.stderr)
- result = subprocess.call(convert_cmd)
- if result != 0:
--- 
-2.35.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch b/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch
deleted file mode 100644
index e3370f32fc38..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff '--color=auto' -ur openscad-2021.01-orig/src/FileModule.cc openscad-2021.01/src/FileModule.cc
---- openscad-2021.01-orig/src/FileModule.cc	2021-01-31 21:17:41.000000000 +0100
-+++ openscad-2021.01/src/FileModule.cc	2024-05-20 07:50:31.746487490 +0200
-@@ -65,7 +65,7 @@
- 	auto ext = fs::path(path).extension().generic_string();
- 
- 	if (boost::iequals(ext, ".otf") || boost::iequals(ext, ".ttf")) {
--		if (fs::is_regular(path)) {
-+		if (fs::is_regular_file(path)) {
- 			FontCache::instance()->register_font_file(path);
- 		} else {
- 			LOG(message_group::Error,Location::NONE,"","Can't read font with path '%1$s'",path);
diff --git a/media-gfx/openscad/openscad-2021.01-r5.ebuild b/media-gfx/openscad/openscad-2021.01-r5.ebuild
deleted file mode 100644
index 3e4af4844ba7..000000000000
--- a/media-gfx/openscad/openscad-2021.01-r5.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common flag-o-matic qmake-utils xdg
-
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="https://openscad.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
-IUSE="emacs"
-# tests are not fully working and need cmake which isn't yet
-# officially supported.
-RESTRICT="test"
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/hidapi
-	dev-libs/libspnav
-	dev-libs/libxml2
-	dev-libs/libzip:=
-	dev-libs/mpfr:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	media-gfx/opencsg:=
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-2.0.0:0=
-	media-libs/harfbuzz:=
-	media-libs/lib3mf
-	sci-mathematics/cgal:=
-	x11-libs/cairo
-	>=x11-libs/qscintilla-2.10.3:=[qt5(+)]
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/itstool
-	app-alternatives/yacc
-	app-alternatives/lex
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-0001-Gentoo-specific-Disable-ccache-building.patch
-	"${FILESDIR}"/${P}-0002-fix-to-find-lib3mf-2.patch
-	"${FILESDIR}"/${P}-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch
-	"${FILESDIR}"/${P}-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch
-	"${FILESDIR}"/${P}-Fix-build-failure-with-generic_print_polyhedron-on-C.patch
-	"${FILESDIR}"/${P}-CGAL-build-fix-v5.4-renames-projection-traits-header.patch
-	"${FILESDIR}"/${P}-Fix-build-issue-with-overloaded-join.patch
-	"${FILESDIR}"/${P}-Remove-double-quoting-of-the-output-file-parameter-f.patch
-	"${FILESDIR}"/${P}-boost-1.85.patch
-)
-
-src_configure() {
-	# -Werror=odr
-	# https://github.com/openscad/openscad/issues/5239
-	filter-lto
-
-	if has ccache ${FEATURES}; then
-		eqmake5 "PREFIX = ${ESYSROOT}/usr" "CONFIG += ccache" "${PN}.pro"
-	else
-		eqmake5 "PREFIX = ${ESYSROOT}/usr" "${PN}.pro"
-	fi
-}
-
-src_compile() {
-	# We have random parallel build issues, bug #856430
-	emake -j1
-
-	if use emacs ; then
-		elisp-compile contrib/*.el
-	fi
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		elisp-install ${PN} contrib/*.el contrib/*.elc
-	fi
-
-	mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
-	ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest
index 4214bfddb56b..d7603e74ed78 100644
--- a/media-gfx/pencil/Manifest
+++ b/media-gfx/pencil/Manifest
@@ -1,2 +1 @@
-DIST catch.hpp 656886 BLAKE2B 590fabc7970b97f333457f409276688f69a66de7fa3c43d767994ed212a3b5bde6e6c113c36a0ff03dd95bbb0cdb38cc12b43a96d16644525ea7425e028485a6 SHA512 ca401efb224e87c4f9d9f3bd58102d3223ef3356149837be2474fa2dbae645272c1ecb17d7db96c2b43b97034aacb63f840f4ebec16f2f3d447c1cc80a500d40
-DIST pencil-0.6.6.tar.gz 3807612 BLAKE2B a4933399ea7f3103eb097756684f42061f5db4c419983458ce8ad317e7eab667ccc5c29c6bf9a3dec5fe57887c4456b64c6e93be889684bd2b567c247aa6dfeb SHA512 1cb976011a1270a2715568fc740db28e6b1a0f050ff7cc2630687edb6e4b57245bf8f58e69721dabab0a2bd65f58780176e2a59691ed0b19f7276c1aad950e7d
+DIST pencil-0.7.0.tar.gz 3890882 BLAKE2B 56becddb43dd6e4cc1308238a2019aad3b7b056f2dfb182ea7c6591d502a7a0fda3f5d7783502c30c0c6f69b4e2a636e9461040c19c9818c74bfab2591c41ae0 SHA512 313ce4014b80ea94ba613d6d6a6e79894a224753ce083273d781e703617edd3f61a6fc33561d376cfdab8d99e2a13a645617943c91f40dec8b172d3ef0857e08
diff --git a/media-gfx/pencil/pencil-0.6.6-r1.ebuild b/media-gfx/pencil/pencil-0.6.6-r1.ebuild
deleted file mode 100644
index 5eb1e6e06838..000000000000
--- a/media-gfx/pencil/pencil-0.6.6-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="2D animation and drawing program based on Qt5"
-HOMEPAGE="https://www.pencil2d.org/"
-SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz
-	https://raw.githubusercontent.com/pencil2d/pencil/617c8868fd27ce540de285ff75c8946fba0c975b/tests/src/catch.hpp"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_prepare() {
-	cp "${DISTDIR}"/catch.hpp tests/src/
-	default
-	sed -e "/^QT/s/xmlpatterns //" \
-		-i core_lib/core_lib.pro tests/tests.pro || die
-}
-
-src_configure() {
-	eqmake5 PREFIX=/usr $(usex test "" "CONFIG+=NO_TESTS")
-}
-
-src_install() {
-	einstalldocs
-	emake INSTALL_ROOT="${D}" install
-	# TODO: Install l10n files
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/pencil/pencil-0.7.0.ebuild b/media-gfx/pencil/pencil-0.7.0.ebuild
new file mode 100644
index 000000000000..754e9dc03f06
--- /dev/null
+++ b/media-gfx/pencil/pencil-0.7.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+DESCRIPTION="2D animation and drawing program based on Qt"
+HOMEPAGE="https://www.pencil2d.org/"
+SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtbase:6[gui,network,widgets,xml]
+	dev-qt/qtmultimedia:6
+	dev-qt/qtsvg:6
+"
+DEPEND="${RDEPEND}"
+# BDEPEND="dev-qt/qttools:6[linguist]"
+
+src_configure() {
+# 	$(qt6_get_bindir)/lrelease gpxsee.pro || die
+	eqmake6 PREFIX=/usr $(usex test "" "CONFIG+=NO_TESTS")
+}
+
+src_install() {
+	einstalldocs
+	emake INSTALL_ROOT="${D}" install
+	# TODO: Install l10n files
+}
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index 4e6d861d95f5..758f57eae4a9 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -1 +1,2 @@
 DIST photoqt-3.2.tar.gz 965895 BLAKE2B ae1e159401b24a1bede344e4d398dbd6c2ae13fd467a4eac9ef15ea2d15933dc1756325a5a4f305a5f447bfd1a9e2d636e0b9367d0201ca356393c033c4f2f0f SHA512 ab7030d0ed6edf79373b1a99b1b8469cd567f04e5c233a87496084424603d8c241f7b473c22d323f4df8480d3f74918a987d2d590ec5026f1b7ca2c92b5c6bba
+DIST photoqt-4.7.tar.gz 3612004 BLAKE2B f4bfd07103e614e3b128668ee7b1dc4767d5c8bd6af4164315e75d537e4054ee2e13fd2f2d8f044669c80bfa31d0651a5a71f07d0947c6b8f1a3088d55123407 SHA512 41274b52ece3a905de7c274183b658b40fdc72ee291b008afdfb2c7e8bb49308ac54c66760397359838bcd9470aa0140bd769137d5a72cd1c11bc4b1a7accb66
diff --git a/media-gfx/photoqt/metadata.xml b/media-gfx/photoqt/metadata.xml
index 1b717b781d4d..3916fd4661ae 100644
--- a/media-gfx/photoqt/metadata.xml
+++ b/media-gfx/photoqt/metadata.xml
@@ -3,9 +3,12 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
+		<flag name="barcode">Support for QR and barcodes detection using <pkg>media-libs/zxing-cpp</pkg></flag>
+		<flag name="chromecast">Enable Chromecast support using <pkg>dev-python/pychromecast</pkg></flag>
 		<flag name="devil">Support additional image formats using <pkg>media-libs/devil</pkg></flag>
 		<flag name="freeimage">Support additional image formats using <pkg>media-libs/freeimage</pkg></flag>
 		<flag name="mpv">Support for video files using <pkg>media-video/mpv</pkg></flag>
+		<flag name="vips">Support for <pkg>media-libs/vips</pkg> image processing library</flag>
 	</use>
 	<upstream>
 		<remote-id type="gitlab">lspies/photoqt</remote-id>
diff --git a/media-gfx/photoqt/photoqt-4.7-r1.ebuild b/media-gfx/photoqt/photoqt-4.7-r1.ebuild
new file mode 100644
index 000000000000..6c6467eee14f
--- /dev/null
+++ b/media-gfx/photoqt/photoqt-4.7-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake optfeature python-single-r1 toolchain-funcs xdg
+
+DESCRIPTION="Simple but powerful Qt-based image viewer"
+HOMEPAGE="https://photoqt.org/"
+SRC_URI="https://photoqt.org/downloads/source/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="barcode chromecast devil exif freeimage geolocation graphicsmagick +imagemagick lcms mpv pdf raw vips"
+REQUIRED_USE="chromecast? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	app-arch/libarchive:=
+	dev-libs/pugixml
+	dev-qt/qtbase:6[dbus,concurrent,gui,network,sql,widgets,xml]
+	dev-qt/qtdeclarative:6[opengl]
+	dev-qt/qtimageformats:6
+	dev-qt/qtmultimedia:6[qml]
+	dev-qt/qtsvg:6
+	barcode? ( media-libs/zxing-cpp:= )
+	chromecast? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pychromecast')
+	)
+	devil? ( media-libs/devil )
+	exif? ( media-gfx/exiv2:=[bmff] )
+	freeimage? ( media-libs/freeimage )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	lcms? ( media-libs/lcms:2 )
+	mpv? ( media-video/mpv:=[libmpv] )
+	pdf? ( app-text/poppler[qt6] )
+	raw? ( media-libs/libraw:= )
+	vips? (
+		dev-libs/glib:2
+		media-libs/vips:=
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	geolocation? (
+		dev-qt/qtlocation:6
+		dev-qt/qtpositioning:6[qml]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	vips? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	>=kde-frameworks/extra-cmake-modules-6.5.0:*
+	virtual/pkgconfig
+	chromecast? ( ${PYTHON_DEPS} )
+"
+
+pkg_setup() {
+	use chromecast && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCHROMECAST=$(usex chromecast)
+		-DDEVIL=$(usex devil)
+		-DEXIV2=$(usex exif)
+		-DEXIV2_ENABLE_BMFF=$(usex exif)
+		-DFREEIMAGE=$(usex freeimage)
+		-DGRAPHICSMAGICK=$(usex graphicsmagick $(usex imagemagick))
+		-DIMAGEMAGICK=$(usex imagemagick $(usex !graphicsmagick))
+		-DLCMS2=$(usex lcms)
+		-DLOCATION=$(usex geolocation)
+		-DVIDEO_MPV=$(usex mpv)
+		-DPOPPLER=$(usex pdf)
+		-DRAW=$(usex raw)
+		-DRESVG=OFF # qt5 only
+		-DLIBVIPS=$(usex vips)
+		-DZXING=$(usex barcode)
+	)
+
+	if use imagemagick && use graphicsmagick; then
+		mycmakeargs+=(
+			-DMAGICK++_INCLUDE_DIR=$($(tc-getPKG_CONFIG) --variable=includedir GraphicsMagick++)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "additional image formats like AVIF, EPS, HEIF/HEIC, PSD, etc." "kde-frameworks/kimageformats:6"
+	xdg_pkg_postinst
+}
diff --git a/media-gfx/phototonic/metadata.xml b/media-gfx/phototonic/metadata.xml
index f05b374d7585..a40d8d29c5ef 100644
--- a/media-gfx/phototonic/metadata.xml
+++ b/media-gfx/phototonic/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
   <!-- maintainer-needed -->
   <upstream>
-    <remote-id type="github">oferkv/phototonic</remote-id>
+    <remote-id type="github">luebking/phototonic</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-gfx/phototonic/phototonic-9999.ebuild b/media-gfx/phototonic/phototonic-9999.ebuild
new file mode 100644
index 000000000000..00dd9c738ecc
--- /dev/null
+++ b/media-gfx/phototonic/phototonic-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Image viewer and organizer"
+HOMEPAGE="https://github.com/luebking/phototonic"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/luebking/phototonic.git"
+else
+	SRC_URI="https://github.com/luebking/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="svg tiff"
+
+RDEPEND="
+	dev-qt/qtbase:6[gui,opengl,widgets]
+	media-gfx/exiv2:=
+	svg? ( dev-qt/qtsvg:6 )
+	tiff? ( dev-qt/qtimageformats:6 )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	eqmake6
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+}
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index 845974968b5c..3e01423bfe47 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1 +1,2 @@
 DIST plantuml-1.2024.8.tar.gz 12543887 BLAKE2B 719602cb8f21e5908fea32778257f0fca830746796e0130bd76f48dc7c829a528d2d0bf8b6f1a0a4ab4fc73c60e8c0b37559108f4afbaf5994597207e6497df2 SHA512 32ee9cb80171ee467b68fe98ca74a3a084bd64410de34d50c79cb40ca972d6092b9c65e0e6ee96647393fa44f152e2ecd3bdafc3f22010afbe73630573996b64
+DIST plantuml-1.2025.0.tar.gz 12278815 BLAKE2B e4ae5b7f76294f060d6a598b6e145bb97af3e37127bcea64cf812d6072e946153de564ddb4d3985f7923fd7584911f08016cee79e26fd48dbf822b385e761b52 SHA512 cdae9effb752af43df913eef21d5c575fa803786d2afeb06732870a36a8a7c71204a8a24817640d9cc99e6361d8cae34a7490bb2a8e5ae034ee31edc1d51afb2
diff --git a/media-gfx/plantuml/plantuml-1.2025.0.ebuild b/media-gfx/plantuml/plantuml-1.2025.0.ebuild
new file mode 100644
index 000000000000..d8529060072a
--- /dev/null
+++ b/media-gfx/plantuml/plantuml-1.2025.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-pkg-simple desktop xdg
+
+DESCRIPTION="Draw UML diagrams using a simple and human readable text description"
+HOMEPAGE="https://plantuml.com"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ant-task"
+
+DEPEND=">=virtual/jdk-1.8:*
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
+RDEPEND=">=virtual/jre-1.8:*
+	media-gfx/graphviz
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
+
+JAVA_AUTOMATIC_MODULE_NAME="net.sourceforge.plantuml"
+JAVA_MAIN_CLASS="net.sourceforge.plantuml.Run"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	if use ant-task; then
+		# src/net/sourceforge/plantuml/ant/readme.md
+		JAVA_GENTOO_CLASSPATH+="ant"
+	else
+		rm src/net/sourceforge/plantuml/ant/{CheckZip,PlantUml}Task.java || die
+	fi
+
+	# java-pkg-simple wants resources in a separate directory
+	cp -r src res || die
+	cp -r skin stdlib svg themes res || die
+	find res -type f \( -name '*.java' -o -iname 'readme.md' \
+		-o -name '*.ttf' -o -name '*.html' -o -name 'data.txt' \
+		-o -name '.editorconfig' \) -exec rm -rf {} + || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	make_desktop_entry plantuml
+}
diff --git a/media-gfx/skanpage/Manifest b/media-gfx/skanpage/Manifest
index cbd0e0ae8a4d..b18ee888236c 100644
--- a/media-gfx/skanpage/Manifest
+++ b/media-gfx/skanpage/Manifest
@@ -1,2 +1,2 @@
 DIST skanpage-24.08.3.tar.xz 1334020 BLAKE2B b2642c74dce6a3d8afdf25eebfcdcdf4059aea3b29ededb069993c0f7f089dc40716cc2567296fa9c815fecb95ab5689a571ab89b8bedd5c0aae5d06431fed31 SHA512 0bdd8d8f94aaabee32d2cd4975e8320d69c25afa1135de3fa672f154f447122ce8747d1a4960b0629bcc6118e078617641a7d0cbbb0c1344fa19733bff18f8ee
-DIST skanpage-24.12.0.tar.xz 1337600 BLAKE2B 4333b2b4c20df70befd2a57a558eee244261ff3332d93750ebe5ae7eda5fd798b1f446573512cf7a4244ba6cefef87b9b2f5c2ab6ca077152276360fc4754c47 SHA512 1e61b08fea3878ab940fd10a176cc251f55c19664ee03cb1bbb93e9bc9b5ae49534d0ee5a4331702b369917186a651782c11f04c2188975b00baccb2b084cce5
+DIST skanpage-24.12.1.tar.xz 1337776 BLAKE2B 3806a71a9051c7bb7cb1ecfe4d35a17d027d77b9db14b39b3d5c2803a1ece6b670ede907f0286f4a198b906762ce287e7e376be128c07890556c1021ef2050c5 SHA512 b6f0eded7692b02fb134438e50fb8d07014a7eaf81fb8ec6bc96d800a497ce8ab7458e699804ed02df77c1f1ee20a62d9da92db48d96c9bc64b72991a3360c08
diff --git a/media-gfx/skanpage/skanpage-24.12.0.ebuild b/media-gfx/skanpage/skanpage-24.12.0.ebuild
deleted file mode 100644
index 73a1e52e8c7c..000000000000
--- a/media-gfx/skanpage/skanpage-24.12.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="utilities"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Multi-page scanning application supporting image and pdf files"
-HOMEPAGE="https://apps.kde.org/skanpage/"
-
-LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64"
-IUSE="ocr"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent,gui,network,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtwebengine-${QTMIN}:6[pdfium]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/purpose-${KFMIN}:6
-	media-libs/kquickimageeditor:6
-	>=media-libs/ksanecore-${PVCUT}:6
-	ocr? (
-		>=app-text/tesseract-5:=
-		media-libs/leptonica:=
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package ocr Tesseract)
-		$(cmake_use_find_package ocr Leptonica)
-	)
-	ecm_src_configure
-}
diff --git a/media-gfx/skanpage/skanpage-24.12.1.ebuild b/media-gfx/skanpage/skanpage-24.12.1.ebuild
new file mode 100644
index 000000000000..77a6baa9ab6a
--- /dev/null
+++ b/media-gfx/skanpage/skanpage-24.12.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="utilities"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Multi-page scanning application supporting image and pdf files"
+HOMEPAGE="https://apps.kde.org/skanpage/"
+
+LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="ocr"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,gui,network,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6[pdfium]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/purpose-${KFMIN}:6
+	media-libs/kquickimageeditor:6
+	>=media-libs/ksanecore-${PVCUT}:6
+	ocr? (
+		>=app-text/tesseract-5:=
+		media-libs/leptonica:=
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package ocr Tesseract)
+		$(cmake_use_find_package ocr Leptonica)
+	)
+	ecm_src_configure
+}
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild
index 1be1e1d0fdb1..6b314f03d097 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.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 @@ S="${WORKDIR}"/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 
 RDEPEND="
 	app-text/libpaper:=
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index a06c09c103b1..64654863a969 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,2 +1,3 @@
 DIST wings-2.2.6.1.tar.bz2 3266532 BLAKE2B a3ec86925632df7d231d620a47841781f8b2e66a50d13857c57fa6389890e7a03fed8bf5e0d09b03de00d6360ee0e4129a4178aec34270367879890f9430c208 SHA512 dba4b189c80180533b7a6c10be5c236a4a9fdacaa7dc491a0d1892149f7a75e636778acc11e38ef82a06718ae705e640da2e1618ec655828d2056e6b3864aba4
 DIST wings-2.3.tar.bz2 3561319 BLAKE2B 0f3dce900dcae74516b57555f188aa578a5ea138d0e55e2b15ba946581652e470f5f596bd7e7661394674d437c8cbbe395bbf2e769af2a77d6940fddab1c86df SHA512 b5b054d974af2443cbe7d46a32cb8dfb7641054fa68aea9245e3d3100b21d223f443171572c3f371f25d937dca8cdb11870c61ba21e28632afef7886b4b2487b
+DIST wings-2.4.tar.bz2 3420165 BLAKE2B d60220413f679af70d8300a6b1925ec15eee206756229ef6cd72eb3063ab04286bc2c64d140ace474c2de654b287e5ea5da51691b4b16097495d3ad563677072 SHA512 1873e57002eb83b404427ab36abf91c8182e4f0141b4792f86613fe5d33e8fb74978a3ed9eddfa78c1b21e86d256e542127956068e9bd596f7582d929518d8a4
diff --git a/media-gfx/wings/wings-2.4.ebuild b/media-gfx/wings/wings-2.4.ebuild
new file mode 100644
index 000000000000..192b98a8625e
--- /dev/null
+++ b/media-gfx/wings/wings-2.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="https://www.wings3d.com/"
+SRC_URI="https://downloads.sourceforge.net/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>dev-lang/erlang-21[wxwidgets]
+	dev-libs/cl
+	media-libs/glu
+	media-libs/libsdl[opengl]
+	virtual/opengl
+	dev-cpp/eigen
+	sci-libs/libigl
+"
+DEPEND="
+	${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.3-nogit.patch )
+
+src_prepare() {
+	sed -i -e 's# -Werror##g;s# -O3##g' $(find -name Makefile) || die
+	sed -i \
+		-e "s|IGL_INCLUDE = .*$|IGL_INCLUDE=-I/usr/include/eigen3|" \
+		c_src/Makefile \
+		|| die
+	default
+}
+
+src_compile() {
+	export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+	tc-export CC
+	# Work around parallel make issues
+	# Set ER_LIBS to the top source directory
+	emake vsn.mk
+	for subdir in intl_tools e3d src plugins_src icons; do
+		emake -C ${subdir} opt ERL_LIBS="${S}"
+	done
+	default
+}
+
+src_install() {
+	WINGS_PATH=${ERL_PATH}/${P}
+	dodir ${WINGS_PATH}
+
+	find -name 'Makefile*' -exec rm -f '{}' \;
+
+	insinto ${WINGS_PATH}
+	doins -r e3d ebin icons plugins priv psd shaders src textures tools
+
+	newbin "${FILESDIR}"/wings.sh-r1 wings
+	dodoc AUTHORS
+}
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild
index 2fb51b27538d..13cc65fc73aa 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r17.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
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/-/.}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11
diff --git a/media-libs/embree/embree-4.3.3.ebuild b/media-libs/embree/embree-4.3.3.ebuild
index eb4bc120565a..f7a64831d453 100644
--- a/media-libs/embree/embree-4.3.3.ebuild
+++ b/media-libs/embree/embree-4.3.3.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="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="$(ver_cut 1)"
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* amd64 ~arm64"
 X86_CPU_FLAGS=( sse2 sse4_2 avx avx2 avx512dq )
 CPU_FLAGS=( cpu_flags_arm_neon "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" )
 IUSE="compact-polys ispc +raymask ssp +tbb test ${CPU_FLAGS[*]}"
diff --git a/media-libs/faun/Manifest b/media-libs/faun/Manifest
index 003becd5010b..bf4da9d5f578 100644
--- a/media-libs/faun/Manifest
+++ b/media-libs/faun/Manifest
@@ -1 +1 @@
-DIST faun-0.1.4.tar.gz 110154 BLAKE2B a41e33282442a1b2999c7cc46fc6978607b6d6f2e6d8d7e92dd43386f2ff2ac61aa3c86e0219ffded8a35224c366a85cd7ab1c36a128eb746457be9fdea76c8e SHA512 4449c478109dd78933e346e87228639d0c5fcc33466a60a9649756cb69b087b82a7e0aa21591b4b2e8046858ac6ac9fc7cc43d84eb2e64624b49af8445dcda21
+DIST faun-0.2.1.tar.gz 118623 BLAKE2B 812f99462d512efde104c664ae1a12b0ada5b87e7b975c2f89274c41d9d24409eccb2ea28d37e02225dab0d6290bf2fa5302a55b5ec824ae7943aaa6149c80cb SHA512 d145d99519c6836147f27bada0b87b70ad864b9bb3af3860183fc7a1c0b51c10a6f904ca365f7016510088d4f83e42dbd2d0e9dd260ad73209e29985af3a9fd4
diff --git a/media-libs/faun/faun-0.1.4.ebuild b/media-libs/faun/faun-0.1.4.ebuild
deleted file mode 100644
index a5b0eb2e7089..000000000000
--- a/media-libs/faun/faun-0.1.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo toolchain-funcs
-
-DESCRIPTION="A high-level C audio library"
-HOMEPAGE="https://wickedsmoke.github.io/faun/"
-SRC_URI="https://github.com/WickedSmoke/faun/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# based on COPYING file
-LICENSE="MIT flac? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flac"
-
-DEPEND="
-	media-libs/libpulse
-	media-libs/libvorbis
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.1.2_makefile.patch"
-)
-
-src_configure() {
-	tc-export CC
-	# custom configure
-	edo ./configure $(usex !flac --no_flac "")
-}
-
-src_install() {
-	emake DESTDIR="${D}/usr" install
-	dodoc README.md
-}
diff --git a/media-libs/faun/faun-0.2.1.ebuild b/media-libs/faun/faun-0.2.1.ebuild
new file mode 100644
index 000000000000..3750f5c686a8
--- /dev/null
+++ b/media-libs/faun/faun-0.2.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+DESCRIPTION="A high-level C audio library"
+HOMEPAGE="https://wickedsmoke.codeberg.page/faun_doc/"
+SRC_URI="https://codeberg.org/wickedsmoke/faun/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac"
+
+DEPEND="
+	flac? ( media-libs/flac )
+	media-libs/libpulse
+	media-libs/libvorbis
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.1_makefile.patch"
+)
+
+src_configure() {
+	tc-export CC
+	# custom configure
+	edo ./configure $(usex !flac --no_flac "")
+}
+
+src_install() {
+	emake DESTDIR="${D}/usr" install
+	dodoc README.md
+}
diff --git a/media-libs/faun/files/faun-0.1.2_makefile.patch b/media-libs/faun/files/faun-0.1.2_makefile.patch
deleted file mode 100644
index 5bc22077aad2..000000000000
--- a/media-libs/faun/files/faun-0.1.2_makefile.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 7d87d5e2fc52c1d429fe99b505bf2db643c82da2 Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Fri, 28 Apr 2023 14:58:02 +0300
-Subject: [PATCH] Fix buildsystem
-
-* Respect CC, CFLAGS, LDFLAGS
-* Don't strip binaries on install
---- a/Makefile
-+++ b/Makefile
-@@ -6,10 +6,13 @@ ifeq ($(STATIC),1)
-     STATIC_LIB=true
- endif
-
--CFLAGS=-O3 -DNDEBUG
-+CC ?= cc
-+PKG_CONFIG ?= pkg-config
-+
-+CFLAGS ?= -O3 -DNDEBUG
- #CFLAGS=-g -DDEBUG
-
--OPT=-DUSE_SFX_GEN
-+OPT=-DUSE_SFX_GEN `$(PKG_CONFIG) --cflags libpulse-simple libpulse vorbisfile`
- ifeq ($(FLAC),1)
- 	OPT+=-DUSE_FLAC
- endif
-@@ -25,7 +28,7 @@ else
- LIB_DIR=$(DESTDIR)/lib
- endif
-
--DEP_LIB = -lpulse-simple -lpulse -lvorbisfile -lpthread -lm
-+DEP_LIB = `$(PKG_CONFIG) --libs libpulse-simple libpulse vorbisfile` -lpthread -lm
-
- ifdef STATIC_LIB
- FAUN_LIB=libfaun.a
-@@ -49,10 +52,10 @@ obj:
- 	mkdir obj
-
- obj/tmsg.o: support/tmsg.c obj
--	cc -c -pipe -Wall -W $< $(CFLAGS) -Isupport $(OPT) -fPIC -o $@
-+	$(CC) -c -pipe -Wall -W $< $(CFLAGS) -Isupport $(OPT) -fPIC -o $@
-
- obj/faun.o: faun.c support/wav_write.c support/wav_read.c support/flac.c support/sfx_gen.c support/well512.c support/os_thread.h support/tmsg.h support/flac.h support/sfx_gen.h support/well512.h obj
--	cc -c -pipe -Wall -W $< $(CFLAGS) -Isupport $(OPT) -fPIC -o $@
-+	$(CC) -c -pipe -Wall -W $< $(CFLAGS) -Isupport $(OPT) -fPIC -o $@
-
- $(FAUN_LIB): obj/tmsg.o obj/faun.o
- ifdef STATIC_LIB
-@@ -60,16 +63,16 @@ ifdef STATIC_LIB
- 	ranlib $@
- 	#strip -d $@
- else
--	cc -o $@ $^ -shared -Wl,-soname,$(FAUN_SO) $(DEP_LIB)
-+	$(CC) -o $@ $^ -shared -Wl,-soname,$(FAUN_SO) $(LDFLAGS) $(DEP_LIB)
- 	ln -sf $@ $(FAUN_SO)
- 	ln -sf $@ libfaun.so
- endif
-
- faun_test: faun_test.c $(FAUN_LIB)
--	cc -Wall -W $< $(CFLAGS) -I. -L. -lfaun $(DEP_STATIC) -o $@
-+	$(CC) -Wall -W $< $(CFLAGS) -I. -L. -lfaun $(DEP_STATIC) $(LDFLAGS) -o $@
-
- basic: example/basic.c $(FAUN_LIB)
--	cc -Wall -W $< $(CFLAGS) -I. -L. -lfaun $(DEP_STATIC) -o $@
-+	$(CC) -Wall -W $< $(CFLAGS) -I. -L. -lfaun $(DEP_STATIC) $(LDFLAGS) -o $@
-
- install:
- 	mkdir -p $(DESTDIR)/include $(LIB_DIR)
-@@ -77,7 +80,7 @@ install:
- ifdef STATIC_LIB
- 	install -m 644 $(FAUN_LIB) $(LIB_DIR)
- else
--	install -m 755 -s $(FAUN_LIB) $(LIB_DIR)
-+	install -m 755 $(FAUN_LIB) $(LIB_DIR)
- 	ln -s $(FAUN_LIB) $(LIB_DIR)/$(FAUN_SO)
- 	ln -s $(FAUN_LIB) $(LIB_DIR)/libfaun.so
- endif
---
-2.39.2
-
diff --git a/media-libs/faun/files/faun-0.2.1_makefile.patch b/media-libs/faun/files/faun-0.2.1_makefile.patch
new file mode 100644
index 000000000000..7de9b4d67449
--- /dev/null
+++ b/media-libs/faun/files/faun-0.2.1_makefile.patch
@@ -0,0 +1,40 @@
+From c8c08f50ba9900790ce4127eee4adcbda208ad7b Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Thu, 16 Jan 2025 18:19:25 +0300
+Subject: [PATCH] Fix buildsystem
+
+* Respect CFLAGS, library dependencies
+--- a/Makefile
++++ b/Makefile
+@@ -6,10 +6,11 @@ ifeq ($(STATIC),1)
+     STATIC_LIB=true
+ endif
+ 
+-CFLAGS+=-O3 -DNDEBUG
++CFLAGS?=-O3 -DNDEBUG
+ #CFLAGS+=-g -DDEBUG
++PKG_CONFIG?=pkg-config
+ 
+-OPT=-DUSE_LOAD_MEM -DUSE_SFX_GEN
++OPT=-DUSE_LOAD_MEM -DUSE_SFX_GEN `$(PKG_CONFIG) --cflags libpulse-simple libpulse vorbisfile`
+ 
+ DESTDIR ?= /usr/local
+ 
+@@ -22,11 +23,11 @@ else
+ LIB_DIR=$(DESTDIR)/lib
+ endif
+ 
+-DEP_LIB = -lpulse -lvorbisfile -lpthread -lm
++DEP_LIB = `$(PKG_CONFIG) --libs libpulse-simple libpulse vorbisfile` -lpthread -lm
+ 
+ ifeq ($(FLAC),1)
+-OPT+=-DUSE_FLAC=1
+-DEP_LIB+=-lFLAC
++OPT+=-DUSE_FLAC=1 `$(PKG_CONFIG) --cflags flac`
++DEP_LIB+=`$(PKG_CONFIG) --libs flac`
+ else ifeq ($(FLAC),2)
+ OPT+=-DUSE_FLAC=2
+ endif
+-- 
+2.45.2
+
diff --git a/media-libs/faun/metadata.xml b/media-libs/faun/metadata.xml
index a4800f6c9069..e17def60d1ea 100644
--- a/media-libs/faun/metadata.xml
+++ b/media-libs/faun/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">WickedSmoke/faun</remote-id>
+		<remote-id type="codeberg">wickedsmoke/faun</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/fcft/Manifest b/media-libs/fcft/Manifest
index 93924ec7a251..c7f374987af1 100644
--- a/media-libs/fcft/Manifest
+++ b/media-libs/fcft/Manifest
@@ -1,3 +1,4 @@
+DIST fcft-3.1.10.tar.gz 732482 BLAKE2B 0198ada9b749aa8c9a84ad6be7713f7c77b13fd8fb21042fcca30ca3aae1a0e8dadb18fed1990c6a6590dda46ba74625517ebf8b7d55cdfb130e98f454a06260 SHA512 02be4080ef90b46ef6fafba259922539a06c6372e3eeb8edfb0e30d3eaa54a69bf303230bbd937472b91eed502e39a50378a20ef428dfd0ca77b6f75938c8e50
 DIST fcft-3.1.2.tar.gz 741659 BLAKE2B d4c3b9ef444771f255b7b19e9645d53558caed2022a59759418fe0b9961f74833da2b760c0c961ce5fbbf91f3e0291dd87590fe00ab300ee194a497accba392e SHA512 b3874819ef90a4f1d1975cae72b925c928bc9758629e63b2083dab807166133bc68308ba4f9481c34c9e0b5262a1d2558e47cccf6ce9d34516583e48d03a5bf9
 DIST fcft-3.1.3.tar.gz 741726 BLAKE2B 00792d3bb3848e271b28be7d9afe81e917f547558663b7cc3ce08a3b36cc2d56f3e69b1e06bf16cf73f1a08c8b20696906d6eaa07b59e113846820dd57e22419 SHA512 7275f4807b72b5125242dfba9499647d6c1e80ac9a7df8adde4e8ad082744472d3efa6b8c608c07a2107a7df3005ccad69d574cfb06f35991ccf676df6f1b407
 DIST fcft-3.1.5.tar.gz 742014 BLAKE2B 39266ab2a7ea422671414d97c21a90b0eeabe9ed7480c54e44e33ff6d39ab903ac3df154b6733bb4de1e69401480d313f067e6f73f13748bf7fd54aa617cd5e6 SHA512 e223d7e825d8f81f05d2f7ec1b945b28311386dc6ccf55eefaeff2231d64483fdf18a2468f942586ecc0bb4ef75ed9ef0a8a490162b0f8bf7a8619e46742c564
diff --git a/media-libs/fcft/fcft-3.1.10-r1.ebuild b/media-libs/fcft/fcft-3.1.10-r1.ebuild
new file mode 100644
index 000000000000..6d4f09e5ac52
--- /dev/null
+++ b/media-libs/fcft/fcft-3.1.10-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit meson python-any-r1
+
+DESCRIPTION="Simple library for font loading and glyph rasterization"
+HOMEPAGE="https://codeberg.org/dnkl/fcft"
+SRC_URI="https://codeberg.org/dnkl/fcft/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+# MIT for fcft
+# ZLIB for nanosvg
+LICENSE="MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="examples +harfbuzz +libutf8proc test"
+REQUIRED_USE="
+	libutf8proc? ( harfbuzz )
+	examples? ( libutf8proc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/pixman
+	examples? (
+		dev-libs/libutf8proc:=
+		dev-libs/wayland
+	)
+	harfbuzz? (
+		media-libs/harfbuzz:=[truetype]
+	)
+	libutf8proc? (
+		dev-libs/libutf8proc:=[-cjk]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	app-i18n/unicode-data
+	dev-libs/tllist
+	examples? (
+		dev-libs/wayland-protocols
+	)
+	test? (
+		dev-libs/check
+		harfbuzz? ( media-fonts/noto-emoji )
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-text/scdoc
+	virtual/pkgconfig
+	examples? (
+		dev-util/wayland-scanner
+	)
+"
+
+src_prepare() {
+	default
+
+	rm -r unicode || die "Failed removing vendored unicode-data"
+
+	sed -i "s;unicode/UnicodeData.txt;${EPREFIX}/usr/share/unicode-data/UnicodeData.txt;" \
+		meson.build || die "Failed changing UnicodeData.txt to system's copy"
+	sed -i "s;unicode/emoji-data.txt;${EPREFIX}/usr/share/unicode-data/emoji/emoji-data.txt;" \
+		meson.build || die "Failed changing emoji-data.txt to system's copy"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature harfbuzz grapheme-shaping)
+		$(meson_feature libutf8proc run-shaping)
+		$(meson_use examples)
+		$(use test && meson_use harfbuzz test-text-shaping)
+		# bundled, tiny, I believe this means we should always include it
+		-Dsvg-backend=nanosvg
+		-Ddocs=enabled
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	local DOCS=( CHANGELOG.md README.md )
+	meson_src_install
+
+	rm -r "${ED}"/usr/share/doc/${PN} || die
+
+	use examples && newbin "${BUILD_DIR}/example/example" fcft-example
+}
diff --git a/media-libs/fcft/fcft-3.1.9.ebuild b/media-libs/fcft/fcft-3.1.9.ebuild
index 7cbcbbb0160c..9239434b14c3 100644
--- a/media-libs/fcft/fcft-3.1.9.ebuild
+++ b/media-libs/fcft/fcft-3.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}"
 # ZLIB for nanosvg
 LICENSE="MIT ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 arm64 ppc64 ~riscv"
 IUSE="examples +harfbuzz +libutf8proc test"
 REQUIRED_USE="
 	libutf8proc? ( harfbuzz )
diff --git a/media-libs/freeglut/freeglut-3.6.0.ebuild b/media-libs/freeglut/freeglut-3.6.0.ebuild
deleted file mode 100644
index d73fd4e40595..000000000000
--- a/media-libs/freeglut/freeglut-3.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library"
-HOMEPAGE="https://freeglut.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-# enabling GLES support seems to cause build failures
-RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]"
-# gles? ( media-libs/mesa[egl(+),gles1,gles2,${MULTILIB_USEDEP}] )
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-#		"-DOpenGL_GL_PREFERENCE=GLVND" # bug 721006
-		"-DFREEGLUT_GLES=OFF"
-		"-DFREEGLUT_BUILD_DEMOS=OFF"
-		"-DFREEGLUT_BUILD_STATIC_LIBS=OFF"
-	)
-#	$(cmake-utils_use gles FREEGLUT_GLES)
-	cmake-multilib_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-	cp "${ED}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc || die
-}
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5-r3.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5-r3.ebuild
index 85ab7478e6d4..25d90b7b2225 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5-r3.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P2}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/media-libs/glycin-loaders/Manifest b/media-libs/glycin-loaders/Manifest
index e5d5822cb726..626b5efef6af 100644
--- a/media-libs/glycin-loaders/Manifest
+++ b/media-libs/glycin-loaders/Manifest
@@ -1,3 +1 @@
-DIST glycin-1.1.0.tar.xz 28570152 BLAKE2B 762c8208c5cc8bf6be93a8daa70cd22b1cbd93c60075ccf38225a10c303b2c503bdc1ec2e6efeb85f36f3787b45a6061926e314f44841a583e0e3cb3debc3d48 SHA512 6e4b84dceb8957f0ab6e840dbc60f6c9bb8179fde841075c614a9742282ea578a51a966eb8e7a2482daf631932e8ce5af2f1f41523f376f4d1a0a2069af94631
-DIST glycin-1.1.1.tar.xz 28914480 BLAKE2B ef39c3b15e9addd36c6bc7010bbdaf1d5efe7aeaf1a5562217c87310b16efae75b568ae0291f91815238bd4b01747cbc5d3eef26f945f0a21f008904cc382392 SHA512 ce3961b4cbe71739cdf24b985b5a609284e2cdb3869671606cbd0f31c5c99f80da7608f2e29df5a0cc7d7ef0f7bd5926eb3fff993e80cbd8ec03bf321b92b0f0
-DIST glycin-1.1.2.tar.xz 28347232 BLAKE2B fca58f99c8f2096a8d339e32a90435f56547f85715b95a5dd5da754c3d47adae712ea6d0bd9b8f7c6678f9b690837da721203a27ddf461cab16130cc7f3c17d2 SHA512 6eef9d21c5f4a423acea41e82b205de3a4dc0e3a5ce235f6cda4b4bd1052703cb9f4e16095b0927ff9185300c32e8631480d73ac313bda9a58c70122a9b7c3e8
+DIST glycin-1.1.4.tar.xz 28352904 BLAKE2B 0623a05462fb8a59d9d7e7f49968b4b68a26bd4f2088702d857048f206e9bc466907dfe2b979fdd4f80ee08e9daa888e4210cc177ca8ca5cc87fc9c10bd86e03 SHA512 8bfeefbbc36794d8b57ac86a0166038372c93aeec65a335db91a098f7442f9d33838c7f657f6a98b5528f62f89cc24b6d52e0e45738e333a3fe0179d0b02ee8c
diff --git a/media-libs/glycin-loaders/glycin-loaders-1.1.0-r1.ebuild b/media-libs/glycin-loaders/glycin-loaders-1.1.0-r1.ebuild
deleted file mode 100644
index 0775282f7108..000000000000
--- a/media-libs/glycin-loaders/glycin-loaders-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cargo meson
-
-MY_P=glycin-${PV/_/.}
-DESCRIPTION="Loaders for glycin clients (glycin crate or libglycin)"
-HOMEPAGE="https://gitlab.gnome.org/sophie-h/glycin/"
-SRC_URI="
-	https://download.gnome.org/sources/glycin/$(ver_cut 1-2)/${MY_P}.tar.xz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD GPL-3+ ISC MIT
-	Unicode-DFS-2016
-	|| ( LGPL-2.1+ MPL-2.0 )
-"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="heif jpegxl svg test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.60:2
-	>=sys-libs/libseccomp-2.5.0
-	heif? ( >=media-libs/libheif-1.17.0:= )
-	jpegxl? ( >=media-libs/libjxl-0.10.0:= )
-	svg? (
-		>=gnome-base/librsvg-2.52.0:2
-		>=x11-libs/cairo-1.17.0
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		>=gui-libs/gtk-4.12.0:4
-		>=media-libs/lcms-2.14:2
-	)
-"
-BDEPEND="
-	test? (
-		sys-apps/bubblewrap
-		sys-apps/dbus
-	)
-"
-
-ECARGO_VENDOR=${S}/vendor
-
-QA_FLAGS_IGNORED="usr/libexec/glycin-loaders/.*"
-
-src_prepare() {
-	default
-
-	# https://gitlab.gnome.org/sophie-h/glycin/-/issues/81
-	sed -i -e '\|/fonts|d' tests/tests.rs || die
-}
-
-src_configure() {
-	local formats=(
-		$(usev heif glycin-heif)
-		$(usev jpegxl glycin-jxl)
-		$(usev svg glycin-svg)
-		glycin-image-rs
-	)
-	local formats_s=${formats[*]}
-	local emesonargs=(
-		-Dprofile=$(usex debug dev release)
-		-Dglycin-loaders=true
-		-Dloaders="${formats_s// /,}"
-		-Dtests=$(usex test true false)
-		-Dlibglycin=false
-	)
-
-	meson_src_configure
-	ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die
-}
-
-src_test() {
-	# tests write to /proc/*/uid_map
-	# apparently, "addpredict /" in Portage breaks it
-	local -x SANDBOX_ON=0
-	meson_src_test
-}
diff --git a/media-libs/glycin-loaders/glycin-loaders-1.1.1-r1.ebuild b/media-libs/glycin-loaders/glycin-loaders-1.1.1-r1.ebuild
deleted file mode 100644
index 0775282f7108..000000000000
--- a/media-libs/glycin-loaders/glycin-loaders-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cargo meson
-
-MY_P=glycin-${PV/_/.}
-DESCRIPTION="Loaders for glycin clients (glycin crate or libglycin)"
-HOMEPAGE="https://gitlab.gnome.org/sophie-h/glycin/"
-SRC_URI="
-	https://download.gnome.org/sources/glycin/$(ver_cut 1-2)/${MY_P}.tar.xz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD GPL-3+ ISC MIT
-	Unicode-DFS-2016
-	|| ( LGPL-2.1+ MPL-2.0 )
-"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="heif jpegxl svg test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.60:2
-	>=sys-libs/libseccomp-2.5.0
-	heif? ( >=media-libs/libheif-1.17.0:= )
-	jpegxl? ( >=media-libs/libjxl-0.10.0:= )
-	svg? (
-		>=gnome-base/librsvg-2.52.0:2
-		>=x11-libs/cairo-1.17.0
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		>=gui-libs/gtk-4.12.0:4
-		>=media-libs/lcms-2.14:2
-	)
-"
-BDEPEND="
-	test? (
-		sys-apps/bubblewrap
-		sys-apps/dbus
-	)
-"
-
-ECARGO_VENDOR=${S}/vendor
-
-QA_FLAGS_IGNORED="usr/libexec/glycin-loaders/.*"
-
-src_prepare() {
-	default
-
-	# https://gitlab.gnome.org/sophie-h/glycin/-/issues/81
-	sed -i -e '\|/fonts|d' tests/tests.rs || die
-}
-
-src_configure() {
-	local formats=(
-		$(usev heif glycin-heif)
-		$(usev jpegxl glycin-jxl)
-		$(usev svg glycin-svg)
-		glycin-image-rs
-	)
-	local formats_s=${formats[*]}
-	local emesonargs=(
-		-Dprofile=$(usex debug dev release)
-		-Dglycin-loaders=true
-		-Dloaders="${formats_s// /,}"
-		-Dtests=$(usex test true false)
-		-Dlibglycin=false
-	)
-
-	meson_src_configure
-	ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die
-}
-
-src_test() {
-	# tests write to /proc/*/uid_map
-	# apparently, "addpredict /" in Portage breaks it
-	local -x SANDBOX_ON=0
-	meson_src_test
-}
diff --git a/media-libs/glycin-loaders/glycin-loaders-1.1.2.ebuild b/media-libs/glycin-loaders/glycin-loaders-1.1.2.ebuild
deleted file mode 100644
index 0775282f7108..000000000000
--- a/media-libs/glycin-loaders/glycin-loaders-1.1.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cargo meson
-
-MY_P=glycin-${PV/_/.}
-DESCRIPTION="Loaders for glycin clients (glycin crate or libglycin)"
-HOMEPAGE="https://gitlab.gnome.org/sophie-h/glycin/"
-SRC_URI="
-	https://download.gnome.org/sources/glycin/$(ver_cut 1-2)/${MY_P}.tar.xz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD GPL-3+ ISC MIT
-	Unicode-DFS-2016
-	|| ( LGPL-2.1+ MPL-2.0 )
-"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="heif jpegxl svg test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.60:2
-	>=sys-libs/libseccomp-2.5.0
-	heif? ( >=media-libs/libheif-1.17.0:= )
-	jpegxl? ( >=media-libs/libjxl-0.10.0:= )
-	svg? (
-		>=gnome-base/librsvg-2.52.0:2
-		>=x11-libs/cairo-1.17.0
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		>=gui-libs/gtk-4.12.0:4
-		>=media-libs/lcms-2.14:2
-	)
-"
-BDEPEND="
-	test? (
-		sys-apps/bubblewrap
-		sys-apps/dbus
-	)
-"
-
-ECARGO_VENDOR=${S}/vendor
-
-QA_FLAGS_IGNORED="usr/libexec/glycin-loaders/.*"
-
-src_prepare() {
-	default
-
-	# https://gitlab.gnome.org/sophie-h/glycin/-/issues/81
-	sed -i -e '\|/fonts|d' tests/tests.rs || die
-}
-
-src_configure() {
-	local formats=(
-		$(usev heif glycin-heif)
-		$(usev jpegxl glycin-jxl)
-		$(usev svg glycin-svg)
-		glycin-image-rs
-	)
-	local formats_s=${formats[*]}
-	local emesonargs=(
-		-Dprofile=$(usex debug dev release)
-		-Dglycin-loaders=true
-		-Dloaders="${formats_s// /,}"
-		-Dtests=$(usex test true false)
-		-Dlibglycin=false
-	)
-
-	meson_src_configure
-	ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die
-}
-
-src_test() {
-	# tests write to /proc/*/uid_map
-	# apparently, "addpredict /" in Portage breaks it
-	local -x SANDBOX_ON=0
-	meson_src_test
-}
diff --git a/media-libs/glycin-loaders/glycin-loaders-1.1.4.ebuild b/media-libs/glycin-loaders/glycin-loaders-1.1.4.ebuild
new file mode 100644
index 000000000000..217ae3663814
--- /dev/null
+++ b/media-libs/glycin-loaders/glycin-loaders-1.1.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cargo meson
+
+MY_P=glycin-${PV/_/.}
+DESCRIPTION="Loaders for glycin clients (glycin crate or libglycin)"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/glycin/"
+SRC_URI="
+	https://download.gnome.org/sources/glycin/$(ver_cut 1-2)/${MY_P}.tar.xz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD GPL-3+ ISC MIT
+	Unicode-DFS-2016
+	|| ( LGPL-2.1+ MPL-2.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="heif jpegxl svg test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.60:2
+	>=sys-libs/libseccomp-2.5.0
+	heif? ( >=media-libs/libheif-1.17.0:= )
+	jpegxl? ( >=media-libs/libjxl-0.10.0:= )
+	svg? (
+		>=gnome-base/librsvg-2.52.0:2
+		>=x11-libs/cairo-1.17.0
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=gui-libs/gtk-4.12.0:4
+		>=media-libs/lcms-2.14:2
+	)
+"
+BDEPEND="
+	test? (
+		sys-apps/bubblewrap
+		sys-apps/dbus
+	)
+"
+
+ECARGO_VENDOR=${S}/vendor
+
+QA_FLAGS_IGNORED="usr/libexec/glycin-loaders/.*"
+
+src_prepare() {
+	default
+
+	# https://gitlab.gnome.org/GNOME/glycin/-/issues/81
+	sed -i -e '\|/fonts|d' tests/tests.rs || die
+	# avoid depending on git
+	# https://gitlab.gnome.org/GNOME/glycin/-/issues/110
+	sed -i -e 's/git/false/' loaders/meson.build || die
+}
+
+src_configure() {
+	local formats=(
+		$(usev heif glycin-heif)
+		$(usev jpegxl glycin-jxl)
+		$(usev svg glycin-svg)
+		glycin-image-rs
+	)
+	local formats_s=${formats[*]}
+	local emesonargs=(
+		-Dprofile=$(usex debug dev release)
+		-Dglycin-loaders=true
+		-Dloaders="${formats_s// /,}"
+		-Dtests=$(usex test true false)
+		-Dlibglycin=false
+	)
+
+	meson_src_configure
+	ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die
+}
+
+src_test() {
+	# tests write to /proc/*/uid_map
+	# apparently, "addpredict /" in Portage breaks it
+	local -x SANDBOX_ON=0
+	meson_src_test
+}
diff --git a/media-libs/glycin-loaders/metadata.xml b/media-libs/glycin-loaders/metadata.xml
index 52ff5d43ffe7..c138ac037769 100644
--- a/media-libs/glycin-loaders/metadata.xml
+++ b/media-libs/glycin-loaders/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="gnome-gitlab">sophie-h/glycin</remote-id>
+		<remote-id type="gnome-gitlab">GNOME/glycin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/gmmlib/gmmlib-22.5.5.ebuild b/media-libs/gmmlib/gmmlib-22.5.5.ebuild
index 2a09f24b8f3d..a2f2b89e674b 100644
--- a/media-libs/gmmlib/gmmlib-22.5.5.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.5.5.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 @@ if [[ ${PV} == *9999 ]] ; then
 	fi
 	inherit git-r3
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 	S="${WORKDIR}/${PN}-intel-${P}"
 fi
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-libs/gst-plugins-bad/files/0001-analyticsoverlay-move-option-to-right-section.patch b/media-libs/gst-plugins-bad/files/0001-analyticsoverlay-move-option-to-right-section.patch
new file mode 100644
index 000000000000..803f31f64286
--- /dev/null
+++ b/media-libs/gst-plugins-bad/files/0001-analyticsoverlay-move-option-to-right-section.patch
@@ -0,0 +1,39 @@
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8238
+
+From 30bce05f5cc6ed0b0f2cf43fcb5558900eeaa198 Mon Sep 17 00:00:00 2001
+Message-ID: <30bce05f5cc6ed0b0f2cf43fcb5558900eeaa198.1736022660.git.sam@gentoo.org>
+From: Sam James <sam@gentoo.org>
+Date: Sat, 4 Jan 2025 19:52:48 +0000
+Subject: [PATCH 1/2] analyticsoverlay: move option to right section
+
+It has an external dependency (pango/cairo) so should be under
+that heading. Also, fix an inconsistency with the ':' style.
+
+Fixes: 95464c89772e144088af54c1e8a4c1fecc45f09a
+---
+ meson_options.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 28448ec6db..b3ec11e911 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -6,7 +6,6 @@ option('accurip', type : 'feature', value : 'auto')
+ option('adpcmdec', type : 'feature', value : 'auto')
+ option('adpcmenc', type : 'feature', value : 'auto')
+ option('aiff', type : 'feature', value : 'auto')
+-option('analyticsoverlay', type:'feature', value : 'auto')
+ option('asfmux', type : 'feature', value : 'auto')
+ option('audiobuffersplit', type : 'feature', value : 'auto')
+ option('audiofxbad', type : 'feature', value : 'auto')
+@@ -92,6 +91,7 @@ option('aja', type : 'feature', value : 'auto', description : 'AJA audio/video s
+ option('aom', type : 'feature', value : 'auto', description : 'AOM AV1 video codec plugin')
+ option('avtp', type : 'feature', value : 'auto', description : 'Audio/Video Transport Protocol (AVTP) plugin')
+ option('amfcodec', type : 'feature', value : 'auto', description : 'AMD AMF codec plugin')
++option('analyticsoverlay', type: 'feature', value : 'auto')
+ option('androidmedia', type : 'feature', value : 'auto', description : 'Video capture and codec plugins for Android')
+ option('applemedia', type : 'feature', value : 'auto', description : 'Video capture and codec access plugins for macOS and iOS')
+ option('asio', type : 'feature', value : 'auto', description : 'Steinberg Audio Streaming Input Output (ASIO) plugin')
+-- 
+2.47.1
+
diff --git a/media-libs/gst-plugins-bad/files/0002-codec2json-move-option-to-right-section.patch b/media-libs/gst-plugins-bad/files/0002-codec2json-move-option-to-right-section.patch
new file mode 100644
index 000000000000..c5ced3449d6b
--- /dev/null
+++ b/media-libs/gst-plugins-bad/files/0002-codec2json-move-option-to-right-section.patch
@@ -0,0 +1,41 @@
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8238
+
+From e76098268a833f697336d718d38ce911a8fd38fb Mon Sep 17 00:00:00 2001
+Message-ID: <e76098268a833f697336d718d38ce911a8fd38fb.1736022660.git.sam@gentoo.org>
+In-Reply-To: <30bce05f5cc6ed0b0f2cf43fcb5558900eeaa198.1736022660.git.sam@gentoo.org>
+References: <30bce05f5cc6ed0b0f2cf43fcb5558900eeaa198.1736022660.git.sam@gentoo.org>
+From: Sam James <sam@gentoo.org>
+Date: Sat, 4 Jan 2025 20:30:01 +0000
+Subject: [PATCH 2/2] codec2json: move option to right section
+
+It has an external dependency (json-glib) so should be under
+that heading.
+
+Fixes: fd588a50e415feb0ab21c4a3386bd426c8c9043b
+---
+ meson_options.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index b3ec11e911..568871f42d 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -15,7 +15,6 @@ option('audiovisualizers', type : 'feature', value : 'auto')
+ option('autoconvert', type : 'feature', value : 'auto')
+ option('bayer', type : 'feature', value : 'auto')
+ option('camerabin2', type : 'feature', value : 'auto')
+-option('codec2json', type : 'feature', value : 'auto')
+ option('codecalpha', type : 'feature', value : 'auto')
+ option('codectimestamper', type : 'feature', value : 'auto')
+ option('coloreffects', type : 'feature', value : 'auto')
+@@ -101,6 +100,7 @@ option('bs2b', type : 'feature', value : 'auto', description : 'Bauer stereophon
+ option('bz2', type : 'feature', value : 'auto', description : 'bz2 stream encoder and decoder plugin')
+ option('chromaprint', type : 'feature', value : 'auto', description : 'Chromaprint fingerprint audio plugin')
+ option('closedcaption', type : 'feature', value : 'auto', description : 'Closed caption extractor, decoder, and overlay plugin')
++option('codec2json', type : 'feature', value : 'auto')
+ option('colormanagement', type : 'feature', value : 'auto', description : 'Color management correction plugin')
+ option('curl', type : 'feature', value : 'auto', description : 'cURL network source and sink plugin')
+ option('curl-ssh2', type : 'feature', value : 'auto', description : 'cURL network source and sink plugin libssh2 support')
+-- 
+2.47.1
+
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.12.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.12.ebuild
index 99160fd971c6..b2a1bf3d89dc 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.12.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.12.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
@@ -9,7 +9,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="X bzip2 +introspection +orc udev vaapi vnc wayland"
 
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.24.10.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.24.10.ebuild
new file mode 100644
index 000000000000..36a30b5c51c4
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.24.10.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE="gst-plugins-bad"
+inherit gstreamer-meson
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="X bzip2 +introspection +orc udev vaapi vnc wayland"
+
+# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
+# Baseline requirement for libva is 1.6, but 1.15 gets more features
+RDEPEND="
+	!media-plugins/gst-plugins-va
+	!media-plugins/gst-transcoder
+
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
+	wayland? (
+		>=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.98[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.26
+	)
+
+	orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] )
+
+	vaapi? (
+		>=media-libs/libva-1.15:=[${MULTILIB_USEDEP}]
+		udev? ( dev-libs/libgudev[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/glib-utils"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE )
+
+PATCHES=(
+	"${FILESDIR}"/0001-analyticsoverlay-move-option-to-right-section.patch
+	"${FILESDIR}"/0002-codec2json-move-option-to-right-section.patch
+)
+
+src_prepare() {
+	default
+	addpredict /dev # Prevent sandbox violations bug #570624
+}
+
+multilib_src_configure() {
+	GST_PLUGINS_NOAUTO="bz2 hls ipcpipeline librfb shm va wayland"
+
+	local emesonargs=(
+		-Dshm=enabled
+		-Dipcpipeline=enabled
+		-Dhls=disabled
+		$(meson_feature bzip2 bz2)
+		$(meson_feature vaapi va)
+		-Dudev=$(usex udev $(usex vaapi enabled disabled) disabled)
+		$(meson_feature vnc librfb)
+		-Dx11=$(usex X $(usex vnc enabled disabled) disabled)
+		$(meson_feature wayland)
+	)
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_test() {
+	# Tests are slower than upstream expects
+	CK_DEFAULT_TIMEOUT=300 gstreamer_multilib_src_test
+}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.24.11.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.24.11.ebuild
new file mode 100644
index 000000000000..54a3033ebddb
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.24.11.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE="gst-plugins-bad"
+inherit gstreamer-meson
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="X bzip2 +introspection +orc udev vaapi vnc wayland"
+
+# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
+# Baseline requirement for libva is 1.6, but 1.15 gets more features
+RDEPEND="
+	!media-plugins/gst-plugins-va
+	!media-plugins/gst-transcoder
+
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
+	wayland? (
+		>=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.98[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.26
+	)
+
+	orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] )
+
+	vaapi? (
+		>=media-libs/libva-1.15:=[${MULTILIB_USEDEP}]
+		udev? ( dev-libs/libgudev[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/glib-utils"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE )
+
+PATCHES=(
+	"${FILESDIR}"/0001-analyticsoverlay-move-option-to-right-section.patch
+	"${FILESDIR}"/0002-codec2json-move-option-to-right-section.patch
+)
+
+src_prepare() {
+	default
+	addpredict /dev # Prevent sandbox violations bug #570624
+}
+
+multilib_src_configure() {
+	GST_PLUGINS_NOAUTO="bz2 hls ipcpipeline librfb shm va wayland"
+
+	local emesonargs=(
+		-Dshm=enabled
+		-Dipcpipeline=enabled
+		-Dhls=disabled
+		$(meson_feature bzip2 bz2)
+		$(meson_feature vaapi va)
+		-Dudev=$(usex udev $(usex vaapi enabled disabled) disabled)
+		$(meson_feature vnc librfb)
+		-Dx11=$(usex X $(usex vnc enabled disabled) disabled)
+		$(meson_feature wayland)
+	)
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_test() {
+	# Tests are slower than upstream expects
+	CK_DEFAULT_TIMEOUT=300 gstreamer_multilib_src_test
+}
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 442c0f85539b..0ab140eea80d 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-base-1.22.11.tar.xz 2373020 BLAKE2B 0809629afae7b82a12079dc40dd5a6a7c86876b591389c3179a74cea975b0ef3c66d9fc2f42a2f722892de2c75ef87eb0cfc5cc5df65f0ebefa02a891b0c392a SHA512 cfd8f7fe66f4707e043c8f070110eb80f9804cec529c8d29b13dbc8604db90e3f010c9614d538ad076b826df54f75ce5ebac355bd05a874e44dccead6a953c60
 DIST gst-plugins-base-1.22.12.tar.xz 2374324 BLAKE2B 7600d5a10a3d7d4f6874cc166cdca2d45d3daedec3fbb56982db172bd4f6c0463fcde812e31c42f912d8fbda793730695ab39e44b7f126b49581f7c87858b988 SHA512 f72edccd49ce2a35577dff80feb1d0f667df54d6b8f61ef2320b5d4564442b907954d015bccec7a915acf25d2197a507c32b72c1ab18dd38d254f57a3277b334
+DIST gst-plugins-base-1.24.11.tar.xz 2455952 BLAKE2B efbf7b1aaece5a287738afb93e4b99c27471c640079bc7312f84925309de0eb91ecb9837eab314e5f787d745fda6c9113105156bd819db64c869ddec6a04e7ff SHA512 b0a2a072c52628b85ae3d2ff8f2769f149fd2d0c3644fb9d9d934ea586835e29af97f41731023969a8120a470f998080ef5a0cac5aa26823d01698dfe2a5e2fb
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.22.11-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.22.11-r1.ebuild
deleted file mode 100644
index 38ac060220c2..000000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.22.11-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE="gst-plugins-base"
-
-inherit flag-o-matic gstreamer-meson
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# For OpenGL we have three separate concepts, with a list of possibilities in each:
-#  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
-#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
-#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
-# With the following limitations:
-#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
-#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
-#  * glx platform requires opengl API (but we don't REQUIRED_USE that as USE=X is common, glx is just disabled with USE=-opengl or USE=-X)
-#  * wayland, gbm and most other non-glx WSIs require egl platform
-# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
-#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
-#  and libpng/jpeg are required for gloverlay element;
-
-# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
-IUSE="alsa +egl gbm +gles2 +introspection ivorbis +ogg opengl +orc +pango theora +vorbis wayland +X"
-GL_REQUIRED_USE="
-	|| ( gbm wayland X )
-	wayland? ( egl )
-	gbm? ( egl )
-"
-REQUIRED_USE="
-	ivorbis? ( ogg )
-	theora? ( ogg )
-	vorbis? ( ogg )
-	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
-	gles2? ( egl ${GL_REQUIRED_USE} )
-"
-
-# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
-# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
-GL_DEPS="
-	|| (
-		>=media-libs/mesa-24.1.0_rc1[opengl,wayland?,${MULTILIB_USEDEP}]
-		<media-libs/mesa-24.1.0_rc1[egl(+)?,gbm(+)?,gles2?,wayland?,${MULTILIB_USEDEP}]
-	)
-	egl? (
-		x11-libs/libdrm
-	)
-	gbm? (
-		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
-		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
-	)
-	wayland? (
-		>=dev-libs/wayland-1.20.0[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.15
-	)
-
-	>=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
-	media-libs/libpng:0[${MULTILIB_USEDEP}]
-	media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
-" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
-# >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
-
-RDEPEND="
-	app-text/iso-codes
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
-	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] )
-	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
-	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
-	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-
-	gles2? ( ${GL_DEPS} )
-	opengl? ( ${GL_DEPS} )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	X? ( x11-base/xorg-proto )
-"
-
-DOCS=( AUTHORS NEWS README.md RELEASE )
-
-PATCHES=(
-)
-
-multilib_src_configure() {
-	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
-
-	# opus: split to media-plugins/gst-plugins-opus
-	GST_PLUGINS_NOAUTO="alsa gl ogg pango theora vorbis x11 xshm xvideo"
-
-	local emesonargs=(
-		-Dtools=enabled
-
-		$(meson_feature alsa)
-		$(meson_feature ogg)
-		$(meson_feature pango)
-		$(meson_feature theora)
-		$(meson_feature vorbis)
-		$(meson_feature X x11)
-		$(meson_feature X xshm)
-		$(meson_feature X xvideo)
-	)
-
-	if use opengl || use gles2; then
-		# because meson doesn't likes extraneous commas
-		local gl_api=( $(use opengl && echo opengl) $(use gles2 && echo gles2) )
-		local gl_platform=( $(use X && use opengl && echo glx) $(use egl && echo egl) )
-		local gl_winsys=(
-			$(use X && echo x11)
-			$(use wayland && echo wayland)
-			$(use egl && echo egl)
-			$(use gbm && echo gbm)
-		)
-
-		emesonargs+=(
-			-Dgl=enabled
-			-Dgl-graphene=enabled
-			-Dgl_api=$(IFS=, ; echo "${gl_api[*]}")
-			-Dgl_platform=$(IFS=, ; echo "${gl_platform[*]}")
-			-Dgl_winsys=$(IFS=, ; echo "${gl_winsys[*]}")
-		)
-	else
-		emesonargs+=(
-			-Dgl=disabled
-			-Dgl_api=
-			-Dgl_platform=
-			-Dgl_winsys=
-		)
-	fi
-
-	# Workaround EGL/eglplatform.h being built with X11 present
-	use X || export CFLAGS="${CFLAGS} -DEGL_NO_X11"
-
-	gstreamer_multilib_src_configure
-}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.22.12.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.22.12.ebuild
index 4610b9698839..7ff6a0837362 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.22.12.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.22.12.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
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.24.11.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.24.11.ebuild
new file mode 100644
index 000000000000..a0f53734c41e
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.24.11.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic gstreamer-meson
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# For OpenGL we have three separate concepts, with a list of possibilities in each:
+#  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
+#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
+#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
+# With the following limitations:
+#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
+#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
+#  * glx platform requires opengl API (but we don't REQUIRED_USE that as USE=X is common, glx is just disabled with USE=-opengl or USE=-X)
+#  * wayland, gbm and most other non-glx WSIs require egl platform
+# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
+#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
+#  and libpng/jpeg are required for gloverlay element;
+
+# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
+IUSE="alsa +egl gbm +gles2 +introspection ivorbis +ogg opengl +orc +pango theora +vorbis wayland +X"
+GL_REQUIRED_USE="
+	|| ( gbm wayland X )
+	wayland? ( egl )
+	gbm? ( egl )
+"
+REQUIRED_USE="
+	ivorbis? ( ogg )
+	theora? ( ogg )
+	vorbis? ( ogg )
+	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
+	gles2? ( egl ${GL_REQUIRED_USE} )
+"
+
+# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
+# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
+GL_DEPS="
+	|| (
+		>=media-libs/mesa-24.1.0_rc1[opengl,wayland?,${MULTILIB_USEDEP}]
+		<media-libs/mesa-24.1.0_rc1[egl(+)?,gbm(+)?,gles2?,wayland?,${MULTILIB_USEDEP}]
+	)
+	egl? (
+		x11-libs/libdrm
+	)
+	gbm? (
+		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+	)
+	wayland? (
+		>=dev-libs/wayland-1.20.0[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.15
+	)
+
+	>=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+	media-libs/libpng:0[${MULTILIB_USEDEP}]
+	media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
+" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
+# >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+
+RDEPEND="
+	app-text/iso-codes
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] )
+	kernel_linux? ( >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}] )
+	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	X? ( x11-base/xorg-proto )
+"
+
+DOCS=( AUTHORS NEWS README.md RELEASE )
+
+PATCHES=(
+)
+
+multilib_src_configure() {
+	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+	# opus: split to media-plugins/gst-plugins-opus
+	GST_PLUGINS_NOAUTO="alsa gl ogg pango theora vorbis x11 xshm xvideo"
+
+	local emesonargs=(
+		-Dtools=enabled
+
+		$(meson_feature alsa)
+		$(meson_feature kernel_linux drm)
+		$(meson_feature ogg)
+		$(meson_feature pango)
+		$(meson_feature theora)
+		$(meson_feature vorbis)
+		$(meson_feature X x11)
+		$(meson_feature X xshm)
+		$(meson_feature X xvideo)
+	)
+
+	if use opengl || use gles2; then
+		# because meson doesn't like extraneous commas
+		local gl_api=( $(use opengl && echo opengl) $(use gles2 && echo gles2) )
+		local gl_platform=( $(use X && use opengl && echo glx) $(use egl && echo egl) )
+		local gl_winsys=(
+			$(use X && echo x11)
+			$(use wayland && echo wayland)
+			$(use egl && echo egl)
+			$(use gbm && echo gbm)
+		)
+
+		emesonargs+=(
+			-Dgl=enabled
+			-Dgl-graphene=enabled
+			-Dgl_api=$(IFS=, ; echo "${gl_api[*]}")
+			-Dgl_platform=$(IFS=, ; echo "${gl_platform[*]}")
+			-Dgl_winsys=$(IFS=, ; echo "${gl_winsys[*]}")
+		)
+	else
+		emesonargs+=(
+			-Dgl=disabled
+			-Dgl_api=
+			-Dgl_platform=
+			-Dgl_winsys=
+		)
+	fi
+
+	# Workaround EGL/eglplatform.h being built with X11 present
+	use X || export CFLAGS="${CFLAGS} -DEGL_NO_X11"
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.22.11.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.22.11.ebuild
deleted file mode 100644
index 47f709973afa..000000000000
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.22.11.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE="gst-plugins-good"
-
-inherit gstreamer-meson
-
-DESCRIPTION="Basepack of plugins for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="+orc"
-
-# Old media-libs/gst-plugins-ugly blocker for xingmux moving from ugly->good
-RDEPEND="
-	!<media-libs/gst-plugins-ugly-1.22.3
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE )
-
-multilib_src_configure() {
-	# gst/matroska can use bzip2
-	GST_PLUGINS_NOAUTO="bz2"
-
-	local emesonargs=(
-		-Dbz2=enabled
-	)
-
-	gstreamer_multilib_src_configure
-}
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.22.12.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.22.12.ebuild
index 5b146687177e..e7591b57374f 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.22.12.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.22.12.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
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="+orc"
 
 # Old media-libs/gst-plugins-ugly blocker for xingmux moving from ugly->good
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.24.11.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.24.11.ebuild
new file mode 100644
index 000000000000..b12ae75cc569
--- /dev/null
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.24.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE="gst-plugins-good"
+
+inherit gstreamer-meson
+
+DESCRIPTION="Basepack of plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+orc"
+
+# Old media-libs/gst-plugins-ugly blocker for xingmux moving from ugly->good
+RDEPEND="
+	!<media-libs/gst-plugins-ugly-1.22.3
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE )
+
+multilib_src_configure() {
+	# gst/matroska can use bzip2
+	GST_PLUGINS_NOAUTO="bz2"
+
+	local emesonargs=(
+		-Dbz2=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index 4d94fd9151a4..4c6a49b345af 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-ugly-1.22.11.tar.xz 256812 BLAKE2B 143fe16c92465be0c5bfb5b6c452be9e730501d372e49c26c6837eb2ff336b8098cda5afc61b3620f9ea9ed13eed6118e0deed8dcc9eab499b941e5e64157fd9 SHA512 767e80c1d15ec79ff196c4c4ad6128bc17502b490201c1a3799341a2784848f639392310de7dabc922d022acb5156bd25e4191ba2409c17b3a23a278f7722c5c
 DIST gst-plugins-ugly-1.22.12.tar.xz 257464 BLAKE2B c7f89dda309712cb2380b2e29b67a40c02c561bbe49a83acb2beb84aac6ebaed895e1a27d5f6fb6787c803e2e94a0409d14a3206feb9797c5329bbaff5e4a61d SHA512 3ef5cb384578bcaff3bb45fa8fa8f97884acb2e09a1621c504fca4bd8744cb83e71c342372a7ddd06bc4077fdd2684d1f7f078278392361ed4e18afed374c659
+DIST gst-plugins-ugly-1.24.10.tar.xz 231124 BLAKE2B d4e5d5a4abd3860d98ea9066d9eb13662ef639bd0ee8b8a1c5d5ffb155e0febc968019a151259cfd6592c8f27332bf6b4b6a3d74249b530c1a25eb31adf31b19 SHA512 87430ccf3e0382bae8f24e429734c38d9339ea95205e2a5fe5db8408ca9a369ee971b2e84b0717f918d65b2b91dec4baf032d8a01658512ec0af9ee9dfe397c5
+DIST gst-plugins-ugly-1.24.11.tar.xz 232056 BLAKE2B 849c34c099d062c81e7e008aee95d36ac6aae0c08eacec0e2ba3582b421d912f9dc0322031310eb459c76af30056ee38d5b5849d0400540656571c1a110f1c54 SHA512 461f3a07b4265bfe66b5b22f3a10bbf254068381f5634e970b3cb6d1c2d3ea401e0be43d188934a490e29658d8447a83de50253380cde371b0f5a55178f90e6a
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.22.12.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.22.12.ebuild
index 9c9d7568b882..2f0d2890b287 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.22.12.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.22.12.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
@@ -9,7 +9,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.24.10.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.24.10.ebuild
new file mode 100644
index 000000000000..9c9d7568b882
--- /dev/null
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.24.10.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE="gst-plugins-ugly"
+inherit gstreamer-meson
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE )
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.24.11.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.24.11.ebuild
new file mode 100644
index 000000000000..b225f09aa1e1
--- /dev/null
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.24.11.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE="gst-plugins-ugly"
+inherit gstreamer-meson
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE )
diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest
index 90e66adf5b12..c71da8ace979 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -1,2 +1,4 @@
 DIST gst-rtsp-server-1.22.11.tar.xz 281608 BLAKE2B 50c2fdaeb828b4f1d8f23cea4e4054ab07bd7be3b3fcf1c977852c13b18b3360603da62daa19bc1f71b6d138158bd2d51f0e048490c99b1dcfc5cf4dbf5bd52a SHA512 cf3c698dbbcaa790b6bb1b1df4bae88be5f54fb70ba4bce5a4a0f907d693616d52b1cf67e73f694dcd7c9588b63a6303949f9f36fde952011a2d2ff80f9b44de
 DIST gst-rtsp-server-1.22.12.tar.xz 282316 BLAKE2B 0f7795271bf8943c322d65f490e1e100db7775f21cb853a39c199871dfa5cd4fcd1ee0169256a1b5bdf31d1c999c22ef355011d326086f13cdf92371b4ab29cc SHA512 fde52d8b08b58170bdf573e76c60aab8c46c857f3111504916d4901246567f4bf018e1c67913425fc1501e8b99723c19c9237297b1f84c2b489331d34199aa2c
+DIST gst-rtsp-server-1.24.10.tar.xz 287084 BLAKE2B fc9da46980c740e256019e4bd461e7672c10f3f44517c80bd9007f344ffa9ce8bcc772fb62c6498e3eba55c05db5c6bf9207b9f4a64ee79049f73c244453a347 SHA512 e5baba79f98ecbc10c90d1e91d6709d20e3faf8bf7f8e166c383229337ec3e3986fc17ef554c5276d517153f380a82c83092261a324b47ae66aeebb9bc741cab
+DIST gst-rtsp-server-1.24.11.tar.xz 288008 BLAKE2B 717af25bd36a414bbe17d629f250d05db63828d6ff34dd27dbad5dc942cc06c85651e829d5770699e75a56a076d0c123db3bd1509640d34d2a4bc1c0b49fc76b SHA512 d1342a75154ff79f26447a14104cbdc6b8ebec46ff7588c3a1dad08ddb591e34401ad02c359e3f8fc3f018020f111573f5e38e9ebe1d3d0a73c142bb3affcf58
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.22.12.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.22.12.ebuild
index 85cf45dde01e..530afd82d813 100644
--- a/media-libs/gst-rtsp-server/gst-rtsp-server-1.22.12.ebuild
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.22.12.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
@@ -9,7 +9,7 @@ DESCRIPTION="A GStreamer based RTSP server"
 HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="examples +introspection static-libs"
 
 # gst-plugins-base for many used elements and API
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.24.10.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.24.10.ebuild
new file mode 100644
index 000000000000..85cf45dde01e
--- /dev/null
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.24.10.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gstreamer-meson
+
+DESCRIPTION="A GStreamer based RTSP server"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="examples +introspection static-libs"
+
+# gst-plugins-base for many used elements and API
+# gst-plugins-good for rtprtxsend and rtpbin elements, maybe more
+# gst-plugins-srtp for srtpenc and srtpdec elements
+RDEPEND="
+	>=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-plugins/gst-plugins-srtp-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dintrospection=$(multilib_native_usex introspection enabled disabled)
+	)
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use examples ; then
+		docinto examples
+		dodoc "${S}"/examples/*.c
+	fi
+}
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.24.11.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.24.11.ebuild
new file mode 100644
index 000000000000..b983621029c2
--- /dev/null
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.24.11.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gstreamer-meson
+
+DESCRIPTION="A GStreamer based RTSP server"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm64 ~x86"
+IUSE="examples +introspection static-libs"
+
+# gst-plugins-base for many used elements and API
+# gst-plugins-good for rtprtxsend and rtpbin elements, maybe more
+# gst-plugins-srtp for srtpenc and srtpdec elements
+RDEPEND="
+	>=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-plugins/gst-plugins-srtp-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dintrospection=$(multilib_native_usex introspection enabled disabled)
+	)
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use examples ; then
+		docinto examples
+		dodoc "${S}"/examples/*.c
+	fi
+}
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index 0e1a6736ca82..2c7cb8c938b5 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,2 +1,4 @@
 DIST gst-editing-services-1.22.11.tar.xz 836008 BLAKE2B 49ce48e45b956f9675f64f8da4ce2a8cd851ccba5573e722d8f823ff08a96053a4b8beca14fe5d32b4d8f71abf32feba2c2b80c10cf3825c32a5eaf52ce474a4 SHA512 87f1240c3c18d1530ace3f15ad50acef90dab2808198658b5f9da54a5cfe2ee2c040e7bdd766550e566c5e86a1509b12a473b6063f3a7e471ee18b163b40873d
 DIST gst-editing-services-1.22.12.tar.xz 836768 BLAKE2B 252426269ab9b7893bf688335ec8920203846f3211a37ccbbd5256104bcee44d3897986e8787ecc138cfb97402c69f27e1622a774f7ada5d0ae6ea07e0495204 SHA512 34a888ca63c883c55e27b5b7270c6842f03d45544fd698c60e35a640f978c60667a23baec096e4be73a618beffdbf251bcc310437a1f1122aa98c2dc7a0b301c
+DIST gst-editing-services-1.24.10.tar.xz 854400 BLAKE2B 85ac071a608e6d21c9c72328851b70d046eef58c9c029d92c0f8e78673a36cf8c6d5b4c00f8b8dec2f801da989edbd9645b20b1961a5cdcc107e30493707bebf SHA512 864c6f03470288bdad2ab9d9c712bc471ae313bad58c08b83aca4b7959d71f7e026b55a8c125fae8abecc89bfb9717e0eaae5bce7c681a82cbd96f1f66684e64
+DIST gst-editing-services-1.24.11.tar.xz 855536 BLAKE2B 3273bb65ddbd23a98f1046a34b1fee28d4187e817662603ecd6fd723e1b9feada4ed478eb9d921062bc2b7f75c3fc04de3c306297f63dd77c85b5cc57d6e6903 SHA512 04535b53aa6120d944ad10beec717fc10a5241d62d3277922750a6523dc0f2e939b2eb4e87b8d7bed615c1920b9cc97e1a40bc25b5b5b7427251541904e4eaa8
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.22.12.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.22.12.ebuild
index c5c89ff1d13a..869b38181cd2 100644
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.22.12.ebuild
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.22.12.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 @@ S="${WORKDIR}"/${P/gstreamer/gst}
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 IUSE="+introspection test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.24.10.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.24.10.ebuild
new file mode 100644
index 000000000000..c5c89ff1d13a
--- /dev/null
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.24.10.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit meson python-r1
+
+DESCRIPTION="SDK for making video editors and more"
+HOMEPAGE="http://wiki.pitivi.org/wiki/GES"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P/gstreamer/gst}.tar.xz"
+S="${WORKDIR}"/${P/gstreamer/gst}
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="+introspection test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# Some tests are failing
+RESTRICT="test"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libxml2:2
+	>=media-libs/gstreamer-${PV}:1.0[introspection?]
+	>=media-libs/gst-plugins-base-${PV}:1.0[introspection?]
+	>=media-libs/gst-plugins-bad-${PV}:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	python_setup
+
+	local emesonargs=(
+		-Ddoc=disabled # hotdoc not packaged
+		$(meson_feature introspection)
+		$(meson_feature test tests)
+		-Dbash-completion=disabled
+		-Dxptv=disabled
+		-Dpython=enabled
+		-Dvalidate=disabled
+		-Dexamples=disabled
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_moduleinto gi.overrides
+	python_foreach_impl python_domodule bindings/python/gi/overrides/GES.py
+}
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.24.11.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.24.11.ebuild
new file mode 100644
index 000000000000..38da7967a94d
--- /dev/null
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.24.11.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit meson python-r1
+
+DESCRIPTION="SDK for making video editors and more"
+HOMEPAGE="http://wiki.pitivi.org/wiki/GES"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P/gstreamer/gst}.tar.xz"
+S="${WORKDIR}"/${P/gstreamer/gst}
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+IUSE="+introspection test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# Some tests are failing
+RESTRICT="test"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libxml2:2
+	>=media-libs/gstreamer-${PV}:1.0[introspection?]
+	>=media-libs/gst-plugins-base-${PV}:1.0[introspection?]
+	>=media-libs/gst-plugins-bad-${PV}:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	python_setup
+
+	local emesonargs=(
+		-Ddoc=disabled # hotdoc not packaged
+		$(meson_feature introspection)
+		$(meson_feature test tests)
+		-Dbash-completion=disabled
+		-Dxptv=disabled
+		-Dpython=enabled
+		-Dvalidate=disabled
+		-Dexamples=disabled
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_moduleinto gi.overrides
+	python_foreach_impl python_domodule bindings/python/gi/overrides/GES.py
+}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 967823b92002..4298b23a2b3d 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,2 +1,2 @@
-DIST gstreamer-1.22.11.tar.xz 1801248 BLAKE2B 856342994bc8750598cb256313151355e7c58d751214c168c53ba831cfcdf3ab789a192473ba0e0645df8cb7cb9e625348b18cfe83d839f1f231f8f746877f49 SHA512 8976cebd2cbac3ef31ee6163d2c5264be7d10d54ab9fe6f0b2317d7d0380420ef2378e1b476af09f1e6b203e3eafcda88fc08bb2f550a6f411d8670dec04843e
 DIST gstreamer-1.22.12.tar.xz 1803104 BLAKE2B c44d0b2a18f523c6e826f774255e0a6946ef6a8386f92dd611ee1f9d2e3bee6dc837654efd61017c7bc4784e6356a66698f9038e1747ed14ff3e468b4fcb8652 SHA512 2443a337a97ac805267d683d049b5023281db54d0d9c561510cff478b0a13256078eb08b1dd89440d2348c84e6e64c8137ce8e6e7c131440a7bd3a8975ebe722
+DIST gstreamer-1.24.11.tar.xz 1870996 BLAKE2B 8d4a24a2c4ee7af8b30eed569f27125cafd8e77b0d93b210a87b2b442809e6bd4b3009b01e961f1c488b11f0c1e21b8d12702a4c32f4c76718d12a4df6dfed9e SHA512 980dcabb5481cc1c59060c0b9b396deb4bc5646f757bc6be6ac514847f046473b5a997ca2d5a394cbedd079403ac0ae84e6b1d94997761018d080fadf9e99af5
diff --git a/media-libs/gstreamer/files/gstreamer-1.24.10-disable-test-with-no-tools.patch b/media-libs/gstreamer/files/gstreamer-1.24.10-disable-test-with-no-tools.patch
new file mode 100644
index 000000000000..bf751b0ce086
--- /dev/null
+++ b/media-libs/gstreamer/files/gstreamer-1.24.10-disable-test-with-no-tools.patch
@@ -0,0 +1,18 @@
+gstregistry needs to be able to find gst-plugin-scanner which doesn't
+exist if tools are disabled, as we do for multilib.
+
+But really, this seems to be papering over a bigger, longer-standing
+problem:
+* https://bugs.gentoo.org/870361
+* https://bugzilla.redhat.com/show_bug.cgi?id=1472160
+--- a/tests/check/meson.build
++++ b/tests/check/meson.build
+@@ -36,7 +36,7 @@ core_tests = [
+   [ 'gst/gstpreset.c' ],
+   [ 'gst/gstprotection.c' ],
+   [ 'gst/gstquery.c', not gst_registry ],
+-  [ 'gst/gstregistry.c', not gst_registry ],
++  [ 'gst/gstregistry.c', not gst_registry or not get_option('tools').enabled() ],
+   [ 'gst/gstpromise.c'],
+   [ 'gst/gstsegment.c' ],
+   [ 'gst/gststream.c' ],
diff --git a/media-libs/gstreamer/gstreamer-1.22.11.ebuild b/media-libs/gstreamer/gstreamer-1.22.11.ebuild
deleted file mode 100644
index 4aa50b8c28c9..000000000000
--- a/media-libs/gstreamer/gstreamer-1.22.11.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 gstreamer-meson
-
-DESCRIPTION="Open source multimedia framework"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+caps +introspection unwind"
-
-# gstreamer-1.22.x requires 2.62, but 2.64 is strongly recommended
-RDEPEND="
-	>=dev-libs/glib-2.64.0:2[${MULTILIB_USEDEP}]
-	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-	unwind? (
-		>=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
-		dev-libs/elfutils[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	app-alternatives/yacc
-	app-alternatives/lex
-"
-
-DOCS=( AUTHORS ChangeLog NEWS MAINTAINERS README.md RELEASE )
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dtools=$(multilib_is_native_abi && echo enabled || echo disabled)
-		-Dbenchmarks=disabled
-		-Dexamples=disabled
-		-Dcheck=enabled
-		$(meson_feature unwind libunwind)
-		$(meson_feature unwind libdw)
-	)
-
-	if use caps ; then
-		emesonargs+=( -Dptp-helper-permissions=capabilities )
-	else
-		emesonargs+=(
-			-Dptp-helper-permissions=setuid-root
-			-Dptp-helper-setuid-user=nobody
-			-Dptp-helper-setuid-group=nobody
-		)
-	fi
-
-	gstreamer_multilib_src_configure
-}
diff --git a/media-libs/gstreamer/gstreamer-1.22.12.ebuild b/media-libs/gstreamer/gstreamer-1.22.12.ebuild
index a83ad6671357..3c23bc3b78ab 100644
--- a/media-libs/gstreamer/gstreamer-1.22.12.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.22.12.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="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+caps +introspection unwind"
 
 # gstreamer-1.22.x requires 2.62, but 2.64 is strongly recommended
diff --git a/media-libs/gstreamer/gstreamer-1.24.11.ebuild b/media-libs/gstreamer/gstreamer-1.24.11.ebuild
new file mode 100644
index 000000000000..557521d45874
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-1.24.11.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+RUST_OPTIONAL=1
+RUST_MIN_VER=1.48
+inherit gstreamer-meson rust
+
+DESCRIPTION="Open source multimedia framework"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+caps +introspection ptp unwind"
+
+# gstreamer-1.22.x requires 2.62, but 2.64 is strongly recommended
+RDEPEND="
+	>=dev-libs/glib-2.64.0:2[${MULTILIB_USEDEP}]
+	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	unwind? (
+		>=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
+		dev-libs/elfutils[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	app-alternatives/yacc
+	app-alternatives/lex
+	ptp? ( ${RUST_DEPEND} )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS MAINTAINERS README.md RELEASE )
+
+PATCHES=(
+	"${FILESDIR}"/gstreamer-1.24.10-disable-test-with-no-tools.patch
+)
+
+# Rust
+QA_FLAGS_IGNORED="usr/libexec/gstreamer-1.0/gst-ptp-helper"
+
+pkg_setup() {
+	gstreamer-meson_pkg_setup
+	use ptp && rust_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dtools=$(multilib_is_native_abi && echo enabled || echo disabled)
+		-Dbenchmarks=disabled
+		-Dexamples=disabled
+		-Dcheck=enabled
+		-Dptp-helper=$(multilib_is_native_abi && echo $(usex 'ptp' 'enabled' 'disabled') || echo disabled)
+		$(meson_feature unwind libunwind)
+		$(meson_feature unwind libdw)
+	)
+
+	if use caps ; then
+		emesonargs+=( -Dptp-helper-permissions=capabilities )
+	else
+		emesonargs+=(
+			-Dptp-helper-permissions=setuid-root
+			-Dptp-helper-setuid-user=nobody
+			-Dptp-helper-setuid-group=nobody
+		)
+	fi
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-libs/gstreamer/metadata.xml b/media-libs/gstreamer/metadata.xml
index 3484eebda129..46db1e6af323 100644
--- a/media-libs/gstreamer/metadata.xml
+++ b/media-libs/gstreamer/metadata.xml
@@ -8,5 +8,7 @@
 	<use>
 		<flag name="unwind">Enable <pkg>sys-libs/libunwind</pkg> usage for better
 			backtrace support in leaks tracer module</flag>
+		<flag name="ptp">Controls Precision Time Protocol (PTP) helper.
+			Written in Rust.</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 5144a7f60988..12a58a80d5cc 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1 +1,2 @@
 DIST harfbuzz-10.1.0.tar.xz 17922136 BLAKE2B 7d78e31d045b984d8d1a8b1d1f8f282ff9b7dc748ffd65355266266e75064b14eb94ec6b1418e208ebb0fffb99ef174d1978ab14f0c318c1112c2d8005285979 SHA512 14b0e8fd417af9c78f36e532e3737c163902b85837be1028a8fd569508639b87afeb56f70a2313ba2f0f6d4b72bb6cee0bf50fb333dfc503c713e4d9cd86e9c3
+DIST harfbuzz-10.2.0.tar.xz 17957608 BLAKE2B 6711eed94c4cbc7b4d37ec17c3bd4512110f873d0f179bc213773ad89af99cd349f92ea8ce957ddeb5084ad3719e2436cb712a880b02668954c69e0b1c3ceb98 SHA512 522028a5de91a042832b1634fc4b7636b1b42c5ee258882d155bc33fca7b30de19ca714b4f9ea8dc3d3f537142ca2305fcf5af04bec4edbf608f557c12742e54
diff --git a/media-libs/harfbuzz/harfbuzz-10.2.0.ebuild b/media-libs/harfbuzz/harfbuzz-10.2.0.ebuild
new file mode 100644
index 000000000000..05db84d3684c
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-10.2.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://harfbuzz.github.io/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+# 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 3.0.0 dropped some unstable APIs; bug #813705
+# 6.0.0 changed libharfbuzz-subset.so ABI
+SLOT="0/6.0.0"
+
+IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:=[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-util/glib-utils )
+"
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	# bug #790359
+	filter-flags -fexceptions -fthreadsafe-statics
+
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for introspection, bug #535852
+	local emesonargs=(
+		-Dcoretext=disabled
+		-Dchafa=disabled
+		-Dwasm=disabled
+
+		$(meson_feature cairo)
+		$(meson_feature glib)
+		$(meson_feature graphite graphite2)
+		$(meson_feature icu)
+		$(meson_feature introspection gobject)
+		$(meson_feature test tests)
+		$(meson_feature truetype freetype)
+
+		$(meson_native_use_feature doc docs)
+		$(meson_native_use_feature introspection)
+		# Breaks building tests..
+		#$(meson_native_use_feature utilities)
+
+		$(meson_use experimental experimental_api)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	# harfbuzz:src / check-static-inits times out on hppa
+	meson_src_test --timeout-multiplier 5
+}
diff --git a/media-libs/kquickimageeditor/Manifest b/media-libs/kquickimageeditor/Manifest
index 7927ec30a654..7f43194d30bf 100644
--- a/media-libs/kquickimageeditor/Manifest
+++ b/media-libs/kquickimageeditor/Manifest
@@ -1 +1,2 @@
 DIST kquickimageeditor-0.4.0.tar.xz 3294388 BLAKE2B 64214edc236871cbeef7cf8d11ba376a1752852a68d11dd46cfdee6dab2fcf0d3f319e825170aa7e01b506ff4b7e3972c120485d8da1bfd7b4e6ff4a38c57e66 SHA512 58ae6af9dc9c8fb0bd99279246acb360eee4110b8e2b1f51bbcb3daf246a60fcb308b111e164a40f1bff09c6f0c1298dfe1588d7bd0f2a571bda8ac9d6252e8c
+DIST kquickimageeditor-0.5.0.tar.xz 3295008 BLAKE2B 69409326be9d4c6604faff7abe3533bdfce415da482170779952a3bbc4ea38e6dbbd3210a890ba7788391e15b1f272cb8026c6ec8009b9f32fa546eec32a5444 SHA512 d1ac919f075a7ade101b3fafa794387a88c50a7580dcd2221bec54ab18c5f9550ba1efcf12c4d2dce958bd3f8ac203021525790afa9adcb9f47375a6b7a648f9
diff --git a/media-libs/kquickimageeditor/kquickimageeditor-0.5.0.ebuild b/media-libs/kquickimageeditor/kquickimageeditor-0.5.0.ebuild
new file mode 100644
index 000000000000..749a67df5f4d
--- /dev/null
+++ b/media-libs/kquickimageeditor/kquickimageeditor-0.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm kde.org
+
+DESCRIPTION="QtQuick components providing basic image editing capabilities"
+HOMEPAGE="https://invent.kde.org/libraries/kquickimageeditor
+https://api.kde.org/kquickimageeditor/html/index.html"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:6
+"
diff --git a/media-libs/ksanecore-common/Manifest b/media-libs/ksanecore-common/Manifest
index dfb7705c0699..389ce932d3e3 100644
--- a/media-libs/ksanecore-common/Manifest
+++ b/media-libs/ksanecore-common/Manifest
@@ -1,2 +1,2 @@
 DIST ksanecore-24.08.3.tar.xz 51184 BLAKE2B 285285ece94d8c55a81be2cb932c1e34b2154d04101a4501fb2cc69c310656529eee7e3d612ff12a240009a86d22d5738352dbad408d8a7871fc66c378083077 SHA512 808c220cf01ec9de1fc5e6cf55f873fe6f70f8ab231e59b7c048db5a5b7ecde542e3291798118d0e65b99c4b627e34beceef38948ba208e9dfb2c992e65a06f8
-DIST ksanecore-24.12.0.tar.xz 54372 BLAKE2B 0e4c6c81ce6a0ab3ec02d23473c0e3d8d0c9f4b14b2afd7d9ccd056e0df2c13f3cb124030c937c933cb0b1e7e6d5d735d7216e303219ef628fa69da4d0745011 SHA512 0ac6acfbd7d2e79d4e1a6b0cdf5629f5ab1cc337dbd2dc60a2e3e2c752b599c1a1aac0356674d0d3ef6c4964b8b2774734fb5333a8864e9f90e4ea63b03ebe28
+DIST ksanecore-24.12.1.tar.xz 54388 BLAKE2B 30d9f8775818dfaf51a49ef442d5f3aa6f810430b6258f9c9cb221224b420301a16969c2f7ac9c4e82160adb8a7bc4d96d6604d0c47f51889a7179720f5362e3 SHA512 11171a23e0cc22a7cdba87bd1814e392028084f4c304e2d517547f0d23f92658323dd1ebcd91bd221859fee8be0f61bdc0be260b131198f6137fd5d6991abf26
diff --git a/media-libs/ksanecore-common/ksanecore-common-24.12.0.ebuild b/media-libs/ksanecore-common/ksanecore-common-24.12.0.ebuild
deleted file mode 100644
index c490609504ee..000000000000
--- a/media-libs/ksanecore-common/ksanecore-common-24.12.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="false"
-KDE_ORG_NAME="${PN/-common/}"
-inherit ecm-common gear.kde.org
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	!<media-libs/ksanecore-23.08.5-r2:5
-	!<media-libs/ksanecore-24.05.2-r1:6
-"
diff --git a/media-libs/ksanecore-common/ksanecore-common-24.12.1.ebuild b/media-libs/ksanecore-common/ksanecore-common-24.12.1.ebuild
new file mode 100644
index 000000000000..b7f8505f8cfb
--- /dev/null
+++ b/media-libs/ksanecore-common/ksanecore-common-24.12.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="false"
+KDE_ORG_NAME="${PN/-common/}"
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	!<media-libs/ksanecore-23.08.5-r2:5
+	!<media-libs/ksanecore-24.05.2-r1:6
+"
diff --git a/media-libs/ksanecore/Manifest b/media-libs/ksanecore/Manifest
index dfb7705c0699..389ce932d3e3 100644
--- a/media-libs/ksanecore/Manifest
+++ b/media-libs/ksanecore/Manifest
@@ -1,2 +1,2 @@
 DIST ksanecore-24.08.3.tar.xz 51184 BLAKE2B 285285ece94d8c55a81be2cb932c1e34b2154d04101a4501fb2cc69c310656529eee7e3d612ff12a240009a86d22d5738352dbad408d8a7871fc66c378083077 SHA512 808c220cf01ec9de1fc5e6cf55f873fe6f70f8ab231e59b7c048db5a5b7ecde542e3291798118d0e65b99c4b627e34beceef38948ba208e9dfb2c992e65a06f8
-DIST ksanecore-24.12.0.tar.xz 54372 BLAKE2B 0e4c6c81ce6a0ab3ec02d23473c0e3d8d0c9f4b14b2afd7d9ccd056e0df2c13f3cb124030c937c933cb0b1e7e6d5d735d7216e303219ef628fa69da4d0745011 SHA512 0ac6acfbd7d2e79d4e1a6b0cdf5629f5ab1cc337dbd2dc60a2e3e2c752b599c1a1aac0356674d0d3ef6c4964b8b2774734fb5333a8864e9f90e4ea63b03ebe28
+DIST ksanecore-24.12.1.tar.xz 54388 BLAKE2B 30d9f8775818dfaf51a49ef442d5f3aa6f810430b6258f9c9cb221224b420301a16969c2f7ac9c4e82160adb8a7bc4d96d6604d0c47f51889a7179720f5362e3 SHA512 11171a23e0cc22a7cdba87bd1814e392028084f4c304e2d517547f0d23f92658323dd1ebcd91bd221859fee8be0f61bdc0be260b131198f6137fd5d6991abf26
diff --git a/media-libs/ksanecore/ksanecore-24.12.0.ebuild b/media-libs/ksanecore/ksanecore-24.12.0.ebuild
deleted file mode 100644
index 625b222fc648..000000000000
--- a/media-libs/ksanecore/ksanecore-24.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Qt-based interface for SANE library to control scanner hardware"
-HOMEPAGE="https://invent.kde.org/libraries/ksanecore
-https://api.kde.org/ksanecore/html/index.html"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	media-gfx/sane-backends
-"
-RDEPEND="${DEPEND}
-	>=media-libs/${PN}-common-${PV}
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-}
diff --git a/media-libs/ksanecore/ksanecore-24.12.1.ebuild b/media-libs/ksanecore/ksanecore-24.12.1.ebuild
new file mode 100644
index 000000000000..fdbc5fb5ff8e
--- /dev/null
+++ b/media-libs/ksanecore/ksanecore-24.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Qt-based interface for SANE library to control scanner hardware"
+HOMEPAGE="https://invent.kde.org/libraries/ksanecore
+https://api.kde.org/ksanecore/html/index.html"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	media-gfx/sane-backends
+"
+RDEPEND="${DEPEND}
+	>=media-libs/${PN}-common-${PV}
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index be0a6fe8db35..637d297e7cfb 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -1 +1,2 @@
 DIST lib3mf-2.2.0.tar.gz 16439833 BLAKE2B c98f57ea99f90625f2bfbdbcde9df8dbd8aeccc655e1bd9be165c24b2d9fb74471e4b01c816d8f665e5793db77c7bcf52016f030ec1947f908d6647e9ad12745 SHA512 2a9ee92312396b8966967a7ed696c58c69a77438f94432ad071659adc8c9d12fba34a3cf3d8c8d3ad3b26c12c9a89f4d8645e6f396987dc05b04952b004a1f07
+DIST lib3mf-2.3.2.tar.gz 35247937 BLAKE2B 8e20e44d715a2942dea8b3d08cb18593162bfd12b9f09b82b182e901f6beb76e2c88d83860c39cdd4e4c239e18f6949e9f9fd5921bc8a9d257975c54a8777e26 SHA512 875529759aff6128b32291d0719b95a75a72a3b19f98711b12c9b1076727b231668b3b14604e69bb1fec79b4725fd098f030b7e965072e566bfb061f3086279c
diff --git a/media-libs/lib3mf/files/lib3mf-2.3.2-include-cstdint.patch b/media-libs/lib3mf/files/lib3mf-2.3.2-include-cstdint.patch
new file mode 100644
index 000000000000..13df032b71fc
--- /dev/null
+++ b/media-libs/lib3mf/files/lib3mf-2.3.2-include-cstdint.patch
@@ -0,0 +1,13 @@
+--- a/Source/Common/Platform/NMR_EncryptionHeader.cpp
++++ b/Source/Common/Platform/NMR_EncryptionHeader.cpp
+@@ -8,6 +8,7 @@
+ #include "Common/Platform/NMR_ExportStream.h"
+ 
+ #include "Common/NMR_Architecture_Utils.h"
++#include <cstdint>
+ #include <cstring>
+ 
+ #define LIB3MF_MAXENCRYPTIONHEADERSIZE (1UL << 31)
+-- 
+2.47.1
+
diff --git a/media-libs/lib3mf/files/lib3mf-2.3.2-remove-std-and-opt-flags.patch b/media-libs/lib3mf/files/lib3mf-2.3.2-remove-std-and-opt-flags.patch
new file mode 100644
index 000000000000..0230335b87ec
--- /dev/null
+++ b/media-libs/lib3mf/files/lib3mf-2.3.2-remove-std-and-opt-flags.patch
@@ -0,0 +1,30 @@
+From 057ae273bf223573b7cdb6ec978e051220ffe401 Mon Sep 17 00:00:00 2001
+From: Peter Levine <plevine457@gmail.com>
+Date: Sat, 18 Feb 2023 13:21:29 -0500
+Subject: [PATCH] [Gentoo specific] remove optimization flags and C++ standard
+ flags
+
+Remove the lines in CMakeLists.txt that emit -std=c++11 (as wall as
+emitting -O2) to enable the compiler default, which builds against
+the latest GTest with both clang-16.0.0_pre20230107 and
+gcc-12.2.1_p20230121-r1.
+
+Signed-off-by: Peter Levine <plevine457@gmail.com>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,12 +32,10 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+   # using GCC
+   add_definitions(-DBUILD_DLL)
+   add_compile_options(-Wall)
+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2")
+ elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
+   # using GCC
+   add_definitions(-DBUILD_DLL)
+   add_compile_options(-Wall) 
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2")
+   set(CMAKE_MACOSX_RPATH ON)
+ endif()
+ 
+-- 
+2.39.1
+
diff --git a/media-libs/lib3mf/lib3mf-2.3.2.ebuild b/media-libs/lib3mf/lib3mf-2.3.2.ebuild
new file mode 100644
index 000000000000..c13736d8833e
--- /dev/null
+++ b/media-libs/lib3mf/lib3mf-2.3.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
+HOMEPAGE="https://3mf.io/ https://github.com/3MFConsortium/lib3mf"
+SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+system-act test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libzip:=
+	sys-apps/util-linux
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-cpp/gtest
+		dev-libs/openssl
+		dev-debug/valgrind
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.2-remove-std-and-opt-flags.patch
+	"${FILESDIR}"/${PN}-2.2.0-include-cstdint.patch
+	"${FILESDIR}"/${PN}-2.3.2-include-cstdint.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# DO NOT WANT!
+	rm -r Libraries/libressl || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_INCLUDEDIR="include/${PN}"
+		-DLIB3MF_TESTS=$(usex test)
+		-DUSE_INCLUDED_LIBZIP=OFF
+		-DUSE_INCLUDED_ZLIB=OFF
+		-DSTRIP_BINARIES=OFF
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			# code says it uses libressl, but works with openssl too
+			-DUSE_INCLUDED_SSL=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	for suf in abi types implicit; do
+		dosym -r /usr/include/${PN}/Bindings/Cpp/${PN}_${suf}.hpp /usr/include/${PN}/${PN}_${suf}.hpp
+	done
+}
diff --git a/media-libs/libcdr/libcdr-0.1.8.ebuild b/media-libs/libcdr/libcdr-0.1.8.ebuild
index c12b0b13e2e6..dc4381008e73 100644
--- a/media-libs/libcdr/libcdr-0.1.8.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.8.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,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Library parsing the Corel cdr documents"
diff --git a/media-libs/libdv/Manifest b/media-libs/libdv/Manifest
index 29ddb2bf12e9..7bea02791b2f 100644
--- a/media-libs/libdv/Manifest
+++ b/media-libs/libdv/Manifest
@@ -1,2 +1,3 @@
+DIST libdv-1.0.0-patches.tar.xz 11028 BLAKE2B ea9e69ed3dd59871ec6bcb3692f7fe4c08cee6489279e287648b3a938d3b2785a3c22fc5cac45c9dd732d222d4b7cd585fee144a68dc9cc9fdf08f72f832b344 SHA512 5f2a5b56cadd3544c9ac04b9755eb2d7404e2377ab2e4a383291fbd3a59aff1a99eba40e8098b64c8282ce2bc4c175f66a8dd28e0e73c33824355461164f210a
 DIST libdv-1.0.0-pic.patch.bz2 9771 BLAKE2B b8a597b5fb5facab05845dae1d08a84a17067804ef873b97b7f975a96c622a5cf3b2bbb17d3f5a364dd1aba1afbf3dbf2b18695f9ae8ccf3fcc478b3d7a17a4f SHA512 18fbc341f9a9349f2325c4cbdf2fcf60bf0b35e2efeaacb9a3e541ace4ab2ffcf64d18409b2d76fd40c6096a69ffd151c2bdc8c33411d1640f150202eef12021
 DIST libdv-1.0.0.tar.gz 574565 BLAKE2B 42d17b07501fa508630afd1cdbaee9378f657a4ee4b77666f1a147ddfcf5a9d67d90e0a6da53bfe4f2b5418984579322565c9e8c76516e8193e75bd4751a731c SHA512 19887a6f452fa7da8924901ad841f5c4a434a3bde56c932ddb43717592aa744281e3a8ad220231e11d7e6bc3b0e704952a8324e5f85d4e088675edceeeca7dc8
diff --git a/media-libs/libdv/libdv-1.0.0-r4.ebuild b/media-libs/libdv/libdv-1.0.0-r4.ebuild
deleted file mode 100644
index 657ba4a03421..000000000000
--- a/media-libs/libdv/libdv-1.0.0-r4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="Software codec for dv-format video (camcorders etc)"
-HOMEPAGE="http://libdv.sourceforge.net/"
-SRC_URI="
-	https://downloads.sourceforge.net/${PN}/${P}.tar.gz
-	mirror://gentoo/${PN}-1.0.0-pic.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="dev-libs/popt:="
-DEPEND="
-	${RDEPEND}
-	media-libs/libsdl"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.99-2.6.patch
-	"${WORKDIR}"/${PN}-1.0.0-pic.patch
-	"${FILESDIR}"/${PN}-1.0.0-solaris.patch
-	"${FILESDIR}"/${PN}-1.0.0-darwin.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	append-cppflags "-I${S}"
-}
-
-multilib_src_configure() {
-	# bug #622662
-	tc-ld-disable-gold
-
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		--without-debug \
-		--disable-gtk \
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-
-	if ! multilib_is_native_abi ; then
-		sed -i \
-			-e 's/ encodedv//' \
-			Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libdv/libdv-1.0.0-r5.ebuild b/media-libs/libdv/libdv-1.0.0-r5.ebuild
new file mode 100644
index 000000000000..65413cbfa123
--- /dev/null
+++ b/media-libs/libdv/libdv-1.0.0-r5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Software codec for dv-format video (camcorders etc)"
+HOMEPAGE="http://libdv.sourceforge.net/"
+SRC_URI="
+	https://downloads.sourceforge.net/${PN}/${P}.tar.gz
+	mirror://gentoo/${PN}-1.0.0-pic.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="dev-libs/popt:="
+DEPEND="
+	${RDEPEND}
+	media-libs/libsdl"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.99-2.6.patch
+	"${WORKDIR}"/${PN}-1.0.0-pic.patch
+	"${FILESDIR}"/${PN}-1.0.0-solaris.patch
+	"${FILESDIR}"/${PN}-1.0.0-darwin.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# bug #927212
+	append-cflags -std=gnu89
+	# bug #877709
+	append-cflags -fno-strict-aliasing $(test-flags-CC -fno-aggressive-loop-optimizations)
+	append-cppflags "-I${S}"
+}
+
+multilib_src_configure() {
+	# bug #622662, bug #910291
+	tc-ld-force-bfd
+
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		--without-debug \
+		--disable-gtk \
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+
+	if ! multilib_is_native_abi ; then
+		sed -i \
+			-e 's/ encodedv//' \
+			Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libdv/libdv-1.0.0-r6.ebuild b/media-libs/libdv/libdv-1.0.0-r6.ebuild
new file mode 100644
index 000000000000..b5d1ab4964ed
--- /dev/null
+++ b/media-libs/libdv/libdv-1.0.0-r6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Software codec for dv-format video (camcorders etc)"
+HOMEPAGE="http://libdv.sourceforge.net/"
+SRC_URI="
+	https://downloads.sourceforge.net/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.0.0-patches.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="dev-libs/popt:="
+DEPEND="
+	${RDEPEND}
+	media-libs/libsdl
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-1.0.0-patches/${PN}-0.99-2.6.patch
+	"${WORKDIR}"/${PN}-1.0.0-patches/${PN}-1.0.0-pic.patch
+	"${WORKDIR}"/${PN}-1.0.0-patches/${PN}-1.0.0-solaris.patch
+	"${WORKDIR}"/${PN}-1.0.0-patches/${PN}-1.0.0-darwin.patch
+	"${WORKDIR}"/${PN}-1.0.0-patches/${PN}-1.0.0-c99.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# bug #877709
+	append-cflags -fno-strict-aliasing $(test-flags-CC -fno-aggressive-loop-optimizations)
+	append-cppflags "-I${S}"
+}
+
+multilib_src_configure() {
+	# bug #622662, bug #910291
+	tc-ld-force-bfd
+
+	local myeconfargs=(
+		--without-debug
+		--disable-gtk
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if ! multilib_is_native_abi ; then
+		sed -i \
+			-e 's/ encodedv//' \
+			Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libheif/files/libheif-1.18.1-prepend_DESTDIR_when_generating_heif-convert_symlink.patch b/media-libs/libheif/files/libheif-1.18.1-prepend_DESTDIR_when_generating_heif-convert_symlink.patch
deleted file mode 100644
index aee9049751aa..000000000000
--- a/media-libs/libheif/files/libheif-1.18.1-prepend_DESTDIR_when_generating_heif-convert_symlink.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 337aa421f68c0274eb0db047646160b05fdde4a0 Mon Sep 17 00:00:00 2001
-From: Dirk Farin <dirk.farin@gmail.com>
-Date: Wed, 24 Jul 2024 16:11:43 +0200
-Subject: [PATCH] fix installing heif-convert symlink in DESTDIR (#1249)
-
----
- examples/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index 8ac3114370..fc9d2f2ca0 100644
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -34,7 +34,7 @@ install(FILES heif-dec.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
- 
- # create symbolic link from the old name `heif-convert` to `heif-dec`
- if(NOT WIN32)
--  install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/heif-dec${CMAKE_EXECUTABLE_SUFFIX} ${DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/heif-convert${CMAKE_EXECUTABLE_SUFFIX})")
-+  install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink heif-dec${CMAKE_EXECUTABLE_SUFFIX} \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/heif-convert${CMAKE_EXECUTABLE_SUFFIX})")
- else()
-   install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/heif-dec${CMAKE_EXECUTABLE_SUFFIX} ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/heif-convert${CMAKE_EXECUTABLE_SUFFIX})")
- endif()
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index df752810671b..13f3b30baeb9 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1,3 +1,3 @@
 DIST libopenmpt-0.6.6+release.autotools.tar.gz 1554516 BLAKE2B 21e2fc4252431235608a52d3a321e26eae5d45f2328ff3e3604d84c537d72e07d72346c504901b000af04dfc52b1dd91c79f576be4331ea8685e534a174b61cd SHA512 b634c556f13dc51d1008f4216936a9b7cab25a6fb0d5218da0b692ec848de21905ed1981223ac9ecdebea9ce6c5376e91ff92e1655dd0be491fce0114e3230bf
 DIST libopenmpt-0.7.10+release.autotools.tar.gz 1671289 BLAKE2B 62bd4a1bcd9685fdb92c270687b71609a23986941e301ad17cc37ca5f6b5b76fa1a8f425b2e68603bb29bfa34c3c1caea98faea1d95004f87943b2bed6b7c9a0 SHA512 e5f02b045bc1449791ec43a32216c4c4231edff88b3bda07283c9768118bce3a1f50c2535dbe38a21eb12016294e3b5823ef2f32f2f1e21d40fafe188bad783d
-DIST libopenmpt-0.7.9+release.autotools.tar.gz 1669833 BLAKE2B 9ba6af6df794583748336cc977b20d7bdb3f8d75e32d32a420c5e137511352ea5ec41b31beb7b0df78376dcb0e3a8160a1c527b6f4575b61b945a9f93252fe84 SHA512 e0928d3dc439c3ed7296b97dc8b8e255db22bfd91fd3bc73d0bdca8262a5cb26dff0ba89e508a4443ebe34c34fc880b202a758a11fde31b75e1ebd5725819414
+DIST libopenmpt-0.7.13+release.autotools.tar.gz 1681351 BLAKE2B d75df89e85531e85974bd532773e8ed16440211448790779191a61a629dde33ef7280bcc1c82e6ac6aeb313f7f568bc7a2abe707772801f52c271977b88eff8e SHA512 04e63c635dd6c63c2ce79db4eff971f10e4d14a12c7f143fc317a4b5f5188cd8cbf84fc5121057c2beff3a3e6b9b48767c02b9eb5c569accab3e6ff7322a9690
diff --git a/media-libs/libopenmpt/libopenmpt-0.7.13.ebuild b/media-libs/libopenmpt/libopenmpt-0.7.13.ebuild
new file mode 100644
index 000000000000..875b7213ec44
--- /dev/null
+++ b/media-libs/libopenmpt/libopenmpt-0.7.13.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+MY_P="libopenmpt-${PV}+release.autotools"
+DESCRIPTION="Library to decode tracked music files (modules)"
+HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
+SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="examples mp3 ogg static-libs test vorbis zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	mp3? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
+	ogg? ( media-libs/libogg[${MULTILIB_USEDEP}] )
+	vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+ECONF_SOURCE="${S}"
+
+multilib_src_configure() {
+	# A lot of these optional dependencies relate to openmpt123, which
+	# we package separately, so we disable them here.
+	econf \
+		$(use_enable static-libs static) \
+		--disable-openmpt123 \
+		--disable-examples \
+		$(use_enable test tests) \
+		--disable-doxygen-doc \
+		$(use_with zlib) \
+		$(use_with mp3 mpg123) \
+		$(use_with ogg) \
+		$(use_with vorbis) \
+		$(use_with vorbis vorbisfile) \
+		--without-pulseaudio \
+		--without-portaudio \
+		--without-portaudiocpp \
+		--without-sdl2 \
+		--without-sndfile \
+		--without-flac
+}
+
+multilib_src_install_all() {
+	rm -f \
+		"${ED}"/usr/*/*.la \
+		"${ED}"/usr/share/doc/${P}/LICENSE || die
+
+	if ! use examples; then
+		rm -r "${ED}"/usr/share/doc/${P}/examples || die
+	fi
+}
diff --git a/media-libs/libopenmpt/libopenmpt-0.7.9.ebuild b/media-libs/libopenmpt/libopenmpt-0.7.9.ebuild
deleted file mode 100644
index 03b0016c8652..000000000000
--- a/media-libs/libopenmpt/libopenmpt-0.7.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal
-
-MY_P="libopenmpt-${PV}+release.autotools"
-DESCRIPTION="Library to decode tracked music files (modules)"
-HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
-SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="examples mp3 ogg static-libs test vorbis zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	mp3? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
-	ogg? ( media-libs/libogg[${MULTILIB_USEDEP}] )
-	vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-ECONF_SOURCE="${S}"
-
-multilib_src_configure() {
-	# A lot of these optional dependencies relate to openmpt123, which
-	# we package separately, so we disable them here.
-	econf \
-		$(use_enable static-libs static) \
-		--disable-openmpt123 \
-		--disable-examples \
-		$(use_enable test tests) \
-		--disable-doxygen-doc \
-		$(use_with zlib) \
-		$(use_with mp3 mpg123) \
-		$(use_with ogg) \
-		$(use_with vorbis) \
-		$(use_with vorbis vorbisfile) \
-		--without-pulseaudio \
-		--without-portaudio \
-		--without-portaudiocpp \
-		--without-sdl2 \
-		--without-sndfile \
-		--without-flac
-}
-
-multilib_src_install_all() {
-	rm -f \
-		"${ED}"/usr/*/*.la \
-		"${ED}"/usr/share/doc/${P}/LICENSE || die
-
-	if ! use examples; then
-		rm -r "${ED}"/usr/share/doc/${P}/examples || die
-	fi
-}
diff --git a/media-libs/libopenraw/files/libopenraw-0.3.7-fix-boost-detection.patch b/media-libs/libopenraw/files/libopenraw-0.3.7-fix-boost-detection.patch
new file mode 100644
index 000000000000..1ca47ea5cc90
--- /dev/null
+++ b/media-libs/libopenraw/files/libopenraw-0.3.7-fix-boost-detection.patch
@@ -0,0 +1,12 @@
+--- a/m4/boost.m4
++++ b/m4/boost.m4
+@@ -229,6 +229,9 @@ AC_LANG_POP([C++])dnl
+                     [#include <boost/version.hpp>
+ boost-lib-version = BOOST_LIB_VERSION],
+     [boost_cv_lib_version=`cat conftest.i`])])
++    if test x"$boost_cv_lib_version" = x; then
++      boost_cv_lib_version=$(grep "#define BOOST_LIB_VERSION" /usr/include/boost/version.hpp | sed 's/.*"\(.*\)".*/\1/')
++    fi
+     # e.g. "134" for 1_34_1 or "135" for 1_35
+     boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'`
+     case $boost_major_version in #(
diff --git a/media-libs/libopenraw/libopenraw-0.3.7-r1.ebuild b/media-libs/libopenraw/libopenraw-0.3.7-r1.ebuild
index 4825810f5604..9d8e94968f46 100644
--- a/media-libs/libopenraw/libopenraw-0.3.7-r1.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.3.7-r1.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
@@ -39,6 +39,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.7-slibtool.patch #913723
+	"${FILESDIR}"/${PN}-0.3.7-fix-boost-detection.patch #919349
 )
 
 src_prepare() {
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.6.0.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.6.0.ebuild
index 87d54f232e8c..14d8b87ef7f5 100644
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.6.0.ebuild
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.6.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
@@ -16,7 +16,7 @@ https://invent.kde.org/libraries/libqaccessibilityclient"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 50f56269d436..9be0d64d75df 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,2 +1,3 @@
 DIST SDL2-2.28.5.tar.gz 7345355 BLAKE2B c96481bc02af6b6d077247238f7e46b0e3ec216664584add29cafb0a91d06dc6ddc637a01519dbd7182d4fa59cfaf26ad6733f72583021cf65849416f9c4b698 SHA512 12593eb78fcca877a8dfb78cf21a4e6feba7dc87c964de378ac462b36d8e41ecb587222cb41d5f56dd35b838e1b9867b8ae0cf2f4d2a01afaf23ac8c11edc84d
+DIST SDL2-2.30.11.tar.gz 7585207 BLAKE2B e6038cbf79bec299fae9cfdc4b84ff3e28343abe782942af17e052d7da93111ea04a2ae15b063bfa0ad0d13a1810890dd29d895189f7f417f1bccce715badde1 SHA512 cd4c040ebe4ec74250e32b401a292658353721dda30ad1066522b2a9de9a07560313978880a0bad7e7f5103cc14278fcbe27dbc5a188189e7fb6f097e7308550
 DIST SDL2-2.30.7.tar.gz 7525092 BLAKE2B a494ca856f43009957f62ef4e5d401777c2d1f8518e4cc1a1b9fc9a2efedc5031b9cb5e2965aeb7347821310153cf3abc4c898dd493962fb268c5c55081ed7c3 SHA512 1a16c10f500dea97bd4e4ca5f560fe4ab8e746c975d30751b7cf567868743d105ce84055d480e4c18b290adac485e67d1bb14ae1719644d6e42223d96f299a16
diff --git a/media-libs/libsdl2/libsdl2-2.30.11.ebuild b/media-libs/libsdl2/libsdl2-2.30.11.ebuild
new file mode 100644
index 000000000000..665f62671fd8
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.30.11.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+MY_P="SDL2-${PV}"
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="https://www.libsdl.org/"
+SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 custom-cflags dbus doc fcitx gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test udev +video vulkan wayland X xscreensaver"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	alsa? ( sound )
+	fcitx? ( dbus )
+	gles1? ( video )
+	gles2? ( video )
+	haptic? ( joystick )
+	ibus? ( dbus )
+	jack? ( sound )
+	nas? ( sound )
+	opengl? ( video )
+	pulseaudio? ( sound )
+	sndio? ( sound )
+	test? ( static-libs )
+	vulkan? ( video )
+	wayland? ( gles2 )
+	xscreensaver? ( X )
+"
+
+COMMON_DEPEND="
+	virtual/libiconv[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	ibus? ( app-i18n/ibus )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	kms? (
+		>=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)]
+	)
+	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
+	nas? (
+		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	)
+	opengl? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	)
+	pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.20[${MULTILIB_USEDEP}]
+		gui-libs/libdecor[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2(+),wayland]
+		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	fcitx? ( app-i18n/fcitx:* )
+	gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1(+)] )
+	gles2? ( media-libs/mesa[${MULTILIB_USEDEP},gles2(+)] )
+	vulkan? ( media-libs/vulkan-loader )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	gles1? ( media-libs/libglvnd )
+	gles2? ( media-libs/libglvnd )
+	ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	test? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	vulkan? ( dev-util/vulkan-headers )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen
+		media-gfx/graphviz
+	)
+	wayland? ( >=dev-util/wayland-scanner-1.20 )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/SDL2/SDL_config.h
+	/usr/include/SDL2/SDL_platform.h
+	/usr/include/SDL2/begin_code.h
+	/usr/include/SDL2/close_code.h
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Unbundle some headers.
+	rm -r src/video/khronos || die
+	ln -s "${ESYSROOT}/usr/include" src/video/khronos || die
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+
+	local mycmakeargs=(
+		-DSDL_STATIC=$(usex static-libs)
+		-DSDL_SYSTEM_ICONV=ON
+		-DSDL_GCC_ATOMICS=ON
+		-DSDL_AUDIO=$(usex sound)
+		-DSDL_VIDEO=$(usex video)
+		-DSDL_JOYSTICK=$(usex joystick)
+		-DSDL_HAPTIC=$(usex haptic)
+		-DSDL_POWER=ON
+		-DSDL_FILESYSTEM=ON
+		-DSDL_TIMERS=ON
+		-DSDL_FILE=ON
+		-DSDL_LOADSO=ON
+		-DSDL_ASSEMBLY=ON
+		-DSDL_ALTIVEC=$(usex cpu_flags_ppc_altivec)
+		-DSDL_SSEMATH=$(usex cpu_flags_x86_sse)
+		-DSDL_MMX=$(usex cpu_flags_x86_mmx)
+		-DSDL_3DNOW=$(usex cpu_flags_x86_3dnow)
+		-DSDL_SSE=$(usex cpu_flags_x86_sse)
+		-DSDL_SSE2=$(usex cpu_flags_x86_sse2)
+		-DSDL_SSE3=$(usex cpu_flags_x86_sse3)
+		-DSDL_OSS=$(usex oss)
+		-DSDL_ALSA=$(usex alsa)
+		-DSDL_ALSA_SHARED=OFF
+		-DSDL_JACK=$(usex jack)
+		-DSDL_JACK_SHARED=OFF
+		-DSDL_ESD=OFF
+		-DSDL_PIPEWIRE=$(usex pipewire)
+		-DSDL_PIPEWIRE_SHARED=OFF
+		-DSDL_PULSEAUDIO=$(usex pulseaudio)
+		-DSDL_PULSEAUDIO_SHARED=OFF
+		-DSDL_ARTS=OFF
+		-DSDL_LIBSAMPLERATE=$(usex libsamplerate)
+		-DSDL_LIBSAMPLERATE_SHARED=OFF
+		-DSDL_WERROR=OFF
+		-DSDL_NAS=$(usex nas)
+		-DSDL_NAS_SHARED=OFF
+		-DSDL_SNDIO=$(usex sndio)
+		-DSDL_SNDIO_SHARED=OFF
+		-DSDL_DISKAUDIO=$(usex sound)
+		-DSDL_DUMMYAUDIO=$(usex sound)
+		-DSDL_WAYLAND=$(usex wayland)
+		-DSDL_WAYLAND_SHARED=OFF
+		-DSDL_WAYLAND_LIBDECOR=$(usex wayland)
+		-DSDL_WAYLAND_LIBDECOR_SHARED=OFF
+		-DSDL_RPI=OFF
+		-DSDL_X11=$(usex X)
+		-DSDL_X11_SHARED=OFF
+		-DSDL_X11_XSCRNSAVER=$(usex xscreensaver)
+		-DSDL_COCOA=$(usex aqua)
+		-DSDL_DIRECTFB=OFF
+		-DSDL_FUSIONSOUND=OFF
+		-DSDL_KMSDRM=$(usex kms)
+		-DSDL_KMSDRM_SHARED=OFF
+		-DSDL_DUMMYVIDEO=$(usex video)
+		-DSDL_OPENGL=$(usex opengl)
+		-DSDL_OPENGLES=$(use gles1 || use gles2 && echo ON || echo OFF)
+		-DSDL_VULKAN=$(usex vulkan)
+		-DSDL_LIBUDEV=$(usex udev)
+		-DSDL_DBUS=$(usex dbus)
+		-DSDL_IBUS=$(usex ibus)
+		-DSDL_CCACHE=OFF
+		-DSDL_DIRECTX=OFF
+		-DSDL_RPATH=OFF
+		-DSDL_VIDEO_RENDER_D3D=OFF
+		-DSDL_TESTS=$(usex test)
+	)
+	cmake-multilib_src_configure
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use doc; then
+		cd docs || die
+		doxygen || die
+	fi
+}
+
+src_test() {
+	unset SDL_GAMECONTROLLERCONFIG SDL_GAMECONTROLLER_USE_BUTTON_LABELS
+	cmake-multilib_src_test
+}
+
+multilib_src_install_all() {
+	rm -r "${ED}"/usr/share/licenses/ || die
+	dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md
+	use doc && dodoc -r docs/output/html/
+}
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index 9187fef08c5a..1dde5c9e14c8 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,2 +1 @@
-DIST libtgvoip-2.4.4_p20221208.tar.gz 1098020 BLAKE2B 6f1eae38e4396ca3b88ab4337176a6076d5f9008b2a865cd286265a9b73d83d44c2cc6828b65dcb580a897a19badeab502395e2128a15c276ae796ac1ab0da68 SHA512 62243629890b1c13f1dbbffae4f82964a0fe23d2071852730674ccbef31126c6e205cfa526f07ba1549ef8eae31e371fb4335ce5f95fd649560bee2b3b530e64
 DIST libtgvoip-2.4.4_p20240706.tar.gz 1089879 BLAKE2B 0b0b83d4c43b18ab6af0cfd2795887180c4cb89d2b4ca22680a472e61c4908a4d2634fcb14677702bc9dc10e0df8d61029e0d361aa53303940cfbec36516afee SHA512 80d09c3e2a02461a2e71855ef086d453c4a95829c8183c7768f390bef82ab2124a3059931a043704e010d5e9ca512ee3001eb054dd3903f84ab51970e52e2ef4
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20221208-r1.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20221208-r1.ebuild
deleted file mode 100644
index 77f3eb6081f8..000000000000
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20221208-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic autotools
-
-DESCRIPTION="VoIP library for Telegram clients"
-HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
-
-LIBTGVOIP_COMMIT="0ffe2e51bfe14b533b860002f1c2e87e5f8c00c0"
-SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${LIBTGVOIP_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv"
-IUSE="+dsp +alsa pulseaudio"
-
-DEPEND="
-	dev-libs/openssl:=
-	media-libs/opus
-	alsa? ( media-libs/alsa-lib )
-	dsp? ( media-libs/tg_owt:= )
-	pulseaudio? ( media-libs/libpulse )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-REQUIRED_USE="
-	|| ( alsa pulseaudio )
-"
-
-src_prepare() {
-	# Will be controlled by us
-	sed -i -e '/^CFLAGS += -DTGVOIP_NO_DSP/d' Makefile.am || die
-	# https://bugs.gentoo.org/717210
-	echo 'libtgvoip_la_LIBTOOLFLAGS = --tag=CXX' >> Makefile.am || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Not using the CMake build despite being the preferred one, because
-	# it's lacking relevant configure options.
-	local myconf=(
-		--disable-dsp  # WebRTC is linked from tg_owt
-		$(use_with alsa)
-		$(use_with pulseaudio pulse)
-	)
-	if use dsp; then
-		append-cppflags "-I${ESYSROOT}/usr/include/tg_owt"
-		append-cppflags "-I${ESYSROOT}/usr/include/tg_owt/third_party/abseil-cpp"
-		append-libs '-ltg_owt'
-	else
-		append-cppflags '-DTGVOIP_NO_DSP'
-	fi
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.4.4-r1.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.4.4-r1.ebuild
new file mode 100644
index 000000000000..42b21fba8de1
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.4.4-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VA-API (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.5.4:=[${MULTILIB_USEDEP}]
+	>=media-libs/libva-2.22.0[X?,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.3.4-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-23.3.4_testing_in_src_test.patch
+	"${FILESDIR}"/${PN}-24.4.4-c23-fix.patch
+)
+
+multilib_src_configure() {
+	# https://github.com/intel/media-driver/issues/356
+	append-cxxflags -D_FILE_OFFSET_BITS=64
+
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
+		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.4.4.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.4.4.ebuild
deleted file mode 100644
index 10dc34ee39cf..000000000000
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.4.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	MY_PV="${PV%_pre}"
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~amd64"
-	fi
-fi
-
-DESCRIPTION="Intel Media Driver for VA-API (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD redistributable? ( no-source-code )"
-SLOT="0"
-IUSE="+redistributable test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-22.5.0:=[${MULTILIB_USEDEP}]
-	>=media-libs/libva-2.22.0[X?,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-23.3.4-Remove-unwanted-CFLAGS.patch
-	"${FILESDIR}"/${PN}-23.3.4_testing_in_src_test.patch
-	"${FILESDIR}"/${PN}-24.4.4-c23-fix.patch
-)
-
-multilib_src_configure() {
-	# https://github.com/intel/media-driver/issues/356
-	append-cxxflags -D_FILE_OFFSET_BITS=64
-
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
-		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-	)
-	local CMAKE_BUILD_TYPE="Release"
-	cmake_src_configure
-}
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index 343e7ed8c609..ddc7213143ea 100644
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-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
@@ -29,7 +29,7 @@ IUSE="+redistributable test X"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=media-libs/gmmlib-22.3.20:=[${MULTILIB_USEDEP}]
+DEPEND=">=media-libs/gmmlib-22.5.4:=[${MULTILIB_USEDEP}]
 	>=media-libs/libva-2.21.0[X?,${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
diff --git a/media-libs/libvisio/libvisio-0.1.8.ebuild b/media-libs/libvisio/libvisio-0.1.8.ebuild
index 3b50dc5240e3..57de08828523 100644
--- a/media-libs/libvisio/libvisio-0.1.8.ebuild
+++ b/media-libs/libvisio/libvisio-0.1.8.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
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libvisio/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Library parsing the file format of MS Visio documents"
diff --git a/media-libs/libxmp/Manifest b/media-libs/libxmp/Manifest
index 42c8b59f01ee..21e83d20a29c 100644
--- a/media-libs/libxmp/Manifest
+++ b/media-libs/libxmp/Manifest
@@ -1,2 +1 @@
-DIST libxmp-4.5.0.tar.gz 652983 BLAKE2B f583c309b4c4349eec73352d16bbd9b2b20fb48be101f0cba34a3597fce903442fbc203be50f940a7e3b8f53cc1bbf6ff91236fc27c6ec70b21ec17ad71bd6fb SHA512 71a57c7fcd696267c6e2d3cc12b43fe09adce9ed83f9f130755d3b2c2b984eb52e4ae4fad115ffeb07397c7cc4886fc3c4e01cbb1f047449228f7a557760cb1a
 DIST libxmp-4.6.0.tar.gz 738532 BLAKE2B d383cb2e8c15c27e9f55954a4ae2ead6978b7e073e647ab667a2c0bb15848ff582626611b3f274ac5075bcdb7b5cfdc1a4f95d2ea76dc0ea64dab595ba8ca1b8 SHA512 d287544c9b569515f1a3fa92d8d930097b252e84f86cba5dd70e9b4460d0fa70754ece45dcc7ec314e434d821b43207d700afb12c9df80b467d73e9d029baafe
diff --git a/media-libs/libxmp/libxmp-4.5.0.ebuild b/media-libs/libxmp/libxmp-4.5.0.ebuild
deleted file mode 100644
index 24a6655017f5..000000000000
--- a/media-libs/libxmp/libxmp-4.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Library that renders module files to PCM data"
-HOMEPAGE="https://github.com/libxmp/libxmp"
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/libxmp/libxmp.git"
-else
-	SRC_URI="https://github.com/libxmp/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-IUSE=""
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_compile() {
-	emake V=1
-}
diff --git a/media-libs/libxmp/libxmp-4.6.0.ebuild b/media-libs/libxmp/libxmp-4.6.0.ebuild
index 780d3b51010e..17788270ae6b 100644
--- a/media-libs/libxmp/libxmp-4.6.0.ebuild
+++ b/media-libs/libxmp/libxmp-4.6.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
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/libxmp/libxmp.git"
 else
 	SRC_URI="https://github.com/libxmp/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 # bzip2 depacker code is 0BSD
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index afa1f80c9ec1..699cd187b474 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,6 +2,7 @@ DIST mesa-24.1.7.tar.xz 29206724 BLAKE2B b3102fcf96c032d07826186c2d60dc93e5c17b2
 DIST mesa-24.2.8.tar.xz 29622208 BLAKE2B f71a1663f9637883b4c442ba8c68f7960c48c4f8a02412738404386bfb962052923b40c1412198bd29f2ab6cf11654f8c63d4c14a400b89d99229680bc96eaae SHA512 3aa1051a72e1428e42f9537d8f6a26f2ebddc78894e0f71d2cdcc9ed555ea4d6489ad8e74d4c59b8cdf7ea1c629fa725ac2fe1e385db5d3a582d8fe8186392d6
 DIST mesa-24.3.1.tar.xz 30611028 BLAKE2B d3efc322388e29f651b15b0396fef8a6acc0cf24881165900845e429dd6cb53d51511f174d6a4017f48962b764b9a42f069825196af9f4ca969a4b46e1108a0e SHA512 deecf58e2c31e35d7c1943bb21184b52133a83fa472925128d3a03a57b26c92a476a6d3f7140ef2b78475b66affdabf97436ee8b324be204ce5bb940f78119c8
 DIST mesa-24.3.2.tar.xz 30640276 BLAKE2B d5973506983a23a95c360801a591e13945695e9a0c6f9f3bbb953865aa39ccfabaae624f4cd1edc8ecf479710856f5cc08e4f6374b107a06870906e934ecc5b8 SHA512 ea1065f7b466f1b2b3570c87585d6de15e3784a60d920c9f991c22720197d5947b598ac2c76773bed8150c91360ee5bbc77f3b48780a19502a8c4224baa728b9
+DIST mesa-24.3.3.tar.xz 30657916 BLAKE2B b973227885b3fd5fa6267c150a5e174f5e8a1c6378cf9326845ba75332084d7c914917c8e3b6d7b89f49ede0f5a5b453eb1ce42591e98b0cbad3f85bd3040035 SHA512 280d7a6dd64503ec398d449430270c78b5558c03bfeed3a42346573fd2db1aa3f96f5a212e49288718a7fe27447ee40235b066517622d68b0dfdd7b251a4e85f
 DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee
 DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
diff --git a/media-libs/mesa/mesa-24.2.8.ebuild b/media-libs/mesa/mesa-24.2.8.ebuild
index 83d5147a4b1c..4e9ede781732 100644
--- a/media-libs/mesa/mesa-24.2.8.ebuild
+++ b/media-libs/mesa/mesa-24.2.8.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
@@ -476,6 +476,15 @@ multilib_src_configure() {
 	fi
 }
 
+multilib_src_compile() {
+	if [[ ${ABI} == x86 ]]; then
+		# Bug 939803
+		BINDGEN_EXTRA_CLANG_ARGS="-m32" meson_src_compile
+	else
+		meson_src_compile
+	fi
+}
+
 multilib_src_test() {
 	meson_src_test -t 100
 }
diff --git a/media-libs/mesa/mesa-24.3.2.ebuild b/media-libs/mesa/mesa-24.3.2.ebuild
index 11cf7cc6900c..7846e415a4f5 100644
--- a/media-libs/mesa/mesa-24.3.2.ebuild
+++ b/media-libs/mesa/mesa-24.3.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
@@ -471,6 +471,15 @@ multilib_src_configure() {
 	fi
 }
 
+multilib_src_compile() {
+	if [[ ${ABI} == x86 ]]; then
+		# Bug 939803
+		BINDGEN_EXTRA_CLANG_ARGS="-m32" meson_src_compile
+	else
+		meson_src_compile
+	fi
+}
+
 multilib_src_test() {
 	meson_src_test -t 100
 }
diff --git a/media-libs/mesa/mesa-24.3.3.ebuild b/media-libs/mesa/mesa-24.3.3.ebuild
new file mode 100644
index 000000000000..94823cb3517c
--- /dev/null
+++ b/media-libs/mesa/mesa-24.3.3.ebuild
@@ -0,0 +1,502 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..19} )
+LLVM_OPTIONAL=1
+CARGO_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain
+
+MY_P="${P/_/-}"
+
+CRATES="
+	syn@2.0.68
+	proc-macro2@1.0.86
+	quote@1.0.33
+	unicode-ident@1.0.12
+	paste@1.0.14
+"
+
+RUST_MIN_VER="1.74.1"
+RUST_OPTIONAL=1
+
+inherit cargo
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="
+		https://archive.mesa3d.org/${MY_P}.tar.xz
+	"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+fi
+
+# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
+# but there are "stale" distfiles on the mirrors with the wrong names.
+# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+
+RADEON_CARDS="r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS}
+	d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl
+	vivante vmware zink"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	cpu_flags_x86_sse2 d3d9 debug +llvm
+	lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
+	test unwind vaapi valgrind vdpau vulkan
+	wayland +X xa +zstd"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	d3d9? (
+		|| (
+			video_cards_freedreno
+			video_cards_intel
+			video_cards_nouveau
+			video_cards_panfrost
+			video_cards_r300
+			video_cards_r600
+			video_cards_radeonsi
+			video_cards_vmware
+			video_cards_zink
+		)
+	)
+	llvm? ( ${LLVM_REQUIRED_USE} )
+	video_cards_lavapipe? ( llvm vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_zink? ( vulkan opengl )
+	video_cards_nvk? ( vulkan video_cards_nouveau )
+	vdpau? ( X )
+	xa? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		$(llvm_gen_dep "
+			llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+			opencl? (
+				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
+				llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+				=llvm-core/libclc-\${LLVM_SLOT}*[spirv(-)]
+			)
+		")
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+	opencl? (
+		>=virtual/opencl-3
+		llvm-core/libclc[spirv(-)]
+		>=dev-util/spirv-tools-1.3.231.0
+		virtual/libelf:0=
+	)
+	vaapi? (
+		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] )
+	video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
+	video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
+	)
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+DEPEND="${RDEPEND}
+	video_cards_d3d12? ( >=dev-util/directx-headers-1.614.1[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-debug/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.38 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		${RUST_DEPEND}
+		>=dev-util/bindgen-0.58.0
+	)
+	>=dev-build/meson-1.4.1
+	app-alternatives/yacc
+	app-alternatives/lex
+	virtual/pkgconfig
+	$(python_gen_any_dep "
+		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
+		dev-python/packaging[\${PYTHON_USEDEP}]
+		dev-python/pyyaml[\${PYTHON_USEDEP}]
+	")
+	video_cards_intel? (
+		~dev-util/intel_clc-${PV}
+		llvm-core/libclc[spirv(-)]
+		$(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
+	)
+	vulkan? (
+		dev-util/glslang
+		video_cards_nvk? (
+			>=dev-util/bindgen-0.68.1
+			>=dev-util/cbindgen-0.26.0
+			${RUST_DEPEND}
+		)
+	)
+	wayland? ( dev-util/wayland-scanner )
+"
+
+QA_WX_LOAD="
+x86? (
+	usr/lib/libglapi.so.0.0.0
+	usr/lib/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${MY_P}.tar.xz
+	fi
+
+	# We need this because we cannot tell meson to use DISTDIR yet
+	pushd "${DISTDIR}" >/dev/null || die
+	mkdir -p "${S}"/subprojects/packagecache || die
+	local i
+	for i in *.crate; do
+		ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die
+	done
+	popd >/dev/null || die
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_lavapipe &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_nvk &&
+		   ! use video_cards_panfrost &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d &&
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
+		fi
+	fi
+
+	# VA
+	if use vaapi; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, intel, nouveau, or vmware"
+		fi
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
+	if use llvm && use vulkan && use video_cards_intel && use amd64; then
+		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version llvm-core/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_intel ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	use llvm && llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+
+	if use opencl || (use vulkan && use video_cards_nvk); then
+		rust_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
+		bin/symbols-check.py || die # bug #830728
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	# bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
+	filter-lto
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use video_cards_freedreno ||
+	   use video_cards_intel || # crocus i915 iris
+	   use video_cards_nouveau ||
+	   use video_cards_panfrost ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_vmware || # svga
+	   use video_cards_zink; then
+		emesonargs+=($(meson_use d3d9 gallium-nine))
+	else
+		emesonargs+=(-Dgallium-nine=false)
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_nouveau ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_virgl; then
+		emesonargs+=($(meson_feature vaapi gallium-va))
+		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+	else
+		emesonargs+=(-Dgallium-va=disabled)
+	fi
+
+	if use video_cards_d3d12; then
+		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_nouveau ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_virgl; then
+		emesonargs+=($(meson_feature vdpau gallium-vdpau))
+	else
+		emesonargs+=(-Dgallium-vdpau=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_intel ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_feature xa gallium-xa))
+	else
+		emesonargs+=(-Dgallium-xa=disabled)
+	fi
+
+	gallium_enable !llvm softpipe
+	gallium_enable llvm llvmpipe
+	gallium_enable video_cards_d3d12 d3d12
+	gallium_enable video_cards_freedreno freedreno
+	gallium_enable video_cards_intel crocus i915 iris
+	gallium_enable video_cards_lima lima
+	gallium_enable video_cards_nouveau nouveau
+	gallium_enable video_cards_panfrost panfrost
+	gallium_enable video_cards_v3d v3d
+	gallium_enable video_cards_vc4 vc4
+	gallium_enable video_cards_virgl virgl
+	gallium_enable video_cards_vivante etnaviv
+	gallium_enable video_cards_vmware svga
+	gallium_enable video_cards_zink zink
+
+	gallium_enable video_cards_r300 r300
+	gallium_enable video_cards_r600 r600
+	gallium_enable video_cards_radeonsi radeonsi
+	if ! use video_cards_r300 &&
+	   ! use video_cards_r600; then
+		gallium_enable video_cards_radeon r300 r600
+	fi
+
+	if use llvm && use opencl; then
+		PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
+		# See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
+		emesonargs+=(
+			$(meson_native_true gallium-rusticl)
+			-Drust_std=2021
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_d3d12 microsoft-experimental
+		vulkan_enable video_cards_freedreno freedreno
+		vulkan_enable video_cards_intel intel intel_hasvk
+		vulkan_enable video_cards_lavapipe swrast
+		vulkan_enable video_cards_panfrost panfrost
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+		vulkan_enable video_cards_vc4 broadcom
+		vulkan_enable video_cards_virgl virtio
+		if use video_cards_nvk; then
+			vulkan_enable video_cards_nvk nouveau
+			if ! multilib_is_native_abi; then
+				echo -e "[binaries]\nrust = ['rustc', '--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini"
+				emesonargs+=(
+					--native-file "${T}"/rust_fix.ini
+				)
+			fi
+		fi
+
+		emesonargs+=(-Dvulkan-layers=device-select,overlay)
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	if use opengl && use X; then
+		emesonargs+=(-Dglx=dri)
+	else
+		emesonargs+=(-Dglx=disabled)
+	fi
+
+	if [[ "${ABI}" == amd64 ]]; then
+		emesonargs+=($(meson_feature video_cards_intel intel-rt))
+	fi
+
+	use debug && EMESON_BUILDTYPE=debug
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dshared-glapi=enabled
+		-Dexpat=enabled
+		$(meson_use opengl)
+		$(meson_feature opengl gbm)
+		$(meson_feature opengl gles1)
+		$(meson_feature opengl gles2)
+		$(meson_feature opengl glvnd)
+		$(meson_feature opengl egl)
+		$(meson_feature llvm)
+		$(meson_feature lm-sensors lmsensors)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature unwind libunwind)
+		$(meson_feature zstd)
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		-Dintel-clc=$(usex video_cards_intel system auto)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+
+	if ! multilib_is_native_abi && use video_cards_nvk; then
+		sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' build.ninja || die
+	fi
+}
+
+multilib_src_compile() {
+	if [[ ${ABI} == x86 ]]; then
+		# Bug 939803
+		BINDGEN_EXTRA_CLANG_ARGS="-m32" meson_src_compile
+	else
+		meson_src_compile
+	fi
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 11cf7cc6900c..904b6f9e4a67 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-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
@@ -92,6 +92,7 @@ REQUIRED_USE="
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
 RDEPEND="
 	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-1.3.231.0[${MULTILIB_USEDEP}]
 	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}]
 	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
@@ -101,6 +102,7 @@ RDEPEND="
 			opencl? (
 				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
 				llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+				=llvm-core/libclc-\${LLVM_SLOT}*[spirv(-)]
 			)
 		")
 		video_cards_r600? (
@@ -114,7 +116,6 @@ RDEPEND="
 	opencl? (
 		>=virtual/opencl-3
 		llvm-core/libclc[spirv(-)]
-		>=dev-util/spirv-tools-1.3.231.0
 		virtual/libelf:0=
 	)
 	vaapi? (
@@ -471,6 +472,15 @@ multilib_src_configure() {
 	fi
 }
 
+multilib_src_compile() {
+	if [[ ${ABI} == x86 ]]; then
+		# Bug 939803
+		BINDGEN_EXTRA_CLANG_ARGS="-m32" meson_src_compile
+	else
+		meson_src_compile
+	fi
+}
+
 multilib_src_test() {
 	meson_src_test -t 100
 }
diff --git a/media-libs/nas/nas-1.9.5-r2.ebuild b/media-libs/nas/nas-1.9.5-r2.ebuild
index 8fb0b91a04be..e548bf7f0d89 100644
--- a/media-libs/nas/nas-1.9.5-r2.ebuild
+++ b/media-libs/nas/nas-1.9.5-r2.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
@@ -50,6 +50,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# Ancient configure and relies on imake, not worth it
+	append-cflags -std=gnu89
+
 	# -Werror=lto-type-mismatch
 	# https://bugs.gentoo.org/859934
 	# https://sourceforge.net/p/nas/bugs/13/
@@ -60,6 +63,9 @@ multilib_src_configure() {
 	econf
 	popd || die
 
+	# bug #947416
+	unset MAKEOPTS GNUMAKEFLAGS
+
 	local cpp=($(get_abi_CHOST ${DEFAULT_ABI})-gcc $(get_abi_CFLAGS) -E) #884203
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
 		IMAKECPP="${IMAKECPP:-${cpp[*]}}" \
diff --git a/media-libs/oidn/oidn-2.3.0.ebuild b/media-libs/oidn/oidn-2.3.0.ebuild
index ab3c94b0c162..7df9eab58658 100644
--- a/media-libs/oidn/oidn-2.3.0.ebuild
+++ b/media-libs/oidn/oidn-2.3.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 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/RenderKit/${PN}/releases/download/v${PV}/${P}.src.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 851acadd4dae..e3d5bbb88ea8 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1 +1,2 @@
 DIST openal-soft-1.24.1.tar.bz2 991155 BLAKE2B 7fbf0e63a46a5f2eacee00bcc28746ded5b950aba580ae041825d3b47a33be757668faad5e7c3eced8983416f4a946dc7bddba69699a56470ace0d6ff6e3762c SHA512 1d2d17c94708b0a63a965b26ad960fe6f2201db2c729b6ba564dd0c2b50f0b1d0733c4448b0d2d1b3e22436fb2d7daf5f285071b7234511e3eb4abfe5fa1f223
+DIST openal-soft-1.24.2.tar.bz2 1020760 BLAKE2B d87b470570006b0e3b9f6662ba50db67eb154713d13968e05015f70c12a73f6199cfe13cbe6fd9797081c970cc37e1de1680ecf2606015d09b8eedc27abcc343 SHA512 5ac05fb20b414dfe50e6ac80a69d1e36db5588fd2ccef2606ae1f3b6fc155881d45826031660123101a31469e24bc2bea42993d81b28dd5f18d0d0463988fa65
diff --git a/media-libs/openal/openal-1.24.2.ebuild b/media-libs/openal/openal-1.24.2.ebuild
new file mode 100644
index 000000000000..644abf92c14c
--- /dev/null
+++ b/media-libs/openal/openal-1.24.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# False positives because of REQUIRE vs BACKEND options() (conditionally set)
+# See bug #809314
+CMAKE_WARN_UNUSED_CLI=no
+inherit cmake-multilib
+
+MY_P="${PN}-soft-${PV}"
+
+DESCRIPTION="A software implementation of the OpenAL 3D audio API"
+HOMEPAGE="https://www.openal-soft.org/"
+SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
+S="${WORKDIR}"/${MY_P}
+
+# See https://github.com/kcat/openal-soft/blob/e0097c18b82d5da37248c4823fde48b6e0002cdd/BSD-3Clause
+# Some components are under BSD
+LICENSE="LGPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="
+	alsa coreaudio debug jack oss pipewire portaudio pulseaudio sdl sndio qt5
+	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
+	cpu_flags_arm_neon
+"
+
+# PipeWire:
+# - See bug #863200 for PipeWire minimum version
+# - PW is in DEPEND although not linked against because we need configure to
+# find it anyway, but no :=.
+RDEPEND="
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	pipewire? ( media-video/pipewire[${MULTILIB_USEDEP}] )
+	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	oss? ( virtual/os-headers )
+"
+
+DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		# See bug #809314 for getting both options for backends
+		-DALSOFT_{BACKEND,REQUIRE}_ALSA=$(usex alsa)
+		-DALSOFT_{BACKEND,REQUIRE}_COREAUDIO=$(usex coreaudio)
+		-DALSOFT_{BACKEND,REQUIRE}_JACK=$(usex jack)
+		-DALSOFT_{BACKEND,REQUIRE}_OSS=$(usex oss)
+		-DALSOFT_{BACKEND,REQUIRE}_PIPEWIRE=$(usex pipewire)
+		-DALSOFT_{BACKEND,REQUIRE}_PORTAUDIO=$(usex portaudio)
+		-DALSOFT_{BACKEND,REQUIRE}_PULSEAUDIO=$(usex pulseaudio)
+		-DALSOFT_{BACKEND,REQUIRE}_SDL2=$(usex sdl)
+		-DALSOFT_{BACKEND,REQUIRE}_SNDIO=$(usex sndio)
+
+		-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
+		-DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
+		 # EXAMPLES=OFF to avoid FFmpeg dependency, bug #481670
+		-DALSOFT_EXAMPLES=OFF
+	)
+
+	# Avoid unused variable warnings, bug #738240
+	if use amd64 || use x86 ; then
+		mycmakeargs+=(
+			-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
+			-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
+			-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		)
+	elif use arm || use arm64 ; then
+		mycmakeargs+=(
+			-DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon)
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 0371cd99d4a2..fb8577191f3a 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,3 +1,2 @@
-DIST opencolorio-2.1.3.tar.gz 11024701 BLAKE2B bcd1eb6a74260f451e49ef40e729bfc4c354ab255d96c261fbf865c586f285fe876ed54b05276f3b6b25ece4fd261672fe1dd519041ffad77d7c78efc8cf161d SHA512 b26fcfa3ea12ab6e4b019a13ce79ebcfd215c674acb348f2d9f85f749b2a5beccd395ed1cc9954e4b3cb83a160b24a8d7d81994ac1d9ea8cfe074b81d6b8a061
-DIST opencolorio-2.2.1.tar.gz 11336775 BLAKE2B b463d6a0a7e7fec0a890fa8a0cd06ed269f925c5986dfb82eb53728a09d884c89e6c4dfe112706ce27351d4440909ff9680387028d1dc887e7d866b30c39c54f SHA512 d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9
 DIST opencolorio-2.3.2.tar.gz 11443450 BLAKE2B 2573d2f229ba0349574d83883cd6534853164dc6a5866b203b65d4c0acbc54fc0aaf6ff4ecbec5506c6adafe48d57fb80a8b47c45b7b16e0c4ac94f5fbaffea3 SHA512 4c7547960623b058398a86d9c8335d31f2354a1ee7ba58fbc2d1ace698132b99e8f823c9b443a77545721da076569228f502f1f3f4deba44659571c6d12db133
+DIST opencolorio-2.4.1.tar.gz 11386201 BLAKE2B b56df7d708dbd8e0b46e9e56ea779614b99412d052372d29b9e2b4c8188bc303f19f3f04ba3e40249fff08e1aa1d5924003757b2944cad3cc7c8b18ba33f8f98 SHA512 dfa616e79da13016d7c0f007a4ad77f793241a7eac18baf65272b5edf8c61f49423a8e0f9f29be170b396014f6b9f4f2789330a5a7608c7c78e858eab622fd4c
diff --git a/media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch b/media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch
deleted file mode 100644
index 0bf00862e51b..000000000000
--- a/media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://src.fedoraproject.org/rpms/OpenColorIO/raw/rawhide/f/OCIO-strlen.patch
-https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/4fa94918c2cf572dcaf61ca07016f3b5c231c14c
-https://bugs.gentoo.org/841479
---- a/src/OpenColorIO/FileRules.cpp
-+++ b/src/OpenColorIO/FileRules.cpp
-@@ -3,6 +3,7 @@
- 
- #include <algorithm>
- #include <cctype>
-+#include <cstring>
- #include <map>
- #include <regex>
- #include <sstream>
-
diff --git a/media-libs/opencolorio/files/opencolorio-2.1.2-musl-strtol.patch b/media-libs/opencolorio/files/opencolorio-2.1.2-musl-strtol.patch
deleted file mode 100644
index 87059614ff03..000000000000
--- a/media-libs/opencolorio/files/opencolorio-2.1.2-musl-strtol.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# Fix strtol_l missing on musl. On musl libc use strtol
-# Taken from Alpine Linux, please refer:
-# https://git.alpinelinux.org/aports/tree/community/opencolorio/0002-fix-strtol.patch?id=dd7ba461824ab0618f0493cbb450b221fdc2513c
-# Please refer: https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1624
---- a/src/utils/NumberUtils.h
-+++ b/src/utils/NumberUtils.h
-@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
-     tempval = ::strtod_l(first, &endptr, loc.local);
- #endif
-
--    if (errno != 0)
-+    if (errno != 0 && errno != EINVAL)
-     {
-         return {first + (endptr - first), std::errc::result_out_of_range};
-     }
-@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
-     long int
- #ifdef _WIN32
-     tempval = _strtol_l(first, &endptr, 0, loc.local);
--#else
-+#elif defined(__GLIBC__)
-     tempval = ::strtol_l(first, &endptr, 0, loc.local);
-+#else
-+    tempval = ::strtol(first, &endptr, 0);
- #endif
-
-     if (errno != 0)
diff --git a/media-libs/opencolorio/files/opencolorio-2.2.1-support-doxygen-1.9.7.patch b/media-libs/opencolorio/files/opencolorio-2.2.1-support-doxygen-1.9.7.patch
deleted file mode 100644
index b3b4db802e96..000000000000
--- a/media-libs/opencolorio/files/opencolorio-2.2.1-support-doxygen-1.9.7.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/94da59daeb4647faa9b134665ad156f37cfa021d
-
-From 94da59daeb4647faa9b134665ad156f37cfa021d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Achard?= <remiachard@gmail.com>
-Date: Tue, 30 May 2023 19:33:25 +0100
-Subject: [PATCH] Fix documentation build on Doxygen 1.9.7
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: RĂ©mi Achard <remiachard@gmail.com>
----
- include/OpenColorIO/OpenColorIO.h    | 29 ++++++----------------------
- include/OpenColorIO/OpenColorTypes.h | 25 +++++-------------------
- 2 files changed, 11 insertions(+), 43 deletions(-)
-
-diff --git a/include/OpenColorIO/OpenColorIO.h b/include/OpenColorIO/OpenColorIO.h
-index 313b9c631..1352771ff 100644
---- a/include/OpenColorIO/OpenColorIO.h
-+++ b/include/OpenColorIO/OpenColorIO.h
-@@ -733,11 +733,8 @@ class OCIOEXPORT Config
-     const char * getRoleColorSpace(const char * roleName) const noexcept;
- 
-     /**
--     * \defgroup Methods related to displays and views.
--     * @{
--     */
--
--    /**
-+     * Methods related to displays and views.
-+     *
-      * The following methods only manipulate active displays and views. Active
-      * displays and views are defined from an env. variable or from the config file.
-      *
-@@ -854,11 +851,8 @@ class OCIOEXPORT Config
-     /// Clear all the displays.
-     void clearDisplays();
- 
--    /** @} */
--
-     /**
--     * \defgroup Methods related to the Virtual Display.
--     * @{
-+     * Methods related to the Virtual Display.
-      *
-      *  ...  (See descriptions for the non-virtual methods above.)
-      *
-@@ -938,8 +932,6 @@ class OCIOEXPORT Config
-      */
-     int instantiateDisplayFromICCProfile(const char * ICCProfileFilepath);
- 
--    /** @} */
--
-     /**
-      * \brief
-      * 
-@@ -1087,8 +1079,7 @@ class OCIOEXPORT Config
-     void clearViewTransforms();
- 
-     /**
--     * \defgroup Methods related to named transforms.
--     * @{
-+     * Methods related to named transforms.
-      */
- 
-     /**
-@@ -1131,8 +1122,6 @@ class OCIOEXPORT Config
-     /// Clear all named transforms.
-     void clearNamedTransforms();
- 
--    /** @} */
--
-     // 
-     // File Rules
-     //
-@@ -2051,8 +2040,7 @@ class OCIOEXPORT ColorSpaceSet
-     const Impl * getImpl() const { return m_impl; }
- };
- 
--/** \defgroup ColorSpaceSetOperators
-- *  @{
-+/** ColorSpaceSetOperators
-  */
- 
- /**
-@@ -2092,8 +2080,6 @@ extern OCIOEXPORT ConstColorSpaceSetRcPtr operator&&(const ConstColorSpaceSetRcP
- extern OCIOEXPORT ConstColorSpaceSetRcPtr operator-(const ConstColorSpaceSetRcPtr & lcss,
-                                                     const ConstColorSpaceSetRcPtr & rcss);
- 
--/** @}*/
--
- 
- //
- // Look
-@@ -3669,8 +3655,7 @@ class OCIOEXPORT SystemMonitors
-     virtual bool isSupported() const noexcept = 0;
- 
-     /**
--     * \defgroup Methods to access some information of the attached and active monitors.
--     * @{
-+     * Methods to access some information of the attached and active monitors.
-      */
- 
-     /// Get the number of active monitors reported by the operating system.
-@@ -3687,8 +3672,6 @@ class OCIOEXPORT SystemMonitors
-     /// Get the ICC profile path associated to the monitor.
-     virtual const char * getProfileFilepath(size_t idx) const = 0;
- 
--    /** @} */
--
- protected:
-     SystemMonitors() = default;
-     virtual ~SystemMonitors() = default;
-diff --git a/include/OpenColorIO/OpenColorTypes.h b/include/OpenColorIO/OpenColorTypes.h
-index c400568ea..0df8310e9 100644
---- a/include/OpenColorIO/OpenColorTypes.h
-+++ b/include/OpenColorIO/OpenColorTypes.h
-@@ -726,8 +726,7 @@ extern OCIOEXPORT ExposureContrastStyle ExposureContrastStyleFromString(const ch
- extern OCIOEXPORT const char * NegativeStyleToString(NegativeStyle style);
- extern OCIOEXPORT NegativeStyle NegativeStyleFromString(const char * style);
- 
--/** \defgroup Env. variables.
-- *  @{
-+/** Env. variables.
-  *
-  * These environmental variables are used by the OpenColorIO library.
-  * For variables that allow specifying more than one token, they should be separated by commas.
-@@ -776,10 +775,7 @@ extern OCIOEXPORT const char * OCIO_OPTIMIZATION_FLAGS_ENVVAR;
-  */
- extern OCIOEXPORT const char * OCIO_USER_CATEGORIES_ENVVAR;
- 
--/** @}*/
--
--/** \defgroup VarsRoles
-- *  @{
-+/** VarsRoles
-  */
- 
- // TODO: Move to .rst
-@@ -852,10 +848,7 @@ extern OCIOEXPORT const char * ROLE_INTERCHANGE_SCENE;
-  */
- extern OCIOEXPORT const char * ROLE_INTERCHANGE_DISPLAY;
- 
--/** @}*/
--
--/** \defgroup VarsSharedView
-- *  @{
-+/** VarsSharedView
-  */
- 
- /*!rst::
-@@ -870,10 +863,7 @@ Shared View
-  */
- extern OCIOEXPORT const char * OCIO_VIEW_USE_DISPLAY_NAME;
- 
--/** @}*/
--
--/** \defgroup VarsFormatMetadata
-- *  @{
-+/** VarsFormatMetadata
-  */
- 
- // TODO: Move to .rst
-@@ -929,10 +919,7 @@ extern OCIOEXPORT const char * METADATA_NAME;
-  */
- extern OCIOEXPORT const char * METADATA_ID;
- 
--/** @}*/
--
--/** \defgroup VarsCaches
-- *  @{
-+/** VarsCaches
-  */
- 
- /*!rst::
-@@ -963,8 +950,6 @@ extern OCIOEXPORT const char * OCIO_DISABLE_PROCESSOR_CACHES;
- // variable to disable the fallback.
- extern OCIOEXPORT const char * OCIO_DISABLE_CACHE_FALLBACK;
- 
--/** @}*/
--
- 
- // Archive config feature
- // Default filename (with extension) of an config.
diff --git a/media-libs/opencolorio/files/opencolorio-2.2.1-support-minizip-ng-4.patch b/media-libs/opencolorio/files/opencolorio-2.2.1-support-minizip-ng-4.patch
deleted file mode 100644
index 8ee4ceaf9970..000000000000
--- a/media-libs/opencolorio/files/opencolorio-2.2.1-support-minizip-ng-4.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-# From https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1806
-From d15ccddd4d20d66749577d7444de861112f6864c Mon Sep 17 00:00:00 2001
-From: Brad Smith <brad@comstyle.com>
-Date: Thu, 29 Jun 2023 09:57:28 -0400
-Subject: [PATCH] Add support for minizip-ng 4 API
-
-Signed-off-by: Brad Smith <brad@comstyle.com>
----
- src/OpenColorIO/OCIOZArchive.cpp | 22 +++++++++++++++++++++-
- src/apps/ocioarchive/main.cpp    |  4 ++++
- 2 files changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/src/OpenColorIO/OCIOZArchive.cpp b/src/OpenColorIO/OCIOZArchive.cpp
-index 85fc7bb76..24d836e95 100644
---- a/src/OpenColorIO/OCIOZArchive.cpp
-+++ b/src/OpenColorIO/OCIOZArchive.cpp
-@@ -225,7 +225,11 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c
-     std::string configStr = ss.str();
- 
-     // Write zip to memory stream.
-+#if MZ_VERSION_BUILD >= 040000
-+    write_mem_stream = mz_stream_mem_create();
-+#else
-     mz_stream_mem_create(&write_mem_stream);
-+#endif
-     mz_stream_mem_set_grow_size(write_mem_stream, 128 * 1024);
-     mz_stream_open(write_mem_stream, NULL, MZ_OPEN_MODE_CREATE);
- 
-@@ -237,7 +241,11 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c
-     options.compress_level  = ArchiveCompressionLevels::BEST;
- 
-     // Create the writer handle.
-+#if MZ_VERSION_BUILD >= 040000
-+    archiver = mz_zip_writer_create();
-+#else
-     mz_zip_writer_create(&archiver);
-+#endif
- 
-     // Archive options.
-     // Compression method
-@@ -332,7 +340,11 @@ void ExtractOCIOZArchive(const char * archivePath, const char * destination)
-     std::string outputDestination = pystring::os::path::normpath(destination);
- 
-     // Create zip reader.
-+#if MZ_VERSION_BUILD >= 040000
-+    extracter = mz_zip_reader_create();
-+#else
-     mz_zip_reader_create(&extracter);
-+#endif
- 
-     MinizipNgHandlerGuard extracterGuard(extracter, false, false);
- 
-@@ -450,7 +462,11 @@ std::vector<uint8_t> getFileStringFromArchiveFile(const std::string & filepath,
-     std::vector<uint8_t> buffer;
- 
-     // Create the reader object.
-+#if MZ_VERSION_BUILD >= 040000
-+    reader = mz_zip_reader_create();
-+#else
-     mz_zip_reader_create(&reader);
-+#endif
- 
-     MinizipNgHandlerGuard extracterGuard(reader, false, true);
- 
-@@ -510,7 +526,11 @@ void getEntriesMappingFromArchiveFile(const std::string & archivePath,
-     void *reader = NULL;
- 
-     // Create the reader object.
-+#if MZ_VERSION_BUILD >= 040000
-+    reader = mz_zip_reader_create();
-+#else
-     mz_zip_reader_create(&reader);
-+#endif
- 
-     MinizipNgHandlerGuard extracterGuard(reader, false, false);
- 
-diff --git a/src/apps/ocioarchive/main.cpp b/src/apps/ocioarchive/main.cpp
-index 190cadee5..68054a6da 100644
---- a/src/apps/ocioarchive/main.cpp
-+++ b/src/apps/ocioarchive/main.cpp
-@@ -235,7 +235,11 @@ int main(int argc, const char **argv)
-         }
- 
-         std::string path = args[0];
-+#if MZ_VERSION_BUILD >= 040000
-+        reader = mz_zip_reader_create();
-+#else
-         mz_zip_reader_create(&reader);
-+#endif
-         struct tm tmu_date;
-         
-         err = mz_zip_reader_open_file(reader, path.c_str());
diff --git a/media-libs/opencolorio/opencolorio-2.1.3.ebuild b/media-libs/opencolorio/opencolorio-2.1.3.ebuild
deleted file mode 100644
index 93f7922f06b6..000000000000
--- a/media-libs/opencolorio/opencolorio-2.1.3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="Color management framework for visual effects and animation"
-HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO"
-SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/OpenColorIO-${PV}"
-
-LICENSE="BSD"
-# TODO: drop .1 on next SONAME bump (2.1 -> 2.2?) as we needed to nudge it
-# to force rebuild of consumers due to changing to openexr 3 changing API.
-SLOT="0/$(ver_cut 1-2).1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
-IUSE="cpu_flags_x86_sse2 doc opengl python test"
-REQUIRED_USE="
-	doc? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Restricting tests, bugs #439790 and #447908
-RESTRICT="test"
-
-# Works with older OIIO but need to force a version w/ OpenEXR 3
-RDEPEND="
-	dev-cpp/pystring
-	dev-python/pybind11
-	<dev-cpp/yaml-cpp-0.8.0:=
-	>=dev-libs/imath-3.1.4-r2:=
-	dev-libs/tinyxml
-	opengl? (
-		media-libs/lcms:2
-		>=media-libs/openimageio-2.3.12.0-r3:=
-		media-libs/glew:=
-		media-libs/freeglut
-		virtual/opengl
-	)
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/testresources[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.1-gcc12.patch
-	"${FILESDIR}"/${PN}-2.1.2-musl-strtol.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
-	sed -i -e "s|ARCHIVE DESTINATION lib|ARCHIVE DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
-
-	# Avoid automagic test dependency on OSL, bug #833933
-	# Can cause problems during e.g. OpenEXR unsplitting migration
-	cmake_run_in tests cmake_comment_add_subdirectory osl
-}
-
-src_configure() {
-	# Missing features:
-	# - Truelight and Nuke are not in portage for now, so their support are disabled
-	# - Java bindings was not tested, so disabled
-	# Notes:
-	# - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
-	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
-	local mycmakeargs=(
-		-DOCIO_USE_OPENEXR_HALF=OFF
-		-DOCIO_BUILD_DOCS=$(usex doc)
-		-DOCIO_BUILD_APPS=$(usex opengl)
-		-DOCIO_BUILD_PYTHON=$(usex python)
-		-DOCIO_PYTHON_VERSION="${EPYTHON/python/}"
-		-DOCIO_BUILD_JAVA=OFF
-		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
-		-DOCIO_BUILD_TESTS=$(usex test)
-		-DOCIO_BUILD_GPU_TESTS=$(usex test)
-		-DOCIO_BUILD_FROZEN_DOCS=$(usex doc)
-		-DOCIO_INSTALL_EXT_PACKAGES=NONE
-	)
-
-	# We need this to work around asserts that can trigger even in proper use cases.
-	# See https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1235
-	append-flags -DNDEBUG
-
-	cmake_src_configure
-}
diff --git a/media-libs/opencolorio/opencolorio-2.2.1.ebuild b/media-libs/opencolorio/opencolorio-2.2.1.ebuild
deleted file mode 100644
index df00e5138051..000000000000
--- a/media-libs/opencolorio/opencolorio-2.2.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake python-single-r1 virtualx
-
-DESCRIPTION="Color management framework for visual effects and animation"
-HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO"
-SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/OpenColorIO-${PV}"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)"
-# minizip-ng: ~arm ~arm64 ~ppc64 ~riscv
-# osl: ~riscv
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apps cpu_flags_x86_sse2 doc opengl python test"
-# TODO: drop opengl? It does nothing without building either the apps or the testsuite
-REQUIRED_USE="
-	apps? ( opengl )
-	doc? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( opengl )
-"
-
-RDEPEND="
-	dev-cpp/pystring
-	<dev-cpp/yaml-cpp-0.8.0:=
-	dev-libs/expat
-	>=dev-libs/imath-3.1.5:=
-	sys-libs/minizip-ng
-	sys-libs/zlib
-	apps? (
-		media-libs/lcms:2
-		>=media-libs/openexr-3.1.5:=
-	)
-	opengl? (
-		media-libs/freeglut
-		media-libs/glew:=
-		media-libs/libglvnd
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
-	)
-"
-DEPEND="${RDEPEND}"
-# TODO: OSL tests would need OIIO, leading to a circular dependency. If OIIO
-# isn't found this test will be skipped (automagic if found?)
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen
-		$(python_gen_cond_dep '
-			dev-python/breathe[${PYTHON_USEDEP}]
-			dev-python/recommonmark[${PYTHON_USEDEP}]
-			dev-python/six[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-press-theme[${PYTHON_USEDEP}]
-			dev-python/sphinx-tabs[${PYTHON_USEDEP}]
-			dev-python/testresources[${PYTHON_USEDEP}]
-		')
-	)
-	opengl? (
-		media-libs/freeglut
-		media-libs/glew:=
-		media-libs/libglvnd
-	)
-"
-# 	test? (
-# 		>=media-libs/openimageio-2.2.14
-# 		>=media-libs/osl-1.11
-# 	)
-# "
-
-# Restricting tests, bugs #439790 and #447908
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.1-adjust-python-installation.patch"
-	"${FILESDIR}/${PN}-2.2.1-support-minizip-ng-4.patch"
-	"${FILESDIR}/${PN}-${PV}-support-doxygen-1.9.7.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Avoid automagic test dependency on OSL, bug #833933
-	# Can cause problems during e.g. OpenEXR unsplitting migration
-	cmake_run_in tests cmake_comment_add_subdirectory osl
-}
-
-src_configure() {
-	# Missing features:
-	# - Truelight and Nuke are not in portage for now, so their support are disabled
-	# - Java bindings was not tested, so disabled
-	# Notes:
-	# - OpenImageIO or OpenEXR (default) is required for building ociodisplay and
-	#	ocioconvert (USE opengl)
-	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
-	local mycmakeargs=(
-		-DOCIO_BUILD_APPS=$(usex apps)
-		-DOCIO_BUILD_DOCS=$(usex doc)
-		-DOCIO_BUILD_FROZEN_DOCS=$(usex doc)
-		-DOCIO_BUILD_GPU_TESTS=$(usex test)
-		-DOCIO_BUILD_JAVA=OFF
-		-DOCIO_BUILD_PYTHON=$(usex python)
-		-DOCIO_BUILD_TESTS=$(usex test)
-		-DOCIO_INSTALL_EXT_PACKAGES=NONE
-		-DOCIO_USE_OIIO_CMAKE_CONFIG=ON
-		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
-	)
-	use python && mycmakeargs+=(
-		-DOCIO_PYTHON_VERSION="${EPYTHON/python/}"
-		-DPython_EXECUTABLE="${PYTHON}"
-		-DPYTHON_VARIANT_PATH=$(python_get_sitedir)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		# there are already files in ${ED}/usr/share/doc/${PF}
-		mv "${ED}/usr/share/doc/OpenColorIO/"* "${ED}/usr/share/doc/${PF}" || die
-		rmdir "${ED}/usr/share/doc/OpenColorIO" || die
-	fi
-}
-
-src_test() {
-	virtx cmake_src_test
-}
diff --git a/media-libs/opencolorio/opencolorio-2.4.1.ebuild b/media-libs/opencolorio/opencolorio-2.4.1.ebuild
new file mode 100644
index 000000000000..86d1cc4b9e7f
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-2.4.1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake python-single-r1 virtualx
+
+DESCRIPTION="Color management framework for visual effects and animation"
+HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO"
+SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenColorIO-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+# minizip-ng: ~arm ~arm64 ~ppc64 ~riscv
+# osl: ~riscv
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+CPU_USE=(
+	x86_{avx,avx2,avx512f,f16c,sse2,sse3,sse4_1,sse4_2,ssse3}
+	# requires https://github.com/DLTcollab/sse2neon
+	# arm_neon
+)
+IUSE="apps ${CPU_USE[*]/#/cpu_flags_} doc opengl python test"
+# TODO: drop opengl? It does nothing without building either the apps or the testsuite
+REQUIRED_USE="
+	apps? ( opengl )
+	doc? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( opengl )
+"
+
+RDEPEND="
+	dev-cpp/pystring
+	>=dev-cpp/yaml-cpp-0.7.0:=
+	dev-libs/expat
+	>=dev-libs/imath-3.1.5:=
+	sys-libs/minizip-ng
+	sys-libs/zlib
+	apps? (
+		media-libs/lcms:2
+		>=media-libs/openexr-3.1.5:=
+	)
+	opengl? (
+		media-libs/freeglut
+		media-libs/glew:=
+		media-libs/libglvnd
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
+	)
+"
+DEPEND="${RDEPEND}"
+# TODO: OSL tests would need OIIO, leading to a circular dependency. If OIIO
+# isn't found this test will be skipped (automagic if found?)
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen
+		$(python_gen_cond_dep '
+			dev-python/breathe[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-press-theme[${PYTHON_USEDEP}]
+			dev-python/sphinx-tabs[${PYTHON_USEDEP}]
+			dev-python/testresources[${PYTHON_USEDEP}]
+		')
+	)
+	opengl? (
+		media-libs/freeglut
+		media-libs/glew:=
+		media-libs/libglvnd
+	)
+"
+# 	test? (
+# 		>=media-libs/openimageio-2.2.14
+# 		>=media-libs/osl-1.11
+# 	)
+# "
+
+# Restricting tests, bugs #439790 and #447908
+# compares floating point numbers for bit equality
+# compares floating point number string representations for equality
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1361 Apr 4, 2021
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1784 Apr 3, 2023
+RESTRICT="test" #"!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.1-adjust-python-installation.patch"
+	"${FILESDIR}/${PN}-2.3.2-include-cstdint.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Avoid automagic test dependency on OSL, bug #833933
+	# Can cause problems during e.g. OpenEXR unsplitting migration
+	cmake_run_in tests cmake_comment_add_subdirectory osl
+}
+
+src_configure() {
+	# Missing features:
+	# - Truelight and Nuke are not in portage for now, so their support are disabled
+	# - Java bindings was not tested, so disabled
+	# Notes:
+	# - OpenImageIO or OpenEXR (default) is required for building ociodisplay and
+	#	ocioconvert (USE opengl)
+	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
+	local mycmakeargs=(
+		"-DOCIO_BUILD_APPS=$(usex apps)"
+		"-DOCIO_BUILD_DOCS=$(usex doc)"
+		"-DOCIO_BUILD_FROZEN_DOCS=$(usex doc)"
+		"-DOCIO_BUILD_GPU_TESTS=$(usex test)"
+		"-DOCIO_BUILD_JAVA=OFF"
+		"-DOCIO_BUILD_PYTHON=$(usex python)"
+		"-DOCIO_BUILD_TESTS=$(usex test)"
+		"-DOCIO_INSTALL_EXT_PACKAGES=NONE"
+		# allow the user to tell OCIO to display more information when searching and building the dependencies.
+		# "-DOCIO_VERBOSE=YES"
+
+		"-DOCIO_USE_SIMD=ON"
+	)
+
+	if use amd64 || use x86 ; then
+		mycmakeargs+=(
+			"-DOCIO_USE_SSE2=$(usex cpu_flags_x86_sse2)"
+			"-DOCIO_USE_SSE3=$(usex cpu_flags_x86_sse3)"
+			"-DOCIO_USE_SSSE3=$(usex cpu_flags_x86_ssse3)"
+			"-DOCIO_USE_SSE4=$(usex cpu_flags_x86_sse4_1)"
+			"-DOCIO_USE_SSE42=$(usex cpu_flags_x86_sse4_2)"
+			"-DOCIO_USE_AVX=$(usex cpu_flags_x86_avx)"
+			"-DOCIO_USE_AVX2=$(usex cpu_flags_x86_avx2)"
+			"-DOCIO_USE_AVX512=$(usex cpu_flags_x86_avx512f)"
+			"-DOCIO_USE_F16C=$(usex cpu_flags_x86_f16c)"
+		)
+	fi
+
+	# requires https://github.com/DLTcollab/sse2neon
+	# if use arm || use arm64 ; then
+	# 	mycmakeargs+=(
+	# 		"-DOCIO_USE_SSE2NEON=$(usex cpu_flags_arm_neon)"
+	# 	)
+	# fi
+
+	use python && mycmakeargs+=(
+		"-DOCIO_PYTHON_VERSION=${EPYTHON/python/}"
+		"-DPython_EXECUTABLE=${PYTHON}"
+		"-DPYTHON_VARIANT_PATH=$(python_get_sitedir)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		-j1
+	)
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		# there are already files in ${ED}/usr/share/doc/${PF}
+		mv "${ED}/usr/share/doc/OpenColorIO/"* "${ED}/usr/share/doc/${PF}" || die
+		rmdir "${ED}/usr/share/doc/OpenColorIO" || die
+	fi
+}
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 8db8ddc087ef..4bb3003623f7 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.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
@@ -63,7 +63,7 @@ else
 			https://github.com/${PN}/${PN}_extra/archive/refs/tags/${PV}.tar.gz -> ${PN}_extra-${PV}.tar.gz
 		)
 	"
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index a8416e9c9951..d12a5a4deed2 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,2 +1,3 @@
 DIST openexr-3.2.4.tar.gz 18856440 BLAKE2B f29910b2e36808b741860bf603571f607ca929672b3c5b9de7c7c16242f2a38d02627614c10e7b01a8cfd8804923636eb0dfe2c798ec3ff63252dd20e3f8e535 SHA512 ecc3d8b206bda5e5897ac9cd797a8432b76981de10d49cbb107af2b4108c22186de0dda25a9a43b07e18d641ef71508445d95f659a4ca932e029d48ee029a492
+DIST openexr-3.3.2.tar.gz 21324765 BLAKE2B 82e67953b75da0d27347260099ccae249f5b1946b78eccc383e9278f57565ed5cb9f0fa17385f0c5cdb3815d647197be3661372f9896e10596a8723ea3d8414b SHA512 0c43337fda2979b328202488a43711afb5d680781c933aa0d74970a3dcda1135fbd01228cb10e81e4628c0d19da2d3e5b781e147d609cdc8a796d2a51a90932f
 DIST openexr-images-1.0.tar.gz 252222962 BLAKE2B d57c458dfbd1b08c964429022b6e08a3309bf11cbd43c64e271ebc620dae6dbe70636e5221f47dabd7fe2aa0806f2cf3f3c9b3f55fd7f45b0a34f3e62b6029e7 SHA512 c1c83a26cd326d0fcda824daccb0044abad46f29e1bd2ceb1c38bc62b3e71f0aeef126dddc4517eb1cb9f7c9d0fe234276a48a754bdb7c7823e9aee459d8670a
diff --git a/media-libs/openexr/openexr-3.3.2-r1.ebuild b/media-libs/openexr/openexr-3.3.2-r1.ebuild
new file mode 100644
index 000000000000..6b2d064c0df0
--- /dev/null
+++ b/media-libs/openexr/openexr-3.3.2-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_PN=OpenEXR
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://openexr.com/"
+SRC_URI="
+	https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		utils? (
+			https://github.com/AcademySoftwareFoundation/openexr-images/archive/refs/tags/v1.0.tar.gz
+				-> openexr-images-1.0.tar.gz
+		)
+	)
+"
+
+LICENSE="BSD"
+SLOT="0/32" # based on SONAME
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="~amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
+REQUIRED_USE="doc? ( utils )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/libdeflate:=[zlib(+)]
+	>=dev-libs/imath-3.1.6:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( sys-apps/help2man )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-bintests-iff-utils.patch"
+)
+
+DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md )
+
+src_prepare() {
+	# Fix path for testsuite
+	sed -e "s:/var/tmp/:${T}:" \
+		-i "${S}"/src/test/${MY_PN}Test/tmpDir.h || die "failed to set temp path for tests"
+
+	sed -e "s:if(INSTALL_DOCS):if(OPENEXR_INSTALL_DOCS):" \
+		-i docs/CMakeLists.txt || die
+
+	cmake_src_prepare
+
+	if use test && use utils; then
+		IMAGES=(
+			Beachball/multipart.0001.exr
+			Beachball/singlepart.0001.exr
+			Chromaticities/Rec709.exr
+			Chromaticities/Rec709_YC.exr
+			Chromaticities/XYZ.exr
+			Chromaticities/XYZ_YC.exr
+			LuminanceChroma/Flowers.exr
+			LuminanceChroma/Garden.exr
+			MultiResolution/ColorCodedLevels.exr
+			MultiResolution/WavyLinesCube.exr
+			MultiResolution/WavyLinesLatLong.exr
+			MultiView/Adjuster.exr
+			TestImages/GammaChart.exr
+			TestImages/GrayRampsHorizontal.exr
+			v2/LeftView/Balls.exr
+			v2/Stereo/Trunks.exr
+		)
+
+		mkdir -p "${BUILD_DIR}/src/test/bin" || die
+
+		for image in "${IMAGES[@]}"; do
+			mkdir -p "${BUILD_DIR}/src/test/bin/$(dirname "${image}")" || die
+			cp -a "${WORKDIR}/openexr-images-1.0/${image}" "${BUILD_DIR}/src/test/bin/${image}" || die
+		done
+	fi
+
+}
+
+src_configure() {
+	if use x86; then
+		replace-cpu-flags native i686
+	fi
+
+	local mycmakeargs=(
+		-DOPENEXR_CXX_STANDARD="17"
+
+		-DBUILD_SHARED_LIBS="yes"
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_WEBSITE="no"
+
+		-DOPENEXR_BUILD_EXAMPLES="$(usex examples)"
+		-DOPENEXR_BUILD_PYTHON="no"
+		-DOPENEXR_BUILD_TOOLS="$(usex utils)"
+		-DOPENEXR_ENABLE_LARGE_STACK="$(usex large-stack)"
+		-DOPENEXR_ENABLE_THREADING="$(usex threads)"
+
+		-DOPENEXR_INSTALL="yes"
+		-DOPENEXR_INSTALL_DOCS="$(usex doc)"
+		-DOPENEXR_INSTALL_PKG_CONFIG="yes"
+		-DOPENEXR_INSTALL_TOOLS="$(usex utils)"
+
+		-DOPENEXR_USE_CLANG_TIDY="no" # don't look for clang-tidy
+
+		-DOPENEXR_FORCE_INTERNAL_DEFLATE="no"
+		-DOPENEXR_FORCE_INTERNAL_IMATH="no"
+	)
+	if use test; then
+		# OPENEXR_RUN_FUZZ_TESTS depends on BUILD_TESTING, see
+		#   - https://bugs.gentoo.org/925128
+		#   - https://openexr.com/en/latest/install.html#component-options
+
+		# NOTE: the fuzz tests are very slow
+		mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS="ON" )
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=()
+
+	use arm64 && CMAKE_SKIP_TESTS+=(
+		# bug #922247
+		'OpenEXRCore.testDWAACompression'
+		'OpenEXRCore.testDWABCompression'
+	)
+	use x86 && CMAKE_SKIP_TESTS+=(
+		'^OpenEXR.testDwaLookups$'
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	use examples && docompress -x "/usr/share/doc/${PF}/examples"
+
+	cmake_src_install
+}
diff --git a/media-libs/openh264/openh264-2.5.0.ebuild b/media-libs/openh264/openh264-2.5.0.ebuild
index d3155eb44b00..c9c4693d7c06 100644
--- a/media-libs/openh264/openh264-2.5.0.ebuild
+++ b/media-libs/openh264/openh264-2.5.0.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # (2.2.0 needed a minor bump due to undocumented but breaking ABI changes, just to be sure.
 #  https://github.com/cisco/openh264/issues/3459 )
 SLOT="0/7"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc64 ~riscv ~sparc x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin test utils"
 
 RESTRICT="bindist !test? ( test )"
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index e75ca4b50a4c..1d817bd5b805 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -5,8 +5,11 @@ DIST file003.fits 581760 BLAKE2B 35d77c64ff9e25f34593ea41839a4f7712dc344d12ab2c0
 DIST file009.fits 25920 BLAKE2B 594061eba4d48da8cbfee58ab592a0adb5a22d681228330e84f60304e5146a8856e9c65b763d6d8e2136217ebe85d92128318cccfcf6358c7bc767232c6382c9 SHA512 57d53622854399aed96efbeff78e700990b2fc63c4dbd1bc9ac58c7670af98d528db2f1a3e9de4e74b977f8318109b465b46423bbac36bf2bf34a1e33e7dcdb8
 DIST file012.fits 1019520 BLAKE2B e86d9e0004ca159d9a5ae0585776db65c7dd49162cb5dbd8b511686244950e33746d8a41f60b5ba8fcea220194fa87e16235adb7ccc0b4fb4b0a61e6c5c376a8 SHA512 45439544da478b24ccbcf14dc9a651aa8ecbce29b9992204d85c1eee42bc88b68802ec57bc148510da1e062de95ee53dd5c64c9bfa2e0b6cdfd945a78d1fc76a
 DIST openimageio-2.5.13.1.tar.gz 52538869 BLAKE2B ceba0bde73cbf2b5b7b243fa1dc4806aece881c37775418c3305d5e5665e1c249219cad2c7b0d9d4acd5955897dc13dfb94e4627e9ae866e6400559b99e7021a SHA512 3c9eb9a361464e73fae518b704438bbf409c846031f05026d8b9ace91431819ac80674130ccd2300deb9756ae26e150bf5c0a866be3f3fb65bdfba0ba60395ab
+DIST openimageio-2.5.18.0.tar.gz 52549475 BLAKE2B 8a3f61f6089b304202e829a28946ec8c0bc84e05e61b84dd39f1e036614faab005619962c0217248208e133595f55fa8ffea1d931710a88eff8208b8c36fa2ae SHA512 ab6ef20fe099c19ec8cce1308890e76ec82c4bcdc1d5a2ead8c44f04593c060e819fededb958b7f36ccd0118b1aae9b1c5e12b442f7e066e940b4e32d378f7d9
+DIST openimageio-oexr-test-image-d45a2d5a890d6963b94479c7a644440068c37dd2.tar.gz 263237088 BLAKE2B 9445464b6d75d4800b843bd4a4f88404f587ca4ed384a0c1d428d5a249c04af0c610a95660aac5edff22c003c067e3a907d4a0896d7cfb20731cb486e436f17d SHA512 bbfd8e40eedd26955bc97789bfdfd556ee9ed652babc1c9c60c3cda6e5cab05a0a813323f25bc536132498a2bf3185a07020cd1170c047b72973e2be3e10fe19
 DIST openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz 252131865 BLAKE2B f5f2477897f84148574cdd02b673c7bdff49d8f45026375095bb6f184230466e2e60020be7583e5a5aa0aa9c971e7251979d3eeb2ee620d47342b1e4435427e0 SHA512 e89c2935496c5fec2ebe1175e9b9bd3aecb23374ec3947057195ee6d31a883c1a67c4dc754bf0a5b68859093b5e169b70ffabd4736cf67f9e3dc09f3299fc54f
 DIST openimageio-oiio-test-image-7d821f02c848022b2ee703d6bee48ca2acbfae70.tar.gz 141224552 BLAKE2B e185f6b2bd345ca0740d1ac7bc48e5a283a80db0d2fa88566367e1179e96d048ac371708db29a6591d0c4eb7f9c171af22bac30fd68bc223e2c373db3b99077d SHA512 a3c9e4151c946b79e2eb37cd53fd2865d6117431ad06e4e35d42c10d9ff8415224e2f20e14af8dd869ec2a6c6faf4f9d8ef28e5b6556c88a54398de4a8843b59
+DIST openimageio-oiio-test-image-7e6d875542b5bc1b2974b7cbecee115365a36527.tar.gz 143496336 BLAKE2B b08d42834f60abd14a64b442e30ec4f80f4bb8095177ffd1ba94240a4c9a3947cdd36f98cd967667e8a5d52fe490a214ad4cd58a836a4acd39bbe1a744eacb8b SHA512 f4f0612b4b3600fbb1ef30b4f196139a300f36e6a8290ee6a49fe0fa86072e2becf3d9e5f32c060b2ed04c0946848976bead62b352996fb8286f9969daf764d1
 DIST tst0001.fits 43200 BLAKE2B 7d9d82fde64c3b21f8f86be6feaf9187d48c2c504c9afc0e652015512fb3d9e04c0f78596cdc9d7cc54815175549bfdf01d2d80f894cd36f4e6284aaf065dcc8 SHA512 b401accd51b56a493e2ec52fe4441e05cbefa3d03fe0e1c6834327094ab9f8e0c69a0f2cff26007ed7c7f8686a78a3a7e043d945f3a93c1b68e03668b8cbdc5c
 DIST tst0003.fits 152640 BLAKE2B 74c38c9f6cd65a46eff865589bd319111187d123c90bedc80f934caf6625f20120ecb30e8f5210c7d5d6609964e63fc2c2fc59f60bf609a07f2440421f44356e SHA512 4cd9c9a96fd3a5b8daae7d6b34af4c68c965abc4cc825aaaf9f3587a43328f468595ff1cd210e9fbca365bd52bf31a70abf39b2b3966d3087dd3af40ba0781a4
 DIST tst0005.fits 48960 BLAKE2B ef8bb62702f579c8500721835100e150b2ca73272866a88457589d6f14b407efb41d106be2d454089dae00c04b903bb874132d5b44852245e6d4372ed20c7b6f SHA512 515a4dbca51e5b7fa0139b369066c02fcfa96eeffb471c6f5073343ab50da527ee610d9b677e6fabdaad1b7f9f9c68bd65eb71c5b944e5ffacf429d01fe14a39
diff --git a/media-libs/openimageio/files/openimageio-2.5.18.0-tests-optional.patch b/media-libs/openimageio/files/openimageio-2.5.18.0-tests-optional.patch
new file mode 100644
index 000000000000..e9fb9a4b1911
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-2.5.18.0-tests-optional.patch
@@ -0,0 +1,31 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Make fits test images download optional
+Make j2k test images download optional
+
+diff --git a/src/cmake/testing.cmake b/src/cmake/testing.cmake
+index b671def..ff84b7d 100644
+--- a/src/cmake/testing.cmake
++++ b/src/cmake/testing.cmake
+@@ -271,9 +271,11 @@ macro (oiio_add_all_tests)
+                     IMAGEDIR oiio-images URL "Recent checkout of OpenImageIO-images")
+     oiio_add_tests (jpeg2000
+                     FOUNDVAR OPENJPEG_FOUND
++                    ENABLEVAR ENABLE_OPENJPEG
+                     IMAGEDIR oiio-images URL "Recent checkout of OpenImageIO-images")
+     oiio_add_tests (jpeg2000-j2kp4files
+                     FOUNDVAR OPENJPEG_FOUND
++                    ENABLEVAR ENABLE_OPENJPEG
+                     IMAGEDIR j2kp4files_v1_5
+                     URL http://www.itu.int/net/ITU-T/sigdb/speimage/ImageForm-s.aspx?val=10100803)
+     set (all_openexr_tests
+@@ -410,6 +410,10 @@ function (oiio_setup_test_data)
+     oiio_get_test_data (openexr-images
+                         REPO https://github.com/AcademySoftwareFoundation/openexr-images.git
+                         BRANCH main)
++    if(ENABLE_FITS)
+     oiio_get_test_data (fits-images)
++    endif()
++    if(ENABLE_OPENJPEG)
+     oiio_get_test_data (j2kp4files_v1_5)
++    endif()
+ endfunction ()
diff --git a/media-libs/openimageio/openimageio-2.5.18.0.ebuild b/media-libs/openimageio/openimageio-2.5.18.0.ebuild
new file mode 100644
index 000000000000..a036d8cbe26c
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.5.18.0.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+TEST_OIIO_IMAGE_COMMIT="7e6d875542b5bc1b2974b7cbecee115365a36527"
+TEST_OEXR_IMAGE_COMMIT="d45a2d5a890d6963b94479c7a644440068c37dd2"
+inherit cmake flag-o-matic python-single-r1 virtualx
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="
+	https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		 -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+		 -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+		jpeg2k? ( https://www.itu.int/wftp3/Public/t/testsignal/SpeImage/T803/v2002_11/J2KP4files.zip )
+
+		fits? (
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file001.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file002.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file003.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file009.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file012.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0001.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0003.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0005.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0006.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0007.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0008.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0013.fits
+		)
+	)
+"
+S="${WORKDIR}/OpenImageIO-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
+
+IUSE="dicom doc ffmpeg fits gif gui jpeg2k opencv openvdb ptex python raw test +tools +truetype ${CPU_FEATURES[*]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools ) test? ( tools truetype )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	jpeg2k? ( app-arch/unzip )
+	doc? (
+		app-text/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	dev-libs/boost:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/libheif-1.13.0:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=dev-libs/imath-3.1.2-r4:=
+	>=media-libs/opencolorio-2.1.1-r4:=
+	>=media-libs/openexr-3:0=
+	media-libs/tiff:=
+	sys-libs/zlib:=
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	fits? ( sci-libs/cfitsio:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	gui? (
+		media-libs/libglvnd
+		dev-qt/qtbase:6[gui,widgets,opengl]
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+DOCS=(
+	CHANGES.md
+	CREDITS.md
+	README.md
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.8.0-fix-tests.patch"
+	"${FILESDIR}/${PN}-2.5.12.0-heif-find-fix.patch"
+	"${FILESDIR}/${PN}-2.5.18.0-tests-optional.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if ! use dicom; then
+		rm "src/dicom.imageio" -r || die
+	fi
+
+	if ! use gif; then
+		rm src/gif.imageio -r || die
+	fi
+
+	if ! use jpeg2k; then
+		rm src/jpeg2000.imageio -r || die
+	fi
+
+	if ! use raw; then
+		rm src/raw.imageio -r || die
+	fi
+
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+
+	if use test ; then
+		ln -s "${WORKDIR}/OpenImageIO-images-${TEST_OIIO_IMAGE_COMMIT}" "${WORKDIR}/oiio-images" || die
+		ln -s "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${WORKDIR}/openexr-images" || die
+
+		if use fits; then
+			mkdir -p "${WORKDIR}/fits-images/"{ftt4b,pg93} || die
+			for a in ${A}; do
+				if [[ "${a}" == file*.fits ]]; then
+					ln -s "${DISTDIR}/${a}" "${WORKDIR}/fits-images/ftt4b/" || die
+				fi
+				if [[ "${a}" == tst*.fits ]]; then
+					ln -s "${DISTDIR}/${a}" "${WORKDIR}/fits-images/pg93/" || die
+				fi
+			done
+		fi
+
+		if use jpeg2k; then
+			ln -s "${WORKDIR}/J2KP4files" "${WORKDIR}/j2kp4files_v1_5" || die
+		fi
+
+		cp testsuite/heif/ref/out-libheif1.1{2,5}-orient.txt || die
+		eapply "${FILESDIR}/${PN}-2.5.12.0_heif_test.patch"
+	fi
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd[*]} ]] && mysimd=("0")
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
+	use arm64 && append-flags -flax-vector-conversions
+
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=118077
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 15 ]]; then
+		append-flags -fno-early-inlining
+	fi
+
+	local mycmakeargs=(
+		-DVERBOSE="yes"
+		-DINTERNALIZE_FMT="no"
+		# -DALWAYS_PREFER_CONFIG="yes"
+		# -DGLIBCXX_USE_CXX11_ABI="yes"
+		# -DTEX_BATCH_SIZE="8" # TODO AVX512 -> 16
+		-DSTOP_ON_WARNING="OFF"
+
+		-DCMAKE_CXX_STANDARD="17"
+		-DDOWNSTREAM_CXX_STANDARD="17"
+
+		-DCMAKE_UNITY_BUILD_MODE="BATCH"
+		-DUNITY_SMALL_BATCH_SIZE="$(nproc)"
+
+		-DBUILD_DOCS="$(usex doc)"
+		# -DBUILD_OIIOUTIL_ONLY="no"
+		-DBUILD_TESTING="$(usex test)"
+
+		-DINSTALL_FONTS="OFF"
+		-DINSTALL_DOCS="$(usex doc)"
+
+		-DENABLE_DCMTK="$(usex dicom)"
+		-DENABLE_FFmpeg="$(usex ffmpeg)"
+		-DENABLE_FITS="$(usex fits)"
+		-DENABLE_FREETYPE="$(usex truetype)"
+		-DENABLE_GIF="$(usex gif)"
+		-DENABLE_LibRaw="$(usex raw)"
+		-DENABLE_Nuke="no" # not in Gentoo
+		-DENABLE_OpenCV="$(usex opencv)"
+		-DENABLE_OpenJPEG="$(usex jpeg2k)"
+		-DENABLE_OpenVDB="$(usex openvdb)"
+		-DENABLE_TBB="$(usex openvdb)"
+		-DENABLE_Ptex="$(usex ptex)"
+
+		-DENABLE_GIF="$(usex gif)"
+		-DENABLE_LIBRAW="$(usex raw)"
+		-DENABLE_PTEX="$(usex ptex)"
+		-DENABLE_OPENJPEG="$(usex jpeg2k)"
+
+		-DOIIO_BUILD_TOOLS="$(usex tools)"
+		-DOIIO_BUILD_TESTS="$(usex test)"
+		-DOIIO_DOWNLOAD_MISSING_TESTDATA="no"
+
+		-DUSE_CCACHE="no"
+		-DUSE_EXTERNAL_PUGIXML="yes"
+		# -DUSE_LIBCPLUSPLUS="yes"
+		-DUSE_R3DSDK="no" # not in Gentoo
+		-DUSE_PYTHON="$(usex python)"
+		-DUSE_SIMD="$(local IFS=','; echo "${mysimd[*]}")"
+)
+
+	if use gui; then
+		mycmakeargs+=(
+			-DUSE_IV="yes"
+			-DUSE_OPENGL="yes"
+			-DUSE_QT="yes"
+		)
+	else
+		mycmakeargs+=(
+			-DUSE_QT="no"
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			"-DPYTHON_VERSION=${EPYTHON#python}"
+			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	DESTDIR="${T}" cmake_build install
+
+	CMAKE_SKIP_TESTS=(
+		"-broken$"
+		"texture-levels-stochaniso.batch"
+		"unit_simd"
+	)
+
+	sed -e "s#../../../testsuite#../../../OpenImageIO-${PV}/testsuite#g" \
+		-i "${CMAKE_USE_DIR}/testsuite/python-imagebufalgo/ref/out.txt" || die
+
+	local -x CI CMAKE_PREFIX_PATH LD_LIBRARY_PATH OPENIMAGEIO_FONTS PYTHONPATH
+	CI=true
+	CMAKE_PREFIX_PATH="${T}/usr"
+	LD_LIBRARY_PATH="${T}/usr/$(get_libdir)"
+	OPENIMAGEIO_FONTS="${CMAKE_USE_DIR}/src/fonts"
+
+	if use python; then
+		PYTHONPATH="${T}$(python_get_sitedir)"
+	fi
+
+	virtx cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr "${T:?}"/usr || die
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove Windows loader file
+	if use python; then
+		rm "${D}$(python_get_sitedir)/__init__.py" || die
+	fi
+}
diff --git a/media-libs/openpgl/openpgl-0.6.0.ebuild b/media-libs/openpgl/openpgl-0.6.0.ebuild
index a3ebfbe61803..a0552f20c28b 100644
--- a/media-libs/openpgl/openpgl-0.6.0.ebuild
+++ b/media-libs/openpgl/openpgl-0.6.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/RenderKit/openpgl/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* amd64 ~arm64"
 
 X86_CPU_FLAGS=( sse4_2 avx2 avx512dq )
 CPU_FLAGS=( "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" )
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index e2e30825190e..8cdddaf497e7 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,2 +1,3 @@
 DIST osl-1.12.14.0.tar.gz 20555853 BLAKE2B 4f6bc2084e4c1b25e707a37830961f20926e6ab5cb915c763cbd8126127e70f6368832077729ab5e044f573e8c38c4afb413eff8adccee5ea1ae96cb9be43b6e SHA512 51641e58fb0bba042853e3976c104decc788f1b1d3ec2e33a3f5504b11b05950dc38766ffb066b0f76edc4e0a8829d6b7dd408d9288b74d69380395b1d991bd5
 DIST osl-1.13.10.0.tar.gz 21776721 BLAKE2B 6b40adcf50403292003ae8216e60328d5af6d25bf22cd241aeb4f99b1d39c628c78fe1bc8372226c984ca38b6e08427525f12dc38e5b6d3355de02cbc71f1b7b SHA512 f005b8797a7bb882bcdf4fd644551d42c150956baa8dd9deff39ff1121321f33b8e144a9a96ac940ae6bf60985c6131457131baa87c73c2b498298aaa77c3c7d
+DIST osl-1.13.12.0.tar.gz 21824352 BLAKE2B 0d5c1d166afc347a515187c34d60c0a2be99e8a1b7078a388190f2232ee545654e3c1fea829dfabb7b0a105d69d3d98cc5dae4fa8f4db1a2228f9f258b34e76b SHA512 152a1b085c4ea88c86bc0ccbd694b848b9f50bd91f1a165899c2c3999042e413e54cdfb83dd90ea23daeeb2a3b65f794b8b2c19e9629bbda266971dcd6e3b5e7
diff --git a/media-libs/osl/files/osl-1.12.14.0-libfmt11.patch b/media-libs/osl/files/osl-1.12.14.0-libfmt11.patch
new file mode 100644
index 000000000000..6b0d7caead64
--- /dev/null
+++ b/media-libs/osl/files/osl-1.12.14.0-libfmt11.patch
@@ -0,0 +1,431 @@
+From 62ab57dcaa96587c9c7d014571c4b83da1181090 Mon Sep 17 00:00:00 2001
+From: Larry Gritz <lg@larrygritz.com>
+Date: Mon, 13 Mar 2023 09:58:11 -0700
+Subject: [PATCH] oslc: simple constant folding of binary expressions on the
+ oslc side
+
+The runtime optimization does a great job of constant folding, and
+we'd pushed it there because, with instance parameter values and
+shader network connections known, it can find so much more opportunity
+to optimize than we could in oslc.
+
+However, there is one pesky problem, which is that shader parameters
+that are initialized to even simple expressions such as 3+1 end up
+with "init ops", which although later constant folded by the time the
+shader is JITed, make it impossible to know the value via OSLQuery.
+
+So this patch just takes the simplest cases -- certain `int OP int`
+and `float OP float` expressions involving literal constants, and
+performs the operation as it's parsing the code. So
+
+         int val = 3 + 1;
+
+actually just immediately is turned into `val = 4` instead of making
+an "add".
+
+To reiterate, the add would never have happened while executing the
+shader -- at runtime in the renderer, when it's time to optimize and
+JIT the shader, it would know it's a constant 4 value. This is
+strictly about making oslc directly output an .oso file that knows
+that parameter `val` has default value 4 instead of throwing up its
+hands and saying "it's math code that will be evaluated later."
+
+Signed-off-by: Larry Gritz <lg@larrygritz.com>
+---
+ src/cmake/testing.cmake                |  1 +
+ src/liboslcomp/ast.cpp                 | 63 +++++++++++++++++++++++
+ src/liboslcomp/ast.h                   |  4 ++
+ src/liboslcomp/oslgram.y               | 36 +++++++-------
+ testsuite/oslc-literalfold/ref/out.txt | 28 +++++++++++
+ testsuite/oslc-literalfold/run.py      |  7 +++
+ testsuite/oslc-literalfold/test.osl    | 69 ++++++++++++++++++++++++++
+ 7 files changed, 190 insertions(+), 18 deletions(-)
+ create mode 100644 testsuite/oslc-literalfold/ref/out.txt
+ create mode 100755 testsuite/oslc-literalfold/run.py
+ create mode 100644 testsuite/oslc-literalfold/test.osl
+
+diff --git a/src/cmake/testing.cmake b/src/cmake/testing.cmake
+index 0ae2c200e..3ce6f2a3d 100644
+--- a/src/cmake/testing.cmake
++++ b/src/cmake/testing.cmake
+@@ -299,6 +299,7 @@ macro (osl_add_all_tests)
+                 oslc-err-struct-dup oslc-err-struct-print
+                 oslc-err-type-as-variable
+                 oslc-err-unknown-ctr
++                oslc-literalfold
+                 oslc-pragma-warnerr
+                 oslc-warn-commainit
+                 oslc-variadic-macro
+diff --git a/src/liboslcomp/ast.cpp b/src/liboslcomp/ast.cpp
+index 0ae74db48..74873e1c1 100644
+--- a/src/liboslcomp/ast.cpp
++++ b/src/liboslcomp/ast.cpp
+@@ -1187,6 +1187,69 @@ ASTbinary_expression::ASTbinary_expression(OSLCompilerImpl* comp, Operator op,
+ 
+ 
+ 
++ASTNode*
++ASTbinary_expression::make(OSLCompilerImpl* comp, Operator op, ASTNode* left,
++                           ASTNode* right)
++{
++    // If the left and right are both literal constants, fold the expression
++    if (left->nodetype() == literal_node && right->nodetype() == literal_node) {
++        ASTNode* cf = nullptr;  // constant-folded result
++        if (left->typespec().is_int() && right->typespec().is_int()) {
++            int lv = dynamic_cast<ASTliteral*>(left)->intval();
++            int rv = dynamic_cast<ASTliteral*>(right)->intval();
++            switch (op) {
++            case Mul: cf = new ASTliteral(comp, lv * rv); break;
++            case Div: cf = new ASTliteral(comp, rv ? lv / rv : 0); break;
++            case Add: cf = new ASTliteral(comp, lv + rv); break;
++            case Sub: cf = new ASTliteral(comp, lv - rv); break;
++            case Mod: cf = new ASTliteral(comp, rv ? lv % rv : 0); break;
++            case Equal: cf = new ASTliteral(comp, lv == rv ? 1 : 0); break;
++            case NotEqual: cf = new ASTliteral(comp, lv != rv ? 1 : 0); break;
++            case Greater: cf = new ASTliteral(comp, lv > rv ? 1 : 0); break;
++            case Less: cf = new ASTliteral(comp, lv < rv ? 1 : 0); break;
++            case GreaterEqual:
++                cf = new ASTliteral(comp, lv >= rv ? 1 : 0);
++                break;
++            case LessEqual: cf = new ASTliteral(comp, lv <= rv ? 1 : 0); break;
++            case BitAnd: cf = new ASTliteral(comp, lv & rv); break;
++            case BitOr: cf = new ASTliteral(comp, lv | rv); break;
++            case Xor: cf = new ASTliteral(comp, lv ^ rv); break;
++            case ShiftLeft: cf = new ASTliteral(comp, lv << rv); break;
++            case ShiftRight: cf = new ASTliteral(comp, lv >> rv); break;
++            default: break;
++            }
++        } else if (left->typespec().is_float()
++                   && right->typespec().is_float()) {
++            float lv = dynamic_cast<ASTliteral*>(left)->floatval();
++            float rv = dynamic_cast<ASTliteral*>(right)->floatval();
++            switch (op) {
++            case Mul: cf = new ASTliteral(comp, lv * rv); break;
++            case Div: cf = new ASTliteral(comp, rv ? lv / rv : 0.0f); break;
++            case Add: cf = new ASTliteral(comp, lv + rv); break;
++            case Sub: cf = new ASTliteral(comp, lv - rv); break;
++            case Equal: cf = new ASTliteral(comp, lv == rv ? 1 : 0); break;
++            case NotEqual: cf = new ASTliteral(comp, lv != rv ? 1 : 0); break;
++            case Greater: cf = new ASTliteral(comp, lv > rv ? 1 : 0); break;
++            case Less: cf = new ASTliteral(comp, lv < rv ? 1 : 0); break;
++            case GreaterEqual:
++                cf = new ASTliteral(comp, lv >= rv ? 1 : 0);
++                break;
++            case LessEqual: cf = new ASTliteral(comp, lv <= rv ? 1 : 0); break;
++            default: break;
++            }
++        }
++        if (cf) {
++            delete left;
++            delete right;
++            return cf;
++        }
++    }
++
++    return new ASTbinary_expression(comp, op, left, right);
++}
++
++
++
+ const char*
+ ASTbinary_expression::childname(size_t i) const
+ {
+diff --git a/src/liboslcomp/ast.h b/src/liboslcomp/ast.h
+index db9bd14e5..f4bd2eeec 100644
+--- a/src/liboslcomp/ast.h
++++ b/src/liboslcomp/ast.h
+@@ -832,6 +832,10 @@ class ASTbinary_expression final : public ASTNode {
+     ASTbinary_expression(OSLCompilerImpl* comp, Operator op, ASTNode* left,
+                          ASTNode* right);
+ 
++    // Special consructor wrapper that can collapse ops between literals
++    static ASTNode* make(OSLCompilerImpl* comp, Operator op, ASTNode* left,
++                         ASTNode* right);
++
+     const char* nodetypename() const { return "binary_expression"; }
+     const char* childname(size_t i) const;
+     const char* opname() const;
+diff --git a/src/liboslcomp/oslgram.y b/src/liboslcomp/oslgram.y
+index b65818193..b4f3ad2e1 100644
+--- a/src/liboslcomp/oslgram.y
++++ b/src/liboslcomp/oslgram.y
+@@ -858,109 +858,109 @@ variable_ref
+ binary_expression
+         : expression OR_OP expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::Or, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+         | expression AND_OP expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::And, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+         | expression '|' expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::BitOr, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+         | expression '^' expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::Xor, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+         | expression '&' expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::BitAnd, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+         | expression EQ_OP expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::Equal, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+         | expression NE_OP expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::NotEqual, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+         | expression '>' expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::Greater, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+         | expression GE_OP expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::GreaterEqual, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+         | expression '<' expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::Less, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+         | expression LE_OP expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::LessEqual, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+         | expression SHL_OP expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::ShiftLeft, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+         | expression SHR_OP expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::ShiftRight, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+         | expression '+' expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::Add, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+         | expression '-' expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::Sub, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+         | expression '*' expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::Mul, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+         | expression '/' expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::Div, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+         | expression '%' expression
+                 {
+-                    $$ = new ASTbinary_expression (oslcompiler,
++                    $$ = ASTbinary_expression::make(oslcompiler,
+                                     ASTNode::Mod, $1, $3);
+                     $$->sourceline (@2.first_line);
+                 }
+diff --git a/testsuite/oslc-literalfold/ref/out.txt b/testsuite/oslc-literalfold/ref/out.txt
+new file mode 100644
+index 000000000..9397357ff
+--- /dev/null
++++ b/testsuite/oslc-literalfold/ref/out.txt
+@@ -0,0 +1,28 @@
++Compiled test.osl -> test.oso
++int add_i = 8
++int sub_i = 2
++int mul_i = 15
++int div_i = 1
++int mod_i = 2
++int eq_i = 0
++int ne_i = 1
++int gt_i = 1
++int ge_i = 1
++int lt_i = 0
++int le_i = 0
++int and_i = 1
++int or_i = 7
++int xor_i = 6
++int shl_i = 40
++int shr_i = 0
++float add_f = 8.000000
++float sub_f = 2.000000
++float mul_f = 15.000000
++float div_f = 1.666667
++float eq_f = 0
++float ne_f = 1
++float gt_f = 1
++float ge_f = 1
++float lt_f = 0
++float le_f = 0
++
+diff --git a/testsuite/oslc-literalfold/run.py b/testsuite/oslc-literalfold/run.py
+new file mode 100755
+index 000000000..6836d5554
+--- /dev/null
++++ b/testsuite/oslc-literalfold/run.py
+@@ -0,0 +1,7 @@
++#!/usr/bin/env python
++
++# Copyright Contributors to the Open Shading Language project.
++# SPDX-License-Identifier: BSD-3-Clause
++# https://github.com/AcademySoftwareFoundation/OpenShadingLanguage
++
++command = testshade("test")
+diff --git a/testsuite/oslc-literalfold/test.osl b/testsuite/oslc-literalfold/test.osl
+new file mode 100644
+index 000000000..0f1b09e36
+--- /dev/null
++++ b/testsuite/oslc-literalfold/test.osl
+@@ -0,0 +1,69 @@
++// Copyright Contributors to the Open Shading Language project.
++// SPDX-License-Identifier: BSD-3-Clause
++// https://github.com/AcademySoftwareFoundation/OpenShadingLanguage
++
++// Test oslc-side constant folding of simple binary operators on literal
++// values
++
++#define three 3
++#define five 5
++
++
++shader test(
++    int add_i = five + three,
++    int sub_i = five - three,
++    int mul_i = five * three,
++    int div_i = five / three,
++    int mod_i = five % three,
++    int eq_i = five == three,
++    int ne_i = five != three,
++    int gt_i = five > three,
++    int ge_i = five >= three,
++    int lt_i = five < three,
++    int le_i = five <= three,
++    int and_i = five & three,
++    int or_i = five | three,
++    int xor_i = five ^ three,
++    int shl_i = five << three,
++    int shr_i = five >> three,
++
++    float add_f = float(five) + float(three),
++    float sub_f = float(five) - float(three),
++    float mul_f = float(five) * float(three),
++    float div_f = float(five) / float(three),
++    int eq_f = float(five) == float(three),
++    int ne_f = float(five) != float(three),
++    int gt_f = float(five) > float(three),
++    int ge_f = float(five) >= float(three),
++    int lt_f = float(five) < float(three),
++    int le_f = float(five) <= float(three),
++)
++{
++    printf("int add_i = %d\n", add_i);
++    printf("int sub_i = %d\n", sub_i);
++    printf("int mul_i = %d\n", mul_i);
++    printf("int div_i = %d\n", div_i);
++    printf("int mod_i = %d\n", mod_i);
++    printf("int eq_i = %d\n", eq_i);
++    printf("int ne_i = %d\n", ne_i);
++    printf("int gt_i = %d\n", gt_i);
++    printf("int ge_i = %d\n", ge_i);
++    printf("int lt_i = %d\n", lt_i);
++    printf("int le_i = %d\n", le_i);
++    printf("int and_i = %d\n", and_i);
++    printf("int or_i = %d\n", or_i);
++    printf("int xor_i = %d\n", xor_i);
++    printf("int shl_i = %d\n", shl_i);
++    printf("int shr_i = %d\n", shr_i);
++
++    printf("float add_f = %f\n", add_f);
++    printf("float sub_f = %f\n", sub_f);
++    printf("float mul_f = %f\n", mul_f);
++    printf("float div_f = %f\n", div_f);
++    printf("float eq_f = %d\n", eq_f);
++    printf("float ne_f = %d\n", ne_f);
++    printf("float gt_f = %d\n", gt_f);
++    printf("float ge_f = %d\n", ge_f);
++    printf("float lt_f = %d\n", lt_f);
++    printf("float le_f = %d\n", le_f);
++}
+From 977f2898b10b9688c4bd65260884e1e477d29806 Mon Sep 17 00:00:00 2001
+From: Larry Gritz <lg@larrygritz.com>
+Date: Sun, 20 Aug 2023 21:36:59 -0700
+Subject: [PATCH] fix: Recent journaling changes break with some fmtlib
+ versions
+
+Certain fmt library versions don't automatically know how to format
+atomics. Explicitly load them to turn into regular ints to avoid new
+build errors introduced by the recent journaling changes.
+
+Signed-off-by: Larry Gritz <lg@larrygritz.com>
+---
+ .github/workflows/ci.yml   | 2 +-
+ src/liboslcomp/ast.cpp     | 2 +-
+ src/liboslexec/journal.cpp | 6 +++---
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/liboslcomp/ast.cpp b/src/liboslcomp/ast.cpp
+index 74873e1c1..a8e5d75e4 100644
+--- a/src/liboslcomp/ast.cpp
++++ b/src/liboslcomp/ast.cpp
+@@ -46,7 +46,7 @@ ScopeExit print_node_counts([]() {
+     for (int i = 0; i < ASTNode::_last_node; ++i)
+         if (node_counts[i] > 0)
+             Strutil::print("ASTNode type {:2}: {:5}   (peak {:5})\n", i,
+-                           node_counts[i], node_counts_peak[i]);
++                           node_counts[i].load(), node_counts_peak[i].load());
+ });
+ }  // namespace
+ #endif
diff --git a/media-libs/osl/files/osl-1.12.14.0-m_dz.patch b/media-libs/osl/files/osl-1.12.14.0-m_dz.patch
new file mode 100644
index 000000000000..fb50c53452bf
--- /dev/null
+++ b/media-libs/osl/files/osl-1.12.14.0-m_dz.patch
@@ -0,0 +1,23 @@
+From f8b8242f26a7d4676cf8e5e195f3b6ba0335bcfc Mon Sep 17 00:00:00 2001
+From: Larry Gritz <lg@larrygritz.com>
+Date: Mon, 23 Sep 2024 12:35:36 -0700
+Subject: [PATCH] fix: Typo in dual.h made invalid template DualStorage
+
+Signed-off-by: Larry Gritz <lg@larrygritz.com>
+---
+ src/include/OSL/dual.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/include/OSL/dual.h b/src/include/OSL/dual.h
+index a7b5e4063..60ec05ee8 100644
+--- a/src/include/OSL/dual.h
++++ b/src/include/OSL/dual.h
+@@ -204,7 +204,7 @@ class DualStorage<T, 3>
+     : m_val(other.m_val)
+     , m_dx(other.m_dx)
+     , m_dy(other.m_dy)
+-    , m_dz(other.dz)
++    , m_dz(other.m_dz)
+     {}
+
+     OSL_HOSTDEVICE constexpr const T& elem (ConstIndex<0>) const { return m_val; }
diff --git a/media-libs/osl/files/osl-boost-config.patch b/media-libs/osl/files/osl-boost-config.patch
new file mode 100644
index 000000000000..0c0f3bbe71e0
--- /dev/null
+++ b/media-libs/osl/files/osl-boost-config.patch
@@ -0,0 +1,22 @@
+From 8a29f2263675bf9cb7a567f00fc257728b3ac3d8 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Thu, 9 Jan 2025 19:49:15 +0100
+Subject: [PATCH] boost config
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
+index 7250633..1f032f8 100644
+--- a/src/cmake/externalpackages.cmake
++++ b/src/cmake/externalpackages.cmake
+@@ -57,6 +57,7 @@ else ()
+     checked_find_package (Boost REQUIRED
+                        VERSION_MIN 1.55
+                        COMPONENTS ${Boost_COMPONENTS}
++                       CONFIG
+                        RECOMMEND_MIN 1.66
+                        RECOMMEND_MIN_REASON "Boost 1.66 is the oldest version our CI tests against"
+                        PRINT Boost_INCLUDE_DIRS Boost_LIBRARIES
+-- 
+2.47.1
+
diff --git a/media-libs/osl/files/osl-include-cstdint.patch b/media-libs/osl/files/osl-include-cstdint.patch
new file mode 100644
index 000000000000..efaa2f81b9b6
--- /dev/null
+++ b/media-libs/osl/files/osl-include-cstdint.patch
@@ -0,0 +1,20 @@
+--- a/src/include/OSL/platform.h
++++ b/src/include/OSL/platform.h
+@@ -18,6 +18,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <cstring>
+ #include <memory>
+ 
+--- a/src/include/osl_pvt.h
++++ b/src/include/osl_pvt.h
+@@ -4,6 +4,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <memory>
+ 
+ #include <OSL/oslconfig.h>
diff --git a/media-libs/osl/files/osl-oslfile.patch b/media-libs/osl/files/osl-oslfile.patch
new file mode 100644
index 000000000000..76e985c26372
--- /dev/null
+++ b/media-libs/osl/files/osl-oslfile.patch
@@ -0,0 +1,26 @@
+From 9abc5d56c8ae830355a10d6008b5925faef30af2 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Thu, 9 Jan 2025 19:59:01 +0100
+Subject: [PATCH] oslsrc
+
+This was snuck in via 
+https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1914
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/src/shaders/CMakeLists.txt b/src/shaders/CMakeLists.txt
+index 1ea7bee..e96207d 100644
+--- a/src/shaders/CMakeLists.txt
++++ b/src/shaders/CMakeLists.txt
+@@ -40,7 +40,7 @@ macro (oslc_compile)
+     list (APPEND oslc_args "-I${CMAKE_SOURCE_DIR}/src/shaders")
+     add_custom_command (OUTPUT ${osofile}
+         COMMAND oslc ${oslc_args} "${oslfile}" -o "${osofile}"
+-        MAIN_DEPENDENCY ${oslsrc}
++        MAIN_DEPENDENCY ${oslfile}
+         DEPENDS ${_shader_DEPENDS} "${stdosl_header}" oslc
+         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+         COMMENT "oslc ${oslsrc_we}")
+-- 
+2.47.1
+
diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml
index a0f31940cbeb..a62fb425a42a 100644
--- a/media-libs/osl/metadata.xml
+++ b/media-libs/osl/metadata.xml
@@ -15,12 +15,11 @@
 		lights, displacement, and pattern generation.
 	</longdescription>
 	<use>
-		<flag name="gui">Build the osltoy binary (with Qt5)</flag>
+		<flag name="gui">Build the osltoy binary</flag>
 		<flag name="libcxx">Build against <pkg>llvm-runtimes/libcxx</pkg> when using clang</flag>
 		<flag name="nofma">Do not use Fuse-Multiply-Add operations</flag>
 		<flag name="optix">Add support for NVIDIA's OptiX Raytracing Engine</flag>
 		<flag name="partio">Use <pkg>media-libs/partio</pkg></flag>
-		<flag name="qt6">Build the osltoy binary (with Qt6)</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">AcademySoftwareFoundation/OpenShadingLanguage</remote-id>
diff --git a/media-libs/osl/osl-1.12.14.0-r1.ebuild b/media-libs/osl/osl-1.12.14.0-r1.ebuild
deleted file mode 100644
index a5bef473888b..000000000000
--- a/media-libs/osl/osl-1.12.14.0-r1.ebuild
+++ /dev/null
@@ -1,399 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-# Check this on updates
-LLVM_COMPAT=( {15..15} )
-
-inherit cmake flag-o-matic llvm-r1 toolchain-funcs python-single-r1
-
-DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="https://www.imageworks.com/technology/opensource https://github.com/AcademySoftwareFoundation/OpenShadingLanguage"
-
-if [[ ${PV} = *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage.git"
-else
-	# If a development release, please don't keyword!
-	SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-	S="${WORKDIR}/OpenShadingLanguage-${PV}"
-fi
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-3)"
-
-X86_CPU_FEATURES=(
-	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
-
-IUSE="debug doc gui libcxx nofma partio qt6 test ${CPU_FEATURES[*]%:*} python"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/pugixml
-	>=media-libs/openexr-3:0=
-	>=media-libs/openimageio-2.4:=
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
-	')
-	sys-libs/zlib:=
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pybind11[${PYTHON_USEDEP}]
-			media-libs/openimageio[python,${PYTHON_SINGLE_USEDEP}]
-		')
-	)
-	partio? ( media-libs/partio )
-	gui? (
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtopengl:5
-		)
-		qt6? (
-			dev-qt/qtbase:6[gui,widgets,opengl]
-		)
-	)
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/875836
-	# https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1810
-	filter-lto
-
-	# pick the highest we support
-	local mysimd=()
-	if use cpu_flags_x86_avx512f; then
-		mysimd+=( avx512f )
-	elif use cpu_flags_x86_avx2 ; then
-		mysimd+=( avx2 )
-		if use cpu_flags_x86_f16c ; then
-			mysimd+=( f16c )
-		fi
-	elif use cpu_flags_x86_avx ; then
-		mysimd+=( avx )
-	elif use cpu_flags_x86_sse4_2 ; then
-		mysimd+=( sse4.2 )
-	elif use cpu_flags_x86_sse4_1 ; then
-		mysimd+=( sse4.1 )
-	elif use cpu_flags_x86_ssse3 ; then
-		mysimd+=( ssse3 )
-	elif use cpu_flags_x86_sse3 ; then
-		mysimd+=( sse3 )
-	elif use cpu_flags_x86_sse2 ; then
-		mysimd+=( sse2 )
-	fi
-
-	local mybatched=()
-	if use cpu_flags_x86_avx512f || use cpu_flags_x86_avx2 ; then
-		if use cpu_flags_x86_avx512f ; then
-			if use nofma; then
-				mybatched+=(
-					"b8_AVX512_noFMA"
-					"b16_AVX512_noFMA"
-				)
-			else
-				mybatched+=(
-					"b8_AVX512"
-					"b16_AVX512"
-				)
-			fi
-		fi
-		if use cpu_flags_x86_avx2 ; then
-			if use nofma; then
-				mybatched+=(
-					"b8_AVX2_noFMA"
-				)
-			else
-				mybatched+=(
-					"b8_AVX2"
-				)
-			fi
-		fi
-	elif use cpu_flags_x86_avx ; then
-		mybatched+=(
-			"b8_AVX"
-		)
-	fi
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z "${mysimd[*]}" ]] && mysimd=("0")
-	[[ -z "${mybatched[*]}" ]] && mybatched=("0")
-
-	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
-	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
-	use arm64 && append-flags -flax-vector-conversions
-
-	local gcc
-	gcc="$(tc-getCC)"
-
-	local mycmakeargs=(
-		-DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # BUG FindCUDA
-		-DCMAKE_POLICY_DEFAULT_CMP0148="OLD" # BUG FindPythonInterp
-
-		# std::tuple_size_v is c++17
-		-DCMAKE_CXX_STANDARD="17"
-
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DINSTALL_DOCS="$(usex doc)"
-		-DUSE_CCACHE="no"
-		-DLLVM_STATIC="no"
-		-DOSL_BUILD_TESTS="$(usex test)"
-		-DSTOP_ON_WARNING="no"
-		-DUSE_PARTIO="$(usex partio)"
-		-DUSE_PYTHON="$(usex python)"
-		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
-		-DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
-		-DUSE_LIBCPLUSPLUS="$(usex libcxx)"
-		-DUSE_OPTIX="no"
-
-		-DOpenImageIO_ROOT="${EPREFIX}/usr"
-	)
-
-	if use debug; then
-		mycmakeargs+=(
-			-DVEC_REPORT="yes"
-		)
-	fi
-
-	if use gui; then
-		mycmakeargs+=( -DUSE_QT="yes" )
-		if ! use qt6; then
-			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" )
-		fi
-	else
-		mycmakeargs+=( -DUSE_QT="no" )
-	fi
-
-	if use partio; then
-		mycmakeargs+=(
-			-Dpartio_ROOT="${EPREFIX}/usr"
-		)
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			"-DPYTHON_VERSION=${EPYTHON#python}"
-			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# A bunch of tests only work when installed.
-	# So install them into the temp directory now.
-	DESTDIR="${T}" cmake_build install
-
-	ln -s "${CMAKE_USE_DIR}/src/cmake/" "${BUILD_DIR}/src/cmake" || die
-
-	CMAKE_SKIP_TESTS=(
-		"broken"
-		"^render"
-
-		# outright fail
-		"^color$"
-		"^color.opt$"
-		"^color.batched$"
-		"^color.batched.opt$"
-		"^matrix.batched.opt$"
-		"^spline-reg.regress.batched.opt$"
-		"^transform-reg.regress.batched.opt$"
-	)
-
-	# These only fail inside sandbox
-	if [[ "${OSL_OPTIONAL_TESTS}" != "true" ]]; then
-		CMAKE_SKIP_TESTS+=(
-			# TODO: investigate failures
-			# SIGABRT similar to https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1363
-			"^andor-reg.regress.batched.opt$"
-			"^arithmetic-reg.regress.batched.opt$"
-			"^array-assign-reg.regress.batched.opt$"
-			"^array-length-reg.regress.batched$"
-			"^closure.batched$"
-			"^closure.batched.opt$"
-			"^closure-parameters.batched$"
-			"^closure-parameters.batched.opt$"
-			"^debug-uninit$"
-			"^debug-uninit.opt$"
-			"^debug-uninit.batched$"
-			"^debug-uninit.batched.opt$"
-			"^derivs$"
-			"^derivs.opt$"
-			"^derivs.batched$"
-			"^derivs.batched.opt$"
-			"^filterwidth-reg.regress.batched.opt$"
-			"^geomath.opt$"
-			"^geomath.batched$"
-			"^geomath.batched.opt$"
-			"^getattribute-camera.batched$"
-			"^getattribute-camera.batched.opt$"
-			"^getattribute-shader.batched.opt$"
-			"^gettextureinfo.batched$"
-			"^gettextureinfo-reg.regress.batched.opt$"
-			"^hyperb.opt$"
-			"^hyperb.batched.opt$"
-			"^ieee_fp-reg.regress.batched.opt$"
-			"^initlist.batched$"
-			"^initlist.batched.opt$"
-			"^isconnected.batched$"
-			"^linearstep.batched$"
-			"^linearstep.batched.opt$"
-			"^loop.batched$"
-			"^loop.batched.opt$"
-			"^matrix$"
-			"^matrix.opt$"
-			"^matrix.batched$"
-			"^matrix-compref-reg.regress.batched.opt$"
-			"^message-no-closure.batched$"
-			"^message-no-closure.batched.opt$"
-			"^message-reg.regress.batched.opt$"
-			"^miscmath$"
-			"^miscmath.opt$"
-			"^miscmath.batched$"
-			"^miscmath.batched.opt$"
-			"^noise.batched$"
-			"^noise-cell.batched$"
-			"^noise-gabor.batched$"
-			"^noise-gabor.batched.opt$"
-			"^noise-gabor-reg.regress.batched.opt$"
-			"^noise-generic.batched$"
-			"^noise-generic.batched.opt$"
-			"^noise-perlin.batched$"
-			"^noise-perlin.batched.opt$"
-			"^noise-simplex.batched$"
-			"^noise-simplex.batched.opt$"
-			"^noise-reg.regress.batched.opt$"
-			"^pnoise.batched$"
-			"^pnoise-cell.batched$"
-			"^pnoise-gabor.batched$"
-			"^pnoise-gabor.batched.opt$"
-			"^pnoise-generic.batched$"
-			"^pnoise-generic.batched.opt$"
-			"^pnoise-perlin.batched$"
-			"^pnoise-perlin.batched.opt$"
-			"^pnoise-reg.regress.batched.opt$"
-			"^opt-warnings.batched$"
-			"^opt-warnings.batched.opt$"
-			"^regex-reg.regress.batched.opt$"
-			"^select.batched$"
-			"^select.batched.opt$"
-			"^shaderglobals.batched$"
-			"^shaderglobals.batched.opt$"
-			"^smoothstep-reg.regress.batched.opt$"
-			"^spline.batched$"
-			"^spline.batched.opt$"
-			"^splineinverse-ident.batched$"
-			"^splineinverse-ident.batched.opt$"
-			"^spline-derivbug.batched$"
-			"^spline-derivbug.batched.opt$"
-			"^split-reg.regress.batched.opt$"
-			"^string.batched$"
-			"^string.batched.opt$"
-			"^string-reg.regress.batched.opt$"
-			"^struct.batched$"
-			"^struct-array-mixture.batched$"
-			"^struct-array-mixture.batched.opt$"
-			"^texture-environment-opts-reg.regress.batched.opt$"
-			"^texture-opts-reg.regress.batched.opt$"
-			"^texture-wrap.batched$"
-			"^texture-wrap.batched.opt$"
-			"^transcendental-reg.regress.batched.opt$"
-			"^transform$"
-			"^transform.opt$"
-			"^transform.batched$"
-			"^transform.batched.opt$"
-			"^transformc$"
-			"^transformc.opt$"
-			"^transformc.batched$"
-			"^transformc.batched.opt$"
-			"^trig$"
-			"^trig.opt$"
-			"^trig.batched$"
-			"^trig.batched.opt$"
-			"^trig-reg.regress.batched.opt$"
-			"^vecctr.batched$"
-			"^vecctr.batched.opt$"
-			"^vector-reg.regress.batched.opt$"
-			"^xml-reg.regress.batched.opt$"
-			"^gettextureinfo-udim.batched$"
-			"^gettextureinfo-udim.batched.opt$"
-			"^gettextureinfo-udim-reg.regress.batched.opt$"
-			"^pointcloud.batched$"
-			"^pointcloud.batched.opt$"
-		)
-	fi
-
-	myctestargs=(
-		# src/build-scripts/ci-test.bash
-		'--force-new-ctest-process'
-	)
-
-	local -x DEBUG CXXFLAGS LD_LIBRARY_PATH DIR OSL_DIR OSL_SOURCE_DIR PYTHONPATH
-	DEBUG=1 # doubles the floating point tolerance
-	CXXFLAGS="-I${T}/usr/include"
-	LD_LIBRARY_PATH="${T}/usr/$(get_libdir)"
-	OSL_DIR="${T}/usr/$(get_libdir)/cmake/OSL"
-	OSL_SOURCE_DIR="${S}"
-
-	if use python; then
-		PYTHONPATH="${BUILD_DIR}/lib/python/site-packages"
-	fi
-
-	cmake_src_test
-
-	CMAKE_SKIP_TESTS=(
-		"^render-background$"
-		"^render-bumptest$"
-		"^render-mx-furnace-sheen$"
-		"^render-mx-burley-diffuse$"
-		"^render-mx-conductor$"
-		"^render-mx-generalized-schlick-glass$"
-		"^render-microfacet$"
-		"^render-oren-nayar$"
-		"^render-veachmis$"
-		"^render-ward$"
-		"^render-raytypes.opt$"
-	)
-
-	myctestargs=(
-		# src/build-scripts/ci-test.bash
-		'--force-new-ctest-process'
-		--repeat until-pass:10
-		-R "^render"
-	)
-
-	cmake_src_test
-}
diff --git a/media-libs/osl/osl-1.12.14.0-r3.ebuild b/media-libs/osl/osl-1.12.14.0-r3.ebuild
new file mode 100644
index 000000000000..3e3f67e8c205
--- /dev/null
+++ b/media-libs/osl/osl-1.12.14.0-r3.ebuild
@@ -0,0 +1,420 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+# Check this on updates
+LLVM_COMPAT=( {15..15} )
+
+inherit cmake flag-o-matic llvm-r1 toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="https://www.imageworks.com/technology/opensource https://github.com/AcademySoftwareFoundation/OpenShadingLanguage"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage.git"
+else
+	# If a development release, please don't keyword!
+	SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+	S="${WORKDIR}/OpenShadingLanguage-${PV}"
+fi
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)" # based on SONAME
+
+X86_CPU_FEATURES=(
+	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
+
+IUSE="debug doc gui libcxx nofma partio test ${CPU_FEATURES[*]%:*} python"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	>=media-libs/openimageio-2.4:=
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}=
+		llvm-core/llvm:${LLVM_SLOT}=
+	')
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pybind11[${PYTHON_USEDEP}]
+			media-libs/openimageio[python,${PYTHON_SINGLE_USEDEP}]
+		')
+	)
+	partio? ( media-libs/partio )
+	gui? (
+		dev-qt/qtbase:6[gui,widgets,opengl]
+	)
+"
+
+DEPEND="${RDEPEND}
+	dev-util/patchelf
+	>=media-libs/openexr-3
+	sys-libs/zlib
+	test? (
+		media-fonts/droid
+	)
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-boost-config.patch"
+	"${FILESDIR}/${PN}-oslfile.patch"
+	"${FILESDIR}/${PN}-include-cstdint.patch"
+	"${FILESDIR}/${PN}-1.12.14.0-libfmt11.patch"
+	"${FILESDIR}/${PN}-1.12.14.0-m_dz.patch"
+)
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/875836
+	# https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1810
+	filter-lto
+
+	# pick the highest we support
+	local mysimd=()
+	if use cpu_flags_x86_avx512f; then
+		mysimd+=( avx512f )
+	elif use cpu_flags_x86_avx2 ; then
+		mysimd+=( avx2 )
+		if use cpu_flags_x86_f16c ; then
+			mysimd+=( f16c )
+		fi
+	elif use cpu_flags_x86_avx ; then
+		mysimd+=( avx )
+	elif use cpu_flags_x86_sse4_2 ; then
+		mysimd+=( sse4.2 )
+	elif use cpu_flags_x86_sse4_1 ; then
+		mysimd+=( sse4.1 )
+	elif use cpu_flags_x86_ssse3 ; then
+		mysimd+=( ssse3 )
+	elif use cpu_flags_x86_sse3 ; then
+		mysimd+=( sse3 )
+	elif use cpu_flags_x86_sse2 ; then
+		mysimd+=( sse2 )
+	fi
+
+	local mybatched=()
+	if use cpu_flags_x86_avx512f || use cpu_flags_x86_avx2 ; then
+		if use cpu_flags_x86_avx512f ; then
+			if use nofma; then
+				mybatched+=(
+					"b8_AVX512_noFMA"
+					"b16_AVX512_noFMA"
+				)
+			fi
+			mybatched+=(
+				"b8_AVX512"
+				"b16_AVX512"
+			)
+		fi
+		if use cpu_flags_x86_avx2 ; then
+			if use nofma; then
+				mybatched+=(
+					"b8_AVX2_noFMA"
+				)
+			fi
+			mybatched+=(
+				"b8_AVX2"
+			)
+		fi
+	fi
+	if use cpu_flags_x86_avx ; then
+		mybatched+=(
+			"b8_AVX"
+		)
+	fi
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z "${mysimd[*]}" ]] && mysimd=("0")
+	[[ -z "${mybatched[*]}" ]] && mybatched=("0")
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
+	use arm64 && append-flags -flax-vector-conversions
+
+	local gcc
+	gcc="$(tc-getCC)"
+
+	local mycmakeargs=(
+		-DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # BUG FindCUDA
+		-DCMAKE_POLICY_DEFAULT_CMP0148="OLD" # BUG FindPythonInterp
+
+		# std::tuple_size_v is c++17
+		-DCMAKE_CXX_STANDARD="17"
+
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DINSTALL_DOCS="$(usex doc)"
+		-DUSE_CCACHE="no"
+		-DLLVM_STATIC="no"
+		-DOSL_BUILD_TESTS="$(usex test)"
+		-DSTOP_ON_WARNING="no"
+		-DUSE_PARTIO="$(usex partio)"
+		-DUSE_PYTHON="$(usex python)"
+		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+		-DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
+		-DUSE_LIBCPLUSPLUS="$(usex libcxx)"
+		-DUSE_OPTIX="no"
+		-DUSE_QT="$(usex gui)"
+
+		-DOpenImageIO_ROOT="${EPREFIX}/usr"
+	)
+
+	if use debug; then
+		mycmakeargs+=(
+			-DVEC_REPORT="yes"
+		)
+	fi
+
+	if use partio; then
+		mycmakeargs+=(
+			-Dpartio_DIR="${EPREFIX}/usr"
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			"-DPYTHON_VERSION=${EPYTHON#python}"
+			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A bunch of tests only work when installed.
+	# So install them into the temp directory now.
+	DESTDIR="${T}" cmake_build install
+
+	ln -s "${CMAKE_USE_DIR}/src/cmake/" "${BUILD_DIR}/src/cmake" || die
+
+	CMAKE_SKIP_TESTS=(
+		"-broken$"
+		"^render"
+
+		# outright fail
+		"^color$"
+		"^color.opt$"
+		"^color.batched$"
+		"^color.batched.opt$"
+		"^matrix.batched.opt$"
+		"^osl-imageio"
+		"^spline-reg.regress.batched.opt$"
+		"^transform-reg.regress.batched.opt$"
+	)
+
+	# These only fail inside sandbox
+	if [[ "${OSL_OPTIONAL_TESTS}" != "true" ]]; then
+		CMAKE_SKIP_TESTS+=(
+			# TODO: investigate failures
+			# SIGABRT similar to https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1363
+			"^andor-reg.regress.batched.opt$"
+			"^arithmetic-reg.regress.batched.opt$"
+			"^array-assign-reg.regress.batched.opt$"
+			"^array-length-reg.regress.batched$"
+			"^closure.batched$"
+			"^closure.batched.opt$"
+			"^closure-parameters.batched$"
+			"^closure-parameters.batched.opt$"
+			"^debug-uninit$"
+			"^debug-uninit.opt$"
+			"^debug-uninit.batched$"
+			"^debug-uninit.batched.opt$"
+			"^derivs$"
+			"^derivs.opt$"
+			"^derivs.batched$"
+			"^derivs.batched.opt$"
+			"^filterwidth-reg.regress.batched.opt$"
+			"^geomath.opt$"
+			"^geomath.batched$"
+			"^geomath.batched.opt$"
+			"^getattribute-camera.batched$"
+			"^getattribute-camera.batched.opt$"
+			"^getattribute-shader.batched.opt$"
+			"^gettextureinfo.batched$"
+			"^gettextureinfo-reg.regress.batched.opt$"
+			"^hyperb.opt$"
+			"^hyperb.batched.opt$"
+			"^ieee_fp-reg.regress.batched.opt$"
+			"^initlist.batched$"
+			"^initlist.batched.opt$"
+			"^isconnected.batched$"
+			"^linearstep.batched$"
+			"^linearstep.batched.opt$"
+			"^loop.batched$"
+			"^loop.batched.opt$"
+			"^matrix$"
+			"^matrix.opt$"
+			"^matrix.batched$"
+			"^matrix-compref-reg.regress.batched.opt$"
+			"^message-no-closure.batched$"
+			"^message-no-closure.batched.opt$"
+			"^message-reg.regress.batched.opt$"
+			"^miscmath$"
+			"^miscmath.opt$"
+			"^miscmath.batched$"
+			"^miscmath.batched.opt$"
+			"^noise.batched$"
+			"^noise-cell.batched$"
+			"^noise-gabor.batched$"
+			"^noise-gabor.batched.opt$"
+			"^noise-gabor-reg.regress.batched.opt$"
+			"^noise-generic.batched$"
+			"^noise-generic.batched.opt$"
+			"^noise-perlin.batched$"
+			"^noise-perlin.batched.opt$"
+			"^noise-simplex.batched$"
+			"^noise-simplex.batched.opt$"
+			"^noise-reg.regress.batched.opt$"
+			"^pnoise.batched$"
+			"^pnoise-cell.batched$"
+			"^pnoise-gabor.batched$"
+			"^pnoise-gabor.batched.opt$"
+			"^pnoise-generic.batched$"
+			"^pnoise-generic.batched.opt$"
+			"^pnoise-perlin.batched$"
+			"^pnoise-perlin.batched.opt$"
+			"^pnoise-reg.regress.batched.opt$"
+			"^opt-warnings.batched$"
+			"^opt-warnings.batched.opt$"
+			"^regex-reg.regress.batched.opt$"
+			"^select.batched$"
+			"^select.batched.opt$"
+			"^shaderglobals.batched$"
+			"^shaderglobals.batched.opt$"
+			"^smoothstep-reg.regress.batched.opt$"
+			"^spline.batched$"
+			"^spline.batched.opt$"
+			"^splineinverse-ident.batched$"
+			"^splineinverse-ident.batched.opt$"
+			"^spline-derivbug.batched$"
+			"^spline-derivbug.batched.opt$"
+			"^split-reg.regress.batched.opt$"
+			"^string.batched$"
+			"^string.batched.opt$"
+			"^string-reg.regress.batched.opt$"
+			"^struct.batched$"
+			"^struct-array-mixture.batched$"
+			"^struct-array-mixture.batched.opt$"
+			"^texture-environment-opts-reg.regress.batched.opt$"
+			"^texture-opts-reg.regress.batched.opt$"
+			"^texture-wrap.batched$"
+			"^texture-wrap.batched.opt$"
+			"^transcendental-reg.regress.batched.opt$"
+			"^transform$"
+			"^transform.opt$"
+			"^transform.batched$"
+			"^transform.batched.opt$"
+			"^transformc$"
+			"^transformc.opt$"
+			"^transformc.batched$"
+			"^transformc.batched.opt$"
+			"^trig$"
+			"^trig.opt$"
+			"^trig.batched$"
+			"^trig.batched.opt$"
+			"^trig-reg.regress.batched.opt$"
+			"^vecctr.batched$"
+			"^vecctr.batched.opt$"
+			"^vector-reg.regress.batched.opt$"
+			"^xml-reg.regress.batched.opt$"
+			"^gettextureinfo-udim.batched$"
+			"^gettextureinfo-udim.batched.opt$"
+			"^gettextureinfo-udim-reg.regress.batched.opt$"
+			"^pointcloud.batched$"
+			"^pointcloud.batched.opt$"
+		)
+	fi
+
+	myctestargs=(
+		# src/build-scripts/ci-test.bash
+		'--force-new-ctest-process'
+	)
+
+	local -x DEBUG CXXFLAGS LD_LIBRARY_PATH DIR OSL_DIR OSL_SOURCE_DIR PYTHONPATH
+	DEBUG=1 # doubles the floating point tolerance so we avoid FMA related issues
+	CXXFLAGS="-I${T}/usr/include"
+	LD_LIBRARY_PATH="${T}/usr/$(get_libdir)"
+	OSL_DIR="${T}/usr/$(get_libdir)/cmake/OSL"
+	OSL_SOURCE_DIR="${S}"
+
+	if use python; then
+		PYTHONPATH="${BUILD_DIR}/lib/python/site-packages"
+	fi
+
+	cmake_src_test
+
+	einfo ""
+	einfo "testing render tests in isolation"
+	einfo ""
+
+	CMAKE_SKIP_TESTS=(
+		"^render-background$"
+		"^render-bumptest$"
+		"^render-mx-furnace-sheen$"
+		"^render-mx-burley-diffuse$"
+		"^render-mx-conductor$"
+		"^render-mx-generalized-schlick-glass$"
+		"^render-microfacet$"
+		"^render-oren-nayar$"
+		"^render-veachmis$"
+		"^render-ward$"
+		"^render-raytypes.opt$"
+	)
+
+	myctestargs=(
+		# src/build-scripts/ci-test.bash
+		'--force-new-ctest-process'
+		--repeat until-pass:10
+		-R "^render"
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use test; then
+		rm \
+			"${ED}/usr/bin/test"{render,shade{,_dso}} \
+			"${ED}/usr/$(get_libdir)/libtestshade.so"* \
+			|| die
+	fi
+
+	if use amd64; then
+		find "${ED}/usr/$(get_libdir)" -type f  -name 'lib_*_oslexec.so' -print0 \
+			| while IFS= read -r -d $'\0' batched_lib; do
+			patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die
+		done
+	fi
+}
diff --git a/media-libs/osl/osl-1.12.14.0.ebuild b/media-libs/osl/osl-1.12.14.0.ebuild
deleted file mode 100644
index 6bbe929b50c3..000000000000
--- a/media-libs/osl/osl-1.12.14.0.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-# Check this on updates
-LLVM_MAX_SLOT=15
-
-inherit cmake flag-o-matic llvm toolchain-funcs python-single-r1
-
-DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="https://www.imageworks.com/technology/opensource https://github.com/AcademySoftwareFoundation/OpenShadingLanguage"
-# If a development release, please don't keyword!
-SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/OpenShadingLanguage-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
-
-X86_CPU_FEATURES=(
-	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="debug doc gui partio qt6 test ${CPU_FEATURES[@]%:*} python"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/pugixml
-	>=media-libs/openexr-3:0=
-	>=media-libs/openimageio-2.3.12.0:=
-	<llvm-core/clang-$((${LLVM_MAX_SLOT} + 1)):=
-	sys-libs/zlib:=
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	partio? ( media-libs/partio )
-	gui? (
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? (
-			dev-qt/qtbase:6[gui,widgets]
-		)
-	)
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-llvm_check_deps() {
-	has_version -r "llvm-core/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/875836
-	# https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1810
-	filter-lto
-
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	local mybatched=()
-	use cpu_flags_x86_avx && mybatched+=(
-		"b8_AVX"
-	)
-	use cpu_flags_x86_avx2 && mybatched+=(
-		"b8_AVX2"
-		"b8_AVX2_noFMA"
-	)
-	use cpu_flags_x86_avx512f && mybatched+=(
-		"b8_AVX512"
-		"b8_AVX512_noFMA"
-		"b16_AVX512"
-		"b16_AVX512_noFMA"
-	)
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-	[[ -z ${mybatched} ]] && mybatched=("0")
-
-	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
-	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
-	use arm64 && append-flags -flax-vector-conversions
-
-	local gcc="$(tc-getCC)"
-	local mycmakeargs=(
-		# std::tuple_size_v is c++17
-		-DCMAKE_CXX_STANDARD=17
-		-DDOWNSTREAM_CXX_STANDARD=17
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DINSTALL_DOCS=$(usex doc)
-		-DUSE_CCACHE=OFF
-		-DLLVM_STATIC=OFF
-		-DOSL_BUILD_TESTS=$(usex test)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_PARTIO=$(usex partio)
-		-DUSE_PYTHON=$(usex python)
-		-DPYTHON_VERSION="${EPYTHON/python}"
-		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
-		-DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
-	)
-
-	if use debug; then
-		mycmakeargs+=(
-			-DVEC_REPORT="yes"
-		)
-	fi
-
-	if use gui; then
-		mycmakeargs+=( -DUSE_QT=yes )
-		if ! use qt6; then
-			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON )
-		fi
-	else
-		mycmakeargs+=( -DUSE_QT=no )
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# TODO: investigate failures
-	local myctestargs=(
-		-E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward|render-raytypes.opt|color|color.opt|example-deformer)"
-	)
-
-	cmake_src_test
-}
diff --git a/media-libs/osl/osl-1.13.10.0-r1.ebuild b/media-libs/osl/osl-1.13.10.0-r1.ebuild
new file mode 100644
index 000000000000..ccf08a400628
--- /dev/null
+++ b/media-libs/osl/osl-1.13.10.0-r1.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+# Check this on updates
+LLVM_COMPAT=( {15..18} )
+
+inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="https://www.imageworks.com/technology/opensource https://github.com/AcademySoftwareFoundation/OpenShadingLanguage"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage.git"
+else
+	# If a development release, please don't keyword!
+	SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+	S="${WORKDIR}/OpenShadingLanguage-${PV}"
+fi
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)" # based on SONAME
+
+X86_CPU_FEATURES=(
+	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
+
+IUSE="debug doc gui libcxx nofma optix partio test ${CPU_FEATURES[*]%:*} python"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# TODO optix
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	>=media-libs/openimageio-2.4:=
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}=
+		llvm-core/llvm:${LLVM_SLOT}=
+	')
+	optix? ( dev-libs/optix[-headers-only] )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pybind11[${PYTHON_USEDEP}]
+			media-libs/openimageio[python,${PYTHON_SINGLE_USEDEP}]
+		')
+	)
+	partio? ( media-libs/partio )
+	gui? (
+		dev-qt/qtbase:6[gui,widgets,opengl]
+	)
+"
+
+DEPEND="${RDEPEND}
+	dev-util/patchelf
+	>=media-libs/openexr-3
+	sys-libs/zlib
+	test? (
+		media-fonts/droid
+	)
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-boost-config.patch"
+	"${FILESDIR}/${PN}-oslfile.patch"
+	"${FILESDIR}/${PN}-include-cstdint.patch"
+	"${FILESDIR}/${PN}-1.12.14.0-m_dz.patch"
+)
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if use optix; then
+		cuda_src_prepare
+		cuda_add_sandbox -w
+	fi
+
+	sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/875836
+	# https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1810
+	filter-lto
+
+	# pick the highest we support
+	local mysimd=()
+	if use cpu_flags_x86_avx512f; then
+		mysimd+=( avx512f )
+	elif use cpu_flags_x86_avx2 ; then
+		mysimd+=( avx2 )
+		if use cpu_flags_x86_f16c ; then
+			mysimd+=( f16c )
+		fi
+	elif use cpu_flags_x86_avx ; then
+		mysimd+=( avx )
+	elif use cpu_flags_x86_sse4_2 ; then
+		mysimd+=( sse4.2 )
+	elif use cpu_flags_x86_sse4_1 ; then
+		mysimd+=( sse4.1 )
+	elif use cpu_flags_x86_ssse3 ; then
+		mysimd+=( ssse3 )
+	elif use cpu_flags_x86_sse3 ; then
+		mysimd+=( sse3 )
+	elif use cpu_flags_x86_sse2 ; then
+		mysimd+=( sse2 )
+	fi
+
+	local mybatched=()
+	if use cpu_flags_x86_avx512f || use cpu_flags_x86_avx2 ; then
+		if use cpu_flags_x86_avx512f ; then
+			if use nofma; then
+				mybatched+=(
+					"b8_AVX512_noFMA"
+					"b16_AVX512_noFMA"
+				)
+			fi
+			mybatched+=(
+				"b8_AVX512"
+				"b16_AVX512"
+			)
+		fi
+		if use cpu_flags_x86_avx2 ; then
+			if use nofma; then
+				mybatched+=(
+					"b8_AVX2_noFMA"
+				)
+			fi
+			mybatched+=(
+				"b8_AVX2"
+			)
+		fi
+	fi
+	if use cpu_flags_x86_avx ; then
+		mybatched+=(
+			"b8_AVX"
+		)
+	fi
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z "${mysimd[*]}" ]] && mysimd=("0")
+	[[ -z "${mybatched[*]}" ]] && mybatched=("0")
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
+	use arm64 && append-flags -flax-vector-conversions
+
+	local gcc
+	gcc="$(tc-getCC)"
+
+	local mycmakeargs=(
+		-DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # BUG FindCUDA
+
+		# std::tuple_size_v is c++17
+		-DCMAKE_CXX_STANDARD="17"
+
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DINSTALL_DOCS="$(usex doc)"
+		-DUSE_CCACHE="no"
+		-DLLVM_STATIC="no"
+		-DOSL_BUILD_TESTS="$(usex test)"
+		-DSTOP_ON_WARNING="no"
+		-DUSE_PARTIO="$(usex partio)"
+		-DUSE_PYTHON="$(usex python)"
+		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+		-DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
+		-DUSE_LIBCPLUSPLUS="$(usex libcxx)"
+		-DOSL_USE_OPTIX="$(usex optix)"
+		-DUSE_QT="$(usex gui)"
+
+		-DOpenImageIO_ROOT="${EPREFIX}/usr"
+	)
+
+	if use debug; then
+		mycmakeargs+=(
+			-DVEC_REPORT="yes"
+		)
+	fi
+
+	if use optix; then
+		mycmakeargs+=(
+			-DOptiX_FIND_QUIETLY="no"
+			-DCUDA_FIND_QUIETLY="no"
+
+			-DOPTIXHOME="${EPREFIX}/opt/optix"
+			-DCUDA_TOOLKIT_ROOT_DIR="${EPREFIX}/opt/cuda"
+
+			-DCUDA_NVCC_FLAGS="--compiler-bindir;$(cuda_gccdir)"
+			-DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;$(cuda_gccdir)"
+			-DCUDA_VERBOSE_BUILD="yes"
+		)
+	fi
+
+	if use partio; then
+		mycmakeargs+=(
+			-Dpartio_DIR="${EPREFIX}/usr"
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			"-DPYTHON_VERSION=${EPYTHON#python}"
+			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A bunch of tests only work when installed.
+	# So install them into the temp directory now.
+	DESTDIR="${T}" cmake_build install
+
+	ln -s "${CMAKE_USE_DIR}/src/cmake/" "${BUILD_DIR}/src/cmake" || die
+
+	if use optix; then
+		cp \
+			"${BUILD_DIR}/src/liboslexec/shadeops_cuda.ptx" \
+			"${BUILD_DIR}/src/testrender/"{optix_raytracer,quad,rend_lib_testrender,sphere,wrapper}".ptx" \
+			"${BUILD_DIR}/src/testshade/"{optix_grid_renderer,rend_lib_testshade}".ptx" \
+			"${BUILD_DIR}/bin/" || die
+
+		# NOTE this should go to cuda eclass
+		addwrite /dev/nvidiactl
+		addwrite /dev/nvidia0
+		addwrite /dev/nvidia-uvm
+		addwrite /dev/nvidia-caps
+		addwrite "/dev/char/"
+	fi
+
+	CMAKE_SKIP_TESTS=(
+		"-broken$"
+		"^render"
+
+		# broken with in-tree <=dev-libs/optix-7.5.0 and out of date
+		"^example-cuda$"
+
+		# outright fail
+		"^testoptix.optix.opt$"
+		"^testoptix-noise.optix.opt$"
+		"^testoptix-reparam.optix.opt$"
+		"^transform-reg.regress.batched.opt$"
+		"^spline-reg.regress.batched.opt$"
+
+		# doesn't handle parameters
+		"^osl-imageio$"
+		"^osl-imageio.opt$"
+		"^osl-imageio.opt.rs_bitcode$"
+	)
+
+	if use optix; then
+		CMAKE_SKIP_TESTS+=(
+			"^color2.optix$"
+			"^color4.optix(|.opt|.fused)$"
+			"^vector2.optix$"
+			"^vector4.optix$"
+		)
+	fi
+
+	myctestargs=(
+		# src/build-scripts/ci-test.bash
+		'--force-new-ctest-process'
+	)
+
+	local -x DEBUG CXXFLAGS LD_LIBRARY_PATH DIR OSL_DIR OSL_SOURCE_DIR PYTHONPATH
+	DEBUG=1 # doubles the floating point tolerance so we avoid FMA related issues
+	CXXFLAGS="-I${T}/usr/include"
+	LD_LIBRARY_PATH="${T}/usr/$(get_libdir)"
+	OSL_DIR="${T}/usr/$(get_libdir)/cmake/OSL"
+	OSL_SOURCE_DIR="${S}"
+
+	if use python; then
+		PYTHONPATH="${BUILD_DIR}/lib/python/site-packages"
+	fi
+
+	cmake_src_test
+
+	einfo ""
+	einfo "testing render tests in isolation"
+	einfo ""
+
+	CMAKE_SKIP_TESTS=(
+		"^render-background$"
+		"^render-mx-furnace-sheen$"
+		"^render-mx-burley-diffuse$"
+		"^render-mx-conductor$"
+		"^render-microfacet$"
+		"^render-veachmis$"
+		"^render-ward$"
+		"^render-raytypes.opt$"
+		"^render-raytypes.opt.rs_bitcode$"
+	)
+
+	myctestargs=(
+		# src/build-scripts/ci-test.bash
+		'--force-new-ctest-process'
+		--repeat until-pass:10
+		-R "^render"
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if [[ -d "${ED}/usr/build-scripts" ]]; then
+		rm -vr "${ED}/usr/build-scripts" || die
+	fi
+
+	if use test; then
+		rm \
+			"${ED}/usr/bin/test"{render,shade{,_dso}} \
+			"${ED}/usr/$(get_libdir)/libtestshade.so"* \
+			|| die
+	fi
+
+	if use amd64; then
+		find "${ED}/usr/$(get_libdir)" -type f  -name 'lib_*_oslexec.so' -print0 \
+			| while IFS= read -r -d $'\0' batched_lib; do
+			patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die
+		done
+	fi
+}
diff --git a/media-libs/osl/osl-1.13.10.0.ebuild b/media-libs/osl/osl-1.13.10.0.ebuild
deleted file mode 100644
index 1ab9bcdd3d56..000000000000
--- a/media-libs/osl/osl-1.13.10.0.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-# Check this on updates
-LLVM_COMPAT=( {15..18} )
-
-inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1
-
-DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="https://www.imageworks.com/technology/opensource https://github.com/AcademySoftwareFoundation/OpenShadingLanguage"
-
-if [[ ${PV} = *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage.git"
-else
-	# If a development release, please don't keyword!
-	SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
-	S="${WORKDIR}/OpenShadingLanguage-${PV}"
-fi
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)" # based on SONAME
-
-X86_CPU_FEATURES=(
-	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
-
-IUSE="debug doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# TODO optix
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/pugixml
-	>=media-libs/openexr-3:0=
-	>=media-libs/openimageio-2.4:=
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
-	')
-	sys-libs/zlib:=
-	optix? ( dev-libs/optix[-headers-only] )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pybind11[${PYTHON_USEDEP}]
-			media-libs/openimageio[python,${PYTHON_SINGLE_USEDEP}]
-		')
-	)
-	partio? ( media-libs/partio )
-	gui? (
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtopengl:5
-		)
-		qt6? (
-			dev-qt/qtbase:6[gui,widgets,opengl]
-		)
-	)
-"
-
-DEPEND="${RDEPEND}
-	dev-util/patchelf
-	test? (
-		media-fonts/droid
-	)
-"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if use optix; then
-		cuda_src_prepare
-		cuda_add_sandbox -w
-	fi
-
-	sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/875836
-	# https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1810
-	filter-lto
-
-	# pick the highest we support
-	local mysimd=()
-	if use cpu_flags_x86_avx512f; then
-		mysimd+=( avx512f )
-	elif use cpu_flags_x86_avx2 ; then
-		mysimd+=( avx2 )
-		if use cpu_flags_x86_f16c ; then
-			mysimd+=( f16c )
-		fi
-	elif use cpu_flags_x86_avx ; then
-		mysimd+=( avx )
-	elif use cpu_flags_x86_sse4_2 ; then
-		mysimd+=( sse4.2 )
-	elif use cpu_flags_x86_sse4_1 ; then
-		mysimd+=( sse4.1 )
-	elif use cpu_flags_x86_ssse3 ; then
-		mysimd+=( ssse3 )
-	elif use cpu_flags_x86_sse3 ; then
-		mysimd+=( sse3 )
-	elif use cpu_flags_x86_sse2 ; then
-		mysimd+=( sse2 )
-	fi
-
-	local mybatched=()
-	if use cpu_flags_x86_avx512f || use cpu_flags_x86_avx2 ; then
-		if use cpu_flags_x86_avx512f ; then
-			if use nofma; then
-				mybatched+=(
-					"b8_AVX512_noFMA"
-					"b16_AVX512_noFMA"
-				)
-			fi
-			mybatched+=(
-				"b8_AVX512"
-				"b16_AVX512"
-			)
-		fi
-		if use cpu_flags_x86_avx2 ; then
-			if use nofma; then
-				mybatched+=(
-					"b8_AVX2_noFMA"
-				)
-			fi
-			mybatched+=(
-				"b8_AVX2"
-			)
-		fi
-	fi
-	if use cpu_flags_x86_avx ; then
-		mybatched+=(
-			"b8_AVX"
-		)
-	fi
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z "${mysimd[*]}" ]] && mysimd=("0")
-	[[ -z "${mybatched[*]}" ]] && mybatched=("0")
-
-	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
-	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
-	use arm64 && append-flags -flax-vector-conversions
-
-	local gcc
-	gcc="$(tc-getCC)"
-
-	local mycmakeargs=(
-		-DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # BUG FindCUDA
-
-		# std::tuple_size_v is c++17
-		-DCMAKE_CXX_STANDARD="17"
-
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DINSTALL_DOCS="$(usex doc)"
-		-DUSE_CCACHE="no"
-		-DLLVM_STATIC="no"
-		-DOSL_BUILD_TESTS="$(usex test)"
-		-DSTOP_ON_WARNING="no"
-		-DUSE_PARTIO="$(usex partio)"
-		-DUSE_PYTHON="$(usex python)"
-		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
-		-DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
-		-DUSE_LIBCPLUSPLUS="$(usex libcxx)"
-		-DOSL_USE_OPTIX="$(usex optix)"
-
-		-DOpenImageIO_ROOT="${EPREFIX}/usr"
-	)
-
-	if use debug; then
-		mycmakeargs+=(
-			-DVEC_REPORT="yes"
-		)
-	fi
-
-	if use gui; then
-		mycmakeargs+=( -DUSE_QT="yes" )
-		if ! use qt6; then
-			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" )
-		fi
-	else
-		mycmakeargs+=( -DUSE_QT="no" )
-	fi
-
-	if use optix; then
-		mycmakeargs+=(
-			-DOptiX_FIND_QUIETLY="no"
-			-DCUDA_FIND_QUIETLY="no"
-
-			-DOPTIXHOME="${EPREFIX}/opt/optix"
-			-DCUDA_TOOLKIT_ROOT_DIR="${EPREFIX}/opt/cuda"
-
-			-DCUDA_NVCC_FLAGS="--compiler-bindir;$(cuda_gccdir)"
-			-DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;$(cuda_gccdir)"
-			-DCUDA_VERBOSE_BUILD="yes"
-		)
-	fi
-
-	if use partio; then
-		mycmakeargs+=(
-			-Dpartio_DIR="${EPREFIX}/usr"
-		)
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			"-DPYTHON_VERSION=${EPYTHON#python}"
-			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# A bunch of tests only work when installed.
-	# So install them into the temp directory now.
-	DESTDIR="${T}" cmake_build install
-
-	ln -s "${CMAKE_USE_DIR}/src/cmake/" "${BUILD_DIR}/src/cmake" || die
-
-	if use optix; then
-		cp \
-			"${BUILD_DIR}/src/liboslexec/shadeops_cuda.ptx" \
-			"${BUILD_DIR}/src/testrender/"{optix_raytracer,quad,rend_lib_testrender,sphere,wrapper}".ptx" \
-			"${BUILD_DIR}/src/testshade/"{optix_grid_renderer,rend_lib_testshade}".ptx" \
-			"${BUILD_DIR}/bin/" || die
-
-		# NOTE this should go to cuda eclass
-		addwrite /dev/nvidiactl
-		addwrite /dev/nvidia0
-		addwrite /dev/nvidia-uvm
-		addwrite /dev/nvidia-caps
-		addwrite "/dev/char/"
-	fi
-
-	CMAKE_SKIP_TESTS=(
-		"-broken$"
-		"^render"
-
-		# broken with in-tree <=dev-libs/optix-7.5.0 and out of date
-		"^example-cuda$"
-
-		# outright fail
-		"^testoptix.optix.opt$"
-		"^testoptix-noise.optix.opt$"
-		"^testoptix-reparam.optix.opt$"
-		"^transform-reg.regress.batched.opt$"
-		"^spline-reg.regress.batched.opt$"
-
-		# doesn't handle parameters
-		"^osl-imageio$"
-		"^osl-imageio.opt$"
-		"^osl-imageio.opt.rs_bitcode$"
-	)
-
-	myctestargs=(
-		# src/build-scripts/ci-test.bash
-		'--force-new-ctest-process'
-	)
-
-	local -x DEBUG CXXFLAGS LD_LIBRARY_PATH DIR OSL_DIR OSL_SOURCE_DIR PYTHONPATH
-	DEBUG=1 # doubles the floating point tolerance so we avoid FMA related issues
-	CXXFLAGS="-I${T}/usr/include"
-	LD_LIBRARY_PATH="${T}/usr/$(get_libdir)"
-	OSL_DIR="${T}/usr/$(get_libdir)/cmake/OSL"
-	OSL_SOURCE_DIR="${S}"
-
-	if use python; then
-		PYTHONPATH="${BUILD_DIR}/lib/python/site-packages"
-	fi
-
-	cmake_src_test
-
-	einfo ""
-	einfo "testing render tests in isolation"
-	einfo ""
-
-	CMAKE_SKIP_TESTS=(
-		"^render-background$"
-		"^render-mx-furnace-sheen$"
-		"^render-mx-burley-diffuse$"
-		"^render-mx-conductor$"
-		"^render-microfacet$"
-		"^render-veachmis$"
-		"^render-ward$"
-		"^render-raytypes.opt$"
-		"^render-raytypes.opt.rs_bitcode$"
-	)
-
-	myctestargs=(
-		# src/build-scripts/ci-test.bash
-		'--force-new-ctest-process'
-		--repeat until-pass:10
-		-R "^render"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if [[ -d "${ED}/usr/build-scripts" ]]; then
-		rm -rf "${ED}/usr/build-scripts" || die
-	fi
-
-	for batched_lib in "${ED}/usr/$(get_libdir)/lib_"*"_oslexec.so"; do
-		patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die
-	done
-}
diff --git a/media-libs/osl/osl-1.13.12.0-r1.ebuild b/media-libs/osl/osl-1.13.12.0-r1.ebuild
new file mode 100644
index 000000000000..5f185caace4b
--- /dev/null
+++ b/media-libs/osl/osl-1.13.12.0-r1.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+# Check this on updates
+LLVM_COMPAT=( {15..19} )
+
+inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="https://www.imageworks.com/technology/opensource https://github.com/AcademySoftwareFoundation/OpenShadingLanguage"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage.git"
+else
+	# If a development release, please don't keyword!
+	SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	S="${WORKDIR}/OpenShadingLanguage-${PV}"
+fi
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)" # based on SONAME
+
+X86_CPU_FEATURES=(
+	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
+
+IUSE="debug doc gui libcxx nofma optix partio test ${CPU_FEATURES[*]%:*} python"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# TODO optix
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	>=media-libs/openimageio-2.4:=
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}=
+		llvm-core/llvm:${LLVM_SLOT}=
+	')
+	optix? ( dev-libs/optix[-headers-only] )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pybind11[${PYTHON_USEDEP}]
+			media-libs/openimageio[python,${PYTHON_SINGLE_USEDEP}]
+		')
+	)
+	partio? ( media-libs/partio )
+	gui? (
+		dev-qt/qtbase:6[gui,widgets,opengl]
+	)
+"
+
+DEPEND="${RDEPEND}
+	dev-util/patchelf
+	>=media-libs/openexr-3
+	sys-libs/zlib
+	test? (
+		media-fonts/droid
+	)
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-boost-config.patch"
+	"${FILESDIR}/${PN}-oslfile.patch"
+	"${FILESDIR}/${PN}-include-cstdint.patch"
+)
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if use optix; then
+		cuda_src_prepare
+		cuda_add_sandbox -w
+	fi
+
+	sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/875836
+	# https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1810
+	filter-lto
+
+	# pick the highest we support
+	local mysimd=()
+	if use cpu_flags_x86_avx512f; then
+		mysimd+=( avx512f )
+	elif use cpu_flags_x86_avx2 ; then
+		mysimd+=( avx2 )
+		if use cpu_flags_x86_f16c ; then
+			mysimd+=( f16c )
+		fi
+	elif use cpu_flags_x86_avx ; then
+		mysimd+=( avx )
+	elif use cpu_flags_x86_sse4_2 ; then
+		mysimd+=( sse4.2 )
+	elif use cpu_flags_x86_sse4_1 ; then
+		mysimd+=( sse4.1 )
+	elif use cpu_flags_x86_ssse3 ; then
+		mysimd+=( ssse3 )
+	elif use cpu_flags_x86_sse3 ; then
+		mysimd+=( sse3 )
+	elif use cpu_flags_x86_sse2 ; then
+		mysimd+=( sse2 )
+	fi
+
+	local mybatched=()
+	if use cpu_flags_x86_avx512f || use cpu_flags_x86_avx2 ; then
+		if use cpu_flags_x86_avx512f ; then
+			if use nofma; then
+				mybatched+=(
+					"b8_AVX512_noFMA"
+					"b16_AVX512_noFMA"
+				)
+			fi
+			mybatched+=(
+				"b8_AVX512"
+				"b16_AVX512"
+			)
+		fi
+		if use cpu_flags_x86_avx2 ; then
+			if use nofma; then
+				mybatched+=(
+					"b8_AVX2_noFMA"
+				)
+			fi
+			mybatched+=(
+				"b8_AVX2"
+			)
+		fi
+	fi
+	if use cpu_flags_x86_avx ; then
+		mybatched+=(
+			"b8_AVX"
+		)
+	fi
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z "${mysimd[*]}" ]] && mysimd=("0")
+	[[ -z "${mybatched[*]}" ]] && mybatched=("0")
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
+	use arm64 && append-flags -flax-vector-conversions
+
+	local gcc
+	gcc="$(tc-getCC)"
+
+	local mycmakeargs=(
+		-DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # BUG FindCUDA
+
+		# std::tuple_size_v is c++17
+		-DCMAKE_CXX_STANDARD="17"
+
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DINSTALL_DOCS="$(usex doc)"
+		-DUSE_CCACHE="no"
+		-DLLVM_STATIC="no"
+		-DOSL_BUILD_TESTS="$(usex test)"
+		-DSTOP_ON_WARNING="no"
+		-DUSE_PARTIO="$(usex partio)"
+		-DUSE_PYTHON="$(usex python)"
+		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+		-DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
+		-DUSE_LIBCPLUSPLUS="$(usex libcxx)"
+		-DOSL_USE_OPTIX="$(usex optix)"
+		-DUSE_QT="$(usex gui)"
+
+		-DOpenImageIO_ROOT="${EPREFIX}/usr"
+	)
+
+	if use debug; then
+		mycmakeargs+=(
+			-DVEC_REPORT="yes"
+		)
+	fi
+
+	if use optix; then
+		mycmakeargs+=(
+			-DOptiX_FIND_QUIETLY="no"
+			-DCUDA_FIND_QUIETLY="no"
+
+			-DOPTIXHOME="${EPREFIX}/opt/optix"
+			-DCUDA_TOOLKIT_ROOT_DIR="${EPREFIX}/opt/cuda"
+
+			-DCUDA_NVCC_FLAGS="--compiler-bindir;$(cuda_gccdir)"
+			-DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;$(cuda_gccdir)"
+			-DCUDA_VERBOSE_BUILD="yes"
+		)
+	fi
+
+	if use partio; then
+		mycmakeargs+=(
+			-Dpartio_DIR="${EPREFIX}/usr"
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			"-DPYTHON_VERSION=${EPYTHON#python}"
+			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A bunch of tests only work when installed.
+	# So install them into the temp directory now.
+	DESTDIR="${T}" cmake_build install
+
+	ln -s "${CMAKE_USE_DIR}/src/cmake/" "${BUILD_DIR}/src/cmake" || die
+
+	if use optix; then
+		cp \
+			"${BUILD_DIR}/src/liboslexec/shadeops_cuda.ptx" \
+			"${BUILD_DIR}/src/testrender/"{optix_raytracer,quad,rend_lib_testrender,sphere,wrapper}".ptx" \
+			"${BUILD_DIR}/src/testshade/"{optix_grid_renderer,rend_lib_testshade}".ptx" \
+			"${BUILD_DIR}/bin/" || die
+
+		# NOTE this should go to cuda eclass
+		addwrite /dev/nvidiactl
+		addwrite /dev/nvidia0
+		addwrite /dev/nvidia-uvm
+		addwrite /dev/nvidia-caps
+		addwrite "/dev/char/"
+	fi
+
+	CMAKE_SKIP_TESTS=(
+		"-broken$"
+		"^render"
+
+		# broken with in-tree <=dev-libs/optix-7.5.0 and out of date
+		"^example-cuda$"
+
+		# outright fail
+		"^testoptix.optix.opt$"
+		"^testoptix-noise.optix.opt$"
+		"^testoptix-reparam.optix.opt$"
+		"^transform-reg.regress.batched.opt$"
+		"^spline-reg.regress.batched.opt$"
+
+		# doesn't handle parameters
+		"^osl-imageio$"
+		"^osl-imageio.opt$"
+		"^osl-imageio.opt.rs_bitcode$"
+	)
+
+	if use optix; then
+		CMAKE_SKIP_TESTS+=(
+			"^color2.optix$"
+			"^color4.optix(|.opt|.fused)$"
+			"^vector2.optix$"
+			"^vector4.optix$"
+		)
+	fi
+
+	myctestargs=(
+		# src/build-scripts/ci-test.bash
+		'--force-new-ctest-process'
+	)
+
+	local -x DEBUG CXXFLAGS LD_LIBRARY_PATH DIR OSL_DIR OSL_SOURCE_DIR PYTHONPATH
+	DEBUG=1 # doubles the floating point tolerance so we avoid FMA related issues
+	CXXFLAGS="-I${T}/usr/include"
+	LD_LIBRARY_PATH="${T}/usr/$(get_libdir)"
+	OSL_DIR="${T}/usr/$(get_libdir)/cmake/OSL"
+	OSL_SOURCE_DIR="${S}"
+
+	if use python; then
+		PYTHONPATH="${BUILD_DIR}/lib/python/site-packages"
+	fi
+
+	cmake_src_test
+
+	einfo ""
+	einfo "testing render tests in isolation"
+	einfo ""
+
+	CMAKE_SKIP_TESTS=(
+		"^render-background$"
+		"^render-mx-furnace-sheen$"
+		"^render-mx-burley-diffuse$"
+		"^render-mx-conductor$"
+		"^render-microfacet$"
+		"^render-veachmis$"
+		"^render-ward$"
+		"^render-raytypes.opt$"
+		"^render-raytypes.opt.rs_bitcode$"
+	)
+
+	myctestargs=(
+		# src/build-scripts/ci-test.bash
+		'--force-new-ctest-process'
+		--repeat until-pass:10
+		-R "^render"
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if [[ -d "${ED}/usr/build-scripts" ]]; then
+		rm -vr "${ED}/usr/build-scripts" || die
+	fi
+
+	if use test; then
+		rm \
+			"${ED}/usr/bin/test"{render,shade{,_dso}} \
+			"${ED}/usr/$(get_libdir)/libtestshade.so"* \
+			|| die
+	fi
+
+	if use amd64; then
+		find "${ED}/usr/$(get_libdir)" -type f  -name 'lib_*_oslexec.so' -print0 \
+			| while IFS= read -r -d $'\0' batched_lib; do
+			patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die
+		done
+	fi
+}
diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-9999.ebuild
index 40728570e380..5f185caace4b 100644
--- a/media-libs/osl/osl-9999.ebuild
+++ b/media-libs/osl/osl-9999.ebuild
@@ -1,12 +1,12 @@
-# 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} )
 
 # Check this on updates
-LLVM_COMPAT=( {15..18} )
+LLVM_COMPAT=( {15..19} )
 
 inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1
 
@@ -32,7 +32,7 @@ X86_CPU_FEATURES=(
 )
 CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
 
-IUSE="debug doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python"
+IUSE="debug doc gui libcxx nofma optix partio test ${CPU_FEATURES[*]%:*} python"
 
 RESTRICT="!test? ( test )"
 
@@ -42,13 +42,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/pugixml
-	>=media-libs/openexr-3:0=
 	>=media-libs/openimageio-2.4:=
 	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
+		llvm-core/clang:${LLVM_SLOT}=
+		llvm-core/llvm:${LLVM_SLOT}=
 	')
-	sys-libs/zlib:=
 	optix? ( dev-libs/optix[-headers-only] )
 	python? (
 		${PYTHON_DEPS}
@@ -59,20 +57,14 @@ RDEPEND="
 	)
 	partio? ( media-libs/partio )
 	gui? (
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtopengl:5
-		)
-		qt6? (
-			dev-qt/qtbase:6[gui,widgets,opengl]
-		)
+		dev-qt/qtbase:6[gui,widgets,opengl]
 	)
 "
 
 DEPEND="${RDEPEND}
 	dev-util/patchelf
+	>=media-libs/openexr-3
+	sys-libs/zlib
 	test? (
 		media-fonts/droid
 	)
@@ -83,6 +75,12 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-boost-config.patch"
+	"${FILESDIR}/${PN}-oslfile.patch"
+	"${FILESDIR}/${PN}-include-cstdint.patch"
+)
+
 pkg_setup() {
 	llvm-r1_pkg_setup
 
@@ -189,6 +187,7 @@ src_configure() {
 		-DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
 		-DUSE_LIBCPLUSPLUS="$(usex libcxx)"
 		-DOSL_USE_OPTIX="$(usex optix)"
+		-DUSE_QT="$(usex gui)"
 
 		-DOpenImageIO_ROOT="${EPREFIX}/usr"
 	)
@@ -199,15 +198,6 @@ src_configure() {
 		)
 	fi
 
-	if use gui; then
-		mycmakeargs+=( -DUSE_QT="yes" )
-		if ! use qt6; then
-			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" )
-		fi
-	else
-		mycmakeargs+=( -DUSE_QT="no" )
-	fi
-
 	if use optix; then
 		mycmakeargs+=(
 			-DOptiX_FIND_QUIETLY="no"
@@ -280,6 +270,15 @@ src_test() {
 		"^osl-imageio.opt.rs_bitcode$"
 	)
 
+	if use optix; then
+		CMAKE_SKIP_TESTS+=(
+			"^color2.optix$"
+			"^color4.optix(|.opt|.fused)$"
+			"^vector2.optix$"
+			"^vector4.optix$"
+		)
+	fi
+
 	myctestargs=(
 		# src/build-scripts/ci-test.bash
 		'--force-new-ctest-process'
@@ -328,10 +327,20 @@ src_install() {
 	cmake_src_install
 
 	if [[ -d "${ED}/usr/build-scripts" ]]; then
-		rm -rf "${ED}/usr/build-scripts" || die
+		rm -vr "${ED}/usr/build-scripts" || die
 	fi
 
-	for batched_lib in "${ED}/usr/$(get_libdir)/lib_"*"_oslexec.so"; do
-		patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die
-	done
+	if use test; then
+		rm \
+			"${ED}/usr/bin/test"{render,shade{,_dso}} \
+			"${ED}/usr/$(get_libdir)/libtestshade.so"* \
+			|| die
+	fi
+
+	if use amd64; then
+		find "${ED}/usr/$(get_libdir)" -type f  -name 'lib_*_oslexec.so' -print0 \
+			| while IFS= read -r -d $'\0' batched_lib; do
+			patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die
+		done
+	fi
 }
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index 859d45911c02..2e7d282c0cde 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -1,2 +1,2 @@
-DIST partio-1.14.6.tar.gz 336527 BLAKE2B 60c9c6ad9d5a7b58967e7633180d4f8d399bd129cc7b76fc4329b3d191ce0d381df7f977d5ec11ccedbdbcd8afa0fde2f946960f08a242338c2f674b4c94343e SHA512 5479d00b3124e8e06abbc65b1cdc01cdac37b9207c0615029e488baa0835e4ad545be2fb07dda5b4541dd846115059aaca5950ff904bddec6bb1fd72180ebcc0
 DIST partio-1.17.1.tar.gz 338461 BLAKE2B 6c08d5b74db34ce114206ab92332e42e827d537d83e65597ba777344e1b9dc69f9b57153f716e87df6955b9898cedcd7e6da353db111463d7c8bd47f648cca6a SHA512 5dbbd988c76a26ac6f3024e29ed12f37f7995daf211e065b9ffaf185c6203be7d9de48bd62b5955d2f5444af72fb3306ea5a0f3501cb0a49a26f157bb09ec6bc
+DIST partio-1.17.3.tar.gz 338044 BLAKE2B 5842c5e1ee728d5e3ea77258293b1cd0a72147ac1229e2156741cfe9a55971e2dd30d2b8e239b0a3cde8e055f564d98cd7c29cf649d33eb9f1891158ba69c1c7 SHA512 b110d29b9d4226c773adf8b98f0bcb78a877d5bf944b09500d81d2810dc2e4cc1386cbe29aa724fc256c00f6df34e171a091b2ddc60aedc9fa2576eb00a3fefa
diff --git a/media-libs/partio/partio-1.14.6.ebuild b/media-libs/partio/partio-1.14.6.ebuild
deleted file mode 100644
index 1f7714410e59..000000000000
--- a/media-libs/partio/partio-1.14.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit cmake python-single-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wdas/partio.git"
-else
-	SRC_URI="https://github.com/wdas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Library for particle IO and manipulation"
-HOMEPAGE="http://partio.us/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	media-libs/freeglut
-	media-libs/glu
-	sys-libs/zlib
-	virtual/opengl
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-lang/swig
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package doc Doxygen)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/partio/partio-1.17.3.ebuild b/media-libs/partio/partio-1.17.3.ebuild
new file mode 100644
index 000000000000..49cd9a61e83f
--- /dev/null
+++ b/media-libs/partio/partio-1.17.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake python-single-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wdas/partio.git"
+else
+	SRC_URI="https://github.com/wdas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library for particle IO and manipulation"
+HOMEPAGE="https://partio.us/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	media-libs/freeglut
+	media-libs/glu
+	sys-libs/zlib
+	virtual/opengl
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+	)
+"
+
+BDEPEND="
+	dev-lang/swig
+	doc? (
+		app-text/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		"$(cmake_use_find_package doc Doxygen)"
+
+		-DPARTIO_GTEST_ENABLED="$(usex test)" # "Enable GTest for tests"
+		-DPARTIO_ORIGIN_RPATH="no" # "Enable ORIGIN rpath in the installed libraries"
+
+		-DPARTIO_USE_GLVND="yes" # "Use GLVND for OpenGL"
+		-DPARTIO_BUILD_SHARED_LIBS="yes" # "Enabled shared libraries"
+
+		-DWDAS_CXX_STANDARD=17
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	CMAKE_SKIP_TESTS=(
+		# fail on import partjson, partio
+		testpartjson
+		testpartio
+	)
+
+	cmake_src_test
+}
diff --git a/media-libs/pulseaudio-qt/Manifest b/media-libs/pulseaudio-qt/Manifest
index f41af1127a1e..94f388ac2f4b 100644
--- a/media-libs/pulseaudio-qt/Manifest
+++ b/media-libs/pulseaudio-qt/Manifest
@@ -1 +1,2 @@
 DIST pulseaudio-qt-1.6.1.tar.xz 38072 BLAKE2B 2d25c05ecc3f401ce4881ae1902f4b1798586bb61c758a7fcb150225c1223bc38c4a053db4502e7ff813d73cc4d34b4887a7f24c7d352893c0da02166768d66c SHA512 7bb79bdc77d2fd8d8be569f692fa0f63b3f000fe5db605c38220a572878120ebe505edc272c43f4a3b22c70f44ee2d8cd0a0be3015c3d7660764258eca62b459
+DIST pulseaudio-qt-1.7.0.tar.xz 40684 BLAKE2B a96571914801e47c33404019edce949c4f7ba75e592051fdf4675b08b6c45aaef0b039212152eaf5f8d24386a9fa83e349ec263fbce6272c2887cde982d65db8 SHA512 e59f30eff77bfcb566b4215e9c3aea2a39acde4fdc460eb768da3280ffece8b63547345e0fb3e65b5a50321889f4c210525b141148b027b71cb5a48942402b3b
diff --git a/media-libs/pulseaudio-qt/pulseaudio-qt-1.6.1.ebuild b/media-libs/pulseaudio-qt/pulseaudio-qt-1.6.1.ebuild
index 714faa3d4c02..32aead60bf06 100644
--- a/media-libs/pulseaudio-qt/pulseaudio-qt-1.6.1.ebuild
+++ b/media-libs/pulseaudio-qt/pulseaudio-qt-1.6.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
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/libraries/pulseaudio-qt"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/pulseaudio-qt/pulseaudio-qt-1.7.0.ebuild b/media-libs/pulseaudio-qt/pulseaudio-qt-1.7.0.ebuild
new file mode 100644
index 000000000000..e5b5ef100ea5
--- /dev/null
+++ b/media-libs/pulseaudio-qt/pulseaudio-qt-1.7.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm kde.org
+
+DESCRIPTION="Qt bindings for libpulse"
+HOMEPAGE="https://invent.kde.org/libraries/pulseaudio-qt"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/5"
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,dbus]
+	media-libs/libpulse[glib]
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtdeclarative-${QTMIN}:6 )
+"
+BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.8.0.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.8.0.ebuild
index 993482241b08..91f66fe7fe7e 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.8.0.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.8.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
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
 IUSE="flac fluidsynth gme midi mod modplug mp3 opus playtools stb timidity tremor vorbis +wav wavpack xmp"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 6df60c02308b..25d3cc44ac9f 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,2 +1,3 @@
 DIST shaderc-2024.1.tar.gz 227211 BLAKE2B a4c9790cb117e4cf2d528ed294ef0599dc3c17ac367a4f658254ff9e161f82b3338a2d70a033fabcdb7a2925c2f4668ee89cfff0d4b88cd2b22fcfb3f2786ea9 SHA512 017d8625c66da7eb5b431f595b27a4ddf146aaa12ef56777cb8c3f7f0f15eb01c3286e5905c5268de55d07cc19d5ffae4d4c08987d105b0a6be74616a467b736
 DIST shaderc-2024.3.tar.gz 227490 BLAKE2B 0f9df6251b1a107c89a4e509c7a36f4035b5282f11e0b00cb7a1603b3212917894e805337d2404509b839dd9ac40aa19d8aa23bf6666b330dae2cfdabc18c9c6 SHA512 ba990054b3e50bd1c3e7decaca80b80dfade0f15505f6e89c455b7a114b8507931dff2c570ca81fd38882472e7d7014c417ca8f4c1117fc0e6825ea9f669222a
+DIST shaderc-2024.4.tar.gz 228004 BLAKE2B c694985ff96659756f70196d98fb48a82c2b05f917b0eb44596558bc17529bad51a282806c973278beb26ec97dd17235659e45b8814c815155448ab8bd7adc94 SHA512 d313af65e76664640020c964cbd7021e3b6f12ea839a58ef67f6052d9af684fc7fd237a687737e6483f24b89d5c85b3e0c0fafeec66b3646f77031cb0d6c9587
diff --git a/media-libs/shaderc/shaderc-2024.4.ebuild b/media-libs/shaderc/shaderc-2024.4.ebuild
new file mode 100644
index 000000000000..eea04b594021
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2024.4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
+HOMEPAGE="https://github.com/google/shaderc"
+EGIT_COMMIT="${PV}"
+SRC_URI="https://github.com/google/${PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-util/glslang-1.4.304.0:=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-1.4.304.0[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/spirv-headers-1.4.304.0"
+
+BDEPEND="doc? ( dev-ruby/asciidoctor )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2020.4-fix-build.patch
+)
+
+# https://github.com/google/shaderc/issues/470
+RESTRICT=test
+
+src_prepare() {
+	cmake_comment_add_subdirectory examples
+
+	# Unbundle glslang, spirv-headers, spirv-tools
+	cmake_comment_add_subdirectory third_party
+	sed -i \
+		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
+		glslc/test/CMakeLists.txt || die
+
+	# Disable git versioning
+	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
+
+	# Manually create build-version.inc as we disabled git versioning
+	cat <<- EOF > glslc/src/build-version.inc || die
+		"${P}\n"
+		"$(best_version dev-util/spirv-tools)\n"
+		"$(best_version dev-util/glslang)\n"
+	EOF
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSHADERC_SKIP_TESTS="true"
+		-DSHADERC_ENABLE_WERROR_COMPILE="false"
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi && use doc; then
+		cmake_src_compile glslc_doc_README
+	fi
+	cmake_src_compile
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
+	fi
+	cmake_src_install
+}
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index 772a0ea39265..1200b9bf8eca 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -1,4 +1,3 @@
 DIST libsrtp-a566a9cfcd619e8327784aa7cff4a1276dc1e895.tar.gz 636836 BLAKE2B 496afcb80f67a8f76104e338408d4930475daadaf3f7cd2d673336aef938986876995e475a4d932424d7f99f6a339bad360f566d6fd3719316eaf8241970cf8d SHA512 930e665434e80e8a26d81b785563c915619b546a9a0af0455a14278816997074add852fae107027f4899415cb0ab47ffbf9492bea76b94b10f558b52098bbf92
 DIST libyuv-04821d1e7d60845525e8db55c7bcd41ef5be9406.tar.bz2 418856 BLAKE2B a72e1f75491785b272b0ded46368a67aadb643278e5764d16dcd902ab7e4139d8664ffbacd940f30113ce3171e0b0846fe0d6111ced17c5b08f326cd61b2af14 SHA512 ff9cfbb61a1361e959740d00c741dc6fbe71ca7c61770abc35f70aada402df3884d7d5992ae79472dfe3d7641154d4f13065593fee41bf8eae924e26cc654117
-DIST tg_owt-0_pre20240804.tar.gz 11722734 BLAKE2B 084bedf7ae20ba173244851e82749dba31ba1320d83d021876f12350ecaa2fb03e47857fdc8013c87df6cae6e9250ec78548b498f35a92d305a28070475f36e4 SHA512 12bc17f39569f8b09c793d0e65b82926325c8d9046454e385ef7c82ab26f4e39e8f44f7491c80be71743abd78565bca50023b62365437fc8e43fc23d1b64840b
 DIST tg_owt-0_pre20241202.tar.gz 11722610 BLAKE2B effe7b833db593bdbf5d923b362cbc8839853e068d22ac1efd39ae8287eac0aeb71e74bf4476fa2a1a1b67c4e7370c6bc3b28d97e510c50b9621761b9b7be219 SHA512 10b7d0686fabc289694c659bcd138737b33375d0aad936e0cf8dcdebeebf30e7c0e1af7a9196c4275bcbb88b5867bcefa8179564980941895a6b7d9bfae822b2
diff --git a/media-libs/tg_owt/tg_owt-0_pre20240804-r2.ebuild b/media-libs/tg_owt/tg_owt-0_pre20240804-r2.ebuild
deleted file mode 100644
index 0c0d80f929dc..000000000000
--- a/media-libs/tg_owt/tg_owt-0_pre20240804-r2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="WebRTC build for Telegram"
-HOMEPAGE="https://github.com/desktop-app/tg_owt"
-
-TG_OWT_COMMIT="dc17143230b5519f3c1a8da0079e00566bd4c5a8"
-LIBYUV_COMMIT="04821d1e7d60845525e8db55c7bcd41ef5be9406"
-LIBSRTP_COMMIT="a566a9cfcd619e8327784aa7cff4a1276dc1e895"
-SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://gitlab.com/chromiumsrc/libyuv/-/archive/${LIBYUV_COMMIT}/libyuv-${LIBYUV_COMMIT}.tar.bz2
-	https://github.com/cisco/libsrtp/archive/${LIBSRTP_COMMIT}.tar.gz -> libsrtp-${LIBSRTP_COMMIT}.tar.gz"
-S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
-# Upstream libyuv: https://chromium.googlesource.com/libyuv/libyuv
-
-LICENSE="BSD"
-SLOT="0/${PV##*pre}"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv"
-IUSE="screencast +X"
-
-# This package's USE flags may change the ABI and require a rebuild of
-#  dependent pacakges. As such, one should make sure to depend on
-#  media-libs/tg_owt[x=,y=,z=] for any package that uses this.
-# Furthermore, the -DNDEBUG preprocessor flag should be defined by any
-#  dependent package, failure to do so will change the ABI in the header files.
-
-# Bundled libs:
-# - libyuv (no stable versioning, www-client/chromium and media-libs/libvpx bundle it)
-# - libsrtp (project uses private APIs)
-# - pffft (no stable versioning, patched)
-RDEPEND="
-	>=dev-cpp/abseil-cpp-20240722.0:=
-	dev-libs/openssl:=
-	dev-libs/protobuf:=
-	media-libs/libjpeg-turbo:=
-	>=media-libs/libvpx-1.10.0:=
-	media-libs/openh264:=
-	media-libs/opus
-	media-video/ffmpeg:=
-	dev-libs/crc32c
-	screencast? (
-		dev-libs/glib:2
-		>=media-video/pipewire-1.0.7:=
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXrender
-		x11-libs/libXrandr
-		x11-libs/libXtst
-	)
-"
-DEPEND="${RDEPEND}
-	screencast? (
-		media-libs/libglvnd[X]
-		media-libs/mesa
-		x11-libs/libdrm
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )
-"
-
-src_unpack() {
-	default
-
-	mv -T "libyuv-${LIBYUV_COMMIT}" "${S}/src/third_party/libyuv" || die
-	mv -T "libsrtp-${LIBSRTP_COMMIT}" "${S}/src/third_party/libsrtp" || die
-}
-
-src_prepare() {
-	# The sources for these aren't available, avoid needing them
-	sed -e '/include(cmake\/libcrc32c.cmake)/d' \
-		-e '/include(cmake\/libabsl.cmake)/d' -i CMakeLists.txt || die
-
-	# "lol" said the scorpion, "lmao"
-	sed -i '/if (BUILD_SHARED_LIBS)/{n;n;s/WARNING/DEBUG/}' CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Defined by -DCMAKE_BUILD_TYPE=Release, avoids crashes
-	# See https://bugs.gentoo.org/754012
-	# EAPI 8 still wipes this flag.
-	append-cppflags '-DNDEBUG'
-
-	local mycmakeargs=(
-		-DTG_OWT_USE_X11=$(usex X)
-		-DTG_OWT_USE_PIPEWIRE=$(usex screencast)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# Save about 15MB of useless headers
-	rm -r "${ED}/usr/include/tg_owt/rtc_base/third_party" || die
-	rm -r "${ED}/usr/include/tg_owt/common_audio/third_party" || die
-	rm -r "${ED}/usr/include/tg_owt/modules/third_party" || die
-	rm -r "${ED}/usr/include/tg_owt/third_party" || die
-
-	# Install a few headers anyway, as required by net-im/telegram-desktop...
-	local headers=(
-		third_party/libyuv/include
-		rtc_base/third_party/sigslot
-		rtc_base/third_party/base64
-	)
-	for dir in "${headers[@]}"; do
-		pushd "${S}/src/${dir}" > /dev/null || die
-		find -type f -name "*.h" -exec install -Dm644 '{}' "${ED}/usr/include/tg_owt/${dir}/{}" \; || die
-		popd > /dev/null || die
-	done
-}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index e67afc60055f..0f185a008606 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,2 +1,3 @@
 DIST vulkan-layers-1.3.290.0.tar.gz 5270142 BLAKE2B cdd22f6dd3b4da9433cba1c0d0ace16961bad2d61279efca3a0d7e5ad885766f25377036f3418ba3ed4e93beeff717b8b45fc772e9e2ad8750a8aac0aec731d2 SHA512 9f1d512b4bafbcef586789e933f903c383bbb9644d0a978a390da16e03ee2395c39c9c7b622e437e1c74880409df0a3cfc3a44b066cc0efeaee8d1edb9349d26
 DIST vulkan-layers-1.3.296.0.tar.gz 5529046 BLAKE2B 42d321cff2cf7f6c0377b5deff298df60811026a4121dc3315610d53059e5db435494c138dfef5844d71e51536572bd8601dc496e88362f3c68ae0562680ac4f SHA512 457edee35a347456391c9b36bdf5d457f05210b6a8889d0623498582d3385bed474fbd7dae66406d20f70d96238ca752414eaa844b86b431ec7f8cf721d46d08
+DIST vulkan-layers-1.4.304.0.tar.gz 5940153 BLAKE2B 68e4f944383c4f4a574c83735c36b8521fbde4ecaf346cf99c1b925358b4178bacaca75bb5b5fb0684ed15255c331c777bdea44ae7a62def20998971f2d968d9 SHA512 1b13ab2d196b5a9c5e85d0d8679ba0ca03b0c0c18f456ac9fb4314cd283b834883d4a89421a32627e266022dbd1b6684955799906c874e8c325c404738d49a4c
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.4.304.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.4.304.0.ebuild
new file mode 100644
index 000000000000..fcdb3b98ed3a
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.4.304.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-ValidationLayers
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland X"
+
+RDEPEND="~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-cpp/robin-hood-hashing-3.11.5-r2
+	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
+	~dev-util/spirv-headers-${PV}
+	~dev-util/vulkan-headers-${PV}
+	~dev-util/vulkan-utility-libraries-${PV}:=[${MULTILIB_USEDEP}]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+QA_SONAME="/usr/lib[^/]*/libVkLayer_khronos_validation.so"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_WERROR=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name \*.a -delete || die
+}
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index a50167832bd5..7d20dc7cfee0 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,2 +1,3 @@
 DIST vulkan-loader-1.3.290.0.tar.gz 1711013 BLAKE2B 72c55f07537df0e0ad0fedb4a3b913cde9b6d5038370c0e92bf15ad9ee881f5910842a1b5ee00d370b93341aefbd141414b77e7ac8823d101a861829cd9f338b SHA512 42ecf05e498f6422cea9d6ef70df5a936536524c1ff4d8cb391b5c55dd409082a6b2fc2eee5b395306c782ca32a7344faceef3e5385b382fb5a7e6564cfce4b5
 DIST vulkan-loader-1.3.296.0.tar.gz 1719284 BLAKE2B 5e31e490b8e301ba7b8f0fe589e3056434701bac2897fe9b1b72651d7ac0268b9b63b72003664a30f20646c7c54987c75c765ab4e39fa994603ff56fea8be3fc SHA512 535b7f324348e9edf44ff6a6a6e9eabe6e3a4bfad79bef789d1dc0cbbe3de36b6495a05236323d155631b081b89c18bb8668c79d1f735b59fc85ebee555aa682
+DIST vulkan-loader-1.4.304.0.tar.gz 1756893 BLAKE2B e5b28b37a4d86ff803b228515e38d96ac078d878f02afdc236722ccd0afac85f254347a22a5a21c7cfe997d1a769eb2b561953a7097b6632c0c7026b950b99fb SHA512 331792dab0e321c8d9ca266a6675ae431ead7babcf59da6f8ca14bacbfb8933c2d0c65dd05545b90a972c8c2bb811ba2b68c88b641f0469850d440d791dae443
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.4.304.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.4.304.0.ebuild
new file mode 100644
index 000000000000..35b52db1dcba
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.4.304.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Loader
+inherit flag-o-matic cmake-multilib toolchain-funcs
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+DEPEND="
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+PDEPEND="layers? ( media-libs/vulkan-layers[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	# Integrated clang assembler doesn't work with x86 - Bug #698164
+	if tc-is-clang && [[ ${ABI} == x86 ]]; then
+		append-cflags -fno-integrated-as
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_TESTS=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+	)
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake_src_install
+}
diff --git a/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.3-r3.ebuild b/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.3-r3.ebuild
index fecb72dc5eec..112b1203df41 100644
--- a/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.3-r3.ebuild
+++ b/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.3-r3.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="1"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux"
 IUSE="cpu_flags_arm_neon"
 
 RDEPEND="dev-cpp/abseil-cpp:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugin-gtk4/Manifest b/media-plugins/gst-plugin-gtk4/Manifest
new file mode 100644
index 000000000000..1b545d93b606
--- /dev/null
+++ b/media-plugins/gst-plugin-gtk4/Manifest
@@ -0,0 +1,132 @@
+DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
+DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
+DIST async-channel-2.3.1.crate 14576 BLAKE2B 09ea03c9758805c90be9aba222e1d74f3166ab492e533597647d1b4f08bf1dda79d73b21de791b9802e19c225cb94b7cb25550bba61488c7b61fa87f88eb29dd SHA512 94c999912bdf681dcb686292645bc8c340c2687bc9544f317e0123e672752c6b31e9d784e488e7d0bab79b5f207da8904a7f1fe140397513b47c292a6508a7e5
+DIST atomic_refcell-0.1.13.crate 11760 BLAKE2B 154efe12b2af05077764e5d9f292f5e5400d39fbb222f36146723312ccc3c6e3b96db8a13396394f30e30f19c6af830ef4fb1df8d4974b6c0285518d3a3c9850 SHA512 f5318e422d02904131ebf5f577ec51fb3d8bcbbfa52096b590df100acf8e991b17b04ad93b898e69628ed6308388a7243199c2da9be927144d3f6737d9343e3f
+DIST autocfg-1.4.0.crate 17712 BLAKE2B 7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6 SHA512 3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c
+DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf
+DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
+DIST cairo-rs-0.20.7.crate 52722 BLAKE2B d3e649b7865de548958b3b0ce00eac879c4e7e5e60bb7baee8af3eceaca45dd57fb23aa39b3c13733b4f66db102481fb087d531556ddaa801891c0a929c4c3c7 SHA512 cf4ea2cb6175e3dc06a110a4b6eb1aca08a5c7baac554e883afa2ffc3c0ab0a28b91d406a2a688c584dbdb5c6efa75812d2ce965bad6be7bdc60a50b6c34ce64
+DIST cairo-sys-rs-0.20.7.crate 11934 BLAKE2B 8a466f1110818d2eec321d98568ff08e0a1efe344f2e232cdc3953371dfe1ec628e744f88e378d2611c4540b86a0178f518522ec76a7fda22d70a624949d6bc4 SHA512 1d604b3001aac0969fdf00f1434f0a8107a056816ac299364709c38bba0601f187216fdcaceb803c6bfb05bd1829b01d7552b8cb7a725e84388dd37578e7673b
+DIST cc-1.2.5.crate 99839 BLAKE2B cbc49474bea2880a8908762a3bd03dd853cc9b342a51071a8cc1cbd3c0db2b8ec054c44e844bec021487e8f06bb8c5299e5b29a13b73e24d6f313918d0e9c929 SHA512 364066b0f45ee99cab088833a0e095ec3e7f3d8e2a0c4030ffca65f8c35174f23fb9b7ce0b97590bfd747fbc33c1851c6c8d74979e8a2250640f8cc2509d4daf
+DIST cfg-expr-0.17.2.crate 44034 BLAKE2B db894b3de251f75fa1d95d89ae06ec4b70f561f190cc6eeebbac3293bc95a1d8e143c86f8c35556d76773b53f10fdede3d9b18a388b533db658882cf6d1574b8 SHA512 115cfefd8e12744985489fd4895b3c66bdcbd9b62b52af9f6216cb6916f09c95564e880306bbe6167aa788638fdb7c3b808534bbbf2e092c0eb41700208ad62e
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST chrono-0.4.39.crate 222248 BLAKE2B eeff1694a98e8775524c261c5c46ebf09bf1ffc6222a945576960e8153af99e4549d8c988bd086507fa430f9cb15a3159be85300247ab3c6f5e77ab515f0988b SHA512 5b258f76bea58ab9baa0fe8fb32c41928b8b655c76bb2fbaae9300ef8380cbb881296cee6b9e9886dce62b0759c73e84f6409e374a86cf0c80e3383512f98571
+DIST concurrent-queue-2.5.0.crate 22654 BLAKE2B b490e76804e45d6a7af6bb4ec074fb370d9ec7cd67c7ecfb55d5ed53b9b437c174e678add915303559e902ac81c8751dccb2c5ef0543d5961713372fd2b08d3c SHA512 235704f9161dfac60d2a6d2cf96425e39c097dcde2f005187c1f044704eec66d8303d59352cd414a81a3ed0eed60421054b0070a9b8f69065a79a2519e913e5a
+DIST core-foundation-sys-0.8.7.crate 37712 BLAKE2B 0e1dd99a5bbb0fe92f55181a37426f6e86445cb20e355f553b3162c88ccc075644461731a0cdcd93dcca65b6cef1de62b409afbd73ba3070a199ab8e7422dcfa SHA512 17492d5314db03abdb3b1998bf0c396ec8ed0f83bc978ae22d6026afdc86c50b58cbac073b3a0d97b92da7e98be11302faf1249d24313494bc058add4f4cb63a
+DIST crossbeam-utils-0.8.21.crate 42691 BLAKE2B cd9015c41f532eb3c90101603f32d383f01e6880718b727d6d1fe46872ae276cda685e1b548cf77dd22bb1a05f0d4c4982332c2bde90e1743dbd7f51919022a7 SHA512 6f4aa7ca10c20da291c4714b56ceb1fab1c06b03b2f4e28e474e9aeb95ab6615a25462dc7819713652c3b5f6a06fa0f24ebc92c533fcf35dfcf2655857d975f8
+DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
+DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
+DIST event-listener-5.3.1.crate 42576 BLAKE2B dfd8020527c06adae338e9bcf19076e70ae745facd7b49e8d6604e8508436b70b48fb1f4479214998f288055447186d4ef4969630af90e301103bc5faf6492e5 SHA512 98b7219a3959d6225ee5fb68e8b9d284ab03334d895f52a71f673e59cabab1d06a0abb9eab905e8d38d5f9589725c7c598355ae3c909044a23bc5830b761f5c0
+DIST event-listener-strategy-0.5.3.crate 10920 BLAKE2B ecfa6387d9f09ab8fc6d7bcaaa655fa69f7d732bf40c16549b12074ffd25b1d9e6ce19f7600d1be615ec72f5fbda85d0c9e0a19bb5c0cdd9020c4b9515d9f778 SHA512 f1a14f69afb9765a317b3d7bda505a28f050a7594d6b07e5263d635b806d494ab41c456dcf38ca924ecc0595be0f77e32ffe239107fce1cc5b71ee7249419f5a
+DIST field-offset-0.3.6.crate 10032 BLAKE2B b4b43d35f793c55e8c521de7bc1648501cfe46494fc17d0b6135ba3456c8d72a11b422a16735c681c7c6542084652c119661372628096d61197f6e387b66143a SHA512 3ec99bf5e860dc68f3fcd0abd2b0de2ae0b3174eb177458506aabeee9dc7b0b8b58b925e2c6108a8f18ab95f2e1952dd9474650a639e1c1d50ec3f72bbd30077
+DIST futures-channel-0.3.31.crate 31971 BLAKE2B 2a59ebb73f998ec307bef01e997bf2922556d6dea10e2e6e8da9e1b4cd05a8bcfeef01bc1cc57d79c39bbd98b8a0d26871dca5c7641a9d4e9c2bacbb3feb4eeb SHA512 87e49e661cb12c1e03a07d3c94ca9bf5954344a51fa11639a118f5a49877c883387343af54639ad80e7196062a77fa7c9b9aff9804fb1e6ea3d0eb09efc53c69
+DIST futures-core-0.3.31.crate 14318 BLAKE2B 613d16e4f18547e45ed0dd56a7b908306393e479c379ff64f358844eacb1f8d37008ffbbfe6b1a4ed184e501ee9214db149d9cca31651b7d353ab4a99c8f5ee1 SHA512 d2f4c2476c4f480f724a880ee16566fcdd545579d3cacd2f16745812eed9ac4a7a88d59d4a38b163ef466c6f6b612b9cb06308a09d52256506a8a90e358db935
+DIST futures-executor-0.3.31.crate 17965 BLAKE2B e111467391cc99d1b6a1f5fd3aafdb86922a2d2d9e360112402d68489577527aa35f4f65e6c0dc8f48372927e6d7a6a4a97c7b9525c369cb14e34ca2dafbe64c SHA512 337e70bd3a3bd3075b51e2afe8f157902ebe486696587cc2706b6a5770478ee2ee4216aa9e155e9821ed1d02ba437cdd3abd0c05aa960378ea192e2ed39af564
+DIST futures-io-0.3.31.crate 9047 BLAKE2B 667e62b50be304b68b8437d93b734a0e2433d88a3b410010ed0b04eb2bbfbc9984454c3f0a591f720c9983582c6421d7f870f0733c31337c4c518112f52aea54 SHA512 16d21388f7ca083d2c618ec140cb2c0807ca621b8c338698c367d862b99133ec9edda828f051f3f666472c929e7bf7a5cb334fcf167109c7c392c5cc60b54fdf
+DIST futures-macro-0.3.31.crate 11341 BLAKE2B d91ace97b854cbfeba1df90468fabf6313721ef72bb408ca6bee1c110b0162fe91da18d371b628513644f9d3956540d93c3e13bc9917550338f797967acc3967 SHA512 26c45dd8c037831ce3c41a326ddfd581784c2e7aa2805ca4d93b91e439f4d8c078293cd328bcd66d0283cbd5a14724bc624ec607c343d15193b00bd644b86166
+DIST futures-task-0.3.31.crate 11217 BLAKE2B 8c0e0aa0aa14bfc28e668af00a3fcc2532950ca865a9f3935717a4a3770cb60477cd8f4cd080675379315b649fbdc5fee9dce49502f0f24f44db481a24c884bf SHA512 4872fd2f24b07c626efc6fd76c01b44d56efecb9697f972d0877307b38d3ccb06277ff029df38981470ba1f8ac5f93086123ab3af44d3c49bd9c10b6c9158a81
+DIST futures-util-0.3.31.crate 162124 BLAKE2B 69ca647a261fe24f90a4221d8629169a8dc7eff9dd1c4e07cc700a52a8609ce9b8aa3974b9b09e1ee64d0121d7bcb3efeee6fc15983347aaa0b0b23b068afc34 SHA512 429b1de584546b931b17d475aacbdb0c14824a57d960c44e615aa808e8c0f9c126473e313a7150b3de87ea91b7eebebb1041509f61b3493fee8a9cd2c75c4df3
+DIST gdk-pixbuf-0.20.7.crate 17840 BLAKE2B 3cc99db7968e2e6b38c8967add9e1c5f76844cbefe76a8c89268fb0203229d020efdcd39d78ad9015bdce527e837e9d4d80c937ff95e27b9064a76b6df665048 SHA512 84d64f58ee4e8b6a07f7ae2a794d4a13b19bbeb8ecd64ebabd67b62c74d5a355dcf7a75aa455452e05afadac4aeab836aea6d17b425f23b7db602d1e19f14a22
+DIST gdk-pixbuf-sys-0.20.7.crate 9852 BLAKE2B d6ff354a01b32a75f6a784c0fb959e0975d4dc22940b23a77d85a920042fffa24a0ada3068e2436f97d2814ef00ba815481ee8d594473aea6079fdcbe1773090 SHA512 74c4952e5692de4d4a10693cb6e9705752a99cc3cda245652fc81d9a933a44ac75a1fad866d5496add841f34c18a6b1b50ecd27e400444ee9bad89ea3dcf49c2
+DIST gdk4-0.9.5.crate 92987 BLAKE2B 7e47ac80b9b890eda2bebb46cfb2ad0c404452c6919a5886cf8fc9f3a707edd40765090e142128930e88556688b526373453c92ba94e97212c236e5bd3db57ab SHA512 16981bfc0d23e025178111d0c2dfbf53cd54c8fb7a1c559dd9cad21a7bd80ca21dc1f82098307aaf5b185d6c4d6b83d8e129f47c38247609113a9227617c65a6
+DIST gdk4-sys-0.9.5.crate 67167 BLAKE2B 4edd75a0220b4294c87d23e6d407ec57e7b768d43fc386d6056f1421b5031080ecfc9262861b28333416b481faf2783743aa5414cc3bd6dcf1b7dd9817e0c24b SHA512 cf17f3f122d87d952b3b6d84adf8efccfb657c98840ac3a99aa0f4a58ff6a46142105f397f7b33dfa0e0bd7df7cb5a682c786fd9e499baa3a571aad463d1c278
+DIST gdk4-wayland-0.9.5.crate 7351 BLAKE2B 7dab28e6191859c710aa46a800dedc924cc943630187baab3ccf6f5ee2890ee447ce8efd0225d3c38c59b58cfdf8c81ca129ac215b15cad96db359e64e221a44 SHA512 74c29e36a2cceed37d54a91b3bcd45651b5eb40e4e70339f66f69dceb97f9381bd591c6fdd70c23212e98b49bdd03374e5f6a7ee4110d86eb981bedca35799b9
+DIST gdk4-wayland-sys-0.9.5.crate 3666 BLAKE2B fee8850aedcb5d08e391ad753568f77b5e119ff14c2db7c50ee21bb62f1dce57b2720668e1c102a3df1d978d3feb9ee0b1f0003ea095faf38c5a34ca1b9522b1 SHA512 91faa69e85038aac1b5e0427c6563f5544c4aed4b049fa8804bbbaef6a4ed4ce7502ec77cfd35b485a7a1b0ff34ecf8a5b9e5496b4df396720d774346c0ca6a0
+DIST gdk4-win32-0.9.5.crate 7409 BLAKE2B 09d8eba1144fce6afcc59b6dfdbdca5e632c4f0f1c936370bbe94ce172ea6d6ce0c67b692bed941bae16873acf9990395b470d4d43cfae51c520ab4572030f25 SHA512 fe893a6138bddde35e003fcd87e5990f5f8d17f2747497a876f1aad884dcc578d50744cad2f8d636aaff9c670456ff77819c648776ed44560d4bad02324790e9
+DIST gdk4-win32-sys-0.9.5.crate 6023 BLAKE2B 5567fc424bd90c6d131629e63affc1b390e124143642ac1e9a832c4eac34abd4f83344895f47bdfcde8fe6d6a6e13548eb8bb6c9e51912d710a6973ef9242bc8 SHA512 0ebebc1f5c7a74935d9e0897e45e29f7a95628baee45ed4c83e29071ceb36172970088958b06397380fba8875038396324eeb76c490d4c46aab11fa27492cdf5
+DIST gdk4-x11-0.9.5.crate 9854 BLAKE2B f0332757437a01dc476b6dec56854c0553a9651936d113fb525baeeffcdca14a85dc2245dab76d1d5dedd5def59f864f7d7eeae1a06c7e99b12e34428093038c SHA512 31d5af10069c2db96657504deb649c7841fb737923fa3ec67ab7d205d0ffc33418d12d225c4ddb3eccd8f663ddef51da823620f8deddd66d95201faf361d7834
+DIST gdk4-x11-sys-0.9.5.crate 6731 BLAKE2B 072bb0e7f2f1a6fe124085ef781e0ecdf79cf8c58f7e79e6c8d18f4845bf5e180447c8bf7efedceae0c6983604e1084c2ba07deb1944a2b2b5e241e75908e6de SHA512 381024f872470b2670aa96bf3dda5c8562254ae36c5f2baf643d5610abf8e0f8325ee54e65c4ef1bc442d54409265cea18261cefe0960983a2c22739993ceb9f
+DIST gio-0.20.7.crate 215199 BLAKE2B b881705bd9c439a81016c726bbe626053c6548a0e89ad16d684fe4984dc296fefbba3400886bcbfefe6f1cffc060e68011cd92ffc15426f8948ae3d387edaa39 SHA512 4481d0d3697f197697d39d5fe75b71e886d69a65fe986d677f30d43860c3122e63d585732d320326bdd3b41f55f2b02e4718d277b4f448370b2f37c683aa8598
+DIST gio-sys-0.20.8.crate 82617 BLAKE2B aa96ccab5f181d4f97a294b788495c5014987cb3abc2a23fa3253fa28f98abb9fa4724519f89d634bd85075ced0285d77cd647c6b5bdc1d383b1a8f64496fd17 SHA512 a3d9ecd2635c98e1c7687b35770c52ea0fe60d07a0270cf77bfeace03cce5df9190e66cec53640adf9d441afcb9f5c7e3197b0fed7567d1fab8c49636a72857f
+DIST glib-0.20.7.crate 285650 BLAKE2B 4e1dd2bb20a850392a346c13cefac6fd0bcb8dfff81fd705ba676270cdd0697be4bec6de2bbe02f3fc25602cdf5055a2ec6a14638b21612cd2fc8ab9c22f3877 SHA512 dc418efd7b2d4375fdb5bce9935201a57683554917a69c7caf3d904f09e24ee8601fee1692bdc290f90ff4117933eabefc8f40f7c07121191da71723cb374775
+DIST glib-macros-0.20.7.crate 72089 BLAKE2B 0b20d59c7d10914fa470216f0531a13de1d8794ab43c7f7a2e26944066f062a3b1b018b441c4d0adfdf3cbf21de34cec8d6d9043a99fc18ae27fca34496a00a3 SHA512 730d8b248213a2b67c3b86b8e45d5440826d03703d21f4657615052a420a0e41fd1a6f989935660c54e4642f227c3130dab2b94d040ebc5faf6768c4b3567aba
+DIST glib-sys-0.20.7.crate 64052 BLAKE2B 2ed5c29a4d463837060737a308fc6a082c65788b9c1276d96aef185aa21d3f64c3eda8dfc0dc5068fd9546aeb84c226aef29f23186d058ecac608002dea97441 SHA512 23e4a250c0d557aa28c1359b22ee71be3b026ae1194c78865ad18d472610f9b1f92d304f9e8e837a4a6be3e4a3b172d7d384c95b005999bbb687945646ca5be7
+DIST gobject-sys-0.20.7.crate 19157 BLAKE2B b035a582db9bf148f02e4299d57528fc9b53bc6707273bfaa3f7b305e6469b1b4fcbf9f353a3755a8f08d4a40e849e74af86587b624656bbae49857f5e3cd50e SHA512 90d10c8b7849b779d0f0983b7df271de00e4ee194d4e190db190e0b49729f98d8809208ebd66c4d78c00c2e2aa28f448047697c4f802b7f0dc1f8e9c82c94564
+DIST graphene-rs-0.20.7.crate 17354 BLAKE2B 1d9b8f4ca2d65e184f6a8e420d9a82048df206b5128c4e8d5f78642741cb5048aadd2090e18f078092d7a7ffb0619a8f6edb75dda08d121334b0587963cce193 SHA512 d1e14d24ebe3941a253cb735fb2212d221b6a27f8697ce5108e69eb9907216a48506a164562369e7fb7508e81b21bb7aebdbf9c83c3c163bb49c18083c4808f7
+DIST graphene-sys-0.20.7.crate 11684 BLAKE2B 11f9d9efb042b33deb8c127289b6a946d5be828a914030c18ada61daa1c1a0acb60e415c0e5a2dd6f5ed4293dd942501c8dda53a6256eaa94db6af86b9b1018d SHA512 89e350924f6b5e3601b1fab514a10dcbc34b0ae278cbba6b0b2c6e0da9f94a17a3b85f65a4f329af9acd55c7b936167beb1d47315ac113d0da6a2bd311f034da
+DIST gsk4-0.9.5.crate 32662 BLAKE2B 491dd5cf44d1859177c81443fac96a476ba269256f2afd90073ca5f18042c8b916016aae73e893968d47167d3ce2f16e203f43ac22d9f283b9022755215af9f3 SHA512 dfb51a80d72ed221ce797d50596ed4e604f1a2ab415882848813308b96437debaf36d4e984c76bb0df1947cfe0cded55128856e96226b92a7a36d5b95b34afff
+DIST gsk4-sys-0.9.5.crate 15446 BLAKE2B 15bf13733688f1d0b65bf276df25a7c3243f8e09feed3661ff78b889d9f9e6247bda05e6bc7f1acea83bc51ccf13f53a9402520a3a65f1238abde8d00b60db1d SHA512 97aa294685339aec33644749f04e1fd85c7f290856ba92778185e44c299fd9d7fdc5f3c4c083ea751ead8ebed38d7ec0e42bb3710d8fe2b143dc6ac30594e077
+DIST gst-plugin-gtk4-0.13.4.crate 40555 BLAKE2B acb1d7b6ca054b0dbb2c0f1018597c1ea6ea26c9ea84571ff59a5a9e364d390c53f7e252f8f68ea1398f4aef845fbc8f6087b70db1e73fcb8c0deb95ddb7e77e SHA512 c3c34ac2cb3f986a3ac0defb2892c6274b6b0548b00d7d839eaf6b181fe41b4e6330331e862c468ce496252be598cab9de883ba43b98fae0b397f0e1bb0f4ff1
+DIST gst-plugin-version-helper-0.8.2.crate 4308 BLAKE2B 7dfcc4ea3c507c1900c023eb6d506bd875bb30a94c42c208722019de96c31e3cce37e29d443c5c6014a8cfc787879f99d9803be0da4a25dfa25f5fffda416afe SHA512 d8b4660e6bc7e0eaf56fc78cf434e6f84498820b841de8fecef16e5ea105e8ad9a0c674f14729d8bd816d9927e743aeca5b9bb6682feb255221f29c26ee660d1
+DIST gstreamer-0.23.4.crate 344349 BLAKE2B a56e217f3b5ef83885114f83af7299a536bd580c86cba521b853b15e00397a0b90c20d84928e1452dc7f66c0ee2feffc52495e327c3ae4a7cc6b6acbc8151eac SHA512 880892fe45e4bfc5946562a1885ab949b58e20742ba1cbedf1a93bc36872f07bf89be65e3e8d3e03089b54f0aedd409fae650f22be72c14efbb3fd4e7ba48650
+DIST gstreamer-allocators-0.23.4.crate 40724 BLAKE2B 28b9f9f72d4056b326be8a98d32910bbaeb34145727d4e1dccbcb9adcbc40de458ee4de7ecc2c7aa32bb7616eea3f0171e57720d03cd945c93a571790519c969 SHA512 6f37ea49affb10e36fbb86df8a952255d90e817b634f606868db54728fe26b65cec28d77b819362581efd4c0b7b6aeb4c5461bb687b43ae777017ef9f2acde93
+DIST gstreamer-allocators-sys-0.23.4.crate 35020 BLAKE2B e5b348e7d4dea5cda349c6301a63fc5b0988af5ff13345045e1febd9bd09945712b744b8d463f322b2981901f721becc90a453e9dd26975b79b7a2a695683dfd SHA512 6ba96c66a6fedc01c2bf3e0ee537792544a9a6c5ca5cef17634309e0156d79af7db4ad21db48b85e601d99d80d57bd16189eb422b5c5fcf2d04068fdc009a1ac
+DIST gstreamer-base-0.23.4.crate 68604 BLAKE2B 7d5d3ffe52495a5c0c59289996d34be653b293366f6a116daa310b68cf9c277a2b63c13f479f01594ffa51305e67f7e12af0cbb2b8ca8e57b1d7a8fcc0fba17a SHA512 e60cf6dd3fc9d532696be515153792894b11b477184b92e638a8a5d2e8a910e2e53ce232018eec42f89926887d19c329d46ebfd0426a8827ada77b158a7b1fff
+DIST gstreamer-base-sys-0.23.4.crate 44597 BLAKE2B 1e71ddd53a35f38b9fcee548a6caaee9fc0aeaa8acf9c210d6379a038bd415684055ea5db50253eac0c8d11cc7ca89d35795f1d9090501413c6c9af911a0365e SHA512 22e1b2a5a7b42aee12436d318ec632ecf6857409d022392ad6845248970a41b88fef0b9809c37ab95d3b5e1e8d99d237f3a0036ac96e687672c88596c494253b
+DIST gstreamer-gl-0.23.4.crate 65928 BLAKE2B 47188bb49e196f9b64412639ccfe12eeba0baf56ce38fc1013737a27cc29fcc3810006a8c0fe565bf05138ef4830d1176b2e8dca16593376af1c34feadaef08e SHA512 086510ee5858e71c422e2c8c85628cfad4e30b184aa93e56fb78cc131fca6267313be099445cd785878a3c90d33981ec56e1e174efdd4857601f685dd08b98c1
+DIST gstreamer-gl-egl-0.23.4.crate 37897 BLAKE2B 387199400f26eb67af9513b35ac2db44e261ea0719c646ccbd8db702750948c316508046a584287ff08b4fffd190368fa7ffaa3e4859a4724cea6207828674df SHA512 cb2f07499fdfa0af2291a29e69565cfbd44f06e60c641c2dcb75dee46b92bb685cd0bc43b697b4e82a4ff06ca426abb7bf8c14349fd7a5bf5eecfc25c679221a
+DIST gstreamer-gl-egl-sys-0.23.4.crate 34046 BLAKE2B 16b787dedfce743d5015b51994fec543261aa14d0e08a842eda13e284fff682dc5485c15ff8f912a623f50bb78dc1f7cd70190933af9a0863cba8128eab07e17 SHA512 642977040a1010a3f433096e6bf1bccab975acd9fbf47fe8e40c6f41202de27d922587d3784b57add7c23fd583388edc89e73713ef6fc37430f5720d34d3ab08
+DIST gstreamer-gl-sys-0.23.4.crate 50774 BLAKE2B 4f88dacec167693e773d8b1904333907304b418d7e4426fc41efa85efca648ee2e7cc466aec5a6ef71d623bb136e3f6c8e71e330a791815f3d06487a5369262b SHA512 603bd6c1dba380302d024ceda7fd21c9a4ecb92f93451b5fcc0ddceab1fcabac938364de9b8a11411e5124235b1e52e31482651eedd2a2893149fe5554007a50
+DIST gstreamer-gl-wayland-0.23.4.crate 37772 BLAKE2B f68bafcb7a2c96ba3467da331109757d9bd60e86d9e4f88e0f6ef2e06e2176722c15fc79f620a05f9b594aab736327cfc388b1afdf05d716b7b84aa976356dc3 SHA512 3c957aa9d74e8e907c7df1131670e4c2918845f45bd4a9c87152efd93e2d06620ab7f7f821b42a63592799b641885ef855f0d1dc047114cfad6e74486bbf6686
+DIST gstreamer-gl-wayland-sys-0.23.4.crate 33990 BLAKE2B cd7f0865f663e2e67e096c72183b568faaffe9a2757f9bf7eab5e7d993f50723487b0e0c052e19cacfa80be2f703d24c6501088b64a031b5647bb700411eb4ca SHA512 5a4d64998594a4795f3c80289426ca6b129c348112ee906831156d2d261e4b214882e7902e304eb4dc9be4e76cc76c3f228a024a6ac7bdd520f4470b3e0a461a
+DIST gstreamer-gl-x11-0.23.4.crate 37751 BLAKE2B d814754816f0449767e047e16e36a2ccda4f974a20ec36b43dbc1ef4fe5aaebd9a612e76722c26f097ffdcd8d0bcdd75cc906810a9d54567729b27eed270bb3e SHA512 9c252aaf92c97c92e1b2338bf47302fa8458d665a5a30d065d9845bd1da2fc41b116d978aebb4fc279eb3e227c75b8b4683d3085729ae983fa2461b568c8ec51
+DIST gstreamer-gl-x11-sys-0.23.4.crate 33922 BLAKE2B 34c53c89efc28bc02d3f1b0afac3fb3a0bae6dde9169054cdc48174de71d8c42e3ad56afe7a5d683e7ed4195e74caebfcd64aa62b4cb7371fed0f2722eb2932b SHA512 4c6ce226c53d96f1a8818f09b5e6e3d2da8e18736167004bc86b9680491acdefaa7e8023815dc93344d8e4a4a126cea8869abb0551ba34be68a81c7f32bfd9b3
+DIST gstreamer-sys-0.23.4.crate 96230 BLAKE2B a97e4978726435f726ec6b92e1d571f724be9b26e2b0fb7b5d67995209b56ff7b3a8be7a908aba8c8a90b8d34cc68b73c48b44f24565396f11e2555f3b599341 SHA512 27347ede98a3325b40623730b82428e3d240a0b22e03cf8c72ee1a0312ecf5d064f87ff00d621c67275171f571ea487f23e779acfb547c7ca69c4c8d25e40788
+DIST gstreamer-video-0.23.4.crate 128513 BLAKE2B d07c10608c9ebb5082de990f57dff17e45a4e5443f4f2f460e52e5b75611bff644b06a5a6cc1095d6fe5265892d01d0d21098c216c99a0de3abfb4a28d125843 SHA512 7e87967e296052e2ed6963adb657cc2fc4bd6ec5c7d3916d7acd5c186a6f4a8d8676333df13bf0fe0f89718ed42c1fcabf6fed1633d9fdf11260e4759c7c9965
+DIST gstreamer-video-sys-0.23.4.crate 64786 BLAKE2B f21305dd44782346d26828057ed58f292a02669629c065661b86323d5b560b7e33873b0c2c9b7a40fa4f10adf4acf0a4bc9649a2700293b2d7ccea94a8b92e42 SHA512 0fa1bef35ade488722f71a2fb516dfce82c39e02d211fd01c24d96a895c750ad8af260e22b4c55993bbff55d9f2de068e595c0f1b888f5c790e93878a6a4d263
+DIST gtk4-0.9.5.crate 477363 BLAKE2B c827d41ac5a4355dfacc43633d7f04eb34010af01edbd594e397cc2a059b0cb417867fd15c8f758b8146bc5a709a9858637a0ab9c24c25a91f709fde9e4e0b5a SHA512 fcfbddae47c0f54554a6a5a820c3c61a86011781e65ed792d80b96d5392617f88a0afbc9a00c9ce6c5dd32fb775590f4b0525595e98fb739ef97b0027866c09e
+DIST gtk4-macros-0.9.5.crate 16721 BLAKE2B 0199e66f82a96aaa70db95cf09f1ea479ac08d1fe6dd17f5d6dbf613a7f6f49cb67bd59340b7338fa0a8b0af2323e5bdb88b71f68076fc3723780f0ca904fd31 SHA512 29595714832ad53fe02b1419f88f8aff94b3ea3b7611fa05677ad87239cc225a953d387ce8efde3dadaae956aa0ee491ef4b09b06da4e636d52deda66d287098
+DIST gtk4-sys-0.9.5.crate 110382 BLAKE2B 49e77750688a554b5007e2fda8548d4cb5d886302501277587184c885a57f56ce995606b7ec321b6cf887d12d27af7b5e3dc78fb519bac3a94f2343de07d120d SHA512 316e15e3c5f8fa557edfe46656e3d09f03d83e7bb1d762daf10f55e2653fc710a5bfe1cd40388b4e72e86a266583ce679c27dd02ebe0cddc764270b5cfaefde5
+DIST hashbrown-0.15.2.crate 138478 BLAKE2B 453888ce68b10cd6e93d787986603fceb29b83fe2dc417e7e57316b9e0060d0bba51ec7fb71d46a038662c99f60deac8237a8f349297208d1d223bcc13f0d0ea SHA512 d6fc0613623f9313533dfcab1240e97f652f78f05baa21419f7edb2eff030c4a2c5f426d3eaae747923cffdd8aa9cc2648340e5fc229395b5eacc6fae087c8cd
+DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
+DIST iana-time-zone-0.1.61.crate 27685 BLAKE2B 2091f0bdbfae3f63ff846e27136d9779a2d65f85cef899ea3ab0ff7c987329e6a584cf49c57de566f08e0277bd4981ac3db30ea0cec6a6757ed50d96e2c6583f SHA512 d16c67f435606334042c3a286350db46ff3409f142c0782509b136150b4069aafff0dc5c2ecfb7519dd8d105b9a2e6649df2a7bec33ee3966dc94034c9d5a1c4
+DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2
+DIST indexmap-2.7.0.crate 85335 BLAKE2B c7430ef510738ac5fc4658f3e4d927ca5cde780774a07848791ea87503be09fb4677c52803f6cdaaed73eee600f47e0595ac3db74a498947d0e180cbd10fb7aa SHA512 efac370b9f365a49489aa2c5406eb503044a4df7d6ceb772e0191b02244b6c2c1bf6c43ad4c8924160c1a2bd76d46c630b500a1c4252fc52366295d1cb04b48d
+DIST itertools-0.13.0.crate 146261 BLAKE2B b23d59a87f80d24925bc868c0ac7abb6b9d05aad5ca08833634ef760ce228a1b753062ec4bd22237d0e74727edecd7ba3df9789cee896345b69780d7de66866c SHA512 c6cb8f93a93b6ac1a2cbb3033e66fc81a39f83be773b734bea3311332b96bc71bbb518aae3e6b40cb537590c23de1ca4964361c336795c3985bde63232d410c4
+DIST js-sys-0.3.76.crate 54420 BLAKE2B 8d211aee6d8af87c339250e06e321bf02d2ff313b80505f696f66c43298e2aee8286076f2b291aa853730f8e1b9940f09c56535d3534fc7990aeb16653844250 SHA512 54e9a6be3f5a19021351d22d655a3aa55579c80f1453a99aba5989fafc7429078dea57ffebada4240b9185d3260d02f30da250fa539ac12c4bdda975adfe0dad
+DIST khronos-egl-6.0.0.crate 29315 BLAKE2B 929d825923bce022ce13595a0ad183a3437581af6cdb19ece34af853c793dddf0a63bf8dd9a160ef253bc4e97c38d4973f667340a809455136b07dd248d2fe46 SHA512 be57e604f577ec526f3f2ea81767a5fbef0b609e0c1aff7c14e2fe658e47bbbcf65b5ac9d6dafb83d2b4fe25039550e21a165fb1d503ea08f167b039bd72cdbb
+DIST libc-0.2.169.crate 757901 BLAKE2B 1012cf93d8975aa20fc3f2332e253426ff66be6aed63ace5292cc8568ee419b0f1a4b5b39ddbb78d9c2dfd8d72eb0d068c98faa229ab55556da5e674429f0e97 SHA512 c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce
+DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
+DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
+DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
+DIST muldiv-1.0.1.crate 4901 BLAKE2B cbb30434b4a264867b31246c685d6b576d1227b61888d5d8795e4a48cc129630a82eae1acaeb21f9fac3fdf79f5ce0180a364833049c15e1446d391b5a3a16ae SHA512 387c201722bf279d4cfd8f326ab0aa43314581d02ad2341b7c5784ffe57d568fe9eea5a2b89c985fe2cf283aa91ca22fdf14b7bae0031d6ef29baa95009e427e
+DIST num-integer-0.1.46.crate 22331 BLAKE2B d88c9f84e5d803a3aa8f44dfc1bd6d9b5e336e7cbf47231cb3a7de30dfe263c41c62c586d31f0029459c8c240475cd329b3fce79f355be7643bdccf8d56dcbba SHA512 e27986d91f6c6dc3d5a0900defe28ab5f47905cde3f84d0914b7acee076dca8fec6fdb7b631ac94d3a31eb01ecbc5854e51afc3187cd1abfa21e1bfafdc700ae
+DIST num-rational-0.4.2.crate 28159 BLAKE2B 653e05b9ea621a92dbac090339d9e0ae0b3f952b332e3a54f27ba8f5209a4e9957b014ef18355555cea0caa63432de0ec0be7ea6798389aae46402f789432554 SHA512 0999130db45e5d877d1e2232c8900cc633bd39e749186b2ef4ac4343b958dcc80edcc2247df5f229546dcb3537fd45984a7a459a9bd8f62aee69a0239fce0b62
+DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956
+DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
+DIST option-operations-0.5.0.crate 19262 BLAKE2B 28bcdc8ffbe8327872932721dbb6a1ee2b48e1f7c7f0d9f8cb0d434c586fce507c2e770026a29fcb89aa974d2fc4d8585a7fd28751ec82250ace685928bbf1d5 SHA512 f27d066ff3a9925c488475945515a2b22784d6b6c526461e70146e55a94c799763eb472dfa1a95012dc36df856c3b0ba32d3e6b240dbaba585480494f4453b23
+DIST pango-0.20.7.crate 45667 BLAKE2B f9773a35646e6fce807b55083f526ca8d8744f565b1ab5765c28111aee45041806623031d52c4dbc65a7f6ead7ea4f4448b07ed952cd84443e1c8ba609ea6870 SHA512 0c6730036407436ec03a2a445fcbd58f8bb33dcbfb7e447c61252890ddf8b38adc20a22c2ac2fa83239f19eea355864b42aefed55beb13a83bd4084485ce66c5
+DIST pango-sys-0.20.7.crate 25002 BLAKE2B 21fa841f1424da52fa584fdb3f1b5f1a366ad97a8d966b55775327e47f2945b1ed1f75b747b66b286187d1e4b1e3bced7c13e9905e213722fedb8597f578fe4c SHA512 5d95f69396924950109eba734eb171902f22b6474dd371cd7d9d3c24dc766f093943936566ecb2cbc5db185969fcd85bd69913fd0f1f229a27c78e2bee1e3471
+DIST parking-2.2.1.crate 10685 BLAKE2B 3af8020bc27ea921d6023c14f20545f70a5a5a5a216d5f97458d76d3bfc8d9de937f3c92668d31a79de85ce08ed0236d440c64ca1e4fe0a7748f412b941c052b SHA512 2e49137b59000f0467aa9ee0648d53e06cd2b8319d6ea28bf04c621b873469739a34186840b02f08d770d109cca26e161b3de3e4341dd729701885307a6a8177
+DIST paste-1.0.15.crate 18374 BLAKE2B 69ee7def55e658a9aa72405bad62325e8d6021a4989fbf11c88d1bf05fbac520f7b04d467bc3c6eb45043a41119f65aceecc4a6a1418a9192d73f33134545062 SHA512 5026d3ec7141ec4e2517a0b1283912d0801e9356f77b703d954b379439b8d85e3886d42fb28f7835edaeeac465582da14233564fb010c71425a59c9e1cbd46b4
+DIST pin-project-lite-0.2.15.crate 29683 BLAKE2B da9dd581eca047f089c2a069a355caf66a631b3ff81fc07220a3c378dc77ea2c399b165ff8a1d2f6556595ec52dc1bbdcbbdea5ad9e5e317281650c9158b3669 SHA512 ba3c22c70f98ee0d0e78fb8a25bdc3100b26c3f03f3e4c6c0c238fde75774c5634d6014660c39406a828d1c28f17f44f20fe19dacd331c4da2f4961a7f7c124c
+DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
+DIST pkg-config-0.3.31.crate 20880 BLAKE2B ab7676e810751f89639b60ae70bdebe1d57edc76319f83077c3680049a701a26e72e8cc485fe77cdc4346fe3571d32c59e7384c8c86fef17e00d7d81df5daf43 SHA512 ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4
+DIST proc-macro-crate-3.2.0.crate 11164 BLAKE2B dba3e1f4e38f427df72794ad891746fbb8c24239cf06b076e75ab6795a7e8c9abf25ae0f40379e07a696827156e7a3780ae242da7e5442cf1224d058f54b83a6 SHA512 41479ec5e414a8b05dffaa0ece21122387d5165a54e60d8ee3502f8a3c0a2ac0247f56996f933d5d77f1efe41a56bffe16874e8c6a34b66100cf047e4b760863
+DIST proc-macro2-1.0.92.crate 52353 BLAKE2B 9aa29fa6f1c56c0392a94a81b4c61953f4d185012cdca37e356817845535da79d7094bf43472ce63109ce479a2fd0cbef4d802afd61daf92c4db303bcac60e7e SHA512 e614f08acc0a7e97ef580479cf5b682378df1ca16f09bfb2296ebb3490a435229dea9d682c621c54ce57e8e1d3b7803eb8ff83c88bd02e07228dba6d02f14aee
+DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
+DIST rustc_version-0.4.1.crate 12245 BLAKE2B 0ed627c560d88e5ade830cc5f72c62f6ba88be3e30d0f8db34761fcd0b284e5b2fc063c240149aabdfb12c8410ecdbe50cb10a3544500b5a020f95a31cd6709c SHA512 7aa8a487ca7411b6d23cae62f7568fa3474a7b1fd1589621071be3428a550ed3b7c4ad68277a8f86849e5900397d7d0e9d678f5d423742a045dc7c660fa6c598
+DIST semver-1.0.24.crate 31267 BLAKE2B 934f55d953ca52f6c11696889182e1e4c660a6eae3917b15b411d91a18b22c6a1178708caf95da93e70e6ea97c0762ed9154333d60bf0a08b156ca7b50c4077e SHA512 751bb04fb50abfbb92b2612e1d1097f612a1ceee1861852681d6ad67fe459d77a72898903b14f2f01d8185fbbc022c7471913785610c2a8e9d6530e48094869a
+DIST serde-1.0.216.crate 79000 BLAKE2B 98c0f5cee2f9212c6b7620d2068665379471ceb7557d1454cab9b1c2120b526ef597fbb642f65440e70f92a4764cad33613b478bacf99138dd5bd51fdbdbee6b SHA512 baabf4c7aac4a540c9ed18b336662087258b71c9cb0e547c8d83a2734818ab2cbbe62f910d812eb61d3d46e653c41a3eebc99b1d679bfc51f95710c71a8ecc20
+DIST serde_derive-1.0.216.crate 57674 BLAKE2B 12a9228679c16288c08c8b256707e276aec79f84ac7af0c4cfd1f109500dfea80438df17d798acdd30a9743c753e70093b22bd324217529bac483f257682a3e2 SHA512 80fcb552279ac7562297df878f2f5e9ac09241701f5cf1088fcbf473b638f58cd3092a7930d8937ca0df9a47b9ae1a42d490cd46a275259cd8089fe8f5426469
+DIST serde_spanned-0.6.8.crate 9330 BLAKE2B 630bb2cabd74e8d9736e315ac57c4d2c5c4f72264aab35ecc8e0040cb4186885722051a9f7b8a9006fd121fe58428cbb151e5cf541e7de30b6528c84e968f7ac SHA512 2343a2fda35ff57ed8ff7d8eeadd651821fce7e22f91c2d5797c6af7db9e009b7d637382f6f390c17911912865a5aea1ce87a86fbe36f4b6aeccb065a4c8942d
+DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
+DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
+DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
+DIST syn-2.0.91.crate 291128 BLAKE2B 039debf1d4d1015978e2b3068efe7be926f84ffdff40f8fc78778afd37192a640e851cfc1642608c7f95d64164ccb75b556d6e3184cdfbaa1450210143cb006a SHA512 076bdb5ca8f23997a8df6ad4027c0d9b859ea627450d2e23cd9863606863185cffbadd7aba20416897c74a5b53aee1946cc0116c8af9536afbea565443816c2e
+DIST system-deps-7.0.3.crate 26313 BLAKE2B 3429b765bbe57865f68a76a53562d31492892c4fe6963195002158049d989268f6ea91bf8826c73d762bd4a80506e1b238ae676234004031acce1eee35924026 SHA512 0b941160ef803e1c0545082bc5a1b6556ef9dc11fe1dab5575a0712428701ebf1446504308061f203bf52a9c61f3c9ab020cc238e9be2e3afc20dc047c746779
+DIST target-lexicon-0.12.16.crate 26488 BLAKE2B e7950e4a302059a1bfc9bc15618a3c1b971a17cffae117a6e8f5f63a0d82fd2bd02680301d15338612d5426d349dd24cfee30ee787a15a7d3187f2a6825e69ce SHA512 092639957c4a0391560b6442b31c47159c04d12e971010f730a6ec9cb5389e4be903ef3d7daa06db95e64dc78b6970731fb647179ebaad2b12e9ed5e9b24da27
+DIST thiserror-2.0.9.crate 28531 BLAKE2B 7789458ffcb381e2cf02f182248396c5e6c20a818e4c5a2c7da8a8f50099c548646b51dbfe0630a242f24e9aff65e215a4473e13f63bbffbd80a3429237c65c7 SHA512 b7b5f54cde87c21e8fac3526d5a140c0d64116e700d07eb28714df3db372a42fba30bb37817282d0ee1b5333f1998d1f628d43054e59fc39393fb567c3df4cb0
+DIST thiserror-impl-2.0.9.crate 21023 BLAKE2B c2def0cfe9b9854ce33075fc246a2baba386d8f3a70f26516124f5ff4f7dbb0cd0b8887882c491f37652b565ee4fb3e7895a39cf34564a21e96890fa6e3ce125 SHA512 408f6a4c0f6cee36f69fff5a2f08cbd349db44753e6b6ac730c418fa1fc06ba7f69fbf248182af947843ae49d5cb5ff53980cdb18cb850ea8d7d9ac7dc8d67fa
+DIST toml-0.8.19.crate 50974 BLAKE2B f68987353837b74421256fd9a76134bfbfe93887cfb25145b65b7e6b31ad2c3a3384829a06f50c771a2a0be0c5467c856cc631af69f586ea056c4f15af9e3b7c SHA512 16fdc58d14516e81badbe8c9a4506db75b559b377c9c4fecee79e76007b31a4abfc8c8868bf9159f79c6f7c0218f93bdcfb92b669b0917db7da42b51ec155751
+DIST toml_datetime-0.6.8.crate 12028 BLAKE2B 62113366771f22b437b2ed0d3bb2489ae9078cb589cfad2ad2e92c81ddbda48f689e5a573366eea4f54c2b3cbc6b37eaa8b442b6d935b631a992de4917268757 SHA512 d38b98db3b2d4eebd3001d88e2135b6fdbae63b200f7e900c6bb9c121dd3f170e557332bd26f237312c1cbef61666716b0cf550c2d730f86fa7cd9eb5f64a16f
+DIST toml_edit-0.22.22.crate 106387 BLAKE2B c658eef2dc8420266a6928d7ef46340372af2593e4db0d3a67ec88aaf8f601d37d1e9b5bac231a799be8a2ee68a7d98b5f651e9c109d23d8b19b60cf75debddb SHA512 0f98b371f7e27ae7f435a207c0915f942af145cc5dfabfe6d57f2b797efa3e706025401e501fccc6df70c001ce27051381556b8e7824447edd23ea25d047da4d
+DIST unicode-ident-1.0.14.crate 47547 BLAKE2B 30e0b6d7f3a967aaf5b9d91237008a60c3a8ded53bda901696e23cea3931dd71b01ddab866dca9e31e17c395d5f5a68f2a938655b693e894962568c2cff5ca15 SHA512 7c6dcd1724e8cfedc37546d1abd49088b633dad228097acc73d7b6cab255b223e830c541144e05a00388fd8ca8066f27c18792419cfa58ee9da4460a38d0bc0a
+DIST version-compare-0.2.0.crate 13942 BLAKE2B 054f7d717ba953f4dbda226aa22332fb40622a776a6f53450831f027273e5a64bb8e87d42a9af1c64a6f035afa76565309c5a8810a20b8a5e51a7168a2e91dbc SHA512 b799c1713d4bf7af00f9c6d562d39c5e916f37350c2f3f57119277725b81c93246d0b1410d4ee981694bbbb731460b6512a813fdde1cf25949cd45fb3e70bd6f
+DIST wasm-bindgen-0.2.99.crate 46136 BLAKE2B 04e69294da3dc4feff9001185bcc5b864d1f14a1ead6b9a31c830b2043dde191f9f7c65755d607365a3b8885bd340bbd266e26cfa74c48464933c8d7a1164f94 SHA512 184aec11998b99a730ea5b63d6141260cd0b7cdc29b02696f533b3e75ec79f7c17c6aac892e7a7b24036c6e73592d01df638ca31b54bda11d3bdbf857b1489c2
+DIST wasm-bindgen-backend-0.2.99.crate 30928 BLAKE2B ecfa94a461df79a33fd2bb9807374a2a0c7ac370b443e5a1103ba73a29c9d337ed3feb427c80571ccc15599f81135987742e698199528a9c1bb570baef3e9d09 SHA512 8369a5e618223f09fff7cdc35662a930b3eb11024af51bf5fb9e70c45dfa22452a518d723f3d912c0c970fc4bf748ef2d83d48756483174993f7d04c92d9621f
+DIST wasm-bindgen-macro-0.2.99.crate 7011 BLAKE2B 07182a9fb98f519d1e5c934e609d7a42cf2409319f59dd901e2a5bec77972b4d16fc6f67cf40ade58af874b05faa981c894443d3950616e2aad117ac7355ac6f SHA512 344bf5192e43582246efad257c600003c41b589234c1900f6ed201f96b6f7665eb55226da15d612060042f89c6214e452489cf3aabc61645843be9c27f9cca0b
+DIST wasm-bindgen-macro-support-0.2.99.crate 22800 BLAKE2B 9772cc94a64f768eecae12072e6d700bf95fded306297b84e235f3450f7c5630cb1985def3eaef05aee193c693f92c6fa61d7a6ca18e84a2b73aa38f070d47e7 SHA512 936ab8211a13fbe8b8f21a870a78c03e24219d0872731561353cfcae245e9f632246f179b67f2b13e106c799e68c5c39f9e388370a8ad3f93f299c4804f5907e
+DIST wasm-bindgen-shared-0.2.99.crate 7773 BLAKE2B 73489af59d16f4d0a1ea51b535cd02d2759b5b7b07873d8a71fa6bd6b6ce1cfc6e8139e6a79346abec13665ed9aeadd0b5b6aed28ae008f9dcb3d5da9fce665a SHA512 8da0f107be99b6666cf1859d68ac0a7295fc03e7b494fce1df9dbe57d21807de8e2bc95f5b974562303923ca4646f38c5297588ad7c97bd59ef236218b2a64f9
+DIST windows-core-0.52.0.crate 42154 BLAKE2B 9670bf02261b4ab2a24eff97dad11e305deac823cacfae286965b62b11bc035f19a55ca710eaa4359c8a4905433a94fe62a836b77ddd68f244ad6ac2c9657f58 SHA512 0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36
+DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03
+DIST windows-targets-0.52.6.crate 6403 BLAKE2B eb98d0a8daeed5fe76e7fa8edb2743e2a3e77dfb9c4ea68605a6ab10532cb7cfc43bc1cea0180869445bd940be762a40136500e26b84ca88b5e0c502004c7a4c SHA512 d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f
+DIST windows_aarch64_gnullvm-0.52.6.crate 435718 BLAKE2B 8b12ae02892cb69401329034bbca671d13bd268a112120b56b90504707cef89decfbd2560492844a9f0588fab62dc1476ab7e931126b939015d25a8cc91ca334 SHA512 f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5
+DIST windows_aarch64_msvc-0.52.6.crate 832615 BLAKE2B adc8ff61b6dc96d39c92c7d4221ae6aa0575edfc016cfcd046067ca5d8fcfd56d10e8e227be1c038ce34684be22c7ccaf5f18cd5a7638d28fbff4ba15b48b90b SHA512 a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b
+DIST windows_i686_gnu-0.52.6.crate 880402 BLAKE2B 5aab8ee07132eccb7695807eb44811beeb0657aadfb672c54e99b6ae39c067ba9b93e38fc69bb5b9b14a9759f263ccd5e301597d2727d83b31b49a409b6bd405 SHA512 a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822
+DIST windows_i686_gnullvm-0.52.6.crate 475940 BLAKE2B fec4fda8bb2bf319a501a22372fa642ae682e4dee3235b258a028190ee73220bfc55b3142f06249bb4579b17e5fde662bb2b121aefe18544653350d7d0fe7d8e SHA512 95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f
+DIST windows_i686_msvc-0.52.6.crate 901163 BLAKE2B 99ed34e052db5ba77bab240ed5d38ce450be347a794d63ec39b719304c32722c9999b540ab40abe0216318900b7412970df99dfb36d1516a9517cae0c77d1bdc SHA512 ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96
+DIST windows_x86_64_gnu-0.52.6.crate 836363 BLAKE2B e2335829155cdbd4a55cc9f9babc237e14e32aab97f6f91afabcdf80d2aee37d6fb4b8669aaf433ff532c85dba59b3d366c7d41b61a2f29b96f960169c900687 SHA512 c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb
+DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd
+DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
+DIST winnow-0.6.20.crate 163617 BLAKE2B b47ba6cd94ec80a72b51ad09c5cb9de350d2243295d3997732d5d3d9f8d08bd83e3129150fb24992243949120da1bd6091d580db5ff10258fd745afaa944c791 SHA512 3347fdfb5b15ec73a40614ecd0cce60f41d3f2d083f49aaafceeaf5db52d5c677dc3eb39fcc2595999fc9f864d1fde81e180e09dc86a6f6124878e16e86e8bc8
diff --git a/media-plugins/gst-plugin-gtk4/gst-plugin-gtk4-0.13.4.ebuild b/media-plugins/gst-plugin-gtk4/gst-plugin-gtk4-0.13.4.ebuild
new file mode 100644
index 000000000000..94874732abee
--- /dev/null
+++ b/media-plugins/gst-plugin-gtk4/gst-plugin-gtk4-0.13.4.ebuild
@@ -0,0 +1,220 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	async-channel@2.3.1
+	atomic_refcell@0.1.13
+	autocfg@1.4.0
+	bitflags@2.6.0
+	bumpalo@3.16.0
+	cairo-rs@0.20.7
+	cairo-sys-rs@0.20.7
+	cc@1.2.5
+	cfg-expr@0.17.2
+	cfg-if@1.0.0
+	chrono@0.4.39
+	concurrent-queue@2.5.0
+	core-foundation-sys@0.8.7
+	crossbeam-utils@0.8.21
+	either@1.13.0
+	equivalent@1.0.1
+	event-listener-strategy@0.5.3
+	event-listener@5.3.1
+	field-offset@0.3.6
+	futures-channel@0.3.31
+	futures-core@0.3.31
+	futures-executor@0.3.31
+	futures-io@0.3.31
+	futures-macro@0.3.31
+	futures-task@0.3.31
+	futures-util@0.3.31
+	gdk-pixbuf-sys@0.20.7
+	gdk-pixbuf@0.20.7
+	gdk4-sys@0.9.5
+	gdk4-wayland-sys@0.9.5
+	gdk4-wayland@0.9.5
+	gdk4-win32-sys@0.9.5
+	gdk4-win32@0.9.5
+	gdk4-x11-sys@0.9.5
+	gdk4-x11@0.9.5
+	gdk4@0.9.5
+	gio-sys@0.20.8
+	gio@0.20.7
+	glib-macros@0.20.7
+	glib-sys@0.20.7
+	glib@0.20.7
+	gobject-sys@0.20.7
+	graphene-rs@0.20.7
+	graphene-sys@0.20.7
+	gsk4-sys@0.9.5
+	gsk4@0.9.5
+	gst-plugin-version-helper@0.8.2
+	gstreamer-allocators-sys@0.23.4
+	gstreamer-allocators@0.23.4
+	gstreamer-base-sys@0.23.4
+	gstreamer-base@0.23.4
+	gstreamer-gl-egl-sys@0.23.4
+	gstreamer-gl-egl@0.23.4
+	gstreamer-gl-sys@0.23.4
+	gstreamer-gl-wayland-sys@0.23.4
+	gstreamer-gl-wayland@0.23.4
+	gstreamer-gl-x11-sys@0.23.4
+	gstreamer-gl-x11@0.23.4
+	gstreamer-gl@0.23.4
+	gstreamer-sys@0.23.4
+	gstreamer-video-sys@0.23.4
+	gstreamer-video@0.23.4
+	gstreamer@0.23.4
+	gtk4-macros@0.9.5
+	gtk4-sys@0.9.5
+	gtk4@0.9.5
+	hashbrown@0.15.2
+	heck@0.5.0
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.61
+	indexmap@2.7.0
+	itertools@0.13.0
+	js-sys@0.3.76
+	khronos-egl@6.0.0
+	libc@0.2.169
+	log@0.4.22
+	memchr@2.7.4
+	memoffset@0.9.1
+	muldiv@1.0.1
+	num-integer@0.1.46
+	num-rational@0.4.2
+	num-traits@0.2.19
+	once_cell@1.20.2
+	option-operations@0.5.0
+	pango-sys@0.20.7
+	pango@0.20.7
+	parking@2.2.1
+	paste@1.0.15
+	pin-project-lite@0.2.15
+	pin-utils@0.1.0
+	pkg-config@0.3.31
+	proc-macro-crate@3.2.0
+	proc-macro2@1.0.92
+	quote@1.0.37
+	rustc_version@0.4.1
+	semver@1.0.24
+	serde@1.0.216
+	serde_derive@1.0.216
+	serde_spanned@0.6.8
+	shlex@1.3.0
+	slab@0.4.9
+	smallvec@1.13.2
+	syn@2.0.91
+	system-deps@7.0.3
+	target-lexicon@0.12.16
+	thiserror-impl@2.0.9
+	thiserror@2.0.9
+	toml@0.8.19
+	toml_datetime@0.6.8
+	toml_edit@0.22.22
+	unicode-ident@1.0.14
+	version-compare@0.2.0
+	wasm-bindgen-backend@0.2.99
+	wasm-bindgen-macro-support@0.2.99
+	wasm-bindgen-macro@0.2.99
+	wasm-bindgen-shared@0.2.99
+	wasm-bindgen@0.2.99
+	windows-core@0.52.0
+	windows-sys@0.52.0
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.52.6
+	winnow@0.6.20
+"
+
+inherit cargo rust-toolchain toolchain-funcs
+
+DESCRIPTION="GStreamer GTK 4 sink element"
+HOMEPAGE="
+	https://lib.rs/crates/gst-plugin-gtk4
+	https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/
+"
+SRC_URI="
+	https://crates.io/api/v1/crates/${PN}/${PV}/download
+		-> ${P}.crate
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MPL-2.0"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0"
+SLOT="1.0"
+KEYWORDS="~amd64"
+IUSE="+egl +gles2 opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
+
+DEPEND="
+	dev-libs/glib
+	>=gui-libs/gtk-4.16:4
+	>=media-libs/gstreamer-1.24:1.0
+	>=media-libs/gst-plugins-base-1.24:${SLOT}[egl=,gles2=,opengl=,wayland=,X=]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/cargo-c
+"
+
+QA_FLAGS_IGNORED="usr/lib.*/gstreamer-1.0/libgstgtk4.so"
+
+src_configure() {
+	local myfeatures=(
+		# match that with gtk dep above, we don't really care to support
+		# older versions here
+		gtk_v4_16
+	)
+
+	# see https://github.com/GStreamer/gst-plugins-rs/blob/main/meson.build
+	local gl_winsys=$(
+		$(tc-getPKG_CONFIG) --variable=gl_winsys gstreamer-gl-1.0 || die
+	)
+	if has wayland ${gl_winsys}; then
+		myfeatures+=( waylandegl )
+	fi
+	if has x11 ${gl_winsys}; then
+		if has egl ${gl_winsys}; then
+			myfeatures+=( x11egl )
+		fi
+		if has glx ${gl_winsys}; then
+			myfeatures+=( x11glx )
+		fi
+	fi
+
+	CARGO_ARGS=(
+		--library-type=cdylib
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--target="$(rust_abi)"
+		$(usev !debug '--release')
+	)
+
+	cargo_src_configure
+}
+
+src_compile() {
+	cargo cbuild "${CARGO_ARGS[@]}" || die
+}
+
+src_test() {
+	# no tests, cargo [c]test just rebuilds everything for no gain
+	:
+}
+
+src_install() {
+	cargo cinstall "${CARGO_ARGS[@]}" --destdir="${D}" || die
+}
diff --git a/media-plugins/gst-plugin-gtk4/metadata.xml b/media-plugins/gst-plugin-gtk4/metadata.xml
new file mode 100644
index 000000000000..1e402b6fec97
--- /dev/null
+++ b/media-plugins/gst-plugin-gtk4/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>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="freedesktop-gitlab">gstreamer/gst-plugins-rs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-plugins/gst-plugins-a52dec/Manifest b/media-plugins/gst-plugins-a52dec/Manifest
index 4d94fd9151a4..4c6a49b345af 100644
--- a/media-plugins/gst-plugins-a52dec/Manifest
+++ b/media-plugins/gst-plugins-a52dec/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-ugly-1.22.11.tar.xz 256812 BLAKE2B 143fe16c92465be0c5bfb5b6c452be9e730501d372e49c26c6837eb2ff336b8098cda5afc61b3620f9ea9ed13eed6118e0deed8dcc9eab499b941e5e64157fd9 SHA512 767e80c1d15ec79ff196c4c4ad6128bc17502b490201c1a3799341a2784848f639392310de7dabc922d022acb5156bd25e4191ba2409c17b3a23a278f7722c5c
 DIST gst-plugins-ugly-1.22.12.tar.xz 257464 BLAKE2B c7f89dda309712cb2380b2e29b67a40c02c561bbe49a83acb2beb84aac6ebaed895e1a27d5f6fb6787c803e2e94a0409d14a3206feb9797c5329bbaff5e4a61d SHA512 3ef5cb384578bcaff3bb45fa8fa8f97884acb2e09a1621c504fca4bd8744cb83e71c342372a7ddd06bc4077fdd2684d1f7f078278392361ed4e18afed374c659
+DIST gst-plugins-ugly-1.24.10.tar.xz 231124 BLAKE2B d4e5d5a4abd3860d98ea9066d9eb13662ef639bd0ee8b8a1c5d5ffb155e0febc968019a151259cfd6592c8f27332bf6b4b6a3d74249b530c1a25eb31adf31b19 SHA512 87430ccf3e0382bae8f24e429734c38d9339ea95205e2a5fe5db8408ca9a369ee971b2e84b0717f918d65b2b91dec4baf032d8a01658512ec0af9ee9dfe397c5
+DIST gst-plugins-ugly-1.24.11.tar.xz 232056 BLAKE2B 849c34c099d062c81e7e008aee95d36ac6aae0c08eacec0e2ba3582b421d912f9dc0322031310eb459c76af30056ee38d5b5849d0400540656571c1a110f1c54 SHA512 461f3a07b4265bfe66b5b22f3a10bbf254068381f5634e970b3cb6d1c2d3ea401e0be43d188934a490e29658d8447a83de50253380cde371b0f5a55178f90e6a
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.22.12.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.22.12.ebuild
index 1e3da0a1f832..c0a38f7b8efd 100644
--- a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer-meson
 
 DESCRIPTION="ATSC A/52 audio decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.24.10.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.24.10.ebuild
new file mode 100644
index 000000000000..1e3da0a1f832
--- /dev/null
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.24.10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer-meson
+
+DESCRIPTION="ATSC A/52 audio decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+orc"
+
+RDEPEND="
+	>=media-libs/a52dec-0.7.4-r6[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.24.11.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.24.11.ebuild
new file mode 100644
index 000000000000..f67f4f8b469e
--- /dev/null
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.24.11.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer-meson
+
+DESCRIPTION="ATSC A/52 audio decoder plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+orc"
+
+RDEPEND="
+	>=media-libs/a52dec-0.7.4-r6[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-adaptivedemux2/Manifest b/media-plugins/gst-plugins-adaptivedemux2/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-adaptivedemux2/Manifest
+++ b/media-plugins/gst-plugins-adaptivedemux2/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-adaptivedemux2/gst-plugins-adaptivedemux2-1.22.11.ebuild b/media-plugins/gst-plugins-adaptivedemux2/gst-plugins-adaptivedemux2-1.22.11.ebuild
deleted file mode 100644
index 38337c3662b4..000000000000
--- a/media-plugins/gst-plugins-adaptivedemux2/gst-plugins-adaptivedemux2-1.22.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="Adaptive demuxer plugins for Gstreamer"
-KEYWORDS="amd64 arm64"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.8[${MULTILIB_USEDEP}]
-	dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	|| (
-		net-libs/libsoup:3.0
-		net-libs/libsoup:2.4
-	)
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dhls-crypto=nettle
-	)
-
-	gstreamer_multilib_src_configure
-}
diff --git a/media-plugins/gst-plugins-adaptivedemux2/gst-plugins-adaptivedemux2-1.22.12.ebuild b/media-plugins/gst-plugins-adaptivedemux2/gst-plugins-adaptivedemux2-1.22.12.ebuild
index e1c664b89daf..b87ff3af0905 100644
--- a/media-plugins/gst-plugins-adaptivedemux2/gst-plugins-adaptivedemux2-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-adaptivedemux2/gst-plugins-adaptivedemux2-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="Adaptive demuxer plugins for Gstreamer"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.8[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-adaptivedemux2/gst-plugins-adaptivedemux2-1.24.11.ebuild b/media-plugins/gst-plugins-adaptivedemux2/gst-plugins-adaptivedemux2-1.24.11.ebuild
new file mode 100644
index 000000000000..56d21706709c
--- /dev/null
+++ b/media-plugins/gst-plugins-adaptivedemux2/gst-plugins-adaptivedemux2-1.24.11.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="Adaptive demuxer plugins for Gstreamer"
+KEYWORDS="amd64 ~arm64"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.8[${MULTILIB_USEDEP}]
+	dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	|| (
+		net-libs/libsoup:3.0
+		net-libs/libsoup:2.4
+	)
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dhls-crypto=nettle
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-amr/Manifest b/media-plugins/gst-plugins-amr/Manifest
index 4d94fd9151a4..3cead6012986 100644
--- a/media-plugins/gst-plugins-amr/Manifest
+++ b/media-plugins/gst-plugins-amr/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-ugly-1.22.11.tar.xz 256812 BLAKE2B 143fe16c92465be0c5bfb5b6c452be9e730501d372e49c26c6837eb2ff336b8098cda5afc61b3620f9ea9ed13eed6118e0deed8dcc9eab499b941e5e64157fd9 SHA512 767e80c1d15ec79ff196c4c4ad6128bc17502b490201c1a3799341a2784848f639392310de7dabc922d022acb5156bd25e4191ba2409c17b3a23a278f7722c5c
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
 DIST gst-plugins-ugly-1.22.12.tar.xz 257464 BLAKE2B c7f89dda309712cb2380b2e29b67a40c02c561bbe49a83acb2beb84aac6ebaed895e1a27d5f6fb6787c803e2e94a0409d14a3206feb9797c5329bbaff5e4a61d SHA512 3ef5cb384578bcaff3bb45fa8fa8f97884acb2e09a1621c504fca4bd8744cb83e71c342372a7ddd06bc4077fdd2684d1f7f078278392361ed4e18afed374c659
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.22.11.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.22.11.ebuild
deleted file mode 100644
index 253b6489a518..000000000000
--- a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.22.11.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-ugly
-
-inherit gstreamer-meson
-
-DESCRIPTION="AMRNB encoder/decoder and AMRWB decoder plugin for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND=">=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_ENABLED="amrnb amrwbdec"
-GST_PLUGINS_BUILD_DIR="amrnb amrwbdec"
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.22.12.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.22.12.ebuild
index 3b245f049122..fafa3d0f03a5 100644
--- a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.22.12.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
@@ -10,7 +10,7 @@ DESCRIPTION="AMRNB encoder/decoder and AMRWB decoder plugin for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=">=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.24.11.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.24.11.ebuild
new file mode 100644
index 000000000000..da9c2a6ade1f
--- /dev/null
+++ b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.24.11.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="AMRNB encoder/decoder and AMRWB decoder plugin for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+RDEPEND=">=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_ENABLED="amrnb amrwbdec"
+GST_PLUGINS_BUILD_DIR="amrnb amrwbdec"
diff --git a/media-plugins/gst-plugins-aom/Manifest b/media-plugins/gst-plugins-aom/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-aom/Manifest
+++ b/media-plugins/gst-plugins-aom/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-aom/gst-plugins-aom-1.22.12.ebuild b/media-plugins/gst-plugins-aom/gst-plugins-aom-1.22.12.ebuild
index 4edba2be1792..347d8360de85 100644
--- a/media-plugins/gst-plugins-aom/gst-plugins-aom-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-aom/gst-plugins-aom-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="Alliance for Open Media AV1 plugin for GStreamer"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="media-libs/libaom:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-aom/gst-plugins-aom-1.24.10.ebuild b/media-plugins/gst-plugins-aom/gst-plugins-aom-1.24.10.ebuild
new file mode 100644
index 000000000000..b113b38bda22
--- /dev/null
+++ b/media-plugins/gst-plugins-aom/gst-plugins-aom-1.24.10.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Alliance for Open Media AV1 plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# >= 3 brings more features, and >= 3.2 even more so. Depend on >=3.2 accordingly.
+RDEPEND=">=media-libs/libaom-3.2:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-aom/gst-plugins-aom-1.24.11.ebuild b/media-plugins/gst-plugins-aom/gst-plugins-aom-1.24.11.ebuild
new file mode 100644
index 000000000000..9b701ebb84b6
--- /dev/null
+++ b/media-plugins/gst-plugins-aom/gst-plugins-aom-1.24.11.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Alliance for Open Media AV1 plugin for GStreamer"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+# >= 3 brings more features, and >= 3.2 even more so. Depend on >=3.2 accordingly.
+RDEPEND=">=media-libs/libaom-3.2:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-assrender/Manifest b/media-plugins/gst-plugins-assrender/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-assrender/Manifest
+++ b/media-plugins/gst-plugins-assrender/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.22.12.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.22.12.ebuild
index c4cb56fd5758..5fbddb04e457 100644
--- a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="ASS/SSA rendering with effects support plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.24.10.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.24.10.ebuild
new file mode 100644
index 000000000000..c4cb56fd5758
--- /dev/null
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="ASS/SSA rendering with effects support plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.24.11.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.24.11.ebuild
new file mode 100644
index 000000000000..fafc660dbd92
--- /dev/null
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="ASS/SSA rendering with effects support plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-bluez/Manifest b/media-plugins/gst-plugins-bluez/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-bluez/Manifest
+++ b/media-plugins/gst-plugins-bluez/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.22.12.ebuild b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.22.12.ebuild
index 7e5a32c1686e..d0cc306c0eac 100644
--- a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="AVDTP source/sink and A2DP sink plugin for GStreamer"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=">=net-wireless/bluez-5[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.24.10.ebuild b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.24.10.ebuild
new file mode 100644
index 000000000000..7e5a32c1686e
--- /dev/null
+++ b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.24.10.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="AVDTP source/sink and A2DP sink plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=net-wireless/bluez-5[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/gdbus-codegen"
diff --git a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.24.11.ebuild b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.24.11.ebuild
new file mode 100644
index 000000000000..326912b6ddb5
--- /dev/null
+++ b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.24.11.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="AVDTP source/sink and A2DP sink plugin for GStreamer"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+RDEPEND=">=net-wireless/bluez-5[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/gdbus-codegen"
diff --git a/media-plugins/gst-plugins-bs2b/Manifest b/media-plugins/gst-plugins-bs2b/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-bs2b/Manifest
+++ b/media-plugins/gst-plugins-bs2b/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.22.12.ebuild b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.22.12.ebuild
index 8574ab79690d..c989ee626498 100644
--- a/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="bs2b elements for Gstreamer"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 RDEPEND=">=media-libs/libbs2b-3.1.0[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.24.10.ebuild b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.24.10.ebuild
new file mode 100644
index 000000000000..8574ab79690d
--- /dev/null
+++ b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="bs2b elements for Gstreamer"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND=">=media-libs/libbs2b-3.1.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.24.11.ebuild b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.24.11.ebuild
new file mode 100644
index 000000000000..e987d8c7a7dc
--- /dev/null
+++ b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="bs2b elements for Gstreamer"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND=">=media-libs/libbs2b-3.1.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cairo/Manifest b/media-plugins/gst-plugins-cairo/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-cairo/Manifest
+++ b/media-plugins/gst-plugins-cairo/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.22.11.ebuild b/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.22.11.ebuild
deleted file mode 100644
index de231dc49b46..000000000000
--- a/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.22.11.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="Video overlay plugin based on cairo for GStreamer"
-KEYWORDS="amd64 ~arm64"
-
-RDEPEND=">=x11-libs/cairo-1.10[glib,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.22.12.ebuild b/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.22.12.ebuild
index ea0dd022ce9b..fadaae7349b6 100644
--- a/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="Video overlay plugin based on cairo for GStreamer"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 RDEPEND=">=x11-libs/cairo-1.10[glib,${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.24.11.ebuild b/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.24.11.ebuild
new file mode 100644
index 000000000000..fadaae7349b6
--- /dev/null
+++ b/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="Video overlay plugin based on cairo for GStreamer"
+KEYWORDS="amd64 ~arm64"
+
+RDEPEND=">=x11-libs/cairo-1.10[glib,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cdio/Manifest b/media-plugins/gst-plugins-cdio/Manifest
index 4d94fd9151a4..4c6a49b345af 100644
--- a/media-plugins/gst-plugins-cdio/Manifest
+++ b/media-plugins/gst-plugins-cdio/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-ugly-1.22.11.tar.xz 256812 BLAKE2B 143fe16c92465be0c5bfb5b6c452be9e730501d372e49c26c6837eb2ff336b8098cda5afc61b3620f9ea9ed13eed6118e0deed8dcc9eab499b941e5e64157fd9 SHA512 767e80c1d15ec79ff196c4c4ad6128bc17502b490201c1a3799341a2784848f639392310de7dabc922d022acb5156bd25e4191ba2409c17b3a23a278f7722c5c
 DIST gst-plugins-ugly-1.22.12.tar.xz 257464 BLAKE2B c7f89dda309712cb2380b2e29b67a40c02c561bbe49a83acb2beb84aac6ebaed895e1a27d5f6fb6787c803e2e94a0409d14a3206feb9797c5329bbaff5e4a61d SHA512 3ef5cb384578bcaff3bb45fa8fa8f97884acb2e09a1621c504fca4bd8744cb83e71c342372a7ddd06bc4077fdd2684d1f7f078278392361ed4e18afed374c659
+DIST gst-plugins-ugly-1.24.10.tar.xz 231124 BLAKE2B d4e5d5a4abd3860d98ea9066d9eb13662ef639bd0ee8b8a1c5d5ffb155e0febc968019a151259cfd6592c8f27332bf6b4b6a3d74249b530c1a25eb31adf31b19 SHA512 87430ccf3e0382bae8f24e429734c38d9339ea95205e2a5fe5db8408ca9a369ee971b2e84b0717f918d65b2b91dec4baf032d8a01658512ec0af9ee9dfe397c5
+DIST gst-plugins-ugly-1.24.11.tar.xz 232056 BLAKE2B 849c34c099d062c81e7e008aee95d36ac6aae0c08eacec0e2ba3582b421d912f9dc0322031310eb459c76af30056ee38d5b5849d0400540656571c1a110f1c54 SHA512 461f3a07b4265bfe66b5b22f3a10bbf254068381f5634e970b3cb6d1c2d3ea401e0be43d188934a490e29658d8447a83de50253380cde371b0f5a55178f90e6a
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.22.12.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.22.12.ebuild
index 44848c582a30..6ea1112e0bb9 100644
--- a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer-meson
 
 DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.24.10.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.24.10.ebuild
new file mode 100644
index 000000000000..44848c582a30
--- /dev/null
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.24.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer-meson
+
+DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.24.11.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.24.11.ebuild
new file mode 100644
index 000000000000..26fa6edb9791
--- /dev/null
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.24.11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer-meson
+
+DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest
index 442c0f85539b..0ab140eea80d 100644
--- a/media-plugins/gst-plugins-cdparanoia/Manifest
+++ b/media-plugins/gst-plugins-cdparanoia/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-base-1.22.11.tar.xz 2373020 BLAKE2B 0809629afae7b82a12079dc40dd5a6a7c86876b591389c3179a74cea975b0ef3c66d9fc2f42a2f722892de2c75ef87eb0cfc5cc5df65f0ebefa02a891b0c392a SHA512 cfd8f7fe66f4707e043c8f070110eb80f9804cec529c8d29b13dbc8604db90e3f010c9614d538ad076b826df54f75ce5ebac355bd05a874e44dccead6a953c60
 DIST gst-plugins-base-1.22.12.tar.xz 2374324 BLAKE2B 7600d5a10a3d7d4f6874cc166cdca2d45d3daedec3fbb56982db172bd4f6c0463fcde812e31c42f912d8fbda793730695ab39e44b7f126b49581f7c87858b988 SHA512 f72edccd49ce2a35577dff80feb1d0f667df54d6b8f61ef2320b5d4564442b907954d015bccec7a915acf25d2197a507c32b72c1ab18dd38d254f57a3277b334
+DIST gst-plugins-base-1.24.11.tar.xz 2455952 BLAKE2B efbf7b1aaece5a287738afb93e4b99c27471c640079bc7312f84925309de0eb91ecb9837eab314e5f787d745fda6c9113105156bd819db64c869ddec6a04e7ff SHA512 b0a2a072c52628b85ae3d2ff8f2769f149fd2d0c3644fb9d9d934ea586835e29af97f41731023969a8120a470f998080ef5a0cac5aa26823d01698dfe2a5e2fb
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.22.11.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.22.11.ebuild
deleted file mode 100644
index d7289c44332d..000000000000
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.22.11.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-base
-
-inherit gstreamer-meson
-
-DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	gstreamer_system_package audio_dep:gstreamer-audio
-}
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.22.12.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.22.12.ebuild
index 10773559f2a3..240131186b5e 100644
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer-meson
 
 DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.24.11.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.24.11.ebuild
new file mode 100644
index 000000000000..61515017dbc1
--- /dev/null
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.24.11.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer-meson
+
+DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_package audio_dep:gstreamer-audio
+}
diff --git a/media-plugins/gst-plugins-chromaprint/Manifest b/media-plugins/gst-plugins-chromaprint/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-chromaprint/Manifest
+++ b/media-plugins/gst-plugins-chromaprint/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.22.12.ebuild b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.22.12.ebuild
index d30374683467..da8715e27035 100644
--- a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="Calculate Chromaprint fingerprint from audio files for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="media-libs/chromaprint[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.24.10.ebuild b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.24.10.ebuild
new file mode 100644
index 000000000000..d30374683467
--- /dev/null
+++ b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Calculate Chromaprint fingerprint from audio files for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="media-libs/chromaprint[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.24.11.ebuild b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.24.11.ebuild
new file mode 100644
index 000000000000..08348af436b8
--- /dev/null
+++ b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Calculate Chromaprint fingerprint from audio files for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="media-libs/chromaprint[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-colormanagement/Manifest b/media-plugins/gst-plugins-colormanagement/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-colormanagement/Manifest
+++ b/media-plugins/gst-plugins-colormanagement/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.24.10.ebuild b/media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.24.10.ebuild
new file mode 100644
index 000000000000..7f629c544832
--- /dev/null
+++ b/media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Color management correction GStreamer plugins"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=media-libs/lcms-2.7:2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.24.11.ebuild b/media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.24.11.ebuild
new file mode 100644
index 000000000000..94d58e789d89
--- /dev/null
+++ b/media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Color management correction GStreamer plugins"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=media-libs/lcms-2.7:2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dash/Manifest b/media-plugins/gst-plugins-dash/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-dash/Manifest
+++ b/media-plugins/gst-plugins-dash/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.22.12.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.22.12.ebuild
index 3a20c29b24fb..899dafabe717 100644
--- a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="MPEG-DASH plugin for GStreamer"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.24.10.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.24.10.ebuild
new file mode 100644
index 000000000000..3a20c29b24fb
--- /dev/null
+++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.24.10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="MPEG-DASH plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_library \
+		gstadaptivedemux_dep:gstadaptivedemux \
+		gsturidownloader_dep:gsturidownloader \
+		gstisoff_dep:gstisoff
+}
+
+pkg_postinst() {
+	einfo "media-plugins/gst-plugins-adaptivedemux2 provides an alternative DASH demuxer option (dashdemux2)"
+}
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.24.11.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.24.11.ebuild
new file mode 100644
index 000000000000..4689ecb466c1
--- /dev/null
+++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.24.11.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="MPEG-DASH plugin for GStreamer"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_library \
+		gstadaptivedemux_dep:gstadaptivedemux \
+		gsturidownloader_dep:gsturidownloader \
+		gstisoff_dep:gstisoff
+}
+
+pkg_postinst() {
+	einfo "media-plugins/gst-plugins-adaptivedemux2 provides an alternative DASH demuxer option (dashdemux2)"
+}
diff --git a/media-plugins/gst-plugins-dtls/Manifest b/media-plugins/gst-plugins-dtls/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-dtls/Manifest
+++ b/media-plugins/gst-plugins-dtls/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.22.12.ebuild b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.22.12.ebuild
index 754a08886cb6..41995d3f48ab 100644
--- a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="DTLS encoder/decoder with SRTP support plugin for GStreamer"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=">=dev-libs/openssl-1.0.1:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.24.10.ebuild b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.24.10.ebuild
new file mode 100644
index 000000000000..754a08886cb6
--- /dev/null
+++ b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="DTLS encoder/decoder with SRTP support plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/openssl-1.0.1:0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.24.11.ebuild b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.24.11.ebuild
new file mode 100644
index 000000000000..ce251a797d02
--- /dev/null
+++ b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="DTLS encoder/decoder with SRTP support plugin for GStreamer"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/openssl-1.0.1:0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dts/Manifest b/media-plugins/gst-plugins-dts/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-dts/Manifest
+++ b/media-plugins/gst-plugins-dts/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.22.12.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.22.12.ebuild
index 7f06762cf2f9..e4e5f2273c67 100644
--- a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="DTS audio decoder plugin for Gstreamer"
-KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.24.10.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.24.10.ebuild
new file mode 100644
index 000000000000..7f06762cf2f9
--- /dev/null
+++ b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.24.10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="DTS audio decoder plugin for Gstreamer"
+KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+orc"
+
+RDEPEND="
+	>=media-libs/libdca-0.0.5-r3[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.24.11.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.24.11.ebuild
new file mode 100644
index 000000000000..9076455cfd9f
--- /dev/null
+++ b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.24.11.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="DTS audio decoder plugin for Gstreamer"
+KEYWORDS="amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+orc"
+
+RDEPEND="
+	>=media-libs/libdca-0.0.5-r3[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-dv/Manifest b/media-plugins/gst-plugins-dv/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-dv/Manifest
+++ b/media-plugins/gst-plugins-dv/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.22.11.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.22.11.ebuild
deleted file mode 100644
index b90c9494f5b3..000000000000
--- a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.22.11.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="DV demuxer and decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.22.12.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.22.12.ebuild
index 77a7190c081e..a82d91029d4a 100644
--- a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="DV demuxer and decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.24.11.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.24.11.ebuild
new file mode 100644
index 000000000000..195b9465aeee
--- /dev/null
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="DV demuxer and decoder plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dvb/Manifest b/media-plugins/gst-plugins-dvb/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-dvb/Manifest
+++ b/media-plugins/gst-plugins-dvb/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.22.12.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.22.12.ebuild
index b560c9e90353..033c52d41cd1 100644
--- a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPION="DVB device capture plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~loong ~mips ppc ppc64 ~riscv x86"
 
 RDEPEND=""
 DEPEND="virtual/os-headers"
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.24.10.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.24.10.ebuild
new file mode 100644
index 000000000000..b560c9e90353
--- /dev/null
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.24.10.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPION="DVB device capture plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND=""
+DEPEND="virtual/os-headers"
+
+src_prepare() {
+	default
+	gstreamer_system_package gstmpegts_dep:gstreamer-mpegts
+}
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.24.11.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.24.11.ebuild
new file mode 100644
index 000000000000..03dcb70eb86d
--- /dev/null
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.24.11.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPION="DVB device capture plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND=""
+DEPEND="virtual/os-headers"
+
+src_prepare() {
+	default
+	gstreamer_system_package gstmpegts_dep:gstreamer-mpegts
+}
diff --git a/media-plugins/gst-plugins-dvdread/Manifest b/media-plugins/gst-plugins-dvdread/Manifest
index 4d94fd9151a4..4c6a49b345af 100644
--- a/media-plugins/gst-plugins-dvdread/Manifest
+++ b/media-plugins/gst-plugins-dvdread/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-ugly-1.22.11.tar.xz 256812 BLAKE2B 143fe16c92465be0c5bfb5b6c452be9e730501d372e49c26c6837eb2ff336b8098cda5afc61b3620f9ea9ed13eed6118e0deed8dcc9eab499b941e5e64157fd9 SHA512 767e80c1d15ec79ff196c4c4ad6128bc17502b490201c1a3799341a2784848f639392310de7dabc922d022acb5156bd25e4191ba2409c17b3a23a278f7722c5c
 DIST gst-plugins-ugly-1.22.12.tar.xz 257464 BLAKE2B c7f89dda309712cb2380b2e29b67a40c02c561bbe49a83acb2beb84aac6ebaed895e1a27d5f6fb6787c803e2e94a0409d14a3206feb9797c5329bbaff5e4a61d SHA512 3ef5cb384578bcaff3bb45fa8fa8f97884acb2e09a1621c504fca4bd8744cb83e71c342372a7ddd06bc4077fdd2684d1f7f078278392361ed4e18afed374c659
+DIST gst-plugins-ugly-1.24.10.tar.xz 231124 BLAKE2B d4e5d5a4abd3860d98ea9066d9eb13662ef639bd0ee8b8a1c5d5ffb155e0febc968019a151259cfd6592c8f27332bf6b4b6a3d74249b530c1a25eb31adf31b19 SHA512 87430ccf3e0382bae8f24e429734c38d9339ea95205e2a5fe5db8408ca9a369ee971b2e84b0717f918d65b2b91dec4baf032d8a01658512ec0af9ee9dfe397c5
+DIST gst-plugins-ugly-1.24.11.tar.xz 232056 BLAKE2B 849c34c099d062c81e7e008aee95d36ac6aae0c08eacec0e2ba3582b421d912f9dc0322031310eb459c76af30056ee38d5b5849d0400540656571c1a110f1c54 SHA512 461f3a07b4265bfe66b5b22f3a10bbf254068381f5634e970b3cb6d1c2d3ea401e0be43d188934a490e29658d8447a83de50253380cde371b0f5a55178f90e6a
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.22.12.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.22.12.ebuild
index e31a94d8f579..07969e0b7b08 100644
--- a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer-meson
 
 DESCRIPTION="DVD read plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-libs/libdvdread-4.2.0-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.24.10.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.24.10.ebuild
new file mode 100644
index 000000000000..e31a94d8f579
--- /dev/null
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.24.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer-meson
+
+DESCRIPTION="DVD read plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=media-libs/libdvdread-4.2.0-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.24.11.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.24.11.ebuild
new file mode 100644
index 000000000000..ba4808343650
--- /dev/null
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.24.11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer-meson
+
+DESCRIPTION="DVD read plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=media-libs/libdvdread-4.2.0-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-faac/Manifest b/media-plugins/gst-plugins-faac/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-faac/Manifest
+++ b/media-plugins/gst-plugins-faac/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.22.12.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.22.12.ebuild
index d7f0f4b3b2e5..b85213504440 100644
--- a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="AAC audio encoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
 
 RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.24.10.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.24.10.ebuild
new file mode 100644
index 000000000000..d7f0f4b3b2e5
--- /dev/null
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="AAC audio encoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.24.11.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.24.11.ebuild
new file mode 100644
index 000000000000..e70d1e848f18
--- /dev/null
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="AAC audio encoder plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faad/Manifest b/media-plugins/gst-plugins-faad/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-faad/Manifest
+++ b/media-plugins/gst-plugins-faad/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.22.12.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.22.12.ebuild
index 0ba822d45305..dcf6315a7e2e 100644
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="AAC audio decoder plugin"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.24.10.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.24.10.ebuild
new file mode 100644
index 000000000000..0ba822d45305
--- /dev/null
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.24.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="AAC audio decoder plugin"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.24.11.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.24.11.ebuild
new file mode 100644
index 000000000000..ce713a39c975
--- /dev/null
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.24.11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="AAC audio decoder plugin"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-flac/Manifest b/media-plugins/gst-plugins-flac/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-flac/Manifest
+++ b/media-plugins/gst-plugins-flac/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.22.11.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.22.11.ebuild
deleted file mode 100644
index 8eec6108d83c..000000000000
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.22.11.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND=">=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.22.12.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.22.12.ebuild
index 3d7bbf0887dd..25526e7e162f 100644
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.24.11.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.24.11.ebuild
new file mode 100644
index 000000000000..1a23bec0ba4e
--- /dev/null
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/Manifest b/media-plugins/gst-plugins-gdkpixbuf/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/Manifest
+++ b/media-plugins/gst-plugins-gdkpixbuf/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.22.11.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.22.11.ebuild
deleted file mode 100644
index bf9c0e13d5c8..000000000000
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.22.11.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_ENABLED="gdk-pixbuf"
-GST_PLUGINS_BUILD_DIR="gdk_pixbuf"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.22.12.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.22.12.ebuild
index f275a78d5398..96bd0e862e1e 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.24.11.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.24.11.ebuild
new file mode 100644
index 000000000000..bf45300e6b34
--- /dev/null
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.24.11.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_ENABLED="gdk-pixbuf"
+GST_PLUGINS_BUILD_DIR="gdk_pixbuf"
diff --git a/media-plugins/gst-plugins-gtk/Manifest b/media-plugins/gst-plugins-gtk/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-gtk/Manifest
+++ b/media-plugins/gst-plugins-gtk/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.22.11.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.22.11.ebuild
deleted file mode 100644
index 8f51be9a5e5c..000000000000
--- a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.22.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+egl +gles2 opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
-# egl, wayland and X only matters if gst-plugins-base is built with USE=opengl and/or USE=gles2
-# We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
-# we don't care about matching egl/wayland/X if both opengl and gles2 are disabled here and on
-# gst-plugins-base, but no way to express that.
-
-# We only need gtk+ matching backend flags when GL is enabled
-GL_DEPS="
-	>=x11-libs/gtk+-3.15:3[X?,wayland?,${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl=,gles2=,opengl=,wayland=,X=]
-	>=x11-libs/gtk+-3.15:3[${MULTILIB_USEDEP}]
-	gles2? ( ${GL_DEPS} )
-	opengl? ( ${GL_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_ENABLED="gtk3"
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.22.12.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.22.12.ebuild
index 57a66d1969c6..a49aad525617 100644
--- a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+egl +gles2 opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
 # egl, wayland and X only matters if gst-plugins-base is built with USE=opengl and/or USE=gles2
 # We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.24.11.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.24.11.ebuild
new file mode 100644
index 000000000000..c346bb0ca84d
--- /dev/null
+++ b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.24.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+egl +gles2 opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
+# egl, wayland and X only matters if gst-plugins-base is built with USE=opengl and/or USE=gles2
+# We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
+# we don't care about matching egl/wayland/X if both opengl and gles2 are disabled here and on
+# gst-plugins-base, but no way to express that.
+
+# We only need gtk+ matching backend flags when GL is enabled
+GL_DEPS="
+	>=x11-libs/gtk+-3.15:3[X?,wayland?,${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl=,gles2=,opengl=,wayland=,X=]
+	>=x11-libs/gtk+-3.15:3[${MULTILIB_USEDEP}]
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_ENABLED="gtk3"
diff --git a/media-plugins/gst-plugins-hls/Manifest b/media-plugins/gst-plugins-hls/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-hls/Manifest
+++ b/media-plugins/gst-plugins-hls/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.22.12.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.22.12.ebuild
index 1fd2ba3e7a22..4f12f72f7923 100644
--- a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="HTTP live streaming plugin for GStreamer"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="dev-libs/nettle:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.24.10.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.24.10.ebuild
new file mode 100644
index 000000000000..1fd2ba3e7a22
--- /dev/null
+++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.24.10.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="HTTP live streaming plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-libs/nettle:0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/gst-plugins-bad-1.18.4-use-system-libs-hls.patch
+)
+
+src_prepare() {
+	default
+	gstreamer_system_library \
+		gstadaptivedemux_dep:gstadaptivedemux \
+		gsturidownloader_dep:gsturidownloader
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dhls-crypto=nettle
+	)
+
+	gstreamer_multilib_src_configure
+}
+
+pkg_postinst() {
+	einfo "media-plugins/gst-plugins-adaptivedemux2 provides an alternative HLS demuxer option (hlsdemux2)"
+}
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.24.11.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.24.11.ebuild
new file mode 100644
index 000000000000..f725e52a42cd
--- /dev/null
+++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.24.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="HTTP live streaming plugin for GStreamer"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+RDEPEND="dev-libs/nettle:0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/gst-plugins-bad-1.18.4-use-system-libs-hls.patch
+)
+
+src_prepare() {
+	default
+	gstreamer_system_library \
+		gstadaptivedemux_dep:gstadaptivedemux \
+		gsturidownloader_dep:gsturidownloader
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dhls-crypto=nettle
+	)
+
+	gstreamer_multilib_src_configure
+}
+
+pkg_postinst() {
+	einfo "media-plugins/gst-plugins-adaptivedemux2 provides an alternative HLS demuxer option (hlsdemux2)"
+}
diff --git a/media-plugins/gst-plugins-jack/Manifest b/media-plugins/gst-plugins-jack/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-jack/Manifest
+++ b/media-plugins/gst-plugins-jack/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.22.11.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.22.11.ebuild
deleted file mode 100644
index 5c5d337ff2bf..000000000000
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.22.11.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPION="JACK audio server source/sink plugin for GStreamer"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-# >=jack-1.9.7 is provided by pipewire[jack-sdk] as well
-RDEPEND="|| (
-	media-sound/jack2[${MULTILIB_USEDEP}]
-	media-video/pipewire[jack-sdk(-),${MULTILIB_USEDEP}]
-)"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.22.12.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.22.12.ebuild
index d3dd4d0f27b9..6cedc375541c 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPION="JACK audio server source/sink plugin for GStreamer"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 # >=jack-1.9.7 is provided by pipewire[jack-sdk] as well
 RDEPEND="|| (
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.24.11.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.24.11.ebuild
new file mode 100644
index 000000000000..03ad60b79596
--- /dev/null
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.24.11.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPION="JACK audio server source/sink plugin for GStreamer"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# >=jack-1.9.7 is provided by pipewire[jack-sdk] as well
+RDEPEND="|| (
+	media-sound/jack2[${MULTILIB_USEDEP}]
+	media-video/pipewire[jack-sdk(-),${MULTILIB_USEDEP}]
+)"
diff --git a/media-plugins/gst-plugins-jpeg/Manifest b/media-plugins/gst-plugins-jpeg/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-jpeg/Manifest
+++ b/media-plugins/gst-plugins-jpeg/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.22.11.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.22.11.ebuild
deleted file mode 100644
index 4e8806b5c9f0..000000000000
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.22.11.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="JPEG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.22.12.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.22.12.ebuild
index c9fe991bab43..82aaca7376a6 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="JPEG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.24.11.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.24.11.ebuild
new file mode 100644
index 000000000000..e3bfe67547ad
--- /dev/null
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="JPEG image encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-kate/Manifest b/media-plugins/gst-plugins-kate/Manifest
index 3a7efee38684..06ebf87982b5 100644
--- a/media-plugins/gst-plugins-kate/Manifest
+++ b/media-plugins/gst-plugins-kate/Manifest
@@ -1,2 +1,3 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
diff --git a/media-plugins/gst-plugins-kate/gst-plugins-kate-1.24.10.ebuild b/media-plugins/gst-plugins-kate/gst-plugins-kate-1.24.10.ebuild
new file mode 100644
index 000000000000..fb63c36ce6b9
--- /dev/null
+++ b/media-plugins/gst-plugins-kate/gst-plugins-kate-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Kate overlay codec suppport plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=media-libs/libkate-0.1.7[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ladspa/Manifest b/media-plugins/gst-plugins-ladspa/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-ladspa/Manifest
+++ b/media-plugins/gst-plugins-ladspa/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.22.12.ebuild b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.22.12.ebuild
index bcd17cd985c5..639476160646 100644
--- a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="Ladspa elements for Gstreamer"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.24.10.ebuild b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.24.10.ebuild
new file mode 100644
index 000000000000..bcd17cd985c5
--- /dev/null
+++ b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.24.10.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Ladspa elements for Gstreamer"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]
+	media-libs/liblrdf[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.24.11.ebuild b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.24.11.ebuild
new file mode 100644
index 000000000000..f6b78da5616b
--- /dev/null
+++ b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.24.11.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Ladspa elements for Gstreamer"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]
+	media-libs/liblrdf[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-lame/Manifest b/media-plugins/gst-plugins-lame/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-lame/Manifest
+++ b/media-plugins/gst-plugins-lame/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.22.11.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.22.11.ebuild
deleted file mode 100644
index 1b50b7d71713..000000000000
--- a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.22.11.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="MP3 encoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.22.12.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.22.12.ebuild
index f5fa4e5d467e..c4bd7e6d9c4e 100644
--- a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="MP3 encoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.24.11.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.24.11.ebuild
new file mode 100644
index 000000000000..d67096f80226
--- /dev/null
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="MP3 encoder plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ldac/Manifest b/media-plugins/gst-plugins-ldac/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-ldac/Manifest
+++ b/media-plugins/gst-plugins-ldac/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.22.12.ebuild b/media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.22.12.ebuild
index b5fb87ce203c..444acfc03a60 100644
--- a/media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="LDAC plugin for GStreamer"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 RDEPEND="media-libs/libldac[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.24.10.ebuild b/media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.24.10.ebuild
new file mode 100644
index 000000000000..b5fb87ce203c
--- /dev/null
+++ b/media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="LDAC plugin for GStreamer"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="media-libs/libldac[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.24.11.ebuild b/media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.24.11.ebuild
new file mode 100644
index 000000000000..c79e907397bf
--- /dev/null
+++ b/media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="LDAC plugin for GStreamer"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="media-libs/libldac[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index cd6839e79344..5354ff14f42e 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,2 +1,4 @@
 DIST gst-libav-1.22.11.tar.xz 207500 BLAKE2B 0fd50fc6bfa8932481be8aff4263a610a0d5642763a7387a5b720abcde8f7477ee6ec024b10fe96ad4149f9e531234ba445f7d41cd958cd0ea8c9397de3e9054 SHA512 808e5659130ed608960bddb68f4ab678149a21e1fb45ebe85d82f47166a254756d615ed37eb83e2aaba349e93279bf2dc43a73daa5c33833aba26d3d8e115362
 DIST gst-libav-1.22.12.tar.xz 208220 BLAKE2B 4373a5c56af796f27c1e01d7cfb991814871d5c49f45c811a5ab09e1f0e27b18ee3061a66e60492a7a2e6de45b5b536a8673cd85b36d45d2fd87e156db940b8a SHA512 3f5ff615708a08f1091213959f11a1d99dfb9ed297727ec43c575931b2f6f88cf61219d37d127273a71f4a326e135bb104166755d969a8758004fe163fffe2c8
+DIST gst-libav-1.24.10.tar.xz 217776 BLAKE2B d22296e1de0b73e7dd519b88ca630596cc6a16cdb48f15e4db8951cfc6ca9b311c75683f11276bda9b872a2366d5d59b4653401dc3a03665144ea80b1d5df6a8 SHA512 446a9af2f446e65981525cecc58e6db9341fe2484f576434965b69a8dcb9e0cb23c67db52ce4dd15f64aef9a4ec012eb5c3baa4d68ef4c14905bf4af7e5d9c15
+DIST gst-libav-1.24.11.tar.xz 218756 BLAKE2B 2e012ac87bcb63f659bc9fd077ea163dd93439894feaa64966ec620bfbb7af0f33999058879157f84352a1721537e7c874168e6076a8e21002d30d38560516d3 SHA512 30acfeafe94903ab0e0de6aca4cf875c4eecf4d03cec6674bfc99aa4cd8e9f0994906f8822db938e1706f87fdc5b7a544aa85e9652684365595b9e01ac7f1353
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.22.12.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.22.12.ebuild
index b2d6770e29b2..0e3d41b6c179 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.22.12.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.24.10.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.24.10.ebuild
new file mode 100644
index 000000000000..b2d6770e29b2
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.24.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gstreamer-meson
+
+MY_PN="gst-libav"
+MY_PV="$(ver_cut 1-3)"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
+SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${MY_PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${MY_PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-video/ffmpeg-4:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.24.11.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.24.11.ebuild
new file mode 100644
index 000000000000..c1152d5fb631
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.24.11.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gstreamer-meson
+
+MY_PN="gst-libav"
+MY_PV="$(ver_cut 1-3)"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
+SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+
+# 1.24.11 unconditionally used new audio channel layouts added in ffmpeg-4.4;
+# 1.24.12 will build time check first. As we don't have older in tree anymore, just dep on it.
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${MY_PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${MY_PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-video/ffmpeg-4.4:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
diff --git a/media-plugins/gst-plugins-libde265/Manifest b/media-plugins/gst-plugins-libde265/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-libde265/Manifest
+++ b/media-plugins/gst-plugins-libde265/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.22.12.ebuild b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.22.12.ebuild
index 0a75718cd1bc..810941f99b1b 100644
--- a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="H.265 decoder plugin for GStreamer"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=">=media-libs/libde265-0.9[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.24.10.ebuild b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.24.10.ebuild
new file mode 100644
index 000000000000..0a75718cd1bc
--- /dev/null
+++ b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="H.265 decoder plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=media-libs/libde265-0.9[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.24.11.ebuild b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.24.11.ebuild
new file mode 100644
index 000000000000..a830a3468441
--- /dev/null
+++ b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="H.265 decoder plugin for GStreamer"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+RDEPEND=">=media-libs/libde265-0.9[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.22.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.22.ebuild
index 28f32db0f670..2f9674d8bbec 100644
--- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.22.ebuild
+++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.22.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 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	~net-libs/libnice-${PV}[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-libpng/Manifest b/media-plugins/gst-plugins-libpng/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-libpng/Manifest
+++ b/media-plugins/gst-plugins-libpng/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.22.11.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.22.11.ebuild
deleted file mode 100644
index f4252fdfcde6..000000000000
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.22.11.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="PNG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_ENABLED="png"
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.22.12.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.22.12.ebuild
index 2f01b69c8d83..573233d3e999 100644
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="PNG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.24.11.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.24.11.ebuild
new file mode 100644
index 000000000000..836c57e16b1c
--- /dev/null
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.24.11.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="PNG image encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_ENABLED="png"
diff --git a/media-plugins/gst-plugins-libvisual/Manifest b/media-plugins/gst-plugins-libvisual/Manifest
index 442c0f85539b..0ab140eea80d 100644
--- a/media-plugins/gst-plugins-libvisual/Manifest
+++ b/media-plugins/gst-plugins-libvisual/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-base-1.22.11.tar.xz 2373020 BLAKE2B 0809629afae7b82a12079dc40dd5a6a7c86876b591389c3179a74cea975b0ef3c66d9fc2f42a2f722892de2c75ef87eb0cfc5cc5df65f0ebefa02a891b0c392a SHA512 cfd8f7fe66f4707e043c8f070110eb80f9804cec529c8d29b13dbc8604db90e3f010c9614d538ad076b826df54f75ce5ebac355bd05a874e44dccead6a953c60
 DIST gst-plugins-base-1.22.12.tar.xz 2374324 BLAKE2B 7600d5a10a3d7d4f6874cc166cdca2d45d3daedec3fbb56982db172bd4f6c0463fcde812e31c42f912d8fbda793730695ab39e44b7f126b49581f7c87858b988 SHA512 f72edccd49ce2a35577dff80feb1d0f667df54d6b8f61ef2320b5d4564442b907954d015bccec7a915acf25d2197a507c32b72c1ab18dd38d254f57a3277b334
+DIST gst-plugins-base-1.24.11.tar.xz 2455952 BLAKE2B efbf7b1aaece5a287738afb93e4b99c27471c640079bc7312f84925309de0eb91ecb9837eab314e5f787d745fda6c9113105156bd819db64c869ddec6a04e7ff SHA512 b0a2a072c52628b85ae3d2ff8f2769f149fd2d0c3644fb9d9d934ea586835e29af97f41731023969a8120a470f998080ef5a0cac5aa26823d01698dfe2a5e2fb
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.22.11.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.22.11.ebuild
deleted file mode 100644
index 1131a036c3f4..000000000000
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.22.11.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
-GST_ORG_MODULE=gst-plugins-base
-
-inherit gstreamer-meson
-
-DESCRIPTION="Visualization elements for GStreamer"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=media-libs/libvisual-0.4.0-r3:0.4[${MULTILIB_USEDEP}]
-	>=media-plugins/libvisual-plugins-0.4.0-r3:0.4[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	gstreamer_system_package audio_dep:gstreamer-audio \
-		pbutils_dep:gstreamer-pbutils \
-		video_dep:gstreamer-video
-}
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.22.12.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.22.12.ebuild
index c508f76530b5..ffbd8615d07b 100644
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer-meson
 
 DESCRIPTION="Visualization elements for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=media-libs/libvisual-0.4.0-r3:0.4[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.24.11.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.24.11.ebuild
new file mode 100644
index 000000000000..31ac3ada072d
--- /dev/null
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.24.11.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer-meson
+
+DESCRIPTION="Visualization elements for GStreamer"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=media-libs/libvisual-0.4.0-r3:0.4[${MULTILIB_USEDEP}]
+	>=media-plugins/libvisual-plugins-0.4.0-r3:0.4[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_package audio_dep:gstreamer-audio \
+		pbutils_dep:gstreamer-pbutils \
+		video_dep:gstreamer-video
+}
diff --git a/media-plugins/gst-plugins-lv2/Manifest b/media-plugins/gst-plugins-lv2/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-lv2/Manifest
+++ b/media-plugins/gst-plugins-lv2/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.22.12.ebuild b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.22.12.ebuild
index 300fa79a39ea..6881054141f1 100644
--- a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="Lv2 elements for Gstreamer"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.24.10.ebuild b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.24.10.ebuild
new file mode 100644
index 000000000000..300fa79a39ea
--- /dev/null
+++ b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.24.10.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Lv2 elements for Gstreamer"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/lilv-0.24.2-r2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.24.11.ebuild b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.24.11.ebuild
new file mode 100644
index 000000000000..093b2f697a53
--- /dev/null
+++ b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.24.11.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Lv2 elements for Gstreamer"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/lilv-0.24.2-r2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.22.12.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.22.12.ebuild
index 36e69dc4c050..fd29a45a6bfb 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.22.12.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=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="metapackage"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
 REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
 
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.24.10-r1.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.24.10-r1.ebuild
new file mode 100644
index 000000000000..2bab54492d75
--- /dev/null
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.24.10-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build
+
+DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="metapackage"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
+REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
+
+RDEPEND="
+	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:1.0[alsa?,ogg?,theora?,vorbis?,X?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-good-${PV}:1.0[${MULTILIB_USEDEP}]
+	a52? ( >=media-plugins/gst-plugins-a52dec-${PV}:1.0[${MULTILIB_USEDEP}] )
+	aac? ( >=media-plugins/gst-plugins-faad-${PV}:1.0[${MULTILIB_USEDEP}] )
+	cdda? ( || (
+		>=media-plugins/gst-plugins-cdparanoia-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-cdio-${PV}:1.0[${MULTILIB_USEDEP}] ) )
+	dts? ( >=media-plugins/gst-plugins-dts-${PV}:1.0[${MULTILIB_USEDEP}] )
+	dv? ( >=media-plugins/gst-plugins-dv-${PV}:1.0[${MULTILIB_USEDEP}] )
+	dvb? (
+		>=media-plugins/gst-plugins-dvb-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-libs/gst-plugins-bad-${PV}:1.0[${MULTILIB_USEDEP}] )
+	dvd? (
+		>=media-libs/gst-plugins-ugly-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-a52dec-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-dvdread-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-resindvd-${PV}:1.0[${MULTILIB_USEDEP}] )
+	ffmpeg? ( >=media-plugins/gst-plugins-libav-${PV}:1.0[${MULTILIB_USEDEP}] )
+	flac? ( >=media-plugins/gst-plugins-flac-${PV}:1.0[${MULTILIB_USEDEP}] )
+	http? ( >=media-plugins/gst-plugins-soup-${PV}:1.0[${MULTILIB_USEDEP}] )
+	jack? ( >=media-plugins/gst-plugins-jack-${PV}:1.0[${MULTILIB_USEDEP}] )
+	lame? ( >=media-plugins/gst-plugins-lame-${PV}:1.0[${MULTILIB_USEDEP}] )
+	libass? ( >=media-plugins/gst-plugins-assrender-${PV}:1.0[${MULTILIB_USEDEP}] )
+	libvisual? ( >=media-plugins/gst-plugins-libvisual-${PV}:1.0[${MULTILIB_USEDEP}] )
+	modplug? ( >=media-plugins/gst-plugins-modplug-${PV}:1.0[${MULTILIB_USEDEP}] )
+	mp3? (
+		>=media-libs/gst-plugins-ugly-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpg123-${PV}:1.0[${MULTILIB_USEDEP}] )
+	mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-plugins/gst-plugins-opus-${PV}:1.0[${MULTILIB_USEDEP}] )
+	oss? ( >=media-plugins/gst-plugins-oss-${PV}:1.0[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-plugins/gst-plugins-pulse-${PV}:1.0[${MULTILIB_USEDEP}] )
+	taglib? ( >=media-plugins/gst-plugins-taglib-${PV}:1.0[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-plugins/gst-plugins-v4l2-${PV}:1.0[${MULTILIB_USEDEP}] )
+	vaapi? ( >=media-libs/gst-plugins-bad-${PV}:1.0[vaapi,${MULTILIB_USEDEP}] )
+	vcd? (
+		>=media-plugins/gst-plugins-mplex-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-plugins/gst-plugins-vpx-${PV}:1.0[${MULTILIB_USEDEP}] )
+	wavpack? ( >=media-plugins/gst-plugins-wavpack-${PV}:1.0[${MULTILIB_USEDEP}] )
+	x264? ( >=media-plugins/gst-plugins-x264-${PV}:1.0[${MULTILIB_USEDEP}] )
+"
+
+# Usage note:
+# The idea is that apps depend on this for optional gstreamer plugins.  Then,
+# when USE flags change, no app gets rebuilt, and all apps that can make use of
+# the new plugin automatically do.
+
+# When adding deps here, make sure the keywords on the gst-plugin are valid.
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.24.11.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.24.11.ebuild
new file mode 100644
index 000000000000..2222284b0c62
--- /dev/null
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.24.11.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build
+
+DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="metapackage"
+SLOT="1.0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
+REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
+
+RDEPEND="
+	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:1.0[alsa?,ogg?,theora?,vorbis?,X?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-good-${PV}:1.0[${MULTILIB_USEDEP}]
+	a52? ( >=media-plugins/gst-plugins-a52dec-${PV}:1.0[${MULTILIB_USEDEP}] )
+	aac? ( >=media-plugins/gst-plugins-faad-${PV}:1.0[${MULTILIB_USEDEP}] )
+	cdda? ( || (
+		>=media-plugins/gst-plugins-cdparanoia-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-cdio-${PV}:1.0[${MULTILIB_USEDEP}] ) )
+	dts? ( >=media-plugins/gst-plugins-dts-${PV}:1.0[${MULTILIB_USEDEP}] )
+	dv? ( >=media-plugins/gst-plugins-dv-${PV}:1.0[${MULTILIB_USEDEP}] )
+	dvb? (
+		>=media-plugins/gst-plugins-dvb-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-libs/gst-plugins-bad-${PV}:1.0[${MULTILIB_USEDEP}] )
+	dvd? (
+		>=media-libs/gst-plugins-ugly-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-a52dec-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-dvdread-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-resindvd-${PV}:1.0[${MULTILIB_USEDEP}] )
+	ffmpeg? ( >=media-plugins/gst-plugins-libav-${PV}:1.0[${MULTILIB_USEDEP}] )
+	flac? ( >=media-plugins/gst-plugins-flac-${PV}:1.0[${MULTILIB_USEDEP}] )
+	http? ( >=media-plugins/gst-plugins-soup-${PV}:1.0[${MULTILIB_USEDEP}] )
+	jack? ( >=media-plugins/gst-plugins-jack-${PV}:1.0[${MULTILIB_USEDEP}] )
+	lame? ( >=media-plugins/gst-plugins-lame-${PV}:1.0[${MULTILIB_USEDEP}] )
+	libass? ( >=media-plugins/gst-plugins-assrender-${PV}:1.0[${MULTILIB_USEDEP}] )
+	libvisual? ( >=media-plugins/gst-plugins-libvisual-${PV}:1.0[${MULTILIB_USEDEP}] )
+	modplug? ( >=media-plugins/gst-plugins-modplug-${PV}:1.0[${MULTILIB_USEDEP}] )
+	mp3? (
+		>=media-libs/gst-plugins-ugly-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpg123-${PV}:1.0[${MULTILIB_USEDEP}] )
+	mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-plugins/gst-plugins-opus-${PV}:1.0[${MULTILIB_USEDEP}] )
+	oss? ( >=media-plugins/gst-plugins-oss-${PV}:1.0[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-plugins/gst-plugins-pulse-${PV}:1.0[${MULTILIB_USEDEP}] )
+	taglib? ( >=media-plugins/gst-plugins-taglib-${PV}:1.0[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-plugins/gst-plugins-v4l2-${PV}:1.0[${MULTILIB_USEDEP}] )
+	vaapi? ( >=media-libs/gst-plugins-bad-${PV}:1.0[vaapi,${MULTILIB_USEDEP}] )
+	vcd? (
+		>=media-plugins/gst-plugins-mplex-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-plugins/gst-plugins-vpx-${PV}:1.0[${MULTILIB_USEDEP}] )
+	wavpack? ( >=media-plugins/gst-plugins-wavpack-${PV}:1.0[${MULTILIB_USEDEP}] )
+	x264? ( >=media-plugins/gst-plugins-x264-${PV}:1.0[${MULTILIB_USEDEP}] )
+"
+
+# Usage note:
+# The idea is that apps depend on this for optional gstreamer plugins.  Then,
+# when USE flags change, no app gets rebuilt, and all apps that can make use of
+# the new plugin automatically do.
+
+# When adding deps here, make sure the keywords on the gst-plugin are valid.
diff --git a/media-plugins/gst-plugins-modplug/Manifest b/media-plugins/gst-plugins-modplug/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-modplug/Manifest
+++ b/media-plugins/gst-plugins-modplug/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.22.12.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.22.12.ebuild
index 22212b149e05..2a0f02b43e8e 100644
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="MOD audio decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86"
 
 RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.24.10.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.24.10.ebuild
new file mode 100644
index 000000000000..22212b149e05
--- /dev/null
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="MOD audio decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.24.11.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.24.11.ebuild
new file mode 100644
index 000000000000..5f002a98ff65
--- /dev/null
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="MOD audio decoder plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpeg2dec/Manifest b/media-plugins/gst-plugins-mpeg2dec/Manifest
index 4d94fd9151a4..4c6a49b345af 100644
--- a/media-plugins/gst-plugins-mpeg2dec/Manifest
+++ b/media-plugins/gst-plugins-mpeg2dec/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-ugly-1.22.11.tar.xz 256812 BLAKE2B 143fe16c92465be0c5bfb5b6c452be9e730501d372e49c26c6837eb2ff336b8098cda5afc61b3620f9ea9ed13eed6118e0deed8dcc9eab499b941e5e64157fd9 SHA512 767e80c1d15ec79ff196c4c4ad6128bc17502b490201c1a3799341a2784848f639392310de7dabc922d022acb5156bd25e4191ba2409c17b3a23a278f7722c5c
 DIST gst-plugins-ugly-1.22.12.tar.xz 257464 BLAKE2B c7f89dda309712cb2380b2e29b67a40c02c561bbe49a83acb2beb84aac6ebaed895e1a27d5f6fb6787c803e2e94a0409d14a3206feb9797c5329bbaff5e4a61d SHA512 3ef5cb384578bcaff3bb45fa8fa8f97884acb2e09a1621c504fca4bd8744cb83e71c342372a7ddd06bc4077fdd2684d1f7f078278392361ed4e18afed374c659
+DIST gst-plugins-ugly-1.24.10.tar.xz 231124 BLAKE2B d4e5d5a4abd3860d98ea9066d9eb13662ef639bd0ee8b8a1c5d5ffb155e0febc968019a151259cfd6592c8f27332bf6b4b6a3d74249b530c1a25eb31adf31b19 SHA512 87430ccf3e0382bae8f24e429734c38d9339ea95205e2a5fe5db8408ca9a369ee971b2e84b0717f918d65b2b91dec4baf032d8a01658512ec0af9ee9dfe397c5
+DIST gst-plugins-ugly-1.24.11.tar.xz 232056 BLAKE2B 849c34c099d062c81e7e008aee95d36ac6aae0c08eacec0e2ba3582b421d912f9dc0322031310eb459c76af30056ee38d5b5849d0400540656571c1a110f1c54 SHA512 461f3a07b4265bfe66b5b22f3a10bbf254068381f5634e970b3cb6d1c2d3ea401e0be43d188934a490e29658d8447a83de50253380cde371b0f5a55178f90e6a
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.22.12.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.22.12.ebuild
index ff64204b0513..1368ce847b7e 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer-meson
 
 DESCRIPTION="MPEG2 decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.24.10.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.24.10.ebuild
new file mode 100644
index 000000000000..ff64204b0513
--- /dev/null
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.24.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer-meson
+
+DESCRIPTION="MPEG2 decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.24.11.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.24.11.ebuild
new file mode 100644
index 000000000000..6d8bb163532c
--- /dev/null
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.24.11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer-meson
+
+DESCRIPTION="MPEG2 decoder plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-mpeg2enc/Manifest b/media-plugins/gst-plugins-mpeg2enc/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-mpeg2enc/Manifest
+++ b/media-plugins/gst-plugins-mpeg2enc/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.22.12.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.22.12.ebuild
index 140cf1bb1df8..0d3d8a6d32ba 100644
--- a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="MPEG-1/2 video encoding plugin for GStreamer"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=">=media-video/mjpegtools-2.1.0-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.24.10.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.24.10.ebuild
new file mode 100644
index 000000000000..140cf1bb1df8
--- /dev/null
+++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.24.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="MPEG-1/2 video encoding plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=media-video/mjpegtools-2.1.0-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.24.11.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.24.11.ebuild
new file mode 100644
index 000000000000..eedc4cf03c4e
--- /dev/null
+++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.24.11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="MPEG-1/2 video encoding plugin for GStreamer"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+RDEPEND=">=media-video/mjpegtools-2.1.0-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-mpg123/Manifest b/media-plugins/gst-plugins-mpg123/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-mpg123/Manifest
+++ b/media-plugins/gst-plugins-mpg123/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.22.11.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.22.11.ebuild
deleted file mode 100644
index 8c23bff4ff53..000000000000
--- a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.22.11.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="MP3 decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=media-sound/mpg123-base-1.23[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.22.12.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.22.12.ebuild
index ca79d18de6df..1df70e72faf3 100644
--- a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="MP3 decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=media-sound/mpg123-base-1.23[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.24.11.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.24.11.ebuild
new file mode 100644
index 000000000000..012b017c42c4
--- /dev/null
+++ b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.24.11.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="MP3 decoder plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=media-sound/mpg123-base-1.23[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mplex/Manifest b/media-plugins/gst-plugins-mplex/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-mplex/Manifest
+++ b/media-plugins/gst-plugins-mplex/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.22.12.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.22.12.ebuild
index 80dff63cadd9..11d7ae1c3c95 100644
--- a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="MPEG/DVD/SVCD/VCD video/audio multiplexing plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-video/mjpegtools-2.1.0-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.24.10.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.24.10.ebuild
new file mode 100644
index 000000000000..80dff63cadd9
--- /dev/null
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.24.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="MPEG/DVD/SVCD/VCD video/audio multiplexing plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=media-video/mjpegtools-2.1.0-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.24.11.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.24.11.ebuild
new file mode 100644
index 000000000000..d5b53836f04c
--- /dev/null
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.24.11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="MPEG/DVD/SVCD/VCD video/audio multiplexing plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=media-video/mjpegtools-2.1.0-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-neon/Manifest b/media-plugins/gst-plugins-neon/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-neon/Manifest
+++ b/media-plugins/gst-plugins-neon/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.22.12.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.22.12.ebuild
index 4e91665933ad..d9a0a72254f8 100644
--- a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="HTTP client source plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 x86"
 
 RDEPEND="
 	>=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.24.10.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.24.10.ebuild
new file mode 100644
index 000000000000..4e91665933ad
--- /dev/null
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.24.10.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="HTTP client source plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]
+	<=net-libs/neon-0.33.99[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.24.11.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.24.11.ebuild
new file mode 100644
index 000000000000..09d2e03c51c9
--- /dev/null
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="HTTP client source plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-openaptx/Manifest b/media-plugins/gst-plugins-openaptx/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-openaptx/Manifest
+++ b/media-plugins/gst-plugins-openaptx/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.22.12.ebuild b/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.22.12.ebuild
index 6be73376483b..195dce70d4d2 100644
--- a/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="openaptx plugin for GStreamer"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	|| (
diff --git a/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.24.10.ebuild b/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.24.10.ebuild
new file mode 100644
index 000000000000..6be73376483b
--- /dev/null
+++ b/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.24.10.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="openaptx plugin for GStreamer"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		>=media-libs/libfreeaptx-0.1.1[${MULTILIB_USEDEP}]
+		=media-libs/libopenaptx-0.2.0*[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.24.11.ebuild b/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.24.11.ebuild
new file mode 100644
index 000000000000..9fdc3ee2b2ca
--- /dev/null
+++ b/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.24.11.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="openaptx plugin for GStreamer"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		>=media-libs/libfreeaptx-0.1.1[${MULTILIB_USEDEP}]
+		=media-libs/libopenaptx-0.2.0*[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-opencv/Manifest b/media-plugins/gst-plugins-opencv/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-opencv/Manifest
+++ b/media-plugins/gst-plugins-opencv/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.24.10-use-system-libs-opencv.patch b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.24.10-use-system-libs-opencv.patch
new file mode 100644
index 000000000000..3c54e3f2f43b
--- /dev/null
+++ b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.24.10-use-system-libs-opencv.patch
@@ -0,0 +1,91 @@
+libgstopencv.so is "normally" installed by gst-plugins-bad, but we want it to
+be part of our gst-plugins-opencv package (installing it as part of gst-plugins-bad
+would at least be confusing, and also not ideal given it'd have to depend on opencv,
+even though we have gst-plugins-opencv).
+
+bad currently doesn't have a way to allow disabling everything but the opencv
+plugin bit, so that's what this patch does as a hack. It only keeps the bare
+minimum to build the opencv helper (i.e. disable everything that gst-plugins-bad
+does to not collide, but keep opencv).
+
+TODO: replace this with something more maintainable, e.g. possible hacks
+with submodules or creating a drop-in meson.build in the ebuild to just build
+the plugin & helper libs.
+--- a/ext/meson.build
++++ b/ext/meson.build
+@@ -68,9 +68,6 @@ subdir('ttml')
+ subdir('voaacenc')
+ subdir('voamrwbenc')
+ subdir('vulkan')
+-subdir('wayland')
+-subdir('webrtc')
+-subdir('webrtcdsp')
+ subdir('webp')
+ subdir('wildmidi')
+ subdir('wpe')
+--- a/gst-libs/gst/meson.build
++++ b/gst-libs/gst/meson.build
+@@ -1,27 +1 @@
+-subdir('uridownloader')
+-
+-subdir('adaptivedemux')
+-subdir('audio')
+-subdir('basecamerabinsrc')
+-subdir('codecparsers')
+-subdir('codecs')
+-subdir('d3d11')
+-# cuda can depend on d3d11
+-subdir('cuda')
+-subdir('dxva')
+-subdir('insertbin')
+-subdir('interfaces')
+-subdir('isoff')
+-subdir('mpegts')
+-subdir('mse')
+ subdir('opencv')
+-subdir('play')
+-subdir('player')
+-subdir('sctp')
+-subdir('transcoder')
+-subdir('va')
+-subdir('vulkan')
+-subdir('wayland')
+-subdir('webrtc')
+-subdir('winrt')
+-subdir('analytics')
+--- a/meson.build
++++ b/meson.build
+@@ -556,23 +556,10 @@ pkgconfig_variables = ['exec_prefix=${prefix}',
+ 
+ pkgconfig_subdirs = ['gstreamer-1.0']
+ 
+-pkgconfig.generate(
+-  libraries : [gst_dep],
+-  variables : pkgconfig_variables,
+-  subdirs : pkgconfig_subdirs,
+-  name : 'gstreamer-plugins-bad-1.0',
+-  description : 'Streaming media framework, bad plugins libraries',
+-)
+-
+ gpl_allowed = get_option('gpl').allowed()
+ 
+ subdir('gst-libs')
+-subdir('gst')
+-subdir('sys')
+ subdir('ext')
+-subdir('tests')
+-subdir('data')
+-subdir('tools')
+ 
+ if have_orcc
+   update_orc_dist_files = find_program('scripts/update-orc-dist-files.py')
+--- a/sys/meson.build
++++ b/sys/meson.build
+@@ -21,7 +21,6 @@ subdir('msdk')
+ subdir('nvcodec')
+ subdir('opensles')
+ subdir('qsv')
+-subdir('shm')
+ subdir('tinyalsa')
+ subdir('uvch264')
+ subdir('v4l2codecs')
diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.24.10.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.24.10.ebuild
new file mode 100644
index 000000000000..be0f4e10574f
--- /dev/null
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.24.10.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+inherit gstreamer-meson
+
+DESCRIPTION="OpenCV elements for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=media-libs/opencv-4.1.2-r3:=[contrib,contribdnn,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/gst-plugins-bad-1.24.10-use-system-libs-opencv.patch
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		# We need to disable here to avoid colliding w/ gst-plugins-bad
+		# on translations, because we currently do a "full" install in
+		# multilib_src_install in this package. See bug #907480.
+		-Dnls=disabled
+	)
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.24.11.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.24.11.ebuild
new file mode 100644
index 000000000000..be0f4e10574f
--- /dev/null
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.24.11.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+inherit gstreamer-meson
+
+DESCRIPTION="OpenCV elements for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=media-libs/opencv-4.1.2-r3:=[contrib,contribdnn,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/gst-plugins-bad-1.24.10-use-system-libs-opencv.patch
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		# We need to disable here to avoid colliding w/ gst-plugins-bad
+		# on translations, because we currently do a "full" install in
+		# multilib_src_install in this package. See bug #907480.
+		-Dnls=disabled
+	)
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
diff --git a/media-plugins/gst-plugins-openh264/Manifest b/media-plugins/gst-plugins-openh264/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-openh264/Manifest
+++ b/media-plugins/gst-plugins-openh264/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.22.12.ebuild b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.22.12.ebuild
index 69c2eb0f1f71..818dadb39fc1 100644
--- a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="H.264 encoder/decoder plugin for GStreamer"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND=">=media-libs/openh264-1.3:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.24.10.ebuild b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.24.10.ebuild
new file mode 100644
index 000000000000..69c2eb0f1f71
--- /dev/null
+++ b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="H.264 encoder/decoder plugin for GStreamer"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=media-libs/openh264-1.3:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.24.11.ebuild b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.24.11.ebuild
new file mode 100644
index 000000000000..61ae9e7949ae
--- /dev/null
+++ b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="H.264 encoder/decoder plugin for GStreamer"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=media-libs/openh264-1.3:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index 5a2175c74aa6..7f5e19314703 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -1,4 +1,4 @@
-DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
-DIST gst-plugins-base-1.22.11.tar.xz 2373020 BLAKE2B 0809629afae7b82a12079dc40dd5a6a7c86876b591389c3179a74cea975b0ef3c66d9fc2f42a2f722892de2c75ef87eb0cfc5cc5df65f0ebefa02a891b0c392a SHA512 cfd8f7fe66f4707e043c8f070110eb80f9804cec529c8d29b13dbc8604db90e3f010c9614d538ad076b826df54f75ce5ebac355bd05a874e44dccead6a953c60
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
 DIST gst-plugins-base-1.22.12.tar.xz 2374324 BLAKE2B 7600d5a10a3d7d4f6874cc166cdca2d45d3daedec3fbb56982db172bd4f6c0463fcde812e31c42f912d8fbda793730695ab39e44b7f126b49581f7c87858b988 SHA512 f72edccd49ce2a35577dff80feb1d0f667df54d6b8f61ef2320b5d4564442b907954d015bccec7a915acf25d2197a507c32b72c1ab18dd38d254f57a3277b334
+DIST gst-plugins-base-1.24.11.tar.xz 2455952 BLAKE2B efbf7b1aaece5a287738afb93e4b99c27471c640079bc7312f84925309de0eb91ecb9837eab314e5f787d745fda6c9113105156bd819db64c869ddec6a04e7ff SHA512 b0a2a072c52628b85ae3d2ff8f2769f149fd2d0c3644fb9d9d934ea586835e29af97f41731023969a8120a470f998080ef5a0cac5aa26823d01698dfe2a5e2fb
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.22.11.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.22.11.ebuild
deleted file mode 100644
index 84cbff7f900d..000000000000
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.22.11.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-base
-
-inherit gstreamer-meson
-
-DESCRIPTION="Opus audio parser plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
-
-RDEPEND="${COMMON_DEPEND}
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},ogg]
-"
-DEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	default
-	gstreamer_system_package audio_dep:gstreamer-audio \
-		pbutils_dep:gstreamer-pbutils \
-		tag_dep:gstreamer-tag
-}
-
-# Everything below is for building opusparse from gst-plugins-bad. Once it moves into -base, all below can be removed
-SRC_URI+=" https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.${GST_TARBALL_SUFFIX}"
-
-in_bdir() {
-	pushd "${BUILD_DIR}" || die
-	"$@"
-	popd || die
-}
-
-src_configure() {
-	S="${WORKDIR}/gst-plugins-base-${PV}" multilib_foreach_abi gstreamer_multilib_src_configure
-	S="${WORKDIR}/gst-plugins-bad-${PV}"  multilib_foreach_abi gstreamer_multilib_src_configure
-}
-
-src_compile() {
-	S="${WORKDIR}/gst-plugins-base-${PV}" multilib_foreach_abi in_bdir gstreamer_multilib_src_compile
-	S="${WORKDIR}/gst-plugins-bad-${PV}"  multilib_foreach_abi in_bdir gstreamer_multilib_src_compile
-}
-
-src_install() {
-	S="${WORKDIR}/gst-plugins-base-${PV}" multilib_foreach_abi in_bdir gstreamer_multilib_src_install
-	S="${WORKDIR}/gst-plugins-bad-${PV}"  multilib_foreach_abi in_bdir gstreamer_multilib_src_install
-}
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.22.12.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.22.12.ebuild
index 6ce1fb70161d..9e1dfd241817 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer-meson
 
 DESCRIPTION="Opus audio parser plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
 
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.24.11.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.24.11.ebuild
new file mode 100644
index 000000000000..bb97e5c59962
--- /dev/null
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.24.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer-meson
+
+DESCRIPTION="Opus audio parser plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
+
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},ogg]
+"
+DEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_package audio_dep:gstreamer-audio \
+		pbutils_dep:gstreamer-pbutils \
+		tag_dep:gstreamer-tag
+}
+
+# Everything below is for building opusparse from gst-plugins-bad. Once it moves into -base, all below can be removed
+SRC_URI+=" https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.${GST_TARBALL_SUFFIX}"
+
+in_bdir() {
+	pushd "${BUILD_DIR}" || die
+	"$@"
+	popd || die
+}
+
+src_configure() {
+	S="${WORKDIR}/gst-plugins-base-${PV}" multilib_foreach_abi gstreamer_multilib_src_configure
+	S="${WORKDIR}/gst-plugins-bad-${PV}"  multilib_foreach_abi gstreamer_multilib_src_configure
+}
+
+src_compile() {
+	S="${WORKDIR}/gst-plugins-base-${PV}" multilib_foreach_abi in_bdir gstreamer_multilib_src_compile
+	S="${WORKDIR}/gst-plugins-bad-${PV}"  multilib_foreach_abi in_bdir gstreamer_multilib_src_compile
+}
+
+src_install() {
+	S="${WORKDIR}/gst-plugins-base-${PV}" multilib_foreach_abi in_bdir gstreamer_multilib_src_install
+	S="${WORKDIR}/gst-plugins-bad-${PV}"  multilib_foreach_abi in_bdir gstreamer_multilib_src_install
+}
diff --git a/media-plugins/gst-plugins-oss/Manifest b/media-plugins/gst-plugins-oss/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-oss/Manifest
+++ b/media-plugins/gst-plugins-oss/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.22.11.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.22.11.ebuild
deleted file mode 100644
index ed413595197e..000000000000
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.22.11.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND=""
-DEPEND="virtual/os-headers"
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.22.12.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.22.12.ebuild
index ac7c966f277f..beee7eeae922 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=""
 DEPEND="virtual/os-headers"
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.24.11.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.24.11.ebuild
new file mode 100644
index 000000000000..dee1449e5662
--- /dev/null
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="virtual/os-headers"
diff --git a/media-plugins/gst-plugins-pulse/Manifest b/media-plugins/gst-plugins-pulse/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-pulse/Manifest
+++ b/media-plugins/gst-plugins-pulse/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.22.11.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.22.11.ebuild
deleted file mode 100644
index 2c7a95c07905..000000000000
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.22.11.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="PulseAudio sound server plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-libs/libpulse-2.1-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.22.12.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.22.12.ebuild
index 89bca732351a..2be52c0d17fa 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="PulseAudio sound server plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.24.11.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.24.11.ebuild
new file mode 100644
index 000000000000..24dea0cdcab2
--- /dev/null
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.24.11.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="PulseAudio sound server plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/libpulse-2.1-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-raw1394/Manifest b/media-plugins/gst-plugins-raw1394/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-raw1394/Manifest
+++ b/media-plugins/gst-plugins-raw1394/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.22.11.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.22.11.ebuild
deleted file mode 100644
index 9a19b0e0c0f1..000000000000
--- a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.22.11.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="Fiwewire DV/HDV capture plugin for GStreamer"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-
-RDEPEND="
-	>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_ENABLED="dv1394"
-GST_PLUGINS_BUILD_DIR="raw1394"
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.22.12.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.22.12.ebuild
index 3e06eb3145ff..c2c48646f617 100644
--- a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="Fiwewire DV/HDV capture plugin for GStreamer"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 
 RDEPEND="
 	>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.24.11.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.24.11.ebuild
new file mode 100644
index 000000000000..ac4cf929744a
--- /dev/null
+++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.24.11.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="Fiwewire DV/HDV capture plugin for GStreamer"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_ENABLED="dv1394"
+GST_PLUGINS_BUILD_DIR="raw1394"
diff --git a/media-plugins/gst-plugins-resindvd/Manifest b/media-plugins/gst-plugins-resindvd/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-resindvd/Manifest
+++ b/media-plugins/gst-plugins-resindvd/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.22.12.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.22.12.ebuild
index e07086ed0a14..780415dd4c06 100644
--- a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="DVD playback support plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=media-libs/libdvdnav-4.2.0-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.24.10.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.24.10.ebuild
new file mode 100644
index 000000000000..e07086ed0a14
--- /dev/null
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.24.10.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="DVD playback support plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=media-libs/libdvdnav-4.2.0-r1:=[${MULTILIB_USEDEP}]
+	>=media-libs/libdvdread-4.2.0-r1:=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.24.11.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.24.11.ebuild
new file mode 100644
index 000000000000..063083e3598f
--- /dev/null
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.24.11.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="DVD playback support plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=media-libs/libdvdnav-4.2.0-r1:=[${MULTILIB_USEDEP}]
+	>=media-libs/libdvdread-4.2.0-r1:=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-rtmp/Manifest b/media-plugins/gst-plugins-rtmp/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-rtmp/Manifest
+++ b/media-plugins/gst-plugins-rtmp/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.22.12.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.22.12.ebuild
index bc68265744ce..821e47b86ceb 100644
--- a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="RTMP source/sink plugin for GStreamer"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=">=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.24.10.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.24.10.ebuild
new file mode 100644
index 000000000000..bc68265744ce
--- /dev/null
+++ b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="RTMP source/sink plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.24.11.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.24.11.ebuild
new file mode 100644
index 000000000000..3919708bdf43
--- /dev/null
+++ b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="RTMP source/sink plugin for GStreamer"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+RDEPEND=">=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-sbc/Manifest b/media-plugins/gst-plugins-sbc/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-sbc/Manifest
+++ b/media-plugins/gst-plugins-sbc/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-sbc/gst-plugins-sbc-1.24.10.ebuild b/media-plugins/gst-plugins-sbc/gst-plugins-sbc-1.24.10.ebuild
new file mode 100644
index 000000000000..1400b52c98b3
--- /dev/null
+++ b/media-plugins/gst-plugins-sbc/gst-plugins-sbc-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="SBC encoder and decoder plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="media-libs/sbc[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-sbc/gst-plugins-sbc-1.24.11.ebuild b/media-plugins/gst-plugins-sbc/gst-plugins-sbc-1.24.11.ebuild
new file mode 100644
index 000000000000..ec5d1b49c706
--- /dev/null
+++ b/media-plugins/gst-plugins-sbc/gst-plugins-sbc-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="SBC encoder and decoder plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="media-libs/sbc[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-sctp/Manifest b/media-plugins/gst-plugins-sctp/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-sctp/Manifest
+++ b/media-plugins/gst-plugins-sctp/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.22.12.ebuild b/media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.22.12.ebuild
index 8c6a35cc81bc..e4fe53266abe 100644
--- a/media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="SCTP plugins for GStreamer"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.24.10.ebuild b/media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.24.10.ebuild
new file mode 100644
index 000000000000..8c6a35cc81bc
--- /dev/null
+++ b/media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="SCTP plugins for GStreamer"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.24.11.ebuild b/media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.24.11.ebuild
new file mode 100644
index 000000000000..e4fe53266abe
--- /dev/null
+++ b/media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="SCTP plugins for GStreamer"
+KEYWORDS="amd64 ~arm64"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-shout2/Manifest b/media-plugins/gst-plugins-shout2/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-shout2/Manifest
+++ b/media-plugins/gst-plugins-shout2/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.22.11.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.22.11.ebuild
deleted file mode 100644
index e921ff09d410..000000000000
--- a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.22.11.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="Icecast server sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 x86"
-
-# Requires >= 2.4.3 but prefers >= 2.4.6
-RDEPEND=">=media-libs/libshout-2.4.6[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.22.12.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.22.12.ebuild
index 036719adce64..587be2056097 100644
--- a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="Icecast server sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 x86"
 
 # Requires >= 2.4.3 but prefers >= 2.4.6
 RDEPEND=">=media-libs/libshout-2.4.6[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.24.11.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.24.11.ebuild
new file mode 100644
index 000000000000..8535d93ee7bb
--- /dev/null
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.24.11.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="Icecast server sink plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+# Requires >= 2.4.3 but prefers >= 2.4.6
+RDEPEND=">=media-libs/libshout-2.4.6[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-sidplay/Manifest b/media-plugins/gst-plugins-sidplay/Manifest
index 4d94fd9151a4..4c6a49b345af 100644
--- a/media-plugins/gst-plugins-sidplay/Manifest
+++ b/media-plugins/gst-plugins-sidplay/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-ugly-1.22.11.tar.xz 256812 BLAKE2B 143fe16c92465be0c5bfb5b6c452be9e730501d372e49c26c6837eb2ff336b8098cda5afc61b3620f9ea9ed13eed6118e0deed8dcc9eab499b941e5e64157fd9 SHA512 767e80c1d15ec79ff196c4c4ad6128bc17502b490201c1a3799341a2784848f639392310de7dabc922d022acb5156bd25e4191ba2409c17b3a23a278f7722c5c
 DIST gst-plugins-ugly-1.22.12.tar.xz 257464 BLAKE2B c7f89dda309712cb2380b2e29b67a40c02c561bbe49a83acb2beb84aac6ebaed895e1a27d5f6fb6787c803e2e94a0409d14a3206feb9797c5329bbaff5e4a61d SHA512 3ef5cb384578bcaff3bb45fa8fa8f97884acb2e09a1621c504fca4bd8744cb83e71c342372a7ddd06bc4077fdd2684d1f7f078278392361ed4e18afed374c659
+DIST gst-plugins-ugly-1.24.10.tar.xz 231124 BLAKE2B d4e5d5a4abd3860d98ea9066d9eb13662ef639bd0ee8b8a1c5d5ffb155e0febc968019a151259cfd6592c8f27332bf6b4b6a3d74249b530c1a25eb31adf31b19 SHA512 87430ccf3e0382bae8f24e429734c38d9339ea95205e2a5fe5db8408ca9a369ee971b2e84b0717f918d65b2b91dec4baf032d8a01658512ec0af9ee9dfe397c5
+DIST gst-plugins-ugly-1.24.11.tar.xz 232056 BLAKE2B 849c34c099d062c81e7e008aee95d36ac6aae0c08eacec0e2ba3582b421d912f9dc0322031310eb459c76af30056ee38d5b5849d0400540656571c1a110f1c54 SHA512 461f3a07b4265bfe66b5b22f3a10bbf254068381f5634e970b3cb6d1c2d3ea401e0be43d188934a490e29658d8447a83de50253380cde371b0f5a55178f90e6a
diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.22.12.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.22.12.ebuild
index b9c48b37b348..3b34b7946352 100644
--- a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer-meson
 
 DESCRIPTION="Sid decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 ~sparc x86"
 
 RDEPEND=">=media-libs/libsidplay-1.36.59-r1:1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.24.10.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.24.10.ebuild
new file mode 100644
index 000000000000..b9c48b37b348
--- /dev/null
+++ b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.24.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer-meson
+
+DESCRIPTION="Sid decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=media-libs/libsidplay-1.36.59-r1:1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.24.11.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.24.11.ebuild
new file mode 100644
index 000000000000..b36545f3c184
--- /dev/null
+++ b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.24.11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer-meson
+
+DESCRIPTION="Sid decoder plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=media-libs/libsidplay-1.36.59-r1:1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-smoothstreaming/Manifest b/media-plugins/gst-plugins-smoothstreaming/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-smoothstreaming/Manifest
+++ b/media-plugins/gst-plugins-smoothstreaming/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.22.12.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.22.12.ebuild
index f62ec7647a20..2128461be568 100644
--- a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="Smooth Streaming plugin for GStreamer"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.24.10.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.24.10.ebuild
new file mode 100644
index 000000000000..f62ec7647a20
--- /dev/null
+++ b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.24.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Smooth Streaming plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_package gstcodecparsers_dep:gstreamer-codecparsers
+	gstreamer_system_library \
+		gstadaptivedemux_dep:gstadaptivedemux \
+		gstisoff_dep:gstisoff \
+		gsturidownloader_dep:gsturidownloader
+}
+
+pkg_postinst() {
+	einfo "media-plugins/gst-plugins-adaptivedemux2 provides an alternative smooth streaming demuxer option (mssdemux2)"
+}
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.24.11.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.24.11.ebuild
new file mode 100644
index 000000000000..db386c6263aa
--- /dev/null
+++ b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.24.11.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Smooth Streaming plugin for GStreamer"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_package gstcodecparsers_dep:gstreamer-codecparsers
+	gstreamer_system_library \
+		gstadaptivedemux_dep:gstadaptivedemux \
+		gstisoff_dep:gstisoff \
+		gsturidownloader_dep:gsturidownloader
+}
+
+pkg_postinst() {
+	einfo "media-plugins/gst-plugins-adaptivedemux2 provides an alternative smooth streaming demuxer option (mssdemux2)"
+}
diff --git a/media-plugins/gst-plugins-soundtouch/Manifest b/media-plugins/gst-plugins-soundtouch/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-soundtouch/Manifest
+++ b/media-plugins/gst-plugins-soundtouch/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.22.12.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.22.12.ebuild
index 2fe2c1153988..8848d7e8e7b6 100644
--- a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="Beats-per-minute detection and pitch controlling plugin for GStreamer"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=">=media-libs/libsoundtouch-1.7.1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.24.10.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.24.10.ebuild
new file mode 100644
index 000000000000..2fe2c1153988
--- /dev/null
+++ b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Beats-per-minute detection and pitch controlling plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=media-libs/libsoundtouch-1.7.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.24.11.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.24.11.ebuild
new file mode 100644
index 000000000000..a6b0ede3a95f
--- /dev/null
+++ b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Beats-per-minute detection and pitch controlling plugin for GStreamer"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+RDEPEND=">=media-libs/libsoundtouch-1.7.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-soup/Manifest b/media-plugins/gst-plugins-soup/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-soup/Manifest
+++ b/media-plugins/gst-plugins-soup/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.22.11.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.22.11.ebuild
deleted file mode 100644
index e4cd64e6344a..000000000000
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.22.11.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
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="HTTP client source/sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
-
-# Checks at runtime which libsoup was linked in and picks the appropriate one.
-# Need both here to guarantee consumers will work.
-# May be able to get rid of 2.4 later if it's possible to build 2.4 support
-# from 3.0 headers.
-RDEPEND="
-	>=net-libs/libsoup-2.48:2.4[${MULTILIB_USEDEP}]
-	net-libs/libsoup:3.0[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.22.12.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.22.12.ebuild
index c68c66badf53..9c51feb2787b 100644
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="HTTP client source/sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 # Checks at runtime which libsoup was linked in and picks the appropriate one.
 # Need both here to guarantee consumers will work.
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.24.11.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.24.11.ebuild
new file mode 100644
index 000000000000..8301a0ff0414
--- /dev/null
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.24.11.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="HTTP client source/sink plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+# Since 1.24.x, dlopen()s with preference for 3.0. But just say 3.0 here
+# given having a 2.4-only system is impossible at this point.
+RDEPEND="net-libs/libsoup:3.0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-speex/Manifest b/media-plugins/gst-plugins-speex/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-speex/Manifest
+++ b/media-plugins/gst-plugins-speex/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.22.11.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.22.11.ebuild
deleted file mode 100644
index 21c4327cb059..000000000000
--- a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.22.11.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="Speex encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
-
-RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.22.12.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.22.12.ebuild
index 468c96a1366b..4bfceb126c76 100644
--- a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="Speex encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 
 RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.24.11.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.24.11.ebuild
new file mode 100644
index 000000000000..5a2e02c0b7be
--- /dev/null
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="Speex encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-srt/Manifest b/media-plugins/gst-plugins-srt/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-srt/Manifest
+++ b/media-plugins/gst-plugins-srt/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-srt/gst-plugins-srt-1.24.10.ebuild b/media-plugins/gst-plugins-srt/gst-plugins-srt-1.24.10.ebuild
new file mode 100644
index 000000000000..96583bca8cb3
--- /dev/null
+++ b/media-plugins/gst-plugins-srt/gst-plugins-srt-1.24.10.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Secure reliable transport (SRT) transfer plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/glib-utils"
diff --git a/media-plugins/gst-plugins-srt/gst-plugins-srt-1.24.11.ebuild b/media-plugins/gst-plugins-srt/gst-plugins-srt-1.24.11.ebuild
new file mode 100644
index 000000000000..1ce157c313f8
--- /dev/null
+++ b/media-plugins/gst-plugins-srt/gst-plugins-srt-1.24.11.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Secure reliable transport (SRT) transfer plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/glib-utils"
diff --git a/media-plugins/gst-plugins-srtp/Manifest b/media-plugins/gst-plugins-srtp/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-srtp/Manifest
+++ b/media-plugins/gst-plugins-srtp/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.22.12.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.22.12.ebuild
index 6f8c5f75a5b8..637dd98364bd 100644
--- a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 
 RDEPEND=">=net-libs/libsrtp-2.1.0:2=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.24.10.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.24.10.ebuild
new file mode 100644
index 000000000000..6f8c5f75a5b8
--- /dev/null
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.24.10.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=net-libs/libsrtp-2.1.0:2=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/glib-utils"
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.24.11.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.24.11.ebuild
new file mode 100644
index 000000000000..1f809c0116ba
--- /dev/null
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.24.11.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=net-libs/libsrtp-2.1.0:2=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/glib-utils"
diff --git a/media-plugins/gst-plugins-taglib/Manifest b/media-plugins/gst-plugins-taglib/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-taglib/Manifest
+++ b/media-plugins/gst-plugins-taglib/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.22.11.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.22.11.ebuild
deleted file mode 100644
index 791c0a7eec02..000000000000
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.22.11.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="ID3v2/APEv2 tagger plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.22.12-r1.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.22.12-r1.ebuild
index f67fa27f3b02..2a79edbe6465 100644
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.22.12-r1.ebuild
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.22.12-r1.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="ID3v2/APEv2 tagger plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-libs/taglib-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.24.11.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.24.11.ebuild
new file mode 100644
index 000000000000..533da9a63807
--- /dev/null
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="ID3v2/APEv2 tagger plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=media-libs/taglib-1.9.1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-twolame/Manifest b/media-plugins/gst-plugins-twolame/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-twolame/Manifest
+++ b/media-plugins/gst-plugins-twolame/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.22.11.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.22.11.ebuild
deleted file mode 100644
index e76958c38df5..000000000000
--- a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.22.11.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="MPEG2 encoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
-
-RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.22.12.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.22.12.ebuild
index ff0a92cea73b..52351db33de4 100644
--- a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="MPEG2 encoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
 
 RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.24.11.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.24.11.ebuild
new file mode 100644
index 000000000000..a2ccecb55c43
--- /dev/null
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="MPEG2 encoder plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-uvch264/Manifest b/media-plugins/gst-plugins-uvch264/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-uvch264/Manifest
+++ b/media-plugins/gst-plugins-uvch264/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.22.12.ebuild b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.22.12.ebuild
index 1ccf4a92f59b..f182915f5afd 100644
--- a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="UVC compliant H264 encoding cameras plugin for GStreamer"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-libs/libgudev:=[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.24.10.ebuild b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.24.10.ebuild
new file mode 100644
index 000000000000..1ccf4a92f59b
--- /dev/null
+++ b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.24.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="UVC compliant H264 encoding cameras plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-libs/libgudev:=[${MULTILIB_USEDEP}]
+	virtual/libusb:1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_library gstbasecamerabin_dep:libgstbasecamerabinsrc
+}
diff --git a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.24.11.ebuild b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.24.11.ebuild
new file mode 100644
index 000000000000..30eec47792d1
--- /dev/null
+++ b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.24.11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="UVC compliant H264 encoding cameras plugin for GStreamer"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-libs/libgudev:=[${MULTILIB_USEDEP}]
+	virtual/libusb:1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_library gstbasecamerabin_dep:libgstbasecamerabinsrc
+}
diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-v4l2/Manifest
+++ b/media-plugins/gst-plugins-v4l2/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.22.11.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.22.11.ebuild
deleted file mode 100644
index 64a11dbdc70a..000000000000
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.22.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPION="V4L2 source/sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="udev"
-
-RDEPEND="
-	>=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	udev? ( >=dev-libs/libgudev-208:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-"
-
-GST_PLUGINS_ENABLED="v4l2"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dv4l2-gudev=$(usex udev enabled disabled)
-	)
-
-	gstreamer_multilib_src_configure
-}
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.22.12.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.22.12.ebuild
index b9926c9f5a83..7885db39ac22 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPION="V4L2 source/sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="udev"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.24.11.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.24.11.ebuild
new file mode 100644
index 000000000000..f29d27efb04b
--- /dev/null
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.24.11.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPION="V4L2 source/sink plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="udev"
+
+RDEPEND="
+	>=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	udev? ( >=dev-libs/libgudev-208:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+"
+
+GST_PLUGINS_ENABLED="v4l2"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dv4l2-gudev=$(usex udev enabled disabled)
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index 65abdeb59d6b..7616805e6e62 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -1,2 +1,4 @@
 DIST gstreamer-vaapi-1.22.11.tar.xz 552468 BLAKE2B 0353699651add70639a4f7d591eccb646f5d6cda3ba8832553597b7b4e9bd3ebfe07d9eb1ac6e078219ee630131d502adccc8106a2207bb0234353905bafd8cd SHA512 939b748fea88c94ad59c1d4610a872a794b383382096a8f5f011a21d4c8fb041c28e1aa9a8d54f519fb3e48a69ed79622b0d45be01d2d5a900738a7928401563
 DIST gstreamer-vaapi-1.22.12.tar.xz 556192 BLAKE2B d8a1a0cb6616f001b1bc98febcb50c61e3af222f9461e8bb9b9d7cb43fd907f115eae76e1c069108fc98370432a82d4a754135a4e755f66d0a3107f205372793 SHA512 6253a97918cf8da5d063bfb9e3e8809c43610cc6495181319e7f198f43395637664ba867b210eaa72d74138dd9be4c39e3cd2d9e6d889ce4a06b0c2ad577f47a
+DIST gstreamer-vaapi-1.24.10.tar.xz 555624 BLAKE2B ffcbbc4d8096c622a3a89804f6b038fbd1ac75cd214f644ede09119b9ba7b5afa19788a9f6c66fad0537ae67c33e1b334cea75133100ad0daf1882a25601f54e SHA512 dad62a767eec9067afefdd7941df2eef31191cc597cd82fd42f196a36ee4dd3c94bd6852118cc8ba6318443dde0de16a77585daf93f61d683acfb034c167aa46
+DIST gstreamer-vaapi-1.24.11.tar.xz 547692 BLAKE2B 9373f9f56191ea8b9681a9638135eeff58c45669829aad6e5035003ac880048df1f5131699e6061586dc8869edc4e1506e9f3b27eb1428b4b20b9182e925be4d SHA512 dfe5ee78283d695103e9bac6bbece63705618f91122f7ab1e91edfce105d9848f2f552d0e83e05ed3d052a3151a4efe1db0955c48af6b3e40c903ffb335fd466
diff --git a/media-plugins/gst-plugins-vaapi/files/gst-plugins-vaapi-1.24.10-wayland-optionality.patch b/media-plugins/gst-plugins-vaapi/files/gst-plugins-vaapi-1.24.10-wayland-optionality.patch
new file mode 100644
index 000000000000..46356da8a8cd
--- /dev/null
+++ b/media-plugins/gst-plugins-vaapi/files/gst-plugins-vaapi-1.24.10-wayland-optionality.patch
@@ -0,0 +1,35 @@
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/577df3a02f7f26283b2749c58ae7738bbdf4be4c
+
+From 577df3a02f7f26283b2749c58ae7738bbdf4be4c Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek@centricular.com>
+Date: Fri, 13 Sep 2024 14:37:10 +0530
+Subject: [PATCH] meson: Re-added required: lines accidentally removed
+
+Broke in e3f086c648171c3c993f5dd73e2d025480c3729e
+
+Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3801
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7512>
+---
+ meson.build | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 5b4a0bbbd71a..e0f8cd19ff51 100644
+--- a/meson.build
++++ b/meson.build
+@@ -80,9 +80,9 @@ else
+ endif
+ 
+ libva_dep = dependency('libva', version: libva_req)
+-libva_drm_dep = dependency('libva-drm', version: libva_req)
+-libva_wayland_dep = dependency('libva-wayland', version: libva_req)
+-libva_x11_dep = dependency('libva-x11', version: libva_req)
++libva_drm_dep = dependency('libva-drm', required: get_option('drm'), version: libva_req)
++libva_wayland_dep = dependency('libva-wayland', required: get_option('wayland'), version: libva_req)
++libva_x11_dep = dependency('libva-x11', required: get_option('x11'), version: libva_req)
+ 
+ libdrm_dep = dependency('libdrm', version: libdrm_req, required: get_option('drm'))
+ libudev_dep = dependency('libudev', required: get_option('drm'))
+-- 
+GitLab
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.22.12.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.22.12.ebuild
index 0b2bbaa48bca..5b3fcb6f14bc 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.22.12.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="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
 IUSE="+drm +egl +gles2 opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva
 
 # gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises,
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.10-r2.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.10-r2.ebuild
new file mode 100644
index 000000000000..38d0dfb4f97e
--- /dev/null
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.10-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gstreamer-meson
+
+MY_PN="gstreamer-vaapi"
+DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer"
+HOMEPAGE="https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi"
+SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="1.0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+drm +egl +gles2 opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva
+
+# gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises,
+# we design gst-vaapi ebuild in terms of GL API as main choice as well, meaning that USE opengl and/or gles2 is required to
+# enable opengl support at all and choices get chained from there.
+# One or multiple video output are required: drm, x11, glx, egl and/or wayland;
+# but GL API is our main trigger, thus USE=egl should be ineffective if neither gles2 or opengl is enabled;
+# So "|| ( drm egl opengl wayland X )" would be wrong, because egl isn't built with USE="egl -opengl -gles2", ending up with no video outputs.
+# As we ensure at least one working GL output with other REQUIRED_USE, we can put gles2/opengl in REQUIRED_USE instead of egl, solving the issue.
+# gles2 API only supported windowing system (on linux) is EGL, so require it
+# opengl API only supported windowing systems (on linux) are EGL and GLX, so require one of them (glx is enabled with USE="opengl X")
+REQUIRED_USE="
+	|| ( drm gles2 opengl wayland X )
+	gles2? ( egl )
+	opengl? ( || ( egl X ) )
+	wayland? ( drm )
+"
+
+# glx doesn't require libva-glx (libva[opengl]) afaics, only by tests/test-display.c
+# USE flag behavior:
+# 'drm' enables vaapi drm support
+# 'egl' enables EGL platform support (but only if also 'opengl||gles2')
+# - 'egl' is exposed as a USE flag mainly to get EGL support instead of or in addition to GLX support with desktop GL while keeping it optional for pure GLX cases;
+#   it's always required with USE=gles2, thus USE="gles2 opengl X" will require and build desktop GL EGL platform support as well on top of GLX, which doesn't add extra deps at that point.
+# 'gles2' enables GLESv2 or GLESv3 based GL API support
+# 'opengl' enables desktop OpenGL based GL API support
+# 'wayland' enables non-GL Wayland support; wayland EGL support when combined with 'egl' (but only if also 'opengl||gles2')
+# 'X' enables non-GL X support; GLX support when combined with 'opengl'
+# gst-plugins-bad still needed for codecparsers (GL libraries moved to -base); checked for 1.14 (recheck for 1.16)
+GST_REQ="${PV}"
+GL_DEPS="
+	>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?]
+	|| (
+		>=media-libs/mesa-24.1.0_rc1[opengl,X?,${MULTILIB_USEDEP}]
+		<media-libs/mesa-24.1.0_rc1[gles2?,egl(+)?,X?,${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="
+	>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-bad-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/libva-1.15.0:=[drm(+)?,wayland?,X?,${MULTILIB_USEDEP}]
+	drm? (
+		>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.98[${MULTILIB_USEDEP}]
+	)
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+	wayland? ( >=dev-libs/wayland-1.11.0[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# FIXME: "Failed to create vaapipostproc element"
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.24.10-wayland-optionality.patch
+)
+
+multilib_src_configure() {
+	GST_PLUGINS_NOAUTO="wayland"
+
+	local emesonargs=(
+		-Dencoders=enabled
+		$(meson_feature drm)
+		$(meson_feature X x11)
+		$(meson_feature wayland)
+	)
+
+	if use opengl || use gles2; then
+		emesonargs+=( $(meson_feature egl) )
+	else
+		emesonargs+=( -Degl=disabled )
+	fi
+
+	if use opengl && use X; then
+		emesonargs+=( -Dglx=enabled )
+	else
+		emesonargs+=( -Dglx=disabled )
+	fi
+
+	# Workaround EGL/eglplatform.h being built with X11 present
+	use X || export CFLAGS="${CFLAGS} -DEGL_NO_X11"
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.11.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.11.ebuild
new file mode 100644
index 000000000000..d7dbee958d26
--- /dev/null
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.24.11.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gstreamer-meson
+
+MY_PN="gstreamer-vaapi"
+DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer"
+HOMEPAGE="https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi"
+SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="1.0"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+drm +egl +gles2 opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva
+
+# gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises,
+# we design gst-vaapi ebuild in terms of GL API as main choice as well, meaning that USE opengl and/or gles2 is required to
+# enable opengl support at all and choices get chained from there.
+# One or multiple video output are required: drm, x11, glx, egl and/or wayland;
+# but GL API is our main trigger, thus USE=egl should be ineffective if neither gles2 or opengl is enabled;
+# So "|| ( drm egl opengl wayland X )" would be wrong, because egl isn't built with USE="egl -opengl -gles2", ending up with no video outputs.
+# As we ensure at least one working GL output with other REQUIRED_USE, we can put gles2/opengl in REQUIRED_USE instead of egl, solving the issue.
+# gles2 API only supported windowing system (on linux) is EGL, so require it
+# opengl API only supported windowing systems (on linux) are EGL and GLX, so require one of them (glx is enabled with USE="opengl X")
+REQUIRED_USE="
+	|| ( drm gles2 opengl wayland X )
+	gles2? ( egl )
+	opengl? ( || ( egl X ) )
+	wayland? ( drm )
+"
+
+# glx doesn't require libva-glx (libva[opengl]) afaics, only by tests/test-display.c
+# USE flag behavior:
+# 'drm' enables vaapi drm support
+# 'egl' enables EGL platform support (but only if also 'opengl||gles2')
+# - 'egl' is exposed as a USE flag mainly to get EGL support instead of or in addition to GLX support with desktop GL while keeping it optional for pure GLX cases;
+#   it's always required with USE=gles2, thus USE="gles2 opengl X" will require and build desktop GL EGL platform support as well on top of GLX, which doesn't add extra deps at that point.
+# 'gles2' enables GLESv2 or GLESv3 based GL API support
+# 'opengl' enables desktop OpenGL based GL API support
+# 'wayland' enables non-GL Wayland support; wayland EGL support when combined with 'egl' (but only if also 'opengl||gles2')
+# 'X' enables non-GL X support; GLX support when combined with 'opengl'
+# gst-plugins-bad still needed for codecparsers (GL libraries moved to -base); checked for 1.14 (recheck for 1.16)
+GST_REQ="${PV}"
+GL_DEPS="
+	>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?]
+	|| (
+		>=media-libs/mesa-24.1.0_rc1[opengl,X?,${MULTILIB_USEDEP}]
+		<media-libs/mesa-24.1.0_rc1[gles2?,egl(+)?,X?,${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="
+	>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-bad-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/libva-1.15.0:=[drm(+)?,wayland?,X?,${MULTILIB_USEDEP}]
+	drm? (
+		>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.98[${MULTILIB_USEDEP}]
+	)
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+	wayland? ( >=dev-libs/wayland-1.11.0[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# FIXME: "Failed to create vaapipostproc element"
+RESTRICT="test"
+
+multilib_src_configure() {
+	GST_PLUGINS_NOAUTO="wayland"
+
+	local emesonargs=(
+		-Dencoders=enabled
+		$(meson_feature drm)
+		$(meson_feature X x11)
+		$(meson_feature wayland)
+	)
+
+	if use opengl || use gles2; then
+		emesonargs+=( $(meson_feature egl) )
+	else
+		emesonargs+=( -Degl=disabled )
+	fi
+
+	if use opengl && use X; then
+		emesonargs+=( -Dglx=enabled )
+	else
+		emesonargs+=( -Dglx=disabled )
+	fi
+
+	# Workaround EGL/eglplatform.h being built with X11 present
+	use X || export CFLAGS="${CFLAGS} -DEGL_NO_X11"
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-voaacenc/Manifest b/media-plugins/gst-plugins-voaacenc/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-voaacenc/Manifest
+++ b/media-plugins/gst-plugins-voaacenc/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.22.12.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.22.12.ebuild
index b7e5d7855260..3f8bd98ae733 100644
--- a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="AAC encoder plugin for GStreamer"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=">=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.24.10.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.24.10.ebuild
new file mode 100644
index 000000000000..b7e5d7855260
--- /dev/null
+++ b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="AAC encoder plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.24.11.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.24.11.ebuild
new file mode 100644
index 000000000000..9e4b5c3b6ac7
--- /dev/null
+++ b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="AAC encoder plugin for GStreamer"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+RDEPEND=">=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-voamrwbenc/Manifest b/media-plugins/gst-plugins-voamrwbenc/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-voamrwbenc/Manifest
+++ b/media-plugins/gst-plugins-voamrwbenc/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.22.12.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.22.12.ebuild
index 065d6781c8b7..9c6031da9d85 100644
--- a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="AMR-WB audio encoder plugin for GStreamer"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=">=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.24.10.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.24.10.ebuild
new file mode 100644
index 000000000000..065d6781c8b7
--- /dev/null
+++ b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="AMR-WB audio encoder plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.24.11.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.24.11.ebuild
new file mode 100644
index 000000000000..4bd3437c1873
--- /dev/null
+++ b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="AMR-WB audio encoder plugin for GStreamer"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+RDEPEND=">=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-vpx/Manifest b/media-plugins/gst-plugins-vpx/Manifest
index 8e6f2cb97c06..b9de351c0670 100644
--- a/media-plugins/gst-plugins-vpx/Manifest
+++ b/media-plugins/gst-plugins-vpx/Manifest
@@ -1,2 +1,3 @@
 DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.22.12.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.22.12.ebuild
index 66667c21e93f..13c25aa539fd 100644
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-libs/libvpx-1.7.0:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.24.11.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.24.11.ebuild
new file mode 100644
index 000000000000..4259887a548d
--- /dev/null
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.24.11.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=media-libs/libvpx-1.7.0:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/glib-utils"
diff --git a/media-plugins/gst-plugins-wavpack/Manifest b/media-plugins/gst-plugins-wavpack/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-wavpack/Manifest
+++ b/media-plugins/gst-plugins-wavpack/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.22.11.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.22.11.ebuild
deleted file mode 100644
index f646256c4f9f..000000000000
--- a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.22.11.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="Wavpack audio encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.22.12.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.22.12.ebuild
index 696d71a05eff..9f74f58cbac4 100644
--- a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="Wavpack audio encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.24.11.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.24.11.ebuild
new file mode 100644
index 000000000000..a2b1feea8716
--- /dev/null
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="Wavpack audio encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-webp/Manifest b/media-plugins/gst-plugins-webp/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-webp/Manifest
+++ b/media-plugins/gst-plugins-webp/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-webp/gst-plugins-webp-1.22.12.ebuild b/media-plugins/gst-plugins-webp/gst-plugins-webp-1.22.12.ebuild
index 3908d21e318e..78bcd875e6f7 100644
--- a/media-plugins/gst-plugins-webp/gst-plugins-webp-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-webp/gst-plugins-webp-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="WebP image format support for GStreamer"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 RDEPEND=">=media-libs/libwebp-0.2.1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-webp/gst-plugins-webp-1.24.10.ebuild b/media-plugins/gst-plugins-webp/gst-plugins-webp-1.24.10.ebuild
new file mode 100644
index 000000000000..3908d21e318e
--- /dev/null
+++ b/media-plugins/gst-plugins-webp/gst-plugins-webp-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="WebP image format support for GStreamer"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=media-libs/libwebp-0.2.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-webp/gst-plugins-webp-1.24.11.ebuild b/media-plugins/gst-plugins-webp/gst-plugins-webp-1.24.11.ebuild
new file mode 100644
index 000000000000..826144005c43
--- /dev/null
+++ b/media-plugins/gst-plugins-webp/gst-plugins-webp-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="WebP image format support for GStreamer"
+KEYWORDS="amd64 ~arm64"
+
+RDEPEND=">=media-libs/libwebp-0.2.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-webrtc/Manifest b/media-plugins/gst-plugins-webrtc/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-webrtc/Manifest
+++ b/media-plugins/gst-plugins-webrtc/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-webrtc/files/gst-plugins-webrtc-1.24.10-disable-srtp-sctp-dtls-options.patch b/media-plugins/gst-plugins-webrtc/files/gst-plugins-webrtc-1.24.10-disable-srtp-sctp-dtls-options.patch
new file mode 100644
index 000000000000..208b36f37b67
--- /dev/null
+++ b/media-plugins/gst-plugins-webrtc/files/gst-plugins-webrtc-1.24.10-disable-srtp-sctp-dtls-options.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/947523
+
+Upstream decided to auto-enable srtp, sctp and dtls options, when the
+webrtc option is enabled.  This is going to partially revert upstream
+fd4828bafe613eec33e8f3faef5ab5181a73c8b6 to fix webrtc compilation.
+
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/fd4828bafe613eec33e8f3faef5ab5181a73c8b6
+
+../gst-plugins-bad-1.24.10/ext/dtls/meson.build:15:33: ERROR: Feature dtls cannot be disabled: webrtc option is enabled
+../gst-plugins-bad-1.24.10/ext/sctp/meson.build:8:33: ERROR: Feature sctp cannot be disabled: webrtc option is enabled
+../gst-plugins-bad-1.24.10/ext/srtp/meson.build:10:33: ERROR: Feature srtp cannot be disabled: webrtc option is enabled
+--- a/ext/dtls/meson.build
++++ b/ext/dtls/meson.build
+@@ -12,7 +12,7 @@ dtls_sources = [
+   'gstdtlselement.c',
+ ]
+ 
+-dtls_option = get_option('dtls').enable_if(get_option('webrtc').enabled(), error_message: 'webrtc option is enabled')
++dtls_option = get_option('dtls')
+ openssl_dep = dependency('openssl', version: '>= 1.0.1', required: dtls_option)
+ libcrypto_dep = dependency('libcrypto', required: dtls_option)
+ 
+--- a/ext/sctp/meson.build
++++ b/ext/sctp/meson.build
+@@ -5,8 +5,8 @@ sctp_sources = [
+   'sctpassociation.c'
+ ]
+ 
+-sctp_option = get_option('sctp').enable_if(get_option('webrtc').enabled(), error_message: 'webrtc option is enabled')
++sctp_option = get_option('sctp')
+ if sctp_option.disabled()
+   subdir_done()
+ endif
+ 
+--- a/ext/srtp/meson.build
++++ b/ext/srtp/meson.build
+@@ -7,8 +7,8 @@ srtp_sources = [
+ ]
+ 
+ srtp_cargs = []
+-srtp_option = get_option('srtp').enable_if(get_option('webrtc').enabled(), error_message: 'webrtc option is enabled')
++srtp_option = get_option('srtp')
+ if srtp_option.disabled()
+   srtp_dep = dependency('', required : false)
+   subdir_done()
+ endif
diff --git a/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.22.12.ebuild b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.22.12.ebuild
index 1b372148ef7c..d0e9247ed74b 100644
--- a/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="WebRTC plugins for GStreamer"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 RDEPEND="
 	>=media-plugins/gst-plugins-sctp-${PV}:1.0[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.24.10-r1.ebuild b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.24.10-r1.ebuild
new file mode 100644
index 000000000000..c5366a1409a3
--- /dev/null
+++ b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.24.10-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="WebRTC plugins for GStreamer"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	>=media-plugins/gst-plugins-sctp-${PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/webrtc-audio-processing-1.0:1[${MULTILIB_USEDEP}]
+	>=net-libs/libnice-0.1.21[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_ENABLED="webrtc webrtcdsp"
+GST_PLUGINS_BUILD_DIR="webrtc webrtcdsp"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.24.10-disable-srtp-sctp-dtls-options.patch"
+)
+
+src_prepare() {
+	default
+	gstreamer_system_package \
+		gstwebrtc_dep:gstreamer-webrtc \
+		gstsctp_dep:gstreamer-sctp \
+		gstbadaudio_dep:gstreamer-bad-audio
+}
+
+multilib_src_install() {
+	# TODO: Fix this properly, see bug #907470 and bug #909079.
+	insinto /usr/$(get_libdir)
+	doins "${BUILD_DIR}"/ext/webrtc/libgstwebrtc.so
+	doins "${BUILD_DIR}"/gst-libs/gst/webrtc/nice/libgstwebrtcnice-1.0.so*
+	insinto /usr/include/gstreamer-1.0/gst/webrtc/nice
+	doins "${S}"/gst-libs/gst/webrtc/nice/*.h
+	gstreamer_multilib_src_install
+}
diff --git a/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.24.11.ebuild b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.24.11.ebuild
new file mode 100644
index 000000000000..03d7c0b97219
--- /dev/null
+++ b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.24.11.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="WebRTC plugins for GStreamer"
+KEYWORDS="amd64 ~arm64"
+
+RDEPEND="
+	>=media-plugins/gst-plugins-sctp-${PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/webrtc-audio-processing-1.0:1[${MULTILIB_USEDEP}]
+	>=net-libs/libnice-0.1.21[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_ENABLED="webrtc webrtcdsp"
+GST_PLUGINS_BUILD_DIR="webrtc webrtcdsp"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.24.10-disable-srtp-sctp-dtls-options.patch"
+)
+
+src_prepare() {
+	default
+	gstreamer_system_package \
+		gstwebrtc_dep:gstreamer-webrtc \
+		gstsctp_dep:gstreamer-sctp \
+		gstbadaudio_dep:gstreamer-bad-audio
+}
+
+multilib_src_install() {
+	# TODO: Fix this properly, see bug #907470 and bug #909079.
+	insinto /usr/$(get_libdir)
+	doins "${BUILD_DIR}"/ext/webrtc/libgstwebrtc.so
+	doins "${BUILD_DIR}"/gst-libs/gst/webrtc/nice/libgstwebrtcnice-1.0.so*
+	insinto /usr/include/gstreamer-1.0/gst/webrtc/nice
+	doins "${S}"/gst-libs/gst/webrtc/nice/*.h
+	gstreamer_multilib_src_install
+}
diff --git a/media-plugins/gst-plugins-x264/Manifest b/media-plugins/gst-plugins-x264/Manifest
index 4d94fd9151a4..4c6a49b345af 100644
--- a/media-plugins/gst-plugins-x264/Manifest
+++ b/media-plugins/gst-plugins-x264/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-ugly-1.22.11.tar.xz 256812 BLAKE2B 143fe16c92465be0c5bfb5b6c452be9e730501d372e49c26c6837eb2ff336b8098cda5afc61b3620f9ea9ed13eed6118e0deed8dcc9eab499b941e5e64157fd9 SHA512 767e80c1d15ec79ff196c4c4ad6128bc17502b490201c1a3799341a2784848f639392310de7dabc922d022acb5156bd25e4191ba2409c17b3a23a278f7722c5c
 DIST gst-plugins-ugly-1.22.12.tar.xz 257464 BLAKE2B c7f89dda309712cb2380b2e29b67a40c02c561bbe49a83acb2beb84aac6ebaed895e1a27d5f6fb6787c803e2e94a0409d14a3206feb9797c5329bbaff5e4a61d SHA512 3ef5cb384578bcaff3bb45fa8fa8f97884acb2e09a1621c504fca4bd8744cb83e71c342372a7ddd06bc4077fdd2684d1f7f078278392361ed4e18afed374c659
+DIST gst-plugins-ugly-1.24.10.tar.xz 231124 BLAKE2B d4e5d5a4abd3860d98ea9066d9eb13662ef639bd0ee8b8a1c5d5ffb155e0febc968019a151259cfd6592c8f27332bf6b4b6a3d74249b530c1a25eb31adf31b19 SHA512 87430ccf3e0382bae8f24e429734c38d9339ea95205e2a5fe5db8408ca9a369ee971b2e84b0717f918d65b2b91dec4baf032d8a01658512ec0af9ee9dfe397c5
+DIST gst-plugins-ugly-1.24.11.tar.xz 232056 BLAKE2B 849c34c099d062c81e7e008aee95d36ac6aae0c08eacec0e2ba3582b421d912f9dc0322031310eb459c76af30056ee38d5b5849d0400540656571c1a110f1c54 SHA512 461f3a07b4265bfe66b5b22f3a10bbf254068381f5634e970b3cb6d1c2d3ea401e0be43d188934a490e29658d8447a83de50253380cde371b0f5a55178f90e6a
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.22.12.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.22.12.ebuild
index 4a80ccd397bb..020b777d6145 100644
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer-meson
 
 DESCRIPTION="H.264 encoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 # 20111220 ensures us X264_BUILD >= 120
 RDEPEND=">=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.24.10.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.24.10.ebuild
new file mode 100644
index 000000000000..4a80ccd397bb
--- /dev/null
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.24.10.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer-meson
+
+DESCRIPTION="H.264 encoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# 20111220 ensures us X264_BUILD >= 120
+RDEPEND=">=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.24.11.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.24.11.ebuild
new file mode 100644
index 000000000000..e40f5da23dd4
--- /dev/null
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.24.11.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer-meson
+
+DESCRIPTION="H.264 encoder plugin for GStreamer"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# 20111220 ensures us X264_BUILD >= 120
+RDEPEND=">=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-x265/Manifest b/media-plugins/gst-plugins-x265/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-x265/Manifest
+++ b/media-plugins/gst-plugins-x265/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.22.12.ebuild b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.22.12.ebuild
index 4267f657ceea..70fc0a13f40c 100644
--- a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE="gst-plugins-bad"
 inherit gstreamer-meson
 
 DESCRIPTION="H.265 encoder plugin for GStreamer"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="media-libs/x265:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.24.10.ebuild b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.24.10.ebuild
new file mode 100644
index 000000000000..4267f657ceea
--- /dev/null
+++ b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.24.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE="gst-plugins-bad"
+
+inherit gstreamer-meson
+
+DESCRIPTION="H.265 encoder plugin for GStreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="media-libs/x265:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.24.11.ebuild b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.24.11.ebuild
new file mode 100644
index 000000000000..38e98dd74e8e
--- /dev/null
+++ b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.24.11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE="gst-plugins-bad"
+
+inherit gstreamer-meson
+
+DESCRIPTION="H.265 encoder plugin for GStreamer"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+RDEPEND="media-libs/x265:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgpl=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-ximagesrc/Manifest b/media-plugins/gst-plugins-ximagesrc/Manifest
index 8e6f2cb97c06..1a6fa0237bb0 100644
--- a/media-plugins/gst-plugins-ximagesrc/Manifest
+++ b/media-plugins/gst-plugins-ximagesrc/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb
 DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.22.11.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.22.11.ebuild
deleted file mode 100644
index 3a68d14596e0..000000000000
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.22.11.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson
-
-DESCRIPTION="X11 video capture stream plugin for GStreamer"
-KEYWORDS="amd64 ~arm64 ppc ppc64 ~sparc x86"
-
-RDEPEND="
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-
-GST_PLUGINS_BUILD_DIR="ximage"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dximagesrc=enabled
-		-Dximagesrc-xshm=enabled
-		-Dximagesrc-xfixes=enabled
-		-Dximagesrc-xdamage=enabled
-	)
-
-	gstreamer_multilib_src_configure
-}
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.22.12.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.22.12.ebuild
index 0143c4a99180..31008e835e38 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.22.12.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.22.12.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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="X11 video capture stream plugin for GStreamer"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.24.11.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.24.11.ebuild
new file mode 100644
index 000000000000..9aacfad9c63f
--- /dev/null
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.24.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="X11 video capture stream plugin for GStreamer"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+
+GST_PLUGINS_BUILD_DIR="ximage"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dximagesrc=enabled
+		-Dximagesrc-xshm=enabled
+		-Dximagesrc-xfixes=enabled
+		-Dximagesrc-xdamage=enabled
+		-Dximagesrc-navigation=enabled
+	)
+
+	gstreamer_multilib_src_configure
+}
diff --git a/media-plugins/gst-plugins-zbar/Manifest b/media-plugins/gst-plugins-zbar/Manifest
index 3a7efee38684..df086fb7aacd 100644
--- a/media-plugins/gst-plugins-zbar/Manifest
+++ b/media-plugins/gst-plugins-zbar/Manifest
@@ -1,2 +1,4 @@
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
+DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
diff --git a/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.24.10.ebuild b/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.24.10.ebuild
new file mode 100644
index 000000000000..26ddb9945dd3
--- /dev/null
+++ b/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.24.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Bar codes detection in video streams for GStreamer"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=media-gfx/zbar-0.10_p20121015-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.24.11.ebuild b/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.24.11.ebuild
new file mode 100644
index 000000000000..89516b3ba434
--- /dev/null
+++ b/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.24.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Bar codes detection in video streams for GStreamer"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=media-gfx/zbar-0.10_p20121015-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/mpg123-output-plugins/Manifest b/media-plugins/mpg123-output-plugins/Manifest
index 4327db810573..d35d39ffe8cb 100644
--- a/media-plugins/mpg123-output-plugins/Manifest
+++ b/media-plugins/mpg123-output-plugins/Manifest
@@ -1,2 +1 @@
-DIST mpg123-1.32.3.tar.bz2 1111054 BLAKE2B 67f889403c2bb639d675ec5ebea5a19c4b7174971d62bdd8d940ad659e6b0c06dada38422fc9d71b878917aa89e305ec48c8faa78d65d507cd6a0c9a79951359 SHA512 946c1073b6eebfd65333ec543df1caeea25864479e9c8e153fb53d8b636cc756d8d81947f7b5cbedbbfb1ea664d3fb27562ed36e7726d95e80591bd2ad622afc
 DIST mpg123-1.32.9.tar.bz2 1118388 BLAKE2B 370012300ca6cd26daf48cc067692e94c2c37c7549f6581d64e8f7cc9f08c720518ed6aaa10b3c2194ce2ae85afa5564a65dcf7129c6789f90d24be395ff1397 SHA512 dccb640b0845061811cb41bf145587e7093556d686d49a748232b079659b46284b6cc40db42d14febceac11277c58edf2b69d1b4c46c223829a3d15478e2e26c
diff --git a/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.32.3.ebuild b/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.32.3.ebuild
deleted file mode 100644
index d2913cba17f4..000000000000
--- a/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.32.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="mpg123"
-MY_P="${MY_PN}-${PV}"
-inherit flag-o-matic libtool toolchain-funcs
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="https://downloads.sourceforge.net/${MY_PN}/${MY_P}.tar.bz2"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-# Note: build system prefers libsdl2 > libsdl. We could in theory add both
-# but it's tricky when it comes to handling switching between them properly.
-# We'd need a USE flag for both sdl1 and sdl2 and to make them clash.
-RDEPEND="
-	!<media-sound/mpg123-1.32.3-r100
-	!media-libs/libmpg123
-	dev-libs/libltdl:0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-libs/libpulse )
-	sdl? ( media-libs/libsdl2 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-build/libtool
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-src_prepare() {
-	default
-	elibtoolize # for Darwin bundles
-
-	# Rerun autotools with patched configure.ac
-	#eautoreconf
-}
-
-src_configure() {
-	local _audio=
-	local _cpu=generic_fpu
-
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: �struct hostent’ has no member named �h_addr’
-	append-cflags -D_GNU_SOURCE
-
-	append-lfs-flags
-
-	local flag
-	for flag in coreaudio pulseaudio jack alsa oss sdl portaudio nas ; do
-		if use ${flag}; then
-			_audio+=" ${flag/pulseaudio/pulse}"
-		fi
-	done
-
-	use cpu_flags_ppc_altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext
-		# bug #164504
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=(
-		--with-optimization=0
-		--with-audio="${_audio}"
-		--with-default-audio="${_audio}"
-		--with-cpu=${_cpu}
-		--enable-network
-		$(use_enable ipv6)
-		--enable-int-quality=$(usex int-quality)
-		--disable-components --enable-libout123-modules
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	# mpg123-1.32.3 cannot disable dummy output module so it is built again
-	# TODO: remove this with >=1.32.4 release
-	rm "${ED}"/usr/$(get_libdir)/mpg123/output_dummy.so || die
-}
diff --git a/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.32.9.ebuild b/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.32.9.ebuild
index 9c81c389649f..ffed3d18c5d6 100644
--- a/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.32.9.ebuild
+++ b/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.32.9.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}/${MY_P}"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-plugins/qmmp-plugin-pack/Manifest b/media-plugins/qmmp-plugin-pack/Manifest
index 2f840038d3c1..7692d0cba027 100644
--- a/media-plugins/qmmp-plugin-pack/Manifest
+++ b/media-plugins/qmmp-plugin-pack/Manifest
@@ -1 +1,2 @@
 DIST qmmp-plugin-pack-1.6.1.tar.bz2 243838 BLAKE2B 1f7bbc35988ec5cecff4cba9a759b77d3e9c60f883683ef03c58342ed9abfabf4b9e362f3a4daa92c333d274f7a46c4288245191441a61b41ed78d5cf328d240 SHA512 532c4804ec32dc450fa8405fd32ab394abf27c1c8b867fde5ed11c7f13b667c5cd4d6dc742ddd07c9f3f9874f3053dc6dc22d02e2159db4f683db84c9808331e
+DIST qmmp-plugin-pack-2.1.2.tar.bz2 247016 BLAKE2B a854c72d04ca131a16cf2d24d92cf76a6aad9171111c6919aa8a87dedb853eb7df1103639e1060b9c85c0cf0b94477acb4bd059101264726818cb0b19f23cc0a SHA512 b9c3464e93b910351bfe453e30e04d8a9f55a9e8ed18677ee309610f5246b0bd9fc68e1e24bc92a85ca2da51732a7de57fcacf4cdf50b36a1273ef5e8b39cc99
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-2.1.2.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-2.1.2.ebuild
new file mode 100644
index 000000000000..9beb093a00ac
--- /dev/null
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-2.1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Set of extra plugins for Qmmp"
+HOMEPAGE="https://qmmp.ylsoftware.com/"
+SRC_URI="https://qmmp.ylsoftware.com/files/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtbase:6[gui,network,widgets]
+	media-libs/libsamplerate
+	media-libs/taglib:=
+	=media-sound/qmmp-$(ver_cut 1-2)*
+	media-video/ffmpeg:=
+"
+DEPEND="${RDEPEND}
+	dev-lang/yasm
+"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	cmake_src_configure
+}
diff --git a/media-radio/cwdaemon/Manifest b/media-radio/cwdaemon/Manifest
index a5cfeec56a97..bb2a733e88c6 100644
--- a/media-radio/cwdaemon/Manifest
+++ b/media-radio/cwdaemon/Manifest
@@ -1,2 +1 @@
-DIST cwdaemon-0.12.0.tar.gz 433974 BLAKE2B c1ab01291e9907a4c090987573eb2914a72285c028d9b1c452be633706a683378ac2976dfddba90aa92dfdb1b821716d30a7e613c48dba0981628013bb4563d2 SHA512 1b9a29d92aa9d212f27def6a938bd170f41ea177ac552f99cbb399422e3046cfeeb440f203079cd3726042187f7cd4fd0903b8cc4c301b4b34238f4e6d842ee0
 DIST cwdaemon-0.13.0.tar.gz 663289 BLAKE2B 1661220e87eb44aac63100319e532b697d67fe24c36ed03fbda18204a3e6d41f5aee8a6aab2afd49b49c0ebf03fe849c5f154d3bb41a1023683c1faa8fcc336b SHA512 bdba023e83f410c35e4656f35f969303e2f86154a17e2f2cf96c26b82073dddf8cb431ab15b219ce775ef3ee01602cdb6f826f47b70bcdafa9fbd3dfe0b96160
diff --git a/media-radio/cwdaemon/cwdaemon-0.12.0.ebuild b/media-radio/cwdaemon/cwdaemon-0.12.0.ebuild
deleted file mode 100644
index 13cbea382e23..000000000000
--- a/media-radio/cwdaemon/cwdaemon-0.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="A morse daemon for the parallel or serial port"
-HOMEPAGE="http://cwdaemon.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86"
-
-RDEPEND=">=media-radio/unixcw-3.6.0"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	# provides header info for getaddrinfo() with C99 (bug 569970)
-	append-cppflags -D_GNU_SOURCE
-	econf
-}
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index f16e84d45da2..763e0b9030b7 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,2 +1 @@
-DIST fldigi-4.2.05.tar.gz 5127250 BLAKE2B 54a144e34da47c5379256c4ece67447815c29500331e29ccce884885daa96650d6ec098839eb97d13a641d8d0078a9656c9d443016a2acc98fbe7b78c98ca6f9 SHA512 46281e65dad24c57ea344182ed053ddea70281b1682d2fe6b40aa1f111c529328c7e1e4de86828ac265ed4523882d086f5213706159fc43b61f15989fdd9d407
 DIST fldigi-4.2.06.tar.gz 5149140 BLAKE2B b7a86e22b237b91b1931b09e718ba3821f62f4a1eb529ef6ba9427d0973dcf0af86f4f8dfa5e7fa374d5f7df6e5302b06dcd0307aa836a7ac454bf994e2ffe3c SHA512 770e8650f8ba9d8276665d0683e2418bd4fa399bd92fb66c1c219633f8fb3d4c49c1568bd2a0261a72af1e9527d548a247f872fe4b4a8019de086f51db280db6
diff --git a/media-radio/fldigi/fldigi-4.2.05-r3.ebuild b/media-radio/fldigi/fldigi-4.2.05-r3.ebuild
deleted file mode 100644
index bb65c55744f8..000000000000
--- a/media-radio/fldigi/fldigi-4.2.05-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="hamlib nls pulseaudio"
-IUSE_CPU_FLAGS=" sse sse2 sse3"
-IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
-
-RDEPEND="x11-libs/fltk:1=[threads(+),xft(+)]
-	media-libs/libsamplerate
-	media-libs/libpng:0
-	x11-misc/xdg-utils
-	dev-perl/RPC-XML
-	dev-perl/Term-ReadLine-Perl
-	|| (
-		media-libs/portaudio[oss]
-		media-libs/portaudio[alsa]
-	)
-	hamlib? ( media-libs/hamlib:= )
-	pulseaudio? ( media-libs/libpulse )
-	>=media-libs/libsndfile-1.0.10"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=( "${FILESDIR}/${PN}-drop-nullptr-definition.patch" )
-
-src_prepare() {
-	eapply ${PATCHES[@]}
-	eapply_user
-}
-
-src_configure() {
-	#fails to compile with -flto (bug #860405)
-	filter-lto
-
-	append-cxxflags $(test-flags-CXX -std=c++14)
-	local myconf=""
-
-	use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
-	use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2"
-	use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3"
-
-	econf ${myconf} \
-		--with-sndfile \
-		$(use_with hamlib) \
-		$(use_enable nls) \
-		$(use_with pulseaudio) \
-		--without-asciidoc
-}
diff --git a/media-radio/fldigi/fldigi-4.2.05-r4.ebuild b/media-radio/fldigi/fldigi-4.2.05-r4.ebuild
deleted file mode 100644
index 0000e5a5d512..000000000000
--- a/media-radio/fldigi/fldigi-4.2.05-r4.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
-
-inherit flag-o-matic
-
-DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hamlib nls pulseaudio"
-IUSE_CPU_FLAGS=" sse sse2 sse3"
-IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
-
-RDEPEND="x11-libs/fltk:1=[threads(+),xft(+)]
-	x11-libs/libX11
-	virtual/libudev:=
-	media-libs/libsamplerate
-	media-libs/libpng:=
-	x11-misc/xdg-utils
-	dev-perl/RPC-XML
-	dev-perl/Term-ReadLine-Perl
-	|| (
-		media-libs/portaudio[oss]
-		media-libs/portaudio[alsa]
-	)
-	hamlib? ( media-libs/hamlib:= )
-	pulseaudio? ( media-libs/libpulse )
-	media-libs/libsndfile"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=( "${FILESDIR}/${PN}-drop-nullptr-definition.patch" )
-
-src_prepare() {
-	eapply ${PATCHES[@]}
-	eapply_user
-}
-
-src_configure() {
-	#fails to compile with -flto (bug #860405)
-	filter-lto
-
-	append-cxxflags $(test-flags-CXX -std=c++14)
-	local myconf=""
-
-	use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
-	use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2"
-	use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3"
-
-	econf ${myconf} \
-		--with-sndfile \
-		$(use_with hamlib) \
-		$(use_enable nls) \
-		$(use_with pulseaudio) \
-		--without-asciidoc
-}
diff --git a/media-radio/qrq/files/qrq-0.3.5-fix-missing-parms.patch b/media-radio/qrq/files/qrq-0.3.5-fix-missing-parms.patch
new file mode 100644
index 000000000000..415288dfeee2
--- /dev/null
+++ b/media-radio/qrq/files/qrq-0.3.5-fix-missing-parms.patch
@@ -0,0 +1,26 @@
+diff --git a/pulseaudio.c b/pulseaudio.c
+index 7a791a0..ee08dbb 100644
+--- a/pulseaudio.c
++++ b/pulseaudio.c
+@@ -33,7 +33,7 @@ short int *buf = 0;
+ int bufsize = 0;
+ int bufpos = 0;
+ 
+-void *open_dsp () {
++void *open_dsp (char *dummy) {
+ 	static int opened = 0;
+ 
+ 	/* with PA we only open the device once and then leave it
+diff --git a/pulseaudio.h b/pulseaudio.h
+index a915f88..fea4d0c 100644
+--- a/pulseaudio.h
++++ b/pulseaudio.h
+@@ -21,7 +21,7 @@ Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ #ifndef QRQ_PA
+ #define QRQ_PA
+ 
+-void *open_dsp (); 
++void *open_dsp (char *dummy);
+ void write_audio (void *unused, int *in, int size);
+ void close_audio (void *s);
+ 
diff --git a/media-radio/qrq/qrq-0.3.5-r2.ebuild b/media-radio/qrq/qrq-0.3.5-r2.ebuild
new file mode 100644
index 000000000000..133c4e75a9eb
--- /dev/null
+++ b/media-radio/qrq/qrq-0.3.5-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Yet another CW trainer for Linux/Unix"
+HOMEPAGE="http://fkurz.net/ham/qrq.html"
+SRC_URI="http://fkurz.net/ham/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pulseaudio"
+
+DEPEND="sys-libs/ncurses:=
+	pulseaudio? ( media-libs/libpulse )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-0.3.2-tinfo.patch"
+	# bug #947561
+	"${FILESDIR}/${PN}-0.3.5-fix-missing-parms.patch" )
+
+src_prepare() {
+	# avoid prestripping of 'qrq' binary
+	sed -i -e "s/INSTALL} -s -m/INSTALL} -m/" Makefile || die
+	sed -i -e "s/CC=gcc/CC=$(tc-getCC)/" Makefile || die
+	default
+}
+
+src_compile() {
+	CONF="USE_PA=NO USE_OSS=YES"
+	if use pulseaudio; then
+		CONF="USE_PA=YES USE_OSS=NO"
+	fi
+	emake PKG_CONFIG="$(tc-getPKG_CONFIG)" ${CONF}
+}
+
+src_install() {
+	emake ${CONF} DESTDIR="${D}/usr" install
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/media-radio/tucnak/Manifest b/media-radio/tucnak/Manifest
index 612bf274c469..fb9bde96e2a5 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -1,2 +1 @@
-DIST tucnak-4.61.tar.gz 6824381 BLAKE2B f995271f309d24725993bd243ade28744a81d5ab80f994dd3425336930bcd8212433f17d682575d3725243c0e1fc84510e9bd063a6b5372158d3a88558898e34 SHA512 67d17da2a321492c8c38f2207570631851122fe2615f7cc20716ad0906b0fc2422e414e0be91fdfad2474b08d20c4c05c0d2aec9ad2d1d6afc3450af0d9eeb62
 DIST tucnak-4.64.tar.gz 6765553 BLAKE2B e093080db4e019a91cc8e95c4262bad039a2a158c9823337cb9e12691de18c6d0ec54aeb1d21ff7bb8c8d6b7b63e8761bb9a3078d76a4f9a98093b6d92d43d22 SHA512 9aa85fc7669083aadc2caec2577f0d65cc342e041c34bc4f9e8f3315d867eb99cf4296e25d83169d2b5b5d3f33c230922882312ea416eb3dce4f4fc1f47ffed0
diff --git a/media-radio/tucnak/tucnak-4.61.ebuild b/media-radio/tucnak/tucnak-4.61.ebuild
deleted file mode 100644
index 538f145335bf..000000000000
--- a/media-radio/tucnak/tucnak-4.61.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 autotools flag-o-matic
-
-DESCRIPTION="Amateur Radio VHF Contest Logbook"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa fftw gpm hamlib portaudio rtlsdr suid"
-
-RDEPEND="dev-libs/glib:2
-	~dev-libs/libzia-4.61
-	media-libs/libsndfile
-	media-libs/libsdl2
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( sci-libs/fftw:3.0= )
-	gpm? ( sys-libs/gpm )
-	hamlib? ( media-libs/hamlib:= )
-	portaudio? ( media-libs/portaudio )
-	rtlsdr? ( net-wireless/rtl-sdr )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eapply_user
-	# fix destop file
-	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
-	# fix doc install path
-	sed -i -e "s/docsdir/# docsdir/" \
-		-e "s/docs_DATA =/# docs_DATA/" \
-		-e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -L/usr/$(get_libdir)/hamlib
-	econf $(use_with alsa) \
-		$(use_with gpm) \
-		$(use_with hamlib) \
-		$(use_with fftw fftw3) \
-		$(use_with portaudio) \
-		$(use_with rtlsdr) \
-		--without-hidapi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog doc/NAVOD.pdf
-	if use suid ; then
-		fperms 4711 /usr/bin/soundwrapper
-	fi
-}
-
-pkg_postinst() {
-	elog "In order to use sound with tucnak add yourself to the 'audio' group"
-	elog "and to key your rig via the parport add yourself to the 'lp' group"
-	elog ""
-	elog "tucnak can be used with the following additional packages:"
-	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
-	elog "                             (No need to recompile)"
-	if use suid ; then
-		ewarn "You have choosen to install the little helper program 'soundwrapper'"
-		ewarn "setuid by setting USE=suid. That helper is only needed if you"
-		ewarn "want to use morse sidetone output via the PC speaker."
-		ewarn ""
-		ewarn "While the helper should be safe by design be aware that setting"
-		ewarn "any program setuid is a security risk."
-	fi
-}
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index b02dcffa010c..63beaff296ce 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,2 +1 @@
-DIST xlog-2.0.24.tar.gz 11407825 BLAKE2B 0de5203d4229005ba84940443672a9787a9ab2a87565bcbf47e0a0fcf375dcddec7636d11a359a117c42b7e07ea81fd482a2684b8a75379da1fe72cbc991643d SHA512 cc96dfabf01a6c49ed7db1257cc102a469642bdd32a158b0a026da2017181060f8aace5de22ada5df42b3bc89c14448dd372332a9ff0101121570f5b1187e5ab
 DIST xlog-2.0.25.tar.gz 11425326 BLAKE2B d0d14a79090a37c45456da7120089193c02d2fb3df30e8e5780bc40287e4f3a0e4e444613a07b5135502c771c2bd650d81966fc59658140740259fcbca509c9f SHA512 3ce5b27a0529885862a8c5256162068504e05cbbca6e0fc6cf492bfabbb2aa84b82a54502319646ee49e78aac6cd2b685877ec3687fb962c59c8648e0be4e121
diff --git a/media-radio/xlog/files/xlog-2.0.7-desktop.patch b/media-radio/xlog/files/xlog-2.0.7-desktop.patch
deleted file mode 100644
index e124e062351c..000000000000
--- a/media-radio/xlog/files/xlog-2.0.7-desktop.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- data/desktop/xlog.desktop.orig	2013-05-24 08:23:25.000000000 +0200
-+++ data/desktop/xlog.desktop	2013-05-24 08:24:47.000000000 +0200
-@@ -5,8 +5,8 @@
- Comment[pl]=Dziennik łączności dla radioamatorów
- TryExec=xlog
- Exec=xlog %F
--Icon=xlog-icon.png
-+Icon=xlog-icon
- Terminal=false
- Type=Application
--Categories=Utility;Database;HamRadio;GTK
--MimeType=text/x-xlog
-+Categories=Utility;Database;HamRadio;GTK;
-+MimeType=text/x-xlog;
diff --git a/media-radio/xlog/xlog-2.0.24.ebuild b/media-radio/xlog/xlog-2.0.24.ebuild
deleted file mode 100644
index 0acd2ca85fe3..000000000000
--- a/media-radio/xlog/xlog-2.0.24.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs xdg-utils
-MY_P=${P/_}
-
-DESCRIPTION="An amateur radio logging program"
-HOMEPAGE="https://www.nongnu.org/xlog"
-SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="media-libs/hamlib:=
-	dev-libs/glib:2
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	media-libs/libpng:0
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS data/doc/THANKS NEWS README )
-
-src_prepare() {
-	eapply_user
-	eapply -p0 "${FILESDIR}/${PN}-2.0.7-desktop.patch"
-	eapply "${FILESDIR}/${PN}-2.0.24-musl.patch"
-
-	# Drop -Werror
-	sed -i -e "s:-Werror::g" configure.ac || die
-	# fix underlinking
-	sed -i -e "s:HAMLIB_LIBS@:HAMLIB_LIBS@ -lm:g" src/Makefile.am || die
-	eautoconf
-
-	# prepare for media-radio/hamlib-4.2 change of API
-	if has_version '>=media-libs/hamlib-4.2' ; then
-		sed -i -e "s/FILPATHLEN/HAMLIB_FILPATHLEN/g" "${S}"/src/hamlib-utils.c || die
-	fi
-
-	# Fix broken png files<<
-	einfo "Fixing broken png files."
-	pushd "${S}"/data/doc/manual/output/html
-	for png in xlog-clock.png xlog-dropdown.png xlog-editbox.png; do
-		pngfix -q --out=out.png ${png}
-		mv -f out.png "${png}" || die
-	done
-	popd
-	einfo "done ..."
-
-}
-
-src_configure() {
-	# mime-update causes file collisions if enabled
-	econf --disable-mime-update
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	# build system makes it complicate to inhibit updating desktop
-	# database, so just remove the offending file
-	rm  "${D}"/usr/share/applications/mimeinfo.cache || die
-	docompress -x /usr/share/doc/${PF}/{KEYS,ChangeLog,TODO,BUGS}
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/abcmidi/abcmidi-2024.12.16.ebuild b/media-sound/abcmidi/abcmidi-2024.12.16.ebuild
index 8aed3dc3a8d2..f28205192dcd 100644
--- a/media-sound/abcmidi/abcmidi-2024.12.16.ebuild
+++ b/media-sound/abcmidi/abcmidi-2024.12.16.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 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-sound/audex/Manifest b/media-sound/audex/Manifest
index 7dd89498b07c..860c3b2c0635 100644
--- a/media-sound/audex/Manifest
+++ b/media-sound/audex/Manifest
@@ -1,2 +1,2 @@
 DIST audex-24.08.3.tar.xz 711860 BLAKE2B c93255a6be4e76f565d32e2c9b638983b619aa3962a2ac9ca60cf7ee48fa9856a12283c97409c8e11f96084e8ff891dc7d958bfd5e7326dcbd74c0300c393686 SHA512 0779e8c82f6c92a51ef772171bbc51c309280f1b85d7e2c003efa841eb656d8bc3ad50e1ff0fa51b4f6117655aff10252b9aa8df6b90fddc6b556f2bc10946a6
-DIST audex-24.12.0.tar.xz 714176 BLAKE2B 9555ac5cbd1c6521da9e88e8d1a69ba68f5a16103368f14563a22ee8cd133bbaa645ef04ba9a996be91c28dde5686f4a1ab3bb09ff10c4ac7136c0281d1e9c15 SHA512 fea459f0711bf3bccb115f92e9e39dc6cd7b9bce47dda770a5871e6bb11ff5794f7decb1fac5eb984b1ab12209dd8df83b93d52bcd7725744cb559ea27c305e2
+DIST audex-24.12.1.tar.xz 716860 BLAKE2B b9cc6ab01e8371c072e130475f8f156f0dcb454f41e5b4b8e3daef0e28ef68486a28a7fa0fd08e5c576ba7f02ffce171e836db45e96962e239da4d7c62caf1b1 SHA512 106b082909d4b581e6cc1b0ac4e1cc8d20265c73e96de20ceaab7085e78b91909b55b4758381ed1959e608609b84a7e2f8e5e176dd0bc866e8a79467da187163
diff --git a/media-sound/audex/audex-24.12.0.ebuild b/media-sound/audex/audex-24.12.0.ebuild
deleted file mode 100644
index 797eb8b4c7f5..000000000000
--- a/media-sound/audex/audex-24.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Tool for ripping compact discs"
-HOMEPAGE="https://apps.kde.org/audex/ https://userbase.kde.org/Audex"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-apps/libkcddb-${PVCUT}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-	dev-libs/libcdio:=
-	dev-libs/libcdio-paranoia:=
-"
-RDEPEND="${DEPEND}"
diff --git a/media-sound/audex/audex-24.12.1.ebuild b/media-sound/audex/audex-24.12.1.ebuild
new file mode 100644
index 000000000000..8b2308535cfd
--- /dev/null
+++ b/media-sound/audex/audex-24.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Tool for ripping compact discs"
+HOMEPAGE="https://apps.kde.org/audex/ https://userbase.kde.org/Audex"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-apps/libkcddb-${PVCUT}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	dev-libs/libcdio:=
+	dev-libs/libcdio-paranoia:=
+"
+RDEPEND="${DEPEND}"
diff --git a/media-sound/cava/cava-0.10.3-r1.ebuild b/media-sound/cava/cava-0.10.3-r1.ebuild
new file mode 100644
index 000000000000..d889ed577fb5
--- /dev/null
+++ b/media-sound/cava/cava-0.10.3-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Console-based Audio Visualizer for Alsa"
+HOMEPAGE="https://github.com/karlstav/cava/"
+SRC_URI="
+	https://github.com/karlstav/cava/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="MIT Unlicense"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="alsa jack +ncurses pipewire portaudio pulseaudio sdl sndio"
+
+RDEPEND="
+	>=dev-libs/iniparser-4.1-r2:=
+	sci-libs/fftw:3.0=
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	ncurses? ( sys-libs/ncurses:= )
+	pipewire? ( media-video/pipewire:= )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-libs/libpulse )
+	sdl? (
+		media-libs/libglvnd
+		media-libs/libsdl2[opengl,video]
+	)
+	sndio? ( media-sound/sndio:= )
+"
+DEPEND="${RDEPEND}"
+# bug #941845 wrt autoconf-archive bounds
+BDEPEND="
+	virtual/pkgconfig
+	sdl? (
+		|| (
+			>dev-build/autoconf-archive-2024.10.16
+			<dev-build/autoconf-archive-2024.10.16
+		)
+	)
+"
+
+src_prepare() {
+	default
+
+	# TODO: drop this when autoconf-archive is fixed (bug #941845), this is
+	# to handle the USE=-sdl case given it breaks it present
+	use sdl || sed -i 's/AX_CHECK_GL/&_DISABLED/' configure.ac || die
+
+	# respect ESYSROOT for iniparser (can't use CPPFLAGS, comes before),
+	# ideally upstream could try pkg-config first (only in >=iniparser-4.2)
+	[[ -z ${ESYSROOT} ]] || sed -i "s|/usr|${ESYSROOT}&|" configure.ac || die
+
+	echo ${PV} > version || die
+	eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		$(use_enable alsa input-alsa)
+		$(use_enable jack input-jack)
+		$(use_enable pipewire input-pipewire)
+		$(use_enable portaudio input-portaudio)
+		$(use_enable pulseaudio input-pulse)
+		$(use_enable sndio input-sndio)
+
+		$(use_enable ncurses output-ncurses)
+		$(use_enable sdl output-sdl)
+		# note: not behind USE=opengl and sdl2[opengl?] given have not gotten
+		# normal output-sdl to work without USE=opengl on sdl either way
+		$(use_enable sdl output-sdl_glsl)
+	)
+
+	# autoconf-archive (currently) does not support -lOpenGL for libglvnd[-X]
+	use sdl && econfargs+=( GL_LIBS="$($(tc-getPKG_CONFIG) --libs opengl || die)" )
+
+	econf "${econfargs[@]}"
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS##* } ]]; then
+		elog "A default ~/.config/cava/config will be created after initial"
+		elog "use of ${PN}, see it and ${EROOT}/usr/share/doc/${PF}/README*"
+		elog "for configuring audio input and more."
+	fi
+}
diff --git a/media-sound/cava/cava-0.10.3.ebuild b/media-sound/cava/cava-0.10.3.ebuild
deleted file mode 100644
index a84de68609b1..000000000000
--- a/media-sound/cava/cava-0.10.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Console-based Audio Visualizer for Alsa"
-HOMEPAGE="https://github.com/karlstav/cava/"
-SRC_URI="
-	https://github.com/karlstav/cava/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT Unlicense"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa jack +ncurses pipewire portaudio pulseaudio sdl sndio"
-
-RDEPEND="
-	dev-libs/iniparser:4
-	sci-libs/fftw:3.0=
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	ncurses? ( sys-libs/ncurses:= )
-	pipewire? ( media-video/pipewire:= )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-libs/libpulse )
-	sdl? (
-		media-libs/libglvnd
-		media-libs/libsdl2[opengl,video]
-	)
-	sndio? ( media-sound/sndio:= )
-"
-DEPEND="${RDEPEND}"
-# bug #941845 wrt autoconf-archive bounds
-BDEPEND="
-	virtual/pkgconfig
-	sdl? (
-		|| (
-			>dev-build/autoconf-archive-2024.10.16
-			<dev-build/autoconf-archive-2024.10.16
-		)
-	)
-"
-
-src_prepare() {
-	# TODO: depend on >=4.2.2 and remove after 4.2.2 is stable unless bug
-	# #933610 reintroduces slotting hacks (also drop ${inip} below)
-	local inip=
-	if has_version '<dev-libs/iniparser-4.2.2:4'; then
-		inip=4
-		eapply "${FILESDIR}"/${PN}-0.10.3-gentoo-iniparser4.patch
-	fi
-
-	default
-
-	# TODO: drop this when autoconf-archive is fixed (bug #941845), this is
-	# to handle the USE=-sdl case given it breaks it present
-	use sdl || sed -i 's/AX_CHECK_GL/&_DISABLED/' configure.ac || die
-
-	# respect both ESYSROOT+slotting (can't use CPPFLAGS, comes before)
-	sed -i "s|/usr/include/iniparser|${ESYSROOT}&${inip} |" configure.ac || die
-
-	echo ${PV} > version || die
-	eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		$(use_enable alsa input-alsa)
-		$(use_enable jack input-jack)
-		$(use_enable pipewire input-pipewire)
-		$(use_enable portaudio input-portaudio)
-		$(use_enable pulseaudio input-pulse)
-		$(use_enable sndio input-sndio)
-
-		$(use_enable ncurses output-ncurses)
-		$(use_enable sdl output-sdl)
-		# note: not behind USE=opengl and sdl2[opengl?] given have not gotten
-		# normal output-sdl to work without USE=opengl on sdl either way
-		$(use_enable sdl output-sdl_glsl)
-	)
-
-	# autoconf-archive (currently) does not support -lOpenGL for libglvnd[-X]
-	use sdl && econfargs+=( GL_LIBS="$($(tc-getPKG_CONFIG) --libs opengl || die)" )
-
-	econf "${econfargs[@]}"
-}
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS##* } ]]; then
-		elog "A default ~/.config/cava/config will be created after initial"
-		elog "use of ${PN}, see it and ${EROOT}/usr/share/doc/${PF}/README*"
-		elog "for configuring audio input and more."
-	fi
-}
diff --git a/media-sound/cava/files/cava-0.10.3-gentoo-iniparser4.patch b/media-sound/cava/files/cava-0.10.3-gentoo-iniparser4.patch
deleted file mode 100644
index 30b9d9dc4600..000000000000
--- a/media-sound/cava/files/cava-0.10.3-gentoo-iniparser4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Gentoo uses non-standard naming for slotted iniparser:4 and it
-does not have a pkg-config file (ideally should be unslotted).
-Cava can use iniparser:0 as well but <3.2 forces legacy mode.
-
-See also: https://bugs.gentoo.org/933610
---- a/configure.ac
-+++ b/configure.ac
-@@ -424,5 +424,5 @@
- 
--AC_CHECK_LIB(iniparser,iniparser_load, have_iniparser=yes, have_iniparser=no)
-+AC_CHECK_LIB(iniparser4,iniparser_load, have_iniparser=yes, have_iniparser=no)
-     if [[ $have_iniparser = "yes" ]] ; then
--    LIBS="$LIBS -liniparser"
-+    LIBS="$LIBS -liniparser4"
-     if [[ $build_mac = "yes" ]] ; then
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index 42ec64d969b4..60cd0d93202c 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,2 +1,3 @@
 DIST chuck-1.5.4.2.tgz 22311827 BLAKE2B 1215211c837fa55c132742a9a4edef97446304fffb6a6e9f4de0d1da66c634c81398870fbd30ba864939f7e3a54bd0f2125bd6c4c9634edb51da43fa25fd05a9 SHA512 c4ce1e3e04d33fbd516f41eebfbc3b71399c587c0ea7b5d16b4d8a8fe5efb3e244ea0e8860f7331aa740f68f96f6b8f92d37104e6b71f0b6e0cb704acc14715b
 DIST chuck-1.5.4.3.tgz 22318954 BLAKE2B 83fffaa811fb9ba73f2000ea7a6d5e133c42964571340877a4080e2a6360ac3a7df8bda01a7c0a4acbdbe2f64d97310dbcff237d935b5598ba5ca0e1a312cd2f SHA512 a8324c7dcd5d031cc256d0a5e87d69ae728d008735c81d977911695ec9e93ff6e647cbc4ef36f7fabf84674c468fcaf7df3350f4898436267344f44f8e4089c7
+DIST chuck-1.5.4.4.tgz 22334080 BLAKE2B 84d3a9e11205c95695fc2b1e9af9fccb31d9a7f2dd6f4184c8bd3b9425cbdb05dac36d477cb6aeb6e757299dc972e2daff5b18d7f5fd748d3c31e04974dd70b9 SHA512 725bea6ee81443e0d65eac80746d2600bf5ab0db2495e8eb376851f46da413ad954106fb9da15b440250da335f0ae63f624945e338a9b2136c110ea876464a05
diff --git a/media-sound/chuck/chuck-1.5.4.3.ebuild b/media-sound/chuck/chuck-1.5.4.3.ebuild
index 70115f4d5785..2d23f14d98bc 100644
--- a/media-sound/chuck/chuck-1.5.4.3.ebuild
+++ b/media-sound/chuck/chuck-1.5.4.3.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="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa jack examples"
 REQUIRED_USE="|| ( alsa jack )"
 
diff --git a/media-sound/chuck/chuck-1.5.4.4.ebuild b/media-sound/chuck/chuck-1.5.4.4.ebuild
new file mode 100644
index 000000000000..cf941b17862c
--- /dev/null
+++ b/media-sound/chuck/chuck-1.5.4.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Strongly-timed, concurrent, and on-the-fly audio programming language"
+HOMEPAGE="http://chuck.cs.princeton.edu/"
+SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack examples"
+REQUIRED_USE="|| ( alsa jack )"
+
+RDEPEND="app-eselect/eselect-chuck
+	media-libs/libsndfile
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )"
+DEPEND="${RDEPEND}
+	app-alternatives/yacc
+	app-alternatives/lex"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0.0-hid-smc.patch
+	"${FILESDIR}"/${PN}-1.5.3.2-makefile.patch
+)
+
+compile_backend() {
+	backend=$1
+	pushd "${S}/src" &>/dev/null || die
+	einfo "Compiling against ${backend}"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getCXX)" linux-${backend}
+	mv chuck{,-${backend}} || die
+	emake clean
+	popd &>/dev/null || die
+}
+
+src_compile() {
+	# when compile with athlon or athlon-xp flags
+	# chuck crashes on removing a shred with a double free or corruption
+	# it happens in Chuck_VM_Stack::shutdown() on the line
+	#   SAFE_DELETE_ARRAY( stack );
+	replace-cpu-flags athlon athlon-xp i686
+
+	use jack && compile_backend jack
+	use alsa && compile_backend alsa
+}
+
+src_install() {
+	use jack && dobin src/chuck-jack
+	use alsa && dobin src/chuck-alsa
+
+	dodoc AUTHORS DEVELOPERS QUICKSTART README.md THANKS VERSIONS
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Chuck now can use multiple audio engines, so you can specify"
+		elog "the preferred audio engine with chuck-{jack,alsa}"
+		elog "Or you can use 'eselect chuck' to set the audio engine"
+	fi
+	eselect chuck update --if-unset
+}
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 9d094a2ce96c..1a2f1e757349 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1 +1,2 @@
 DIST clementine-1.4.0_rc2.tar.gz 9073685 BLAKE2B a2376f1a895c651c2eb089419e20b9ce6050739f1342a6fdf1ebad0a14b65a08f56cc846eb79ad7facb77d6ee2cac74f9e374bd8e284a2a7f87d7c117779a08d SHA512 403093386efabd52e649c0e379abbf4873c4b2f8d0af72cda2b7e0255f90c60259f961045e7b51d0e5bf35425d678ff6b018c9191845ebbd156d9216d8bd7722
+DIST clementine-1.4.1_p28.tar.xz 5554308 BLAKE2B 213c5719ce987700739d625de07861143a85690c91908d458cb40db9b932f4a33caca727f2a2db942d96ee3e5f356841c09dfd293fa676ad134d1283937ef4fc SHA512 c5b06540909127e8b3bc774f2bee54584c0993e1ddebce4572cd8402bba5524babdcc3b74a1b6a8335c525ce64ee1347766b6698df05bdcf21209583b8d1dc9d
diff --git a/media-sound/clementine/clementine-1.4.0_rc2-r6.ebuild b/media-sound/clementine/clementine-1.4.0_rc2-r6.ebuild
deleted file mode 100644
index cdaced76e890..000000000000
--- a/media-sound/clementine/clementine-1.4.0_rc2-r6.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
-
-PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
-
-inherit cmake flag-o-matic plocale virtualx xdg
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Clementine-${PV/_}"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="alsa box cdda +dbus debug dropbox googledrive ipod lastfm moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-	wiimote? ( dbus )
-"
-
-COMMON_DEPEND="
-	dev-cpp/abseil-cpp:=
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/chromaprint:=
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-	media-libs/taglib:=
-	sys-libs/zlib
-	x11-libs/libX11
-	alsa? ( media-libs/alsa-lib )
-	cdda? ( dev-libs/libcdio:= )
-	dbus? ( dev-qt/qtdbus:5 )
-	ipod? ( >=media-libs/libgpod-0.8.0 )
-	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
-	moodbar? ( sci-libs/fftw:3.0= )
-	mtp? ( >=media-libs/libmtp-1.0.0:= )
-	projectm? (
-		media-libs/glew:=
-		>=media-libs/libprojectm-3.1.12:0=
-		virtual/opengl
-	)
-	pulseaudio? ( media-libs/libpulse )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	mtp? ( gnome-base/gvfs[mtp] )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-libs/libxml2
-	dev-qt/qtopengl:5
-	dev-qt/qtxml:5
-	virtual/glu
-	box? ( dev-cpp/sparsehash )
-	dropbox? ( dev-cpp/sparsehash )
-	googledrive? ( dev-cpp/sparsehash )
-	seafile? ( dev-cpp/sparsehash )
-	skydrive? ( dev-cpp/sparsehash )
-"
-BDEPEND="
-	>=dev-cpp/gtest-1.8.0
-	dev-qt/linguist-tools:5
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		dev-qt/qttest:5
-		gnome-base/gsettings-desktop-schemas
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/clementine-1.4.0_rc2-lz.patch"
-	"${FILESDIR}/clementine-1.4.0_rc2-c17.patch"
-	"${FILESDIR}/clementine-1.4.0_rc2-absl.patch"
-	"${FILESDIR}/clementine-1.4.0_rc2-projectm-dir.patch"
-	"${FILESDIR}/clementine-1.4.0_rc2-fix-build-taglib2.patch"
-)
-
-DOCS=( Changelog README.md )
-
-src_prepare() {
-	plocale_find_changes "src/translations" "" ".po"
-
-	cmake_src_prepare
-	# some tests fail or hang
-	sed -i \
-		-e '/add_test_file(translations_test.cpp/d' \
-		tests/CMakeLists.txt || die
-
-	if ! use test; then
-		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
-		cmake_comment_add_subdirectory tests
-	fi
-
-	rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
-		-DENABLE_GIO=ON
-		-DENABLE_SPOTIFY=OFF
-		-DENABLE_SPOTIFY_BLOB=OFF
-		-DUSE_SYSTEM_GMOCK=ON
-		-DUSE_SYSTEM_PROJECTM=ON
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		-DLINGUAS="$(plocale_get_locales)"
-		-DENABLE_BOX="$(usex box)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
-		-DENABLE_DROPBOX="$(usex dropbox)"
-		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBLASTFM="$(usex lastfm)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_VISUALISATIONS="$(usex projectm)"
-		-DENABLE_SEAFILE="$(usex seafile)"
-		-DENABLE_SKYDRIVE="$(usex skydrive)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
-		"$(cmake_use_find_package alsa ALSA)"
-		-DGENTOO_FIX_ABSL_LIBS="$(test-flags-CCLD -labsl_log_internal_check_op -labsl_log_internal_message)"
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	virtx cmake_build clementine_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-	elog "depending on your preferences"
-}
diff --git a/media-sound/clementine/clementine-1.4.1_p28.ebuild b/media-sound/clementine/clementine-1.4.1_p28.ebuild
new file mode 100644
index 000000000000..1555e2a42292
--- /dev/null
+++ b/media-sound/clementine/clementine-1.4.1_p28.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
+HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
+
+PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
+
+inherit cmake flag-o-matic plocale virtualx xdg
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
+	inherit git-r3
+else
+	MY_PV="$(ver_cut 1-3)-$(ver_cut 5)-g41e2a07b3"
+	SRC_URI="https://github.com/clementine-player/Clementine/releases/download/${MY_PV}/clementine-${MY_PV}.tar.xz -> ${P}.tar.xz"
+	S="${WORKDIR}/clementine-${MY_PV}"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="alsa box cdda +dbus debug dropbox googledrive ipod lastfm moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+	wiimote? ( dbus )
+"
+
+COMMON_DEPEND="
+	dev-cpp/abseil-cpp:=
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/chromaprint:=
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+	media-libs/taglib:=
+	sys-libs/zlib
+	x11-libs/libX11
+	alsa? ( media-libs/alsa-lib )
+	cdda? ( dev-libs/libcdio:= )
+	dbus? ( dev-qt/qtdbus:5 )
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
+	moodbar? ( sci-libs/fftw:3.0= )
+	mtp? ( >=media-libs/libmtp-1.0.0:= )
+	projectm? (
+		media-libs/glew:=
+		>=media-libs/libprojectm-3.1.12:0=
+		virtual/opengl
+	)
+	pulseaudio? ( media-libs/libpulse )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	dev-libs/libxml2
+	dev-qt/qtopengl:5
+	dev-qt/qtxml:5
+	virtual/glu
+	box? ( dev-cpp/sparsehash )
+	dropbox? ( dev-cpp/sparsehash )
+	googledrive? ( dev-cpp/sparsehash )
+	seafile? ( dev-cpp/sparsehash )
+	skydrive? ( dev-cpp/sparsehash )
+"
+BDEPEND="
+	>=dev-cpp/gtest-1.8.0
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		dev-qt/qttest:5
+		gnome-base/gsettings-desktop-schemas
+	)
+"
+
+DOCS=( Changelog README.md )
+
+src_prepare() {
+	plocale_find_changes "src/translations" "" ".po"
+
+	cmake_src_prepare
+	# some tests fail or hang
+	sed -i \
+		-e '/add_test_file(translations_test.cpp/d' \
+		tests/CMakeLists.txt || die
+
+	if ! use test; then
+		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
+		cmake_comment_add_subdirectory tests
+	fi
+
+	rm -r 3rdparty/{libmygpo-qt5,taglib} || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
+		-DENABLE_GIO=ON
+		-DUSE_SYSTEM_GMOCK=ON
+		-DUSE_SYSTEM_PROJECTM=ON
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		-DLINGUAS="$(plocale_get_locales)"
+		-DENABLE_BOX="$(usex box)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_DROPBOX="$(usex dropbox)"
+		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBLASTFM="$(usex lastfm)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_VISUALISATIONS="$(usex projectm)"
+		-DENABLE_SEAFILE="$(usex seafile)"
+		-DENABLE_SKYDRIVE="$(usex skydrive)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+		"$(cmake_use_find_package alsa ALSA)"
+	)
+
+	if [[ ${PV} != *9999* ]]; then
+		mycmakeargs+=(
+			-DFORCE_GIT_REVISION="${MY_PV}"
+		)
+	fi
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	virtx cmake_build clementine_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+	elog "depending on your preferences"
+}
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index a09833cc5cc0..823a70ac7fe8 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-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
@@ -14,8 +14,9 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Clementine-${PV/_}"
+	MY_PV="$(ver_cut 1-3)-$(ver_cut 5)-gxxxxxxxxx"
+	SRC_URI="https://github.com/clementine-player/Clementine/releases/download/${MY_PV}/clementine-${MY_PV}.tar.xz -> ${P}.tar.xz"
+	S="${WORKDIR}/clementine-${MY_PV}"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
@@ -92,13 +93,6 @@ BDEPEND="
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/clementine-1.4.0_rc2-c17.patch"
-	"${FILESDIR}/clementine-1.4.0_rc2-absl.patch"
-	"${FILESDIR}/clementine-1.4.0_rc2-projectm-dir.patch"
-	"${FILESDIR}/clementine-1.4.0_rc2-fix-build-taglib2.patch"
-)
-
 DOCS=( Changelog README.md )
 
 src_prepare() {
@@ -145,9 +139,14 @@ src_configure() {
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
 		"$(cmake_use_find_package alsa ALSA)"
-		-DGENTOO_FIX_ABSL_LIBS="$(test-flags-CCLD -labsl_log_internal_check_op -labsl_log_internal_message)"
 	)
 
+	if [[ ${PV} != *9999* ]]; then
+		mycmakeargs+=(
+			-DFORCE_GIT_REVISION="${MY_PV}"
+		)
+	fi
+
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
 
 	cmake_src_configure
diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-fix-build-taglib2.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-fix-build-taglib2.patch
deleted file mode 100644
index 0c26343c7bf0..000000000000
--- a/media-sound/clementine/files/clementine-1.4.0_rc2-fix-build-taglib2.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-https://github.com/clementine-player/Clementine/commit/e9c09b1c4054925fa6366233cb44d4d0a543258f.patch
-compatibility added with taglib1
---- a/ext/libclementine-tagreader/cloudstream.cpp
-+++ b/ext/libclementine-tagreader/cloudstream.cpp
-@@ -91,7 +91,11 @@
-   clear();
- }
- 
-+#if (TAGLIB_MAJOR_VERSION == 2)
-+TagLib::ByteVector CloudStream::readBlock(size_t length) {
-+#else
- TagLib::ByteVector CloudStream::readBlock(ulong length) {
-+#endif
-   const uint start = cursor_;
-   const uint end = qMin(cursor_ + length - 1, length_ - 1);
- 
-@@ -144,11 +148,19 @@
-   qLog(Debug) << Q_FUNC_INFO << "not implemented";
- }
- 
-+#if (TAGLIB_MAJOR_VERSION == 2)
-+void CloudStream::insert(const TagLib::ByteVector&, TagLib::offset_t, size_t) {
-+#else
- void CloudStream::insert(const TagLib::ByteVector&, ulong, ulong) {
-+#endif
-   qLog(Debug) << Q_FUNC_INFO << "not implemented";
- }
- 
-+#if (TAGLIB_MAJOR_VERSION == 2)
-+void CloudStream::removeBlock(TagLib::offset_t, size_t) {
-+#else
- void CloudStream::removeBlock(ulong, ulong) {
-+#endif
-   qLog(Debug) << Q_FUNC_INFO << "not implemented";
- }
- 
-@@ -159,7 +171,11 @@
- 
- bool CloudStream::isOpen() const { return true; }
- 
-+#if (TAGLIB_MAJOR_VERSION == 2)
-+void CloudStream::seek(TagLib::offset_t offset, TagLib::IOStream::Position p) {
-+#else
- void CloudStream::seek(long offset, TagLib::IOStream::Position p) {
-+#endif
-   switch (p) {
-     case TagLib::IOStream::Beginning:
-       cursor_ = offset;
-@@ -178,11 +194,19 @@
- 
- void CloudStream::clear() { cursor_ = 0; }
- 
-+#if (TAGLIB_MAJOR_VERSION == 2)
-+TagLib::offset_t CloudStream::tell() const { return cursor_; }
-+
-+TagLib::offset_t CloudStream::length() { return length_; }
-+
-+void CloudStream::truncate(TagLib::offset_t) {
-+#else
- long CloudStream::tell() const { return cursor_; }
- 
- long CloudStream::length() { return length_; }
- 
- void CloudStream::truncate(long) {
-+#endif
-   qLog(Debug) << Q_FUNC_INFO << "not implemented";
- }
- 
---- a/ext/libclementine-tagreader/cloudstream.h
-+++ b/ext/libclementine-tagreader/cloudstream.h
-@@ -35,6 +35,19 @@
- 
-   // Taglib::IOStream
-   virtual TagLib::FileName name() const;
-+#if (TAGLIB_MAJOR_VERSION == 2)
-+  virtual TagLib::ByteVector readBlock(size_t length);
-+  virtual void writeBlock(const TagLib::ByteVector&);
-+  virtual void insert(const TagLib::ByteVector&, TagLib::offset_t, size_t);
-+  virtual void removeBlock(TagLib::offset_t, size_t);
-+  virtual bool readOnly() const;
-+  virtual bool isOpen() const;
-+  virtual void seek(TagLib::offset_t offset, TagLib::IOStream::Position p);
-+  virtual void clear();
-+  virtual TagLib::offset_t tell() const;
-+  virtual TagLib::offset_t length();
-+  virtual void truncate(TagLib::offset_t);
-+#else
-   virtual TagLib::ByteVector readBlock(ulong length);
-   virtual void writeBlock(const TagLib::ByteVector&);
-   virtual void insert(const TagLib::ByteVector&, ulong, ulong);
-@@ -46,6 +59,7 @@
-   virtual long tell() const;
-   virtual long length();
-   virtual void truncate(long);
-+#endif
- 
-   google::sparsetable<char>::size_type cached_bytes() const {
-     return cache_.num_nonempty();
---- a/ext/libclementine-tagreader/tagreader.cpp
-+++ b/ext/libclementine-tagreader/tagreader.cpp
-@@ -198,7 +198,7 @@
-     // Find album artists
-     TagLib::APE::ItemListMap::ConstIterator it = items.find("ALBUM ARTIST");
-     if (it != items.end()) {
--      TagLib::StringList album_artists = it->second.toStringList();
-+      TagLib::StringList album_artists = it->second.values();
-       if (!album_artists.isEmpty()) {
-         Decode(album_artists.front(), nullptr, song->mutable_albumartist());
-       }
-@@ -243,22 +243,22 @@
-     }
- 
-     if (items.contains("BPM")) {
--      Decode(items["BPM"].toStringList().toString(", "), nullptr,
-+      Decode(items["BPM"].values().toString(", "), nullptr,
-              song->mutable_performer());
-     }
- 
-     if (items.contains("PERFORMER")) {
--      Decode(items["PERFORMER"].toStringList().toString(", "), nullptr,
-+      Decode(items["PERFORMER"].values().toString(", "), nullptr,
-              song->mutable_performer());
-     }
- 
-     if (items.contains("COMPOSER")) {
--      Decode(items["COMPOSER"].toStringList().toString(", "), nullptr,
-+      Decode(items["COMPOSER"].values().toString(", "), nullptr,
-              song->mutable_composer());
-     }
- 
-     if (items.contains("GROUPING")) {
--      Decode(items["GROUPING"].toStringList().toString(" "), nullptr,
-+      Decode(items["GROUPING"].values().toString(" "), nullptr,
-              song->mutable_grouping());
-     }
- 
-@@ -565,8 +565,8 @@
-   if (fileref->audioProperties()) {
-     song->set_bitrate(fileref->audioProperties()->bitrate());
-     song->set_samplerate(fileref->audioProperties()->sampleRate());
--    song->set_length_nanosec(fileref->audioProperties()->length() *
--                             kNsecPerSec);
-+    song->set_length_nanosec(fileref->audioProperties()->lengthInMilliseconds() *
-+                             kNsecPerMsec);
-   }
- 
-   // Get the filetype if we can
-@@ -1376,9 +1376,15 @@
-   std::unique_ptr<TagLib::File> tag;
-   if (mime_type == "audio/mpeg" &&
-       title.endsWith(".mp3", Qt::CaseInsensitive)) {
-+#if (TAGLIB_MAJOR_VERSION == 2)
-+    tag.reset(new TagLib::MPEG::File(stream.get(), true,
-+                                     TagLib::AudioProperties::Accurate,
-+                                     TagLib::ID3v2::FrameFactory::instance()));
-+#else
-     tag.reset(new TagLib::MPEG::File(stream.get(),
-                                      TagLib::ID3v2::FrameFactory::instance(),
-                                      TagLib::AudioProperties::Accurate));
-+#endif
-   } else if (mime_type == "audio/mp4" ||
-              (mime_type == "audio/mpeg" &&
-               title.endsWith(".m4a", Qt::CaseInsensitive))) {
-@@ -1398,9 +1398,15 @@
-                                             TagLib::AudioProperties::Accurate));
-   } else if (mime_type == "application/x-flac" || mime_type == "audio/flac" ||
-              mime_type == "audio/x-flac") {
-+#if (TAGLIB_MAJOR_VERSION == 2)
-+    tag.reset(new TagLib::FLAC::File(stream.get(), true,
-+                                     TagLib::AudioProperties::Accurate,
-+                                     TagLib::ID3v2::FrameFactory::instance()));
-+#else
-     tag.reset(new TagLib::FLAC::File(stream.get(),
-                                      TagLib::ID3v2::FrameFactory::instance(),
-                                      true, TagLib::AudioProperties::Accurate));
-+#endif
-   } else if (mime_type == "audio/x-ms-wma") {
-     tag.reset(new TagLib::ASF::File(stream.get(), true,
-                                     TagLib::AudioProperties::Accurate));
-@@ -1431,7 +1431,7 @@
-     song->set_type(cpb::tagreader::SongMetadata_Type_STREAM);
- 
-     if (tag->audioProperties()) {
--      song->set_length_nanosec(tag->audioProperties()->length() * kNsecPerSec);
-+      song->set_length_nanosec(tag->audioProperties()->lengthInMilliseconds() * kNsecPerMsec);
-     }
-     return true;
-   }
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index f2004705fbc0..20c044e9d48b 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,2 +1,2 @@
 DIST elisa-24.08.3.tar.xz 1909116 BLAKE2B 1f1fd6f767bc7da4a0ba9ef5d6472138cc8a4107211fb061a7d6fba0304ba79fa6ac4bee0ee631b26c4743e9a44ac5ea7e96767762c346f27b7fee649ba1eb30 SHA512 a81950f2f2248e8590ad32c056b56532c0ba847e885abf0aed8109746d3db69a96293f66c91e7670f9b5bfd45a61d91c97d3ef78a95ea217f33ad8f8b18b43cc
-DIST elisa-24.12.0.tar.xz 1924748 BLAKE2B 8f7b632f7424fa2c6f6e50e6b31ac7ad5187de74c98d9361278ed8f3b08934b6590cb7c562c2e0dbc9c67e74f9e155bab88a7cb14a9a8e3aa8f0cf21809fbed8 SHA512 0b5ca83dbf67d358d3e0b8a26305fe192edb553ba1c144153260d0d5b86fa088367d941a391e5ff3a4139a2208e08daad9c2fe04ade7e59e261e7739a83b4fb8
+DIST elisa-24.12.1.tar.xz 1924868 BLAKE2B 1877ee588a86430cc21b3869bece5fd5cdd91cadd3d94a7c044a2c9440ceb7eb5bf44f151390a78288632dc7ff4468c83633f4e02bdd3ae95dad5c4b1d0716f2 SHA512 cd9514e1736cf20a3b9ebb895ab9c3a706e406d16e22803fd251ef94651697ea9cd5c991c7a11567339da05f5042d76a81b96256e997b78b1d5aa18efcad7b48
diff --git a/media-sound/elisa/elisa-24.12.0.ebuild b/media-sound/elisa/elisa-24.12.0.ebuild
deleted file mode 100644
index e729f16e7d6e..000000000000
--- a/media-sound/elisa/elisa-24.12.0.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
-
-ECM_TEST="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://apps.kde.org/elisa/"
-
-LICENSE="LGPL-3+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+mpris vlc"
-
-RESTRICT="test"
-
-DEPEND="
-	>=dev-libs/kirigami-addons-0.11.76:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,sql,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
-	>=dev-qt/qtmultimedia-${QTMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kfilemetadata-${KFMIN}:6[taglib]
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
-	mpris? (
-		>=dev-qt/qtbase-${QTMIN}:6[dbus]
-		>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	)
-	vlc? ( media-video/vlc:= )
-	!vlc? ( >=dev-qt/qtmultimedia-${QTMIN}:6 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qt5compat-${QTMIN}:6[qml]
-"
-BDEPEND="sys-devel/gettext"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package mpris KF6DBusAddons)
-		$(cmake_use_find_package vlc LIBVLC)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-sound/elisa/elisa-24.12.1.ebuild b/media-sound/elisa/elisa-24.12.1.ebuild
new file mode 100644
index 000000000000..e949e11298c7
--- /dev/null
+++ b/media-sound/elisa/elisa-24.12.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Simple music player by KDE"
+HOMEPAGE="https://apps.kde.org/elisa/"
+
+LICENSE="LGPL-3+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+mpris vlc"
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-libs/kirigami-addons-0.11.76:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,sql,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kfilemetadata-${KFMIN}:6[taglib]
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+	mpris? (
+		>=dev-qt/qtbase-${QTMIN}:6[dbus]
+		>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	)
+	vlc? ( media-video/vlc:= )
+	!vlc? ( >=dev-qt/qtmultimedia-${QTMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+"
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package mpris KF6DBusAddons)
+		$(cmake_use_find_package vlc LIBVLC)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-sound/fapg/Manifest b/media-sound/fapg/Manifest
index 40e9945e6785..3c10ab740e84 100644
--- a/media-sound/fapg/Manifest
+++ b/media-sound/fapg/Manifest
@@ -1 +1,2 @@
 DIST fapg-0.44.tar.gz 95423 BLAKE2B 7ceb0bada49092b491daa553786a88c193489b702b898638d118f0616738a746973a2d7982ec6a95376bd27a7c8c6ac531a546688c2d1f1079a2e7255f5a64d5 SHA512 ffb7e95c6060b0afeffc820c74f8cf619aff3b8876212a94106184d1b61201896626806a9334722fe856203cc09b01c0a1cd10a40cba62ad6f6709f3663fd933
+DIST fapg-0.45.tar.gz 95554 BLAKE2B b453e20af0373378dcec8a4de733eb4b61eb659ea0c19f67ec962df2f92cd5dc23090c00d7fdd28ec4be9f5efad102a2610144111994fcf10cb2c1f50381ae20 SHA512 befc5980462d210fbac273e4eb565e35f5e5db36d8c0bf5ba1aacf14d50db1b70b2d92a091c00dc8c459ef351043c2349d0b6973c719336043d597aa48a5d418
diff --git a/media-sound/fapg/fapg-0.45.ebuild b/media-sound/fapg/fapg-0.45.ebuild
new file mode 100644
index 000000000000..e7c1407fe128
--- /dev/null
+++ b/media-sound/fapg/fapg-0.45.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Fast Audio Playlist Generator"
+HOMEPAGE="http://royale.zerezo.com/fapg/"
+SRC_URI="http://royale.zerezo.com/fapg/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="xspf"
+
+DEPEND="xspf? ( >=dev-libs/uriparser-0.6.3 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myconf=""
+	use xspf || myconf="${myconf} --disable-xspf"
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/media-sound/flake/files/flake-0.11-make-instability.patch b/media-sound/flake/files/flake-0.11-make-instability.patch
new file mode 100644
index 000000000000..66cb47a4e53d
--- /dev/null
+++ b/media-sound/flake/files/flake-0.11-make-instability.patch
@@ -0,0 +1,57 @@
+https://bugs.gentoo.org/917760
+We can't build program without library, utils dependency is just in case
+diff -ru a/Makefile b/Makefile
+--- a/Makefile	2025-01-09 11:48:10.117085442 +0400
++++ b/Makefile	2025-01-09 11:48:27.041979565 +0400
+@@ -19,10 +19,10 @@
+ lib:
+ 	$(MAKE) -C libflake all
+ 
+-progs:
++progs: lib
+ 	$(MAKE) -C flake all
+ 
+-utils:
++utils: progs lib
+ 	$(MAKE) -C util all
+ 
+ .PHONY: install
+https://bugs.gentoo.org/912148
+https://bugs.gentoo.org/880819
+False dependency, if we put flake in build graph, make uses default build
+rules, doesn't include library and failure to link occurs.
+diff -ru a/flake/Makefile b/flake/Makefile
+--- a/flake/Makefile	2025-01-09 11:57:17.279914146 +0400
++++ b/flake/Makefile	2025-01-09 11:59:25.559155784 +0400
+@@ -21,6 +21,6 @@
+ 
+-all: $(PROGS_G) $(PROGS)
++all: $(PROGS_G)
+ 
+ flake_g$(EXESUF): flake.o wav.o $(DEP_LIBS)
+ 	$(CC) $(FLAKE_LIBDIRS) $(LDFLAGS) -o $@ flake.o wav.o $(FLAKE_LIBS) $(EXTRALIBS)
+ 	cp -p flake_g$(EXESUF) flake$(EXESUF)
+Clean up implicit declaration in configure and prepare for C23
+diff -ru a/configure b/configure
+@@ -666,6 +667,7 @@
+ # test for strnlen in string.h
+ check_exec <<EOF && have_strnlen=yes || have_strnlen=no
+ #define _ISOC9X_SOURCE  1
++#define _GNU_SOURCE  1
++#include <strings.h>
+ #include <string.h>
+ int main( void ) { return (strnlen("help", 6) == 4)?0:1; }
+ EOF
+diff -ru a/common.h b/common.h
+--- a/common.h	2025-01-09 16:06:00.978525674 +0400
++++ b//common.h	2025-01-09 16:07:06.592168373 +0400
+@@ -87,7 +87,8 @@
+     return i;
+ }
+ #elif !defined(__USE_GNU)
+-extern size_t strnlen(const char *s, size_t maxlen);
++#include <strings.h>
++//extern size_t strnlen(const char *s, size_t maxlen);
+ #endif
+ 
+ #endif /* COMMON_H */
diff --git a/media-sound/flake/flake-0.11-r1.ebuild b/media-sound/flake/flake-0.11-r1.ebuild
new file mode 100644
index 000000000000..25a2b34a6e6f
--- /dev/null
+++ b/media-sound/flake/flake-0.11-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="An alternative to the FLAC reference encoder"
+HOMEPAGE="https://flake-enc.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/flake-enc/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+PATCHES=("${FILESDIR}"/${P}-make-instability.patch)
+
+src_configure() {
+	# NIH configure script that uses hardcoded cc for discovery
+	# https://bugs.gentoo.org/947767
+	sed -i -e "s:cc=\"gcc\":cc=\"$(tc-getCC)\":" configure \
+	|| die failed to patch CC
+
+	./configure \
+		--ar="$(tc-getAR)" \
+		--cc="$(tc-getCC)" \
+		--ranlib="$(tc-getRANLIB)" \
+		--prefix="${EPREFIX}"/usr \
+		--disable-opts \
+		--disable-debug \
+		--disable-strip || die "configure failed"
+}
+
+src_install() {
+	dobin flake/flake
+	doheader libflake/flake.h
+	dolib.a libflake/libflake.a
+	dodoc Changelog README
+}
diff --git a/media-sound/flake/flake-0.11.ebuild b/media-sound/flake/flake-0.11.ebuild
deleted file mode 100644
index 177b54723d9a..000000000000
--- a/media-sound/flake/flake-0.11.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="An alternative to the FLAC reference encoder"
-HOMEPAGE="http://flake-enc.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/flake-enc/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_configure() {
-	# NIH configure script
-	./configure \
-		--ar="$(tc-getAR)" \
-		--cc="$(tc-getCC)" \
-		--ranlib="$(tc-getRANLIB)" \
-		--prefix="${ED}"/usr \
-		--disable-opts \
-		--disable-debug \
-		--disable-strip || die "configure failed"
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	dobin flake/flake
-	doheader libflake/flake.h
-	dolib.a libflake/libflake.a
-	dodoc Changelog README
-}
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index ce1ea70a9880..cb732a7b75e4 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,3 +1 @@
-DIST fluidsynth-2.4.0.tar.gz 1780676 BLAKE2B 9814d8ac133ab18650b7f3b6ef0cdec6da76a59ef2dd2af9471311e7e7850604376d3d135e13c5b6e01a93d70bd5f266ad9df2a270cd9f3482738bb3d8f81747 SHA512 57770597e26140011324cac14dd81aa1f5fc52ec0c256a4e16f629b81b8d477279ad714cc9d1e375d74aabb348e1436eafd06746cdf10fa29196468645bf7600
-DIST fluidsynth-2.4.1.tar.gz 3298564 BLAKE2B 15ed3a808d0c0123226a087520564c2833d43c20fd8b6aa273a7467a74d92b8a67159fc960ad2f3a5d764b8e95ec25c1ec045c203058ceb83bfc276408d96b58 SHA512 d01d18c42ce98d0daa4e137118fc41f0a59047013870c09bacd9014baadf747e8e73571046781e34bc03eef454f2ef12ee59cf9b2c7f9517c586c08041ebe081
 DIST fluidsynth-2.4.2.tar.gz 1785003 BLAKE2B d514e595b6e902dc54ef94575701c8aa0b6b1d84d92f57874b163319076cb85c38b7c97bce70f66f55f3ef8e791608e7e29add6cb92c768e4f6ba2a4a89a1481 SHA512 8c43e4e86f364f42115a51311231d9926325d7e519c2ddd087a9ed421c9a94cc0dfc5cfbfdfffe9401c634cce14c6e442523550114ac887096dde22ab0c63d98
diff --git a/media-sound/fluidsynth/fluidsynth-2.4.0.ebuild b/media-sound/fluidsynth/fluidsynth-2.4.0.ebuild
deleted file mode 100644
index f49a307d340b..000000000000
--- a/media-sound/fluidsynth/fluidsynth-2.4.0.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib systemd toolchain-funcs
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="https://www.fluidsynth.org"
-SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="alsa dbus debug doc ipv6 jack ladspa network oss pipewire portaudio pulseaudio +readline sdl +sndfile systemd threads"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen
-		dev-libs/libxslt
-	)
-"
-DEPEND="
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	alsa? (
-		media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	ladspa? (
-		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
-		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
-	)
-	pipewire? (
-		media-video/pipewire:0=[${MULTILIB_USEDEP}]
-	)
-	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS CONTRIBUTING.md README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
-
-src_prepare() {
-	# https://bugs.gentoo.org/833979#c17
-	sed -i "/CONFIGURE_COMMAND/{n;s/$/ -DCMAKE_C_COMPILER=$(tc-getBUILD_CC)/}" \
-		src/CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Denable-alsa=$(usex alsa)
-		-Denable-aufile=ON
-		-Denable-dbus=$(usex dbus)
-		-Denable-dsound=OFF # Windows
-		-Denable-floats=OFF # loat instead of double for DSP samples
-		-Denable-fpe-check=$(usex debug)
-		-Denable-ipv6=$(usex ipv6)
-		-Denable-jack=$(usex jack)
-		-Denable-ladspa=$(usex ladspa)
-		-Denable-libinstpatch=OFF # https://github.com/swami/libinstpatch
-		-Denable-midishare=OFF # http://midishare.sourceforge.net/
-		-Denable-network=$(usex network)
-		-Denable-opensles=OFF
-		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
-		-Denable-oss=$(usex oss)
-		-Denable-libsndfile=$(usex sndfile)
-		-Denable-portaudio=$(usex portaudio)
-		-Denable-profiling=$(usex debug)
-		-Denable-pulseaudio=$(usex pulseaudio)
-		-Denable-pipewire=$(usex pipewire)
-		-Denable-readline=$(usex readline)
-		-Denable-sdl2=$(usex sdl)
-		-Denable-systemd=$(usex systemd)
-		-Denable-threads=$(usex threads)
-		-Denable-trap-on-fpe=$(usex debug)
-		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
-		-Denable-waveout=OFF # Windows
-		-Denable-winmidi=OFF # Windows
-		$(cmake_use_find_package doc Doxygen)
-	)
-
-	if use systemd; then
-		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-compile_doxygen_doc() {
-	multilib_is_native_abi && cmake_build doxygen
-}
-
-src_compile() {
-	cmake-multilib_src_compile
-	use doc && multilib_foreach_abi compile_doxygen_doc
-}
-
-install_doxygen_doc() {
-	if multilib_is_native_abi; then
-		docinto .
-		dodoc -r "${BUILD_DIR}/doc/api/html"
-	fi
-}
-
-install_systemd_files() {
-	if multilib_is_native_abi; then
-		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
-		insinto /etc
-		doins "${BUILD_DIR}/fluidsynth.conf"
-	fi
-}
-
-multilib_src_test() {
-	eninja check
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	docinto examples
-	dodoc doc/examples/*.c
-
-	if use doc; then
-		multilib_foreach_abi install_doxygen_doc
-	fi
-	if use systemd; then
-		multilib_foreach_abi install_systemd_files
-
-		elog "When using fluidsynth as a systemd service, make sure"
-		elog "to configure your fluidsynth settings globally in "
-		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
-	fi
-}
diff --git a/media-sound/fluidsynth/fluidsynth-2.4.1.ebuild b/media-sound/fluidsynth/fluidsynth-2.4.1.ebuild
deleted file mode 100644
index b89d1a35137f..000000000000
--- a/media-sound/fluidsynth/fluidsynth-2.4.1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib systemd toolchain-funcs
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="https://www.fluidsynth.org"
-SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="alsa dbus debug doc ipv6 jack ladspa network oss pipewire portaudio pulseaudio +readline sdl +sndfile systemd threads"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen
-		dev-libs/libxslt
-	)
-"
-DEPEND="
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	alsa? (
-		media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	ladspa? (
-		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
-		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
-	)
-	pipewire? (
-		media-video/pipewire:0=[${MULTILIB_USEDEP}]
-	)
-	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS CONTRIBUTING.md README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
-
-src_prepare() {
-	# https://bugs.gentoo.org/833979#c17
-	sed -i "/CONFIGURE_COMMAND/{n;s/$/ -DCMAKE_C_COMPILER=$(tc-getBUILD_CC)/}" \
-		src/CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Denable-alsa=$(usex alsa)
-		-Denable-aufile=ON
-		-Denable-dbus=$(usex dbus)
-		-Denable-dsound=OFF # Windows
-		-Denable-floats=OFF # loat instead of double for DSP samples
-		-Denable-fpe-check=$(usex debug)
-		-Denable-ipv6=$(usex ipv6)
-		-Denable-jack=$(usex jack)
-		-Denable-ladspa=$(usex ladspa)
-		-Denable-libinstpatch=OFF # https://github.com/swami/libinstpatch
-		-Denable-midishare=OFF # http://midishare.sourceforge.net/
-		-Denable-network=$(usex network)
-		-Denable-opensles=OFF
-		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
-		-Denable-oss=$(usex oss)
-		-Denable-libsndfile=$(usex sndfile)
-		-Denable-portaudio=$(usex portaudio)
-		-Denable-profiling=$(usex debug)
-		-Denable-pulseaudio=$(usex pulseaudio)
-		-Denable-pipewire=$(usex pipewire)
-		-Denable-readline=$(usex readline)
-		-Denable-sdl2=$(usex sdl)
-		-Denable-systemd=$(usex systemd)
-		-Denable-threads=$(usex threads)
-		-Denable-trap-on-fpe=$(usex debug)
-		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
-		-Denable-waveout=OFF # Windows
-		-Denable-winmidi=OFF # Windows
-		$(cmake_use_find_package doc Doxygen)
-	)
-
-	if use systemd; then
-		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-compile_doxygen_doc() {
-	multilib_is_native_abi && cmake_build doxygen
-}
-
-src_compile() {
-	cmake-multilib_src_compile
-	use doc && multilib_foreach_abi compile_doxygen_doc
-}
-
-install_doxygen_doc() {
-	if multilib_is_native_abi; then
-		docinto .
-		dodoc -r "${BUILD_DIR}/doc/api/html"
-	fi
-}
-
-install_systemd_files() {
-	if multilib_is_native_abi; then
-		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
-		insinto /etc
-		doins "${BUILD_DIR}/fluidsynth.conf"
-	fi
-}
-
-multilib_src_test() {
-	eninja check
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	docinto examples
-	dodoc doc/examples/*.c
-
-	if use doc; then
-		multilib_foreach_abi install_doxygen_doc
-	fi
-	if use systemd; then
-		multilib_foreach_abi install_systemd_files
-
-		elog "When using fluidsynth as a systemd service, make sure"
-		elog "to configure your fluidsynth settings globally in "
-		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
-	fi
-}
diff --git a/media-sound/fluidsynth/fluidsynth-2.4.2.ebuild b/media-sound/fluidsynth/fluidsynth-2.4.2.ebuild
index e1cbe51ff8bc..0673aa8f45c4 100644
--- a/media-sound/fluidsynth/fluidsynth-2.4.2.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.4.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="alsa dbus debug doc ipv6 jack ladspa network oss pipewire portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 35da8fc2e0b3..ff8848556737 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-music-45.1.tar.xz 1666152 BLAKE2B 27403070735003df5d907fae2675b67f5b907e10e55e2ed3b31e369e146c03a2d7c95371092043862d83968fc45131ddb7643e34634b0a98d686402fdf676118 SHA512 6cc123eda769d524e5c215c7167248b15ac21fd99a1ac385069c8bac8a03652d458460438adec5853daf329f61d70339f5765b938badc862151b655ba64a80cf
-DIST gnome-music-46.0.tar.xz 1667376 BLAKE2B b8eff0b4b1815af7e29b09be066f2415b1c41fb7724564d7724aefc8804b51ed1f26022f3b5d2d4be640980ddb2446f557a6861b57a020ff119aadb1b37e9809 SHA512 f0fc16029c9e7dc2f9824604ac81b5c3d6f4165878f8558e6a1372ae1a6188d9bfc100f658897a37db7f1250d6b3c50154aee75225d3bb333749fa3176751b14
 DIST gnome-music-46.1.tar.xz 1672556 BLAKE2B 64c1103489e67076ab1e4c751a7da72c476a01cff0a5a88f172e18d24aaf9e4ce97b78cf47582098f3021101d94e7ed3fbb97afa515b9dddb8678711a51a3c22 SHA512 e54029cbc08bb6565ae0b44263e5dc25956687b41fa9e6cd3b617adbfb4f46f7296b297ab4febf788b2c31107522a200e8f1ff9ed73e0fee04ec0b2bc3bbe293
+DIST gnome-music-47.1.tar.xz 1673688 BLAKE2B 63b2793a0b38eb57cf71b7b731745724bada55885d09b038de9490abf00b1369527b5f552067bb5ed12c802f8de3905cf460e4d885f88759a3a85d8969e6d015 SHA512 2f5b8e47bdb5c4840c367cde537a93012118bda3848b3098d617079e34bf9bdf161a50f687cd23aacfb4b0d6b64fcdff8d21911765b96aabfc298e492c0db064
diff --git a/media-sound/gnome-music/gnome-music-45.1.ebuild b/media-sound/gnome-music/gnome-music-45.1.ebuild
deleted file mode 100644
index b983b5705323..000000000000
--- a/media-sound/gnome-music/gnome-music-45.1.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
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music https://gitlab.gnome.org/GNOME/gnome-music/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.67.1:2
-	>=net-libs/gnome-online-accounts-3.35.90[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=gui-libs/gtk-4.5.0:4[introspection]
-	>=gui-libs/libadwaita-1.2:1=[introspection]
-	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	net-libs/libsoup:3.0[introspection]
-	app-misc/tracker:3=[introspection(+)]
-	>=x11-libs/pango-1.44:=
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.36.1:3[cairo,${PYTHON_USEDEP}]
-		>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
-	')
-	>=media-libs/grilo-0.3.15-r1:0.3[introspection]
-	>=media-plugins/grilo-plugins-0.3.16:0.3[tracker]
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${DEPEND}
-	|| (
-		app-misc/tracker-miners:3[gstreamer]
-		app-misc/tracker-miners:3[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.3[tracker]
-	x11-misc/xdg-user-dirs
-"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"/usr/bin/gnome-music
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-sound/gnome-music/gnome-music-46.0.ebuild b/media-sound/gnome-music/gnome-music-46.0.ebuild
deleted file mode 100644
index 9ee0df80f6cd..000000000000
--- a/media-sound/gnome-music/gnome-music-46.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{11..12} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://apps.gnome.org/Music/ https://gitlab.gnome.org/GNOME/gnome-music/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/gobject-introspection-1.54:=
-	>=gui-libs/gtk-4.10.0:4[introspection]
-	>=gui-libs/libadwaita-1.5_beta:1=[introspection]
-	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	net-libs/libsoup:3.0[introspection]
-	app-misc/tracker:3=[introspection(+)]
-	>=x11-libs/pango-1.44:=
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.47.0:3[cairo,${PYTHON_USEDEP}]
-		>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
-	')
-	>=media-libs/grilo-0.3.15-r1:0.3[introspection]
-	>=media-plugins/grilo-plugins-0.3.16:0.3[tracker]
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${DEPEND}
-	|| (
-		app-misc/tracker-miners:3[gstreamer]
-		app-misc/tracker-miners:3[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.3[tracker]
-	x11-misc/xdg-user-dirs
-"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"/usr/bin/gnome-music
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-sound/gnome-music/gnome-music-47.1.ebuild b/media-sound/gnome-music/gnome-music-47.1.ebuild
new file mode 100644
index 000000000000..46aaf1591555
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-47.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://apps.gnome.org/Music/ https://gitlab.gnome.org/GNOME/gnome-music/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/gobject-introspection-1.54:=
+	>=gui-libs/gtk-4.10.0:4[introspection]
+	>=gui-libs/libadwaita-1.5_beta:1=[introspection]
+	>=media-libs/libmediaart-1.9.1:2.0[introspection]
+	net-libs/libsoup:3.0[introspection]
+	app-misc/tracker:3=[introspection(+)]
+	>=x11-libs/pango-1.44:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.47.0:3[cairo,${PYTHON_USEDEP}]
+		>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
+	')
+	>=media-libs/grilo-0.3.15-r1:0.3[introspection]
+	>=media-plugins/grilo-plugins-0.3.16:0.3[tracker]
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${DEPEND}
+	|| (
+		app-misc/tracker-miners:3[gstreamer]
+		app-misc/tracker-miners:3[ffmpeg]
+	)
+	x11-libs/libnotify[introspection]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/grilo-plugins:0.3[tracker]
+	x11-misc/xdg-user-dirs
+"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"/usr/bin/gnome-music
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 468e3e1c2e12..d4cea5a4be3d 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,2 +1 @@
-DIST hydrogen-1.2.3.tar.gz 13692726 BLAKE2B 0860b10569506d868e8238196ecefbee080e74af41137d45b49c1032185c320ca3cb637fae71c0b6797d333699434a54919189153069877f10c77446deb2a007 SHA512 0dad3ac25e7c867b3141450faf2affeac2165b7593a2cafb61885434520d1726eaee85d11689be0304bc8a037fbc0737c8130d4ba59bd1ed4e7f1addc56cc25d
 DIST hydrogen-1.2.4.tar.gz 14399993 BLAKE2B ed718e75d7016dae234148d3eafd676127248bbebc2f8bd98db2c6ca52e62e4df282035afba0de0692a5e4c0cceb7a920dab6d3688aec9c3793f448f8db54a7b SHA512 3f1522ac0535aa482c828382965822c6a81e5359bece93cbd7ed5029d8a1e192f187e10c5205274cc0ca5c030e958cfd062650f47fb9188f13a176dface64475
diff --git a/media-sound/hydrogen/files/hydrogen-1.2.2-no-pch-include.patch b/media-sound/hydrogen/files/hydrogen-1.2.2-no-pch-include.patch
deleted file mode 100644
index fd0ee64b76a0..000000000000
--- a/media-sound/hydrogen/files/hydrogen-1.2.2-no-pch-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/922034
---- a/src/gui/src/Widgets/FileDialog.h
-+++ b/src/gui/src/Widgets/FileDialog.h
-@@ -23,6 +23,7 @@
- #define FILEDIALOG_H
- 
- #include <QDialog>
-+#include <QFileDialog>
- #include <core/Object.h>
- 
- /** Custom file dialog checking whether the user has write access to
diff --git a/media-sound/hydrogen/hydrogen-1.2.3.ebuild b/media-sound/hydrogen/hydrogen-1.2.3.ebuild
deleted file mode 100644
index 1983f42e2586..000000000000
--- a/media-sound/hydrogen/hydrogen-1.2.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://hydrogen-music.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
-else
-	MY_PV=${PV/_/-}
-	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-fi
-
-LICENSE="GPL-2 ZLIB"
-SLOT="0"
-IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
-
-REQUIRED_USE="lash? ( alsa )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-CDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	media-libs/libsndfile
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	!archive? ( dev-libs/libtar )
-	doc? ( dev-texlive/texlive-fontutils )
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/liblrdf )
-	lash? ( media-sound/lash )
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-libs/libpulse )
-"
-DEPEND="
-	${CDEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2.3-gnuinstalldirs.patch"
-	"${FILESDIR}/${PN}-1.2.3-cflags.patch"
-	"${FILESDIR}/${PN}-1.2.2-no-pch-include.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_CPPUNIT=OFF
-		-DWANT_DEBUG=OFF
-		-DWANT_JACK=$(usex jack)
-		-DWANT_LADSPA=$(usex ladspa)
-		-DWANT_LASH=$(usex lash)
-		-DWANT_LIBARCHIVE=$(usex archive)
-		-DWANT_LRDF=$(usex ladspa)
-		-DWANT_OSC=$(usex osc)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PORTAUDIO=$(usex portaudio)
-		-DWANT_PORTMIDI=$(usex portmidi)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_RUBBERBAND=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-	cmake_src_install
-}
diff --git a/media-sound/hydrogen/hydrogen-1.2.4.ebuild b/media-sound/hydrogen/hydrogen-1.2.4.ebuild
index 32571f66a996..786069d44e7e 100644
--- a/media-sound/hydrogen/hydrogen-1.2.4.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.4.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 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 	S="${WORKDIR}"/${PN}-${MY_PV}
 fi
 
diff --git a/media-sound/kasts/Manifest b/media-sound/kasts/Manifest
index 238db682e195..912462a1a575 100644
--- a/media-sound/kasts/Manifest
+++ b/media-sound/kasts/Manifest
@@ -1,2 +1,2 @@
 DIST kasts-24.08.3.tar.xz 619032 BLAKE2B a5c6a0fe14ba94fa0f80fe53eca2c51b30d366142f83eeafc5521de923cd06c601fe5fafb929ac671d1f8081f830eb23e70f93e5a421f78b5f112bb96030e7c9 SHA512 b53e8f97508d2cbe846fa263b75192b36f1c3fa23165f3d21bd13c682ac55522e006e00bfb9dc34e8b8d8c216b4607fe5a4094019dd274097f34a0b2ac09f7a8
-DIST kasts-24.12.0.tar.xz 625720 BLAKE2B df01c112e16a70bafb3841a182ca26f496b571e7ce20c394cb635f886327e0fe51c7a35b88fc23d40e79466a65936de39195f87776ffee30ff004b5c80b4b62d SHA512 b28d503174d9d07e690de3c2d8e5db3f47d9098bd7b9e50365034004375b845f96c38a89cbd9977913d1f5c22362ac0b1f141b81a1e9574bad4f40b22a2c14ff
+DIST kasts-24.12.1.tar.xz 626016 BLAKE2B a7e9b80187d81fcecb7b06b478948b07cb9f2630769b4dd4ce03bd0c20c6086737d6c6319e6033bb7c439c817bd49819ad3da3adaf883798d481c00977937445 SHA512 b2366b6a08644eaf198f1a991354a8f46add113233408ad5953dab320d496862db77ea8088d86f555b036f7cd022c4a5f9557f119393cc296bbc8c4f4359771e
diff --git a/media-sound/kasts/kasts-24.12.0.ebuild b/media-sound/kasts/kasts-24.12.0.ebuild
deleted file mode 100644
index 6618440efed5..000000000000
--- a/media-sound/kasts/kasts-24.12.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Convergent podcast application for desktop and mobile"
-HOMEPAGE="https://apps.kde.org/kasts/"
-
-LICENSE="GPL-2 GPL-2+ GPL-3+ BSD LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="gstreamer vlc"
-
-DEPEND="
-	dev-libs/kirigami-addons:6
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtmultimedia-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/breeze-icons-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/syndication-${KFMIN}:6
-	>=kde-frameworks/threadweaver-${KFMIN}:6
-	media-libs/taglib:=
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-good:1.0
-	)
-	vlc? ( media-video/vlc:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="gstreamer? ( virtual/pkgconfig )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLE_PLAYER=OFF
-		-DBUILD_GSTREAMER_BACKEND=$(usex gstreamer)
-		$(cmake_use_find_package vlc LIBVLC)
-	)
-	ecm_src_configure
-}
diff --git a/media-sound/kasts/kasts-24.12.1.ebuild b/media-sound/kasts/kasts-24.12.1.ebuild
new file mode 100644
index 000000000000..12a1db6a4627
--- /dev/null
+++ b/media-sound/kasts/kasts-24.12.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Convergent podcast application for desktop and mobile"
+HOMEPAGE="https://apps.kde.org/kasts/"
+
+LICENSE="GPL-2 GPL-2+ GPL-3+ BSD LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gstreamer vlc"
+
+DEPEND="
+	dev-libs/kirigami-addons:6
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/breeze-icons-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/syndication-${KFMIN}:6
+	>=kde-frameworks/threadweaver-${KFMIN}:6
+	media-libs/taglib:=
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-good:1.0
+	)
+	vlc? ( media-video/vlc:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="gstreamer? ( virtual/pkgconfig )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLE_PLAYER=OFF
+		-DBUILD_GSTREAMER_BACKEND=$(usex gstreamer)
+		$(cmake_use_find_package vlc LIBVLC)
+	)
+	ecm_src_configure
+}
diff --git a/media-sound/kmetronome/Manifest b/media-sound/kmetronome/Manifest
index 37de5a0dd31c..e82de6cb2c4a 100644
--- a/media-sound/kmetronome/Manifest
+++ b/media-sound/kmetronome/Manifest
@@ -1 +1,2 @@
 DIST kmetronome-1.4.0.tar.bz2 226942 BLAKE2B e8a5c7d0f2458b58d6329a72af622522004853af1fccdf73eedf5161d1f9ea72ee1ff40276b6626fcc0d56b737f2176d857646eda284947a63647cee968b79d0 SHA512 e101d3558064c67937995640f355abfa16e6e8790ac2566cfdd872fbea87df8cfce8430e8976f2ee6c23f0a9e2b66324b2b49c24c41d54c83cc7b51fce557461
+DIST kmetronome-1.4.1.tar.bz2 227015 BLAKE2B db0b96b2937b406aee228d96a7dc42a65e1e3beecd96a15d73ab118f2172c1b7fe8192eb2fdf417303b63833254d0141861c2d4c3e7d964f35824b965df87aea SHA512 2f35f3dda3deb6e77b68a015c7145f44500c4bdc20a5b7fc256569034cff8048df236ee38ccfb77203162491bb051152f84c5a6fa75fbbb7ef6bde4d9860af35
diff --git a/media-sound/kmetronome/kmetronome-1.4.1.ebuild b/media-sound/kmetronome/kmetronome-1.4.1.ebuild
new file mode 100644
index 000000000000..3819c5304f1b
--- /dev/null
+++ b/media-sound/kmetronome/kmetronome-1.4.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="MIDI based metronome using ALSA sequencer"
+HOMEPAGE="https://kmetronome.sourceforge.io/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtbase:6[dbus,gui,widgets]
+	dev-qt/qtsvg:6
+	media-libs/alsa-lib
+	>=media-sound/drumstick-2.10.0[alsa]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCS=OFF
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/kmidimon/Manifest b/media-sound/kmidimon/Manifest
index f976eed6614f..244c13f10fc3 100644
--- a/media-sound/kmidimon/Manifest
+++ b/media-sound/kmidimon/Manifest
@@ -1 +1,2 @@
 DIST kmidimon-1.4.0.tar.bz2 309675 BLAKE2B 83a466b63256d082e257af797c501cd4a405409a31c20f26bd38cb7afbfe84566550589feceb201563572352b9ae90f20e255d6c75e21340bd43316ea392e5a2 SHA512 83f3ff86b02d91bd20c81c4dc8dc036b3c8483c246c65b1dc4fe2d084f98c792cf1e9dcaad3b0984f0f294bc0b7f4d6d090bd44b88efa3738fc9ada63cf613ba
+DIST kmidimon-1.4.1.tar.bz2 316984 BLAKE2B 78ea3a157cf640ab9de74e2b4cd57d1f2f0148e0017475eb7affc7dfda004681fd5dbc673bfdce9d2e885554b8918ba89a210f215dcdc293224c6af3907b81fa SHA512 458c9081ba35908f4b3d408b77516112732ec4ad13fb42e3a150d15571b4f5663e539c1cb5ed2c92c22d764dcd75b4f1af0e5bf2b487e50ddc5d9d661234bb96
diff --git a/media-sound/kmidimon/kmidimon-1.4.1.ebuild b/media-sound/kmidimon/kmidimon-1.4.1.ebuild
new file mode 100644
index 000000000000..c9c91cd6c067
--- /dev/null
+++ b/media-sound/kmidimon/kmidimon-1.4.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="MIDI monitor for ALSA sequencer"
+HOMEPAGE="https://kmidimon.sourceforge.io/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-qt/qt5compat:6
+	dev-qt/qtbase:6[gui,widgets]
+	media-libs/alsa-lib
+	>=media-sound/drumstick-2.10.0[alsa]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	dev-qt/qttools:6[linguist]
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.2.0-fix-cmake-pathvar.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCS=OFF
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/krecorder/Manifest b/media-sound/krecorder/Manifest
index 986d3497cb7f..8c7211e0f867 100644
--- a/media-sound/krecorder/Manifest
+++ b/media-sound/krecorder/Manifest
@@ -1,2 +1,2 @@
 DIST krecorder-24.08.3.tar.xz 168280 BLAKE2B 8f17304e9528657be24934ed23d1d7115607454f819f0201b1bc0bc2e840dbce7d8e26981ce0c57977aae6f16665a6e4981d2033640f607b6b49a0aa66cbcac9 SHA512 4697ae0708206a02ef63e023590a5200add598be57306b8c3b0d8d29d5eef7d9cf3ca2bce425de323059b44ee583934312ec05fb9864d6288591822718326dc2
-DIST krecorder-24.12.0.tar.xz 168860 BLAKE2B e99b9910209c99af719d75a7668d192fd9285e317af823ca207c9a3f50b727ebfe4a0658ba71c0e8261eecb5af4aa54f38470927777b79938c1ddd1ce48393ea SHA512 12fed2d6853f5372c127b9e3284125d178353129cadfb7113b60cc2d17de20b5187a5fad83c5890e548e68ae136edb27e581b5bda4c9eefbec7e3e854f436a49
+DIST krecorder-24.12.1.tar.xz 168876 BLAKE2B 15a441a9f06f79d76d2c742598999a60a83d29d83570f0576f0a07917526fbd397ff8d266b2f7eef55f5c49a250338b5de479c4e83bce2747a813f504d6024f9 SHA512 925a397d3c821e4f6c53010beeaedc2d263122b213f70bc4405e190f7b75bf65bfe5b9ce242e6b425420f9188a0e19c751ab244b4ae9a48384767bb5e34f4c46
diff --git a/media-sound/krecorder/krecorder-24.12.0.ebuild b/media-sound/krecorder/krecorder-24.12.0.ebuild
deleted file mode 100644
index 01e69af0a849..000000000000
--- a/media-sound/krecorder/krecorder-24.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="utilities"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Convergent audio recording application for Plasma"
-HOMEPAGE="https://apps.kde.org/krecorder/"
-
-LICENSE="CC0-1.0 CC-BY-4.0 GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	dev-libs/kirigami-addons:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-"
-BDEPEND=">=kde-frameworks/ki18n-${KFMIN}:6"
diff --git a/media-sound/krecorder/krecorder-24.12.1.ebuild b/media-sound/krecorder/krecorder-24.12.1.ebuild
new file mode 100644
index 000000000000..f66ea364c59a
--- /dev/null
+++ b/media-sound/krecorder/krecorder-24.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="utilities"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Convergent audio recording application for Plasma"
+HOMEPAGE="https://apps.kde.org/krecorder/"
+
+LICENSE="CC0-1.0 CC-BY-4.0 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	dev-libs/kirigami-addons:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+"
+BDEPEND=">=kde-frameworks/ki18n-${KFMIN}:6"
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index 150f92d1a1e0..3fefeffc19bf 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -1,3 +1,3 @@
-DIST mac-10.76.zip 1674982 BLAKE2B 8e32b6804df1c7f551100a5e05458cf0e88c48cf5d81875cd585780102b600738b7599a0400dc4a5387089e543d0a2cc66999f64274232f45e42addde5870a48 SHA512 1bcd6c41856166f4e0d2b7305aad66255a75f42fbbac902706dd236a619725abb9ffc6634274142c7969f9b344d2ebcf3bb963ca7d6943f4ede6151d77518e55
 DIST mac-10.82.zip 1675437 BLAKE2B 1915a8154873d972998f11b0f6b233150ede890bbe82b124f9e5c90caad716971c63069724fe5b38fd410c1f2e6a8e96156ed608b3a00839b6741a94c59a95b8 SHA512 9d29b52112a6511dda04bd49d365bd564cba63923abe4bfa72d5af292e01ce3fe330ad71833113692e7e675d44a4bc8edd43e8eab4aeb4c3178debbdb2750a88
+DIST mac-10.87.zip 1673921 BLAKE2B 4a4d1946bcb33f742b75f1ad1d21170309ff82016eaa82104035d544c6916b5a0fb8ceff827bafb782aaea07d77c83b94c080426e5ed458e3e9d53f46a584354 SHA512 2e0ef696302d8a066e57a47df9578a922fa07f0b8a916d0bb041b4f558e4824e0cc4d2c3fa5bda2ecf22c5380780301f03af1cb4b01ba5b525b6c2616f9a0197
 DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 BLAKE2B 28b5a3aadd9dae410c93cfc43c40c07fe207036f27cf60d59d8fa137a0327f90a78746c14930b7d3becb7f5fa69a454a6855aae1553dc74cd5168a9a523bb8f0 SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0
diff --git a/media-sound/mac/mac-10.76.ebuild b/media-sound/mac/mac-10.76.ebuild
deleted file mode 100644
index abc593097c30..000000000000
--- a/media-sound/mac/mac-10.76.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE=Release
-inherit cmake
-
-DESCRIPTION="Monkey's Audio Codecs"
-HOMEPAGE="https://www.monkeysaudio.com"
-SRC_URI="https://monkeysaudio.com/files/MAC_${PV/.}_SDK.zip -> ${P}.zip"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="~alpha amd64 ~loong ppc ppc64 ~riscv sparc x86"
-
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-10.18-linux.patch"
-	"${FILESDIR}/${PN}-10.52-output.patch"
-)
-
-src_unpack() {
-	mkdir -p "${S}" || die
-	cd "${S}" || die
-	default
-}
diff --git a/media-sound/mac/mac-10.87.ebuild b/media-sound/mac/mac-10.87.ebuild
new file mode 100644
index 000000000000..5f6629969376
--- /dev/null
+++ b/media-sound/mac/mac-10.87.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE=Release
+inherit cmake
+
+DESCRIPTION="Monkey's Audio Codecs"
+HOMEPAGE="https://www.monkeysaudio.com"
+SRC_URI="https://monkeysaudio.com/files/MAC_${PV/.}_SDK.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0/11"
+KEYWORDS="~alpha ~amd64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-10.18-linux.patch"
+	"${FILESDIR}/${PN}-10.52-output.patch"
+)
+
+src_unpack() {
+	mkdir -p "${S}" || die
+	cd "${S}" || die
+	default
+}
diff --git a/media-sound/mp3c/files/mp3c-c23.patch b/media-sound/mp3c/files/mp3c-c23.patch
new file mode 100644
index 000000000000..14c2de0f16b0
--- /dev/null
+++ b/media-sound/mp3c/files/mp3c-c23.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/899854
+also, feature-macro'd glibc functions
+--- a/configure.ac	2025-01-05 00:30:25.475280699 +0400
++++ b/configure.ac	2025-01-05 00:30:38.800207692 +0400
+@@ -6,7 +6,8 @@
+ 
+ AM_INIT_AUTOMAKE
++AC_USE_SYSTEM_EXTENSIONS
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION
++AM_GNU_GETTEXT_VERSION(0.21)
+ AM_ICONV
+ 
+ AC_PROG_CC
+Bad definition, fails with C23
+https://bugs.gentoo.org/945206
+--- a/src/keys.c	2025-01-05 00:39:12.053395586 +0400
++++ b/src/keys.c	2025-01-05 00:39:42.420229207 +0400
+@@ -76,7 +76,7 @@
+ extern int build_data_tree(char *cddb_server, char *local_cddb_db,
+ 			   song_typ **ret_tree, BOOL force_sampler);
+ extern int cddb_internet_lookup (char *addr, char *cddb_path, BOOL force);
+-extern void option_menu();
++extern void option_menu(WINDOW *win);
+ extern int output_batch(song_typ *anchor, char *filenm, BOOL ask_overwrite);
+ extern void calc_tot_frm();
+ extern int add_to_m3u(song_typ *song);
diff --git a/media-sound/mp3c/mp3c-0.31-r2.ebuild b/media-sound/mp3c/mp3c-0.31-r2.ebuild
new file mode 100644
index 000000000000..8de1f7276435
--- /dev/null
+++ b/media-sound/mp3c/mp3c-0.31-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs autotools
+
+DESCRIPTION="console based mp3 ripper, with cddb support"
+HOMEPAGE="http://wspse.de/WSPse/Linux-MP3c.php3"
+SRC_URI="ftp://ftp.wspse.de/pub/linux/wspse/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="mp3 vorbis"
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="
+	${DEPEND}
+	app-cdr/cdrtools
+	mp3? (
+		media-sound/lame
+		media-sound/mp3info
+	)
+	vorbis? ( media-sound/vorbis-tools )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-buffer.patch
+	"${FILESDIR}"/${PN}-c23.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
+	econf $(use_enable vorbis oggdefaults)
+}
+
+src_install() {
+	default
+	dodoc BATCH.README CDDB_HOWTO OTHERS
+}
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 0accc3634bf6..c53399afb32a 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1 +1,3 @@
+DIST mpd-0.23.15.16-fix-libfmt-11.1.0.patch.xz 7260 BLAKE2B 4321f48f8bf21011a1919517969ce7de6eaa5d6c051654ec96e57d01fe48f38341d7ecb206aec314bd33288b2a6a299d594328fa136b04547d6d0cb48de85f25 SHA512 a52443039a9f60c10d19e85ef1b4c8a762d6c6f135257d9a2c8f01c936f4007dd096e4bec354ffb756519794960f57d5b2a7882c8e9296d6e2f07f99e4267d20
 DIST mpd-0.23.15.tar.xz 778384 BLAKE2B 78036078b850afab900b5d50e44ce83cbbf900369f5028d4177fdbfc4128dd3c35c59a773528a1fcfcc0179d0e579566b827fe87ef780a88082dc3b7f70cd5e7 SHA512 12329dbd0c1994c1bd95b88ce2a62a4c1d691b655e9e4fac7e9ef7066d0be3422b26fad3ea6ca144ba9b21add0a7c492c4f74fd2b68a1539bff2e0d2714db709
+DIST mpd-0.23.16.tar.xz 778572 BLAKE2B 7e4e7dafdc60cac59b7b47898cdaf8332970dae9209f8dd408aee7f4ecf90909404ab12a263d06aae44124d795d0d1092425294034fc0728fc9b4ac973a75dd0 SHA512 1b7042cbe8543270b26c1a9e4f35d80d68e03682e4d1e039af8f52527753830972de2a763e5dfb7bde28f4c9d0308a397becd4a206d17e7a5b2fa97f48b69d20
diff --git a/media-sound/mpd/mpd-0.23.16.ebuild b/media-sound/mpd/mpd-0.23.16.ebuild
new file mode 100644
index 000000000000..4946911eee31
--- /dev/null
+++ b/media-sound/mpd/mpd-0.23.16.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info meson systemd xdg
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/mpd-0.23.15.16-fix-libfmt-11.1.0.patch.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +io-uring
+	jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz
+	recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd
+	test twolame udisks vorbis wavpack webdav wildmidi upnp
+	yajl zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder"
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	qobuz? ( curl soundcloud )
+	snapcast? ( yajl )
+	soundcloud? ( curl qobuz yajl )
+	udisks? ( dbus )
+	upnp? ( curl expat )
+	webdav? ( curl expat )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/mpd
+	dev-libs/libfmt:=
+	dev-libs/libpcre2:=
+	media-libs/libogg
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+	bzip2? ( app-arch/bzip2 )
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia:=
+	)
+	chromaprint? ( media-libs/chromaprint:= )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	doc? ( dev-python/sphinx )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac:= )
+	fluidsynth? ( media-sound/fluidsynth:= )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (
+		>=dev-libs/icu-50:=
+		virtual/libiconv
+	)
+	id3tag? ( media-libs/libid3tag:= )
+	io-uring? ( sys-libs/liburing:= )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123-base )
+	musepack? ( media-sound/musepack-tools )
+	network? ( >=media-libs/libshout-2.4.0 )
+	nfs? ( net-fs/libnfs:= )
+	openal? ( media-libs/openal )
+	openmpt? ( media-libs/libopenmpt )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-libs/libpulse )
+	pipewire? ( media-video/pipewire:= )
+	qobuz? (
+		|| (
+			dev-libs/libgcrypt
+			media-video/ffmpeg
+		)
+	)
+	samba? ( net-fs/samba:= )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	snapcast? ( media-sound/snapcast )
+	sndfile? ( media-libs/libsndfile )
+	sndio? ( media-sound/sndio:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd:= )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:= )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	yajl? ( >=dev-libs/yajl-2:= )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib:= )
+	zlib? ( sys-libs/zlib:= )
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost:=
+	test? ( dev-cpp/gtest )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${WORKDIR}"/mpd-0.23.15.16-fix-libfmt-11.1.0.patch
+)
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use io-uring; then
+		CONFIG_CHECK+=" ~IO_URING"
+		ERROR_IO_URING="${P} requires io-uring in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify || use io-uring; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
+		$(meson_feature alsa)
+		$(meson_feature ao)
+		$(meson_feature audiofile)
+		$(meson_feature bzip2)
+		$(meson_feature cdio cdio_paranoia)
+		$(meson_feature chromaprint)
+		$(meson_use cue)
+		$(meson_feature curl)
+		$(meson_feature dbus)
+		$(meson_use eventfd)
+		$(meson_feature expat)
+		$(meson_feature faad)
+		$(meson_feature ffmpeg)
+		$(meson_use fifo)
+		$(meson_feature flac)
+		$(meson_feature fluidsynth)
+		$(meson_feature gme)
+		$(meson_feature icu)
+		$(meson_feature id3tag)
+		$(meson_use inotify)
+		-Dipv6=enabled
+		$(meson_feature cdio iso9660)
+		$(meson_feature io-uring io_uring)
+		$(meson_feature jack)
+		$(meson_feature libmpdclient)
+		$(meson_feature libsamplerate)
+		$(meson_feature mad)
+		$(meson_feature mikmod)
+		$(meson_feature mms)
+		$(meson_feature modplug)
+		$(meson_feature musepack mpcdec)
+		$(meson_feature mpg123)
+		$(meson_feature nfs)
+		$(meson_feature openal)
+		$(meson_feature openmpt)
+		$(meson_feature opus)
+		$(meson_feature oss)
+		$(meson_use pipe)
+		$(meson_feature pipewire)
+		$(meson_feature pulseaudio pulse)
+		$(meson_feature qobuz)
+		$(meson_use recorder)
+		$(meson_use signalfd)
+		$(meson_feature samba smbclient)
+		$(meson_use snapcast)
+		$(meson_feature sid sidplay)
+		$(meson_feature sndfile)
+		$(meson_feature sndio)
+		$(meson_feature soundcloud)
+		$(meson_feature libsoxr soxr)
+		$(meson_feature sqlite)
+		$(meson_feature systemd)
+		$(meson_use test)
+		$(meson_feature udisks)
+		-Dupnp=$(usex upnp pupnp disabled)
+		$(meson_feature vorbis)
+		$(meson_feature wavpack)
+		$(meson_feature wildmidi)
+		$(meson_feature webdav)
+		$(meson_feature yajl)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		$(meson_feature zlib)
+		$(meson_feature zip zzip)
+
+		--libdir="/usr/$(get_libdir)"
+		$(meson_feature doc documentation)
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddaemon=true
+		-Ddsd=true
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+
+		$(meson_feature icu iconv)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+		emesonargs+=(
+			-Dshine=disabled
+			-Dshout=enabled
+			$(meson_feature vorbis vorbisenc)
+			-Dhttpd=true
+			$(meson_feature lame)
+			$(meson_feature twolame)
+			$(meson_use audiofile wave_encoder)
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	# When running MPD as system service, better switch to the user we provide
+	sed -i \
+		-e 's:^#user.*$:user "mpd":' \
+		-e 's:^#group.*$:group "audio":' \
+		"${ED}/etc/mpd.conf" || die
+
+	if ! use systemd; then
+		# Extra options for running MPD under OpenRC
+		# (options that should not be set when using systemd)
+		sed -i \
+			-e 's:^#log_file.*$:log_file "/var/log/mpd/mpd.log":' \
+			-e 's:^#pid_file.*$:pid_file "/run/mpd/mpd.pid":' \
+			"${ED}/etc/mpd.conf" || die
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-0.23.15.logrotate" "${PN}"
+
+	newinitd "${FILESDIR}/${PN}-0.23.15.init-r1" "${PN}"
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+	keepdir /var/log/mpd
+
+	rm -r "${ED}"/usr/share/doc/mpd || die
+
+	fowners mpd:audio -R /var/lib/mpd
+	fowners mpd:audio -R /var/log/mpd
+}
diff --git a/media-sound/mpg123-base/Manifest b/media-sound/mpg123-base/Manifest
index 4327db810573..d35d39ffe8cb 100644
--- a/media-sound/mpg123-base/Manifest
+++ b/media-sound/mpg123-base/Manifest
@@ -1,2 +1 @@
-DIST mpg123-1.32.3.tar.bz2 1111054 BLAKE2B 67f889403c2bb639d675ec5ebea5a19c4b7174971d62bdd8d940ad659e6b0c06dada38422fc9d71b878917aa89e305ec48c8faa78d65d507cd6a0c9a79951359 SHA512 946c1073b6eebfd65333ec543df1caeea25864479e9c8e153fb53d8b636cc756d8d81947f7b5cbedbbfb1ea664d3fb27562ed36e7726d95e80591bd2ad622afc
 DIST mpg123-1.32.9.tar.bz2 1118388 BLAKE2B 370012300ca6cd26daf48cc067692e94c2c37c7549f6581d64e8f7cc9f08c720518ed6aaa10b3c2194ce2ae85afa5564a65dcf7129c6789f90d24be395ff1397 SHA512 dccb640b0845061811cb41bf145587e7093556d686d49a748232b079659b46284b6cc40db42d14febceac11277c58edf2b69d1b4c46c223829a3d15478e2e26c
diff --git a/media-sound/mpg123-base/mpg123-base-1.32.3.ebuild b/media-sound/mpg123-base/mpg123-base-1.32.3.ebuild
deleted file mode 100644
index ffb8dd7f6853..000000000000
--- a/media-sound/mpg123-base/mpg123-base-1.32.3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="mpg123"
-MY_P="${MY_PN}-${PV}"
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="https://downloads.sourceforge.net/${MY_PN}/${MY_P}.tar.bz2"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-# Note: build system prefers libsdl2 > libsdl. We could in theory add both
-# but it's tricky when it comes to handling switching between them properly.
-# We'd need a USE flag for both sdl1 and sdl2 and to make them clash.
-RDEPEND="
-	!<media-sound/mpg123-1.32.3-r100
-	!media-libs/libmpg123
-	dev-libs/libltdl:0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-build/libtool
-	virtual/pkgconfig
-"
-IDEPEND="app-eselect/eselect-mpg123"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-src_prepare() {
-	default
-	elibtoolize # for Darwin bundles
-
-	# Rerun autotools with patched configure.ac
-	#eautoreconf
-}
-
-multilib_src_configure() {
-	local _audio=
-	local _cpu=generic_fpu
-
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: �struct hostent’ has no member named �h_addr’
-	append-cflags -D_GNU_SOURCE
-
-	append-lfs-flags
-
-	if $(multilib_is_native_abi) ; then
-		local flag
-		for flag in coreaudio pulseaudio jack alsa oss sdl portaudio nas ; do
-			if use ${flag}; then
-				_audio+=" ${flag/pulseaudio/pulse}"
-			fi
-		done
-	fi
-
-	use cpu_flags_ppc_altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext
-		# bug #164504
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=(
-		--with-optimization=0
-		--with-audio=dummy
-		--with-default-audio="${_audio} dummy"
-		--with-cpu=${_cpu}
-		--enable-network
-		$(use_enable ipv6)
-		--enable-int-quality=$(usex int-quality)
-	)
-
-	multilib_is_native_abi || myconf+=( --disable-modules )
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! $(multilib_is_native_abi) ; then
-		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123} || die
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
-	eselect mpg123 update ifunset
-}
diff --git a/media-sound/mpg123-base/mpg123-base-1.32.9.ebuild b/media-sound/mpg123-base/mpg123-base-1.32.9.ebuild
index 2f1267b7dc35..03f35ac6b43c 100644
--- a/media-sound/mpg123-base/mpg123-base-1.32.9.ebuild
+++ b/media-sound/mpg123-base/mpg123-base-1.32.9.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}/${MY_P}"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index f431e400c378..a24e97eb7593 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,5 +1,2 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
-DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
-DIST musescore-4.3.2.tar.gz 138083648 BLAKE2B 02c1fe9de387fd7783ecb26643f76694d7b4c29541318799c9c35f0f222d7a89ccd3164ec6109bb265245d836a2eb73f29ef687bebc2fb189eacf30c7e5ca970 SHA512 9cffbc25c748970980ec6013c4489178b143ec9ac78fbfcb995b1fbc02512cb6ff3ce912224ded9b526811c6b86a1810307c888e354d9ef09febdffa525f94c5
-DIST musescore-4.4.3.tar.gz 143462048 BLAKE2B 98a0a685093dc4f21d263308663ce263f11d9ce3dcf92038f266afebd19f2d9aa125d831aaa5fb805c0eeeca26a869b589c304b1c6004b7adb537ddff263d4e6 SHA512 0eb7e8eaed3397f826449312dfedeceab86c102c83969c8d5e88ccfa08daf27fceff092ad1a96274fcaf815d15d6c4a416940506b6eddb0ade25e1f53119d719
 DIST musescore-4.4.4.tar.gz 143607247 BLAKE2B 934b95d51bb667be57101ebc7528dbb04cbb9a10501da7e8a5aea11e34fd45817b55072a1094bf1731aab4a9b1765a8582fa997502c1f1ca90097d492e120bfa SHA512 1e1d3f9018cb5f30e2e76a98673c03097ae3d0982e14a25df3b3b8a8f5d191968c470ba548e05afb6c5fbc6dce8b4c8a3112b99a70341fb285ced257d5df0ee8
diff --git a/media-sound/musescore/files/musescore-3.0.1-man-pages.patch b/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
deleted file mode 100644
index a9e871f12d77..000000000000
--- a/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -660,7 +660,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE)
-     # Compress man pages if gzip is installed (don't on OpenBSD)
-     # Note: Compressing man pages is normal on Linux but not OpenBSD
-     find_program( GZIP_EXECUTABLE gzip DOC "A tool for compressing manpages (optional)." )
--    if (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+    if (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
-         message(STATUS "Found 'gzip'. Man pages will be compressed.")
-         set(MAN_TARGET ${MAN_BUILD})
-         set(MAN_EXTENSION ${MAN_EXTENSION}.gz)
-@@ -677,7 +677,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE)
-             COMMAND echo "Man pages have been compressed ready for installation."
-             VERBATIM
-             )
--    else (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+    else (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
-         if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-             message(STATUS "System is OpenBSD: Man pages will not be compressed.")
-         else (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-@@ -687,7 +687,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE)
-             COMMAND echo "Man pages will be installed uncompressed."
-             VERBATIM
-             )
--    endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+    endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
-     # Install man pages in either compressed or uncompressed form
-     install( FILES ${MAN_BUILD} DESTINATION share/man/man1 COMPONENT doc)
-     # Create symlink alias for man pages so `man musescore` = `man mscore`
diff --git a/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch b/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch
deleted file mode 100644
index caf9ae67ec70..000000000000
--- a/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix misnamed variable causing build failure with USE=-mp3
-https://bugs.gentoo.org/767760
-Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
---- a/mscore/exportdialog.cpp
-+++ b/mscore/exportdialog.cpp
-@@ -77,5 +77,5 @@
-       // Disable .mp3 option if unavailable
-       QStandardItem* mp3Item = fileTypeComboBoxModel->item(3);
--      mp3Item->setFlags(audioItem->flags() & ~Qt::ItemIsEnabled);
-+      mp3Item->setFlags(mp3Item->flags() & ~Qt::ItemIsEnabled);
- # endif
- # ifndef HAS_AUDIOFILE
diff --git a/media-sound/musescore/files/musescore-4.2.0-uncompressed-man-pages.patch b/media-sound/musescore/files/musescore-4.2.0-uncompressed-man-pages.patch
deleted file mode 100644
index 12bcb0f2f42b..000000000000
--- a/media-sound/musescore/files/musescore-4.2.0-uncompressed-man-pages.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/build/cmake/SetupAppImagePackaging.cmake
-+++ b/build/cmake/SetupAppImagePackaging.cmake
-@@ -99,7 +99,7 @@ configure_file(${MAN_TARGET} ${MAN_BUILD})
- # Note: Compressing man pages is normal on Linux but not OpenBSD
- find_program(GZIP_EXECUTABLE gzip DOC "A tool for compressing manpages (optional).")
- 
--if(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+if(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
-     message(STATUS "Found 'gzip'. Man pages will be compressed.")
-     set(MAN_TARGET ${MAN_BUILD})
-     set(MAN_EXTENSION ${MAN_EXTENSION}.gz)
-@@ -116,7 +116,7 @@ if(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-         COMMAND echo "Man pages have been compressed ready for installation."
-         VERBATIM
-     )
--else(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+else(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
-     if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-         message(STATUS "System is OpenBSD: Man pages will not be compressed.")
-     else(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-@@ -127,7 +127,7 @@ else(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-         COMMAND echo "Man pages will be installed uncompressed."
-         VERBATIM
-     )
--endif(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+endif(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
- 
- # Install man pages in either compressed or uncompressed form
- install(FILES ${MAN_BUILD} DESTINATION share/man/man1 COMPONENT doc)
diff --git a/media-sound/musescore/files/musescore-4.2.1-missing-headers.patch b/media-sound/musescore/files/musescore-4.2.1-missing-headers.patch
deleted file mode 100644
index 56ae1f4fa2d6..000000000000
--- a/media-sound/musescore/files/musescore-4.2.1-missing-headers.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/src/framework/ui/uimodule.h
-+++ b/src/framework/ui/uimodule.h
-@@ -24,6 +24,7 @@
- #define MU_UI_UIMODULE_H
- 
- #include "modularity/imodulesetup.h"
-+#include <QtGlobal>
- 
- namespace mu::ui {
- class UiConfiguration;
---- a/src/framework/ui/view/interactiveprovider.h
-+++ b/src/framework/ui/view/interactiveprovider.h
-@@ -26,6 +26,7 @@
- #include <QVariant>
- #include <QMap>
- #include <QStack>
-+#include <QEventLoop>
- 
- #include "modularity/ioc.h"
- #include "../iinteractiveprovider.h"
---- a/src/importexport/musicxml/internal/musicxml/musicxmlsupport.cpp
-+++ b/src/importexport/musicxml/internal/musicxml/musicxmlsupport.cpp
-@@ -34,6 +34,8 @@
- 
- #include "log.h"
- 
-+#include <QXmlStreamReader>
-+
- using AccidentalType = mu::engraving::AccidentalType;
- using SymId = mu::engraving::SymId;
- const static std::map<mu::String, AccidentalType> smuflAccidentalTypes {
---- a/src/importexport/videoexport/internal/videowriter.cpp
-+++ b/src/importexport/videoexport/internal/videowriter.cpp
-@@ -32,6 +32,8 @@
- 
- #include "log.h"
- 
-+#include <QPainter>
-+
- using namespace mu::iex::videoexport;
- using namespace mu::project;
- using namespace mu::notation;
---- a/src/learn/view/learnpagemodel.h
-+++ b/src/learn/view/learnpagemodel.h
-@@ -23,6 +23,7 @@
- #define MU_LEARN_LEARNPAGEMODEL_H
- 
- #include <QObject>
-+#include <QVariant>
- 
- #include "async/asyncable.h"
- 
---- a/src/project/internal/exporttype.h
-+++ b/src/project/internal/exporttype.h
-@@ -23,6 +23,8 @@
- #define MU_PROJECT_EXPORTTYPE_H
- 
- #include <unordered_set>
-+#include <QList>
-+#include <QVariant>
- 
- #include "containers.h"
- 
diff --git a/media-sound/musescore/files/musescore-4.3.2-unbundle-deps.patch b/media-sound/musescore/files/musescore-4.3.2-unbundle-deps.patch
deleted file mode 100644
index 6a3f44702f27..000000000000
--- a/media-sound/musescore/files/musescore-4.3.2-unbundle-deps.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -188,7 +188,7 @@ if (MUE_BUILD_UNIT_TESTS)
-         FULL_DOCS "List XML files outputted by google test."
-     )
- 
--    add_subdirectory(thirdparty/googletest)
-+    find_package(GTest REQUIRED)
- endif(MUE_BUILD_UNIT_TESTS)
- 
- add_subdirectory(share)
---- a/src/framework/audio/CMakeLists.txt
-+++ b/src/framework/audio/CMakeLists.txt
-@@ -268,10 +268,10 @@ if (MUE_ENABLE_AUDIO_EXPORT)
-         ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
-         )
- 
--    add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame)
-+    pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
-     set(MODULE_LINK
-         ${MODULE_LINK}
--        lame
-+        PkgConfig::lame
-     )
-     if (MUE_COMPILE_USE_SYSTEM_OPUSENC)
-         pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc)
---- a/src/framework/audio/internal/encoders/mp3encoder.cpp
-+++ b/src/framework/audio/internal/encoders/mp3encoder.cpp
-@@ -22,7 +22,7 @@
- 
- #include "mp3encoder.h"
- 
--#include "lame.h"
-+#include "lame/lame.h"
- 
- using namespace mu;
- using namespace mu::audio;
---- a/src/framework/testing/gtest.cmake
-+++ b/src/framework/testing/gtest.cmake
-@@ -60,7 +60,7 @@ find_package(Qt5 COMPONENTS Core Gui REQUIRED)
- target_link_libraries(${MODULE_TEST}
-     Qt5::Core
-     Qt5::Gui
--    gmock
-+    GTest::gmock
-     global
-     ${MODULE_TEST_LINK}
-     )
diff --git a/media-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml
index bdf3cf8fbc6d..265b53d9c817 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/metadata.xml
@@ -10,12 +10,6 @@
 		<remote-id type="github">musescore/MuseScore</remote-id>
 	</upstream>
 	<use>
-		<flag name="osc">Enable OSC remote control protocol</flag>
-		<flag name="omr">Enable PDF import (OMR - optical music recognition)</flag>
-		<flag name="portmidi">Enable support for building against <pkg>media-libs/portmidi</pkg></flag>
-		<flag name="sf3">Enable SoundFont 3 support using  <pkg>media-libs/libvorbis</pkg></flag>
-		<flag name="sfz">Enable experimental SFZ sampler</flag>
-		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for embedded web browser</flag>
 		<flag name="video">Support exporting scores as videos using the command line</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/musescore/musescore-3.6.2-r1.ebuild b/media-sound/musescore/musescore-3.6.2-r1.ebuild
deleted file mode 100644
index 38e0104ea372..000000000000
--- a/media-sound/musescore/musescore-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake flag-o-matic qmake-utils xdg check-reqs
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
-else
-	SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S="${WORKDIR}/MuseScore-${PV}"
-fi
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols2:5
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/freetype-2.5.2
-	media-libs/libsndfile
-	sys-libs/zlib:=
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	jack? ( virtual/jack )
-	mp3? ( media-sound/lame )
-	omr? ( app-text/poppler )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	sf3? ( media-libs/libvorbis )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-	"${FILESDIR}/${PN}-3.6.1-rename-audioitem.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_src_unpack
-		unpack ${A}
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Move soundfonts to the correct directory
-	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/860885
-	#
-	# The relevant code no longer exists in later releases.
-	filter-lto
-
-	# bug #766111
-	export PATH="$(qt5_get_bindir):${PATH}"
-
-	local mycmakeargs=(
-		-DAEOLUS=OFF # does not compile
-		-DBUILD_ALSA="$(usex alsa)"
-		-DBUILD_CRASH_REPORTER=OFF
-		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
-		-DBUILD_PCH=OFF
-		-DBUILD_PORTAUDIO="$(usex portaudio)"
-		-DBUILD_PORTMIDI="$(usex portmidi)"
-		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TELEMETRY_MODULE=ON
-		-DBUILD_WEBENGINE="$(usex webengine)"
-		-DCMAKE_SKIP_RPATH=ON
-		-DDOWNLOAD_SOUNDFONT=OFF
-		-DHAS_AUDIOFILE=ON
-		-DOCR=OFF
-		-DOMR="$(usex omr)"
-		-DSOUNDFONT3=ON
-		-DZERBERUS="$(usex sfz)"
-		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-		-DUSE_SYSTEM_FREETYPE=ON
-		-DUSE_SYSTEM_POPPLER=ON
-		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake_build -j1 lrelease manpages
-	cmake_src_compile
-}
diff --git a/media-sound/musescore/musescore-4.3.2.ebuild b/media-sound/musescore/musescore-4.3.2.ebuild
deleted file mode 100644
index b5a97d520654..000000000000
--- a/media-sound/musescore/musescore-4.3.2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHECKREQS_DISK_BUILD=3500M
-VIRTUALX_REQUIRED="test"
-inherit cmake flag-o-matic qmake-utils xdg check-reqs virtualx
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/musescore/MuseScore.git"
-else
-	SRC_URI="
-		https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	S="${WORKDIR}/MuseScore-${PV}"
-fi
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="jack test video"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-libs/tinyxml2:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtnetworkauth:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5[widgets]
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-	dev-qt/qtsvg:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/alsa-lib-1.0.0
-	media-libs/flac:=
-	>=media-libs/freetype-2.5.2
-	media-libs/libopusenc
-	media-libs/libsndfile
-	media-libs/opus
-	media-sound/lame
-	sys-libs/zlib:=
-	jack? ( virtual/jack )
-	video? ( media-video/ffmpeg )
-"
-# dev-cpp/gtest is required even when tests are disabled!
-DEPEND="
-	${RDEPEND}
-	dev-cpp/gtest
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch"
-	"${FILESDIR}/${PN}-4.3.2-unbundle-deps.patch"
-	"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
-	"${FILESDIR}/${PN}-4.2.1-missing-headers.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_src_unpack
-		unpack ${A}
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Move soundfonts to the correct directory
-	mv -v "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-
-	# Make sure we don't accidentally use bundled third party deps
-	# for which we want to use system packages instead.
-	rm -r thirdparty/{flac,googletest,lame,opus,opusenc} \
-		|| die "Failed to remove unused thirdparty directories"
-}
-
-src_configure() {
-	# confuses rcc, bug #908808
-	filter-lto
-
-	# bug #766111
-	export PATH="$(qt5_get_bindir):${PATH}"
-
-	local mycmakeargs=(
-		-DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}"
-		-DCMAKE_C_FLAGS_RELEASE="${CFLAGS}"
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_SKIP_RPATH=TRUE
-		-DMUE_BUILD_CRASHPAD_CLIENT=OFF
-		-DMUE_BUILD_UNIT_TESTS="$(usex test)"
-		-DMUE_BUILD_UPDATE_MODULE=OFF
-		-DMUE_BUILD_VIDEOEXPORT_MODULE="$(usex video)"
-		-DMUE_COMPILE_USE_CCACHE=OFF
-		-DMUE_COMPILE_USE_SYSTEM_FLAC=ON
-		-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
-		-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON
-		-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON
-		-DMUE_DOWNLOAD_SOUNDFONT=OFF
-		-DMUE_ENABLE_AUDIO_JACK=$(usex jack)
-		-DMUSESCORE_BUILD_MODE=release
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake_build lrelease manpages
-	cmake_src_compile
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# Hack to not install bundled libraries
-	rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
-}
diff --git a/media-sound/musescore/musescore-4.4.3.ebuild b/media-sound/musescore/musescore-4.4.3.ebuild
deleted file mode 100644
index 453e2ca9139c..000000000000
--- a/media-sound/musescore/musescore-4.4.3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHECKREQS_DISK_BUILD=3500M
-VIRTUALX_REQUIRED="test"
-inherit cmake flag-o-matic qmake-utils xdg check-reqs virtualx
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/musescore/MuseScore.git"
-else
-	SRC_URI="
-		https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	S="${WORKDIR}/MuseScore-${PV}"
-fi
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="jack test video"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-qt/qttools:6[linguist]
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-libs/tinyxml2:=
-	dev-qt/qtbase[concurrent,dbus,gui,network,opengl,widgets,xml]
-	dev-qt/qt5compat:6[qml]
-	dev-qt/qtdeclarative:6
-	dev-qt/qtnetworkauth:6
-	dev-qt/qtscxml:6
-	dev-qt/qtsvg:6
-	dev-qt/qttools:6[assistant]
-	>=media-libs/alsa-lib-1.0.0
-	media-libs/flac:=
-	>=media-libs/freetype-2.5.2
-	media-libs/libopusenc
-	media-libs/libsndfile
-	media-libs/opus
-	media-sound/lame
-	sys-libs/zlib:=
-	jack? ( virtual/jack )
-	video? ( media-video/ffmpeg )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-uncompressed-man-pages.patch"
-	"${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
-	"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
-	"${FILESDIR}/${PN}-4.4.0-include.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_src_unpack
-		unpack ${A}
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Move soundfonts to the correct directory
-	mv -v "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-}
-
-src_configure() {
-	# confuses rcc, bug #908808
-	filter-lto
-
-	# bug #766111
-	export PATH="$(qt5_get_bindir):${PATH}"
-
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPE="release"
-		-DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}"
-		-DCMAKE_C_FLAGS_RELEASE="${CFLAGS}"
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_SKIP_RPATH=TRUE
-		-DMUE_BUILD_VIDEOEXPORT_MODULE="$(usex video)"
-		-DMUE_COMPILE_USE_CCACHE=OFF
-		-DMUE_COMPILE_USE_SYSTEM_FLAC=ON
-		-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
-		-DMUE_COMPILE_USE_SYSTEM_OPUS=ON
-		-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON
-		-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON
-		-DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=ON
-		-DMUE_DOWNLOAD_SOUNDFONT=OFF
-		-DMUSE_APP_BUILD_MODE="release"
-		-DMUSE_MODULE_AUDIO_JACK="$(usex jack)"
-		-DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF
-		# tests
-		-DMUE_BUILD_BRAILLE_TESTS="$(usex test)"
-		-DMUE_BUILD_ENGRAVING_TESTS="$(usex test)"
-		-DMUE_BUILD_IMPORTEXPORT_TESTS="$(usex test)"
-		-DMUE_BUILD_NOTATION_TESTS="$(usex test)"
-		-DMUE_BUILD_PLAYBACK_TESTS="$(usex test)"
-		-DMUE_BUILD_PROJECT_TESTS="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake_build
-	cmake_src_compile
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# Hack to not install bundled libraries
-	rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
-}
diff --git a/media-sound/musescore/musescore-4.4.4.ebuild b/media-sound/musescore/musescore-4.4.4.ebuild
index 453e2ca9139c..3cfdb03e7dc9 100644
--- a/media-sound/musescore/musescore-4.4.4.ebuild
+++ b/media-sound/musescore/musescore-4.4.4.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
 	SRC_URI="
 		https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 	S="${WORKDIR}/MuseScore-${PV}"
 fi
 
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.10.1-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.10.1-r1.ebuild
index bfb1410aa37c..f0a00dec5740 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.10.1-r1.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.10.1-r1.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 @@ SRC_URI="https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="clock outputs taglib visualizer"
 
 RDEPEND="
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index 2941fe4abe48..9cc3eda38aec 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1 +1 @@
-DIST libopenmpt-0.7.10+release.autotools.tar.gz 1671289 BLAKE2B 62bd4a1bcd9685fdb92c270687b71609a23986941e301ad17cc37ca5f6b5b76fa1a8f425b2e68603bb29bfa34c3c1caea98faea1d95004f87943b2bed6b7c9a0 SHA512 e5f02b045bc1449791ec43a32216c4c4231edff88b3bda07283c9768118bce3a1f50c2535dbe38a21eb12016294e3b5823ef2f32f2f1e21d40fafe188bad783d
+DIST libopenmpt-0.7.13+release.autotools.tar.gz 1681351 BLAKE2B d75df89e85531e85974bd532773e8ed16440211448790779191a61a629dde33ef7280bcc1c82e6ac6aeb313f7f568bc7a2abe707772801f52c271977b88eff8e SHA512 04e63c635dd6c63c2ce79db4eff971f10e4d14a12c7f143fc317a4b5f5188cd8cbf84fc5121057c2beff3a3e6b9b48767c02b9eb5c569accab3e6ff7322a9690
diff --git a/media-sound/openmpt123/openmpt123-0.7.10.ebuild b/media-sound/openmpt123/openmpt123-0.7.10.ebuild
deleted file mode 100644
index d3819b92551d..000000000000
--- a/media-sound/openmpt123/openmpt123-0.7.10.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib
-
-MY_P="libopenmpt-${PV}+release.autotools"
-DESCRIPTION="libopenmpt-based command line player for tracked music files (modules)"
-HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
-SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="flac portaudio pulseaudio sdl sndfile"
-
-RDEPEND="
-	~media-libs/libopenmpt-${PV}
-	flac? ( media-libs/flac:= )
-	pulseaudio? ( media-libs/libpulse )
-	sdl? ( >=media-libs/libsdl2-2.0.4 )
-	sndfile? ( media-libs/libsndfile )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Normally libopenmpt is built alongside openmpt123. Avoid the
-	# internal dependency and link it externally.
-	rm -r libopenmpt/ || die
-	sed -i \
-		-e "s:libopenmpt/libopenmpt\.pc::g" \
-		configure || die
-	sed -i \
-		-e "/_${PN}_DEPENDENCIES/s:libopenmpt\.la::g" \
-		-e "/_${PN}_LDADD/s:libopenmpt\.la:-lopenmpt:g" \
-		Makefile.in || die
-}
-
-src_configure() {
-	# A lot of these optional dependencies relate to libopenmpt, which
-	# we package separately, so we disable them here.
-	econf \
-		--disable-static \
-		--enable-openmpt123 \
-		--disable-examples \
-		--disable-tests \
-		--disable-doxygen-doc \
-		--without-zlib \
-		--without-mpg123 \
-		--without-ogg \
-		--without-vorbis \
-		--without-vorbisfile \
-		$(use_with pulseaudio) \
-		$(use_with portaudio) \
-		--without-portaudiocpp \
-		$(use_with sdl sdl2) \
-		$(use_with sndfile) \
-		$(use_with flac)
-}
-
-src_compile() {
-	emake "bin/${PN}$(get_exeext)"
-}
-
-src_install() {
-	dobin "bin/${PN}$(get_exeext)"
-}
diff --git a/media-sound/openmpt123/openmpt123-0.7.13.ebuild b/media-sound/openmpt123/openmpt123-0.7.13.ebuild
new file mode 100644
index 000000000000..d8a1233270c6
--- /dev/null
+++ b/media-sound/openmpt123/openmpt123-0.7.13.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib
+
+MY_P="libopenmpt-${PV}+release.autotools"
+DESCRIPTION="libopenmpt-based command line player for tracked music files (modules)"
+HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
+SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="flac portaudio pulseaudio sdl sndfile"
+
+RDEPEND="
+	~media-libs/libopenmpt-${PV}
+	flac? ( media-libs/flac:= )
+	pulseaudio? ( media-libs/libpulse )
+	sdl? ( >=media-libs/libsdl2-2.0.4 )
+	sndfile? ( media-libs/libsndfile )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Normally libopenmpt is built alongside openmpt123. Avoid the
+	# internal dependency and link it externally.
+	rm -r libopenmpt/ || die
+	sed -i \
+		-e "s:libopenmpt/libopenmpt\.pc::g" \
+		configure || die
+	sed -i \
+		-e "/_${PN}_DEPENDENCIES/s:libopenmpt\.la::g" \
+		-e "/_${PN}_LDADD/s:libopenmpt\.la:-lopenmpt:g" \
+		Makefile.in || die
+}
+
+src_configure() {
+	# A lot of these optional dependencies relate to libopenmpt, which
+	# we package separately, so we disable them here.
+	econf \
+		--disable-static \
+		--enable-openmpt123 \
+		--disable-examples \
+		--disable-tests \
+		--disable-doxygen-doc \
+		--without-zlib \
+		--without-mpg123 \
+		--without-ogg \
+		--without-vorbis \
+		--without-vorbisfile \
+		$(use_with pulseaudio) \
+		$(use_with portaudio) \
+		--without-portaudiocpp \
+		$(use_with sdl sdl2) \
+		$(use_with sndfile) \
+		$(use_with flac)
+}
+
+src_compile() {
+	emake "bin/${PN}$(get_exeext)"
+}
+
+src_install() {
+	dobin "bin/${PN}$(get_exeext)"
+}
diff --git a/media-sound/pavucontrol/pavucontrol-6.1.ebuild b/media-sound/pavucontrol/pavucontrol-6.1.ebuild
index 8cc8143ff6a2..1a8b23357e32 100644
--- a/media-sound/pavucontrol/pavucontrol-6.1.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-6.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
@@ -9,7 +9,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="X"
 
 inherit meson
diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild
index c3074961c6a9..4adf1135cad6 100644
--- a/media-sound/picard/picard-9999.ebuild
+++ b/media-sound/picard/picard-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
@@ -25,14 +25,11 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="discid fingerprints nls"
 
-BDEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
 RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/fasteners[${PYTHON_USEDEP}]
 		dev-python/pyjwt[${PYTHON_USEDEP}]
-		dev-python/pyqt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+		dev-python/pyqt6[gui,network,qml,widgets,${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		media-libs/mutagen[${PYTHON_USEDEP}]
@@ -40,6 +37,8 @@ RDEPEND="
 	')
 	fingerprints? ( media-libs/chromaprint[tools] )
 "
+DEPEND="test? ( $(python_gen_cond_dep 'dev-python/pyqt6[testlib,${PYTHON_USEDEP}]') )"
+BDEPEND="nls? ( dev-qt/qttools:6[linguist] )"
 
 distutils_enable_tests pytest
 
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index f119fae0ae05..8da207f3072a 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1 +1,2 @@
 DIST qmmp-1.6.4.tar.bz2 1379335 BLAKE2B e17ec8f84f94cfbc6a0a1d30d6d954f3e6b3448909c0e3344614340b41974d69aa5bd3dbb149fcc88c6ede289ec7900050eb0de81307dfeb8ebfc360255d1ea6 SHA512 da8eae4ca4e10cca8a177064a422fdc196e76bb5e3e06c3029040e1120da0d2e5666824a8effd51f82c94b999e1243ae3bc6c71c8c05e334276bf40a5767c17f
+DIST qmmp-2.1.9.tar.bz2 1373111 BLAKE2B a7420c50b4a3e9d41d6e483dce3a0446a202823f673aab2def308b5473563d5ea77730aec771a96a63ef860284bdcaa378dafe9d03c20919cba70b046681bc4c SHA512 87370dfdb856953ff9f89c1308c21133eaef880c3ace1e57ea1e0fde6deea4988c491836139a8d89c41670730838c0b8786fd4208429c709bab3b976efac53a8
diff --git a/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch b/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch
deleted file mode 100644
index 45512099ffeb..000000000000
--- a/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qmmp-1.6.0/src/plugins/General/CMakeLists.txt
-+++ qmmp-1.6.0/src/plugins/General/CMakeLists.txt
-@@ -51,7 +51,7 @@
- ENDIF(USE_HAL AND Qt5DBus_FOUND)
- 
- IF(USE_UDISKS2 AND Qt5DBus_FOUND)
--add_subdirectory(udisks2)
-+add_subdirectory(udisks)
- ENDIF(USE_UDISKS2 AND Qt5DBus_FOUND)
- 
- IF(USE_HOTKEY AND Qt5X11Extras_FOUND)
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index 6f150fbd17d6..a6bb8b917981 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -15,7 +15,8 @@
 		<flag name="dbus">Enable DBus notifiications and MPRIS support</flag>
 		<flag name="enca">Detects the character encoding automatically</flag>
 		<flag name="game">Enable Game music support</flag>
-		<flag name="gnome">Enable Gnome hotkey support (requires Qt5DBus)</flag>
+		<flag name="gnome">Enable Gnome hotkey support (requires QtDBus)</flag>
+		<flag name="libxmp">Enable module files renderer (modplug replacement) via <pkg>media-libs/libxmp</pkg></flag>
 		<flag name="lyrics">Fetch track lyrics from the web</flag>
 		<flag name="midi">Enable midi support using wildmidi library</flag>
 		<flag name="notifier">Enable qmmps' notifier system</flag>
@@ -32,6 +33,9 @@
 		<flag name="xmp">Enable module files renderer (modplug replacement)</flag>
 	</use>
 	<upstream>
+		<bugs-to>https://sourceforge.net/p/qmmp-dev/tickets/</bugs-to>
+		<changelog>https://sourceforge.net/p/qmmp-dev/code/HEAD/tree/trunk/qmmp/ChangeLog</changelog>
+		<doc>https://sourceforge.net/p/qmmp-dev/wiki/browse_pages/</doc>
 		<remote-id type="sourceforge">qmmp-dev</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/qmmp/qmmp-2.1.9.ebuild b/media-sound/qmmp/qmmp-2.1.9.ebuild
new file mode 100644
index 000000000000..4628e3c5aa07
--- /dev/null
+++ b/media-sound/qmmp/qmmp-2.1.9.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Qt-based audio player with winamp/xmms skins support"
+HOMEPAGE="https://qmmp.ylsoftware.com"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://qmmp.ylsoftware.com/files/${PN}/$(ver_cut 1-2)/${P}.tar.bz2
+		https://downloads.sourceforge.net/${PN}-dev/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit subversion
+	QMMP_DEV_BRANCH="1.3"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
+ffmpeg flac game gnome jack ladspa libxmp lyrics +mad midi mms mplayer musepack
+notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
+sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
+
+RDEPEND="
+	dev-qt/qtbase:6[X,dbus,gui,network,sqlite,widgets]
+	media-libs/taglib:=
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtbase:6[dbus] )
+	enca? ( app-i18n/enca )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac:= )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		virtual/jack
+	)
+	ladspa? ( media-plugins/cmt-plugins )
+	libxmp? ( media-libs/libxmp )
+	mad? (
+		media-libs/libmad:=
+		media-sound/mpg123:=
+	)
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	pipewire? ( media-video/pipewire )
+	projectm? (
+		dev-qt/qtbase:6[-gles2-only,opengl]
+		media-libs/libprojectm:=
+	)
+	pulseaudio? ( media-libs/libpulse )
+	qtmedia? ( dev-qt/qtmultimedia:6 )
+	scrobbler? ( net-misc/curl )
+	shout? ( media-libs/libshout )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia ; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PIPEWIRE="$(usex pipewire)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+		-DUSE_XMP="$(usex libxmp)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 98bde86c0905..8355e3dc5d39 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit cmake xdg
 
-DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+DESCRIPTION="Qt-based audio player with winamp/xmms skins support"
 HOMEPAGE="https://qmmp.ylsoftware.com"
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://qmmp.ylsoftware.com/files/${P}.tar.bz2
+	SRC_URI="https://qmmp.ylsoftware.com/files/${PN}/$(ver_cut 1-2)/${P}.tar.bz2
 		https://downloads.sourceforge.net/${PN}-dev/files/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
 	inherit subversion
-	QMMP_DEV_BRANCH="1.3"
+	QMMP_DEV_BRANCH="2.2"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
 fi
 
@@ -21,9 +21,9 @@ LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
 IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
-ffmpeg flac game gnome jack ladspa lyrics +mad midi mms mplayer musepack
+ffmpeg flac game gnome jack ladspa libxmp lyrics +mad midi mms mplayer musepack
 notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
-sndfile soxr stereo tray udisks +vorbis wavpack xmp"
+sndfile soxr stereo tray udisks +vorbis wavpack"
 
 REQUIRED_USE="
 	gnome? ( dbus )
@@ -32,12 +32,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
+	dev-qt/qtbase:6[X,dbus,gui,network,sqlite,widgets]
 	media-libs/taglib:=
 	x11-libs/libX11
 	aac? ( media-libs/faad2 )
@@ -49,7 +44,7 @@ RDEPEND="
 		dev-libs/libcdio-paranoia
 	)
 	curl? ( net-misc/curl )
-	dbus? ( dev-qt/qtdbus:5 )
+	dbus? ( dev-qt/qtbase:6[dbus] )
 	enca? ( app-i18n/enca )
 	ffmpeg? ( media-video/ffmpeg:= )
 	flac? ( media-libs/flac:= )
@@ -59,6 +54,7 @@ RDEPEND="
 		virtual/jack
 	)
 	ladspa? ( media-plugins/cmt-plugins )
+	libxmp? ( media-libs/libxmp )
 	mad? (
 		media-libs/libmad:=
 		media-sound/mpg123:=
@@ -70,12 +66,11 @@ RDEPEND="
 	opus? ( media-libs/opusfile )
 	pipewire? ( media-video/pipewire )
 	projectm? (
-		dev-qt/qtgui:5[-gles2-only]
-		dev-qt/qtopengl:5
+		dev-qt/qtbase:6[-gles2-only,opengl]
 		media-libs/libprojectm:=
 	)
 	pulseaudio? ( media-libs/libpulse )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
+	qtmedia? ( dev-qt/qtmultimedia:6 )
 	scrobbler? ( net-misc/curl )
 	shout? ( media-libs/libshout )
 	sid? ( >=media-libs/libsidplayfp-1.1.0 )
@@ -87,17 +82,12 @@ RDEPEND="
 		media-libs/libvorbis
 	)
 	wavpack? ( media-sound/wavpack )
-	xmp? ( media-libs/libxmp )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
+BDEPEND="dev-qt/qttools:6[linguist]"
 
 DOCS=( AUTHORS ChangeLog README )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.0-udisks_plugin.patch"
-)
-
 src_prepare() {
 	if has_version dev-libs/libcdio-paranoia ; then
 		sed -i \
@@ -154,7 +144,7 @@ src_configure() {
 		-DUSE_UDISKS="$(usex udisks)"
 		-DUSE_VORBIS="$(usex vorbis)"
 		-DUSE_WAVPACK="$(usex wavpack)"
-		-DUSE_XMP="$(usex xmp)"
+		-DUSE_XMP="$(usex libxmp)"
 	)
 
 	cmake_src_configure
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 112d1b13db48..73610c6796d6 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,2 +1,3 @@
 DIST qtractor-1.4.0.tar.gz 2662656 BLAKE2B 52a40439e498a3316964ad181c95b0f18ebf89b246553af30f490ce229fedbea8195b0e88518216622833e1dd8d5ad253179cb9d3d86065f10ff5f6e24377adf SHA512 23fc7922f63a31f7e8483c4d90f08e6852778edfe365e40086d3a9aa350ba75fed93d25f153e261a522615fd43515926abac913b8ee106efa5680c51100a992a
 DIST qtractor-1.5.1.tar.gz 2662704 BLAKE2B 258eb392299b0fcec0c8d9d4f6cb17b3a934a6b266dc538ccb34fbaac810f58d4c20ad1fa093f5417f0f04f4511415773d46f697a20c7c1c57eb126a8ee702f4 SHA512 05807b4371ac6355e401f7153578c00736a51ebff96ea351a55ed0e9d4383d4ed05b20f6e65cca3ceaf3df883156d0a49e1a5a3c110daf8d85133cc7100659af
+DIST qtractor-1.5.2.tar.gz 2663125 BLAKE2B a639ef79905f3029b81ac9aace375dae43827de4225558bdf4737abe068f69da0cca2fc9f14d016a9369fbc1eb41faf184d8a72091cf222a72e031d80da81939 SHA512 6c87e803b596f7e673edc72e2b588549bb18e2891a7aeef4e9cab3d5647487bf617423c27e3527f33e1b3b3fe864db25789f33838212f778fe82055b9e33158a
diff --git a/media-sound/qtractor/qtractor-1.5.2.ebuild b/media-sound/qtractor/qtractor-1.5.2.ebuild
new file mode 100644
index 000000000000..bac20b7e3bcd
--- /dev/null
+++ b/media-sound/qtractor/qtractor-1.5.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
+HOMEPAGE="https://qtractor.sourceforge.io https://github.com/rncbc/qtractor"
+SRC_URI="https://downloads.sourceforge.net/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
+REQUIRED_USE="dssi? ( ladspa )"
+
+DEPEND="
+	dev-qt/qtbase:6[gui,widgets,xml]
+	dev-qt/qtsvg:6
+	media-libs/alsa-lib
+	media-libs/libsndfile
+	media-libs/lilv
+	media-libs/lv2
+	media-libs/suil
+	virtual/jack
+	x11-libs/libxcb:=
+	aubio? ( media-libs/aubio:= )
+	dssi? ( media-libs/dssi )
+	ladspa? ( media-libs/ladspa-sdk )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-qt/qttools:6[linguist]
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DSSI=$(usex dssi 1 0)
+		-DCONFIG_GRADIENT=1
+		-DCONFIG_JACK_LATENCY=1
+		-DCONFIG_JACK_METADATA=1
+		-DCONFIG_JACK_SESSION=1
+		-DCONFIG_LADSPA=$(usex ladspa 1 0)
+		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
+		-DCONFIG_LIBLILV=1
+		-DCONFIG_LIBLO=$(usex osc 1 0)
+		-DCONFIG_LIBMAD=$(usex mad 1 0)
+		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
+		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
+		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
+		-DCONFIG_LIBZ=$(usex zlib 1 0)
+		-DCONFIG_LV2=1
+		-DCONFIG_LV2_UI_GTK2=0
+		-DCONFIG_NSM=0
+		-DCONFIG_QT6=1
+		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
+		-DCONFIG_STACKTRACE=$(usex debug 1 0)
+		-DCONFIG_VESTIGE=1
+		-DCONFIG_VST2=1
+		-DCONFIG_VST3=0
+		-DCONFIG_XUNIQUE=0
+	)
+	# Following options are left to the default
+	# CONFIG_LV2_ATOM
+	# CONFIG_LV2_BUF_SIZE
+	# CONFIG_LV2_CVPORT
+	# CONFIG_LV2_EVENT
+	# CONFIG_LV2_EXTERNAL_UI
+	# CONFIG_LV2_MIDNAM
+	# CONFIG_LV2_OPTIONS
+	# CONFIG_LV2_PARAMETERS
+	# CONFIG_LV2_PATCH
+	# CONFIG_LV2_PORT_EVENT
+	# CONFIG_LV2_PRESETS
+	# CONFIG_LV2_PROGRAMS
+	# CONFIG_LV2_STATE
+	# CONFIG_LV2_STATE_FILES
+	# CONFIG_LV2_STATE_MAKE_PATH
+	# CONFIG_LV2_TIME
+	# CONFIG_LV2_TIME_POSITION
+	# CONFIG_LV2_UI
+	# CONFIG_LV2_UI_IDLE
+	# CONFIG_LV2_UI_REQ_VALUE
+	# CONFIG_LV2_UI_SHOW
+	# CONFIG_LV2_UI_TOUCH
+	# CONFIG_LV2_WORKER
+	# CONFIG_LV2_UI_X11
+	cmake_src_configure
+}
diff --git a/media-sound/reaper-bin/Manifest b/media-sound/reaper-bin/Manifest
index e00efd0125be..7996ce4f44b5 100644
--- a/media-sound/reaper-bin/Manifest
+++ b/media-sound/reaper-bin/Manifest
@@ -1,5 +1,5 @@
-DIST WDL-89ba433c90edd89fe498f9a8e8c78c2020c841fd.tar.gz 2476141 BLAKE2B ada4b343372a2921fb9f137062528eb0a793458e062267567f0f1bce215cb6690738d39f335e35cc65dac5c8a7b99689785527c93ff956b1dd7e33f82412d674 SHA512 cbee544f04d4f4174932e7771064021064297b9c6cd87f06ca0fa4bac915a841edd811a1952cf3932e418a5d9e9f82cf7042c7f53e02ef105d0a75257dc49588
-DIST reaper728_linux_aarch64.tar.xz 11388440 BLAKE2B b26fdded2c6133cfef632c35836071356c2a4409fdff417dfb74c6be948fce8522f59151ea6322b848d20af6700d62af17359924478ee25a52f0cc76a60f98ad SHA512 b9fb691c4689ffd26d317c155393bc20834622c24e0ba0b26a23c146348df914f6086b965901f2822c31b1c9db9e398b2855518ea77a3b84984bd71c5c46aa34
-DIST reaper728_linux_armv7l.tar.xz 11029880 BLAKE2B 9a33f565a59fca587baaa24dfb7aa9d2c8d1ff97e563b59b80e0c7145ea141a4b609c769771c172eaf8275151d7bb37b3a5b5940ba675db7f41357e5c9381618 SHA512 f1706f036d1fc70de176588324b6cb127713f115d0dcb01b232751faa342d07c376d2b5e6d52a6d21f202cc1007facab3a21db90baa96f9f8e078eaed7914c9b
-DIST reaper728_linux_i686.tar.xz 12696136 BLAKE2B 7a6bdb068e523c8ab8105837ec0408dc4bbb7bbf0f640ba97416a4dcc31a3f385b10d39ebc820005fdef127dcb6bbc462ee4f99eda705a7de563581c322fd491 SHA512 f7843b35b49630ee6f159b9b16fc4823e4a9e493f7bdd9e686d94739304df75f2f919e278040882cba112242287c972d21093dc4a80d5652c70bca1b60c89ba3
-DIST reaper728_linux_x86_64.tar.xz 12677660 BLAKE2B b36f17eae62fd20c322cceb485b8d2f81b5a666d86a99a41d4c0713d8ddfc6ffc3e03fce1e12790d97522ff4ab9253f845400749e6b68463a6ac283b9ae77054 SHA512 e304ee38c68ed923102fbf64d146d35e2a6c65000eb0477509007a59b9a2b190edd06e4ccfc055504efa23f56292d62e57cd2575e50525379b53bf95bd4aaa59
+DIST WDL-dda0d7519ee9d50d59a39fc1b1a82001416a3dff.tar.gz 2476492 BLAKE2B 2b748f0f22ce3375feb3ae03f5d93fdd6887c9d9f5ce3d0cabb8cdeff9ecf51c3719358e0e0ef70d90a47069d2b885ad9028d13f0f09fdef993af4bc6cd8013b SHA512 c2894345a47b7ef95a459756cab1819ac9b17701b7fcfd09ab483387aea67f0a29137a94c4a9b8455ae54d365819886c2a81cfe62514b050370a637a7697da8f
+DIST reaper730_linux_aarch64.tar.xz 11404460 BLAKE2B 55211ccd693f9f6370991ed5cf743aba6e69c2a83a8d0a6f004f22dbb082854c443ecc155f2c2c2794c32b7470a6f809fa4b190ad2cb29244490098342efec51 SHA512 868d19b00a1fb4d800b677658da98c5806dc9209e826c487366f75dcd26a34da4263674d782df3fb80d86bb4e95d54357896445a27183e3a428fe5dc98a54e62
+DIST reaper730_linux_armv7l.tar.xz 11041228 BLAKE2B 390198f72f238545d9a7a3db5c8c9f61feec770d75b842b356a2eafe26316b53995e3642dcf3133b237c4980dcdfb571ff90009601c77eb71e34b0ca69c83d5f SHA512 8e8580daf964ffecc1d558dd8d48a90345fae1b7bd21516acc09deab75c85165f72380c1a178e44ecc112dc923e086a8aa4f4ec48ed9d3eb2fd260cd1f0c7f19
+DIST reaper730_linux_i686.tar.xz 12711988 BLAKE2B c26b5957da205d1a4be7df8c27ccec5d06f2b55f3d4f1fa48d06660392b0bb29d0525c6442c4d3d5bcd9004d66150bde268fd2d7f36bc0142dbacb9d1a6eced9 SHA512 10c79262f9a86285518fa7e84b06f95e56c6ecc9238062367e44c989ea30f0885c5fd3924050ee9c6644e68ec3d402aa1c9a4123fb9f85433222968f4c0cbf9e
+DIST reaper730_linux_x86_64.tar.xz 12692216 BLAKE2B 71443d36a386c6e08db21c1f6814f28acd0b57ff667c4c8f4d48ffa2d3fad20624ec38e22c2471f4f73638bc354db88cf3a4a9a2a7c167c69d9a5e095a02f403 SHA512 fb995c6d69677a32aac33d7de08fc2478118ca4ac36536a18d030aaf1353b7148cbc42cb4546a0bb1cf4421ca1ab558b39c42dc498fd2321ce7bb01eaf6445cb
diff --git a/media-sound/reaper-bin/reaper-bin-7.28.ebuild b/media-sound/reaper-bin/reaper-bin-7.28.ebuild
deleted file mode 100644
index a35b90353718..000000000000
--- a/media-sound/reaper-bin/reaper-bin-7.28.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop xdg
-
-DESCRIPTION="Digital audio workstation"
-HOMEPAGE="https://www.reaper.fm"
-
-WDL_COMMIT="89ba433c90edd89fe498f9a8e8c78c2020c841fd"
-
-SRC_URI="
-	amd64? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_x86_64.tar.xz )
-	x86? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_i686.tar.xz )
-	arm64? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_aarch64.tar.xz )
-	arm? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_armv7l.tar.xz )
-	https://github.com/justinfrankel/WDL/archive/${WDL_COMMIT}.tar.gz -> WDL-${WDL_COMMIT}.tar.gz
-"
-
-LICENSE="Cockos"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-RESTRICT="mirror"
-
-IUSE="+jack pulseaudio mp3 ffmpeg"
-
-RDEPEND="
-	${DEPEND}
-	media-libs/alsa-lib
-	media-libs/libglvnd
-	jack? ( virtual/jack )
-	pulseaudio? ( media-libs/libpulse )
-	mp3? ( media-sound/lame )
-	ffmpeg? ( media-video/ffmpeg )
-"
-
-DEPEND="
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11
-	x11-libs/libXi
-	media-libs/fontconfig
-	media-libs/freetype
-"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-	cd "WDL-${WDL_COMMIT}" || die
-	eapply "${FILESDIR}"/libSwell-makefile-cflags.patch
-}
-
-src_compile() {
-	emake -C "WDL-${WDL_COMMIT}/WDL/swell" \
-		PRELOAD_GDK=1
-}
-
-QA_PREBUILT="*/*.so */reaper */reaper_host_*"
-
-src_install() {
-	cd "reaper_linux_"* || die
-	mv -fv "../WDL-${WDL_COMMIT}/WDL/swell/libSwell.so" REAPER/ || die
-
-	./install-reaper.sh --install "${D}"/opt || die
-	rm -f "${D}"/opt/REAPER/uninstall-reaper.sh
-
-	dosym ../../opt/REAPER/reaper /usr/bin/reaper
-
-	# The following is pulled out of install-reaper.sh to match desktop.eclass.
-	cd REAPER || die
-
-	newicon -s 256 Resources/main.png cockos-reaper.png
-	doicon -s 256 Resources/cockos-reaper-backup.png
-	doicon -s 256 Resources/cockos-reaper-document.png
-	doicon -s 256 Resources/cockos-reaper-theme.png
-	doicon -s 256 Resources/cockos-reaper-peak.png
-	doicon -s 256 Resources/cockos-reaper-template.png
-	doicon -s 256 Resources/cockos-reaper-template2.png
-
-	cat > cockos-reaper.desktop <<-EOF
-	[Desktop Entry]
-	Encoding=UTF-8
-	Type=Application
-	Name=REAPER
-	Comment=REAPER
-	Categories=Audio;Video;AudioVideo;AudioVideoEditing;Recorder;
-	Exec="/usr/bin/reaper" %F
-	Icon=cockos-reaper
-	MimeType=application/x-reaper-project;application/x-reaper-project-backup;application/x-reaper-theme
-	StartupWMClass=REAPER
-	EOF
-	domenu cockos-reaper.desktop
-
-	cat > application-x-reaper.xml <<-EOF
-	<?xml version="1.0" encoding="UTF-8"?>
-	<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-	  <mime-type type="application/x-reaper-project">
-		<sub-class-of type="text/plain"/>
-		<comment xml:lang="en">REAPER project</comment>
-		<icon name="cockos-reaper-document"/>
-		<glob pattern="*.rpp"/>
-	  </mime-type>
-	  <mime-type type="application/x-reaper-project-backup">
-		<sub-class-of type="text/plain"/>
-		<comment xml:lang="en">REAPER project backup</comment>
-		<icon name="cockos-reaper-backup"/>
-		<glob pattern="*.rpp-bak"/>
-	  </mime-type>
-	  <mime-type type="application/x-reaper-config">
-		<sub-class-of type="text/plain"/>
-		<icon name="cockos-reaper"/>
-		<comment xml:lang="en">REAPER configuration</comment>
-		<glob pattern="reaper*.ini"/>
-	  </mime-type>
-	  <mime-type type="application/x-reaper-fxchain">
-		<sub-class-of type="text/plain"/>
-		<comment xml:lang="en">REAPER fx chain</comment>
-		<icon name="cockos-reaper-template"/>
-		<glob pattern="*.rfxchain"/>
-	  </mime-type>
-	  <mime-type type="application/x-reaper-tracktemplate">
-		<sub-class-of type="text/plain"/>
-		<comment xml:lang="en">REAPER track template</comment>
-		<icon name="cockos-reaper-template2"/>
-		<glob pattern="*.RTrackTemplate"/>
-	  </mime-type>
-	  <mime-type type="application/x-reaper-theme">
-		<comment xml:lang="en">REAPER theme</comment>
-		<icon name="cockos-reaper-theme"/>
-		<glob pattern="*.ReaperTheme"/>
-		<glob pattern="*.ReaperThemeZip"/>
-	  </mime-type>
-	  <mime-type type="application/x-reaper-undo">
-		<icon name="cockos-reaper-backup"/>
-		<comment xml:lang="en">REAPER undo</comment>
-		<glob pattern="*.rpp-undo"/>
-	  </mime-type>
-	  <mime-type type="application/x-reaper-bak-undo">
-		<icon name="cockos-reaper-backup"/>
-		<comment xml:lang="en">REAPER undo backup</comment>
-		<glob pattern="*.rpp-bak-undo"/>
-	  </mime-type>
-	  <mime-type type="application/x-reaper-peak">
-		<comment xml:lang="en">REAPER peak file</comment>
-		<icon name="cockos-reaper-peak"/>
-		<glob pattern="*.reapeaks"/>
-	  </mime-type>
-	  <mime-type type="application/x-reaper-proxy">
-		<icon name="cockos-reaper-peak"/>
-		<comment xml:lang="en">REAPER proxy</comment>
-		<glob pattern="*.rpp-prox"/>
-	  </mime-type>
-	</mime-info>
-	EOF
-	insopts -m 0644
-	insinto /usr/share/mime
-	doins application-x-reaper.xml
-}
diff --git a/media-sound/reaper-bin/reaper-bin-7.30.ebuild b/media-sound/reaper-bin/reaper-bin-7.30.ebuild
new file mode 100644
index 000000000000..28dfdf60cb4d
--- /dev/null
+++ b/media-sound/reaper-bin/reaper-bin-7.30.ebuild
@@ -0,0 +1,159 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Digital audio workstation"
+HOMEPAGE="https://www.reaper.fm"
+
+WDL_COMMIT="dda0d7519ee9d50d59a39fc1b1a82001416a3dff"
+
+SRC_URI="
+	amd64? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_x86_64.tar.xz )
+	x86? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_i686.tar.xz )
+	arm64? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_aarch64.tar.xz )
+	arm? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_armv7l.tar.xz )
+	https://github.com/justinfrankel/WDL/archive/${WDL_COMMIT}.tar.gz -> WDL-${WDL_COMMIT}.tar.gz
+"
+
+LICENSE="Cockos"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+RESTRICT="mirror"
+
+IUSE="+jack pulseaudio mp3 ffmpeg"
+
+RDEPEND="
+	${DEPEND}
+	media-libs/alsa-lib
+	media-libs/libglvnd
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	mp3? ( media-sound/lame )
+	ffmpeg? ( media-video/ffmpeg )
+"
+
+DEPEND="
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/libXi
+	media-libs/fontconfig
+	media-libs/freetype
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+	cd "WDL-${WDL_COMMIT}" || die
+	eapply "${FILESDIR}"/libSwell-makefile-cflags.patch
+}
+
+src_compile() {
+	emake -C "WDL-${WDL_COMMIT}/WDL/swell" \
+		PRELOAD_GDK=1
+}
+
+QA_PREBUILT="*/*.so */reaper */reaper_host_*"
+
+src_install() {
+	cd "reaper_linux_"* || die
+	mv -fv "../WDL-${WDL_COMMIT}/WDL/swell/libSwell.so" REAPER/ || die
+
+	./install-reaper.sh --install "${D}"/opt || die
+	rm -f "${D}"/opt/REAPER/uninstall-reaper.sh
+
+	dosym ../../opt/REAPER/reaper /usr/bin/reaper
+
+	# The following is pulled out of install-reaper.sh to match desktop.eclass.
+	cd REAPER || die
+
+	newicon -s 256 Resources/main.png cockos-reaper.png
+	doicon -s 256 Resources/cockos-reaper-backup.png
+	doicon -s 256 Resources/cockos-reaper-document.png
+	doicon -s 256 Resources/cockos-reaper-theme.png
+	doicon -s 256 Resources/cockos-reaper-peak.png
+	doicon -s 256 Resources/cockos-reaper-template.png
+	doicon -s 256 Resources/cockos-reaper-template2.png
+
+	cat > cockos-reaper.desktop <<-EOF
+	[Desktop Entry]
+	Encoding=UTF-8
+	Type=Application
+	Name=REAPER
+	Comment=REAPER
+	Categories=Audio;Video;AudioVideo;AudioVideoEditing;Recorder;
+	Exec="/usr/bin/reaper" %F
+	Icon=cockos-reaper
+	MimeType=application/x-reaper-project;application/x-reaper-project-backup;application/x-reaper-theme
+	StartupWMClass=REAPER
+	EOF
+	domenu cockos-reaper.desktop
+
+	cat > application-x-reaper.xml <<-EOF
+	<?xml version="1.0" encoding="UTF-8"?>
+	<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+	  <mime-type type="application/x-reaper-project">
+		<sub-class-of type="text/plain"/>
+		<comment xml:lang="en">REAPER project</comment>
+		<icon name="cockos-reaper-document"/>
+		<glob pattern="*.rpp"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-project-backup">
+		<sub-class-of type="text/plain"/>
+		<comment xml:lang="en">REAPER project backup</comment>
+		<icon name="cockos-reaper-backup"/>
+		<glob pattern="*.rpp-bak"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-config">
+		<sub-class-of type="text/plain"/>
+		<icon name="cockos-reaper"/>
+		<comment xml:lang="en">REAPER configuration</comment>
+		<glob pattern="reaper*.ini"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-fxchain">
+		<sub-class-of type="text/plain"/>
+		<comment xml:lang="en">REAPER fx chain</comment>
+		<icon name="cockos-reaper-template"/>
+		<glob pattern="*.rfxchain"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-tracktemplate">
+		<sub-class-of type="text/plain"/>
+		<comment xml:lang="en">REAPER track template</comment>
+		<icon name="cockos-reaper-template2"/>
+		<glob pattern="*.RTrackTemplate"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-theme">
+		<comment xml:lang="en">REAPER theme</comment>
+		<icon name="cockos-reaper-theme"/>
+		<glob pattern="*.ReaperTheme"/>
+		<glob pattern="*.ReaperThemeZip"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-undo">
+		<icon name="cockos-reaper-backup"/>
+		<comment xml:lang="en">REAPER undo</comment>
+		<glob pattern="*.rpp-undo"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-bak-undo">
+		<icon name="cockos-reaper-backup"/>
+		<comment xml:lang="en">REAPER undo backup</comment>
+		<glob pattern="*.rpp-bak-undo"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-peak">
+		<comment xml:lang="en">REAPER peak file</comment>
+		<icon name="cockos-reaper-peak"/>
+		<glob pattern="*.reapeaks"/>
+	  </mime-type>
+	  <mime-type type="application/x-reaper-proxy">
+		<icon name="cockos-reaper-peak"/>
+		<comment xml:lang="en">REAPER proxy</comment>
+		<glob pattern="*.rpp-prox"/>
+	  </mime-type>
+	</mime-info>
+	EOF
+	insopts -m 0644
+	insinto /usr/share/mime
+	doins application-x-reaper.xml
+}
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 721ab5144072..049c79e028d6 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,2 +1 @@
-DIST rosegarden-24.06.tar.xz 5638668 BLAKE2B 82218675b9bf124ae2d5a1355b53b93ce7f8ceaeef0fe498038427f5248cf8cc687b1a34eca839f784eced496c9208ab8bca6c20821f6edd04238404ffc663b5 SHA512 345e6498dbed3bcefb6a8bca9b0f799ffb6c2031802901d4e649a764a7727f06fcbda5ef5e8e4375dcf0a6fac250419ac1e8f709767583564becf98af8dffdce
 DIST rosegarden-24.12.tar.xz 5737612 BLAKE2B e8976ef1c46d4e137ad78f762cc979363e66427b47760e8ee5e5813e89fa68349d1cc541223c980b6e3972b2d55d33bc8cc2de77d61f95b903f897626be1571e SHA512 dd948e2f9bd0fe11249c1e138afc79da10043664c85ea300f9050dd01e959be50f1056d5035f89b8b1f62fb58254890f6f03384eda546f8968cd42baf1153555
diff --git a/media-sound/rosegarden/rosegarden-24.06.ebuild b/media-sound/rosegarden/rosegarden-24.06.ebuild
deleted file mode 100644
index 58f5c4dd0087..000000000000
--- a/media-sound/rosegarden/rosegarden-24.06.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg virtualx
-
-DESCRIPTION="MIDI and audio sequencer and notation editor"
-HOMEPAGE="https://www.rosegardenmusic.com/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="lirc"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/alsa-lib:=
-	>=media-libs/dssi-1.0.0:=
-	media-libs/ladspa-sdk:=
-	media-libs/liblo:=
-	media-libs/liblrdf:=
-	media-libs/libsamplerate:=
-	media-libs/libsndfile:=
-	sci-libs/fftw:3.0
-	sys-libs/zlib:=
-	virtual/jack
-	x11-libs/libSM:=
-	lirc? ( app-misc/lirc:= )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-24.06-includes.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_LIRC=$(usex !lirc)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	# bug 701682, tries to open network socket and fails.
-	local myctestargs=(
-		-E "(test_notationview_selection)"
-	)
-	virtx cmake_src_test
-}
diff --git a/media-sound/rosegarden/rosegarden-24.12.ebuild b/media-sound/rosegarden/rosegarden-24.12.ebuild
index 52eca96a7796..3aa68cfc9f97 100644
--- a/media-sound/rosegarden/rosegarden-24.12.ebuild
+++ b/media-sound/rosegarden/rosegarden-24.12.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="https://downloads.sourceforge.net/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="lirc"
 
 BDEPEND="
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index bd3aca4fcae9..ed538a339b2f 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1 +1,2 @@
 DIST schismtracker-20240529.source.tar.gz 1189815 BLAKE2B d6e8de018a9fd440cba4822990060d2ea2a6fc9655482898ca236d3ee692922c4397ece78baceda894b1c56bb058d9daa5fe89e26556adffa9b59b0cf11b0e54 SHA512 1a01a2085cc607ad7a448b5ee8ad76ec9474ac5c2f69b7995303a0aaceffb637b553b53e9ec890d01208391df3bc0e8f33d9021e406aa01b166cb0433d79bb4e
+DIST schismtracker-20241226.tar.gz 1187056 BLAKE2B 50d16f256c1234c1bec333dc2ba6d7bcf7ebfd4d07ecf49bab82f10e6f9bc1a60fd03584ff06503c22be5ef21583f9320b831b985429062ffafdd3508232c19b SHA512 056e366b46b901658dbbc8456c58800fc52918a1fdf345ab9666652d2b2c1ef5147e98712f1d31e32d1c7cd2c3a41f8b9c95130f5cfeb666996c1b8dcab2ac3c
diff --git a/media-sound/schismtracker/schismtracker-20241226.ebuild b/media-sound/schismtracker/schismtracker-20241226.ebuild
new file mode 100644
index 000000000000..ec5146cba287
--- /dev/null
+++ b/media-sound/schismtracker/schismtracker-20241226.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop xdg
+
+DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
+HOMEPAGE="http://schismtracker.org/"
+SRC_URI="https://github.com/schismtracker/schismtracker/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libutf8proc
+	>=media-libs/libsdl2-2.0.5[X]
+	x11-libs/libX11
+	x11-libs/libXv
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# workaround for temporary files (missing directory). Fixes:
+	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt \
+	#	font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
+	# /bin/sh: auto/default-font.c: No such file or directory
+	mkdir auto || die
+
+	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
+	#   wine provides /usr/bin/windres
+	# and schismtracker fails to use it properly:
+	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
+	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
+}
+
+src_install() {
+	default
+
+	domenu sys/fd.org/*.desktop
+	doicon icons/schism{,-itf}-icon-128.png
+}
diff --git a/media-sound/sidplayfp/Manifest b/media-sound/sidplayfp/Manifest
index 1bef0dbe5e2d..7b35dcc61d57 100644
--- a/media-sound/sidplayfp/Manifest
+++ b/media-sound/sidplayfp/Manifest
@@ -1,2 +1 @@
-DIST sidplayfp-2.11.0.tar.gz 252126 BLAKE2B 0ef141ca32c3f91dad67a54bf253da806242fb30294be97b44ded23490bb30d05dfc63593bb3c5b05a1bae48228d0ce3c31c35dba15dea1db70ed36692ef060d SHA512 455e8a81e7540f7fa5b97a11c5ab45cb87d77210569dd62ea3bfee8149d56b884eafb23ae404e806b92bf62f40bbf560ecfda76073477caf3fa960a1f52933be
 DIST sidplayfp-2.12.0.tar.gz 251994 BLAKE2B 9b3416504d7488e05c127a2b9c112118bf1283f0a022cc82e353c8f16f61a4d87779712d7faa591dca1a145c060d8a8afada1050a1766c654df7d9055e04d95f SHA512 1e511d2847d774bb8b64757b0c83ae1c5d3e794d05998600ba6f68b79eb29f6f970854d00be84572b5622495099211af7fc2e166d135b6447dc0eba163b68ec3
diff --git a/media-sound/sidplayfp/sidplayfp-2.11.0.ebuild b/media-sound/sidplayfp/sidplayfp-2.11.0.ebuild
deleted file mode 100644
index 451012e6ce4e..000000000000
--- a/media-sound/sidplayfp/sidplayfp-2.11.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Sidplay2 fork with resid-fp"
-HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="https://downloads.sourceforge.net/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+alsa oss pulseaudio"
-
-BDEPEND="virtual/pkgconfig"
-CDEPEND="
-	media-libs/libsidplayfp
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-libs/libpulse )
-"
-RDEPEND="
-	${CDEPEND}
-	media-plugins/mpg123-output-plugins
-"
-DEPEND="${CDEPEND}
-	oss? ( virtual/os-headers )
-"
-
-DOCS=( AUTHORS README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.4-musl-limits.patch
-)
-
-src_prepare() {
-	default
-
-	if ! use alsa; then
-		sed -i -e 's:alsa >= 1.0:dIsAbLe&:' configure || die
-	fi
-
-	if ! use pulseaudio; then
-		sed -i -e 's:libpulse-simple >= 1.0:dIsAbLe&:' configure || die
-	fi
-}
-
-src_configure() {
-	export ac_cv_header_linux_soundcard_h=$(usex oss)
-
-	econf
-}
diff --git a/media-sound/soundconverter/soundconverter-4.0.5.ebuild b/media-sound/soundconverter/soundconverter-4.0.5.ebuild
index b4704cea2c49..22eaf4ec4de6 100644
--- a/media-sound/soundconverter/soundconverter-4.0.5.ebuild
+++ b/media-sound/soundconverter/soundconverter-4.0.5.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
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/kassoulet/${PN}/archive/${MY_PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="aac flac mp3 ogg opus vorbis"
 
 # gst-plugins-meta for any decoders, USE flags for specific encoders used by code
diff --git a/media-sound/soundkonverter/Manifest b/media-sound/soundkonverter/Manifest
deleted file mode 100644
index 174b63c1565f..000000000000
--- a/media-sound/soundkonverter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST soundkonverter-3.0.1.tar.gz 821278 BLAKE2B 3b54a0e8d728d15a1c0ae716e0d321fe37a866f755fee25dd284e46a04a514ace5e8b27fb612b928a3a6ddf32504d08ff0165ceb5c8d48ba1763fcd34994e586 SHA512 db0f9ff7b8d229012d08bb8030c7f11c428632867d0eeb7de8717d47f651a7641240aa0df9c947653fe6a2ad7d4930421f69fff8d038d47f28ca563dfa720911
diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch
deleted file mode 100644
index b7009d33125d..000000000000
--- a/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0eda1978640dda400ca02172abeeacbb725f7b7c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 19 Jul 2020 11:43:30 +0200
-Subject: [PATCH] Consolidate find_package calls inside CMakeLists.txt
-
-- Drop unused Qt5Network
-- Search for Qt5Xml once instead of in most plugins
-- KF5WidgetsAddons and KF5KIO were already being searched for
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt                                             | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 521d0da..7e578f0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -30,7 +30,7 @@ include(CMakePackageConfigHelpers)
- include(ECMInstallIcons)
- include(FeatureSummary)
- 
--find_package(Qt5 REQUIRED COMPONENTS Network Core Widgets)
-+find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml)
- find_package(KF5 REQUIRED COMPONENTS I18n XmlGui KIO Solid Config ConfigWidgets WidgetsAddons KDELibs4Support)
- find_package(KF5Cddb)
- find_package(Phonon4Qt5 REQUIRED)
--- 
-2.27.0
-
diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-fix-add-dirs.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-fix-add-dirs.patch
deleted file mode 100644
index cc5a584b5e0c..000000000000
--- a/media-sound/soundkonverter/files/soundkonverter-3.0.1-fix-add-dirs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 16fb09fcbd5712b7b75004229dbb74f85f213b53 Mon Sep 17 00:00:00 2001
-From: Daniel Faust <hessijames@gmail.com>
-Date: Mon, 6 Aug 2018 18:35:15 +0200
-Subject: [PATCH] Fix adding directories to the Replay Gain tool
-
-Fixes #70
----
- replaygainscanner/replaygainfilelist.cpp | 2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/replaygainscanner/replaygainfilelist.cpp b/replaygainscanner/replaygainfilelist.cpp
-index edd64d0..3df5d58 100644
---- a/replaygainscanner/replaygainfilelist.cpp
-+++ b/replaygainscanner/replaygainfilelist.cpp
-@@ -355,7 +355,7 @@ int ReplayGainFileList::listDir( const QString& directory, const QStringList& fi
-             if( filter.contains(codecName) )
-             {
-                 QList<QUrl> urls;
--                urls.append(directory + "/" + fileName);
-+                urls.append("file://" + directory + "/" + fileName);
-                 addFiles( urls, codecName );
-             }
- 
diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch
deleted file mode 100644
index 8439e7a83df9..000000000000
--- a/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch
+++ /dev/null
@@ -1,300 +0,0 @@
-From 3760bccb3aa1e15bd5ec67bc977717c55a95bc6e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 19 Jul 2020 12:06:28 +0200
-Subject: [PATCH 1/2] FindTaglib.cmake: Update local copy with ECM 5.72.0
- version and adapt cmake
-
-ECM 5.72.0 ships an incompatible FindTaglib.cmake module.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt                 |   6 +-
- cmake/modules/FindTaglib.cmake | 209 +++++++++++------------------
- 2 files changed, 85 insertions(+), 130 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 521d0da..c9d9bee 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,7 +40,7 @@ find_package(Phonon4Qt5 REQUIRED)
- find_package(Cdparanoia REQUIRED)
- 
- set(TAGLIB_MIN_VERSION "1.10")
--find_package(Taglib REQUIRED)
-+find_package(Taglib ${TAGLIB_MIN_VERSION} REQUIRED)
- 
- 
- # plugins 
-@@ -48,7 +48,7 @@ add_subdirectory(plugins)
- 
- 
- # include directories
--include_directories(${TAGLIB_INCLUDES} ${CDPARANOIA_INCLUDE_DIR})
-+include_directories(${CDPARANOIA_INCLUDE_DIR})
- 
- 
- # translation
-@@ -120,7 +120,7 @@ set(soundkonverter_SRCS
- )
- 
- add_executable(soundkonverter ${soundkonverter_SRCS})
--target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 ${TAGLIB_LIBRARIES} ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore)
-+target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 Taglib::Taglib ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore)
- 
- install(TARGETS soundkonverter DESTINATION ${BIN_INSTALL_DIR})
- 
-diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
-index 5a985f9..40c5ca2 100644
---- a/cmake/modules/FindTaglib.cmake
-+++ b/cmake/modules/FindTaglib.cmake
-@@ -1,135 +1,90 @@
--# - Try to find the Taglib library
--# Once done this will define
-+#.rst:
-+# FindTaglib
-+# ----------
- #
--#  TAGLIB_FOUND - system has the taglib library
--#  TAGLIB_CFLAGS - the taglib cflags
--#  TAGLIB_LIBRARIES - The libraries needed to use taglib
--
--# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
-+# Try to find the Taglib library.
- #
--# Redistribution and use is allowed according to the terms of the BSD license.
--# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
--
--if(NOT TAGLIB_MIN_VERSION)
--  set(TAGLIB_MIN_VERSION "1.6")
--endif(NOT TAGLIB_MIN_VERSION)
--
--if(NOT WIN32)
--    find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS
--       ${BIN_INSTALL_DIR}
--    )
--endif(NOT WIN32)
--
--#reset vars
--set(TAGLIB_LIBRARIES)
--set(TAGLIB_CFLAGS)
--
--# if taglib-config has been found
--if(TAGLIBCONFIG_EXECUTABLE)
--
--  exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
--
--  if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
--     message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
--     set(TAGLIB_FOUND FALSE)
--  else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
--
--     exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
--
--     exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS)
-+# This will define the following variables:
-+#
-+# ``Taglib_FOUND``
-+#       True if the system has the taglib library of at least the minimum
-+#       version specified by the version parameter to find_package()
-+# ``Taglib_INCLUDE_DIRS``
-+#       The taglib include dirs for use with target_include_directories
-+# ``Taglib_LIBRARIES``
-+#       The taglib libraries for use with target_link_libraries()
-+# ``Taglib_VERSION``
-+#       The version of taglib that was found
-+#
-+# If ``Taglib_FOUND is TRUE, it will also define the following imported
-+# target:
-+#
-+# ``Taglib::Taglib``
-+#       The Taglib library
-+#
-+# Since 5.72.0
-+#
-+# SPDX-FileCopyrightText: 2006 Laurent Montel <montel@kde.org>
-+# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org>
-+# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org>
-+# SPDX-License-Identifier: BSD-3-Clause
- 
--     if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
--        set(TAGLIB_FOUND TRUE)
--     endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
--     string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
--  endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
--  mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
-+find_package(PkgConfig QUIET)
- 
--else(TAGLIBCONFIG_EXECUTABLE)
-+pkg_search_module(PC_TAGLIB QUIET taglib)
- 
--  find_path(TAGLIB_INCLUDES
--    NAMES
--    tag.h
-+find_path(Taglib_INCLUDE_DIRS
-+    NAMES tag.h
-     PATH_SUFFIXES taglib
--    PATHS
--    ${KDE4_INCLUDE_DIR}
--    ${INCLUDE_INSTALL_DIR}
--  )
--
--    IF(NOT WIN32)
--      # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX
--
--      FIND_LIBRARY(TAGLIB_LIBRARIES tag PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
--
--    ELSE(NOT WIN32)
--
--      # 1. get all possible libnames
--      SET(args PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})             
--      SET(newargs "")               
--      SET(libnames_release "")      
--      SET(libnames_debug "")        
--
--      LIST(LENGTH args listCount)
--
--        # just one name
--        LIST(APPEND libnames_release "tag")
--        LIST(APPEND libnames_debug   "tagd")
--
--        SET(newargs ${args})
--
--      # search the release lib
--      FIND_LIBRARY(TAGLIB_LIBRARIES_RELEASE
--                   NAMES ${libnames_release}
--                   ${newargs}
--      )
--
--      # search the debug lib
--      FIND_LIBRARY(TAGLIB_LIBRARIES_DEBUG
--                   NAMES ${libnames_debug}
--                   ${newargs}
--      )
--
--      IF(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG)
--
--        # both libs found
--        SET(TAGLIB_LIBRARIES optimized ${TAGLIB_LIBRARIES_RELEASE}
--                        debug     ${TAGLIB_LIBRARIES_DEBUG})
--
--      ELSE(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG)
--
--        IF(TAGLIB_LIBRARIES_RELEASE)
--
--          # only release found
--          SET(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_RELEASE})
--
--        ELSE(TAGLIB_LIBRARIES_RELEASE)
--
--          # only debug (or nothing) found
--          SET(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_DEBUG})
--
--        ENDIF(TAGLIB_LIBRARIES_RELEASE)
--
--      ENDIF(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG)
--
--      MARK_AS_ADVANCED(TAGLIB_LIBRARIES_RELEASE)
--      MARK_AS_ADVANCED(TAGLIB_LIBRARIES_DEBUG)
--
--    ENDIF(NOT WIN32)
--  
--  INCLUDE(FindPackageMessage)
--  INCLUDE(FindPackageHandleStandardArgs)
--  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Taglib DEFAULT_MSG TAGLIB_INCLUDES TAGLIB_LIBRARIES)
--
--endif(TAGLIBCONFIG_EXECUTABLE)
--
-+    HINTS ${PC_TAGLIB_INCLUDEDIR}
-+)
-+
-+find_library(Taglib_LIBRARIES
-+    NAMES tag
-+    HINTS ${PC_TAGLIB_LIBDIR}
-+)
-+
-+set(Taglib_VERSION ${PC_TAGLIB_VERSION})
-+
-+if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION)
-+    if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h")
-+        file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H)
-+
-+        string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H})
-+        string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H})
-+        string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H})
-+
-+        string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}")
-+        string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}")
-+        string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}")
-+
-+        set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}")
-+    endif()
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Taglib
-+    FOUND_VAR
-+        Taglib_FOUND
-+    REQUIRED_VARS
-+        Taglib_LIBRARIES
-+        Taglib_INCLUDE_DIRS
-+    VERSION_VAR
-+        Taglib_VERSION
-+)
-+
-+if (Taglib_FOUND AND NOT TARGET Taglib::Taglib)
-+    add_library(Taglib::Taglib UNKNOWN IMPORTED)
-+    set_target_properties(Taglib::Taglib PROPERTIES
-+        IMPORTED_LOCATION "${Taglib_LIBRARIES}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}"
-+    )
-+endif()
- 
--if(TAGLIB_FOUND)
--  if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
--    message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}")
--  endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
--else(TAGLIB_FOUND)
--  if(Taglib_FIND_REQUIRED)
--    message(FATAL_ERROR "Could not find Taglib")
--  endif(Taglib_FIND_REQUIRED)
--endif(TAGLIB_FOUND)
-+mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS)
- 
-+include(FeatureSummary)
-+set_package_properties(Taglib PROPERTIES
-+    URL "https://taglib.org/"
-+    DESCRIPTION "A library for reading and editing the meta-data of audio formats"
-+)
--- 
-2.27.0
-
-
-From ff943d9cb19aa46b555826a053642ac2e84d392d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 19 Jul 2020 13:02:33 +0200
-Subject: [PATCH 2/2] Use local cmake modules first
-
-Although FindTaglib.cmake was fixed in previous commit, local cmake modules
-should not be overriden by system versions anyway.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c9d9bee..7a92898 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,7 +19,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
- 
- # kde libs
- find_package(ECM REQUIRED NO_MODULE)
--set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
-+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})
- 
- add_definitions(-DSOUNDKONVERTER_KF5_BUILD)
- 
--- 
-2.27.0
-
diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-metainfodir.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-metainfodir.patch
deleted file mode 100644
index cae51b5790bc..000000000000
--- a/media-sound/soundkonverter/files/soundkonverter-3.0.1-metainfodir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8589c87095466f0785902dea6367192bcd813eb3 Mon Sep 17 00:00:00 2001
-From: eclipseo <30413512+eclipseo@users.noreply.github.com>
-Date: Fri, 7 Sep 2018 18:15:43 +0200
-Subject: [PATCH] Install appdata in /usr/share/metainfo
-
-appdata file should now be installed in /usr/share/metainfo.  /usr/share/appdata is deprecated.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a0e36de..521d0da 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -135,7 +135,7 @@ install(FILES soundkonverter_replaygainplugin.desktop DESTINATION ${SERVICETYPES
- install(FILES soundkonverter_ripperplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
- install(FILES soundkonverter-rip-audiocd.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions)
- 
--install(FILES soundkonverter.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata)
-+install(FILES soundkonverter.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/metainfo)
- 
- add_subdirectory(icons)
- add_subdirectory(images)
diff --git a/media-sound/soundkonverter/metadata.xml b/media-sound/soundkonverter/metadata.xml
deleted file mode 100644
index 8b7b2706f6a4..000000000000
--- a/media-sound/soundkonverter/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">dfaust/soundkonverter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/soundkonverter/soundkonverter-3.0.1-r3.ebuild b/media-sound/soundkonverter/soundkonverter-3.0.1-r3.ebuild
deleted file mode 100644
index 391721a35df6..000000000000
--- a/media-sound/soundkonverter/soundkonverter-3.0.1-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit ecm
-
-DESCRIPTION="Frontend to various audio converters"
-HOMEPAGE="https://www.linux-apps.com/p/1126634/ https://github.com/dfaust/soundkonverter"
-SRC_URI="https://github.com/dfaust/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}/src"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	kde-apps/libkcddb:5
-	kde-frameworks/kcompletion:5
-	kde-frameworks/kconfig:5
-	kde-frameworks/kconfigwidgets:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/kdelibs4support:5
-	kde-frameworks/ki18n:5
-	kde-frameworks/kio:5
-	kde-frameworks/knotifications:5
-	kde-frameworks/kservice:5
-	kde-frameworks/ktextwidgets:5
-	kde-frameworks/kwidgetsaddons:5
-	kde-frameworks/kxmlgui:5
-	kde-frameworks/solid:5
-	>=media-libs/phonon-4.11.0[qt5(+)]
-	>=media-libs/taglib-1.10
-	media-sound/cdparanoia
-"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
-
-# git master, now archived:
-PATCHES=(
-	"${FILESDIR}/${P}-deps.patch"
-	"${FILESDIR}/${P}-kf-5.72-findtaglib.patch"
-	"${FILESDIR}/${P}-fix-add-dirs.patch"
-	"${FILESDIR}/${P}-metainfodir.patch"
-)
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	elog "soundKonverter optionally supports many different audio formats."
-	elog "You will need to install the appropriate encoding packages for the"
-	elog "formats you require. For a full listing, consult the README file"
-	elog "in /usr/share/doc/${PF}"
-}
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 20dd2fa73715..bfc6b7d3336b 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,2 +1,2 @@
 DIST strawberry-1.2.2.tar.xz 11460012 BLAKE2B bf0edcec29b85cd33b8f2ee883979e6056f776b039e265f63e9b1f7c04cd5193531477f4a52d1eb6f520e380078eee13d3b8d9823f78806527712c09b7a445aa SHA512 f61029de969c47c10c4353d2613a111e0103d1fa0f2e968e3b3c0ce8679f4eaeb302ff24e4bbe28af4513b88b73ca8d02e8e0418fc1150a3144316d5441e996c
-DIST strawberry-1.2.3.tar.xz 11460484 BLAKE2B 7fc1313a496a4f19ca2853b3cc21ba0ceab8dfa2a4916271fd073e7171e4705f232c244598df550574c57bd73cf1446e384d0d563cf9281be32f2d01ef996d65 SHA512 3efe5c8245376731a0558493f6153d312badad21553502d9a876c0d00c74c157aa3b7549815d9925457cedf87f1c94dca25588ae4ece1cf442b9a29f056dc447
+DIST strawberry-1.2.6.tar.xz 11463972 BLAKE2B 907ade85924a639a82f607fb393a78b7f035372f4ce74bf97f727c54faf7c141309200439ce292972690cf119e9f70e52e0b415569bd9c6afd00d587aa95f98f SHA512 5c04d8d4c4798ca0f83d16595b97bf1f509e122e04662379c9739fcdaac2e4776fbe39e37d39ba057a6a6fa735523727da321b700df3231f311bcfc88031677e
diff --git a/media-sound/strawberry/strawberry-1.2.2-r1.ebuild b/media-sound/strawberry/strawberry-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..376e7810e59a
--- /dev/null
+++ b/media-sound/strawberry/strawberry-1.2.2-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawberrymusicplayer.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="alsa cdda chromaprint dbus debug kde +loudness ipod moodbar mtp +pulseaudio streaming +udisks X"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+#INFO: alsa-lib is always required in linux even if its not built
+COMMON_DEPEND="
+	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 )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib
+	udisks? ( sys-fs/udisks:2 )
+	kde? ( kde-frameworks/kglobalaccel )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/gtest
+	dev-libs/boost
+"
+
+DOCS=( Changelog README.md )
+
+REQUIRED_USE="
+	|| ( alsa pulseaudio )
+"
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11 )
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DENABLE_GIO_UNIX=ON
+		-DENABLE_ALSA="$(usex alsa)"
+		-DENABLE_PULSE="$(usex pulseaudio)"
+		-DENABLE_DBUS="$(usex dbus)"
+		-DENABLE_MPRIS2="$(usex dbus)"
+		-DENABLE_KGLOBALACCEL_GLOBALSHORTCUTS=$(usex kde)
+		-DENABLE_SONGFINGERPRINTING="$(usex chromaprint)"
+		-DENABLE_MUSICBRAINZ="$(usex chromaprint)"
+		-DENABLE_X11_GLOBALSHORTCUTS="$(usex X)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_MTP="$(usex mtp)"
+		-DENABLE_GPOD="$(usex ipod)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_EBUR128="$(usex loudness)"
+		-DENABLE_SUBSONIC="$(usex streaming)"
+		-DENABLE_TIDAL="$(usex streaming)"
+		-DENABLE_QOBUZ="$(usex streaming)"
+		-DENABLE_SPOTIFY="$(usex streaming)"
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+	elog "depending on your preferences"
+}
diff --git a/media-sound/strawberry/strawberry-1.2.2.ebuild b/media-sound/strawberry/strawberry-1.2.2.ebuild
deleted file mode 100644
index c8643f713b38..000000000000
--- a/media-sound/strawberry/strawberry-1.2.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
-HOMEPAGE="https://www.strawberrymusicplayer.org/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="alsa cdda chromaprint dbus debug kde +loudness ipod moodbar mtp +pulseaudio streaming +udisks X"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-#INFO: alsa-lib is always required in linux even if its not built
-COMMON_DEPEND="
-	dev-db/sqlite:=
-	dev-libs/glib:2
-	dev-libs/icu:=
-	media-libs/alsa-lib
-	media-libs/taglib
-	dev-libs/kdsingleapplication[qt6(+)]
-	dev-qt/qtbase:6[concurrent,dbus?,gui,network,ssl,sql,sqlite,widgets,X?]
-	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 )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0[taglib]
-	udisks? ( sys-fs/udisks:2 )
-	kde? ( kde-frameworks/kglobalaccel )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/gtest
-	dev-libs/boost
-"
-
-DOCS=( Changelog README.md )
-
-REQUIRED_USE="
-	|| ( alsa pulseaudio )
-"
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11 )
-		-DBUILD_WERROR=OFF
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_GIO=ON
-		-DENABLE_GIO_UNIX=ON
-		-DENABLE_ALSA="$(usex alsa)"
-		-DENABLE_PULSE="$(usex pulseaudio)"
-		-DENABLE_DBUS="$(usex dbus)"
-		-DENABLE_MPRIS2="$(usex dbus)"
-		-DENABLE_KGLOBALACCEL_GLOBALSHORTCUTS=$(usex kde)
-		-DENABLE_SONGFINGERPRINTING="$(usex chromaprint)"
-		-DENABLE_MUSICBRAINZ="$(usex chromaprint)"
-		-DENABLE_X11_GLOBALSHORTCUTS="$(usex X)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DENABLE_MTP="$(usex mtp)"
-		-DENABLE_GPOD="$(usex ipod)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_EBUR128="$(usex loudness)"
-		-DENABLE_SUBSONIC="$(usex streaming)"
-		-DENABLE_TIDAL="$(usex streaming)"
-		-DENABLE_QOBUZ="$(usex streaming)"
-		-DENABLE_SPOTIFY="$(usex streaming)"
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-	elog "depending on your preferences"
-}
diff --git a/media-sound/strawberry/strawberry-1.2.3-r1.ebuild b/media-sound/strawberry/strawberry-1.2.3-r1.ebuild
deleted file mode 100644
index 3179da1a806c..000000000000
--- a/media-sound/strawberry/strawberry-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
-HOMEPAGE="https://www.strawberrymusicplayer.org/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="alsa cdda chromaprint dbus debug kde +loudness ipod moodbar mtp +pulseaudio streaming +udisks X"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-#INFO: alsa-lib is always required in linux even if its not built
-COMMON_DEPEND="
-	dev-db/sqlite:=
-	dev-libs/glib:2
-	dev-libs/icu:=
-	media-libs/alsa-lib
-	media-libs/taglib:=
-	dev-libs/kdsingleapplication[qt6(+)]
-	dev-qt/qtbase:6[concurrent,dbus?,gui,network,ssl,sql,sqlite,widgets,X?]
-	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 )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0[taglib]
-	udisks? ( sys-fs/udisks:2 )
-	kde? ( kde-frameworks/kglobalaccel )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/gtest
-	dev-libs/boost
-"
-
-DOCS=( Changelog README.md )
-
-REQUIRED_USE="
-	|| ( alsa pulseaudio )
-"
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11 )
-		-DBUILD_WERROR=OFF
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_GIO=ON
-		-DENABLE_GIO_UNIX=ON
-		-DENABLE_ALSA="$(usex alsa)"
-		-DENABLE_PULSE="$(usex pulseaudio)"
-		-DENABLE_DBUS="$(usex dbus)"
-		-DENABLE_MPRIS2="$(usex dbus)"
-		-DENABLE_KGLOBALACCEL_GLOBALSHORTCUTS=$(usex kde)
-		-DENABLE_SONGFINGERPRINTING="$(usex chromaprint)"
-		-DENABLE_MUSICBRAINZ="$(usex chromaprint)"
-		-DENABLE_X11_GLOBALSHORTCUTS="$(usex X)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DENABLE_MTP="$(usex mtp)"
-		-DENABLE_GPOD="$(usex ipod)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_EBUR128="$(usex loudness)"
-		-DENABLE_SUBSONIC="$(usex streaming)"
-		-DENABLE_TIDAL="$(usex streaming)"
-		-DENABLE_QOBUZ="$(usex streaming)"
-		-DENABLE_SPOTIFY="$(usex streaming)"
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-	elog "depending on your preferences"
-}
diff --git a/media-sound/strawberry/strawberry-1.2.6.ebuild b/media-sound/strawberry/strawberry-1.2.6.ebuild
new file mode 100644
index 000000000000..062c8ce36172
--- /dev/null
+++ b/media-sound/strawberry/strawberry-1.2.6.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawberrymusicplayer.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="alsa cdda chromaprint dbus debug kde +loudness ipod moodbar mtp +pulseaudio streaming +udisks X"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+#INFO: alsa-lib is always required in linux even if its not built
+COMMON_DEPEND="
+	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 )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib
+	udisks? ( sys-fs/udisks:2 )
+	kde? ( kde-frameworks/kglobalaccel )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/gtest
+	dev-libs/boost
+"
+
+DOCS=( Changelog README.md )
+
+REQUIRED_USE="
+	|| ( alsa pulseaudio )
+"
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11 )
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DENABLE_GIO_UNIX=ON
+		-DENABLE_ALSA="$(usex alsa)"
+		-DENABLE_PULSE="$(usex pulseaudio)"
+		-DENABLE_DBUS="$(usex dbus)"
+		-DENABLE_MPRIS2="$(usex dbus)"
+		-DENABLE_KGLOBALACCEL_GLOBALSHORTCUTS=$(usex kde)
+		-DENABLE_SONGFINGERPRINTING="$(usex chromaprint)"
+		-DENABLE_MUSICBRAINZ="$(usex chromaprint)"
+		-DENABLE_X11_GLOBALSHORTCUTS="$(usex X)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_MTP="$(usex mtp)"
+		-DENABLE_GPOD="$(usex ipod)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_EBUR128="$(usex loudness)"
+		-DENABLE_SUBSONIC="$(usex streaming)"
+		-DENABLE_TIDAL="$(usex streaming)"
+		-DENABLE_QOBUZ="$(usex streaming)"
+		-DENABLE_SPOTIFY="$(usex streaming)"
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+	elog "depending on your preferences"
+}
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 3179da1a806c..062c8ce36172 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-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
@@ -29,10 +29,10 @@ COMMON_DEPEND="
 	dev-db/sqlite:=
 	dev-libs/glib:2
 	dev-libs/icu:=
-	media-libs/alsa-lib
-	media-libs/taglib:=
 	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:= )
@@ -48,7 +48,8 @@ COMMON_DEPEND="
 "
 # Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
 RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0[taglib]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib
 	udisks? ( sys-fs/udisks:2 )
 	kde? ( kde-frameworks/kglobalaccel )
 "
diff --git a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta77-r1.ebuild b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta77-r1.ebuild
index fa6790279ba0..99847f852414 100644
--- a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta77-r1.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta77-r1.ebuild
@@ -12,6 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="teamspeak5 || ( GPL-2 GPL-3 LGPL-3 )"
 SLOT="5"
+KEYWORDS="-* ~amd64"
 
 RDEPEND="
 	app-accessibility/at-spi2-core:2
diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest
index 1b9694d58c33..0e3abacab020 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -7,3 +7,4 @@ DIST ffmpeg-chromium-130.tar.xz 10420352 BLAKE2B 1b7711a3ee349d1e0d8ad8f761c8a38
 DIST ffmpeg-chromium-131.tar.xz 10550352 BLAKE2B 985a4d0caede506050d2277af956723ae74236e2373d766862cef669031e91e44bcb51de219a76a1663f5cac5d85c74bd85215e96dffb14e6090d05ba6031f6c SHA512 1ccba5547ead2a64bcf72b6cdc9b6f9f8a6f817840125248b4d41efdf8376f8a69e8f7d3e4527cf155bb0a058ea6fc9f4cdb12d40a4b74189682e0db7b501ba3
 DIST ffmpeg-chromium-132.tar.xz 10588420 BLAKE2B 988fa447019d4fc3a26685bffd9345b4cf31ace3d39c31a070551f4d4f664cf2982b47c4b6265c2f3e2e7b0eca65effb68a9e25840b6a5ca61600a33d5901b8b SHA512 51856a226e29345c708356e1c6ae478239f1f634937e0ad4caa73e33c7bef1dbaeae97d8670ccd8f15e628fc3d399fdb3a4be1769c57d1283704743b6ce23b72
 DIST ffmpeg-chromium-133.tar.xz 10592716 BLAKE2B 81aac47dfb694c605242e762e6ced29714bc9780907afda6f61f55afef5416d1d998dda6785e8e64b7968f8b9cfc03bdcc4711535ccad65e6a9c55c626d30226 SHA512 798704455973439d3a1990e6344fe7bf1ebef370e7316cb813e898b84b4a39809e5681d54554a765a8f474731fcdf69897fb00f0b5e7ecc6b2e1bd6eef46a77a
+DIST ffmpeg-chromium-134.tar.xz 10687424 BLAKE2B c33487885bb6c75f9bc93abf7b11b52266930dde95411d7e702a2039d94de79d0fa9a4d5f82af12fb7db9e3b3e2be24147a446c6498c60c17841aa5738ec403e SHA512 369aae6bd3b065db3e3b9cac004209e596e9bbeada1a03bb8e20df4b026810fc12489ce52fb95a4320eeec31c09460d18e5c598f36fab1205024f0540be1c639
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-132.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-132.ebuild
index 649b2d94ea08..cfbddc764afd 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-132.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-132.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
@@ -16,7 +16,7 @@ LICENSE="
 "
 SLOT="${PV}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64"
 
 # Options to use as use_enable in the foo[:bar] form.
 # This will feed configure with $(use_enable foo bar)
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-134.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-134.ebuild
new file mode 100644
index 000000000000..043dc19c028a
--- /dev/null
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-134.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+COMMIT=d10a0f8bf5ddcce572df95105152bc74041cae0c
+DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers"
+HOMEPAGE="https://ffmpeg.org/"
+SRC_URI="https://deps.gentoo.zip/media-video/${P}.tar.xz"
+
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+"
+SLOT="${PV}"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64"
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		cpudetection:runtime-cpudetect debug
+		+gpl
+		vaapi vdpau vulkan
+		nvenc:ffnvcodec
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+IUSE="
+	${FFMPEG_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_thumb:armv5te
+	cpu_flags_arm_v6:armv6
+	cpu_flags_arm_thumb2:armv6t2
+	cpu_flags_arm_neon:neon
+	cpu_flags_arm_vfp:vfp
+	cpu_flags_arm_vfpv3:vfpv3
+	cpu_flags_arm_v8:armv8
+	cpu_flags_arm_asimddp:dotprod
+	cpu_flags_arm_i8mm:i8mm
+)
+ARM_CPU_REQUIRED_USE="
+	arm64? ( cpu_flags_arm_v8 )
+	cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+	cpu_flags_arm_neon? (
+		cpu_flags_arm_vfp
+		arm? ( cpu_flags_arm_thumb2 )
+	)
+	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+	cpu_flags_arm_v6? (
+		arm? ( cpu_flags_arm_thumb )
+	)
+"
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx
+					   mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+	${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+	${ARM_CPU_REQUIRED_USE}
+	${X86_CPU_REQUIRED_USE}
+"
+
+RDEPEND="
+	>=media-libs/opus-1.0.2-r2
+	vaapi? ( >=media-libs/libva-1.2.1-r1:0= )
+	nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 )
+	vdpau? ( >=x11-libs/libvdpau-0.7 )
+	vulkan? ( >=media-libs/vulkan-loader-1.3.277:= )
+"
+
+DEPEND="${RDEPEND}
+	vulkan? ( >=dev-util/vulkan-headers-1.3.277 )
+"
+BDEPEND="
+	>=dev-build/make-3.81
+	virtual/pkgconfig
+	cpu_flags_x86_mmx? ( >=dev-lang/nasm-2.13 )
+"
+
+REQUIRED_USE="
+	vulkan? ( threads )
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	test
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-120.patch
+	"${FILESDIR}"/chromium.patch
+)
+
+src_prepare() {
+	export revision=git-N-g${COMMIT:0:10}
+	default
+
+	# -fdiagnostics-color=auto gets appended after user flags which
+	# will ignore user's preference.
+	sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die
+
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+src_configure() {
+	local myconf=( )
+
+	# Bug #918997. Will probably be fixed upstream in the next release.
+	use vulkan && append-ldflags -Wl,-z,muldefs
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# CPU features
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282, bug #754654, bug #772854
+	if [[ ${ABI} != x86 ]] && tc-is-lto; then
+		# Respect -flto value, e.g -flto=thin
+		local v="$(get-flag flto)"
+		[[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" )
+	fi
+	filter-lto
+
+	# Mandatory configuration
+	myconf=(
+		--disable-stripping
+		# This is only for hardcoded cflags; those are used in configure checks that may
+		# interfere with proper detections, bug #671746 and bug #645778
+		# We use optflags, so that overrides them anyway.
+		--disable-optimizations
+		--disable-libcelt # bug #664158
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+		case ${CHOST} in
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# Use --extra-libs if needed for LIBS
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--nm="$(tc-getNM)" \
+		--strip="$(tc-getSTRIP)" \
+		--ranlib="$(tc-getRANLIB)" \
+		--pkg-config="$(tc-getPKG_CONFIG)" \
+		--optflags="${CFLAGS}" \
+		--disable-all \
+		--disable-autodetect \
+		--disable-error-resilience \
+		--disable-everything \
+		--disable-faan \
+		--disable-iconv \
+		--disable-network \
+		--enable-avcodec \
+		--enable-avformat \
+		--enable-avutil \
+		--enable-libopus \
+		--enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \
+		--enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \
+		--enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \
+		--enable-pic \
+		--enable-static \
+		"${myconf[@]}" \
+		${EXTRA_FFMPEG_CONF}
+
+	echo "${@}"
+	"${@}" || die
+}
+
+src_compile() {
+	emake V=1 libffmpeg
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install-libffmpeg
+}
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index f3e0742b26cf..4c9f675164e5 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,14 +1,9 @@
-DIST ffmpeg-4.4.4-texinfo.patch.xz 19136 BLAKE2B 591b46180fccdb58c5b6b102c5e12075ff4388dc6bc0ab1752531d4f9f2802c1fd09ed1353ed70a539fdc5c2298f9cfc84ec24e3a04d371ef0d9f3f30d8e8f38 SHA512 f86a324efe261801a5192d4f204f48de581466550cca49b54432fdf5430f1b3bc9a9d31b9b52e2f23481def67ad55b5ad315752c482709aa67b1f3a3e6c17a4f
-DIST ffmpeg-4.4.4.tar.xz 9565584 BLAKE2B 8cd76a91ae6e485e56c6e5ae7b31d678e2fc2d634b1c56240619a4b6924dae4ec7adb445932bf4455f409dbc03fdc6d52b4fc270da55393e329ccd3d129f5770 SHA512 253799eccd129dad331db85def5352178ae22303e42af47fc013a6adfd4b60d1e59ff5f9ac6118fe3b403affa56ea1f3ba658042f526a914fba27050c3065daf
-DIST ffmpeg-4.4.4.tar.xz.asc 520 BLAKE2B c8bf944883e375555b6dd69029fe863c23f68a3584d84aa3e9c4278ae45aee0bfa3697cc1d8a768b95a1ebd7a9cb91553671072f88f46f6a9c947faa74344a44 SHA512 47afa042d8b529d0bfce391455a25cda261f39f8510601d7de2aba6398483ecb623992626e8489aa2a636e3cb93008f26b32080e526143254226d4e2651accea
 DIST ffmpeg-4.4.5.tar.xz 9575596 BLAKE2B 546df09f7731d22e532a18d9ba9be184283f62b7a2e9470e745e536802bc2263a00f11ed6ab0aee8fc60c5f728826311cbf3542084ba3a64b65a61d76295cd64 SHA512 70df4e63ef507a7ec76da34438142499139769728fd5130d9cf48d56c110ec82c3d6a7e6d1622da03c70167fa861d901d016bbe52c21d2b284b8a0d9f30811dc
 DIST ffmpeg-4.4.5.tar.xz.asc 520 BLAKE2B 505987208ed58b548f910299adb1324e6eba655cc37e6f03cac32c8623e16a4a884e822c745fb72b1934129a8c0a2706bb8bfb785715e6a68e43f737cb8ed365 SHA512 bcfee8986681dfbefd3add741fcbbc5e223bb06c9800797e68fde968c114055ac3fc02ce8731ed269bf30c92d6c990c7f636f82d42379920012e8a0ace8d527e
 DIST ffmpeg-6.1.1.tar.xz 10458600 BLAKE2B 77827ff92b47c773ed82e7b7793dbb135c370fe23501169cb1eab08ff5ede77cfd5b397e8fb1d38756812cc82277898fd5c74b7d8495842556570c0c5570daeb SHA512 fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f7c1032033b1cad2f67557d7c5f7f7d85e2adadca122965d5
 DIST ffmpeg-6.1.1.tar.xz.asc 520 BLAKE2B 801cd976d10363d1f9fc302351b330cb57e609a266407627ef378172f28974f4a18435b8a77b9cc7a8ff7b75701185211739f685629bbda961c3588c15af1221 SHA512 0e10c1f560bab0812d759d286656593dea5940f02bb52d88d9ba7f10b12b9cc3d7aa2a41c5f7a45b319069e04dce22dc1286b3c1ba685b35cd6d04cd81c5a0f5
 DIST ffmpeg-6.1.2.tar.xz 10466152 BLAKE2B ff1f2b2bb60ccc4c37b6ffda2a0e6a0be80c451dc99f6d4a99bd95a1bdc44c494d62377c53383ccfb5b818573a1971948d7db34119099dbc56d7258724831d3c SHA512 3a009184d971fc3168e1322d1d724aae787ed0e9c152d8d1813ea0b9099bda3b35c41fcabbd7b140560e7a8fa9fa1ffd7f0938432d5d498c43829fc6cc3d9e08
 DIST ffmpeg-6.1.2.tar.xz.asc 520 BLAKE2B f26a2d6f5423f93090f2a448172e49f3858aeb5a00f326207d374bbb70fa8942c7ee1a7c55338b2db664b647c983cd5ab4fd8d71efe5c37af4c90385ca17d0ab SHA512 a26dba1f4870b964080b45f8468f5ce3591eb6aa69be426bf4afbe5a60c3cbd0fe5056dc86ca7bb817c04ae30d39160cb7773772a9a2123ae7f095b18a6d7050
-DIST ffmpeg-7.0.1.tar.xz 10793572 BLAKE2B 7468bb0768da56794c57b43db5fb8a1c5471f86dc7789ba342e494907b2f05fd0edbaa93159b05927a749d878c431ad8ac56cafc2434b54c5190b91ca6a6116a SHA512 94e06c4ce64ed3888620547db0e33b29c68a9e78b3ea748346f34280f69723a6d4b7485911f45f1849f9aa3036c0699334abbcf7126d2763bdaa7276673b7daa
-DIST ffmpeg-7.0.1.tar.xz.asc 520 BLAKE2B 3fe3bdd8da390591849ac3784bf8e68e021124715de1a8d142a42096d625df9d9a27b224258f2f0c24b20397bfea7a8035ced4202904ca12fe0eef109516dbf1 SHA512 bd787bfa6dbb147800f5f79a3fe5e4c20054d48ea9e6af4d5c84ace68c19459f4ea677f5921b084eab889ed7b9f81dc138fa2ecf9ae306ac7fb19434a68aeced
 DIST ffmpeg-7.0.2.tar.xz 10795332 BLAKE2B f6536f41f784f1b49ed0728d80a522676dfe1facbeb7fec3f7796683ce28c73e41508f9a5dd1e5cd18d3ff787d562bb1e6a5085ee0660076b84a76040587e5a8 SHA512 2fc66e919db53f6b12f845c0f9b92f3d8a7ec1db1ff533d29e679a6524f32567babf2d0791da039dcf2918c4d4cbb3f99c2898d3795345f03112238af8edcbd9
 DIST ffmpeg-7.0.2.tar.xz.asc 520 BLAKE2B edaadb45588938a524b64d82f96d224c2060648c10649adeba4a3546863eea45b674ebca80e7839e92138ae0b375afd22e0b4552d4d5a68dbb021e706f965b6d SHA512 b41eeb8044754bfcf2cf67a3ed4a4e74194ee6e5f4ed5f03aa03bb68772f6bacd7a1839d8e9740573889230a71d3bc7d52b4625542f4c892e8de8c61deda2c51
 DIST ffmpeg-rpi-6.1-r3.patch 800738 BLAKE2B b7e449ee5eec8b50a3b3bba233c5269f3b6845dbd18a619b844c841a97345ce24c7a5d7f4da05b08e3cb49668426b9044f3d3553d9c2ef3a50aec7199bfa3c09 SHA512 aeaf12afabf5f2192fb0b6ef47397d8477b109e49cee8c02a890d1656a27b1985c62c719ef72966d8c97b0709918233b65ea2e0ef988771507e4be137fcd9158
diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r11.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r11.ebuild
deleted file mode 100644
index f0197354a2e7..000000000000
--- a/media-video/ffmpeg/ffmpeg-4.4.4-r11.ebuild
+++ /dev/null
@@ -1,611 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=56.58.58
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_MIN_CLONE_TYPE="single"
-	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
-HOMEPAGE="https://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Release
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc
-	inherit verify-sig
-	SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz"
-	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-texinfo.patch.xz"
-	SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )"
-
-	BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-	!gpl? ( LGPL-2.1 )
-	gpl? ( GPL-2 )
-	amr? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	gmp? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	libaribb24? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp
-		+gpl hardcoded-tables +iconv libxml2 lzma +network opencl
-		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan
-		X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
-		# libavdevice options
-		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-		opengl
-		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
-		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-		libaribb24 mmal modplug:libmodplug opus:libopus qsv:libmfx libilbc librtmp ssh:libssh
-		speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec
-		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
-		# libavfilter options
-		appkit
-		bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r fribidi:libfribidi
-		fontconfig glslang:libglslang ladspa libass libtesseract lv2 truetype:libfreetype
-		vidstab:libvidstab vmaf:libvmaf rubberband:librubberband zeromq:libzmq zimg:libzimg
-		# libswresample options
-		libsoxr
-		# Threads; we only support pthread for now but ffmpeg supports more
-		+threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-	amf amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame
-	openh264:libopenh264 rav1e:librav1e	snappy:libsnappy svt-av1:libsvtav1
-	theora:libtheora twolame:libtwolame webp:libwebp x264:libx264
-	x265:libx265 xvid:libxvid
-)
-
-IUSE="
-	alsa chromium doc +encode oss +pic sndio static-libs test v4l
-	${FFMPEG_FLAG_MAP[@]%:*}
-	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_thumb:armv5te
-	cpu_flags_arm_v6:armv6
-	cpu_flags_arm_thumb2:armv6t2
-	cpu_flags_arm_neon:neon
-	cpu_flags_arm_vfp:vfp
-	cpu_flags_arm_vfpv3:vfpv3
-	cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
-	arm64? ( cpu_flags_arm_v8 )
-	cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
-	cpu_flags_arm_neon? (
-		cpu_flags_arm_vfp
-		arm? ( cpu_flags_arm_thumb2 )
-	)
-	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
-	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
-	cpu_flags_arm_v6? (
-		arm? ( cpu_flags_arm_thumb )
-	)
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx cpu_flags_ppc_vsx2:power8 )
-PPC_CPU_REQUIRED_USE="
-	cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec )
-	cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx )
-"
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx
-					   mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${MIPS_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE}
-	${CPU_FEATURES_MAP[@]%:*}"
-
-CPU_REQUIRED_USE="
-	${ARM_CPU_REQUIRED_USE}
-	${PPC_CPU_REQUIRED_USE}
-	${X86_CPU_REQUIRED_USE}
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt
-		  graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amf? ( media-video/amdgpu-pro-amf )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-	codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
-	dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		openh264? ( >=media-libs/openh264-1.4.0-r1:=[${MULTILIB_USEDEP}] )
-		rav1e? ( >=media-video/rav1e-0.4:=[capi] )
-		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-	glslang? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1:2=[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
-	libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
-	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	mmal? ( media-libs/raspberrypi-userland )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	qsv? ( media-libs/intel-mediasdk[${MULTILIB_USEDEP}] )
-	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5:=[sftp,${MULTILIB_USEDEP}] )
-	svg? (
-		gnome-base/librsvg:2=[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-	)
-	nvenc? ( <media-libs/nv-codec-headers-12 )
-	svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
-	vmaf? ( media-libs/libvmaf:=[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-	vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.4:=[${MULTILIB_USEDEP}]
-	)
-	zeromq? ( >=net-libs/zeromq-4.1.6 )
-	zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-"
-
-RDEPEND="${RDEPEND}
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-	!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
-"
-
-DEPEND="${RDEPEND}
-	amf? ( media-libs/amf-headers )
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# += for verify-sig above
-BDEPEND+="
-	>=dev-build/make-3.81
-	virtual/pkgconfig
-	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
-	cuda? ( >=llvm-core/clang-7[llvm_targets_NVPTX] )
-	doc? ( sys-apps/texinfo )
-	test? ( net-misc/wget app-alternatives/bc )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	rubberband? ( gpl )
-	vidstab? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-	)
-"
-REQUIRED_USE="
-	cuda? ( nvenc )
-	fftools_cws2fws? ( zlib )
-	glslang? ( vulkan )
-	libv4l? ( v4l )
-	test? ( encode )
-	${GPL_REQUIRED_USE}
-	${CPU_REQUIRED_USE}"
-RESTRICT="
-	!test? ( test )
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-PATCHES=(
-	"${FILESDIR}"/chromium-r1.patch
-	"${FILESDIR}"/${PN}-5.0-backport-ranlib-build-fix.patch
-	"${FILESDIR}"/${PN}-4.4.3-clang-14-ff_seek_frame_binary-crash.patch
-	"${FILESDIR}"/${PN}-4.4.3-get_cabac_inline_x86-32-bit.patch
-	"${FILESDIR}"/${PN}-4.4.4-wint-conversion-vulkan.patch
-	"${FILESDIR}"/${P}-fix-build-svt-av1-1.5.0.patch
-	"${FILESDIR}"/${PN}-5.1.3-binutils-2.41.patch
-	"${FILESDIR}"/${PN}-4.4.4-opencl-parallel-gmake-fix.patch
-	"${FILESDIR}"/${PN}-4.4.4-glslang.patch
-	"${WORKDIR}"/${PN}-4.4.4-texinfo.patch
-	"${FILESDIR}"/${PN}-4.4.4-amd-av1-vaapi.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-build_separate_libffmpeg() {
-	use opencl
-}
-
-pkg_setup() {
-	# ffmpeg[chromaprint] depends on chromaprint, and chromaprint[tools] depends on ffmpeg.
-	# May cause breakage while updating, #862996, #625210, #833821.
-	if has_version media-libs/chromaprint[tools] && use chromaprint; then
-		ewarn "You have media-libs/chromaprint installed with 'tools' USE flag, which "
-		ewarn "links to ffmpeg, and you have enabled 'chromaprint' USE flag for ffmpeg, "
-		ewarn "which links to chromaprint. This may cause issues while rebuilding ffmpeg."
-		ewarn ""
-		ewarn "If your build fails to 'ERROR: chromaprint not found', rebuild chromaprint "
-		ewarn "without the 'tools' use flag first, then rebuild ffmpeg, and then finally enable "
-		ewarn "'tools' USE flag for chromaprint. See #862996."
-	fi
-}
-
-src_unpack() {
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-
-	eapply "${FILESDIR}/vmaf-models-default-path.patch"
-
-	default
-
-	# -fdiagnostics-color=auto gets appended after user flags which
-	# will ignore user's preference.
-	sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die
-
-	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
-	local myconf=( )
-
-	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode ; then
-		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-		# Licensing.
-		if use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack sndio ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-
-	# Outdevs
-	for i in alsa oss sndio ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && myconf+=( --enable-version3 )
-	use libaribb24 && myconf+=( --enable-version3 )
-	use fdk && use gpl && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]#+}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	if use openssl ; then
-		myconf+=( --disable-gnutls )
-	fi
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in librav1e libzmq ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# LTO support, bug #566282, bug #754654, bug #772854
-	[[ ${ABI} != x86 ]] && tc-is-lto && myconf+=( "--enable-lto" )
-	filter-lto
-
-	# Mandatory configuration
-	myconf=(
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		# This is only for hardcoded cflags; those are used in configure checks that may
-		# interfere with proper detections, bug #671746 and bug #645778
-		# We use optflags, so that overrides them anyway.
-		--disable-optimizations
-		--disable-libcelt # bug #664158
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
-		case ${CHOST} in
-			*mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# doc
-	myconf+=(
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable doc htmlpages)
-		$(multilib_native_enable manpages)
-	)
-
-	# Use --extra-libs if needed for LIBS
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--nm="$(tc-getNM)" \
-		--strip="$(tc-getSTRIP)" \
-		--ranlib="$(tc-getRANLIB)" \
-		--pkg-config="$(tc-getPKG_CONFIG)" \
-		--optflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}" \
-		${EXTRA_FFMPEG_CONF}
-	echo "${@}"
-	"${@}" || die
-
-	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
-		einfo "Configuring for Chromium"
-		mkdir -p ../chromium || die
-		pushd ../chromium >/dev/null || die
-		set -- "${@}" \
-			--disable-shared \
-			--enable-static \
-			--enable-pic \
-			--disable-opencl
-		echo "${@}"
-		"${@}" || die
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			if build_separate_libffmpeg; then
-				einfo "Compiling for Chromium"
-				pushd ../chromium >/dev/null || die
-				emake V=1 libffmpeg
-				popd >/dev/null || die
-			else
-				emake V=1 libffmpeg
-			fi
-		fi
-	fi
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate -k
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-doc
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			if build_separate_libffmpeg; then
-				einfo "Installing for Chromium"
-				pushd ../chromium >/dev/null || die
-				emake V=1 DESTDIR="${D}" install-libffmpeg
-				popd >/dev/null || die
-			else
-				emake V=1 DESTDIR="${D}" install-libffmpeg
-
-				# When not built separately, libffmpeg has no code of
-				# its own so this QA check raises a false positive.
-				QA_FLAGS_IGNORED+=" usr/$(get_libdir)/chromium/.*"
-			fi
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
diff --git a/media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild
deleted file mode 100644
index aa31d2b98eb0..000000000000
--- a/media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild
+++ /dev/null
@@ -1,616 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=58.60.60
-
-SOC_PATCH="ffmpeg-rpi-7.0.patch"
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_MIN_CLONE_TYPE="single"
-	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
-HOMEPAGE="https://ffmpeg.org/"
-SRC_URI="soc? ( https://dev.gentoo.org/~chewi/distfiles/${SOC_PATCH} )"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	:
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI+=" mirror://gentoo/${P}.tar.xz"
-else # Release
-	inherit verify-sig
-
-	SRC_URI+="
-		https://ffmpeg.org/releases/${P/_/-}.tar.xz
-		verify-sig? (
-			https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc
-			soc? ( https://dev.gentoo.org/~chewi/distfiles/${SOC_PATCH}.asc )
-		)
-	"
-
-	BDEPEND="
-		verify-sig? (
-			sec-keys/openpgp-keys-ffmpeg
-			soc? ( >=sec-keys/openpgp-keys-gentoo-developers-20240708 )
-		)
-	"
-
-	src_unpack() {
-		if use verify-sig; then
-			verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc} /usr/share/openpgp-keys/ffmpeg.asc
-			use soc && verify-sig_verify_detached "${DISTDIR}"/${SOC_PATCH}{,.asc} /usr/share/openpgp-keys/gentoo-developers.asc
-		fi
-		default
-	}
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-S=${WORKDIR}/${P/_/-}
-LICENSE="
-	!gpl? ( LGPL-2.1 )
-	gpl? ( GPL-2 )
-	amr? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	gmp? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	libaribb24? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-SLOT="0/${FFMPEG_SUBSLOT}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp
-		+gpl hardcoded-tables +iconv libxml2 libdvdnav libdvdread lzma +network
-		opencl openssl +postproc qrcode:libqrencode quirc:libquirc
-		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan
-		X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
-		# libavdevice options
-		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-		opengl
-		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
-		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac
-		jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm
-		libaribb24 modplug:libmodplug opus:libopus qsv:libvpl libilbc librtmp ssh:libssh
-		speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec
-		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
-		# libavfilter options
-		appkit
-		bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite fontconfig frei0r
-		fribidi:libfribidi glslang:libglslang ladspa lcms:lcms2 libass libplacebo
-		libtesseract lv2 rubberband:librubberband shaderc:libshaderc truetype:libfreetype
-		truetype:libharfbuzz vidstab:libvidstab vmaf:libvmaf zeromq:libzmq zimg:libzimg
-		# libswresample options
-		libsoxr
-		# Threads; we only support pthread for now but ffmpeg supports more
-		+threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-	amf amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom	mp3:libmp3lame
-	openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1
-	theora:libtheora twolame:libtwolame webp:libwebp x264:libx264
-	x265:libx265 xvid:libxvid
-)
-
-IUSE="
-	alsa chromium doc +encode oss +pic sndio static-libs test v4l soc
-	${FFMPEG_FLAG_MAP[@]%:*}
-	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_thumb:armv5te
-	cpu_flags_arm_v6:armv6
-	cpu_flags_arm_thumb2:armv6t2
-	cpu_flags_arm_neon:neon
-	cpu_flags_arm_vfp:vfp
-	cpu_flags_arm_vfpv3:vfpv3
-	cpu_flags_arm_v8:armv8
-	cpu_flags_arm_asimddp:dotprod
-	cpu_flags_arm_i8mm:i8mm
-)
-ARM_CPU_REQUIRED_USE="
-	arm64? ( cpu_flags_arm_v8 )
-	cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
-	cpu_flags_arm_neon? (
-		cpu_flags_arm_vfp
-		arm? ( cpu_flags_arm_thumb2 )
-	)
-	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
-	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
-	cpu_flags_arm_v6? (
-		arm? ( cpu_flags_arm_thumb )
-	)
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx cpu_flags_ppc_vsx2:power8 )
-PPC_CPU_REQUIRED_USE="
-	cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec )
-	cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx )
-"
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx
-					   mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${MIPS_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE}
-	${CPU_FEATURES_MAP[@]%:*}"
-
-CPU_REQUIRED_USE="
-	${ARM_CPU_REQUIRED_USE}
-	${PPC_CPU_REQUIRED_USE}
-	${X86_CPU_REQUIRED_USE}
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt
-		  graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amf? ( media-video/amdgpu-pro-amf )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-	codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
-	dav1d? ( >=media-libs/dav1d-0.5.0:0=[${MULTILIB_USEDEP}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( >=media-libs/kvazaar-2.0.0[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		openh264? ( >=media-libs/openh264-1.4.0-r1:=[${MULTILIB_USEDEP}] )
-		rav1e? ( >=media-video/rav1e-0.5:=[capi] )
-		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-	glslang? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1:2=[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-2.1:2=[${MULTILIB_USEDEP}] )
-	jpegxl? ( >=media-libs/libjxl-0.7.0:=[$MULTILIB_USEDEP] )
-	lcms? ( >=media-libs/lcms-2.13:2[$MULTILIB_USEDEP] )
-	libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
-	libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.11.0:=[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-	libdvdnav? ( media-libs/libdvdnav[${MULTILIB_USEDEP}] )
-	libdvdread? ( media-libs/libdvdread:=[${MULTILIB_USEDEP}] )
-	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	libplacebo? ( >=media-libs/libplacebo-4.192.0:=[$MULTILIB_USEDEP] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
-	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	qsv? ( media-libs/libvpl[${MULTILIB_USEDEP}] )
-	qrcode? ( media-gfx/qrencode:=[${MULTILIB_USEDEP}] )
-	quirc? ( media-libs/quirc:=[${MULTILIB_USEDEP}] )
-	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-	shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] )
-	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
-	soc? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.6.0:=[sftp,${MULTILIB_USEDEP}] )
-	svg? (
-		gnome-base/librsvg:2=[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-	)
-	nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 )
-	svt-av1? ( >=media-libs/svt-av1-0.9.0:=[${MULTILIB_USEDEP}] )
-	truetype? (
-		>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
-		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
-	)
-	vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
-	vmaf? ( >=media-libs/libvmaf-2.0.0:=[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-	vulkan? ( >=media-libs/vulkan-loader-1.3.277:=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.4:=[${MULTILIB_USEDEP}]
-	)
-	zeromq? ( >=net-libs/zeromq-4.2.1:= )
-	zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-"
-
-RDEPEND="${RDEPEND}
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-	!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
-"
-
-DEPEND="${RDEPEND}
-	amf? ( media-libs/amf-headers )
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-	vulkan? ( >=dev-util/vulkan-headers-1.3.277 )
-"
-
-# += for verify-sig above
-BDEPEND+="
-	>=dev-build/make-3.81
-	virtual/pkgconfig
-	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
-	cuda? ( >=llvm-core/clang-7[llvm_targets_NVPTX] )
-	doc? ( sys-apps/texinfo )
-	test? ( net-misc/wget app-alternatives/bc )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	rubberband? ( gpl )
-	vidstab? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-	)
-"
-REQUIRED_USE="
-	chromium? ( opus )
-	cuda? ( nvenc )
-	fftools_cws2fws? ( zlib )
-	glslang? ( vulkan !shaderc )
-	libv4l? ( v4l )
-	shaderc? ( vulkan !glslang )
-	soc? ( libdrm )
-	test? ( encode )
-	vulkan? ( threads )
-	${GPL_REQUIRED_USE}
-	${CPU_REQUIRED_USE}"
-RESTRICT="
-	!test? ( test )
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/chromium-r2.patch
-	"${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-pkg_setup() {
-	# ffmpeg[chromaprint] depends on chromaprint, and chromaprint[tools] depends on ffmpeg.
-	# May cause breakage while updating, #862996, #625210, #833821.
-	if has_version media-libs/chromaprint[tools] && use chromaprint; then
-		ewarn "You have media-libs/chromaprint installed with 'tools' USE flag, which "
-		ewarn "links to ffmpeg, and you have enabled 'chromaprint' USE flag for ffmpeg, "
-		ewarn "which links to chromaprint. This may cause issues while rebuilding ffmpeg."
-		ewarn ""
-		ewarn "If your build fails to 'ERROR: chromaprint not found', rebuild chromaprint "
-		ewarn "without the 'tools' use flag first, then rebuild ffmpeg, and then finally enable "
-		ewarn "'tools' USE flag for chromaprint. See #862996."
-	fi
-}
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-
-	use soc &&
-		eapply "${DISTDIR}"/${SOC_PATCH}
-
-	default
-
-	# -fdiagnostics-color=auto gets appended after user flags which
-	# will ignore user's preference.
-	sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die
-
-	ln -snf "${FILESDIR}"/chromium.c chromium.c || die
-	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-
-	# We need to detect LTO usage before multilib stuff and filter-lto is called (bug #923491)
-	if tc-is-lto ; then
-		# Respect -flto value, e.g -flto=thin
-		local v="$(get-flag flto)"
-		[[ ${v} != -flto ]] && LTO_FLAG="--enable-lto=${v}" || LTO_FLAG="--enable-lto"
-	fi
-	filter-lto
-}
-
-multilib_src_configure() {
-	local myconf=( )
-
-	# Conditional patch options
-	use soc && myconf+=( --enable-v4l2-request --enable-libudev --enable-sand )
-
-	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode ; then
-		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-		# Licensing.
-		if use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack sndio ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-
-	# Outdevs
-	for i in alsa oss sndio ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && myconf+=( --enable-version3 )
-	use libaribb24 && myconf+=( --enable-version3 )
-	use fdk && use gpl && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]#+}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	if use openssl ; then
-		myconf+=( --disable-gnutls )
-		has_version dev-libs/openssl:0/3 && myconf+=( --enable-version3 )
-	fi
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in librav1e libzmq ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# LTO support, bug #566282, bug #754654, bug #772854
-	if [[ ${ABI} != x86 && ! -z ${LTO_FLAG} ]]; then
-		myconf+=( ${LTO_FLAG} )
-	fi
-
-	# Mandatory configuration
-	myconf=(
-		--disable-libaribcaption # libaribcaption is not packaged (yet?)
-		--disable-libxeve
-		--disable-libxevd
-		--disable-d3d12va
-		--enable-avfilter
-		--disable-stripping
-		# This is only for hardcoded cflags; those are used in configure checks that may
-		# interfere with proper detections, bug #671746 and bug #645778
-		# We use optflags, so that overrides them anyway.
-		--disable-optimizations
-		--disable-libcelt # bug #664158
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
-		case ${CHOST} in
-			*mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# doc
-	myconf+=(
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable doc htmlpages)
-		$(multilib_native_enable manpages)
-	)
-
-	if use elibc_musl ; then
-		append-cflags -D__musl__
-	fi
-
-	# Use --extra-libs if needed for LIBS
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--nm="$(tc-getNM)" \
-		--strip="$(tc-getSTRIP)" \
-		--ranlib="$(tc-getRANLIB)" \
-		--pkg-config="$(tc-getPKG_CONFIG)" \
-		--optflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}" \
-		${EXTRA_FFMPEG_CONF}
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}$(get_exeext)
-			fi
-		done
-
-		use chromium &&
-			emake V=1 libffmpeg
-	fi
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil" \
-		emake V=1 fate -k
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-doc
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}$(get_exeext)
-			fi
-		done
-
-		use chromium &&
-			emake V=1 DESTDIR="${D}" install-libffmpeg
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.3-clang-14-ff_seek_frame_binary-crash.patch b/media-video/ffmpeg/files/ffmpeg-4.4.3-clang-14-ff_seek_frame_binary-crash.patch
deleted file mode 100644
index c8733ea2382f..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-4.4.3-clang-14-ff_seek_frame_binary-crash.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://github.com/FFmpeg/FFmpeg/commit/ab792634197e364ca1bb194f9abe36836e42f12d
-
-(Rebased for 4.4.x in Gentoo.)
-
-From ab792634197e364ca1bb194f9abe36836e42f12d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
-Date: Mon, 18 Oct 2021 12:31:38 +0300
-Subject: [PATCH] seek: Fix crashes in ff_seek_frame_binary if built with
- latest Clang 14
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Passing an uninitialized variable as argument to a function is
-undefined behaviour (UB). The compiler can assume that UB does not
-happen.
-
-Hence, the compiler can assume that the variables are never
-uninitialized when passed as argument, which means that the codepaths
-that initializes them must be taken.
-
-In ff_seek_frame_binary, this means that the compiler can assume
-that the codepaths that initialize pos_min and pos_max are taken,
-which means that the conditions "if (sti->index_entries)" and
-"if (index >= 0)" can be optimized out.
-
-Current Clang git versions (upcoming Clang 14) enabled an optimization
-that does this, which broke the current version of this function
-(which intentionally left the variables uninitialized, but silencing
-warnings about being uninitialized). See [1] for discussion on
-the matter.
-
-[1] https://reviews.llvm.org/D105169#3069555
-
-Signed-off-by: Martin Storsjö <martin@martin.st>
---- a/libavformat/utils.c
-+++ b/libavformat/utils.c
-@@ -2146,7 +2146,7 @@ int ff_seek_frame_binary(AVFormatContext *s, int stream_index,
-                          int64_t target_ts, int flags)
- {
-     const AVInputFormat *avif = s->iformat;
--    int64_t av_uninit(pos_min), av_uninit(pos_max), pos, pos_limit;
-+    int64_t pos_min = 0, pos_max = 0, pos, pos_limit;
-     int64_t ts_min, ts_max, ts;
-     int index;
-     int64_t ret;
diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.4-fix-build-svt-av1-1.5.0.patch b/media-video/ffmpeg/files/ffmpeg-4.4.4-fix-build-svt-av1-1.5.0.patch
deleted file mode 100644
index c9c180f06641..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-4.4.4-fix-build-svt-av1-1.5.0.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://bugs.gentoo.org/907478
-https://bugs.gentoo.org/907493
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=c3c8f97a9804b4234e97f13b0057ffc2c9af27c0
-
-From c3c8f97a9804b4234e97f13b0057ffc2c9af27c0 Mon Sep 17 00:00:00 2001
-From: Christopher Degawa <christopher.degawa@intel.com>
-Date: Thu, 20 Oct 2022 22:55:27 -0500
-Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and
- simplify alloc_buffer
-
-compressed_ten_bit_format has been deprecated upstream and has no effect
-and can be removed. Plus, technically it was never used in the first place
-since it would require the app (ffmpeg) to set it and do additional
-processing of the input frames.
-
-Also simplify alloc_buffer by removing calculations relating to the
-non-existant processing.
-
-Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-(cherry picked from commit 031f1561cd286596cdb374da32f8aa816ce3b135)
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -120,16 +120,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
- 
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
--    const int    pack_mode_10bit =
--        (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
--    const size_t luma_size_8bit  =
--        config->source_width * config->source_height * (1 << pack_mode_10bit);
--    const size_t luma_size_10bit =
--        (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+    const size_t luma_size = config->source_width * config->source_height *
-+        (config->encoder_bit_depth > 8 ? 2 : 1);
- 
-     EbSvtIOFormat *in_data;
- 
--    svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+    svt_enc->raw_size = luma_size * 3 / 2;
- 
-     // allocate buffer for in and out
-     svt_enc->in_buf           = av_mallocz(sizeof(*svt_enc->in_buf));
--- 
-2.30.2
diff --git a/media-video/ffmpeg/files/ffmpeg-5.1.3-binutils-2.41.patch b/media-video/ffmpeg/files/ffmpeg-5.1.3-binutils-2.41.patch
deleted file mode 100644
index 7031d1f02ccf..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-5.1.3-binutils-2.41.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-https://bugs.gentoo.org/911582
-https://trac.ffmpeg.org/ticket/10405
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e
-https://sourceware.org/PR30578
-https://gcc.gnu.org/PR108941
-
-From 25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e Mon Sep 17 00:00:00 2001
-From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
-(cherry picked from commit effadce6c756247ea8bae32dc13bb3e6f464f0eb)
---- a/libavcodec/x86/mathops.h
-+++ b/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
-     int rt, dummy;
-+    if (__builtin_constant_p(shift))
-     __asm__ (
-         "imull %3               \n\t"
-         "shrdl %4, %%edx, %%eax \n\t"
-         :"=a"(rt), "=d"(dummy)
--        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+        :"a"(a), "rm"(b), "i"(shift & 0x1F)
-     );
-+    else
-+        __asm__ (
-+            "imull %3               \n\t"
-+            "shrdl %4, %%edx, %%eax \n\t"
-+            :"=a"(rt), "=d"(dummy)
-+            :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+        );
-     return rt;
- }
- 
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
-+    if (__builtin_constant_p(s))
-     __asm__ ("sarl %1, %0\n\t"
-          : "+r" (a)
--         : "ic" ((uint8_t)(-s))
-+         : "i" (-s & 0x1F)
-     );
-+    else
-+        __asm__ ("sarl %1, %0\n\t"
-+               : "+r" (a)
-+               : "c" ((uint8_t)(-s))
-+        );
-     return a;
- }
- 
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+    if (__builtin_constant_p(s))
-     __asm__ ("shrl %1, %0\n\t"
-          : "+r" (a)
--         : "ic" ((uint8_t)(-s))
-+         : "i" (-s & 0x1F)
-     );
-+    else
-+        __asm__ ("shrl %1, %0\n\t"
-+               : "+r" (a)
-+               : "c" ((uint8_t)(-s))
-+        );
-     return a;
- }
- 
--- 
-2.30.2
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 3d2dc38d7690..9b9a1e18220a 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1 +1,2 @@
 DIST guvcview-src-2.1.0.tar.bz2 775670 BLAKE2B e6f0fe87b1c44e00265228195b93bb5863170487fd1c3b9741667dc32295406bd920f44150efaecb42ab9396ec67897d3bef517e29ee788c2a6a8a6a95692f81 SHA512 f449e1b1623bb2a96847fc88c4e334ff5bde91f0f9779e37ccbd5777fb96ea4106c3df2c9c30f5d6cacf99e4da04815fc3b739387c2a8fb496c3080b1f99ab70
+DIST guvcview-src-2.2.1.tar.bz2 355747 BLAKE2B 57b1ea3a38ce4dbd68220b3a5caacf2f0b3e4b8cd880667988ea13bf50f495cb761249df2fc7ddf24fcdea19b6b4317b5ec1fc63202987bc7820d6095913233f SHA512 3757ff41306c6c02b3a0fcb7f9a4499e90271e47a2dd97f75a2a809caf32a0a0ceaf28c2475bf707017009f8bf9aa7fcef36cb4386b08311998b51d7122cefea
diff --git a/media-video/guvcview/files/guvcview-2.2.1-fix-desktop-file-for-cmake.patch b/media-video/guvcview/files/guvcview-2.2.1-fix-desktop-file-for-cmake.patch
new file mode 100644
index 000000000000..4748def9a922
--- /dev/null
+++ b/media-video/guvcview/files/guvcview-2.2.1-fix-desktop-file-for-cmake.patch
@@ -0,0 +1,86 @@
+https://sourceforge.net/p/guvcview/git-master/ci/39f76eda4d66ef7b2303ce795e701e43fafadff2
+From 39f76eda4d66ef7b2303ce795e701e43fafadff2 Mon Sep 17 00:00:00 2001
+From: Paulo Assis <pj.assis@gmail.com>
+Date: Mon, 2 Dec 2024 14:19:01 +0000
+Subject: [PATCH] Fix desktop file for cmake
+
+---
+ data/guvcview.desktop.in | 64 +++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 60 insertions(+), 4 deletions(-)
+
+diff --git a/data/guvcview.desktop.in b/data/guvcview.desktop.in
+index c086c21..ca02856 100644
+--- a/data/guvcview.desktop.in
++++ b/data/guvcview.desktop.in
+@@ -1,8 +1,64 @@
+ [Desktop Entry]
+-_Name=guvcview
+-_GenericName=GTK UVC video viewer
+-_X-GNOME-FullName=GTK UVC video viewer
+-_Comment=A video viewer and capturer for the linux uvc driver
++Name=guvcview
++Name[cs]=guvcview
++Name[de]=GUVCView
++Name[en_AU]=guvcview
++Name[es]=guvcview
++Name[fr]=guvcview
++Name[it]=guvcview
++Name[lv]=guvcview
++Name[nl]=guvcview
++Name[pt]=guvcview
++Name[pt_BR]=guvcview
++Name[ru]=guvcview
++Name[si]=guvcview
++Name[sr]=Камерица
++Name[tr]=guvcview
++GenericName=GTK UVC video viewer
++GenericName[cs]=ProhlĂ­ĹľeÄŤ videa GTK UVC
++GenericName[de]=UVC-Video-Betrachter in GTK
++GenericName[en_AU]=GTK UVC video viewer
++GenericName[es]=Visualizador GTK de vĂ­deo UVC
++GenericName[fr]=Logiciel GTK de visualisation de vidéo UVC
++GenericName[it]=GTK UVC visualizzatore video
++GenericName[lv]=GTK UVC video skatīt�js
++GenericName[nl]=GTK UVC videokijker
++GenericName[pt]=Visualizador de vĂ­deo GTK UVC
++GenericName[pt_BR]=Visualizador de vĂ­deo GTK UVC
++GenericName[ru]=GTK UVC видео обозреватель
++GenericName[si]=GTK UVC වීඩියෝ දකින්නා
++GenericName[sr]=ГТК УВЦ видео приказивач
++GenericName[tr]=GTK UVC video görüntüleyici
++X-GNOME-FullName=GTK UVC video viewer
++X-GNOME-FullName[cs]=ProhlĂ­ĹľeÄŤ videa GTK UVC
++X-GNOME-FullName[de]=UVC-Video-Betrachter in GTK
++X-GNOME-FullName[en_AU]=GTK UVC video viewer
++X-GNOME-FullName[es]=Visualizador GTK de vĂ­deo UVC
++X-GNOME-FullName[fr]=Logiciel GTK de visualisation de vidéo UVC
++X-GNOME-FullName[it]=GTK UVC visualizzatore video
++X-GNOME-FullName[lv]=GTK UVC video skatīt�js
++X-GNOME-FullName[nl]=GTK UVC videokijker
++X-GNOME-FullName[pt]=Visualizador de vĂ­deo GTK UVC
++X-GNOME-FullName[pt_BR]=Visualizador de vĂ­deo GTK UVC
++X-GNOME-FullName[ru]=GTK UVC видео обозреватель
++X-GNOME-FullName[si]=GTK UVC වීඩියෝ දකින්නා
++X-GNOME-FullName[sr]=ГТК УВЦ видео приказивач
++X-GNOME-FullName[tr]=GTK UVC video görüntüleyici
++Comment=A video viewer and capturer for the linux uvc driver
++Comment[cs]=Prohlížení a zachytávání videa z linuxových uvc ovladačů
++Comment[de]=Ein Video-Betrachter und Aufnahmewerkzeug fĂĽr den Linux-UVC-Treiber
++Comment[en_AU]=A video viewer and capturer for the linux uvc driver
++Comment[es]=Un visualizador y capturador de vĂ­deo para el controlador UVC de Linux
++Comment[fr]=Logiciel de visualisation et de capture vidéo pour le pilote uvc Linux
++Comment[it]=Un visualizzatore e catturatore video per il driver uvc di linux
++Comment[lv]=Video skatīt�js un uzņēmējs Linux UVC draiverim
++Comment[nl]=Een programma voor het bekijken en opnemen van video, voor het Linuxstuurprogramma uvc
++Comment[pt]=Um visualizador e capturador de de vĂ­deo para o controlador linux uvc
++Comment[pt_BR]=Um visualizador e capturador de de vĂ­deo para o controlador linux uvc
++Comment[ru]=Программа про�мотра и запи�и видео для драйвера Linux UVC
++Comment[si]=ලිනක්�් uvc ඩ්‍රයිවරය �ඳහා වීඩියෝ පෙන්වන්නා �හ ග්‍රහණය කරන්නා
++Comment[sr]=Приказивач и �нимач видеа за лин�к�ов �вц �прављачки програм
++Comment[tr]=Linux uvc sürücüsü için video görüntüleyici ve yakalayıcı
+ TryExec=guvcview
+ Exec=guvcview
+ Icon=@DATADIR@/pixmaps/guvcview.png
+-- 
+2.45.2
+
diff --git a/media-video/guvcview/files/guvcview-2.2.1-set-metainfo-dir.patch b/media-video/guvcview/files/guvcview-2.2.1-set-metainfo-dir.patch
new file mode 100644
index 000000000000..dc0285fa7afa
--- /dev/null
+++ b/media-video/guvcview/files/guvcview-2.2.1-set-metainfo-dir.patch
@@ -0,0 +1,11 @@
+--- a/data/CMakeLists.txt
++++ b/data/CMakeLists.txt
+@@ -16,7 +16,7 @@
+   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/guvcview DESTINATION ${DATADIR}/menu)
+ endif()
+ 
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/guvcview.appdata.xml DESTINATION ${DATADIR}/appdata)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/guvcview.appdata.xml DESTINATION ${DATADIR}/metainfo)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/guvcview.desktop DESTINATION ${DATADIR}/applications)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/guvcview.1.gz DESTINATION ${DATADIR}/man/man1)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/guvcview.png DESTINATION ${DATADIR}/pixmaps)
diff --git a/media-video/guvcview/guvcview-2.2.1.ebuild b/media-video/guvcview/guvcview-2.2.1.ebuild
new file mode 100644
index 000000000000..3894905e46a1
--- /dev/null
+++ b/media-video/guvcview/guvcview-2.2.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Simple Qt6 or GTK+3 interface for capturing and viewing video from v4l2 devices"
+HOMEPAGE="https://guvcview.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/${PN}/source/${PN}-src-${PV}.tar.bz2"
+S="${WORKDIR}/${PN}-src-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gsl pulseaudio qt6 sfml"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	media-libs/libpng:=
+	media-libs/libv4l
+	media-libs/portaudio
+	media-video/ffmpeg:=
+	virtual/libusb:1
+	virtual/udev
+	gsl? ( sci-libs/gsl:= )
+	pulseaudio? ( media-libs/libpulse )
+	qt6? ( dev-qt/qtbase:6[gui,widgets]	)
+	!qt6? (
+		dev-libs/glib:2
+		x11-libs/gtk+:3
+	)
+	sfml? (
+		media-libs/libglvnd
+		media-libs/libsfml:=
+	)
+	!sfml? ( media-libs/libsdl2 )
+"
+# linux-headers: bug 448260
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+	!qt6? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-fix-desktop-file-for-cmake.patch
+	"${FILESDIR}"/${PN}-2.2.1-set-metainfo-dir.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_DEVKIT=ON
+		-DUSE_DEBIANMENU=OFF
+		-DUSE_PULSE=$(usex pulseaudio)
+		-DUSE_GTK3=$(usex !qt6)
+		-DUSE_QT6=$(usex qt6)
+		-DUSE_SDL2=$(usex !sfml)
+		-DUSE_SFML=$(usex sfml)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	gunzip "${ED}"/usr/share/man/man1/guvcview.1.gz || die
+}
diff --git a/media-video/guvcview/metadata.xml b/media-video/guvcview/metadata.xml
index b0fc701d591b..cd4de82a9cb8 100644
--- a/media-video/guvcview/metadata.xml
+++ b/media-video/guvcview/metadata.xml
@@ -9,5 +9,7 @@
 	</upstream>
 	<use>
 		<flag name="qt5">Build with Qt5 interface instead Gtk+</flag>
+		<flag name="qt6">Build with Qt6 interface instead Gtk+</flag>
+		<flag name="sfml">Build with SFML X11-engine instead of sdl</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-video/makemkv/makemkv-1.17.8.ebuild b/media-video/makemkv/makemkv-1.17.8.ebuild
index c8dd8c6309b2..792e4df29072 100644
--- a/media-video/makemkv/makemkv-1.17.8.ebuild
+++ b/media-video/makemkv/makemkv-1.17.8.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 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE="+gui +java"
 RESTRICT="bindist mirror"
 
diff --git a/media-video/mkvtoolnix/mkvtoolnix-88.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-88.0.ebuild
index 6731cce63b2d..11168efe0a43 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-88.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-88.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
@@ -17,7 +17,7 @@ else
 		https://mkvtoolnix.download/sources/${P}.tar.xz
 		verify-sig? ( https://mkvtoolnix.download/sources/${P}.tar.xz.sig )
 	"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc ppc64 ~x86"
 
 	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/mkvtoolnix.asc"
 fi
diff --git a/media-video/obs-studio/obs-studio-30.2.3-r1.ebuild b/media-video/obs-studio/obs-studio-30.2.3-r1.ebuild
new file mode 100644
index 000000000000..81b7effe5cfc
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-30.2.3-r1.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg
+
+CEF_DIR="cef_binary_5060_linux_x86_64"
+CEF_REVISION="_v3"
+OBS_BROWSER_COMMIT="c710222ec9d7ef9aa5d7099e9019d636e2c89f00"
+OBS_WEBSOCKET_COMMIT="0548c7798a323fe5296c150e13b898a5ee62fc1e"
+
+DESCRIPTION="Software for Recording and Streaming Live Video Content"
+HOMEPAGE="https://obsproject.com"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
+	EGIT_SUBMODULES=(
+		plugins/obs-browser
+		plugins/obs-websocket
+	)
+else
+	SRC_URI="
+		https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz
+		https://github.com/obsproject/obs-websocket/archive/${OBS_WEBSOCKET_COMMIT}.tar.gz -> obs-websocket-${OBS_WEBSOCKET_COMMIT}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}${CEF_REVISION}.tar.xz )"
+
+LICENSE="Boost-1.0 GPL-2+ MIT Unlicense"
+SLOT="0"
+IUSE="
+	+alsa browser decklink fdk jack lua mpegts nvenc pipewire pulseaudio
+	python qsv speex +ssl test truetype v4l vlc wayland websocket
+"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	browser? ( || ( alsa pulseaudio ) )
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+BDEPEND="
+	lua? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+"
+# media-video/ffmpeg[opus] required due to bug 909566
+DEPEND="
+	dev-cpp/nlohmann_json
+	dev-libs/glib:2
+	dev-libs/jansson:=
+	dev-libs/uthash
+	dev-qt/qtbase:6[network,widgets,xml(+)]
+	dev-qt/qtsvg:6
+	media-libs/libglvnd[X]
+	media-libs/libva
+	media-libs/rnnoise
+	media-libs/x264:=
+	media-video/ffmpeg:=[nvenc?,opus,x264]
+	net-misc/curl
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-apps/util-linux
+	sys-libs/zlib:=
+	x11-libs/libX11
+	x11-libs/libxcb:=
+	x11-libs/libXcomposite
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	alsa? ( media-libs/alsa-lib )
+	browser? (
+		|| (
+			>=app-accessibility/at-spi2-core-2.46.0:2
+			( app-accessibility/at-spi2-atk dev-libs/atk )
+		)
+		dev-libs/expat
+		dev-libs/glib
+		dev-libs/nspr
+		dev-libs/nss
+		dev-libs/wayland
+		media-libs/alsa-lib
+		media-libs/fontconfig
+		media-libs/mesa[gbm(+)]
+		net-print/cups
+		x11-libs/cairo
+		x11-libs/libdrm
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libxkbcommon
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXScrnSaver
+		x11-libs/libxshmfence
+		x11-libs/libXtst
+		x11-libs/pango
+	)
+	fdk? ( media-libs/fdk-aac:= )
+	jack? ( virtual/jack )
+	lua? ( ${LUA_DEPS} )
+	mpegts? (
+		net-libs/librist
+		net-libs/srt
+	)
+	nvenc? ( >=media-libs/nv-codec-headers-12 )
+	pipewire? ( media-video/pipewire:= )
+	pulseaudio? ( media-libs/libpulse )
+	python? ( ${PYTHON_DEPS} )
+	qsv? ( media-libs/libvpl )
+	speex? ( media-libs/speexdsp )
+	ssl? ( net-libs/mbedtls:0= )
+	test? ( dev-util/cmocka )
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	v4l? (
+		media-libs/libv4l
+		virtual/udev
+	)
+	vlc? ( media-video/vlc:= )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	websocket? (
+		dev-cpp/asio
+		dev-cpp/websocketpp
+		dev-libs/qr-code-generator
+	)
+"
+RDEPEND="${DEPEND}
+	qsv? ( media-libs/intel-mediasdk )
+"
+
+QA_PREBUILT="
+	usr/lib*/obs-plugins/chrome-sandbox
+	usr/lib*/obs-plugins/libcef.so
+	usr/lib*/obs-plugins/libEGL.so
+	usr/lib*/obs-plugins/libGLESv2.so
+	usr/lib*/obs-plugins/libvk_swiftshader.so
+	usr/lib*/obs-plugins/libvulkan.so.1
+	usr/lib*/obs-plugins/swiftshader/libEGL.so
+	usr/lib*/obs-plugins/swiftshader/libGLESv2.so
+"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		rm -d ${P}/plugins/obs-browser || die
+		mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die
+
+		rm -d ${P}/plugins/obs-websocket || die
+		mv obs-websocket-${OBS_WEBSOCKET_COMMIT} ${P}/plugins/obs-websocket || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i '/-Werror$/d' "${WORKDIR}"/${P}/cmake/Modules/CompilerConfig.cmake || die
+
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/867250
+	# https://github.com/obsproject/obs-studio/issues/8988
+	use wayland && filter-lto
+
+	cmake_src_prepare
+
+	pushd deps/json11 &> /dev/null || die
+		eapply "${FILESDIR}/json11-1.0.0-include-cstdint.patch"
+	popd &> /dev/null || die
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		$(usev browser -DCEF_ROOT_DIR=../${CEF_DIR})
+		-DCALM_DEPRECATION=ON
+		-DCCACHE_SUPPORT=OFF
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AJA=OFF
+		-DENABLE_BROWSER=$(usex browser)
+		-DENABLE_DECKLINK=$(usex decklink)
+		-DENABLE_FREETYPE=$(usex truetype)
+		-DENABLE_JACK=$(usex jack)
+		-DENABLE_LIBFDK=$(usex fdk)
+		-DENABLE_NATIVE_NVENC=OFF
+		-DENABLE_NEW_MPEGTS_OUTPUT=$(usex mpegts)
+		-DENABLE_PIPEWIRE=$(usex pipewire)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_QSV11=$(usex qsv)
+		-DENABLE_RNNOISE=ON
+		-DENABLE_RTMPS=$(usex ssl ON OFF) # Needed for bug 880861
+		-DENABLE_SPEEXDSP=$(usex speex)
+		-DENABLE_UNIT_TESTS=$(usex test)
+		-DENABLE_V4L2=$(usex v4l)
+		-DENABLE_VLC=$(usex vlc)
+		-DENABLE_VST=ON
+		-DENABLE_WAYLAND=$(usex wayland)
+		-DENABLE_WEBRTC=OFF # Requires libdatachannel.
+		-DENABLE_WEBSOCKET=$(usex websocket)
+		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
+		-DUNIX_STRUCTURE=1
+	)
+
+	if [[ ${PV} != 9999 ]]; then
+		mycmakeargs+=(
+			-DOBS_VERSION_OVERRIDE=${PV}
+		)
+	fi
+
+	if use lua || use python; then
+		mycmakeargs+=(
+			-DENABLE_SCRIPTING_LUA=$(usex lua)
+			-DENABLE_SCRIPTING_PYTHON=$(usex python)
+			-DENABLE_SCRIPTING=ON
+		)
+	else
+		mycmakeargs+=( -DENABLE_SCRIPTING=OFF )
+	fi
+
+	if use browser && use ssl; then
+		mycmakeargs+=( -DENABLE_WHATSNEW=ON )
+	else
+		mycmakeargs+=( -DENABLE_WHATSNEW=OFF )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# external plugins may need some things not installed by default, install them here
+	insinto /usr/include/obs/UI/obs-frontend-api
+	doins UI/obs-frontend-api/obs-frontend-api.h
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use alsa && ! use pulseaudio; then
+		elog
+		elog "For the audio capture features to be available,"
+		elog "at least one of the 'alsa' or 'pulseaudio' USE-flags needs to"
+		elog "be enabled."
+		elog
+	fi
+
+	if use v4l && has_version media-video/v4l2loopback; then
+		elog
+		elog "Depending on system configuration, the v4l2loopback kernel module"
+		elog "may need to be loaded manually, and needs to be re-built after"
+		elog "kernel changes."
+		elog
+	fi
+
+	optfeature "VA-API hardware encoding" media-video/ffmpeg[vaapi]
+	optfeature "virtual camera support" media-video/v4l2loopback
+}
diff --git a/media-video/obs-studio/obs-studio-30.2.3.ebuild b/media-video/obs-studio/obs-studio-30.2.3.ebuild
deleted file mode 100644
index 043f43465d42..000000000000
--- a/media-video/obs-studio/obs-studio-30.2.3.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{9..12} )
-
-inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg
-
-CEF_DIR="cef_binary_5060_linux_x86_64"
-CEF_REVISION="_v3"
-OBS_BROWSER_COMMIT="c710222ec9d7ef9aa5d7099e9019d636e2c89f00"
-OBS_WEBSOCKET_COMMIT="0548c7798a323fe5296c150e13b898a5ee62fc1e"
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
-	EGIT_SUBMODULES=(
-		plugins/obs-browser
-		plugins/obs-websocket
-	)
-else
-	SRC_URI="
-		https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz
-		https://github.com/obsproject/obs-websocket/archive/${OBS_WEBSOCKET_COMMIT}.tar.gz -> obs-websocket-${OBS_WEBSOCKET_COMMIT}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}${CEF_REVISION}.tar.xz )"
-
-LICENSE="Boost-1.0 GPL-2+ MIT Unlicense"
-SLOT="0"
-IUSE="
-	+alsa browser decklink fdk jack lua mpegts nvenc pipewire pulseaudio
-	python qsv speex +ssl test truetype v4l vlc wayland websocket
-"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	browser? ( || ( alsa pulseaudio ) )
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-BDEPEND="
-	lua? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-"
-# media-video/ffmpeg[opus] required due to bug 909566
-DEPEND="
-	dev-cpp/nlohmann_json
-	dev-libs/glib:2
-	dev-libs/jansson:=
-	dev-libs/uthash
-	dev-qt/qtbase:6[network,widgets,xml(+)]
-	dev-qt/qtsvg:6
-	media-libs/libglvnd[X]
-	media-libs/libva
-	media-libs/rnnoise
-	media-libs/x264:=
-	media-video/ffmpeg:=[nvenc?,opus,x264]
-	net-misc/curl
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-apps/util-linux
-	sys-libs/zlib:=
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/libXcomposite
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	alsa? ( media-libs/alsa-lib )
-	browser? (
-		|| (
-			>=app-accessibility/at-spi2-core-2.46.0:2
-			( app-accessibility/at-spi2-atk dev-libs/atk )
-		)
-		dev-libs/expat
-		dev-libs/glib
-		dev-libs/nspr
-		dev-libs/nss
-		dev-libs/wayland
-		media-libs/alsa-lib
-		media-libs/fontconfig
-		media-libs/mesa[gbm(+)]
-		net-print/cups
-		x11-libs/cairo
-		x11-libs/libdrm
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libxkbcommon
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXScrnSaver
-		x11-libs/libxshmfence
-		x11-libs/libXtst
-		x11-libs/pango
-	)
-	fdk? ( media-libs/fdk-aac:= )
-	jack? ( virtual/jack )
-	lua? ( ${LUA_DEPS} )
-	mpegts? (
-		net-libs/librist
-		net-libs/srt
-	)
-	nvenc? ( >=media-libs/nv-codec-headers-12 )
-	pipewire? ( media-video/pipewire:= )
-	pulseaudio? ( media-libs/libpulse )
-	python? ( ${PYTHON_DEPS} )
-	qsv? ( media-libs/libvpl )
-	speex? ( media-libs/speexdsp )
-	ssl? ( net-libs/mbedtls:= )
-	test? ( dev-util/cmocka )
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	v4l? (
-		media-libs/libv4l
-		virtual/udev
-	)
-	vlc? ( media-video/vlc:= )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	websocket? (
-		dev-cpp/asio
-		dev-cpp/websocketpp
-		dev-libs/qr-code-generator
-	)
-"
-RDEPEND="${DEPEND}
-	qsv? ( media-libs/intel-mediasdk )
-"
-
-QA_PREBUILT="
-	usr/lib*/obs-plugins/chrome-sandbox
-	usr/lib*/obs-plugins/libcef.so
-	usr/lib*/obs-plugins/libEGL.so
-	usr/lib*/obs-plugins/libGLESv2.so
-	usr/lib*/obs-plugins/libvk_swiftshader.so
-	usr/lib*/obs-plugins/libvulkan.so.1
-	usr/lib*/obs-plugins/swiftshader/libEGL.so
-	usr/lib*/obs-plugins/swiftshader/libGLESv2.so
-"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		rm -d ${P}/plugins/obs-browser || die
-		mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die
-
-		rm -d ${P}/plugins/obs-websocket || die
-		mv obs-websocket-${OBS_WEBSOCKET_COMMIT} ${P}/plugins/obs-websocket || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i '/-Werror$/d' "${WORKDIR}"/${P}/cmake/Modules/CompilerConfig.cmake || die
-
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/867250
-	# https://github.com/obsproject/obs-studio/issues/8988
-	use wayland && filter-lto
-
-	cmake_src_prepare
-
-	pushd deps/json11 &> /dev/null || die
-		eapply "${FILESDIR}/json11-1.0.0-include-cstdint.patch"
-	popd &> /dev/null || die
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		$(usev browser -DCEF_ROOT_DIR=../${CEF_DIR})
-		-DCALM_DEPRECATION=ON
-		-DCCACHE_SUPPORT=OFF
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AJA=OFF
-		-DENABLE_BROWSER=$(usex browser)
-		-DENABLE_DECKLINK=$(usex decklink)
-		-DENABLE_FREETYPE=$(usex truetype)
-		-DENABLE_JACK=$(usex jack)
-		-DENABLE_LIBFDK=$(usex fdk)
-		-DENABLE_NATIVE_NVENC=OFF
-		-DENABLE_NEW_MPEGTS_OUTPUT=$(usex mpegts)
-		-DENABLE_PIPEWIRE=$(usex pipewire)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_QSV11=$(usex qsv)
-		-DENABLE_RNNOISE=ON
-		-DENABLE_RTMPS=$(usex ssl ON OFF) # Needed for bug 880861
-		-DENABLE_SPEEXDSP=$(usex speex)
-		-DENABLE_UNIT_TESTS=$(usex test)
-		-DENABLE_V4L2=$(usex v4l)
-		-DENABLE_VLC=$(usex vlc)
-		-DENABLE_VST=ON
-		-DENABLE_WAYLAND=$(usex wayland)
-		-DENABLE_WEBRTC=OFF # Requires libdatachannel.
-		-DENABLE_WEBSOCKET=$(usex websocket)
-		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
-		-DUNIX_STRUCTURE=1
-	)
-
-	if [[ ${PV} != 9999 ]]; then
-		mycmakeargs+=(
-			-DOBS_VERSION_OVERRIDE=${PV}
-		)
-	fi
-
-	if use lua || use python; then
-		mycmakeargs+=(
-			-DENABLE_SCRIPTING_LUA=$(usex lua)
-			-DENABLE_SCRIPTING_PYTHON=$(usex python)
-			-DENABLE_SCRIPTING=ON
-		)
-	else
-		mycmakeargs+=( -DENABLE_SCRIPTING=OFF )
-	fi
-
-	if use browser && use ssl; then
-		mycmakeargs+=( -DENABLE_WHATSNEW=ON )
-	else
-		mycmakeargs+=( -DENABLE_WHATSNEW=OFF )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# external plugins may need some things not installed by default, install them here
-	insinto /usr/include/obs/UI/obs-frontend-api
-	doins UI/obs-frontend-api/obs-frontend-api.h
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use alsa && ! use pulseaudio; then
-		elog
-		elog "For the audio capture features to be available,"
-		elog "at least one of the 'alsa' or 'pulseaudio' USE-flags needs to"
-		elog "be enabled."
-		elog
-	fi
-
-	if use v4l && has_version media-video/v4l2loopback; then
-		elog
-		elog "Depending on system configuration, the v4l2loopback kernel module"
-		elog "may need to be loaded manually, and needs to be re-built after"
-		elog "kernel changes."
-		elog
-	fi
-
-	optfeature "VA-API hardware encoding" media-video/ffmpeg[vaapi]
-	optfeature "virtual camera support" media-video/v4l2loopback
-}
diff --git a/media-video/obs-studio/obs-studio-31.0.0-r2.ebuild b/media-video/obs-studio/obs-studio-31.0.0-r2.ebuild
deleted file mode 100644
index 79bc62763bf4..000000000000
--- a/media-video/obs-studio/obs-studio-31.0.0-r2.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-LUA_COMPAT=( luajit )
-# For the time being upstream supports up to Python 3.12 only.
-# Any issues found with 3.13 should be reported as a Gentoo bug.
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg
-
-CEF_VERSION="cef_binary_6533_linux_x86_64"
-OBS_BROWSER_COMMIT="a76b4d8810a0a33e91ac5b76a0b1af2f22bf8efd"
-OBS_WEBSOCKET_COMMIT="eed8a49933786383d11f4868a4e5604a9ee303c6"
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
-	EGIT_SUBMODULES=(
-		plugins/obs-browser
-		plugins/obs-websocket
-	)
-else
-	SRC_URI="
-		https://github.com/obsproject/${PN}/archive/${PV}.tar.gz
-			-> ${P}.tar.gz
-		https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz
-			-> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz
-		https://github.com/obsproject/obs-websocket/archive/${OBS_WEBSOCKET_COMMIT}.tar.gz
-			-> obs-websocket-${OBS_WEBSOCKET_COMMIT}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_VERSION}.tar.xz )"
-
-LICENSE="Boost-1.0 GPL-2+ MIT Unlicense"
-SLOT="0"
-IUSE="
-	+alsa browser decklink fdk jack lua mpegts nvenc pipewire pulseaudio
-	python qsv sndio speex test-input truetype v4l vlc wayland websocket
-"
-REQUIRED_USE="
-	browser? ( || ( alsa pulseaudio ) )
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-BDEPEND="
-	lua? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-"
-# media-video/ffmpeg[opus] required due to bug 909566
-DEPEND="
-	dev-cpp/nlohmann_json
-	dev-libs/glib:2
-	dev-libs/jansson:=
-	dev-libs/uthash
-	dev-qt/qtbase:6[network,widgets,xml(+)]
-	dev-qt/qtsvg:6
-	media-libs/libglvnd[X]
-	media-libs/libva
-	media-libs/rnnoise
-	media-libs/x264:=
-	>=media-video/ffmpeg-6.1:=[nvenc?,opus,x264]
-	net-misc/curl
-	net-libs/mbedtls:=
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-apps/util-linux
-	sys-libs/zlib:=
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/libXcomposite
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	alsa? ( media-libs/alsa-lib )
-	browser? (
-		|| (
-			>=app-accessibility/at-spi2-core-2.46.0:2
-			( app-accessibility/at-spi2-atk dev-libs/atk )
-		)
-		dev-libs/expat
-		dev-libs/glib
-		dev-libs/nspr
-		dev-libs/nss
-		dev-libs/wayland
-		media-libs/alsa-lib
-		media-libs/fontconfig
-		media-libs/mesa[gbm(+)]
-		net-print/cups
-		x11-libs/cairo
-		x11-libs/libdrm
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libxkbcommon
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXScrnSaver
-		x11-libs/libxshmfence
-		x11-libs/libXtst
-		x11-libs/pango
-	)
-	fdk? ( media-libs/fdk-aac:= )
-	jack? ( virtual/jack )
-	lua? ( ${LUA_DEPS} )
-	mpegts? (
-		net-libs/librist
-		net-libs/srt
-	)
-	nvenc? ( >=media-libs/nv-codec-headers-12 )
-	pipewire? ( media-video/pipewire:= )
-	pulseaudio? ( media-libs/libpulse )
-	python? ( ${PYTHON_DEPS} )
-	qsv? ( media-libs/libvpl )
-	sndio? ( media-sound/sndio )
-	speex? ( media-libs/speexdsp )
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	v4l? (
-		media-libs/libv4l
-		virtual/udev
-	)
-	vlc? ( media-video/vlc:= )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	websocket? (
-		dev-cpp/asio
-		dev-cpp/websocketpp
-		dev-libs/qr-code-generator
-	)
-"
-RDEPEND="${DEPEND}
-	qsv? ( media-libs/intel-mediasdk )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-31.0.0-libx11-link.patch )
-
-QA_PREBUILT="
-	usr/lib*/obs-plugins/chrome-sandbox
-	usr/lib*/obs-plugins/libcef.so
-	usr/lib*/obs-plugins/libEGL.so
-	usr/lib*/obs-plugins/libGLESv2.so
-	usr/lib*/obs-plugins/libvk_swiftshader.so
-	usr/lib*/obs-plugins/libvulkan.so.1
-	usr/lib*/obs-plugins/swiftshader/libEGL.so
-	usr/lib*/obs-plugins/swiftshader/libGLESv2.so
-"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		rm -d ${P}/plugins/obs-browser || die
-		mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die
-
-		rm -d ${P}/plugins/obs-websocket || die
-		mv obs-websocket-${OBS_WEBSOCKET_COMMIT} ${P}/plugins/obs-websocket || die
-	fi
-}
-
-src_prepare() {
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/867250
-	# https://github.com/obsproject/obs-studio/issues/8988
-	use wayland && filter-lto
-
-	cmake_src_prepare
-
-	pushd deps/json11 &> /dev/null || die
-		eapply "${FILESDIR}/json11-1.0.0-include-cstdint.patch"
-	popd &> /dev/null || die
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		$(usev browser -DCEF_ROOT_DIR=../${CEF_VERSION})
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AJA=OFF
-		-DENABLE_BROWSER=$(usex browser)
-		-DENABLE_CCACHE=OFF
-		-DENABLE_DECKLINK=$(usex decklink)
-		-DENABLE_FFMPEG_NVENC=$(usex nvenc)
-		-DENABLE_FREETYPE=$(usex truetype)
-		-DENABLE_JACK=$(usex jack)
-		-DENABLE_LIBFDK=$(usex fdk)
-		-DENABLE_NEW_MPEGTS_OUTPUT=$(usex mpegts)
-		-DENABLE_NVENC=$(usex nvenc)
-		-DENABLE_PIPEWIRE=$(usex pipewire)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_QSV11=$(usex qsv)
-		-DENABLE_RNNOISE=ON
-		-DENABLE_SNDIO=$(usex sndio)
-		-DENABLE_SPEEXDSP=$(usex speex)
-		-DENABLE_TEST_INPUT=$(usex test-input)
-		-DENABLE_V4L2=$(usex v4l)
-		-DENABLE_VLC=$(usex vlc)
-		-DENABLE_VST=ON
-		-DENABLE_WAYLAND=$(usex wayland)
-		-DENABLE_WEBRTC=OFF # Requires libdatachannel.
-		-DENABLE_WEBSOCKET=$(usex websocket)
-	)
-
-	if [[ ${PV} != 9999 ]]; then
-		mycmakeargs+=(
-			-DOBS_VERSION_OVERRIDE=${PV}
-		)
-	fi
-
-	if use lua || use python; then
-		mycmakeargs+=(
-			-DENABLE_SCRIPTING_LUA=$(usex lua)
-			-DENABLE_SCRIPTING_PYTHON=$(usex python)
-			-DENABLE_SCRIPTING=ON
-		)
-	else
-		mycmakeargs+=( -DENABLE_SCRIPTING=OFF )
-	fi
-
-	if use browser; then
-		mycmakeargs+=( -DENABLE_WHATSNEW=ON )
-	else
-		mycmakeargs+=( -DENABLE_WHATSNEW=OFF )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# external plugins may need some things not installed by default, install them here
-	insinto /usr/include/obs/UI/obs-frontend-api
-	doins UI/obs-frontend-api/obs-frontend-api.h
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use alsa && ! use pulseaudio; then
-		elog
-		elog "For the audio capture features to be available,"
-		elog "at least one of the 'alsa' or 'pulseaudio' USE-flags needs to"
-		elog "be enabled."
-		elog
-	fi
-
-	if use v4l && has_version media-video/v4l2loopback; then
-		elog
-		elog "Depending on system configuration, the v4l2loopback kernel module"
-		elog "may need to be loaded manually, and needs to be re-built after"
-		elog "kernel changes."
-		elog
-	fi
-
-	optfeature "VA-API hardware encoding" media-video/ffmpeg[vaapi]
-	optfeature "virtual camera support" media-video/v4l2loopback
-}
diff --git a/media-video/obs-studio/obs-studio-31.0.0-r3.ebuild b/media-video/obs-studio/obs-studio-31.0.0-r3.ebuild
new file mode 100644
index 000000000000..7f7837436298
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-31.0.0-r3.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+LUA_COMPAT=( luajit )
+# For the time being upstream supports up to Python 3.12 only.
+# Any issues found with 3.13 should be reported as a Gentoo bug.
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg
+
+CEF_VERSION="cef_binary_6533_linux_x86_64"
+OBS_BROWSER_COMMIT="a76b4d8810a0a33e91ac5b76a0b1af2f22bf8efd"
+OBS_WEBSOCKET_COMMIT="eed8a49933786383d11f4868a4e5604a9ee303c6"
+
+DESCRIPTION="Software for Recording and Streaming Live Video Content"
+HOMEPAGE="https://obsproject.com"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
+	EGIT_SUBMODULES=(
+		plugins/obs-browser
+		plugins/obs-websocket
+	)
+else
+	SRC_URI="
+		https://github.com/obsproject/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz
+		https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz
+			-> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz
+		https://github.com/obsproject/obs-websocket/archive/${OBS_WEBSOCKET_COMMIT}.tar.gz
+			-> obs-websocket-${OBS_WEBSOCKET_COMMIT}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_VERSION}.tar.xz )"
+
+LICENSE="Boost-1.0 GPL-2+ MIT Unlicense"
+SLOT="0"
+IUSE="
+	+alsa browser decklink fdk jack lua mpegts nvenc pipewire pulseaudio
+	python qsv sndio speex test-input truetype v4l vlc wayland websocket
+"
+REQUIRED_USE="
+	browser? ( || ( alsa pulseaudio ) )
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+BDEPEND="
+	lua? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+"
+# media-video/ffmpeg[opus] required due to bug 909566
+DEPEND="
+	dev-cpp/nlohmann_json
+	dev-libs/glib:2
+	dev-libs/jansson:=
+	dev-libs/uthash
+	dev-qt/qtbase:6[network,widgets,xml(+)]
+	dev-qt/qtsvg:6
+	media-libs/libglvnd[X]
+	media-libs/libva
+	media-libs/rnnoise
+	media-libs/x264:=
+	>=media-video/ffmpeg-6.1:=[nvenc?,opus,x264]
+	net-misc/curl
+	net-libs/mbedtls:0=
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-apps/util-linux
+	sys-libs/zlib:=
+	x11-libs/libX11
+	x11-libs/libxcb:=
+	x11-libs/libXcomposite
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	alsa? ( media-libs/alsa-lib )
+	browser? (
+		|| (
+			>=app-accessibility/at-spi2-core-2.46.0:2
+			( app-accessibility/at-spi2-atk dev-libs/atk )
+		)
+		dev-libs/expat
+		dev-libs/glib
+		dev-libs/nspr
+		dev-libs/nss
+		dev-libs/wayland
+		media-libs/alsa-lib
+		media-libs/fontconfig
+		media-libs/mesa[gbm(+)]
+		net-print/cups
+		x11-libs/cairo
+		x11-libs/libdrm
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libxkbcommon
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXScrnSaver
+		x11-libs/libxshmfence
+		x11-libs/libXtst
+		x11-libs/pango
+	)
+	fdk? ( media-libs/fdk-aac:= )
+	jack? ( virtual/jack )
+	lua? ( ${LUA_DEPS} )
+	mpegts? (
+		net-libs/librist
+		net-libs/srt
+	)
+	nvenc? ( >=media-libs/nv-codec-headers-12 )
+	pipewire? ( media-video/pipewire:= )
+	pulseaudio? ( media-libs/libpulse )
+	python? ( ${PYTHON_DEPS} )
+	qsv? ( media-libs/libvpl )
+	sndio? ( media-sound/sndio )
+	speex? ( media-libs/speexdsp )
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	v4l? (
+		media-libs/libv4l
+		virtual/udev
+	)
+	vlc? ( media-video/vlc:= )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	websocket? (
+		dev-cpp/asio
+		dev-cpp/websocketpp
+		dev-libs/qr-code-generator
+	)
+"
+RDEPEND="${DEPEND}
+	qsv? ( media-libs/intel-mediasdk )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-31.0.0-libx11-link.patch )
+
+QA_PREBUILT="
+	usr/lib*/obs-plugins/chrome-sandbox
+	usr/lib*/obs-plugins/libcef.so
+	usr/lib*/obs-plugins/libEGL.so
+	usr/lib*/obs-plugins/libGLESv2.so
+	usr/lib*/obs-plugins/libvk_swiftshader.so
+	usr/lib*/obs-plugins/libvulkan.so.1
+	usr/lib*/obs-plugins/swiftshader/libEGL.so
+	usr/lib*/obs-plugins/swiftshader/libGLESv2.so
+"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		rm -d ${P}/plugins/obs-browser || die
+		mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die
+
+		rm -d ${P}/plugins/obs-websocket || die
+		mv obs-websocket-${OBS_WEBSOCKET_COMMIT} ${P}/plugins/obs-websocket || die
+	fi
+}
+
+src_prepare() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/867250
+	# https://github.com/obsproject/obs-studio/issues/8988
+	use wayland && filter-lto
+
+	cmake_src_prepare
+
+	pushd deps/json11 &> /dev/null || die
+		eapply "${FILESDIR}/json11-1.0.0-include-cstdint.patch"
+	popd &> /dev/null || die
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		$(usev browser -DCEF_ROOT_DIR=../${CEF_VERSION})
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AJA=OFF
+		-DENABLE_BROWSER=$(usex browser)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_DECKLINK=$(usex decklink)
+		-DENABLE_FFMPEG_NVENC=$(usex nvenc)
+		-DENABLE_FREETYPE=$(usex truetype)
+		-DENABLE_JACK=$(usex jack)
+		-DENABLE_LIBFDK=$(usex fdk)
+		-DENABLE_NEW_MPEGTS_OUTPUT=$(usex mpegts)
+		-DENABLE_NVENC=$(usex nvenc)
+		-DENABLE_PIPEWIRE=$(usex pipewire)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_QSV11=$(usex qsv)
+		-DENABLE_RNNOISE=ON
+		-DENABLE_SNDIO=$(usex sndio)
+		-DENABLE_SPEEXDSP=$(usex speex)
+		-DENABLE_TEST_INPUT=$(usex test-input)
+		-DENABLE_V4L2=$(usex v4l)
+		-DENABLE_VLC=$(usex vlc)
+		-DENABLE_VST=ON
+		-DENABLE_WAYLAND=$(usex wayland)
+		-DENABLE_WEBRTC=OFF # Requires libdatachannel.
+		-DENABLE_WEBSOCKET=$(usex websocket)
+	)
+
+	if [[ ${PV} != 9999 ]]; then
+		mycmakeargs+=(
+			-DOBS_VERSION_OVERRIDE=${PV}
+		)
+	fi
+
+	if use lua || use python; then
+		mycmakeargs+=(
+			-DENABLE_SCRIPTING_LUA=$(usex lua)
+			-DENABLE_SCRIPTING_PYTHON=$(usex python)
+			-DENABLE_SCRIPTING=ON
+		)
+	else
+		mycmakeargs+=( -DENABLE_SCRIPTING=OFF )
+	fi
+
+	if use browser; then
+		mycmakeargs+=( -DENABLE_WHATSNEW=ON )
+	else
+		mycmakeargs+=( -DENABLE_WHATSNEW=OFF )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# external plugins may need some things not installed by default, install them here
+	insinto /usr/include/obs/UI/obs-frontend-api
+	doins UI/obs-frontend-api/obs-frontend-api.h
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use alsa && ! use pulseaudio; then
+		elog
+		elog "For the audio capture features to be available,"
+		elog "at least one of the 'alsa' or 'pulseaudio' USE-flags needs to"
+		elog "be enabled."
+		elog
+	fi
+
+	if use v4l && has_version media-video/v4l2loopback; then
+		elog
+		elog "Depending on system configuration, the v4l2loopback kernel module"
+		elog "may need to be loaded manually, and needs to be re-built after"
+		elog "kernel changes."
+		elog
+	fi
+
+	optfeature "VA-API hardware encoding" media-video/ffmpeg[vaapi]
+	optfeature "virtual camera support" media-video/v4l2loopback
+}
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index a7536b82f747..b215ca637d54 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-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
@@ -69,7 +69,7 @@ DEPEND="
 	media-libs/x264:=
 	>=media-video/ffmpeg-6.1:=[nvenc?,opus,x264]
 	net-misc/curl
-	net-libs/mbedtls:=
+	net-libs/mbedtls:0=
 	sys-apps/dbus
 	sys-apps/pciutils
 	sys-apps/util-linux
@@ -141,8 +141,14 @@ DEPEND="
 		dev-libs/qr-code-generator
 	)
 "
-RDEPEND="${DEPEND}
-	qsv? ( media-libs/intel-mediasdk )
+RDEPEND="
+	${DEPEND}
+	qsv? (
+		|| (
+			media-libs/intel-mediasdk
+			media-libs/vpl-gpu-rt
+		)
+	)
 "
 
 QA_PREBUILT="
@@ -249,8 +255,8 @@ src_install() {
 	cmake_src_install
 
 	# external plugins may need some things not installed by default, install them here
-	insinto /usr/include/obs/UI/obs-frontend-api
-	doins UI/obs-frontend-api/obs-frontend-api.h
+	insinto /usr/include/obs/frontend/api
+	doins frontend/api/obs-frontend-api.h
 }
 
 pkg_postinst() {
diff --git a/media-video/pipewire/files/1.2.7/0001-spa-alsa-Fix-key-name-suggestion-in-log-message.patch b/media-video/pipewire/files/1.2.7/0001-spa-alsa-Fix-key-name-suggestion-in-log-message.patch
new file mode 100644
index 000000000000..a9348553e15b
--- /dev/null
+++ b/media-video/pipewire/files/1.2.7/0001-spa-alsa-Fix-key-name-suggestion-in-log-message.patch
@@ -0,0 +1,28 @@
+From 1993383ddf67e296334c7916d6afc699ee6300c7 Mon Sep 17 00:00:00 2001
+Message-ID: <1993383ddf67e296334c7916d6afc699ee6300c7.1737052666.git.sam@gentoo.org>
+From: Arun Raghavan <arun@asymptotic.io>
+Date: Fri, 29 Nov 2024 10:54:18 -0500
+Subject: [PATCH 1/8] spa: alsa: Fix key name suggestion in log message
+
+We use api.alsa.pcm.card to look up the PCM's card if we don't know it
+by other means.
+---
+ spa/plugins/alsa/alsa-pcm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spa/plugins/alsa/alsa-pcm.c b/spa/plugins/alsa/alsa-pcm.c
+index b07897935..9244b66aa 100644
+--- a/spa/plugins/alsa/alsa-pcm.c
++++ b/spa/plugins/alsa/alsa-pcm.c
+@@ -939,7 +939,7 @@ int spa_alsa_init(struct state *state, const struct spa_dict *info)
+ 		sscanf(state->props.device, "%*[^:]:%u", &state->card_index);
+ 		if (state->card_index == SPA_ID_INVALID) {
+ 			spa_log_error(state->log, "Could not determine card index, maybe set %s",
+-					SPA_KEY_API_ALSA_CARD);
++					SPA_KEY_API_ALSA_PCM_CARD);
+ 			return -EINVAL;
+ 		}
+ 	}
+-- 
+2.48.0
+
diff --git a/media-video/pipewire/files/1.2.7/0002-spa-alsa-Don-t-assume-all-PCMs-have-a-card.patch b/media-video/pipewire/files/1.2.7/0002-spa-alsa-Don-t-assume-all-PCMs-have-a-card.patch
new file mode 100644
index 000000000000..efb13f667b9a
--- /dev/null
+++ b/media-video/pipewire/files/1.2.7/0002-spa-alsa-Don-t-assume-all-PCMs-have-a-card.patch
@@ -0,0 +1,128 @@
+From a6019e6dd73e686c69db5967fc3e852a8fe43ecb Mon Sep 17 00:00:00 2001
+Message-ID: <a6019e6dd73e686c69db5967fc3e852a8fe43ecb.1737052666.git.sam@gentoo.org>
+In-Reply-To: <1993383ddf67e296334c7916d6afc699ee6300c7.1737052666.git.sam@gentoo.org>
+References: <1993383ddf67e296334c7916d6afc699ee6300c7.1737052666.git.sam@gentoo.org>
+From: Arun Raghavan <arun@asymptotic.io>
+Date: Fri, 29 Nov 2024 10:42:58 -0500
+Subject: [PATCH 2/8] spa: alsa: Don't assume all PCMs have a card
+
+dmix/dsnoop devices, for example, don't have an associated card, so all
+the card-related checks don't make sense. Let's explicitly deal with
+this case.
+
+Fixes: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/4432
+---
+ spa/plugins/alsa/alsa-pcm.c | 31 +++++++++++++++++--------------
+ 1 file changed, 17 insertions(+), 14 deletions(-)
+
+diff --git a/spa/plugins/alsa/alsa-pcm.c b/spa/plugins/alsa/alsa-pcm.c
+index 9244b66aa..b8728bfe1 100644
+--- a/spa/plugins/alsa/alsa-pcm.c
++++ b/spa/plugins/alsa/alsa-pcm.c
+@@ -40,6 +40,9 @@ static struct card *ensure_card(uint32_t index, bool ucm)
+ 	const char *alibpref = NULL;
+ 	int err;
+ 
++	if (index == SPA_ID_INVALID)
++		return NULL;
++
+ 	if ((c = find_card(index)) != NULL)
+ 		return c;
+ 
+@@ -78,6 +81,9 @@ error:
+ 
+ static void release_card(struct card *c)
+ {
++	if (!c)
++		return;
++
+ 	spa_assert(c->ref > 0);
+ 
+ 	if (--c->ref > 0)
+@@ -657,7 +663,7 @@ static void silence_error_handler(const char *file, int line,
+ static void fill_device_name(struct state *state, const char *params, char device_name[], size_t len)
+ {
+ 	spa_scnprintf(device_name, len, "%s%s%s",
+-			state->card->ucm_prefix ? state->card->ucm_prefix : "",
++			state->card && state->card->ucm_prefix ? state->card->ucm_prefix : "",
+ 			state->props.device, params ? params : "");
+ }
+ 
+@@ -938,13 +944,12 @@ int spa_alsa_init(struct state *state, const struct spa_dict *info)
+ 		/* If we don't have a card index, see if we have a *:<idx> string */
+ 		sscanf(state->props.device, "%*[^:]:%u", &state->card_index);
+ 		if (state->card_index == SPA_ID_INVALID) {
+-			spa_log_error(state->log, "Could not determine card index, maybe set %s",
+-					SPA_KEY_API_ALSA_PCM_CARD);
+-			return -EINVAL;
++			spa_log_info(state->log, "Could not determine card index. %s and/or clock.name "
++					"may need to be configured manually", SPA_KEY_API_ALSA_PCM_CARD);
+ 		}
+ 	}
+ 
+-	if (state->clock_name[0] == '\0')
++	if (state->clock_name[0] == '\0' && state->card_index != SPA_ID_INVALID)
+ 		snprintf(state->clock_name, sizeof(state->clock_name),
+ 				"api.alsa.%s-%u",
+ 				state->stream == SND_PCM_STREAM_PLAYBACK ? "p" : "c",
+@@ -957,10 +962,7 @@ int spa_alsa_init(struct state *state, const struct spa_dict *info)
+ 	}
+ 
+ 	state->card = ensure_card(state->card_index, state->open_ucm);
+-	if (state->card == NULL) {
+-		spa_log_error(state->log, "can't create card %u", state->card_index);
+-		return -errno;
+-	}
++
+ 	state->log_file = fopencookie(state, "w", io_funcs);
+ 	if (state->log_file == NULL) {
+ 		spa_log_error(state->log, "can't create log file");
+@@ -1203,7 +1205,7 @@ int spa_alsa_close(struct state *state)
+ 	else
+ 		state->n_fds = 0;
+ 
+-	if (state->have_format)
++	if (state->have_format && state->card)
+ 		state->card->format_ref--;
+ 
+ 	state->have_format = false;
+@@ -1423,7 +1425,7 @@ static int add_rate(struct state *state, uint32_t scale, uint32_t interleave, bo
+ 	if (max < min)
+ 		return 0;
+ 
+-	if (!state->multi_rate && state->card->format_ref > 0)
++	if (!state->multi_rate && state->card && state->card->format_ref > 0)
+ 		rate = state->card->rate;
+ 	else
+ 		rate = state->default_rate;
+@@ -1439,8 +1441,8 @@ static int add_rate(struct state *state, uint32_t scale, uint32_t interleave, bo
+ 
+ 	rate = SPA_CLAMP(rate, min, max);
+ 
+-	spa_log_debug(state->log, "rate:%u multi:%d card:%d def:%d",
+-			rate, state->multi_rate, state->card->rate, state->default_rate);
++	spa_log_debug(state->log, "rate:%u multi:%d card:%u def:%d",
++			rate, state->multi_rate, state->card ? state->card->rate : 0, state->default_rate);
+ 
+ 	spa_pod_builder_prop(b, SPA_FORMAT_AUDIO_rate, 0);
+ 
+@@ -2172,6 +2174,7 @@ int spa_alsa_set_format(struct state *state, struct spa_audio_info *fmt, uint32_
+ 	}
+ 
+ 	if (!state->multi_rate &&
++	    state->card &&
+ 	    state->card->format_ref > 0 &&
+ 	    state->card->rate != rrate) {
+ 		spa_log_error(state->log, "%p: card already opened at rate:%i",
+@@ -2217,7 +2220,7 @@ int spa_alsa_set_format(struct state *state, struct spa_audio_info *fmt, uint32_
+ 	state->driver_rate.denom = 0;
+ 
+ 	state->have_format = true;
+-	if (state->card->format_ref++ == 0)
++	if (state->card && state->card->format_ref++ == 0)
+ 		state->card->rate = rrate;
+ 
+ 	dir = 0;
+-- 
+2.48.0
+
diff --git a/media-video/pipewire/files/1.2.7/0003-gst-mark-the-pipewiresink-as-EARLY_PROCESS.patch b/media-video/pipewire/files/1.2.7/0003-gst-mark-the-pipewiresink-as-EARLY_PROCESS.patch
new file mode 100644
index 000000000000..54f020f9379e
--- /dev/null
+++ b/media-video/pipewire/files/1.2.7/0003-gst-mark-the-pipewiresink-as-EARLY_PROCESS.patch
@@ -0,0 +1,29 @@
+From 938283aee4a1c120bf1c9285090ea196a5b5c89b Mon Sep 17 00:00:00 2001
+Message-ID: <938283aee4a1c120bf1c9285090ea196a5b5c89b.1737052666.git.sam@gentoo.org>
+In-Reply-To: <1993383ddf67e296334c7916d6afc699ee6300c7.1737052666.git.sam@gentoo.org>
+References: <1993383ddf67e296334c7916d6afc699ee6300c7.1737052666.git.sam@gentoo.org>
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Tue, 26 Nov 2024 16:57:14 +0100
+Subject: [PATCH 3/8] gst: mark the pipewiresink as EARLY_PROCESS
+
+We want to receive process callbacks as soon as a buffer is ready for
+reuse because we dequeue it for use in our buffer pool.
+---
+ src/gst/gstpipewiresink.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gst/gstpipewiresink.c b/src/gst/gstpipewiresink.c
+index b39a335d8..d79ceaa66 100644
+--- a/src/gst/gstpipewiresink.c
++++ b/src/gst/gstpipewiresink.c
+@@ -633,6 +633,7 @@ gst_pipewire_sink_setcaps (GstBaseSink * bsink, GstCaps * caps)
+     char buf[64];
+ 
+     flags = PW_STREAM_FLAG_ASYNC;
++    flags |= PW_STREAM_FLAG_EARLY_PROCESS;
+     if (pwsink->mode != GST_PIPEWIRE_SINK_MODE_PROVIDE)
+       flags |= PW_STREAM_FLAG_AUTOCONNECT;
+     else
+-- 
+2.48.0
+
diff --git a/media-video/pipewire/files/1.2.7/0004-gst-add-rate-control-to-the-sink.patch b/media-video/pipewire/files/1.2.7/0004-gst-add-rate-control-to-the-sink.patch
new file mode 100644
index 000000000000..1fdd40244948
--- /dev/null
+++ b/media-video/pipewire/files/1.2.7/0004-gst-add-rate-control-to-the-sink.patch
@@ -0,0 +1,234 @@
+From 1e2b7f7c00fbded9e9ebb83b10ce302155ba444f Mon Sep 17 00:00:00 2001
+Message-ID: <1e2b7f7c00fbded9e9ebb83b10ce302155ba444f.1737052666.git.sam@gentoo.org>
+In-Reply-To: <1993383ddf67e296334c7916d6afc699ee6300c7.1737052666.git.sam@gentoo.org>
+References: <1993383ddf67e296334c7916d6afc699ee6300c7.1737052666.git.sam@gentoo.org>
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Tue, 26 Nov 2024 17:45:41 +0100
+Subject: [PATCH 4/8] gst: add rate control to the sink
+
+Track the elapsed time between buffers and try to keep the buffer fill
+level constant by changing the rate of the stream.
+
+See #4374
+---
+ src/gst/gstpipewiresink.c   | 76 ++++++++++++++++++++++++++++++++++---
+ src/gst/gstpipewiresink.h   |  4 ++
+ src/gst/gstpipewirestream.c |  1 +
+ src/gst/gstpipewirestream.h |  8 ++++
+ src/gst/meson.build         |  2 +-
+ 5 files changed, 84 insertions(+), 7 deletions(-)
+
+diff --git a/src/gst/gstpipewiresink.c b/src/gst/gstpipewiresink.c
+index d79ceaa66..33f2322e9 100644
+--- a/src/gst/gstpipewiresink.c
++++ b/src/gst/gstpipewiresink.c
+@@ -26,6 +26,7 @@
+ 
+ #include <spa/pod/builder.h>
+ #include <spa/utils/result.h>
++#include <spa/utils/dll.h>
+ 
+ #include <gst/video/video.h>
+ 
+@@ -481,14 +482,13 @@ static void
+ do_send_buffer (GstPipeWireSink *pwsink, GstBuffer *buffer)
+ {
+   GstPipeWirePoolData *data;
++  GstPipeWireStream *stream = pwsink->stream;
+   gboolean res;
+   guint i;
+   struct spa_buffer *b;
+ 
+   data = gst_pipewire_pool_get_data(buffer);
+ 
+-  GST_LOG_OBJECT (pwsink, "queue buffer %p, pw_buffer %p", buffer, data->b);
+-
+   b = data->b->buffer;
+ 
+   if (data->header) {
+@@ -508,12 +508,15 @@ do_send_buffer (GstPipeWireSink *pwsink, GstBuffer *buffer)
+       data->crop->region.size.height = meta->width;
+     }
+   }
++  data->b->size = 0;
+   for (i = 0; i < b->n_datas; i++) {
+     struct spa_data *d = &b->datas[i];
+     GstMemory *mem = gst_buffer_peek_memory (buffer, i);
+     d->chunk->offset = mem->offset;
+     d->chunk->size = mem->size;
+-    d->chunk->stride = pwsink->stream->pool->video_info.stride[i];
++    d->chunk->stride = stream->pool->video_info.stride[i];
++
++    data->b->size += mem->size / 4;
+   }
+ 
+   GstVideoMeta *meta = gst_buffer_get_video_meta (buffer);
+@@ -532,9 +535,50 @@ do_send_buffer (GstPipeWireSink *pwsink, GstBuffer *buffer)
+     }
+   }
+ 
+-  if ((res = pw_stream_queue_buffer (pwsink->stream->pwstream, data->b)) < 0) {
++  if ((res = pw_stream_queue_buffer (stream->pwstream, data->b)) < 0) {
+     g_warning ("can't send buffer %s", spa_strerror(res));
+   }
++
++  if (pwsink->rate_match) {
++    double err, corr;
++    struct pw_time ts;
++    guint64 queued, now, elapsed, target;
++
++    pw_stream_get_time_n(stream->pwstream, &ts, sizeof(ts));
++    now = pw_stream_get_nsec(stream->pwstream);
++    if (ts.now != 0)
++	    elapsed = gst_util_uint64_scale_int (now - ts.now, ts.rate.denom, GST_SECOND * ts.rate.num);
++    else
++	    elapsed = 0;
++
++    queued = ts.queued - ts.size;
++    target = 2 * elapsed;
++    err = ((gint64)queued - ((gint64)target));
++
++    corr = spa_dll_update(&stream->dll, SPA_CLAMPD(err, -128.0, 128.0));
++
++    stream->err_wdw = (double)ts.rate.denom/ts.size;
++
++    double avg = (stream->err_avg * stream->err_wdw + (err - stream->err_avg)) / (stream->err_wdw + 1.0);
++    stream->err_var = (stream->err_var * stream->err_wdw +
++                      (err - stream->err_avg) * (err - avg)) / (stream->err_wdw + 1.0);
++    stream->err_avg = avg;
++
++    if (stream->last_ts == 0 || stream->last_ts + SPA_NSEC_PER_SEC < now) {
++      stream->last_ts = now;
++      spa_dll_set_bw(&stream->dll, SPA_CLAMPD(fabs(stream->err_avg) / sqrt(fabs(stream->err_var)), 0.001, SPA_DLL_BW_MAX),
++                     ts.size, ts.rate.denom);
++    GST_INFO_OBJECT (pwsink, "queue buffer %p, pw_buffer %p q:%"PRIi64"/%"PRIi64" e:%"PRIu64
++		    " err:%+03f corr:%f %f %f %f",
++                    buffer, data->b, ts.queued, ts.size, elapsed, err, corr,
++		    stream->err_avg, stream->err_var, stream->dll.bw);
++    }
++
++    if (pwsink->match) {
++	pwsink->match->rate = corr;
++	SPA_FLAG_UPDATE(pwsink->match->flags, SPA_IO_RATE_MATCH_FLAG_ACTIVE, true);
++    }
++  }
+ }
+ 
+ 
+@@ -576,6 +620,18 @@ on_state_changed (void *data, enum pw_stream_state old, enum pw_stream_state sta
+   pw_thread_loop_signal (pwsink->stream->core->loop, FALSE);
+ }
+ 
++static void
++on_io_changed (void *obj, uint32_t id, void *data, uint32_t size)
++{
++  GstPipeWireSink *pwsink = obj;
++
++  switch (id) {
++    case SPA_IO_RateMatch:
++      pwsink->match = data;
++      break;
++  }
++}
++
+ static void
+ on_param_changed (void *data, uint32_t id, const struct spa_pod *param)
+ {
+@@ -613,9 +669,16 @@ gst_pipewire_sink_setcaps (GstBaseSink * bsink, GstCaps * caps)
+   pwsink = GST_PIPEWIRE_SINK (bsink);
+ 
+   s = gst_caps_get_structure (caps, 0);
+-  rate = 0;
+-  if (gst_structure_has_name (s, "audio/x-raw"))
++  if (gst_structure_has_name (s, "audio/x-raw")) {
+     gst_structure_get_int (s, "rate", &rate);
++    pwsink->rate = rate;
++    pwsink->rate_match = true;
++  } else {
++    pwsink->rate = rate = 0;
++    pwsink->rate_match = false;
++  }
++
++  spa_dll_set_bw(&pwsink->stream->dll, SPA_DLL_BW_MIN, 4096, rate);
+ 
+   possible = gst_caps_to_format_all (caps);
+ 
+@@ -791,6 +854,7 @@ not_negotiated:
+ static const struct pw_stream_events stream_events = {
+         PW_VERSION_STREAM_EVENTS,
+         .state_changed = on_state_changed,
++        .io_changed = on_io_changed,
+         .param_changed = on_param_changed,
+         .add_buffer = on_add_buffer,
+         .remove_buffer = on_remove_buffer,
+diff --git a/src/gst/gstpipewiresink.h b/src/gst/gstpipewiresink.h
+index 74e6667e6..33d7b5b4f 100644
+--- a/src/gst/gstpipewiresink.h
++++ b/src/gst/gstpipewiresink.h
+@@ -50,8 +50,12 @@ struct _GstPipeWireSink {
+ 
+   /* video state */
+   gboolean negotiated;
++  gboolean rate_match;
++  gint rate;
+ 
+   GstPipeWireSinkMode mode;
++
++  struct spa_io_rate_match *match;
+ };
+ 
+ GType gst_pipewire_sink_mode_get_type (void);
+diff --git a/src/gst/gstpipewirestream.c b/src/gst/gstpipewirestream.c
+index bf7641548..68cb9be21 100644
+--- a/src/gst/gstpipewirestream.c
++++ b/src/gst/gstpipewirestream.c
+@@ -19,6 +19,7 @@ gst_pipewire_stream_init (GstPipeWireStream * self)
+   self->fd = -1;
+   self->client_name = g_strdup (pw_get_client_name());
+   self->pool = gst_pipewire_pool_new (self);
++  spa_dll_init(&self->dll);
+ }
+ 
+ static void
+diff --git a/src/gst/gstpipewirestream.h b/src/gst/gstpipewirestream.h
+index ff8c8e2e6..a301375c7 100644
+--- a/src/gst/gstpipewirestream.h
++++ b/src/gst/gstpipewirestream.h
+@@ -11,6 +11,7 @@
+ #include "gstpipewirecore.h"
+ 
+ #include <gst/gst.h>
++#include <spa/utils/dll.h>
+ #include <pipewire/pipewire.h>
+ 
+ G_BEGIN_DECLS
+@@ -29,6 +30,13 @@ struct _GstPipeWireStream {
+   GstPipeWirePool *pool;
+   GstClock *clock;
+ 
++  guint64 position;
++  struct spa_dll dll;
++  double err_avg, err_var, err_wdw;
++  guint64 last_ts;
++  guint64 base_buffer_ts;
++  guint64 base_ts;
++
+   /* the actual pw stream */
+   struct pw_stream *pwstream;
+   struct spa_hook pwstream_listener;
+diff --git a/src/gst/meson.build b/src/gst/meson.build
+index ba1f6d558..1e39bcf89 100644
+--- a/src/gst/meson.build
++++ b/src/gst/meson.build
+@@ -27,7 +27,7 @@ pipewire_gst_headers = [
+ pipewire_gst = shared_library('gstpipewire',
+     pipewire_gst_sources,
+     include_directories : [ configinc ],
+-    dependencies : [ spa_dep, gst_dep, pipewire_dep ],
++    dependencies : [ spa_dep, gst_dep, pipewire_dep, mathlib ],
+     install : true,
+     install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')),
+ )
+-- 
+2.48.0
+
diff --git a/media-video/pipewire/files/1.2.7/0005-gst-add-slave-method-property.patch b/media-video/pipewire/files/1.2.7/0005-gst-add-slave-method-property.patch
new file mode 100644
index 000000000000..74df92bbdfcf
--- /dev/null
+++ b/media-video/pipewire/files/1.2.7/0005-gst-add-slave-method-property.patch
@@ -0,0 +1,259 @@
+From 91e26d6011bd194deffb5765f9b3306fb92738d9 Mon Sep 17 00:00:00 2001
+Message-ID: <91e26d6011bd194deffb5765f9b3306fb92738d9.1737052666.git.sam@gentoo.org>
+In-Reply-To: <1993383ddf67e296334c7916d6afc699ee6300c7.1737052666.git.sam@gentoo.org>
+References: <1993383ddf67e296334c7916d6afc699ee6300c7.1737052666.git.sam@gentoo.org>
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Tue, 3 Dec 2024 11:54:52 +0100
+Subject: [PATCH 5/8] gst: add slave-method property
+
+Set the slave-method to none by default to disable the resampler.
+
+Fixes #4374
+---
+ src/gst/gstpipewiresink.c | 141 +++++++++++++++++++++++++++-----------
+ src/gst/gstpipewiresink.h |  21 +++++-
+ 2 files changed, 120 insertions(+), 42 deletions(-)
+
+diff --git a/src/gst/gstpipewiresink.c b/src/gst/gstpipewiresink.c
+index 33f2322e9..bf1b427f0 100644
+--- a/src/gst/gstpipewiresink.c
++++ b/src/gst/gstpipewiresink.c
+@@ -37,6 +37,7 @@ GST_DEBUG_CATEGORY_STATIC (pipewire_sink_debug);
+ #define GST_CAT_DEFAULT pipewire_sink_debug
+ 
+ #define DEFAULT_PROP_MODE GST_PIPEWIRE_SINK_MODE_DEFAULT
++#define DEFAULT_PROP_SLAVE_METHOD GST_PIPEWIRE_SINK_SLAVE_METHOD_NONE
+ 
+ #define MIN_BUFFERS     8u
+ 
+@@ -49,7 +50,8 @@ enum
+   PROP_CLIENT_PROPERTIES,
+   PROP_STREAM_PROPERTIES,
+   PROP_MODE,
+-  PROP_FD
++  PROP_FD,
++  PROP_SLAVE_METHOD
+ };
+ 
+ GType
+@@ -72,6 +74,26 @@ gst_pipewire_sink_mode_get_type (void)
+   return (GType) mode_type;
+ }
+ 
++GType
++gst_pipewire_sink_slave_method_get_type (void)
++{
++  static gsize method_type = 0;
++  static const GEnumValue method[] = {
++    {GST_PIPEWIRE_SINK_SLAVE_METHOD_NONE, "GST_PIPEWIRE_SINK_SLAVE_METHOD_NONE", "none"},
++    {GST_PIPEWIRE_SINK_SLAVE_METHOD_RESAMPLE, "GST_PIPEWIRE_SINK_SLAVE_METHOD_RESAMPLE", "resample"},
++    {0, NULL, NULL},
++  };
++
++  if (g_once_init_enter (&method_type)) {
++    GType tmp =
++        g_enum_register_static ("GstPipeWireSinkSlaveMethod", method);
++    g_once_init_leave (&method_type, tmp);
++  }
++
++  return (GType) method_type;
++}
++
++
+ 
+ static GstStaticPadTemplate gst_pipewire_sink_template =
+ GST_STATIC_PAD_TEMPLATE ("sink",
+@@ -225,6 +247,17 @@ gst_pipewire_sink_class_init (GstPipeWireSinkClass * klass)
+                                                       G_PARAM_READWRITE |
+                                                       G_PARAM_STATIC_STRINGS));
+ 
++  g_object_class_install_property (gobject_class,
++                                   PROP_SLAVE_METHOD,
++                                   g_param_spec_enum ("slave-method",
++                                                      "Slave Method",
++                                                      "Algorithm used to match the rate of the masterclock",
++                                                      GST_TYPE_PIPEWIRE_SINK_SLAVE_METHOD,
++                                                      DEFAULT_PROP_SLAVE_METHOD,
++                                                      G_PARAM_READWRITE |
++                                                      G_PARAM_STATIC_STRINGS));
++
++
+   gstelement_class->provide_clock = gst_pipewire_sink_provide_clock;
+   gstelement_class->change_state = gst_pipewire_sink_change_state;
+ 
+@@ -408,6 +441,10 @@ gst_pipewire_sink_set_property (GObject * object, guint prop_id,
+       pwsink->stream->fd = g_value_get_int (value);
+       break;
+ 
++    case PROP_SLAVE_METHOD:
++      pwsink->slave_method = g_value_get_enum (value);
++      break;
++
+     default:
+       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+       break;
+@@ -449,12 +486,69 @@ gst_pipewire_sink_get_property (GObject * object, guint prop_id,
+       g_value_set_int (value, pwsink->stream->fd);
+       break;
+ 
++    case PROP_SLAVE_METHOD:
++      g_value_set_enum (value, pwsink->slave_method);
++      break;
++
+     default:
+       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+       break;
+   }
+ }
+ 
++static void rate_match_resample(GstPipeWireSink *pwsink)
++{
++  GstPipeWireStream *stream = pwsink->stream;
++  double err, corr;
++  struct pw_time ts;
++  guint64 queued, now, elapsed, target;
++
++  if (!pwsink->rate_match)
++    return;
++
++  pw_stream_get_time_n(stream->pwstream, &ts, sizeof(ts));
++  now = pw_stream_get_nsec(stream->pwstream);
++  if (ts.now != 0)
++    elapsed = gst_util_uint64_scale_int (now - ts.now, ts.rate.denom, GST_SECOND * ts.rate.num);
++  else
++    elapsed = 0;
++
++  queued = ts.queued - ts.size;
++  target = elapsed;
++  err = ((gint64)queued - ((gint64)target));
++
++  corr = spa_dll_update(&stream->dll, SPA_CLAMPD(err, -128.0, 128.0));
++
++  stream->err_wdw = (double)ts.rate.denom/ts.size;
++
++  double avg = (stream->err_avg * stream->err_wdw + (err - stream->err_avg)) / (stream->err_wdw + 1.0);
++  stream->err_var = (stream->err_var * stream->err_wdw +
++                    (err - stream->err_avg) * (err - avg)) / (stream->err_wdw + 1.0);
++  stream->err_avg = avg;
++
++  if (stream->last_ts == 0 || stream->last_ts + SPA_NSEC_PER_SEC < now) {
++    double bw;
++
++    stream->last_ts = now;
++
++    if (stream->err_var == 0.0)
++      bw = 0.0;
++    else
++      bw = fabs(stream->err_avg) / sqrt(fabs(stream->err_var));
++
++    spa_dll_set_bw(&stream->dll, SPA_CLAMPD(bw, 0.001, SPA_DLL_BW_MAX), ts.size, ts.rate.denom);
++
++    GST_INFO_OBJECT (pwsink, "q:%"PRIi64"/%"PRIi64" e:%"PRIu64" err:%+03f corr:%f %f %f %f",
++                    ts.queued, ts.size, elapsed, err, corr,
++		    stream->err_avg, stream->err_var, stream->dll.bw);
++  }
++
++  if (pwsink->match) {
++    pwsink->match->rate = corr;
++    SPA_FLAG_UPDATE(pwsink->match->flags, SPA_IO_RATE_MATCH_FLAG_ACTIVE, true);
++  }
++}
++
+ static void
+ on_add_buffer (void *_data, struct pw_buffer *b)
+ {
+@@ -539,45 +633,12 @@ do_send_buffer (GstPipeWireSink *pwsink, GstBuffer *buffer)
+     g_warning ("can't send buffer %s", spa_strerror(res));
+   }
+ 
+-  if (pwsink->rate_match) {
+-    double err, corr;
+-    struct pw_time ts;
+-    guint64 queued, now, elapsed, target;
+-
+-    pw_stream_get_time_n(stream->pwstream, &ts, sizeof(ts));
+-    now = pw_stream_get_nsec(stream->pwstream);
+-    if (ts.now != 0)
+-	    elapsed = gst_util_uint64_scale_int (now - ts.now, ts.rate.denom, GST_SECOND * ts.rate.num);
+-    else
+-	    elapsed = 0;
+-
+-    queued = ts.queued - ts.size;
+-    target = 2 * elapsed;
+-    err = ((gint64)queued - ((gint64)target));
+-
+-    corr = spa_dll_update(&stream->dll, SPA_CLAMPD(err, -128.0, 128.0));
+-
+-    stream->err_wdw = (double)ts.rate.denom/ts.size;
+-
+-    double avg = (stream->err_avg * stream->err_wdw + (err - stream->err_avg)) / (stream->err_wdw + 1.0);
+-    stream->err_var = (stream->err_var * stream->err_wdw +
+-                      (err - stream->err_avg) * (err - avg)) / (stream->err_wdw + 1.0);
+-    stream->err_avg = avg;
+-
+-    if (stream->last_ts == 0 || stream->last_ts + SPA_NSEC_PER_SEC < now) {
+-      stream->last_ts = now;
+-      spa_dll_set_bw(&stream->dll, SPA_CLAMPD(fabs(stream->err_avg) / sqrt(fabs(stream->err_var)), 0.001, SPA_DLL_BW_MAX),
+-                     ts.size, ts.rate.denom);
+-    GST_INFO_OBJECT (pwsink, "queue buffer %p, pw_buffer %p q:%"PRIi64"/%"PRIi64" e:%"PRIu64
+-		    " err:%+03f corr:%f %f %f %f",
+-                    buffer, data->b, ts.queued, ts.size, elapsed, err, corr,
+-		    stream->err_avg, stream->err_var, stream->dll.bw);
+-    }
+-
+-    if (pwsink->match) {
+-	pwsink->match->rate = corr;
+-	SPA_FLAG_UPDATE(pwsink->match->flags, SPA_IO_RATE_MATCH_FLAG_ACTIVE, true);
+-    }
++  switch (pwsink->slave_method) {
++    case GST_PIPEWIRE_SINK_SLAVE_METHOD_NONE:
++      break;
++    case GST_PIPEWIRE_SINK_SLAVE_METHOD_RESAMPLE:
++      rate_match_resample(pwsink);
++      break;
+   }
+ }
+ 
+diff --git a/src/gst/gstpipewiresink.h b/src/gst/gstpipewiresink.h
+index 33d7b5b4f..306297d0e 100644
+--- a/src/gst/gstpipewiresink.h
++++ b/src/gst/gstpipewiresink.h
+@@ -37,6 +37,22 @@ typedef enum
+ 
+ #define GST_TYPE_PIPEWIRE_SINK_MODE (gst_pipewire_sink_mode_get_type ())
+ 
++
++/**
++ * GstPipeWireSinkSlaveMethod:
++ * @GST_PIPEWIRE_SINK_SLAVE_METHOD_NONE: no clock and timestamp slaving
++ * @GST_PIPEWIRE_SINK_SLAVE_METHOD_RESAMPLE: resample audio
++ *
++ * Different clock slaving methods
++ */
++typedef enum
++{
++  GST_PIPEWIRE_SINK_SLAVE_METHOD_NONE,
++  GST_PIPEWIRE_SINK_SLAVE_METHOD_RESAMPLE,
++} GstPipeWireSinkSlaveMethod;
++
++#define GST_TYPE_PIPEWIRE_SINK_SLAVE_METHOD (gst_pipewire_sink_slave_method_get_type ())
++
+ /**
+  * GstPipeWireSink:
+  *
+@@ -53,9 +69,10 @@ struct _GstPipeWireSink {
+   gboolean rate_match;
+   gint rate;
+ 
+-  GstPipeWireSinkMode mode;
+-
+   struct spa_io_rate_match *match;
++
++  GstPipeWireSinkMode mode;
++  GstPipeWireSinkSlaveMethod slave_method;
+ };
+ 
+ GType gst_pipewire_sink_mode_get_type (void);
+-- 
+2.48.0
+
diff --git a/media-video/pipewire/files/1.2.7/0006-spa-fix-some-param-type-info.patch b/media-video/pipewire/files/1.2.7/0006-spa-fix-some-param-type-info.patch
new file mode 100644
index 000000000000..c91ada71cf5a
--- /dev/null
+++ b/media-video/pipewire/files/1.2.7/0006-spa-fix-some-param-type-info.patch
@@ -0,0 +1,51 @@
+From e42de413e89249dca22b78f3c3d5a5c2e2e8b2f3 Mon Sep 17 00:00:00 2001
+Message-ID: <e42de413e89249dca22b78f3c3d5a5c2e2e8b2f3.1737052666.git.sam@gentoo.org>
+In-Reply-To: <1993383ddf67e296334c7916d6afc699ee6300c7.1737052666.git.sam@gentoo.org>
+References: <1993383ddf67e296334c7916d6afc699ee6300c7.1737052666.git.sam@gentoo.org>
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Tue, 3 Dec 2024 12:41:07 +0100
+Subject: [PATCH 6/8] spa: fix some param type info
+
+Add an int array type and use this in the route properties.
+
+Fixes #4441
+---
+ spa/include/spa/param/param-types.h | 5 +++++
+ spa/include/spa/param/route-types.h | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/spa/include/spa/param/param-types.h b/spa/include/spa/param/param-types.h
+index 4bed3651d..ebb8d988b 100644
+--- a/spa/include/spa/param/param-types.h
++++ b/spa/include/spa/param/param-types.h
+@@ -55,6 +55,11 @@ static const struct spa_type_info spa_type_prop_float_array[] = {
+ 	{ 0, 0, NULL, NULL },
+ };
+ 
++static const struct spa_type_info spa_type_prop_int_array[] = {
++	{ SPA_PROP_START, SPA_TYPE_Int, SPA_TYPE_INFO_BASE "intArray", NULL, },
++	{ 0, 0, NULL, NULL },
++};
++
+ static const struct spa_type_info spa_type_prop_channel_map[] = {
+ 	{ SPA_PROP_START, SPA_TYPE_Id, SPA_TYPE_INFO_BASE "channelMap", spa_type_audio_channel, },
+ 	{ 0, 0, NULL, NULL },
+diff --git a/spa/include/spa/param/route-types.h b/spa/include/spa/param/route-types.h
+index 619a9e2e8..78ced495e 100644
+--- a/spa/include/spa/param/route-types.h
++++ b/spa/include/spa/param/route-types.h
+@@ -32,9 +32,9 @@ static const struct spa_type_info spa_type_param_route[] = {
+ 	{ SPA_PARAM_ROUTE_priority, SPA_TYPE_Int, SPA_TYPE_INFO_PARAM_ROUTE_BASE "priority", NULL, },
+ 	{ SPA_PARAM_ROUTE_available, SPA_TYPE_Id, SPA_TYPE_INFO_PARAM_ROUTE_BASE "available", spa_type_param_availability, },
+ 	{ SPA_PARAM_ROUTE_info, SPA_TYPE_Struct, SPA_TYPE_INFO_PARAM_ROUTE_BASE "info", NULL, },
+-	{ SPA_PARAM_ROUTE_profiles, SPA_TYPE_Int, SPA_TYPE_INFO_PARAM_ROUTE_BASE "profiles", NULL, },
++	{ SPA_PARAM_ROUTE_profiles, SPA_TYPE_Array, SPA_TYPE_INFO_PARAM_ROUTE_BASE "profiles", spa_type_prop_int_array, },
+ 	{ SPA_PARAM_ROUTE_props, SPA_TYPE_OBJECT_Props, SPA_TYPE_INFO_PARAM_ROUTE_BASE "props", NULL, },
+-	{ SPA_PARAM_ROUTE_devices, SPA_TYPE_Int, SPA_TYPE_INFO_PARAM_ROUTE_BASE "devices", NULL, },
++	{ SPA_PARAM_ROUTE_devices, SPA_TYPE_Array, SPA_TYPE_INFO_PARAM_ROUTE_BASE "devices", spa_type_prop_int_array, },
+ 	{ SPA_PARAM_ROUTE_profile, SPA_TYPE_Int, SPA_TYPE_INFO_PARAM_ROUTE_BASE "profile", NULL, },
+ 	{ SPA_PARAM_ROUTE_save, SPA_TYPE_Bool, SPA_TYPE_INFO_PARAM_ROUTE_BASE "save", NULL, },
+ 	{ 0, 0, NULL, NULL },
+-- 
+2.48.0
+
diff --git a/media-video/pipewire/files/1.2.7/0007-filter-chain-handle-0-length-IR.patch b/media-video/pipewire/files/1.2.7/0007-filter-chain-handle-0-length-IR.patch
new file mode 100644
index 000000000000..4a1c25871d4c
--- /dev/null
+++ b/media-video/pipewire/files/1.2.7/0007-filter-chain-handle-0-length-IR.patch
@@ -0,0 +1,305 @@
+From 8d9269374ddd7fc1628d9bf05c0880e82a76015d Mon Sep 17 00:00:00 2001
+Message-ID: <8d9269374ddd7fc1628d9bf05c0880e82a76015d.1737052666.git.sam@gentoo.org>
+In-Reply-To: <1993383ddf67e296334c7916d6afc699ee6300c7.1737052666.git.sam@gentoo.org>
+References: <1993383ddf67e296334c7916d6afc699ee6300c7.1737052666.git.sam@gentoo.org>
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Tue, 3 Dec 2024 15:43:56 +0100
+Subject: [PATCH 7/8] filter-chain: handle 0 length IR
+
+Make sure we copy the DSP functions in the convolver before leaving the
+function because we need them to clear memory.
+
+Don't store the DSP functions in the head and tail convolvers but pass
+them from the main convolver because the convolvers might be NULL but we
+still need the DSP functions to clear memory.
+
+Fixes #4433
+---
+ src/modules/module-filter-chain/convolver.c | 96 +++++++++++----------
+ 1 file changed, 49 insertions(+), 47 deletions(-)
+
+diff --git a/src/modules/module-filter-chain/convolver.c b/src/modules/module-filter-chain/convolver.c
+index 3aa7230c0..4251c4025 100644
+--- a/src/modules/module-filter-chain/convolver.c
++++ b/src/modules/module-filter-chain/convolver.c
+@@ -11,8 +11,6 @@
+ #include <math.h>
+ 
+ struct convolver1 {
+-	struct dsp_ops *dsp;
+-
+ 	int blockSize;
+ 	int segSize;
+ 	int segCount;
+@@ -76,15 +74,15 @@ static int next_power_of_two(int val)
+ 	return r;
+ }
+ 
+-static void convolver1_reset(struct convolver1 *conv)
++static void convolver1_reset(struct dsp_ops *dsp, struct convolver1 *conv)
+ {
+ 	int i;
+ 	for (i = 0; i < conv->segCount; i++)
+-		fft_cpx_clear(conv->dsp, conv->segments[i], conv->fftComplexSize);
+-	dsp_ops_clear(conv->dsp, conv->overlap, conv->blockSize);
+-	dsp_ops_clear(conv->dsp, conv->inputBuffer, conv->segSize);
+-	fft_cpx_clear(conv->dsp, conv->pre_mult, conv->fftComplexSize);
+-	fft_cpx_clear(conv->dsp, conv->conv, conv->fftComplexSize);
++		fft_cpx_clear(dsp, conv->segments[i], conv->fftComplexSize);
++	dsp_ops_clear(dsp, conv->overlap, conv->blockSize);
++	dsp_ops_clear(dsp, conv->inputBuffer, conv->segSize);
++	fft_cpx_clear(dsp, conv->pre_mult, conv->fftComplexSize);
++	fft_cpx_clear(dsp, conv->conv, conv->fftComplexSize);
+ 	conv->inputBufferFill = 0;
+ 	conv->current = 0;
+ }
+@@ -107,16 +105,15 @@ static struct convolver1 *convolver1_new(struct dsp_ops *dsp, int block, const f
+ 	if (irlen == 0)
+ 		return conv;
+ 
+-	conv->dsp = dsp;
+ 	conv->blockSize = next_power_of_two(block);
+ 	conv->segSize = 2 * conv->blockSize;
+ 	conv->segCount = (irlen + conv->blockSize-1) / conv->blockSize;
+ 	conv->fftComplexSize = (conv->segSize / 2) + 1;
+ 
+-	conv->fft = dsp_ops_fft_new(conv->dsp, conv->segSize, true);
++	conv->fft = dsp_ops_fft_new(dsp, conv->segSize, true);
+ 	if (conv->fft == NULL)
+ 		goto error;
+-	conv->ifft = dsp_ops_fft_new(conv->dsp, conv->segSize, true);
++	conv->ifft = dsp_ops_fft_new(dsp, conv->segSize, true);
+ 	if (conv->ifft == NULL)
+ 		goto error;
+ 
+@@ -134,18 +131,18 @@ static struct convolver1 *convolver1_new(struct dsp_ops *dsp, int block, const f
+ 		conv->segments[i] = fft_cpx_alloc(conv->fftComplexSize);
+ 		conv->segmentsIr[i] = fft_cpx_alloc(conv->fftComplexSize);
+ 
+-		dsp_ops_copy(conv->dsp, conv->fft_buffer, &ir[i * conv->blockSize], copy);
++		dsp_ops_copy(dsp, conv->fft_buffer, &ir[i * conv->blockSize], copy);
+ 		if (copy < conv->segSize)
+-			dsp_ops_clear(conv->dsp, conv->fft_buffer + copy, conv->segSize - copy);
++			dsp_ops_clear(dsp, conv->fft_buffer + copy, conv->segSize - copy);
+ 
+-	        dsp_ops_fft_run(conv->dsp, conv->fft, 1, conv->fft_buffer, conv->segmentsIr[i]);
++	        dsp_ops_fft_run(dsp, conv->fft, 1, conv->fft_buffer, conv->segmentsIr[i]);
+ 	}
+ 	conv->pre_mult = fft_cpx_alloc(conv->fftComplexSize);
+ 	conv->conv = fft_cpx_alloc(conv->fftComplexSize);
+ 	conv->overlap = fft_alloc(conv->blockSize);
+ 	conv->inputBuffer = fft_alloc(conv->segSize);
+ 	conv->scale = 1.0f / conv->segSize;
+-	convolver1_reset(conv);
++	convolver1_reset(dsp, conv);
+ 
+ 	return conv;
+ error:
+@@ -159,7 +156,7 @@ error:
+ 	return NULL;
+ }
+ 
+-static void convolver1_free(struct convolver1 *conv)
++static void convolver1_free(struct dsp_ops *dsp, struct convolver1 *conv)
+ {
+ 	int i;
+ 	for (i = 0; i < conv->segCount; i++) {
+@@ -167,9 +164,9 @@ static void convolver1_free(struct convolver1 *conv)
+ 		fft_cpx_free(conv->segmentsIr[i]);
+ 	}
+ 	if (conv->fft)
+-		dsp_ops_fft_free(conv->dsp, conv->fft);
++		dsp_ops_fft_free(dsp, conv->fft);
+ 	if (conv->ifft)
+-		dsp_ops_fft_free(conv->dsp, conv->ifft);
++		dsp_ops_fft_free(dsp, conv->ifft);
+ 	if (conv->fft_buffer)
+ 		fft_free(conv->fft_buffer);
+ 	free(conv->segments);
+@@ -181,12 +178,12 @@ static void convolver1_free(struct convolver1 *conv)
+ 	free(conv);
+ }
+ 
+-static int convolver1_run(struct convolver1 *conv, const float *input, float *output, int len)
++static int convolver1_run(struct dsp_ops *dsp, struct convolver1 *conv, const float *input, float *output, int len)
+ {
+ 	int i, processed = 0;
+ 
+ 	if (conv == NULL || conv->segCount == 0) {
+-		dsp_ops_clear(conv->dsp, output, len);
++		dsp_ops_clear(dsp, output, len);
+ 		return len;
+ 	}
+ 
+@@ -194,17 +191,17 @@ static int convolver1_run(struct convolver1 *conv, const float *input, float *ou
+ 		const int processing = SPA_MIN(len - processed, conv->blockSize - conv->inputBufferFill);
+ 		const int inputBufferPos = conv->inputBufferFill;
+ 
+-		dsp_ops_copy(conv->dsp, conv->inputBuffer + inputBufferPos, input + processed, processing);
++		dsp_ops_copy(dsp, conv->inputBuffer + inputBufferPos, input + processed, processing);
+ 		if (inputBufferPos == 0 && processing < conv->blockSize)
+-			dsp_ops_clear(conv->dsp, conv->inputBuffer + processing, conv->blockSize - processing);
++			dsp_ops_clear(dsp, conv->inputBuffer + processing, conv->blockSize - processing);
+ 
+-		dsp_ops_fft_run(conv->dsp, conv->fft, 1, conv->inputBuffer, conv->segments[conv->current]);
++		dsp_ops_fft_run(dsp, conv->fft, 1, conv->inputBuffer, conv->segments[conv->current]);
+ 
+ 		if (conv->segCount > 1) {
+ 			if (conv->inputBufferFill == 0) {
+ 				int indexAudio = (conv->current + 1) % conv->segCount;
+ 
+-				dsp_ops_fft_cmul(conv->dsp, conv->fft, conv->pre_mult,
++				dsp_ops_fft_cmul(dsp, conv->fft, conv->pre_mult,
+ 						conv->segmentsIr[1],
+ 						conv->segments[indexAudio],
+ 						conv->fftComplexSize, conv->scale);
+@@ -212,7 +209,7 @@ static int convolver1_run(struct convolver1 *conv, const float *input, float *ou
+ 				for (i = 2; i < conv->segCount; i++) {
+ 					indexAudio = (conv->current + i) % conv->segCount;
+ 
+-					dsp_ops_fft_cmuladd(conv->dsp, conv->fft,
++					dsp_ops_fft_cmuladd(dsp, conv->fft,
+ 							conv->pre_mult,
+ 							conv->pre_mult,
+ 							conv->segmentsIr[i],
+@@ -220,30 +217,30 @@ static int convolver1_run(struct convolver1 *conv, const float *input, float *ou
+ 							conv->fftComplexSize, conv->scale);
+ 				}
+ 			}
+-			dsp_ops_fft_cmuladd(conv->dsp, conv->fft,
++			dsp_ops_fft_cmuladd(dsp, conv->fft,
+ 					conv->conv,
+ 					conv->pre_mult,
+ 					conv->segments[conv->current],
+ 					conv->segmentsIr[0],
+ 					conv->fftComplexSize, conv->scale);
+ 		} else {
+-			dsp_ops_fft_cmul(conv->dsp, conv->fft,
++			dsp_ops_fft_cmul(dsp, conv->fft,
+ 					conv->conv,
+ 					conv->segments[conv->current],
+ 					conv->segmentsIr[0],
+ 					conv->fftComplexSize, conv->scale);
+ 		}
+ 
+-		dsp_ops_fft_run(conv->dsp, conv->ifft, -1, conv->conv, conv->fft_buffer);
++		dsp_ops_fft_run(dsp, conv->ifft, -1, conv->conv, conv->fft_buffer);
+ 
+-		dsp_ops_sum(conv->dsp, output + processed, conv->fft_buffer + inputBufferPos,
++		dsp_ops_sum(dsp, output + processed, conv->fft_buffer + inputBufferPos,
+ 				conv->overlap + inputBufferPos, processing);
+ 
+ 		conv->inputBufferFill += processing;
+ 		if (conv->inputBufferFill == conv->blockSize) {
+ 			conv->inputBufferFill = 0;
+ 
+-			dsp_ops_copy(conv->dsp, conv->overlap, conv->fft_buffer + conv->blockSize, conv->blockSize);
++			dsp_ops_copy(dsp, conv->overlap, conv->fft_buffer + conv->blockSize, conv->blockSize);
+ 
+ 			conv->current = (conv->current > 0) ? (conv->current - 1) : (conv->segCount - 1);
+ 		}
+@@ -272,17 +269,18 @@ struct convolver
+ 
+ void convolver_reset(struct convolver *conv)
+ {
++	struct dsp_ops *dsp = conv->dsp;
+ 	if (conv->headConvolver)
+-		convolver1_reset(conv->headConvolver);
++		convolver1_reset(dsp, conv->headConvolver);
+ 	if (conv->tailConvolver0) {
+-		convolver1_reset(conv->tailConvolver0);
+-		dsp_ops_clear(conv->dsp, conv->tailOutput0, conv->tailBlockSize);
+-		dsp_ops_clear(conv->dsp, conv->tailPrecalculated0, conv->tailBlockSize);
++		convolver1_reset(dsp, conv->tailConvolver0);
++		dsp_ops_clear(dsp, conv->tailOutput0, conv->tailBlockSize);
++		dsp_ops_clear(dsp, conv->tailPrecalculated0, conv->tailBlockSize);
+ 	}
+ 	if (conv->tailConvolver) {
+-		convolver1_reset(conv->tailConvolver);
+-		dsp_ops_clear(conv->dsp, conv->tailOutput, conv->tailBlockSize);
+-		dsp_ops_clear(conv->dsp, conv->tailPrecalculated, conv->tailBlockSize);
++		convolver1_reset(dsp, conv->tailConvolver);
++		dsp_ops_clear(dsp, conv->tailOutput, conv->tailBlockSize);
++		dsp_ops_clear(dsp, conv->tailPrecalculated, conv->tailBlockSize);
+ 	}
+ 	conv->tailInputFill = 0;
+ 	conv->precalculatedPos = 0;
+@@ -307,10 +305,11 @@ struct convolver *convolver_new(struct dsp_ops *dsp_ops, int head_block, int tai
+ 	if (conv == NULL)
+ 		return NULL;
+ 
++	conv->dsp = dsp_ops;
++
+ 	if (irlen == 0)
+ 		return conv;
+ 
+-	conv->dsp = dsp_ops;
+ 	conv->headBlockSize = next_power_of_two(head_block);
+ 	conv->tailBlockSize = next_power_of_two(tail_block);
+ 
+@@ -341,12 +340,13 @@ struct convolver *convolver_new(struct dsp_ops *dsp_ops, int head_block, int tai
+ 
+ void convolver_free(struct convolver *conv)
+ {
++	struct dsp_ops *dsp = conv->dsp;
+ 	if (conv->headConvolver)
+-		convolver1_free(conv->headConvolver);
++		convolver1_free(dsp, conv->headConvolver);
+ 	if (conv->tailConvolver0)
+-		convolver1_free(conv->tailConvolver0);
++		convolver1_free(dsp, conv->tailConvolver0);
+ 	if (conv->tailConvolver)
+-		convolver1_free(conv->tailConvolver);
++		convolver1_free(dsp, conv->tailConvolver);
+ 	fft_free(conv->tailOutput0);
+ 	fft_free(conv->tailPrecalculated0);
+ 	fft_free(conv->tailOutput);
+@@ -357,7 +357,9 @@ void convolver_free(struct convolver *conv)
+ 
+ int convolver_run(struct convolver *conv, const float *input, float *output, int length)
+ {
+-	convolver1_run(conv->headConvolver, input, output, length);
++	struct dsp_ops *dsp = conv->dsp;
++
++	convolver1_run(dsp, conv->headConvolver, input, output, length);
+ 
+ 	if (conv->tailInput) {
+ 		int processed = 0;
+@@ -367,21 +369,21 @@ int convolver_run(struct convolver *conv, const float *input, float *output, int
+ 			int processing = SPA_MIN(remaining, conv->headBlockSize - (conv->tailInputFill % conv->headBlockSize));
+ 
+ 			if (conv->tailPrecalculated0)
+-				dsp_ops_sum(conv->dsp, &output[processed], &output[processed],
++				dsp_ops_sum(dsp, &output[processed], &output[processed],
+ 						&conv->tailPrecalculated0[conv->precalculatedPos],
+ 						processing);
+ 			if (conv->tailPrecalculated)
+-				dsp_ops_sum(conv->dsp, &output[processed], &output[processed],
++				dsp_ops_sum(dsp, &output[processed], &output[processed],
+ 						&conv->tailPrecalculated[conv->precalculatedPos],
+ 						processing);
+ 			conv->precalculatedPos += processing;
+ 
+-			dsp_ops_copy(conv->dsp, conv->tailInput + conv->tailInputFill, input + processed, processing);
++			dsp_ops_copy(dsp, conv->tailInput + conv->tailInputFill, input + processed, processing);
+ 			conv->tailInputFill += processing;
+ 
+ 			if (conv->tailPrecalculated0 && (conv->tailInputFill % conv->headBlockSize == 0)) {
+ 				int blockOffset = conv->tailInputFill - conv->headBlockSize;
+-				convolver1_run(conv->tailConvolver0,
++				convolver1_run(dsp, conv->tailConvolver0,
+ 						conv->tailInput + blockOffset,
+ 						conv->tailOutput0 + blockOffset,
+ 						conv->headBlockSize);
+@@ -392,7 +394,7 @@ int convolver_run(struct convolver *conv, const float *input, float *output, int
+ 			if (conv->tailPrecalculated &&
+ 			    conv->tailInputFill == conv->tailBlockSize) {
+ 				SPA_SWAP(conv->tailPrecalculated, conv->tailOutput);
+-				convolver1_run(conv->tailConvolver, conv->tailInput,
++				convolver1_run(dsp, conv->tailConvolver, conv->tailInput,
+ 						conv->tailOutput, conv->tailBlockSize);
+ 			}
+ 			if (conv->tailInputFill == conv->tailBlockSize) {
+-- 
+2.48.0
+
diff --git a/media-video/pipewire/files/1.2.7/0008-spa-initialize-all-fields-explicitly.patch b/media-video/pipewire/files/1.2.7/0008-spa-initialize-all-fields-explicitly.patch
new file mode 100644
index 000000000000..24b99891cee2
--- /dev/null
+++ b/media-video/pipewire/files/1.2.7/0008-spa-initialize-all-fields-explicitly.patch
@@ -0,0 +1,47 @@
+From 223569dc4a5778bf74f6d072b10e71912f8b5418 Mon Sep 17 00:00:00 2001
+Message-ID: <223569dc4a5778bf74f6d072b10e71912f8b5418.1737052666.git.sam@gentoo.org>
+In-Reply-To: <1993383ddf67e296334c7916d6afc699ee6300c7.1737052666.git.sam@gentoo.org>
+References: <1993383ddf67e296334c7916d6afc699ee6300c7.1737052666.git.sam@gentoo.org>
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Mon, 30 Sep 2024 10:06:30 +0200
+Subject: [PATCH 8/8] spa: initialize all fields explicitly
+
+Patch by Petar Popovic
+
+Fixes #4325
+
+(cherry picked from commit 0ca64277b317b4836beccaa3248ab9055526811c)
+---
+ spa/include/spa/pod/builder.h | 2 +-
+ spa/include/spa/pod/parser.h  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/spa/include/spa/pod/builder.h b/spa/include/spa/pod/builder.h
+index 0564d94ea..6d3e9d54a 100644
+--- a/spa/include/spa/pod/builder.h
++++ b/spa/include/spa/pod/builder.h
+@@ -49,7 +49,7 @@ struct spa_pod_builder {
+ 	struct spa_callbacks callbacks;
+ };
+ 
+-#define SPA_POD_BUILDER_INIT(buffer,size)  ((struct spa_pod_builder){ (buffer), (size), 0, {0}, {0} })
++#define SPA_POD_BUILDER_INIT(buffer,size)  ((struct spa_pod_builder){ (buffer), (size), 0, {0,0,NULL},{NULL,NULL}})
+ 
+ static inline void
+ spa_pod_builder_get_state(struct spa_pod_builder *builder, struct spa_pod_builder_state *state)
+diff --git a/spa/include/spa/pod/parser.h b/spa/include/spa/pod/parser.h
+index 083f91171..4c1e72acc 100644
+--- a/spa/include/spa/pod/parser.h
++++ b/spa/include/spa/pod/parser.h
+@@ -33,7 +33,7 @@ struct spa_pod_parser {
+ 	struct spa_pod_parser_state state;
+ };
+ 
+-#define SPA_POD_PARSER_INIT(buffer,size)  ((struct spa_pod_parser){ (buffer), (size), 0, {0} })
++#define SPA_POD_PARSER_INIT(buffer,size)  ((struct spa_pod_parser){ (buffer), (size), 0, {0,0,NULL}})
+ 
+ static inline void spa_pod_parser_init(struct spa_pod_parser *parser,
+ 				       const void *data, uint32_t size)
+-- 
+2.48.0
+
diff --git a/media-video/pipewire/pipewire-1.2.7-r1.ebuild b/media-video/pipewire/pipewire-1.2.7-r1.ebuild
new file mode 100644
index 000000000000..63b0b609e159
--- /dev/null
+++ b/media-video/pipewire/pipewire-1.2.7-r1.ebuild
@@ -0,0 +1,527 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Upstream also sometimes amend release notes for the previous release to mention
+# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
+#
+# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+# TODO: Maybe get upstream to produce `meson dist` tarballs:
+# - https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3663
+# - https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1788
+#
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-pipewire-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${PIPEWIRE_DOCS_PREBUILT:=1}
+
+PIPEWIRE_DOCS_PREBUILT_DEV=sam
+PIPEWIRE_DOCS_VERSION="$(ver_cut 1-2).0"
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+PIPEWIRE_DOCS_USEFLAG="+man"
+PYTHON_COMPAT=( python3_{10..13} )
+inherit meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
+
+if [[ ${PV} == 9999 ]]; then
+	PIPEWIRE_DOCS_PREBUILT=0
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *_p* ]] ; then
+		MY_COMMIT=""
+		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+		S="${WORKDIR}"/${PN}-${MY_COMMIT}
+	else
+		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	fi
+
+	if [[ ${PIPEWIRE_DOCS_PREBUILT} == 1 ]] ; then
+		SRC_URI+=" !man? ( https://dev.gentoo.org/~${PIPEWIRE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${PIPEWIRE_DOCS_VERSION}-docs.tar.xz )"
+		PIPEWIRE_DOCS_USEFLAG="man"
+	fi
+
+	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="${PIPEWIRE_DOCS_USEFLAG} bluetooth elogind dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2"
+IUSE+=" modemmanager pipewire-alsa readline roc selinux sound-server ssl system-service systemd test v4l X zeroconf"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+# - TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
+# - TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
+#   which provides adequate guarantee that alsa-lib will be able to provide audio services.
+#   If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
+#   When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
+# - ffmpeg is only used for pw-cat. We don't build the spa plugin which receives barely any activity.
+REQUIRED_USE="
+	ffmpeg? ( extra )
+	bluetooth? ( dbus )
+	jack-sdk? ( !jack-client )
+	modemmanager? ( bluetooth )
+	system-service? ( systemd )
+	!sound-server? ( !pipewire-alsa )
+	jack-client? ( dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-build/meson-0.59
+	virtual/pkgconfig
+	dbus? ( dev-util/gdbus-codegen )
+	doc? (
+		${PYTHON_DEPS}
+		>=app-text/doxygen-1.9.8
+		media-gfx/graphviz
+	)
+	man? (
+		${PYTHON_DEPS}
+		>=app-text/doxygen-1.9.8
+	)
+"
+# * While udev could technically be optional, it's needed for a number of options,
+# and not really worth it, bug #877769.
+#
+# * Supports both legacy webrtc-audio-processing:0 and new webrtc-audio-processing:1.
+# We depend on :1 as it prefers that, it's not legacy, and to avoid automagic.
+#
+# * Older Doxygen (<1.9.8) may work but inferior output is created:
+#   - https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1778
+#   - https://github.com/doxygen/doxygen/issues/9254
+RDEPEND="
+	acct-group/audio
+	acct-group/pipewire
+	media-libs/alsa-lib[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		dev-libs/glib
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libfreeaptx
+		media-libs/opus
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+		virtual/libusb:1
+	)
+	elogind? ( sys-auth/elogind )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	echo-cancel? ( >=media-libs/webrtc-audio-processing-1.2:1 )
+	extra? ( >=media-libs/libsndfile-1.0.20 )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flatpak? ( dev-libs/glib )
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gsettings? ( >=dev-libs/glib-2.26.0:2 )
+	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	liblc3? ( media-sound/liblc3 )
+	lv2? ( media-libs/lilv )
+	modemmanager? ( >=net-misc/modemmanager-1.10.0 )
+	pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] )
+	sound-server? ( !media-sound/pulseaudio-daemon )
+	roc? ( >=media-libs/roc-toolkit-0.3.0:= )
+	readline? ( sys-libs/readline:= )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd )
+	system-service? ( acct-user/pipewire )
+	v4l? ( media-libs/libv4l )
+	X? (
+		media-libs/libcanberra
+		x11-libs/libX11
+		x11-libs/libXfixes
+	)
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}"
+
+PDEPEND=">=media-video/wireplumber-0.5.2"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+pkg_setup() {
+	if use doc || use man ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Used for upstream backports
+	[[ -d "${FILESDIR}"/${PV} ]] && eapply "${FILESDIR}"/${PV}
+}
+
+multilib_src_configure() {
+	local logind=disabled
+	if multilib_is_native_abi ; then
+		if use systemd ; then
+			logind=enabled
+		elif use elogind ; then
+			logind=enabled
+		fi
+	fi
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
+		$(meson_feature dbus)
+		$(meson_native_use_feature zeroconf avahi)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_use_feature man)
+		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_feature ieee1394 libffado)
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature gsettings)
+		$(meson_native_use_feature systemd)
+		-Dlogind=${logind}
+		-Dlogind-provider=$(usex systemd 'libsystemd' 'libelogind')
+
+		$(meson_native_use_feature system-service systemd-system-service)
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		$(meson_feature selinux)
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+		-Dcompress-offload=disabled # TODO: tinycompress unpackaged
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379
+		$(meson_native_use_feature modemmanager bluez5-backend-native-mm)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		$(meson_native_use_feature bluetooth opus)
+		$(meson_native_use_feature bluetooth bluez5-codec-opus)
+		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
+		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		$(meson_native_use_feature ffmpeg pw-cat-ffmpeg)
+		$(meson_native_use_feature flatpak)
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_use jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		-Dbluez5-codec-lc3plus=disabled # unpackaged
+		$(meson_native_use_feature liblc3 bluez5-codec-lc3)
+		$(meson_native_use_feature lv2)
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		$(meson_native_use_feature roc)
+		$(meson_native_use_feature readline)
+		$(meson_native_use_feature ssl raop)
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		-Dlibmysofa=disabled # libmysofa is unpackaged
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+
+		# We still have <5.16 kernels packaged in Gentoo and 6.1 (LTS) only
+		# just became stable, with 5.15 being the previous LTS. Many people
+		# are still on it.
+		-Dpam-defaults-install=true
+
+		# Just for bell sounds in X11 right now.
+		$(meson_native_use_feature X x11)
+		$(meson_native_use_feature X x11-xfixes)
+		$(meson_native_use_feature X libcanberra)
+
+		# TODO
+		-Dsnap=disabled
+	)
+
+	# This installs the schema file for pulseaudio-daemon, iff we are replacing
+	# the official sound-server
+	if use !sound-server; then
+		emesonargs+=( '-Dgsettings-pulse-schema=disabled' )
+	else
+		emesonargs+=(
+			$(meson_native_use_feature gsettings gsettings-pulse-schema)
+		)
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test --timeout-multiplier 10
+}
+
+multilib_src_install() {
+	# Our custom DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use man && [[ ${PIPEWIRE_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${PIPEWIRE_DOCS_VERSION}-docs/man/*/*.[0-8]
+	fi
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+
+		# Install pipewire conf loader hook
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/99-pipewire-default-hook.conf
+		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
+
+		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
+	fi
+
+	# Enable required wireplumber alsa and bluez monitors
+	if use sound-server; then
+		# Install sound-server enabler for wireplumber 0.5.0+ conf syntax
+		insinto /etc/wireplumber/wireplumber.conf.d
+		doins "${FILESDIR}"/gentoo-sound-server-enable-audio-bluetooth.conf
+	fi
+
+	if use system-service; then
+		newtmpfiles - pipewire.conf <<-EOF || die
+			d /run/pipewire 0755 pipewire pipewire - -
+		EOF
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop-r2 pipewire.desktop
+
+		exeinto /usr/bin
+		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r3 gentoo-pipewire-launcher
+
+		doman "${FILESDIR}"/gentoo-pipewire-launcher.1
+
+		# Disable pipewire-pulse if sound-server is disabled.
+		if ! use sound-server ; then
+			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
+		fi
+
+		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
+
+pkg_preinst() {
+	HAD_SOUND_SERVER=0
+	HAD_SYSTEM_SERVICE=0
+
+	if has_version "media-video/pipewire[sound-server(-)]" ; then
+		HAD_SOUND_SERVER=1
+	fi
+
+	if has_version "media-video/pipewire[system-service(-)]" ; then
+		HAD_SYSTEM_SERVICE=1
+	fi
+}
+
+pkg_postinst() {
+	udev_reload
+
+	use system-service && tmpfiles_process pipewire.conf
+
+	local ver
+	for ver in ${REPLACING_VERSIONS} ; do
+		if has_version kde-plasma/kwin[screencast] || has_version x11-wm/mutter[screencast] ; then
+			# https://bugs.gentoo.org/908490
+			# https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3243
+			ewarn "Please restart KWin/Mutter after upgrading PipeWire."
+			ewarn "Screencasting may not work until you do."
+		fi
+
+		if ver_test ${ver} -le 0.3.66-r1 ; then
+			elog ">=pipewire-0.3.66 uses the 'pipewire' group to manage permissions"
+			elog "and limits needed to function smoothly:"
+			elog
+			elog "1. Please make sure your user is in the 'pipewire' group for"
+			elog "the best experience with realtime scheduling (PAM limits behavior)!"
+			elog "You can add your account with:"
+			elog " usermod -aG pipewire <youruser>"
+			elog
+			elog "2. For the best experience with fast user switching, it is recommended"
+			elog "that you remove your user from the 'audio' group unless you rely on the"
+			elog "audio group for device access control or ACLs.:"
+			elog " usermod -rG audio <youruser>"
+			elog
+
+			if ! use jack-sdk ; then
+				elog
+				elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+				elog "alternative libraries have been installed to a non-default location."
+				elog "To use them, put pw-jack <application> before every JACK application."
+				elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+				elog "provider is still needed to compile the JACK applications themselves."
+				elog
+			fi
+
+			if use systemd ; then
+				ewarn
+				ewarn "PipeWire daemon startup has been moved to a launcher script!"
+				ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+				ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+				ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+				ewarn
+				ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+				ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+				ewarn "advised that a D-Bus user session is set up before starting the script."
+				ewarn
+			fi
+
+			if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
+				elog
+				elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+				elog "are recommended to edit pulseaudio client configuration files:"
+				elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+				elog "if it exists, and disable autospawning of the original daemon by setting:"
+				elog
+				elog "  autospawn = no"
+				elog
+				elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+				elog
+				elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+				elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+				elog "command:"
+				elog
+				elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+				elog
+			fi
+
+			if has_version 'net-misc/ofono' ; then
+				ewarn "Native backend has become default. Please disable oFono via:"
+				if systemd_is_booted ; then
+					ewarn "systemctl disable ofono"
+				else
+					ewarn "rc-update delete ofono"
+				fi
+			fi
+		fi
+	done
+
+	if [[ ${HAD_SOUND_SERVER} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
+		# TODO: We could drop most of this if we set up systemd presets?
+		# They're worth looking into because right now, the out-of-the-box experience
+		# is automatic on OpenRC, while it needs manual intervention on systemd.
+		if use sound-server && use systemd ; then
+			elog
+			elog "When switching from PulseAudio, you may need to disable PulseAudio:"
+			elog
+			elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+			elog
+			elog "To use PipeWire, the user units must be manually enabled"
+			elog "by running this command as each user you use for desktop activities:"
+			elog
+			elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+			elog
+			elog "A reboot is recommended to avoid interferences from still running"
+			elog "PulseAudio daemon."
+			elog
+			elog "Both new users and those upgrading need to enable WirePlumber"
+			elog "for relevant users:"
+			elog
+			elog "  systemctl --user disable pipewire-media-session.service"
+			elog "  systemctl --user --force enable wireplumber.service"
+			elog
+			elog "Root user may replace --user with --global to change system default"
+			elog "configuration for all of the above commands."
+			elog
+		fi
+
+		if ! use sound-server ; then
+			ewarn
+			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
+			ewarn "your sound, please enable it. See the wiki at"
+			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
+			ewarn "for more details."
+			ewarn
+		fi
+	fi
+
+	if use system-service && [[ ${HAD_SYSTEM_SERVICE} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
+		ewarn
+		ewarn "You have enabled the system-service USE flag, which installs"
+		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
+		ewarn "service. This is more than likely NOT what you want. You are strongly"
+		ewarn "advised not to enable this mode and instead stick with systemd user"
+		ewarn "units. The default configuration files will likely not work out of the"
+		ewarn "box, and you are on your own with configuration."
+		ewarn
+	fi
+
+	elog "For latest tips and tricks, troubleshooting information, and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+	if use sound-server && ! use pipewire-alsa; then
+		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
+	fi
+}
diff --git a/media-video/pipewire/pipewire-1.2.7.ebuild b/media-video/pipewire/pipewire-1.2.7.ebuild
index abb7bfd0f406..bcfeeafff3df 100644
--- a/media-video/pipewire/pipewire-1.2.7.ebuild
+++ b/media-video/pipewire/pipewire-1.2.7.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
 		PIPEWIRE_DOCS_USEFLAG="man"
 	fi
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
@@ -188,7 +188,7 @@ src_prepare() {
 	default
 
 	# Used for upstream backports
-	[[ -d "${FILESDIR}"/${PV} ]] && eapply "${FILESDIR}"/${PV}
+	#[[ -d "${FILESDIR}"/${PV} ]] && eapply "${FILESDIR}"/${PV}
 }
 
 multilib_src_configure() {
diff --git a/media-video/qmplay2/qmplay2-24.12.28.ebuild b/media-video/qmplay2/qmplay2-24.12.28.ebuild
index 389e940a75d0..6c13763ed45a 100644
--- a/media-video/qmplay2/qmplay2-24.12.28.ebuild
+++ b/media-video/qmplay2/qmplay2-24.12.28.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 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
 	S="${WORKDIR}/QMPlay2-src-${PV}"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="LGPL-3"
diff --git a/media-video/vlc/files/vlc-3.0.2.1-vdpau.patch b/media-video/vlc/files/vlc-3.0.2.1-vdpau.patch
new file mode 100644
index 000000000000..884c1fcd1eb2
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.2.1-vdpau.patch
@@ -0,0 +1,174 @@
+https://bugs.gentoo.org/946178
+https://code.videolan.org/videolan/vlc/-/issues/28374
+https://code.videolan.org/videolan/vlc/-/merge_requests/6454
+https://code.videolan.org/videolan/vlc/-/merge_requests/6496
+
+From 056d7349a559cb63b456505bb11c08a4910452aa Mon Sep 17 00:00:00 2001
+From: Alexandre Janniaux <ajanni@videolabs.io>
+Date: Sun, 1 Dec 2024 06:25:29 +0100
+Subject: [PATCH] Makefile.am: enforce pkglib dependency order for install
+
+During installation, no dependencies existed between the targets being
+installed and the targets being relinked against the installed version,
+which made the following race condition:
+
+    ../doltlibtool   --mode=install /usr/bin/install -c   libvlc_pipewire.la libvlc_pulse.la libvlc_vdpau.la libvlc_xcb_events.la '/builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc'
+    libtool: install: (cd /builds/videolan/vlc/vlc-4.0.0-dev/_build/sub/modules; /bin/bash "/builds/videolan/vlc/vlc-4.0.0-dev/_build/sub/modules/../libtool"  --silent --tag CC --mode=relink gcc -g -O2 -pthread -Wall -Wextra -Wsign-compare -Wundef -Wpointer-arith -Wvolatile-register-var -Wformat -Wformat-security -Wduplicated-branches -Wduplicated-cond -Wbad-function-cast -Wwrite-strings -Wmissing-prototypes -Werror-implicit-function-declaration -Winit-self -Wlogical-op -Wshadow=local -Wmultistatement-macros -pipe -Werror=missing-field-initializers -Werror=format -Werror=incompatible-pointer-types -Werror=restrict -Werror=int-conversion -Werror=implicit-int -Werror=return-mismatch -Werror=declaration-missing-parameter-type -fvisibility=hidden -fno-math-errno -funsafe-math-optimizations -fno-rounding-math -fno-signaling-nans -fcx-limited-range -funroll-loops -fstack-protector-strong -avoid-version -module -export-symbols-regex "^vlc_entry" -shrext .so -no-undefined ../compat/libcompat.la ../src/libvlccore.la -Wl,-z,defs -o libvdpau_instance_plugin.la -rpath /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc/plugins/vdpau hw/vdpau/libvdpau_instance_plugin_la-device.lo libvlc_vdpau.la -lSM -lICE -lX11 -lanl )
+    libtool: install: /usr/bin/install -c .libs/libvlc_vdpau.so.0.0.0 /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc/libvlc_vdpau.so.0.0.0
+    /usr/bin/ld: cannot find -lvlc_vdpau: No such file or directory
+    libtool: install: (cd /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc && { ln -s -f libvlc_vdpau.so.0.0.0 libvlc_vdpau.so.0 || { rm -f libvlc_vdpau.so.0 && ln -s libvlc_vdpau.so.0.0.0 libvlc_vdpau.so.0; }; })
+    collect2: error: ld returned 1 exit status
+    libtool: install: (cd /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc && { ln -s -f libvlc_vdpau.so.0.0.0 libvlc_vdpau.so || { rm -f libvlc_vdpau.so && ln -s libvlc_vdpau.so.0.0.0 libvlc_vdpau.so; }; })
+    ----------------------------------------------------------------------
+    libtool:   error: error: relink 'libvdpau_instance_plugin.la' with the above command before installing it
+    libtool: install: /usr/bin/install -c .libs/libvlc_vdpau.lai /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc/libvlc_vdpau.la
+    make[6]: *** [Makefile:15527: install-vdpauLTLIBRARIES] Error 1
+
+Here, with the thread number, we have:
+ - (1) doltlibtool installing the pkglibs (install-exec-am).
+ - (2) in parallel, libtool relinking the vdpau instance plugin.
+ - (1) libtool starts to be called for "relinking" (which is only
+       installing there) with version 0.0.0.
+ - (2) libtool tried to run the linker but it failed because
+       libvlc_vdpau.so doesn't exist yet on the target prefix.
+ - (1) libtool .0.0.0 links to the major version shortcut .0 for
+       libvlc_vdpau.
+ - (1) libtool .0.0.0 links to the unversioned shortcut for
+       libvlc_vdpau.
+
+So the pkglibs were not installed before installing the plugins linking
+them and it was racy whether automake succeeded in installing vlc_vdpau
+before or not. This could apply to any pkglib being used from plugins.
+
+This patch ensure the pkglibs are installed before relinking the plugins
+for vpdau, same must be done for each other pkglib usage location.
+
+Note that install-vdpauLTLIBRARIES itself will install each target from
+vdpau_LTLIBRARIES serially in the order they are defined, so there would
+be no race inside the same LTLIBRARIES variables, but the different
+LTLIBRARIES variables are processed in parallel themselves.
+
+Fixes #28374
+---
+ modules/Makefile.am              | 1 +
+ modules/audio_output/Makefile.am | 3 +++
+ modules/hw/vdpau/Makefile.am     | 4 ++++
+ modules/video_output/Makefile.am | 3 +++
+ 4 files changed, 11 insertions(+)
+
+diff --git a/modules/Makefile.am b/modules/Makefile.am
+index d9940f95cbc8..3a41a6bbe456 100644
+--- a/modules/Makefile.am
++++ b/modules/Makefile.am
+@@ -1,3 +1,4 @@
++
+ noinst_LTLIBRARIES =
+ check_LTLIBRARIES =
+ pkglib_LTLIBRARIES =
+diff --git a/modules/audio_output/Makefile.am b/modules/audio_output/Makefile.am
+index 4c7957cdd153..8d48003e20b5 100644
+--- a/modules/audio_output/Makefile.am
++++ b/modules/audio_output/Makefile.am
+@@ -1,5 +1,8 @@
+ aoutdir = $(pluginsdir)/audio_output
+ aout_LTLIBRARIES =
++# Install the pkglib/pkglibexec first before relinking the modules.
++# This ensures libtool re-linking is not racy.
++install-aoutLTLIBRARIES: install-pkglibLTLIBRARIES
+ 
+ libvlc_android_audioformat_jni_la_SOURCES = \
+ 	audio_output/android/audioformat_jni.c \
+diff --git a/modules/hw/vdpau/Makefile.am b/modules/hw/vdpau/Makefile.am
+index ef3601209314..f195f712310b 100644
+--- a/modules/hw/vdpau/Makefile.am
++++ b/modules/hw/vdpau/Makefile.am
+@@ -1,4 +1,8 @@
+ vdpaudir = $(pluginsdir)/vdpau
++# Install the pkglib/pkglibexec first before relinking the modules.
++# This ensures libtool re-linking is not racy.
++install-vpdauLTLIBRARIES: install-pkglibLTLIBRARIES
++
+ 
+ libvlc_vdpau_la_SOURCES = hw/vdpau/vlc_vdpau.c hw/vdpau/vlc_vdpau.h
+ libvlc_vdpau_la_CFLAGS = $(VDPAU_CFLAGS)
+diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
+index ad959bc45ed5..bcbb892c4c93 100644
+--- a/modules/video_output/Makefile.am
++++ b/modules/video_output/Makefile.am
+@@ -1,5 +1,8 @@
+ voutdir = $(pluginsdir)/video_output
+ vout_LTLIBRARIES =
++# Install the pkglib/pkglibexec first before relinking the modules.
++# This ensures libtool re-linking is not racy.
++install-voutLTLIBRARIES: install-pkglibLTLIBRARIES
+ 
+ EXTRA_DIST += video_output/README
+ 
+-- 
+GitLab
+
+From 0b9f3f836f1c678e6d101f62545a8edaba16dcd0 Mon Sep 17 00:00:00 2001
+From: Alexandre Janniaux <ajanni@videolabs.io>
+Date: Sun, 8 Dec 2024 22:43:37 +0100
+Subject: [PATCH] Makefile.am: fix installation regression
+
+Automake doesn't generate automatic rules when a rule already exist in
+the file, except if it cannot detect it. Adding the
+`install-fooLTLIBRARIES: install-pkglibLTLIBRARIES` rule for audio
+outputs, video outputs and vdpau broke the installation.
+
+Adding `$(install-fooLTLIBRARIES): install-pkglibLTLIBRARIES` also makes
+automake unhappy because of the variable name looking suspiciously close
+to the target it generates, so a version without the dash is used for
+the variable name in the rule. With this, the install target is
+preserved but the dependency also exists in the output.
+---
+ modules/audio_output/Makefile.am | 3 ++-
+ modules/hw/vdpau/Makefile.am     | 3 ++-
+ modules/video_output/Makefile.am | 3 ++-
+ 3 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/modules/audio_output/Makefile.am b/modules/audio_output/Makefile.am
+index 8d48003e20b..c045a892c10 100644
+--- a/modules/audio_output/Makefile.am
++++ b/modules/audio_output/Makefile.am
+@@ -2,7 +2,8 @@ aoutdir = $(pluginsdir)/audio_output
+ aout_LTLIBRARIES =
+ # Install the pkglib/pkglibexec first before relinking the modules.
+ # This ensures libtool re-linking is not racy.
+-install-aoutLTLIBRARIES: install-pkglibLTLIBRARIES
++installaoutLTLIBRARIES = install-aoutLTLIBRARIES
++$(installaoutLTLIBRARIES): install-pkglibLTLIBRARIES
+ 
+ libvlc_android_audioformat_jni_la_SOURCES = \
+ 	audio_output/android/audioformat_jni.c \
+diff --git a/modules/hw/vdpau/Makefile.am b/modules/hw/vdpau/Makefile.am
+index f195f712310..1abdfa21a9b 100644
+--- a/modules/hw/vdpau/Makefile.am
++++ b/modules/hw/vdpau/Makefile.am
+@@ -1,7 +1,8 @@
+ vdpaudir = $(pluginsdir)/vdpau
+ # Install the pkglib/pkglibexec first before relinking the modules.
+ # This ensures libtool re-linking is not racy.
+-install-vpdauLTLIBRARIES: install-pkglibLTLIBRARIES
++installvpdauLTLIBRARIES = install-vdpauLTLIBRARIES
++$(installvpdauLTLIBRARIES): install-pkglibLTLIBRARIES
+ 
+ 
+ libvlc_vdpau_la_SOURCES = hw/vdpau/vlc_vdpau.c hw/vdpau/vlc_vdpau.h
+diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
+index bcbb892c4c9..844b0dd01c8 100644
+--- a/modules/video_output/Makefile.am
++++ b/modules/video_output/Makefile.am
+@@ -2,7 +2,8 @@ voutdir = $(pluginsdir)/video_output
+ vout_LTLIBRARIES =
+ # Install the pkglib/pkglibexec first before relinking the modules.
+ # This ensures libtool re-linking is not racy.
+-install-voutLTLIBRARIES: install-pkglibLTLIBRARIES
++installvoutLTLIBRARIES = install-voutLTLIBRARIES
++$(installvoutLTLIBRARIES): install-pkglibLTLIBRARIES
+ 
+ EXTRA_DIST += video_output/README
+ 
+-- 
+GitLab
diff --git a/media-video/vlc/files/vlc-3.0.21-vaapi-w-ffmpeg5.patch b/media-video/vlc/files/vlc-3.0.21-vaapi-w-ffmpeg5.patch
new file mode 100644
index 000000000000..322818b348b7
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.21-vaapi-w-ffmpeg5.patch
@@ -0,0 +1,149 @@
+From ba5dc03aecc1d96f81b76838f845ebde7348cf62 Mon Sep 17 00:00:00 2001
+From: David Rosca <nowrep@gmail.com>
+Date: Fri, 20 Dec 2024 20:24:36 +0100
+Subject: [PATCH] avcodec: vaapi: Support VAAPI with latest FFmpeg
+
+---
+ configure.ac                            | 20 +------------
+ modules/codec/Makefile.am               |  2 +-
+ modules/codec/avcodec/avcommon_compat.h |  3 ++
+ modules/codec/avcodec/vaapi.c           | 38 +++++++++++++++++++++++--
+ 4 files changed, 41 insertions(+), 22 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 00afb063c455..089339e10e0b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2550,25 +2550,7 @@ AM_CONDITIONAL([HAVE_VAAPI], [test "${have_vaapi}" = "yes"])
+ AM_CONDITIONAL([HAVE_VAAPI_DRM], [test "${have_vaapi_drm}" = "yes"])
+ AM_CONDITIONAL([HAVE_VAAPI_X11], [test "${have_vaapi_x11}" = "yes"])
+ AM_CONDITIONAL([HAVE_VAAPI_WL], [test "${have_vaapi_wl}" = "yes"])
+-
+-have_avcodec_vaapi="no"
+-AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [
+-  VLC_SAVE_FLAGS
+-  CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
+-  CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
+-  AC_CHECK_HEADERS([libavcodec/vaapi.h], [
+-    AC_MSG_NOTICE([VA API acceleration activated])
+-    have_avcodec_vaapi="yes"
+-  ],[
+-    AS_IF([test -n "${enable_libva}"], [
+-      AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])
+-    ], [
+-      AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])
+-    ])
+-  ])
+-  VLC_RESTORE_FLAGS
+-])
+-AM_CONDITIONAL([HAVE_AVCODEC_VAAPI], [test "${have_avcodec_vaapi}" = "yes"])
++AM_CONDITIONAL([HAVE_AVCODEC_VAAPI], [test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"])
+ 
+ dnl
+ dnl dxva2 needs avcodec
+diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
+index 6d9465fdaef9..dd04391c1bf7 100644
+--- a/modules/codec/Makefile.am
++++ b/modules/codec/Makefile.am
+@@ -416,7 +416,7 @@ libvaapi_plugin_la_SOURCES = \
+ 	codec/avcodec/vaapi.c hw/vaapi/vlc_vaapi.c hw/vaapi/vlc_vaapi.h
+ libvaapi_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+ libvaapi_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVCODEC_CFLAGS)
+-libvaapi_plugin_la_LIBADD = $(LIBVA_LIBS)
++libvaapi_plugin_la_LIBADD = $(LIBVA_LIBS) $(AVCODEC_LIBS)
+ if HAVE_AVCODEC_VAAPI
+ if HAVE_VAAPI_DRM
+ codec_LTLIBRARIES += libvaapi_drm_plugin.la
+diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h
+index ac02c06d2339..8ab6910f3250 100644
+--- a/modules/codec/avcodec/avcommon_compat.h
++++ b/modules/codec/avcodec/avcommon_compat.h
+@@ -84,6 +84,9 @@
+ #ifndef FF_API_AVIO_WRITE_NONCONST // removed in ffmpeg 7
+ # define FF_API_AVIO_WRITE_NONCONST (LIBAVFORMAT_VERSION_MAJOR < 61)
+ #endif
++#ifndef FF_API_STRUCT_VAAPI_CONTEXT
++# define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59)
++#endif
+ 
+ #endif /* HAVE_LIBAVCODEC_AVCODEC_H */
+ 
+diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
+index c83269e43f30..e203baaf9ee2 100644
+--- a/modules/codec/avcodec/vaapi.c
++++ b/modules/codec/avcodec/vaapi.c
+@@ -42,12 +42,25 @@
+ # include <va/va_drm.h>
+ #endif
+ #include <libavcodec/avcodec.h>
++#if FF_API_STRUCT_VAAPI_CONTEXT
+ #include <libavcodec/vaapi.h>
++#else
++#include <libavutil/hwcontext_vaapi.h>
++#endif
+ 
+ #include "avcodec.h"
+ #include "va.h"
+ #include "../../hw/vaapi/vlc_vaapi.h"
+ 
++#if !FF_API_STRUCT_VAAPI_CONTEXT
++struct vaapi_context
++{
++    VADisplay display;
++    VAConfigID config_id;
++    VAContextID context_id;
++};
++#endif
++
+ struct vlc_va_sys_t
+ {
+     struct vlc_vaapi_instance *va_inst;
+@@ -145,8 +158,10 @@ static void Delete(vlc_va_t *va, void **hwctx)
+ 
+     (void) hwctx;
+ 
+-    vlc_vaapi_DestroyContext(o, sys->hw_ctx.display, sys->hw_ctx.context_id);
+-    vlc_vaapi_DestroyConfig(o, sys->hw_ctx.display, sys->hw_ctx.config_id);
++    if (sys->hw_ctx.context_id != VA_INVALID_ID)
++        vlc_vaapi_DestroyContext(o, sys->hw_ctx.display, sys->hw_ctx.context_id);
++    if (sys->hw_ctx.config_id != VA_INVALID_ID)
++        vlc_vaapi_DestroyConfig(o, sys->hw_ctx.display, sys->hw_ctx.config_id);
+     vlc_vaapi_ReleaseInstance(sys->va_inst);
+     free(sys);
+ }
+@@ -196,6 +211,7 @@ static int Create(vlc_va_t *va, AVCodecContext *ctx, const AVPixFmtDescriptor *d
+     sys->hw_ctx.config_id = VA_INVALID_ID;
+     sys->hw_ctx.context_id = VA_INVALID_ID;
+ 
++#if FF_API_STRUCT_VAAPI_CONTEXT
+     sys->hw_ctx.config_id =
+         vlc_vaapi_CreateConfigChecked(o, sys->hw_ctx.display, i_profile,
+                                       VAEntrypointVLD, i_vlc_chroma);
+@@ -211,6 +227,24 @@ static int Create(vlc_va_t *va, AVCodecContext *ctx, const AVPixFmtDescriptor *d
+         goto error;
+ 
+     ctx->hwaccel_context = &sys->hw_ctx;
++#else
++    AVBufferRef *hwdev_ref = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_VAAPI);
++    if (hwdev_ref == NULL)
++        goto error;
++
++    AVHWDeviceContext *hwdev_ctx = (void *) hwdev_ref->data;
++    AVVAAPIDeviceContext *vadev_ctx = hwdev_ctx->hwctx;
++    vadev_ctx->display = va_dpy;
++
++    if (av_hwdevice_ctx_init(hwdev_ref) < 0)
++    {
++        av_buffer_unref(&hwdev_ref);
++        goto error;
++    }
++
++    ctx->hw_device_ctx = hwdev_ref;
++#endif
++
+     va->sys = sys;
+     va->description = vaQueryVendorString(sys->hw_ctx.display);
+     va->get = Get;
+-- 
+GitLab
+
diff --git a/media-video/vlc/vlc-3.0.21-r1.ebuild b/media-video/vlc/vlc-3.0.21-r1.ebuild
index 9ca438fed821..d34fc239251f 100644
--- a/media-video/vlc/vlc-3.0.21-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2024 Gentoo Authors
+# Copyright 2000-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -234,6 +234,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch
 	"${FILESDIR}"/${PN}-3.0.21-freerdp-2.patch # bug 919296, 590164
 	"${FILESDIR}"/${PN}-3.0.21-vaapi-without-ffmpeg4.patch # bug 864721, thx Fedora
+	"${FILESDIR}"/${PN}-3.0.2.1-vdpau.patch # bug 946178
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
diff --git a/media-video/vlc/vlc-3.0.21-r2.ebuild b/media-video/vlc/vlc-3.0.21-r2.ebuild
deleted file mode 100644
index c675966604da..000000000000
--- a/media-video/vlc/vlc-3.0.21-r2.ebuild
+++ /dev/null
@@ -1,498 +0,0 @@
-# Copyright 2000-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz
-	https://dev.gentoo.org/~asturm/distfiles/${P}-taglib2.tar.xz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86"
-
-IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus
-	dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth
-	fontconfig +gcrypt gme keyring gstreamer +gui ieee1394 jack jpeg kate
-	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua
-	macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg
-	omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image
-	sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame
-	udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi
-	cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse
-"
-REQUIRED_USE="
-	chromecast? ( encode )
-	directx? ( ffmpeg )
-	fontconfig? ( truetype )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	lua? ( ${LUA_REQUIRED_USE} )
-	skins? ( archive gui truetype X xml )
-	ssl? ( gcrypt )
-	vaapi? ( ffmpeg X )
-	vdpau? ( ffmpeg X )
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	lua? ( ${LUA_DEPS} )
-	amd64? ( dev-lang/yasm )
-	wayland? ( dev-util/wayland-scanner )
-	x86? ( dev-lang/yasm )
-"
-RDEPEND="
-	media-libs/libvorbis
-	net-dns/libidn:=
-	sys-libs/zlib
-	virtual/libintl
-	virtual/opengl
-	a52? ( media-libs/a52dec )
-	alsa? ( media-libs/alsa-lib )
-	aom? ( media-libs/libaom:= )
-	archive? ( app-arch/libarchive:= )
-	aribsub? ( media-libs/aribb24 )
-	bidi? (
-		dev-libs/fribidi
-		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz:=
-		virtual/ttf-fonts
-	)
-	bluray? ( >=media-libs/libbluray-1.3.0:= )
-	cddb? ( media-libs/libcddb )
-	chromaprint? ( media-libs/chromaprint:= )
-	chromecast? (
-		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.1.2:=
-	)
-	dav1d? ( media-libs/dav1d:= )
-	dbus? ( sys-apps/dbus )
-	dc1394? (
-		media-libs/libdc1394:2
-		sys-libs/libraw1394
-	)
-	dts? ( media-libs/libdca )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
-	dvd? (
-		>=media-libs/libdvdnav-6.1.1:=
-		>=media-libs/libdvdread-6.1.2:=
-	)
-	faad? ( media-libs/faad2 )
-	fdk? ( media-libs/fdk-aac:= )
-	ffmpeg? ( >=media-video/ffmpeg-3.1.3:=[postproc,vaapi?,vdpau?] )
-	flac? (
-		media-libs/flac:=
-		media-libs/libogg
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? (
-		dev-libs/libgcrypt:=
-		dev-libs/libgpg-error
-	)
-	gme? ( media-libs/game-music-emu )
-	keyring? ( app-crypt/libsecret )
-	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		X? (
-			dev-qt/qtx11extras:5
-			x11-libs/libX11
-		)
-	)
-	ieee1394? (
-		sys-libs/libavc1394
-		sys-libs/libraw1394
-	)
-	jack? ( virtual/jack )
-	jpeg? ( media-libs/libjpeg-turbo:0 )
-	kate? ( media-libs/libkate )
-	libass? (
-		media-libs/fontconfig:1.0
-		media-libs/libass:=
-	)
-	libcaca? ( media-libs/libcaca )
-	libnotify? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libnotify
-	)
-	libsamplerate? ( media-libs/libsamplerate )
-	libtar? ( dev-libs/libtar )
-	libtiger? ( media-libs/libtiger )
-	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live:= )
-	lua? ( ${LUA_DEPS} )
-	mad? ( media-libs/libmad )
-	matroska? (
-		>=dev-libs/libebml-1.4.2:=
-		media-libs/libmatroska:=
-	)
-	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
-	mp3? ( media-sound/mpg123-base )
-	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:= )
-	musepack? ( media-sound/musepack-tools )
-	ncurses? ( sys-libs/ncurses:=[unicode(+)] )
-	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( media-libs/libogg )
-	opus? ( >=media-libs/opus-1.0.3 )
-	png? ( media-libs/libpng:0= )
-	projectm? (
-		media-fonts/dejavu
-		>=media-libs/libprojectm-3.1.12:0=
-	)
-	pulseaudio? ( media-libs/libpulse )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:2= )
-	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	sdl-image? ( media-libs/sdl-image )
-	sftp? ( net-libs/libssh2 )
-	shout? ( media-libs/libshout )
-	sid? ( media-libs/libsidplay:2 )
-	skins? (
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXpm
-	)
-	soxr? ( >=media-libs/soxr-0.1.2 )
-	speex? (
-		>=media-libs/speex-1.2.0
-		media-libs/speexdsp
-	)
-	srt? ( >=net-libs/srt-1.4.2:= )
-	ssl? ( net-libs/gnutls:= )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-	)
-	taglib? ( media-libs/taglib:= )
-	theora? ( media-libs/libtheora )
-	tremor? ( media-libs/tremor )
-	truetype? (
-		media-libs/freetype:2
-		virtual/ttf-fonts
-		!fontconfig? ( media-fonts/dejavu )
-	)
-	twolame? ( media-sound/twolame )
-	udev? ( virtual/udev )
-	upnp? ( net-libs/libupnp:=[ipv6(+)] )
-	v4l? ( media-libs/libv4l:= )
-	vaapi? ( media-libs/libva:=[drm(+),wayland?,X?] )
-	vdpau? ( x11-libs/libvdpau )
-	vnc? ( net-libs/libvncserver )
-	vpx? ( media-libs/libvpx:= )
-	wayland? (
-		>=dev-libs/wayland-1.15
-		dev-libs/wayland-protocols
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-keysyms
-	)
-	x264? ( >=media-libs/x264-0.0.20190214:= )
-	x265? ( media-libs/x265:= )
-	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zvbi? ( media-libs/zvbi )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
-	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
-	"${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch
-	"${FILESDIR}"/${PN}-3.0.21-freerdp-2.patch # bug 919296, 590164
-	"${WORKDIR}"/${P}-taglib2 # bug 938946, in 3.0.x branch
-	"${FILESDIR}"/${PN}-3.0.21-vaapi-without-ffmpeg4.patch # bug 864721, thx Fedora
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-pkg_setup() {
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	# bug 608256
-	xdg_environment_reset
-
-	has_version 'net-libs/libupnp:1.8' && \
-		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
-	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	rm m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	# Disable running of vlc-cache-gen, we do that in pkg_postinst
-	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
-	# Fix gettext version mismatch errors.
-	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
-	local -x BUILDCC="$(tc-getBUILD_CC)"
-
-	local myeconfargs=(
-		--disable-aa
-		--disable-optimizations
-		--disable-rpath
-		--disable-update-check
-		--enable-fast-install
-		--enable-screen
-		--enable-vcd
-		--enable-vlc
-		--enable-vorbis
-		$(use_enable a52)
-		$(use_enable alsa)
-		$(use_enable aom)
-		$(use_enable archive)
-		$(use_enable aribsub)
-		$(use_enable bidi fribidi)
-		$(use_enable bidi harfbuzz)
-		$(use_enable bluray)
-		$(use_enable cddb libcddb)
-		$(use_enable chromaprint)
-		$(use_enable chromecast)
-		$(use_enable chromecast microdns)
-		$(use_enable cpu_flags_arm_neon neon)
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable dav1d)
-		$(use_enable dbus)
-		$(use_enable dbus kwallet)
-		$(use_enable dc1394)
-		$(use_enable debug)
-		$(use_enable directx)
-		$(use_enable directx d3d11va)
-		$(use_enable directx dxva2)
-		$(use_enable dts dca)
-		$(use_enable dvbpsi)
-		$(use_enable dvd dvdnav)
-		$(use_enable dvd dvdread)
-		$(use_enable encode sout)
-		$(use_enable encode vlm)
-		$(use_enable faad)
-		$(use_enable fdk fdkaac)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable ffmpeg avformat)
-		$(use_enable ffmpeg postproc)
-		$(use_enable ffmpeg swscale)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable fontconfig)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable gme)
-		$(use_enable keyring secret)
-		$(use_enable gstreamer gst-decode)
-		$(use_enable gui qt)
-		$(use_enable ieee1394 dv1394)
-		$(use_enable jack)
-		$(use_enable jpeg)
-		$(use_enable kate)
-		$(use_enable libass)
-		$(use_enable libcaca caca)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable libtar)
-		$(use_enable libtiger tiger)
-		$(use_enable linsys)
-		$(use_enable lirc)
-		$(use_enable live live555)
-		$(use_enable lua)
-		$(use_enable macosx-notifications osx-notifications)
-		$(use_enable mad)
-		$(use_enable matroska)
-		$(use_enable modplug mod)
-		$(use_enable mp3 mpg123)
-		$(use_enable mpeg libmpeg2)
-		$(use_enable mtp)
-		$(use_enable musepack mpc)
-		$(use_enable ncurses)
-		$(use_enable nfs)
-		$(use_enable ogg)
-		$(use_enable omxil)
-		$(use_enable omxil omxil-vout)
-		$(use_enable optimisememory optimize-memory)
-		$(use_enable opus)
-		$(use_enable png)
-		$(use_enable projectm)
-		$(use_enable pulseaudio pulse)
-		$(use_enable rdp freerdp)
-		$(use_enable run-as-root)
-		$(use_enable samba smbclient)
-		$(use_enable sdl-image)
-		$(use_enable sftp)
-		$(use_enable shout)
-		$(use_enable sid)
-		$(use_enable skins skins2)
-		$(use_enable soxr)
-		$(use_enable speex)
-		$(use_enable srt)
-		$(use_enable ssl gnutls)
-		$(use_enable svg)
-		$(use_enable svg svgdec)
-		$(use_enable taglib)
-		$(use_enable theora)
-		$(use_enable tremor)
-		$(use_enable twolame)
-		$(use_enable udev)
-		$(use_enable upnp)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi libva)
-		$(use_enable vdpau)
-		$(use_enable vnc)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_with X x)
-		$(use_enable X xcb)
-		$(use_enable X xvideo)
-		$(use_enable x264)
-		$(use_enable x264 x26410b)
-		$(use_enable x265)
-		$(use_enable xml libxml2)
-		$(use_enable zeroconf avahi)
-		$(use_enable zvbi)
-		$(use_enable !zvbi telx)
-		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
-		--disable-asdcp
-		--disable-coverage
-		--disable-cprof
-		--disable-crystalhd
-		--disable-decklink
-		--disable-gles2
-		--disable-goom
-		--disable-kai
-		--disable-kva
-		--disable-libplacebo
-		--disable-maintainer-mode
-		--disable-merge-ffmpeg
-		--disable-mfx
-		--disable-mmal
-		--disable-opencv
-		--disable-opensles
-		--disable-oss
-		--disable-rpi-omxil
-		--disable-schroedinger
-		--disable-shine
-		--disable-sndio
-		--disable-spatialaudio
-		--disable-vsxu
-		--disable-wasapi
-		--disable-wma-fixed
-	)
-	# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# https://code.videolan.org/videolan/vlc/-/issues/17626 (bug #861143)
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I${ESYSROOT}/usr/include/samba-4.0"
-
-	if use x86; then
-		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-		append-cflags $(test-flags-CC -fno-stack-check)
-		# Bug 569774
-		replace-flags -Os -O2
-	fi
-
-	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
-	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders/"
-
-	if use riscv; then
-		# bug #803473
-		append-libs -latomic
-	fi
-
-	if use truetype || use bidi; then
-		myeconfargs+=( --enable-freetype )
-	else
-		myeconfargs+=( --disable-freetype )
-	fi
-
-	if use truetype || use projectm; then
-		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
-		myeconfargs+=(
-			--with-default-font=${dejavu}/DejaVuSans.ttf
-			--with-default-font-family=Sans
-			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-			--with-default-monospace-font-family=Monospace
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values may break the build (bug 523144), so definition should not be removed.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
-	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
-}
-
-src_test() {
-	virtx emake check-TESTS
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
-		einfo "Running ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-		"${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
-		ewarn "Please run ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
-		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
-	fi
-
-	xdg_pkg_postrm
-}
diff --git a/media-video/vlc/vlc-3.0.21-r3.ebuild b/media-video/vlc/vlc-3.0.21-r3.ebuild
new file mode 100644
index 000000000000..540d7d7a940b
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.21-r3.ebuild
@@ -0,0 +1,499 @@
+# Copyright 2000-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-taglib2.tar.xz"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86"
+
+IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus
+	dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth
+	fontconfig +gcrypt gme keyring gstreamer +gui ieee1394 jack jpeg kate
+	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua
+	macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg
+	omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image
+	sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame
+	udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi
+	cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse
+"
+REQUIRED_USE="
+	chromecast? ( encode )
+	directx? ( ffmpeg )
+	fontconfig? ( truetype )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	lua? ( ${LUA_REQUIRED_USE} )
+	skins? ( archive gui truetype X xml )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	lua? ( ${LUA_DEPS} )
+	amd64? ( dev-lang/yasm )
+	wayland? ( dev-util/wayland-scanner )
+	x86? ( dev-lang/yasm )
+"
+RDEPEND="
+	media-libs/libvorbis
+	net-dns/libidn:=
+	sys-libs/zlib
+	virtual/libintl
+	virtual/opengl
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
+	aom? ( media-libs/libaom:= )
+	archive? ( app-arch/libarchive:= )
+	aribsub? ( media-libs/aribb24 )
+	bidi? (
+		dev-libs/fribidi
+		media-libs/freetype:2[harfbuzz]
+		media-libs/harfbuzz:=
+		virtual/ttf-fonts
+	)
+	bluray? ( >=media-libs/libbluray-1.3.0:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
+	chromecast? (
+		>=dev-libs/protobuf-2.5.0:=
+		>=net-libs/libmicrodns-0.1.2:=
+	)
+	dav1d? ( media-libs/dav1d:= )
+	dbus? ( sys-apps/dbus )
+	dc1394? (
+		media-libs/libdc1394:2
+		sys-libs/libraw1394
+	)
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
+	dvd? (
+		>=media-libs/libdvdnav-6.1.1:=
+		>=media-libs/libdvdread-6.1.2:=
+	)
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
+	ffmpeg? ( >=media-video/ffmpeg-3.1.3:=[postproc,vaapi?,vdpau?] )
+	flac? (
+		media-libs/flac:=
+		media-libs/libogg
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? (
+		dev-libs/libgcrypt:=
+		dev-libs/libgpg-error
+	)
+	gme? ( media-libs/game-music-emu )
+	keyring? ( app-crypt/libsecret )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
+	ieee1394? (
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+	)
+	jack? ( virtual/jack )
+	jpeg? ( media-libs/libjpeg-turbo:0 )
+	kate? ( media-libs/libkate )
+	libass? (
+		media-libs/fontconfig:1.0
+		media-libs/libass:=
+	)
+	libcaca? ( media-libs/libcaca )
+	libnotify? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libnotify
+	)
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
+	linsys? ( media-libs/zvbi )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live:= )
+	lua? ( ${LUA_DEPS} )
+	mad? ( media-libs/libmad )
+	matroska? (
+		>=dev-libs/libebml-1.4.2:=
+		media-libs/libmatroska:=
+	)
+	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
+	mp3? ( media-sound/mpg123-base )
+	mpeg? ( media-libs/libmpeg2 )
+	mtp? ( media-libs/libmtp:= )
+	musepack? ( media-sound/musepack-tools )
+	ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+	nfs? ( >=net-fs/libnfs-0.10.0:= )
+	ogg? ( media-libs/libogg )
+	opus? ( >=media-libs/opus-1.0.3 )
+	png? ( media-libs/libpng:0= )
+	projectm? (
+		media-fonts/dejavu
+		>=media-libs/libprojectm-3.1.12:0=
+	)
+	pulseaudio? ( media-libs/libpulse )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:2= )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
+	sid? ( media-libs/libsidplay:2 )
+	skins? (
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
+	)
+	soxr? ( >=media-libs/soxr-0.1.2 )
+	speex? (
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
+	)
+	srt? ( >=net-libs/srt-1.4.2:= )
+	ssl? ( net-libs/gnutls:= )
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo
+	)
+	taglib? ( media-libs/taglib:= )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
+	truetype? (
+		media-libs/freetype:2
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
+	)
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/libupnp:=[ipv6(+)] )
+	v4l? ( media-libs/libv4l:= )
+	vaapi? ( media-libs/libva:=[drm(+),wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vnc? ( net-libs/libvncserver )
+	vpx? ( media-libs/libvpx:= )
+	wayland? (
+		>=dev-libs/wayland-1.15
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
+	x264? ( >=media-libs/x264-0.0.20190214:= )
+	x265? ( media-libs/x265:= )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zvbi? ( media-libs/zvbi )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+	"${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch
+	"${FILESDIR}"/${PN}-3.0.21-freerdp-2.patch # bug 919296, 590164
+	"${WORKDIR}"/${P}-taglib2 # bug 938946, in 3.0.x branch
+	"${FILESDIR}"/${PN}-3.0.2.1-vdpau.patch # bug 946178
+	"${FILESDIR}"/${P}-vaapi-w-ffmpeg5.patch # bug 864721, in 3.0.x branch
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	# bug 608256
+	xdg_environment_reset
+
+	has_version 'net-libs/libupnp:1.8' && \
+		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	rm m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+	# Fix gettext version mismatch errors.
+	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+	local -x BUILDCC="$(tc-getBUILD_CC)"
+
+	local myeconfargs=(
+		--disable-aa
+		--disable-optimizations
+		--disable-rpath
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		--enable-vcd
+		--enable-vlc
+		--enable-vorbis
+		$(use_enable a52)
+		$(use_enable alsa)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable aribsub)
+		$(use_enable bidi fribidi)
+		$(use_enable bidi harfbuzz)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_arm_neon neon)
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable dav1d)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable directx)
+		$(use_enable directx d3d11va)
+		$(use_enable directx dxva2)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable encode sout)
+		$(use_enable encode vlm)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg postproc)
+		$(use_enable ffmpeg swscale)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable keyring secret)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable gui qt)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable mad)
+		$(use_enable matroska)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mpg123)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable nfs)
+		$(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable opus)
+		$(use_enable png)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable rdp freerdp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable sdl-image)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable sid)
+		$(use_enable skins skins2)
+		$(use_enable soxr)
+		$(use_enable speex)
+		$(use_enable srt)
+		$(use_enable ssl gnutls)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vdpau)
+		$(use_enable vnc)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
+		$(use_enable x264)
+		$(use_enable x264 x26410b)
+		$(use_enable x265)
+		$(use_enable xml libxml2)
+		$(use_enable zeroconf avahi)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-libplacebo
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opencv
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-schroedinger
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-vsxu
+		--disable-wasapi
+		--disable-wma-fixed
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# https://code.videolan.org/videolan/vlc/-/issues/17626 (bug #861143)
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I${ESYSROOT}/usr/include/samba-4.0"
+
+	if use x86; then
+		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+		append-cflags $(test-flags-CC -fno-stack-check)
+		# Bug 569774
+		replace-flags -Os -O2
+	fi
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders/"
+
+	if use riscv; then
+		# bug #803473
+		append-libs -latomic
+	fi
+
+	if use truetype || use bidi; then
+		myeconfargs+=( --enable-freetype )
+	else
+		myeconfargs+=( --disable-freetype )
+	fi
+
+	if use truetype || use projectm; then
+		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+		"${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
+		ewarn "Please run ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
+	xdg_pkg_postrm
+}
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 73417535b63d..c3e406c30347 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -233,7 +233,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
 	"${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch
 	"${FILESDIR}"/${PN}-3.0.21-freerdp-2.patch # bug 919296, 590164
-	"${FILESDIR}"/${PN}-3.0.21-vaapi-without-ffmpeg4.patch # bug 864721, thx Fedora
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
diff --git a/media-video/webcamoid/Manifest b/media-video/webcamoid/Manifest
index d11a0b3cbcc2..f7422d3101d0 100644
--- a/media-video/webcamoid/Manifest
+++ b/media-video/webcamoid/Manifest
@@ -1,2 +1 @@
-DIST webcamoid-9.0.0.tar.gz 9257331 BLAKE2B df7044650c92fd1e557043e2a721079dcc2531a59fb9859c19e02f95bd091fb33cec5e69bbc323baf8c11faad404824f875afe643e9d21085d3496a78acc04f4 SHA512 0de39dc6a5bc3fb8d6477728d971bca933c57e354a6d041389b33c3e48ec7c7912007f6f87bc9be5db303f58ddc5143bb28dc1b475c9ca361f579e1532b515a4
 DIST webcamoid-9.1.1.tar.gz 9288681 BLAKE2B 2444240c6ed90eac761c26860c2aabf2467578fec7eca1d488dad3adff63b1638525ff677c9f7d8a49971c9158f245b826390c45251697c7310fde32787998b4 SHA512 aebf413a358ee3397712d0a0935da0b4a8ae595019197450e1c2cd4ac33f9afc16e174ab06d0f8ca9c7fba25c6d71de14cbbdf36ad8f7bfb55428a432e06bb90
diff --git a/media-video/webcamoid/webcamoid-9.0.0-r1.ebuild b/media-video/webcamoid/webcamoid-9.0.0-r1.ebuild
deleted file mode 100644
index a836fa4160b7..000000000000
--- a/media-video/webcamoid/webcamoid-9.0.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Full featured webcam capture application"
-HOMEPAGE="https://webcamoid.github.io"
-SRC_URI="https://github.com/webcamoid/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="alsa coreaudio ffmpeg gstreamer jack libuvc oss pulseaudio qtaudio v4lutils videoeffects debug headers v4l"
-
-REQUIRED_USE="v4lutils? ( v4l )"
-
-COMMON_DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	ffmpeg?	( media-video/ffmpeg:= )
-	gstreamer? ( >=media-libs/gstreamer-1.6.0 )
-	jack? ( virtual/jack )
-	libuvc? ( media-libs/libuvc )
-	pulseaudio? ( media-libs/libpulse )
-	qtaudio? ( dev-qt/qtmultimedia:5 )
-	v4l? ( media-libs/libv4l )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.6
-"
-RDEPEND="${COMMON_DEPEND}
-	virtual/opengl
-"
-
-src_configure() {
-	#Disable git in package source. If not disabled the cmake configure process will show a lot of "fatal not a git repository" errors
-	sed -i 's|find_program(GIT_BIN git)|#find_program(GIT_BIN git)|' libAvKys/cmake/ProjectCommons.cmake || die
-
-	local mycmakeargs=(
-		"-DNOMEDIAFOUNDATION=1"
-		"-DNOAVFOUNDATION=1"
-		"-DNODSHOW=1"
-		"-DNOWASAPI=1"
-		"-DNOVLC=1"
-		"-DNOPIPEWIRE=1"
-		"-DNOALSA=$(usex alsa 0 1)"
-		"-DNOCOREAUDIO=$(usex coreaudio 0 1)"
-		"-DNOFFMPEG=$(usex ffmpeg 0 1)"
-		"-DNOGSTREAMER=$(usex gstreamer 0 1)"
-		"-DNOJACK=$(usex jack 0 1)"
-		"-DNOLIBUVC=$(usex libuvc 0 1)"
-		"-DNOPULSEAUDIO=$(usex pulseaudio 0 1)"
-		"-DNOV4L2=$(usex v4l 0 1)"
-		"-DNOV4LUTILS=$(usex v4lutils 0 1)"
-		"-DNOVIDEOEFFECTS=$(usex videoeffects 0 1)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	docompress -x /usr/share/man/${PN}.1.gz
-	cmake_src_install
-}
diff --git a/media-video/wireplumber/files/wireplumber-0.4.81-config-disable-sound-server-parts.patch b/media-video/wireplumber/files/wireplumber-0.4.81-config-disable-sound-server-parts.patch
deleted file mode 100644
index 3a9e828837b5..000000000000
--- a/media-video/wireplumber/files/wireplumber-0.4.81-config-disable-sound-server-parts.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ed5ce9c176db2e26ac9915b4d86c3a076a8093ae Mon Sep 17 00:00:00 2001
-From: "Igor V. Kovalenko" <igor.v.kovalenko@gmail.com>
-Date: Fri, 2 Feb 2024 22:00:03 +0300
-Subject: [PATCH] config: Disable alsa and bluez monitors by default
-
----
- src/config/wireplumber.conf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/config/wireplumber.conf b/src/config/wireplumber.conf
-index 822b7967..ca0faa0a 100644
---- a/src/config/wireplumber.conf
-+++ b/src/config/wireplumber.conf
-@@ -64,8 +64,8 @@ wireplumber.profiles = {
-     support.settings = required
-     support.log-settings = required
-     metadata.sm-objects = required
--    hardware.audio = required
--    hardware.bluetooth = required
-+    #hardware.audio = required
-+    #hardware.bluetooth = required
-     hardware.video-capture = required
-     policy.standard = required
-     #policy.role-priority-system = optional
--- 
-2.43.0
-
diff --git a/media-video/wireplumber/wireplumber-0.5.7.ebuild b/media-video/wireplumber/wireplumber-0.5.7.ebuild
index 05daac42ad03..d1f979b31c3a 100644
--- a/media-video/wireplumber/wireplumber-0.5.7.ebuild
+++ b/media-video/wireplumber/wireplumber-0.5.7.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 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/metadata/license-mapping.conf b/metadata/license-mapping.conf
index 8066827fd3f1..0a67f2dfdffd 100644
--- a/metadata/license-mapping.conf
+++ b/metadata/license-mapping.conf
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Mapping of SPDX-2.0 licenses to Gentoo repository licenses.
@@ -117,6 +117,7 @@ GPL-2.0 = GPL-2
 GPL-2.0+ = GPL-2+
 GPL-2.0-only = GPL-2
 GPL-2.0-or-later = GPL-2+
+GPL-2.0-or-later WITH Bootloader-exception = GPL-2+-with-Pyinstaller-Bootloader-exception
 GPL-2.0-with-classpath-exception = GPL-2-with-classpath-exception
 GPL-2.0 WITH Classpath-exception-2.0 = GPL-2-with-classpath-exception
 GPL-2.0-only WITH Classpath-exception-2.0 = GPL-2-with-classpath-exception
diff --git a/metadata/stabilization-groups/gstreamer.group b/metadata/stabilization-groups/gstreamer.group
new file mode 100644
index 000000000000..b411ab482ddb
--- /dev/null
+++ b/metadata/stabilization-groups/gstreamer.group
@@ -0,0 +1,82 @@
+dev-lang/orc
+dev-python/gst-python
+media-libs/gst-plugins-bad
+media-libs/gst-plugins-base
+media-libs/gst-plugins-good
+media-libs/gst-plugins-ugly
+media-libs/gstreamer
+media-libs/gstreamer-editing-services
+media-libs/gst-rtsp-server
+media-plugins/gst-plugins-a52dec
+media-plugins/gst-plugins-adaptivedemux2
+media-plugins/gst-plugins-amr
+media-plugins/gst-plugins-aom
+media-plugins/gst-plugins-assrender
+media-plugins/gst-plugins-bluez
+media-plugins/gst-plugins-bs2b
+media-plugins/gst-plugins-cairo
+media-plugins/gst-plugins-cdio
+media-plugins/gst-plugins-cdparanoia
+media-plugins/gst-plugins-chromaprint
+media-plugins/gst-plugins-dash
+media-plugins/gst-plugins-dtls
+media-plugins/gst-plugins-dts
+media-plugins/gst-plugins-dv
+media-plugins/gst-plugins-dvb
+media-plugins/gst-plugins-dvdread
+media-plugins/gst-plugins-faac
+media-plugins/gst-plugins-faad
+media-plugins/gst-plugins-flac
+media-plugins/gst-plugins-gdkpixbuf
+media-plugins/gst-plugins-gtk
+media-plugins/gst-plugins-hls
+media-plugins/gst-plugins-jack
+media-plugins/gst-plugins-jpeg
+media-plugins/gst-plugins-ladspa
+media-plugins/gst-plugins-lame
+media-plugins/gst-plugins-ldac
+media-plugins/gst-plugins-libav
+media-plugins/gst-plugins-libde265
+media-plugins/gst-plugins-libnice
+media-plugins/gst-plugins-libpng
+media-plugins/gst-plugins-libvisual
+media-plugins/gst-plugins-lv2
+media-plugins/gst-plugins-meta
+media-plugins/gst-plugins-modplug
+media-plugins/gst-plugins-mpeg2dec
+media-plugins/gst-plugins-mpeg2enc
+media-plugins/gst-plugins-mpg123
+media-plugins/gst-plugins-mplex
+media-plugins/gst-plugins-neon
+media-plugins/gst-plugins-openaptx
+media-plugins/gst-plugins-openh264
+media-plugins/gst-plugins-opus
+media-plugins/gst-plugins-oss
+media-plugins/gst-plugins-pulse
+media-plugins/gst-plugins-raw1394
+media-plugins/gst-plugins-resindvd
+media-plugins/gst-plugins-rtmp
+media-plugins/gst-plugins-sctp
+media-plugins/gst-plugins-shout2
+media-plugins/gst-plugins-sidplay
+media-plugins/gst-plugins-smoothstreaming
+media-plugins/gst-plugins-soundtouch
+media-plugins/gst-plugins-soup
+media-plugins/gst-plugins-speex
+media-plugins/gst-plugins-srtp
+media-plugins/gst-plugins-taglib
+media-plugins/gst-plugins-twolame
+media-plugins/gst-plugins-uvch264
+media-plugins/gst-plugins-v4l2
+media-plugins/gst-plugins-vaapi
+media-plugins/gst-plugins-voaacenc
+media-plugins/gst-plugins-voamrwbenc
+media-plugins/gst-plugins-vpx
+media-plugins/gst-plugins-wavpack
+media-plugins/gst-plugins-webp
+media-plugins/gst-plugins-webrtc
+media-plugins/gst-plugins-x264
+media-plugins/gst-plugins-x265
+media-plugins/gst-plugins-ximagesrc
+media-sound/soundconverter
+media-video/pitivi
diff --git a/metadata/stabilization-groups/libvirt.group b/metadata/stabilization-groups/libvirt.group
new file mode 100644
index 000000000000..dcec93c67e74
--- /dev/null
+++ b/metadata/stabilization-groups/libvirt.group
@@ -0,0 +1,4 @@
+app-emulation/libvirt
+app-emulation/libvirt-glib
+dev-perl/Sys-Virt
+dev-python/libvirt-python
diff --git a/metadata/stabilization-groups/qemu.group b/metadata/stabilization-groups/qemu.group
new file mode 100644
index 000000000000..589cc458074e
--- /dev/null
+++ b/metadata/stabilization-groups/qemu.group
@@ -0,0 +1,2 @@
+app-emulation/qemu
+app-emulation/qemu-guest-agent
diff --git a/metadata/stabilization-groups/rust.group b/metadata/stabilization-groups/rust.group
index 93ce53ffc2cf..25b10aa618a5 100644
--- a/metadata/stabilization-groups/rust.group
+++ b/metadata/stabilization-groups/rust.group
@@ -1,3 +1,3 @@
 dev-lang/rust
 dev-lang/rust-bin
-virtual/rust
+dev-lang/rust-common
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild
index 7166713208bb..adb45f6903fd 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.20.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 @@ SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ~ppc64 sparc x86"
 
 DEPEND="dev-db/mysql-connector-c:=
 	dev-libs/openssl:=
diff --git a/net-analyzer/cacti/cacti-1.2.21.ebuild b/net-analyzer/cacti/cacti-1.2.21.ebuild
index 1bbc77868e48..8ecd1781018b 100644
--- a/net-analyzer/cacti/cacti-1.2.21.ebuild
+++ b/net-analyzer/cacti/cacti-1.2.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
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.cacti.net/"
 SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc64 sparc x86"
 IUSE="snmp doc"
 
 need_httpd
diff --git a/net-analyzer/cacti/cacti-1.2.26.ebuild b/net-analyzer/cacti/cacti-1.2.26.ebuild
index 1bbc77868e48..8ecd1781018b 100644
--- a/net-analyzer/cacti/cacti-1.2.26.ebuild
+++ b/net-analyzer/cacti/cacti-1.2.26.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 @@ HOMEPAGE="https://www.cacti.net/"
 SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc64 sparc x86"
 IUSE="snmp doc"
 
 need_httpd
diff --git a/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild b/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild
index 8f20f2c81674..0b57ddc83426 100644
--- a/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild
+++ b/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://www.nagiosforge.org/gf/download/frsrelease/126/252/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/httpd-php"
diff --git a/net-analyzer/raddump/files/raddump-0.3.1-gcc14.patch b/net-analyzer/raddump/files/raddump-0.3.1-gcc14.patch
new file mode 100644
index 000000000000..82fecf6cb1da
--- /dev/null
+++ b/net-analyzer/raddump/files/raddump-0.3.1-gcc14.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/919358
+diff -ru a/pktrecord.h b/pktrecord.h
+--- a/pktrecord.h	2025-01-05 15:55:08.349684611 +0400
++++ b/pktrecord.h	2025-01-05 15:57:49.645807285 +0400
+@@ -25,7 +25,7 @@
+   unsigned int included_len;   /* how much of it we actually have here */
+   unsigned int ts_secs;	       /* timestamp, seconds component */
+   unsigned int ts_usecs;       /* timestamp, microseconds component */
+-  unsigned char *pkt_data;     /* pointer to the actual packet data */
++  const unsigned char *pkt_data;     /* pointer to the actual packet data */
+ };
+ 
+ struct prec_handle;
diff --git a/net-analyzer/raddump/raddump-0.3.1-r1.ebuild b/net-analyzer/raddump/raddump-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..85f7315b3a27
--- /dev/null
+++ b/net-analyzer/raddump/raddump-0.3.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="RADIUS packet interpreter"
+HOMEPAGE="https://sourceforge.net/projects/raddump/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=net-analyzer/tcpdump-3.8.3-r1"
+DEPEND=${RDEPEND}
+
+PATCHES=( "${FILESDIR}/${P}-gcc14.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch b/net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch
deleted file mode 100644
index 852ea6b6c132..000000000000
--- a/net-analyzer/tcpdump/files/tcpdump-9999-libdir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -371,7 +371,7 @@
- 
- if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
- 	if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
--		LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
-+		LIBS="-l$ipv6lib $LIBS"
- 		echo "You have $ipv6lib library, using it"
- 	else
- 		if test "$ipv6trylibc" = "yes"; then
-@@ -891,7 +891,6 @@
- 		# at the front of the header and library search path.
- 		#
- 		CFLAGS="-I$withval/include $CFLAGS"
--		LIBS="-L$withval/lib $LIBS"
- 	fi
- ],[
- 	#
diff --git a/net-analyzer/trippy/Manifest b/net-analyzer/trippy/Manifest
index 8aaf5c8e8ad3..1d4fa042519f 100644
--- a/net-analyzer/trippy/Manifest
+++ b/net-analyzer/trippy/Manifest
@@ -364,9 +364,11 @@ DIST serde_spanned-0.6.5.crate 8349 BLAKE2B f4f8f798ae3a02c0d5178aa12a94bd1bc08f
 DIST serde_spanned-0.6.7.crate 9164 BLAKE2B 559a62c0ac00a1559947224bd268842f35c52f65d0d52102c98b5e683dfe4c36acb015edf97c5f79ff818dc575b3ae43c3f100d18eb7afc3ab9c96e348ba6794 SHA512 d0ef413867a705080fa68f84a059b4d04b604bec59323329ded7ae03e0caec49c89fc53640c1e58c27bb23b5c9f260ed176ac52f3a93d25d8d7643252dba037f
 DIST serde_spanned-0.6.8.crate 9330 BLAKE2B 630bb2cabd74e8d9736e315ac57c4d2c5c4f72264aab35ecc8e0040cb4186885722051a9f7b8a9006fd121fe58428cbb151e5cf541e7de30b6528c84e968f7ac SHA512 2343a2fda35ff57ed8ff7d8eeadd651821fce7e22f91c2d5797c6af7db9e009b7d637382f6f390c17911912865a5aea1ce87a86fbe36f4b6aeccb065a4c8942d
 DIST serde_with-3.11.0.crate 145979 BLAKE2B 83c6cbbe14d44179321ef51a3b53e6c9044c81c24512c67b1bb0c95d51f364da71ff919d4bf517c7372998e2c8a7c373688c9c8ca0973e380df4ff69428d6df2 SHA512 d2a6d5e8075194f82e42ca676307b1456dbf75cf59172a7abe84f5398ba37f7217c86c8f71b954161a5f7c7f5163ab10ac322eef4b5fe6fbbf86550f3f37ea0b
+DIST serde_with-3.12.0.crate 148666 BLAKE2B 244377aa9de46c77d12f0348a2656848ab44bda4bbac2f14a607ccfb532cbc33597e0b3336b9fff5242e8b907f59cbe093eac7e1aa9cc82e320bce011f5d177a SHA512 243b4aacf9f0aa9c3915274650c2b70ebb389ef0b1e607afba35f0144199073b573703f8b66bcaa875aeb434301ec2ad209c3d54160f6fe25dc2e4a9fe48a53d
 DIST serde_with-3.7.0.crate 140905 BLAKE2B fa749055ab1b1f271d46f68a169b18c7e670640e937002ee6f59814c4ed7a7dcee13340ec4a4bc116c57224472f919dad85ac64270441987d3cb0110162d6b05 SHA512 a923993d3ebf1543de6f73e264f436849de6d9a292668ca5508e20c1231b78105307f62140d06bd401fa7001d83a46b56a14f3ad95a2360a55e276ec7b94e142
 DIST serde_with-3.9.0.crate 145089 BLAKE2B a4d5032d864a996c2d6edf0b1ef4657784ab76b9cc437d86214024f6bd77dd59908efa594f24db4d2dca490f4e072d688681eee9d24f92c8a528d8940e991fc4 SHA512 90ae5faa9bdcc2ce2198599c546a0ee9593fffb3271c3fcc07bef5eb39fe7b44697dabdd6eaf059a166a67dc5694c70ae2908ca3f6fc65e25747cd391e3121b1
 DIST serde_with_macros-3.11.0.crate 32054 BLAKE2B 4d4710b41c2b441d28f8ae95d95c74f3bdbb2306873dc66b1cd7de17daac257b19ca80c5d240b521353f3b67ca8c746ec709b6db65942b6289560367897e1c08 SHA512 222aec6c50a7b758ea15e1192c71dc19fbde3a99062beee12e24ff7691e0858fb84a0245ac86d96d818a877a89834c188f864dab1aaaeab22ae6cdd7bb416036
+DIST serde_with_macros-3.12.0.crate 32089 BLAKE2B 667db574c1a7850917a6738ba55447285085e87826b04da22b6be92ecf32ade3f0e99f63c738262f822820674b09be742778223f28507daf75324f4c62195e98 SHA512 feb186b9c51325a19643217ca2bfafc6f7e5433e2e059683ac2f271d11641a7feab728c5e7e37a99310ef259faf862b6a42ec41e77ff9b3349cb04333e008907
 DIST serde_with_macros-3.7.0.crate 30834 BLAKE2B 2da5db01fbbbc9e3ad94531c4947bab966e7284c3867f1bb2520cfad23f5a7f5dabe58b821ecfd8bd1f89041e57ee388910636479faea2506fad232c5c7aeafe SHA512 43d666624e6216de285aa3ff8435bc01bfacb675544f63922d1113c4d1a37e8556c61d19807558e002aa05888f8a5d19e7ff8b339b50c4b9c54f0a2cdfc4e9b0
 DIST serde_with_macros-3.9.0.crate 30865 BLAKE2B 69c764f45180463047045f81106961f274411200ecec6997baad0c8ed0cc25f7550ceccba122fe3fd8d248e3a3a6bc3326f7f9ea0bd3c08e81b93589b75de537 SHA512 451af6f14cac8ead53b9705c530cb6494063ea8f20d1a7ca80561d16334985b98541bd9c3a50857a4cf377ab5d84593baadd5503676540da8212f9c5fea89e90
 DIST serde_yaml-0.9.33.crate 65165 BLAKE2B d72edc6e5fe569d20bd909d079d3f8a3db0aa85bf016eeee755923c5f4dcb4dbf896cc6c15920d9b2c1ccde909a6d8733b63843dd2f8149ce34ef4a09889dee1 SHA512 cd41feeabc886b1f02a240d1234f31ea0a67b787e9888e5d8d4397dd5bd389cb5c920bc6dc72f44c5b25e1cb4434e410d8c0b01559f1338e8b1a3f90505f6e02
@@ -456,6 +458,7 @@ DIST tracing-subscriber-0.3.19.crate 198345 BLAKE2B c7083168e62619c856b872570b85
 DIST trippy-0.10.0.tar.gz 15288046 BLAKE2B 08cc2bc288b78fa205954db245c89fd5ce1966ac497dd8108feb816b737035f010ab5b92dda733962408ec039f4afff2d2c07505ed7f9ffe2577c545c5f0d161 SHA512 888812ba578c53403769df7c1192577e8e7e23fbcd529a21edba7fa2e0ac7f9463ca40e5f4137aa732bec8407d7b5252d485e4a5b2d29ef4a9da41e20eaa5bee
 DIST trippy-0.11.0.tar.gz 15955237 BLAKE2B a69c4945ecfa98710168154182668653ed910634447b2b0b22fa5ae161b24f73ef171fded11a2eac0a0e3d9fbf9333c136b4901bfe64e153d349f23df1f46d77 SHA512 5beaaa65bd7c76a4b37abca616a3db472dcced01ae4da6e2ec834c513a4c13c32096a97960964aedb71ae4c0c23c17e04ebbce25409af281dd4406160b01575c
 DIST trippy-0.12.1.tar.gz 18961273 BLAKE2B 068368d5e10df78c471b52f2dc3b2eb16fb16caa2883d6bbe98d6b4135bf6daa09d4f5dfb6db7ccd07173e1182de2fb82c1a6d1bb0dc45b53d6bfe2b11f5cf60 SHA512 e1f3178fafb7f2af726ce776f87f13edb5300f40061ee3df9ee9d8a2f876d11e020c7c1b2e5b3b22a772e498e0e85b5ef9147ec899f5f51e9f4a45510b084346
+DIST trippy-0.12.2.tar.gz 20922811 BLAKE2B e78ebdceabf4cbeab886742fa2085e05a01744cb46cc236eca81fd105dd74288a12ddf34b2231fdc238efffe1ac23a442b0ed90f1b6e6b5eebfc2e570574d0ca SHA512 703db726d28f555061dae415ca684e15ea342a733ca3318410b424ab4e45e9b411ca0956449050e8026b0db3ffa09d5ae9a7e724db7ccfeff054511ee4705586
 DIST tun2-1.2.7.crate 30692 BLAKE2B 4200932f2fafbcb79dcd54ac177566c156d8bf9cfcdbaa9ed74010a0655fa48cf477b3b918e1a0c4e5fd00bfba8874a78bbfc0110f9fac6a070c5c7aa363423c SHA512 5156970a5779b13446aeec9da884ea74c48bced3a277cb84ccd80cf0b3b22f73e45f76f48e7d5ff94e772fa255a5dec30c729fcda95d4b169550954d3ee71eb4
 DIST tun2-2.0.5.crate 36144 BLAKE2B 5dedf4c7e8b26e9fe01bf8f0528c49b7a2333abdf7d74f21e0312f36a43dd77c4edbf8bd30a24908dc72ee99d9ada88e280920b1ee14e9801c1edd874ce8d0d2 SHA512 823d25790577e1147b44d1a9b76097f5836d962250a4187fd49e8dc71b859099b89e3f98296b69731649b22d6e9521610d9a1b207e235b554875996170ec2f16
 DIST tun2-4.0.0.crate 34496 BLAKE2B f87c9bace127f7bd616d3af68075d800c853e0140c2578d9b11134f1e79371c6cb75c5db6570c1394b8fffd365c446ca672d33dec8b12a14ee220bd0fc2216a8 SHA512 77fd0e9ddaec79c71a9081f223d3e03a20dd669329a190a22fe1df2c96e691e1455cb96fb25650276896bef5116926df43b6c359f6f76c68698242e1db98f0bc
diff --git a/net-analyzer/trippy/trippy-0.12.2.ebuild b/net-analyzer/trippy/trippy-0.12.2.ebuild
new file mode 100644
index 000000000000..312e292154b3
--- /dev/null
+++ b/net-analyzer/trippy/trippy-0.12.2.ebuild
@@ -0,0 +1,330 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	addr2line@0.24.2
+	adler2@2.0.0
+	aho-corasick@1.1.3
+	allocator-api2@0.2.21
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anstream@0.6.18
+	anstyle-parse@0.2.6
+	anstyle-query@1.1.2
+	anstyle-wincon@3.0.6
+	anstyle@1.0.10
+	anyhow@1.0.94
+	arrayvec@0.7.6
+	async-channel@2.3.1
+	async-task@4.7.1
+	async-trait@0.1.83
+	atomic-waker@1.1.2
+	autocfg@1.4.0
+	backtrace@0.3.74
+	bitflags@2.6.0
+	blocking@1.6.1
+	bumpalo@3.16.0
+	byteorder@1.5.0
+	bytes@1.9.0
+	c2rust-bitfields-derive@0.19.0
+	c2rust-bitfields@0.19.0
+	caps@0.5.5
+	cassowary@0.3.0
+	castaway@0.2.3
+	cc@1.2.3
+	cfg-if@1.0.0
+	cfg_aliases@0.2.1
+	chrono@0.4.39
+	clap@4.5.23
+	clap_builder@4.5.23
+	clap_complete@4.5.38
+	clap_derive@4.5.18
+	clap_lex@0.7.4
+	clap_mangen@0.2.24
+	colorchoice@1.0.3
+	comfy-table@7.1.3
+	compact_str@0.8.0
+	concurrent-queue@2.5.0
+	console@0.15.8
+	core-foundation-sys@0.8.7
+	crossbeam-channel@0.5.13
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-queue@0.3.11
+	crossbeam-utils@0.8.20
+	crossbeam@0.8.4
+	crossterm@0.28.1
+	crossterm_winapi@0.9.1
+	csv-core@0.1.11
+	csv@1.3.1
+	darling@0.20.10
+	darling_core@0.20.10
+	darling_macro@0.20.10
+	data-encoding@2.6.0
+	derive_more-impl@1.0.0
+	derive_more@1.0.0
+	diff@0.1.13
+	displaydoc@0.2.5
+	dns-lookup@2.0.4
+	downcast@0.11.0
+	either@1.13.0
+	encode_unicode@0.3.6
+	encoding_rs@0.8.35
+	encoding_rs_io@0.1.7
+	enum-as-inner@0.6.1
+	equivalent@1.0.1
+	errno@0.3.10
+	etcetera@0.8.0
+	event-listener-strategy@0.5.3
+	event-listener@5.3.1
+	fastrand@2.3.0
+	fixedbitset@0.4.2
+	fnv@1.0.7
+	foldhash@0.1.3
+	form_urlencoded@1.2.1
+	fragile@2.0.0
+	futures-channel@0.3.31
+	futures-core@0.3.31
+	futures-executor@0.3.31
+	futures-io@0.3.31
+	futures-lite@2.5.0
+	futures-macro@0.3.31
+	futures-sink@0.3.31
+	futures-task@0.3.31
+	futures-util@0.3.31
+	futures@0.3.31
+	getrandom@0.2.15
+	gimli@0.31.1
+	hashbrown@0.15.2
+	heck@0.5.0
+	hex-literal@0.4.1
+	hickory-proto@0.24.2
+	hickory-resolver@0.24.2
+	home@0.5.9
+	hostname@0.3.1
+	humantime@2.1.0
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.61
+	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
+	ident_case@1.0.1
+	idna@1.0.3
+	idna_adapter@1.2.0
+	indexmap@2.7.0
+	indoc@2.0.5
+	insta@1.41.1
+	instability@0.3.3
+	ipconfig@0.3.2
+	ipnet@2.10.1
+	ipnetwork@0.20.0
+	is_terminal_polyfill@1.70.1
+	itertools@0.13.0
+	itoa@1.0.14
+	js-sys@0.3.76
+	lazy_static@1.5.0
+	libc@0.2.168
+	libloading@0.8.6
+	linked-hash-map@0.5.6
+	linux-raw-sys@0.4.14
+	litemap@0.7.4
+	lock_api@0.4.12
+	log@0.4.22
+	lru-cache@0.1.2
+	lru@0.12.5
+	match_cfg@0.1.0
+	matchers@0.1.0
+	maxminddb@0.24.0
+	memchr@2.7.4
+	memoffset@0.9.1
+	miniz_oxide@0.8.0
+	mio@1.0.3
+	mockall@0.13.1
+	mockall_derive@0.13.1
+	nix@0.29.0
+	nu-ansi-term@0.46.0
+	num-traits@0.2.19
+	object@0.36.5
+	once_cell@1.20.2
+	overload@0.1.1
+	parking@2.2.1
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	paste@1.0.15
+	percent-encoding@2.3.1
+	petgraph@0.6.5
+	pin-project-lite@0.2.15
+	pin-utils@0.1.0
+	piper@0.2.4
+	ppv-lite86@0.2.20
+	predicates-core@1.0.8
+	predicates-tree@1.0.11
+	predicates@3.1.2
+	pretty_assertions@1.4.1
+	proc-macro2@1.0.92
+	quick-error@1.2.3
+	quote@1.0.37
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	ratatui@0.29.0
+	redox_syscall@0.5.7
+	regex-automata@0.1.10
+	regex-automata@0.4.9
+	regex-syntax@0.6.29
+	regex-syntax@0.8.5
+	regex@1.11.1
+	resolv-conf@0.7.0
+	roff@0.2.2
+	rustc-demangle@0.1.24
+	rustix@0.38.42
+	rustversion@1.0.18
+	ryu@1.0.18
+	scopeguard@1.2.0
+	serde@1.0.216
+	serde_derive@1.0.216
+	serde_json@1.0.133
+	serde_spanned@0.6.8
+	serde_with@3.12.0
+	serde_with_macros@3.12.0
+	sharded-slab@0.1.7
+	shlex@1.3.0
+	signal-hook-mio@0.2.4
+	signal-hook-registry@1.4.2
+	signal-hook@0.3.17
+	similar@2.6.0
+	slab@0.4.9
+	smallvec@1.13.2
+	socket2@0.5.8
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	strsim@0.11.1
+	strum@0.26.3
+	strum_macros@0.26.4
+	syn@1.0.109
+	syn@2.0.90
+	synstructure@0.13.1
+	sys-locale@0.3.2
+	terminal_size@0.4.1
+	termtree@0.4.1
+	test-case-core@3.3.1
+	test-case-macros@3.3.1
+	test-case@3.3.1
+	thiserror-impl@1.0.69
+	thiserror-impl@2.0.6
+	thiserror@1.0.69
+	thiserror@2.0.6
+	thread_local@1.1.8
+	tinystr@0.7.6
+	tinyvec@1.8.0
+	tinyvec_macros@0.1.1
+	tokio-macros@2.4.0
+	tokio-util@0.7.13
+	tokio@1.42.0
+	toml@0.8.19
+	toml_datetime@0.6.8
+	toml_edit@0.22.22
+	tracing-attributes@0.1.28
+	tracing-chrome@0.7.2
+	tracing-core@0.1.33
+	tracing-log@0.2.0
+	tracing-serde@0.2.0
+	tracing-subscriber@0.3.19
+	tracing@0.1.41
+	tun2@4.0.0
+	unicode-ident@1.0.14
+	unicode-segmentation@1.12.0
+	unicode-truncate@1.1.0
+	unicode-width@0.1.14
+	unicode-width@0.2.0
+	url@2.5.4
+	utf16_iter@1.0.5
+	utf8_iter@1.0.4
+	utf8parse@0.2.2
+	valuable@0.1.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.99
+	wasm-bindgen-macro-support@0.2.99
+	wasm-bindgen-macro@0.2.99
+	wasm-bindgen-shared@0.2.99
+	wasm-bindgen@0.2.99
+	widestring@1.1.0
+	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-sys@0.59.0
+	windows-targets@0.48.5
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.6
+	winnow@0.6.20
+	winreg@0.50.0
+	winreg@0.52.0
+	wintun-bindings@0.7.20
+	write16@1.0.0
+	writeable@0.5.5
+	yansi@1.0.1
+	yoke-derive@0.7.5
+	yoke@0.7.5
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+	zerofrom-derive@0.1.5
+	zerofrom@0.1.5
+	zerovec-derive@0.10.3
+	zerovec@0.10.4
+"
+
+inherit cargo fcaps
+
+DESCRIPTION="A network diagnostic tool"
+HOMEPAGE="https://trippy.cli.rs/ https://github.com/fujiapple852/trippy"
+SRC_URI="
+	https://github.com/fujiapple852/trippy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD ISC MIT Unicode-3.0 WTFPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="suid"
+
+FILECAPS=( cap_net_raw+p usr/bin/trip )
+
+QA_FLAGS_IGNORED="usr/bin/trip"
+
+src_install() {
+	cargo_src_install --path crates/trippy
+
+	dodoc README.md CHANGELOG.md
+
+	if use suid; then
+		fperms u+s usr/bin/trip
+	fi
+}
diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest
index 4ca8b3c31830..bdfbcf26edfe 100644
--- a/net-analyzer/wapiti/Manifest
+++ b/net-analyzer/wapiti/Manifest
@@ -1,2 +1 @@
-DIST wapiti3-3.1.6.tar.gz 538064 BLAKE2B fca98e05af7e4979ce5cc1360c565748b720f84e640accc9abd6d60017696827fb119228fec37bcf905e6e9f29c07ad5b9041a16fb49a6204777df07dd642bbd SHA512 8017d88c35a232f20f97297f5955154bead777a1b3d3937d29e6a39d2eeb5167764aa81286bfca5b9d200a29c25a6173052ddd8cbfebc1cb18aa84c0e2bb0e22
 DIST wapiti3-3.1.7.tar.gz 537866 BLAKE2B 2c58e20b5f754d5c461103a457aa18cfeb93b4ee7ca4c7525e29642f9cd027ece6f64a547b43b4c257c9cf27ae562ef9cb130e5635f1c13c9fdcda6b3f0a4ebf SHA512 d5a49a0f4c361f699f792b2b0c19a3ca65131534e5b244a8692137d1c63f120d33c47de41a6e4639316b63dd301396ae4f0b26f41259077ca34fba5065a36857
diff --git a/net-analyzer/wapiti/wapiti-3.1.6.ebuild b/net-analyzer/wapiti/wapiti-3.1.6.ebuild
deleted file mode 100644
index cf4e1d331985..000000000000
--- a/net-analyzer/wapiti/wapiti-3.1.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-# No 3.11 in loguru
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE='xml(+)'
-
-inherit distutils-r1
-
-MY_P=${PN}3-${PV}
-DESCRIPTION="Web-application vulnerability scanner"
-HOMEPAGE="https://wapiti.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-# Requires httpx-ntlm (to package)
-#IUSE="ntlm"
-IUSE="test"
-
-# httpx requires brotli and socks, so depending on
-# dev-python/socksio and dev-python/brotlicffi
-RDEPEND="
-	>=dev-python/aiocache-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3.8.1[${PYTHON_USEDEP}]
-	>=dev-python/aiosqlite-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/arsenic-21.8[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup4-4.10.0[${PYTHON_USEDEP}]
-	dev-python/brotlicffi[${PYTHON_USEDEP}]
-	>=dev-python/browser-cookie3-0.16.2[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.14[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.23.3[${PYTHON_USEDEP}]
-	>=dev-python/loguru-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.1.4[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.4.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
-	dev-python/socksio[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.4.26[${PYTHON_USEDEP}]
-	>=dev-python/tld-0.12.5[${PYTHON_USEDEP}]
-	>=dev-python/yaswfp-0.9.3[${PYTHON_USEDEP}]
-	>=net-proxy/mitmproxy-9.0.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-# Tests also require unpackaged respx
-BDEPEND+=" test? (
-				dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-				dev-python/pytest-cov[${PYTHON_USEDEP}]
-				dev-python/responses[${PYTHON_USEDEP}]
-				)"
-# Many tests require execution of local test php server
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.1.6-setup_scripts.patch )
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	sed -e 's/"pytest-runner"//' \
-		-e "/DOC_DIR =/s/wapiti/${PF}/" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index da3f3bb1724f..ac4e2422906e 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,4 @@
-DIST wireshark-4.4.1-signatures.txt 2706 BLAKE2B 04458da4aedbefa57f03711781215b999bbf1e8d5f34aefa7d853b18991cb08da29ec9b922fd1b9d8f1092cd9b1a080df8aa41bf0e5981639cc9820c39302b12 SHA512 145c6739d092f0068666c4317b58efdfd34690511ff30797c0fa153abc847f96fb84ea8bde4e09c681ca28b32ddb7dc25683c8e40ccb55b83c23328f2e732f62
-DIST wireshark-4.4.1.tar.xz 46748700 BLAKE2B 747ffe14a7b30c4d7bb435bff1fded11efcf03a8bfcacd48d36141fae7a9cfb7965076b1a807d7f095f66bb99148732c090493d2c3654b4a20355f8dbeac3972 SHA512 66c5e035a5a0d2bbb82fba67b652e0e37c296ab470da59b8ed71ef4e6d6d061d6a2649b5af544b737cdf31d808a7f8f07a64a9e4d805674ce8965eff23081de4
 DIST wireshark-4.4.2-signatures.txt 2706 BLAKE2B 3349a3e88782e1326b6c2e1b56d5eefbaeb2dbd6cf33b055e3a49692023b02e77a7e6d26ade7a9018cda783aa29edade997aaa03222fadb06c5bfa106a492459 SHA512 c809085b69c909702b3390b93891a19b8a8c0812d448ac9399eb59991618737b3bfeb737bd569267dcffc46290d59b34664f967e88c1a38b1678faaecd76d445
 DIST wireshark-4.4.2.tar.xz 46763620 BLAKE2B ea5c48f06c2aeb5b51f6ba62fd57214e9dd79917f978867d3ae31ffec74eb82ba7c8a2e2dcba415e53d051e531f9f9907aac88c6f29b6746222cf812bb43c85b SHA512 df80c98a2d00ba46a853acfe3aec9dfc0d4484f490a276b8b8390b6d108634b7e0fa38e8f02f8d93afe5c2394c463a0d89611027032898d7d0390d2111b70ca6
+DIST wireshark-4.4.3-signatures.txt 2706 BLAKE2B 175e3f54e8e88426554ccdf0cf9b09c51a3d6f6cb128d1b1172e2478f1255f35773575d15c65f7c7aa835086e11c32c7bc0802374b44eebd14ac7f7f25f12c24 SHA512 5dfbc85bb41b009022cd67148c44051971e2c3f0bf865c4755a41596b25f9018bae125cda3477c5e7d19f9a0c1c60de424ddbad60abd4b19da697349849c8b9b
+DIST wireshark-4.4.3.tar.xz 46769200 BLAKE2B b6a7348a4da0f6160e325e3345b508ae9e0ca900a2c0d308cb70d3da216ff90818e0439be3ef5f89dc87166e566d8b7d77f6fff114b5b303a5ad9b72e5665be4 SHA512 d100b562fbd452f52945502ecd918b26a15084b9c942754af43ffb221d49229f5a93eafd18b9bacc0cfcd60a38935d51a6ac809a2060d65faf1157ec9dae16e7
diff --git a/net-analyzer/wireshark/files/wireshark-4.4.1-cares.patch b/net-analyzer/wireshark/files/wireshark-4.4.1-cares.patch
deleted file mode 100644
index ffb388fa6453..000000000000
--- a/net-analyzer/wireshark/files/wireshark-4.4.1-cares.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://gitlab.com/wireshark/wireshark/-/commit/0e120834b0883c9940d31f210a51613f723ad422
-
-From 0e120834b0883c9940d31f210a51613f723ad422 Mon Sep 17 00:00:00 2001
-From: John Thacker <johnthacker@gmail.com>
-Date: Thu, 10 Oct 2024 23:15:18 +0000
-Subject: [PATCH] CMake: Fix our c-ares version discovery
-
-c-ares 1.34.0 and later generate ARES_VERSION_STR using a macro, so
-fetch the version from ARES_VERSION_MAJOR, ARES_VERSION_MINOR, and
-ARES_VERSION_PATCH.
-
-Fixes #20125
-
-
-(cherry picked from commit 7c1418625d2ba5095ef5393abdb2141c990a662c)
-
-Co-authored-by: Gerald Combs <gerald@wireshark.org>
---- a/cmake/modules/FindCARES.cmake
-+++ b/cmake/modules/FindCARES.cmake
-@@ -36,11 +36,22 @@ find_library( CARES_LIBRARY
- )
- 
- # Try to retrieve version from header if found
-+# Adapted from https://stackoverflow.com/a/47084079/82195
- if(CARES_INCLUDE_DIR)
--  set(_version_regex "^#define[ \t]+ARES_VERSION_STR[ \t]+\"([^\"]+)\".*")
--  file(STRINGS "${CARES_INCLUDE_DIR}/ares_version.h" CARES_VERSION REGEX "${_version_regex}")
--  string(REGEX REPLACE "${_version_regex}" "\\1" CARES_VERSION "${CARES_VERSION}")
--  unset(_version_regex)
-+  file(READ "${CARES_INCLUDE_DIR}/ares_version.h" _ares_version_h)
-+
-+  string(REGEX MATCH "#[\t ]*define[ \t]+ARES_VERSION_MAJOR[ \t]+([0-9]+)" _ ${_ares_version_h})
-+  set(_ares_version_major ${CMAKE_MATCH_1})
-+  string(REGEX MATCH "#[\t ]*define[ \t]+ARES_VERSION_MINOR[ \t]+([0-9]+)" _ ${_ares_version_h})
-+  set(_ares_version_minor ${CMAKE_MATCH_1})
-+  string(REGEX MATCH "#[\t ]*define[ \t]+ARES_VERSION_PATCH[ \t]+([0-9]+)" _ ${_ares_version_h})
-+  set(_ares_version_patch ${CMAKE_MATCH_1})
-+  set(CARES_VERSION ${_ares_version_major}.${_ares_version_minor}.${_ares_version_patch})
-+
-+  unset(_ares_version_h)
-+  unset(_ares_version_major)
-+  unset(_ares_version_minor)
-+  unset(_ares_version_patch)
- endif()
- 
- # handle the QUIETLY and REQUIRED arguments and set CARES_FOUND to TRUE if
--- 
-GitLab
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index cbc3c515856e..5148243df1c5 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>holger@applied-asynchrony.com</email>
+		<name>Holger Hoffstätte</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
diff --git a/net-analyzer/wireshark/wireshark-4.4.1.ebuild b/net-analyzer/wireshark/wireshark-4.4.1.ebuild
deleted file mode 100644
index 9b0ab0f0cacf..000000000000
--- a/net-analyzer/wireshark/wireshark-4.4.1.ebuild
+++ /dev/null
@@ -1,347 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{3..4} )
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-HOMEPAGE="https://www.wireshark.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
-	inherit verify-sig
-
-	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )"
-	S="${WORKDIR}/${P/_/}"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc64 ~riscv x86"
-	fi
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-"
-
-RESTRICT="!test? ( test )"
-
-# bug #753062 for speexdsp
-RDEPEND="
-	acct-group/pcap
-	>=dev-libs/glib-2.50.0:2
-	dev-libs/libpcre2
-	>=net-dns/c-ares-1.13.0:=
-	>=dev-libs/libgcrypt-1.8.0:=
-	media-libs/speexdsp
-	bcg729? ( media-libs/bcg729 )
-	brotli? ( app-arch/brotli:= )
-	ciscodump? ( >=net-libs/libssh-0.6:= )
-	filecaps? ( sys-libs/libcap )
-	http2? ( >=net-libs/nghttp2-1.11.0:= )
-	http3? ( net-libs/nghttp3 )
-	ilbc? ( media-libs/libilbc:= )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( ${LUA_DEPS} )
-	lz4? ( app-arch/lz4:= )
-	maxminddb? ( dev-libs/libmaxminddb:= )
-	minizip? ( sys-libs/zlib[minizip] )
-	netlink? ( dev-libs/libnl:3 )
-	opus? ( media-libs/opus )
-	pcap? ( net-libs/libpcap )
-	gui? (
-		dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
-		dev-qt/qt5compat:6
-		dev-qt/qtdeclarative:6
-		dev-qt/qtmultimedia:6
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd:= )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy:= )
-	spandsp? ( media-libs/spandsp:= )
-	sshdump? ( >=net-libs/libssh-0.6:= )
-	ssl? ( >=net-libs/gnutls-3.5.8:= )
-	wifi? ( >=net-libs/libssh-0.6:= )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-"
-# TODO: 4.0.0_rc1 release notes say:
-# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks."
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	app-alternatives/lex
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen
-		dev-ruby/asciidoctor
-		dev-libs/libxslt
-	)
-	gui? (
-		dev-qt/qttools:6[linguist]
-	)
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="
-	${RDEPEND}
-	gui? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${P}-cares.patch"
-)
-
-python_check_deps() {
-	use test || return 0
-
-	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" &&
-		 python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		git-r3_src_unpack
-	else
-		if use verify-sig ; then
-			cd "${DISTDIR}" || die
-			verify-sig_verify_signed_checksums \
-				${P}-signatures.txt \
-				openssl-dgst \
-				${P}.tar.xz
-			cd "${WORKDIR}" || die
-		fi
-
-		default
-	fi
-}
-
-src_configure() {
-	local mycmakeargs
-
-	python_setup
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos ; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use gui ; then
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	# crashes at runtime
-	# https://bugs.gentoo.org/754021
-	filter-lto
-
-	mycmakeargs+=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
-
-		# Force bundled lemon (bug 933119)
-		-DLEMON_EXECUTABLE=
-
-		-DRPMBUILD_EXECUTABLE=
-		-DGIT_EXECUTABLE=
-		-DENABLE_CCACHE=OFF
-
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex gui LRELEASE=$(qt6_get_bindir)/lrelease '')
-		$(usex gui MOC=$(qt6_get_bindir)/moc '')
-		$(usex gui RCC=$(qt6_get_bindir)/rcc '')
-		$(usex gui UIC=$(qt6_get_bindir)/uic '')
-
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-
-		-DBUILD_wireshark=$(usex gui)
-		-DUSE_qt6=$(usex gui)
-
-		-DENABLE_WERROR=OFF
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_ILBC=$(usex ilbc)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		# only appends -flto
-		-DENABLE_LTO=OFF
-		-DENABLE_LUA=$(usex lua)
-		-DLUA_FIND_VERSIONS="${ELUA#lua}"
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_NGHTTP3=$(usex http3)
-		-DENABLE_OPUS=$(usex opus)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=OFF
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DBUILD_wifidump=$(usex wifi)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_ZSTD=$(usex zstd)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test-programs
-
-	# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
-	epytest \
-		--disable-capture \
-		--skip-missing-programs=all \
-		--program-path "${BUILD_DIR}"/run
-}
-
-src_install() {
-	# bug #928577
-	# https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd
-	cmake_src_install install-headers
-
-	if ! use doc; then
-		# prepare Relase Notes redirector (bug #939195)
-		local relnotes="doc/release-notes.html"
-
-		# by default create a link for our specific version
-		local relversion="wireshark-${PV}.html"
-
-		# for 9999 we link to the release notes index page
-		if [[ ${PV} == *9999* ]] ; then
-			relversion=""
-		fi
-
-		# patch version into redirector & install it
-		sed -e "s/#VERSION#/${relversion}/g" < "${FILESDIR}/release-notes.html" > ${relnotes} || die
-		dodoc ${relnotes}
-	fi
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins "${BUILD_DIR}"/config.h
-
-	# If trying to remove this, try build e.g. libvirt first!
-	# At last check, Fedora is still doing this too.
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		wiretap
-		wsutil
-		wsutil/wmem
-	)
-
-	for dir in "${dirs[@]}" ; do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	if use gui ; then
-		local s
-
-		for s in 16 32 48 64 128 256 512 1024 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins resources/icons/wsicon${s}.png wireshark.png
-		done
-
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if [[ -d "${ED}"/usr/share/appdata ]] ; then
-		rm -r "${ED}"/usr/share/appdata || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	# Add group for users allowed to sniff.
-	chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap ; then
-		fcaps -o 0 -g pcap -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the pcap group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
diff --git a/net-analyzer/wireshark/wireshark-4.4.2-r1.ebuild b/net-analyzer/wireshark/wireshark-4.4.2-r1.ebuild
new file mode 100644
index 000000000000..5a6a17724369
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-4.4.2-r1.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{3..4} )
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+
+DESCRIPTION="Network protocol analyzer (sniffer)"
+HOMEPAGE="https://www.wireshark.org/"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
+	inherit verify-sig
+
+	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )"
+	S="${WORKDIR}/${P/_/}"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc64 ~riscv x86"
+	fi
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
+IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap +randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+"
+
+RESTRICT="!test? ( test )"
+
+# bug #753062 for speexdsp
+RDEPEND="
+	acct-group/pcap
+	>=dev-libs/glib-2.50.0:2
+	dev-libs/libpcre2
+	>=net-dns/c-ares-1.13.0:=
+	>=dev-libs/libgcrypt-1.8.0:=
+	media-libs/speexdsp
+	bcg729? ( media-libs/bcg729 )
+	brotli? ( app-arch/brotli:= )
+	ciscodump? ( >=net-libs/libssh-0.6:= )
+	filecaps? ( sys-libs/libcap )
+	http2? ( >=net-libs/nghttp2-1.11.0:= )
+	http3? ( net-libs/nghttp3 )
+	ilbc? ( media-libs/libilbc:= )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( ${LUA_DEPS} )
+	lz4? ( app-arch/lz4:= )
+	maxminddb? ( dev-libs/libmaxminddb:= )
+	minizip? ( sys-libs/zlib[minizip] )
+	netlink? ( dev-libs/libnl:3 )
+	opus? ( media-libs/opus )
+	pcap? ( net-libs/libpcap )
+	gui? (
+		dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
+		dev-qt/qt5compat:6
+		dev-qt/qtdeclarative:6
+		dev-qt/qtmultimedia:6
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd:= )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy:= )
+	spandsp? ( media-libs/spandsp:= )
+	sshdump? ( >=net-libs/libssh-0.6:= )
+	ssl? ( >=net-libs/gnutls-3.5.8:= )
+	wifi? ( >=net-libs/libssh-0.6:= )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+	${RDEPEND}
+"
+# TODO: 4.0.0_rc1 release notes say:
+# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks."
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	app-alternatives/lex
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen
+		dev-ruby/asciidoctor
+		dev-libs/libxslt
+	)
+	gui? (
+		dev-qt/qttools:6[linguist]
+	)
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="
+	${RDEPEND}
+	gui? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )"
+fi
+
+python_check_deps() {
+	use test || return 0
+
+	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" &&
+		 python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
+	else
+		if use verify-sig ; then
+			cd "${DISTDIR}" || die
+			verify-sig_verify_signed_checksums \
+				${P}-signatures.txt \
+				openssl-dgst \
+				${P}.tar.xz
+			cd "${WORKDIR}" || die
+		fi
+
+		default
+	fi
+}
+
+src_configure() {
+	local mycmakeargs
+
+	python_setup
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos ; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use gui ; then
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	# crashes at runtime
+	# https://bugs.gentoo.org/754021
+	filter-lto
+
+	mycmakeargs+=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
+
+		# Force bundled lemon (bug 933119)
+		-DLEMON_EXECUTABLE=
+
+		-DRPMBUILD_EXECUTABLE=
+		-DGIT_EXECUTABLE=
+		-DENABLE_CCACHE=OFF
+
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex gui LRELEASE=$(qt6_get_bindir)/lrelease '')
+		$(usex gui MOC=$(qt6_get_bindir)/moc '')
+		$(usex gui RCC=$(qt6_get_bindir)/rcc '')
+		$(usex gui UIC=$(qt6_get_bindir)/uic '')
+
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+
+		-DBUILD_wireshark=$(usex gui)
+		-DUSE_qt6=$(usex gui)
+
+		-DENABLE_WERROR=OFF
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_BROTLI=$(usex brotli)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_ILBC=$(usex ilbc)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		# only appends -flto
+		-DENABLE_LTO=OFF
+		-DENABLE_LUA=$(usex lua)
+		-DLUA_FIND_VERSIONS="${ELUA#lua}"
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_MINIZIP=$(usex minizip)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex http2)
+		-DENABLE_NGHTTP3=$(usex http3)
+		-DENABLE_OPUS=$(usex opus)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DENABLE_PLUGIN_IFDEMO=OFF
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DBUILD_wifidump=$(usex wifi)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_ZLIBNG=OFF
+		-DENABLE_ZSTD=$(usex zstd)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build test-programs
+
+	EPYTEST_DESELECT=(
+		# https://gitlab.com/wireshark/wireshark/-/issues/20330
+		suite_sharkd.py::TestSharkd::test_sharkd_req_follow_http2
+	)
+
+	# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
+	epytest \
+		--disable-capture \
+		--skip-missing-programs=all \
+		--program-path "${BUILD_DIR}"/run
+}
+
+src_install() {
+	# bug #928577
+	# https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd
+	cmake_src_install install-headers
+
+	if ! use doc; then
+		# prepare Relase Notes redirector (bug #939195)
+		local relnotes="doc/release-notes.html"
+
+		# by default create a link for our specific version
+		local relversion="wireshark-${PV}.html"
+
+		# for 9999 we link to the release notes index page
+		if [[ ${PV} == *9999* ]] ; then
+			relversion=""
+		fi
+
+		# patch version into redirector & install it
+		sed -e "s/#VERSION#/${relversion}/g" < "${FILESDIR}/release-notes.html" > ${relnotes} || die
+		dodoc ${relnotes}
+	fi
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins "${BUILD_DIR}"/config.h
+
+	# If trying to remove this, try build e.g. libvirt first!
+	# At last check, Fedora is still doing this too.
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		wiretap
+		wsutil
+		wsutil/wmem
+	)
+
+	for dir in "${dirs[@]}" ; do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	if use gui ; then
+		local s
+
+		for s in 16 32 48 64 128 256 512 1024 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins resources/icons/wsicon${s}.png wireshark.png
+		done
+
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	if [[ -d "${ED}"/usr/share/appdata ]] ; then
+		rm -r "${ED}"/usr/share/appdata || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	# Add group for users allowed to sniff.
+	chgrp pcap "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap ; then
+		fcaps -o 0 -g pcap -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the pcap group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
diff --git a/net-analyzer/wireshark/wireshark-4.4.2.ebuild b/net-analyzer/wireshark/wireshark-4.4.2.ebuild
deleted file mode 100644
index f7217d6e97b7..000000000000
--- a/net-analyzer/wireshark/wireshark-4.4.2.ebuild
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{3..4} )
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-HOMEPAGE="https://www.wireshark.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
-	inherit verify-sig
-
-	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )"
-	S="${WORKDIR}/${P/_/}"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc64 ~riscv x86"
-	fi
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-"
-
-RESTRICT="!test? ( test )"
-
-# bug #753062 for speexdsp
-RDEPEND="
-	acct-group/pcap
-	>=dev-libs/glib-2.50.0:2
-	dev-libs/libpcre2
-	>=net-dns/c-ares-1.13.0:=
-	>=dev-libs/libgcrypt-1.8.0:=
-	media-libs/speexdsp
-	bcg729? ( media-libs/bcg729 )
-	brotli? ( app-arch/brotli:= )
-	ciscodump? ( >=net-libs/libssh-0.6:= )
-	filecaps? ( sys-libs/libcap )
-	http2? ( >=net-libs/nghttp2-1.11.0:= )
-	http3? ( net-libs/nghttp3 )
-	ilbc? ( media-libs/libilbc:= )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( ${LUA_DEPS} )
-	lz4? ( app-arch/lz4:= )
-	maxminddb? ( dev-libs/libmaxminddb:= )
-	minizip? ( sys-libs/zlib[minizip] )
-	netlink? ( dev-libs/libnl:3 )
-	opus? ( media-libs/opus )
-	pcap? ( net-libs/libpcap )
-	gui? (
-		dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
-		dev-qt/qt5compat:6
-		dev-qt/qtdeclarative:6
-		dev-qt/qtmultimedia:6
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd:= )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy:= )
-	spandsp? ( media-libs/spandsp:= )
-	sshdump? ( >=net-libs/libssh-0.6:= )
-	ssl? ( >=net-libs/gnutls-3.5.8:= )
-	wifi? ( >=net-libs/libssh-0.6:= )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-"
-# TODO: 4.0.0_rc1 release notes say:
-# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks."
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	app-alternatives/lex
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen
-		dev-ruby/asciidoctor
-		dev-libs/libxslt
-	)
-	gui? (
-		dev-qt/qttools:6[linguist]
-	)
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="
-	${RDEPEND}
-	gui? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )"
-fi
-
-python_check_deps() {
-	use test || return 0
-
-	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" &&
-		 python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		git-r3_src_unpack
-	else
-		if use verify-sig ; then
-			cd "${DISTDIR}" || die
-			verify-sig_verify_signed_checksums \
-				${P}-signatures.txt \
-				openssl-dgst \
-				${P}.tar.xz
-			cd "${WORKDIR}" || die
-		fi
-
-		default
-	fi
-}
-
-src_configure() {
-	local mycmakeargs
-
-	python_setup
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos ; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use gui ; then
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	# crashes at runtime
-	# https://bugs.gentoo.org/754021
-	filter-lto
-
-	mycmakeargs+=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
-
-		# Force bundled lemon (bug 933119)
-		-DLEMON_EXECUTABLE=
-
-		-DRPMBUILD_EXECUTABLE=
-		-DGIT_EXECUTABLE=
-		-DENABLE_CCACHE=OFF
-
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex gui LRELEASE=$(qt6_get_bindir)/lrelease '')
-		$(usex gui MOC=$(qt6_get_bindir)/moc '')
-		$(usex gui RCC=$(qt6_get_bindir)/rcc '')
-		$(usex gui UIC=$(qt6_get_bindir)/uic '')
-
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-
-		-DBUILD_wireshark=$(usex gui)
-		-DUSE_qt6=$(usex gui)
-
-		-DENABLE_WERROR=OFF
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_ILBC=$(usex ilbc)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		# only appends -flto
-		-DENABLE_LTO=OFF
-		-DENABLE_LUA=$(usex lua)
-		-DLUA_FIND_VERSIONS="${ELUA#lua}"
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_NGHTTP3=$(usex http3)
-		-DENABLE_OPUS=$(usex opus)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=OFF
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DBUILD_wifidump=$(usex wifi)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_ZSTD=$(usex zstd)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test-programs
-
-	# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
-	epytest \
-		--disable-capture \
-		--skip-missing-programs=all \
-		--program-path "${BUILD_DIR}"/run
-}
-
-src_install() {
-	# bug #928577
-	# https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd
-	cmake_src_install install-headers
-
-	if ! use doc; then
-		# prepare Relase Notes redirector (bug #939195)
-		local relnotes="doc/release-notes.html"
-
-		# by default create a link for our specific version
-		local relversion="wireshark-${PV}.html"
-
-		# for 9999 we link to the release notes index page
-		if [[ ${PV} == *9999* ]] ; then
-			relversion=""
-		fi
-
-		# patch version into redirector & install it
-		sed -e "s/#VERSION#/${relversion}/g" < "${FILESDIR}/release-notes.html" > ${relnotes} || die
-		dodoc ${relnotes}
-	fi
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins "${BUILD_DIR}"/config.h
-
-	# If trying to remove this, try build e.g. libvirt first!
-	# At last check, Fedora is still doing this too.
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		wiretap
-		wsutil
-		wsutil/wmem
-	)
-
-	for dir in "${dirs[@]}" ; do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	if use gui ; then
-		local s
-
-		for s in 16 32 48 64 128 256 512 1024 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins resources/icons/wsicon${s}.png wireshark.png
-		done
-
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if [[ -d "${ED}"/usr/share/appdata ]] ; then
-		rm -r "${ED}"/usr/share/appdata || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	# Add group for users allowed to sniff.
-	chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap ; then
-		fcaps -o 0 -g pcap -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the pcap group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
diff --git a/net-analyzer/wireshark/wireshark-4.4.3.ebuild b/net-analyzer/wireshark/wireshark-4.4.3.ebuild
new file mode 100644
index 000000000000..9247e0f60c8a
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-4.4.3.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{3..4} )
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+
+DESCRIPTION="Network protocol analyzer (sniffer)"
+HOMEPAGE="https://www.wireshark.org/"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc
+	inherit verify-sig
+
+	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )"
+	S="${WORKDIR}/${P/_/}"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	fi
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
+IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap +randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+"
+
+RESTRICT="!test? ( test )"
+
+# bug #753062 for speexdsp
+RDEPEND="
+	acct-group/pcap
+	>=dev-libs/glib-2.50.0:2
+	dev-libs/libpcre2
+	>=net-dns/c-ares-1.13.0:=
+	>=dev-libs/libgcrypt-1.8.0:=
+	media-libs/speexdsp
+	bcg729? ( media-libs/bcg729 )
+	brotli? ( app-arch/brotli:= )
+	ciscodump? ( >=net-libs/libssh-0.6:= )
+	filecaps? ( sys-libs/libcap )
+	http2? ( >=net-libs/nghttp2-1.11.0:= )
+	http3? ( net-libs/nghttp3 )
+	ilbc? ( media-libs/libilbc:= )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( ${LUA_DEPS} )
+	lz4? ( app-arch/lz4:= )
+	maxminddb? ( dev-libs/libmaxminddb:= )
+	minizip? ( sys-libs/minizip-ng )
+	netlink? ( dev-libs/libnl:3 )
+	opus? ( media-libs/opus )
+	pcap? ( net-libs/libpcap )
+	gui? (
+		dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
+		dev-qt/qt5compat:6
+		dev-qt/qtdeclarative:6
+		dev-qt/qtmultimedia:6
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd:= )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy:= )
+	spandsp? ( media-libs/spandsp:= )
+	sshdump? ( >=net-libs/libssh-0.6:= )
+	ssl? ( >=net-libs/gnutls-3.5.8:= )
+	wifi? ( >=net-libs/libssh-0.6:= )
+	zlib? ( sys-libs/zlib-ng )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+	${RDEPEND}
+"
+# TODO: 4.0.0_rc1 release notes say:
+# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks."
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	app-alternatives/lex
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen
+		dev-ruby/asciidoctor
+		dev-libs/libxslt
+	)
+	gui? (
+		dev-qt/qttools:6[linguist]
+	)
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="
+	${RDEPEND}
+	gui? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )"
+fi
+
+python_check_deps() {
+	use test || return 0
+
+	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" &&
+		 python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
+	else
+		if use verify-sig ; then
+			cd "${DISTDIR}" || die
+			verify-sig_verify_signed_checksums \
+				${P}-signatures.txt \
+				openssl-dgst \
+				${P}.tar.xz
+			cd "${WORKDIR}" || die
+		fi
+
+		default
+	fi
+}
+
+src_configure() {
+	local mycmakeargs
+
+	python_setup
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos ; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use gui ; then
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	# crashes at runtime
+	# https://bugs.gentoo.org/754021
+	filter-lto
+
+	mycmakeargs+=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
+
+		# Force bundled lemon (bug 933119)
+		-DLEMON_EXECUTABLE=
+
+		-DRPMBUILD_EXECUTABLE=
+		-DGIT_EXECUTABLE=
+		-DENABLE_CCACHE=OFF
+
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex gui LRELEASE=$(qt6_get_bindir)/lrelease '')
+		$(usex gui MOC=$(qt6_get_bindir)/moc '')
+		$(usex gui RCC=$(qt6_get_bindir)/rcc '')
+		$(usex gui UIC=$(qt6_get_bindir)/uic '')
+
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+
+		-DBUILD_wireshark=$(usex gui)
+		-DUSE_qt6=$(usex gui)
+
+		-DENABLE_WERROR=OFF
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_BROTLI=$(usex brotli)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_ILBC=$(usex ilbc)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		# only appends -flto
+		-DENABLE_LTO=OFF
+		-DENABLE_LUA=$(usex lua)
+		-DLUA_FIND_VERSIONS="${ELUA#lua}"
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_MINIZIP=$(usex minizip)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex http2)
+		-DENABLE_NGHTTP3=$(usex http3)
+		-DENABLE_OPUS=$(usex opus)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DENABLE_PLUGIN_IFDEMO=OFF
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DBUILD_wifidump=$(usex wifi)
+		-DENABLE_ZLIB=OFF
+		-DENABLE_ZLIBNG=$(usex zlib)
+		-DENABLE_ZSTD=$(usex zstd)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build test-programs
+
+	EPYTEST_DESELECT=(
+		# https://gitlab.com/wireshark/wireshark/-/issues/20330
+		suite_sharkd.py::TestSharkd::test_sharkd_req_follow_http2
+	)
+
+	# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
+	epytest \
+		--disable-capture \
+		--skip-missing-programs=all \
+		--program-path "${BUILD_DIR}"/run
+}
+
+src_install() {
+	# bug #928577
+	# https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd
+	cmake_src_install install-headers
+
+	if ! use doc; then
+		# prepare Relase Notes redirector (bug #939195)
+		local relnotes="doc/release-notes.html"
+
+		# by default create a link for our specific version
+		local relversion="wireshark-${PV}.html"
+
+		# for 9999 we link to the release notes index page
+		if [[ ${PV} == *9999* ]] ; then
+			relversion=""
+		fi
+
+		# patch version into redirector & install it
+		sed -e "s/#VERSION#/${relversion}/g" < "${FILESDIR}/release-notes.html" > ${relnotes} || die
+		dodoc ${relnotes}
+	fi
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins "${BUILD_DIR}"/config.h
+
+	# If trying to remove this, try build e.g. libvirt first!
+	# At last check, Fedora is still doing this too.
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		wiretap
+		wsutil
+		wsutil/wmem
+	)
+
+	for dir in "${dirs[@]}" ; do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	if use gui ; then
+		local s
+
+		for s in 16 32 48 64 128 256 512 1024 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins resources/icons/wsicon${s}.png wireshark.png
+		done
+
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	if [[ -d "${ED}"/usr/share/appdata ]] ; then
+		rm -r "${ED}"/usr/share/appdata || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	# Add group for users allowed to sniff.
+	chgrp pcap "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap ; then
+		fcaps -o 0 -g pcap -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the pcap group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 5c5d9c7af028..9247e0f60c8a 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-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 @@ else
 	S="${WORKDIR}/${P/_/}"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
+		KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 	fi
 fi
 
@@ -61,7 +61,7 @@ RDEPEND="
 	lua? ( ${LUA_DEPS} )
 	lz4? ( app-arch/lz4:= )
 	maxminddb? ( dev-libs/libmaxminddb:= )
-	minizip? ( sys-libs/zlib[minizip] )
+	minizip? ( sys-libs/minizip-ng )
 	netlink? ( dev-libs/libnl:3 )
 	opus? ( media-libs/opus )
 	pcap? ( net-libs/libpcap )
@@ -80,7 +80,7 @@ RDEPEND="
 	sshdump? ( >=net-libs/libssh-0.6:= )
 	ssl? ( >=net-libs/gnutls-3.5.8:= )
 	wifi? ( >=net-libs/libssh-0.6:= )
-	zlib? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib-ng )
 	zstd? ( app-arch/zstd:= )
 "
 DEPEND="
@@ -242,7 +242,8 @@ src_configure() {
 		-DENABLE_SNAPPY=$(usex snappy)
 		-DENABLE_SPANDSP=$(usex spandsp)
 		-DBUILD_wifidump=$(usex wifi)
-		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_ZLIB=OFF
+		-DENABLE_ZLIBNG=$(usex zlib)
 		-DENABLE_ZSTD=$(usex zstd)
 	)
 
@@ -252,6 +253,11 @@ src_configure() {
 src_test() {
 	cmake_build test-programs
 
+	EPYTEST_DESELECT=(
+		# https://gitlab.com/wireshark/wireshark/-/issues/20330
+		suite_sharkd.py::TestSharkd::test_sharkd_req_follow_http2
+	)
+
 	# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
 	epytest \
 		--disable-capture \
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index a3d64f0fc2ac..d8f5aca0f3ce 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,16 +1,14 @@
 DIST zabbix-5.0.45-go-deps.tar.xz 27797872 BLAKE2B f56bf82ebd1e66e2d0a9867f85b1fe21e4726cd6cf64976a14997b8ddd7abdec6414035819c94d906620a3d02841b27675c9880d69fcebc71bcf80a8b5fbc41a SHA512 baa2167aa33e9e1b7156b8cf1393a3bf51d19410066dee4805a2a37576c95ad62cb5176cc49168641b8d0feafc3c1154abfbf8319081f2bee6f9216c1beccc25
 DIST zabbix-5.0.45.tar.gz 21885357 BLAKE2B 892050f2d4ef9c1972afadb856ca2e37c9a9e35820f39aab4efb0fa0dc3a62a2e1dcb63f12f779764f5990f8bc17d25e463e85234d6e59947742ceb0544c7e6f SHA512 3a181b63aed307d2ac6133dbac90c593d7f98648c545490a717501ab11da018f4cfc2abb35a573102a7fcf700423045fcd469a8d5f8e5b1d7c047e4f302af756
-DIST zabbix-6.0.36-go-deps.tar.xz 31343856 BLAKE2B b25ba3991e53aee09e352a76d67cce73e2ea090a9d7d8c42720f86e9011aae93b940b824b83be093eda1653475aa872fc73468345ce543a745aa86e4a1d16fde SHA512 fb54ce97279de11ed190e3524a4f77e952caf3d70a601244dd3ec7f5c2e27ac6dd8f63d42b3e5879866ae78d2f4ed87955e0a92c3061473a8018474586e6bc7d
-DIST zabbix-6.0.36.tar.gz 40473761 BLAKE2B 37f2be6213da993db7726c6aec0c09f8801b7e7cf0b1eef331506a3aa3d05c5fe4d8e1fad7d6a93133ad6dda7945453365905b9740bea4e6b843c6130c3a7616 SHA512 d3997e8131bdb320700e8041c628b7b24e9b9db1bcaf60966ce58dc7501cd555094835a1382e4c2ee35c48a5eea79876ad7b51ed66a6d5928b739af19b060082
 DIST zabbix-6.0.37-go-deps.tar.xz 31334504 BLAKE2B 3060bba678bcf2cc926ecc992b89cad4acc4ec496d0c7c8b9464d082fcd0288bfbf4310d9b02475357f4b2b209ae4cc3ca10bf37d357f3c340f2d2a7573c3fd9 SHA512 bf6a88384ca4fc2e7fa335fbdb920e9e39f7b06fd05be474a1f359e0a32ca0a278c8259890e4ee0dd6b0628539e6ad93a1a8fb726599a0e40c2463d0cc40acce
 DIST zabbix-6.0.37.tar.gz 40479472 BLAKE2B 6bf65efe59963294699d8fc6b6456167ae035c075f057c6ca85c612cc41f3f812b14189ed7e03ab2446e751720f8908f8e098fc0fd7335f95251b221b66b674a SHA512 c7f638bc391cc4afa70d3322da6f0889ac846911559b544d18d61b2c1a5277a7c8cf4e86e5a63a8b6f5d94ac69a0cf11739cc2a22e251ed8ba76ee0edd8b151d
 DIST zabbix-6.4.20-go-deps.tar.xz 34456784 BLAKE2B d703a985d578580af16810dd7c030976e15fb7695311581069a6b6f5050d30848bb0abdae987ca73e9d283d56b8fe7265e418ff973072eaa7f9297f576122939 SHA512 710d7ddc479f9b1c59af6c9345d0ca0d6dc1d81c3ae7c872c81d09a37cf394abd67e9c48650d913d661497728ad405f7c415667f34185c0f1bd1115e0779b2f2
 DIST zabbix-6.4.20.tar.gz 47050234 BLAKE2B 06e523d51e49625285bd6cfbed4ba790218f69eeddbb57e6b635ff7ed6f710dce5b3c9fd5b9333bfb1e582187b5a6c3b3400763eb129fe6c03f52b55c4521499 SHA512 cde89b8bf4b5e6c39a8a7e661e7c229da9f189bf6ffd9960505daf3d63627d7bc12d420a9262244d789b30ceda34b7668e49ec9d52b8eea7144b9897871d1ae0
-DIST zabbix-7.0.6-go-deps.tar.xz 34172684 BLAKE2B f0f3f5af7f1c5d849e86b05e4bf1be48dbb78fd233e9c2b5b731ed6cf0257bd00b0ad54fa8b56f8355094af03910bb2f556d5cc3624b3c1b63dc2d5a3735a2a4 SHA512 51f64599259ad911e1befc14c3fa347f02a58c44f69694fd6ed70a6f7d0e405c7f800b8236d2d3dc0b64a09eedb6291f5509b847790f10ad6c225fd4246a5ea9
-DIST zabbix-7.0.6.tar.gz 44028175 BLAKE2B ecdaf4e2a0a949e216e662a8e691bf5627c7369b83e9d91bd9e26a99137b0741950c5910a146915689e8a761ed14facc425dc703fec080007c490c10b40d33ed SHA512 ea74e1b45487333579cfe3c421d9467895efc3ce511fc4795b6e18950128ee9ead6599934b7dcb3aa393f32fd81847b48c61924196d111e99f26f65b620d83aa
 DIST zabbix-7.0.7-go-deps.tar.xz 34173780 BLAKE2B 2b99762800cc2c7f1364f05b1ebf61083f3244bf9b7efa716450ed72cf2e52b554a3c4da639d645705cc5d733c670dfdba6bd3260a93cb34681c21db083093bf SHA512 a8d9acb2b22501fad5b3cbac5eef6af4c385030df686e52a35d6c156453564a3a95a161defc40ffc5b241a1dca7693398cb2144ed92a7ed6d4d03fdd0aa2d106
 DIST zabbix-7.0.7.tar.gz 44142959 BLAKE2B 506addefd46d3765206c2268a16fca453be0eb6511ca69f38089b43e2a34c0836a8f458be08a41af18f71d96884cadf72f5c87e9681892154a45cfe35a1378f2 SHA512 670144e89554251a4e45e358fef2185d90bb610b318f637e6f9113685a983c574224d1a39e0b2a521d489a40a185712bad0c4809e39a61cbaa20477255244373
-DIST zabbix-7.2.0-go-deps.tar.xz 34463060 BLAKE2B aed6fc85ab7cf93eb01766ca919bc1dc6354c1c1c23c1b50c1ad7c5cac9eabc97fe7971181d6fdfe013952fd29fe2f91801f0945dc50455ef313fbab4871d41c SHA512 fb2549eb721a0425435e80291ede82b7107bef087c9f6a8c835405ceb9cc5d47409543cdbd9bf39b4321a27c71f23112ce47ae881d552c4a17da61f71ea2377d
-DIST zabbix-7.2.0.tar.gz 40284122 BLAKE2B 92140e4a23d46a6ad3bf24941f719acf793ee0e597c5a098d6afa25cbef3bcd9f063a8fb39645f6469febef3dea90ab69cc9c9501b8490576de2ffb7427b520a SHA512 be8f3a7f58af15ab5b0ee5e47666fdf7888937d99bbe8f491be1ab668f3812237c652f4ebbdbdcfd747a9b90fe489ffbbe2c199468ab19c618f4e3bda12cc5fb
+DIST zabbix-7.0.8-go-deps.tar.xz 34174372 BLAKE2B f034f8b46e5cbe860a99679a5a6dd4c66697e73a9cb47531da069ad1e0c524d8ecb828c4a38a098ef741454e46046e0585950a40d457d6e041527de52fb46333 SHA512 ba9c541ad0b7809d2e1cb78a0cd71967dee5f40b8d27515ef69d02e1092b12457b378c8eb8c0e3d9e0a02091d2eaf0d80868bd0a2c606c2b04ee5ef15764d683
+DIST zabbix-7.0.8.tar.gz 44231377 BLAKE2B 5f36ac44e9b64717a7aac9409c6b3a7c4a2610fdc93a368c5c64519963b50fd1b15cfee5a653b293ec0c042522c0a9c6c164772727339b3d606a71438fe3bb41 SHA512 648030e2393fe52c1b7050134bdc73023e54371206ddba3a7cac9d97ccd8869706ddbd00d770e57a92b109446141663803d2dc6959295927780155721eae6a01
 DIST zabbix-7.2.1-go-deps.tar.xz 34175908 BLAKE2B 204abe329feb80c10bc3da8a62ab7e9b4601878812209590236f149976147a9c97c9885e9d248fcccba938c98429d65276380e432928b4d24437d3ccd89243eb SHA512 6b625e4096d008bdd279fc16152f9e0c48b36ac97ffc1da8ca6c57666c21c6f7cd9c65808c577a43966b55602a81bef734bd0aa395bd81d975061615aa3e906b
 DIST zabbix-7.2.1.tar.gz 40360084 BLAKE2B 4762eacce715bb45f2ecd8393dc4b7f43670efd7dbb90604bcc99d4876185d42fa4ea9a165d7c65fbe8e900f41d684adf74e91a3749c136d4bd5af6dd784772e SHA512 ff36705e74100c23e8667f9ebc3f2b3228867dd1348c68496656c6ecc2003fc2295ec50cd9dbf9b718003383bf54e49626f0d73acc175e831d6fd15de1115c04
+DIST zabbix-7.2.2-go-deps.tar.xz 34162248 BLAKE2B cb5c40bb62af88bf642f6189d349a6907194c9cbe1c832e543b6b32ebbf3e937c2634932bd77a3872a8d09a6ca008fc1afd0fee3dffdcfa9197851f2fb7a98e4 SHA512 78a04c81a792e8d7476be849ca4172a0e06736309cbf33d86710b5054642ce3b7878d59d8fb187273b0f7b8305ee5fb660a5e0fe192cbdf102fdef651d77e3ce
+DIST zabbix-7.2.2.tar.gz 40372426 BLAKE2B 3cff418340428aa1de6cdbe00e5eef34068ea43eb5f6935c7e8d72bee6a484aa0b07806cd3eaaf1e09365f11a98673b07042d394109ec471055c7fdbfbf40df1 SHA512 98e4a21c4235dee36e050cfc1506cbef5cd5c9409ee6bb3cac663346826a80dd2c59c6f5e6cfaeb770975785b19689d4775b0eee407093a12ed6f1169621aa1f
diff --git a/net-analyzer/zabbix/zabbix-6.0.36.ebuild b/net-analyzer/zabbix/zabbix-6.0.36.ebuild
deleted file mode 100644
index 7cbc451d3735..000000000000
--- a/net-analyzer/zabbix/zabbix-6.0.36.ebuild
+++ /dev/null
@@ -1,389 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 ~x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	agent2? ( !gnutls )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	selinux? ( sec-policy/selinux-zabbix )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
-)
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	local econf_args=(
-		--with-libpcre2
-		"$(use_enable agent)"
-		"$(use_enable agent2)"
-		"$(use_enable ipv6)"
-		"$(use_enable java)"
-		"$(use_enable proxy)"
-		"$(use_enable server)"
-		"$(use_enable static)"
-		"$(use_with curl libcurl)"
-		"$(use_with gnutls)"
-		"$(use_with ldap)"
-		"$(use_with libxml2)"
-		"$(use_with mysql)"
-		"$(use_with odbc unixodbc)"
-		"$(use_with openipmi openipmi)"
-		"$(use_with openssl)"
-		"$(use_with oracle)"
-		"$(use_with postgres postgresql)"
-		"$(use_with snmp net-snmp)"
-		"$(use_with sqlite sqlite3)"
-		"$(use_with ssh ssh2)"
-	)
-
-	econf ${econf_args[@]}
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	if use oracle; then
-		ewarn
-		ewarn "Support for Oracle database has been dropped from PHP"
-		ewarn "so to make the web frontend work, you need to install"
-		ewarn "PECL extension for Oracle database."
-		ewarn "For details see https://bugs.gentoo.org/928386"
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-6.0.37.ebuild b/net-analyzer/zabbix/zabbix-6.0.37.ebuild
index 44884d9f45ff..d9fd70808b8f 100644
--- a/net-analyzer/zabbix/zabbix-6.0.37.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.37.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
 
 # To create the go modules tarball:
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-analyzer/zabbix/zabbix-7.0.6.ebuild b/net-analyzer/zabbix/zabbix-7.0.6.ebuild
deleted file mode 100644
index 132e5bd1913b..000000000000
--- a/net-analyzer/zabbix/zabbix-7.0.6.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit autotools webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-S=${WORKDIR}/${MY_P}
-
-LICENSE="AGPL-3"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	agent2? ( !gnutls )
-	proxy? ( ^^ ( mysql postgres sqlite ) )
-	server? ( ^^ ( mysql postgres ) !sqlite )
-	static? ( !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	selinux? ( sec-policy/selinux-zabbix )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
-)
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Since we patch configure.ac with e.g., ${PN}-6.4.0-configure-sscanf.patch".
-	eautoreconf
-}
-
-src_configure() {
-	local econf_args=(
-		--with-libpcre2
-		"$(use_enable agent)"
-		"$(use_enable agent2)"
-		"$(use_enable ipv6)"
-		"$(use_enable java)"
-		"$(use_enable proxy)"
-		"$(use_enable server)"
-		"$(use_enable static)"
-		"$(use_with curl libcurl)"
-		"$(use_with gnutls)"
-		"$(use_with ldap)"
-		"$(use_with libxml2)"
-		"$(use_with mysql)"
-		"$(use_with odbc unixodbc)"
-		"$(use_with openipmi openipmi)"
-		"$(use_with openssl)"
-		"$(use_with postgres postgresql)"
-		"$(use_with snmp net-snmp)"
-		"$(use_with sqlite sqlite3)"
-		"$(use_with ssh ssh2)"
-	)
-
-	econf ${econf_args[@]}
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-7.0.7.ebuild b/net-analyzer/zabbix/zabbix-7.0.7.ebuild
index f90e2783580f..aaca68e952a5 100644
--- a/net-analyzer/zabbix/zabbix-7.0.7.ebuild
+++ b/net-analyzer/zabbix/zabbix-7.0.7.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
 
 # To create the go modules tarball:
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="AGPL-3"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-analyzer/zabbix/zabbix-7.0.8.ebuild b/net-analyzer/zabbix/zabbix-7.0.8.ebuild
new file mode 100644
index 000000000000..3f658c2f3323
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-7.0.8.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit autotools webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="AGPL-3"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	agent2? ( !gnutls )
+	proxy? ( ^^ ( mysql postgres sqlite ) )
+	server? ( ^^ ( mysql postgres ) !sqlite )
+	static? ( !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	selinux? ( sec-policy/selinux-zabbix )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
+)
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Since we patch configure.ac with e.g., ${PN}-6.4.0-configure-sscanf.patch".
+	eautoreconf
+}
+
+src_configure() {
+	local econf_args=(
+		--with-libpcre2
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	econf ${econf_args[@]}
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-7.2.0.ebuild b/net-analyzer/zabbix/zabbix-7.2.0.ebuild
deleted file mode 100644
index f90e2783580f..000000000000
--- a/net-analyzer/zabbix/zabbix-7.2.0.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit autotools webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-S=${WORKDIR}/${MY_P}
-
-LICENSE="AGPL-3"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	agent2? ( !gnutls )
-	proxy? ( ^^ ( mysql postgres sqlite ) )
-	server? ( ^^ ( mysql postgres ) !sqlite )
-	static? ( !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	selinux? ( sec-policy/selinux-zabbix )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
-)
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Since we patch configure.ac with e.g., ${PN}-6.4.0-configure-sscanf.patch".
-	eautoreconf
-}
-
-src_configure() {
-	local econf_args=(
-		--with-libpcre2
-		"$(use_enable agent)"
-		"$(use_enable agent2)"
-		"$(use_enable ipv6)"
-		"$(use_enable java)"
-		"$(use_enable proxy)"
-		"$(use_enable server)"
-		"$(use_enable static)"
-		"$(use_with curl libcurl)"
-		"$(use_with gnutls)"
-		"$(use_with ldap)"
-		"$(use_with libxml2)"
-		"$(use_with mysql)"
-		"$(use_with odbc unixodbc)"
-		"$(use_with openipmi openipmi)"
-		"$(use_with openssl)"
-		"$(use_with postgres postgresql)"
-		"$(use_with snmp net-snmp)"
-		"$(use_with sqlite sqlite3)"
-		"$(use_with ssh ssh2)"
-	)
-
-	econf ${econf_args[@]}
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-7.2.1.ebuild b/net-analyzer/zabbix/zabbix-7.2.1.ebuild
index f90e2783580f..aaca68e952a5 100644
--- a/net-analyzer/zabbix/zabbix-7.2.1.ebuild
+++ b/net-analyzer/zabbix/zabbix-7.2.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
 
 # To create the go modules tarball:
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="AGPL-3"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-analyzer/zabbix/zabbix-7.2.2.ebuild b/net-analyzer/zabbix/zabbix-7.2.2.ebuild
new file mode 100644
index 000000000000..3f658c2f3323
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-7.2.2.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit autotools webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="AGPL-3"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	agent2? ( !gnutls )
+	proxy? ( ^^ ( mysql postgres sqlite ) )
+	server? ( ^^ ( mysql postgres ) !sqlite )
+	static? ( !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	selinux? ( sec-policy/selinux-zabbix )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
+)
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Since we patch configure.ac with e.g., ${PN}-6.4.0-configure-sscanf.patch".
+	eautoreconf
+}
+
+src_configure() {
+	local econf_args=(
+		--with-libpcre2
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	econf ${econf_args[@]}
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-dialup/lrzsz/Manifest b/net-dialup/lrzsz/Manifest
index d492485ee7df..f0ba33792cdd 100644
--- a/net-dialup/lrzsz/Manifest
+++ b/net-dialup/lrzsz/Manifest
@@ -1,3 +1,2 @@
 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
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r10.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r10.ebuild
index d1ea630d21b1..945241880cea 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r10.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r10.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 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 DEPEND="nls? ( virtual/libintl )"
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-dialup/ppp/ppp-2.5.1-r1.ebuild b/net-dialup/ppp/ppp-2.5.1-r1.ebuild
index 4009514c3ccd..d34919022999 100644
--- a/net-dialup/ppp/ppp-2.5.1-r1.ebuild
+++ b/net-dialup/ppp/ppp-2.5.1-r1.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
@@ -70,7 +70,7 @@ src_prepare() {
 }
 
 src_configure() {
-	# bug #944065
+	# https://bugs.gentoo.org/943931
 	append-cflags -std=gnu17
 
 	local args=(
diff --git a/net-dialup/ppp/ppp-2.5.2.ebuild b/net-dialup/ppp/ppp-2.5.2.ebuild
index f777f5f9240d..02d8a124a403 100644
--- a/net-dialup/ppp/ppp-2.5.2.ebuild
+++ b/net-dialup/ppp/ppp-2.5.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
@@ -69,7 +69,7 @@ src_prepare() {
 }
 
 src_configure() {
-	# bug #944065
+	# https://bugs.gentoo.org/943931
 	append-cflags -std=gnu17
 
 	local args=(
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index a3abbc13c0c5..599985d6ba2f 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,3 +1 @@
-DIST avahi-0.8.tar.gz 953319 BLAKE2B ddede1b8790ff3057ea5f4bb710e95578229e078a7abac83121e043017dda1ab3d971c723f920fdd4f3d98b88bd2cf21f9645bec1b7bbd2ea194cb399a5f5b46 SHA512 27bba9a551152dfc7e721f326042e7bfce55d227044a6cbaee04d6fb0e3f59c36e159c2b7a4dd42d1c955cdf37cc1c303e91991c08928bbded91d796e9a22abe
-DIST avahi-0.9_rc1.tar.gz 1057252 BLAKE2B f38c35d25c439d0d4dce00131d61d4be816fdcf14ddbe4f91fed95990ac6313b8ed905bca84f693feeccf92b891c849a994cbee80b02732108a18378b044d4b4 SHA512 c46ef2c646ae7a7be8e61ef18924a5c1349e19293ecd2e95f51dd6cd41967ea2f118ca2af48671c68a5b33687cdd6cbadb8745d95e8b69963d0b73f2d447db8d
 DIST avahi-0.9_rc2.tar.gz 1076915 BLAKE2B 0aa72353b3ec9dc3e5c4a729ce81c1dcece5dd11d8a5736887aea63936417d515b91107da6e52f56dee870853d2f3943496da38a7e706e3e174ca84b3ce584c6 SHA512 29d6c9d075d0202b9da2cdf935fa04fad31ba95475ba5de086c9958d25caa405925bbd82ed439a024febf7880325e80c1a032a660284a7708c71dae9076f413b
diff --git a/net-dns/avahi/avahi-0.8-r7.ebuild b/net-dns/avahi/avahi-0.8-r7.ebuild
deleted file mode 100644
index 217e414f4bcc..000000000000
--- a/net-dns/avahi/avahi-0.8-r7.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="gdbm"
-inherit autotools flag-o-matic multilib-minimal mono-env python-single-r1 systemd
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="https://avahi.org/"
-SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 mdnsresponder-compat mono nls python qt5 selinux systemd test"
-
-REQUIRED_USE="
-	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
-	bookmarks? ( python )
-	mono? ( dbus )
-	howl-compat? ( dbus )
-	mdnsresponder-compat? ( dbus )
-	systemd? ( dbus )
-"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/libdaemon
-	dev-libs/libevent:=[${MULTILIB_USEDEP}]
-	dev-libs/expat
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	gdbm? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] )
-	qt5? ( dev-qt/qtcore:5 )
-	gtk?  ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	kernel_linux? ( sys-libs/libcap )
-	introspection? ( dev-libs/gobject-introspection:= )
-	mono? ( dev-lang/mono )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			bookmarks? ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] )
-			dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
-		')
-	)
-"
-RDEPEND="
-	acct-user/avahi
-	acct-group/avahi
-	acct-group/netdev
-	autoipd? (
-		acct-user/avahi-autoipd
-		acct-group/avahi-autoipd
-	)
-	${DEPEND}
-	selinux? ( sec-policy/selinux-avahi )
-"
-BDEPEND="
-	dev-util/glib-utils
-	doc? ( app-text/doxygen )
-	app-text/xmltoman
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h )
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable-avahi-ui-sharp.patch" # bug 769062
-	"${FILESDIR}/${P}-dependency-error.patch"
-	"${FILESDIR}/${P}-null-pointer-crash.patch"
-	"${FILESDIR}/${P}-potentially-undefined-fix.patch"
-	"${FILESDIR}/${P}-strict-prototypes.patch"
-# These patches do not apply cleanly but may need to be re-instated.
-# I'll leave them commented out for now.
-#	"${FILESDIR}/${PN}-0.7-qt5.patch"
-#	"${FILESDIR}/${PN}-0.7-CVE-2017-6519.patch"
-#	"${FILESDIR}/${PN}-0.7-remove-empty-avahi_discover.patch"
-#	"${FILESDIR}/${PN}-0.7-python3.patch"
-#	"${FILESDIR}/${PN}-0.7-python3-unittest.patch"
-#	"${FILESDIR}/${PN}-0.7-python3-gdbm.patch"
-)
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if ! use ipv6; then
-		sed -i \
-			-e "s/use-ipv6=yes/use-ipv6=no/" \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i \
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	eautoreconf
-
-	# bundled manpages
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-gtk
-		--disable-monodoc
-		--disable-python-dbus
-		--disable-qt3
-		--disable-qt4
-		--disable-static
-		--enable-manpages
-		--enable-glib
-		--enable-gobject
-		--enable-xmltoman
-		--localstatedir="${EPREFIX}/var"
-		--with-distro=gentoo
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_enable dbus)
-		$(use_enable gdbm)
-		$(use_enable gtk gtk3)
-		$(use_enable howl-compat compat-howl)
-		$(use_enable mdnsresponder-compat compat-libdns_sd)
-		$(use_enable nls)
-		$(multilib_native_use_enable autoipd)
-		$(multilib_native_use_enable doc doxygen-doc)
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable mono)
-		$(multilib_native_use_enable python)
-		$(multilib_native_use_enable test tests)
-	)
-
-	if use python; then
-		myconf+=(
-			$(multilib_native_use_enable dbus python-dbus)
-			$(multilib_native_use_enable introspection pygobject)
-		)
-	fi
-
-	if use mono; then
-		myconf+=( $(multilib_native_use_enable doc monodoc) )
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# used by daemons only
-			--disable-libdaemon
-			--with-xml=none
-		)
-	fi
-
-	myconf+=( $(multilib_native_use_enable qt5) )
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	multilib_is_native_abi && use doc && emake avahi.devhelp
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if ! use bookmarks || ! use python || ! use dbus; then
-		rm -f "${ED}"/usr/bin/avahi-bookmarks || die
-	fi
-
-	# https://github.com/lathiat/avahi/issues/28
-	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doxygen/html/.
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp
-	fi
-
-	# The build system creates an empty "/run" directory, so we clean it up here
-	rmdir "${ED}"/run || die
-}
-
-multilib_src_install_all() {
-	use python && python_optimize
-
-	if use autoipd; then
-		insinto /lib/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh
-
-		insinto /lib/netifrc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO}
-
-	find "${ED}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	if use autoipd; then
-		elog
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
-	fi
-
-	systemd_reenable avahi-daemon.service
-}
diff --git a/net-dns/avahi/avahi-0.9_rc1.ebuild b/net-dns/avahi/avahi-0.9_rc1.ebuild
deleted file mode 100644
index 455a301a236b..000000000000
--- a/net-dns/avahi/avahi-0.9_rc1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-PYTHON_REQ_USE="gdbm"
-inherit autotools multilib-minimal python-single-r1 systemd
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="https://avahi.org/"
-SRC_URI="https://github.com/lathiat/avahi/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 mdnsresponder-compat nls python qt5 selinux systemd test"
-
-REQUIRED_USE="
-	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
-	bookmarks? ( python )
-	howl-compat? ( dbus )
-	mdnsresponder-compat? ( dbus )
-	systemd? ( dbus )
-"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/libdaemon
-	dev-libs/libevent:=[${MULTILIB_USEDEP}]
-	dev-libs/expat
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	gdbm? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] )
-	qt5? ( dev-qt/qtcore:5 )
-	gtk?  ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	kernel_linux? ( sys-libs/libcap )
-	introspection? ( dev-libs/gobject-introspection:= )
-	systemd? ( sys-apps/systemd:=[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			bookmarks? ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] )
-			dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
-		')
-	)
-"
-RDEPEND="
-	acct-user/avahi
-	acct-group/avahi
-	acct-group/netdev
-	autoipd? (
-		acct-user/avahi-autoipd
-		acct-group/avahi-autoipd
-	)
-	${DEPEND}
-	selinux? ( sec-policy/selinux-avahi )
-"
-BDEPEND="
-	dev-util/glib-utils
-	doc? ( app-text/doxygen )
-	app-text/xmltoman
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h )
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable-avahi-ui-sharp.patch" # bug 769062
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if ! use ipv6; then
-		sed -i \
-			-e "s/use-ipv6=yes/use-ipv6=no/" \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i \
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	eautoreconf
-
-	# bundled manpages
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-gtk
-		--disable-mono
-		--disable-monodoc
-		--disable-python-dbus
-		--disable-qt3
-		--disable-qt4
-		--disable-static
-		--enable-manpages
-		--enable-glib
-		--enable-gobject
-		--enable-xmltoman
-		--localstatedir="${EPREFIX}/var"
-		--runstatedir="${EPREFIX}/run"
-		--with-distro=gentoo
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_enable dbus)
-		$(use_enable gdbm)
-		$(use_enable gtk gtk3)
-		$(use_enable howl-compat compat-howl)
-		$(use_enable mdnsresponder-compat compat-libdns_sd)
-		$(use_enable nls)
-		$(use_enable systemd libsystemd)
-		$(multilib_native_use_enable autoipd)
-		$(multilib_native_use_enable doc doxygen-doc)
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable python)
-		$(multilib_native_use_enable test tests)
-	)
-
-	if use python; then
-		myconf+=(
-			$(multilib_native_use_enable dbus python-dbus)
-			$(multilib_native_use_enable introspection pygobject)
-		)
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# used by daemons only
-			--disable-libdaemon
-			--with-xml=none
-		)
-	fi
-
-	myconf+=( $(multilib_native_use_enable qt5) )
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	multilib_is_native_abi && use doc && emake avahi.devhelp
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if ! use bookmarks || ! use python || ! use dbus; then
-		rm -f "${ED}"/usr/bin/avahi-bookmarks || die
-	fi
-
-	# https://github.com/lathiat/avahi/issues/28
-	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doxygen/html/.
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp
-	fi
-
-	# The build system creates an empty "/run" directory, so we clean it up here
-	rmdir "${ED}"/run || die
-}
-
-multilib_src_install_all() {
-	use python && python_optimize
-
-	if use autoipd; then
-		insinto /lib/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh
-
-		insinto /lib/netifrc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO}
-
-	find "${ED}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	if use autoipd; then
-		elog
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
-	fi
-
-	systemd_reenable avahi-daemon.service
-}
diff --git a/net-dns/avahi/avahi-0.9_rc2.ebuild b/net-dns/avahi/avahi-0.9_rc2.ebuild
index 9767e3c5de28..a337c8c61bb9 100644
--- a/net-dns/avahi/avahi-0.9_rc2.ebuild
+++ b/net-dns/avahi/avahi-0.9_rc2.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 @@ S="${WORKDIR}/${PN}-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 mdnsresponder-compat nls python qt5 selinux systemd test"
 
 REQUIRED_USE="
diff --git a/net-dns/avahi/files/avahi-0.8-dependency-error.patch b/net-dns/avahi/files/avahi-0.8-dependency-error.patch
deleted file mode 100644
index 1a4025ea2002..000000000000
--- a/net-dns/avahi/files/avahi-0.8-dependency-error.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/lathiat/avahi/commit/366e3798bdbd6b7bf24e59379f4a9a51af575ce9.patch
-From: =?UTF-8?q?Tomasz=20Pawe=C5=82=20Gajc?= <tpgxyz@gmail.com>
-Date: Thu, 20 Feb 2020 16:09:40 +0100
-Subject: [PATCH] fix requires in pc file
-
---- a/avahi-libevent.pc.in
-+++ b/avahi-libevent.pc.in
-@@ -6,6 +6,6 @@ includedir=${prefix}/include
- Name: avahi-libevent
- Description: Avahi Multicast DNS Responder (libevent Support)
- Version: @PACKAGE_VERSION@
--Requires: libevent-2.1.5
-+Requires: libevent >= 2.1.5
- Libs: -L${libdir} -lavahi-libevent
- Cflags: -D_REENTRANT -I${includedir}
diff --git a/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch b/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch
deleted file mode 100644
index 35f2a15af919..000000000000
--- a/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ebd2a01a7b5e88f3be35b2f803d5adbd36ae6593 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 27 Mar 2021 22:49:08 +0100
-Subject: [PATCH] Disable avahi-ui-sharp
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -46,7 +46,6 @@ EXTRA_DIST = \
- 	avahi-qt4.pc.in \
- 	avahi-qt5.pc.in \
- 	avahi-sharp.pc.in \
--	avahi-ui-sharp.pc.in \
- 	avahi-compat-libdns_sd.pc.in \
- 	avahi-compat-howl.pc.in \
- 	avahi-ui.pc.in \
-@@ -77,7 +76,6 @@ SUBDIRS = \
- 	avahi-compat-howl \
- 	avahi-autoipd \
- 	avahi-ui \
--	avahi-ui-sharp \
- 	avahi-libevent \
- 	po
- 
-@@ -188,8 +186,8 @@ CLEANFILES += avahi-compat-libdns_sd.pc
- endif
- 
- if HAVE_MONO
--pkgconfig_DATA += avahi-sharp.pc avahi-ui-sharp.pc
--CLEANFILES += avahi-sharp.pc avahi-ui-sharp.pc
-+pkgconfig_DATA += avahi-sharp.pc
-+CLEANFILES += avahi-sharp.pc
- endif
- 
- endif
---- a/configure.ac
-+++ b/configure.ac
-@@ -1166,7 +1166,6 @@ man/Makefile
- tests/Makefile
- service-type-database/Makefile
- avahi-sharp/Makefile
--avahi-ui-sharp/Makefile
- avahi-compat-libdns_sd/Makefile
- avahi-compat-howl/Makefile
- avahi-compat-howl/samples/Makefile
diff --git a/net-dns/avahi/files/avahi-0.8-null-pointer-crash.patch b/net-dns/avahi/files/avahi-0.8-null-pointer-crash.patch
deleted file mode 100644
index 93ed513a59cd..000000000000
--- a/net-dns/avahi/files/avahi-0.8-null-pointer-crash.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-https://github.com/lathiat/avahi/commit/fd482a74625b8db8547b8cfca3ee3d3c6c721423.patch
-From: Tommi Rantala <tommi.t.rantala@nokia.com>
-Date: Mon, 8 Feb 2021 11:04:43 +0200
-Subject: [PATCH] Fix NULL pointer crashes from #175
-
-avahi-daemon is crashing when running "ping .local".
-The crash is due to failing assertion from NULL pointer.
-Add missing NULL pointer checks to fix it.
-
-Introduced in #175 - merge commit 8f75a045709a780c8cf92a6a21e9d35b593bdecd
---- a/avahi-core/browse-dns-server.c
-+++ b/avahi-core/browse-dns-server.c
-@@ -343,7 +343,10 @@ AvahiSDNSServerBrowser *avahi_s_dns_server_browser_new(
-         AvahiSDNSServerBrowser* b;
- 
-         b = avahi_s_dns_server_browser_prepare(server, interface, protocol, domain, type, aprotocol, flags, callback, userdata);
-+        if (!b)
-+            return NULL;
-+
-         avahi_s_dns_server_browser_start(b);
- 
-         return b;
--}
-\ No newline at end of file
-+}
-
---- a/avahi-core/browse-domain.c
-+++ b/avahi-core/browse-domain.c
-@@ -253,7 +253,10 @@ AvahiSDomainBrowser *avahi_s_domain_browser_new(
-         AvahiSDomainBrowser *b;
- 
-         b = avahi_s_domain_browser_prepare(server, interface, protocol, domain, type, flags, callback, userdata);
-+        if (!b)
-+            return NULL;
-+
-         avahi_s_domain_browser_start(b);
- 
-         return b;
--}
-\ No newline at end of file
-+}
-
---- a/avahi-core/browse-service-type.c
-+++ b/avahi-core/browse-service-type.c
-@@ -171,6 +171,9 @@ AvahiSServiceTypeBrowser *avahi_s_service_type_browser_new(
-         AvahiSServiceTypeBrowser *b;
- 
-         b = avahi_s_service_type_browser_prepare(server, interface, protocol, domain, flags, callback, userdata);
-+        if (!b)
-+            return NULL;
-+
-         avahi_s_service_type_browser_start(b);
- 
-         return b;
-
---- a/avahi-core/browse-service.c
-+++ b/avahi-core/browse-service.c
-@@ -184,6 +184,9 @@ AvahiSServiceBrowser *avahi_s_service_browser_new(
-         AvahiSServiceBrowser *b;
- 
-         b = avahi_s_service_browser_prepare(server, interface, protocol, service_type, domain, flags, callback, userdata);
-+        if (!b)
-+            return NULL;
-+
-         avahi_s_service_browser_start(b);
- 
-         return b;
-
---- a/avahi-core/browse.c
-+++ b/avahi-core/browse.c
-@@ -634,6 +634,9 @@ AvahiSRecordBrowser *avahi_s_record_browser_new(
-         AvahiSRecordBrowser *b;
- 
-         b = avahi_s_record_browser_prepare(server, interface, protocol, key, flags, callback, userdata);
-+        if (!b)
-+            return NULL;
-+
-         avahi_s_record_browser_start_query(b);
- 
-         return b;
-
---- a/avahi-core/resolve-address.c
-+++ b/avahi-core/resolve-address.c
-@@ -286,7 +286,10 @@ AvahiSAddressResolver *avahi_s_address_resolver_new(
-         AvahiSAddressResolver *b;
- 
-         b = avahi_s_address_resolver_prepare(server, interface, protocol, address, flags, callback, userdata);
-+        if (!b)
-+            return NULL;
-+
-         avahi_s_address_resolver_start(b);
- 
-         return b;
--}
-\ No newline at end of file
-+}
-
---- a/avahi-core/resolve-host-name.c
-+++ b/avahi-core/resolve-host-name.c
-@@ -318,7 +318,10 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new(
-         AvahiSHostNameResolver *b;
- 
-         b = avahi_s_host_name_resolver_prepare(server, interface, protocol, host_name, aprotocol, flags, callback, userdata);
-+        if (!b)
-+            return NULL;
-+
-         avahi_s_host_name_resolver_start(b);
- 
-         return b;
--}
-\ No newline at end of file
-+}
-
---- a/avahi-core/resolve-service.c
-+++ b/avahi-core/resolve-service.c
-@@ -519,7 +519,10 @@ AvahiSServiceResolver *avahi_s_service_resolver_new(
-         AvahiSServiceResolver *b;
- 
-         b = avahi_s_service_resolver_prepare(server, interface, protocol, name, type, domain, aprotocol, flags, callback, userdata);
-+        if (!b)
-+            return NULL;
-+
-         avahi_s_service_resolver_start(b);
- 
-         return b;
--}
-\ No newline at end of file
-+}
-
diff --git a/net-dns/avahi/files/avahi-0.8-potentially-undefined-fix.patch b/net-dns/avahi/files/avahi-0.8-potentially-undefined-fix.patch
deleted file mode 100644
index 4419831939e1..000000000000
--- a/net-dns/avahi/files/avahi-0.8-potentially-undefined-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/lathiat/avahi/commit/b897ca43ac100d326d118e5877da710eb7f836f9.patch
-From: traffic-millions <60914101+traffic-millions@users.noreply.github.com>
-Date: Tue, 3 Mar 2020 11:15:48 +0800
-Subject: [PATCH] avahi_dns_packet_consume_uint32: fix potential undefined
- behavior
-
-avahi_dns_packet_consume_uint32 left shifts uint8_t values by 8, 16 and 24 bits to combine them into a 32-bit value. This produces an undefined behavior warning with gcc -fsanitize when fed input values of 128 or 255 however in testing no actual unexpected behavior occurs in practice and the 32-bit uint32_t is always correctly produced as the final value is immediately stored into a uint32_t and the compiler appears to handle this "correctly".
-
-Cast the intermediate values to uint32_t to prevent this warning and ensure the intended result is explicit.
-
-Closes: #267
-Closes: #268
-Reference: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19304
---- a/avahi-core/dns.c
-+++ b/avahi-core/dns.c
-@@ -455,7 +455,7 @@ int avahi_dns_packet_consume_uint32(AvahiDnsPacket *p, uint32_t *ret_v) {
-         return -1;
- 
-     d = (uint8_t*) (AVAHI_DNS_PACKET_DATA(p) + p->rindex);
--    *ret_v = (d[0] << 24) | (d[1] << 16) | (d[2] << 8) | d[3];
-+    *ret_v = ((uint32_t)d[0] << 24) | ((uint32_t)d[1] << 16) | ((uint32_t)d[2] << 8) | (uint32_t)d[3];
-     p->rindex += sizeof(uint32_t);
- 
-     return 0;
-
diff --git a/net-dns/avahi/files/avahi-0.8-strict-prototypes.patch b/net-dns/avahi/files/avahi-0.8-strict-prototypes.patch
deleted file mode 100644
index 3954aa4357ae..000000000000
--- a/net-dns/avahi/files/avahi-0.8-strict-prototypes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/lathiat/avahi/pull/405
-
-From 54409e5af9c382117b67674756971f4f1bf646f8 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 5 Nov 2022 23:49:47 +0000
-Subject: [PATCH] configure.ac: fix -Wstrict-prototypes
-
-Fixes errors like:
-```
--ignoreme: warning: a function definition without a prototype is deprecated in all versions of C and is not supported in C2x [-Wdeprecated-non-prototype]
-+ignoreme: error: a function definition without a prototype is deprecated in all versions of C and is not supported in C2x [-Werror,-Wdeprecated-non-prototype]
- void test_broken_ssp(c)
-      ^
-```
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -99,8 +99,7 @@ if test x"$enable_ssp" = x"yes"; then
-     LDFLAGS="$LDFLAGS -Wl,-z,defs"
-     cat confdefs.h > conftest.c
-     cat >>conftest.c <<_ACEOF
--void test_broken_ssp(c)
--    const char *c;
-+void test_broken_ssp(const char *c)
- {
-     char arr[[123]], *p; /* beware of possible double-braces if copying this */
-     for (p = arr; *c; ++p) {
-@@ -300,7 +299,7 @@ AM_CONDITIONAL(TARGET_FREEBSD, test x"$with_distro" = xfreebsd)
- AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
- 
- test_gcc_flag() {
--    AC_LANG_CONFTEST([int main() {}])
-+    AC_LANG_CONFTEST([int main(void) {}])
-     $CC -c conftest.c $CFLAGS $@ > /dev/null 2> /dev/null
-     ret=$?
-     rm -f conftest.o
-
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 537000cfa8d1..47c87a4e44c3 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,2 +1,2 @@
-DIST dnscrypt-proxy-2.1.4.tar.gz 6897787 BLAKE2B 655011c98e335e0f605c093e5b12156afc9be88f0e14882e11cfdca1affa6de29830344e7c3aa7a5013f90a322f824d54e2db4d37a69395d344e90b0160e442b SHA512 4540d11432c4f35244b79f66b8926f8a1025e09010d8d313f0cd0d62e3fafcbd12bd24e9956ddf9cd8c1ec8aae997b031ab08dae4ee220bf31f33227ec6c07ca
 DIST dnscrypt-proxy-2.1.5.tar.gz 4065395 BLAKE2B f8984121776565342c1920832839a9cebe8660eaa5f380baf5db6530a137efefbe270f61f9967426f3bea44110bf66b50524d2b891ec285eef1ad7329b1e305c SHA512 2c9a0e0896483b4453cb3779efd41205be8839e61e17b86701deb91e531676529a82b8859ae0975d121322ec8cc05bdd13a1324b8f56010692e1ac9f36a99d69
+DIST dnscrypt-proxy-2.1.7.tar.gz 4195998 BLAKE2B 2b8e979a178301eb560d7f3be33755401a9fd1808dcd5919c9513a7f2f5513c4d12606af0b38dc6cabdf4f243d69df8a61f2af30071634251309721144521b1d SHA512 53b100d5238186ae99add2a8aff4069e6491f9d687e63cc3e5648630626c86ff4f9d246789ae40490030b20584a3c82e1abce8a8ca685f18111a2bcfa0519c09
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.4.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.4.ebuild
deleted file mode 100644
index 76ec52a2adbe..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/DNSCrypt/dnscrypt-proxy.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc64 x86"
-fi
-
-LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="+pie"
-
-RDEPEND="
-	acct-group/dnscrypt-proxy
-	acct-user/dnscrypt-proxy
-"
-
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.2-config-full-paths.patch
-)
-
-src_compile() {
-	pushd "${PN}" >/dev/null || die
-	go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die
-	popd >/dev/null || die
-}
-
-src_test() {
-	cd "${PN}" || die
-	go test -mod=vendor -buildmode="$(usex pie pie default)" || die "Failed to run tests"
-}
-
-src_install() {
-	pushd "${PN}" >/dev/null || die
-
-	dobin dnscrypt-proxy
-
-	insinto /etc/dnscrypt-proxy
-	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins example-{allowed,blocked}-{ips.txt,names.txt}
-	doins example-{cloaking-rules.txt,forwarding-rules.txt}
-
-	popd >/dev/null || die
-
-	insinto /usr/share/dnscrypt-proxy
-	doins -r "utils/generate-domains-blocklist/."
-
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
-	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
-
-	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
-	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if ! use filecaps; then
-		ewarn "'filecaps' USE flag is disabled"
-		ewarn "${PN} will fail to listen on port 53"
-		ewarn "please do one the following:"
-		ewarn "1) re-enable 'filecaps'"
-		ewarn "2) change port to > 1024"
-		ewarn "3) configure to run ${PN} as root (not recommended)"
-		ewarn
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "Using systemd socket activation may cause issues with speed"
-		elog "latency and reliability of ${PN} and is discouraged by upstream"
-		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
-		elog "It is disabled by default for new installations"
-		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
-		elog
-
-	fi
-
-	elog "After starting the service you will need to update your"
-	elog "${EROOT}/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver 127.0.0.1"
-	elog
-	elog "Also see https://github.com/DNSCrypt/${PN}/wiki"
-}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.7.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.7.ebuild
new file mode 100644
index 000000000000..91fc991e7cb3
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.7.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps go-module prefix systemd
+
+DESCRIPTION="Flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/DNSCrypt/dnscrypt-proxy.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
+SLOT="0"
+
+RDEPEND="
+	acct-group/dnscrypt-proxy
+	acct-user/dnscrypt-proxy
+"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.7-config-full-paths.patch
+)
+
+src_compile() {
+	pushd "${PN}" >/dev/null || die
+	ego build -v -x -mod=readonly -mod=vendor
+	popd >/dev/null || die
+}
+
+src_test() {
+	cd "${PN}" || die
+	ego test -mod=vendor
+}
+
+src_install() {
+	pushd "${PN}" >/dev/null || die
+
+	dobin dnscrypt-proxy
+
+	eprefixify example-dnscrypt-proxy.toml
+	insinto /etc/dnscrypt-proxy
+	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins example-{allowed,blocked}-{ips.txt,names.txt}
+	doins example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	popd >/dev/null || die
+
+	insinto /usr/share/dnscrypt-proxy
+	doins -r "utils/generate-domains-blocklist/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53"
+		ewarn "please do one the following:"
+		ewarn "1) re-enable 'filecaps'"
+		ewarn "2) change port to > 1024"
+		ewarn "3) configure to run ${PN} as root (not recommended)"
+		ewarn
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Using systemd socket activation may cause issues with speed"
+		elog "latency and reliability of ${PN} and is discouraged by upstream"
+		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+		elog "It is disabled by default for new installations"
+		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+		elog
+
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "${EROOT}/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/DNSCrypt/${PN}/wiki"
+}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
index 74779702e9ac..91fc991e7cb3 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ RDEPEND="
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.5-config-full-paths.patch
+	"${FILESDIR}"/${PN}-2.1.7-config-full-paths.patch
 )
 
 src_compile() {
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.2-config-full-paths.patch b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.2-config-full-paths.patch
deleted file mode 100644
index c5d7ed53f5f5..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.2-config-full-paths.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
-+++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
-@@ -348,7 +348,7 @@ reject_ttl = 10
- 
- ## See the `example-forwarding-rules.txt` file for an example
- 
--# forwarding_rules = 'forwarding-rules.txt'
-+# forwarding_rules = '/etc/dnscrypt-proxy/forwarding-rules.txt'
- 
- 
- 
-@@ -364,7 +364,7 @@ reject_ttl = 10
- ##
- ## See the `example-cloaking-rules.txt` file for an example
- 
--# cloaking_rules = 'cloaking-rules.txt'
-+# cloaking_rules = '/etc/dnscrypt-proxy/cloaking-rules.txt'
- 
- ## TTL used when serving entries in cloaking-rules.txt
- 
-@@ -418,7 +418,7 @@ cache_neg_max_ttl = 600
- ## check for connectivity and captive portals, along with hard-coded
- ## IP addresses to return.
- 
--# map_file = 'example-captive-portals.txt'
-+# map_file = '/etc/dnscrypt-proxy/example-captive-portals.txt'
- 
- 
- 
-@@ -448,8 +448,8 @@ cache_neg_max_ttl = 600
- ## Certificate file and key - Note that the certificate has to be trusted.
- ## See the documentation (wiki) for more information.
- 
--# cert_file = 'localhost.pem'
--# cert_key_file = 'localhost.pem'
-+# cert_file = '/etc/dnscrypt-proxy/localhost.pem'
-+# cert_key_file = '/etc/dnscrypt-proxy/localhost.pem'
- 
- 
- 
-@@ -680,7 +680,7 @@ format = 'tsv'
- 
-   [sources.public-resolvers]
-     urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/public-resolvers.md']
--    cache_file = 'public-resolvers.md'
-+    cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md'
-     minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-     refresh_delay = 72
-     prefix = ''
-@@ -689,7 +689,7 @@ format = 'tsv'
- 
-   [sources.relays]
-     urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/relays.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/relays.md']
--    cache_file = 'relays.md'
-+    cache_file = '/var/cache/dnscrypt-proxy/relays.md'
-     minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-     refresh_delay = 72
-     prefix = ''
-@@ -698,13 +698,13 @@ format = 'tsv'
- 
-   # [sources.odoh-servers]
-   #   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-servers.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-servers.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/odoh-servers.md']
--  #   cache_file = 'odoh-servers.md'
-+  #   cache_file = '/var/cache/dnscrypt-proxy/odoh-servers.md'
-   #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-   #   refresh_delay = 24
-   #   prefix = ''
-   # [sources.odoh-relays]
-   #   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-relays.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/odoh-relays.md']
--  #   cache_file = 'odoh-relays.md'
-+  #   cache_file = '/var/cache/dnscrypt-proxy/odoh-relays.md'
-   #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-   #   refresh_delay = 24
-   #   prefix = ''
-@@ -714,7 +714,7 @@ format = 'tsv'
-   # [sources.quad9-resolvers]
-   #   urls = ['https://www.quad9.net/quad9-resolvers.md']
-   #   minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN'
--  #   cache_file = 'quad9-resolvers.md'
-+  #   cache_file = '/var/cache/dnscrypt-proxy/quad9-resolvers.md'
-   #   prefix = 'quad9-'
- 
-   ### Another example source, with resolvers censoring some websites not appropriate for children
-@@ -722,7 +722,7 @@ format = 'tsv'
- 
-   # [sources.parental-control]
-   #   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/parental-control.md']
--  #   cache_file = 'parental-control.md'
-+  #   cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
-   #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
- 
- 
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.7-config-full-paths.patch b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.7-config-full-paths.patch
new file mode 100644
index 000000000000..d668149783f1
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.7-config-full-paths.patch
@@ -0,0 +1,101 @@
+--- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
++++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
+@@ -379,7 +379,7 @@ reject_ttl = 10
+ 
+ ## See the `example-forwarding-rules.txt` file for an example
+ 
+-# forwarding_rules = 'forwarding-rules.txt'
++# forwarding_rules = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/forwarding-rules.txt'
+ 
+ 
+ 
+@@ -395,7 +395,7 @@ reject_ttl = 10
+ ##
+ ## See the `example-cloaking-rules.txt` file for an example
+ 
+-# cloaking_rules = 'cloaking-rules.txt'
++# cloaking_rules = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/cloaking-rules.txt'
+ 
+ ## TTL used when serving entries in cloaking-rules.txt
+ 
+@@ -449,7 +449,7 @@ cache_neg_max_ttl = 600
+ ## check for connectivity and captive portals, along with hard-coded
+ ## IP addresses to return.
+ 
+-# map_file = 'example-captive-portals.txt'
++# map_file = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/example-captive-portals.txt'
+ 
+ 
+ 
+@@ -481,8 +481,8 @@ cache_neg_max_ttl = 600
+ ## openssl req -x509 -nodes -newkey rsa:2048 -days 5000 -sha256 -keyout localhost.pem -out localhost.pem
+ ## See the documentation (wiki) for more information.
+ 
+-# cert_file = 'localhost.pem'
+-# cert_key_file = 'localhost.pem'
++# cert_file = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/localhost.pem'
++# cert_key_file = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/localhost.pem'
+ 
+ 
+ 
+@@ -713,7 +713,7 @@ format = 'tsv'
+ 
+   [sources.public-resolvers]
+     urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md']
+-    cache_file = 'public-resolvers.md'
++    cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/public-resolvers.md'
+     minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+     refresh_delay = 73
+     prefix = ''
+@@ -722,7 +722,7 @@ format = 'tsv'
+ 
+   [sources.relays]
+     urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/relays.md']
+-    cache_file = 'relays.md'
++    cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/relays.md'
+     minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+     refresh_delay = 73
+     prefix = ''
+@@ -731,13 +731,13 @@ format = 'tsv'
+ 
+   # [sources.odoh-servers]
+   #   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-servers.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-servers.md']
+-  #   cache_file = 'odoh-servers.md'
++  #   cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/odoh-servers.md'
+   #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   #   refresh_delay = 73
+   #   prefix = ''
+   # [sources.odoh-relays]
+   #   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-relays.md']
+-  #   cache_file = 'odoh-relays.md'
++  #   cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/odoh-relays.md'
+   #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   #   refresh_delay = 73
+   #   prefix = ''
+@@ -747,7 +747,7 @@ format = 'tsv'
+   # [sources.quad9-resolvers]
+   #   urls = ['https://www.quad9.net/quad9-resolvers.md']
+   #   minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN'
+-  #   cache_file = 'quad9-resolvers.md'
++  #   cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/quad9-resolvers.md'
+   #   prefix = 'quad9-'
+ 
+   ### Another example source, with resolvers censoring some websites not appropriate for children
+@@ -755,7 +755,7 @@ format = 'tsv'
+ 
+   # [sources.parental-control]
+   #   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v3/parental-control.md']
+-  #   cache_file = 'parental-control.md'
++  #   cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/parental-control.md'
+   #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+ 
+   ### dnscry.pt servers - See https://www.dnscry.pt
+@@ -763,7 +763,7 @@ format = 'tsv'
+   #  [sources.dnscry-pt-resolvers]
+   #    urls = ["https://www.dnscry.pt/resolvers.md"]
+   #    minisign_key = "RWQM31Nwkqh01x88SvrBL8djp1NH56Rb4mKLHz16K7qsXgEomnDv6ziQ"
+-  #    cache_file = "dnscry.pt-resolvers.md"
++  #    cache_file = "@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/dnscry.pt-resolvers.md"
+   #    refresh_delay = 73
+   #    prefix = "dnscry.pt-"
+ 
diff --git a/net-dns/doggo/doggo-1.0.5.ebuild b/net-dns/doggo/doggo-1.0.5.ebuild
index cb4e40048fc1..3f57844ecb91 100644
--- a/net-dns/doggo/doggo-1.0.5.ebuild
+++ b/net-dns/doggo/doggo-1.0.5.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 @@ SRC_URI="https://github.com/mr-karan/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_compile() {
 	emake build-cli VERSION=${PV}
diff --git a/net-dns/inadyn/inadyn-2.12.0-r1.ebuild b/net-dns/inadyn/inadyn-2.12.0-r1.ebuild
deleted file mode 100644
index 380d72354dd1..000000000000
--- a/net-dns/inadyn/inadyn-2.12.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Dynamic DNS client with multiple SSL/TLS library support"
-HOMEPAGE="https://github.com/troglobit/inadyn"
-SRC_URI="https://github.com/troglobit/inadyn/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="gnutls mbedtls openssl"
-REQUIRED_USE="?? ( gnutls mbedtls openssl )"
-
-DEPEND="
-	acct-group/inadyn
-	acct-user/inadyn
-	dev-libs/confuse:=
-	gnutls? (
-		dev-libs/nettle:=
-		net-libs/gnutls:=
-	)
-	mbedtls? ( net-libs/mbedtls:= )
-	openssl? ( dev-libs/openssl:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-2.12.0-musl.patch" )
-
-src_configure() {
-	# Tests would need a custom config file in homedir per configure help?
-	local myeconfargs=(
-		--disable-ssl
-		--with-systemd="$(systemd_get_systemunitdir)"
-	)
-
-	if use gnutls || use mbedtls || use openssl; then
-		myeconfargs=( --enable-ssl )
-	fi
-
-	if use mbedtls; then
-		myeconfargs+=( --enable-mbedtls )
-
-		# MbedTLS has no support for pkg-config
-		# TODO: Revisit a while after bug #922123 is fixed
-		myeconfargs+=( MbedTLS_CFLAGS="-I${ESYSROOT}/usr/include/mbedtls" )
-		myeconfargs+=( MbedTLS_LIBS="-lmbedtls" )
-	fi
-
-	use openssl && myeconfargs+=( --enable-openssl )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto	/etc
-	insopts -m 0600 -o inadyn -g inadyn
-	doins examples/inadyn.conf
-
-	newinitd "${FILESDIR}"/inadyn.initd inadyn
-	newconfd "${FILESDIR}"/inadyn.confd inadyn
-
-	newtmpfiles "${FILESDIR}"/inadyn.tmpfilesd inadyn.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process inadyn.conf
-}
diff --git a/net-dns/inadyn/inadyn-2.12.0-r2.ebuild b/net-dns/inadyn/inadyn-2.12.0-r2.ebuild
new file mode 100644
index 000000000000..e93a10ff8773
--- /dev/null
+++ b/net-dns/inadyn/inadyn-2.12.0-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Dynamic DNS client with multiple SSL/TLS library support"
+HOMEPAGE="https://github.com/troglobit/inadyn"
+SRC_URI="https://github.com/troglobit/inadyn/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gnutls mbedtls openssl"
+REQUIRED_USE="?? ( gnutls mbedtls openssl )"
+
+DEPEND="
+	acct-group/inadyn
+	acct-user/inadyn
+	dev-libs/confuse:=
+	gnutls? (
+		dev-libs/nettle:=
+		net-libs/gnutls:=
+	)
+	mbedtls? ( net-libs/mbedtls:0= )
+	openssl? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-2.12.0-musl.patch" )
+
+src_configure() {
+	# Tests would need a custom config file in homedir per configure help?
+	local myeconfargs=(
+		--disable-ssl
+		--with-systemd="$(systemd_get_systemunitdir)"
+	)
+
+	if use gnutls || use mbedtls || use openssl; then
+		myeconfargs=( --enable-ssl )
+	fi
+
+	if use mbedtls; then
+		myeconfargs+=( --enable-mbedtls )
+
+		# MbedTLS has no support for pkg-config
+		# TODO: Revisit a while after bug #922123 is fixed
+		myeconfargs+=( MbedTLS_CFLAGS="-I${ESYSROOT}/usr/include/mbedtls" )
+		myeconfargs+=( MbedTLS_LIBS="-lmbedtls" )
+	fi
+
+	use openssl && myeconfargs+=( --enable-openssl )
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto	/etc
+	insopts -m 0600 -o inadyn -g inadyn
+	doins examples/inadyn.conf
+
+	newinitd "${FILESDIR}"/inadyn.initd inadyn
+	newconfd "${FILESDIR}"/inadyn.confd inadyn
+
+	newtmpfiles "${FILESDIR}"/inadyn.tmpfilesd inadyn.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process inadyn.conf
+}
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 32bf4d32a68c..5ddf5c59b7dc 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -1 +1,2 @@
 DIST nsd-4.10.1.tar.gz 1404799 BLAKE2B 7b286ac681c1bb8201654cd2e5fac8a98256f6a595dfbb39bcfed92de63b3337e05d219bc766bab01e4aaf3fb1de3c128d7157caeee3a7f21e4132db9ea72cba SHA512 b0f4bdca8a1c6fbbe99096abc8c5f8b34ef2e66dc0da44da253ab164b35ad0aaef5d05eb682b88cc68d8b1671f7b80abafee242a784ed6deb785adee7f6a53a9
+DIST nsd-4.11.1.tar.gz 1527949 BLAKE2B 82a710a5e484818a6df19dd39d6b6b4cce4c1add0a055771946f040bbdd6dbee35d8bdb1d48f7d906aca85653e6809754749cc74654e182f5a5b07f19dcd9b42 SHA512 50b7d93485f3b9903e0d7ee5ec326f47c8a603d3c143899aa46e7865413f8b7f0ed2edcdae5ac054b3c709ab50acfbe8816e1be41dd008803ef83fa9bc370944
diff --git a/net-dns/nsd/files/nsd.confd-r1 b/net-dns/nsd/files/nsd.confd-r1
deleted file mode 100644
index 7c9a7effb844..000000000000
--- a/net-dns/nsd/files/nsd.confd-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-# /etc/conf.d/nsd
-
-# NSD_ARGS is set by default to run in the foreground (-d) and to not
-# create its own PID file (-P ''), as we let OpenRC handle that instead.
-# It is recommended to keep these defaults and append additional flags
-# to them.
-NSD_ARGS="-d -P ''"
-
-# NSD_CONFBASE sets the base configuration directory for nsd's
-# configuration and, by default, uses the standard '/etc/nsd' path.
-NSD_CONFBASE="/etc/nsd"
-
-# NSD_CONFNAME sets the first part of the nsd config file name to be that
-# of the calling service script name.  This allows you to create symlinks
-# that point at '/etc/init.d/nsd' for different instances of nsd.
-NSD_CONFNAME="${RC_SVCNAME}.conf"
diff --git a/net-dns/nsd/files/nsd.initd-r2 b/net-dns/nsd/files/nsd.initd-r2
deleted file mode 100644
index e1825433ac3b..000000000000
--- a/net-dns/nsd/files/nsd.initd-r2
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="NSD is an authoritative-only, high performance, open source name server"
-extra_commands="configtest"
-extra_started_commands="reload"
-
-# These can be overridden in /etc/conf.d/nsd if necessary.
-NSD_ARGS="${NSD_ARGS:--d -P ''}"
-NSD_CONFBASE="${NSD_CONFBASE:-/etc/nsd}"
-NSD_CONFNAME="${NSD_CONFNAME:-${RC_SVCNAME}.conf}"
-
-# The conf.d defaults shipped with nsd-4.9.1+ will run it in the foreground
-# and tell it not to create a PID file, as we allow OpenRC to handle those
-# details.
-config_file="${NSD_CONFBASE}/${NSD_CONFNAME}"
-checkconf="/usr/sbin/nsd-checkconf"
-command="/usr/sbin/nsd"
-command_args="-c ${config_file} ${NSD_ARGS}"
-command_background=true
-pidfile="/run/${RC_SVCNAME}.pid"
-required_files="${config_file}"
-
-depend() {
-	use logger
-}
-
-checkconfig() {
-	if ! "${checkconf}" "${config_file}"; then
-		eerror "You have errors in your configfile (${config_file})"
-		return $?
-	fi
-	return 0
-}
-
-configtest() {
-	ebegin "Checking ${RC_SVCNAME} configuration"
-	checkconfig
-	eend $?
-}
-
-start_pre() {
-	checkconfig || return $?
-}
-
-reload() {
-	checkconfig || return $?
-	ebegin "Reloading config and zone files"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
diff --git a/net-dns/nsd/files/nsd.tmpfilesd-r1 b/net-dns/nsd/files/nsd.tmpfilesd-r1
deleted file mode 100644
index 0e2211770cd2..000000000000
--- a/net-dns/nsd/files/nsd.tmpfilesd-r1
+++ /dev/null
@@ -1 +0,0 @@
-d /run/nsd 0750 nsd nsd
diff --git a/net-dns/nsd/nsd-4.11.1.ebuild b/net-dns/nsd/nsd-4.11.1.ebuild
new file mode 100644
index 000000000000..7fe65a15843c
--- /dev/null
+++ b/net-dns/nsd/nsd-4.11.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools systemd tmpfiles
+
+DESCRIPTION="An authoritative only, high performance, open source name server"
+HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/NLnetLabs/nsd.git"
+else
+	# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
+	MY_PV="${PV/_beta/b}"
+	MY_PV="${MY_PV/_rc/rc}"
+	MY_P="${PN}-${MY_PV}"
+
+	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
+		SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
+		S="${WORKDIR}"/${MY_P}
+
+		KEYWORDS="~amd64 ~x86"
+	fi
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="bind8-stats debug +default-znow dnstap +ipv6 +largefile libevent +lto memclean minimal-responses mmap munin +nsec3 packed +pie +radix-tree ratelimit recvmmsg +simdzone ssl systemd +tfo year2038"
+
+RDEPEND="
+	acct-group/nsd
+	acct-user/nsd
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
+	libevent? ( dev-libs/libevent )
+	munin? ( net-analyzer/munin )
+	ssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/lex
+	app-alternatives/yacc
+	systemd? ( virtual/pkgconfig )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-munin-gentoo-paths.patch"
+)
+
+NSD_DBDIR="/var/db/nsd"		# Default dir for NSD's databases.
+NSD_ZNDIR="/var/lib/nsd"	# Default dir for NSD's zone files.
+
+src_prepare() {
+	default
+
+	# Required to get correct pkg-config macros with USE="systemd".
+	# See bugs #663618 & #758050.
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable bind8-stats)
+		$(use_enable bind8-stats zone-stats)
+		$(use_enable debug checking)
+		$(use_enable default-znow relro-now)
+		$(use_enable dnstap)
+		$(use_enable ipv6)
+		$(use_enable largefile)
+		$(use_enable lto flto)
+		$(use_enable memclean)
+		$(use_enable minimal-responses)
+		$(use_enable mmap)
+		$(use_enable nsec3)
+		$(use_enable packed)
+		$(use_enable pie)
+		$(use_enable radix-tree)
+		$(use_enable ratelimit)
+		$(use_enable recvmmsg)
+		$(use_enable systemd)
+		$(use_enable tfo tcp-fastopen)
+		$(use_with libevent)
+		$(use_with ssl)
+
+		--with-cookiesecretsfile="${EPREFIX}${NSD_DBDIR}/cookiesecrets.txt"
+		--with-dbfile="${EPREFIX}${NSD_DBDIR}/nsd.db"
+		--with-logfile="${EPREFIX}/var/log/nsd.log"
+		--with-pidfile="${EPREFIX}/run/nsd.pid"
+		--with-xfrdfile="${EPREFIX}${NSD_DBDIR}/xfrd.state"
+		--with-xfrdir="${EPREFIX}${NSD_DBDIR}"
+		--with-zonelistfile="${EPREFIX}${NSD_DBDIR}/zone.list"
+		--with-zonesdir="${EPREFIX}${NSD_ZNDIR}"
+	)
+
+	# NSD 4.10.x introduced a new zone parser, "simdzone", which
+	# replaces the older parser that used flex & bison:
+	#   https://github.com/NLnetLabs/simdzone
+	# It leverages SSE4.2 and/or AVX2 instruction sets for faster
+	# zone parsing on x86_64 architectures.  Other CPU archs will
+	# use a fallback implementation.
+	if use amd64; then
+		myconf+=(
+			$(use_enable simdzone haswell)
+			$(use_enable simdzone westmere)
+		)
+	fi
+
+	# This configure switch only appears on glibc-based userlands.
+	# It enables 64-bit time_t to support timestamps greater than
+	# the year 2038 (D_TIME_BITS=64).
+	if use elibc_glibc; then
+		myconf+=( $(use_enable year2038) )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
+	newinitd "contrib/nsd.openrc" nsd
+	newconfd "contrib/nsd.openrc.conf" nsd
+	newtmpfiles "contrib/nsd-tmpfiles.conf" nsd.conf
+
+	# Install munin plugin and config, if requested.
+	if use munin ; then
+		exeinto "/usr/libexec/munin/plugins"
+		doexe "contrib/nsd_munin_"
+		insinto "/etc/munin/plugin-conf.d"
+		newins "${FILESDIR}/nsd.munin-conf" nsd_munin
+	fi
+
+	# Use the upstream-provided systemd service file.
+	systemd_dounit "contrib/nsd.service"
+
+	# Remove the /run directory that usually resides on tmpfs and is
+	# being taken care of by the nsd init script anyway (checkpath).
+	rm -r "${ED}/run" || die "Failed to remove /run"
+
+	keepdir "${NSD_DBDIR}"
+}
+
+pkg_postinst() {
+	# See eclass/tmpfiles.eclass for info.
+	tmpfiles_process nsd.conf
+
+	# Database directory
+	# Writable by nsd:nsd for database updates and zone transfers.
+	install -d -m 750 -o nsd -g nsd "${EROOT}/${NSD_DBDIR}"
+
+	# Zones directory
+	# Writable by nsd:nsd for zone file updates (via 'nsd-control write').
+	install -d -m 750 -o nsd -g nsd "${EROOT}/${NSD_ZNDIR}"
+}
diff --git a/net-dns/nsd/nsd-9999.ebuild b/net-dns/nsd/nsd-9999.ebuild
index 099b81460652..7fe65a15843c 100644
--- a/net-dns/nsd/nsd-9999.ebuild
+++ b/net-dns/nsd/nsd-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"
@@ -87,6 +87,7 @@ src_configure() {
 		$(use_with libevent)
 		$(use_with ssl)
 
+		--with-cookiesecretsfile="${EPREFIX}${NSD_DBDIR}/cookiesecrets.txt"
 		--with-dbfile="${EPREFIX}${NSD_DBDIR}/nsd.db"
 		--with-logfile="${EPREFIX}/var/log/nsd.log"
 		--with-pidfile="${EPREFIX}/run/nsd.pid"
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index a3e3cddd5539..d3c2f9bbb4c0 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,63 +1,95 @@
+DIST anyhow-1.0.87.crate 46831 BLAKE2B 8d277aef9dfb9e28d6fbbb840fc3dde385ae29df8fdaf76913c39ccdfac487c8a7599783c6bf4271cd7466a06bcb4b3b1459b317c0f531634a4b4b8ccc1d6174 SHA512 1ed272eb20bd28d361d71b8dd1279bb3ab3a722c6a68e0f7bf4fb0a196f8a5d9f5ed9874d231ba7cf93e6a6f2551e96411d1fcb26908c79ee76919214637816f
 DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9
+DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9763070e269b56a14b150cbfc4b7f599d4c2a0a5f783638170ee132f0796fefb14fcac7fd73c58db0791007a SHA512 91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20
 DIST cc-1.0.84.crate 74922 BLAKE2B 8a6c1208b32648d1d3e33388f3fea506b82236dcdfc5d89865233c8567d80d55d8e102f30d5a6dc4b9a38bfb831974327048ac01ee7dbe7df04020e6c664f238 SHA512 c74a842b57d1239329b35af63070c147e75455c929999265eb0ddef9f360301c266885dee5f32b13d3cc1b953761db6f5949eb70ad9ecc2920777ec2c1507dbc
 DIST cc-1.0.98.crate 76780 BLAKE2B 64124ebdda70b211b6fde8c02d256d97d57fc3a0db433371bad896c06e36caaa5f938074d92ca82724b34fde06bc10af63c7fdde8f52ac50a3ea6e3329d18d93 SHA512 dfeb194266a4a9cf2ddf69fe20f8e20a72a0a9c2f72b1ea578fd48dae5b0c3589f501068ca24e0da7b3691860cd8c05247c803f3ef2f338d56eef8b1f4f4fbd2
+DIST cc-1.1.18.crate 83315 BLAKE2B a97d24ffdf44f80795f67f7721ed4d2524d92342bfb4ba39e00a1d3351945c904ba84cc7e245c637453e70d19b1584a400e8422e185d42c036ef44d3f2135663 SHA512 af525791c6ba731d688d3f5bf898c0ff86bbd81b127454d7f933491cea1e921d171cb819d04e460e759c6ae0f6da2188ede6bbe94c940c47c6d9d9f991925401
 DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844
 DIST cxx-1.0.110.crate 197887 BLAKE2B 5f727fe8bc2c46052208499f5bf0061b5cb3feefb30d96fad3f5d3f8fc67fc0a1d37148620a1c77bad4ecf2037559919c6f286451e56d41ae9933a5ea5fec775 SHA512 ee168deaf5f08bed4f6f4613c38ccf0c219ec00393204c67d6ce5495ecaf1cc67a7ad30d36f2277cfd276ba284ebe37aa784a81d59019ab973988ab52ee3c136
 DIST cxx-1.0.122.crate 274986 BLAKE2B 60c30c0c27885f2362a17cb32a9b28ccfe65593c4545b2915c5a73bdab372abf48286f42e1e8dc9c763a44a7d7f8676aad5fc5572717d2d60928d6f3fd4e26c8 SHA512 5985d5324d77b50e8fd71f3fc820e52f21ab1b4fbc1171c111136ef86d9e5ee70d823a21c2860006d0fb72c690a31d93a80f2bb2ca7616896aa2174c215c93ed
+DIST cxx-1.0.128.crate 268642 BLAKE2B 0a9c5c30f6099f725b9b5e0dcf948a81211cb37e415fc9098eaa3cec8dca15b7c303add44ceda3c73fcdc70aa224113825c75558efbd7a43c32322ab23580800 SHA512 a426721f5d11989398c1c62bfc2561c08efe314d39e146b868ff6df53328f16d1704f48cfbac38f1eb1c2cffec75aebf4f93ca236f9cf904f2e32110e5438af3
 DIST cxx-build-1.0.110.crate 86469 BLAKE2B 91dfb19587505c020f1130a9f213a9e8f496ea3a1feeefd471b0d3cb4f60a7abbe8ba4bb41ae63ef1b231806b5407fe0850907bd79fd462a81919e8515f534e4 SHA512 a37dfbe97a03026d8469db25c2dbb5110f301a72b22f0b0d98559c7f69a39ad6786f2a9c7a8d6bba3286f374a2024d7b5aaafa7bfc9a603444032f75c7019fdc
 DIST cxx-build-1.0.122.crate 86704 BLAKE2B cab17e180c641f82fe76cfccadd248b28868137d83566aacde61c6461f84f38f07c1054d464885b7a5f427201bd3d61a0a5ead97c6db134c9a4228e55d20b421 SHA512 5a20911dbaad7669788d7228c9588a367f0fdfdb19828b5ecc38e958a4b5e09bf96d9d2d2ce658286e8188e0213e7b1ce56be7cb8a52668edc99abb572bf675a
+DIST cxx-build-1.0.128.crate 86674 BLAKE2B bc4028b4e2c51822e86bc7c8b906bb195556df9f81300ed36606996138b4222bec7d8bc2cec204b4703f7db7ef0416e88f4c010159de58f90626dd9909129d68 SHA512 c4121c27d5f3489e82016fc5342820bd4bf1af2d185d0c9ae85eded567fd274db6bcfb394d60d766ebacd2d78082f15073e762f9dd7dfbf45b398cd51d38f0c0
 DIST cxxbridge-flags-1.0.110.crate 5284 BLAKE2B f8cd35bb64cb0b8e371f3c58f251a7595d105e5ca628c1ca016bd831d8ba18c4f598b1a47d32ae6256f24feb8d3aac116c046a42a9a03115d506bb684b0e1a83 SHA512 c78014624144232e84a76f649fef90ac8187fef76bdd802f9d75fdc502b56946580303c39141750544490521c787a9ee7398e40529f791e6066c57ade0c105a0
 DIST cxxbridge-flags-1.0.122.crate 5312 BLAKE2B 8a00b92e787bce33092103bfad765a256febf1a83a8533d6a029c5dc63ceb34cce171a3939277652cb7bffd3658e20f2c21c7e48e0d9881812c8a3cd2ca0fa22 SHA512 b2995a302c857ebced6ccb0c87bb4dce7818a124c56342d2faedc3458eb371aeacd9097c237bcd39f654c9159adb9e0f4357bff0950c4e4d4232e620cabdd24f
+DIST cxxbridge-flags-1.0.128.crate 5313 BLAKE2B 7548c095e4367dab0b5ab080028ce3582dbfcd068726e1c9347f242f6f90a8c770f2238f0b4d6febd0ae80f2f94da40be35dd221c0c3479435ef57e694c32c19 SHA512 caba89e959f53362829e4554e73fed1900a9d172c756552c5bca8b3d04839e4107b6bc1a48ccf50d30ceb369a419fc1e3b846ab57760e3d3449c41efffefc7c6
 DIST cxxbridge-macro-1.0.110.crate 60405 BLAKE2B 38d1f105a427cd0ab40508ce190e45e6e4829051347fc5677d9cbd35551719f119ddf938cd0152f2624f4305fe98e6219dcc117780e64e9480b76ccbc66ce7f7 SHA512 3119839d71d55805dfa22308add558cc4973bd9e7991f04a155da0e81f3e1c927282cff494c205eee6df42c8ad4c97ecf94ad4fe1f5842dd926be8e4d695f6e0
 DIST cxxbridge-macro-1.0.122.crate 60451 BLAKE2B b8c9c1a380e87a578fa9ee1f3c6fb273b1bc211280adc911c902b66aa4291a76d20a90625439635dab5b0c925dc6afac9ae209a262a3c2daa6a23d0b97df1805 SHA512 74c8debaff29ee50c37a3af0b290ce7127d47bc980cc60ab43b47a883a4b0c67b3c7121f1462c017cbfa9fe6c92833cf245e04a4d5a8f02ad0192d51c3ee317f
+DIST cxxbridge-macro-1.0.128.crate 60417 BLAKE2B 3cf8cf16e2ff0ccda30783afe9b1b9d942162a7abccf5215840be34ef8ec5c375736a4cac18e84c36170801e48ece54a009ae8699630b1bc54ed8723d4c721f4 SHA512 9a7a91c8de8e240b0cf7f054e9d5097900aa4982722f55082a71715265fd10c3650e11f7b9705d8d88c04593bdd68529bca74d283f7d404368c442a5a1a5a873
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
 DIST hashbrown-0.14.2.crate 140080 BLAKE2B 4a9fc89d77940d116d781ac6ca2a07a8ba3146fed54bd5d304d5ccb7722d27c053bbd83ec5ef897f1a25db50f838b73421677fd92be5d534a91909a7ad390d3b SHA512 a611359ccc8d859a72e812b94123ff162f5653caa1839c5f5e3269ed18b5fe2b2c7b15b4f03ae8076a622d08090a90e747d8cbcdfce9cf7f317592f1a3695351
 DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
 DIST indexmap-2.1.0.crate 68224 BLAKE2B 9d833570cbb63ecae138ca234b998bd0e5b11b1a7e3d5ef4a21212bb32d0998395f1fc609f66860bdbab198081687630f583f5a2e495fac1afa40ff48bee8a0f SHA512 9d303eef918b9264b9fe326cc1d71f4095f7ed5639ed8696efa3e9be65dff2c50ada4495409e109e7718997db51ae1fd865cf8e88978107d7823faba14380600
 DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea
+DIST indexmap-2.5.0.crate 85919 BLAKE2B 766da0a2ddc406e3fb1a70a0bee00141045ff72b52cc412adf05972ccef59d416f502c429dada111461cb522a5c442087e01d8fb235c2f1fd5493adea00e79dc SHA512 c4627d43b1bc5c5fd64861d1a7ed66255ec3f790367028b2758a40751286d6677da7170cfb04dd88ca4c2d163df621583d2e0dc4e9db6d7ed9bd0cbea42b1729
+DIST ipnet-2.10.0.crate 28372 BLAKE2B 9bac14f8742962b16ff36c8f8ec6527ceaf60d77c11cd85a557ad2e5d1f99d568512233771b87f0f3b53fed90fbe44262ed8a41f097f0f0fac2a4df359dda83a SHA512 1c82a2bffe92fabedc5bf07c43580bd1bdf2e7293c7dc62d511420a8f4d1c3ecf4831f252a4867fa3693627d798977a04be075be413106403470c4d4729ae557
 DIST ipnet-2.9.0.crate 27627 BLAKE2B e7e1c74815b965e9cec1cd37cc3dca76671168feb689620d44d5e635f3a5fa92a7276cb3022f25a9512ffbaaa11b0a8719cc1b838a7dacda71a5beb1a992ecc0 SHA512 8ce429ba2bae53cfdaf8a7d6bf980e10b9dd515446ef3ed4e4e11432043a18e09454260567419818f523bc589fc367194bc345660f2cc808d281db235d3e0b54
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d
 DIST libc-0.2.150.crate 719359 BLAKE2B d08e17fb29992c76337bb5862cbc1cdaf7b9d7749cd65021f145fcf49fa7954d6251c8c2f3c9a796b46283c3bc014bccfd259ea52824459841911ad847fd7f5a SHA512 7ae8fe6a1db38ac6d951c0b4880d25a02f064f5e61d6057c20f7208dec8395d58efd085e41857bcf5f4da2b014d2952dc4ddaf18ac4acd3a23675bb659e70385
+DIST libyml-0.0.5.crate 97931 BLAKE2B f79d8e9ab775a6a31be18757129708a6b6f173b3ce2e58696992b34e42b820e4c3426202df1ed7c07601dc351a60d770285c8adf3d5383e515cdb4aea3a3a6b1 SHA512 69ce3208f0602e15cedc6e82b8b27ef7ed20f76fdd9820269959515d964ed8ee3f3f624d73d2989188af0fcd24a915576a3c441c857b29495bac2977e379c714
 DIST link-cplusplus-1.0.9.crate 7484 BLAKE2B 4f73807068243aa0dc4b6773c5446fc988154669eb196afca19fe39ffe63627ee705c4ee3cf9cca9628d0bb8fc4cdeb7ef52b41bab810d12721a6ad53d9557ee SHA512 30697093b54ca449135d7a2a963bdd9af61a446472b0f245c87a05bd6eefa62eeebf9cc58cf17aa77ac5f2301b05ae27d13eb50d92ec58fec27303f865261170
+DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
 DIST pdns-recursor-5.0.9.tar.bz2 1679197 BLAKE2B 1f69f0aa800b8265a580eb9ac2101e19fc383c5a0d8ead98420d399f97fda748cff4e6d7b090259197be2d822e71f65d3c62ddf7710c56cc1e6ca7b600d972d0 SHA512 4fcb417e63383111bbb784b440c5b9bf9351a4d8dfae404aa468515cd74a4789fb969b8f3bcee1a08792dcb01a2d8129bbb671db1959f523e557bf69a4bc0fca
 DIST pdns-recursor-5.1.3.tar.bz2 1718665 BLAKE2B 1030d7ee0b4fc06a4e20f23249167d21ac6439218652a5853ea5f3aaaa476c5bd659cf0e79df27cf42ab6efdd9f5ade856ddde8716aacd1914fe8f8f8792549f SHA512 6ff144efb60125c5fa66232852f267270a24f4b656d039f167be007b6aefb65fb68e53007a868493fca11f7e33916565fb3e4de87dd9bd0899f2d975271a72ec
+DIST pdns-recursor-5.2.0.tar.bz2 1729913 BLAKE2B 61fcfe736e5da8bfb61d359db887a19132516247cfcdc87e6b43db55e8b7ac6f81a7ecd15b8985b0aa1ec91ed3da1d1f23cc4a5415285e32faa0b53ff283e6df SHA512 00b1d9a837d2e854750a90f6306d3a7d7b23cf96dd0897666034f120d2c57f1277e1bc1677b8b54eec804f8983483208e3d2e4f156ca376374d06f3d73e3abd0
 DIST proc-macro2-1.0.69.crate 44271 BLAKE2B 9d1531a0b123e6238363d574bee03ad050454b65710b9800c12597f3a9ae2f9bf50c617da0472b7ac0b549afaca19c546ccd6519e648598500efda9c0db2ef6d SHA512 d197cbe9b6100c3193a01fd7dd6b4e49d440290012ababb5d9f139409f0afe816f213d67a03abeb1f3227228e0a1f2446d1dc0a2775363a15d1237c38b45d6a1
 DIST proc-macro2-1.0.84.crate 48922 BLAKE2B 51f73a6bbc3cc42aa5bb5c3f4bf404a0c7803f7219673771d375ab288c638113f496e932b98981ef56dac755d9387f888a4147864d8f9364cef47644ea179161 SHA512 0d0bd0cc1f457b6d5feb9fd6da670f2a0662d15d88e5d20d4d308103c689a103861b3838eb25e5144cf24fb87abffdebb3175989285a03f08730ce3daa55e35e
+DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
+DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
 DIST ryu-1.0.15.crate 46906 BLAKE2B 6d6949e43aaa27fba0ec6002fa11ba859af8d867f87c90d88413267186abbf6302b817985bca3d577ab3fab2e319e11756f144473a16330dfd8fc7b604cdc4b3 SHA512 4655b5647f919082a9b84b889539ae7fb23a1201057cf280efe79c58cb5f040864efb7812cda5021bf6d34838a15d173ac8bdb0fb9fa2dba85173d3efa5a826b
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST scratch-1.0.7.crate 7997 BLAKE2B cb92a93751d209c68cd003792e45365d186138a115b936f190ad22b33f87c1e1aea2bcd20937188ba496cbe709539bf5fc1d73c0760020e5159121e88c82aed8 SHA512 2cdd160a89844101b62b4d6c23a56d3f9089828b8914031ca973bcbdeffba41ee7d9fb2edb0736d5f8e19d3bf2b1491e8451ae8fe2525518939b2f5cc6310d55
 DIST serde-1.0.192.crate 76866 BLAKE2B 4920089921e23bbc9180d413cff34277683db1881d7e65c5fd9dc8bad2beae954d2429c9c2049b3e98bc04314ef059e59562c936d6c767681e75b84aa0a2a468 SHA512 b34cea6034a14a6785b3023d0a1c2cb5b1c2756c28f02ea20ba62a657ba54e9d04096a54c4fdde3ff4094913dba46c99713828de4287186bf9dd3f7d89dda0c3
 DIST serde-1.0.203.crate 77935 BLAKE2B 3d3dd4f81f7d74b60483d6759879a9f87c0c7d615aec308bad1bc575fac4e2071dc86551c2789e87331dbf8089e923ae56fff82e6f5a9992cf850121b052ce1d SHA512 a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec
+DIST serde-1.0.210.crate 78338 BLAKE2B b3621d1313312177a346313e6e384fe9660f74eefb18e6cffa39fc2aadc0ab73be84b9037c59b716e5feafcd73f4f054f83e6d17d82746984b3064bf8d3ed338 SHA512 0d853ca51543ae8b4a0c70204ff4e559a4eec77af3d3bdcfc75c5905c80d4ffd1bd9eb8258ea4f6ecfbdd26477ecac7dd698d84d86759fa32e03a9cce02fa4ae
 DIST serde_derive-1.0.192.crate 55690 BLAKE2B 1e9706fdf38880989cf907c36d1f72b5b211fc6f263a4ee35d5f7106aea0a792fd79a3361d09f831e06ce0a43680647952a8478bd1001f617d2571be428b5516 SHA512 67ad208291c8d7063adce4bface5d963488c43a326e77a89970f86f65e8f77856e173d134718f64eb80dce67283df1951022c12300dea0b4d9570fb7f637643a
 DIST serde_derive-1.0.203.crate 55867 BLAKE2B 1bc8aa96328bb83e4e4ff527b1df855bbcefd333f0c43c96d1e0b93f98a46273dd88a21653bccc8f517c4fc06d17b9b44332a963d024796e0a2c18a5bfecc824 SHA512 b2aeeab33395ac11ebdbd922fcdbda29f2592e7a20e78aef250713baf269cacf497271be7aa407f657aba33da132df0e035be046fef070f915f234097d1dd392
+DIST serde_derive-1.0.210.crate 56020 BLAKE2B b346e574c99b6a8b12dfc29b20a4fd2daf8abfabd3714ccfde059a3a1f14a5628d4acf6a03f8076174fd28adfdb7cb9bbdb8ac0d4403aa2f43e917eed4b08028 SHA512 1c54d70a55007c00d3ff3d8c2096f4f9966431ba7bfd9195bcf41932de71b71c4ab934f9a8c5067cb56a042742cf0efab07377dbabf12feb1af6d20399de00b5
 DIST serde_yaml-0.9.27.crate 64781 BLAKE2B 071d9ec686e0fd029cda986c14a6156c617e64b94ca9f7608c6306fbe426e07dee6231504f346d53b658395812b0fe32d74a103fc1b361e642949474211df41e SHA512 661b6a796caa3da6fabc3b24e798f9608c97706d49f64f05b8e046d40fd7c5e60ac66c3a88d399fdcd7eb2c71f3b6cec0104bdaf46870404e938b08fd55c7ea5
 DIST serde_yaml-0.9.34+deprecated.crate 65290 BLAKE2B 1c1f8c7dd1a7952948596d8c727fb6fd36426c7b80ddaba2e6065db7551757e6fb170c77373ba9784f6b32de9f8aec94f90e1c85df98b9ac1f75a7cc8e5da174 SHA512 64329436d18bc3b1a0737afff7c8727f7e04c71b2bf6022f597a45f0860fa3a678eac688f61f0bf7a7846f98809f427c9907625e1d00c8691c383043c1cffaca
+DIST serde_yml-0.0.12.crate 125859 BLAKE2B b9edf944cb967a66882354b15b99fb469005e6af002d7a1064b63b0e2cfba812fed56b2c5ca994a157694a10f1e3a0777a1645ae07d347c7840c632f621e189d SHA512 a7a3ef7b9114410388496817e417aa11c8f73cadd09c51ad60c7b62ea4932a6c4cbfa8b735efc8cd4077bee5249949203d618961eb99dd8472ffce4a61711ba1
+DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3
 DIST syn-2.0.66.crate 264855 BLAKE2B 5029091b2cfa88e5c739be913a647dc9492696398c09b891f84089350e6f09baafd9935b81e0f3519d5465eff2e1822ef6cdc96c15d6a40d1b6b8dd2f9e7d073 SHA512 60a617bfd37d74c52e4d4d63ef0a27a2f9b982469a6926922f2f6e96754a0c66affb0847b9a44d505c053cbd788b97e998efb8d1e558ea00ae4a0b7f15bed9b0
+DIST syn-2.0.77.crate 268784 BLAKE2B adf14ddc4b284ad78dae3c05be7e63a58a85a2ef16c1051b991aa278843ba7231f0da3cf2adc65eb95762d4c88b4e1440cb616c651d3bb568392bb036399304c SHA512 f8030332c3c4ab34fc1e86196eb0eeda9700e5438f2a339591a5968d8bdd3373b523dba4bd998bf578e4247e0019d999d4e9c6d062a1dedcafe18d27b6c9f6d4
 DIST termcolor-1.4.0.crate 18765 BLAKE2B d7286fcc84843296e2edf074e316ee8fcceb018c08deda7f1048e38108bf1a7c5f6b90dd3150078c413322eda08a1c58300b4adb963d9f51f307ecd08b5b7e10 SHA512 36c8550fe85cb90c4fdd1a6e3f60b42b6c71f65b6128da97d5ad6aac8350d907410899ad4a47bb4dc72ea6d00bc69e5a1ccc80ee9b0e80a1a27912e233f3e416
 DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe
 DIST unicode-width-0.1.12.crate 24062 BLAKE2B 61afd22353d46a8a77519af9b3580d75dafc7965967f7724cb740f1ee199c7742b3549ad6c67776b876dbda5b8f27c634431f68517e29a72ade1622da9fde446 SHA512 0bafd7a69bdf49c849e7c063ebf0487eca8a76244e3bc18c9a5f4609465dc0e5d482daceb6a9a6f4125b801bf7063cb8225fdb55173e5dc55e7bf278300df1b4
+DIST unicode-width-0.1.13.crate 457228 BLAKE2B 757c4da5fa090369a26130b08440c2348f1cd1c0dfbb6770dd75b65eba797eaa65f5d683f0c2862cced06124d46a89b4825af0d990f6adc2df8709b8ef291665 SHA512 9781d6dab2c6343e8c28ec66b50cb4293261bb2114e122fa80ad2facdb23020f5b621c38030193b918669e58adf143808e5ab4c507c18beb6dc61e97b2e296f4
 DIST unsafe-libyaml-0.2.11.crate 62101 BLAKE2B 7ba17f2c19d96fc8999448594ba67bfc0eceaff47a39e560f856d13229ad5e69a9c8ba8794ec814e6b7c3cb7d597b7c7a366c8e880f17c0efc6a03a5677d82bf SHA512 a42c95eaed1ae2e438d3ba19ccd92337327c34f6174a43db80e1f37c507154249c7510e93f81726890c6032c89fe21b1876582afb7fbb811e3931480c4727712
 DIST unsafe-libyaml-0.2.9.crate 60812 BLAKE2B 2fc475191d1285344e06a7056503bb994acf3bcd19fc5692a61cbf2315b2a331a0ed7d30d50c112cf05fa41f6f71b0b8235e15bb936848497bee85592f6ddc3d SHA512 31e803c321475364c6df65cec149a044bf7941379e9e66f47a698ab324eef0b1a3c32092ccf060e73a350b4c87e4e8bd908a1ad0cccf7b75fd86da679300663e
+DIST version_check-0.9.5.crate 15554 BLAKE2B 131e75cc287518831e142430e2a39b48e4275874f4473780d47a27552294097aa1cddb65c385583e1022478f940b495eb43c24a8b1617b8ac5a24af3340c0d72 SHA512 d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9
 DIST winapi-util-0.1.8.crate 12416 BLAKE2B 5b48c27dfbb5db5c332f7e248138327b35ceec0909788b940168e7f6fe1402800da5e7690b2b1654da6c510b5c720330a92da16dff53ef15821f37fef6f335e3 SHA512 e186111398f9f0f0686e791ad0d72c39205e5f246b6e020df413e477ee07f32e91d09405c61dc92752f061f54fd7533435545c1a151477b40e2d68acc94a57fd
+DIST winapi-util-0.1.9.crate 12464 BLAKE2B 7fb9dd803fc2608c4e5bc75674472992d82da364f24c22072d5624d6ae6abc44abd3e3ea3c45a7558e045331f3d87572b306b4ab5de52c07ff3706e7f13c2a38 SHA512 c46b893f67ec6e36499b00736bb6b9421e0e2611e76784afa6da01d7ebd033df82f1be7cf8d871d541125d290983f98f26f759488ba9aface49efce8edd682e9
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03
+DIST windows-sys-0.59.0.crate 2387323 BLAKE2B 3110c8cd2bc005f8c95cd038a8d574af648dc19788fe4485f977376f92e36b911b1a542d669a07ae9cd4ea72a884ab01ec78b8a2b5587456eb202452d1d8fa0d SHA512 d35e009e979633a1f3c8468cd038bd5c8c0381405165ce03497decd7d9edaaac485d704487e4a61d9aaf4e4d011b4248408912df6a0044d50e8457259867e061
 DIST windows-targets-0.52.5.crate 6376 BLAKE2B 1d39fd86380ab086c536d88e67b60956410b345790ccea62a25e6a700757b2a9cfa6dfeb7b86934cf47b981ea2e5f42dddf49780ad9829a551dc507fcf108641 SHA512 d00d7bc7eec3c10272e803ee5c9ea0d9b07c43311124dae975b4f5aae7408c5f2ccb2fe6e68228ea3d4e70b6b658382cac6992ea177f43a9cba2ef95c4fda0ee
+DIST windows-targets-0.52.6.crate 6403 BLAKE2B eb98d0a8daeed5fe76e7fa8edb2743e2a3e77dfb9c4ea68605a6ab10532cb7cfc43bc1cea0180869445bd940be762a40136500e26b84ca88b5e0c502004c7a4c SHA512 d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f
 DIST windows_aarch64_gnullvm-0.52.5.crate 433266 BLAKE2B dee1b69cdf1fbd4143136909e4df3adaa7b80d7630a01ca9a42fc5ad0d5a4d9a9e2873b43c6d8e55de59f237d9199fad0768c4e1cda3b1e5354847bd70d4c79e SHA512 b4cf511025458fe30d5b11368af285610e1654a8986ea9f78fa81b8bb87d38a00c4869441c62692534df66d06baf14c8a4d17f8eb06468eb260b99e2fda6439d
+DIST windows_aarch64_gnullvm-0.52.6.crate 435718 BLAKE2B 8b12ae02892cb69401329034bbca671d13bd268a112120b56b90504707cef89decfbd2560492844a9f0588fab62dc1476ab7e931126b939015d25a8cc91ca334 SHA512 f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5
 DIST windows_aarch64_msvc-0.52.5.crate 827944 BLAKE2B 3bcb16d527be1dfdf18a9105ab259a064f00e949937ca423c8dcd1d2b90090d85aa7e42ca6ccc50c9baeee1aa144123d0a04643f9ff1147e62b2fce28b8a697b SHA512 c8974f81e37a43d92c4a8b142705e36b7acc58d9150d80ffa3997433da878044c467a2d9167ba792d37a183a0082d912500fea8c8fed743f395b63ca62a5758d
+DIST windows_aarch64_msvc-0.52.6.crate 832615 BLAKE2B adc8ff61b6dc96d39c92c7d4221ae6aa0575edfc016cfcd046067ca5d8fcfd56d10e8e227be1c038ce34684be22c7ccaf5f18cd5a7638d28fbff4ba15b48b90b SHA512 a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b
 DIST windows_i686_gnu-0.52.5.crate 875699 BLAKE2B 528ea431d080c5326e4c6ed316d9ea3e38b40c2e1322a12a432506a2c11555a94537661a0941e90c20eff4a9ce42c12539876dae6e77a1df18b522529928b309 SHA512 cc3e0362fb62dd5e8a855bda3be0177708ec8629ee9685f1f9aaac3f71a8cb082387388bdf49b09d3f5ee24a636b0b4f933d2c8bb75db434ee0192c8ce0547d2
+DIST windows_i686_gnu-0.52.6.crate 880402 BLAKE2B 5aab8ee07132eccb7695807eb44811beeb0657aadfb672c54e99b6ae39c067ba9b93e38fc69bb5b9b14a9759f263ccd5e301597d2727d83b31b49a409b6bd405 SHA512 a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822
 DIST windows_i686_gnullvm-0.52.5.crate 473064 BLAKE2B abe41ee330c05ee1366b3a835d15c6db3964ffd7b340ee69d215056b0d4b65c67f2782b0c04a55db64001098de87c93e2d447e25ef2a27f2cfa6685b8cf20c88 SHA512 da45c882248070911bf55698f62c245cb081a23254cdcf578df053905adb9117454235e52dcf1dd97c0d2248f92ff1d2fd3e18844a7be8d93ba08590c1eca22b
+DIST windows_i686_gnullvm-0.52.6.crate 475940 BLAKE2B fec4fda8bb2bf319a501a22372fa642ae682e4dee3235b258a028190ee73220bfc55b3142f06249bb4579b17e5fde662bb2b121aefe18544653350d7d0fe7d8e SHA512 95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f
 DIST windows_i686_msvc-0.52.5.crate 895404 BLAKE2B 02555169f8c5b944231a877de8693fc871ea0d7d33f52f60e164bacb35cec13d463af07c57fec4667948047cc222d8bda7f6a0be01a07e7184b69e4adc2b4577 SHA512 08c96f8e9385ac121549bae8ed228741b32004be20b2955d163a98d4b62af464f1682cb813681fa22823d20646f19335cf0a66203a876b105e119e05a4db0634
+DIST windows_i686_msvc-0.52.6.crate 901163 BLAKE2B 99ed34e052db5ba77bab240ed5d38ce450be347a794d63ec39b719304c32722c9999b540ab40abe0216318900b7412970df99dfb36d1516a9517cae0c77d1bdc SHA512 ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96
 DIST windows_x86_64_gnu-0.52.5.crate 831539 BLAKE2B 54f84c19988addeb7cbbbddb940e430e7345944589419592b99addf9b83bf6d801b18f4e80399b85bbb0b0ccf4608e36d9a50b79d8b1d6ce2b93745856e06eba SHA512 d9bf91765d02d2727344e42081f4bcfa73be97991495126f7e633f27e56a261ada3a8b865a559cfe71f9bc9aed5b14504f89138796766937b3521009726dfab8
+DIST windows_x86_64_gnu-0.52.6.crate 836363 BLAKE2B e2335829155cdbd4a55cc9f9babc237e14e32aab97f6f91afabcdf80d2aee37d6fb4b8669aaf433ff532c85dba59b3d366c7d41b61a2f29b96f960169c900687 SHA512 c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb
 DIST windows_x86_64_gnullvm-0.52.5.crate 433246 BLAKE2B f34328a6d100e092ecb34a6305daedf4fecd71840432f104e8707f049b60d784584ce4f02fabdd0281fdb8bc7ebed34b38fdacf3be9c8abd60084e9a4ee9fd56 SHA512 22a978c40df9705cd94e4c52f2b706e477e667b564c608d0adb144b38cb486c279c09d1eb1dd2d6c7bd3401b75a2dc5eafe0f7d642ffe6453f394d1f59483a08
+DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd
 DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
+DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
diff --git a/net-dns/pdns-recursor/pdns-recursor-5.0.9-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-5.0.9-r1.ebuild
index d4ade41512cd..bdcc684d3c98 100644
--- a/net-dns/pdns-recursor/pdns-recursor-5.0.9-r1.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-5.0.9-r1.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"
@@ -61,7 +61,7 @@ DEPEND="${LUA_DEPS}
 		x86? ( >=sys-libs/glibc-2.34 )
 	)
 	dev-libs/openssl:=
-	dev-libs/boost:=[context]"
+	>=dev-libs/boost-1.42:=[context]"
 RDEPEND="${DEPEND}
 	!<net-dns/pdns-2.9.20-r1
 	acct-user/pdns
@@ -75,6 +75,7 @@ S="${WORKDIR}"/${P/_/-}
 pkg_setup() {
 	lua-single_pkg_setup
 	filter-flags -ftree-vectorize
+	filter-lto
 	append-lfs-flags
 	append-cppflags -D_TIME_BITS=64
 	rust_pkg_setup
diff --git a/net-dns/pdns-recursor/pdns-recursor-5.1.3-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-5.1.3-r1.ebuild
index e02040bf9ecb..d7677bee2e5a 100644
--- a/net-dns/pdns-recursor/pdns-recursor-5.1.3-r1.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-5.1.3-r1.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"
@@ -54,7 +54,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2 ${CARGO_CRATE_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug dnstap snmp sodium systemd test valgrind"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
@@ -69,7 +69,7 @@ DEPEND="${LUA_DEPS}
 		x86? ( >=sys-libs/glibc-2.34 )
 	)
 	dev-libs/openssl:=
-	dev-libs/boost:=[context]"
+	>=dev-libs/boost-1.42:=[context]"
 RDEPEND="${DEPEND}
 	!<net-dns/pdns-2.9.20-r1
 	acct-user/pdns
@@ -83,6 +83,7 @@ S="${WORKDIR}"/${P/_/-}
 pkg_setup() {
 	lua-single_pkg_setup
 	filter-flags -ftree-vectorize
+	filter-lto
 	append-lfs-flags
 	append-cppflags -D_TIME_BITS=64
 	rust_pkg_setup
diff --git a/net-dns/pdns-recursor/pdns-recursor-5.2.0.ebuild b/net-dns/pdns-recursor/pdns-recursor-5.2.0.ebuild
new file mode 100644
index 000000000000..02223adeb190
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-5.2.0.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+CRATES="
+	anyhow@1.0.87
+	base64@0.22.1
+	cc@1.1.18
+	codespan-reporting@0.11.1
+	cxx-build@1.0.128
+	cxx@1.0.128
+	cxxbridge-flags@1.0.128
+	cxxbridge-macro@1.0.128
+	equivalent@1.0.1
+	hashbrown@0.14.5
+	indexmap@2.5.0
+	ipnet@2.10.0
+	itoa@1.0.11
+	libyml@0.0.5
+	link-cplusplus@1.0.9
+	memchr@2.7.4
+	once_cell@1.19.0
+	proc-macro2@1.0.86
+	quote@1.0.37
+	ryu@1.0.18
+	scratch@1.0.7
+	serde@1.0.210
+	serde_derive@1.0.210
+	serde_yml@0.0.12
+	shlex@1.3.0
+	syn@2.0.77
+	termcolor@1.4.1
+	unicode-ident@1.0.12
+	unicode-width@0.1.13
+	version_check@0.9.5
+	winapi-util@0.1.9
+	windows-sys@0.59.0
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.52.6
+"
+
+inherit cargo flag-o-matic lua-single
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2 ${CARGO_CRATE_URIS}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug dnstap snmp sodium systemd test valgrind"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}
+	dnstap? ( dev-libs/fstrm )
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	elibc_glibc? (
+		arm? ( >=sys-libs/glibc-2.34 )
+		x86? ( >=sys-libs/glibc-2.34 )
+	)
+	dev-libs/openssl:=
+	>=dev-libs/boost-1.54:=[context]"
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1
+	acct-user/pdns
+	acct-group/pdns"
+DEPEND="${DEPEND}
+	valgrind? ( dev-debug/valgrind )"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	lua-single_pkg_setup
+	filter-flags -ftree-vectorize
+	filter-lto
+	rust_pkg_setup
+}
+
+src_configure() {
+	econf \
+		--enable-experimental-64bit-time_t-support-on-glibc \
+		--sysconfdir=/etc/powerdns \
+		--with-nod-cache-dir=/var/lib/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-lua="${ELUA}" \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(use_enable test unit-tests) \
+		$(use_enable valgrind) \
+		$(use_with sodium libsodium) \
+		$(use_with snmp net-snmp)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	# rename .yml file to .conf, to facilitate easy upgrade and switch to .yml
+	mv "${D}"/etc/powerdns/recursor.{yml-dist,conf} || die
+
+	sed -i \
+		-e 's/^#   set\([ug]\)id: '\'\''$/    set\1id: '\''pdns'\''/' \
+		-e 's/^#   chroot: '\'\''$/    chroot: '\''\/var\/lib\/powerdns'\''/' \
+		"${D}"/etc/powerdns/recursor.conf || die
+
+	newinitd "${FILESDIR}"/pdns-recursor-r3 pdns-recursor
+
+	keepdir /var/lib/powerdns
+}
+
+src_test() {
+	default
+}
+
+pkg_postinst() {
+	einfo "Starting with 5.1.x we default to using the new yaml configuration file format."
+	einfo "The old configuration file format is still supported for now, but please update"
+	einfo "your recursor.conf to yaml using 'rec_control show-yaml'."
+}
diff --git a/net-dns/pdns/pdns-4.9.3.ebuild b/net-dns/pdns/pdns-4.9.3.ebuild
index 6a8019baa961..8fa4178e098d 100644
--- a/net-dns/pdns/pdns-4.9.3.ebuild
+++ b/net-dns/pdns/pdns-4.9.3.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 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug doc geoip ldap lmdb lua-records mysql odbc postgres remote sodium sqlite systemd tools tinydns test"
 RESTRICT="!test? ( test )"
diff --git a/net-firewall/firewalld/firewalld-2.3.0.ebuild b/net-firewall/firewalld/firewalld-2.3.0.ebuild
index 5ed05ae33d83..bbb543d6a9f1 100644
--- a/net-firewall/firewalld/firewalld-2.3.0.ebuild
+++ b/net-firewall/firewalld/firewalld-2.3.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="gui selinux test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"
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-firewall/iptables/iptables-1.8.11-r1.ebuild b/net-firewall/iptables/iptables-1.8.11-r1.ebuild
index 249bd2c0b14a..eeb7878289e6 100644
--- a/net-firewall/iptables/iptables-1.8.11-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.8.11-r1.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 @@ LICENSE="GPL-2"
 # Subslot reflects PV when libxtables and/or libip*tc was changed
 # the last time.
 SLOT="0/1.8.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="conntrack netlink nftables pcap static-libs test"
 RESTRICT="!test? ( test )"
 # TODO: skip tests needing nftables if no xtables-nft-multi (bug #890628)
diff --git a/net-firewall/iptables/iptables-1.8.11.ebuild b/net-firewall/iptables/iptables-1.8.11.ebuild
index 6bfee9b5102c..ba246b4b175d 100644
--- a/net-firewall/iptables/iptables-1.8.11.ebuild
+++ b/net-firewall/iptables/iptables-1.8.11.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 @@ LICENSE="GPL-2"
 # Subslot reflects PV when libxtables and/or libip*tc was changed
 # the last time.
 SLOT="0/1.8.3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="conntrack netlink nftables pcap static-libs test"
 RESTRICT="!test? ( test )"
 # TODO: skip tests needing nftables if no xtables-nft-multi (bug #890628)
diff --git a/net-firewall/nftables/nftables-1.1.1.ebuild b/net-firewall/nftables/nftables-1.1.1.ebuild
index d6be7fe6a1e3..81f6ec23a51b 100644
--- a/net-firewall/nftables/nftables-1.1.1.ebuild
+++ b/net-firewall/nftables/nftables-1.1.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
@@ -21,7 +21,7 @@ else
 		https://netfilter.org/projects/nftables/files/${P}.tar.xz
 		verify-sig? ( https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )
 	"
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 
diff --git a/net-firewall/nftlb/Manifest b/net-firewall/nftlb/Manifest
index d4a85e63f071..8ec890888e6a 100644
--- a/net-firewall/nftlb/Manifest
+++ b/net-firewall/nftlb/Manifest
@@ -1,2 +1,3 @@
 DIST nftlb-1.0.7.tar.gz 201988 BLAKE2B 794778523b3a60a351fd071e6ff129197203ddfb1b80823dd6b05c30cb530040da465a10d2ffbf11cad063c2a453bb9baebd6e689b9166d4fcb0fe9fd17760e8 SHA512 eb1e9847f340e57b75a5b8680774d8208b282faccdef48e316b2bd52b10349eeda70643386e0e899d0f6a2f506964cf1b7a7ec2d86279f83ca87a9afa8f047bc
 DIST nftlb-1.0.8.gh.tar.gz 256936 BLAKE2B 1ab9fb508c8613304ebde7185a8ad8ddabb483d17c8b872cfb7da8a0b0e5a8d40f74a74361d1d5b8304d45c00357eea1f88f2cc39e5afe537791278277462407 SHA512 f612b7065fb5011f1af34cabe0945b7b0c1479241b4673d86e2e97d06bffdfefcc5ca4ec3ad3752faa92862306ed8ad28754838236476fe9db88099bc389cf7c
+DIST nftlb-1.1.0.gh.tar.gz 250421 BLAKE2B 4034032bec80fe43c67af54550fe24f6133ce9b79c769caa678ef351d001ad01b758740df73e149726f00c258a84e3f4cbd6394a86efec0cdb5221a2f374f774 SHA512 e4fd41f5d7251913be457ae9b4e1ca1a1cc25751d1ffbb7fac3e009332ff963fcd5ab141e8cdbd26eee57183bc7663bf153feb5cd2ba8e2b6cc36083c8c12e46
diff --git a/net-firewall/nftlb/files/nftlb-1.1.0-musl.patch b/net-firewall/nftlb/files/nftlb-1.1.0-musl.patch
new file mode 100644
index 000000000000..b9cfb315c7e2
--- /dev/null
+++ b/net-firewall/nftlb/files/nftlb-1.1.0-musl.patch
@@ -0,0 +1,73 @@
+diff --git a/configure.ac b/configure.ac
+index ace78db..55f5f68 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,6 +2,7 @@ AC_INIT([nftlb], [1.1.0], [netfilter-devel@vger.kernel.org])
+ 
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
++AC_CONFIG_HEADERS([config.h])
+ AM_INIT_AUTOMAKE([-Wall foreign subdir-objects
+         tar-pax no-dist-gzip dist-bzip2 1.6])
+ 
+@@ -25,5 +26,7 @@ AC_CHECK_HEADER([ev.h], [EVENTINC="-include ev.h"],
+ 				 [EVENTINC="-include libev/ev.h"],
+ 				 [AC_MSG_ERROR([ev.h not found])])])
+ 
++AC_CHECK_HEADERS([execinfo.h])
++
+ AC_CONFIG_FILES([Makefile src/Makefile])
+ AC_OUTPUT
+diff --git a/src/main.c b/src/main.c
+index bca652e..5d7e918 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -18,6 +18,7 @@
+  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
+  */
++#include "config.h"
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -25,6 +26,10 @@
+ #include <errno.h>
+ #include <unistd.h>
+ 
++#ifdef HAVE_EXECINFO_H
++ #include <execinfo.h>
++#endif /* HAVE_EXECINFO_H */
++
+ #include "config.h"
+ #include "objects.h"
+ #include "server.h"
+@@ -88,6 +93,7 @@ static void nftlb_sighandler(int signo)
+ 	exit(EXIT_SUCCESS);
+ }
+ 
++#ifdef HAVE_EXECINFO_H
+ static void nftlb_trace() {
+ 	int level;
+ 
+@@ -100,6 +106,7 @@ static void nftlb_trace() {
+ 	if (!obj_recovery())
+ 		exit(EXIT_FAILURE);
+ }
++#endif /* HAVE_EXECINFO_H */
+ 
+ static int main_process(const char *config, int mode)
+ {
+@@ -189,9 +196,13 @@ int main(int argc, char *argv[])
+ 
+ 	if (signal(SIGINT, nftlb_sighandler) == SIG_ERR ||
+ 	    signal(SIGTERM, nftlb_sighandler) == SIG_ERR ||
++#ifdef HAVE_EXECINFO_H
+ 	    signal(SIGPIPE, SIG_IGN) == SIG_ERR ||
+ 	    signal(SIGABRT, nftlb_trace) == SIG_ERR ||
+ 	    signal(SIGSEGV, nftlb_trace) == SIG_ERR) {
++#else
++	    signal(sigpipe, sig_ign) == sig_err) {
++#endif /* have_execinfo_h */
+ 		u_log_print(LOG_ERR, "Error assigning signals");
+ 		return EXIT_FAILURE;
+ 	}
diff --git a/net-firewall/nftlb/metadata.xml b/net-firewall/nftlb/metadata.xml
index ab906c04250e..6cf207784952 100644
--- a/net-firewall/nftlb/metadata.xml
+++ b/net-firewall/nftlb/metadata.xml
@@ -6,6 +6,6 @@
     <name>Patrick McLean</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">zevenet/nftlb</remote-id>
+    <remote-id type="github">relianoid/nftlb</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-firewall/nftlb/nftlb-1.1.0.ebuild b/net-firewall/nftlb/nftlb-1.1.0.ebuild
new file mode 100644
index 000000000000..7e90a613b33b
--- /dev/null
+++ b/net-firewall/nftlb/nftlb-1.1.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info autotools
+
+DESCRIPTION="nftables load balancer"
+HOMEPAGE="
+	https://www.relianoid.com/nftlb
+	https://github.com/relianoid/nftlb
+"
+SRC_URI="https://github.com/relianoid/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	net-firewall/nftables:=[modern-kernel(+)]
+	dev-libs/jansson:=
+	dev-libs/libev:=
+"
+RDEPEND="
+	${DEPEND}
+"
+
+# tests need root access
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/nftlb-1.0.8-tests.patch"
+	"${FILESDIR}/nftlb-1.1.0-musl.patch"
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="
+		~NF_TABLES
+		~NFT_NUMGEN
+		~NFT_HASH
+		~NF_NAT
+		~IP_NF_NAT
+	"
+
+	linux-info_pkg_setup
+
+	if kernel_is lt 4 19; then
+		eerror "${PN} requires kernel version 4.19 or newer"
+	fi
+}
+
+src_prepare() {
+	# there are some compiler artifacts in the tarball
+	find "${S}" -name '*.o' -delete || die
+
+	default
+	eautoreconf
+}
+
+src_test() {
+	pushd tests >/dev/null || die
+
+	sed -e "s:/var/log/syslog:\"${T}/tests.log\":" \
+		-i exec_tests.sh || die
+
+	./exec_tests.sh || die "tests failed"
+
+	popd >/dev/null || die
+}
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 9872ccdd593f..1642d26f874d 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,5 +1,7 @@
 DIST openafs-1.8.13-doc.tar.bz2 3779824 BLAKE2B aab4d57df918061982614ea83b1b5de08d1b851e6a141957ae5c5f68f558994725eee6623479659729df92d6cb9058120179107058ab8974b36701420bfce48e SHA512 df95f26a24829f82f86896d20d47da2e9b5bcb7ecf9d24cb5ab0b956733e67d6bd2021bc4b52d6734ad1aacfd2e22a5a15a3acc5f14a401bb7f4f83f52251f1e
 DIST openafs-1.8.13-src.tar.bz2 15053864 BLAKE2B 83c62197b7825e46f733a593e096494a234607b0fa17ee30717b42740e1ebb13f43e11986cf39e950e79f867ed3ab40d1c80ab7aa79a153ffd9d8f3b1cde307a SHA512 f2b60b3942ba21a4f0fd837dfda1a9659ebe4d2f96edfbe7162e97faa8c5887fbea8fdef958af396356b78793f06e6744566a1aa6b70df2164c9ab37c06e2cd9
+DIST openafs-1.8.13.1-doc.tar.bz2 3781663 BLAKE2B f7bc8750456cd61cf1d2b5737fa4f0b3b319bfb79d0517ed82f551e31118313ea64baff738b8ad380a64d4f02bb8df1425af4ca8cfb690d7be31ec29c68d8866 SHA512 f297fa2e6d8dbff1566f11e54ba88b171e56e2fdfba373b0852f3036411c99c4e1e2cfd83705512fa1ff64ac2e6e008df15fd291208c9d15c53d393fac21c96f
+DIST openafs-1.8.13.1-src.tar.bz2 15046870 BLAKE2B aeed6e0a8caab9614e0980b362f806856bb3f3340865e9197986314f8219b14b78c38f0ff05d71169716de7614b10e318561377982969945a420bca4679ebd32 SHA512 705978208e69f43a87153c6c343722a0fc3d9aacbedfaca161f260dd0a8806b9dd23f81686dbd13b62ce9b787dbf860e60e035bed7e2d26ea21576b495764c41
 DIST openafs-1.8.7-doc.tar.bz2 3808045 BLAKE2B 8ded75239dd59633297ee4208a0f3f018486b5b5b71fda91229583fd2d6a7743bbbeba280e61ff91d602617fc47944105b06a5c0610b0c89c808ecba38af7f9c SHA512 6d087320ab6681686b6afb78621b21eaec26b91dbd03a13df447ad9f0ce897332ac378b38bf1abc590575d82d8cb22757249e60a2407e4ad498d46c083632e0d
 DIST openafs-1.8.7-src.tar.bz2 15059909 BLAKE2B 89aacc48100d3eabbec45acca3911fbd823c029a30e79ad16564dcc3646b9bbadb60a528f142fc907de0d4eb2831d922d8146cdba72c02f4e8db9ab806c84d86 SHA512 12d5aa9177dde10e504f71b4b1ae19be0b0c52e8031e0f5afacce4a2c3f2321970af65591edab6145f7400f6276acd7e8624aa66e816d2394324e2ef5c403c01
 DIST openafs-1.8.8.1-doc.tar.bz2 3770278 BLAKE2B 4d10c96f05190a71b8d7aa89557946d0b95774ca77f40d8e9ca81f5d5bacff1966e637f3bd066181f2dcf182dbfffdf93521981745fe4dbfea142e6b17fcf574 SHA512 c229636ca4c7245d37fa25b02805982e3f667163ae312e14678117c60320ccce50230bf09e081167e789a76bad8fa39a88638cb439ab87954c93b6108004efa8
diff --git a/net-fs/openafs/metadata.xml b/net-fs/openafs/metadata.xml
index ccc902021cc8..ae8af51d80a4 100644
--- a/net-fs/openafs/metadata.xml
+++ b/net-fs/openafs/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>cwills@witznd.net</email>
+		<name>Cheyenne Wills</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
 <use>
 	<flag name="apidoc">Build API documentation using <pkg>app-text/doxygen</pkg>.
 	May take a *long* time to build.</flag>
diff --git a/net-fs/openafs/openafs-1.8.13.1.ebuild b/net-fs/openafs/openafs-1.8.13.1.ebuild
new file mode 100644
index 000000000000..86e2aeed829f
--- /dev/null
+++ b/net-fs/openafs/openafs-1.8.13.1.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_IUSE="modules"
+inherit autotools linux-mod-r1 flag-o-matic pam systemd tmpfiles toolchain-funcs
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+KERNEL_LIMIT=6.12
+
+DESCRIPTION="The OpenAFS distributed file system"
+HOMEPAGE="https://www.openafs.org/"
+# We always d/l the doc tarball as man pages are not USE=doc material
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
+"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 -riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei
+ncurses perl +pthreaded-ubik selinux +supergroups tsm ubik-read-while-write"
+
+BDEPEND="
+	dev-lang/perl
+	app-alternatives/lex
+	app-alternatives/yacc
+	apidoc? (
+		app-text/doxygen[dot]
+		media-gfx/graphviz
+	)
+	doc? (
+		dev-libs/libxslt
+		|| (
+			>=dev-java/fop-2.10-r1:0
+			app-text/dblatex
+			app-text/docbook-sgml-utils[jadetex]
+		)
+	)
+	perl? ( dev-lang/swig )"
+DEPEND="
+	virtual/libcrypt:=
+	virtual/libintl
+	amd64? ( tsm? ( app-backup/tsm ) )
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		app-text/docbook-xml-dtd:4.3
+	)
+	fuse? ( sys-fs/fuse:0= )
+	kauth? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )
+	ncurses? ( sys-libs/ncurses:0= )"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-afs )"
+
+PATCHES=(
+	"${FILESDIR}"/0001-autoconf-use-AC_CHECK_TOOL-for-as-and-ld.patch
+	"${FILESDIR}"/0002-pam-paths.patch
+	"${FILESDIR}"/0003-fbsd.patch
+	"${FILESDIR}"/0004-sparc.patch
+	"${FILESDIR}"/0005-uname.patch
+	"${FILESDIR}"/0006-resolv.patch
+	"${FILESDIR}"/0007-afsauthent-symbols.patch
+	"${FILESDIR}"/0008-flags.patch
+	"${FILESDIR}"/0009-docbook2pdf.patch
+	"${FILESDIR}"/0010-libperl.patch
+	"${FILESDIR}"/0011-xbsa.patch
+	"${FILESDIR}"/0012-xml-dtd.patch
+	"${FILESDIR}"/0013-kernel-cc-ld.patch
+)
+# see https://bugs.gentoo.org/943641
+# Upstream performs uses customized autoconf routines to check for
+# the availability of various functions and the warnings/errors in
+# the config log for implicit function declarations are expected
+# and therefore are false positives.
+QA_CONFIG_IMPL_DECL_SKIP=("*")
+
+CONFIG_CHECK="~!AFS_FS KEYS"
+ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support. Make sure not to load both at the same time!"
+ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
+
+pkg_pretend() {
+	if use modules && use kernel_linux && kernel_is -ge ${KERNEL_LIMIT/\./ } ; then
+		ewarn "Gentoo supports kernels which are supported by OpenAFS"
+		ewarn "which are limited to the kernel versions: < ${KERNEL_LIMIT}"
+		ewarn ""
+		ewarn "You are free to utilize eapply_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Please do not file a bug report about this."
+		ewarn ""
+		ewarn "Alternatively, you may:"
+		ewarn "1. Use OpenAFS FUSE client, build OpenAFS with USE=fuse to enable it."
+		ewarn "2. Use native kernel AFS client: configure your kernel with CONFIG_AFS_FS."
+		ewarn "net-fs/openafs is not required in this case, but client's functionality will be limited."
+	fi
+}
+
+pkg_setup() {
+	use kernel_linux && linux-mod-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# fixing 2-nd level makefiles to honor flags
+	sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
+		src/*/Makefile.in || die '*/Makefile.in sed failed'
+
+	# build system is very delicate, so we can't run eautoreconf
+	# run autotools commands based on what is listed in regen.sh
+	_elibtoolize -c -f -i
+	eaclocal -I src/cf -I src/external/rra-c-util/m4 -I src/external/autoconf-archive/m4
+	eautoconf
+	eautoconf -o configure-libafs configure-libafs.ac
+	eautoheader
+	einfo "Deleting autom4te.cache directory"
+	rm -rf autom4te.cache || die
+}
+
+src_configure() {
+	# requires the --enable-static to avoid build errors.  This is
+	# currently an upstream limitation.
+	local myconf=(
+		--enable-static
+		--disable-strip-binaries
+		$(use_enable bitmap-later)
+		$(use_enable debug)
+		$(use_enable debug debug-locks)
+		$(use_enable debug debug-lwp)
+		$(use_enable fuse fuse-client)
+		$(use_enable kauth)
+		$(use_enable modules kernel-module)
+		$(use_enable namei namei-fileserver)
+		$(use_enable ncurses gtx)
+		$(use_enable pthreaded-ubik)
+		$(use_enable supergroups)
+		$(use_enable ubik-read-while-write)
+		$(use_with apidoc dot)
+		$(use_with doc docbook-stylesheets /usr/share/sgml/docbook/xsl-stylesheets)
+		$(use_with kerberos krb5)
+		$(use_with perl swig)
+	)
+
+	# bug #861368
+	filter-lto
+
+	if use debug; then
+		use kauth && myconf+=( --enable-debug-pam )
+		use modules && myconf+=( --enable-debug-kernel )
+	fi
+
+	if use modules; then
+		if use kernel_linux; then
+			if kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
+				myconf+=( --enable-linux-d_splice_alias-extra-iput )
+			fi
+			myconf+=( --with-linux-kernel-headers="${KV_DIR}" \
+					  --with-linux-kernel-build="${KV_OUT_DIR}" )
+		fi
+	fi
+
+	use amd64 && use tsm && myconf+=( --enable-tivoli-tsm )
+
+	local ARCH="$(tc-arch-kernel)"
+	local MY_ARCH="$(tc-arch)"
+	local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC"
+
+	AFS_SYSKVERS=26 \
+	econf "${myconf[@]}"
+
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1
+	local d
+	if use doc; then
+		emake -C doc/xml/AdminGuide auagd000.pdf
+		emake -C doc/xml/AdminRef auarf000.pdf
+		emake -C doc/xml/QuickStartUnix auqbg000.pdf
+		emake -C doc/xml/UserGuide auusg000.pdf
+	fi
+	if use apidoc; then
+		doxygen doc/doxygen/Doxyfile || die "Failed to build doxygen files"
+	fi
+}
+
+src_install() {
+	local OPENRCDIR="${FILESDIR}/openrc"
+	local SYSTEMDDIR="${FILESDIR}/systemd"
+
+	emake DESTDIR="${ED}" install_nolibafs
+
+	if use modules; then
+		if use kernel_linux; then
+			local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
+			[[ -f ${srcdir}/libafs.ko ]] || die "Couldn't find compiled kernel module"
+			linux_domodule ${srcdir}/libafs.ko
+			modules_post_process
+		fi
+	fi
+
+	insinto /etc/openafs
+	doins src/afsd/CellServDB
+	newins "${FILESDIR}/ThisCell.default" ThisCell
+	newins "${FILESDIR}/cacheinfo.default" cacheinfo
+
+	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
+	if use kauth; then
+		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
+	fi
+	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
+
+	# remove kdump stuff provided by kexec-tools #222455
+	rm -rf "${ED}"/usr/sbin/kdump* || die
+
+	# avoid collision with mit_krb5's version of kpasswd
+	if use kauth; then
+		mv "${ED}"/usr/bin/kpasswd{,_afs} || die
+		mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
+	fi
+
+	# avoid collision with heimdal's pagsh
+	if has_version app-crypt/heimdal; then
+		mv "${ED}"/usr/bin/pagsh{,_afs} || die
+		mv "${ED}"/usr/share/man/man1/pagsh{,_afs}.1 || die
+	fi
+
+	# move lwp stuff around #200674 #330061
+	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
+	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
+	# update paths to the relocated lwp headers
+	sed -ri \
+		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
+		"${ED}"/usr/include/*.h \
+		"${ED}"/usr/include/*/*.h \
+		|| die
+
+	# minimal documentation
+	use kauth && doman src/pam/pam_afs.5
+	DOCS=( "${FILESDIR}/README.Gentoo" src/afsd/CellServDB NEWS README )
+
+	# documentation package
+	rm -rf doc/txt/winnotes || die # unneeded docs
+	if use doc; then
+		DOCS+=( doc/{pdf,protocol,txt} CODING CONTRIBUTING )
+		newdoc doc/xml/AdminGuide/auagd000.pdf AdminGuide.pdf
+		newdoc doc/xml/AdminRef/auarf000.pdf AdminRef.pdf
+		newdoc doc/xml/QuickStartUnix/auqbg000.pdf QuickStartUnix.pdf
+		newdoc doc/xml/UserGuide/auusg000.pdf UserGuide.pdf
+	fi
+	use apidoc && DOCS+=( doc/doxygen/output/html )
+	einstalldocs
+
+	# Gentoo related scripts
+	newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
+	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
+	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
+	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
+	dotmpfiles "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
+	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
+	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
+	systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf
+	systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf
+
+	# used directories: client
+	keepdir /etc/openafs
+
+	# used directories: server
+	keepdir /etc/openafs/server
+	diropts -m0700
+	keepdir /var/lib/openafs
+	keepdir /var/lib/openafs/db
+	diropts -m0755
+	keepdir /var/lib/openafs/logs
+
+	# link logfiles to /var/log
+	dosym ../lib/openafs/logs /var/log/openafs
+}
+
+pkg_preinst() {
+	## Somewhat intelligently install default configuration files
+	## (when they are not present)
+	local x
+	for x in cacheinfo CellServDB ThisCell ; do
+		if [[ -e "${EROOT}"/etc/openafs/${x} ]] ; then
+			cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
+		fi
+	done
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod-r1_pkg_postinst
+
+	tmpfiles_process openafs-client.conf
+
+	elog "This installation should work out of the box (at least the"
+	elog "client part doing global afs-cell browsing, unless you had"
+	elog "a previous and different configuration).  If you want to"
+	elog "set up your own cell or modify the standard config,"
+	elog "please have a look at the Gentoo OpenAFS documentation"
+	elog "(warning: it is not yet up to date wrt the new file locations)"
+	elog
+	elog "The documentation can be found at:"
+	elog "  https://wiki.gentoo.org/wiki/OpenAFS"
+	elog
+	elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before"
+	elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited."
+}
+
+pkg_config() {
+	elog "Setting cache options for systemd."
+
+	SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf
+	[[ ! -e "${SERVICED_FILE}" ]] && die "Systemd service.d file ${SERVICED_FILE} not found."
+
+	CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo)
+	[[ -z ${CACHESIZE} ]] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo."
+
+	if [[ ${CACHESIZE} -lt 131070 ]]; then
+		AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50"
+	elif [[ ${CACHESIZE} -lt 524288 ]]; then
+		AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
+	elif [[ ${CACHESIZE} -lt 1048576 ]]; then
+		AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
+	elif [[ ${CACHESIZE} -lt 2209715 ]]; then
+		AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000"
+	else
+		AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000"
+	fi
+
+	# Replace existing env var if exists, else append line
+	grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \
+		sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \
+		sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \
+		die "Updating ${SERVICED_FILE} failed."
+}
diff --git a/net-fs/samba/samba-4.21.1.ebuild b/net-fs/samba/samba-4.21.1.ebuild
index 80aeecc1717a..71fd45394a02 100644
--- a/net-fs/samba/samba-4.21.1.ebuild
+++ b/net-fs/samba/samba-4.21.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
@@ -210,6 +210,9 @@ src_prepare() {
 		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
 		|| die
 
+	# bug #943942
+	append-cflags -std=gnu17
+
 	# WAF
 	multilib_copy_sources
 }
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 2ccaa2a45a9c..fd973c80c40f 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1 +1,2 @@
 DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad
+DIST lftp-4.9.3.tar.gz 3385456 BLAKE2B 10d96a8d10d95ab205b63adb1fa31ffa71ee88aeea6ba1740e4f9e24fbc7499387507cb9a9d6b7025cd8ff05c4d4ac0acc9ddbc5e6d04561ad1a4fc644faf86a SHA512 3168077f065ab71d1c49fda9c6e22ecc67bc0a16c27206c413f2103ba343e0c1364f63a1ee10a4c0f06203cbb9a2a81f94f736f7ef8a3dd667445e17ea75206f
diff --git a/net-ftp/lftp/files/lftp-4.9.3-gnulib.patch b/net-ftp/lftp/files/lftp-4.9.3-gnulib.patch
new file mode 100644
index 000000000000..2d821907f2d7
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.3-gnulib.patch
@@ -0,0 +1,45 @@
+From: Jan Palus <jpalus@fastmail.com>
+Date: Sun, 17 Nov 2024 17:58:42 +0000 (+0100)
+Subject: md5-stream, sha*-stream, sm3-stream: Avoid duplicate symbols.
+X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff_plain;h=353a3236d9328349c18ce2e4e984755cb4a76ea7
+
+md5-stream, sha*-stream, sm3-stream: Avoid duplicate symbols.
+
+* lib/md5-stream.c (GL_OPENSSL_INLINE): Remove definition, that caused
+the symbols defined in md5.o to be defined in md5-stream.o as well.
+* lib/sha1-stream.c (GL_OPENSSL_INLINE): Likewise.
+* lib/sha256-stream.c (GL_OPENSSL_INLINE): Likewise.
+* lib/sha512-stream.c (GL_OPENSSL_INLINE): Likewise.
+* lib/sm3-stream.c (GL_OPENSSL_INLINE): Likewise.
+
+Copyright-paperwork-exempt: Yes
+---
+
+diff --git a/lib/md5-stream.c b/lib/md5-stream.c
+index fdd2bd8b4b..2cbdda6b0f 100644
+--- a/lib/md5-stream.c
++++ b/lib/md5-stream.c
+@@ -22,9 +22,6 @@
+ #include <config.h>
+ 
+ /* Specification.  */
+-#if HAVE_OPENSSL_MD5
+-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
+-#endif
+ #include "md5.h"
+ 
+ #include <stdlib.h>
+diff --git a/lib/sha1-stream.c b/lib/sha1-stream.c
+index cbdf95ab76..b713e678a6 100644
+--- a/lib/sha1-stream.c
++++ b/lib/sha1-stream.c
+@@ -24,9 +24,6 @@
+ #include <config.h>
+ 
+ /* Specification.  */
+-#if HAVE_OPENSSL_SHA1
+-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
+-#endif
+ #include "sha1.h"
+ 
+ #include <stdlib.h>
diff --git a/net-ftp/lftp/lftp-4.9.3.ebuild b/net-ftp/lftp/lftp-4.9.3.ebuild
new file mode 100644
index 000000000000..b7c5e998433f
--- /dev/null
+++ b/net-ftp/lftp/lftp-4.9.3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools libtool xdg-utils
+
+DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
+HOMEPAGE="http://lftp.yar.ru/"
+SRC_URI="https://github.com/lavv17/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="convert-mozilla-cookies +gnutls idn nls socks5 +ssl verify-file"
+RESTRICT="test"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.1:=
+	>=sys-libs/readline-5.1:=
+	dev-libs/expat
+	sys-libs/zlib
+	convert-mozilla-cookies? ( dev-perl/DBI )
+	idn? ( net-dns/libidn2:= )
+	socks5? (
+		>=net-proxy/dante-1.1.12
+		sys-libs/pam
+	)
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-1.2.3:0= )
+		!gnutls? ( dev-libs/openssl:0= )
+	)
+	verify-file? (
+		dev-perl/String-CRC32
+		virtual/perl-Digest-MD5
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+	=dev-build/libtool-2*
+	app-arch/xz-utils
+	nls? ( >=sys-devel/gettext-0.21 )
+	virtual/pkgconfig
+"
+
+DOCS=(
+	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
+	README.dnssec README.modules THANKS TODO
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
+	"${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch
+	"${FILESDIR}"/${PN}-4.9.2-socks.patch
+	"${FILESDIR}"/${PN}-4.9.3-gnulib.patch
+)
+
+# Gnulib false positive #900064
+QA_CONFIG_IMPL_DECL_SKIP="( MIN )"
+
+src_prepare() {
+	default
+
+	# bug #875692
+	sed -e '/#include/s/cmath/math.h/' -i trio/*.c || die
+
+	eautoreconf
+
+	elibtoolize # for Darwin bundles
+
+	# bug #536036
+	printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with idn libidn2) \
+		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
+		$(usex ssl "$(use_with !gnutls openssl "${EPREFIX}"/usr)" '--without-openssl') \
+		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
+		--enable-ipv6 \
+		--enable-packager-mode \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--with-modules \
+		--with-readline="${EPREFIX}"/usr \
+		--without-included-regex
+}
+
+src_install() {
+	default
+
+	local script
+	for script in {convert-mozilla-cookies,verify-file}; do
+		use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
+	done
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index 4eeb8cb7874b..a5e731f6531e 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools git-r3 libtool xdg-utils
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
@@ -10,7 +11,6 @@ EGIT_REPO_URI="https://github.com/lavv17/lftp"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
 IUSE="convert-mozilla-cookies +gnutls idn nls socks5 +ssl verify-file"
 
 RDEPEND="
@@ -36,10 +36,9 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
-	dev-libs/gnulib
 	=dev-build/libtool-2*
 	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.19 )
+	nls? ( >=sys-devel/gettext-0.21 )
 	virtual/pkgconfig
 "
 
@@ -47,14 +46,18 @@ DOCS=(
 	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
 	README.dnssec README.modules THANKS TODO
 )
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
+	"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch
 	"${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
 	"${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch
 	"${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch
 	"${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
 	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
 	"${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch
+	"${FILESDIR}"/${PN}-4.9.2-socks.patch
+	"${FILESDIR}"/${PN}-4.9.3-gnulib.patch
 )
 
 # Gnulib false positive #900064
@@ -66,12 +69,12 @@ src_prepare() {
 	# bug #875692
 	sed -e '/#include/s/cmath/math.h/' -i trio/*.c || die
 
-	gnulib-tool --update || die
-
-	chmod +x build-aux/git-version-gen || die
-
 	eautoreconf
+
 	elibtoolize # for Darwin bundles
+
+	# bug #536036
+	printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die
 }
 
 src_configure() {
@@ -81,7 +84,7 @@ src_configure() {
 		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
 		$(usex ssl "$(use_with !gnutls openssl "${EPREFIX}"/usr)" '--without-openssl') \
 		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
-		--enable-ipv6
+		--enable-ipv6 \
 		--enable-packager-mode \
 		--sysconfdir="${EPREFIX}"/etc/${PN} \
 		--with-modules \
@@ -90,8 +93,7 @@ src_configure() {
 }
 
 src_install() {
-	# FIXME: MKDIR_P is not getting picked up in po/Makefile
-	emake DESTDIR="${D}" mkdir_p="mkdir -p" install
+	default
 
 	local script
 	for script in {convert-mozilla-cookies,verify-file}; do
diff --git a/net-im/dino/dino-0.4.4-r3.ebuild b/net-im/dino/dino-0.4.4-r3.ebuild
new file mode 100644
index 000000000000..aa0695a944b6
--- /dev/null
+++ b/net-im/dino/dino-0.4.4-r3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake vala xdg readme.gentoo-r1
+
+DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
+HOMEPAGE="https://dino.im"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+gpg +http +omemo +notification-sound +rtp test"
+RESTRICT="!test? ( test )"
+
+MY_REPO_URI="https://github.com/dino/dino"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="${MY_REPO_URI}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm64"
+	SRC_URI="${MY_REPO_URI}/releases/download/v${PV}/${P}.tar.gz"
+fi
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/icu:=
+	dev-libs/libgee:0.8=
+	gui-libs/gtk:4
+	>=gui-libs/libadwaita-1.2.0:1[vala]
+	media-libs/graphene
+	net-libs/glib-networking
+	net-libs/gnutls:=
+	>=net-libs/libnice-0.1.15
+	net-libs/libsignal-protocol-c
+	net-libs/libsrtp:2=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	gpg? ( app-crypt/gpgme:= )
+	http? ( net-libs/libsoup:2.4 )
+	notification-sound? ( media-libs/libcanberra:0[sound(+)] )
+	omemo? (
+		dev-libs/libgcrypt:=
+		media-gfx/qrencode:=
+	)
+	rtp? (
+		media-libs/gst-plugins-base:1.0
+		media-libs/gstreamer:1.0
+		media-libs/webrtc-audio-processing:0
+	)
+"
+DEPEND="${RDEPEND}
+	media-libs/gst-plugins-base
+	media-libs/gstreamer
+"
+BDEPEND="
+	sys-devel/gettext
+	$(vala_depend)
+"
+
+src_configure() {
+	vala_setup
+
+	local disabled_plugins=(
+		$(usex gpg "" "openpgp")
+		$(usex omemo "" "omemo")
+		$(usex http  "" "http-files")
+		$(usex rtp "" rtp)
+	)
+	local enabled_plugins=(
+		$(usex notification-sound "notification-sound" "")
+	)
+	local mycmakeargs=(
+		"-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")"
+		"-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")"
+		"-DVALA_EXECUTABLE=${VALAC}"
+		# libsoup-2 for bug #948374
+		# dino -> libnice[upnp] -> gupnp-igd:0 -> gupnp:0 -> libsoup:2.4
+		"-DSOUP_VERSION=2"
+		"-DBUILD_TESTS=$(usex test)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	"${BUILD_DIR}"/xmpp-vala-test || die
+}
+
+src_install() {
+	cmake_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-9999.ebuild
index f072fcc344e7..aa0695a944b6 100644
--- a/net-im/dino/dino-9999.ebuild
+++ b/net-im/dino/dino-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
@@ -76,6 +76,8 @@ src_configure() {
 		"-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")"
 		"-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")"
 		"-DVALA_EXECUTABLE=${VALAC}"
+		# libsoup-2 for bug #948374
+		# dino -> libnice[upnp] -> gupnp-igd:0 -> gupnp:0 -> libsoup:2.4
 		"-DSOUP_VERSION=2"
 		"-DBUILD_TESTS=$(usex test)"
 	)
diff --git a/net-im/discord/Manifest b/net-im/discord/Manifest
index b61c519bd737..4523f4ac6d57 100644
--- a/net-im/discord/Manifest
+++ b/net-im/discord/Manifest
@@ -1 +1 @@
-DIST discord-0.0.78.tar.gz 101827838 BLAKE2B d4d0da431c9ee83dcb44f8bfd1776235952a9f91a631e279d7af2b4aeedae4ab419486b703bdb88ee286a7abc7d7a424356f2433b8ae7f6c07db1c6c8fb2061d SHA512 a0f1ad6f8e28e6ef014f7e5659fd20fe11eece13f2d7e453baa8ae0d65c8b2758e26510964108fe28e23ccd8b3e6dc64b97d2fa7394637d0463d7d529fbe944e
+DIST discord-0.0.80.tar.gz 101822457 BLAKE2B 8d9fb0dd27bd29bbf2a9c0352beb6cefc1fb31f3918c0e9e11ae507855975645d0aa41977010413bcb4b2e2cd6895a25d551b3a8084d32236bb4b4507638edfb SHA512 c23cc93c91986e619113a8e772b67904ad72240897527e538174353ede805abe4c3fd9a1376cd1cef192bb0c6c49e29f80f735a8590319412d3297e2a4d220a9
diff --git a/net-im/discord/discord-0.0.78.ebuild b/net-im/discord/discord-0.0.78.ebuild
deleted file mode 100644
index 1af370033bc8..000000000000
--- a/net-im/discord/discord-0.0.78.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN/-bin/}"
-MY_PV="${PV/-r*/}"
-
-CHROMIUM_LANGS="
-	af am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
-	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
-	sw ta te th tr uk ur vi zh-CN zh-TW
-"
-
-inherit chromium-2 desktop linux-info optfeature unpacker xdg
-
-DESCRIPTION="All-in-one voice and text chat for gamers"
-HOMEPAGE="https://discord.com/"
-SRC_URI="https://dl.discordapp.net/apps/linux/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${MY_PN^}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE="appindicator +seccomp wayland"
-RESTRICT="bindist mirror strip test"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/mesa[gbm(+)]
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-	appindicator? ( dev-libs/libayatana-appindicator )
-"
-
-DESTDIR="/opt/${MY_PN}"
-
-QA_PREBUILT="*"
-
-CONFIG_CHECK="~USER_NS"
-
-src_unpack() {
-	unpack ${MY_PN}-${MY_PV}.tar.gz
-}
-
-src_configure() {
-	default
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	default
-	# remove post-install script
-	rm postinst.sh || die "the removal of the unneeded post-install script failed"
-	# cleanup languages
-	pushd "locales/" >/dev/null || die "location change for language cleanup failed"
-	chromium_remove_language_paks
-	popd >/dev/null || die "location reset for language cleanup failed"
-
-	# fix .desktop exec location
-	sed --in-place --expression "/^Exec=/s:/usr/share/discord/Discord:/usr/bin/${MY_PN}:" \
-		"${MY_PN}.desktop" ||
-		die "fixing of exec location on .desktop failed"
-
-	# Update exec location in launcher
-	sed --expression "s:@@DESTDIR@@:${DESTDIR}:" \
-		"${FILESDIR}/launcher.sh" > "${T}/launcher.sh" || die "updating of exec location in launcher failed"
-
-	# USE seccomp in launcher
-	if use seccomp; then
-		sed --in-place --expression '/^EBUILD_SECCOMP=/s/false/true/' \
-			"${T}/launcher.sh" || die "sed failed for seccomp"
-	fi
-
-	# USE wayland in launcher
-	if use wayland; then
-		sed --in-place --expression '/^EBUILD_WAYLAND=/s/false/true/' \
-			"${T}/launcher.sh" || die "sed failed for wayland"
-	fi
-}
-
-src_install() {
-	doicon -s 256 "${MY_PN}.png"
-
-	# install .desktop file
-	domenu "${MY_PN}.desktop"
-
-	exeinto "${DESTDIR}"
-
-	doexe "${MY_PN^}" chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so
-
-	insinto "${DESTDIR}"
-	doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat resources.pak snapshot_blob.bin v8_context_snapshot.bin
-	insopts -m0755
-	doins -r locales resources
-
-	# Chrome-sandbox requires the setuid bit to be specifically set.
-	# see https://github.com/electron/electron/issues/17972
-	fowners root "${DESTDIR}/chrome-sandbox"
-	fperms 4711 "${DESTDIR}/chrome-sandbox"
-
-	# Crashpad is included in the package once in a while and when it does, it must be installed.
-	# See #903616 and #890595
-	[[ -x chrome_crashpad_handler ]] && doins chrome_crashpad_handler
-
-	exeinto "/usr/bin"
-	newexe "${T}/launcher.sh" "discord" || die "failing to install launcher"
-
-	# https://bugs.gentoo.org/898912
-	if use appindicator; then
-		dosym ../../usr/lib64/libayatana-appindicator3.so /opt/discord/libappindicator3.so
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature_header "Install the following packages for additional support:"
-	optfeature "sound support" \
-		media-sound/pulseaudio media-sound/apulse[sdk] media-video/pipewire
-	optfeature "emoji support" media-fonts/noto-emoji
-}
diff --git a/net-im/discord/discord-0.0.80.ebuild b/net-im/discord/discord-0.0.80.ebuild
new file mode 100644
index 000000000000..a62e1b060922
--- /dev/null
+++ b/net-im/discord/discord-0.0.80.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN/-bin/}"
+MY_PV="${PV/-r*/}"
+
+CHROMIUM_LANGS="
+	af am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+	sw ta te th tr uk ur vi zh-CN zh-TW
+"
+
+inherit chromium-2 desktop linux-info optfeature unpacker xdg
+
+DESCRIPTION="All-in-one voice and text chat for gamers"
+HOMEPAGE="https://discord.com/"
+SRC_URI="https://dl.discordapp.net/apps/linux/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${MY_PN^}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="amd64"
+
+IUSE="appindicator +seccomp wayland"
+RESTRICT="bindist mirror strip test"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/mesa[gbm(+)]
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+	appindicator? ( dev-libs/libayatana-appindicator )
+"
+
+DESTDIR="/opt/${MY_PN}"
+
+QA_PREBUILT="*"
+
+CONFIG_CHECK="~USER_NS"
+
+src_unpack() {
+	unpack ${MY_PN}-${MY_PV}.tar.gz
+}
+
+src_configure() {
+	default
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	default
+	# remove post-install script
+	rm postinst.sh || die "the removal of the unneeded post-install script failed"
+	# cleanup languages
+	pushd "locales/" >/dev/null || die "location change for language cleanup failed"
+	chromium_remove_language_paks
+	popd >/dev/null || die "location reset for language cleanup failed"
+
+	# fix .desktop exec location
+	sed --in-place --expression "/^Exec=/s:/usr/share/discord/Discord:/usr/bin/${MY_PN}:" \
+		"${MY_PN}.desktop" ||
+		die "fixing of exec location on .desktop failed"
+
+	# Update exec location in launcher
+	sed --expression "s:@@DESTDIR@@:${DESTDIR}:" \
+		"${FILESDIR}/launcher.sh" > "${T}/launcher.sh" || die "updating of exec location in launcher failed"
+
+	# USE seccomp in launcher
+	if use seccomp; then
+		sed --in-place --expression '/^EBUILD_SECCOMP=/s/false/true/' \
+			"${T}/launcher.sh" || die "sed failed for seccomp"
+	fi
+
+	# USE wayland in launcher
+	if use wayland; then
+		sed --in-place --expression '/^EBUILD_WAYLAND=/s/false/true/' \
+			"${T}/launcher.sh" || die "sed failed for wayland"
+	fi
+}
+
+src_install() {
+	doicon -s 256 "${MY_PN}.png"
+
+	# install .desktop file
+	domenu "${MY_PN}.desktop"
+
+	exeinto "${DESTDIR}"
+
+	doexe "${MY_PN^}" chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so
+
+	insinto "${DESTDIR}"
+	doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat resources.pak snapshot_blob.bin v8_context_snapshot.bin
+	insopts -m0755
+	doins -r locales resources
+
+	# Chrome-sandbox requires the setuid bit to be specifically set.
+	# see https://github.com/electron/electron/issues/17972
+	fowners root "${DESTDIR}/chrome-sandbox"
+	fperms 4711 "${DESTDIR}/chrome-sandbox"
+
+	# Crashpad is included in the package once in a while and when it does, it must be installed.
+	# See #903616 and #890595
+	[[ -x chrome_crashpad_handler ]] && doins chrome_crashpad_handler
+
+	exeinto "/usr/bin"
+	newexe "${T}/launcher.sh" "discord" || die "failing to install launcher"
+
+	# https://bugs.gentoo.org/898912
+	if use appindicator; then
+		dosym ../../usr/lib64/libayatana-appindicator3.so /opt/discord/libappindicator3.so
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature_header "Install the following packages for additional support:"
+	optfeature "sound support" \
+		media-sound/pulseaudio media-sound/apulse[sdk] media-video/pipewire
+	optfeature "emoji support" media-fonts/noto-emoji
+}
diff --git a/net-im/fractal/Manifest b/net-im/fractal/Manifest
index f3eb072cda29..ef46d6ca4b80 100644
--- a/net-im/fractal/Manifest
+++ b/net-im/fractal/Manifest
@@ -1,4 +1,10 @@
+DIST fractal-10.beta.tar.bz2 1964153 BLAKE2B 638525c3d177c53021c63656a74a8616e725bc2f971fe2c2a4412f45c5bbd48b76d859d6a6fc50b39141409c6429bd0bc794c155bfbbab9e0f793805df285940 SHA512 286b59500c6db5c4293e5b947e0f028a9b2c689984627ac59b642cfcefb8c299a994564b1266b3fb43172298d4b53325bee971f5ab93e56a50a5c6f630654192
+DIST fractal-10.rc.tar.bz2 1982345 BLAKE2B b3435fd6fc4f3d2363e2eaac7dc3a42cfba9e0ffc94ed910b0efa73f900b8378ced8b3445dc88dd7f137971683e9be4a87cc3ceb5b53b158515f80e32f713091 SHA512 06b3b6c05d7988d324b18bcb3a454b941b8a42e0975a4e295dac661fbae096e48bde7e67f1c31783c245a4a5b308a5a8cc891a81a977b8c9c7c32bff10cb4045
+DIST fractal-10_beta-crates.tar.xz 47757844 BLAKE2B 4946bd3f60b4025617281de4e418ba77bd8868163f37c66207509b475954b19362e589ed24994c089c5ccb6001a74b40c3bcf40998e92a15cf3d55eec385828a SHA512 e38110e9bcd3deac70a0a959d387f9d1fc6a0bcf94bbd4cf70520183a753ca6f4de42d0bcea00ae4f951fe7ae4982a450e01930156ec0329b12e0caaa995471c
+DIST fractal-10_rc-crates.tar.xz 46451468 BLAKE2B 5ffadfeec0e19ada66785d9413716a7fe8e110efc0349246b87cbf460d2866f041b676811e7dbce2ebff33bd4a4cc58f9980b5b4d4d401e845b27ad4cb481324 SHA512 fb39271f2aac25ce8791e6a4693a5c4ee91b83e613cdba439a7ffd6588a0d6e167f12a85b146c72ee711278b752651514cb28db02b0f90978d7b8d9be7cea754
 DIST fractal-8.tar.bz2 1860423 BLAKE2B d6b0b0a8f479d7ceda4c40bd9eb677ef01abf8304ebd4ba8d15bc96557c78ec84af37fbca241feec3e85b3ef3b4ae6bc7564a40c5232830b43b03cd73e6fe9f4 SHA512 cae1e9f85fb570a075ceb88c115d5ce8169a3c38920765e46fd0f92e6c962a2377338e330d54cf3944903828db1c0c50c51ff4de2a079b34a478248485aad952
 DIST fractal-8_rc-crates.tar.xz 49000316 BLAKE2B b9c68668e762563a06ba176e23b76fab23ba97e61e48c01ad18e063426fc906c20c559a0f812fa08871b916156d3374b9308390f950e3dd1fa56ab270f8d283e SHA512 8c855aae2fbddbe2c186b6e1c0ef269ab1ced6c5ea1f3e7270681d6523549569aa6ccab91cbc803b1322d5115d9c8cda0df75d8eef9db559f10834d542454723
 DIST matrix-rust-sdk-92b4c2a469f507696fa9db3d6bdb000a761e2694.gh.tar.gz 2220737 BLAKE2B df740551e28e0651447dd3f3404b9e3aa2a871acaecbfb7774a5ea62c45b89b4ddfd347fa5d1975c22874e8f629a645e6fcd8d69b14de4c4e22723b47d217755 SHA512 f2f44cc3119666a7cc3382ba95b44b757ce9ef193a004aa4423ccbe51dbcafa6ecfbab6f90f2a274e88b06cd07e45c03c357877aa36e8626f67ae04c8586e328
+DIST matrix-rust-sdk-9514388108c7007cbdc822c582d26ad9e89af5d9.gh.tar.gz 2506236 BLAKE2B 2e30d002da8c4c53d4494af2933ac8e3ed116f8edcfd84f29a130aeaf4a04603d6a5c453ce2e34cc8879291c584c22bdef4dfdec576d4bcd3686e6e3147d45e0 SHA512 0fff84a263e733105d381adcd452a4c277ba561926c6cddb023e4620abdf37e488e28888e4343d968b0fb49bdd881e395c6f187c2ba1bcc70781879a36e55366
 DIST ruma-4d3d8b46fd519012e4585ccf00dbea1eb602c028.gh.tar.gz 692921 BLAKE2B 3d06096f41327351e462628d1218c9031a10f3d3dd661dc2a2008ed37001cad649dd5f081316ca4eba7acc715c6eba91576532ea62ab94c8915ec697992f9390 SHA512 6193005c1e5224f4e903f00c4086091161239b2980c88dc23c666840fb72d61b336339909cb7efb4f9f14d151a8172fb8b0ecaf162df3a0094edccf97d616fe4
+DIST ruma-b266343136e8470a7d040efc207e16af0c20d374.gh.tar.gz 740485 BLAKE2B a96fe3a41449de40e2d95fe4b1995f73e1119d1c10de562c584e23694fe7141b65f6a5efa557435b125a38052fd8b37a4b683c84a3b13ec8e5749d0b3d8d9d54 SHA512 87649cbd78550f3e3936610eb57470fd6af8cf890a8aec7a4859387226e3048f5faf4ce72070775df627d2edbffc8e086c10a307ff4942874878aa103e989abe
diff --git a/net-im/fractal/fractal-10_beta.ebuild b/net-im/fractal/fractal-10_beta.ebuild
new file mode 100644
index 000000000000..41a24ef3ea58
--- /dev/null
+++ b/net-im/fractal/fractal-10_beta.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+RUST_MIN_VER="1.82.0"
+
+inherit cargo gnome2-utils meson
+
+MY_P=${P/_/.}
+CRATE_P=fractal-${PV}
+
+DESCRIPTION="Matrix messaging app for GNOME written in Rust"
+HOMEPAGE="
+	https://wiki.gnome.org/Apps/Fractal
+	https://gitlab.gnome.org/World/fractal/
+"
+SRC_URI="
+	https://gitlab.gnome.org/World/fractal/-/archive/${PV/_/.}/${MY_P}.tar.bz2
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/${CRATE_P}-crates.tar.xz
+	"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3+"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0 ISC
+	MIT MPL-2.0 MPL-2.0 Unicode-3.0 ZLIB
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-libs/glib-2.82
+	>=gui-libs/gtk-4.16:4
+	>=gui-libs/libadwaita-1.6:1
+
+	>=media-libs/gstreamer-1.20:1.0
+	>=media-libs/gst-plugins-bad-1.20:1.0
+	>=media-libs/gst-plugins-base-1.20:1.0
+
+	>=gui-libs/gtksourceview-5.0.0:5
+	>=media-video/pipewire-0.3.0:=[gstreamer]
+	>=media-libs/libwebp-1.0.0:=
+	>=dev-libs/openssl-1.0.1:=
+	>=media-libs/libshumate-1.2:1.0
+	>=dev-db/sqlite-3.24.0:3
+	>=sys-apps/xdg-desktop-portal-1.14.1
+
+	>=media-libs/lcms-2.12.0:2
+	>=sys-libs/libseccomp-2.5.0:=
+
+"
+RDEPEND="
+	${DEPEND}
+	media-libs/glycin-loaders
+	virtual/secret-service
+"
+# clang needed by bindgen
+BDEPEND="
+	llvm-core/clang
+	dev-lang/grass
+"
+
+# Rust
+QA_FLAGS_IGNORED="usr/bin/fractal"
+
+src_prepare() {
+	default
+
+	# upstream dev settings are insane
+	sed -i -e 's:profile\.dev:ignored.insanity:' Cargo.toml || die
+}
+
+src_configure() {
+	local mymesonargs=(
+		#-Ddisable-glycin-sandbox=true
+	)
+
+	meson_src_configure
+	ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-im/fractal/fractal-10_rc-r1.ebuild b/net-im/fractal/fractal-10_rc-r1.ebuild
new file mode 100644
index 000000000000..432f1735f3d2
--- /dev/null
+++ b/net-im/fractal/fractal-10_rc-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[matrix-sdk-base]='https://github.com/matrix-org/matrix-rust-sdk;9514388108c7007cbdc822c582d26ad9e89af5d9;matrix-rust-sdk-%commit%/crates/matrix-sdk-base'
+	[matrix-sdk-common]='https://github.com/matrix-org/matrix-rust-sdk;9514388108c7007cbdc822c582d26ad9e89af5d9;matrix-rust-sdk-%commit%/crates/matrix-sdk-common'
+	[matrix-sdk-crypto]='https://github.com/matrix-org/matrix-rust-sdk;9514388108c7007cbdc822c582d26ad9e89af5d9;matrix-rust-sdk-%commit%/crates/matrix-sdk-crypto'
+	[matrix-sdk-indexeddb]='https://github.com/matrix-org/matrix-rust-sdk;9514388108c7007cbdc822c582d26ad9e89af5d9;matrix-rust-sdk-%commit%/crates/matrix-sdk-indexeddb'
+	[matrix-sdk-qrcode]='https://github.com/matrix-org/matrix-rust-sdk;9514388108c7007cbdc822c582d26ad9e89af5d9;matrix-rust-sdk-%commit%/crates/matrix-sdk-qrcode'
+	[matrix-sdk-sqlite]='https://github.com/matrix-org/matrix-rust-sdk;9514388108c7007cbdc822c582d26ad9e89af5d9;matrix-rust-sdk-%commit%/crates/matrix-sdk-sqlite'
+	[matrix-sdk-store-encryption]='https://github.com/matrix-org/matrix-rust-sdk;9514388108c7007cbdc822c582d26ad9e89af5d9;matrix-rust-sdk-%commit%/crates/matrix-sdk-store-encryption'
+	[matrix-sdk-ui]='https://github.com/matrix-org/matrix-rust-sdk;9514388108c7007cbdc822c582d26ad9e89af5d9;matrix-rust-sdk-%commit%/crates/matrix-sdk-ui'
+	[matrix-sdk]='https://github.com/matrix-org/matrix-rust-sdk;9514388108c7007cbdc822c582d26ad9e89af5d9;matrix-rust-sdk-%commit%/crates/matrix-sdk'
+	[ruma-client-api]='https://github.com/ruma/ruma;b266343136e8470a7d040efc207e16af0c20d374;ruma-%commit%/crates/ruma-client-api'
+	[ruma-common]='https://github.com/ruma/ruma;b266343136e8470a7d040efc207e16af0c20d374;ruma-%commit%/crates/ruma-common'
+	[ruma-events]='https://github.com/ruma/ruma;b266343136e8470a7d040efc207e16af0c20d374;ruma-%commit%/crates/ruma-events'
+	[ruma-federation-api]='https://github.com/ruma/ruma;b266343136e8470a7d040efc207e16af0c20d374;ruma-%commit%/crates/ruma-federation-api'
+	[ruma-html]='https://github.com/ruma/ruma;b266343136e8470a7d040efc207e16af0c20d374;ruma-%commit%/crates/ruma-html'
+	[ruma-identifiers-validation]='https://github.com/ruma/ruma;b266343136e8470a7d040efc207e16af0c20d374;ruma-%commit%/crates/ruma-identifiers-validation'
+	[ruma-macros]='https://github.com/ruma/ruma;b266343136e8470a7d040efc207e16af0c20d374;ruma-%commit%/crates/ruma-macros'
+	[ruma]='https://github.com/ruma/ruma;b266343136e8470a7d040efc207e16af0c20d374;ruma-%commit%/crates/ruma'
+)
+
+RUST_MIN_VER="1.82.0"
+
+inherit cargo gnome2-utils meson
+
+MY_P=${P/_/.}
+CRATE_P=fractal-${PV}
+
+DESCRIPTION="Matrix messaging app for GNOME written in Rust"
+HOMEPAGE="
+	https://wiki.gnome.org/Apps/Fractal
+	https://gitlab.gnome.org/World/fractal/
+"
+SRC_URI="
+	https://gitlab.gnome.org/World/fractal/-/archive/${PV/_/.}/${MY_P}.tar.bz2
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/${CRATE_P}-crates.tar.xz
+	"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3+"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0 ISC
+	MIT MPL-2.0 MPL-2.0 Unicode-3.0 ZLIB
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-libs/glib-2.82
+	>=gui-libs/gtk-4.16:4
+	>=gui-libs/libadwaita-1.6:1
+
+	>=media-libs/gstreamer-1.20:1.0
+	>=media-libs/gst-plugins-bad-1.20:1.0
+	>=media-libs/gst-plugins-base-1.20:1.0
+	>=media-plugins/gst-plugin-gtk4-0.13.0:1.0
+
+	>=gui-libs/gtksourceview-5.0.0:5
+	>=media-video/pipewire-0.3.0:=[gstreamer]
+	>=media-libs/libwebp-1.0.0:=
+	>=dev-libs/openssl-1.0.1:=
+	>=media-libs/libshumate-1.2:1.0
+	>=dev-db/sqlite-3.24.0:3
+	>=sys-apps/xdg-desktop-portal-1.14.1
+
+	>=media-libs/lcms-2.12.0:2
+	>=sys-libs/libseccomp-2.5.0:=
+
+"
+RDEPEND="
+	${DEPEND}
+	media-libs/glycin-loaders
+	virtual/secret-service
+"
+# clang needed by bindgen
+BDEPEND="
+	llvm-core/clang
+	dev-lang/grass
+"
+
+# Rust
+QA_FLAGS_IGNORED="usr/bin/fractal"
+
+src_prepare() {
+	default
+
+	# ignore upstream settings, they force debug symbols for release
+	# and disable them for dev builds
+	sed -i -e 's:profile\.:ignored.&:' Cargo.toml || die
+
+	# force linking against libwebp dynamically
+	# https://github.com/NoXF/libwebp-sys/issues/17
+	cat > "${ECARGO_VENDOR}/libwebp-sys-0.9.6/build.rs" <<-EOF || die
+		fn main() {
+			println!("cargo:rustc-link-lib=dylib=webp");
+		}
+	EOF
+}
+
+src_configure() {
+	local mymesonargs=(
+		#-Ddisable-glycin-sandbox=true
+	)
+
+	meson_src_configure
+	ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-im/fractal/fractal-8-r1.ebuild b/net-im/fractal/fractal-8-r1.ebuild
index 238aa81303d1..e138b3cda8df 100644
--- a/net-im/fractal/fractal-8-r1.ebuild
+++ b/net-im/fractal/fractal-8-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
@@ -73,7 +73,7 @@ DEPEND="
 	>=gui-libs/gtksourceview-5.0.0:5
 	>=media-video/pipewire-0.3.0:=[gstreamer]
 	>=dev-libs/openssl-1.0.1:=
-	>=media-libs/libshumate-1.0.0:1.0
+	>=media-libs/libshumate-1.2:1.0
 	>=dev-db/sqlite-3.24.0:3
 	>=sys-apps/xdg-desktop-portal-1.14.1
 "
diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest
index 38c91f22fbcf..e27c3584ce8a 100644
--- a/net-im/neochat/Manifest
+++ b/net-im/neochat/Manifest
@@ -1,2 +1,2 @@
 DIST neochat-24.08.3.tar.xz 1031148 BLAKE2B 53684fc75f95441dfec80dc3e50837d309241ecaad3d868ec4772bdb83a35e6763c351346f3c7e44e392fb216dc21025a59b3013cac930fa84dac82496019b52 SHA512 a1a6cc6d1b7fc2126aeb800ed64546f9414e1ab6759d92452dcfba22ffc00a9903b3097b6d474f2aef85da351c07cf8d734b2e8a573abbea0482caf74c4566bf
-DIST neochat-24.12.0.tar.xz 1063468 BLAKE2B ac1232dcb8e9598f15446383117991eeac5d3cf5d97338ba2feed537df855710b63ad789d820d667721a01470fa246cb98a157a3c039c1efa5de3e2f1a373cde SHA512 aae8805e07fdbb43da8af20f6651aa0623dd3f3efd9e4d93b0cca081a78264907d7d475a7e7abf5e63c00661767d9aabbea6cb92e2ddd80fa1169faeb334651c
+DIST neochat-24.12.1.tar.xz 1063988 BLAKE2B 9a2d5f5523f3e8f73e05a80ab81c982528d098b6a3aeed6cbdbb9a7e5e539e220ecb9416aa83cb94c80c8a661a8492e1fa99c7f850ba899a7eb25696b72cf657 SHA512 35a67bb9a876c4a4a0e5374905a5846205e72dcbcd90bb8feec984455b1bd299de061d00137bb3b68c4d92a1aa9acc1d2096d86dc87f1455ea553c49cf8dffc6
diff --git a/net-im/neochat/neochat-24.12.0.ebuild b/net-im/neochat/neochat-24.12.0.ebuild
deleted file mode 100644
index 5e3a5b00f578..000000000000
--- a/net-im/neochat/neochat-24.12.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Client for Matrix, the decentralized communication protocol"
-HOMEPAGE="https://apps.kde.org/neochat/"
-
-LICENSE="GPL-3+ handbook? ( CC-BY-SA-4.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-# TODO: Wire up kunifiedpush once packaged? (1a3055df8673802076bc0c269ec24274abef375b)
-DEPEND="
-	app-text/cmark:=
-	dev-libs/kirigami-addons:6
-	>=dev-libs/icu-61.0:=
-	dev-libs/qcoro[network]
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtmultimedia-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=dev-qt/qtwebview-${QTMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6[qml]
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/purpose-${KFMIN}:6
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6[qml]
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
-	media-libs/kquickimageeditor:6
-	>=net-libs/libquotient-0.9.0:=
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qt5compat-${QTMIN}:6[qml]
-	>=dev-qt/qtlocation-${QTMIN}:6
-	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
-	>=dev-qt/qtpositioning-${QTMIN}:6[qml]
-	>=kde-frameworks/kquickcharts-${KFMIN}:6
-	>=kde-frameworks/prison-${KFMIN}:6[qml]
-"
-BDEPEND="virtual/pkgconfig"
-
-CMAKE_SKIP_TESTS=(
-	# bug 938530, i18n bs
-	eventhandlertest
-	# bug 909816, tries access /proc/PID/mem
-	texthandlertest # ki18n (KLocalizedString) failure
-)
diff --git a/net-im/neochat/neochat-24.12.1.ebuild b/net-im/neochat/neochat-24.12.1.ebuild
new file mode 100644
index 000000000000..00e62de3356c
--- /dev/null
+++ b/net-im/neochat/neochat-24.12.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Client for Matrix, the decentralized communication protocol"
+HOMEPAGE="https://apps.kde.org/neochat/"
+
+LICENSE="GPL-3+ handbook? ( CC-BY-SA-4.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+# TODO: Wire up kunifiedpush once packaged? (1a3055df8673802076bc0c269ec24274abef375b)
+DEPEND="
+	app-text/cmark:=
+	dev-libs/kirigami-addons:6
+	>=dev-libs/icu-61.0:=
+	dev-libs/qcoro[network]
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwebview-${QTMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6[qml]
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/purpose-${KFMIN}:6
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6[qml]
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+	media-libs/kquickimageeditor:6
+	>=net-libs/libquotient-0.9.0:=
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtlocation-${QTMIN}:6
+	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+	>=dev-qt/qtpositioning-${QTMIN}:6[qml]
+	>=kde-frameworks/kquickcharts-${KFMIN}:6
+	>=kde-frameworks/prison-${KFMIN}:6[qml]
+"
+BDEPEND="virtual/pkgconfig"
+
+CMAKE_SKIP_TESTS=(
+	# bug 938530, i18n bs
+	eventhandlertest
+	# bug 909816, tries access /proc/PID/mem
+	texthandlertest # ki18n (KLocalizedString) failure
+)
diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
index f396862e2e46..0cd06a7ee1ca 100644
--- a/net-im/openmittsu/Manifest
+++ b/net-im/openmittsu/Manifest
@@ -1 +1,2 @@
 DIST openmittsu-0.10.0.0.tar.xz 2345724 BLAKE2B 407fe07147b17e6ac6ec2381e77256d09824fce87f1d9d141d2940e566191e911b05fb3d6701d342be9bb667551903f4f8913cbb25f504100e92ab4a38339555 SHA512 d4334c8516efcd63a3e9dfcf9f9655922aa14b2574f39269cf7019a8c951144569138c2a0a75abb16e2746a33002f0c07ef6c86dbdb5405e11c315ec630eb0d0
+DIST openmittsu-0.10.1.0.tar.xz 2272080 BLAKE2B bf91a5d2cdaadc002c1db0bb86246c6ae47809eace96ebabcc963875d2d5ce0f21f9a53e2cbd230335647cbad08a0d6e73ef57157e71a3b66e42d1493bebb07d SHA512 fb612b79b9de7224690c2a7ce4235e72c9aa60da6e89e578c0fef23cb2093bd88798edd90885cf3dc4d8ce61e5ec5aeb66b0066c2666132fc3f0989f8fef066c
diff --git a/net-im/openmittsu/files/openmittsu-0.10.0.0-root-cert.pem b/net-im/openmittsu/files/openmittsu-0.10.0.0-root-cert.pem
new file mode 100644
index 000000000000..b1cf1fd3a13b
--- /dev/null
+++ b/net-im/openmittsu/files/openmittsu-0.10.0.0-root-cert.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNl
+eSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMT
+JVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMjAx
+MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+Ck5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVUaGUg
+VVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqflo
+I+d61SRvU8Za2EurxtW20eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinng
+o4N+LZfQYcTxmdwlkWOrfzCjtHDix6EznPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0G
+A1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBBHU6+4WMB
+zzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbW
+RNZu9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
+-----END CERTIFICATE-----
diff --git a/net-im/openmittsu/metadata.xml b/net-im/openmittsu/metadata.xml
index 10e4ea021b98..fc8749e96557 100644
--- a/net-im/openmittsu/metadata.xml
+++ b/net-im/openmittsu/metadata.xml
@@ -4,4 +4,7 @@
 <maintainer type="person">
   <email>ulm@gentoo.org</email>
 </maintainer>
+<upstream>
+  <remote-id type="github">blizzard4591/openMittsu</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-im/openmittsu/openmittsu-0.10.0.0-r1.ebuild b/net-im/openmittsu/openmittsu-0.10.0.0-r1.ebuild
new file mode 100644
index 000000000000..55d3ee7bb812
--- /dev/null
+++ b/net-im/openmittsu/openmittsu-0.10.0.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop
+
+DESCRIPTION="Open source chat client for Threema-style end-to-end encrypted chat networks"
+HOMEPAGE="https://www.openmittsu.de/"
+# snapshot of https://github.com/blizzard4591/openMittsu.git
+# git-archive-all.sh --prefix ${P}/ -- - | xz > ${P}.tar.xz
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/qt5-sqlcipher
+	>=dev-libs/libsodium-1.0.18:=
+	>=dev-qt/qtcore-5.7.1:5=
+	>=dev-qt/qtgui-5.7.1:5=
+	>=dev-qt/qtmultimedia-5.7.1:5=[widgets]
+	>=dev-qt/qtnetwork-5.7.1:5=[ssl]
+	>=dev-qt/qtsql-5.7.1:5=[sqlite]
+	>=dev-qt/qtwidgets-5.7.1:5=
+	>=media-gfx/qrencode-3.4.4-r1:="
+DEPEND="${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.8.0 )"
+
+PATCHES=( "${FILESDIR}"/${P}-musl.patch )
+
+DOCS=(
+	README.md
+	Example-client-configuration-file.ini
+	Example-contacts-file.txt
+)
+
+CMAKE_BUILD_TYPE="Gentoo"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Replace the root certificate
+	# https://crt.sh/?id=2841410 - USERTrust ECC Certification Authority
+	local cert=$(base64 -w 0 "${FILESDIR}"/${P}-root-cert.pem || die)
+	sed -i -e "/Certificate.*Literal/s/\".*\"/\"${cert}\"/" \
+		src/network/ServerConfiguration.cpp || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# set version manually, since autodetection works only with git
+		"-DOPENMITTSU_CUSTOM_VERSION_STRING=${PV%.*}-${PV##*.}-00000000"
+		"-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON"
+		"-DOPENMITTSU_ENABLE_TESTS=$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	./openMittsuTests || die
+}
+
+src_install() {
+	local my_pn="openMittsu"
+	cmake_src_install
+	newicon resources/icon.png ${my_pn}.png
+	make_desktop_entry ${my_pn} ${my_pn} ${my_pn}
+	rm "${ED}"/usr/bin/${my_pn}VersionInfo || die
+	rm -f "${ED}"/usr/bin/${my_pn}Tests || die
+}
diff --git a/net-im/openmittsu/openmittsu-0.10.0.0.ebuild b/net-im/openmittsu/openmittsu-0.10.0.0.ebuild
deleted file mode 100644
index dc31c3a2ca06..000000000000
--- a/net-im/openmittsu/openmittsu-0.10.0.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop
-
-DESCRIPTION="Open source chat client for Threema-style end-to-end encrypted chat networks"
-HOMEPAGE="https://www.openmittsu.de/"
-# snapshot of https://github.com/blizzard4591/openMittsu.git
-# git-archive-all.sh --prefix ${P}/ -- - | xz > ${P}.tar.xz
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/qt5-sqlcipher
-	>=dev-libs/libsodium-1.0.18:=
-	>=dev-qt/qtcore-5.7.1:5=
-	>=dev-qt/qtgui-5.7.1:5=
-	>=dev-qt/qtmultimedia-5.7.1:5=[widgets]
-	>=dev-qt/qtnetwork-5.7.1:5=[ssl]
-	>=dev-qt/qtsql-5.7.1:5=[sqlite]
-	>=dev-qt/qtwidgets-5.7.1:5=
-	>=media-gfx/qrencode-3.4.4-r1:="
-DEPEND="${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.8.0 )"
-
-PATCHES=( "${FILESDIR}"/${P}-musl.patch )
-
-DOCS=(
-	README.md
-	Example-client-configuration-file.ini
-	Example-contacts-file.txt
-)
-
-CMAKE_BUILD_TYPE="Gentoo"
-
-src_configure() {
-	local mycmakeargs=(
-		# set version manually, since autodetection works only with git
-		"-DOPENMITTSU_CUSTOM_VERSION_STRING=${PV%.*}-${PV##*.}-00000000"
-		"-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON"
-		"-DOPENMITTSU_ENABLE_TESTS=$(usex test)"
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	./openMittsuTests || die
-}
-
-src_install() {
-	local my_pn="openMittsu"
-	cmake_src_install
-	newicon resources/icon.png ${my_pn}.png
-	make_desktop_entry ${my_pn} ${my_pn} ${my_pn}
-	rm "${ED}"/usr/bin/${my_pn}VersionInfo || die
-	rm -f "${ED}"/usr/bin/${my_pn}Tests || die
-}
diff --git a/net-im/openmittsu/openmittsu-0.10.1.0.ebuild b/net-im/openmittsu/openmittsu-0.10.1.0.ebuild
new file mode 100644
index 000000000000..6e4e8a7cd724
--- /dev/null
+++ b/net-im/openmittsu/openmittsu-0.10.1.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop
+
+DESCRIPTION="Open source chat client for Threema-style end-to-end encrypted chat networks"
+HOMEPAGE="https://www.openmittsu.de/"
+# snapshot of https://github.com/blizzard4591/openMittsu.git
+# git-archive-all.sh --prefix ${P}/ -- - | xz > ${P}.tar.xz
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/qt5-sqlcipher
+	>=dev-libs/libsodium-1.0.18:=
+	>=dev-qt/qtcore-5.7.1:5=
+	>=dev-qt/qtgui-5.7.1:5=
+	>=dev-qt/qtmultimedia-5.7.1:5=[widgets]
+	>=dev-qt/qtnetwork-5.7.1:5=[ssl]
+	>=dev-qt/qtsql-5.7.1:5=[sqlite]
+	>=dev-qt/qtwidgets-5.7.1:5=
+	>=media-gfx/qrencode-3.4.4-r1:="
+DEPEND="${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.8.0 )"
+
+DOCS=(
+	README.md
+	Example-client-configuration-file.ini
+	Example-contacts-file.txt
+)
+
+CMAKE_BUILD_TYPE="Gentoo"
+
+src_configure() {
+	local mycmakeargs=(
+		# set version manually, since autodetection works only with git
+		"-DOPENMITTSU_CUSTOM_VERSION_STRING=${PV%.*}-${PV##*.}-00000000"
+		"-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON"
+		"-DOPENMITTSU_ENABLE_TESTS=$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	./openMittsuTests || die
+}
+
+src_install() {
+	local my_pn="openMittsu"
+	cmake_src_install
+	newicon resources/icon.png ${my_pn}.png
+	make_desktop_entry ${my_pn} ${my_pn} ${my_pn}
+	rm "${ED}"/usr/bin/${my_pn}VersionInfo || die
+	rm -f "${ED}"/usr/bin/${my_pn}Tests || die
+}
diff --git a/net-im/qtox/Manifest b/net-im/qtox/Manifest
index 26687b415f4c..8214149d3115 100644
--- a/net-im/qtox/Manifest
+++ b/net-im/qtox/Manifest
@@ -1 +1,2 @@
 DIST qTox-1.17.6.tar.gz 4777590 BLAKE2B d67ea8c1d5c478a791fd8594866130874c036f22ec9fd991e0f6c81fb7919824bba8e13675b0ffaf613188215a4fce6d07545476ab5565922b3989519aedd91f SHA512 840dfbca2cb1a3db4b5ab27cb408e183b152fcd87c0cb915ee58245e7c311b8682605e73497248072a5a48b239058b101a85235ed169d19606dc7bf61865f208
+DIST qTox-1.18.2.tar.gz 5341017 BLAKE2B 563af4ae55f54876af78376942ecec1674c004643ac5e359e2bddbbd09480b415414b29268a53422d4803a876ac6ba4668c69ac7b9f9e6b018af306dcf6308df SHA512 f051ddb53c1760854685442e2c65c0339821388bb53cb2a7445d3110c66777b7ce9abe262f5b6f1920794e16bba1ef42f65765851b7c797cfc3d5540099052f6
diff --git a/net-im/qtox/qtox-1.18.2.ebuild b/net-im/qtox/qtox-1.18.2.ebuild
new file mode 100644
index 000000000000..fe5515aba16b
--- /dev/null
+++ b/net-im/qtox/qtox-1.18.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TokTok/qTox.git"
+else
+	MY_P="qTox-${PV}"
+	SRC_URI="https://github.com/TokTok/qTox/archive/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/qTox-${PV}"
+fi
+
+DESCRIPTION="Instant messaging client using the encrypted p2p Tox protocol"
+HOMEPAGE="https://qtox.github.io/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="spellcheck X"
+
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-db/sqlcipher
+	dev-libs/libsodium:=
+	dev-qt/qtbase:6[concurrent,gui,network,opengl,widgets,xml]
+	dev-qt/qtsvg:6
+	media-gfx/qrencode:=
+	media-libs/libexif
+	media-libs/openal
+	media-video/ffmpeg:=[webp,v4l]
+	>=net-libs/tox-0.2.19:=[av]
+	spellcheck? (
+		|| (
+			kde-frameworks/sonnet:6[aspell]
+			kde-frameworks/sonnet:6[hunspell]
+		)
+	)
+	X? (
+		dev-qt/qtbase:6=[X]
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+DOCS=( CHANGELOG.md README.md doc/user_manual_en.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DASAN=OFF
+		-DPLATFORM_EXTENSIONS=$(usex X)
+		-DSPELL_CHECK=$(usex spellcheck)
+		-DSTRICT_OPTIONS=OFF
+		-DSVGZ_ICON=ON
+		-DTSAN=OFF
+		-DUBSAN=ON
+		-DUPDATE_CHECK=OFF
+		-DUSE_CCACHE=OFF
+	)
+
+	[[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_DESCRIBE=${PV} )
+
+	cmake_src_configure
+}
+
+src_test() {
+	# The excluded tests require network access.
+	cmake_src_test -E "test_(bsu|core)"
+}
diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild
index 3b1a26bd42fa..a1ddf6c7e693 100644
--- a/net-im/qtox/qtox-9999.ebuild
+++ b/net-im/qtox/qtox-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
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/TokTok/qTox.git"
 else
 	MY_P="qTox-${PV}"
-	SRC_URI="https://github.com/TokTok/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	SRC_URI="https://github.com/TokTok/qTox/archive/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/qTox"
 fi
@@ -35,7 +35,7 @@ RDEPEND="
 	media-libs/libexif
 	media-libs/openal
 	media-video/ffmpeg:=[webp,v4l]
-	>=net-libs/tox-0.2.20:=[av]
+	>=net-libs/tox-0.2.19:=[av]
 	spellcheck? (
 		|| (
 			kde-frameworks/sonnet:6[aspell]
diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.13.9.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.13.9.ebuild
index 200ffb194879..8b14b5ff6912 100644
--- a/net-im/signal-cli-bin/signal-cli-bin-0.13.9.ebuild
+++ b/net-im/signal-cli-bin/signal-cli-bin-0.13.9.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
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	virtual/jre:21
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index e698d0f56dcb..39bdbf139dd2 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1 +1 @@
-DIST signal-desktop_7.36.1_amd64.deb 121128498 BLAKE2B fe57557289ccb2d15826109366f25dc8c2d432be1d3e452150791cee8c04f00e88c12d46d6a47954291da522ea62a861a8d5dfa529b2e3d7dd521101688674d9 SHA512 fbc63cef963defa4573af7cdd76117d46418975121d5c01d654cbaa2e000db97cb2ad1c4290149f3b019b69ce5028118e9a67056a107e87755b49df1ab4bcfeb
+DIST signal-desktop_7.38.0_amd64.deb 121541482 BLAKE2B 16b7b9e4efd0a52a18527909ed1c3e06da8d3bc5acd59b74dd18a34811ce51cde5f2600a7349423ac0a558d8f333a44c6c07c14d44d908ed1db435de4b565829 SHA512 f14de0038bf08412ad3109d3730e02289d935b22420f64f93558825bddbee5696606778cfa633708bfb5e5689c773abfe35ae37234c43e44cb1fae1958cc3947
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-7.36.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-7.36.1.ebuild
deleted file mode 100644
index e1382e530665..000000000000
--- a/net-im/signal-desktop-bin/signal-desktop-bin-7.36.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN/-bin/}"
-
-inherit pax-utils unpacker xdg
-
-DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
-HOMEPAGE="https://signal.org/
-	https://github.com/signalapp/Signal-Desktop"
-SRC_URI="https://updates.signal.org/desktop/apt/pool/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
-S="${WORKDIR}"
-
-LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* amd64"
-RESTRICT="splitdebug"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	>=media-fonts/noto-emoji-20231130
-	media-libs/alsa-lib
-	media-libs/libpulse
-	media-libs/mesa[X(+)]
-	net-print/cups
-	sys-apps/dbus[X]
-	virtual/udev
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/pango
-"
-
-QA_PREBUILT="
-	opt/Signal/chrome_crashpad_handler
-	opt/Signal/chrome-sandbox
-	opt/Signal/libEGL.so
-	opt/Signal/libGLESv2.so
-	opt/Signal/libffmpeg.so
-	opt/Signal/libvk_swiftshader.so
-	opt/Signal/libvulkan.so.1
-	opt/Signal/resources/app.asar.unpacked/node_modules/*
-	opt/Signal/signal-desktop
-	opt/Signal/swiftshader/libEGL.so
-	opt/Signal/swiftshader/libGLESv2.so"
-
-src_prepare() {
-	default
-	sed -e 's| --no-sandbox||g' \
-		-i usr/share/applications/signal-desktop.desktop || die
-	unpack usr/share/doc/signal-desktop/changelog.gz
-}
-
-src_install() {
-	insinto /
-	dodoc changelog
-	doins -r opt
-	insinto /usr/share
-
-	doins -r usr/share/applications
-	doins -r usr/share/icons
-	fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox /opt/Signal/chrome_crashpad_handler
-	fperms u+s /opt/Signal/chrome-sandbox
-	pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox opt/Signal/chrome_crashpad_handler
-
-	dosym -r /opt/Signal/${MY_PN} /usr/bin/${MY_PN}
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "For using the tray icon on compatible desktop environments, start Signal with"
-	elog " '--start-in-tray' or '--use-tray-icon'."
-}
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-7.38.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-7.38.0.ebuild
new file mode 100644
index 000000000000..3c73e65a0712
--- /dev/null
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-7.38.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN/-bin/}"
+
+inherit pax-utils unpacker xdg
+
+DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
+HOMEPAGE="https://signal.org/
+	https://github.com/signalapp/Signal-Desktop"
+SRC_URI="https://updates.signal.org/desktop/apt/pool/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
+S="${WORKDIR}"
+
+LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* amd64"
+RESTRICT="splitdebug"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=media-fonts/noto-emoji-20231130
+	media-libs/alsa-lib
+	media-libs/libpulse
+	media-libs/mesa[X(+)]
+	net-print/cups
+	sys-apps/dbus
+	virtual/udev
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/pango
+"
+
+QA_PREBUILT="
+	opt/Signal/chrome_crashpad_handler
+	opt/Signal/chrome-sandbox
+	opt/Signal/libEGL.so
+	opt/Signal/libGLESv2.so
+	opt/Signal/libffmpeg.so
+	opt/Signal/libvk_swiftshader.so
+	opt/Signal/libvulkan.so.1
+	opt/Signal/resources/app.asar.unpacked/node_modules/*
+	opt/Signal/signal-desktop
+	opt/Signal/swiftshader/libEGL.so
+	opt/Signal/swiftshader/libGLESv2.so"
+
+src_prepare() {
+	default
+	sed -e 's| --no-sandbox||g' \
+		-i usr/share/applications/signal-desktop.desktop || die
+	unpack usr/share/doc/signal-desktop/changelog.gz
+}
+
+src_install() {
+	insinto /
+	dodoc changelog
+	doins -r opt
+	insinto /usr/share
+
+	doins -r usr/share/applications
+	doins -r usr/share/icons
+	fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox /opt/Signal/chrome_crashpad_handler
+	fperms u+s /opt/Signal/chrome-sandbox
+	pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox opt/Signal/chrome_crashpad_handler
+
+	dosym -r /opt/Signal/${MY_PN} /usr/bin/${MY_PN}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "For using the tray icon on compatible desktop environments, start Signal with"
+	elog " '--start-in-tray' or '--use-tray-icon'."
+}
diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
index 71e1af8ccce1..c8ab04ca0734 100644
--- a/net-im/synapse/Manifest
+++ b/net-im/synapse/Manifest
@@ -1,5 +1,6 @@
 DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
 DIST anyhow-1.0.93.crate 47490 BLAKE2B 1c64b24d3df3307430deb8189ded345ee2858c1990fc343f2400bd67b6d79ee2cf90876326fb29ea311bd857a941fc8319dccbe6c81f2cca2c085dc0c1fffb27 SHA512 237b36bdefeaf8dd2f7d4c5c92d8f7627a5206ded5fa3dafd5710f2fbd3dd7d7187d4a8ae917ae03d0cf06bc8d101a7663bb7bb022507ac1ec88577a37475efc
+DIST anyhow-1.0.95.crate 52155 BLAKE2B fc9cebdfae0afed86f2dfb7faf62f5a108000895317dd0cab9c83d6e48c891558fc3a1d8b9940b623b4c6fd861631a0f0344a9915517a9bc39dbfbe48ec6b45b SHA512 8c5c176381c3e861c3c4451f7cd3d9e2447c0a55735ececfd3199288d65d36dc5fdc4a19a0798f62a0b9d6ca2c155a616c7eab8bcd53e6ece743aed57ec3d0fa
 DIST arc-swap-1.7.1.crate 68512 BLAKE2B 5ddeffd2ae8af4125a5b43d4a0a1afc7948533bf037d8cd3e47603c13b57b156618280d99b840bf318b25b6eb29400ad68499695e182acdc05bc5f621c42ee16 SHA512 070fa8dd17b380b6d7d72f6f45c84e591de9a9770b9662351e7a41af03798bf5e34d185a5fcb948f4d8ac5e210a33acd465c39eff6097662c2442b34ee3dbdff
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9
@@ -22,6 +23,7 @@ DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST http-1.1.0.crate 103144 BLAKE2B 7a8c4ffd3ce664e1f575bf4042ac0f15ff42b200fa8c6aa27a6686d77be2de7cd3df242e36f8cb45cdb822bfa96011d5d5dd7bb03122ae5bdcaa15bbf9d40051 SHA512 1c29f25a8895a69d815e21df427dfff7924e9040d01c55cc3256dd0b5e72b670fe75b1414223fb971c16082e4b26217142628be5e0905994da4f08b52e7f4a33
+DIST http-1.2.0.crate 105932 BLAKE2B efc9fc4ccc4a622781ed895f77c1752baf34e82d249acf97687ac8d4260aeafb333040833d9f8df5916cb105cc8217c8f27ddd021636b9248ad551ebfe4d83a6 SHA512 2c8e7234ec3aa720c9dd762c0bb06367fbc39ea89446fc9d8d2e55052a4ac461559a20a8294c877879f3e94d5db06fe41e2cdbb9664ea7ab1bc8003abb038bb5
 DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a
 DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
@@ -41,16 +43,21 @@ DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb76974
 DIST proc-macro2-1.0.89.crate 49446 BLAKE2B 844c021394e7a2551bc179592a6769d672360150abf92debcb9ac60a94a2e426c48c408f06aeb2128686f5f04d66dc12973714670c21a5063ee6b9f3bae4e671 SHA512 488ab38a04df1d0330309382a7e4f667238cbc9b4d513da6a8f5718f8a762f76cc122af67fefe8f4b021a286b3d23e3ec83d781fe6ac823042a6daf14d147e2f
 DIST pyo3-0.21.2.crate 504574 BLAKE2B 1b8bf374d1b61e3e4bedce6344338126051a6d951ea87d258e5ed92d4c0e13b0202f2e7e56500277c54743dd16c9b4587f436cf2058567501c8a9ac7c6b6c17a SHA512 5f88cda423e82b62698a74ceaa31fc27e5c1f1d417928accddb2e00337d163fda622f774ae6e24c1cb73c467d6b01e9a2ba866e4454338b1fbfc892ae14ffc53
 DIST pyo3-0.23.2.crate 1073639 BLAKE2B 01ddd26a4e347f3b6d7fee215a1894e779167730710373d59712f2119332fcf287d9c0e75d3d28baff8cf5000afb9d0e577947a26bdd8828428d33aa0f8be537 SHA512 b2b40809e1f26978c140b7ca4ecebb661a47fc01cd03fcd5c486076576c9b229de04f15ed55661db4e26545cb29110f1034a185abb623e4bf7fbb69188db335c
+DIST pyo3-0.23.3.crate 1073838 BLAKE2B 5e1ce6a5c5232ebf0399b1b969e737cca12f978f445efec9408ea80b8bc6ac1047125dbefa36149c8a904882d6a64dd24a9bd50f1e8de7afe3a3271e1a0f2d6f SHA512 c80377e8673de8b8e51e2423d102dbcc46605a783c13127215916d69fc600efd67ba5f9cca420cb6859124165ec97fde40eb0a0566d8b4b60708e20b8e6e9b6d
 DIST pyo3-build-config-0.21.2.crate 30581 BLAKE2B 993c1f7f15124336b70570ed3949cc0873c2b883e81dd3a350f347cf014fb9a82d487197fdaf475989b727b7ee8d9a5511a72422f76126b8788c4f40831baed8 SHA512 8b6bedb31235de3dd95bca6e19ea4eb7752227ceb9f1c928c4df2b277df5ee443e5c262e448012e4e54e3104213db4d745c9c42f79ab3029dee68f48ec3a2795
 DIST pyo3-build-config-0.23.2.crate 32197 BLAKE2B 393c76b1dcb625145673736272d4cb9d96a02df87ddcc385316652f0ff1b5595a34ebe5d789f61888c2fd82de05476c85f781d21018bd99cb630fa634afee203 SHA512 29678272073e896cb0b65efb0eaba40c82977b18efd389597aef8902e32daff51f2609c6be93ecfe0336260446c3186951f770ff449823cdde5a0518a1585c81
+DIST pyo3-build-config-0.23.3.crate 32509 BLAKE2B 9e77701712589dec4ad74b3d0e66ae82c7a01b6f29ed36231d999aaf909f80def59d17916e1900bfff10b1d36a0a48ed4bf9757c817eb6c6269549f3d04bd6d4 SHA512 db8b0aa86e96eeb30a8ab36a8a1ba917b7b9e6918c2193d7466841ef38e689908f7719a5390d35fb9a156aa6bd84348fa99ea8d5a784faf5c5cc4635d9a3fac9
 DIST pyo3-ffi-0.21.2.crate 66160 BLAKE2B 759622fa3a41bcdb48170983c4e194898415f8db16a7c57ace89a7945bd47374d9a14e5ecf24e80a178bde597cfa30d41f9e6617b458d365640bdbda048e6f6e SHA512 5cbc9dfb14569210776fd66341e77e61642a9920354251a65b91aa13a0fb1c373258d1a6b4f8feacdc4266d472193d8f20a6dd2cc180ccc3d43fb66237ae6d0d
 DIST pyo3-ffi-0.23.2.crate 74052 BLAKE2B 085c66bae61e6059331813be77a1e4f850c4b8b12ac60b03188f2a009c9f58e062dc3ea2b9e470a480956bb8cbef645f95e53fae2638d59ebf5039aa5d41d504 SHA512 e228e473da98ce0fe4f15cf840ba1f51f66bb6fd103a7c0bb76b3218980c93b45ecf691f712333f4a27a9efc76517a85f6e13d5e9650b774eadebf59a647e493
+DIST pyo3-ffi-0.23.3.crate 74064 BLAKE2B ec3cc59e047f780041a05e2bf9fac9d65a6f8ccfb5a3e1c35d7c7918da6ded7e65676888a743d3b4d0fe7b0996e441b722c159eed67360c1e3c5b598160a46cc SHA512 fe4678d4cfe81f065554f0d454345f5f8fde927af1afec9212bb49a67be5080dcc9be84e088612208b7732d2283c2c9168a31b0b6fbd32496520d500e372e161
 DIST pyo3-log-0.10.0.crate 14517 BLAKE2B 0812223f413e150253323695e33c141d4382e9a5865fbdcf76f20dab8728c01727ab5fc9e642d44e88545cf999bd768a84e79364ddb55de543282c790f01f739 SHA512 b11cebb201dd4d57bcae335bc952189aed052b23ccc6b351d57e375941c1fa6cdfbceeda9b49028bfde6ca2dd931cdd9cbc06065184f2f5012e1d122c62f3599
 DIST pyo3-log-0.12.0.crate 14630 BLAKE2B 0c22aff53a88b99bc3dca14c20ed7ee8f90bb0f955ff70e2c709dbd5947160a364a8c6f1e6cdd417f81cf58f8285b85d632c5b07c9497388f41f372f356ca934 SHA512 12a39a0ea2f85b5d8db8d325f913428364ec6e2a02cae83aaacbe013d3a70cac137ab8e916e1892badb7784c72b5d0aaa2634c7c8ac6f34f5fe778cd2e169c45
 DIST pyo3-macros-0.21.2.crate 7920 BLAKE2B 60ceb626fd1ffeca7e81ebc721bb4cfebd99bb708d48bbfdd296b250ed41471f82e8657715e1f58840423ac11d8c5a84a6107a7037affdea4e0c2cc561514ed7 SHA512 95335a55d57346107fdc7591d51e36aa0a985d6c44a875475a0ed52df25d33b21a7b922fdab0eed190da9708968e79f7cd50bc683b6d210eb068713a915ac7f4
 DIST pyo3-macros-0.23.2.crate 8056 BLAKE2B a87c4b8aab972eaf5e9b941db34e18be411bed8b5753d3e2d3f65e4a18723a72e70858bb34e8db949f0c6b748e122fed41e9c78f6c20150077fcc3c4eb0026ba SHA512 dba0b5bd212b6a5f38d6fc93183c8ab80bb53bfa5f03d471897014f2d3d1959804e5fdbc817845c1cef797f314b924d58eff95cfcb848eb98b283e104d24637c
+DIST pyo3-macros-0.23.3.crate 8085 BLAKE2B bf9ea45a8afe7c663da4f3f5c09c23039bbcf9a9ae350eac2b6581a227864d259b1e5c5ea36f9d6f302c26cd957bb4564562b98785eac49233515d7d54453fdf SHA512 23bfcff285db1276f2dcca9895f7672ec6e5aec118039e2cef3cabca0a85eb97f138391cea4da26eb887dff09c65947b165ca83392edcc8640cb283df2929901
 DIST pyo3-macros-backend-0.21.2.crate 58088 BLAKE2B 05dd49983c8aeddc47cd94f6cd58f10e41ad6f4ec57006908cde4fe3edbcf6814058d7843a88c9dbeb0824f840ad3509414c52e47fffe5ad4b730f791c9a3f19 SHA512 f8488ba0a68f1ae20d053e2323d065f03b40c24231a50b05205b100e973ae50bc7bb9c25e4d37df56f4cfa73d2001655ce9685078d1017a4a90bd7945c01b833
 DIST pyo3-macros-backend-0.23.2.crate 70067 BLAKE2B 905c0e6e5ca0c0a91af8386a632cc81f4a9b08a51a22a260188078abf9ee70d60f77e2fc0df09483d8dc6b37cd455a23b7f70f41ee74a2ad9dd0dbef39cc22c2 SHA512 dc3f8780c09c63c0e0d4f26c29a9a4e29e4fc9f14254ac8a942235e480a3f4bfa3bf073d3011e043b6c22e1999d1f68bf7b0fdf212e9edb4bfb2396a97ab0ee1
+DIST pyo3-macros-backend-0.23.3.crate 70098 BLAKE2B f8ee9c39f743960fc8093bfd53c043fca03b973192e1ab24b48066634e57ea7e74b3ba825ae72380e10569855eec9cb4f0d54f5f8c88dc60e67793257bef8d43 SHA512 9b22e975480f9afc2037587ba85889868a1b543069c2280c65f4cf98e5537708d098bb4885e881c1c9427740c8259988d82176b974900551a4e51097cefb8708
 DIST pythonize-0.21.1.crate 13357 BLAKE2B 4534dece498c6afb8c6ab0ebfdd1b26f52a9e36c70c4db7433a79a7b2577a29f30d4e015d2ee149cbe4bed8ec571158a04b5c1bfd4eff9b64fd40d2fa99e6641 SHA512 75193fb9b803cd24b94efc895d0aae59ac8bfdc8454795c358b5ccfda554a8b5f8da93c71964dfa6d676a9f7b0b8e1dfa5a3dca9c2af709bda3a2841cbb15131
 DIST pythonize-0.23.0.crate 16177 BLAKE2B 96c27ee7819b5aa27a493c11fbfde4174baf8c081634543f211a1270874a239973bf16788641837efafe0b09f85df6edf82da36818bfb37005fdbac5fbb1edc8 SHA512 25d395bbbfaad4c2d57599144e92c289eb96cd1e2c5306b8ec17048a406df3147b93b56785a03bec6aba6ea31789a21ec0cc519ed40177fb263a98757349fa63
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
@@ -64,9 +71,12 @@ DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST serde-1.0.215.crate 78527 BLAKE2B ca8e1175839ca45a4d78a155f5943396211408a85e0840b065c52948188010653d68fc4fc7b63bf2c39a11a6988abb7f6f3c6d878ca1373596e0a5d62186e109 SHA512 3da13f1a74393f1fcb6d659b5e060a11ecae358f55cdf4a2fd05bfc863fea6f75d3140d3bc74902f8feba8cddf7dae71a3f4e4e78e78e1b08ed46b3e4900281f
+DIST serde-1.0.217.crate 79019 BLAKE2B a0aacff795d34583365ddd469fa14c58a6cccf8afbb248210aaff3134c7ce6e34b3d03f437326d7c01b3e78f82a5d19c37ed9fa4372970d8b2793f2889288e1c SHA512 f97b3b54b9e99c9a027390405cc054c3072f49c92803a4ed5f5f69e76a179deda9d77993b645b3581437085912d881da88d0451b9e0da423c64033a23fdd8054
 DIST serde_derive-1.0.215.crate 57092 BLAKE2B f28bb66017599afdcd8d45c514b8e07854eb944c1dcf931e052a01ce421e0de6c20c13b3867da5922e2153e25ce88bf9fa27e2e68ddc9d212977f71fa0bd6352 SHA512 cae686bdf10c683149956ffe1c64fcf3e9b9bf0cd6e33b4ce7429d0ca35b9fdb55443693866c1202fa79348c6ea0f49ab3be3d5f857de4ae0818d2b4c8c67d9b
+DIST serde_derive-1.0.217.crate 57749 BLAKE2B 63b4930122d80d64492ba2718630513012202e42bbaa74510729ee66a0e72b8a1ad123784b479697ba562db43868f4bddfdf5e94bb3d744cd68a547471ba40aa SHA512 31020f4533d04b31ae125580a3c5093fad36438d324e2d9b063923aa8c125c654102ae7fbc3b3df892bb41db6b321962a23e0a37950e080055d715d15b18af76
 DIST serde_json-1.0.132.crate 150549 BLAKE2B a49aef7737fad2e6f6ec79cb6da00c734e7de7ef16be321846d1f6229534b58e15ceb0f6306eeae6f85bf07431d82959c0a56ed1394d21a67b65c8c48e971f3f SHA512 9d157ce7d705fee8245569e7c577310782b69675a6e459f21904544b824a1ca5c9b445d17419fee438dfeb6fcc35343ba14e022043fffade0210b6d2c1b5795e
 DIST serde_json-1.0.133.crate 150739 BLAKE2B 7891eb5b8edcc7fd09ab1e15d3881ffdcb629aa39f2bd758c0505700a5f2dfabd85b1b66c3b094268bc1627b346e204c792f4ca61efa76c54ab9cd5744fb0ee2 SHA512 20e65ec87bff319897a141960d13deb5cadcf821209c1ee8799f1dc7f458ce432bc62c16df5bdada1c8d3cc01ff23b8125e8fa0a03545d4614f32efd687dc69f
+DIST serde_json-1.0.134.crate 154351 BLAKE2B 546f8ffe9373444e8c9e81910476da281dcef10498dceabc8bec9f9063c55f4a9033b83586a09b0f410369515882c37712a2bd75ff1fff05815d904f37386124 SHA512 ab6323799bf19da8ec6e6c428370d37cd230192b45ef54d2c65c7d83907b2dde71d51650e44f1fcca1084e75e0e195e97b28437f53a331bf48effed3d59b58a5
 DIST sha1-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f
 DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785
 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
@@ -74,6 +84,7 @@ DIST subtle-2.5.0.crate 13909 BLAKE2B 660c3a472ca54c9843ce3feea74b802e27fd7f62dd
 DIST syn-2.0.85.crate 275231 BLAKE2B e7679e81bcef87920bc0ed707c997563844ffa1e9d470675ae6ec11d1e045e04ee2ad5744d423b8bc16def1c197ebecd874f468c1e12244838d1b4f34f9c1a30 SHA512 14b1402d2cd91456eb32dcffd494592eb3bd848ae22571f7ef0686493f91b82d23ba41428f9d31686fd24ea6ebca4b239b6c5099302a32014dffbc4ff9afeec1
 DIST synapse-1.120.2.gh.tar.gz 8821285 BLAKE2B 507385b71ca9858df956855db4f5a36dbb4d653635716fdfb733eab14ff652f38578cc191ec2704896e7ef269e3960b5b269b9596e694a5812ce841f329d1c33 SHA512 30687e90bbb58ed605fc8241bfd8573ddabe4c1a46650cb4b0c9588701374f6ae06b6558d62f1b838d7ff47ca45563b8a1143ab036877f0b9f0e8b7c28048fcf
 DIST synapse-1.121.1.gh.tar.gz 8830079 BLAKE2B 1e249bdc3cc098417dbb1f707cc5ae2ca795ac9745fb664a4a51ed4b3788b808766808be913b08b7a7535fa7dd1535ece9cc67af4e1460be63cbd4750cf273ea SHA512 b3b0a5f7dbfa492a66ffb4b90a48ac0bc507e28be1a55889b966332acb59049dc58bab8798183216932f753b2736d285bf711b7179c4c412881ea4ac0df1fa9a
+DIST synapse-1.122.0.gh.tar.gz 8838124 BLAKE2B f954472c45efb6649318378b39779e491469d8294ee40b6de53423673e48f919e882555209c8c47a2794c58a0226b44426f0330578992324a48e21ae5eb815f7 SHA512 cab6f2f3dd43299b82ec582444cd29a430f4a0c87f15240a93a9d72ef690f91c4ed20ec68fe3e822f404ba43208dafa67d883a1911f7808616bdfa378a0276e7
 DIST target-lexicon-0.12.14.crate 25508 BLAKE2B 5ebb6b49e5c3b0057959557651287d4bf5ffe5b499340019ff64d5fc3b64e780e344982e358c94b1b25a20bf0f526a584aeecc704695b50a55cc268dd65edb97 SHA512 3410ecc0faf854f49c41c99f83972960e67065b1e0e78557a7c4996d996109bfd167d2121a019f5256f996c896cd45af032038ab7918fdcc6ee6311693ce951a
 DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
 DIST ulid-1.1.3.crate 11596 BLAKE2B a079fc34f5af9de89469d1edd5a53c1bc1a0f9bff8ce731c185345fe4067432a121efc6a04ac6cf377fd03c89558067e7d5d52c4b9dfd23e7055ce5af89e84b3 SHA512 a8f6ab3601417e7a46a763bb28722c3770fb0c2dea340c02a8e96d2e3597a304589745c65278c90bbc64f5153501a2a85321386669fda71ad7252ec67dd749df
diff --git a/net-im/synapse/synapse-1.121.1.ebuild b/net-im/synapse/synapse-1.121.1.ebuild
index 29bdc23dd029..46f484beb739 100644
--- a/net-im/synapse/synapse-1.121.1.ebuild
+++ b/net-im/synapse/synapse-1.121.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -100,7 +100,7 @@ LICENSE+="
 	|| ( Apache-2.0 Boost-1.0 )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 IUSE="postgres systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-im/synapse/synapse-1.122.0.ebuild b/net-im/synapse/synapse-1.122.0.ebuild
new file mode 100644
index 000000000000..eb97e0cb9fd7
--- /dev/null
+++ b/net-im/synapse/synapse-1.122.0.ebuild
@@ -0,0 +1,226 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..13} )
+
+CRATES="
+	aho-corasick@1.1.3
+	anyhow@1.0.95
+	arc-swap@1.7.1
+	autocfg@1.3.0
+	base64@0.21.7
+	blake2@0.10.6
+	block-buffer@0.10.4
+	bumpalo@3.16.0
+	bytes@1.9.0
+	cfg-if@1.0.0
+	cpufeatures@0.2.12
+	crypto-common@0.1.6
+	digest@0.10.7
+	fnv@1.0.7
+	generic-array@0.14.7
+	getrandom@0.2.15
+	headers-core@0.3.0
+	headers@0.4.0
+	heck@0.5.0
+	hex@0.4.3
+	http@1.2.0
+	httpdate@1.0.3
+	indoc@2.0.5
+	itoa@1.0.11
+	js-sys@0.3.69
+	lazy_static@1.5.0
+	libc@0.2.154
+	log@0.4.22
+	memchr@2.7.2
+	memoffset@0.9.1
+	mime@0.3.17
+	once_cell@1.19.0
+	portable-atomic@1.6.0
+	ppv-lite86@0.2.17
+	proc-macro2@1.0.89
+	pyo3-build-config@0.23.3
+	pyo3-ffi@0.23.3
+	pyo3-log@0.12.0
+	pyo3-macros-backend@0.23.3
+	pyo3-macros@0.23.3
+	pyo3@0.23.3
+	pythonize@0.23.0
+	quote@1.0.36
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	regex-automata@0.4.8
+	regex-syntax@0.8.5
+	regex@1.11.1
+	ryu@1.0.18
+	serde@1.0.217
+	serde_derive@1.0.217
+	serde_json@1.0.134
+	sha1@0.10.6
+	sha2@0.10.8
+	subtle@2.5.0
+	syn@2.0.85
+	target-lexicon@0.12.14
+	typenum@1.17.0
+	ulid@1.1.3
+	unicode-ident@1.0.12
+	unindent@0.2.3
+	version_check@0.9.4
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.92
+	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-time@1.1.0
+"
+
+inherit cargo distutils-r1 multiprocessing optfeature systemd
+
+DESCRIPTION="Reference implementation of Matrix homeserver"
+HOMEPAGE="
+	https://matrix.org/
+	https://github.com/element-hq/synapse
+"
+SRC_URI="
+	https://github.com/element-hq/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="AGPL-3+"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
+	|| ( Apache-2.0 Boost-1.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="postgres systemd test"
+RESTRICT="!test? ( test )"
+
+# <twisted-24.10: https://github.com/element-hq/synapse/pull/17878
+RDEPEND="
+	acct-user/synapse
+	acct-group/synapse
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/bleach[${PYTHON_USEDEP}]
+	>=dev-python/canonicaljson-2[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/ijson[${PYTHON_USEDEP}]
+	dev-python/immutabledict[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.0[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	>=dev-python/matrix-common-1.3.0[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/phonenumbers[${PYTHON_USEDEP}]
+	>=dev-python/pillow-10.0.1[${PYTHON_USEDEP},webp]
+	dev-python/prometheus-client[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pydantic[${PYTHON_USEDEP}]
+	dev-python/pymacaroons[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/python-multipart-0.0.12-r100[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/service-identity[${PYTHON_USEDEP}]
+	dev-python/signedjson[${PYTHON_USEDEP}]
+	dev-python/sortedcontainers[${PYTHON_USEDEP}]
+	dev-python/treq[${PYTHON_USEDEP}]
+	<dev-python/twisted-24.10[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	acct-user/synapse
+	acct-group/synapse
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/hiredis[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/pyicu[${PYTHON_USEDEP}]
+		dev-python/txredisapi[${PYTHON_USEDEP}]
+		postgres? ( dev-db/postgresql[server] )
+	)
+"
+
+# Rust extension
+QA_FLAGS_IGNORED="usr/lib/python3.*/site-packages/synapse/synapse_rust.abi3.so"
+
+src_test() {
+	if use postgres; then
+		einfo "Preparing postgres test instance"
+		initdb --pgdata="${T}/pgsql" || die
+		pg_ctl --wait --pgdata="${T}/pgsql" start \
+			--options="-h '' -k '${T}'" || die
+		createdb --host="${T}" synapse_test || die
+
+		# See https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#running-tests-under-postgresql
+		local -x SYNAPSE_POSTGRES=1
+		local -x SYNAPSE_POSTGRES_HOST="${T}"
+	fi
+
+	# This remove is necessary otherwise python is not able to locate
+	# synapse_rust.abi3.so.
+	rm -rf synapse || die
+
+	nonfatal distutils-r1_src_test
+	local ret=${?}
+
+	if use postgres; then
+		einfo "Stopping postgres test instance"
+		pg_ctl --wait --pgdata="${T}/pgsql" stop || die
+	fi
+
+	[[ ${ret} -ne 0 ]] && die
+}
+
+python_test() {
+	"${EPYTHON}" -m twisted.trial -j "$(makeopts_jobs)" tests
+}
+
+src_install() {
+	distutils-r1_src_install
+	keepdir /var/{lib,log}/synapse /etc/synapse
+	fowners synapse:synapse /var/{lib,log}/synapse /etc/synapse
+	fperms 0750 /var/{lib,log}/synapse /etc/synapse
+	newinitd "${FILESDIR}/${PN}.initd-r1" "${PN}"
+	systemd_dounit "${FILESDIR}/synapse.service"
+}
+
+pkg_postinst() {
+	optfeature "Improve user search for international display names" dev-python/pyicu
+	optfeature "Redis support" dev-python/txredisapi
+	optfeature "VoIP relaying on your homeserver with turn" net-im/coturn
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		einfo
+		elog "In order to generate initial configuration run:"
+		elog "sudo -u synapse synapse_homeserver \\"
+		elog "    --server-name matrix.domain.tld \\"
+		elog "    --config-path /etc/synapse/homeserver.yaml \\"
+		elog "    --generate-config \\"
+		elog "    --data-directory /var/lib/synapse \\"
+		elog "    --report-stats=no"
+		einfo
+	else
+		einfo
+		elog "Please refer to upgrade notes if any special steps are required"
+		elog "to upgrade from the version you currently have installed:"
+		elog
+		elog "  https://github.com/element-hq/synapse/blob/develop/docs/upgrade.md"
+		einfo
+	fi
+}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index a5a9c139c9ba..f6182603cfa7 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,4 +1,4 @@
-DIST tdesktop-5.8.3.tar.gz 20240134 BLAKE2B 6d1d296e91820e458a332113fe825b80968d116f3f8573b361ffd133fc687edda31b907561fdbf4a319a008512aba93416449762b1339373e08f642628c1cd27 SHA512 c6e8dabaa3e11207b4c87e07d9b8afc1b77421d0b6aaa37dd07f3bca51d1c0ced61834ae044fe13096689de18366c380dd6dac839bce3f3ec0e88cc639f7e41f
-DIST tdesktop-5.9.0.tar.gz 22241739 BLAKE2B c8e181a2b0f254ffb75f4b65bebb148d71a5687fac4b46d4d5c7e39df4093c1336417a34f859f0717067b64376093502aadf7e1568ab9a58523e13ac05673e5a SHA512 60444a9e01336923f494ba5400e7ed800dc62ccc28b8a6603eeda81e97debdfb7f2e2c725a96a6bfedd0aaaf3a5f73faabac60eee167ac8298ed497b5ebf038c
-DIST tsetup.5.8.3.tar.xz 57966620 BLAKE2B 0cf8e12457204d5aea06beda76de3b7e9f6b42d056dcd132affc129236b4597f200a157de875f3903d88d7b588169c8d596d562f83b3bc839806f7bb4c55e1af SHA512 9dfbe9a242415d632169d59711bb300589e39f0e646f93e5aa6571d694ec460992cd5e3024ec1d0f5be0fac0ae0f98829dd4063cfa6de3e5de63f7564281d324
-DIST tsetup.5.9.0.tar.xz 58297660 BLAKE2B c4a5336989a2192fd0f57190e79b28db352dcee4619803396f38148029d7b01935e73dec0692791bd3ece0db5684276e6fc4f9315be3bf4343274976d1545c43 SHA512 c45a4e0aef81dc1b6ccb18a2ff77c0e5c90c9be0e07407d0b888264a4d7e96eac8f44c3759064b9fb492546e89acbabbd281ced3d012efc869121e6c9419c6a3
+DIST tdesktop-5.10.2.tar.gz 22323788 BLAKE2B 7bfa2f29fb8d72b3feb5af5733c5dc0e62c4983b3d2e7f6ae7d1c028b86232d6fcedcf5833d51cc8f348aa8c78947d6a288d0b2bbeca82feac53f9c5094527fb SHA512 b717c612c42f43a93a40f38d797ec7d8b977542a91eb1686d7a4b14c428e800f205ec9a7cfb18196e2051d9e6721c3858ad6c32a42bf01bbf8818e92cc4a9dc5
+DIST tdesktop-5.10.3.tar.gz 22323592 BLAKE2B f851c59b2247cc3b2483a28a69a262cc2bf4b643bc18b065657f190718166a2943c0e2648a5093e1ba532e45fe6bf1de9448a1fd823e18056800ce47c212b7df SHA512 e8b3dd9ab806647e95d54dbf94798e0b3e1b2268f3103fc2db71de4a0e0354bb04dc0394e3a4513633fe111c3ea0d94666a51e44dd1e98d4e9cb8fbc15ddabf6
+DIST tsetup.5.10.2.tar.xz 58696464 BLAKE2B ca5dce741a3369b40cfd1953dd83d2003f8485a24f6afa821887e565f1fba41962b41a7c0e82f211d9e18e35615840fa4870e3128d150c6ec0843b1d1cc5c8c1 SHA512 0bfaa063c80c468e25ae316dac7fea0d0fa1177cacb3d135f62d8f71b9c0206a576e08bef98a279d0076a2437f6dde31727674290db102d8484fa851b5a0e53e
+DIST tsetup.5.10.3.tar.xz 58701288 BLAKE2B 00446ea9e6fb61ac41c29c925b5062d9113da81145fb2fd754b6de860239e3c917c607bcc5be6b73ddf54733bae273de26664b9fe552f7bd6e31dd69bf213af7 SHA512 ee54bec2bbb093c4a4684dc15681818e4e94f33b92a41939f3d082c21b20abb7e1cbbedd18ce0d1e80fa8b223e505b2b0bf2194a70e65ba30f1b8876f5147388
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-5.10.2.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-5.10.2.ebuild
new file mode 100644
index 000000000000..590a50fa0310
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-5.10.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+"
+
+S="${WORKDIR}/Telegram"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/bin/telegram-desktop"
+
+RDEPEND="
+	!net-im/telegram-desktop
+	sys-libs/glibc
+	dev-libs/glib:2
+	>=media-libs/fontconfig-2.13
+	media-libs/freetype:2
+	virtual/opengl
+	x11-libs/gtk+:3[X,wayland]
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10
+"
+
+src_prepare() {
+	default
+
+	sed -i -e \
+		's/^Exec=@CMAKE_INSTALL_FULL_BINDIR@\/telegram-desktop/Exec=\/usr\/bin\/telegram-desktop/' \
+		"${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service || die
+}
+
+src_install() {
+	newbin Telegram telegram-desktop
+
+	insinto /usr/share/TelegramDesktop/externalupdater.d/
+	newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop
+	insinto /usr/share/dbus-1/services
+	doins "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "spell checker support" app-text/enchant
+}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-5.10.3.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-5.10.3.ebuild
new file mode 100644
index 000000000000..590a50fa0310
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-5.10.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+"
+
+S="${WORKDIR}/Telegram"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/bin/telegram-desktop"
+
+RDEPEND="
+	!net-im/telegram-desktop
+	sys-libs/glibc
+	dev-libs/glib:2
+	>=media-libs/fontconfig-2.13
+	media-libs/freetype:2
+	virtual/opengl
+	x11-libs/gtk+:3[X,wayland]
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10
+"
+
+src_prepare() {
+	default
+
+	sed -i -e \
+		's/^Exec=@CMAKE_INSTALL_FULL_BINDIR@\/telegram-desktop/Exec=\/usr\/bin\/telegram-desktop/' \
+		"${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service || die
+}
+
+src_install() {
+	newbin Telegram telegram-desktop
+
+	insinto /usr/share/TelegramDesktop/externalupdater.d/
+	newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop
+	insinto /usr/share/dbus-1/services
+	doins "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "spell checker support" app-text/enchant
+}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-5.8.3.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-5.8.3.ebuild
deleted file mode 100644
index 24722ca70535..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-5.8.3.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
-
-inherit desktop optfeature xdg
-
-DESCRIPTION="Official desktop client for Telegram (binary package)"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="
-	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
-	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
-"
-
-S="${WORKDIR}/Telegram"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT="usr/bin/telegram-desktop"
-
-RDEPEND="
-	!net-im/telegram-desktop
-	sys-libs/glibc
-	dev-libs/glib:2
-	>=media-libs/fontconfig-2.13
-	media-libs/freetype:2
-	virtual/opengl
-	x11-libs/gtk+:3[X,wayland]
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10
-"
-
-src_prepare() {
-	default
-
-	sed -i -e \
-		's/^Exec=@CMAKE_INSTALL_FULL_BINDIR@\/telegram-desktop/Exec=\/usr\/bin\/telegram-desktop/' \
-		"${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service || die
-}
-
-src_install() {
-	newbin Telegram telegram-desktop
-
-	insinto /usr/share/TelegramDesktop/externalupdater.d/
-	newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
-
-	local icon_size
-	for icon_size in 16 32 48 64 128 256 512; do
-		newicon -s "${icon_size}" \
-			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
-			telegram.png
-	done
-
-	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop
-	insinto /usr/share/dbus-1/services
-	doins "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "spell checker support" app-text/enchant
-}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-5.9.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-5.9.0.ebuild
deleted file mode 100644
index 24722ca70535..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-5.9.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
-
-inherit desktop optfeature xdg
-
-DESCRIPTION="Official desktop client for Telegram (binary package)"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="
-	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
-	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
-"
-
-S="${WORKDIR}/Telegram"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT="usr/bin/telegram-desktop"
-
-RDEPEND="
-	!net-im/telegram-desktop
-	sys-libs/glibc
-	dev-libs/glib:2
-	>=media-libs/fontconfig-2.13
-	media-libs/freetype:2
-	virtual/opengl
-	x11-libs/gtk+:3[X,wayland]
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10
-"
-
-src_prepare() {
-	default
-
-	sed -i -e \
-		's/^Exec=@CMAKE_INSTALL_FULL_BINDIR@\/telegram-desktop/Exec=\/usr\/bin\/telegram-desktop/' \
-		"${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service || die
-}
-
-src_install() {
-	newbin Telegram telegram-desktop
-
-	insinto /usr/share/TelegramDesktop/externalupdater.d/
-	newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
-
-	local icon_size
-	for icon_size in 16 32 48 64 128 256 512; do
-		newicon -s "${icon_size}" \
-			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
-			telegram.png
-	done
-
-	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop
-	insinto /usr/share/dbus-1/services
-	doins "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "spell checker support" app-text/enchant
-}
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index cbaeaccc5eea..b2720b8f6241 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,3 +1,2 @@
-DIST tdesktop-5.5.5-full.tar.gz 70112426 BLAKE2B 21cdb01d66ea1d1b7479995d790fc44d65248c807dafb25d865970a0d619483ccccd99c8d64b6853d8aa29c78c73010f14e720bf707c918e7c3bb5cb2428dde5 SHA512 88cd526fb02b7b0459cb1bd1b0c57147b2261e57c392d2cb62964015ef6b26e202fba717b35d74201c41becf0a5d78ef4d9d593b5666b3f0a0db646e40bfd1fc
-DIST tdesktop-5.8.3-full.tar.gz 70450970 BLAKE2B 475d70beaf08898d69888a7484409886f894f2327eaae3027b22d10bf0926369542141a959474f74c7a1bb7c50c8981f407a7695e363708dbdb32c4eed393d9a SHA512 272c677544fdca4e2a7e24a5821fb0e99f9caef4388d577c47442351ff1939837163fb2d83a2ec929b92c60197608ed968b5f98b180735218b6cf57cdd501327
+DIST tdesktop-5.10.0-full.tar.gz 72526377 BLAKE2B 179bb59fa9e10f850a7c99f9c2c8f8d33f6b5e54977b143e7dc9532ff4c78cb6eb8c0d00c1fe8b6bf1f84161c63668d960ce813d2d6206ad7ae0237327828f9f SHA512 d85fc191fe629a845db221f1910eabccbf5993cf01ecad61e6427b765c0e6760f93d8a125683fbf4f38b1a84d793073b7c8df6d65fcdf4c50a3504ab51626e37
 DIST tdesktop-5.9.0-full.tar.gz 72447849 BLAKE2B 269fbc9aea24291b8d9e16024a3e2af789d048ecdef22b301fff50684227c39e2f8589259963a194729c3afeb7d69e1241017991490d2370dc6be14a4c86eecc SHA512 378735399cfd3557d473723fcf35b52fccb17c96bc8ce8e3d54658e4d955c750743aa44e5b3fe905a01276030fe4df8618fe8647e71cd5100409b339482b73c2
diff --git a/net-im/telegram-desktop/files/tdesktop-5.8.3-webkit-no-wayland.patch b/net-im/telegram-desktop/files/tdesktop-5.8.3-webkit-no-wayland.patch
deleted file mode 100644
index b2235fbb4481..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-5.8.3-webkit-no-wayland.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix failure when building webkit without wayland support
-
---- tdesktop-5.8.3-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk.cpp
-+++ tdesktop-5.8.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk.cpp
-@@ -730,9 +730,11 @@
- 
- void Instance::setOpaqueBg(QColor opaqueBg) {
- 	if (_remoting) {
-+#ifdef DESKTOP_APP_WEBVIEW_WAYLAND_COMPOSITOR
- 		if (const auto widget = qobject_cast<QQuickWidget*>(_widget.get())) {
- 			widget->setClearColor(opaqueBg);
- 		}
-+#endif
- 
- 		if (!_helper) {
- 			return;
diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml
index f910759e757c..526a64b15115 100644
--- a/net-im/telegram-desktop/metadata.xml
+++ b/net-im/telegram-desktop/metadata.xml
@@ -22,7 +22,6 @@
 		<flag name="fonts">Use builtin patched copy of open-sans fonts (overrides fontconfig)</flag>
 		<flag name="libdispatch">Use <pkg>dev-libs/libdispatch</pkg> to speed up concurrent code execution</flag>
 		<flag name="qt6">Build with Qt6 support</flag>
-		<flag name="qt6-imageformats">Add support for HEIF, AVIF and JpegXL by bundling kde-frameworks/kimageformats</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">telegramdesktop/tdesktop</remote-id>
diff --git a/net-im/telegram-desktop/telegram-desktop-5.10.0-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-5.10.0-r1.ebuild
new file mode 100644
index 000000000000..ef5345800daa
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-5.10.0-r1.ebuild
@@ -0,0 +1,243 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit xdg cmake python-any-r1 optfeature flag-o-matic
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org https://github.com/telegramdesktop/tdesktop"
+
+MY_P="tdesktop-${PV}-full"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+IUSE="dbus enchant +fonts +jemalloc +libdispatch screencast qt6 wayland webkit +X"
+
+CDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	dev-cpp/abseil-cpp:=
+	dev-cpp/ada:=
+	>=dev-cpp/glibmm-2.77:2.68
+	dev-libs/glib:2
+	dev-libs/openssl:=
+	>=dev-libs/protobuf-21.12
+	dev-libs/xxhash
+	media-libs/libjpeg-turbo:=
+	~media-libs/libtgvoip-2.4.4_p20240706
+	media-libs/openal
+	media-libs/opus
+	media-libs/rnnoise
+	~media-libs/tg_owt-0_pre20241202:=[screencast=,X=]
+	>=media-video/ffmpeg-6:=[opus,vpx]
+	sys-libs/zlib:=[minizip]
+	!enchant? ( >=app-text/hunspell-1.7:= )
+	enchant? ( app-text/enchant:= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	libdispatch? ( dev-libs/libdispatch )
+	!qt6? (
+		>=dev-qt/qtcore-5.15:5=
+		>=dev-qt/qtgui-5.15:5=[dbus?,jpeg,png,wayland?,X?]
+		>=dev-qt/qtimageformats-5.15:5
+		>=dev-qt/qtnetwork-5.15:5[ssl]
+		>=dev-qt/qtsvg-5.15:5
+		>=dev-qt/qtwidgets-5.15:5[png,X?]
+		kde-frameworks/kcoreaddons:5
+		webkit? ( wayland? (
+			>=dev-qt/qtdeclarative-5.15:5
+			>=dev-qt/qtwayland-5.15:5[compositor(+)]
+		) )
+	)
+	qt6? (
+		>=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?]
+		>=dev-qt/qtimageformats-6.5:6
+		>=dev-qt/qtsvg-6.5:6
+		webkit? ( wayland? (
+			>=dev-qt/qtdeclarative-6.5:6
+			>=dev-qt/qtwayland-6.5:6[compositor,qml]
+		) )
+	)
+	X? (
+		x11-libs/libxcb:=
+		x11-libs/xcb-util-keysyms
+	)
+"
+RDEPEND="${CDEPEND}
+	webkit? ( || ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:6 ) )
+"
+DEPEND="${CDEPEND}
+	>=dev-cpp/cppgir-2.0_p20240315
+	>=dev-cpp/ms-gsl-4.1.0
+	dev-cpp/expected-lite
+	dev-cpp/range-v3
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-build/cmake-3.16
+	>=dev-cpp/cppgir-2.0_p20240315
+	dev-libs/gobject-introspection
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+	wayland? ( dev-util/wayland-scanner )
+"
+
+PATCHES=(
+	"${FILESDIR}"/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch
+	"${FILESDIR}"/tdesktop-4.10.0-system-cppgir.patch
+	"${FILESDIR}"/tdesktop-5.2.2-qt6-no-wayland.patch
+	"${FILESDIR}"/tdesktop-5.2.2-libdispatch.patch
+	"${FILESDIR}"/tdesktop-5.7.2-cstring.patch
+	"${FILESDIR}"/tdesktop-5.8.3-cstdint.patch
+)
+
+pkg_pretend() {
+	if has ccache ${FEATURES}; then
+		ewarn "ccache does not work with ${PN} out of the box"
+		ewarn "due to usage of precompiled headers"
+		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# Happily fail if libraries aren't found...
+	find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \
+		\! -path './Telegram/lib_webview/CMakeLists.txt' \
+		\! -path './cmake/external/expected/CMakeLists.txt' \
+		\! -path './cmake/external/kcoreaddons/CMakeLists.txt' \
+		\! -path './cmake/external/qt/package.cmake' \
+		-print0 | xargs -0 sed -i \
+		-e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \
+		-e '/find_package(/s/)/ REQUIRED)/' || die
+	# Make sure to check the excluded files for new
+	# CMAKE_DISABLE_FIND_PACKAGE entries.
+
+	# Control QtDBus dependency from here, to avoid messing with QtGui.
+	# QtGui will use find_package to find QtDbus as well, which
+	# conflicts with the -DCMAKE_DISABLE_FIND_PACKAGE method.
+	if ! use dbus; then
+		sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \
+			-i cmake/external/qt/package.cmake || die
+	fi
+
+	# Control automagic dep only needed when USE="webkit wayland"
+	if ! use webkit || ! use wayland; then
+		sed -e 's/QT_CONFIG(wayland_compositor_quick)/0/' \
+			-i Telegram/lib_webview/webview/platform/linux/webview_linux_compositor.h || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Having user paths sneak into the build environment through the
+	# XDG_DATA_DIRS variable causes all sorts of weirdness with cppgir:
+	# - bug 909038: can't read from flatpak directories (fixed upstream)
+	# - bug 920819: system-wide directories ignored when variable is set
+	export XDG_DATA_DIRS="${EPREFIX}/usr/share"
+
+	# Evil flag (bug #919201)
+	filter-flags -fno-delete-null-pointer-checks
+
+	# The ABI of media-libs/tg_owt breaks if the -DNDEBUG flag doesn't keep
+	# the same state across both projects.
+	# See https://bugs.gentoo.org/866055
+	append-cppflags -DNDEBUG
+
+	# https://github.com/telegramdesktop/tdesktop/issues/17437#issuecomment-1001160398
+	use !libdispatch && append-cppflags -DCRL_FORCE_QT
+
+	local use_webkit_wayland=$(use webkit && use wayland && echo yes || echo no)
+	local qt=$(usex qt6 6 5)
+	local mycmakeargs=(
+		-DQT_VERSION_MAJOR=${qt}
+
+		# Override new cmake.eclass defaults (https://bugs.gentoo.org/921939)
+		# Upstream never tests this any other way
+		-DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF
+
+		# Control automagic dependencies on certain packages
+		## Header-only lib, some git version.
+		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=${use_webkit_wayland}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=${use_webkit_wayland}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=${use_webkit_wayland}
+		## KF6CoreAddons is currently unavailable in ::gentoo
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6)
+
+		-DDESKTOP_APP_USE_LIBDISPATCH=$(usex libdispatch)
+		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
+		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
+		-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
+		## Enables enchant and disables hunspell
+		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)
+		## Use system fonts instead of bundled ones
+		-DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts)
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
+		# Building with snapcraft API credentials by default
+		# Custom API credentials can be obtained here:
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
+		# After getting credentials you can export variables:
+		#  export MY_TDESKTOP_API_ID="17349""
+		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
+		# and restart the build"
+		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
+		# portage will use custom variable every build automatically
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="611335"
+			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! use X && ! use screencast; then
+		ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!"
+		ewarn
+	fi
+	if ! use jemalloc && use elibc_glibc; then
+		# https://github.com/telegramdesktop/tdesktop/issues/16084
+		# https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003
+		ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!"
+		ewarn "Do NOT report issues about RAM usage without enabling this flag first."
+		ewarn
+	fi
+	if ! use libdispatch; then
+		ewarn "Disabling USE=libdispatch may cause performance degradation"
+		ewarn "due to fallback to poor QThreadPool! Please see"
+		ewarn "https://github.com/telegramdesktop/tdesktop/wiki/The-Packaged-Building-Mode"
+		ewarn
+	fi
+	if use wayland && ! use qt6; then
+		ewarn "Wayland-specific integrations have been deprecated with Qt5."
+		ewarn "The app will continue to function under wayland, but some"
+		ewarn "functionality may be reduced."
+		ewarn "These integrations are only supported when built with Qt6."
+		ewarn
+	fi
+	optfeature_header
+	if ! use qt6; then
+		optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats:5[avif,heif,jpegxl]
+	else
+		optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats:6[avif,heif,jpegxl]
+	fi
+}
diff --git a/net-im/telegram-desktop/telegram-desktop-5.5.5.ebuild b/net-im/telegram-desktop/telegram-desktop-5.5.5.ebuild
deleted file mode 100644
index 267bc8810402..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-5.5.5.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit xdg cmake python-any-r1 optfeature flag-o-matic
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org https://github.com/telegramdesktop/tdesktop"
-
-MY_P="tdesktop-${PV}-full"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-IUSE="dbus enchant +fonts +jemalloc +libdispatch screencast qt6 qt6-imageformats wayland webkit +X"
-REQUIRED_USE="
-	qt6-imageformats? ( qt6 )
-"
-
-KIMAGEFORMATS_RDEPEND="
-	media-libs/libavif:=
-	media-libs/libheif:=
-	>=media-libs/libjxl-0.8.0:=
-"
-CDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	dev-cpp/abseil-cpp:=
-	dev-cpp/ada:=
-	>=dev-cpp/glibmm-2.77:2.68
-	dev-libs/glib:2
-	dev-libs/openssl:=
-	dev-libs/protobuf
-	dev-libs/xxhash
-	media-libs/libjpeg-turbo:=
-	~media-libs/libtgvoip-2.4.4_p20240706
-	media-libs/openal
-	media-libs/opus
-	media-libs/rnnoise
-	~media-libs/tg_owt-0_pre20240804:=[screencast=,X=]
-	media-video/ffmpeg:=[opus,vpx]
-	sys-libs/zlib:=[minizip]
-	!enchant? ( >=app-text/hunspell-1.7:= )
-	enchant? ( app-text/enchant:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	libdispatch? ( dev-libs/libdispatch )
-	!qt6? (
-		>=dev-qt/qtcore-5.15:5=
-		>=dev-qt/qtgui-5.15:5=[dbus?,jpeg,png,wayland?,X?]
-		>=dev-qt/qtimageformats-5.15:5
-		>=dev-qt/qtnetwork-5.15:5[ssl]
-		>=dev-qt/qtsvg-5.15:5
-		>=dev-qt/qtwidgets-5.15:5[png,X?]
-		kde-frameworks/kcoreaddons:5
-		webkit? (
-			>=dev-qt/qtdeclarative-5.15:5
-			>=dev-qt/qtwayland-5.15:5[compositor(+)]
-		)
-	)
-	qt6? (
-		>=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?]
-		>=dev-qt/qtimageformats-6.5:6
-		>=dev-qt/qtsvg-6.5:6
-		webkit? (
-			>=dev-qt/qtdeclarative-6.5:6
-			>=dev-qt/qtwayland-6.5:6[compositor,qml]
-		)
-		qt6-imageformats? (
-			>=dev-qt/qtimageformats-6.5:6=
-			${KIMAGEFORMATS_RDEPEND}
-		)
-	)
-	X? (
-		x11-libs/libxcb:=
-		x11-libs/xcb-util-keysyms
-	)
-"
-RDEPEND="${CDEPEND}
-	webkit? ( || ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:6 ) )
-"
-DEPEND="${CDEPEND}
-	>=dev-cpp/cppgir-2.0_p20240315
-	>=dev-cpp/ms-gsl-4
-	dev-cpp/expected-lite
-	dev-cpp/range-v3
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-build/cmake-3.16
-	>=dev-cpp/cppgir-2.0_p20240315
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	wayland? ( dev-util/wayland-scanner )
-"
-
-PATCHES=(
-	"${FILESDIR}"/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch
-	"${FILESDIR}"/tdesktop-4.10.0-system-cppgir.patch
-	"${FILESDIR}"/tdesktop-5.2.2-qt6-no-wayland.patch
-	"${FILESDIR}"/tdesktop-5.2.2-libdispatch.patch
-)
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Bundle kde-frameworks/kimageformats for qt6, since it's impossible to
-	#   build in gentoo right now.
-	if use qt6-imageformats; then
-		sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \
-			cmake/external/kimageformats/CMakeLists.txt || die
-		printf '%s\n' \
-			'Q_IMPORT_PLUGIN(QAVIFPlugin)' \
-			'Q_IMPORT_PLUGIN(HEIFPlugin)' \
-			'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \
-			>> cmake/external/qt/qt_static_plugins/qt_static_plugins.cpp || die
-	fi
-	# kde-frameworks/kcoreaddons is bundled when using qt6.
-
-	# Happily fail if libraries aren't found...
-	find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \
-		\! -path './Telegram/lib_webview/CMakeLists.txt' \
-		\! -path './cmake/external/expected/CMakeLists.txt' \
-		\! -path './cmake/external/kcoreaddons/CMakeLists.txt' \
-		\! -path './cmake/external/qt/package.cmake' \
-		-print0 | xargs -0 sed -i \
-		-e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \
-		-e '/find_package(/s/)/ REQUIRED)/' || die
-	# Make sure to check the excluded files for new
-	# CMAKE_DISABLE_FIND_PACKAGE entries.
-
-	# Control QtDBus dependency from here, to avoid messing with QtGui.
-	# QtGui will use find_package to find QtDbus as well, which
-	# conflicts with the -DCMAKE_DISABLE_FIND_PACKAGE method.
-	if ! use dbus; then
-		sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \
-			-i cmake/external/qt/package.cmake || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Having user paths sneak into the build environment through the
-	# XDG_DATA_DIRS variable causes all sorts of weirdness with cppgir:
-	# - bug 909038: can't read from flatpak directories (fixed upstream)
-	# - bug 920819: system-wide directories ignored when variable is set
-	export XDG_DATA_DIRS="${EPREFIX}/usr/share"
-
-	# Evil flag (bug #919201)
-	filter-flags -fno-delete-null-pointer-checks
-
-	# The ABI of media-libs/tg_owt breaks if the -DNDEBUG flag doesn't keep
-	# the same state across both projects.
-	# See https://bugs.gentoo.org/866055
-	append-cppflags '-DNDEBUG'
-
-	# https://github.com/telegramdesktop/tdesktop/issues/17437#issuecomment-1001160398
-	use !libdispatch && append-cppflags -DCRL_FORCE_QT
-
-	local qt=$(usex qt6 6 5)
-	local mycmakeargs=(
-		-DQT_VERSION_MAJOR=${qt}
-
-		# Override new cmake.eclass defaults (https://bugs.gentoo.org/921939)
-		# Upstream never tests this any other way
-		-DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF
-
-		# Control automagic dependencies on certain packages
-		## Header-only lib, some git version.
-		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=$(usex !webkit)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=$(usex !webkit)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland)
-		## Only used in Telegram/lib_webview/CMakeLists.txt
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=$(usex !webkit)
-		## KF6CoreAddons is currently unavailable in ::gentoo
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6)
-
-		-DDESKTOP_APP_USE_LIBDISPATCH=$(usex libdispatch)
-		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
-		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
-		-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
-		## Enables enchant and disables hunspell
-		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)
-		## Use system fonts instead of bundled ones
-		-DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts)
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! use X && ! use screencast; then
-		ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!"
-		ewarn
-	fi
-	if ! use jemalloc && use elibc_glibc; then
-		# https://github.com/telegramdesktop/tdesktop/issues/16084
-		# https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003
-		ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!"
-		ewarn "Do NOT report issues about RAM usage without enabling this flag first."
-		ewarn
-	fi
-	if ! use libdispatch; then
-		ewarn "Disabling USE=libdispatch may cause performance degradation"
-		ewarn "due to fallback to poor QThreadPool! Please see"
-		ewarn "https://github.com/telegramdesktop/tdesktop/wiki/The-Packaged-Building-Mode"
-		ewarn
-	fi
-	if use wayland && ! use qt6; then
-		ewarn "Wayland-specific integrations have been deprecated with Qt5."
-		ewarn "The app will continue to function under wayland, but some"
-		ewarn "functionality may be reduced."
-		ewarn "These integrations are only supported when built with Qt6."
-		ewarn
-	fi
-	if use qt6 && ! use qt6-imageformats; then
-		elog "Enable USE=qt6-imageformats for AVIF, HEIF and JpegXL support"
-		elog
-	fi
-	optfeature_header
-	if ! use qt6; then
-		optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl]
-	fi
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-5.8.3-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-5.8.3-r1.ebuild
deleted file mode 100644
index a1346e36663d..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-5.8.3-r1.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit xdg cmake python-any-r1 optfeature flag-o-matic
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org https://github.com/telegramdesktop/tdesktop"
-
-MY_P="tdesktop-${PV}-full"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
-IUSE="dbus enchant +fonts +jemalloc +libdispatch screencast qt6 wayland webkit +X"
-
-CDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	dev-cpp/abseil-cpp:=
-	dev-cpp/ada:=
-	>=dev-cpp/glibmm-2.77:2.68
-	dev-libs/glib:2
-	dev-libs/openssl:=
-	>=dev-libs/protobuf-21.12
-	dev-libs/xxhash
-	media-libs/libjpeg-turbo:=
-	~media-libs/libtgvoip-2.4.4_p20240706
-	media-libs/openal
-	media-libs/opus
-	media-libs/rnnoise
-	~media-libs/tg_owt-0_pre20240804:=[screencast=,X=]
-	media-video/ffmpeg:=[opus,vpx]
-	sys-libs/zlib:=[minizip]
-	!enchant? ( >=app-text/hunspell-1.7:= )
-	enchant? ( app-text/enchant:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	libdispatch? ( dev-libs/libdispatch )
-	!qt6? (
-		>=dev-qt/qtcore-5.15:5=
-		>=dev-qt/qtgui-5.15:5=[dbus?,jpeg,png,wayland?,X?]
-		>=dev-qt/qtimageformats-5.15:5
-		>=dev-qt/qtnetwork-5.15:5[ssl]
-		>=dev-qt/qtsvg-5.15:5
-		>=dev-qt/qtwidgets-5.15:5[png,X?]
-		kde-frameworks/kcoreaddons:5
-		webkit? ( wayland? (
-			>=dev-qt/qtdeclarative-5.15:5
-			>=dev-qt/qtwayland-5.15:5[compositor(+)]
-		) )
-	)
-	qt6? (
-		>=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?]
-		>=dev-qt/qtimageformats-6.5:6
-		>=dev-qt/qtsvg-6.5:6
-		webkit? ( wayland? (
-			>=dev-qt/qtdeclarative-6.5:6
-			>=dev-qt/qtwayland-6.5:6[compositor,qml]
-		) )
-	)
-	X? (
-		x11-libs/libxcb:=
-		x11-libs/xcb-util-keysyms
-	)
-"
-RDEPEND="${CDEPEND}
-	webkit? ( || ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:6 ) )
-"
-DEPEND="${CDEPEND}
-	>=dev-cpp/cppgir-2.0_p20240315
-	>=dev-cpp/ms-gsl-4.1.0
-	dev-cpp/expected-lite
-	dev-cpp/range-v3
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-build/cmake-3.16
-	>=dev-cpp/cppgir-2.0_p20240315
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	wayland? ( dev-util/wayland-scanner )
-"
-
-PATCHES=(
-	"${FILESDIR}"/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch
-	"${FILESDIR}"/tdesktop-4.10.0-system-cppgir.patch
-	"${FILESDIR}"/tdesktop-5.2.2-qt6-no-wayland.patch
-	"${FILESDIR}"/tdesktop-5.2.2-libdispatch.patch
-	"${FILESDIR}"/tdesktop-5.7.2-cstring.patch
-	"${FILESDIR}"/tdesktop-5.8.3-webkit-no-wayland.patch
-	"${FILESDIR}"/tdesktop-5.8.3-cstdint.patch
-)
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Happily fail if libraries aren't found...
-	find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \
-		\! -path './Telegram/lib_webview/CMakeLists.txt' \
-		\! -path './cmake/external/expected/CMakeLists.txt' \
-		\! -path './cmake/external/kcoreaddons/CMakeLists.txt' \
-		\! -path './cmake/external/qt/package.cmake' \
-		-print0 | xargs -0 sed -i \
-		-e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \
-		-e '/find_package(/s/)/ REQUIRED)/' || die
-	# Make sure to check the excluded files for new
-	# CMAKE_DISABLE_FIND_PACKAGE entries.
-
-	# Control QtDBus dependency from here, to avoid messing with QtGui.
-	# QtGui will use find_package to find QtDbus as well, which
-	# conflicts with the -DCMAKE_DISABLE_FIND_PACKAGE method.
-	if ! use dbus; then
-		sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \
-			-i cmake/external/qt/package.cmake || die
-	fi
-
-	# Control automagic dep only needed when USE="webkit wayland"
-	if ! use webkit || ! use wayland; then
-		sed -e 's/QT_CONFIG(wayland_compositor_quick)/0/' \
-			-i Telegram/Telegram/lib_webview/webview/platform/linux/webview_linux_compositor.h
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Having user paths sneak into the build environment through the
-	# XDG_DATA_DIRS variable causes all sorts of weirdness with cppgir:
-	# - bug 909038: can't read from flatpak directories (fixed upstream)
-	# - bug 920819: system-wide directories ignored when variable is set
-	export XDG_DATA_DIRS="${EPREFIX}/usr/share"
-
-	# Evil flag (bug #919201)
-	filter-flags -fno-delete-null-pointer-checks
-
-	# The ABI of media-libs/tg_owt breaks if the -DNDEBUG flag doesn't keep
-	# the same state across both projects.
-	# See https://bugs.gentoo.org/866055
-	append-cppflags -DNDEBUG
-
-	# https://github.com/telegramdesktop/tdesktop/issues/17437#issuecomment-1001160398
-	use !libdispatch && append-cppflags -DCRL_FORCE_QT
-
-	local use_webkit_wayland=$(use webkit && use wayland && echo yes || echo no)
-	local qt=$(usex qt6 6 5)
-	local mycmakeargs=(
-		-DQT_VERSION_MAJOR=${qt}
-
-		# Override new cmake.eclass defaults (https://bugs.gentoo.org/921939)
-		# Upstream never tests this any other way
-		-DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF
-
-		# Control automagic dependencies on certain packages
-		## Header-only lib, some git version.
-		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=${use_webkit_wayland}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=${use_webkit_wayland}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=${use_webkit_wayland}
-		## KF6CoreAddons is currently unavailable in ::gentoo
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6)
-
-		-DDESKTOP_APP_USE_LIBDISPATCH=$(usex libdispatch)
-		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
-		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
-		-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
-		## Enables enchant and disables hunspell
-		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)
-		## Use system fonts instead of bundled ones
-		-DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts)
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! use X && ! use screencast; then
-		ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!"
-		ewarn
-	fi
-	if ! use jemalloc && use elibc_glibc; then
-		# https://github.com/telegramdesktop/tdesktop/issues/16084
-		# https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003
-		ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!"
-		ewarn "Do NOT report issues about RAM usage without enabling this flag first."
-		ewarn
-	fi
-	if ! use libdispatch; then
-		ewarn "Disabling USE=libdispatch may cause performance degradation"
-		ewarn "due to fallback to poor QThreadPool! Please see"
-		ewarn "https://github.com/telegramdesktop/tdesktop/wiki/The-Packaged-Building-Mode"
-		ewarn
-	fi
-	if use wayland && ! use qt6; then
-		ewarn "Wayland-specific integrations have been deprecated with Qt5."
-		ewarn "The app will continue to function under wayland, but some"
-		ewarn "functionality may be reduced."
-		ewarn "These integrations are only supported when built with Qt6."
-		ewarn
-	fi
-	optfeature_header
-	if ! use qt6; then
-		optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats:5[avif,heif,jpegxl]
-	else
-		optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats:6[avif,heif,jpegxl]
-	fi
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-5.9.0-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-5.9.0-r1.ebuild
deleted file mode 100644
index 65bdd0fb2274..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-5.9.0-r1.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 2020-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit xdg cmake python-any-r1 optfeature flag-o-matic
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org https://github.com/telegramdesktop/tdesktop"
-
-MY_P="tdesktop-${PV}-full"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~riscv"
-IUSE="dbus enchant +fonts +jemalloc +libdispatch screencast qt6 wayland webkit +X"
-
-CDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	dev-cpp/abseil-cpp:=
-	dev-cpp/ada:=
-	>=dev-cpp/glibmm-2.77:2.68
-	dev-libs/glib:2
-	dev-libs/openssl:=
-	>=dev-libs/protobuf-21.12
-	dev-libs/xxhash
-	media-libs/libjpeg-turbo:=
-	~media-libs/libtgvoip-2.4.4_p20240706
-	media-libs/openal
-	media-libs/opus
-	media-libs/rnnoise
-	~media-libs/tg_owt-0_pre20241202:=[screencast=,X=]
-	>=media-video/ffmpeg-6:=[opus,vpx]
-	sys-libs/zlib:=[minizip]
-	!enchant? ( >=app-text/hunspell-1.7:= )
-	enchant? ( app-text/enchant:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	libdispatch? ( dev-libs/libdispatch )
-	!qt6? (
-		>=dev-qt/qtcore-5.15:5=
-		>=dev-qt/qtgui-5.15:5=[dbus?,jpeg,png,wayland?,X?]
-		>=dev-qt/qtimageformats-5.15:5
-		>=dev-qt/qtnetwork-5.15:5[ssl]
-		>=dev-qt/qtsvg-5.15:5
-		>=dev-qt/qtwidgets-5.15:5[png,X?]
-		kde-frameworks/kcoreaddons:5
-		webkit? ( wayland? (
-			>=dev-qt/qtdeclarative-5.15:5
-			>=dev-qt/qtwayland-5.15:5[compositor(+)]
-		) )
-	)
-	qt6? (
-		>=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?]
-		>=dev-qt/qtimageformats-6.5:6
-		>=dev-qt/qtsvg-6.5:6
-		webkit? ( wayland? (
-			>=dev-qt/qtdeclarative-6.5:6
-			>=dev-qt/qtwayland-6.5:6[compositor,qml]
-		) )
-	)
-	X? (
-		x11-libs/libxcb:=
-		x11-libs/xcb-util-keysyms
-	)
-"
-RDEPEND="${CDEPEND}
-	webkit? ( || ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:6 ) )
-"
-DEPEND="${CDEPEND}
-	>=dev-cpp/cppgir-2.0_p20240315
-	>=dev-cpp/ms-gsl-4.1.0
-	dev-cpp/expected-lite
-	dev-cpp/range-v3
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-build/cmake-3.16
-	>=dev-cpp/cppgir-2.0_p20240315
-	dev-libs/gobject-introspection
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	wayland? ( dev-util/wayland-scanner )
-"
-
-PATCHES=(
-	"${FILESDIR}"/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch
-	"${FILESDIR}"/tdesktop-4.10.0-system-cppgir.patch
-	"${FILESDIR}"/tdesktop-5.2.2-qt6-no-wayland.patch
-	"${FILESDIR}"/tdesktop-5.2.2-libdispatch.patch
-	"${FILESDIR}"/tdesktop-5.7.2-cstring.patch
-	"${FILESDIR}"/tdesktop-5.8.3-cstdint.patch
-)
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Happily fail if libraries aren't found...
-	find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \
-		\! -path './Telegram/lib_webview/CMakeLists.txt' \
-		\! -path './cmake/external/expected/CMakeLists.txt' \
-		\! -path './cmake/external/kcoreaddons/CMakeLists.txt' \
-		\! -path './cmake/external/qt/package.cmake' \
-		-print0 | xargs -0 sed -i \
-		-e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \
-		-e '/find_package(/s/)/ REQUIRED)/' || die
-	# Make sure to check the excluded files for new
-	# CMAKE_DISABLE_FIND_PACKAGE entries.
-
-	# Control QtDBus dependency from here, to avoid messing with QtGui.
-	# QtGui will use find_package to find QtDbus as well, which
-	# conflicts with the -DCMAKE_DISABLE_FIND_PACKAGE method.
-	if ! use dbus; then
-		sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \
-			-i cmake/external/qt/package.cmake || die
-	fi
-
-	# Control automagic dep only needed when USE="webkit wayland"
-	if ! use webkit || ! use wayland; then
-		sed -e 's/QT_CONFIG(wayland_compositor_quick)/0/' \
-			-i Telegram/Telegram/lib_webview/webview/platform/linux/webview_linux_compositor.h
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Having user paths sneak into the build environment through the
-	# XDG_DATA_DIRS variable causes all sorts of weirdness with cppgir:
-	# - bug 909038: can't read from flatpak directories (fixed upstream)
-	# - bug 920819: system-wide directories ignored when variable is set
-	export XDG_DATA_DIRS="${EPREFIX}/usr/share"
-
-	# Evil flag (bug #919201)
-	filter-flags -fno-delete-null-pointer-checks
-
-	# The ABI of media-libs/tg_owt breaks if the -DNDEBUG flag doesn't keep
-	# the same state across both projects.
-	# See https://bugs.gentoo.org/866055
-	append-cppflags -DNDEBUG
-
-	# https://github.com/telegramdesktop/tdesktop/issues/17437#issuecomment-1001160398
-	use !libdispatch && append-cppflags -DCRL_FORCE_QT
-
-	local use_webkit_wayland=$(use webkit && use wayland && echo yes || echo no)
-	local qt=$(usex qt6 6 5)
-	local mycmakeargs=(
-		-DQT_VERSION_MAJOR=${qt}
-
-		# Override new cmake.eclass defaults (https://bugs.gentoo.org/921939)
-		# Upstream never tests this any other way
-		-DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF
-
-		# Control automagic dependencies on certain packages
-		## Header-only lib, some git version.
-		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=${use_webkit_wayland}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=${use_webkit_wayland}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=${use_webkit_wayland}
-		## KF6CoreAddons is currently unavailable in ::gentoo
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6)
-
-		-DDESKTOP_APP_USE_LIBDISPATCH=$(usex libdispatch)
-		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
-		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
-		-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
-		## Enables enchant and disables hunspell
-		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)
-		## Use system fonts instead of bundled ones
-		-DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts)
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! use X && ! use screencast; then
-		ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!"
-		ewarn
-	fi
-	if ! use jemalloc && use elibc_glibc; then
-		# https://github.com/telegramdesktop/tdesktop/issues/16084
-		# https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003
-		ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!"
-		ewarn "Do NOT report issues about RAM usage without enabling this flag first."
-		ewarn
-	fi
-	if ! use libdispatch; then
-		ewarn "Disabling USE=libdispatch may cause performance degradation"
-		ewarn "due to fallback to poor QThreadPool! Please see"
-		ewarn "https://github.com/telegramdesktop/tdesktop/wiki/The-Packaged-Building-Mode"
-		ewarn
-	fi
-	if use wayland && ! use qt6; then
-		ewarn "Wayland-specific integrations have been deprecated with Qt5."
-		ewarn "The app will continue to function under wayland, but some"
-		ewarn "functionality may be reduced."
-		ewarn "These integrations are only supported when built with Qt6."
-		ewarn
-	fi
-	optfeature_header
-	if ! use qt6; then
-		optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats:5[avif,heif,jpegxl]
-	else
-		optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats:6[avif,heif,jpegxl]
-	fi
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-5.9.0-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-5.9.0-r2.ebuild
new file mode 100644
index 000000000000..f820c72628bc
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-5.9.0-r2.ebuild
@@ -0,0 +1,243 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit xdg cmake python-any-r1 optfeature flag-o-matic
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org https://github.com/telegramdesktop/tdesktop"
+
+MY_P="tdesktop-${PV}-full"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv"
+IUSE="dbus enchant +fonts +jemalloc +libdispatch screencast qt6 wayland webkit +X"
+
+CDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	dev-cpp/abseil-cpp:=
+	dev-cpp/ada:=
+	>=dev-cpp/glibmm-2.77:2.68
+	dev-libs/glib:2
+	dev-libs/openssl:=
+	>=dev-libs/protobuf-21.12
+	dev-libs/xxhash
+	media-libs/libjpeg-turbo:=
+	~media-libs/libtgvoip-2.4.4_p20240706
+	media-libs/openal
+	media-libs/opus
+	media-libs/rnnoise
+	~media-libs/tg_owt-0_pre20241202:=[screencast=,X=]
+	>=media-video/ffmpeg-6:=[opus,vpx]
+	sys-libs/zlib:=[minizip]
+	!enchant? ( >=app-text/hunspell-1.7:= )
+	enchant? ( app-text/enchant:= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	libdispatch? ( dev-libs/libdispatch )
+	!qt6? (
+		>=dev-qt/qtcore-5.15:5=
+		>=dev-qt/qtgui-5.15:5=[dbus?,jpeg,png,wayland?,X?]
+		>=dev-qt/qtimageformats-5.15:5
+		>=dev-qt/qtnetwork-5.15:5[ssl]
+		>=dev-qt/qtsvg-5.15:5
+		>=dev-qt/qtwidgets-5.15:5[png,X?]
+		kde-frameworks/kcoreaddons:5
+		webkit? ( wayland? (
+			>=dev-qt/qtdeclarative-5.15:5
+			>=dev-qt/qtwayland-5.15:5[compositor(+)]
+		) )
+	)
+	qt6? (
+		>=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?]
+		>=dev-qt/qtimageformats-6.5:6
+		>=dev-qt/qtsvg-6.5:6
+		webkit? ( wayland? (
+			>=dev-qt/qtdeclarative-6.5:6
+			>=dev-qt/qtwayland-6.5:6[compositor,qml]
+		) )
+	)
+	X? (
+		x11-libs/libxcb:=
+		x11-libs/xcb-util-keysyms
+	)
+"
+RDEPEND="${CDEPEND}
+	webkit? ( || ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:6 ) )
+"
+DEPEND="${CDEPEND}
+	>=dev-cpp/cppgir-2.0_p20240315
+	>=dev-cpp/ms-gsl-4.1.0
+	dev-cpp/expected-lite
+	dev-cpp/range-v3
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-build/cmake-3.16
+	>=dev-cpp/cppgir-2.0_p20240315
+	dev-libs/gobject-introspection
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+	wayland? ( dev-util/wayland-scanner )
+"
+
+PATCHES=(
+	"${FILESDIR}"/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch
+	"${FILESDIR}"/tdesktop-4.10.0-system-cppgir.patch
+	"${FILESDIR}"/tdesktop-5.2.2-qt6-no-wayland.patch
+	"${FILESDIR}"/tdesktop-5.2.2-libdispatch.patch
+	"${FILESDIR}"/tdesktop-5.7.2-cstring.patch
+	"${FILESDIR}"/tdesktop-5.8.3-cstdint.patch
+)
+
+pkg_pretend() {
+	if has ccache ${FEATURES}; then
+		ewarn "ccache does not work with ${PN} out of the box"
+		ewarn "due to usage of precompiled headers"
+		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# Happily fail if libraries aren't found...
+	find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \
+		\! -path './Telegram/lib_webview/CMakeLists.txt' \
+		\! -path './cmake/external/expected/CMakeLists.txt' \
+		\! -path './cmake/external/kcoreaddons/CMakeLists.txt' \
+		\! -path './cmake/external/qt/package.cmake' \
+		-print0 | xargs -0 sed -i \
+		-e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \
+		-e '/find_package(/s/)/ REQUIRED)/' || die
+	# Make sure to check the excluded files for new
+	# CMAKE_DISABLE_FIND_PACKAGE entries.
+
+	# Control QtDBus dependency from here, to avoid messing with QtGui.
+	# QtGui will use find_package to find QtDbus as well, which
+	# conflicts with the -DCMAKE_DISABLE_FIND_PACKAGE method.
+	if ! use dbus; then
+		sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \
+			-i cmake/external/qt/package.cmake || die
+	fi
+
+	# Control automagic dep only needed when USE="webkit wayland"
+	if ! use webkit || ! use wayland; then
+		sed -e 's/QT_CONFIG(wayland_compositor_quick)/0/' \
+			-i Telegram/lib_webview/webview/platform/linux/webview_linux_compositor.h || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Having user paths sneak into the build environment through the
+	# XDG_DATA_DIRS variable causes all sorts of weirdness with cppgir:
+	# - bug 909038: can't read from flatpak directories (fixed upstream)
+	# - bug 920819: system-wide directories ignored when variable is set
+	export XDG_DATA_DIRS="${EPREFIX}/usr/share"
+
+	# Evil flag (bug #919201)
+	filter-flags -fno-delete-null-pointer-checks
+
+	# The ABI of media-libs/tg_owt breaks if the -DNDEBUG flag doesn't keep
+	# the same state across both projects.
+	# See https://bugs.gentoo.org/866055
+	append-cppflags -DNDEBUG
+
+	# https://github.com/telegramdesktop/tdesktop/issues/17437#issuecomment-1001160398
+	use !libdispatch && append-cppflags -DCRL_FORCE_QT
+
+	local use_webkit_wayland=$(use webkit && use wayland && echo yes || echo no)
+	local qt=$(usex qt6 6 5)
+	local mycmakeargs=(
+		-DQT_VERSION_MAJOR=${qt}
+
+		# Override new cmake.eclass defaults (https://bugs.gentoo.org/921939)
+		# Upstream never tests this any other way
+		-DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF
+
+		# Control automagic dependencies on certain packages
+		## Header-only lib, some git version.
+		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=${use_webkit_wayland}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=${use_webkit_wayland}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=${use_webkit_wayland}
+		## KF6CoreAddons is currently unavailable in ::gentoo
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6)
+
+		-DDESKTOP_APP_USE_LIBDISPATCH=$(usex libdispatch)
+		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
+		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
+		-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
+		## Enables enchant and disables hunspell
+		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)
+		## Use system fonts instead of bundled ones
+		-DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts)
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
+		# Building with snapcraft API credentials by default
+		# Custom API credentials can be obtained here:
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
+		# After getting credentials you can export variables:
+		#  export MY_TDESKTOP_API_ID="17349""
+		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
+		# and restart the build"
+		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
+		# portage will use custom variable every build automatically
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="611335"
+			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! use X && ! use screencast; then
+		ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!"
+		ewarn
+	fi
+	if ! use jemalloc && use elibc_glibc; then
+		# https://github.com/telegramdesktop/tdesktop/issues/16084
+		# https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003
+		ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!"
+		ewarn "Do NOT report issues about RAM usage without enabling this flag first."
+		ewarn
+	fi
+	if ! use libdispatch; then
+		ewarn "Disabling USE=libdispatch may cause performance degradation"
+		ewarn "due to fallback to poor QThreadPool! Please see"
+		ewarn "https://github.com/telegramdesktop/tdesktop/wiki/The-Packaged-Building-Mode"
+		ewarn
+	fi
+	if use wayland && ! use qt6; then
+		ewarn "Wayland-specific integrations have been deprecated with Qt5."
+		ewarn "The app will continue to function under wayland, but some"
+		ewarn "functionality may be reduced."
+		ewarn "These integrations are only supported when built with Qt6."
+		ewarn
+	fi
+	optfeature_header
+	if ! use qt6; then
+		optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats:5[avif,heif,jpegxl]
+	else
+		optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats:6[avif,heif,jpegxl]
+	fi
+}
diff --git a/net-im/tokodon/Manifest b/net-im/tokodon/Manifest
index 5fa06ad17b61..e01399244465 100644
--- a/net-im/tokodon/Manifest
+++ b/net-im/tokodon/Manifest
@@ -1,2 +1,2 @@
 DIST tokodon-24.08.3.tar.xz 581996 BLAKE2B 5f155b7445239eb4854fc37f66c1550ca9eef0ea94815aa37fc3aa22c0e175a8a2aebcd009e3e32b8e17596b06d0e9e22f7e081282cffb2ce2a8e0f7bf5282e0 SHA512 9a798aa957a87f0fae984da59d859d92888e937fbe54eb1ea474a5ff363df4cfbbb1026891a159c100257e9793d59e267247e3380cdb8c44d78fa32edffd235f
-DIST tokodon-24.12.0.tar.xz 654968 BLAKE2B c8f4f1204c1151bb5b7cc5d0c2fbe6abdb4ec0a91ead9ead69480d4b5d7d20adf91e6ec0f9ad3c11e57e09f01c4d780265c3ebe65f5e337cb349c6961cf0313f SHA512 21a5522ec1986f8c362a644d9dc5f78aece3d37bc7809b1bca38158ac54169c92d3438a8315582f9ce0547ff908ec644c08cc902160989a4bf9fa56c054964c8
+DIST tokodon-24.12.1.tar.xz 658232 BLAKE2B 62ae0e783f30133a19225c512ce1e96c9bb4b73f61a434a5e556d97c50550db9ac655c48f860082286d2ce90c8b11b9e1a51def5e99a65096ea28be61bfa29c6 SHA512 38a5e76b537a359bd40223c75501bf651258d7ec28f20921c9f9430f8bda2f30347780f49f19c60ac885f64ba50128df0feaa9d5d6b956d0b8922d7d3fdce493
diff --git a/net-im/tokodon/tokodon-24.12.0.ebuild b/net-im/tokodon/tokodon-24.12.0.ebuild
deleted file mode 100644
index 46086c91751a..000000000000
--- a/net-im/tokodon/tokodon-24.12.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Mastodon client for Plasma and Plasma Mobile"
-HOMEPAGE="https://apps.kde.org/tokodon/"
-
-LICENSE="CC-BY-SA-4.0 GPL-2+ GPL-3+ || ( LGPL-2.1+ LGPL-3+ ) MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+mpv webengine"
-
-# TODO: Add kunifiedpush support once packaged (cd01eb31d1ec298d4c1e10d25a0781d799161bfc)
-DEPEND="
-	>=dev-libs/kirigami-addons-1.1.0:6
-	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=dev-qt/qtwebsockets-${QTMIN}:6
-	>=kde-frameworks/breeze-icons-${KFMIN}:*
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6[qml]
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/purpose-${KFMIN}:6
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
-	mpv? ( media-libs/mpvqt )
-	!mpv? ( >=dev-qt/qtmultimedia-${QTMIN}:6[qml] )
-	webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 )
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6[qml]
-"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QTMULTIMEDIA=$(usex !mpv)
-		$(cmake_use_find_package webengine Qt6WebView) # "only makes sense on mobile"
-	)
-
-	ecm_src_configure
-}
diff --git a/net-im/tokodon/tokodon-24.12.1.ebuild b/net-im/tokodon/tokodon-24.12.1.ebuild
new file mode 100644
index 000000000000..422eb8482946
--- /dev/null
+++ b/net-im/tokodon/tokodon-24.12.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Mastodon client for Plasma and Plasma Mobile"
+HOMEPAGE="https://apps.kde.org/tokodon/"
+
+LICENSE="CC-BY-SA-4.0 GPL-2+ GPL-3+ || ( LGPL-2.1+ LGPL-3+ ) MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+mpv webengine"
+
+# TODO: Add kunifiedpush support once packaged (cd01eb31d1ec298d4c1e10d25a0781d799161bfc)
+DEPEND="
+	>=dev-libs/kirigami-addons-1.1.0:6
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwebsockets-${QTMIN}:6
+	>=kde-frameworks/breeze-icons-${KFMIN}:*
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6[qml]
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/purpose-${KFMIN}:6
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+	mpv? ( media-libs/mpvqt )
+	!mpv? ( >=dev-qt/qtmultimedia-${QTMIN}:6[qml] )
+	webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6[qml]
+"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QTMULTIMEDIA=$(usex !mpv)
+		$(cmake_use_find_package webengine Qt6WebView) # "only makes sense on mobile"
+	)
+
+	ecm_src_configure
+}
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 4e90f4c06d7b..b7a3715ae501 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1 +1,2 @@
-DIST zoom-6.3.1.5673_x86_64.tar.xz 212901792 BLAKE2B 625df68d633fea6258369c7572c99872361e608f37496c8d87b9bb18525e8f99c00dcb7a95ad8a28033a8e00940732f3bd324f9bb6c0e0e72fe62ef1c7503690 SHA512 f88ad40bf31943620e69259bd8c07ed61ff7b6a72d8a8c0fc1da3100e0e5ffa6125bdbe62516847f1be55a060efcb1752b7e4d876e42cfde11710d4b5e9a0fc1
+DIST zoom-6.3.5.6065_x86_64.tar.xz 213070892 BLAKE2B 27a380917a2c91da8ee4d51733f8751c12c460df181b9c008a989927275abfb40188bbaf6fb2a2024f3ecddc347d9363a709778ab2c706afd7e5111097cc054f SHA512 7348b0f62f3c7088b7abf8bc00f58a838b18f838346f173fe9917cbca3b189b813c6863228c65a9adcf2089e1ce66f23d0c726d5986d183a3ead14e03453a997
+DIST zoom-6.3.6.6315_x86_64.tar.xz 213433712 BLAKE2B 94d66c2e5c120b1e6564bc1b550f0e62bea2e8fdd6659479e5cb52d4bdaa0c294d0072acd51a7300d603e13dd3e0393ed149cc15ef4ae851e7e01613efb26fbc SHA512 799d730bdb89655d78c8f8e5860edaa05093264fa94279d7374a1f55c304c789b15dd7d8ac4711f5e410fe6383ae3bf3632a39c0d0059b9de2455bbfa92762dd
diff --git a/net-im/zoom/zoom-6.3.1.5673.ebuild b/net-im/zoom/zoom-6.3.5.6065.ebuild
index 61473dfd1366..61473dfd1366 100644
--- a/net-im/zoom/zoom-6.3.1.5673.ebuild
+++ b/net-im/zoom/zoom-6.3.5.6065.ebuild
diff --git a/net-im/zoom/zoom-6.3.6.6315.ebuild b/net-im/zoom/zoom-6.3.6.6315.ebuild
new file mode 100644
index 000000000000..6e0870b15831
--- /dev/null
+++ b/net-im/zoom/zoom-6.3.6.6315.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop eapi9-pipestatus linux-info readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="Video conferencing and web conferencing service"
+HOMEPAGE="https://zoom.us/"
+SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="opencl pulseaudio wayland +zoom-symlink"
+RESTRICT="mirror bindist strip"
+
+RDEPEND="zoom-symlink? ( !games-engines/zoom )
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/mit-krb5
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fdk-aac:0/2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa[gbm(+)]
+	media-sound/mpg123
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon[X]
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libxshmfence
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-renderutil
+	x11-libs/xcb-util-wm
+	opencl? ( virtual/opencl )
+	pulseaudio? ( media-libs/libpulse )
+	wayland? ( dev-libs/wayland )"
+
+BDEPEND="dev-util/bbe"
+
+CONFIG_CHECK="~USER_NS ~PID_NS ~NET_NS ~SECCOMP_FILTER"
+QA_PREBUILT="opt/zoom/*"
+
+src_prepare() {
+	default
+
+	# The tarball doesn't contain an icon, so extract it from the binary
+	bbe -s -b '/<svg width="32" height="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
+		>videoconference-zoom.svg && [[ -s videoconference-zoom.svg ]] \
+		|| die "Extraction of icon failed"
+
+	if ! use pulseaudio; then
+		# For some strange reason, zoom cannot use any ALSA sound devices if
+		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
+		# is installed. So, force zoom to ignore libpulse.
+		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
+		mv zoom.tmp zoom || die
+	fi
+}
+
+src_install() {
+	insinto /opt/zoom
+	exeinto /opt/zoom
+	doins -r calendar cef chatapp diagnostic email js json ringtone \
+		scheduler sip timezones translations
+	doins *.pcm Embedded.properties version.txt
+	doexe zoom zopen ZoomLauncher ZoomWebviewHost *.sh \
+		aomhost libaomagent.so libcml.so libdvf.so libmkldnn.so libquazip.so \
+		libavcodec.so* libavformat.so* libavutil.so* libswresample.so*
+	fperms a+x /opt/zoom/cef/chrome-sandbox
+	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
+	dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
+
+	if use opencl; then
+		doexe libclDNN64.so
+		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1
+	fi
+
+	if ! use wayland; then
+		# Soname dependency on libwayland-client.so.0
+		rm "${ED}"/opt/zoom/cef/libGLESv2.so || die
+	fi
+
+	doins -r Qt
+	find Qt -type f '(' -name '*.so' -o -name '*.so.*' ')' \
+		-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755
+	pipestatus || die
+	(	# Remove libs and plugins with unresolved soname dependencies.
+		# Why does the upstream package contain such garbage? :-(
+		cd "${ED}"/opt/zoom/Qt || die
+		rm -r plugins/audio plugins/egldeviceintegrations \
+			plugins/platforms/libqeglfs.so plugins/platforms/libqlinuxfb.so \
+			plugins/platformthemes/libqgtk3.so qml/Qt/labs/lottieqt \
+			qml/QtQml/RemoteObjects qml/QtQuick/LocalStorage \
+			qml/QtQuick/Particles.2 qml/QtQuick/Scene2D qml/QtQuick/Scene3D \
+			qml/QtQuick/XmlListModel || die
+		use wayland || rm -r lib/libQt5Wayland*.so* plugins/wayland* \
+			plugins/platforms/libqwayland*.so qml/QtWayland || die
+	)
+
+	use zoom-symlink && dosym -r /opt/zoom/ZoomLauncher /usr/bin/zoom
+
+	make_desktop_entry "${EPREFIX}/opt/zoom/ZoomLauncher %U" Zoom \
+		videoconference-zoom "Network;VideoConference;" \
+		"MimeType=$(printf '%s;' \
+			x-scheme-handler/zoommtg \
+			x-scheme-handler/zoomus \
+			application/x-zoom)"
+	doicon videoconference-zoom.svg
+	doicon -s scalable videoconference-zoom.svg
+
+	local DOC_CONTENTS="Some of Zoom's screen share features (e.g.
+		the whiteboard) require display compositing. If you encounter
+		a black window when sharing the screen, then one of the following
+		actions should help:
+		\\n- Enable compositing in your window manager if it is supported
+		\\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-irc/inspircd/inspircd-3.17.1-r1.ebuild b/net-irc/inspircd/inspircd-3.17.1-r1.ebuild
new file mode 100644
index 000000000000..b5dd27a9abd4
--- /dev/null
+++ b/net-irc/inspircd/inspircd-3.17.1-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1 systemd toolchain-funcs
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="https://www.inspircd.org/"
+SRC_URI="
+	https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/clinew/gentoo-distfiles/raw/master/inspircd-${PV}-fix-build-paths.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+IUSE="argon2 debug gnutls ldap maxminddb mbedtls mysql pcre pcre2 postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
+
+RDEPEND="
+	acct-group/inspircd
+	acct-user/inspircd
+	dev-lang/perl
+	argon2? ( app-crypt/argon2 )
+	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
+	ldap? ( net-nds/openldap:= )
+	maxminddb? ( dev-libs/libmaxminddb:= )
+	mbedtls? ( net-libs/mbedtls:0= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pcre? ( dev-libs/libpcre )
+	pcre2? ( dev-libs/libpcre2 )
+	postgres? ( dev-db/postgresql:= )
+	re2? ( dev-libs/re2:= )
+	sqlite? ( >=dev-db/sqlite-3.0 )
+	ssl? ( dev-libs/openssl:= )
+	tre? ( dev-libs/tre )"
+DEPEND="${RDEPEND}"
+
+DOC_CONTENTS="
+	You will find example configuration files under /usr/share/doc/${PN}.\n
+	Read the ${PN}.conf file carefully before starting the service."
+DOCS=( docs/. .configure/apparmor )
+PATCHES=( "${WORKDIR}"/${P}-fix-build-paths.patch )
+
+src_configure() {
+	local extras=""
+
+	use argon2 && extras+="argon2,"
+	use gnutls && extras+="ssl_gnutls,"
+	use ldap && extras+="ldap,"
+	use maxminddb && extras+="geo_maxmind,"
+	use mbedtls && extras+="ssl_mbedtls,"
+	use mysql && extras+="mysql,"
+	use pcre && extras+="regex_pcre,"
+	use pcre2 && extras+="regex_pcre2,"
+	use postgres && extras+="pgsql,"
+	use re2 && extras+="regex_re2,"
+	use regex-posix && extras+="regex_posix,"
+	use regex-stdlib && extras+="regex_stdlib,"
+	use sqlite && extras+="sqlite3,"
+	use ssl && extras+="ssl_openssl,"
+	use sslrehashsignal && extras+="sslrehashsignal,"
+	use tre && extras+="regex_tre,"
+
+	# The first configuration run enables certain "extra" InspIRCd
+	# modules, the second run generates the actual makefile.
+	if [[ -n ${extras} ]]; then
+		./configure --enable-extras=${extras%,} || die
+	fi
+
+	local myconf=(
+		--disable-auto-extras
+		--disable-ownership
+		--system
+		--uid ${PN}
+		--gid ${PN}
+		--binary-dir="/usr/bin"
+		--data-dir="/var/lib/${PN}/data"
+		--example-dir="/usr/share/doc/${PV}"
+		--manual-dir="/usr/share/man"
+		--module-dir="/usr/$(get_libdir)/${PN}/modules")
+	CXX="$(tc-getCXX)" ./configure "${myconf[@]}" || die
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usev debug INSPIRCD_DEBUG=2) INSPIRCD_VERBOSE=1
+}
+
+src_install() {
+	default
+
+	insinto "/usr/include/${PN}"
+	doins -r include/.
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit .configure/inspircd.service
+
+	keepdir "/var/log/${PN}"
+	insinto "/etc/logrotate.d"
+	newins .configure/logrotate "${PN}"
+
+	diropts -o"${PN}" -g"${PN}" -m0700
+	keepdir "/var/lib/${PN}/data"
+
+	readme.gentoo_create_doc
+
+	rmdir "${ED}"/run{/inspircd,} || die
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-irc/inspircd/inspircd-3.17.1.ebuild b/net-irc/inspircd/inspircd-3.17.1.ebuild
deleted file mode 100644
index 21d0bac2f66b..000000000000
--- a/net-irc/inspircd/inspircd-3.17.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit readme.gentoo-r1 systemd toolchain-funcs
-
-DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
-HOMEPAGE="https://www.inspircd.org/"
-SRC_URI="
-	https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/clinew/gentoo-distfiles/raw/master/inspircd-${PV}-fix-build-paths.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="argon2 debug gnutls ldap maxminddb mbedtls mysql pcre pcre2 postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
-
-RDEPEND="
-	acct-group/inspircd
-	acct-user/inspircd
-	dev-lang/perl
-	argon2? ( app-crypt/argon2 )
-	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
-	ldap? ( net-nds/openldap:= )
-	maxminddb? ( dev-libs/libmaxminddb:= )
-	mbedtls? ( net-libs/mbedtls:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	pcre? ( dev-libs/libpcre )
-	pcre2? ( dev-libs/libpcre2 )
-	postgres? ( dev-db/postgresql:= )
-	re2? ( dev-libs/re2:= )
-	sqlite? ( >=dev-db/sqlite-3.0 )
-	ssl? ( dev-libs/openssl:= )
-	tre? ( dev-libs/tre )"
-DEPEND="${RDEPEND}"
-
-DOC_CONTENTS="
-	You will find example configuration files under /usr/share/doc/${PN}.\n
-	Read the ${PN}.conf file carefully before starting the service."
-DOCS=( docs/. .configure/apparmor )
-PATCHES=( "${WORKDIR}"/${P}-fix-build-paths.patch )
-
-src_configure() {
-	local extras=""
-
-	use argon2 && extras+="argon2,"
-	use gnutls && extras+="ssl_gnutls,"
-	use ldap && extras+="ldap,"
-	use maxminddb && extras+="geo_maxmind,"
-	use mbedtls && extras+="ssl_mbedtls,"
-	use mysql && extras+="mysql,"
-	use pcre && extras+="regex_pcre,"
-	use pcre2 && extras+="regex_pcre2,"
-	use postgres && extras+="pgsql,"
-	use re2 && extras+="regex_re2,"
-	use regex-posix && extras+="regex_posix,"
-	use regex-stdlib && extras+="regex_stdlib,"
-	use sqlite && extras+="sqlite3,"
-	use ssl && extras+="ssl_openssl,"
-	use sslrehashsignal && extras+="sslrehashsignal,"
-	use tre && extras+="regex_tre,"
-
-	# The first configuration run enables certain "extra" InspIRCd
-	# modules, the second run generates the actual makefile.
-	if [[ -n ${extras} ]]; then
-		./configure --enable-extras=${extras%,} || die
-	fi
-
-	local myconf=(
-		--disable-auto-extras
-		--disable-ownership
-		--system
-		--uid ${PN}
-		--gid ${PN}
-		--binary-dir="/usr/bin"
-		--data-dir="/var/lib/${PN}/data"
-		--example-dir="/usr/share/doc/${PV}"
-		--manual-dir="/usr/share/man"
-		--module-dir="/usr/$(get_libdir)/${PN}/modules")
-	CXX="$(tc-getCXX)" ./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usev debug INSPIRCD_DEBUG=2) INSPIRCD_VERBOSE=1
-}
-
-src_install() {
-	default
-
-	insinto "/usr/include/${PN}"
-	doins -r include/.
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit .configure/inspircd.service
-
-	keepdir "/var/log/${PN}"
-	insinto "/etc/logrotate.d"
-	newins .configure/logrotate "${PN}"
-
-	diropts -o"${PN}" -g"${PN}" -m0700
-	keepdir "/var/lib/${PN}/data"
-
-	readme.gentoo_create_doc
-
-	rmdir "${ED}"/run{/inspircd,} || die
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index bde7d6fc239e..db4026827efc 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,2 +1,2 @@
 DIST konversation-24.08.3.tar.xz 4412196 BLAKE2B 25d9432ad1f5636351324a46fa386fc8e6f7c35f81333b91bb22ed3ccce3c5441bf5994c61f351a2367be1d7295ac652744b84dad6b8e68d2d81d78a9f1806af SHA512 698bb79a53a75e38c25dc7e42406c1f94ff76899a95a89ae1d5464a599998734941cac0f0fdc937c010fe5c3a9fdeb294fc64aafe9829fbafa66e58dc35cb80d
-DIST konversation-24.12.0.tar.xz 4415648 BLAKE2B 4b72c749133af41ee52a12ed7cbd9ad994b7af11ef759d5b7c854874ca47526c50c9763a8d0a56585556eac52e38487ca58cb01bb47a2dd3d09cea7d174644b8 SHA512 00b2d13c5e312fe64a92bc24f90f7c66775174d89b708bc2c31e51b04a6bac17b71289a69cc0165dd859bcc4d33f5148924db50dcaae205e21f355ab2d9c07f5
+DIST konversation-24.12.1.tar.xz 4415788 BLAKE2B 78d183b44d62795b458c27c16853b15db90d15828e95e9d070265afd4ce2d24c4cb769ab301d6b5204ab488f4f646cfc4783aa6d6bc0d048b8c04a132fd40211 SHA512 43ead82211542ce519726394412df0ede462a1ce8501546688d93767f745e0beb37c259098398adec35abea15416f6547d53d22c859236dcb3ee20fd496cca6c
diff --git a/net-irc/konversation/konversation-24.12.0.ebuild b/net-irc/konversation/konversation-24.12.0.ebuild
deleted file mode 100644
index 46325ee54875..000000000000
--- a/net-irc/konversation/konversation-24.12.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="User friendly IRC Client"
-HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/"
-
-LICENSE="GPL-2"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+crypt"
-
-DEPEND="
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
-	>=dev-qt/qtmultimedia-${QTMIN}:6
-	>=dev-qt/qttools-${QTMIN}:6[qdbus]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kbookmarks-${KFMIN}:6
-	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kglobalaccel-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kidletime-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	crypt? ( >=app-crypt/qca-2.3.7:2[qt6(+)] )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtsvg-${QTMIN}:6
-	crypt? ( >=app-crypt/qca-2.3.7:2[qt6(+),ssl] )
-"
-BDEPEND="sys-devel/gettext"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package crypt Qca-qt6)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# Bug 616162
-	insinto /etc/xdg
-	doins "${FILESDIR}"/konversationrc
-}
diff --git a/net-irc/konversation/konversation-24.12.1.ebuild b/net-irc/konversation/konversation-24.12.1.ebuild
new file mode 100644
index 000000000000..5438f1943722
--- /dev/null
+++ b/net-irc/konversation/konversation-24.12.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="User friendly IRC Client"
+HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/"
+
+LICENSE="GPL-2"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+crypt"
+
+DEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=dev-qt/qttools-${QTMIN}:6[qdbus]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kidletime-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	crypt? ( >=app-crypt/qca-2.3.7:2[qt6(+)] )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtsvg-${QTMIN}:6
+	crypt? ( >=app-crypt/qca-2.3.7:2[qt6(+),ssl] )
+"
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package crypt Qca-qt6)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# Bug 616162
+	insinto /etc/xdg
+	doins "${FILESDIR}"/konversationrc
+}
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
index d7843a4c462e..8b00622fff05 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -1,2 +1,4 @@
 DIST ngircd-26.1.tar.xz 375812 BLAKE2B 4bd7dae47b579bdfaceee0e3ff1b30ac7c70326cd9d609a128192b1efbec17ac50010cb1bf27f4ca6d921700b7bd8cf3d0e8fb5bc569a84d6a101be10ec5832a SHA512 6333244e3fb2dc00ee9812c8c45990baa95ff473a7037a0a11ca495bed86fa438110ad5151d86b9274b6187d86b7b5712fdca2b74b8cb92f7f66fa10cf1961ee
 DIST ngircd-26.1.tar.xz.sig 310 BLAKE2B 6bf3330387ef01af32c0026e12e5fe5a9a34f5d5fc221a66931312fb70d17832259b94e370ddc49f8834d0d29b9c53b52f11ddec3bfc12655472e046cc569e99 SHA512 c1bbc481dd92e487706fa0b3b18dffd214018946fad8ced77feccc1105a65fcc33c82b0e93529a14ad103ef784da20e3bf86358a8f26cdddeac9f947833d6848
+DIST ngircd-27.tar.xz 377484 BLAKE2B 177bccf689690799cb746934c67c5efac31fbc73aa74d678ce6f542dd1c6651b36ad74b84ae59f06f47f24478a9bfc1a5834fc159e980eced3a50507dbd1898c SHA512 d653e0f430bc27485780c9492038622a850be9b910993d625cec4045f0d9973e448a39949c576450598e2cd923b377304ba987a6330f3fcdc42978e8a30334b8
+DIST ngircd-27.tar.xz.sig 566 BLAKE2B 43c03f65f8ddd40c51390afd27359a3fba379aff529c586ccfc8e5ea434af0e128a199a2a2bc8e64c61979f9adb6921655d72ddbb7837a169385f9dca6b3dfe0 SHA512 e759bb199d001be2dab1b292d8fdaf09fd4f32e8345e35ef4ad0f381141f95b1ef2efb5dbb7958c4aefe758c30dc349d3dffef36c6f4cdb2414a6b958d4c0389
diff --git a/net-irc/ngircd/files/ngircd-27-systemd-unit.patch b/net-irc/ngircd/files/ngircd-27-systemd-unit.patch
new file mode 100644
index 000000000000..22f203f997b9
--- /dev/null
+++ b/net-irc/ngircd/files/ngircd-27-systemd-unit.patch
@@ -0,0 +1,24 @@
+diff --git a/contrib/ngircd.service b/contrib/ngircd.service
+index 311bc0d..0191034 100644
+--- a/contrib/ngircd.service
++++ b/contrib/ngircd.service
+@@ -12,8 +12,8 @@ Before=bopm.service hopm.service
+ 
+ [Service]
+ Type=notify
+-User=irc
+-Group=irc
++User=ngircd
++Group=ngircd
+ # Settings & limits:
+ CapabilityBoundingSet=CAP_SYS_CHROOT CAP_NET_BIND_SERVICE
+ MemoryDenyWriteExecute=yes
+@@ -27,7 +27,7 @@ ProtectKernelTunables=yes
+ ProtectSystem=full
+ RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
+ RestrictRealtime=yes
+-RuntimeDirectory=ircd
++RuntimeDirectory=ngircd
+ RuntimeDirectoryMode=750
+ StandardError=journal
+ StandardOutput=journal
diff --git a/net-irc/ngircd/ngircd-27.ebuild b/net-irc/ngircd/ngircd-27.ebuild
new file mode 100644
index 000000000000..998b85cca770
--- /dev/null
+++ b/net-irc/ngircd/ngircd-27.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/alexbarton.asc
+inherit tmpfiles systemd verify-sig
+
+DESCRIPTION="An IRC server written from scratch"
+HOMEPAGE="https://ngircd.barton.de/"
+SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://arthur.barton.de/pub/${PN}/${P}.tar.xz.sig )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="debug gnutls ident +irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib"
+
+# Flaky test needs investigation (bug #719256)
+RESTRICT="test"
+
+RDEPEND="
+	acct-user/ngircd
+	irc-plus? ( virtual/libiconv )
+	ident? ( net-libs/libident )
+	pam? ( sys-libs/pam )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-tcltk/expect
+		net-misc/netkit-telnetd
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-alexbarton-20241211 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-27-systemd-unit.patch
+	"${FILESDIR}"/${PN}-26.1-configure-getaddrinfo.patch # XXX #946998 PLEASE CHECK PER RELEASE
+)
+
+src_prepare() {
+	default
+
+	if ! use prefix ; then
+		sed -i \
+			-e "/;ServerUID = /s/65534/ngircd/" \
+			-e "/;ServerGID = /s/65534/ngircd/" \
+			doc/sample-ngircd.conf.tmpl || die
+	fi
+
+	# Make pidfiles work out-of-the-box
+	sed -i \
+		-e "/;PidFile = /s/;//" \
+		-e "/;ServerUID = /s/;//" \
+		-e "/;ServerGID = /s/;//" \
+		doc/sample-ngircd.conf.tmpl || die
+
+	# Note that if we need to use automake, we need a certain version (for now):
+	# https://github.com/ngircd/ngircd/issues/261
+	# WANT_AUTOMAKE=1.11
+	# eautomake
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/${PN}
+
+		$(use_enable debug sniffer)
+		$(use_enable debug)
+		$(use_enable irc-plus ircplus)
+		$(use_enable ipv6)
+		$(use_enable strict-rfc)
+		$(use_with irc-plus iconv)
+		$(use_with ident)
+		$(use_with pam)
+		$(use_with tcpd tcp-wrappers)
+		$(use_with zlib)
+	)
+
+	if use ssl ; then
+		if use gnutls ; then
+			myeconfargs+=(
+				$( use_with gnutls )
+			)
+		else
+			myeconfargs+=(
+				$( use_with !gnutls openssl )
+			)
+		fi
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	fowners root:ngircd /etc/ngircd/{,ngircd.conf}
+	fperms 0750 /etc/ngircd/
+	fperms 0640 /etc/ngircd/ngircd.conf
+
+	newinitd "${FILESDIR}"/ngircd.init-r2.d ngircd
+	newconfd "${FILESDIR}"/ngircd.conf.d ngircd
+
+	systemd_dounit contrib/ngircd.{service,socket}
+
+	dotmpfiles "${FILESDIR}"/ngircd.conf
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] && use pam ; then
+		elog "ngircd will use PAMIsOptionalPAM by default, please change this option."
+		elog "You may not be able to login until you change this."
+	fi
+
+	if ! use irc-plus ; then
+		ewarn "server-login-test occasional failure had been reported. Upstream suggests"
+		ewarn "to enable ircplus by default. See Gentoo bug #719256. You have been warned."
+	fi
+	tmpfiles_process ngircd.conf
+}
diff --git a/net-irc/rbot/files/rbot-gettext-rubygems.patch b/net-irc/rbot/files/rbot-gettext-rubygems.patch
new file mode 100644
index 000000000000..4286573d3394
--- /dev/null
+++ b/net-irc/rbot/files/rbot-gettext-rubygems.patch
@@ -0,0 +1,45 @@
+From 7a6221adf24e81ef1e47441bd848241adfa02ba6 Mon Sep 17 00:00:00 2001
+From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
+Date: Sun, 4 Mar 2012 21:16:46 +0100
+Subject: [PATCH] RubyGems obsoleted *and* b0rked all_load_path, try to work
+ around it
+
+---
+ lib/rbot/load-gettext.rb | 24 +++++++++++++++++++++++-
+ 1 file changed, 23 insertions(+), 1 deletion(-)
+
+diff --git a/lib/rbot/load-gettext.rb b/lib/rbot/load-gettext.rb
+index d45263e1..ba9b09ba 100644
+--- b/lib/rbot/load-gettext.rb
++++ a/lib/rbot/load-gettext.rb
+@@ -43,29 +43,7 @@
+   else
+     warning 'This version of ruby-gettext does not support non-cached mode; mo files are not reloaded when setting language'
+   end
+-
+-  begin
+-    bindtextdomain 'rbot'
+-  rescue NoMethodError => e
+-    error e
+-    warning 'Trying to work around RubyGems/GetText incompatibility'
+-    module ::Gem
+-      def self.all_load_paths
+-        result = []
+-
+-        Gem.path.each do |gemdir|
+-          each_load_path all_partials(gemdir) do |load_path|
+-            result << load_path
+-          end
+-        end
+-
+-        result
+-      end
+-    end
+-    retry
+-  end
+-
+-
++  bindtextdomain 'rbot'
+ 
+   module GetText
+     # patch for ruby-gettext 1.x to cope with anonymous modules used by rbot.
diff --git a/net-irc/rbot/rbot-0.9.15_p20210609.ebuild b/net-irc/rbot/rbot-0.9.15_p20210609.ebuild
index fda274cc6b6a..fd41e8820810 100644
--- a/net-irc/rbot/rbot-0.9.15_p20210609.ebuild
+++ b/net-irc/rbot/rbot-0.9.15_p20210609.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="ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 GITHUB_COMMIT="3ace72d5642284665fce2c33c99dfeb1b931b2c6"
 inherit ruby-ng strip-linguas
@@ -57,6 +57,7 @@ ruby_add_rdepend "
 
 all_ruby_prepare() {
 	eapply -p0 "${FILESDIR}"/rbot-rakefile-gettext.patch
+	eapply "${FILESDIR}/rbot-gettext-rubygems.patch"
 
 	# Avoid tests that are only compatible with ruby22
 	rm -f test/test_journal.rb || die
diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest
index 8e3e6125cf3f..7aadbc23a7c8 100644
--- a/net-libs/aqbanking/Manifest
+++ b/net-libs/aqbanking/Manifest
@@ -1 +1,2 @@
 DIST aqbanking-6.5.3.tar.gz 2690700 BLAKE2B 2a6407a9d6bfe6a7cfa3b3f4b6d3183b801bda8914770a11d48491fa7bc48e9b034b7eb5d220c6181725240e4475460a11c64df2d73dac98ccb30a61d5de5bca SHA512 bca4449981f9660dc7de8506a2088981b52dcf4ded765fd337263962b464b7903319878e8efbce6cbef043b65be8edb828fee873f19e8c6b2fed0cf7906d58b2
+DIST aqbanking-6.6.0.tar.gz 2724090 BLAKE2B 32b5b83bd99f0404c84d0d1de096113c5236879535178f226d0ba5df1d9e9cc54bf2e1ba64af7c7e5e243ccf62dce3f44feb7e84dfe3327c9e9e79694418c53a SHA512 9275015f1c8885f9e59874abda3ad8977f0fddd24e80360ea1d88467832183d7bf4f3f3cb1138ede437a0e4f1bf8aec3d795d9a45f866e91a44936d7f30ec954
diff --git a/net-libs/aqbanking/aqbanking-6.6.0.ebuild b/net-libs/aqbanking/aqbanking-6.6.0.ebuild
new file mode 100644
index 000000000000..fdd2a9aba9ae
--- /dev/null
+++ b/net-libs/aqbanking/aqbanking-6.6.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Generic Online Banking Interface"
+HOMEPAGE="https://www.aquamaniac.de/sites/aqbanking/index.php"
+SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/531/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug doc ebics examples ofx"
+
+DEPEND="
+	app-misc/ktoblzcheck
+	dev-libs/gmp:0=
+	>=sys-libs/gwenhywfar-5.10.1:=
+	virtual/libintl
+	ebics? ( dev-libs/xmlsec:=[gcrypt] )
+	ofx? ( >=dev-libs/libofx-0.9.5:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_configure() {
+	local backends="aqhbci aqnone aqpaypal"
+	use ofx && backends="${backends} aqofxconnect"
+	use ebics && backends="${backends} aqebics"
+
+	local myeconfargs=(
+		--docdir="${EPREFIX}"/usr/share/doc/"${PF}"
+		$(use_enable debug)
+		$(use_enable doc full-doc)
+		--with-backends="${backends}"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rv "${ED}"/usr/share/doc/ || die "Failed to remove docs"
+
+	einstalldocs
+
+	if use examples; then
+		docinto tutorials
+		dodoc tutorials/*.{c,h} tutorials/README
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/net-libs/c-client/files/c-client-2006k_GENTOO_amd64-so-fix.patch b/net-libs/c-client/files/c-client-2006k_GENTOO_amd64-so-fix.patch
deleted file mode 100644
index 79b067d21f94..000000000000
--- a/net-libs/c-client/files/c-client-2006k_GENTOO_amd64-so-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -r 7c3e6c6ef2ba src/osdep/unix/Makefile
---- a/src/osdep/unix/Makefile	Thu Feb 21 18:51:32 2008 +0100
-+++ b/src/osdep/unix/Makefile	Thu Feb 21 18:53:15 2008 +0100
-@@ -962,6 +962,9 @@ onceenv:
- 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
- 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
- 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
-+	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
-+	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
-+	 >> ARCHIVE
- 	echo $(OS) > OSTYPE
- 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
- 	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
diff --git a/net-libs/c-client/files/c-client-2007f-implicit-declaration-fix.patch b/net-libs/c-client/files/c-client-2007f-implicit-declaration-fix.patch
deleted file mode 100644
index 74e223d0f86c..000000000000
--- a/net-libs/c-client/files/c-client-2007f-implicit-declaration-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-This patch solves build issues with -Werror=implicit-function-declaration
-enabled.
-
-- safe_flock is a function from flocklnx.c but header file for consumers
-  is missing, the simplest was to add function prototype to other
-  header file.
-- utime.h is needed also in multiple places but os_slx.h header file is
-  used in all of them
-
-Bug: https://bugs.gentoo.org/870478
-
-diff --git a/src/osdep/unix/os_slx.h b/src/osdep/unix/os_slx.h
-index b5f39ff..adad223 100644
---- a/src/osdep/unix/os_slx.h
-+++ b/src/osdep/unix/os_slx.h
-@@ -46,6 +46,7 @@
- #include <sys/types.h>
- #include <dirent.h>
- #include <time.h>		/* for struct tm */
-+#include <utime.h>
- #include <fcntl.h>
- #include <syslog.h>
- #include <sys/file.h>
-@@ -57,6 +58,7 @@
- 
- #define direct dirent
- 
-+int safe_flock(int, int);
- #define flock safe_flock
- 
- 
--- 
-2.35.1
-
diff --git a/net-libs/c-client/files/c-client-2007f-ldflags.patch b/net-libs/c-client/files/c-client-2007f-ldflags.patch
deleted file mode 100644
index 2f1cf506db75..000000000000
--- a/net-libs/c-client/files/c-client-2007f-ldflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/osdep/unix/Makefile~	2011-06-07 16:04:29.000000000 +0300
-+++ b/src/osdep/unix/Makefile	2011-06-07 15:55:31.000000000 +0300
-@@ -954,23 +954,24 @@
- 
- # Once-only environment setup
- 
--once:	onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c
-+once:	ssl$(SSLTYPE) onceenv ckp$(PASSWDTYPE) osdep.c
- 
- onceenv:
- 	@echo Once-only environment setup...
- 	echo $(CC) > CCTYPE
--	echo $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
--	echo -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
-+	echo `$(CAT) CFLAGS` $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
-+	echo `$(CAT) OSCFLAGS` -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
- 	 -DMD5ENABLE=\"$(MD5PWD)\" -DMAILSPOOL=\"$(MAILSPOOL)\" \
- 	 -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
- 	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
- 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" \
- 	 -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
- 	 -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
--	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
-+	echo $(EXTRALIBS) `$(CAT) LDFLAGS` > LIBS
-+	echo $(EXTRALDFLAGS) `$(CAT) LDFLAGS` -lcrypt $(BASELDFLAGS) > LDFLAGS
- 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
--	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
--	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
-+	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` $(EXTRALDFLAGS) `$(CAT) OSFLAGS` -shared \
-+	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" `$(CAT) LIBS` $(BASELDFLAGS) \
- 	 >> ARCHIVE
- 	echo $(OS) > OSTYPE
- 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
diff --git a/net-libs/c-client/files/c-client-2007f-openssl-1.1.patch b/net-libs/c-client/files/c-client-2007f-openssl-1.1.patch
deleted file mode 100644
index 918f0bd3fbd5..000000000000
--- a/net-libs/c-client/files/c-client-2007f-openssl-1.1.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Nru a/src/osdep/unix/ssl_unix.c b/src/osdep/unix/ssl_unix.c
---- a/src/osdep/unix/ssl_unix.c	2011-07-23 02:20:10.000000000 +0200
-+++ b/src/osdep/unix/ssl_unix.c	2018-09-22 09:34:26.492765776 +0200
-@@ -59,7 +59,7 @@
- static SSLSTREAM *ssl_start(TCPSTREAM *tstream,char *host,unsigned long flags);
- static char *ssl_start_work (SSLSTREAM *stream,char *host,unsigned long flags);
- static int ssl_open_verify (int ok,X509_STORE_CTX *ctx);
--static char *ssl_validate_cert (X509 *cert,char *host);
-+static char *ssl_validate_cert (X509 *cert,char *host, char *cert_subj);
- static long ssl_compare_hostnames (unsigned char *s,unsigned char *pat);
- static char *ssl_getline_work (SSLSTREAM *stream,unsigned long *size,
- 			       long *contd);
-@@ -210,6 +210,7 @@
-   BIO *bio;
-   X509 *cert;
-   unsigned long sl,tl;
-+  char cert_subj[250];
-   char *s,*t,*err,tmp[MAILTMPLEN];
-   sslcertificatequery_t scq =
-     (sslcertificatequery_t) mail_parameters (NIL,GET_SSLCERTIFICATEQUERY,NIL);
-@@ -266,13 +267,17 @@
-   if (SSL_write (stream->con,"",0) < 0)
-     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
- 				/* need to validate host names? */
--  if (!(flags & NET_NOVALIDATECERT) &&
--      (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
--				host))) {
--				/* application callback */
--    if (scq) return (*scq) (err,host,cert ? cert->name : "???") ? NIL : "";
--				/* error message to return via mm_log() */
--    sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
-+  if (!(flags & NET_NOVALIDATECERT)) {
-+    cert_subj[0] = '\0';
-+    cert = SSL_get_peer_certificate(stream->con);
-+    if (cert)
-+      X509_NAME_oneline(X509_get_subject_name(cert), cert_subj, sizeof(cert_subj));
-+    err = ssl_validate_cert (cert, host, cert_subj);
-+    if (err)
-+      /* application callback */
-+      if (scq) return (*scq) (err,host,cert ? cert_subj : "???") ? NIL : "";
-+    /* error message to return via mm_log() */
-+    sprintf (tmp,"*%.128s: %.255s",err,cert ? cert_subj : "???");
-     return ssl_last_error = cpystr (tmp);
-   }
-   return NIL;
-@@ -313,7 +318,7 @@
-  * Returns: NIL if validated, else string of error message
-  */
- 
--static char *ssl_validate_cert (X509 *cert,char *host)
-+static char *ssl_validate_cert (X509 *cert,char *host, char *cert_subj)
- {
-   int i,n;
-   char *s,*t,*ret;
-@@ -322,9 +327,9 @@
- 				/* make sure have a certificate */
-   if (!cert) ret = "No certificate from server";
- 				/* and that it has a name */
--  else if (!cert->name) ret = "No name in certificate";
-+  else if (cert_subj[0] == '\0') ret = "No name in certificate";
- 				/* locate CN */
--  else if (s = strstr (cert->name,"/CN=")) {
-+  else if (s = strstr (cert_subj,"/CN=")) {
-     if (t = strchr (s += 4,'/')) *t = '\0';
- 				/* host name matches pattern? */
-     ret = ssl_compare_hostnames (host,s) ? NIL :
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 408b33f0f688..766b136d6789 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -2,3 +2,4 @@ DIST glib-networking-2.76.1.tar.xz 280896 BLAKE2B d4fb8e30096e2e0bdca183795e5d6f
 DIST glib-networking-2.78.0.tar.xz 282864 BLAKE2B 24b503a79e3a75c706e5aac98bb4593c6a282d980175633e77097ec8dcb7399f1e197ef42cad9f1f0a7c0456e0f09fbb7a197dcdf1ee2eff0f061ea826e2ee33 SHA512 7574e82aa018332edf99dd284c7fd74b5935bca4a6a70e950ae4b22bbe7be188433fea69e35c742cae120e7ff7d1a6b4f5bf3957fc31f220f50189d3958a3f58
 DIST glib-networking-2.78.1.tar.xz 283472 BLAKE2B 424a7d1f05b8589e9f5ca4e53fe4aead2ded484799b984e80ba8c203633bb5c7cec47cf56d15df4af1cb900025a560b9f07a9ebaeb5428c051f600849630a310 SHA512 dc8076d3ff1c97c44c7ba04f74bed50117b07f703efc1bc4cc44989ffcfada0ab49813556ad5bb1831dfb114c4f74ec7bfe08c9b6b514ae7049700211606b288
 DIST glib-networking-2.80.0.tar.xz 287044 BLAKE2B cf407acf5876756dac1fae19b6442b718aa8cdcfd381b00a2d34acc9cac60b519df82a27ceca9af0cc25d54dac03bf43cf74e5f485e6c8fe6b84e11e71719200 SHA512 9707bd47a7f613bc24ac3212737b6b67c57fb6c5dc20e8659a6276750cb07d2af7d42277e4c7294644e8e833eb5aea28320f3d517073e1316860a1dee2e3dc2b
+DIST glib-networking-2.80.1.tar.xz 290828 BLAKE2B 04df4d08a6d43cbd8ca9409aa566f72c9ef1041a098d6e9468f5345d78af96e5d85ade68f735f95acc8fe784467b9475bb9b51686d3316e523123639774bf6aa SHA512 0f1b3807635fcae143ad1a89731a8f7e1b6f4b8f6cc2dd1b7b5eea3d77c796ee5a55ea330901bfd22927d07795f39450d30f0f1029595761e659f96a8415c263
diff --git a/net-libs/glib-networking/glib-networking-2.80.1.ebuild b/net-libs/glib-networking/glib-networking-2.80.1.ebuild
new file mode 100644
index 000000000000..649ec0c0ae31
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.80.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson-multilib xdg
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/glib-networking"
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+IUSE="+gnome +libproxy +ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.73.3:2[${MULTILIB_USEDEP}]
+	libproxy? ( >=net-libs/libproxy-0.4.16[${MULTILIB_USEDEP}] )
+	>=net-libs/gnutls-3.7.4:=[${MULTILIB_USEDEP}]
+	ssl? ( app-misc/ca-certificates )
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+"
+DEPEND="${RDEPEND}
+	test? ( net-libs/gnutls[pkcs11] )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	if ! use test ; then
+		# Don't build tests unconditionally
+		# This is a hack to avoid needing gnutls[pkcs11] when USE=-test
+		# It may become a real runtime dependency in future
+		# Please check!
+		# bug #777462
+		sed -i "/^subdir('tests')/d" tls/meson.build || die
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgnutls=enabled
+		-Dopenssl=disabled
+		$(meson_feature !libproxy environment_proxy)
+		$(meson_feature libproxy)
+		$(meson_feature gnome gnome_proxy)
+		-Dinstalled_tests=false
+		-Ddebug_logs=false
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	# Pretend the network is available so we get real libproxy parsing
+	# output rather than it giving up early in e.g. systemd-nspawn in some
+	# cases.
+	# https://github.com/libproxy/libproxy/issues/260 (bug #914382)
+	local -x GIO_USE_NETWORK_MONITOR=base
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	multilib_pkg_postrm() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 7d337af181b6..9cd59052d333 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-online-accounts-3.48.1.tar.xz 383124 BLAKE2B a9e18bf034454429a84be0920110f4d74fba9462fb1f7f23e74f304e963323413d99af2d84caa9ef1c6841917f5b8249ac94dc433ba04546f2ae23d6268dcd70 SHA512 8f191994b8f38bee4b922b10b94e96d6f7cb323de0e9a1f29febea848cb2002320357262ccf6f28839e32e9216faeb28a871f878e1ad9478c61650fdd3549737
-DIST gnome-online-accounts-3.50.3.tar.xz 406404 BLAKE2B ff1d52b76720ccc28619a988d6c9a584cf8a44a9919368761c64d3b39e735b740ca1eb3ce18cd11e6998ee1a68deee12b0dc838f76c733a650fdf7ee72700a09 SHA512 c8ac65e9610ced7644239d72ab7bb137eea3ac9ca266c79ca0ad75f16982ba10bea7a880259309bbd96aedd057091eb088c78a86756fc24332f0ad7b37683a46
 DIST gnome-online-accounts-3.50.4.tar.xz 407300 BLAKE2B 7e8759c2f3c44312081a4bff774335867ced068ca94709db5ecb300bcd7aa1ca56d0d986679d4e3113b9df6fd6af1ec41066fa6f1cffff888563341061bc45fb SHA512 f0f3d6186cd436cac3f6f3624062fedce7035726cf148a75c1929d9e2b3b6813eab774c12fb6d54fb86fcb2154e016abe5a861d847048cd2a38d3b67e8867857
+DIST gnome-online-accounts-3.52.3.1.tar.xz 473940 BLAKE2B 044e74cdd7fca352087515a377f446adfeef9df53357937db1dae5937207d83957db8aa2aa1760cd4319e68639c62c56111c1c1ac9d796629fef2335e6db4467 SHA512 fcc869d8d0d64f61895fca9f4a2cb54ade46f6092c4bd1a46d15cd0fef8e5cb772c95f31d2ec75b25c30aca43c88c1a695eb9ed6b5b43c457ad2501a6232a7ad
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.50.3.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.50.3.ebuild
deleted file mode 100644
index 4989d24db326..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.50.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson vala xdg
-
-DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-online-accounts"
-
-LICENSE="LGPL-2+"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-IUSE="debug gnome gtk-doc +introspection kerberos man ms365 +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-# libsoup used in goaoauthprovider
-# goa kerberos provider is incompatible with app-crypt/heimdal, see
-# https://bugzilla.gnome.org/show_bug.cgi?id=692250
-# json-glib-0.16 needed for bug #485092
-RDEPEND="
-	>=dev-libs/glib-2.67.4:2
-	sys-apps/dbus
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
-	>=gui-libs/libadwaita-1.4
-	>=gui-libs/gtk-4.10:4
-	>=dev-libs/json-glib-0.16
-	>=app-crypt/libsecret-0.5
-	>=net-libs/libsoup-3.0:3.0
-	dev-libs/libxml2:2
-	>=net-libs/rest-0.9.0:1.0
-	kerberos? (
-		>=app-crypt/gcr-4.1.0:4=[gtk]
-		app-crypt/mit-krb5
-	)
-"
-# goa-daemon can launch gnome-control-center
-PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
-
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend) )
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.30.0
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-BDEPEND="gtk-doc? ( dev-util/gtk-doc )"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-}
-
-src_configure() {
-	# TODO: Give users a way to set the G/FB/Windows Live secrets
-	local emesonargs=(
-		-Dgoabackend=true
-		-Dexchange=true
-		-Dfedora=false
-		-Dgoogle=true
-		-Dimap_smtp=true
-		$(meson_use kerberos)
-		-Downcloud=true
-		-Dwebdav=true
-		-Dwindows_live=true
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use ms365 ms_graph)
-		$(meson_use introspection)
-		-Dman=true
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.52.3.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.52.3.1.ebuild
new file mode 100644
index 000000000000..b8d62139f19b
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.52.3.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="GNOME framework for accessing online accounts"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-online-accounts"
+
+LICENSE="LGPL-2+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+IUSE="debug doc gnome +introspection kerberos ms365 +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+# libsoup used in goaoauthprovider
+# goa kerberos provider is incompatible with app-crypt/heimdal, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=692250
+# json-glib-0.16 needed for bug #485092
+RDEPEND="
+	>=dev-libs/glib-2.67.4:2
+	sys-apps/dbus
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
+	>=gui-libs/libadwaita-1.6_beta
+	>=gui-libs/gtk-4.15.2:4
+	>=dev-libs/json-glib-0.16
+	>=app-crypt/libsecret-0.5
+	>=net-libs/libsoup-3.0:3.0
+	>=sys-apps/keyutils-1.6.2
+	dev-libs/libxml2:2
+	>=net-libs/rest-0.9.0:1.0
+	kerberos? (
+		>=app-crypt/gcr-4.1.0:4=[gtk]
+		app-crypt/mit-krb5
+	)
+"
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
+
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.30.0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+BDEPEND="doc? ( dev-util/gi-docgen )"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+src_configure() {
+	# TODO: Give users a way to set the G/FB/Windows Live secrets
+	local emesonargs=(
+		-Dgoabackend=true
+		-Dexchange=true
+		-Dfedora=false
+		-Dgoogle=true
+		-Dimap_smtp=true
+		$(meson_use kerberos)
+		-Downcloud=true
+		-Dwebdav=true
+		-Dwindows_live=true
+		$(meson_use doc documentation)
+		$(meson_use ms365 ms_graph)
+		$(meson_use introspection)
+		-Dman=true
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc; then
+		mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
+	fi
+}
diff --git a/net-libs/http-parser/http-parser-2.9.4-r2.ebuild b/net-libs/http-parser/http-parser-2.9.4-r2.ebuild
index 797273aa6b61..745d65de854a 100644
--- a/net-libs/http-parser/http-parser-2.9.4-r2.ebuild
+++ b/net-libs/http-parser/http-parser-2.9.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ LICENSE="MIT"
 # 2.9.4 restored ABI compatibility with 2.9.0 but since we failed
 # to set subslot in 2.9.3, we want to provoke another rebuild
 SLOT="0/2.9.4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-non-x86-test.patch
diff --git a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.4.0.ebuild b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.4.0.ebuild
index f0b31770d1f2..ee99876238e3 100644
--- a/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.4.0.ebuild
+++ b/net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.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
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/libraries/kdsoap-ws-discovery-client"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="CC0-1.0 GPL-3+"
@@ -24,7 +24,7 @@ RESTRICT="test"
 
 RDEPEND="
 	dev-qt/qtbase:6[network]
-	>=net-libs/kdsoap-2.2.0[qt6]
+	>=net-libs/kdsoap-2.2.0[qt6(+)]
 "
 DEPEND="${RDEPEND}
 	test? ( dev-qt/qtbase:6[xml] )
diff --git a/net-libs/kdsoap/kdsoap-2.2.0-r1.ebuild b/net-libs/kdsoap/kdsoap-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..6b821df016e8
--- /dev/null
+++ b/net-libs/kdsoap/kdsoap-2.2.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/KDAB/KDSoap/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+else
+	EGIT_REPO_URI="https://github.com/KDAB/KDSoap.git"
+	EGIT_SUBMODULES=( kdwsdl2cpp/libkode -autogen )
+	inherit git-r3
+fi
+inherit cmake
+
+DESCRIPTION="Qt-based client-side and server-side SOAP component"
+HOMEPAGE="https://www.kdab.com/development-resources/qt-tools/kd-soap/"
+
+LICENSE="GPL-3 AGPL-3"
+SLOT="0/2"
+
+RDEPEND="dev-qt/qtbase:6[network,xml]"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/install.*INSTALL_DOC_DIR/d" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDSoap_DOCS=OFF
+		-DKDSoap_EXAMPLES=OFF # no install targets
+		-DKDSoap_QT6=ON
+		-DKDSoap_STATIC=OFF
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/kdsoap/kdsoap-2.2.0.ebuild b/net-libs/kdsoap/kdsoap-2.2.0.ebuild
deleted file mode 100644
index 5c5c5c7672a8..000000000000
--- a/net-libs/kdsoap/kdsoap-2.2.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/KDAB/KDSoap/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-else
-	EGIT_REPO_URI="https://github.com/KDAB/KDSoap.git"
-	EGIT_SUBMODULES=( kdwsdl2cpp/libkode -autogen )
-	inherit git-r3
-fi
-inherit cmake multibuild
-
-DESCRIPTION="Qt-based client-side and server-side SOAP component"
-HOMEPAGE="https://www.kdab.com/development-resources/qt-tools/kd-soap/"
-
-LICENSE="GPL-3 AGPL-3"
-SLOT="0/2"
-IUSE="+qt5 qt6"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-RDEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtxml:5
-	)
-	qt6? ( dev-qt/qtbase:6[network,xml] )"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/install.*INSTALL_DOC_DIR/d" -i CMakeLists.txt || die
-}
-
-src_configure() {
-	my_src_configure() {
-		local mycmakeargs=(
-			-DKDSoap_DOCS=OFF
-			-DKDSoap_EXAMPLES=OFF # no install targets
-			-DKDSoap_STATIC=OFF
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
-			mycmakeargs+=( -DKDSoap_QT6=ON )
-		else
-			mycmakeargs+=( -DKDSoap_QT6=OFF )
-		fi
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-}
diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
index 642d8967544e..316ba3def340 100644
--- a/net-libs/libiscsi/Manifest
+++ b/net-libs/libiscsi/Manifest
@@ -1,2 +1 @@
-DIST libiscsi-1.19.0_p20230208.tar.gz 293283 BLAKE2B 8dafcdd87d66c8addea8734af264b1ce70ec7cbb7925becf1946b616821a94a0d22ed9a903f5f24c03d9b647353fc76a708cafed0f6482199a45cb628c143fff SHA512 d6416833b4e1352e91d869ae753fdc01968e303d5ce7de52f27692ce7f8d7ca4f648931d54f0ebfa1323f8b43531bfc81771ea0468af4dc9ad53df02c8bad55f
 DIST libiscsi-1.20.0.tar.gz 302381 BLAKE2B 36d2d80ff51ece0a5577e43f3bfefa7160e2a6a9d026ad5587b64f87dc8c96957cd89251229ae7cab00236e1276c1dae5413b7b9192ce1cf3219c2629f542442 SHA512 f614f701671da1b1e7beda052886eb2d6a965482a5b7ae656cb6b5449a387d89302397fb8b6e3579307f98274d66b13d8b2a5d423826683185e5df0d9417d737
diff --git a/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild b/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild
deleted file mode 100644
index 7764c7f968e8..000000000000
--- a/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *_p* ]] ; then
-		# The S path is too long for the test suite otherwise.
-		inherit vcs-snapshot
-
-		MY_COMMIT="22f7b26567760921fa1aad77cca642153123ea8c"
-		SRC_URI="https://github.com/sahlberg/libiscsi/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-	else
-		SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	fi
-
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="iscsi client library and utilities"
-HOMEPAGE="https://github.com/sahlberg/libiscsi"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE="rdma test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libgcrypt:=
-	rdma? ( sys-cluster/rdma-core )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cunit )
-"
-BDEPEND="
-	test? ( >=sys-block/tgt-1.0.58 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.19.0_p20230208-fix-rdma-automagic.patch
-)
-
-src_prepare() {
-	default
-
-	# bug #906063
-	rm tests/test_0600_ipv6.sh || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-manpages \
-		$(use_with rdma) \
-		--disable-werror \
-		$(use_enable test tests)
-}
-
-src_test() {
-	emake -C tests test
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 8cd089d26b72..603688c040e8 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,2 +1,2 @@
 DIST libktorrent-24.08.3.tar.xz 605900 BLAKE2B 8b74457f67618616d49524a660b04d9cdccded54e92995f5c4d8a1c407f2ed587e29a613b7b51130cf0716138ce0d9f850b2caeb68d456155fd94aaa9918429b SHA512 0cb5aac161ba7afa4ab9e5f4f2c82ec0b38b6ab587c4f46c6ea277f4b9add72b9eecdbf47b10274400df2ff5508a8696d504ef1488ed16be6092ab01af627d17
-DIST libktorrent-24.12.0.tar.xz 604588 BLAKE2B d1462698e158002fa3ef14fcfbb64d468a9c115e5a9f9191b2be9a292ccbb0290870ad2bfffd409cb9b357d3ed5060036019d8bf46cb0c6c8159e3040c8ba1a4 SHA512 85f64892620274cbd2e9844e17356532e2965c2239eb4f3433f06ca3a418a89b77e7d10e109db573e6dd7f18fd3b7474382da9a67911df12eb151eb9d877433d
+DIST libktorrent-24.12.1.tar.xz 604520 BLAKE2B f96b4bdd1d8c81b4e10cb99e42c8074032276237dd36600dbf4fcd04460aacbcc2fc637e8ce1ba0f0dcfc7221be3f748c22ae38e15f72001e70c06b02415efd0 SHA512 c08e6edbf15a90f6999953636bea44c6de219a77e02fff90e6555f6b5f30a6664dd8971b0c1348902a70a6953c11b516ff2726048ea66e24e4f5335e101de1bf
diff --git a/net-libs/libktorrent/libktorrent-24.12.0.ebuild b/net-libs/libktorrent/libktorrent-24.12.0.ebuild
deleted file mode 100644
index e1af1d58ad59..000000000000
--- a/net-libs/libktorrent/libktorrent-24.12.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KDE_ORG_CATEGORY="network"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="BitTorrent library based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="xfs"
-
-COMMON_DEPEND="
-	>=app-crypt/qca-2.3.7:2[qt6(+)]
-	>=dev-libs/gmp-6.0.0a:0=
-	dev-libs/libgcrypt:0=
-	>=dev-qt/qtbase-${QTMIN}:6[network,xml]
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=kde-frameworks/karchive-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-	xfs? ( sys-fs/xfsprogs )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.71
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-libs/botan[gmp(-)]
-"
-BDEPEND="sys-devel/gettext"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# Gentoo workaround because gmp.h in MULTILIB_WRAPPED_HEADERS is breaking this
-	sed -i -e "/^find_package/ s/\"\${LibGMP_MIN_VERSION}\" //" \
-		CMakeLists.txt || die
-	sed -i -e "/^find_dependency/ s/ \"@LibGMP_MIN_VERSION@\"//" \
-		KTorrent6Config.cmake.in || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_XFS=$(usex xfs)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# failing network tests
-	local myctestargs=(
-		-E "(fin|packetloss|send|superseedtest|transmit|utppolltest)"
-	)
-	ecm_src_test
-}
diff --git a/net-libs/libktorrent/libktorrent-24.12.1.ebuild b/net-libs/libktorrent/libktorrent-24.12.1.ebuild
new file mode 100644
index 000000000000..a1805110d2ea
--- /dev/null
+++ b/net-libs/libktorrent/libktorrent-24.12.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KDE_ORG_CATEGORY="network"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="BitTorrent library based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="xfs"
+
+COMMON_DEPEND="
+	>=app-crypt/qca-2.3.7:2[qt6(+)]
+	>=dev-libs/gmp-6.0.0a:0=
+	dev-libs/libgcrypt:0=
+	>=dev-qt/qtbase-${QTMIN}:6[network,xml]
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	xfs? ( sys-fs/xfsprogs )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.71
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-libs/botan[gmp(-)]
+"
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	ecm_src_prepare
+
+	# Gentoo workaround because gmp.h in MULTILIB_WRAPPED_HEADERS is breaking this
+	sed -i -e "/^find_package/ s/\"\${LibGMP_MIN_VERSION}\" //" \
+		CMakeLists.txt || die
+	sed -i -e "/^find_dependency/ s/ \"@LibGMP_MIN_VERSION@\"//" \
+		KTorrent6Config.cmake.in || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_XFS=$(usex xfs)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# failing network tests
+	local myctestargs=(
+		-E "(fin|packetloss|send|superseedtest|transmit|utppolltest)"
+	)
+	ecm_src_test
+}
diff --git a/net-libs/liblockfile/liblockfile-1.17.ebuild b/net-libs/liblockfile/liblockfile-1.17.ebuild
index 026c9581b3d4..7d314f6a7ea8 100644
--- a/net-libs/liblockfile/liblockfile-1.17.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/miquels/liblockfile/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="static-libs"
 
 RDEPEND="acct-group/mail"
diff --git a/net-libs/libnice/libnice-0.1.22.ebuild b/net-libs/libnice/libnice-0.1.22.ebuild
index 6516f6bb2537..a8b960d7665e 100644
--- a/net-libs/libnice/libnice-0.1.22.ebuild
+++ b/net-libs/libnice/libnice-0.1.22.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
@@ -10,7 +10,7 @@ SRC_URI="https://libnice.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+gnutls gtk-doc +introspection test +upnp"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 588c90bd83d2..0146a52e7986 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,2 +1 @@
-DIST libproxy-0.5.5.tar.gz 60880 BLAKE2B fedf06db2e39ca1cacf489542597ab002a8c943234fda2f9e5482d43d3b3b0a5af2c4d270eb678e24bb3c4c9ac8e37e65d609af84d02be9541555e953be6a0f5 SHA512 101139fe6972c9b8b46a8bc5f5cea807649ad21e201a9cd7d532d2145c34eadc861d8039fc8a2bf129f364ddc99ffb1324ab8f19bb0b4b9e52eb0f6bd703c8a8
 DIST libproxy-0.5.9.tar.gz 58165 BLAKE2B 5ac24fa025d170eeaed94b6322bf60e6c81669cc2199f4c6a75e3810c62e2e126a0f9a69e48dda7e6773814a0252fa8f6350282488f442eb88975bfabf8238aa SHA512 781fdd51ea8467f603a46dcab8d0e7a97eb4834acfbe57d00b103e2a075dd32eeb16aece88d4e018192eb58fe54f42aefd954873e6d8364836866d0167e063d5
diff --git a/net-libs/libproxy/libproxy-0.5.5.ebuild b/net-libs/libproxy/libproxy-0.5.5.ebuild
deleted file mode 100644
index d7cb3c59e108..000000000000
--- a/net-libs/libproxy/libproxy-0.5.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib vala
-
-DESCRIPTION="Library for automatic proxy configuration management"
-HOMEPAGE="https://github.com/libproxy/libproxy"
-SRC_URI="https://github.com/libproxy/libproxy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="duktape gnome gtk-doc +introspection test vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.71.3:2[${MULTILIB_USEDEP}]
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-	duktape? (
-		dev-lang/duktape:=
-		net-misc/curl
-	)
-	introspection? ( dev-libs/gobject-introspection )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gi-docgen )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_setup
-	default
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_use_bool gtk-doc docs)
-		$(meson_use test tests)
-		-Dconfig-env=true
-		$(meson_use gnome config-gnome)
-		-Dconfig-windows=false
-		-Dconfig-sysconfig=true
-		-Dconfig-osx=false
-		-Dconfig-kde=true
-		$(meson_native_use_bool duktape pacrunner-duktape)
-		$(meson_native_use_bool vala vapi)
-		$(meson_use duktape curl)
-		$(meson_native_use_bool introspection)
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/${PN}-1.0 "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-}
diff --git a/net-libs/libproxy/libproxy-0.5.9.ebuild b/net-libs/libproxy/libproxy-0.5.9.ebuild
index 1791916247ff..8beb5708687c 100644
--- a/net-libs/libproxy/libproxy-0.5.9.ebuild
+++ b/net-libs/libproxy/libproxy-0.5.9.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="https://github.com/libproxy/libproxy/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="duktape gnome gtk-doc +introspection test vala"
 REQUIRED_USE="
 	gtk-doc? ( introspection )
diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index 54ae5392ff10..4c6a0a0ee034 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -1,2 +1,3 @@
 DIST libquotient-0.8.2.tar.gz 744095 BLAKE2B c33016e4eda22e0a363f06ab4545d17010519b8d778566c1bae29e4c7d6563280f4ce3c1235f7d75f55ce4a8971ef5ce23e45f1d3a0edc043e23857d805a824f SHA512 3d971439f8a89609930ca1648f6cf1bdb59f3ad492af1a15a7f8a13d06c81bd5bfffa1dd732ef5156fab8a9ea2ba3e98376bf76511db17bdeee17641a772b762
 DIST libquotient-0.9.1.tar.gz 772882 BLAKE2B f43da0833baa1242f29fb7ed1dd1065b673497d8e2d8358b60d67da0fef8f382ac3fdda8cdc9ed0ac67b5cd423527ef418d0a574fd30e46fe9337214509b1dc2 SHA512 f998b187a1168381c7868400fec73f68ab95af29d1d648921a507fac8782f8c69fd8aab7916466ad9d6b85edadf5168659d7b78a876daa30798891d84afcfa5a
+DIST libquotient-0.9.2.tar.gz 777025 BLAKE2B f616283a7ebd493caba57de950c8dd1a53213b54ff3183ffd436a4d901439607d086020256955375208d3c311e20f3e3fd0b55e3164961bd885b5a0882296919 SHA512 c179b1ca670f9b75b945d50026b02c34dabbd58056abb6f210998229dae80dba8f00de157d9c3fc32254b613c5db149ca497a9b9695cdf5e61255e82be73db0c
diff --git a/net-libs/libquotient/libquotient-0.9.2.ebuild b/net-libs/libquotient/libquotient-0.9.2.ebuild
new file mode 100644
index 000000000000..cafd0f8faefe
--- /dev/null
+++ b/net-libs/libquotient/libquotient-0.9.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Qt-based SDK to develop applications for Matrix"
+HOMEPAGE="https://github.com/quotient-im/libQuotient"
+SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/libQuotient-${PV}"
+
+LICENSE="LGPL-2+"
+SLOT="0/${PV}" # FIXME: check soname on next version bump
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/olm
+	dev-libs/openssl:=
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-6.4:6=[gui,network,sql,ssl]
+	>=dev-qt/qtmultimedia-6.4:6
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtbase-6.4:6[concurrent] )
+"
+
+# downstream patch
+PATCHES=( "${FILESDIR}"/${PN}-0.8.0-no-android.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	use test && mycmakeargs+=(
+		-DQuotient_INSTALL_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# https://github.com/quotient-im/libQuotient/issues/435
+	# testolmaccount requires network connection/server set up
+	local myctestargs=(
+		-j1
+		-E "(testolmaccount)"
+	)
+	cmake_src_test
+}
diff --git a/net-libs/librist/librist-0.2.8-r1.ebuild b/net-libs/librist/librist-0.2.8-r1.ebuild
new file mode 100644
index 000000000000..3debbeee8199
--- /dev/null
+++ b/net-libs/librist/librist-0.2.8-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2018-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Library for Reliable Internet Stream Transport (RIST) protocol"
+HOMEPAGE="https://code.videolan.org/rist/librist"
+
+SRC_URI="https://code.videolan.org/rist/librist/-/archive/v${PV}/librist-v${PV}.tar.bz2"
+S="${WORKDIR}/librist-v${PV}"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~arm64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/cJSON
+	net-libs/mbedtls:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local emesonargs=(
+		-Dstatic_analyze=false
+		$(meson_use test)
+		-Dbuiltin_cjson=false
+		-Dbuiltin_mbedtls=false
+		# Tools have automagic libmicrohttpd dep for prometheus;
+		# needs solved before exposing; look into use_tun once enabled
+		-Dbuilt_tools=false
+		-Dfallback_builtin=false
+		-Duse_mbedtls=true
+		-Duse_nettle=false
+		-Duse_tun=false # Used only by tools
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# multicast tests fails with FEATURES=network-sandbox
+	meson_src_test --no-suite multicast
+}
diff --git a/net-libs/librist/librist-0.2.8.ebuild b/net-libs/librist/librist-0.2.8.ebuild
deleted file mode 100644
index d5c984d28111..000000000000
--- a/net-libs/librist/librist-0.2.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2018-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Library for Reliable Internet Stream Transport (RIST) protocol"
-HOMEPAGE="https://code.videolan.org/rist/librist"
-
-SRC_URI="https://code.videolan.org/rist/librist/-/archive/v${PV}/librist-v${PV}.tar.bz2"
-KEYWORDS="~arm64"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/cJSON
-	net-libs/mbedtls:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/librist-v${PV}"
-
-src_configure() {
-	local emesonargs=(
-		-Dstatic_analyze=false
-		$(meson_use test)
-		-Dbuiltin_cjson=false
-		-Dbuiltin_mbedtls=false
-		# Tools have automagic libmicrohttpd dep for prometheus;
-		# needs solved before exposing; look into use_tun once enabled
-		-Dbuilt_tools=false
-		-Dfallback_builtin=false
-		-Duse_mbedtls=true
-		-Duse_nettle=false
-		-Duse_tun=false # Used only by tools
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# multicast tests fails with FEATURES=network-sandbox
-	meson_src_test --no-suite multicast
-}
diff --git a/net-libs/libssh/libssh-0.10.6-r1.ebuild b/net-libs/libssh/libssh-0.10.6-r1.ebuild
deleted file mode 100644
index 96aceba24d24..000000000000
--- a/net-libs/libssh/libssh-0.10.6-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!gcrypt? (
-		!mbedtls? (
-			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
-		elibc_musl? ( sys-libs/argp-standalone )
-	)
-"
-BDEPEND="doc? ( app-text/doxygen[dot] )"
-
-DOCS=( AUTHORS CHANGELOG README )
-
-PATCHES=(
-	"${FILESDIR}/${P}-libgcrypt-type-mismatches.patch" # bug 932715
-	"${FILESDIR}/${P}-ipv6-hostname-parsing.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# just install the examples, do not compile them
-	cmake_comment_add_subdirectory examples
-
-	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-		-i ConfigureChecks.cmake || die
-
-	if use test; then
-		local skip_tests=(
-			# keyfile torture test is currently broken
-			-e "/torture_keyfiles/d"
-
-			# Tries to expand ~ which fails w/ portage homedir
-			# (torture_path_expand_tilde_unix and torture_config_make_absolute_no_sshdir)
-			-e "/torture_misc/d"
-			-e "/torture_config/d"
-		)
-
-		# Disable tests that take too long (bug #677006)
-		if use sparc; then
-			skip_tests+=(
-				-e "/torture_threads_pki_rsa/d"
-				-e "/torture_pki_dsa/d"
-			)
-		fi
-
-		if (( ${#skip_tests[@]} )) ; then
-			sed -i "${skip_tests[@]}" tests/unittests/CMakeLists.txt || die
-		fi
-
-		if use elibc_musl; then
-			sed -e "/SOLARIS/d" \
-				-i tests/CMakeLists.txt || die
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_NACL=OFF
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STACK_PROTECTOR_STRONG=OFF
-		-DWITH_DEBUG_CALLTRACE=$(usex debug)
-		-DWITH_DEBUG_CRYPTO=$(usex debug)
-		-DWITH_GCRYPT=$(usex gcrypt)
-		-DWITH_GSSAPI=$(usex gssapi)
-		-DWITH_MBEDTLS=$(usex mbedtls)
-		-DWITH_PCAP=$(usex pcap)
-		-DWITH_SERVER=$(usex server)
-		-DWITH_SFTP=$(usex sftp)
-		-DBUILD_STATIC_LIB=$(usex static-libs)
-		# TODO: try enabling {CLIENT,SERVER}_TESTING
-		-DUNIT_TESTING=$(usex test)
-		-DWITH_ZLIB=$(usex zlib)
-	)
-
-	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	multilib_is_native_abi && use doc && cmake_src_compile docs
-}
-
-multilib_src_test() {
-	cmake_src_test --timeout 3000
-}
-
-multilib_src_install() {
-	cmake_src_install
-	multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	use static-libs && dolib.a src/libssh.a
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	use mbedtls && DOCS+=( README.mbedtls )
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.10.6-r2.ebuild b/net-libs/libssh/libssh-0.10.6-r2.ebuild
new file mode 100644
index 000000000000..ff5c0510997d
--- /dev/null
+++ b/net-libs/libssh/libssh-0.10.6-r2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
+else
+	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!gcrypt? (
+		!mbedtls? (
+			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
+		elibc_musl? ( sys-libs/argp-standalone )
+	)
+"
+BDEPEND="doc? ( app-text/doxygen[dot] )"
+
+DOCS=( AUTHORS CHANGELOG README )
+
+PATCHES=(
+	"${FILESDIR}/${P}-libgcrypt-type-mismatches.patch" # bug 932715
+	"${FILESDIR}/${P}-ipv6-hostname-parsing.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# just install the examples, do not compile them
+	cmake_comment_add_subdirectory examples
+
+	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+		-i ConfigureChecks.cmake || die
+
+	if use test; then
+		local skip_tests=(
+			# keyfile torture test is currently broken
+			-e "/torture_keyfiles/d"
+
+			# Tries to expand ~ which fails w/ portage homedir
+			# (torture_path_expand_tilde_unix and torture_config_make_absolute_no_sshdir)
+			-e "/torture_misc/d"
+			-e "/torture_config/d"
+		)
+
+		# Disable tests that take too long (bug #677006)
+		if use sparc; then
+			skip_tests+=(
+				-e "/torture_threads_pki_rsa/d"
+				-e "/torture_pki_dsa/d"
+			)
+		fi
+
+		if (( ${#skip_tests[@]} )) ; then
+			sed -i "${skip_tests[@]}" tests/unittests/CMakeLists.txt || die
+		fi
+
+		if use elibc_musl; then
+			sed -e "/SOLARIS/d" \
+				-i tests/CMakeLists.txt || die
+		fi
+	fi
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DWITH_NACL=OFF
+		-DWITH_STACK_PROTECTOR=OFF
+		-DWITH_STACK_PROTECTOR_STRONG=OFF
+		-DWITH_DEBUG_CALLTRACE=$(usex debug)
+		-DWITH_DEBUG_CRYPTO=$(usex debug)
+		-DWITH_GCRYPT=$(usex gcrypt)
+		-DWITH_GSSAPI=$(usex gssapi)
+		-DWITH_MBEDTLS=$(usex mbedtls)
+		-DWITH_PCAP=$(usex pcap)
+		-DWITH_SERVER=$(usex server)
+		-DWITH_SFTP=$(usex sftp)
+		-DBUILD_STATIC_LIB=$(usex static-libs)
+		# TODO: try enabling {CLIENT,SERVER}_TESTING
+		-DUNIT_TESTING=$(usex test)
+		-DWITH_ZLIB=$(usex zlib)
+	)
+
+	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	multilib_is_native_abi && use doc && cmake_src_compile docs
+}
+
+multilib_src_test() {
+	cmake_src_test --timeout 3000
+}
+
+multilib_src_install() {
+	cmake_src_install
+	multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+
+	use static-libs && dolib.a src/libssh.a
+
+	# compatibility symlink until all consumers have been updated
+	# to no longer use libssh_threads.so
+	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
+}
+
+multilib_src_install_all() {
+	use mbedtls && DOCS+=( README.mbedtls )
+	einstalldocs
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,cpp}
+	fi
+}
diff --git a/net-libs/libssh/libssh-0.11.1-r1.ebuild b/net-libs/libssh/libssh-0.11.1-r1.ebuild
new file mode 100644
index 000000000000..a1ddb76df753
--- /dev/null
+++ b/net-libs/libssh/libssh-0.11.1-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
+else
+	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gssapi mbedtls pcap server +sftp static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
+		elibc_musl? ( sys-libs/argp-standalone )
+	)
+"
+BDEPEND="doc? ( app-text/doxygen[dot] )"
+
+DOCS=( AUTHORS CHANGELOG README )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# just install the examples, do not compile them
+	cmake_comment_add_subdirectory examples
+
+	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+		-i ConfigureChecks.cmake || die
+
+	if use test; then
+		local skip_tests=(
+			# keyfile torture test is currently broken
+			-e "/torture_keyfiles/d"
+
+			# Tries to expand ~ which fails w/ portage homedir
+			# (torture_path_expand_tilde_unix and torture_config_make_absolute_no_sshdir)
+			-e "/torture_misc/d"
+			-e "/torture_config/d"
+		)
+
+		# Disable tests that take too long (bug #677006)
+		if use sparc; then
+			skip_tests+=(
+				-e "/torture_threads_pki_rsa/d"
+				-e "/torture_pki_dsa/d"
+			)
+		fi
+
+		if (( ${#skip_tests[@]} )) ; then
+			sed -i "${skip_tests[@]}" tests/unittests/CMakeLists.txt || die
+		fi
+
+		if use elibc_musl; then
+			sed -e "/SOLARIS/d" \
+				-i tests/CMakeLists.txt || die
+		fi
+	fi
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DWITH_NACL=OFF
+		-DWITH_STACK_PROTECTOR=OFF
+		-DWITH_STACK_PROTECTOR_STRONG=OFF
+		-DWITH_DEBUG_CALLTRACE=$(usex debug)
+		-DWITH_DEBUG_CRYPTO=$(usex debug)
+		-DWITH_GCRYPT=OFF
+		-DWITH_GSSAPI=$(usex gssapi)
+		-DWITH_MBEDTLS=$(usex mbedtls)
+		-DWITH_PCAP=$(usex pcap)
+		-DWITH_SERVER=$(usex server)
+		-DWITH_SFTP=$(usex sftp)
+		-DBUILD_STATIC_LIB=$(usex static-libs)
+		# TODO: try enabling {CLIENT,SERVER}_TESTING
+		-DUNIT_TESTING=$(usex test)
+		-DWITH_ZLIB=$(usex zlib)
+	)
+
+	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	multilib_is_native_abi && use doc && cmake_src_compile docs
+}
+
+multilib_src_test() {
+	cmake_src_test --timeout 3000
+}
+
+multilib_src_install() {
+	cmake_src_install
+	multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+
+	use static-libs && dolib.a src/libssh.a
+
+	# compatibility symlink until all consumers have been updated
+	# to no longer use libssh_threads.so
+	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
+}
+
+multilib_src_install_all() {
+	use mbedtls && DOCS+=( README.mbedtls )
+	einstalldocs
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,cpp}
+	fi
+}
diff --git a/net-libs/libssh/libssh-0.11.1.ebuild b/net-libs/libssh/libssh-0.11.1.ebuild
deleted file mode 100644
index 57664907ccdb..000000000000
--- a/net-libs/libssh/libssh-0.11.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gssapi mbedtls pcap server +sftp static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
-		elibc_musl? ( sys-libs/argp-standalone )
-	)
-"
-BDEPEND="doc? ( app-text/doxygen[dot] )"
-
-DOCS=( AUTHORS CHANGELOG README )
-
-src_prepare() {
-	cmake_src_prepare
-
-	# just install the examples, do not compile them
-	cmake_comment_add_subdirectory examples
-
-	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-		-i ConfigureChecks.cmake || die
-
-	if use test; then
-		local skip_tests=(
-			# keyfile torture test is currently broken
-			-e "/torture_keyfiles/d"
-
-			# Tries to expand ~ which fails w/ portage homedir
-			# (torture_path_expand_tilde_unix and torture_config_make_absolute_no_sshdir)
-			-e "/torture_misc/d"
-			-e "/torture_config/d"
-		)
-
-		# Disable tests that take too long (bug #677006)
-		if use sparc; then
-			skip_tests+=(
-				-e "/torture_threads_pki_rsa/d"
-				-e "/torture_pki_dsa/d"
-			)
-		fi
-
-		if (( ${#skip_tests[@]} )) ; then
-			sed -i "${skip_tests[@]}" tests/unittests/CMakeLists.txt || die
-		fi
-
-		if use elibc_musl; then
-			sed -e "/SOLARIS/d" \
-				-i tests/CMakeLists.txt || die
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_NACL=OFF
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STACK_PROTECTOR_STRONG=OFF
-		-DWITH_DEBUG_CALLTRACE=$(usex debug)
-		-DWITH_DEBUG_CRYPTO=$(usex debug)
-		-DWITH_GCRYPT=OFF
-		-DWITH_GSSAPI=$(usex gssapi)
-		-DWITH_MBEDTLS=$(usex mbedtls)
-		-DWITH_PCAP=$(usex pcap)
-		-DWITH_SERVER=$(usex server)
-		-DWITH_SFTP=$(usex sftp)
-		-DBUILD_STATIC_LIB=$(usex static-libs)
-		# TODO: try enabling {CLIENT,SERVER}_TESTING
-		-DUNIT_TESTING=$(usex test)
-		-DWITH_ZLIB=$(usex zlib)
-	)
-
-	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	multilib_is_native_abi && use doc && cmake_src_compile docs
-}
-
-multilib_src_test() {
-	cmake_src_test --timeout 3000
-}
-
-multilib_src_install() {
-	cmake_src_install
-	multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	use static-libs && dolib.a src/libssh.a
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	use mbedtls && DOCS+=( README.mbedtls )
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 1cab5e95f04b..956a471414a6 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-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
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	!mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
diff --git a/net-libs/libtirpc/libtirpc-1.3.6.ebuild b/net-libs/libtirpc/libtirpc-1.3.6.ebuild
index 83d0f66abfba..7494d948866f 100644
--- a/net-libs/libtirpc/libtirpc-1.3.6.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.3.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
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-2 BSD-4 LGPL-2.1+"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/libwebsockets/libwebsockets-4.3.3-r1.ebuild b/net-libs/libwebsockets/libwebsockets-4.3.3-r1.ebuild
new file mode 100644
index 000000000000..6657425c8e80
--- /dev/null
+++ b/net-libs/libwebsockets/libwebsockets-4.3.3-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A flexible pure-C library for implementing network protocols"
+HOMEPAGE="https://libwebsockets.org/"
+SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/19" # libwebsockets.so.19
+KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
+IUSE="access-log caps cgi client dbus extensions generic-sessions http-proxy http2 ipv6
+	+lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5
+	sqlite3 ssl threads zip"
+
+REQUIRED_USE="
+	access-log? ( http2 )
+	generic-sessions? ( smtp sqlite3 )
+	http-proxy? ( client )
+	mbedtls? ( ssl )
+	smtp? ( libuv )
+	socks5? ( client http-proxy )
+	?? ( libev libevent )"
+
+RDEPEND="
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	http-proxy? ( net-libs/libhubbub )
+	libev? ( dev-libs/libev )
+	libevent? ( dev-libs/libevent:= )
+	libuv? ( dev-libs/libuv:= )
+	sqlite3? ( dev-db/sqlite:= )
+	ssl? (
+		!mbedtls? ( dev-libs/openssl:0= )
+		mbedtls? ( net-libs/mbedtls:0= )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+		-DDISABLE_WERROR=ON
+		-DLWS_BUILD_HASH="unknown"
+		-DLWS_HAVE_LIBCAP=$(usex caps)
+		-DLWS_IPV6=$(usex ipv6)
+		-DLWS_ROLE_DBUS=$(usex dbus)
+		-DLWS_WITHOUT_CLIENT=$(usex !client)
+		-DLWS_WITHOUT_TEST_CLIENT=$(usex !client)
+		-DLWS_WITH_ACCESS_LOG=$(usex access-log)
+		-DLWS_WITH_CGI=$(usex cgi)
+		-DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions)
+		-DLWS_WITH_HTTP2=$(usex http2)
+		-DLWS_WITH_HTTP_PROXY=$(usex http-proxy)
+		-DLWS_WITH_HUBBUB=$(usex http-proxy)
+		-DLWS_WITH_LEJP=$(usex lejp)
+		-DLWS_WITH_LIBEV=$(usex libev)
+		-DLWS_WITH_LIBEVENT=$(usex libevent)
+		-DLWS_WITH_LIBUV=$(usex libuv)
+		-DLWS_WITH_MBEDTLS=$(usex mbedtls)
+		-DLWS_WITH_PEER_LIMITS=$(usex peer-limits)
+		-DLWS_WITH_SERVER_STATUS=$(usex server-status)
+		-DLWS_WITH_SMTP=$(usex smtp)
+		-DLWS_WITH_SOCKS5=$(usex socks5)
+		-DLWS_WITH_SQLITE3=$(usex sqlite3)
+		-DLWS_WITH_SSL=$(usex ssl)
+		-DLWS_WITH_STATIC=OFF
+		-DLWS_WITH_STRUCT_JSON=$(usex lejp)
+		-DLWS_WITH_THREADPOOL=$(usex threads)
+		-DLWS_WITH_ZIP_FOPS=$(usex zip)
+		-DLWS_WITHOUT_EXTENSIONS=$(usex !extensions)
+		-DLWS_WITHOUT_TESTAPPS=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/net-libs/libwebsockets/libwebsockets-4.3.3.ebuild b/net-libs/libwebsockets/libwebsockets-4.3.3.ebuild
deleted file mode 100644
index 2e0c4457d823..000000000000
--- a/net-libs/libwebsockets/libwebsockets-4.3.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="A flexible pure-C library for implementing network protocols"
-HOMEPAGE="https://libwebsockets.org/"
-SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/19" # libwebsockets.so.19
-KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
-IUSE="access-log caps cgi client dbus extensions generic-sessions http-proxy http2 ipv6
-	+lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5
-	sqlite3 ssl threads zip"
-
-REQUIRED_USE="
-	access-log? ( http2 )
-	generic-sessions? ( smtp sqlite3 )
-	http-proxy? ( client )
-	mbedtls? ( ssl )
-	smtp? ( libuv )
-	socks5? ( client http-proxy )
-	?? ( libev libevent )"
-
-RDEPEND="
-	sys-libs/zlib
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	http-proxy? ( net-libs/libhubbub )
-	libev? ( dev-libs/libev )
-	libevent? ( dev-libs/libevent:= )
-	libuv? ( dev-libs/libuv:= )
-	sqlite3? ( dev-db/sqlite:= )
-	ssl? (
-		!mbedtls? ( dev-libs/openssl:0= )
-		mbedtls? ( net-libs/mbedtls:= )
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
-		-DDISABLE_WERROR=ON
-		-DLWS_BUILD_HASH="unknown"
-		-DLWS_HAVE_LIBCAP=$(usex caps)
-		-DLWS_IPV6=$(usex ipv6)
-		-DLWS_ROLE_DBUS=$(usex dbus)
-		-DLWS_WITHOUT_CLIENT=$(usex !client)
-		-DLWS_WITHOUT_TEST_CLIENT=$(usex !client)
-		-DLWS_WITH_ACCESS_LOG=$(usex access-log)
-		-DLWS_WITH_CGI=$(usex cgi)
-		-DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions)
-		-DLWS_WITH_HTTP2=$(usex http2)
-		-DLWS_WITH_HTTP_PROXY=$(usex http-proxy)
-		-DLWS_WITH_HUBBUB=$(usex http-proxy)
-		-DLWS_WITH_LEJP=$(usex lejp)
-		-DLWS_WITH_LIBEV=$(usex libev)
-		-DLWS_WITH_LIBEVENT=$(usex libevent)
-		-DLWS_WITH_LIBUV=$(usex libuv)
-		-DLWS_WITH_MBEDTLS=$(usex mbedtls)
-		-DLWS_WITH_PEER_LIMITS=$(usex peer-limits)
-		-DLWS_WITH_SERVER_STATUS=$(usex server-status)
-		-DLWS_WITH_SMTP=$(usex smtp)
-		-DLWS_WITH_SOCKS5=$(usex socks5)
-		-DLWS_WITH_SQLITE3=$(usex sqlite3)
-		-DLWS_WITH_SSL=$(usex ssl)
-		-DLWS_WITH_STATIC=OFF
-		-DLWS_WITH_STRUCT_JSON=$(usex lejp)
-		-DLWS_WITH_THREADPOOL=$(usex threads)
-		-DLWS_WITH_ZIP_FOPS=$(usex zip)
-		-DLWS_WITHOUT_EXTENSIONS=$(usex !extensions)
-		-DLWS_WITHOUT_TESTAPPS=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/net-libs/llhttp/llhttp-9.2.1.ebuild b/net-libs/llhttp/llhttp-9.2.1.ebuild
index 79527f4f6cc0..7a9a49b0b578 100644
--- a/net-libs/llhttp/llhttp-9.2.1.ebuild
+++ b/net-libs/llhttp/llhttp-9.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,4 +18,4 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 87d94b7ef25e..49b4cb94be50 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,3 +1,2 @@
-DIST mbedtls-2.28.8.tar.bz2 3343796 BLAKE2B 1efde6698662873c40df9733bae902db4e009f3dd26a937e05707ca1a208b71675df0737b44b5895a60cfbf42f18f92dae88cba62f32b55733947b9c0481880e SHA512 c8e91ec50ab2caf1f33e907279dc30fca2a8cd97e6e531be857149589e52aeffb95b445b2a9fa674886f0071f446381da3bb8107f7e850f3390128b069ac9ea7
 DIST mbedtls-2.28.9.tar.bz2 3357068 BLAKE2B 14b845f826c3a1953ca3ab82d2f557d8fe6f1a2f57b31134c89933571a87ab9027de50f8f094d4086509d60e38d4c82ac67180f848aa6d06f3ce9f390c8ed63c SHA512 305f97c0b0ba7d57639532a24600234d8f849a4a5795773673b31cc1fdcd1cd56aea42bec2ff87439296e1528dcc2bed5e2a29fbdbf7edad4f5c4da232079d99
 DIST mbedtls-3.6.2.tar.bz2 4979769 BLAKE2B dbf34ca3cffca7a9bdb10191bd58971583ae3f2cdef3e350ccda08eae2e7b52f5fd4d1aff5582ee120b6e35e6843d7dd323ba7da5f1428c16130e5ed7c0d689e SHA512 7ab3b1ec179681949e1b0d171e04f75a605ae9ed8177cf3f6f27c401efca4aff930437ecc425c9a994d36f50ddd6f0f0dd7feeb42251128ac875b4c57fe3811b
diff --git a/net-libs/mbedtls/files/mbedtls-3.6.2-add-version-suffix-for-all-installable-targets.patch b/net-libs/mbedtls/files/mbedtls-3.6.2-add-version-suffix-for-all-installable-targets.patch
new file mode 100644
index 000000000000..3aeea6060da7
--- /dev/null
+++ b/net-libs/mbedtls/files/mbedtls-3.6.2-add-version-suffix-for-all-installable-targets.patch
@@ -0,0 +1,79 @@
+https://github.com/Mbed-TLS/mbedtls/pull/9876
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Sun, 1 Dec 2024 00:49:15 +0300
+Subject: Add version suffix for all installable targets
+
+Convert main library targets to slottable versions. This allows to
+install major versions of MbedTLS simultaneously.
+
+Dependent packages should use `find_package(MbedTLS 3 [REQUIRED])` and
+`MbedTLS::<component>` in order to use requested libraries.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -478,7 +478,7 @@ if(NOT DISABLE_PACKAGE_CONFIG_AND_INSTALL)
+     install(
+         FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/MbedTLSConfig.cmake"
+               "${CMAKE_CURRENT_BINARY_DIR}/cmake/MbedTLSConfigVersion.cmake"
+-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/MbedTLS")
++        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/MbedTLS-${PROJECT_VERSION_MAJOR}")
+ 
+     export(
+         EXPORT MbedTLSTargets
+@@ -488,7 +488,7 @@ if(NOT DISABLE_PACKAGE_CONFIG_AND_INSTALL)
+     install(
+         EXPORT MbedTLSTargets
+         NAMESPACE MbedTLS::
+-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/MbedTLS"
++        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/MbedTLS-${PROJECT_VERSION_MAJOR}"
+         FILE "MbedTLSTargets.cmake")
+ 
+     if(CMAKE_VERSION VERSION_GREATER 3.15 OR CMAKE_VERSION VERSION_EQUAL 3.15)
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -277,7 +277,7 @@ set(everest_target "${MBEDTLS_TARGET_PREFIX}everest")
+ 
+ if(USE_STATIC_MBEDTLS_LIBRARY)
+     add_library(${mbedcrypto_static_target} STATIC ${src_crypto})
+-    set_target_properties(${mbedcrypto_static_target} PROPERTIES OUTPUT_NAME mbedcrypto)
++    set_target_properties(${mbedcrypto_static_target} PROPERTIES OUTPUT_NAME mbedcrypto${PROJECT_VERSION_MAJOR})
+     target_link_libraries(${mbedcrypto_static_target} PUBLIC ${libs})
+ 
+     if(TARGET ${everest_target})
+@@ -289,11 +289,11 @@ if(USE_STATIC_MBEDTLS_LIBRARY)
+     endif()
+ 
+     add_library(${mbedx509_static_target} STATIC ${src_x509})
+-    set_target_properties(${mbedx509_static_target} PROPERTIES OUTPUT_NAME mbedx509)
++    set_target_properties(${mbedx509_static_target} PROPERTIES OUTPUT_NAME mbedx509${PROJECT_VERSION_MAJOR})
+     target_link_libraries(${mbedx509_static_target} PUBLIC ${libs} ${mbedcrypto_static_target})
+ 
+     add_library(${mbedtls_static_target} STATIC ${src_tls})
+-    set_target_properties(${mbedtls_static_target} PROPERTIES OUTPUT_NAME mbedtls)
++    set_target_properties(${mbedtls_static_target} PROPERTIES OUTPUT_NAME mbedtls${PROJECT_VERSION_MAJOR})
+     target_link_libraries(${mbedtls_static_target} PUBLIC ${libs} ${mbedx509_static_target})
+ endif(USE_STATIC_MBEDTLS_LIBRARY)
+ 
+@@ -301,6 +301,7 @@ if(USE_SHARED_MBEDTLS_LIBRARY)
+     set(CMAKE_LIBRARY_PATH ${CMAKE_CURRENT_BINARY_DIR})
+     add_library(${mbedcrypto_target} SHARED ${src_crypto})
+     set_target_properties(${mbedcrypto_target} PROPERTIES VERSION 3.6.2 SOVERSION 16)
++    set_target_properties(${mbedcrypto_target} PROPERTIES OUTPUT_NAME mbedcrypto${PROJECT_VERSION_MAJOR})
+     target_link_libraries(${mbedcrypto_target} PUBLIC ${libs})
+ 
+     if(TARGET ${everest_target})
+@@ -313,10 +314,12 @@ if(USE_SHARED_MBEDTLS_LIBRARY)
+ 
+     add_library(${mbedx509_target} SHARED ${src_x509})
+     set_target_properties(${mbedx509_target} PROPERTIES VERSION 3.6.2 SOVERSION 7)
++    set_target_properties(${mbedx509_target} PROPERTIES OUTPUT_NAME mbedx509${PROJECT_VERSION_MAJOR})
+     target_link_libraries(${mbedx509_target} PUBLIC ${libs} ${mbedcrypto_target})
+ 
+     add_library(${mbedtls_target} SHARED ${src_tls})
+     set_target_properties(${mbedtls_target} PROPERTIES VERSION 3.6.2 SOVERSION 21)
++    set_target_properties(${mbedtls_target} PROPERTIES OUTPUT_NAME mbedtls${PROJECT_VERSION_MAJOR})
+     target_link_libraries(${mbedtls_target} PUBLIC ${libs} ${mbedx509_target})
+ endif(USE_SHARED_MBEDTLS_LIBRARY)
+ 
+-- 
+2.45.2
+
diff --git a/net-libs/mbedtls/files/mbedtls-3.6.2-add-version-suffix-for-pkg-config-files.patch b/net-libs/mbedtls/files/mbedtls-3.6.2-add-version-suffix-for-pkg-config-files.patch
new file mode 100644
index 000000000000..4e3858b327cd
--- /dev/null
+++ b/net-libs/mbedtls/files/mbedtls-3.6.2-add-version-suffix-for-pkg-config-files.patch
@@ -0,0 +1,71 @@
+https://github.com/Mbed-TLS/mbedtls/pull/9876
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Sun, 1 Dec 2024 00:54:10 +0300
+Subject: Add version suffix for pkg-config files
+
+Convert main library targets to slottable versions. This allows to
+install major versions of MbedTLS simultaneously.
+
+Dependent packages should use
+`pkg-config --libs --cflags (mbedtls3|mbedx5093|mbedx5093)` in order to use
+requested libraries.
+--- a/pkgconfig/CMakeLists.txt
++++ b/pkgconfig/CMakeLists.txt
+@@ -8,18 +8,18 @@ if(NOT DISABLE_PACKAGE_CONFIG_AND_INSTALL)
+   set(PKGCONFIG_PROJECT_DESCRIPTION "Mbed TLS is a C library that implements cryptographic primitives, X.509 certificate manipulation and the SSL/TLS and DTLS protocols. Its small code footprint makes it suitable for embedded systems.")
+   set(PKGCONFIG_PROJECT_HOMEPAGE_URL "https://www.trustedfirmware.org/projects/mbed-tls/")
+ 
+-  configure_file(mbedcrypto.pc.in mbedcrypto.pc @ONLY)
++  configure_file(mbedcrypto.pc.in mbedcrypto${PROJECT_VERSION_MAJOR}.pc @ONLY)
+     install(FILES
+-    ${CMAKE_CURRENT_BINARY_DIR}/mbedcrypto.pc
++    ${CMAKE_CURRENT_BINARY_DIR}/mbedcrypto${PROJECT_VERSION_MAJOR}.pc
+     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+-  configure_file(mbedtls.pc.in mbedtls.pc @ONLY)
++  configure_file(mbedtls.pc.in mbedtls${PROJECT_VERSION_MAJOR}.pc @ONLY)
+     install(FILES
+-    ${CMAKE_CURRENT_BINARY_DIR}/mbedtls.pc
++    ${CMAKE_CURRENT_BINARY_DIR}/mbedtls${PROJECT_VERSION_MAJOR}.pc
+     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+-  configure_file(mbedx509.pc.in mbedx509.pc @ONLY)
++  configure_file(mbedx509.pc.in mbedx509${PROJECT_VERSION_MAJOR}.pc @ONLY)
+     install(FILES
+-    ${CMAKE_CURRENT_BINARY_DIR}/mbedx509.pc
++    ${CMAKE_CURRENT_BINARY_DIR}/mbedx509${PROJECT_VERSION_MAJOR}.pc
+     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ endif()
+--- a/pkgconfig/mbedcrypto.pc.in
++++ b/pkgconfig/mbedcrypto.pc.in
+@@ -7,4 +7,4 @@ Description: @PKGCONFIG_PROJECT_DESCRIPTION@
+ URL: @PKGCONFIG_PROJECT_HOMEPAGE_URL@
+ Version: @PROJECT_VERSION@
+ Cflags: -I"${includedir}"
+-Libs: -L"${libdir}" -lmbedcrypto
++Libs: -L"${libdir}" -lmbedcrypto@PROJECT_VERSION_MAJOR@
+--- a/pkgconfig/mbedtls.pc.in
++++ b/pkgconfig/mbedtls.pc.in
+@@ -6,6 +6,6 @@ Name: @PROJECT_NAME@
+ Description: @PKGCONFIG_PROJECT_DESCRIPTION@
+ URL: @PKGCONFIG_PROJECT_HOMEPAGE_URL@
+ Version: @PROJECT_VERSION@
+-Requires.private: mbedcrypto mbedx509
++Requires.private: mbedcrypto@PROJECT_VERSION_MAJOR@ mbedx509@PROJECT_VERSION_MAJOR@
+ Cflags: -I"${includedir}"
+-Libs: -L"${libdir}" -lmbedtls
++Libs: -L"${libdir}" -lmbedtls@PROJECT_VERSION_MAJOR@
+--- a/pkgconfig/mbedx509.pc.in
++++ b/pkgconfig/mbedx509.pc.in
+@@ -6,6 +6,6 @@ Name: @PROJECT_NAME@
+ Description: @PKGCONFIG_PROJECT_DESCRIPTION@
+ URL: @PKGCONFIG_PROJECT_HOMEPAGE_URL@
+ Version: @PROJECT_VERSION@
+-Requires.private: mbedcrypto
++Requires.private: mbedcrypto@PROJECT_VERSION_MAJOR@
+ Cflags: -I"${includedir}"
+-Libs: -L"${libdir}" -lmbedx509
++Libs: -L"${libdir}" -lmbedx509@PROJECT_VERSION_MAJOR@
+-- 
+2.45.2
+
diff --git a/net-libs/mbedtls/files/mbedtls-3.6.2-allow-install-headers-to-different-location.patch b/net-libs/mbedtls/files/mbedtls-3.6.2-allow-install-headers-to-different-location.patch
new file mode 100644
index 000000000000..2b3ae9fb6999
--- /dev/null
+++ b/net-libs/mbedtls/files/mbedtls-3.6.2-allow-install-headers-to-different-location.patch
@@ -0,0 +1,105 @@
+https://github.com/Mbed-TLS/mbedtls/pull/9876
+From 6a0c205d86a96772b82c4d7e7dfce5ea362c7870 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Sat, 30 Nov 2024 02:17:17 +0300
+Subject: Allow install headers to different location
+
+Use standard `CMAKE_INSTALL_INCLUDEDIR` and `CMAKE_INSTALL_LIBDIR`
+location to define headers and library installation. This variable can be
+redefined on configuration phase to allow install headers and libraries to
+different location (like `include/mbedtls3`, #8723).
+
+Additionally removing explicit permission rules as they may broke proper
+permissions for system installation (like remove executable bit from
+libraries). By default CMake sets permissions correctly on all files and
+directories.
+
+See #8723 for rationale.
+--- a/3rdparty/everest/CMakeLists.txt
++++ b/3rdparty/everest/CMakeLists.txt
+@@ -27,16 +27,16 @@ if(MBEDTLS_USER_CONFIG_FILE)
+ endif()
+ 
+ if(INSTALL_MBEDTLS_HEADERS)
+-
+   install(DIRECTORY include/everest
+-    DESTINATION include
+-    FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-    DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
++    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+     FILES_MATCHING PATTERN "*.h")
+ 
+ endif(INSTALL_MBEDTLS_HEADERS)
+ 
+ install(TARGETS ${everest_target}
+   EXPORT MbedTLSTargets
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++)
+--- a/3rdparty/p256-m/CMakeLists.txt
++++ b/3rdparty/p256-m/CMakeLists.txt
+@@ -25,16 +25,16 @@ if(MBEDTLS_USER_CONFIG_FILE)
+ endif()
+ 
+ if(INSTALL_MBEDTLS_HEADERS)
+-
+-  install(DIRECTORY :${CMAKE_CURRENT_SOURCE_DIR}
+-    DESTINATION include
+-    FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-    DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
++  install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
++    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+     FILES_MATCHING PATTERN "*.h")
+ 
+ endif(INSTALL_MBEDTLS_HEADERS)
+ 
+ install(TARGETS ${p256m_target}
+-EXPORT MbedTLSTargets
+-DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
++  EXPORT MbedTLSTargets
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++)
+--- a/include/CMakeLists.txt
++++ b/include/CMakeLists.txt
+@@ -1,16 +1,15 @@
+ option(INSTALL_MBEDTLS_HEADERS "Install Mbed TLS headers." ON)
+ 
+ if(INSTALL_MBEDTLS_HEADERS)
+-
+     file(GLOB headers "mbedtls/*.h")
+     file(GLOB psa_headers "psa/*.h")
+ 
+     install(FILES ${headers}
+-        DESTINATION include/mbedtls
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mbedtls
+         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+ 
+     install(FILES ${psa_headers}
+-        DESTINATION include/psa
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/psa
+         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+ 
+ endif(INSTALL_MBEDTLS_HEADERS)
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -348,7 +348,8 @@ foreach(target IN LISTS target_libraries)
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-        PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
++        INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++    )
+ endforeach(target)
+ 
+ set(lib_target "${MBEDTLS_TARGET_PREFIX}lib")
+-- 
+2.45.2
+
diff --git a/net-libs/mbedtls/files/mbedtls-3.6.2-exclude-static-3dparty.patch b/net-libs/mbedtls/files/mbedtls-3.6.2-exclude-static-3dparty.patch
new file mode 100644
index 000000000000..1df749854419
--- /dev/null
+++ b/net-libs/mbedtls/files/mbedtls-3.6.2-exclude-static-3dparty.patch
@@ -0,0 +1,22 @@
+https://github.com/Mbed-TLS/mbedtls/pull/8284#issuecomment-2030088495
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Sun, 1 Dec 2024 20:56:50 +0300
+Subject: Exclude 3rd party code from building
+
+Third party code is required only for limited features that not enabled by default.
+
+See: https://github.com/Mbed-TLS/mbedtls/pull/8284#issuecomment-2030088495
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -325,8 +325,6 @@ add_subdirectory(framework)
+ 
+ add_subdirectory(include)
+ 
+-add_subdirectory(3rdparty)
+-
+ add_subdirectory(library)
+ 
+ add_subdirectory(pkgconfig)
+-- 
+2.45.2
+
diff --git a/net-libs/mbedtls/mbedtls-2.28.8-r1.ebuild b/net-libs/mbedtls/mbedtls-2.28.8-r1.ebuild
deleted file mode 100644
index 748942d2e93f..000000000000
--- a/net-libs/mbedtls/mbedtls-2.28.8-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake flag-o-matic multilib-minimal python-any-r1
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://www.trustedfirmware.org/projects/mbed-tls/"
-SRC_URI="https://github.com/Mbed-TLS/mbedtls/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( Apache-2.0 GPL-2+ )"
-SLOT="0/7.14.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? (
-		app-text/doxygen
-		media-gfx/graphviz
-	)
-	test? ( dev-lang/perl )
-"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cmac && enable_mbedtls_option MBEDTLS_CMAC_C
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Workaround for https://github.com/Mbed-TLS/mbedtls/issues/9814 (bug #946544)
-	append-flags $(test-flags-CC -fzero-init-padding-bits=unions)
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_TESTING=$(usex test)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DLINK_WITH_PTHREAD=$(usex threads)
-		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	use doc && multilib_is_native_abi && emake -C "${S}" apidoc
-}
-
-multilib_src_test() {
-	# Disable parallel run, bug #718390
-	# https://github.com/Mbed-TLS/mbedtls/issues/4980
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake_src_test -j1
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-3.6.2-r1.ebuild b/net-libs/mbedtls/mbedtls-3.6.2-r1.ebuild
deleted file mode 100644
index 89dea0151ff0..000000000000
--- a/net-libs/mbedtls/mbedtls-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,102 +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} )
-
-inherit cmake flag-o-matic multilib-minimal python-any-r1
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://www.trustedfirmware.org/projects/mbed-tls/"
-SRC_URI="https://github.com/Mbed-TLS/mbedtls/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="|| ( Apache-2.0 GPL-2+ )"
-SLOT="0/16.21.7" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cpu_flags_x86_sse2 doc programs static-libs test threads"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? (
-		app-text/doxygen
-		media-gfx/graphviz
-	)
-	test? ( dev-lang/perl )
-"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/mbedtls_config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Workaround for https://github.com/Mbed-TLS/mbedtls/issues/9814 (bug #946544)
-	append-flags $(test-flags-CC -fzero-init-padding-bits=unions)
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_TESTING=$(usex test)
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DLINK_WITH_PTHREAD=$(usex threads)
-		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	use doc && multilib_is_native_abi && emake -C "${S}" apidoc
-}
-
-multilib_src_test() {
-	# Disable parallel run, bug #718390
-	# https://github.com/Mbed-TLS/mbedtls/issues/4980
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake_src_test -j1
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-3.6.2-r100.ebuild b/net-libs/mbedtls/mbedtls-3.6.2-r100.ebuild
new file mode 100644
index 000000000000..1b2705f0524e
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-3.6.2-r100.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake flag-o-matic multilib-minimal python-any-r1
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://www.trustedfirmware.org/projects/mbed-tls/"
+SRC_URI="https://github.com/Mbed-TLS/mbedtls/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="|| ( Apache-2.0 GPL-2+ )"
+SLOT="3/16.21.7" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 doc programs static-libs test threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!>net-libs/mbedtls-3:0"
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? (
+		app-text/doxygen
+		media-gfx/graphviz
+	)
+	test? ( dev-lang/perl )
+"
+
+PATCHES=(
+	"${FILESDIR}/mbedtls-3.6.2-allow-install-headers-to-different-location.patch"
+	"${FILESDIR}/mbedtls-3.6.2-add-version-suffix-for-all-installable-targets.patch"
+	"${FILESDIR}/mbedtls-3.6.2-add-version-suffix-for-pkg-config-files.patch"
+	"${FILESDIR}/mbedtls-3.6.2-exclude-static-3dparty.patch"
+)
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/mbedtls_config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Workaround for https://github.com/Mbed-TLS/mbedtls/issues/9814 (bug #946544)
+	append-flags $(test-flags-CC -fzero-init-padding-bits=unions)
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_TESTING=$(usex test)
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DCMAKE_INSTALL_INCLUDEDIR="include/mbedtls3"
+		-DLINK_WITH_PTHREAD=$(usex threads)
+		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	use doc && multilib_is_native_abi && emake -C "${S}" apidoc
+}
+
+multilib_src_test() {
+	# Disable parallel run, bug #718390
+	# https://github.com/Mbed-TLS/mbedtls/issues/4980
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake_src_test -j1
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 1ae860948ae7..384574121def 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,4 +1,4 @@
-DIST miniupnpc-2.2.7.tar.gz 104258 BLAKE2B 5681c1747c8e330442a0ad46d673e1739283bfc23571cb2225abf82326caa7da979911b3182cab2e3eea49140b90619f4e00bb5b1e2f0cd6067c28017cf87016 SHA512 d24e653c2f7bfed4485342c5ec8d18b4dd4c3430975b5fae392d3534f38bb3fb59e6638e76d57847f49045e22f3afd6cac128d7d9d10ef05bd6ad24ef38303b6
-DIST miniupnpc-2.2.7.tar.gz.sig 543 BLAKE2B 6649e5866afd13034b05a9d771c25c419e85631ca17ed7457e5811aee0ba8c38b0ad34033caa5b611cde21a63251e902e3f24cc4748e52a4a379ef075bf59dc5 SHA512 188837275b20c61c05babac916bff86178774030dbc191ecd0e5314c6e9b6dbb627680b512c554a8b27a020bd7503b141be26a134e0ed7e2cc56c7e2c01d9e81
 DIST miniupnpc-2.2.8.tar.gz 104603 BLAKE2B eae4d97bdf8c494ea6744edfeb870f9d92df8468d23f974e0e44e735fc7c8925189ea58f60a71c37315aebff1269ae69e9413cdf80dc292c4b90df5f12bf58a4 SHA512 526c9df1485302d4c9c78062fb058cfd433463f6e7a9f4025a9f5228aef41ee61a4b9e7a76b6cfa8779b91cc3c663846a997dc1470902d7108b129155e6a3360
 DIST miniupnpc-2.2.8.tar.gz.sig 543 BLAKE2B b4d056972fc7e46c1e41a658d301db8e9a0d3b99af2220c264d06267b4e8ae45847e2bf2cd6583fded67f12c2e0a3c833ba7e38d9c05b5a0cc363e0c1fc8feae SHA512 b5eec0d24a84183021cd16bfd6ecedda587dee0bbb017fe6d107e8c2815ef90cf5f904c6fb9aa32e2e4d5f0b63de8566814c9a0d921b338b26b60ea35c23ecae
+DIST miniupnpc-2.3.0.tar.gz 105071 BLAKE2B a5a2d22d99eb9f20fcb0b61107db61b97fec8207f5d8079c7d8e1d7bbc73478c3b575c7ecf32cb3ffe64f82a93673ab1f734139755c512d48439358e314e8762 SHA512 63efda015c7f693499a6f1f28b8356c4bb05ed0354fe2fb79042295607bf4f12c15082a48ced348ca5647fca9d83b99068c28311623f46225e9b09b5dc23a290
+DIST miniupnpc-2.3.0.tar.gz.sig 543 BLAKE2B acbc2fedd1984e2488aac4618a70b2f0e5573ab17beaa84660117fada915b9ee94e419ee4ddbeae30c04e4eff8749d2a8724b4826bd5ce8ac972908fbda1189c SHA512 081d6c77fb08863760e4ddeb5bc1a5414603782b785f1f86efe516e59a113a4da794895ad160922818574029189df32a0c57fe2558c2ce99d521aa2673d40d43
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.7.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.7.ebuild
deleted file mode 100644
index 8f58e1fc3ffd..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.2.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs verify-sig
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="
-	http://miniupnp.free.fr/
-	https://miniupnp.tuxfamily.org/
-	https://github.com/miniupnp/miniupnp/
-"
-SRC_URI="
-	https://miniupnp.tuxfamily.org/files/${P}.tar.gz
-	verify-sig? (
-		https://miniupnp.tuxfamily.org/files/${P}.tar.gz.sig
-	)
-"
-
-LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	kernel_linux? ( sys-apps/lsb-release )
-	verify-sig? ( sec-keys/openpgp-keys-miniupnp )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/miniupnp.asc
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/miniupnpc-2.2.3-drop-which.patch
-	)
-	default
-
-	local exprs=(
-		# These bins are not installed, upnpc-static requires building static lib
-		-e '/EXECUTABLES =/s/ upnpc-static upnp-listdevices-static//'
-		# Prevent gzipping manpage.
-		-e '/gzip/d'
-		# Disable installing the static library
-		-e '/FILESTOINSTALL =/s/ $(LIBRARY)//'
-		-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d'
-	)
-	sed -i "${exprs[@]}" Makefile || die
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake build/upnpc-shared
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/net-libs/miniupnpc/miniupnpc-2.3.0.ebuild b/net-libs/miniupnpc/miniupnpc-2.3.0.ebuild
new file mode 100644
index 000000000000..5c80be461765
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-2.3.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs verify-sig
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="
+	http://miniupnp.free.fr/
+	https://miniupnp.tuxfamily.org/
+	https://github.com/miniupnp/miniupnp/
+"
+SRC_URI="
+	https://miniupnp.tuxfamily.org/files/${P}.tar.gz
+	verify-sig? (
+		https://miniupnp.tuxfamily.org/files/${P}.tar.gz.sig
+	)
+"
+
+LICENSE="BSD"
+SLOT="0/19"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	kernel_linux? ( sys-apps/lsb-release )
+	verify-sig? ( sec-keys/openpgp-keys-miniupnp )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/miniupnp.asc
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/miniupnpc-2.2.3-drop-which.patch
+	)
+	default
+
+	local exprs=(
+		# These bins are not installed, upnpc-static requires building static lib
+		-e '/EXECUTABLES =/s/ upnpc-static upnp-listdevices-static//'
+		# Prevent gzipping manpage.
+		-e '/gzip/d'
+		# Disable installing the static library
+		-e '/FILESTOINSTALL =/s/ $(LIBRARY)//'
+		-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d'
+	)
+	sed -i "${exprs[@]}" Makefile || die
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+	tc-export CC AR
+	emake build/upnpc-shared
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="$(get_libdir)" \
+		install
+
+	dodoc README Changelog.txt
+}
diff --git a/net-libs/msgraph/msgraph-0.2.3.ebuild b/net-libs/msgraph/msgraph-0.2.3.ebuild
index f8d84f7c0d8b..b904efdb790b 100644
--- a/net-libs/msgraph/msgraph-0.2.3.ebuild
+++ b/net-libs/msgraph/msgraph-0.2.3.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/msgraph"
 
 LICENSE="LGPL-2+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 IUSE="debug gtk-doc +introspection man test"
 REQUIRED_USE="gtk-doc? ( introspection )"
diff --git a/net-libs/nghttp3/nghttp3-1.7.0.ebuild b/net-libs/nghttp3/nghttp3-1.7.0.ebuild
index ddeee7aee2f3..07ab2fa343e1 100644
--- a/net-libs/nghttp3/nghttp3-1.7.0.ebuild
+++ b/net-libs/nghttp3/nghttp3-1.7.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~m68k ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="HTTP/3 library written in C"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 7195d240d10a..12ead0be479a 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -2,10 +2,7 @@ DIST node-v18.20.4.tar.xz 40445740 BLAKE2B 0675f2aba1d9a9cd9aeb665ecb3a0f61b9caf
 DIST node-v18.20.5.tar.xz 40624172 BLAKE2B 3691e655016704adb625cbf6bda7c79775a3184c4081a70874573807cde9ecc646dd6a572bad7872138f9a95ee2756f0ed5ecabe796bcd2f5dcd612d79ec8b2f SHA512 d2215d26ac3bca00ea5eb16976e943375e8d98cef9b2674f9842aa73afb3c269afd0a17104961f6f13e653ab13da1f647669b76a8446a5b82c9db6a743cd5e7f
 DIST node-v20.15.1.tar.xz 41880412 BLAKE2B f113856db03a3306d50a659e21d11f585e9e78b85ce7ad9926cc778837f905c618ac762faf56e03caaa862ab0a38c5f34770cd2bfb0854d79650ee9d9b9e2bfe SHA512 2a2935490c4c629f47cc67819094904a1b91eaf0b75cbb8ebe92f5eb34b0929230932fa456bf1bec00213155ea8b6337b2e02e946fc18606543c8c71082615b9
 DIST node-v20.17.0.tar.xz 41751520 BLAKE2B 157cf4c3326fcd2f1324c0898018c88327df05c717acfa8d96728e1ebf378ea04e46da56b93e89041a49b5ee4b7e6070373401a2bc2e9163eec3b0dffb6ff4d3 SHA512 3f21c9b5b292143d25a9d51e24d8f9b366429872b3d905d705fb2293e4f4b11e8861650535425d498b999974971a8dec7bf9f9c398af03170caa84bdc63b94da
-DIST node-v20.18.0.tar.xz 41937144 BLAKE2B 072d6c43f45054eaad8e747330726791e2fcb992cdb3437894d6804b0b9a1c4dc4e68b5321d91abcd8d3e0a13e7eaf2a63f953903098aae1e54db0d639441c6e SHA512 e7d43bb7324df59362591c4d3f2c91a870bec17c4024666ae92e2a3ffc0711b82d05b91a21802a0b252ad7469f8da430f7d427b2d8291d91107dd8589ea91f66
 DIST node-v20.18.1.tar.xz 41962272 BLAKE2B 9c66153e22dd924182304190358402e7bf850a165433bb8ce46cafae715904d9ba987e96f0e373778d0b6a9b3cf6dcf92866f39043c184e97825ce7c2319da33 SHA512 7b421ced5d96aa90af9d96e5a3f84d5b6967db9f107740da7cfe4980b7e9f74a00aedac6db28f42f670da536abb957298069c7498e1d744f6212e75defb5305b
-DIST node-v22.10.0.tar.xz 47009048 BLAKE2B 5a18a4d6b850f34b3e983384c04b4c214aeef41236f5901d0db396c91faa32f946f03ca807ca6e55576c10698653044416b82d01e6595934a3f5d3d85706728f SHA512 4554b77611a8ee83e026ad9eb69cc9521ecf6c7805dd674929a9810c38e42616de4795d12cabee58632eea8de452031b4b3bba318ac27dece0e16aa3edb5d2c2
 DIST node-v22.12.0.tar.xz 47625776 BLAKE2B 12df19e32d3af0dd953b31ee6c136edd45ef7bcec2ca9b0d5ada24337d71b5c075595f31862238f781cd4679cc5e1d55ac1d6cfd84ea7e767b55b84d4c5c7475 SHA512 1d906ffa0c187d5c405b1bb0db6a01fcc9eb94ceb0a18e013129d81201d5ea68a57a7ac954383a5fd36f78fcd9f43cfd1cda1eaf0a2dd2fe0e988d752511d8f7
 DIST node-v22.4.1.tar.xz 46125104 BLAKE2B 7e54a7e01f821d752abbec03212c5be838b2e12fdb10c50cfe05b0ec25ddbe71eaa3187ba25d99efb258ab14d31927216e6816aacdfa29efdb1dc70a06e9b135 SHA512 840423e9738cad9f6024e9b51b683893eab16487ba18183251a189b5d4acf9b4168e9245623092705b014bff2058174127d5d7ecb31c1a8b324961074cb8ca54
 DIST node-v22.7.0.tar.xz 46875872 BLAKE2B f0dcd07d3040ddc0df335b51da82bce8a963ce7848892cda5f593b7fa954a61d0b789f0f70d6b2d4ca80716fcabf70268ac94297c2acd3886ac8172eb5fdf6df SHA512 6d5b751a03b68beec3f046697a806918571b04799a0c5fbb0374026729cc2e88fb1787bef6235c19e0bfda4e7545a618bf375410553c7d9e1eb149c6d43c0c3b
-DIST node-v22.8.0.tar.xz 46899840 BLAKE2B 04dc53ad42c6a913335ecd9b5bfd5bf2f2a8d3429f28d5eba59ebde62fd76be5dea90f12212bfa9dfaa6698000da6bfec08cb1f0e1e3d3b9e8af70cab005268e SHA512 c2942c65dc9909b1f412489a54d16afae7be46a5c2a8bd292cde75e4c56ec763ccee6572fd72774c3f9d94796cfff6edbd9e93976893873cc182548225ac162a
diff --git a/net-libs/nodejs/nodejs-20.18.0.ebuild b/net-libs/nodejs/nodejs-20.18.0.ebuild
deleted file mode 100644
index a06c32bdae99..000000000000
--- a/net-libs/nodejs/nodejs-20.18.0.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto npm pax-kernel +snapshot +ssl +system-icu +system-ssl test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )
-	x86? ( cpu_flags_x86_sse2 )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
-	>=dev-libs/libuv-1.46.0:=
-	>=net-dns/c-ares-1.18.1:=
-	>=net-libs/nghttp2-1.41.0:=
-	>=net-libs/ngtcp2-1.1.0:=
-	sys-libs/zlib
-	corepack? ( !sys-apps/yarn )
-	system-icu? ( >=dev-libs/icu-73:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-	sys-devel/gcc:*"
-BDEPEND="${PYTHON_DEPS}
-	app-alternatives/ninja
-	sys-apps/coreutils
-	virtual/pkgconfig
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-# These are measured on a loong machine with -ggdb on, and only checked
-# if debugging flags are present in CFLAGS.
-#
-# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
-# limit for memory usage. Disk usage was 19.1GiB for the build directory and
-# 1.2GiB for the installed image, so we leave some room for architectures with
-# fatter binaries and set the disk requirement to 22GiB.
-CHECKREQS_MEMORY="8G"
-CHECKREQS_DISK_BUILD="22G"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-lto
-	# nodejs unconditionally links to libatomic #869992
-	# specifically it requires __atomic_is_lock_free which
-	# is not yet implemented by llvm-runtimes/compiler-rt (see
-	# https://reviews.llvm.org/D85044?id=287068), therefore
-	# we depend on gcc and force using libgcc as the support lib
-	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
-
-	local myconf=(
-		--ninja
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-ngtcp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use corepack || myconf+=( --without-corepack )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case "${ARCH}:${ABI}" in
-		*:amd64) myarch="x64";;
-		*:arm) myarch="arm";;
-		*:arm64) myarch="arm64";;
-		loong:lp64*) myarch="loong64";;
-		riscv:lp64*) myarch="riscv64";;
-		*:ppc64) myarch="ppc64";;
-		*:x32) myarch="x32";;
-		*:x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	export NINJA_ARGS=" $(get_NINJAOPTS) "
-	emake -Onone
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		keepdir /etc/npm
-		echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm
-		doenvd "${T}"/50npm
-
-		# Install bash completion for `npm`
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	use corepack &&
-		"${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	local drop_tests=(
-		test/parallel/test-dns.js
-		test/parallel/test-dns-resolveany-bad-ancount.js
-		test/parallel/test-dns-setserver-when-querying.js
-		test/parallel/test-fs-mkdir.js
-		test/parallel/test-fs-read-stream.js
-		test/parallel/test-fs-utimes-y2K38.js
-		test/parallel/test-fs-watch-recursive-add-file.js
-		test/parallel/test-inspector-emit-protocol-event.js
-		test/parallel/test-inspector-network-domain.js
-		test/parallel/test-process-euid-egid.js
-		test/parallel/test-process-get-builtin.mjs
-		test/parallel/test-process-initgroups.js
-		test/parallel/test-process-setgroups.js
-		test/parallel/test-process-uid-gid.js
-		test/parallel/test-release-npm.js
-		test/parallel/test-socket-write-after-fin-error.js
-		test/parallel/test-strace-openat-openssl.js
-		test/parallel/test-tls-cert-regression.js
-		test/parallel/test-tls-client-getephemeralkeyinfo.js
-		test/parallel/test-tls-getcipher.js
-		test/parallel/test-tls-set-ciphers.js
-		test/parallel/test-tls-junk-closes-server.js
-		test/sequential/test-util-debug.js
-	)
-	use inspector || drop_tests+=( test/sequential/test-watch-mode.mjs )
-	[[ "$(nice)" -gt 10 ]] && drop_tests+=( "test/parallel/test-os.js" )
-	rm -f "${drop_tests[@]}" || die "disabling tests failed"
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	if use npm; then
-		ewarn "remember to run: source /etc/profile if you plan to use nodejs"
-		ewarn "	in your current shell"
-	fi
-}
diff --git a/net-libs/nodejs/nodejs-22.10.0.ebuild b/net-libs/nodejs/nodejs-22.10.0.ebuild
deleted file mode 100644
index e1343e263acb..000000000000
--- a/net-libs/nodejs/nodejs-22.10.0.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT npm? ( Artistic-2 )"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto npm pax-kernel +snapshot +ssl +system-icu +system-ssl test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )
-	x86? ( cpu_flags_x86_sse2 )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
-	dev-db/sqlite:3
-	>=dev-libs/libuv-1.46.0:=
-	>=dev-libs/simdjson-3.9.1:=
-	>=net-dns/c-ares-1.18.1:=
-	>=net-libs/nghttp2-1.61.0:=
-	sys-libs/zlib
-	corepack? ( !sys-apps/yarn )
-	system-icu? ( >=dev-libs/icu-73:= )
-	system-ssl? (
-		>=net-libs/ngtcp2-1.3.0:=
-		>=dev-libs/openssl-1.1.1:0=
-	)
-	!system-ssl? ( >=net-libs/ngtcp2-1.3.0:=[-gnutls] )
-	sys-devel/gcc:*"
-BDEPEND="${PYTHON_DEPS}
-	app-alternatives/ninja
-	sys-apps/coreutils
-	virtual/pkgconfig
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-# These are measured on a loong machine with -ggdb on, and only checked
-# if debugging flags are present in CFLAGS.
-#
-# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
-# limit for memory usage. Disk usage was 19.1GiB for the build directory and
-# 1.2GiB for the installed image, so we leave some room for architectures with
-# fatter binaries and set the disk requirement to 22GiB.
-CHECKREQS_MEMORY="8G"
-CHECKREQS_DISK_BUILD="22G"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch )
-
-	# bug 931256
-	use riscv && PATCHES+=( "${FILESDIR}"/${PN}-22.2.0-riscv.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-lto
-	# GCC with -ftree-vectorize miscompiles node's exception handling code
-	# causing it to fail to catch exceptions sometimes
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116057
-	tc-is-gcc && append-cxxflags -fno-tree-vectorize
-	# https://bugs.gentoo.org/931514
-	use arm64 && append-flags $(test-flags-CXX -mbranch-protection=none)
-	# nodejs unconditionally links to libatomic #869992
-	# specifically it requires __atomic_is_lock_free which
-	# is not yet implemented by llvm-runtimes/compiler-rt (see
-	# https://reviews.llvm.org/D85044?id=287068), therefore
-	# we depend on gcc and force using libgcc as the support lib
-	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
-
-	local myconf=(
-		--ninja
-		# ada is not packaged yet
-		# https://github.com/ada-url/ada
-		# --shared-ada
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-ngtcp2
-		--shared-simdjson
-		# sindutf is not packaged yet
-		# https://github.com/simdutf/simdutf
-		# --shared-simdutf
-		--shared-sqlite
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use corepack || myconf+=( --without-corepack )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case "${ARCH}:${ABI}" in
-		*:amd64) myarch="x64";;
-		*:arm) myarch="arm";;
-		*:arm64) myarch="arm64";;
-		loong:lp64*) myarch="loong64";;
-		riscv:lp64*) myarch="riscv64";;
-		*:ppc64) myarch="ppc64";;
-		*:x32) myarch="x32";;
-		*:x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	export NINJA_ARGS=" $(get_NINJAOPTS)"
-	emake -Onone
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		keepdir /etc/npm
-		echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm
-		doenvd "${T}"/50npm
-
-		# Install bash completion for `npm`
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	use corepack &&
-		"${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	local drop_tests=(
-		test/parallel/test-dns.js
-		test/parallel/test-dns-resolveany-bad-ancount.js
-		test/parallel/test-dns-setserver-when-querying.js
-		test/parallel/test-fs-mkdir.js
-		test/parallel/test-fs-read-stream.js
-		test/parallel/test-fs-utimes-y2K38.js
-		test/parallel/test-fs-watch-recursive-add-file.js
-		test/parallel/test-process-euid-egid.js
-		test/parallel/test-process-get-builtin.mjs
-		test/parallel/test-process-initgroups.js
-		test/parallel/test-process-setgroups.js
-		test/parallel/test-process-uid-gid.js
-		test/parallel/test-release-npm.js
-		test/parallel/test-socket-write-after-fin-error.js
-		test/parallel/test-strace-openat-openssl.js
-		test/sequential/test-util-debug.js
-	)
-	[[ "$(nice)" -gt 10 ]] && drop_tests+=( "test/parallel/test-os.js" )
-	use inspector ||
-		drop_tests+=(
-			test/parallel/test-inspector-emit-protocol-event.js
-			test/parallel/test-inspector-network-domain.js
-			test/sequential/test-watch-mode.mjs
-		)
-	rm -f "${drop_tests[@]}" || die "disabling tests failed"
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	if use npm; then
-		ewarn "remember to run: source /etc/profile if you plan to use nodejs"
-		ewarn " in your current shell"
-	fi
-}
diff --git a/net-libs/nodejs/nodejs-22.12.0-r1.ebuild b/net-libs/nodejs/nodejs-22.12.0-r1.ebuild
index 31ac08005b1e..d306c76b0603 100644
--- a/net-libs/nodejs/nodejs-22.12.0-r1.ebuild
+++ b/net-libs/nodejs/nodejs-22.12.0-r1.ebuild
@@ -119,6 +119,8 @@ src_configure() {
 
 	# LTO compiler flags are handled by configure.py itself
 	filter-lto
+	# The warnings are *so* noisy and make build.logs massive
+	append-cxxflags $(test-flags-CXX -Wno-template-id-cdtor)
 	# GCC with -ftree-vectorize miscompiles node's exception handling code
 	# causing it to fail to catch exceptions sometimes
 	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116057
diff --git a/net-libs/nodejs/nodejs-22.12.0.ebuild b/net-libs/nodejs/nodejs-22.12.0.ebuild
deleted file mode 100644
index e1343e263acb..000000000000
--- a/net-libs/nodejs/nodejs-22.12.0.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT npm? ( Artistic-2 )"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto npm pax-kernel +snapshot +ssl +system-icu +system-ssl test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )
-	x86? ( cpu_flags_x86_sse2 )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
-	dev-db/sqlite:3
-	>=dev-libs/libuv-1.46.0:=
-	>=dev-libs/simdjson-3.9.1:=
-	>=net-dns/c-ares-1.18.1:=
-	>=net-libs/nghttp2-1.61.0:=
-	sys-libs/zlib
-	corepack? ( !sys-apps/yarn )
-	system-icu? ( >=dev-libs/icu-73:= )
-	system-ssl? (
-		>=net-libs/ngtcp2-1.3.0:=
-		>=dev-libs/openssl-1.1.1:0=
-	)
-	!system-ssl? ( >=net-libs/ngtcp2-1.3.0:=[-gnutls] )
-	sys-devel/gcc:*"
-BDEPEND="${PYTHON_DEPS}
-	app-alternatives/ninja
-	sys-apps/coreutils
-	virtual/pkgconfig
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-# These are measured on a loong machine with -ggdb on, and only checked
-# if debugging flags are present in CFLAGS.
-#
-# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
-# limit for memory usage. Disk usage was 19.1GiB for the build directory and
-# 1.2GiB for the installed image, so we leave some room for architectures with
-# fatter binaries and set the disk requirement to 22GiB.
-CHECKREQS_MEMORY="8G"
-CHECKREQS_DISK_BUILD="22G"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch )
-
-	# bug 931256
-	use riscv && PATCHES+=( "${FILESDIR}"/${PN}-22.2.0-riscv.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-lto
-	# GCC with -ftree-vectorize miscompiles node's exception handling code
-	# causing it to fail to catch exceptions sometimes
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116057
-	tc-is-gcc && append-cxxflags -fno-tree-vectorize
-	# https://bugs.gentoo.org/931514
-	use arm64 && append-flags $(test-flags-CXX -mbranch-protection=none)
-	# nodejs unconditionally links to libatomic #869992
-	# specifically it requires __atomic_is_lock_free which
-	# is not yet implemented by llvm-runtimes/compiler-rt (see
-	# https://reviews.llvm.org/D85044?id=287068), therefore
-	# we depend on gcc and force using libgcc as the support lib
-	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
-
-	local myconf=(
-		--ninja
-		# ada is not packaged yet
-		# https://github.com/ada-url/ada
-		# --shared-ada
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-ngtcp2
-		--shared-simdjson
-		# sindutf is not packaged yet
-		# https://github.com/simdutf/simdutf
-		# --shared-simdutf
-		--shared-sqlite
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use corepack || myconf+=( --without-corepack )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case "${ARCH}:${ABI}" in
-		*:amd64) myarch="x64";;
-		*:arm) myarch="arm";;
-		*:arm64) myarch="arm64";;
-		loong:lp64*) myarch="loong64";;
-		riscv:lp64*) myarch="riscv64";;
-		*:ppc64) myarch="ppc64";;
-		*:x32) myarch="x32";;
-		*:x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	export NINJA_ARGS=" $(get_NINJAOPTS)"
-	emake -Onone
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		keepdir /etc/npm
-		echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm
-		doenvd "${T}"/50npm
-
-		# Install bash completion for `npm`
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	use corepack &&
-		"${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	local drop_tests=(
-		test/parallel/test-dns.js
-		test/parallel/test-dns-resolveany-bad-ancount.js
-		test/parallel/test-dns-setserver-when-querying.js
-		test/parallel/test-fs-mkdir.js
-		test/parallel/test-fs-read-stream.js
-		test/parallel/test-fs-utimes-y2K38.js
-		test/parallel/test-fs-watch-recursive-add-file.js
-		test/parallel/test-process-euid-egid.js
-		test/parallel/test-process-get-builtin.mjs
-		test/parallel/test-process-initgroups.js
-		test/parallel/test-process-setgroups.js
-		test/parallel/test-process-uid-gid.js
-		test/parallel/test-release-npm.js
-		test/parallel/test-socket-write-after-fin-error.js
-		test/parallel/test-strace-openat-openssl.js
-		test/sequential/test-util-debug.js
-	)
-	[[ "$(nice)" -gt 10 ]] && drop_tests+=( "test/parallel/test-os.js" )
-	use inspector ||
-		drop_tests+=(
-			test/parallel/test-inspector-emit-protocol-event.js
-			test/parallel/test-inspector-network-domain.js
-			test/sequential/test-watch-mode.mjs
-		)
-	rm -f "${drop_tests[@]}" || die "disabling tests failed"
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	if use npm; then
-		ewarn "remember to run: source /etc/profile if you plan to use nodejs"
-		ewarn " in your current shell"
-	fi
-}
diff --git a/net-libs/nodejs/nodejs-22.8.0.ebuild b/net-libs/nodejs/nodejs-22.8.0.ebuild
deleted file mode 100644
index 783214a446b3..000000000000
--- a/net-libs/nodejs/nodejs-22.8.0.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto npm pax-kernel +snapshot +ssl +system-icu +system-ssl test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )
-	x86? ( cpu_flags_x86_sse2 )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
-	dev-db/sqlite:3
-	>=dev-libs/libuv-1.46.0:=
-	>=dev-libs/simdjson-3.9.1:=
-	>=net-dns/c-ares-1.18.1:=
-	>=net-libs/nghttp2-1.61.0:=
-	sys-libs/zlib
-	corepack? ( !sys-apps/yarn )
-	system-icu? ( >=dev-libs/icu-73:= )
-	system-ssl? (
-		>=net-libs/ngtcp2-1.3.0:=
-		>=dev-libs/openssl-1.1.1:0=
-	)
-	!system-ssl? ( >=net-libs/ngtcp2-1.3.0:=[-gnutls] )
-	sys-devel/gcc:*"
-BDEPEND="${PYTHON_DEPS}
-	app-alternatives/ninja
-	sys-apps/coreutils
-	virtual/pkgconfig
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-# These are measured on a loong machine with -ggdb on, and only checked
-# if debugging flags are present in CFLAGS.
-#
-# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
-# limit for memory usage. Disk usage was 19.1GiB for the build directory and
-# 1.2GiB for the installed image, so we leave some room for architectures with
-# fatter binaries and set the disk requirement to 22GiB.
-CHECKREQS_MEMORY="8G"
-CHECKREQS_DISK_BUILD="22G"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch )
-
-	# bug 931256
-	use riscv && PATCHES+=( "${FILESDIR}"/${PN}-22.2.0-riscv.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-lto
-	# GCC with -ftree-vectorize miscompiles node's exception handling code
-	# causing it to fail to catch exceptions sometimes
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116057
-	tc-is-gcc && append-cxxflags -fno-tree-vectorize
-	# https://bugs.gentoo.org/931514
-	use arm64 && append-flags $(test-flags-CXX -mbranch-protection=none)
-	# nodejs unconditionally links to libatomic #869992
-	# specifically it requires __atomic_is_lock_free which
-	# is not yet implemented by llvm-runtimes/compiler-rt (see
-	# https://reviews.llvm.org/D85044?id=287068), therefore
-	# we depend on gcc and force using libgcc as the support lib
-	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
-
-	local myconf=(
-		--ninja
-		# ada is not packaged yet
-		# https://github.com/ada-url/ada
-		# --shared-ada
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-ngtcp2
-		--shared-simdjson
-		# sindutf is not packaged yet
-		# https://github.com/simdutf/simdutf
-		# --shared-simdutf
-		--shared-sqlite
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use corepack || myconf+=( --without-corepack )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case "${ARCH}:${ABI}" in
-		*:amd64) myarch="x64";;
-		*:arm) myarch="arm";;
-		*:arm64) myarch="arm64";;
-		loong:lp64*) myarch="loong64";;
-		riscv:lp64*) myarch="riscv64";;
-		*:ppc64) myarch="ppc64";;
-		*:x32) myarch="x32";;
-		*:x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	export NINJA_ARGS=" $(get_NINJAOPTS)"
-	emake -Onone
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		keepdir /etc/npm
-		echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm
-		doenvd "${T}"/50npm
-
-		# Install bash completion for `npm`
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	use corepack &&
-		"${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	local drop_tests=(
-		test/parallel/test-dns.js
-		test/parallel/test-dns-resolveany-bad-ancount.js
-		test/parallel/test-dns-setserver-when-querying.js
-		test/parallel/test-fs-mkdir.js
-		test/parallel/test-fs-read-stream.js
-		test/parallel/test-fs-utimes-y2K38.js
-		test/parallel/test-fs-watch-recursive-add-file.js
-		test/parallel/test-process-euid-egid.js
-		test/parallel/test-process-get-builtin.mjs
-		test/parallel/test-process-initgroups.js
-		test/parallel/test-process-setgroups.js
-		test/parallel/test-process-uid-gid.js
-		test/parallel/test-release-npm.js
-		test/parallel/test-socket-write-after-fin-error.js
-		test/parallel/test-strace-openat-openssl.js
-		test/sequential/test-util-debug.js
-	)
-	[[ "$(nice)" -gt 10 ]] && drop_tests+=( "test/parallel/test-os.js" )
-	use inspector ||
-		drop_tests+=(
-			test/parallel/test-inspector-emit-protocol-event.js
-			test/parallel/test-inspector-network-domain.js
-			test/sequential/test-watch-mode.mjs
-		)
-	rm -f "${drop_tests[@]}" || die "disabling tests failed"
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	if use npm; then
-		ewarn "remember to run: source /etc/profile if you plan to use nodejs"
-		ewarn " in your current shell"
-	fi
-}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index e1343e263acb..6b0ec506c0a3 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.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
@@ -119,6 +119,8 @@ src_configure() {
 
 	# LTO compiler flags are handled by configure.py itself
 	filter-lto
+	# The warnings are *so* noisy and make build.logs massive
+	append-cxxflags $(test-flags-CXX -Wno-template-id-cdtor)
 	# GCC with -ftree-vectorize miscompiles node's exception handling code
 	# causing it to fail to catch exceptions sometimes
 	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116057
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index 63af13697704..2cc962d291b8 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -1,2 +1,3 @@
 DIST srt-1.5.1.tar.gz 1694199 BLAKE2B 4c215ef936100b02b3a5a9aab6e9a715ecdb728517b0648e91f2144bb34a34cb1573c4e6905441a366ea281c9410c2d00d5ebc64144f327f7a115d81038942af SHA512 f3aa1f7773540e2dd31cd19b124eec3c3d830f59c08d953cae01e129a58db7e639bdf94c8a5a678435ae9a1d2402e2c77196fc9c4e75b42aa37d8eafcc16f436
 DIST srt-1.5.3.tar.gz 1706632 BLAKE2B fd053782e58602ccd06690c5785b68ff20531afd890678fbd77660e376887b0886cc020d449e2669672748c3d1a515b56d9fd94670c33d085eadb961220a7431 SHA512 5b576d6fd325515e05074e4568e3b65d1ae265e3e971db6e6242e5138243fc1594df1e3a7d90962385dac38abc34c4c4b0a567439050f8c0ff818b3b3d497efc
+DIST srt-1.5.4.tar.gz 1743040 BLAKE2B 29532384ea3e1f2961d265fe81f2061fb5a92e801d31708c18687ba31162c571843f4a27578e89fefd3a18a2da724bfde61cfd9120754b61c222f49ce6953bb2 SHA512 ec4e5923531a8a7fd7778c739cb52208d24a91c569f31f3995d6e0695dffd83492e5eca2530b2e112ca37f1fd4520061d89ef42d1ded95e2516a9acda009bcaf
diff --git a/net-libs/srt/srt-1.5.4.ebuild b/net-libs/srt/srt-1.5.4.ebuild
new file mode 100644
index 000000000000..e5bf4493276e
--- /dev/null
+++ b/net-libs/srt/srt-1.5.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2018-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="Secure Reliable Transport (SRT) library and tools"
+HOMEPAGE="https://github.com/Haivision/srt"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/Haivision/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~ppc-macos ~x64-macos"
+fi
+
+LICENSE="MPL-2.0"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="gnutls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gnutls? (
+		dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+		net-libs/gnutls:0=[${MULTILIB_USEDEP}]
+	)
+	!gnutls? (
+		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? ( >=dev-cpp/gtest-1.10[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+	# ODR violations
+	# https://github.com/Haivision/srt/issues/2145 (bug #861584)
+	filter-lto
+
+	local mycmakeargs=(
+		-DUSE_CXX_STD=c++14 # Required for gtest
+		-DENABLE_STATIC=OFF
+		# Bonding is experimental in 1.5, but works good and doesn't affect anything when not enabled with API calls
+		-DENABLE_BONDING=ON
+		-DENABLE_UNITTESTS=$(usex test)
+		-DENABLE_TESTING=OFF # Not installed developer/testing tools
+		-DUSE_GNUTLS=$(usex gnutls)
+	)
+	cmake-multilib_src_configure
+}
+
+multilib_src_test() {
+	cmake_src_test -j1
+}
+
+multilib_src_install() {
+	cmake_src_install
+	# remove old upstream temporary compatibility pc
+	rm "${ED}/usr/$(get_libdir)/pkgconfig/haisrt.pc" || die
+}
diff --git a/net-libs/webkit-gtk/files/2.46.4-no-egl.patch b/net-libs/webkit-gtk/files/2.46.4-no-egl.patch
deleted file mode 100644
index cf66a8c3bf45..000000000000
--- a/net-libs/webkit-gtk/files/2.46.4-no-egl.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-https://bugs.gentoo.org/945827
-https://bugs.webkit.org/show_bug.cgi?id=283750
-https://github.com/WebKit/WebKit/commit/1cfbdd74e97ea29636ce442322b5399b43937401
-
-From 9cd50ae71cd463145529f86ca0306319cc9a4321 Mon Sep 17 00:00:00 2001
-From: Philippe Normand <philn@igalia.com>
-Date: Wed, 27 Nov 2024 07:20:41 -0800
-Subject: [PATCH] [WPE][GTK] Build fixes for gbm disabled and release logs
- disabled https://bugs.webkit.org/show_bug.cgi?id=283750
-
-* Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp:
-(WebCore::PeerConnectionBackend::PeerConnectionBackend):
-* Source/WebCore/Modules/mediastream/PeerConnectionBackend.h:
-* Source/WebCore/Modules/mediastream/gstreamer/GStreamerMediaEndpoint.cpp:
-(WebCore::GStreamerMediaEndpoint::startRTCLogs):
-* Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:
-* Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.h:
-(WKWPE::ViewPlatform::ViewPlatform):
-
-Cherrypicked https://commits.webkit.org/287124@main to 2.46.4
---- a/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp
-+++ b/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp
-@@ -165,6 +165,10 @@ PeerConnectionBackend::PeerConnectionBackend(RTCPeerConnection& peerConnection)
-         m_shouldFilterICECandidates = page->webRTCProvider().isSupportingMDNS();
- #endif
- 
-+#if RELEASE_LOG_DISABLED
-+    m_logIdentifierString = makeString(hex(reinterpret_cast<uintptr_t>(this)));
-+#endif
-+
- #if !RELEASE_LOG_DISABLED && (PLATFORM(WPE) || PLATFORM(GTK))
-     m_jsonFilePath = String::fromUTF8(getenv("WEBKIT_WEBRTC_JSON_EVENTS_FILE"));
-     if (!m_jsonFilePath.isEmpty())
---- a/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h
-+++ b/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h
-@@ -281,8 +281,8 @@ private:
- #if !RELEASE_LOG_DISABLED
-     Ref<const Logger> m_logger;
-     const void* m_logIdentifier;
--    String m_logIdentifierString;
- #endif
-+    String m_logIdentifierString;
-     bool m_finishedGatheringCandidates { false };
-     bool m_isProcessingLocalDescriptionAnswer { false };
- 
---- a/Source/WebCore/Modules/mediastream/gstreamer/GStreamerMediaEndpoint.cpp
-+++ b/Source/WebCore/Modules/mediastream/gstreamer/GStreamerMediaEndpoint.cpp
-@@ -2228,7 +2228,9 @@ std::optional<bool> GStreamerMediaEndpoint::canTrickleIceCandidates() const
- void GStreamerMediaEndpoint::startRTCLogs()
- {
-     m_isGatheringRTCLogs = true;
-+#if !RELEASE_LOG_DISABLED
-     startLoggingStats();
-+#endif
- }
- 
- void GStreamerMediaEndpoint::stopRTCLogs()
---- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
-+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
-@@ -1726,7 +1726,7 @@ void gstStructureFilterAndMapInPlace(GstStructure* structure, Function<bool(GstI
- #endif
- }
- 
--#if !GST_CHECK_VERSION(1, 24, 0)
-+#if USE(GBM) && !GST_CHECK_VERSION(1, 24, 0)
- static GstVideoFormat drmFourccToGstVideoFormat(uint32_t fourcc)
- {
-     switch (fourcc) {
-@@ -1761,7 +1761,7 @@ static GstVideoFormat drmFourccToGstVideoFormat(uint32_t fourcc)
-     RELEASE_ASSERT_NOT_REACHED();
-     return GST_VIDEO_FORMAT_UNKNOWN;
- }
--#endif // !GST_CHECK_VERSION(1, 24, 0)
-+#endif // USE(GBM) && !GST_CHECK_VERSION(1, 24, 0)
- 
- #if USE(GBM)
- GRefPtr<GstCaps> buildDMABufCaps()
-@@ -1805,7 +1805,7 @@ GRefPtr<GstCaps> buildDMABufCaps()
-                 gst_value_list_append_and_take_value(&supportedFormats, &value);
-             }
-         }
--#else
-+#elif USE(GBM)
-         GValue value = G_VALUE_INIT;
-         g_value_init(&value, G_TYPE_STRING);
-         g_value_set_string(&value, gst_video_format_to_string(drmFourccToGstVideoFormat(format.fourcc)));
-@@ -1815,7 +1815,7 @@ GRefPtr<GstCaps> buildDMABufCaps()
- 
- #if GST_CHECK_VERSION(1, 24, 0)
-     gst_caps_set_value(caps.get(), "drm-format", &supportedFormats);
--#else
-+#elif USE(GBM)
-     gst_caps_set_value(caps.get(), "format", &supportedFormats);
- #endif
-     g_value_unset(&supportedFormats);
---- a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.h
-+++ b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourcePrivateGStreamer.h
-@@ -93,13 +93,14 @@ private:
- #if !RELEASE_LOG_DISABLED
-     Ref<const Logger> m_logger;
-     const void* m_logIdentifier;
-+#endif
-+
-     uint64_t m_nextSourceBufferID { 0 };
- 
-     // Stores known track IDs, so we can work around ID collisions between multiple source buffers.
-     // The registry is placed here to enforce ID uniqueness specifically by player, not by process,
-     // since its not an issue if multiple players use the same ID, and we want to preserve IDs as much as possible.
-     HashSet<TrackID, WTF::IntHash<TrackID>, WTF::UnsignedWithZeroKeyHashTraits<TrackID>> m_trackIdRegistry;
--#endif
- };
- 
- } // namespace WebCore
--- 
-2.47.1
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-libs/xdp-tools/Manifest b/net-libs/xdp-tools/Manifest
index 6c126922895c..d17cfd0ccf52 100644
--- a/net-libs/xdp-tools/Manifest
+++ b/net-libs/xdp-tools/Manifest
@@ -1 +1,2 @@
 DIST xdp-tools-1.4.3.tar.gz 339989 BLAKE2B 836eb66a2264e9d46124a009a8b3e039da23f28f83460fb3aa724c8ca4c37952979278e3041e9acca44acd68cc94423d73f381febc107c454db7da01f583ae41 SHA512 3ba176e573d02feefc1baf81570b514bc25a61d7be3256ce530128092f07b246b8731430289cdcd874f8846122a4451f0bcd06891565dd1b48beaa10b854c646
+DIST xdp-tools-1.5.0.tar.gz 353321 BLAKE2B 41ef06c544af743a8542306af93b1d2a671e53118aa9c4230521c755868245d854ef4ed38ac47102869c18104d67808e8ede8baef45dde8811b074501fc34520 SHA512 9713280fc5d58c19f972cced614f0acdb21de0f467439af2364217ae5381963f90c9e4aba9b6de1a8fdb7fa36c1f645c42b9cd1c86a2cd60168a3b974f14c0dd
diff --git a/net-libs/xdp-tools/xdp-tools-1.5.0.ebuild b/net-libs/xdp-tools/xdp-tools-1.5.0.ebuild
new file mode 100644
index 000000000000..0ed747f71d13
--- /dev/null
+++ b/net-libs/xdp-tools/xdp-tools-1.5.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info toolchain-funcs
+
+DESCRIPTION="The libxdp library and various tools for use with XDP"
+HOMEPAGE="https://github.com/xdp-project/xdp-tools"
+SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+tools"
+
+DEPEND="
+	dev-libs/libbpf:=
+	net-libs/libpcap
+	sys-libs/zlib
+	virtual/libelf
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/bpftool
+	sys-apps/grep[pcre]
+	llvm-core/clang:*[llvm_targets_BPF]
+	sys-devel/m4
+"
+
+# Not prebuilt -- we build them -- but they're not ordinary ELF objects either.
+QA_PREBUILT="usr/lib/bpf/*.o"
+
+MAKEOPTS+=" V=1"
+
+CONFIG_CHECK="~BPF ~BPF_JIT ~BPF_SYSCALL ~HAVE_EBPF_JIT ~XDP_SOCKETS ~XDP_SOCKETS_DIAG"
+
+src_prepare() {
+	# remove -Werror: #899744
+	sed -i 's/-Werror//g' lib/Makefile lib/defines.mk || die
+	sed -i '/-Werror/d' lib/common.mk lib/libxdp/Makefile \
+		lib/libxdp/tests/Makefile lib/util/Makefile || die
+
+	default
+}
+
+src_configure() {
+	# filter LTO: #861587
+	filter-lto
+
+	# filter LDFLAGS some more: #916591
+	filter-ldflags -Wl,--{icf,lto}*
+
+	# force ld.bfd: #916591
+	tc-ld-force-bfd
+
+	export CC="$(tc-getCC)"
+	export PREFIX="${EPREFIX}/usr"
+	export LIBDIR="${PREFIX}/$(get_libdir)"
+	export BPF_OBJECT_DIR="${PREFIX}/lib/bpf"
+	export PRODUCTION=1
+	export DYNAMIC_LIBXDP=1
+	export FORCE_SYSTEM_LIBBPF=1
+
+	default
+}
+
+src_test() { :; }
+
+src_install() {
+	default
+
+	# To remove the scripts/testing files that are installed.
+	rm -r "${ED}/usr/share/xdp-tools" || die
+	# We can't control static archive generation yet.
+	rm "${ED}/usr/$(get_libdir)/libxdp.a" || die
+
+	use tools || { rm "${ED}/usr/sbin"/* || die; }
+
+	# These are ELF objects but BPF ones.
+	dostrip -x /usr/lib/bpf
+}
+
+pkg_postinst() {
+	elog
+	elog "Many BPF utilities need access to a mounted bpffs virtual file system."
+	elog "Either mount it manually like this:"
+	elog
+	elog "  mount bpffs /sys/fs/bpf -t bpf -o nosuid,nodev,noexec,relatime,mode=700"
+	elog
+	elog "or add the following line to your /etc/fstab to always mount it at boot time:"
+	elog
+	elog "  bpffs  /sys/fs/bpf  bpf  nosuid,nodev,noexec,relatime,mode=700  0 0"
+	elog
+	elog "You can verify that bpffs is mounted with:"
+	elog
+	elog "  mount | grep /sys/fs/bpf"
+	elog
+}
diff --git a/net-mail/asmail/asmail-2.1-r2.ebuild b/net-mail/asmail/asmail-2.1-r2.ebuild
deleted file mode 100644
index 8a15dabe5212..000000000000
--- a/net-mail/asmail/asmail-2.1-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A small mail monitor similar to xbiff"
-HOMEPAGE="https://tigr.net/afterstep/applets/"
-SRC_URI="https://tigr.net/afterstep/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="jpeg"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libICE
-	x11-libs/libSM
-	jpeg? ( virtual/jpeg:= )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1-ldflags.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e "/LIB/s/-lssl/-lssl -lcrypto/g" \
-		configure
-}
-
-src_configure() {
-	tc-export CC
-	econf $(use_enable jpeg)
-}
-
-src_install() {
-	dobin ${PN}
-
-	newman ${PN}.man ${PN}.1
-	newman ${PN}rc.man ${PN}rc.5
-
-	insinto /usr/share/${PN}/pixmaps
-	doins pixmaps/cloud-e/*.xpm
-
-	insinto /usr/share/${PN}
-	doins -r sounds
-
-	dodoc ${PN}rc.s* CHANGES *.txt README* TODO
-}
diff --git a/net-mail/asmail/asmail-2.1-r3.ebuild b/net-mail/asmail/asmail-2.1-r3.ebuild
deleted file mode 100644
index 29c8a3a37716..000000000000
--- a/net-mail/asmail/asmail-2.1-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A small mail monitor similar to xbiff"
-HOMEPAGE="https://tigr.net/afterstep/applets/"
-SRC_URI="https://tigr.net/afterstep/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="jpeg"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libICE
-	x11-libs/libSM
-	jpeg? ( media-libs/libjpeg-turbo:0 )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-update-autotools.patch
-)
-
-src_prepare() {
-	default
-	cd "${S}/autoconf" || die
-	eautoreconf
-	cp "${S}/autoconf/configure" "${S}/" || die
-}
-
-src_configure() {
-	tc-export CC
-	econf $(use_enable jpeg) --with-xpm-library=/usr/$(get_libdir)
-}
-
-src_install() {
-	dobin ${PN}
-
-	newman ${PN}.man ${PN}.1
-	newman ${PN}rc.man ${PN}rc.5
-
-	insinto /usr/share/${PN}/pixmaps
-	doins pixmaps/cloud-e/*.xpm
-
-	insinto /usr/share/${PN}
-	doins -r sounds
-
-	dodoc ${PN}rc.s* CHANGES *.txt README* TODO
-}
diff --git a/net-mail/asmail/asmail-2.1-r4.ebuild b/net-mail/asmail/asmail-2.1-r4.ebuild
new file mode 100644
index 000000000000..4c24bda587f2
--- /dev/null
+++ b/net-mail/asmail/asmail-2.1-r4.ebuild
@@ -0,0 +1,58 @@
+# 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 mail monitor similar to xbiff"
+HOMEPAGE="https://tigr.net/afterstep/applets/"
+SRC_URI="https://tigr.net/afterstep/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="jpeg"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libICE
+	x11-libs/libSM
+	jpeg? ( media-libs/libjpeg-turbo:0 )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-update-autotools.patch
+)
+
+src_prepare() {
+	default
+	cd "${S}/autoconf" || die
+	eautoreconf
+	cp "${S}/autoconf/configure" "${S}/" || die
+}
+
+src_configure() {
+	tc-export CC
+	econf $(use_enable jpeg) --with-xpm-library=/usr/$(get_libdir)
+}
+
+src_install() {
+	dobin ${PN}
+
+	newman ${PN}.man ${PN}.1
+	newman ${PN}rc.man ${PN}rc.5
+
+	insinto /usr/share/${PN}/pixmaps
+	doins pixmaps/cloud-e/*.xpm
+
+	insinto /usr/share/${PN}
+	doins -r sounds
+
+	dodoc ${PN}rc.s* CHANGES *.txt README* TODO
+}
diff --git a/net-mail/asmail/files/asmail-2.1-update-autotools.patch b/net-mail/asmail/files/asmail-2.1-update-autotools.patch
index 287b36480111..4899b0deddca 100644
--- a/net-mail/asmail/files/asmail-2.1-update-autotools.patch
+++ b/net-mail/asmail/files/asmail-2.1-update-autotools.patch
@@ -1,4 +1,4 @@
-I order to compile this package with clang we need to run autoreconf. Newer autotools complain about
+In order to compile this package with clang we need to run autoreconf. Newer autotools complain about
 the several declarations of the same header.
 
 MD5 calculation is split from libssl into libcrypto. 
diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
index d34d7dbed896..189a582c1aaf 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -1,2 +1,2 @@
-DIST automx2-2022.1.tar.gz 182519 BLAKE2B baf2ecc801f6f024eb6a6fe2610d6cb7c3dd0726cfa877fdea76d94ebf16b9393addc5be8844f3017fd664b73adc74f2cd898736bbcad1fa0b2b3c1022cb638a SHA512 3d6fb9cf01cff641c78851560d72e3d80f9011cca4cd438cd49e999feef3f290bbd9495655f41319eb5456beac09bb8862dc327b521254266e0d53aa17b0bbd3
 DIST automx2-2024.2.tar.gz 169710 BLAKE2B 1977e07291d27168424e536273af4069d0cbe4c44e2c37fc10b4d0a2fa53272c404aae6dbb8b0a33dd9926e9fc94aae7cd3c6e5669454dad802e6a6ad85bfaf6 SHA512 de518e7eb5184d5dcd7945ab860250c6338e3343a9c4bba26bcdd68b4cb1d22de9624c329ff63af1420746a17ea220ad6d4bbda627af64f7ddcc5ae73275e5dd
+DIST automx2-2025.1.tar.gz 175571 BLAKE2B c3c7bbeb6f438a24a476ca6d14b4529ea51869786b3d53f8ef1202a4955259274674683614e0ddadc456d1f7d3e1b9ca20b18d266e4ff8aa54c683456834f92f SHA512 cbaaee4863e7bb265a4c2b991395b8ef3b6405be28beded53287328fb766d1ddb12fde0fdf4ea8992ed0b8abba0e83a018b60054e778a97c734a9a68c391d776
diff --git a/net-mail/automx2/automx2-2022.1-r1.ebuild b/net-mail/automx2/automx2-2022.1-r1.ebuild
deleted file mode 100644
index ead2c323a51f..000000000000
--- a/net-mail/automx2/automx2-2022.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Email client autoconfiguration service"
-HOMEPAGE="https://rseichter.github.io/automx2/"
-SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="acct-user/automx2
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-migrate[${PYTHON_USEDEP}]
-	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
-	dev-python/ldap3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	sed -i -e "/('scripts'/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x AUTOMX2_CONF="tests/unittest.conf"
-	eunittest tests/
-}
-
-python_install_all() {
-	local DOCS=( "${S}"/docs/*.adoc "${S}"/contrib/*sample.conf )
-	local HTML_DOCS=( "${S}"/docs/*.{html,svg} )
-	newconfd "${FILESDIR}/confd" "${PN}"
-	newinitd "${FILESDIR}/init-r1" "${PN}"
-	insinto /etc
-	newins "${FILESDIR}/conf" "${PN}.conf"
-	distutils-r1_python_install_all
-}
diff --git a/net-mail/automx2/automx2-2025.1.ebuild b/net-mail/automx2/automx2-2025.1.ebuild
new file mode 100644
index 000000000000..0647731a280f
--- /dev/null
+++ b/net-mail/automx2/automx2-2025.1.ebuild
@@ -0,0 +1,46 @@
+# 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_{11..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mail User Agent (email client) configuration made easy"
+HOMEPAGE="https://rseichter.github.io/automx2/"
+SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="acct-user/automx2
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-migrate[${PYTHON_USEDEP}]
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/ldap3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	rm -r src/alembic || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x AUTOMX2_CONF="tests/unittest.conf"
+	eunittest tests/
+}
+
+python_install_all() {
+	local DOCS=( "${S}"/docs/*.pdf )
+	local HTML_DOCS=( "${S}"/docs/*.{html,svg} )
+	newconfd "${FILESDIR}/confd" "${PN}"
+	newinitd "${FILESDIR}/init-r2" "${PN}"
+	insinto /etc
+	newins "${FILESDIR}/conf" "${PN}.conf"
+	distutils-r1_python_install_all
+}
diff --git a/net-mail/automx2/files/init-r2 b/net-mail/automx2/files/init-r2
new file mode 100644
index 000000000000..bf64b5bd74c7
--- /dev/null
+++ b/net-mail/automx2/files/init-r2
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${AUTOMX2_CONF:="/etc/${RC_SVCNAME}.conf"}
+: ${AUTOMX2_USER:="automx2"}
+: ${AUTOMX2_ARGS:="--port 4243"}
+
+command="/usr/bin/flask"
+command_args="run ${AUTOMX2_ARGS}"
+command_background="true"
+command_user="${AUTOMX2_USER}"
+pidfile="/run/${RC_SVCNAME}.pid"
+required_files="${AUTOMX2_CONF}"
+
+depend() {
+	use logger net
+	before nginx
+}
+
+start_pre() {
+	export AUTOMX2_CONF
+	export EPYTHON="python"
+	export FLASK_APP="automx2.server:app"
+	export FLASK_ENV="production"
+}
diff --git a/net-mail/b4/Manifest b/net-mail/b4/Manifest
index ed1b3171acf8..e541aec69657 100644
--- a/net-mail/b4/Manifest
+++ b/net-mail/b4/Manifest
@@ -1,2 +1 @@
-DIST b4-0.14.1.tar.gz 268141 BLAKE2B 128a061600aeea7c0b05fc69ad1e36be55086dff4b66e1456151fae375457dcd60113a4bc1335878227fb86763d0d1ed74f103c683f17634e80cb4c6fedbe078 SHA512 6e77d9e7e49fee5ccada275ceda51280310bf71f17e910d30c4b9e6346cf7595563c5cc489963e0cb16aa68606e7ba8050ead19454c294469820fbf30a948c36
 DIST b4-0.14.2.tar.gz 268868 BLAKE2B fe9d9be83163084659c7a68ce5791d3a680abdfa6e1c1d0c14468bac5e58d702e6f2ae19418cd7b92509cbec20952cb8411bed04a73b03c01f5171c157d66312 SHA512 8883fe0d198870c77665e1febbdcca44a639ad564b526f3c1a1f32559cbffacb555a1b6e6ab15b2c775ed0d82042f4ad775e356317af8bdae4f31f21e6602f7b
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-mail/courier-imap/courier-imap-5.2.10.ebuild b/net-mail/courier-imap/courier-imap-5.2.10.ebuild
index d9bda17d8ec2..f5f18e69b27b 100644
--- a/net-mail/courier-imap/courier-imap-5.2.10.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceforge.net/projects/courier/files/imap/${PV}/${P}.tar.bz2/
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~s390 sparc x86"
 
 IUSE="berkdb debug +gdbm gnutls ipv6 selinux trashquota"
 REQUIRED_USE="|| ( berkdb gdbm )"
diff --git a/net-mail/dovecot/dovecot-2.3.21.1.ebuild b/net-mail/dovecot/dovecot-2.3.21.1.ebuild
index 87354877eb82..42e361ab1f99 100644
--- a/net-mail/dovecot/dovecot-2.3.21.1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.21.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
@@ -30,7 +30,7 @@ SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
 S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
 IUSE_DOVECOT_COMPRESS="lz4 zstd"
diff --git a/net-mail/fdm/fdm-2.2-r1.ebuild b/net-mail/fdm/fdm-2.2-r1.ebuild
deleted file mode 100644
index cac36667dc18..000000000000
--- a/net-mail/fdm/fdm-2.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Fetch, filter and deliver mail"
-HOMEPAGE="https://github.com/nicm/fdm"
-SRC_URI="https://github.com/nicm/fdm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="examples pcre"
-
-DEPEND="
-	dev-libs/openssl:=
-	sys-libs/tdb
-	pcre? ( dev-libs/libpcre2 )
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/fdm
-	acct-user/fdm
-"
-
-DOCS=( CHANGES README TODO MANUAL )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-configure-strlcpy.patch
-)
-
-src_prepare() {
-	default
-
-	# Change user '_fdm' to 'fdm'
-	sed -e 's/_fdm/fdm/g' -i fdm.h || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable pcre pcre2)
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*
-	fi
-}
diff --git a/net-mail/fdm/fdm-2.2-r2.ebuild b/net-mail/fdm/fdm-2.2-r2.ebuild
deleted file mode 100644
index d916992998f7..000000000000
--- a/net-mail/fdm/fdm-2.2-r2.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 autotools
-
-DESCRIPTION="Fetch, filter and deliver mail"
-HOMEPAGE="https://github.com/nicm/fdm"
-SRC_URI="https://github.com/nicm/fdm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="examples pcre"
-
-DEPEND="
-	dev-libs/openssl:=
-	sys-libs/tdb
-	pcre? ( dev-libs/libpcre2 )
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/fdm
-	acct-user/fdm
-"
-
-DOCS=( CHANGES README TODO MANUAL )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-configure-strlcpy.patch
-	"${FILESDIR}"/${P}-pcre2.patch
-	"${FILESDIR}"/${P}-uaf.patch
-	"${FILESDIR}"/${P}-pop3-utf8.patch
-)
-
-src_prepare() {
-	default
-
-	# Change user '_fdm' to 'fdm'
-	sed -e 's/_fdm/fdm/g' -i fdm.h || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable pcre pcre2)
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*
-	fi
-}
diff --git a/net-mail/fdm/fdm-2.2-r3.ebuild b/net-mail/fdm/fdm-2.2-r3.ebuild
index 404b0182e72b..ee77b6292d2d 100644
--- a/net-mail/fdm/fdm-2.2-r3.ebuild
+++ b/net-mail/fdm/fdm-2.2-r3.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
@@ -25,6 +25,11 @@ RDEPEND="
 	acct-user/fdm
 "
 
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# missing on musl, fdm has fallback implememntation
+	b64_ntop
+)
+
 DOCS=( CHANGES README TODO MANUAL )
 
 PATCHES=(
diff --git a/net-mail/fdm/files/fdm-2.2-pop3-utf8.patch b/net-mail/fdm/files/fdm-2.2-pop3-utf8.patch
deleted file mode 100644
index 71cc08197ad7..000000000000
--- a/net-mail/fdm/files/fdm-2.2-pop3-utf8.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/nicm/fdm/commit/0918b78a82a789d63cebe44b7662f0a8dc603000
-
-From 0918b78a82a789d63cebe44b7662f0a8dc603000 Mon Sep 17 00:00:00 2001
-From: Nicholas Marriott <nicholas.marriott@gmail.com>
-Date: Mon, 4 Sep 2023 09:03:47 +0100
-Subject: [PATCH] Send UTF8 command to POP3 server (ignore the response),
- because some servers don't like UTF-8 without it.
-
----
- pop3-common.c | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/pop3-common.c b/pop3-common.c
-index 0724887..e038172 100644
---- a/pop3-common.c
-+++ b/pop3-common.c
-@@ -54,6 +54,7 @@ int	pop3_invalid(struct account *, const char *);
- int	pop3_state_connect(struct account *, struct fetch_ctx *);
- int	pop3_state_starttls(struct account *, struct fetch_ctx *);
- int	pop3_state_connected(struct account *, struct fetch_ctx *);
-+int	pop3_state_utf8(struct account *, struct fetch_ctx *);
- int	pop3_state_user(struct account *, struct fetch_ctx *);
- int	pop3_state_cache1(struct account *, struct fetch_ctx *);
- int	pop3_state_cache2(struct account *, struct fetch_ctx *);
-@@ -436,6 +437,24 @@ pop3_state_connected(struct account *a, struct fetch_ctx *fctx)
- 		}
- 	}
- 
-+	if (pop3_putln(a, "UTF8") != 0)
-+		return (FETCH_ERROR);
-+	fctx->state = pop3_state_utf8;
-+	return (FETCH_BLOCK);
-+}
-+
-+/* UTF8 state. */
-+int
-+pop3_state_utf8(struct account *a, struct fetch_ctx *fctx)
-+{
-+	struct fetch_pop3_data	*data = a->data;
-+	char			*line;
-+
-+	if (pop3_getln(a, fctx, &line) != 0)
-+		return (FETCH_ERROR);
-+	if (line == NULL)
-+		return (FETCH_BLOCK);
-+
- 	if (pop3_putln(a, "USER %s", data->user) != 0)
- 		return (FETCH_ERROR);
- 	fctx->state = pop3_state_user;
-
diff --git a/net-mail/fdm/metadata.xml b/net-mail/fdm/metadata.xml
index f4f8580b129e..e107065d0209 100644
--- a/net-mail/fdm/metadata.xml
+++ b/net-mail/fdm/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
   <!-- maintainer-needed -->
   <upstream>
-    <remote-id type="sourceforge">fdm</remote-id>
     <remote-id type="github">nicm/fdm</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 1dbbe152e3be..188a8095f6eb 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1 +1,2 @@
 DIST mailutils-3.17.tar.xz 3219484 BLAKE2B b2b00d4eb8b74b3f2f7341638639fef79e636364deaa0a24c9595022db44faac433c1fa26b231e29384ebdfc9c1602040cf363e637fc66ec3a738b5bd04a884a SHA512 e4080d9674444c3e077aa72f825a0373a4750d187a04a488449e89f6fec19d9309a118412e91745575eb90d05fa541f8d2626a8fd5e8ac10710aa1f7a0ff3193
+DIST mailutils-3.18.tar.xz 3294996 BLAKE2B 7866a9c0419daaeaf277f266893030cda771804c636ce143e36a9cd1823280c2662b0696825387b3b0727115e0ab131ca376bd99445d4b4080f66289dca11316 SHA512 77718e41d77556b59d7eeee4b80fca658c32f949dd87e09848a559eb6470254c9562208e49b62e5027522eebb5eaaf7eb9dc12ec02424f4144cceee5ef695ca9
diff --git a/net-mail/mailutils/files/mailutils-tests-use-mbox.patch b/net-mail/mailutils/files/mailutils-tests-use-mbox.patch
new file mode 100644
index 000000000000..0710b880a196
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-tests-use-mbox.patch
@@ -0,0 +1,119 @@
+From e5ae56618dc2a15b9cff792be7315185bbd96ad2 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Tue, 7 Jan 2025 11:59:33 +0200
+Subject: Fix testsuite (mda & mail) to work with arbitrary default mailbox
+ type
+
+* mail/testsuite/lib/mail.exp (default_mail_start): Force mbox
+mailbox type.
+* mda/mda/tests/forward.at: Likewise.
+* mda/mda/tests/mda.at: Likewise.
+* mda/tests/mda.sh (dumpmail): Handle only mbox.
+---
+ mail/testsuite/lib/mail.exp |  2 ++
+ mda/mda/tests/forward.at    |  2 +-
+ mda/mda/tests/mda.at        | 16 +---------------
+ mda/tests/mda.sh            | 26 --------------------------
+ 4 files changed, 4 insertions(+), 42 deletions(-)
+
+diff --git a/mail/testsuite/lib/mail.exp b/mail/testsuite/lib/mail.exp
+index b7e68b2..9034d57 100644
+--- a/mail/testsuite/lib/mail.exp
++++ b/mail/testsuite/lib/mail.exp
+@@ -51,6 +51,8 @@ proc default_mail_start {args} {
+ 	append sw $MU_TOOL_FLAGS
+     }
+     
++    append sw " --set mailbox.mailbox-type=mbox"
++
+     if [info exists host_board] {
+ 	if [board_info $host_board exists top_srcdir] {
+ 	    append sw " --set \"mailbox.mail-spool='[board_info $host_board top_srcdir]/mail/testsuite/spool'\""
+diff --git a/mda/mda/tests/forward.at b/mda/mda/tests/forward.at
+index 08d22ac..d4af639 100644
+--- a/mda/mda/tests/forward.at
++++ b/mda/mda/tests/forward.at
+@@ -19,7 +19,7 @@ AT_KEYWORDS([maidag forward])
+ 
+ m4_pushdef([TESTMDA_CONF],[cat > testmda.conf <<EOF
+ mailbox {
+-  mailbox-pattern "$(pwd)/spool/\${user}";
++  mailbox-pattern "mbox://$(pwd)/spool/\${user}";
+ }  
+ 
+ mailer {
+diff --git a/mda/mda/tests/mda.at b/mda/mda/tests/mda.at
+index b101ae0..5279f15 100644
+--- a/mda/mda/tests/mda.at
++++ b/mda/mda/tests/mda.at
+@@ -16,7 +16,7 @@
+ 
+ m4_pushdef([TESTMDA_CONF],[cat > testmda.conf <<EOF
+ mailbox {
+-  mailbox-pattern "$(pwd)/spool/\${user}";
++  mailbox-pattern "mbox://$(pwd)/spool/\${user}";
+ }  
+ EOF
+ ])
+@@ -52,20 +52,6 @@ mkdir spool
+ TESTMDA_CONF
+ testmda  --from gulliver@example.net root < msg || exit $?
+ dumpmail spool/root
+-case $MU_DEFAULT_SCHEME in
+-mbox)
+-    head -1 spool/root
+-    echo "$envelope" >> expout
+-    ;;
+-mh)    
+-    sed -n -e '/^X-Envelope-Date: */s///p' spool/root/1
+-    echo "$date" >> expout
+-    ;;
+-maildir)
+-    sed -n -e '/^X-Envelope-Date: */s///p' $(find spool/root/new -type f | head -n 1)
+-    echo "$date" >> expout
+-    ;;
+-esac
+ ],
+ [0],
+ [expout])
+diff --git a/mda/tests/mda.sh b/mda/tests/mda.sh
+index 208602a..90a8d6c 100644
+--- a/mda/tests/mda.sh
++++ b/mda/tests/mda.sh
+@@ -16,33 +16,7 @@
+ 
+ INPUT_MSG=$abs_top_srcdir/mda/tests/input.msg
+ dumpmail() {
+-    case $MU_DEFAULT_SCHEME in
+-	mbox)
+ 	    sed -e '/^From /d'\
+ 		-e /^X-IMAPbase:/d\
+                 -e /^X-UID:/d $1
+-	    ;;
+-	dotmail)
+-	    sed -e '/^\.$/d'\
+-		-e /^X-IMAPbase:/d\
+-                -e /^X-UID:/d $1
+-	    ;;
+-	mh)
+-	    sed -e /^X-IMAPbase:/d\
+-                -e /^X-UID:/d\
+-                -e /^X-Envelope-Sender:/d\
+-                -e /^X-Envelope-Date:/d $1/1
+-	    ;;
+-	maildir)
+-	    f=$(find $1/new -type f | head -n 1)
+-	    if test -n $f; then
+-		sed -e /^X-IMAPbase:/d\
+-                    -e /^X-UID:/d\
+-                    -e /^X-Envelope-Sender:/d\
+-                    -e /^X-Envelope-Date:/d $f
+-	    fi
+-	    ;;
+-	*)  # Should not happen
+-	    echo >&2 "Default mailbox format is uknown"
+-    esac
+ }    
+-- 
+cgit v1.1
+
diff --git a/net-mail/mailutils/mailutils-3.18.ebuild b/net-mail/mailutils/mailutils-3.18.ebuild
new file mode 100644
index 000000000000..45199633d8cc
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.18.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GUILE_COMPAT=( 2-2 3-0 )
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit autotools elisp-common flag-o-matic guile-single python-single-r1 toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="https://mailutils.org/"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
+IUSE="berkdb bidi +clients emacs gdbm sasl guile kerberos kyotocabinet \
+	ldap mysql nls pam postgres python servers split-usr ssl static-libs test +threads tcpd \
+	tokyocabinet"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!mail-filter/libsieve
+	!mail-client/mailx
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	dev-libs/libltdl:0
+	virtual/libcrypt:=
+	virtual/mta
+	berkdb? ( sys-libs/db:= )
+	bidi? ( dev-libs/fribidi )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gdbm? ( sys-libs/gdbm:= )
+	guile? ( ${GUILE_DEPS} )
+	kerberos? ( virtual/krb5 )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	ldap? ( net-nds/openldap:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	nls? ( sys-devel/gettext )
+	pam? ( sys-libs/pam:= )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( >=net-misc/gsasl-2.0.0 )
+	servers? ( virtual/libiconv dev-libs/libunistring:= )
+	ssl? ( net-libs/gnutls:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-util/dejagnu )
+"
+
+REQUIRED_USE="
+	guile? ( ${GUILE_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	servers? ( tcpd ldap )"
+
+DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-add-include.patch
+	"${FILESDIR}"/${PN}-tests-use-mbox.patch
+)
+
+pkg_setup() {
+	use guile && guile-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if use guile; then
+		guile_bump_sources
+		sed -i -e "s|guile|${GUILE}|" libmu_scm/tests/testsuite || die
+	fi
+	if use mysql; then
+		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+			sql/Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	# bug #943873
+	append-cflags -std=gnu17
+	append-flags -fno-strict-aliasing
+
+	if use guile; then
+		export GUILE_SNARF="${GUILESNARF}"
+		export GUILE_TOOLS="${GUILE/guile/guile-tools}"
+	fi
+
+	# maildir is the Gentoo default
+	econf \
+		MU_DEFAULT_SCHEME=maildir \
+		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+		$(use_with berkdb berkeley-db) \
+		$(use_with bidi fribidi) \
+		$(use_with gdbm) \
+		$(use_with sasl gsasl) \
+		$(use_with guile) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_with postgres) \
+		$(use_enable python) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread) \
+		$(use_with tokyocabinet) \
+		$(use_with kyotocabinet) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable servers build-servers) \
+		$(use_with servers unistring ) \
+		$(use_enable clients build-clients) \
+		EMACS=$(usex emacs emacs no) \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-mail-spool=/var/spool/mail \
+		--with-readline \
+		--enable-ipv6 \
+		--enable-sendmail \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	# bug 613112
+	newins "${FILESDIR}/mailutils.rc" mailutils.conf
+	keepdir /etc/mailutils.d/
+	insinto /etc/mailutils.d
+	doins "${FILESDIR}/mail"
+
+	use guile && guile_unstrip_ccache
+
+	if use python; then
+		python_optimize
+		if use static-libs; then
+			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
+		fi
+	fi
+
+	if use servers; then
+		newinitd "${FILESDIR}"/imap4d.initd imap4d
+		newinitd "${FILESDIR}"/pop3d.initd pop3d
+		newinitd "${FILESDIR}"/comsatd.initd comsatd
+	fi
+
+	# compatibility link
+	if use clients && use split-usr; then
+		dosym ../usr/bin/mail /bin/mail
+	fi
+
+	if ! use static-libs; then
+		find "${D}" -name "*.la" -delete || die
+	fi
+}
diff --git a/net-mail/serialmail/serialmail-0.75-r5.ebuild b/net-mail/serialmail/serialmail-0.75-r5.ebuild
index e0ee8b24b777..ca05f8018e88 100644
--- a/net-mail/serialmail/serialmail-0.75-r5.ebuild
+++ b/net-mail/serialmail/serialmail-0.75-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,11 +10,11 @@ HOMEPAGE="http://cr.yp.to/serialmail.html"
 SRC_URI="http://cr.yp.to/software/${P}.tar.gz
 	mirror://gentoo/${P}-patch.tar.bz2"
 
-LICENSE="all-rights-reserved"
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE="static"
-RESTRICT="mirror bindist test"
+RESTRICT="test"
 
 BDEPEND="sys-apps/groff"
 DEPEND=">=sys-apps/ucspi-tcp-0.88"
diff --git a/net-mail/stalwart-cli/Manifest b/net-mail/stalwart-cli/Manifest
index b70aea033f18..b66d06651d40 100644
--- a/net-mail/stalwart-cli/Manifest
+++ b/net-mail/stalwart-cli/Manifest
@@ -1,6 +1,7 @@
 DIST RustyXML-0.3.0.crate 17517 BLAKE2B aee90d7d8926cf922e7497f4a375344f1252123b90010253a8d85a1741bc7a5580ef9c8f284a1207af4e64c2fc4509327b58accd8a5ffb86b454125e73703101 SHA512 87e8ad6e6570a8f2cf20ca8b322864e44f555cec2415f03ec9ce5358514b57f164c548ae9da12bc5cb0dde702dd095f8a493f4fa39c98fde6779ebeedb9f7409
 DIST addr2line-0.24.2.crate 39015 BLAKE2B 57186d6b957542cd71a0aa19f1355dfaabe6efa19b853c42f306494728b03d1e3183efdb2d2c7734a3e2347cd83a985d004f50c097e06b7520bd152310532e9b SHA512 39cbec3c920ffc0f37584afb55e1cfe4f182e4415319a4e9bfe842360f102f7b9315f6171c0cf71ba0337123903e604096cd573fe98698a26c8eebc2376d965b
 DIST adler2-2.0.0.crate 13529 BLAKE2B ec575b0bf12e321399ac3a1d59fce4ddbeabcc60cb3d7c2f362cce23eb29b4ea836451372d6d88552a4435ae29bb41d6230d55f625a4359eace680b9b771d0ad SHA512 12d12579ad617cf1a94cf95ab9d3f5db566c3b2de4bd5735eccd83c668fdad0eff134c996b73c46cbb9f932837682043878b8cc4764191625e9f93ccffcce423
+DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
 DIST aead-0.5.2.crate 15509 BLAKE2B 0214f3e8ee85a7e18c7d20f9a3fcbdbb9e5af6fdfdcb427e915279b505556dbd2df6d09d5c90561417c56796236a56ab24b2b11389745bc03a0a6da45c0e8636 SHA512 61926a615618e64efd0e9342d729a89f80d6e092dda50e018252a06147e2ca0dc2a989136416f57ae02019695757dfa3d3f3cf3799f138e440662744ecab4a44
 DIST aes-0.8.4.crate 124812 BLAKE2B c4a9cadbbfd9d24a758bd5d18b851fb86bd74f5b1f0f6f5706275329d92396a00dc2c35fa0aa2af5b55fd336934d35df413a31f85ba886e85a037296f9df25bd SHA512 96243337546acf64f89bf9ba23011eea1a205d82d96707f9c45bf28cc62ef00cdac5cdfacb8d6013155ee1522ad73dd1b7f166c74ed18159bf23c3c48ec77d79
 DIST aes-gcm-0.10.3.crate 148991 BLAKE2B e1376b741386577277a8cb9535c1ad3e15ea383c0f324bc5cedff09a76b11f2c9e29226535688f9431e904bf2800b8e140c4b1cab333e572208eefd19ca897f1 SHA512 f9aec1e2609262c30921bf83cdd82117d147905d4ca311f9fef4b9f1734d3a57893ba2586f0ccfd39cf9264d347ba2c2d2c52b4726495eda8fec7fbec42d6db3
@@ -9,6 +10,7 @@ DIST ahash-0.7.8.crate 38550 BLAKE2B 0fd5f220c15bc0a1aa2e95d13477bcc832d992c6406
 DIST ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d
 DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
 DIST allocator-api2-0.2.20.crate 63549 BLAKE2B 12f88e884cd96122291e3fd277ec47f7cd33f36def475508e1e27d762ee8024d1bc33c861a8c076bf75553816a4500fada64a6ca9c7154a52de98fa1e6cd2660 SHA512 da80dc95cfcd985e16f3500f3ca5a5add872dd82cc8dd2928d41669648d3471c540d3b35cf961ccaa8a6104aff8eb536da465a1ba47f122ee9120615427b4ae1
+DIST allocator-api2-0.2.21.crate 63622 BLAKE2B 983897fc977118f220dc4af7e801ac08eba77bfde2a25d756bad3e77f849418e74e7c67eaed68e2d719ca7fc6e1e9ce151dd7dbe8707dc43d4a6400294c8fc8e SHA512 1bb5711ed6041b0d7eae2ec784b8aa9d215db0f49cf79c692946eeb0db545d358cbcaa8156ae34e51d05287c08574f1da251ee574f2392949e4ed26d04770d03
 DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
 DIST anstream-0.6.18.crate 29681 BLAKE2B b6f72cda084b38f1e1cfe60de2562e8d62ebbc352176bdf668a2d6be09349bec46d291cd475e8af814ce66def44d95cb98c325761150130752284a82d8a84f21 SHA512 5149977d6f7b5e9cf6350f1ef130caa3ff46c7e78976358452a185ce196cdd77fee48a3a9838f434ae6ea9c15b19f6bfbab156edf819f81179d6774318f08963
@@ -17,6 +19,7 @@ DIST anstyle-parse-0.2.6.crate 22343 BLAKE2B 85eba405dc5cf806283cf442984e86583df
 DIST anstyle-query-1.1.2.crate 9969 BLAKE2B 179b8dd6dd709c2ca67f4eb5c9a502b2867cb6744a39f824c4fdebedc67c6c3e07d107c7d817e2ffb589d13b7ed4900cf9653ddc0a43663217042ee92ce8c9da SHA512 26069d936c4b1fb09bc65cda0253fe9be8fa4e96c0821f980c772602b4e9230035ec8c9d092ef95e0a0354ac559f8d25f57a14c34086d4d241b5fba688951837
 DIST anstyle-wincon-3.0.6.crate 12271 BLAKE2B d9f4d9d46fa93a1168ca340562681718be852ffa94e30c9ea208af53af9d6697ca84921837a325ddc36681caab2b866b7f574901c80b5c0d862dcb765b81b68b SHA512 59ec6f5a53bd68b6344d82e923eb8c45ddac481dd0d270a7b452dc5b0540ee1656705697c1508942ecc131e7c075248c85d8f4159f27d97ea94f22469ce2eeb5
 DIST anyhow-1.0.93.crate 47490 BLAKE2B 1c64b24d3df3307430deb8189ded345ee2858c1990fc343f2400bd67b6d79ee2cf90876326fb29ea311bd857a941fc8319dccbe6c81f2cca2c085dc0c1fffb27 SHA512 237b36bdefeaf8dd2f7d4c5c92d8f7627a5206ded5fa3dafd5710f2fbd3dd7d7187d4a8ae917ae03d0cf06bc8d101a7663bb7bb022507ac1ec88577a37475efc
+DIST anyhow-1.0.95.crate 52155 BLAKE2B fc9cebdfae0afed86f2dfb7faf62f5a108000895317dd0cab9c83d6e48c891558fc3a1d8b9940b623b4c6fd861631a0f0344a9915517a9bc39dbfbe48ec6b45b SHA512 8c5c176381c3e861c3c4451f7cd3d9e2447c0a55735ececfd3199288d65d36dc5fdc4a19a0798f62a0b9d6ca2c155a616c7eab8bcd53e6ece743aed57ec3d0fa
 DIST arbitrary-1.4.1.crate 36816 BLAKE2B 86adbf1a2522e972bf4a7fc26e4d88ec45298dc2ce716a1fe30cd49bebf4d5a65af1f097f83be6ee8c554d4b392657efd32ffa1cb35704585a9816b6e234c067 SHA512 a3507aa0ab684464c3559376beabc0992bbb589ddc85d2426b26238d7c5d1d856df5d9226603fe7ad2b17ac6570d62e86ba4f5a2e65f3cbc9ad52bbe294f8123
 DIST arc-swap-1.7.1.crate 68512 BLAKE2B 5ddeffd2ae8af4125a5b43d4a0a1afc7948533bf037d8cd3e47603c13b57b156618280d99b840bf318b25b6eb29400ad68499695e182acdc05bc5f621c42ee16 SHA512 070fa8dd17b380b6d7d72f6f45c84e591de9a9770b9662351e7a41af03798bf5e34d185a5fcb948f4d8ac5e210a33acd465c39eff6097662c2442b34ee3dbdff
 DIST argon2-0.5.3.crate 28795 BLAKE2B 5c3d098871fa632eac8f0873e13958b90801d76b87b18e9cc379da2fae2f1fa8f5da1ab5fdcbbc482fece6a4de8b9b3c0c397683353c366d53bb8f063702886a SHA512 5be5c07093e277092e4772172ea5b34ae7389cb3108d41f8824060a7cee1692d8019a85d196f3535e8b19ab0a869df879cae32b10d98494bda180aee16e7553c
@@ -38,6 +41,7 @@ DIST async-stream-impl-0.3.6.crate 4312 BLAKE2B ca2b41ff4279ee86db08f6e9954a8058
 DIST async-trait-0.1.83.crate 29054 BLAKE2B 4991f79abd8b9260b9541e754c30d3e0731ff786fcf65cc3f3eb75a5fcedcb37be147222778e1a0fa6c68d8fb872144b2b55b43cf6f8f4de371f24175cef405d SHA512 15969eafbdbe51e80433b53196962293daed2a70d3d9bac91c58e5e7359f60fc99ef519ceb1fd54e34d627c94f821329474a602f25f85179318d10c3147b5649
 DIST atomic-waker-1.1.2.crate 12422 BLAKE2B fc6632f3c9d719b1d24a1c8e05947d94028909d1c629b80576e176e567636dd4cca699c7e91cae2df63541da574146b3ce766374e93f0ee429bb5bc89a4d3cae SHA512 e07e58db7955791259d0ec00fc4d53318aefb4506e062914819c4220c6dc75fa11a7af0289b4653aa1f9041eb975a025635190de68b4800a0e91e33cdb0ba11c
 DIST attohttpc-0.28.0.crate 61745 BLAKE2B a2c62479e6b392d6985b006e54d3457d032c6d23c129b719e913eb43a908a202e297042e0916edb54f0d73424ff57d76b2265ad374b1c65943621f9d2ec10348 SHA512 9e8ef786681ce5edfdad1075a5a69f298abc6117a2adfc676d5af5b0ba37e1b3846b997dfd33c851273e58b38fa4b0383322ed088c5c4478a5647d631765441d
+DIST attohttpc-0.28.2.crate 63013 BLAKE2B a7f38fc320bb40da15f7f85ac381347a0ca98fcc04a1c2c279e5449687bd44d41dd6d80611c42a0eaa891f2a063b7185a574f6eb2835e339006f4aedce0f4503 SHA512 570ad6af2c661ddbaf3a2b8f4b0c8a5b1d70762c46a1e9de8ba26f975dc32d5d2eca66b98f628c2dca880a0688f3751e19f46b80fc64d97c6b42fb4dc040ca14
 DIST autocfg-1.4.0.crate 17712 BLAKE2B 7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6 SHA512 3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c
 DIST aws-creds-0.37.0.crate 6130 BLAKE2B e0332b85b0efdcd9bd34422c6221b64d7e9782f5243601d9afdeeb43280d57793d3aa4e0fcee33b70397f2d03656f6f1698873ca89ec923a9068363e8d4840c7 SHA512 6bef3a3c707642ff6ac41027e768f8714d8920008607b51bbf01b541795b1a15d81300ae56b159752bd9be3a85241c43f50f335335fb5a1d55f3331aa19864d2
 DIST aws-region-0.25.5.crate 3987 BLAKE2B c5e1b23427a3b6087318c6dfc7219347a700c8c47134d6e273573376fb980e4b32192a45affd2547f8d3b4d5f01d7968f5c64d435b1abb196e9a56b28927c65d SHA512 2526f015b2b168f5960b5b14bc5a99822add27bf727db680c3137253262c1822cf10d7fb2816345ed2a15c7171cdf1158e03301bb885292d8d3af32c1afcdfc3
@@ -56,9 +60,11 @@ DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cb
 DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9763070e269b56a14b150cbfc4b7f599d4c2a0a5f783638170ee132f0796fefb14fcac7fd73c58db0791007a SHA512 91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20
 DIST base64ct-1.6.0.crate 28870 BLAKE2B 60fbd9958f2519f293db2cd86add5160b51ff4f98718591b3e65d866e8bb176670ceecd5f6e365ff3ff488bf813860bf65d375a2159dd28b25e276e027303c4a SHA512 e3a267dce49257b6990d8d0842299d75b49a9af635082dfee25e314f5ab9067b339c877a4c7b012a1eaf9a84a7f8ddf0173c6f9d8695be81b8b4db03df66c92c
 DIST bigdecimal-0.4.6.crate 86155 BLAKE2B 5529cf7133ba9af8246e28a73456f96a4824147093f473f68a6d0a1bca4cc70c972cb47af7fa9cd8773a52fe3889cb9b708bca6973cfb0dc99971ecdabf10d67 SHA512 c419dc313bd4dcb6cf9eae361e0d7fc088aa07ad6c8f687127ee1f657439ddbe7ed3b7fc85b832e7044e93feaccd5c4f1c7b2ac29931cfab6e06401b15634737
+DIST bigdecimal-0.4.7.crate 89252 BLAKE2B 457c97530d89fd78a672aecef6bd0a0210d83f797f9297b7149cf33e9e94aa87b2c298264ceae44979042eeae2a502eea51c378263d4644edcbc877089a0c567 SHA512 7a3493617005dc19b2fa0eaf11e7fbfda734e701f3d5f24bfb01722a2739196daa29b2a33392dea40a47812528691a162773dc602c5053df65aec3a29dfec0ff
 DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
 DIST bindgen-0.69.5.crate 221128 BLAKE2B b89edbf883e1bc11a074c2f37f84bb966749823a6408b9765d6a61ee1179451d67dadde41d27838e8ddc6172dee9c342429f42fbe6959ff9fd7dcbc73d7506ea SHA512 b232b906af7535f8b87198f0a4037a0f09af367e0c913575f3d16453a2c272e7d76033cb3fd12d4223ebda4a0f8130629e67c5883e026a2422db3e0659ed3c3f
 DIST bindgen-0.70.1.crate 226363 BLAKE2B 4c5b9d70d0aa95ec3dc4cc956b3b101043132054ef47017f1e7b51072dec1ad87885caaaa91ce5353f88332a6412c0377cf9490822357e78b5124ae9b3e9a6e5 SHA512 cf1c87ea7ab9ed4df953795f1aa77e6ae6d72e768de3b517300074501ce49db6a3def1f58b9d824b5727974cab84a48461e7d98086fc440dc73ad9cf173ad5ed
+DIST bindgen-0.71.1.crate 237785 BLAKE2B 4ef4af15b95a65510190e611662e39c4c7f6a33c02ed49c19e7e2d8d0ba951657ee5f681e73d3297603a87cff02ad857a21711f1a66eb13526d5af72e749ad1b SHA512 ff7f9f1989cf014fdc73f47263adff7928a51787e57a08eb687bfa3fae2b474300c13bfba62eff4da97cb70c456846826353debd9ef6de255228fe30dc9a7b6d
 DIST biscuit-0.7.0.crate 73064 BLAKE2B 521da2ae90b8e75e8eb6395a6457a209dafc8f91ee8d2475b6e3c9cd535073e2e8467de1b69c64a11718ba930ecfd31d6f41e80e1d7137285ac1b3963de7afec SHA512 c4615ad054520a460fd2352ce3fff3d740d9279c1342028bd0b8007800bbc3133e74d8d43b84f5dcaaa883a5f2f9a2d5f6d18ef38c2942df09d3b2a80f468dfb
 DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
 DIST bit-set-0.8.0.crate 16289 BLAKE2B b27bd0a273d7e45e2fbdf46d4c5df4d82f710071cee82b19e95204cecfb13dda26aa346696f489a52f66347e7123a67cd0d05f7c2a4d7164d671f712fba1b9da SHA512 eb06e6b9285f33fb0dca69ce189838138f679e97e72538d09923e29348cb25ff1043cf4ef4ef4b74644de9a601859159d9d9d74354def92eb10b86e6067047fa
@@ -80,18 +86,22 @@ DIST borsh-1.5.3.crate 63733 BLAKE2B 70de963b8fae272eee797218075f8b5a5c732ba7b7f
 DIST borsh-derive-1.5.3.crate 29532 BLAKE2B 8ecabc2f3eb94a8766a5fd719f925d768e8443bf98872ffb5c06dfe5c14bce348fef2d9ed2e30bfbf35a8b735371a5535c7d4c92a5dff6836412737e96963438 SHA512 9f958776953543fa7dce1b36435bb331c31644e78b19bb12549ab9c0df945c6439e019384f218648c45112d1be379b67b3cff47c4cf3ed5ce6e29081dd71b47c
 DIST btoi-0.4.3.crate 10007 BLAKE2B 60a4c0511afc23ec3bdd07a905e82b501f1000081e6dbfca9ee6a0d6aad40ade84ab09d740fbc8e9656653a7f5a9a12a68ffa732618e8dc87f9cf00a90b6d3cd SHA512 35d54183a37c8adb11838724a061b38d286a92603a557ee8b4b80dd230649a0ceb165fcab4b6e41402284f2153e18fad5c246f83d99accb2fdaa8f32f854bd22
 DIST buffered-reader-1.3.1.crate 63723 BLAKE2B 7a7553b5994c01666c95a678712005ed3c02fbf8f0b45d80f2e80b2bd46c5993376b16f5d89d50a7cd915aed9da6dc164901c6e62091922e615bc8b9284f3328 SHA512 4b7efde96c2db48f8452e56a904b1fc865b7317bcc324c10c0a23147b96eb14cd5097b3178910a1a74d54948b50d6499fa7f5c8630274a80ff05f1eeb2c7054f
+DIST buffered-reader-1.3.2.crate 63738 BLAKE2B 397c9c78d467692240d4f6ce0004a089af48ff01697ca98b923e63f1df3832f16f1c0d015981863225710dd8c28e3b9dabf4acf0171e9aa227f6071d2ccb17e1 SHA512 a121f3ddc14713c79cf3b61484e3b21953eaf0fc079385a238d38c3de3b8a88b16a0793986f07bbcb7270510439eeae5fe5dc007a358ecc0f683d0b74a320167
 DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
 DIST bytecheck-0.6.12.crate 8202 BLAKE2B 2ea8db419348ad79af1e7e61b5278ebf0e0b77ed1416c2ea409d6d00f1eb991358b8d3798717121ab23fd66a4d0ff6b97515551d5f7774f5ca2933eccdee6c1e SHA512 49a85f9bbfe8bccceffcd94e3eac1f4407d93159358428ea07652714e06e97fbcb41f22f72d9d10318bc9a019be8afc99727764162f18e8de01ea4069f44dda6
 DIST bytecheck_derive-0.6.12.crate 5415 BLAKE2B c578c268d1aa62ff4f5bb7b6207ae94f42a14cfe4e16dc59a69418fc8cbc4ad3a9e18854507456111dfbfe4f720ad8cca0fab23720889b070e837196d5846476 SHA512 57f8480ddb76d8620095962acd203231fb7938c0caf9c216d89466f22464a6970f13adca5f4d5b10c9e1ec99d6e0b260ba7586c2bb895fad0380f8f9ac9a4fc8
 DIST bytemuck-1.20.0.crate 50943 BLAKE2B 5a2f373961718e994650c5f4c02a3f0e41bc7382a5b05a4488474e2ea6b077db7f773a02b77bf9b9d5b5a6da53ea79e87861ea57d944735efd225d1ee8c08425 SHA512 5ab5917e650184720a751f310d8cd7502d183a0942d97922e0bac25f257762bbe07c09b1f8427e04669f0fe449d07bd66893593cf11846cb8ec6632cb7eb271f
+DIST bytemuck-1.21.0.crate 51553 BLAKE2B dbd88d153c79cd87d6a51d33e49dde7b825711339367a168cf2471fc98a41e72d4d759873d542c3c6e196a6baed4f099103dbdfd369a329bb4578864b9ffb448 SHA512 64abfc5c0430b8bbb4b75fa7ee43037ceb180699655c0862b2699f3823fc445d931d3284ccc88dfdc98ed1a24a660cf6ea1040f91c6b2ba1cb21ab83c89d9b18
 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
 DIST bytes-1.8.0.crate 64824 BLAKE2B 9af490b43146b04704e8bf0f7df1f251d7db414b68aa614d47daebcb374a7e18908192cf0a2ecc80f40e70379395b88f60f85fa80f66e3be5661752c4ac560f2 SHA512 a721724e5cbfc73b79102a9c4a00fc9da520417819ca5c82b798c8cfb45af3d77b33f7035ad33d6187399c613cc2e83644236ac772aec934f521f87d4680059a
+DIST bytes-1.9.0.crate 67320 BLAKE2B d5a89fc1dced217bd78c6c50d0494308b69b0841506c4663b6df3755b91a9eedbd242ce1322a71b8a96847db7920b2b15744fb060aa2d69f5c8d9bcbf2745b9a SHA512 e6c0681c535db6035c1fb1c0481725bb8ab341b6324acde07ac4b60cc4f490ec6ff01478bc00fae00ade2bc5420f9d14cc44438e5d156bcce91cc0f06118296b
 DIST bzip2-0.4.4.crate 34197 BLAKE2B b69f8ad38b44eb4912b33d53467492b0ebe6ed740451bdfe9133e71c47a8dbd85b1110a9607c4cc627fbabc44cd86fe0396bb545864632ffb6169f9cfa547b6c SHA512 9cd2b9159bd0b42ac908ecad41f0a737272af94ae0d6dcfe182d2f44bcea4632d32b0456f02322047ea9d6f46377db6cd083f468782bccd6126bcc75cb852555
 DIST bzip2-sys-0.1.11+1.0.8.crate 633444 BLAKE2B 01578c512443134fc786669bea4f2ec4b9c457b9936c907315299d8b67ed78045d458c83ccc119f0fad511529fb5af5feff5fa2d983fdae832d2fcc1b343e102 SHA512 d0a86b9f03acb1e4e309d5739dc2e88cab582757d467a433afe0017017f0e5d2c0282529e3a117160958ed170d8d695ecae739805888305df0e35e4dc440582b
 DIST camellia-0.1.0.crate 89085 BLAKE2B 88f67a01f18e236a8ec2613cea4f0d38fdd65b2191e5478bd7c1155feb45832d693bff15ad4b880651cdc9c74e89cdc0131548864b2c51f7cec38ecb11b5d113 SHA512 b851c285509d21ed02428ab45378dc145959bd196ab75daebb7df60bce3b71e059d4dbb5639697ef21fd6f7554c122cab8a5702b1d118c743fe02f65054f66df
 DIST cast5-0.11.1.crate 37018 BLAKE2B ed3d9283131df32dc18a5e4110a325b7713936e109b43bed8da0d22b0afe81a0f00c9e4fab0bca1194c93fe6f0bf326a5474af6f9274c310632b93d24dc9328a SHA512 0fe363b576ece2661616c47c4de1801756c5aaa2a56c720a7b4eedf23e031ba9d30af9d086a16b0f957c39b473cea1f059295dd1c776e9a9cd4393e6c895d015
 DIST cbc-0.1.2.crate 23501 BLAKE2B c0d537af0323a92cd01a9ec197bbe46507835348e16dcec7360072226647abe2eaa4823023930da93885347fe1429acc2f9c079b7bcac686c1293ef73b91bf0a SHA512 d3b33deff64d839ad25141f1c3b5fbeaa21f71aee7b58dbed91e7d257f93e68073c8d4a63d4c4eb9775c20f00bb0ceeee714a8218e85a231f30cd7423022f820
 DIST cc-1.2.1.crate 92731 BLAKE2B c9cb100964834692781ecc3f47972f83adaf27e019ca212f896b19a853521cf2084da213f2c2fc5c8a1bc794cc83fe9f81faf7751e1b065a3a2a08137cda0b61 SHA512 54bc5d85d48d678d33dc795aa6cc823a59ae6d17b4ec5708a1dd515e3495eabccdd949e9467e9bb3a29e44847a2d3ccd75055dfda241d8abbb16bfad650f2819
+DIST cc-1.2.5.crate 99839 BLAKE2B cbc49474bea2880a8908762a3bd03dd853cc9b342a51071a8cc1cbd3c0db2b8ec054c44e844bec021487e8f06bb8c5299e5b29a13b73e24d6f313918d0e9c929 SHA512 364066b0f45ee99cab088833a0e095ec3e7f3d8e2a0c4030ffca65f8c35174f23fb9b7ce0b97590bfd747fbc33c1851c6c8d74979e8a2250640f8cc2509d4daf
 DIST cedarwood-0.4.6.crate 12726 BLAKE2B ec553ca39d10242865027a20714e09148f1c3b40cee683976663fd4dfdb4396dca6e0cdd3bebe626c137093e25828c3243e04c4135dfa42aaf3fffb7d2d869cd SHA512 9c05863b5f35bd8652ae08d432f9abca8ce7fae5784496e1e46081bfea4efbd1b045283c4eb20062b76294f89f1970b337730111d638e65d731b16daba6e8d2e
 DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
 DIST cfb-0.7.3.crate 63277 BLAKE2B 5d0d4124421d26c1e3dbfabaf741c407f346d62147b12bbf889ef5b4c25350c02d09919e332e1ca18ade34a4e6d2895fc835161f7062c0c0bb56f104f94811a6 SHA512 a5c8d5da5ac009dd7d19320237ea516a65c9b1780bec3403fdbfb6ffa13bf7d05a896baeac5760c3e9aead9f4bd66cf969ab12bbd2938cbe479b1d2266e80b8f
@@ -99,27 +109,34 @@ DIST cfb-mode-0.8.2.crate 25334 BLAKE2B e004871204d40258a052b7771f6d770f710857fd
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cfg_aliases-0.2.1.crate 6355 BLAKE2B a758d9c88527f0e6e7cfd6d4c83eda1bcb4d6e2438189fe08e8ecbcaa78d56afc5a4873f3b82bf7da96afd690b44cdf1e44466b6da0f37c358b340481017103e SHA512 74969d12d5d24002a29e08d52e30fbce014dd481a7c35ee0162e69333c5f2d7755f3b02439b31522e12444cf1ac8e65880ce33fe6778dac03757e362cbf8a72c
 DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
+DIST chrono-0.4.39.crate 222248 BLAKE2B eeff1694a98e8775524c261c5c46ebf09bf1ffc6222a945576960e8153af99e4549d8c988bd086507fa430f9cb15a3159be85300247ab3c6f5e77ab515f0988b SHA512 5b258f76bea58ab9baa0fe8fb32c41928b8b655c76bb2fbaae9300ef8380cbb881296cee6b9e9886dce62b0759c73e84f6409e374a86cf0c80e3383512f98571
 DIST cipher-0.2.5.crate 13099 BLAKE2B a728a53007340dcc55da52cc170e5b801c8ad20c4e159d31200d5ab7f8bf4407af9a60713b4385ef0d65c06cc81692cfbd7339cb7449367d1eaf7c529ca34373 SHA512 e55627f5424d9b566dfb0787eebb1fb17ae98b4016c9091e87040ed37b36e0256b7681958a0d90aaf06c125c71123270bf986128ca1e0dc125f3162a868848b9
 DIST cipher-0.4.4.crate 19073 BLAKE2B 144c45c1bdc5f7aef7f4fc63b6dd85955c453537567d1f1074e436e50d0d61f8413973cf3da207a48f1560ea92f2280fc5880569c78a1dd66bf97fd1d88ccde7 SHA512 1856d8b08bc3dbd2fa5c8b97e9eae43323c7aa19203ef3e80bb49cf15b5ddc832acb7b97121a52032656353e764f1f722200b638f7c28975fec1b5c9dc908846
 DIST clang-sys-1.8.1.crate 44009 BLAKE2B 9173de6dfbd3ef9d5d1fdc559700cd3a52f95cd77302063a97e8cf311a35825825e030b47f252c857853663ae8a16709e1f7bd0c608d67c2a74eb36ed588e778 SHA512 a68c426c20110fddb8bba07d6631517b0528fad45802e5a34a22561d7e6dad82dc5001387019a03f275e9a671b09ee0a06b6e86793c4fb4ec655700bb0f5e125
 DIST clap-4.5.21.crate 56470 BLAKE2B 63b58b49ad5494712d0d45db92bea7a0247715f655c108cb81a4ae7380bdf572c292bee1edfb601aacec401d7d2fcd76068373200be642ac8179a33bc6b941ef SHA512 ca7b55defd85a4e1001d04653aaf1c38af9b43715dc6fd7b7a8c49a66ce1be0c09e0ac78b3a3febb90ad9a7d8676b4ff1ddc136816019eb394b7d4908af2a51e
+DIST clap-4.5.23.crate 56460 BLAKE2B 5c0ff6ecc072368022b8dc08703d87802160817e40228fccbf9cbdc15d86dfaf0eec141dec4e8f1327e5a6d1622df9b334e94797027372dbe8765a12b918961e SHA512 4a8ef8731c9768844debcd1ba83a79a607fd32d9fbfe7411abefb8939c5c442e8a206738bb54dddd136117d3992f519ffd1640694ad7796c4e0aae3f95502c7c
 DIST clap_builder-4.5.21.crate 164115 BLAKE2B 7df7a2fb8472e32c1885978f99a77b05f91c96131d00947386930e7249ad7a7b055ae5b1ebf145ddafef4d7d5fb276f3135423101bdb5ebc597b9b15267cfab1 SHA512 48abad9de7b0985138a2586674df36bcb925f3280cc19c7dcbec14d58c1a3bb391c836ff284366fb32d7460a5616b066e4e055e3a5fa7651196e62c59ca49c8c
+DIST clap_builder-4.5.23.crate 164180 BLAKE2B 90948ac5e8ea620be3e1ec1334677b0ae9dc227a00354fcd3d78e2cf23a1c101e009e6cc96fc19c0a2395e1b9ac6272fd9615abc1acf1a5d60392e337cfc961b SHA512 0889876990f0a361cc6b6d41f2a8f4b1decd376987a02fe69888455c92f3e583d6ff70880c6f0ea154ba62f4be7d2e7b18cdc4e0e2f243e6b17f250c3e8d1c2a
 DIST clap_derive-4.5.18.crate 30131 BLAKE2B ff962e52d8d8afcc9639365e27753c6c6943fd809ef89d9e555e8be5b2f13efa650bf1f9ae451f4c127c1529a0af1d892c3b02153b46deb912029b45983e01cb SHA512 035bb918bc7e9badd59341560f23e3a8a2e7cf945b6d8183f74052c4edfcbecf07c9ea6fce0ceef0b84c89a99d62b11760af39398897e4ee7dad0170a96cfefa
 DIST clap_lex-0.7.3.crate 12841 BLAKE2B e825c027d8f3909cde259236fce6c3f12fcffd92c714cdb29eb886a12ef703c6844dc6a157199e94f8015549311becbdb11b83d49cb89fd5c8ce1e642b9e1e1b SHA512 c76838743e65529d00ce4b1224174007892967622ba820750bc7fb352bb267923fa3baf42dcbd7e831c3d1b247144bac5475548c9d13582b95762695528d952b
+DIST clap_lex-0.7.4.crate 12858 BLAKE2B a5ecd50cc503157dd69746f3b6e9c288e0fe4f6d5d82271499f657134fd401fbe076255e2be6a23ed0b69daf3941c6429dad8b288223b0ad390a2c435575cdd1 SHA512 a2566868f4619679d3b74b70592ffa6a04b13e38e3196c56bb1dae8bea0c711bddbccd778d2aba3cc0ee074c9b1cc0335222818f0d47fb3cc8109cbc35bb992e
 DIST cmac-0.7.2.crate 44847 BLAKE2B ab8539f41e720f132b2da3176e9c533a2309cbb3dcdb027af4c5bdd6ac68e4a2a97f53efda52236527a15786b73bd96ad940385002412330d7cde60e3492a6fc SHA512 9e55f9f9323dff330ef45da953bc35da79ff8fe643b3984479dbab10b35e05e4d613f7329c46bc119fefa589d8f5f3bb268a7e7f0853003c1e192fe324e83315
 DIST cmake-0.1.52.crate 18119 BLAKE2B 03025cec724f080a9911505405a3bfc489709f557119adf7a70ca86d148a75ac7758896a9b136211b8473162484c998a9c7e7b5005250a037d1633b3a5706c3c SHA512 3200249c2de5b1d052fdf05a9fa82539f2d3f25c37e1c064d05dab2607a16cff2e7755497d09f71e01b95618e71f42640cf9d533b17ead9cca84777dec355fcb
 DIST colorchoice-1.0.3.crate 7923 BLAKE2B 7055fe61677143f0d4445ed5f6be2cbc284c155aa6ceac04df6f3fa2563a225e440ba708bf40e298ad09775ab7c7e1842b5f6dd78422b06dbd1250908e3227ee SHA512 fc26696189d3935d5510a1237504339c1f354d03ffd3b4e830b7080335aa778bc72787ac5fa9a67a731b9bde2788da778d497f2ef97ec68bdec5145fedf4cd14
 DIST combine-4.6.7.crate 134808 BLAKE2B 1f3ea9962f4ed4177a9c028d04934b5e261df405c1c0282c74609e0e6a1490a92b262ad26d1d21dae977cff8795bfa3c1f85aa43fab13a88227394d61d93861d SHA512 b8232b0e1f94039cef3ad4a0a35a972eb49f4f198749d2fe50aa3fd2a77614f2d24e51f3b4465243ce9140aed6bd048aaaae189a7ba864e3d23843e9be0c437f
 DIST concurrent-queue-2.5.0.crate 22654 BLAKE2B b490e76804e45d6a7af6bb4ec074fb370d9ec7cd67c7ecfb55d5ed53b9b437c174e678add915303559e902ac81c8751dccb2c5ef0543d5961713372fd2b08d3c SHA512 235704f9161dfac60d2a6d2cf96425e39c097dcde2f005187c1f044704eec66d8303d59352cd414a81a3ed0eed60421054b0070a9b8f69065a79a2519e913e5a
+DIST console-0.15.10.crate 36449 BLAKE2B d0d2f161ea045854f0f53af39490c37af170888241b2f63bb47749b288ac387e24e52f936651763a5584a20bcca3512b28d50cfc4435d97ff06cb5de20768e29 SHA512 2d4b99912215a1e7083ac4cdd594f6ef7914152c683f007babecde2be7f3d6c2a861a198c9b4306242d84722d44965185ba846041e2ef13ee9ee9a5d43c370d5
 DIST console-0.15.8.crate 36364 BLAKE2B 467de2c2fbfe31688cea20b338558ae9671e50ba1fd07983d21f32d7eacb73e565ebdd6ec5e78b2ae04446f09615c70983c0ee534e25ca5a28fd1b408acfdf34 SHA512 b05e49ed145785e29631d481885788f0cc5574d4d7c4d90280dfedaee7f8c1515072c9c4cfe6bd2e017230cd228157222af7e7d41a9fce697cd1888095df4de9
 DIST const-oid-0.9.6.crate 45382 BLAKE2B ac27c689784fbb1f486cec1c17502c8738ce3d7d1b579391a151cb0f0a6a0c8335e474d0a517c59230fcac74317396f20ac15d66e2f6685780be01dab197fd96 SHA512 b871d3b4326c4828b1c1d7a3e968315fa320e0b52e97081a95617ded0dc5b93d42b3f79ad26ff3b58a4835dcc442473f3965c2b60026412ad6aacc0c23e9f399
 DIST const-random-0.1.18.crate 6646 BLAKE2B 20e71fd7e2b0b9af663073a45d0224a4cf9a6a6bdab5c3565de88b4a66ff24a1b0f8c01bdbb86f5192b723c03030ae02fb86722be7cc41c3154cdc81f843f013 SHA512 e250227850001a3ac6abdda6e7bb88efeaec1504a54348a5ea71ff66c984455eb9181b2acfdc0b6c08ef6f51beb34b7ae7836e370d84d75731a2482226c5ed26
 DIST const-random-macro-0.1.16.crate 6657 BLAKE2B 44a3508e2158b79042cab698b1f31c50fa356098bb5f4537f82fe1b9e893d3e8eab59612a8957e524294ca0a035046468d799e4a0e9253c1464b68ef682f84e2 SHA512 8478bc65b0845e765a69e09fe4152e89f3e3970d2d92e4b32bb0abb7b918c725f325d4b19a45d2a462905bedf837b3a23f31b1ed9dc8655ca502de72616b074d
 DIST const_panic-0.2.10.crate 48359 BLAKE2B 0acea832fc22f1007a935ad64eb15a07321a0a9c6777350b3dceef61cdc6f6f1b9f038dc2a25881ec1dfc0230ede42fc98a37ee252625be8f0965e571bc14643 SHA512 840e7cd76a09502868cdd7f36c8598e2c6fad913beb58c7267471d5d1b1561d858fd77de196999acafa1d912ef03b61ee4b2e2daf7b87bfa14b691b73ec3761d
+DIST const_panic-0.2.11.crate 48930 BLAKE2B 131a9b02b0ab620d75a0e5489df28af9a5ebe960049f3e7a4b3a34d09470873c00c276c08f3e8cc2db2dd7257440697fadac067826a84aab94b2cd7a20123fe7 SHA512 9c98b7ea45d6343d95c9af26d3adb0d0a1ebbd9b160ea315f5e6f173a4afe1b4fca3984c72e845d40b067311b6ea55aec1280a28ae7c1e3e728fc40aab48485a
 DIST constant_time_eq-0.2.6.crate 10936 BLAKE2B 4fe46bfd279394ac8064662a89da8a5f7240ea337b3b43b6f69804952ed6370dc28979060534776e7f252f472e3197fec130529899afeb37f82260358900d107 SHA512 3c8b61de0be32647be4c64d2d4856cf317964dfd682c32268046c6d4fb66af5b3fac32dc214e537ece9b3a879685b1d87c47757afd336630cacd5c8b9716f8f7
 DIST constant_time_eq-0.3.1.crate 11561 BLAKE2B 9ac06a1b13da2aacfaa20d60e48df4f32f6462e4036fd9ec116c45a9bbe142a18b82cf18d762989876f31b745d98d52ce7e3d32f6c9700a500f16f00649b5699 SHA512 2b6b0d7572c02606b7c3780013fb1d1773b999a0d9934e4b140dd82f94e6c91d2ef82f6daaa1bda94f95bdf6b5997b2f0ea0c8eba8ca7e28a07d1e06b1071b50
 DIST core-foundation-0.9.4.crate 27743 BLAKE2B 5b695e671cc833170bc6bad436b2d0d8d386ffb8181bfcf2e92a1d93cee67c3ba1768cf57064fb91b0897c6aec1be7db40b5bd256a052c1bdaf872ec19f6e15e SHA512 82d0878a1b9e3d56b3666fb5a78f92c6f7806d01665c242c06a640bd6b1fd36260211e92dc05e1a16d1430622bfdd650aabb0b5bd8e5592f74abdcf412448e33
 DIST core-foundation-sys-0.8.7.crate 37712 BLAKE2B 0e1dd99a5bbb0fe92f55181a37426f6e86445cb20e355f553b3162c88ccc075644461731a0cdcd93dcca65b6cef1de62b409afbd73ba3070a199ab8e7422dcfa SHA512 17492d5314db03abdb3b1998bf0c396ec8ed0f83bc978ae22d6026afdc86c50b58cbac073b3a0d97b92da7e98be11302faf1249d24313494bc058add4f4cb63a
+DIST core2-0.4.0.crate 37075 BLAKE2B 89ad26bf5eb5ee48dff32d3b6b11e0a84b68e4f29c39fb9db79c64f3c445fde248b33b1ba9d1410673c3fe823ecca25dea637237c384b7cb419de9bceab8a570 SHA512 53c9d2599d87c37d8b6fc8b2293fc16928a97754240e35af770f7e969e4d91ffffe3afbb4e04312de828d1d43ca6c9b734e0725ac5ac9d74f252449ce296ab7b
 DIST cpufeatures-0.2.16.crate 13405 BLAKE2B 06d061cb2577057bd2afbc8cd6783488595701dbc46772533645d86aed71ba8b20905625b897840c90aaebb41360a286935824ca49bdebc0763a81df4bd64402 SHA512 97707ae1b533ecd3a6fe412a22fb70cf4ac278c2d7dba407fa7dbebd110d06f88a7b3aee3fb7cf4b0b5ca88f6fecf390c4d3e5ccbd4d18a75fc2f93a647e7074
 DIST crc-3.2.1.crate 15070 BLAKE2B 9d5f488b57bc232528cfb8d9ef33a88d25d904395dfac8dc10e864dc0d6c89e576585195a20db585fe358859ec50afa998562ad6becf6fd2e505f3969eb36ed8 SHA512 64b7272d8cf55efe9768f9f3218f83302ccb59458a56fe3b7b2de1a53eb5a3b57fbf268647fdba5b230cccdd4058462ba583d76870ba12cb1057ac2787f181db
 DIST crc-catalog-2.4.0.crate 10155 BLAKE2B a9c3ef81871d72635addf1ded611fa6e963b9b128dda198eaa3a256512c8759608bae95df95524704aeb38f81e2fb6c2da2e29e306a8ed3dea595e63cdf05638 SHA512 25536456fe71c44fd8ec527299339c1d186f6e12f1f90142de60eabce337d836c2497ddd6307473b57a6cc720cfc8e29b059f378c70b8165bc171420ccb40a29
@@ -127,10 +144,14 @@ DIST crc16-0.4.0.crate 9571 BLAKE2B 2f848e7a00e860d62a44832adfaad655e89dd6e46b0e
 DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd SHA512 c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266
 DIST crossbeam-0.8.4.crate 10500 BLAKE2B 03212d9789a66c1eee7d1f4c7883eec1267089ab9d652ba5d7d59a22e04ab878e5defeccf8cff4587a34d976488ffa689bffde596588057d814b633ab3d67d1d SHA512 63650fe2d46ff2e593342b398c153facd3cb7cd72dac9b057ee0aac5ef5e9dd9df0e71536d66879676c0edaa89787d1f365eea35c82604ca46090e527749f994
 DIST crossbeam-channel-0.5.13.crate 91174 BLAKE2B 7a9aed6f4922c1d10e4ae12508a03dc7daca773adad6a317c4ea38e544d7c28c56a06623d958aec540fcaa86fa9051a1aaa2c859dadff72873f18f2f3a951449 SHA512 0f31223a7099f84e39e6b76b19cf26736e0c3907fffc2ed3eb0012c7984b1993570bf6d155eba5bfb82897ef0e4fc93b89096071410bbac256ca6be9a9568ff8
+DIST crossbeam-channel-0.5.14.crate 92728 BLAKE2B 0da1bb0f0dc6f35c4ce8d4bb058d61b7c3ff4854f71b58968edc691c1d7016ec845f27e2fffa34835e86f19fdf4507275b013946b2fe3135dfa83d328ecb5199 SHA512 ab3448f7adeccab3c1d988746c3db1fc1e8854a53f7b5cad63fb7874e5b6f5663d34541d4c5383472db56a7c8b272fddfc78ea2ac1792a18d6c8230dfbabad45
 DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864
+DIST crossbeam-deque-0.8.6.crate 22471 BLAKE2B 02b854df171b0430ca8a40349674ff251698d0c322c317055da8678da6661730c945d86737fa4947c3bd824ffe402271ee2f77fd6a505d2d46b4a41454c510c8 SHA512 9368c0c224c4b84356f1d422d8869a5ab4bfb36b0ff69244a9e7a7304ed51f034001cd9b2bc35849df874d36ed34285c66574943573522ea32bbdc5a05df6989
 DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2
 DIST crossbeam-queue-0.3.11.crate 15581 BLAKE2B 91b9797f985af06c854c38b8124cb67864bdb47979d2e253928678118515fbc1257108c7102bad66e1f65fd6f324a93749dde86b4ea28f3bb5a16491f3f56ed2 SHA512 c6007307ef9d219889e6244805ae759998396e1d0548e3664ce9ab366ea78917dee75251c4265b0e3ef4ab15b5c6d42d6a5e9b286d17ad42ec169e7fcddb8ffe
+DIST crossbeam-queue-0.3.12.crate 16270 BLAKE2B 75be9d53340ab72e5e52c940bf6ba5dc417d3245fe18c456ca68b460c7747f7d99340517fa1387c7153faa8a0beac002fe3eabedc8638d044e0c05f4c5b98d56 SHA512 a117977e55c0c2eca2a6141e3292dbc75ae5d80c087f0667cd767b9e9ee0f9c87084ceab34937b66b28a586b071e518a483684bb041e6410b2c3ab5924bef769
 DIST crossbeam-utils-0.8.20.crate 42487 BLAKE2B b50da06721cfbfff07825574feada8a28d3814edb218434288683eec31bddabe2ffbf7e5ef1281ee14a8a77c56db3b66f3c5ceabaea9c72317c1bd2cecda0c26 SHA512 7175eadf9fa7c526fa11ff87e40ff203f0e7a4bcec15cb972f924f3c7ff7cc20b6e2e8dbbc1ede142a0207cd2baa4f446deb25d825d28a54cbd25c263701bfaa
+DIST crossbeam-utils-0.8.21.crate 42691 BLAKE2B cd9015c41f532eb3c90101603f32d383f01e6880718b727d6d1fe46872ae276cda685e1b548cf77dd22bb1a05f0d4c4982332c2bde90e1743dbd7f51919022a7 SHA512 6f4aa7ca10c20da291c4714b56ceb1fab1c06b03b2f4e28e474e9aeb95ab6615a25462dc7819713652c3b5f6a06fa0f24ebc92c533fcf35dfcf2655857d975f8
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST crypto-bigint-0.5.5.crate 83384 BLAKE2B f688f22331b4b3620299ae9b50aa9ba6e1b2c7a4ae55e4236f7ccb8ddee4f61950ee0332b6b67005bad505434f3be74b1a0caa426036dde94162289c6926c8d4 SHA512 04668d432b4169154934d55b8ab14f708e59f70a70704b56cd72ceaca460e15589965aa92a22bef20b32ce637a423cc6e1a8819dfba38a32353bd749f7126021
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
@@ -146,12 +167,14 @@ DIST darling_core-0.13.4.crate 52937 BLAKE2B e038aea27b5b56f29cec8874132881ef589
 DIST darling_core-0.20.10.crate 65015 BLAKE2B a94adcc6092a7a69728725ec4bf4cb7c163bc3fe0890f272bba9963c256697bbe1ad964d58a975c80742019c59d4e1b3e56e624f938576996e216d2f99e21f2d SHA512 2b971156b8c1433dd0ddb2213ee522e2fe9968a62889285d1457b5e733daa70a09c21bca9b8573d9c742026b4c06f4dd2025a6a196ec0b08b25a78d8737dff6d
 DIST darling_macro-0.13.4.crate 1910 BLAKE2B 432adc44108cce6a13adc9ec45ff9b7555eb4c0ac7f1000fdc8f8e9d1bc0ecfeb65b78f81438b097946aed8e37835f82028c1b16c1d466a124998139ae854df1 SHA512 908ea6459110da16e4ec6ac843659664ed4fa3fb2ea9b92274a738ff5994cf81fbb48403db609b9a70f39c3e288da4358ce369c66821122e3a6a0940473da94c
 DIST darling_macro-0.20.10.crate 1874 BLAKE2B 29cbdc6bd63e4eb0731c8f8f0a50cfcae9a88f116f8cfc0068e5d3cddc20b42b7f0f20f128ffa0f7bcb8d72f0188b04b3838b8327fa6f3ab45de4cf5c3bbf317 SHA512 565b8d535248d9d88b49a58e2a210ecc70f1cd39bfaf029ac6576a9b2eac70a6b18b4930aeca746d76d53b745c6aa82172bb341c4844b3757fc7978732fc2f52
+DIST dary_heap-0.3.7.crate 24076 BLAKE2B 917b6f0a9f00b117e37b43cb2979cb77c6bb3913e4e91367d79ce51787caf8d78e1fcc92d26d0290e938837ba6e649e4fe150dfe5626f0ab841c36b7c44869a4 SHA512 18301b9f6acaabadcf79e8c05953db92412173de2474583f8ae0274d7ff73c2a3440a8f93c398e2847db5a84dd0c373d7daa6c0e0f0a185578a6fd10f3450f25
 DIST dashmap-6.1.0.crate 24828 BLAKE2B de8632e7e22132fb2464653cbf6d928d7f2abd8e7352a50e6fcbf6b522aaec67ab2a7618cdd34f0d48d0bdfbef026a1515d5ada98ac5b123fc7856246e392968 SHA512 03a727e41505e5e7068df8fb27fad6d348fc14f6b1609d7f606fba765fb92fec7fb42c6427bc11d057ad2ad52d1b44bcf5a802651765148941ba41fa75968cb0
 DIST data-encoding-2.6.0.crate 20769 BLAKE2B 9d5713e63f6f6a4d6e5324fb0be9308a231ccefa20d69cda9e19609a2250e2cd72030ec28309068f71c932327a3ef680b749125658e27d35273354c3465f9931 SHA512 a685c7bbd251a5738b27ac3ac8121a0db049221510c99e0ada6f245ed7499d04ec29d725ad01c688ad283e3d2d5aae0751685c804f6d95cae84e63a160d04c9c
 DIST dbl-0.3.2.crate 6336 BLAKE2B bb912351efaf270363c2a6cefe4da42ae8c6a552690b566e5a7b70115721efd2ef42801500d534de0245b6feff5b6895bed74924c86eda3c5e9a5322f32e1392 SHA512 efed499069e1eacb709598b9a250be353d65dd9a1a27c7fac6d23af6262af0fda60b121c283b9318f301be2d80194ec1ce33733daa554f54ed3f690478d37cfe
 DIST deadpool-0.10.0.crate 31997 BLAKE2B c5ca6045700c38a2c1581c45c782ff4920e28833d520dc2f8bba09afbecf423e5d29bc1151d21f9b394bfacb5a92077ec81d1f981d77ac42d5ea618c04ee93f8 SHA512 cc928921af9c0b3007d71e4951d9b1a63ef24d29e6d699c99a629eda3b75700eff9cb0fa7043263b96090e0ec5438749ed552e676594982a5f72ca7c24f34a74
 DIST deadpool-0.12.1.crate 33054 BLAKE2B 06712612f4efd78694b52ab2de7fbb4b48b308e522b4fc7849ef8fedea5bfa84aa790656b3e44bd012814494bef71fec1cac1d19e031ef43c5d43786cf4c46a9 SHA512 4df9fedbc66f1aa7b2a83c730c66f4d7a1041ee2bf3d50a3217b45fefc4502b203166fd77ac5fbb8ec878d95c412d3530322e7f1c1b668cb4f02661d800866ee
 DIST deadpool-postgres-0.14.0.crate 22259 BLAKE2B f9c9b9b762dc39766479ebc36f585df191b26458ac4fd53bd9703f848a3eca26796470b0524c9676c8622da4e1c367c3983ed2426ab0a956f9274e5876b5e6f0 SHA512 d7fe34d14f97a2c4e892681999911f18147d0cd04d1b9093a15545df9f8b4393803d30f752e00083007f07ec8f5f4f143cc409718272521c746bb465e06a2595
+DIST deadpool-postgres-0.14.1.crate 22351 BLAKE2B 63f34d4fc29c723abaddf225e9701cf99ef3ce447c7f8f8b21abc729260b64b0e16d04c3ad077727f0f360f09ca03febe06f96071de4f9e01f59e8c88141b2d3 SHA512 9532442c19c3db92602375b7dfaee64687339242161c5a7b2ac105ac7a58a3fccfdce0b034649326af98bb7470df74ba831a34f07c202b5e1a30b19ce1ad0af3
 DIST deadpool-runtime-0.1.4.crate 7664 BLAKE2B 1a9574aa768115ed77e4a3694b4227a8709a1535b67a7fb1f0c847b704826908ce402b5891bf54430429b247cbe467ce1fa499b01001dfd5d584ff92d3333612 SHA512 830da91a0f7d608c6db5982d39b0c9df0660adff88a7e6a6b7216ccd366701b1aa5dc23f3e7705685ee881b8c43b689934cdb5ac0d4c50f5624d9e05230a120c
 DIST decancer-3.2.8.crate 64647 BLAKE2B 06cab1141cf9fb146e30dedd8f9f8940c78ad00cafc7f9f4a57dcd677cb3d90fdd11cb045b6511c04b0623571a311b44e73d133736882bd28fa67fbe4c892f40 SHA512 bdc7027f959accab68d466d60b7a3ccf9e065d6927d6a45487d27430d42662bc538588fd6cf6433deba7ed04d7bffc3a5bb3fc3fdb25749a226730cd775df8b2
 DIST deflate64-0.1.9.crate 15104 BLAKE2B e0b221fb309a56d5172738a09d83e3bc51fc5629db9a4a7977f4c05bd3ed67ddbc246141df8edb65fba7cfee3da2e931f35fc18cc6039b67a9b016bec94c473e SHA512 7b91cb3c9f37e80dcb7fb86ce29e29b2b803e18d6e5b44d0dce907978f439ce9547807b3d19f8172053ca501b71e701e356a889756b84c4c158c3c596c46508d
@@ -193,6 +216,7 @@ DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc
 DIST event-listener-2.5.3.crate 15392 BLAKE2B c56ed5eafa64014141e869dcf952e86f755eb35ed1722f8139260cb502ba226351ed1bea301618e94c9ca7f3309747057eb5f7d7986cfcdb7f6b79d13d52b439 SHA512 ddd67c1139ffe2aba95d763b73db0e2a9985dd2e57cf8f72030047d53d46d833df4b4192730cf0af4e060ce52e4f2df23aab6509abb94a6cd02e0d8cc3559d22
 DIST event-listener-5.3.1.crate 42576 BLAKE2B dfd8020527c06adae338e9bcf19076e70ae745facd7b49e8d6604e8508436b70b48fb1f4479214998f288055447186d4ef4969630af90e301103bc5faf6492e5 SHA512 98b7219a3959d6225ee5fb68e8b9d284ab03334d895f52a71f673e59cabab1d06a0abb9eab905e8d38d5f9589725c7c598355ae3c909044a23bc5830b761f5c0
 DIST event-listener-strategy-0.5.2.crate 10697 BLAKE2B f49faa8a2cda551b65e29b9dc98e4e55dabff7f2b330097bf5f6a5a5927804a99cb699d1f693db9c7cbd92ecb44f6c1b51be2b86810d3e3fbfd5eebcfad1a241 SHA512 7b3759d07c7936b53351172e38623658cbe642f079426c99e7f9187ba1d7f8cbbe7530c056cc760909cda4e70281a50577caa41426164b4c8d6c3f4cbddb2626
+DIST event-listener-strategy-0.5.3.crate 10920 BLAKE2B ecfa6387d9f09ab8fc6d7bcaaa655fa69f7d732bf40c16549b12074ffd25b1d9e6ce19f7600d1be615ec72f5fbda85d0c9e0a19bb5c0cdd9020c4b9515d9f778 SHA512 f1a14f69afb9765a317b3d7bda505a28f050a7594d6b07e5263d635b806d494ab41c456dcf38ca924ecc0595be0f77e32ffe239107fce1cc5b71ee7249419f5a
 DIST fallible-iterator-0.2.0.crate 18509 BLAKE2B 9630fcadb2f30fbd8a2a057eb992bf33c0aa2d163e6fbd43de9c8c350e3e932ebca79a6576b215e17a0566898f6e37aef806a643d20c16a6aa73ca515fcf30c0 SHA512 c558fea3fcf3a7756acc0b63d38f76dfe7eeed4dd9c12c46b7a7e8b8bea64d00e0cc115492e8b3a1a19e86e6083477dcf7d2d72ef960b44f24d61819a3077e79
 DIST fallible-iterator-0.3.0.crate 19639 BLAKE2B 58b8fe842fd6514fa4327eacc81b157a4a9bec4ad9b8e69248c0f0aa5610dbddb9c8a72e6e6ef9fb8216e8f79e6aab439e90d4d527e35634ab222347cbe39974 SHA512 c655918fcda5deb8ce792708509e4959139f113c1006dd41b94d7073ffc204512a22cdeeee05c87534db9c414da3f4eb716e1a26970646fcb1c139a14eb8a2fa
 DIST fallible-streaming-iterator-0.1.9.crate 9249 BLAKE2B cc4459b34a9ad00552a5248d090d1f25804b92838f41131e475abb83ae0b89401248feeb52a49dbffd499ccc0ba0f2f1d044f2f3e9b06662be01fe2257a4e885 SHA512 34824e2007cb944eaf54b10d6d3885bb17ef2a2976c6dd7695ff82a937cc95eb65d343dd7a5cd2fab5aa5859faae3352a9e1c78f239ff736900c1dbc3f5ef7dc
@@ -206,6 +230,7 @@ DIST fixedbitset-0.4.2.crate 15954 BLAKE2B 91270883db5ad0e999ebbca1123d8729d3040
 DIST flate2-1.0.35.crate 109188 BLAKE2B 8bd6e51c3bcc06044e5b8d7ead950c3beab6c6337052fd48e86175f0fc98c8d12804274308ee515dc6156bbedb2277dfa2706cdcd7baaf2a789122473248486e SHA512 aa2c4f0ad46cfbc7d2bfbdffd226eaa37f5223a34d132d8fb2dfd04c20d15a96c4882cc377fd72afbc7d13e512f5e9934386b0390a0ab2b171d081335c58fad4
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST foldhash-0.1.3.crate 13712 BLAKE2B e5913d3aa493d0176af9650354d98870b7e97523ca743a7d9605da3f559463654f391e42438d96fc797397ced449f13ce499c20ed5db7aec772aae97c5f29175 SHA512 844d5b699db632254dfc378d46e34909637118647250e2382cbb88855f6739fb9b5f1b840bb8e250dc8fbd2a97c9155e5d8fd0c5c760b8e02dd0aecd96818a5b
+DIST foldhash-0.1.4.crate 13764 BLAKE2B 7dde82c52671b93d91b2ec9984c0ce539d89d5c80cb115c0db18cf72f84f4fbbe4f7b36b745143102fc83c307df2cae051e4fb461a3131f52c8f98172fc0e72b SHA512 096efd30917c42e75e162a79d5c0ef068af76c7b6206cef880c4a3af92d096b4b4a1cd3de5b66ddb040730d58678c9a651734517dc8a60a265ebddd5559b95c1
 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-data-0.5.5.crate 25339 BLAKE2B ca5a19db317f4830e72d3efff2beb0396cbcca821aa920464a8197e5a5f96feda0b1b6b4c0ddacddb884836f8595da7373bedc3246c04aa2eb0a1a521d2a931c SHA512 522778535df66fd485a7d9f544d91a3f16fab12b88639e0540edbc67d8ce26f897fdf200b450218908b30bdc1ede81407fd9ba92f021bc393bd93ea78d04512a
@@ -252,16 +277,21 @@ DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc447
 DIST hermit-abi-0.4.0.crate 16310 BLAKE2B efcd1dee7bcd6d185cbe0051c7bc7e2776857ffcfd2adc3fb101febd7c1bd75994b7e4a4a0a59c5b4628cc2521b4c1f043e98a0c44935d0180e7499667690ab8 SHA512 b1a21f6d54598185a8e8c29565ffc2e1bc5da57cf1c9d87ba643d23d7c23d53e8ad36ee2f5c1ec8a504334b6f98b0f17a832ff37877c7b7f9238b196f4034e6f
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST hickory-client-0.24.1.crate 37830 BLAKE2B 5b996ffc2d2e10edec0fb2aad9f361be2383c2adc2524ce583ffc3c43f3cb0a49236a00c70ff10624b805b41f20016c12d9ac97281fb79a16fe1710868f91287 SHA512 b47f6e7e237c803ce0a1ae7b034e9173b64b9c4e5db74259348e943004f5a506b36c57563590337755ad2eb411524f09593d771f3d2bb66eba225a7418ee0792
+DIST hickory-client-0.24.2.crate 37573 BLAKE2B 9a0a0a055e02a3db4893163f981dcc293879af323374a934ba719f306a31cd9bf7e4e839e0ce56155c07c112db4580a978d0b81b43585f127179c061b93e5e5a SHA512 ca819f9936af515c31e646a337a9e73f67a02e1991a56a07015214786f77ef891a2a20ec247c151efcacf1b3d93ba526552ff9c58944716aa65b138f49ef7aa1
 DIST hickory-proto-0.24.1.crate 374410 BLAKE2B 342ac0893684c2f350e4e1e26d37323e066782ab1c37db41f00d97b47856f2ff9b18c216fd162884b330dfeb542d9bd4da1eaad05a869d83f3245b5e6d451ab7 SHA512 9b14d8f4763b8034313ec48f96ffbcab0cbbdac73c0b32e04eabb5a11cfbb3ba8c6d2a84bff5ce2b1a625db5a76be895929a60bc3582b56012c736c897fb99ba
+DIST hickory-proto-0.24.2.crate 372860 BLAKE2B 81e36f8e86f3a9884e4e22bab989d9183e9efc53c57bbc611cf99549c2dd083fef5f4f8f982e72147dc4c64c313be5d6fa3c56c8309f8384518ebb3df3c1a4ed SHA512 f3ab93d60f28ebe85225c55b27abf43613e73db645699c8b8291ce8cdf76dc66bb0160ad0f1dd4b3f7e01e23d05bcf0fd702f2753d72ac0de62c5b5f2256f275
 DIST hickory-resolver-0.24.1.crate 91134 BLAKE2B 9a0930e26f64317012e507ceab8b06ba44a367bc32bea7d0d58cf27a6980a6b82a66411cb629a576a5890a1d7ebe8717634dba928f5d420094d4f1f971f215d6 SHA512 f24e726b4f6b884be6d5072d030e4f542c9f25bbdc594fcb68f2003aa6425209a51a044fd4e83f2ac4746e67bd7a5fcd2b6b0105e5b63fcfc777dde173029609
+DIST hickory-resolver-0.24.2.crate 90292 BLAKE2B 7b09d1a954d3aaa89d2b44b180ef922da3068505432361b1f4e522bf386d381dd788830313b3257c169d74fb0d3363de46e518db9710ba83c61e34bff007fede SHA512 8a6febc9036a163a5c5dfe83468ede61121270763ea8d672bd5e32277becf84789d32e62074dedb49fc88a51eb19589bb0b489620eb77a3d3b6e61df21e9171d
 DIST hkdf-0.12.4.crate 171163 BLAKE2B ffa03876879110dcdd3081cdeadc9490534c44763b3b49f1d6a5f4407a7346e6fa1ea18303f429b23adcd23e8898ba8fbf3797f5ef9f7ab7b11499d130311d68 SHA512 a43fe20b7d14fa26b118c6eba2b84219645f65f2ff33fcca679b139ae3e96f72abc1e7a47eb8887aac5afe4e34211434a4eb5a2fdbc014666d82c4af340a4b21
 DIST hmac-0.10.1.crate 11120 BLAKE2B eabb92f1f276f2397f7e28d306f4bc3ef0928f83b4b622f120dcf1203cdd420c331ecbe430e8f8424e6709523118fe01d425712cb8e520aebee620144f666834 SHA512 ab61133d280fb1b149ad097e29f6028a1998475d2f1995e3ed4f354a8fc91eaff01cf9437a13da637ff433fa05b43d7b144b5726c1edba1130c7004bf18b1c3d
 DIST hmac-0.12.1.crate 42657 BLAKE2B 5d432a666dbcf9077a98e1f8a4aaa3afc88f3d88553cf7a2356d117c66f38efafe686c148598ad67ae89d64ee3edf56387a6f89b75dd9ab5eee63e13953dcead SHA512 77d4bf51f4633a8c36712ce3178945141df31cd645eafcf4bd130b8ecd7cb498bf1ee6f2d9c8dfbbc9f97ac638919fcc81bd3ee600a1b27c3be3fa87313aa0b8
+DIST home-0.5.11.crate 9926 BLAKE2B d9c0d3660aa7784f3a26f3930a5ee35dd50cd15b7e252d930240ff9bcb70fdb0169f78c02b5fd82318af8c398d7139be18d2e9675a1b85c7845c90266945da1f SHA512 cd107c4cee793b6db8b29157c3aa2629b5ef1b9fe129fd903fe414faadfa06a881a1b685f1c66fa5aa1deefd3013a210603c952bfa4bf02d5d1f90f75ba9ff18
 DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
 DIST hostname-0.3.1.crate 9272 BLAKE2B cafcae4bbfadd51d058e3daba3e63d897bc3418723d8e843fd941d9663dbc89dba131c77d14ce7a5da552650ea3c40c4e418c88d465f1bab2fa20c178596852d SHA512 a90407996353c9bcf5b76be03713e3a0455ac80a50892e77a508744cf436a938ddb87ef97d8cc91ec7dc4353cfb7bca0fd28c90a72f8a9ecd4f29220d174edf2
 DIST hostname-0.4.0.crate 10632 BLAKE2B 85c1b224aa0de4c64a4c56dc284145c50bfe3ddc9063e0884de1cc994b38931552229c57dfa832e927f816df0d93d7b553bd8b4ede582939bebc36c0acf451a8 SHA512 1365d02b3c438d467cee0bb704e98b601390cfc76ff290da198d6c1e85bdd57db5ea07ed9d14b35f4b0cb3c2999eddda69667fca4b01ef3b6c4df1769f0abd21
 DIST http-0.2.12.crate 101964 BLAKE2B c35c2ae5f9494cafdfacefd778b4b6824588e74685fe5204bc6efa87b667d00b28f59cae667115fe45ae332d8542e7a0c2c7c42fdeb302302f89b00cb716f380 SHA512 e32dd4600aae7e26f1d530871815b30fa0b9bf95293005649bd9a7bc4df7f69a1d8de503d1b8873e67a5496e644d0a47db2a0680fa1e9058bee4dcecccebee58
 DIST http-1.1.0.crate 103144 BLAKE2B 7a8c4ffd3ce664e1f575bf4042ac0f15ff42b200fa8c6aa27a6686d77be2de7cd3df242e36f8cb45cdb822bfa96011d5d5dd7bb03122ae5bdcaa15bbf9d40051 SHA512 1c29f25a8895a69d815e21df427dfff7924e9040d01c55cc3256dd0b5e72b670fe75b1414223fb971c16082e4b26217142628be5e0905994da4f08b52e7f4a33
+DIST http-1.2.0.crate 105932 BLAKE2B efc9fc4ccc4a622781ed895f77c1752baf34e82d249acf97687ac8d4260aeafb333040833d9f8df5916cb105cc8217c8f27ddd021636b9248ad551ebfe4d83a6 SHA512 2c8e7234ec3aa720c9dd762c0bb06367fbc39ea89446fc9d8d2e55052a4ac461559a20a8294c877879f3e94d5db06fe41e2cdbb9664ea7ab1bc8003abb038bb5
 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
@@ -270,9 +300,12 @@ DIST httparse-1.9.5.crate 39029 BLAKE2B 3318ed1d82f1cc52cf3596a133b59b9613fd09b6
 DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a
 DIST human-size-0.4.3.crate 14757 BLAKE2B 45914e45592eb1cfa116ffb7b2ae82240218757eb4ba0b3f07194667ba975c4f3aaf4f6920d7134fb4c69a5f2d8b5707d73df7d7e9a19d01b7fae273f5340731 SHA512 d4887450a7c080ca515826e400fc3f93f5b604c4d8b523815bccd3b952661379e29505544d684385b2ebb48b88dbc299018ca8d4540324d3c7cc2f73c6e2fc99
 DIST hyper-0.14.31.crate 198190 BLAKE2B 155c55b71afdab6e83cf099d011527235132f345879fd1c4035a76846f148c913470952b1ed670cc406818cab366e5f30218552073333473445ce0abdcb3c033 SHA512 b7319c628b368c8fd85590afd0194802405fdf54f91a678fe93cd3ef78dc8297e8af6ac65102281adb13a1b45d65667c96bc05083c1205f64d2a48685bd935e5
+DIST hyper-0.14.32.crate 199622 BLAKE2B 05b0a2ac2c29157cf4d6258fbf07d871fa9d29b7f453d8d8fda9700db1423f6ce9c0de2b30ffa1faac877279bee75a283a81c2b59c6e429a7e22a4d5f1f49913 SHA512 d2b1d713a3ddc8a469ea344a5e7732da637bb644c2d999bed8e8b00b602742e193e553b9bc77eb58017ddccbc4217b20651e2b1698ac98568e780bfa3aa1a819
 DIST hyper-1.5.1.crate 152653 BLAKE2B be470a4a902b464d95f30e656f0f54c8a426308f03f118aecf583a1994fb12ec8229e09b43168d856adf6d3dd39d8dd0f97945d4202f4badf4a3076eab1e4dfb SHA512 ec90992a7569e8e7fb3e4a9250131a272851ec0938da48730198ac41347f82e7a308b1c4ba8b864de58ac849367d4360dd2d8a03cde58b330329949e87ff85d4
+DIST hyper-1.5.2.crate 152817 BLAKE2B e5e1cdf2bbedc51e076d6084261b6c4462495c5e71ae230251758b1271d7909b612ceb97b7e5a83e7668ca5af0fdf3918e3cf02680dc75df609ae7b16734e579 SHA512 bbf3b72650c464b8ce36c96e25dbb975fc1c28cf2a78315d03be8e377b505e57534dda4ce600a5b1d57ae974ba869675ff5bdc3e80c8721b575593fc12b55b94
 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-rustls-0.27.5.crate 34660 BLAKE2B de261692fa4765f3ffdf8c384250532a0747b2595c41fbbc1a01c69c2c8a68a87656572f70228ecadb4aea04851ea6e7a0ab7077d6ffbe75b1a15805e64fbcbf SHA512 6a2451be2f42880978b0236385e8775fdfc3f538d9642c7fd6993ce85b16d623357f97a8c2a328e76e31c76083a8be557a4e7447f34aa52b9e990f4c9680e193
 DIST hyper-timeout-0.5.2.crate 19222 BLAKE2B bf1714bda5cbcea30e948c67568c8762074cf9bcdbc57cb68f50fa5228576b4e6185f517157dd42e4f6b8a0f59dd90dc606527c4a19208cdb04af89778b5276f SHA512 745a8e3a2a104aa1648f82a1e0c2eaeaca4aa63bcf5d64a10a9f03f5273c73010953366b29d2945fe506f4f1d3366530431e78c78de716c02046b58c3e9a8a99
 DIST hyper-util-0.1.10.crate 72887 BLAKE2B 9d8ae7445ea56505e19f57ad680020b748e943a5cc3eca7292c06d93be1b58499db5769b214687aba53a0e9aa6fff3b3f63d1623157350ea826cd2decaf8d0aa SHA512 0a16c5d8857cf522bd53017dac50e530ae685c512eb55221fd6808299c7d716815f7b8192f8a9a504421b938cc0536bd497c7388d2f70ebbd91c46b644496b2a
 DIST iana-time-zone-0.1.61.crate 27685 BLAKE2B 2091f0bdbfae3f63ff846e27136d9779a2d65f85cef899ea3ab0ff7c987329e6a584cf49c57de566f08e0277bd4981ac3db30ea0cec6a6757ed50d96e2c6583f SHA512 d16c67f435606334042c3a286350db46ff3409f142c0782509b136150b4069aafff0dc5c2ecfb7519dd8d105b9a2e6649df2a7bec33ee3966dc94034c9d5a1c4
@@ -293,8 +326,11 @@ DIST idna-0.4.0.crate 271429 BLAKE2B 8b81bc4535d2e8a1100ddeaf6f43c043fd601ee3b37
 DIST idna-1.0.3.crate 142515 BLAKE2B 6835a64772e5d301c2456a94f8f5f40ebe6828aaeb1d48e3fbe015917dc3ef95ac7cfd0e1f1763e23950482f4b46ef7987928c8dfddebab63947d5a29fb490ac SHA512 e75ab18297878df11d82bf3623b005a3dbf7a6fa38c8f78830c219adc7d6f4ac07dce24a5f1186de69035ec316421319e487396cfacb053674137342d72a4126
 DIST idna_adapter-1.2.0.crate 8206 BLAKE2B 5e8d7dbfea699584542cde53039df9d8c3dd408efa2534f11fce7086f679872c45d9905d6b2cfe523148eda3bb0cd4820a7b14317f91725f3d9cdb475aafbd57 SHA512 1d8b54c19878645749a1bae768dacf353b07d266f2cb3bfa1071a7afb56ca68f534dc1d54cae277b777bc97e5986f297cbe2051a82e14f553ea73cd723d9da7e
 DIST imagesize-0.13.0.crate 17033 BLAKE2B b48dab29dd1f4d81c7c04df9434385dcca3d84f14fc4a706b3af74cf554c59ab93b9cd68dbe878fe2f13b902f6a210cd44678d861ac6d5602506bfaf4f8ad697 SHA512 a514bed07f2f4252283ef2e79036981a98bf6fbf8ac3093d98d39c7fb11b855d781121dd410a1b7e5893792b0028af60d92083348e7056e6ba9d006a89cc3530
+DIST include-flate-0.3.0.crate 1072081 BLAKE2B e672b86cc90c58ad6419450c5275ca0c36d703039af177e2db1c1954d1b8eeaf62d09609e02b42404486f7bd88a5541bf34a2957c82df29a5cadeecb3da81113 SHA512 2aeb597b7ecf456b70da0a6a700eea7f84449f97d9a6cf220e237fa55e41b84b8606477035eeb6d41e36b480d825aee7b8415136074498401847cf6cfa2fa1b0
+DIST include-flate-codegen-0.2.0.crate 2268 BLAKE2B 7040b22d131a081e8912e3382bf45090530b6a1cfb63061411bea690865b6a97dd8a52271c3640e079e515381b379a86bf30ee2feff05dd8809a77370a056dd6 SHA512 fff1718466fa88ab7569c17ebc66ccef340f0d4a1fa185b671aed8048332b50e93338afac7a1469eb76aeda14c429d25a5eabe64e89a3a520f0102369997b970
 DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
 DIST indexmap-2.6.0.crate 85204 BLAKE2B 420a3cceedab93e5023b476f9b6b93e57057238425d4095de59eb9490c2a088193873e643dcad2f739e34e5798baa9a18939424cac1afc5fc7b93ae496ba188c SHA512 c870348691f5acf97e7bff25c805e60f2e9db9e3ee7b3b939b7be45b6bcfaadee9880e6ad27adbbe2545865193655b5fa9de18487b7a1d030017b2fca48616ca
+DIST indexmap-2.7.0.crate 85335 BLAKE2B c7430ef510738ac5fc4658f3e4d927ca5cde780774a07848791ea87503be09fb4677c52803f6cdaaed73eee600f47e0595ac3db74a498947d0e180cbd10fb7aa SHA512 efac370b9f365a49489aa2c5406eb503044a4df7d6ceb772e0191b02244b6c2c1bf6c43ad4c8924160c1a2bd76d46c630b500a1c4252fc52366295d1cb04b48d
 DIST indicatif-0.17.9.crate 65246 BLAKE2B 9ce758e7dbafb3394d632a6fca910ea3d1237309ac9bad0ca1236cca9563abfc442509ca96fda1cc7be6916875416cf2b85390c53266f59bc18c6589addbeef1 SHA512 a0d798fa86cc4b75d080bd233e274d6554d82e1532b3590d27b9fcdfdfde4da2717afa16ef42b180ca0ad43ad151db8b0963890de106e36b6bdf07f87a519bdf
 DIST infer-0.16.0.crate 18830 BLAKE2B 4ea9a8f5ace677aa212007dbc0c559f14857b262ea7ecb4f6a343959307bd06b45e213e80f26c011036caea3f7b4712a6aa4bf345e585f39a9e612a244b5e538 SHA512 0cd54ebcf35d8628d8b576ec305f0ec5884c0578f1655764a34c1eb6eb0aad830f7b737c818545c75fcd404afd9ffce62d431bd0b5afb2cf01beddbf4669872f
 DIST infer-0.2.3.crate 12401 BLAKE2B 8db9c350ab57e2b17ff4a698827f25b100c75e881d6dd9f82264e304cf4065f34169d3d1b558ce760937d92d27174dda4dd2514df06058c72f5e002b7b3cd057 SHA512 ac349efe070df8a0e6ff50d233882124402cacccf60a1279ac3b0a43289297ddbcc964346f7bb60ab8e8022a6aaedb42d9f0d9cb69ace0d112a31bce4ec381d9
@@ -311,13 +347,18 @@ DIST itertools-0.13.0.crate 146261 BLAKE2B b23d59a87f80d24925bc868c0ac7abb6b9d05
 DIST itoa-1.0.14.crate 11210 BLAKE2B b2d33dc384757963eab3ae7d80bb672d828a549967986e3af8c70fe71a0ad46c4a278da2db4dfccef99e804e6cd4934067e97c0697a33ac3302cafbc46eeb416 SHA512 ea2d38df373652ddacccd11e610dfdad4e3ae7f0d476514e6ac58092733c817bd834e8cd88c3bc4178dd5a646ba628ae626195e0aa407e8534ae3c2a7b049987
 DIST jemalloc-sys-0.5.4+5.3.0-patched.crate 884321 BLAKE2B 36f66a53472f6b02aa05a5be5dd437d0668eefa5b058e1b72d3d5eae4aef61df55795379cac7560ae87e805d7e714581dc9ca9ba7ee9bb042976716ddb7079ae SHA512 b81c75efa70b869abe08c0805fd9545436ccd4e6ce24bb7355c1b3684a03bbf234af0680854f3fd9b519e7d59296d32ef04497a1f45584ed8de462e4e21d60c1
 DIST jemallocator-0.5.4.crate 13088 BLAKE2B 760cb954b24c705ccb072c21ce0aa699dbc3140141a44a037bb917e5e1fa45f831d103b5058d5bbba221c347f7148c7e6fa4e0395e68ef5e9b7fc2eb46c9e11f SHA512 23b0107ce5fa6a31cbe2cd07beeee973543c1e5f6f2a57fde5a313dfdf0b7138a0675fd00b1b4823d60eeffe02b9159d0261579c9ee4ce4246fcf799f9c1f853
+DIST jieba-macros-0.7.1.crate 204683 BLAKE2B 93b7a12ce25637c1d6e5926b6bd5aa0980cd61d4ca1ee2e96902dbc05c7517c1f0c080b6a5309590e52056b576bbba7b106b6d65478636504c3ec6304946a50d SHA512 d2477b2e415b048d96bf47b5dbd4ebde6670da3ca23ebac67ceea32ef2e9e3fe4cc709f2235bf257aab7eeb822577edb3739c1fb1e6955eed74e285cf27d83fa
 DIST jieba-rs-0.7.0.crate 4316099 BLAKE2B 4ccdd224ba8755390257e113b4875e95e1011e2661ab573960319fe26d816a658c99a76eaf49c4209d8afeb9082424920f7a047e402319d55253606bcd086547 SHA512 965c051fe4c638289daf671714cdf1c77280899dadb94520c9e24122f934fb38a7b1c33315e9dcb788e7d2309c48951dbaaaa79967db2a20bc37aa11ad79056b
+DIST jieba-rs-0.7.1.crate 4114286 BLAKE2B d3d55b1ea0ff119777e7c01997371b88a099fa061a9e6cfe6df713d68e40bb1d5baffc5ea04a988b2b805d5ac8567d9989bda1fe3487efe601daa1b875fce940 SHA512 faa07ba0af3a13f16d979e17b2de5073d0de44ad894d429180fca81adf14fd27b90cc644a88b8b7be6c0268899c2241fd4eb3c3ec9b8174c94e1153af24545c4
 DIST jmap-client-0.3.2.crate 74537 BLAKE2B edfc6a6ef8c62712e1c45daeb44f00ed6a804a1fb7a9ad737153d4bf3e94f9c49076924b7b4e5dc7725c989bb151dab445d2cb30b8674ee9ba60c8a0f3dcfe06 SHA512 cfda60b22dfacbad15f8cf2c9cbb432387784cd2fd82210de6d3ac68898e32abf079768ccf557f818fef4e0ebab04d1c947b598dabd31aff35dbbcb3e84410ea
 DIST jobserver-0.1.32.crate 27549 BLAKE2B 5f6556788d10af992fafcb578ecfd2c81698eea31b636d3adb7544e12155796082623735c8b10ac4c04d891d1acc307fb4e4ac3f88b2006e181013006f51c8cb SHA512 d4528113dd5a5d4a3765d55599a07e0998c69c7d21a90d2872679755ec4bd7726e9721af9220c36e1179b153ad8a39214a422af63aea15eaafd7cefc828ddff4
 DIST js-sys-0.3.72.crate 54096 BLAKE2B 76c1044b7684ccfbc06c6d43541fc39552c058fda5ccdcb7154c930d03f5260706ed42b36b305e56c5a0eb0dcee27180d3df3fbde92f3b7ba5104b0709f5714e SHA512 5a83d711a02bead2d9c05aaf8a7e3f351307b3219f4f6697bf190d9a9b36bcc10fd33ce0a334e4f3e251d52fc7411020a3631d0874097e9b519e839b713e1c42
+DIST js-sys-0.3.76.crate 54420 BLAKE2B 8d211aee6d8af87c339250e06e321bf02d2ff313b80505f696f66c43298e2aee8286076f2b291aa853730f8e1b9940f09c56535d3534fc7990aeb16653844250 SHA512 54e9a6be3f5a19021351d22d655a3aa55579c80f1453a99aba5989fafc7429078dea57ffebada4240b9185d3260d02f30da250fa539ac12c4bdda975adfe0dad
 DIST keyed_priority_queue-0.4.2.crate 16016 BLAKE2B 94941db8366772b2ef3fcc8a591470aff286122ff390482d6c66c27d23b115c0e6e78b65a9d89cc3615fe566d9efcbb30267c9d0386e8dcd3e515f6a886bbcf2 SHA512 3211646729dd549620688439444e5c4578caacdb4aa264a73766440d110e841f0b2a7847fd7def9a29939c03915722292e8f04b31c31a8c632912e10d09b8113
 DIST konst-0.3.14.crate 86731 BLAKE2B 3a52c2c7f83b51d8e0acd371f5f59221076d28cb4559670ab36b86e8c655b1edfe4157f4d2141d9525e9782da72b1595bc8082f2b81ffdc4b89155ff58e159a9 SHA512 5686418f885d2253ee4fc94fbd465263909ab5e5d8011b34ca54f5d8d36b4948584d239be511b3b34af006c812816ae392a3f3111b58eb66bc8d36f53e590b66
+DIST konst-0.3.15.crate 89161 BLAKE2B be2836afae019f333283b83b298a77e3532b6771df6c10ded55532dde1134ac270fcd25cc0caecd6910f8f01f92fecee0f90a96435635705a9bd0c2f0d626940 SHA512 e3aac4b596b4f344e37a1efdfc4f20340236e82e35478c818e72d07f71dc0b7fc4b7c715f54da75dcd1a8e19fd000678f201005dc4a29efa5b41bdae85db9aec
 DIST konst_kernel-0.3.12.crate 22453 BLAKE2B 467ced39e7d283cfe978a356f27f103d0f0c249f070c30b7e17642bfac7b2e14fc66e864b83defbc4a5a479a8616143ed0ddb9bcf967374203ebfcdbacc4cc08 SHA512 e0840fed817aaef44e6d71aae7d17bb4fb4abf1351daf65e72fc8b89b6ff5917c87017f75377d311b0bb23f7c9f12107c428b7a2cf3985253af2e5bf2a8633a8
+DIST konst_kernel-0.3.15.crate 22461 BLAKE2B 5af68770ba303e6c02ae8292028f1e07618a21d686afbe2baeb5f258a3cc42f3581b233a75ddb28579da3b9fc7a65d60e7a1b0a326bd9d520cdcf46a88aeed33 SHA512 b7e6d017c697c3708441796b8235b56ab2f5046cf67ab1bc96a4a54e2ed21e6655003c54e985ca05f465490f4f6c7d3b79cb004735d0c21bf16f406412618606
 DIST lalrpop-0.20.2.crate 240370 BLAKE2B 024026e9d206f24f3f0675f87a5d8204237c00c96331c3cce43f563639c2750f363b173bcf928bb69b3707917ef0769c9e174316b1c85f76e8fbedc6d0262bb8 SHA512 1f22f3aab724e720c7f78b268a9f6ee468fbdc7fbc0ecf83e0a35130ca56371aa2e38752e02cff5ddf0f003d5a8bce43c735c6d5ce09a3bfcda924f2c5ab0674
 DIST lalrpop-util-0.20.2.crate 15064 BLAKE2B 7304f30748afad37ac9be5f9cb890b70b0362bf889a86f7385e7e83a067e5919e42d85f892a018d255d0eab56f7c3b8fd9564fc5d24b657916dd915bc45f0a46 SHA512 91034c6d82a0a006bf35208f84503660d55170a36e38d5c64a6c0ceaa0302c43e268df21feee6b60b70723462f6e4f09022ce83547560ab7c51b5de0954cfb28
 DIST lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f
@@ -325,10 +366,15 @@ DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc524
 DIST lber-0.4.2.crate 8107 BLAKE2B 90ed15da1b8c6278bd9559297df383fae0adfa82ca47f74945e777b2e50f6c7727dc2cf5a1633cde1df8d60e6724a1b3822402228c62ba9d4f757cdcecca1585 SHA512 3d126c5424396ac52a1621f5e7ad98c13a07f4ae51d603f37bae83ffd4683aa1618bf762ba06d3402b0548ec055503cdb7aabeb937c033857b478dcc5816b430
 DIST ldap3-0.11.5.crate 118725 BLAKE2B c4f28718973aa68b5049056fa2552862575ecc4a9d89f5d592849040bd1069954f9d30c4a000ea2e0a9b4175581b3449549facb2bb700653cf35fa9f6a4bc2c7 SHA512 bd3dc73e21da64842c347bb6620a8a38ebca5a3bfe131eab5ac50e8f5e50e20000dc66d96cd6f760cc967123e2092480e93fee3c5ef55e43757d46159e916751
 DIST libc-0.2.166.crate 760418 BLAKE2B e4a81e82d139d03b85eb061439f045f1965f6260dc4d4a769f1db19e5d682a923497ba2cf041ebebd46b90c627b91cd97f86250d8b1854945b4f2e826a04d14f SHA512 55a484456ca4d0fc90e488c5b793a6100f160c9333f0b4173f21a49e33e2ce3ae28d74eadd4f2e72e51040667f0a2a93d7edcdc727fe266ff35b8b37608cce2d
+DIST libc-0.2.169.crate 757901 BLAKE2B 1012cf93d8975aa20fc3f2332e253426ff66be6aed63ace5292cc8568ee419b0f1a4b5b39ddbb78d9c2dfd8d72eb0d068c98faa229ab55556da5e674429f0e97 SHA512 c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce
+DIST libflate-2.1.0.crate 43366 BLAKE2B 3635565c152893ab958c491d1dcd1f5826abed77f6f41e38b64566c27a81664c1573cb054cfe069392519437e403138b14ec4daca8b8af22e6432136e94bf957 SHA512 00cba931f92f50ba527aab2303533e72d183ba1ff7b61d396b50d0a1fc0f31dd348a506cc87ad417879108c03f0b500d05c1b7abf48e92473e0d472594d4151c
+DIST libflate_lz77-2.1.0.crate 5918 BLAKE2B f931e7d96baf91903ffb73100996f11df1fcf3d67f4d06f2dfcf08bb4ebcc0f24e9da7ddd8b886f6a4f5a4d138beebeea54fa8247594ec5f5fddd94c9cae4b83 SHA512 5e521a46a6ef2976deab481d2410db0797fbf5a78e6ac4d406bc0ac4464b01836938a528990657328b29698a19a631d641dd1e3093cfddc91be62fcb4b646ba7
 DIST libloading-0.8.5.crate 28902 BLAKE2B a0fca8f8876092e874964b3dcbaacd417451704fc1d687669a95a0b9df22ccda73a754118ac0bd706a7c7d86e4eceb2ad012e20e341d71548b34ea8d629bbfdf SHA512 f332884fa75cf210460f4678d45091345b23469c09301614c476e95bc54163afd6d4f098a34f9e0d529fa1ec63892395b50957598070ff327743e4c3b0871074
+DIST libloading-0.8.6.crate 28922 BLAKE2B cd9d7c2652bc4b0220e1c29cbfbca41f44d12d76c4dab3d025c21e5d317407ab656a88add0db95f1086934a424f55b4b413f33cb2a52cdcadde7641f9c5b3fc3 SHA512 f49ab79244d4b54c2f181bd9d7506fe5df9824a09446924dc429636e08ed7bcd6f5d2afaf8a0c862982e2c2c5832370b118266d36f36bc7b7522668bd598fc81
 DIST libm-0.2.11.crate 111477 BLAKE2B b1247b197dc66a38b9a1f9db0e32655c9ee09575347895bb1e3f22e6953c334d74574a7015f214b0af0eed564ff2ee4576d07d0db5421aae917a7aa1e10ea142 SHA512 86742b5d97dc976cec5bbf75f565b40c7058e74cf840cbc7baf4d84823318040ac692b5796a407bd44caac553dda3f5a087d3bf8d6099cf26305123ce106c7bb
 DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
 DIST librocksdb-sys-0.16.0+8.10.0.crate 6929396 BLAKE2B 24f317c55d2c53910fe9eb1162bcea16624e498c55b06b5f64654c70add709d60d261dc3ade3772f5cf838b115ac8690b9ca603fcd39de49450108cf64a75d7e SHA512 c2dd9bbc8e85f8927db1e053309e821da6d02d38c78333e9cc37822a3c2e826daa312ece9ff83a032056d91746082241285c3384697b37b0ad2994ed160e6eb6
+DIST librocksdb-sys-0.17.1+9.9.3.crate 6898368 BLAKE2B 83be24abce59afd9d67e693ea52080c98b0ba36b07faa6bab62889350e56028ace285dce5e3f334f3e02c47a51ff9ef3fd1943a4d1e365cfa978c1bf03000191 SHA512 268336c2b11ed143e1ef4a27e93a1c9b1a77b88600d3b79d38094317dd57bc724f5380b50d1249a75c3a6650deefb9aaf8e943caec607dddc49f863408fba381
 DIST libsqlite3-sys-0.30.1.crate 5122296 BLAKE2B 3f3d5ecc434af6ce6e28836dc6bccc812d53da909e5e4a92f0eb7b6dd56c66c5243e29901867df2e72be424f20fed6c896da59bfd5349fad831a6305cb25db51 SHA512 6ffb2a23a78f3221ac8f6c9260713741970e522bebc1ec7f3e1d7405f25dac9024ebe3a73d76a6ed74dc7109a8333d6936ad1c64a0a7c75d6d81f97c3524e952
 DIST libz-sys-1.1.20.crate 830422 BLAKE2B 26265b1faf04f7d0cfd751ddf003585b1be59fcf8fde3ddfd86f18cc3e2d5c3b62a808f47c01329a57759d14fe6283cd94a72eda46d5c5031249df0f1696ab03 SHA512 9b537e7c01553e782be145223c6d174601ade3a950bfd0eb4ea09658da5b8910cf0d0c5984672f9d198f73d5aa63d21e0c20c4c44ff7d0a017ee11ae4ecf4859
 DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
@@ -342,6 +388,7 @@ DIST lz4-sys-1.11.1+lz4-1.10.0.crate 391317 BLAKE2B e79aac475b62f16adc7a33e37fa9
 DIST lz4_flex-0.11.3.crate 40633 BLAKE2B 438cf3cf7858e00dfecf44b136e84169386ace08118bcb349499fa0ead88dab5792cc1bcb0e0c5362fa4dc020ee14b9b6906f875889c8ed629829a44cd134847 SHA512 b2a5b44aa98a1994bcc90bfd0c6245dbec2f390be39d7171bac68b352a0c96c15eb735623816a559fc4fa45681f5f496e29399d911ba95b1d5855dced7afeaae
 DIST lzma-rs-0.3.0.crate 29080 BLAKE2B 521d9f12a155fb1c9224b155400ada0cabe8be62a6b46f3b9d73704928446bfce653df97c73ae0951b6b1cf793a2b95c37180d5794c07a399ac581d75ef87337 SHA512 1c554b5fe33e6cd6ab069efaafc2826d3cb0bbb13dc55c2438345e1dd17de99cd43da4aa3419841ce50d9fdfa5956baff477b37a09470f48908fc1b7382086ad
 DIST mail-auth-0.5.0.crate 159634 BLAKE2B bd978f9d2f7c878423f16e370fa95882405454dfb2d6ac793b14749e8d7ae346ed20dc87a6ae43f507cce68af7d870bcdbb2ab6f26f76351fb88013f3fc4911f SHA512 148a426e7acbcdf25bf7507e5ec8ea2898968a979f5c3314cc1df636b15c8306e207bb200de05285e0b6a585130b9666fef221c95aa38fc1ede7a09aa01da966
+DIST mail-auth-0.6.0.crate 165563 BLAKE2B b3115669446720005564d856a7acabb66768390a1016e938f13a1bf8d3fdf7df66c92be37b1c2c9aa5fae5cf349d4d741344c2d0865c20a0b9f7b9739d092c54 SHA512 47e58ff61080f3dfe406fa5781457da15aaedf2d2b2c84c5295bad2289e6c6efb272007937d0a70a718b1bbcfa4e7a69096802b5f1b52b24aea71e2e33056d65
 DIST mail-builder-0.3.2.crate 24507 BLAKE2B 2534d9c424ecabaf0b7cd42165aebb6b1b1a795c9803fe45740f11ff550df73029e5a1f706a3078aa743ff9acf85754cc1b8ce31d0d1538733d2ee8df1574198 SHA512 85beed8e0da7f106faf849bf641d92ba2d5d9c3a2df983bd5462aa48ef0f47de18fdd16964b25186f3cb04894de4fde71b88ef90dc6c96b223810046fabe686a
 DIST mail-parser-0.9.4.crate 513740 BLAKE2B 423e845bd7e8a3e37851a38951dbecb15f57269e41426c62a60379c5dde46899480387943eb563868b2d3b64fbdd12b7d25e149380ee257e91762f3d93c6dd0d SHA512 96b21574d9da48d4f490b5fa4cc894e970664bec6b50d69b80f43679fa4b425745698a6cf75ad7fafc59423bf11c59f88d73375feddc4186c1039f0047fe780d
 DIST mail-send-0.4.9.crate 36322 BLAKE2B 3ac282e6f7c4099f2c3e7bf6d8009d91761a5ee847e698c03281b7959615b884ac0e9fa58c37957c4875c67eb67d5aea925fb59a805e0f7d2423caa17ad69924 SHA512 9140c5eb946c815d5b8707780540e0dfe9cad50271a2a66bc04dc5e20c3194784a837caddae920dc43f8af50e550ccb9cb07c8790d07eb19667a3df948916d7c
@@ -360,6 +407,7 @@ DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a0587345
 DIST mime_guess-2.0.5.crate 27166 BLAKE2B a8ec67e16a336e7d07c9aaa55025c24c3d4a62aae25213ce768786d9f292b76930132a880d662cd9a5d63aa899e9d488ab76fa9d99350e9f448ef484705ba4d9 SHA512 433c876e28394282cfbe14bb9543616cd296879f253ed331c15ace8a7d9f3629f5b596c2d5a64823a97ca9b774acc711b65006c46d54d1e9ee0553cbf1f13b7c
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
 DIST miniz_oxide-0.8.0.crate 56343 BLAKE2B e4abcacab4c8698d0489faca8556faa7bff53d272ea0c80e2e7843dc0f6f9229b7d5b0a17ae210344722a379853e7f14212505ee05da4e60549081cf77717c1b SHA512 044b641ce6d98d1968c1ee0906f91963f9f524d6f3fdf3059708177a759e1d498c63e595d3a3f0f9f3210c45c828b9b70274134ba078b899d7fefc2bbddbeee6
+DIST miniz_oxide-0.8.2.crate 59068 BLAKE2B 22808b2137b4afae29cc5cf25d9f643d24824293524542e2cbac3ed0fb0341417c052310602a6f0a003843abdbe7715a95a6068c807cc0c843ed867958650215 SHA512 e58802e332a72123954ba1751cdb59509789bf930ad74da3d06e2c1c3737547fc0b9848be816a66b6585830786b7a0fce7c9fb574789e15f3b540709563cf854
 DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
 DIST mysql-common-derive-0.31.2.crate 11745 BLAKE2B a7c6ada0bee74ebfd6735d917d771078a25e15b81d78a904465bc5a6a5f4ef7f018946b7cee9101af24a8fd49beb0a22102bd6c014bbde1fc9455100cc74b371 SHA512 0d60a929c5d78f055b8a3315d3f6af2323ef42f56c112d28f1923a0635a875f79f3c525722e13f1e9a1c19292f822ce15a1a3e04a3c0f9736e566ed38ba2a8d4
 DIST mysql_async-0.34.1.crate 100221 BLAKE2B c162d6ed42bf90d7c1f4e5c0571f10bdde34cfc6eb4e114e049c03ed778e37b5730cffefda2ea908fd2e016e02ec580783db6d7a59064062a82860003e5b7f81 SHA512 9f8324e7431de3094924ac84c53147efe4e9c4489bdbb2949b7a29d2fa117014bd22a0ee76b0c55689c417a621881079d766320a9e442790532a6abf790125af
@@ -378,6 +426,7 @@ DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af973
 DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
 DIST number_prefix-0.4.0.crate 6922 BLAKE2B 81bd3b588c788e6865104e5ce87119b5e0c5a526042963d52cd582ff23c2f8c9f32b4c445ef0397fc402b6d047e031d8e2c67ac97e191bde22e17662eec3a554 SHA512 a43b668d7314218b86ca7451daa9dfef71f6c9f6616bc34c12d94ae6030f182bcca9da83905cb46f3d49d0aa81385a787e92e4f3ae239658067adc249f8174df
 DIST object-0.36.5.crate 327435 BLAKE2B 1ffbb8ba57024a7273217edb1db76eff03e0689f81ba27b0aef0a622972e7f6acdbdc480384b50d603dee6c38c960fd25125a313264187aa0e429aa839198dd4 SHA512 b85375ab3660a8a0c57833c28c4dc665dc0664857e1eb3cd472a61b9ec8c16c470b16475545c2c311fc23cb3c43755967f93feac12c7bfad013cfed5f879e355
+DIST object-0.36.7.crate 329938 BLAKE2B 0b02cf2f44e99002909b38125edada1a259feae59fd0e5ef52001755b6878cac710c87c60fbafdbe405281e039f68572ea3d8093d16128899090fd70df7f2fa8 SHA512 dd69172349ecf51fd2351d32cc4453760ca1d15e854a1cf5ed99112032901a54b4645b24163b946deed11f81d3e3035e1a5afd8bff20f335dbd05eceab073478
 DIST oid-registry-0.6.1.crate 15068 BLAKE2B 03206bce78c7fef1ca8f06879a9a79a6176091d61f87278acbd10c690c86f3a790ea88b54a600923eb5f914506f5fe335b7d983a857224d5127d22c843643cd2 SHA512 93fe90de87955a0c855d9dd4480280b72e0d559c9e17d864dcd3ee424a38e406a60492393778e01a0e6d3b8cfb9f1c5cd06b90a4db180613c5ffb21530b681ba
 DIST oid-registry-0.7.1.crate 15220 BLAKE2B db9f45c622cb96fa1edf6c15253d4059e01f07f804b26bc5fad782eef5d65a7d0ee3607c064668898190082fbfdb676d8c77b091788646d73d2f4a5f6f3c464e SHA512 302838c6d88e8f9b1e2f40576d0436c85bcc4955290e5f0a5826d11e5a7f880bf6335f6d449d1976f9899a05716f789a87d8c8fe641856da088ec63f15e31c10
 DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
@@ -436,9 +485,12 @@ DIST proc-macro-error2-2.0.1.crate 24807 BLAKE2B 20bc34aff566445280cc874fc0c2a43
 DIST proc-macro2-1.0.92.crate 52353 BLAKE2B 9aa29fa6f1c56c0392a94a81b4c61953f4d185012cdca37e356817845535da79d7094bf43472ce63109ce479a2fd0cbef4d802afd61daf92c4db303bcac60e7e SHA512 e614f08acc0a7e97ef580479cf5b682378df1ca16f09bfb2296ebb3490a435229dea9d682c621c54ce57e8e1d3b7803eb8ff83c88bd02e07228dba6d02f14aee
 DIST prometheus-0.13.4.crate 84650 BLAKE2B 5923e6e6fa6923d15d6c5bafdc1f1efbac6d7f1646d7a098a6cb14294490e7d9219a024383e96df0684ac5d3f57137960ae680ac19932ed8d63aa89a3dc91e97 SHA512 3ca6f9e29cc40371c08651b3cb178beaaba222594781bb2355db3631040c218a72ad05917048fe5dc712b0c6e2dfc61c1bc4b857a0ff043a0258357b2015c6dd
 DIST prost-0.13.3.crate 25684 BLAKE2B 48508eb332066f7d212a20a5c4cd722a06c90727d4ac746f55d3d23389c707095da22869cb42a63aad352d48974d9ca5cb0a8c20a7d2ac057a8ceaa3d9d43356 SHA512 1d8d7691323ad2989a77389b5295d774bfb8200d2cdbe2342081d79c2c1d0985608cce24960736d29ae0800452e4e6b45c8a1e9df6ab838c9439492535e49c8d
+DIST prost-0.13.4.crate 31812 BLAKE2B e78f00da1ccef0db90ec8fdd6dab24372fc01104ce7cc5e2ad29fa593655aecf6b6e4e320dd227ac9dc884fe92ba4b69a43b6db5da3e3b7e6d5d3a6ffe0f29f4 SHA512 fa1544800fd5c21384853c949137935fc5080eb199d15b86086ed6e8e24a4a2e6ff1a0b5ba13780843b19c4f3684f1d4e17d94218457686aca7279ba2146316c
 DIST prost-derive-0.13.3.crate 19930 BLAKE2B 23806bf49544c873d756def9174785da6450567bd00d21227898d9dfc73800ac8dee6148e1c4c4f11b069ad8822fad5cc6669c7bbde563a8e36be455cd975e66 SHA512 42d27393a8117e1f446430a5ee4043ec792625b49f7eb11b19ff7a38a766390ac96e5b7fc18b5e11b4c18593bf655caae0d0e5586f39ee4b38373ca3059be3dc
+DIST prost-derive-0.13.4.crate 20592 BLAKE2B f1133f74988e73e8faca3c1b24b141956ac3000a1b7b7c2544af5b937133a232563ace9b166f8ec18cccec58e922e1f91024561fc944528d25620fb882885ad4 SHA512 9219ccce06744efdc4a248afd20bc057cc79b9a1d25dd0da7791135e53edba32648c2a9d25e4461ff9af13209abb9e709e35ba595e546688469d2377d0340b36
 DIST proxy-header-0.1.2.crate 17073 BLAKE2B 5f45cece250c07d57327f779bf8c0737efc580006603d5266a7aa06025cec446ba432cd5589a61f93eeb324d45558c957a2ce12248a477de59238a00c4d110f8 SHA512 65f7e0cb7a57fe2d54c2f4406b61749abe6dde0394e7e17a707e1deb449ab2ec64a2356d35c7638d9083465d87b2bc88e5efce99d41216eb3ad3c9e4440f7a34
 DIST psl-2.1.62.crate 193011 BLAKE2B f2be3bafc0e68c35c38709a0627c248943e104348a92ff77e9cc2e8915e5f99493284ac21c470bd94e93e2a75af9283bf74aca66bd8d6107fc2fbd16ad23f91d SHA512 3055b97b47d5c8ec4c7e2ddb29a4a03307948a079ba4fdea34039b56b327e8e4704fc19bb5f2059bfdc1f05219811f32be11f0c00f181938914afed2c14314fc
+DIST psl-2.1.73.crate 191503 BLAKE2B 07ff1bad672c7794a69e7bb9c1fdf2e44fc0480ab3a3851c618749b5ec7dd6e169201cf05bac86e276e5f4829321d1958076d5b2535e9ba3142a060829c0e0ff SHA512 e3eb575f62f277b739b980751309e96d3a6df109507a334bce9ae3b62a28d1079ae702f20cd402075ef4fd5715f20751049043f60259dccfc4aae4bd1a3a9ce0
 DIST psl-types-2.0.11.crate 7959 BLAKE2B 287a71add0c75af1266fa1e4089da8f82c8b64e3ae1e880b3a71ebef5fe43bce3bf50f6378a228e131cf857a4cc29f3ff37c2b08b62896196a3e86ef82b1128c SHA512 c609f6a414bc1f5f98c22f9ca73e3908ddaf10e33ef43f408ab8ae2f8c544c0f70cc1a73b1fcfa20ea53f2225f60922f6d28d2e5d31a9877550c2ef3520ee2b7
 DIST ptr_meta-0.1.4.crate 5754 BLAKE2B 89e312313d343177c6fd20637da6fcb720027064038cd362f41104dd753e6ac949582297f91da6a088fa408816af75f1ea9030634ab3291afccbb598b001de1c SHA512 9936264dd52ae40e6afc8cef8914dbdc5767f397b91ea965d65275fe547a2d9cde7ccdcf908f787e25f84fbc23a2e30df895793fca308e09f48f2adf2e30d2bf
 DIST ptr_meta_derive-0.1.4.crate 2302 BLAKE2B 14210f93fdf3460feb53963e88001b468d0305395fff7b082f079eead29723d09b7986277c760ad4f6b906e5373e4307dc81dd0e8d37d4dcc3e61c4458b76fdc SHA512 15a72b2c36e9d1761c4dd42cee1623c2d85c52eadc3c3102c8334c14c9c5db9a43d74dbbab1d14a2600d789917fcb5bc2652877b172aaa02c37a6868462ff20e
@@ -447,10 +499,14 @@ DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf
 DIST quick-xml-0.31.0.crate 172236 BLAKE2B b83c7f485a30576027a4ae77aa23cd6284942d786f0f0a14faafdfecff646371ba15133b3ba90f820183c8537c8ac47ad3e1e7deaad65e56761bc662be406026 SHA512 9b1f4f9c32694ccb244938a9a4e9373c3902314afb6af5d2f6b1be55e5ec63fee5cf1085f8f32161570cc10fdd96f3375c7564b1d884bb152542b86593f175de
 DIST quick-xml-0.32.0.crate 184149 BLAKE2B 35a28dda8dab04a933c4e5d40f22dec6f9c5bc75e9319bf2711daad869301a90aceea9aeccdce5763d5fb513548b7c1f030b6216ca1454e8f56bd6e5a5fb6ba7 SHA512 288232de1583d8c7387716900be1fc513b2161123182e4812bde9851f4bd31c1a67417afdc16e8a55c028747d0a1147d2dbae6f0e8885e946829a379563507d2
 DIST quick-xml-0.36.2.crate 185201 BLAKE2B 4541812a73fd95bedf21f90f07f27b31eea6c514ae17818ba957dd83ed176b0f17bcf3860fdbda07f0fedfdd7ac660bdde5e8ae2aa9903bf7a7c8ad2d4770470 SHA512 7cd4778dbb1f50fdfd7290241fbb42c8529f7d44c2633cac017657010d0d443024f049287e1a1806f5bebe46465549973cccc660959c587fe383490a150ddcdc
+DIST quick-xml-0.37.1.crate 187839 BLAKE2B 1d2a47f497bfbd7d32216527804731f7183e55a661991db7d76480442021f945dcbcc219b12db80e2ebafed5e08160e39a42d2225a1d47f02b7e45671308f5a1 SHA512 dd6f61ef1810481ce0f994f19027cd68620e546f10cdd9160880ac25cf91a0f6e642c0e6d88d81952a3af58fda81e5c93f761c8598432610540876f33e4f3159
+DIST quick_cache-0.6.9.crate 41207 BLAKE2B 4a0953cfe9fc99a18e1b1333415cfa116e2e15d689aa99c541a1a354b05923a596e9a76c6e3cc8c574b649cea0e26f69f91ecc4692cac9043da469b294239fdc SHA512 95b2408146e99877957586262d5e898c2b3d00c63dbf95d7e6f2dced8bdef929c91de37beca3b9b2cfcc4d090c7ed9979c66a76adf4fd2f7c0ea73e52467a536
 DIST quinn-0.11.6.crate 78222 BLAKE2B 75a5531450e8990a610967b40d31ef5409a4b9b99d965b3b31c35276a788731473ebbb26fa465aab621923cf52236a0560df8abb87a02d0e911021509cf1a1b5 SHA512 f8d4359df3698442181843a5c49d688502046d60394d0954cd5a6336aa16ae9960f8906c152ccd966f5ff24225a6c4851f1f0b3153528bbb3d58e2b549096ca9
 DIST quinn-proto-0.11.9.crate 209286 BLAKE2B 4d512dc74943dbd19fe406a7dcb40288b78aed8086b81a49daf12da808eed35ce0546842b840aa460afac9a8187e47da0628cc2d4cfe8ba6eb1ddfd2c0c528aa SHA512 a0e37817d91ca1dcd780d2ca1c01b30d59716ad94dfc313f9232dff708cd8f64c7dd3da91026c8fc1fa9e81d918ffc354092ab1b8841d521eda5ab93153c2616
 DIST quinn-udp-0.5.7.crate 24798 BLAKE2B 286c9664335cc3273122fad49ad6d533db504b7e4dc2a1baf0cb4104974f99202024b59e0dbbc0b8eb91bb8b0b9bd193720b66eec531e8fe6b427da5b3bf1c3b SHA512 4ddcc254065615d60be2086cb02ee9c69d6025d0f7230986c2bda6599f9271bf29968f0e048f2cfaec7b28ac93e032a62b45fe9fbe7ccf38ae66daf5c246c16b
+DIST quinn-udp-0.5.9.crate 25342 BLAKE2B ca285db2f61734b08f105955a22fa3aab5276371675bf111f35239a4c5461aa8e26617d0ce83c50c11e65e98c67f290a0124b3523852670a1fe727aa0432c937 SHA512 13d9abb6162933a8318d1acb3e90c7c7d936952f9795ac02d751f8964bee05dcb0a98890dcdfe1fa3160061049f14b385c125ae56b829a43aafea150be90257d
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
+DIST quote-1.0.38.crate 31252 BLAKE2B a3836efbe5c21dec70c684002b47b8fc7cef643c82ee903b537a48bc0707a28106c4b33d98e60ff81e04c7520f7404b1dc4d49446e8d91dded517e476c36e1c2 SHA512 530c47c5e6372b508bf5b2b88a138408a7afa5ef52c47280ed20eccf39f8e97dfc1e0a18c1bd5472efcdc49a7a1e69566333a0a1b4c0b4f0e11e6a7a85bfe8af
 DIST r2d2-0.8.10.crate 17888 BLAKE2B 66af689f5a1d691c9a46f58545405b0967059205360ed5c2244d59851c3426960e9f93ee630e6b4ae29482159a5fbf7d22e49331473d836848fa61d0e09be2b2 SHA512 b2ccd3a309ec9210893baeb57241c486c861884af3ed8a0d9b6b811ccc53a21dc077b0b3cb62da0acf19dd9f3913175e2bf66cc5c0598113732b1002f2757a5c
 DIST radium-0.7.0.crate 10906 BLAKE2B d576e0ea5c5287bcb6740cee3a3838b6ae4dfdef0ef05d34634b96dba5159e48260233db57a767c9e032fa5d9a5798361335cb19f7844f450113ece30ffbc51d SHA512 51e23cf52997b46c0018a94b0259b29d7bf33ddba19f6db406ca57ee5b1417d7e5f27dda3bb487d0099886011a97f238e8b3dd4d6c86e8464c0b471c1a7622a0
 DIST radix_trie-0.2.1.crate 251366 BLAKE2B 14b50e45eacbc5b42cdde8a4f8e8642adfdfa3cc569c3fe0e3aa1fdab901713b3929d706dc0aede1b679762fb8fb1af345efca15befc9234322db434c8a3923c SHA512 f6f54511860b6b878c83de4455bdbd71289599dba93234d5c7469342f3401cba99a9ea6bca2d32df2e31ba657f40e42e7d5fd7de66786ddd2814e22fe867f9d8
@@ -469,8 +525,11 @@ DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2
 DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
 DIST rcgen-0.12.1.crate 63815 BLAKE2B fca25c2e951d3ccd0832d2861fe829f6966906ead6f7ad2123be1708413b8409af878e744375d599c2e38f977ae8cefed5f9c5149c60f480798bc0dd5d5012fc SHA512 1679764515a71b1048f866aeb3497d65e8b1150234c71aaae871544ad002c362d5e8af77fcc7773cd8da320f011fa8245e68531ccf6655a0cc8add1e38eba881
 DIST rcgen-0.13.1.crate 74432 BLAKE2B 5e62c037cf912c19b0f17670ac1dec9b31238ef3f289a1c5432b67cb4dfff1d058d9501d61081dc5cbe81d17706f3148c98e64d6a1cf657aa672800526782295 SHA512 f4d8ba116e907bd4e6a7f261c8b8325909ca619380d048325e456b037570ce3ca01d0d2b68577d085606250796e97129f86db383e20d7ece62a603baeb45f703
+DIST rcgen-0.13.2.crate 77836 BLAKE2B f92211a4ca1d6f8c2c926d0d60e241e8a9d414f27f91d5b8fbb7103c2123f590aa2796264d16a0590a1ac3e3bf73ed0933da2f63268a98d3efa776b7bc677b60 SHA512 bd8ec21505237b8675a8cf71df1c422f97eef02350a8145875456784d2b7a0637738de44ffbbc4808406f151fe67428671d0fe80f3b16a77c1c8b839854ac121
 DIST redis-0.26.1.crate 252284 BLAKE2B c019451ffe717b48c89fd94d54091b132a42c4e27f866a90156bdf2a1dc8bf6b4ff149a8f797df8e8764267665e95d75126b69b921c46e38bdd44fbf3571ae5e SHA512 2c8cb7d558b7ad75c5fcb28bdc0c03c3e6b85dc0ae40289304635fa08a39cd9fbd84fe26e0ad66364dcabffe2b565ce7e62f9a0c2873b3624e56bb95883c580d
+DIST redis-0.27.6.crate 271646 BLAKE2B 9ca08c85c6b0b902406b8105b2dc2c9b345fb5a9a68fc7a49b65b0c5cb2cb8f014bcfce5768ce1e646f95734adc331e07a9a58ef598b48d1098d2e7dc4ac621c SHA512 e695c7f07e74bad47424f745f235b72cdfe96f2d0e468eecf531820290675dc17fc0873bb3086b9164a0c6e6848e9e3908685e01f20bb5bef201bf997729be69
 DIST redox_syscall-0.5.7.crate 26249 BLAKE2B 97f848b130403686404dc193415e5060c32585aa3638b825b4775e54d9a058695b86457ae9e3cc0240bcac27ab4c05dd6b488bdc1c797faecd236c6e477fbc3f SHA512 e9f2d254279a4063089436b699ecca766a997a72718d132a9b35f7c8c8fc82c4b5e25fd8f3e6cbd17920fec484140db520c262376ed1c74f847929b7f43fb97e
+DIST redox_syscall-0.5.8.crate 26319 BLAKE2B bd69a69e2a0f3d84843a8f76199ef6b3991698ebac58b23f69c26d02f5f3e24e77a9d5e8259e9fbff3887f06d15ced94ff23b5a3272ab475918e6e3e753dcde6 SHA512 5f9632f1f89f4963c36ede4da9b955c3474b673c3414d81cdbb61f46c08eff67167f703a0b06b239beeb2d720f8fa592a5493c0f7e872728b5b95f561ff11348
 DIST redox_users-0.4.6.crate 15585 BLAKE2B 1d60d0b7781395ff271d79264910d24fb021cd8ef612714265abae25b26ac158d48f542f1e73701bf5b99bd67546a7b878e4a14e40cdbd478b35bcc8b4778f5f SHA512 719d63fec42bad3cbed39deb9242ce1daf3f391bccafa8121f63198120371f112d78b0da8d66458519e946581511004983f04b0a697071f22294ac7c831120c9
 DIST regex-1.11.1.crate 254170 BLAKE2B 5cf41012fc2ba8a006c0eb4a922cbbf1614bf300be361c9e2d98956a9a5e9b140e37bea09132fab7bfb633d4439158723624bcf45e8c619c4061b399253c1b82 SHA512 d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8
 DIST regex-automata-0.4.9.crate 618525 BLAKE2B ee3fc41c8c445be4c1aa3e5b19a3e61efd641b1a24e7a1ed55f837c1fba9c816272cb4645c13232b66b170bc7c413802928beb22e3891500141ad4ede65b60b0 SHA512 40bde0ec91cc27bc0c3fa237a37ecee5a1f023dbe006a999c5888f8f578ee2c4c64d9edfe1827546cea8e92ca3c10f8b4d494d81f3d0422b40d90bca9cf598d2
@@ -486,8 +545,11 @@ DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd0
 DIST ripemd-0.1.3.crate 16601 BLAKE2B b72f950d20e0f6f19e5e4dac9da24a5fdfe3dfa441596a89fc7a8350cea3a297ec04caab43c7c24c4d8e499e50de306656b5a5a608d5b01d0ae86014aa4931aa SHA512 eb4510c2a5879984dc662a985515e17f0c22f91babd1ad9914a030058bf8e703a72375e82672c382294a0bf7e004c776e9c5ae30ee0f6acbddc44d22b48e2e03
 DIST rkyv-0.7.45.crate 115753 BLAKE2B 61ffe5c7a819a99e59a06a0259e758467affbebc86ad291db05e1899cf3928c163272beb72e69d564a761102db8a712f0eda273023ca08d15f1d2b60c24e8743 SHA512 bac10c6e7e7f797e505cc8103c55ae2fd4b04a76631e085fcf1c8f2b05e52c064cb14145479dadc292995b7ca5bbab5235d54d8e651bf47623a0228f936f73c9
 DIST rkyv_derive-0.7.45.crate 18972 BLAKE2B 65ab35abb4724021529cd730f41809a2cf4aac06e8ef542961a8d80f636e0244bf9d08dd2e577f2f383e2b52e5694d2dfcc00cb34028d46cc85cadc999bf7e07 SHA512 ec48c62251a8c2b97de67da56cf6abff15cff1a329d7f8dd3e45e1175616f0dd1b32c2a9c0998086fc57d0084e7908cfd6000fff3eaa30a1776f8abd9cb00564
+DIST rle-decode-fast-1.0.3.crate 62086 BLAKE2B 402d56595936734f36597c18e816a798ade6a8636b27e79acdedd4069da38e22e6ded5f2358ef0f0d509ea752e828fa294a4a9ac6d99cf26472fe21a505302c9 SHA512 f647cfd9ae0bbaca4a189cd1f8d1f8531f6dc0ffa1fd296c75cfe405fc9060e25be74581558a9195364ea90e32c7ccd60e066d21704cae836d41606b5799301a
 DIST roaring-0.10.7.crate 94529 BLAKE2B 1b7be7b4c858e66e0920efa5c855e737aef9ad900ea9735873af7e3f9eedc108719844d271a56ccc4ad55e6e9fabaf9a6f5b110c4c4bff9de6736650cb2c325d SHA512 58ee3ac982e77b6a5f4c805eadcac6a87c49c80af1b02bbe5a1dfee150c044e4d0e92596dfcf32375bebdfe18a49c5cda949829f1840dc09687d2cb87977ef3c
+DIST roaring-0.10.9.crate 97470 BLAKE2B e5b39b1346b02a83f32dd6d72cf017d4eeeae0975949507197e34ec1df03a3e7368900406b13608b7e8f2bf3b2ed31f1747e6302671bab550b22aa07309e9ca3 SHA512 b0a2c90f57927ee623ecffaecfb39a0b6d66ea8886108bb350f507038205e26e880bd51e906d759f42b4a5eba7dc95dcbf5b50a16558bc341d15fa4941cebc6b
 DIST rocksdb-0.22.0.crate 143095 BLAKE2B 510a5885d362f67370e3b40f1bc9b85396536d115383c79de942f4ed21e039408b5a0d2819619562e668eb77066fbaca9d4abde98372b40a803c6e482dc085de SHA512 56ae6d0e8a6810b10ce086a8779b21f8e92232a007064be4cffc003fdcb06ad8dcaf999a783f3787b889ec8e5ce7a6f116e7c8c61fab41fc9195fb0ffeaeb4ba
+DIST rocksdb-0.23.0.crate 154324 BLAKE2B 744ba63160bb4856cdbdc17f6479b2cf46db885ace3b7f75c367cd18395ad643beddd6dabe4a48eb63886ee3cafa44a2167e15692a024655cc6b7e121bf2fb3f SHA512 63aa2747ca694f8d59c935a601ce8834002d221edc0d070088e4f533afab95c48368b4f57fc3d2ba989997b383dca2c70649efc55816cfb0cd46a926c35d594a
 DIST rpassword-7.3.1.crate 8164 BLAKE2B 60e89fc36d78a64d9441bd902866500872f4ddbd28ffe4bc5c26b5882ec1dd9bcf50dc06105c87f5fef8c51b327bb9af1a324831cb6396796afab3cb7f4a2288 SHA512 28905b33e5fa26d9a7bc0d682b94edc6119b2d8c2a6826c89d61fa86033230707c54f3ed8047ee3f5da4393c119c70f102ff61efdc1d4bac38e583c04e3b4382
 DIST rsa-0.9.7.crate 80231 BLAKE2B b8f6e435f35776f2a67f79f5791d035ee5753512fb8e05386aadc5ed4962d88be7ae4c016ed43bcf2333e2913687155aebd3ccc79aae7f2b04b0307915dd6257 SHA512 dff7f46609a006dc8342a36c43f841592cc6ded5cb88d63bc252f221372cd756eac820d57e218ae573ea8a643875463c8707ddd3e01f2fdcf729215c75e7030d
 DIST rtoolbox-0.0.2.crate 9179 BLAKE2B 4cc9faea86aaf0f9e9ed95269d0fa8c633d7c05d539a435bbfcadc563ad5fd0d3f06bc33f83a24432a53da483bc7771edca21e6237888254b1d000f7af1ee41c SHA512 2e239e821d0bdb171ff9d03d3b8df2fbb561ae67ed653f66096ca32b2a83badc7d1b74b4ed1f0f41f141ff2a383fd06618f4f7740a03514b256eca4db0699d42
@@ -500,17 +562,20 @@ DIST rust_decimal-1.36.0.crate 129249 BLAKE2B e48f78222503528cec94e34780c67f0016
 DIST rustc-demangle-0.1.24.crate 29047 BLAKE2B 8248b014eedb26cdc0b748544ba91b9aae9c992a6f93b4d3ac256b78f691d572f8885a3575492ea556698a241d2759743968293079ca02bb6a5f318b0ed66dd4 SHA512 eb897c35300b87766e6105917a907fca1c5b1f7691fc03c6c1aaf38075ac883a73d1eb54a245d13ba59c7b0f0333d6543e23fc1b1c542fbbd5c750a84660b9e8
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustc-hash-2.0.0.crate 12691 BLAKE2B b6a619f681e897c8a9167bb88d6ba78715010ac6c1ef9a7a9e115fe8aab10fcd9d4f5e1893e89a36a59118819dbf67de3d261a190fe37948137f097bc99b3fd2 SHA512 996ad683db2e6839ee28fdc4a31293aecce7baefaf6051220a633a00beddef1be41aef0995d7501e5b92dbc85350ced920bc980d05f5ba235e9a5d1a13464339
+DIST rustc-hash-2.1.0.crate 13316 BLAKE2B 3e93739234cd36f3cda5d71522e3d2204e98b1d134cf01cae5a93a93e6c4340a7b1b0485c339f312145c723185fb83f6aa87ae2a0b9b726a34cd29c19d3ede56 SHA512 6f6a40586fd7a99016efd53888970c745888a06bb6b9d32eeb4936bcd16906c90ba22fad82a4a6b547df4b6c9cf6d73eaa8d36af097d65d3d6de18a0669d5ad2
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST rustc_version-0.4.1.crate 12245 BLAKE2B 0ed627c560d88e5ade830cc5f72c62f6ba88be3e30d0f8db34761fcd0b284e5b2fc063c240149aabdfb12c8410ecdbe50cb10a3544500b5a020f95a31cd6709c SHA512 7aa8a487ca7411b6d23cae62f7568fa3474a7b1fd1589621071be3428a550ed3b7c4ad68277a8f86849e5900397d7d0e9d678f5d423742a045dc7c660fa6c598
 DIST rusticata-macros-4.1.0.crate 11746 BLAKE2B ef912926df8ff2d3ee64a190d79dde0edacaa0ae8c2442d75a1fae82f97aacd9994f3511605686cd2bf592e71461279776afc63b9f25cd8ab10610d59cf3610d SHA512 8066a2de0d63f82278b33fdb27fba99b0ebc56ffd364ce6361fc9ac6d78f31e3e4418cbc78916365fd0e7735fdcecced21e16aaabe56cd72250bac0cb30151b3
 DIST rustls-0.21.12.crate 285674 BLAKE2B 44977600effb314aa3c89609059c61337905f0380464ce05b4e91783f1a1c9076a016c8957afb3d184a7a6d076cdbc59e4703be22fc15c540e46a057527ac1ca SHA512 7e48a990ee69fc298df45d9a0de9b5a33a56261ec3f79ff16065cbae7368705c1f3432b77e3262a6141df68b19cbedcccf16eb271a54202049435c63454186e5
 DIST rustls-0.22.4.crate 333681 BLAKE2B 01f84b7f44883c807d8651b6058647180d6e9d48deb51fab0e76d7b587ad11face13215170db3bb7d0216505eb108438dcc3bc08ed2080816401f3955f73fbab SHA512 0b62c741b73dd49dd9d5531c9ae749fc8eedd4a396c5b4c02b1b33062d56c84e327e12f5a984b9ca22c7984103896d4ac69899032397dd6eac1b737e0647e2da
 DIST rustls-0.23.19.crate 333921 BLAKE2B eb7c1354ab7fededcefab1664c4a6f9c893df36a222a9c7cb5d56c74ac688f4ceda086ff7473926cfe5db60a1df13f6938e9ca9794c871ec842b8a4a641d2e69 SHA512 e1836edda343609258deda49725a2dfb46bcb98e1542c877d1e4262b52b39f9ec018574a366d534d39792c832bc03cc99e5852a35f078e9f827161eff45a7553
+DIST rustls-0.23.20.crate 335933 BLAKE2B 754a580f74b16ebb8f0f3dea9f3730fdd0ab9c4d04b0abb5741ecb69548cc32c54713636922031ac1acf2019df602db101da2dc363e50f224c815f1f8edca37e SHA512 3778f649026b59c4698bca9207ecb516a237e3d782d7727bcd93a2a20f0ed7b02e3931cf956b75cbec8fd806b54a9b231e3b663d0123f9894b54283e34e78dfd
 DIST rustls-native-certs-0.6.3.crate 24438 BLAKE2B 5f019685414f19eb709ad61caf5b3df4c8b498aeac499b1e841d081f3bafbdc66a7f3892c6cfe699d5d2b702c3d1fbc90f0f6720e4cd5bf8366c91f94a02141e SHA512 53a3a4b96f05dd06c575b2eb62eb7b6d026bda539c87c0e2a4bc84fd332c6401a825135fecdda39c489b0c910ffbe4d42c93844fbdd8da4fc2badad400b27264
 DIST rustls-native-certs-0.7.3.crate 31564 BLAKE2B ca94046f09e51d79380c06cb62413f2df5bc4f68abfddc5a5a60dfc3fee5aac6aa0568b42e50e7aa9a55e6476a1a4afd8e188c32c7a0282a1632068ec399f8b5 SHA512 3e7e835c8fa392f4db94ea481bf51fefb6c632a085e2c8b2df197173a4402d78fde7ff8a964edefd3efb48b2f473d0cb4470c2f1a385a74792f9caa4c3cd60ef
 DIST rustls-pemfile-1.0.4.crate 22092 BLAKE2B 9a776027d6e43a336ecfdd6713d4b1e6642378f81b73c97752563ee1d2cac5b3988afd48c92d25d55f655a6fa248436954aaa0e0bd9c7c679c987ce7df0cc99f SHA512 bc748ee06f2c101d8e54e8c4555e88c5ca824ac7bb0182f8e49bfe1fc66d418d2a3da8e454f3741697f491ad0c7bc8e924a752697023a191c1bb6eb98c48aa37
 DIST rustls-pemfile-2.2.0.crate 25849 BLAKE2B dfb94a77fe9d86b17b0c6badc6b715f247e9aaf0b312bc9698dbe8d38fff281428ceaec2ec73bef8009667dd93536dda2bc7e7c49d194b36244dca38dd86d577 SHA512 1e69f0b72c6060eb0a54ec8a1cb51809525b053771a1d417892205f8f5dbcf4ba45250fc0d6a836e0cc8fede06d934f0a90c47d475cd8e066dcb3f7504ddaf17
 DIST rustls-pki-types-1.10.0.crate 55134 BLAKE2B e61e78231bb48b6b249e3b1fa6a6edde4479c4b263ad78f78fcb78982d4fadae7c67ac08077b9b0ec32d0f0d527e12f3ecf456ba11f9740854f0cedeeb881d82 SHA512 8a5c51acfb97cef6e9aa2516b3a2a07f6fd37884b7597bdf81e16bd6ad7512fe45f0b95f4635963fd6e74c0aa79fefed1c3f1a9e1fbf7ab78477302fc333743c
+DIST rustls-pki-types-1.10.1.crate 58944 BLAKE2B 1bf83e046802a5eef5dc597bcbe045a7aef146c489ef5fca442bc20a9a80dcb2d15cc8e07ffff45890df069b99698bca2a9463d1c2925a8f1a5eaa673ebf621c SHA512 ec63005b54bb9676fb6ab3f7a399aa816881c34670577e8c8de7f86a46a834e71c2363049ef152475d784f12b6cc9301b4fa20e9d478e95a8f1b9ad75f6ba2d8
 DIST rustls-webpki-0.101.7.crate 168808 BLAKE2B ab7177449be359e17f1f4553193e96e71b8e26e1298a0937af658b1a6f9485f051183d1bf8262d52430ea4c3b96263d1fd903c7a5f046bfe5f87b6b97ebb0672 SHA512 680e3d52f699c9d6200e2e738a4245a5114fc7122546c07d3f15f1e6741a52275061b3e016c2240f1dc3eb9f701f7346193bd82e827274fb73b8e9e0d5af4e68
 DIST rustls-webpki-0.102.8.crate 204327 BLAKE2B 8db832f181b46bdecc419e1433dd5550bc181cbffa1961aa90b2533f92696ebe15d71d742225bf806e2dc3a4ebb110d48bf62b0677089df1eede6d5a072c0a28 SHA512 8cdd5d07bb8d6c3f0d1d6663babc3b7ccbe8c9b1463870a3dd095c67f46addf4097a715da796c70f1891ebc1d045ae7d7c3a352400e8bfd6687e6cddfd33b1ba
 DIST rustversion-1.0.18.crate 17794 BLAKE2B fa35445404b836214bdbaa3de8e43312b6d8f50eea32540f808a6255908d756bb1a5dcf49ca6268a1d214c535c2ee770e295c0e7d6430268142a190b31032421 SHA512 263d2cef02b6df4d38b35af7a9ee3a6a044f160f3cf7c6771528f23dea342232087f73f89e419ef7869db771e73c273c05b3dccfe9e29f707586b2059e820645
@@ -519,24 +584,32 @@ DIST salsa20-0.10.2.crate 12780 BLAKE2B 9627985a2b5583e91cdbefff2a71af02009b1905
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST saturating-0.1.0.crate 2904 BLAKE2B 952a91bb4439baa7ee4737babeba776fb95d23eae2512c3e21967f33548758b7ba0a44e041cf730d6d7bc839c5398464977b1ef33dd742ab3260dc3c194b91cc SHA512 47168d75abec44a8f12e8d7eac65052ae3751b7ab6dae3b5830e27fcb2b5955df389bdb93c82def00ace6901e89267cecf2a6fc294a9974f8e0ae9dded6d0eef
 DIST scc-2.2.5.crate 130745 BLAKE2B e00226c3118a84d7f2f1a7bbc1c104db8199368dc5376f116caf77c986195394b8fb9cdd1eb7a399ce18f699fd22d185763acda0fd211065806ffa0bbec8fca5 SHA512 e2ad4cfd2201b9cf35ecb3397d29c0469c8a3f8366bf85d270341b1936c36f6eb4bc38e7eb5407b7287b38f6bd786665b486b54972c3b394634256ec1e06b5ad
+DIST scc-2.2.6.crate 130721 BLAKE2B 4d52f2160421af4801fb85385d82cfd3158c618fb2871255891dfe2f724727fa6a1449ac8be92aed34fdb01d2169144e167cc46ffff391714dc1db8ccbc47611 SHA512 b6bdbc7e9436a974b586d2c6d5503aa024f03cf6b9a8b78ccb04001809d873aa35a7bcfa957210769db02bf1ffbea1e8a695247e7cceb87285328ea1b1b75fec
 DIST schannel-0.1.27.crate 42772 BLAKE2B 55b3cdf596d6d490fdbc10298eed7cb1b1bb8d6349ac8700ac2e7db66e1d75f0a5bea5b1b322bf30cc0f982262e96aa421998151a8ee1e620b5a09d25ad4263f SHA512 f469d03c2be014c248e7b6408f541584f250a9d58bc8dd8ff4d1e63f5720cadba1c0579b1e5d97b58844fadaeff10e9cfae6d5cd33c5de0fa4ebe699a8ead4a8
 DIST scheduled-thread-pool-0.2.7.crate 10554 BLAKE2B 04f7aec6946828394e7cd6961e656acbc29a05b334ff0ce8ca2fd76ced4db2ce663aa6914a10ab33dd306ef99022d0550fddff7b47512aa4320f36b67db2292b SHA512 3215c063cddfe017e102b63a8449c6f624d190547ccfffb912968b4c4975b70d36ce2c9b3521f7527a053fb89b9513903bde46dede72922d7050e87f76601f3b
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST scrypt-0.11.0.crate 13440 BLAKE2B c2378aaa8e81c5b18fa5954b7b72fd3c4e02f61e4f8c8472de4822279d3cdbabf26200492c332581e1d6397e6b4a2e62e38bc09e5472871501c1883de7649894 SHA512 d7910b277ef814a470361c12a7f2c90ef5b1df56cba9b62662f52a36f076872cf21d18f6c81d33d5a7e94184625753e8a6224d6559ab3cf82ae1a0b7f704e544
 DIST sct-0.7.1.crate 27501 BLAKE2B 12f63e62f49a0ed0c5a62c1c9b42a83c1df43401ed1de85f993167d8fc52733908e58ea1fe76cd7ff6128d4d6046d7c0335434672ed1865c8ddb1b3fbaecb590 SHA512 6030295b3b11411f5a7e518db1066282bf11a279c27414c5e959cd430e9fcbb7358e5d69bcc68c8bf696d4c1d9579ed7218b7f9dfbb61de2271c4c3d3316fb7e
 DIST sdd-3.0.4.crate 25303 BLAKE2B 9047388b3d0d9a136a8a6c75c74488eca6d5a9302299eafca9e97c5cfabc2a7eb3f76035c21f081d6f3f9cc104fb56458a1b48252c23adfaf74e31cd9dcc8560 SHA512 e7ab851cfedb69596c5497295d0d66367e3e9e6fda5879fabe131ef653574fbb1dc53f0454eac12417d0f776381319f6b218a6a2a27c6a0f55108aa9ee2b5188
+DIST sdd-3.0.5.crate 25330 BLAKE2B da350571c17efbb1575a392c32e96c021681f417c45ff9373f50952ca932f455b0f03f81f5bce1d056797b580ccafc49da5dc9d9378641b4d7882e96905eab22 SHA512 7846304e585910561c13f7ea765aeab8f41c47b08c70509ddcdeb28af409c7453b0195cb28ee824390234f51299126304d56bc160e43986a979f3c282ed8792c
 DIST seahash-4.1.0.crate 31976 BLAKE2B f553bcff7af9da9b024efd8db4ec8cbe4100dcf4ccd8f627c724fe4a34b678ef0be8da44e92ea55c4622b9f9f37228792a22c8bcdd54e652ca926eb3c7d37655 SHA512 4d9111dd2e491c7f6d49e0b79a3c23628c02d6603ac46e88ed137ca737830003b549ccb38087679de2cf0b02a53065b89f8d79e0ac9ddb66844d970cc6383f8b
 DIST sec1-0.7.3.crate 17979 BLAKE2B c30d4e617f9c0c21b80f14a7df88a164ad43f4c18fbedc1ec32af41193053e67ff6ea83db54f46c8cd6389d930984120c2a1688662fd8083e0c23bd4995d510b SHA512 be646413d84b39a43a0af478854f47db3b167c2bf1bedf7a58392782c423aaaa38df3b3676f9807a98c6128152295c426edd16d67d62ae7048caa635bf39641e
 DIST security-framework-2.11.1.crate 80188 BLAKE2B 844d36d2b2216cc7055687110d54ea783a7ed9bfe6375fd4dcbea267ec85531e666fe002648110315f42c3364ff5ff5aeba711cf8d1f5358ba65c8393e96f55c SHA512 02786d62fd9dded80bae3942896bc8fea2a90763427f582bf5d9f127ca5682097b59b5dbff2cde373198ba659316ab5906a68d3141ba00c7408b73ebe353fac1
 DIST security-framework-sys-2.12.1.crate 20112 BLAKE2B c03abcc08f068e8cd4dbfb4d5054b4c0a75cc68f0dcc955ea5f5f958db9c28588841723bd7047207dc51bba46868fc1b8d3367b612c7f4a07984d94fc8710cd9 SHA512 5ecae3e1280d99e3730ca3be3dfdebd16971d54b8fe167d29cb07f7b3837a2bb9db2d8131bab679c395e329b10ed28ad9ad8d6764048f6019587d5e2b52c7eef
+DIST security-framework-sys-2.13.0.crate 20496 BLAKE2B 5ac84d004ed09afdeeaf531d96e81fcaac3af32207d7c8b2180a506fe0512fe6616ab3b4244c75667088e7a8215c1d33dd9274a60a400afb1952254070dbbb15 SHA512 a5b69044571e8426277b2ac241bafb53d268adbb7340c0626cf00fd356c654baccdd36277995d38601e19cfca00da8481a9c861d01bbab3ce51685a7dd186832
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743ad0feca0929bf2409eb81e03637ec5f92ba9f38ea386c4ee5cde72bd3d2042083e2fb0d6fa0b839b1c5093a SHA512 5ea1fa17c08d1280c3a4bc8d28494e88ee05acd5dc969ef6f0c6f91fd3b5a8fbe999c9e8bbd2da383413038b8d29fabf02b87bd5265bbb8333f3fcbe409103ec
+DIST semver-1.0.24.crate 31267 BLAKE2B 934f55d953ca52f6c11696889182e1e4c660a6eae3917b15b411d91a18b22c6a1178708caf95da93e70e6ea97c0762ed9154333d60bf0a08b156ca7b50c4077e SHA512 751bb04fb50abfbb92b2612e1d1097f612a1ceee1861852681d6ad67fe459d77a72898903b14f2f01d8185fbbc022c7471913785610c2a8e9d6530e48094869a
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST sequoia-openpgp-1.21.2.crate 3017548 BLAKE2B 86fd51244c808c3fa44e2722c7028bc2746c9ae9db1f6620f6935ae7c1af7ab331b322fd9e8b28dd0119c71aa72dc2a3e2cc144b84112ad465ff2e9cedb7571f SHA512 bc8f0121dcbe083c688d14abfa9dbe3f850aedc02ede98ea4c56f8b8fc28adabcbe1a2ab02cc266e35b28c1f5f563377422e5f8f99ecee0f21eb05a32b94e8a8
+DIST sequoia-openpgp-1.22.0.crate 3017622 BLAKE2B 83be10aaa9adcd3af9a8b4657474892d4042c262c2349e2b7cd4669c23c27606c04674317daa6c143f8277684f58a1b85a2df77bc1cfeff3d79473480937401e SHA512 10893cff011ced034382d4fca9c04e61b7bdb5f2f621cbf4f36d611423248c7b411d7440433607cffdc1d646898607ede159248d1e69a6d2ca69bbc14db6f95a
 DIST serde-1.0.215.crate 78527 BLAKE2B ca8e1175839ca45a4d78a155f5943396211408a85e0840b065c52948188010653d68fc4fc7b63bf2c39a11a6988abb7f6f3c6d878ca1373596e0a5d62186e109 SHA512 3da13f1a74393f1fcb6d659b5e060a11ecae358f55cdf4a2fd05bfc863fea6f75d3140d3bc74902f8feba8cddf7dae71a3f4e4e78e78e1b08ed46b3e4900281f
+DIST serde-1.0.216.crate 79000 BLAKE2B 98c0f5cee2f9212c6b7620d2068665379471ceb7557d1454cab9b1c2120b526ef597fbb642f65440e70f92a4764cad33613b478bacf99138dd5bd51fdbdbee6b SHA512 baabf4c7aac4a540c9ed18b336662087258b71c9cb0e547c8d83a2734818ab2cbbe62f910d812eb61d3d46e653c41a3eebc99b1d679bfc51f95710c71a8ecc20
 DIST serde_bytes-0.11.15.crate 12191 BLAKE2B 71cfa0a91b274a2f31c2541c230ac16041d4454c56c70206f9b1874884cc9bf5b6ecb5a490f6f849daf391dae5888b5cc7428d8397b14e47cd8e13d973b1eeb9 SHA512 96c9f7749b15773df420fae1307ff1a8699856362775a9c9ef6a9eedaed4d5bbd4919872d8c2f9c24caed6dca6e3d82b929a9a3e7536df7e2be954bd1f4d56c4
 DIST serde_derive-1.0.215.crate 57092 BLAKE2B f28bb66017599afdcd8d45c514b8e07854eb944c1dcf931e052a01ce421e0de6c20c13b3867da5922e2153e25ce88bf9fa27e2e68ddc9d212977f71fa0bd6352 SHA512 cae686bdf10c683149956ffe1c64fcf3e9b9bf0cd6e33b4ce7429d0ca35b9fdb55443693866c1202fa79348c6ea0f49ab3be3d5f857de4ae0818d2b4c8c67d9b
+DIST serde_derive-1.0.216.crate 57674 BLAKE2B 12a9228679c16288c08c8b256707e276aec79f84ac7af0c4cfd1f109500dfea80438df17d798acdd30a9743c753e70093b22bd324217529bac483f257682a3e2 SHA512 80fcb552279ac7562297df878f2f5e9ac09241701f5cf1088fcbf473b638f58cd3092a7930d8937ca0df9a47b9ae1a42d490cd46a275259cd8089fe8f5426469
 DIST serde_json-1.0.133.crate 150739 BLAKE2B 7891eb5b8edcc7fd09ab1e15d3881ffdcb629aa39f2bd758c0505700a5f2dfabd85b1b66c3b094268bc1627b346e204c792f4ca61efa76c54ab9cd5744fb0ee2 SHA512 20e65ec87bff319897a141960d13deb5cadcf821209c1ee8799f1dc7f458ce432bc62c16df5bdada1c8d3cc01ff23b8125e8fa0a03545d4614f32efd687dc69f
+DIST serde_json-1.0.134.crate 154351 BLAKE2B 546f8ffe9373444e8c9e81910476da281dcef10498dceabc8bec9f9063c55f4a9033b83586a09b0f410369515882c37712a2bd75ff1fff05815d904f37386124 SHA512 ab6323799bf19da8ec6e6c428370d37cd230192b45ef54d2c65c7d83907b2dde71d51650e44f1fcca1084e75e0e195e97b28437f53a331bf48effed3d59b58a5
 DIST serde_qs-0.8.5.crate 44854 BLAKE2B 85beaf2fb1c5918cc4cebd536b351e34e0fdee08659ce1db4c7776a8793c3765f0f9c525f33db239b7a52d9e6f997e2b2fb14b1531a5205dba4bac4fab79ded9 SHA512 c9c94a791c5dbd6c87a6c4f487c98f1be44f7206ae0de1ff836fa43b2c867d45b5019f4b91d3d9dfc764b3043ed4f6df63e8de208b6a9288a2e283588b970274
 DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
 DIST serde_with-1.14.0.crate 114325 BLAKE2B 5681438f6e9ce0032a0b0bd224dd4ee9680a6b4818a93cd8e7990e2e88b1425f81540de6dfe71f5162b8ea516c44458d5f095f815e86079e3dc011880968c685 SHA512 643183189980641b904fd181a699faeebb95ce1eea4805cad8ac72f32a2d47dd4aaaf146f7489c0a062f7867076860cae1aa73e12cb96d542fb0991231a51923
@@ -563,11 +636,13 @@ DIST smtp-proto-0.1.5.crate 34660 BLAKE2B ac043fc8059aa9bfd19f889e53deed3ac4b7ef
 DIST snafu-0.7.5.crate 65229 BLAKE2B 7ab41547d6775fe92a0be3810847a00567cd3c82fe12b7f6f5170f1c5ede011b763fcc8f470c7d4dad9369956e9ce6d5e66edd4d66f4bb6c8a260dbd1deaea2e SHA512 50a10d3d1c13a28136227219da1e43c8655309bd1ca44e81a76516ce7661ba3cda8ba2f4e0ad16b3b1e7d5e07b2dcf50e158bbd6ff54077709a105633e6bcb50
 DIST snafu-derive-0.7.5.crate 28208 BLAKE2B aee0f63ef6fa1c414a42d6bd625067d5c1065ef6df4178ace3c5b2bed733f719126ac428b723d77522cf5b1a384382aaa03c0acfb32a7b5a7703b3212c2c9d9d SHA512 6e07fae7d75ca975bf2b90ba10e2bd7368a0bee7670e1d9f4cc90512d9290c9d131b4fa6accbf6e177cb23a17072e029e879a55c5b1bb595b3e4ab447ce445c4
 DIST socket2-0.5.7.crate 55758 BLAKE2B 148d2e2b6610895ec555b1357b340576984eb76cb3ea719f85af50cc4215b2ea2db739e2a61434c09360a0c1ff8e05911764e18dc4a59451c0aeb0eb60b8403f SHA512 ca37157bfa970cf3cee8b45c7fe64930becf2ffbbc309ea4613be968400279b70edd084d159f65b76fe1130917312d81455023c0d7c1bab7a59c79542aef9dcd
+DIST socket2-0.5.8.crate 56309 BLAKE2B 309e5a0e46d0b9debbbd6049a138e56b82df4fc0e9d1115745ed935eb40c81b004ad748844f641934e13b5b88773db5cc4a57fc9e61dc82b5322fa0232110864 SHA512 b7d03608a3d4cf3e2d1539b5a375412effcc96279e8f57668fa8cf67b3f0a3a6b611ea5e2e72f282460582954acbb5364320611f7798a11ec9e4833e53830b60
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee
 DIST spki-0.7.3.crate 16409 BLAKE2B 6b39144e4e718ce5eb454e21ee89fb936ffd31ec99554b0150fee47bca396bdfe4ef39603ec029d4af4d8c4c3ba2de7f6c549244f8c20114de9b43ff14921681 SHA512 d33a6a7844b33c37628024ccf25c1a631f7a6661595e063049b8c9a9b4edb28f0335397faefc592c6fc5e96378b870ab5dab9b0649c3387577b2370ec8210db9
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
 DIST stalwart-mail-0.10.7.tar.gz 7000660 BLAKE2B 6b4ee19e664e9f1a0bb283f2dd66d92ace4002109cb211766fff8fa2d5acb4a3d93db02dc5e80d9794a02f1fbef617870a47d2613daa853f9ec798cf873c54e1 SHA512 d6c7d7bdda91d1b4ca22667a351888955a230d49b621e918e682e4bec6b0cfa4e87bc128e555612a0055a31dff18fb02fd396b507235820e0e6b01aff022388c
+DIST stalwart-mail-0.11.1.tar.gz 7043011 BLAKE2B 8ea520bfa00f1c13af84b452ce1684effc1d36c4f5fb8578f9b4e8558279c023da8b61ab1fb63f65c4597178261fbd19d163a3e41faf46e20b6010dd71eb28a7 SHA512 957ad7b6054364f0c8e2153a7dcb8ad37c9ff1eb28fb1e232c12b48bdbc2f444b49eae6c62957f3a11cc912699bddd5b4657964c56334f7701726debedc564d9
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST string_cache-0.8.7.crate 16655 BLAKE2B 9a017f3248a3d5e7b8c1a05462a882862b20174c7ce5dda1568c3d3f61c422e84ba2ccd5d6dbd726d1c752f1eaa8062a179470927a80d5bdda0ce530d1ae2c17 SHA512 03f9cdd2c01c0f233284851f17eaefebd68a91ae2ed2b231fab2d6d6476bd19e0696d7d3a74fb6ecb2ec36b89e79ad966ab73051255c9e194bcf9c5029fb8479
 DIST stringprep-0.1.5.crate 23573 BLAKE2B 8b5ae2f278603553761e0b98a3f0a02c6a81fd117fee57a8186a015a58ce5ec8d91d9f3decb393f53e07d8df05963f399e63afa46bca937b99f609204582aa50 SHA512 f5dd6ee410e42f285b4da85e76d514ef697cd995c601b5ed23e25f702d920dcc76f15fad41610b6554b692ca0f939f329845535fe4ea167df3ea0e628b1da447
@@ -577,6 +652,7 @@ DIST subprocess-0.2.9.crate 46463 BLAKE2B db082824bc0b71a73f134161ad1bfd3a3f9224
 DIST subtle-2.6.1.crate 14562 BLAKE2B 3cf4940b7a01f04715da1057f6a92b1043a6b86ab2ee7f9fee0337b680ff781201d330409460f6f90b3f81bb5fd4b563e17c762c6e824ba3b0af99e4ae7d66bd SHA512 f5946ebd9bcb8776ee3446abcbf4afb3cca5d8bd847cadda87e864333ac7ded537a3efa773e9648adf20ce4add2c1da85172cff88c1e1a3a6cb051401b00c6bd
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-2.0.89.crate 289852 BLAKE2B 4e2b06d2a0ea9b8970338ab61f8c5569cb7c10466dcf139576d0618c3690cfd23c98b66f0714c34839364dee72df6a6d8571f73dbf03ecc347fb1effb118fc2f SHA512 d172936f04a383b7b5e79dad328e70ea3c4faba4a88d0b6d186645413e8698434d30f53012cc9d3813f617c8bef75e95a2d064fdabae7867678abbed22bcd910
+DIST syn-2.0.91.crate 291128 BLAKE2B 039debf1d4d1015978e2b3068efe7be926f84ffdff40f8fc78778afd37192a640e851cfc1642608c7f95d64164ccb75b556d6e3184cdfbaa1450210143cb006a SHA512 076bdb5ca8f23997a8df6ad4027c0d9b859ea627450d2e23cd9863606863185cffbadd7aba20416897c74a5b53aee1946cc0116c8af9536afbea565443816c2e
 DIST sync_wrapper-0.1.2.crate 6933 BLAKE2B 0ec797ddead298a95bde0a508ae942a4e90943948d3c1e4833fb3ad1cefd3566b7fd1aa0b133d614839707e3f416e3e739099ac73441527213da81b6d1c47d50 SHA512 ca7cd7a6dd242fa420e8dba820117d85b1b11ea6a9fd99c92a5a260f12263cac0c034c9f9fe10090d5830fb5bf5eefc8a5a0d0b5a40f3f809d69e5393693d5c8
 DIST sync_wrapper-1.0.2.crate 6958 BLAKE2B b2e162f982ea827229dcff468bcf31c6286c57ea3491a909784cdb50b0ba36c3a1a6fbdc7b34fc2aa9a7df1d174393d61ea9dc7ab3439a5e1a1884e2473a70f8 SHA512 aa314a6ab3ba028d2a169ea55a50eecf3b73b475a81c91330430ece9f1734296562627a8c32fad51b5a26796931f364e2803b3a13075ccd9a0aa614d5220903c
 DIST synstructure-0.12.6.crate 18429 BLAKE2B 7666cd83f82910e036e5b57600dec9a1c2e559453ccc2f1201e2ee4ba64f2ee62cfc1046ded5cae64dd183967b9d71cbfe4b60a88bcb93706eedd0c4ab69be4f SHA512 6ec5dd7ade904fb6d79c2be595886289846e064b8c4100f780d8adfcbb41e6ca67f4b1d682212f4673c2169f889a042049b31161ec3cebc3f399751124f01f9c
@@ -588,15 +664,20 @@ DIST term-0.7.0.crate 37082 BLAKE2B cb7947c696f71fc68bab3b25cc6cbde74b92380fdde5
 DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a
 DIST thiserror-1.0.69.crate 22198 BLAKE2B fdd8ca8c8ca78702377d0bf7b253440519018275b105db980d63229d0d44aa5c39a703e14aa6fe453c779b3c864d8044009dfef893d2a5294950f067656d7a80 SHA512 ef50d2867d965da1dfb29d26faf6de273b5fadf78f95313f6caf44d68bfc610b9bd4b7544200b05bb0861231cfc84e961007f8db83c7905244c492037fd31899
 DIST thiserror-2.0.3.crate 25559 BLAKE2B 4222d28be8ee9b2e74d647587b9a79a1584b158a0eb9fc6bf642a1f008bc2004698d3aefdd0ad8305052bd225eb75e57d7040768ace9b0839ccc135c92ddba1b SHA512 f6a8e8e1bb6d6e10edc07c35f3141b4b3ecb46b943b4879dd8f8bef0306feaa5446d8e47b24cffeb4cd6c57b4715b86b2bc0716b4ef7dfdaeb080ecd29646c9a
+DIST thiserror-2.0.9.crate 28531 BLAKE2B 7789458ffcb381e2cf02f182248396c5e6c20a818e4c5a2c7da8a8f50099c548646b51dbfe0630a242f24e9aff65e215a4473e13f63bbffbd80a3429237c65c7 SHA512 b7b5f54cde87c21e8fac3526d5a140c0d64116e700d07eb28714df3db372a42fba30bb37817282d0ee1b5333f1998d1f628d43054e59fc39393fb567c3df4cb0
 DIST thiserror-impl-1.0.69.crate 18365 BLAKE2B 51663251ea6ec99c59aec35fe73c5f9760809d6b6b7eaa8ecbc8f6939acdc4d0ebc11f9034d9204dde7bd689d5e8303ae0be86e298745e9ef96825bf73453a08 SHA512 579eb796c8885feb01d27638862823acd96c79440655bb444c3445ac00121852603396ce7439aed617c0a0ac69f62102167fde5845411c906997574a46d6d9e3
 DIST thiserror-impl-2.0.3.crate 20283 BLAKE2B 3b9b162b46a0fc6e816b3dd6c09b6ba38224c4dba9fb41e4048cc4543c6c2735ee34a94ba205be0b193debd7cc42210be5f78d9150711c9058416e41e56ba2ee SHA512 50bb722db6bff4f18975312be61fbf201b8edb29a2c6420d8a2a1f2817403aa09c6de1269e7f952c4d4583f0dd2ab1eec45b26e5391b6bd69c6450c8e42019c1
+DIST thiserror-impl-2.0.9.crate 21023 BLAKE2B c2def0cfe9b9854ce33075fc246a2baba386d8f3a70f26516124f5ff4f7dbb0cd0b8887882c491f37652b565ee4fb3e7895a39cf34564a21e96890fa6e3ce125 SHA512 408f6a4c0f6cee36f69fff5a2f08cbd349db44753e6b6ac730c418fa1fc06ba7f69fbf248182af947843ae49d5cb5ff53980cdb18cb850ea8d7d9ac7dc8d67fa
 DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
+DIST time-0.3.37.crate 123257 BLAKE2B 5968d85182e3a945c194c0e405a3c771698472f4b4028a01870e8dedcfc5c10a32e167715c7c12626b46b9ddd758c72e0188b55e45c0396cbaa42a65920ae28e SHA512 6d007507f79c45a7408675b3223bbf83a133bbaf96429ae6a02b5db09acccf884bb8323dc6f3dd05e7ce87a78366a55bafa6c6ba31b04198a31026df4ef425e2
 DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
 DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
+DIST time-macros-0.2.19.crate 24268 BLAKE2B 18f0601f5307d310010bea20dc7171adc8600c5b2e6303dc9b38ebfbaa7fb59a029dddb627cf5a5b7fd2f7ed66186dbb5321cad0f90f3f85b6edcc901a8c2855 SHA512 c58aa596247a4cab720bef74ff43be44686db2da2978826a1f9b58c640113b5696efc2ae1746bf84042fdbb94bec42c7fc34f7ae6812478f55849a12a90dff5e
 DIST tiny-keccak-2.0.2.crate 20129 BLAKE2B 105a2d2af36cc053cd95721ea563108f33b8a3feb2ae84c75a04a65ed5d548dfe35d8b2e48977a82f725c0ebcf914f21157c547f4a74bb4d98c2e894385139be SHA512 c0219f23361eb07e0a68575c461a36b7286d9bdebae89080d9e259178d402b0c7762ccf33e65a16951ea168392322c44a24eb55189cf143e22d09d6dfc4acec1
 DIST tinysegmenter-0.1.1.crate 12434 BLAKE2B 837cbab8a07b1c6102192ce3e0e53361616469bf5c7eac313a63a2f30a75ecc8671487730fcaf60b6f76df2ef8e17b5eedd81a0fd48c3461408ab535afa92b41 SHA512 524528be4c8f4edc0f77acf4a405ece5c7e079afbbbb82c2b953d1de34a5b1ac9ce550633122243c5bea1ee6078c2e471794e796ad41192d647b133c262278dd
 DIST tinystr-0.7.6.crate 16971 BLAKE2B 33a248261c4cded41a81f0d6e6c8df55437f042b37f235c39787986ec562f0dbff50b282ad0f1483daaf49c4b33e6618e139a6677d1238c21f4e12082562b4ae SHA512 a33051848de248cac0a2d151760a78cb3aa62c787d84ff7aac38b11c0660e9188e4d43d43a77fb8676e49ac6102015e9c3db057848d809e71981851875d0fb25
 DIST tinyvec-1.8.0.crate 46796 BLAKE2B 720d0e6d881855a36779e12f5ffa708d3a8b96e6d0de9056cb33c9b8ce0d408f99b22f5b2bb9d64bee72a011fef846dbebbea2ccd238d7b951eb5ef0c4866e05 SHA512 b7b32e38229645965900f80f298685f13e6d13e58cfd6945409a6643ca9c9adc2621456956d5998ab9dd91c2db4ae79638b156ca0d9c7c5505023fd9b28414df
+DIST tinyvec-1.8.1.crate 47269 BLAKE2B d72ec2417520fa0481b8447e6d75e1f24731d38f9083a711185785174a8567c81f6416468b9eabf426f9d32683231e7c5e80202292d1e424f9e4ac9cc8b3e765 SHA512 db32a6beb1c86eb3e9f5ff2732a4acc03d1d684f0e54df5de2ecbfd08399639f47396ae8b17eb5f0122a09ba0c313f39bd73a6f7c44cc38d1891d1bdf3f2d176
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST tokio-1.38.1.crate 774260 BLAKE2B c30488cf0beb002732991f86ffbbd4edc4fb3661837cfecfc93b8cbf9972ff307ed4c41c893221207995953daa7123c8ae0c5dda43111df74f9192b82f2eed1c SHA512 72934b781cafb27488325de9226bcdfcd2327f4dac0d58a22b87e3ffa3604db431985efb8ec68f1287d1cf17a9c3273aea89558d19572ecd2895e0e64b97141c
 DIST tokio-macros-2.3.0.crate 11753 BLAKE2B 53429417a6fe3bc6c320ac5e321ffb2b19a64236a8a499fbb10b501d875e9d266fca2d82364a8aabdfecab46e4aef1b48d3b8ab3ac20086b54834c3e2f0f1b98 SHA512 cdb2f13141895035b76d38137dfd0e6829a5f8a617d0b63ec53ff51723c69e301d49f19c4b8b7e86c6e6a2cf58c1aeb35d071193029005fdfb9127f5a12841ae
@@ -604,16 +685,20 @@ DIST tokio-postgres-0.7.12.crate 79307 BLAKE2B 325718c0f9fcdb913e05315e5de545798
 DIST tokio-rustls-0.24.1.crate 33049 BLAKE2B b061bc5895b9d7e5aef96512667673ac6fb813a4524b1f6620af9e2598425662b15b5e07d3896499b8a24d820462d15b71a2b9cc804886d546c8ac5957f28529 SHA512 93098f34d117107214e2e80e0e6c030423850ba160d1858b5149c165643700d308dacef7723e45b79fc911ba13bc1bf363c89ccac047cc6636e48a9a5a9502fa
 DIST tokio-rustls-0.25.0.crate 30541 BLAKE2B fc85306724dbb91efee7924340e0cbf4557cfeb149cf11dca84e37ca96e6ca54cbe774edaffdaf313da11af98ac03cca23bb7c2ff6ea551f5328a3bf3ee9aa02 SHA512 4e04669ecdd8235edd438075e6b125f6473e117adc2ae13ceaee7668705e81a87f97242253f51dea204fa1bb3b9f8f9f21b587b4edc7c2e58e375f5537ee5f95
 DIST tokio-rustls-0.26.0.crate 34253 BLAKE2B faec8cf5b55c5b68549659e82e656d63181b8384d170690b8a22e00b9b7bf4f63cf3f2a0c7a78ed7adc9122253765cf8aa0adebfe620f642f08268ba66ba610e SHA512 101f2083e04feffec48204388c4be3d51fd6dc45bdd04bb75bdfaba48cbdd89529e14dda194ef45b2d78530cc74f128a763fb09165a52d738eb17adff7c56664
+DIST tokio-rustls-0.26.1.crate 31214 BLAKE2B c5829570c90b5d4dffe73c8b3a5bcba799bc48e8b742ff10030805067201848c362fad9f4ff319b003eb734b078389a35420186e90a434464f45dc1b6b3391ad SHA512 0cee6b356ebc4be05c484d459ac457280f41401093ca942cc61a6e6514dd4a48b1cc921f7dc02f9c8bc34b751d4d40d6d4768b21193d5a12c38ebd140bad4896
 DIST tokio-stream-0.1.16.crate 38312 BLAKE2B 39b9ccac4091e8d882e1dac43cf930bd4428669add837c2fa989fabdde8f2edc5340df83745600cab1d0880a87668ea6ac95dbcdfa02fe171f3f763887374e9b SHA512 1e9013ff016b59b99b29465f42b4dd61f0a7feeabcd35ecf39a26862ce3e00ac1c818d012d0c62a7509c244d429c8a10f9afdfbccc2e178a5e62fbfe097ce39a
+DIST tokio-stream-0.1.17.crate 38477 BLAKE2B 9b8d7307ad8194145ff8afe682874d9f4cc7b06a11429005912dd9bfe1bbfb980876bf831b7d715552bc86ee18344eec331fc18c8871681d58171abcda7252e7 SHA512 c44c5da6f916ce128e8a13025d9c3e92ddb4c82d2cad52bde4bfb982e6f83eb89125b616f89f2fbbf9ba8b7f800ce46e33f43104a59153db2e950bc2f0d570c4
 DIST tokio-tungstenite-0.21.0.crate 28159 BLAKE2B 5ac21d0f51f717e3816ac38ad957d1300bdb16c60d3b6041c80a494dee8b08d12c1b20d7f00d08500ad2f092f9f2c6f2e7c7c00fba1d0f34caec4525e61dd85d SHA512 2ed4baa38ed5f3e19250af71c9142412dd96d59c971f9813e9a633c9764c580f7ea2141719a82251c60c9d2a5fdb22b311fc0f7a297f9363585be4d140c1747b
 DIST tokio-tungstenite-0.24.0.crate 28904 BLAKE2B 09c4549b80762d155ccfc474dde1ee242a2aa704b557ddb9220cb09ab902119faae1db3fa8dfb5f6661c53189923a6bc45e431a7282cac448d88ebfe28295d37 SHA512 27fb548fac3abfd5e3aa96df4dcf938095629bc64d04488a8fb56a436ea8ed1d82e8cf248a6d283042e339cc08cabd23946c49fbcea2e6cb6e6e39beb2b408d3
 DIST tokio-util-0.7.12.crate 115177 BLAKE2B c6018d9d228ca74f198767ea9be53569bcceb369e4dc9ea10b31e7baa0a4a6368f1ee23532121499e31f2da3f825184ef7f8e00911efb1c2e37295c1ea3ef19d SHA512 df30a9b0cb435bbf3030c1d5bfd4391310b96833acfc623f5343fadd694fc44601fa07663fefa2cfc6719d444632890efb696727d9c1049376fc6e01f1814c78
+DIST tokio-util-0.7.13.crate 115191 BLAKE2B f4acc65d0fd14a88d46545bec2313cb1f25e1cb76014d09c34f8a8be62c6901ab09b18d7b32fdab58f6594fb861bfcb8bfdc8825871347d7eabe2bd8117768bf SHA512 2a1e8fbdd094f81e00ee87eb5ebc4c62825945048105970e52d6d0a872769d268a41ddf91c60158c02a303ecbaa1b19795948b5416f9bbfcb079c5b27d39d51f
 DIST toml_datetime-0.6.8.crate 12028 BLAKE2B 62113366771f22b437b2ed0d3bb2489ae9078cb589cfad2ad2e92c81ddbda48f689e5a573366eea4f54c2b3cbc6b37eaa8b442b6d935b631a992de4917268757 SHA512 d38b98db3b2d4eebd3001d88e2135b6fdbae63b200f7e900c6bb9c121dd3f170e557332bd26f237312c1cbef61666716b0cf550c2d730f86fa7cd9eb5f64a16f
 DIST toml_edit-0.22.22.crate 106387 BLAKE2B c658eef2dc8420266a6928d7ef46340372af2593e4db0d3a67ec88aaf8f601d37d1e9b5bac231a799be8a2ee68a7d98b5f651e9c109d23d8b19b60cf75debddb SHA512 0f98b371f7e27ae7f435a207c0915f942af145cc5dfabfe6d57f2b797efa3e706025401e501fccc6df70c001ce27051381556b8e7824447edd23ea25d047da4d
 DIST tonic-0.12.3.crate 99380 BLAKE2B 96895bbd3673a6cd59cafab2e572d7126f90a7449761f102c571626a6e68aca9b4050058fffcaae58704323420d711ca5702bb690aac45d07452f4182256e6eb SHA512 c0ff1241a0e31e2f4f513e3ffb1357b8148d9c2b8754be4e05ea04ab432c1014432b216af7877b7c05e78aa48f7fb84705faecdee3ac077590a1195bc4cf5ca5
 DIST totp-rs-5.6.0.crate 25093 BLAKE2B dfb6ceebb9206f94f47aa1b863b1032a00225da0322186238527a2cd96f6ed1a0c4a6ee98de6c451132a64e8272886898e66dfdc5ea893c95425f242107dd3d0 SHA512 c74aa33a3bc1993e51075604b11128ca4910e450eca203623de980e227d82d6bc8ea89baa2f20cf5d6747d6da2edb4e24046942f31b7087c1db08f5fec9f6a4e
 DIST tower-0.4.13.crate 106906 BLAKE2B 6a8f4455dcc69f6c03af703fcfb0e6b214c2ce599611ef78fd41cf411ccf06bdce241e03a1d85d36cfeadc72db9f3d9b7ed94c4fcec466c070f2357ff6e27360 SHA512 592f23eee5efa6a4f0d2ffb0d965da7e0f75a90a4320a0d0dacdd5add66513ae40902d21af2bf683573133ee984866987df2ae8eb8e632cba7a9d196985aff8c
 DIST tower-0.5.1.crate 109627 BLAKE2B 5dfbdca4a25372651bf3a128f6afac6a9c2b61fbe70f78a59fceb11f4581635004b5415183ef9b1ceb09fb0d4f8aa7412f54c4cabc534d3c01554cd7ed7a190a SHA512 69e8926182f72775f9f30b2680e8ddce1133082c87123a39694d42b35c098a8ca1d003282c2bbee7aee30ce2531a96dd0734842d4d2233435be0a7a5bf7fe6f0
+DIST tower-0.5.2.crate 109417 BLAKE2B 414f17e97102224f1fdf23a03e6aa958e0a2d6cfcfce93ac3f2e911d68267aee33aa079c94540626ec3fa895e1780e6e5d18b4831f9f05cdf3e8c26ff73b7279 SHA512 e89c4ffd83fec3566334a4c4e9151ddeabfd3437269afc8bffb46201391bc1cdc82cbb97c69643a30f8873e87c511ad9aefc6c081241a4419fe315c99c61ffce
 DIST tower-layer-0.3.3.crate 6180 BLAKE2B 20435102dd62113c3e961bb28d7b18ac6f8ec6d5f0051f511e6f5eb044b20016f247ddd1b8eae9dc9f1ee259d8cc31e0bbddd26f5a22fadeea4007a3011b8500 SHA512 edf36671076cd29bb32c29351b648afbf3e7134316988a697c7807db62de7a63cb0339e4db7c0f36ed60d8aced7f3e493318cccc272070c037b01e2dd189b934
 DIST tower-service-0.3.3.crate 6950 BLAKE2B 32ca66bff783eeb015af982b539acb63c9d426b931832b27aa45088382712df3894132a9e6e96fe1ed9d0f9e582b7a25b33e0ab73711acb06b4e134e69158452 SHA512 770cbca46d8500ff36fe84a9a420beb84a0e893dbeaccdd93a3970e746c893b5d32580182ef3017662f421e4b2d71f079ed2cf1727dcd5fc3443a4484f9b43fd
 DIST tracing-0.1.41.crate 82448 BLAKE2B c056d938e001654e03efaec7a11eb8ecfbdfe9af2099271fcefa43f4f4683b40c59f7111fdf7f27df4da38bcbe94f1b2ac0abb6ec3d6e6a0d165b9fbb14da3a3 SHA512 dffb8d3a1375f1b9d5418550a46cb7b1d92b2cc8ffbccb430a38f7731547960775bb42798074186711847d256eee30fb3e74078b69cb36f28c07d9f231dbf96c
@@ -628,9 +713,12 @@ DIST twofish-0.7.1.crate 12156 BLAKE2B 282ba2e6e4610297a67aff0e06db6089c57edcb00
 DIST twox-hash-1.6.3.crate 21842 BLAKE2B 67c261b2b0a93293717a4e2e07dc11df2abde09da6fe713b9d04917ace73de1b59b8d4fd9449ab46cb7cf496fad1e440effdfa1fae6f5cae4ca78af8cd019c42 SHA512 f7ce63e6e5ca79ce9330caf40b32578a5d2088c5d8ed371604268760d6e212d447d9e3a95378378a283024155bccdaea47597902c488a94c5d5f79770baec8fc
 DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
 DIST typewit-1.10.1.crate 61902 BLAKE2B 3f998e25231ea67e6e6fe2391fc9ba8f4475bdadb153e3f125768ed1320aefe7b6f43b423999e855286e34e60050f9d6cc8b937116228971751d8808ac8c3524 SHA512 3790c4217c8a8391555b85e20b4bbfe4089dffeb72532256f13c3b51956a1b7820f9da31285f8b70b706aba7d51a2c8bb3ef3f81050e8a1bee60cce6a539aaf0
+DIST typewit-1.11.0.crate 62046 BLAKE2B 9f102191b1db4f8de6c63b77a66bb1ad92c7ee4eb7d954f8e987faed86c2d4e5df185757757730dc90e1b7c29292c4f9c8a263b3728a9027cb3ef29bd57a0e7a SHA512 ae5e1b2c29685ae7bd52de3a7c000b105e55881a5920ca220968d0a06be713cc4c165e45fe1e458ded1541be3031b541a107fd15205805458ca017a6a99eac55
 DIST typewit_proc_macros-1.8.1.crate 1944 BLAKE2B 8f8ca4d79f4231ab2b1de8a97bc98346391a10f172e276e8f2b52e1cc5400152b3cb19e08cf9a57d80734ec8e61fc00fd496dc7873b8f6175509b1d44fd4485a SHA512 052db451ead451dca05cbbeee37cb39e1332014adf2d6d0dcd63f3bcb1d184809af39cd41a213d3398b99dd15fbdeab7cb23dd25b880adf67598a82d47b09769
 DIST unicase-2.8.0.crate 23843 BLAKE2B 5e479780dd3a690a98e612454761f0248d8106b8efa45964059a04eabadb78f0a6c598115e4b74d38a96c231272e1bde2b8f4edb328069ee6dd0874358613d50 SHA512 2c86abf8c87b87fbcff4ea9a6093d86b876e2e619120c6a9b055712a271f8bf165eb533ab9d523af2b516843a39b5bd549d9251f9b079748176451c9c820c0ed
+DIST unicase-2.8.1.crate 24088 BLAKE2B 29fe558490245cc1f9c551ba524ab452a4ea18d5f3e5763bc58e6b4c52e21bb8bb5e3f16df35bb96652801c3d96e53f8a39cffd31a0cfd1c83f0fa3161f4ed4d SHA512 99a3944a5c987376bdea5fe6c0797e881bc8e6f629c56120ce811c8ebbed0a3ba24617decb74d6939699c8fc994c662eb292869ab407c0ba0ec460a32ede0190
 DIST unicode-bidi-0.3.17.crate 58120 BLAKE2B 9d7759554e265136ab9d95dda90bab84763189d3613522a5cb966ad6417ac0ee726d79e296c8821ccca589ef09a999701149c88a9189cabe0ed7d32902040832 SHA512 cf523ff9a2e1face42da035f81bba2476e80d1154f73f3e34cbaf5ce322504e93a520114a54e0a4b2e5d6b930e508ce31b5d8b4f4ed4d39159a8c9a9c7b94d91
+DIST unicode-bidi-0.3.18.crate 58300 BLAKE2B 388af09d26248f2059d251f9c2b7d949112a430b16ad5868874d436346e2e753875ae382257cf5bb1d41d6ce9f2d7a34d37d2a2e88f9cc051b85a53c3baf5ee0 SHA512 69b5f220cfe8b7b36471fb0adc7d7852a8c40c497b8a81eacd1293b72c46e09c39c2e0a7218b58f0cb62c5ced397a8eda2c5f358eacdfe5d18aba2bc14afe2bd
 DIST unicode-ident-1.0.14.crate 47547 BLAKE2B 30e0b6d7f3a967aaf5b9d91237008a60c3a8ded53bda901696e23cea3931dd71b01ddab866dca9e31e17c395d5f5a68f2a938655b693e894962568c2cff5ca15 SHA512 7c6dcd1724e8cfedc37546d1abd49088b633dad228097acc73d7b6cab255b223e830c541144e05a00388fd8ca8066f27c18792419cfa58ee9da4460a38d0bc0a
 DIST unicode-normalization-0.1.24.crate 126536 BLAKE2B 1d6d535a1236562918d2625172d38c261854cd8c45cccc81c5d5aefb052db5d0e33981d95f5c87e8760cf77b3651c60b7ec1762421a7a9caa72fe7eac3f562a0 SHA512 f7af59688773319b9d1523955ce9b82e6735bd72358715ba5c056f41956ca050b6a612cae1b39199cc089674b3c71e4016d85d48167277c794c5cef3df881754
 DIST unicode-properties-0.1.3.crate 42252 BLAKE2B 2c054d7e84f739514a79dca218aed1580b06c66dd66a760afaa433c8822eb45ee97b47d00bcfae9770ab2371489db467c6667157fec73dff663847fa080e38eb SHA512 1825cb20913ec343dbbca7a2b1062c8e4bd2dd514b57598bb6f5a6545e8142b5f16377dbb3b821e9b999a1b0fc08e671b16e1d4f6b7a953ea40e8196b51744a2
@@ -659,13 +747,20 @@ DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST wasite-0.1.0.crate 2346 BLAKE2B a5a03d04135e3e32354d298386f132f9aa3b5c3806186f0c1eb75138038001d07f3bb5a3c6f8f938c9bba7c84b97b06b5304be3c9f86255d2d00f46a134ccd3e SHA512 06be2f7a2d289136740cc7b9ef9c4addbbf85210312759a7c99f977aa52285e2c3e4e3dade82d454a266ae42aaeeda7e767140b0bcdc1208ecc86aa18afc1384
 DIST wasm-bindgen-0.2.95.crate 43894 BLAKE2B f14fa63110c62d3bd51c947f31ee96b11812fa60d6adb9cf1907f99c011bd43ab8e14b437fe8b6357cde37124769080b3bd20a2a947fafe3bfd6cccdb875b5a2 SHA512 5a303a6e9bc71030371d6a60a04064b148423d89b6d5de4232b24ff5205175c5236812209eccfc60d8f82a876d3b745ae76ebcb30811eaa6f39701c9a84e1251
+DIST wasm-bindgen-0.2.99.crate 46136 BLAKE2B 04e69294da3dc4feff9001185bcc5b864d1f14a1ead6b9a31c830b2043dde191f9f7c65755d607365a3b8885bd340bbd266e26cfa74c48464933c8d7a1164f94 SHA512 184aec11998b99a730ea5b63d6141260cd0b7cdc29b02696f533b3e75ec79f7c17c6aac892e7a7b24036c6e73592d01df638ca31b54bda11d3bdbf857b1489c2
 DIST wasm-bindgen-backend-0.2.95.crate 30487 BLAKE2B f199e3392e964c4b0e6a7b2e3ccbbdc458973b4aae4193ce36ee0ac18d595230be9ea6708caa439d70aa92a7b924f51928059984f560e5dad20d41eaf06616dd SHA512 1bea648ca248cf13383b297917a5c315da9e4830a8c49cd3ba23392566725cceae818b4e7e60ad85360c9073c2e557fa36452a2cbc8e05b60318feda7404026e
+DIST wasm-bindgen-backend-0.2.99.crate 30928 BLAKE2B ecfa94a461df79a33fd2bb9807374a2a0c7ac370b443e5a1103ba73a29c9d337ed3feb427c80571ccc15599f81135987742e698199528a9c1bb570baef3e9d09 SHA512 8369a5e618223f09fff7cdc35662a930b3eb11024af51bf5fb9e70c45dfa22452a518d723f3d912c0c970fc4bf748ef2d83d48756483174993f7d04c92d9621f
 DIST wasm-bindgen-futures-0.4.45.crate 14329 BLAKE2B 511a9e29bf54a31acca2e74b1f654d9a85653567afd61ac7aca2c2d9a4ce833d85213345fccf5e58b788edb61a31b66192b9d69a432e7cb5e074497acbd1ee56 SHA512 1b8a99085ab274bb50e5c57625f826c8ca2f0795472c12c0db0d4c890043825df048e360997f8201a68e1ddc53f52e139acd29552e60e85213e87846946914c7
+DIST wasm-bindgen-futures-0.4.49.crate 14838 BLAKE2B a549a84dae70f480e387e01b4366994404370ae8f0989146d8548106267884096442d2fd6bca0a8cd22e21a3eff6b16aca1edcbc23c73af757a043311aa49081 SHA512 e141d6a97d2bbd6c54bc23d4857124d6e43ca1ab51c37e867287d771fcc0d8b7a2488acc56d46202c2e9b2380684ebeed688e7322175dae67475b77fb307ebda
 DIST wasm-bindgen-macro-0.2.95.crate 6938 BLAKE2B 672509ff595fae86492dad98a4480f28d74a51fc8156ce7f96928b148f3af7f0f45ca9560b72148c6ad2d45ddfbbf3dbe39e2c94603ef92a925ac5503d939d2f SHA512 1f52188932e20145cb23d527a733fb5fe211813826c6b5ec04277e376127b700aea181efa5f60e34d120f10652066fbdf001952024017cccc7af728a3c8e41d9
+DIST wasm-bindgen-macro-0.2.99.crate 7011 BLAKE2B 07182a9fb98f519d1e5c934e609d7a42cf2409319f59dd901e2a5bec77972b4d16fc6f67cf40ade58af874b05faa981c894443d3950616e2aad117ac7355ac6f SHA512 344bf5192e43582246efad257c600003c41b589234c1900f6ed201f96b6f7665eb55226da15d612060042f89c6214e452489cf3aabc61645843be9c27f9cca0b
 DIST wasm-bindgen-macro-support-0.2.95.crate 21331 BLAKE2B a1f71b727736b7166af5a9ad739da33f07ac3d7a190a27621f8a9821530f9bed78a6c437d194f9609bef91ebea0ed9ce1738eea0a9800344b8af9ce7df868da0 SHA512 f45d78831c37401a417c837281d1705b84eae5db430630a9caf544ce5d92f1ddd945baa3bccf26f4c58170e3cbea035174d8b60f906d2757b152e1d090baea58
+DIST wasm-bindgen-macro-support-0.2.99.crate 22800 BLAKE2B 9772cc94a64f768eecae12072e6d700bf95fded306297b84e235f3450f7c5630cb1985def3eaef05aee193c693f92c6fa61d7a6ca18e84a2b73aa38f070d47e7 SHA512 936ab8211a13fbe8b8f21a870a78c03e24219d0872731561353cfcae245e9f632246f179b67f2b13e106c799e68c5c39f9e388370a8ad3f93f299c4804f5907e
 DIST wasm-bindgen-shared-0.2.95.crate 7649 BLAKE2B c18f531c6094b49af3b2beea93914d16b0054a707011890f9054f4cb313ed6b433e3f73c7b42accbd1fa59d1f14c2db5ab0f0a82cde107b9cf437fad8b4cd7bd SHA512 3ce689a4c845765bd6e1f84b94948df3ef84560d98d830a15c1932a2ab1942ec91465db65cbf14a045526cf003218aa5c3209dd06e8ee8a39815757f56356099
+DIST wasm-bindgen-shared-0.2.99.crate 7773 BLAKE2B 73489af59d16f4d0a1ea51b535cd02d2759b5b7b07873d8a71fa6bd6b6ce1cfc6e8139e6a79346abec13665ed9aeadd0b5b6aed28ae008f9dcb3d5da9fce665a SHA512 8da0f107be99b6666cf1859d68ac0a7295fc03e7b494fce1df9dbe57d21807de8e2bc95f5b974562303923ca4646f38c5297588ad7c97bd59ef236218b2a64f9
 DIST wasm-streams-0.4.2.crate 36773 BLAKE2B 601f8bc4bf872943de47903de57c9e833afa2500d7e30205046ee02a8a2a8d6486b546117009e81f399f9ece69de89145fff85557ae87d37f989095bbe2046c0 SHA512 f93693b41220e819c4efce0fe756633f1aaffbb57b8a9c028031a6b02a7a221ff4d5bacf162a0b301b55794745ad1f4c97a7bbd46ac396e1518689c0639ecd65
 DIST web-sys-0.3.72.crate 629190 BLAKE2B e8cbf0bf36a1de4b0507c4a57724083f8a7f6332a138455de5ae1090e757872b217e2d2f6d0cb345088cfb4cd5ccf49360919838a299a74aebd0afe4dc688462 SHA512 997b27fdfd0291079f3f16999499404968a9d079ccf326d8eb17dc0f89a87cfe52f6fa780654612c769cb24dffd61baac22c5965b9feaa9c1f0624c203d2d039
+DIST web-sys-0.3.76.crate 635842 BLAKE2B ecd166e739e4ae4ebccc51fe0d429723ed7e4209bc9bd4658b5447486d7d58d8f2d2a6186e433e8ff11e7b52fe159d842a28de6251d61cd5f5876a92a7d945fe SHA512 370fb49edffd9ce125f77a9451389dd23ab5b70fd49263248d5794310ed757c28839a29436111df2fe6369ae8d6af56a64ac59af5258743cccfd9d18cd07dbd1
 DIST web-time-1.1.0.crate 18026 BLAKE2B cd72e384aca90c79e587448160587531c417f31a32e9ded23e6b78d492d0e517520170fd03177f28870c313b9302b28c32069a2408acccc076a1e4939a2c8f8d SHA512 73e4ef9851de089fde9381a595cb9e37a434f563f1fd350e345f2617b701caf57a9aef739b922b5b10cda131cdf2fd0af42c55603f8973a623a8b6ae70f6cc9f
 DIST webpki-0.22.4.crate 63472 BLAKE2B 35862693d6e10574490f516dd8683cb5b167bca9ac06a72ca0b1ab2007b055cc14db9c6f92ebc872394775d769d38290b8c592833ae9778e5070e115caace504 SHA512 b1bb203a5a36c01259840d9f32c729e736b25baebfa4de66ccdb9c38f164857e701fb597a91e18537ab1c31a6b29cd3d0cd8f45658cec87e55dd27c1c582a637
 DIST webpki-roots-0.25.4.crate 253559 BLAKE2B 737f608323fec02b77c47a40f8b2f9bf44f1b29d32b936fd7bd8c1066efd8916451b96ffab8949f5b5ba537bb1ed6300143bf51d1ef8663ce5a9a7a33947e81d SHA512 4891aa5c6a5bb8a4d6bd730fca5ab5bbddb5a39b9267c81951ca8d3ff0dbcd305b498328f99b2da79ac65cdc9dfa42c40631a4f8d6975ac6f4ed9c85a8d2178e
@@ -711,7 +806,9 @@ DIST x25519-dalek-2.0.1.crate 87820 BLAKE2B 039749d0278d95996016260f9e32162b3705
 DIST x509-parser-0.15.1.crate 91123 BLAKE2B 2ceb4174704978413e07b63e15e1b0b28662da2a3623abd5d439657e1c3a310e30dc25855d3c9366b8fc6cb81640e0c7e7a289c06a104d1ed8b62f4f7ca390a3 SHA512 43d5f9c7a76627bc73b045cabb26682e37b3b92e5570e467d508c5aaaabb1eb278043e195fac5c3a2b04d7b2403e49e47b731889ec15915fff3203217138845d
 DIST x509-parser-0.16.0.crate 92925 BLAKE2B 4224f1a058c7f6bf062f83159951fa65513d7d761fde54426e8451968be83516465ae86bf39b2321997d5cf2a512b671717e03c933bf61bc15d6634fb663364b SHA512 fb113c78eb5231d47af2e0884109d6406f4a19369500d582a075b50ec347e8cd9a085a28aafb50ae5699026f5220945c61c879c4dd3c484c4cbccdc46dd65378
 DIST xml-rs-0.8.23.crate 54730 BLAKE2B f97afd340475ecf6ae5068f619814192de562f9461c9b8dd38d4914639e3582a5ade19ca6c1f7456b47b1f76962087786fe7ae8dd1b9599b762343b007c3e0cd SHA512 b6aad2ba2eac7c9eac2f2b07656ec39498d12a54afda4abbb40bac70d413dd96df604fa26e46cb4e7ec218ef6ba08c1acfe797ca7d7653d5ef8d301b02595737
+DIST xml-rs-0.8.24.crate 54815 BLAKE2B 69be4f30c761ec573b03c657171d351ffaeca86e20de579460f9e3c5bf3a5905d3d71c48979e7c3f5e74c234f3db88f050aca849b97526d15e910f2a8b77c1f7 SHA512 7249a8702c9ef7c7775a69634e9be0909a8e1c9665e9c0473d97294a211e4c924af3db6a04d9198c96505f01b962fd577a25cfe089704757b922ed5a0ca71005
 DIST xxhash-rust-0.8.12.crate 21329 BLAKE2B e9596bb83cd0f0465c279deecaf4dd87aac05db1c8c7d3aed4f0689022c5a0522d976379fb3dcf6cfe1c18452c87890e95f3d17998c777d92f5cbe58119a20a9 SHA512 6fd17ec65be94b58f109b6aa9bb283e51092621e8af624f8c2c2c95558a3d0461d743cb8a65a0da5853ff7fd98273daec0dcc5b632440868524f99894beeff3d
+DIST xxhash-rust-0.8.14.crate 21880 BLAKE2B 5fba4ff81e595472cf9fb876983828e11c0e569ec172766b38d76e63dead61dccbaee28fd2fee4563646b44271215e852d7e7ff7ba0115bec6a258f5fd99452b SHA512 e56dc8eb0cd80da0f4aa66da3930f2814eba5f2f7b9f026b6e2926ad0237e48e69f80b47836c225d941e3b1b6112e5cfc32b5e40c48c977a683bc698b43c0adf
 DIST yasna-0.5.2.crate 34859 BLAKE2B 622852d441bae19ac2445d616cab5a0dd2b59926ced62b66c84d4804a0ba25d411fb9c2fef3bc86b0336e73dc060678ac58e41245f99d3412fe8bad28d131847 SHA512 7532b6d06b34b0a5e2b769c5d2647f910bec481d98482bf9cea212f1bd1466336d7cb117d0c2e240e7673b2825f1d091619f79814bad836d25cf3a6ca2be63e5
 DIST yoke-0.7.5.crate 29673 BLAKE2B cd2e42103140e080a29bf579fe5176b36a192f9b1309c1f2fd7557fe93b2f6eadbf6fca4a6a3b1a7b6288403d2f643841dfc7a5b6a4476776943950abe5c1613 SHA512 6bbd99671d1a5a5217890eaa267113d193b3636b265393afb6e72a313f01704d462fe017264f061405e8e84c188b590094c29e3fcf19a63c375ae165d1a0bbef
 DIST yoke-derive-0.7.5.crate 7525 BLAKE2B 9b6b97eaf3c50f0f5ce8cebf685a1a17d4c21eb9b26d38eac99e0a4c0f9d592e95a7843b7a0b897945a14c4eb78ffdf2c0972b448d31d7bc7b077f27aad81d9a SHA512 e30b06b020aa283080905004295fb643c539b130d0d53bda51927b95e79ba562336aad30d8a6202d9a0c62d5b64559a01218c6f02f3faada6003d4b03c205cd6
@@ -724,6 +821,7 @@ DIST zeroize_derive-1.4.2.crate 11141 BLAKE2B a40add656369a3a40d5b5f3397a77a1e9f
 DIST zerovec-0.10.4.crate 126398 BLAKE2B b078784d6f178bbb9de1c3c1b6c7ef996f00bdd7dfd2924bda921e62f3e09e953fbf50f8d0da99ac6ff6d134f146253846f5663549dcf8df08eaf34b9d4016b3 SHA512 db12bba1d7476ddead92e6dfcdcc30e2e0defff4f263a740244eabee265a2cab265473a663d3dc3210f48e113b66d951da496dfab7965ce1bc792e5f2db422a0
 DIST zerovec-derive-0.10.3.crate 19438 BLAKE2B 9f7df8a4e4a0b62ab25aed967b26509db4bcc5d5b10b3bd73305099a4c49a60be8921484ced1a34d9b7ae30ffa5abe789686f432416a8f1cfc07de1db1dff594 SHA512 caefbffeb35265db9f74933bf07109d57f0da48156cafd4f330af78a5c7eb9ab0831a80789ad4fb119875ebc6cfd7e3de68c9984b77dca5151f9be41f1ae6e09
 DIST zip-2.2.1.crate 107205 BLAKE2B 7685d4cf3d8d644a4f6f395f9c0a6be1db8d0b3a6d30ca9edcb7663b66587f29293741b4cf4352690798727806978bc30eee1a432d83cb054d209088ce1d0bbb SHA512 2e38cfa4298fac678f3654c5c23c9807630778e4a95a294c3b936d9222638c95f189e829c363f0a7f873afd84f9cae37858e9eb7547d4985070f01a2e0e3940a
+DIST zip-2.2.2.crate 108809 BLAKE2B e6d7792b70ab397ef340d37167266b87538d2e0ad422d02b053f6b492c8ed13535ea18d5d4077350286b3c2f79623a01ec89544f6334eddd07c87b0d443f19ae SHA512 0255079792b786a55dd18587daf178456f2b79f83d767ba42504f8b7163eebc152c02500097edd78bb37916444c9ad9905779367c6d743489502468258f1706e
 DIST zopfli-0.8.1.crate 50972 BLAKE2B 27cde48858dc65ec8082d4e0d81e2758f92d3dcc7a1c1f08aa6448e99f2995a865ac3259353b26e787f108c2f88ce3c7610413ea9d3daae6f864900d74565de6 SHA512 799e25c0cc9f0bf2119a7c03225b11ed94e7c3ac83f872a27da8ae15c90206245121c38f5e2b78fece131f5bb428f01fabbfd1b1e18ea456957940042d38f38d
 DIST zstd-0.13.2.crate 30251 BLAKE2B 7a13a094791b13b9215cce3aae5f99b86dc76ff271324a67170747f56b97df514762a0c097e6376752d2a5b35f9ef03d76e0c362e34e15ca02fa3644cc933131 SHA512 9cc3584f74da6da6920b74a7125b4eee9133ae00776aff3c77404fb438e05831f654fce46f7ebab442b04f20f84c11ca58f7ebfe7ff506833c38e919ee3f8572
 DIST zstd-safe-7.2.1.crate 21122 BLAKE2B 49df1ae857449393e6a09293b8963702fecb375622a5cda96d51c3ae96b67044aa40dbc043b96a16ea3b66dac47287dc58007a825c025c3d9b7aac31b441ab9a SHA512 95d0a1d4bb307f64de40f4bad5b400e5a592c901e133a88d8344c46ba3dd51465a8284fa2e3aca74f531c21e7bc3eead112f3797abaea7e439e3f407401b947b
diff --git a/net-mail/stalwart-cli/stalwart-cli-0.11.1.ebuild b/net-mail/stalwart-cli/stalwart-cli-0.11.1.ebuild
new file mode 100644
index 000000000000..02db91e81330
--- /dev/null
+++ b/net-mail/stalwart-cli/stalwart-cli-0.11.1.ebuild
@@ -0,0 +1,773 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.4
+
+EAPI=8
+
+CRATES="
+	RustyXML@0.3.0
+	addr2line@0.24.2
+	adler2@2.0.0
+	adler32@1.2.0
+	aead@0.5.2
+	aes-gcm-siv@0.11.1
+	aes-gcm@0.10.3
+	aes@0.8.4
+	ahash@0.7.8
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	allocator-api2@0.2.21
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anstream@0.6.18
+	anstyle-parse@0.2.6
+	anstyle-query@1.1.2
+	anstyle-wincon@3.0.6
+	anstyle@1.0.10
+	anyhow@1.0.95
+	arbitrary@1.4.1
+	arc-swap@1.7.1
+	argon2@0.5.3
+	arrayref@0.3.9
+	arrayvec@0.7.6
+	ascii-canvas@3.0.0
+	asn1-rs-derive@0.4.0
+	asn1-rs-derive@0.5.1
+	asn1-rs-impl@0.1.0
+	asn1-rs-impl@0.2.0
+	asn1-rs@0.5.2
+	asn1-rs@0.6.2
+	async-channel@1.9.0
+	async-compression@0.4.18
+	async-lock@3.4.0
+	async-recursion@1.1.1
+	async-stream-impl@0.3.6
+	async-stream@0.3.6
+	async-trait@0.1.83
+	atomic-waker@1.1.2
+	attohttpc@0.28.2
+	autocfg@1.4.0
+	aws-creds@0.37.0
+	aws-region@0.25.5
+	axum-core@0.4.5
+	axum@0.7.9
+	azure_core@0.21.0
+	azure_storage@0.21.0
+	azure_storage_blobs@0.21.0
+	azure_svc_blobstorage@0.21.0
+	backtrace@0.3.74
+	base16ct@0.2.0
+	base32@0.4.0
+	base64@0.11.0
+	base64@0.13.1
+	base64@0.21.7
+	base64@0.22.1
+	base64ct@1.6.0
+	bigdecimal@0.4.7
+	bincode@1.3.3
+	bindgen@0.69.5
+	bindgen@0.70.1
+	bindgen@0.71.1
+	biscuit@0.7.0
+	bit-set@0.5.3
+	bit-set@0.8.0
+	bit-vec@0.6.3
+	bit-vec@0.8.0
+	bitflags@1.3.2
+	bitflags@2.6.0
+	bitpacking@0.9.2
+	bitvec-nom2@0.2.1
+	bitvec@1.0.1
+	blake2@0.10.6
+	blake3@1.5.5
+	block-buffer@0.10.4
+	block-buffer@0.9.0
+	block-padding@0.3.3
+	blowfish@0.7.0
+	blowfish@0.9.1
+	borsh-derive@1.5.3
+	borsh@1.5.3
+	btoi@0.4.3
+	buffered-reader@1.3.2
+	bumpalo@3.16.0
+	bytecheck@0.6.12
+	bytecheck_derive@0.6.12
+	bytemuck@1.21.0
+	byteorder@1.5.0
+	bytes@1.9.0
+	bzip2-sys@0.1.11+1.0.8
+	bzip2@0.4.4
+	camellia@0.1.0
+	cast5@0.11.1
+	cbc@0.1.2
+	cc@1.2.5
+	cedarwood@0.4.6
+	cexpr@0.6.0
+	cfb-mode@0.8.2
+	cfb@0.7.3
+	cfg-if@1.0.0
+	cfg_aliases@0.2.1
+	chrono@0.4.39
+	cipher@0.2.5
+	cipher@0.4.4
+	clang-sys@1.8.1
+	clap@4.5.23
+	clap_builder@4.5.23
+	clap_derive@4.5.18
+	clap_lex@0.7.4
+	cmac@0.7.2
+	cmake@0.1.52
+	colorchoice@1.0.3
+	combine@4.6.7
+	concurrent-queue@2.5.0
+	console@0.15.10
+	const-oid@0.9.6
+	const-random-macro@0.1.16
+	const-random@0.1.18
+	const_panic@0.2.11
+	constant_time_eq@0.2.6
+	constant_time_eq@0.3.1
+	core-foundation-sys@0.8.7
+	core-foundation@0.9.4
+	core2@0.4.0
+	cpufeatures@0.2.16
+	crc-catalog@2.4.0
+	crc16@0.4.0
+	crc32fast@1.4.2
+	crc@3.2.1
+	crossbeam-channel@0.5.14
+	crossbeam-deque@0.8.6
+	crossbeam-epoch@0.9.18
+	crossbeam-queue@0.3.12
+	crossbeam-utils@0.8.21
+	crossbeam@0.8.4
+	crunchy@0.2.2
+	crypto-bigint@0.5.5
+	crypto-common@0.1.6
+	crypto-mac@0.10.0
+	csv-core@0.1.11
+	csv@1.3.1
+	ctr@0.9.2
+	curve25519-dalek-derive@0.1.1
+	curve25519-dalek@4.1.3
+	darling@0.13.4
+	darling@0.20.10
+	darling_core@0.13.4
+	darling_core@0.20.10
+	darling_macro@0.13.4
+	darling_macro@0.20.10
+	dary_heap@0.3.7
+	dashmap@6.1.0
+	data-encoding@2.6.0
+	dbl@0.3.2
+	deadpool-postgres@0.14.1
+	deadpool-runtime@0.1.4
+	deadpool@0.10.0
+	deadpool@0.12.1
+	decancer@3.2.8
+	deflate64@0.1.9
+	der-parser@8.2.0
+	der-parser@9.0.0
+	der@0.7.9
+	deranged@0.3.11
+	derive_arbitrary@1.4.1
+	des@0.8.1
+	digest@0.10.7
+	digest@0.9.0
+	dirs-next@2.0.0
+	dirs-sys-next@0.1.2
+	displaydoc@0.2.5
+	dlv-list@0.5.2
+	dns-update@0.1.2
+	doc-comment@0.3.3
+	dsa@0.6.3
+	dyn-clone@1.0.17
+	eax@0.5.0
+	ecb@0.1.2
+	ecdsa@0.16.9
+	ece@2.3.1
+	ed25519-dalek@2.1.1
+	ed25519@2.2.3
+	either@1.13.0
+	elasticsearch@8.5.0-alpha.1
+	elliptic-curve@0.13.8
+	ena@0.14.3
+	encode_unicode@1.0.0
+	encoding_rs@0.8.35
+	endian-type@0.1.2
+	enum-as-inner@0.6.1
+	equivalent@1.0.1
+	event-listener-strategy@0.5.3
+	event-listener@2.5.3
+	event-listener@5.3.1
+	fallible-iterator@0.2.0
+	fallible-iterator@0.3.0
+	fallible-streaming-iterator@0.1.9
+	fancy-regex@0.14.0
+	farmhash@1.1.5
+	fast-float@0.2.0
+	fastrand@1.9.0
+	ff@0.13.0
+	fiat-crypto@0.2.9
+	fixedbitset@0.4.2
+	flate2@1.0.35
+	fnv@1.0.7
+	foldhash@0.1.4
+	foreign-types-shared@0.1.1
+	foreign-types@0.3.2
+	form-data@0.5.5
+	form_urlencoded@1.2.1
+	foundationdb-gen@0.9.1
+	foundationdb-macros@0.3.1
+	foundationdb-sys@0.9.1
+	foundationdb@0.9.1
+	frunk@0.4.3
+	frunk_core@0.4.3
+	frunk_derives@0.4.3
+	frunk_proc_macro_helpers@0.1.3
+	frunk_proc_macros@0.1.3
+	funty@2.0.0
+	futures-channel@0.3.31
+	futures-core@0.3.31
+	futures-executor@0.3.31
+	futures-io@0.3.31
+	futures-lite@1.13.0
+	futures-macro@0.3.31
+	futures-sink@0.3.31
+	futures-task@0.3.31
+	futures-util@0.3.31
+	futures@0.3.31
+	fxhash@0.2.1
+	generic-array@0.14.7
+	generic-array@1.1.1
+	gethostname@0.4.3
+	getrandom@0.1.16
+	getrandom@0.2.15
+	ghash@0.5.1
+	gimli@0.31.1
+	glob@0.3.1
+	group@0.13.0
+	h2@0.3.26
+	h2@0.4.7
+	hashbrown@0.12.3
+	hashbrown@0.14.5
+	hashbrown@0.15.2
+	hashlink@0.9.1
+	heck@0.4.1
+	heck@0.5.0
+	hermit-abi@0.3.9
+	hermit-abi@0.4.0
+	hex@0.4.3
+	hickory-client@0.24.2
+	hickory-proto@0.24.2
+	hickory-resolver@0.24.2
+	hkdf@0.12.4
+	hmac@0.10.1
+	hmac@0.12.1
+	home@0.5.11
+	hostname@0.3.1
+	hostname@0.4.0
+	http-body-util@0.1.2
+	http-body@0.4.6
+	http-body@1.0.1
+	http-types@2.12.0
+	http@0.2.12
+	http@1.2.0
+	httparse@1.9.5
+	httpdate@1.0.3
+	human-size@0.4.3
+	hyper-rustls@0.24.2
+	hyper-rustls@0.27.5
+	hyper-timeout@0.5.2
+	hyper-util@0.1.10
+	hyper@0.14.32
+	hyper@1.5.2
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.61
+	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
+	idea@0.5.1
+	ident_case@1.0.1
+	idna@1.0.3
+	idna_adapter@1.2.0
+	imagesize@0.13.0
+	include-flate-codegen@0.2.0
+	include-flate@0.3.0
+	indexmap@1.9.3
+	indexmap@2.7.0
+	indicatif@0.17.9
+	infer@0.16.0
+	infer@0.2.3
+	inout@0.1.3
+	instant@0.1.13
+	ipconfig@0.3.2
+	ipnet@2.10.1
+	is-terminal@0.4.13
+	is_terminal_polyfill@1.70.1
+	itertools@0.10.5
+	itertools@0.11.0
+	itertools@0.12.1
+	itertools@0.13.0
+	itoa@1.0.14
+	jemalloc-sys@0.5.4+5.3.0-patched
+	jemallocator@0.5.4
+	jieba-macros@0.7.1
+	jieba-rs@0.7.1
+	jmap-client@0.3.2
+	jobserver@0.1.32
+	js-sys@0.3.76
+	keyed_priority_queue@0.4.2
+	konst@0.3.15
+	konst_kernel@0.3.15
+	lalrpop-util@0.20.2
+	lalrpop@0.20.2
+	lazy_static@1.5.0
+	lazycell@1.3.0
+	lber@0.4.2
+	ldap3@0.11.5
+	libc@0.2.169
+	libflate@2.1.0
+	libflate_lz77@2.1.0
+	libloading@0.8.6
+	libm@0.2.11
+	libredox@0.1.3
+	librocksdb-sys@0.17.1+9.9.3
+	libsqlite3-sys@0.30.1
+	libz-sys@1.1.20
+	linked-hash-map@0.5.6
+	litemap@0.7.4
+	lock_api@0.4.12
+	lockfree-object-pool@0.1.6
+	log@0.4.22
+	lru-cache@0.1.2
+	lru@0.12.5
+	lz4-sys@1.11.1+lz4-1.10.0
+	lz4_flex@0.11.3
+	lzma-rs@0.3.0
+	mail-auth@0.6.0
+	mail-builder@0.3.2
+	mail-parser@0.9.4
+	mail-send@0.4.9
+	maplit@1.0.2
+	match_cfg@0.1.0
+	matchit@0.7.3
+	maybe-async@0.2.10
+	md-5@0.10.6
+	md-5@0.9.1
+	md5@0.7.0
+	memchr@2.7.4
+	memoffset@0.7.1
+	memory-stats@1.2.0
+	memsec@0.7.0
+	mime@0.3.17
+	mime_guess@2.0.5
+	minimal-lexical@0.2.1
+	miniz_oxide@0.8.2
+	mio@0.8.11
+	mysql-common-derive@0.31.2
+	mysql_async@0.34.1
+	mysql_common@0.32.4
+	new_debug_unreachable@1.0.6
+	nibble_vec@0.1.0
+	nix@0.26.4
+	nohash@0.2.0
+	nom@7.1.3
+	num-bigint-dig@0.8.4
+	num-bigint@0.4.6
+	num-conv@0.1.0
+	num-integer@0.1.46
+	num-iter@0.1.45
+	num-traits@0.2.19
+	num_cpus@1.16.0
+	number_prefix@0.4.0
+	object@0.36.7
+	oid-registry@0.6.1
+	oid-registry@0.7.1
+	once_cell@1.20.2
+	opaque-debug@0.3.1
+	openssl-macros@0.1.1
+	openssl-probe@0.1.5
+	openssl-sys@0.9.104
+	openssl@0.10.68
+	opentelemetry-http@0.25.0
+	opentelemetry-otlp@0.25.0
+	opentelemetry-proto@0.25.0
+	opentelemetry-semantic-conventions@0.25.0
+	opentelemetry@0.25.0
+	opentelemetry_sdk@0.25.0
+	ordered-multimap@0.7.3
+	p256@0.13.2
+	p384@0.13.0
+	p521@0.13.3
+	parking@2.2.1
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	password-hash@0.5.0
+	paste@1.0.15
+	pbkdf2@0.12.2
+	pem-rfc7468@0.7.0
+	pem@3.0.4
+	percent-encoding@2.3.1
+	petgraph@0.6.5
+	phf@0.11.2
+	phf_codegen@0.11.2
+	phf_generator@0.11.2
+	phf_macros@0.11.2
+	phf_shared@0.10.0
+	phf_shared@0.11.2
+	pin-project-internal@1.1.7
+	pin-project-lite@0.2.15
+	pin-project@1.1.7
+	pin-utils@0.1.0
+	pkcs1@0.7.5
+	pkcs8@0.10.2
+	pkg-config@0.3.31
+	polyval@0.6.2
+	portable-atomic@1.10.0
+	postgres-protocol@0.6.7
+	postgres-types@0.2.8
+	powerfmt@0.2.0
+	ppv-lite86@0.2.20
+	precomputed-hash@0.1.1
+	prettyplease@0.2.25
+	prettytable-rs@0.10.0
+	primeorder@0.13.6
+	privdrop@0.5.4
+	proc-macro-crate@3.2.0
+	proc-macro-error-attr2@2.0.0
+	proc-macro-error2@2.0.1
+	proc-macro2@1.0.92
+	prometheus@0.13.4
+	prost-derive@0.13.4
+	prost@0.13.4
+	proxy-header@0.1.2
+	psl-types@2.0.11
+	psl@2.1.73
+	ptr_meta@0.1.4
+	ptr_meta_derive@0.1.4
+	pwhash@1.0.0
+	quick-error@1.2.3
+	quick-xml@0.31.0
+	quick-xml@0.32.0
+	quick-xml@0.36.2
+	quick-xml@0.37.1
+	quick_cache@0.6.9
+	quinn-proto@0.11.9
+	quinn-udp@0.5.9
+	quinn@0.11.6
+	quote@1.0.38
+	r2d2@0.8.10
+	radium@0.7.0
+	radix_trie@0.2.1
+	rand@0.7.3
+	rand@0.8.5
+	rand_chacha@0.2.2
+	rand_chacha@0.3.1
+	rand_core@0.5.1
+	rand_core@0.6.4
+	rand_hc@0.2.0
+	rasn-cms@0.10.6
+	rasn-derive@0.10.6
+	rasn-pkix@0.10.6
+	rasn@0.10.6
+	rayon-core@1.12.1
+	rayon@1.10.0
+	rcgen@0.12.1
+	rcgen@0.13.2
+	redis@0.27.6
+	redox_syscall@0.5.8
+	redox_users@0.4.6
+	regex-automata@0.4.9
+	regex-syntax@0.8.5
+	regex@1.11.1
+	rend@0.4.2
+	reqwest@0.11.27
+	reqwest@0.12.9
+	resolv-conf@0.7.0
+	rev_lines@0.3.0
+	rfc6979@0.4.0
+	ring@0.16.20
+	ring@0.17.8
+	ripemd@0.1.3
+	rkyv@0.7.45
+	rkyv_derive@0.7.45
+	rle-decode-fast@1.0.3
+	roaring@0.10.9
+	rocksdb@0.23.0
+	rpassword@7.3.1
+	rsa@0.9.7
+	rtoolbox@0.0.2
+	rtrb@0.3.1
+	rusqlite@0.32.1
+	rust-ini@0.21.1
+	rust-s3@0.35.0-alpha.2
+	rust-stemmers@1.2.0
+	rust_decimal@1.36.0
+	rustc-demangle@0.1.24
+	rustc-hash@1.1.0
+	rustc-hash@2.1.0
+	rustc_version@0.2.3
+	rustc_version@0.4.1
+	rusticata-macros@4.1.0
+	rustls-native-certs@0.6.3
+	rustls-native-certs@0.7.3
+	rustls-pemfile@1.0.4
+	rustls-pemfile@2.2.0
+	rustls-pki-types@1.10.1
+	rustls-webpki@0.101.7
+	rustls-webpki@0.102.8
+	rustls@0.21.12
+	rustls@0.22.4
+	rustls@0.23.20
+	rustversion@1.0.18
+	ryu@1.0.18
+	salsa20@0.10.2
+	same-file@1.0.6
+	saturating@0.1.0
+	scc@2.2.6
+	schannel@0.1.27
+	scheduled-thread-pool@0.2.7
+	scopeguard@1.2.0
+	scrypt@0.11.0
+	sct@0.7.1
+	sdd@3.0.5
+	seahash@4.1.0
+	sec1@0.7.3
+	security-framework-sys@2.13.0
+	security-framework@2.11.1
+	semver-parser@0.7.0
+	semver@0.9.0
+	semver@1.0.24
+	sequoia-openpgp@1.22.0
+	serde@1.0.216
+	serde_bytes@0.11.15
+	serde_derive@1.0.216
+	serde_json@1.0.134
+	serde_qs@0.8.5
+	serde_urlencoded@0.7.1
+	serde_with@1.14.0
+	serde_with_macros@1.5.2
+	serial_test@3.2.0
+	serial_test_derive@3.2.0
+	sha-1@0.9.8
+	sha1@0.10.6
+	sha1_smol@1.0.1
+	sha1collisiondetection@0.3.4
+	sha2@0.10.8
+	sha2@0.9.9
+	shlex@1.3.0
+	sieve-rs@0.5.3
+	signal-hook-registry@1.4.2
+	signature@2.2.0
+	simd-adler32@0.3.7
+	simdutf8@0.1.5
+	siphasher@0.3.11
+	siphasher@1.0.1
+	slab@0.4.9
+	smallvec@1.13.2
+	smtp-proto@0.1.5
+	snafu-derive@0.7.5
+	snafu@0.7.5
+	socket2@0.5.8
+	spin@0.5.2
+	spin@0.9.8
+	spki@0.7.3
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	string_cache@0.8.7
+	stringprep@0.1.5
+	strsim@0.10.0
+	strsim@0.11.1
+	subprocess@0.2.9
+	subtle@2.6.1
+	syn@1.0.109
+	syn@2.0.91
+	sync_wrapper@0.1.2
+	sync_wrapper@1.0.2
+	synstructure@0.12.6
+	synstructure@0.13.1
+	system-configuration-sys@0.5.0
+	system-configuration@0.5.1
+	tap@1.0.1
+	term@0.7.0
+	termcolor@1.4.1
+	thiserror-impl@1.0.69
+	thiserror-impl@2.0.9
+	thiserror@1.0.69
+	thiserror@2.0.9
+	time-core@0.1.2
+	time-macros@0.2.19
+	time@0.3.37
+	tiny-keccak@2.0.2
+	tinystr@0.7.6
+	tinyvec@1.8.1
+	tinyvec_macros@0.1.1
+	tokio-macros@2.3.0
+	tokio-postgres@0.7.12
+	tokio-rustls@0.24.1
+	tokio-rustls@0.25.0
+	tokio-rustls@0.26.1
+	tokio-stream@0.1.17
+	tokio-tungstenite@0.21.0
+	tokio-tungstenite@0.24.0
+	tokio-util@0.7.13
+	tokio@1.38.1
+	toml_datetime@0.6.8
+	toml_edit@0.22.22
+	tonic@0.12.3
+	totp-rs@5.6.0
+	tower-layer@0.3.3
+	tower-service@0.3.3
+	tower@0.4.13
+	tower@0.5.2
+	tracing-attributes@0.1.28
+	tracing-core@0.1.33
+	tracing@0.1.41
+	trim-in-place@0.1.7
+	try-lock@0.2.5
+	try_map@0.3.1
+	tungstenite@0.21.0
+	tungstenite@0.24.0
+	twofish@0.7.1
+	twox-hash@1.6.3
+	typenum@1.17.0
+	typewit@1.11.0
+	typewit_proc_macros@1.8.1
+	unicase@2.8.1
+	unicode-bidi@0.3.18
+	unicode-ident@1.0.14
+	unicode-normalization@0.1.24
+	unicode-properties@0.1.3
+	unicode-script@0.5.7
+	unicode-security@0.1.2
+	unicode-width@0.1.14
+	unicode-width@0.2.0
+	unicode-xid@0.2.6
+	universal-hash@0.5.1
+	untrusted@0.7.1
+	untrusted@0.9.0
+	url@2.5.4
+	urlencoding@2.1.3
+	utf-8@0.7.6
+	utf16_iter@1.0.5
+	utf8_iter@1.0.4
+	utf8parse@0.2.2
+	uuid@1.11.0
+	vcpkg@0.2.15
+	version_check@0.9.5
+	void@1.0.2
+	waker-fn@1.2.0
+	walkdir@2.5.0
+	want@0.3.1
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasi@0.9.0+wasi-snapshot-preview1
+	wasite@0.1.0
+	wasm-bindgen-backend@0.2.99
+	wasm-bindgen-futures@0.4.49
+	wasm-bindgen-macro-support@0.2.99
+	wasm-bindgen-macro@0.2.99
+	wasm-bindgen-shared@0.2.99
+	wasm-bindgen@0.2.99
+	wasm-streams@0.4.2
+	web-sys@0.3.76
+	web-time@1.1.0
+	webpki-roots@0.25.4
+	webpki-roots@0.26.7
+	webpki@0.22.4
+	whatlang@0.16.4
+	whoami@1.5.2
+	widestring@1.1.0
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.9
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-core@0.52.0
+	windows-registry@0.2.0
+	windows-result@0.2.0
+	windows-strings@0.1.0
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-sys@0.59.0
+	windows-targets@0.48.5
+	windows-targets@0.52.6
+	windows@0.52.0
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.6
+	winnow@0.6.20
+	winreg@0.50.0
+	write16@1.0.0
+	writeable@0.5.5
+	wyz@0.5.1
+	x25519-dalek@2.0.1
+	x509-parser@0.15.1
+	x509-parser@0.16.0
+	xml-rs@0.8.24
+	xxhash-rust@0.8.14
+	yasna@0.5.2
+	yoke-derive@0.7.5
+	yoke@0.7.5
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+	zerofrom-derive@0.1.5
+	zerofrom@0.1.5
+	zeroize@1.8.1
+	zeroize_derive@1.4.2
+	zerovec-derive@0.10.3
+	zerovec@0.10.4
+	zip@2.2.2
+	zopfli@0.8.1
+	zstd-safe@7.2.1
+	zstd-sys@2.0.13+zstd.1.5.6
+	zstd@0.13.2
+"
+
+inherit cargo
+
+DESCRIPTION="Stalwart Mail Server command line utility"
+HOMEPAGE="https://stalw.art"
+SRC_URI="https://github.com/stalwartlabs/mail-server/archive/refs/tags/v${PV}.tar.gz -> stalwart-mail-${PV}.tar.gz
+	${CARGO_CRATE_URIS}
+"
+# rename to same as stalwart-mail as it is the same tarball
+
+S="${WORKDIR}/mail-server-${PV}"
+
+LICENSE="|| ( AGPL-3 )"
+# Dependent crate licenses
+LICENSE+="
+	AGPL-3 Apache-2.0 BSD-2 BSD Boost-1.0 CC0-1.0 ISC LGPL-2+ MIT
+	MPL-2.0 Unicode-3.0 ZLIB
+"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	cargo_src_compile --bin stalwart-cli
+}
+
+src_install() {
+	cargo_src_install --path crates/cli
+}
diff --git a/net-mail/stalwart-mail/Manifest b/net-mail/stalwart-mail/Manifest
index b70aea033f18..b66d06651d40 100644
--- a/net-mail/stalwart-mail/Manifest
+++ b/net-mail/stalwart-mail/Manifest
@@ -1,6 +1,7 @@
 DIST RustyXML-0.3.0.crate 17517 BLAKE2B aee90d7d8926cf922e7497f4a375344f1252123b90010253a8d85a1741bc7a5580ef9c8f284a1207af4e64c2fc4509327b58accd8a5ffb86b454125e73703101 SHA512 87e8ad6e6570a8f2cf20ca8b322864e44f555cec2415f03ec9ce5358514b57f164c548ae9da12bc5cb0dde702dd095f8a493f4fa39c98fde6779ebeedb9f7409
 DIST addr2line-0.24.2.crate 39015 BLAKE2B 57186d6b957542cd71a0aa19f1355dfaabe6efa19b853c42f306494728b03d1e3183efdb2d2c7734a3e2347cd83a985d004f50c097e06b7520bd152310532e9b SHA512 39cbec3c920ffc0f37584afb55e1cfe4f182e4415319a4e9bfe842360f102f7b9315f6171c0cf71ba0337123903e604096cd573fe98698a26c8eebc2376d965b
 DIST adler2-2.0.0.crate 13529 BLAKE2B ec575b0bf12e321399ac3a1d59fce4ddbeabcc60cb3d7c2f362cce23eb29b4ea836451372d6d88552a4435ae29bb41d6230d55f625a4359eace680b9b771d0ad SHA512 12d12579ad617cf1a94cf95ab9d3f5db566c3b2de4bd5735eccd83c668fdad0eff134c996b73c46cbb9f932837682043878b8cc4764191625e9f93ccffcce423
+DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
 DIST aead-0.5.2.crate 15509 BLAKE2B 0214f3e8ee85a7e18c7d20f9a3fcbdbb9e5af6fdfdcb427e915279b505556dbd2df6d09d5c90561417c56796236a56ab24b2b11389745bc03a0a6da45c0e8636 SHA512 61926a615618e64efd0e9342d729a89f80d6e092dda50e018252a06147e2ca0dc2a989136416f57ae02019695757dfa3d3f3cf3799f138e440662744ecab4a44
 DIST aes-0.8.4.crate 124812 BLAKE2B c4a9cadbbfd9d24a758bd5d18b851fb86bd74f5b1f0f6f5706275329d92396a00dc2c35fa0aa2af5b55fd336934d35df413a31f85ba886e85a037296f9df25bd SHA512 96243337546acf64f89bf9ba23011eea1a205d82d96707f9c45bf28cc62ef00cdac5cdfacb8d6013155ee1522ad73dd1b7f166c74ed18159bf23c3c48ec77d79
 DIST aes-gcm-0.10.3.crate 148991 BLAKE2B e1376b741386577277a8cb9535c1ad3e15ea383c0f324bc5cedff09a76b11f2c9e29226535688f9431e904bf2800b8e140c4b1cab333e572208eefd19ca897f1 SHA512 f9aec1e2609262c30921bf83cdd82117d147905d4ca311f9fef4b9f1734d3a57893ba2586f0ccfd39cf9264d347ba2c2d2c52b4726495eda8fec7fbec42d6db3
@@ -9,6 +10,7 @@ DIST ahash-0.7.8.crate 38550 BLAKE2B 0fd5f220c15bc0a1aa2e95d13477bcc832d992c6406
 DIST ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d
 DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
 DIST allocator-api2-0.2.20.crate 63549 BLAKE2B 12f88e884cd96122291e3fd277ec47f7cd33f36def475508e1e27d762ee8024d1bc33c861a8c076bf75553816a4500fada64a6ca9c7154a52de98fa1e6cd2660 SHA512 da80dc95cfcd985e16f3500f3ca5a5add872dd82cc8dd2928d41669648d3471c540d3b35cf961ccaa8a6104aff8eb536da465a1ba47f122ee9120615427b4ae1
+DIST allocator-api2-0.2.21.crate 63622 BLAKE2B 983897fc977118f220dc4af7e801ac08eba77bfde2a25d756bad3e77f849418e74e7c67eaed68e2d719ca7fc6e1e9ce151dd7dbe8707dc43d4a6400294c8fc8e SHA512 1bb5711ed6041b0d7eae2ec784b8aa9d215db0f49cf79c692946eeb0db545d358cbcaa8156ae34e51d05287c08574f1da251ee574f2392949e4ed26d04770d03
 DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
 DIST anstream-0.6.18.crate 29681 BLAKE2B b6f72cda084b38f1e1cfe60de2562e8d62ebbc352176bdf668a2d6be09349bec46d291cd475e8af814ce66def44d95cb98c325761150130752284a82d8a84f21 SHA512 5149977d6f7b5e9cf6350f1ef130caa3ff46c7e78976358452a185ce196cdd77fee48a3a9838f434ae6ea9c15b19f6bfbab156edf819f81179d6774318f08963
@@ -17,6 +19,7 @@ DIST anstyle-parse-0.2.6.crate 22343 BLAKE2B 85eba405dc5cf806283cf442984e86583df
 DIST anstyle-query-1.1.2.crate 9969 BLAKE2B 179b8dd6dd709c2ca67f4eb5c9a502b2867cb6744a39f824c4fdebedc67c6c3e07d107c7d817e2ffb589d13b7ed4900cf9653ddc0a43663217042ee92ce8c9da SHA512 26069d936c4b1fb09bc65cda0253fe9be8fa4e96c0821f980c772602b4e9230035ec8c9d092ef95e0a0354ac559f8d25f57a14c34086d4d241b5fba688951837
 DIST anstyle-wincon-3.0.6.crate 12271 BLAKE2B d9f4d9d46fa93a1168ca340562681718be852ffa94e30c9ea208af53af9d6697ca84921837a325ddc36681caab2b866b7f574901c80b5c0d862dcb765b81b68b SHA512 59ec6f5a53bd68b6344d82e923eb8c45ddac481dd0d270a7b452dc5b0540ee1656705697c1508942ecc131e7c075248c85d8f4159f27d97ea94f22469ce2eeb5
 DIST anyhow-1.0.93.crate 47490 BLAKE2B 1c64b24d3df3307430deb8189ded345ee2858c1990fc343f2400bd67b6d79ee2cf90876326fb29ea311bd857a941fc8319dccbe6c81f2cca2c085dc0c1fffb27 SHA512 237b36bdefeaf8dd2f7d4c5c92d8f7627a5206ded5fa3dafd5710f2fbd3dd7d7187d4a8ae917ae03d0cf06bc8d101a7663bb7bb022507ac1ec88577a37475efc
+DIST anyhow-1.0.95.crate 52155 BLAKE2B fc9cebdfae0afed86f2dfb7faf62f5a108000895317dd0cab9c83d6e48c891558fc3a1d8b9940b623b4c6fd861631a0f0344a9915517a9bc39dbfbe48ec6b45b SHA512 8c5c176381c3e861c3c4451f7cd3d9e2447c0a55735ececfd3199288d65d36dc5fdc4a19a0798f62a0b9d6ca2c155a616c7eab8bcd53e6ece743aed57ec3d0fa
 DIST arbitrary-1.4.1.crate 36816 BLAKE2B 86adbf1a2522e972bf4a7fc26e4d88ec45298dc2ce716a1fe30cd49bebf4d5a65af1f097f83be6ee8c554d4b392657efd32ffa1cb35704585a9816b6e234c067 SHA512 a3507aa0ab684464c3559376beabc0992bbb589ddc85d2426b26238d7c5d1d856df5d9226603fe7ad2b17ac6570d62e86ba4f5a2e65f3cbc9ad52bbe294f8123
 DIST arc-swap-1.7.1.crate 68512 BLAKE2B 5ddeffd2ae8af4125a5b43d4a0a1afc7948533bf037d8cd3e47603c13b57b156618280d99b840bf318b25b6eb29400ad68499695e182acdc05bc5f621c42ee16 SHA512 070fa8dd17b380b6d7d72f6f45c84e591de9a9770b9662351e7a41af03798bf5e34d185a5fcb948f4d8ac5e210a33acd465c39eff6097662c2442b34ee3dbdff
 DIST argon2-0.5.3.crate 28795 BLAKE2B 5c3d098871fa632eac8f0873e13958b90801d76b87b18e9cc379da2fae2f1fa8f5da1ab5fdcbbc482fece6a4de8b9b3c0c397683353c366d53bb8f063702886a SHA512 5be5c07093e277092e4772172ea5b34ae7389cb3108d41f8824060a7cee1692d8019a85d196f3535e8b19ab0a869df879cae32b10d98494bda180aee16e7553c
@@ -38,6 +41,7 @@ DIST async-stream-impl-0.3.6.crate 4312 BLAKE2B ca2b41ff4279ee86db08f6e9954a8058
 DIST async-trait-0.1.83.crate 29054 BLAKE2B 4991f79abd8b9260b9541e754c30d3e0731ff786fcf65cc3f3eb75a5fcedcb37be147222778e1a0fa6c68d8fb872144b2b55b43cf6f8f4de371f24175cef405d SHA512 15969eafbdbe51e80433b53196962293daed2a70d3d9bac91c58e5e7359f60fc99ef519ceb1fd54e34d627c94f821329474a602f25f85179318d10c3147b5649
 DIST atomic-waker-1.1.2.crate 12422 BLAKE2B fc6632f3c9d719b1d24a1c8e05947d94028909d1c629b80576e176e567636dd4cca699c7e91cae2df63541da574146b3ce766374e93f0ee429bb5bc89a4d3cae SHA512 e07e58db7955791259d0ec00fc4d53318aefb4506e062914819c4220c6dc75fa11a7af0289b4653aa1f9041eb975a025635190de68b4800a0e91e33cdb0ba11c
 DIST attohttpc-0.28.0.crate 61745 BLAKE2B a2c62479e6b392d6985b006e54d3457d032c6d23c129b719e913eb43a908a202e297042e0916edb54f0d73424ff57d76b2265ad374b1c65943621f9d2ec10348 SHA512 9e8ef786681ce5edfdad1075a5a69f298abc6117a2adfc676d5af5b0ba37e1b3846b997dfd33c851273e58b38fa4b0383322ed088c5c4478a5647d631765441d
+DIST attohttpc-0.28.2.crate 63013 BLAKE2B a7f38fc320bb40da15f7f85ac381347a0ca98fcc04a1c2c279e5449687bd44d41dd6d80611c42a0eaa891f2a063b7185a574f6eb2835e339006f4aedce0f4503 SHA512 570ad6af2c661ddbaf3a2b8f4b0c8a5b1d70762c46a1e9de8ba26f975dc32d5d2eca66b98f628c2dca880a0688f3751e19f46b80fc64d97c6b42fb4dc040ca14
 DIST autocfg-1.4.0.crate 17712 BLAKE2B 7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6 SHA512 3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c
 DIST aws-creds-0.37.0.crate 6130 BLAKE2B e0332b85b0efdcd9bd34422c6221b64d7e9782f5243601d9afdeeb43280d57793d3aa4e0fcee33b70397f2d03656f6f1698873ca89ec923a9068363e8d4840c7 SHA512 6bef3a3c707642ff6ac41027e768f8714d8920008607b51bbf01b541795b1a15d81300ae56b159752bd9be3a85241c43f50f335335fb5a1d55f3331aa19864d2
 DIST aws-region-0.25.5.crate 3987 BLAKE2B c5e1b23427a3b6087318c6dfc7219347a700c8c47134d6e273573376fb980e4b32192a45affd2547f8d3b4d5f01d7968f5c64d435b1abb196e9a56b28927c65d SHA512 2526f015b2b168f5960b5b14bc5a99822add27bf727db680c3137253262c1822cf10d7fb2816345ed2a15c7171cdf1158e03301bb885292d8d3af32c1afcdfc3
@@ -56,9 +60,11 @@ DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cb
 DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9763070e269b56a14b150cbfc4b7f599d4c2a0a5f783638170ee132f0796fefb14fcac7fd73c58db0791007a SHA512 91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20
 DIST base64ct-1.6.0.crate 28870 BLAKE2B 60fbd9958f2519f293db2cd86add5160b51ff4f98718591b3e65d866e8bb176670ceecd5f6e365ff3ff488bf813860bf65d375a2159dd28b25e276e027303c4a SHA512 e3a267dce49257b6990d8d0842299d75b49a9af635082dfee25e314f5ab9067b339c877a4c7b012a1eaf9a84a7f8ddf0173c6f9d8695be81b8b4db03df66c92c
 DIST bigdecimal-0.4.6.crate 86155 BLAKE2B 5529cf7133ba9af8246e28a73456f96a4824147093f473f68a6d0a1bca4cc70c972cb47af7fa9cd8773a52fe3889cb9b708bca6973cfb0dc99971ecdabf10d67 SHA512 c419dc313bd4dcb6cf9eae361e0d7fc088aa07ad6c8f687127ee1f657439ddbe7ed3b7fc85b832e7044e93feaccd5c4f1c7b2ac29931cfab6e06401b15634737
+DIST bigdecimal-0.4.7.crate 89252 BLAKE2B 457c97530d89fd78a672aecef6bd0a0210d83f797f9297b7149cf33e9e94aa87b2c298264ceae44979042eeae2a502eea51c378263d4644edcbc877089a0c567 SHA512 7a3493617005dc19b2fa0eaf11e7fbfda734e701f3d5f24bfb01722a2739196daa29b2a33392dea40a47812528691a162773dc602c5053df65aec3a29dfec0ff
 DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
 DIST bindgen-0.69.5.crate 221128 BLAKE2B b89edbf883e1bc11a074c2f37f84bb966749823a6408b9765d6a61ee1179451d67dadde41d27838e8ddc6172dee9c342429f42fbe6959ff9fd7dcbc73d7506ea SHA512 b232b906af7535f8b87198f0a4037a0f09af367e0c913575f3d16453a2c272e7d76033cb3fd12d4223ebda4a0f8130629e67c5883e026a2422db3e0659ed3c3f
 DIST bindgen-0.70.1.crate 226363 BLAKE2B 4c5b9d70d0aa95ec3dc4cc956b3b101043132054ef47017f1e7b51072dec1ad87885caaaa91ce5353f88332a6412c0377cf9490822357e78b5124ae9b3e9a6e5 SHA512 cf1c87ea7ab9ed4df953795f1aa77e6ae6d72e768de3b517300074501ce49db6a3def1f58b9d824b5727974cab84a48461e7d98086fc440dc73ad9cf173ad5ed
+DIST bindgen-0.71.1.crate 237785 BLAKE2B 4ef4af15b95a65510190e611662e39c4c7f6a33c02ed49c19e7e2d8d0ba951657ee5f681e73d3297603a87cff02ad857a21711f1a66eb13526d5af72e749ad1b SHA512 ff7f9f1989cf014fdc73f47263adff7928a51787e57a08eb687bfa3fae2b474300c13bfba62eff4da97cb70c456846826353debd9ef6de255228fe30dc9a7b6d
 DIST biscuit-0.7.0.crate 73064 BLAKE2B 521da2ae90b8e75e8eb6395a6457a209dafc8f91ee8d2475b6e3c9cd535073e2e8467de1b69c64a11718ba930ecfd31d6f41e80e1d7137285ac1b3963de7afec SHA512 c4615ad054520a460fd2352ce3fff3d740d9279c1342028bd0b8007800bbc3133e74d8d43b84f5dcaaa883a5f2f9a2d5f6d18ef38c2942df09d3b2a80f468dfb
 DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
 DIST bit-set-0.8.0.crate 16289 BLAKE2B b27bd0a273d7e45e2fbdf46d4c5df4d82f710071cee82b19e95204cecfb13dda26aa346696f489a52f66347e7123a67cd0d05f7c2a4d7164d671f712fba1b9da SHA512 eb06e6b9285f33fb0dca69ce189838138f679e97e72538d09923e29348cb25ff1043cf4ef4ef4b74644de9a601859159d9d9d74354def92eb10b86e6067047fa
@@ -80,18 +86,22 @@ DIST borsh-1.5.3.crate 63733 BLAKE2B 70de963b8fae272eee797218075f8b5a5c732ba7b7f
 DIST borsh-derive-1.5.3.crate 29532 BLAKE2B 8ecabc2f3eb94a8766a5fd719f925d768e8443bf98872ffb5c06dfe5c14bce348fef2d9ed2e30bfbf35a8b735371a5535c7d4c92a5dff6836412737e96963438 SHA512 9f958776953543fa7dce1b36435bb331c31644e78b19bb12549ab9c0df945c6439e019384f218648c45112d1be379b67b3cff47c4cf3ed5ce6e29081dd71b47c
 DIST btoi-0.4.3.crate 10007 BLAKE2B 60a4c0511afc23ec3bdd07a905e82b501f1000081e6dbfca9ee6a0d6aad40ade84ab09d740fbc8e9656653a7f5a9a12a68ffa732618e8dc87f9cf00a90b6d3cd SHA512 35d54183a37c8adb11838724a061b38d286a92603a557ee8b4b80dd230649a0ceb165fcab4b6e41402284f2153e18fad5c246f83d99accb2fdaa8f32f854bd22
 DIST buffered-reader-1.3.1.crate 63723 BLAKE2B 7a7553b5994c01666c95a678712005ed3c02fbf8f0b45d80f2e80b2bd46c5993376b16f5d89d50a7cd915aed9da6dc164901c6e62091922e615bc8b9284f3328 SHA512 4b7efde96c2db48f8452e56a904b1fc865b7317bcc324c10c0a23147b96eb14cd5097b3178910a1a74d54948b50d6499fa7f5c8630274a80ff05f1eeb2c7054f
+DIST buffered-reader-1.3.2.crate 63738 BLAKE2B 397c9c78d467692240d4f6ce0004a089af48ff01697ca98b923e63f1df3832f16f1c0d015981863225710dd8c28e3b9dabf4acf0171e9aa227f6071d2ccb17e1 SHA512 a121f3ddc14713c79cf3b61484e3b21953eaf0fc079385a238d38c3de3b8a88b16a0793986f07bbcb7270510439eeae5fe5dc007a358ecc0f683d0b74a320167
 DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
 DIST bytecheck-0.6.12.crate 8202 BLAKE2B 2ea8db419348ad79af1e7e61b5278ebf0e0b77ed1416c2ea409d6d00f1eb991358b8d3798717121ab23fd66a4d0ff6b97515551d5f7774f5ca2933eccdee6c1e SHA512 49a85f9bbfe8bccceffcd94e3eac1f4407d93159358428ea07652714e06e97fbcb41f22f72d9d10318bc9a019be8afc99727764162f18e8de01ea4069f44dda6
 DIST bytecheck_derive-0.6.12.crate 5415 BLAKE2B c578c268d1aa62ff4f5bb7b6207ae94f42a14cfe4e16dc59a69418fc8cbc4ad3a9e18854507456111dfbfe4f720ad8cca0fab23720889b070e837196d5846476 SHA512 57f8480ddb76d8620095962acd203231fb7938c0caf9c216d89466f22464a6970f13adca5f4d5b10c9e1ec99d6e0b260ba7586c2bb895fad0380f8f9ac9a4fc8
 DIST bytemuck-1.20.0.crate 50943 BLAKE2B 5a2f373961718e994650c5f4c02a3f0e41bc7382a5b05a4488474e2ea6b077db7f773a02b77bf9b9d5b5a6da53ea79e87861ea57d944735efd225d1ee8c08425 SHA512 5ab5917e650184720a751f310d8cd7502d183a0942d97922e0bac25f257762bbe07c09b1f8427e04669f0fe449d07bd66893593cf11846cb8ec6632cb7eb271f
+DIST bytemuck-1.21.0.crate 51553 BLAKE2B dbd88d153c79cd87d6a51d33e49dde7b825711339367a168cf2471fc98a41e72d4d759873d542c3c6e196a6baed4f099103dbdfd369a329bb4578864b9ffb448 SHA512 64abfc5c0430b8bbb4b75fa7ee43037ceb180699655c0862b2699f3823fc445d931d3284ccc88dfdc98ed1a24a660cf6ea1040f91c6b2ba1cb21ab83c89d9b18
 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
 DIST bytes-1.8.0.crate 64824 BLAKE2B 9af490b43146b04704e8bf0f7df1f251d7db414b68aa614d47daebcb374a7e18908192cf0a2ecc80f40e70379395b88f60f85fa80f66e3be5661752c4ac560f2 SHA512 a721724e5cbfc73b79102a9c4a00fc9da520417819ca5c82b798c8cfb45af3d77b33f7035ad33d6187399c613cc2e83644236ac772aec934f521f87d4680059a
+DIST bytes-1.9.0.crate 67320 BLAKE2B d5a89fc1dced217bd78c6c50d0494308b69b0841506c4663b6df3755b91a9eedbd242ce1322a71b8a96847db7920b2b15744fb060aa2d69f5c8d9bcbf2745b9a SHA512 e6c0681c535db6035c1fb1c0481725bb8ab341b6324acde07ac4b60cc4f490ec6ff01478bc00fae00ade2bc5420f9d14cc44438e5d156bcce91cc0f06118296b
 DIST bzip2-0.4.4.crate 34197 BLAKE2B b69f8ad38b44eb4912b33d53467492b0ebe6ed740451bdfe9133e71c47a8dbd85b1110a9607c4cc627fbabc44cd86fe0396bb545864632ffb6169f9cfa547b6c SHA512 9cd2b9159bd0b42ac908ecad41f0a737272af94ae0d6dcfe182d2f44bcea4632d32b0456f02322047ea9d6f46377db6cd083f468782bccd6126bcc75cb852555
 DIST bzip2-sys-0.1.11+1.0.8.crate 633444 BLAKE2B 01578c512443134fc786669bea4f2ec4b9c457b9936c907315299d8b67ed78045d458c83ccc119f0fad511529fb5af5feff5fa2d983fdae832d2fcc1b343e102 SHA512 d0a86b9f03acb1e4e309d5739dc2e88cab582757d467a433afe0017017f0e5d2c0282529e3a117160958ed170d8d695ecae739805888305df0e35e4dc440582b
 DIST camellia-0.1.0.crate 89085 BLAKE2B 88f67a01f18e236a8ec2613cea4f0d38fdd65b2191e5478bd7c1155feb45832d693bff15ad4b880651cdc9c74e89cdc0131548864b2c51f7cec38ecb11b5d113 SHA512 b851c285509d21ed02428ab45378dc145959bd196ab75daebb7df60bce3b71e059d4dbb5639697ef21fd6f7554c122cab8a5702b1d118c743fe02f65054f66df
 DIST cast5-0.11.1.crate 37018 BLAKE2B ed3d9283131df32dc18a5e4110a325b7713936e109b43bed8da0d22b0afe81a0f00c9e4fab0bca1194c93fe6f0bf326a5474af6f9274c310632b93d24dc9328a SHA512 0fe363b576ece2661616c47c4de1801756c5aaa2a56c720a7b4eedf23e031ba9d30af9d086a16b0f957c39b473cea1f059295dd1c776e9a9cd4393e6c895d015
 DIST cbc-0.1.2.crate 23501 BLAKE2B c0d537af0323a92cd01a9ec197bbe46507835348e16dcec7360072226647abe2eaa4823023930da93885347fe1429acc2f9c079b7bcac686c1293ef73b91bf0a SHA512 d3b33deff64d839ad25141f1c3b5fbeaa21f71aee7b58dbed91e7d257f93e68073c8d4a63d4c4eb9775c20f00bb0ceeee714a8218e85a231f30cd7423022f820
 DIST cc-1.2.1.crate 92731 BLAKE2B c9cb100964834692781ecc3f47972f83adaf27e019ca212f896b19a853521cf2084da213f2c2fc5c8a1bc794cc83fe9f81faf7751e1b065a3a2a08137cda0b61 SHA512 54bc5d85d48d678d33dc795aa6cc823a59ae6d17b4ec5708a1dd515e3495eabccdd949e9467e9bb3a29e44847a2d3ccd75055dfda241d8abbb16bfad650f2819
+DIST cc-1.2.5.crate 99839 BLAKE2B cbc49474bea2880a8908762a3bd03dd853cc9b342a51071a8cc1cbd3c0db2b8ec054c44e844bec021487e8f06bb8c5299e5b29a13b73e24d6f313918d0e9c929 SHA512 364066b0f45ee99cab088833a0e095ec3e7f3d8e2a0c4030ffca65f8c35174f23fb9b7ce0b97590bfd747fbc33c1851c6c8d74979e8a2250640f8cc2509d4daf
 DIST cedarwood-0.4.6.crate 12726 BLAKE2B ec553ca39d10242865027a20714e09148f1c3b40cee683976663fd4dfdb4396dca6e0cdd3bebe626c137093e25828c3243e04c4135dfa42aaf3fffb7d2d869cd SHA512 9c05863b5f35bd8652ae08d432f9abca8ce7fae5784496e1e46081bfea4efbd1b045283c4eb20062b76294f89f1970b337730111d638e65d731b16daba6e8d2e
 DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
 DIST cfb-0.7.3.crate 63277 BLAKE2B 5d0d4124421d26c1e3dbfabaf741c407f346d62147b12bbf889ef5b4c25350c02d09919e332e1ca18ade34a4e6d2895fc835161f7062c0c0bb56f104f94811a6 SHA512 a5c8d5da5ac009dd7d19320237ea516a65c9b1780bec3403fdbfb6ffa13bf7d05a896baeac5760c3e9aead9f4bd66cf969ab12bbd2938cbe479b1d2266e80b8f
@@ -99,27 +109,34 @@ DIST cfb-mode-0.8.2.crate 25334 BLAKE2B e004871204d40258a052b7771f6d770f710857fd
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cfg_aliases-0.2.1.crate 6355 BLAKE2B a758d9c88527f0e6e7cfd6d4c83eda1bcb4d6e2438189fe08e8ecbcaa78d56afc5a4873f3b82bf7da96afd690b44cdf1e44466b6da0f37c358b340481017103e SHA512 74969d12d5d24002a29e08d52e30fbce014dd481a7c35ee0162e69333c5f2d7755f3b02439b31522e12444cf1ac8e65880ce33fe6778dac03757e362cbf8a72c
 DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
+DIST chrono-0.4.39.crate 222248 BLAKE2B eeff1694a98e8775524c261c5c46ebf09bf1ffc6222a945576960e8153af99e4549d8c988bd086507fa430f9cb15a3159be85300247ab3c6f5e77ab515f0988b SHA512 5b258f76bea58ab9baa0fe8fb32c41928b8b655c76bb2fbaae9300ef8380cbb881296cee6b9e9886dce62b0759c73e84f6409e374a86cf0c80e3383512f98571
 DIST cipher-0.2.5.crate 13099 BLAKE2B a728a53007340dcc55da52cc170e5b801c8ad20c4e159d31200d5ab7f8bf4407af9a60713b4385ef0d65c06cc81692cfbd7339cb7449367d1eaf7c529ca34373 SHA512 e55627f5424d9b566dfb0787eebb1fb17ae98b4016c9091e87040ed37b36e0256b7681958a0d90aaf06c125c71123270bf986128ca1e0dc125f3162a868848b9
 DIST cipher-0.4.4.crate 19073 BLAKE2B 144c45c1bdc5f7aef7f4fc63b6dd85955c453537567d1f1074e436e50d0d61f8413973cf3da207a48f1560ea92f2280fc5880569c78a1dd66bf97fd1d88ccde7 SHA512 1856d8b08bc3dbd2fa5c8b97e9eae43323c7aa19203ef3e80bb49cf15b5ddc832acb7b97121a52032656353e764f1f722200b638f7c28975fec1b5c9dc908846
 DIST clang-sys-1.8.1.crate 44009 BLAKE2B 9173de6dfbd3ef9d5d1fdc559700cd3a52f95cd77302063a97e8cf311a35825825e030b47f252c857853663ae8a16709e1f7bd0c608d67c2a74eb36ed588e778 SHA512 a68c426c20110fddb8bba07d6631517b0528fad45802e5a34a22561d7e6dad82dc5001387019a03f275e9a671b09ee0a06b6e86793c4fb4ec655700bb0f5e125
 DIST clap-4.5.21.crate 56470 BLAKE2B 63b58b49ad5494712d0d45db92bea7a0247715f655c108cb81a4ae7380bdf572c292bee1edfb601aacec401d7d2fcd76068373200be642ac8179a33bc6b941ef SHA512 ca7b55defd85a4e1001d04653aaf1c38af9b43715dc6fd7b7a8c49a66ce1be0c09e0ac78b3a3febb90ad9a7d8676b4ff1ddc136816019eb394b7d4908af2a51e
+DIST clap-4.5.23.crate 56460 BLAKE2B 5c0ff6ecc072368022b8dc08703d87802160817e40228fccbf9cbdc15d86dfaf0eec141dec4e8f1327e5a6d1622df9b334e94797027372dbe8765a12b918961e SHA512 4a8ef8731c9768844debcd1ba83a79a607fd32d9fbfe7411abefb8939c5c442e8a206738bb54dddd136117d3992f519ffd1640694ad7796c4e0aae3f95502c7c
 DIST clap_builder-4.5.21.crate 164115 BLAKE2B 7df7a2fb8472e32c1885978f99a77b05f91c96131d00947386930e7249ad7a7b055ae5b1ebf145ddafef4d7d5fb276f3135423101bdb5ebc597b9b15267cfab1 SHA512 48abad9de7b0985138a2586674df36bcb925f3280cc19c7dcbec14d58c1a3bb391c836ff284366fb32d7460a5616b066e4e055e3a5fa7651196e62c59ca49c8c
+DIST clap_builder-4.5.23.crate 164180 BLAKE2B 90948ac5e8ea620be3e1ec1334677b0ae9dc227a00354fcd3d78e2cf23a1c101e009e6cc96fc19c0a2395e1b9ac6272fd9615abc1acf1a5d60392e337cfc961b SHA512 0889876990f0a361cc6b6d41f2a8f4b1decd376987a02fe69888455c92f3e583d6ff70880c6f0ea154ba62f4be7d2e7b18cdc4e0e2f243e6b17f250c3e8d1c2a
 DIST clap_derive-4.5.18.crate 30131 BLAKE2B ff962e52d8d8afcc9639365e27753c6c6943fd809ef89d9e555e8be5b2f13efa650bf1f9ae451f4c127c1529a0af1d892c3b02153b46deb912029b45983e01cb SHA512 035bb918bc7e9badd59341560f23e3a8a2e7cf945b6d8183f74052c4edfcbecf07c9ea6fce0ceef0b84c89a99d62b11760af39398897e4ee7dad0170a96cfefa
 DIST clap_lex-0.7.3.crate 12841 BLAKE2B e825c027d8f3909cde259236fce6c3f12fcffd92c714cdb29eb886a12ef703c6844dc6a157199e94f8015549311becbdb11b83d49cb89fd5c8ce1e642b9e1e1b SHA512 c76838743e65529d00ce4b1224174007892967622ba820750bc7fb352bb267923fa3baf42dcbd7e831c3d1b247144bac5475548c9d13582b95762695528d952b
+DIST clap_lex-0.7.4.crate 12858 BLAKE2B a5ecd50cc503157dd69746f3b6e9c288e0fe4f6d5d82271499f657134fd401fbe076255e2be6a23ed0b69daf3941c6429dad8b288223b0ad390a2c435575cdd1 SHA512 a2566868f4619679d3b74b70592ffa6a04b13e38e3196c56bb1dae8bea0c711bddbccd778d2aba3cc0ee074c9b1cc0335222818f0d47fb3cc8109cbc35bb992e
 DIST cmac-0.7.2.crate 44847 BLAKE2B ab8539f41e720f132b2da3176e9c533a2309cbb3dcdb027af4c5bdd6ac68e4a2a97f53efda52236527a15786b73bd96ad940385002412330d7cde60e3492a6fc SHA512 9e55f9f9323dff330ef45da953bc35da79ff8fe643b3984479dbab10b35e05e4d613f7329c46bc119fefa589d8f5f3bb268a7e7f0853003c1e192fe324e83315
 DIST cmake-0.1.52.crate 18119 BLAKE2B 03025cec724f080a9911505405a3bfc489709f557119adf7a70ca86d148a75ac7758896a9b136211b8473162484c998a9c7e7b5005250a037d1633b3a5706c3c SHA512 3200249c2de5b1d052fdf05a9fa82539f2d3f25c37e1c064d05dab2607a16cff2e7755497d09f71e01b95618e71f42640cf9d533b17ead9cca84777dec355fcb
 DIST colorchoice-1.0.3.crate 7923 BLAKE2B 7055fe61677143f0d4445ed5f6be2cbc284c155aa6ceac04df6f3fa2563a225e440ba708bf40e298ad09775ab7c7e1842b5f6dd78422b06dbd1250908e3227ee SHA512 fc26696189d3935d5510a1237504339c1f354d03ffd3b4e830b7080335aa778bc72787ac5fa9a67a731b9bde2788da778d497f2ef97ec68bdec5145fedf4cd14
 DIST combine-4.6.7.crate 134808 BLAKE2B 1f3ea9962f4ed4177a9c028d04934b5e261df405c1c0282c74609e0e6a1490a92b262ad26d1d21dae977cff8795bfa3c1f85aa43fab13a88227394d61d93861d SHA512 b8232b0e1f94039cef3ad4a0a35a972eb49f4f198749d2fe50aa3fd2a77614f2d24e51f3b4465243ce9140aed6bd048aaaae189a7ba864e3d23843e9be0c437f
 DIST concurrent-queue-2.5.0.crate 22654 BLAKE2B b490e76804e45d6a7af6bb4ec074fb370d9ec7cd67c7ecfb55d5ed53b9b437c174e678add915303559e902ac81c8751dccb2c5ef0543d5961713372fd2b08d3c SHA512 235704f9161dfac60d2a6d2cf96425e39c097dcde2f005187c1f044704eec66d8303d59352cd414a81a3ed0eed60421054b0070a9b8f69065a79a2519e913e5a
+DIST console-0.15.10.crate 36449 BLAKE2B d0d2f161ea045854f0f53af39490c37af170888241b2f63bb47749b288ac387e24e52f936651763a5584a20bcca3512b28d50cfc4435d97ff06cb5de20768e29 SHA512 2d4b99912215a1e7083ac4cdd594f6ef7914152c683f007babecde2be7f3d6c2a861a198c9b4306242d84722d44965185ba846041e2ef13ee9ee9a5d43c370d5
 DIST console-0.15.8.crate 36364 BLAKE2B 467de2c2fbfe31688cea20b338558ae9671e50ba1fd07983d21f32d7eacb73e565ebdd6ec5e78b2ae04446f09615c70983c0ee534e25ca5a28fd1b408acfdf34 SHA512 b05e49ed145785e29631d481885788f0cc5574d4d7c4d90280dfedaee7f8c1515072c9c4cfe6bd2e017230cd228157222af7e7d41a9fce697cd1888095df4de9
 DIST const-oid-0.9.6.crate 45382 BLAKE2B ac27c689784fbb1f486cec1c17502c8738ce3d7d1b579391a151cb0f0a6a0c8335e474d0a517c59230fcac74317396f20ac15d66e2f6685780be01dab197fd96 SHA512 b871d3b4326c4828b1c1d7a3e968315fa320e0b52e97081a95617ded0dc5b93d42b3f79ad26ff3b58a4835dcc442473f3965c2b60026412ad6aacc0c23e9f399
 DIST const-random-0.1.18.crate 6646 BLAKE2B 20e71fd7e2b0b9af663073a45d0224a4cf9a6a6bdab5c3565de88b4a66ff24a1b0f8c01bdbb86f5192b723c03030ae02fb86722be7cc41c3154cdc81f843f013 SHA512 e250227850001a3ac6abdda6e7bb88efeaec1504a54348a5ea71ff66c984455eb9181b2acfdc0b6c08ef6f51beb34b7ae7836e370d84d75731a2482226c5ed26
 DIST const-random-macro-0.1.16.crate 6657 BLAKE2B 44a3508e2158b79042cab698b1f31c50fa356098bb5f4537f82fe1b9e893d3e8eab59612a8957e524294ca0a035046468d799e4a0e9253c1464b68ef682f84e2 SHA512 8478bc65b0845e765a69e09fe4152e89f3e3970d2d92e4b32bb0abb7b918c725f325d4b19a45d2a462905bedf837b3a23f31b1ed9dc8655ca502de72616b074d
 DIST const_panic-0.2.10.crate 48359 BLAKE2B 0acea832fc22f1007a935ad64eb15a07321a0a9c6777350b3dceef61cdc6f6f1b9f038dc2a25881ec1dfc0230ede42fc98a37ee252625be8f0965e571bc14643 SHA512 840e7cd76a09502868cdd7f36c8598e2c6fad913beb58c7267471d5d1b1561d858fd77de196999acafa1d912ef03b61ee4b2e2daf7b87bfa14b691b73ec3761d
+DIST const_panic-0.2.11.crate 48930 BLAKE2B 131a9b02b0ab620d75a0e5489df28af9a5ebe960049f3e7a4b3a34d09470873c00c276c08f3e8cc2db2dd7257440697fadac067826a84aab94b2cd7a20123fe7 SHA512 9c98b7ea45d6343d95c9af26d3adb0d0a1ebbd9b160ea315f5e6f173a4afe1b4fca3984c72e845d40b067311b6ea55aec1280a28ae7c1e3e728fc40aab48485a
 DIST constant_time_eq-0.2.6.crate 10936 BLAKE2B 4fe46bfd279394ac8064662a89da8a5f7240ea337b3b43b6f69804952ed6370dc28979060534776e7f252f472e3197fec130529899afeb37f82260358900d107 SHA512 3c8b61de0be32647be4c64d2d4856cf317964dfd682c32268046c6d4fb66af5b3fac32dc214e537ece9b3a879685b1d87c47757afd336630cacd5c8b9716f8f7
 DIST constant_time_eq-0.3.1.crate 11561 BLAKE2B 9ac06a1b13da2aacfaa20d60e48df4f32f6462e4036fd9ec116c45a9bbe142a18b82cf18d762989876f31b745d98d52ce7e3d32f6c9700a500f16f00649b5699 SHA512 2b6b0d7572c02606b7c3780013fb1d1773b999a0d9934e4b140dd82f94e6c91d2ef82f6daaa1bda94f95bdf6b5997b2f0ea0c8eba8ca7e28a07d1e06b1071b50
 DIST core-foundation-0.9.4.crate 27743 BLAKE2B 5b695e671cc833170bc6bad436b2d0d8d386ffb8181bfcf2e92a1d93cee67c3ba1768cf57064fb91b0897c6aec1be7db40b5bd256a052c1bdaf872ec19f6e15e SHA512 82d0878a1b9e3d56b3666fb5a78f92c6f7806d01665c242c06a640bd6b1fd36260211e92dc05e1a16d1430622bfdd650aabb0b5bd8e5592f74abdcf412448e33
 DIST core-foundation-sys-0.8.7.crate 37712 BLAKE2B 0e1dd99a5bbb0fe92f55181a37426f6e86445cb20e355f553b3162c88ccc075644461731a0cdcd93dcca65b6cef1de62b409afbd73ba3070a199ab8e7422dcfa SHA512 17492d5314db03abdb3b1998bf0c396ec8ed0f83bc978ae22d6026afdc86c50b58cbac073b3a0d97b92da7e98be11302faf1249d24313494bc058add4f4cb63a
+DIST core2-0.4.0.crate 37075 BLAKE2B 89ad26bf5eb5ee48dff32d3b6b11e0a84b68e4f29c39fb9db79c64f3c445fde248b33b1ba9d1410673c3fe823ecca25dea637237c384b7cb419de9bceab8a570 SHA512 53c9d2599d87c37d8b6fc8b2293fc16928a97754240e35af770f7e969e4d91ffffe3afbb4e04312de828d1d43ca6c9b734e0725ac5ac9d74f252449ce296ab7b
 DIST cpufeatures-0.2.16.crate 13405 BLAKE2B 06d061cb2577057bd2afbc8cd6783488595701dbc46772533645d86aed71ba8b20905625b897840c90aaebb41360a286935824ca49bdebc0763a81df4bd64402 SHA512 97707ae1b533ecd3a6fe412a22fb70cf4ac278c2d7dba407fa7dbebd110d06f88a7b3aee3fb7cf4b0b5ca88f6fecf390c4d3e5ccbd4d18a75fc2f93a647e7074
 DIST crc-3.2.1.crate 15070 BLAKE2B 9d5f488b57bc232528cfb8d9ef33a88d25d904395dfac8dc10e864dc0d6c89e576585195a20db585fe358859ec50afa998562ad6becf6fd2e505f3969eb36ed8 SHA512 64b7272d8cf55efe9768f9f3218f83302ccb59458a56fe3b7b2de1a53eb5a3b57fbf268647fdba5b230cccdd4058462ba583d76870ba12cb1057ac2787f181db
 DIST crc-catalog-2.4.0.crate 10155 BLAKE2B a9c3ef81871d72635addf1ded611fa6e963b9b128dda198eaa3a256512c8759608bae95df95524704aeb38f81e2fb6c2da2e29e306a8ed3dea595e63cdf05638 SHA512 25536456fe71c44fd8ec527299339c1d186f6e12f1f90142de60eabce337d836c2497ddd6307473b57a6cc720cfc8e29b059f378c70b8165bc171420ccb40a29
@@ -127,10 +144,14 @@ DIST crc16-0.4.0.crate 9571 BLAKE2B 2f848e7a00e860d62a44832adfaad655e89dd6e46b0e
 DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd SHA512 c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266
 DIST crossbeam-0.8.4.crate 10500 BLAKE2B 03212d9789a66c1eee7d1f4c7883eec1267089ab9d652ba5d7d59a22e04ab878e5defeccf8cff4587a34d976488ffa689bffde596588057d814b633ab3d67d1d SHA512 63650fe2d46ff2e593342b398c153facd3cb7cd72dac9b057ee0aac5ef5e9dd9df0e71536d66879676c0edaa89787d1f365eea35c82604ca46090e527749f994
 DIST crossbeam-channel-0.5.13.crate 91174 BLAKE2B 7a9aed6f4922c1d10e4ae12508a03dc7daca773adad6a317c4ea38e544d7c28c56a06623d958aec540fcaa86fa9051a1aaa2c859dadff72873f18f2f3a951449 SHA512 0f31223a7099f84e39e6b76b19cf26736e0c3907fffc2ed3eb0012c7984b1993570bf6d155eba5bfb82897ef0e4fc93b89096071410bbac256ca6be9a9568ff8
+DIST crossbeam-channel-0.5.14.crate 92728 BLAKE2B 0da1bb0f0dc6f35c4ce8d4bb058d61b7c3ff4854f71b58968edc691c1d7016ec845f27e2fffa34835e86f19fdf4507275b013946b2fe3135dfa83d328ecb5199 SHA512 ab3448f7adeccab3c1d988746c3db1fc1e8854a53f7b5cad63fb7874e5b6f5663d34541d4c5383472db56a7c8b272fddfc78ea2ac1792a18d6c8230dfbabad45
 DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864
+DIST crossbeam-deque-0.8.6.crate 22471 BLAKE2B 02b854df171b0430ca8a40349674ff251698d0c322c317055da8678da6661730c945d86737fa4947c3bd824ffe402271ee2f77fd6a505d2d46b4a41454c510c8 SHA512 9368c0c224c4b84356f1d422d8869a5ab4bfb36b0ff69244a9e7a7304ed51f034001cd9b2bc35849df874d36ed34285c66574943573522ea32bbdc5a05df6989
 DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2
 DIST crossbeam-queue-0.3.11.crate 15581 BLAKE2B 91b9797f985af06c854c38b8124cb67864bdb47979d2e253928678118515fbc1257108c7102bad66e1f65fd6f324a93749dde86b4ea28f3bb5a16491f3f56ed2 SHA512 c6007307ef9d219889e6244805ae759998396e1d0548e3664ce9ab366ea78917dee75251c4265b0e3ef4ab15b5c6d42d6a5e9b286d17ad42ec169e7fcddb8ffe
+DIST crossbeam-queue-0.3.12.crate 16270 BLAKE2B 75be9d53340ab72e5e52c940bf6ba5dc417d3245fe18c456ca68b460c7747f7d99340517fa1387c7153faa8a0beac002fe3eabedc8638d044e0c05f4c5b98d56 SHA512 a117977e55c0c2eca2a6141e3292dbc75ae5d80c087f0667cd767b9e9ee0f9c87084ceab34937b66b28a586b071e518a483684bb041e6410b2c3ab5924bef769
 DIST crossbeam-utils-0.8.20.crate 42487 BLAKE2B b50da06721cfbfff07825574feada8a28d3814edb218434288683eec31bddabe2ffbf7e5ef1281ee14a8a77c56db3b66f3c5ceabaea9c72317c1bd2cecda0c26 SHA512 7175eadf9fa7c526fa11ff87e40ff203f0e7a4bcec15cb972f924f3c7ff7cc20b6e2e8dbbc1ede142a0207cd2baa4f446deb25d825d28a54cbd25c263701bfaa
+DIST crossbeam-utils-0.8.21.crate 42691 BLAKE2B cd9015c41f532eb3c90101603f32d383f01e6880718b727d6d1fe46872ae276cda685e1b548cf77dd22bb1a05f0d4c4982332c2bde90e1743dbd7f51919022a7 SHA512 6f4aa7ca10c20da291c4714b56ceb1fab1c06b03b2f4e28e474e9aeb95ab6615a25462dc7819713652c3b5f6a06fa0f24ebc92c533fcf35dfcf2655857d975f8
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST crypto-bigint-0.5.5.crate 83384 BLAKE2B f688f22331b4b3620299ae9b50aa9ba6e1b2c7a4ae55e4236f7ccb8ddee4f61950ee0332b6b67005bad505434f3be74b1a0caa426036dde94162289c6926c8d4 SHA512 04668d432b4169154934d55b8ab14f708e59f70a70704b56cd72ceaca460e15589965aa92a22bef20b32ce637a423cc6e1a8819dfba38a32353bd749f7126021
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
@@ -146,12 +167,14 @@ DIST darling_core-0.13.4.crate 52937 BLAKE2B e038aea27b5b56f29cec8874132881ef589
 DIST darling_core-0.20.10.crate 65015 BLAKE2B a94adcc6092a7a69728725ec4bf4cb7c163bc3fe0890f272bba9963c256697bbe1ad964d58a975c80742019c59d4e1b3e56e624f938576996e216d2f99e21f2d SHA512 2b971156b8c1433dd0ddb2213ee522e2fe9968a62889285d1457b5e733daa70a09c21bca9b8573d9c742026b4c06f4dd2025a6a196ec0b08b25a78d8737dff6d
 DIST darling_macro-0.13.4.crate 1910 BLAKE2B 432adc44108cce6a13adc9ec45ff9b7555eb4c0ac7f1000fdc8f8e9d1bc0ecfeb65b78f81438b097946aed8e37835f82028c1b16c1d466a124998139ae854df1 SHA512 908ea6459110da16e4ec6ac843659664ed4fa3fb2ea9b92274a738ff5994cf81fbb48403db609b9a70f39c3e288da4358ce369c66821122e3a6a0940473da94c
 DIST darling_macro-0.20.10.crate 1874 BLAKE2B 29cbdc6bd63e4eb0731c8f8f0a50cfcae9a88f116f8cfc0068e5d3cddc20b42b7f0f20f128ffa0f7bcb8d72f0188b04b3838b8327fa6f3ab45de4cf5c3bbf317 SHA512 565b8d535248d9d88b49a58e2a210ecc70f1cd39bfaf029ac6576a9b2eac70a6b18b4930aeca746d76d53b745c6aa82172bb341c4844b3757fc7978732fc2f52
+DIST dary_heap-0.3.7.crate 24076 BLAKE2B 917b6f0a9f00b117e37b43cb2979cb77c6bb3913e4e91367d79ce51787caf8d78e1fcc92d26d0290e938837ba6e649e4fe150dfe5626f0ab841c36b7c44869a4 SHA512 18301b9f6acaabadcf79e8c05953db92412173de2474583f8ae0274d7ff73c2a3440a8f93c398e2847db5a84dd0c373d7daa6c0e0f0a185578a6fd10f3450f25
 DIST dashmap-6.1.0.crate 24828 BLAKE2B de8632e7e22132fb2464653cbf6d928d7f2abd8e7352a50e6fcbf6b522aaec67ab2a7618cdd34f0d48d0bdfbef026a1515d5ada98ac5b123fc7856246e392968 SHA512 03a727e41505e5e7068df8fb27fad6d348fc14f6b1609d7f606fba765fb92fec7fb42c6427bc11d057ad2ad52d1b44bcf5a802651765148941ba41fa75968cb0
 DIST data-encoding-2.6.0.crate 20769 BLAKE2B 9d5713e63f6f6a4d6e5324fb0be9308a231ccefa20d69cda9e19609a2250e2cd72030ec28309068f71c932327a3ef680b749125658e27d35273354c3465f9931 SHA512 a685c7bbd251a5738b27ac3ac8121a0db049221510c99e0ada6f245ed7499d04ec29d725ad01c688ad283e3d2d5aae0751685c804f6d95cae84e63a160d04c9c
 DIST dbl-0.3.2.crate 6336 BLAKE2B bb912351efaf270363c2a6cefe4da42ae8c6a552690b566e5a7b70115721efd2ef42801500d534de0245b6feff5b6895bed74924c86eda3c5e9a5322f32e1392 SHA512 efed499069e1eacb709598b9a250be353d65dd9a1a27c7fac6d23af6262af0fda60b121c283b9318f301be2d80194ec1ce33733daa554f54ed3f690478d37cfe
 DIST deadpool-0.10.0.crate 31997 BLAKE2B c5ca6045700c38a2c1581c45c782ff4920e28833d520dc2f8bba09afbecf423e5d29bc1151d21f9b394bfacb5a92077ec81d1f981d77ac42d5ea618c04ee93f8 SHA512 cc928921af9c0b3007d71e4951d9b1a63ef24d29e6d699c99a629eda3b75700eff9cb0fa7043263b96090e0ec5438749ed552e676594982a5f72ca7c24f34a74
 DIST deadpool-0.12.1.crate 33054 BLAKE2B 06712612f4efd78694b52ab2de7fbb4b48b308e522b4fc7849ef8fedea5bfa84aa790656b3e44bd012814494bef71fec1cac1d19e031ef43c5d43786cf4c46a9 SHA512 4df9fedbc66f1aa7b2a83c730c66f4d7a1041ee2bf3d50a3217b45fefc4502b203166fd77ac5fbb8ec878d95c412d3530322e7f1c1b668cb4f02661d800866ee
 DIST deadpool-postgres-0.14.0.crate 22259 BLAKE2B f9c9b9b762dc39766479ebc36f585df191b26458ac4fd53bd9703f848a3eca26796470b0524c9676c8622da4e1c367c3983ed2426ab0a956f9274e5876b5e6f0 SHA512 d7fe34d14f97a2c4e892681999911f18147d0cd04d1b9093a15545df9f8b4393803d30f752e00083007f07ec8f5f4f143cc409718272521c746bb465e06a2595
+DIST deadpool-postgres-0.14.1.crate 22351 BLAKE2B 63f34d4fc29c723abaddf225e9701cf99ef3ce447c7f8f8b21abc729260b64b0e16d04c3ad077727f0f360f09ca03febe06f96071de4f9e01f59e8c88141b2d3 SHA512 9532442c19c3db92602375b7dfaee64687339242161c5a7b2ac105ac7a58a3fccfdce0b034649326af98bb7470df74ba831a34f07c202b5e1a30b19ce1ad0af3
 DIST deadpool-runtime-0.1.4.crate 7664 BLAKE2B 1a9574aa768115ed77e4a3694b4227a8709a1535b67a7fb1f0c847b704826908ce402b5891bf54430429b247cbe467ce1fa499b01001dfd5d584ff92d3333612 SHA512 830da91a0f7d608c6db5982d39b0c9df0660adff88a7e6a6b7216ccd366701b1aa5dc23f3e7705685ee881b8c43b689934cdb5ac0d4c50f5624d9e05230a120c
 DIST decancer-3.2.8.crate 64647 BLAKE2B 06cab1141cf9fb146e30dedd8f9f8940c78ad00cafc7f9f4a57dcd677cb3d90fdd11cb045b6511c04b0623571a311b44e73d133736882bd28fa67fbe4c892f40 SHA512 bdc7027f959accab68d466d60b7a3ccf9e065d6927d6a45487d27430d42662bc538588fd6cf6433deba7ed04d7bffc3a5bb3fc3fdb25749a226730cd775df8b2
 DIST deflate64-0.1.9.crate 15104 BLAKE2B e0b221fb309a56d5172738a09d83e3bc51fc5629db9a4a7977f4c05bd3ed67ddbc246141df8edb65fba7cfee3da2e931f35fc18cc6039b67a9b016bec94c473e SHA512 7b91cb3c9f37e80dcb7fb86ce29e29b2b803e18d6e5b44d0dce907978f439ce9547807b3d19f8172053ca501b71e701e356a889756b84c4c158c3c596c46508d
@@ -193,6 +216,7 @@ DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc
 DIST event-listener-2.5.3.crate 15392 BLAKE2B c56ed5eafa64014141e869dcf952e86f755eb35ed1722f8139260cb502ba226351ed1bea301618e94c9ca7f3309747057eb5f7d7986cfcdb7f6b79d13d52b439 SHA512 ddd67c1139ffe2aba95d763b73db0e2a9985dd2e57cf8f72030047d53d46d833df4b4192730cf0af4e060ce52e4f2df23aab6509abb94a6cd02e0d8cc3559d22
 DIST event-listener-5.3.1.crate 42576 BLAKE2B dfd8020527c06adae338e9bcf19076e70ae745facd7b49e8d6604e8508436b70b48fb1f4479214998f288055447186d4ef4969630af90e301103bc5faf6492e5 SHA512 98b7219a3959d6225ee5fb68e8b9d284ab03334d895f52a71f673e59cabab1d06a0abb9eab905e8d38d5f9589725c7c598355ae3c909044a23bc5830b761f5c0
 DIST event-listener-strategy-0.5.2.crate 10697 BLAKE2B f49faa8a2cda551b65e29b9dc98e4e55dabff7f2b330097bf5f6a5a5927804a99cb699d1f693db9c7cbd92ecb44f6c1b51be2b86810d3e3fbfd5eebcfad1a241 SHA512 7b3759d07c7936b53351172e38623658cbe642f079426c99e7f9187ba1d7f8cbbe7530c056cc760909cda4e70281a50577caa41426164b4c8d6c3f4cbddb2626
+DIST event-listener-strategy-0.5.3.crate 10920 BLAKE2B ecfa6387d9f09ab8fc6d7bcaaa655fa69f7d732bf40c16549b12074ffd25b1d9e6ce19f7600d1be615ec72f5fbda85d0c9e0a19bb5c0cdd9020c4b9515d9f778 SHA512 f1a14f69afb9765a317b3d7bda505a28f050a7594d6b07e5263d635b806d494ab41c456dcf38ca924ecc0595be0f77e32ffe239107fce1cc5b71ee7249419f5a
 DIST fallible-iterator-0.2.0.crate 18509 BLAKE2B 9630fcadb2f30fbd8a2a057eb992bf33c0aa2d163e6fbd43de9c8c350e3e932ebca79a6576b215e17a0566898f6e37aef806a643d20c16a6aa73ca515fcf30c0 SHA512 c558fea3fcf3a7756acc0b63d38f76dfe7eeed4dd9c12c46b7a7e8b8bea64d00e0cc115492e8b3a1a19e86e6083477dcf7d2d72ef960b44f24d61819a3077e79
 DIST fallible-iterator-0.3.0.crate 19639 BLAKE2B 58b8fe842fd6514fa4327eacc81b157a4a9bec4ad9b8e69248c0f0aa5610dbddb9c8a72e6e6ef9fb8216e8f79e6aab439e90d4d527e35634ab222347cbe39974 SHA512 c655918fcda5deb8ce792708509e4959139f113c1006dd41b94d7073ffc204512a22cdeeee05c87534db9c414da3f4eb716e1a26970646fcb1c139a14eb8a2fa
 DIST fallible-streaming-iterator-0.1.9.crate 9249 BLAKE2B cc4459b34a9ad00552a5248d090d1f25804b92838f41131e475abb83ae0b89401248feeb52a49dbffd499ccc0ba0f2f1d044f2f3e9b06662be01fe2257a4e885 SHA512 34824e2007cb944eaf54b10d6d3885bb17ef2a2976c6dd7695ff82a937cc95eb65d343dd7a5cd2fab5aa5859faae3352a9e1c78f239ff736900c1dbc3f5ef7dc
@@ -206,6 +230,7 @@ DIST fixedbitset-0.4.2.crate 15954 BLAKE2B 91270883db5ad0e999ebbca1123d8729d3040
 DIST flate2-1.0.35.crate 109188 BLAKE2B 8bd6e51c3bcc06044e5b8d7ead950c3beab6c6337052fd48e86175f0fc98c8d12804274308ee515dc6156bbedb2277dfa2706cdcd7baaf2a789122473248486e SHA512 aa2c4f0ad46cfbc7d2bfbdffd226eaa37f5223a34d132d8fb2dfd04c20d15a96c4882cc377fd72afbc7d13e512f5e9934386b0390a0ab2b171d081335c58fad4
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST foldhash-0.1.3.crate 13712 BLAKE2B e5913d3aa493d0176af9650354d98870b7e97523ca743a7d9605da3f559463654f391e42438d96fc797397ced449f13ce499c20ed5db7aec772aae97c5f29175 SHA512 844d5b699db632254dfc378d46e34909637118647250e2382cbb88855f6739fb9b5f1b840bb8e250dc8fbd2a97c9155e5d8fd0c5c760b8e02dd0aecd96818a5b
+DIST foldhash-0.1.4.crate 13764 BLAKE2B 7dde82c52671b93d91b2ec9984c0ce539d89d5c80cb115c0db18cf72f84f4fbbe4f7b36b745143102fc83c307df2cae051e4fb461a3131f52c8f98172fc0e72b SHA512 096efd30917c42e75e162a79d5c0ef068af76c7b6206cef880c4a3af92d096b4b4a1cd3de5b66ddb040730d58678c9a651734517dc8a60a265ebddd5559b95c1
 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-data-0.5.5.crate 25339 BLAKE2B ca5a19db317f4830e72d3efff2beb0396cbcca821aa920464a8197e5a5f96feda0b1b6b4c0ddacddb884836f8595da7373bedc3246c04aa2eb0a1a521d2a931c SHA512 522778535df66fd485a7d9f544d91a3f16fab12b88639e0540edbc67d8ce26f897fdf200b450218908b30bdc1ede81407fd9ba92f021bc393bd93ea78d04512a
@@ -252,16 +277,21 @@ DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc447
 DIST hermit-abi-0.4.0.crate 16310 BLAKE2B efcd1dee7bcd6d185cbe0051c7bc7e2776857ffcfd2adc3fb101febd7c1bd75994b7e4a4a0a59c5b4628cc2521b4c1f043e98a0c44935d0180e7499667690ab8 SHA512 b1a21f6d54598185a8e8c29565ffc2e1bc5da57cf1c9d87ba643d23d7c23d53e8ad36ee2f5c1ec8a504334b6f98b0f17a832ff37877c7b7f9238b196f4034e6f
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST hickory-client-0.24.1.crate 37830 BLAKE2B 5b996ffc2d2e10edec0fb2aad9f361be2383c2adc2524ce583ffc3c43f3cb0a49236a00c70ff10624b805b41f20016c12d9ac97281fb79a16fe1710868f91287 SHA512 b47f6e7e237c803ce0a1ae7b034e9173b64b9c4e5db74259348e943004f5a506b36c57563590337755ad2eb411524f09593d771f3d2bb66eba225a7418ee0792
+DIST hickory-client-0.24.2.crate 37573 BLAKE2B 9a0a0a055e02a3db4893163f981dcc293879af323374a934ba719f306a31cd9bf7e4e839e0ce56155c07c112db4580a978d0b81b43585f127179c061b93e5e5a SHA512 ca819f9936af515c31e646a337a9e73f67a02e1991a56a07015214786f77ef891a2a20ec247c151efcacf1b3d93ba526552ff9c58944716aa65b138f49ef7aa1
 DIST hickory-proto-0.24.1.crate 374410 BLAKE2B 342ac0893684c2f350e4e1e26d37323e066782ab1c37db41f00d97b47856f2ff9b18c216fd162884b330dfeb542d9bd4da1eaad05a869d83f3245b5e6d451ab7 SHA512 9b14d8f4763b8034313ec48f96ffbcab0cbbdac73c0b32e04eabb5a11cfbb3ba8c6d2a84bff5ce2b1a625db5a76be895929a60bc3582b56012c736c897fb99ba
+DIST hickory-proto-0.24.2.crate 372860 BLAKE2B 81e36f8e86f3a9884e4e22bab989d9183e9efc53c57bbc611cf99549c2dd083fef5f4f8f982e72147dc4c64c313be5d6fa3c56c8309f8384518ebb3df3c1a4ed SHA512 f3ab93d60f28ebe85225c55b27abf43613e73db645699c8b8291ce8cdf76dc66bb0160ad0f1dd4b3f7e01e23d05bcf0fd702f2753d72ac0de62c5b5f2256f275
 DIST hickory-resolver-0.24.1.crate 91134 BLAKE2B 9a0930e26f64317012e507ceab8b06ba44a367bc32bea7d0d58cf27a6980a6b82a66411cb629a576a5890a1d7ebe8717634dba928f5d420094d4f1f971f215d6 SHA512 f24e726b4f6b884be6d5072d030e4f542c9f25bbdc594fcb68f2003aa6425209a51a044fd4e83f2ac4746e67bd7a5fcd2b6b0105e5b63fcfc777dde173029609
+DIST hickory-resolver-0.24.2.crate 90292 BLAKE2B 7b09d1a954d3aaa89d2b44b180ef922da3068505432361b1f4e522bf386d381dd788830313b3257c169d74fb0d3363de46e518db9710ba83c61e34bff007fede SHA512 8a6febc9036a163a5c5dfe83468ede61121270763ea8d672bd5e32277becf84789d32e62074dedb49fc88a51eb19589bb0b489620eb77a3d3b6e61df21e9171d
 DIST hkdf-0.12.4.crate 171163 BLAKE2B ffa03876879110dcdd3081cdeadc9490534c44763b3b49f1d6a5f4407a7346e6fa1ea18303f429b23adcd23e8898ba8fbf3797f5ef9f7ab7b11499d130311d68 SHA512 a43fe20b7d14fa26b118c6eba2b84219645f65f2ff33fcca679b139ae3e96f72abc1e7a47eb8887aac5afe4e34211434a4eb5a2fdbc014666d82c4af340a4b21
 DIST hmac-0.10.1.crate 11120 BLAKE2B eabb92f1f276f2397f7e28d306f4bc3ef0928f83b4b622f120dcf1203cdd420c331ecbe430e8f8424e6709523118fe01d425712cb8e520aebee620144f666834 SHA512 ab61133d280fb1b149ad097e29f6028a1998475d2f1995e3ed4f354a8fc91eaff01cf9437a13da637ff433fa05b43d7b144b5726c1edba1130c7004bf18b1c3d
 DIST hmac-0.12.1.crate 42657 BLAKE2B 5d432a666dbcf9077a98e1f8a4aaa3afc88f3d88553cf7a2356d117c66f38efafe686c148598ad67ae89d64ee3edf56387a6f89b75dd9ab5eee63e13953dcead SHA512 77d4bf51f4633a8c36712ce3178945141df31cd645eafcf4bd130b8ecd7cb498bf1ee6f2d9c8dfbbc9f97ac638919fcc81bd3ee600a1b27c3be3fa87313aa0b8
+DIST home-0.5.11.crate 9926 BLAKE2B d9c0d3660aa7784f3a26f3930a5ee35dd50cd15b7e252d930240ff9bcb70fdb0169f78c02b5fd82318af8c398d7139be18d2e9675a1b85c7845c90266945da1f SHA512 cd107c4cee793b6db8b29157c3aa2629b5ef1b9fe129fd903fe414faadfa06a881a1b685f1c66fa5aa1deefd3013a210603c952bfa4bf02d5d1f90f75ba9ff18
 DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
 DIST hostname-0.3.1.crate 9272 BLAKE2B cafcae4bbfadd51d058e3daba3e63d897bc3418723d8e843fd941d9663dbc89dba131c77d14ce7a5da552650ea3c40c4e418c88d465f1bab2fa20c178596852d SHA512 a90407996353c9bcf5b76be03713e3a0455ac80a50892e77a508744cf436a938ddb87ef97d8cc91ec7dc4353cfb7bca0fd28c90a72f8a9ecd4f29220d174edf2
 DIST hostname-0.4.0.crate 10632 BLAKE2B 85c1b224aa0de4c64a4c56dc284145c50bfe3ddc9063e0884de1cc994b38931552229c57dfa832e927f816df0d93d7b553bd8b4ede582939bebc36c0acf451a8 SHA512 1365d02b3c438d467cee0bb704e98b601390cfc76ff290da198d6c1e85bdd57db5ea07ed9d14b35f4b0cb3c2999eddda69667fca4b01ef3b6c4df1769f0abd21
 DIST http-0.2.12.crate 101964 BLAKE2B c35c2ae5f9494cafdfacefd778b4b6824588e74685fe5204bc6efa87b667d00b28f59cae667115fe45ae332d8542e7a0c2c7c42fdeb302302f89b00cb716f380 SHA512 e32dd4600aae7e26f1d530871815b30fa0b9bf95293005649bd9a7bc4df7f69a1d8de503d1b8873e67a5496e644d0a47db2a0680fa1e9058bee4dcecccebee58
 DIST http-1.1.0.crate 103144 BLAKE2B 7a8c4ffd3ce664e1f575bf4042ac0f15ff42b200fa8c6aa27a6686d77be2de7cd3df242e36f8cb45cdb822bfa96011d5d5dd7bb03122ae5bdcaa15bbf9d40051 SHA512 1c29f25a8895a69d815e21df427dfff7924e9040d01c55cc3256dd0b5e72b670fe75b1414223fb971c16082e4b26217142628be5e0905994da4f08b52e7f4a33
+DIST http-1.2.0.crate 105932 BLAKE2B efc9fc4ccc4a622781ed895f77c1752baf34e82d249acf97687ac8d4260aeafb333040833d9f8df5916cb105cc8217c8f27ddd021636b9248ad551ebfe4d83a6 SHA512 2c8e7234ec3aa720c9dd762c0bb06367fbc39ea89446fc9d8d2e55052a4ac461559a20a8294c877879f3e94d5db06fe41e2cdbb9664ea7ab1bc8003abb038bb5
 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
@@ -270,9 +300,12 @@ DIST httparse-1.9.5.crate 39029 BLAKE2B 3318ed1d82f1cc52cf3596a133b59b9613fd09b6
 DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a
 DIST human-size-0.4.3.crate 14757 BLAKE2B 45914e45592eb1cfa116ffb7b2ae82240218757eb4ba0b3f07194667ba975c4f3aaf4f6920d7134fb4c69a5f2d8b5707d73df7d7e9a19d01b7fae273f5340731 SHA512 d4887450a7c080ca515826e400fc3f93f5b604c4d8b523815bccd3b952661379e29505544d684385b2ebb48b88dbc299018ca8d4540324d3c7cc2f73c6e2fc99
 DIST hyper-0.14.31.crate 198190 BLAKE2B 155c55b71afdab6e83cf099d011527235132f345879fd1c4035a76846f148c913470952b1ed670cc406818cab366e5f30218552073333473445ce0abdcb3c033 SHA512 b7319c628b368c8fd85590afd0194802405fdf54f91a678fe93cd3ef78dc8297e8af6ac65102281adb13a1b45d65667c96bc05083c1205f64d2a48685bd935e5
+DIST hyper-0.14.32.crate 199622 BLAKE2B 05b0a2ac2c29157cf4d6258fbf07d871fa9d29b7f453d8d8fda9700db1423f6ce9c0de2b30ffa1faac877279bee75a283a81c2b59c6e429a7e22a4d5f1f49913 SHA512 d2b1d713a3ddc8a469ea344a5e7732da637bb644c2d999bed8e8b00b602742e193e553b9bc77eb58017ddccbc4217b20651e2b1698ac98568e780bfa3aa1a819
 DIST hyper-1.5.1.crate 152653 BLAKE2B be470a4a902b464d95f30e656f0f54c8a426308f03f118aecf583a1994fb12ec8229e09b43168d856adf6d3dd39d8dd0f97945d4202f4badf4a3076eab1e4dfb SHA512 ec90992a7569e8e7fb3e4a9250131a272851ec0938da48730198ac41347f82e7a308b1c4ba8b864de58ac849367d4360dd2d8a03cde58b330329949e87ff85d4
+DIST hyper-1.5.2.crate 152817 BLAKE2B e5e1cdf2bbedc51e076d6084261b6c4462495c5e71ae230251758b1271d7909b612ceb97b7e5a83e7668ca5af0fdf3918e3cf02680dc75df609ae7b16734e579 SHA512 bbf3b72650c464b8ce36c96e25dbb975fc1c28cf2a78315d03be8e377b505e57534dda4ce600a5b1d57ae974ba869675ff5bdc3e80c8721b575593fc12b55b94
 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-rustls-0.27.5.crate 34660 BLAKE2B de261692fa4765f3ffdf8c384250532a0747b2595c41fbbc1a01c69c2c8a68a87656572f70228ecadb4aea04851ea6e7a0ab7077d6ffbe75b1a15805e64fbcbf SHA512 6a2451be2f42880978b0236385e8775fdfc3f538d9642c7fd6993ce85b16d623357f97a8c2a328e76e31c76083a8be557a4e7447f34aa52b9e990f4c9680e193
 DIST hyper-timeout-0.5.2.crate 19222 BLAKE2B bf1714bda5cbcea30e948c67568c8762074cf9bcdbc57cb68f50fa5228576b4e6185f517157dd42e4f6b8a0f59dd90dc606527c4a19208cdb04af89778b5276f SHA512 745a8e3a2a104aa1648f82a1e0c2eaeaca4aa63bcf5d64a10a9f03f5273c73010953366b29d2945fe506f4f1d3366530431e78c78de716c02046b58c3e9a8a99
 DIST hyper-util-0.1.10.crate 72887 BLAKE2B 9d8ae7445ea56505e19f57ad680020b748e943a5cc3eca7292c06d93be1b58499db5769b214687aba53a0e9aa6fff3b3f63d1623157350ea826cd2decaf8d0aa SHA512 0a16c5d8857cf522bd53017dac50e530ae685c512eb55221fd6808299c7d716815f7b8192f8a9a504421b938cc0536bd497c7388d2f70ebbd91c46b644496b2a
 DIST iana-time-zone-0.1.61.crate 27685 BLAKE2B 2091f0bdbfae3f63ff846e27136d9779a2d65f85cef899ea3ab0ff7c987329e6a584cf49c57de566f08e0277bd4981ac3db30ea0cec6a6757ed50d96e2c6583f SHA512 d16c67f435606334042c3a286350db46ff3409f142c0782509b136150b4069aafff0dc5c2ecfb7519dd8d105b9a2e6649df2a7bec33ee3966dc94034c9d5a1c4
@@ -293,8 +326,11 @@ DIST idna-0.4.0.crate 271429 BLAKE2B 8b81bc4535d2e8a1100ddeaf6f43c043fd601ee3b37
 DIST idna-1.0.3.crate 142515 BLAKE2B 6835a64772e5d301c2456a94f8f5f40ebe6828aaeb1d48e3fbe015917dc3ef95ac7cfd0e1f1763e23950482f4b46ef7987928c8dfddebab63947d5a29fb490ac SHA512 e75ab18297878df11d82bf3623b005a3dbf7a6fa38c8f78830c219adc7d6f4ac07dce24a5f1186de69035ec316421319e487396cfacb053674137342d72a4126
 DIST idna_adapter-1.2.0.crate 8206 BLAKE2B 5e8d7dbfea699584542cde53039df9d8c3dd408efa2534f11fce7086f679872c45d9905d6b2cfe523148eda3bb0cd4820a7b14317f91725f3d9cdb475aafbd57 SHA512 1d8b54c19878645749a1bae768dacf353b07d266f2cb3bfa1071a7afb56ca68f534dc1d54cae277b777bc97e5986f297cbe2051a82e14f553ea73cd723d9da7e
 DIST imagesize-0.13.0.crate 17033 BLAKE2B b48dab29dd1f4d81c7c04df9434385dcca3d84f14fc4a706b3af74cf554c59ab93b9cd68dbe878fe2f13b902f6a210cd44678d861ac6d5602506bfaf4f8ad697 SHA512 a514bed07f2f4252283ef2e79036981a98bf6fbf8ac3093d98d39c7fb11b855d781121dd410a1b7e5893792b0028af60d92083348e7056e6ba9d006a89cc3530
+DIST include-flate-0.3.0.crate 1072081 BLAKE2B e672b86cc90c58ad6419450c5275ca0c36d703039af177e2db1c1954d1b8eeaf62d09609e02b42404486f7bd88a5541bf34a2957c82df29a5cadeecb3da81113 SHA512 2aeb597b7ecf456b70da0a6a700eea7f84449f97d9a6cf220e237fa55e41b84b8606477035eeb6d41e36b480d825aee7b8415136074498401847cf6cfa2fa1b0
+DIST include-flate-codegen-0.2.0.crate 2268 BLAKE2B 7040b22d131a081e8912e3382bf45090530b6a1cfb63061411bea690865b6a97dd8a52271c3640e079e515381b379a86bf30ee2feff05dd8809a77370a056dd6 SHA512 fff1718466fa88ab7569c17ebc66ccef340f0d4a1fa185b671aed8048332b50e93338afac7a1469eb76aeda14c429d25a5eabe64e89a3a520f0102369997b970
 DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
 DIST indexmap-2.6.0.crate 85204 BLAKE2B 420a3cceedab93e5023b476f9b6b93e57057238425d4095de59eb9490c2a088193873e643dcad2f739e34e5798baa9a18939424cac1afc5fc7b93ae496ba188c SHA512 c870348691f5acf97e7bff25c805e60f2e9db9e3ee7b3b939b7be45b6bcfaadee9880e6ad27adbbe2545865193655b5fa9de18487b7a1d030017b2fca48616ca
+DIST indexmap-2.7.0.crate 85335 BLAKE2B c7430ef510738ac5fc4658f3e4d927ca5cde780774a07848791ea87503be09fb4677c52803f6cdaaed73eee600f47e0595ac3db74a498947d0e180cbd10fb7aa SHA512 efac370b9f365a49489aa2c5406eb503044a4df7d6ceb772e0191b02244b6c2c1bf6c43ad4c8924160c1a2bd76d46c630b500a1c4252fc52366295d1cb04b48d
 DIST indicatif-0.17.9.crate 65246 BLAKE2B 9ce758e7dbafb3394d632a6fca910ea3d1237309ac9bad0ca1236cca9563abfc442509ca96fda1cc7be6916875416cf2b85390c53266f59bc18c6589addbeef1 SHA512 a0d798fa86cc4b75d080bd233e274d6554d82e1532b3590d27b9fcdfdfde4da2717afa16ef42b180ca0ad43ad151db8b0963890de106e36b6bdf07f87a519bdf
 DIST infer-0.16.0.crate 18830 BLAKE2B 4ea9a8f5ace677aa212007dbc0c559f14857b262ea7ecb4f6a343959307bd06b45e213e80f26c011036caea3f7b4712a6aa4bf345e585f39a9e612a244b5e538 SHA512 0cd54ebcf35d8628d8b576ec305f0ec5884c0578f1655764a34c1eb6eb0aad830f7b737c818545c75fcd404afd9ffce62d431bd0b5afb2cf01beddbf4669872f
 DIST infer-0.2.3.crate 12401 BLAKE2B 8db9c350ab57e2b17ff4a698827f25b100c75e881d6dd9f82264e304cf4065f34169d3d1b558ce760937d92d27174dda4dd2514df06058c72f5e002b7b3cd057 SHA512 ac349efe070df8a0e6ff50d233882124402cacccf60a1279ac3b0a43289297ddbcc964346f7bb60ab8e8022a6aaedb42d9f0d9cb69ace0d112a31bce4ec381d9
@@ -311,13 +347,18 @@ DIST itertools-0.13.0.crate 146261 BLAKE2B b23d59a87f80d24925bc868c0ac7abb6b9d05
 DIST itoa-1.0.14.crate 11210 BLAKE2B b2d33dc384757963eab3ae7d80bb672d828a549967986e3af8c70fe71a0ad46c4a278da2db4dfccef99e804e6cd4934067e97c0697a33ac3302cafbc46eeb416 SHA512 ea2d38df373652ddacccd11e610dfdad4e3ae7f0d476514e6ac58092733c817bd834e8cd88c3bc4178dd5a646ba628ae626195e0aa407e8534ae3c2a7b049987
 DIST jemalloc-sys-0.5.4+5.3.0-patched.crate 884321 BLAKE2B 36f66a53472f6b02aa05a5be5dd437d0668eefa5b058e1b72d3d5eae4aef61df55795379cac7560ae87e805d7e714581dc9ca9ba7ee9bb042976716ddb7079ae SHA512 b81c75efa70b869abe08c0805fd9545436ccd4e6ce24bb7355c1b3684a03bbf234af0680854f3fd9b519e7d59296d32ef04497a1f45584ed8de462e4e21d60c1
 DIST jemallocator-0.5.4.crate 13088 BLAKE2B 760cb954b24c705ccb072c21ce0aa699dbc3140141a44a037bb917e5e1fa45f831d103b5058d5bbba221c347f7148c7e6fa4e0395e68ef5e9b7fc2eb46c9e11f SHA512 23b0107ce5fa6a31cbe2cd07beeee973543c1e5f6f2a57fde5a313dfdf0b7138a0675fd00b1b4823d60eeffe02b9159d0261579c9ee4ce4246fcf799f9c1f853
+DIST jieba-macros-0.7.1.crate 204683 BLAKE2B 93b7a12ce25637c1d6e5926b6bd5aa0980cd61d4ca1ee2e96902dbc05c7517c1f0c080b6a5309590e52056b576bbba7b106b6d65478636504c3ec6304946a50d SHA512 d2477b2e415b048d96bf47b5dbd4ebde6670da3ca23ebac67ceea32ef2e9e3fe4cc709f2235bf257aab7eeb822577edb3739c1fb1e6955eed74e285cf27d83fa
 DIST jieba-rs-0.7.0.crate 4316099 BLAKE2B 4ccdd224ba8755390257e113b4875e95e1011e2661ab573960319fe26d816a658c99a76eaf49c4209d8afeb9082424920f7a047e402319d55253606bcd086547 SHA512 965c051fe4c638289daf671714cdf1c77280899dadb94520c9e24122f934fb38a7b1c33315e9dcb788e7d2309c48951dbaaaa79967db2a20bc37aa11ad79056b
+DIST jieba-rs-0.7.1.crate 4114286 BLAKE2B d3d55b1ea0ff119777e7c01997371b88a099fa061a9e6cfe6df713d68e40bb1d5baffc5ea04a988b2b805d5ac8567d9989bda1fe3487efe601daa1b875fce940 SHA512 faa07ba0af3a13f16d979e17b2de5073d0de44ad894d429180fca81adf14fd27b90cc644a88b8b7be6c0268899c2241fd4eb3c3ec9b8174c94e1153af24545c4
 DIST jmap-client-0.3.2.crate 74537 BLAKE2B edfc6a6ef8c62712e1c45daeb44f00ed6a804a1fb7a9ad737153d4bf3e94f9c49076924b7b4e5dc7725c989bb151dab445d2cb30b8674ee9ba60c8a0f3dcfe06 SHA512 cfda60b22dfacbad15f8cf2c9cbb432387784cd2fd82210de6d3ac68898e32abf079768ccf557f818fef4e0ebab04d1c947b598dabd31aff35dbbcb3e84410ea
 DIST jobserver-0.1.32.crate 27549 BLAKE2B 5f6556788d10af992fafcb578ecfd2c81698eea31b636d3adb7544e12155796082623735c8b10ac4c04d891d1acc307fb4e4ac3f88b2006e181013006f51c8cb SHA512 d4528113dd5a5d4a3765d55599a07e0998c69c7d21a90d2872679755ec4bd7726e9721af9220c36e1179b153ad8a39214a422af63aea15eaafd7cefc828ddff4
 DIST js-sys-0.3.72.crate 54096 BLAKE2B 76c1044b7684ccfbc06c6d43541fc39552c058fda5ccdcb7154c930d03f5260706ed42b36b305e56c5a0eb0dcee27180d3df3fbde92f3b7ba5104b0709f5714e SHA512 5a83d711a02bead2d9c05aaf8a7e3f351307b3219f4f6697bf190d9a9b36bcc10fd33ce0a334e4f3e251d52fc7411020a3631d0874097e9b519e839b713e1c42
+DIST js-sys-0.3.76.crate 54420 BLAKE2B 8d211aee6d8af87c339250e06e321bf02d2ff313b80505f696f66c43298e2aee8286076f2b291aa853730f8e1b9940f09c56535d3534fc7990aeb16653844250 SHA512 54e9a6be3f5a19021351d22d655a3aa55579c80f1453a99aba5989fafc7429078dea57ffebada4240b9185d3260d02f30da250fa539ac12c4bdda975adfe0dad
 DIST keyed_priority_queue-0.4.2.crate 16016 BLAKE2B 94941db8366772b2ef3fcc8a591470aff286122ff390482d6c66c27d23b115c0e6e78b65a9d89cc3615fe566d9efcbb30267c9d0386e8dcd3e515f6a886bbcf2 SHA512 3211646729dd549620688439444e5c4578caacdb4aa264a73766440d110e841f0b2a7847fd7def9a29939c03915722292e8f04b31c31a8c632912e10d09b8113
 DIST konst-0.3.14.crate 86731 BLAKE2B 3a52c2c7f83b51d8e0acd371f5f59221076d28cb4559670ab36b86e8c655b1edfe4157f4d2141d9525e9782da72b1595bc8082f2b81ffdc4b89155ff58e159a9 SHA512 5686418f885d2253ee4fc94fbd465263909ab5e5d8011b34ca54f5d8d36b4948584d239be511b3b34af006c812816ae392a3f3111b58eb66bc8d36f53e590b66
+DIST konst-0.3.15.crate 89161 BLAKE2B be2836afae019f333283b83b298a77e3532b6771df6c10ded55532dde1134ac270fcd25cc0caecd6910f8f01f92fecee0f90a96435635705a9bd0c2f0d626940 SHA512 e3aac4b596b4f344e37a1efdfc4f20340236e82e35478c818e72d07f71dc0b7fc4b7c715f54da75dcd1a8e19fd000678f201005dc4a29efa5b41bdae85db9aec
 DIST konst_kernel-0.3.12.crate 22453 BLAKE2B 467ced39e7d283cfe978a356f27f103d0f0c249f070c30b7e17642bfac7b2e14fc66e864b83defbc4a5a479a8616143ed0ddb9bcf967374203ebfcdbacc4cc08 SHA512 e0840fed817aaef44e6d71aae7d17bb4fb4abf1351daf65e72fc8b89b6ff5917c87017f75377d311b0bb23f7c9f12107c428b7a2cf3985253af2e5bf2a8633a8
+DIST konst_kernel-0.3.15.crate 22461 BLAKE2B 5af68770ba303e6c02ae8292028f1e07618a21d686afbe2baeb5f258a3cc42f3581b233a75ddb28579da3b9fc7a65d60e7a1b0a326bd9d520cdcf46a88aeed33 SHA512 b7e6d017c697c3708441796b8235b56ab2f5046cf67ab1bc96a4a54e2ed21e6655003c54e985ca05f465490f4f6c7d3b79cb004735d0c21bf16f406412618606
 DIST lalrpop-0.20.2.crate 240370 BLAKE2B 024026e9d206f24f3f0675f87a5d8204237c00c96331c3cce43f563639c2750f363b173bcf928bb69b3707917ef0769c9e174316b1c85f76e8fbedc6d0262bb8 SHA512 1f22f3aab724e720c7f78b268a9f6ee468fbdc7fbc0ecf83e0a35130ca56371aa2e38752e02cff5ddf0f003d5a8bce43c735c6d5ce09a3bfcda924f2c5ab0674
 DIST lalrpop-util-0.20.2.crate 15064 BLAKE2B 7304f30748afad37ac9be5f9cb890b70b0362bf889a86f7385e7e83a067e5919e42d85f892a018d255d0eab56f7c3b8fd9564fc5d24b657916dd915bc45f0a46 SHA512 91034c6d82a0a006bf35208f84503660d55170a36e38d5c64a6c0ceaa0302c43e268df21feee6b60b70723462f6e4f09022ce83547560ab7c51b5de0954cfb28
 DIST lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f
@@ -325,10 +366,15 @@ DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc524
 DIST lber-0.4.2.crate 8107 BLAKE2B 90ed15da1b8c6278bd9559297df383fae0adfa82ca47f74945e777b2e50f6c7727dc2cf5a1633cde1df8d60e6724a1b3822402228c62ba9d4f757cdcecca1585 SHA512 3d126c5424396ac52a1621f5e7ad98c13a07f4ae51d603f37bae83ffd4683aa1618bf762ba06d3402b0548ec055503cdb7aabeb937c033857b478dcc5816b430
 DIST ldap3-0.11.5.crate 118725 BLAKE2B c4f28718973aa68b5049056fa2552862575ecc4a9d89f5d592849040bd1069954f9d30c4a000ea2e0a9b4175581b3449549facb2bb700653cf35fa9f6a4bc2c7 SHA512 bd3dc73e21da64842c347bb6620a8a38ebca5a3bfe131eab5ac50e8f5e50e20000dc66d96cd6f760cc967123e2092480e93fee3c5ef55e43757d46159e916751
 DIST libc-0.2.166.crate 760418 BLAKE2B e4a81e82d139d03b85eb061439f045f1965f6260dc4d4a769f1db19e5d682a923497ba2cf041ebebd46b90c627b91cd97f86250d8b1854945b4f2e826a04d14f SHA512 55a484456ca4d0fc90e488c5b793a6100f160c9333f0b4173f21a49e33e2ce3ae28d74eadd4f2e72e51040667f0a2a93d7edcdc727fe266ff35b8b37608cce2d
+DIST libc-0.2.169.crate 757901 BLAKE2B 1012cf93d8975aa20fc3f2332e253426ff66be6aed63ace5292cc8568ee419b0f1a4b5b39ddbb78d9c2dfd8d72eb0d068c98faa229ab55556da5e674429f0e97 SHA512 c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce
+DIST libflate-2.1.0.crate 43366 BLAKE2B 3635565c152893ab958c491d1dcd1f5826abed77f6f41e38b64566c27a81664c1573cb054cfe069392519437e403138b14ec4daca8b8af22e6432136e94bf957 SHA512 00cba931f92f50ba527aab2303533e72d183ba1ff7b61d396b50d0a1fc0f31dd348a506cc87ad417879108c03f0b500d05c1b7abf48e92473e0d472594d4151c
+DIST libflate_lz77-2.1.0.crate 5918 BLAKE2B f931e7d96baf91903ffb73100996f11df1fcf3d67f4d06f2dfcf08bb4ebcc0f24e9da7ddd8b886f6a4f5a4d138beebeea54fa8247594ec5f5fddd94c9cae4b83 SHA512 5e521a46a6ef2976deab481d2410db0797fbf5a78e6ac4d406bc0ac4464b01836938a528990657328b29698a19a631d641dd1e3093cfddc91be62fcb4b646ba7
 DIST libloading-0.8.5.crate 28902 BLAKE2B a0fca8f8876092e874964b3dcbaacd417451704fc1d687669a95a0b9df22ccda73a754118ac0bd706a7c7d86e4eceb2ad012e20e341d71548b34ea8d629bbfdf SHA512 f332884fa75cf210460f4678d45091345b23469c09301614c476e95bc54163afd6d4f098a34f9e0d529fa1ec63892395b50957598070ff327743e4c3b0871074
+DIST libloading-0.8.6.crate 28922 BLAKE2B cd9d7c2652bc4b0220e1c29cbfbca41f44d12d76c4dab3d025c21e5d317407ab656a88add0db95f1086934a424f55b4b413f33cb2a52cdcadde7641f9c5b3fc3 SHA512 f49ab79244d4b54c2f181bd9d7506fe5df9824a09446924dc429636e08ed7bcd6f5d2afaf8a0c862982e2c2c5832370b118266d36f36bc7b7522668bd598fc81
 DIST libm-0.2.11.crate 111477 BLAKE2B b1247b197dc66a38b9a1f9db0e32655c9ee09575347895bb1e3f22e6953c334d74574a7015f214b0af0eed564ff2ee4576d07d0db5421aae917a7aa1e10ea142 SHA512 86742b5d97dc976cec5bbf75f565b40c7058e74cf840cbc7baf4d84823318040ac692b5796a407bd44caac553dda3f5a087d3bf8d6099cf26305123ce106c7bb
 DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
 DIST librocksdb-sys-0.16.0+8.10.0.crate 6929396 BLAKE2B 24f317c55d2c53910fe9eb1162bcea16624e498c55b06b5f64654c70add709d60d261dc3ade3772f5cf838b115ac8690b9ca603fcd39de49450108cf64a75d7e SHA512 c2dd9bbc8e85f8927db1e053309e821da6d02d38c78333e9cc37822a3c2e826daa312ece9ff83a032056d91746082241285c3384697b37b0ad2994ed160e6eb6
+DIST librocksdb-sys-0.17.1+9.9.3.crate 6898368 BLAKE2B 83be24abce59afd9d67e693ea52080c98b0ba36b07faa6bab62889350e56028ace285dce5e3f334f3e02c47a51ff9ef3fd1943a4d1e365cfa978c1bf03000191 SHA512 268336c2b11ed143e1ef4a27e93a1c9b1a77b88600d3b79d38094317dd57bc724f5380b50d1249a75c3a6650deefb9aaf8e943caec607dddc49f863408fba381
 DIST libsqlite3-sys-0.30.1.crate 5122296 BLAKE2B 3f3d5ecc434af6ce6e28836dc6bccc812d53da909e5e4a92f0eb7b6dd56c66c5243e29901867df2e72be424f20fed6c896da59bfd5349fad831a6305cb25db51 SHA512 6ffb2a23a78f3221ac8f6c9260713741970e522bebc1ec7f3e1d7405f25dac9024ebe3a73d76a6ed74dc7109a8333d6936ad1c64a0a7c75d6d81f97c3524e952
 DIST libz-sys-1.1.20.crate 830422 BLAKE2B 26265b1faf04f7d0cfd751ddf003585b1be59fcf8fde3ddfd86f18cc3e2d5c3b62a808f47c01329a57759d14fe6283cd94a72eda46d5c5031249df0f1696ab03 SHA512 9b537e7c01553e782be145223c6d174601ade3a950bfd0eb4ea09658da5b8910cf0d0c5984672f9d198f73d5aa63d21e0c20c4c44ff7d0a017ee11ae4ecf4859
 DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
@@ -342,6 +388,7 @@ DIST lz4-sys-1.11.1+lz4-1.10.0.crate 391317 BLAKE2B e79aac475b62f16adc7a33e37fa9
 DIST lz4_flex-0.11.3.crate 40633 BLAKE2B 438cf3cf7858e00dfecf44b136e84169386ace08118bcb349499fa0ead88dab5792cc1bcb0e0c5362fa4dc020ee14b9b6906f875889c8ed629829a44cd134847 SHA512 b2a5b44aa98a1994bcc90bfd0c6245dbec2f390be39d7171bac68b352a0c96c15eb735623816a559fc4fa45681f5f496e29399d911ba95b1d5855dced7afeaae
 DIST lzma-rs-0.3.0.crate 29080 BLAKE2B 521d9f12a155fb1c9224b155400ada0cabe8be62a6b46f3b9d73704928446bfce653df97c73ae0951b6b1cf793a2b95c37180d5794c07a399ac581d75ef87337 SHA512 1c554b5fe33e6cd6ab069efaafc2826d3cb0bbb13dc55c2438345e1dd17de99cd43da4aa3419841ce50d9fdfa5956baff477b37a09470f48908fc1b7382086ad
 DIST mail-auth-0.5.0.crate 159634 BLAKE2B bd978f9d2f7c878423f16e370fa95882405454dfb2d6ac793b14749e8d7ae346ed20dc87a6ae43f507cce68af7d870bcdbb2ab6f26f76351fb88013f3fc4911f SHA512 148a426e7acbcdf25bf7507e5ec8ea2898968a979f5c3314cc1df636b15c8306e207bb200de05285e0b6a585130b9666fef221c95aa38fc1ede7a09aa01da966
+DIST mail-auth-0.6.0.crate 165563 BLAKE2B b3115669446720005564d856a7acabb66768390a1016e938f13a1bf8d3fdf7df66c92be37b1c2c9aa5fae5cf349d4d741344c2d0865c20a0b9f7b9739d092c54 SHA512 47e58ff61080f3dfe406fa5781457da15aaedf2d2b2c84c5295bad2289e6c6efb272007937d0a70a718b1bbcfa4e7a69096802b5f1b52b24aea71e2e33056d65
 DIST mail-builder-0.3.2.crate 24507 BLAKE2B 2534d9c424ecabaf0b7cd42165aebb6b1b1a795c9803fe45740f11ff550df73029e5a1f706a3078aa743ff9acf85754cc1b8ce31d0d1538733d2ee8df1574198 SHA512 85beed8e0da7f106faf849bf641d92ba2d5d9c3a2df983bd5462aa48ef0f47de18fdd16964b25186f3cb04894de4fde71b88ef90dc6c96b223810046fabe686a
 DIST mail-parser-0.9.4.crate 513740 BLAKE2B 423e845bd7e8a3e37851a38951dbecb15f57269e41426c62a60379c5dde46899480387943eb563868b2d3b64fbdd12b7d25e149380ee257e91762f3d93c6dd0d SHA512 96b21574d9da48d4f490b5fa4cc894e970664bec6b50d69b80f43679fa4b425745698a6cf75ad7fafc59423bf11c59f88d73375feddc4186c1039f0047fe780d
 DIST mail-send-0.4.9.crate 36322 BLAKE2B 3ac282e6f7c4099f2c3e7bf6d8009d91761a5ee847e698c03281b7959615b884ac0e9fa58c37957c4875c67eb67d5aea925fb59a805e0f7d2423caa17ad69924 SHA512 9140c5eb946c815d5b8707780540e0dfe9cad50271a2a66bc04dc5e20c3194784a837caddae920dc43f8af50e550ccb9cb07c8790d07eb19667a3df948916d7c
@@ -360,6 +407,7 @@ DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a0587345
 DIST mime_guess-2.0.5.crate 27166 BLAKE2B a8ec67e16a336e7d07c9aaa55025c24c3d4a62aae25213ce768786d9f292b76930132a880d662cd9a5d63aa899e9d488ab76fa9d99350e9f448ef484705ba4d9 SHA512 433c876e28394282cfbe14bb9543616cd296879f253ed331c15ace8a7d9f3629f5b596c2d5a64823a97ca9b774acc711b65006c46d54d1e9ee0553cbf1f13b7c
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
 DIST miniz_oxide-0.8.0.crate 56343 BLAKE2B e4abcacab4c8698d0489faca8556faa7bff53d272ea0c80e2e7843dc0f6f9229b7d5b0a17ae210344722a379853e7f14212505ee05da4e60549081cf77717c1b SHA512 044b641ce6d98d1968c1ee0906f91963f9f524d6f3fdf3059708177a759e1d498c63e595d3a3f0f9f3210c45c828b9b70274134ba078b899d7fefc2bbddbeee6
+DIST miniz_oxide-0.8.2.crate 59068 BLAKE2B 22808b2137b4afae29cc5cf25d9f643d24824293524542e2cbac3ed0fb0341417c052310602a6f0a003843abdbe7715a95a6068c807cc0c843ed867958650215 SHA512 e58802e332a72123954ba1751cdb59509789bf930ad74da3d06e2c1c3737547fc0b9848be816a66b6585830786b7a0fce7c9fb574789e15f3b540709563cf854
 DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
 DIST mysql-common-derive-0.31.2.crate 11745 BLAKE2B a7c6ada0bee74ebfd6735d917d771078a25e15b81d78a904465bc5a6a5f4ef7f018946b7cee9101af24a8fd49beb0a22102bd6c014bbde1fc9455100cc74b371 SHA512 0d60a929c5d78f055b8a3315d3f6af2323ef42f56c112d28f1923a0635a875f79f3c525722e13f1e9a1c19292f822ce15a1a3e04a3c0f9736e566ed38ba2a8d4
 DIST mysql_async-0.34.1.crate 100221 BLAKE2B c162d6ed42bf90d7c1f4e5c0571f10bdde34cfc6eb4e114e049c03ed778e37b5730cffefda2ea908fd2e016e02ec580783db6d7a59064062a82860003e5b7f81 SHA512 9f8324e7431de3094924ac84c53147efe4e9c4489bdbb2949b7a29d2fa117014bd22a0ee76b0c55689c417a621881079d766320a9e442790532a6abf790125af
@@ -378,6 +426,7 @@ DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af973
 DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
 DIST number_prefix-0.4.0.crate 6922 BLAKE2B 81bd3b588c788e6865104e5ce87119b5e0c5a526042963d52cd582ff23c2f8c9f32b4c445ef0397fc402b6d047e031d8e2c67ac97e191bde22e17662eec3a554 SHA512 a43b668d7314218b86ca7451daa9dfef71f6c9f6616bc34c12d94ae6030f182bcca9da83905cb46f3d49d0aa81385a787e92e4f3ae239658067adc249f8174df
 DIST object-0.36.5.crate 327435 BLAKE2B 1ffbb8ba57024a7273217edb1db76eff03e0689f81ba27b0aef0a622972e7f6acdbdc480384b50d603dee6c38c960fd25125a313264187aa0e429aa839198dd4 SHA512 b85375ab3660a8a0c57833c28c4dc665dc0664857e1eb3cd472a61b9ec8c16c470b16475545c2c311fc23cb3c43755967f93feac12c7bfad013cfed5f879e355
+DIST object-0.36.7.crate 329938 BLAKE2B 0b02cf2f44e99002909b38125edada1a259feae59fd0e5ef52001755b6878cac710c87c60fbafdbe405281e039f68572ea3d8093d16128899090fd70df7f2fa8 SHA512 dd69172349ecf51fd2351d32cc4453760ca1d15e854a1cf5ed99112032901a54b4645b24163b946deed11f81d3e3035e1a5afd8bff20f335dbd05eceab073478
 DIST oid-registry-0.6.1.crate 15068 BLAKE2B 03206bce78c7fef1ca8f06879a9a79a6176091d61f87278acbd10c690c86f3a790ea88b54a600923eb5f914506f5fe335b7d983a857224d5127d22c843643cd2 SHA512 93fe90de87955a0c855d9dd4480280b72e0d559c9e17d864dcd3ee424a38e406a60492393778e01a0e6d3b8cfb9f1c5cd06b90a4db180613c5ffb21530b681ba
 DIST oid-registry-0.7.1.crate 15220 BLAKE2B db9f45c622cb96fa1edf6c15253d4059e01f07f804b26bc5fad782eef5d65a7d0ee3607c064668898190082fbfdb676d8c77b091788646d73d2f4a5f6f3c464e SHA512 302838c6d88e8f9b1e2f40576d0436c85bcc4955290e5f0a5826d11e5a7f880bf6335f6d449d1976f9899a05716f789a87d8c8fe641856da088ec63f15e31c10
 DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
@@ -436,9 +485,12 @@ DIST proc-macro-error2-2.0.1.crate 24807 BLAKE2B 20bc34aff566445280cc874fc0c2a43
 DIST proc-macro2-1.0.92.crate 52353 BLAKE2B 9aa29fa6f1c56c0392a94a81b4c61953f4d185012cdca37e356817845535da79d7094bf43472ce63109ce479a2fd0cbef4d802afd61daf92c4db303bcac60e7e SHA512 e614f08acc0a7e97ef580479cf5b682378df1ca16f09bfb2296ebb3490a435229dea9d682c621c54ce57e8e1d3b7803eb8ff83c88bd02e07228dba6d02f14aee
 DIST prometheus-0.13.4.crate 84650 BLAKE2B 5923e6e6fa6923d15d6c5bafdc1f1efbac6d7f1646d7a098a6cb14294490e7d9219a024383e96df0684ac5d3f57137960ae680ac19932ed8d63aa89a3dc91e97 SHA512 3ca6f9e29cc40371c08651b3cb178beaaba222594781bb2355db3631040c218a72ad05917048fe5dc712b0c6e2dfc61c1bc4b857a0ff043a0258357b2015c6dd
 DIST prost-0.13.3.crate 25684 BLAKE2B 48508eb332066f7d212a20a5c4cd722a06c90727d4ac746f55d3d23389c707095da22869cb42a63aad352d48974d9ca5cb0a8c20a7d2ac057a8ceaa3d9d43356 SHA512 1d8d7691323ad2989a77389b5295d774bfb8200d2cdbe2342081d79c2c1d0985608cce24960736d29ae0800452e4e6b45c8a1e9df6ab838c9439492535e49c8d
+DIST prost-0.13.4.crate 31812 BLAKE2B e78f00da1ccef0db90ec8fdd6dab24372fc01104ce7cc5e2ad29fa593655aecf6b6e4e320dd227ac9dc884fe92ba4b69a43b6db5da3e3b7e6d5d3a6ffe0f29f4 SHA512 fa1544800fd5c21384853c949137935fc5080eb199d15b86086ed6e8e24a4a2e6ff1a0b5ba13780843b19c4f3684f1d4e17d94218457686aca7279ba2146316c
 DIST prost-derive-0.13.3.crate 19930 BLAKE2B 23806bf49544c873d756def9174785da6450567bd00d21227898d9dfc73800ac8dee6148e1c4c4f11b069ad8822fad5cc6669c7bbde563a8e36be455cd975e66 SHA512 42d27393a8117e1f446430a5ee4043ec792625b49f7eb11b19ff7a38a766390ac96e5b7fc18b5e11b4c18593bf655caae0d0e5586f39ee4b38373ca3059be3dc
+DIST prost-derive-0.13.4.crate 20592 BLAKE2B f1133f74988e73e8faca3c1b24b141956ac3000a1b7b7c2544af5b937133a232563ace9b166f8ec18cccec58e922e1f91024561fc944528d25620fb882885ad4 SHA512 9219ccce06744efdc4a248afd20bc057cc79b9a1d25dd0da7791135e53edba32648c2a9d25e4461ff9af13209abb9e709e35ba595e546688469d2377d0340b36
 DIST proxy-header-0.1.2.crate 17073 BLAKE2B 5f45cece250c07d57327f779bf8c0737efc580006603d5266a7aa06025cec446ba432cd5589a61f93eeb324d45558c957a2ce12248a477de59238a00c4d110f8 SHA512 65f7e0cb7a57fe2d54c2f4406b61749abe6dde0394e7e17a707e1deb449ab2ec64a2356d35c7638d9083465d87b2bc88e5efce99d41216eb3ad3c9e4440f7a34
 DIST psl-2.1.62.crate 193011 BLAKE2B f2be3bafc0e68c35c38709a0627c248943e104348a92ff77e9cc2e8915e5f99493284ac21c470bd94e93e2a75af9283bf74aca66bd8d6107fc2fbd16ad23f91d SHA512 3055b97b47d5c8ec4c7e2ddb29a4a03307948a079ba4fdea34039b56b327e8e4704fc19bb5f2059bfdc1f05219811f32be11f0c00f181938914afed2c14314fc
+DIST psl-2.1.73.crate 191503 BLAKE2B 07ff1bad672c7794a69e7bb9c1fdf2e44fc0480ab3a3851c618749b5ec7dd6e169201cf05bac86e276e5f4829321d1958076d5b2535e9ba3142a060829c0e0ff SHA512 e3eb575f62f277b739b980751309e96d3a6df109507a334bce9ae3b62a28d1079ae702f20cd402075ef4fd5715f20751049043f60259dccfc4aae4bd1a3a9ce0
 DIST psl-types-2.0.11.crate 7959 BLAKE2B 287a71add0c75af1266fa1e4089da8f82c8b64e3ae1e880b3a71ebef5fe43bce3bf50f6378a228e131cf857a4cc29f3ff37c2b08b62896196a3e86ef82b1128c SHA512 c609f6a414bc1f5f98c22f9ca73e3908ddaf10e33ef43f408ab8ae2f8c544c0f70cc1a73b1fcfa20ea53f2225f60922f6d28d2e5d31a9877550c2ef3520ee2b7
 DIST ptr_meta-0.1.4.crate 5754 BLAKE2B 89e312313d343177c6fd20637da6fcb720027064038cd362f41104dd753e6ac949582297f91da6a088fa408816af75f1ea9030634ab3291afccbb598b001de1c SHA512 9936264dd52ae40e6afc8cef8914dbdc5767f397b91ea965d65275fe547a2d9cde7ccdcf908f787e25f84fbc23a2e30df895793fca308e09f48f2adf2e30d2bf
 DIST ptr_meta_derive-0.1.4.crate 2302 BLAKE2B 14210f93fdf3460feb53963e88001b468d0305395fff7b082f079eead29723d09b7986277c760ad4f6b906e5373e4307dc81dd0e8d37d4dcc3e61c4458b76fdc SHA512 15a72b2c36e9d1761c4dd42cee1623c2d85c52eadc3c3102c8334c14c9c5db9a43d74dbbab1d14a2600d789917fcb5bc2652877b172aaa02c37a6868462ff20e
@@ -447,10 +499,14 @@ DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf
 DIST quick-xml-0.31.0.crate 172236 BLAKE2B b83c7f485a30576027a4ae77aa23cd6284942d786f0f0a14faafdfecff646371ba15133b3ba90f820183c8537c8ac47ad3e1e7deaad65e56761bc662be406026 SHA512 9b1f4f9c32694ccb244938a9a4e9373c3902314afb6af5d2f6b1be55e5ec63fee5cf1085f8f32161570cc10fdd96f3375c7564b1d884bb152542b86593f175de
 DIST quick-xml-0.32.0.crate 184149 BLAKE2B 35a28dda8dab04a933c4e5d40f22dec6f9c5bc75e9319bf2711daad869301a90aceea9aeccdce5763d5fb513548b7c1f030b6216ca1454e8f56bd6e5a5fb6ba7 SHA512 288232de1583d8c7387716900be1fc513b2161123182e4812bde9851f4bd31c1a67417afdc16e8a55c028747d0a1147d2dbae6f0e8885e946829a379563507d2
 DIST quick-xml-0.36.2.crate 185201 BLAKE2B 4541812a73fd95bedf21f90f07f27b31eea6c514ae17818ba957dd83ed176b0f17bcf3860fdbda07f0fedfdd7ac660bdde5e8ae2aa9903bf7a7c8ad2d4770470 SHA512 7cd4778dbb1f50fdfd7290241fbb42c8529f7d44c2633cac017657010d0d443024f049287e1a1806f5bebe46465549973cccc660959c587fe383490a150ddcdc
+DIST quick-xml-0.37.1.crate 187839 BLAKE2B 1d2a47f497bfbd7d32216527804731f7183e55a661991db7d76480442021f945dcbcc219b12db80e2ebafed5e08160e39a42d2225a1d47f02b7e45671308f5a1 SHA512 dd6f61ef1810481ce0f994f19027cd68620e546f10cdd9160880ac25cf91a0f6e642c0e6d88d81952a3af58fda81e5c93f761c8598432610540876f33e4f3159
+DIST quick_cache-0.6.9.crate 41207 BLAKE2B 4a0953cfe9fc99a18e1b1333415cfa116e2e15d689aa99c541a1a354b05923a596e9a76c6e3cc8c574b649cea0e26f69f91ecc4692cac9043da469b294239fdc SHA512 95b2408146e99877957586262d5e898c2b3d00c63dbf95d7e6f2dced8bdef929c91de37beca3b9b2cfcc4d090c7ed9979c66a76adf4fd2f7c0ea73e52467a536
 DIST quinn-0.11.6.crate 78222 BLAKE2B 75a5531450e8990a610967b40d31ef5409a4b9b99d965b3b31c35276a788731473ebbb26fa465aab621923cf52236a0560df8abb87a02d0e911021509cf1a1b5 SHA512 f8d4359df3698442181843a5c49d688502046d60394d0954cd5a6336aa16ae9960f8906c152ccd966f5ff24225a6c4851f1f0b3153528bbb3d58e2b549096ca9
 DIST quinn-proto-0.11.9.crate 209286 BLAKE2B 4d512dc74943dbd19fe406a7dcb40288b78aed8086b81a49daf12da808eed35ce0546842b840aa460afac9a8187e47da0628cc2d4cfe8ba6eb1ddfd2c0c528aa SHA512 a0e37817d91ca1dcd780d2ca1c01b30d59716ad94dfc313f9232dff708cd8f64c7dd3da91026c8fc1fa9e81d918ffc354092ab1b8841d521eda5ab93153c2616
 DIST quinn-udp-0.5.7.crate 24798 BLAKE2B 286c9664335cc3273122fad49ad6d533db504b7e4dc2a1baf0cb4104974f99202024b59e0dbbc0b8eb91bb8b0b9bd193720b66eec531e8fe6b427da5b3bf1c3b SHA512 4ddcc254065615d60be2086cb02ee9c69d6025d0f7230986c2bda6599f9271bf29968f0e048f2cfaec7b28ac93e032a62b45fe9fbe7ccf38ae66daf5c246c16b
+DIST quinn-udp-0.5.9.crate 25342 BLAKE2B ca285db2f61734b08f105955a22fa3aab5276371675bf111f35239a4c5461aa8e26617d0ce83c50c11e65e98c67f290a0124b3523852670a1fe727aa0432c937 SHA512 13d9abb6162933a8318d1acb3e90c7c7d936952f9795ac02d751f8964bee05dcb0a98890dcdfe1fa3160061049f14b385c125ae56b829a43aafea150be90257d
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
+DIST quote-1.0.38.crate 31252 BLAKE2B a3836efbe5c21dec70c684002b47b8fc7cef643c82ee903b537a48bc0707a28106c4b33d98e60ff81e04c7520f7404b1dc4d49446e8d91dded517e476c36e1c2 SHA512 530c47c5e6372b508bf5b2b88a138408a7afa5ef52c47280ed20eccf39f8e97dfc1e0a18c1bd5472efcdc49a7a1e69566333a0a1b4c0b4f0e11e6a7a85bfe8af
 DIST r2d2-0.8.10.crate 17888 BLAKE2B 66af689f5a1d691c9a46f58545405b0967059205360ed5c2244d59851c3426960e9f93ee630e6b4ae29482159a5fbf7d22e49331473d836848fa61d0e09be2b2 SHA512 b2ccd3a309ec9210893baeb57241c486c861884af3ed8a0d9b6b811ccc53a21dc077b0b3cb62da0acf19dd9f3913175e2bf66cc5c0598113732b1002f2757a5c
 DIST radium-0.7.0.crate 10906 BLAKE2B d576e0ea5c5287bcb6740cee3a3838b6ae4dfdef0ef05d34634b96dba5159e48260233db57a767c9e032fa5d9a5798361335cb19f7844f450113ece30ffbc51d SHA512 51e23cf52997b46c0018a94b0259b29d7bf33ddba19f6db406ca57ee5b1417d7e5f27dda3bb487d0099886011a97f238e8b3dd4d6c86e8464c0b471c1a7622a0
 DIST radix_trie-0.2.1.crate 251366 BLAKE2B 14b50e45eacbc5b42cdde8a4f8e8642adfdfa3cc569c3fe0e3aa1fdab901713b3929d706dc0aede1b679762fb8fb1af345efca15befc9234322db434c8a3923c SHA512 f6f54511860b6b878c83de4455bdbd71289599dba93234d5c7469342f3401cba99a9ea6bca2d32df2e31ba657f40e42e7d5fd7de66786ddd2814e22fe867f9d8
@@ -469,8 +525,11 @@ DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2
 DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
 DIST rcgen-0.12.1.crate 63815 BLAKE2B fca25c2e951d3ccd0832d2861fe829f6966906ead6f7ad2123be1708413b8409af878e744375d599c2e38f977ae8cefed5f9c5149c60f480798bc0dd5d5012fc SHA512 1679764515a71b1048f866aeb3497d65e8b1150234c71aaae871544ad002c362d5e8af77fcc7773cd8da320f011fa8245e68531ccf6655a0cc8add1e38eba881
 DIST rcgen-0.13.1.crate 74432 BLAKE2B 5e62c037cf912c19b0f17670ac1dec9b31238ef3f289a1c5432b67cb4dfff1d058d9501d61081dc5cbe81d17706f3148c98e64d6a1cf657aa672800526782295 SHA512 f4d8ba116e907bd4e6a7f261c8b8325909ca619380d048325e456b037570ce3ca01d0d2b68577d085606250796e97129f86db383e20d7ece62a603baeb45f703
+DIST rcgen-0.13.2.crate 77836 BLAKE2B f92211a4ca1d6f8c2c926d0d60e241e8a9d414f27f91d5b8fbb7103c2123f590aa2796264d16a0590a1ac3e3bf73ed0933da2f63268a98d3efa776b7bc677b60 SHA512 bd8ec21505237b8675a8cf71df1c422f97eef02350a8145875456784d2b7a0637738de44ffbbc4808406f151fe67428671d0fe80f3b16a77c1c8b839854ac121
 DIST redis-0.26.1.crate 252284 BLAKE2B c019451ffe717b48c89fd94d54091b132a42c4e27f866a90156bdf2a1dc8bf6b4ff149a8f797df8e8764267665e95d75126b69b921c46e38bdd44fbf3571ae5e SHA512 2c8cb7d558b7ad75c5fcb28bdc0c03c3e6b85dc0ae40289304635fa08a39cd9fbd84fe26e0ad66364dcabffe2b565ce7e62f9a0c2873b3624e56bb95883c580d
+DIST redis-0.27.6.crate 271646 BLAKE2B 9ca08c85c6b0b902406b8105b2dc2c9b345fb5a9a68fc7a49b65b0c5cb2cb8f014bcfce5768ce1e646f95734adc331e07a9a58ef598b48d1098d2e7dc4ac621c SHA512 e695c7f07e74bad47424f745f235b72cdfe96f2d0e468eecf531820290675dc17fc0873bb3086b9164a0c6e6848e9e3908685e01f20bb5bef201bf997729be69
 DIST redox_syscall-0.5.7.crate 26249 BLAKE2B 97f848b130403686404dc193415e5060c32585aa3638b825b4775e54d9a058695b86457ae9e3cc0240bcac27ab4c05dd6b488bdc1c797faecd236c6e477fbc3f SHA512 e9f2d254279a4063089436b699ecca766a997a72718d132a9b35f7c8c8fc82c4b5e25fd8f3e6cbd17920fec484140db520c262376ed1c74f847929b7f43fb97e
+DIST redox_syscall-0.5.8.crate 26319 BLAKE2B bd69a69e2a0f3d84843a8f76199ef6b3991698ebac58b23f69c26d02f5f3e24e77a9d5e8259e9fbff3887f06d15ced94ff23b5a3272ab475918e6e3e753dcde6 SHA512 5f9632f1f89f4963c36ede4da9b955c3474b673c3414d81cdbb61f46c08eff67167f703a0b06b239beeb2d720f8fa592a5493c0f7e872728b5b95f561ff11348
 DIST redox_users-0.4.6.crate 15585 BLAKE2B 1d60d0b7781395ff271d79264910d24fb021cd8ef612714265abae25b26ac158d48f542f1e73701bf5b99bd67546a7b878e4a14e40cdbd478b35bcc8b4778f5f SHA512 719d63fec42bad3cbed39deb9242ce1daf3f391bccafa8121f63198120371f112d78b0da8d66458519e946581511004983f04b0a697071f22294ac7c831120c9
 DIST regex-1.11.1.crate 254170 BLAKE2B 5cf41012fc2ba8a006c0eb4a922cbbf1614bf300be361c9e2d98956a9a5e9b140e37bea09132fab7bfb633d4439158723624bcf45e8c619c4061b399253c1b82 SHA512 d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8
 DIST regex-automata-0.4.9.crate 618525 BLAKE2B ee3fc41c8c445be4c1aa3e5b19a3e61efd641b1a24e7a1ed55f837c1fba9c816272cb4645c13232b66b170bc7c413802928beb22e3891500141ad4ede65b60b0 SHA512 40bde0ec91cc27bc0c3fa237a37ecee5a1f023dbe006a999c5888f8f578ee2c4c64d9edfe1827546cea8e92ca3c10f8b4d494d81f3d0422b40d90bca9cf598d2
@@ -486,8 +545,11 @@ DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd0
 DIST ripemd-0.1.3.crate 16601 BLAKE2B b72f950d20e0f6f19e5e4dac9da24a5fdfe3dfa441596a89fc7a8350cea3a297ec04caab43c7c24c4d8e499e50de306656b5a5a608d5b01d0ae86014aa4931aa SHA512 eb4510c2a5879984dc662a985515e17f0c22f91babd1ad9914a030058bf8e703a72375e82672c382294a0bf7e004c776e9c5ae30ee0f6acbddc44d22b48e2e03
 DIST rkyv-0.7.45.crate 115753 BLAKE2B 61ffe5c7a819a99e59a06a0259e758467affbebc86ad291db05e1899cf3928c163272beb72e69d564a761102db8a712f0eda273023ca08d15f1d2b60c24e8743 SHA512 bac10c6e7e7f797e505cc8103c55ae2fd4b04a76631e085fcf1c8f2b05e52c064cb14145479dadc292995b7ca5bbab5235d54d8e651bf47623a0228f936f73c9
 DIST rkyv_derive-0.7.45.crate 18972 BLAKE2B 65ab35abb4724021529cd730f41809a2cf4aac06e8ef542961a8d80f636e0244bf9d08dd2e577f2f383e2b52e5694d2dfcc00cb34028d46cc85cadc999bf7e07 SHA512 ec48c62251a8c2b97de67da56cf6abff15cff1a329d7f8dd3e45e1175616f0dd1b32c2a9c0998086fc57d0084e7908cfd6000fff3eaa30a1776f8abd9cb00564
+DIST rle-decode-fast-1.0.3.crate 62086 BLAKE2B 402d56595936734f36597c18e816a798ade6a8636b27e79acdedd4069da38e22e6ded5f2358ef0f0d509ea752e828fa294a4a9ac6d99cf26472fe21a505302c9 SHA512 f647cfd9ae0bbaca4a189cd1f8d1f8531f6dc0ffa1fd296c75cfe405fc9060e25be74581558a9195364ea90e32c7ccd60e066d21704cae836d41606b5799301a
 DIST roaring-0.10.7.crate 94529 BLAKE2B 1b7be7b4c858e66e0920efa5c855e737aef9ad900ea9735873af7e3f9eedc108719844d271a56ccc4ad55e6e9fabaf9a6f5b110c4c4bff9de6736650cb2c325d SHA512 58ee3ac982e77b6a5f4c805eadcac6a87c49c80af1b02bbe5a1dfee150c044e4d0e92596dfcf32375bebdfe18a49c5cda949829f1840dc09687d2cb87977ef3c
+DIST roaring-0.10.9.crate 97470 BLAKE2B e5b39b1346b02a83f32dd6d72cf017d4eeeae0975949507197e34ec1df03a3e7368900406b13608b7e8f2bf3b2ed31f1747e6302671bab550b22aa07309e9ca3 SHA512 b0a2c90f57927ee623ecffaecfb39a0b6d66ea8886108bb350f507038205e26e880bd51e906d759f42b4a5eba7dc95dcbf5b50a16558bc341d15fa4941cebc6b
 DIST rocksdb-0.22.0.crate 143095 BLAKE2B 510a5885d362f67370e3b40f1bc9b85396536d115383c79de942f4ed21e039408b5a0d2819619562e668eb77066fbaca9d4abde98372b40a803c6e482dc085de SHA512 56ae6d0e8a6810b10ce086a8779b21f8e92232a007064be4cffc003fdcb06ad8dcaf999a783f3787b889ec8e5ce7a6f116e7c8c61fab41fc9195fb0ffeaeb4ba
+DIST rocksdb-0.23.0.crate 154324 BLAKE2B 744ba63160bb4856cdbdc17f6479b2cf46db885ace3b7f75c367cd18395ad643beddd6dabe4a48eb63886ee3cafa44a2167e15692a024655cc6b7e121bf2fb3f SHA512 63aa2747ca694f8d59c935a601ce8834002d221edc0d070088e4f533afab95c48368b4f57fc3d2ba989997b383dca2c70649efc55816cfb0cd46a926c35d594a
 DIST rpassword-7.3.1.crate 8164 BLAKE2B 60e89fc36d78a64d9441bd902866500872f4ddbd28ffe4bc5c26b5882ec1dd9bcf50dc06105c87f5fef8c51b327bb9af1a324831cb6396796afab3cb7f4a2288 SHA512 28905b33e5fa26d9a7bc0d682b94edc6119b2d8c2a6826c89d61fa86033230707c54f3ed8047ee3f5da4393c119c70f102ff61efdc1d4bac38e583c04e3b4382
 DIST rsa-0.9.7.crate 80231 BLAKE2B b8f6e435f35776f2a67f79f5791d035ee5753512fb8e05386aadc5ed4962d88be7ae4c016ed43bcf2333e2913687155aebd3ccc79aae7f2b04b0307915dd6257 SHA512 dff7f46609a006dc8342a36c43f841592cc6ded5cb88d63bc252f221372cd756eac820d57e218ae573ea8a643875463c8707ddd3e01f2fdcf729215c75e7030d
 DIST rtoolbox-0.0.2.crate 9179 BLAKE2B 4cc9faea86aaf0f9e9ed95269d0fa8c633d7c05d539a435bbfcadc563ad5fd0d3f06bc33f83a24432a53da483bc7771edca21e6237888254b1d000f7af1ee41c SHA512 2e239e821d0bdb171ff9d03d3b8df2fbb561ae67ed653f66096ca32b2a83badc7d1b74b4ed1f0f41f141ff2a383fd06618f4f7740a03514b256eca4db0699d42
@@ -500,17 +562,20 @@ DIST rust_decimal-1.36.0.crate 129249 BLAKE2B e48f78222503528cec94e34780c67f0016
 DIST rustc-demangle-0.1.24.crate 29047 BLAKE2B 8248b014eedb26cdc0b748544ba91b9aae9c992a6f93b4d3ac256b78f691d572f8885a3575492ea556698a241d2759743968293079ca02bb6a5f318b0ed66dd4 SHA512 eb897c35300b87766e6105917a907fca1c5b1f7691fc03c6c1aaf38075ac883a73d1eb54a245d13ba59c7b0f0333d6543e23fc1b1c542fbbd5c750a84660b9e8
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustc-hash-2.0.0.crate 12691 BLAKE2B b6a619f681e897c8a9167bb88d6ba78715010ac6c1ef9a7a9e115fe8aab10fcd9d4f5e1893e89a36a59118819dbf67de3d261a190fe37948137f097bc99b3fd2 SHA512 996ad683db2e6839ee28fdc4a31293aecce7baefaf6051220a633a00beddef1be41aef0995d7501e5b92dbc85350ced920bc980d05f5ba235e9a5d1a13464339
+DIST rustc-hash-2.1.0.crate 13316 BLAKE2B 3e93739234cd36f3cda5d71522e3d2204e98b1d134cf01cae5a93a93e6c4340a7b1b0485c339f312145c723185fb83f6aa87ae2a0b9b726a34cd29c19d3ede56 SHA512 6f6a40586fd7a99016efd53888970c745888a06bb6b9d32eeb4936bcd16906c90ba22fad82a4a6b547df4b6c9cf6d73eaa8d36af097d65d3d6de18a0669d5ad2
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST rustc_version-0.4.1.crate 12245 BLAKE2B 0ed627c560d88e5ade830cc5f72c62f6ba88be3e30d0f8db34761fcd0b284e5b2fc063c240149aabdfb12c8410ecdbe50cb10a3544500b5a020f95a31cd6709c SHA512 7aa8a487ca7411b6d23cae62f7568fa3474a7b1fd1589621071be3428a550ed3b7c4ad68277a8f86849e5900397d7d0e9d678f5d423742a045dc7c660fa6c598
 DIST rusticata-macros-4.1.0.crate 11746 BLAKE2B ef912926df8ff2d3ee64a190d79dde0edacaa0ae8c2442d75a1fae82f97aacd9994f3511605686cd2bf592e71461279776afc63b9f25cd8ab10610d59cf3610d SHA512 8066a2de0d63f82278b33fdb27fba99b0ebc56ffd364ce6361fc9ac6d78f31e3e4418cbc78916365fd0e7735fdcecced21e16aaabe56cd72250bac0cb30151b3
 DIST rustls-0.21.12.crate 285674 BLAKE2B 44977600effb314aa3c89609059c61337905f0380464ce05b4e91783f1a1c9076a016c8957afb3d184a7a6d076cdbc59e4703be22fc15c540e46a057527ac1ca SHA512 7e48a990ee69fc298df45d9a0de9b5a33a56261ec3f79ff16065cbae7368705c1f3432b77e3262a6141df68b19cbedcccf16eb271a54202049435c63454186e5
 DIST rustls-0.22.4.crate 333681 BLAKE2B 01f84b7f44883c807d8651b6058647180d6e9d48deb51fab0e76d7b587ad11face13215170db3bb7d0216505eb108438dcc3bc08ed2080816401f3955f73fbab SHA512 0b62c741b73dd49dd9d5531c9ae749fc8eedd4a396c5b4c02b1b33062d56c84e327e12f5a984b9ca22c7984103896d4ac69899032397dd6eac1b737e0647e2da
 DIST rustls-0.23.19.crate 333921 BLAKE2B eb7c1354ab7fededcefab1664c4a6f9c893df36a222a9c7cb5d56c74ac688f4ceda086ff7473926cfe5db60a1df13f6938e9ca9794c871ec842b8a4a641d2e69 SHA512 e1836edda343609258deda49725a2dfb46bcb98e1542c877d1e4262b52b39f9ec018574a366d534d39792c832bc03cc99e5852a35f078e9f827161eff45a7553
+DIST rustls-0.23.20.crate 335933 BLAKE2B 754a580f74b16ebb8f0f3dea9f3730fdd0ab9c4d04b0abb5741ecb69548cc32c54713636922031ac1acf2019df602db101da2dc363e50f224c815f1f8edca37e SHA512 3778f649026b59c4698bca9207ecb516a237e3d782d7727bcd93a2a20f0ed7b02e3931cf956b75cbec8fd806b54a9b231e3b663d0123f9894b54283e34e78dfd
 DIST rustls-native-certs-0.6.3.crate 24438 BLAKE2B 5f019685414f19eb709ad61caf5b3df4c8b498aeac499b1e841d081f3bafbdc66a7f3892c6cfe699d5d2b702c3d1fbc90f0f6720e4cd5bf8366c91f94a02141e SHA512 53a3a4b96f05dd06c575b2eb62eb7b6d026bda539c87c0e2a4bc84fd332c6401a825135fecdda39c489b0c910ffbe4d42c93844fbdd8da4fc2badad400b27264
 DIST rustls-native-certs-0.7.3.crate 31564 BLAKE2B ca94046f09e51d79380c06cb62413f2df5bc4f68abfddc5a5a60dfc3fee5aac6aa0568b42e50e7aa9a55e6476a1a4afd8e188c32c7a0282a1632068ec399f8b5 SHA512 3e7e835c8fa392f4db94ea481bf51fefb6c632a085e2c8b2df197173a4402d78fde7ff8a964edefd3efb48b2f473d0cb4470c2f1a385a74792f9caa4c3cd60ef
 DIST rustls-pemfile-1.0.4.crate 22092 BLAKE2B 9a776027d6e43a336ecfdd6713d4b1e6642378f81b73c97752563ee1d2cac5b3988afd48c92d25d55f655a6fa248436954aaa0e0bd9c7c679c987ce7df0cc99f SHA512 bc748ee06f2c101d8e54e8c4555e88c5ca824ac7bb0182f8e49bfe1fc66d418d2a3da8e454f3741697f491ad0c7bc8e924a752697023a191c1bb6eb98c48aa37
 DIST rustls-pemfile-2.2.0.crate 25849 BLAKE2B dfb94a77fe9d86b17b0c6badc6b715f247e9aaf0b312bc9698dbe8d38fff281428ceaec2ec73bef8009667dd93536dda2bc7e7c49d194b36244dca38dd86d577 SHA512 1e69f0b72c6060eb0a54ec8a1cb51809525b053771a1d417892205f8f5dbcf4ba45250fc0d6a836e0cc8fede06d934f0a90c47d475cd8e066dcb3f7504ddaf17
 DIST rustls-pki-types-1.10.0.crate 55134 BLAKE2B e61e78231bb48b6b249e3b1fa6a6edde4479c4b263ad78f78fcb78982d4fadae7c67ac08077b9b0ec32d0f0d527e12f3ecf456ba11f9740854f0cedeeb881d82 SHA512 8a5c51acfb97cef6e9aa2516b3a2a07f6fd37884b7597bdf81e16bd6ad7512fe45f0b95f4635963fd6e74c0aa79fefed1c3f1a9e1fbf7ab78477302fc333743c
+DIST rustls-pki-types-1.10.1.crate 58944 BLAKE2B 1bf83e046802a5eef5dc597bcbe045a7aef146c489ef5fca442bc20a9a80dcb2d15cc8e07ffff45890df069b99698bca2a9463d1c2925a8f1a5eaa673ebf621c SHA512 ec63005b54bb9676fb6ab3f7a399aa816881c34670577e8c8de7f86a46a834e71c2363049ef152475d784f12b6cc9301b4fa20e9d478e95a8f1b9ad75f6ba2d8
 DIST rustls-webpki-0.101.7.crate 168808 BLAKE2B ab7177449be359e17f1f4553193e96e71b8e26e1298a0937af658b1a6f9485f051183d1bf8262d52430ea4c3b96263d1fd903c7a5f046bfe5f87b6b97ebb0672 SHA512 680e3d52f699c9d6200e2e738a4245a5114fc7122546c07d3f15f1e6741a52275061b3e016c2240f1dc3eb9f701f7346193bd82e827274fb73b8e9e0d5af4e68
 DIST rustls-webpki-0.102.8.crate 204327 BLAKE2B 8db832f181b46bdecc419e1433dd5550bc181cbffa1961aa90b2533f92696ebe15d71d742225bf806e2dc3a4ebb110d48bf62b0677089df1eede6d5a072c0a28 SHA512 8cdd5d07bb8d6c3f0d1d6663babc3b7ccbe8c9b1463870a3dd095c67f46addf4097a715da796c70f1891ebc1d045ae7d7c3a352400e8bfd6687e6cddfd33b1ba
 DIST rustversion-1.0.18.crate 17794 BLAKE2B fa35445404b836214bdbaa3de8e43312b6d8f50eea32540f808a6255908d756bb1a5dcf49ca6268a1d214c535c2ee770e295c0e7d6430268142a190b31032421 SHA512 263d2cef02b6df4d38b35af7a9ee3a6a044f160f3cf7c6771528f23dea342232087f73f89e419ef7869db771e73c273c05b3dccfe9e29f707586b2059e820645
@@ -519,24 +584,32 @@ DIST salsa20-0.10.2.crate 12780 BLAKE2B 9627985a2b5583e91cdbefff2a71af02009b1905
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST saturating-0.1.0.crate 2904 BLAKE2B 952a91bb4439baa7ee4737babeba776fb95d23eae2512c3e21967f33548758b7ba0a44e041cf730d6d7bc839c5398464977b1ef33dd742ab3260dc3c194b91cc SHA512 47168d75abec44a8f12e8d7eac65052ae3751b7ab6dae3b5830e27fcb2b5955df389bdb93c82def00ace6901e89267cecf2a6fc294a9974f8e0ae9dded6d0eef
 DIST scc-2.2.5.crate 130745 BLAKE2B e00226c3118a84d7f2f1a7bbc1c104db8199368dc5376f116caf77c986195394b8fb9cdd1eb7a399ce18f699fd22d185763acda0fd211065806ffa0bbec8fca5 SHA512 e2ad4cfd2201b9cf35ecb3397d29c0469c8a3f8366bf85d270341b1936c36f6eb4bc38e7eb5407b7287b38f6bd786665b486b54972c3b394634256ec1e06b5ad
+DIST scc-2.2.6.crate 130721 BLAKE2B 4d52f2160421af4801fb85385d82cfd3158c618fb2871255891dfe2f724727fa6a1449ac8be92aed34fdb01d2169144e167cc46ffff391714dc1db8ccbc47611 SHA512 b6bdbc7e9436a974b586d2c6d5503aa024f03cf6b9a8b78ccb04001809d873aa35a7bcfa957210769db02bf1ffbea1e8a695247e7cceb87285328ea1b1b75fec
 DIST schannel-0.1.27.crate 42772 BLAKE2B 55b3cdf596d6d490fdbc10298eed7cb1b1bb8d6349ac8700ac2e7db66e1d75f0a5bea5b1b322bf30cc0f982262e96aa421998151a8ee1e620b5a09d25ad4263f SHA512 f469d03c2be014c248e7b6408f541584f250a9d58bc8dd8ff4d1e63f5720cadba1c0579b1e5d97b58844fadaeff10e9cfae6d5cd33c5de0fa4ebe699a8ead4a8
 DIST scheduled-thread-pool-0.2.7.crate 10554 BLAKE2B 04f7aec6946828394e7cd6961e656acbc29a05b334ff0ce8ca2fd76ced4db2ce663aa6914a10ab33dd306ef99022d0550fddff7b47512aa4320f36b67db2292b SHA512 3215c063cddfe017e102b63a8449c6f624d190547ccfffb912968b4c4975b70d36ce2c9b3521f7527a053fb89b9513903bde46dede72922d7050e87f76601f3b
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST scrypt-0.11.0.crate 13440 BLAKE2B c2378aaa8e81c5b18fa5954b7b72fd3c4e02f61e4f8c8472de4822279d3cdbabf26200492c332581e1d6397e6b4a2e62e38bc09e5472871501c1883de7649894 SHA512 d7910b277ef814a470361c12a7f2c90ef5b1df56cba9b62662f52a36f076872cf21d18f6c81d33d5a7e94184625753e8a6224d6559ab3cf82ae1a0b7f704e544
 DIST sct-0.7.1.crate 27501 BLAKE2B 12f63e62f49a0ed0c5a62c1c9b42a83c1df43401ed1de85f993167d8fc52733908e58ea1fe76cd7ff6128d4d6046d7c0335434672ed1865c8ddb1b3fbaecb590 SHA512 6030295b3b11411f5a7e518db1066282bf11a279c27414c5e959cd430e9fcbb7358e5d69bcc68c8bf696d4c1d9579ed7218b7f9dfbb61de2271c4c3d3316fb7e
 DIST sdd-3.0.4.crate 25303 BLAKE2B 9047388b3d0d9a136a8a6c75c74488eca6d5a9302299eafca9e97c5cfabc2a7eb3f76035c21f081d6f3f9cc104fb56458a1b48252c23adfaf74e31cd9dcc8560 SHA512 e7ab851cfedb69596c5497295d0d66367e3e9e6fda5879fabe131ef653574fbb1dc53f0454eac12417d0f776381319f6b218a6a2a27c6a0f55108aa9ee2b5188
+DIST sdd-3.0.5.crate 25330 BLAKE2B da350571c17efbb1575a392c32e96c021681f417c45ff9373f50952ca932f455b0f03f81f5bce1d056797b580ccafc49da5dc9d9378641b4d7882e96905eab22 SHA512 7846304e585910561c13f7ea765aeab8f41c47b08c70509ddcdeb28af409c7453b0195cb28ee824390234f51299126304d56bc160e43986a979f3c282ed8792c
 DIST seahash-4.1.0.crate 31976 BLAKE2B f553bcff7af9da9b024efd8db4ec8cbe4100dcf4ccd8f627c724fe4a34b678ef0be8da44e92ea55c4622b9f9f37228792a22c8bcdd54e652ca926eb3c7d37655 SHA512 4d9111dd2e491c7f6d49e0b79a3c23628c02d6603ac46e88ed137ca737830003b549ccb38087679de2cf0b02a53065b89f8d79e0ac9ddb66844d970cc6383f8b
 DIST sec1-0.7.3.crate 17979 BLAKE2B c30d4e617f9c0c21b80f14a7df88a164ad43f4c18fbedc1ec32af41193053e67ff6ea83db54f46c8cd6389d930984120c2a1688662fd8083e0c23bd4995d510b SHA512 be646413d84b39a43a0af478854f47db3b167c2bf1bedf7a58392782c423aaaa38df3b3676f9807a98c6128152295c426edd16d67d62ae7048caa635bf39641e
 DIST security-framework-2.11.1.crate 80188 BLAKE2B 844d36d2b2216cc7055687110d54ea783a7ed9bfe6375fd4dcbea267ec85531e666fe002648110315f42c3364ff5ff5aeba711cf8d1f5358ba65c8393e96f55c SHA512 02786d62fd9dded80bae3942896bc8fea2a90763427f582bf5d9f127ca5682097b59b5dbff2cde373198ba659316ab5906a68d3141ba00c7408b73ebe353fac1
 DIST security-framework-sys-2.12.1.crate 20112 BLAKE2B c03abcc08f068e8cd4dbfb4d5054b4c0a75cc68f0dcc955ea5f5f958db9c28588841723bd7047207dc51bba46868fc1b8d3367b612c7f4a07984d94fc8710cd9 SHA512 5ecae3e1280d99e3730ca3be3dfdebd16971d54b8fe167d29cb07f7b3837a2bb9db2d8131bab679c395e329b10ed28ad9ad8d6764048f6019587d5e2b52c7eef
+DIST security-framework-sys-2.13.0.crate 20496 BLAKE2B 5ac84d004ed09afdeeaf531d96e81fcaac3af32207d7c8b2180a506fe0512fe6616ab3b4244c75667088e7a8215c1d33dd9274a60a400afb1952254070dbbb15 SHA512 a5b69044571e8426277b2ac241bafb53d268adbb7340c0626cf00fd356c654baccdd36277995d38601e19cfca00da8481a9c861d01bbab3ce51685a7dd186832
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743ad0feca0929bf2409eb81e03637ec5f92ba9f38ea386c4ee5cde72bd3d2042083e2fb0d6fa0b839b1c5093a SHA512 5ea1fa17c08d1280c3a4bc8d28494e88ee05acd5dc969ef6f0c6f91fd3b5a8fbe999c9e8bbd2da383413038b8d29fabf02b87bd5265bbb8333f3fcbe409103ec
+DIST semver-1.0.24.crate 31267 BLAKE2B 934f55d953ca52f6c11696889182e1e4c660a6eae3917b15b411d91a18b22c6a1178708caf95da93e70e6ea97c0762ed9154333d60bf0a08b156ca7b50c4077e SHA512 751bb04fb50abfbb92b2612e1d1097f612a1ceee1861852681d6ad67fe459d77a72898903b14f2f01d8185fbbc022c7471913785610c2a8e9d6530e48094869a
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST sequoia-openpgp-1.21.2.crate 3017548 BLAKE2B 86fd51244c808c3fa44e2722c7028bc2746c9ae9db1f6620f6935ae7c1af7ab331b322fd9e8b28dd0119c71aa72dc2a3e2cc144b84112ad465ff2e9cedb7571f SHA512 bc8f0121dcbe083c688d14abfa9dbe3f850aedc02ede98ea4c56f8b8fc28adabcbe1a2ab02cc266e35b28c1f5f563377422e5f8f99ecee0f21eb05a32b94e8a8
+DIST sequoia-openpgp-1.22.0.crate 3017622 BLAKE2B 83be10aaa9adcd3af9a8b4657474892d4042c262c2349e2b7cd4669c23c27606c04674317daa6c143f8277684f58a1b85a2df77bc1cfeff3d79473480937401e SHA512 10893cff011ced034382d4fca9c04e61b7bdb5f2f621cbf4f36d611423248c7b411d7440433607cffdc1d646898607ede159248d1e69a6d2ca69bbc14db6f95a
 DIST serde-1.0.215.crate 78527 BLAKE2B ca8e1175839ca45a4d78a155f5943396211408a85e0840b065c52948188010653d68fc4fc7b63bf2c39a11a6988abb7f6f3c6d878ca1373596e0a5d62186e109 SHA512 3da13f1a74393f1fcb6d659b5e060a11ecae358f55cdf4a2fd05bfc863fea6f75d3140d3bc74902f8feba8cddf7dae71a3f4e4e78e78e1b08ed46b3e4900281f
+DIST serde-1.0.216.crate 79000 BLAKE2B 98c0f5cee2f9212c6b7620d2068665379471ceb7557d1454cab9b1c2120b526ef597fbb642f65440e70f92a4764cad33613b478bacf99138dd5bd51fdbdbee6b SHA512 baabf4c7aac4a540c9ed18b336662087258b71c9cb0e547c8d83a2734818ab2cbbe62f910d812eb61d3d46e653c41a3eebc99b1d679bfc51f95710c71a8ecc20
 DIST serde_bytes-0.11.15.crate 12191 BLAKE2B 71cfa0a91b274a2f31c2541c230ac16041d4454c56c70206f9b1874884cc9bf5b6ecb5a490f6f849daf391dae5888b5cc7428d8397b14e47cd8e13d973b1eeb9 SHA512 96c9f7749b15773df420fae1307ff1a8699856362775a9c9ef6a9eedaed4d5bbd4919872d8c2f9c24caed6dca6e3d82b929a9a3e7536df7e2be954bd1f4d56c4
 DIST serde_derive-1.0.215.crate 57092 BLAKE2B f28bb66017599afdcd8d45c514b8e07854eb944c1dcf931e052a01ce421e0de6c20c13b3867da5922e2153e25ce88bf9fa27e2e68ddc9d212977f71fa0bd6352 SHA512 cae686bdf10c683149956ffe1c64fcf3e9b9bf0cd6e33b4ce7429d0ca35b9fdb55443693866c1202fa79348c6ea0f49ab3be3d5f857de4ae0818d2b4c8c67d9b
+DIST serde_derive-1.0.216.crate 57674 BLAKE2B 12a9228679c16288c08c8b256707e276aec79f84ac7af0c4cfd1f109500dfea80438df17d798acdd30a9743c753e70093b22bd324217529bac483f257682a3e2 SHA512 80fcb552279ac7562297df878f2f5e9ac09241701f5cf1088fcbf473b638f58cd3092a7930d8937ca0df9a47b9ae1a42d490cd46a275259cd8089fe8f5426469
 DIST serde_json-1.0.133.crate 150739 BLAKE2B 7891eb5b8edcc7fd09ab1e15d3881ffdcb629aa39f2bd758c0505700a5f2dfabd85b1b66c3b094268bc1627b346e204c792f4ca61efa76c54ab9cd5744fb0ee2 SHA512 20e65ec87bff319897a141960d13deb5cadcf821209c1ee8799f1dc7f458ce432bc62c16df5bdada1c8d3cc01ff23b8125e8fa0a03545d4614f32efd687dc69f
+DIST serde_json-1.0.134.crate 154351 BLAKE2B 546f8ffe9373444e8c9e81910476da281dcef10498dceabc8bec9f9063c55f4a9033b83586a09b0f410369515882c37712a2bd75ff1fff05815d904f37386124 SHA512 ab6323799bf19da8ec6e6c428370d37cd230192b45ef54d2c65c7d83907b2dde71d51650e44f1fcca1084e75e0e195e97b28437f53a331bf48effed3d59b58a5
 DIST serde_qs-0.8.5.crate 44854 BLAKE2B 85beaf2fb1c5918cc4cebd536b351e34e0fdee08659ce1db4c7776a8793c3765f0f9c525f33db239b7a52d9e6f997e2b2fb14b1531a5205dba4bac4fab79ded9 SHA512 c9c94a791c5dbd6c87a6c4f487c98f1be44f7206ae0de1ff836fa43b2c867d45b5019f4b91d3d9dfc764b3043ed4f6df63e8de208b6a9288a2e283588b970274
 DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
 DIST serde_with-1.14.0.crate 114325 BLAKE2B 5681438f6e9ce0032a0b0bd224dd4ee9680a6b4818a93cd8e7990e2e88b1425f81540de6dfe71f5162b8ea516c44458d5f095f815e86079e3dc011880968c685 SHA512 643183189980641b904fd181a699faeebb95ce1eea4805cad8ac72f32a2d47dd4aaaf146f7489c0a062f7867076860cae1aa73e12cb96d542fb0991231a51923
@@ -563,11 +636,13 @@ DIST smtp-proto-0.1.5.crate 34660 BLAKE2B ac043fc8059aa9bfd19f889e53deed3ac4b7ef
 DIST snafu-0.7.5.crate 65229 BLAKE2B 7ab41547d6775fe92a0be3810847a00567cd3c82fe12b7f6f5170f1c5ede011b763fcc8f470c7d4dad9369956e9ce6d5e66edd4d66f4bb6c8a260dbd1deaea2e SHA512 50a10d3d1c13a28136227219da1e43c8655309bd1ca44e81a76516ce7661ba3cda8ba2f4e0ad16b3b1e7d5e07b2dcf50e158bbd6ff54077709a105633e6bcb50
 DIST snafu-derive-0.7.5.crate 28208 BLAKE2B aee0f63ef6fa1c414a42d6bd625067d5c1065ef6df4178ace3c5b2bed733f719126ac428b723d77522cf5b1a384382aaa03c0acfb32a7b5a7703b3212c2c9d9d SHA512 6e07fae7d75ca975bf2b90ba10e2bd7368a0bee7670e1d9f4cc90512d9290c9d131b4fa6accbf6e177cb23a17072e029e879a55c5b1bb595b3e4ab447ce445c4
 DIST socket2-0.5.7.crate 55758 BLAKE2B 148d2e2b6610895ec555b1357b340576984eb76cb3ea719f85af50cc4215b2ea2db739e2a61434c09360a0c1ff8e05911764e18dc4a59451c0aeb0eb60b8403f SHA512 ca37157bfa970cf3cee8b45c7fe64930becf2ffbbc309ea4613be968400279b70edd084d159f65b76fe1130917312d81455023c0d7c1bab7a59c79542aef9dcd
+DIST socket2-0.5.8.crate 56309 BLAKE2B 309e5a0e46d0b9debbbd6049a138e56b82df4fc0e9d1115745ed935eb40c81b004ad748844f641934e13b5b88773db5cc4a57fc9e61dc82b5322fa0232110864 SHA512 b7d03608a3d4cf3e2d1539b5a375412effcc96279e8f57668fa8cf67b3f0a3a6b611ea5e2e72f282460582954acbb5364320611f7798a11ec9e4833e53830b60
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee
 DIST spki-0.7.3.crate 16409 BLAKE2B 6b39144e4e718ce5eb454e21ee89fb936ffd31ec99554b0150fee47bca396bdfe4ef39603ec029d4af4d8c4c3ba2de7f6c549244f8c20114de9b43ff14921681 SHA512 d33a6a7844b33c37628024ccf25c1a631f7a6661595e063049b8c9a9b4edb28f0335397faefc592c6fc5e96378b870ab5dab9b0649c3387577b2370ec8210db9
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
 DIST stalwart-mail-0.10.7.tar.gz 7000660 BLAKE2B 6b4ee19e664e9f1a0bb283f2dd66d92ace4002109cb211766fff8fa2d5acb4a3d93db02dc5e80d9794a02f1fbef617870a47d2613daa853f9ec798cf873c54e1 SHA512 d6c7d7bdda91d1b4ca22667a351888955a230d49b621e918e682e4bec6b0cfa4e87bc128e555612a0055a31dff18fb02fd396b507235820e0e6b01aff022388c
+DIST stalwart-mail-0.11.1.tar.gz 7043011 BLAKE2B 8ea520bfa00f1c13af84b452ce1684effc1d36c4f5fb8578f9b4e8558279c023da8b61ab1fb63f65c4597178261fbd19d163a3e41faf46e20b6010dd71eb28a7 SHA512 957ad7b6054364f0c8e2153a7dcb8ad37c9ff1eb28fb1e232c12b48bdbc2f444b49eae6c62957f3a11cc912699bddd5b4657964c56334f7701726debedc564d9
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST string_cache-0.8.7.crate 16655 BLAKE2B 9a017f3248a3d5e7b8c1a05462a882862b20174c7ce5dda1568c3d3f61c422e84ba2ccd5d6dbd726d1c752f1eaa8062a179470927a80d5bdda0ce530d1ae2c17 SHA512 03f9cdd2c01c0f233284851f17eaefebd68a91ae2ed2b231fab2d6d6476bd19e0696d7d3a74fb6ecb2ec36b89e79ad966ab73051255c9e194bcf9c5029fb8479
 DIST stringprep-0.1.5.crate 23573 BLAKE2B 8b5ae2f278603553761e0b98a3f0a02c6a81fd117fee57a8186a015a58ce5ec8d91d9f3decb393f53e07d8df05963f399e63afa46bca937b99f609204582aa50 SHA512 f5dd6ee410e42f285b4da85e76d514ef697cd995c601b5ed23e25f702d920dcc76f15fad41610b6554b692ca0f939f329845535fe4ea167df3ea0e628b1da447
@@ -577,6 +652,7 @@ DIST subprocess-0.2.9.crate 46463 BLAKE2B db082824bc0b71a73f134161ad1bfd3a3f9224
 DIST subtle-2.6.1.crate 14562 BLAKE2B 3cf4940b7a01f04715da1057f6a92b1043a6b86ab2ee7f9fee0337b680ff781201d330409460f6f90b3f81bb5fd4b563e17c762c6e824ba3b0af99e4ae7d66bd SHA512 f5946ebd9bcb8776ee3446abcbf4afb3cca5d8bd847cadda87e864333ac7ded537a3efa773e9648adf20ce4add2c1da85172cff88c1e1a3a6cb051401b00c6bd
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-2.0.89.crate 289852 BLAKE2B 4e2b06d2a0ea9b8970338ab61f8c5569cb7c10466dcf139576d0618c3690cfd23c98b66f0714c34839364dee72df6a6d8571f73dbf03ecc347fb1effb118fc2f SHA512 d172936f04a383b7b5e79dad328e70ea3c4faba4a88d0b6d186645413e8698434d30f53012cc9d3813f617c8bef75e95a2d064fdabae7867678abbed22bcd910
+DIST syn-2.0.91.crate 291128 BLAKE2B 039debf1d4d1015978e2b3068efe7be926f84ffdff40f8fc78778afd37192a640e851cfc1642608c7f95d64164ccb75b556d6e3184cdfbaa1450210143cb006a SHA512 076bdb5ca8f23997a8df6ad4027c0d9b859ea627450d2e23cd9863606863185cffbadd7aba20416897c74a5b53aee1946cc0116c8af9536afbea565443816c2e
 DIST sync_wrapper-0.1.2.crate 6933 BLAKE2B 0ec797ddead298a95bde0a508ae942a4e90943948d3c1e4833fb3ad1cefd3566b7fd1aa0b133d614839707e3f416e3e739099ac73441527213da81b6d1c47d50 SHA512 ca7cd7a6dd242fa420e8dba820117d85b1b11ea6a9fd99c92a5a260f12263cac0c034c9f9fe10090d5830fb5bf5eefc8a5a0d0b5a40f3f809d69e5393693d5c8
 DIST sync_wrapper-1.0.2.crate 6958 BLAKE2B b2e162f982ea827229dcff468bcf31c6286c57ea3491a909784cdb50b0ba36c3a1a6fbdc7b34fc2aa9a7df1d174393d61ea9dc7ab3439a5e1a1884e2473a70f8 SHA512 aa314a6ab3ba028d2a169ea55a50eecf3b73b475a81c91330430ece9f1734296562627a8c32fad51b5a26796931f364e2803b3a13075ccd9a0aa614d5220903c
 DIST synstructure-0.12.6.crate 18429 BLAKE2B 7666cd83f82910e036e5b57600dec9a1c2e559453ccc2f1201e2ee4ba64f2ee62cfc1046ded5cae64dd183967b9d71cbfe4b60a88bcb93706eedd0c4ab69be4f SHA512 6ec5dd7ade904fb6d79c2be595886289846e064b8c4100f780d8adfcbb41e6ca67f4b1d682212f4673c2169f889a042049b31161ec3cebc3f399751124f01f9c
@@ -588,15 +664,20 @@ DIST term-0.7.0.crate 37082 BLAKE2B cb7947c696f71fc68bab3b25cc6cbde74b92380fdde5
 DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a
 DIST thiserror-1.0.69.crate 22198 BLAKE2B fdd8ca8c8ca78702377d0bf7b253440519018275b105db980d63229d0d44aa5c39a703e14aa6fe453c779b3c864d8044009dfef893d2a5294950f067656d7a80 SHA512 ef50d2867d965da1dfb29d26faf6de273b5fadf78f95313f6caf44d68bfc610b9bd4b7544200b05bb0861231cfc84e961007f8db83c7905244c492037fd31899
 DIST thiserror-2.0.3.crate 25559 BLAKE2B 4222d28be8ee9b2e74d647587b9a79a1584b158a0eb9fc6bf642a1f008bc2004698d3aefdd0ad8305052bd225eb75e57d7040768ace9b0839ccc135c92ddba1b SHA512 f6a8e8e1bb6d6e10edc07c35f3141b4b3ecb46b943b4879dd8f8bef0306feaa5446d8e47b24cffeb4cd6c57b4715b86b2bc0716b4ef7dfdaeb080ecd29646c9a
+DIST thiserror-2.0.9.crate 28531 BLAKE2B 7789458ffcb381e2cf02f182248396c5e6c20a818e4c5a2c7da8a8f50099c548646b51dbfe0630a242f24e9aff65e215a4473e13f63bbffbd80a3429237c65c7 SHA512 b7b5f54cde87c21e8fac3526d5a140c0d64116e700d07eb28714df3db372a42fba30bb37817282d0ee1b5333f1998d1f628d43054e59fc39393fb567c3df4cb0
 DIST thiserror-impl-1.0.69.crate 18365 BLAKE2B 51663251ea6ec99c59aec35fe73c5f9760809d6b6b7eaa8ecbc8f6939acdc4d0ebc11f9034d9204dde7bd689d5e8303ae0be86e298745e9ef96825bf73453a08 SHA512 579eb796c8885feb01d27638862823acd96c79440655bb444c3445ac00121852603396ce7439aed617c0a0ac69f62102167fde5845411c906997574a46d6d9e3
 DIST thiserror-impl-2.0.3.crate 20283 BLAKE2B 3b9b162b46a0fc6e816b3dd6c09b6ba38224c4dba9fb41e4048cc4543c6c2735ee34a94ba205be0b193debd7cc42210be5f78d9150711c9058416e41e56ba2ee SHA512 50bb722db6bff4f18975312be61fbf201b8edb29a2c6420d8a2a1f2817403aa09c6de1269e7f952c4d4583f0dd2ab1eec45b26e5391b6bd69c6450c8e42019c1
+DIST thiserror-impl-2.0.9.crate 21023 BLAKE2B c2def0cfe9b9854ce33075fc246a2baba386d8f3a70f26516124f5ff4f7dbb0cd0b8887882c491f37652b565ee4fb3e7895a39cf34564a21e96890fa6e3ce125 SHA512 408f6a4c0f6cee36f69fff5a2f08cbd349db44753e6b6ac730c418fa1fc06ba7f69fbf248182af947843ae49d5cb5ff53980cdb18cb850ea8d7d9ac7dc8d67fa
 DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
+DIST time-0.3.37.crate 123257 BLAKE2B 5968d85182e3a945c194c0e405a3c771698472f4b4028a01870e8dedcfc5c10a32e167715c7c12626b46b9ddd758c72e0188b55e45c0396cbaa42a65920ae28e SHA512 6d007507f79c45a7408675b3223bbf83a133bbaf96429ae6a02b5db09acccf884bb8323dc6f3dd05e7ce87a78366a55bafa6c6ba31b04198a31026df4ef425e2
 DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
 DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
+DIST time-macros-0.2.19.crate 24268 BLAKE2B 18f0601f5307d310010bea20dc7171adc8600c5b2e6303dc9b38ebfbaa7fb59a029dddb627cf5a5b7fd2f7ed66186dbb5321cad0f90f3f85b6edcc901a8c2855 SHA512 c58aa596247a4cab720bef74ff43be44686db2da2978826a1f9b58c640113b5696efc2ae1746bf84042fdbb94bec42c7fc34f7ae6812478f55849a12a90dff5e
 DIST tiny-keccak-2.0.2.crate 20129 BLAKE2B 105a2d2af36cc053cd95721ea563108f33b8a3feb2ae84c75a04a65ed5d548dfe35d8b2e48977a82f725c0ebcf914f21157c547f4a74bb4d98c2e894385139be SHA512 c0219f23361eb07e0a68575c461a36b7286d9bdebae89080d9e259178d402b0c7762ccf33e65a16951ea168392322c44a24eb55189cf143e22d09d6dfc4acec1
 DIST tinysegmenter-0.1.1.crate 12434 BLAKE2B 837cbab8a07b1c6102192ce3e0e53361616469bf5c7eac313a63a2f30a75ecc8671487730fcaf60b6f76df2ef8e17b5eedd81a0fd48c3461408ab535afa92b41 SHA512 524528be4c8f4edc0f77acf4a405ece5c7e079afbbbb82c2b953d1de34a5b1ac9ce550633122243c5bea1ee6078c2e471794e796ad41192d647b133c262278dd
 DIST tinystr-0.7.6.crate 16971 BLAKE2B 33a248261c4cded41a81f0d6e6c8df55437f042b37f235c39787986ec562f0dbff50b282ad0f1483daaf49c4b33e6618e139a6677d1238c21f4e12082562b4ae SHA512 a33051848de248cac0a2d151760a78cb3aa62c787d84ff7aac38b11c0660e9188e4d43d43a77fb8676e49ac6102015e9c3db057848d809e71981851875d0fb25
 DIST tinyvec-1.8.0.crate 46796 BLAKE2B 720d0e6d881855a36779e12f5ffa708d3a8b96e6d0de9056cb33c9b8ce0d408f99b22f5b2bb9d64bee72a011fef846dbebbea2ccd238d7b951eb5ef0c4866e05 SHA512 b7b32e38229645965900f80f298685f13e6d13e58cfd6945409a6643ca9c9adc2621456956d5998ab9dd91c2db4ae79638b156ca0d9c7c5505023fd9b28414df
+DIST tinyvec-1.8.1.crate 47269 BLAKE2B d72ec2417520fa0481b8447e6d75e1f24731d38f9083a711185785174a8567c81f6416468b9eabf426f9d32683231e7c5e80202292d1e424f9e4ac9cc8b3e765 SHA512 db32a6beb1c86eb3e9f5ff2732a4acc03d1d684f0e54df5de2ecbfd08399639f47396ae8b17eb5f0122a09ba0c313f39bd73a6f7c44cc38d1891d1bdf3f2d176
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST tokio-1.38.1.crate 774260 BLAKE2B c30488cf0beb002732991f86ffbbd4edc4fb3661837cfecfc93b8cbf9972ff307ed4c41c893221207995953daa7123c8ae0c5dda43111df74f9192b82f2eed1c SHA512 72934b781cafb27488325de9226bcdfcd2327f4dac0d58a22b87e3ffa3604db431985efb8ec68f1287d1cf17a9c3273aea89558d19572ecd2895e0e64b97141c
 DIST tokio-macros-2.3.0.crate 11753 BLAKE2B 53429417a6fe3bc6c320ac5e321ffb2b19a64236a8a499fbb10b501d875e9d266fca2d82364a8aabdfecab46e4aef1b48d3b8ab3ac20086b54834c3e2f0f1b98 SHA512 cdb2f13141895035b76d38137dfd0e6829a5f8a617d0b63ec53ff51723c69e301d49f19c4b8b7e86c6e6a2cf58c1aeb35d071193029005fdfb9127f5a12841ae
@@ -604,16 +685,20 @@ DIST tokio-postgres-0.7.12.crate 79307 BLAKE2B 325718c0f9fcdb913e05315e5de545798
 DIST tokio-rustls-0.24.1.crate 33049 BLAKE2B b061bc5895b9d7e5aef96512667673ac6fb813a4524b1f6620af9e2598425662b15b5e07d3896499b8a24d820462d15b71a2b9cc804886d546c8ac5957f28529 SHA512 93098f34d117107214e2e80e0e6c030423850ba160d1858b5149c165643700d308dacef7723e45b79fc911ba13bc1bf363c89ccac047cc6636e48a9a5a9502fa
 DIST tokio-rustls-0.25.0.crate 30541 BLAKE2B fc85306724dbb91efee7924340e0cbf4557cfeb149cf11dca84e37ca96e6ca54cbe774edaffdaf313da11af98ac03cca23bb7c2ff6ea551f5328a3bf3ee9aa02 SHA512 4e04669ecdd8235edd438075e6b125f6473e117adc2ae13ceaee7668705e81a87f97242253f51dea204fa1bb3b9f8f9f21b587b4edc7c2e58e375f5537ee5f95
 DIST tokio-rustls-0.26.0.crate 34253 BLAKE2B faec8cf5b55c5b68549659e82e656d63181b8384d170690b8a22e00b9b7bf4f63cf3f2a0c7a78ed7adc9122253765cf8aa0adebfe620f642f08268ba66ba610e SHA512 101f2083e04feffec48204388c4be3d51fd6dc45bdd04bb75bdfaba48cbdd89529e14dda194ef45b2d78530cc74f128a763fb09165a52d738eb17adff7c56664
+DIST tokio-rustls-0.26.1.crate 31214 BLAKE2B c5829570c90b5d4dffe73c8b3a5bcba799bc48e8b742ff10030805067201848c362fad9f4ff319b003eb734b078389a35420186e90a434464f45dc1b6b3391ad SHA512 0cee6b356ebc4be05c484d459ac457280f41401093ca942cc61a6e6514dd4a48b1cc921f7dc02f9c8bc34b751d4d40d6d4768b21193d5a12c38ebd140bad4896
 DIST tokio-stream-0.1.16.crate 38312 BLAKE2B 39b9ccac4091e8d882e1dac43cf930bd4428669add837c2fa989fabdde8f2edc5340df83745600cab1d0880a87668ea6ac95dbcdfa02fe171f3f763887374e9b SHA512 1e9013ff016b59b99b29465f42b4dd61f0a7feeabcd35ecf39a26862ce3e00ac1c818d012d0c62a7509c244d429c8a10f9afdfbccc2e178a5e62fbfe097ce39a
+DIST tokio-stream-0.1.17.crate 38477 BLAKE2B 9b8d7307ad8194145ff8afe682874d9f4cc7b06a11429005912dd9bfe1bbfb980876bf831b7d715552bc86ee18344eec331fc18c8871681d58171abcda7252e7 SHA512 c44c5da6f916ce128e8a13025d9c3e92ddb4c82d2cad52bde4bfb982e6f83eb89125b616f89f2fbbf9ba8b7f800ce46e33f43104a59153db2e950bc2f0d570c4
 DIST tokio-tungstenite-0.21.0.crate 28159 BLAKE2B 5ac21d0f51f717e3816ac38ad957d1300bdb16c60d3b6041c80a494dee8b08d12c1b20d7f00d08500ad2f092f9f2c6f2e7c7c00fba1d0f34caec4525e61dd85d SHA512 2ed4baa38ed5f3e19250af71c9142412dd96d59c971f9813e9a633c9764c580f7ea2141719a82251c60c9d2a5fdb22b311fc0f7a297f9363585be4d140c1747b
 DIST tokio-tungstenite-0.24.0.crate 28904 BLAKE2B 09c4549b80762d155ccfc474dde1ee242a2aa704b557ddb9220cb09ab902119faae1db3fa8dfb5f6661c53189923a6bc45e431a7282cac448d88ebfe28295d37 SHA512 27fb548fac3abfd5e3aa96df4dcf938095629bc64d04488a8fb56a436ea8ed1d82e8cf248a6d283042e339cc08cabd23946c49fbcea2e6cb6e6e39beb2b408d3
 DIST tokio-util-0.7.12.crate 115177 BLAKE2B c6018d9d228ca74f198767ea9be53569bcceb369e4dc9ea10b31e7baa0a4a6368f1ee23532121499e31f2da3f825184ef7f8e00911efb1c2e37295c1ea3ef19d SHA512 df30a9b0cb435bbf3030c1d5bfd4391310b96833acfc623f5343fadd694fc44601fa07663fefa2cfc6719d444632890efb696727d9c1049376fc6e01f1814c78
+DIST tokio-util-0.7.13.crate 115191 BLAKE2B f4acc65d0fd14a88d46545bec2313cb1f25e1cb76014d09c34f8a8be62c6901ab09b18d7b32fdab58f6594fb861bfcb8bfdc8825871347d7eabe2bd8117768bf SHA512 2a1e8fbdd094f81e00ee87eb5ebc4c62825945048105970e52d6d0a872769d268a41ddf91c60158c02a303ecbaa1b19795948b5416f9bbfcb079c5b27d39d51f
 DIST toml_datetime-0.6.8.crate 12028 BLAKE2B 62113366771f22b437b2ed0d3bb2489ae9078cb589cfad2ad2e92c81ddbda48f689e5a573366eea4f54c2b3cbc6b37eaa8b442b6d935b631a992de4917268757 SHA512 d38b98db3b2d4eebd3001d88e2135b6fdbae63b200f7e900c6bb9c121dd3f170e557332bd26f237312c1cbef61666716b0cf550c2d730f86fa7cd9eb5f64a16f
 DIST toml_edit-0.22.22.crate 106387 BLAKE2B c658eef2dc8420266a6928d7ef46340372af2593e4db0d3a67ec88aaf8f601d37d1e9b5bac231a799be8a2ee68a7d98b5f651e9c109d23d8b19b60cf75debddb SHA512 0f98b371f7e27ae7f435a207c0915f942af145cc5dfabfe6d57f2b797efa3e706025401e501fccc6df70c001ce27051381556b8e7824447edd23ea25d047da4d
 DIST tonic-0.12.3.crate 99380 BLAKE2B 96895bbd3673a6cd59cafab2e572d7126f90a7449761f102c571626a6e68aca9b4050058fffcaae58704323420d711ca5702bb690aac45d07452f4182256e6eb SHA512 c0ff1241a0e31e2f4f513e3ffb1357b8148d9c2b8754be4e05ea04ab432c1014432b216af7877b7c05e78aa48f7fb84705faecdee3ac077590a1195bc4cf5ca5
 DIST totp-rs-5.6.0.crate 25093 BLAKE2B dfb6ceebb9206f94f47aa1b863b1032a00225da0322186238527a2cd96f6ed1a0c4a6ee98de6c451132a64e8272886898e66dfdc5ea893c95425f242107dd3d0 SHA512 c74aa33a3bc1993e51075604b11128ca4910e450eca203623de980e227d82d6bc8ea89baa2f20cf5d6747d6da2edb4e24046942f31b7087c1db08f5fec9f6a4e
 DIST tower-0.4.13.crate 106906 BLAKE2B 6a8f4455dcc69f6c03af703fcfb0e6b214c2ce599611ef78fd41cf411ccf06bdce241e03a1d85d36cfeadc72db9f3d9b7ed94c4fcec466c070f2357ff6e27360 SHA512 592f23eee5efa6a4f0d2ffb0d965da7e0f75a90a4320a0d0dacdd5add66513ae40902d21af2bf683573133ee984866987df2ae8eb8e632cba7a9d196985aff8c
 DIST tower-0.5.1.crate 109627 BLAKE2B 5dfbdca4a25372651bf3a128f6afac6a9c2b61fbe70f78a59fceb11f4581635004b5415183ef9b1ceb09fb0d4f8aa7412f54c4cabc534d3c01554cd7ed7a190a SHA512 69e8926182f72775f9f30b2680e8ddce1133082c87123a39694d42b35c098a8ca1d003282c2bbee7aee30ce2531a96dd0734842d4d2233435be0a7a5bf7fe6f0
+DIST tower-0.5.2.crate 109417 BLAKE2B 414f17e97102224f1fdf23a03e6aa958e0a2d6cfcfce93ac3f2e911d68267aee33aa079c94540626ec3fa895e1780e6e5d18b4831f9f05cdf3e8c26ff73b7279 SHA512 e89c4ffd83fec3566334a4c4e9151ddeabfd3437269afc8bffb46201391bc1cdc82cbb97c69643a30f8873e87c511ad9aefc6c081241a4419fe315c99c61ffce
 DIST tower-layer-0.3.3.crate 6180 BLAKE2B 20435102dd62113c3e961bb28d7b18ac6f8ec6d5f0051f511e6f5eb044b20016f247ddd1b8eae9dc9f1ee259d8cc31e0bbddd26f5a22fadeea4007a3011b8500 SHA512 edf36671076cd29bb32c29351b648afbf3e7134316988a697c7807db62de7a63cb0339e4db7c0f36ed60d8aced7f3e493318cccc272070c037b01e2dd189b934
 DIST tower-service-0.3.3.crate 6950 BLAKE2B 32ca66bff783eeb015af982b539acb63c9d426b931832b27aa45088382712df3894132a9e6e96fe1ed9d0f9e582b7a25b33e0ab73711acb06b4e134e69158452 SHA512 770cbca46d8500ff36fe84a9a420beb84a0e893dbeaccdd93a3970e746c893b5d32580182ef3017662f421e4b2d71f079ed2cf1727dcd5fc3443a4484f9b43fd
 DIST tracing-0.1.41.crate 82448 BLAKE2B c056d938e001654e03efaec7a11eb8ecfbdfe9af2099271fcefa43f4f4683b40c59f7111fdf7f27df4da38bcbe94f1b2ac0abb6ec3d6e6a0d165b9fbb14da3a3 SHA512 dffb8d3a1375f1b9d5418550a46cb7b1d92b2cc8ffbccb430a38f7731547960775bb42798074186711847d256eee30fb3e74078b69cb36f28c07d9f231dbf96c
@@ -628,9 +713,12 @@ DIST twofish-0.7.1.crate 12156 BLAKE2B 282ba2e6e4610297a67aff0e06db6089c57edcb00
 DIST twox-hash-1.6.3.crate 21842 BLAKE2B 67c261b2b0a93293717a4e2e07dc11df2abde09da6fe713b9d04917ace73de1b59b8d4fd9449ab46cb7cf496fad1e440effdfa1fae6f5cae4ca78af8cd019c42 SHA512 f7ce63e6e5ca79ce9330caf40b32578a5d2088c5d8ed371604268760d6e212d447d9e3a95378378a283024155bccdaea47597902c488a94c5d5f79770baec8fc
 DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
 DIST typewit-1.10.1.crate 61902 BLAKE2B 3f998e25231ea67e6e6fe2391fc9ba8f4475bdadb153e3f125768ed1320aefe7b6f43b423999e855286e34e60050f9d6cc8b937116228971751d8808ac8c3524 SHA512 3790c4217c8a8391555b85e20b4bbfe4089dffeb72532256f13c3b51956a1b7820f9da31285f8b70b706aba7d51a2c8bb3ef3f81050e8a1bee60cce6a539aaf0
+DIST typewit-1.11.0.crate 62046 BLAKE2B 9f102191b1db4f8de6c63b77a66bb1ad92c7ee4eb7d954f8e987faed86c2d4e5df185757757730dc90e1b7c29292c4f9c8a263b3728a9027cb3ef29bd57a0e7a SHA512 ae5e1b2c29685ae7bd52de3a7c000b105e55881a5920ca220968d0a06be713cc4c165e45fe1e458ded1541be3031b541a107fd15205805458ca017a6a99eac55
 DIST typewit_proc_macros-1.8.1.crate 1944 BLAKE2B 8f8ca4d79f4231ab2b1de8a97bc98346391a10f172e276e8f2b52e1cc5400152b3cb19e08cf9a57d80734ec8e61fc00fd496dc7873b8f6175509b1d44fd4485a SHA512 052db451ead451dca05cbbeee37cb39e1332014adf2d6d0dcd63f3bcb1d184809af39cd41a213d3398b99dd15fbdeab7cb23dd25b880adf67598a82d47b09769
 DIST unicase-2.8.0.crate 23843 BLAKE2B 5e479780dd3a690a98e612454761f0248d8106b8efa45964059a04eabadb78f0a6c598115e4b74d38a96c231272e1bde2b8f4edb328069ee6dd0874358613d50 SHA512 2c86abf8c87b87fbcff4ea9a6093d86b876e2e619120c6a9b055712a271f8bf165eb533ab9d523af2b516843a39b5bd549d9251f9b079748176451c9c820c0ed
+DIST unicase-2.8.1.crate 24088 BLAKE2B 29fe558490245cc1f9c551ba524ab452a4ea18d5f3e5763bc58e6b4c52e21bb8bb5e3f16df35bb96652801c3d96e53f8a39cffd31a0cfd1c83f0fa3161f4ed4d SHA512 99a3944a5c987376bdea5fe6c0797e881bc8e6f629c56120ce811c8ebbed0a3ba24617decb74d6939699c8fc994c662eb292869ab407c0ba0ec460a32ede0190
 DIST unicode-bidi-0.3.17.crate 58120 BLAKE2B 9d7759554e265136ab9d95dda90bab84763189d3613522a5cb966ad6417ac0ee726d79e296c8821ccca589ef09a999701149c88a9189cabe0ed7d32902040832 SHA512 cf523ff9a2e1face42da035f81bba2476e80d1154f73f3e34cbaf5ce322504e93a520114a54e0a4b2e5d6b930e508ce31b5d8b4f4ed4d39159a8c9a9c7b94d91
+DIST unicode-bidi-0.3.18.crate 58300 BLAKE2B 388af09d26248f2059d251f9c2b7d949112a430b16ad5868874d436346e2e753875ae382257cf5bb1d41d6ce9f2d7a34d37d2a2e88f9cc051b85a53c3baf5ee0 SHA512 69b5f220cfe8b7b36471fb0adc7d7852a8c40c497b8a81eacd1293b72c46e09c39c2e0a7218b58f0cb62c5ced397a8eda2c5f358eacdfe5d18aba2bc14afe2bd
 DIST unicode-ident-1.0.14.crate 47547 BLAKE2B 30e0b6d7f3a967aaf5b9d91237008a60c3a8ded53bda901696e23cea3931dd71b01ddab866dca9e31e17c395d5f5a68f2a938655b693e894962568c2cff5ca15 SHA512 7c6dcd1724e8cfedc37546d1abd49088b633dad228097acc73d7b6cab255b223e830c541144e05a00388fd8ca8066f27c18792419cfa58ee9da4460a38d0bc0a
 DIST unicode-normalization-0.1.24.crate 126536 BLAKE2B 1d6d535a1236562918d2625172d38c261854cd8c45cccc81c5d5aefb052db5d0e33981d95f5c87e8760cf77b3651c60b7ec1762421a7a9caa72fe7eac3f562a0 SHA512 f7af59688773319b9d1523955ce9b82e6735bd72358715ba5c056f41956ca050b6a612cae1b39199cc089674b3c71e4016d85d48167277c794c5cef3df881754
 DIST unicode-properties-0.1.3.crate 42252 BLAKE2B 2c054d7e84f739514a79dca218aed1580b06c66dd66a760afaa433c8822eb45ee97b47d00bcfae9770ab2371489db467c6667157fec73dff663847fa080e38eb SHA512 1825cb20913ec343dbbca7a2b1062c8e4bd2dd514b57598bb6f5a6545e8142b5f16377dbb3b821e9b999a1b0fc08e671b16e1d4f6b7a953ea40e8196b51744a2
@@ -659,13 +747,20 @@ DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST wasite-0.1.0.crate 2346 BLAKE2B a5a03d04135e3e32354d298386f132f9aa3b5c3806186f0c1eb75138038001d07f3bb5a3c6f8f938c9bba7c84b97b06b5304be3c9f86255d2d00f46a134ccd3e SHA512 06be2f7a2d289136740cc7b9ef9c4addbbf85210312759a7c99f977aa52285e2c3e4e3dade82d454a266ae42aaeeda7e767140b0bcdc1208ecc86aa18afc1384
 DIST wasm-bindgen-0.2.95.crate 43894 BLAKE2B f14fa63110c62d3bd51c947f31ee96b11812fa60d6adb9cf1907f99c011bd43ab8e14b437fe8b6357cde37124769080b3bd20a2a947fafe3bfd6cccdb875b5a2 SHA512 5a303a6e9bc71030371d6a60a04064b148423d89b6d5de4232b24ff5205175c5236812209eccfc60d8f82a876d3b745ae76ebcb30811eaa6f39701c9a84e1251
+DIST wasm-bindgen-0.2.99.crate 46136 BLAKE2B 04e69294da3dc4feff9001185bcc5b864d1f14a1ead6b9a31c830b2043dde191f9f7c65755d607365a3b8885bd340bbd266e26cfa74c48464933c8d7a1164f94 SHA512 184aec11998b99a730ea5b63d6141260cd0b7cdc29b02696f533b3e75ec79f7c17c6aac892e7a7b24036c6e73592d01df638ca31b54bda11d3bdbf857b1489c2
 DIST wasm-bindgen-backend-0.2.95.crate 30487 BLAKE2B f199e3392e964c4b0e6a7b2e3ccbbdc458973b4aae4193ce36ee0ac18d595230be9ea6708caa439d70aa92a7b924f51928059984f560e5dad20d41eaf06616dd SHA512 1bea648ca248cf13383b297917a5c315da9e4830a8c49cd3ba23392566725cceae818b4e7e60ad85360c9073c2e557fa36452a2cbc8e05b60318feda7404026e
+DIST wasm-bindgen-backend-0.2.99.crate 30928 BLAKE2B ecfa94a461df79a33fd2bb9807374a2a0c7ac370b443e5a1103ba73a29c9d337ed3feb427c80571ccc15599f81135987742e698199528a9c1bb570baef3e9d09 SHA512 8369a5e618223f09fff7cdc35662a930b3eb11024af51bf5fb9e70c45dfa22452a518d723f3d912c0c970fc4bf748ef2d83d48756483174993f7d04c92d9621f
 DIST wasm-bindgen-futures-0.4.45.crate 14329 BLAKE2B 511a9e29bf54a31acca2e74b1f654d9a85653567afd61ac7aca2c2d9a4ce833d85213345fccf5e58b788edb61a31b66192b9d69a432e7cb5e074497acbd1ee56 SHA512 1b8a99085ab274bb50e5c57625f826c8ca2f0795472c12c0db0d4c890043825df048e360997f8201a68e1ddc53f52e139acd29552e60e85213e87846946914c7
+DIST wasm-bindgen-futures-0.4.49.crate 14838 BLAKE2B a549a84dae70f480e387e01b4366994404370ae8f0989146d8548106267884096442d2fd6bca0a8cd22e21a3eff6b16aca1edcbc23c73af757a043311aa49081 SHA512 e141d6a97d2bbd6c54bc23d4857124d6e43ca1ab51c37e867287d771fcc0d8b7a2488acc56d46202c2e9b2380684ebeed688e7322175dae67475b77fb307ebda
 DIST wasm-bindgen-macro-0.2.95.crate 6938 BLAKE2B 672509ff595fae86492dad98a4480f28d74a51fc8156ce7f96928b148f3af7f0f45ca9560b72148c6ad2d45ddfbbf3dbe39e2c94603ef92a925ac5503d939d2f SHA512 1f52188932e20145cb23d527a733fb5fe211813826c6b5ec04277e376127b700aea181efa5f60e34d120f10652066fbdf001952024017cccc7af728a3c8e41d9
+DIST wasm-bindgen-macro-0.2.99.crate 7011 BLAKE2B 07182a9fb98f519d1e5c934e609d7a42cf2409319f59dd901e2a5bec77972b4d16fc6f67cf40ade58af874b05faa981c894443d3950616e2aad117ac7355ac6f SHA512 344bf5192e43582246efad257c600003c41b589234c1900f6ed201f96b6f7665eb55226da15d612060042f89c6214e452489cf3aabc61645843be9c27f9cca0b
 DIST wasm-bindgen-macro-support-0.2.95.crate 21331 BLAKE2B a1f71b727736b7166af5a9ad739da33f07ac3d7a190a27621f8a9821530f9bed78a6c437d194f9609bef91ebea0ed9ce1738eea0a9800344b8af9ce7df868da0 SHA512 f45d78831c37401a417c837281d1705b84eae5db430630a9caf544ce5d92f1ddd945baa3bccf26f4c58170e3cbea035174d8b60f906d2757b152e1d090baea58
+DIST wasm-bindgen-macro-support-0.2.99.crate 22800 BLAKE2B 9772cc94a64f768eecae12072e6d700bf95fded306297b84e235f3450f7c5630cb1985def3eaef05aee193c693f92c6fa61d7a6ca18e84a2b73aa38f070d47e7 SHA512 936ab8211a13fbe8b8f21a870a78c03e24219d0872731561353cfcae245e9f632246f179b67f2b13e106c799e68c5c39f9e388370a8ad3f93f299c4804f5907e
 DIST wasm-bindgen-shared-0.2.95.crate 7649 BLAKE2B c18f531c6094b49af3b2beea93914d16b0054a707011890f9054f4cb313ed6b433e3f73c7b42accbd1fa59d1f14c2db5ab0f0a82cde107b9cf437fad8b4cd7bd SHA512 3ce689a4c845765bd6e1f84b94948df3ef84560d98d830a15c1932a2ab1942ec91465db65cbf14a045526cf003218aa5c3209dd06e8ee8a39815757f56356099
+DIST wasm-bindgen-shared-0.2.99.crate 7773 BLAKE2B 73489af59d16f4d0a1ea51b535cd02d2759b5b7b07873d8a71fa6bd6b6ce1cfc6e8139e6a79346abec13665ed9aeadd0b5b6aed28ae008f9dcb3d5da9fce665a SHA512 8da0f107be99b6666cf1859d68ac0a7295fc03e7b494fce1df9dbe57d21807de8e2bc95f5b974562303923ca4646f38c5297588ad7c97bd59ef236218b2a64f9
 DIST wasm-streams-0.4.2.crate 36773 BLAKE2B 601f8bc4bf872943de47903de57c9e833afa2500d7e30205046ee02a8a2a8d6486b546117009e81f399f9ece69de89145fff85557ae87d37f989095bbe2046c0 SHA512 f93693b41220e819c4efce0fe756633f1aaffbb57b8a9c028031a6b02a7a221ff4d5bacf162a0b301b55794745ad1f4c97a7bbd46ac396e1518689c0639ecd65
 DIST web-sys-0.3.72.crate 629190 BLAKE2B e8cbf0bf36a1de4b0507c4a57724083f8a7f6332a138455de5ae1090e757872b217e2d2f6d0cb345088cfb4cd5ccf49360919838a299a74aebd0afe4dc688462 SHA512 997b27fdfd0291079f3f16999499404968a9d079ccf326d8eb17dc0f89a87cfe52f6fa780654612c769cb24dffd61baac22c5965b9feaa9c1f0624c203d2d039
+DIST web-sys-0.3.76.crate 635842 BLAKE2B ecd166e739e4ae4ebccc51fe0d429723ed7e4209bc9bd4658b5447486d7d58d8f2d2a6186e433e8ff11e7b52fe159d842a28de6251d61cd5f5876a92a7d945fe SHA512 370fb49edffd9ce125f77a9451389dd23ab5b70fd49263248d5794310ed757c28839a29436111df2fe6369ae8d6af56a64ac59af5258743cccfd9d18cd07dbd1
 DIST web-time-1.1.0.crate 18026 BLAKE2B cd72e384aca90c79e587448160587531c417f31a32e9ded23e6b78d492d0e517520170fd03177f28870c313b9302b28c32069a2408acccc076a1e4939a2c8f8d SHA512 73e4ef9851de089fde9381a595cb9e37a434f563f1fd350e345f2617b701caf57a9aef739b922b5b10cda131cdf2fd0af42c55603f8973a623a8b6ae70f6cc9f
 DIST webpki-0.22.4.crate 63472 BLAKE2B 35862693d6e10574490f516dd8683cb5b167bca9ac06a72ca0b1ab2007b055cc14db9c6f92ebc872394775d769d38290b8c592833ae9778e5070e115caace504 SHA512 b1bb203a5a36c01259840d9f32c729e736b25baebfa4de66ccdb9c38f164857e701fb597a91e18537ab1c31a6b29cd3d0cd8f45658cec87e55dd27c1c582a637
 DIST webpki-roots-0.25.4.crate 253559 BLAKE2B 737f608323fec02b77c47a40f8b2f9bf44f1b29d32b936fd7bd8c1066efd8916451b96ffab8949f5b5ba537bb1ed6300143bf51d1ef8663ce5a9a7a33947e81d SHA512 4891aa5c6a5bb8a4d6bd730fca5ab5bbddb5a39b9267c81951ca8d3ff0dbcd305b498328f99b2da79ac65cdc9dfa42c40631a4f8d6975ac6f4ed9c85a8d2178e
@@ -711,7 +806,9 @@ DIST x25519-dalek-2.0.1.crate 87820 BLAKE2B 039749d0278d95996016260f9e32162b3705
 DIST x509-parser-0.15.1.crate 91123 BLAKE2B 2ceb4174704978413e07b63e15e1b0b28662da2a3623abd5d439657e1c3a310e30dc25855d3c9366b8fc6cb81640e0c7e7a289c06a104d1ed8b62f4f7ca390a3 SHA512 43d5f9c7a76627bc73b045cabb26682e37b3b92e5570e467d508c5aaaabb1eb278043e195fac5c3a2b04d7b2403e49e47b731889ec15915fff3203217138845d
 DIST x509-parser-0.16.0.crate 92925 BLAKE2B 4224f1a058c7f6bf062f83159951fa65513d7d761fde54426e8451968be83516465ae86bf39b2321997d5cf2a512b671717e03c933bf61bc15d6634fb663364b SHA512 fb113c78eb5231d47af2e0884109d6406f4a19369500d582a075b50ec347e8cd9a085a28aafb50ae5699026f5220945c61c879c4dd3c484c4cbccdc46dd65378
 DIST xml-rs-0.8.23.crate 54730 BLAKE2B f97afd340475ecf6ae5068f619814192de562f9461c9b8dd38d4914639e3582a5ade19ca6c1f7456b47b1f76962087786fe7ae8dd1b9599b762343b007c3e0cd SHA512 b6aad2ba2eac7c9eac2f2b07656ec39498d12a54afda4abbb40bac70d413dd96df604fa26e46cb4e7ec218ef6ba08c1acfe797ca7d7653d5ef8d301b02595737
+DIST xml-rs-0.8.24.crate 54815 BLAKE2B 69be4f30c761ec573b03c657171d351ffaeca86e20de579460f9e3c5bf3a5905d3d71c48979e7c3f5e74c234f3db88f050aca849b97526d15e910f2a8b77c1f7 SHA512 7249a8702c9ef7c7775a69634e9be0909a8e1c9665e9c0473d97294a211e4c924af3db6a04d9198c96505f01b962fd577a25cfe089704757b922ed5a0ca71005
 DIST xxhash-rust-0.8.12.crate 21329 BLAKE2B e9596bb83cd0f0465c279deecaf4dd87aac05db1c8c7d3aed4f0689022c5a0522d976379fb3dcf6cfe1c18452c87890e95f3d17998c777d92f5cbe58119a20a9 SHA512 6fd17ec65be94b58f109b6aa9bb283e51092621e8af624f8c2c2c95558a3d0461d743cb8a65a0da5853ff7fd98273daec0dcc5b632440868524f99894beeff3d
+DIST xxhash-rust-0.8.14.crate 21880 BLAKE2B 5fba4ff81e595472cf9fb876983828e11c0e569ec172766b38d76e63dead61dccbaee28fd2fee4563646b44271215e852d7e7ff7ba0115bec6a258f5fd99452b SHA512 e56dc8eb0cd80da0f4aa66da3930f2814eba5f2f7b9f026b6e2926ad0237e48e69f80b47836c225d941e3b1b6112e5cfc32b5e40c48c977a683bc698b43c0adf
 DIST yasna-0.5.2.crate 34859 BLAKE2B 622852d441bae19ac2445d616cab5a0dd2b59926ced62b66c84d4804a0ba25d411fb9c2fef3bc86b0336e73dc060678ac58e41245f99d3412fe8bad28d131847 SHA512 7532b6d06b34b0a5e2b769c5d2647f910bec481d98482bf9cea212f1bd1466336d7cb117d0c2e240e7673b2825f1d091619f79814bad836d25cf3a6ca2be63e5
 DIST yoke-0.7.5.crate 29673 BLAKE2B cd2e42103140e080a29bf579fe5176b36a192f9b1309c1f2fd7557fe93b2f6eadbf6fca4a6a3b1a7b6288403d2f643841dfc7a5b6a4476776943950abe5c1613 SHA512 6bbd99671d1a5a5217890eaa267113d193b3636b265393afb6e72a313f01704d462fe017264f061405e8e84c188b590094c29e3fcf19a63c375ae165d1a0bbef
 DIST yoke-derive-0.7.5.crate 7525 BLAKE2B 9b6b97eaf3c50f0f5ce8cebf685a1a17d4c21eb9b26d38eac99e0a4c0f9d592e95a7843b7a0b897945a14c4eb78ffdf2c0972b448d31d7bc7b077f27aad81d9a SHA512 e30b06b020aa283080905004295fb643c539b130d0d53bda51927b95e79ba562336aad30d8a6202d9a0c62d5b64559a01218c6f02f3faada6003d4b03c205cd6
@@ -724,6 +821,7 @@ DIST zeroize_derive-1.4.2.crate 11141 BLAKE2B a40add656369a3a40d5b5f3397a77a1e9f
 DIST zerovec-0.10.4.crate 126398 BLAKE2B b078784d6f178bbb9de1c3c1b6c7ef996f00bdd7dfd2924bda921e62f3e09e953fbf50f8d0da99ac6ff6d134f146253846f5663549dcf8df08eaf34b9d4016b3 SHA512 db12bba1d7476ddead92e6dfcdcc30e2e0defff4f263a740244eabee265a2cab265473a663d3dc3210f48e113b66d951da496dfab7965ce1bc792e5f2db422a0
 DIST zerovec-derive-0.10.3.crate 19438 BLAKE2B 9f7df8a4e4a0b62ab25aed967b26509db4bcc5d5b10b3bd73305099a4c49a60be8921484ced1a34d9b7ae30ffa5abe789686f432416a8f1cfc07de1db1dff594 SHA512 caefbffeb35265db9f74933bf07109d57f0da48156cafd4f330af78a5c7eb9ab0831a80789ad4fb119875ebc6cfd7e3de68c9984b77dca5151f9be41f1ae6e09
 DIST zip-2.2.1.crate 107205 BLAKE2B 7685d4cf3d8d644a4f6f395f9c0a6be1db8d0b3a6d30ca9edcb7663b66587f29293741b4cf4352690798727806978bc30eee1a432d83cb054d209088ce1d0bbb SHA512 2e38cfa4298fac678f3654c5c23c9807630778e4a95a294c3b936d9222638c95f189e829c363f0a7f873afd84f9cae37858e9eb7547d4985070f01a2e0e3940a
+DIST zip-2.2.2.crate 108809 BLAKE2B e6d7792b70ab397ef340d37167266b87538d2e0ad422d02b053f6b492c8ed13535ea18d5d4077350286b3c2f79623a01ec89544f6334eddd07c87b0d443f19ae SHA512 0255079792b786a55dd18587daf178456f2b79f83d767ba42504f8b7163eebc152c02500097edd78bb37916444c9ad9905779367c6d743489502468258f1706e
 DIST zopfli-0.8.1.crate 50972 BLAKE2B 27cde48858dc65ec8082d4e0d81e2758f92d3dcc7a1c1f08aa6448e99f2995a865ac3259353b26e787f108c2f88ce3c7610413ea9d3daae6f864900d74565de6 SHA512 799e25c0cc9f0bf2119a7c03225b11ed94e7c3ac83f872a27da8ae15c90206245121c38f5e2b78fece131f5bb428f01fabbfd1b1e18ea456957940042d38f38d
 DIST zstd-0.13.2.crate 30251 BLAKE2B 7a13a094791b13b9215cce3aae5f99b86dc76ff271324a67170747f56b97df514762a0c097e6376752d2a5b35f9ef03d76e0c362e34e15ca02fa3644cc933131 SHA512 9cc3584f74da6da6920b74a7125b4eee9133ae00776aff3c77404fb438e05831f654fce46f7ebab442b04f20f84c11ca58f7ebfe7ff506833c38e919ee3f8572
 DIST zstd-safe-7.2.1.crate 21122 BLAKE2B 49df1ae857449393e6a09293b8963702fecb375622a5cda96d51c3ae96b67044aa40dbc043b96a16ea3b66dac47287dc58007a825c025c3d9b7aac31b441ab9a SHA512 95d0a1d4bb307f64de40f4bad5b400e5a592c901e133a88d8344c46ba3dd51465a8284fa2e3aca74f531c21e7bc3eead112f3797abaea7e439e3f407401b947b
diff --git a/net-mail/stalwart-mail/stalwart-mail-0.11.1.ebuild b/net-mail/stalwart-mail/stalwart-mail-0.11.1.ebuild
new file mode 100644
index 000000000000..c71377e29566
--- /dev/null
+++ b/net-mail/stalwart-mail/stalwart-mail-0.11.1.ebuild
@@ -0,0 +1,812 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.4
+
+EAPI=8
+
+CRATES="
+	RustyXML@0.3.0
+	addr2line@0.24.2
+	adler2@2.0.0
+	adler32@1.2.0
+	aead@0.5.2
+	aes-gcm-siv@0.11.1
+	aes-gcm@0.10.3
+	aes@0.8.4
+	ahash@0.7.8
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	allocator-api2@0.2.21
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anstream@0.6.18
+	anstyle-parse@0.2.6
+	anstyle-query@1.1.2
+	anstyle-wincon@3.0.6
+	anstyle@1.0.10
+	anyhow@1.0.95
+	arbitrary@1.4.1
+	arc-swap@1.7.1
+	argon2@0.5.3
+	arrayref@0.3.9
+	arrayvec@0.7.6
+	ascii-canvas@3.0.0
+	asn1-rs-derive@0.4.0
+	asn1-rs-derive@0.5.1
+	asn1-rs-impl@0.1.0
+	asn1-rs-impl@0.2.0
+	asn1-rs@0.5.2
+	asn1-rs@0.6.2
+	async-channel@1.9.0
+	async-compression@0.4.18
+	async-lock@3.4.0
+	async-recursion@1.1.1
+	async-stream-impl@0.3.6
+	async-stream@0.3.6
+	async-trait@0.1.83
+	atomic-waker@1.1.2
+	attohttpc@0.28.2
+	autocfg@1.4.0
+	aws-creds@0.37.0
+	aws-region@0.25.5
+	axum-core@0.4.5
+	axum@0.7.9
+	azure_core@0.21.0
+	azure_storage@0.21.0
+	azure_storage_blobs@0.21.0
+	azure_svc_blobstorage@0.21.0
+	backtrace@0.3.74
+	base16ct@0.2.0
+	base32@0.4.0
+	base64@0.11.0
+	base64@0.13.1
+	base64@0.21.7
+	base64@0.22.1
+	base64ct@1.6.0
+	bigdecimal@0.4.7
+	bincode@1.3.3
+	bindgen@0.69.5
+	bindgen@0.70.1
+	bindgen@0.71.1
+	biscuit@0.7.0
+	bit-set@0.5.3
+	bit-set@0.8.0
+	bit-vec@0.6.3
+	bit-vec@0.8.0
+	bitflags@1.3.2
+	bitflags@2.6.0
+	bitpacking@0.9.2
+	bitvec-nom2@0.2.1
+	bitvec@1.0.1
+	blake2@0.10.6
+	blake3@1.5.5
+	block-buffer@0.10.4
+	block-buffer@0.9.0
+	block-padding@0.3.3
+	blowfish@0.7.0
+	blowfish@0.9.1
+	borsh-derive@1.5.3
+	borsh@1.5.3
+	btoi@0.4.3
+	buffered-reader@1.3.2
+	bumpalo@3.16.0
+	bytecheck@0.6.12
+	bytecheck_derive@0.6.12
+	bytemuck@1.21.0
+	byteorder@1.5.0
+	bytes@1.9.0
+	bzip2-sys@0.1.11+1.0.8
+	bzip2@0.4.4
+	camellia@0.1.0
+	cast5@0.11.1
+	cbc@0.1.2
+	cc@1.2.5
+	cedarwood@0.4.6
+	cexpr@0.6.0
+	cfb-mode@0.8.2
+	cfb@0.7.3
+	cfg-if@1.0.0
+	cfg_aliases@0.2.1
+	chrono@0.4.39
+	cipher@0.2.5
+	cipher@0.4.4
+	clang-sys@1.8.1
+	clap@4.5.23
+	clap_builder@4.5.23
+	clap_derive@4.5.18
+	clap_lex@0.7.4
+	cmac@0.7.2
+	cmake@0.1.52
+	colorchoice@1.0.3
+	combine@4.6.7
+	concurrent-queue@2.5.0
+	console@0.15.10
+	const-oid@0.9.6
+	const-random-macro@0.1.16
+	const-random@0.1.18
+	const_panic@0.2.11
+	constant_time_eq@0.2.6
+	constant_time_eq@0.3.1
+	core-foundation-sys@0.8.7
+	core-foundation@0.9.4
+	core2@0.4.0
+	cpufeatures@0.2.16
+	crc-catalog@2.4.0
+	crc16@0.4.0
+	crc32fast@1.4.2
+	crc@3.2.1
+	crossbeam-channel@0.5.14
+	crossbeam-deque@0.8.6
+	crossbeam-epoch@0.9.18
+	crossbeam-queue@0.3.12
+	crossbeam-utils@0.8.21
+	crossbeam@0.8.4
+	crunchy@0.2.2
+	crypto-bigint@0.5.5
+	crypto-common@0.1.6
+	crypto-mac@0.10.0
+	csv-core@0.1.11
+	csv@1.3.1
+	ctr@0.9.2
+	curve25519-dalek-derive@0.1.1
+	curve25519-dalek@4.1.3
+	darling@0.13.4
+	darling@0.20.10
+	darling_core@0.13.4
+	darling_core@0.20.10
+	darling_macro@0.13.4
+	darling_macro@0.20.10
+	dary_heap@0.3.7
+	dashmap@6.1.0
+	data-encoding@2.6.0
+	dbl@0.3.2
+	deadpool-postgres@0.14.1
+	deadpool-runtime@0.1.4
+	deadpool@0.10.0
+	deadpool@0.12.1
+	decancer@3.2.8
+	deflate64@0.1.9
+	der-parser@8.2.0
+	der-parser@9.0.0
+	der@0.7.9
+	deranged@0.3.11
+	derive_arbitrary@1.4.1
+	des@0.8.1
+	digest@0.10.7
+	digest@0.9.0
+	dirs-next@2.0.0
+	dirs-sys-next@0.1.2
+	displaydoc@0.2.5
+	dlv-list@0.5.2
+	dns-update@0.1.2
+	doc-comment@0.3.3
+	dsa@0.6.3
+	dyn-clone@1.0.17
+	eax@0.5.0
+	ecb@0.1.2
+	ecdsa@0.16.9
+	ece@2.3.1
+	ed25519-dalek@2.1.1
+	ed25519@2.2.3
+	either@1.13.0
+	elasticsearch@8.5.0-alpha.1
+	elliptic-curve@0.13.8
+	ena@0.14.3
+	encode_unicode@1.0.0
+	encoding_rs@0.8.35
+	endian-type@0.1.2
+	enum-as-inner@0.6.1
+	equivalent@1.0.1
+	event-listener-strategy@0.5.3
+	event-listener@2.5.3
+	event-listener@5.3.1
+	fallible-iterator@0.2.0
+	fallible-iterator@0.3.0
+	fallible-streaming-iterator@0.1.9
+	fancy-regex@0.14.0
+	farmhash@1.1.5
+	fast-float@0.2.0
+	fastrand@1.9.0
+	ff@0.13.0
+	fiat-crypto@0.2.9
+	fixedbitset@0.4.2
+	flate2@1.0.35
+	fnv@1.0.7
+	foldhash@0.1.4
+	foreign-types-shared@0.1.1
+	foreign-types@0.3.2
+	form-data@0.5.5
+	form_urlencoded@1.2.1
+	foundationdb-gen@0.9.1
+	foundationdb-macros@0.3.1
+	foundationdb-sys@0.9.1
+	foundationdb@0.9.1
+	frunk@0.4.3
+	frunk_core@0.4.3
+	frunk_derives@0.4.3
+	frunk_proc_macro_helpers@0.1.3
+	frunk_proc_macros@0.1.3
+	funty@2.0.0
+	futures-channel@0.3.31
+	futures-core@0.3.31
+	futures-executor@0.3.31
+	futures-io@0.3.31
+	futures-lite@1.13.0
+	futures-macro@0.3.31
+	futures-sink@0.3.31
+	futures-task@0.3.31
+	futures-util@0.3.31
+	futures@0.3.31
+	fxhash@0.2.1
+	generic-array@0.14.7
+	generic-array@1.1.1
+	gethostname@0.4.3
+	getrandom@0.1.16
+	getrandom@0.2.15
+	ghash@0.5.1
+	gimli@0.31.1
+	glob@0.3.1
+	group@0.13.0
+	h2@0.3.26
+	h2@0.4.7
+	hashbrown@0.12.3
+	hashbrown@0.14.5
+	hashbrown@0.15.2
+	hashlink@0.9.1
+	heck@0.4.1
+	heck@0.5.0
+	hermit-abi@0.3.9
+	hermit-abi@0.4.0
+	hex@0.4.3
+	hickory-client@0.24.2
+	hickory-proto@0.24.2
+	hickory-resolver@0.24.2
+	hkdf@0.12.4
+	hmac@0.10.1
+	hmac@0.12.1
+	home@0.5.11
+	hostname@0.3.1
+	hostname@0.4.0
+	http-body-util@0.1.2
+	http-body@0.4.6
+	http-body@1.0.1
+	http-types@2.12.0
+	http@0.2.12
+	http@1.2.0
+	httparse@1.9.5
+	httpdate@1.0.3
+	human-size@0.4.3
+	hyper-rustls@0.24.2
+	hyper-rustls@0.27.5
+	hyper-timeout@0.5.2
+	hyper-util@0.1.10
+	hyper@0.14.32
+	hyper@1.5.2
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.61
+	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
+	idea@0.5.1
+	ident_case@1.0.1
+	idna@1.0.3
+	idna_adapter@1.2.0
+	imagesize@0.13.0
+	include-flate-codegen@0.2.0
+	include-flate@0.3.0
+	indexmap@1.9.3
+	indexmap@2.7.0
+	indicatif@0.17.9
+	infer@0.16.0
+	infer@0.2.3
+	inout@0.1.3
+	instant@0.1.13
+	ipconfig@0.3.2
+	ipnet@2.10.1
+	is-terminal@0.4.13
+	is_terminal_polyfill@1.70.1
+	itertools@0.10.5
+	itertools@0.11.0
+	itertools@0.12.1
+	itertools@0.13.0
+	itoa@1.0.14
+	jemalloc-sys@0.5.4+5.3.0-patched
+	jemallocator@0.5.4
+	jieba-macros@0.7.1
+	jieba-rs@0.7.1
+	jmap-client@0.3.2
+	jobserver@0.1.32
+	js-sys@0.3.76
+	keyed_priority_queue@0.4.2
+	konst@0.3.15
+	konst_kernel@0.3.15
+	lalrpop-util@0.20.2
+	lalrpop@0.20.2
+	lazy_static@1.5.0
+	lazycell@1.3.0
+	lber@0.4.2
+	ldap3@0.11.5
+	libc@0.2.169
+	libflate@2.1.0
+	libflate_lz77@2.1.0
+	libloading@0.8.6
+	libm@0.2.11
+	libredox@0.1.3
+	librocksdb-sys@0.17.1+9.9.3
+	libsqlite3-sys@0.30.1
+	libz-sys@1.1.20
+	linked-hash-map@0.5.6
+	litemap@0.7.4
+	lock_api@0.4.12
+	lockfree-object-pool@0.1.6
+	log@0.4.22
+	lru-cache@0.1.2
+	lru@0.12.5
+	lz4-sys@1.11.1+lz4-1.10.0
+	lz4_flex@0.11.3
+	lzma-rs@0.3.0
+	mail-auth@0.6.0
+	mail-builder@0.3.2
+	mail-parser@0.9.4
+	mail-send@0.4.9
+	maplit@1.0.2
+	match_cfg@0.1.0
+	matchit@0.7.3
+	maybe-async@0.2.10
+	md-5@0.10.6
+	md-5@0.9.1
+	md5@0.7.0
+	memchr@2.7.4
+	memoffset@0.7.1
+	memory-stats@1.2.0
+	memsec@0.7.0
+	mime@0.3.17
+	mime_guess@2.0.5
+	minimal-lexical@0.2.1
+	miniz_oxide@0.8.2
+	mio@0.8.11
+	mysql-common-derive@0.31.2
+	mysql_async@0.34.1
+	mysql_common@0.32.4
+	new_debug_unreachable@1.0.6
+	nibble_vec@0.1.0
+	nix@0.26.4
+	nohash@0.2.0
+	nom@7.1.3
+	num-bigint-dig@0.8.4
+	num-bigint@0.4.6
+	num-conv@0.1.0
+	num-integer@0.1.46
+	num-iter@0.1.45
+	num-traits@0.2.19
+	num_cpus@1.16.0
+	number_prefix@0.4.0
+	object@0.36.7
+	oid-registry@0.6.1
+	oid-registry@0.7.1
+	once_cell@1.20.2
+	opaque-debug@0.3.1
+	openssl-macros@0.1.1
+	openssl-probe@0.1.5
+	openssl-sys@0.9.104
+	openssl@0.10.68
+	opentelemetry-http@0.25.0
+	opentelemetry-otlp@0.25.0
+	opentelemetry-proto@0.25.0
+	opentelemetry-semantic-conventions@0.25.0
+	opentelemetry@0.25.0
+	opentelemetry_sdk@0.25.0
+	ordered-multimap@0.7.3
+	p256@0.13.2
+	p384@0.13.0
+	p521@0.13.3
+	parking@2.2.1
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	password-hash@0.5.0
+	paste@1.0.15
+	pbkdf2@0.12.2
+	pem-rfc7468@0.7.0
+	pem@3.0.4
+	percent-encoding@2.3.1
+	petgraph@0.6.5
+	phf@0.11.2
+	phf_codegen@0.11.2
+	phf_generator@0.11.2
+	phf_macros@0.11.2
+	phf_shared@0.10.0
+	phf_shared@0.11.2
+	pin-project-internal@1.1.7
+	pin-project-lite@0.2.15
+	pin-project@1.1.7
+	pin-utils@0.1.0
+	pkcs1@0.7.5
+	pkcs8@0.10.2
+	pkg-config@0.3.31
+	polyval@0.6.2
+	portable-atomic@1.10.0
+	postgres-protocol@0.6.7
+	postgres-types@0.2.8
+	powerfmt@0.2.0
+	ppv-lite86@0.2.20
+	precomputed-hash@0.1.1
+	prettyplease@0.2.25
+	prettytable-rs@0.10.0
+	primeorder@0.13.6
+	privdrop@0.5.4
+	proc-macro-crate@3.2.0
+	proc-macro-error-attr2@2.0.0
+	proc-macro-error2@2.0.1
+	proc-macro2@1.0.92
+	prometheus@0.13.4
+	prost-derive@0.13.4
+	prost@0.13.4
+	proxy-header@0.1.2
+	psl-types@2.0.11
+	psl@2.1.73
+	ptr_meta@0.1.4
+	ptr_meta_derive@0.1.4
+	pwhash@1.0.0
+	quick-error@1.2.3
+	quick-xml@0.31.0
+	quick-xml@0.32.0
+	quick-xml@0.36.2
+	quick-xml@0.37.1
+	quick_cache@0.6.9
+	quinn-proto@0.11.9
+	quinn-udp@0.5.9
+	quinn@0.11.6
+	quote@1.0.38
+	r2d2@0.8.10
+	radium@0.7.0
+	radix_trie@0.2.1
+	rand@0.7.3
+	rand@0.8.5
+	rand_chacha@0.2.2
+	rand_chacha@0.3.1
+	rand_core@0.5.1
+	rand_core@0.6.4
+	rand_hc@0.2.0
+	rasn-cms@0.10.6
+	rasn-derive@0.10.6
+	rasn-pkix@0.10.6
+	rasn@0.10.6
+	rayon-core@1.12.1
+	rayon@1.10.0
+	rcgen@0.12.1
+	rcgen@0.13.2
+	redis@0.27.6
+	redox_syscall@0.5.8
+	redox_users@0.4.6
+	regex-automata@0.4.9
+	regex-syntax@0.8.5
+	regex@1.11.1
+	rend@0.4.2
+	reqwest@0.11.27
+	reqwest@0.12.9
+	resolv-conf@0.7.0
+	rev_lines@0.3.0
+	rfc6979@0.4.0
+	ring@0.16.20
+	ring@0.17.8
+	ripemd@0.1.3
+	rkyv@0.7.45
+	rkyv_derive@0.7.45
+	rle-decode-fast@1.0.3
+	roaring@0.10.9
+	rocksdb@0.23.0
+	rpassword@7.3.1
+	rsa@0.9.7
+	rtoolbox@0.0.2
+	rtrb@0.3.1
+	rusqlite@0.32.1
+	rust-ini@0.21.1
+	rust-s3@0.35.0-alpha.2
+	rust-stemmers@1.2.0
+	rust_decimal@1.36.0
+	rustc-demangle@0.1.24
+	rustc-hash@1.1.0
+	rustc-hash@2.1.0
+	rustc_version@0.2.3
+	rustc_version@0.4.1
+	rusticata-macros@4.1.0
+	rustls-native-certs@0.6.3
+	rustls-native-certs@0.7.3
+	rustls-pemfile@1.0.4
+	rustls-pemfile@2.2.0
+	rustls-pki-types@1.10.1
+	rustls-webpki@0.101.7
+	rustls-webpki@0.102.8
+	rustls@0.21.12
+	rustls@0.22.4
+	rustls@0.23.20
+	rustversion@1.0.18
+	ryu@1.0.18
+	salsa20@0.10.2
+	same-file@1.0.6
+	saturating@0.1.0
+	scc@2.2.6
+	schannel@0.1.27
+	scheduled-thread-pool@0.2.7
+	scopeguard@1.2.0
+	scrypt@0.11.0
+	sct@0.7.1
+	sdd@3.0.5
+	seahash@4.1.0
+	sec1@0.7.3
+	security-framework-sys@2.13.0
+	security-framework@2.11.1
+	semver-parser@0.7.0
+	semver@0.9.0
+	semver@1.0.24
+	sequoia-openpgp@1.22.0
+	serde@1.0.216
+	serde_bytes@0.11.15
+	serde_derive@1.0.216
+	serde_json@1.0.134
+	serde_qs@0.8.5
+	serde_urlencoded@0.7.1
+	serde_with@1.14.0
+	serde_with_macros@1.5.2
+	serial_test@3.2.0
+	serial_test_derive@3.2.0
+	sha-1@0.9.8
+	sha1@0.10.6
+	sha1_smol@1.0.1
+	sha1collisiondetection@0.3.4
+	sha2@0.10.8
+	sha2@0.9.9
+	shlex@1.3.0
+	sieve-rs@0.5.3
+	signal-hook-registry@1.4.2
+	signature@2.2.0
+	simd-adler32@0.3.7
+	simdutf8@0.1.5
+	siphasher@0.3.11
+	siphasher@1.0.1
+	slab@0.4.9
+	smallvec@1.13.2
+	smtp-proto@0.1.5
+	snafu-derive@0.7.5
+	snafu@0.7.5
+	socket2@0.5.8
+	spin@0.5.2
+	spin@0.9.8
+	spki@0.7.3
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	string_cache@0.8.7
+	stringprep@0.1.5
+	strsim@0.10.0
+	strsim@0.11.1
+	subprocess@0.2.9
+	subtle@2.6.1
+	syn@1.0.109
+	syn@2.0.91
+	sync_wrapper@0.1.2
+	sync_wrapper@1.0.2
+	synstructure@0.12.6
+	synstructure@0.13.1
+	system-configuration-sys@0.5.0
+	system-configuration@0.5.1
+	tap@1.0.1
+	term@0.7.0
+	termcolor@1.4.1
+	thiserror-impl@1.0.69
+	thiserror-impl@2.0.9
+	thiserror@1.0.69
+	thiserror@2.0.9
+	time-core@0.1.2
+	time-macros@0.2.19
+	time@0.3.37
+	tiny-keccak@2.0.2
+	tinystr@0.7.6
+	tinyvec@1.8.1
+	tinyvec_macros@0.1.1
+	tokio-macros@2.3.0
+	tokio-postgres@0.7.12
+	tokio-rustls@0.24.1
+	tokio-rustls@0.25.0
+	tokio-rustls@0.26.1
+	tokio-stream@0.1.17
+	tokio-tungstenite@0.21.0
+	tokio-tungstenite@0.24.0
+	tokio-util@0.7.13
+	tokio@1.38.1
+	toml_datetime@0.6.8
+	toml_edit@0.22.22
+	tonic@0.12.3
+	totp-rs@5.6.0
+	tower-layer@0.3.3
+	tower-service@0.3.3
+	tower@0.4.13
+	tower@0.5.2
+	tracing-attributes@0.1.28
+	tracing-core@0.1.33
+	tracing@0.1.41
+	trim-in-place@0.1.7
+	try-lock@0.2.5
+	try_map@0.3.1
+	tungstenite@0.21.0
+	tungstenite@0.24.0
+	twofish@0.7.1
+	twox-hash@1.6.3
+	typenum@1.17.0
+	typewit@1.11.0
+	typewit_proc_macros@1.8.1
+	unicase@2.8.1
+	unicode-bidi@0.3.18
+	unicode-ident@1.0.14
+	unicode-normalization@0.1.24
+	unicode-properties@0.1.3
+	unicode-script@0.5.7
+	unicode-security@0.1.2
+	unicode-width@0.1.14
+	unicode-width@0.2.0
+	unicode-xid@0.2.6
+	universal-hash@0.5.1
+	untrusted@0.7.1
+	untrusted@0.9.0
+	url@2.5.4
+	urlencoding@2.1.3
+	utf-8@0.7.6
+	utf16_iter@1.0.5
+	utf8_iter@1.0.4
+	utf8parse@0.2.2
+	uuid@1.11.0
+	vcpkg@0.2.15
+	version_check@0.9.5
+	void@1.0.2
+	waker-fn@1.2.0
+	walkdir@2.5.0
+	want@0.3.1
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasi@0.9.0+wasi-snapshot-preview1
+	wasite@0.1.0
+	wasm-bindgen-backend@0.2.99
+	wasm-bindgen-futures@0.4.49
+	wasm-bindgen-macro-support@0.2.99
+	wasm-bindgen-macro@0.2.99
+	wasm-bindgen-shared@0.2.99
+	wasm-bindgen@0.2.99
+	wasm-streams@0.4.2
+	web-sys@0.3.76
+	web-time@1.1.0
+	webpki-roots@0.25.4
+	webpki-roots@0.26.7
+	webpki@0.22.4
+	whatlang@0.16.4
+	whoami@1.5.2
+	widestring@1.1.0
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.9
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-core@0.52.0
+	windows-registry@0.2.0
+	windows-result@0.2.0
+	windows-strings@0.1.0
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-sys@0.59.0
+	windows-targets@0.48.5
+	windows-targets@0.52.6
+	windows@0.52.0
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.6
+	winnow@0.6.20
+	winreg@0.50.0
+	write16@1.0.0
+	writeable@0.5.5
+	wyz@0.5.1
+	x25519-dalek@2.0.1
+	x509-parser@0.15.1
+	x509-parser@0.16.0
+	xml-rs@0.8.24
+	xxhash-rust@0.8.14
+	yasna@0.5.2
+	yoke-derive@0.7.5
+	yoke@0.7.5
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+	zerofrom-derive@0.1.5
+	zerofrom@0.1.5
+	zeroize@1.8.1
+	zeroize_derive@1.4.2
+	zerovec-derive@0.10.3
+	zerovec@0.10.4
+	zip@2.2.2
+	zopfli@0.8.1
+	zstd-safe@7.2.1
+	zstd-sys@2.0.13+zstd.1.5.6
+	zstd@0.13.2
+"
+
+inherit cargo systemd
+
+DESCRIPTION="Stalwart Mail Server"
+HOMEPAGE="https://stalw.art"
+SRC_URI="https://github.com/stalwartlabs/mail-server/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+S="${WORKDIR}/mail-server-${PV}"
+
+LICENSE="|| ( AGPL-3 )"
+# Dependent crate licenses
+LICENSE+="
+	AGPL-3 Apache-2.0 BSD-2 BSD Boost-1.0 CC0-1.0 ISC LGPL-2+ MIT
+	MPL-2.0 Unicode-3.0 ZLIB
+"
+
+RDEPEND="acct-group/stalwart-mail
+		 acct-user/stalwart-mail"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sqlite postgres mysql +rocks"
+
+DOCS="resources/config README.md SECURITY.md UPGRADING.md CONTRIBUTING.md CHANGELOG.md"
+
+src_unpack() {
+	cargo_src_unpack
+	sed -i -e "s%__PATH__/etc/%/opt/stalwart-mail/etc/%g" "${S}"/resources/systemd/stalwart-mail.service || die
+	sed -i -e "s%__PATH__/bin/%/usr/bin/%g" "${S}"/resources/systemd/stalwart-mail.service || die
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usev sqlite)
+		$(usev postgres)
+		$(usev mysql)
+		$(usev rocks)
+	)
+	# TODO: consider "enterprise" USE flag, which requires a premium license
+	cargo_src_configure --no-default-features
+}
+
+src_compile() {
+	cargo_src_compile --bin stalwart-mail
+}
+
+src_install() {
+	cargo_src_install --path crates/main
+
+	keepdir /var/run/stalwart-mail
+	newinitd "${FILESDIR}"/stalwart-mail.initd stalwart-mail
+	systemd_dounit "${S}"/resources/systemd/stalwart-mail.service
+
+	einstalldocs
+}
+
+pkg_config() {
+	if [[ ! -d ${ROOT}/opt/stalwart-mail ]]; then
+		einfo "Initializing standard config in ${ROOT}/opt/stalwart-mail"
+		"${ROOT}"/usr/bin/stalwart-mail --init "${ROOT}"/opt/stalwart-mail
+	else
+		einfo "It appears you already have a config in stalwart-mail."
+		einfo "Please remove ${ROOT}/opt/stalwart-mail and run this again"
+		einfo "if you want to create a new clean standard config."
+	fi
+}
diff --git a/net-misc/clockspeed/clockspeed-0.62-r8.ebuild b/net-misc/clockspeed/clockspeed-0.62-r8.ebuild
deleted file mode 100644
index 29bf5a916bca..000000000000
--- a/net-misc/clockspeed/clockspeed-0.62-r8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Simple Network Time Protocol (NTP) client"
-HOMEPAGE="https://cr.yp.to/clockspeed.html"
-
-# this is the trailing part of the name for the latest leapseconds file.
-LEAPSECONDS_DATE="20081114"
-
-SRC_URI="https://cr.yp.to/clockspeed/${P}.tar.gz
-	https://dev.gentoo.org/~pacho/maintainer-needed/leapsecs.dat."$LEAPSECONDS_DATE""
-
-# http://cr.yp.to/distributors.html
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="static selinux"
-RESTRICT="mirror bindist test"
-
-DEPEND="sys-apps/groff"
-RDEPEND="net-dns/djbdns"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
-	echo "$(tc-getCC) ${CFLAGS} ${ASFLAGS}" > conf-cc || die
-	use static && append-ldflags -static
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-}
-
-src_install() {
-	dobin clockspeed clockadd clockview sntpclock taiclock taiclockd
-	dosbin "${FILESDIR}"/ntpclockset
-
-	doman *.1
-	dodoc BLURB CHANGES INSTALL README THANKS TODO
-
-	insinto /var/lib/clockspeed
-	newins "${DISTDIR}"/leapsecs.dat."$LEAPSECONDS_DATE" leapsecs.dat
-}
diff --git a/net-misc/clockspeed/clockspeed-0.62-r9.ebuild b/net-misc/clockspeed/clockspeed-0.62-r9.ebuild
index a605c46179f5..ff6856a5012e 100644
--- a/net-misc/clockspeed/clockspeed-0.62-r9.ebuild
+++ b/net-misc/clockspeed/clockspeed-0.62-r9.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
@@ -19,7 +19,7 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~mips x86"
 IUSE="static selinux"
-RESTRICT="mirror bindist test"
+RESTRICT="test"
 
 DEPEND="sys-apps/groff"
 RDEPEND="net-dns/djbdns"
diff --git a/net-misc/curl/curl-8.10.1-r1.ebuild b/net-misc/curl/curl-8.10.1-r1.ebuild
deleted file mode 100644
index 15453a09b464..000000000000
--- a/net-misc/curl/curl-8.10.1-r1.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainers should subscribe to the 'curl-distros' ML for backports etc
-# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/
-# https://lists.haxx.se/listinfo/curl-distros
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
-inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.se/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/curl/curl.git"
-else
-	SRC_URI="
-		https://curl.se/download/${P}.tar.xz
-		verify-sig? ( https://curl.se/download/${P}.tar.xz.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"
-fi
-
-LICENSE="BSD curl ISC test? ( BSD-4 )"
-SLOT="0"
-IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 idn +imap kerberos ldap mbedtls +openssl +pop3"
-IUSE+=" +psl +progress-meter +quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp +websockets zstd"
-# These select the default tls implementation / which quic impl to use
-IUSE+=" +curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
-RESTRICT="!test? ( test )"
-
-# Only one default ssl / quic provider can be enabled
-# The default provider needs its USE satisfied
-# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL offers any benefit at all in the modern day.
-# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e
-REQUIRED_USE="
-	quic? (
-		^^ (
-			curl_quic_openssl
-			curl_quic_ngtcp2
-		)
-		http3
-		ssl
-	)
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_mbedtls
-			curl_ssl_openssl
-			curl_ssl_rustls
-		)
-	)
-	curl_quic_openssl? (
-		curl_ssl_openssl
-		quic
-		!gnutls
-		!mbedtls
-		!rustls
-	)
-	curl_quic_ngtcp2? (
-		curl_ssl_gnutls
-		quic
-		!mbedtls
-		!openssl
-		!rustls
-	)
-	curl_ssl_gnutls? ( gnutls )
-	curl_ssl_mbedtls? ( mbedtls )
-	curl_ssl_openssl? ( openssl )
-	curl_ssl_rustls? ( rustls )
-	http3? ( alt-svc quic )
-"
-
-# cURL's docs and CI/CD are great resources for confirming supported versions
-# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
-# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions)
-# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly)
-# - https://github.com/curl/curl/blob/master/.github/workflows/http3-linux.yml (CI/CD for TCP/2)
-# However 'supported' vs 'works' are two entirely different things; be sane but
-# don't be afraid to require a later version.
-# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time.
-RDEPEND="
-	>=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
-	adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] )
-	http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
-	psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
-	quic? (
-		curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] )
-		curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] )
-	)
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls? (
-			app-misc/ca-certificates
-			>=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:=[${MULTILIB_USEDEP}]
-		)
-		mbedtls? (
-			app-misc/ca-certificates
-			net-libs/mbedtls:=[${MULTILIB_USEDEP}]
-		)
-		openssl? (
-			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
-		)
-		rustls? (
-			>=net-libs/rustls-ffi-0.14.0:=[${MULTILIB_USEDEP}]
-		)
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
-		http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
-	)
-	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
-"
-
-DOCS=( README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__builtin_available
-	closesocket
-	CloseSocket
-	getpass_r
-	ioctlsocket
-	IoctlSocket
-	mach_absolute_time
-	setmode
-	_fseeki64
-	# custom AC_LINK_IFELSE code fails to link even without -Werror
-	OSSL_QUIC_client_method
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-prefix-2.patch
-	"${FILESDIR}"/${PN}-respect-cflags-3.patch
-)
-
-src_prepare() {
-	default
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl; then
-		myconf+=( --without-gnutls --without-mbedtls --without-rustls )
-
-		if use gnutls; then
-			multilib_is_native_abi && einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls )
-		fi
-		if use mbedtls; then
-			multilib_is_native_abi && einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		fi
-		if use openssl; then
-			multilib_is_native_abi && einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-		if use rustls; then
-			multilib_is_native_abi && einfo "SSL provided by rustls"
-			myconf+=( --with-rustls )
-		fi
-		if use curl_ssl_gnutls; then
-			multilib_is_native_abi && einfo "Default SSL provided by gnutls"
-			myconf+=( --with-default-ssl-backend=gnutls )
-		elif use curl_ssl_mbedtls; then
-			multilib_is_native_abi && einfo "Default SSL provided by mbedtls"
-			myconf+=( --with-default-ssl-backend=mbedtls )
-		elif use curl_ssl_openssl; then
-			multilib_is_native_abi && einfo "Default SSL provided by openssl"
-			myconf+=( --with-default-ssl-backend=openssl )
-		elif use curl_ssl_rustls; then
-			multilib_is_native_abi && einfo "Default SSL provided by rustls"
-			myconf+=( --with-default-ssl-backend=rustls )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-			die "Please file a bug, hit impossible condition w/ USE=ssl handling."
-		fi
-
-	else
-		myconf+=( --without-ssl )
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
-	myconf+=(
-		$(use_enable alt-svc)
-		--enable-basic-auth
-		--enable-bearer-auth
-		--enable-digest-auth
-		--enable-kerberos-auth
-		--enable-negotiate-auth
-		--enable-aws
-		--enable-dict
-		--disable-ech
-		--enable-file
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable hsts)
-		--enable-http
-		$(use_enable imap)
-		$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		--enable-ntlm
-		$(use_enable pop3)
-		--enable-rt
-		--enable-rtsp
-		$(use_enable samba smb)
-		$(use_with ssh libssh2)
-		$(use_enable smtp)
-		$(use_enable telnet)
-		$(use_enable tftp)
-		--enable-tls-srp
-		$(use_enable adns ares)
-		--enable-cookies
-		--enable-dateparse
-		--enable-dnsshuffle
-		--enable-doh
-		--enable-symbol-hiding
-		--enable-http-auth
-		--enable-ipv6
-		--enable-largefile
-		--enable-manual
-		--enable-mime
-		--enable-netrc
-		$(use_enable progress-meter)
-		--enable-proxy
-		--enable-socketpair
-		--disable-sspi
-		$(use_enable static-libs static)
-		--enable-pthreads
-		--enable-threaded-resolver
-		--disable-versioned-symbols
-		--without-amissl
-		--without-bearssl
-		$(use_with brotli)
-		--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
-		$(use_with http2 nghttp2)
-		--without-hyper
-		$(use_with idn libidn2)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		--without-libgsasl
-		$(use_with psl libpsl)
-		--without-msh3
-		$(use_with http3 nghttp3)
-		$(use_with curl_quic_ngtcp2 ngtcp2)
-		$(use_with curl_quic_openssl openssl-quic)
-		--without-quiche
-		$(use_with rtmp librtmp)
-		--without-schannel
-		--without-secure-transport
-		--without-test-caddy
-		--without-test-httpd
-		--without-test-nghttpx
-		$(use_enable websockets)
-		--without-winidn
-		--without-wolfssl
-		--with-zlib
-		$(use_with zstd)
-		--with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
-	)
-
-	if use debug; then
-		myconf+=(
-			--enable-debug
-		)
-	fi
-
-	if use test && multilib_is_native_abi && ( use http2 || use http3 ); then
-		myconf+=(
-			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
-		)
-	fi
-
-	if [[ ${CHOST} == *mingw* ]] ; then
-		myconf+=(
-			--disable-pthreads
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# Avoid building the client (we just want libcurl for multilib)
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi; then
-		# Shell completions
-		! tc-is-cross-compiler && emake -C scripts
-	fi
-}
-
-# There is also a pytest harness that tests for bugs in some very specific
-# situations; we can rely on upstream for this rather than adding additional test deps.
-multilib_src_test() {
-	# See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
-	# -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
-	# -v: verbose
-	# -a: keep going on failure (so we see everything that breaks, not just 1st test)
-	# -k: keep test files after completion
-	# -am: automake style TAP output
-	# -p: print logs if test fails
-	# Note: if needed, we can skip specific tests. See e.g. Fedora's packaging
-	# or just read https://github.com/curl/curl/tree/master/tests#run.
-	# Note: we don't run the testsuite for cross-compilation.
-	# Upstream recommend 7*nproc as a starting point for parallel tests, but
-	# this ends up breaking when nproc is huge (like -j80).
-	# The network sandbox causes tests 241 and 1083 to fail; these are typically skipped
-	# as most gentoo users don't have an 'ip6-localhost'
-	multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi; then
-		# Shell completions
-		! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm -rf "${ED}"/etc/ || die
-}
-
-pkg_postinst() {
-	if use debug; then
-		ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose."
-		ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger."
-		ewarn "hic sunt dracones; you have been warned."
-	fi
-}
diff --git a/net-misc/curl/curl-8.10.1-r2.ebuild b/net-misc/curl/curl-8.10.1-r2.ebuild
new file mode 100644
index 000000000000..fefabb8b133a
--- /dev/null
+++ b/net-misc/curl/curl-8.10.1-r2.ebuild
@@ -0,0 +1,383 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should subscribe to the 'curl-distros' ML for backports etc
+# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/
+# https://lists.haxx.se/listinfo/curl-distros
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
+inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.se/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/curl/curl.git"
+else
+	SRC_URI="
+		https://curl.se/download/${P}.tar.xz
+		verify-sig? ( https://curl.se/download/${P}.tar.xz.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"
+fi
+
+LICENSE="BSD curl ISC test? ( BSD-4 )"
+SLOT="0"
+IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 idn +imap kerberos ldap mbedtls +openssl +pop3"
+IUSE+=" +psl +progress-meter +quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp +websockets zstd"
+# These select the default tls implementation / which quic impl to use
+IUSE+=" +curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
+RESTRICT="!test? ( test )"
+
+# Only one default ssl / quic provider can be enabled
+# The default provider needs its USE satisfied
+# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL offers any benefit at all in the modern day.
+# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e
+REQUIRED_USE="
+	quic? (
+		^^ (
+			curl_quic_openssl
+			curl_quic_ngtcp2
+		)
+		http3
+		ssl
+	)
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_mbedtls
+			curl_ssl_openssl
+			curl_ssl_rustls
+		)
+	)
+	curl_quic_openssl? (
+		curl_ssl_openssl
+		quic
+		!gnutls
+		!mbedtls
+		!rustls
+	)
+	curl_quic_ngtcp2? (
+		curl_ssl_gnutls
+		quic
+		!mbedtls
+		!openssl
+		!rustls
+	)
+	curl_ssl_gnutls? ( gnutls )
+	curl_ssl_mbedtls? ( mbedtls )
+	curl_ssl_openssl? ( openssl )
+	curl_ssl_rustls? ( rustls )
+	http3? ( alt-svc quic )
+"
+
+# cURL's docs and CI/CD are great resources for confirming supported versions
+# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
+# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions)
+# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly)
+# - https://github.com/curl/curl/blob/master/.github/workflows/http3-linux.yml (CI/CD for TCP/2)
+# However 'supported' vs 'works' are two entirely different things; be sane but
+# don't be afraid to require a later version.
+# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time.
+RDEPEND="
+	>=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
+	adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] )
+	http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
+	psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
+	quic? (
+		curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] )
+		curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] )
+	)
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			app-misc/ca-certificates
+			>=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:=[${MULTILIB_USEDEP}]
+		)
+		mbedtls? (
+			app-misc/ca-certificates
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+		)
+		openssl? (
+			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+		)
+		rustls? (
+			>=net-libs/rustls-ffi-0.14.0:=[${MULTILIB_USEDEP}]
+		)
+	)
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
+		http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
+	)
+	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
+"
+
+DOCS=( README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__builtin_available
+	closesocket
+	CloseSocket
+	getpass_r
+	ioctlsocket
+	IoctlSocket
+	mach_absolute_time
+	setmode
+	_fseeki64
+	# custom AC_LINK_IFELSE code fails to link even without -Werror
+	OSSL_QUIC_client_method
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-prefix-2.patch
+	"${FILESDIR}"/${PN}-respect-cflags-3.patch
+)
+
+src_prepare() {
+	default
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl; then
+		myconf+=( --without-gnutls --without-mbedtls --without-rustls )
+
+		if use gnutls; then
+			multilib_is_native_abi && einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls )
+		fi
+		if use mbedtls; then
+			multilib_is_native_abi && einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		fi
+		if use openssl; then
+			multilib_is_native_abi && einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+		if use rustls; then
+			multilib_is_native_abi && einfo "SSL provided by rustls"
+			myconf+=( --with-rustls )
+		fi
+		if use curl_ssl_gnutls; then
+			multilib_is_native_abi && einfo "Default SSL provided by gnutls"
+			myconf+=( --with-default-ssl-backend=gnutls )
+		elif use curl_ssl_mbedtls; then
+			multilib_is_native_abi && einfo "Default SSL provided by mbedtls"
+			myconf+=( --with-default-ssl-backend=mbedtls )
+		elif use curl_ssl_openssl; then
+			multilib_is_native_abi && einfo "Default SSL provided by openssl"
+			myconf+=( --with-default-ssl-backend=openssl )
+		elif use curl_ssl_rustls; then
+			multilib_is_native_abi && einfo "Default SSL provided by rustls"
+			myconf+=( --with-default-ssl-backend=rustls )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+			die "Please file a bug, hit impossible condition w/ USE=ssl handling."
+		fi
+
+	else
+		myconf+=( --without-ssl )
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	myconf+=(
+		$(use_enable alt-svc)
+		--enable-basic-auth
+		--enable-bearer-auth
+		--enable-digest-auth
+		--enable-kerberos-auth
+		--enable-negotiate-auth
+		--enable-aws
+		--enable-dict
+		--disable-ech
+		--enable-file
+		$(use_enable ftp)
+		$(use_enable gopher)
+		$(use_enable hsts)
+		--enable-http
+		$(use_enable imap)
+		$(use_enable ldap)
+		$(use_enable ldap ldaps)
+		--enable-ntlm
+		$(use_enable pop3)
+		--enable-rt
+		--enable-rtsp
+		$(use_enable samba smb)
+		$(use_with ssh libssh2)
+		$(use_enable smtp)
+		$(use_enable telnet)
+		$(use_enable tftp)
+		--enable-tls-srp
+		$(use_enable adns ares)
+		--enable-cookies
+		--enable-dateparse
+		--enable-dnsshuffle
+		--enable-doh
+		--enable-symbol-hiding
+		--enable-http-auth
+		--enable-ipv6
+		--enable-largefile
+		--enable-manual
+		--enable-mime
+		--enable-netrc
+		$(use_enable progress-meter)
+		--enable-proxy
+		--enable-socketpair
+		--disable-sspi
+		$(use_enable static-libs static)
+		--enable-pthreads
+		--enable-threaded-resolver
+		--disable-versioned-symbols
+		--without-amissl
+		--without-bearssl
+		$(use_with brotli)
+		--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
+		$(use_with http2 nghttp2)
+		--without-hyper
+		$(use_with idn libidn2)
+		$(use_with kerberos gssapi "${EPREFIX}"/usr)
+		--without-libgsasl
+		$(use_with psl libpsl)
+		--without-msh3
+		$(use_with http3 nghttp3)
+		$(use_with curl_quic_ngtcp2 ngtcp2)
+		$(use_with curl_quic_openssl openssl-quic)
+		--without-quiche
+		$(use_with rtmp librtmp)
+		--without-schannel
+		--without-secure-transport
+		--without-test-caddy
+		--without-test-httpd
+		--without-test-nghttpx
+		$(use_enable websockets)
+		--without-winidn
+		--without-wolfssl
+		--with-zlib
+		$(use_with zstd)
+		--with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
+	)
+
+	if use debug; then
+		myconf+=(
+			--enable-debug
+		)
+	fi
+
+	if use test && multilib_is_native_abi && ( use http2 || use http3 ); then
+		myconf+=(
+			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
+		)
+	fi
+
+	if [[ ${CHOST} == *mingw* ]] ; then
+		myconf+=(
+			--disable-pthreads
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# Avoid building the client (we just want libcurl for multilib)
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi; then
+		# Shell completions
+		! tc-is-cross-compiler && emake -C scripts
+	fi
+}
+
+# There is also a pytest harness that tests for bugs in some very specific
+# situations; we can rely on upstream for this rather than adding additional test deps.
+multilib_src_test() {
+	# See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
+	# -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
+	# -v: verbose
+	# -a: keep going on failure (so we see everything that breaks, not just 1st test)
+	# -k: keep test files after completion
+	# -am: automake style TAP output
+	# -p: print logs if test fails
+	# Note: if needed, we can skip specific tests. See e.g. Fedora's packaging
+	# or just read https://github.com/curl/curl/tree/master/tests#run.
+	# Note: we don't run the testsuite for cross-compilation.
+	# Upstream recommend 7*nproc as a starting point for parallel tests, but
+	# this ends up breaking when nproc is huge (like -j80).
+	# The network sandbox causes tests 241 and 1083 to fail; these are typically skipped
+	# as most gentoo users don't have an 'ip6-localhost'
+	multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi; then
+		# Shell completions
+		! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm -rf "${ED}"/etc/ || die
+}
+
+pkg_postinst() {
+	if use debug; then
+		ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose."
+		ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger."
+		ewarn "hic sunt dracones; you have been warned."
+	fi
+}
diff --git a/net-misc/curl/curl-8.11.0-r1.ebuild b/net-misc/curl/curl-8.11.0-r1.ebuild
new file mode 100644
index 000000000000..256378637261
--- /dev/null
+++ b/net-misc/curl/curl-8.11.0-r1.ebuild
@@ -0,0 +1,390 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should subscribe to the 'curl-distros' ML for backports etc
+# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/
+# https://lists.haxx.se/listinfo/curl-distros
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
+inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.se/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/curl/curl.git"
+else
+	SRC_URI="
+		https://curl.se/download/${P}.tar.xz
+		verify-sig? ( https://curl.se/download/${P}.tar.xz.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"
+fi
+
+LICENSE="BSD curl ISC test? ( BSD-4 )"
+SLOT="0"
+IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 idn +imap kerberos ldap mbedtls +openssl +pop3"
+IUSE+=" +psl +progress-meter +quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp +websockets zstd"
+# These select the default tls implementation / which quic impl to use
+IUSE+=" +curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
+RESTRICT="!test? ( test )"
+
+# Only one default ssl / quic provider can be enabled
+# The default provider needs its USE satisfied
+# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL offers any benefit at all in the modern day.
+# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e
+REQUIRED_USE="
+	quic? (
+		^^ (
+			curl_quic_openssl
+			curl_quic_ngtcp2
+		)
+		http3
+		ssl
+	)
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_mbedtls
+			curl_ssl_openssl
+			curl_ssl_rustls
+		)
+	)
+	curl_quic_openssl? (
+		curl_ssl_openssl
+		quic
+		!gnutls
+		!mbedtls
+		!rustls
+	)
+	curl_quic_ngtcp2? (
+		curl_ssl_gnutls
+		quic
+		!mbedtls
+		!openssl
+		!rustls
+	)
+	curl_ssl_gnutls? ( gnutls )
+	curl_ssl_mbedtls? ( mbedtls )
+	curl_ssl_openssl? ( openssl )
+	curl_ssl_rustls? ( rustls )
+	http3? ( alt-svc quic )
+"
+
+# cURL's docs and CI/CD are great resources for confirming supported versions
+# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
+# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions)
+# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly)
+# - https://github.com/curl/curl/blob/master/.github/workflows/http3-linux.yml (CI/CD for TCP/2)
+# However 'supported' vs 'works' are two entirely different things; be sane but
+# don't be afraid to require a later version.
+# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time.
+RDEPEND="
+	>=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
+	adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] )
+	http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
+	psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
+	quic? (
+		curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] )
+		curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] )
+	)
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			app-misc/ca-certificates
+			>=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:=[${MULTILIB_USEDEP}]
+		)
+		mbedtls? (
+			app-misc/ca-certificates
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+		)
+		openssl? (
+			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+		)
+		rustls? (
+			>=net-libs/rustls-ffi-0.14.0:=[${MULTILIB_USEDEP}]
+		)
+	)
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
+		http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
+	)
+	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
+"
+
+DOCS=( README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__builtin_available
+	closesocket
+	CloseSocket
+	getpass_r
+	ioctlsocket
+	IoctlSocket
+	mach_absolute_time
+	setmode
+	_fseeki64
+	# custom AC_LINK_IFELSE code fails to link even without -Werror
+	OSSL_QUIC_client_method
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-prefix-3.patch"
+	"${FILESDIR}/${PN}-respect-cflags-3.patch"
+	"${FILESDIR}/${P}-cmdline-ech-docs.patch"
+	"${FILESDIR}/${P}-curl-libssh-ipv6-brackets.patch"
+	"${FILESDIR}/${P}-mbedtls-global-init.patch"
+	"${FILESDIR}/${P}-setopt-http_content_decoding.patch"
+	"${FILESDIR}/${P}-cookie-case-sensitive.patch"
+	"${FILESDIR}/${P}-duphandle-init-netrc.patch"
+	"${FILESDIR}/${P}-netrc-large-file.patch"
+)
+
+src_prepare() {
+	default
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl; then
+		myconf+=( --without-gnutls --without-mbedtls --without-rustls )
+
+		if use gnutls; then
+			multilib_is_native_abi && einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls )
+		fi
+		if use mbedtls; then
+			multilib_is_native_abi && einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		fi
+		if use openssl; then
+			multilib_is_native_abi && einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+		if use rustls; then
+			multilib_is_native_abi && einfo "SSL provided by rustls"
+			myconf+=( --with-rustls )
+		fi
+		if use curl_ssl_gnutls; then
+			multilib_is_native_abi && einfo "Default SSL provided by gnutls"
+			myconf+=( --with-default-ssl-backend=gnutls )
+		elif use curl_ssl_mbedtls; then
+			multilib_is_native_abi && einfo "Default SSL provided by mbedtls"
+			myconf+=( --with-default-ssl-backend=mbedtls )
+		elif use curl_ssl_openssl; then
+			multilib_is_native_abi && einfo "Default SSL provided by openssl"
+			myconf+=( --with-default-ssl-backend=openssl )
+		elif use curl_ssl_rustls; then
+			multilib_is_native_abi && einfo "Default SSL provided by rustls"
+			myconf+=( --with-default-ssl-backend=rustls )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+			die "Please file a bug, hit impossible condition w/ USE=ssl handling."
+		fi
+
+	else
+		myconf+=( --without-ssl )
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	myconf+=(
+		$(use_enable alt-svc)
+		--enable-basic-auth
+		--enable-bearer-auth
+		--enable-digest-auth
+		--enable-kerberos-auth
+		--enable-negotiate-auth
+		--enable-aws
+		--enable-dict
+		--disable-ech
+		--enable-file
+		$(use_enable ftp)
+		$(use_enable gopher)
+		$(use_enable hsts)
+		--enable-http
+		$(use_enable imap)
+		$(use_enable ldap)
+		$(use_enable ldap ldaps)
+		--enable-ntlm
+		$(use_enable pop3)
+		--enable-rt
+		--enable-rtsp
+		$(use_enable samba smb)
+		$(use_with ssh libssh2)
+		$(use_enable smtp)
+		$(use_enable telnet)
+		$(use_enable tftp)
+		--enable-tls-srp
+		$(use_enable adns ares)
+		--enable-cookies
+		--enable-dateparse
+		--enable-dnsshuffle
+		--enable-doh
+		--enable-symbol-hiding
+		--enable-http-auth
+		--enable-ipv6
+		--enable-largefile
+		--enable-manual
+		--enable-mime
+		--enable-netrc
+		$(use_enable progress-meter)
+		--enable-proxy
+		--enable-socketpair
+		--disable-sspi
+		$(use_enable static-libs static)
+		--enable-pthreads
+		--enable-threaded-resolver
+		--disable-versioned-symbols
+		--without-amissl
+		--without-bearssl
+		$(use_with brotli)
+		--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
+		$(use_with http2 nghttp2)
+		--without-hyper
+		$(use_with idn libidn2)
+		$(use_with kerberos gssapi "${EPREFIX}"/usr)
+		--without-libgsasl
+		$(use_with psl libpsl)
+		--without-msh3
+		$(use_with http3 nghttp3)
+		$(use_with curl_quic_ngtcp2 ngtcp2)
+		$(use_with curl_quic_openssl openssl-quic)
+		--without-quiche
+		$(use_with rtmp librtmp)
+		--without-schannel
+		--without-secure-transport
+		--without-test-caddy
+		--without-test-httpd
+		--without-test-nghttpx
+		$(use_enable websockets)
+		--without-winidn
+		--without-wolfssl
+		--with-zlib
+		$(use_with zstd)
+		--with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
+	)
+
+	if use debug; then
+		myconf+=(
+			--enable-debug
+		)
+	fi
+
+	if use test && multilib_is_native_abi && ( use http2 || use http3 ); then
+		myconf+=(
+			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
+		)
+	fi
+
+	if [[ ${CHOST} == *mingw* ]] ; then
+		myconf+=(
+			--disable-pthreads
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# Avoid building the client (we just want libcurl for multilib)
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi; then
+		# Shell completions
+		! tc-is-cross-compiler && emake -C scripts
+	fi
+}
+
+# There is also a pytest harness that tests for bugs in some very specific
+# situations; we can rely on upstream for this rather than adding additional test deps.
+multilib_src_test() {
+	# See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
+	# -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
+	# -v: verbose
+	# -a: keep going on failure (so we see everything that breaks, not just 1st test)
+	# -k: keep test files after completion
+	# -am: automake style TAP output
+	# -p: print logs if test fails
+	# Note: if needed, we can skip specific tests. See e.g. Fedora's packaging
+	# or just read https://github.com/curl/curl/tree/master/tests#run.
+	# Note: we don't run the testsuite for cross-compilation.
+	# Upstream recommend 7*nproc as a starting point for parallel tests, but
+	# this ends up breaking when nproc is huge (like -j80).
+	# The network sandbox causes tests 241 and 1083 to fail; these are typically skipped
+	# as most gentoo users don't have an 'ip6-localhost'
+	multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi; then
+		# Shell completions
+		! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm -rf "${ED}"/etc/ || die
+}
+
+pkg_postinst() {
+	if use debug; then
+		ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose."
+		ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger."
+		ewarn "hic sunt dracones; you have been warned."
+	fi
+}
diff --git a/net-misc/curl/curl-8.11.0.ebuild b/net-misc/curl/curl-8.11.0.ebuild
deleted file mode 100644
index 35717336263a..000000000000
--- a/net-misc/curl/curl-8.11.0.ebuild
+++ /dev/null
@@ -1,390 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainers should subscribe to the 'curl-distros' ML for backports etc
-# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/
-# https://lists.haxx.se/listinfo/curl-distros
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
-inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.se/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/curl/curl.git"
-else
-	SRC_URI="
-		https://curl.se/download/${P}.tar.xz
-		verify-sig? ( https://curl.se/download/${P}.tar.xz.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"
-fi
-
-LICENSE="BSD curl ISC test? ( BSD-4 )"
-SLOT="0"
-IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 idn +imap kerberos ldap mbedtls +openssl +pop3"
-IUSE+=" +psl +progress-meter +quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp +websockets zstd"
-# These select the default tls implementation / which quic impl to use
-IUSE+=" +curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
-RESTRICT="!test? ( test )"
-
-# Only one default ssl / quic provider can be enabled
-# The default provider needs its USE satisfied
-# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL offers any benefit at all in the modern day.
-# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e
-REQUIRED_USE="
-	quic? (
-		^^ (
-			curl_quic_openssl
-			curl_quic_ngtcp2
-		)
-		http3
-		ssl
-	)
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_mbedtls
-			curl_ssl_openssl
-			curl_ssl_rustls
-		)
-	)
-	curl_quic_openssl? (
-		curl_ssl_openssl
-		quic
-		!gnutls
-		!mbedtls
-		!rustls
-	)
-	curl_quic_ngtcp2? (
-		curl_ssl_gnutls
-		quic
-		!mbedtls
-		!openssl
-		!rustls
-	)
-	curl_ssl_gnutls? ( gnutls )
-	curl_ssl_mbedtls? ( mbedtls )
-	curl_ssl_openssl? ( openssl )
-	curl_ssl_rustls? ( rustls )
-	http3? ( alt-svc quic )
-"
-
-# cURL's docs and CI/CD are great resources for confirming supported versions
-# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
-# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions)
-# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly)
-# - https://github.com/curl/curl/blob/master/.github/workflows/http3-linux.yml (CI/CD for TCP/2)
-# However 'supported' vs 'works' are two entirely different things; be sane but
-# don't be afraid to require a later version.
-# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time.
-RDEPEND="
-	>=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
-	adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] )
-	http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
-	psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
-	quic? (
-		curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] )
-		curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] )
-	)
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls? (
-			app-misc/ca-certificates
-			>=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:=[${MULTILIB_USEDEP}]
-		)
-		mbedtls? (
-			app-misc/ca-certificates
-			net-libs/mbedtls:=[${MULTILIB_USEDEP}]
-		)
-		openssl? (
-			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
-		)
-		rustls? (
-			>=net-libs/rustls-ffi-0.14.0:=[${MULTILIB_USEDEP}]
-		)
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
-		http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
-	)
-	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
-"
-
-DOCS=( README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__builtin_available
-	closesocket
-	CloseSocket
-	getpass_r
-	ioctlsocket
-	IoctlSocket
-	mach_absolute_time
-	setmode
-	_fseeki64
-	# custom AC_LINK_IFELSE code fails to link even without -Werror
-	OSSL_QUIC_client_method
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-prefix-3.patch"
-	"${FILESDIR}/${PN}-respect-cflags-3.patch"
-	"${FILESDIR}/${P}-cmdline-ech-docs.patch"
-	"${FILESDIR}/${P}-curl-libssh-ipv6-brackets.patch"
-	"${FILESDIR}/${P}-mbedtls-global-init.patch"
-	"${FILESDIR}/${P}-setopt-http_content_decoding.patch"
-	"${FILESDIR}/${P}-cookie-case-sensitive.patch"
-	"${FILESDIR}/${P}-duphandle-init-netrc.patch"
-	"${FILESDIR}/${P}-netrc-large-file.patch"
-)
-
-src_prepare() {
-	default
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl; then
-		myconf+=( --without-gnutls --without-mbedtls --without-rustls )
-
-		if use gnutls; then
-			multilib_is_native_abi && einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls )
-		fi
-		if use mbedtls; then
-			multilib_is_native_abi && einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		fi
-		if use openssl; then
-			multilib_is_native_abi && einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-		if use rustls; then
-			multilib_is_native_abi && einfo "SSL provided by rustls"
-			myconf+=( --with-rustls )
-		fi
-		if use curl_ssl_gnutls; then
-			multilib_is_native_abi && einfo "Default SSL provided by gnutls"
-			myconf+=( --with-default-ssl-backend=gnutls )
-		elif use curl_ssl_mbedtls; then
-			multilib_is_native_abi && einfo "Default SSL provided by mbedtls"
-			myconf+=( --with-default-ssl-backend=mbedtls )
-		elif use curl_ssl_openssl; then
-			multilib_is_native_abi && einfo "Default SSL provided by openssl"
-			myconf+=( --with-default-ssl-backend=openssl )
-		elif use curl_ssl_rustls; then
-			multilib_is_native_abi && einfo "Default SSL provided by rustls"
-			myconf+=( --with-default-ssl-backend=rustls )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-			die "Please file a bug, hit impossible condition w/ USE=ssl handling."
-		fi
-
-	else
-		myconf+=( --without-ssl )
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
-	myconf+=(
-		$(use_enable alt-svc)
-		--enable-basic-auth
-		--enable-bearer-auth
-		--enable-digest-auth
-		--enable-kerberos-auth
-		--enable-negotiate-auth
-		--enable-aws
-		--enable-dict
-		--disable-ech
-		--enable-file
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable hsts)
-		--enable-http
-		$(use_enable imap)
-		$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		--enable-ntlm
-		$(use_enable pop3)
-		--enable-rt
-		--enable-rtsp
-		$(use_enable samba smb)
-		$(use_with ssh libssh2)
-		$(use_enable smtp)
-		$(use_enable telnet)
-		$(use_enable tftp)
-		--enable-tls-srp
-		$(use_enable adns ares)
-		--enable-cookies
-		--enable-dateparse
-		--enable-dnsshuffle
-		--enable-doh
-		--enable-symbol-hiding
-		--enable-http-auth
-		--enable-ipv6
-		--enable-largefile
-		--enable-manual
-		--enable-mime
-		--enable-netrc
-		$(use_enable progress-meter)
-		--enable-proxy
-		--enable-socketpair
-		--disable-sspi
-		$(use_enable static-libs static)
-		--enable-pthreads
-		--enable-threaded-resolver
-		--disable-versioned-symbols
-		--without-amissl
-		--without-bearssl
-		$(use_with brotli)
-		--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
-		$(use_with http2 nghttp2)
-		--without-hyper
-		$(use_with idn libidn2)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		--without-libgsasl
-		$(use_with psl libpsl)
-		--without-msh3
-		$(use_with http3 nghttp3)
-		$(use_with curl_quic_ngtcp2 ngtcp2)
-		$(use_with curl_quic_openssl openssl-quic)
-		--without-quiche
-		$(use_with rtmp librtmp)
-		--without-schannel
-		--without-secure-transport
-		--without-test-caddy
-		--without-test-httpd
-		--without-test-nghttpx
-		$(use_enable websockets)
-		--without-winidn
-		--without-wolfssl
-		--with-zlib
-		$(use_with zstd)
-		--with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
-	)
-
-	if use debug; then
-		myconf+=(
-			--enable-debug
-		)
-	fi
-
-	if use test && multilib_is_native_abi && ( use http2 || use http3 ); then
-		myconf+=(
-			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
-		)
-	fi
-
-	if [[ ${CHOST} == *mingw* ]] ; then
-		myconf+=(
-			--disable-pthreads
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# Avoid building the client (we just want libcurl for multilib)
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi; then
-		# Shell completions
-		! tc-is-cross-compiler && emake -C scripts
-	fi
-}
-
-# There is also a pytest harness that tests for bugs in some very specific
-# situations; we can rely on upstream for this rather than adding additional test deps.
-multilib_src_test() {
-	# See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
-	# -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
-	# -v: verbose
-	# -a: keep going on failure (so we see everything that breaks, not just 1st test)
-	# -k: keep test files after completion
-	# -am: automake style TAP output
-	# -p: print logs if test fails
-	# Note: if needed, we can skip specific tests. See e.g. Fedora's packaging
-	# or just read https://github.com/curl/curl/tree/master/tests#run.
-	# Note: we don't run the testsuite for cross-compilation.
-	# Upstream recommend 7*nproc as a starting point for parallel tests, but
-	# this ends up breaking when nproc is huge (like -j80).
-	# The network sandbox causes tests 241 and 1083 to fail; these are typically skipped
-	# as most gentoo users don't have an 'ip6-localhost'
-	multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi; then
-		# Shell completions
-		! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm -rf "${ED}"/etc/ || die
-}
-
-pkg_postinst() {
-	if use debug; then
-		ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose."
-		ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger."
-		ewarn "hic sunt dracones; you have been warned."
-	fi
-}
diff --git a/net-misc/curl/curl-8.11.1-r1.ebuild b/net-misc/curl/curl-8.11.1-r1.ebuild
deleted file mode 100644
index ddd74bc97377..000000000000
--- a/net-misc/curl/curl-8.11.1-r1.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainers should subscribe to the 'curl-distros' ML for backports etc
-# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/
-# https://lists.haxx.se/listinfo/curl-distros
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
-inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.se/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/curl/curl.git"
-else
-	SRC_URI="
-		https://curl.se/download/${P}.tar.xz
-		verify-sig? ( https://curl.se/download/${P}.tar.xz.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"
-fi
-
-LICENSE="BSD curl ISC test? ( BSD-4 )"
-SLOT="0"
-IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 idn +imap kerberos ldap mbedtls +openssl +pop3"
-IUSE+=" +psl +progress-meter +quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp +websockets zstd"
-# These select the default tls implementation / which quic impl to use
-IUSE+=" +curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
-RESTRICT="!test? ( test )"
-
-# Only one default ssl / quic provider can be enabled
-# The default provider needs its USE satisfied
-# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL offers any benefit at all in the modern day.
-# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e
-REQUIRED_USE="
-	quic? (
-		^^ (
-			curl_quic_openssl
-			curl_quic_ngtcp2
-		)
-		http3
-		ssl
-	)
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_mbedtls
-			curl_ssl_openssl
-			curl_ssl_rustls
-		)
-	)
-	curl_quic_openssl? (
-		curl_ssl_openssl
-		quic
-		!gnutls
-		!mbedtls
-		!rustls
-	)
-	curl_quic_ngtcp2? (
-		curl_ssl_gnutls
-		quic
-		!mbedtls
-		!openssl
-		!rustls
-	)
-	curl_ssl_gnutls? ( gnutls )
-	curl_ssl_mbedtls? ( mbedtls )
-	curl_ssl_openssl? ( openssl )
-	curl_ssl_rustls? ( rustls )
-	http3? ( alt-svc quic )
-"
-
-# cURL's docs and CI/CD are great resources for confirming supported versions
-# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
-# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions)
-# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly)
-# - https://github.com/curl/curl/blob/master/.github/workflows/http3-linux.yml (CI/CD for TCP/2)
-# However 'supported' vs 'works' are two entirely different things; be sane but
-# don't be afraid to require a later version.
-# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time.
-RDEPEND="
-	>=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
-	adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] )
-	http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
-	psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
-	quic? (
-		curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] )
-		curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] )
-	)
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls? (
-			app-misc/ca-certificates
-			>=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:=[${MULTILIB_USEDEP}]
-		)
-		mbedtls? (
-			app-misc/ca-certificates
-			net-libs/mbedtls:=[${MULTILIB_USEDEP}]
-		)
-		openssl? (
-			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
-		)
-		rustls? (
-			>=net-libs/rustls-ffi-0.14.0:=[${MULTILIB_USEDEP}]
-		)
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
-		http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
-	)
-	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
-"
-
-DOCS=( README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__builtin_available
-	closesocket
-	CloseSocket
-	getpass_r
-	ioctlsocket
-	IoctlSocket
-	mach_absolute_time
-	setmode
-	_fseeki64
-	# custom AC_LINK_IFELSE code fails to link even without -Werror
-	OSSL_QUIC_client_method
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-prefix-3.patch"
-	"${FILESDIR}/${PN}-respect-cflags-3.patch"
-	"${FILESDIR}/${P}-async-thread-close-eventfd.patch"
-)
-
-src_prepare() {
-	default
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl; then
-		myconf+=( --without-gnutls --without-mbedtls --without-rustls )
-
-		if use gnutls; then
-			multilib_is_native_abi && einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls )
-		fi
-		if use mbedtls; then
-			multilib_is_native_abi && einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		fi
-		if use openssl; then
-			multilib_is_native_abi && einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-		if use rustls; then
-			multilib_is_native_abi && einfo "SSL provided by rustls"
-			myconf+=( --with-rustls )
-		fi
-		if use curl_ssl_gnutls; then
-			multilib_is_native_abi && einfo "Default SSL provided by gnutls"
-			myconf+=( --with-default-ssl-backend=gnutls )
-		elif use curl_ssl_mbedtls; then
-			multilib_is_native_abi && einfo "Default SSL provided by mbedtls"
-			myconf+=( --with-default-ssl-backend=mbedtls )
-		elif use curl_ssl_openssl; then
-			multilib_is_native_abi && einfo "Default SSL provided by openssl"
-			myconf+=( --with-default-ssl-backend=openssl )
-		elif use curl_ssl_rustls; then
-			multilib_is_native_abi && einfo "Default SSL provided by rustls"
-			myconf+=( --with-default-ssl-backend=rustls )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-			die "Please file a bug, hit impossible condition w/ USE=ssl handling."
-		fi
-
-	else
-		myconf+=( --without-ssl )
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
-	myconf+=(
-		$(use_enable alt-svc)
-		--enable-basic-auth
-		--enable-bearer-auth
-		--enable-digest-auth
-		--enable-kerberos-auth
-		--enable-negotiate-auth
-		--enable-aws
-		--enable-dict
-		--disable-ech
-		--enable-file
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable hsts)
-		--enable-http
-		$(use_enable imap)
-		$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		--enable-ntlm
-		$(use_enable pop3)
-		--enable-rt
-		--enable-rtsp
-		$(use_enable samba smb)
-		$(use_with ssh libssh2)
-		$(use_enable smtp)
-		$(use_enable telnet)
-		$(use_enable tftp)
-		--enable-tls-srp
-		$(use_enable adns ares)
-		--enable-cookies
-		--enable-dateparse
-		--enable-dnsshuffle
-		--enable-doh
-		--enable-symbol-hiding
-		--enable-http-auth
-		--enable-ipv6
-		--enable-largefile
-		--enable-manual
-		--enable-mime
-		--enable-netrc
-		$(use_enable progress-meter)
-		--enable-proxy
-		--enable-socketpair
-		--disable-sspi
-		$(use_enable static-libs static)
-		--enable-pthreads
-		--enable-threaded-resolver
-		--disable-versioned-symbols
-		--without-amissl
-		--without-bearssl
-		$(use_with brotli)
-		--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
-		$(use_with http2 nghttp2)
-		--without-hyper
-		$(use_with idn libidn2)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		--without-libgsasl
-		$(use_with psl libpsl)
-		--without-msh3
-		$(use_with http3 nghttp3)
-		$(use_with curl_quic_ngtcp2 ngtcp2)
-		$(use_with curl_quic_openssl openssl-quic)
-		--without-quiche
-		$(use_with rtmp librtmp)
-		--without-schannel
-		--without-secure-transport
-		--without-test-caddy
-		--without-test-httpd
-		--without-test-nghttpx
-		$(use_enable websockets)
-		--without-winidn
-		--without-wolfssl
-		--with-zlib
-		$(use_with zstd)
-		--with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
-	)
-
-	if use debug; then
-		myconf+=(
-			--enable-debug
-		)
-	fi
-
-	if use test && multilib_is_native_abi && ( use http2 || use http3 ); then
-		myconf+=(
-			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
-		)
-	fi
-
-	if [[ ${CHOST} == *mingw* ]] ; then
-		myconf+=(
-			--disable-pthreads
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# Avoid building the client (we just want libcurl for multilib)
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi; then
-		# Shell completions
-		! tc-is-cross-compiler && emake -C scripts
-	fi
-}
-
-# There is also a pytest harness that tests for bugs in some very specific
-# situations; we can rely on upstream for this rather than adding additional test deps.
-multilib_src_test() {
-	# See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
-	# -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
-	# -v: verbose
-	# -a: keep going on failure (so we see everything that breaks, not just 1st test)
-	# -k: keep test files after completion
-	# -am: automake style TAP output
-	# -p: print logs if test fails
-	# Note: if needed, we can skip specific tests. See e.g. Fedora's packaging
-	# or just read https://github.com/curl/curl/tree/master/tests#run.
-	# Note: we don't run the testsuite for cross-compilation.
-	# Upstream recommend 7*nproc as a starting point for parallel tests, but
-	# this ends up breaking when nproc is huge (like -j80).
-	# The network sandbox causes tests 241 and 1083 to fail; these are typically skipped
-	# as most gentoo users don't have an 'ip6-localhost'
-	multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi; then
-		# Shell completions
-		! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm -rf "${ED}"/etc/ || die
-}
-
-pkg_postinst() {
-	if use debug; then
-		ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose."
-		ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger."
-		ewarn "hic sunt dracones; you have been warned."
-	fi
-}
diff --git a/net-misc/curl/curl-8.11.1-r2.ebuild b/net-misc/curl/curl-8.11.1-r2.ebuild
new file mode 100644
index 000000000000..96c0bc7723d3
--- /dev/null
+++ b/net-misc/curl/curl-8.11.1-r2.ebuild
@@ -0,0 +1,384 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should subscribe to the 'curl-distros' ML for backports etc
+# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/
+# https://lists.haxx.se/listinfo/curl-distros
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
+inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.se/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/curl/curl.git"
+else
+	SRC_URI="
+		https://curl.se/download/${P}.tar.xz
+		verify-sig? ( https://curl.se/download/${P}.tar.xz.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"
+fi
+
+LICENSE="BSD curl ISC test? ( BSD-4 )"
+SLOT="0"
+IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 idn +imap kerberos ldap mbedtls +openssl +pop3"
+IUSE+=" +psl +progress-meter +quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp +websockets zstd"
+# These select the default tls implementation / which quic impl to use
+IUSE+=" +curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
+RESTRICT="!test? ( test )"
+
+# Only one default ssl / quic provider can be enabled
+# The default provider needs its USE satisfied
+# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL offers any benefit at all in the modern day.
+# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e
+REQUIRED_USE="
+	quic? (
+		^^ (
+			curl_quic_openssl
+			curl_quic_ngtcp2
+		)
+		http3
+		ssl
+	)
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_mbedtls
+			curl_ssl_openssl
+			curl_ssl_rustls
+		)
+	)
+	curl_quic_openssl? (
+		curl_ssl_openssl
+		quic
+		!gnutls
+		!mbedtls
+		!rustls
+	)
+	curl_quic_ngtcp2? (
+		curl_ssl_gnutls
+		quic
+		!mbedtls
+		!openssl
+		!rustls
+	)
+	curl_ssl_gnutls? ( gnutls )
+	curl_ssl_mbedtls? ( mbedtls )
+	curl_ssl_openssl? ( openssl )
+	curl_ssl_rustls? ( rustls )
+	http3? ( alt-svc quic )
+"
+
+# cURL's docs and CI/CD are great resources for confirming supported versions
+# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
+# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions)
+# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly)
+# - https://github.com/curl/curl/blob/master/.github/workflows/http3-linux.yml (CI/CD for TCP/2)
+# However 'supported' vs 'works' are two entirely different things; be sane but
+# don't be afraid to require a later version.
+# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time.
+RDEPEND="
+	>=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
+	adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] )
+	http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
+	psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
+	quic? (
+		curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] )
+		curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] )
+	)
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			app-misc/ca-certificates
+			>=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:=[${MULTILIB_USEDEP}]
+		)
+		mbedtls? (
+			app-misc/ca-certificates
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+		)
+		openssl? (
+			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+		)
+		rustls? (
+			>=net-libs/rustls-ffi-0.14.0:=[${MULTILIB_USEDEP}]
+		)
+	)
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
+		http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
+	)
+	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
+"
+
+DOCS=( README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__builtin_available
+	closesocket
+	CloseSocket
+	getpass_r
+	ioctlsocket
+	IoctlSocket
+	mach_absolute_time
+	setmode
+	_fseeki64
+	# custom AC_LINK_IFELSE code fails to link even without -Werror
+	OSSL_QUIC_client_method
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-prefix-3.patch"
+	"${FILESDIR}/${PN}-respect-cflags-3.patch"
+	"${FILESDIR}/${P}-async-thread-close-eventfd.patch"
+)
+
+src_prepare() {
+	default
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl; then
+		myconf+=( --without-gnutls --without-mbedtls --without-rustls )
+
+		if use gnutls; then
+			multilib_is_native_abi && einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls )
+		fi
+		if use mbedtls; then
+			multilib_is_native_abi && einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		fi
+		if use openssl; then
+			multilib_is_native_abi && einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+		if use rustls; then
+			multilib_is_native_abi && einfo "SSL provided by rustls"
+			myconf+=( --with-rustls )
+		fi
+		if use curl_ssl_gnutls; then
+			multilib_is_native_abi && einfo "Default SSL provided by gnutls"
+			myconf+=( --with-default-ssl-backend=gnutls )
+		elif use curl_ssl_mbedtls; then
+			multilib_is_native_abi && einfo "Default SSL provided by mbedtls"
+			myconf+=( --with-default-ssl-backend=mbedtls )
+		elif use curl_ssl_openssl; then
+			multilib_is_native_abi && einfo "Default SSL provided by openssl"
+			myconf+=( --with-default-ssl-backend=openssl )
+		elif use curl_ssl_rustls; then
+			multilib_is_native_abi && einfo "Default SSL provided by rustls"
+			myconf+=( --with-default-ssl-backend=rustls )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+			die "Please file a bug, hit impossible condition w/ USE=ssl handling."
+		fi
+
+	else
+		myconf+=( --without-ssl )
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	myconf+=(
+		$(use_enable alt-svc)
+		--enable-basic-auth
+		--enable-bearer-auth
+		--enable-digest-auth
+		--enable-kerberos-auth
+		--enable-negotiate-auth
+		--enable-aws
+		--enable-dict
+		--disable-ech
+		--enable-file
+		$(use_enable ftp)
+		$(use_enable gopher)
+		$(use_enable hsts)
+		--enable-http
+		$(use_enable imap)
+		$(use_enable ldap)
+		$(use_enable ldap ldaps)
+		--enable-ntlm
+		$(use_enable pop3)
+		--enable-rt
+		--enable-rtsp
+		$(use_enable samba smb)
+		$(use_with ssh libssh2)
+		$(use_enable smtp)
+		$(use_enable telnet)
+		$(use_enable tftp)
+		--enable-tls-srp
+		$(use_enable adns ares)
+		--enable-cookies
+		--enable-dateparse
+		--enable-dnsshuffle
+		--enable-doh
+		--enable-symbol-hiding
+		--enable-http-auth
+		--enable-ipv6
+		--enable-largefile
+		--enable-manual
+		--enable-mime
+		--enable-netrc
+		$(use_enable progress-meter)
+		--enable-proxy
+		--enable-socketpair
+		--disable-sspi
+		$(use_enable static-libs static)
+		--enable-pthreads
+		--enable-threaded-resolver
+		--disable-versioned-symbols
+		--without-amissl
+		--without-bearssl
+		$(use_with brotli)
+		--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
+		$(use_with http2 nghttp2)
+		--without-hyper
+		$(use_with idn libidn2)
+		$(use_with kerberos gssapi "${EPREFIX}"/usr)
+		--without-libgsasl
+		$(use_with psl libpsl)
+		--without-msh3
+		$(use_with http3 nghttp3)
+		$(use_with curl_quic_ngtcp2 ngtcp2)
+		$(use_with curl_quic_openssl openssl-quic)
+		--without-quiche
+		$(use_with rtmp librtmp)
+		--without-schannel
+		--without-secure-transport
+		--without-test-caddy
+		--without-test-httpd
+		--without-test-nghttpx
+		$(use_enable websockets)
+		--without-winidn
+		--without-wolfssl
+		--with-zlib
+		$(use_with zstd)
+		--with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
+	)
+
+	if use debug; then
+		myconf+=(
+			--enable-debug
+		)
+	fi
+
+	if use test && multilib_is_native_abi && ( use http2 || use http3 ); then
+		myconf+=(
+			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
+		)
+	fi
+
+	if [[ ${CHOST} == *mingw* ]] ; then
+		myconf+=(
+			--disable-pthreads
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# Avoid building the client (we just want libcurl for multilib)
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi; then
+		# Shell completions
+		! tc-is-cross-compiler && emake -C scripts
+	fi
+}
+
+# There is also a pytest harness that tests for bugs in some very specific
+# situations; we can rely on upstream for this rather than adding additional test deps.
+multilib_src_test() {
+	# See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
+	# -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
+	# -v: verbose
+	# -a: keep going on failure (so we see everything that breaks, not just 1st test)
+	# -k: keep test files after completion
+	# -am: automake style TAP output
+	# -p: print logs if test fails
+	# Note: if needed, we can skip specific tests. See e.g. Fedora's packaging
+	# or just read https://github.com/curl/curl/tree/master/tests#run.
+	# Note: we don't run the testsuite for cross-compilation.
+	# Upstream recommend 7*nproc as a starting point for parallel tests, but
+	# this ends up breaking when nproc is huge (like -j80).
+	# The network sandbox causes tests 241 and 1083 to fail; these are typically skipped
+	# as most gentoo users don't have an 'ip6-localhost'
+	multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi; then
+		# Shell completions
+		! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm -rf "${ED}"/etc/ || die
+}
+
+pkg_postinst() {
+	if use debug; then
+		ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose."
+		ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger."
+		ewarn "hic sunt dracones; you have been warned."
+	fi
+}
diff --git a/net-misc/curl/curl-8.8.0-r1.ebuild b/net-misc/curl/curl-8.8.0-r1.ebuild
deleted file mode 100644
index 71a852bab339..000000000000
--- a/net-misc/curl/curl-8.8.0-r1.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainers should subscribe to the 'curl-distros' ML for backports etc
-# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/
-# https://lists.haxx.se/listinfo/curl-distros
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
-inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.se/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/curl/curl.git"
-else
-	SRC_URI="
-		https://curl.se/download/${P}.tar.xz
-		verify-sig? ( https://curl.se/download/${P}.tar.xz.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"
-fi
-
-LICENSE="BSD curl ISC test? ( BSD-4 )"
-SLOT="0"
-IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3"
-IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
-# These select the default SSL implementation
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
-RESTRICT="!test? ( test )"
-
-# Only one default ssl provider can be enabled
-# The default ssl provider needs its USE satisfied
-# nghttp3 = https://bugs.gentoo.org/912029
-REQUIRED_USE="
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_mbedtls
-			curl_ssl_openssl
-			curl_ssl_rustls
-		)
-	)
-	curl_ssl_gnutls? ( gnutls )
-	curl_ssl_mbedtls? ( mbedtls )
-	curl_ssl_openssl? ( openssl )
-	curl_ssl_rustls? ( rustls )
-	nghttp3? (
-		!openssl
-		alt-svc )
-"
-
-# cURL's docs and CI/CD are great resources for confirming supported versions
-# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
-# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions)
-# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly)
-# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2)
-# However 'supported' vs 'works' are two entirely different things; be sane but
-# don't be afraid to require a later version.
-
-RDEPEND="
-	>=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
-	adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
-	nghttp3? (
-		>=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}]
-		>=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
-	)
-	psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls? (
-			app-misc/ca-certificates
-			>=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:=[${MULTILIB_USEDEP}]
-		)
-		mbedtls? (
-			app-misc/ca-certificates
-			net-libs/mbedtls:=[${MULTILIB_USEDEP}]
-		)
-		openssl? (
-			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
-		)
-		rustls? (
-			>=net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}]
-		)
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
-		nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
-	)
-	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
-"
-
-DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__builtin_available
-	closesocket
-	CloseSocket
-	getpass_r
-	ioctlsocket
-	IoctlSocket
-	mach_absolute_time
-	setmode
-	_fseeki64
-	# custom AC_LINK_IFELSE code fails to link even without -Werror
-	OSSL_QUIC_client_method
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-prefix-2.patch
-	"${FILESDIR}"/${PN}-respect-cflags-3.patch
-	"${FILESDIR}"/${P}-install-manpage.patch
-	"${FILESDIR}"/${P}-mbedtls.patch
-	"${FILESDIR}"/${P}-multi_wait-timeout.patch
-)
-
-src_prepare() {
-	default
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl; then
-		myconf+=( --without-gnutls --without-mbedtls --without-rustls )
-
-		if use gnutls; then
-			multilib_is_native_abi && einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls )
-		fi
-		if use mbedtls; then
-			multilib_is_native_abi && einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		fi
-		if use openssl; then
-			multilib_is_native_abi && einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-		if use rustls; then
-			multilib_is_native_abi && einfo "SSL provided by rustls"
-			myconf+=( --with-rustls )
-		fi
-		if use curl_ssl_gnutls; then
-			multilib_is_native_abi && einfo "Default SSL provided by gnutls"
-			myconf+=( --with-default-ssl-backend=gnutls )
-		elif use curl_ssl_mbedtls; then
-			multilib_is_native_abi && einfo "Default SSL provided by mbedtls"
-			myconf+=( --with-default-ssl-backend=mbedtls )
-		elif use curl_ssl_openssl; then
-			multilib_is_native_abi && einfo "Default SSL provided by openssl"
-			myconf+=( --with-default-ssl-backend=openssl )
-		elif use curl_ssl_rustls; then
-			multilib_is_native_abi && einfo "Default SSL provided by rustls"
-			myconf+=( --with-default-ssl-backend=rustls )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-			die "Please file a bug, hit impossible condition w/ USE=ssl handling."
-		fi
-
-	else
-		myconf+=( --without-ssl )
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
-	myconf+=(
-		$(use_enable alt-svc)
-		--enable-basic-auth
-		--enable-bearer-auth
-		--enable-digest-auth
-		--enable-kerberos-auth
-		--enable-negotiate-auth
-		--enable-aws
-		--enable-dict
-		--disable-ech
-		--enable-file
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable hsts)
-		--enable-http
-		$(use_enable imap)
-		$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		--enable-ntlm
-		$(use_enable pop3)
-		--enable-rt
-		--enable-rtsp
-		$(use_enable samba smb)
-		$(use_with ssh libssh2)
-		$(use_enable smtp)
-		$(use_enable telnet)
-		$(use_enable tftp)
-		--enable-tls-srp
-		$(use_enable adns ares)
-		--enable-cookies
-		--enable-dateparse
-		--enable-dnsshuffle
-		--enable-doh
-		--enable-symbol-hiding
-		--enable-http-auth
-		--enable-ipv6
-		--enable-largefile
-		--enable-manual
-		--enable-mime
-		--enable-netrc
-		$(use_enable progress-meter)
-		--enable-proxy
-		--enable-socketpair
-		--disable-sspi
-		$(use_enable static-libs static)
-		--enable-pthreads
-		--enable-threaded-resolver
-		--disable-versioned-symbols
-		--without-amissl
-		--without-bearssl
-		$(use_with brotli)
-		--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
-		$(use_with http2 nghttp2)
-		--without-hyper
-		$(use_with idn libidn2)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		--without-libgsasl
-		$(use_with psl libpsl)
-		--without-msh3
-		$(use_with nghttp3)
-		$(use_with nghttp3 ngtcp2)
-		--without-quiche
-		$(use_with rtmp librtmp)
-		--without-schannel
-		--without-secure-transport
-		--without-test-caddy
-		--without-test-httpd
-		--without-test-nghttpx
-		$(use_enable websockets)
-		--without-winidn
-		--without-wolfssl
-		--with-zlib
-		$(use_with zstd)
-		--with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
-	)
-
-	if use debug; then
-		myconf+=(
-			--enable-debug
-		)
-	fi
-
-	if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then
-		myconf+=(
-			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
-		)
-	fi
-
-	if [[ ${CHOST} == *mingw* ]] ; then
-		myconf+=(
-			--disable-pthreads
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# Avoid building the client (we just want libcurl for multilib)
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use nghttp3; then
-		libs+=( "-lnghttp3" "-lngtcp2" )
-		priv+=( "libnghttp3" "libngtcp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc || die
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi; then
-		# Shell completions
-		! tc-is-cross-compiler && emake -C scripts
-	fi
-}
-
-# There is also a pytest harness that tests for bugs in some very specific
-# situations; we can rely on upstream for this rather than adding additional test deps.
-multilib_src_test() {
-	# See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
-	# -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
-	# -v: verbose
-	# -a: keep going on failure (so we see everything which breaks, not just 1st test)
-	# -k: keep test files after completion
-	# -am: automake style TAP output
-	# -p: print logs if test fails
-	# Note: if needed, we can skip specific tests. See e.g. Fedora's packaging
-	# or just read https://github.com/curl/curl/tree/master/tests#run.
-	# Note: we don't run the testsuite for cross-compilation.
-	# Upstream recommend 7*nproc as a starting point for parallel tests, but
-	# this ends up breaking when nproc is huge (like -j80).
-	# The network sandbox causes tests 241 and 1083 to fail; these are typically skipped
-	# as most gentoo users don't have an 'ip6-localhost'
-	multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi; then
-		# Shell completions
-		! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm -rf "${ED}"/etc/ || die
-}
-
-pkg_postinst() {
-	if use debug; then
-		ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose."
-		ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger."
-		ewarn "hic sunt dracones; you have been warned."
-	fi
-}
diff --git a/net-misc/curl/curl-8.8.0-r2.ebuild b/net-misc/curl/curl-8.8.0-r2.ebuild
new file mode 100644
index 000000000000..89b07c74c60e
--- /dev/null
+++ b/net-misc/curl/curl-8.8.0-r2.ebuild
@@ -0,0 +1,387 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should subscribe to the 'curl-distros' ML for backports etc
+# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/
+# https://lists.haxx.se/listinfo/curl-distros
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
+inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.se/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/curl/curl.git"
+else
+	SRC_URI="
+		https://curl.se/download/${P}.tar.xz
+		verify-sig? ( https://curl.se/download/${P}.tar.xz.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"
+fi
+
+LICENSE="BSD curl ISC test? ( BSD-4 )"
+SLOT="0"
+IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3"
+IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
+# These select the default SSL implementation
+IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
+RESTRICT="!test? ( test )"
+
+# Only one default ssl provider can be enabled
+# The default ssl provider needs its USE satisfied
+# nghttp3 = https://bugs.gentoo.org/912029
+REQUIRED_USE="
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_mbedtls
+			curl_ssl_openssl
+			curl_ssl_rustls
+		)
+	)
+	curl_ssl_gnutls? ( gnutls )
+	curl_ssl_mbedtls? ( mbedtls )
+	curl_ssl_openssl? ( openssl )
+	curl_ssl_rustls? ( rustls )
+	nghttp3? (
+		!openssl
+		alt-svc )
+"
+
+# cURL's docs and CI/CD are great resources for confirming supported versions
+# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
+# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions)
+# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly)
+# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2)
+# However 'supported' vs 'works' are two entirely different things; be sane but
+# don't be afraid to require a later version.
+
+RDEPEND="
+	>=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
+	adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
+	nghttp3? (
+		>=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}]
+		>=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
+	)
+	psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			app-misc/ca-certificates
+			>=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:=[${MULTILIB_USEDEP}]
+		)
+		mbedtls? (
+			app-misc/ca-certificates
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+		)
+		openssl? (
+			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+		)
+		rustls? (
+			>=net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}]
+		)
+	)
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
+		nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
+	)
+	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
+"
+
+DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__builtin_available
+	closesocket
+	CloseSocket
+	getpass_r
+	ioctlsocket
+	IoctlSocket
+	mach_absolute_time
+	setmode
+	_fseeki64
+	# custom AC_LINK_IFELSE code fails to link even without -Werror
+	OSSL_QUIC_client_method
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-prefix-2.patch
+	"${FILESDIR}"/${PN}-respect-cflags-3.patch
+	"${FILESDIR}"/${P}-install-manpage.patch
+	"${FILESDIR}"/${P}-mbedtls.patch
+	"${FILESDIR}"/${P}-multi_wait-timeout.patch
+)
+
+src_prepare() {
+	default
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl; then
+		myconf+=( --without-gnutls --without-mbedtls --without-rustls )
+
+		if use gnutls; then
+			multilib_is_native_abi && einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls )
+		fi
+		if use mbedtls; then
+			multilib_is_native_abi && einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		fi
+		if use openssl; then
+			multilib_is_native_abi && einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+		if use rustls; then
+			multilib_is_native_abi && einfo "SSL provided by rustls"
+			myconf+=( --with-rustls )
+		fi
+		if use curl_ssl_gnutls; then
+			multilib_is_native_abi && einfo "Default SSL provided by gnutls"
+			myconf+=( --with-default-ssl-backend=gnutls )
+		elif use curl_ssl_mbedtls; then
+			multilib_is_native_abi && einfo "Default SSL provided by mbedtls"
+			myconf+=( --with-default-ssl-backend=mbedtls )
+		elif use curl_ssl_openssl; then
+			multilib_is_native_abi && einfo "Default SSL provided by openssl"
+			myconf+=( --with-default-ssl-backend=openssl )
+		elif use curl_ssl_rustls; then
+			multilib_is_native_abi && einfo "Default SSL provided by rustls"
+			myconf+=( --with-default-ssl-backend=rustls )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+			die "Please file a bug, hit impossible condition w/ USE=ssl handling."
+		fi
+
+	else
+		myconf+=( --without-ssl )
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	myconf+=(
+		$(use_enable alt-svc)
+		--enable-basic-auth
+		--enable-bearer-auth
+		--enable-digest-auth
+		--enable-kerberos-auth
+		--enable-negotiate-auth
+		--enable-aws
+		--enable-dict
+		--disable-ech
+		--enable-file
+		$(use_enable ftp)
+		$(use_enable gopher)
+		$(use_enable hsts)
+		--enable-http
+		$(use_enable imap)
+		$(use_enable ldap)
+		$(use_enable ldap ldaps)
+		--enable-ntlm
+		$(use_enable pop3)
+		--enable-rt
+		--enable-rtsp
+		$(use_enable samba smb)
+		$(use_with ssh libssh2)
+		$(use_enable smtp)
+		$(use_enable telnet)
+		$(use_enable tftp)
+		--enable-tls-srp
+		$(use_enable adns ares)
+		--enable-cookies
+		--enable-dateparse
+		--enable-dnsshuffle
+		--enable-doh
+		--enable-symbol-hiding
+		--enable-http-auth
+		--enable-ipv6
+		--enable-largefile
+		--enable-manual
+		--enable-mime
+		--enable-netrc
+		$(use_enable progress-meter)
+		--enable-proxy
+		--enable-socketpair
+		--disable-sspi
+		$(use_enable static-libs static)
+		--enable-pthreads
+		--enable-threaded-resolver
+		--disable-versioned-symbols
+		--without-amissl
+		--without-bearssl
+		$(use_with brotli)
+		--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
+		$(use_with http2 nghttp2)
+		--without-hyper
+		$(use_with idn libidn2)
+		$(use_with kerberos gssapi "${EPREFIX}"/usr)
+		--without-libgsasl
+		$(use_with psl libpsl)
+		--without-msh3
+		$(use_with nghttp3)
+		$(use_with nghttp3 ngtcp2)
+		--without-quiche
+		$(use_with rtmp librtmp)
+		--without-schannel
+		--without-secure-transport
+		--without-test-caddy
+		--without-test-httpd
+		--without-test-nghttpx
+		$(use_enable websockets)
+		--without-winidn
+		--without-wolfssl
+		--with-zlib
+		$(use_with zstd)
+		--with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
+	)
+
+	if use debug; then
+		myconf+=(
+			--enable-debug
+		)
+	fi
+
+	if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then
+		myconf+=(
+			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
+		)
+	fi
+
+	if [[ ${CHOST} == *mingw* ]] ; then
+		myconf+=(
+			--disable-pthreads
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# Avoid building the client (we just want libcurl for multilib)
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use nghttp3; then
+		libs+=( "-lnghttp3" "-lngtcp2" )
+		priv+=( "libnghttp3" "libngtcp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi; then
+		# Shell completions
+		! tc-is-cross-compiler && emake -C scripts
+	fi
+}
+
+# There is also a pytest harness that tests for bugs in some very specific
+# situations; we can rely on upstream for this rather than adding additional test deps.
+multilib_src_test() {
+	# See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
+	# -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
+	# -v: verbose
+	# -a: keep going on failure (so we see everything which breaks, not just 1st test)
+	# -k: keep test files after completion
+	# -am: automake style TAP output
+	# -p: print logs if test fails
+	# Note: if needed, we can skip specific tests. See e.g. Fedora's packaging
+	# or just read https://github.com/curl/curl/tree/master/tests#run.
+	# Note: we don't run the testsuite for cross-compilation.
+	# Upstream recommend 7*nproc as a starting point for parallel tests, but
+	# this ends up breaking when nproc is huge (like -j80).
+	# The network sandbox causes tests 241 and 1083 to fail; these are typically skipped
+	# as most gentoo users don't have an 'ip6-localhost'
+	multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi; then
+		# Shell completions
+		! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm -rf "${ED}"/etc/ || die
+}
+
+pkg_postinst() {
+	if use debug; then
+		ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose."
+		ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger."
+		ewarn "hic sunt dracones; you have been warned."
+	fi
+}
diff --git a/net-misc/curl/curl-8.9.1-r1.ebuild b/net-misc/curl/curl-8.9.1-r1.ebuild
deleted file mode 100644
index 6f36295d7391..000000000000
--- a/net-misc/curl/curl-8.9.1-r1.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainers should subscribe to the 'curl-distros' ML for backports etc
-# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/
-# https://lists.haxx.se/listinfo/curl-distros
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
-inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.se/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/curl/curl.git"
-else
-	SRC_URI="
-		https://curl.se/download/${P}.tar.xz
-		verify-sig? ( https://curl.se/download/${P}.tar.xz.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"
-fi
-
-LICENSE="BSD curl ISC test? ( BSD-4 )"
-SLOT="0"
-IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 idn +imap kerberos ldap mbedtls +openssl +pop3"
-IUSE+=" +psl +progress-meter +quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
-# These select the default tls implementation / which quic impl to use
-IUSE+=" +curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
-RESTRICT="!test? ( test )"
-
-# Only one default ssl / quic provider can be enabled
-# The default provider needs its USE satisfied
-# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL offers any benefit at all in the modern day.
-# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e
-REQUIRED_USE="
-	quic? (
-		^^ (
-			curl_quic_openssl
-			curl_quic_ngtcp2
-		)
-		http3
-		ssl
-	)
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_mbedtls
-			curl_ssl_openssl
-			curl_ssl_rustls
-		)
-	)
-	curl_quic_openssl? (
-		curl_ssl_openssl
-		quic
-		!gnutls
-		!mbedtls
-		!rustls
-	)
-	curl_quic_ngtcp2? (
-		curl_ssl_gnutls
-		quic
-		!mbedtls
-		!openssl
-		!rustls
-	)
-	curl_ssl_gnutls? ( gnutls )
-	curl_ssl_mbedtls? ( mbedtls )
-	curl_ssl_openssl? ( openssl )
-	curl_ssl_rustls? ( rustls )
-	http3? ( alt-svc quic )
-"
-
-# cURL's docs and CI/CD are great resources for confirming supported versions
-# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
-# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions)
-# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly)
-# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2)
-# However 'supported' vs 'works' are two entirely different things; be sane but
-# don't be afraid to require a later version.
-# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time.
-RDEPEND="
-	>=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
-	adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] )
-	http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
-	psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
-	quic? (
-		curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] )
-		curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] )
-	)
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls? (
-			app-misc/ca-certificates
-			>=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:=[${MULTILIB_USEDEP}]
-		)
-		mbedtls? (
-			app-misc/ca-certificates
-			net-libs/mbedtls:=[${MULTILIB_USEDEP}]
-		)
-		openssl? (
-			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
-		)
-		rustls? (
-			>=net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}]
-		)
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
-		http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
-	)
-	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
-"
-
-DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__builtin_available
-	closesocket
-	CloseSocket
-	getpass_r
-	ioctlsocket
-	IoctlSocket
-	mach_absolute_time
-	setmode
-	_fseeki64
-	# custom AC_LINK_IFELSE code fails to link even without -Werror
-	OSSL_QUIC_client_method
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-prefix-2.patch
-	"${FILESDIR}"/${PN}-respect-cflags-3.patch
-	"${FILESDIR}"/${PN}-8.9.1-sigpipe.patch
-)
-
-src_prepare() {
-	default
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl; then
-		myconf+=( --without-gnutls --without-mbedtls --without-rustls )
-
-		if use gnutls; then
-			multilib_is_native_abi && einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls )
-		fi
-		if use mbedtls; then
-			multilib_is_native_abi && einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		fi
-		if use openssl; then
-			multilib_is_native_abi && einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-		if use rustls; then
-			multilib_is_native_abi && einfo "SSL provided by rustls"
-			myconf+=( --with-rustls )
-		fi
-		if use curl_ssl_gnutls; then
-			multilib_is_native_abi && einfo "Default SSL provided by gnutls"
-			myconf+=( --with-default-ssl-backend=gnutls )
-		elif use curl_ssl_mbedtls; then
-			multilib_is_native_abi && einfo "Default SSL provided by mbedtls"
-			myconf+=( --with-default-ssl-backend=mbedtls )
-		elif use curl_ssl_openssl; then
-			multilib_is_native_abi && einfo "Default SSL provided by openssl"
-			myconf+=( --with-default-ssl-backend=openssl )
-		elif use curl_ssl_rustls; then
-			multilib_is_native_abi && einfo "Default SSL provided by rustls"
-			myconf+=( --with-default-ssl-backend=rustls )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-			die "Please file a bug, hit impossible condition w/ USE=ssl handling."
-		fi
-
-	else
-		myconf+=( --without-ssl )
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
-	myconf+=(
-		$(use_enable alt-svc)
-		--enable-basic-auth
-		--enable-bearer-auth
-		--enable-digest-auth
-		--enable-kerberos-auth
-		--enable-negotiate-auth
-		--enable-aws
-		--enable-dict
-		--disable-ech
-		--enable-file
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable hsts)
-		--enable-http
-		$(use_enable imap)
-		$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		--enable-ntlm
-		$(use_enable pop3)
-		--enable-rt
-		--enable-rtsp
-		$(use_enable samba smb)
-		$(use_with ssh libssh2)
-		$(use_enable smtp)
-		$(use_enable telnet)
-		$(use_enable tftp)
-		--enable-tls-srp
-		$(use_enable adns ares)
-		--enable-cookies
-		--enable-dateparse
-		--enable-dnsshuffle
-		--enable-doh
-		--enable-symbol-hiding
-		--enable-http-auth
-		--enable-ipv6
-		--enable-largefile
-		--enable-manual
-		--enable-mime
-		--enable-netrc
-		$(use_enable progress-meter)
-		--enable-proxy
-		--enable-socketpair
-		--disable-sspi
-		$(use_enable static-libs static)
-		--enable-pthreads
-		--enable-threaded-resolver
-		--disable-versioned-symbols
-		--without-amissl
-		--without-bearssl
-		$(use_with brotli)
-		--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
-		$(use_with http2 nghttp2)
-		--without-hyper
-		$(use_with idn libidn2)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		--without-libgsasl
-		$(use_with psl libpsl)
-		--without-msh3
-		$(use_with http3 nghttp3)
-		$(use_with curl_quic_ngtcp2 ngtcp2)
-		$(use_with curl_quic_openssl openssl-quic)
-		--without-quiche
-		$(use_with rtmp librtmp)
-		--without-schannel
-		--without-secure-transport
-		--without-test-caddy
-		--without-test-httpd
-		--without-test-nghttpx
-		$(use_enable websockets)
-		--without-winidn
-		--without-wolfssl
-		--with-zlib
-		$(use_with zstd)
-		--with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
-	)
-
-	if use debug; then
-		myconf+=(
-			--enable-debug
-		)
-	fi
-
-	if use test && multilib_is_native_abi && ( use http2 || use http3 ); then
-		myconf+=(
-			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
-		)
-	fi
-
-	if [[ ${CHOST} == *mingw* ]] ; then
-		myconf+=(
-			--disable-pthreads
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# Avoid building the client (we just want libcurl for multilib)
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi; then
-		# Shell completions
-		! tc-is-cross-compiler && emake -C scripts
-	fi
-}
-
-# There is also a pytest harness that tests for bugs in some very specific
-# situations; we can rely on upstream for this rather than adding additional test deps.
-multilib_src_test() {
-	# See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
-	# -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
-	# -v: verbose
-	# -a: keep going on failure (so we see everything which breaks, not just 1st test)
-	# -k: keep test files after completion
-	# -am: automake style TAP output
-	# -p: print logs if test fails
-	# Note: if needed, we can skip specific tests. See e.g. Fedora's packaging
-	# or just read https://github.com/curl/curl/tree/master/tests#run.
-	# Note: we don't run the testsuite for cross-compilation.
-	# Upstream recommend 7*nproc as a starting point for parallel tests, but
-	# this ends up breaking when nproc is huge (like -j80).
-	# The network sandbox causes tests 241 and 1083 to fail; these are typically skipped
-	# as most gentoo users don't have an 'ip6-localhost'
-	multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi; then
-		# Shell completions
-		! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm -rf "${ED}"/etc/ || die
-}
-
-pkg_postinst() {
-	if use debug; then
-		ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose."
-		ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger."
-		ewarn "hic sunt dracones; you have been warned."
-	fi
-}
diff --git a/net-misc/curl/curl-8.9.1-r2.ebuild b/net-misc/curl/curl-8.9.1-r2.ebuild
new file mode 100644
index 000000000000..0648465d5677
--- /dev/null
+++ b/net-misc/curl/curl-8.9.1-r2.ebuild
@@ -0,0 +1,384 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should subscribe to the 'curl-distros' ML for backports etc
+# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/
+# https://lists.haxx.se/listinfo/curl-distros
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
+inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.se/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/curl/curl.git"
+else
+	SRC_URI="
+		https://curl.se/download/${P}.tar.xz
+		verify-sig? ( https://curl.se/download/${P}.tar.xz.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"
+fi
+
+LICENSE="BSD curl ISC test? ( BSD-4 )"
+SLOT="0"
+IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 idn +imap kerberos ldap mbedtls +openssl +pop3"
+IUSE+=" +psl +progress-meter +quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
+# These select the default tls implementation / which quic impl to use
+IUSE+=" +curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
+RESTRICT="!test? ( test )"
+
+# Only one default ssl / quic provider can be enabled
+# The default provider needs its USE satisfied
+# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL offers any benefit at all in the modern day.
+# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e
+REQUIRED_USE="
+	quic? (
+		^^ (
+			curl_quic_openssl
+			curl_quic_ngtcp2
+		)
+		http3
+		ssl
+	)
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_mbedtls
+			curl_ssl_openssl
+			curl_ssl_rustls
+		)
+	)
+	curl_quic_openssl? (
+		curl_ssl_openssl
+		quic
+		!gnutls
+		!mbedtls
+		!rustls
+	)
+	curl_quic_ngtcp2? (
+		curl_ssl_gnutls
+		quic
+		!mbedtls
+		!openssl
+		!rustls
+	)
+	curl_ssl_gnutls? ( gnutls )
+	curl_ssl_mbedtls? ( mbedtls )
+	curl_ssl_openssl? ( openssl )
+	curl_ssl_rustls? ( rustls )
+	http3? ( alt-svc quic )
+"
+
+# cURL's docs and CI/CD are great resources for confirming supported versions
+# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
+# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions)
+# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly)
+# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2)
+# However 'supported' vs 'works' are two entirely different things; be sane but
+# don't be afraid to require a later version.
+# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time.
+RDEPEND="
+	>=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
+	adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] )
+	http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
+	psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
+	quic? (
+		curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] )
+		curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] )
+	)
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			app-misc/ca-certificates
+			>=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:=[${MULTILIB_USEDEP}]
+		)
+		mbedtls? (
+			app-misc/ca-certificates
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+		)
+		openssl? (
+			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+		)
+		rustls? (
+			>=net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}]
+		)
+	)
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
+		http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
+	)
+	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
+"
+
+DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__builtin_available
+	closesocket
+	CloseSocket
+	getpass_r
+	ioctlsocket
+	IoctlSocket
+	mach_absolute_time
+	setmode
+	_fseeki64
+	# custom AC_LINK_IFELSE code fails to link even without -Werror
+	OSSL_QUIC_client_method
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-prefix-2.patch
+	"${FILESDIR}"/${PN}-respect-cflags-3.patch
+	"${FILESDIR}"/${PN}-8.9.1-sigpipe.patch
+)
+
+src_prepare() {
+	default
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl; then
+		myconf+=( --without-gnutls --without-mbedtls --without-rustls )
+
+		if use gnutls; then
+			multilib_is_native_abi && einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls )
+		fi
+		if use mbedtls; then
+			multilib_is_native_abi && einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		fi
+		if use openssl; then
+			multilib_is_native_abi && einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+		if use rustls; then
+			multilib_is_native_abi && einfo "SSL provided by rustls"
+			myconf+=( --with-rustls )
+		fi
+		if use curl_ssl_gnutls; then
+			multilib_is_native_abi && einfo "Default SSL provided by gnutls"
+			myconf+=( --with-default-ssl-backend=gnutls )
+		elif use curl_ssl_mbedtls; then
+			multilib_is_native_abi && einfo "Default SSL provided by mbedtls"
+			myconf+=( --with-default-ssl-backend=mbedtls )
+		elif use curl_ssl_openssl; then
+			multilib_is_native_abi && einfo "Default SSL provided by openssl"
+			myconf+=( --with-default-ssl-backend=openssl )
+		elif use curl_ssl_rustls; then
+			multilib_is_native_abi && einfo "Default SSL provided by rustls"
+			myconf+=( --with-default-ssl-backend=rustls )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+			die "Please file a bug, hit impossible condition w/ USE=ssl handling."
+		fi
+
+	else
+		myconf+=( --without-ssl )
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	myconf+=(
+		$(use_enable alt-svc)
+		--enable-basic-auth
+		--enable-bearer-auth
+		--enable-digest-auth
+		--enable-kerberos-auth
+		--enable-negotiate-auth
+		--enable-aws
+		--enable-dict
+		--disable-ech
+		--enable-file
+		$(use_enable ftp)
+		$(use_enable gopher)
+		$(use_enable hsts)
+		--enable-http
+		$(use_enable imap)
+		$(use_enable ldap)
+		$(use_enable ldap ldaps)
+		--enable-ntlm
+		$(use_enable pop3)
+		--enable-rt
+		--enable-rtsp
+		$(use_enable samba smb)
+		$(use_with ssh libssh2)
+		$(use_enable smtp)
+		$(use_enable telnet)
+		$(use_enable tftp)
+		--enable-tls-srp
+		$(use_enable adns ares)
+		--enable-cookies
+		--enable-dateparse
+		--enable-dnsshuffle
+		--enable-doh
+		--enable-symbol-hiding
+		--enable-http-auth
+		--enable-ipv6
+		--enable-largefile
+		--enable-manual
+		--enable-mime
+		--enable-netrc
+		$(use_enable progress-meter)
+		--enable-proxy
+		--enable-socketpair
+		--disable-sspi
+		$(use_enable static-libs static)
+		--enable-pthreads
+		--enable-threaded-resolver
+		--disable-versioned-symbols
+		--without-amissl
+		--without-bearssl
+		$(use_with brotli)
+		--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
+		$(use_with http2 nghttp2)
+		--without-hyper
+		$(use_with idn libidn2)
+		$(use_with kerberos gssapi "${EPREFIX}"/usr)
+		--without-libgsasl
+		$(use_with psl libpsl)
+		--without-msh3
+		$(use_with http3 nghttp3)
+		$(use_with curl_quic_ngtcp2 ngtcp2)
+		$(use_with curl_quic_openssl openssl-quic)
+		--without-quiche
+		$(use_with rtmp librtmp)
+		--without-schannel
+		--without-secure-transport
+		--without-test-caddy
+		--without-test-httpd
+		--without-test-nghttpx
+		$(use_enable websockets)
+		--without-winidn
+		--without-wolfssl
+		--with-zlib
+		$(use_with zstd)
+		--with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
+	)
+
+	if use debug; then
+		myconf+=(
+			--enable-debug
+		)
+	fi
+
+	if use test && multilib_is_native_abi && ( use http2 || use http3 ); then
+		myconf+=(
+			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
+		)
+	fi
+
+	if [[ ${CHOST} == *mingw* ]] ; then
+		myconf+=(
+			--disable-pthreads
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# Avoid building the client (we just want libcurl for multilib)
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi; then
+		# Shell completions
+		! tc-is-cross-compiler && emake -C scripts
+	fi
+}
+
+# There is also a pytest harness that tests for bugs in some very specific
+# situations; we can rely on upstream for this rather than adding additional test deps.
+multilib_src_test() {
+	# See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
+	# -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
+	# -v: verbose
+	# -a: keep going on failure (so we see everything which breaks, not just 1st test)
+	# -k: keep test files after completion
+	# -am: automake style TAP output
+	# -p: print logs if test fails
+	# Note: if needed, we can skip specific tests. See e.g. Fedora's packaging
+	# or just read https://github.com/curl/curl/tree/master/tests#run.
+	# Note: we don't run the testsuite for cross-compilation.
+	# Upstream recommend 7*nproc as a starting point for parallel tests, but
+	# this ends up breaking when nproc is huge (like -j80).
+	# The network sandbox causes tests 241 and 1083 to fail; these are typically skipped
+	# as most gentoo users don't have an 'ip6-localhost'
+	multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi; then
+		# Shell completions
+		! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm -rf "${ED}"/etc/ || die
+}
+
+pkg_postinst() {
+	if use debug; then
+		ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose."
+		ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger."
+		ewarn "hic sunt dracones; you have been warned."
+	fi
+}
diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild
index 09179eadd2f2..5a37525caae2 100644
--- a/net-misc/curl/curl-9999.ebuild
+++ b/net-misc/curl/curl-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
@@ -106,7 +106,7 @@ RDEPEND="
 		)
 		mbedtls? (
 			app-misc/ca-certificates
-			net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
 		)
 		openssl? (
 			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 8de118df2785..f5744007495f 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,7 +1,3 @@
 DIST dropbox-icon.svg 574 BLAKE2B a73a0906b5b03dc3214010736164fcdbceb6d91463ed95133b5117277cd635c8a77ec3e7ca8338538e5a6a2c4a23f3ef0186184bc1dc770b3c7f3a219f00faa6 SHA512 cd7ad8fea652f0713a00e7fbd88d6c22949dde216040f2ba7c903db70cb6c5c9ec85202831c0863c3bb2cf339b4ea0c6731d7b2d56750b63a4f36160815e4346
-DIST dropbox-lnx.x86_64-209.4.3661.tar.gz 117384855 BLAKE2B 509c1e3b8eab3e44b6b713988b7bebc83f9ee62c94100fceb163496d5b419c4caaf933f9646e21ad996a303140639b7de44b2a52fac942adc23a1973a86149ab SHA512 769c3063f87732ecc82e44e1de7ffa581d313fbdecf2230304730ab58da0e4a0bf284e3188897d066c961a5e25316c481b47d46e6dc015a5b974ade7074a4b54
-DIST dropbox-lnx.x86_64-210.4.4854.tar.gz 117607664 BLAKE2B 402717c16c063de5b506826cdf2862eab009e3b8c28eda64deebc7dc9637947c1d46dec183a99bab3353257e1ca118e4fe72f390537175038a0b25eb7adc8a6a SHA512 4331999d87e7326dd6a60bb1aebce94326e776a595f6222bd9238a4225139b84324bde6215162aece0eb87868e1e6320092ba40d6fff684dbdc39535dc5426b4
-DIST dropbox-lnx.x86_64-211.4.6008.tar.gz 113807403 BLAKE2B 893e8e7480b44551b79581172d908f7caa76fe8df54704f0fff3bb02bd0885ca07f0feb3a8cb70f7f21abdc9534204acf95d9ffa62b72bda3ca17ef9b9a271ac SHA512 e734581117dcc78c72cb925316a88def7d094b04058b6753d498fc258a82bddb9a920e546c92ddd441d9ed0e9b8e6109c4924e2a14da1414166dec7c26a651ce
-DIST dropbox-lnx.x86_64-212.4.5767.tar.gz 113020508 BLAKE2B ac8ee381a4e28f84cdb1103e30bf2e1f2e948340e62811381961d90c3b49886133b0a64c62f06de0fb17d1e753b3bb854518ec1e94f779dcdd351dff1f349ba4 SHA512 c2d827794186be2ff40bc58048885e21a360410d8a00b142ae184e72a0982a50a02a1ab02cdad38957e66413b020bd08c41d86da6818b30694b1ad21316ae3fb
-DIST dropbox-lnx.x86_64-213.4.4597.tar.gz 112310334 BLAKE2B 24d94630e755fdafe56c37f0963acf4a35f19da85ed1616434d1dafe152b0b51a883932978b9aa946a088ad6eb9f166658812fbefa61e916da1902c85b483e30 SHA512 6646a444bd1bd22656aad9f13a713ab04373307e0cdc32fea1bfe2115cd10f781a0816894790033d2b39f841711312693d4df6feeb696a3f805fcb50eac32a0f
 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
diff --git a/net-misc/dropbox/dropbox-209.4.3661.ebuild b/net-misc/dropbox/dropbox-209.4.3661.ebuild
deleted file mode 100644
index 3f3f937a4064..000000000000
--- a/net-misc/dropbox/dropbox-209.4.3661.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 desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz
-	https://uxwing.com/wp-content/themes/uxwing/download/brands-and-social-media/dropbox-icon.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	if use X; then
-		doicon -s 16 -c status "${T}"/status
-		newicon -s scalable "${DISTDIR}/dropbox-icon.svg" dropbox.svg
-	fi
-
-	make_desktop_entry "${PN}" "Dropbox" "dropbox"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-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:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-210.4.4854.ebuild b/net-misc/dropbox/dropbox-210.4.4854.ebuild
deleted file mode 100644
index 9aafe425d4d6..000000000000
--- a/net-misc/dropbox/dropbox-210.4.4854.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 desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz
-	https://uxwing.com/wp-content/themes/uxwing/download/brands-and-social-media/dropbox-icon.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	if use X; then
-		doicon -s 16 -c status "${T}"/status
-		newicon -s scalable "${DISTDIR}/dropbox-icon.svg" dropbox.svg
-	fi
-
-	make_desktop_entry "${PN}" "Dropbox" "dropbox"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-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:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-211.4.6008.ebuild b/net-misc/dropbox/dropbox-211.4.6008.ebuild
deleted file mode 100644
index 9aafe425d4d6..000000000000
--- a/net-misc/dropbox/dropbox-211.4.6008.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 desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz
-	https://uxwing.com/wp-content/themes/uxwing/download/brands-and-social-media/dropbox-icon.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	if use X; then
-		doicon -s 16 -c status "${T}"/status
-		newicon -s scalable "${DISTDIR}/dropbox-icon.svg" dropbox.svg
-	fi
-
-	make_desktop_entry "${PN}" "Dropbox" "dropbox"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-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:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-212.4.5767.ebuild b/net-misc/dropbox/dropbox-212.4.5767.ebuild
deleted file mode 100644
index 9aafe425d4d6..000000000000
--- a/net-misc/dropbox/dropbox-212.4.5767.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 desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz
-	https://uxwing.com/wp-content/themes/uxwing/download/brands-and-social-media/dropbox-icon.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	if use X; then
-		doicon -s 16 -c status "${T}"/status
-		newicon -s scalable "${DISTDIR}/dropbox-icon.svg" dropbox.svg
-	fi
-
-	make_desktop_entry "${PN}" "Dropbox" "dropbox"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-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:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-213.4.4597.ebuild b/net-misc/dropbox/dropbox-213.4.4597.ebuild
deleted file mode 100644
index 9aafe425d4d6..000000000000
--- a/net-misc/dropbox/dropbox-213.4.4597.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 desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz
-	https://uxwing.com/wp-content/themes/uxwing/download/brands-and-social-media/dropbox-icon.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	if use X; then
-		doicon -s 16 -c status "${T}"/status
-		newicon -s scalable "${DISTDIR}/dropbox-icon.svg" dropbox.svg
-	fi
-
-	make_desktop_entry "${PN}" "Dropbox" "dropbox"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-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:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-214.4.5217.ebuild b/net-misc/dropbox/dropbox-214.4.5217.ebuild
index 9aafe425d4d6..1cc4d0f0e51e 100644
--- a/net-misc/dropbox/dropbox-214.4.5217.ebuild
+++ b/net-misc/dropbox/dropbox-214.4.5217.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 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="selinux X"
 
 RESTRICT="mirror strip"
@@ -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
new file mode 100644
index 000000000000..8bce8f921402
--- /dev/null
+++ b/net-misc/dropbox/dropbox-215.4.7202.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz
+	https://uxwing.com/wp-content/themes/uxwing/download/brands-and-social-media/dropbox-icon.svg
+"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		x11-themes/hicolor-icon-theme
+	)
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/glib:2
+	dev-libs/libffi-compat:6
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/wget
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libxcb
+"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+	# we supply all of these in RDEPEND
+	rm -vf libGL.so.1 libX11* libffi.so.6 || die
+	# some of these do not appear to be used
+	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
+		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
+		wmctrl libdrm.so.2 libpopt.so.0 || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	if use X; then
+		doicon -s 16 -c status "${T}"/status
+		newicon -s scalable "${DISTDIR}/dropbox-icon.svg" dropbox.svg
+	fi
+
+	make_desktop_entry "${PN}" "Dropbox" "dropbox"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+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:"
+	einfo ""
+	einfo "install -dm0 ~/.dropbox-dist"
+}
diff --git a/net-misc/electrum/electrum-4.5.8-r2.ebuild b/net-misc/electrum/electrum-4.5.8-r2.ebuild
index e7eecb79c2c5..09ca3fcc853b 100644
--- a/net-misc/electrum/electrum-4.5.8-r2.ebuild
+++ b/net-misc/electrum/electrum-4.5.8-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="ncurses?"
 
 inherit distutils-r1 verify-sig xdg-utils
diff --git a/net-misc/ena-driver/Manifest b/net-misc/ena-driver/Manifest
index c93f616f6ee2..c9ad76157e2f 100644
--- a/net-misc/ena-driver/Manifest
+++ b/net-misc/ena-driver/Manifest
@@ -1 +1,2 @@
 DIST ena-driver-2.13.0-linux.tar.gz 1450959 BLAKE2B 3536d976505de48f64ad33bb30269dbc090631e862c68c250f9452e5537018f86ecb93fa2272a812172c9145d33ecef7e82a1cee3cf86db53f520f6e2b3d3545 SHA512 2be761afae1374ab5d8043d01d8521c21c944d8e6830b0cf24dea6e51a4b2e1751d5521ad261af9eebca819c9c15ebcec5a84b51af505df7bc9cd99ef0350939
+DIST ena-driver-2.13.2-linux.tar.gz 1468215 BLAKE2B e5f4cba68b77b2c9b971771f548ad62d555838d6f8c88dc33282fc2498df3e7e9503f8aa346999652e4b3102c4dc1981d2e8e21587c9f1201aef7b6c3c03c761 SHA512 c4c20fe3ad79496ef99c2137855b5842a8dab18e936eca890509a70c66832892f4a13c7cb7cf15546525226eaddbc632ce45a296656fbf36414bb67929a928aa
diff --git a/net-misc/ena-driver/ena-driver-2.13.2.ebuild b/net-misc/ena-driver/ena-driver-2.13.2.ebuild
new file mode 100644
index 000000000000..9c3884dfcf29
--- /dev/null
+++ b/net-misc/ena-driver/ena-driver-2.13.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1
+
+DESCRIPTION="Amazon EC2 Elastic Network Adapter (ENA) kernel driver"
+HOMEPAGE="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html"
+SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.tar.gz -> ${P}-linux.tar.gz"
+S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="app-arch/unzip"
+
+CONFIG_CHECK="PCI_MSI !CPU_BIG_ENDIAN DIMLIB"
+DOCS=(
+	README.rst
+	RELEASENOTES.md
+	ENA_Linux_Best_Practices.rst
+)
+
+src_compile() {
+	local modlist=( ena=net )
+	local modargs=( CONFIG_MODULE_SIG=n BUILD_KERNEL="${KV_FULL}" )
+	linux-mod-r1_src_compile
+}
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 0713b940a00e..07c9b7361cb2 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,4 +1,5 @@
-DIST gallery-dl-1.27.7.gh.tar.gz 738516 BLAKE2B af29a40de14c392101c50698ae2199f64b458c8e5ab997982625773f21b069d5b3133c1a7897a743255962c5494e0536f36f4c4067872a06761a5a3a333e44ca SHA512 384c5a5c7dfac01ad48dbbe12750e5bec5814620bebd1d49866a9a3b6d64f7aac60e4173f737ed2678c6d57e372b6957cb747d28444981a4ddb7721bd4f9cff9
 DIST gallery-dl-1.28.0.gh.tar.gz 766066 BLAKE2B d99cff290ea3b4c1e32a77a1eb3c751b51a8741402a50586edb3d029b36bd7178358fb0541452538cde6fb75029dfb6839d02602a8d869e8ae0406914fa13e90 SHA512 2e1a49ea4db7ba7576ac62a1518d1bb54110720c53ebda3bb9ef272422d7ccbb742b60dd49cd5d5830cb89d67dce849d355f0972030b27d337577d7e622a0998
 DIST gallery-dl-1.28.1.gh.tar.gz 768090 BLAKE2B 865f2ab4844202bd7643090783d173637d8eb1c58426074e012e44350a564ee44ff59a034533164306f89ba320bafb81ad91691dfda539c29ea6ab8359ed0d7f SHA512 438e03476dd9f8c551368c1de51911cf26de74e174f34f59579f8293d41112ca269cfd2f44a9eb7c0e012cfbb36beef8bd85aac0415147da518ed14d8009fc69
 DIST gallery-dl-1.28.2.gh.tar.gz 774891 BLAKE2B 4abbcffa26f3ef15abc2385f5d84b7e11075e26751ce6cd2c9ee621530a21d55fe0f3356bcc0c022389f66189051d9baba3cf5e9867488f95bc9a6cb63e739d3 SHA512 4a7b7c11f98e333038640f0fc422aa0148a73f2163ff41f2778000499d33eafe2257ae143198b936627272ee281a3f14e458aa977094f24fea5751de68982251
+DIST gallery-dl-1.28.3.gh.tar.gz 713131 BLAKE2B 0d5776b3a643bb58018bed427fca4d5dc0a892d601fdf58c2546cdbe014cf9a76d959fd54ce3ca38b919b9b54181158d2e0c3c183f4238cb3928eaac08d5063f SHA512 7390745f5bda7fa2864a113cf5484aeb28949a89e51847534941c19eaed8c971398411c5b70d12c3443c0b1af208e62e92c67f499deb3f0aa31b1f5d46b572e7
+DIST gallery-dl-1.28.4.gh.tar.gz 783110 BLAKE2B 954fcff7f65b6c835aba935ca3707987729cecbaeab8b99387280a661c3440f110bbd7e71c6d2d6e655825f99ef18f1dd803fd934c2b4cd0316dd597515f84d7 SHA512 eb0810dfdbd4eed5d7586af7649e4d72a98f4ed3060448a749c9cd17a3dfde1688782bbfd29738e551324b75dc4a0d2c8134539f5e4356bcfe4532694a67d690
diff --git a/net-misc/gallery-dl/gallery-dl-1.27.7.ebuild b/net-misc/gallery-dl/gallery-dl-1.27.7.ebuild
deleted file mode 100644
index f8c14c22a279..000000000000
--- a/net-misc/gallery-dl/gallery-dl-1.27.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{12..13} )
-PYTHON_REQ_USE="sqlite,ssl,xml(+)"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download image galleries and collections from several image hosting sites"
-HOMEPAGE="https://github.com/mikf/gallery-dl/"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
-else
-	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Tests against real servers, some tests always fail and some are subject to change.
-	rm test/test_extractor.py test/test_results.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_compile_all() {
-	emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man
-}
-
-pkg_postinst() {
-	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
-	optfeature "video downloads" net-misc/yt-dlp
-}
diff --git a/net-misc/gallery-dl/gallery-dl-1.28.0.ebuild b/net-misc/gallery-dl/gallery-dl-1.28.0.ebuild
index 254956362b1d..0b041cbbf2d3 100644
--- a/net-misc/gallery-dl/gallery-dl-1.28.0.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.28.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
@@ -20,7 +20,7 @@ else
 	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/gallery-dl/gallery-dl-1.28.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.28.3.ebuild
new file mode 100644
index 000000000000..8bb9fcbbb941
--- /dev/null
+++ b/net-misc/gallery-dl/gallery-dl-1.28.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{12..13} )
+PYTHON_REQ_USE="sqlite,ssl,xml(+)"
+DISTUTILS_USE_PEP517="setuptools"
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Download image galleries and collections from several image hosting sites"
+HOMEPAGE="https://github.com/mikf/gallery-dl/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
+else
+	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Tests against real servers, some tests always fail and some are subject to change.
+	rm ./test/test_{extractor,results}.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_compile_all() {
+	emake PYTHON="${EPYTHON}" ./data/completion/{,_}gallery-dl man
+}
+
+pkg_postinst() {
+	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
+	optfeature "video downloads" net-misc/yt-dlp
+}
diff --git a/net-misc/gallery-dl/gallery-dl-1.28.4.ebuild b/net-misc/gallery-dl/gallery-dl-1.28.4.ebuild
new file mode 100644
index 000000000000..8bb9fcbbb941
--- /dev/null
+++ b/net-misc/gallery-dl/gallery-dl-1.28.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{12..13} )
+PYTHON_REQ_USE="sqlite,ssl,xml(+)"
+DISTUTILS_USE_PEP517="setuptools"
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Download image galleries and collections from several image hosting sites"
+HOMEPAGE="https://github.com/mikf/gallery-dl/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
+else
+	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Tests against real servers, some tests always fail and some are subject to change.
+	rm ./test/test_{extractor,results}.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_compile_all() {
+	emake PYTHON="${EPYTHON}" ./data/completion/{,_}gallery-dl man
+}
+
+pkg_postinst() {
+	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
+	optfeature "video downloads" net-misc/yt-dlp
+}
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index c4c90d690a54..7fb119b992c4 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-remote-desktop-45.1.tar.xz 213504 BLAKE2B 78dd348cf15b677f52ca327ac824b2bd5276d53e7b6578bef0634e00e81993c1a1802ee861a31527af03351e6640cc9fcdc5f86fd44f20ec56138837dd9f05b6 SHA512 4572fefa03ee433783c822cf0405bd17b645f3aa08e8d88c04165859fd30643d612e5d7516a64ded8c1a0d2007026d6df877930b5ea127d7e1e939c1bb60f379
 DIST gnome-remote-desktop-46.3.tar.xz 273304 BLAKE2B dd959c0fabf183afd0be39da84f344589d5f5a6defaa298141bba4aeb3a39b253c962095efe35e425c106ae7126ddf2b3c8bba79b43054e26d0e0ff61c8e5ce5 SHA512 4e12ef3156eae8a1770646dd10235f0950ca34bd60bd8358958fe98696c2eb3af9ed9a2ad37239de9b4f25e0991bb7248a1d0f89e4b67c34430d5980064d4319
+DIST gnome-remote-desktop-47.1.tar.xz 283864 BLAKE2B 17c70fe8b5642d9abb77e1fee12328ea9c2f1ada146f39b374432441de44c37f190dfaf2d420403d676478b466e89fa43b47d25ad080e1f7d69e4afa8c0dd01d SHA512 072d4064d23976eaf76a3293c313a6e121a33ab5ab5aa9557e6065579b72cfeae3e070db705c9d1d07dbb9fd5633ab5014aa1d4f022bc0b9a15ee2120589b75c
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1-r1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1-r1.ebuild
deleted file mode 100644
index 61bc7a28c45c..000000000000
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1-r1.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 gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="aac doc +rdp systemd +vnc"
-REQUIRED_USE="|| ( rdp vnc ) aac? ( rdp )"
-RESTRICT="test" # Tests run xvfb-run directly
-
-DEPEND="
-	x11-libs/cairo
-	x11-libs/libdrm
-	>=media-libs/libepoxy-1.4
-	>=dev-libs/glib-2.68:2
-	>=dev-libs/libei-1.0.901
-	x11-libs/libnotify
-	app-crypt/libsecret
-	>=media-video/pipewire-0.3.49:=
-	app-crypt/tpm2-tss:=
-	rdp? (
-		>=media-libs/nv-codec-headers-11.1.5.0
-		>=net-misc/freerdp-2.10.0:2=[server]
-		>=sys-fs/fuse-3.9.1:3
-		>=x11-libs/libxkbcommon-1.0.0
-
-		aac? (
-			media-libs/fdk-aac:=
-		)
-	)
-	vnc? (
-		net-libs/libvncserver
-	)
-"
-RDEPEND="${DEPEND}
-	x11-wm/mutter[screencast]
-"
-BDEPEND="
-	dev-libs/glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	virtual/pkgconfig
-	doc? (
-		app-text/asciidoc
-	)
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc man)
-		$(meson_use aac fdk_aac)
-		$(meson_use rdp)
-		$(meson_use vnc)
-		$(meson_use systemd)
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-		-Dtests=false  # Tests run xvfb-run directly
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-47.1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-47.1.ebuild
new file mode 100644
index 000000000000..907fcb0f88c6
--- /dev/null
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-47.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson systemd tmpfiles xdg
+
+DESCRIPTION="Remote desktop server which allows you to connect to your machine remotely"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="doc +rdp systemd +vnc"
+REQUIRED_USE="|| ( rdp vnc )"
+RESTRICT="test" # Tests run xvfb-run directly
+
+DEPEND="
+	x11-libs/cairo
+	x11-libs/libdrm
+	>=media-libs/libepoxy-1.4
+	>=dev-libs/glib-2.75:2
+	>=dev-libs/libei-1.2.0
+	x11-libs/libnotify
+	app-crypt/libsecret
+	>=media-video/pipewire-0.3.49:=
+	app-crypt/tpm2-tss:=
+	rdp? (
+		>=media-libs/nv-codec-headers-11.1.5.0
+		>=net-misc/freerdp-3.1.0:=[server]
+		>=sys-fs/fuse-3.9.1:3
+		>=sys-auth/polkit-122
+		>=x11-libs/libxkbcommon-1.0.0
+		media-libs/fdk-aac:=
+	)
+	vnc? (
+		net-libs/libvncserver
+	)
+"
+RDEPEND="${DEPEND}
+	acct-user/gnome-remote-desktop
+	acct-group/gnome-remote-desktop
+	x11-wm/mutter[screencast]
+"
+BDEPEND="
+	dev-libs/glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+	doc? (
+		app-text/asciidoc
+	)
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc man)
+		$(meson_use rdp)
+		$(meson_use vnc)
+		$(meson_use systemd)
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		-Dtests=false  # Tests run xvfb-run directly
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}-tmpfiles.conf"
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-misc/gnome-remote-desktop/metadata.xml b/net-misc/gnome-remote-desktop/metadata.xml
index a1a029905dfd..2e7d80f07e20 100644
--- a/net-misc/gnome-remote-desktop/metadata.xml
+++ b/net-misc/gnome-remote-desktop/metadata.xml
@@ -5,9 +5,6 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
-  <use>
-    <flag name="aac">Use <pkg>media-libs/fdk-aac</pkg> for audio output redirection of the RDP backend</flag>
-  </use>
   <upstream>
     <remote-id type="gnome-gitlab">GNOME/gnome-remote-desktop</remote-id>
   </upstream>
diff --git a/net-misc/hurl/metadata.xml b/net-misc/hurl/metadata.xml
index cb7dbfdc6787..d76c4f2e9988 100644
--- a/net-misc/hurl/metadata.xml
+++ b/net-misc/hurl/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>arsen@gentoo.org</email>
-    <description>Arsen Arsenović</description>
+    <name>Arsen Arsenović</name>
   </maintainer>
   <upstream>
     <remote-id type="github">Orange-OpenSource/hurl</remote-id>
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 4415444a1c3c..6cc3dd76d522 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -1,5 +1,4 @@
-DIST linuxx64-23.5.0.58.tar.gz 449048746 BLAKE2B d0a70dbb29addc5da8f4ca32582eb210ef56cbbab21efa61ea19ae45ae12fcc59b080f0f30fdc5d1ed02169b5084a49ca265f7bfa9dde813809847f06b319046 SHA512 f695a4fed73b6bff30eb16f8c159799c7a7b4c17f088959f24c17fc4a51208c1354c19df1e22b9b975f8fcb13f6775ea1dca15dd149ea186d8aeee47f3830441
 DIST linuxx64-23.7.0.17.tar.gz 363012535 BLAKE2B 77e1fa1fb71d98840ebeebb444e86797a5514597dd1059cf19ed0a6240c05a68c13019350e26e6b52f96802a3eba4cb1a42ba20e85756aebed80e7e235a76089 SHA512 e25665ae8937c4a03382473df8f92b0227d6f07cad663ce71d4a90430014cc6630fb5593d688e6b59b7c65eaafeb3e258fc2f04f0d80573938dcb9d173a4ccab
+DIST linuxx64-24.11.0.85.tar.gz 440589375 BLAKE2B eba5970b4a6c99aa7ce76d04a58f5d3cf45885dd9f6aa332bbb4457c472bf58f3b2204779d75bb705c2381938af60f55e77d5d43471e56b6b9c789e9b5d1cf64 SHA512 426dc72a903d1d902c0fda3c2590a9e659ff1a6c5206d19a80d0f7d4905e3810a9be3318a6972598f2a175333f6d9737501460c30dc4f27899fcd1fec20eaa43
 DIST linuxx64-24.2.0.65.tar.gz 398188196 BLAKE2B 6869cb6ab3b53d7ca1020c2a504bdf071c871daff1601e21b32f50b299b7b81c9159f248ee0be9370241b119dc49f1a01038f81f623c323a25ba6ce8ec9c975c SHA512 312a32fc6b5ba1c8af5449ca71b024d02966521915ab94ed7ee580c9bf4782afdb383dc855a14c83181311e0eb2329654a1493afdb55ca49640510e348666cd3
-DIST linuxx86-23.5.0.58.tar.gz 152642143 BLAKE2B 8ea722aecfb7e6588701646ed5dec1d1591a8c36986fda25c85ece50313cd1eddefb22ae58be8f1ea2edbfdf9fa725e73182f0745b0494df890008d65065ed08 SHA512 8cad203451b26920d66fb3b1bb794d74f8ab76dd24d76408f51d60278786b59fe2d83f0e6c4a2eb6741a4e1d534b9739513224e0f27ba903a9266f81e439a51f
 DIST linuxx86-23.7.0.17.tar.gz 66184043 BLAKE2B 8e408ce26d75172cdd80d7bd9e1ef7aa8b855a7028673f00fd0aef6a42ca57ec8f11f894ecafb76a4e7b69c6cea922551ca9d4615aea436348ae2dbabc92e127 SHA512 e91a6205bb59e2d41075a5b5e0898cc0710a84ed7582ed2f053a3a83345daba1f437864c6e8111e80aabf19bc5b5d82b0fb6096948c166027a0f9fea183b883a
diff --git a/net-misc/icaclient/icaclient-23.5.0.58.ebuild b/net-misc/icaclient/icaclient-23.5.0.58.ebuild
deleted file mode 100644
index be7ca6568279..000000000000
--- a/net-misc/icaclient/icaclient-23.5.0.58.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop wrapper xdg-utils
-
-DESCRIPTION="ICA Client for Citrix Presentation servers"
-HOMEPAGE="https://www.citrix.com/"
-SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
-	x86? ( linuxx86-${PV}.tar.gz )"
-
-LICENSE="icaclient"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx usb"
-RESTRICT="mirror strip fetch"
-
-ICAROOT="/opt/Citrix/ICAClient"
-
-QA_PREBUILT="${ICAROOT#/}/*"
-
-# we have binaries for two conflicting kerberos implementations
-# https://bugs.gentoo.org/792090
-# https://bugs.gentoo.org/775995
-REQUIRES_EXCLUDE="
-	libgssapi.so.3
-	libgssapi_krb5.so.2 libkrb5.so.3
-"
-# when using media-plugins/hdx-realtime-media-engine we better not ignore that
-REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
-	!hdx? ( libunwind.so.1 )
-"
-# we have binaries which wouls still support gstreamer:0.10
-REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
-	libgstapp-0.10.so.0
-	libgstbase-0.10.so.0
-	libgstinterfaces-0.10.so.0
-	libgstpbutils-0.10.so.0
-	libgstreamer-0.10.so.0
-"
-
-# video background blurring, optional
-REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
-	libopencv_core.so.407
-	libopencv_imgcodecs.so.407
-	libopencv_imgproc.so.407
-"
-
-BDEPEND="
-	hdx? ( media-plugins/hdx-realtime-media-engine )
-"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-fonts/font-adobe-100dpi
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-ethiopic
-	media-fonts/font-misc-misc
-	media-fonts/font-xfree86-type1
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/gst-plugins-base:1.0
-	media-libs/gstreamer:1.0
-	media-libs/libogg
-	media-libs/libpng
-	media-libs/libpulse
-	media-libs/libvorbis
-	media-libs/mesa
-	media-libs/speex
-	media-libs/speexdsp
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
-	sys-apps/util-linux
-	llvm-runtimes/libcxx
-	llvm-runtimes/libcxxabi
-	sys-libs/zlib
-	virtual/krb5
-	virtual/libudev
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXinerama
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango
-	${BDEPEND}
-	!hdx? ( !media-plugins/hdx-realtime-media-engine )
-	usb? ( virtual/libudev )
-"
-
-pkg_nofetch() {
-	elog "Download the client file ${A} from
-	https://www.citrix.com/downloads/workspace-app/"
-	elog "and place it into your DISTDIR directory."
-}
-
-pkg_setup() {
-	case ${ARCH} in
-		amd64)
-			ICAARCH=linuxx64
-		;;
-		x86)
-			ICAARCH=linuxx86
-		;;
-		*)
-			eerror "Given architecture is not supported by Citrix."
-		;;
-	esac
-}
-
-src_unpack() {
-	default
-	mv "${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" "${S}" || die
-}
-
-src_prepare() {
-	default
-	rm lib/UIDialogLibWebKit.so || die
-
-	cp nls/en/module.ini . || die
-	if use usb; then
-		# inspired by debian usb support package postinst
-		sed -i -e 's/^[ \t]*VirtualDriver[ \t]*=.*$/&, GenericUSB/' module.ini || die
-		sed -i -e '/\[ICA 3.0\]/a\GenericUSB=on' module.ini || true
-		echo "[GenericUSB]" >> module.ini || true
-		echo "DriverName=VDGUSB.DLL" >> module.ini
-	fi
-
-	if use hdx; then
-		"${BROOT}${ICAROOT}"/rtme/RTMEconfig -install -ignoremm || die
-		mv new_module.ini module.ini || die
-	fi
-	mv module.ini config/ || die
-}
-
-src_install() {
-	local bin tmpl dest
-
-	dodir "${ICAROOT}"
-
-	keepdir /etc/icaclient
-
-	insinto "${ICAROOT}"
-	exeinto "${ICAROOT}"
-	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
-	if use usb; then
-		doexe usb/ctxusb usb/ctxusbd usb/ctx_usb_isactive
-		doins usb/*.DLL
-		insinto /etc/icaclient
-		doins usb/usb.conf
-		dosym ../../../etc/icaclient/usb.conf "${ICAROOT}"/usb.conf
-		insinto "${ICAROOT}"
-	fi
-
-	exeinto "${ICAROOT}"/lib
-	doexe lib/*.so
-
-	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
-		insinto "${dest}"
-		doins nls/en.UTF-8/eula.txt
-	done
-
-	insinto "${ICAROOT}"/config
-	doins config/*
-	mv "${ED}/${ICAROOT}"/config/module.ini "${ED}"/etc/icaclient/ || die
-	dosym ../../../../etc/icaclient/module.ini "${ICAROOT}"/config/module.ini
-	for tmpl in {appsrv,wfclient}.template ; do
-		newins nls/en/${tmpl} ${tmpl/template/ini}
-	done
-	touch "${ED}/${ICAROOT}"/config/.server || die
-
-	insinto "${ICAROOT}"/gtk
-	doins gtk/*
-
-	insinto "${ICAROOT}"/gtk/glade
-	doins gtk/glade/*
-
-	insinto "${ICAROOT}"/site
-	doins -r site/*
-
-	dodir "${ICAROOT}"/help
-
-	insinto "${ICAROOT}"/config/usertemplate
-	doins config/usertemplate/*
-
-	local lang LANGCODES=( en )
-	use l10n_de && LANGCODES+=( de )
-	use l10n_es && LANGCODES+=( es )
-	use l10n_fr && LANGCODES+=( fr )
-	use l10n_ja && LANGCODES+=( ja )
-	use l10n_zh-CN && LANGCODES+=( zh_CN )
-
-	for lang in ${LANGCODES[@]} ; do
-		insinto "${ICAROOT}"/nls/${lang}
-		doins nls/${lang}/*
-
-		insinto "${ICAROOT}"/nls/$lang/UTF-8
-		doins nls/${lang}.UTF-8/*
-
-		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
-		doins nls/${lang}/LC_MESSAGES/*
-
-		insinto "${ICAROOT}"/nls/${lang}
-		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
-
-		for tmpl in {appsrv,wfclient}.template ; do
-			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
-				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
-				|| die
-		done
-	done
-
-	insinto "${ICAROOT}"/nls
-	dosym en /opt/Citrix/ICAClient/nls/C
-
-	insinto "${ICAROOT}"/icons
-	doins icons/*
-
-	insinto "${ICAROOT}"/keyboard
-	doins keyboard/*
-
-	cp -a util "${ED}/${ICAROOT}" || die
-	test -f util/HdxRtcEngine && fperms 0755 "${ICAROOT}"/util/HdxRtcEngine
-
-	dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts
-	insinto "${ICAROOT}"/keystore/intcerts
-	doins keystore/intcerts/*
-
-	local other_files=(
-		icasessionmgr
-		NativeMessagingHost
-		UtilDaemon
-	)
-
-	exeinto "${ICAROOT}"
-	for bin in ${other_files[@]} ; do
-		doexe ${bin}
-	done
-
-	# https://bugs.gentoo.org/655922
-	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
-	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
-	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
-
-	doenvd "${FILESDIR}"/10ICAClient
-
-	for bin in configmgr conncenter new_store ; do
-		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
-	done
-
-	for bin in selfservice wfica ; do
-		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
-	done
-
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
-		> "${ED}"/etc/revdep-rebuild/70icaclient
-
-	insinto "${ICAROOT}"/pkginf
-	newins "${WORKDIR}"/PkgId Ver.core."${ICAARCH}"
-
-	# 651926
-	domenu "${FILESDIR}"/*.desktop
-
-	insinto /usr/share/mime/packages
-	doins desktop/Citrix-mime_types.xml
-}
-
-pkg_preinst() {
-	# previous versions of the ebuild created that and left it around
-	# we own it now and avoid conflict warnings with this
-	rm -f "${ROOT}${ICAROOT}/config/module.ini"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	if ! use hdx; then
-		if [ -x "${ROOT}${ICAROOT}"/rtme/RTMEconfig ]; then
-			ewarn "Starting from 22.12.0.12 you have to set USE=hdx if you want"
-			ewarn "to use media-plugins/hdx-realtime-media-engine. Which does"
-			ewarn "not need to be explicitly installed anymore."
-		fi
-	fi
-
-	if use usb; then
-		einfo
-		einfo "Add users of ${CATEGORY}/${PN} to group 'usb' for redirect to work"
-		einfo
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-misc/icaclient/icaclient-24.11.0.85.ebuild b/net-misc/icaclient/icaclient-24.11.0.85.ebuild
new file mode 100644
index 000000000000..48b7caabf498
--- /dev/null
+++ b/net-misc/icaclient/icaclient-24.11.0.85.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper xdg-utils
+
+DESCRIPTION="ICA Client for Citrix Presentation servers"
+HOMEPAGE="https://www.citrix.com/"
+SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )"
+
+LICENSE="icaclient"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx usb selfservice"
+RESTRICT="mirror strip fetch"
+
+ICAROOT="/opt/Citrix/ICAClient"
+
+QA_PREBUILT="${ICAROOT#/}/*"
+
+# we have binaries for two conflicting kerberos implementations
+# https://bugs.gentoo.org/792090
+# https://bugs.gentoo.org/775995
+REQUIRES_EXCLUDE="
+	libgssapi.so.3
+	libgssapi_krb5.so.2 libkrb5.so.3
+"
+# when using media-plugins/hdx-realtime-media-engine we better not ignore that
+REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
+	!hdx? ( libunwind.so.1 )
+"
+# we have binaries which wouls still support gstreamer:0.10
+REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
+	libgstapp-0.10.so.0
+	libgstbase-0.10.so.0
+	libgstinterfaces-0.10.so.0
+	libgstpbutils-0.10.so.0
+	libgstreamer-0.10.so.0
+"
+
+# video background blurring, optional
+REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
+	libopencv_core.so.407
+	libopencv_imgcodecs.so.407
+	libopencv_imgproc.so.407
+"
+
+BDEPEND="
+	hdx? ( media-plugins/hdx-realtime-media-engine )
+"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret
+	dev-libs/glib:2
+	media-fonts/font-adobe-100dpi
+	media-fonts/font-cursor-misc
+	media-fonts/font-misc-ethiopic
+	media-fonts/font-misc-misc
+	media-fonts/font-xfree86-type1
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	media-libs/libogg
+	media-libs/libpng
+	media-libs/libpulse
+	media-libs/libva
+	media-libs/libvorbis
+	media-libs/mesa
+	media-libs/speex
+	media-libs/speexdsp
+	net-libs/libsoup:2.4
+	sys-apps/util-linux
+	llvm-runtimes/libcxx
+	llvm-runtimes/libcxxabi
+	sys-libs/zlib
+	virtual/krb5
+	virtual/libudev
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXinerama
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+	${BDEPEND}
+	!hdx? ( !media-plugins/hdx-realtime-media-engine )
+	usb? ( virtual/libudev )
+	selfservice? (
+		dev-libs/libxml2
+		net-libs/webkit-gtk:4.1
+		dev-libs/xerces-c
+	)
+"
+
+pkg_nofetch() {
+	elog "Download the client file ${A} from
+	https://www.citrix.com/downloads/workspace-app/"
+	elog "and place it into your DISTDIR directory."
+}
+
+pkg_setup() {
+	case ${ARCH} in
+		amd64)
+			ICAARCH=linuxx64
+		;;
+		x86)
+			ICAARCH=linuxx86
+		;;
+		*)
+			eerror "Given architecture is not supported by Citrix."
+		;;
+	esac
+}
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" "${S}" || die
+}
+
+src_prepare() {
+	default
+	rm lib/UIDialogLibWebKit.so || die
+
+	cp nls/en/module.ini . || die
+	if use usb; then
+		# inspired by debian usb support package postinst
+		sed -i -e 's/^[ \t]*VirtualDriver[ \t]*=.*$/&, GenericUSB/' module.ini || die
+		sed -i -e '/\[ICA 3.0\]/a\GenericUSB=on' module.ini || die
+		echo "[GenericUSB]" >> module.ini
+		echo "DriverName=VDGUSB.DLL" >> module.ini
+	fi
+
+	if use hdx; then
+		"${BROOT}${ICAROOT}"/rtme/RTMEconfig -install -ignoremm || die
+		mv new_module.ini module.ini || die
+	fi
+	mv module.ini config/ || die
+}
+
+src_install() {
+	local bin tmpl dest
+
+	dodir "${ICAROOT}"
+
+	keepdir /etc/icaclient
+
+	insinto "${ICAROOT}"
+	exeinto "${ICAROOT}"
+	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
+	if use usb; then
+		doexe usb/ctxusb usb/ctxusbd usb/ctx_usb_isactive
+		doins usb/*.DLL
+		insinto /etc/icaclient
+		doins usb/usb.conf
+		dosym ../../../etc/icaclient/usb.conf "${ICAROOT}"/usb.conf
+		insinto "${ICAROOT}"
+	fi
+
+	exeinto "${ICAROOT}"/lib
+	doexe lib/*.so
+
+	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
+		insinto "${dest}"
+		doins nls/en.UTF-8/eula.txt
+	done
+
+	insinto "${ICAROOT}"/config
+	doins config/*
+	mv "${ED}/${ICAROOT}"/config/module.ini "${ED}"/etc/icaclient/ || die
+	dosym ../../../../etc/icaclient/module.ini "${ICAROOT}"/config/module.ini
+	for tmpl in {appsrv,wfclient}.template ; do
+		newins nls/en/${tmpl} ${tmpl/template/ini}
+	done
+	touch "${ED}/${ICAROOT}"/config/.server || die
+
+	insinto "${ICAROOT}"/gtk
+	doins gtk/*
+
+	insinto "${ICAROOT}"/gtk/glade
+	doins gtk/glade/*
+
+	insinto "${ICAROOT}"/site
+	doins -r site/*
+
+	dodir "${ICAROOT}"/help
+
+	insinto "${ICAROOT}"/config/usertemplate
+	doins config/usertemplate/*
+
+	local lang LANGCODES=( en )
+	use l10n_de && LANGCODES+=( de )
+	use l10n_es && LANGCODES+=( es )
+	use l10n_fr && LANGCODES+=( fr )
+	use l10n_ja && LANGCODES+=( ja )
+	use l10n_zh-CN && LANGCODES+=( zh_CN )
+
+	for lang in ${LANGCODES[@]} ; do
+		insinto "${ICAROOT}"/nls/${lang}
+		doins nls/${lang}/*
+
+		insinto "${ICAROOT}"/nls/$lang/UTF-8
+		doins nls/${lang}.UTF-8/*
+
+		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
+		doins nls/${lang}/LC_MESSAGES/*
+
+		insinto "${ICAROOT}"/nls/${lang}
+		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
+
+		for tmpl in {appsrv,wfclient}.template ; do
+			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
+				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
+				|| die
+		done
+	done
+
+	insinto "${ICAROOT}"/nls
+	dosym en /opt/Citrix/ICAClient/nls/C
+
+	insinto "${ICAROOT}"/icons
+	doins icons/*
+
+	insinto "${ICAROOT}"/keyboard
+	doins keyboard/*
+
+	cp -a util "${ED}/${ICAROOT}" || die
+	test -f util/HdxRtcEngine && fperms 0755 "${ICAROOT}"/util/HdxRtcEngine
+
+	dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts
+	insinto "${ICAROOT}"/keystore/intcerts
+	doins keystore/intcerts/*
+
+	local other_files=(
+		icasessionmgr
+		NativeMessagingHost
+		UtilDaemon
+	)
+
+	exeinto "${ICAROOT}"
+	for bin in ${other_files[@]} ; do
+		doexe ${bin}
+	done
+
+	# https://bugs.gentoo.org/655922
+	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
+	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
+	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
+
+	doenvd "${FILESDIR}"/10ICAClient
+
+	for bin in configmgr conncenter new_store ; do
+		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
+	done
+
+	for bin in selfservice wfica ; do
+		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
+	done
+
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
+		> "${ED}"/etc/revdep-rebuild/70icaclient
+
+	insinto "${ICAROOT}"/pkginf
+	newins "${WORKDIR}"/PkgId Ver.core."${ICAARCH}"
+
+	# 651926
+	domenu "${FILESDIR}"/*.desktop
+
+	insinto /usr/share/mime/packages
+	doins desktop/Citrix-mime_types.xml
+}
+
+pkg_preinst() {
+	# previous versions of the ebuild created that and left it around
+	# we own it now and avoid conflict warnings with this
+	rm -f "${ROOT}${ICAROOT}/config/module.ini" || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if ! use hdx; then
+		if [ -x "${ROOT}${ICAROOT}"/rtme/RTMEconfig ]; then
+			ewarn "Starting from 22.12.0.12 you have to set USE=hdx if you want"
+			ewarn "to use media-plugins/hdx-realtime-media-engine. Which does"
+			ewarn "not need to be explicitly installed anymore."
+		fi
+	fi
+
+	if use usb; then
+		einfo
+		einfo "Add users of ${CATEGORY}/${PN} to group 'usb' for redirect to work"
+		einfo
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-misc/icaclient/metadata.xml b/net-misc/icaclient/metadata.xml
index 2e136fc44c0a..067b86638f24 100644
--- a/net-misc/icaclient/metadata.xml
+++ b/net-misc/icaclient/metadata.xml
@@ -7,5 +7,6 @@
 	<use>
 		<flag name="hdx">Install and enable hdx-realtime-media-engine plugin</flag>
 		<flag name="usb">Allow connecting USB devices to virtual desktops</flag>
+		<flag name="selfservice">Install and enable the self-service component</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/kio-zeroconf-common/Manifest b/net-misc/kio-zeroconf-common/Manifest
index a6a070c5641b..a20663f7a7e6 100644
--- a/net-misc/kio-zeroconf-common/Manifest
+++ b/net-misc/kio-zeroconf-common/Manifest
@@ -1,2 +1,2 @@
 DIST kio-zeroconf-24.08.3.tar.xz 44896 BLAKE2B 28e0acfbc943c4942e65e87a6d5f10dccbd17d61372b592d7167a1de0103fa54007b399036531897a942ced0e6dcd9cd26a757dda9244d6dc643cf9c57d1d2e8 SHA512 5b88d06d998702556bb0f2c533b12c289f039ed7803e9785f224b21509bf5dd4de2e17c3c6cddfa70bd374aab6b9c63a8d2b24e8019e2a4d33b8a8b0412007c5
-DIST kio-zeroconf-24.12.0.tar.xz 44888 BLAKE2B 0fc277660d95dc311263e0ba06f114586295931dc70d4be0118970e409ae7edb4c8d5a16004fd6200bf737312f8077dd24fa3b6fea0ba0a12243411fd42b76aa SHA512 7810a69260c2eddbccf4fa7988fae7532c970b6e620785c7b2eb067e79ad02158cbb706777e1112fdeacbbca09201b56541becff4521577aa2c0bf8184d3d898
+DIST kio-zeroconf-24.12.1.tar.xz 44872 BLAKE2B 930e5af21fa4afe9a7b965e5b2f7dd90a3eb88767534e3098d88715c5d51a5339673ef057f40f1f40bd1235b1843b67571bc10a2e2431895b2368273006c35ce SHA512 51bae186c3720a69850890774f87c787368c9dcc7325e2edbc37ccc8606acd0ef5f9d6d686d4740091e72d05b7fafe54243e93e763b59d6902f836a55bb7e091
diff --git a/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.12.0.ebuild b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.12.0.ebuild
deleted file mode 100644
index 4ab4638c9e5a..000000000000
--- a/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="false"
-KDE_ORG_NAME="${PN/-common/}"
-KFMIN=5.115.0
-inherit ecm-common gear.kde.org
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	!<net-misc/kio-zeroconf-23.08.5-r2:5
-	!<net-misc/kio-zeroconf-24.08.0-r1:6
-"
-
-ECM_INSTALL_FILES=(
-	kdedmodule/org.kde.kdnssd.xml:\${KDE_INSTALL_DBUSINTERFACEDIR}
-	kioworker/zeroconf.desktop:\${KDE_INSTALL_DATADIR}/remoteview
-	org.kde.kio_zeroconf.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
-)
diff --git a/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.12.1.ebuild b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.12.1.ebuild
new file mode 100644
index 000000000000..92a86b37d0f6
--- /dev/null
+++ b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="false"
+KDE_ORG_NAME="${PN/-common/}"
+KFMIN=5.115.0
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!<net-misc/kio-zeroconf-23.08.5-r2:5
+	!<net-misc/kio-zeroconf-24.08.0-r1:6
+"
+
+ECM_INSTALL_FILES=(
+	kdedmodule/org.kde.kdnssd.xml:\${KDE_INSTALL_DBUSINTERFACEDIR}
+	kioworker/zeroconf.desktop:\${KDE_INSTALL_DATADIR}/remoteview
+	org.kde.kio_zeroconf.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
+)
diff --git a/net-misc/kio-zeroconf/Manifest b/net-misc/kio-zeroconf/Manifest
index a6a070c5641b..a20663f7a7e6 100644
--- a/net-misc/kio-zeroconf/Manifest
+++ b/net-misc/kio-zeroconf/Manifest
@@ -1,2 +1,2 @@
 DIST kio-zeroconf-24.08.3.tar.xz 44896 BLAKE2B 28e0acfbc943c4942e65e87a6d5f10dccbd17d61372b592d7167a1de0103fa54007b399036531897a942ced0e6dcd9cd26a757dda9244d6dc643cf9c57d1d2e8 SHA512 5b88d06d998702556bb0f2c533b12c289f039ed7803e9785f224b21509bf5dd4de2e17c3c6cddfa70bd374aab6b9c63a8d2b24e8019e2a4d33b8a8b0412007c5
-DIST kio-zeroconf-24.12.0.tar.xz 44888 BLAKE2B 0fc277660d95dc311263e0ba06f114586295931dc70d4be0118970e409ae7edb4c8d5a16004fd6200bf737312f8077dd24fa3b6fea0ba0a12243411fd42b76aa SHA512 7810a69260c2eddbccf4fa7988fae7532c970b6e620785c7b2eb067e79ad02158cbb706777e1112fdeacbbca09201b56541becff4521577aa2c0bf8184d3d898
+DIST kio-zeroconf-24.12.1.tar.xz 44872 BLAKE2B 930e5af21fa4afe9a7b965e5b2f7dd90a3eb88767534e3098d88715c5d51a5339673ef057f40f1f40bd1235b1843b67571bc10a2e2431895b2368273006c35ce SHA512 51bae186c3720a69850890774f87c787368c9dcc7325e2edbc37ccc8606acd0ef5f9d6d686d4740091e72d05b7fafe54243e93e763b59d6902f836a55bb7e091
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.12.0.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.12.0.ebuild
deleted file mode 100644
index 1c51d9b1efb0..000000000000
--- a/net-misc/kio-zeroconf/kio-zeroconf-24.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discovery)"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus]
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kdnssd-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
-	>=net-misc/${PN}-common-${PV}
-"
-
-# Shipped by net-misc/kio-zeroconf-common package for shared use w/ SLOT 5
-ECM_REMOVE_FROM_INSTALL=(
-	/usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
-	/usr/share/remoteview/zeroconf.desktop
-	/usr/share/metainfo/org.kde.kio_zeroconf.metainfo.xml
-)
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-}
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.12.1.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.12.1.ebuild
new file mode 100644
index 000000000000..0513a063cc46
--- /dev/null
+++ b/net-misc/kio-zeroconf/kio-zeroconf-24.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discovery)"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus]
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdnssd-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	>=net-misc/${PN}-common-${PV}
+"
+
+# Shipped by net-misc/kio-zeroconf-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
+	/usr/share/remoteview/zeroconf.desktop
+	/usr/share/metainfo/org.kde.kio_zeroconf.metainfo.xml
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 96161893a88d..d28d40ac2a46 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1 +1,2 @@
 DIST lldpd-1.0.18.tar.gz 1988691 BLAKE2B 37ee156013ab9ceaee06d10025fe0b76e26ebafef7a8254866347db8e6b316805a49d0f9f2ba330bb5f863336e95983214c9c9fb453e2290e9be0c47808504c7 SHA512 c8734221767cd879c98ea3ee6fa80e1dce2f8470a97b0f757cfe7ef8fe2adaf878fdedcda896cf65e1af980634f2ab312588658fb85f89c6d5b6cc9d2da52045
+DIST lldpd-1.0.19.tar.gz 1987102 BLAKE2B 8303683af56492027a5610240d9c5007ce2a6653dbe6b8f5ce5e28089dac4c06c8716ad96ed5dda31af4a29e10abbbe675ec5cf29b639a1c17db24698e318715 SHA512 128a664de09fb91fd1cab4070e3a9cf2705d91f57e956f6953f431f17fcf21ce3f12b89a536e66057ef456840cfd0c2ac5102ec9736f2856586d7a64751cfb67
diff --git a/net-misc/lldpd/lldpd-1.0.19.ebuild b/net-misc/lldpd/lldpd-1.0.19.ebuild
new file mode 100644
index 000000000000..cc14c4a59beb
--- /dev/null
+++ b/net-misc/lldpd/lldpd-1.0.19.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd bash-completion-r1 autotools tmpfiles
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://lldpd.github.io/"
+SRC_URI="https://github.com/lldpd/lldpd/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
+	seccomp sonmp snmp static-libs test readline valgrind xml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/lldpd
+	acct-user/lldpd
+	dev-libs/libbsd
+	>=dev-libs/libevent-2.1.11:=
+	sys-libs/readline:0=
+	seccomp? ( sys-libs/libseccomp:= )
+	snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
+	xml? ( dev-libs/libxml2:= )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )
+	valgrind? ( dev-debug/valgrind )
+"
+BDEPEND="virtual/pkgconfig
+	doc? (
+		graph? ( app-text/doxygen[dot,doc] )
+		!graph? ( app-text/doxygen )
+	)
+"
+
+REQUIRED_USE="
+	graph? ( doc )
+	test? ( snmp sanitizers )
+"
+
+# tests need root
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+
+	econf \
+		--cache-file="${S}"/config.cache \
+		--without-embedded-libevent \
+		--with-privsep-user=${PN} \
+		--with-privsep-group=${PN} \
+		--with-privsep-chroot=/run/${PN} \
+		--with-lldpd-ctl-socket=/run/${PN}.socket \
+		--with-lldpd-pid-file=/run/${PN}.pid \
+		$(use_enable cdp) \
+		$(use_enable doc doxygen-doc) \
+		$(use_enable doc doxygen-man) \
+		$(use_enable doc doxygen-pdf) \
+		$(use_enable doc doxygen-html) \
+		$(use_enable dot1) \
+		$(use_enable dot3) \
+		$(use_enable edp) \
+		$(use_enable fdp) \
+		$(use_enable graph doxygen-dot) \
+		$(use_enable lldpmed) \
+		$(use_enable old-kernel oldies) \
+		$(use_enable sonmp) \
+		$(use_enable static-libs static) \
+		$(use_with readline) \
+		$(use_enable sanitizers) \
+		$(use_with seccomp) \
+		$(use_with snmp) \
+		$(use_with xml)
+}
+
+src_compile() {
+	emake
+	use doc && emake doxygen-doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
+	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
+	newbashcomp src/client/completion/lldpcli lldpcli
+
+	use doc && dodoc -r doxygen/html
+
+	insinto /etc
+	doins "${FILESDIR}/lldpd.conf"
+	keepdir /etc/${PN}.d
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-misc/memcached/memcached-1.6.27.ebuild b/net-misc/memcached/memcached-1.6.27.ebuild
index bc9b19386913..f9c94759a23f 100644
--- a/net-misc/memcached/memcached-1.6.27.ebuild
+++ b/net-misc/memcached/memcached-1.6.27.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=7
@@ -15,7 +15,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/mptcpd/mptcpd-0.13.ebuild b/net-misc/mptcpd/mptcpd-0.13.ebuild
index 5ff4a416cd0b..010c52df6d4c 100644
--- a/net-misc/mptcpd/mptcpd-0.13.ebuild
+++ b/net-misc/mptcpd/mptcpd-0.13.ebuild
@@ -34,7 +34,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/intel/mptcpd.git"
 else
 	SRC_URI="https://github.com/intel/mptcpd/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 CONFIG_CHECK="MPTCP"
diff --git a/net-misc/netkit-timed/files/netkit-timed-0.17-accept-build-flags.patch b/net-misc/netkit-timed/files/netkit-timed-0.17-accept-build-flags.patch
new file mode 100644
index 000000000000..c72452ff0fdc
--- /dev/null
+++ b/net-misc/netkit-timed/files/netkit-timed-0.17-accept-build-flags.patch
@@ -0,0 +1,23 @@
+was sed -i -e '/^LDFLAGS=/d' configure || die "sed configure"
+--- a/configure	2024-05-09 06:02:18.884496589 -0000
++++ b/configure	2024-05-09 06:02:26.304490777 -0000
+@@ -115,7 +115,6 @@
+      echo 'no'
+ fi
+ 
+-LDFLAGS=
+ LIBS=
+ 
+ rm -f __conftest*
+was sed -i -e "s|ar -cruv|\${AR} -cruv|g" timed/lib/Makefile || die
+--- a/timed/lib/Makefile	2024-05-09 06:02:18.886496588 -0000
++++ b/timed/lib/Makefile	2024-05-09 06:02:31.568486653 -0000
+@@ -7,7 +7,7 @@
+ OBJS = byteorder.o measure.o cksum.o
+ 
+ libtimed.a: $(OBJS)
+-	ar -cruv $@ $^
++	${AR} -cruv $@ $^
+ 
+ install: ;
+ clean:
diff --git a/net-misc/netkit-timed/files/netkit-timed-0.17-c23-port.patch b/net-misc/netkit-timed/files/netkit-timed-0.17-c23-port.patch
new file mode 100644
index 000000000000..ad0410db4421
--- /dev/null
+++ b/net-misc/netkit-timed/files/netkit-timed-0.17-c23-port.patch
@@ -0,0 +1,65 @@
+#bug https://bugs.gentoo.org/715776
+#bug https://bugs.gentoo.org/919876
+and general port to C23
+--- a/configure
++++ b/configure
+@@ -134,6 +100,7 @@
+ 
+ echo -n 'Checking for BSD signal semantics... '
+ cat <<EOF >__conftest.c
++#define _DEFAULT_SOURCE
+ #include <unistd.h>
+ #include <signal.h>
+ int count=0;
+--- a/timed/lib/cksum.c
++++ b/timed/lib/cksum.c
+@@ -41,6 +41,7 @@
+ #ident "$Revision: 1.4 $"
+ #endif
+ 
++#define _DEFAULT_SOURCE
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include "timed-extern.h"
+--- a/timed/timed/globals.h
++++ b/timed/timed/globals.h
+@@ -37,6 +37,7 @@
+ #ident "$Revision: 1.5 $"
+ #endif
+ 
++#define _DEFAULT_SOURCE
+ #include <sys/param.h>
+ #include <sys/time.h>
+ #include <sys/socket.h>
+--- a/timed/timedc/cmds.c
++++ b/timed/timedc/cmds.c
+@@ -41,6 +41,7 @@
+ #ident "$Revision: 1.11 $"
+ #endif
+ 
++#define _DEFAULT_SOURCE
+ #include "timedc.h"
+ #include <string.h>
+ #include <sys/file.h>
+--- a/timed/timedc/timedc.c
++++ b/timed/timedc/timedc.c
+@@ -45,6 +45,7 @@
+ #ident "$Revision: 1.8 $"
+ #endif
+ 
++#define _DEFAULT_SOURCE
+ #include "timedc.h"
+ #include <string.h>
+ #include <signal.h>
+--- a/timed/timed/networkdelta.c
++++ b/timed/timed/networkdelta.c
+@@ -40,8 +40,8 @@
+ #ifdef sgi
+ #ident "$Revision: 1.4 $"
+ #endif
+-#include <math.h>
+ #include "globals.h"
++#include <math.h>
+ 
+ static long median(float, float*, long*, long*, unsigned int);
+ 
diff --git a/net-misc/netkit-timed/files/netkit-timed-0.17-c99-port.patch b/net-misc/netkit-timed/files/netkit-timed-0.17-c99-port.patch
new file mode 100644
index 000000000000..f46408049b14
--- /dev/null
+++ b/net-misc/netkit-timed/files/netkit-timed-0.17-c99-port.patch
@@ -0,0 +1,44 @@
+Simple port to C99
+#bug https://bugs.gentoo.org/919876
+--- a/timed/lib/measure.c
++++ b/timed/lib/measure.c
+@@ -75,7 +75,7 @@ measure(u_long maxmsec,			/* wait this many msec at most */
+ 	struct sockaddr_in *xaddr,
+ 	int doprint)			/* print complaints on stderr */
+ {
+-	size_t length;
++	socklen_t length;
+ 	int measure_status;
+ 	int rcvcount, trials = 0;
+ 	int cc, count;
+--- a/timed/timed/correct.c
++++ b/timed/timed/correct.c
+@@ -165,7 +165,7 @@ adjclock(struct timeval *corr)
+ 		}
+ 	} else {
+ 		syslog(LOG_WARNING,
+-		       "clock correction %d sec too large to adjust",
++		       "clock correction %ld sec too large to adjust",
+ 		       adj.tv_sec);
+ 		(void) gettimeofday(&now, 0);
+ 		timevaladd(&now, corr);
+--- a/timed/timed/networkdelta.c
++++ b/timed/timed/networkdelta.c
+@@ -40,7 +40,7 @@ char nd_rcsid[] =
+ #ifdef sgi
+ #ident "$Revision: 1.4 $"
+ #endif
+-
++#include <math.h>
+ #include "globals.h"
+ 
+ static long median(float, float*, long*, long*, unsigned int);
+@@ -238,7 +238,7 @@ median(float a,				/* initial guess for the median */
+ 				        (long)a, pass, npts);
+ 			return a;
+ 		}
+-		eps = AFAC*abs(aa - a);
++		eps = AFAC*fabsf(aa - a);
+ 		*eps_ptr = eps;
+ 		a = aa;
+ 	}
diff --git a/net-misc/netkit-timed/netkit-timed-0.17-r12.ebuild b/net-misc/netkit-timed/netkit-timed-0.17-r12.ebuild
new file mode 100644
index 000000000000..eb70db4a45ed
--- /dev/null
+++ b/net-misc/netkit-timed/netkit-timed-0.17-r12.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Netkit - timed: Time daemon"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/netkit"
+SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/netkit/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}/0.17-CFLAG-DEF-fix.patch"
+	"${FILESDIR}/0.17-timed-opt-parsing.patch"
+	"${FILESDIR}/${P}-c99-port.patch"
+	"${FILESDIR}/${P}-accept-build-flags.patch"
+	"${FILESDIR}/${P}-c23-port.patch"
+)
+
+src_configure() {
+	tc-export AR
+	# Note this is not an autoconf configure script. econf fails
+	append-flags -DCLK_TCK=CLOCKS_PER_SEC
+	./configure --prefix=/usr --with-c-compiler="$(tc-getCC)" || die "bad configure"
+}
+
+src_install() {
+	dosbin timed/timed/timed
+	doman  timed/timed/timed.8
+	dosbin timed/timedc/timedc
+	doman  timed/timedc/timedc.8
+	einstalldocs
+
+	newinitd "${FILESDIR}"/timed.rc6 timed
+}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 2d005594575b..c37489c91c1a 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,3 +1,4 @@
 DIST nextcloud-client-3.14.4.tar.gz 13813595 BLAKE2B 310bbf9b8024bb8688bffe65d6993d63d95260f26565998bd1cd734a49bdd5a6d4fc152ee51968d5e705c6440c24c7571f1079ba13fc5d8492cdd57ad57ebe0d SHA512 8de91b288507d13e7dd2c64112f0540f4664ad2a0b02525d5ff5b187dc7eb9af61a40d9f65320284241bb620cf2dcc648ecfe6090d3d09c0dbb865504026b11e
 DIST nextcloud-client-3.15.2-fix-macosvfs-file-sharing.png.patch 727 BLAKE2B 77d87c47caa28c0d60afdef161c05a365d953e31e7331fd4b07adfe232ddd04a6108ad325a25befe961862dccb118c251239b84cfb63f1c72c205df31055ad69 SHA512 d4d8928aa63b7e174c7fe8099d349a5779e8be1b1a71dfecfded9f971533ba677fc85013c53c7cafdc05e1aed81820c6ef3b5e7c3f6a5cae62fc284a2a9371db
 DIST nextcloud-client-3.15.2.tar.gz 15671238 BLAKE2B ea98587f4183d42d3e6ace54c0cd8b2208e7e21bfbb2385af84c8688b2d5464171f90e287302c5d6081b234b8cbec4e2b05635d1385a2980f133bba7127a6203 SHA512 982b74d57954440496f973781aa6a719d316b3651fecbb5da4d4b211dda0574094b2ba35f83c6afe2e67c7be095528e0cf8544e9214e8d9db445f1ab95c8c256
+DIST nextcloud-client-3.15.3.tar.gz 15683038 BLAKE2B 535b6f8fc70cbfb63c5c87f09f31da943df5e6dd9d218d2289beda51f6d10eec2e99a4bd1efe4f9b4b373c54414ec4c3b36a9e6968134733b7fe942ea2d26099 SHA512 bf451681c352c75290c92780a84c37456ec199890081f6e7f0f1b14e302c4e14a1998a0fa90e7b4702325a1f447a7538bec58e9021c2269bcf04f9275925b365
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.15.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.15.3.ebuild
new file mode 100644
index 000000000000..c0e60352d63e
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.15.3.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake virtualx xdg
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="
+	https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/nextcloud/desktop/commit/49a7c8d7874643da2550793877115c7f3dbd2d05.patch
+		-> ${PN}-3.15.2-fix-macosvfs-file-sharing.png.patch
+"
+S="${WORKDIR}/desktop-${PV/_/-}"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="doc dolphin nautilus test webengine"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-db/sqlite-3.34:3
+	dev-libs/glib:2
+	>=dev-libs/openssl-1.1.0:0=
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	dev-qt/qt5compat:6
+	>=dev-qt/qtbase-6.6.0:6[dbus,gui,network,sql,sqlite,ssl,widgets]
+	dev-qt/qtdeclarative:6[widgets]
+	dev-qt/qtsvg:6
+	dev-qt/qtwebsockets:6
+	kde-frameworks/karchive:6
+	kde-frameworks/kguiaddons:6
+	net-libs/libcloudproviders
+	sys-libs/zlib
+	dolphin? (
+		kde-frameworks/kcoreaddons:6
+		kde-frameworks/kio:6
+	)
+	nautilus? ( dev-python/nautilus-python )
+	webengine? ( dev-qt/qtwebengine:6[widgets] )
+"
+DEPEND="
+	${RDEPEND}
+	dev-qt/qtbase:6[concurrent,xml]
+	|| (
+		gnome-base/librsvg
+		media-gfx/inkscape
+	)
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	test? (
+		dev-util/cmocka
+	)
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	dolphin? ( >=kde-frameworks/extra-cmake-modules-5.106.0 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch
+	# https://github.com/nextcloud/desktop/pull/7383
+	"${FILESDIR}"/${PN}-3.14.2-doc-fix.patch
+	# https://github.com/nextcloud/desktop/pull/7691
+	"${DISTDIR}"/${PN}-3.15.2-fix-macosvfs-file-sharing.png.patch
+)
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+	# The image under images/building/path.png does no longer
+	# exist. This is already fixed upstream and can be dropped on the
+	# next bump
+	sed -i '/images\/building\/path.png/d' doc/building.rst || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DBUILD_UPDATER=OFF
+		$(cmake_use_find_package doc Sphinx)
+		$(cmake_use_find_package doc PdfLatex)
+		-DBUILD_WITH_WEBENGINE=$(usex webengine)
+		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	TEST_VERBOSE=1 virtx cmake_src_test
+}
+
+src_compile() {
+	local compile_targets=(all)
+	if use doc; then
+		compile_targets+=(doc doc-man)
+	fi
+	cmake_src_compile ${compile_targets[@]}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! has_version -r "dev-libs/qtkeychain[keyring]"; then
+		elog "dev-libs/qtkeychain has not been build with the 'keyring' USE flag."
+		elog "Please consider enabling the 'keyring' USE flag. Otherwise you may"
+		elog "have to authenticate manually every time you start the nextlcoud client."
+		elog "See https://bugs.gentoo.org/912844 for more information."
+	fi
+}
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index 3d4f5395c13a..97555b8701b7 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -1,3 +1,3 @@
 DIST ofono-2.1.tar.xz 1097624 BLAKE2B 574293a73061470eec322df7fa62d581e8e8d2c5b81e896bff52173a986733f448686186bc0400ccf256fb931e26a1fef6a664dafa8f64935f936c9347e4a054 SHA512 7227939c488c2a62f640d5a8279e0698935aa1df5a2a349e195df9a8d9d9123c73a7f1177aae022b4c805d266c24a9770784193100adffa45f6c36a3ed847bb1
-DIST ofono-2.3.tar.xz 1216872 BLAKE2B e32ea09dbc8f0aa2ca3f322ffc34d9f9d06d862792b05a0f96ddba4ebe4038199ab40a4065582d68a35d2a5725646626bc36c8f9e83d89a42be8d76271144751 SHA512 0c53c2c441d28f89140192fe808769b3b27ef1ebf75e9ee9f9bfa53d0d102a47d11fcb364077ca88cdc598e8368924f477024b44a2adf795efe40b52ffe92dce
+DIST ofono-2.14.tar.xz 1311452 BLAKE2B 96f3875d9a2f515f14b5b6b6b5576e38338fd4a4912c5c7ea2c9ab8ed0e2791e4d22b591f5eb3ed9ccc1cd133174cbc3787b7d57e9bd6161fd03ad1a1e3f17f2 SHA512 77466c9155753130465748660df66473ca13afee59441a27f3d7dde653e632fb142af294aa2272ea14ce9d4845b68b5e2d4a58a9534555819c92fe161b4ff893
 DIST ofono-2.9.tar.xz 1302044 BLAKE2B d468c179ead13ab75b5e9872c671bea3c5f7cd59242516ba432c323aefc423ea18fd401a236a7abacf0ff0f2c74c8921828496b8a74269a1dc246f893c89036b SHA512 181f4aad276ea5c5888c6b89187e27b65d42f002d1dd72091f377033bda82bada17364c49773d4a1fd62ea7940d27d7f796da561595b606abbf4b4ec220ae031
diff --git a/net-misc/ofono/ofono-2.14.ebuild b/net-misc/ofono/ofono-2.14.ebuild
new file mode 100644
index 000000000000..dc5af0dc80f3
--- /dev/null
+++ b/net-misc/ofono/ofono-2.14.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/ofono/ofono.git"
+SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+atmodem bluetooth +datafiles doc dundee examples +isimodem +phonesim +qmimodem tools +udev upower"
+
+REQUIRED_USE="dundee? ( bluetooth )"
+
+RDEPEND=">=sys-apps/dbus-1.6
+	>=dev-libs/glib-2.68
+	net-misc/mobile-broadband-provider-info
+	bluetooth? ( >=net-wireless/bluez-4.99 )
+	udev? ( virtual/udev )
+	examples? ( dev-python/dbus-python )
+	tools? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS )
+
+src_configure() {
+	econf \
+		$(use_enable udev) \
+		$(use_enable isimodem) \
+		$(use_enable atmodem) \
+		$(use_enable datafiles) \
+		$(use_enable dundee) \
+		$(use_enable bluetooth) \
+		$(use_enable phonesim) \
+		$(use_enable qmimodem) \
+		$(use_enable tools) \
+		$(use_enable examples test) \
+		$(use_enable upower) \
+		--disable-maintainer-mode \
+		--disable-rilmodem \
+		--localstatedir=/var \
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	default
+
+	if use tools ; then
+		dobin tools/auto-enable \
+			tools/huawei-audio \
+			tools/lookup-apn \
+			tools/get-location \
+			tools/tty-redirector
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use doc && dodoc doc/*.txt
+}
diff --git a/net-misc/ofono/ofono-2.3.ebuild b/net-misc/ofono/ofono-2.3.ebuild
deleted file mode 100644
index 69e1ff1a5624..000000000000
--- a/net-misc/ofono/ofono-2.3.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
-
-inherit systemd
-
-DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/ofono/ofono.git"
-SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="+atmodem bluetooth +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower"
-
-REQUIRED_USE="dundee? ( bluetooth )"
-
-RDEPEND=">=sys-apps/dbus-1.6
-	>=dev-libs/glib-2.68
-	net-misc/mobile-broadband-provider-info
-	bluetooth? ( >=net-wireless/bluez-4.99 )
-	udev? ( virtual/udev )
-	examples? ( dev-python/dbus-python )
-	tools? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS )
-
-src_configure() {
-	econf \
-		$(use_enable udev) \
-		$(use_enable isimodem) \
-		$(use_enable atmodem) \
-		$(use_enable datafiles) \
-		$(use_enable dundee) \
-		$(use_enable bluetooth) \
-		$(use_enable phonesim) \
-		$(use_enable provision) \
-		$(use_enable qmimodem) \
-		$(use_enable tools) \
-		$(use_enable examples test) \
-		$(use_enable upower) \
-		--disable-maintainer-mode \
-		--disable-rilmodem \
-		--localstatedir=/var \
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-
-	if use tools ; then
-		dobin tools/auto-enable \
-			tools/huawei-audio \
-			tools/lookup-apn \
-			tools/get-location \
-			tools/tty-redirector
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	use doc && dodoc doc/*.txt
-}
diff --git a/net-misc/passt/passt-2024.09.06.ebuild b/net-misc/passt/passt-2024.09.06.ebuild
index e3ed4b3ca17e..fbff0b525899 100644
--- a/net-misc/passt/passt-2024.09.06.ebuild
+++ b/net-misc/passt/passt-2024.09.06.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
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://passt.top/passt/snapshot/passt-${MY_PV}.tar.xz -> ${PF}.tar.xz"
 	S="${WORKDIR}/${PN}-${MY_PV}"
-	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~riscv"
 fi
 
 LICENSE="BSD GPL-2+"
diff --git a/net-misc/r8168/r8168-8.054.00.ebuild b/net-misc/r8168/r8168-8.054.00.ebuild
index 5cb149094196..321cdf54b112 100644
--- a/net-misc/r8168/r8168-8.054.00.ebuild
+++ b/net-misc/r8168/r8168-8.054.00.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="https://github.com/mtorromeo/${PN}/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="use-firmware"
 
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 899a29aa6b22..58c78ffffdf0 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -2,3 +2,4 @@ DIST Remmina-ecb29e7830037dd3ee618472c80b5e8eaecf1ce0.tar.bz2 2152678 BLAKE2B 20
 DIST Remmina-v1.4.35.tar.bz2 2150047 BLAKE2B 3ba730cd4009a797ee7d66bbe4390e9db221ee5cf0b008e0eb3df4a992d7260ddc65983c8c34d1aa1bb2190ed1104653e269369565d7e4eecaf3078ffc84330c SHA512 36dc419b4473c71f6b3e53338f4a3cf7a1fe60534ea0dce375b4c9fd00cd9d8a618c4376be4d031bdee1eed8b4aade4538a6cc414629ef6dde41cdcd513a6d36
 DIST Remmina-v1.4.36.tar.bz2 2153190 BLAKE2B 0d29adcb84b7c72ae2f2468e0ef56e6f16f49a0ff2774cf59df699cf721aabdabbde91799d9266295f30fa5789d33f4aab450924aa5a325aa3f1315332dd7d4e SHA512 bdf3604849238ca2e61b6f35bbfba1df5eedf1c2374897a565f1a1e0b76a285be93700d92a6912d33d73ab745fb412856ee14fd0eab3feec492bf1b5aa35bc38
 DIST Remmina-v1.4.37.tar.bz2 2154629 BLAKE2B 113fcb53818526914ce5b867c1e41ed3703d28961037127444b66e2167d53512d330fa8c6eb0fe13b61f26b6eb43c5bb58d9b158f42897ae4081a8f0bc3481d0 SHA512 09db30823d4ffb61627cee01469e431b88575aa4370e39f9e4d1d384e3196c815206f01f3eeb8bc58df3e90d01bec38c271d81a8ea20cb4e44dd34d6e30d6706
+DIST Remmina-v1.4.39.tar.bz2 2155021 BLAKE2B 632c8c4e764117fef73a0fe330df74f9426ef691ea5315d8a02cc90437fdd41f2917de88a0e7f9501f62607d2bdc8fb81647c54ede33a506ac7fd915f931768c SHA512 b1e6b2f56eb4f4e236d78a2967374c4199250702d7301c9ab0878709ee8df8a1a8a1dcb0e74d78de51e52ccb087a2f92bd7b79e0f57a5266bfbf050aa8f555d7
diff --git a/net-misc/remmina/remmina-1.4.39.ebuild b/net-misc/remmina/remmina-1.4.39.ebuild
new file mode 100644
index 000000000000..c74329094808
--- /dev/null
+++ b/net-misc/remmina/remmina-1.4.39.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake python-single-r1 xdg
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${PN^}-v${PV}"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+appindicator crypt cups examples keyring gvnc kwallet nls python spice ssh rdp vnc wayland webkit zeroconf X"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) || ( X wayland )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libpcre2
+	dev-libs/libsodium:=
+	dev-libs/openssl:0=
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3[X?,wayland?]
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+	appindicator? ( dev-libs/libayatana-appindicator )
+	crypt? ( dev-libs/libgcrypt:0= )
+	keyring? ( app-crypt/libsecret )
+	gvnc? ( net-libs/gtk-vnc )
+	kwallet? ( kde-frameworks/kwallet:5 )
+	python? ( ${PYTHON_DEPS} )
+	rdp? ( net-misc/freerdp:3=
+		cups? ( net-print/cups:= ) )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh:0=[sftp]
+		x11-libs/vte:2.91 )
+	vnc? ( net-libs/libvncserver[jpeg] )
+	webkit? ( net-libs/webkit-gtk:4.1 )
+	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	spice? ( app-emulation/spice-protocol )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_environment_reset
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_FREERDP3=ON
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_ICON_CACHE=OFF
+		-DWITH_KF5WALLET=$(usex kwallet)
+		-DWITH_LIBSECRET=$(usex keyring)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_PYTHONLIBS=$(usex python ON OFF)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_UPDATE_DESKTOP_DB=OFF
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_WWW=$(usex webkit)
+		-DWITH_X2GO=OFF
+		# when this feature is stable, add python eclass usage to optionally enable
+		-DWITH_PYTHON=OFF
+	)
+	cmake_src_configure
+}
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12084.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12084.patch
new file mode 100644
index 000000000000..c4479ef8a80f
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12084.patch
@@ -0,0 +1,132 @@
+https://bugs.gentoo.org/948106
+
+Backport provided by Red Hat on the VINCE case.
+diff --git a/io.c b/io.c
+index a99ac0e..bb60eec 100644
+--- a/io.c
++++ b/io.c
+@@ -55,6 +55,7 @@ extern int read_batch;
+ extern int compat_flags;
+ extern int protect_args;
+ extern int checksum_seed;
++extern int xfer_sum_len;
+ extern int daemon_connection;
+ extern int protocol_version;
+ extern int remove_source_files;
+@@ -1977,7 +1978,7 @@ void read_sum_head(int f, struct sum_struct *sum)
+ 		exit_cleanup(RERR_PROTOCOL);
+ 	}
+ 	sum->s2length = protocol_version < 27 ? csum_length : (int)read_int(f);
+-	if (sum->s2length < 0 || sum->s2length > MAX_DIGEST_LEN) {
++	if (sum->s2length < 0 || sum->s2length > xfer_sum_len) {
+ 		rprintf(FERROR, "Invalid checksum length %d [%s]\n",
+ 			sum->s2length, who_am_i());
+ 		exit_cleanup(RERR_PROTOCOL);
+diff --git a/match.c b/match.c
+index cdb30a1..36e78ed 100644
+--- a/match.c
++++ b/match.c
+@@ -232,7 +232,7 @@ static void hash_search(int f,struct sum_struct *s,
+ 				done_csum2 = 1;
+ 			}
+ 
+-			if (memcmp(sum2,s->sums[i].sum2,s->s2length) != 0) {
++			if (memcmp(sum2, sum2_at(s, i), s->s2length) != 0) {
+ 				false_alarms++;
+ 				continue;
+ 			}
+@@ -252,7 +252,7 @@ static void hash_search(int f,struct sum_struct *s,
+ 					if (i != aligned_i) {
+ 						if (sum != s->sums[aligned_i].sum1
+ 						 || l != s->sums[aligned_i].len
+-						 || memcmp(sum2, s->sums[aligned_i].sum2, s->s2length) != 0)
++						 || memcmp(sum2, sum2_at(s, aligned_i), s->s2length) != 0)
+ 							goto check_want_i;
+ 						i = aligned_i;
+ 					}
+@@ -271,7 +271,7 @@ static void hash_search(int f,struct sum_struct *s,
+ 						if (sum != s->sums[i].sum1)
+ 							goto check_want_i;
+ 						get_checksum2((char *)map, l, sum2);
+-						if (memcmp(sum2, s->sums[i].sum2, s->s2length) != 0)
++						if (memcmp(sum2, sum2_at(s, i), s->s2length) != 0)
+ 							goto check_want_i;
+ 						/* OK, we have a re-alignment match.  Bump the offset
+ 						 * forward to the new match point. */
+@@ -290,7 +290,7 @@ static void hash_search(int f,struct sum_struct *s,
+ 			 && (!updating_basis_file || s->sums[want_i].offset >= offset
+ 			  || s->sums[want_i].flags & SUMFLG_SAME_OFFSET)
+ 			 && sum == s->sums[want_i].sum1
+-			 && memcmp(sum2, s->sums[want_i].sum2, s->s2length) == 0) {
++			 && memcmp(sum2, sum2_at(s, want_i), s->s2length) == 0) {
+ 				/* we've found an adjacent match - the RLL coder
+ 				 * will be happy */
+ 				i = want_i;
+diff --git a/rsync.c b/rsync.c
+index cd288f5..b130aba 100644
+--- a/rsync.c
++++ b/rsync.c
+@@ -437,7 +437,10 @@ int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr, cha
+   */
+ void free_sums(struct sum_struct *s)
+ {
+-	if (s->sums) free(s->sums);
++	if (s->sums) {
++		free(s->sums);
++		free(s->sum2_array);
++	}
+ 	free(s);
+ }
+ 
+diff --git a/rsync.h b/rsync.h
+index d3709fe..0f9e277 100644
+--- a/rsync.h
++++ b/rsync.h
+@@ -958,12 +958,12 @@ struct sum_buf {
+ 	uint32 sum1;	        /**< simple checksum */
+ 	int32 chain;		/**< next hash-table collision */
+ 	short flags;		/**< flag bits */
+-	char sum2[SUM_LENGTH];	/**< checksum  */
+ };
+ 
+ struct sum_struct {
+ 	OFF_T flength;		/**< total file length */
+ 	struct sum_buf *sums;	/**< points to info for each chunk */
++	char *sum2_array;	/**< checksums of length xfer_sum_len */
+ 	int32 count;		/**< how many chunks */
+ 	int32 blength;		/**< block_length */
+ 	int32 remainder;	/**< flength % block_length */
+@@ -982,6 +982,8 @@ struct map_struct {
+ 	int status;		/* first errno from read errors		*/
+ };
+ 
++#define sum2_at(s, i)	((s)->sum2_array + ((size_t)(i) * xfer_sum_len))
++
+ #define NAME_IS_FILE		(0)    /* filter name as a file */
+ #define NAME_IS_DIR		(1<<0) /* filter name as a dir */
+ #define NAME_IS_XATTR		(1<<2) /* filter name as an xattr */
+diff --git a/sender.c b/sender.c
+index 3d4f052..2bbff2f 100644
+--- a/sender.c
++++ b/sender.c
+@@ -31,6 +31,7 @@ extern int log_before_transfer;
+ extern int stdout_format_has_i;
+ extern int logfile_format_has_i;
+ extern int want_xattr_optim;
++extern int xfer_sum_len;
+ extern int csum_length;
+ extern int append_mode;
+ extern int copy_links;
+@@ -94,10 +95,11 @@ static struct sum_struct *receive_sums(int f)
+ 		return(s);
+ 
+ 	s->sums = new_array(struct sum_buf, s->count);
++	s->sum2_array = new_array(char, (size_t)s->count * xfer_sum_len);
+ 
+ 	for (i = 0; i < s->count; i++) {
+ 		s->sums[i].sum1 = read_int(f);
+-		read_buf(f, s->sums[i].sum2, s->s2length);
++		read_buf(f, sum2_at(s, i), s->s2length);
+ 
+ 		s->sums[i].offset = offset;
+ 		s->sums[i].flags = 0;
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12085.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12085.patch
new file mode 100644
index 000000000000..d841ad0716dc
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12085.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/948106
+
+Backport provided by Red Hat on the VINCE case.
+diff --git a/match.c b/match.c
+index 36e78ed..dfd6af2 100644
+--- a/match.c
++++ b/match.c
+@@ -147,6 +147,9 @@ static void hash_search(int f,struct sum_struct *s,
+ 	int more;
+ 	schar *map;
+ 
++	// prevent possible memory leaks
++	memset(sum2, 0, sizeof sum2);
++
+ 	/* want_i is used to encourage adjacent matches, allowing the RLL
+ 	 * coding of the output to work more efficiently. */
+ 	want_i = 0;
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12086-1.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12086-1.patch
new file mode 100644
index 000000000000..b0ab88e8c106
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12086-1.patch
@@ -0,0 +1,200 @@
+https://bugs.gentoo.org/948106
+
+Backport provided by Red Hat on the VINCE case.
+diff --git a/receiver.c b/receiver.c
+index 6b4b369..8031b8f 100644
+--- a/receiver.c
++++ b/receiver.c
+@@ -66,6 +66,7 @@ extern char sender_file_sum[MAX_DIGEST_LEN];
+ extern struct file_list *cur_flist, *first_flist, *dir_flist;
+ extern filter_rule_list daemon_filter_list;
+ extern OFF_T preallocated_len;
++extern int fuzzy_basis;
+ 
+ extern struct name_num_item *xfer_sum_nni;
+ extern int xfer_sum_len;
+@@ -551,6 +552,8 @@ int recv_files(int f_in, int f_out, char *local_name)
+ 	progress_init();
+ 
+ 	while (1) {
++		const char *basedir = NULL;
++
+ 		cleanup_disable();
+ 
+ 		/* This call also sets cur_flist. */
+@@ -716,28 +719,34 @@ int recv_files(int f_in, int f_out, char *local_name)
+ 				fnamecmp = get_backup_name(fname);
+ 				break;
+ 			case FNAMECMP_FUZZY:
++				if (fuzzy_basis == 0) {
++					rprintf(FERROR_XFER, "rsync: refusing malicious fuzzy operation for %s\n", xname);
++					exit_cleanup(RERR_PROTOCOL);
++				}
+ 				if (file->dirname) {
+-					pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, file->dirname, xname);
+-					fnamecmp = fnamecmpbuf;
+-				} else
+-					fnamecmp = xname;
++					basedir = file->dirname;
++				}
++				fnamecmp = xname;
+ 				break;
+ 			default:
+ 				if (fnamecmp_type > FNAMECMP_FUZZY && fnamecmp_type-FNAMECMP_FUZZY <= basis_dir_cnt) {
+ 					fnamecmp_type -= FNAMECMP_FUZZY + 1;
+ 					if (file->dirname) {
+-						stringjoin(fnamecmpbuf, sizeof fnamecmpbuf,
+-							   basis_dir[fnamecmp_type], "/", file->dirname, "/", xname, NULL);
+-					} else
+-						pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basis_dir[fnamecmp_type], xname);
++						pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basis_dir[fnamecmp_type], file->dirname);
++						basedir = fnamecmpbuf;
++					} else {
++						basedir = basis_dir[fnamecmp_type];
++					}
++					fnamecmp = xname;
+ 				} else if (fnamecmp_type >= basis_dir_cnt) {
+ 					rprintf(FERROR,
+ 						"invalid basis_dir index: %d.\n",
+ 						fnamecmp_type);
+ 					exit_cleanup(RERR_PROTOCOL);
+-				} else
+-					pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basis_dir[fnamecmp_type], fname);
+-				fnamecmp = fnamecmpbuf;
++				} else {
++					basedir = basis_dir[fnamecmp_type];
++					fnamecmp = fname;
++				}
+ 				break;
+ 			}
+ 			if (!fnamecmp || (daemon_filter_list.head
+@@ -760,7 +769,7 @@ int recv_files(int f_in, int f_out, char *local_name)
+ 		}
+ 
+ 		/* open the file */
+-		fd1 = do_open(fnamecmp, O_RDONLY, 0);
++		fd1 = secure_relative_open(basedir, fnamecmp, O_RDONLY, 0);
+ 
+ 		if (fd1 == -1 && protocol_version < 29) {
+ 			if (fnamecmp != fname) {
+@@ -771,14 +780,20 @@ int recv_files(int f_in, int f_out, char *local_name)
+ 
+ 			if (fd1 == -1 && basis_dir[0]) {
+ 				/* pre-29 allowed only one alternate basis */
+-				pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
+-					 basis_dir[0], fname);
+-				fnamecmp = fnamecmpbuf;
++				basedir = basis_dir[0];
++				fnamecmp = fname;
+ 				fnamecmp_type = FNAMECMP_BASIS_DIR_LOW;
+-				fd1 = do_open(fnamecmp, O_RDONLY, 0);
++				fd1 = secure_relative_open(basedir, fnamecmp, O_RDONLY, 0);
+ 			}
+ 		}
+ 
++		if (basedir) {
++			// for the following code we need the full
++			// path name as a single string
++			pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basedir, fnamecmp);
++			fnamecmp = fnamecmpbuf;
++		}
++
+ 		one_inplace = inplace_partial && fnamecmp_type == FNAMECMP_PARTIAL_DIR;
+ 		updating_basis_or_equiv = one_inplace
+ 		    || (inplace && (fnamecmp == fname || fnamecmp_type == FNAMECMP_BACKUP));
+diff --git a/syscall.c b/syscall.c
+index d92074a..47c5ea5 100644
+--- a/syscall.c
++++ b/syscall.c
+@@ -33,6 +33,8 @@
+ #include <sys/syscall.h>
+ #endif
+ 
++#include "ifuncs.h"
++
+ extern int dry_run;
+ extern int am_root;
+ extern int am_sender;
+@@ -712,3 +714,82 @@ int do_open_nofollow(const char *pathname, int flags)
+ 
+ 	return fd;
+ }
++
++/*
++  open a file relative to a base directory. The basedir can be NULL,
++  in which case the current working directory is used. The relpath
++  must be a relative path, and the relpath must not contain any
++  elements in the path which follow symlinks (ie. like O_NOFOLLOW, but
++  applies to all path components, not just the last component)
++
++  The relpath must also not contain any ../ elements in the path
++*/
++int secure_relative_open(const char *basedir, const char *relpath, int flags, mode_t mode)
++{
++	if (!relpath || relpath[0] == '/') {
++		// must be a relative path
++		errno = EINVAL;
++		return -1;
++	}
++	if (strncmp(relpath, "../", 3) == 0 || strstr(relpath, "/../")) {
++		// no ../ elements allowed in the relpath
++		errno = EINVAL;
++		return -1;
++	}
++
++#if !defined(O_NOFOLLOW) || !defined(O_DIRECTORY)
++	// really old system, all we can do is live with the risks
++	if (!basedir) {
++		return open(relpath, flags, mode);
++	}
++	char fullpath[MAXPATHLEN];
++	pathjoin(fullpath, sizeof fullpath, basedir, relpath);
++	return open(fullpath, flags, mode);
++#else
++	int dirfd = AT_FDCWD;
++	if (basedir != NULL) {
++		dirfd = openat(AT_FDCWD, basedir, O_RDONLY | O_DIRECTORY);
++		if (dirfd == -1) {
++			return -1;
++		}
++	}
++	int retfd = -1;
++
++	char *path_copy = my_strdup(relpath, __FILE__, __LINE__);
++	if (!path_copy) {
++		return -1;
++	}
++	
++	for (const char *part = strtok(path_copy, "/");
++	     part != NULL;
++	     part = strtok(NULL, "/"))
++	{
++		int next_fd = openat(dirfd, part, O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
++		if (next_fd == -1 && errno == ENOTDIR) {
++			if (strtok(NULL, "/") != NULL) {
++				// this is not the last component of the path
++				errno = ELOOP;
++				goto cleanup;
++			}
++			// this could be the last component of the path, try as a file
++			retfd = openat(dirfd, part, flags | O_NOFOLLOW, mode);
++			goto cleanup;
++		}
++		if (next_fd == -1) {
++			goto cleanup;
++		}
++		if (dirfd != AT_FDCWD) close(dirfd);
++		dirfd = next_fd;
++	}
++
++	// the path must be a directory
++	errno = EINVAL;
++
++cleanup:
++	free(path_copy);
++	if (dirfd != AT_FDCWD) {
++		close(dirfd);
++	}
++	return retfd;
++#endif // O_NOFOLLOW, O_DIRECTORY
++}
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12086-2.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12086-2.patch
new file mode 100644
index 000000000000..ae0a85bc4a5d
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12086-2.patch
@@ -0,0 +1,26 @@
+https://github.com/RsyncProject/rsync/pull/707
+
+From 4e9b6476325eb08931025d719cfc3ff2c94d2b23 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 15 Jan 2025 15:59:17 +0100
+Subject: [PATCH] Fix build on ancient glibc without openat(AT_FDCWD
+
+Fixes: https://github.com/RsyncProject/rsync/issues/701
+---
+ syscall.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/syscall.c b/syscall.c
+index 8cea2900..34a9bba0 100644
+--- a/syscall.c
++++ b/syscall.c
+@@ -734,7 +734,7 @@ int secure_relative_open(const char *basedir, const char *relpath, int flags, mo
+ 		return -1;
+ 	}
+ 
+-#if !defined(O_NOFOLLOW) || !defined(O_DIRECTORY)
++#if !defined(O_NOFOLLOW) || !defined(O_DIRECTORY) || !defined(AT_FDCWD)
+ 	// really old system, all we can do is live with the risks
+ 	if (!basedir) {
+ 		return open(relpath, flags, mode);
+
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12087-1.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12087-1.patch
new file mode 100644
index 000000000000..2328f3c0f6eb
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12087-1.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/948106
+
+Backport provided by Red Hat on the VINCE case.
+diff --git a/flist.c b/flist.c
+index 464d556..087f9da 100644
+--- a/flist.c
++++ b/flist.c
+@@ -2584,6 +2584,19 @@ struct file_list *recv_file_list(int f, int dir_ndx)
+ 		init_hard_links();
+ #endif
+ 
++	if (inc_recurse && dir_ndx >= 0) {
++		if (dir_ndx >= dir_flist->used) {
++			rprintf(FERROR_XFER, "rsync: refusing invalid dir_ndx %u >= %u\n", dir_ndx, dir_flist->used);
++			exit_cleanup(RERR_PROTOCOL);
++		}
++		struct file_struct *file = dir_flist->files[dir_ndx];
++		if (file->flags & FLAG_GOT_DIR_FLIST) {
++			rprintf(FERROR_XFER, "rsync: refusing malicious duplicate flist for dir %d\n", dir_ndx);
++			exit_cleanup(RERR_PROTOCOL);
++		}
++		file->flags |= FLAG_GOT_DIR_FLIST;
++	}
++
+ 	flist = flist_new(0, "recv_file_list");
+ 	flist_expand(flist, FLIST_START_LARGE);
+ 
+diff --git a/rsync.h b/rsync.h
+index 0f9e277..b9a7101 100644
+--- a/rsync.h
++++ b/rsync.h
+@@ -84,6 +84,7 @@
+ #define FLAG_DUPLICATE (1<<4)	/* sender */
+ #define FLAG_MISSING_DIR (1<<4)	/* generator */
+ #define FLAG_HLINKED (1<<5)	/* receiver/generator (checked on all types) */
++#define FLAG_GOT_DIR_FLIST (1<<5)/* sender/receiver/generator - dir_flist only */
+ #define FLAG_HLINK_FIRST (1<<6)	/* receiver/generator (w/FLAG_HLINKED) */
+ #define FLAG_IMPLIED_DIR (1<<6)	/* sender/receiver/generator (dirs only) */
+ #define FLAG_HLINK_LAST (1<<7)	/* receiver/generator */
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12087-2.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12087-2.patch
new file mode 100644
index 000000000000..dd4c7fb87a74
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12087-2.patch
@@ -0,0 +1,36 @@
+https://github.com/RsyncProject/rsync/pull/705
+
+From efb85fd8db9e8f74eb3ab91ebf44f6ed35e3da5b Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 15 Jan 2025 15:10:24 +0100
+Subject: [PATCH] Fix FLAG_GOT_DIR_FLIST collission with FLAG_HLINKED
+
+fixes commit 688f5c379a43 (Refuse a duplicate dirlist.)
+
+Fixes: https://github.com/RsyncProject/rsync/issues/702
+Fixes: https://github.com/RsyncProject/rsync/issues/697
+---
+ rsync.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rsync.h b/rsync.h
+index 9be1297b..479ac484 100644
+--- a/rsync.h
++++ b/rsync.h
+@@ -84,7 +84,6 @@
+ #define FLAG_DUPLICATE (1<<4)	/* sender */
+ #define FLAG_MISSING_DIR (1<<4)	/* generator */
+ #define FLAG_HLINKED (1<<5)	/* receiver/generator (checked on all types) */
+-#define FLAG_GOT_DIR_FLIST (1<<5)/* sender/receiver/generator - dir_flist only */
+ #define FLAG_HLINK_FIRST (1<<6)	/* receiver/generator (w/FLAG_HLINKED) */
+ #define FLAG_IMPLIED_DIR (1<<6)	/* sender/receiver/generator (dirs only) */
+ #define FLAG_HLINK_LAST (1<<7)	/* receiver/generator */
+@@ -93,6 +92,7 @@
+ #define FLAG_SKIP_GROUP (1<<10)	/* receiver/generator */
+ #define FLAG_TIME_FAILED (1<<11)/* generator */
+ #define FLAG_MOD_NSEC (1<<12)	/* sender/receiver/generator */
++#define FLAG_GOT_DIR_FLIST (1<<13)/* sender/receiver/generator - dir_flist only */
+ 
+ /* These flags are passed to functions but not stored. */
+ 
+
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12088.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12088.patch
new file mode 100644
index 000000000000..422a45e2c03e
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12088.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/948106
+
+Backport provided by Red Hat on the VINCE case.
+diff --git a/testsuite/unsafe-byname.test b/testsuite/unsafe-byname.test
+index 75e7201..d2e318e 100644
+--- a/testsuite/unsafe-byname.test
++++ b/testsuite/unsafe-byname.test
+@@ -40,7 +40,7 @@ test_unsafe ..//../dest 		from/dir			unsafe
+ test_unsafe ..				from/file			safe
+ test_unsafe ../..			from/file			unsafe
+ test_unsafe ..//..			from//file			unsafe
+-test_unsafe dir/..			from				safe
++test_unsafe dir/..			from				unsafe
+ test_unsafe dir/../..			from				unsafe
+ test_unsafe dir/..//..			from				unsafe
+ 
+diff --git a/util1.c b/util1.c
+index da50ff1..f260d39 100644
+--- a/util1.c
++++ b/util1.c
+@@ -1318,7 +1318,14 @@ int handle_partial_dir(const char *fname, int create)
+  *
+  * "src" is the top source directory currently applicable at the level
+  * of the referenced symlink.  This is usually the symlink's full path
+- * (including its name), as referenced from the root of the transfer. */
++ * (including its name), as referenced from the root of the transfer.
++ *
++ * NOTE: this also rejects dest names with a .. component in other
++ * than the first component of the name ie. it rejects names such as
++ * a/b/../x/y. This needs to be done as the leading subpaths 'a' or
++ * 'b' could later be replaced with symlinks such as a link to '.'
++ * resulting in the link being transferred now becoming unsafe
++ */
+ int unsafe_symlink(const char *dest, const char *src)
+ {
+ 	const char *name, *slash;
+@@ -1328,6 +1335,23 @@ int unsafe_symlink(const char *dest, const char *src)
+ 	if (!dest || !*dest || *dest == '/')
+ 		return 1;
+ 
++	// reject destinations with /../ in the name other than at the start of the name
++	const char *dest2 = dest;
++	while (strncmp(dest2, "../", 3) == 0) {
++	    dest2 += 3;
++	    while (*dest2 == '/') {
++		// allow for ..//..///../foo
++		dest2++;
++	    }
++	}
++	if (strstr(dest2, "/../"))
++	    return 1;
++
++	// reject if the destination ends in /..
++	const size_t dlen = strlen(dest);
++	if (dlen > 3 && strcmp(&dest[dlen-3], "/..") == 0)
++	    return 1;
++
+ 	/* find out what our safety margin is */
+ 	for (name = src; (slash = strchr(name, '/')) != 0; name = slash+1) {
+ 		/* ".." segment starts the count over.  "." segment is ignored. */
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12747-1.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12747-1.patch
new file mode 100644
index 000000000000..527da2046125
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12747-1.patch
@@ -0,0 +1,166 @@
+https://bugs.gentoo.org/948106
+
+Backport provided by Red Hat on the VINCE case.
+diff --git a/checksum.c b/checksum.c
+index cb21882..66e8089 100644
+--- a/checksum.c
++++ b/checksum.c
+@@ -406,7 +406,7 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+ 	int32 remainder;
+ 	int fd;
+ 
+-	fd = do_open(fname, O_RDONLY, 0);
++	fd = do_open_checklinks(fname);
+ 	if (fd == -1) {
+ 		memset(sum, 0, file_sum_len);
+ 		return;
+diff --git a/flist.c b/flist.c
+index 087f9da..1783253 100644
+--- a/flist.c
++++ b/flist.c
+@@ -1390,7 +1390,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+ 
+ 	if (copy_devices && am_sender && IS_DEVICE(st.st_mode)) {
+ 		if (st.st_size == 0) {
+-			int fd = do_open(fname, O_RDONLY, 0);
++			int fd = do_open_checklinks(fname);
+ 			if (fd >= 0) {
+ 				st.st_size = get_device_size(fd, fname);
+ 				close(fd);
+diff --git a/generator.c b/generator.c
+index 110db28..3f13bb9 100644
+--- a/generator.c
++++ b/generator.c
+@@ -1798,7 +1798,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+ 
+ 	if (write_devices && IS_DEVICE(sx.st.st_mode) && sx.st.st_size == 0) {
+ 		/* This early open into fd skips the regular open below. */
+-		if ((fd = do_open(fnamecmp, O_RDONLY, 0)) >= 0)
++		if ((fd = do_open_nofollow(fnamecmp, O_RDONLY)) >= 0)
+ 			real_sx.st.st_size = sx.st.st_size = get_device_size(fd, fnamecmp);
+ 	}
+ 
+@@ -1867,7 +1867,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+ 	}
+ 
+ 	/* open the file */
+-	if (fd < 0 && (fd = do_open(fnamecmp, O_RDONLY, 0)) < 0) {
++	if (fd < 0 && (fd = do_open_checklinks(fnamecmp)) < 0) {
+ 		rsyserr(FERROR, errno, "failed to open %s, continuing",
+ 			full_fname(fnamecmp));
+ 	  pretend_missing:
+diff --git a/receiver.c b/receiver.c
+index 8031b8f..edfbb21 100644
+--- a/receiver.c
++++ b/receiver.c
+@@ -775,7 +775,7 @@ int recv_files(int f_in, int f_out, char *local_name)
+ 			if (fnamecmp != fname) {
+ 				fnamecmp = fname;
+ 				fnamecmp_type = FNAMECMP_FNAME;
+-				fd1 = do_open(fnamecmp, O_RDONLY, 0);
++				fd1 = do_open_nofollow(fnamecmp, O_RDONLY);
+ 			}
+ 
+ 			if (fd1 == -1 && basis_dir[0]) {
+diff --git a/sender.c b/sender.c
+index 2bbff2f..a4d46c3 100644
+--- a/sender.c
++++ b/sender.c
+@@ -350,7 +350,7 @@ void send_files(int f_in, int f_out)
+ 			exit_cleanup(RERR_PROTOCOL);
+ 		}
+ 
+-		fd = do_open(fname, O_RDONLY, 0);
++		fd = do_open_checklinks(fname);
+ 		if (fd == -1) {
+ 			if (errno == ENOENT) {
+ 				enum logcode c = am_daemon && protocol_version < 28 ? FERROR : FWARNING;
+diff --git a/syscall.c b/syscall.c
+index 47c5ea5..c55ae5f 100644
+--- a/syscall.c
++++ b/syscall.c
+@@ -45,6 +45,8 @@ extern int preallocate_files;
+ extern int preserve_perms;
+ extern int preserve_executability;
+ extern int open_noatime;
++extern int copy_links;
++extern int copy_unsafe_links;
+ 
+ #ifndef S_BLKSIZE
+ # if defined hpux || defined __hpux__ || defined __hpux
+@@ -793,3 +795,21 @@ cleanup:
+ 	return retfd;
+ #endif // O_NOFOLLOW, O_DIRECTORY
+ }
++
++/*
++  varient of do_open/do_open_nofollow which does do_open() if the
++  copy_links or copy_unsafe_links options are set and does
++  do_open_nofollow() otherwise
++
++  This is used to prevent a race condition where an attacker could be
++  switching a file between being a symlink and being a normal file
++
++  The open is always done with O_RDONLY flags
++ */
++int do_open_checklinks(const char *pathname)
++{
++	if (copy_links || copy_unsafe_links) {
++		return do_open(pathname, O_RDONLY, 0);
++	}
++	return do_open_nofollow(pathname, O_RDONLY);
++}
+diff --git a/t_unsafe.c b/t_unsafe.c
+index 010cac5..e10619a 100644
+--- a/t_unsafe.c
++++ b/t_unsafe.c
+@@ -28,6 +28,9 @@ int am_root = 0;
+ int am_sender = 1;
+ int read_only = 0;
+ int list_only = 0;
++int copy_links = 0;
++int copy_unsafe_links = 0;
++
+ short info_levels[COUNT_INFO], debug_levels[COUNT_DEBUG];
+ 
+ int
+diff --git a/tls.c b/tls.c
+index e6b0708..858f8f1 100644
+--- a/tls.c
++++ b/tls.c
+@@ -49,6 +49,9 @@ int list_only = 0;
+ int link_times = 0;
+ int link_owner = 0;
+ int nsec_times = 0;
++int safe_symlinks = 0;
++int copy_links = 0;
++int copy_unsafe_links = 0;
+ 
+ #ifdef SUPPORT_XATTRS
+ 
+diff --git a/trimslash.c b/trimslash.c
+index 1ec928c..f2774cd 100644
+--- a/trimslash.c
++++ b/trimslash.c
+@@ -26,6 +26,8 @@ int am_root = 0;
+ int am_sender = 1;
+ int read_only = 1;
+ int list_only = 0;
++int copy_links = 0;
++int copy_unsafe_links = 0;
+ 
+ int
+ main(int argc, char **argv)
+diff --git a/util1.c b/util1.c
+index f260d39..d84bc41 100644
+--- a/util1.c
++++ b/util1.c
+@@ -365,7 +365,7 @@ int copy_file(const char *source, const char *dest, int tmpfilefd, mode_t mode)
+ 	int len;   /* Number of bytes read into `buf'. */
+ 	OFF_T prealloc_len = 0, offset = 0;
+ 
+-	if ((ifd = do_open(source, O_RDONLY, 0)) < 0) {
++	if ((ifd = do_open_nofollow(source, O_RDONLY)) < 0) {
+ 		int save_errno = errno;
+ 		rsyserr(FERROR_XFER, errno, "open %s", full_fname(source));
+ 		errno = save_errno;
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12747-2.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12747-2.patch
new file mode 100644
index 000000000000..2a3add75e0a9
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12747-2.patch
@@ -0,0 +1,34 @@
+https://github.com/RsyncProject/rsync/pull/706
+
+From f923b19fd85039a2b0e908391074872334646d51 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 15 Jan 2025 15:48:04 +0100
+Subject: [PATCH] Fix use-after-free in generator
+
+full_fname() will free the return value in the next call so we need to
+duplicate it before passing it to rsyserr.
+
+Fixes: https://github.com/RsyncProject/rsync/issues/704
+---
+ generator.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/generator.c b/generator.c
+index 3f13bb95..b56fa569 100644
+--- a/generator.c
++++ b/generator.c
+@@ -2041,8 +2041,12 @@ int atomic_create(struct file_struct *file, char *fname, const char *slnk, const
+ 
+ 	if (!skip_atomic) {
+ 		if (do_rename(tmpname, fname) < 0) {
++			char *full_tmpname = strdup(full_fname(tmpname));
++			if (full_tmpname == NULL)
++				out_of_memory("atomic_create");
+ 			rsyserr(FERROR_XFER, errno, "rename %s -> \"%s\" failed",
+-				full_fname(tmpname), full_fname(fname));
++				full_tmpname, full_fname(fname));
++			free(full_tmpname);
+ 			do_unlink(tmpname);
+ 			return 0;
+ 		}
+
diff --git a/net-misc/rsync/rsync-3.2.7-r4.ebuild b/net-misc/rsync/rsync-3.2.7-r4.ebuild
deleted file mode 100644
index a747693763f0..000000000000
--- a/net-misc/rsync/rsync-3.2.7-r4.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Uncomment when introducing a patch which touches configure
-RSYNC_NEEDS_AUTOCONF=1
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic prefix python-single-r1 systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
-	inherit autotools git-r3
-
-	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc
-	inherit verify-sig
-
-	if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
-		inherit autotools
-	fi
-
-	if [[ ${PV} == *_pre* ]] ; then
-		SRC_DIR="src-previews"
-	else
-		SRC_DIR="src"
-		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
-
-	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
-		verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
-	S="${WORKDIR}"/${P/_/}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd"
-REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
-REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/popt-1.5
-	acl? ( virtual/acl )
-	examples? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-	)
-	lz4? ( app-arch/lz4:= )
-	rrsync? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/bracex[${PYTHON_USEDEP}]
-		')
-	)
-	ssl? ( dev-libs/openssl:= )
-	system-zlib? ( sys-libs/zlib )
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	xxhash? ( >=dev-libs/xxhash-0.8 )
-	zstd? ( >=app-arch/zstd-1.4:= )
-	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	examples? ( ${PYTHON_DEPS} )
-	rrsync? ( ${PYTHON_DEPS} )
-"
-
-if [[ ${PV} == *9999 ]] ; then
-	BDEPEND+=" ${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-		')"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${P}-flist-memcmp-ub.patch
-	"${FILESDIR}"/${P}-fortify-source-3.patch
-	"${FILESDIR}"/${PN}-3.2.7-ipv6-configure-c99.patch
-)
-
-pkg_setup() {
-	# - USE=examples needs Python itself at runtime, but nothing else
-	# - 9999 needs commonmark at build time
-	if [[ ${PV} == *9999 ]] || use examples || use rrsync; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac
-
-	if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
-		eaclocal -I m4
-		eautoconf -o configure.sh
-		eautoheader && touch config.h.in
-	fi
-
-	if use examples || use rrsync; then
-		python_fix_shebang support/
-	fi
-
-	if [[ -f rrsync.1 ]]; then
-		# If the pre-build rrsync.1 man page exists, then link to it
-		# from support/rrsync.1 to avoid rsync's build system attempting
-		# re-creating the man page (bug #883049).
-		ln -s ../rrsync.1 support/rrsync.1 || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
-		--without-included-popt
-		--enable-ipv6
-		$(use_enable acl acl-support)
-		$(use_enable iconv)
-		$(use_enable lz4)
-		$(use_with rrsync)
-		$(use_enable ssl openssl)
-		$(use_with !system-zlib included-zlib)
-		$(use_enable xattr xattr-support)
-		$(use_enable xxhash)
-		$(use_enable zstd)
-	)
-
-	# https://github.com/WayneD/rsync/pull/428
-	if is-flagq -fsanitize=undefined ; then
-		sed -E -i \
-			-e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \
-			byteorder.h || die
-		append-flags -DCAREFUL_ALIGNMENT
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
-	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
-	dodoc NEWS.md README.md TODO tech_report.tex
-
-	insinto /etc
-	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
-	# Install stunnel helpers
-	if use stunnel ; then
-		emake DESTDIR="${D}" install-ssl-daemon
-	fi
-
-	# Install the useful contrib scripts
-	if use examples ; then
-		# The 'rrsync' script is installed conditionally via the 'rrysnc'
-		# USE flag, and not via the 'examples' USE flag.
-		rm support/rrsync* || die
-
-		exeinto /usr/share/rsync
-		doexe support/*
-
-		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
-	fi
-
-	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
-	systemd_newunit packaging/systemd/rsync.service rsyncd.service
-}
-
-pkg_postinst() {
-	if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
-		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
-		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
-		ewarn "is a security risk which you should fix.  Please check your"
-		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
-	fi
-
-	if use stunnel ; then
-		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
-		einfo
-		einfo "You maybe have to update the certificates configured in"
-		einfo "${EROOT}/etc/stunnel/rsync.conf"
-	fi
-
-	if use system-zlib ; then
-		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
-		ewarn "using the --compress option."
-		ewarn
-		ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
-		ewarn "and the --compress option, add --new-compress (-zz)."
-		ewarn
-		ewarn "For syncing the portage tree, add:"
-		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
-	fi
-}
diff --git a/net-misc/rsync/rsync-3.3.0-r2.ebuild b/net-misc/rsync/rsync-3.3.0-r2.ebuild
new file mode 100644
index 000000000000..7fbdb2af33fe
--- /dev/null
+++ b/net-misc/rsync/rsync-3.3.0-r2.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Uncomment when introducing a patch which touches configure
+RSYNC_NEEDS_AUTOCONF=1
+PYTHON_COMPAT=( python3_{10..13} )
+inherit flag-o-matic prefix python-single-r1 systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
+	inherit autotools git-r3
+
+	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc
+	inherit verify-sig
+
+	if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
+		inherit autotools
+	fi
+
+	if [[ ${PV} == *_pre* ]] ; then
+		SRC_DIR="src-previews"
+	else
+		SRC_DIR="src"
+		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
+
+	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
+		verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
+	S="${WORKDIR}"/${P/_/}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd"
+REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/popt-1.5
+	acl? ( virtual/acl )
+	examples? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+	)
+	lz4? ( app-arch/lz4:= )
+	rrsync? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/bracex[${PYTHON_USEDEP}]
+		')
+	)
+	ssl? ( dev-libs/openssl:= )
+	system-zlib? ( sys-libs/zlib )
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	xxhash? ( >=dev-libs/xxhash-0.8 )
+	zstd? ( >=app-arch/zstd-1.4:= )
+	iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	examples? ( ${PYTHON_DEPS} )
+	rrsync? ( ${PYTHON_DEPS} )
+"
+
+if [[ ${PV} == *9999 ]] ; then
+	BDEPEND+=" ${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+		')"
+else
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
+fi
+
+PATCHES=(
+	# Temporary just for the bug #948106 CVE fixes
+	"${FILESDIR}"/3.3.0
+)
+
+pkg_setup() {
+	# - USE=examples needs Python itself at runtime, but nothing else
+	# - 9999 needs commonmark at build time
+	if [[ ${PV} == *9999 ]] || use examples || use rrsync; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac
+
+	if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
+		eaclocal -I m4
+		eautoconf -o configure.sh
+		eautoheader && touch config.h.in
+	fi
+
+	if use examples || use rrsync; then
+		python_fix_shebang support/
+	fi
+
+	if [[ -f rrsync.1 ]]; then
+		# If the pre-build rrsync.1 man page exists, then link to it
+		# from support/rrsync.1 to avoid rsync's build system attempting
+		# re-creating the man page (bug #883049).
+		ln -s ../rrsync.1 support/rrsync.1 || die
+	fi
+}
+
+src_configure() {
+	# Should be fixed upstream in next release (>3.3.0) (bug #943745)
+	append-cflags $(test-flags-CC -std=gnu17)
+
+	local myeconfargs=(
+		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+		--without-included-popt
+		--enable-ipv6
+		$(use_enable acl acl-support)
+		$(use_enable iconv)
+		$(use_enable lz4)
+		$(use_with rrsync)
+		$(use_enable ssl openssl)
+		$(use_with !system-zlib included-zlib)
+		$(use_enable xattr xattr-support)
+		$(use_enable xxhash)
+		$(use_enable zstd)
+	)
+
+	# https://github.com/WayneD/rsync/pull/428
+	if is-flagq -fsanitize=undefined ; then
+		sed -E -i \
+			-e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \
+			byteorder.h || die
+		append-flags -DCAREFUL_ALIGNMENT
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+
+	dodoc NEWS.md README.md TODO tech_report.tex
+
+	insinto /etc
+	newins "${FILESDIR}"/rsyncd.conf-3.2.7-r5 rsyncd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+	# Install stunnel helpers
+	if use stunnel ; then
+		emake DESTDIR="${D}" install-ssl-daemon
+	fi
+
+	# Install the useful contrib scripts
+	if use examples ; then
+		# The 'rrsync' script is installed conditionally via the 'rrysnc'
+		# USE flag, and not via the 'examples' USE flag.
+		rm support/rrsync* || die
+
+		exeinto /usr/share/rsync
+		doexe support/*
+
+		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+	fi
+
+	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+	systemd_newunit packaging/systemd/rsync.service rsyncd.service
+}
+
+pkg_postinst() {
+	if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
+		ewarn "is a security risk which you should fix.  Please check your"
+		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+	fi
+
+	if use stunnel ; then
+		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+		einfo
+		einfo "You maybe have to update the certificates configured in"
+		einfo "${EROOT}/etc/stunnel/rsync.conf"
+	fi
+
+	if use system-zlib ; then
+		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
+		ewarn "using the --compress option."
+		ewarn
+		ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
+		ewarn "and the --compress option, add --new-compress (-zz)."
+		ewarn
+		ewarn "For syncing the portage tree, add:"
+		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
+	fi
+}
diff --git a/net-misc/rsync/rsync-3.3.0.ebuild b/net-misc/rsync/rsync-3.3.0.ebuild
deleted file mode 100644
index 8c66b403fc31..000000000000
--- a/net-misc/rsync/rsync-3.3.0.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Uncomment when introducing a patch which touches configure
-RSYNC_NEEDS_AUTOCONF=1
-PYTHON_COMPAT=( python3_{10..12} )
-inherit flag-o-matic prefix python-single-r1 systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
-	inherit autotools git-r3
-
-	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc
-	inherit verify-sig
-
-	if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
-		inherit autotools
-	fi
-
-	if [[ ${PV} == *_pre* ]] ; then
-		SRC_DIR="src-previews"
-	else
-		SRC_DIR="src"
-		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
-
-	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
-		verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
-	S="${WORKDIR}"/${P/_/}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd"
-REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
-REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/popt-1.5
-	acl? ( virtual/acl )
-	examples? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-	)
-	lz4? ( app-arch/lz4:= )
-	rrsync? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/bracex[${PYTHON_USEDEP}]
-		')
-	)
-	ssl? ( dev-libs/openssl:= )
-	system-zlib? ( sys-libs/zlib )
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	xxhash? ( >=dev-libs/xxhash-0.8 )
-	zstd? ( >=app-arch/zstd-1.4:= )
-	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	examples? ( ${PYTHON_DEPS} )
-	rrsync? ( ${PYTHON_DEPS} )
-"
-
-if [[ ${PV} == *9999 ]] ; then
-	BDEPEND+=" ${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-		')"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
-fi
-
-pkg_setup() {
-	# - USE=examples needs Python itself at runtime, but nothing else
-	# - 9999 needs commonmark at build time
-	if [[ ${PV} == *9999 ]] || use examples || use rrsync; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac
-
-	if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
-		eaclocal -I m4
-		eautoconf -o configure.sh
-		eautoheader && touch config.h.in
-	fi
-
-	if use examples || use rrsync; then
-		python_fix_shebang support/
-	fi
-
-	if [[ -f rrsync.1 ]]; then
-		# If the pre-build rrsync.1 man page exists, then link to it
-		# from support/rrsync.1 to avoid rsync's build system attempting
-		# re-creating the man page (bug #883049).
-		ln -s ../rrsync.1 support/rrsync.1 || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
-		--without-included-popt
-		--enable-ipv6
-		$(use_enable acl acl-support)
-		$(use_enable iconv)
-		$(use_enable lz4)
-		$(use_with rrsync)
-		$(use_enable ssl openssl)
-		$(use_with !system-zlib included-zlib)
-		$(use_enable xattr xattr-support)
-		$(use_enable xxhash)
-		$(use_enable zstd)
-	)
-
-	# https://github.com/WayneD/rsync/pull/428
-	if is-flagq -fsanitize=undefined ; then
-		sed -E -i \
-			-e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \
-			byteorder.h || die
-		append-flags -DCAREFUL_ALIGNMENT
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
-	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
-	dodoc NEWS.md README.md TODO tech_report.tex
-
-	insinto /etc
-	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
-	# Install stunnel helpers
-	if use stunnel ; then
-		emake DESTDIR="${D}" install-ssl-daemon
-	fi
-
-	# Install the useful contrib scripts
-	if use examples ; then
-		# The 'rrsync' script is installed conditionally via the 'rrysnc'
-		# USE flag, and not via the 'examples' USE flag.
-		rm support/rrsync* || die
-
-		exeinto /usr/share/rsync
-		doexe support/*
-
-		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
-	fi
-
-	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
-	systemd_newunit packaging/systemd/rsync.service rsyncd.service
-}
-
-pkg_postinst() {
-	if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
-		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
-		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
-		ewarn "is a security risk which you should fix.  Please check your"
-		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
-	fi
-
-	if use stunnel ; then
-		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
-		einfo
-		einfo "You maybe have to update the certificates configured in"
-		einfo "${EROOT}/etc/stunnel/rsync.conf"
-	fi
-
-	if use system-zlib ; then
-		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
-		ewarn "using the --compress option."
-		ewarn
-		ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
-		ewarn "and the --compress option, add --new-compress (-zz)."
-		ewarn
-		ewarn "For syncing the portage tree, add:"
-		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
-	fi
-}
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index 6014a70f8943..991dc398112c 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1,2 +1 @@
-DIST seafile-client-8.0.9.tar.gz 11716754 BLAKE2B 2087d2b31ce4696fdaaaa723da7a353c54ebebef86c84b62146d806692066165d0499f5fd6d3be108130d28c297020eafc3497be03131c8a8751f34f33eece90 SHA512 d0b55883f8d00138c092309994047652c6a5aa8b66182f83b6c852f1721794d9d8125da5fba282e9efdb92a0a97a55ecd6e225ab6a7916718a05ea2b7f4bd944
 DIST seafile-client-9.0.3.tar.gz 11718581 BLAKE2B cb2cecc9b02df4edb7b7191fd609ee5bc3548849c68b3c0cd8f59641bd0716791c2272633c0ba0f4f7b374a1302fd81a8f1396736961cb4e6e4ef1dd8db82c85 SHA512 c2d77c5f9407fd6d4ce3dfd47044de83a3c3e0bbbd1b66f1566ad54a8aa5391f51f70c7e094f16216a653a5ef0e9b8de1025ee56ce56c496c31c87983fbee4d7
diff --git a/net-misc/seafile-client/seafile-client-8.0.9.ebuild b/net-misc/seafile-client/seafile-client-8.0.9.ebuild
deleted file mode 100644
index 54a7323dc84f..000000000000
--- a/net-misc/seafile-client/seafile-client-8.0.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Upstream is moving tags repeatedly, then we use commit hash.
-RELEASE_COMMIT="5701514e89114b97795d4cfcbc3b59a1fd2f91e8"
-
-inherit xdg cmake
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="shibboleth test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/jansson:=
-	dev-libs/openssl:=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	>=net-libs/libsearpc-3.2.0_p1
-	~net-misc/seafile-${PV}
-	sys-libs/zlib
-	virtual/opengl
-	elibc_musl? ( sys-libs/fts-standalone )
-	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-8.0.6-select-qt5.patch"
-	"${FILESDIR}/${PN}-7.0.9-qt-5.15.patch"
-)
-
-S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	# 863554
-	use elibc_musl && mycmakeargs+=( -DCMAKE_CXX_STANDARD_LIBRARIES="-lfts" )
-	cmake_src_configure
-}
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index ed2334a2a495..f68e701ab4fd 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,2 +1 @@
-DIST seafile-8.0.9.gh.tar.gz 740920 BLAKE2B c62c7ccea536934a92166db5d2acea45b65f5508c1e5d4f70749c922c12d29da11bc2265203c91e87fe0096cc3f4b6ec4f6125b538a4de88725583871b05e67e SHA512 c4621ea4c08fcd9c5d4cf683152f7504c37212272b5a9535da869de846b71a7f5e9a72c5544f9b7487ad8025a6cdf2866c15788828cc27937209d8242fc13cb8
 DIST seafile-9.0.3.tar.gz 752618 BLAKE2B fc03756934ed36bf6706250e8a41a8d069a4cf0d69fcb76a44acd3a134a80e0705e72cfa1b8e44d1d4cf01e7f94e5781da3e3af88fc9f2cc4cfccbc8ecc15e11 SHA512 07312e56d642de63a5621870d6fe5ff42a0545d5b7def020dabdd36c9a06500c86801a02138de9e3dc6ff16cfdda43b59d651a08395207e108692cfa61db027f
diff --git a/net-misc/seafile/seafile-8.0.9-r2.ebuild b/net-misc/seafile/seafile-8.0.9-r2.ebuild
deleted file mode 100644
index f44fa93c9cb2..000000000000
--- a/net-misc/seafile/seafile-8.0.9-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-# Upstream is moving tags repeatedly, then we use commit hash.
-# (Please file a bug upstream if this happens!)
-#RELEASE_COMMIT="6bd36a957573eda6a53f3d1bc538dbfc001aa9fd"
-
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
-#SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
-#S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-SRC_URI="https://github.com/haiwen/seafile/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/openssl:=
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/jansson:=
-	dev-libs/libevent:=
-	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
-	net-misc/curl
-	sys-apps/util-linux
-	sys-libs/zlib
-	elibc_musl? ( sys-libs/fts-standalone )"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	$(vala_depend)"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	vala_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files
-	find "${ED}" -name '*.la' -delete || die
-	python_fix_shebang "${ED}"/usr/bin/seaf-cli
-}
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index e8bea8c2d5f5..10d287c7ff54 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,2 +1,2 @@
 DIST streamlink-6.11.0.tar.gz 763094 BLAKE2B 7fb0a84088991bc5a7514e0a40d5c05d3a14da5cffbcb255c5e5767fcae8c745a6397cbe79b0b0fd5bebab32b0d8d6c015931af03e6eaa199b5ed9437d0f3a7e SHA512 e6d6e49d2df0aa76ebca76c0b3ada085eac59553423a5ccaa3d5cb62f6be0a679da36c4f78a3e1fea48b22144e705b8de9e46fc146c1c93889ef0c056d59fc7b
-DIST streamlink-7.1.1.tar.gz 771209 BLAKE2B 812e2ddfda1780b72c03c1aac1fb1ab4f0cc9d0b347d2a6a2ff8d2e6a627e51d3920a63b46d8074525a1003cd1a9e10f6f6e6b75423ba436a754e9bb97ce795e SHA512 f379ecfb1aaf7962ee082b2526497678c8f10c0accba1aab72776ed5cd16a67e61ae52643028c5fb770bfc0a309e28d8dc88a8aec7e7e20c0f3388b103a4b71c
+DIST streamlink-7.1.2.tar.gz 772724 BLAKE2B 0a5165e0ec33c127272e4f232fc0ee421bafc54147a1e99424bbbd45ebb41ee2d8bae4fa68e278c1ddf26e8bc9cfe401616e108a2a1fa93fa34d4561046028f4 SHA512 da552336700a0b7e391435aa3e369d0f8b2868a13e15dd5110869a67d164b6775f924fe09839c00bf9f5d9ce0935380ec8c0996fdc58b82c6bbe5e6c6f89ec04
diff --git a/net-misc/streamlink/streamlink-7.1.1.ebuild b/net-misc/streamlink/streamlink-7.1.1.ebuild
deleted file mode 100644
index 38bb73a0d640..000000000000
--- a/net-misc/streamlink/streamlink-7.1.1.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
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
-	inherit git-r3
-fi
-
-DISTUTILS_SINGLE_IMPL=1
-# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools
-# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE='xml(+),threads(+)'
-inherit distutils-r1
-
-DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
-HOMEPAGE="https://streamlink.github.io/"
-
-if [[ ${PV} != 9999* ]]; then
-	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
-fi
-
-LICENSE="BSD-2 Apache-2.0"
-SLOT="0"
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep
-RDEPEND="
-	media-video/ffmpeg
-	$(python_gen_cond_dep '
-		dev-python/exceptiongroup[${PYTHON_USEDEP}]
-	' 3.10)
-	$(python_gen_cond_dep '
-		dev-python/certifi[${PYTHON_USEDEP}]
-		|| (
-			dev-python/chardet[${PYTHON_USEDEP}]
-			dev-python/charset-normalizer[${PYTHON_USEDEP}]
-		)
-		>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-		dev-python/isodate[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
-		>=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}]
-		dev-python/pycountry[${PYTHON_USEDEP}]
-		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
-		>dev-python/pysocks-1.5.7[${PYTHON_USEDEP}]
-		>=dev-python/trio-0.22.0[${PYTHON_USEDEP}]
-		>=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools-64[${PYTHON_USEDEP}]
-		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
-		test? (
-			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
-			dev-python/pytest-trio[${PYTHON_USEDEP}]
-			dev-python/requests-mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-if [[ ${PV} == 9999* ]]; then
-	RDEPEND+="
-		$(python_gen_cond_dep '
-			>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
-		')
-	"
-fi
-
-distutils_enable_tests pytest
diff --git a/net-misc/streamlink/streamlink-7.1.2.ebuild b/net-misc/streamlink/streamlink-7.1.2.ebuild
new file mode 100644
index 000000000000..1822f3313d84
--- /dev/null
+++ b/net-misc/streamlink/streamlink-7.1.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
+	inherit git-r3
+fi
+
+DISTUTILS_SINGLE_IMPL=1
+# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools
+# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+inherit distutils-r1
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+
+if [[ ${PV} != 9999* ]]; then
+	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
+fi
+
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+if [[ ${PV} != 9999* ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep
+RDEPEND="
+	media-video/ffmpeg
+	$(python_gen_cond_dep '
+		dev-python/exceptiongroup[${PYTHON_USEDEP}]
+	' 3.10)
+	$(python_gen_cond_dep '
+		dev-python/certifi[${PYTHON_USEDEP}]
+		|| (
+			dev-python/chardet[${PYTHON_USEDEP}]
+			dev-python/charset-normalizer[${PYTHON_USEDEP}]
+		)
+		>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
+		dev-python/isodate[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
+		>=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}]
+		dev-python/pycountry[${PYTHON_USEDEP}]
+		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+		>dev-python/pysocks-1.5.7[${PYTHON_USEDEP}]
+		>=dev-python/trio-0.22.0[${PYTHON_USEDEP}]
+		>=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}]
+		>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-64[${PYTHON_USEDEP}]
+		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
+		test? (
+			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
+			dev-python/pytest-trio[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+if [[ ${PV} == 9999* ]]; then
+	RDEPEND+="
+		$(python_gen_cond_dep '
+			>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
+		')
+	"
+fi
+
+distutils_enable_tests pytest
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.14.90.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.14.90.ebuild
new file mode 100644
index 000000000000..2e6cd6b87324
--- /dev/null
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.14.90.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XSERVER_VERSION="21.1.15"
+
+DESCRIPTION="Metapackage for the xorg module provided by tigervnc"
+HOMEPAGE="https://tigervnc.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	~net-misc/tigervnc-${PV}[server]
+	=x11-base/xorg-server-${XSERVER_VERSION%.*}*
+"
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 3cccbb4f57dd..6f9e98885706 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,2 +1,4 @@
 DIST tigervnc-1.14.1.tar.gz 2097932 BLAKE2B 44593837154e019562f63cad54afaa41d1af7a5199988571002019dc60af193162a54b4c3f4e57a3cef2c824253bec5d83f029ba489a7f5459873255b1968cba SHA512 d7a6cff4a3a1e4c30e2dbd6e17ad2d76145e76f5c1a93abbaf32b1c488377a4eaf936d4e8a24a97863948138ba40031c862f9da1c1cd427da35ebffa8eaa4f31
+DIST tigervnc-1.14.90.tar.gz 2106976 BLAKE2B 02c9509580790a65d76c05067f132a8ac7a834e02f4d46910f235dd55deba995630e74a8dd2e81b7d77bc7ee2f5ccbfbb565aee8f3bf0d15d8c532d366819e69 SHA512 c842f1beb0610a8dc039136592cf4acd8d2ef42f7681c44f98c4ec57c35dd759cb98ad7e8462852a1c85ee8f7f63e3283909e30cc52de6c30b602235f4ffafd2
 DIST xorg-server-21.1.14.tar.xz 5016608 BLAKE2B b64ff9bbcd1d1c632b588800acb1531d6295a52347294d323d684a7149a4f803fb38357a102d715525511c8bb8554daf2e71c28149ccb650b1c7c1990351f53e SHA512 833d36ca4a409363dc021a50702bc29dbb32d074de319d6910a158b6e4d8f51a20c3b0de0486d9613d4e526fe4fd60ca306b3c9fcce7d014ca8cc10185afd973
+DIST xorg-server-21.1.15.tar.xz 5009756 BLAKE2B a7d5df70a4af98b903a306850a169879cf083b2c811f6e75e1e916f85441214541f7c9fa0e0089c4bf08c67597166d97ea194c6a0a511948568120e579d1104f SHA512 677bbec81ecdd1d14e1d289a00c40249988985ec636e5473b30c4f63bad03a6cc5f9168cea94969e1550370eee8863595bc9c064c3d218a96123afc7567bf363
diff --git a/net-misc/tigervnc/tigervnc-1.14.90.ebuild b/net-misc/tigervnc/tigervnc-1.14.90.ebuild
new file mode 100644
index 000000000000..ef7fe09fa151
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.14.90.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+
+XSERVER_VERSION="21.1.15"
+XSERVER_PATCH_VERSION="21"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="https://tigervnc.org"
+SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+else
+	SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
+REQUIRED_USE="
+	dri3? ( drm )
+	java? ( viewer )
+	opengl? ( server )
+	|| ( server viewer )
+"
+
+# TODO: sys-libs/libselinux
+# <fltk-1.4: https://github.com/TigerVNC/tigervnc/pull/1887#issuecomment-2545662546
+COMMON_DEPEND="
+	dev-libs/gmp:=
+	dev-libs/nettle:=
+	media-libs/libjpeg-turbo:=
+	sys-libs/zlib:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/pixman
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
+	server? (
+		dev-libs/openssl:0=
+		sys-libs/pam
+		x11-libs/libXau
+		x11-libs/libxcvt
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXfixes
+		x11-libs/libXfont2
+		x11-libs/libXtst
+		x11-libs/pixman
+		x11-apps/xauth
+		x11-apps/xinit
+		x11-apps/xkbcomp
+		x11-apps/xsetroot
+		x11-misc/xkeyboard-config
+		dri3? (
+			media-libs/mesa[opengl]
+			x11-libs/libxshmfence
+		)
+		opengl? ( media-libs/libglvnd[X] )
+		!net-misc/turbovnc[server]
+	)
+	viewer? (
+		media-video/ffmpeg:=
+		<x11-libs/fltk-1.4:1=
+		x11-libs/libXi
+		x11-libs/libXrender
+		!net-misc/turbovnc[viewer]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+	server? ( dev-lang/perl )
+"
+DEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.8:* )
+	drm? ( x11-libs/libdrm )
+	server? (
+		media-fonts/font-util
+		x11-base/xorg-proto
+		x11-libs/libXi
+		x11-libs/libxkbfile
+		x11-libs/libXrender
+		x11-libs/xtrans
+		x11-misc/util-macros
+		opengl? ( media-libs/mesa )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	# Restore Java viewer
+	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+	"${FILESDIR}"/${PN}-1.14.0-xsession-path.patch
+	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
+	"${FILESDIR}"/${PN}-1.14.1-pam.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	if use server; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+	fi
+
+	cmake_src_prepare
+
+	if use server; then
+		cd unix/xserver || die
+		eapply ../xserver${XSERVER_PATCH_VERSION}.patch
+		eautoreconf
+		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
+
+		if use drm; then
+			cd "${WORKDIR}" && \
+			sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+		fi
+	fi
+}
+
+src_configure() {
+	if use arm || use hppa; then
+		append-flags "-fPIC"
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DBUILD_JAVA=$(usex java)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_VIEWER=$(usex viewer)
+	)
+
+	cmake_src_configure
+
+	if use server; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dri \
+			$(use_enable dri3) \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-static \
+			--disable-unit-tests \
+			--disable-xephyr \
+			$(use_enable xinerama) \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--with-sha1=libcrypto
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use server; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
+			damageext miext Xi xkb composite dix mi os present hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+
+		newconfd "${FILESDIR}"/${PN}-1.14.0.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}-1.14.0.initd ${PN}
+
+		systemd_douserunit unix/vncserver/vncserver@.service
+
+		# install vncserver to /usr/bin too, see bug #836620
+		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	use server && [[ -n ${REPLACING_VERSIONS} ]] && ver_test "${REPLACING_VERSIONS}" -lt 1.13.1-r3 && {
+		elog 'OpenRC users: please migrate to one service per display as documented here:'
+		elog 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:'
+		elog
+	}
+
+	use server && {
+		elog 'PLEASE NOTE:'
+		elog '	The default config directory is now ${XDG_CONFIG_HOME}/tigervnc or'
+		elog '	~/.config/tigervnc instead of ~/.vnc'
+		elog
+	}
+
+	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
+	use server && \
+		optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
+		optfeature_header "Install any additional display manager package:" && \
+		optfeature "proper session support" ${OPTIONAL_DM}
+}
diff --git a/net-misc/trurl/Manifest b/net-misc/trurl/Manifest
index 7b709110ceaf..285f2c40663a 100644
--- a/net-misc/trurl/Manifest
+++ b/net-misc/trurl/Manifest
@@ -1 +1 @@
-DIST trurl-0.16.tar.gz 54414 BLAKE2B ace93c0ec54e81131bed91a78092bb5a2768a92cf2dee763f29327221a2b5ac3f657c7500e1f1cb895a29c1dd73500c15140eaadede72a6ee57a31d7ebe5c414 SHA512 4411769ba36109dc0e0c27ff605b7b6eb9dc9da3ab53290dc0049f44d853f7363699a9e22716dbf4c2d912f5c0c1556ea0d14f55475f44b48ea2e320b00a75e7
+DIST trurl-0.16-tmp.tar.gz 59327 BLAKE2B d349cf57eb4ad048a9d4a15aac0d0f9e6e577f379eb97b21530d2e080d78e1cb333aca7625805e0e6e555f356bad985e0961c43d499d02b9369b505b8c8d2757 SHA512 da4f7afd4a0685037549543ece23ad30d8f98ed9613d9050cbb269524ea4242d097bf74f7642c386d664eb2f24aff910f3cae9c8efda0e6a4f6a2a644a8c82f2
diff --git a/net-misc/trurl/trurl-0.16-r1.ebuild b/net-misc/trurl/trurl-0.16-r1.ebuild
new file mode 100644
index 000000000000..227ea49cde7b
--- /dev/null
+++ b/net-misc/trurl/trurl-0.16-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit toolchain-funcs python-any-r1
+
+DESCRIPTION="Command line tool for URL parsing and manipulation"
+HOMEPAGE="https://curl.se/trurl/ https://daniel.haxx.se/blog/2023/04/03/introducing-trurl/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/curl/trurl"
+	inherit git-r3
+else
+	## 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
+
+LICENSE="curl"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Older curls may work but not all features will be present
+DEPEND=">=net-misc/curl-7.81.0"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_compile() {
+	tc-export CC
+	export NDEBUG=1
+
+	default
+}
+
+src_test() {
+	emake PYTHON3="${EPYTHON}" test
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+}
diff --git a/net-misc/trurl/trurl-0.16.ebuild b/net-misc/trurl/trurl-0.16.ebuild
deleted file mode 100644
index 0818842536b1..000000000000
--- a/net-misc/trurl/trurl-0.16.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit toolchain-funcs python-any-r1
-
-DESCRIPTION="Command line tool for URL parsing and manipulation"
-HOMEPAGE="https://curl.se/trurl/ https://daniel.haxx.se/blog/2023/04/03/introducing-trurl/"
-
-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}
-
-	KEYWORDS="~amd64 ~arm ~arm64"
-fi
-
-LICENSE="curl"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Older curls may work but not all features will be present
-DEPEND=">=net-misc/curl-7.81.0"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_compile() {
-	tc-export CC
-	export NDEBUG=1
-
-	default
-}
-
-src_test() {
-	emake PYTHON3="${EPYTHON}" test
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-}
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-misc/tuba/Manifest b/net-misc/tuba/Manifest
index f4c3c98ab68d..e035134408d1 100644
--- a/net-misc/tuba/Manifest
+++ b/net-misc/tuba/Manifest
@@ -1 +1,2 @@
 DIST Tuba-0.8.4.gh.tar.gz 1803987 BLAKE2B 9ec1647bc255a3cef37293fc86f81eed534f4a313e3ec0ab81318766972ed01100b30afcc05448f5344637da08962bb72dc2eb5d44fc0561ce1a61c48b9b8b5d SHA512 8484cdb898174958c1e79ddfd6fab9e74693bca19d1eddde504679d1074cac986580dcf2e2c98fa13ab54fec2a4ffc25b1977bc6e62f1b3a524a6810b2ac268f
+DIST Tuba-0.9.1.gh.tar.gz 2137594 BLAKE2B 1df526b4340896d367243eeee534b923554cf039368e851d82faa178b2d2bb43dc84612f0af209f4ded6e7902c47026dd2305b82159d8d92323810075c7daa43 SHA512 4c80fb98902359f9f8b59665ea580e477885d5de66e1d5640b67766fde49805702eababed4600b13afd6e8a16b5dbdc9b2391b0c8271eebdef70152c1b60f7a4
diff --git a/net-misc/tuba/tuba-0.9.1.ebuild b/net-misc/tuba/tuba-0.9.1.ebuild
new file mode 100644
index 000000000000..09c732985f1f
--- /dev/null
+++ b/net-misc/tuba/tuba-0.9.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson optfeature vala
+
+MY_P=${P^}
+DESCRIPTION="Browse the Fediverse (GTK client)"
+HOMEPAGE="
+	https://tuba.geopjr.dev/
+	https://github.com/GeopJr/Tuba/
+"
+SRC_URI="
+	https://github.com/GeopJr/Tuba/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+# TODO: optional dep on libspelling-1
+DEPEND="
+	app-crypt/libsecret[introspection,vala]
+	>=dev-libs/glib-2.76.0:2
+	dev-libs/icu:=
+	>=dev-libs/json-glib-1.4.4[introspection]
+	>=dev-libs/libgee-0.8.5:0.8[introspection]
+	dev-libs/libxml2
+	>=gui-libs/gtk-4.13.4:4[gstreamer,introspection]
+	>=gui-libs/libadwaita-1.6:1[introspection,vala]
+	>=gui-libs/gtksourceview-5.6.0:5[introspection,vala]
+	media-libs/gstreamer[introspection]
+	net-libs/libsoup:3.0[introspection,vala]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	$(vala_depend)
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		# disable calling updaters (see pkg_post*)
+		-Ddistro=true
+		# not packaged
+		-Dclapper=false
+	)
+
+	vala_setup
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dosym dev.geopjr.Tuba /usr/bin/tuba
+}
+
+pkg_postinst() {
+	optfeature "WebP image support" gui-libs/gdk-pixbuf-loader-webp
+
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-misc/ubridge/Manifest b/net-misc/ubridge/Manifest
index 5cf3d291486a..e0c9e79c5f09 100644
--- a/net-misc/ubridge/Manifest
+++ b/net-misc/ubridge/Manifest
@@ -1,2 +1 @@
-DIST ubridge-0.9.18.tar.gz 64340 BLAKE2B 7ac540ccf180adc8bf0bb0d440d6a0335626181ba680f7f94cea43d6b6b70745cd64f8ee8048aa1621b7407fea83cf03039147ffe38236e70970c014771ab09b SHA512 f2c9e9d0242f61363a3f4ce6f1acf4013245ff0854a7f64c96d6b8737bd3cc505a38aaf43a0928e2a5a88bcd39f786e00fab68748ad56770d18d713005750c60
 DIST ubridge-0.9.19.tar.gz 66911 BLAKE2B c9de0485b84fa7cb78edb6651f0022c6e3f3d6e62aa2e1c56927c62d540ae1efaee25225bc7eb843ad688b7bd0aa39eb8a2ff1015a5c01f2d23d5a798b21ff14 SHA512 b693a64569ba17fcb40f8a7894fcc205efba17fc3103150bb6f1d7a8a165505c88251e75f56d003f4c4337e97bffa57b5948156e42d01a2938b8d969a088ff32
diff --git a/net-misc/ubridge/files/ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch b/net-misc/ubridge/files/ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch
deleted file mode 100644
index 4d4825f477aa..000000000000
--- a/net-misc/ubridge/files/ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur a/Makefile b/Makefile
---- a/Makefile	2019-05-20 10:02:14.000000000 +0300
-+++ b/Makefile	2019-05-20 10:32:04.972039000 +0300
-@@ -67,7 +67,7 @@
- 
- ifeq ($(SYSTEM_INIPARSER),1)
-     CFLAGS += -DUSE_SYSTEM_INIPARSER
--    LIBS += -liniparser
-+    LIBS += -liniparser4
- else
-     SRC += src/iniparser/iniparser.c   \
- 	   src/iniparser/dictionary.c
-diff -ur a/src/parse.h b/src/parse.h
---- a/src/parse.h	2019-05-20 10:02:14.000000000 +0300
-+++ b/src/parse.h	2019-05-20 10:32:04.968039000 +0300
-@@ -24,7 +24,7 @@
- #include "ubridge.h"
- 
- #ifdef USE_SYSTEM_INIPARSER
--#include <iniparser.h>
-+#include <iniparser4/iniparser.h>
- #else
- #include "iniparser/iniparser.h"
- #endif
-diff -ur a/src/ubridge.c b/src/ubridge.c
---- a/src/ubridge.c	2019-05-20 10:02:14.000000000 +0300
-+++ b/src/ubridge.c	2019-05-20 10:32:04.968039000 +0300
-@@ -26,7 +26,7 @@
- #include <pthread.h>
- 
- #ifdef USE_SYSTEM_INIPARSER
--#include <iniparser.h>
-+#include <iniparser4/iniparser.h>
- #else
- #include "iniparser/iniparser.h"
- #endif
diff --git a/net-misc/ubridge/ubridge-0.9.18.ebuild b/net-misc/ubridge/ubridge-0.9.18.ebuild
deleted file mode 100644
index adfeeba6492c..000000000000
--- a/net-misc/ubridge/ubridge-0.9.18.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps toolchain-funcs
-
-DESCRIPTION="Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces"
-HOMEPAGE="https://github.com/GNS3/ubridge"
-SRC_URI="https://github.com/GNS3/ubridge/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3+"
-
-RDEPEND="
-	acct-group/ubridge
-	dev-libs/iniparser:4=
-	net-libs/libpcap"
-
-DEPEND="${RDEPEND}"
-
-# Bugs: https://bugs.gentoo.org/647588
-#       https://github.com/GNS3/ubridge/issues/60
-PATCHES=( "${FILESDIR}/${PN}-0.9.16_add_slotted_iniparser-4.1+_support.patch" )
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		SYSTEM_INIPARSER=1
-}
-
-src_install() {
-	exeinto /usr/bin
-	exeopts -m 710 -g ubridge
-	doexe ubridge
-
-	dodoc README.rst
-}
-
-pkg_postinst() {
-	fcaps -g ubridge -m 4710 -M 0710 cap_net_raw,cap_net_admin \
-		"${EROOT}"/usr/bin/ubridge
-
-	einfo "\nNOTE: To read packets from the network interfaces with ubridge as"
-	einfo "normal user you have to add trusted users to the \"ubridge\" group.\n"
-}
diff --git a/net-misc/ubridge/ubridge-0.9.19-r1.ebuild b/net-misc/ubridge/ubridge-0.9.19-r1.ebuild
new file mode 100644
index 000000000000..f2b58fb26ca2
--- /dev/null
+++ b/net-misc/ubridge/ubridge-0.9.19-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps flag-o-matic toolchain-funcs
+
+DESCRIPTION="Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces"
+HOMEPAGE="https://github.com/GNS3/ubridge"
+SRC_URI="https://github.com/GNS3/ubridge/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/ubridge
+	>=dev-libs/iniparser-4.1-r2:=
+	net-libs/libpcap"
+
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	# iniparser.pc only exists in >=4.2 and it changes headers location
+	has_version '>=dev-libs/iniparser-4.2' &&
+		append-cflags $($(tc-getPKG_CONFIG) --cflags iniparser || die)
+
+	emake \
+		CC="$(tc-getCC)" \
+		SYSTEM_INIPARSER=1
+}
+
+src_install() {
+	exeinto /usr/bin
+	exeopts -m 710 -g ubridge
+	doexe ubridge
+
+	dodoc README.md
+}
+
+pkg_postinst() {
+	fcaps -g ubridge -m 4710 -M 0710 cap_net_raw,cap_net_admin \
+		"${EROOT}"/usr/bin/ubridge
+
+	einfo "\nNOTE: To read packets from the network interfaces with ubridge as"
+	einfo "normal user you have to add trusted users to the \"ubridge\" group.\n"
+}
diff --git a/net-misc/ubridge/ubridge-0.9.19.ebuild b/net-misc/ubridge/ubridge-0.9.19.ebuild
deleted file mode 100644
index 5c359bef8f37..000000000000
--- a/net-misc/ubridge/ubridge-0.9.19.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps toolchain-funcs
-
-DESCRIPTION="Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces"
-HOMEPAGE="https://github.com/GNS3/ubridge"
-SRC_URI="https://github.com/GNS3/ubridge/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	acct-group/ubridge
-	dev-libs/iniparser:4=
-	net-libs/libpcap"
-
-DEPEND="${RDEPEND}"
-
-# Bugs: https://bugs.gentoo.org/647588
-#       https://github.com/GNS3/ubridge/issues/60
-PATCHES=( "${FILESDIR}/${PN}-0.9.16_add_slotted_iniparser-4.1+_support.patch" )
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		SYSTEM_INIPARSER=1
-}
-
-src_install() {
-	exeinto /usr/bin
-	exeopts -m 710 -g ubridge
-	doexe ubridge
-
-	dodoc README.md
-}
-
-pkg_postinst() {
-	fcaps -g ubridge -m 4710 -M 0710 cap_net_raw,cap_net_admin \
-		"${EROOT}"/usr/bin/ubridge
-
-	einfo "\nNOTE: To read packets from the network interfaces with ubridge as"
-	einfo "normal user you have to add trusted users to the \"ubridge\" group.\n"
-}
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index c4fa6a87ee08..32c690817381 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,2 +1,3 @@
-DIST yt-dlp-2024.12.13.tar.gz 5813833 BLAKE2B ead14c4922e74e75dcdabe63ed5bb4a91e7d30a3b475acad63c03320a5958190118a886c88a7f5424ed6b7cbb9115c2368b41737b1ad99165f925c3f6a38275b SHA512 369cb303a4bf14b8e872ea3315478c943bc13741eaa4ee1d219df0d5e89d1c46992577acb8530c592e4278da1af7969a25417972c2ca55d84ee0f8e7e25c31b4
 DIST yt-dlp-2024.12.23.tar.gz 5817118 BLAKE2B 99df0c13661d5768bb38545d59ba982365ca62a26c90f7217793b9a386ad932164e4e166c20cb05449cf56950324a56ee3aea56a2fb1fa5258dc8e0872e2e784 SHA512 8b068ebb88fc7339f685dfe999a1814f43098c16bd89033154f872e53e6743090c210ac5cb5cdd783ebd947ac33ecb749b08bbec9c7d7dc41da3424968666ee8
+DIST yt-dlp-2025.01.12.tar.gz 5821087 BLAKE2B 8d385e4aeed026f1c85f06b7a7bb1403f9561852f49cca51030c6fd88bcd66462e56de2419eff2fd784091cc87431e14a6ab5abc1ebd23f8b9d05d7d9f667ed1 SHA512 bea91c322ac33a717deff7558cae7d12e1337e3a9888860a339c6315dca08814b4ef1018848adf3c434aaacdf093e96a6e5ad07e60bd76b1f8abf6cb7f1b418b
+DIST yt-dlp-2025.01.15.tar.gz 5819696 BLAKE2B f846d9bc7dec85667dc6ded40b9307731889fe1736920a40367de8f3ec3b1127f630d437792654baf21a2d83a3cd59757341cb6fbfe95f4b614e650d061c231d SHA512 20786cb0d16e58dc9fb2b2e35852b496862d79dfa42ebf92e430161c89863fc1d6247a2c1f9220e8555b20ea60ffbabb3e0d81521df98e47677f56ad1f4a68a1
diff --git a/net-misc/yt-dlp/yt-dlp-2024.12.13.ebuild b/net-misc/yt-dlp/yt-dlp-2024.12.13.ebuild
deleted file mode 100644
index 3de67e0bfb4a..000000000000
--- a/net-misc/yt-dlp/yt-dlp-2024.12.13.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-inherit bash-completion-r1 distutils-r1 optfeature wrapper
-
-DESCRIPTION="youtube-dl fork with additional features and fixes"
-HOMEPAGE="https://github.com/yt-dlp/yt-dlp/"
-SRC_URI="
-	https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz
-		-> ${P}.tar.gz
-"
-S=${WORKDIR}/${PN}
-
-LICENSE="Unlicense"
-SLOT="0"
-# note that yt-dlp bumps are typically done straight-to-stable (unless there
-# was major/breaking changes) given website changes breaks it on a whim
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	!net-misc/youtube-dl[-yt-dlp(-)]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# fails with FEATURES=network-sandbox
-		test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout
-		# fails with FEATURES=distcc, bug #915614
-		test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\]
-	)
-
-	epytest -m 'not download'
-}
-
-python_install_all() {
-	dodoc README.md Changelog.md supportedsites.md
-	doman yt-dlp.1
-
-	dobashcomp completions/bash/yt-dlp
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completions/fish/yt-dlp.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/zsh/_yt-dlp
-
-	rm -r "${ED}"/usr/share/doc/yt_dlp || die
-
-	make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl"
-}
-
-pkg_postinst() {
-	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
-	has_version media-video/atomicparsley || # allow fallback but don't advertise
-		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
-	optfeature "decrypting cookies from Chromium-based browsers" dev-python/secretstorage
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
-		elog 'as "youtube-dl". This is strictly for compatibility and it is'
-		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
-	fi
-}
diff --git a/net-misc/yt-dlp/yt-dlp-2025.01.12.ebuild b/net-misc/yt-dlp/yt-dlp-2025.01.12.ebuild
new file mode 100644
index 000000000000..213369c3ecb0
--- /dev/null
+++ b/net-misc/yt-dlp/yt-dlp-2025.01.12.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+inherit bash-completion-r1 distutils-r1 optfeature wrapper
+
+DESCRIPTION="youtube-dl fork with additional features and fixes"
+HOMEPAGE="https://github.com/yt-dlp/yt-dlp/"
+SRC_URI="
+	https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz
+		-> ${P}.tar.gz
+"
+S=${WORKDIR}/${PN}
+
+LICENSE="Unlicense"
+SLOT="0"
+# note that yt-dlp bumps are typically done straight-to-stable (unless there
+# was major/breaking changes) given website changes breaks it on a whim
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	!net-misc/youtube-dl[-yt-dlp(-)]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# fails with FEATURES=network-sandbox
+		test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout
+		# fails with FEATURES=distcc, bug #915614
+		test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\]
+	)
+
+	epytest -m 'not download'
+}
+
+python_install_all() {
+	dodoc README.md Changelog.md supportedsites.md
+	doman yt-dlp.1
+
+	dobashcomp completions/bash/yt-dlp
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/yt-dlp.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_yt-dlp
+
+	rm -r "${ED}"/usr/share/doc/yt_dlp || die
+
+	make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl"
+}
+
+pkg_postinst() {
+	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
+	has_version media-video/atomicparsley || # allow fallback but don't advertise
+		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
+	optfeature "decrypting cookies from Chromium-based browsers" dev-python/secretstorage
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
+		elog 'as "youtube-dl". This is strictly for compatibility and it is'
+		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
+	fi
+}
diff --git a/net-misc/yt-dlp/yt-dlp-2025.01.15.ebuild b/net-misc/yt-dlp/yt-dlp-2025.01.15.ebuild
new file mode 100644
index 000000000000..213369c3ecb0
--- /dev/null
+++ b/net-misc/yt-dlp/yt-dlp-2025.01.15.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+inherit bash-completion-r1 distutils-r1 optfeature wrapper
+
+DESCRIPTION="youtube-dl fork with additional features and fixes"
+HOMEPAGE="https://github.com/yt-dlp/yt-dlp/"
+SRC_URI="
+	https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz
+		-> ${P}.tar.gz
+"
+S=${WORKDIR}/${PN}
+
+LICENSE="Unlicense"
+SLOT="0"
+# note that yt-dlp bumps are typically done straight-to-stable (unless there
+# was major/breaking changes) given website changes breaks it on a whim
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	!net-misc/youtube-dl[-yt-dlp(-)]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# fails with FEATURES=network-sandbox
+		test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout
+		# fails with FEATURES=distcc, bug #915614
+		test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\]
+	)
+
+	epytest -m 'not download'
+}
+
+python_install_all() {
+	dodoc README.md Changelog.md supportedsites.md
+	doman yt-dlp.1
+
+	dobashcomp completions/bash/yt-dlp
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/yt-dlp.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_yt-dlp
+
+	rm -r "${ED}"/usr/share/doc/yt_dlp || die
+
+	make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl"
+}
+
+pkg_postinst() {
+	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
+	has_version media-video/atomicparsley || # allow fallback but don't advertise
+		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
+	optfeature "decrypting cookies from Chromium-based browsers" dev-python/secretstorage
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
+		elog 'as "youtube-dl". This is strictly for compatibility and it is'
+		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
+	fi
+}
diff --git a/net-news/alligator/Manifest b/net-news/alligator/Manifest
index f7e0a6b01eb7..28967a803847 100644
--- a/net-news/alligator/Manifest
+++ b/net-news/alligator/Manifest
@@ -1,2 +1,2 @@
 DIST alligator-24.08.3.tar.xz 195108 BLAKE2B 31c2c324d0d39df6592186cb9da437d61f9baba9728b2f4066cb101065da43a59a8cf9cc019f9a8b7233d721fbcd06291115d61543c23536850829c5b0b1d022 SHA512 2227fb86f238a7eb8505e19e390d5f23a5d820ac5889109d4df4a87f267999c5cc5a12abb9cc8bb689b89bd1911dc1d122646cbd083d244c9686501d695167dc
-DIST alligator-24.12.0.tar.xz 196428 BLAKE2B 36fff003146a8826b7c10f6fe6106b2ced1da9a9e56bf4b84e6570fa8a98fe6dc47a5951e91a3674caef3b3d837be76740c9f8e68f174d64b46781e62486497f SHA512 904c4ca6f928331dad999c5c3c5791c668efb3132b3f9300c5a54b797c2c9c93081d251778278e8b9f681b794fb0ba18e088b7927dc1f04b7a02bafdba8b4d53
+DIST alligator-24.12.1.tar.xz 196484 BLAKE2B 29a10e46cb4420f0f24eb90501a17bbc1a5dae16cca29e5c234c8667094b8886ff31bf8cdc9c90b9a723fac5b4eb00214ffcc576505b080b2a1be67f8b42d7b7 SHA512 35c5680ab540a305bd2898ffbe2de7c72cea4eeb748ecfa2cf611ac61a69c79e83d915646d5c3df723f88c15e45e5dcc67e96869d9c7b513554a307720d395e1
diff --git a/net-news/alligator/alligator-24.12.0.ebuild b/net-news/alligator/alligator-24.12.0.ebuild
deleted file mode 100644
index ce3048bdcd80..000000000000
--- a/net-news/alligator/alligator-24.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Convergent RSS/Atom feed reader for Plasma"
-HOMEPAGE="https://apps.kde.org/alligator/"
-
-LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0 CC-BY-SA-4.0 GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-DEPEND="
-	dev-libs/kirigami-addons:6
-	>=dev-qt/qtbase-${QTMIN}:6[gui,network,sql,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/syndication-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/net-news/alligator/alligator-24.12.1.ebuild b/net-news/alligator/alligator-24.12.1.ebuild
new file mode 100644
index 000000000000..da0edaacc614
--- /dev/null
+++ b/net-news/alligator/alligator-24.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Convergent RSS/Atom feed reader for Plasma"
+HOMEPAGE="https://apps.kde.org/alligator/"
+
+LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0 CC-BY-SA-4.0 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	dev-libs/kirigami-addons:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,sql,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/syndication-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
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-news/newsboat/Manifest b/net-news/newsboat/Manifest
index 6040e03f343c..09cb74501942 100644
--- a/net-news/newsboat/Manifest
+++ b/net-news/newsboat/Manifest
@@ -1,172 +1,110 @@
-DIST addr2line-0.17.0.crate 32260 BLAKE2B 23c3715820a04260460a41695d535da3565f76519b7313d0ed684352b339de2ea668c44fe8ca58fc1a5b9f84cc5e9d04d889440abb5985bdc04b267dbdad9d9c SHA512 ef3bbd7c6d1dfdd0b47e3be1fb4c8b15ed61a769bed7e80dce80461a1ee13ef21c75e62e9a66328504f862341f1e808abec5790ac79784e18655afcc16206b95
 DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
-DIST aho-corasick-0.7.19.crate 113070 BLAKE2B 5ddaa0d415d19cf9922b5723bf3480750634ea68cb66fd05bfa2bf57607eb6383ba86d8c55f70adb87b71b98caa73d8f6ebd075c006493530c81979032899b60 SHA512 0d63d29079650bde4e8a9f8529716b9d8c42db076a1d74715116240c2628173f1e86fb29c08a25ad07a0148e48789ab20de0c186a8b3dfb193cbfeb0d76ae78c
 DIST aho-corasick-1.1.1.crate 182812 BLAKE2B df74c2cfa0ae392a8d466e370ba761c4cd37c65773affba9a3cdcf7f5797b34b4a25e1646be3de5081644b34db2dce273609edb4f18a1ce7fdbf31ac28a10b88 SHA512 a894e1cefbb63a3b7b78a3676874d0b7a507c27970f48cdfbda1e5deefbf6b20ed4271b660a12eea77b318cd2fa0f80850a0b1ddfe0d0731ffa326c0fc295692
 DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST backtrace-0.3.66.crate 74397 BLAKE2B d5c2e941d118a13e1335ceb5c129fc022281592b19a03f7c07914c607e14d0f415956a6076755e33263cb44a5e60827345db1490abe36c74aabd2594ef9661ca SHA512 7370ce52d0b949a6faa05f91225f60928e42e52c00ed2ba4054ef7efd41cd65c77b0e67c8afb9d5bf834eb4b1451b642720521e17d1954be810e3c5fc70bf646
 DIST backtrace-0.3.69.crate 77299 BLAKE2B 594358f1d9171fc369f50cacffab03b8a10a8fe3da5b915611cb74b0dbad0e048c7dc79c53569d89827db583e0f61fb7269147b6258781a1599a811e642414a8 SHA512 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244
 DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
 DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitflags-2.4.1.crate 37043 BLAKE2B f61c45b142265e9c2944c7054e01704de47510735e9ee5351cd02b98676cc4eb42d68b1fc4849ad5f54654617a74f20cb533b4207c2fe76516b724ba9318b414 SHA512 d3fd7abc95acc1cb5bf16d6acc12dbb8eadd250f069268df13c2e8dc3d5f5c15a929cd17ca931c77393b64dce0516ef8674c469789ed32d78e315b5faada062b
 DIST block-0.1.6.crate 4077 BLAKE2B a2c11873b8cb1a1ea399ecc99ed45e5d0b9399bd88435cdea346910b8707b7da94eeef522dafa5cdb09929534472b2a096c03c373744a789962d4175fd1b110e SHA512 c278e3c0346cae423b533a8f5d6b822e788ec450c92ef0f5f559d5705764a0a11df49f0f66bb1c8af7e89bec8ec802934676b969e43f92255a38b210d0fbd710
-DIST bumpalo-3.11.0.crate 80945 BLAKE2B a740a674d0922794cc71b87a8bd686f677f8d0b38d88cc43467b7f8f6d1368ef5cff99bf10867d3c8af9b79b71deca7e5bfe78670b7890b04e468359780d8c76 SHA512 f747b5743bd2825c62c363ec49f1eccc492d7cf8cca8101aa9733f32489685c1777344dc6183f83c772f1067f9648b953d3ae1034976a14295f252f1ee7788fa
 DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
-DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST chrono-0.4.23.crate 187259 BLAKE2B b4a7cfb8d1921d396c9e2bf350e6c61d04480a78c170d153e525ff581e8298936583744b6c59769774fdb8ad433269d01ad792f967da96e6c19d33460de937f9 SHA512 697a78ee83eaf38d83011bdf2086b3149b830d3d270e8414828b98ed2426063df43ac6eb4324f2dd694662afb86e6e4f005dee6116dfdd97adaebedefffd43fa
 DIST chrono-0.4.31.crate 214513 BLAKE2B 2ac43852ea14cb7b129adf68ff62adac1763b3f4802dd3d23c43cb131377b501b4adb22aa93818d7ceded8eb10c17f94a7836257ce2876d0513b063276129c54 SHA512 23276daa2c1bc3b7b2327dc84200fb40cc995a8b599d1a537e92e08138ab8a0d1548a510a8155dcdda18820120d7204e89a4686c866fc3a8d2460cdb30ac6089
 DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844
-DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
 DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6
-DIST curl-sys-0.4.59+curl-7.86.0.crate 2996584 BLAKE2B dd06c7cdf7740049558b8296d16e2485ee1b83692a94bdd2a037ecd45c0ec88c32bf48a26ea985c8de2de84296edf3f52092bfd3ab8338e10066e0a8defdc33d SHA512 048c5dbc3e1870c9b205c107e006c7112d01f4f7f03eb301ad9ca06ef29d03b08a840717ccc45883f19f1f6734958301375365653ccc6e45ff99151bd5e03b3f
 DIST curl-sys-0.4.70+curl-8.5.0.crate 3254512 BLAKE2B 2f07aa5ebc35ef46869775861b11849b4d728be33d957ff03e4d7d893caae9f78b137bd507aacacdadd1071fc220157907295233760f43d596834b92d58b3583 SHA512 349fb40ef95da3595425056c44bac9bf122f8e9b2095fbe0f2ea7442460cc40ad49bc30b7aec5961cd625d804348306971d53783f13208e6813158c9096e58b4
 DIST cxx-1.0.111.crate 206212 BLAKE2B e8c3241e5a0df7d0011929984075cdf3c178b556814901988979313a989f6c2ecb5f85f21e7b3c2635d533e154282f32fb468e02d668ff05d5fc189e923f041f SHA512 9b7a2cb5042fa59505cdc422446448097267f305236d3bee3dc80e919d45bf59dc754cd6dd58258fb89fcc3f209e6d7cd3b86629ce43fe658dc0fd7ca68c3c67
-DIST cxx-1.0.85.crate 589916 BLAKE2B 3be165b6d8c5ccaa7e5ec3d456c1bc2aeb95e2dc7890feb1ebeb2d25b2887b1b023afdccda08862a13928a8f379200c46fcaf88ecc111d9dbb3bbc5dde63f88d SHA512 bf9386f58ea007bcc7171af713e944459a6b219ddbe88813f16df5e274ab85418be23dd7bdaee7964108e9a4a1698365de67362d5504c80bee726f1151166f5c
 DIST cxx-build-1.0.111.crate 86475 BLAKE2B c172c415733adfc417cb2ffa985cc2b54267c68456ed8b183bb92ea5f36c234f9ffc960e77f5296d29c72a820336ddbb6844333b1febdfe2711dd025c8f4ca6b SHA512 7384d2161046ece17f0a1c2de7978678aba837c6683fbee6342c5264ef8894627d45e1bb0fb628f0e4cc524af5aaa72cd5636188736420cfe77b3d30bfdab8da
-DIST cxx-build-1.0.85.crate 84820 BLAKE2B 6dd01e251776f33cbb11b4ef6a9d77db7c476e6184f942d0a5fca5505c5fc2463bc03edcf8f08597238898b92df1c53ba330e9c3b4e63a106136445fcf202584 SHA512 3ef75dc28bed9c1c9cea5dbd7b396f8e88a5fe288e19d1aa1f96add32830236b2414fe33ed7b06566759298cf0130d6b82d2049ba9bf362c95413ce8481f2bf2
 DIST cxxbridge-flags-1.0.111.crate 5285 BLAKE2B 78a1ac0b15f8ba3e457887fb26a5e859c20e61c87ae1ade054c00d5ab2cd15b8b93166e420e145a953e4f5877025ba7d4b9c0297cca708731ae430d9f223570d SHA512 45b32890cd76986cccf24178c835091d223065ebc9e48d47b30ae6a3a418eda61fb7b3ce521587fe1496b62ded8bc48506fb2cc627963c5f02fd9e76da860da0
-DIST cxxbridge-flags-1.0.85.crate 5635 BLAKE2B 5d365e5a6e2ef5bdde5f223f5ab726e0667aedcecdc2a2f1ec961d9c199c291dfcf94ed4ca6a2ea9056073c8519839cad7d5b49f7c8022bf96b96186f19874a2 SHA512 186a08d40469bfc8fcf801bd766e89e72d160a7b28ce465b3e8a39b4f38d7c17bc373e9bd8f5e50c758be7755ac450d532aa88c7c20d908c3905106bd8cac05c
 DIST cxxbridge-macro-1.0.111.crate 60424 BLAKE2B ed630b824a394496563361d0cf339d87594567efd4c10395eeeb3cd31d665b84829f995011ee45201a2b09e9605af5f162a5a307748100697f50f76ed4b4c291 SHA512 f7c71d93a1f5729723f904396d7f11c5b11213902dda5b2958de20372cda54d8b886f182869e94167f2b125f3958c9b69d7b018bea3fca2812ca372b9c9252cf
-DIST cxxbridge-macro-1.0.85.crate 59873 BLAKE2B f44f7b48da2b08b2a678742001c4bb02dd35a78de91db11165589a4dd1e90db5484dc3bcc3599689afd5866fcb944b6a3031b17a69ec6867c0547b0df004eedf SHA512 7e3e93c5698ff1f6d0a5a40beebb3bac603f3c157afa639f1c5191895680b7d9b2d17494f9b5fa195ff8d42066387a85c166ea28b33415a4a0aff9820d31985e
-DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b
-DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f
 DIST errno-0.3.3.crate 10543 BLAKE2B 958e9d12766533ae9e84a60b121794929b9b3b1a8111aca9a2e914beee5784b64c946e143cd8031335ac9cb51069e51dbc9a6b61073a2ccfd3ff60612a20b619 SHA512 9524db39d0c9be287e0d2aed3358a86e961b2868717037212a2e9dc408bc73198ab23196d7923a9ba7e0e9357276075148f582e0325ad36ae1b212a8c674173e
 DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
-DIST fastrand-1.8.0.crate 11369 BLAKE2B 93e911ffcec559e30b2fefa44c4d74d1ffa9b8ef1904ace608b8576210bcd41a2b4c7adffc00cd3bb40996110d07316cf8068f4754a879c6cb47e3d41304d406 SHA512 82cbc2b29b97fa3fa2c9372d3e8c390586a7b39f6c7d8c45f9b779bdfdaa2e8a3b44bc7bfcb3367c18120726facc753c9827cf63a8fb4ddc2667509b16333cb1
 DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
-DIST form_urlencoded-1.1.0.crate 8734 BLAKE2B eaca73d73d16242f3fa3e38e23531c67c01404697bc7b7eb7c64fa04167dcb403a41818487fc46c5d9118842818472d549a2f5fcef5e4d962461e1c103d895d1 SHA512 9e245495dbf235b147e4216b313f2e6a96357d2782a66d71c08c2902c6a065701ca8ecdbb6b2035983a83c44cf36c921b5c71d63af0e02dd39bf5f8347117e11
 DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
 DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b
-DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1
 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.26.2.crate 717340 BLAKE2B 6460346625fad7ed202f387d45900867e785026e08efbf6542bb5c7b6ec2bc8ddfdaf825e872d2c339c3b72f8ddaba546efa94243a602bd8c9470c6e808a8f30 SHA512 10baa5fb5fe13eeab2ed9ac8e02ae7607b42df80b9f39b14027d052ac7f6f11e4dec451bd73c3640ff8ef174e280c1640110720b2bc4220229d27bbb31079029
 DIST gimli-0.28.0.crate 269277 BLAKE2B 4d651d9f71b826d06b3089cb09933f30d785801b8072228c9a5c9ed2011172c679e86205dd507cb1866634238b20721773e60410bd25fbcc5c3421c72ba565be SHA512 a5a861c7398ec655635a39c3a421ca5c9effb03f4980a000c342b81b9bf229481639a8a62c4396508a9800ec9d313317036a8e4e7da3add5adeca596f1c09d51
-DIST iana-time-zone-0.1.50.crate 17151 BLAKE2B dcef44c0bc7a97c47a8191e512da1734a215b1194881720b4c6a879b410ff28e749452bc7f7d3ac4101d909720e640e257903007564fd0a3669c958b5dfacd3c SHA512 6acdc857a8f32f4ff1a3cc8ffb69bf1e8ec3e0462629183f29601237c9e45657b2f6e1d4f9fe589da8d2b7b058ce085d856ed9ac6c28ef9e7c568089fc8b6b32
 DIST iana-time-zone-0.1.57.crate 19785 BLAKE2B 2304a63e4d3a477125ed07fccd5a84832f775c4a0fbd60a995e6f1850aaf3f5047c6f70975c9f6334f96def12770d470677e1f536e9817f8ab1df8a312622cfe SHA512 79bc0fe559dce022cd3c15ffc3b6f870c14a40de6d5a61b4a5a6ad28fe7efce82a16ac5102073a3510f3ba683843475f7fb8a4029bbafbc1cc25e48b98ce2fe8
 DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2
-DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabea8785b93cd247b3aedd2aeef2cd99978a027186290016ed924db39d19fe7d397da1ab570be9646bbb630a SHA512 9b7cee27811ee52ed9bb39fe82f724742eef2e5370642b6c756bd134c8cbc20bb6faa9f296053672dba8a66f7356a08b2ca99f176407b173e2d566d85d066441
 DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c
-DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
-DIST js-sys-0.3.60.crate 79257 BLAKE2B 714facdab00d567d074de4a25b69487400c23194d0f58ca784159483f9e02289acadce084b1514d8816cc9e0597800de82a5298b071b7df19a24df93541f23c1 SHA512 543dfd444539fad27bafcbbf112366f53d4ccf4bc63f8bb17820d818c3e1804656697ed6268a793f383ddf6b6227f7e9b3a11fb6fbb24e10732fdbd971801665
 DIST js-sys-0.3.64.crate 80313 BLAKE2B 7cf5dcb2b9e0b63cb82771c9e98518a4cda70372c5aed07866a07d2aa51274622357e4b5a665499328f5a3c38f7c515303da50421bad4a496fbb658e2132325f SHA512 a4f389a4eb45c2122e7bcf365dccdce8fcf14b1b521b8b839746bba8783296e2f1b959d73bdd874743f49c61a24c4077dec52f63cc7d594cd42e9cd6ea9c2e64
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST lexopt-0.2.1.crate 22503 BLAKE2B c97023f65afb6ffe396b048af4c146bdeda27acf4e35271b9c2d5d6c73ffb38aa3945515f0da7a9f98fef384e6726ba6e5fc745496d3da3e3d69b26efddc163c SHA512 34abdeeb0093c4b6d02a6a932a4405e82c52c9db981ecf4c7bf41c877dcebe131b35374ebbb0d66aa7f069c7f431d99117a191578d9cf2b3e7e5dbb0e8249b11
 DIST lexopt-0.3.0.crate 24767 BLAKE2B 9e2437715bbeb5ad1d638b21791936a336f5344afa2fe6c65506cfd478a75671bc82c81c4329e6aa7edf9c34b61083ccf5a38268340702c614701e99269b8ce4 SHA512 7ce3856a54fa6274ea3d5a4fe353f4a0411f5f6754fe8a5e7a114705f063300a93aa2efad765bc1dd0244caee15a8cf44a3de540a4db0626ed2ac6476bdb6843
-DIST libc-0.2.139.crate 638983 BLAKE2B e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598 SHA512 ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4
 DIST libc-0.2.151.crate 736640 BLAKE2B ba8ea6d22b0eefdc5c1c5ee9fab960b6ea0eb7098a21b032563ec78b5d6e2a8f1d7ca4d5bb721c71de2c5de28e105029f229b9b03cd5168c78a65c7164e6d07d SHA512 2039bdfd704c5a876ff7d609622bb968260d6e0fd264ca457e92b75660503eca10e1ff21864b3c919d2656de521f03ef443895f5c0150271ae2502857742b0ec
 DIST libm-0.2.7.crate 115688 BLAKE2B e180347d10847c40a88e43d321e08561df053e6fea0cea2cac480c4162c2f31d8697b4572a384edae323d43781d3c6462b2d77220dd71b2fd0da3a2757487db1 SHA512 b7adbf657be812451fc50cd5e5f92b7a71d43b4e48761bd2738d65498c9abad851f8e86d3be06ae75cf39c7798c23cafe767bc5fd40f596774e858f69fcb46d9
 DIST libz-sys-1.1.12.crate 3030648 BLAKE2B ab8cb974481f86f7ef40eb27ee08ee5535cb914cb76608683b53b57e89d7c92ee4d0831d6d0977ec76476036fdb8c6374ebdf3daa639cfb627e0153d40ca752a SHA512 03daeb5f03193887b692cbe8d631c83ac632f3e92fca4f10e881058fea38d85e11c090de04be9d70d52a22dec669474a0044a3d45d4adeb3a0f39e3398cdac11
-DIST libz-sys-1.1.8.crate 2481844 BLAKE2B e890a3850aed5348afe7558168c7571564687d6a7d3567a4d53ffdf79444d38c4d70d35891e16f496f31169bf73b669534f5fc584f9ec520b518dda05e80b882 SHA512 0766ab72cc1414160ccefe4812e6204cbed1341607e5d17607f24fd4ff81dca68d8f2cf43e1d27f332a508d602bff0ad340c4c647a5d5f85acc120c19cfb4100
-DIST link-cplusplus-1.0.7.crate 7576 BLAKE2B 9e8fc7f4b149a778c732469c6ef4663ad01aa49d6dae747b4368f827a41c62cd2f38cbd7e1efff45d8bf0ccafbff305b8ff5503f25028bef12400343b427e278 SHA512 c8fdf9ffb29cd0f8824bb4416d28f6f4fd7a024ce5056acbe63a680f975f50fc0cb408c0d0af04a37b6985bf15f78e7e7d1fc20a9c0f8b729e7ea696460d8c75
 DIST link-cplusplus-1.0.9.crate 7484 BLAKE2B 4f73807068243aa0dc4b6773c5446fc988154669eb196afca19fe39ffe63627ee705c4ee3cf9cca9628d0bb8fc4cdeb7ef52b41bab810d12721a6ad53d9557ee SHA512 30697093b54ca449135d7a2a963bdd9af61a446472b0f245c87a05bd6eefa62eeebf9cc58cf17aa77ac5f2301b05ae27d13eb50d92ec58fec27303f865261170
 DIST linux-raw-sys-0.4.10.crate 1407767 BLAKE2B 8bc633d99bc1ee1a6fdfa19501fd034a4475fa9ebe18a206e4254309d91aee7a91fc70faf9775efa5157a1b2fb7e5f827bde40a770b066643356113f2cf38b5d SHA512 107f61add087bff55869798d5c71bc6ac9ecb27a603d8f9071b856189de8b7b0a7f9243fa1433700f52a0c3020eff5604dbf6e0653109d0dd277b98ab45fae21
 DIST locale_config-0.3.0.crate 20808 BLAKE2B 68b0519639c816af82b941a417d4a74896033e9c5110081d495e1cc3a3e7613ddaf2a665770c6199749b89be131a35592dc4cd7cc2789928199b22205300aa9d SHA512 c7d77156e957559172f589f90405b2e9f5306041887990a60a31630af2de81c00fbba2bcdf52bd163fe431f85694dc6d2d380671f38f2724d7e4d178d89998da
-DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
 DIST malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad965c3681f244161deaee76282fa09b9af0d0642cd39ef35689f85f5bd7c2efb7ba8119a58e86c7cd12d81b2c6b SHA512 463b3d7666cdd7de618abf0cc4e488060c84d6d93c56d4e922169511a0b03de380ea988cd998f5a162b244088902198763351ac16dea3762f0fa0840fc29d6ed
 DIST md5-0.7.0.crate 6671 BLAKE2B a1c8132cb4d7497ab3f4550e6fffdea6b118ad99a31128c068ea3243b5f76c4b059042da376a0be32fb74e866571348a581c2ca727d6acf855d823ce15f593b5 SHA512 569c992eafe25986a1328666a428b2335ecc5cb7a5ba142c34d7abb1247f6768c0bb3dce790121686d4ebf1b4a1832d65315136552163dfba5f799f99551544a
-DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memchr-2.6.3.crate 94377 BLAKE2B 5f1603397d6703ddd9a1e68429cb6e9dae9021e14692c1e084f3b5c82d36645a1fa930c7a76b97df8e1919402fa7e1c621969ce85ce20c82b3087104afe18f25 SHA512 8d5e1425ea702a0950c95271dfd2e81610731496f77af0d683536b074a22922a7d7ec6da41577487d1d658e3b27257b7d1e142761b523e68760a2f5f24f049bc
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
-DIST miniz_oxide-0.5.4.crate 53485 BLAKE2B 8836697bdc3707f89fa869e6b09a36ee4d83ce2ae0a53bc7b06bbad70ed7ac25f8f67d841f3f611f6756d891f0eddb0abf7fcaf87570f8ab32220f113583ea6d SHA512 589dac16ca9c2f94e6fa92b68bcf51d140f46562cbb3a1b791b75c59feae51da5ec16042604bbd6bcb7d7f0c7f75e98ea1af8cf42d177133a5eaa86429cf3114
 DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c
 DIST natord-1.0.9.crate 3866 BLAKE2B 8e8f576af50121e7571a1d919557ddc14a3c1511c12154a9cb74fa34cb5c2279406e1ae7ffb120242689e34d4f237d9548631f5a35f4f5d4369bafd8a728fcc6 SHA512 bf58eda54c759fecca1fd310bece370f26555bde1096081adc5bb1e9446a538f1652fb3049a52f898f4f62a2608805b72cb72dd52ff3fc9b88fe0a7c9071025a
-DIST newsboat-2.30.1.tar.xz 807552 BLAKE2B 0e925e6fb47ce6007d534da9b7c716c92e103d67ddaa5433754156b0e26b24594348a41c075388e3e8097f231c60ba95b5227a78a665d49a9c43d7e2d7f9cdcb SHA512 1a6ce38b61104c9ce84eecab915a74320942fcfcb82ab130f0b64aca995be0f666bbfb1867c0f1df0c15415b30896c01217132d2f79bcb85926f581aa024e551
 DIST newsboat-2.34-docs.tar.gz 101500 BLAKE2B 75429817af1a5480a5ad4ede08e5e346a04ce866231015b91da7ca6a61803fbe77b1c014ba6f75df8331cf34b81153cc30d404c9d552f15cabce1e432cd0a066 SHA512 62c36ffa61420999e89f47c46870665a95df482340a51b5a22e34d50fa602f9e8c1b3fd1f18b8cedf533dafb112b4e524451d8e9864beb7ff1f780ed56a0858b
 DIST newsboat-2.34.tar.xz 825292 BLAKE2B 0eb206ef41f4e233a1a08cb87138a760b22776e932f5cc7b570bd832abf577ca62042b996bfcbcb12e4321e198ef77ce77eb64efa132f91817c098ce759b8934 SHA512 5a00ec9664182963db527589a853a7a1b480c72acd734aa5a5bc80e0e63c707e2b0890a52ff6acacfba40eeb78f4c98f23fc05b0f4dbf212b4e41c81c635f231
-DIST nom-7.1.1.crate 115818 BLAKE2B 1ec3df3d9a7527f26618a9b6b976ca8ad5176d711dc7e6163dafb1ec214a55345e952439b4c98b2ac371c9a67c7ffdc3213d1081b62b699b36af68207fa8b320 SHA512 1456efdbda4f5b3da6c8580721acf101ed7d779619ee0190c1df103244e405a8ffa0c3889901a2d8beeab0ab84074ed4c7cec5330c7cc2a5a3c30e36a2530be8
+DIST newsboat-2.38-crates.tar.xz 24555800 BLAKE2B cde655483b4af0f48b44e4ac75999cf2577cb73e6d813ea08ca7cfea2b2124fcd534c8b4ea360a413b36b4e6840f55327770447a4d68f3306c3ff9c7ba6b745e SHA512 e717e9ad5cc92c675489ffe16cf9a490b77a14bd3387d2ab876ab1e1ec8d6ca675364ab7a8107a0fd594f3945f6fb3139babb634d212b3d30c3595b1501a53b3
+DIST newsboat-2.38-docs.tar.xz 68260 BLAKE2B 481d0b97b9cbbeb6cd8292653e1ddcfb800bb2adf884ef81487d9c62e33cf52f4cdb292ea244f64ee94124f2eb521337777f8002e5c4567717e49256184819d2 SHA512 f7ce7c7afb8dfbdaf58f82d2c59c04d7ba906505419db55cb296fa6c2034a2c2f5db3e9be9a7cf63b870a3066f1fd31589ed5708b0b91c2fbd3d95a99047e5fe
+DIST newsboat-2.38.tar.xz 811288 BLAKE2B 2429ae101057af6aed6de68c117bdbf3700ebc959f7312af9af49225a76732f1996c55101a4b7090e8756df3d1109d882dc0556fbfb5ee02d564c8a70bc00dba SHA512 ef7268e5a716b0253c0e2b9700a6ebfc5b3b15e91e069c01da07ce727fb84ad7da8ca48b71d2b09375f059050ccc2e2c8a8cc773d4f02e4ee7c6091d70699f1c
 DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
-DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
-DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
 DIST num-traits-0.2.16.crate 50130 BLAKE2B 1101d28cb4dce477657684a068792b94c7008a965e655edbabfeff51cbe6f008450dc6d7e4fc5dc4fe9c3ee8623ed77a7bde83ce2f68e75d618295fe6cebe0a8 SHA512 2ef65e2f6275b1000f611cc4d019b2f4846a8964b54d9b96462da10e3ac9edbf3d1de82e40094c76f7f5205740361b0eb0ced414bcddbaba5955144f728c6f94
 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.29.0.crate 237723 BLAKE2B fd579be961df0d3185682348f1d9cc0fb4dde3daf9a3c5d89b16a5f03f3084f1755d1b077f8a7bd14b2bb296b3bb95e9fd85f58380bd52fe9aa885e19c1b176f SHA512 fb69ed164b9d766b2eb268b3492134ba9ca6b4358eb61712773c44c5c0676ce04e3e0c749f947658ee1423dce5e11237f6b6c0320f2d32bd6979cae141273dc2
 DIST object-0.32.1.crate 275463 BLAKE2B df88d37427c2741931ab0ef24a482755168c7348ccc280f8264e94e5f8548c608799868e0bc5984632ee02aa84313fc5e222b7cd7ebc6829729ea49544f13416 SHA512 5bfd3b8960fd80bb48691fdef35d7a9fc3d752a1cf5f29cb4e146a17d427e878d972d208e8aefe5015b3c62d065ed9a66f2f9f790b4743d1a4a3f9c0b8e581e3
-DIST once_cell-1.16.0.crate 32120 BLAKE2B 59bfc8a44f1fec72442e3d34bf4be3a5af073f854f07b3618b2857c759dca4a0fa6ba358514ae28c25d745b01bb7b390ffe9ed6e296d163fd3dd67e49092b87a SHA512 bc199570ee43bde9245a2c4637ae738e370ce9988635c8342349ceb6fb158f376247b69f9ec4ea0e6d76b934decdc77a524299ebde96c0a2c2d29d9501b9a568
 DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8
-DIST percent-encoding-2.2.0.crate 10075 BLAKE2B 397e59acc3953868c709244b89a2e0db3304c0b574ecba761026b570a485f2cb5b0b2a0159586d1f342ec395ef02ace536da3bc1c72093e1cf93f8b37b26b0ec SHA512 890a5256d2b4290e12e04a02c3529f3a017faa2b6016a4dd0f08b36509f0b1107eacfcb4702024d6a21ff8852a11f263c1adc096b16ef8d12c45a734c087fe68
 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
-DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8
 DIST pkg-config-0.3.27.crate 18838 BLAKE2B 1295eb4f08751b3663cb2c7c2753f29bf2ccd80f4e5856909fe10b6f006c37fb9672c9518b9b416546469faa18821512673a66543c0bd1e848bddabc456d0a90 SHA512 41e9b8d4fce6b8244c2ac8566318a001b481bd42a182f1a832c81ce93c6a023e18af03aa3500b134c30195219d35080433bdba69b2594e9665081debfbb4533a
-DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74
 DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
-DIST proc-macro2-1.0.44.crate 41745 BLAKE2B 8f0a5ca5140487ad6437a6d3bbc66ea3772f75d2847e90d3d859a6107c79467f5daaab2433462cc2e91df0aa1bd7f058cc94a5038cb57f8c69d39d9f37ac619c SHA512 b3d9842edafedd4531474ce3cd36861fd9317b16f7800c5255b393f5b2b1a94f6f854bccdb52aa2d3cb0622512b5f11725fcad416d42542f3e96d84ad34cc526
 DIST proc-macro2-1.0.67.crate 43683 BLAKE2B a7f485d058ffb654c22ad01088756d8050780e559d86f96590e284c3babf1bb59ce347400c1681b296c6f58e2d42ed67d3e458483368399c22d7810685adcbc6 SHA512 3827f5f698aaecc168a03643e330e03aca7b0de98bd57dc97507c1bd53b6ec64752a1f4dee4c8a12ab02f410775a11f5ce7b0d36ec0e1fbbec197e3d7e199eab
-DIST proptest-1.0.0.crate 189237 BLAKE2B 52c7768f092677b947b8d04fb30ecfb556f5514ed29bf98c0a5ea773ab0b4433c3a04d1df8d30e4b5afb174b8c9bfc13656c75ed3ff16150d3ad3dc0924f1e12 SHA512 c8a45bdace0e836db5ec0113f3794bbcee2b75fa5b06caf84808df7a052ef117f22b48fe12413f86750da710d5e5c88457a77ecfce04e1e8fc5a76dbba3d79af
 DIST proptest-1.2.0.crate 194884 BLAKE2B dc217485d84af76365170252690d18b0abd472addcf1ebda60db79255d17d48a0f56897b93bbb01d84f20c9c1f53da854bbfd3091c8685229c4dfaa51c673e3f SHA512 b0786ba104849dc45bf1cb970cd7bd8fa645f0bfe1fbd37f1c2535d28d2f7773cc99af67838ebcb546d900f421bb6145c1a70639d5fa2ff0d25b45a2ab176e9e
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
-DIST quick-error-2.0.1.crate 14265 BLAKE2B 3815c89e960923bfe0abc962c38714b953fa1d5af991f3de22d1d084a8cd1ba1761fc961ba97e06ead3992ed1b61f525d04bcce459599e5546315932281c1dfd SHA512 e028deb598466ae91663e5d090606be4f117662d0fa6e0c0b0043c7261f26787057e84e644cae72a45b1a0a7b1fb03fc9712faa3abee94b97ce2c8d25c365c32
-DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
 DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
 DIST rand_xorshift-0.3.0.crate 9121 BLAKE2B 56c29e159c0beb9c751429130e84e4666f9031b6f70e180544f9cc8f8e85d98676b861b588dbda46f2cdbd254fb908c02c6ba640d53422e6bfa1ae4e48ca5a33 SHA512 256e410e5bc08c56496c53c3d53936f3b1cfed41458b0ee8879d7aa8b95375055746ca49e29000ef847b37f01e9237f569cd000c4b281f6c78ddfc78ce439a49
-DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
 DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
-DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
-DIST regex-1.6.0.crate 239329 BLAKE2B 646405e681ce572ebe2dc51a3339f0f8204143f9b2b8f8e74a4c80379c43c3581363ad347610a384d5ee831cf1425f74ddd944a658b1da2461e8068c5521af69 SHA512 b4861c9cc13d6fb224f67057fd3522f04576591b3d7ae0d3581dce42ca2b2bff96860cf2a7f4dfab00e46a1d29e6473f6723c4aeb02e34ed6d5f205b66f07876
 DIST regex-1.9.5.crate 253883 BLAKE2B aeb05371251aaa0fd11dce1f22ea095345b3b1e68d9d5e083b4b8b0b938d0d901b3bade66015bec830db3ee71d0d2ccac09b842ff9919e08b0e98112ea1897be SHA512 79b921edc977dc98bd07e89dc17873c8a1088473ddf941504973259bb8c46ad11bbe3818fb88a7ed07b86841206c322a9555033d0a5dfebb18fcae45e07ea53e
 DIST regex-automata-0.3.8.crate 610113 BLAKE2B 1aebbca26e76e85b42b035fa9ba02f98425b75fdeeec0f12c1c08e8f4a320c64d36c129c692e622256d7f8772052041c47df1aff165d8337d55d61770963a777 SHA512 47ad01be2c51fd510576e14f399b7f30d379a2cce2dbef3af4ee3e609859451082885132ae703c810e2b19bb3716976356e057a1a592ed507146aff9e7138dac
-DIST regex-syntax-0.6.27.crate 297300 BLAKE2B 4ca1a2e23d04e29c5925085ea4ab7ebcc398dfe135eacaab1e686aa8be43a110a28e8bec05a6910183f9a6bb1fd0d635fcb1a60b5a6a03fed4d2cf937a542a5a SHA512 5cc705a5dda08cbdb4dbcf3fa98763cadcda13d9c3ba407b35f3e88d77935efc2704bb40b3fb5aad7dfbad0df43bcb4c4cad9732defb954e2228a0739f7c37c6
 DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e
 DIST regex-syntax-0.7.5.crate 343366 BLAKE2B af07596e45e3525ffd253d6070ddad08dffc8f0409ea14843a135646da8b37a7a568c12ede809d9fa47eec2329f68da7a3b3c0e0cabfa200de64affe6ecefee3 SHA512 6388dbf68c8c86d8a5bd8cfb13a86e9ab2da1a339fd607c1a16848f85dd21c85d744d694c7b918954ea27eeefc90b589926c9da464343fb78ab639a5e2925efd
-DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
 DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247
 DIST rustix-0.38.21.crate 358962 BLAKE2B b3e4915385aaa1783e0024caee2c454d9ce66542ffdb9ab0f0ef02f07b6d583a49b29b25a604832903f7909a0362bcd2260958cfe3fe045af4df2ea5c62c1da8 SHA512 f3b147706e1befb9d743bb57c7f8dc0a1ca8f244ed98069dfc757ee9d7281f097531bf7d1028d21ac798ee27bfb07b2ea6ac395dd0bc6caef4647fac88669833
 DIST rusty-fork-0.3.0.crate 19881 BLAKE2B 01bae755c66d7e4f72789b7140de35573d82961adadcc9febb841e332fc2730b405d4f1dc8aff1db6eba3ca03ee24d5dcd9a9c9a914fd2a94428c796dc9bfcd0 SHA512 8e41e12971c36ae1d4439943e55204e32fb4e62717355a2bf79152825eef7dac305c2fe22468957cb3b7af0b27004ceb18eee2d2fa0a6f8822b28b711f64ccd7
-DIST scratch-1.0.2.crate 8152 BLAKE2B d38df70a8067ab6a411798b64e4e9679b554aa66886c824e410d50ed805555716e96c54872186617f2963526119ba81c20ce237d4a0b1ce754d7d28696c9b742 SHA512 c3863dff0c67184605b356d6cc57db2bdf26cad9e0357ce6cbf7d3f23d913fa8917966a8c93b3084a3c9c900e357c6ca4bc2bc5ae5db3bb6feb5ee1ea5c61521
 DIST scratch-1.0.7.crate 7997 BLAKE2B cb92a93751d209c68cd003792e45365d186138a115b936f190ad22b33f87c1e1aea2bcd20937188ba496cbe709539bf5fc1d73c0760020e5159121e88c82aed8 SHA512 2cdd160a89844101b62b4d6c23a56d3f9089828b8914031ca973bcbdeffba41ee7d9fb2edb0736d5f8e19d3bf2b1491e8451ae8fe2525518939b2f5cc6310d55
 DIST section_testing-0.0.5.crate 4464 BLAKE2B f02e0137be40f5402cc3bdd824d2e04f3a32860a6b37a524628f7a472f52cecf974857f732ffa5d2dcfc38e2ea294a3a81c8396acadb84a18261371a7b167faa SHA512 cfcae4e2100112fb03b713f763e136d2315ad10aa8da916b9faac9bc511724d64cfecc67113f93ad9269ccb277ac17400186c4c54c481f4c574200e43dbe164b
-DIST syn-1.0.100.crate 236691 BLAKE2B 0e604e48b2e9498f2de290ea0c7249d03a2e7c388f920c5f671a861770c96a5d72958fb5efde45490c0fad0f5ba34a25927e5ae1a538062feee509b0d8629ebd SHA512 20fbac3fa505bb2bafebdb35e3581434240629d8554433ccdfa1ef8cc4b74e31ca0355d47abf7081e983d222b14e08c5a806922e5490a7c19d5a6bdc2ffcffde
 DIST syn-2.0.37.crate 243250 BLAKE2B b81750ed52bf75bf944542c373a88f5a54421c230c86f23d0ed3e5680d85bb454251bf43e0ad7bd3e2464e6df579550cca1e17e8b044ba62a27a25f3940ff20b SHA512 5cc8f2a17f891477a9b2078580bcb4c5dec0b540fdc4d2c0b8dd51972c734ff4519e891166c1c5f6d35b73bfb564ac747836f7487481a2ea26fb7d8405835023
 DIST temp-dir-0.1.11.crate 5743 BLAKE2B d73fb783b750a16061e325a3564dd62b1e7561d9d3d7ea93d8a75e01588e2633ccd11617595662cab647c52de6eafc25e9e97a3ea43564dc55656284bda57e74 SHA512 1946df8b4c93bc5517a18c05ecebddf0935cf2d3cae390a7ce9befff9516a29df3f19d2edc3407ace12184c36be75fd35f3d436957ee48c6f128923496c19060
-DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
 DIST tempfile-3.8.1.crate 32164 BLAKE2B abccff7939df8cd223a5a8ee61e5af7c35335f1cd61b3e72fed9a8565465c293e99938d57b50743141aace3cd20422ad5d3090507ed66561cb0155771fe0a5ec SHA512 b257bfb70793575d59ec4cf4b7492aff83dafb68b367a48594211f476a3b1d4800b69bddc405d8749d8b320c30cbe71be1261a60b4bbc862663b37a6c7d97a3a
-DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST termcolor-1.3.0.crate 18799 BLAKE2B e50e5d56e7b0e911e125a06714a3ac51bf3404a0686b97711cdcf0c6a4af344c6b80d88052f2bb5f6fb1798ac02e65fbd0fffa4359c749c799ce98311800fe4d SHA512 cb6639ece1f24a30ee4f28071f5f177e88dfc294c3b9aadbc4d539bb5e796a1f47a8d3db61e7e0798d271fa1e1cad9c23f3e56e166b8688c4fd4e81fab2a8942
-DIST thiserror-1.0.36.crate 18712 BLAKE2B b10f0ea359289cfe3f268bd9585663daf750a73ff811c9b998d5ca5501ebd545e7b307fcdb557f41c44a1b65991c9094a5de23ac3eee57a8a6c7ce99ea397195 SHA512 b1bf4b29e770b7222513f8b6d5d560cbfec5cd046213ef8a21da491896dd6b07ff3a85238426c53c967c7a57a04893b8019677af910c501fe81594d435885de7
-DIST thiserror-impl-1.0.36.crate 15433 BLAKE2B 3dc813e31bcd12611a68018e16fe1f0ffd98018a8ee6c326b457f150a93ceed2225308a2eaded19d6e092ea8c4f96373049a84a07b67d79203e13668cffeb480 SHA512 83e06ba8fcf62c408747df19f84aa4af817197976ebb40a9423553303ac89b9ed9fa919103378c8aecb4cee1bd817a5782e878c18ff924e40cb01546585cd479
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
-DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST unarray-0.1.4.crate 12895 BLAKE2B 20fab4ce218941bad9ae341d24e92469b01f46523adf9d6c80cf2418b79dc529011f357e3c96a66ad96bf822358581a150f75c4d3ca67043e01814c59f1a9bd1 SHA512 373d16e9688938762c61cc9056a50badfde417f64385de1949678333cf9465cc496a357707989da83ee5e4ab041a89688fcd3ab9dfb9c6ec66446c9f5b56b630
 DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4d51047803e61ed3f7c80361987947b2029a2b679bd301e8a0766ee8ea7f080e9b9b6ebcbb4354e19813a0f7da2abc SHA512 fb094fcfd907d90fa7232432aca0143209446e4c5c73d8a0fe6d2dc44b9dbb5b8b926c59b5e3f9a5a0a36f91c04613509b6e430c9c4adf526e7445e6e8d7a3d9
-DIST unicode-bidi-0.3.8.crate 36575 BLAKE2B c0442dd47a8ee81f575b28e34c9781ccf507b53ea96d1d4df2e8117231e8e67579031e4244a2dacfd6f4c24ec01fbbd4da7c9ab72ad50af51ef56d7d813b6444 SHA512 810b5be48159ecbca542c715496f279518285c3b09f7c39451986f94e6c259fab1057512a2148bf99ba9abf76e861a24456b547cc2273f0b45ed5d3ce9dfe3d5
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
-DIST unicode-ident-1.0.4.crate 35491 BLAKE2B b92d4f09ec86fe1e0b403b8cb0787989c313f29e6b24961fc2ca046ee5e3b50f43f49469a290880412dd37fc1b46cbeb9123e9636e1f39e425f722a5aa44ad08 SHA512 db41d5c3f72cfaf654b4c250e18ac0ac077a816fd582f1548ed384653f467c15f85fcfbbb4ed2f9e8182587181abf1db14059d50f3e43b60434ddf38c8f65d89
 DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c
-DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b
 DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe
-DIST url-2.3.1.crate 72777 BLAKE2B 6ca0e537baf373b92269b2531945c1cdf360f1566cae4734dfb96f05a605e5c6c82e3192a1b9dde0ff22b92b87aba2d56e32a1bf17882b4de15efd7cdf52bc76 SHA512 8224010bef067574481e5d84100d944782d52b49db7c396ae2b4dfc145ed58769c15440d97a0fed4d2f9857592a8601417cc5b1bdea959c47a3e7a1f7182ed0d
 DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
-DIST wasm-bindgen-0.2.83.crate 169618 BLAKE2B f6158596c80a0385bee0a05bd9cf0b3beee83a7958efb40244956b4fec2c83baa1a1b4605eb604f313db3508a7911c78f645acbb19f6fc93eef27e9f7f0ac109 SHA512 ec93d1334417d0329e113d5f2da7f16c0f1209d71e5cbd21a2dc9278d877e70ca2327ff7863b40505504883ed51d6bf20dda98c22ef44011a47c604a7b44e82d
 DIST wasm-bindgen-0.2.87.crate 175052 BLAKE2B bf8cf4aa1786ac5c2ba76e80500b5c54313adf9690ef370e60b894401bd1b81416da7bb46b90c014412c96f30f995bd1e52cf7f3a6be1111aea40866e8178396 SHA512 0c3099155ef079d2b91d2d5b135243d687bf865cdd9ae9d97d8cc2eb4c9bf7439b66b28d5b1d7e95048e53be63ed4909b6b3f2427951348de25ca7abb7a03705
-DIST wasm-bindgen-backend-0.2.83.crate 25620 BLAKE2B 3cbba20a2f5344c0ed2791de7b04ee294746606289ba83a9c139b53b56edf31eab8d3b3802cec309d5395e2404bbd75b7fab5d748a9961b36906fabeb0e66493 SHA512 dd1b65733e4d0a198d61a5287bb75db3e03ef738d2c2dcd3ce3e873c27d41c90cfcbb775ad40b2a546190db8d7213e5866f8e3f9913c28fe4b43a49054bfea44
 DIST wasm-bindgen-backend-0.2.87.crate 26821 BLAKE2B e230aa256a1f681ab3ffd2c83c3f6a810c305bb79a5e1d806b8b2b9f54ef0babc83809f6153b9ca511faa4b122f80bd1cc9eb97e7ae3cb4cba9e2dc1c6bd0b51 SHA512 317ee2bdf85067cb7f4b4ed6ff475ff9e5063143e9b7c8a28572211c09025935815227c4afa8c92823ac92102562d4d34531aa4891d8c922048d37e27377ee94
-DIST wasm-bindgen-macro-0.2.83.crate 12075 BLAKE2B 3b358ba7c2a3563840f54f11170cde78044a8f087659daa7c784fa252f5dd4b7f6200eba425d95b568e50fd43c04c32a509994ddaf5248120feaa67586402150 SHA512 eb83e06f998e858cf25494c1d171984269e72db798147d4d1d8aeeb25ea7a35c5986b882011e131968621742ceecff976430856b4e8b7d7fd7f1237767cf01b4
 DIST wasm-bindgen-macro-0.2.87.crate 13897 BLAKE2B 0926975b0328cdd5525820358795b7b68b4ab9dc460715ed84e5d276e76e936057140efb1ba875acf25f3d2862e680f9827bd05cc47560d54f7ec673f30244cb SHA512 af366d8d853b280014cdf5286f3b1f6d7fb0837ce6e359a81cb6f85161537c8e2cd06d7f893c957f5bf1548d34084d33a213670b471937782b56033a23cb15a6
-DIST wasm-bindgen-macro-support-0.2.83.crate 18530 BLAKE2B f305c9fc1f7bba5bee65a1c76fc2216c98aa306a072286e1ced048ab191f49e7e4436bf2f67d4c1fff558f59b2cef5e9b40e9e940268128ab1ebeb3c64696107 SHA512 804014c75ae5f8c1c7f0fad3f3209887fa346d74029e5f6e1830e44f7318719e65c4a643c71d87cf388f131fd370af40d536bbc15fc11c25b91cb785f56a908b
 DIST wasm-bindgen-macro-support-0.2.87.crate 20006 BLAKE2B d32dfc7231e4fbc226586e66063538208f9e299fbf803c4e2d1e1e61b4a22f51cc7509bdd269a44f072f9843a083ee84d2326408fb3211009ce93542c3fdc6ce SHA512 9390aa2767fed1027be168612c424d4c7cd4423addd83b79afd8c67886f66303ca4846e6454302ecc78b47bc62e8ee46849a4c0d3edb98849ce8476901424e33
-DIST wasm-bindgen-shared-0.2.83.crate 7194 BLAKE2B 4dd1cffea1edc98dcd4993bf6fdde8100fe00d1e97322ce8bc0bdefd0c659047c8c726e5da27b59fd7a6621c1e5385c18204e834c6c6fd1fb9de52f95b40e40d SHA512 2bfc1a068fa41a9ecacce7bda494fc0485c57ccb102c1d76c87a42e00ad30b944b0cb788642e8339d050a0e831ce8306844a77292ab9f79ed765b65cdb4765e7
 DIST wasm-bindgen-shared-0.2.87.crate 7248 BLAKE2B 0393ce9452119fd5f92836a76b28d3a697f91fb09de39d1af0a2a83e81d48bd4a17f39b48f15ae97edca3e361d4f8fedae8de04173c4ba1711decc73f64000d5 SHA512 cb9ff537554f56fd07052ddc4adc904a57ee64e13298df1dfca58b361ce163c34640e7dd9ed301ec1375f335dfa424230e22638ea7569ceb34aeca4505f6c008
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST windows-0.48.0.crate 11864177 BLAKE2B 39c0e4f058f68a829ee08721818a0b04287af20dfe6e03a125b75566b4c8a58b56557d685600f1f9c215811154f9782f12368d42848445d54dcf9bfd6471349d SHA512 7c906f885fa0a730f1cb1ef4e62f5b602a49d44343febe1d38fcd4cbc28e0342766983796042585fe457aa229333558715b6270e378946faa8f398a7ecc2af8c
@@ -179,5 +117,4 @@ DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1d
 DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
 DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
-DIST xdg-2.4.1.crate 14034 BLAKE2B 7fd98ef4e1534d13da125a78cb7425318f1f2f0c7e06a8c8045b2145c1696bf86daf820577aa9757af0deb11951315efd382091b1c73dd3853841388927c2b01 SHA512 23e69abbe79a0977900af37feb9f367a82d0ba4e69fc9421e356a5957920e316379355b1c6eeda1235feb3d028f738c41f520d28665f919e775b20240219e07e
 DIST xdg-2.5.2.crate 14394 BLAKE2B 9d7ad2681ba450b73c66aefd8602a1d32e13e0ec751a368188b61000a5efb3fac943f6e5d6875f409aff6eddff3b2ba22631f71dcda4ea44dac080d551053f4a SHA512 12c7f42d2afd63d8d196511fa069519a0c495fc2555c87c059b96b46d7e2a2c51c31836c48fb329806d312a45a2fd67b4243793aa91e2139e2aa3f05230b2edd
diff --git a/net-news/newsboat/files/newsboat-2.30.1-gcc-13.patch b/net-news/newsboat/files/newsboat-2.30.1-gcc-13.patch
deleted file mode 100644
index 82092f29c037..000000000000
--- a/net-news/newsboat/files/newsboat-2.30.1-gcc-13.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/newsboat/newsboat/commit/ca1fe3c9fcea89fb9cc0a5ea8740732ae480c6bd
-https://github.com/newsboat/newsboat/commit/7ecea2591df830baea41c7b46b3c5d8a2cbd985e
-
-From ca1fe3c9fcea89fb9cc0a5ea8740732ae480c6bd Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyich@gmail.com>
-Date: Sun, 8 Jan 2023 09:31:36 +0000
-Subject: [PATCH] include/listwidgetbackend.h: add missing <cstdint> include
-
-Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
-implicitly anymore. As a result build fails without the change as:
-
-    include/listwidgetbackend.h:16:37: error: 'std::uint32_t' has not been declared
-       16 |         void stfl_replace_list(std::uint32_t number_of_lines, std::string stfl);
-          |                                     ^~~~~~~~
---- a/include/listwidgetbackend.h
-+++ b/include/listwidgetbackend.h
-@@ -1,6 +1,7 @@
- #ifndef NEWSBOAT_LISTWIDGETBACKEND_H_
- #define NEWSBOAT_LISTWIDGETBACKEND_H_
- 
-+#include <cstdint>
- #include <string>
- 
- #include "listformatter.h"
-
-From 7ecea2591df830baea41c7b46b3c5d8a2cbd985e Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyich@gmail.com>
-Date: Sun, 8 Jan 2023 09:32:59 +0000
-Subject: [PATCH] include/matcherexception.h: add missing <cstdint> include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
-implicitly anymore. As a result build fails without the change as:
-
-    include/matcherexception.h:14:14: error: elaborated-type-specifier for a scoped enum must not use the «class» keyword [-Werror]
-       14 |         enum class Type : std::uint8_t { ATTRIB_UNAVAIL = 0, INVALID_REGEX = 1 };
-          |         ~~~~ ^~~~~
-          |              -----
---- a/include/matcherexception.h
-+++ b/include/matcherexception.h
-@@ -1,6 +1,7 @@
- #ifndef NEWSBOAT_MATCHEREXCEPTON_H_
- #define NEWSBOAT_MATCHEREXCEPTON_H_
- 
-+#include <cstdint>
- #include <stdexcept>
- #include <string>
- 
diff --git a/net-news/newsboat/newsboat-2.30.1-r1.ebuild b/net-news/newsboat/newsboat-2.30.1-r1.ebuild
deleted file mode 100644
index bb2748631b77..000000000000
--- a/net-news/newsboat/newsboat-2.30.1-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 2017-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	addr2line@0.17.0
-	adler@1.0.2
-	aho-corasick@0.7.19
-	android_system_properties@0.1.5
-	autocfg@1.1.0
-	backtrace@0.3.66
-	bitflags@1.3.2
-	bit-set@0.5.3
-	bit-vec@0.6.3
-	block@0.1.6
-	bumpalo@3.11.0
-	byteorder@1.4.3
-	cc@1.0.73
-	cfg-if@1.0.0
-	chrono@0.4.23
-	codespan-reporting@0.11.1
-	core-foundation-sys@0.8.3
-	curl-sys-0.4.59+curl@7.86.0
-	cxx@1.0.85
-	cxxbridge-flags@1.0.85
-	cxxbridge-macro@1.0.85
-	cxx-build@1.0.85
-	dirs@4.0.0
-	dirs-sys@0.3.7
-	fastrand@1.8.0
-	fnv@1.0.7
-	form_urlencoded@1.1.0
-	getrandom@0.2.7
-	gettext-rs@0.7.0
-	gettext-sys@0.21.3
-	gimli@0.26.2
-	iana-time-zone@0.1.50
-	idna@0.3.0
-	instant@0.1.12
-	js-sys@0.3.60
-	lazy_static@1.4.0
-	lexopt@0.2.1
-	libc@0.2.139
-	libz-sys@1.1.8
-	link-cplusplus@1.0.7
-	locale_config@0.3.0
-	log@0.4.17
-	malloc_buf@0.0.6
-	md5@0.7.0
-	memchr@2.5.0
-	minimal-lexical@0.2.1
-	miniz_oxide@0.5.4
-	natord@1.0.9
-	nom@7.1.1
-	num-integer@0.1.45
-	num-traits@0.2.15
-	objc@0.2.7
-	objc-foundation@0.1.1
-	objc_id@0.1.1
-	object@0.29.0
-	once_cell@1.16.0
-	percent-encoding@2.2.0
-	pkg-config@0.3.25
-	ppv-lite86@0.2.16
-	proc-macro2@1.0.44
-	proptest@1.0.0
-	quick-error@1.2.3
-	quick-error@2.0.1
-	quote@1.0.21
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rand_xorshift@0.3.0
-	redox_syscall@0.2.16
-	redox_users@0.4.3
-	regex@1.6.0
-	regex-syntax@0.6.27
-	remove_dir_all@0.5.3
-	rustc-demangle@0.1.21
-	rusty-fork@0.3.0
-	scratch@1.0.2
-	section_testing@0.0.5
-	syn@1.0.100
-	temp-dir@0.1.11
-	tempfile@3.3.0
-	termcolor@1.1.3
-	thiserror@1.0.36
-	thiserror-impl@1.0.36
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.0
-	unicode-bidi@0.3.8
-	unicode-ident@1.0.4
-	unicode-normalization@0.1.22
-	unicode-width@0.1.10
-	url@2.3.1
-	vcpkg@0.2.15
-	wait-timeout@0.2.0
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasm-bindgen@0.2.83
-	wasm-bindgen-backend@0.2.83
-	wasm-bindgen-macro@0.2.83
-	wasm-bindgen-macro-support@0.2.83
-	wasm-bindgen-shared@0.2.83
-	winapi@0.3.9
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.5
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	xdg@2.4.1
-"
-
-inherit flag-o-matic toolchain-funcs cargo
-
-DESCRIPTION="An RSS/Atom feed reader for text terminals"
-HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat"
-SRC_URI="
-	https://newsboat.org/releases/${PV}/${P}.tar.xz
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD MIT Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=dev-db/sqlite-3.5:3
-	>=dev-libs/json-c-0.11:=
-	>=dev-libs/stfl-0.21
-	>=net-misc/curl-7.21.6
-	dev-libs/libxml2
-	dev-libs/openssl:=
-	sys-libs/ncurses:=[unicode(+)]
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-BDEPEND="
-	app-alternatives/awk
-	>=dev-ruby/asciidoctor-1.5.3
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-13.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s/WARNFLAGS=-Werror -Wall/WARNFLAGS=-Wall/" \
-		-e "s/BARE_CXXFLAGS=-std=c++11 -O2 -ggdb/BARE_CXXFLAGS=-std=c++11/" \
-		Makefile || die
-}
-
-src_configure() {
-	filter-lto  # bug #877657
-	./config.sh || die
-}
-
-src_compile() {
-	export CARGO_HOME="${ECARGO_HOME}"
-	emake prefix="/usr" CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-}
-
-src_test() {
-	emake CC="${tc-getCC}" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" check || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install
-	einstalldocs
-}
diff --git a/net-news/newsboat/newsboat-2.38.ebuild b/net-news/newsboat/newsboat-2.38.ebuild
new file mode 100644
index 000000000000..44bfe22ad0b3
--- /dev/null
+++ b/net-news/newsboat/newsboat-2.38.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2017-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=""
+RUST_MIN_VER="1.74.1"
+
+inherit cargo flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="An RSS/Atom feed reader for text terminals"
+HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat"
+SRC_URI="
+	https://newsboat.org/releases/${PV}/${P}.tar.xz
+	https://dev.gentoo.org/~arthurzam/distfiles/net-news/${PN}/${P}-crates.tar.xz
+	!doc? ( https://dev.gentoo.org/~arthurzam/distfiles/net-news/${PN}/${P}-docs.tar.xz )
+"
+
+LICENSE="Apache-2.0 Boost-1.0 CC-BY-4.0 MIT"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 CC0-1.0 MIT Unicode-3.0 Unicode-DFS-2016 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc"
+
+COMMON_DEPEND="
+	>=dev-db/sqlite-3.5:3
+	>=dev-libs/json-c-0.11:=
+	>=dev-libs/stfl-0.21
+	>=net-misc/curl-7.32.0[ssl]
+	dev-libs/libxml2
+	sys-libs/ncurses:=[unicode(+)]
+"
+# Depend on new enough OpenSSL/GnuTLS libs to avoid providing header files of
+# curl's default SSL backend in DEPEND. SSL libs are only called through
+# libcurl, so don't depend on any slot.
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		>=dev-libs/openssl-1.1.0:*
+		>=net-libs/gnutls-2.11.0:*
+		net-libs/mbedtls:*
+		net-libs/rustls-ffi:*
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-libs/zlib
+"
+BDEPEND="
+	app-alternatives/awk
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		dev-ruby/asciidoctor
+	)
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s/WARNFLAGS=-Werror -Wall/WARNFLAGS=-Wall/" \
+		-e "s/BARE_CXXFLAGS=-std=c++11 -O2 -ggdb/BARE_CXXFLAGS=-std=c++11/" \
+		Makefile || die
+
+	# Avoid running `curl-config` which does not work when cross-compiling.
+	# Don't define the HAVE_{OPENSSL,GCRYPT} macros, since they only guard code
+	# for older lib versions.
+	sed -i -e "s/^check_ssl_implementation$//g" config.sh || die
+
+	if use !doc; then
+		sed -i Makefile -e "s#^doc: .*#doc: doc/example-config#" || die
+	fi
+}
+
+src_configure() {
+	# bug #877657
+	if tc-is-gcc ; then
+		filter-lto
+	fi
+
+	# Set up CXXFLAGS_FOR_BUILD among other (standard) env vars.
+	tc-export_build_env AR {BUILD_,}CXX PKG_CONFIG RANLIB
+	export CXX_FOR_BUILD="${BUILD_CXX}"
+	emake config
+}
+
+src_compile() {
+	default
+}
+
+src_test() {
+	export TMPDIR="${T}"
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${PF}" install
+}
diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index 8bac572d1390..9430f12048f7 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,2 +1 @@
-DIST rssguard-4.7.4.gh.tar.gz 23684487 BLAKE2B b6a37d381956900fd1fac9093247515b426b369552043e9406cfbbd664a6470fac952a3d50fa449bf5bded4e69ea8ec5285a5064c51e405fcd985a3fbb7e26bd SHA512 8d269ec19a30b6f466bc5cd1268d838d4adad8bf0de1e39063a6859184a5936156ca3b2fd4c74c2edbeb5d1cb756678bd8a72cb49aae98a81a81710e75d1e892
 DIST rssguard-4.8.1.gh.tar.gz 23782356 BLAKE2B dfc0a02ae3728794f98d48814881d66fe8ddc2e3af3cc767e53894254d6556dec78007068f098c4a8204d98d4e6a3d31718736565d036c98380d6f30dd67d5aa SHA512 68e53dd0b9924d227d4b46e5f03d93e99f6171b62ec33ad846336404f6be6c0c1c4c92eb38c5b11e9a1a4d30c07ebe3bb21f05ae450acaa73dd8a6c4f7a19106
diff --git a/net-news/rssguard/rssguard-4.7.4.ebuild b/net-news/rssguard/rssguard-4.7.4.ebuild
deleted file mode 100644
index 63805a49b8cd..000000000000
--- a/net-news/rssguard/rssguard-4.7.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake optfeature xdg
-
-DESCRIPTION="Simple (yet powerful) news feed reader"
-HOMEPAGE="https://github.com/martinrotter/rssguard/"
-SRC_URI="
-	https://github.com/martinrotter/rssguard/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="libmpv mysql qtmultimedia +sqlite webengine"
-REQUIRED_USE="
-	|| ( mysql sqlite )
-	?? ( libmpv qtmultimedia )
-"
-
-BDEPEND="
-	dev-qt/qttools:6[linguist]
-"
-DEPEND="
-	dev-qt/qtbase:6[concurrent,dbus,gui,mysql?,network,sql,sqlite?,ssl,widgets]
-	dev-qt/qtdeclarative:6
-	dev-qt/qtmultimedia:6[gstreamer]
-	dev-qt/qt5compat:6
-	media-libs/libglvnd
-	sys-libs/zlib:=
-	libmpv? (
-		dev-qt/qtbase:6[opengl]
-		media-video/mpv:=
-	)
-	qtmultimedia? (
-		dev-qt/qtbase:6[opengl]
-		dev-qt/qtmultimedia:6
-	)
-	webengine? ( dev-qt/qtwebengine:6[widgets(+)] )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=ON
-		-DNO_LITE=$(usex webengine)
-		-DREVISION_FROM_GIT=OFF
-		-DNO_UPDATE_CHECK=ON
-		-DENABLE_COMPRESSED_SITEMAP=ON
-		-DENABLE_MEDIAPLAYER_QTMULTIMEDIA=$(usex qtmultimedia)
-		-DENABLE_MEDIAPLAYER_LIBMPV=$(usex libmpv)
-		# recommended
-		-DMEDIAPLAYER_FORCE_OPENGL=ON
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "ad blocking functionality" "net-libs/nodejs[npm]"
-}
diff --git a/net-news/rssguard/rssguard-4.8.1.ebuild b/net-news/rssguard/rssguard-4.8.1.ebuild
index 2aef032efaa3..c75b112dc995 100644
--- a/net-news/rssguard/rssguard-4.8.1.ebuild
+++ b/net-news/rssguard/rssguard-4.8.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
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="libmpv mysql qtmultimedia +sqlite webengine"
 REQUIRED_USE="
 	|| ( mysql sqlite )
diff --git a/net-news/sfeed/Manifest b/net-news/sfeed/Manifest
index ee61c2438e2c..08c23695a969 100644
--- a/net-news/sfeed/Manifest
+++ b/net-news/sfeed/Manifest
@@ -1,2 +1,3 @@
 DIST sfeed-1.9.tar.gz 67718 BLAKE2B 414f53e63962192e994b5f57ff76c809df49d7f089bf1f4bf14cd16f7c52534f5fd7030acf5bcc6514d8b5b4a74cc1f7bdf31759df4c37186d4e1c35fad0b184 SHA512 714ce9526ce6a37cdc5777e279512b611f9e329ed0d7d1e9fd8efe8c981a69fe19c6622685d0ac2e16eef1f699096262e616e5b4f5ba81e44624ae99d10de749
 DIST sfeed-2.0.tar.gz 67584 BLAKE2B b9c8bdaeea63c2a6781f69087601814943a09ea62b5764668ae0d22dab12976f47b4185196cdc87365cc03fa27322de357541c7c8ad4430323241fb56e2c3d11 SHA512 cc4c0236b14ac6da6a9417d879caef9943c30506e2fee404eefceea53dea597b36814846cfc454d76727ddcca33746f2bac3c1ee6831f9900e68d00f6eb32b5b
+DIST sfeed-2.1.tar.gz 68610 BLAKE2B 6ce4d99dfa6665282ba6db3d6d41e0e0008d487b662a7799a781682faaafc0118a387d9fc2e4562e958996e79a19090f70936f2dffb4fbcf15f00003407b6bd8 SHA512 47f176bcb9e97e42446edf2b8fd2f902430d86bd93cd076e474532b344dca930fdeaffdf89cb58b59a5583bfed94921f1d2032ee8921e7075ee31d38a766e396
diff --git a/net-news/sfeed/sfeed-2.1.ebuild b/net-news/sfeed/sfeed-2.1.ebuild
new file mode 100644
index 000000000000..19d1974f6a4d
--- /dev/null
+++ b/net-news/sfeed/sfeed-2.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs savedconfig optfeature
+
+DESCRIPTION="Simple RSS and Atom parser"
+HOMEPAGE="https://codemadness.org/sfeed-simple-feed-parser.html"
+SRC_URI="https://codemadness.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc ~x86"
+
+THEMES=( mono{,-highlight} newsboat templeos )
+IUSE="+ncurses +${THEMES[@]/#/theme-}"
+REQUIRED_USE="ncurses? ( ^^ ( "${THEMES[@]/#/theme-}" ) )"
+
+DEPEND="ncurses? ( sys-libs/ncurses:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="ncurses? ( virtual/pkgconfig )"
+
+src_configure() {
+	local name
+	for name in "${THEMES[@]}"; do
+		use "theme-${name}" && SFEED_THEME="${name//-/_}"
+	done
+
+	restore_config $(printf "themes/%s.h " "${THEMES[@]//-/_}")
+}
+
+src_compile() {
+	local ncurses_ldflags=""
+	use ncurses && ncurses_ldflags="$($(tc-getPKG_CONFIG) --libs ncurses || die)"
+
+	emake \
+		CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		AR="$(tc-getAR)" \
+		SFEED_CURSES="$(usev ncurses sfeed_curses)" \
+		SFEED_THEME="${SFEED_THEME}" \
+		SFEED_CURSES_LDFLAGS="${LDFLAGS} ${ncurses_ldflags}"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		MANPREFIX="${EPREFIX}/usr/share/man" \
+		DOCPREFIX="${EPREFIX}/usr/share/doc/${PF}" \
+		SFEED_CURSES="$(usev ncurses sfeed_curses)" \
+		install
+
+	save_config $(printf "themes/%s.h " "${THEMES[@]//-/_}")
+}
+
+pkg_postinst() {
+	local optmsg
+
+	if use ncurses; then
+		optmsg="yanking the URL or enclosure in sfeed_curses. "
+		optmsg+="See \$SFEED_YANKER to change it."
+		optfeature "${optmsg}" x11-misc/xclip
+
+		optmsg="plumbing the URL or enclosure in sfeed_curses. "
+		optmsg+="See \$SFEED_PLUMBER to change it."
+		optfeature "${optmsg}" x11-misc/xdg-utils
+	fi
+
+	optmsg="converting HTML content via sfeed_content. "
+	optmsg+="See the ENVIRONMENT VARIABLES section in the man page to change it."
+	optfeature "${optmsg}" www-client/lynx
+
+	optmsg="fetching feeds. Used by sfeed_update as default. "
+	optmsg+="See OVERRIDE FUNCTIONS section on sfeedrc manpage to change it."
+	optfeature "${optmsg}" net-misc/curl
+}
diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index 770929d977c5..d08f18534b0b 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,4 +1,3 @@
-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
+DIST airdcpp-webclient-2.13.3.tar.gz 829955 BLAKE2B 990463a3c3cf05a6f503e385dc371353bc4a17703a4cfa9784167bdbd6ef49b557b7ccd230a2cd7fd0832115a6bfcbde4da5711b755305101280e5fe2fc1d99a SHA512 c74c6ab57325a39b470e8cdfc99f59fd4e163df3b2a2d7bad8a2a9e07fd3b9372cf310dbc228a7f547adc5d9de54269b3cb19b7a710ab96ecb0fd2da0022e615
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.4.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.4.ebuild
deleted file mode 100644
index fe61b08cdcf2..000000000000
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-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"
-
-KEYWORDS="amd64 ~riscv x86"
-LICENSE="GPL-2+"
-SLOT="0"
-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 )"
-
-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.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.13.3.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.13.3.ebuild
new file mode 100644
index 000000000000..91129dbea10e
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.13.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2025 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-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="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="
+	dev-cpp/nlohmann_json
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+PDEPEND="webui? ( www-apps/airdcpp-webui )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_NATPMP=$(usex nat-pmp)
+		-DENABLE_TBB=$(usex tbb)
+		-DINSTALL_WEB_UI=OFF
+	)
+	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/files/airdcpp-webclient-2.12.1-miniupnpc-2.2.8.patch b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.12.1-miniupnpc-2.2.8.patch
deleted file mode 100644
index 64dcce950d48..000000000000
--- a/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.12.1-miniupnpc-2.2.8.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/airdcpp/airdcpp-windows/commit/2b1cd3d05774ce8134186bb9977a45cf00aaaef5
-
-From 2b1cd3d05774ce8134186bb9977a45cf00aaaef5 Mon Sep 17 00:00:00 2001
-From: maksis <maksis@adrenaline-network.com>
-Date: Thu, 13 Jun 2024 20:05:17 +0300
-Subject: [PATCH] Add support for miniupnpc 2.2.8
-
---- a/airdcpp-core/airdcpp/Mapper_MiniUPnPc.cpp
-+++ b/airdcpp-core/airdcpp/Mapper_MiniUPnPc.cpp
-@@ -108,7 +108,12 @@ bool Mapper_MiniUPnPc::init() {
- 	UPNPUrls urls;
- 	IGDdatas data;
- 
-+#if (MINIUPNPC_API_VERSION >= 18)
-+	auto ret = UPNP_GetValidIGD(devices, &urls, &data, 0, 0, nullptr, 0);
-+#else
- 	auto ret = UPNP_GetValidIGD(devices, &urls, &data, 0, 0);
-+#endif
-+
- 
- 	bool ok = ret == 1;
- 	if(ok) {
diff --git a/net-p2p/arti/Manifest b/net-p2p/arti/Manifest
index 27d96f7b76a4..78c81b87367b 100644
--- a/net-p2p/arti/Manifest
+++ b/net-p2p/arti/Manifest
@@ -1,11 +1,8 @@
-DIST addr2line-0.22.0.crate 39156 BLAKE2B 3fbb55f6cacbb177d06359bcd39885247a9eeef96d95ffac0dfd1d45ed394dcd1e9e069c02c71a9ffca0b69e3a974e4d96bc3385470ee39c87d7a30ea7914303 SHA512 b334f51bd369348b4446805b4f624ec9b4cc8eefcc53ceb57b523ff55bf018d1dfe23259daf48d1878170ad4fcb44181d4738456eb5e35ede6932ff29686268e
 DIST addr2line-0.24.2.crate 39015 BLAKE2B 57186d6b957542cd71a0aa19f1355dfaabe6efa19b853c42f306494728b03d1e3183efdb2d2c7734a3e2347cd83a985d004f50c097e06b7520bd152310532e9b SHA512 39cbec3c920ffc0f37584afb55e1cfe4f182e4415319a4e9bfe842360f102f7b9315f6171c0cf71ba0337123903e604096cd573fe98698a26c8eebc2376d965b
-DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST adler2-2.0.0.crate 13529 BLAKE2B ec575b0bf12e321399ac3a1d59fce4ddbeabcc60cb3d7c2f362cce23eb29b4ea836451372d6d88552a4435ae29bb41d6230d55f625a4359eace680b9b771d0ad SHA512 12d12579ad617cf1a94cf95ab9d3f5db566c3b2de4bd5735eccd83c668fdad0eff134c996b73c46cbb9f932837682043878b8cc4764191625e9f93ccffcce423
 DIST aes-0.8.4.crate 124812 BLAKE2B c4a9cadbbfd9d24a758bd5d18b851fb86bd74f5b1f0f6f5706275329d92396a00dc2c35fa0aa2af5b55fd336934d35df413a31f85ba886e85a037296f9df25bd SHA512 96243337546acf64f89bf9ba23011eea1a205d82d96707f9c45bf28cc62ef00cdac5cdfacb8d6013155ee1522ad73dd1b7f166c74ed18159bf23c3c48ec77d79
 DIST ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d
 DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
-DIST amplify-4.7.0.crate 34650 BLAKE2B 453953aed5dd902302cb05a001412707eeb85b72e6e7af0ddc1cd410816cbe592b2c8916283bc067d9b2688d5c47cb58eb1de676a4ac10d578188e4ef4de3378 SHA512 82082616787193716ea731b7641fb727f1e1a7d010c45685f2640ca0aa6119901686acdfcffcf9b59e7b2ee74ee55e1b02be8c313d208571ab84ea7453311c7e
 DIST amplify-4.8.0.crate 34990 BLAKE2B 932a16387033c0a75b6efa73235aaa9d3ae4d4e2b8b680e5adb9a9155efe1ea8166f523db3f09c59ef628722016b5e16e6eb97612424f62a25308e9d28ec6cb0 SHA512 1305c068cb7c1319b9b87f2b3a53a32588f096070fb003a41642b30c90023b8588629b8e29a53088674a1630a926322ed8c4020c0dd491c5dd03d60b4ab9eb80
 DIST amplify_derive-4.0.1.crate 39539 BLAKE2B 888703b3674c765075bf9297f39098373a6ea1aaf4e1bc303124a680bfb43153c13a11a017630f01ff5327e3d778e2256630f3510e256a5be0c5a4f45c75e311 SHA512 f052eca0ec4c18a4dbd4d539253e60f103f058337cae4337256096cb945ded0f982aa76df2ca3684cac501460f95b9c91db0ee1ac4d540ea8d51ebc694a79937
 DIST amplify_num-0.5.3.crate 27590 BLAKE2B 3121ccff0b931f10828f1d95cd37b22fa57b0e65e3c574636209114d76973489b876e94f7bc833f511271d5a4bae3583f7c967ebd4077304babcbc171b3f122c SHA512 a13f15d14665cf8de0a0c46c470634b5f366f17194a1064d096c919ebc52fd13374eabe7bb444413f3937547c6d606280a18b1c525d803ad8b9dcb19c6a8c88a
@@ -13,28 +10,18 @@ DIST amplify_syn-2.0.1.crate 19566 BLAKE2B aa024efbd14427f267903560d60792c08ff32
 DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
 DIST anes-0.1.6.crate 23857 BLAKE2B 9ef464a964709b408c7d7846b9b1e54e52d6ae8f21f22ccfe509ef7197d4694f439084dbdb01fdf88829d181965ea9d1452253789a46fdf6d0520e3413c50d61 SHA512 f9dfaaca9ca327881ec30efaf24e208daae668b1e9d6963c8b0ca9f9fd13be777c793076a87980429f0dfa4db28ef5331ce6652a76da4d5a87485b23fc2fde29
-DIST anstream-0.6.15.crate 29231 BLAKE2B cc4cf0f381c210fecc20b5796fe872b533419e5f957021b0c3be3cdc23fb84ce029fbef6f9b6f174a76ad713c07f0811145a70572de7c24cfab060fdd990f49a SHA512 1cb01a0293b4c9bcc010909707e71c464416d3ec6fc9789060b7aa9fe4cc04424fefa8013cc8765ccdae6dfd9a1c50a11f7b30b39a32c4aeaf525f28167ddb92
-DIST anstream-0.6.17.crate 29445 BLAKE2B 417f32065317b17c8a846c9015e9794a72f57028ac87cd97685a442f0cd7e8437db6820294f38b6b96a9e8f644235f99eb0aeda0fcc02c14899d85058e004970 SHA512 00a9e781650978b419e8b28bce8be00b2f4f5dfddff3c2184b35b32b247e8e0f0ab9da6c145dfe65f1109d4bcb5b2fdbf473f00c764fb9ba871d7527c5a73d8d
 DIST anstream-0.6.18.crate 29681 BLAKE2B b6f72cda084b38f1e1cfe60de2562e8d62ebbc352176bdf668a2d6be09349bec46d291cd475e8af814ce66def44d95cb98c325761150130752284a82d8a84f21 SHA512 5149977d6f7b5e9cf6350f1ef130caa3ff46c7e78976358452a185ce196cdd77fee48a3a9838f434ae6ea9c15b19f6bfbab156edf819f81179d6774318f08963
 DIST anstyle-1.0.10.crate 15725 BLAKE2B 36e656bd8f9c584f11fda5cfe0c2e24e8426b9e1b602aad34ed118ae6950a55440e292d2e0ff7615f5e4f466fd06f07536be198a59506a587d40cb0c4ede4f80 SHA512 621e7a89fad13db985f07375d316cf8efba57fd44ae18628a8049a65aefbaef27949f99317872e91e0922bb089a00234055199ea3167f80ae03d00ada4f75dea
-DIST anstyle-1.0.8.crate 15771 BLAKE2B c039613e7de27cc990e5764810f9351754b160928a8954dc19041354cf9fef1422ed964237a5d39d16e4e9f8592ed52c523ccf36b0b5506f464d4f818f3332ff SHA512 3b867f73df0b2f69a0c7d5d6e62c7515045e053656afaa303e5aade8012e838cdf5d15d2c3d7c297db9e297d08ea69a9c8eed04b97922a83f56c58962c1c0b69
-DIST anstyle-1.0.9.crate 15770 BLAKE2B 61112cee3e3b399f8858f61d23d756eb81231eb0b9b19b1a3cb9b818d3418017187ade9df6c656e15cffa32995f6aa5346c396e009dc9c02b70a200e133b59a4 SHA512 2a503aa0b37c39232bc4ae573c37f41fc3a89d1944cb16384e6d9cd7ee031789140a836f31a05a39842d2322279518dc2ff9c2661782aeb90d8d8329a902c81b
-DIST anstyle-parse-0.2.5.crate 22680 BLAKE2B 7473651b1eee08857a6ed1419d3d62ba4b9a9aa0d6657965ad9c67bddd793d825737d3804961716a89bdebed9879ac43b42c897cd229c6e7bd780859e1e3c247 SHA512 cd94ad0e88ad4547a660da1473bf4e6dfed805a066782124204143c7f754c12db719bd3a1774c299f1a035740bfc4830919da191bd14e0acede410f6dbd1e2ef
 DIST anstyle-parse-0.2.6.crate 22343 BLAKE2B 85eba405dc5cf806283cf442984e86583dfe6c681f849eb7a347b7b67bd2b6f692e84fc9b5bd86486633cb2f05960ec16e8778300df114ae6676da43442db9bb SHA512 e28c9818afcda0e9b84c205d9c6697ce64cb06c21df2c3666869c07d66893105d9c5e96a27fcf2410a09f6af00735252e22b5c7d8c6cb3f68c4a8f376c49d396
-DIST anstyle-query-1.1.1.crate 9891 BLAKE2B c298114c1864a5233fb39c365e079a7f1f4ef23499dc330e5deb06f83f27bc727015befef79075c7e39952547f799b4135d7db287cf72dfc914191df784a4989 SHA512 1b2e888f025142a0d9b01314cf083831a2a45d8da737c1be3a6a9aa177e73e0d2ae7999fe7610dd450b7096115e8cf38c5da23723cebf1deaa7d3501d3dbd5ce
 DIST anstyle-query-1.1.2.crate 9969 BLAKE2B 179b8dd6dd709c2ca67f4eb5c9a502b2867cb6744a39f824c4fdebedc67c6c3e07d107c7d817e2ffb589d13b7ed4900cf9653ddc0a43663217042ee92ce8c9da SHA512 26069d936c4b1fb09bc65cda0253fe9be8fa4e96c0821f980c772602b4e9230035ec8c9d092ef95e0a0354ac559f8d25f57a14c34086d4d241b5fba688951837
-DIST anstyle-wincon-3.0.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c57b22b57e32a5c75847f2e2bd68a52b33c24797db662aa5fd7e799b9644075c8c939d93b0cf8598b16ee80fc817b77f SHA512 24b3a9a44382609ad449425a657d4b42a792d4703c36e0953f09a03817759c266a2f0ff4ecc9e8b93ea8403df2badef1f1af6a6e50af56205176c41b13501ae6
 DIST anstyle-wincon-3.0.6.crate 12271 BLAKE2B d9f4d9d46fa93a1168ca340562681718be852ffa94e30c9ea208af53af9d6697ca84921837a325ddc36681caab2b866b7f574901c80b5c0d862dcb765b81b68b SHA512 59ec6f5a53bd68b6344d82e923eb8c45ddac481dd0d270a7b452dc5b0540ee1656705697c1508942ecc131e7c075248c85d8f4159f27d97ea94f22469ce2eeb5
-DIST anyhow-1.0.86.crate 46741 BLAKE2B 21b1f3acd1c1b659e6e9a53693178de67c806d7dbad30dedea0fb7078b2388baa196d1e7240a7dc88ed9dc93ee4c00bca8e608dad1b6bfb5bfa4f4c5ab51f0d3 SHA512 3853da32a2c53d73969bb29a1e622f3a6d5832d8888dc6bc8eedb76394b392f983aa3fcb1f542933e238841486106f0f38e9a2400c12c7699baba0ebe1d8193a
-DIST anyhow-1.0.91.crate 47348 BLAKE2B b6b0f3082c4b8398090f0f93c35c54eeac8f6c9fbfb7507a8d82a73310db09d819b4d764615f8e66902e81d89554e4dd7ade6267ab40b44a53e7df7e6d1a2730 SHA512 6b0e30f5aafd47f245276a0424b0ecf54a9b263fb101a2bc8a0db040e011597a2b7eee5bc3391378395c55582176b5a98ed31cedb3684b7944667801df1a5554
 DIST anyhow-1.0.93.crate 47490 BLAKE2B 1c64b24d3df3307430deb8189ded345ee2858c1990fc343f2400bd67b6d79ee2cf90876326fb29ea311bd857a941fc8319dccbe6c81f2cca2c085dc0c1fffb27 SHA512 237b36bdefeaf8dd2f7d4c5c92d8f7627a5206ded5fa3dafd5710f2fbd3dd7d7187d4a8ae917ae03d0cf06bc8d101a7663bb7bb022507ac1ec88577a37475efc
+DIST anyhow-1.0.95.crate 52155 BLAKE2B fc9cebdfae0afed86f2dfb7faf62f5a108000895317dd0cab9c83d6e48c891558fc3a1d8b9940b623b4c6fd861631a0f0344a9915517a9bc39dbfbe48ec6b45b SHA512 8c5c176381c3e861c3c4451f7cd3d9e2447c0a55735ececfd3199288d65d36dc5fdc4a19a0798f62a0b9d6ca2c155a616c7eab8bcd53e6ece743aed57ec3d0fa
 DIST approx-0.5.1.crate 15100 BLAKE2B 8fe84d52263521c0b72a1d1e82ed283828f680b8b56f532df2c14ea86ca09e793686d823c5d58ecfd7a829948543bb375e85223c866cf036e9432be5d6aa7399 SHA512 c6d768496c974b6ff4cf7ad8e65f3fc9faf29a1957da497968ee112c6a0b9d7a0ff9a2579206e864976c0f65ed2190bc9d2b63b31a09ced7b57879e207c46407
-DIST arbitrary-1.3.2.crate 32037 BLAKE2B f8f6a10a8f42f14eefaad4348b6ff200d0c2fb22faa7a2876247228046359e39c555f3170a1975f64f8537319b97c7ce2030dcab3614229c8334b5d6f9248114 SHA512 faab26c44f25d2c7298add2a657e4010d9fe24b3a61e2270bc6feac05cf2a82895fe225d2fb1c6b63e6c7da54e061955503f39322b96dbdbc4916601bd5e5ccf
 DIST arbitrary-1.4.1.crate 36816 BLAKE2B 86adbf1a2522e972bf4a7fc26e4d88ec45298dc2ce716a1fe30cd49bebf4d5a65af1f097f83be6ee8c554d4b392657efd32ffa1cb35704585a9816b6e234c067 SHA512 a3507aa0ab684464c3559376beabc0992bbb589ddc85d2426b26238d7c5d1d856df5d9226603fe7ad2b17ac6570d62e86ba4f5a2e65f3cbc9ad52bbe294f8123
 DIST arrayvec-0.7.6.crate 31237 BLAKE2B b9d1df7e3ec47d434a2606fe9540e37e02351873b376a4e113b54461288e9ab20e02285eed5c4bc0f052ec4d6b3c804044413490ea706c31a852624b03bde7bb SHA512 b1f320746018a7f32340a833420089446ec5cefb7f299b4506eab7423d5db49f00b72d8aa8c6600f9159b9480d5eb3ce69407d93f5c9934147860c83e4d6eca8
-DIST arti-1.2.7.tar.bz2 3768120 BLAKE2B da29a17c823cc36dc799af0ac1c9d606a98cddc7dc24fdc90ee59af4c5c319d63ef777985afa47c19f5b1e9c20f9e0b84b38f1e8ee9b0bf0f96c797ed21b917d SHA512 52cace4ed141c1bebcde4841823161a367c4c84f039a4c222d4d996528801ebf809d73933fad3bc42c0219929500397faccbccb08b7145d5d9a82c3473ae517a
-DIST arti-1.3.0.tar.bz2 3890213 BLAKE2B f925a716c01a533391cfefe52adaa1bfecdeeeecef6cf6cf3b89b4a273de0b94ee87cbe2a2b6f69d538724fc40c4d1d761a206ede56c5f4a5c05238110d26d74 SHA512 1a11323dfa54c39e1fd346795a4c128a9970c069958f741582d27a10883220336932ca5ee173fa04ca114ac32b4627156a6cc3e56d4f9361ee601d9b887e1115
 DIST arti-1.3.1.tar.bz2 3931583 BLAKE2B 1434f36454f36d3bfd2005e1966c9132aafe263883f05dee8f5c957c6a1b02918de97a0c42edf1161f79377a9d19d9ff0d1ab082ae1def1995715a08993b38fe SHA512 c844bc702a6bddcc3b39e964d8cacbc4e60f99ab240e794b2e7170059a8afc4739db62510717fbc6f3a98fa1f530b3a6dec0708ccc24c19c4d9d9ea7b5b98512
+DIST arti-1.3.2.tar.bz2 3967605 BLAKE2B 4acfeadb1e27ed276a10f634dabb99702583f3ef51e9a8f9f1343eff14c44b0db88a3ab8e0fcff3c5ae58f376092fef7dde192f7b6b27b990b2bed54812a28af SHA512 e7c8b473f415c39fea15c78284b5b75d2b5844c06b330eb576adeb92ea3827903137dcff93091176727aecd3ce0cb668961b9837582475afe71dc6d040440963
 DIST ascii-1.1.0.crate 36075 BLAKE2B 7e68e7b3d5e6aef132c52db8c078fdf2e70462d9238b637015d7964312737fc09b35719143ce1fbd3e5b8072c21717f33e5061adf4da1913a9b9f11ac9c453ec SHA512 d74982ad87796f0d745bfd654450dc74174fdc6aa2a0047e5d250f76dd6079189dc0f05d02a73a85b1d3a86c163524d1f43f5d014de0153cd69fad4de26cf0ec
 DIST asn1-rs-0.6.2.crate 90647 BLAKE2B 6261d2a39440bd7809c060f3d9385f9720af496dfb9c793f3550fb2d8d3c443ee70113b620e49e29319b52c1f1c8549648b95c3622a330a9bdd8e207c266f16c SHA512 68666c347f0684ae04703f23fd5b9e1d9b1cd36ebdf4456ad70084750ae79389bc0386ef942c8324e1864719312e8b1c4d55bef6189df1caae2e128720e8953f
 DIST asn1-rs-derive-0.5.1.crate 9692 BLAKE2B 81fd70fc9708ec58d2fc85fe645ab35f2e5cdaacf84ddcb54f5af86dc8b6da2c2f7ad1e974b7dc22d390ca4771724ea2922b0bfb3ffe3720aa1692740f1e1858 SHA512 96734a2c6ed24bb3b5e8b40fca55acee2dc9e09dec2af746a095769424e1a329baced90d09838d6a5b99fd237f9965dbb9ba4e1ff75bcbe155c586ba6ad90d29
@@ -42,43 +29,33 @@ DIST asn1-rs-impl-0.2.0.crate 2261 BLAKE2B 2b400558c8fdb265e208c973e6b79257264e0
 DIST assert-impl-0.1.3.crate 2270 BLAKE2B 20375f019d5b0eeb1c922c9c7f77fb351d53c62c734a779fc0d95a1d660fa4c66ca455d68a5a985cdca3e1cdf77792c83f36d857cec677b737ed06cb47693cf6 SHA512 888294ccfd62de80e4a41dcf3237bc9385d209eda706a56c32345a2a7bbc6eecc36c3d931aa10854bb59605611e4c14ef71bdb24f483acc932911ca68e28dc98
 DIST assert_matches-1.5.0.crate 7761 BLAKE2B ea977b104fd0d98bf9cb77ee9bfaf2c3fa378618a744b05fafa5175ec45929fefd574ff4730c90a5b485b1abb17861c25be6e2041c790fcf9c2add552d583e97 SHA512 95f6a7c6f1d577464cb488acad76d765436c20f1cc75c6bfbac28c5820890f7ee169120e3e0a60ad72e91409722e23d35d6487752a16cd07372960a41900eefe
 DIST async-broadcast-0.7.1.crate 21867 BLAKE2B 9c430a70bbd2b15ecc88afee064bcb04a665c0421d6c239de611d86ff3fe56fafc083ebc172c5d41c9f72a40080d87a75dae8e9b1e85249202dd844b8360735b SHA512 82b90a41ade624631dd5a03226921ed58835ddf1bcde271ff0c0e14905fb069847bbacee5592978c5389cbf366d77a7cab244ca92871949f3f4872d6da10755c
+DIST async-broadcast-0.7.2.crate 22746 BLAKE2B 5b0bca51866d8778161fc60d33ca289fb65622ea6daa6ff9e2d97487f452c44fd996e4438b7d4151d799e19b731330f7f1bfb829e3deb183015cb8bea7733666 SHA512 dd53db4a5f7100cb969d40c709f40540703f498e64fa8486c5ed914bc8d1a451185e698b6f0b21decad890c459aeeb917d6f42b0500aebaef4bde48eccfedd5d
 DIST async-channel-1.9.0.crate 13664 BLAKE2B 52455c1c9f82bede902a96de0526ce4563184a9da303477110b556b4c877b563c21c32bfd9c6ded446ea0bad416af81a07e5df5a62e7c8f40c8183c1d09ac4f5 SHA512 cc624b87dbf34e4be4e219a82b96036396b92042025eeed2362d91f414ca17884365470fca5014b02659be44b77f20530ca33236dc427f0a2fcff2704c46c3dc
 DIST async-channel-2.3.1.crate 14576 BLAKE2B 09ea03c9758805c90be9aba222e1d74f3166ab492e533597647d1b4f08bf1dda79d73b21de791b9802e19c225cb94b7cb25550bba61488c7b61fa87f88eb29dd SHA512 94c999912bdf681dcb686292645bc8c340c2687bc9544f317e0123e672752c6b31e9d784e488e7d0bab79b5f207da8904a7f1fe140397513b47c292a6508a7e5
-DIST async-compression-0.4.12.crate 109647 BLAKE2B ba52f08d34d618dd44c33b61b6b13e653da84a9890adefd9966b41ef97b899743f55c3392c81847e1812dc8dc0c6228781e9ade06b36866499fd7af43d3ef3fc SHA512 5185b8583050a293a93f2bdb15e062a9769af230937c333aff1047e1fc6be867ed11545767e2129e22bea89044128d38fb843564344d91a0c43b63df49e518ea
-DIST async-compression-0.4.17.crate 111860 BLAKE2B e3c9b2d20634522dbfeae3b2dc97fc85ab9813902bc93bad98789a0979a02f323f1e4f9d3121b442102df147ba223e6b0dbc00d7099d6ca8b203d774e7918f6b SHA512 fd90a09680069eaa0f9300a0f232614359711c957022e8e031a49dbca1eaebd1c755848144d833aaca891b2d0811d313199a28bf8d47680427f931ef7657f366
 DIST async-compression-0.4.18.crate 111919 BLAKE2B 3ded3d17abb4eb15b55fb76a4a5584c1733588191b05bd23eecd7e8a7665d7e3914bcc00d1dbd5f573667578c5faaca9a5751c40a8b1720eab4308b714dac455 SHA512 611ebc8ff2b79a0554e12e428d7ef7534802cdfadb012683695dc40f708b9c0663f7d9468858379c2103eb36396ec30243680fd45d392b73989ca436a69130d0
 DIST async-ctrlc-1.2.0.crate 12413 BLAKE2B 8a3850b2528d768af4c3f1681df2eca8a46e0d81b281f91bcf5da9fb06597fa32163ef81bec143f921839a172695e6837fb059f557140566a6fa7d670b0b1224 SHA512 62e648b216630b3a8309e8619bda64f1f12263fc97598618813921d79d9bb0d6eea80f4612512bca802d4f2b71654b9bb5e768460f35c528ae9494a8bc1a236f
-DIST async-executor-1.13.0.crate 27974 BLAKE2B f12f77471a843fa44dbe5281159d47c0e41b53672dbb1f91519e9e6f302024b905e8415027c0d740bc33db43267db94da907251af8ebbe677ce6ded59078e92f SHA512 618d771243c1ec31496cc228f3e6bdd3d5cdd479eb94e30810c87241e38a5fa652b59d61ec55cefbd120f0ea1d557a683c8a42a3e82344b7813d172d25b6ddec
 DIST async-executor-1.13.1.crate 27991 BLAKE2B 856bd4f42a0d8d35bfb8b8525f626e0b52fd6704810f8bc964cebc47aa0c7a4450f16e5df307f4fc613da81fb3207f4671543f48710177931d6f70dc40c9f95d SHA512 27357b3dc28ad5512b46306ab7d959b2e68b4b5ed0d42fc8cd12fd265a1931a4d8c8c328911eca97227b12d861c9658c14afea6336f999436671d6ef351f3820
 DIST async-global-executor-2.4.1.crate 11844 BLAKE2B 910e2472142201b970a20e6a65406b5e79d3fd96d88d03e43f6c2b868a6cbd3a5fa715cba3ebd427e5ea6e30dbf159bba162ea7f0718d8b5c9eda1a8e355aab4 SHA512 688fc105404feb0bcc841e9b853e5f270257cf2bdffc041bac7dd681a2990978a0f0d1e48e2eb574bfccd991d95632641e2407768d572c6352084b2808aca3b1
 DIST async-io-1.13.0.crate 37191 BLAKE2B ec27c5a49550f9a2cda66df0a6c54e5a64191e6c1ebade4e47a3164cd04fe7fff60d225788983f55e47a785dd57c74a22f2a3455349d2d451646e4d0e7f4ffcb SHA512 b37a13fdb1d29e2e8852ab6f24589718a88aa39bf532145ae7541d61c3f49f731f890764dd945845eef6c8b5af1042bac2c04cdabc00b36dc4350fa1c62ce54e
-DIST async-io-2.3.4.crate 49145 BLAKE2B 0530cfcd440e09f0132d2f078b9dbece4a0ed6c1eae668072d29042f41c2855c06a28a9a5420778f9b35150aafc3f0833789091f4779663cb838d44b07feb114 SHA512 30ff1355bcf0d93857604b93d22532040cf50195b6337bbab2cc734e8b81c485a4ac1e575c7c00495519afd0cf406cde9e49f044b183f29ce7b9a1f44edb2760
 DIST async-io-2.4.0.crate 49252 BLAKE2B 46962d877837913e861299f796fe4d04f861332c58dfa7058029d5070adf23be7281aedfc1232df5538da477c66190703d67fac9e2ceb8d55bdea17eb9f83e9a SHA512 6ffd4c7fcb39760c67ad1d89b15ddedb9f1734a3caa497e0105cdb78fc58c42a39a0be55bcec7911a9feb67acd8bbf97b52e8b5ac585edaea8ee262d3e7f58e0
 DIST async-lock-2.8.0.crate 29944 BLAKE2B ebb35437caf6bc8db154b21fd17bbe1973490fec06cd34e7385d9028440b0960407d674beaa707a01becb227ef1107686165953658f490902e13d0732a4e80b4 SHA512 f48732dd8e5de0228f56780adb87e4d9870496ddbfe4cc7c6aace8d4cd7198627a05ff0358fb33ed57480c7ac886b57253fc73b2bbcd3e8cfe65624b51847ae1
 DIST async-lock-3.4.0.crate 34446 BLAKE2B e113033a86101bd93543d287379ba354b4bd61ce87786719f05f8a990c177a885eb50a19eb71fcd5cafa01308cb45b7872be65cd7e975cde03b0555a691a4bd7 SHA512 83731067a3302d3266848b0f65ea6564dad60188472c80e78a7d4cd93804f830332aa01b404b60a8f91cc1c6c7170020ebdfe4b5bae14fef6d3bddcc5f1ed9a5
 DIST async-native-tls-0.5.0.crate 24719 BLAKE2B a88ac4991037c43ccca585cbea6788c2a4b9a062f91caf7de95c52d3b33d5bcc6b4779bd3ca1d0dc6f8e0b9883465e47cfff41cfee1acd96010513d280670277 SHA512 1715e1e45b8da32a4491c41706692d002a677ed3ec8210084220e2450d8e45855dbb2f3db4137102ad5aaef525c56cce3bc283bac440b1611634b819359f8abd
-DIST async-process-1.8.1.crate 22758 BLAKE2B ec395b0b2041c44a8d7b15433447d044d53944a71bd4912e052f59eea1dc7cc5b1555aede4778c773f6241cdc27cab058499143fa65f23348b43549e91beab5c SHA512 ce0dbcd0f893d93ed83915d7ed9661c0d5ef867115c051df2a298cd07e531a2b0f63fe58cbcd25820cd810d81759a6f467635201659d34994c04edfba8a8187c
 DIST async-process-2.3.0.crate 26766 BLAKE2B 346eca5d8bd2e0a58039c9772413a0d0174dac49e31c7256927c9bd03b7c9f07ccbec6115792478b87123fff1516972eabdec6d54e5c070e0dcf00f3b1d6a43d SHA512 48c1decd4ed3e65d0feb9381533e1274b98b9ba16318f1caa35729078e707dbb2a5a0b52822873d5cc91fc5a51b725c33b784ef8a91aa6cc2cf357ae87c5e2fa
 DIST async-signal-0.2.10.crate 16970 BLAKE2B 4364a566ca828387f4e1d7689b1ec7d6327bf35a56eacff013f81ec6f438d9ba02a59a8a5c457f1806dbefa23649ee289a8d5ccc7257e2c54f99de45cc4e35d6 SHA512 10d58c9aa3ef6ea4bddd4fa86afd342c6d5097764736294b7fa3b26596301f98827172cc9ed9bdecf8dcb313d2fa0222fb6aaae04f7ffd73ce89cd4b0374ba8b
-DIST async-std-1.12.0.crate 215080 BLAKE2B 1d9c56e03971f742b6e78a7a8ae097a6b1b622f64ebe378fa54511187e7c9c7ed5840ed6282633ac6636d3130d0ed4cc7985eb1a5c32718f07b57bc7172f3eaa SHA512 aaeef7f474fc700bba7beb6725d4eb778a9a05ebccfecdd81789b5d039c49508860d953f231c7b8fbce4c5b237d063a43eb03b83410490fc14eca572884f57e2
 DIST async-std-1.13.0.crate 221584 BLAKE2B c4b99fccd21dbfe600d0a96987d01c9c0ebd044c97e722e00492aceb461377ae88098b1e235f7fd9277ccb84cba2c5689c2f88d0372dc895f4fc63b0087d7656 SHA512 47d50f728b1d5f8d9510234833d0b2044ee6817e7a5920df58bffabb6fdd5b821c9645fc54303f8f270de06329f041385b11eec9ce3983eb5975870d99d5ca48
 DIST async-task-4.7.1.crate 38077 BLAKE2B 200f3c2eff92afeffb34404bd9b02af39226024d309137c3835342ab6631c09f14f47abc5d25d77e73cbd133274e731fc88e7e94d8456f690b0f1056bae8dd95 SHA512 8495436d0739a2ce83b372ae13ff24ca1487c92e032948d5830af19c3ba411d7cd004634fa10bc2f748f8a82de27c12cbfacaac92cd0012e1fae024eca9e78ca
-DIST async-trait-0.1.82.crate 28997 BLAKE2B 87d6bdbe1a1f008908d7fddc88dee143df8ddd83cf10424358c5d07ad948cb290ee9fd7c564df756ffd526da329233f5102ed1d665aef0e224496f0782d37e30 SHA512 5e05ff37c0c982083f92ad798646f8faea23a718304bcf12dfbab9ea044792fff9fde3e7240e85309b3e4015a575112591a7e9601dcd19c07aa9da0f6ae1da14
 DIST async-trait-0.1.83.crate 29054 BLAKE2B 4991f79abd8b9260b9541e754c30d3e0731ff786fcf65cc3f3eb75a5fcedcb37be147222778e1a0fa6c68d8fb872144b2b55b43cf6f8f4de371f24175cef405d SHA512 15969eafbdbe51e80433b53196962293daed2a70d3d9bac91c58e5e7359f60fc99ef519ceb1fd54e34d627c94f821329474a602f25f85179318d10c3147b5649
+DIST async-trait-0.1.85.crate 33251 BLAKE2B 3a260c1a95e6a249a3619f8dfefd46bf39506ba78a144793ba7ba3c9e35611aaadd6aa82bf70f7ab7874c57d3dacec490e1111b9ece3fce280921a1e29d91698 SHA512 2a0490640a847b4b104909f44b62bb246dd578c1cf487af58e4a6dfdffa1c2c450b05c80e47e4a053270d91537327412622c453c69e1006b3677d256445cf3b9
 DIST async_executors-0.7.0.crate 36636 BLAKE2B 6d43e1dff7f294865becf497e9a90dcd91bd9d89934f5ba9bfeed6e6ce2279f2eee2cee0d842184cffb1127be51942d279c008878e37f2600157be949994f262 SHA512 6b33de98aa20db2a8a839c0196e613b7f626a8fd7dd4b172043008850dc6985762ec00ffc97aa8e1191bfc31e4c7d8a5257423ceed5ecdf087b0ea68f1a0a0c4
 DIST asynchronous-codec-0.7.0.crate 14271 BLAKE2B d2887e4aa1043b5f8172afb39f0895851c440dbe98a832a099de7bad889e61a0b93c067e4d1d5b93f838e77b7c7de73d8de1863991ff1d1855805b4a32a11532 SHA512 259065048fd63311101e7ecd5633c6ff3d3ea01ffc0b37f24f40755f27a9a53010174688609b4c5208c8a6a08bad929a235f25cd798bfc01f9103f43af1f740c
 DIST atomic-0.5.3.crate 12801 BLAKE2B 0839f1d26840f33f865248ba8f8e275f8168d5dc07a7e424717ef48db014da3c2fe8877eb7a08230669d2b585775145efb69bfc43da7062ac9076b037a9f1bf5 SHA512 de1be4302b4d8f50ef5a808ef09881726e56fbdd72bd1b2a118724295a48128bae57316805ed92e991b82b06e7bf229efac4deff9a9ce84fdb839726a2ae8064
 DIST atomic-0.6.0.crate 12919 BLAKE2B e9a6978637f0c887b6c65e7abd92088cdab699a49957df2856499eaa8f8b38310c3cec949348884a4d17012ca97b98b4a4fa8f4695f2673063e6ad6ed5fe3541 SHA512 45f82c3b87ee248a32ea403aa2b230b7dd90142254bf7d2ad09b992368620d6b70b4fa05d0319bd2e12f327c4da678863a76ee249db7071f57baedbd301a5626
 DIST atomic-waker-1.1.2.crate 12422 BLAKE2B fc6632f3c9d719b1d24a1c8e05947d94028909d1c629b80576e176e567636dd4cca699c7e91cae2df63541da574146b3ce766374e93f0ee429bb5bc89a4d3cae SHA512 e07e58db7955791259d0ec00fc4d53318aefb4506e062914819c4220c6dc75fa11a7af0289b4653aa1f9041eb975a025635190de68b4800a0e91e33cdb0ba11c
-DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST autocfg-1.4.0.crate 17712 BLAKE2B 7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6 SHA512 3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c
 DIST automod-1.0.14.crate 8717 BLAKE2B aaf79cd054645d3fce5e57f96bdc33f0d02c66495353f4155eba37e81160cd3eb3019587770a38bc22cff5f1e673f0af1b0c9e5e6472bd08e9a6c2812c71b576 SHA512 5efdf134f24298f3a522688b3bb87f5e8e43bafd761909a09a1018f7142ef0ce3ed390f7f01cc475391bf8e6e3d433d776c47efce619a403276ed8998b2c531f
-DIST axum-0.6.20.crate 146227 BLAKE2B 24592e684de9b7c0b06b9871028dd6ed14b9a2ed259076b50b12a2376e93b8fc028831a94bc748eb6c66dce49978987d3655fc30313daccb0ddf92919fa9da00 SHA512 e0ef6bab62d465a607a49c799823133d634d93d7a389fddd2e165fc3895eeb4c544f35e044e3c8f52a21c8421e4e4880982fc0be62de613f98ee571186f55646
-DIST axum-0.7.7.crate 152149 BLAKE2B ce97d6042ef7a514b59701e96cba3531bcb6fbba15179e4bf8576dab062993d8dfee744ce636f11cd90e236e674552222c744c18b4e9cba193f1b2f8a5885d88 SHA512 03a5b888f40a9094656527f685a020e577482e3ad2175e0a8d4fbdea10267c5a4756f934f0a8bc85b2c5b7ee2da8513f436520c36f4c1a0dd43ed571b147f09c
 DIST axum-0.7.9.crate 155272 BLAKE2B 84e309268dfc5199db52c46d1849ddfec054908f953a9e1a5eb16ca298be195241d41b29d898b2280b1024858dfb772b38c26975b7f7f081293dec54a4264a0c SHA512 e2ffe34565d98b50c452313e8e53baf439f34fcf17067ca3c71697c87dfcaecf07e40a8d23f2ac5e452b4e2f0d99c2038088967926c615c22d535c172ee12a63
-DIST axum-core-0.3.4.crate 21088 BLAKE2B 323888f8dd90f27f6f14a9ca0c1b9f1d81e04336c52eab887ada22d8ff2dfaaeab191635f45706c4246c73cdb32078b3c01481a5df888db402c29279fafb0434 SHA512 e09e65e478db742c26115b417970cbcff81bbdf75b37ac3c7b5b0b99e953d21de05884a50377238ab788ae3afea40388c59daea45fd03cce8fcb861c7cabb0ef
 DIST axum-core-0.4.5.crate 22183 BLAKE2B e0a5e7e70e51bfafce7ed1c190a6bd5740836371096f40eee7366f210f21c0dfc62bb6aa9eeeae4ca471a402c13c6a6736ee486af0fece40f7a2cf898347b497 SHA512 d3a8f7c3b6a89b9ed54e50658c39043e875f96b6ffd311ac187068df731b4814dd228e0aacaff03b9588a7547b4198119e696ceb7e26cdd6bebced7c0cf543fa
-DIST backtrace-0.3.73.crate 87617 BLAKE2B 585eebbb44671dfb3ff088092f62c7b25118ffc34e148b9b6ac67707923254ea43056861e2658c5fac7b9ed16fa56c30e7734e976fc3178f1fc03912d1d44c40 SHA512 dacedfd32cb91fe408e4f395441baf09c0a4b3bc4ba8f79d088359455cc903c93d24969567c7c5b2feb806433ffbb63a526d73f53caa4bee9c51961b61f831d9
 DIST backtrace-0.3.74.crate 88516 BLAKE2B 594b537f3860560bc790d04d72a91ea25bbf5f2494b9c43377129a8021c02d9c16471a223e518889775a816c45513b14bf097c453846b62302a58b59753a5fcb SHA512 00cb2be0626f0bf6ec8b8f525bb129d3ac74c386c5e46ee0f343edb78c863222521f8132876057a5a1facacf40792dea51f2f20e986b35f3a85bca3dcf5c1520
 DIST base16ct-0.2.0.crate 10240 BLAKE2B a8097674e84bb85fa72ea752d71446fc39e695fea9acc0f98178bb4e6569180f9acb4c7a9820708359d1c4733b57af6448015cce83f8c610985e6d2f7858fc33 SHA512 efe7c810102646733cb24c5cab62bd58d797e77b117d0fa5d651c34630f77de4d768fb99c981af5968393734bc32a2c1944a719f9f1a192b5062c0af8bb3413a
 DIST base32-0.5.1.crate 9238 BLAKE2B 338b0714edf860d85c97fcd97e6b1fd45b0e54553f36ab583310830c7bee0fa68da2ad98a3cd79ba36968a3d008cfc6edca309313696582f4ff428fabccf8e77 SHA512 9280622ecf5c4e871796c5ed8ce620611e067bbb2ac4d331a359cfbb313af5ff3e55076623e340b91add3a120864eeb4ea4b4cfa1565c62189ddd1ed675caff9
@@ -92,63 +69,58 @@ DIST blanket-0.3.0.crate 15928 BLAKE2B b78a3bb21a3781e1eb38e3aea7bf1b0fd982d1901
 DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb
 DIST blocking-1.6.1.crate 17788 BLAKE2B d07246809d8b80f1fdbdc678b2877f349b748f2dd0f8543e91fde4aec7aea0b45e145a44f07cdbf26934d20269af01844e1cf7d9dd8b9588d129da7f929d9c95 SHA512 1879bf31c18d5cc4653f794dd4109769ae32071564d3a0d63896162fe160bb5ed3d7d8de59ab34363f8192871122099bb8564ffa93de5a5b75ffd93c0d424ed6
 DIST bounded-vec-deque-0.1.1.crate 22869 BLAKE2B b3ed72740db336a70f0a8fccbb1e4a1397ea689f3bae6cefcd513fd8b9a5a92d798503dffbceceed3fe4a9e77764a85a6c6f1b437574115969bbeba54e9f0429 SHA512 e26e28d67ae780cbf49baf7e5634a8c386ede6169bcc5a54d06044c19e772133208dd19f2156ea07d252e54da4b0e7fd0d5b2ba325d63641da85ea6b2f7f286e
-DIST bstr-1.10.0.crate 380426 BLAKE2B 19330a5a293430c09908d2174ff814351b16419f60de6463abf9b8a9dff06a4e6845e889d8047a710cef54842f2790d9cd5080b92cdcb113d89742b869979c74 SHA512 823abdbda9b13802facc7d6b1ed9ad809ed3b0b827d26e418348ffb8481b5f5735f129c5a9a8c7b2ab010d7f32ca57cba69a1ee10a64225c54c6ceacd22c05d2
 DIST bstr-1.11.0.crate 380721 BLAKE2B f0fac00b83cab351f8b7e02cfd20a2aaf04de853878b8c1a667159ea444093eb3fdebe4bd893e9b3723070fb4b1d2646b7c560987b640bf3f5a4923fe9accf72 SHA512 e4534db9f27184134264dfb16ffc79b7d2374e79ef50400cee4cf44c1e9d7d0b9f7ab8fa034493b5a1ef835c797214bfb399ae95d4b670b3283180fded414ba9
+DIST bstr-1.11.3.crate 351536 BLAKE2B 72a4fcc236942d121f76f42135c332fda2b1ad778d993ee69855c4eb6f909c91491fe6aa68daa0e2d602aea1bce61b1fcf03d03787f84ebb4d63b2bd3f4295fd SHA512 f1082ac8f121c6f9eab4b41c5f60aafe4623696c9f800f9d59f6726efc74f86071910f7749fbcdc8f1c20c83416d58f3ff507978775f602e18ae3d1bb027944d
 DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
 DIST by_address-1.2.1.crate 8437 BLAKE2B c1dfdb111a7c9815bb084fc44f1216d45da6ab401b5b646a6eb93b2f7cd77843ac5559f0f390e006ef77645ac2fd814ba86b10e586798b96b02d928d0526ac3b SHA512 f19b8397386913892241cefb1ad71c152280a71e63d2b42e05579e10e3a54ac7a3fc4b706fc1e5e571da7b77b8d483057c9d76f91c88975a970d48f62d718ef0
-DIST bytemuck-1.17.1.crate 50022 BLAKE2B 49e0235d3138a7747576474df50cd995e7a0180096a97a937bf4d39c95ccabe86368c5e73ee28178e34bb58393ffab36ce322bb91f8a067f9a6379d248958471 SHA512 fbc88803a253ad84cd390e0b724578f11e2100e3c26140ed413887eb5532e9283f3091ee4ff151f8ee2624fe4fcb33c2e6cb43a621eefd7919d0a7f34de8075b
-DIST bytemuck-1.19.0.crate 50363 BLAKE2B e3dc5d5285367a0e79976f4b96a5d1204c35ac33d822bc5d2e8bbb2d06d3e2c59ef63f1c1eefe12277cdce6c1730fafc0ba4583be193bf68f9a84d541ea7f55e SHA512 7f150a5b63a8aa2f59d1fae7cfc70d08a78a19ce4171352aeb3f252a5cae90f76b75d6517d6d6872d9b05254b16629b7fcffccc825d7813b40d95b4fcfb20174
 DIST bytemuck-1.20.0.crate 50943 BLAKE2B 5a2f373961718e994650c5f4c02a3f0e41bc7382a5b05a4488474e2ea6b077db7f773a02b77bf9b9d5b5a6da53ea79e87861ea57d944735efd225d1ee8c08425 SHA512 5ab5917e650184720a751f310d8cd7502d183a0942d97922e0bac25f257762bbe07c09b1f8427e04669f0fe449d07bd66893593cf11846cb8ec6632cb7eb271f
+DIST bytemuck-1.21.0.crate 51553 BLAKE2B dbd88d153c79cd87d6a51d33e49dde7b825711339367a168cf2471fc98a41e72d4d759873d542c3c6e196a6baed4f099103dbdfd369a329bb4578864b9ffb448 SHA512 64abfc5c0430b8bbb4b75fa7ee43037ceb180699655c0862b2699f3823fc445d931d3284ccc88dfdc98ed1a24a660cf6ea1040f91c6b2ba1cb21ab83c89d9b18
 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
-DIST bytes-1.7.1.crate 63623 BLAKE2B c399f7f25b85ac284bd2f139d895838eeba7deb56d109c8579966be4b8a7a56bbc26f9387bd0bef9fe5449d5e2ae8d11b254a7ef93048a4827d945ddddb5ce09 SHA512 04cb5bb1718ee378be1d9d56aef2d117ed561935ddadd78139ef2839f998e92c88369c79560bce9d23246a3ebda1dc888af373f9ad4827a0b9a249379bc71e81
-DIST bytes-1.8.0.crate 64824 BLAKE2B 9af490b43146b04704e8bf0f7df1f251d7db414b68aa614d47daebcb374a7e18908192cf0a2ecc80f40e70379395b88f60f85fa80f66e3be5661752c4ac560f2 SHA512 a721724e5cbfc73b79102a9c4a00fc9da520417819ca5c82b798c8cfb45af3d77b33f7035ad33d6187399c613cc2e83644236ac772aec934f521f87d4680059a
 DIST bytes-1.9.0.crate 67320 BLAKE2B d5a89fc1dced217bd78c6c50d0494308b69b0841506c4663b6df3755b91a9eedbd242ce1322a71b8a96847db7920b2b15744fb060aa2d69f5c8d9bcbf2745b9a SHA512 e6c0681c535db6035c1fb1c0481725bb8ab341b6324acde07ac4b60cc4f490ec6ff01478bc00fae00ade2bc5420f9d14cc44438e5d156bcce91cc0f06118296b
-DIST c_str_macro-1.0.3.crate 7285 BLAKE2B 55f66dd72fabf25b0085bb9be027d3a5047f44d9a5b358e0d630c036ab5950ba30116fad1448a0864b1a97e96963117b6913f5e9f505f72cab182fcbd3301aae SHA512 e3afe1138366e1a88e0141b91051291b51e9da3dedfb536873e0d923d8b372178db570c6832bfd3e2e5f1aa0df45b89385f982df419003dcf235d00a7d1d3abc
 DIST cast-0.3.0.crate 11452 BLAKE2B fe6edddd0589fa436cda32342d7beaabe4003afdbdf1d7c5db7e8748adf23b1b2cdcdd286235837c735d2143f29e692c152a5d56fb0458a54961e4dea303b2cb SHA512 4a3e19bc1e9e5ecc03aaef9bcdce01624ac0e6858c065fa1c41693db0ac172b9735ce872064561347cd9e79f00a274129011f6e4ccf9e61d960c8bb684b6d396
-DIST cc-1.1.15.crate 83085 BLAKE2B 14077692d5fc47afc59b44227353aa24d91708fecd316b058e553940e6a9b6c8f148115cde2b7d6cb2a3462f487aa3b45bd670a2beab03f677e4bf63a06fc3f7 SHA512 2f1e4f3a4dad3638f680448520e218e3c984a7c13c3984d620949a9d3c4f13d68b3a0749997dace1e43faffe3477ea15394bd4e32a959bd56e3c35c27a4aa4de
-DIST cc-1.1.31.crate 84637 BLAKE2B 80b95666f87f80f20efc53aacb132db32900132a58995411e95fdb043e65467ac3c84ac905d13206524d9666563486ab594a09df1fe86035ec3e5542f78a6f5e SHA512 fbc42db9e908d69fe2dac18605e057f3187ccca067ee0e9f0c271b6b9dd213f0bce1a1e32f073bc012d2ea756878929f506775076d453593a14accc5f9a159ea
 DIST cc-1.2.1.crate 92731 BLAKE2B c9cb100964834692781ecc3f47972f83adaf27e019ca212f896b19a853521cf2084da213f2c2fc5c8a1bc794cc83fe9f81faf7751e1b065a3a2a08137cda0b61 SHA512 54bc5d85d48d678d33dc795aa6cc823a59ae6d17b4ec5708a1dd515e3495eabccdd949e9467e9bb3a29e44847a2d3ccd75055dfda241d8abbb16bfad650f2819
+DIST cc-1.2.7.crate 100283 BLAKE2B 98102a93e01ff0fc95a18ec4b2382a0e4b74000c33002da4553c2ea030d5f09b898b5c046bcf1868368b5fbf510d74c710916b98ead11a1bbe21c4f7bd1c5977 SHA512 f3c947912aaeb9d76fc5e3fa3c7ec1f87b19d9815170190b47e9925edfcca2963d56b75a140506656ef49a3a0ca22575304ab76e1b4c028730557b436baa3da4
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cfg_aliases-0.2.1.crate 6355 BLAKE2B a758d9c88527f0e6e7cfd6d4c83eda1bcb4d6e2438189fe08e8ecbcaa78d56afc5a4873f3b82bf7da96afd690b44cdf1e44466b6da0f37c358b340481017103e SHA512 74969d12d5d24002a29e08d52e30fbce014dd481a7c35ee0162e69333c5f2d7755f3b02439b31522e12444cf1ac8e65880ce33fe6778dac03757e362cbf8a72c
 DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
+DIST chrono-0.4.39.crate 222248 BLAKE2B eeff1694a98e8775524c261c5c46ebf09bf1ffc6222a945576960e8153af99e4549d8c988bd086507fa430f9cb15a3159be85300247ab3c6f5e77ab515f0988b SHA512 5b258f76bea58ab9baa0fe8fb32c41928b8b655c76bb2fbaae9300ef8380cbb881296cee6b9e9886dce62b0759c73e84f6409e374a86cf0c80e3383512f98571
 DIST ciborium-0.2.2.crate 35611 BLAKE2B 7bb34ed2b16f55af2d762bbc83263bba901a0f05bc7677a370460549297839c4d6e913622e8a6cb3a5c2447b94b0bd17b7d5007228ea8881193d08e5b8deb072 SHA512 8d1af6a09f116e42f0098d7d0e34dd906dc3e718b257ff1a1fde655a235d40619f61f18917c0cf35c55de9160c255a9795d5e7525989037e3512807cc6a900b1
 DIST ciborium-io-0.2.2.crate 6697 BLAKE2B 07636da78f59859515af0075cb36d9ca969113ac327ff727953c73b64b60ddae22e5b1b65d8be5aa401f8b13d34074cbc8b47f23abd7a13d551f0b1c78f23575 SHA512 641b8592f9699d5e6c607815c8e6dfc82b2bd01897015e04ef8853420a7d90c2ec5c1140e39eb7623ce05587bea52ef63659eae76baee5b6592d2ac5298ce106
 DIST ciborium-ll-0.2.2.crate 14695 BLAKE2B 3c9ab0b338070359f9565706a504e4f6c65560072380af6e0a57068ae6716773d40e75dee84ded5e1d32f93445a07a0965759bedace58291b68b94479fb16488 SHA512 2f7ef6ad8bf5a862e8b9daa64bc6d8184c87a22c264b10dbb35c00c9effcd5712f354b4ca6c2eb8e6795d4b99d7cb88fa2acf01f3ad6fb28caf81708a500549a
 DIST cipher-0.4.4.crate 19073 BLAKE2B 144c45c1bdc5f7aef7f4fc63b6dd85955c453537567d1f1074e436e50d0d61f8413973cf3da207a48f1560ea92f2280fc5880569c78a1dd66bf97fd1d88ccde7 SHA512 1856d8b08bc3dbd2fa5c8b97e9eae43323c7aa19203ef3e80bb49cf15b5ddc832acb7b97121a52032656353e764f1f722200b638f7c28975fec1b5c9dc908846
-DIST clap-4.5.16.crate 56627 BLAKE2B 83a6a9ad12b826affa68df179dc1cb534f58b6ae505f4794ca6dfaa8f8a9e33d93b9babd7931bf48bc13da31cb3078b442c4a2a2e84a8f2e675b5d620100c50d SHA512 d13bfda2c3f77cf194acd87763d5f2fea83ec2135504b173af2941547a7d3dcf75c3757532c60b53c57600bf4859395ddc94a7dd92b17f44c60d3e781741f928
-DIST clap-4.5.20.crate 56376 BLAKE2B 8efa9c3e171ef38c98a25c526f528629e7e72850c6ec27e7e89a212403ee90d7d005b00750769e4335423ecec1d86abb35c19b0bf7f2c063bc7c6a8bd59d6804 SHA512 e432a118a2ec15b273a404c3cb75bbe579b11034ba55def1823d4670c6553e3d8611074a24f50a0f4adc8bda184213b06106c44c68a19d267342c53e345351d4
 DIST clap-4.5.21.crate 56470 BLAKE2B 63b58b49ad5494712d0d45db92bea7a0247715f655c108cb81a4ae7380bdf572c292bee1edfb601aacec401d7d2fcd76068373200be642ac8179a33bc6b941ef SHA512 ca7b55defd85a4e1001d04653aaf1c38af9b43715dc6fd7b7a8c49a66ce1be0c09e0ac78b3a3febb90ad9a7d8676b4ff1ddc136816019eb394b7d4908af2a51e
-DIST clap_builder-4.5.15.crate 163717 BLAKE2B 795fa9c6de6a3f4d9a1288c3340613c14b11a5346e314f5f486bee76346f5f88396e54d95d051bd84184a91bb1f2d3575f870fca56a4b9b590ea2d9939beb415 SHA512 52efd99bce20bb8ff2187c4cef8bc27bef6cdc52598f00b47639b797683f18c76a79a6ebf34d1d250621a49cab0e9ec9e7824d323516f1ed3fa721cfd34cd713
-DIST clap_builder-4.5.20.crate 163812 BLAKE2B 689110f2e4f46e8c4c779b6c39cb5f5758c3a32ea5bbfa1faaa6642da7d650cac0827a3e5b503c5054a85e0e7dbf04e7c53d65991a45f3be90c75070cc9c200a SHA512 e914c8b6592f9d230b4f4290cf4b4d73d0160c12a1fa3976c74bad21ff16da532d6af792f0a33fa472166f1cd551291b5d1d71fe8b359040040418694ec52000
+DIST clap-4.5.23.crate 56460 BLAKE2B 5c0ff6ecc072368022b8dc08703d87802160817e40228fccbf9cbdc15d86dfaf0eec141dec4e8f1327e5a6d1622df9b334e94797027372dbe8765a12b918961e SHA512 4a8ef8731c9768844debcd1ba83a79a607fd32d9fbfe7411abefb8939c5c442e8a206738bb54dddd136117d3992f519ffd1640694ad7796c4e0aae3f95502c7c
 DIST clap_builder-4.5.21.crate 164115 BLAKE2B 7df7a2fb8472e32c1885978f99a77b05f91c96131d00947386930e7249ad7a7b055ae5b1ebf145ddafef4d7d5fb276f3135423101bdb5ebc597b9b15267cfab1 SHA512 48abad9de7b0985138a2586674df36bcb925f3280cc19c7dcbec14d58c1a3bb391c836ff284366fb32d7460a5616b066e4e055e3a5fa7651196e62c59ca49c8c
-DIST clap_derive-4.5.13.crate 30132 BLAKE2B d5fcd2c5a213817165c61ba2071fc6424ce822e4881686556b8379fc71188f60d8c6712f6f4a8e5c8b125b58d7454aa9846214caf324fbc93300abba240bea17 SHA512 2dae32bffd91de9311d94e2be0d990074cb2e2edc832f422cd5e7c5177f5daafc0c335e74f865024c77cae5fff631ddaba58028fcfc24b203467478fd473bbf5
+DIST clap_builder-4.5.23.crate 164180 BLAKE2B 90948ac5e8ea620be3e1ec1334677b0ae9dc227a00354fcd3d78e2cf23a1c101e009e6cc96fc19c0a2395e1b9ac6272fd9615abc1acf1a5d60392e337cfc961b SHA512 0889876990f0a361cc6b6d41f2a8f4b1decd376987a02fe69888455c92f3e583d6ff70880c6f0ea154ba62f4be7d2e7b18cdc4e0e2f243e6b17f250c3e8d1c2a
 DIST clap_derive-4.5.18.crate 30131 BLAKE2B ff962e52d8d8afcc9639365e27753c6c6943fd809ef89d9e555e8be5b2f13efa650bf1f9ae451f4c127c1529a0af1d892c3b02153b46deb912029b45983e01cb SHA512 035bb918bc7e9badd59341560f23e3a8a2e7cf945b6d8183f74052c4edfcbecf07c9ea6fce0ceef0b84c89a99d62b11760af39398897e4ee7dad0170a96cfefa
-DIST clap_lex-0.7.2.crate 12805 BLAKE2B 952bf3f3885ae7bedd0e8add236590da5fce72a7ccd88ebda063410aef337ce7ccdb5e5e929cb870bc993891610edc0197150a3aa82a62fadc4bbfd96324fcdf SHA512 a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380
 DIST clap_lex-0.7.3.crate 12841 BLAKE2B e825c027d8f3909cde259236fce6c3f12fcffd92c714cdb29eb886a12ef703c6844dc6a157199e94f8015549311becbdb11b83d49cb89fd5c8ce1e642b9e1e1b SHA512 c76838743e65529d00ce4b1224174007892967622ba820750bc7fb352bb267923fa3baf42dcbd7e831c3d1b247144bac5475548c9d13582b95762695528d952b
+DIST clap_lex-0.7.4.crate 12858 BLAKE2B a5ecd50cc503157dd69746f3b6e9c288e0fe4f6d5d82271499f657134fd401fbe076255e2be6a23ed0b69daf3941c6429dad8b288223b0ad390a2c435575cdd1 SHA512 a2566868f4619679d3b74b70592ffa6a04b13e38e3196c56bb1dae8bea0c711bddbccd778d2aba3cc0ee074c9b1cc0335222818f0d47fb3cc8109cbc35bb992e
 DIST coarsetime-0.1.34.crate 8765 BLAKE2B 483d81496126dfee31e3fd26de09c20e8b7226f97ddb30cf186ac9a66420c8ef4328382f2728084d900b79cc43b5f7d8f5986c088756a1190df961f0ba62d05d SHA512 88680d1bd95608f1905169061ed4307f1c05cb093bcb5f96b20d273e4ed718c6b63f9ce9674c5cfaf3c376ed5387d5546b90e29cdd81f52515fbd8a6d515e3b3
-DIST colorchoice-1.0.2.crate 7924 BLAKE2B a4027d5f870b4d9a718ac3f9d89ce04e2ed38406658c4a55ffaf39ed0cb1ce7e1c691eb56c66596b519ca82309e8ec7eebac65e69394cdd277f44f9b6280d560 SHA512 f34d5f66f84e90f473b6b9a62a61a59575e712d3e9b140324683f80af42d40c1d079701aa2ed651d0dd95a5ac8838e1f6f6c034e2adef79509d32357b8093117
+DIST coarsetime-0.1.35.crate 9015 BLAKE2B d38a12d6a22c3b621fff8938d0eda22a0db469fe24fd09a551a0e1a62f95545a48c41013bb235c9be46e262a063ea7afef5d7cf98ea770a9da9ff79cf83d2b46 SHA512 e22836ed8d652d97c25f2d13cae70d70ec569fa2734f9a726484ba519ae2dafa5794467a914c5128997df687fe58627cd7a221f8c1c89b4177b91e33304dd9a4
 DIST colorchoice-1.0.3.crate 7923 BLAKE2B 7055fe61677143f0d4445ed5f6be2cbc284c155aa6ceac04df6f3fa2563a225e440ba708bf40e298ad09775ab7c7e1842b5f6dd78422b06dbd1250908e3227ee SHA512 fc26696189d3935d5510a1237504339c1f354d03ffd3b4e830b7080335aa778bc72787ac5fa9a67a731b9bde2788da778d497f2ef97ec68bdec5145fedf4cd14
 DIST concurrent-queue-2.5.0.crate 22654 BLAKE2B b490e76804e45d6a7af6bb4ec074fb370d9ec7cd67c7ecfb55d5ed53b9b437c174e678add915303559e902ac81c8751dccb2c5ef0543d5961713372fd2b08d3c SHA512 235704f9161dfac60d2a6d2cf96425e39c097dcde2f005187c1f044704eec66d8303d59352cd414a81a3ed0eed60421054b0070a9b8f69065a79a2519e913e5a
+DIST console-0.15.10.crate 36449 BLAKE2B d0d2f161ea045854f0f53af39490c37af170888241b2f63bb47749b288ac387e24e52f936651763a5584a20bcca3512b28d50cfc4435d97ff06cb5de20768e29 SHA512 2d4b99912215a1e7083ac4cdd594f6ef7914152c683f007babecde2be7f3d6c2a861a198c9b4306242d84722d44965185ba846041e2ef13ee9ee9a5d43c370d5
 DIST console-0.15.8.crate 36364 BLAKE2B 467de2c2fbfe31688cea20b338558ae9671e50ba1fd07983d21f32d7eacb73e565ebdd6ec5e78b2ae04446f09615c70983c0ee534e25ca5a28fd1b408acfdf34 SHA512 b05e49ed145785e29631d481885788f0cc5574d4d7c4d90280dfedaee7f8c1515072c9c4cfe6bd2e017230cd228157222af7e7d41a9fce697cd1888095df4de9
 DIST const-oid-0.9.6.crate 45382 BLAKE2B ac27c689784fbb1f486cec1c17502c8738ce3d7d1b579391a151cb0f0a6a0c8335e474d0a517c59230fcac74317396f20ac15d66e2f6685780be01dab197fd96 SHA512 b871d3b4326c4828b1c1d7a3e968315fa320e0b52e97081a95617ded0dc5b93d42b3f79ad26ff3b58a4835dcc442473f3965c2b60026412ad6aacc0c23e9f399
 DIST content_inspector-0.2.4.crate 11386 BLAKE2B 2393cf83b2dd338ded7f5acd695e05a4a08fa639a52a8042dd0692be5e959cd1cc670472e25ca696a151d161c821eb899b2a950c74f4cb5b880bc42bc53d1d57 SHA512 1acb8b4f12ce3479f5a60b7b6a0c05b86548591e488e7be529c4a2f9aaa60a76ed07e7ce1e557664d31ddd9964e7f73415ad667cd14ada919f61511bf486ed6f
-DIST convert_case-0.4.0.crate 8098 BLAKE2B cd038a7b0d52a9e183a96cbd548a8deefbe0c60d6aea15d7c6f92a4bbf991444d401b5cd3c944f3d37019e7e3db2a648e321402e13803768556f32c08ec00084 SHA512 e17e92b94b030e39f368ef0dd0288dbb45f77c8ce3034c1a6fd2fd43f38cf10a1af5aa7bebdfb447c335d9593c32dde7262e13f97c271c419c6106cf47dc01e1
 DIST convert_case-0.6.0.crate 18675 BLAKE2B 5e5ab159a61e68b801f1c95dc5336f3af7ffe6fee212c8ffb9905af1121f0b272b234b4e70a30f29f5ed24f4825ccfb59722057b69549fec0fc3472857ee1ce9 SHA512 3b17449195a9a36e3965db89eeb967979c192ad7743217ea08e8c8b91ecae1ac1674362d05dc6f32f1f361fface3f783398285bb78060403f65a777a9d29adf2
 DIST cookie-factory-0.3.3.crate 19084 BLAKE2B 795a6f0cd4e93fe8ee257ddaf1f76852499137bcfe47d25e3188f3822f3d92b191cb9f3894163de39386584fcb899ec01d0cabe5757f534dfcee9fa28aef8132 SHA512 25f79e74be133b780373c1277a00538d9faa19b77868d62b16d60037d4890b57aeba2eeaf52d78d3f8523285b033e88b680195a67ba5bb8ffa7c0ffb2070831c
 DIST core-foundation-0.9.4.crate 27743 BLAKE2B 5b695e671cc833170bc6bad436b2d0d8d386ffb8181bfcf2e92a1d93cee67c3ba1768cf57064fb91b0897c6aec1be7db40b5bd256a052c1bdaf872ec19f6e15e SHA512 82d0878a1b9e3d56b3666fb5a78f92c6f7806d01665c242c06a640bd6b1fd36260211e92dc05e1a16d1430622bfdd650aabb0b5bd8e5592f74abdcf412448e33
 DIST core-foundation-sys-0.8.7.crate 37712 BLAKE2B 0e1dd99a5bbb0fe92f55181a37426f6e86445cb20e355f553b3162c88ccc075644461731a0cdcd93dcca65b6cef1de62b409afbd73ba3070a199ab8e7422dcfa SHA512 17492d5314db03abdb3b1998bf0c396ec8ed0f83bc978ae22d6026afdc86c50b58cbac073b3a0d97b92da7e98be11302faf1249d24313494bc058add4f4cb63a
 DIST cpu-time-1.0.0.crate 10003 BLAKE2B c2ceeaf71c193f5372970ced94bffc807a651a04646b58ae2f2a40db83dc775b214758c66883d4aecdf4143f67dfea50c07543f48ca5e764648736d8d81143bf SHA512 ca368add3f265468f98ab2f8aaeb9703532e539d164c632721892b006c284f75281cbd01652742fe17a3149490c83f247cb61176111f4091e907ac502b4c41d3
-DIST cpufeatures-0.2.13.crate 12999 BLAKE2B 4c49e01e91fff33c61bfae48a07a9d76a69565840f5a12399a3515f6e6808743dda0d4c6877feabfd276bdeb05c285daa3bce6062a87cc3da50bbe3b6c0fe1e3 SHA512 e961ccd9fc001cce661b6360b18abc4ce2daa4080eb5fd84dc5704d8d5ddb6ce6cc66b5d42440bffdda03137af9c5ba20b6793130692168e7e28729841c3f352
-DIST cpufeatures-0.2.14.crate 13165 BLAKE2B 45521d1a4bf2ddc03c6cdb9ceacb900806a03748fd122dd4431f6927d06cbf8608f9830e312b5728dd55b5084476280669129ea80477432fd04fdd68a0e50fb0 SHA512 402c0d6497c65882415841b9eb5953b1dcc1cb35b9fb4512801f3d0e2a056ca95bd32fdf70b6e65a18b048d7df8892c95fef1de975b56b63cfe45460783d5867
 DIST cpufeatures-0.2.16.crate 13405 BLAKE2B 06d061cb2577057bd2afbc8cd6783488595701dbc46772533645d86aed71ba8b20905625b897840c90aaebb41360a286935824ca49bdebc0763a81df4bd64402 SHA512 97707ae1b533ecd3a6fe412a22fb70cf4ac278c2d7dba407fa7dbebd110d06f88a7b3aee3fb7cf4b0b5ca88f6fecf390c4d3e5ccbd4d18a75fc2f93a647e7074
 DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd SHA512 c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266
 DIST criterion-0.5.1.crate 110088 BLAKE2B b99018b6a6f97fe47d90a2135e3d483ee624d43088d7881bafb2c35ba385629f1a4353110bf190c04903abc4ee99ad1735bc9c5afc6c2854a1aa9221fd714617 SHA512 6a1a32437bdb95f8472bafb5b04bb5999a6ff6fee4ca5965028ec53b4867d01b529241d01809a003722ec7d5710c323274b6f3b50ca0935919a9dee693f4d3b0
 DIST criterion-plot-0.5.0.crate 22706 BLAKE2B 28a50375f2871ce6f168aafabff46f4368bf55cac379c67a2b4396403259372759dba3355786e695b566b1cddee9091a469755a04c06ee949f00aee8e9a28699 SHA512 971e96dcc64a5afa7488f1a99475f0f5639c0ef63f9eeebcada351868697cbff397e99827cc07c0a52e7d7d1a87856fe1fc48c22075776b3bc9c94af62d79f14
 DIST crossbeam-channel-0.5.13.crate 91174 BLAKE2B 7a9aed6f4922c1d10e4ae12508a03dc7daca773adad6a317c4ea38e544d7c28c56a06623d958aec540fcaa86fa9051a1aaa2c859dadff72873f18f2f3a951449 SHA512 0f31223a7099f84e39e6b76b19cf26736e0c3907fffc2ed3eb0012c7984b1993570bf6d155eba5bfb82897ef0e4fc93b89096071410bbac256ca6be9a9568ff8
+DIST crossbeam-channel-0.5.14.crate 92728 BLAKE2B 0da1bb0f0dc6f35c4ce8d4bb058d61b7c3ff4854f71b58968edc691c1d7016ec845f27e2fffa34835e86f19fdf4507275b013946b2fe3135dfa83d328ecb5199 SHA512 ab3448f7adeccab3c1d988746c3db1fc1e8854a53f7b5cad63fb7874e5b6f5663d34541d4c5383472db56a7c8b272fddfc78ea2ac1792a18d6c8230dfbabad45
 DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864
+DIST crossbeam-deque-0.8.6.crate 22471 BLAKE2B 02b854df171b0430ca8a40349674ff251698d0c322c317055da8678da6661730c945d86737fa4947c3bd824ffe402271ee2f77fd6a505d2d46b4a41454c510c8 SHA512 9368c0c224c4b84356f1d422d8869a5ab4bfb36b0ff69244a9e7a7304ed51f034001cd9b2bc35849df874d36ed34285c66574943573522ea32bbdc5a05df6989
 DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2
 DIST crossbeam-queue-0.3.11.crate 15581 BLAKE2B 91b9797f985af06c854c38b8124cb67864bdb47979d2e253928678118515fbc1257108c7102bad66e1f65fd6f324a93749dde86b4ea28f3bb5a16491f3f56ed2 SHA512 c6007307ef9d219889e6244805ae759998396e1d0548e3664ce9ab366ea78917dee75251c4265b0e3ef4ab15b5c6d42d6a5e9b286d17ad42ec169e7fcddb8ffe
+DIST crossbeam-queue-0.3.12.crate 16270 BLAKE2B 75be9d53340ab72e5e52c940bf6ba5dc417d3245fe18c456ca68b460c7747f7d99340517fa1387c7153faa8a0beac002fe3eabedc8638d044e0c05f4c5b98d56 SHA512 a117977e55c0c2eca2a6141e3292dbc75ae5d80c087f0667cd767b9e9ee0f9c87084ceab34937b66b28a586b071e518a483684bb041e6410b2c3ab5924bef769
 DIST crossbeam-utils-0.8.20.crate 42487 BLAKE2B b50da06721cfbfff07825574feada8a28d3814edb218434288683eec31bddabe2ffbf7e5ef1281ee14a8a77c56db3b66f3c5ceabaea9c72317c1bd2cecda0c26 SHA512 7175eadf9fa7c526fa11ff87e40ff203f0e7a4bcec15cb972f924f3c7ff7cc20b6e2e8dbbc1ede142a0207cd2baa4f446deb25d825d28a54cbd25c263701bfaa
+DIST crossbeam-utils-0.8.21.crate 42691 BLAKE2B cd9015c41f532eb3c90101603f32d383f01e6880718b727d6d1fe46872ae276cda685e1b548cf77dd22bb1a05f0d4c4982332c2bde90e1743dbd7f51919022a7 SHA512 6f4aa7ca10c20da291c4714b56ceb1fab1c06b03b2f4e28e474e9aeb95ab6615a25462dc7819713652c3b5f6a06fa0f24ebc92c533fcf35dfcf2655857d975f8
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST crypto-bigint-0.5.5.crate 83384 BLAKE2B f688f22331b4b3620299ae9b50aa9ba6e1b2c7a4ae55e4236f7ccb8ddee4f61950ee0332b6b67005bad505434f3be74b1a0caa426036dde94162289c6926c8d4 SHA512 04668d432b4169154934d55b8ab14f708e59f70a70704b56cd72ceaca460e15589965aa92a22bef20b32ce637a423cc6e1a8819dfba38a32353bd749f7126021
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
@@ -166,16 +138,12 @@ DIST data-encoding-2.6.0.crate 20769 BLAKE2B 9d5713e63f6f6a4d6e5324fb0be9308a231
 DIST der-0.7.9.crate 85173 BLAKE2B f2dcf402e3d8b6a7ca818a8f260e0996290c77517b06bba8b22849c4d0e0c8f3dd57d664a06d9a7bfb1da6a39abd0740cd7d9776e75669aa970cc3ef63f924d4 SHA512 6de996346365647ac0da23d3fa9c72100d665c9225dc2f0bf1f553c4f0e7eb5c6acf3f1e36a11a7cc20e8b1c44752997e6f592c1d142755df145c5e302800f5b
 DIST der-parser-9.0.0.crate 63191 BLAKE2B bf969104ab390c0bfe7b908254fc2fbd21559e3db0d042449ab762e4ad0ac24455e177da41abb17d457bae590d76a6e6f3b2cf4c2121bbc07acb3ddcbbaa5856 SHA512 cf7bd2c0ccc89622acb945c60d5c0a74d181214bf48c469edb679491a8143310a48689291c261f00ce8982c4be6b7770c39ea00b45b3b4f65526dc54e1c9c0d2
 DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43
-DIST derive-adhoc-0.7.3.crate 52230 BLAKE2B bd49f168cb829c9b010233fb05780abf1484592335d183342649ed0baa0e153dec4d68bea6bd4bb6929a88f9b71c25092163495a6da5f50c8625653ead56fd36 SHA512 c4a46eab68da2bf1782c463b060b2473117c11b9a82ed266f91294ffdcac625bc5034820fde12da127c373c5d14e54f1c120e8f0b02b6cce9111c5499f1e07d1
-DIST derive-adhoc-macros-0.7.3.crate 60290 BLAKE2B 1e94df97f58103df49c8cd3b0a46c0c3eedf28c9058b139d500d6e96ef323cbcb3fc31dbdfa1ae0f8eb2e00382ed85e63554f18d98d612ffc8a3b3e616c7e003 SHA512 c5e1a67c6c787caa1c735e25a1b440274d7bbf0ce693df15c6b949158605396b3d3554bcc8297b2cdb4bd036b4e458abd2ec2295da903dcf1626bdf332b8f2fe
 DIST derive-deftly-0.14.2.crate 83169 BLAKE2B 94caa90d9912ded1f0d9818b1ab0f45ea130036171cc163d894784ebab3a1cebfa45ce93663a03f6cdae5168b31000323b7b43660361cc6f18be962ebbef372d SHA512 e3edaabdada5599da041624e069ed6ebcb7fd8c4489df7fb3ff63c63139137e24f0cd5bd10077bf9b2473d180be2d64665a0a43120dfcbf49bf708f18dabff29
 DIST derive-deftly-macros-0.14.2.crate 95095 BLAKE2B 6d8c388e78280962b83e3fa7f43fd624a977f9fe8628281326ff262cb6d308199a12b7efeaa0b06d13bdd5fc2434543302d3ea567b44753444c993bffc390794 SHA512 c4388c0105cec23a264f9d775038486e42c0e09d634021107252350748f752ce5003d7c52e27289d36d48fe7ff747c6586b9322fcded466294a06796b85e9fdc
-DIST derive_arbitrary-1.3.2.crate 10614 BLAKE2B df96dfb9000a794e3ee6e633ab527621d321db8006221b482e944d58d4293c3f87f6808af4784c53c06b28f3078ec9be6860e3496d6af044ad6d71db35310dae SHA512 5ff36cdb5fdbc1120442571b21405bca9dc3e7a0c0d6f0b4996fc71be0553e1a8cbf2626457c55198ecd9c66d18dda66909823e7c6f1f16151b5d05e1c69d201
 DIST derive_arbitrary-1.4.1.crate 11521 BLAKE2B 47ab73cc942314a65574d2ef8395dda33361fcd1e33ccdf37843a92b0a5de62540277e6791991ae54835ba4235a9fa504cc8f6d43cbfde20f18f14b70f84defd SHA512 0d499a368f9f97b0a1a52f17fd111109b071c25c2732c206c96485a7a753520ad706320e5a817e1a10e5f8cf154afc6afe0ce09f9187d23b4e2c2ed4961afeb8
 DIST derive_builder_core_fork_arti-0.11.2.crate 31064 BLAKE2B 1e2fc6de858d9f48325ba6cf5beec5342bace2bea08213f5f9c7e94505435ed1c129b493f8aba4dd59b0b66f10b6832bad7144ce56a8d7fee3a83f8100920610 SHA512 5f62dfdf43ecfcb02ee49538233d8a9600b3a4042ec79d9d0476b11954faa5b38d5463d7825ae70b9738421941951da7137a4035b045de9684b403562322f89f
 DIST derive_builder_fork_arti-0.11.2.crate 35894 BLAKE2B deaf01f4302b5c04a8dcfefa7f4d0ac7b2f0fc58a399d3e50a08a55e23e3552218013ae64cc8052e57c30228622f3b7951dc3bcf5c15d1b6c4131cb15c244670 SHA512 db5fdc656a3c7d235e2ffd691d4b056538fbbf871d1def9850046e703b58f67abd3d8e49fc2815435f3bc9ae1d1c0fee789cdab77e02ce7b08172687080834a6
 DIST derive_builder_macro_fork_arti-0.11.2.crate 6446 BLAKE2B 041b0335a9df2948a46199d4451e8607832cf13467b775f31d4615c812c25236d593fc72a67868cdbdc57d8359b6c5faad8047ba016635874c85e0dde547f20d SHA512 9f97c56fc1ba89e54d5a904d23da16901a9fec6ddfc52356f4b6905cd1aa5ff4b3d9f49a8828ed0b1f3c37e9a2ccda8e13e212fd91186e48e0e56a01193e11f2
-DIST derive_more-0.99.18.crate 55013 BLAKE2B 989e22daa6592dc38667d9a9b6edf73c6772d57e2e925d3f86cb079e4107f88871133f47c2aca06f61ebdc510f916d396b14c72678340ce50db9a9f28cfed252 SHA512 e4d157525c408d32f62b11085f0c49c213c41df58b28bfd59605b86172c00b258f477c811dbbe141a5c12224ba2e9f4c696800000d8ad2e330b1a8d86122d5f3
 DIST derive_more-1.0.0.crate 64854 BLAKE2B 4df45d1cbab6a46d72f72319b346f2f9f2d8006a404959d5811038a2c7719099a055763d3744704538cb32fbc79534cee2320dac321d6b9c5fded090b6936e0c SHA512 94f95fc1df70b57e40ba47bd3ebbbe75d475555fb1dd7e5bca460efc4edbbfd8e2403cdc109be90f04454d379c5c4c3d6b6b1dd9d9276049d32bc72e7bb1f954
 DIST derive_more-impl-1.0.0.crate 76182 BLAKE2B 8c7da3ff4737d21808d66c355d967a764e589f48c24cf7b08f82e771bda4cbcfaa37fcfe74d5a771cb0307a5b818909efc5b71e6cdc283e84611df88b7f66489 SHA512 12ffa53bfb07d24c601b0727c2a59284ded615e9bd83779c5877943c766b661aef13fcd463224cec7d3bea95e5ce3275df58e7d2562b4f40c72fc9b13de82caa
 DIST dialoguer-0.11.0.crate 31286 BLAKE2B 612c7b9de482b48df6404ce31b3d9a8afbd1c8c42807f2c3bc343bd3aa16c359abc95bc879304f29c6861c93101833bf5da036eb0fe85f21be50fdc3a771f447 SHA512 7124e9943dd4fd4403200357b7d26683e7ea709ad9b0251af5d6db4dc8da2a476c6b89e7413df3a90e4279498bd54b67d8d0b161b0e5ae8ebd0bb5b5276cd612
@@ -189,7 +157,9 @@ DIST dsa-0.6.3.crate 25991 BLAKE2B f8db8e4eac2b967206e0641f83da560de847e59cbaaac
 DIST dunce-1.0.5.crate 8244 BLAKE2B 1499ae0bb3d34e8d42e97eaf551308efc95697366b804dc83c51171a939d45bad46fce9f82a39e17b6b92fc833aecc85eabd2104823c7db30396833388125728 SHA512 36d7d75217d629185a9a9187f7d2e2dc346a28be0ad1c21b1b6bcbe3991e9cd11797e53d745c0b3b5ae94cf1e4cf141cdb2322bab86d97cc258b4145e3b97a56
 DIST dyn-clone-1.0.17.crate 11848 BLAKE2B 1f90492639630036e1e877537328e46ee3fa697d85b2f87c45990d4a51cc900a6f604d077b16575015bbf0a970c26f898226e87e6e2af82d624f5fa565036617 SHA512 b51fee8c4fa3c6b0bc677e9997d4b6921bfee9a11e369eedc649d19eb5d95d7872b533b37fb1ca842c75e714b46afb1231369341c45071db94f09b53e37e03f6
 DIST dynasm-2.0.0.crate 104802 BLAKE2B 40922ab676de054e8ab10bbc3c42dc17f460730d1470420e57c0da0841381a72e38c548fe00ef531d13c0e64437617bdc4aefbb8a46de77f8e9c0e63f2ba452d SHA512 525fd83328f50417f67174a5b7093787b896fa8e9e68def589f87d0d8e3b74b02c1448a2a1fcf6fdec566895536ebf67b89172082c655e854ae974234bb8df69
+DIST dynasm-3.0.1.crate 106895 BLAKE2B ba89cac0d31038fd3a6627eb6c47553505225d4e67d48fde49bf07a2cf7c51fb11b106e5da1dc3c70b12a9ec0e48871f2105ead1fe3711719b9511c1fec0b89f SHA512 a112005b4f13aaabe549cfc8fa0ebb8bd2554d806fad1997e52286f70d48297900a413f0a736f535fb4d2045d6f7c762fde232c9e7f313143e72b48e2a258457
 DIST dynasmrt-2.0.0.crate 22144 BLAKE2B 85d18e7cbf2f062ffcd8f708c493e84809ea3c239ce02a94dd93e87673bce401037bbc6f0a935243bc4f48d99973c07a8599f85a68a6f01a64b6fa8f1caf976d SHA512 94c6e4713df5e37a5d1fd05e8f6ebfd649208aa3b080d53b8ce5f7aa79c5a5813127884a0e61b0c4009442fdf4a71188df7ed91b28dd1f6ab48a1fa6d90afa2c
+DIST dynasmrt-3.0.1.crate 24172 BLAKE2B 3bc525fc7e2c1d9eb833a0120f845ce994e9841d831f31cc1adb52a4821536cd5b092f61083cbcffed21e6aa2d65b08065f9d72c00af0b68650ee12010bce9b2 SHA512 533f5ea0c3f4b58a73e7d5034d9d44acc8a0d671a4ce5eb8013bccfc70f6f87e6ecf0ad9db39e5c88cb1a7bc0ef2102e9e63b62cf23749cdcfedc6de92655afa
 DIST ecdsa-0.16.9.crate 31406 BLAKE2B f827c0ea9f80555a1c4e37efa3509ef57bcb8c2abbefac29cfd85c3904d82495753bc5917e8e2b8659bd091d73c2d57bc2f6c8477b7d5d44ab858bd3a99229af SHA512 c69f921653a3dd47fede16aa886675c35b082c7b83486a6fea2c39cf2f98535a00263d7f0e68c5593d16b7cbee757ea913060bcaaa4c69884ca6fe2d3b149222
 DIST ed25519-2.2.3.crate 17802 BLAKE2B aff96de3343d0cfba058203e90b6fd2c6cbd24531abca3a37977a1ed2f1eff0f4d4b6decbfcd9759617f381f88eed32d78397e6fa8d310b99b98d603b809de44 SHA512 3bfbfcd7f442dbb6d49860c530525bac60182bc57f6778e4ee097c7ace9c6a9d32ce430339ec15931070a538d3bb1e1f7b1cf572537ffb782bc5551fab49b2b2
 DIST ed25519-dalek-2.1.1.crate 85736 BLAKE2B 77dd4019467da3dfbe574ceb574849ea665ffd8dc91660f6a9b2596fb886400508bc632dac10a06461f35fce5400f27b89b1270514188ab488a952288309beda SHA512 a3e3838a3d4eef726b65a38196e66456f586b7e29cc328eb243bacc5a247b50f10ce76df6259aa102a08ca921f07d0395793088445f36de33f5dc1aae5223ed9
@@ -197,33 +167,30 @@ DIST educe-0.4.23.crate 44244 BLAKE2B 4218f50521f2dffd8907a4ad5c9b4a1fda8bea353c
 DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
 DIST elliptic-curve-0.13.8.crate 63198 BLAKE2B 542536886019beb276b587f906c5552d88229eb06364d93db5eb6c93f70555e9e38e4636bda14789e5ba5b54321c0c6da85aa8d584e638fccda107e296c4d8f1 SHA512 64ec7868cfd2350f5a0e9f4fa7e2225b7f5532b8514ed6d5b8a7718f252f94caba4acf51b2471ac59717783289c9f2ab35d47881210ffbdeff08a85f68ef3042
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
-DIST enum-as-inner-0.6.0.crate 12079 BLAKE2B fea251b187470b6204f686eede8d9d2fc3869a396d50051a45c72e3628b4d893a2393760afdbe14676cf505b1892ff67846226ffdc4a23f59a18b2cda1a2629c SHA512 c06e0bbc43068161a07a8b34bf1382311273cfc5390f3fb4c90b758d47cf49baf648f6bb277770a983942f7d2effd242bf1f6eaa4eab77e7f6f4fe9ef6ce188b
+DIST encode_unicode-1.0.0.crate 56986 BLAKE2B 76e8915408c26bdc909e9ff2d59a1655344dcb4ca0e6accaf038434b7518f1b86554954fda8c7874285924c7d16cc81f62e68afcb8b0efc639407b558df1470b SHA512 c9a21d48ba9d50750789cb6fbe32afd903c583c9ef05a9741007dcdf64b1344735f71dd882ad71ab9e5f96f8839578ca53bca14d13d57b9e27b8cce2cd507359
 DIST enum-as-inner-0.6.1.crate 12190 BLAKE2B c2162a838bb717ea7859d5c11ea820aa6bc79210bd6a9e06e4f05bcd17a3c92bdb7d98453d58911f96dac79bdf553730b58d4949d268321aeae324187602ae09 SHA512 e6f80a4a47f5901301debff47f1e88291ee6d29dda2805373ebee62f77c149a2c7f8d1188f8a365f2e11f5497025036aae4a4c3a7f570928961d1d25d6caabd1
 DIST enum-ordinalize-3.1.15.crate 5783 BLAKE2B b36aa380b1544696543f30241c797805137c745329d86e659b66d1e6238601c923704177b622bc77c2ca9039ba1bce6b1f052b6bc3c009e721073ab1faed7f92 SHA512 1cf94cc9409316449e7ae0b8655c5bdf30687e6ba446f52adb72f03836a02d1cc3a674078cdc4aa725cc780390d3899a289187f67e38d854a36e62579fba6644
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
 DIST erased-serde-0.4.5.crate 25459 BLAKE2B 0745866c0780b8635861ac9c6bc545742d5b1abbc7a42e299ee5fc7092803e709892987b2a82b293eea5a610b410602c5f4f27be3503b7467ea71eac01bcb028 SHA512 56ecd1be8f756a852102eea15d6e79b6c1c5d39c87cac0a5595d050fd3a62fda6b2bd81b9370dbde806b3b1b1c664a994f968b418212d0453b47a458313968c8
 DIST errno-0.3.10.crate 11824 BLAKE2B f9976b538868daba3cd2d47ff2fdcda16b4a436ca767f865f23d1139e7f232aba263dd4aa38d573442c762999c8a8beab8a4a8c10649d21b49090fa65ced1ec7 SHA512 fa4b9a368f254cd90c6f69f6883af4c579829a6da6f31481a1b527ac9602c8ffcb5e9518cdc32c39b5589c151a20e75a7300c8a907d178346185ecc6e8749f3f
-DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
 DIST event-listener-2.5.3.crate 15392 BLAKE2B c56ed5eafa64014141e869dcf952e86f755eb35ed1722f8139260cb502ba226351ed1bea301618e94c9ca7f3309747057eb5f7d7986cfcdb7f6b79d13d52b439 SHA512 ddd67c1139ffe2aba95d763b73db0e2a9985dd2e57cf8f72030047d53d46d833df4b4192730cf0af4e060ce52e4f2df23aab6509abb94a6cd02e0d8cc3559d22
-DIST event-listener-3.1.0.crate 38793 BLAKE2B b26a13ca1172531145e8ae1e7990beb8719b99828d38ba3291b80d0bec59faba38b754debe3f64950f587304986ca9bc3c8edc1ea1d4323f094306943379c046 SHA512 e341cb624bfbbf0c58ae177e6a0bf462a7bbccdfff839f04051b7bc6338c6c504f3c6593e69f5cdad3592202e11979fa0b9986794272856b746ffdcfc7fb3154
 DIST event-listener-5.3.1.crate 42576 BLAKE2B dfd8020527c06adae338e9bcf19076e70ae745facd7b49e8d6604e8508436b70b48fb1f4479214998f288055447186d4ef4969630af90e301103bc5faf6492e5 SHA512 98b7219a3959d6225ee5fb68e8b9d284ab03334d895f52a71f673e59cabab1d06a0abb9eab905e8d38d5f9589725c7c598355ae3c909044a23bc5830b761f5c0
 DIST event-listener-strategy-0.5.2.crate 10697 BLAKE2B f49faa8a2cda551b65e29b9dc98e4e55dabff7f2b330097bf5f6a5a5927804a99cb699d1f693db9c7cbd92ecb44f6c1b51be2b86810d3e3fbfd5eebcfad1a241 SHA512 7b3759d07c7936b53351172e38623658cbe642f079426c99e7f9187ba1d7f8cbbe7530c056cc760909cda4e70281a50577caa41426164b4c8d6c3f4cbddb2626
+DIST event-listener-strategy-0.5.3.crate 10920 BLAKE2B ecfa6387d9f09ab8fc6d7bcaaa655fa69f7d732bf40c16549b12074ffd25b1d9e6ce19f7600d1be615ec72f5fbda85d0c9e0a19bb5c0cdd9020c4b9515d9f778 SHA512 f1a14f69afb9765a317b3d7bda505a28f050a7594d6b07e5263d635b806d494ab41c456dcf38ca924ecc0595be0f77e32ffe239107fce1cc5b71ee7249419f5a
 DIST fallible-iterator-0.3.0.crate 19639 BLAKE2B 58b8fe842fd6514fa4327eacc81b157a4a9bec4ad9b8e69248c0f0aa5610dbddb9c8a72e6e6ef9fb8216e8f79e6aab439e90d4d527e35634ab222347cbe39974 SHA512 c655918fcda5deb8ce792708509e4959139f113c1006dd41b94d7073ffc204512a22cdeeee05c87534db9c414da3f4eb716e1a26970646fcb1c139a14eb8a2fa
 DIST fallible-streaming-iterator-0.1.9.crate 9249 BLAKE2B cc4459b34a9ad00552a5248d090d1f25804b92838f41131e475abb83ae0b89401248feeb52a49dbffd499ccc0ba0f2f1d044f2f3e9b06662be01fe2257a4e885 SHA512 34824e2007cb944eaf54b10d6d3885bb17ef2a2976c6dd7695ff82a937cc95eb65d343dd7a5cd2fab5aa5859faae3352a9e1c78f239ff736900c1dbc3f5ef7dc
+DIST fast-socks5-0.10.0.crate 35324 BLAKE2B 6ef150dc4765fa5e3aa082e472cf9221b03b975e954b6d8231e38218904260eaf98c5d2fd9bb3a13dbf9e912495753eacc43894468a010f5ab640fbe789f571a SHA512 cc2957d0d8bb48b29428877876b577ef194eeb5bc84b1fcffa7e3c435e5b3c5f3a7584585758883a86c1bfbe21532314477d9bf9352921ba46c7a95630e65244
 DIST fast-socks5-0.9.6.crate 33144 BLAKE2B e00f1b0e46b96bce36feca57503a0100a38c6630025b62ce80eaeca480407169da1201c1456963da5d3388fd2ed3acfd2a8f9bd76dd765ec99211f21d52d723e SHA512 05f0a6e7c41963788a91edca7ef13c2d71e99aa7d338ab8a52e32ea7600f6e51b9752f1092ecacc233869fe7c419de806ff6e98284b645c6697ce2093dc1fb9a
 DIST fastrand-1.9.0.crate 11910 BLAKE2B 570c66ec1d4ace08b9790299759e3b6f0394aca52c4ec2e02258229c198846cba7c0627807548bac3ef1f86c7e512c4bd105f1e18e35ac0ea6934f76a6838e1f SHA512 321567b5fad8552c0efc4393b1e77d1bce288b0a88c475d432f79e91b3457ee6eb5db9e4d65ac6381b9990c9916f4651b6a76250df44d51ea3e25bd8184bdc52
-DIST fastrand-2.1.1.crate 14983 BLAKE2B a4535b1612b103376fe64d71a393f7bfc37668c574d9122ca90a631aeb91cf0895bb030e597b79a80a4a37ea4d514c4c0836332030bb10a60bd971573a6d6ee0 SHA512 9a51185132c1c89fc31af463c664e996f431e607ce96676b8301f28ff11a99661d18025dd460e3332e373af68d20017d96481719746fc3c5de742d08d63aba3e
 DIST fastrand-2.2.0.crate 15031 BLAKE2B f3fe05ed1acfda1fbca7ebe3da2b26d05a35ab782db693ca58737dad537c53d16142422a04d2d55a6f9fa9a76abe4454923d85f6948601394f39cea5c90e835d SHA512 de2835aee8d5380a6e1c0f627a876594626e1379f2f7dbd3ad0f785d7c3f3f82162c9c20a68417324506f78264cb9dbcfb2d4d5dc9ca666996150979738822e4
+DIST fastrand-2.3.0.crate 15076 BLAKE2B 15c9a1c4f64d94c4bfd38ae139c6fe19b6b621a495c1b57209edd6d76d978eaf018ba77f356b5086c3f462a6de044fb5e3b172fc288309569911a17ec39951bc SHA512 267fecbb7459c8840f03425733d278dd6c4e7637b85b99552877117ed5e8015e094d86aa95841f77064136b7f382276c3cb2c2bef7b2881d272f4aa57c5cf947
 DIST ff-0.13.0.crate 17688 BLAKE2B c32379ebfea6cadd162dc169e0b413577fd191620f4f2a1c7d18e50ddfbe561ca865bc3e0fee3be287f43f6c9f2982992cbc56629889689bcbbf652e512da80b SHA512 eab19938f5a2cddb0fcc78b0724efd788aab7f17f04c482e0d06acac4d1cef2bcbfc74d6e4b2d9f535f9c955bf39c2153e010bdd2fa72d6d637d44baf8bf5f63
 DIST fiat-crypto-0.2.9.crate 495390 BLAKE2B 9201d3faedab8c73b606dce70d65d1138f5fb29e480d56b25cd66a8d2a150fb6d946c9e0ca98eaab0227490cea288b4c78917ccfb6693022d70d74dee94e6e78 SHA512 d916fe8ba3e82a365d20485b93c36994363059dead84c0266b7bfa0bcc74122d71b4a5c8689226c0e1007e7e01fc6f6c76e8687ae14fcc38f6f159287810f510
 DIST figment-0.10.19.crate 70111 BLAKE2B 3f985b6a9d03d61143bef1c3eb681944f90e1441937f783bb49c00f1333da9b75952554301ee04e1f4446f131d656c714be5795d93537011739c16ea78e84feb SHA512 1b153903f54c980451d013a145138b8c4254796014c19e6bc096927d490c96f04bf0a2266164cca3ad3a50322c07b3ef41831e317d264ae9273645e1e43ee095
 DIST filetime-0.2.25.crate 14940 BLAKE2B 1ffcbad3b2023ba5e9b2d71e279fd8c3564458b28290f3e19bf43b87083e1e3c0e18f191f6dc67540baccb83075df453950230089f243e6276e413321cceedc7 SHA512 90b4f3c4df29a3456c393f78f636d70f2615cba748a972dc9b937c2fcbbf4544f5b0d28c6c8fcfed5d5eda026ac670afffec18ab7d7127cee9afa2717146ccf2
 DIST fixed-capacity-vec-1.0.1.crate 14879 BLAKE2B 03fb2e1df04eac104e79f92a0b59c3ec49b25693a5f69d6f5bdc9b2052d3eabebef04d4b04472d58c628e1e12fb76db8444989b06d470a942c3ddc9a66c09a32 SHA512 976c5dbd2f54534219cbcd4eaec1d14d1644f6cc8bd608a14ae63a71d31f72ad9a2da334c00b7629d0c9a62c5e2f83f34f4e3df0350a1ee1a03d698d26af962b
-DIST flate2-1.0.33.crate 108838 BLAKE2B 9fd23b3b0a75c29f750c873f74de8565f0d8f3a574c7d28e11d15e6c3c4686c42ba98b5769a08c21f3b9c6ffe7140196c3e7001153ff5a046ee7af40f7f6d965 SHA512 59a871137518586f1d66810528595acad5ca763ec5acc100098a372194f55f33b48e59c0806fd237c644a6d797b5deb26c541fa871a1194ee3ac725da3b6d134
-DIST flate2-1.0.34.crate 109174 BLAKE2B 70fb087904e1e29243facbb9a01f05770581d91d49935290943797cf84c3d2b416a8f78b2c4f9277d86053f1bb79e858ab1d5bac427bacea9771fe1998ea498b SHA512 0526f2c7c061d57f5a39fec9726c547848f6bb36dfc977497c15fd42da6c300bcd332278c31e3acc0a72e897a7161f03deef61e95e072bf3cfe5b0302b5f98f9
 DIST flate2-1.0.35.crate 109188 BLAKE2B 8bd6e51c3bcc06044e5b8d7ead950c3beab6c6337052fd48e86175f0fc98c8d12804274308ee515dc6156bbedb2277dfa2706cdcd7baaf2a789122473248486e SHA512 aa2c4f0ad46cfbc7d2bfbdffd226eaa37f5223a34d132d8fb2dfd04c20d15a96c4882cc377fd72afbc7d13e512f5e9934386b0390a0ab2b171d081335c58fad4
 DIST float-cmp-0.10.0.crate 10702 BLAKE2B e1285cdaa5abc561cea8916bb89cb022da8574faa0070d05cd4ab7537b6e429220ae9a11db2ee24551a52eda5b541c157b8d18f00f27458bf380b45df6f20f00 SHA512 024d6cce0c16f56e4f42381fecff1f3c6b9f960d62e81cdd78b1c77103dc4bbac11c5d656d44ec5fcb644edcd7b9c1a905533df3d758470137e48e3dde4633c7
-DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
 DIST float-ord-0.3.2.crate 7683 BLAKE2B ef9b6d27b92f82857974cb790156c2e7c8e178728c362d60db33d0a01d4a015a361fb9572c96ff136f4f93d0966058cbc70db9b3e3d49fee6df660e71c3d3e0d SHA512 a2f3a5745f1b2a0a9f9dd44d72baf75bb61009916fbd72839eaad0de3f7dd5f6cbb5f1eceed2206ff948dff4c79787e31ad10fb00aa91d2530d20abf38b34c1c
 DIST float_eq-1.0.1.crate 23293 BLAKE2B 6eda7621be0a0d51c8b55e14067dcc5e9ee569840f3642614d102510a7a7e89683b59db4dc9930efe2f9785860726babb6b1a1aa1b2f0087da9f84fed1f06ac3 SHA512 dd9b4adc9304d075c49fc3e1922dcc87b263de0ee6dffa1e2fc6d548b16d1d40ef2d20ece79f65b2aabb5c4a23a4f67350a0d11919c39b4897c9db913e2dcbe3
 DIST fluid-let-1.0.0.crate 9036 BLAKE2B 219cff426cd7ba7b0760ebc83c68c174d5608d9df26a5d331715340aae51eed7e0dfcec6d5a0d7f4ace3e304dcaa2bd06e061eba034fb6b36047571b87dd6a00 SHA512 dac6b73b18bae4fc2b35759598ca1cf27155415c619c3b42a6aa0cee3a030b9c1eff0f8e9825852a433e41ead8f011ac543083c3f86bb189d84ec39de1e59a0e
@@ -234,74 +201,55 @@ DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d7705
 DIST fslock-0.2.1.crate 13463 BLAKE2B dca565da8e760d016a659b7b81289034b8c48c416b326e403086a96aa4f50d6b30abe96f3026bc87e9deecbb49d7ee2b8352641f26d99dd9e9b85dfa7640d6ed SHA512 89f69658457994697f090c5ea090fed0699d032e2fa66fdafaab12d545ad6d21a324912e7132dab02e2bb1a09fc7b72d6562004c0321988a0b34332542f061f4
 DIST fslock-arti-fork-0.2.0.crate 14305 BLAKE2B 455b2056ba3d714e5e90993d947befc849c4756d40e6e27f74b7f1241583b0157217d7de774f5245afe87e3f259d651f432c2a54f89cd70fb7762c63085a23bb SHA512 f9a67df24e8e588b3b8d4892b9aacc054fd9002ce658900de254eb771c0626608365efccedfa68eaa49c3e0bddf0feeeeefb893abaeda2fd06883f6b5dfb0906
 DIST funty-2.0.0.crate 13160 BLAKE2B db6315d63fffe9f70698da0b1b0e4aea4b509242c60e6639f00303dad8d2ba60c6c1c04fe9289695b7aa2d7a0c90c31fba72656afa7ad111b77358772b14a9f5 SHA512 691e1c275b648110ef42c4adece8178cf037bad40d469780280eb2ebe07aa4b0406737c5ba02c9f9f63ee57a99fec27e5e51712e2113655f7522c8678f689155
-DIST futures-0.3.30.crate 53828 BLAKE2B 4e595639500f7147ceb994359ef1656ed096ea679409a5721c05ff84ba439fe4e82563a7cf8dca9aed4cd16b03e89ba1385b0a34feed9d4923871225e131b91e SHA512 98fc67bf1047609c8bb0763c00ab9cb39b6a6d0cb7d993bce4966ddc2492a6578b789e98095981b207ddd73ac4b1dfcd5224b352a0e970eed347537c6fbea43e
 DIST futures-0.3.31.crate 54953 BLAKE2B 4b91470d3c85b9260c734dc6be8c985f78491b599d2a6ec0d1e824b82f684cd030be6f64179f7aa7c1d1fbc7cf0c5a1bc5bd045123b73461f490d7c2b9011f9a SHA512 a08d23cdac9e162d0e6ae72bd792201ff4e13d7ade6b498cc597149b3df2062b06814804c0750d941d8b5be5d2ab4cfebbe2d08a98d875d2092bf25e6e71a51d
 DIST futures-await-test-0.3.0.crate 1462 BLAKE2B a13dfd5240d734e63dd3b8f5b6f9872c39fe3d7b4f8ea2e2f9fc66d34a9fbc69a04e07497ef54abaf1b8bd1920355dd4b03e07b0636800603db956dc61eebc56 SHA512 dd9dc8b039c450de5d24444715580625dc74ed79a5ce1562b60feab13d5e8f065a5f12d9ca08def97863d6d9d93924cf956c50e0e71649fbf20ddff0d7470ca9
 DIST futures-await-test-macro-0.3.0.crate 1682 BLAKE2B 407d98631dbc35f4c1c471d1ea1ac354503e842f38981dc3e58f6f7a71223691525ea69571e8521d8884539a95e0f0075ca407e4d74bed17541774c121a44787 SHA512 e7bac28186e414a30f2325b3ff9af6dc3b33a04153d971d1ff025500392848449f16bfb73e140ed6c3aaa8fe8a38113faaad0b214cbbeefcffa3ba6198c719cb
-DIST futures-channel-0.3.30.crate 31736 BLAKE2B 57461dbb723fd53daa07b2fe6164125508cc3901e0138d2a60da5c814ade415a3611baa45c71487f1853812282ef358c132785ff40c630408e8544d57eee3483 SHA512 689531748821529c528772a6dd0f27362078ff5803d2e0b431ee5a0ecf8787b5a15262d65d52f48486ded46b88f7a9c477ad95cc2c5a3e8f5f9b9f53f367832c
 DIST futures-channel-0.3.31.crate 31971 BLAKE2B 2a59ebb73f998ec307bef01e997bf2922556d6dea10e2e6e8da9e1b4cd05a8bcfeef01bc1cc57d79c39bbd98b8a0d26871dca5c7641a9d4e9c2bacbb3feb4eeb SHA512 87e49e661cb12c1e03a07d3c94ca9bf5954344a51fa11639a118f5a49877c883387343af54639ad80e7196062a77fa7c9b9aff9804fb1e6ea3d0eb09efc53c69
-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-executor-0.3.31.crate 17965 BLAKE2B e111467391cc99d1b6a1f5fd3aafdb86922a2d2d9e360112402d68489577527aa35f4f65e6c0dc8f48372927e6d7a6a4a97c7b9525c369cb14e34ca2dafbe64c SHA512 337e70bd3a3bd3075b51e2afe8f157902ebe486696587cc2706b6a5770478ee2ee4216aa9e155e9821ed1d02ba437cdd3abd0c05aa960378ea192e2ed39af564
-DIST futures-io-0.3.30.crate 8910 BLAKE2B c9af4290f45a9fd0839e107fbdfa4abff4f9077ff45b61054670419076f1c4508d7d560d4d86f8cd7ce146e436e531b9f5e0abfed2c4f2406c57be209cfdd498 SHA512 077acf5eab1101917b5b4b4b83347d30d533110d9a34c2de6db1411ffae0f0530f457033c5a5c14249119e89375c9f12127790b46e486dcd003a12a6fad48bc2
 DIST futures-io-0.3.31.crate 9047 BLAKE2B 667e62b50be304b68b8437d93b734a0e2433d88a3b410010ed0b04eb2bbfbc9984454c3f0a591f720c9983582c6421d7f870f0733c31337c4c518112f52aea54 SHA512 16d21388f7ca083d2c618ec140cb2c0807ca621b8c338698c367d862b99133ec9edda828f051f3f666472c929e7bf7a5cb334fcf167109c7c392c5cc60b54fdf
 DIST futures-lite-1.13.0.crate 37058 BLAKE2B e1151b6263adfc96494ced26c377eb6582c4529f1c6347c1f920623400d317f6466d11e03c1ed70dd4172c57340b13b1fb1cfceedf430e3b95879bfa120d8e59 SHA512 2c007c62294c86108eba30a850a341e8fb369892bcbacfcd4b7ca39f949bc9a20624c3bb21630706d8240e27dcc402cec542480dbae8867ff933375e4be15fef
-DIST futures-lite-2.3.0.crate 39181 BLAKE2B 0e4c510d7b640efc6ca8e8b00f4cd51b05b727ce5d25d76e317fd5aec2f515d3b1dac57e4058c323fdd0c5d125ebc4073a9ab1f2ee21aee0e5aa0f9bf2e049ac SHA512 057de40b58d5ae06104c480a0e20a0ee4a962a93af615b04a9a34cd08135359c1f49f1b61577f15277fa73e9b7a93d2a659d3203b490ca4295b88fde2316bc7f
 DIST futures-lite-2.5.0.crate 41117 BLAKE2B a1d5492e373abc8bf237812e2d9e30fcce583f3fdcac05d68aabc829f8b92beb38e47853836aeb4f660d4df3bf298a8988e65ec027a22f2c1ccfb97652411861 SHA512 6030323680faaac01cb46793b86be294f1e7d4ab062330f9f250c9862913b6a85a4038462e753ed05951c8067d8611791546c79bcb8e32ac3146b4c511be346c
-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-rustls-0.26.0.crate 22849 BLAKE2B f79edeb888184b67273c842f263a1cb909d224a22c58b8a5bd9ad3cc46b37a4e34e230a54e2b8bf56ff5952c381a3face19b0804415f5032ec1b5e97ad4d536a SHA512 51caa68e418f401930db8cb67ae381404832ecaff7243a37a08e723ed844f8b8669071b16e68615e9464f452266040b454622f76974f46d0522eff1b1c209bc5
-DIST futures-sink-0.3.30.crate 7852 BLAKE2B dc768e4ec4c9f9dfb22a20c1c977401d859072b9222e6f77978332f495cbd0f764b175a679c9d7c77028d7b56cda5e2d86188ee979c7f323187defa6a0485ce3 SHA512 1c198da8f4118d9a9ab2b597e3f7b4e1ac7094dfa547bb81f3c4148c45216ef55b309255849174a517ebddba6c874283425f1df6e56e2ba5150af091bacf46a3
 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 generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d
 DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb
-DIST gimli-0.29.0.crate 275756 BLAKE2B 092e5bce9503a337451f63706e7ae7d12a4228db6a43d2c14fa6af74640a790ec70ea2055ac84db3919d19612ee6ee0453f64981390667abec97637679ff06d3 SHA512 a6b591d48dbe93a1fa6b814759a5cb61fba0838288840667aaecf01346a3ab862fbfe1cab51b057a425ba9a0ce35c8421b28cd5195464be881f38905062f1446
 DIST gimli-0.31.1.crate 279515 BLAKE2B c8924ce351af5b8f96ef757a189f7a9be14533c024d496c62037cd4eda790b3f6282cd3013ba82ecc83082acab1b60ea80b83e0fd5f8eeb381fd7f9df88ce0ee SHA512 b9c8c11547dc7420fe936b9f32a4f5ccf3bb68d1d9f39dedffd40d631360f6e032e719d858668826f1099b8a262e8096aa7ae1f6d7d3d7aaf47934d832715949
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
+DIST glob-0.3.2.crate 22359 BLAKE2B 564b72e2738cce5311aee12d8d6147631cb571f7b96d8d3823098d3dd449bcc23ffed5a6584f8979402bef95536b0e73fe9772f273295a0079782b9f7d88d19f SHA512 d15389441e337e3fab9c30102fe7b4b1b3e68d8cbb5d14162d2fd7e7d01a9812b2d6d6d2a24a60116418be41e2075e70becd6994c13b34365d512521e8debb02
 DIST glob-match-0.2.1.crate 13599 BLAKE2B d92aab7dfe3cf3c05a3f05cf1b246aa88b118b404e681584aa4111a75dc953998fde38a1daf68ebbf9234061d9a66ade04bbf3852f7202196951af5b42a4916c SHA512 fb64321ef2196b9c047d6cbbb74e59a304532dad68bb9feeb446c7c1998bc7ba962f3c32d33414b945d276e1c9854d42ee4076c177a793cf1804c67e0c1d85f0
-DIST gloo-timers-0.2.6.crate 5516 BLAKE2B 1c06b6a7f7ebcae8145c8aa4675d2d4d56d04c37a3b8e25ede6dce7b8a144fee30ff5b4b04103408f1866b70b02607237161913d250ed6d34af2b6f4c54cb57c SHA512 1e3ea8351528e8e73add2f48482019fb9737533bb128170834bd27541e9d53c35c6bbe18c28bd0f70fc218ed22731c7a3f01891c6977fcbcf839fe932c3c792d
 DIST gloo-timers-0.3.0.crate 5530 BLAKE2B 5036f519e6b7e91b140fa3b61cb1cd2b58034fa11b6063549f050c3189767bce516e178e74710b0f08f1e0d0d59379cc0fabca30ff2ee60d5bd565750f0b2c2a SHA512 35b87a0fcdca230157c05cbe0c781c60128869c49c32d6aea90653e22dea9b996be1678181d999059dc300bbac4e8c046c51418b1c2edb1638a118742db4b2b1
 DIST group-0.13.0.crate 16526 BLAKE2B 099ced5b8d16e6fefc331f2d89aee931ec5900a168dbe31bfbe29bd00304e8525fa5763dbcd60cb19ac6c62c8d77877f2d83e700c7ab18255b08c9b42be60d24 SHA512 359db06bee4cb51ffe799d9c408791e310e72fde3bb3fd447cf97482ebb909af07b43e9b728e3639d5497fc905b650bf00403b3a6b21515e6628c2466e0851e3
-DIST growable-bloom-filter-2.1.0.crate 10214 BLAKE2B 041816ce78035e827146407c0659b509f0ab5c5839c600e8626546ea3d9b078fd77a2dba8f6aa1344db748eaf623f3185590578d3a1fe3ad8fd20dc390bd73a0 SHA512 9a716abb55cbb48a0c7786e15905ce17b97176cb6c2d36fe78026a7e36e91c6fc26949efa0ea036f2af653405f97b2346ce1776d818f744e03a5bf6473af4e66
 DIST growable-bloom-filter-2.1.1.crate 10305 BLAKE2B 7e12de5d9e713a06be95d604ab3f0cfbd2262041db5d73220f676fd7fdc3ad9123945bfe61a8dab10d3f24b21186d50600d912c574c8ee588e25887f802c8266 SHA512 9c0a7a31c94f5bd65c3995021ae115397a85ebca6b5687fb32b904ed18bca2b9aa9bc10dc541d9b3aadb45e81980f3fc9ffb81784485e64784bd9155d256aec3
 DIST half-2.4.1.crate 50892 BLAKE2B c275a9ec70d2fc0c50cb63421399202d31252b0dbf463798ed0a12a17493817c66b8933811d483b348f8f945cb05aab7cc2a4d952bd16009c3da4860202e28dc SHA512 0bce235583ca128723186e1fb50f636b519bf826c942f02c5b969db4117baa87c644665c541991c16d1f1dd97c7233c017a513d45075fc72c5d99ccc7c1ac193
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
 DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
-DIST hashbrown-0.15.0.crate 136460 BLAKE2B a2bc34b9d2eb7ca52dad7bc59e9bbb38ff9f79925495e1645eda7c0587e86e0a3d0675f8c7f159c5a83dfb2832fee9788a7ba6914168b51c26f762e140bd05b2 SHA512 497310e0f8e256e931ae0e752f66eb3811d5d3b9254dacfe2a1227e8532dc23eac8cce7a3f0758fbe0e0fd8f08b7bb18b5f118dbbf4fdf575a31666283583111
 DIST hashbrown-0.15.2.crate 138478 BLAKE2B 453888ce68b10cd6e93d787986603fceb29b83fe2dc417e7e57316b9e0060d0bba51ec7fb71d46a038662c99f60deac8237a8f349297208d1d223bcc13f0d0ea SHA512 d6fc0613623f9313533dfcab1240e97f652f78f05baa21419f7edb2eff030c4a2c5f426d3eaae747923cffdd8aa9cc2648340e5fc229395b5eacc6fae087c8cd
 DIST hashlink-0.9.1.crate 28928 BLAKE2B 14276fe00fb8aa7a8183b5cedc99eb403c0a68cb662555cd51efbe55a46c864f68f3d421395f56defcd1a87576c5a38509581adb5d02b831d9aab2efdd376f9f SHA512 16189f332b9e2a71f8cf4c8b72485eb107c4a84d4bfe3c739ecea8fe5dec33ad3c796d57830b12c176bc65a2066913c809a0f7c8db83e9da1bb0c555de8d3717
-DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
 DIST hermit-abi-0.4.0.crate 16310 BLAKE2B efcd1dee7bcd6d185cbe0051c7bc7e2776857ffcfd2adc3fb101febd7c1bd75994b7e4a4a0a59c5b4628cc2521b4c1f043e98a0c44935d0180e7499667690ab8 SHA512 b1a21f6d54598185a8e8c29565ffc2e1bc5da57cf1c9d87ba643d23d7c23d53e8ad36ee2f5c1ec8a504334b6f98b0f17a832ff37877c7b7f9238b196f4034e6f
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST hex-literal-0.4.1.crate 8559 BLAKE2B ca88420383532a2f2c09e188bc0950cedf74e8335c1e5b3f640dc80607d57bab0aa6967a536a458d149a074f8bc1025a3de99a9081787e7ac80dd8308fa0e5e6 SHA512 8894e48485be7e1d7a16d2e061086c524b039a1be24a4c20126d3f175e12aa87d6d65ae295da6dea88f19708f3f3a051c3c3e334196c094ace68a249ad57fbb6
 DIST hickory-proto-0.24.1.crate 374410 BLAKE2B 342ac0893684c2f350e4e1e26d37323e066782ab1c37db41f00d97b47856f2ff9b18c216fd162884b330dfeb542d9bd4da1eaad05a869d83f3245b5e6d451ab7 SHA512 9b14d8f4763b8034313ec48f96ffbcab0cbbdac73c0b32e04eabb5a11cfbb3ba8c6d2a84bff5ce2b1a625db5a76be895929a60bc3582b56012c736c897fb99ba
+DIST hickory-proto-0.24.2.crate 372860 BLAKE2B 81e36f8e86f3a9884e4e22bab989d9183e9efc53c57bbc611cf99549c2dd083fef5f4f8f982e72147dc4c64c313be5d6fa3c56c8309f8384518ebb3df3c1a4ed SHA512 f3ab93d60f28ebe85225c55b27abf43613e73db645699c8b8291ce8cdf76dc66bb0160ad0f1dd4b3f7e01e23d05bcf0fd702f2753d72ac0de62c5b5f2256f275
 DIST hkdf-0.12.4.crate 171163 BLAKE2B ffa03876879110dcdd3081cdeadc9490534c44763b3b49f1d6a5f4407a7346e6fa1ea18303f429b23adcd23e8898ba8fbf3797f5ef9f7ab7b11499d130311d68 SHA512 a43fe20b7d14fa26b118c6eba2b84219645f65f2ff33fcca679b139ae3e96f72abc1e7a47eb8887aac5afe4e34211434a4eb5a2fdbc014666d82c4af340a4b21
 DIST hmac-0.12.1.crate 42657 BLAKE2B 5d432a666dbcf9077a98e1f8a4aaa3afc88f3d88553cf7a2356d117c66f38efafe686c148598ad67ae89d64ee3edf56387a6f89b75dd9ab5eee63e13953dcead SHA512 77d4bf51f4633a8c36712ce3178945141df31cd645eafcf4bd130b8ecd7cb498bf1ee6f2d9c8dfbbc9f97ac638919fcc81bd3ee600a1b27c3be3fa87313aa0b8
 DIST hostname-validator-1.1.1.crate 2377 BLAKE2B 4bb40853b923bdd08cf7cfd1f0d3d78bc923edb7952c985b06eaaf9d02f6500f01f279763669134f4c43d9ad8bc504f8bfbda9534706bf759ecf0a70f856302c SHA512 3b2a6b0b61e6c8fbd2fcbac529a55115a3015a1319a8ea95acd5ab0baff58183bb8c8ee048d5e6067d97cd8550d2c971250899cc421f7d2d384112acb41ff7f0
-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-1.2.0.crate 105932 BLAKE2B efc9fc4ccc4a622781ed895f77c1752baf34e82d249acf97687ac8d4260aeafb333040833d9f8df5916cb105cc8217c8f27ddd021636b9248ad551ebfe4d83a6 SHA512 2c8e7234ec3aa720c9dd762c0bb06367fbc39ea89446fc9d8d2e55052a4ac461559a20a8294c877879f3e94d5db06fe41e2cdbb9664ea7ab1bc8003abb038bb5
 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.9.4.crate 38555 BLAKE2B 24949d12a08fad7c90f57de628fed1cf9d0a726ddf1b1f66def1d7037f509406911e6a54067eb299436d865881fcb5b4dcd54bc9a7fd166f9ab6f562ca29a3c7 SHA512 7a6c34cd0e60aea6a4e747b1e0711c7227f0cb6f332ed34b8b5424ab2d21772a77e60295e4df6421e921f6f9afe1e9955db1be5bf1dbc065200d4aa7d23a4aef
 DIST httparse-1.9.5.crate 39029 BLAKE2B 3318ed1d82f1cc52cf3596a133b59b9613fd09b6e50e4cc0073fbd37275fe53ae6dc23c322569d06272068cc196aa253527d45a939361797f6c77a488ebda874 SHA512 88f4489610c6d3338353731c38cd368a565f362bba1e9b0e1e9cffc1ad9fb871ec2282ab1e3956947e41e0087d1170d35a0e2b71b9e823c1acbb7ee4c6c8f48d
 DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST humantime-serde-1.1.1.crate 7886 BLAKE2B 4c66a483276e0cc5f4bd82fd49cfa0ee40c8ceda753919cfb7a8c794d098e9e4e851643fbc42a209d6ab00c5c62d9edc81c3bb1f6da218a09eafc96da9b566f6 SHA512 0bd72554e700f89506d2d1c8191832aed0065ea02aacb99e27139a60c883d3dbabb1fc3d60f499f5aeb20bd155fdcf21dc671aec1ca68d4041bf98ddf324248d
-DIST hyper-0.14.30.crate 198175 BLAKE2B 9aa000132bc5db1cf566df48d243484b52a099d47d68aa2fc02d11455f3eece99f6a954bcc9900c0173cb39f145d371cf97b024517aefee4c7bea7746f800dfd SHA512 037f19ad0ee461dede269acc634955b087cc021abe52053de74805243621e35037b4968e20fa0ce7fcfd83ae05bf485c8003cf1df55dc30bc4cd64e62fcde633
-DIST hyper-1.4.1.crate 151849 BLAKE2B aa5f48c38ed54de8d1b8ca0236acbae6bc30d530156c3f4f429f89e48148dcfd0580478041549a3f43faf38b30f36bc41276a272463c42c80c1b45a7b24a236b SHA512 0fcaaabfbb606020534aaf0cf68c9f1be3480f2d1b126deec30ba2879cdc3c7c7a24bdc5a2ed81aabe8be4df36b146ac1585ed8d07181dcb743852ff3fc0878b
-DIST hyper-1.5.0.crate 152734 BLAKE2B 3823edfb0ebe5aa1128a15dbddccd8ac844d29a8553f464179c20bc19d45ff6e3171fe6733ff7778f35469a05e2f6f7835eed2104d8714a00d1e5cdf30576a16 SHA512 ce51a2333e35e2bf50c4d467178648f712e7621aebc025aa82ad68883586d2eed930632110a2d240834fb51edbd8d9dfa278e28d296c14c150b140fee72ec106
 DIST hyper-1.5.1.crate 152653 BLAKE2B be470a4a902b464d95f30e656f0f54c8a426308f03f118aecf583a1994fb12ec8229e09b43168d856adf6d3dd39d8dd0f97945d4202f4badf4a3076eab1e4dfb SHA512 ec90992a7569e8e7fb3e4a9250131a272851ec0938da48730198ac41347f82e7a308b1c4ba8b864de58ac849367d4360dd2d8a03cde58b330329949e87ff85d4
+DIST hyper-1.5.2.crate 152817 BLAKE2B e5e1cdf2bbedc51e076d6084261b6c4462495c5e71ae230251758b1271d7909b612ceb97b7e5a83e7668ca5af0fdf3918e3cf02680dc75df609ae7b16734e579 SHA512 bbf3b72650c464b8ce36c96e25dbb975fc1c28cf2a78315d03be8e377b505e57534dda4ce600a5b1d57ae974ba869675ff5bdc3e80c8721b575593fc12b55b94
 DIST hyper-util-0.1.10.crate 72887 BLAKE2B 9d8ae7445ea56505e19f57ad680020b748e943a5cc3eca7292c06d93be1b58499db5769b214687aba53a0e9aa6fff3b3f63d1623157350ea826cd2decaf8d0aa SHA512 0a16c5d8857cf522bd53017dac50e530ae685c512eb55221fd6808299c7d716815f7b8192f8a9a504421b938cc0536bd497c7388d2f70ebbd91c46b644496b2a
-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-0.1.61.crate 27685 BLAKE2B 2091f0bdbfae3f63ff846e27136d9779a2d65f85cef899ea3ab0ff7c987329e6a584cf49c57de566f08e0277bd4981ac3db30ea0cec6a6757ed50d96e2c6583f SHA512 d16c67f435606334042c3a286350db46ff3409f142c0782509b136150b4069aafff0dc5c2ecfb7519dd8d105b9a2e6649df2a7bec33ee3966dc94034c9d5a1c4
 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
@@ -316,47 +264,42 @@ DIST icu_provider-1.5.0.crate 52722 BLAKE2B b1e53ac677e2db5870df0a91de405ebbc635
 DIST icu_provider_macros-1.5.0.crate 6436 BLAKE2B 7405924dca41db72ce422437434a4affece69f888e5c18d2a92f761a8d83b180f40c8de9a34ec15d0e107b63b2fe0502cebd0a0ae6f98d9d6ee37d197e754703 SHA512 a0dd58d731556a010428fe4aebbc9dbcd626b46d380cf28ba5236ec8824045a20f6f2ec986e0c1e791bc8bc2b692a10306f448279f079b4c37237e4a3c3cef63
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST idna-0.4.0.crate 271429 BLAKE2B 8b81bc4535d2e8a1100ddeaf6f43c043fd601ee3b37eb109a9dff01630a81603223407bd5c2f1a1b108d741c811781b205c10148a0122b8125c237a5d5ba8a58 SHA512 b4133c5f73bd9c4ccc05245a9edcc5c980714129ce4f6eb7851eea7e509617ff972fadefe6ac78db6b4106667d9d6070de52c4d42414c95921e3d9fe1b7a76cb
-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-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
-DIST indexmap-2.5.0.crate 85919 BLAKE2B 766da0a2ddc406e3fb1a70a0bee00141045ff72b52cc412adf05972ccef59d416f502c429dada111461cb522a5c442087e01d8fb235c2f1fd5493adea00e79dc SHA512 c4627d43b1bc5c5fd64861d1a7ed66255ec3f790367028b2758a40751286d6677da7170cfb04dd88ca4c2d163df621583d2e0dc4e9db6d7ed9bd0cbea42b1729
 DIST indexmap-2.6.0.crate 85204 BLAKE2B 420a3cceedab93e5023b476f9b6b93e57057238425d4095de59eb9490c2a088193873e643dcad2f739e34e5798baa9a18939424cac1afc5fc7b93ae496ba188c SHA512 c870348691f5acf97e7bff25c805e60f2e9db9e3ee7b3b939b7be45b6bcfaadee9880e6ad27adbbe2545865193655b5fa9de18487b7a1d030017b2fca48616ca
+DIST indexmap-2.7.0.crate 85335 BLAKE2B c7430ef510738ac5fc4658f3e4d927ca5cde780774a07848791ea87503be09fb4677c52803f6cdaaed73eee600f47e0595ac3db74a498947d0e180cbd10fb7aa SHA512 efac370b9f365a49489aa2c5406eb503044a4df7d6ceb772e0191b02244b6c2c1bf6c43ad4c8924160c1a2bd76d46c630b500a1c4252fc52366295d1cb04b48d
 DIST inotify-0.10.2.crate 26200 BLAKE2B 8080cace302b0e5aca8ed4188126992fed5b5b4f3624d0e5de70dfb426583428890513faae2fa32c31afbe1051aea03acb7a7f22d0720a24569f020a2a5ec940 SHA512 79692a043787daa67284f9b94892a09a2bebb12feaa5be2e1bcfa213b710af5499a4fb62b837d45793efdc19ed1eee00a014a7a620b5bfc9a594fe0571e96929
-DIST inotify-0.9.6.crate 22971 BLAKE2B 7a6cedd29b2503911fb42324fe3b4f4f20abb62a6b4370f8a7f634d9988f1b3053a70d69d6bbd7b850aae2590ded7548b73326a598d31e5b579e19ac3cc781d8 SHA512 39c3db1b6da620df9eaaa41cc20c2f22b9a372e181ed7d8ba0c7ad4e711ba4486bcec7ff86bb4d814d9c53e071cc4e43845567069e45b897c562cb677fc872b2
 DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
 DIST inout-0.1.3.crate 10743 BLAKE2B ac2fa5cadd98088ea3f6eb94ca46b3a9ceb6547ba49f0de311d86474d71024d1a087ce9b8d44ec808008db69146e9c81446bcfeebeb2fd74d2e8d0ad2c4975ed SHA512 1db5bc2bd87aae145b3b0be6669a9a722df2aac8f970fda210aaf945c372e641b941cee822917926dfa1ab8381c6e99cc7df4b18d2f4e2fbef17fdec36ed2beb
 DIST instant-0.1.13.crate 6305 BLAKE2B 83a2c479e21e789ca9795f66116ebc55481a42afb21f4c0ec0551edf07781901a28978667e92b01355b43e0e1a7ffcd3cc37b5501a7521da78f4f352e586c9fd SHA512 b7839431e8920c4c0841d0974eede75fc50f2bb7a9475664bd2c4ff6c558a10084e1c025e5be977c3364ae9112c365c0a6f480cb9b35ee4130ca2beebcf650a9
 DIST inventory-0.3.15.crate 13967 BLAKE2B 213ed4450412fd25bd74328389727e7b0c40363f677a156f6d4c1158958c1d000c8fa27b800a517b830f17579e3fe1905fa96cf8de6d384ce8592837923005c1 SHA512 1b7e229e5555e9b08edf1c1658e11831e591fe1f7c10e6160162fad076e89e4ca401b58ac59a76ce8ed4e1f9cd759a073d8d1f937f0190e2892804ce4e0c1f72
-DIST io-extras-0.18.2.crate 36030 BLAKE2B 4912dc81221b605fad766a8783f71cffaf6c62d3924f2579bcd60ae4f763aec54b5a8e1fe756b190beb04ff61bed627c2f34c27f5dc431ba0e522e79da8074c1 SHA512 bd8f046c2678f8cbae5f0419f3d1c3dd8964161479a019163e911ef2400efb5c1840e1a282252726e2c7634d0765c9d4dff6da5a2a8d4e1df057a097e97c3c2c
+DIST inventory-0.3.16.crate 15265 BLAKE2B d8c9399207dc91636639aa787277021a4e470cd7789ed0de0910cb33dda8fc5fb6c8e2c94fd791e8e122a9502b90a9424b2abcee5f30bc301cdb755ebe9fc6f1 SHA512 f32433aa5f69814602cf75852a5a058363dc419740c150a6da43e4de9b0c852d522283c83eecc2b5b2abc58769651b2d305298a46eed96b3a962798b3474b7be
 DIST io-extras-0.18.3.crate 34322 BLAKE2B 6eb7ab292ae0420726d14d229437c95a766fc954fd390d633e10dc82ef7928a2b186f6d07d61f3b2ba941b4492f73cea1762a5c5f1ecaf82a6f6ae55f4a08515 SHA512 2a9b5fd7eb7d53cb7eec2edacbf2523dd5d3ce7f8e793abed7725d5537227db5818ee4522b4a36713bc054a70a66e5849b8eaf345c07f84d1cca5643f1678b64
+DIST io-extras-0.18.4.crate 34254 BLAKE2B f153fd25a7c16c95b1603848892531d57ff372450547a88a340381c4778b59bc53208b784ffc02907a7c4ef1c78a953181280b20b4c78cc2681fa9999ddc5baf SHA512 6d3692c79846da023acb4a4c5b5472eb6475e5fe8fcc4843b5363ad5f48cf9ca50c7973a1e2a1bb9f6e60ef45ff481ae59bb1e66f69c861a766d852855514b26
 DIST io-lifetimes-1.0.11.crate 37346 BLAKE2B 7f278b7378a8569d3552c9b6d4be06d7908e05d77cdb964267f0b621ec4975a42fb6e48fc030a75ad5865681adf32ff747943ac559ab4ad73331a6611a1b10c6 SHA512 30c6e5ce6f5beabe0d7bee4f4522884d1316cf7d9b8d093ba0f952995997be3d0f10e1e77b9c20b7fe2b65429de0d2ec89bb35e939455795205206a3154ed544
 DIST io-lifetimes-2.0.3.crate 29216 BLAKE2B 799129ac5cd95c4ee852fb068550169bcad85316d9ea0f04c8e27f0b008e4c832af46cc8ca09ee5b7877af5dea58568d50710df20d763d48578b97e21bce5890 SHA512 00b807764d4db5ffc01823615c96beacf4d029b834069ee4e9ff2584038c59cbd48db49af8eb6aaae92903d27446bad86fd69b8c7bcbf4c9e5e697abfddad772
+DIST io-lifetimes-2.0.4.crate 28501 BLAKE2B 996dff247e515d1d23ee09dc5375b528e898b627b76a3a136cd316c4528493c3b73196a1b9d9511fb2eea422aca8a13130ad7d72cd6d406a248c6ce5143ddb85 SHA512 f0f43adc936d1d494c4e45a12741b295a08e0a61dde4c29a7ee0e91873ccfe3637c52317cb466273350ad8815a13b4a68fadd2c4a5176715fbbb672e6066de6e
 DIST ipnet-2.10.1.crate 28407 BLAKE2B 50c27384d58bf57ad2c3dd0ffe44f1ceb1ae302dd40e451b0c0d69f227050fae17c368c417666c1ec9d087caf775132db7387d5a6c919a0863c78a151912ea64 SHA512 7f55f23b2b0936e3a7dafa2db0447dcf1b63a092df4af8f6fd88a02ecc8f0a290b0d21b18fe777eb573201bf82f56ae475a447650ed0803af676b1e0c0970cb4
-DIST ipnet-2.9.0.crate 27627 BLAKE2B e7e1c74815b965e9cec1cd37cc3dca76671168feb689620d44d5e635f3a5fa92a7276cb3022f25a9512ffbaaa11b0a8719cc1b838a7dacda71a5beb1a992ecc0 SHA512 8ce429ba2bae53cfdaf8a7d6bf980e10b9dd515446ef3ed4e4e11432043a18e09454260567419818f523bc589fc367194bc345660f2cc808d281db235d3e0b54
 DIST is-terminal-0.4.13.crate 7665 BLAKE2B 47a024e135ca4931a04a8dc8151f999f816ab50c924f17321af4295dd84fd51bf98ff057de967e646a461c1cc9ffbfd7ae245a9021b3a77f3812f43707b44aa2 SHA512 ea5b18dbfc965b96a27086eabc070747fdc557a6a9acd06203164e846c2f390c4bebedb29211ec008e060dc80b10f53de6d6cdc822d4f51a543057736fe33448
 DIST is_terminal_polyfill-1.70.1.crate 7492 BLAKE2B fa663f858ab8e5fd56202d731b572bfdd4ab0e8262100424e27360a9ffd2820182bc57d6718a305ef82d04c3798111841c0d9f9dcfe219765c0f63edb560dc1e SHA512 4730fa09401cb4e69c92b38b2b43afd74699c61f5bd7b37605efbc0c08ca7a1318d43e4a844e46e0f84f83f42432f01e33771be2b18eb5977702ab9f894837e1
 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
-DIST itertools-0.11.0.crate 125074 BLAKE2B 8e686f176764e92e4da3697eb781e1bc30d6c57ac61d97343b4fc3a48e4febf669d5771fa8620005c620cce52c236760ee2e1bc344cf602e878bc168a2e69cab SHA512 8ece00ba0a7cf481ad4586da24385a6f0b1719b9c3f0c25b9b5b373dd1a0ca7b9687a77cd179853392890b7bf4d31e0356a4e5fd540465b4ac62bd74ef717fd8
 DIST itertools-0.13.0.crate 146261 BLAKE2B b23d59a87f80d24925bc868c0ac7abb6b9d05aad5ca08833634ef760ce228a1b753062ec4bd22237d0e74727edecd7ba3df9789cee896345b69780d7de66866c SHA512 c6cb8f93a93b6ac1a2cbb3033e66fc81a39f83be773b734bea3311332b96bc71bbb518aae3e6b40cb537590c23de1ca4964361c336795c3985bde63232d410c4
-DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
+DIST itertools-0.14.0.crate 152715 BLAKE2B 3c075b735a6ae4b66980b1f7ca0ccf4237286b140268ea179e4ac01b1349105da227f03ea9ea721d3e762c3cf8b736cc48b6902148eae73addd864b9c79aa219 SHA512 bb168e21281ef3e43f9c93a079fc1938d79b6db2366fe17e26a90f7ce6fa55df73e54a06334cdb2a7b208b0a64473b5af9de76827a9ecb49378a5f9073d2e645
 DIST itoa-1.0.14.crate 11210 BLAKE2B b2d33dc384757963eab3ae7d80bb672d828a549967986e3af8c70fe71a0ad46c4a278da2db4dfccef99e804e6cd4934067e97c0697a33ac3302cafbc46eeb416 SHA512 ea2d38df373652ddacccd11e610dfdad4e3ae7f0d476514e6ac58092733c817bd834e8cd88c3bc4178dd5a646ba628ae626195e0aa407e8534ae3c2a7b049987
 DIST jobserver-0.1.32.crate 27549 BLAKE2B 5f6556788d10af992fafcb578ecfd2c81698eea31b636d3adb7544e12155796082623735c8b10ac4c04d891d1acc307fb4e4ac3f88b2006e181013006f51c8cb SHA512 d4528113dd5a5d4a3765d55599a07e0998c69c7d21a90d2872679755ec4bd7726e9721af9220c36e1179b153ad8a39214a422af63aea15eaafd7cefc828ddff4
-DIST js-sys-0.3.70.crate 53863 BLAKE2B 15e75a94a2b7c77ff18847f98f76a1442b6e5f66960f3375534440c382a255e6b16ba3cb8c5345365d2195f7598564bf856755988f1288eb1b0b964e26446e21 SHA512 5dff8e790447a475b3c0a7068f0bdf1cced5fb8be2d66c92cb6f6c799f9d807f9d3c498e4f42c67e16d83dd4bb3be70472ece20fc42c3a8c8d57615ac8d398d7
 DIST js-sys-0.3.72.crate 54096 BLAKE2B 76c1044b7684ccfbc06c6d43541fc39552c058fda5ccdcb7154c930d03f5260706ed42b36b305e56c5a0eb0dcee27180d3df3fbde92f3b7ba5104b0709f5714e SHA512 5a83d711a02bead2d9c05aaf8a7e3f351307b3219f4f6697bf190d9a9b36bcc10fd33ce0a334e4f3e251d52fc7411020a3631d0874097e9b519e839b713e1c42
+DIST js-sys-0.3.76.crate 54420 BLAKE2B 8d211aee6d8af87c339250e06e321bf02d2ff313b80505f696f66c43298e2aee8286076f2b291aa853730f8e1b9940f09c56535d3534fc7990aeb16653844250 SHA512 54e9a6be3f5a19021351d22d655a3aa55579c80f1453a99aba5989fafc7429078dea57ffebada4240b9185d3260d02f30da250fa539ac12c4bdda975adfe0dad
 DIST k12-0.3.0.crate 9896 BLAKE2B e5a8cae268bec991c804754413e00906b91ab1cf07fd0a47cfa2fb2276dda171e56c9574ada3c2efba01f8604d08bc145626e5edac6e15ea49a92cd951201fd6 SHA512 ba91da33d8cd1641bb2cb45d516aa6e9c24a1bf79474b2d27476c2eed9ce3e7890f113a20a1f712d4f15d6a04376704b4e64b00d476f2359e771b56b69309e05
 DIST keccak-0.1.5.crate 13120 BLAKE2B 26b5d52a18550e67e79eb51d26c5329607699b14014d82136ed34199adf1144be8271fd50ef176b913b366b45f249ae5fc09560b0c6e5626b2fb2041de314e89 SHA512 95d5c12f903c572750ee2fa0829b8ccbf2ee2fa473bf0eae5434e08a7c1980dc435ffb36e53bd2d2fe840a55ca1c13b7650be1a0727cc8b79f649d73634f1b0e
 DIST kqueue-1.0.8.crate 12642 BLAKE2B 93a0ee7484655045986d6d5ca800ca001d68bb327f841bff3e54b38beff09ff10c099b2432ebf90cf8213153370e4c4aeab9bb0eb3bb02b1bb494b461dfd2fa0 SHA512 c8734fa2cfbf8b8f173604acf5d13ad4cc2739c879387b548a1200f8383b81a1b72315449eb73844e4b82280a4c29901d20c12cdc746d48f9047db89849985f3
 DIST kqueue-sys-1.0.4.crate 7160 BLAKE2B d75e152cfccbdf7ae000be14e0f84c6d1fd07290fe498349a8715061a83d8c02011b59578db2c451de011ac3eb4b218aeea73963a2a5cd82e7f5f49de0779632 SHA512 6650aef7efd7fbf4f9b6c8c6e4c1a91b79636423d46a0173dcb99de74e6f277cb02ada01cb62aa71c3f174a2c28db62a708b0aada9480fc5bde613204acb30a5
 DIST kv-log-macro-1.0.7.crate 16842 BLAKE2B ad3c028863d78730e4b2bb2e8cb980581b13d741b5dd2b76435ae91f5a7498a1e9f99178a0c9370b693a3af6a95c0682ff0d63e81a2515a267c6564d50ec3683 SHA512 aa7d79ae599930dcbca06f77590d9623dce461b118435dae1a4128fa8f38149a820109fe4bd1f19944b67285cf1b41bbf78e94b47e561dff1af683953c55a697
 DIST lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f
-DIST libc-0.2.158.crate 751340 BLAKE2B a67318ab24bb86c4df682cdf846d51f5f0a69504567acff43cc6e724f2641521945dc75dddc10c1c265fda960cb28b528575b5d39ce321073844dbddbc77bdb8 SHA512 c2d90d58480cca3464db475d7c70cd66bc1492239d8183038b48def8f5d8a437a1e2a2f084cb2bd9456889221b10aa07981cd5e9bcbb6bea28a2bde3c76f1105
-DIST libc-0.2.161.crate 765389 BLAKE2B 4880efbc347e0b92faa893993f37c486a69afd1a3c741cfb9d3a2d3c87fd56e49788f8aeac17baca217f4ceee9180097386ef481f4e142942802f27983f8e6fa SHA512 264d7a872c10484b9cb19ee858c2ac44bf165297653fbc6220672bd2e0ba10913408130f21d370d2861eef529f9ecafece66515b47b4461d56e6b02f55ea2be8
 DIST libc-0.2.166.crate 760418 BLAKE2B e4a81e82d139d03b85eb061439f045f1965f6260dc4d4a769f1db19e5d682a923497ba2cf041ebebd46b90c627b91cd97f86250d8b1854945b4f2e826a04d14f SHA512 55a484456ca4d0fc90e488c5b793a6100f160c9333f0b4173f21a49e33e2ce3ae28d74eadd4f2e72e51040667f0a2a93d7edcdc727fe266ff35b8b37608cce2d
+DIST libc-0.2.169.crate 757901 BLAKE2B 1012cf93d8975aa20fc3f2332e253426ff66be6aed63ace5292cc8568ee419b0f1a4b5b39ddbb78d9c2dfd8d72eb0d068c98faa229ab55556da5e674429f0e97 SHA512 c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce
 DIST libm-0.2.11.crate 111477 BLAKE2B b1247b197dc66a38b9a1f9db0e32655c9ee09575347895bb1e3f22e6953c334d74574a7015f214b0af0eed564ff2ee4576d07d0db5421aae917a7aa1e10ea142 SHA512 86742b5d97dc976cec5bbf75f565b40c7058e74cf840cbc7baf4d84823318040ac692b5796a407bd44caac553dda3f5a087d3bf8d6099cf26305123ce106c7bb
-DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
 DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
-DIST libsqlite3-sys-0.28.0.crate 4975624 BLAKE2B e8d9e637a9ed616372e6e9496a9a7095eea281e1496ffa5b312f632958c751d50d9051f5ad09777e23a18dec08821cf9c43a405c4ac64fbb8719820c12886b54 SHA512 4a3d16eec47c6e3e53e00232501fd50fa77f1ee1370f4ab6c984496f2f897b4acd1c15c697caa8babd635d31a946e147d5d090378615676a3b5c4a9656355016
 DIST libsqlite3-sys-0.30.1.crate 5122296 BLAKE2B 3f3d5ecc434af6ce6e28836dc6bccc812d53da909e5e4a92f0eb7b6dd56c66c5243e29901867df2e72be424f20fed6c896da59bfd5349fad831a6305cb25db51 SHA512 6ffb2a23a78f3221ac8f6c9260713741970e522bebc1ec7f3e1d7405f25dac9024ebe3a73d76a6ed74dc7109a8333d6936ad1c64a0a7c75d6d81f97c3524e952
 DIST linux-raw-sys-0.3.8.crate 1013776 BLAKE2B 375b29d2cc700e95d94ea8dc304cb711562952742f65c9664e33560a3da862aba74f2ad2ee66b1dface8cd5371ea9cbbc452ea953a6b6c656ade7d938b7d2ff2 SHA512 cb0e5c54870dacfa513ad05f7a84e9e90dc1a42f55685fe3e252fd25cffa4b875f1b65eaf4ad132ef0a19e6677c7763b360d71ff0060fe6ce5198f38b9956375
 DIST linux-raw-sys-0.4.14.crate 1826665 BLAKE2B 804af73daf396bb20da14f831f26ce06325181de14f0c277350bd22d21789f2bdd663a964cc0e7c5cbd2e084285d02a401a6bfbb3e8a8f079c120f9488b56f99 SHA512 28149660bd975ede05624af3582d5c78f498239f5d89713c2c32f5372fc16f4ca024dec35f81ea973a2cf986098890395dbda06ac6cf4ee29df3f9a0e11eaea7
@@ -369,24 +312,24 @@ DIST matchit-0.7.3.crate 30372 BLAKE2B fe41094d3de61e12e2612f90bb25ab21a56aed165
 DIST matrixmultiply-0.3.9.crate 57819 BLAKE2B c13f0edd4e33f9be4e562a8ad79eb4b0f42384ea6652b9e8b8b8435cc42f6ac8ff7e425a3b690b87b94ceae8d7f8ecd2d9acedac9591134a24b36cf479c14e4f SHA512 0b0a3433e81ccf7f62469bf478c430abb8b18cf499bae389dff0e25945b569810197eb110a7deb69cb8545d668350d1ac79414c82b3b9efe5e3cae4dc4c602fd
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST memmap2-0.5.10.crate 26847 BLAKE2B 1cf50f710ffedcebade4f131b8c3103b036778b320da671305c0244077743c53da155d444bcc4d0eece294234bb6e86bffe67da67aaf12a116573c64ce0ebc50 SHA512 39bd2734ce4f16c7f5a5e771f9ef92272b26f511421d5f39dfd2aaca072400ee38f2cd38352005c0c8c359095131770ce1c14570790bfe19ce6a17f711deff8a
-DIST memmap2-0.9.4.crate 32752 BLAKE2B 1b21af908061e6fe09484ce5f84d31ed1751301dffb6439512b38c53f9f090cef7541b591b968d0207c6d8351ee4d5949007caef7832ce130ffda1b3716b5454 SHA512 8bba078dba73253e8ee88f0bd2202dcd2afd0b7b800d08af8af593b882cb4acff7e297a3f299e253f5adf103893fc390dcd73e882a2e7d93ca96099fc2eace4a
 DIST memmap2-0.9.5.crate 33280 BLAKE2B cffb232e313c40c6a698ad6c9e6bf140193cf1cd4dc003ea6da08d748f11001c5426786f741dfe23490841350363db3b9adea927f3e40138b36f2f4558c7a113 SHA512 947eeaf7ded7241a256fc2b288013585f5034a77a18c8621ab01a4b47c0ae6e9b9414c5e9e2f2d47b661f8c6966b1ed0d159342cae80cf45e51629949c3b1337
 DIST merlin-3.0.0.crate 10964 BLAKE2B ee977213c246ae5220955d1735f350b2c75d419e3ef5a325cdab10b0e3d6f7d8660712af20a9403f6721f9acf45b23e3b96410d12c43dbe73307730b92447751 SHA512 bfbc3d1dbb0b9fff76687e9557a10b905341439733add2ad38edaa5bb9e5b80a50a8451be9c9bc95e9920204cabbb6f1b962f3a4eaba009efb43271eab71f382
 DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
-DIST miniz_oxide-0.7.4.crate 56119 BLAKE2B 68facfec9ff405bebe99f52bcf3aac6788f1b5eef313ca393e2a15e1158bf294003cbe31efea4c793e644e8ab4e00ef67d38f7d32849ab6f01a8e19d31c30221 SHA512 482bf02d7bfd25bd8abe5e5959132677202d8c5dc014b9b0b64fbdc204be1b8431867095c140a1183dd1ca59f6ba871a355422fbd148ce34d62960cad2b7a978
 DIST miniz_oxide-0.8.0.crate 56343 BLAKE2B e4abcacab4c8698d0489faca8556faa7bff53d272ea0c80e2e7843dc0f6f9229b7d5b0a17ae210344722a379853e7f14212505ee05da4e60549081cf77717c1b SHA512 044b641ce6d98d1968c1ee0906f91963f9f524d6f3fdf3059708177a759e1d498c63e595d3a3f0f9f3210c45c828b9b70274134ba078b899d7fefc2bbddbeee6
-DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
+DIST miniz_oxide-0.8.2.crate 59068 BLAKE2B 22808b2137b4afae29cc5cf25d9f643d24824293524542e2cbac3ed0fb0341417c052310602a6f0a003843abdbe7715a95a6068c807cc0c843ed867958650215 SHA512 e58802e332a72123954ba1751cdb59509789bf930ad74da3d06e2c1c3737547fc0b9848be816a66b6585830786b7a0fce7c9fb574789e15f3b540709563cf854
 DIST mio-1.0.2.crate 102777 BLAKE2B 9b87abd99269c62e48c6be4fa197d2b12527b672c435d5f1f623f986c60ed391597dbde7d5b73a624a4df0eeaf9c9cedcd56cfd7ce4239757d59e67e9892c59f SHA512 77eae1170a318d4a53550dda3462ae070d25656cda51db4cb2dbcb28210802f9b7e279900e6d6eba68314a0c814c90eb4af7acc561f611535cb364f75ad4e317
+DIST mio-1.0.3.crate 103703 BLAKE2B 0d2360e4ef45f37104208a31e9aa467d6db041dfeb97403a010a36e1e1427f51d97f8408948c75c0084e6c118f058267bfe87d36e7911cb37366f2b1ac6eb693 SHA512 2142edc7e9378fc3437110c85ba2cee9c9683e87034cd44275d2c389645979db53fbbc29fec304f1d8c8f0464ae17d2a5db1aa9215d696fa0282f5069700b1e2
 DIST nalgebra-0.32.6.crate 375297 BLAKE2B 7ab4efc3ec9e088df6aaa3b80cbbe9a1758412ff6ff842ef20d4463aab69450f0890717bb3c4dbd8b15080875325759fa4cb3144086bf957b82ca38ab4ade01a SHA512 075be55b003c8153b5ad21db3bbd7bb5dbca2c5513576486f1a024351aab59b65abf245d202c06e6928a96009aa0f3fda4dc00f5590333ed0bbb20a0242a8889
+DIST nalgebra-0.33.2.crate 385768 BLAKE2B ffc69848ed68849ebcb54f62b071cc1fa4aa34d9a52d84a23338933c37d140ab70984ba08329c3477fd03d726a2303cef57d09eeadb7d0a5c6607495216f914a SHA512 5243953c455565aee44962039c4145992a1516b8108814e02168212bfd81d2ace4d34d591505913465d8017eb68b6a13134d6d8f128cf73377ca4634d0859998
 DIST nalgebra-macros-0.2.2.crate 7545 BLAKE2B 00883aac40e7eb64ff0f088520befe7fdb6d59b7d24c5553d86ff5f362da537e266e4d7684c40d23d7af27c45ab92263ccc88a17f48415b6644e94b8878b3dad SHA512 8fe15a64c1e31c7a2c2943d975f0f17a04c8670df505c5f0c4c86a5889467f79017587c0be42e30aec7eb030133c87e2f5b19eab91bf1593432d2da459d3a719
 DIST native-tls-0.2.12.crate 29517 BLAKE2B 76f4bb2aa8fefc306a04ff50a62d6617f71c3c34aa83ed35f11714ef2306fd82f76c7e26ab7ce50f8eabed40602ba02589dde2d98b55ea6113b45cc539c84bb6 SHA512 15fbc9d02134d3d55334d2f02fe4f64be50db991d75720b38d802088f06cf5f844cba6b25dfd7beb92f2cd367ba477ec2098e3c7336c4e5a5a7fd39c753fc723
 DIST nix-0.29.0.crate 318248 BLAKE2B 3a13a88375a359cf77b28d7f77f47f178bd31ef74b7627b6701bc6fc601024706be4e9ac1a076c7cba26b64d3bac4de17aab45fe3c045aa7a36e2d9232e872ca SHA512 86c05084aa0e6238f8d48df0f5ce6e6d7661b589f4f3fbdad43387c59c0d6afafea4badf25d31db1611615de19a0b9ef18ce614846b79a47cad4e2c9367dbe7f
 DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
-DIST notify-6.1.1.crate 40117 BLAKE2B e8f2626841903b7cb261ece9ff7d42aa6655b439a2d613f43a0d518355af2842e8731a6a2a92fdb84d82f0f7cf7423f051ab529cd22248944a19b3338e5b0f29 SHA512 58a44759d96c3ec7c431a37d92e1c1a0f112d75fac9651e9fead7a3a1de46074d79a251320b0522891711879da4ab42dd008c5a28a994039890f8d434d215e69
 DIST notify-7.0.0.crate 35141 BLAKE2B 671e6e02d35f277a1fb552ba04d9aa8073fd98212ab5ddd6eb92e3d234961f14a5541c3466f6da8a0e366f4d83a1c9723159e41249d8032a6d6405b0ff2cea5a SHA512 e55407f5235192dd784132182549f5cd8ab211bfbc4aebdfc5b2da61b726d5bc523951b675190ab218c6aa125bc70d2bd85c87061e113f825dae22b0b5990d82
 DIST notify-types-1.0.0.crate 14472 BLAKE2B c9b1ade29ecf3e6287816a167b8ad4944816c9a7b53b78a580060467f44032f0b7fd5671ddd71fba2108988d4478a3b5207d7e863868f4f399f9d5caafe94ad7 SHA512 9b2523817fcca6710fea5f17dbd6ae272c8b3836fd0d1bccb3b4b85d196aab6efbe46e0dae08862b10ac8488e9583f2eaa4f0a9e7f6cb9b674258ca2acb14011
+DIST notify-types-1.0.1.crate 14490 BLAKE2B dcdf805989cd64a3c132a73c4100388113bffd1446f1a4d9685826ea43b126b9a51c70340c3221fdd20b1e3aa814b58d4051a995820de206078deaeae4d34eb5 SHA512 3a040f916c967fafc934ddb75b0cab81c8e3c4cd9e7213a8bc5e8650f7481f6a11b740e033348833338c46ba917189f34fd9a933a6dce606381cc361ef44b447
 DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996d1b07a0fa40839072df3061bd7e5bc9341363403ea3ef8d19c7725ba3b7a8ed540c63e2209123b1b93f69418288b6 SHA512 b4f37786dc85e0596e2b7b261a5a9fe0265bf1651c39efb358dd649b926b12c3093f307b98bf0c4df3899f0a7cb1854f2596bd5c3e22fbbef42f912ab2eb5043
 DIST num-bigint-0.4.6.crate 102801 BLAKE2B 0460e7dfdbd44b6c68fc8ead6bff4353e549127158dab8bb5d217ee33104fe9ad5f58b63a01d56fffa8d7c4df1a87dcf5b536e436a0ef98dc4418a4690c4cc15 SHA512 19d14a7755de2b559026547d9e3e1775e636781bdfdd418f2e1d962c51411a0973a46d84d0356e30c0f708a7c7b2097926611960043f71391919cab1aeb6aa04
 DIST num-bigint-dig-0.8.4.crate 123825 BLAKE2B 9710266116ea15d0e56792b7c8e217931765dcf2377bc05f23bd386625087eb6a7d7aca7b8f0beeb78ace9f280895565a6de3b14ffda7721e35c741ff64b71c0 SHA512 88ea682c5aabc61c0cab9234e31a2dccdb5458d3bc018e1f9ccbbf0a9f09ed0053341e93bc53f65b5bee55bafe71d50bbcd48fd085ac723ef4662e15664925b8
@@ -398,19 +341,14 @@ DIST num-rational-0.4.2.crate 28159 BLAKE2B 653e05b9ea621a92dbac090339d9e0ae0b3f
 DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956
 DIST num_enum-0.7.3.crate 18603 BLAKE2B ae7644ae0697518e538a38e33fc1658057641b719437351a5cd1d5add8ce2b03b834097a4b2ddcadb27937c266bf758894aab5e0949fe82b63150b8332aeae84 SHA512 8b8fc32da39d1c89210fda38098425f21cc384b6a38841f3b04264dbb24ba3c46344835be6e70b794c18365f86796a8af584085dab41bfa677136b8c9c9b6197
 DIST num_enum_derive-0.7.3.crate 17092 BLAKE2B 79b4e4f1def44702347a2291e7c2b3f97a902b4768031795d9fea53c624f31acce9f5ee68316d08af149681afd8374e39b596c3d63e3547445cfcd28d3b5314e SHA512 d670d60cf9a547232190d663d92a288b06953ccc5989c2fd9d4101db35be9e3e7386c42878c15bd820817aa703ba06af3a9641898f4a204fe9d7fbc32c3bd786
-DIST object-0.36.4.crate 325802 BLAKE2B 1eb4fbe0cb2882a5371947234b4421b224c40a61cf71b994ee53074d70e010ee9b30638290ae89e14a9c6e1e339001852dbfedd4d740c642415c58327d121a76 SHA512 b929b3ad9ca32a5830a2ba103e6e14419b145c324b834b453d53f3cbfb5181246b2628baf5fc668c449f5337411d374b56abdd4d1dc4a744f65aaaab284bf77c
 DIST object-0.36.5.crate 327435 BLAKE2B 1ffbb8ba57024a7273217edb1db76eff03e0689f81ba27b0aef0a622972e7f6acdbdc480384b50d603dee6c38c960fd25125a313264187aa0e429aa839198dd4 SHA512 b85375ab3660a8a0c57833c28c4dc665dc0664857e1eb3cd472a61b9ec8c16c470b16475545c2c311fc23cb3c43755967f93feac12c7bfad013cfed5f879e355
-DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
+DIST object-0.36.7.crate 329938 BLAKE2B 0b02cf2f44e99002909b38125edada1a259feae59fd0e5ef52001755b6878cac710c87c60fbafdbe405281e039f68572ea3d8093d16128899090fd70df7f2fa8 SHA512 dd69172349ecf51fd2351d32cc4453760ca1d15e854a1cf5ed99112032901a54b4645b24163b946deed11f81d3e3035e1a5afd8bff20f335dbd05eceab073478
 DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
 DIST oorandom-11.1.4.crate 10201 BLAKE2B fc77678ec202bc5ef7314ed876f670575983612db9cc94ddec4ad7e9f04e2e2742d12b746803b33f1dada4a10c8afe19210fbc337803ca59a0df74998fa6de92 SHA512 8d5acd7b344b1eb9635ae597b38d65f0da519366664f02bfd083d37b5e9c88f21403066a8e93d8a61e843e06ad9323cca9796058aabd901d0adf7e7235c17562
-DIST openssl-0.10.66.crate 273705 BLAKE2B 7892e96dac3b24ad5622833b4061bd82028210f9f26ec9772cebb65905ff6e45da8b21ad1aabfb87bb5610f534018da6bd20c10eaee8c189dd08a7ebfbf12b4b SHA512 2f4dd6e40dd8aff8c04563517fabeecd5ac0d986764649cc9af9bf4ce25757a67f75655eee207703b46fe57661a216ff00144358ffcbc70525447a063fa086c1
 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-src-300.3.1+3.3.1.crate 9783559 BLAKE2B d6717a6d1b09cc277138eb9b9d035cbbe584ef1c6f51c488063ed73f9d8bc20fc15eeab2ed5d5713c6d040f2e2d6f5c31f233b56259ef3b7c4d15b446cc5af32 SHA512 4f90b906dca08664bcf5784c8e4d7111e9f61029f7b9ffc512f3904900d4a29918d14cb6f57845f0c7029ee31e551bd58048c3cdfc8ae5b4c0f2c637075bdc40
-DIST openssl-src-300.4.0+3.4.0.crate 9945264 BLAKE2B 48b9ef03714ce571e67b0cd2c347b0b58d76379df66f3630934fa5e0730d7c821452f3b40e1e3b7f7fb9f5d151618cab566f4f27fbbc317532864caeac279880 SHA512 b5f92ff9e34477a59c26bf8f954e59efaf17af70f53d1a7a030f7d5e1ce59e6d8075479a7e40326b63b4e21b4f5dbdf15c9190748ec86f31fbecd83120cc5792
 DIST openssl-src-300.4.1+3.4.0.crate 9945831 BLAKE2B 5ea47b7a9d934bc25999bdbf38e35b6d860c02444367277744c2ce4b43e1ee127f6662076ad1c3e80aa538c957c3e0028df6828c0a01df19cb5e9fa03779a770 SHA512 f0d5ba6af60cdbe7fa926412e1da9cef57c83fd41d9e451a9ed3e69d294e233823bc23ba1b897c40dbaa833274b5b8e2ff30ad6e801e51f26a93cb1594695480
-DIST openssl-sys-0.9.103.crate 71552 BLAKE2B 4cc1ab93f5a444b4b985c84f6ae90f345da4639e4ff7c5502dc1ae59f842d46e3855057a7c05855f7cd739b5311f330dff361480ef2a0102fe46471506956148 SHA512 61b802f6baf918ec055be90ee47c69fe0184f6d9a1d29c748386192a11d4df115758961ec9b636126a6b42d7d8f7509248c59f7c035905558c4cc35b804a8eaf
 DIST openssl-sys-0.9.104.crate 72287 BLAKE2B d9af8f2ae8a8dfd53b3bb68433a4dd2a4b30038858ac58aa98d7a23b2d23e0b7c7d8fc36c1733d0330bcb9f51284667b2c32fc5a5bd4d9e1a5df7b98d610a997 SHA512 e812d5323bc0ec7376f176a980dd9856dad6d36513e854d333b93ce8a14c20a9ca61be88db82ba2a8ae4e086df5c3fe6965ed10ac155eb7b502e0225c0124278
 DIST option-ext-0.2.0.crate 7345 BLAKE2B cbfc03e7c960fe3023512a4ad816d657b4f54f8ecbde9f9c4df4c5fee3b36b68ab463c67ad650778279e01c7ffaa63a0dacbd0c080c8c3d15b1611de0e71f92d SHA512 f8539f97b01af97e0b80fc96556002251befa60f8ddd19613311e62f9dc9834d71c22f5d8e7c53c4925046e38cdcf834c3c28042a4da862d6f6a21ddff8d8e56
 DIST ordered-float-2.10.1.crate 16029 BLAKE2B 7c6920160e52e377ba44ff63ac679208dcb3782c1ffb802707c54fd285ec22bebf80edd036753ee13ac3e577b0b7114241dbd9ce5f018d0d6d31ae21df1cde48 SHA512 bc659ff02660a12c4340889ca7ad99d569d8e7b9043d8e8ffae912da0a5049c1a837c7e4eb0a39e5ee3bbba9fdb498af6236e56af6da841c97c2bd4ca4c39090
@@ -420,7 +358,6 @@ DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a
 DIST p256-0.13.2.crate 63434 BLAKE2B 8c0d6997b60299382f1da2b7caa1b0353b787352bc3de9ec7168bf224ff7ca15b2ffa28f99377eb11cb6cec3481e5d28c68042ac88c1cea27e84aa8fff5e0658 SHA512 4105c597346e2bc74ad7b7173d13b3b46cf4a1df87ea1699586cb7d09beb1b9f8d152b2bd0bc6849c69771fe4d320dc15a9e275470923b495971e9aae54b0ca9
 DIST p384-0.13.0.crate 236495 BLAKE2B 240fa9cf7cc066cba64e9c89d78ae65d0f0fff3e875b0175646114784a2eb0083cbdac9e1a17e6de6b3e9a6074b8f318e8d6abfe63b7de432c2d19dfc0fc0091 SHA512 e81451d336b2fd0c1dc3483f1e586b7d4059b3ee7cfc935edca6be1be02d23b1e380859a44d0a6cc6538fbdfbb22cc22b8d3aba11cf90c6fdfd0e8edecdfba17
 DIST p521-0.13.3.crate 138499 BLAKE2B 758cd3d1917e9e3055d1ce26194443b4c5aa72812194cf63abef0750342501d58a4c27b92272504e2295a44fa291e614b462dc112742e8576126e280a6cccb0b SHA512 fada6c066deb17c1d046ab4e321b32b35ab851e4f39ef9d095b7a05163a4a43d1e4d35fed4f9594b854a6a1dc32d257685eeff33956698f20f805980ee763a8b
-DIST parking-2.2.0.crate 9730 BLAKE2B c6da9ea4d8c0a488a64510781b025ce07f283814a09703c58e8d46c625cd74e2c55d7e28a4c09b0886fe4ab415b128bd3114f8283d4c903398e12a11d65489b6 SHA512 184a4514322279ed093a27a9bcad5fce808900a9ebbfb624216dfcb90a5483e8bcc054d82a0bba4da3809364ad1ed0a623328cf983bec3751e4503c9670a3f9a
 DIST parking-2.2.1.crate 10685 BLAKE2B 3af8020bc27ea921d6023c14f20545f70a5a5a5a216d5f97458d76d3bfc8d9de937f3c92668d31a79de85ce08ed0236d440c64ca1e4fe0a7748f412b941c052b SHA512 2e49137b59000f0467aa9ee0648d53e06cd2b8319d6ea28bf04c621b873469739a34186840b02f08d770d109cca26e161b3de3e4341dd729701885307a6a8177
 DIST parking_lot-0.12.3.crate 41860 BLAKE2B d1899a1132035aaea3a784290cf4951ea3b36b2018d407e27d333b2a2ce3820e040d635009c44cb6e58ad07cec6565c0347af6f6fb02954eac2d4c348bb036f0 SHA512 368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703
 DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389
@@ -429,44 +366,44 @@ DIST pem-rfc7468-0.7.0.crate 24159 BLAKE2B 478d355dd970b9705ebcf44d74d61ae0694db
 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
 DIST permutohedron-0.2.4.crate 11090 BLAKE2B 23d159363a177b6ce4681ca6a2ba69ef9f41444955c6f0ea838ea77e9bd1dd507890f022c9fc8971d5c2a4911e3a2ad25bb019a797c4b98675b77c61449e6fe1 SHA512 40a355843b57c8e455456173b5de6816bd30102bcee857f1df40b8d7b7cb4101926737f10d9986b6beaa41807b2e1465f5600488f717301b9b21c921395ca3b0
 DIST phf-0.11.2.crate 21569 BLAKE2B c809201298f1c5046874b3bbdd30e33f2bee2e4b977152a2c5faa91019ee5a1c8fe1d42cf91f6d0b0dd52015fc66f0a84c1b3ae014291ad7d5ba647a78debded SHA512 97752bfb44f3d1f9347b4ccfb6fa2fb80b3263d6f67aa703c52ae90d693c537a0db878acef828c79bd4c41e8f7ca0ea45588dee073d12c9bb0f2980c511b65b4
+DIST phf-0.11.3.crate 23231 BLAKE2B 588ff9dfc05a3d2cbe223d97c36c8a596d89cd421b568a0526992a089958e4b4ae8f7d33b3f15cf935d20bffea8f60d39ef2d2e1904101f285ca9b8b8155ecb0 SHA512 20a834481bc43ac8c560b00e337294d3c14d1fe359e7f78ed08166b096305e40277f4cd3c179a740911b5c241aeb4e263afa1a50d37f383ef63da113bd6270a9
 DIST phf_generator-0.11.2.crate 14190 BLAKE2B a20d6d3d815ca0eb5ef18780587b9963459887a3ddfe3408c99f5ad7c382da014cc0bbbdca24fe13c780460f3e4ec4580665004afbd300fa470a91d3becf1a5f SHA512 122ee5ddb1f65f386d35e438396eafb7c9f2b1254daa11aefe0a6a45aa0662190c0b7fce32b6e003b04d022e60c2af4e355f995d5ddbd1b58df93eedacb809b3
+DIST phf_generator-0.11.3.crate 15431 BLAKE2B 0c8fa88e391141d36d6f128fdc3708a87e34ebd56e201ad56d62de8c05e9bff62258dd7f3a03b432ddcbd83c4f61fb9a57d93574a9f9a68e931720733ecfe1c6 SHA512 52998e20648b6ecd1eaafa407f7da4667fa829d48fe0c9f8f718377cc86a232a6261fc2f831ffc7051b62dbdb880654b1207ac314e57b23d2b70f634d07c2115
 DIST phf_macros-0.11.2.crate 4748 BLAKE2B 643942f8e83dcf5623f3479d677ee11c7e25a87e9e90f2aa3b43a75398e6d956613257046f5b307476f605b433c5ae443832223ff1319a918fcf3f9602ce291d SHA512 ea6acfc43491af1330d32860103ad60f29566f6c32d43bbef254f23da0f17cc3723b1d04153fa41f82c01d3865e0e16156b9d2dcbe6a52532b8f268f3a55df7c
+DIST phf_macros-0.11.3.crate 18436 BLAKE2B f52beba12088a40eb532da1dabab5d633c1c90fe143ea0367afd7ad8263c42336fa81974fb122ae0d30eb45f13a257c7fef85f03b0aee8de45d3cf3b9e903d30 SHA512 331d3392dfd3e48eab0e65c3daca469c3abaf902989ed912e394175876f36c14d06fd1ba4ed03e01234608faf1189743e6dcde75eccdf2f4fe0dc8ffb15e720f
 DIST phf_shared-0.11.2.crate 14284 BLAKE2B 3c3bbd24de77b032d194d0b0679a84a4e2848d41ceea5552f73e51e3ebddd5e61188393f126f668689dccbbfa92a8accd9c09a77de39eeaf72b8993dae280dcf SHA512 f2cf9e8ceabde75bb7548e5a47dece9a8fb7eea4a6c5568675e7bd735860c3e51181d749a26cd3dcad1476ec22d524ccb77a956dd267cd0f2b7dfb81db9abcbe
+DIST phf_shared-0.11.3.crate 15199 BLAKE2B 82441a3f6db12e9021552b51ef4ad8b564532833dce782938d7d721e9f2d8b7015eee7483724552b8fcfeeed365259cdfd5044e9d2a999f42baf476df8141db4 SHA512 34bc3c0dff5568f0276777614d92d87882ca6be9e3d405c1e7de90ac16ec52a12acc30ea9ab2033074d0e988fa514247f37de1a21a3727de0ef43f42f477e27e
 DIST pico-args-0.5.0.crate 11545 BLAKE2B d1247ad160bc37db36e05244772f506ee5e27c4bd75d2eb0c763c43ca304e5280350b24a818f5e470303167640a22f38ac7064afd6313fd65b14d0d3e5572817 SHA512 2d3dc5bf1ae11b0373e03698e7020c20b4e14c9aa482ff2d8e98e68ecacc5c0804152bf7d188779197da9464907bda60cf270cd6fe85e6b9fcbf29b1b82bf99e
-DIST pin-project-1.1.5.crate 54214 BLAKE2B f4adef2c4f5587ab0523e92b7a662c035882237620fc87aa3919bfd360745b587ab84cce3cd0db24f4f15bd358a46af1cfd196c2071836f4d300be998b6bbcf7 SHA512 103e58f1779cd2d6c63053e9448d0f53edc7f08f29540fe0de2dded1dd0b7de50cd62d31ecaf6cf30b1a7f1f5e4728beb2cab3e40dacf8ad5d5a7a6254527578
 DIST pin-project-1.1.7.crate 55438 BLAKE2B c7cc110f906d29e25325ce1fee00777917d0d07a4b53e65bd6e25d54df96bcd8fbab0ec33a8b994f8e0574ad78fc3c590ce46eab296653af560b629a5b93d51d SHA512 ca3cb06148fe20d64d37f6f115f838da2e8fd0836b8f08b316518f4f5e679b3776cc0fddc393add0f147bfc74756c03a2273dba7000e218698f9b6cf4b2eb093
-DIST pin-project-internal-1.1.5.crate 28280 BLAKE2B fa30a86b1c2d1a66d7e427b04772efb68bfd7c006194dfcc458713b4dfc8c90929e43732e0792a9c33285855857f0979780e854e303322243b7654a120f74ece SHA512 f0c264460bb111ed8d0d3bf57cbb0f6a1adca16500accca4be7e5ec0d292ce6e1319c6b98108c583b85c3211ca1a84a5470f3e31caa63989f52022abafddc032
+DIST pin-project-1.1.8.crate 56118 BLAKE2B 7a72280105c6bb51ddb2571a05112de6493dbeb42013f26ccd4f4dd58459d9741839ad9ec9023e4a4f4fd2c6dcc975d58c6c86a72fcaf6bff295407943b8e49b SHA512 c93706969cb1358d84a9eefea6de6ed732b87c0bd68cd5299f6874b8ec0ea16d65989f127b9ea06a766a5c0e299033a11dd9d83f361938c28e1658d546e3725c
 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-project-internal-1.1.8.crate 28634 BLAKE2B bf23cce4c65b929df156719db59318ae0aabcd2058aaa800a00b3f25f1729824214559a1c4e671cd80ba00c2843297d884d1e3b3851abcb890fe3f0e588985c5 SHA512 9471d2c163bb6966203735f6815023a77c7b650adf6f0f03f439416af297e03ccab1772de040c0b2c7bf9f57b92ff6cb0dd50668f85d5a9fe766e24eab0cd1eb
 DIST pin-project-lite-0.2.15.crate 29683 BLAKE2B da9dd581eca047f089c2a069a355caf66a631b3ff81fc07220a3c378dc77ea2c399b165ff8a1d2f6556595ec52dc1bbdcbbdea5ad9e5e317281650c9158b3669 SHA512 ba3c22c70f98ee0d0e78fb8a25bdc3100b26c3f03f3e4c6c0c238fde75774c5634d6014660c39406a828d1c28f17f44f20fe19dacd331c4da2f4961a7f7c124c
+DIST pin-project-lite-0.2.16.crate 30504 BLAKE2B efd0b426fcc6ea8852bce499fac61f9755a11c6a2999cbec514f093ba7b3f94b1f2d437ee9abb243e31f3838ac1c74491a212851d7798eb249e209b35e015332 SHA512 971adfe54cfed304647fd944c1c915e78b37eaf0de3a582fb984a5e91f1b7d4db2cf0f53a9a64b64427062d4b41c0a36baddef782411a76ae3be0f8ca45f0718
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST piper-0.2.4.crate 15950 BLAKE2B 265ee8a57029e6ffa6532dda8e4da94a288504b658fceca9426d2c13086255cfe5a1013b58dd02e029ac658b6bfc8ff59b88458fa620a41e0203413b78b7ce1b SHA512 88c6fd8d1118b37b77217fae004e47c01db8f95b9b925f1302c0577971a8a9f239b4ac07ccbec924d8912cc47ccfd88eb2045cc607b5fef3fbaf496d24ef7df4
 DIST pkcs1-0.7.5.crate 35790 BLAKE2B 0cee88bc3406b60d225593b4b01a4eca11d14a916bd589843300f6130729e7926d2af32b9b7d03e98b6934775e30e5627754e7e32e1785f59c8ede36c28ea40d SHA512 a3584ce492116d6e617a733a0d3d5696404aa7b10ae95070313b4a41dbc21d0940850870b711e375ac8b54fdd179b4083d61c48e902e6efd8a3a11cb630076a3
 DIST pkcs8-0.10.2.crate 26360 BLAKE2B a62b5b7386eedba6fcbc4cff2b103b899dbf6179101445283f9076080489129543561af1ad6f09061564f68c28954262e49d0bb3e182f2ce7495e19d6f34bd5e SHA512 87127d51f0e1fe085d46b30394f2a580e857cd64f5c6fe4a3ac3b8871230aa426598dbb007e8bdfd5d729b99a9c0b4d84116f0768886605342d2ed112c51dfa8
-DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
 DIST pkg-config-0.3.31.crate 20880 BLAKE2B ab7676e810751f89639b60ae70bdebe1d57edc76319f83077c3680049a701a26e72e8cc485fe77cdc4346fe3571d32c59e7384c8c86fef17e00d7d81df5daf43 SHA512 ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4
 DIST plotters-0.3.7.crate 149031 BLAKE2B a53b3aa85eda3ac2278cf49c4d701642b37a5f52a3a013594101388d9d104b96e35f542ff6b8ee33bf711fb64c8c25a48c8f10b3c12e70e6e57c90fd30cb9b5f SHA512 526fa20153b445176efcd1314c2e36963561e267c566223ddbbcdaf74340aa821e9c0174c15849c55f3cb3177fd5e34aa9bdd872888476b7ff0a20ec3c1a04e1
 DIST plotters-backend-0.3.7.crate 13709 BLAKE2B 7ba96de1435beaffe0171dd4fd010f84d0bb6bf0856adb05da87dd324a5834aee3a71545a019ac899e141cec32cd15e395c56d281f498430e54b6715eaa46761 SHA512 5b53e5d369f39748d45269c82c87a0731cf23666b88d7e407162602c715a01807ebc50f8a90805f417c0e7e74dc511d1d7861052835beb8a9d548e2f33c062e3
 DIST plotters-svg-0.3.7.crate 6715 BLAKE2B 1437ad7e1c1b3e82ab1f58660ff6931e510f6ea5ea6cae6eb48582d4652bc65c5dad518d3312e25303651c03d90bf56d9abac4c2e3979f8290b4cb35c0b6ba5c SHA512 9a60e19026edfad359a7d042630b60825d7723855fc0c17881ac880c29160a81449ca672a3ae5cea4405293947ae0556f31cb37f519dad4cef56353248350cd6
 DIST polling-2.8.0.crate 43554 BLAKE2B 8fc5986db7c34989954bbe84bd69d1f61c59b890d4e5fd21a20f3861bad750aafe2d1a89b3181df97f3659f1a6c980a92e43dcb9ef9e1de3881518024caa6f58 SHA512 c22dc35f39f374f21483c987d43108472dbfc291508e3f5e1d76e2c466f40b396b1ba7c222db5e5a2c0e670e83b4c34e0fbb5c3e93d86435b8a2ebb0890471a2
-DIST polling-3.7.3.crate 58276 BLAKE2B 907f5cec860d5c631b7cb7ea9fc919df1a1b77dfe3ed4ca94f717316b78d73e9ae0f34391476a057d82d7376f819625ca1ca594ebbfb33bce7557db6663b7f2d SHA512 a2db17dcf623b77c8b94e36ea5f55059a35a70aba80f261428bc5b8df175dd1a95e302912bdf55dd1a6a3282fe4920054bd1cf6d7bc6eb52a70556d220e05429
 DIST polling-3.7.4.crate 58239 BLAKE2B 4d42d4112693a14938aa40692674ea1d791ec251ba864d4820b7f884fa859bb8e285f997150974a1b09fba0be1f0f77b196376aeab02295e4f433705a105fbe7 SHA512 0a137aed396f9b6a34a69ceb043a355efbdbb6674d36664e767516b2555b51ca494b74cbfafd530ba2f9b48eb7ffa55ae1bbfe7b1e8ce7745d41600709a5d324
 DIST postage-0.5.0.crate 431521 BLAKE2B 641efa40f8edfa53e9764f8f89fabf150588e293d62d054b2ed3739e30af409ba4f40b6011aa1f8140db9d651133b2613145a0aaa099e11d6918d506f4ed06da SHA512 f30825d5326830047f9d1dad63c63cc8655a0bfe92ab65ebb2338145688dbb9250ca0c53923b038d4ba04b687898eb4accc1040f3d2f1d158c666e192a528c89
 DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029
 DIST ppv-lite86-0.2.20.crate 22478 BLAKE2B 9d68dc36d8148047d571c0147ed29f586f3c6ac9394b56bd955c8ae5bb18f5a8da5369809f7b8c3199074e23660325158c32c62e1bf69a16cb1f5da2a01f5df0 SHA512 6d171f63b42296f7765732fce3af7ea05d0d81f1541ffb3ad86e81210715ef4afe5bc9e58926e97e757aea6ff96a8012c8411eac78be0fd080898318ed21d7d1
 DIST primeorder-0.13.6.crate 21296 BLAKE2B 2ba479defa1c26d14f8711f6be5020eee9bb91a39fa7a7c14a93dedc6de920e0ef1c9f6240d308233d0e0d6bce4be9500d0e9cfb01b6c4f9902e0f77a2f97352 SHA512 fdf52b47b36403d5218220b886a3ccec7828731b5a59ea1d48a25fa85de754544fa9c94d51356d2ed904bf2d908bdb4fa87c53e597a3c9f2941d7310f70198ac
-DIST priority-queue-2.1.0.crate 36311 BLAKE2B ddeb32c19b6ba185a54668b3905011323bde8b262642383bd44bc2b66a83c9318369384ed8a88d8391266177578d8beedca4ec4a6930978fbeecb63b52cabcaa SHA512 b09742db9303be0175665381160f875a819080e20561909222dab36aeded00915b276f98bcbf7d0e2bb5df7c516c55c511eb40186e6b954d7517069139a5d272
 DIST priority-queue-2.1.1.crate 36321 BLAKE2B 12b77ff251da81df6f3879e5a61c545865bcc62db445d3af78d728faf98d78ee4496dbcf3c5f2916aa710c6b84b57ef48b5fb6c926925cfe64c847fc66f67b69 SHA512 4be9d16fcf468b9c2be1524b3a81d868326cbf5197ed59dc38098bd8c1e869e9a2e21cba4b1150bfa8472dd98ea20fb2a82571a57fe6635bd1648696fad755ae
-DIST proc-macro-crate-1.3.1.crate 9678 BLAKE2B ed617a1930bf28a26e865f6477229566a0c4ade7f2c1e8f70d628c5536985f03c7533c561490415e207c0f58b4885367e7f54ddcf10b058711829f78a34d68a9 SHA512 5306f017933ffa89eb6111ee00b0536179c5cfab56529440630a0bec86b62194ff16f57ebb471b233e88cd886b7b9871de8402ed29073b23e5ca98193e513659
 DIST proc-macro-crate-3.2.0.crate 11164 BLAKE2B dba3e1f4e38f427df72794ad891746fbb8c24239cf06b076e75ab6795a7e8c9abf25ae0f40379e07a696827156e7a3780ae242da7e5442cf1224d058f54b83a6 SHA512 41479ec5e414a8b05dffaa0ece21122387d5165a54e60d8ee3502f8a3c0a2ac0247f56996f933d5d77f1efe41a56bffe16874e8c6a34b66100cf047e4b760863
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
-DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
-DIST proc-macro2-1.0.89.crate 49446 BLAKE2B 844c021394e7a2551bc179592a6769d672360150abf92debcb9ac60a94a2e426c48c408f06aeb2128686f5f04d66dc12973714670c21a5063ee6b9f3bae4e671 SHA512 488ab38a04df1d0330309382a7e4f667238cbc9b4d513da6a8f5718f8a762f76cc122af67fefe8f4b021a286b3d23e3ec83d781fe6ac823042a6daf14d147e2f
+DIST proc-macro-error-attr2-2.0.0.crate 7745 BLAKE2B 6e0e6d0d19bc467550de90a075a602f0be1e6ba24b29b84e42f01ccc953dec4f841625a84930a84cc5c00a1959ebdde9919c8d6d21664dd2161ea4a18a6f1d08 SHA512 8dfdd6aa54b03cc3b29e97f6be2a2d0716cb52b751cb7cbce8ceaa9120f95f9567be5869d6c4467ad16560b6db037d2c48ecf5290817c4e06b6acec1d7aaec44
+DIST proc-macro-error2-2.0.1.crate 24807 BLAKE2B 20bc34aff566445280cc874fc0c2a43ef6ea2ff67f674107f816daceee712749fafcdd1a8fd52fc35f8b875375e5fe05a571b717629e6cbd250b42162c2b3837 SHA512 6406a792b780178e80597709fa34923b59f8a9e8ad22fddafd78b3495b943765f5657542078a88dafa0e904073a22fbd9722d45ee175bcb51725e566682a976b
 DIST proc-macro2-1.0.92.crate 52353 BLAKE2B 9aa29fa6f1c56c0392a94a81b4c61953f4d185012cdca37e356817845535da79d7094bf43472ce63109ce479a2fd0cbef4d802afd61daf92c4db303bcac60e7e SHA512 e614f08acc0a7e97ef580479cf5b682378df1ca16f09bfb2296ebb3490a435229dea9d682c621c54ce57e8e1d3b7803eb8ff83c88bd02e07228dba6d02f14aee
-DIST pwd-grp-0.1.1.crate 28281 BLAKE2B 6c1f121ba0978d07ced60ce2435893299667274d9b11c7def5b6735f7c5d63068694bfe61d43297640bddbe3c89b266b6f202631efab91638bf71cabbbe63e81 SHA512 689ab5d42e5fa39260e17d0573d4ee7bae7b4fcc677d27c3d2a9c7694c198899f4e41395d1fc80df05d23e5273f0373f59de6e40ac04f5398d208359d7f107d5
 DIST pwd-grp-1.0.0.crate 28723 BLAKE2B 67adaa637ef76715f00d816eb7f16e904606486340b05f8ab11b5c3bcda2b817748f968d029bc8b4a47f0715e80655020f22f0f111998a874a0483575497b4d7 SHA512 cc77e66a0e906127eacc9e911e3bd9f3125167810e652463d24eadccae7f4e3e95772338a09b8f878945c8a695be519b41e237b2d5324b5cf82845dbad2830b4
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
+DIST quote-1.0.38.crate 31252 BLAKE2B a3836efbe5c21dec70c684002b47b8fc7cef643c82ee903b537a48bc0707a28106c4b33d98e60ff81e04c7520f7404b1dc4d49446e8d91dded517e476c36e1c2 SHA512 530c47c5e6372b508bf5b2b88a138408a7afa5ef52c47280ed20eccf39f8e97dfc1e0a18c1bd5472efcdc49a7a1e69566333a0a1b4c0b4f0e11e6a7a85bfe8af
 DIST radium-0.7.0.crate 10906 BLAKE2B d576e0ea5c5287bcb6740cee3a3838b6ae4dfdef0ef05d34634b96dba5159e48260233db57a767c9e032fa5d9a5798361335cb19f7844f450113ece30ffbc51d SHA512 51e23cf52997b46c0018a94b0259b29d7bf33ddba19f6db406ca57ee5b1417d7e5f27dda3bb487d0099886011a97f238e8b3dd4d6c86e8464c0b471c1a7622a0
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
@@ -476,17 +413,13 @@ DIST rangemap-1.5.1.crate 57091 BLAKE2B 2fde0bcf53cad7c90bd39f6bc85f9d0913f9d772
 DIST rawpointer-0.2.1.crate 7490 BLAKE2B ee4542886347f2bfc7cb32cf4f7d025d35c78cb763e6d6acf2a8f85ae8d0261a2a20f86903952bd33b886dcaff789bd30c507b4e5d53c0debd2e6696291a825b SHA512 bff9ba7b69e7754e89ca6d42bd3b7a547f450404de999e35c10e4002fe03ee1f563b9799673c5010aa4c2f80885ca9e45b5560c5093e117be3b75d86affcb62f
 DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2a0a0dc24f0282fa7eb01fd1351a7dc8b5af3a55ea321e6526fbe037fec3cf8b32463166a082a6e417a51fca SHA512 3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3
 DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
-DIST redox_syscall-0.5.3.crate 23830 BLAKE2B 0a38235ec277144f0c3e7bcb1d273c7f357d85aef33dbd06328ef16bab7df0a07b523431590899ea58d55e8e1d84c32392478530200cca3a9483e8a47b29e233 SHA512 777d1208004b7756887d6c5745ea408972670e59430e1d299d01a463ae41b98e0920ee77aefef8755fc949d4799dca679afaaae9c1a7d060f76f69af5b90427e
 DIST redox_syscall-0.5.7.crate 26249 BLAKE2B 97f848b130403686404dc193415e5060c32585aa3638b825b4775e54d9a058695b86457ae9e3cc0240bcac27ab4c05dd6b488bdc1c797faecd236c6e477fbc3f SHA512 e9f2d254279a4063089436b699ecca766a997a72718d132a9b35f7c8c8fc82c4b5e25fd8f3e6cbd17920fec484140db520c262376ed1c74f847929b7f43fb97e
+DIST redox_syscall-0.5.8.crate 26319 BLAKE2B bd69a69e2a0f3d84843a8f76199ef6b3991698ebac58b23f69c26d02f5f3e24e77a9d5e8259e9fbff3887f06d15ced94ff23b5a3272ab475918e6e3e753dcde6 SHA512 5f9632f1f89f4963c36ede4da9b955c3474b673c3414d81cdbb61f46c08eff67167f703a0b06b239beeb2d720f8fa592a5493c0f7e872728b5b95f561ff11348
 DIST redox_users-0.4.6.crate 15585 BLAKE2B 1d60d0b7781395ff271d79264910d24fb021cd8ef612714265abae25b26ac158d48f542f1e73701bf5b99bd67546a7b878e4a14e40cdbd478b35bcc8b4778f5f SHA512 719d63fec42bad3cbed39deb9242ce1daf3f391bccafa8121f63198120371f112d78b0da8d66458519e946581511004983f04b0a697071f22294ac7c831120c9
-DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
 DIST regex-1.11.1.crate 254170 BLAKE2B 5cf41012fc2ba8a006c0eb4a922cbbf1614bf300be361c9e2d98956a9a5e9b140e37bea09132fab7bfb633d4439158723624bcf45e8c619c4061b399253c1b82 SHA512 d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
-DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3
-DIST regex-automata-0.4.8.crate 617784 BLAKE2B 7535c79f6ddf1b1225e21171921594dcf32fc3afd47519d2067b2047b19070cb7e6fdfd1563b884fec6f91dd568522fc95d85bf095c11f8c02daeac128c45020 SHA512 278e3e2ab230ed5fa7d4837e8ea879fae68ebf35c2da5cc3a67f46b7d593abbcf71e6326a0cf34e38edc0f3f2166ff42a4fcc17a400d9604429aa5b4be075a3f
 DIST regex-automata-0.4.9.crate 618525 BLAKE2B ee3fc41c8c445be4c1aa3e5b19a3e61efd641b1a24e7a1ed55f837c1fba9c816272cb4645c13232b66b170bc7c413802928beb22e3891500141ad4ede65b60b0 SHA512 40bde0ec91cc27bc0c3fa237a37ecee5a1f023dbe006a999c5888f8f578ee2c4c64d9edfe1827546cea8e92ca3c10f8b4d494d81f3d0422b40d90bca9cf598d2
 DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e
-DIST regex-syntax-0.8.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed
 DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff736f2d9991b19814ffc1a414ebc5b76e84fb8fd36c983b38e8e391d165cdd9047832b0d9100f0e1ba7085484b7db5 SHA512 549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8
 DIST rfc6979-0.4.0.crate 9140 BLAKE2B 662d967b1d818439e972d19bd251a4e3609c65bae945b4d11c0ff4966e9fcfaecb739d0b63bd767cda6a22e77a52f3386f02cb27c5c76ce9008837c882f8df33 SHA512 fb68114f5f8c1e7b921ed175fc01813531a584b8cb2df1264b72e1925bd66b4c021714b3627fbbcf3fabc26e4d6578c4d246369a0c98049d4058dca4cbabb20f
 DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
@@ -494,74 +427,57 @@ DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd0
 DIST rlimit-0.10.2.crate 19093 BLAKE2B 1b3cb20fecc89caa3d8079130965476f73cf4e2ed6268d8ae8b0adf42f5759832f5b9c6e43a951dc1945bb68c91f135f3ff63c06602a16c6796ba319595e9bef SHA512 80c713dda749f35753546376b8ad804d9a89f430659b26eea1f56b50ac0c1f28ec3f66e611ec20986e5efcfd70e1cbc38c9be1acc816f668c8f4f864b34a056a
 DIST rmp-0.8.14.crate 29687 BLAKE2B 8467f30a5c015798bcd984297c9af33b5cea52b775e21d79322021c1232efadf3fcf9db86310a66a22cc84dcec2450da410d7308be6e723279279df98e922a4b SHA512 f83634cf6a9eb9a905b55039b59efea72b0f5fb88aa92fa008d9a867812d06d9dfeab8b4ced5047eec66568742e3d873ea35e57e66da36f67cd266be6b64e00e
 DIST rmp-serde-1.3.0.crate 33025 BLAKE2B c726f5555cc4d3a08d45e6229d6541fecd78022b79a844c28a16ee9ac60ea5b08efc4059394f2f3911c1ca699c3420a8e8fc40abce60a402d7a43248d63b8fd9 SHA512 d4ab14e7cd4e6a3628d6795d45112504ce6e571038b08fa92b70ad5deed143d2e4a89927c206eb1fc06b3d5fcf4dc6d4357572f8393e766c958b50f0076b436f
-DIST rsa-0.9.6.crate 80048 BLAKE2B 0021065c262a351c3c3e9e63984442e9ff8e739f0f60c79f0eec031fc3ecf928756a0da656a0eeb4bcb94cd6f10ced2326a83666efba3b85b8a518b0aaec3d18 SHA512 0af7737181236f0e5544a83eb41d7e780df1a488b7b782b2c97eb4eab3dd599b86d18adcdc69bb56f9aac548a24dc88806e7bdc32fbc43c33b4d7a9817cfab9c
 DIST rsa-0.9.7.crate 80231 BLAKE2B b8f6e435f35776f2a67f79f5791d035ee5753512fb8e05386aadc5ed4962d88be7ae4c016ed43bcf2333e2913687155aebd3ccc79aae7f2b04b0307915dd6257 SHA512 dff7f46609a006dc8342a36c43f841592cc6ded5cb88d63bc252f221372cd756eac820d57e218ae573ea8a643875463c8707ddd3e01f2fdcf729215c75e7030d
-DIST rusqlite-0.31.0.crate 152252 BLAKE2B 5ef8396ab6ee9f6887466e7ff856c6260f40ef85361ca451e230d8590019d6ffa4952df15abd21cf300cf51da4a6ea4e82f5dc88dfba474f2f62036cee76caa3 SHA512 6d20b015ab72d3d75c363111c0cb41feae8bff83104ebdfcb8e5efc1bfb63eb48a17f6de2e6c96cb1e916b4795fea6d58466ab0820b151b12d1dc4c29800ba66
 DIST rusqlite-0.32.1.crate 155563 BLAKE2B fb310ccf297ca0be6f0fa045ece633f12c5664defc56c71763fb44f60292e85103ef235cd37eb60fb2cdc91cbdabdb311b6937696bb96146513f687af9a786d9 SHA512 f21986063af655842c41cb1f9a7711d289d52f69850d02b7c08eb5381e43c0b740fc047912dca5f9a745469ccf6bed12b751d2cc5e351adafdbf37fd69946cd9
 DIST rustc-demangle-0.1.24.crate 29047 BLAKE2B 8248b014eedb26cdc0b748544ba91b9aae9c992a6f93b4d3ac256b78f691d572f8885a3575492ea556698a241d2759743968293079ca02bb6a5f318b0ed66dd4 SHA512 eb897c35300b87766e6105917a907fca1c5b1f7691fc03c6c1aaf38075ac883a73d1eb54a245d13ba59c7b0f0333d6543e23fc1b1c542fbbd5c750a84660b9e8
 DIST rustc_version-0.4.1.crate 12245 BLAKE2B 0ed627c560d88e5ade830cc5f72c62f6ba88be3e30d0f8db34761fcd0b284e5b2fc063c240149aabdfb12c8410ecdbe50cb10a3544500b5a020f95a31cd6709c SHA512 7aa8a487ca7411b6d23cae62f7568fa3474a7b1fd1589621071be3428a550ed3b7c4ad68277a8f86849e5900397d7d0e9d678f5d423742a045dc7c660fa6c598
 DIST rusticata-macros-4.1.0.crate 11746 BLAKE2B ef912926df8ff2d3ee64a190d79dde0edacaa0ae8c2442d75a1fae82f97aacd9994f3511605686cd2bf592e71461279776afc63b9f25cd8ab10610d59cf3610d SHA512 8066a2de0d63f82278b33fdb27fba99b0ebc56ffd364ce6361fc9ac6d78f31e3e4418cbc78916365fd0e7735fdcecced21e16aaabe56cd72250bac0cb30151b3
 DIST rustix-0.37.27.crate 324534 BLAKE2B 65fc8317c5aa86236b2099104b6841a7d35d4567977218f5e59a85d199aee7d6b9f0278083d93f575b31d77ef8685576b7cba06ce8da6e96a164af30c854ace3 SHA512 e1c648cf11379509b732b9e9ed88ebd36006d8e73755528a09aed4f46df08e23a705696c5e6ff7ea0e4382513edb487f9859a8f1673150d60d70c698216fec3e
-DIST rustix-0.38.35.crate 369206 BLAKE2B f52d40dce187c8712fe8dbeb0fb8c338656f5d9bc92b7e886bd93008732462e8a2cb64f64825e9fa8ada41054f22bc2a0eb2b9c32c856c89d6d572f9eb9b894b SHA512 0f5367d596797f5719a154e0f929b24db8c5f2b92b3ed4772b89e11663beb0b3fd6447e1ddbde32bb2507450ca60504ba0ba6b4d58510fc64dfd70e5099ccdef
-DIST rustix-0.38.38.crate 377665 BLAKE2B e476166c5815470c6c3b6018ec309501c9815e0a78c1d55bd55f28fb1ba585f7343e7dec276cb677c83549565171f27d9cfb8b9ee13143c0af48db291bbecc8a SHA512 2c3d90fd86f3300d0391720713a68218e489ad4ee72bf315fb308adaf297a3ced6983d2af295ba25df2bbc32af097a91b6d412082a016dd1eb655f957f3dfc5b
 DIST rustix-0.38.41.crate 378463 BLAKE2B 8af17ffb57da36df6407e112d78e8748fd9931a5cc451530bf46c4c2a57685a9ff5de3591e3d7d01d033060f24f55cd1444541e2899dcc622869f077116ef847 SHA512 faefcebbc668605640d156800781f7c8726271e15ca4cbde4057fed22f94032bd083c873f5595ec39d5cb00c203fcdf7cb863bc3cb3ae79c20c2aed4423f0ec1
-DIST rustls-0.23.12.crate 438443 BLAKE2B 638ed38c62f807d1a28cd880a8664e09e0ef25ef038f93c6b8f5512e1864d60f2bc8a83e00907f9ee36e543bbbd9e5b6f5a0ff7fb57770619864298d32c31bd7 SHA512 49b7fb3dc02e9ded96718d064a121629dffeded6affbe8dd8a41283be62c99244b23208205a1821d83b557200b017d26589d4f42a0048b2cbd70156dcbbb8b94
-DIST rustls-0.23.16.crate 339595 BLAKE2B 90021efe3a28adf4a042c09ff134872838fb8db15a750aedff3aa031b253e96cf574c267ad658f429bdd66a3ab33b0c8b9559edd45de7f431e77163566cb5775 SHA512 540c8c864f090c4729c7e70fa495e8030d3ac6b0decd64aa23c3213e8070be0619aff523a61907d1ce384780639484c313c041376493cb76e8732d88115e198e
+DIST rustix-0.38.42.crate 378683 BLAKE2B 4071e1118ab8111bab9efef39c6e35f8a3030cb230cb3643df7ae09ffc750b18becf1f069c2714b0b6d13e334c12446433057fd015c9dec04d7a1372a354ae05 SHA512 438bf1e4663cacbc7c0af23b10ecc11c8b01c53e18c2e82a740c46b4a61f06cdd25d926aff27a9c39084c39d9c950c222a1a3a6d5878dd240554fa593fa762a5
 DIST rustls-0.23.19.crate 333921 BLAKE2B eb7c1354ab7fededcefab1664c4a6f9c893df36a222a9c7cb5d56c74ac688f4ceda086ff7473926cfe5db60a1df13f6938e9ca9794c871ec842b8a4a641d2e69 SHA512 e1836edda343609258deda49725a2dfb46bcb98e1542c877d1e4262b52b39f9ec018574a366d534d39792c832bc03cc99e5852a35f078e9f827161eff45a7553
+DIST rustls-0.23.20.crate 335933 BLAKE2B 754a580f74b16ebb8f0f3dea9f3730fdd0ab9c4d04b0abb5741ecb69548cc32c54713636922031ac1acf2019df602db101da2dc363e50f224c815f1f8edca37e SHA512 3778f649026b59c4698bca9207ecb516a237e3d782d7727bcd93a2a20f0ed7b02e3931cf956b75cbec8fd806b54a9b231e3b663d0123f9894b54283e34e78dfd
 DIST rustls-pki-types-1.10.0.crate 55134 BLAKE2B e61e78231bb48b6b249e3b1fa6a6edde4479c4b263ad78f78fcb78982d4fadae7c67ac08077b9b0ec32d0f0d527e12f3ecf456ba11f9740854f0cedeeb881d82 SHA512 8a5c51acfb97cef6e9aa2516b3a2a07f6fd37884b7597bdf81e16bd6ad7512fe45f0b95f4635963fd6e74c0aa79fefed1c3f1a9e1fbf7ab78477302fc333743c
-DIST rustls-pki-types-1.8.0.crate 29562 BLAKE2B 933e281d6f4725717c09699cbc73368b7212745df7900e9242dfb872edbf6908faf417b5684c843af8b37a198dc4104de279bec0d72d2c43581f837a62f67683 SHA512 f8a223b904c224e4aae9f06046280f3f9daacb50d1456f8ea2911cc7174a4b8317f86e4ea5431a29c0ad8dcef44bae53c20bc88ffd9dd72bf83161289bb65e04
-DIST rustls-webpki-0.102.7.crate 203931 BLAKE2B 53333cee7c6143a0ec4ec85c367c5d04166e845c7e2005cf1fbda1cead19099a39739695a626bb191ab4496b77499552873eb10217fd0e37042813ccb890560a SHA512 3ea381f53ec8b77f2fd515f5ba91286163e2fee46f0a731035d6bc37e61206e0fac5412bebf62483619d1601cb64979cbb1aed377d4c7cef57c97a369b834279
+DIST rustls-pki-types-1.10.1.crate 58944 BLAKE2B 1bf83e046802a5eef5dc597bcbe045a7aef146c489ef5fca442bc20a9a80dcb2d15cc8e07ffff45890df069b99698bca2a9463d1c2925a8f1a5eaa673ebf621c SHA512 ec63005b54bb9676fb6ab3f7a399aa816881c34670577e8c8de7f86a46a834e71c2363049ef152475d784f12b6cc9301b4fa20e9d478e95a8f1b9ad75f6ba2d8
 DIST rustls-webpki-0.102.8.crate 204327 BLAKE2B 8db832f181b46bdecc419e1433dd5550bc181cbffa1961aa90b2533f92696ebe15d71d742225bf806e2dc3a4ebb110d48bf62b0677089df1eede6d5a072c0a28 SHA512 8cdd5d07bb8d6c3f0d1d6663babc3b7ccbe8c9b1463870a3dd095c67f46addf4097a715da796c70f1891ebc1d045ae7d7c3a352400e8bfd6687e6cddfd33b1ba
-DIST rustversion-1.0.17.crate 17621 BLAKE2B 1f077ca6fd90333724d1ea9df7f5b178f37f895b71a7b2814e9ba8618bffcd2307f9cb4ac2eea25d461a6686a4b5b51eebb80f1b1ccc773d4da1948c47fe8abe SHA512 0565cddecaedae17e7cd99bc34f54cda242d4c29cd4269f8e3b178ff91d49f3682e7ffe66e436bbb138299736c8e55cc143fefb74c076911fefcc41ba98064f3
 DIST rustversion-1.0.18.crate 17794 BLAKE2B fa35445404b836214bdbaa3de8e43312b6d8f50eea32540f808a6255908d756bb1a5dcf49ca6268a1d214c535c2ee770e295c0e7d6430268142a190b31032421 SHA512 263d2cef02b6df4d38b35af7a9ee3a6a044f160f3cf7c6771528f23dea342232087f73f89e419ef7869db771e73c273c05b3dccfe9e29f707586b2059e820645
+DIST rustversion-1.0.19.crate 20616 BLAKE2B 025944fe053ef928f26affb890ef6a563b0e63cf6acc0ce7bd4ff104541f819bbda48ebb59fd8a677e44ca1ea21f4a18c209adf2004c9ad79604dfbeca43b5fb SHA512 45b959aea8155ee47c51aa1d87c6c344b5f4b20199a2646ca30bdabe1c2458b014be91fe0c48c29c2261ad9e5de6df7eef7ddead1682e584d4a906c17984baab
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST safe_arch-0.7.2.crate 74949 BLAKE2B 93051082e7c3d1c80aa0f7ecff17d80470baadec310a54bebc45680da726bd2f17f362337458413f1f8a15d4adda03d68b499cfea413b328e5b8e8dcc134913b SHA512 4baa60bf3888b7d7efca8e62288bd62a15668b3a74b07ae79557ad518ceacc87d5bedfa87637f0a384064374aa8ae63aa95edc56c04f083ffba7d0b880194ddc
+DIST safe_arch-0.7.4.crate 74564 BLAKE2B 9d8bbfc283c06a1840aa94cb9812e190c5803ee101fb4aba6de56f9456d69292b837904d4973e2239da2557a6daa5f83e3c1cda9acba0f02e76801c61f4604e4 SHA512 e3dc8e6514bff493a56a533cf928929cc87216fb4f38823e39cda4e759a642a40df6000344cd47405f17bdfe56ec96152472c83754e4eec61e439211415b309b
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
-DIST sanitize-filename-0.5.0.crate 4043 BLAKE2B 7f97a41221a55a1da452054f458e0d6460edf9a862965f964dc836af1bdc4a7332de68e8e6c98fe933cf023f786fa476df644ded9deee24901442ed062fecf8e SHA512 2cde9126452e6a3b638892cbeae6da56467a73a9a5c667c148180ede92e0e17b4ab05bc5c4a3836bde3dc43d0030b3ee776f222ae965cd144e1d349e4b9adf22
 DIST sanitize-filename-0.6.0.crate 4819 BLAKE2B 4f2362f1bd0b4f7a3820ba8b95a539033c52a45bba6b18a72f3b6acaf6a7008ef24f06d0c948a4e07b03376b8bd661d552b35ff98a25f45369581854182b4a0c SHA512 088bf8fcd78258208493f202c7e9fa5f530ae13644511135d076795283853adf3926088be022ea628312052e81a6369ec3d6e7689efb9d02c5c34048f44a2d75
-DIST scc-2.1.16.crate 127936 BLAKE2B 989a56b9d8063a36bb6a6b78f3a835ec29a14974402211ee0e49a917aaa530208817b85eca43e8b350656b96231a4a1f0e1a8ef43d9b199463384a8184785c15 SHA512 4b88cccd98dbc38ace6b8217dd358172786a810d4a1c18cc4da1d539350badb4502ac5a9113ad956f91ddfef11ef2b2ec4774039dc4f8bbc904d0174021285a2
-DIST scc-2.2.4.crate 130513 BLAKE2B 321a0072ef741acdceec0d76fa2186c92409fbe862feaf1400b2dc65e9dc42bebdfb2ed0a44fb02856da6243f7d0593714d5e408ad93652041fc51b9afe6dd58 SHA512 091d5eb0f4620ea04b213149883176014d57692c5af3b68a0235312eb21835e9dac80b1afb3fefa44473cad36ca6ac4871c1e366d62db70a293b0a26c1e4f8ff
 DIST scc-2.2.5.crate 130745 BLAKE2B e00226c3118a84d7f2f1a7bbc1c104db8199368dc5376f116caf77c986195394b8fb9cdd1eb7a399ce18f699fd22d185763acda0fd211065806ffa0bbec8fca5 SHA512 e2ad4cfd2201b9cf35ecb3397d29c0469c8a3f8366bf85d270341b1936c36f6eb4bc38e7eb5407b7287b38f6bd786665b486b54972c3b394634256ec1e06b5ad
-DIST schannel-0.1.23.crate 41667 BLAKE2B 3f34ecf4cc519f5302f0ab5207907a275c68e6fcbb47630aec4ed5d5f1a1cc7475f6d7a8c22361e9878002f9f54314c1f630ab0c1f77ea309714bdb7ada6c9af SHA512 dfce25e3b8bc09d8dd1fce2783fe02ec83f74697cb24aa212ef9369a628685ba488f821cb3e5f863798e0e59995038c8d748f74b89f7929eb8cfd804d5066b84
-DIST schannel-0.1.26.crate 42791 BLAKE2B 7066c414a30de1ffcf5badb24410371765ac3e6ab94f41892a0587495d8920c3b3809a2d7c4e0fb452f03b904062e114a3eb50b619f910a302aabc45af17db03 SHA512 6db6182cc076df820d44aa0bea24f96013e3f1a581bf9416d84e59e33dbd98a3a5d39a7aca9ae162cf109f1501a0edac683a3a95361bf9107780b2a280e82323
+DIST scc-2.3.0.crate 130826 BLAKE2B 9ba8d600acaa4b84f7d1965dd4650b7206cd801c84cdd09d403050f37d2f6cad5aaae3de350a4d32c731e6e6687625ae5502240934ed864436d0d47252b9256b SHA512 c3f10632b73c05c1f67458459c0b085ee23ed70c95844a1545bc7b7c1742d60009a48bfb8b69180dd42b2f549d05a48bb6185b54ba2cb4f3c0b71f458c6e190f
 DIST schannel-0.1.27.crate 42772 BLAKE2B 55b3cdf596d6d490fdbc10298eed7cb1b1bb8d6349ac8700ac2e7db66e1d75f0a5bea5b1b322bf30cc0f982262e96aa421998151a8ee1e620b5a09d25ad4263f SHA512 f469d03c2be014c248e7b6408f541584f250a9d58bc8dd8ff4d1e63f5720cadba1c0579b1e5d97b58844fadaeff10e9cfae6d5cd33c5de0fa4ebe699a8ead4a8
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
-DIST sdd-3.0.2.crate 25156 BLAKE2B 948657f67a15a5d137ec18faa2ffd3ea59c5b7b9261dfa27fde27933ade3aab3c8427ff137e9c4a6e6035eb7d5f60f185a792c3b528e113ab76c195225c58e30 SHA512 d78dab38883a67b4199ce6df90eebafa910a01bfc370ffe2c6cb5d3e0a502cde1acca96bb0497f91b62b541e62ca67efde3ec4525127b43c9ddca39404fa01b8
 DIST sdd-3.0.4.crate 25303 BLAKE2B 9047388b3d0d9a136a8a6c75c74488eca6d5a9302299eafca9e97c5cfabc2a7eb3f76035c21f081d6f3f9cc104fb56458a1b48252c23adfaf74e31cd9dcc8560 SHA512 e7ab851cfedb69596c5497295d0d66367e3e9e6fda5879fabe131ef653574fbb1dc53f0454eac12417d0f776381319f6b218a6a2a27c6a0f55108aa9ee2b5188
+DIST sdd-3.0.5.crate 25330 BLAKE2B da350571c17efbb1575a392c32e96c021681f417c45ff9373f50952ca932f455b0f03f81f5bce1d056797b580ccafc49da5dc9d9378641b4d7882e96905eab22 SHA512 7846304e585910561c13f7ea765aeab8f41c47b08c70509ddcdeb28af409c7453b0195cb28ee824390234f51299126304d56bc160e43986a979f3c282ed8792c
 DIST sec1-0.7.3.crate 17979 BLAKE2B c30d4e617f9c0c21b80f14a7df88a164ad43f4c18fbedc1ec32af41193053e67ff6ea83db54f46c8cd6389d930984120c2a1688662fd8083e0c23bd4995d510b SHA512 be646413d84b39a43a0af478854f47db3b167c2bf1bedf7a58392782c423aaaa38df3b3676f9807a98c6128152295c426edd16d67d62ae7048caa635bf39641e
-DIST secmem-proc-0.3.3.crate 30000 BLAKE2B f7de21d6ff55b6305b3fd1ded19830bafeac54b881982224af23c3a8c47482cb3236947be7f37b49437380b6f1c80f8ad2e74da59d77426d5534de44166f6a3b SHA512 adf1ac818909e6a16133d8828632d6c41fa229873fd461be30028a57ee5a47076c444c8c48aafeb4af34a672facb5939288bcb3c3a46fc431e212eec3f73c5ea
-DIST secmem-proc-0.3.4.crate 30162 BLAKE2B 409fa66b5d5a62d2c1f0dfca096350065f07f06cd22b3fe61ccc674beb61f2a1d942e5802b87fbac058c7ade1b83e860e23242192f83b53887231622c7de5144 SHA512 8f08ac0b388e1e42935b0ca8dc328aad5721ec8e43c78b035dc7b516a047d59ae162b783ac53dabc8f5cb6f23dbbe7e1b3eb7163e69043b292233ba370a7a0cd
 DIST secmem-proc-0.3.5.crate 30619 BLAKE2B 221875c8a908278dc1b4f77c364d7bcddcdfe6bb8e9fc9ebe9f15cceef01b95e27c06a0b9f36fe42a4b099b099624f23544b8eb18db106d35c09f2e9727db7ae SHA512 24a91cbe8cc6249c03b387b2b5a846868e3324def475ec3331196ba68ebb06aa1e485392893a6ef8ccd29eaa9ecb3743ebccb7886686da1f58792b83e31345ac
 DIST security-framework-2.11.1.crate 80188 BLAKE2B 844d36d2b2216cc7055687110d54ea783a7ed9bfe6375fd4dcbea267ec85531e666fe002648110315f42c3364ff5ff5aeba711cf8d1f5358ba65c8393e96f55c SHA512 02786d62fd9dded80bae3942896bc8fea2a90763427f582bf5d9f127ca5682097b59b5dbff2cde373198ba659316ab5906a68d3141ba00c7408b73ebe353fac1
-DIST security-framework-sys-2.11.1.crate 18755 BLAKE2B 6e4f8617ab92304a435489492f1126eff2913f5332dacb8b48704b5f051e87893e5f4239ee5d6a8e5c350d14cf5226fe57a36d8119b1e150407e9b157e74232d SHA512 8565d7ca296995c2bba78a328758c84c500e95cbafc988cb595e040ce95d4114c1de46fa30224a310981c3dd2a9b7d1d98c87f129d98a0b2fbc44c72f9085d23
-DIST security-framework-sys-2.12.0.crate 20103 BLAKE2B 4277ccd8d983c2c1a60666dc443637a22b242811a71191b86e177adfe37783e15090d74b7070d6ad49ce13e127c0b12347ddb107eae26bb13b2766463a777cd9 SHA512 676a587b716894339fd65d1e558acca3c5fa1c23bb556fbeeb2b92721d54671b1014420c8893776fc1d21e544b3acf8298f07953ea30c2c118535b0dcb31240b
 DIST security-framework-sys-2.12.1.crate 20112 BLAKE2B c03abcc08f068e8cd4dbfb4d5054b4c0a75cc68f0dcc955ea5f5f958db9c28588841723bd7047207dc51bba46868fc1b8d3367b612c7f4a07984d94fc8710cd9 SHA512 5ecae3e1280d99e3730ca3be3dfdebd16971d54b8fe167d29cb07f7b3837a2bb9db2d8131bab679c395e329b10ed28ad9ad8d6764048f6019587d5e2b52c7eef
+DIST security-framework-sys-2.13.0.crate 20496 BLAKE2B 5ac84d004ed09afdeeaf531d96e81fcaac3af32207d7c8b2180a506fe0512fe6616ab3b4244c75667088e7a8215c1d33dd9274a60a400afb1952254070dbbb15 SHA512 a5b69044571e8426277b2ac241bafb53d268adbb7340c0626cf00fd356c654baccdd36277995d38601e19cfca00da8481a9c861d01bbab3ce51685a7dd186832
 DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743ad0feca0929bf2409eb81e03637ec5f92ba9f38ea386c4ee5cde72bd3d2042083e2fb0d6fa0b839b1c5093a SHA512 5ea1fa17c08d1280c3a4bc8d28494e88ee05acd5dc969ef6f0c6f91fd3b5a8fbe999c9e8bbd2da383413038b8d29fabf02b87bd5265bbb8333f3fcbe409103ec
-DIST serde-1.0.209.crate 78364 BLAKE2B f6b4c2bd931a8067482ca033211c4e85c0dfd6084cb599c38a9ba666cce30489685a3a6a8a539eb6e41141a52328943dccbfe25dbd857af16665094fdf7c3f45 SHA512 25d2236eedc08fa3b9d078a1971df705c4f428b7a4e6a2d28d9f0f9893c19de745bffffe3fa9f3c08074bf4359aaf09cc28770e4b14c21c66d6a0b9411738f7b
-DIST serde-1.0.214.crate 78523 BLAKE2B c701f316a3204625d475668d2722991d75c8d9c573ae32e9175ccf99780fbe0c9c9d1dd0b4bac35f2cc91aca888c7f3dc41af2842dd833ab82776a38c2a2f6c0 SHA512 100eac65a39b9b9c32c1671d36fa9cf8aca84a2673e24c2521fdbdb3ed9f932c71548f3f1a26b1e73dd7c92a34ffa8ed1c76eb173fa20d6e85736cdf8dc9a8ee
+DIST semver-1.0.24.crate 31267 BLAKE2B 934f55d953ca52f6c11696889182e1e4c660a6eae3917b15b411d91a18b22c6a1178708caf95da93e70e6ea97c0762ed9154333d60bf0a08b156ca7b50c4077e SHA512 751bb04fb50abfbb92b2612e1d1097f612a1ceee1861852681d6ad67fe459d77a72898903b14f2f01d8185fbbc022c7471913785610c2a8e9d6530e48094869a
 DIST serde-1.0.215.crate 78527 BLAKE2B ca8e1175839ca45a4d78a155f5943396211408a85e0840b065c52948188010653d68fc4fc7b63bf2c39a11a6988abb7f6f3c6d878ca1373596e0a5d62186e109 SHA512 3da13f1a74393f1fcb6d659b5e060a11ecae358f55cdf4a2fd05bfc863fea6f75d3140d3bc74902f8feba8cddf7dae71a3f4e4e78e78e1b08ed46b3e4900281f
+DIST serde-1.0.217.crate 79019 BLAKE2B a0aacff795d34583365ddd469fa14c58a6cccf8afbb248210aaff3134c7ce6e34b3d03f437326d7c01b3e78f82a5d19c37ed9fa4372970d8b2793f2889288e1c SHA512 f97b3b54b9e99c9a027390405cc054c3072f49c92803a4ed5f5f69e76a179deda9d77993b645b3581437085912d881da88d0451b9e0da423c64033a23fdd8054
 DIST serde-value-0.7.0.crate 10249 BLAKE2B d2d3d687cf490eb0be1910bf82c09334ffe32efc485297ee228363e4dbb536b72e2c37f3d37a5f8fe61af7480fa8975c0a654f761c55e56348082e4605f2288b SHA512 6ca9a73420ca9fb5415730bac4daa30087b1722ed7966ae07f403497b8cab95e1e1da664c0581b9cd170494242d4e01be75e1d5f9b6ce19c538e7323da46bf76
 DIST serde_bytes-0.11.15.crate 12191 BLAKE2B 71cfa0a91b274a2f31c2541c230ac16041d4454c56c70206f9b1874884cc9bf5b6ecb5a490f6f849daf391dae5888b5cc7428d8397b14e47cd8e13d973b1eeb9 SHA512 96c9f7749b15773df420fae1307ff1a8699856362775a9c9ef6a9eedaed4d5bbd4919872d8c2f9c24caed6dca6e3d82b929a9a3e7536df7e2be954bd1f4d56c4
-DIST serde_derive-1.0.209.crate 56023 BLAKE2B 752bc9f46b880d0ed8a4f7e29ffde1343c63c4be1e9740afb1a28dcbff5bedfe077eb51c7052adecfbdbd9942c30b63a27914deb6401a2ecaf70fef0f64cd80a SHA512 22c4eb76412bd73814d0b86209b110b9e59626f64b41cbc250755144e545ff30fa69972ac93d74f988a3a6a239d9138f4e8a23b283c746a0aa5fcddfbe077cd6
-DIST serde_derive-1.0.214.crate 56630 BLAKE2B c284561109e5d60e103f1bb421e4da48f35c5046aa52359177e286449cf8fe51a92f6295f5bec3dc4cd737025e8d0bc618436e2f7640873f66bc5b77bb4f450a SHA512 70bc0a31d344cfec8d30f2034beab25097ef76ab8d89947b21753f737759e5d4e60e5596e0c7994a7cc35993bae01148120f6cdf5239be25fb243056effa27f0
 DIST serde_derive-1.0.215.crate 57092 BLAKE2B f28bb66017599afdcd8d45c514b8e07854eb944c1dcf931e052a01ce421e0de6c20c13b3867da5922e2153e25ce88bf9fa27e2e68ddc9d212977f71fa0bd6352 SHA512 cae686bdf10c683149956ffe1c64fcf3e9b9bf0cd6e33b4ce7429d0ca35b9fdb55443693866c1202fa79348c6ea0f49ab3be3d5f857de4ae0818d2b4c8c67d9b
+DIST serde_derive-1.0.217.crate 57749 BLAKE2B 63b4930122d80d64492ba2718630513012202e42bbaa74510729ee66a0e72b8a1ad123784b479697ba562db43868f4bddfdf5e94bb3d744cd68a547471ba40aa SHA512 31020f4533d04b31ae125580a3c5093fad36438d324e2d9b063923aa8c125c654102ae7fbc3b3df892bb41db6b321962a23e0a37950e080055d715d15b18af76
 DIST serde_ignored-0.1.10.crate 11789 BLAKE2B 16900f4e424fe522a72158ffeaa1c279ea96d498317215d2da9ffb61963587914965c87c31023d67be67675721db693d9ecaab6f4b0e064ca438ea8087e8c2d2 SHA512 c8a0b55c975446e06ae6a6ed16690a9b0a942f9e43e84149a8d9727660283e7d42c9e0386af60c7186923edffaf1781013f52739bdd9ea0a5e22dbb006f5a413
-DIST serde_json-1.0.127.crate 149465 BLAKE2B da5048f70a0b7594be0112efbfccf8d6575a77b324d59321cbd34d355978aadb2ceea1bbcb182412547587235f58873ddd2232822f020e2db85c1599cb0bca8b SHA512 f14f5eeebe07261daded47c3cbb6d511da4633bfcc46ea1b0600063730dd4211a0c310959e4f8731a688d18d60a46f6dc1c1a1f052f170b6207877b93742a88b
-DIST serde_json-1.0.132.crate 150549 BLAKE2B a49aef7737fad2e6f6ec79cb6da00c734e7de7ef16be321846d1f6229534b58e15ceb0f6306eeae6f85bf07431d82959c0a56ed1394d21a67b65c8c48e971f3f SHA512 9d157ce7d705fee8245569e7c577310782b69675a6e459f21904544b824a1ca5c9b445d17419fee438dfeb6fcc35343ba14e022043fffade0210b6d2c1b5795e
 DIST serde_json-1.0.133.crate 150739 BLAKE2B 7891eb5b8edcc7fd09ab1e15d3881ffdcb629aa39f2bd758c0505700a5f2dfabd85b1b66c3b094268bc1627b346e204c792f4ca61efa76c54ab9cd5744fb0ee2 SHA512 20e65ec87bff319897a141960d13deb5cadcf821209c1ee8799f1dc7f458ce432bc62c16df5bdada1c8d3cc01ff23b8125e8fa0a03545d4614f32efd687dc69f
+DIST serde_json-1.0.135.crate 154499 BLAKE2B deeb22932145715d6a443b36b9b984b6ace1e254199db9586c48dcfdd270a3208ef127584431e19a826947df705de78f07e58d9126ee1c5ccd2bc73d1e779bd8 SHA512 e19c583aa4a55f1c3b9a4e49b8b5c6b66e91c893db06e52f33e87608be1ff0aa27996065157f45dd4d2c59b752259ae747b2d353fe7cd1d466f56cd8a97fe71d
 DIST serde_path_to_error-0.1.16.crate 16657 BLAKE2B c9064b28677201ead32eaa91f20444251b75e7fc7f512075cd53079fcad54006f531ab4fada27ad7414f57a385441de65def5702d592143916d0106fa8e70182 SHA512 d937e2ef7eb6f58e741f0b1805431fd8cfc583d558fd5b58aa04aefcfc61694503afeca33ad62f6a09b4039555e3199c18d5912b7d5d928120ff631949cfc30e
-DIST serde_repr-0.1.19.crate 9997 BLAKE2B 1bfc8e94b8c3cf897813f4749d6a1112c1097c2c257821eb366073a41ac46084a21bdc0ee4e3b99d82444619a894472e24fccb60cbd8a41ab7d5b0469cad7c41 SHA512 678216a62702b3300fef850f10ee60d88f31de1fbeb7300e3fbbdc4e4a9cbc95c6890c8e7b9385223ec837d9504edd53e69b620f80609e54579c0994ed1ab0a1
-DIST serde_spanned-0.6.7.crate 9164 BLAKE2B 559a62c0ac00a1559947224bd268842f35c52f65d0d52102c98b5e683dfe4c36acb015edf97c5f79ff818dc575b3ae43c3f100d18eb7afc3ab9c96e348ba6794 SHA512 d0ef413867a705080fa68f84a059b4d04b604bec59323329ded7ae03e0caec49c89fc53640c1e58c27bb23b5c9f260ed176ac52f3a93d25d8d7643252dba037f
 DIST serde_spanned-0.6.8.crate 9330 BLAKE2B 630bb2cabd74e8d9736e315ac57c4d2c5c4f72264aab35ecc8e0040cb4186885722051a9f7b8a9006fd121fe58428cbb151e5cf541e7de30b6528c84e968f7ac SHA512 2343a2fda35ff57ed8ff7d8eeadd651821fce7e22f91c2d5797c6af7db9e009b7d637382f6f390c17911912865a5aea1ce87a86fbe36f4b6aeccb065a4c8942d
 DIST serde_test-1.0.177.crate 18671 BLAKE2B 85efeedf5465ba9258f7138667cf547b4e3934b5b3cf36ceb09be04ec6ab32c77c43e7130cb1302a642586f0554c66ddaa5633f9644f9250c9db0b978993f8c3 SHA512 11be2b5f2f8e18ae5b787f26517cfd0be4750b021f792ec90f74425c54292c7b8e1525758b7fd9459d764fc1c104e6def95c14fe685261425aa162582074bc6c
 DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
 DIST serde_with-3.11.0.crate 145979 BLAKE2B 83c6cbbe14d44179321ef51a3b53e6c9044c81c24512c67b1bb0c95d51f364da71ff919d4bf517c7372998e2c8a7c373688c9c8ca0973e380df4ff69428d6df2 SHA512 d2a6d5e8075194f82e42ca676307b1456dbf75cf59172a7abe84f5398ba37f7217c86c8f71b954161a5f7c7f5163ab10ac322eef4b5fe6fbbf86550f3f37ea0b
-DIST serde_with-3.9.0.crate 145089 BLAKE2B a4d5032d864a996c2d6edf0b1ef4657784ab76b9cc437d86214024f6bd77dd59908efa594f24db4d2dca490f4e072d688681eee9d24f92c8a528d8940e991fc4 SHA512 90ae5faa9bdcc2ce2198599c546a0ee9593fffb3271c3fcc07bef5eb39fe7b44697dabdd6eaf059a166a67dc5694c70ae2908ca3f6fc65e25747cd391e3121b1
+DIST serde_with-3.12.0.crate 148666 BLAKE2B 244377aa9de46c77d12f0348a2656848ab44bda4bbac2f14a607ccfb532cbc33597e0b3336b9fff5242e8b907f59cbe093eac7e1aa9cc82e320bce011f5d177a SHA512 243b4aacf9f0aa9c3915274650c2b70ebb389ef0b1e607afba35f0144199073b573703f8b66bcaa875aeb434301ec2ad209c3d54160f6fe25dc2e4a9fe48a53d
 DIST serde_with_macros-3.11.0.crate 32054 BLAKE2B 4d4710b41c2b441d28f8ae95d95c74f3bdbb2306873dc66b1cd7de17daac257b19ca80c5d240b521353f3b67ca8c746ec709b6db65942b6289560367897e1c08 SHA512 222aec6c50a7b758ea15e1192c71dc19fbde3a99062beee12e24ff7691e0858fb84a0245ac86d96d818a877a89834c188f864dab1aaaeab22ae6cdd7bb416036
-DIST serde_with_macros-3.9.0.crate 30865 BLAKE2B 69c764f45180463047045f81106961f274411200ecec6997baad0c8ed0cc25f7550ceccba122fe3fd8d248e3a3a6bc3326f7f9ea0bd3c08e81b93589b75de537 SHA512 451af6f14cac8ead53b9705c530cb6494063ea8f20d1a7ca80561d16334985b98541bd9c3a50857a4cf377ab5d84593baadd5503676540da8212f9c5fea89e90
-DIST serial_test-3.1.1.crate 8660 BLAKE2B c53e2253af200a40abeba2e9ceffe24b12abb128a123370eff1deb0f430c2ba511e0f59d0d22e541e7993e0e5751665be6457de025fb39b43edb72db4cac963e SHA512 6c339aa658625ecb561f000247df185ff98eb3d9d117fc32c3c57f83fb5d02c4e45fba53d9f53457f87f2e7e635f581d5c4fde48cff6971fe17619307b487aea
+DIST serde_with_macros-3.12.0.crate 32089 BLAKE2B 667db574c1a7850917a6738ba55447285085e87826b04da22b6be92ecf32ade3f0e99f63c738262f822820674b09be742778223f28507daf75324f4c62195e98 SHA512 feb186b9c51325a19643217ca2bfafc6f7e5433e2e059683ac2f271d11641a7feab728c5e7e37a99310ef259faf862b6a42ec41e77ff9b3349cb04333e008907
 DIST serial_test-3.2.0.crate 9232 BLAKE2B a58cf0bf9d7cf378d8de5c923cd653f9dbb54b4ae32e039c6f57e939e0ec9eb3f26e7af78569da18cc4f63e9c05e881eadf37df2d7c2f8c22359124ab2201a68 SHA512 5cc1cba910b3e04f8bd0a9dde696bce6df6d36d2d2782e81f2cf78ab55972cf981c44c497484dde6fc249766b41f1d6ddff6beddf70406b2cc4130a9ebef728b
-DIST serial_test_derive-3.1.1.crate 6881 BLAKE2B 8dcadae7d44ecb2f4ca7290d5e1749e0ea2b21462b0020fc7d751f7d254a18afdb99456b4d5cdc35c73c9f5f5112654ecd7e06cb3afdf384d93e48430d11dcbc SHA512 7ea928622fd1c8b0e9103815e181ef179a4bac91b1b7de8937b4c97d7f552b22615129df29598d7415e6d735ac08f5fdd7d09f4393861714354bf47bcd6dba09
 DIST serial_test_derive-3.2.0.crate 6992 BLAKE2B 5f1e40295e4dee1abdeecb9608a07cffab2ad3a4a53c36b841c4196c60a8a574a1c112c0077e9ddddeeb6f665b526e7ea7287d6c8481e2b80cffdf069ba2281c SHA512 b3f03f51e1bc880c0b3f1ae5ad5be18dbbb708c43ddba1aa14a29f62d712da031dba7223eab850289464862f1b575d77d00501bf00668d83443cbc385aec11b8
 DIST sha1-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f
 DIST sha1-asm-0.5.3.crate 5830 BLAKE2B f0bdd5f39644f59ecb8e163f797f2398afe3735adcf67b86340028c422479a13d3d6ab89c13044cd05ad52cd56ee170253a384e719b85d1851b4ac4a4501ae62 SHA512 dd8658dda1b44120b4475e09c51137b9a83a9c55f3d141db8fc170990fa1dcca351194b8bfeb610e8a6bc8846a1edee05e3ae9bdaf986c0a0da0e8d52c34a7b9
@@ -576,18 +492,17 @@ DIST signal-hook-async-std-0.2.2.crate 7751 BLAKE2B 875a1f92187eac245eaceb0d8d6f
 DIST signal-hook-registry-1.4.2.crate 18064 BLAKE2B 7274d4c115678eae2640a709bf9d682ce867c1f6295a0c5f49e492f95dd1c457f20b56207a74221df1fd9d744b24c6260e28f705777e3c7d47b7bdd36f1d57fb SHA512 16362d232b1d301007c069198d7716848aa73d898ef92e050422b36c09001b4334390dc95a6650e5315377fd8960d4336e5ae869b0a305e8525e977b8327c508
 DIST signature-2.2.0.crate 15531 BLAKE2B c584d9ad52a1ab3cdc129c36cb2ed6dedc40a8d49f7294352a7df8121dc57de78268f15d9ff9ce076abf1dd3c56773daa26ed5ec39c83a600b6a377b51d4db37 SHA512 673a8f6229c795cc8f640fbfe02cd912b41c6359ca23c5ddeb1679f49784b84f109c6c45e6210201c9ca05e441c1be64ce6537e81ccd3589b37be6d0bf50dca7
 DIST simba-0.8.1.crate 52545 BLAKE2B d6f02df46cf10e8c9728c6f08a923781a970b78158063fb475c885255b6d1f9bbe485031c5a6654f074752537af252c5e67b2684a1e0759315c91c5988bc1583 SHA512 d17f2338b03dc319221c3b1afdd54d3f34c5926ce40ab22d67030057b407c8e2c6c9617ee4d1f5e637b24540baa5aed5bd9cea06e6e6652e05d5281fb702eb80
+DIST simba-0.9.0.crate 52680 BLAKE2B ca9c315f05b2402f3626dc4109f85ce3236555a04419ab2fff5b82bb36523f0164952e59b75cbd541467310694133f0a68c14a52aa1cddea6ff838e05f7a4f69 SHA512 4aa8a6aa50fc931d7834afcfcee1b63bec32df629ebe97c17a45379178c1e234cbc693e483b127572b6a471c1a25618c51860a9bb66918a630bddfe03b1894c1
 DIST similar-2.6.0.crate 51659 BLAKE2B cfd3fd530a1bb99d63a071f34b7db55210edc3a4568b45a39ad67a0f9c1ba7fe7619a5c78f452732f698cc2f4df8e2e90d174c469e103338a70af016c030499d SHA512 cad3a5fafe3ab0c8eb08d87f982d7d93b9e65a714e3a313db92eb4e3b2c539657bdb7df4bb71597300b690248f45013401ab83f949fa8410606648e2ccb87e0e
-DIST simple_asn1-0.6.2.crate 15992 BLAKE2B 3abf422412f51d0f8d3440c245792b817eb3333d58f27146109f11278b8eac4b49898264e266de3d00816319aaa822eeb0d1115e46f96f2c9a971b41a3edce0c SHA512 b2ad0042a4492f8cfdbf475b52c87431dccb91444ba3ed026adc488c844d1182a6ec88fc833b5dc0c2ebfdd6194c5b49289af71c151822228b8ecf89251ee9ae
 DIST siphasher-0.3.11.crate 10442 BLAKE2B 771221614bbd56f609b9743da4352dc7a2cbd0f6257952fab0cd052e5e5b258a4c95a0461d6d1b579dec90b72d66a0e58e036899b3db8341ae753a421a4cd4d5 SHA512 601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b
+DIST siphasher-1.0.1.crate 10351 BLAKE2B 6653898cf0eb071fe83b7c317f93ffb73bd26ed601961173875b26ec8851632599891ec178b7e14318abb9eb98d522db8022deb852af9ad9f6bf38a5a5708e82 SHA512 d230991add51a555af95b30ef104c0e5ed7011fafb92d6ac9ba0f238c8bf4d2fbd39f4b04dbbe960453f8fdd16d3768ba39f39e4877ad453562e689ec8f24a28
 DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
 DIST slotmap-1.0.7.crate 61390 BLAKE2B 56f7ee840f848f2331bee7d7e31aa66f2185db5b57fc72694e1514b462dab8f673442c36f7b9260d5db7b68a522ca76f7748aab774246bb12c2ecfbfd3e7bb8f SHA512 f130275c506a3d648b5d66acddf7ed88274fc381d8d0101ea5b3ad931069d4ca46b856d75311e95e09a23c009af343c7a4321023bd1d065d3d516a0b4b8a3080
 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
-DIST snapbox-0.6.17.crate 54102 BLAKE2B d35081b1f799032519898ed282a46aa6a4888d5a07fa13369fa8b3badabbc046bb08283046c1b8b3db31034fd03e4c37c60b5b2779300d2a02e7b1ff73f3cb44 SHA512 ee990e1b0851c40c4a9c88de737b430f57eb57b3ca55a1024786b82536e6bcf1e390e94864637cc8945b30ee3a1ff7f88ef97fbbadaea11717d587c00d078b8f
-DIST snapbox-0.6.18.crate 54153 BLAKE2B f61d75be2c70a85b52dc860bca7b51b7aec330f6e109da1194b75e37eaeb39d447ae356e049356ad9f10d9a9932c8d89332511a34691971295ac5966022bd6fd SHA512 834f12fd31cc5595f54eddb9d007d35ddcc4ca2aee3e430340bfaa15d175cec4444f18d64098c4d6ddffdee0da3dab1c72aa7ff735e4833a96978968f800213c
 DIST snapbox-0.6.20.crate 54265 BLAKE2B 6e2b3dcba647d4d4cc47085f4af13873d8441c7285e2326054c5a8defeefe5f447b5eb3bcaa7c59e6afaf95268fd1963877722d4d6129b3b27db3c889d95b5dc SHA512 f556b1d1f76d51ae566ed8eae92053b2d58ae3322b23f7fef3dcd22488a639591719eb586eb34cce525cb8490571212da317b76ba9b514ef70410ea4101b5902
+DIST snapbox-0.6.21.crate 55301 BLAKE2B 41b19da97383e0fc4f4960b96459079850f074c974d1bdbfec5d51b259182d6011ee9c3e0f66fb042e6301015e0a72829beb6c0788c8b3fc0e1742736fa40627 SHA512 876956af4087cfd1fe5675f02c4578a1c3d3adc2a05a49a14db63f82f27459d0aea1d5716c711cd7201fe3293f76c642777c38fd2ae091ff19ae3feb9cbceb79
 DIST snapbox-macros-0.3.10.crate 7129 BLAKE2B 74bf3d2b0308ecc70dd935bf5a761a9788de2c0da14277117868b892d0ed850018cbc234476a8da9840d5a61be42b29cc8fd51a0d81410f15bbe294a11bdca9d SHA512 560a6d6d236d24cf9e8b59a31d01027cb25beb26080820edc28dac1e6e9392563e3f0fa858c19d47b22919859ac13551266e648d0eb47a434a2008196efde410
 DIST socket2-0.4.10.crate 45697 BLAKE2B 1af475724e47f0d7889ee092c4bb5ed34cd3a34885bb3d65a7c11428ad224174be94c617f5215ed1a1656973e112e40bc56ed50666543743371a65d61bf3257b SHA512 eeb0bdb86ad969f3cce4735c99aa812a867b11a5ec88a53fc7f5e399c510b47ab14d06bbfba63398fec0a0f65835edaedb7eca7fe36aeaf4805843aa9f0dd5ce
-DIST socket2-0.5.7.crate 55758 BLAKE2B 148d2e2b6610895ec555b1357b340576984eb76cb3ea719f85af50cc4215b2ea2db739e2a61434c09360a0c1ff8e05911764e18dc4a59451c0aeb0eb60b8403f SHA512 ca37157bfa970cf3cee8b45c7fe64930becf2ffbbc309ea4613be968400279b70edd084d159f65b76fe1130917312d81455023c0d7c1bab7a59c79542aef9dcd
 DIST socket2-0.5.8.crate 56309 BLAKE2B 309e5a0e46d0b9debbbd6049a138e56b82df4fc0e9d1115745ed935eb40c81b004ad748844f641934e13b5b88773db5cc4a57fc9e61dc82b5322fa0232110864 SHA512 b7d03608a3d4cf3e2d1539b5a375412effcc96279e8f57668fa8cf67b3f0a3a6b611ea5e2e72f282460582954acbb5364320611f7798a11ec9e4833e53830b60
 DIST socketpair-0.19.5.crate 19302 BLAKE2B 7b6d639e16f9e555e1e8c82bc2e4b03a8bc6af403fdace400c0a5c05e20096ef5f477dc40f5ee70c0f9cc833d4e98dbcb418e4890375ab93adda9761dc11595a SHA512 226c15ab978b5447bea899466a38ce8e80bece1faf351b129bf184fe6dd2db18261ff2a2e6f5dcbd0b156c10169b7744255696ab3a0c4fbc9c0ee4f255ce3ec3
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
@@ -595,112 +510,99 @@ DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d1866
 DIST spki-0.7.3.crate 16409 BLAKE2B 6b39144e4e718ce5eb454e21ee89fb936ffd31ec99554b0150fee47bca396bdfe4ef39603ec029d4af4d8c4c3ba2de7f6c549244f8c20114de9b43ff14921681 SHA512 d33a6a7844b33c37628024ccf25c1a631f7a6661595e063049b8c9a9b4edb28f0335397faefc592c6fc5e96378b870ab5dab9b0649c3387577b2370ec8210db9
 DIST ssh-cipher-0.2.0.crate 10843 BLAKE2B 72984af70ec6d814b688834dbac1337f9ecd0e00c5a2740f1d80464161589430382ed8960baaad98a41f37270395d5d87d1ac7b65630211104c887662786dd2b SHA512 b78e35365fd503418edb9e061c5338f94445b8465fef396ce2c0ce2a18ccf8203f81fb2890eb851798f9cbac0003948a0edead9b2df03a57135d6caae106c6bb
 DIST ssh-encoding-0.2.0.crate 13600 BLAKE2B d90150f5cc2399d0beb08742280a147e22e8dde23eafb4c36e1054bc156109e273926186f862c79b965c45239d5a7f71bc03f597817be7feeee143b56e50da79 SHA512 bdf0ea0691c140d0ba04db4e465dc2fac0ead483dfde6b998d87563e2dc3eff1b4553689df3bac1811b13c3866bfadc162d8bd807752f56d499690145a2a9662
-DIST ssh-key-0.6.6.crate 111935 BLAKE2B f64b83168707668814e11270c5d4eb6826a238c654cfbcd3d99296d0da6733061e19a2a2aae0564132b44e016d310c72b3457b8a7152066b84e8b21fb495a4ed SHA512 26e5219068bf4241b9ebd4c1708a6af868ced77c1d341e83ba91120bcba20e78488b5e7729eb52f2cc8d13e552e0267eec0c4016969a5d72221dbc4b23d939ce
 DIST ssh-key-0.6.7.crate 112921 BLAKE2B cae14b5a47e29407379bd78626a6275faa8a74a71f4801f6f262b0141166d46d64349f1d8875adea706ca566026c5a8654fcd8c62c5cbc043bcfe7f9c0cdd205 SHA512 352bea55c47b66eeb41e725cabd96bb6cda63c0e328b3a7966c5b4619f05e018bed38f100abbdd8864d66ed8473ebb76fc20ef2afac940e900c37456ddc5b699
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST statrs-0.17.1.crate 139729 BLAKE2B 88c0e712604d8a8de47aa3e31849e78939ae1717f2feaf4df881327eab812099d899700f1cc8fde8613acec059ba7dc630f6b53d8c4746fbdfec6b5ae081a38d SHA512 b8c3732dac3eb1ae1f1e8a8143d402a2e8786d1d652850559cae1c24fb1d9b24b0282af5a0aab19e15c6cdba7a71fc5d4f5991b677e9149a3bce682a5ecaa212
+DIST statrs-0.18.0.crate 156842 BLAKE2B 7045efb379d1a65e6f6e5326024cdf819b1ac0accb05cbf6fb76eb77e7d73b8e37cd1aced4283c800bcc5c913b8ef26c72dc2d543de8e6dac3a5165eab84a34e SHA512 c3c11dd9af5364d0fa4ca8b63e65f80864f2558ac804f97c93df377858d6a1a2c19b981f3558dc72f01e82de39f8e3608e11548d210277d5ca35e67a111868bd
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c
-DIST strum-0.25.0.crate 5539 BLAKE2B 9c031e5ce19e2ecaa63e63118197c740ae9295b8881f6280ad92847b99fca6fb08b0d395ab1b2a66e25c8374cd18866d8436540538e3c0f1f047fd2235971b40 SHA512 a3522df79547e94518f25a0e29248f67f1d7e2586a7a424d7d996cb6bfe5d98fcc4fc44da7ddcd4e35a1127b2816bee55107f30cb2a559f5b9bbb1346139544a
 DIST strum-0.26.3.crate 7237 BLAKE2B bdc348c718c39609c00b9fa7d47b7090b1467022b7a8a28cc7c8a72a0aef20569c6ab22a8a8d26c2d9272f18d000e4ce94858a6647194f0a7b86d812d52b05a9 SHA512 62f116d5bbc6167a6ac68b049f8045bc660901f1ce1252f8bdcd91cb28bef821aad8098905369db6c2fe74c134a5d549e55ddd28e383d7d78f7175258924b268
-DIST strum_macros-0.25.3.crate 22570 BLAKE2B 511af0d1f0f76df7ad1528c79987b6e09390bfb33e1c34078fb5450171aca7f169afb83fa2f2338a861ded6842c8535ea6e4cdb0d31f341edab0a06d7eeac16c SHA512 e6ebc00943d9f88104815a5bd6a302a391a06fb0ed5ff836e01d341150628684e00e5e2e5b3f6466ece92d376985246f818243a0d1d775cfa55d1c50c0ec0c62
 DIST strum_macros-0.26.4.crate 27531 BLAKE2B 7f7d57c957a1591054288fcae6590a5e669fba1b47d8f1a52371ce60fd84f91fdb430e48cc7edbb5fc72914be5ce12af29758b653680da3f4177339b31206750 SHA512 77a17ce47d5e8fe8a89cb6aa6c3ca5d5c2625aea0f93456f05a9994238cd3b08b3f7c6a45e9b3db21bca8fb5759f505f15cc111ac84acbbb34d59cdae8307b0b
 DIST subtle-2.6.1.crate 14562 BLAKE2B 3cf4940b7a01f04715da1057f6a92b1043a6b86ab2ee7f9fee0337b680ff781201d330409460f6f90b3f81bb5fd4b563e17c762c6e824ba3b0af99e4ae7d66bd SHA512 f5946ebd9bcb8776ee3446abcbf4afb3cca5d8bd847cadda87e864333ac7ded537a3efa773e9648adf20ce4add2c1da85172cff88c1e1a3a6cb051401b00c6bd
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
-DIST syn-2.0.77.crate 268784 BLAKE2B adf14ddc4b284ad78dae3c05be7e63a58a85a2ef16c1051b991aa278843ba7231f0da3cf2adc65eb95762d4c88b4e1440cb616c651d3bb568392bb036399304c SHA512 f8030332c3c4ab34fc1e86196eb0eeda9700e5438f2a339591a5968d8bdd3373b523dba4bd998bf578e4247e0019d999d4e9c6d062a1dedcafe18d27b6c9f6d4
-DIST syn-2.0.85.crate 275231 BLAKE2B e7679e81bcef87920bc0ed707c997563844ffa1e9d470675ae6ec11d1e045e04ee2ad5744d423b8bc16def1c197ebecd874f468c1e12244838d1b4f34f9c1a30 SHA512 14b1402d2cd91456eb32dcffd494592eb3bd848ae22571f7ef0686493f91b82d23ba41428f9d31686fd24ea6ebca4b239b6c5099302a32014dffbc4ff9afeec1
 DIST syn-2.0.89.crate 289852 BLAKE2B 4e2b06d2a0ea9b8970338ab61f8c5569cb7c10466dcf139576d0618c3690cfd23c98b66f0714c34839364dee72df6a6d8571f73dbf03ecc347fb1effb118fc2f SHA512 d172936f04a383b7b5e79dad328e70ea3c4faba4a88d0b6d186645413e8698434d30f53012cc9d3813f617c8bef75e95a2d064fdabae7867678abbed22bcd910
+DIST syn-2.0.95.crate 297136 BLAKE2B 5f0ec2d11613e7c172ba25302e4303b09c8d81813735a1ac6d368c7aad5171198dd276365ddd2fa3fc9f3cedf4951cace0c56831c7cd40d71ecbdeed9a47886f SHA512 2c1ebc62893830c34815b29fd6788b3a3b80cfddd5e303fa438569262da1bacd9fe3b892881b544e022f10a4f0c2fa9df1569a73418ce003cc7c8cd8c7420035
 DIST sync_wrapper-0.1.2.crate 6933 BLAKE2B 0ec797ddead298a95bde0a508ae942a4e90943948d3c1e4833fb3ad1cefd3566b7fd1aa0b133d614839707e3f416e3e739099ac73441527213da81b6d1c47d50 SHA512 ca7cd7a6dd242fa420e8dba820117d85b1b11ea6a9fd99c92a5a260f12263cac0c034c9f9fe10090d5830fb5bf5eefc8a5a0d0b5a40f3f809d69e5393693d5c8
-DIST sync_wrapper-1.0.1.crate 6939 BLAKE2B 5ba3017c80445090b5d1d4c4deb5a639df89a9f58069e136963e52799f8327cd65f9191911d3243e760936c06bdd29884381c375054e1ed3a07ab44b86d7b89e SHA512 9b83ff2f3d379ab955c16279227c7bc4f5c00d3f1541e5a525e8f89cb14499a02c0e8e9ccfbfc16bc59213385f837ea206d4c09116d231d143b6f8b3d769002c
 DIST sync_wrapper-1.0.2.crate 6958 BLAKE2B b2e162f982ea827229dcff468bcf31c6286c57ea3491a909784cdb50b0ba36c3a1a6fbdc7b34fc2aa9a7df1d174393d61ea9dc7ab3439a5e1a1884e2473a70f8 SHA512 aa314a6ab3ba028d2a169ea55a50eecf3b73b475a81c91330430ece9f1734296562627a8c32fad51b5a26796931f364e2803b3a13075ccd9a0aa614d5220903c
 DIST synstructure-0.13.1.crate 18327 BLAKE2B b29ee88c559a2d58fa46b7af155b448f001649ea79a1898f0ac87e69108b87c65cbd287d8f9001f360df7fef06ff39c937b48d33e487a30c8eec6a46c639c0c2 SHA512 09024193b44fc9a8901bda845b9f86c57dad65d0f53e309b2e7e968538fab6f67db1c86e5e52a2eb8fd116dc073e3ad10983bd60764662ec6ba94fee22a958aa
 DIST tap-1.0.1.crate 11316 BLAKE2B 60786fd5f12c2f06097330c26809fdcfce62716586d2e1985f8c01406d356ed0ab730a04dfe72ee3e1d6208a53c76c66883d45a76130750b41ba5b82aa721b83 SHA512 d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995
-DIST tempfile-3.12.0.crate 34423 BLAKE2B a8b84f54a54be636f5b69791ca567e8b692d6a8485ef37e5a8340d26b32b1b0f9f8e9fcd9a2da90ec2fbd39c281d364dfc5723d06892832edb79ea5cf45d069c SHA512 1a27513548060984be894e6f8fc215831e4b2054b2244c6188bee76c477c001f294c762f2f4a14488c58c04e5d1473806d589c7bba1eaa2cc02d97656709be66
-DIST tempfile-3.13.0.crate 34910 BLAKE2B 736378935088ccd8b540997c0554444c3752a74c9a4bd82cfcb700a9b22f572d0f2b3e61252064d4a631b57783199cfb42309e518826346a83fb5adb44843c49 SHA512 68701bee80309cd8dfa96c237b2344f26bd03702d2fc2e1a253820c98654c85d802aee1e0fc856f6372159a92ecbf624f78c8146f34a0cf924f5b56284915f85
 DIST tempfile-3.14.0.crate 35065 BLAKE2B d155a39f6ed6e846bfd572ffdc73f306d30942642e07f2b497963ae150b8ef774dd046bfb3ce410fa326c8e1df27b0cada804100215e01d02272d6059d5294e3 SHA512 98c1ab70eb3efd2d8b16ed58c8c83f8599663af7ef269304e908a04c38334f659a4d0b1647a13dc0d1eb90a293f1b37ec8ff0b9b45ef5b7ff1b4452bbfcdcb15
-DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
+DIST tempfile-3.15.0.crate 35693 BLAKE2B 1b4d6b17ed4263ff89ef6967650b0c18671b2b80cbfe388cbfd77ca597473e91c1c7aebfc715d0fe4360c20d0f235df31147b1f029b471aea8c57d188f7c2be0 SHA512 82636d50a29e1ea8cc61e80dc1fa28ea4cfaeb6175e5bf0558d6cd6f8da823f50a808a555ec17fc8601acfd0f504e15688fe95f64e8792feeb216bf27678807d
 DIST terminal_size-0.4.0.crate 10036 BLAKE2B 2f910a6ecd80a3fba12811eff425fe2d1a7c474d8db7f673037c1088ef468e96d41fd13fd3175c84c20da12195a07bbd4354767bdbc64d757feef86f86e384ec SHA512 b1a66cdf4e94997b5291f3becfac1e2a838f6c3f6c068faa1ff1aa775b2a97d41be2aff5460d88928786cfd7dc8dac5e2d46a62b475d40343e1fd517c6299897
-DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
-DIST thiserror-1.0.65.crate 21825 BLAKE2B feca5315211d9c2f953dbc2a1b94eb7e00aee29918617b033dacd24fa8575bb3c540dc788496b4d8c4f2ef93715e2c1586ebed9dadb4531c13cc8404dd5860b2 SHA512 80a6525265bccfc890599070166133c25ba764d6bc63a486e5f7350e473826c5a004b08a5c58b0fd4c04dcafb7649617720021564717021230078ca0bb416697
+DIST terminal_size-0.4.1.crate 10037 BLAKE2B 1d99577917b88498902d85718b4ba71ddcd7a1daca4f1b38f4b5ea4c34533eab9cda2cc344cdec5a31ffe0152fbcc5d499ccb40dc73f985f083a3ea21b0b1226 SHA512 e07bdbdf695bf9a607ea7c7c4c5b22a8637b0871877114aa305717a04d31a6b7670e2a79435810aefefe25db8c9a655e4c4ba6075d4ec76322a30cdf71ff03be
 DIST thiserror-1.0.69.crate 22198 BLAKE2B fdd8ca8c8ca78702377d0bf7b253440519018275b105db980d63229d0d44aa5c39a703e14aa6fe453c779b3c864d8044009dfef893d2a5294950f067656d7a80 SHA512 ef50d2867d965da1dfb29d26faf6de273b5fadf78f95313f6caf44d68bfc610b9bd4b7544200b05bb0861231cfc84e961007f8db83c7905244c492037fd31899
 DIST thiserror-2.0.3.crate 25559 BLAKE2B 4222d28be8ee9b2e74d647587b9a79a1584b158a0eb9fc6bf642a1f008bc2004698d3aefdd0ad8305052bd225eb75e57d7040768ace9b0839ccc135c92ddba1b SHA512 f6a8e8e1bb6d6e10edc07c35f3141b4b3ecb46b943b4879dd8f8bef0306feaa5446d8e47b24cffeb4cd6c57b4715b86b2bc0716b4ef7dfdaeb080ecd29646c9a
-DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102
-DIST thiserror-impl-1.0.65.crate 16077 BLAKE2B 06b704bac22338710de027d220d86451d2dc832df722888d01d35f87e34853d683f1c2508937ae221cf0c7d20d8026092d676f8910b18f7cb3b21189556141c2 SHA512 ef211d621322fb5886b2eb3c7fdc210c7885545a736bb37b195666051a8b47ec8b771fc4f6c641cfe36a840cb841186ba132cc5a270caf3137cc17bdd061251a
+DIST thiserror-2.0.9.crate 28531 BLAKE2B 7789458ffcb381e2cf02f182248396c5e6c20a818e4c5a2c7da8a8f50099c548646b51dbfe0630a242f24e9aff65e215a4473e13f63bbffbd80a3429237c65c7 SHA512 b7b5f54cde87c21e8fac3526d5a140c0d64116e700d07eb28714df3db372a42fba30bb37817282d0ee1b5333f1998d1f628d43054e59fc39393fb567c3df4cb0
 DIST thiserror-impl-1.0.69.crate 18365 BLAKE2B 51663251ea6ec99c59aec35fe73c5f9760809d6b6b7eaa8ecbc8f6939acdc4d0ebc11f9034d9204dde7bd689d5e8303ae0be86e298745e9ef96825bf73453a08 SHA512 579eb796c8885feb01d27638862823acd96c79440655bb444c3445ac00121852603396ce7439aed617c0a0ac69f62102167fde5845411c906997574a46d6d9e3
 DIST thiserror-impl-2.0.3.crate 20283 BLAKE2B 3b9b162b46a0fc6e816b3dd6c09b6ba38224c4dba9fb41e4048cc4543c6c2735ee34a94ba205be0b193debd7cc42210be5f78d9150711c9058416e41e56ba2ee SHA512 50bb722db6bff4f18975312be61fbf201b8edb29a2c6420d8a2a1f2817403aa09c6de1269e7f952c4d4583f0dd2ab1eec45b26e5391b6bd69c6450c8e42019c1
+DIST thiserror-impl-2.0.9.crate 21023 BLAKE2B c2def0cfe9b9854ce33075fc246a2baba386d8f3a70f26516124f5ff4f7dbb0cd0b8887882c491f37652b565ee4fb3e7895a39cf34564a21e96890fa6e3ce125 SHA512 408f6a4c0f6cee36f69fff5a2f08cbd349db44753e6b6ac730c418fa1fc06ba7f69fbf248182af947843ae49d5cb5ff53980cdb18cb850ea8d7d9ac7dc8d67fa
 DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492
 DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
+DIST time-0.3.37.crate 123257 BLAKE2B 5968d85182e3a945c194c0e405a3c771698472f4b4028a01870e8dedcfc5c10a32e167715c7c12626b46b9ddd758c72e0188b55e45c0396cbaa42a65920ae28e SHA512 6d007507f79c45a7408675b3223bbf83a133bbaf96429ae6a02b5db09acccf884bb8323dc6f3dd05e7ce87a78366a55bafa6c6ba31b04198a31026df4ef425e2
 DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
 DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
+DIST time-macros-0.2.19.crate 24268 BLAKE2B 18f0601f5307d310010bea20dc7171adc8600c5b2e6303dc9b38ebfbaa7fb59a029dddb627cf5a5b7fd2f7ed66186dbb5321cad0f90f3f85b6edcc901a8c2855 SHA512 c58aa596247a4cab720bef74ff43be44686db2da2978826a1f9b58c640113b5696efc2ae1746bf84042fdbb94bec42c7fc34f7ae6812478f55849a12a90dff5e
 DIST tiny-keccak-2.0.2.crate 20129 BLAKE2B 105a2d2af36cc053cd95721ea563108f33b8a3feb2ae84c75a04a65ed5d548dfe35d8b2e48977a82f725c0ebcf914f21157c547f4a74bb4d98c2e894385139be SHA512 c0219f23361eb07e0a68575c461a36b7286d9bdebae89080d9e259178d402b0c7762ccf33e65a16951ea168392322c44a24eb55189cf143e22d09d6dfc4acec1
 DIST tinystr-0.7.6.crate 16971 BLAKE2B 33a248261c4cded41a81f0d6e6c8df55437f042b37f235c39787986ec562f0dbff50b282ad0f1483daaf49c4b33e6618e139a6677d1238c21f4e12082562b4ae SHA512 a33051848de248cac0a2d151760a78cb3aa62c787d84ff7aac38b11c0660e9188e4d43d43a77fb8676e49ac6102015e9c3db057848d809e71981851875d0fb25
 DIST tinystr-0.8.0.crate 17567 BLAKE2B 47d65409ec19e0477964c8aa5c4e52219869c18931d95465ffb759cb84a736ea49d54d5f575d9dc62851b9c53d0e9c901e8074ec08e20c716a1a66d863983641 SHA512 864fa724f54ac32f51ed8bcb9bdf36a43115a45bf508113baa3b0d8bf8424cdb0ce85e90a175de68749b9caa5136287affa71d89c3ec9094d2ab1c0699e1cf3f
 DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
 DIST tinyvec-1.8.0.crate 46796 BLAKE2B 720d0e6d881855a36779e12f5ffa708d3a8b96e6d0de9056cb33c9b8ce0d408f99b22f5b2bb9d64bee72a011fef846dbebbea2ccd238d7b951eb5ef0c4866e05 SHA512 b7b32e38229645965900f80f298685f13e6d13e58cfd6945409a6643ca9c9adc2621456956d5998ab9dd91c2db4ae79638b156ca0d9c7c5505023fd9b28414df
+DIST tinyvec-1.8.1.crate 47269 BLAKE2B d72ec2417520fa0481b8447e6d75e1f24731d38f9083a711185785174a8567c81f6416468b9eabf426f9d32683231e7c5e80202292d1e424f9e4ac9cc8b3e765 SHA512 db32a6beb1c86eb3e9f5ff2732a4acc03d1d684f0e54df5de2ecbfd08399639f47396ae8b17eb5f0122a09ba0c313f39bd73a6f7c44cc38d1891d1bdf3f2d176
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
-DIST tokio-1.40.0.crate 789848 BLAKE2B cbb0aba8e31ab37afd21ebfb89b5dc961d3d19d38711786ac0860dfd24cfd7ba8c8998788a1e4e5dd8435c498fa754742c183cb8ead085c0f98a06d851a9dea9 SHA512 3026362f2848d9e7fedc9005e8bfa0413efe18c49a07f85b9c7aba619bd9525f6ee8c3c65621e43df3bf37288f5b7a63ea57ecca061e4ae7153834e93108bc10
-DIST tokio-1.41.0.crate 805168 BLAKE2B caefbbbb03450cec3f3d5e445464254c14d24b2a905b1affe54ca7c89765e91a2bac0d35bd5794e7fe1e78a7de25d6d84bd3aa1bb59c98eae0e11f143ebdec48 SHA512 62f31b33cbd595f20c3b3169895163fc2bfb1b4f5ec2f6e554c7f238a0b63c8431675843fcd1be0e9d1d8de734aac69e41bcb8b5355516b1a239cfac1e9c62c2
 DIST tokio-1.41.1.crate 805675 BLAKE2B dd389d00a78c341cc91f6b26389dbcc7aafa193572f7c6692cb4cca93aa25d4128f7a5f0a65c60c8941fd8015f558ec88bfded2db32d986be9408c8a2d493e7a SHA512 6299350980baac47f6d37a16e75f97eeca9f8419e073c5372e984e755d7444ab9f88f104d07bfb1d73bd8a72d997a1d6a49edec457f681ca1ba15c4481c7fe8e
+DIST tokio-1.42.0.crate 806998 BLAKE2B 9d33a892eb8de63a65218da70f29f21b75b5b9635cbde0ae0667f6de117a4c6660cb2bbc1316b76e9e796960b7dc6c2b31c146f016cc147a2f11333b26391a5d SHA512 3cdc72f3209057cd0f954913f3d26d275246e0a2d63171f84449257de55d1a416c65b340d38a0d0c7fa33bde36bb612f550cbd43a49df22781c84f8ab2bdad9f
 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-socks-0.5.2.crate 22102 BLAKE2B e090d5bf4cba7962f135728bec9b6c2745fa500c1876239ef4e5f88562b59600bd94cb5375a1c65ed923f0f11a0ee08d374dcdaa77e68d848b1b6c81612aa603 SHA512 ee0704ae63ccf65715bed2bb1b27f92042016e2cf4ea7c2dbb3799e60d068ab9a541ab3bf1a55523d8391351430b54c93829cb54f7290f47ee949e826c98342f
-DIST tokio-stream-0.1.15.crate 36284 BLAKE2B e12d50652cb39227da004ce6850413d21294142fff229dede50f2d6736753cce87a6b0d864b0446fd878b4cfbf715ce94a9a7fdde0ca6fceff3d5d5fa402553f SHA512 3e6b0ecedd45fe6333689b9dff06c85a5dd9beae461879278c795782bdad0680c6744cadca9ef64d30abddcf1bc83b04b489768a0777f7c6a621d2ea7cb1328b
 DIST tokio-stream-0.1.16.crate 38312 BLAKE2B 39b9ccac4091e8d882e1dac43cf930bd4428669add837c2fa989fabdde8f2edc5340df83745600cab1d0880a87668ea6ac95dbcdfa02fe171f3f763887374e9b SHA512 1e9013ff016b59b99b29465f42b4dd61f0a7feeabcd35ecf39a26862ce3e00ac1c818d012d0c62a7509c244d429c8a10f9afdfbccc2e178a5e62fbfe097ce39a
-DIST tokio-util-0.7.11.crate 113421 BLAKE2B 2bb1c64e4698b99a149ac3db137d9f80a691199397f98f1e6fbba14f411e849859d061e7052cd3955f000b31d97d594a4bab7928fcbfefcc9723980d3a1c80f5 SHA512 09956fc3eac8587f48cc739370883b96d19eb3de19293d240396b64b187178adc081248a5ed3d15accf97c27f9aabd0e6a1e3e2a194f330a0efcbebcd5055360
+DIST tokio-stream-0.1.17.crate 38477 BLAKE2B 9b8d7307ad8194145ff8afe682874d9f4cc7b06a11429005912dd9bfe1bbfb980876bf831b7d715552bc86ee18344eec331fc18c8871681d58171abcda7252e7 SHA512 c44c5da6f916ce128e8a13025d9c3e92ddb4c82d2cad52bde4bfb982e6f83eb89125b616f89f2fbbf9ba8b7f800ce46e33f43104a59153db2e950bc2f0d570c4
 DIST tokio-util-0.7.12.crate 115177 BLAKE2B c6018d9d228ca74f198767ea9be53569bcceb369e4dc9ea10b31e7baa0a4a6368f1ee23532121499e31f2da3f825184ef7f8e00911efb1c2e37295c1ea3ef19d SHA512 df30a9b0cb435bbf3030c1d5bfd4391310b96833acfc623f5343fadd694fc44601fa07663fefa2cfc6719d444632890efb696727d9c1049376fc6e01f1814c78
+DIST tokio-util-0.7.13.crate 115191 BLAKE2B f4acc65d0fd14a88d46545bec2313cb1f25e1cb76014d09c34f8a8be62c6901ab09b18d7b32fdab58f6594fb861bfcb8bfdc8825871347d7eabe2bd8117768bf SHA512 2a1e8fbdd094f81e00ee87eb5ebc4c62825945048105970e52d6d0a872769d268a41ddf91c60158c02a303ecbaa1b19795948b5416f9bbfcb079c5b27d39d51f
 DIST toml-0.8.19.crate 50974 BLAKE2B f68987353837b74421256fd9a76134bfbfe93887cfb25145b65b7e6b31ad2c3a3384829a06f50c771a2a0be0c5467c856cc631af69f586ea056c4f15af9e3b7c SHA512 16fdc58d14516e81badbe8c9a4506db75b559b377c9c4fecee79e76007b31a4abfc8c8868bf9159f79c6f7c0218f93bdcfb92b669b0917db7da42b51ec155751
 DIST toml_datetime-0.6.8.crate 12028 BLAKE2B 62113366771f22b437b2ed0d3bb2489ae9078cb589cfad2ad2e92c81ddbda48f689e5a573366eea4f54c2b3cbc6b37eaa8b442b6d935b631a992de4917268757 SHA512 d38b98db3b2d4eebd3001d88e2135b6fdbae63b200f7e900c6bb9c121dd3f170e557332bd26f237312c1cbef61666716b0cf550c2d730f86fa7cd9eb5f64a16f
-DIST toml_edit-0.19.15.crate 95324 BLAKE2B f989f96d571693ff81572af6c05a6f51b673e478f22d20a6b166c45909902ac80280ea92ec5c3567327df90100a47fb7504845fc39bbcff6756af6c1a89e2221 SHA512 46d6bd2fea957392ae0ad7e687dad7743b76ee8e8ec76c80d6374ea294d3d09b6f73df0a82c821b9ee3b5268987a4136aa825034309f3cbc1947dbd1af1505dc
-DIST toml_edit-0.22.20.crate 106726 BLAKE2B c545e7460ffcff1404dcb77e577121f6ef332645cc0566b2e23af72743cd40e571a74660e8034ddfe75c4ae5b0bac8d9cf2915e8c62c283eb977ed3a43449410 SHA512 f1514cb1c89fd0d89bcf13a448cd8f0a0a31e05b9c483d9167e6890d70594175dab570c267cbc6596382c2300299c8d1677a5a331bc407e80832da5b7a580294
 DIST toml_edit-0.22.22.crate 106387 BLAKE2B c658eef2dc8420266a6928d7ef46340372af2593e4db0d3a67ec88aaf8f601d37d1e9b5bac231a799be8a2ee68a7d98b5f651e9c109d23d8b19b60cf75debddb SHA512 0f98b371f7e27ae7f435a207c0915f942af145cc5dfabfe6d57f2b797efa3e706025401e501fccc6df70c001ce27051381556b8e7824447edd23ea25d047da4d
-DIST tower-0.4.13.crate 106906 BLAKE2B 6a8f4455dcc69f6c03af703fcfb0e6b214c2ce599611ef78fd41cf411ccf06bdce241e03a1d85d36cfeadc72db9f3d9b7ed94c4fcec466c070f2357ff6e27360 SHA512 592f23eee5efa6a4f0d2ffb0d965da7e0f75a90a4320a0d0dacdd5add66513ae40902d21af2bf683573133ee984866987df2ae8eb8e632cba7a9d196985aff8c
 DIST tower-0.5.1.crate 109627 BLAKE2B 5dfbdca4a25372651bf3a128f6afac6a9c2b61fbe70f78a59fceb11f4581635004b5415183ef9b1ceb09fb0d4f8aa7412f54c4cabc534d3c01554cd7ed7a190a SHA512 69e8926182f72775f9f30b2680e8ddce1133082c87123a39694d42b35c098a8ca1d003282c2bbee7aee30ce2531a96dd0734842d4d2233435be0a7a5bf7fe6f0
+DIST tower-0.5.2.crate 109417 BLAKE2B 414f17e97102224f1fdf23a03e6aa958e0a2d6cfcfce93ac3f2e911d68267aee33aa079c94540626ec3fa895e1780e6e5d18b4831f9f05cdf3e8c26ff73b7279 SHA512 e89c4ffd83fec3566334a4c4e9151ddeabfd3437269afc8bffb46201391bc1cdc82cbb97c69643a30f8873e87c511ad9aefc6c081241a4419fe315c99c61ffce
 DIST tower-layer-0.3.3.crate 6180 BLAKE2B 20435102dd62113c3e961bb28d7b18ac6f8ec6d5f0051f511e6f5eb044b20016f247ddd1b8eae9dc9f1ee259d8cc31e0bbddd26f5a22fadeea4007a3011b8500 SHA512 edf36671076cd29bb32c29351b648afbf3e7134316988a697c7807db62de7a63cb0339e4db7c0f36ed60d8aced7f3e493318cccc272070c037b01e2dd189b934
 DIST tower-service-0.3.3.crate 6950 BLAKE2B 32ca66bff783eeb015af982b539acb63c9d426b931832b27aa45088382712df3894132a9e6e96fe1ed9d0f9e582b7a25b33e0ab73711acb06b4e134e69158452 SHA512 770cbca46d8500ff36fe84a9a420beb84a0e893dbeaccdd93a3970e746c893b5d32580182ef3017662f421e4b2d71f079ed2cf1727dcd5fc3443a4484f9b43fd
-DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275
 DIST tracing-0.1.41.crate 82448 BLAKE2B c056d938e001654e03efaec7a11eb8ecfbdfe9af2099271fcefa43f4f4683b40c59f7111fdf7f27df4da38bcbe94f1b2ac0abb6ec3d6e6a0d165b9fbb14da3a3 SHA512 dffb8d3a1375f1b9d5418550a46cb7b1d92b2cc8ffbccb430a38f7731547960775bb42798074186711847d256eee30fb3e74078b69cb36f28c07d9f231dbf96c
 DIST tracing-appender-0.2.3.crate 21964 BLAKE2B 7e2e9b759d876731984dd6c7b802fce18b8f233f6d659a220e5f1b338abe928b8f869d1479278eecac2899985d578db0f60dfeb80a1b8eb774265f21fff960d8 SHA512 c00f22d85a29209ec59377dd2f8c9bdfba84a5153ac84e1551266837e30fb931e76d93239a09bd4a27fabaf822bcbfd88d27787d923bc809493b7030b5cdfc02
-DIST tracing-attributes-0.1.27.crate 32241 BLAKE2B a20af0f50a90dcd64e5318e55779142da294ba18d1cd40059a8aa964fd3c92834e03ee563e41caaeef71a30e3f027e5c8d167d90e2844da79e0774b267e179b4 SHA512 7dc59f4234c3bf3434fb352baed2b81db4e931eeb3ed207c4a204e480da734be40847b167b808058d2807b5583815625bcd5153e2bbe79804cfa6f069a74ffa0
 DIST tracing-attributes-0.1.28.crate 33280 BLAKE2B 4f4bfab16ad8a296c9399125edfd4314d55ef58977d8a1f3e867618617feed898cd14766527c9b788d5fe3d3f8ee5bcca0e26dae79a2e6cf05366991ac23dc10 SHA512 4a3d5fd76efc414c86af0721aab9e9aa70fcd6b08eed4acee8c2af5af56fd665197aea612187c7f6022d1acf5567d5b9e72a7dcdcf25cc401135d875d95a99ed
-DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521
 DIST tracing-core-0.1.33.crate 63434 BLAKE2B bc36332ffe5f4c95ae2d12df43944bcf589746cdb923a39098e5f4007fd1f19d7c3bb115011ddc40c13e3ae0e5cfc9a59c49861824e99fed7430fd29479abacf SHA512 1c6f0cf3b7bd6c8f6316ed9ea0b315a619308de6cbf7e50e665a193cf8c3399b5227d4f145d83b10c7e01a2f9fbc83d16e108cf09b7fd6cef413aa5c1acf89ef
 DIST tracing-journald-0.3.0.crate 11592 BLAKE2B 5cf510c6b64bede0a6cbcf20a4224fcd838fc117d56befce60cd83e8bf1f6189c8df06460d82b4be14f6a7e083780ca705909801e0234ed95dcb4fa7cb1f9f48 SHA512 f51a48f8329f92a459511f64408a91067bcc7c91824effb4dacbb3712c553e7e5b0ef9d5a630dc2e1f373c453b352884a8fd67cf4ba7e96a559246b3a778e78e
+DIST tracing-journald-0.3.1.crate 14416 BLAKE2B 34e7df26248ca1bf2f524851e7fbb95f6a4b7d2eb97fadec9d8dbe3d29852836638e40a113bfefcb27a4bdf1af25ee74150b064e0e20182566aed9693feed1dc SHA512 91e84cd4bccf31560228e08432827beba9bacd8f2b463c8c36c46927e1a3a4be665d32691a2ddb9db4540669b04b79e09920b0aae906f09f1c11ecc377a37b4c
 DIST tracing-log-0.2.0.crate 17561 BLAKE2B 701bdadd40f1343f3c4901bd8dd188f1dbc0afcdf50807bd0f6df7539635e239b5095696872103125a4d4cfec24af6336fce6f3931363dd5be4f53a09fa584f2 SHA512 0c1f060e8ffb9ff24cee7b85cc2d7d42c69b2f7623a7faecd7422b23b11ae8d5c7691e4635bae76861d444c369d9701ccb147904668023642b223e442e3c8285
 DIST tracing-subscriber-0.3.18.crate 196312 BLAKE2B bc2f04da63b0313d26073eb4a39b549ae37701e4dbf1fe06a2483279a03d9dde981f0efea6ceb5cd441ab313bfe7eaf812971c3ca60dfd4b5d9cf0d2eb7bacd4 SHA512 72f91855637aa476f03077d5f523cbc94989d40b12d7328167f88b081869ed096e6370450831f6cd5f0686cae5628f14eed4696c06a2ec75f56808b64445e0c1
+DIST tracing-subscriber-0.3.19.crate 198345 BLAKE2B c7083168e62619c856b872570b85b44475edd687fb6d5c3334246622900fcbf4e4a8484c23362fbfb358d6d9f8088f7dbad2e2ed30954aebf76d1b57324b712b SHA512 840e35103f1152e94ef9138d0f03f157b296def538bab6c7464fa7d363aef7734feed196091782dd3aa9bf06c7dc181a2c37149a23f5be036f00c00b5200686c
 DIST tracing-test-0.2.5.crate 9080 BLAKE2B 0aa7187ec86064dfd69eff2451985333108f3210c9c887ea215c7b8d547c719edbee1b56e333fece5ce309a321061c713d3cfe2059acc9f1af9b445e453ce63d SHA512 4f02d3e1441deb2279dff64b11dd8decc5721e5e180feaeb41db28466f814397d236030fcf7f9bae600c4593b2ca3d6f4b1d7eb4cefe71e8006308bf6930a8da
 DIST tracing-test-macro-0.2.5.crate 7665 BLAKE2B 10883684a7d0b9448938600fdb3fe2e481d5eebadebcbfb96d72075d4b8c1d4d23f6fb0de51d2ce1dd5fca74e96a5a32356c42b69fa6309a1da2413b7b1a9fe6 SHA512 d26bfc1bc9730b463d10edc5097bfd80542d03754ae7d46782862637539c3cf37293d66ff9b336134d16cc4bd3d8435dd58b4c894283a267fe73ae1dc6a2c947
 DIST try-lock-0.2.5.crate 4314 BLAKE2B e75c6c0d7c975e294e3d723e2fb023067530ad6db3c7bdbe89b9558764606fd1a74f0d1ba787d85266db1912dbeda85408e85646d0f7cb24496d743b7a18c705 SHA512 433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08
-DIST trycmd-0.15.7.crate 33688 BLAKE2B 603dc63404b92311968082d8c4d50ad160ae9907e46c33860d9879ce61e868c3c7535ffb63b5f2ce8649ceb3cdbdbf7d4084d3c49b163e98337d6d1e6142932a SHA512 4b4e7471e391f629979be1938690c3e7c14f6206b530c46fb7049a0460481e0f09bd7c1d0408db87bcea8833d5325b04ce06d625099ddadd35f5848ea94d05d7
 DIST trycmd-0.15.8.crate 33689 BLAKE2B 4538f6806f95162476b863aaa38fe79331f221cf6beb76bf317ebc575fc0a9a1059424c250c7de09962f5fe3776a932ec3f2a602bd440cdfa03139cf04032c73 SHA512 c2a1eb81d69b95620f9c49712970ede14945bfa71df76c32e67ea4f209b45de34d4ed3b836a089737000e6ab17a05b41843f56f668a8dae791518beb81b8965f
 DIST typed-index-collections-3.1.0.crate 31537 BLAKE2B c0c51eff0607bea4ea83c69492893c00f198d19435832df6bb3b1c62b81398df91288e9ab743d692bd7c7b61f10d141f11932359577b8805a86ec0caef8e04a1 SHA512 134cc573a4736527860d0be612aa7edf3f452cba143c0d946ef7cd7d1821f7a78976b7366944050d6324386640cbc55ebe608faf296f1fbe2cb7e6f3ecae705a
 DIST typeid-1.0.2.crate 8844 BLAKE2B ec74d365b11f17f63f938bfd8819a29d94eee8a3d938d8e5f6c797c0fc4696c1016e5c900f5874e3df05f6d5650f1b05da9446e240afea6185d16ec958beaa37 SHA512 a056d99db3bc648ea260157335045dba1df96e70cefe65dbeac80d517cf630cf398f86da692180592e99f27ae14eec1d3f658c0d2d039ae353ce56463f7cee40
 DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
 DIST typetag-0.2.18.crate 30145 BLAKE2B 0f336e7d7d6aa1d65bb49df6ecee7118028c3d1347ba1d56bd54e91a253e3c1b61196563de9af5db436d3adbe79dba2c8ad5d179386cf0091cbdc998b65aff71 SHA512 13aca22dbeb231c1349f84a4e95047bfa9036c67dfc1cb235db19100bf25a60987073c1a5ed9a0c0dd95cb71ca57187976867bcbc3060e0058045d0ade680fd9
+DIST typetag-0.2.19.crate 30602 BLAKE2B a135db0d342f30bbcafb4ead147b19c0909954c74daec89daffe38ba2d3f34ae2993a0a49657f3183f840717ca2cfc8b4be201ccc2161b7e42bc09f4195bc28f SHA512 2b4541bcf569ac82d5255cb785ab62b88b92e07d9137fd0be3f5579b3b90bbe6c24d12e8e2b94635e304bae4facbcdd31dd2acffa0e01124764a7a02535eb276
 DIST typetag-impl-0.2.18.crate 9137 BLAKE2B 13f51d00cf4f437a2d52283f02a5b63ea7ede213b4c88b46f98faf7b4a5507f734c65b97d61b834234e1f31e6efa901604d04bd22ed1cd0880d268d0746ede0d SHA512 34575c2ee41005870c13e9bdcef49022d938e37e8908fa148bceff0b1d0976b52f5622c97ee7d85d1f8f90bbe04a1ce874396eba2d6d83ed6ae937ec9ee15fc7
+DIST typetag-impl-0.2.19.crate 9740 BLAKE2B 2affcaa14d169964b5bd0e826167ee671a0b69833db3b8c94d37fadc9fc0a9ab3d13d2993443082931988c42371f98f35da10491a16e96621b1e81916ef610b2 SHA512 1f303f07460c4650a4c37bdcd17521a445f4551db58be7fc56ef68db06fd2249723600ecf7f314ea9f293e39ac1d68ed3ae699030d6fa0556fe4cea4f3aa2367
 DIST uncased-0.9.10.crate 10872 BLAKE2B 33dc5de7d08a3134a772308d9e92231a4fc92ede7f5bef57217e23127b1efdc76da6b69503f5c3a48e255c088d0945725ec23327bb291759c76a0b98715bc990 SHA512 efc06b45f24ca65a675b03a292c3ca40b330e54d9d53f0a619f42a2ea0597a6a5efb532a5a03e3b066287adc4d488d49d6306d5581e26dc7bd451cf38bb6012b
-DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8
 DIST unicode-bidi-0.3.17.crate 58120 BLAKE2B 9d7759554e265136ab9d95dda90bab84763189d3613522a5cb966ad6417ac0ee726d79e296c8821ccca589ef09a999701149c88a9189cabe0ed7d32902040832 SHA512 cf523ff9a2e1face42da035f81bba2476e80d1154f73f3e34cbaf5ce322504e93a520114a54e0a4b2e5d6b930e508ce31b5d8b4f4ed4d39159a8c9a9c7b94d91
-DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
-DIST unicode-ident-1.0.13.crate 43279 BLAKE2B b5e935020d1c9f3aa24f7d382f6b73d6510d654a61ce1c9c024e2e365bb817182e076139f370e822573531356fb78ff7499049b1f29aa1e2f4a2cc74a955b47b SHA512 5ba884f39debe9c8eb0b1d251ca713f7e2bc191d211707ed10cd81465487dbdca53914c19e131edfa1da15af132dc2c346260c3969c61e3747b63399ccb1cc51
 DIST unicode-ident-1.0.14.crate 47547 BLAKE2B 30e0b6d7f3a967aaf5b9d91237008a60c3a8ded53bda901696e23cea3931dd71b01ddab866dca9e31e17c395d5f5a68f2a938655b693e894962568c2cff5ca15 SHA512 7c6dcd1724e8cfedc37546d1abd49088b633dad228097acc73d7b6cab255b223e830c541144e05a00388fd8ca8066f27c18792419cfa58ee9da4460a38d0bc0a
-DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c8782321b1bbbee724db1e4d8c1d43af4e6bd8044b99307c227d93631d178d10fda445a941a485882ae0015a6e3d3c347e4bd465bbe1d9 SHA512 539f04010810d73fde7b0ab314faf813f3e7ecd2e51d7975281554b7cba4a8706e2b5523c4b7840568593652360ca59e9db0e1ce342e71c28db635ff55ffb0f5
 DIST unicode-normalization-0.1.24.crate 126536 BLAKE2B 1d6d535a1236562918d2625172d38c261854cd8c45cccc81c5d5aefb052db5d0e33981d95f5c87e8760cf77b3651c60b7ec1762421a7a9caa72fe7eac3f562a0 SHA512 f7af59688773319b9d1523955ce9b82e6735bd72358715ba5c056f41956ca050b6a612cae1b39199cc089674b3c71e4016d85d48167277c794c5cef3df881754
 DIST unicode-segmentation-1.12.0.crate 106323 BLAKE2B 268b60aff6694434f05afb7e2b8187eeccdceb77460f8ce2ac0f84d470f8a4e03182ce3f7906177cd2f00f989273a7e69061a763006245f0876bf21b15076804 SHA512 55eebfe5e9972b39d7c0011d80eb5f517d636de37870999119a3d8f064f21f67b66a5ba9761d562738b05f220e21d56b5be7bbd9cc51662994e40dd67c38f946
 DIST unicode-width-0.1.14.crate 271615 BLAKE2B dd2e1504caedecb5d37c397ba05446d3d762b8b6833a8032ebbc213e324d53d89db5e96ed2f7223096e5754d800b39a54105906effc88d9437d7acb9e7beb81e SHA512 3c58a18776aa82cc13c761789a47901616cd98a30356f93d7eb05ae457314209d0a66213e2bbfa5eb8b59be6beacf62438234ce8daafa31b128dbf7d5d6fcadb
+DIST unicode-width-0.2.0.crate 271509 BLAKE2B 53015f24c57ba65d7ffc6e15e947f5ab96fa272996fe5a4d2f9203051972238ea7591c99f1d8ae5d2610c7b83c215b6912eff7aaae034237aec8d79620bfb843 SHA512 38149ad512a44fc79b2c991c6b5667da2e8f8b442ab6bb7e4f404e7fbb034f7540c7e0e8b9e72a1ff6117b899d6034862239f43b6423fa89d55dcf489caff37d
 DIST unicode-xid-0.2.6.crate 15744 BLAKE2B b1bad25897717f6346f988d5a7c90c51fb842da113f19aa434a64add8f2e637258d9fab0f7b871fd2aac02e83c68359fc679b326232793cbc804523e2bff5056 SHA512 f68e78484479a5341b14d7e3391e691265851fa00feeca53af745479af6aa9b4ce3570456df785c8362043db9b04e2e57f9bad05d8305946f16af405bc611764
 DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa0282af4faaf2cfb15718421ff26abc56021c546f6aebb411f5abd27020273ba0f785e012a4b0089e96c2db4faa6 SHA512 5ebe3266912e4e78fdfdd13f9fcc07e9cf489d19d5e9ff346486f47aa58a0aca35278d561612c49eb3cab5a6759ac974d3b92bfabc399e1bc0808428dc347be0
 DIST untrusted-0.9.0.crate 14447 BLAKE2B 8e9c3ae09435af0885bc4a6e3c8943805b48cfc00bdae228c7c43093254e1be15d7005d1026561ff369ec37865d8458203f421a9c89ae3db077f655449621aed SHA512 5929e4079c1c2ff933ae8d8f59a2ecc7a424e71a20d1b8821f75925af68bdf82604b024c008e5464b02e25ff093e561a352b685e755b3d0b27e4c30254689416
-DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d9183478cf501c26fb5f22d7704ef1313ba6d355e849cbf8ab7980310c1aae85e253a2b28d59099e23af29 SHA512 2515903e41c0659cb226f9bb049ef80f2a49d1b609b6ac480e570a84e899088ffe3be4fb58f41a1fa7f5288eb5f97ab513f331aeb6d56979df783d48e2ace28a
 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.10.0.crate 47648 BLAKE2B 370f56b5057fc43ed6645ca4a032737230242c88f3c6945248585054a0d1de0c85cb2eb21bd4c759c1ca73df1b5005652f74b474537116c4fd6642cb60d274ff SHA512 e17db9433d919b51468acaebd240a2cb218d07f099fade49118ca9313f8cdf6aa3103e7aa24440be65a4f25a25f8f511e36dba08cbef27747f9e43b849cd612b
 DIST uuid-1.11.0.crate 47683 BLAKE2B 37a601b0fe7ec57333613f8c18ada76bd784c43c8af7c252200a7c9c76b445b179931cdf727b5ddae3ffa3fa29c5a13507fb0f2bd604d306982843e042038314 SHA512 0cd1b95fc2247bf4e627de6abb41e332ebaf39e5720640e52b9f235f7a0e2d451e7a486efdabb616ce00e47832d21919611683d0e6a71c86a86f290940cfda32
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
 DIST value-bag-1.10.0.crate 40371 BLAKE2B 8d201444eb30bb6820dd9c0132b6e475df3f358762f2dd3ef0a7172bc0241ebe108ff8a8f1b053cd1c27de17f994cb14af13ba8f70fa00618288f0a7c035e973 SHA512 30b7d7e181c7ffdfff2b2f669dced2dd75508678a9f40f01b45249ba95ee685910a069e089867084ff1e3c2092663c3b11544869e3323f4ae77c6adf6fa020ce
-DIST value-bag-1.9.0.crate 39936 BLAKE2B 78bd900226b9032f2016ae087f92e5f47ec282fba37dcbb204faa83ff4bcddca8f47a14f899d36dabe0df0a684c8f1874d26206edbb5fdbb30b883c09afb37cc SHA512 37b121feb957f81f9900cd5754bc3e5bbb5ac53e4f5626ee1aaacaf70d5c3d1c0128b26f585b8bcaf555970a0f023ee977fac836861a3f928b70b2b79ac5bac5
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST version_check-0.9.5.crate 15554 BLAKE2B 131e75cc287518831e142430e2a39b48e4275874f4473780d47a27552294097aa1cddb65c385583e1022478f940b495eb43c24a8b1617b8ac5a24af3340c0d72 SHA512 d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db
 DIST visibility-0.1.1.crate 8119 BLAKE2B b4812fe37305ac90ab09d5c286b72b1230a2dfb9b6640dfc1bc139c9f513d2ab2c94a28bcef75f1f55aef15163f2df3984690d39c3ba9a2ebebe7539f5f581e8 SHA512 df6b3752c9c2676e34d53837a6c0ce4ce36f6ef803f7c6cb77b87e3e249a52e7e86b179fc3ecaf30883573562b5dc93bacf73b288f0f0b77dd9b5e601e30636e
@@ -712,28 +614,27 @@ DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf
 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 wasix-0.12.21.crate 193621 BLAKE2B 59ad2dca5fffed6c56b8ada583814f3e6e2c8b1b214acd05d533b833b6ce6dab0ec6bdf748c59d5fd2c8af65e9b2d24e8aa8b4eb27f9e90fc0c430092c5e416c SHA512 8c89788e1338e5292b62772f5d1ff4cb4cd4625cc424c3c9dd376ba899d702e6e163e1b60a2fa31d123dcafd4d3d17a783cab27da6bd8b03130c196e0c0caeef
-DIST wasm-bindgen-0.2.93.crate 43769 BLAKE2B e1abf981a042ebbc5c506975d5c2258942278fc000ac62aafe4221725fc52003c4032dc04a396e8fc8ec6712155e056ea9381a72070ee7c45b348ce470f52c7c SHA512 0c0a63b04b02b57fca78d2c0b885ea752ef1e8e4317c27dc84fd35843c9c396ae20557a1321c03a405b050f21895e6f25e95ddb56f3a3e8cec13928858ae8422
 DIST wasm-bindgen-0.2.95.crate 43894 BLAKE2B f14fa63110c62d3bd51c947f31ee96b11812fa60d6adb9cf1907f99c011bd43ab8e14b437fe8b6357cde37124769080b3bd20a2a947fafe3bfd6cccdb875b5a2 SHA512 5a303a6e9bc71030371d6a60a04064b148423d89b6d5de4232b24ff5205175c5236812209eccfc60d8f82a876d3b745ae76ebcb30811eaa6f39701c9a84e1251
-DIST wasm-bindgen-backend-0.2.93.crate 30344 BLAKE2B d0b9f0cd0e6191dc3f57869023450952f2d73c0432fd4516522df5f63090de021f44f11ce7676fd2f87b31f6b236eb155b22b36eb80c3ccf3880f55ca23d4b0b SHA512 c67dad5fa26f78b233612cb6ebd44f48edd84253e46a2f5094e95da935185cf2a7be14d49247e8b8cd1d916721ed82ea44046080a40b2fe37ad88175a5f96597
+DIST wasm-bindgen-0.2.99.crate 46136 BLAKE2B 04e69294da3dc4feff9001185bcc5b864d1f14a1ead6b9a31c830b2043dde191f9f7c65755d607365a3b8885bd340bbd266e26cfa74c48464933c8d7a1164f94 SHA512 184aec11998b99a730ea5b63d6141260cd0b7cdc29b02696f533b3e75ec79f7c17c6aac892e7a7b24036c6e73592d01df638ca31b54bda11d3bdbf857b1489c2
 DIST wasm-bindgen-backend-0.2.95.crate 30487 BLAKE2B f199e3392e964c4b0e6a7b2e3ccbbdc458973b4aae4193ce36ee0ac18d595230be9ea6708caa439d70aa92a7b924f51928059984f560e5dad20d41eaf06616dd SHA512 1bea648ca248cf13383b297917a5c315da9e4830a8c49cd3ba23392566725cceae818b4e7e60ad85360c9073c2e557fa36452a2cbc8e05b60318feda7404026e
-DIST wasm-bindgen-futures-0.4.43.crate 14207 BLAKE2B b7337c1863af9975ef4a10ef64b129cb7b579fa83849ffb8406637c10bd86da4db0709d1af4161c787de986c98acfb9c6b382a4871f53298e0db30cf2c482eb8 SHA512 2499b47329c3dec1d15666eb7307fabaca086881a46e1a53ff2a551df1122eb2b74b18ea1e7620152a35407ad49a93223332e20ac042295799e55f156b7061de
+DIST wasm-bindgen-backend-0.2.99.crate 30928 BLAKE2B ecfa94a461df79a33fd2bb9807374a2a0c7ac370b443e5a1103ba73a29c9d337ed3feb427c80571ccc15599f81135987742e698199528a9c1bb570baef3e9d09 SHA512 8369a5e618223f09fff7cdc35662a930b3eb11024af51bf5fb9e70c45dfa22452a518d723f3d912c0c970fc4bf748ef2d83d48756483174993f7d04c92d9621f
 DIST wasm-bindgen-futures-0.4.45.crate 14329 BLAKE2B 511a9e29bf54a31acca2e74b1f654d9a85653567afd61ac7aca2c2d9a4ce833d85213345fccf5e58b788edb61a31b66192b9d69a432e7cb5e074497acbd1ee56 SHA512 1b8a99085ab274bb50e5c57625f826c8ca2f0795472c12c0db0d4c890043825df048e360997f8201a68e1ddc53f52e139acd29552e60e85213e87846946914c7
-DIST wasm-bindgen-macro-0.2.93.crate 6822 BLAKE2B 3704c01b90ae900032e455a265b614d1057a7ed7b7eef1ebfdce75a7b0f0b97083211db562d1602160cf9e70843a1949be836465398787315d66ccf85fbe0801 SHA512 8b1a690bf4fc344728bae21a11c8ce4641d81b02e215d88a489f8155433d8e579ed367c96bc19a345b561f2ddb42afa44056b71e15dc935a4fe38fd7f937a632
+DIST wasm-bindgen-futures-0.4.49.crate 14838 BLAKE2B a549a84dae70f480e387e01b4366994404370ae8f0989146d8548106267884096442d2fd6bca0a8cd22e21a3eff6b16aca1edcbc23c73af757a043311aa49081 SHA512 e141d6a97d2bbd6c54bc23d4857124d6e43ca1ab51c37e867287d771fcc0d8b7a2488acc56d46202c2e9b2380684ebeed688e7322175dae67475b77fb307ebda
 DIST wasm-bindgen-macro-0.2.95.crate 6938 BLAKE2B 672509ff595fae86492dad98a4480f28d74a51fc8156ce7f96928b148f3af7f0f45ca9560b72148c6ad2d45ddfbbf3dbe39e2c94603ef92a925ac5503d939d2f SHA512 1f52188932e20145cb23d527a733fb5fe211813826c6b5ec04277e376127b700aea181efa5f60e34d120f10652066fbdf001952024017cccc7af728a3c8e41d9
-DIST wasm-bindgen-macro-support-0.2.93.crate 20642 BLAKE2B 3fef9d35c09e97317e8531f11c3cfcafc5cb58126ab7a96374cd5e2e3f8736ef016b4c0b3b16bcdc0bef686e9f07439f263c54dc980649e9963b12d0a6814ddc SHA512 9fe590636e229184a944acbb8472c03db0a48a9094cd9ee204c09cee6c5241194a9757f06b09e7c30ba9db1a2feca616cd1e7dc0e52c7f1c1560c50c9d3adbb8
+DIST wasm-bindgen-macro-0.2.99.crate 7011 BLAKE2B 07182a9fb98f519d1e5c934e609d7a42cf2409319f59dd901e2a5bec77972b4d16fc6f67cf40ade58af874b05faa981c894443d3950616e2aad117ac7355ac6f SHA512 344bf5192e43582246efad257c600003c41b589234c1900f6ed201f96b6f7665eb55226da15d612060042f89c6214e452489cf3aabc61645843be9c27f9cca0b
 DIST wasm-bindgen-macro-support-0.2.95.crate 21331 BLAKE2B a1f71b727736b7166af5a9ad739da33f07ac3d7a190a27621f8a9821530f9bed78a6c437d194f9609bef91ebea0ed9ce1738eea0a9800344b8af9ce7df868da0 SHA512 f45d78831c37401a417c837281d1705b84eae5db430630a9caf544ce5d92f1ddd945baa3bccf26f4c58170e3cbea035174d8b60f906d2757b152e1d090baea58
-DIST wasm-bindgen-shared-0.2.93.crate 7527 BLAKE2B a2df995ba72d83beb3f347909c004d9693ee06cec62de248a1f96b0244c05dd8b62d46356f1b7eb0a29122517bc23270eb4eaf045e6cdbb7122089dc84829d9f SHA512 4e9271a746d3b3ea44bae472b7d9722edbcf262fdec2e03c18788d95b923c71c26f309e316ad3c621d5773311d6b1d5ad468cd7bdff015d162193b6effaf8420
+DIST wasm-bindgen-macro-support-0.2.99.crate 22800 BLAKE2B 9772cc94a64f768eecae12072e6d700bf95fded306297b84e235f3450f7c5630cb1985def3eaef05aee193c693f92c6fa61d7a6ca18e84a2b73aa38f070d47e7 SHA512 936ab8211a13fbe8b8f21a870a78c03e24219d0872731561353cfcae245e9f632246f179b67f2b13e106c799e68c5c39f9e388370a8ad3f93f299c4804f5907e
 DIST wasm-bindgen-shared-0.2.95.crate 7649 BLAKE2B c18f531c6094b49af3b2beea93914d16b0054a707011890f9054f4cb313ed6b433e3f73c7b42accbd1fa59d1f14c2db5ab0f0a82cde107b9cf437fad8b4cd7bd SHA512 3ce689a4c845765bd6e1f84b94948df3ef84560d98d830a15c1932a2ab1942ec91465db65cbf14a045526cf003218aa5c3209dd06e8ee8a39815757f56356099
+DIST wasm-bindgen-shared-0.2.99.crate 7773 BLAKE2B 73489af59d16f4d0a1ea51b535cd02d2759b5b7b07873d8a71fa6bd6b6ce1cfc6e8139e6a79346abec13665ed9aeadd0b5b6aed28ae008f9dcb3d5da9fce665a SHA512 8da0f107be99b6666cf1859d68ac0a7295fc03e7b494fce1df9dbe57d21807de8e2bc95f5b974562303923ca4646f38c5297588ad7c97bd59ef236218b2a64f9
 DIST weak-table-0.3.2.crate 23989 BLAKE2B f5b12d62704a86f77fabaac918d084a4f7471b52994307da20376d48264b811eaeffe2cae2f28ebeeefa4338c758516bcdba5d138cd7ac12ebfccc697009e167 SHA512 78936f2afca36575d3faa823ef4e621d7dea9e3eb4c8c3e1d66af296951fc25476dc8cbadae184322f6e1e8166410df617fe74794b2d3696d599bb2406499562
-DIST web-sys-0.3.70.crate 615438 BLAKE2B cbc8b7ec572a3df1b42d603efb3af1914621957a79f0217e75b6eaa192db6dcf2de9782e130ebc364f704e624913a13cf9dbbe816087db340bcff4a4021b7526 SHA512 337a12d7eaf2a643a7a49a026bccebde73fbef44f729daa6feb71c228d7d8ef72155f9f501b7ef9ea5c22a619b8a8591487841a67a1e12a6d1105d92f3cc708b
 DIST web-sys-0.3.72.crate 629190 BLAKE2B e8cbf0bf36a1de4b0507c4a57724083f8a7f6332a138455de5ae1090e757872b217e2d2f6d0cb345088cfb4cd5ccf49360919838a299a74aebd0afe4dc688462 SHA512 997b27fdfd0291079f3f16999499404968a9d079ccf326d8eb17dc0f89a87cfe52f6fa780654612c769cb24dffd61baac22c5965b9feaa9c1f0624c203d2d039
-DIST wide-0.7.28.crate 94236 BLAKE2B 1a8c496f488ea2d333dac5c3103f1512aa383d62d67f4d820c5384186cb356a804407a4facd38fbf6c66fd2719e4ab11f24a471a0957efc11043b1ebf7132672 SHA512 4bd4d6fd79c408deea64a97b7384ec51e63119c605434778d5a841fbf292df69f651e5fac58439cbb3960c8920767277fc2ee546a25d894041faed2a02c87a33
+DIST web-sys-0.3.76.crate 635842 BLAKE2B ecd166e739e4ae4ebccc51fe0d429723ed7e4209bc9bd4658b5447486d7d58d8f2d2a6186e433e8ff11e7b52fe159d842a28de6251d61cd5f5876a92a7d945fe SHA512 370fb49edffd9ce125f77a9451389dd23ab5b70fd49263248d5794310ed757c28839a29436111df2fe6369ae8d6af56a64ac59af5258743cccfd9d18cd07dbd1
 DIST wide-0.7.30.crate 96407 BLAKE2B e9f61ac4f8c36f44214737dff50dc5de6d6f9b6c635606e11b6d28fadd8521a531e17314382f925f01056ed54808fe4211c9984dff5037af5d3f4ba3c28897a4 SHA512 3a849b952b94310fc6da1b0e28f95678c8939d84f88e25c7ccf257f0e50d0d199bbad80ed821f990434492195237a92616bfe9436507a5b2db5b1f6c28119b71
+DIST wide-0.7.31.crate 95402 BLAKE2B 21f7bc17f4a83e4e08d3bfd6f878f773c17b972ec97376f058a5a76d7c2c360372243d2acb90236d1313032da1c7c2e946cecc33aeee71d17d75470488625808 SHA512 f45acf1b2c917584aa850b9782486ba57c4b36ac085b7be11395ed29d236ff617219768385171146445b08a8ff21fafa8a9b227afa43ab152540015274fadeb1
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.9.crate 12464 BLAKE2B 7fb9dd803fc2608c4e5bc75674472992d82da364f24c22072d5624d6ae6abc44abd3e3ea3c45a7558e045331f3d87572b306b4ab5de52c07ff3706e7f13c2a38 SHA512 c46b893f67ec6e36499b00736bb6b9421e0e2611e76784afa6da01d7ebd033df82f1be7cf8d871d541125d290983f98f26f759488ba9aface49efce8edd682e9
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST windows-0.52.0.crate 11843715 BLAKE2B 0d35225f5d61f71b0cb768f03825031101e05c83d7f12e05cb17b14ba28e6bc6a3d5aaee5ba07e54c1a773b6eadde4ce3523ab87e8e313e5578e2de01a3dcdc7 SHA512 8a9d443cfae3b44ab50bdffd70b70ea3b3d536f464e4beb7cfa9e15eb4e4505cbac20266b44d589bb7231790a87f473ead6d2160b8cd18d62f31b78bf61417da
 DIST windows-0.58.0.crate 9744521 BLAKE2B ad865c866cbc2825e35def7bd21c0a9015a87b8b9f1c01aa7b6a4ed49db8c8806e1fabdef9f729860d1501e79a4ed4872b19cfc347f5cd4c71d34baa3e14d052 SHA512 c4c6e4af6f6c4527325262189ef0106df5a1a0159c3cdab8d2364a0d7f060c197f109d2d021303779c8b3ff3295d13701e6fdeedcd67c8b09e9092d3279d2d8d
 DIST windows-core-0.52.0.crate 42154 BLAKE2B 9670bf02261b4ab2a24eff97dad11e305deac823cacfae286965b62b11bc035f19a55ca710eaa4359c8a4905433a94fe62a836b77ddd68f244ad6ac2c9657f58 SHA512 0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36
 DIST windows-core-0.58.0.crate 41022 BLAKE2B fcc1113ea97fd4fb889a8ce1a03f6cebf340c2e6c26136a4185860a98eac3585caba7269cea351c832e388c9c25974c7807fe1929691ab39a14f1cf56d9d869d SHA512 d864e373a3d04edce84ec133b98496ffdd0cba2fb547ed6e5bb7f717648f4fddda8fe4af73ed24a9bac1e3a44f1031de4ad145ae662dd26531ed875317d4526d
@@ -761,15 +662,15 @@ DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e
 DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
-DIST winnow-0.5.40.crate 159316 BLAKE2B aae5076d59b3459c901d918d8aaa97ba8bfcc993b8484344f52e45f1f37deb96d6cd3a1663a67f3c367be2b05d633286f270274c621bda9f3ab72b98bb652cc2 SHA512 525156f08514b0110697360be6e331a68d08f0cb65ee4ba3ac9d101dd2d42a8c89601e7409bdb5652c5b05145626506651010f58a854c47712065334c61ff39c
-DIST winnow-0.6.18.crate 163357 BLAKE2B 7a43eba294c43b187211c6eabc449775081f44405045ec4786c5f10290639e18d002e872f9db14caa94e26fd99079c7ce2f99e70dcb20d842c0886ac203d8ca8 SHA512 3a146d9dc8fe3fcc855f7766852cd69c49a28f9048d553d3952d7722d49216cb44652d98b15ae1ddee99b2bbc3caefb107a9b85c309242dac943deeca65a81dc
 DIST winnow-0.6.20.crate 163617 BLAKE2B b47ba6cd94ec80a72b51ad09c5cb9de350d2243295d3997732d5d3d9f8d08bd83e3129150fb24992243949120da1bd6091d580db5ff10258fd745afaa944c791 SHA512 3347fdfb5b15ec73a40614ecd0cce60f41d3f2d083f49aaafceeaf5db52d5c677dc3eb39fcc2595999fc9f864d1fde81e180e09dc86a6f6124878e16e86e8bc8
+DIST winnow-0.6.22.crate 164867 BLAKE2B 07accade624077820b82b1388791335ffc6dc6b138a0a93de9be8643816ece5dc2b0278e6f7061f3ddb701d02c1b5e5cf90d41508f762d70854e7293f03f4384 SHA512 128bfde72f851d73c6aeb9afb0cb3a45f6e2dca8eae22c54cae8921cc71dd64b36a1adb5358a1075af42f2e296f3e9a112988725eba7acfb2619f46fbbc688b5
 DIST write16-1.0.0.crate 7218 BLAKE2B 548796314339463e4b71f8af3d344e45dc89480e103180b6d56c90fcb816ad1a37ab2ba20766c4b9754f2cc686752eb1f3a5a12ec1ed4369a9cef749ad4f3e97 SHA512 655a207b8082bb88e462f992ecb4833cef9d590da06d6356b41d109df2862b49ee5705189c78a607b549e7343035119d158020d58fcad49608e51659357a83c1
 DIST writeable-0.5.5.crate 22354 BLAKE2B e4ff9862c070b413568ce0c75d1eccafcf1db8578eee4795ea9046dadd643f8a77258b437be288b93af247199d63455298ac2cff909226bc432f91c0aa863921 SHA512 818b2546c8ec25816aeaf5e31a1ded927d197bf7256e7c5073738c2709bc58a95d382a0256eb38a99235ae83729b578701261866d42ea3357a26024906e196c1
 DIST wyz-0.5.1.crate 18790 BLAKE2B 07ac1435a812d2f50309348ef8378ea4955c001f01edaf2ffab108f7d524ee731f06b22fd42c043349a4a2271ec47ea203e89562076e8c7c1719112b0214c89a SHA512 15d86c167145c90e3fbabcefd11754fb1cb835896e32d1bb7f4b027e5b2092f5fdbdca4062c129bc38e655cb87c6a3f4e181747ee25d89db5e01fb1fcac18fe9
 DIST x25519-dalek-2.0.1.crate 87820 BLAKE2B 039749d0278d95996016260f9e32162b370594085186044665685288d879e067fa16a5d4d42e939d2bd05f7b47a81036cb4f573d841cc81ece078c7a08eb672d SHA512 13dde8a8d4772dfccc3849a37717828ff6fdf6b4deaae86b5d6bbfce9b6dabbaf039d95c163cc6764447d503c1a62d602ae5b5d1f7204cc002d3fb13ca85acb9
 DIST x509-signature-0.5.0.crate 21704 BLAKE2B 82ac157b0291069dbaef0a92c73f06c6b9d09406837ac08cedfb7a4de39a20d5dc827cfa019213a99039c3b154a537a70c0f96afbe9fbc868d1881f62b97df32 SHA512 2216a23872cd02882e89f3c6f3279cf7bba08e518c387c7cc564a54b4f87c1d60e8998d8d7b308b1be525854ddd54dbafc175ee90f52d70615356f11a25c81fe
 DIST xxhash-rust-0.8.12.crate 21329 BLAKE2B e9596bb83cd0f0465c279deecaf4dd87aac05db1c8c7d3aed4f0689022c5a0522d976379fb3dcf6cfe1c18452c87890e95f3d17998c777d92f5cbe58119a20a9 SHA512 6fd17ec65be94b58f109b6aa9bb283e51092621e8af624f8c2c2c95558a3d0461d743cb8a65a0da5853ff7fd98273daec0dcc5b632440868524f99894beeff3d
+DIST xxhash-rust-0.8.15.crate 21515 BLAKE2B 0d82ffaecfedc3001e4273c7cb3211e847c110334c0558099c02c2457ccc1f6381b5b1c9c13ec87236e23f4e5551e3cb09101bca75358481ed7ae8ecb83d4866 SHA512 80a73a93249cfa0043a743e883f078d9e4bbedc236dec239d9f89b6816715c614f212930fe8842f0598275d2676a0e406a1ab7101158c163f50b9d1d00265925
 DIST xz2-0.1.7.crate 23892 BLAKE2B fd4b65cc82405f28a3d9fcc3db9dbffac41ae8ec7e767f3405bc9c7e45000b529cd571f72a76e41f2fb9866e7af8ab37d9f1ab8e6f14652495d306ba0a745879 SHA512 9969ae958b157f3d49708bd00640e57fe7c3826add2871575bdac03e6064aabd28392e3062bfbb833752df374195c50b19dc6b6c08ac41455c492213fb91fc74
 DIST yoke-0.7.5.crate 29673 BLAKE2B cd2e42103140e080a29bf579fe5176b36a192f9b1309c1f2fd7557fe93b2f6eadbf6fca4a6a3b1a7b6288403d2f643841dfc7a5b6a4476776943950abe5c1613 SHA512 6bbd99671d1a5a5217890eaa267113d193b3636b265393afb6e72a313f01704d462fe017264f061405e8e84c188b590094c29e3fcf19a63c375ae165d1a0bbef
 DIST yoke-derive-0.7.5.crate 7525 BLAKE2B 9b6b97eaf3c50f0f5ce8cebf685a1a17d4c21eb9b26d38eac99e0a4c0f9d592e95a7843b7a0b897945a14c4eb78ffdf2c0972b448d31d7bc7b077f27aad81d9a SHA512 e30b06b020aa283080905004295fb643c539b130d0d53bda51927b95e79ba562336aad30d8a6202d9a0c62d5b64559a01218c6f02f3faada6003d4b03c205cd6
diff --git a/net-p2p/arti/arti-1.2.7-r1.ebuild b/net-p2p/arti/arti-1.2.7-r1.ebuild
deleted file mode 100644
index 8e9690f4332a..000000000000
--- a/net-p2p/arti/arti-1.2.7-r1.ebuild
+++ /dev/null
@@ -1,609 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	addr2line@0.22.0
-	adler2@2.0.0
-	adler@1.0.2
-	aes@0.8.4
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	amplify@4.7.0
-	amplify_derive@4.0.1
-	amplify_num@0.5.3
-	amplify_syn@2.0.1
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	anstream@0.6.15
-	anstyle-parse@0.2.5
-	anstyle-query@1.1.1
-	anstyle-wincon@3.0.4
-	anstyle@1.0.8
-	anyhow@1.0.86
-	approx@0.5.1
-	arbitrary@1.3.2
-	arrayvec@0.7.6
-	ascii@1.1.0
-	assert-impl@0.1.3
-	async-broadcast@0.7.1
-	async-channel@1.9.0
-	async-channel@2.3.1
-	async-compression@0.4.12
-	async-ctrlc@1.2.0
-	async-executor@1.13.0
-	async-global-executor@2.4.1
-	async-io@1.13.0
-	async-io@2.3.4
-	async-lock@2.8.0
-	async-lock@3.4.0
-	async-native-tls@0.5.0
-	async-process@1.8.1
-	async-signal@0.2.10
-	async-std@1.12.0
-	async-task@4.7.1
-	async-trait@0.1.82
-	async_executors@0.7.0
-	asynchronous-codec@0.7.0
-	atomic-waker@1.1.2
-	atomic@0.5.3
-	atomic@0.6.0
-	autocfg@1.3.0
-	automod@1.0.14
-	axum-core@0.3.4
-	axum@0.6.20
-	backtrace@0.3.73
-	base16ct@0.2.0
-	base32@0.5.1
-	base64@0.22.1
-	base64ct@1.6.0
-	bitflags@1.3.2
-	bitflags@2.6.0
-	bitvec@1.0.1
-	blake2@0.10.6
-	blanket@0.3.0
-	block-buffer@0.10.4
-	blocking@1.6.1
-	bounded-vec-deque@0.1.1
-	bumpalo@3.16.0
-	by_address@1.2.1
-	bytemuck@1.17.1
-	byteorder@1.5.0
-	bytes@1.7.1
-	c_str_macro@1.0.3
-	cc@1.1.15
-	cfg-if@1.0.0
-	cfg_aliases@0.2.1
-	chrono@0.4.38
-	cipher@0.4.4
-	clap@4.5.16
-	clap_builder@4.5.15
-	clap_derive@4.5.13
-	clap_lex@0.7.2
-	coarsetime@0.1.34
-	colorchoice@1.0.2
-	concurrent-queue@2.5.0
-	const-oid@0.9.6
-	content_inspector@0.2.4
-	convert_case@0.4.0
-	core-foundation-sys@0.8.7
-	core-foundation@0.9.4
-	cpufeatures@0.2.13
-	crc32fast@1.4.2
-	crossbeam-channel@0.5.13
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-queue@0.3.11
-	crossbeam-utils@0.8.20
-	crunchy@0.2.2
-	crypto-bigint@0.5.5
-	crypto-common@0.1.6
-	ctr@0.9.2
-	ctrlc@3.4.5
-	curve25519-dalek-derive@0.1.1
-	curve25519-dalek@4.1.3
-	darling@0.14.4
-	darling@0.20.10
-	darling_core@0.14.4
-	darling_core@0.20.10
-	darling_macro@0.14.4
-	darling_macro@0.20.10
-	data-encoding@2.6.0
-	der@0.7.9
-	deranged@0.3.11
-	derive-adhoc-macros@0.7.3
-	derive-adhoc@0.7.3
-	derive-deftly-macros@0.14.2
-	derive-deftly@0.14.2
-	derive_arbitrary@1.3.2
-	derive_builder_core_fork_arti@0.11.2
-	derive_builder_fork_arti@0.11.2
-	derive_builder_macro_fork_arti@0.11.2
-	derive_more@0.99.18
-	digest@0.10.7
-	directories@5.0.1
-	dirs-sys@0.4.1
-	dirs@5.0.1
-	displaydoc@0.2.5
-	downcast-rs@1.2.1
-	dsa@0.6.3
-	dunce@1.0.5
-	dyn-clone@1.0.17
-	dynasm@2.0.0
-	dynasmrt@2.0.0
-	ecdsa@0.16.9
-	ed25519-dalek@2.1.1
-	ed25519@2.2.3
-	educe@0.4.23
-	either@1.13.0
-	elliptic-curve@0.13.8
-	enum-as-inner@0.6.0
-	enum-ordinalize@3.1.15
-	equivalent@1.0.1
-	erased-serde@0.4.5
-	errno@0.3.9
-	event-listener-strategy@0.5.2
-	event-listener@2.5.3
-	event-listener@3.1.0
-	event-listener@5.3.1
-	fallible-iterator@0.3.0
-	fallible-streaming-iterator@0.1.9
-	fast-socks5@0.9.6
-	fastrand@1.9.0
-	fastrand@2.1.1
-	ff@0.13.0
-	fiat-crypto@0.2.9
-	figment@0.10.19
-	filetime@0.2.25
-	fixed-capacity-vec@1.0.1
-	flate2@1.0.33
-	float-cmp@0.9.0
-	float-ord@0.3.2
-	float_eq@1.0.1
-	fluid-let@1.0.0
-	fnv@1.0.7
-	foreign-types-shared@0.1.1
-	foreign-types@0.3.2
-	form_urlencoded@1.2.1
-	fslock-arti-fork@0.2.0
-	fslock@0.2.1
-	funty@2.0.0
-	futures-await-test-macro@0.3.0
-	futures-await-test@0.3.0
-	futures-channel@0.3.30
-	futures-core@0.3.30
-	futures-executor@0.3.30
-	futures-io@0.3.30
-	futures-lite@1.13.0
-	futures-lite@2.3.0
-	futures-macro@0.3.30
-	futures-rustls@0.26.0
-	futures-sink@0.3.30
-	futures-task@0.3.30
-	futures-util@0.3.30
-	futures@0.3.30
-	generic-array@0.14.7
-	getrandom@0.2.15
-	gimli@0.29.0
-	glob-match@0.2.1
-	glob@0.3.1
-	gloo-timers@0.2.6
-	group@0.13.0
-	growable-bloom-filter@2.1.0
-	hashbrown@0.12.3
-	hashbrown@0.14.5
-	hashlink@0.9.1
-	heck@0.4.1
-	heck@0.5.0
-	hermit-abi@0.3.9
-	hermit-abi@0.4.0
-	hex-literal@0.4.1
-	hex@0.4.3
-	hickory-proto@0.24.1
-	hkdf@0.12.4
-	hmac@0.12.1
-	hostname-validator@1.1.1
-	http-body-util@0.1.2
-	http-body@0.4.6
-	http-body@1.0.1
-	http@0.2.12
-	http@1.1.0
-	httparse@1.9.4
-	httpdate@1.0.3
-	humantime-serde@1.1.1
-	humantime@2.1.0
-	hyper-util@0.1.7
-	hyper@0.14.30
-	hyper@1.4.1
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.60
-	ident_case@1.0.1
-	idna@0.4.0
-	idna@0.5.0
-	indexmap@1.9.3
-	indexmap@2.5.0
-	inotify-sys@0.1.5
-	inotify@0.9.6
-	inout@0.1.3
-	instant@0.1.13
-	inventory@0.3.15
-	io-extras@0.18.2
-	io-lifetimes@1.0.11
-	io-lifetimes@2.0.3
-	ipnet@2.9.0
-	is_terminal_polyfill@1.70.1
-	itertools@0.11.0
-	itertools@0.13.0
-	itoa@1.0.11
-	jobserver@0.1.32
-	js-sys@0.3.70
-	k12@0.3.0
-	keccak@0.1.5
-	kqueue-sys@1.0.4
-	kqueue@1.0.8
-	kv-log-macro@1.0.7
-	lazy_static@1.5.0
-	libc@0.2.158
-	libm@0.2.8
-	libredox@0.1.3
-	libsqlite3-sys@0.28.0
-	linux-raw-sys@0.3.8
-	linux-raw-sys@0.4.14
-	lock_api@0.4.12
-	log@0.4.22
-	lzma-sys@0.1.20
-	matchers@0.1.0
-	matchit@0.7.3
-	matrixmultiply@0.3.9
-	memchr@2.7.4
-	memmap2@0.5.10
-	memmap2@0.9.4
-	merlin@3.0.0
-	mime@0.3.17
-	miniz_oxide@0.7.4
-	miniz_oxide@0.8.0
-	mio@0.8.11
-	mio@1.0.2
-	nalgebra-macros@0.2.2
-	nalgebra@0.32.6
-	native-tls@0.2.12
-	nix@0.29.0
-	normalize-line-endings@0.3.0
-	notify@6.1.1
-	nu-ansi-term@0.46.0
-	num-bigint-dig@0.8.4
-	num-bigint@0.4.6
-	num-complex@0.4.6
-	num-conv@0.1.0
-	num-integer@0.1.46
-	num-iter@0.1.45
-	num-rational@0.4.2
-	num-traits@0.2.19
-	num_enum@0.7.3
-	num_enum_derive@0.7.3
-	object@0.36.4
-	once_cell@1.19.0
-	openssl-macros@0.1.1
-	openssl-probe@0.1.5
-	openssl-src@300.3.1+3.3.1
-	openssl-sys@0.9.103
-	openssl@0.10.66
-	option-ext@0.2.0
-	ordered-float@2.10.1
-	os_pipe@1.2.1
-	overload@0.1.1
-	p256@0.13.2
-	p384@0.13.0
-	p521@0.13.3
-	parking@2.2.0
-	parking_lot@0.12.3
-	parking_lot_core@0.9.10
-	paste@1.0.15
-	pem-rfc7468@0.7.0
-	percent-encoding@2.3.1
-	permutohedron@0.2.4
-	phf@0.11.2
-	phf_generator@0.11.2
-	phf_macros@0.11.2
-	phf_shared@0.11.2
-	pico-args@0.5.0
-	pin-project-internal@1.1.5
-	pin-project-lite@0.2.14
-	pin-project@1.1.5
-	pin-utils@0.1.0
-	piper@0.2.4
-	pkcs1@0.7.5
-	pkcs8@0.10.2
-	pkg-config@0.3.30
-	polling@2.8.0
-	polling@3.7.3
-	postage@0.5.0
-	powerfmt@0.2.0
-	ppv-lite86@0.2.20
-	primeorder@0.13.6
-	priority-queue@2.1.0
-	proc-macro-crate@1.3.1
-	proc-macro-crate@3.2.0
-	proc-macro-error-attr@1.0.4
-	proc-macro-error@1.0.4
-	proc-macro2@1.0.86
-	pwd-grp@0.1.1
-	quote@1.0.37
-	radium@0.7.0
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rand_distr@0.4.3
-	rangemap@1.5.1
-	rawpointer@0.2.1
-	rayon-core@1.12.1
-	rayon@1.10.0
-	redox_syscall@0.5.3
-	redox_users@0.4.6
-	regex-automata@0.1.10
-	regex-automata@0.4.7
-	regex-syntax@0.6.29
-	regex-syntax@0.8.4
-	regex@1.10.6
-	rfc6979@0.4.0
-	ring@0.16.20
-	ring@0.17.8
-	rlimit@0.10.2
-	rmp-serde@1.3.0
-	rmp@0.8.14
-	rsa@0.9.6
-	rusqlite@0.31.0
-	rustc-demangle@0.1.24
-	rustc_version@0.4.1
-	rustix@0.37.27
-	rustix@0.38.35
-	rustls-pki-types@1.8.0
-	rustls-webpki@0.102.7
-	rustls@0.23.12
-	rustversion@1.0.17
-	ryu@1.0.18
-	safe_arch@0.7.2
-	same-file@1.0.6
-	sanitize-filename@0.5.0
-	scc@2.1.16
-	schannel@0.1.23
-	scopeguard@1.2.0
-	sdd@3.0.2
-	sec1@0.7.3
-	secmem-proc@0.3.3
-	security-framework-sys@2.11.1
-	security-framework@2.11.1
-	semver@1.0.23
-	serde-value@0.7.0
-	serde@1.0.209
-	serde_bytes@0.11.15
-	serde_derive@1.0.209
-	serde_ignored@0.1.10
-	serde_json@1.0.127
-	serde_path_to_error@0.1.16
-	serde_repr@0.1.19
-	serde_spanned@0.6.7
-	serde_test@1.0.177
-	serde_urlencoded@0.7.1
-	serde_with@3.9.0
-	serde_with_macros@3.9.0
-	serial_test@3.1.1
-	serial_test_derive@3.1.1
-	sha1-asm@0.5.3
-	sha1@0.10.6
-	sha2@0.10.8
-	sha3@0.10.8
-	sharded-slab@0.1.7
-	shellexpand@3.1.0
-	shlex@1.3.0
-	signal-hook-async-std@0.2.2
-	signal-hook-registry@1.4.2
-	signal-hook@0.3.17
-	signature@2.2.0
-	simba@0.8.1
-	similar@2.6.0
-	simple_asn1@0.6.2
-	siphasher@0.3.11
-	slab@0.4.9
-	slotmap@1.0.7
-	smallvec@1.13.2
-	snapbox-macros@0.3.10
-	snapbox@0.6.17
-	socket2@0.4.10
-	socket2@0.5.7
-	socketpair@0.19.5
-	spin@0.5.2
-	spin@0.9.8
-	spki@0.7.3
-	ssh-cipher@0.2.0
-	ssh-encoding@0.2.0
-	ssh-key@0.6.6
-	static_assertions@1.1.0
-	statrs@0.17.1
-	strsim@0.10.0
-	strsim@0.11.1
-	strum@0.25.0
-	strum@0.26.3
-	strum_macros@0.25.3
-	strum_macros@0.26.4
-	subtle@2.6.1
-	syn@1.0.109
-	syn@2.0.77
-	sync_wrapper@0.1.2
-	tap@1.0.1
-	tempfile@3.12.0
-	terminal_size@0.3.0
-	thiserror-impl@1.0.63
-	thiserror@1.0.63
-	thread_local@1.1.8
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tiny-keccak@2.0.2
-	tinystr@0.7.6
-	tinyvec@1.8.0
-	tinyvec_macros@0.1.1
-	tokio-macros@2.4.0
-	tokio-native-tls@0.3.1
-	tokio-socks@0.5.2
-	tokio-stream@0.1.15
-	tokio-util@0.7.11
-	tokio@1.40.0
-	toml@0.8.19
-	toml_datetime@0.6.8
-	toml_edit@0.19.15
-	toml_edit@0.22.20
-	tower-layer@0.3.3
-	tower-service@0.3.3
-	tower@0.4.13
-	tracing-appender@0.2.3
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing-journald@0.3.0
-	tracing-log@0.2.0
-	tracing-subscriber@0.3.18
-	tracing-test-macro@0.2.5
-	tracing-test@0.2.5
-	tracing@0.1.40
-	try-lock@0.2.5
-	trycmd@0.15.7
-	typed-index-collections@3.1.0
-	typeid@1.0.2
-	typenum@1.17.0
-	typetag-impl@0.2.18
-	typetag@0.2.18
-	uncased@0.9.10
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	untrusted@0.7.1
-	untrusted@0.9.0
-	url@2.5.2
-	utf8parse@0.2.2
-	uuid@1.10.0
-	valuable@0.1.0
-	value-bag@1.9.0
-	vcpkg@0.2.15
-	version_check@0.9.5
-	visibility@0.1.1
-	visible@0.0.1
-	void@1.0.2
-	wait-timeout@0.2.0
-	waker-fn@1.2.0
-	walkdir@2.5.0
-	want@0.3.1
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasix@0.12.21
-	wasm-bindgen-backend@0.2.93
-	wasm-bindgen-futures@0.4.43
-	wasm-bindgen-macro-support@0.2.93
-	wasm-bindgen-macro@0.2.93
-	wasm-bindgen-shared@0.2.93
-	wasm-bindgen@0.2.93
-	weak-table@0.3.2
-	web-sys@0.3.70
-	wide@0.7.28
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.9
-	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-sys@0.59.0
-	windows-targets@0.48.5
-	windows-targets@0.52.6
-	windows@0.52.0
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.6
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.6
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.6
-	windows_i686_gnullvm@0.52.6
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.6
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.6
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.6
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.6
-	winnow@0.5.40
-	winnow@0.6.18
-	wyz@0.5.1
-	x25519-dalek@2.0.1
-	x509-signature@0.5.0
-	xxhash-rust@0.8.12
-	xz2@0.1.7
-	zerocopy-derive@0.7.35
-	zerocopy@0.7.35
-	zeroize@1.8.1
-	zeroize_derive@1.4.2
-	zstd-safe@7.2.1
-	zstd-sys@2.0.13+zstd.1.5.6
-	zstd@0.13.2
-"
-
-inherit cargo
-
-MY_P="${PN}-${PN}-v${PV}"
-
-DESCRIPTION="An implementation of Tor, in Rust."
-HOMEPAGE="https://gitlab.torproject.org/tpo/core/arti/"
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.torproject.org/tpo/core/arti"
-else
-	SRC_URI="https://gitlab.torproject.org/tpo/core/${PN}/-/archive/${PN}-v${PV}/${PN}-${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2
-		${CARGO_CRATE_URIS}"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="MIT Apache-2.0"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 Unicode-3.0
-	Unicode-DFS-2016 Unlicense ZLIB
-"
-SLOT="0"
-
-DEPEND="app-arch/xz-utils
-	app-arch/zstd:=
-	dev-db/sqlite:3
-	dev-libs/openssl:="
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED="usr/bin/arti"
-
-src_unpack() {
-	if [[ "${PV}" == *9999 ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_compile() {
-	export ZSTD_SYS_USE_PKG_CONFIG=1
-	for crate in crates/*; do
-		pushd "${crate}" || die
-		cargo_src_compile
-		popd >/dev/null || die
-	done
-}
-
-src_install() {
-	pushd crates/arti >/dev/null || die
-
-	cargo_src_install
-	newdoc src/arti-example-config.toml arti.toml
-
-	popd >/dev/null || die
-
-	dodoc -r doc/*
-}
diff --git a/net-p2p/arti/arti-1.3.0.ebuild b/net-p2p/arti/arti-1.3.0.ebuild
deleted file mode 100644
index 7a8e990cf851..000000000000
--- a/net-p2p/arti/arti-1.3.0.ebuild
+++ /dev/null
@@ -1,613 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	addr2line@0.24.2
-	adler2@2.0.0
-	aes@0.8.4
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	amplify@4.7.0
-	amplify_derive@4.0.1
-	amplify_num@0.5.3
-	amplify_syn@2.0.1
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	anstream@0.6.17
-	anstyle-parse@0.2.6
-	anstyle-query@1.1.2
-	anstyle-wincon@3.0.6
-	anstyle@1.0.9
-	anyhow@1.0.91
-	approx@0.5.1
-	arbitrary@1.3.2
-	arrayvec@0.7.6
-	ascii@1.1.0
-	asn1-rs-derive@0.5.1
-	asn1-rs-impl@0.2.0
-	asn1-rs@0.6.2
-	assert-impl@0.1.3
-	assert_matches@1.5.0
-	async-broadcast@0.7.1
-	async-channel@1.9.0
-	async-channel@2.3.1
-	async-compression@0.4.17
-	async-ctrlc@1.2.0
-	async-executor@1.13.1
-	async-global-executor@2.4.1
-	async-io@1.13.0
-	async-io@2.3.4
-	async-lock@2.8.0
-	async-lock@3.4.0
-	async-native-tls@0.5.0
-	async-process@2.3.0
-	async-signal@0.2.10
-	async-std@1.13.0
-	async-task@4.7.1
-	async-trait@0.1.83
-	async_executors@0.7.0
-	asynchronous-codec@0.7.0
-	atomic-waker@1.1.2
-	atomic@0.5.3
-	atomic@0.6.0
-	autocfg@1.4.0
-	automod@1.0.14
-	axum-core@0.4.5
-	axum@0.7.7
-	backtrace@0.3.74
-	base16ct@0.2.0
-	base32@0.5.1
-	base64@0.22.1
-	base64ct@1.6.0
-	bitflags@1.3.2
-	bitflags@2.6.0
-	bitvec@1.0.1
-	blake2@0.10.6
-	blanket@0.3.0
-	block-buffer@0.10.4
-	blocking@1.6.1
-	bounded-vec-deque@0.1.1
-	bstr@1.10.0
-	bumpalo@3.16.0
-	by_address@1.2.1
-	bytemuck@1.19.0
-	byteorder@1.5.0
-	bytes@1.8.0
-	cc@1.1.31
-	cfg-if@1.0.0
-	cfg_aliases@0.2.1
-	chrono@0.4.38
-	cipher@0.4.4
-	clap@4.5.20
-	clap_builder@4.5.20
-	clap_derive@4.5.18
-	clap_lex@0.7.2
-	coarsetime@0.1.34
-	colorchoice@1.0.3
-	concurrent-queue@2.5.0
-	console@0.15.8
-	const-oid@0.9.6
-	content_inspector@0.2.4
-	convert_case@0.6.0
-	cookie-factory@0.3.3
-	core-foundation-sys@0.8.7
-	core-foundation@0.9.4
-	cpufeatures@0.2.14
-	crc32fast@1.4.2
-	crossbeam-channel@0.5.13
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-queue@0.3.11
-	crossbeam-utils@0.8.20
-	crunchy@0.2.2
-	crypto-bigint@0.5.5
-	crypto-common@0.1.6
-	ctr@0.9.2
-	ctrlc@3.4.5
-	curve25519-dalek-derive@0.1.1
-	curve25519-dalek@4.1.3
-	darling@0.14.4
-	darling@0.20.10
-	darling_core@0.14.4
-	darling_core@0.20.10
-	darling_macro@0.14.4
-	darling_macro@0.20.10
-	data-encoding@2.6.0
-	der-parser@9.0.0
-	der@0.7.9
-	deranged@0.3.11
-	derive-deftly-macros@0.14.2
-	derive-deftly@0.14.2
-	derive_arbitrary@1.3.2
-	derive_builder_core_fork_arti@0.11.2
-	derive_builder_fork_arti@0.11.2
-	derive_builder_macro_fork_arti@0.11.2
-	derive_more-impl@1.0.0
-	derive_more@1.0.0
-	dialoguer@0.11.0
-	digest@0.10.7
-	directories@5.0.1
-	dirs-sys@0.4.1
-	dirs@5.0.1
-	displaydoc@0.2.5
-	downcast-rs@1.2.1
-	dsa@0.6.3
-	dunce@1.0.5
-	dyn-clone@1.0.17
-	dynasm@2.0.0
-	dynasmrt@2.0.0
-	ecdsa@0.16.9
-	ed25519-dalek@2.1.1
-	ed25519@2.2.3
-	educe@0.4.23
-	either@1.13.0
-	elliptic-curve@0.13.8
-	encode_unicode@0.3.6
-	enum-as-inner@0.6.1
-	enum-ordinalize@3.1.15
-	equivalent@1.0.1
-	erased-serde@0.4.5
-	errno@0.3.9
-	event-listener-strategy@0.5.2
-	event-listener@2.5.3
-	event-listener@5.3.1
-	fallible-iterator@0.3.0
-	fallible-streaming-iterator@0.1.9
-	fast-socks5@0.9.6
-	fastrand@1.9.0
-	fastrand@2.1.1
-	ff@0.13.0
-	fiat-crypto@0.2.9
-	figment@0.10.19
-	filetime@0.2.25
-	fixed-capacity-vec@1.0.1
-	flate2@1.0.34
-	float-cmp@0.10.0
-	float-ord@0.3.2
-	float_eq@1.0.1
-	fluid-let@1.0.0
-	fnv@1.0.7
-	foreign-types-shared@0.1.1
-	foreign-types@0.3.2
-	form_urlencoded@1.2.1
-	fslock-arti-fork@0.2.0
-	fslock@0.2.1
-	funty@2.0.0
-	futures-await-test-macro@0.3.0
-	futures-await-test@0.3.0
-	futures-channel@0.3.31
-	futures-core@0.3.31
-	futures-executor@0.3.31
-	futures-io@0.3.31
-	futures-lite@1.13.0
-	futures-lite@2.3.0
-	futures-macro@0.3.31
-	futures-rustls@0.26.0
-	futures-sink@0.3.31
-	futures-task@0.3.31
-	futures-util@0.3.31
-	futures@0.3.31
-	generic-array@0.14.7
-	getrandom@0.2.15
-	gimli@0.31.1
-	glob-match@0.2.1
-	glob@0.3.1
-	gloo-timers@0.3.0
-	group@0.13.0
-	growable-bloom-filter@2.1.1
-	hashbrown@0.12.3
-	hashbrown@0.14.5
-	hashbrown@0.15.0
-	hashlink@0.9.1
-	heck@0.5.0
-	hermit-abi@0.3.9
-	hermit-abi@0.4.0
-	hex-literal@0.4.1
-	hex@0.4.3
-	hickory-proto@0.24.1
-	hkdf@0.12.4
-	hmac@0.12.1
-	hostname-validator@1.1.1
-	http-body-util@0.1.2
-	http-body@1.0.1
-	http@1.1.0
-	httparse@1.9.5
-	httpdate@1.0.3
-	humantime-serde@1.1.1
-	humantime@2.1.0
-	hyper-util@0.1.10
-	hyper@1.5.0
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.61
-	ident_case@1.0.1
-	idna@0.4.0
-	idna@0.5.0
-	indexmap@1.9.3
-	indexmap@2.6.0
-	inotify-sys@0.1.5
-	inotify@0.10.2
-	inout@0.1.3
-	instant@0.1.13
-	inventory@0.3.15
-	io-extras@0.18.2
-	io-lifetimes@1.0.11
-	io-lifetimes@2.0.3
-	ipnet@2.10.1
-	is_terminal_polyfill@1.70.1
-	itertools@0.13.0
-	itoa@1.0.11
-	jobserver@0.1.32
-	js-sys@0.3.72
-	k12@0.3.0
-	keccak@0.1.5
-	kqueue-sys@1.0.4
-	kqueue@1.0.8
-	kv-log-macro@1.0.7
-	lazy_static@1.5.0
-	libc@0.2.161
-	libm@0.2.11
-	libredox@0.1.3
-	libsqlite3-sys@0.30.1
-	linux-raw-sys@0.3.8
-	linux-raw-sys@0.4.14
-	lock_api@0.4.12
-	log@0.4.22
-	lzma-sys@0.1.20
-	matchers@0.1.0
-	matchit@0.7.3
-	matrixmultiply@0.3.9
-	memchr@2.7.4
-	memmap2@0.5.10
-	memmap2@0.9.5
-	merlin@3.0.0
-	mime@0.3.17
-	minimal-lexical@0.2.1
-	miniz_oxide@0.8.0
-	mio@1.0.2
-	nalgebra-macros@0.2.2
-	nalgebra@0.32.6
-	native-tls@0.2.12
-	nix@0.29.0
-	nom@7.1.3
-	normalize-line-endings@0.3.0
-	notify-types@1.0.0
-	notify@7.0.0
-	nu-ansi-term@0.46.0
-	num-bigint-dig@0.8.4
-	num-bigint@0.4.6
-	num-complex@0.4.6
-	num-conv@0.1.0
-	num-integer@0.1.46
-	num-iter@0.1.45
-	num-rational@0.4.2
-	num-traits@0.2.19
-	num_enum@0.7.3
-	num_enum_derive@0.7.3
-	object@0.36.5
-	once_cell@1.20.2
-	openssl-macros@0.1.1
-	openssl-probe@0.1.5
-	openssl-src@300.4.0+3.4.0
-	openssl-sys@0.9.104
-	openssl@0.10.68
-	option-ext@0.2.0
-	ordered-float@2.10.1
-	os_pipe@1.2.1
-	os_str_bytes@6.6.1
-	overload@0.1.1
-	p256@0.13.2
-	p384@0.13.0
-	p521@0.13.3
-	parking@2.2.1
-	parking_lot@0.12.3
-	parking_lot_core@0.9.10
-	paste@1.0.15
-	pem-rfc7468@0.7.0
-	percent-encoding@2.3.1
-	permutohedron@0.2.4
-	phf@0.11.2
-	phf_generator@0.11.2
-	phf_macros@0.11.2
-	phf_shared@0.11.2
-	pico-args@0.5.0
-	pin-project-internal@1.1.7
-	pin-project-lite@0.2.15
-	pin-project@1.1.7
-	pin-utils@0.1.0
-	piper@0.2.4
-	pkcs1@0.7.5
-	pkcs8@0.10.2
-	pkg-config@0.3.31
-	polling@2.8.0
-	polling@3.7.3
-	postage@0.5.0
-	powerfmt@0.2.0
-	ppv-lite86@0.2.20
-	primeorder@0.13.6
-	priority-queue@2.1.1
-	proc-macro-crate@3.2.0
-	proc-macro-error-attr@1.0.4
-	proc-macro-error@1.0.4
-	proc-macro2@1.0.89
-	pwd-grp@1.0.0
-	quote@1.0.37
-	radium@0.7.0
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rand_distr@0.4.3
-	rangemap@1.5.1
-	rawpointer@0.2.1
-	rayon-core@1.12.1
-	rayon@1.10.0
-	redox_syscall@0.5.7
-	redox_users@0.4.6
-	regex-automata@0.1.10
-	regex-automata@0.4.8
-	regex-syntax@0.6.29
-	regex-syntax@0.8.5
-	regex@1.11.1
-	rfc6979@0.4.0
-	ring@0.16.20
-	ring@0.17.8
-	rlimit@0.10.2
-	rmp-serde@1.3.0
-	rmp@0.8.14
-	rsa@0.9.6
-	rusqlite@0.32.1
-	rustc-demangle@0.1.24
-	rustc_version@0.4.1
-	rusticata-macros@4.1.0
-	rustix@0.37.27
-	rustix@0.38.38
-	rustls-pki-types@1.10.0
-	rustls-webpki@0.102.8
-	rustls@0.23.16
-	rustversion@1.0.18
-	ryu@1.0.18
-	safe_arch@0.7.2
-	same-file@1.0.6
-	sanitize-filename@0.5.0
-	scc@2.2.4
-	schannel@0.1.26
-	scopeguard@1.2.0
-	sdd@3.0.4
-	sec1@0.7.3
-	secmem-proc@0.3.4
-	security-framework-sys@2.12.0
-	security-framework@2.11.1
-	semver@1.0.23
-	serde-value@0.7.0
-	serde@1.0.214
-	serde_bytes@0.11.15
-	serde_derive@1.0.214
-	serde_ignored@0.1.10
-	serde_json@1.0.132
-	serde_path_to_error@0.1.16
-	serde_spanned@0.6.8
-	serde_test@1.0.177
-	serde_urlencoded@0.7.1
-	serde_with@3.11.0
-	serde_with_macros@3.11.0
-	serial_test@3.1.1
-	serial_test_derive@3.1.1
-	sha1-asm@0.5.3
-	sha1@0.10.6
-	sha2@0.10.8
-	sha3@0.10.8
-	sharded-slab@0.1.7
-	shell-words@1.1.0
-	shellexpand@3.1.0
-	shlex@1.3.0
-	signal-hook-async-std@0.2.2
-	signal-hook-registry@1.4.2
-	signal-hook@0.3.17
-	signature@2.2.0
-	simba@0.8.1
-	similar@2.6.0
-	siphasher@0.3.11
-	slab@0.4.9
-	slotmap@1.0.7
-	smallvec@1.13.2
-	snapbox-macros@0.3.10
-	snapbox@0.6.18
-	socket2@0.4.10
-	socket2@0.5.7
-	socketpair@0.19.5
-	spin@0.5.2
-	spin@0.9.8
-	spki@0.7.3
-	ssh-cipher@0.2.0
-	ssh-encoding@0.2.0
-	ssh-key@0.6.7
-	static_assertions@1.1.0
-	statrs@0.17.1
-	strsim@0.10.0
-	strsim@0.11.1
-	strum@0.26.3
-	strum_macros@0.26.4
-	subtle@2.6.1
-	syn@1.0.109
-	syn@2.0.85
-	sync_wrapper@0.1.2
-	sync_wrapper@1.0.1
-	synstructure@0.13.1
-	tap@1.0.1
-	tempfile@3.13.0
-	terminal_size@0.4.0
-	thiserror-impl@1.0.65
-	thiserror@1.0.65
-	thread_local@1.1.8
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tiny-keccak@2.0.2
-	tinystr@0.7.6
-	tinyvec@1.8.0
-	tinyvec_macros@0.1.1
-	tokio-macros@2.4.0
-	tokio-native-tls@0.3.1
-	tokio-socks@0.5.2
-	tokio-stream@0.1.16
-	tokio-util@0.7.12
-	tokio@1.41.0
-	toml@0.8.19
-	toml_datetime@0.6.8
-	toml_edit@0.22.22
-	tower-layer@0.3.3
-	tower-service@0.3.3
-	tower@0.5.1
-	tracing-appender@0.2.3
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing-journald@0.3.0
-	tracing-log@0.2.0
-	tracing-subscriber@0.3.18
-	tracing-test-macro@0.2.5
-	tracing-test@0.2.5
-	tracing@0.1.40
-	try-lock@0.2.5
-	trycmd@0.15.7
-	typed-index-collections@3.1.0
-	typeid@1.0.2
-	typenum@1.17.0
-	typetag-impl@0.2.18
-	typetag@0.2.18
-	uncased@0.9.10
-	unicode-bidi@0.3.17
-	unicode-ident@1.0.13
-	unicode-normalization@0.1.24
-	unicode-segmentation@1.12.0
-	unicode-width@0.1.14
-	unicode-xid@0.2.6
-	untrusted@0.7.1
-	untrusted@0.9.0
-	url@2.5.2
-	utf8parse@0.2.2
-	uuid@1.11.0
-	valuable@0.1.0
-	value-bag@1.10.0
-	vcpkg@0.2.15
-	version_check@0.9.5
-	visibility@0.1.1
-	visible@0.0.1
-	void@1.0.2
-	wait-timeout@0.2.0
-	waker-fn@1.2.0
-	walkdir@2.5.0
-	want@0.3.1
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasix@0.12.21
-	wasm-bindgen-backend@0.2.95
-	wasm-bindgen-futures@0.4.45
-	wasm-bindgen-macro-support@0.2.95
-	wasm-bindgen-macro@0.2.95
-	wasm-bindgen-shared@0.2.95
-	wasm-bindgen@0.2.95
-	weak-table@0.3.2
-	web-sys@0.3.72
-	wide@0.7.28
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.9
-	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-sys@0.59.0
-	windows-targets@0.48.5
-	windows-targets@0.52.6
-	windows@0.52.0
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.6
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.6
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.6
-	windows_i686_gnullvm@0.52.6
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.6
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.6
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.6
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.6
-	winnow@0.6.20
-	wyz@0.5.1
-	x25519-dalek@2.0.1
-	x509-signature@0.5.0
-	xxhash-rust@0.8.12
-	xz2@0.1.7
-	zerocopy-derive@0.7.35
-	zerocopy@0.7.35
-	zeroize@1.8.1
-	zeroize_derive@1.4.2
-	zstd-safe@7.2.1
-	zstd-sys@2.0.13+zstd.1.5.6
-	zstd@0.13.2
-"
-
-inherit cargo
-
-MY_P="${PN}-${PN}-v${PV}"
-
-DESCRIPTION="An implementation of Tor, in Rust."
-HOMEPAGE="https://gitlab.torproject.org/tpo/core/arti/"
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.torproject.org/tpo/core/arti"
-else
-	SRC_URI="https://gitlab.torproject.org/tpo/core/${PN}/-/archive/${PN}-v${PV}/${PN}-${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2
-		${CARGO_CRATE_URIS}"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="MIT Apache-2.0"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 Unicode-3.0
-	Unicode-DFS-2016 Unlicense ZLIB
-"
-SLOT="0"
-
-DEPEND="app-arch/xz-utils
-	app-arch/zstd:=
-	dev-db/sqlite:3
-	dev-libs/openssl:="
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED="usr/bin/arti"
-
-src_unpack() {
-	if [[ "${PV}" == *9999 ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_compile() {
-	export ZSTD_SYS_USE_PKG_CONFIG=1
-	for crate in crates/*; do
-		pushd "${crate}" || die
-		cargo_src_compile
-		popd >/dev/null || die
-	done
-}
-
-src_install() {
-	pushd crates/arti >/dev/null || die
-
-	cargo_src_install
-	newdoc src/arti-example-config.toml arti.toml
-
-	popd >/dev/null || die
-
-	dodoc -r doc/*
-}
diff --git a/net-p2p/arti/arti-1.3.2.ebuild b/net-p2p/arti/arti-1.3.2.ebuild
new file mode 100644
index 000000000000..4a342167d753
--- /dev/null
+++ b/net-p2p/arti/arti-1.3.2.ebuild
@@ -0,0 +1,655 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	addr2line@0.24.2
+	adler2@2.0.0
+	aes@0.8.4
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	amplify@4.8.0
+	amplify_derive@4.0.1
+	amplify_num@0.5.3
+	amplify_syn@2.0.1
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anes@0.1.6
+	anstream@0.6.18
+	anstyle-parse@0.2.6
+	anstyle-query@1.1.2
+	anstyle-wincon@3.0.6
+	anstyle@1.0.10
+	anyhow@1.0.95
+	approx@0.5.1
+	arbitrary@1.4.1
+	arrayvec@0.7.6
+	ascii@1.1.0
+	asn1-rs-derive@0.5.1
+	asn1-rs-impl@0.2.0
+	asn1-rs@0.6.2
+	assert-impl@0.1.3
+	assert_matches@1.5.0
+	async-broadcast@0.7.2
+	async-channel@1.9.0
+	async-channel@2.3.1
+	async-compression@0.4.18
+	async-ctrlc@1.2.0
+	async-executor@1.13.1
+	async-global-executor@2.4.1
+	async-io@1.13.0
+	async-io@2.4.0
+	async-lock@2.8.0
+	async-lock@3.4.0
+	async-native-tls@0.5.0
+	async-process@2.3.0
+	async-signal@0.2.10
+	async-std@1.13.0
+	async-task@4.7.1
+	async-trait@0.1.85
+	async_executors@0.7.0
+	asynchronous-codec@0.7.0
+	atomic-waker@1.1.2
+	atomic@0.5.3
+	atomic@0.6.0
+	autocfg@1.4.0
+	automod@1.0.14
+	axum-core@0.4.5
+	axum@0.7.9
+	backtrace@0.3.74
+	base16ct@0.2.0
+	base32@0.5.1
+	base64@0.22.1
+	base64ct@1.6.0
+	bitflags@1.3.2
+	bitflags@2.6.0
+	bitvec@1.0.1
+	blake2@0.10.6
+	blanket@0.3.0
+	block-buffer@0.10.4
+	blocking@1.6.1
+	bounded-vec-deque@0.1.1
+	bstr@1.11.3
+	bumpalo@3.16.0
+	by_address@1.2.1
+	bytemuck@1.21.0
+	byteorder@1.5.0
+	bytes@1.9.0
+	cast@0.3.0
+	cc@1.2.7
+	cfg-if@1.0.0
+	cfg_aliases@0.2.1
+	chrono@0.4.39
+	ciborium-io@0.2.2
+	ciborium-ll@0.2.2
+	ciborium@0.2.2
+	cipher@0.4.4
+	clap@4.5.23
+	clap_builder@4.5.23
+	clap_derive@4.5.18
+	clap_lex@0.7.4
+	coarsetime@0.1.35
+	colorchoice@1.0.3
+	concurrent-queue@2.5.0
+	console@0.15.10
+	const-oid@0.9.6
+	content_inspector@0.2.4
+	convert_case@0.6.0
+	cookie-factory@0.3.3
+	core-foundation-sys@0.8.7
+	core-foundation@0.9.4
+	cpu-time@1.0.0
+	cpufeatures@0.2.16
+	crc32fast@1.4.2
+	criterion-plot@0.5.0
+	criterion@0.5.1
+	crossbeam-channel@0.5.14
+	crossbeam-deque@0.8.6
+	crossbeam-epoch@0.9.18
+	crossbeam-queue@0.3.12
+	crossbeam-utils@0.8.21
+	crunchy@0.2.2
+	crypto-bigint@0.5.5
+	crypto-common@0.1.6
+	ctr@0.9.2
+	ctrlc@3.4.5
+	curve25519-dalek-derive@0.1.1
+	curve25519-dalek@4.1.3
+	darling@0.14.4
+	darling@0.20.10
+	darling_core@0.14.4
+	darling_core@0.20.10
+	darling_macro@0.14.4
+	darling_macro@0.20.10
+	data-encoding@2.6.0
+	der-parser@9.0.0
+	der@0.7.9
+	deranged@0.3.11
+	derive-deftly-macros@0.14.2
+	derive-deftly@0.14.2
+	derive_arbitrary@1.4.1
+	derive_builder_core_fork_arti@0.11.2
+	derive_builder_fork_arti@0.11.2
+	derive_builder_macro_fork_arti@0.11.2
+	derive_more-impl@1.0.0
+	derive_more@1.0.0
+	dialoguer@0.11.0
+	digest@0.10.7
+	directories@5.0.1
+	dirs-sys@0.4.1
+	dirs@5.0.1
+	displaydoc@0.2.5
+	downcast-rs@1.2.1
+	dsa@0.6.3
+	dunce@1.0.5
+	dyn-clone@1.0.17
+	dynasm@3.0.1
+	dynasmrt@3.0.1
+	ecdsa@0.16.9
+	ed25519-dalek@2.1.1
+	ed25519@2.2.3
+	educe@0.4.23
+	either@1.13.0
+	elliptic-curve@0.13.8
+	encode_unicode@1.0.0
+	enum-as-inner@0.6.1
+	enum-ordinalize@3.1.15
+	equivalent@1.0.1
+	erased-serde@0.4.5
+	errno@0.3.10
+	event-listener-strategy@0.5.3
+	event-listener@2.5.3
+	event-listener@5.3.1
+	fallible-iterator@0.3.0
+	fallible-streaming-iterator@0.1.9
+	fast-socks5@0.10.0
+	fastrand@1.9.0
+	fastrand@2.3.0
+	ff@0.13.0
+	fiat-crypto@0.2.9
+	figment@0.10.19
+	filetime@0.2.25
+	fixed-capacity-vec@1.0.1
+	flate2@1.0.35
+	float-cmp@0.10.0
+	float-ord@0.3.2
+	float_eq@1.0.1
+	fluid-let@1.0.0
+	fnv@1.0.7
+	foreign-types-shared@0.1.1
+	foreign-types@0.3.2
+	form_urlencoded@1.2.1
+	fslock-arti-fork@0.2.0
+	fslock@0.2.1
+	funty@2.0.0
+	futures-await-test-macro@0.3.0
+	futures-await-test@0.3.0
+	futures-channel@0.3.31
+	futures-core@0.3.31
+	futures-executor@0.3.31
+	futures-io@0.3.31
+	futures-lite@1.13.0
+	futures-lite@2.5.0
+	futures-macro@0.3.31
+	futures-rustls@0.26.0
+	futures-sink@0.3.31
+	futures-task@0.3.31
+	futures-util@0.3.31
+	futures@0.3.31
+	generic-array@0.14.7
+	getrandom@0.2.15
+	gimli@0.31.1
+	glob-match@0.2.1
+	glob@0.3.2
+	gloo-timers@0.3.0
+	group@0.13.0
+	growable-bloom-filter@2.1.1
+	half@2.4.1
+	hashbrown@0.12.3
+	hashbrown@0.14.5
+	hashbrown@0.15.2
+	hashlink@0.9.1
+	heck@0.5.0
+	hermit-abi@0.3.9
+	hermit-abi@0.4.0
+	hex-literal@0.4.1
+	hex@0.4.3
+	hickory-proto@0.24.2
+	hkdf@0.12.4
+	hmac@0.12.1
+	hostname-validator@1.1.1
+	http-body-util@0.1.2
+	http-body@1.0.1
+	http@1.2.0
+	httparse@1.9.5
+	httpdate@1.0.3
+	humantime-serde@1.1.1
+	humantime@2.1.0
+	hyper-util@0.1.10
+	hyper@1.5.2
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.61
+	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
+	ident_case@1.0.1
+	idna@1.0.3
+	idna_adapter@1.2.0
+	indexmap@1.9.3
+	indexmap@2.7.0
+	inotify-sys@0.1.5
+	inotify@0.10.2
+	inout@0.1.3
+	instant@0.1.13
+	inventory@0.3.16
+	io-extras@0.18.4
+	io-lifetimes@1.0.11
+	io-lifetimes@2.0.4
+	ipnet@2.10.1
+	is-terminal@0.4.13
+	is_terminal_polyfill@1.70.1
+	itertools@0.10.5
+	itertools@0.13.0
+	itertools@0.14.0
+	itoa@1.0.14
+	jobserver@0.1.32
+	js-sys@0.3.76
+	k12@0.3.0
+	keccak@0.1.5
+	kqueue-sys@1.0.4
+	kqueue@1.0.8
+	kv-log-macro@1.0.7
+	lazy_static@1.5.0
+	libc@0.2.169
+	libm@0.2.11
+	libredox@0.1.3
+	libsqlite3-sys@0.30.1
+	linux-raw-sys@0.3.8
+	linux-raw-sys@0.4.14
+	litemap@0.7.4
+	lock_api@0.4.12
+	log@0.4.22
+	lzma-sys@0.1.20
+	matchers@0.1.0
+	matchit@0.7.3
+	matrixmultiply@0.3.9
+	memchr@2.7.4
+	memmap2@0.9.5
+	merlin@3.0.0
+	mime@0.3.17
+	minimal-lexical@0.2.1
+	miniz_oxide@0.8.2
+	mio@1.0.3
+	nalgebra@0.33.2
+	native-tls@0.2.12
+	nix@0.29.0
+	nom@7.1.3
+	normalize-line-endings@0.3.0
+	notify-types@1.0.1
+	notify@7.0.0
+	nu-ansi-term@0.46.0
+	num-bigint-dig@0.8.4
+	num-bigint@0.4.6
+	num-complex@0.4.6
+	num-conv@0.1.0
+	num-integer@0.1.46
+	num-iter@0.1.45
+	num-rational@0.4.2
+	num-traits@0.2.19
+	num_enum@0.7.3
+	num_enum_derive@0.7.3
+	object@0.36.7
+	once_cell@1.20.2
+	oorandom@11.1.4
+	openssl-macros@0.1.1
+	openssl-probe@0.1.5
+	openssl-src@300.4.1+3.4.0
+	openssl-sys@0.9.104
+	openssl@0.10.68
+	option-ext@0.2.0
+	ordered-float@2.10.1
+	os_pipe@1.2.1
+	os_str_bytes@6.6.1
+	overload@0.1.1
+	p256@0.13.2
+	p384@0.13.0
+	p521@0.13.3
+	parking@2.2.1
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	paste@1.0.15
+	pem-rfc7468@0.7.0
+	percent-encoding@2.3.1
+	permutohedron@0.2.4
+	phf@0.11.3
+	phf_generator@0.11.3
+	phf_macros@0.11.3
+	phf_shared@0.11.3
+	pico-args@0.5.0
+	pin-project-internal@1.1.8
+	pin-project-lite@0.2.16
+	pin-project@1.1.8
+	pin-utils@0.1.0
+	piper@0.2.4
+	pkcs1@0.7.5
+	pkcs8@0.10.2
+	pkg-config@0.3.31
+	plotters-backend@0.3.7
+	plotters-svg@0.3.7
+	plotters@0.3.7
+	polling@2.8.0
+	polling@3.7.4
+	postage@0.5.0
+	powerfmt@0.2.0
+	ppv-lite86@0.2.20
+	primeorder@0.13.6
+	priority-queue@2.1.1
+	proc-macro-crate@3.2.0
+	proc-macro-error-attr2@2.0.0
+	proc-macro-error2@2.0.1
+	proc-macro2@1.0.92
+	pwd-grp@1.0.0
+	quote@1.0.38
+	radium@0.7.0
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rand_distr@0.4.3
+	rangemap@1.5.1
+	rawpointer@0.2.1
+	rayon-core@1.12.1
+	rayon@1.10.0
+	redox_syscall@0.5.8
+	redox_users@0.4.6
+	regex-automata@0.1.10
+	regex-automata@0.4.9
+	regex-syntax@0.6.29
+	regex-syntax@0.8.5
+	regex@1.11.1
+	rfc6979@0.4.0
+	ring@0.16.20
+	ring@0.17.8
+	rlimit@0.10.2
+	rmp-serde@1.3.0
+	rmp@0.8.14
+	rsa@0.9.7
+	rusqlite@0.32.1
+	rustc-demangle@0.1.24
+	rustc_version@0.4.1
+	rusticata-macros@4.1.0
+	rustix@0.37.27
+	rustix@0.38.42
+	rustls-pki-types@1.10.1
+	rustls-webpki@0.102.8
+	rustls@0.23.20
+	rustversion@1.0.19
+	ryu@1.0.18
+	safe_arch@0.7.4
+	same-file@1.0.6
+	sanitize-filename@0.6.0
+	scc@2.3.0
+	schannel@0.1.27
+	scopeguard@1.2.0
+	sdd@3.0.5
+	sec1@0.7.3
+	secmem-proc@0.3.5
+	security-framework-sys@2.13.0
+	security-framework@2.11.1
+	semver@1.0.24
+	serde-value@0.7.0
+	serde@1.0.217
+	serde_bytes@0.11.15
+	serde_derive@1.0.217
+	serde_ignored@0.1.10
+	serde_json@1.0.135
+	serde_path_to_error@0.1.16
+	serde_spanned@0.6.8
+	serde_test@1.0.177
+	serde_urlencoded@0.7.1
+	serde_with@3.12.0
+	serde_with_macros@3.12.0
+	serial_test@3.2.0
+	serial_test_derive@3.2.0
+	sha1-asm@0.5.3
+	sha1@0.10.6
+	sha2@0.10.8
+	sha3@0.10.8
+	sharded-slab@0.1.7
+	shell-words@1.1.0
+	shellexpand@3.1.0
+	shlex@1.3.0
+	signal-hook-async-std@0.2.2
+	signal-hook-registry@1.4.2
+	signal-hook@0.3.17
+	signature@2.2.0
+	simba@0.9.0
+	similar@2.6.0
+	siphasher@1.0.1
+	slab@0.4.9
+	slotmap@1.0.7
+	smallvec@1.13.2
+	snapbox-macros@0.3.10
+	snapbox@0.6.21
+	socket2@0.4.10
+	socket2@0.5.8
+	socketpair@0.19.5
+	spin@0.5.2
+	spin@0.9.8
+	spki@0.7.3
+	ssh-cipher@0.2.0
+	ssh-encoding@0.2.0
+	ssh-key@0.6.7
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	statrs@0.18.0
+	strsim@0.10.0
+	strsim@0.11.1
+	strum@0.26.3
+	strum_macros@0.26.4
+	subtle@2.6.1
+	syn@1.0.109
+	syn@2.0.95
+	sync_wrapper@1.0.2
+	synstructure@0.13.1
+	tap@1.0.1
+	tempfile@3.15.0
+	terminal_size@0.4.1
+	thiserror-impl@1.0.69
+	thiserror-impl@2.0.9
+	thiserror@1.0.69
+	thiserror@2.0.9
+	thread_local@1.1.8
+	time-core@0.1.2
+	time-macros@0.2.19
+	time@0.3.37
+	tiny-keccak@2.0.2
+	tinystr@0.7.6
+	tinystr@0.8.0
+	tinytemplate@1.2.1
+	tinyvec@1.8.1
+	tinyvec_macros@0.1.1
+	tokio-macros@2.4.0
+	tokio-native-tls@0.3.1
+	tokio-socks@0.5.2
+	tokio-stream@0.1.17
+	tokio-util@0.7.13
+	tokio@1.42.0
+	toml@0.8.19
+	toml_datetime@0.6.8
+	toml_edit@0.22.22
+	tower-layer@0.3.3
+	tower-service@0.3.3
+	tower@0.5.2
+	tracing-appender@0.2.3
+	tracing-attributes@0.1.28
+	tracing-core@0.1.33
+	tracing-journald@0.3.1
+	tracing-log@0.2.0
+	tracing-subscriber@0.3.19
+	tracing-test-macro@0.2.5
+	tracing-test@0.2.5
+	tracing@0.1.41
+	try-lock@0.2.5
+	trycmd@0.15.8
+	typed-index-collections@3.1.0
+	typeid@1.0.2
+	typenum@1.17.0
+	typetag-impl@0.2.19
+	typetag@0.2.19
+	uncased@0.9.10
+	unicode-ident@1.0.14
+	unicode-segmentation@1.12.0
+	unicode-width@0.2.0
+	unicode-xid@0.2.6
+	untrusted@0.7.1
+	untrusted@0.9.0
+	url@2.5.4
+	utf16_iter@1.0.5
+	utf8_iter@1.0.4
+	utf8parse@0.2.2
+	uuid@1.11.0
+	valuable@0.1.0
+	value-bag@1.10.0
+	vcpkg@0.2.15
+	version_check@0.9.5
+	visibility@0.1.1
+	visible@0.0.1
+	void@1.0.2
+	wait-timeout@0.2.0
+	waker-fn@1.2.0
+	walkdir@2.5.0
+	want@0.3.1
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasix@0.12.21
+	wasm-bindgen-backend@0.2.99
+	wasm-bindgen-futures@0.4.49
+	wasm-bindgen-macro-support@0.2.99
+	wasm-bindgen-macro@0.2.99
+	wasm-bindgen-shared@0.2.99
+	wasm-bindgen@0.2.99
+	weak-table@0.3.2
+	web-sys@0.3.76
+	wide@0.7.31
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.9
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-core@0.52.0
+	windows-core@0.58.0
+	windows-implement@0.58.0
+	windows-interface@0.58.0
+	windows-result@0.2.0
+	windows-strings@0.1.0
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-sys@0.59.0
+	windows-targets@0.48.5
+	windows-targets@0.52.6
+	windows@0.58.0
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.6
+	winnow@0.6.22
+	write16@1.0.0
+	writeable@0.5.5
+	wyz@0.5.1
+	x25519-dalek@2.0.1
+	x509-signature@0.5.0
+	xxhash-rust@0.8.15
+	xz2@0.1.7
+	yoke-derive@0.7.5
+	yoke@0.7.5
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+	zerofrom-derive@0.1.5
+	zerofrom@0.1.5
+	zeroize@1.8.1
+	zeroize_derive@1.4.2
+	zerovec-derive@0.10.3
+	zerovec@0.10.4
+	zstd-safe@7.2.1
+	zstd-sys@2.0.13+zstd.1.5.6
+	zstd@0.13.2
+"
+
+inherit cargo
+
+MY_P="${PN}-${PN}-v${PV}"
+
+DESCRIPTION="An implementation of Tor, in Rust."
+HOMEPAGE="https://gitlab.torproject.org/tpo/core/arti/"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.torproject.org/tpo/core/arti"
+else
+	SRC_URI="https://gitlab.torproject.org/tpo/core/${PN}/-/archive/${PN}-v${PV}/${PN}-${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2
+		${CARGO_CRATE_URIS}"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="MIT Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 Unicode-3.0
+	Unlicense ZLIB
+"
+SLOT="0"
+
+DEPEND="app-arch/xz-utils
+	app-arch/zstd:=
+	dev-db/sqlite:3
+	dev-libs/openssl:="
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/arti"
+
+src_unpack() {
+	if [[ "${PV}" == *9999 ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_compile() {
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+	for crate in crates/*; do
+		pushd "${crate}" || die
+		cargo_src_compile
+		popd >/dev/null || die
+	done
+}
+
+src_install() {
+	pushd crates/arti >/dev/null || die
+
+	cargo_src_install
+	newdoc src/arti-example-config.toml arti.toml
+
+	popd >/dev/null || die
+
+	dodoc -r doc/*
+}
diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest
index d70c66770b6f..0d31c0b6cb85 100644
--- a/net-p2p/bitcoin-core/Manifest
+++ b/net-p2p/bitcoin-core/Manifest
@@ -1,2 +1,2 @@
 DIST bitcoin-core-28.0.tar.gz 12598313 BLAKE2B 20b189cc359d4ba1d2c61af6f69f050be32b3670a3df7e9d8fe53e55bd78fcac8dde07d6a5d32088981742aa97234aa38c19669d77837c5ab6b114260762e039 SHA512 67b2abf58c1bc57ce53b80d2d2bc9c83fc5b6d8ac08224073e03a7f13b7f6fef1127d9b825ff3594210a7c962098b520042f1eff9007ba26a5d8922f96f96e57
-DIST bitcoin-core-28.1_rc2.tar.gz 12601765 BLAKE2B 3a16411497d00f635b89684e7cda69cac98aa03d442d5ad1bde6d0ca757cd65354687110d5ec71d05d4be55cc732b93f03cfc769b5ed278d6ae72bad28794039 SHA512 59f4176c8c456c410ea4adfe396c4bbf89a70b41c251c0d6aa8ed98b29b1b1826ed14b2c15409306330d29cd4337469e67179d102e777c3a945d438a912c974a
+DIST bitcoin-core-28.1.tar.gz 12601466 BLAKE2B f6dd3c269b0e132798b3bea96a122a89b95e7544f01fd3401bfc2fd1ef11fc847a3570f8d5c0339778df0a3ecf17cf49af4148c2f68d7719d6f85ac2688e9d3c SHA512 859c5f0b2f927969766d3ebde64173469e5810694ba317629fac64c66311d847698ae093dbf585e327cf4e75983b722ff45a23ed3fe6f1f13752db4cf6846aa9
diff --git a/net-p2p/bitcoin-core/bitcoin-core-28.1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-28.1.ebuild
new file mode 100644
index 000000000000..4033be10f25b
--- /dev/null
+++ b/net-p2p/bitcoin-core/bitcoin-core-28.1.ebuild
@@ -0,0 +1,421 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessing python-any-r1 systemd toolchain-funcs xdg-utils
+
+DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency"
+HOMEPAGE="https://bitcoincore.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> ${P}.tar.gz
+"
+S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
+
+LICENSE="MIT"
+SLOT="0"
+if [[ "${PV}" != *_rc* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+IUSE="+asm +berkdb +cli +daemon dbus examples +external-signer gui kde +man nat-pmp +qrcode +sqlite +system-libsecp256k1 systemtap test test-full upnp zeromq"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	dbus? ( gui )
+	kde? ( gui )
+	qrcode? ( gui )
+	test-full? ( test )
+"
+# dev-libs/univalue is now bundled, as upstream dropped support for system copy
+# and their version in the Bitcoin repo has deviated a fair bit from upstream.
+# Upstream also seems very inactive.
+RDEPEND="
+	!dev-util/bitcoin-tx
+	>=dev-libs/boost-1.81.0:=
+	>=dev-libs/libevent-2.1.12:=
+	berkdb? ( >=sys-libs/db-4.8.30:$(db_ver_to_slot 4.8)=[cxx] )
+	cli? ( !net-p2p/bitcoin-cli )
+	daemon? (
+		!net-p2p/bitcoind
+		acct-group/bitcoin
+		acct-user/bitcoin
+	)
+	gui? (
+		!net-p2p/bitcoin-qt
+		>=dev-qt/qtcore-5.15.14:5
+		>=dev-qt/qtgui-5.15.14:5
+		>=dev-qt/qtnetwork-5.15.14:5
+		>=dev-qt/qtwidgets-5.15.14:5
+		dbus? ( >=dev-qt/qtdbus-5.15.14:5 )
+	)
+	nat-pmp? ( >=net-libs/libnatpmp-20230423:= )
+	qrcode? ( >=media-gfx/qrencode-4.1.1:= )
+	sqlite? ( >=dev-db/sqlite-3.38.5:= )
+	system-libsecp256k1? ( >=dev-libs/libsecp256k1-0.6.0:=[ellswift,extrakeys,recovery,schnorr] )
+	upnp? ( >=net-libs/miniupnpc-2.2.7:= )
+	zeromq? ( >=net-libs/zeromq-4.3.4:= )
+"
+DEPEND="
+	${RDEPEND}
+	systemtap? ( >=dev-debug/systemtap-4.8 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	daemon? (
+		acct-group/bitcoin
+		acct-user/bitcoin
+	)
+	gui? ( >=dev-qt/linguist-tools-5.15.14:5 )
+	test? ( ${PYTHON_DEPS} )
+"
+IDEPEND="
+	gui? ( dev-util/desktop-file-utils )
+"
+
+DOCS=(
+	doc/bips.md
+	doc/bitcoin-conf.md
+	doc/descriptors.md
+	doc/files.md
+	doc/i2p.md
+	doc/JSON-RPC-interface.md
+	doc/multisig-tutorial.md
+	doc/p2p-bad-ports.md
+	doc/psbt.md
+	doc/reduce-memory.md
+	doc/reduce-traffic.md
+	doc/release-notes.md
+	doc/REST-interface.md
+	doc/tor.md
+)
+
+PATCHES=(
+	"${FILESDIR}/28.0-syslibs.patch"
+	"${FILESDIR}/26.0-init.patch"
+)
+
+efmt() {
+	: ${1:?} ; local l ; while read -r l ; do "${!#}" "${l}" ; done < <(fmt "${@:1:$#-1}")
+}
+
+pkg_pretend() {
+	if ! use daemon && ! use gui && ! has_version "${CATEGORY}/${PN}[-daemon,-gui(-),-qt5(-)]" ; then
+		efmt ewarn <<-EOF
+			You are enabling neither USE="daemon" nor USE="gui". This is a valid
+			configuration, but you will be unable to run a Bitcoin node using this
+			installation.
+		EOF
+	fi
+	if use daemon && ! use cli && ! has_version "${CATEGORY}/${PN}[daemon,-bitcoin-cli(-),-cli(-)]" ; then
+		efmt ewarn <<-EOF
+			You are enabling USE="daemon" but not USE="cli". This is a valid
+			configuration, but you will be unable to interact with your bitcoind node
+			via the command line using this installation.
+		EOF
+	fi
+	if ! use berkdb && ! use sqlite &&
+		{ { use daemon && ! has_version "${CATEGORY}/${PN}[daemon,-berkdb,-sqlite]" ; } ||
+		  { use gui && ! has_version "${CATEGORY}/${PN}[gui,-berkdb,-sqlite]" ; } ; }
+	then
+		efmt ewarn <<-EOF
+			You are enabling neither USE="berkdb" nor USE="sqlite". This is a valid
+			configuration, but your Bitcoin node will be unable to open any wallets.
+		EOF
+	fi
+
+	# test/functional/feature_pruning.py requires 4 GB disk space
+	# test/functional/wallet_pruning.py requires 1.3 GB disk space
+	use test && CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_setup
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+	if use system-libsecp256k1 ; then
+		rm -r src/secp256k1 || die
+		sed -e '/^DIST_SUBDIRS *=/s/\bsecp256k1\b//' -i src/Makefile.am || die
+	else
+		pushd src/secp256k1 >/dev/null || die
+		AT_NOELIBTOOLIZE=yes eautoreconf
+		popd >/dev/null || die
+	fi
+	eautoreconf
+
+	# we say --disable-util-util, so we can't test bitcoin-util
+	sed -ne '/^  {/{h;:0;n;H;/^  }/!b0;g;\|"exec": *"\./bitcoin-util"|d};p' \
+		-i test/util/data/bitcoin-util-test.json || die
+
+	sed -e 's/^\(complete -F _bitcoind\b\).*$/\1'"$(usev daemon ' bitcoind')$(usev gui ' bitcoin-qt')/" \
+		-i contrib/completions/bash/bitcoind.bash || die
+}
+
+src_configure() {
+	local wallet ; if use berkdb || use sqlite ; then wallet=enable ; else wallet=disable ; fi
+	local myeconfargs=(
+		--disable-static
+		--${wallet}-wallet
+		$(use_with sqlite)
+		$(use_with berkdb bdb)
+		$(use_enable systemtap usdt)
+		$(use_with upnp miniupnpc)
+		$(use_with nat-pmp natpmp)
+		$(use_enable test tests)
+		--disable-bench
+		--disable-fuzz{,-binary}
+		$(use_with qrcode qrencode)
+		--disable-ccache
+		$(use_enable asm)
+		$(use_enable zeromq zmq)
+		$(use_enable man)
+		$(use_enable external-signer)
+		--with-utils
+		$(use_enable {,util-}cli)
+		--enable-util-tx
+		--${wallet}-util-wallet
+		--disable-util-util
+		$(use_with daemon)
+		$(use_with gui gui qt5)
+		$(use_with dbus qtdbus)
+		$(use_with system-libsecp256k1)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use daemon && ! tc-is-cross-compiler ; then
+		TOPDIR="${S}" bash contrib/devtools/gen-bitcoin-conf.sh || die
+	fi
+	sed -e 's/ To use, copy this file$//p;Tp;:0;n;/save the file\.$/!b0;d;:p;p' \
+		-ni share/examples/bitcoin.conf || die
+}
+
+src_test() {
+	emake check
+
+	use daemon && edo "${PYTHON}" test/functional/test_runner.py \
+			--ansi $(usev test-full --extended) --jobs="$(get_makeopts_jobs)" --timeout-factor="${TIMEOUT_FACTOR:-15}"
+}
+
+src_install() {
+	dodoc -r doc/release-notes
+
+	use external-signer && DOCS+=( doc/external-signer.md )
+	use berkdb || use sqlite && DOCS+=( doc/managing-wallets.md )
+	use systemtap && DOCS+=( doc/tracing.md )
+	use zeromq && DOCS+=( doc/zmq.md )
+
+	if use daemon ; then
+		# https://bugs.gentoo.org/757102
+		DOCS+=( share/rpcauth/rpcauth.py )
+		docompress -x "/usr/share/doc/${PF}/rpcauth.py"
+	fi
+
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+	! use test || rm -f -- "${ED}"/usr/bin/test_bitcoin{,-qt} || die
+
+	newbashcomp contrib/completions/bash/bitcoin-tx.bash bitcoin-tx
+	use cli && newbashcomp contrib/completions/bash/bitcoin-cli.bash bitcoin-cli
+	if use daemon ; then
+		newbashcomp contrib/completions/bash/bitcoind.bash bitcoind
+		use gui && bashcomp_alias bitcoind bitcoin-qt
+	elif use gui ; then
+		newbashcomp contrib/completions/bash/bitcoind.bash bitcoin-qt
+	fi
+
+	if use daemon ; then
+		insinto /etc/bitcoin
+		doins share/examples/bitcoin.conf
+		fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+		fperms 0660 /etc/bitcoin/bitcoin.conf
+
+		newconfd contrib/init/bitcoind.openrcconf bitcoind
+		newinitd "${FILESDIR}/bitcoind.openrc" bitcoind
+		systemd_newunit contrib/init/bitcoind.service bitcoind.service
+
+		keepdir /var/lib/bitcoind
+		fperms 0750 /var/lib/bitcoind
+		fowners bitcoin:bitcoin /var/lib/bitcoind
+		dosym -r {/etc/bitcoin,/var/lib/bitcoind}/bitcoin.conf
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
+	fi
+
+	if use gui ; then
+		insinto /usr/share/icons/hicolor/scalable/apps
+		newins src/qt/res/src/bitcoin.svg bitcoin128.svg
+
+		domenu "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop"
+
+		if use kde ; then
+			insinto /usr/share/kservices5
+			doins "${FILESDIR}/bitcoin-qt.protocol"
+		fi
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc -r contrib/{linearize,qos}
+		use zeromq && dodoc -r contrib/zmq
+	fi
+}
+
+pkg_preinst() {
+	if use daemon && [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then
+		if [[ -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then
+			dosym -r /var/lib/bitcoin{d,/.bitcoin}
+		elif [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] ; then
+			efmt ewarn <<-EOF
+				Your bitcoind data directory is located at ${EPREFIX}/var/lib/bitcoin/.bitcoin,
+				a deprecated location. To perform an automated migration to
+				${EPREFIX}/var/lib/bitcoind, first shut down any running bitcoind instances
+				that may be using the deprecated path, and then run:
+
+				# emerge --config ${CATEGORY}/${PN}
+				EOF
+			insinto /var/lib/bitcoin
+			mv -- "${ED}/var/lib/bitcoin"{d,/.bitcoin} || die
+			dosym -r {/etc/,/var/lib/bitcoin/.}bitcoin/bitcoin.conf
+			dosym -r /var/lib/bitcoin{/.bitcoin,d}
+		fi
+	fi
+
+	if use kde && [[ -d "${EROOT}/usr/share/kde4" ]] ; then
+		dosym -r /usr/share/{kservices5,kde4/services}/bitcoin-qt.protocol
+	fi
+}
+
+pkg_postinst() {
+	# we don't use xdg.eclass because it adds unconditional IDEPENDs
+	if use gui ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+
+	if use daemon && [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		efmt -su elog <<-EOF
+			To have ${PN} automatically use Tor when it's running, be sure your \
+			'torrc' config file has 'ControlPort' and 'CookieAuthentication' set up \
+			correctly, and:
+			- Using an init script: add the 'bitcoin' user to the 'tor' user group.
+			- Running bitcoind directly: add that user to the 'tor' user group.
+			EOF
+	fi
+
+	if use cli && use daemon ; then
+		efmt -su elog <<-EOF
+			To use bitcoin-cli with the /etc/init.d/bitcoind service:
+			 - Add your user(s) to the 'bitcoin' group.
+			 - Symlink ~/.bitcoin to /var/lib/bitcoind.
+		EOF
+	fi
+
+	if use berkdb ; then
+		# https://github.com/bitcoin/bitcoin/pull/28597
+		# https://bitcoincore.org/en/releases/26.0/#wallet
+		efmt ewarn <<-EOF
+			Creation of legacy (Berkeley DB) wallets is refused starting with Bitcoin
+			Core 26.0, pending the deprecation and eventual removal of support for
+			legacy wallets altogether in future releases. At present you can still
+			force support for the creation of legacy wallets by adding the following
+			line to your bitcoin.conf:
+
+			deprecatedrpc=create_bdb
+		EOF
+	fi
+}
+
+pkg_postrm() {
+	if use gui ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_config() {
+	if [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" && ! -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] &&
+		[[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]]
+	then
+		in_use() {
+			: ${1:?} ; local each
+			if command -v fuser >/dev/null ; then
+				fuser "${@}" >/dev/null 2>&1
+			elif command -v lsof >/dev/null ; then
+				for each ; do
+					lsof -- "${each}" && return
+				done >/dev/null 2>&1
+			elif mountpoint -q /proc ; then
+				{ find /proc/[0-9]*/{cwd,exe,fd} -type l -exec readlink -- {} +
+					awk '{ print $6 }' /proc/[0-9]*/maps
+				} 2>/dev/null | grep -Fqx -f <(printf '%s\n' "${@}" ; readlink -m -- "${@}")
+			else
+				return 13
+			fi
+		}
+		ebegin "Checking that ${EPREFIX}/var/lib/bitcoin/.bitcoin is not in use"
+		in_use "${EROOT}/var/lib/bitcoin/.bitcoin"{,/.lock}
+		case $? in
+			0)
+				eend 1
+				efmt eerror <<-EOF
+					${EPREFIX}/var/lib/bitcoin/.bitcoin is currently in use. Please stop any
+					running bitcoind instances that may be using this data directory, and then
+					retry this migration.
+					EOF
+				die "${EPREFIX}/var/lib/bitcoin/.bitcoin is in use"
+				;;
+			13)
+				eend 1
+				if [[ "${BITCOIND_IS_NOT_RUNNING}" != 1 ]] ; then
+					efmt eerror <<-EOF
+						Found no way to check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use.
+						Do you have /proc mounted? To force the migration without checking, re-run
+						this command with BITCOIND_IS_NOT_RUNNING=1.
+						EOF
+					die "could not check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use"
+				fi
+				;;
+			*)
+				eend 0
+				;;
+		esac
+
+		# find all relative symlinks that point outside the data dir
+		local -A symlinks
+		cd -- "${EROOT}/var/lib/bitcoin/.bitcoin" || die
+		local each ; while read -r -d '' each ; do
+			local target=$(readlink -- "${each}") && [[ "${target}" == ../* ]] &&
+				target=$(readlink -e -- "${each}") && [[ "${target}" != "${EROOT}/var/lib/bitcoin/.bitcoin/"* ]] &&
+				symlinks["${each}"]="${target}"
+		done < <(find -type l -print0)
+
+		einfo "Moving your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind."
+		rm -f -- "${EROOT}/var/lib/bitcoind" || die
+		mv --no-clobber --no-copy --no-target-directory -- "${EROOT}/var/lib/bitcoin"{/.bitcoin,d} ||
+			die "Failed to move your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind."
+
+		# fix up the relative symlinks
+		cd -- "${EROOT}/var/lib/bitcoind" || die
+		for each in "${!symlinks[@]}" ; do
+			ln -fnrs -- "${symlinks[${each}]}" "${each}"  # keep going even if this fails
+		done
+
+		einfo 'Creating a transitional symlink for your convenience.'
+		ln -fnrsv -- "${EROOT}/var/lib/bitcoin"{d,/.bitcoin}
+		einfo 'You may remove this link when you no longer need it.'
+	else
+		einfo 'Nothing to do.'
+	fi
+}
diff --git a/net-p2p/bitcoin-core/bitcoin-core-28.1_rc2.ebuild b/net-p2p/bitcoin-core/bitcoin-core-28.1_rc2.ebuild
deleted file mode 100644
index 98309717e219..000000000000
--- a/net-p2p/bitcoin-core/bitcoin-core-28.1_rc2.ebuild
+++ /dev/null
@@ -1,421 +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} )
-
-inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessing python-any-r1 systemd toolchain-funcs xdg-utils
-
-DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency"
-HOMEPAGE="https://bitcoincore.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> ${P}.tar.gz
-"
-S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
-
-LICENSE="MIT"
-SLOT="0"
-if [[ "${PV}" != *_rc* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-fi
-IUSE="+asm +berkdb +cli +daemon dbus examples +external-signer gui kde +man nat-pmp +qrcode +sqlite +system-libsecp256k1 systemtap test test-full upnp zeromq"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	dbus? ( gui )
-	kde? ( gui )
-	qrcode? ( gui )
-	test-full? ( test )
-"
-# dev-libs/univalue is now bundled, as upstream dropped support for system copy
-# and their version in the Bitcoin repo has deviated a fair bit from upstream.
-# Upstream also seems very inactive.
-RDEPEND="
-	!dev-util/bitcoin-tx
-	>=dev-libs/boost-1.81.0:=
-	>=dev-libs/libevent-2.1.12:=
-	berkdb? ( >=sys-libs/db-4.8.30:$(db_ver_to_slot 4.8)=[cxx] )
-	cli? ( !net-p2p/bitcoin-cli )
-	daemon? (
-		!net-p2p/bitcoind
-		acct-group/bitcoin
-		acct-user/bitcoin
-	)
-	gui? (
-		!net-p2p/bitcoin-qt
-		>=dev-qt/qtcore-5.15.14:5
-		>=dev-qt/qtgui-5.15.14:5
-		>=dev-qt/qtnetwork-5.15.14:5
-		>=dev-qt/qtwidgets-5.15.14:5
-		dbus? ( >=dev-qt/qtdbus-5.15.14:5 )
-	)
-	nat-pmp? ( >=net-libs/libnatpmp-20230423:= )
-	qrcode? ( >=media-gfx/qrencode-4.1.1:= )
-	sqlite? ( >=dev-db/sqlite-3.38.5:= )
-	system-libsecp256k1? ( >=dev-libs/libsecp256k1-0.4.0:=[ellswift,extrakeys,recovery,schnorr] )
-	upnp? ( >=net-libs/miniupnpc-2.2.7:= )
-	zeromq? ( >=net-libs/zeromq-4.3.4:= )
-"
-DEPEND="
-	${RDEPEND}
-	systemtap? ( >=dev-debug/systemtap-4.8 )
-"
-BDEPEND="
-	virtual/pkgconfig
-	daemon? (
-		acct-group/bitcoin
-		acct-user/bitcoin
-	)
-	gui? ( >=dev-qt/linguist-tools-5.15.14:5 )
-	test? ( ${PYTHON_DEPS} )
-"
-IDEPEND="
-	gui? ( dev-util/desktop-file-utils )
-"
-
-DOCS=(
-	doc/bips.md
-	doc/bitcoin-conf.md
-	doc/descriptors.md
-	doc/files.md
-	doc/i2p.md
-	doc/JSON-RPC-interface.md
-	doc/multisig-tutorial.md
-	doc/p2p-bad-ports.md
-	doc/psbt.md
-	doc/reduce-memory.md
-	doc/reduce-traffic.md
-	doc/release-notes.md
-	doc/REST-interface.md
-	doc/tor.md
-)
-
-PATCHES=(
-	"${FILESDIR}/28.0-syslibs.patch"
-	"${FILESDIR}/26.0-init.patch"
-)
-
-efmt() {
-	: ${1:?} ; local l ; while read -r l ; do "${!#}" "${l}" ; done < <(fmt "${@:1:$#-1}")
-}
-
-pkg_pretend() {
-	if ! use daemon && ! use gui && ! has_version "${CATEGORY}/${PN}[-daemon,-gui(-),-qt5(-)]" ; then
-		efmt ewarn <<-EOF
-			You are enabling neither USE="daemon" nor USE="gui". This is a valid
-			configuration, but you will be unable to run a Bitcoin node using this
-			installation.
-		EOF
-	fi
-	if use daemon && ! use cli && ! has_version "${CATEGORY}/${PN}[daemon,-bitcoin-cli(-),-cli(-)]" ; then
-		efmt ewarn <<-EOF
-			You are enabling USE="daemon" but not USE="cli". This is a valid
-			configuration, but you will be unable to interact with your bitcoind node
-			via the command line using this installation.
-		EOF
-	fi
-	if ! use berkdb && ! use sqlite &&
-		{ { use daemon && ! has_version "${CATEGORY}/${PN}[daemon,-berkdb,-sqlite]" ; } ||
-		  { use gui && ! has_version "${CATEGORY}/${PN}[gui,-berkdb,-sqlite]" ; } ; }
-	then
-		efmt ewarn <<-EOF
-			You are enabling neither USE="berkdb" nor USE="sqlite". This is a valid
-			configuration, but your Bitcoin node will be unable to open any wallets.
-		EOF
-	fi
-
-	# test/functional/feature_pruning.py requires 4 GB disk space
-	# test/functional/wallet_pruning.py requires 1.3 GB disk space
-	use test && CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	if use test ; then
-		CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_setup
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	if use system-libsecp256k1 ; then
-		rm -r src/secp256k1 || die
-		sed -e '/^DIST_SUBDIRS *=/s/\bsecp256k1\b//' -i src/Makefile.am || die
-	else
-		pushd src/secp256k1 >/dev/null || die
-		AT_NOELIBTOOLIZE=yes eautoreconf
-		popd >/dev/null || die
-	fi
-	eautoreconf
-
-	# we say --disable-util-util, so we can't test bitcoin-util
-	sed -ne '/^  {/{h;:0;n;H;/^  }/!b0;g;\|"exec": *"\./bitcoin-util"|d};p' \
-		-i test/util/data/bitcoin-util-test.json || die
-
-	sed -e 's/^\(complete -F _bitcoind\b\).*$/\1'"$(usev daemon ' bitcoind')$(usev gui ' bitcoin-qt')/" \
-		-i contrib/completions/bash/bitcoind.bash || die
-}
-
-src_configure() {
-	local wallet ; if use berkdb || use sqlite ; then wallet=enable ; else wallet=disable ; fi
-	local myeconfargs=(
-		--disable-static
-		--${wallet}-wallet
-		$(use_with sqlite)
-		$(use_with berkdb bdb)
-		$(use_enable systemtap usdt)
-		$(use_with upnp miniupnpc)
-		$(use_with nat-pmp natpmp)
-		$(use_enable test tests)
-		--disable-bench
-		--disable-fuzz{,-binary}
-		$(use_with qrcode qrencode)
-		--disable-ccache
-		$(use_enable asm)
-		$(use_enable zeromq zmq)
-		$(use_enable man)
-		$(use_enable external-signer)
-		--with-utils
-		$(use_enable {,util-}cli)
-		--enable-util-tx
-		--${wallet}-util-wallet
-		--disable-util-util
-		$(use_with daemon)
-		$(use_with gui gui qt5)
-		$(use_with dbus qtdbus)
-		$(use_with system-libsecp256k1)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use daemon && ! tc-is-cross-compiler ; then
-		TOPDIR="${S}" bash contrib/devtools/gen-bitcoin-conf.sh || die
-	fi
-	sed -e 's/ To use, copy this file$//p;Tp;:0;n;/save the file\.$/!b0;d;:p;p' \
-		-ni share/examples/bitcoin.conf || die
-}
-
-src_test() {
-	emake check
-
-	use daemon && edo "${PYTHON}" test/functional/test_runner.py \
-			--ansi $(usev test-full --extended) --jobs="$(get_makeopts_jobs)" --timeout-factor="${TIMEOUT_FACTOR:-15}"
-}
-
-src_install() {
-	dodoc -r doc/release-notes
-
-	use external-signer && DOCS+=( doc/external-signer.md )
-	use berkdb || use sqlite && DOCS+=( doc/managing-wallets.md )
-	use systemtap && DOCS+=( doc/tracing.md )
-	use zeromq && DOCS+=( doc/zmq.md )
-
-	if use daemon ; then
-		# https://bugs.gentoo.org/757102
-		DOCS+=( share/rpcauth/rpcauth.py )
-		docompress -x "/usr/share/doc/${PF}/rpcauth.py"
-	fi
-
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-	! use test || rm -f -- "${ED}"/usr/bin/test_bitcoin{,-qt} || die
-
-	newbashcomp contrib/completions/bash/bitcoin-tx.bash bitcoin-tx
-	use cli && newbashcomp contrib/completions/bash/bitcoin-cli.bash bitcoin-cli
-	if use daemon ; then
-		newbashcomp contrib/completions/bash/bitcoind.bash bitcoind
-		use gui && bashcomp_alias bitcoind bitcoin-qt
-	elif use gui ; then
-		newbashcomp contrib/completions/bash/bitcoind.bash bitcoin-qt
-	fi
-
-	if use daemon ; then
-		insinto /etc/bitcoin
-		doins share/examples/bitcoin.conf
-		fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
-		fperms 0660 /etc/bitcoin/bitcoin.conf
-
-		newconfd contrib/init/bitcoind.openrcconf bitcoind
-		newinitd "${FILESDIR}/bitcoind.openrc" bitcoind
-		systemd_newunit contrib/init/bitcoind.service bitcoind.service
-
-		keepdir /var/lib/bitcoind
-		fperms 0750 /var/lib/bitcoind
-		fowners bitcoin:bitcoin /var/lib/bitcoind
-		dosym -r {/etc/bitcoin,/var/lib/bitcoind}/bitcoin.conf
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-	fi
-
-	if use gui ; then
-		insinto /usr/share/icons/hicolor/scalable/apps
-		newins src/qt/res/src/bitcoin.svg bitcoin128.svg
-
-		domenu "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop"
-
-		if use kde ; then
-			insinto /usr/share/kservices5
-			doins "${FILESDIR}/bitcoin-qt.protocol"
-		fi
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc -r contrib/{linearize,qos}
-		use zeromq && dodoc -r contrib/zmq
-	fi
-}
-
-pkg_preinst() {
-	if use daemon && [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then
-		if [[ -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then
-			dosym -r /var/lib/bitcoin{d,/.bitcoin}
-		elif [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] ; then
-			efmt ewarn <<-EOF
-				Your bitcoind data directory is located at ${EPREFIX}/var/lib/bitcoin/.bitcoin,
-				a deprecated location. To perform an automated migration to
-				${EPREFIX}/var/lib/bitcoind, first shut down any running bitcoind instances
-				that may be using the deprecated path, and then run:
-
-				# emerge --config ${CATEGORY}/${PN}
-				EOF
-			insinto /var/lib/bitcoin
-			mv -- "${ED}/var/lib/bitcoin"{d,/.bitcoin} || die
-			dosym -r {/etc/,/var/lib/bitcoin/.}bitcoin/bitcoin.conf
-			dosym -r /var/lib/bitcoin{/.bitcoin,d}
-		fi
-	fi
-
-	if use kde && [[ -d "${EROOT}/usr/share/kde4" ]] ; then
-		dosym -r /usr/share/{kservices5,kde4/services}/bitcoin-qt.protocol
-	fi
-}
-
-pkg_postinst() {
-	# we don't use xdg.eclass because it adds unconditional IDEPENDs
-	if use gui ; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-
-	if use daemon && [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		efmt -su elog <<-EOF
-			To have ${PN} automatically use Tor when it's running, be sure your \
-			'torrc' config file has 'ControlPort' and 'CookieAuthentication' set up \
-			correctly, and:
-			- Using an init script: add the 'bitcoin' user to the 'tor' user group.
-			- Running bitcoind directly: add that user to the 'tor' user group.
-			EOF
-	fi
-
-	if use cli && use daemon ; then
-		efmt -su elog <<-EOF
-			To use bitcoin-cli with the /etc/init.d/bitcoind service:
-			 - Add your user(s) to the 'bitcoin' group.
-			 - Symlink ~/.bitcoin to /var/lib/bitcoind.
-		EOF
-	fi
-
-	if use berkdb ; then
-		# https://github.com/bitcoin/bitcoin/pull/28597
-		# https://bitcoincore.org/en/releases/26.0/#wallet
-		efmt ewarn <<-EOF
-			Creation of legacy (Berkeley DB) wallets is refused starting with Bitcoin
-			Core 26.0, pending the deprecation and eventual removal of support for
-			legacy wallets altogether in future releases. At present you can still
-			force support for the creation of legacy wallets by adding the following
-			line to your bitcoin.conf:
-
-			deprecatedrpc=create_bdb
-		EOF
-	fi
-}
-
-pkg_postrm() {
-	if use gui ; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}
-
-pkg_config() {
-	if [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" && ! -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] &&
-		[[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]]
-	then
-		in_use() {
-			: ${1:?} ; local each
-			if command -v fuser >/dev/null ; then
-				fuser "${@}" >/dev/null 2>&1
-			elif command -v lsof >/dev/null ; then
-				for each ; do
-					lsof -- "${each}" && return
-				done >/dev/null 2>&1
-			elif mountpoint -q /proc ; then
-				{ find /proc/[0-9]*/{cwd,exe,fd} -type l -exec readlink -- {} +
-					awk '{ print $6 }' /proc/[0-9]*/maps
-				} 2>/dev/null | grep -Fqx -f <(printf '%s\n' "${@}" ; readlink -m -- "${@}")
-			else
-				return 13
-			fi
-		}
-		ebegin "Checking that ${EPREFIX}/var/lib/bitcoin/.bitcoin is not in use"
-		in_use "${EROOT}/var/lib/bitcoin/.bitcoin"{,/.lock}
-		case $? in
-			0)
-				eend 1
-				efmt eerror <<-EOF
-					${EPREFIX}/var/lib/bitcoin/.bitcoin is currently in use. Please stop any
-					running bitcoind instances that may be using this data directory, and then
-					retry this migration.
-					EOF
-				die "${EPREFIX}/var/lib/bitcoin/.bitcoin is in use"
-				;;
-			13)
-				eend 1
-				if [[ "${BITCOIND_IS_NOT_RUNNING}" != 1 ]] ; then
-					efmt eerror <<-EOF
-						Found no way to check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use.
-						Do you have /proc mounted? To force the migration without checking, re-run
-						this command with BITCOIND_IS_NOT_RUNNING=1.
-						EOF
-					die "could not check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use"
-				fi
-				;;
-			*)
-				eend 0
-				;;
-		esac
-
-		# find all relative symlinks that point outside the data dir
-		local -A symlinks
-		cd -- "${EROOT}/var/lib/bitcoin/.bitcoin" || die
-		local each ; while read -r -d '' each ; do
-			local target=$(readlink -- "${each}") && [[ "${target}" == ../* ]] &&
-				target=$(readlink -e -- "${each}") && [[ "${target}" != "${EROOT}/var/lib/bitcoin/.bitcoin/"* ]] &&
-				symlinks["${each}"]="${target}"
-		done < <(find -type l -print0)
-
-		einfo "Moving your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind."
-		rm -f -- "${EROOT}/var/lib/bitcoind" || die
-		mv --no-clobber --no-copy --no-target-directory -- "${EROOT}/var/lib/bitcoin"{/.bitcoin,d} ||
-			die "Failed to move your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind."
-
-		# fix up the relative symlinks
-		cd -- "${EROOT}/var/lib/bitcoind" || die
-		for each in "${!symlinks[@]}" ; do
-			ln -fnrs -- "${symlinks[${each}]}" "${each}"  # keep going even if this fails
-		done
-
-		einfo 'Creating a transitional symlink for your convenience.'
-		ln -fnrsv -- "${EROOT}/var/lib/bitcoin"{d,/.bitcoin}
-		einfo 'You may remove this link when you no longer need it.'
-	else
-		einfo 'Nothing to do.'
-	fi
-}
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index bcb602028bf8..590761909799 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,5 +1 @@
-DIST cpuminer-opt-24.4.tar.gz 1787907 BLAKE2B 73f1da98f64ab7048f12d22f16ea2c94e2a0059a941d161d7c3e9721d13e7e018e0c98486f969270b1de580077ea8cd188f6b88e1f3a61b71c4f5626b43f7100 SHA512 e3648726ebd528d79c0d5f89fdf2affa1629fef0a28c7bccc6c3fdc76bac2c5ce8db9e36ccc0f1c6e3bf4f663cf15dd06d7130a6dbb205f3ab55ac675a6bac77
-DIST cpuminer-opt-24.5.tar.gz 1792866 BLAKE2B b9eba21088d967ecf85657f14873bb4b13214b4172071d22869d01d1b9f5acf9d7de56f20ed80ddce9c4cee1fbb59c65fab70893580e38978258b955a096eb80 SHA512 a29d9d479644511204534b680c0feaff6d232f24f70ceb77f5260f3aae35275a4823d0f75c6286013bbef5b30162e3807919e8c19a4c0ad932e1b091ce8c5428
-DIST cpuminer-opt-24.6.tar.gz 1794289 BLAKE2B 1d6fef86ec38351a88a98b5f2d574521ce9997ce9a11ffc709110ad906026f5a487dce8980550b182c066cc3c960ecf31571e884b04d523c90a91714cd71b6e7 SHA512 2c33a48827c3fe34222bc13e58f1a9582a4f77563047a48d386aa75f5364031f1bcc8561a5f7f1aed95138291417506e6f142b90bbb12fcfb3552935afb34035
-DIST cpuminer-opt-24.8.tar.gz 1796451 BLAKE2B 068eeab032c4539fa1d836f1f91467bc13f29a460263af1178fce74c150f9b4a6808368d6a30012eac8dfa83ce7f275327e7748bee175752563b738252c7bf7f SHA512 59b841e11c8ac784392b006e8edf0f3d3627abd65fc48aee73397abec4ea7f2723e7a5637735e4b5c5a87f7c0bcfd5e9c2c311021b9e756ab80acdcd73106310
-DIST cpuminer-opt-25.1.tar.gz 1782054 BLAKE2B 9f7c90096e332c8c0419e1d9851ceea06ad3537a6c69bf991236a5db0660a7f3aeaa217d9be862d4f3bf7a6807d71a530a69c740e0e7e6fbf9d699f9ccbee860 SHA512 bda22f5887fc106491181d375433f588504f498f5d5a1a7b631f66f1b95a80db4af58d1f23a3ec373ef8763752d4f1e21a2fbd9c6f57c52a0d9330bee40f67b7
+DIST cpuminer-opt-25.3.tar.gz 1779278 BLAKE2B 0c6222692c3b342b104b54c538f376789c7097f09219372437c10e5a4e0986d40c502bb3682bf10cbf693398e8be4fe9082da1ffc191064cf3cd3f7460deed72 SHA512 4768c2925e5fbcf37008fe8a7f3345a7816534132dde54e9b4fba0430aff06ca1f88c9606cf413556f71b604a15c184628f51e6b2228cc3ed861843dee993128
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-24.4.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-24.4.ebuild
deleted file mode 100644
index 2683d4bdc544..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-24.4.ebuild
+++ /dev/null
@@ -1,48 +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 systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:=
-	dev-libs/jansson:=
-	>=net-misc/curl-7.15[ssl]
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	newins config-template.json cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-24.5.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-24.5.ebuild
deleted file mode 100644
index 2683d4bdc544..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-24.5.ebuild
+++ /dev/null
@@ -1,48 +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 systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:=
-	dev-libs/jansson:=
-	>=net-misc/curl-7.15[ssl]
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	newins config-template.json cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-24.6.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-24.6.ebuild
deleted file mode 100644
index 2683d4bdc544..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-24.6.ebuild
+++ /dev/null
@@ -1,48 +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 systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:=
-	dev-libs/jansson:=
-	>=net-misc/curl-7.15[ssl]
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	newins config-template.json cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-24.8.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-24.8.ebuild
deleted file mode 100644
index 2683d4bdc544..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-24.8.ebuild
+++ /dev/null
@@ -1,48 +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 systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:=
-	dev-libs/jansson:=
-	>=net-misc/curl-7.15[ssl]
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	newins config-template.json cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-25.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-25.1.ebuild
deleted file mode 100644
index 2683d4bdc544..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-25.1.ebuild
+++ /dev/null
@@ -1,48 +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 systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:=
-	dev-libs/jansson:=
-	>=net-misc/curl-7.15[ssl]
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	newins config-template.json cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-25.3.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-25.3.ebuild
new file mode 100644
index 000000000000..289eb7265773
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-25.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:=
+	dev-libs/jansson:=
+	>=net-misc/curl-7.15[ssl]
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto --with-curl
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	newins config-template.json cpuminer-conf.json
+}
+
+src_test() {
+	./cpuminer --cputest || die
+}
diff --git a/net-p2p/deluge/deluge-2.1.1-r5.ebuild b/net-p2p/deluge/deluge-2.1.1-r5.ebuild
index c03f9d0f3185..5d9ec6ed1c78 100644
--- a/net-p2p/deluge/deluge-2.1.1-r5.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd xdg
diff --git a/net-p2p/deluge/deluge-2.1.1-r6.ebuild b/net-p2p/deluge/deluge-2.1.1-r6.ebuild
new file mode 100644
index 000000000000..9e8a39ca5453
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.1.1-r6.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2024 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_SINGLE_IMPL=1
+inherit distutils-r1 systemd xdg
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="https://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
+else
+	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console gui libnotify sound webinterface"
+REQUIRED_USE="
+	libnotify? ( gui )
+	sound? ( gui )
+"
+
+BDEPEND="
+	dev-util/intltool
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+RDEPEND="
+	acct-group/deluge
+	acct-user/deluge
+	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		gui? (
+			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( x11-libs/libnotify )
+		)
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/rencode[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		>=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}]
+		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-twisted-22.10.patch"
+	# https://dev.deluge-torrent.org/ticket/3598
+	"${FILESDIR}/${P}-ayatana.patch"
+	# https://dev.deluge-torrent.org/ticket/3582
+	"${FILESDIR}/${P}-consoleui-deferred.patch"
+	"${FILESDIR}/${P}-email-module-replace.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# Upstream CI/CD skips these and they seem to intentionally segfault to collect core dumps...
+		deluge/plugins/Stats/deluge_stats/tests/test_stats.py
+		# Skipped upstream
+		deluge/tests/test_security.py
+	)
+	local EPYTEST_DESELECT=(
+		# Skipped upstream
+		'deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py::TestWebUIPlugin::test_enable_webui'
+		'deluge/tests/test_torrent.py::TestTorrent::test_torrent_error_resume_data_unaltered'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_seo_svg_with_sni'
+		# never returns
+		'deluge/tests/test_ui_entry.py::TestConsoleScriptEntryWithDaemon'
+		# failing network(?)-related tests, even with sandbox disabled
+		'deluge/tests/test_common.py::TestCommon::test_is_interface'
+		# fails
+		'deluge/tests/test_core.py::TestCore::test_pause_torrents'
+		# fails because of network sandbox
+		'deluge/tests/test_core.py::TestCore::test_test_listen_port'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_deluge_png'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_hebrew'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_with_redirect'
+		# segfaults with FEATURES="network-sandbox"
+		'deluge/tests/test_core.py::TestCore::test_pause_torrent'
+	)
+
+	# dev-python/pytest-twisted has disabled autoloading
+	epytest -m "not (todo or gtkui)" -p pytest_twisted -v
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
+		rm "${ED}/usr/bin/deluge-console" || die
+		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gui ; then
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
+		rm -r "${ED}/usr/share/icons/" || die
+		rm "${ED}/usr/bin/deluge-gtk" || die
+		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
+	else
+		mkdir -p "${ED}/usr/share/applications/" || die
+		cp "${WORKDIR}/${P}/deluge/ui/data/share/applications/deluge.desktop" "${ED}/usr/share/applications/" || die
+		mkdir -p "${ED}/usr/share/metainfo" || die
+		cp "${WORKDIR}/${P}/deluge/ui/data/share/appdata/deluge.appdata.xml" "${ED}/usr/share/metainfo/" || die
+	fi
+
+	if use webinterface; then
+		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
+		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
+		systemd_newunit "${FILESDIR}/deluge-web.service-4" deluge-web.service
+		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
+		rm "${ED}/usr/bin/deluge-web" || die
+		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
+	fi
+
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog
+	elog "If, after upgrading, deluge doesn't work please back up and then"
+	elog "remove your '~/.config/deluge' directory and try again"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "'/etc/init.d/deluged start' as root if you use OpenRC"
+	elog "or"
+	elog "'systemctl start deluged.service' as root if you use systemd"
+	elog "You can still use deluge the old way"
+	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
+	elog "For more information see https://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}
diff --git a/net-p2p/deluge/files/deluge-2.1.1-email-module-replace.patch b/net-p2p/deluge/files/deluge-2.1.1-email-module-replace.patch
new file mode 100644
index 000000000000..eefcd2b8d52a
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-2.1.1-email-module-replace.patch
@@ -0,0 +1,95 @@
+From https://github.com/deluge-torrent/deluge/commit/5d96cfc72f0bfa36d90afd2725aa2216b8073d66
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Thu, 29 Aug 2024 15:31:25 +0900
+Subject: [PATCH] [UI] Replace deprecated cgi module with email
+
+As PEP 594 says, cgi module is marked as deprecated
+in python 3.11, and will be removed in 3.13
+(actually removed at least in 3.13 rc1).
+
+As suggested on PEP 594, replace cgi.parse_header
+with email.message.EmailMessage introduced in python 3.6.
+
+Updated test modify test_download_with_rename_sanitised
+- With RFC2045 specification, Content-Disposition filenames
+parameter containing slash (directory separator) must be
+quoted, so changing as such.
+
+Ref: https://peps.python.org/pep-0594/#deprecated-modules
+Ref: https://peps.python.org/pep-0594/#cgi
+
+Closes: https://github.com/deluge-torrent/deluge/pull/462
+--- a/deluge/httpdownloader.py
++++ b/deluge/httpdownloader.py
+@@ -6,7 +6,7 @@
+ # See LICENSE for more details.
+ #
+ 
+-import cgi
++import email.message
+ import logging
+ import os.path
+ import zlib
+@@ -133,9 +133,10 @@ def request_callback(self, response):
+                 content_disp = headers.getRawHeaders(b'content-disposition')[0].decode(
+                     'utf-8'
+                 )
+-                content_disp_params = cgi.parse_header(content_disp)[1]
+-                if 'filename' in content_disp_params:
+-                    new_file_name = content_disp_params['filename']
++                message = email.message.EmailMessage()
++                message['content-disposition'] = content_disp
++                new_file_name = message.get_filename()
++                if new_file_name:
+                     new_file_name = sanitise_filename(new_file_name)
+                     new_file_name = os.path.join(
+                         os.path.split(self.filename)[0], new_file_name
+@@ -152,7 +153,10 @@ def request_callback(self, response):
+                     self.filename = new_file_name
+ 
+             cont_type_header = headers.getRawHeaders(b'content-type')[0].decode()
+-            cont_type, params = cgi.parse_header(cont_type_header)
++            message = email.message.EmailMessage()
++            message['content-type'] = cont_type_header
++            cont_type = message.get_content_type()
++            params = message['content-type'].params
+             # Only re-ecode text content types.
+             encoding = None
+             if cont_type.startswith('text/'):
+--- a/deluge/tests/test_httpdownloader.py
++++ b/deluge/tests/test_httpdownloader.py
+@@ -206,10 +206,10 @@ async def test_download_with_rename_exists(self):
+         self.assert_contains(filename, 'This file should be called renamed')
+ 
+     async def test_download_with_rename_sanitised(self):
+-        url = self.get_url('rename?filename=/etc/passwd')
++        url = self.get_url('rename?filename="/etc/passwd"')
+         filename = await download_file(url, fname('original'))
+         assert filename == fname('passwd')
+-        self.assert_contains(filename, 'This file should be called /etc/passwd')
++        self.assert_contains(filename, 'This file should be called "/etc/passwd"')
+ 
+     async def test_download_with_attachment_no_filename(self):
+         url = self.get_url('attachment')
+--- a/deluge/ui/web/json_api.py
++++ b/deluge/ui/web/json_api.py
+@@ -6,7 +6,7 @@
+ # See LICENSE for more details.
+ #
+ 
+-import cgi
++import email.message
+ import json
+ import logging
+ import os
+@@ -191,7 +191,9 @@ def _on_json_request(self, request):
+         Handler to take the json data as a string and pass it on to the
+         _handle_request method for further processing.
+         """
+-        content_type, _ = cgi.parse_header(request.getHeader(b'content-type').decode())
++        message = email.message.EmailMessage()
++        message['content-type'] = request.getHeader(b'content-type').decode()
++        content_type = message.get_content_type()
+         if content_type != 'application/json':
+             message = 'Invalid JSON request content-type: %s' % content_type
+             raise JSONException(message)
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 1e47162dde9c..6abee10c5f99 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,3 +1,5 @@
 DIST freenet-build01498-source.tar.bz2 6349168 BLAKE2B e42b3b7a89a5b4051ac38512d6beb06ce21d661e9cdb7ae1e2e0f800cea4cac0885281efb589e29800e4fd15578b223dd42c2bfbfe3b0deabd774073eef0a4e8 SHA512 6202e6f066c85ae704cb1f5db8b971cfec39dc902b166d5204be87848f9ff338bf964cd694702c6a3bfd08c23533a3658914998cf384ddec367b77c09c6eb808
 DIST freenet-build01498-source.tar.bz2.sig 566 BLAKE2B 5c7fef3e5272be6ba4d75d5ca62cebe6bf2ebbc3086ad840e26c52b908bc9b7a2d0e3a77e20fbc3774d7a73bc63c710e3e44e681cf675931aa1bd1373c198c7c SHA512 008a13bde022d4db0b8daf2318c91255fc46bb374c884767b29370e4f0e595c7a9ca787a81197bcb2191c9b4f217f8f7ab7a1a9f5f91d51ac06a2a6505aa367e
+DIST freenet-build01500-source.tar.bz2 6314667 BLAKE2B dc4a7333f030f6d53a5d734bd2b8dfd6712d555addadb2201a899118ad69414779db7d499884daf69ce687e57d510ebef76fdc6d9cb2cb3ae5fd649e5529ac10 SHA512 a7e67f91805b04d9e7cf56af12afd07d8cccedbed3a9977e4d5af938711ab4d9aee7ed85acad8f3e03c8ce4f35e4324fd6a607fc00f135ac1bfecd6ed3cbcb04
+DIST freenet-build01500-source.tar.bz2.sig 566 BLAKE2B 69f05acb65b093c5d62160ef5933446a0383c2aaf9d42fa216df21106ac86b6e49d56c1223746c7d602717cdd2340bbf3834fdde9026b4765d4454decf7f5a31 SHA512 2028ba06cbf6cbf123b011365f32ef4fdeb1f61cf8bbfc0e92e7666a8a2f3eacadd5deff9d12e1952146cd3830f95bf5515ea71e20a2321a7e204286c77423bf
 DIST seednodes-0.7.5_p1480.tar.gz 12364 BLAKE2B edb4e2a5c7424b51f0afb8234c7e486d56fe92e9201ab7ed7658366f070225f8def1b5412a31367e434ab4afae393caa16e7bdd7307f1d870607105fd5076638 SHA512 a2662a29f5721cd1523eb68b8787b074baec990327207b9ff444c91e644738a610e5216064aef00c62d6aca8ba66b2035a3175f63d45c1e0e8efc816b2a38660
diff --git a/net-p2p/freenet/freenet-0.7.5_p1500.ebuild b/net-p2p/freenet/freenet-0.7.5_p1500.ebuild
new file mode 100644
index 000000000000..29085cb5336b
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1500.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple systemd verify-sig
+
+DESCRIPTION="An encrypted network without censorship"
+HOMEPAGE="https://www.hyphanet.org"
+PEV="3.1.6"
+SRC_URI="https://github.com/hyphanet/fred/releases/download/build0${PV#*p}/freenet-build0${PV#*p}-source.tar.bz2
+	https://github.com/hyphanet/seedrefs/archive/build01480.tar.gz -> seednodes-0.7.5_p1480.tar.gz
+	verify-sig? (
+		https://github.com/hyphanet/fred/releases/download/build0${PV#*p}/freenet-build0${PV#*p}-source.tar.bz2.sig
+	)"
+S="${WORKDIR}/freenet-build0${PV#*p}"
+
+LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+nss"
+
+CP_DEPEND="
+	dev-java/bcprov:0
+	dev-java/commons-compress:0
+	dev-java/commons-io:1
+	dev-java/fec:0
+	dev-java/freenet-ext:29
+	dev-java/java-service-wrapper:0
+	dev-java/jbitcollider-core:0
+	dev-java/jna:4
+	dev-java/lzma:0
+	dev-java/lzmajio:0
+	dev-java/mersennetwister:0
+	dev-java/pebble:0
+"
+
+DEPEND="
+	dev-java/unbescape:0
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		dev-java/hamcrest:0
+		dev-java/mockito:0
+		dev-java/objenesis:0
+		net-libs/NativeThread:0
+	)
+"
+RDEPEND="
+	acct-user/freenet
+	acct-group/freenet
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+	nss? ( dev-libs/nss )
+"
+BDEPEND="
+	app-arch/unzip
+	verify-sig? ( sec-keys/openpgp-keys-freenet )
+"
+PDEPEND="net-libs/NativeThread:0"
+
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	NEWS.md
+	README.md
+	SECURITY.md
+)
+
+PATCHES=(
+	"${FILESDIR}/freenet-0.7.5_p1498-ignore-failing-tests.patch"
+)
+
+JAVA_CLASSPATH_EXTRA="
+	java-service-wrapper
+	unbescape
+"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="src"
+JAVA_TEST_GENTOO_CLASSPATH="
+	hamcrest
+	junit-4
+	mockito
+	objenesis
+"
+# Yes, both variables point to the same directory
+# https://github.com/hyphanet/fred/blob/build01497/build.gradle#L169-L173
+JAVA_TEST_RESOURCE_DIRS="test"
+JAVA_TEST_SRC_DIR="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/freenetproject.org.asc"
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached \
+			"${DISTDIR}"/freenet-build0${PV#*p}-source.tar.bz2 \
+			"${DISTDIR}"/freenet-build0${PV#*p}-source.tar.bz2.sig
+	fi
+	unpack freenet-build0${PV#*p}-source.tar.bz2
+	unpack seednodes-0.7.5_p1480.tar.gz
+}
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+
+	# Could not get resource : freenet/l10n/freenet.l10n.pt-PT.properties
+	# https://github.com/hyphanet/fred/pull/500
+	mv src/freenet/l10n/freenet.l10n.pt{_,-}PT.properties || die
+
+	# java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
+	mkdir res || die
+	pushd src  > /dev/null || die
+		find -type f \
+			! -name '*.java' \
+			! -name 'package.html' \
+			! -path '*/simulator/readme.txt' \
+			| xargs cp --parent -t ../res || die
+	popd > /dev/null || die
+
+	mkdir "${JAVA_RESOURCE_DIRS}/META-INF" || die
+	cat > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" <<- EOF || die
+		Add-opens: java.base/java.lang java.base/java.util java.base/java.io
+	EOF
+
+	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
+	cp "${FILESDIR}"/freenet-0.7.5_p1497-wrapper.conf freenet-wrapper.conf || die
+	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
+
+	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
+		freenet-wrapper.conf || die "sed failed"
+
+	echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf || die
+	if use nss; then
+		echo "wrapper.java.additional.11=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# Moved here because of using JAVA_GENTOO_CLASSPATH which is populated by java-pkg_gen-cp.
+	local i=2 pkg jars jar
+	local ifs_original=${IFS}
+	IFS=","
+	for pkg in ${JAVA_GENTOO_CLASSPATH} ; do
+		jars="$(java-pkg_getjars ${pkg})"
+		for jar in ${jars} ; do
+			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf || die
+		done
+	done
+	IFS=${ifs_original}
+	echo "wrapper.java.library.path.2=/usr/$(get_libdir)/java-service-wrapper" >> freenet-wrapper.conf || die
+	echo "wrapper.java.library.path.3=/usr/$(get_libdir)/jna-4" >> freenet-wrapper.conf || die
+}
+
+src_test() {
+	JAVA_TEST_EXTRA_ARGS=(
+		-Djava.library.path="${EPREFIX}/usr/$(get_libdir)/jna-4/"
+		-Djna.nosys=false
+		-Dnetworkaddress.cache.negative.ttl=0
+		-Dnetworkaddress.cache.ttl=0
+		# https://github.com/hyphanet/fred/blob/build01497/build.gradle#L194-L196
+		# "test.l10npath_main" reads from the JAR file.
+		-Dtest.l10npath_test="freenet/l10n/"
+		-Dtest.l10npath_main="freenet/l10n/"
+	)
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17; then
+		JAVA_TEST_EXTRA_ARGS+=(
+			--add-opens=java.base/java.io=ALL-UNNAMED
+			--add-opens=java.base/java.lang=ALL-UNNAMED
+			--add-opens=java.base/java.util=ALL-UNNAMED
+		)
+	fi
+
+	pushd test > /dev/null || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-type f  -name "*Test.java" \
+			)
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd > /dev/null || die
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	doinitd "${FILESDIR}"/freenet
+
+	systemd_dounit "${FILESDIR}"/freenet.service
+
+	insinto /etc
+	doins freenet-wrapper.conf
+	insinto /var/freenet
+	doins run.sh seednodes.fref
+	fperms +x /var/freenet/run.sh
+}
+
+pkg_postinst() {
+	elog " "
+	elog "1. Start freenet with rc-service freenet start."
+	elog "2. Open localhost:8888 in your browser for the web interface."
+	#workaround for previously existing freenet user
+	[[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \
+		freenet:freenet /var/freenet
+}
+
+pkg_postrm() {
+	if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then
+		elog " "
+		elog "If you dont want to use freenet any more"
+		elog "and dont want to keep your identity/other stuff"
+		elog "remember to do 'rm -rf /var/freenet' to remove everything"
+	fi
+}
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index a670fd0bd3ca..32c284436fc3 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,2 +1,2 @@
 DIST ktorrent-24.08.3.tar.xz 2187640 BLAKE2B 7f3def9ddb84f077584a66658f32a2935da649b6e2afa0159826825de7ffd55459b41862156e4d92b404706547d9c649fd44c196db20aa2d1ffa24840cecfd67 SHA512 28c1a2fcbafb89fd7d2b1cabad3c3355277e66fc17fde9f12a7a30240ddc09633a21a228f4bc0c7445be6c6f4943808b6971cbb7f80e84a18e5accd8bb5d1724
-DIST ktorrent-24.12.0.tar.xz 2189328 BLAKE2B e1fa0792c38f48f6c4124ee5bc74bfc498be3bc8ac13874a811ab57d867299c222250901e1100163728b44a5fa65ca974d2a3970c9969ce9290d54fef9f556c4 SHA512 a4d83f0ddbe54fc27bb9631ee1063aff64f9c2de1c717f87c2dae3691e4cf5da4702da6767852e5bad7ad41fbf3e4fe6547699ff9e9717b247c46d006f1d2037
+DIST ktorrent-24.12.1.tar.xz 2197140 BLAKE2B 3af10ba970396ac87e2d09df738363f39ccc96ba2dd319fe47175c7d7d0a1ad3279d4e7b982d2b0503ccae0474c2acad56c014ce8e4b3a52f0d853965e144ede SHA512 1ec845f81d5d301df7377a16ce717043be858f1f6d149bf8394d6c9b0474aa132795c81c7f0cb4b852e722f55aca20291a76ffa30ce14d0f36f4233acbfb9550
diff --git a/net-p2p/ktorrent/ktorrent-24.12.0.ebuild b/net-p2p/ktorrent/ktorrent-24.12.0.ebuild
deleted file mode 100644
index b02da35cc7ba..000000000000
--- a/net-p2p/ktorrent/ktorrent-24.12.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=6.5.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/ktorrent/"
-
-LICENSE="GPL-2"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +logviewer +magnetgenerator
-+mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf"
-
-COMMON_DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/kglobalaccel-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-	>=net-libs/libktorrent-${PVCUT}:6
-	infowidget? ( dev-libs/geoip )
-	ipfilter? ( >=kde-frameworks/karchive-${KFMIN}:6 )
-	mediaplayer? (
-		>=media-libs/phonon-4.12.0[qt6(+)]
-		>=media-libs/taglib-1.5:=
-	)
-	rss? (
-		>=dev-qt/qtwebengine-${QTMIN}:6
-		>=kde-frameworks/syndication-${KFMIN}:6
-	)
-	stats? ( >=kde-frameworks/kplotting-${KFMIN}:6 )
-	upnp? ( >=kde-frameworks/kcompletion-${KFMIN}:6 )
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6 )
-	zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:6 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.71
-"
-RDEPEND="${COMMON_DEPEND}
-	ipfilter? (
-		app-arch/bzip2
-		app-arch/unzip
-		kde-apps/kio-extras:6
-		>=kde-frameworks/ktextwidgets-${KFMIN}:6
-	)
-"
-BDEPEND="sys-devel/gettext"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler)
-		-DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder)
-		-DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget)
-		-DENABLE_IPFILTER_PLUGIN=$(usex ipfilter)
-		-DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer)
-		-DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator)
-		-DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer)
-		$(cmake_use_find_package rss KF6Syndication)
-		-DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
-		-DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown)
-		-DENABLE_STATS_PLUGIN=$(usex stats)
-		-DENABLE_UPNP_PLUGIN=$(usex upnp)
-		-DENABLE_SEARCH_PLUGIN=$(usex webengine)
-		-DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf)
-	)
-# add back when ported
-# 		-DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface)
-	ecm_src_configure
-}
diff --git a/net-p2p/ktorrent/ktorrent-24.12.1.ebuild b/net-p2p/ktorrent/ktorrent-24.12.1.ebuild
new file mode 100644
index 000000000000..424bc97dd11a
--- /dev/null
+++ b/net-p2p/ktorrent/ktorrent-24.12.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.7.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/ktorrent/"
+
+LICENSE="GPL-2"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +logviewer +magnetgenerator
++mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf"
+
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=net-libs/libktorrent-${PVCUT}:6
+	infowidget? ( dev-libs/geoip )
+	ipfilter? ( >=kde-frameworks/karchive-${KFMIN}:6 )
+	mediaplayer? (
+		>=media-libs/phonon-4.12.0[qt6(+)]
+		>=media-libs/taglib-1.5:=
+	)
+	rss? (
+		>=dev-qt/qtwebengine-${QTMIN}:6
+		>=kde-frameworks/syndication-${KFMIN}:6
+	)
+	stats? ( >=kde-frameworks/kplotting-${KFMIN}:6 )
+	upnp? ( >=kde-frameworks/kcompletion-${KFMIN}:6 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6 )
+	zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.71
+"
+RDEPEND="${COMMON_DEPEND}
+	ipfilter? (
+		app-arch/bzip2
+		app-arch/unzip
+		kde-apps/kio-extras:6
+		>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	)
+"
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler)
+		-DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder)
+		-DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget)
+		-DENABLE_IPFILTER_PLUGIN=$(usex ipfilter)
+		-DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer)
+		-DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator)
+		-DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer)
+		$(cmake_use_find_package rss KF6Syndication)
+		-DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
+		-DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown)
+		-DENABLE_STATS_PLUGIN=$(usex stats)
+		-DENABLE_UPNP_PLUGIN=$(usex upnp)
+		-DENABLE_SEARCH_PLUGIN=$(usex webengine)
+		-DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf)
+	)
+# add back when ported
+# 		-DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface)
+	ecm_src_configure
+}
diff --git a/net-p2p/mktorrent/Manifest b/net-p2p/mktorrent/Manifest
index f8ab0acc15a9..0237d50def74 100644
--- a/net-p2p/mktorrent/Manifest
+++ b/net-p2p/mktorrent/Manifest
@@ -1,2 +1 @@
-DIST mktorrent-4c221a05d949a3767a2671de139c6014909daf6b.tar.gz 24574 BLAKE2B e7dcc17aca52c8d1f9d816ce3e89bea5c2b1d7759dba6a00578960b253652506b7e61855d769440056aaa6b0719e6856108ca5b80977152746a648862c71e97b SHA512 49ba2697373a1b40829d50d66faaaeb57fa3893e97283ec2844b447b8e4cf2713d7c0e76e49d3893475f5ce298c3215249751defe0f952d2c52df1bf68f7706c
 DIST mktorrent-de7d011b35458de1472665f50b96c9cf6c303f39.tar.gz 27939 BLAKE2B 3fbf2c98829be21394b6517f2548925fdc83c9199a209aed39a6ba5f31174e34a3290b8c01eaf55e13acd2f15100cf9ecb20073d5fa9d4d1e3b2fb7641f3418d SHA512 4194d73958ba0d43e88a167c46a24e2a92e94b43682f96079a7317fb77f9e48477eddc1556a9785e5c7e5e1745efa7679d1b6b2b41c0ba2aa6df9dae4d3eb489
diff --git a/net-p2p/mktorrent/metadata.xml b/net-p2p/mktorrent/metadata.xml
index de14c77ecf47..7537a309db7b 100644
--- a/net-p2p/mktorrent/metadata.xml
+++ b/net-p2p/mktorrent/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="github">Rudde/mktorrent</remote-id>
+		<remote-id type="github">pobrn/mktorrent</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-p2p/mktorrent/mktorrent-1.1_p20180912.ebuild b/net-p2p/mktorrent/mktorrent-1.1_p20180912.ebuild
deleted file mode 100644
index 4dcfd16cd968..000000000000
--- a/net-p2p/mktorrent/mktorrent-1.1_p20180912.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Simple command line utility to create BitTorrent metainfo files"
-HOMEPAGE="https://github.com/Rudde/mktorrent"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Rudde/mktorrent.git"
-else
-	COMMIT_ID="4c221a05d949a3767a2671de139c6014909daf6b"
-	SRC_URI="https://github.com/Rudde/${PN}/archive/${COMMIT_ID}.tar.gz -> ${PN}-${COMMIT_ID}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
-	S="${WORKDIR}/${PN}-${COMMIT_ID}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="threads +ssl debug"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-"
-
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	tc-export CC
-
-	local myemakeargs=(
-		USE_LONG_OPTIONS=1
-		USE_LARGE_FILES=1
-		DEBUG=$(usex debug)
-		USE_OPENSSL=$(usex ssl)
-		USE_PTHREADS=$(usex threads)
-		)
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README
-}
diff --git a/net-p2p/mktorrent/mktorrent-1.1_p20210130-r1.ebuild b/net-p2p/mktorrent/mktorrent-1.1_p20210130-r1.ebuild
new file mode 100644
index 000000000000..892c1fb58c80
--- /dev/null
+++ b/net-p2p/mktorrent/mktorrent-1.1_p20210130-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simple command line utility to create BitTorrent metainfo files"
+HOMEPAGE="https://github.com/pobrn/mktorrent"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pobrn/mktorrent"
+else
+	COMMIT_ID="de7d011b35458de1472665f50b96c9cf6c303f39"
+	SRC_URI="
+		https://github.com/pobrn/${PN}/archive/${COMMIT_ID}.tar.gz
+			-> ${PN}-${COMMIT_ID}.tar.gz
+	"
+	S="${WORKDIR}/${PN}-${COMMIT_ID}"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="threads +ssl debug"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:0= )
+"
+
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	tc-export CC
+
+	local myemakeargs=(
+		USE_LARGE_FILES=1
+		DEBUG=$(usex debug)
+		USE_OPENSSL=$(usex ssl)
+		USE_PTHREADS=$(usex threads)
+	)
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README
+}
diff --git a/net-p2p/mktorrent/mktorrent-1.1_p20210130.ebuild b/net-p2p/mktorrent/mktorrent-1.1_p20210130.ebuild
index f1f41c1e84bf..f9d2eb03cd64 100644
--- a/net-p2p/mktorrent/mktorrent-1.1_p20210130.ebuild
+++ b/net-p2p/mktorrent/mktorrent-1.1_p20210130.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,9 +16,9 @@ else
 	S="${WORKDIR}/${PN}-${COMMIT_ID}"
 fi
 
-KEYWORDS="amd64 ~arm x86"
 LICENSE="GPL-2+"
 SLOT="0"
+KEYWORDS="amd64 ~arm x86"
 IUSE="threads +ssl debug"
 
 RDEPEND="
diff --git a/net-p2p/nicotine+/nicotine+-3.3.7.ebuild b/net-p2p/nicotine+/nicotine+-3.3.7.ebuild
index 7b20b7a58423..f19f670f245d 100644
--- a/net-p2p/nicotine+/nicotine+-3.3.7.ebuild
+++ b/net-p2p/nicotine+/nicotine+-3.3.7.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}/nicotine-plus-${PV}"
 
 LICENSE="GPL-3+ MIT CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index 0bd802946455..a4c4c5302646 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -1,3 +1,2 @@
-DIST epson-inkjet-printer-escpr-1.8.5-1.tar.gz 5666905 BLAKE2B 549c948709993779b5615b501038fdceb6c3d6f173709b8cf99459346fff89923bdbe1babe34ee98eed4e1ebbd7a4b5962ddbc9cec9711aa15ff2056fec3d436 SHA512 4117b1efe903e4f506bbc67c45079f1d467ff6527691308734e55d32feeda3ec44b2dd85361e0243114f924eef04a91b0a5e86b5008f0a32ef323989b3d2896f
 DIST epson-inkjet-printer-escpr-1.8.6-1.tar.gz 5715741 BLAKE2B 0da5e0af022bf2ce42ef94631c984b8308562bcb8f1f47a8f50b77be09326a80e9495ddaf02becdf72e78e50041f73cdd558c96d72046600452de50bc68f1bc8 SHA512 d0040c99793ba33e54ec5f0137f3b672628f089a6cd792916c24fc5edab75702561dade91eb63cd4b3b8e898f7b4647c899ca425e1449a401c7ff562f8cc0f1e
 DIST epson-inkjet-printer-escpr2-1.2.15-1.tar.gz 5560479 BLAKE2B 8180fe06df8175ec31044b0eec2a125b9567c11a827343401a07e59e8bd93e689617b9b29364374f1d6ba6d6bca320d6615f601791c59e966d3a4d63f7adbeb0 SHA512 62cd5161f65f8ca6f8c1a8bb755e06eb147d4a06b5f796a8068ed9235b3abf38e6ccb10e82bdd93fddc085b90a7f9332e024ba09679aa08490a05735c0372653
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.5.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.5.ebuild
deleted file mode 100644
index ca70ea12d8a6..000000000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
-HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-
-# https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr.php
-# Use the "source package for arm CPU" to get a tarball instead of an srpm.
-SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/15/68/89/fbff579f15226ffcc4a16895bd6bce6842277802/${P}-1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64"
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/1.6.5-warnings.patch"
-	"${FILESDIR}/${PN}-1.7.7-fnocommon.patch"
-	"${FILESDIR}/${PN}-1.8-missing-include.patch"
-)
-
-src_configure() {
-	econf --disable-shared
-
-	# Makefile calls ls to generate a file list which is included in Makefile.am
-	# Set the collation to C to avoid automake being called automatically
-	unset LC_ALL
-	export LC_COLLATE=C
-}
-
-src_install() {
-	emake -C ppd DESTDIR="${D}" install
-	emake -C src DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/net-print/epson-inkjet-printer-escpr/files/1.6.5-warnings.patch b/net-print/epson-inkjet-printer-escpr/files/1.6.5-warnings.patch
deleted file mode 100644
index afd88b99eedf..000000000000
--- a/net-print/epson-inkjet-printer-escpr/files/1.6.5-warnings.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/lib/epson-escpr-api.h
-+++ b/lib/epson-escpr-api.h
-@@ -111,6 +111,9 @@
-     /*** -------------------------------------------------------------------------------*/

- extern EPS_ERR_CODE epsMakeMainteCmd     (EPS_INT32, EPS_UINT8*, EPS_UINT32*            );

- 

-+extern EPS_ERR_CODE SetupJobAttrib          (const EPS_JOB_ATTRIB*                      );

-+extern EPS_ERR_CODE SendStartJob            (EPS_BOOL                                   );

-+extern EPS_ERR_CODE PrintBand               (const EPS_UINT8*, EPS_UINT32, EPS_UINT32*  );

- #ifdef __cplusplus

- }

- #endif

---- a/src/filter.c
-+++ b/src/filter.c
-@@ -33,7 +33,9 @@
- 
- #include "epson-protocol.h"
- #include "epson-escpr-api.h"
-+#include "epson-escpr-services.h"
- #include "epson-escpr-mem.h"
-+#include "epson-escpage.h"
- 
- #include "err.h"
- #include "mem.h"
-@@ -42,6 +44,7 @@
- #include "libprtX.h"
- #include "optBase.h"
- #include "linux_cmn.h"
-+#include "xfifo.h"
- 
- #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
- 
---- a/src/mem.c
-+++ b/src/mem.c
-@@ -23,6 +23,7 @@
- #endif
- 
- #include <stdlib.h>
-+#include "err.h"
- #include "mem.h"
- 
- void *
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 12c5a3db13b8..f2cdb915660e 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,3 +1,2 @@
-DIST hplip-3.24.4-patches-1.tar.xz 22068 BLAKE2B 9b388033b17315c407014b0b344e2994c456c84dd856f3f522e202b431a03fb315060d74ead98696af62934fa5e5d44185cae20cd3171252f33049a9832b15f5 SHA512 292c5717627ecbb5f50b2ecad82fdf43bb80c3128f1e4c3cc806167dd34ac9c7c5c2a988103ec18fc82483ba95221261c7935271a0b213523f00a4e9de23731c
 DIST hplip-3.24.4-patches-2.tar.xz 22240 BLAKE2B 6fe2a7378e54e01964168ebfdb175efc99cb778bb98e3a488da16da89759efec875d8caf54e3efacb365bff008065c425d6b617cca5e9c0abfb8099867a3aad4 SHA512 7acf3b1a885ebfff3e97ed8d74387e6c5636e7f3595b8a379342cff844c0b780ff88d3ca035fec80d761d926b9a3a608a1ba3352f9059ad62a3409967462c6ae
 DIST hplip-3.24.4.tar.gz 30217933 BLAKE2B 0b5c93465f6d9e30916bf57fd7f2d490d2f04ef80ed1654a7d2c6adc57a5293e358720a71bbb76757a1496d9f7ca05f077f6e9ea62cfa243319fe9d551440710 SHA512 6162ec58289433659ed4c3a254b2a50863c01acb87a8c0e1a1f935fed2b1916c5ae211c2d84130f40963368ff53e0c8da1878a1fce4dd08bd517f65bbcf6a2d2
diff --git a/net-print/hplip/hplip-3.24.4.ebuild b/net-print/hplip/hplip-3.24.4.ebuild
deleted file mode 100644
index 61c2933b087d..000000000000
--- a/net-print/hplip/hplip-3.24.4.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10,11,12} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-inherit autotools flag-o-matic linux-info python-single-r1 readme.gentoo-r1 udev
-
-DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
-HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
-SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~billie/distfiles/${PN}-3.24.4-patches-1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-
-IUSE="doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
-
-COMMON_DEPEND="
-	net-print/cups
-	media-libs/libjpeg-turbo:0
-	hpijs? ( net-print/cups-filters[foomatic] )
-	!libusb0? ( virtual/libusb:1 )
-	libusb0? ( virtual/libusb:0 )
-	${PYTHON_DEPS}
-	!minimal? (
-		sys-apps/dbus
-		scanner? (
-			media-gfx/sane-backends
-		)
-		snmp? (
-			dev-libs/openssl:0=
-			net-analyzer/net-snmp:=[${PYTHON_SINGLE_USEDEP}]
-			net-dns/avahi[dbus,python,${PYTHON_SINGLE_USEDEP}]
-		)
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	${COMMON_DEPEND}
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-	!minimal? (
-		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
-		kernel_linux? ( virtual/udev )
-		$(python_gen_cond_dep '
-			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
-			dev-python/distro[${PYTHON_USEDEP}]
-			fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
-			qt5? (
-				>=dev-python/pyqt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
-				libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
-			)
-			scanner? (
-				>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
-				>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
-				X? (
-					|| (
-						kde? ( kde-misc/skanlite )
-						media-gfx/xsane
-						media-gfx/sane-frontends
-					)
-				)
-			)
-		')
-	)
-	policykit? ( sys-auth/polkit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${WORKDIR}/patches"
-)
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
-
-#DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-For more information on setting up your printer please take
-a look at the hplip section of the gentoo printing guide:
-https://wiki.gentoo.org/wiki/Printing
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
-
-	use parport && linux-info_pkg_setup
-
-	if use minimal ; then
-		ewarn "Installing driver portions only, make sure you know what you are doing."
-		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-		ewarn "This also disables fax, network, scanner and gui support!"
-	fi
-
-	if ! use hpcups && ! use hpijs ; then
-		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
-		ewarn "which is probably not what you want."
-		ewarn "You will almost certainly not be able to print."
-	fi
-}
-
-src_prepare() {
-	default
-
-	python_fix_shebang .
-
-	# Make desktop files follow the specification
-	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Encoding=.*/d' hplip.desktop.in || die
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Version=.*/d' \
-		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
-
-	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
-	# https://bugs.launchpad.net/hplip/+bug/500086
-	local udevdir=$(get_udevdir)
-	sed -i -e "s|/etc/udev|${udevdir}|g" \
-		$(find . -type f -exec grep -l /etc/udev {} +) || die
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/861851
-	# https://bugs.launchpad.net/hplip/+bug/2055371
-	filter-lto
-
-	local drv_build minimal_build
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install"
-		drv_build="${drv_build} --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-		minimal_build="${minimal_build} --disable-dbus-build"
-		minimal_build="${minimal_build} --disable-fax-build"
-		minimal_build="${minimal_build} --disable-network-build"
-		minimal_build="${minimal_build} --disable-scan-build"
-		minimal_build="${minimal_build} --disable-gui-build"
-	else
-		minimal_build="${minimal_build} --enable-dbus-build"
-		if use fax ; then
-			minimal_build="${minimal_build} --enable-fax-build"
-		else
-			minimal_build="${minimal_build} --disable-fax-build"
-		fi
-		if use snmp ; then
-			minimal_build="${minimal_build} --enable-network-build"
-		else
-			minimal_build="${minimal_build} --disable-network-build"
-		fi
-		if use scanner ; then
-			minimal_build="${minimal_build} --enable-scan-build"
-		else
-			minimal_build="${minimal_build} --disable-scan-build"
-		fi
-		if use qt5 ; then
-			minimal_build="${minimal_build} --enable-qt5"
-			minimal_build="${minimal_build} --enable-gui-build"
-		else
-			minimal_build="${minimal_build} --disable-gui-build"
-			minimal_build="${minimal_build} --disable-qt5"
-		fi
-	fi
-
-	# disable class driver for now
-	econf \
-		--disable-class-driver \
-		--disable-cups11-build \
-		--disable-foomatic-rip-hplip-install \
-		--disable-imageProcessor-build \
-		--disable-lite-build \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-qt4 \
-		--disable-udev_sysfs_rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		--enable-hpps-install \
-		${drv_build} \
-		${minimal_build} \
-		$(use_enable doc doc-build) \
-		$(use_enable libusb0 libusb01_build) \
-		$(use_enable parport pp-build) \
-		$(use_enable policykit)
-
-	# hpijs ppds are created at configure time but are not installed (3.17.11)
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	#local i
-	#for i in ppd/hpijs/*.ppd.gz ; do
-	#	rm -f ${i}.temp || die
-	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-	#		gzip > ${i}.temp || die
-	#	mv ${i}.temp ${i} || die
-	#done
-}
-
-src_install() {
-	# Disable parallel install
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-	# default
-
-	# Installed by sane-backends
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
-	rm -f "${ED}"/etc/sane.d/dll.conf || die
-
-	# Remove desktop and autostart files
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
-	use qt5 || {
-		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
-	}
-
-	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	rm -rf "${ED}"/usr/share/hal || die
-
-	find "${D}" -name '*.la' -delete || die
-
-	python_optimize "${ED}"/usr/share/hplip
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	udev_reload
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-print/libcupsfilters/libcupsfilters-2.1.0.ebuild b/net-print/libcupsfilters/libcupsfilters-2.1.0.ebuild
index 3d1bc26157a0..253c42c7e387 100644
--- a/net-print/libcupsfilters/libcupsfilters-2.1.0.ebuild
+++ b/net-print/libcupsfilters/libcupsfilters-2.1.0.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
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P/_beta/b}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="dbus exif jpeg pdf +poppler +postscript png test tiff"
 RESTRICT="!test? ( test )"
 
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 1f328d6ed8dd..28a6cb907eb7 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -3,15 +3,11 @@ DIST haproxy-2.6.16.tar.gz 4084854 BLAKE2B 15a33d6d88de9181d4b1b05d59d32f1c76496
 DIST haproxy-2.6.19.tar.gz 4110701 BLAKE2B fe003ac433a7756e57751db8f5430fb5f16e20d328bd28c0c5595304570a1450cecc19ca600fae515b21af00bfd6699ba08bd8ccfe43a09b6719e0f90b985a02 SHA512 cdcf6c2108d844c08b586e0e4ee4bd64dde3ef0da7487d65ea68f6fb52d9a1c2c34f4438ffacebea1d0f2400aac9f9f1b9000714a08cbac192a9f302dcc6c345
 DIST haproxy-2.6.20.tar.gz 4111858 BLAKE2B cddd6a14f82b4957a6b4c9e61b580772a17aa1698042578628267d5339d43a3805ada1721855de44b4202838734d479f434d857bf0ad3598776bdab5eb2b5f8a SHA512 f52f5b7223d825455dd5eb415a69985a124c30e1bb2d04221c54d82f83c705e45e1b5a312e2d760f9991e0f09e962cd9b8454557c3e08700e75309e4b6ea30ac
 DIST haproxy-2.8.11.tar.gz 4400628 BLAKE2B 0daccc4dbae5cecae3ad0bc1d164ea78a9584a0f4cb71e15664aff4b76fc05a828030dee355722c99a77270427bd3e9e43939ae59a3f3b1cabcc0179faff34b9 SHA512 59517187a5c0e0dbcb8629d2a922f7a865e1ebdbb9fe0f4fbe273913e0f15a1a26767808bd1607f10e79d3abcdd8c35c1ae648df149a1d5c0df32604df553655
-DIST haproxy-2.8.12.tar.gz 4404583 BLAKE2B fb5f29d981f6a26f27357e46abe29f00703e2fe46ec36466efb26c3baf8c353c48ad212665d19914b64455b2cf74a13e2105c380a737a53d9beb1ed79c1c75ab SHA512 b7c0e5aca9f93621a518cab971a570f1d5da9dbdc07788146de99032e329dac06376cee2837f40ec88319e67c067cb9eaa1a6d66d28df63e7c253892115573e0
 DIST haproxy-2.8.13.tar.gz 4407964 BLAKE2B b9dc167ca395d71cf1340bd92c1399187f93fce0cfd2f895f6fda05f09bc341c63bc64fa8d4fed5cb521ff5466d8c9b09d368139ac09e11b43f58bb4dadbd138 SHA512 6097516d469ac633e2cdb1423d060b46708592d366a6a8d17bfc14a2224c40203cc201b905c3501aa3acc3c17edf6a25a812f88b599359507ee2a72136ee1b97
 DIST haproxy-2.8.7.tar.gz 4376705 BLAKE2B ae145fe6b642f860af814c2c43e84452a0bbc1b545b1b11eb07c65d903b97e42576b94e1774838b32b29ce32778941b79222669fc7615779c49f2ced85bf3fdc SHA512 dd2fe2ccd5d8805da3f7544451507b182377c34a9951747643c04cb9ee178b7be0978d56a0586c59771c2bb955765d3e961f6f06187afb768dc1fd27f08da464
 DIST haproxy-2.9.11.tar.gz 4540689 BLAKE2B 53f81c845e2bb8b3c9935a6035cb28d49708337e16081c2197cab60e4c1f01642cc64f1b2162bdabef07ab79cf72af9fac136bfa19fe89518b7de110433a1789 SHA512 316ab1dfbc60da4fe39acd4f9dc62d352690b35f0787f4fc0ae51853c7d35c656417e97945650bd79900d815414ad9504e4ff368e852657690f20ddc69bd3693
-DIST haproxy-2.9.12.tar.gz 4551877 BLAKE2B 884df1c1cff3abfe96f92b9756f5ec6662c8f90059958bc600bc4bb8f9f96568cc6c7d97030fdb55b34414f0ab901067ee002c77ae57b2b940e9ef3feb17b9a1 SHA512 ad5dadae9bbb2e1e7547e500ec02b44bc7e97c4a133e5fddfc9213bc39c4696437ffdc1b60a95505222f1aa4830d95196fd723673836a2704434ae70a5acd067
 DIST haproxy-2.9.13.tar.gz 4555979 BLAKE2B 8ef464cf9f6c12f7a85336f578137e4a070e9f0083a4cf99150b7a4128211afbf92bfd578debc77657533c0188cb41fbcc08c6e575abb9feefd0980f0792163e SHA512 7ad13194ae274123d4bfbdaa00d4dcd662218bc98274c11adffb9334d9215dec71d7f97491e5042c5134a472207563292d9a87e9ec58e33f7a0c346b757ab52a
 DIST haproxy-2.9.6.tar.gz 4507680 BLAKE2B 5666624d340cba70bc21f53efbe0a7b37897a616e55aa865ffa80471b6b5c03b3eae10bf86078245ec87cc2681b1fd2777148e0fa7f0d4a0a6bc65733f0e8692 SHA512 4e00069356083c8d428bf056e2a26ccfb3e18029cc96769189010d59d0b4f1c7af58986f1653067db83838dcbc2c138798663d3fbb9aac1d3c49c30cfc579c2a
 DIST haproxy-3.0.5.tar.gz 4698022 BLAKE2B c64d8799755fddaf5b45a9e2b67c5f03b25af98fbddde68ab1206c288d9a65f91938810b150c4398ee138d9154c90f1af9fb05c3d0bbc80394e71430e1cc4396 SHA512 8c16b026d5e26fc030178ecd354c68e8ea32c2b971f143cb2aa2f1b2d16fbfc0a27e3975f78873a0cefe3f904b5f1999f8d75622a04234b9cf88f90161d9ea91
-DIST haproxy-3.0.6.tar.gz 4710169 BLAKE2B 51d459756523b073c43ef052a76fe331aba08dc2877cdbe2a97a7025874cbd795220ca133978e5ff4f9f2536c7a47e2f7458a27ef6786af9b626ec550fc95c5a SHA512 a072ad27fc7478d6082b2f92ce869a8d31d80b9d0cca70e9d256c53e54615accdb34d680fe092e72d534647ab3c82394537f55f74e3e7561419eb2c4e249daf9
 DIST haproxy-3.0.7.tar.gz 4713776 BLAKE2B f6515e0d6e3d26a122e341715ecdcc701c6b98fb5ba2d2bf9d38d65cd6d00fc43912c223b0b1530c1154b326247362ea7b1253af5e0ba9567937fb51aa6cc0f6 SHA512 a2ee8cf513fcbae9fc6fa8d66dc6dcd5013667791ef9c3320753f4490904e1568258e499a3b2ccdd3b9d60b2efce98688fd638297cd9b87bddb715167c730c70
-DIST haproxy-3.1.0.tar.gz 4892185 BLAKE2B 32f2fc10b8168289d01f6879443a996d58d2d55e3bca6788f5776637bc97b18f6f45ae76ff5815fec0a77f334cfafc8cc2a0f43e01eb5bd4066260ef16236580 SHA512 b3006dc90d51b44589371ab107eeb8abd04d65f015163569fd602035dee4bc95a516e5fbf786e9f42a6744134cbf4b9478399277f6fa501429b1a9c4044a07b6
-DIST haproxy-3.1.1.tar.gz 4897704 BLAKE2B fb79c335997792441fd697595bc784d462648bb67b260d05db9786a97b480d76927e94e7b54a3064cf3f4ab4c2ed27c2c1ec6b72a4df0c1ac6604299ee7c5d94 SHA512 a2f72fd5bbd8e2a0f93c5b7ad34c77b9eecd1ec0de566985693e3c3a4dc670a2b6fb9972a4b59e29ab31dcc0f297fc710338d51652ef26caf0a5630b32b0e17e
+DIST haproxy-3.1.2.tar.gz 4899606 BLAKE2B 234a365251f226dcd1892fe89ec0dc11f505a85e08b12be1dba61dfd03808cb4cd8ad0f0548b2250379ade124314a5b5577b634bb401798666bae41fe1cc1388 SHA512 5fe0717cab829943438466d0d1e7afddca5dd68e0458fba33584c0e938d117401c3a60bf1d595717d4f7103aba0379ff498148abd205bf515b7b192e11bd73bf
diff --git a/net-proxy/haproxy/haproxy-2.8.12.ebuild b/net-proxy/haproxy/haproxy-2.8.12.ebuild
deleted file mode 100644
index ce11ece1a066..000000000000
--- a/net-proxy/haproxy/haproxy-2.8.12.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	# This is arbitrary; upstream uses master.  Try to update when possible
-	VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
-	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
-			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-elif [[ ${PV} == 9999 ]]; then
-	VTEST_DIR="${WORKDIR}/VTest"
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-else
-	VTEST_DIR="${WORKDIR}/VTest"
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	crypt? ( virtual/libcrypt:= )
-	pcre? (
-		dev-libs/libpcre2:=
-		pcre-jit? ( dev-libs/libpcre2:=[jit] )
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	lua? ( ${LUA_DEPS} )
-	test? (
-		dev-libs/libpcre2
-		sys-libs/zlib
-	)"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		# Switching to PCRE2 by default, bug 838013
-		PCRE=
-		PCRE_JIT=
-	)
-
-	if use elibc_musl; then
-		args+=( TARGET=linux-musl )
-	else
-		args+=( TARGET=linux-glibc )
-	fi
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE2) )
-	args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-	args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	fi
-
-	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
-		TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-		EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
-		SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for extra in ${EXTRAS[@]} ; do
-			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
-			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
-			else
-				# Those two includes are a workaround for hpack Makefile missing those
-				emake -C ${extra} \
-					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-						CC="$(tc-getCC)" ${args[@]}
-			fi
-		done
-	fi
-}
-
-src_test() {
-	# https://github.com/vtest/VTest/issues/12
-	emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result"
-	ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests"
-	env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \
-		HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-src_install() {
-	dosbin haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit admin/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
-		has admin/iprange "${EXTRAS[@]}" && {
-			newbin admin/iprange/iprange haproxy_iprange
-			newbin admin/iprange/ip6range haproxy_ip6range
-		}
-		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
-		has dev/hpack "${EXTRAS[@]}" && {
-			newbin dev/hpack/gen-rht haproxy_gen-rht
-			newbin dev/hpack/gen-enc haproxy_gen-enc
-			newbin dev/hpack/decode haproxy_decode
-		}
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc doc/seamless_reload.txt
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins admin/syntax-highlight/haproxy.vim
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.9.12.ebuild b/net-proxy/haproxy/haproxy-2.9.12.ebuild
deleted file mode 100644
index ce11ece1a066..000000000000
--- a/net-proxy/haproxy/haproxy-2.9.12.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	# This is arbitrary; upstream uses master.  Try to update when possible
-	VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
-	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
-			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-elif [[ ${PV} == 9999 ]]; then
-	VTEST_DIR="${WORKDIR}/VTest"
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-else
-	VTEST_DIR="${WORKDIR}/VTest"
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	crypt? ( virtual/libcrypt:= )
-	pcre? (
-		dev-libs/libpcre2:=
-		pcre-jit? ( dev-libs/libpcre2:=[jit] )
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	lua? ( ${LUA_DEPS} )
-	test? (
-		dev-libs/libpcre2
-		sys-libs/zlib
-	)"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		# Switching to PCRE2 by default, bug 838013
-		PCRE=
-		PCRE_JIT=
-	)
-
-	if use elibc_musl; then
-		args+=( TARGET=linux-musl )
-	else
-		args+=( TARGET=linux-glibc )
-	fi
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE2) )
-	args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-	args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	fi
-
-	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
-		TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-		EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
-		SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for extra in ${EXTRAS[@]} ; do
-			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
-			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
-			else
-				# Those two includes are a workaround for hpack Makefile missing those
-				emake -C ${extra} \
-					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-						CC="$(tc-getCC)" ${args[@]}
-			fi
-		done
-	fi
-}
-
-src_test() {
-	# https://github.com/vtest/VTest/issues/12
-	emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result"
-	ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests"
-	env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \
-		HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-src_install() {
-	dosbin haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit admin/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
-		has admin/iprange "${EXTRAS[@]}" && {
-			newbin admin/iprange/iprange haproxy_iprange
-			newbin admin/iprange/ip6range haproxy_ip6range
-		}
-		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
-		has dev/hpack "${EXTRAS[@]}" && {
-			newbin dev/hpack/gen-rht haproxy_gen-rht
-			newbin dev/hpack/gen-enc haproxy_gen-enc
-			newbin dev/hpack/decode haproxy_decode
-		}
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc doc/seamless_reload.txt
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins admin/syntax-highlight/haproxy.vim
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-3.0.6.ebuild b/net-proxy/haproxy/haproxy-3.0.6.ebuild
deleted file mode 100644
index 019b7ed1219f..000000000000
--- a/net-proxy/haproxy/haproxy-3.0.6.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	# This is arbitrary; upstream uses master.  Try to update when possible
-	VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
-	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
-			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-elif [[ ${PV} == 9999 ]]; then
-	VTEST_DIR="${WORKDIR}/VTest"
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-else
-	VTEST_DIR="${WORKDIR}/VTest"
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	crypt? ( virtual/libcrypt:= )
-	pcre? (
-		dev-libs/libpcre2:=
-		pcre-jit? ( dev-libs/libpcre2:=[jit] )
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	lua? ( ${LUA_DEPS} )
-	test? (
-		dev-libs/libpcre2
-		sys-libs/zlib
-	)"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		# Switching to PCRE2 by default, bug 838013
-		PCRE=
-		PCRE_JIT=
-	)
-
-	if use elibc_musl; then
-		args+=( TARGET=linux-musl )
-	else
-		args+=( TARGET=linux-glibc )
-	fi
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE2) )
-	args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-	args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	fi
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
-		TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-		EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
-		SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for extra in ${EXTRAS[@]} ; do
-			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
-			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
-			else
-				# Those two includes are a workaround for hpack Makefile missing those
-				emake -C ${extra} \
-					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-						CC="$(tc-getCC)" ${args[@]}
-			fi
-		done
-	fi
-}
-
-src_test() {
-	# https://github.com/vtest/VTest/issues/12
-	emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result"
-	ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests"
-	env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \
-		HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-src_install() {
-	dosbin haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit admin/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
-		has admin/iprange "${EXTRAS[@]}" && {
-			newbin admin/iprange/iprange haproxy_iprange
-			newbin admin/iprange/ip6range haproxy_ip6range
-		}
-		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
-		has dev/hpack "${EXTRAS[@]}" && {
-			newbin dev/hpack/gen-rht haproxy_gen-rht
-			newbin dev/hpack/gen-enc haproxy_gen-enc
-			newbin dev/hpack/decode haproxy_decode
-		}
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc doc/seamless_reload.txt
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins admin/syntax-highlight/haproxy.vim
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-3.1.0.ebuild b/net-proxy/haproxy/haproxy-3.1.0.ebuild
deleted file mode 100644
index c0bde0ca349c..000000000000
--- a/net-proxy/haproxy/haproxy-3.1.0.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	# This is arbitrary; upstream uses master.  Try to update when possible
-	VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
-	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
-			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-elif [[ ${PV} == 9999 ]]; then
-	VTEST_DIR="${WORKDIR}/VTest"
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-else
-	VTEST_DIR="${WORKDIR}/VTest"
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	crypt? ( virtual/libcrypt:= )
-	pcre? (
-		dev-libs/libpcre2:=
-		pcre-jit? ( dev-libs/libpcre2:=[jit] )
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	lua? ( ${LUA_DEPS} )
-	test? (
-		dev-libs/libpcre2
-		sys-libs/zlib
-	)"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		# Switching to PCRE2 by default, bug 838013
-		PCRE=
-		PCRE_JIT=
-	)
-
-	if use elibc_musl; then
-		args+=( TARGET=linux-musl )
-	else
-		args+=( TARGET=linux-glibc )
-	fi
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE2) )
-	args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	fi
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
-		TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-		EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
-		SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for extra in ${EXTRAS[@]} ; do
-			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
-			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
-			else
-				# Those two includes are a workaround for hpack Makefile missing those
-				emake -C ${extra} \
-					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-						CC="$(tc-getCC)" ${args[@]}
-			fi
-		done
-	fi
-}
-
-src_test() {
-	# https://github.com/vtest/VTest/issues/12
-	emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result"
-	ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests"
-	env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \
-		HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-src_install() {
-	dosbin haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit admin/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
-		has admin/iprange "${EXTRAS[@]}" && {
-			newbin admin/iprange/iprange haproxy_iprange
-			newbin admin/iprange/ip6range haproxy_ip6range
-		}
-		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
-		has dev/hpack "${EXTRAS[@]}" && {
-			newbin dev/hpack/gen-rht haproxy_gen-rht
-			newbin dev/hpack/gen-enc haproxy_gen-enc
-			newbin dev/hpack/decode haproxy_decode
-		}
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc doc/seamless_reload.txt
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins admin/syntax-highlight/haproxy.vim
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-3.1.1.ebuild b/net-proxy/haproxy/haproxy-3.1.1.ebuild
deleted file mode 100644
index c0bde0ca349c..000000000000
--- a/net-proxy/haproxy/haproxy-3.1.1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	# This is arbitrary; upstream uses master.  Try to update when possible
-	VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
-	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
-			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-elif [[ ${PV} == 9999 ]]; then
-	VTEST_DIR="${WORKDIR}/VTest"
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-else
-	VTEST_DIR="${WORKDIR}/VTest"
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	crypt? ( virtual/libcrypt:= )
-	pcre? (
-		dev-libs/libpcre2:=
-		pcre-jit? ( dev-libs/libpcre2:=[jit] )
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	lua? ( ${LUA_DEPS} )
-	test? (
-		dev-libs/libpcre2
-		sys-libs/zlib
-	)"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		# Switching to PCRE2 by default, bug 838013
-		PCRE=
-		PCRE_JIT=
-	)
-
-	if use elibc_musl; then
-		args+=( TARGET=linux-musl )
-	else
-		args+=( TARGET=linux-glibc )
-	fi
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE2) )
-	args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	fi
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
-		TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-		EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
-		SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for extra in ${EXTRAS[@]} ; do
-			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
-			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
-			else
-				# Those two includes are a workaround for hpack Makefile missing those
-				emake -C ${extra} \
-					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-						CC="$(tc-getCC)" ${args[@]}
-			fi
-		done
-	fi
-}
-
-src_test() {
-	# https://github.com/vtest/VTest/issues/12
-	emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result"
-	ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests"
-	env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \
-		HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-src_install() {
-	dosbin haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit admin/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
-		has admin/iprange "${EXTRAS[@]}" && {
-			newbin admin/iprange/iprange haproxy_iprange
-			newbin admin/iprange/ip6range haproxy_ip6range
-		}
-		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
-		has dev/hpack "${EXTRAS[@]}" && {
-			newbin dev/hpack/gen-rht haproxy_gen-rht
-			newbin dev/hpack/gen-enc haproxy_gen-enc
-			newbin dev/hpack/decode haproxy_decode
-		}
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc doc/seamless_reload.txt
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins admin/syntax-highlight/haproxy.vim
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-3.1.2.ebuild b/net-proxy/haproxy/haproxy-3.1.2.ebuild
new file mode 100644
index 000000000000..d7bd5ede499e
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-3.1.2.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	# This is arbitrary; upstream uses master.  Try to update when possible
+	VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
+	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
+			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+elif [[ ${PV} == 9999 ]]; then
+	VTEST_DIR="${WORKDIR}/VTest"
+	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
+	EGIT_BRANCH=master
+else
+	VTEST_DIR="${WORKDIR}/VTest"
+	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
+ssl systemd test +threads tools zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	lua? ( ${LUA_REQUIRED_USE} )
+	?? ( slz zlib )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	crypt? ( virtual/libcrypt:= )
+	pcre? (
+		dev-libs/libpcre2:=
+		pcre-jit? ( dev-libs/libpcre2:=[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	test? (
+		dev-libs/libpcre2
+		sys-libs/zlib
+	)"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS )
+EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		# Switching to PCRE2 by default, bug 838013
+		PCRE=
+		PCRE_JIT=
+	)
+
+	if use elibc_musl; then
+		args+=( TARGET=linux-musl )
+	else
+		args+=( TARGET=linux-glibc )
+	fi
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE2) )
+	args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use prometheus-exporter PROMEX) )
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+		TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+	emake -C admin/systemd CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+		EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
+		SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for extra in ${EXTRAS[@]} ; do
+			if [ "${extra}" = "admin/halog" ]; then
+				emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
+			elif [ "${extra}" = "dev/hpack" ]; then
+				emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+			else
+				# Those two includes are a workaround for hpack Makefile missing those
+				emake -C ${extra} \
+					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+						CC="$(tc-getCC)" ${args[@]}
+			fi
+		done
+	fi
+}
+
+src_test() {
+	# https://github.com/vtest/VTest/issues/12
+	emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result"
+	ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests"
+	env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \
+		HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
+}
+
+src_install() {
+	dosbin haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit admin/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
+		has admin/iprange "${EXTRAS[@]}" && {
+			newbin admin/iprange/iprange haproxy_iprange
+			newbin admin/iprange/ip6range haproxy_ip6range
+		}
+		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
+		has dev/hpack "${EXTRAS[@]}" && {
+			newbin dev/hpack/gen-rht haproxy_gen-rht
+			newbin dev/hpack/gen-enc haproxy_gen-enc
+			newbin dev/hpack/decode haproxy_decode
+		}
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins admin/syntax-highlight/haproxy.vim
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/mitmproxy-rs/mitmproxy-rs-0.11.1.ebuild b/net-proxy/mitmproxy-rs/mitmproxy-rs-0.11.1.ebuild
index 9f84fe051d70..3bb00cc3cf0c 100644
--- a/net-proxy/mitmproxy-rs/mitmproxy-rs-0.11.1.ebuild
+++ b/net-proxy/mitmproxy-rs/mitmproxy-rs-0.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,7 +38,7 @@ LICENSE+="
 	LGPL-3+ MIT Unicode-DFS-2016 WTFPL-2
 "
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 src_prepare() {
 	distutils-r1_src_prepare
diff --git a/net-proxy/mitmproxy/mitmproxy-11.0.2.ebuild b/net-proxy/mitmproxy/mitmproxy-11.0.2.ebuild
index c9e7901fd19e..9ef96962bd42 100644
--- a/net-proxy/mitmproxy/mitmproxy-11.0.2.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-11.0.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
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	>=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}]
diff --git a/net-proxy/privoxy/privoxy-3.0.34-r1.ebuild b/net-proxy/privoxy/privoxy-3.0.34-r1.ebuild
new file mode 100644
index 000000000000..8ed6801e6935
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.34-r1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd toolchain-funcs
+
+[ "${PV##*_}" = "beta" ] &&
+	PRIVOXY_STATUS="beta" ||
+	PRIVOXY_STATUS="stable"
+
+DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing privacy"
+HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/"
+SRC_URI="https://downloads.sourceforge.net/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
+
+S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~riscv sparc x86"
+IUSE="+acl brotli client-tags compression editor extended-host-patterns
+extended-statistics external-filters +fast-redirects +force fuzz
+graceful-termination +image-blocking ipv6 +jit lfs +mbedtls openssl
+png-images sanitize selinux ssl +stats +threads toggle tools whitelists
++zlib"
+
+DEPEND="
+	acct-group/privoxy
+	acct-user/privoxy
+	dev-libs/libpcre
+	brotli? ( app-arch/brotli )
+	ssl? (
+		mbedtls? ( net-libs/mbedtls:0= )
+		openssl? ( dev-libs/openssl:= )
+	)
+	zlib? ( sys-libs/zlib:= )
+"
+RDEPEND="${DEPEND}
+	extended-host-patterns? ( dev-lang/perl )
+	selinux? ( sec-policy/selinux-privoxy )
+	tools? (
+		net-misc/curl
+		dev-lang/perl
+	)
+"
+REQUIRED_USE="
+	brotli? ( zlib )
+	client-tags? ( threads )
+	compression? ( zlib )
+	extended-statistics? ( threads )
+	fuzz? ( zlib )
+	ssl? ( ^^ ( mbedtls openssl ) threads )
+	toggle? ( editor )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.32-gentoo.patch
+	"${FILESDIR}"/${PN}-3.0.28-strip.patch
+	"${FILESDIR}"/${PN}-3.0.33-configure-c99.patch
+)
+
+pkg_pretend() {
+	if ! use threads; then
+		ewarn
+		ewarn "Privoxy may be very slow without threads support, consider enabling it."
+		ewarn "See also https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS"
+		ewarn "Additionally some features may not build or work poperly. You are on your own."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	sed -i "s|/p\.p/|/config.privoxy.org/|g" tools/privoxy-regression-test.pl || die
+
+	# autoreconf needs to be called even if we don't modify any autotools source files
+	# See main makefile
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--without-mbedtls --without-openssl"
+	if use ssl; then
+		myconf="$(use_with mbedtls) $(use_with openssl)"
+	fi
+	if use sanitize; then
+		myconf+=" --with-usan"
+		# msan is available in clang only
+		# asan is broken with current configure tests in gcc
+		tc-is-clang && myconf+=" --with-msan --with-asan"
+	fi
+
+	# --with-debug only enables debug CFLAGS
+	# --with-docbook and --with-db2html and their deps are useless,
+	#	since docs are already pregenerated in the source tarball
+	econf \
+		--sysconfdir=/etc/privoxy \
+		--disable-accept-filter \
+		--enable-dynamic-pcre \
+		--without-assertions \
+		--with-user=privoxy \
+		--with-group=privoxy \
+		$(use_enable acl acl-support) \
+		$(use_enable compression) \
+		$(use_enable client-tags) \
+		$(use_enable editor) \
+		$(use_enable extended-host-patterns pcre-host-patterns) \
+		$(use_enable extended-statistics) \
+		$(use_enable fast-redirects) \
+		$(use_enable force) \
+		$(use_enable fuzz) \
+		$(use_enable graceful-termination) \
+		$(use_enable image-blocking) \
+		$(use_enable jit pcre-jit-compilation) \
+		$(use_enable ipv6 ipv6-support) \
+		$(use_enable lfs large-file-support) \
+		$(use_enable png-images no-gifs) \
+		$(use_enable stats) \
+		$(use_enable threads pthread) \
+		$(use_enable toggle) \
+		$(use_enable whitelists trust-files) \
+		$(use_enable zlib) \
+		$(use_with brotli) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/privoxy.initd-3" privoxy
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/privoxy.logrotate" privoxy
+
+	diropts -m 0750 -g privoxy -o privoxy
+	keepdir /var/log/privoxy
+
+	use extended-host-patterns && newbin tools/url-pattern-translator.pl privoxy-url-pattern-translator.pl
+	if use tools; then
+		dobin tools/{privoxy-log-parser.pl,privoxy-regression-test.pl}
+		newbin tools/uagen.pl privoxy-uagen.pl
+	fi
+
+	rmdir "${ED}/var/run" || die
+	chown privoxy:root "${ED}/etc/privoxy" || die
+}
+
+pkg_postinst() {
+	if use extended-host-patterns; then
+		ewarn
+		ewarn "You enabled extended-host-patterns, now you *must* convert all action files in"
+		ewarn "PCRE-compatible format, or privoxy will fail to start. Helper tool"
+		ewarn "privoxy-url-pattern-translator.pl is available."
+		ewarn
+	fi
+}
diff --git a/net-proxy/privoxy/privoxy-3.0.34.ebuild b/net-proxy/privoxy/privoxy-3.0.34.ebuild
deleted file mode 100644
index 20df6ca09563..000000000000
--- a/net-proxy/privoxy/privoxy-3.0.34.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd toolchain-funcs
-
-[ "${PV##*_}" = "beta" ] &&
-	PRIVOXY_STATUS="beta" ||
-	PRIVOXY_STATUS="stable"
-
-DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing privacy"
-HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/"
-SRC_URI="https://downloads.sourceforge.net/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~riscv sparc x86"
-IUSE="+acl brotli client-tags compression editor extended-host-patterns
-extended-statistics external-filters +fast-redirects +force fuzz
-graceful-termination +image-blocking ipv6 +jit lfs +mbedtls openssl
-png-images sanitize selinux ssl +stats +threads toggle tools whitelists
-+zlib"
-
-DEPEND="
-	acct-group/privoxy
-	acct-user/privoxy
-	dev-libs/libpcre
-	brotli? ( app-arch/brotli )
-	ssl? (
-		mbedtls? ( net-libs/mbedtls:= )
-		openssl? ( dev-libs/openssl:= )
-	)
-	zlib? ( sys-libs/zlib:= )
-"
-RDEPEND="${DEPEND}
-	extended-host-patterns? ( dev-lang/perl )
-	selinux? ( sec-policy/selinux-privoxy )
-	tools? (
-		net-misc/curl
-		dev-lang/perl
-	)
-"
-REQUIRED_USE="
-	brotli? ( zlib )
-	client-tags? ( threads )
-	compression? ( zlib )
-	extended-statistics? ( threads )
-	fuzz? ( zlib )
-	ssl? ( ^^ ( mbedtls openssl ) threads )
-	toggle? ( editor )
-"
-
-S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.32-gentoo.patch
-	"${FILESDIR}"/${PN}-3.0.28-strip.patch
-	"${FILESDIR}"/${PN}-3.0.33-configure-c99.patch
-)
-
-pkg_pretend() {
-	if ! use threads; then
-		ewarn
-		ewarn "Privoxy may be very slow without threads support, consider enabling it."
-		ewarn "See also https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS"
-		ewarn "Additionally some features may not build or work poperly. You are on your own."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-	mv configure.in configure.ac || die
-	sed -i "s|/p\.p/|/config.privoxy.org/|g" tools/privoxy-regression-test.pl || die
-
-	# autoreconf needs to be called even if we don't modify any autotools source files
-	# See main makefile
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--without-mbedtls --without-openssl"
-	if use ssl; then
-		myconf="$(use_with mbedtls) $(use_with openssl)"
-	fi
-	if use sanitize; then
-		myconf+=" --with-usan"
-		# msan is available in clang only
-		# asan is broken with current configure tests in gcc
-		tc-is-clang && myconf+=" --with-msan --with-asan"
-	fi
-
-	# --with-debug only enables debug CFLAGS
-	# --with-docbook and --with-db2html and their deps are useless,
-	#	since docs are already pregenerated in the source tarball
-	econf \
-		--sysconfdir=/etc/privoxy \
-		--disable-accept-filter \
-		--enable-dynamic-pcre \
-		--without-assertions \
-		--with-user=privoxy \
-		--with-group=privoxy \
-		$(use_enable acl acl-support) \
-		$(use_enable compression) \
-		$(use_enable client-tags) \
-		$(use_enable editor) \
-		$(use_enable extended-host-patterns pcre-host-patterns) \
-		$(use_enable extended-statistics) \
-		$(use_enable fast-redirects) \
-		$(use_enable force) \
-		$(use_enable fuzz) \
-		$(use_enable graceful-termination) \
-		$(use_enable image-blocking) \
-		$(use_enable jit pcre-jit-compilation) \
-		$(use_enable ipv6 ipv6-support) \
-		$(use_enable lfs large-file-support) \
-		$(use_enable png-images no-gifs) \
-		$(use_enable stats) \
-		$(use_enable threads pthread) \
-		$(use_enable toggle) \
-		$(use_enable whitelists trust-files) \
-		$(use_enable zlib) \
-		$(use_with brotli) \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/privoxy.initd-3" privoxy
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/privoxy.logrotate" privoxy
-
-	diropts -m 0750 -g privoxy -o privoxy
-	keepdir /var/log/privoxy
-
-	use extended-host-patterns && newbin tools/url-pattern-translator.pl privoxy-url-pattern-translator.pl
-	if use tools; then
-		dobin tools/{privoxy-log-parser.pl,privoxy-regression-test.pl}
-		newbin tools/uagen.pl privoxy-uagen.pl
-	fi
-
-	rmdir "${ED}/var/run" || die
-	chown privoxy:root "${ED}/etc/privoxy" || die
-}
-
-pkg_postinst() {
-	if use extended-host-patterns; then
-		ewarn
-		ewarn "You enabled extended-host-patterns, now you *must* convert all action files in"
-		ewarn "PCRE-compatible format, or privoxy will fail to start. Helper tool"
-		ewarn "privoxy-url-pattern-translator.pl is available."
-		ewarn
-	fi
-}
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5-r1.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5-r1.ebuild
new file mode 100644
index 000000000000..4dc612115a33
--- /dev/null
+++ b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="v${PV}"
+inherit autotools systemd
+
+DESCRIPTION="A lightweight secured SOCKS5 proxy for embedded devices and low end boxes"
+HOMEPAGE="https://github.com/shadowsocks/shadowsocks-libev"
+
+#repack with git submodule populated: libbloom, libcork, libipset
+#SRC_URI="https://dev.gentoo.org/~dlan/distfiles/${P}.tar.xz"
+
+SRC_URI="https://github.com/shadowsocks/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="debug doc"
+
+RDEPEND="net-libs/mbedtls:0=
+	>=net-libs/libbloom-1.6
+	net-libs/libcork
+	net-libs/libcorkipset
+	>=dev-libs/libsodium-1.0.8:=
+	dev-libs/libev
+	net-dns/c-ares
+	dev-libs/libpcre
+	"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+	"
+
+src_prepare() {
+	sed -i -e 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' \
+		configure.ac || die
+	sed -i -e 's|-Werror||g' \
+		configure.ac src/Makefile.am || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="
+		$(use_enable debug assert)
+		--enable-system-shared-lib
+	"
+	use doc || myconf+="--disable-documentation"
+	econf ${myconf}
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	insinto "/etc/${PN}"
+	newins "${FILESDIR}/shadowsocks.json" shadowsocks.json
+
+	newinitd "${FILESDIR}/shadowsocks.initd" shadowsocks
+	dosym shadowsocks /etc/init.d/shadowsocks.server
+	dosym shadowsocks /etc/init.d/shadowsocks.client
+	dosym shadowsocks /etc/init.d/shadowsocks.redir
+	dosym shadowsocks /etc/init.d/shadowsocks.tunnel
+
+	dodoc -r acl
+
+	for i in debian/${PN}*.service; do
+		systemd_newunit $i $(basename $i)
+	done
+}
+
+pkg_setup() {
+	elog "You need to choose the mode"
+	elog "  server: rc-update add shadowsocks.server default"
+	elog "  client: rc-update add shadowsocks.client default"
+	elog "  redir:  rc-update add shadowsocks.redir default"
+	elog "  tunnel: rc-update add shadowsocks.tunnel default"
+}
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5.ebuild
deleted file mode 100644
index 70be2ec789e8..000000000000
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="v${PV}"
-inherit autotools systemd
-
-DESCRIPTION="A lightweight secured SOCKS5 proxy for embedded devices and low end boxes"
-HOMEPAGE="https://github.com/shadowsocks/shadowsocks-libev"
-
-#repack with git submodule populated: libbloom, libcork, libipset
-#SRC_URI="https://dev.gentoo.org/~dlan/distfiles/${P}.tar.xz"
-
-SRC_URI="https://github.com/shadowsocks/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="debug doc"
-
-RDEPEND="net-libs/mbedtls:=
-	>=net-libs/libbloom-1.6
-	net-libs/libcork
-	net-libs/libcorkipset
-	>=dev-libs/libsodium-1.0.8:=
-	dev-libs/libev
-	net-dns/c-ares
-	dev-libs/libpcre
-	"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)
-	"
-
-src_prepare() {
-	sed -i -e 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' \
-		configure.ac || die
-	sed -i -e 's|-Werror||g' \
-		configure.ac src/Makefile.am || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="
-		$(use_enable debug assert)
-		--enable-system-shared-lib
-	"
-	use doc || myconf+="--disable-documentation"
-	econf ${myconf}
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	insinto "/etc/${PN}"
-	newins "${FILESDIR}/shadowsocks.json" shadowsocks.json
-
-	newinitd "${FILESDIR}/shadowsocks.initd" shadowsocks
-	dosym shadowsocks /etc/init.d/shadowsocks.server
-	dosym shadowsocks /etc/init.d/shadowsocks.client
-	dosym shadowsocks /etc/init.d/shadowsocks.redir
-	dosym shadowsocks /etc/init.d/shadowsocks.tunnel
-
-	dodoc -r acl
-
-	for i in debian/${PN}*.service; do
-		systemd_newunit $i $(basename $i)
-	done
-}
-
-pkg_setup() {
-	elog "You need to choose the mode"
-	elog "  server: rc-update add shadowsocks.server default"
-	elog "  client: rc-update add shadowsocks.client default"
-	elog "  redir:  rc-update add shadowsocks.redir default"
-	elog "  tunnel: rc-update add shadowsocks.tunnel default"
-}
diff --git a/net-voip/umurmur/umurmur-0.2.20-r1.ebuild b/net-voip/umurmur/umurmur-0.2.20-r1.ebuild
new file mode 100644
index 000000000000..b833732c98d6
--- /dev/null
+++ b/net-voip/umurmur/umurmur-0.2.20-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd readme.gentoo-r1
+
+DESCRIPTION="Minimalistic Murmur (Mumble server)"
+HOMEPAGE="https://github.com/umurmur/umurmur"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/umurmur/umurmur.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm x86"
+fi
+S="${WORKDIR}/${P/_}"
+LICENSE="BSD"
+SLOT="0"
+IUSE="gnutls mbedtls shm"
+
+# ssl-provider precendence: gnutls, mbedtls and openssl if none specified
+DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
+	dev-libs/libconfig:=
+	gnutls? (
+		dev-libs/nettle:=
+		>=net-libs/gnutls-3.0.0:=
+	)
+	!gnutls? (
+		mbedtls? ( net-libs/mbedtls:0= )
+		!mbedtls? ( dev-libs/openssl:0= )
+	)
+"
+
+RDEPEND="${DEPEND}
+	acct-group/murmur
+	acct-user/murmur
+"
+
+DOC_CONTENTS="
+	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
+	may want to review it. See also\n
+	https://github.com/umurmur/umurmur/wiki/Configuration "
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.20-openssl3.patch" #806154
+)
+
+get_ssl_impl() {
+	local ssl_provider=()
+
+	use gnutls && ssl_provider+=( gnutls )
+	use mbedtls && ssl_provider+=( mbedtls )
+
+	if ! use gnutls && ! use mbedtls ; then
+		ssl_provider+=( openssl )
+	fi
+	echo ${ssl_provider[@]}
+}
+
+pkg_pretend() {
+	local ssl_provider=( $(get_ssl_impl) )
+
+	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
+		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
+		ewarn "defaulting to ${ssl_provider[0]}."
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local ssl_provider=( $(get_ssl_impl) )
+
+	local myeconfargs=(
+		--with-ssl="${ssl_provider[0]}"
+		$(use_enable shm shmapi)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local confdir
+
+	emake DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
+	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
+	systemd_dounit "${FILESDIR}"/umurmurd.service
+
+	dodoc AUTHORS ChangeLog
+	newdoc README.md README
+
+	confdir="/etc/umurmur"
+	insinto "${confdir}"
+	doins "${FILESDIR}"/umurmur.conf
+
+	# Some permissions are adjusted as the config may contain a server
+	# password, and /etc/umurmur will typically contain the cert and the
+	# key used to sign it, which are read after priveleges are dropped.
+	fperms 0750 "${confdir}"
+	fowners -R root:murmur "${confdir}"
+	fperms 0640 "${confdir}"/umurmur.conf
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-voip/umurmur/umurmur-0.2.20.ebuild b/net-voip/umurmur/umurmur-0.2.20.ebuild
deleted file mode 100644
index d0487801838c..000000000000
--- a/net-voip/umurmur/umurmur-0.2.20.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd readme.gentoo-r1
-
-DESCRIPTION="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="https://github.com/umurmur/umurmur"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/umurmur/umurmur.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
-fi
-LICENSE="BSD"
-SLOT="0"
-IUSE="gnutls mbedtls shm"
-
-# ssl-provider precendence: gnutls, mbedtls and openssl if none specified
-DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
-	dev-libs/libconfig:=
-	gnutls? (
-		dev-libs/nettle:=
-		>=net-libs/gnutls-3.0.0:=
-	)
-	!gnutls? (
-		mbedtls? ( net-libs/mbedtls:= )
-		!mbedtls? ( dev-libs/openssl:0= )
-	)
-"
-
-RDEPEND="${DEPEND}
-	acct-group/murmur
-	acct-user/murmur
-"
-
-DOC_CONTENTS="
-	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
-	may want to review it. See also\n
-	https://github.com/umurmur/umurmur/wiki/Configuration "
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2.20-openssl3.patch" #806154
-)
-
-S="${WORKDIR}/${P/_}"
-
-get_ssl_impl() {
-	local ssl_provider=()
-
-	use gnutls && ssl_provider+=( gnutls )
-	use mbedtls && ssl_provider+=( mbedtls )
-
-	if ! use gnutls && ! use mbedtls ; then
-		ssl_provider+=( openssl )
-	fi
-	echo ${ssl_provider[@]}
-}
-
-pkg_pretend() {
-	local ssl_provider=( $(get_ssl_impl) )
-
-	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
-		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
-		ewarn "defaulting to ${ssl_provider[0]}."
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ssl_provider=( $(get_ssl_impl) )
-
-	local myeconfargs=(
-		--with-ssl="${ssl_provider[0]}"
-		$(use_enable shm shmapi)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local confdir
-
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
-	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
-	systemd_dounit "${FILESDIR}"/umurmurd.service
-
-	dodoc AUTHORS ChangeLog
-	newdoc README.md README
-
-	confdir="/etc/umurmur"
-	insinto "${confdir}"
-	doins "${FILESDIR}"/umurmur.conf
-
-	# Some permissions are adjusted as the config may contain a server
-	# password, and /etc/umurmur will typically contain the cert and the
-	# key used to sign it, which are read after priveleges are dropped.
-	fperms 0750 "${confdir}"
-	fowners -R root:murmur "${confdir}"
-	fperms 0640 "${confdir}"/umurmur.conf
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-vpn/candy/Manifest b/net-vpn/candy/Manifest
index 8be113b96228..25844b5787f6 100644
--- a/net-vpn/candy/Manifest
+++ b/net-vpn/candy/Manifest
@@ -1,2 +1,2 @@
-DIST candy-5.10.3.gh.tar.gz 115258 BLAKE2B 70d698d69fbb0a28adeb1ba515a1a1f6986c083d3a04b688bfd5b7ead98941bac46af47cd745b74928fc56466ebe3fa7d570f7ecaa1716b2eac948d9eaf52fe2 SHA512 c56ab81f599c5fbf72c509265b3fc0189a17e36b8738e536f21702585e7994c706a277d8c1dbf8b68e7f3609518fec0b4daccc0b180d375463e898bb7d41bbdc
 DIST candy-5.10.4.gh.tar.gz 115673 BLAKE2B d150cdf06cd003f0d42e176538a204b8c4cab114bde2c363162a8a75d22e7911abf6a0944a142d6be5ee49116dc24b61d20588390dff7496b51995079ed05457 SHA512 09653777c4653c786d03d8a2141988e1b6f33f0b81b46815d3c13e7d7ca40957d15d654a7d58dd72f02574197183e9198563e871ab4d23f228f87a81cccd0b2d
+DIST candy-5.10.6.gh.tar.gz 341627 BLAKE2B 5b72e07b808e57b448c197c9fe34e7ffff1cde3de6e8fd702ef76f45fc97d97e86db8f049fa6562d18e551f9e0f9daa9d50a36a0cda92757bcf700406fa494e0 SHA512 8f20776d53f60812cf2f1775fe7c439f5dc65b20efe0a87928ad9a067118310f1adf8e5ca3a470c5abf86ddb5fe7a825c3f1e8270590afcc6da57fdad92d09b3
diff --git a/net-vpn/candy/candy-5.10.3-r1.ebuild b/net-vpn/candy/candy-5.10.3-r1.ebuild
deleted file mode 100644
index b2396261c0bd..000000000000
--- a/net-vpn/candy/candy-5.10.3-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd readme.gentoo-r1
-
-DESCRIPTION="A reliable, low-latency, and anti-censorship virtual private network"
-HOMEPAGE="https://github.com/lanthora/candy"
-SRC_URI="https://github.com/lanthora/candy/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-DEPEND="
-	dev-libs/poco:=
-	dev-libs/openssl:=
-	dev-libs/spdlog:=
-	dev-libs/libfmt:=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-src_install(){
-	cmake_src_install
-	default
-
-	insinto /etc
-	doins candy.cfg
-
-	systemd_dounit candy.service
-	systemd_dounit candy@.service
-	newinitd candy.initd candy
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-vpn/candy/candy-5.10.6.ebuild b/net-vpn/candy/candy-5.10.6.ebuild
new file mode 100644
index 000000000000..5322bf2b14e1
--- /dev/null
+++ b/net-vpn/candy/candy-5.10.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd readme.gentoo-r1
+
+DESCRIPTION="A reliable, low-latency, and anti-censorship virtual private network"
+HOMEPAGE="https://github.com/lanthora/candy"
+SRC_URI="https://github.com/lanthora/candy/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+DEPEND="
+	dev-libs/poco:=
+	dev-libs/openssl:=
+	dev-libs/spdlog:=
+	dev-libs/libfmt:=
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_install(){
+	cmake_src_install
+	default
+
+	insinto /etc
+	doins candy.cfg
+
+	systemd_dounit candy.service
+	systemd_dounit candy@.service
+	newinitd candy.initd candy
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-vpn/gsocket/gsocket-1.4.43-r1.ebuild b/net-vpn/gsocket/gsocket-1.4.43-r1.ebuild
index 74426aaafe23..450fb65d37c4 100644
--- a/net-vpn/gsocket/gsocket-1.4.43-r1.ebuild
+++ b/net-vpn/gsocket/gsocket-1.4.43-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,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/hackerschoice/gsocket.git"
 else
 	SRC_URI="https://github.com/hackerschoice/gsocket/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 11359c29680a..b798283f621c 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -1,2 +1,3 @@
 DIST i2pd-2.53.1.tar.gz 677029 BLAKE2B 5b84a3833b3a71c88dc7bf319f802c7c326f045eeee1c5062d51f3b9aa9fb76627c075baf6c6aa8ed9bac3b2fd35ea16d33396332c7b7b21ea15117564f037e0 SHA512 9226fbab7f260e6d84738db4fe9d729eedc8104ed09b191331760b1d77debb6bc05e6558861c1cd304ffdc8661e893f9ac5950e47a38facad51038769b478c64
 DIST i2pd-2.54.0.tar.gz 686135 BLAKE2B 48e3caed26c8ed5725952a5c21df98b70224d39327b1b95d67924c9ccde2bf687f819a5956f6d8181b44f394464918a8c126b3e5c1052ff6dd22ba3baa3c2215 SHA512 edb1f6d74411754f20475386c40df68579e062716c9344f5d006d40e882dd2a2aaa10d48acdf399c0f9f2db9dcd0c7c466d077dfd9854085db0e1a4a28b57f89
+DIST i2pd-2.55.0.tar.gz 690979 BLAKE2B 51d36971ff4aac1a30a07c39f2a9d424d83f01cf978591642c2a28dfa772a7f24e02f04900cbeec639e37be1c5ffb2cef06d9b681ac1ca91abed100e998eb228 SHA512 b7eedf116f7282f0825395a3ecca25789e6b09279ac9da4c5146f7202302f9b07fad8cfd6ac7c5f5f1b4299851e78a4923807a370e1cad7d435ce13535cfa6be
diff --git a/net-vpn/i2pd/i2pd-2.55.0.ebuild b/net-vpn/i2pd/i2pd-2.55.0.ebuild
new file mode 100644
index 000000000000..6cd51ebacee2
--- /dev/null
+++ b/net-vpn/i2pd/i2pd-2.55.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
+HOMEPAGE="https://github.com/PurpleI2P/i2pd"
+SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes +upnp"
+
+DEPEND="
+	dev-libs/boost:=
+	dev-libs/openssl:0=[-bindist(-)]
+	sys-libs/zlib
+	upnp? ( net-libs/miniupnpc:= )
+"
+RDEPEND="
+	acct-user/i2pd
+	acct-group/i2pd
+	${DEPEND}
+"
+
+CMAKE_USE_DIR="${WORKDIR}/${P}/build"
+
+DOCS=( ../README.md ../contrib/i2pd.conf ../contrib/tunnels.conf )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
+		-DWITH_HARDENING=OFF # worsens or matches the non-hardened profiles
+		-DWITH_STATIC=OFF
+		-DWITH_UPNP=$(usex upnp ON OFF)
+		-DWITH_LIBRARY=ON
+		-DWITH_BINARY=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# config
+	insinto /etc/i2pd
+	doins contrib/i2pd.conf
+	doins contrib/tunnels.conf
+
+	# working directory
+	insinto /var/lib/i2pd
+	doins -r contrib/certificates
+
+	# add /var/lib/i2pd/certificates to CONFIG_PROTECT
+	doenvd "${FILESDIR}/99i2pd"
+
+	# openrc and systemd daemon routines
+	newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd
+	newinitd "${FILESDIR}/i2pd-2.39.0.initd" i2pd
+	systemd_newunit "${FILESDIR}/i2pd-2.38.0.service" i2pd.service
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/i2pd-2.38.0-r1.logrotate" i2pd
+}
+
+pkg_postinst() {
+	if [[ -f ${EROOT}/etc/i2pd/subscriptions.txt ]]; then
+		ewarn
+		ewarn "Configuration of the subscriptions has been moved from"
+		ewarn "subscriptions.txt to i2pd.conf. We recommend updating"
+		ewarn "i2pd.conf accordingly and deleting subscriptions.txt."
+	fi
+}
diff --git a/net-vpn/openvpn/files/openvpn-2.5.2-detect-python-rst2man.patch b/net-vpn/openvpn/files/openvpn-2.5.2-detect-python-rst2man.patch
deleted file mode 100644
index d2060bbff4b1..000000000000
--- a/net-vpn/openvpn/files/openvpn-2.5.2-detect-python-rst2man.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,8 +376,8 @@ AC_DEFINE_UNQUOTED([SYSTEMD_ASK_PASSWORD_PATH], ["$SYSTEMD_ASK_PASSWORD"], [Path
- #
- AC_ARG_VAR([RST2MAN], [path to rst2man utility])
- AC_ARG_VAR([RST2HTML], [path to rst2html utility])
--AC_CHECK_PROGS([RST2MAN], [rst2man])
--AC_CHECK_PROGS([RST2HTML], [rst2html])
-+AC_CHECK_PROGS([RST2MAN], [rst2man rst2man.py])
-+AC_CHECK_PROGS([RST2HTML], [rst2html rst2html.py])
- AM_CONDITIONAL([HAVE_PYDOCUTILS], [test "${RST2MAN}" -a "${RST2HTML}"])
- 
- # Set -std=c99 unless user already specified a -std=
- 
diff --git a/net-vpn/openvpn/openvpn-2.5.6-r1.ebuild b/net-vpn/openvpn/openvpn-2.5.6-r1.ebuild
deleted file mode 100644
index 3636e8880907..000000000000
--- a/net-vpn/openvpn/openvpn-2.5.6-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd linux-info tmpfiles
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-HOMEPAGE="https://openvpn.net/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
-	EGIT_SUBMODULES=(-cmocka)
-
-	inherit git-r3
-else
-	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
-IUSE+=" pam pkcs11 +plugins selinux systemd test"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( openssl mbedtls )
-	pkcs11? ( !mbedtls )
-	!plugins? ( !pam !down-root )
-	inotify? ( plugins )
-"
-
-CDEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] )
-	)
-	lz4? ( app-arch/lz4 )
-	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
-	openssl? ( >=dev-libs/openssl-0.9.8:0= )
-	pam? ( sys-libs/pam )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
-	systemd? ( sys-apps/systemd )
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
-	test? ( dev-util/cmocka )
-"
-RDEPEND="${CDEPEND}
-	acct-group/openvpn
-	acct-user/openvpn
-	selinux? ( sec-policy/selinux-openvpn )
-"
-
-if [[ ${PV} = "9999" ]]; then
-	BDEPEND+=" dev-python/docutils"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/openvpn-2.5.0-auth-pam-missing-header.patch
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~TUN"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local -a myeconfargs
-
-	if ! use mbedtls; then
-		myeconfargs+=(
-			$(use_enable pkcs11)
-		)
-	fi
-
-	myeconfargs+=(
-		$(use_enable inotify async-push)
-		--with-crypto-library=$(usex mbedtls mbedtls openssl)
-		$(use_enable lz4)
-		$(use_enable lzo)
-		$(use_enable plugins)
-		$(use_enable iproute2)
-		$(use_enable pam plugin-auth-pam)
-		$(use_enable down-root plugin-down-root)
-		$(use_enable systemd)
-	)
-
-	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
-		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
-		IPROUTE=$(usex iproute2 '/bin/ip' '') \
-		econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	local -x RUN_SUDO=false
-
-	elog "Running top-level tests"
-	emake check
-
-	pushd tests/unit_tests &>/dev/null || die
-	elog "Running unit tests"
-	emake check
-	popd &>/dev/null || die
-}
-
-src_install() {
-	default
-
-	find "${ED}/usr" -name '*.la' -delete || die
-
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README README.IPv6
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# (is the below comment relevant anymore?)
-		## dodoc does not supportly support directory traversal, #15193
-		docinto examples
-		dodoc -r sample contrib
-	fi
-
-	# https://bugs.gentoo.org/755680#c3
-	doman doc/openvpn.8
-}
-
-pkg_postinst() {
-	tmpfiles_process openvpn.conf
-
-	if use x64-macos ; then
-		elog "You might want to install tuntaposx for TAP interface support:"
-		elog "http://tuntaposx.sourceforge.net"
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd ; then
-		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
-		elog  ""
-		elog "server:"
-		elog ""
-		elog "- Place your server configuration file in /etc/openvpn/server"
-		elog "- Use the openvpn-server@.service like so"
-		elog "systemctl start openvpn-server@{Server-config}"
-		elog ""
-		elog "client:"
-		elog ""
-		elog "- Place your client configuration file in /etc/openvpn/client"
-		elog "- Use the openvpn-client@.service like so:"
-		elog "systemctl start openvpn-client@{Client-config}"
-	else
-		elog "The openvpn init script expects to find the configuration file"
-		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-		elog ""
-		elog "To create more VPNs, simply create a new .conf file for it and"
-		elog "then create a symlink to the openvpn init script from a link called"
-		elog "openvpn.newconfname - like so"
-		elog "	 cd /etc/openvpn"
-		elog "	 ${EDITOR##*/} foo.conf"
-		elog "	 cd /etc/init.d"
-		elog "	 ln -s openvpn openvpn.foo"
-		elog ""
-		elog "You can then treat openvpn.foo as any other service, so you can"
-		elog "stop one vpn and start another if you need to."
-	fi
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if use plugins ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
-	fi
-}
diff --git a/net-vpn/openvpn/openvpn-2.5.6-r2.ebuild b/net-vpn/openvpn/openvpn-2.5.6-r2.ebuild
new file mode 100644
index 000000000000..68afef4eb0b3
--- /dev/null
+++ b/net-vpn/openvpn/openvpn-2.5.6-r2.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd linux-info tmpfiles
+
+DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
+HOMEPAGE="https://openvpn.net/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
+	EGIT_SUBMODULES=(-cmocka)
+
+	inherit git-r3
+else
+	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
+IUSE+=" pam pkcs11 +plugins selinux systemd test"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	^^ ( openssl mbedtls )
+	pkcs11? ( !mbedtls )
+	!plugins? ( !pam !down-root )
+	inotify? ( plugins )
+"
+
+CDEPEND="
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2[-minimal] )
+	)
+	lz4? ( app-arch/lz4 )
+	lzo? ( >=dev-libs/lzo-1.07 )
+	mbedtls? ( net-libs/mbedtls:0= )
+	openssl? ( >=dev-libs/openssl-0.9.8:0= )
+	pam? ( sys-libs/pam )
+	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
+	systemd? ( sys-apps/systemd )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	test? ( dev-util/cmocka )
+"
+RDEPEND="${CDEPEND}
+	acct-group/openvpn
+	acct-user/openvpn
+	selinux? ( sec-policy/selinux-openvpn )
+"
+
+if [[ ${PV} = "9999" ]]; then
+	BDEPEND+=" dev-python/docutils"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/openvpn-2.5.0-auth-pam-missing-header.patch
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~TUN"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local -a myeconfargs
+
+	if ! use mbedtls; then
+		myeconfargs+=(
+			$(use_enable pkcs11)
+		)
+	fi
+
+	myeconfargs+=(
+		$(use_enable inotify async-push)
+		--with-crypto-library=$(usex mbedtls mbedtls openssl)
+		$(use_enable lz4)
+		$(use_enable lzo)
+		$(use_enable plugins)
+		$(use_enable iproute2)
+		$(use_enable pam plugin-auth-pam)
+		$(use_enable down-root plugin-down-root)
+		$(use_enable systemd)
+	)
+
+	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
+		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
+		IPROUTE=$(usex iproute2 '/bin/ip' '') \
+		econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	local -x RUN_SUDO=false
+
+	elog "Running top-level tests"
+	emake check
+
+	pushd tests/unit_tests &>/dev/null || die
+	elog "Running unit tests"
+	emake check
+	popd &>/dev/null || die
+}
+
+src_install() {
+	default
+
+	find "${ED}/usr" -name '*.la' -delete || die
+
+	# install documentation
+	dodoc AUTHORS ChangeLog PORTS README README.IPv6
+
+	# Install some helper scripts
+	keepdir /etc/openvpn
+	exeinto /etc/openvpn
+	doexe "${FILESDIR}/up.sh"
+	doexe "${FILESDIR}/down.sh"
+
+	# Install the init script and config file
+	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
+	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
+
+	# install examples, controlled by the respective useflag
+	if use examples ; then
+		# (is the below comment relevant anymore?)
+		## dodoc does not supportly support directory traversal, #15193
+		docinto examples
+		dodoc -r sample contrib
+	fi
+
+	# https://bugs.gentoo.org/755680#c3
+	doman doc/openvpn.8
+}
+
+pkg_postinst() {
+	tmpfiles_process openvpn.conf
+
+	if use x64-macos ; then
+		elog "You might want to install tuntaposx for TAP interface support:"
+		elog "http://tuntaposx.sourceforge.net"
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd ; then
+		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
+		elog  ""
+		elog "server:"
+		elog ""
+		elog "- Place your server configuration file in /etc/openvpn/server"
+		elog "- Use the openvpn-server@.service like so"
+		elog "systemctl start openvpn-server@{Server-config}"
+		elog ""
+		elog "client:"
+		elog ""
+		elog "- Place your client configuration file in /etc/openvpn/client"
+		elog "- Use the openvpn-client@.service like so:"
+		elog "systemctl start openvpn-client@{Client-config}"
+	else
+		elog "The openvpn init script expects to find the configuration file"
+		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
+		elog ""
+		elog "To create more VPNs, simply create a new .conf file for it and"
+		elog "then create a symlink to the openvpn init script from a link called"
+		elog "openvpn.newconfname - like so"
+		elog "	 cd /etc/openvpn"
+		elog "	 ${EDITOR##*/} foo.conf"
+		elog "	 cd /etc/init.d"
+		elog "	 ln -s openvpn openvpn.foo"
+		elog ""
+		elog "You can then treat openvpn.foo as any other service, so you can"
+		elog "stop one vpn and start another if you need to."
+	fi
+
+	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
+		ewarn ""
+		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
+		ewarn "a client by our init script and as such we force up,down scripts."
+		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
+		ewarn "can move your scripts to."
+	fi
+
+	if use plugins ; then
+		einfo ""
+		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
+	fi
+}
diff --git a/net-vpn/openvpn/openvpn-2.5.7-r1.ebuild b/net-vpn/openvpn/openvpn-2.5.7-r1.ebuild
deleted file mode 100644
index d4f1ab61a2e6..000000000000
--- a/net-vpn/openvpn/openvpn-2.5.7-r1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd linux-info tmpfiles
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-HOMEPAGE="https://openvpn.net/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
-	EGIT_SUBMODULES=(-cmocka)
-
-	inherit git-r3
-else
-	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
-IUSE+=" pam pkcs11 +plugins selinux systemd test"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( openssl mbedtls )
-	pkcs11? ( !mbedtls )
-	!plugins? ( !pam !down-root )
-	inotify? ( plugins )
-"
-
-CDEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] )
-	)
-	lz4? ( app-arch/lz4 )
-	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
-	openssl? ( >=dev-libs/openssl-0.9.8:0= )
-	pam? ( sys-libs/pam )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
-	systemd? ( sys-apps/systemd )
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
-	test? ( dev-util/cmocka )
-"
-RDEPEND="${CDEPEND}
-	acct-group/openvpn
-	acct-user/openvpn
-	selinux? ( sec-policy/selinux-openvpn )
-"
-
-if [[ ${PV} = "9999" ]]; then
-	BDEPEND+=" dev-python/docutils"
-fi
-
-pkg_setup() {
-	local CONFIG_CHECK="~TUN"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local -a myeconfargs
-
-	if ! use mbedtls; then
-		myeconfargs+=(
-			$(use_enable pkcs11)
-		)
-	fi
-
-	myeconfargs+=(
-		$(use_enable inotify async-push)
-		--with-crypto-library=$(usex mbedtls mbedtls openssl)
-		$(use_enable lz4)
-		$(use_enable lzo)
-		$(use_enable plugins)
-		$(use_enable iproute2)
-		$(use_enable pam plugin-auth-pam)
-		$(use_enable down-root plugin-down-root)
-		$(use_enable systemd)
-	)
-
-	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
-		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
-		IPROUTE=$(usex iproute2 '/bin/ip' '') \
-		econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	local -x RUN_SUDO=false
-
-	elog "Running top-level tests"
-	emake check
-
-	pushd tests/unit_tests &>/dev/null || die
-	elog "Running unit tests"
-	emake check
-	popd &>/dev/null || die
-}
-
-src_install() {
-	default
-
-	find "${ED}/usr" -name '*.la' -delete || die
-
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README README.IPv6
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# (is the below comment relevant anymore?)
-		## dodoc does not supportly support directory traversal, #15193
-		docinto examples
-		dodoc -r sample contrib
-	fi
-
-	# https://bugs.gentoo.org/755680#c3
-	doman doc/openvpn.8
-}
-
-pkg_postinst() {
-	tmpfiles_process openvpn.conf
-
-	if use x64-macos ; then
-		elog "You might want to install tuntaposx for TAP interface support:"
-		elog "http://tuntaposx.sourceforge.net"
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd ; then
-		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
-		elog  ""
-		elog "server:"
-		elog ""
-		elog "- Place your server configuration file in /etc/openvpn/server"
-		elog "- Use the openvpn-server@.service like so"
-		elog "systemctl start openvpn-server@{Server-config}"
-		elog ""
-		elog "client:"
-		elog ""
-		elog "- Place your client configuration file in /etc/openvpn/client"
-		elog "- Use the openvpn-client@.service like so:"
-		elog "systemctl start openvpn-client@{Client-config}"
-	else
-		elog "The openvpn init script expects to find the configuration file"
-		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-		elog ""
-		elog "To create more VPNs, simply create a new .conf file for it and"
-		elog "then create a symlink to the openvpn init script from a link called"
-		elog "openvpn.newconfname - like so"
-		elog "	 cd /etc/openvpn"
-		elog "	 ${EDITOR##*/} foo.conf"
-		elog "	 cd /etc/init.d"
-		elog "	 ln -s openvpn openvpn.foo"
-		elog ""
-		elog "You can then treat openvpn.foo as any other service, so you can"
-		elog "stop one vpn and start another if you need to."
-	fi
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if use plugins ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
-	fi
-}
diff --git a/net-vpn/openvpn/openvpn-2.5.7-r2.ebuild b/net-vpn/openvpn/openvpn-2.5.7-r2.ebuild
new file mode 100644
index 000000000000..0a59debf1b92
--- /dev/null
+++ b/net-vpn/openvpn/openvpn-2.5.7-r2.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd linux-info tmpfiles
+
+DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
+HOMEPAGE="https://openvpn.net/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
+	EGIT_SUBMODULES=(-cmocka)
+
+	inherit git-r3
+else
+	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
+IUSE+=" pam pkcs11 +plugins selinux systemd test"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	^^ ( openssl mbedtls )
+	pkcs11? ( !mbedtls )
+	!plugins? ( !pam !down-root )
+	inotify? ( plugins )
+"
+
+CDEPEND="
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2[-minimal] )
+	)
+	lz4? ( app-arch/lz4 )
+	lzo? ( >=dev-libs/lzo-1.07 )
+	mbedtls? ( net-libs/mbedtls:0= )
+	openssl? ( >=dev-libs/openssl-0.9.8:0= )
+	pam? ( sys-libs/pam )
+	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
+	systemd? ( sys-apps/systemd )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	test? ( dev-util/cmocka )
+"
+RDEPEND="${CDEPEND}
+	acct-group/openvpn
+	acct-user/openvpn
+	selinux? ( sec-policy/selinux-openvpn )
+"
+
+if [[ ${PV} = "9999" ]]; then
+	BDEPEND+=" dev-python/docutils"
+fi
+
+pkg_setup() {
+	local CONFIG_CHECK="~TUN"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local -a myeconfargs
+
+	if ! use mbedtls; then
+		myeconfargs+=(
+			$(use_enable pkcs11)
+		)
+	fi
+
+	myeconfargs+=(
+		$(use_enable inotify async-push)
+		--with-crypto-library=$(usex mbedtls mbedtls openssl)
+		$(use_enable lz4)
+		$(use_enable lzo)
+		$(use_enable plugins)
+		$(use_enable iproute2)
+		$(use_enable pam plugin-auth-pam)
+		$(use_enable down-root plugin-down-root)
+		$(use_enable systemd)
+	)
+
+	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
+		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
+		IPROUTE=$(usex iproute2 '/bin/ip' '') \
+		econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	local -x RUN_SUDO=false
+
+	elog "Running top-level tests"
+	emake check
+
+	pushd tests/unit_tests &>/dev/null || die
+	elog "Running unit tests"
+	emake check
+	popd &>/dev/null || die
+}
+
+src_install() {
+	default
+
+	find "${ED}/usr" -name '*.la' -delete || die
+
+	# install documentation
+	dodoc AUTHORS ChangeLog PORTS README README.IPv6
+
+	# Install some helper scripts
+	keepdir /etc/openvpn
+	exeinto /etc/openvpn
+	doexe "${FILESDIR}/up.sh"
+	doexe "${FILESDIR}/down.sh"
+
+	# Install the init script and config file
+	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
+	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
+
+	# install examples, controlled by the respective useflag
+	if use examples ; then
+		# (is the below comment relevant anymore?)
+		## dodoc does not supportly support directory traversal, #15193
+		docinto examples
+		dodoc -r sample contrib
+	fi
+
+	# https://bugs.gentoo.org/755680#c3
+	doman doc/openvpn.8
+}
+
+pkg_postinst() {
+	tmpfiles_process openvpn.conf
+
+	if use x64-macos ; then
+		elog "You might want to install tuntaposx for TAP interface support:"
+		elog "http://tuntaposx.sourceforge.net"
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd ; then
+		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
+		elog  ""
+		elog "server:"
+		elog ""
+		elog "- Place your server configuration file in /etc/openvpn/server"
+		elog "- Use the openvpn-server@.service like so"
+		elog "systemctl start openvpn-server@{Server-config}"
+		elog ""
+		elog "client:"
+		elog ""
+		elog "- Place your client configuration file in /etc/openvpn/client"
+		elog "- Use the openvpn-client@.service like so:"
+		elog "systemctl start openvpn-client@{Client-config}"
+	else
+		elog "The openvpn init script expects to find the configuration file"
+		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
+		elog ""
+		elog "To create more VPNs, simply create a new .conf file for it and"
+		elog "then create a symlink to the openvpn init script from a link called"
+		elog "openvpn.newconfname - like so"
+		elog "	 cd /etc/openvpn"
+		elog "	 ${EDITOR##*/} foo.conf"
+		elog "	 cd /etc/init.d"
+		elog "	 ln -s openvpn openvpn.foo"
+		elog ""
+		elog "You can then treat openvpn.foo as any other service, so you can"
+		elog "stop one vpn and start another if you need to."
+	fi
+
+	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
+		ewarn ""
+		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
+		ewarn "a client by our init script and as such we force up,down scripts."
+		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
+		ewarn "can move your scripts to."
+	fi
+
+	if use plugins ; then
+		einfo ""
+		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
+	fi
+}
diff --git a/net-vpn/openvpn/openvpn-2.6.12-r1.ebuild b/net-vpn/openvpn/openvpn-2.6.12-r1.ebuild
new file mode 100644
index 000000000000..ca32558901d9
--- /dev/null
+++ b/net-vpn/openvpn/openvpn-2.6.12-r1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd linux-info tmpfiles
+
+DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
+HOMEPAGE="https://openvpn.net/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="dco down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
+IUSE+=" pam pkcs11 +plugins selinux systemd test"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	^^ ( openssl mbedtls )
+	pkcs11? ( !mbedtls )
+	!plugins? ( !pam !down-root )
+	inotify? ( plugins )
+	dco? ( !iproute2 )
+"
+
+COMMON_DEPEND="
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2[-minimal] )
+	)
+	lz4? ( app-arch/lz4 )
+	lzo? ( >=dev-libs/lzo-1.07 )
+	mbedtls? ( net-libs/mbedtls:0= )
+	openssl? ( >=dev-libs/openssl-1.0.2:0= )
+	pam? ( sys-libs/pam )
+	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
+	systemd? ( sys-apps/systemd )
+	dco? ( >=net-vpn/ovpn-dco-0.2 >=dev-libs/libnl-3.2.29:= )
+	sys-libs/libcap-ng:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-util/cmocka )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/openvpn
+	acct-user/openvpn
+	selinux? ( sec-policy/selinux-openvpn )
+"
+
+if [[ ${PV} = "9999" ]]; then
+	BDEPEND+=" dev-python/docutils"
+fi
+
+pkg_setup() {
+	local CONFIG_CHECK="~TUN"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local -a myeconfargs
+
+	if ! use mbedtls; then
+		myeconfargs+=(
+			$(use_enable pkcs11)
+		)
+	fi
+
+	myeconfargs+=(
+		$(use_enable inotify async-push)
+		--with-crypto-library=$(usex mbedtls mbedtls openssl)
+		$(use_enable lz4)
+		$(use_enable lzo)
+		$(use_enable plugins)
+		$(use_enable iproute2)
+		$(use_enable pam plugin-auth-pam)
+		$(use_enable down-root plugin-down-root)
+		$(use_enable systemd)
+		$(use_enable dco)
+	)
+
+	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
+		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
+		IPROUTE=$(usex iproute2 '/bin/ip' '') \
+		econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	local -x RUN_SUDO=false
+
+	elog "Running top-level tests"
+	emake check
+
+	pushd tests/unit_tests &>/dev/null || die
+	elog "Running unit tests"
+	emake check
+	popd &>/dev/null || die
+}
+
+src_install() {
+	default
+
+	find "${ED}/usr" -name '*.la' -delete || die
+
+	# install documentation
+	dodoc AUTHORS ChangeLog PORTS README
+
+	# Install some helper scripts
+	keepdir /etc/openvpn
+	exeinto /etc/openvpn
+	doexe "${FILESDIR}/up.sh"
+	doexe "${FILESDIR}/down.sh"
+
+	# Install the init script and config file
+	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
+	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
+
+	# install examples, controlled by the respective useflag
+	if use examples ; then
+		# (is the below comment relevant anymore?)
+		## dodoc does not supportly support directory traversal, #15193
+		docinto examples
+		dodoc -r sample contrib
+	fi
+
+	# https://bugs.gentoo.org/755680#c3
+	doman doc/openvpn.8
+}
+
+pkg_postinst() {
+	tmpfiles_process openvpn.conf
+
+	if use x64-macos ; then
+		elog "You might want to install tuntaposx for TAP interface support:"
+		elog "http://tuntaposx.sourceforge.net"
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd ; then
+		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
+		elog  ""
+		elog "server:"
+		elog ""
+		elog "- Place your server configuration file in /etc/openvpn/server"
+		elog "- Use the openvpn-server@.service like so"
+		elog "systemctl start openvpn-server@{Server-config}"
+		elog ""
+		elog "client:"
+		elog ""
+		elog "- Place your client configuration file in /etc/openvpn/client"
+		elog "- Use the openvpn-client@.service like so:"
+		elog "systemctl start openvpn-client@{Client-config}"
+	else
+		elog "The openvpn init script expects to find the configuration file"
+		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
+		elog ""
+		elog "To create more VPNs, simply create a new .conf file for it and"
+		elog "then create a symlink to the openvpn init script from a link called"
+		elog "openvpn.newconfname - like so"
+		elog "	 cd /etc/openvpn"
+		elog "	 ${EDITOR##*/} foo.conf"
+		elog "	 cd /etc/init.d"
+		elog "	 ln -s openvpn openvpn.foo"
+		elog ""
+		elog "You can then treat openvpn.foo as any other service, so you can"
+		elog "stop one vpn and start another if you need to."
+	fi
+
+	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
+		ewarn ""
+		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
+		ewarn "a client by our init script and as such we force up,down scripts."
+		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
+		ewarn "can move your scripts to."
+	fi
+
+	if use plugins ; then
+		einfo ""
+		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
+	fi
+}
diff --git a/net-vpn/openvpn/openvpn-2.6.12.ebuild b/net-vpn/openvpn/openvpn-2.6.12.ebuild
deleted file mode 100644
index ebad808e6e1f..000000000000
--- a/net-vpn/openvpn/openvpn-2.6.12.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd linux-info tmpfiles
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-HOMEPAGE="https://openvpn.net/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="dco down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
-IUSE+=" pam pkcs11 +plugins selinux systemd test"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( openssl mbedtls )
-	pkcs11? ( !mbedtls )
-	!plugins? ( !pam !down-root )
-	inotify? ( plugins )
-	dco? ( !iproute2 )
-"
-
-COMMON_DEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] )
-	)
-	lz4? ( app-arch/lz4 )
-	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
-	openssl? ( >=dev-libs/openssl-1.0.2:0= )
-	pam? ( sys-libs/pam )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
-	systemd? ( sys-apps/systemd )
-	dco? ( >=net-vpn/ovpn-dco-0.2 >=dev-libs/libnl-3.2.29:= )
-	sys-libs/libcap-ng:=
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-util/cmocka )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	acct-group/openvpn
-	acct-user/openvpn
-	selinux? ( sec-policy/selinux-openvpn )
-"
-
-if [[ ${PV} = "9999" ]]; then
-	BDEPEND+=" dev-python/docutils"
-fi
-
-pkg_setup() {
-	local CONFIG_CHECK="~TUN"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local -a myeconfargs
-
-	if ! use mbedtls; then
-		myeconfargs+=(
-			$(use_enable pkcs11)
-		)
-	fi
-
-	myeconfargs+=(
-		$(use_enable inotify async-push)
-		--with-crypto-library=$(usex mbedtls mbedtls openssl)
-		$(use_enable lz4)
-		$(use_enable lzo)
-		$(use_enable plugins)
-		$(use_enable iproute2)
-		$(use_enable pam plugin-auth-pam)
-		$(use_enable down-root plugin-down-root)
-		$(use_enable systemd)
-		$(use_enable dco)
-	)
-
-	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
-		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
-		IPROUTE=$(usex iproute2 '/bin/ip' '') \
-		econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	local -x RUN_SUDO=false
-
-	elog "Running top-level tests"
-	emake check
-
-	pushd tests/unit_tests &>/dev/null || die
-	elog "Running unit tests"
-	emake check
-	popd &>/dev/null || die
-}
-
-src_install() {
-	default
-
-	find "${ED}/usr" -name '*.la' -delete || die
-
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# (is the below comment relevant anymore?)
-		## dodoc does not supportly support directory traversal, #15193
-		docinto examples
-		dodoc -r sample contrib
-	fi
-
-	# https://bugs.gentoo.org/755680#c3
-	doman doc/openvpn.8
-}
-
-pkg_postinst() {
-	tmpfiles_process openvpn.conf
-
-	if use x64-macos ; then
-		elog "You might want to install tuntaposx for TAP interface support:"
-		elog "http://tuntaposx.sourceforge.net"
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd ; then
-		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
-		elog  ""
-		elog "server:"
-		elog ""
-		elog "- Place your server configuration file in /etc/openvpn/server"
-		elog "- Use the openvpn-server@.service like so"
-		elog "systemctl start openvpn-server@{Server-config}"
-		elog ""
-		elog "client:"
-		elog ""
-		elog "- Place your client configuration file in /etc/openvpn/client"
-		elog "- Use the openvpn-client@.service like so:"
-		elog "systemctl start openvpn-client@{Client-config}"
-	else
-		elog "The openvpn init script expects to find the configuration file"
-		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-		elog ""
-		elog "To create more VPNs, simply create a new .conf file for it and"
-		elog "then create a symlink to the openvpn init script from a link called"
-		elog "openvpn.newconfname - like so"
-		elog "	 cd /etc/openvpn"
-		elog "	 ${EDITOR##*/} foo.conf"
-		elog "	 cd /etc/init.d"
-		elog "	 ln -s openvpn openvpn.foo"
-		elog ""
-		elog "You can then treat openvpn.foo as any other service, so you can"
-		elog "stop one vpn and start another if you need to."
-	fi
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if use plugins ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
-	fi
-}
diff --git a/net-vpn/openvpn/openvpn-2.6.4-r1.ebuild b/net-vpn/openvpn/openvpn-2.6.4-r1.ebuild
new file mode 100644
index 000000000000..810f3c52ed89
--- /dev/null
+++ b/net-vpn/openvpn/openvpn-2.6.4-r1.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd linux-info tmpfiles
+
+DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
+HOMEPAGE="https://openvpn.net/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="dco down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
+IUSE+=" pam pkcs11 +plugins selinux systemd test"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	^^ ( openssl mbedtls )
+	pkcs11? ( !mbedtls )
+	!plugins? ( !pam !down-root )
+	inotify? ( plugins )
+	dco? ( !iproute2 )
+"
+
+CDEPEND="
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2[-minimal] )
+	)
+	lz4? ( app-arch/lz4 )
+	lzo? ( >=dev-libs/lzo-1.07 )
+	mbedtls? ( net-libs/mbedtls:0= )
+	openssl? ( >=dev-libs/openssl-1.0.2:0= )
+	pam? ( sys-libs/pam )
+	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
+	systemd? ( sys-apps/systemd )
+	dco? ( >=net-vpn/ovpn-dco-0.2 >=dev-libs/libnl-3.2.29:= )
+	sys-libs/libcap-ng:=
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	test? ( dev-util/cmocka )
+"
+RDEPEND="${CDEPEND}
+	acct-group/openvpn
+	acct-user/openvpn
+	selinux? ( sec-policy/selinux-openvpn )
+"
+
+if [[ ${PV} = "9999" ]]; then
+	BDEPEND+=" dev-python/docutils"
+fi
+
+pkg_setup() {
+	local CONFIG_CHECK="~TUN"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local -a myeconfargs
+
+	if ! use mbedtls; then
+		myeconfargs+=(
+			$(use_enable pkcs11)
+		)
+	fi
+
+	myeconfargs+=(
+		$(use_enable inotify async-push)
+		--with-crypto-library=$(usex mbedtls mbedtls openssl)
+		$(use_enable lz4)
+		$(use_enable lzo)
+		$(use_enable plugins)
+		$(use_enable iproute2)
+		$(use_enable pam plugin-auth-pam)
+		$(use_enable down-root plugin-down-root)
+		$(use_enable systemd)
+		$(use_enable dco)
+	)
+
+	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
+		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
+		IPROUTE=$(usex iproute2 '/bin/ip' '') \
+		econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	local -x RUN_SUDO=false
+
+	elog "Running top-level tests"
+	emake check
+
+	pushd tests/unit_tests &>/dev/null || die
+	elog "Running unit tests"
+	emake check
+	popd &>/dev/null || die
+}
+
+src_install() {
+	default
+
+	find "${ED}/usr" -name '*.la' -delete || die
+
+	# install documentation
+	dodoc AUTHORS ChangeLog PORTS README
+
+	# Install some helper scripts
+	keepdir /etc/openvpn
+	exeinto /etc/openvpn
+	doexe "${FILESDIR}/up.sh"
+	doexe "${FILESDIR}/down.sh"
+
+	# Install the init script and config file
+	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
+	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
+
+	# install examples, controlled by the respective useflag
+	if use examples ; then
+		# (is the below comment relevant anymore?)
+		## dodoc does not supportly support directory traversal, #15193
+		docinto examples
+		dodoc -r sample contrib
+	fi
+
+	# https://bugs.gentoo.org/755680#c3
+	doman doc/openvpn.8
+}
+
+pkg_postinst() {
+	tmpfiles_process openvpn.conf
+
+	if use x64-macos ; then
+		elog "You might want to install tuntaposx for TAP interface support:"
+		elog "http://tuntaposx.sourceforge.net"
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd ; then
+		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
+		elog  ""
+		elog "server:"
+		elog ""
+		elog "- Place your server configuration file in /etc/openvpn/server"
+		elog "- Use the openvpn-server@.service like so"
+		elog "systemctl start openvpn-server@{Server-config}"
+		elog ""
+		elog "client:"
+		elog ""
+		elog "- Place your client configuration file in /etc/openvpn/client"
+		elog "- Use the openvpn-client@.service like so:"
+		elog "systemctl start openvpn-client@{Client-config}"
+	else
+		elog "The openvpn init script expects to find the configuration file"
+		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
+		elog ""
+		elog "To create more VPNs, simply create a new .conf file for it and"
+		elog "then create a symlink to the openvpn init script from a link called"
+		elog "openvpn.newconfname - like so"
+		elog "	 cd /etc/openvpn"
+		elog "	 ${EDITOR##*/} foo.conf"
+		elog "	 cd /etc/init.d"
+		elog "	 ln -s openvpn openvpn.foo"
+		elog ""
+		elog "You can then treat openvpn.foo as any other service, so you can"
+		elog "stop one vpn and start another if you need to."
+	fi
+
+	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
+		ewarn ""
+		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
+		ewarn "a client by our init script and as such we force up,down scripts."
+		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
+		ewarn "can move your scripts to."
+	fi
+
+	if use plugins ; then
+		einfo ""
+		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
+	fi
+}
diff --git a/net-vpn/openvpn/openvpn-2.6.4.ebuild b/net-vpn/openvpn/openvpn-2.6.4.ebuild
deleted file mode 100644
index 5bc085c9c209..000000000000
--- a/net-vpn/openvpn/openvpn-2.6.4.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd linux-info tmpfiles
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-HOMEPAGE="https://openvpn.net/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="dco down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
-IUSE+=" pam pkcs11 +plugins selinux systemd test"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( openssl mbedtls )
-	pkcs11? ( !mbedtls )
-	!plugins? ( !pam !down-root )
-	inotify? ( plugins )
-	dco? ( !iproute2 )
-"
-
-CDEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] )
-	)
-	lz4? ( app-arch/lz4 )
-	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
-	openssl? ( >=dev-libs/openssl-1.0.2:0= )
-	pam? ( sys-libs/pam )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
-	systemd? ( sys-apps/systemd )
-	dco? ( >=net-vpn/ovpn-dco-0.2 >=dev-libs/libnl-3.2.29:= )
-	sys-libs/libcap-ng:=
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
-	test? ( dev-util/cmocka )
-"
-RDEPEND="${CDEPEND}
-	acct-group/openvpn
-	acct-user/openvpn
-	selinux? ( sec-policy/selinux-openvpn )
-"
-
-if [[ ${PV} = "9999" ]]; then
-	BDEPEND+=" dev-python/docutils"
-fi
-
-pkg_setup() {
-	local CONFIG_CHECK="~TUN"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local -a myeconfargs
-
-	if ! use mbedtls; then
-		myeconfargs+=(
-			$(use_enable pkcs11)
-		)
-	fi
-
-	myeconfargs+=(
-		$(use_enable inotify async-push)
-		--with-crypto-library=$(usex mbedtls mbedtls openssl)
-		$(use_enable lz4)
-		$(use_enable lzo)
-		$(use_enable plugins)
-		$(use_enable iproute2)
-		$(use_enable pam plugin-auth-pam)
-		$(use_enable down-root plugin-down-root)
-		$(use_enable systemd)
-		$(use_enable dco)
-	)
-
-	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
-		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
-		IPROUTE=$(usex iproute2 '/bin/ip' '') \
-		econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	local -x RUN_SUDO=false
-
-	elog "Running top-level tests"
-	emake check
-
-	pushd tests/unit_tests &>/dev/null || die
-	elog "Running unit tests"
-	emake check
-	popd &>/dev/null || die
-}
-
-src_install() {
-	default
-
-	find "${ED}/usr" -name '*.la' -delete || die
-
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# (is the below comment relevant anymore?)
-		## dodoc does not supportly support directory traversal, #15193
-		docinto examples
-		dodoc -r sample contrib
-	fi
-
-	# https://bugs.gentoo.org/755680#c3
-	doman doc/openvpn.8
-}
-
-pkg_postinst() {
-	tmpfiles_process openvpn.conf
-
-	if use x64-macos ; then
-		elog "You might want to install tuntaposx for TAP interface support:"
-		elog "http://tuntaposx.sourceforge.net"
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd ; then
-		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
-		elog  ""
-		elog "server:"
-		elog ""
-		elog "- Place your server configuration file in /etc/openvpn/server"
-		elog "- Use the openvpn-server@.service like so"
-		elog "systemctl start openvpn-server@{Server-config}"
-		elog ""
-		elog "client:"
-		elog ""
-		elog "- Place your client configuration file in /etc/openvpn/client"
-		elog "- Use the openvpn-client@.service like so:"
-		elog "systemctl start openvpn-client@{Client-config}"
-	else
-		elog "The openvpn init script expects to find the configuration file"
-		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-		elog ""
-		elog "To create more VPNs, simply create a new .conf file for it and"
-		elog "then create a symlink to the openvpn init script from a link called"
-		elog "openvpn.newconfname - like so"
-		elog "	 cd /etc/openvpn"
-		elog "	 ${EDITOR##*/} foo.conf"
-		elog "	 cd /etc/init.d"
-		elog "	 ln -s openvpn openvpn.foo"
-		elog ""
-		elog "You can then treat openvpn.foo as any other service, so you can"
-		elog "stop one vpn and start another if you need to."
-	fi
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if use plugins ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
-	fi
-}
diff --git a/net-vpn/openvpn/openvpn-2.6.8-r1.ebuild b/net-vpn/openvpn/openvpn-2.6.8-r1.ebuild
new file mode 100644
index 000000000000..5302cbd095f6
--- /dev/null
+++ b/net-vpn/openvpn/openvpn-2.6.8-r1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd linux-info tmpfiles
+
+DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
+HOMEPAGE="https://openvpn.net/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="dco down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
+IUSE+=" pam pkcs11 +plugins selinux systemd test"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	^^ ( openssl mbedtls )
+	pkcs11? ( !mbedtls )
+	!plugins? ( !pam !down-root )
+	inotify? ( plugins )
+	dco? ( !iproute2 )
+"
+
+COMMON_DEPEND="
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2[-minimal] )
+	)
+	lz4? ( app-arch/lz4 )
+	lzo? ( >=dev-libs/lzo-1.07 )
+	mbedtls? ( net-libs/mbedtls:0= )
+	openssl? ( >=dev-libs/openssl-1.0.2:0= )
+	pam? ( sys-libs/pam )
+	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
+	systemd? ( sys-apps/systemd )
+	dco? ( >=net-vpn/ovpn-dco-0.2 >=dev-libs/libnl-3.2.29:= )
+	sys-libs/libcap-ng:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-util/cmocka )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/openvpn
+	acct-user/openvpn
+	selinux? ( sec-policy/selinux-openvpn )
+"
+
+if [[ ${PV} = "9999" ]]; then
+	BDEPEND+=" dev-python/docutils"
+fi
+
+pkg_setup() {
+	local CONFIG_CHECK="~TUN"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local -a myeconfargs
+
+	if ! use mbedtls; then
+		myeconfargs+=(
+			$(use_enable pkcs11)
+		)
+	fi
+
+	myeconfargs+=(
+		$(use_enable inotify async-push)
+		--with-crypto-library=$(usex mbedtls mbedtls openssl)
+		$(use_enable lz4)
+		$(use_enable lzo)
+		$(use_enable plugins)
+		$(use_enable iproute2)
+		$(use_enable pam plugin-auth-pam)
+		$(use_enable down-root plugin-down-root)
+		$(use_enable systemd)
+		$(use_enable dco)
+	)
+
+	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
+		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
+		IPROUTE=$(usex iproute2 '/bin/ip' '') \
+		econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	local -x RUN_SUDO=false
+
+	elog "Running top-level tests"
+	emake check
+
+	pushd tests/unit_tests &>/dev/null || die
+	elog "Running unit tests"
+	emake check
+	popd &>/dev/null || die
+}
+
+src_install() {
+	default
+
+	find "${ED}/usr" -name '*.la' -delete || die
+
+	# install documentation
+	dodoc AUTHORS ChangeLog PORTS README
+
+	# Install some helper scripts
+	keepdir /etc/openvpn
+	exeinto /etc/openvpn
+	doexe "${FILESDIR}/up.sh"
+	doexe "${FILESDIR}/down.sh"
+
+	# Install the init script and config file
+	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
+	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
+
+	# install examples, controlled by the respective useflag
+	if use examples ; then
+		# (is the below comment relevant anymore?)
+		## dodoc does not supportly support directory traversal, #15193
+		docinto examples
+		dodoc -r sample contrib
+	fi
+
+	# https://bugs.gentoo.org/755680#c3
+	doman doc/openvpn.8
+}
+
+pkg_postinst() {
+	tmpfiles_process openvpn.conf
+
+	if use x64-macos ; then
+		elog "You might want to install tuntaposx for TAP interface support:"
+		elog "http://tuntaposx.sourceforge.net"
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd ; then
+		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
+		elog  ""
+		elog "server:"
+		elog ""
+		elog "- Place your server configuration file in /etc/openvpn/server"
+		elog "- Use the openvpn-server@.service like so"
+		elog "systemctl start openvpn-server@{Server-config}"
+		elog ""
+		elog "client:"
+		elog ""
+		elog "- Place your client configuration file in /etc/openvpn/client"
+		elog "- Use the openvpn-client@.service like so:"
+		elog "systemctl start openvpn-client@{Client-config}"
+	else
+		elog "The openvpn init script expects to find the configuration file"
+		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
+		elog ""
+		elog "To create more VPNs, simply create a new .conf file for it and"
+		elog "then create a symlink to the openvpn init script from a link called"
+		elog "openvpn.newconfname - like so"
+		elog "	 cd /etc/openvpn"
+		elog "	 ${EDITOR##*/} foo.conf"
+		elog "	 cd /etc/init.d"
+		elog "	 ln -s openvpn openvpn.foo"
+		elog ""
+		elog "You can then treat openvpn.foo as any other service, so you can"
+		elog "stop one vpn and start another if you need to."
+	fi
+
+	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
+		ewarn ""
+		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
+		ewarn "a client by our init script and as such we force up,down scripts."
+		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
+		ewarn "can move your scripts to."
+	fi
+
+	if use plugins ; then
+		einfo ""
+		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
+	fi
+}
diff --git a/net-vpn/openvpn/openvpn-2.6.8.ebuild b/net-vpn/openvpn/openvpn-2.6.8.ebuild
deleted file mode 100644
index a454e266b420..000000000000
--- a/net-vpn/openvpn/openvpn-2.6.8.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd linux-info tmpfiles
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-HOMEPAGE="https://openvpn.net/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="dco down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
-IUSE+=" pam pkcs11 +plugins selinux systemd test"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( openssl mbedtls )
-	pkcs11? ( !mbedtls )
-	!plugins? ( !pam !down-root )
-	inotify? ( plugins )
-	dco? ( !iproute2 )
-"
-
-COMMON_DEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] )
-	)
-	lz4? ( app-arch/lz4 )
-	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
-	openssl? ( >=dev-libs/openssl-1.0.2:0= )
-	pam? ( sys-libs/pam )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
-	systemd? ( sys-apps/systemd )
-	dco? ( >=net-vpn/ovpn-dco-0.2 >=dev-libs/libnl-3.2.29:= )
-	sys-libs/libcap-ng:=
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-util/cmocka )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	acct-group/openvpn
-	acct-user/openvpn
-	selinux? ( sec-policy/selinux-openvpn )
-"
-
-if [[ ${PV} = "9999" ]]; then
-	BDEPEND+=" dev-python/docutils"
-fi
-
-pkg_setup() {
-	local CONFIG_CHECK="~TUN"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local -a myeconfargs
-
-	if ! use mbedtls; then
-		myeconfargs+=(
-			$(use_enable pkcs11)
-		)
-	fi
-
-	myeconfargs+=(
-		$(use_enable inotify async-push)
-		--with-crypto-library=$(usex mbedtls mbedtls openssl)
-		$(use_enable lz4)
-		$(use_enable lzo)
-		$(use_enable plugins)
-		$(use_enable iproute2)
-		$(use_enable pam plugin-auth-pam)
-		$(use_enable down-root plugin-down-root)
-		$(use_enable systemd)
-		$(use_enable dco)
-	)
-
-	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
-		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
-		IPROUTE=$(usex iproute2 '/bin/ip' '') \
-		econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	local -x RUN_SUDO=false
-
-	elog "Running top-level tests"
-	emake check
-
-	pushd tests/unit_tests &>/dev/null || die
-	elog "Running unit tests"
-	emake check
-	popd &>/dev/null || die
-}
-
-src_install() {
-	default
-
-	find "${ED}/usr" -name '*.la' -delete || die
-
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# (is the below comment relevant anymore?)
-		## dodoc does not supportly support directory traversal, #15193
-		docinto examples
-		dodoc -r sample contrib
-	fi
-
-	# https://bugs.gentoo.org/755680#c3
-	doman doc/openvpn.8
-}
-
-pkg_postinst() {
-	tmpfiles_process openvpn.conf
-
-	if use x64-macos ; then
-		elog "You might want to install tuntaposx for TAP interface support:"
-		elog "http://tuntaposx.sourceforge.net"
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd ; then
-		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
-		elog  ""
-		elog "server:"
-		elog ""
-		elog "- Place your server configuration file in /etc/openvpn/server"
-		elog "- Use the openvpn-server@.service like so"
-		elog "systemctl start openvpn-server@{Server-config}"
-		elog ""
-		elog "client:"
-		elog ""
-		elog "- Place your client configuration file in /etc/openvpn/client"
-		elog "- Use the openvpn-client@.service like so:"
-		elog "systemctl start openvpn-client@{Client-config}"
-	else
-		elog "The openvpn init script expects to find the configuration file"
-		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-		elog ""
-		elog "To create more VPNs, simply create a new .conf file for it and"
-		elog "then create a symlink to the openvpn init script from a link called"
-		elog "openvpn.newconfname - like so"
-		elog "	 cd /etc/openvpn"
-		elog "	 ${EDITOR##*/} foo.conf"
-		elog "	 cd /etc/init.d"
-		elog "	 ln -s openvpn openvpn.foo"
-		elog ""
-		elog "You can then treat openvpn.foo as any other service, so you can"
-		elog "stop one vpn and start another if you need to."
-	fi
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if use plugins ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
-	fi
-}
diff --git a/net-vpn/openvpn/openvpn-2.6.9-r1.ebuild b/net-vpn/openvpn/openvpn-2.6.9-r1.ebuild
new file mode 100644
index 000000000000..5302cbd095f6
--- /dev/null
+++ b/net-vpn/openvpn/openvpn-2.6.9-r1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd linux-info tmpfiles
+
+DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
+HOMEPAGE="https://openvpn.net/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="dco down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
+IUSE+=" pam pkcs11 +plugins selinux systemd test"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	^^ ( openssl mbedtls )
+	pkcs11? ( !mbedtls )
+	!plugins? ( !pam !down-root )
+	inotify? ( plugins )
+	dco? ( !iproute2 )
+"
+
+COMMON_DEPEND="
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2[-minimal] )
+	)
+	lz4? ( app-arch/lz4 )
+	lzo? ( >=dev-libs/lzo-1.07 )
+	mbedtls? ( net-libs/mbedtls:0= )
+	openssl? ( >=dev-libs/openssl-1.0.2:0= )
+	pam? ( sys-libs/pam )
+	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
+	systemd? ( sys-apps/systemd )
+	dco? ( >=net-vpn/ovpn-dco-0.2 >=dev-libs/libnl-3.2.29:= )
+	sys-libs/libcap-ng:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-util/cmocka )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/openvpn
+	acct-user/openvpn
+	selinux? ( sec-policy/selinux-openvpn )
+"
+
+if [[ ${PV} = "9999" ]]; then
+	BDEPEND+=" dev-python/docutils"
+fi
+
+pkg_setup() {
+	local CONFIG_CHECK="~TUN"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local -a myeconfargs
+
+	if ! use mbedtls; then
+		myeconfargs+=(
+			$(use_enable pkcs11)
+		)
+	fi
+
+	myeconfargs+=(
+		$(use_enable inotify async-push)
+		--with-crypto-library=$(usex mbedtls mbedtls openssl)
+		$(use_enable lz4)
+		$(use_enable lzo)
+		$(use_enable plugins)
+		$(use_enable iproute2)
+		$(use_enable pam plugin-auth-pam)
+		$(use_enable down-root plugin-down-root)
+		$(use_enable systemd)
+		$(use_enable dco)
+	)
+
+	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
+		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
+		IPROUTE=$(usex iproute2 '/bin/ip' '') \
+		econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	local -x RUN_SUDO=false
+
+	elog "Running top-level tests"
+	emake check
+
+	pushd tests/unit_tests &>/dev/null || die
+	elog "Running unit tests"
+	emake check
+	popd &>/dev/null || die
+}
+
+src_install() {
+	default
+
+	find "${ED}/usr" -name '*.la' -delete || die
+
+	# install documentation
+	dodoc AUTHORS ChangeLog PORTS README
+
+	# Install some helper scripts
+	keepdir /etc/openvpn
+	exeinto /etc/openvpn
+	doexe "${FILESDIR}/up.sh"
+	doexe "${FILESDIR}/down.sh"
+
+	# Install the init script and config file
+	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
+	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
+
+	# install examples, controlled by the respective useflag
+	if use examples ; then
+		# (is the below comment relevant anymore?)
+		## dodoc does not supportly support directory traversal, #15193
+		docinto examples
+		dodoc -r sample contrib
+	fi
+
+	# https://bugs.gentoo.org/755680#c3
+	doman doc/openvpn.8
+}
+
+pkg_postinst() {
+	tmpfiles_process openvpn.conf
+
+	if use x64-macos ; then
+		elog "You might want to install tuntaposx for TAP interface support:"
+		elog "http://tuntaposx.sourceforge.net"
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd ; then
+		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
+		elog  ""
+		elog "server:"
+		elog ""
+		elog "- Place your server configuration file in /etc/openvpn/server"
+		elog "- Use the openvpn-server@.service like so"
+		elog "systemctl start openvpn-server@{Server-config}"
+		elog ""
+		elog "client:"
+		elog ""
+		elog "- Place your client configuration file in /etc/openvpn/client"
+		elog "- Use the openvpn-client@.service like so:"
+		elog "systemctl start openvpn-client@{Client-config}"
+	else
+		elog "The openvpn init script expects to find the configuration file"
+		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
+		elog ""
+		elog "To create more VPNs, simply create a new .conf file for it and"
+		elog "then create a symlink to the openvpn init script from a link called"
+		elog "openvpn.newconfname - like so"
+		elog "	 cd /etc/openvpn"
+		elog "	 ${EDITOR##*/} foo.conf"
+		elog "	 cd /etc/init.d"
+		elog "	 ln -s openvpn openvpn.foo"
+		elog ""
+		elog "You can then treat openvpn.foo as any other service, so you can"
+		elog "stop one vpn and start another if you need to."
+	fi
+
+	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
+		ewarn ""
+		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
+		ewarn "a client by our init script and as such we force up,down scripts."
+		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
+		ewarn "can move your scripts to."
+	fi
+
+	if use plugins ; then
+		einfo ""
+		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
+	fi
+}
diff --git a/net-vpn/openvpn/openvpn-2.6.9.ebuild b/net-vpn/openvpn/openvpn-2.6.9.ebuild
deleted file mode 100644
index a454e266b420..000000000000
--- a/net-vpn/openvpn/openvpn-2.6.9.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd linux-info tmpfiles
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-HOMEPAGE="https://openvpn.net/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="dco down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
-IUSE+=" pam pkcs11 +plugins selinux systemd test"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( openssl mbedtls )
-	pkcs11? ( !mbedtls )
-	!plugins? ( !pam !down-root )
-	inotify? ( plugins )
-	dco? ( !iproute2 )
-"
-
-COMMON_DEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] )
-	)
-	lz4? ( app-arch/lz4 )
-	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
-	openssl? ( >=dev-libs/openssl-1.0.2:0= )
-	pam? ( sys-libs/pam )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
-	systemd? ( sys-apps/systemd )
-	dco? ( >=net-vpn/ovpn-dco-0.2 >=dev-libs/libnl-3.2.29:= )
-	sys-libs/libcap-ng:=
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-util/cmocka )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	acct-group/openvpn
-	acct-user/openvpn
-	selinux? ( sec-policy/selinux-openvpn )
-"
-
-if [[ ${PV} = "9999" ]]; then
-	BDEPEND+=" dev-python/docutils"
-fi
-
-pkg_setup() {
-	local CONFIG_CHECK="~TUN"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local -a myeconfargs
-
-	if ! use mbedtls; then
-		myeconfargs+=(
-			$(use_enable pkcs11)
-		)
-	fi
-
-	myeconfargs+=(
-		$(use_enable inotify async-push)
-		--with-crypto-library=$(usex mbedtls mbedtls openssl)
-		$(use_enable lz4)
-		$(use_enable lzo)
-		$(use_enable plugins)
-		$(use_enable iproute2)
-		$(use_enable pam plugin-auth-pam)
-		$(use_enable down-root plugin-down-root)
-		$(use_enable systemd)
-		$(use_enable dco)
-	)
-
-	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
-		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
-		IPROUTE=$(usex iproute2 '/bin/ip' '') \
-		econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	local -x RUN_SUDO=false
-
-	elog "Running top-level tests"
-	emake check
-
-	pushd tests/unit_tests &>/dev/null || die
-	elog "Running unit tests"
-	emake check
-	popd &>/dev/null || die
-}
-
-src_install() {
-	default
-
-	find "${ED}/usr" -name '*.la' -delete || die
-
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# (is the below comment relevant anymore?)
-		## dodoc does not supportly support directory traversal, #15193
-		docinto examples
-		dodoc -r sample contrib
-	fi
-
-	# https://bugs.gentoo.org/755680#c3
-	doman doc/openvpn.8
-}
-
-pkg_postinst() {
-	tmpfiles_process openvpn.conf
-
-	if use x64-macos ; then
-		elog "You might want to install tuntaposx for TAP interface support:"
-		elog "http://tuntaposx.sourceforge.net"
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd ; then
-		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
-		elog  ""
-		elog "server:"
-		elog ""
-		elog "- Place your server configuration file in /etc/openvpn/server"
-		elog "- Use the openvpn-server@.service like so"
-		elog "systemctl start openvpn-server@{Server-config}"
-		elog ""
-		elog "client:"
-		elog ""
-		elog "- Place your client configuration file in /etc/openvpn/client"
-		elog "- Use the openvpn-client@.service like so:"
-		elog "systemctl start openvpn-client@{Client-config}"
-	else
-		elog "The openvpn init script expects to find the configuration file"
-		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-		elog ""
-		elog "To create more VPNs, simply create a new .conf file for it and"
-		elog "then create a symlink to the openvpn init script from a link called"
-		elog "openvpn.newconfname - like so"
-		elog "	 cd /etc/openvpn"
-		elog "	 ${EDITOR##*/} foo.conf"
-		elog "	 cd /etc/init.d"
-		elog "	 ln -s openvpn openvpn.foo"
-		elog ""
-		elog "You can then treat openvpn.foo as any other service, so you can"
-		elog "stop one vpn and start another if you need to."
-	fi
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if use plugins ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
-	fi
-}
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index ebad808e6e1f..ca32558901d9 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-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
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 	)
 	lz4? ( app-arch/lz4 )
 	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
+	mbedtls? ( net-libs/mbedtls:0= )
 	openssl? ( >=dev-libs/openssl-1.0.2:0= )
 	pam? ( sys-libs/pam )
 	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
diff --git a/net-vpn/strongswan/metadata.xml b/net-vpn/strongswan/metadata.xml
index c81edb750eb7..780a710b9622 100644
--- a/net-vpn/strongswan/metadata.xml
+++ b/net-vpn/strongswan/metadata.xml
@@ -30,33 +30,69 @@
 		<flag name="non-root">Force IKEv1/IKEv2 daemons to normal user privileges. This might impose some restrictions mainly to the IKEv1 daemon. Disable only if you really require superuser privileges.</flag>
 		<flag name="openssl">Enable <pkg>dev-libs/openssl</pkg> plugin which is required for Elliptic Curve Cryptography (DH groups 19-21,25,26) and ECDSA. Also provides 3DES, AES, Blowfish, Camellia, CAST, DES, IDEA and RC5 ciphers along with MD2, MD4, MD5 and SHA1/2 hash algorithms, RSA and DH groups 1,2,5,14-18 and 22-24(4.4+) <pkg>dev-libs/openssl</pkg> has to be compiled with USE="-bindist".</flag>
 		<flag name="pkcs11">Enable pkcs11 support</flag>
+		<flag name="strongswan_plugins_acert">Enable support for X.509 attribute certificates</flag>
 		<flag name="strongswan_plugins_addrblock">Enable support for the addrblock crypto plugin</flag>
+		<flag name="strongswan_plugins_aes">Enable support for the aes plugin</flag>
 		<flag name="strongswan_plugins_aesni">Enable support for Intel AES-NI crypto plugin</flag>
-		<flag name="strongswan_plugins_bypass-lan">Enable support for the bypass-lan plugin</flag>
-		<flag name="strongswan_plugins_chapoly">Enable ChaCha20/Poly1305 AEAD implementation and ChaCha20 XOF plugin</flag>
-		<flag name="strongswan_plugins_eap-radius">Enable EAP Radius plugin</flag>
-		<flag name="strongswan_plugins_forecast">Enable multicast and broadcast forwarding plugin</flag>
-		<flag name="strongswan_plugins_led">Enable support for the led plugin</flag>
-		<flag name="strongswan_plugins_lookip">Enable support for the lookip plugin</flag>
-		<flag name="strongswan_plugins_systime-fix">Enable support for the systime-fix plugin</flag>
-		<flag name="strongswan_plugins_unity">Enable support for the unity plugin</flag>
-		<flag name="strongswan_plugins_vici">Enable support for the vici plugin</flag>
+		<flag name="strongswan_plugins_af-alg">Enable support for the AF_ALG Linux kernel crypto API</flag>
+		<flag name="strongswan_plugins_agent">Enable support for RSA/ECDSA private keys</flag>
 		<flag name="strongswan_plugins_blowfish">Enable support for the blowfish plugin</flag>
+		<flag name="strongswan_plugins_botan">Enable support for the botan library plugin</flag>
+		<flag name="strongswan_plugins_bypass-lan">Enable support for the bypass-lan plugin</flag>
 		<flag name="strongswan_plugins_ccm">Enable support for the ccm plugin</flag>
+		<flag name="strongswan_plugins_chapoly">Enable ChaCha20/Poly1305 AEAD implementation and ChaCha20 XOF plugin</flag>
+		<flag name="strongswan_plugins_cmac">Enable support for the cmac plugin</flag>
 		<flag name="strongswan_plugins_ctr">Enable support for the ctr plugin</flag>
+		<flag name="strongswan_plugins_curve25519">Enable support for X25519 DH group and Ed25519 public key uthentication</flag>
+		<flag name="strongswan_plugins_des">Enable DES/3DES cipher implementation</flag>
+		<flag name="strongswan_plugins_dnskey">Enable support for parsing DNS public keys</flag>
+		<flag name="strongswan_plugins_drbg">Enable support for the drgb plugin</flag>
+		<flag name="strongswan_plugins_eap-radius">Enable EAP Radius plugin</flag>
 		<flag name="strongswan_plugins_error-notify">Enable support for the error-notify plugin</flag>
+		<flag name="strongswan_plugins_files">Enable support for local file:// URIs</flag>
+		<flag name="strongswan_plugins_fips-prf">Enable support for the fips-prf plugin</flag>
+		<flag name="strongswan_plugins_forecast">Enable multicast and broadcast forwarding plugin</flag>
 		<flag name="strongswan_plugins_gcm">Enable support for the gcm plugin</flag>
 		<flag name="strongswan_plugins_ha">Enable support for the ha plugin</flag>
+		<flag name="strongswan_plugins_hmac">Enable support for the hmac plugin</flag>
 		<flag name="strongswan_plugins_ipseckey">Enable support for the ipseckey plugin</flag>
 		<flag name="strongswan_plugins_kdf">Enable support for the kdf plugin</flag>
+		<flag name="strongswan_plugins_led">Enable support for the led plugin</flag>
+		<flag name="strongswan_plugins_lookip">Enable support for the lookip plugin</flag>
+		<flag name="strongswan_plugins_md4">Enable support for the md4 plugin</flag>
+		<flag name="strongswan_plugins_md5">Enable support for the md5 plugin</flag>
+		<flag name="strongswan_plugins_mgf1">Enable support for the mgf1 plugin</flag>
 		<flag name="strongswan_plugins_newhope">Enable plugin that allows key exchange based on post-quantum computer New Hope algorithm</flag>
+		<flag name="strongswan_plugins_nonce">Enable support the nonce plugin</flag>
 		<flag name="strongswan_plugins_ntru">Enable support for the ntru plugin</flag>
+		<flag name="strongswan_plugins_openxpki">Enable OCSP responder accessing OpenXPKI MySQL/MariaDB certificate database</flag>
 		<flag name="strongswan_plugins_padlock">Enable support for the padlock plugin</flag>
+		<flag name="strongswan_plugins_pem">Enable support for the pem plugin</flag>
+		<flag name="strongswan_plugins_pgp">Enable support for the pgp plugin</flag>
+		<flag name="strongswan_plugins_pkcs1">Enable pkcs1 support</flag>
+		<flag name="strongswan_plugins_pkcs12">Enable pkcs12 support</flag>
+		<flag name="strongswan_plugins_pkcs7">Enable pkcs7 support</flag>
+		<flag name="strongswan_plugins_pkcs8">Enable pkcs8 support</flag>
+		<flag name="strongswan_plugins_pubkey">Enable wrapper to handle raw public keys</flag>
+		<flag name="strongswan_plugins_random">Enable RNG support with /dev/[u]random</flag>
+		<flag name="strongswan_plugins_rc2">Enable plugin for RC2 support</flag>
 		<flag name="strongswan_plugins_rdrand">Enable support for the rdrand plugin</flag>
+		<flag name="strongswan_plugins_revocation">Enable X.509 CRL/OCSP revocation checking</flag>
 		<flag name="strongswan_plugins_save-keys">Enable plugin that saves IKE and/or ESP keys to files compatible with Wireshark (for debugging)</flag>
+		<flag name="strongswan_plugins_sha1">Enable plugin for SHA1 support</flag>
+		<flag name="strongswan_plugins_sha2">Enable plugin for SHA2 support</flag>
+		<flag name="strongswan_plugins_sha3">Enable plugin for SHA3 support</flag>
+		<flag name="strongswan_plugins_soup">Enable libsoup based HTTP fetcher</flag>
+		<flag name="strongswan_plugins_sshkey">Enable SSH key decoding routines</flag>
+		<flag name="strongswan_plugins_systime-fix">Enable support for the systime-fix plugin</flag>
+		<flag name="strongswan_plugins_test-vectors">Enable set of test vectors for various algorithms</flag>
 		<flag name="strongswan_plugins_unbound">Enable support for the unbound plugin</flag>
+		<flag name="strongswan_plugins_unity">Enable support for the unity plugin</flag>
+		<flag name="strongswan_plugins_vici">Enable support for the vici plugin</flag>
 		<flag name="strongswan_plugins_whitelist">Enable support for the whitelist plugin</flag>
+		<flag name="strongswan_plugins_x509">Enable plugin for advanced X.509 functionality</flag>
 		<flag name="strongswan_plugins_xauth-noauth">Enable support for the xauth-noauth plugin</flag>
+		<flag name="strongswan_plugins_xcbc">Enable support for XCBC plugin</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:strongswan:strongswan</remote-id>
diff --git a/net-vpn/strongswan/strongswan-5.9.14-r1.ebuild b/net-vpn/strongswan/strongswan-5.9.14-r1.ebuild
deleted file mode 100644
index 2e53e2a284f6..000000000000
--- a/net-vpn/strongswan/strongswan-5.9.14-r1.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-inherit linux-info systemd
-
-DESCRIPTION="IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE"
-HOMEPAGE="https://www.strongswan.org/"
-SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
-
-LICENSE="GPL-2 RSA DES"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
-
-STRONGSWAN_PLUGINS_STD="eap-radius gcm led lookip systime-fix unity vici"
-STRONGSWAN_PLUGINS_OPT_DISABLE="kdf"
-STRONGSWAN_PLUGINS_OPT="addrblock aesni blowfish bypass-lan ccm chapoly ctr error-notify forecast
-ha ipseckey newhope ntru padlock rdrand save-keys unbound whitelist
-xauth-noauth"
-for mod in $STRONGSWAN_PLUGINS_STD; do
-	IUSE="${IUSE} +strongswan_plugins_${mod}"
-done
-
-for mod in $STRONGSWAN_PLUGINS_OPT_DISABLE; do
-	IUSE="${IUSE} strongswan_plugins_${mod}"
-done
-
-for mod in $STRONGSWAN_PLUGINS_OPT; do
-	IUSE="${IUSE} strongswan_plugins_${mod}"
-done
-
-COMMON_DEPEND="non-root? (
-		acct-user/ipsec
-		acct-group/ipsec
-	)
-	dev-libs/glib:2
-	gmp? ( >=dev-libs/gmp-4.1.5:= )
-	gcrypt? ( dev-libs/libgcrypt:= )
-	caps? ( sys-libs/libcap )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap:= )
-	openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] )
-	mysql? ( dev-db/mysql-connector-c:= )
-	sqlite? ( >=dev-db/sqlite-3.3.1:3 )
-	systemd? ( sys-apps/systemd )
-	networkmanager? ( net-misc/networkmanager )
-	pam? ( sys-libs/pam )
-	strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources
-	sys-kernel/linux-headers"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2
-	!net-vpn/libreswan
-	selinux? ( sec-policy/selinux-ipsec )"
-
-UGID="ipsec"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	elog "Linux kernel version: ${KV_FULL}"
-
-	if ! kernel_is -ge 2 6 16; then
-		eerror
-		eerror "This ebuild currently only supports ${PN} with the"
-		eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
-		eerror
-	fi
-
-	if kernel_is -lt 2 6 34; then
-		ewarn
-		ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
-		ewarn
-
-		if kernel_is -lt 2 6 29; then
-			ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
-			ewarn "include all required IPv6 modules even if you just intend"
-			ewarn "to run on IPv4 only."
-			ewarn
-			ewarn "This has been fixed with kernels >= 2.6.29."
-			ewarn
-		fi
-
-		if kernel_is -lt 2 6 33; then
-			ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
-			ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
-			ewarn "miss SHA384 and SHA512 HMAC support altogether."
-			ewarn
-			ewarn "If you need any of those features, please use kernel >= 2.6.33."
-			ewarn
-		fi
-
-		if kernel_is -lt 2 6 34; then
-			ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
-			ewarn "ESP cipher is only included in kernels >= 2.6.34."
-			ewarn
-			ewarn "If you need it, please use kernel >= 2.6.34."
-			ewarn
-		fi
-	fi
-}
-
-src_configure() {
-	local myconf=""
-
-	if use non-root; then
-		myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
-	fi
-
-	# If a user has already enabled db support, those plugins will
-	# most likely be desired as well. Besides they don't impose new
-	# dependencies and come at no cost (except for space).
-	if use mysql || use sqlite; then
-		myconf="${myconf} --enable-attr-sql --enable-sql"
-	fi
-
-	# strongSwan builds and installs static libs by default which are
-	# useless to the user (and to strongSwan for that matter) because no
-	# header files or alike get installed... so disabling them is safe.
-	if use pam && use eap; then
-		myconf="${myconf} --enable-eap-gtc"
-	else
-		myconf="${myconf} --disable-eap-gtc"
-	fi
-
-	for mod in $STRONGSWAN_PLUGINS_STD; do
-		if use strongswan_plugins_${mod}; then
-			myconf+=" --enable-${mod}"
-		fi
-	done
-
-	for mod in $STRONGSWAN_PLUGINS_OPT_DISABLE; do
-		if ! use strongswan_plugins_${mod}; then
-			myconf+=" --disable-${mod}"
-		fi
-	done
-
-	for mod in $STRONGSWAN_PLUGINS_OPT; do
-		if use strongswan_plugins_${mod}; then
-			myconf+=" --enable-${mod}"
-		fi
-	done
-
-	econf \
-		--disable-static \
-		--enable-ikev1 \
-		--enable-ikev2 \
-		--enable-swanctl \
-		--enable-socket-dynamic \
-		--enable-cmd \
-		$(use_enable curl) \
-		$(use_enable constraints) \
-		$(use_enable ldap) \
-		$(use_enable debug leak-detective) \
-		$(use_enable dhcp) \
-		$(use_enable eap eap-sim) \
-		$(use_enable eap eap-sim-file) \
-		$(use_enable eap eap-simaka-sql) \
-		$(use_enable eap eap-simaka-pseudonym) \
-		$(use_enable eap eap-simaka-reauth) \
-		$(use_enable eap eap-identity) \
-		$(use_enable eap eap-md5) \
-		$(use_enable eap eap-aka) \
-		$(use_enable eap eap-aka-3gpp2) \
-		$(use_enable eap md4) \
-		$(use_enable eap eap-mschapv2) \
-		$(use_enable eap eap-radius) \
-		$(use_enable eap eap-tls) \
-		$(use_enable eap eap-ttls) \
-		$(use_enable eap xauth-eap) \
-		$(use_enable eap eap-dynamic) \
-		$(use_enable farp) \
-		$(use_enable gmp) \
-		$(use_enable gcrypt) \
-		$(use_enable mysql) \
-		$(use_enable networkmanager nm) \
-		$(use_enable openssl) \
-		$(use_enable pam xauth-pam) \
-		$(use_enable pkcs11) \
-		$(use_enable sqlite) \
-		$(use_enable systemd) \
-		$(use_with caps capabilities libcap) \
-		--with-piddir=/run \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if ! use systemd; then
-		rm -rf "${ED}"/lib/systemd || die "Failed removing systemd lib."
-	fi
-
-	doinitd "${FILESDIR}"/ipsec
-
-	local dir_ugid
-	if use non-root; then
-		fowners ${UGID}:${UGID} \
-			/etc/ipsec.conf \
-			/etc/strongswan.conf
-
-		dir_ugid="${UGID}"
-	else
-		dir_ugid="root"
-	fi
-
-	diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
-	dodir /etc/ipsec.d \
-		/etc/ipsec.d/aacerts \
-		/etc/ipsec.d/acerts \
-		/etc/ipsec.d/cacerts \
-		/etc/ipsec.d/certs \
-		/etc/ipsec.d/crls \
-		/etc/ipsec.d/ocspcerts \
-		/etc/ipsec.d/private \
-		/etc/ipsec.d/reqs
-
-	dodoc NEWS README TODO
-
-	# shared libs are used only internally and there are no static libs,
-	# so it's safe to get rid of the .la files
-	find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
-}
-
-pkg_preinst() {
-	has_version "<net-vpn/strongswan-4.3.6-r1"
-	upgrade_from_leq_4_3_6=$(( !$? ))
-
-	has_version "<net-vpn/strongswan-4.3.6-r1[-caps]"
-	previous_4_3_6_with_caps=$(( !$? ))
-}
-
-pkg_postinst() {
-	if ! use openssl && ! use gcrypt; then
-		elog
-		elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
-		elog "Please note that this might effect availability and speed of some"
-		elog "cryptographic features. You are advised to enable the OpenSSL plugin."
-	elif ! use openssl; then
-		elog
-		elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
-		elog "availability and speed of some cryptographic features. There will be"
-		elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
-		elog "25, 26) and ECDSA."
-	fi
-
-	if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
-		chmod 0750 "${ROOT}"/etc/ipsec.d \
-			"${ROOT}"/etc/ipsec.d/aacerts \
-			"${ROOT}"/etc/ipsec.d/acerts \
-			"${ROOT}"/etc/ipsec.d/cacerts \
-			"${ROOT}"/etc/ipsec.d/certs \
-			"${ROOT}"/etc/ipsec.d/crls \
-			"${ROOT}"/etc/ipsec.d/ocspcerts \
-			"${ROOT}"/etc/ipsec.d/private \
-			"${ROOT}"/etc/ipsec.d/reqs
-
-		ewarn
-		ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
-		ewarn "security reasons. Your system installed directories have been"
-		ewarn "updated accordingly. Please check if necessary."
-		ewarn
-
-		if [[ $previous_4_3_6_with_caps == 1 ]]; then
-			if ! use non-root; then
-				ewarn
-				ewarn "IMPORTANT: You previously had ${PN} installed without root"
-				ewarn "privileges because it was implied by the 'caps' USE flag."
-				ewarn "This has been changed. If you want ${PN} with user privileges,"
-				ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
-				ewarn
-			fi
-		fi
-	fi
-	if ! use caps && ! use non-root; then
-		ewarn
-		ewarn "You have decided to run ${PN} with root privileges and built it"
-		ewarn "without support for POSIX capability dropping. It is generally"
-		ewarn "strongly suggested that you reconsider- especially if you intend"
-		ewarn "to run ${PN} as server with a public ip address."
-		ewarn
-		ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
-		ewarn
-	fi
-	if use non-root; then
-		elog
-		elog "${PN} has been installed without superuser privileges (USE=non-root)."
-		elog "This imposes a few limitations mainly to the daemon 'charon' in"
-		elog "regards of the use of iptables."
-		elog
-		elog "Please carefully read: http://wiki.strongswan.org/projects/strongswan/wiki/ReducedPrivileges"
-		elog
-		elog "Thus if you require to specify a custom updown"
-		elog "script to charon which requires superuser privileges, you"
-		elog "can work around this limitation by using sudo to grant the"
-		elog "user \"ipsec\" the appropriate rights."
-		elog "For example (the default case):"
-		elog "/etc/sudoers:"
-		elog "  ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
-		elog "Under the specific connection block in /etc/ipsec.conf:"
-		elog "  leftupdown=\"sudo -E ipsec _updown iptables\""
-		elog
-	fi
-	elog
-	elog "Make sure you have _all_ required kernel modules available including"
-	elog "the appropriate cryptographic algorithms. A list is available at:"
-	elog "  https://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
-	elog
-	elog "The up-to-date manual is available online at:"
-	elog "  https://wiki.strongswan.org/"
-	elog
-}
diff --git a/net-vpn/strongswan/strongswan-5.9.14-r2.ebuild b/net-vpn/strongswan/strongswan-5.9.14-r2.ebuild
new file mode 100644
index 000000000000..589e3fd628c1
--- /dev/null
+++ b/net-vpn/strongswan/strongswan-5.9.14-r2.ebuild
@@ -0,0 +1,322 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+inherit linux-info systemd
+
+DESCRIPTION="IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE"
+HOMEPAGE="https://www.strongswan.org/"
+SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
+
+LICENSE="GPL-2 RSA DES"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
+
+STRONGSWAN_PLUGINS_STD="aes cmac curve25519 des dnskey drbg eap-radius fips-prf gcm hmac led lookip md5 nonce pem pgp
+pkcs1 pkcs7 pkcs8 pkcs12 pubkey random rc2 revocation sha1 sha2 sshkey systime-fix unity vici x509 xcbc"
+STRONGSWAN_PLUGINS_OPT_DISABLE="kdf"
+STRONGSWAN_PLUGINS_OPT="acert af-alg agent addrblock aesni botan blowfish bypass-lan
+ccm chapoly ctr error-notify forecast files gcm ha ipseckey md4 mgf1 ntru newhope
+openxpki padlock rdrand save-keys sha3 soup test-vectors unbound whitelist xauth-noauth"
+
+for mod in $STRONGSWAN_PLUGINS_STD; do
+	IUSE="${IUSE} +strongswan_plugins_${mod}"
+done
+
+for mod in $STRONGSWAN_PLUGINS_OPT_DISABLE; do
+	IUSE="${IUSE} strongswan_plugins_${mod}"
+done
+
+for mod in $STRONGSWAN_PLUGINS_OPT; do
+	IUSE="${IUSE} strongswan_plugins_${mod}"
+done
+
+COMMON_DEPEND="non-root? (
+		acct-user/ipsec
+		acct-group/ipsec
+	)
+	dev-libs/glib:2
+	gmp? ( >=dev-libs/gmp-4.1.5:= )
+	gcrypt? ( dev-libs/libgcrypt:= )
+	caps? ( sys-libs/libcap )
+	curl? ( net-misc/curl )
+	ldap? ( net-nds/openldap:= )
+	openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] )
+	mysql? ( dev-db/mysql-connector-c:= )
+	sqlite? ( >=dev-db/sqlite-3.3.1:3 )
+	systemd? ( sys-apps/systemd )
+	networkmanager? ( net-misc/networkmanager )
+	pam? ( sys-libs/pam )
+	strongswan_plugins_botan? ( dev-libs/botan:2= )
+	strongswan_plugins_soup? ( net-libs/libsoup:2.4= )
+	strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/linux-sources
+	sys-kernel/linux-headers"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	sys-apps/iproute2
+	!net-vpn/libreswan
+	selinux? ( sec-policy/selinux-ipsec )"
+
+UGID="ipsec"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	elog "Linux kernel version: ${KV_FULL}"
+
+	if ! kernel_is -ge 2 6 16; then
+		eerror
+		eerror "This ebuild currently only supports ${PN} with the"
+		eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
+		eerror
+	fi
+
+	if kernel_is -lt 2 6 34; then
+		ewarn
+		ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
+		ewarn
+
+		if kernel_is -lt 2 6 29; then
+			ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
+			ewarn "include all required IPv6 modules even if you just intend"
+			ewarn "to run on IPv4 only."
+			ewarn
+			ewarn "This has been fixed with kernels >= 2.6.29."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 33; then
+			ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
+			ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
+			ewarn "miss SHA384 and SHA512 HMAC support altogether."
+			ewarn
+			ewarn "If you need any of those features, please use kernel >= 2.6.33."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 34; then
+			ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
+			ewarn "ESP cipher is only included in kernels >= 2.6.34."
+			ewarn
+			ewarn "If you need it, please use kernel >= 2.6.34."
+			ewarn
+		fi
+	fi
+}
+
+src_configure() {
+	local myconf=""
+
+	if use non-root; then
+		myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
+	fi
+
+	# If a user has already enabled db support, those plugins will
+	# most likely be desired as well. Besides they don't impose new
+	# dependencies and come at no cost (except for space).
+	if use mysql || use sqlite; then
+		myconf="${myconf} --enable-attr-sql --enable-sql"
+	fi
+
+	# strongSwan builds and installs static libs by default which are
+	# useless to the user (and to strongSwan for that matter) because no
+	# header files or alike get installed... so disabling them is safe.
+	if use pam && use eap; then
+		myconf="${myconf} --enable-eap-gtc"
+	else
+		myconf="${myconf} --disable-eap-gtc"
+	fi
+
+	for mod in $STRONGSWAN_PLUGINS_STD; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	for mod in $STRONGSWAN_PLUGINS_OPT_DISABLE; do
+		if ! use strongswan_plugins_${mod}; then
+			myconf+=" --disable-${mod}"
+		fi
+	done
+
+	for mod in $STRONGSWAN_PLUGINS_OPT; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	econf \
+		--disable-static \
+		--enable-ikev1 \
+		--enable-ikev2 \
+		--enable-swanctl \
+		--enable-socket-dynamic \
+		--enable-cmd \
+		$(use_enable curl) \
+		$(use_enable constraints) \
+		$(use_enable ldap) \
+		$(use_enable debug leak-detective) \
+		$(use_enable dhcp) \
+		$(use_enable eap eap-sim) \
+		$(use_enable eap eap-sim-file) \
+		$(use_enable eap eap-simaka-sql) \
+		$(use_enable eap eap-simaka-pseudonym) \
+		$(use_enable eap eap-simaka-reauth) \
+		$(use_enable eap eap-identity) \
+		$(use_enable eap eap-md5) \
+		$(use_enable eap eap-aka) \
+		$(use_enable eap eap-aka-3gpp2) \
+		$(use_enable eap md4) \
+		$(use_enable eap eap-mschapv2) \
+		$(use_enable eap eap-radius) \
+		$(use_enable eap eap-tls) \
+		$(use_enable eap eap-ttls) \
+		$(use_enable eap xauth-eap) \
+		$(use_enable eap eap-dynamic) \
+		$(use_enable farp) \
+		$(use_enable gmp) \
+		$(use_enable gcrypt) \
+		$(use_enable mysql) \
+		$(use_enable networkmanager nm) \
+		$(use_enable openssl) \
+		$(use_enable pam xauth-pam) \
+		$(use_enable pkcs11) \
+		$(use_enable sqlite) \
+		$(use_enable systemd) \
+		$(use_with caps capabilities libcap) \
+		--with-piddir=/run \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if ! use systemd; then
+		rm -rf "${ED}"/lib/systemd || die "Failed removing systemd lib."
+	fi
+
+	doinitd "${FILESDIR}"/ipsec
+
+	local dir_ugid
+	if use non-root; then
+		fowners ${UGID}:${UGID} \
+			/etc/ipsec.conf \
+			/etc/strongswan.conf
+
+		dir_ugid="${UGID}"
+	else
+		dir_ugid="root"
+	fi
+
+	diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
+	dodir /etc/ipsec.d \
+		/etc/ipsec.d/aacerts \
+		/etc/ipsec.d/acerts \
+		/etc/ipsec.d/cacerts \
+		/etc/ipsec.d/certs \
+		/etc/ipsec.d/crls \
+		/etc/ipsec.d/ocspcerts \
+		/etc/ipsec.d/private \
+		/etc/ipsec.d/reqs
+
+	dodoc NEWS README TODO
+
+	# shared libs are used only internally and there are no static libs,
+	# so it's safe to get rid of the .la files
+	find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
+}
+
+pkg_preinst() {
+	has_version "<net-vpn/strongswan-4.3.6-r1"
+	upgrade_from_leq_4_3_6=$(( !$? ))
+
+	has_version "<net-vpn/strongswan-4.3.6-r1[-caps]"
+	previous_4_3_6_with_caps=$(( !$? ))
+}
+
+pkg_postinst() {
+	if ! use openssl && ! use gcrypt; then
+		elog
+		elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
+		elog "Please note that this might effect availability and speed of some"
+		elog "cryptographic features. You are advised to enable the OpenSSL plugin."
+	elif ! use openssl; then
+		elog
+		elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
+		elog "availability and speed of some cryptographic features. There will be"
+		elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
+		elog "25, 26) and ECDSA."
+	fi
+
+	if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
+		chmod 0750 "${ROOT}"/etc/ipsec.d \
+			"${ROOT}"/etc/ipsec.d/aacerts \
+			"${ROOT}"/etc/ipsec.d/acerts \
+			"${ROOT}"/etc/ipsec.d/cacerts \
+			"${ROOT}"/etc/ipsec.d/certs \
+			"${ROOT}"/etc/ipsec.d/crls \
+			"${ROOT}"/etc/ipsec.d/ocspcerts \
+			"${ROOT}"/etc/ipsec.d/private \
+			"${ROOT}"/etc/ipsec.d/reqs
+
+		ewarn
+		ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
+		ewarn "security reasons. Your system installed directories have been"
+		ewarn "updated accordingly. Please check if necessary."
+		ewarn
+
+		if [[ $previous_4_3_6_with_caps == 1 ]]; then
+			if ! use non-root; then
+				ewarn
+				ewarn "IMPORTANT: You previously had ${PN} installed without root"
+				ewarn "privileges because it was implied by the 'caps' USE flag."
+				ewarn "This has been changed. If you want ${PN} with user privileges,"
+				ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
+				ewarn
+			fi
+		fi
+	fi
+	if ! use caps && ! use non-root; then
+		ewarn
+		ewarn "You have decided to run ${PN} with root privileges and built it"
+		ewarn "without support for POSIX capability dropping. It is generally"
+		ewarn "strongly suggested that you reconsider- especially if you intend"
+		ewarn "to run ${PN} as server with a public ip address."
+		ewarn
+		ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
+		ewarn
+	fi
+	if use non-root; then
+		elog
+		elog "${PN} has been installed without superuser privileges (USE=non-root)."
+		elog "This imposes a few limitations mainly to the daemon 'charon' in"
+		elog "regards of the use of iptables."
+		elog
+		elog "Please carefully read: http://wiki.strongswan.org/projects/strongswan/wiki/ReducedPrivileges"
+		elog
+		elog "Thus if you require to specify a custom updown"
+		elog "script to charon which requires superuser privileges, you"
+		elog "can work around this limitation by using sudo to grant the"
+		elog "user \"ipsec\" the appropriate rights."
+		elog "For example (the default case):"
+		elog "/etc/sudoers:"
+		elog "  ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
+		elog "Under the specific connection block in /etc/ipsec.conf:"
+		elog "  leftupdown=\"sudo -E ipsec _updown iptables\""
+		elog
+	fi
+	elog
+	elog "Make sure you have _all_ required kernel modules available including"
+	elog "the appropriate cryptographic algorithms. A list is available at:"
+	elog "  https://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
+	elog
+	elog "The up-to-date manual is available online at:"
+	elog "  https://wiki.strongswan.org/"
+	elog
+}
diff --git a/net-vpn/tailscale/tailscale-1.78.3.ebuild b/net-vpn/tailscale/tailscale-1.78.3.ebuild
index 182c92339ad8..ae2bb237a00e 100644
--- a/net-vpn/tailscale/tailscale-1.78.3.ebuild
+++ b/net-vpn/tailscale/tailscale-1.78.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 
 CONFIG_CHECK="~TUN"
 
diff --git a/net-vpn/tor/tor-0.4.8.13-r1.ebuild b/net-vpn/tor/tor-0.4.8.13-r1.ebuild
index 4fc537113317..cd30d48f8f7e 100644
--- a/net-vpn/tor/tor-0.4.8.13-r1.ebuild
+++ b/net-vpn/tor/tor-0.4.8.13-r1.ebuild
@@ -66,7 +66,7 @@ RDEPEND+="
 	acct-group/tor
 	selinux? ( sec-policy/selinux-tor )
 "
-BDEPEND="
+BDEPEND+="
 	acct-user/tor
 	acct-group/tor
 "
diff --git a/net-vpn/tor/tor-9999.ebuild b/net-vpn/tor/tor-9999.ebuild
index 4fc537113317..cd30d48f8f7e 100644
--- a/net-vpn/tor/tor-9999.ebuild
+++ b/net-vpn/tor/tor-9999.ebuild
@@ -66,7 +66,7 @@ RDEPEND+="
 	acct-group/tor
 	selinux? ( sec-policy/selinux-tor )
 "
-BDEPEND="
+BDEPEND+="
 	acct-user/tor
 	acct-group/tor
 "
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index 5a81518818ce..7dfddfa65388 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-bluetooth-42.8.tar.xz 304908 BLAKE2B c487e0c278b316ecdcbdd39421389ce95024b06bf0e350d59dcac06d7a7e8b982da12b1088701e479d0b5c64b123899a5351a00c477208946bb1f44f3c8f30a6 SHA512 1c3d1db874b54ebae3cf59e526db8ff71131daea0c994abeefd95b51abf590bbba0baa8314ebbd1d3efe7973021327c7b8257163ed8f0567fe610b4e0c3dba88
-DIST gnome-bluetooth-46.0.tar.xz 306148 BLAKE2B cc2ecb80b69bab74f878eb640f8b65505b0a5e12d4c661bd2491cbb70c4020db7f191e604805df788e3bd45c46de38c8069434a8615874006368e027dd5608b6 SHA512 48ed8aeaa59aba1997991a6ae6113a4d3c9e286aa4e34f3f2611e33582ffa53f9f3f5a81052320292ccb576904d0f3cf8074c0fff6d0f56995266188441e6f7b
 DIST gnome-bluetooth-46.2.tar.xz 306076 BLAKE2B 5696ec06cde737d833f02edd89f265172a3b8c4e3486cbb09b3e2e046ead445e6a3aac23a92223dada9f8a6cadd7969755bed661b3a95161fb3874f545172f38 SHA512 e0745ae67e5c30000ace8161c114caecc1f3b8e99b824b961ed695ba78a088247d797ad3cb284fc7cf91dd7c37b94c5ce0bdc4c1118b9bf059039effeb79313a
+DIST gnome-bluetooth-47.1.tar.xz 297800 BLAKE2B f111a46cf56bc3614dac448297c2cd5fadbe0a3c3f75c2130542e9cbf88d3a6a167c6d59416ffede12945310e6720aedfc9181f3a71ca1e8bd4b61e14df9ab6b SHA512 474f8687e8d1c1a10ce5690a8e7c57e6afd29d55c9777820fad3b6d21ec07bab4ac31ab0ea9dd7d9a0e93a60b933913f5a54df69dc7d348d95098cc289c2e6b4
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.8.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.8.ebuild
deleted file mode 100644
index ca926a36b788..000000000000
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.8.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="3/13" # subslot = libgnome-bluetooth-3 soname version
-IUSE="gtk-doc +introspection sendto test"
-RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-
-DEPEND="
-	>=dev-libs/glib-2.44:2
-	>=gui-libs/gtk-4.4:4[introspection?]
-	media-libs/gsound
-	>=gui-libs/libadwaita-1.1:1
-	>=x11-libs/libnotify-0.7.0
-	virtual/libudev:=
-	>=sys-power/upower-0.99.14:=
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	acct-group/plugdev
-	virtual/udev
-	>=net-wireless/bluez-5
-	sendto? ( !net-wireless/gnome-bluetooth:2 )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.9 )
-	virtual/pkgconfig
-	test? (
-		$(python_gen_any_dep '
-			>=dev-python/python-dbusmock-0.26.0[${PYTHON_USEDEP}]
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	if use test; then
-		python_has_version ">=dev-python/python-dbusmock-0.26.0[${PYTHON_USEDEP}]" &&
-		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	# Check for python is unconditional
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use sendto)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# Workaround test failures caused by flatpak being installed that adds to XDG_DATA_DIRS
-	gnome2_environment_reset
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share
-
-	meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-46.0.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-46.0.ebuild
deleted file mode 100644
index 81aefdc67717..000000000000
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-46.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-bluetooth"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="3/13" # subslot = libgnome-bluetooth-3 soname version
-IUSE="gtk-doc +introspection sendto test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	>=dev-libs/glib-2.44:2
-	>=gui-libs/gtk-4.4:4[introspection?]
-	media-libs/gsound
-	>=gui-libs/libadwaita-1.1:1
-	>=x11-libs/libnotify-0.7.0
-	virtual/libudev:=
-	>=sys-power/upower-0.99.14:=
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	acct-group/plugdev
-	virtual/udev
-	>=net-wireless/bluez-5
-	sendto? ( !net-wireless/gnome-bluetooth:2 )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.9 )
-	virtual/pkgconfig
-	test? (
-		$(python_gen_any_dep '
-			>=dev-python/python-dbusmock-0.26.0[${PYTHON_USEDEP}]
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	if use test; then
-		python_has_version ">=dev-python/python-dbusmock-0.26.0[${PYTHON_USEDEP}]" &&
-		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	# Check for python is unconditional
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use sendto)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# Workaround test failures caused by flatpak being installed that adds to XDG_DATA_DIRS
-	gnome2_environment_reset
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share
-
-	meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-47.1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-47.1.ebuild
new file mode 100644
index 000000000000..5f5004802dfd
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-47.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-bluetooth"
+
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
+SLOT="3/13" # subslot = libgnome-bluetooth-3 soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="gtk-doc +introspection sendto test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.44:2
+	>=gui-libs/gtk-4.15.2:4[introspection?]
+	media-libs/gsound
+	>=gui-libs/libadwaita-1.6_beta:1
+	>=x11-libs/libnotify-0.7.0
+	virtual/libudev:=
+	>=sys-power/upower-0.99.14:=
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	acct-group/plugdev
+	virtual/udev
+	>=net-wireless/bluez-5
+	sendto? ( !net-wireless/gnome-bluetooth:2 )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.9 )
+	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep '
+			>=dev-python/python-dbusmock-0.26.0[${PYTHON_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	if use test; then
+		python_has_version ">=dev-python/python-dbusmock-0.26.0[${PYTHON_USEDEP}]" &&
+		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	# Check for python is unconditional
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use sendto)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# Workaround test failures caused by flatpak being installed that adds to XDG_DATA_DIRS
+	gnome2_environment_reset
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+
+	meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.9.2-libfmt-11.patch b/net-wireless/gnuradio/files/gnuradio-3.10.9.2-libfmt-11.patch
new file mode 100644
index 000000000000..60304a36ea16
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.10.9.2-libfmt-11.patch
@@ -0,0 +1,50 @@
+From 19b070051c1c2b5fb6f2da8fb6422b27418c3dfa Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 09:27:16 +0800
+Subject: [PATCH] blocks,runtime: io_signature: include spdlog/*/ranges.h for
+ using fmt::join()
+
+fmt::join() was moved into fmt/ranges.h since fmt 11, so let's
+include the corresponding header in spdlog for using it.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ gnuradio-runtime/lib/io_signature.cc | 5 +++++
+ gr-blocks/lib/message_debug_impl.cc  | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/gnuradio-runtime/lib/io_signature.cc b/gnuradio-runtime/lib/io_signature.cc
+index 812f444f8..76bb2aba6 100644
+--- a/gnuradio-runtime/lib/io_signature.cc
++++ b/gnuradio-runtime/lib/io_signature.cc
+@@ -16,6 +16,11 @@
+ #include <spdlog/tweakme.h>
+ 
+ #include <spdlog/fmt/fmt.h>
++#if __has_include(<spdlog/fmt/ranges.h>)
++#include <spdlog/fmt/ranges.h>
++#elif __has_include(<spdlog/fmt/bundled/ranges.h>)
++#include <spdlog/fmt/bundled/ranges.h>
++#endif
+ #include <string_view>
+ #include <algorithm>
+ #include <memory>
+diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc
+index 41d312e43..373287b02 100644
+--- a/gr-blocks/lib/message_debug_impl.cc
++++ b/gr-blocks/lib/message_debug_impl.cc
+@@ -19,6 +19,11 @@
+ #include <pmt/pmt.h>
+ #include <spdlog/common.h>
+ #include <spdlog/fmt/fmt.h>
++#if __has_include(<spdlog/fmt/ranges.h>)
++#include <spdlog/fmt/ranges.h>
++#elif __has_include(<spdlog/fmt/bundled/ranges.h>)
++#include <spdlog/fmt/bundled/ranges.h>
++#endif
+ #include <functional>
+ #include <utility>
+ #include <vector>
+-- 
+2.45.2
+
diff --git a/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild
index f4eaff739bf2..e2b0ef2bca50 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.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
@@ -131,7 +131,10 @@ DEPEND="${RDEPEND}
 	zeromq? ( net-libs/cppzmq )
 "
 
-PATCHES=( "${FILESDIR}/PR7093.patch" )
+PATCHES=(
+	"${FILESDIR}/PR7093.patch"
+	"${FILESDIR}"/${PN}-3.10.9.2-libfmt-11.patch
+)
 
 src_prepare() {
 	xdg_environment_reset #534582
diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index d3c03753c7f7..d8ccf5aa4cba 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -1,2 +1 @@
-DIST gqrx-2.16.tar.gz 3608271 BLAKE2B 0523be1f678c8966a0f973776ed4db71b9856334df528996a1790f74454124e72a3cbe51ae75dae3b5d02794a5dde8c0d06a0ea69d5886bd5678f630504c84df SHA512 b2a2035f22b927667dd36e838dedc3db119c916eea0b9c70f37f5f6c1826ce04f05de6c459aeb84cf71bca39c036e96380b8c9531ad035558de7759864ac8569
 DIST gqrx-2.17.2.tar.gz 3620793 BLAKE2B a8354212c5084160315581840a19a28f737d2492f16aad2f58f4e508e0ac4dfda7fa139eccd38694ebd0777a4c2062f984840baa2cc2313524e0566e695dc638 SHA512 7e387dd909d0dda710e8fb7766bcd6f26abc2a6bef73d2bdf4d9c96b8cf698d3b6c6c1b2fbd51e91f907f446bb1e551b9fb99503851e02777599193717a72e35
diff --git a/net-wireless/gqrx/gqrx-2.16.ebuild b/net-wireless/gqrx/gqrx-2.16.ebuild
deleted file mode 100644
index 2cf2b96d63cd..000000000000
--- a/net-wireless/gqrx/gqrx-2.16.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
-HOMEPAGE="https://gqrx.dk/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/gqrx-sdr/gqrx.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/gqrx-sdr/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~riscv ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="gr-audio portaudio pulseaudio"
-REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )"
-
-RDEPEND="
-	>=net-wireless/gnuradio-3.10:0=[audio,analog,filter,network]
-	>=net-wireless/gr-osmosdr-0.1.0:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	sci-libs/volk:=
-	pulseaudio? ( media-libs/libpulse )
-	portaudio? ( media-libs/portaudio:= )"
-DEPEND="${RDEPEND}
-	dev-libs/boost:=
-	dev-libs/log4cpp:=
-"
-BDEPEND=""
-
-src_configure() {
-	if use pulseaudio; then
-		LINUX_AUDIO_BACKEND=Pulseaudio
-	elif use portaudio; then
-		LINUX_AUDIO_BACKEND=Portaudio
-	elif use gr-audio; then
-		LINUX_AUDIO_BACKEND=Gr-audio
-	fi
-
-	local mycmakeargs=(
-		"-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/src/gqrx
-}
diff --git a/net-wireless/gqrx/gqrx-2.17.2-r1.ebuild b/net-wireless/gqrx/gqrx-2.17.2-r1.ebuild
new file mode 100644
index 000000000000..5853ad507b1f
--- /dev/null
+++ b/net-wireless/gqrx/gqrx-2.17.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
+HOMEPAGE="https://gqrx.dk/"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/gqrx-sdr/gqrx.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gqrx-sdr/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="gr-audio portaudio pulseaudio"
+REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )"
+
+RDEPEND="
+	dev-qt/qtbase:6[gui,network,widgets]
+	dev-qt/qtsvg:6
+	>=net-wireless/gnuradio-3.10:0=[audio,analog,filter,network]
+	>=net-wireless/gr-osmosdr-0.1.0:=
+	sci-libs/volk:=
+	pulseaudio? ( media-libs/libpulse )
+	portaudio? ( media-libs/portaudio:= )"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-libs/log4cpp
+"
+
+src_configure() {
+	if use pulseaudio; then
+		LINUX_AUDIO_BACKEND=Pulseaudio
+	elif use portaudio; then
+		LINUX_AUDIO_BACKEND=Portaudio
+	elif use gr-audio; then
+		LINUX_AUDIO_BACKEND=Gr-audio
+	fi
+
+	local mycmakeargs=(
+		-DFORCE_QT6=ON
+		-DFORCE_QT5=OFF
+		-DLINUX_AUDIO_BACKEND="${LINUX_AUDIO_BACKEND}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/src/gqrx
+}
diff --git a/net-wireless/gqrx/gqrx-2.17.2.ebuild b/net-wireless/gqrx/gqrx-2.17.2.ebuild
deleted file mode 100644
index eaecd1663e78..000000000000
--- a/net-wireless/gqrx/gqrx-2.17.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
-HOMEPAGE="https://gqrx.dk/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/gqrx-sdr/gqrx.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/gqrx-sdr/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~riscv ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="gr-audio portaudio pulseaudio qt6"
-REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )"
-
-RDEPEND="
-	>=net-wireless/gnuradio-3.10:0=[audio,analog,filter,network]
-	>=net-wireless/gr-osmosdr-0.1.0:=
-	qt6? (
-		dev-qt/qtbase:6
-		dev-qt/qtsvg:6
-	)
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-	sci-libs/volk:=
-	pulseaudio? ( media-libs/libpulse )
-	portaudio? ( media-libs/portaudio:= )"
-DEPEND="${RDEPEND}
-	dev-libs/boost:=
-	dev-libs/log4cpp:=
-"
-BDEPEND=""
-
-src_configure() {
-	if use pulseaudio; then
-		LINUX_AUDIO_BACKEND=Pulseaudio
-	elif use portaudio; then
-		LINUX_AUDIO_BACKEND=Portaudio
-	elif use gr-audio; then
-		LINUX_AUDIO_BACKEND=Gr-audio
-	fi
-
-	local mycmakeargs=(
-		-DFORCE_QT6="$(usex qt6)"
-		-DFORCE_QT5="$(usex !qt6)"
-		"-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/src/gqrx
-}
diff --git a/net-wireless/gqrx/gqrx-9999.ebuild b/net-wireless/gqrx/gqrx-9999.ebuild
index eaecd1663e78..5853ad507b1f 100644
--- a/net-wireless/gqrx/gqrx-9999.ebuild
+++ b/net-wireless/gqrx/gqrx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit cmake
 DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
 HOMEPAGE="https://gqrx.dk/"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/gqrx-sdr/gqrx.git"
 	inherit git-r3
 else
@@ -18,31 +18,21 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="gr-audio portaudio pulseaudio qt6"
+IUSE="gr-audio portaudio pulseaudio"
 REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )"
 
 RDEPEND="
+	dev-qt/qtbase:6[gui,network,widgets]
+	dev-qt/qtsvg:6
 	>=net-wireless/gnuradio-3.10:0=[audio,analog,filter,network]
 	>=net-wireless/gr-osmosdr-0.1.0:=
-	qt6? (
-		dev-qt/qtbase:6
-		dev-qt/qtsvg:6
-	)
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
 	sci-libs/volk:=
 	pulseaudio? ( media-libs/libpulse )
 	portaudio? ( media-libs/portaudio:= )"
 DEPEND="${RDEPEND}
-	dev-libs/boost:=
-	dev-libs/log4cpp:=
+	dev-libs/boost
+	dev-libs/log4cpp
 "
-BDEPEND=""
 
 src_configure() {
 	if use pulseaudio; then
@@ -54,9 +44,9 @@ src_configure() {
 	fi
 
 	local mycmakeargs=(
-		-DFORCE_QT6="$(usex qt6)"
-		-DFORCE_QT5="$(usex !qt6)"
-		"-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}"
+		-DFORCE_QT6=ON
+		-DFORCE_QT5=OFF
+		-DLINUX_AUDIO_BACKEND="${LINUX_AUDIO_BACKEND}"
 	)
 	cmake_src_configure
 }
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 88c62b00ff7a..c82f3b00386b 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,5 +1,2 @@
-DIST iwd-2.22.tar.xz 1095092 BLAKE2B 69db8bf4d0c5dae0d3b569f7f04f2361b3b3eef0ba5084d5c12684a9d18611611708ac077efe2df2085c7352273d28fe23c7e1145883c513cb4fdfed0f1f835e SHA512 fca6f50b849e6b4fc18a8cf0163e0d532f09b71e593d37f21bdc1b4878bddd7c96b481a3bb45ee6d36f4b1fd2ad76e428f9d1dd1b64ba77545227d3740b1a210
-DIST iwd-3.0.tar.xz 1096812 BLAKE2B a459a1d27a03631897a40c958dcf5ba451d09a1621207beaca20002e4056b0b72eade0b1cfbf26d3365346fbe204720841175f9f1e5370482375314c4a74b851 SHA512 d3c02fb034c471358817dc3f72eb0b96570004e042b704eee619a4ef44881486cfcfe9dfeedd0ff4ac9f70d07a5e68ce5626dc1f7f68fa190887d96f781bd0cd
-DIST iwd-3.1.tar.xz 1097252 BLAKE2B 2529ab4bba1b831f2720349bf2324f4eb2d89ab288a7a7063ed20fcf31d40380fc7ef684eb8eeb1c60d37523a497c539174f9ffb873f416d431090ae9bc6f3e0 SHA512 e0b04cf6d0f21356c959455d79f76ec7fe0101c036e06ca7d31a8318b802f79e04eb7b6c1aba8ba7f85cbcdd25885a765f9c99c1a3229d62d3428c049386ed45
 DIST iwd-3.2.tar.xz 1102488 BLAKE2B 303b1790c3a1f56e11e1d8e5a66bc1f4b4df8e36b6a68f2fe774f6ad4d74ea9bcc580ce2e8fc85110a970e75a9c1fed52dc96189e7d655a511860d1c378964a1 SHA512 edde70e5eda6fd455a649877c0aa22c44a2c9e8353c12c7fb624e6dbe3b1b024dddac702313548b61d9f06f86c77fd5dd15b25c54673a2a338da994dc87d1e5d
 DIST iwd-3.3.tar.xz 1103272 BLAKE2B dd3f54f1a15bdef49da8ffe8359cd579b51da6762f2cfd82ad0204b02ab9445c0db50908360cebb3551d035ebc784caceb0d8edfd553d6b2a14a662c97cfd25c SHA512 05c1319371c7be0e4234afcf6c346c66fd42a7e393ca6edfccea159e4ebc187de427f01e848fb43d8fa8da158b3b390dde3dbf651d70b045c1a70b121b305004
diff --git a/net-wireless/iwd/iwd-2.22.ebuild b/net-wireless/iwd/iwd-2.22.ebuild
deleted file mode 100644
index 184f2a89a85f..000000000000
--- a/net-wireless/iwd/iwd-2.22.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.69"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-	MYRST2MAN="RST2MAN=:"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +monitor ofono selinux standalone systemd wired"
-
-DEPEND="
-	sys-apps/dbus
-	client? ( sys-libs/readline:0= )
-"
-
-[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="
-	${DEPEND}
-	acct-group/netdev
-	net-wireless/wireless-regdb
-	selinux? ( sec-policy/selinux-networkmanager )
-	standalone? (
-		systemd? ( sys-apps/systemd )
-		!systemd? ( virtual/resolvconf )
-	)
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~RFKILL
-		~X509_CERTIFICATE_PARSER
-	"
-
-	if use amd64;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3 && use amd64; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	if use kernel_linux && kernel_is -ge 4 20; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
-	fi
-
-	check_extra_config
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	fi
-
-	sed -e "s:Exec=/bin/false:Exec=${EPREFIX}/usr/libexec/iwd:g" -i src/net.connman.iwd.service || die
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
-		"$(use_enable client)"
-		"$(use_enable monitor)"
-		"$(use_enable ofono)"
-		"$(use_enable wired)"
-		--enable-systemd-service
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
-		--with-systemd-networkdir="$(systemd_get_utildir)/network"
-	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake "${MYRST2MAN}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" "${MYRST2MAN}" install
-	keepdir "/var/lib/${PN}"
-
-	newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
-	if use wired;then
-		newinitd "${FILESDIR}/ead.initd" ead
-	fi
-
-	if [[ ${PV} == *9999* ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-
-	if use standalone ; then
-		local iwdconf="${ED}/etc/iwd/main.conf"
-		dodir /etc/iwd
-		cat << EOF > "${iwdconf}"
-[General]
-EnableNetworkConfiguration=true
-
-[Network]
-NameResolvingService=$(usex systemd systemd resolvconf)
-EOF
-		dodir /etc/conf.d
-		echo "rc_provide=\"net\"" > "${ED}"/etc/conf.d/iwd
-	fi
-}
diff --git a/net-wireless/iwd/iwd-3.0.ebuild b/net-wireless/iwd/iwd-3.0.ebuild
deleted file mode 100644
index 95ad12b6ce87..000000000000
--- a/net-wireless/iwd/iwd-3.0.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.69"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	MYRST2MAN="RST2MAN=:"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +monitor ofono selinux standalone systemd wired"
-
-DEPEND="
-	sys-apps/dbus
-	client? ( sys-libs/readline:0= )
-"
-
-[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="
-	${DEPEND}
-	acct-group/netdev
-	net-wireless/wireless-regdb
-	selinux? ( sec-policy/selinux-networkmanager )
-	standalone? (
-		systemd? ( sys-apps/systemd )
-		!systemd? ( virtual/resolvconf )
-	)
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~RFKILL
-		~X509_CERTIFICATE_PARSER
-	"
-
-	if use amd64;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3 && use amd64; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	if use kernel_linux && kernel_is -ge 4 20; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
-	fi
-
-	check_extra_config
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	fi
-
-	sed -e "s:Exec=/bin/false:Exec=${EPREFIX}/usr/libexec/iwd:g" -i src/net.connman.iwd.service || die
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
-		"$(use_enable client)"
-		"$(use_enable monitor)"
-		"$(use_enable ofono)"
-		"$(use_enable wired)"
-		--enable-systemd-service
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
-		--with-systemd-networkdir="$(systemd_get_utildir)/network"
-	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake "${MYRST2MAN}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" "${MYRST2MAN}" install
-	keepdir "/var/lib/${PN}"
-
-	newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
-	if use wired;then
-		newinitd "${FILESDIR}/ead.initd" ead
-	fi
-
-	if [[ ${PV} == *9999* ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-
-	if use standalone ; then
-		local iwdconf="${ED}/etc/iwd/main.conf"
-		dodir /etc/iwd
-		cat << EOF > "${iwdconf}"
-[General]
-EnableNetworkConfiguration=true
-
-[Network]
-NameResolvingService=$(usex systemd systemd resolvconf)
-EOF
-		dodir /etc/conf.d
-		echo "rc_provide=\"net\"" > "${ED}"/etc/conf.d/iwd
-	fi
-}
diff --git a/net-wireless/iwd/iwd-3.1.ebuild b/net-wireless/iwd/iwd-3.1.ebuild
deleted file mode 100644
index 48f0d7987bd3..000000000000
--- a/net-wireless/iwd/iwd-3.1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.70"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	MYRST2MAN="RST2MAN=:"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +monitor ofono selinux standalone systemd wired"
-
-DEPEND="
-	sys-apps/dbus
-	client? ( sys-libs/readline:0= )
-"
-
-[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="
-	${DEPEND}
-	acct-group/netdev
-	net-wireless/wireless-regdb
-	selinux? ( sec-policy/selinux-networkmanager )
-	standalone? (
-		systemd? ( sys-apps/systemd )
-		!systemd? ( virtual/resolvconf )
-	)
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~RFKILL
-		~X509_CERTIFICATE_PARSER
-	"
-
-	if use amd64;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3 && use amd64; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	if use kernel_linux && kernel_is -ge 4 20; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
-	fi
-
-	check_extra_config
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	fi
-
-	sed -e "s:Exec=/bin/false:Exec=${EPREFIX}/usr/libexec/iwd:g" -i src/net.connman.iwd.service || die
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
-		"$(use_enable client)"
-		"$(use_enable monitor)"
-		"$(use_enable ofono)"
-		"$(use_enable wired)"
-		--enable-systemd-service
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
-		--with-systemd-networkdir="$(systemd_get_utildir)/network"
-	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake "${MYRST2MAN}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" "${MYRST2MAN}" install
-	keepdir "/var/lib/${PN}"
-
-	newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
-	if use wired;then
-		newinitd "${FILESDIR}/ead.initd" ead
-	fi
-
-	if [[ ${PV} == *9999* ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-
-	if use standalone ; then
-		local iwdconf="${ED}/etc/iwd/main.conf"
-		dodir /etc/iwd
-		cat << EOF > "${iwdconf}"
-[General]
-EnableNetworkConfiguration=true
-
-[Network]
-NameResolvingService=$(usex systemd systemd resolvconf)
-EOF
-		dodir /etc/conf.d
-		echo "rc_provide=\"net\"" > "${ED}"/etc/conf.d/iwd
-	fi
-}
diff --git a/net-wireless/iwd/iwd-3.2.ebuild b/net-wireless/iwd/iwd-3.2.ebuild
index c3eb18a6af94..c59e512a21d3 100644
--- a/net-wireless/iwd/iwd-3.2.ebuild
+++ b/net-wireless/iwd/iwd-3.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
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 	MYRST2MAN="RST2MAN=:"
 fi
 
diff --git a/net-wireless/nanovna-saver/Manifest b/net-wireless/nanovna-saver/Manifest
index 2939e5c33831..e4bfea086460 100644
--- a/net-wireless/nanovna-saver/Manifest
+++ b/net-wireless/nanovna-saver/Manifest
@@ -1,5 +1 @@
-DIST nanovna-saver-0.5.4.tar.gz 494010 BLAKE2B 71e4292e33dbb5b055e7ddd3a29222a67e05b1af431eaee64b613e50648b0b91ad5446cc2d3af868ae624826caf871bff9062275239298c29de261d741bad1f4 SHA512 6600b3c83fc1dcaf81a85b1d14087d2067327098c486011c8bfbaba83e06ca1081c6f7045730a58f097bab332072139707ea23c037924624d2f8100a7b61acb7
-DIST nanovna-saver-0.6.3.tar.gz 580073 BLAKE2B be8482bf60a3abfff8a58c14cb34e81cf7b5733efa4d4da02e8d1cae0884fc4030f14a21bd66a6e5fb38f05938a446de8a5919cf3d13d902568c8c76f43381f1 SHA512 96cedb567f01f90ff07fef385d7ab6130213ab35674668d50962795e527414ca772583991db7bab73375a2651cb23876f1047d914579d5bec7758173f70bce71
-DIST nanovna-saver-0.6.4.tar.gz 580141 BLAKE2B f46914f60ef845cb65343c336ad905f6fb00206b5f0888ded45193b988a495127a4a944ef8fb24aa25cf5025d522291c062178ee55e460d3a54889b7a36d02c7 SHA512 ec85495cc2a72fc7f97c6336abec3cc20d1829d878d8ee1692103d00dc5482a14a5407309a585d39e938d8f77b6b336b6a12aa80c986ff01ff75b3daed6581c0
-DIST nanovna-saver-0.6.5.tar.gz 580669 BLAKE2B c1ab76f8cce42a764623a1ecc97186a5e42da2bcd12cf157a08591f8549400c5a7179a9c5c2844eb2aea7cd426f5111fae427ab5ab464c13b07d9e3a454f3c4b SHA512 21ad70534a265ac04b01d311aae05e74fb9a8d0525eb2f30cfa7cc4d8c3ad7d337d6888d9bbf3e1372d682ef63f044d959579bb36caa0fdc29531493c751a855
 DIST nanovna-saver-0.6.8.tar.gz 586892 BLAKE2B 6cbbac42221a6c862a2cd20c3c0fde7c51f41f0659e2c7898f42252a5c78edf4eac845cd8742ecf193a1572d2277c7b43835430e9731d985ee4abb4a79926571 SHA512 046ab6097eb47ff7321d3eaf88277f7cca0748f4977c48ee558ea8ccee6fdebc82e0ded589d0c3916d120c851448e7f09dc368752150a57973be1ce9201ca762
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.5.4.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.5.4.ebuild
deleted file mode 100644
index 4df9788f3f27..000000000000
--- a/net-wireless/nanovna-saver/nanovna-saver-0.5.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA"
-HOMEPAGE="https://github.com/mihtjel/nanovna-saver"
-SRC_URI=""
-
-LICENSE="GPL-3+"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
-else
-	SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/pyqt5[${PYTHON_USEDEP},gui,widgets]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND=""
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e "s/48.png/48/" \
-		-e "s/TerminalOptions=/#TerminalOptions=/" \
-		-e "s/Path=/#Path=/" NanoVNASaver.desktop || die
-	sed -i "/nanovnasaver/d" setup.py || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.6.3-r1.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.6.3-r1.ebuild
deleted file mode 100644
index caa8b29873f5..000000000000
--- a/net-wireless/nanovna-saver/nanovna-saver-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA"
-HOMEPAGE="https://github.com/mihtjel/nanovna-saver"
-
-LICENSE="GPL-3+"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
-else
-	SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64"
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-fi
-
-RDEPEND="${DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/pyqt6[${PYTHON_USEDEP},gui,widgets]
-	dev-python/pyqt6-sip[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_install() {
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.6.4.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.6.4.ebuild
deleted file mode 100644
index 66984a384d51..000000000000
--- a/net-wireless/nanovna-saver/nanovna-saver-0.6.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA"
-HOMEPAGE="https://github.com/mihtjel/nanovna-saver"
-
-LICENSE="GPL-3+"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
-else
-	SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-fi
-
-RDEPEND="${DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/pyqt6[${PYTHON_USEDEP},gui,widgets]
-	dev-python/pyqt6-sip[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_install() {
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.6.5.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.6.5.ebuild
deleted file mode 100644
index 66984a384d51..000000000000
--- a/net-wireless/nanovna-saver/nanovna-saver-0.6.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA"
-HOMEPAGE="https://github.com/mihtjel/nanovna-saver"
-
-LICENSE="GPL-3+"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
-else
-	SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-fi
-
-RDEPEND="${DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/pyqt6[${PYTHON_USEDEP},gui,widgets]
-	dev-python/pyqt6-sip[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_install() {
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.6.8.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.6.8.ebuild
index 66984a384d51..dd1b3257bfd5 100644
--- a/net-wireless/nanovna-saver/nanovna-saver-0.6.8.ebuild
+++ b/net-wireless/nanovna-saver/nanovna-saver-0.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
 else
 	SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
 fi
 
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 1ea7d350b4f3..0c1a9db81ad0 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,2 +1,2 @@
-DIST unifi-8.5.6.zip 169180361 BLAKE2B 945fb693d41301205647297f257dc7f8fb915421e0b40234d7e424993dfa58e50414d128cadb9792d824ca5e76716315a899331f33d6730957f25125806024ba SHA512 ff5f477be142fc9ea650cff4bf8eed3622bee60fa1513857000831eefd730bff9432aa218b3ae54ee1ac5ee592eb7ced4a4fc00347a353cb8529f2a9a8735e94
 DIST unifi-8.6.9.zip 166991856 BLAKE2B 93581e020b3f240614dfc02c058d732f33a7cd30696a50b7f3f1155b77688d1ade5179ebc6ea8e9870a6b21ce405576334dcba96ea6020b20bfec7441fdfbedb SHA512 61a4ddb5e3214f92cd8645c5c134181d3ee31354af7d7be237cee68138c9d807769d26ef608266d35f0d432c02d40cf59bfbe875839cce3046186e40714df5d1
+DIST unifi-9.0.108.zip 152362996 BLAKE2B 563d6f87c85ae38505f3943cc8d37b71ab50c993ed3b9334b804c926bcb1bf5a7ac107ecff28e312b1eccd653feda5c014a47e4e746c3fba158d79796e4ad6c0 SHA512 588f46f50844fdbd2ccd9b8903b345659396609ee0a8dac8c579ab14a633531c89080856016e8361cdd55c80c8582d3fabaaf4314758292155bf924441c3d2f9
diff --git a/net-wireless/unifi/unifi-8.5.6.ebuild b/net-wireless/unifi/unifi-8.5.6.ebuild
deleted file mode 100644
index 2f1936dc19fa..000000000000
--- a/net-wireless/unifi/unifi-8.5.6.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
-
-# Set this var for any releases except stable
-# RC_SUFFIX="-"
-
-inherit java-pkg-2 readme.gentoo-r1 systemd
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-S="${WORKDIR}/UniFi"
-
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="-* amd64 ~arm64"
-IUSE="systemd system-mongodb"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	dev-db/mongodb
-	virtual/jre:17
-"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="
-	usr/lib/unifi/lib/native/Linux/aarch64/*.so
-	usr/lib/unifi/lib/native/Linux/x86_64/*.so
-"
-
-src_prepare() {
-	if [[ ${CHOST} != aarch64* ]]; then
-		rm -r lib/native/Linux/aarch64 || die
-	fi
-	if [[ ${CHOST} != x86_64* ]]; then
-		rm -r lib/native/Linux/x86_64 || die
-	fi
-
-	if [[ ${CHOST} == aarch64* ]]; then
-		if ! use systemd; then
-			rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die
-		fi
-	fi
-	if [[ ${CHOST} == x86_64* ]]; then
-		if ! use systemd; then
-			rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-		fi
-	fi
-
-	default
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-	! use system-mongodb && doins -r bin
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar
-	java-pkg_dolauncher \
-		unifi \
-		--java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp \
-			-Djava.library.path= \
-			--add-opens java.base/java.lang=ALL-UNNAMED \
-			--add-opens java.base/java.time=ALL-UNNAMED \
-			--add-opens java.base/sun.security.util=ALL-UNNAMED \
-			--add-opens java.base/java.io=ALL-UNNAMED \
-			--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED' \
-		--jar ace.jar \
-		--pwd '/usr/lib/unifi'
-
-	if use system-mongodb; then
-		systemd_newunit "${FILESDIR}"/unifi-mongodb.service unifi.service
-		newinitd "${FILESDIR}"/unifi-mongodb.initd unifi
-	else
-		systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service
-		newinitd "${FILESDIR}"/unifi.initd-r2 unifi
-	fi
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-wireless/unifi/unifi-9.0.108.ebuild b/net-wireless/unifi/unifi-9.0.108.ebuild
new file mode 100644
index 000000000000..23a94d6779c9
--- /dev/null
+++ b/net-wireless/unifi/unifi-9.0.108.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Set this var for any releases except stable
+# RC_SUFFIX="-"
+
+inherit java-pkg-2 readme.gentoo-r1 systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+S="${WORKDIR}/UniFi"
+
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="-* ~amd64 ~arm64"
+IUSE="systemd system-mongodb"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	|| (
+		virtual/jre:21
+		virtual/jre:17
+	)
+"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="
+	usr/lib/unifi/lib/native/Linux/aarch64/*.so
+	usr/lib/unifi/lib/native/Linux/x86_64/*.so
+"
+
+src_prepare() {
+	if [[ ${CHOST} != aarch64* ]]; then
+		rm -r lib/native/Linux/aarch64 || die
+	fi
+	if [[ ${CHOST} != x86_64* ]]; then
+		rm -r lib/native/Linux/x86_64 || die
+	fi
+
+	if [[ ${CHOST} == aarch64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == x86_64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+
+	default
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+	! use system-mongodb && doins -r bin
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar
+	java-pkg_dolauncher \
+		unifi \
+		--java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp \
+			-Djava.library.path= \
+			--add-opens java.base/java.lang=ALL-UNNAMED \
+			--add-opens java.base/java.time=ALL-UNNAMED \
+			--add-opens java.base/sun.security.util=ALL-UNNAMED \
+			--add-opens java.base/java.io=ALL-UNNAMED \
+			--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED' \
+		--jar ace.jar \
+		--pwd '/usr/lib/unifi'
+
+	if use system-mongodb; then
+		systemd_newunit "${FILESDIR}"/unifi-mongodb.service unifi.service
+		newinitd "${FILESDIR}"/unifi-mongodb.initd unifi
+	else
+		systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service
+		newinitd "${FILESDIR}"/unifi.initd-r2 unifi
+	fi
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/perl-core/Term-Table/Term-Table-0.23.0.ebuild b/perl-core/Term-Table/Term-Table-0.23.0.ebuild
index 1e7bfc2d1815..f61f443ed139 100644
--- a/perl-core/Term-Table/Term-Table-0.23.0.ebuild
+++ b/perl-core/Term-Table/Term-Table-0.23.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
@@ -10,7 +10,7 @@ inherit perl-module optfeature
 DESCRIPTION="Format a header and rows into a table"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 40a0bb8542cc..dcd64feb48b7 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,14 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2025-01-14)
+# Needs dev-python/numpy and dev-python/scipy which aren't keyworded here
+dev-cpp/benchmark tools
+
+# Sam James <sam@gentoo.org> (2025-01-10)
+# Many unkeyworded dependencies like parts of TL (bug #947788)
+dev-perl/Template-Toolkit gd latex vim-syntax
+
 # Christopher Byrne <salah.coronya@gmail.com> (2024-12-01)
 # requires dev-libs/hidapi to be keyworded
 dev-libs/libfido2 hidapi
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index 96d56e664c34..3893086024e6 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -alpha
 
+# Sam James <sam@gentoo.org> (2025-01-09)
+# dev-db/mysql not keyworded here
+mysql
+
 # matoro <matoro_gentoo@matoro.tk> (2024-01-24)
 # sys-apps/flatpak is not keyworded here
 flatpak
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 49053c2044cb..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
 
@@ -40,6 +44,7 @@ media-gfx/openscad -manifold
 # Joonas Niilola <juippis@gentoo.org> (2024-11-16)
 # Available on amd64.
 www-client/firefox -wasm
+www-client/firefox -wasm-sandbox
 
 # Sam James <sam@gentoo.org> (2024-10-29)
 # Only available on amd64 for now
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/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index 29ee34a86394..b4645f631745 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -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
 
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in use.mask
+# New entries go on top.
+# Please use the same syntax as in use.mask.
 
 # Paul Zander <negril.nx+gentoo@gmail.com> (2023-11-17)
 # ROCm/HIP is not suitable for stabilization.
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index b3034404b82f..505bdf5077ac 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -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
 
 # John Helmert III <ajak@gentoo.org> (2024-12-14)
@@ -85,7 +85,6 @@ app-text/bibletime
 app-text/calibre
 app-text/cb2bib
 app-text/kchmviewer
-app-text/kjots
 app-text/sigil
 dev-python/spyder
 dev-python/spyder-terminal
@@ -120,7 +119,6 @@ kde-apps/kimagemapeditor
 kde-apps/kmail
 kde-apps/kmail-account-wizard
 kde-apps/kmailtransport
-kde-apps/knotes
 kde-apps/konqueror
 kde-apps/konsolekalendar
 kde-apps/kontact
diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index 72f8fa05cf8e..02cf9e76f0d9 100644
--- a/profiles/arch/arm/make.defaults
+++ b/profiles/arch/arm/make.defaults
@@ -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
 
 # Main ARM profile
@@ -25,3 +25,9 @@ VIDEO_CARDS="exynos fbdev omap"
 # Michał Górny <mgorny@gentoo.org> (2017-03-14)
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
+
+# Sam James <sam@gentoo.org> (2025-01-05)
+# Temporary USE until the global default catches up. dev-lang/ada-bootstrap
+# starts with sys-devel/gcc:14 so ADA_TARGET needs to be >= that. This
+# entry can be dropped once the global one is >= gcc_14.
+ADA_TARGET="gcc_14"
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 7272ccbf018d..e1fe33c51cef 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2025-01-04)
+# kde-plasma/kde-cli-tools not keyworded here
+x11-misc/xdg-utils plasma
+
 # Sam James <sam@gentoo.org> (2024-12-17)
 # dev-lang/ada-bootstrap exists here
 >=sys-devel/gcc-14 -ada
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index d322c4168ffe..e33a92c846c6 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -1,9 +1,15 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -arm
 
+# Sam James <sam@gentoo.org> (2025-01-05)
+# Older targets don't have an old enough dev-lang/ada-bootstrap available
+ada_target_gnat_2021
+ada_target_gcc_12
+ada_target_gcc_13
+
 # Sam James <sam@gentoo.org> (2024-06-13)
 # Needs as-yet-unkeyworded KF6 (bug #934215)
 kf6compat
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index dceaf51d1fc3..3837abbd1800 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -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
 
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in use.mask
+# New entries go on top.
+# Please use the same syntax as in use.mask.
 
 # Sam James <sam@gentoo.org> (2022-01-16)
 # net-libs/gnome-online-accounts is not marked stable on arm yet
diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults
index 55118834bcce..e7b9c1371a6f 100644
--- a/profiles/arch/arm64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2014-2024 Gentoo Authors
+# Copyright 2014-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Main ARM64 (AArch64/ARMv8) profile; endian independent.
@@ -20,6 +20,12 @@ LIBDIR_arm64="lib64"
 # Defaults for video drivers
 VIDEO_CARDS="fbdev"
 
+# Sam James <sam@gentoo.org> (2025-01-05)
+# Temporary USE until the global default catches up. dev-lang/ada-bootstrap
+# starts with sys-devel/gcc:14 so ADA_TARGET needs to be >= that. This
+# entry can be dropped once the global one is >= gcc_14.
+ADA_TARGET="gcc_14"
+
 # Mart Raudsepp <leio@gentoo.org> (2018-06-05)
 # Enable USE=libtirpc by default, to ease dependency resolution during
 # the stabilization of glibc-2.26. Bug 657148
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 3dfe1bbafefd..c8a4ee1e7d0d 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -21,6 +21,7 @@ sci-chemistry/gromacs nnpot
 # Joonas Niilola <juippis@gentoo.org> (2024-11-16)
 # Available on arm64.
 www-client/firefox -wasm
+www-client/firefox -wasm-sandbox
 
 # Michał Górny <mgorny@gentoo.org> (2024-10-23)
 # Debug-enabled binary packages are built for a subset of architectures.
@@ -389,11 +390,6 @@ media-video/mplayer -sdl
 media-video/mpv -sdl
 >=x11-libs/wxGTK-3 -sdl
 
-# Jan Vesely <jano.vesely@gmail.com> (2018-06-15)
-# Mesa clover only works on r600 or radeonsi GPUs. The corresponding
-# video_cards useflags are not available on arm
-media-libs/mesa opencl
-
 # Mart Raudsepp <leio@gentoo.org> (2018-05-30)
 # app-text/pandoc not keyworded yet
 app-emulation/xen-tools doc
@@ -402,16 +398,6 @@ app-emulation/xen-tools doc
 # Unkeyworded dependencies.
 app-admin/syslog-ng mongodb
 
-# Mart Raudsepp <leio@gentoo.org> (2018-04-08)
-# Tests fail for bundled luajit, USE=luajit is globally
-# masked too (no-one has tested it yet).
-# Florian Schmaus <flow@gentoo.org> (2024-03-29)
-# Restricted to pre texlive 2023 releases, as we have users
-# reporting that luajittex works with 2023 on arm64.
-# For example https://bugs.gentoo.org/928122#c7
-<app-text/texlive-core-2023 luajittex
-<dev-texlive/texlive-basic-2023 luajittex
-
 # Mart Raudsepp <leio@gentoo.org> (2018-03-31)
 # Boost.Context can be built on arm64
 dev-libs/boost -context
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 1c2ad46544da..0dd10cef4fb9 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -1,9 +1,15 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -arm64
 
+# Sam James <sam@gentoo.org> (2025-01-05)
+# Older targets don't have an old enough dev-lang/ada-bootstrap available
+ada_target_gnat_2021
+ada_target_gcc_12
+ada_target_gcc_13
+
 # Paul Zander <negril.nx+gentoo@gmail.com> (2024-03-28)
 # dev-libs/optix works on arm64
 -optix
@@ -74,10 +80,6 @@ cpu_flags_arm_neon
 -cpu_flags_arm_vfpv4
 -cpu_flags_arm_vfp-d32
 
-# Michał Górny <mgorny@gentoo.org> (2018-07-09)
-# No OpenCL provider is available on arm64.
-opencl
-
 # Mart Raudsepp <leio@gentoo.org> (2018-02-13)
 # net-libs/libsmi not tested on arm64 yet
 smi
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index 18cd219279c6..ec37d9bdcf5c 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -1,17 +1,14 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in use.mask
+
+# New entries go on top.
+# Please use the same syntax as in use.mask.
 
 # Matt Turner <mattst88@gentoo.org> (2024-05-10)
 # x11-drivers/xf86-video-vmware is not stable yet
 video_cards_vmware
 
-# Matt Turner <mattst88@gentoo.org> (2024-05-10)
-# dev-util/directx-headers is not stable yet
-video_cards_d3d12
-
 # Mart Raudsepp <leio@gentoo.org> (2023-10-03)
 # dev-util/sysprof-capture and dev-util/sysprof are not stable yet
 sysprof
diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index b8faae33585f..3330405919e4 100644
--- a/profiles/arch/hppa/make.defaults
+++ b/profiles/arch/hppa/make.defaults
@@ -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
 
 ARCH="hppa"
@@ -10,6 +10,12 @@ CXXFLAGS="${CFLAGS}"
 
 FEATURES="sandbox sfperms strict"
 
+# Sam James <sam@gentoo.org> (2025-01-05)
+# Temporary USE until the global default catches up. dev-lang/ada-bootstrap
+# starts with sys-devel/gcc:14 so ADA_TARGET needs to be >= that. This
+# entry can be dropped once the global one is >= gcc_14.
+ADA_TARGET="gcc_14"
+
 # Michał Górny <mgorny@gentoo.org> (2014-07-01)
 # Set ABI & DEFAULT_ABI consistently with ${ARCH}, to make ebuild
 # checks simpler.
diff --git a/profiles/arch/hppa/package.mask b/profiles/arch/hppa/package.mask
index 39addcecad66..e7ef6e29762a 100644
--- a/profiles/arch/hppa/package.mask
+++ b/profiles/arch/hppa/package.mask
@@ -4,8 +4,3 @@
 # Sam James <sam@gentoo.org> (2023-03-28)
 # Needs explicit porting to each platform (bug 894078#c6)
 dev-python/py-cpuinfo
-
-# Quote from <eike@s...l.de>:
-# "Compilation fails with: #error You need to define CycleTimer for
-#  your OS and CPU"
-dev-cpp/benchmark
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index b9e4d47d4f96..d97b9aa2f142 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -1,9 +1,24 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Sam James <sam@gentoo.org> (2025-01-14)
+# dev-cpp/benchmark isn't (yet) keyworded here, although >=1.9.1 should
+# work fine with patching as the ebuild does.
+dev-libs/re2 benchmark
+
+# Sam James <sam@gentoo.org> (2025-01-14)
+# libpfm: needs unkeyworded dev-libs/libpfm but I don't think HPPA has
+# any performance counters anyway.
+# tools: needs dev-python/numpy and dev-python/scipy which aren't keyworded here
+dev-cpp/benchmark libpfm tools
+
+# Sam James <sam@gentoo.org> (2025-01-10)
+# Many unkeyworded dependencies like parts of TL (bug #947788)
+dev-perl/Template-Toolkit gd latex vim-syntax
+
 # Matt Jolly <kangie@gentoo.org> (2024-12-08)
 # dev-vcs/mercurial is not keyworded on hppa
 app-eselect/eselect-repository mercurial
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index a61c98914043..ab4e4a87102b 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -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
 
 # Unmask the flag which corresponds to ARCH.
@@ -7,6 +7,12 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Sam James <sam@gentoo.org> (2025-01-05)
+# Older targets don't have an old enough dev-lang/ada-bootstrap available
+ada_target_gnat_2021
+ada_target_gcc_12
+ada_target_gcc_13
+
 # Sam James <sam@gentoo.org> (2023-09-11)
 # wayland hasn't been tested on hppa
 wayland
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index 3d3e6d11f69b..a3999f0a7fe3 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -1,8 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in use.mask
+
+# New entries go on top.
+# Please use the same syntax as in use.mask.
 
 # matoro <matoro_gentoo@matoro.tk> (2024-07-16)
 # dev-lang/ruby now unstabled on hppa
diff --git a/profiles/arch/loong/make.defaults b/profiles/arch/loong/make.defaults
index 08d836272984..7665e2f05407 100644
--- a/profiles/arch/loong/make.defaults
+++ b/profiles/arch/loong/make.defaults
@@ -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
 
 # Main LoongArch profile directory. Common settings for all loong profiles.
@@ -44,3 +44,9 @@ FEATURES="-pid-sandbox -network-sandbox -ipc-sandbox"
 # ABI
 # DEFAULT_ABI
 # MULTILIB_ABIS
+
+# Sam James <sam@gentoo.org> (2025-01-10)
+# Temporary USE until the global default catches up. dev-lang/ada-bootstrap
+# starts with sys-devel/gcc:14 so ADA_TARGET needs to be >= that. This
+# entry can be dropped once the global one is >= gcc_14.
+ADA_TARGET="gcc_14"
diff --git a/profiles/arch/loong/package.mask b/profiles/arch/loong/package.mask
index 8e24d8cdb106..ec60751587df 100644
--- a/profiles/arch/loong/package.mask
+++ b/profiles/arch/loong/package.mask
@@ -1,16 +1,11 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# WANG Xuerui <xen0n@gentoo.org> (2023-09-10)
-# Has correctness issues on loong (failing test_encode_long_neg_conversion),
-# pending debug.
-dev-python/ujson
-
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
-# sys-boot/gnu-efi upstream hasn't merged the loong port yet
+# sys-boot/gnu-efi applications that need porting (sbsigntools & refind) or
+# is abandoned upstream (elilo)
 app-crypt/efitools
 app-crypt/pesign
 app-crypt/sbsigntools
-sys-apps/fwupd-efi
 sys-boot/elilo
 sys-boot/refind
diff --git a/profiles/arch/loong/package.use.force b/profiles/arch/loong/package.use.force
index f1f01cb659f3..66e574a891d5 100644
--- a/profiles/arch/loong/package.use.force
+++ b/profiles/arch/loong/package.use.force
@@ -1,10 +1,6 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Holger Hoffstätte <holger@applied-asynchrony.com>
-# sys-devel/bpf-toolchain not yet kw'ed on loong (#938169)
-dev-util/bpftool clang
-
 # Sam James <sam@gentoo.org> (2024-02-03)
 # We only have MariaDB on loong, not MySQL.
 dev-perl/DBD-MariaDB mariadb
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index 109e82008ce7..1969983a39ce 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -1,6 +1,41 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# WANG Xuerui <xen0n@gentoo.org> (2025-01-16)
+# tests require qtwebengine which is unavailable
+dev-python/qtconsole test
+dev-python/qtpy test
+
+# WANG Xuerui <xen0n@gentoo.org> (2025-01-12)
+# Vulkan works on loong.
+gui-libs/gtk -vulkan
+media-video/mpv -vulkan
+
+# Sam James <sam@gentoo.org> (2025-01-10)
+# dev-lang/ada-bootstrap exists here
+>=sys-devel/gcc-14 -ada
+
+# WANG Xuerui <xen0n@gentoo.org> (2025-01-10)
+# bootstrap-emacs crashes at build time
+app-editors/emacs jit
+
+# WANG Xuerui <xen0n@gentoo.org> (2025-01-06)
+# necessary dep is keyworded and passes tests
+dev-db/mariadb -galera
+
+# WANG Xuerui <xen0n@gentoo.org> (2025-01-06)
+# 2 test cases abort with "LLVM ERROR: Relocation type not implemented yet!"
+sci-libs/symengine llvm
+
+# WANG Xuerui <xen0n@gentoo.org> (2025-01-06)
+# llvm does not have sufficient codegen support for mesa before 18
+# bug #929197
+media-libs/mesa llvm_slot_15 llvm_slot_16 llvm_slot_17
+
+# Sam James <sam@gentoo.org> (2025-01-04)
+# kde-plasma/kde-cli-tools not keyworded here
+x11-misc/xdg-utils plasma
+
 # Nowa Ammerlaan <nowa@gentoo.org> (2024-10-08)
 # Not all required dependencies are keyworded here
 sys-kernel/dracut test
@@ -21,22 +56,10 @@ net-voip/yate ilbc
 # needs re-keywording and clean-up of media-libs/opencollada
 media-libs/assimp collada
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-09-13)
-# dev-python/pyside6 isn't keyworded here
-dev-python/qtpy pyside6
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-09-07)
-# kde-plasma/plasma-workspace:6 is not keyworded
-virtual/notification-daemon kde
-
 # Sam James <sam@gentoo.org> (2024-08-31)
 # dnstap USE masked due to missing keywords
 net-dns/bind dnstap
 
-# Sam James <sam@gentoo.org> (2024-08-23)
-# dev-util/bpftool and/or sys-devel/bpf-toolchain not keyworded here
-sys-apps/systemd bpf
-
 # WANG Xuerui <xen0n@gentoo.org> (2024-08-22)
 # dev-lang/spidermonkey gained JIT support for loong since version 107,
 # but the nearest packaged version is 115.
@@ -54,10 +77,6 @@ dev-ruby/minitest-hooks test
 # QUIC dependencies are not keyworded
 net-misc/curl http3 quic curl_quic_openssl curl_quic_ngtcp2
 
-# Ulrich MĂĽller <ulm@gentoo.org> (2024-08-03)
-# Needs dev-libs/openspecfun which is not yet keyworded
-sci-visualization/gnuplot amos
-
 # Michał Górny <mgorny@gentoo.org> (2024-07-24)
 # Full testing requires www-client/firefox.
 dev-python/selenium test-rust
@@ -73,11 +92,6 @@ kde-frameworks/purpose:5 kaccounts
 # Requires unkeyworded dev-qt/qtwebengine (and revdeps)
 kde-plasma/plasma-nm openconnect
 
-# Sam James <sam@gentoo.org> (2024-06-13)
-# Needs as-yet-unkeyworded KF6 (bug #934215)
-app-crypt/pinentry qt6
-app-office/libreoffice qt6
-
 # WANG Xuerui <xen0n@gentoo.org> (2024-06-03)
 # Requires arch-specific code in python (relocs handling), in addition to
 # sys-devel/{clang,llvm}.
@@ -160,14 +174,8 @@ llvm-core/llvm -debuginfod
 dev-python/cattrs test
 dev-python/requests-cache test
 
-# Nowa Ammerlaan <nowa@gentoo.org> (2023-08-30)
-# Avoid having to keyword more Qt deps
-dev-python/pyside2 3d datavis location scxml
-dev-python/pyside6 3d location scxml
-
 # WANG Xuerui <xen0n@gentoo.org> (2023-07-26)
 # no llvm:15 or lld:16 on loong
-app-office/libreoffice clang
 <dev-db/postgresql-16 llvm
 <dev-lang/rust-1.73.0 wasm
 
@@ -212,10 +220,6 @@ sys-cluster/openmpi openmpi_fabrics_knem openmpi_rm_pbs
 # fails to build with 6.3.x kernel
 sys-cluster/knem modules
 
-# Matt Turner <mattst88@gentoo.org> (2023-05-30)
-# sys-apps/dbus-broker is not keyworded
-app-accessibility/at-spi2-core dbus-broker
-
 # Mike Gilbert <floppym@gentoo.org> (2023-05-27)
 # Newer sd-boot does not use gnuefi.
 >=sys-apps/systemd-254 -boot -ukify
@@ -243,25 +247,11 @@ net-nds/openldap kerberos
 # further investigation.
 net-vpn/openconnect test
 
-# WANG Xuerui <xen0n@gentoo.org> (2022-12-06)
-# dev-python/pyside2 not keyworded yet
-dev-python/qtpy pyside2
-dev-python/qtconsole test
-
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
 # <dev-cpp/tbb-2021 fails to build on loong w/ gcc-13
 sci-libs/spqr tbb
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
-# sys-boot/gnu-efi upstream hasn't merged the loong port yet
-sys-apps/fwupd uefi
-
-# WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
-# The loong port of sys-boot/grub:2 isn't upstreamed yet.
-dev-util/ostree grub
-sys-libs/efivar test
-
-# WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
 # sci-libs/adolc fails to build on loong for now.
 dev-cpp/eigen test
 
@@ -300,11 +290,6 @@ net-analyzer/rrdtool rados
 # Boost.Context has had support for loong since 1.79.0.
 dev-libs/boost -context
 
-# WANG Xuerui <xen0n@gentoo.org> (2022-12-02)
-# dev-qt/qtlocation:5 fails to compile with gcc-13 for now.
-dev-python/pyqt5 location
-dev-python/qtpy test
-
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-01)
 # Mask GRUB2 platforms not applicable to loong.
 sys-boot/grub:2 grub_platforms_coreboot grub_platforms_efi-32 grub_platforms_ieee1275 grub_platforms_multiboot grub_platforms_pc grub_platforms_qemu grub_platforms_uboot grub_platforms_xen grub_platforms_xen-pvh
@@ -364,10 +349,6 @@ sys-block/fio -io-uring -zbc
 # from libxcrypt for a world without libcrypt.so.1
 sys-libs/libxcrypt compat
 
-# WANG Xuerui <xen0n@gentoo.org> (2022-04-18)
-# Catalyst has support for assembling bootloader on this arch
-dev-util/catalyst -system-bootloader
-
 # The below masks are liberally taken from riscv, which has similar
 # limitations.
 
diff --git a/profiles/arch/loong/use.mask b/profiles/arch/loong/use.mask
index 697686ae9aed..298b46c94c58 100644
--- a/profiles/arch/loong/use.mask
+++ b/profiles/arch/loong/use.mask
@@ -1,18 +1,20 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Sam James <sam@gentoo.org> (2024-06-13)
-# Needs as-yet-unkeyworded KF6 (bug #934215)
-kf6compat
+# WANG Xuerui <xen0n@gentoo.org> (2025-01-12)
+# net-misc/dropbox is closed-source and unavailable on loong
+dropbox
+
+# Sam James <sam@gentoo.org> (2025-01-10)
+# Older targets don't have an old enough dev-lang/ada-bootstrap available
+ada_target_gnat_2021
+ada_target_gcc_12
+ada_target_gcc_13
 
 # Michał Górny <mgorny@gentoo.org> (2024-02-05)
 # LLVM slots without keywords.
 llvm_slot_15
 
-# WANG Xuerui <xen0n@gentoo.org> (2023-07-11)
-# dev-util/babeltrace fails tests on loong
-babeltrace
-
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
 # media-libs/xine-lib not tested
 xine
@@ -61,12 +63,10 @@ lua_single_target_luajit
 lua_targets_luajit
 mono
 ocamlopt
-opencl
 valgrind
 
 # Temporarily masked during initial keywording
 doc
-emacs
 fam
 mpi
 tpm
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index e205a629b5c3..1aa09c8746ec 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2025-01-10)
+# Many unkeyworded dependencies like parts of TL (bug #947788)
+dev-perl/Template-Toolkit gd latex vim-syntax
+
 # Christopher Byrne <salah.coronya@gmail.com> (2024-12-01)
 # requires dev-libs/hidapi to be keyworded
 dev-libs/libfido2 hidapi
diff --git a/profiles/arch/powerpc/make.defaults b/profiles/arch/powerpc/make.defaults
index 5290818c64fc..f5392d8be424 100644
--- a/profiles/arch/powerpc/make.defaults
+++ b/profiles/arch/powerpc/make.defaults
@@ -1,9 +1,15 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # All extra USE/etc should be specified in sub-profiles.
 # DO NOT POLLUTE USE ON THIS PROFILE.
 
+# Sam James <sam@gentoo.org> (2025-01-05)
+# Temporary USE until the global default catches up. dev-lang/ada-bootstrap
+# starts with sys-devel/gcc:14 so ADA_TARGET needs to be >= that. This
+# entry can be dropped once the global one is >= gcc_14.
+ADA_TARGET="gcc_14"
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-08-30)
 # Unhide PPC specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_PPC"
diff --git a/profiles/arch/powerpc/ppc32/package.mask b/profiles/arch/powerpc/ppc32/package.mask
index 744217fe4d35..7efe88bfadc8 100644
--- a/profiles/arch/powerpc/ppc32/package.mask
+++ b/profiles/arch/powerpc/ppc32/package.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2025-01-09)
+# MySQL is marked -ppc (bug #761715) because of a failing static assert.
+dev-db/mysql
+
 # Sam James <sam@gentoo.org> (2024-12-10)
 # Crashes in libuv (bug #941738)
 >=dev-build/cmake-3.29
diff --git a/profiles/arch/powerpc/ppc32/use.mask b/profiles/arch/powerpc/ppc32/use.mask
index 53d3dbf8f248..df7a446261d6 100644
--- a/profiles/arch/powerpc/ppc32/use.mask
+++ b/profiles/arch/powerpc/ppc32/use.mask
@@ -1,4 +1,4 @@
-# Copyright 2008-2023 Gentoo Authors
+# Copyright 2008-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
@@ -10,7 +10,7 @@ heif
 
 # Sam James <sam@gentoo.org> (2022-03-03)
 # dev-db/mysql doesn't work well on PPC, especially 8.x, but should be fine on PPC64
--mysql
+mysql
 
 # Matt Turner <mattst88@gentoo.org> (2022-02-21)
 # app-crypt/tpm2-tss is not keyworded here
diff --git a/profiles/arch/powerpc/ppc64/package.use.stable.mask b/profiles/arch/powerpc/ppc64/package.use.stable.mask
index 8c3e84c49ce2..151441b4a4bf 100644
--- a/profiles/arch/powerpc/ppc64/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.stable.mask
@@ -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
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2025-01-04)
+# kde-plasma/kde-cli-tools not marked stable here
+x11-misc/xdg-utils plasma
+
 # Joonas Niilola <juippis@gentoo.org> (2024-12-02)
 # www-client/firefox doesn't have stable ppc64 keyword.
 dev-python/selenium test-rust
diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask
index 1d065e2da02c..9bb63a5c3d6f 100644
--- a/profiles/arch/powerpc/ppc64/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/use.stable.mask
@@ -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
 
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in use.mask
+# New entries go on top.
+# Please use the same syntax as in use.mask.
 
 # Sam James <sam@gentoo.org> (2024-03-07)
 # dev-lang/php:8.2 is not marked stable here yet (bug #920701)
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index fe66cd25ca94..0a6d66483c1f 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -1,9 +1,15 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # PPC Specific use flags
 #
 
+# Sam James <sam@gentoo.org> (2025-01-05)
+# Older targets don't have an old enough dev-lang/ada-bootstrap available
+ada_target_gnat_2021
+ada_target_gcc_12
+ada_target_gcc_13
+
 # matoro <matoro_gentoo@matoro.tk> (2022-09-29)
 # dev-util/google-perftools is supported here
 -tcmalloc
diff --git a/profiles/arch/powerpc/use.stable.mask b/profiles/arch/powerpc/use.stable.mask
index cf5a25e06e1d..c078717efd1a 100644
--- a/profiles/arch/powerpc/use.stable.mask
+++ b/profiles/arch/powerpc/use.stable.mask
@@ -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
 
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in use.mask
+# New entries go on top.
+# Please use the same syntax as in use.mask.
 
 # Matt Turner <mattst88@gentoo.org> (2018-04-25)
 # Dropped stable keywords
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 34ee1fd0c2e9..21be0e584200 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,6 +1,18 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org. (2025-01-14)
+# dev-cpp/benchmark is not yet keyworded here
+dev-libs/re2 benchmark
+
+# Sam James <sam@gentoo.org> (2025-01-14)
+# dev-libs/libpfm is not yet keyworded here
+dev-cpp/benchmark libpfm
+
+# Sam James <sam@gentoo.org> (2025-01-10)
+# Many unkeyworded dependencies like parts of TL (bug #947788)
+dev-perl/Template-Toolkit gd latex vim-syntax
+
 # Matt Jolly <kangie@gentoo.org> (2024-12-08)
 # dev-vcs/mercurial is not keyworded on s390
 app-eselect/eselect-repository mercurial
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index ad4a52329c2f..d3f218aa2673 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -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
 
 ARCH="sparc"
@@ -42,3 +42,9 @@ VIDEO_CARDS="fbdev mga r128 radeon"
 # Enable USE=libtirpc by default, to ease dependency resolution during
 # the stabilization of glibc-2.26. Bug 657148
 USE="libtirpc"
+
+# Sam James <sam@gentoo.org> (2025-01-05)
+# Temporary USE until the global default catches up. dev-lang/ada-bootstrap
+# starts with sys-devel/gcc:14 so ADA_TARGET needs to be >= that. This
+# entry can be dropped once the global one is >= gcc_14.
+ADA_TARGET="gcc_14"
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 3db496865794..82cb8c7de29f 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2025-01-10)
+# Many unkeyworded dependencies like parts of TL (bug #947788)
+dev-perl/Template-Toolkit gd latex vim-syntax
+
 # Ionen Wolkens <ionen@gentoo.org> (2024-12-18)
 # dev-qt/* is not keyworded here
 app-text/doxygen gui
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index ec96e6cef2fb..ba46a802cac9 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -1,9 +1,15 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -sparc
 
+# Sam James <sam@gentoo.org> (2025-01-05)
+# Older targets don't have an old enough dev-lang/ada-bootstrap available
+ada_target_gnat_2021
+ada_target_gcc_12
+ada_target_gcc_13
+
 # matoro <matoro_gentoo@matoro.tk> (2024-06-11)
 # Extensive use of unaligned access, no plans to fix, #636552
 # https://github.com/memcached/memcached/issues/902
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index 79cf2319f1fd..7b9862d055e7 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -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
 
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in use.mask
+# New entries go on top.
+# Please use the same syntax as in use.mask.
 
 # Sam James <sam@gentoo.org> (2024-03-07)
 # dev-lang/php:8.2 is not marked stable here yet (bug #920701)
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 9a6fe640fd74..78cae9fe9e90 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2025-01-04)
+# kde-plasma/kde-cli-tools not marked stable here
+x11-misc/xdg-utils plasma
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-12-17)
 # app-office/libreoffice is no longer stable on x86
 x11-misc/mugshot libreoffice
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 5deb6e10b6cf..faa26490acb9 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -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
 
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in use.mask
+# New entries go on top.
+# Please use the same syntax as in use.mask.
 
 # Paul Zander <negril.nx+gentoo@gmail.org> (2024-02-14)
 # sci-libs/atlas is not stable
diff --git a/profiles/base/package.use b/profiles/base/package.use
index 92b4c57ef598..96310f5ecb0d 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -1,6 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mike Gilbert <floppym@gentoo.org> (2025-01-12)
+# Requires >= lua-5.3.
+>=dev-lua/lutok-0.6 lua_single_target_lua5-4
+
 # Michał Górny <mgorny@gentoo.org> (2024-09-15)
 # Each flag is used by exactly one version, so let's default-enable
 # them all to make tattoo not fail on almost everything.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 8da1c3ad38eb..64e9abd1ad0f 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,8 +1,20 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # 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
+
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2025-01-04)
+# No suitable versions of dev-libs/protobuf available.
+=dev-java/protobuf-java-4.29.1 system-protoc
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2025-01-03)
 # Blocking cleanup of kde-apps/kdegraphics-mobipocket:5
 kde-frameworks/kfilemetadata:5 mobi
@@ -21,14 +33,14 @@ sci-libs/symengine boost
 # Currently experimental features do not compile.
 app-emulation/pcem experimental
 
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2024-12-29)
+# openjfx for OpenJDK 25 is not yet available.
+dev-java/openjdk:25 javafx
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-12-28)
 # Prepare virtual/bitcoin-leveldb last-rites, bug #945359
 net-p2p/bitcoin-core system-leveldb
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2024-12-20)
-# openjfx for OpenJDK 24 is not yet available.
-dev-java/openjdk:24 javafx
-
 # Paul Zander <negril.nx+gentoo@gmail.com> (2024-12-16)
 # sci-libs/atlas requires you to disable frequency scaling to build.
 # This barely works on older Intel CPUs on good days.
@@ -49,11 +61,6 @@ sci-libs/vtk qt5
 # dev-python/pyside2 last-rites
 dev-python/qtpy pyside2
 
-# Mats Lidell <matsl@gentoo.org> (2024-11-20)
-# The dependency x11-libs/dnd blocks gcc-14, is only used by XEmacs,
-# and upstream is not sure it even works so dropping use. #908831
-app-editors/xemacs dnd
-
 # Sam James <sam@gentoo.org> (2024-11-17)
 # The example bindings fail to build.
 ~sys-libs/ncurses-6.5_p20241109 cxx
@@ -61,6 +68,7 @@ app-editors/xemacs dnd
 # Joonas Niilola <juippis@gentoo.org> (2024-11-16)
 # Wasm support is (currently) only available on amd64 and arm64.
 www-client/firefox wasm
+www-client/firefox wasm-sandbox
 
 # Matt Jolly <kangie@gentoo.org> (2024-11-11)
 # ICU 76.1 is not compatible with Chromium. Bug #943216.
@@ -72,10 +80,6 @@ www-client/chromium system-icu
 # Dependency for generating docs not packaged in Gentoo. #942992
 dev-util/repolite doc
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2024-11-01)
-# No suitable versions of dev-libs/protobuf available.
->=dev-java/protobuf-java-4.28.1 system-protoc
-
 # Sam James <sam@gentoo.org> (2024-10-29)
 # Currently needs patched dev-util/sysprof.
 dev-libs/elfutils stacktrace
@@ -478,12 +482,6 @@ sys-libs/ncurses stack-realign
 # Not ready for general use.
 >=www-client/chromium-104 pgo
 
-# Joonas Niilola <juippis@gentoo.org> (2022-05-03)
-# system-python-libs is HIGHLY EXPERIMENTAL according to upstream, and
-# still being worked on in Gentoo.
->=mail-client/thunderbird-100.0 system-python-libs
->=www-client/firefox-100.0 system-python-libs
-
 # Piotr Karbowski <slashbeast@gentoo.org> (2022-04-29)
 # There's a bug with gnutls support leading TLS certificates
 # validation failures on some certificates that are otherwise valid.
@@ -521,7 +519,8 @@ dev-util/rizin test
 # Sam James <sam@gentoo.org> (2021-12-27)
 # Doc building is broken and no new releases in a long time.
 # bug #830013
-sci-libs/flann doc
+# fixed in sci-libs/flann-1.9.2-20221027
+<=sci-libs/flann-1.9.2 doc
 
 # Joonas Niilola <juippis@gentoo.org> (2021-12-20)
 # Broken, upstream issue/PR open since 2021-05 without reply.
diff --git a/profiles/base/package.use.stable.force b/profiles/base/package.use.stable.force
index 90c98d1e2a45..99d1bdee75dd 100644
--- a/profiles/base/package.use.stable.force
+++ b/profiles/base/package.use.stable.force
@@ -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
 
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in package.use.force
+# New entries go on top.
+# Please use the same syntax as in package.use.force.
 
 ## Kent Fredric <kentnl@gentoo.org> (2019-07-11)
 # The absense of these features require dev-perl/GD, which currently
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index e608d1ea724d..b918228c0ddc 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -1,8 +1,12 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in package.use.mask
+# New entries go on top.
+# Please use the same syntax as in package.use.mask.
+
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2025-01-04)
+# dev-libs/protobuf-28.3 is not yet marked stable.
+>=dev-java/protobuf-java-4.28.3 system-protoc
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-08-29)
 # Pin down kf6compat mask to currently stable versions.
@@ -137,11 +141,6 @@ dev-lang/rust nightly system-bootstrap
 # Declared experimental, and dev-cpp/websocketpp not stable yet
 sci-libs/indilib websocket
 
-# Kent Fredric <kentnl@gentoo.org> (2019-08-29)
-# Support for DBD-mysql to use mariadb is sketchy. Use DBD-MariaDB
-# instead if you can.
-dev-perl/DBD-mysql mariadb
-
 # Kent Fredric <kentnl@gentoo.org> (2019-07-30)
 # These features require dev-perl/GD, which currently can't be
 # considered stable due to serious defects upstream. Bug #661634
diff --git a/profiles/base/use.stable.force b/profiles/base/use.stable.force
index 98f4a6f00e43..a5ef319d34cb 100644
--- a/profiles/base/use.stable.force
+++ b/profiles/base/use.stable.force
@@ -1,5 +1,5 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in use.force
+# New entries go on top.
+# Please use the same syntax as in use.force.
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index d01d4174094c..f2bbf0a0a135 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -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
 
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in use.mask
+# New entries go on top.
+# Please use the same syntax as in use.mask.
 
 # Hans de Graaff <graaff@gentoo.org> (2024-12-26)
 # Currently in testing and not ready to go stable yet.
diff --git a/profiles/default/linux/package.mask b/profiles/default/linux/package.mask
index 3c9bd77211fa..5e491992ef25 100644
--- a/profiles/default/linux/package.mask
+++ b/profiles/default/linux/package.mask
@@ -1,6 +1,15 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2025-01-10)
+# These packages are only relevant on musl systems.
+sys-libs/argp-standalone
+sys-libs/error-standalone
+sys-libs/fts-standalone
+sys-libs/obstack-standalone
+sys-libs/queue-standalone
+sys-libs/rpmatch-standalone
+
 # Sam James <sam@gentoo.org> (2023-06-06)
 # Only available on Linux.
 -dev-libs/libaio
diff --git a/profiles/features/big-endian/package.mask b/profiles/features/big-endian/package.mask
index f4e0f77dc13f..ce763eba0a38 100644
--- a/profiles/features/big-endian/package.mask
+++ b/profiles/features/big-endian/package.mask
@@ -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
 
 # Michał Górny <mgorny@gentoo.org> (2024-06-07)
@@ -48,7 +48,6 @@ kde-misc/zanshin
 kde-apps/mailcommon
 kde-apps/pim-sieve-editor
 kde-apps/korganizer
-kde-apps/knotes
 kde-apps/kdepim-meta
 kde-apps/kdepim-addons
 kde-apps/kaddressbook
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 49140e594c95..473b5f22aa53 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,21 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2025-01-10)
+# These packages are only relevant on musl systems.
+-sys-libs/argp-standalone
+-sys-libs/error-standalone
+-sys-libs/fts-standalone
+-sys-libs/obstack-standalone
+-sys-libs/queue-standalone
+-sys-libs/rpmatch-standalone
+
+# Cheyenne Wills <cwills@witznd.net> (2025-01-05)
+# Not ported to musl, bug #832428
+# openafs hasn't been tested with musl
+# would require a patch to get past the configure step
+net-fs/openafs
+
 # Sam James <sam@gentoo.org> (2024-11-19)
 # Not ported to musl (bug #717252, bug #938613)
 sys-apps/dog
@@ -68,6 +83,7 @@ sci-electronics/ghdl
 
 # Alfredo Tupone <tupone@gentoo.org> (2024-03-13)
 # To bootstrap uses an ada compiler built using glibc
+dev-lang/ada-bootstrap
 dev-lang/gnat-gpl
 dev-lang/spark
 dev-ada/gnatcoll-db
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index 7c6a28b1fc57..d7bf599bc90d 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -1,6 +1,17 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2025-01-08)
+# Depends on currently-masked elogind version on musl profiles (bug #947739)
+sys-libs/pam elogind
+
+# Cheyenne Wills <cwills@witznd.net> (2025-01-05)
+# openafs hasn't been ported to / tested with musl bug #832428
+app-crypt/heimdal afs
+app-crypt/kstart afs
+net-mail/cyrus-imapd afs
+www-apps/webdavcgi afs
+
 # Nowa Ammerlaan <nowa@gentoo.org> (2024-10-08)
 # Not all required dependencies are keyworded here
 sys-kernel/dracut test
diff --git a/profiles/features/wd40/package.use.mask b/profiles/features/wd40/package.use.mask
index d1ca730c6f37..b9bc220cfc3d 100644
--- a/profiles/features/wd40/package.use.mask
+++ b/profiles/features/wd40/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2025-01-04)
+# ptp-helper is written in Rust
+media-libs/gstreamer ptp
+
 # Mike Gilbert <floppym@gentoo.org> (2024-11-12)
 # Requires rust/cargo.
 sys-kernel/dracut dracut-cpio
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/package.mask b/profiles/package.mask
index c38aa9f95890..0387add8c933 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,135 @@
 
 #--- END OF EXAMPLES ---
 
+# Zac Medico <zmedico@gentoo.org> (2025-01-18)
+# Ebuild is difficult to maintain. No revdeps.
+# Removal on 2025-02-17. Bug #896044
+sys-cluster/k3s
+
+# Michał Górny <mgorny@gentoo.org> (2025-01-18)
+# Superseded by dev-python/terminaltables3, the only revdep switched
+# over.
+# Removal on 2025-02-17.  Bug #948333.
+dev-python/terminaltables
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2025-01-11)
+# Last release from 2012, dead upstream for 7 years, no Gentoo maintainer.
+# Depends on dev-qt/qtwebengine:5, removed from almost every other distro.
+# Bugs #741849, #830220, #851507 and #926672. Removal on 2025-02-10.
+net-misc/fatrat
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2025-01-11)
+# Last release from 2020, effectively unmaintained in Gentoo as its
+# maintainer has moved on to taking care of it in rion overlay instead.
+# Depends on Qt5, app-crypt/qca[qt5], dev-qt/qtwebengine:5.
+# Bugs #755446, #926138, #926670. Removal on 2025-02-10.
+net-im/psi
+net-im/psimedia
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2025-01-11)
+# Qt5-based library without any revdeps. Depends on app-crypt/qca[qt5].
+# Removal on 2025-02-10.
+dev-libs/qoauth
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2025-01-11)
+# Last release from 2020, dead upstream; Depends on app-crypt/qca[qt5].
+# Bug #935556. Removal on 2025-02-10.
+net-im/dianara
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2025-01-10)
+# EAPI=7, maintainer needed, no reverse dependencies, fails to compile,
+# uses deprecated Go eclass.
+# Removal on 2025-02-09.  Bugs #947810, #856319, #844730, #771048, #679078.
+sys-cluster/zetcd
+
+# James Le Cuirot <chewi@gentoo.org> (2025-01-09)
+# Obsolete and needs to be dropped along with Qt5. The GTK theme has been
+# superseded by dev-qt/qtbase[gtk], which uses GTK 3 rather than GTK 2.
+# Removal on 2025-02-09. See bug #947787.
+dev-qt/qtstyleplugins
+
+# Conrad Kostecki <conikost@gentoo.org> (2025-01-09)
+# New version, which dropps support for legacy devices.
+# Will be unmasked, when split to legacy-branch is done.
+>=dev-libs/intel-compute-runtime-24.52.32224.5
+>=dev-util/intel-graphics-compiler-2.5.7
+
+# Andrey Grozin <grozin@gentoo.org> (2025-01-09)
+# Unsupported old version, newer versions are not open-source.
+# Depends on Qt5.
+# Bugs 499030, 437262, 597268, 603592, 734890, 745495, 947740.
+# Use app-text/crqt-ng instead.
+# Removal on 2025-02-08.
+app-text/fbreader
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2025-01-09)
+# Last release from 2017; fails to build w/ GCC-14 and qscintilla-2.14.1.
+# Depends on Qt5. Bugs #914918, #917408. Removal on 2025-02-08.
+dev-db/tora
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2025-01-08)
+# Qt5-based library without any revdeps. Removal on 2025-02-07.
+dev-libs/kqoauth
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2025-01-08)
+# Qt5-based library without any revdeps. Removal on 2025-02-07.
+dev-libs/qcoro5
+
+# Andreas K. HĂĽttel <dilfridge@gentoo.org> (2025-01-06)
+# Masked for testing
+=dev-lang/perl-5.40.1*
+~virtual/perl-File-Spec-3.910.0
+~virtual/perl-Module-CoreList-5.202.501.184_rc
+
+# Hans de Graaff <graaff@gentoo.org> (2025-01-06)
+# ruby32-only package. Depends on assumptions that are no longer true in
+# ruby33. No reverse dependencies left. Last release in 2007. Upstream
+# gone. Removal on 2025-02-06.
+dev-ruby/dust
+
+# Sam James <sam@gentoo.org> (2025-01-05)
+# Removed upstream in gstreamer-1.24. See bug #947522. Removal on 2025-02-05.
+media-plugins/gst-plugins-kate
+
+# Paul Zander <negril.nx+gentoo@gmail.com> (2025-01-05)
+# Masked for testing
+>=dev-build/rocm-cmake-6.3.0
+>=dev-libs/hipother-6.3.0
+>=dev-libs/rccl-6.3.0
+>=dev-libs/rocdbgapi-6.3.0
+>=dev-libs/rocm-comgr-6.3.0
+>=dev-libs/rocm-device-libs-6.3.0
+>=dev-libs/rocm-opencl-runtime-6.3.0
+>=dev-libs/rocr-runtime-6.3.0
+>=dev-libs/roct-thunk-interface-6.3.0
+>=dev-util/hip-6.3.0
+>=dev-util/hipcc-6.3.0
+>=dev-util/hipify-clang-6.3.0
+>=dev-util/rocm_bandwidth_test-6.3.0
+>=dev-util/rocm-smi-6.3.0
+>=dev-util/rocminfo-6.3.0
+>=dev-util/roctracer-6.3.0
+>=dev-util/Tensile-6.3.0
+>=sci-libs/composable-kernel-6.3.0
+>=sci-libs/hipBLAS-common-6.3.0
+>=sci-libs/hipBLAS-6.3.0
+>=sci-libs/hipBLASLt-6.3.0
+>=sci-libs/hipCUB-6.3.0
+>=sci-libs/hipFFT-6.3.0
+>=sci-libs/hipRAND-6.3.0
+>=sci-libs/hipSOLVER-6.3.0
+>=sci-libs/hipSPARSE-6.3.0
+>=sci-libs/miopen-6.3.0
+>=sci-libs/rocBLAS-6.3.0
+>=sci-libs/rocFFT-6.3.0
+>=sci-libs/rocPRIM-6.3.0
+>=sci-libs/rocRAND-6.3.0
+>=sci-libs/rocSOLVER-6.3.0
+>=sci-libs/rocSPARSE-6.3.0
+>=sci-libs/rocThrust-6.3.0
+>=sci-libs/rocWMMA-6.3.0
+>=sci-libs/rpp-6.3.0
+
 # Nowa Ammerlaan <nowa@gentoo.org> (2025-01-03)
 # Contains a serious bug that can cause deletion of the users home dir.
 # See-also: https://github.com/keshavbhatt/whatsie/issues/230
@@ -55,13 +184,12 @@ acct-group/aspnet
 acct-user/aspnet
 www-servers/xsp
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-01-02)
-# No more revdeps, depends on Qt5. Removal on 2025-01-29.
+# Andreas Sturmlechner <asturm@gentoo.org> (2025-01-02)
+# No more revdeps, depends on Qt5, bug #942178. Removal on 2025-01-29.
 dev-libs/libqt5pas
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2025-01-01)
-# Transitional package without any revdeps left.
-# Removal on 2025-01-31
+# Transitional package without any revdeps left. Removal on 2025-01-31
 kde-apps/konsolepart
 
 # Nowa Ammerlaan <nowa@gentoo.org> (2025-01-01)
@@ -85,9 +213,11 @@ dev-libs/dmalloc
 dev-python/pslab
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-12-28)
-# Cleanup transitional Bitcoin Core meta packages, as well as
+# Cleanup transitional Bitcoin meta packages, as well as
 # unmaintainable net-p2p/bitcoin-core[system-leveldb] and
-# virtual/bitcoin-leveldb. Removal on 2025-01-27. Bug #945359
+# virtual/bitcoin-leveldb. Use net-p2p/bitcoin-core instead which is
+# the same as these packages but merged into one ebuild for maintainability.
+# Removal on 2025-01-27. Bug #945359
 dev-util/bitcoin-tx
 net-libs/libbitcoinconsensus
 net-p2p/bitcoin-cli
@@ -101,45 +231,6 @@ virtual/bitcoin-leveldb
 app-xemacs/latin-unity
 app-xemacs/mule-ucs
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-12-14)
-# Last "release" seems to have been an AUR special, and even that is now
-# >6 years old and still KF5 based. No known repository, no tarball source
-# except AUR. Removal on 2025-01-13.
-app-crypt/kencfs-plasma
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-12-14)
-# Archived and unmaintained upstream; see also:
-# https://invent.kde.org/libraries/atcore/-/issues/2
-# Library without revdeps. Removal on 2025-01-13.
-dev-libs/atcore
-
-# Ulrich MĂĽller <ulm@gentoo.org> (2024-12-13)
-# Unmaintained upstream: last release (2.40) in 2009, last commit
-# to upstream repository in 2017. Broken with Emacs 29.
-# Removal on 2025-01-12. Bug #911288.
-app-emacs/ecb
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-12-11)
-# Build system needs someone really dedicated to put up with it.
-# Version completely outdated, way too many bugs to list here.
-# Removal on 2025-01-10
-dev-db/firebird
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-12-11)
-# Declared unmaintained by upstream, will be broken by akonadi-24.12.
-# Use app-text/marknote https://apps.kde.org/marknote/ as alternative,
-# importing existing notes is possible. Removal on 2025-01-10.
-app-text/kjots
-kde-apps/knotes
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-12-10)
-# KF5 Porting Aids removal; bugs 755956, 759778
-# Removal on 2025-01-09
-media-sound/soundkonverter
-kde-frameworks/countryflags
-kde-frameworks/kdelibs4support
-kde-frameworks/kemoticons
-
 # Michał Górny <mgorny@gentoo.org> (2024-12-05)
 # 6.12.2 does not boot for me.
 =sys-kernel/gentoo-kernel-6.12.2
@@ -147,26 +238,6 @@ kde-frameworks/kemoticons
 =sys-kernel/vanilla-kernel-6.12.2
 =virtual/dist-kernel-6.12.2
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2024-12-04)
-# Bugs #845294 #757543 #517744 #704198 #366739 #350302 #614318 #637422
-# #738898 #501586.
-# Blocks removal of dev-java/swt-3.7.2-r4, bug #944885.
-# Users should switch to dev-util/android-sdk-cmdline-tools for a CLI replacement
-# or dev-util/android-studio for a GUI replacement.
-# Removal on 2025-01-04
-dev-util/android-sdk-update-manager
-dev-java/swt:3.7
-
-# Patrick Lauer <patrick@gentoo.org> (2024-12-01)
-# ROCm 6.2 builds but doesn't work at all for me
->=dev-libs/roct-thunk-interface-6.2
->=dev-libs/rocm-comgr-6.2
->=dev-libs/rocm-device-libs-6.2
->=dev-libs/rocr-runtime-6.2
->=dev-libs/rocm-opencl-runtime-6.2
->=dev-util/hipcc-6.2
->=dev-util/hip-6.2
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-11-28)
 # Grave data loss bug. See also:
 # https://github.com/nicotine-plus/nicotine-plus/issues/3152
@@ -251,14 +322,6 @@ dev-php/swoole
 =virtual/rust-1.81.0-r1
 =virtual/rust-1.82.0
 
-# Matt Jolly <kangie@gentoo.org> (2024-11-09)
-# Does not build with any rust version in the tree. Removal in 30 days.
-=dev-lang/starlark-rust-0.8.0
-
-# Matt Jolly <kangie@gentoo.org> (2024-11-09)
-# Does not build with any rust version in the tree. Removal in 30 days.
-=dev-util/wasmer-0.11.0
-
 # Viorel Munteanu <ceamac@gentoo.org> (2024-10-18)
 # Experimental version, for testing purposes only.
 # Bug #941566.
@@ -506,11 +569,6 @@ x11-drivers/nvidia-drivers:0/vulkan
 # old de-ANSI-fication/ansi2knr/AM_C_PROTOTYPES code. Please uninstall.
 dev-build/automake:1.11
 
-# Joonas Niilola <juippis@gentoo.org> (2021-07-29)
-# Upstream provided migration instructions from 2. -> 3. update,
-# breaks if not all at least many revdeps. #805011 for tracker bug.
->=net-libs/mbedtls-3.0.0
-
 # Michał Górny <mgorny@gentoo.org> (2021-07-06)
 # Upstream changed license to GPL-3+ in order to deliberately cause
 # incompatiblity with revdep licenses.  Mask until the situation
diff --git a/profiles/releases/17.0/package.use.stable.mask b/profiles/releases/17.0/package.use.stable.mask
index 1f4a6f6c548d..1eafbe784be9 100644
--- a/profiles/releases/17.0/package.use.stable.mask
+++ b/profiles/releases/17.0/package.use.stable.mask
@@ -1,6 +1,5 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in package.use.mask
-
+# New entries go on top.
+# Please use the same syntax as in package.use.mask.
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index b4f3a3a296f0..da37d51de1b4 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,10 +1,6 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-30)
-# Resolve conflicting REQUIRED_USE defaults (qt5 vs. qt6)
-media-libs/simage -qt5
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-03-07)
 # Required by kde-frameworks/kio:6
 dev-qt/qtbase libproxy
diff --git a/profiles/updates/4Q-2024 b/profiles/updates/4Q-2024
index 819daf818b22..4613d02bafbe 100644
--- a/profiles/updates/4Q-2024
+++ b/profiles/updates/4Q-2024
@@ -84,3 +84,4 @@ move dev-ml/llvm-ocaml dev-ml/llvm
 move dev-python/clang-python dev-python/clang
 slotmove kde-frameworks/kapidox 5 0
 move dev-python/publicsuffix dev-python/publicsuffix2
+move dev-util/imediff2 dev-util/imediff
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 1261a956a674..e96fa42bf35b 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1,2 +1,4 @@
 DIST celestia-1.7.0_pre20221215-data.tar.gz 306465675 BLAKE2B 74f7bb1fd827571e761d3e1f0342733134b20f8333bb06daab9d5d673ec236d830758526d99fe551ac0011eccf8dc7e7f9f108c939ec96c5accb022fa28aafa8 SHA512 a2531c03b534f14886b3ecfc96549ad0cec530e194a9c592bb62d5c05db3c85372b4dbb6c5137ccbe0d305c4689c8616d7120285b570fd8d777394e23b676159
 DIST celestia-1.7.0_pre20221215.tar.gz 5215167 BLAKE2B 755bea8c9a6e4f9f5ea961e7dcae2fdbede2ed5eb23b0b5085d11c0f6a56f7f5b31c9daa8d42fe6b1c42590b417248cd5a215d4079963b00a0f843354a137daf SHA512 8c86aa55febf8463f3eef64c54458e2bebb21ce4a344e77c733e77e5d499446cc30c5bb75699f38328e6ebc1d8221f89f65ab962ad38758ae10cc6ee45b9c6b1
+DIST celestia-1.7.0_pre20241231-data.tar.gz 295402479 BLAKE2B c6566f60435bb44c38cce0f01bbbda642a4f171e4c6425c48bfbf769fcce8cd4083ed5fa05783571b2adbba857c37c19ec44f0095bc1259f9abdcc2f7c015eef SHA512 58473a9c10a81740564f97666d991fc507e79c561b3a2388d7358e11ca664015ca81e52e65a4c96916dcd01313b5df8ee0a24337ac716ecf08bdd4208982b8d7
+DIST celestia-1.7.0_pre20241231.tar.gz 4587843 BLAKE2B e6332306a7772a592ac4da6ea3c5713e47c454eb84a79ff2655be30602956e82d68a604c59290ed0b3adf9d4dd01d2dc4c1faf1d6baf7d45d0043242d6e1c440 SHA512 0782f0288388a7069d4a04afee9768be3a4c94779cec63b5b3886899b72c266539b553ae0050d22592f0d677d329873063ab20ef19a95cdf8a07671c79d33a4b
diff --git a/sci-astronomy/celestia/celestia-1.7.0_pre20241231.ebuild b/sci-astronomy/celestia/celestia-1.7.0_pre20241231.ebuild
new file mode 100644
index 000000000000..64d19ddfbd18
--- /dev/null
+++ b/sci-astronomy/celestia/celestia-1.7.0_pre20241231.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+CMAKE_IN_SOURCE_BUILD="yes"
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit desktop lua-single xdg cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/CelestiaProject/Celestia.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *_p* ]] ; then
+		COMMIT_ID="9292455b420aa865482078c3149ae974367270e5"
+		COMMIT_ID_DATA="d20a4500410af19bd508eba567c9220890e9e316"
+		SRC_URI="
+			https://github.com/${PN^}Project/${PN^}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz
+			https://github.com/${PN^}Project/${PN^}Content/archive/${COMMIT_ID_DATA}.tar.gz -> ${P}-data.tar.gz
+		"
+		S="${WORKDIR}/${PN^}-${COMMIT_ID}"
+		KEYWORDS="~amd64 ~x86"
+	else
+		SRC_URI="https://github.com/${PN^}Project/${PN^}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	fi
+fi
+
+DESCRIPTION="OpenGL 3D space simulator"
+HOMEPAGE="https://celestiaproject.space/ https://github.com/CelestiaProject/Celestia"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="ffmpeg gtk lto lua nls +qt6 sdl"
+REQUIRED_USE="|| ( gtk qt6 sdl )
+	lua? ( ${LUA_REQUIRED_USE} )"
+
+BDEPEND="
+	dev-cpp/eigen
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+DEPEND="
+	dev-libs/libfmt:=
+	media-libs/libepoxy
+	media-libs/libjpeg-turbo:0=
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/opengl
+	gtk? ( x11-libs/gtk+:3 )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	lua? ( ${LUA_DEPS} )
+	qt6? ( dev-qt/qtbase:6[gui,opengl,widgets] )
+	sdl? ( media-libs/libsdl2[X] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# allow forcing CMake to look for a specific Lua version instead of the newest branch installed
+	"${FILESDIR}"/${PN}-1.7.0-cmake_lua_version-r1.patch
+)
+
+src_prepare() {
+	mv "${WORKDIR}"/CelestiaContent-${COMMIT_ID_DATA} content || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${CMAKE_USE_DIR}/content" BUILD_DIR="${BUILD_DIR}/content" \
+		cmake_src_configure
+
+	local mycmakeargs=(
+		-DCELCFG_EXTRAS_DIRS='"~/.celestia"'
+		-DENABLE_CELX="$(usex lua)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_FFMPEG="$(usex ffmpeg)"
+		-DENABLE_GTK="$(usex gtk)"
+		-DUSE_GTK3="$(usex gtk)"
+		-DENABLE_LTO="$(usex lto)"
+		-DENABLE_QT5=OFF
+		-DENABLE_QT6="$(usex qt6)"
+		-DENABLE_WIN=OFF
+		-DENABLE_SDL="$(usex sdl)"
+	)
+	# Upstream always looks for LuaJIT first unless stopped, and we only need
+	# the version specification when linking against PUC Lua
+	if use lua && ! use lua_single_target_luajit; then
+		mycmakeargs+=(
+			-DCMAKE_DISABLE_FIND_PACKAGE_LuaJIT=ON
+			-DLUA_VERSION=$(lua_get_version)
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	CMAKE_USE_DIR="${CMAKE_USE_DIR}/content" BUILD_DIR="${BUILD_DIR}/content" cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+
+	# Icons with more resolutions
+	doicon -s 48 "${S}"/src/celestia/gtk/data/${PN}.png
+	newicon -s 128 "${S}"/src/celestia/gtk/data/${PN}-logo.png ${PN}.png
+	doicon -s scalable "${S}"/src/celestia/gtk/data/${PN}.svg
+
+	dodoc AUTHORS README TRANSLATORS *.txt
+
+	CMAKE_USE_DIR="${CMAKE_USE_DIR}/content" BUILD_DIR="${BUILD_DIR}/content" cmake_src_install
+}
diff --git a/sci-astronomy/celestia/files/celestia-1.7.0-cmake_lua_version-r1.patch b/sci-astronomy/celestia/files/celestia-1.7.0-cmake_lua_version-r1.patch
new file mode 100644
index 000000000000..145f89a4a784
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.7.0-cmake_lua_version-r1.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -300,7 +300,7 @@
+   if(LUAJIT_FOUND)
+     link_libraries(LuaJIT::LuaJIT)
+   else()
+-    find_package(Lua REQUIRED)
++    find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+     include(FixLua)
+     MakeLuaTarget()
+     link_libraries(Lua::Lua)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 54380b20d401..87bf696d4915 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -8,9 +8,13 @@ DIST stellarium-24.2.tar.xz 327084704 BLAKE2B b1d38a92d0487a6555f1aad2d544711527
 DIST stellarium-24.2.tar.xz.asc 313 BLAKE2B d76fb00c0446ddeee90c42a3750989746e85334e9ac2bbb723959e87850bc6f9464b6f59d379e9354698d50e7ee447ab6c8ffbeab0fd0cbda9ad3be7765cad41 SHA512 dc5a6d30423f6ac389115c6235656f8f144ba97d2ba09f7f074a17bc6ec92be46a9da741a387f0c149a73e6b15d5906bd0eaec13f6e69b327beeae4512bcf992
 DIST stellarium-24.3.tar.xz 328039964 BLAKE2B 295114fce95e4c01d6f25051d4988328ebaa93b815fa9198e0b6e30f15395116a2cd0974d2d211ba162780e4ae586a33ba98396465d6942c50db3945a206a03c SHA512 8bb8ebdfdf57accf6d200f6c17d39edcda15c7ecdbfcd280f2a21e682fa62d62fc6523965d16b2033cee8f84da3dbb24db837c594a75144f5822d3576067000e
 DIST stellarium-24.3.tar.xz.asc 313 BLAKE2B 8f5af1a52e29e029b6e0bf61cb5612ae7ebe688b315e87011661e178dfe309ff76125177cd88dbf9c999abf3bbe5ee4b9ae52235fd0029cb5c2ebf66332f3df4 SHA512 c88e238a311b382be4623c67414dc5cce19cb1accdcbe35077916a0690ecaf0adc34ef43bd1b100f14b0cad8a6a8eec479eff353c32f0ad79b6a3263acf30f64
+DIST stellarium-24.4.tar.xz 328675340 BLAKE2B 4c16e84083b64f8c9fc3cd8cab7c479583ceae7d99b12e3d5c1a2c35980eb081e55e3f849698c3c57b8a06915a51bdce4bf4521b4481c42f5d8e69c8392ae248 SHA512 07a24fa9fc1f4e1c862925751d37169e391cf161decc764baa470406a3ce4e5fa15cf224f1affd7aab1cb224f66a49db1bd65bdd70dbdb43cc2e3c7b9ae92b9a
+DIST stellarium-24.4.tar.xz.asc 313 BLAKE2B ff5ac5f915bf814d6bd5d6765739a332788a773e796536e65768169cb491ff6bad5f2e7218f6f4a4a4435786224ac8aed0f024e252fe66621faa2425a91abe07 SHA512 07dc7da0c84670165d53cb4a64adec6ae281a655c3cc72f90f25cfd4a7df7f3cc70253d2d0a9cda8089f5a8dadaac2edbf06821762ae2dd238de5975364d9d39
 DIST stellarium-dso-catalog-3.20.dat 28678745 BLAKE2B 24ddf76e81e91424cced5df74dd164d17a45fed2b65c1dc1e7065371c18a796350a1e1aab2da5860376eb90eac07e7c836ffdbb324a0d3eda6c91e8ce1c4ab3a SHA512 c84832bbf56d1097db3ff8fa8f3faadac1470a9f79d9ee759493915a48754dc86174551b5e705786f29331991bee57daa4cab6d7ecc2e4e00a2f895823ccfd87
 DIST stellarium-dso-catalog-3.20.dat.asc 313 BLAKE2B a7d9a1977ff4e1b21a80239d85ad5123ad03c2dcd57422cec7c2585eddb1004bbfc2b29a934653bc36c438981218811d21ade7380ae49278ef2c4f387ab762e5 SHA512 e8a7b10bb157d15b550a31646c8d8ce9933a77f748900a9c75f0c78b9b9205ce5e4e2ec18248ba786aacd5fbf36da00bbaf578b8b011c75351a9237568e62f1b
 DIST stellarium_user_guide-24.2-1.pdf 32957159 BLAKE2B 4a6b7d93484945dffbee72eb4b3eba52cbe7affae63c9989b95dfe86be00d09ba3c283629a2939bca140daa1fd987dd6faa6e346fe56456777990fabcb46eb36 SHA512 784005bbd13333d2ab7ea0d043077ace88f0e824aef51ad65e2b3c11e6e2761f75332f7d03aa15a271078406688237da316f9d2077eb4155eaa9aa683b22e616
 DIST stellarium_user_guide-24.2-1.pdf.asc 313 BLAKE2B 7e2093891fc6250982a95436f1e4fe39861f08e1adec3251d35fbe991c155cf5df0cfe1e78af3511da7e8f29268beae905e7f79a1e3e7677b649527c34df6aad SHA512 c5cd4603e6d1f02569be9d5bbb54a051b60143eb3967b56aa727525de67f8af4e4405d26b1ca25bc118d400d49f06f32cbafdbbecf6b2339000ab3366a722a7a
 DIST stellarium_user_guide-24.3-1.pdf 33106635 BLAKE2B 60b165bcb4d6ce8d0226e6c8c341a87ac38939e6f91155ea647b73e365f5dd76d812f48f10d36995fa27e8f56c7433256c8e6e4b190fc6cabf2c712a506fc8a6 SHA512 ba87fcb9b64faa123965c710b06e585ae20594e84aef59fe804d858f33497683fe4a5a2de6e0d7b1eff071e654d8ee3802e625a2f3f76712ec5962f919cc0ff1
 DIST stellarium_user_guide-24.3-1.pdf.asc 313 BLAKE2B a61d77585af364b977c1eb4ca40910c2dffc4905ba04426aa4c664975a5021c97f681395a64b7cf3556887d96a49f851ca289f74325283344d442b89ecc6783b SHA512 1aa60a229336aa17b22364589425a1001175d7478ec5a5258d5b305ac6b6e2c508d97224a497d1b64d9f961cc454b39a1a7a95c4e0333c9e6fddfc1b3f54cca8
+DIST stellarium_user_guide-24.4-1.pdf 13416178 BLAKE2B ffa110294a6689c0e32eb9027d88bc1bd458d59018d80b1085d83b80bd3f91754ee74493f431ab5d6163c871aa7685e789619e41ce7a1dbb3cff8377f737af23 SHA512 0d27f95b913c4b2a5676290f09791abb1bae2fe121c19479dcd1ba350881cd6b56a5b1bd69b1efe82f805d2ca8cbea8192c0c43064d2919aa75aef488900808a
+DIST stellarium_user_guide-24.4-1.pdf.asc 313 BLAKE2B 6bca7ff1a4bf150390bda99c0967c371931f9fceac215c7e79c0360196d4addd870c1913efb351e94cf128605e0277624f0e84d6c9668d9781709c995ec3551d SHA512 3d7fa66f533f12c0cccffa23365a5c4347a4d9c7f835e392914d4e3adc8fa865549d9af9d7dee247aaa671cb6374c65c33624f705bd7512947177ac6a30c4833
diff --git a/sci-astronomy/stellarium/files/stellarium-0.24.4-indilib.patch b/sci-astronomy/stellarium/files/stellarium-0.24.4-indilib.patch
new file mode 100644
index 000000000000..43d440a33c43
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.24.4-indilib.patch
@@ -0,0 +1,52 @@
+https://github.com/Stellarium/stellarium/issues/4019
+
+--- a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
++++ b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
+@@ -25,9 +25,9 @@
+ #include <limits>
+ #include <cmath>
+ 
+-#include <libs/indiclient/baseclient.h>
+-#include <libs/indidevice/basedevice.h>
+-#include <libs/indibase/inditelescope.h>
++#include <libindi/baseclient.h>
++#include <libindi/basedevice.h>
++#include <libindi/inditelescope.h>
+ 
+ const int INDIConnection::SLEW_STOP = INDI::Telescope::SLEW_GUIDE - 1;
+ 
+--- a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
++++ b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
+@@ -20,8 +20,8 @@
+ #define INDICONNECTION_HPP
+ 
+ #include <QObject>
+-#include <libs/indiclient/baseclient.h>
+-#include <libs/indidevice/basedevice.h>
++#include <libindi/baseclient.h>
++#include <libindi/basedevice.h>
+ 
+ #include <mutex>
+ #include <QStringList>
+--- a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
++++ b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
+@@ -25,7 +25,7 @@
+ 
+ #include "StelCore.hpp"
+ #include "StelUtils.hpp"
+-#include <libs/indibase/inditelescope.h>
++#include <libindi/inditelescope.h>
+ #include "INDIControlWidget.hpp"
+ 
+ TelescopeClientINDI::TelescopeClientINDI(const QString &name, const QString &params):
+--- a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp
++++ b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp
+@@ -23,7 +23,7 @@
+ #include <string>
+ 
+ #include "INDIConnection.hpp"
+-#include <libs/indidevice/basedevice.h>
++#include <libindi/basedevice.h>
+ 
+ void TestINDIConnection::deafultCoordinates()
+ {
diff --git a/sci-astronomy/stellarium/stellarium-24.2.ebuild b/sci-astronomy/stellarium/stellarium-24.2.ebuild
index 5065b8b36107..72fe54325536 100644
--- a/sci-astronomy/stellarium/stellarium-24.2.ebuild
+++ b/sci-astronomy/stellarium/stellarium-24.2.ebuild
@@ -74,7 +74,7 @@ RDEPEND="
 		scripting? ( dev-qt/qtscript:5 )
 		telescope? ( dev-qt/qtserialport:5 )
 		webengine? ( dev-qt/qtwebengine:5[widgets] )
-		xlsx? ( dev-libs/qxlsx:=[qt5] )
+		xlsx? ( dev-libs/qxlsx:=[qt5(-)] )
 	)
 	qt6? (
 		dev-qt/qtbase:6=[gui,network,widgets]
@@ -90,7 +90,7 @@ RDEPEND="
 		scripting? ( dev-qt/qtdeclarative:6 )
 		telescope? ( dev-qt/qtserialport:6 )
 		webengine? ( dev-qt/qtwebengine:6[widgets] )
-		xlsx? ( dev-libs/qxlsx:=[qt6] )
+		xlsx? ( dev-libs/qxlsx:=[qt6(+)] )
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/sci-astronomy/stellarium/stellarium-24.3.ebuild b/sci-astronomy/stellarium/stellarium-24.3.ebuild
index 7a9447a0cbad..4139fe141dd6 100644
--- a/sci-astronomy/stellarium/stellarium-24.3.ebuild
+++ b/sci-astronomy/stellarium/stellarium-24.3.ebuild
@@ -77,7 +77,7 @@ RDEPEND="
 		scripting? ( dev-qt/qtscript:5 )
 		telescope? ( dev-qt/qtserialport:5 )
 		webengine? ( dev-qt/qtwebengine:5[widgets] )
-		xlsx? ( dev-libs/qxlsx:=[qt5] )
+		xlsx? ( dev-libs/qxlsx:=[qt5(-)] )
 	)
 	qt6? (
 		dev-qt/qtbase:6=[concurrent,gui,network,widgets]
@@ -93,7 +93,7 @@ RDEPEND="
 		scripting? ( dev-qt/qtdeclarative:6 )
 		telescope? ( dev-qt/qtserialport:6 )
 		webengine? ( dev-qt/qtwebengine:6[widgets] )
-		xlsx? ( dev-libs/qxlsx:=[qt6] )
+		xlsx? ( dev-libs/qxlsx:=[qt6(+)] )
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/sci-astronomy/stellarium/stellarium-24.4.ebuild b/sci-astronomy/stellarium/stellarium-24.4.ebuild
new file mode 100644
index 000000000000..051ec9a0898f
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-24.4.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake desktop flag-o-matic python-any-r1 toolchain-funcs xdg verify-sig virtualx
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="https://stellarium.org/ https://github.com/Stellarium/stellarium"
+MY_DSO_VERSION="3.20"
+SRC_URI="
+	https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.xz
+	verify-sig? ( https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.xz.asc )
+	deep-sky? (
+		https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
+		verify-sig? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat.asc -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat.asc )
+	)
+	doc? (
+		https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
+		verify-sig? ( https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf.asc )
+	)
+	stars? (
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
+	)"
+
+LICENSE="GPL-2+ SGI-B-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="debug deep-sky doc gps +lens-distortion libcxx media nls +scripting +show-my-sky stars telescope test webengine +xlsx"
+
+# Python interpreter is used while building RemoteControl plugin
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	doc? ( app-text/doxygen[dot] )
+	nls? ( dev-qt/qttools:6[linguist] )
+	verify-sig? ( sec-keys/openpgp-keys-stellarium )
+"
+# TODO: review need for dev-cpp/tbb after several releases of gcc and clang
+RDEPEND="
+	dev-cpp/tbb:=
+	dev-qt/qtbase:6=[concurrent,gui,network,widgets]
+	dev-qt/qtcharts:6
+	media-fonts/dejavu
+	>=sci-astronomy/calcmysky-0.3.0:=[qt6(+)]
+	sys-libs/zlib
+	gps? (
+		dev-qt/qtpositioning:6
+		dev-qt/qtserialport:6
+		sci-geosciences/gpsd:=[cxx]
+	)
+	lens-distortion? (
+		media-gfx/exiv2:=
+		sci-libs/nlopt
+	)
+	media? (
+		dev-qt/qtmultimedia:6[gstreamer]
+		virtual/opengl
+	)
+	scripting? ( dev-qt/qtdeclarative:6 )
+	telescope? (
+		dev-qt/qtserialport:6
+		sci-libs/indilib:=
+	)
+	webengine? ( dev-qt/qtwebengine:6[widgets] )
+	xlsx? ( dev-libs/qxlsx:=[qt6(+)] )
+"
+DEPEND="${RDEPEND}
+	libcxx? ( dev-cpp/fast_float )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/stellarium-0.23.4-unbundle-zlib.patch"
+	"${FILESDIR}/stellarium-0.24.4-indilib.patch"
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/stellarium.asc
+
+pkg_setup() {
+	if tc-is-clang && ! use libcxx && [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+		die "When using libc++, please enable USE=libcxx"
+	fi
+}
+
+src_unpack() {
+	# stars-2.0 are not signed
+	if use verify-sig; then
+		pushd "${DISTDIR}" > /dev/null || die
+		verify-sig_verify_detached \
+			${P}.tar.xz{,.asc}
+		use deep-sky && verify-sig_verify_detached \
+			${PN}-dso-catalog-${MY_DSO_VERSION}.dat{,.asc}
+		use doc && verify-sig_verify_detached \
+			stellarium_user_guide-${PV}-1.pdf{,.asc}
+		popd > /dev/null || die
+	fi
+	default_src_unpack
+}
+
+src_prepare() {
+	cmake_src_prepare
+	use debug || append-cppflags -DQT_NO_DEBUG #415769
+
+	rm -r src/external/qtcompress/ || die
+	rm -r src/external/zlib/ || die
+
+	# for glues_stel aka libtess I couldn't find an upstream with the same API
+
+	local remaining="$(cd src/external/ && echo */)"
+	if [[ "${remaining}" != "glues_stel/" ]]; then
+		eqawarn "Need to unbundle more deps: ${remaining}"
+	fi
+}
+
+src_configure() {
+	filter-lto # https://bugs.gentoo.org/862249
+
+	local mycmakeargs=(
+		-DCCACHE_PROGRAM=no
+		-DCPM_LOCAL_PACKAGES_ONLY=yes
+		-DUSE_BUNDLED_QTCOMPRESS=no
+		-DENABLE_GPS="$(usex gps)"
+		-DENABLE_MEDIA="$(usex media)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_QT6=yes
+		-DENABLE_QTWEBENGINE="$(usex webengine)"
+		-DENABLE_SHOWMYSKY=$(usex show-my-sky)
+		-DENABLE_SCRIPTING=$(usex scripting)
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_XLSX="$(usex xlsx)"
+		-DUSE_PLUGIN_LENSDISTORTIONESTIMATOR="$(usex lens-distortion)"
+		-DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
+		"$(cmake_use_find_package doc Doxygen)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc ; then
+		cmake_build apidoc
+	fi
+}
+
+src_install() {
+	if use doc ; then
+		local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
+		dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
+	fi
+	cmake_src_install
+
+	# use the more up-to-date system fonts
+	rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+
+	if use stars ; then
+		insinto /usr/share/${PN}/stars/default
+		doins "${DISTDIR}"/stars_4_1v0_2.cat
+		doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
+	fi
+	if use deep-sky ; then
+		insinto /usr/share/${PN}/nebulae/default
+		newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
+	fi
+	newicon doc/images/stellarium-logo.png ${PN}.png
+}
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index 202731030399..4c6b5d73032b 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST qalculate-gtk-5.3.0.tar.gz 2963963 BLAKE2B a7d827b62c5a771b401c0d7578293d60ec3a68721e00521baed05f202bee9464e3d75be097dbcff2d11883b5988c13c34245bf3eb7779ca5dffa55e31e7304e2 SHA512 d36165e1e4321c64d99a788110f0a567e51649a62f563f2a24be470d3cf302da3840c65634336b7d0508858fa2f77aae94531f9447298b32891bcf60e87d625f
 DIST qalculate-gtk-5.4.0.tar.gz 3003465 BLAKE2B c863b50aa0a400ce6c77423878ddd1ad4b77529273b7de424da3456343008a558712bd6cdf73a913930130b2c93516b716d504a41d190bda5b592543afb2ac4e SHA512 e9a30220d19b207a4b9dc5b0690b117135432afe60255eae148acc14d38b24157fe67d9b7f6dd45c9a862d6d28e9fad2f594d56274a1a4b6d431dc577089acfc
+DIST qalculate-gtk-5.5.0.tar.gz 3007792 BLAKE2B 32f4621be47236a156c11d7512dff15cf76089da53bd17c6a47171f5788642dfdef2d83eaa62c927e83240445a16f68cea176a618f45d03d19e6d272ff29b7aa SHA512 2dbc04cf687e93ec7a32c43f8b11c51a2211705dbbd9de73a70c97b6f972bb7558abe00f9c94e0718f07c87ce789e819782e5c5eed50de1dd099ceb32a875cda
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-5.5.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-5.5.0.ebuild
new file mode 100644
index 000000000000..91844fafdd1a
--- /dev/null
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-5.5.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: bump with sci-libs/libqalculate and sci-calculators/qalculate-qt!
+
+inherit optfeature xdg
+
+DESCRIPTION="Modern multi-purpose calculator"
+HOMEPAGE="https://qalculate.github.io/"
+SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-libs/glib:2
+	>=sci-libs/libqalculate-${PV}:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/gdbus-codegen
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Required by src_test() and `make check`
+	cat >po/POTFILES.skip <<-EOF || die
+		# Required by make check
+		data/calendarconversion.ui
+		data/periodictable.ui
+	EOF
+
+	default
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "gnuplot support" sci-libs/libqalculate[gnuplot]
+}
diff --git a/sci-calculators/qalculate-qt/Manifest b/sci-calculators/qalculate-qt/Manifest
index 7073fc804117..89168d97e480 100644
--- a/sci-calculators/qalculate-qt/Manifest
+++ b/sci-calculators/qalculate-qt/Manifest
@@ -1,2 +1,3 @@
 DIST qalculate-qt-5.3.0.tar.gz 1850298 BLAKE2B b93a9a698d905f07e5856f09bd07c408a495514e2bb72a858400567e8d95399dcdd6b84ed52ffc4ccec19e4d2bfa500860b2e7aec888244090676d087e5727ac SHA512 841461dca4fa97d9dc3cff57de050b5c0d1dabe06c151149484a85b66540b038f6d3270ca96a34a65fbd9e71da26ce1068f2df76adc365e74a0e4d2220ccc909
 DIST qalculate-qt-5.4.0.tar.gz 1879385 BLAKE2B 07ed9e3a968ac634fab5a01e4c3a97e60dedf666c98d5c2efdec67db946eb4770be7e32f3d1e9f0482030dbed0468c907c54787bc2d6b0c438d10258bdd32dec SHA512 30f30d904211ebf3ac57d1d5ddb1235763731bc93ced86507b94accfd1b320d7dcfe5c3a030bd2ae41e94bea53b4b68412faa5cc9a8ff54b52dd18b602011985
+DIST qalculate-qt-5.5.0.tar.gz 1882778 BLAKE2B 5cdf49490799120d1fd5feffa95382a8420d8104e131e9c9c995b5205494e8bdfdc5101147bf4cc26b347d7680d1b0090d49f7ff5e053c0e2789dd8ba7b400a6 SHA512 789cf3971248d8d3a395022d09d17e758ae796c008a55adf8086f83dc7eab31cbb0f886da8c1c4e46713c9d1f1fb1ade3a60cc673c5f467731b24408aaf8efb4
diff --git a/sci-calculators/qalculate-qt/qalculate-qt-5.5.0.ebuild b/sci-calculators/qalculate-qt/qalculate-qt-5.5.0.ebuild
new file mode 100644
index 000000000000..101933bc74ba
--- /dev/null
+++ b/sci-calculators/qalculate-qt/qalculate-qt-5.5.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bump with sci-libs/libqalculate and sci-calculators/qalculate-gtk!
+
+inherit optfeature qmake-utils xdg
+
+DESCRIPTION="Qt-based UI for libqalculate"
+HOMEPAGE="https://github.com/Qalculate/qalculate-qt"
+SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-qt/qtbase:6[gui,network,widgets]
+	>=sci-libs/libqalculate-${PV}:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+src_configure() {
+	eqmake6 PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "gnuplot support" sci-libs/libqalculate[gnuplot]
+}
diff --git a/sci-chemistry/dssp/dssp-4.4.10.ebuild b/sci-chemistry/dssp/dssp-4.4.10.ebuild
index d5e51fe40fec..52cf9b1a6a0f 100644
--- a/sci-chemistry/dssp/dssp-4.4.10.ebuild
+++ b/sci-chemistry/dssp/dssp-4.4.10.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 # doc disabled as it only generates a PDF from the manpage for now
 # https://github.com/PDB-REDO/dssp/issues/64
 #IUSE="doc"
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 975f179885b5..2a69594a5cae 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,2 +1,3 @@
 DIST gazebo-11.13.0.tar.bz2 56636967 BLAKE2B 7c0ef875711e832a213631d97584edc2300d25be6d538d6f2ac782ab279b6518e1fb7c59d895a1c7b92fbaec46bb0e7c505afb34f05ab2eece016f5bd15a7c3f SHA512 a77ce4a02f723c615738d11a13aa10fa5124705bc9ca95153477d8df25b296eef7d442769379d3888a9ba0f04c1e5a3e38d686e7b5eef393b91bdc78f792c390
 DIST gazebo-11.14.0.tar.bz2 56640328 BLAKE2B 9712118339593edd6c3cc1321ffa3d60f9f986abecc858d0709a0ddd1600a00620b26141300083dcfbc8ff699ae01a21340190cda04b276d146e93ccd1bfc6dc SHA512 365bda1be67745b6b40834a059f220351559e962df5f7254c80d363a04cc4beb092d20eaa357469d87f64c00fd3c6b2480693d7b1d734b0b42a75eb0ba687e34
+DIST gazebo-11.15.1.tar.bz2 111639491 BLAKE2B 1a97fd04980310ed8e775c5ba8aa36af6d60ea0235c467ade763a4d7cb2ca72008bae2299c73018f89b0d5b12c23f3663948fd0a5c91b58a3cf235b49ffaa975 SHA512 085bd71f2495d86752274c02578d4e30d49f4e35dc91226ad11242f0cc5129f98686dfbae83120d228036d2034beb21b9cd1be91505a48d4ccc757d19cecb111
diff --git a/sci-electronics/gazebo/files/boost187.patch b/sci-electronics/gazebo/files/boost187.patch
new file mode 100644
index 000000000000..30fe4a82fa4d
--- /dev/null
+++ b/sci-electronics/gazebo/files/boost187.patch
@@ -0,0 +1,198 @@
+Index: gazebo-11.15.1/gazebo/transport/Connection.cc
+===================================================================
+--- gazebo-11.15.1.orig/gazebo/transport/Connection.cc
++++ gazebo-11.15.1/gazebo/transport/Connection.cc
+@@ -73,7 +73,7 @@ IOManager *Connection::iomanager = NULL;
+ // is stolen from adress::is_unspecified function in boost v1.52.
+ static bool addressIsUnspecified(const boost::asio::ip::address_v4 &_addr)
+ {
+-  return _addr.to_ulong() == 0;
++  return _addr.to_uint() == 0;
+ }
+ 
+ // Version 1.52 of boost has an address::is_loopback function, but
+@@ -81,7 +81,7 @@ static bool addressIsUnspecified(const b
+ // is stolen from adress::is_loopback function in boost v1.52.
+ static bool addressIsLoopback(const boost::asio::ip::address_v4 &_addr)
+ {
+-  return (_addr.to_ulong() & 0xFF000000) == 0x7F000000;
++  return (_addr.to_uint() & 0xFF000000) == 0x7F000000;
+ }
+ 
+ //////////////////////////////////////////////////
+@@ -151,15 +151,15 @@ bool Connection::Connect(const std::stri
+     host = _host.substr(7, _host.size() - 7);
+ 
+   // Resolve the host name into an IP address
+-  boost::asio::ip::tcp::resolver::iterator end;
+   boost::asio::ip::tcp::resolver resolver(iomanager->GetIO());
+-  boost::asio::ip::tcp::resolver::query query(host, service,
++
++  auto res = resolver.resolve(host, service,
+       boost::asio::ip::resolver_query_base::numeric_service);
+-  boost::asio::ip::tcp::resolver::iterator endpointIter;
++  auto endpointIter = res.begin();
++  auto end = res.end();
+ 
+   try
+   {
+-    endpointIter = resolver.resolve(query);
+ 
+     // Find the first valid IPv4 address
+     for (; endpointIter != end &&
+@@ -690,9 +690,9 @@ boost::asio::ip::tcp::endpoint Connectio
+   if (hostname && !std::string(hostname).empty())
+   {
+     boost::asio::ip::tcp::resolver resolver(iomanager->GetIO());
+-    boost::asio::ip::tcp::resolver::query query(hostname, "");
+-    boost::asio::ip::tcp::resolver::iterator iter = resolver.resolve(query);
+-    boost::asio::ip::tcp::resolver::iterator end;
++    auto res = resolver.resolve(hostname, "");
++    auto iter = res.begin();
++    auto end = res.end();
+ 
+     // Loop through the results, and stop at the first valid address.
+     while (iter != end)
+@@ -724,7 +724,7 @@ boost::asio::ip::tcp::endpoint Connectio
+             << "] is invalid. We will still try to use it, be warned.\n";
+     }
+ 
+-    address = boost::asio::ip::address_v4::from_string(ip);
++    address = boost::asio::ip::make_address_v4(ip);
+   }
+ 
+   // Try to automatically find a valid address if GAZEBO_IP and
+@@ -774,7 +774,7 @@ boost::asio::ip::tcp::endpoint Connectio
+         if (!ValidateIP(host))
+           continue;
+ 
+-        address = boost::asio::ip::address_v4::from_string(host);
++        address = boost::asio::ip::make_address_v4(host);
+ 
+         // Also make sure that the IP address is not a loopback interface.
+         if (!addressIsLoopback(address))
+@@ -868,7 +868,7 @@ boost::asio::ip::tcp::endpoint Connectio
+       "but will almost certainly not work if you have remote processes."
+       "Report to the disc-zmq development team to seek a fix." << std::endl;
+   }
+-  address = boost::asio::ip::address_v4::from_string(retAddr);
++  address = boost::asio::ip::make_address_v4(retAddr);
+ #endif
+   }
+ 
+@@ -923,8 +923,9 @@ std::string Connection::GetHostname(boos
+   else
+   {
+     boost::asio::ip::tcp::resolver resolver(iomanager->GetIO());
+-    boost::asio::ip::tcp::resolver::iterator iter = resolver.resolve(_ep);
+-    boost::asio::ip::tcp::resolver::iterator end;
++    auto res = resolver.resolve(_ep);
++    auto iter = res.begin();
++    auto end = res.end();
+ 
+     while (iter != end)
+     {
+@@ -950,7 +951,7 @@ std::string Connection::GetLocalHostname
+ 
+ //////////////////////////////////////////////////
+ void Connection::OnConnect(const boost::system::error_code &_error,
+-    boost::asio::ip::tcp::resolver::iterator /*_endPointIter*/)
++    boost::asio::ip::tcp::resolver::results_type::iterator /*_endPointIter*/)
+ {
+   // This function is called when a connection is successfully (or
+   // unsuccessfully) established.
+Index: gazebo-11.15.1/gazebo/transport/Connection.hh
+===================================================================
+--- gazebo-11.15.1.orig/gazebo/transport/Connection.hh
++++ gazebo-11.15.1/gazebo/transport/Connection.hh
+@@ -409,7 +409,7 @@ namespace gazebo
+       /// \param[in] _error Error code thrown during connection
+       /// \param[in] _endPointIter Pointer to resolver iterator
+       private: void OnConnect(const boost::system::error_code &_error,
+-                  boost::asio::ip::tcp::resolver::iterator _endPointIter);
++                  boost::asio::ip::tcp::resolver::results_type::iterator _endPointIter);
+ 
+       /// \brief Socket pointer
+       private: boost::asio::ip::tcp::socket *socket;
+Index: gazebo-11.15.1/gazebo/transport/IOManager.cc
+===================================================================
+--- gazebo-11.15.1.orig/gazebo/transport/IOManager.cc
++++ gazebo-11.15.1/gazebo/transport/IOManager.cc
+@@ -17,6 +17,7 @@
+ #include <atomic>
+ #include <boost/bind/bind.hpp>
+ #include <boost/thread/thread.hpp>
++#include <boost/asio/executor_work_guard.hpp>
+ #include <iostream>
+ #include "gazebo/transport/IOManager.hh"
+ 
+@@ -28,10 +29,10 @@ namespace transport
+ class IOManagerPrivate
+ {
+   /// \brief IO service.
+-  public: boost::asio::io_service *io_service = nullptr;
++  public: boost::asio::io_context *io_service = nullptr;
+ 
+   /// \brief Use io_service::work to keep the io_service running in thread.
+-  public: boost::asio::io_service::work *work = nullptr;
++  //public: boost::asio::executor_work_guard<boost::asio::io_context> work;
+ 
+   /// \brief Reference count of connections using this IOManager.
+   public: std::atomic_int count;
+@@ -44,12 +45,11 @@ class IOManagerPrivate
+ IOManager::IOManager()
+   : dataPtr(new IOManagerPrivate)
+ {
+-  this->dataPtr->io_service = new boost::asio::io_service;
+-  this->dataPtr->work = new boost::asio::io_service::work(
+-      *this->dataPtr->io_service);
++  this->dataPtr->io_service = new boost::asio::io_context;
++  //this->dataPtr->work = boost::asio::make_work_guard(*this->dataPtr->io_service);
+   this->dataPtr->count = 0;
+   this->dataPtr->thread = new boost::thread(boost::bind(
+-      &boost::asio::io_service::run, this->dataPtr->io_service));
++      &boost::asio::io_context::run, this->dataPtr->io_service));
+ }
+ 
+ /////////////////////////////////////////////////
+@@ -57,9 +57,6 @@ IOManager::~IOManager()
+ {
+   this->Stop();
+ 
+-  delete this->dataPtr->work;
+-  this->dataPtr->work = nullptr;
+-
+   delete this->dataPtr->io_service;
+   this->dataPtr->io_service = nullptr;
+ 
+@@ -70,7 +67,7 @@ IOManager::~IOManager()
+ /////////////////////////////////////////////////
+ void IOManager::Stop()
+ {
+-  this->dataPtr->io_service->reset();
++  this->dataPtr->io_service->restart();
+   this->dataPtr->io_service->stop();
+   if (this->dataPtr->thread)
+   {
+@@ -81,7 +78,7 @@ void IOManager::Stop()
+ }
+ 
+ /////////////////////////////////////////////////
+-boost::asio::io_service &IOManager::GetIO()
++boost::asio::io_context &IOManager::GetIO()
+ {
+   return *this->dataPtr->io_service;
+ }
+Index: gazebo-11.15.1/gazebo/transport/IOManager.hh
+===================================================================
+--- gazebo-11.15.1.orig/gazebo/transport/IOManager.hh
++++ gazebo-11.15.1/gazebo/transport/IOManager.hh
+@@ -42,7 +42,7 @@ namespace gazebo
+ 
+       /// \brief Get handle to boost::asio IO service
+       /// \return Handle to boost::asio IO service
+-      public: boost::asio::io_service &GetIO();
++      public: boost::asio::io_context &GetIO();
+ 
+       /// \brief Increment the event count by 1
+       public: void IncCount();
diff --git a/sci-electronics/gazebo/gazebo-11.15.1.ebuild b/sci-electronics/gazebo/gazebo-11.15.1.ebuild
new file mode 100644
index 000000000000..d5dea1bebd8b
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-11.15.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A 3D multiple robot simulator with dynamics"
+HOMEPAGE="https://gazebosim.org/home"
+SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# Subslot = major version = soname of libs
+SLOT="0/11"
+KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_sse2 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/protobuf-2:=
+	virtual/opengl
+	media-libs/openal
+	net-misc/curl
+	dev-libs/tinyxml
+	>=dev-libs/tinyxml2-6:=
+	dev-libs/libtar
+	dev-cpp/tbb:=
+	>=dev-games/ogre-1.7.4:=[freeimage]
+	<dev-games/ogre-1.10
+	>=media-libs/freeimage-3.15.4[png]
+	sci-libs/libccd
+	>=media-video/ffmpeg-2.6:0=
+	sci-libs/gts
+	>=sci-physics/bullet-2.82:=
+	>=dev-libs/sdformat-9.8:=
+	dev-qt/qtwidgets:5
+	dev-qt/qtcore:5
+	dev-qt/qtopengl:5
+	dev-libs/boost:=
+	sci-libs/gdal:=
+	virtual/libusb:1
+	dev-libs/libspnav
+	media-libs/freeimage
+	sci-libs/hdf5:=[cxx]
+	sys-apps/util-linux
+	>=media-gfx/graphviz-4
+	net-libs/ignition-msgs:5=
+	sci-libs/ignition-math:6=
+	net-libs/ignition-transport:8=
+	sci-libs/ignition-common:3=
+	sci-libs/ignition-fuel-tools:4=
+	x11-libs/qwt:6=[qt5(+)]
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+	x11-apps/mesa-progs
+	test? ( dev-libs/libxslt )
+"
+BDEPEND="
+	app-text/ronn-ng
+	app-arch/gzip
+	virtual/pkgconfig
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=(
+	"${FILESDIR}/qwt2.patch"
+	"${FILESDIR}/cmake.patch"
+	"${FILESDIR}/boost187.patch"
+)
+
+src_configure() {
+	# find OGRE properly
+	sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
+
+	local mycmakeargs=(
+		"-DUSE_UPSTREAM_CFLAGS=OFF"
+		"-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
+		"-DUSE_HOST_CFLAGS=FALSE"
+		"-DBUILD_TESTING=$(usex test TRUE FALSE)"
+		"-DENABLE_SCREEN_TESTS=FALSE"
+		"-DUSE_EXTERNAL_TINYXML2=TRUE"
+	)
+	cmake_src_configure
+}
diff --git a/sci-electronics/librepcb/Manifest b/sci-electronics/librepcb/Manifest
index b213eb0e1df5..c0e37f05e957 100644
--- a/sci-electronics/librepcb/Manifest
+++ b/sci-electronics/librepcb/Manifest
@@ -1 +1 @@
-DIST librepcb-1.1.0-source.zip 15373750 BLAKE2B 6f8ba8d66b95373e4760aae617b423e71fcb89ceb39703ce4547a390e4ad0630866632d9bad01f93780fdb8c3452ec0424e753ef891402e440686c64eba56495 SHA512 2ca02095d89547e17813fcfeadedd48fb9345d177885c9d21a8d313d864c6f02243eb13a33341c474bc0671a66ef6b00b6329760aeb3439fdb10123f2db9d38b
+DIST librepcb-1.2.0-source.zip 15923398 BLAKE2B b7ec8dc5ff4b9531e4614defe8e95ec4bf3da796f5aece8d849aed6dfa3d352149fbdb928cf5b24510266977dd9648634ab89a7e675f29d990849bb314a252e8 SHA512 a7e7a0e4e433000db39501874240652d85fe3a2be08f442c72138b70ec3faa0e8117399a997f2083e31d54a5f9276c02fa5a101d3855fad8d1c5cd78f1d80a8f
diff --git a/sci-electronics/librepcb/librepcb-1.1.0-r2.ebuild b/sci-electronics/librepcb/librepcb-1.1.0-r2.ebuild
deleted file mode 100644
index 023d688196a6..000000000000
--- a/sci-electronics/librepcb/librepcb-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2009-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake virtualx xdg
-
-DESCRIPTION="Free EDA software to develop printed circuit boards"
-HOMEPAGE="https://librepcb.org/"
-SRC_URI="https://download.librepcb.org/releases/${PV}/${P}-source.zip"
-S="${WORKDIR}/${PN}-${PV/_/-}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="opencascade"
-
-RDEPEND="
-	dev-cpp/muParser:=
-	>=dev-libs/quazip-1.3-r2:=[qt6(+)]
-	dev-qt/qtbase:6[concurrent,gui,network,opengl,sql,sqlite,ssl,widgets]
-	dev-qt/qtdeclarative:6
-	dev-qt/qtsvg:6
-	media-libs/libglvnd[X]
-	sys-libs/zlib
-	virtual/glu
-	opencascade? ( sci-libs/opencascade:= )"
-
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-
-BDEPEND="
-	app-arch/unzip
-	dev-qt/qttools:6[linguist]"
-
-src_configure() {
-	local mycmakeargs=(
-		-DQT_MAJOR_VERSION=6
-		-DUNBUNDLE_GTEST=ON
-		-DUNBUNDLE_MUPARSER=ON
-		-DUNBUNDLE_QUAZIP=ON
-		-DUSE_OPENCASCADE=$(usex opencascade 1 0)
-		-DBUILD_TESTS=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/tests/unittests || die
-	# https://github.com/LibrePCB/LibrePCB/issues/516
-	# virtx ./librepcb-unittests --gtest_filter=-SystemInfoTest.testGetUsername
-	virtx ./librepcb-unittests --gtest_filter=-SystemInfoTest.testGetUsername:CategoryTreeModelTest.testSort:BoardPlaneFragmentsBuilderTest.testFragments:BoardGerberExportTest.test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ewarn
-	ewarn "LibrePCB builds might not be exactly reproducible with e.g. -march={native,haswell,...}."
-	ewarn "This can cause minor issues, see for example:"
-	ewarn "https://github.com/LibrePCB/LibrePCB/issues/516"
-	ewarn "For a completely reproducible build use: -march=x86-64."
-	ewarn
-}
diff --git a/sci-electronics/librepcb/librepcb-1.2.0.ebuild b/sci-electronics/librepcb/librepcb-1.2.0.ebuild
new file mode 100644
index 000000000000..9ac74c9d417e
--- /dev/null
+++ b/sci-electronics/librepcb/librepcb-1.2.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2009-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Free EDA software to develop printed circuit boards"
+HOMEPAGE="https://librepcb.org/"
+SRC_URI="https://download.librepcb.org/releases/${PV}/${P}-source.zip"
+S="${WORKDIR}/${PN}-${PV/_/-}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="opencascade test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/muParser:=
+	>=dev-libs/quazip-1.3-r2:=[qt6(+)]
+	dev-qt/qtbase:6[concurrent,gui,network,opengl,sql,sqlite,ssl,widgets]
+	dev-qt/qtdeclarative:6
+	dev-qt/qtsvg:6
+	media-libs/libglvnd[X]
+	sys-libs/zlib
+	virtual/glu
+	opencascade? ( sci-libs/opencascade:= )"
+
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+
+BDEPEND="
+	app-arch/unzip
+	dev-qt/qttools:6[linguist]"
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT_MAJOR_VERSION=6
+		-DUNBUNDLE_GTEST=ON
+		-DUNBUNDLE_MUPARSER=ON
+		-DUNBUNDLE_QUAZIP=ON
+		-DUSE_OPENCASCADE=$(usex opencascade 1 0)
+		-DBUILD_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QT_QPA_PLATFORM=offscreen
+	cd "${BUILD_DIR}"/tests/unittests || die
+	# https://github.com/LibrePCB/LibrePCB/issues/516
+	./librepcb-unittests --gtest_filter=-SystemInfoTest.testGetUsername:CategoryTreeModelTest.testSort:BoardPlaneFragmentsBuilderTest.testFragments:BoardGerberExportTest.test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ewarn
+	ewarn "LibrePCB builds might not be exactly reproducible with e.g. -march={native,haswell,...}."
+	ewarn "This can cause minor issues, see for example:"
+	ewarn "https://github.com/LibrePCB/LibrePCB/issues/516"
+	ewarn "For a completely reproducible build use: -march=x86-64."
+	ewarn
+}
diff --git a/sci-electronics/nvc/Manifest b/sci-electronics/nvc/Manifest
index 9f4f68dd390c..9a1fe44512d6 100644
--- a/sci-electronics/nvc/Manifest
+++ b/sci-electronics/nvc/Manifest
@@ -1,2 +1,3 @@
 DIST nvc-1.14.1.tar.gz 2033076 BLAKE2B 8c17d08aaf01d8dec293530b9e28e37261396e846433a574532e7d1c68bd13424879e25a00e186e46523fa73b9e731a624088312c8133b3fa0d5626f42681d8b SHA512 13648a8c9b952a64c0ec053f733f359ee138a0a3f02ac160ed8d7ac2ace0db658a9092695229a0fe6d1bebf7bae4386969b6b2883e720ae6f4e8ab8098960cc2
 DIST nvc-1.14.2.tar.gz 2035337 BLAKE2B 999540938a31ea0d622eeaeca93a0910bcd7af1d36470b9ecbee37dfc53dba6c1a56d543665c7b8ada18a81d0755818d6b570d06610e139436a1c53d57d0241c SHA512 90b9be206628784f39eac721e92e70a5b9b2b6043973f51b18f45df8c50e642bddcc149c02a8bea6d433b91d5fac1678107581832ca24f433f63e1450162fb2d
+DIST nvc-1.15.0.tar.gz 2110906 BLAKE2B 0b451e35c535af09660567f176b217eeeeb17203ef9ab6f6f16796e981bf92da4b27c9251642bf5abd8ff63c292154013c739d3c7fa131368f4b5d865e234c9a SHA512 965bd7ff8bd1c59317f8d2c7c2e466f41e009765ea18dd09212c844a8142cd1aa5d5e20db4628285f3d3998345e2a0ccf2a89081fcdf3baa6abe777163c46ac5
diff --git a/sci-electronics/nvc/nvc-1.15.0.ebuild b/sci-electronics/nvc/nvc-1.15.0.ebuild
new file mode 100644
index 000000000000..5770424e35be
--- /dev/null
+++ b/sci-electronics/nvc/nvc-1.15.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {18..19} )
+
+inherit autotools bash-completion-r1 llvm-r1
+
+DESCRIPTION="NVC is a VHDL compiler and simulator"
+HOMEPAGE="https://www.nickg.me.uk/nvc/
+	https://github.com/nickg/nvc/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/nickg/nvc.git"
+
+	NVC_SOURCEDIR="${WORKDIR}/${PN}-${PV}"
+else
+	SRC_URI="https://github.com/nickg/nvc/archive/r${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+
+	NVC_SOURCEDIR="${WORKDIR}/${PN}-r${PV}"
+fi
+
+NVC_BUILDDIR="${NVC_SOURCEDIR}_BuildDir"
+S="${NVC_BUILDDIR}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug llvm"
+RESTRICT="test"         # Some tests fail.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/zstd:=
+	dev-libs/capstone:=
+	dev-libs/elfutils
+	dev-libs/icu:=
+	dev-libs/libffi:=
+	dev-libs/libxml2:=
+	sys-libs/ncurses:=
+	sys-libs/zlib:=
+	llvm? (
+		$(llvm_gen_dep '
+			llvm-core/llvm:${LLVM_SLOT}=
+		')
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-libs/check
+	sys-apps/which
+	sys-devel/bison
+	sys-devel/flex
+"
+
+PATCHES=( "${FILESDIR}/nvc-1.9.2-jit-code-capstone.patch" )
+
+# Special libraries for NVC.
+QA_FLAGS_IGNORED="usr/lib[0-9]*/nvc/preload[0-9]*.so"
+
+pkg_setup() {
+	use llvm && llvm-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	mkdir -p "${S}" || die
+}
+
+src_prepare() {
+	pushd "${NVC_SOURCEDIR}" >/dev/null || die
+
+	default
+	eautoreconf
+
+	popd >/dev/null || die
+}
+
+src_configure() {
+	# Needs "bison" and "flex" exactly.
+	unset LEX
+	unset YACC
+
+	local ECONF_SOURCE="${NVC_SOURCEDIR}"
+	local -a myconf=(
+		--enable-vital
+		--with-bash-completion="$(get_bashcompdir)"
+		$(use_enable debug)
+		$(use_enable llvm)
+	)
+	econf "${myconf[@]}"
+
+	export V=1          # Verbose compilation and install.
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_test() {
+	PATH="${S}/bin:${PATH}" emake check-TESTS
+}
+
+src_install() {
+	default
+
+	mv "${D}/$(get_bashcompdir)"/nvc{.bash,} || die
+	dostrip -x "/usr/$(get_libdir)/nvc"
+}
diff --git a/sci-electronics/pulseview/files/pulseview-0.5.0-glibmm-2.68-required.patch b/sci-electronics/pulseview/files/pulseview-0.5.0-glibmm-2.68-required.patch
new file mode 100644
index 000000000000..46309724517a
--- /dev/null
+++ b/sci-electronics/pulseview/files/pulseview-0.5.0-glibmm-2.68-required.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -120,14 +120,7 @@
+ 
+ list(APPEND PKGDEPS glib-2.0>=2.28.0)
+ 
+-# Try to find the prefered glibmm-2.4. If not found then add glibmm-2.68
+-# to the dependency list.
+-pkg_check_modules(GLIBMM_2_4 glibmm-2.4>=2.28.0)
+-if(GLIBMM_2_4_FOUND)
+-	list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
+-else()
+-	list(APPEND PKGDEPS glibmm-2.68>=2.68.0)
+-endif()
++list(APPEND PKGDEPS glibmm-2.68>=2.68.0)
+ 
+ if(ENABLE_FLOW)
+ 	list(APPEND PKGDEPS gstreamermm-1.0>=1.8.0)
diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild
index f6e44dc48a2f..80e69f8085ed 100644
--- a/sci-electronics/pulseview/pulseview-9999.ebuild
+++ b/sci-electronics/pulseview/pulseview-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="8"
+EAPI=8
 
 inherit cmake xdg-utils
 
@@ -20,25 +20,25 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="+decode static"
 
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
 RDEPEND="
-	>=dev-cpp/glibmm-2.28.0:2
+	>=dev-cpp/glibmm-2.68.0:2.68
 	dev-libs/boost:=
 	>=dev-libs/glib-2.28.0:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
+	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtsvg:6
 	>=sci-libs/libsigrok-0.6.0:=[cxx]
 	decode? ( >=sci-libs/libsigrokdecode-0.6.0:= )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	virtual/pkgconfig
+"
 
 DOCS=( HACKING NEWS README )
 
+PATCHES=( "${FILESDIR}/${PN}-0.5.0-glibmm-2.68-required.patch" )
+
 src_prepare() {
 	cmake_src_prepare
 	cmake_comment_add_subdirectory manual
@@ -47,6 +47,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_WERROR=TRUE
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON
 		-DENABLE_DECODE=$(usex decode)
 		-DSTATIC_PKGDEPS_LIBS=$(usex static)
 	)
diff --git a/sci-geosciences/folium/Manifest b/sci-geosciences/folium/Manifest
index 00176557ca89..2441b32dbbb0 100644
--- a/sci-geosciences/folium/Manifest
+++ b/sci-geosciences/folium/Manifest
@@ -1,2 +1,2 @@
-DIST folium-0.19.2.tar.gz 8193746 BLAKE2B 65a3a45748b9f42e6a76057b554e3759806912bbb4336848c25e5ddb7cf6f5d04f8a4e786ca400a99f28c2f8a02607d9dc9e5edb15770c158eecd4a0843806a8 SHA512 df932f599308105b0e2bb8db2bad35e25ed823c3ed34abc36d494a80e671f683c0d6debdf8d20fc22e5582e2072ccd8307707b5fdab0d62bc128898d6c795073
 DIST folium-0.19.3.tar.gz 8193962 BLAKE2B 956cb050527270ffa54a2d8331e453e10359ebf99be0e37decffd512cd3f1a3dfde626840608d9e84621b9a4b0e5f5cd278d8cf25533debe8b5e2a1a88b51fe6 SHA512 2ff2fca474ff7ab911b184a2b144ca5253bc04a673f61f668efcd9ea2041f50ed3172daab7ae86209bd1aa51da3894358cfb0eec7203de9692886aea88c2a202
+DIST folium-0.19.4.tar.gz 8189535 BLAKE2B a4453f3bd6d2e36d2768f904aa0a621aad25c43ad16d6f774a1ff651c102d05cd567e359eaab20c27d63a62c9fa87b014defcd468c1b0105ff1243111fed85fd SHA512 79cd52a7fd77a6446512cd7bae29bb2200c61d3fb3c7e895e24aa8905d8936c65ba3730204eeda2851db91bbdde14de042cc70d423c76e6e61d60e84301f9afb
diff --git a/sci-geosciences/folium/folium-0.19.2.ebuild b/sci-geosciences/folium/folium-0.19.2.ebuild
deleted file mode 100644
index fa0fbce0df38..000000000000
--- a/sci-geosciences/folium/folium-0.19.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-inherit distutils-r1
-
-DESCRIPTION="Python Data, Leaflet.js Maps"
-HOMEPAGE="https://github.com/python-visualization/folium"
-SRC_URI="https://github.com/python-visualization/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.1-gentoo.patch
-)
-
-RDEPEND="sci-geosciences/xyzservices[${PYTHON_USEDEP}]
-	sci-libs/branca[${PYTHON_USEDEP}]
-	dev-python/jinja2[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/setuptools-scm
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	tests/selenium									# require chromedriver
-	tests/test_folium.py							# require geopandas
-	tests/plugins/test_time_slider_choropleth.py	# require geopandas
-	tests/test_repr.py								# require geckodriver
-)
-
-python_test() {
-	epytest -m 'not web'
-}
diff --git a/sci-geosciences/folium/folium-0.19.4.ebuild b/sci-geosciences/folium/folium-0.19.4.ebuild
new file mode 100644
index 000000000000..1f4b583ab221
--- /dev/null
+++ b/sci-geosciences/folium/folium-0.19.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+inherit distutils-r1
+
+DESCRIPTION="Python Data, Leaflet.js Maps"
+HOMEPAGE="https://github.com/python-visualization/folium"
+SRC_URI="https://github.com/python-visualization/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15.1-gentoo.patch
+)
+
+RDEPEND="sci-geosciences/xyzservices[${PYTHON_USEDEP}]
+	sci-libs/branca[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/setuptools-scm
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	tests/selenium									# require chromedriver
+	tests/test_folium.py							# require geopandas
+	tests/plugins/test_time_slider_choropleth.py	# require geopandas
+	tests/test_repr.py								# require geckodriver
+)
+
+python_test() {
+	epytest -m 'not web'
+}
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 0cd04002d070..725d82208498 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,2 +1,3 @@
 DIST gpxsee-13.27.tar.gz 5639124 BLAKE2B f3e10b1580e6e96f106d789abf9273530a36f528e4971b430c4b83d0a056f065a08faca28d850a7983df7fc7cc5fcab1d564a88d4337ad7ea4c33b4e2b22579c SHA512 88ed97d6a6813385ce9194d7b18935f410fc69f25072f0a5de20ac19464a1be9ec7c28ac9de2533b3153bb6d43ab2f84428faef0c687d2dffbb39bad4df1c96b
 DIST gpxsee-13.33.tar.gz 5557400 BLAKE2B b1aaf16567ab4f35120cf5dd43f9c29136f8dfe04ba85d4876ed135a5f84ebf3626aac9cb1c63cd7b732245a6fbb76bcedb3255d6157796a7a68c938f1da8d1e SHA512 9ae1c59ca9e3b1ceb36fb1923da7f599c6c3f11be05d789629a0a425c11a634cf5a98f78390fb5b0838f7da4e96cce807fe146d0125671d3567b17cbbf1ae9cb
+DIST gpxsee-13.34.tar.gz 5559175 BLAKE2B 40c702c5cb4e333738be3591fd5c3660f8d616a8689b529dae324baf2dfcc0bd460d4ccd715947fbcd7bd9be605e4516d0ab4abfc8389b3c49b3cc3a04532295 SHA512 424dbfc60ec3dd4802e69616d5cd35d26e4131ad2ed366eaced3539ea2afe1e44c8e3343f85d408fce6c5b186cf8085bfb01182e891859521778321877b9452e
diff --git a/sci-geosciences/gpxsee/gpxsee-13.34.ebuild b/sci-geosciences/gpxsee/gpxsee-13.34.ebuild
new file mode 100644
index 000000000000..3bdb41535e80
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-13.34.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="GPXSee"
+PLOCALES="ca cs da de en eo es fi fr hu it ko nb pl pt_BR ru sv tr uk zh_CN"
+inherit plocale qmake-utils xdg
+
+DESCRIPTION="Viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="https://www.gpxsee.org/ https://github.com/tumic0/GPXSee"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-qt/qtbase:6=[concurrent,gui,network,opengl,sql,widgets]
+	dev-qt/qtpositioning:6
+	dev-qt/qtsvg:6
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtserialport:6
+"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
+
+src_prepare() {
+	default
+
+	plocale_find_changes lang "${PN}_" '.ts'
+
+	rm_ts() {
+		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+	}
+
+	plocale_for_each_disabled_locale rm_ts
+}
+
+src_configure() {
+	$(qt6_get_bindir)/lrelease gpxsee.pro || die "lrelease failed"
+	eqmake6 gpxsee.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README.md
+}
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index 0317f3747524..a0a54dbf4a74 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -2,5 +2,8 @@ DIST josm-bin-19253.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b8
 DIST josm-bin-19253.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0
 DIST josm-bin-19265.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7 SHA512 328bc131d5985cd164e3ffa27f61241098329ac01954e1cdde1dcab92261eb3e84d69c9b158f2bb944b02f373c3868bea1850ae335f9dabe3c2314d16d651394
 DIST josm-bin-19265.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0
+DIST josm-bin-19277.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7 SHA512 328bc131d5985cd164e3ffa27f61241098329ac01954e1cdde1dcab92261eb3e84d69c9b158f2bb944b02f373c3868bea1850ae335f9dabe3c2314d16d651394
+DIST josm-bin-19277.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0
 DIST josm-snapshot-19253.jar 18361067 BLAKE2B b2765e33c73e7ed3b9bbc72ba52ed6df142a81f9ee31ecf1b20e8dbe79cf61e18fab80c15dbbeaf9b29c06d1f04c0f362a157ef3a0993a1baa7a1eadca00b6b8 SHA512 36d40422080cf6f14db53623796ce73d6c61f956916493021f2002146f8f254781caa3fd48c905f1f78b0baff63b51c6566620c2e5627f505e15b1a794dfc1f7
 DIST josm-snapshot-19265.jar 18383098 BLAKE2B 986ac6b09a1ac042da5ec922914da7cc6a752b3c2bde8281fe24fdc395534d4bedd4b166e7f0b616ad233f03d2926cbe071f06a2440bc6812ccb13cf3783288a SHA512 6c13b9ab7849265df153af0c2cf0b00ec0f73cacb15b16c0d7e4e5fb3e73e15b15b769f279ee51f89539c7c479060a8676892d6cf869ddbb0158bd57c3dbf7ee
+DIST josm-snapshot-19277.jar 18592729 BLAKE2B 37171bb80822168b923b0b0e6564a71a243bc7ac5397fd3f9c748b9658480d6a6f59bfa899c01fdc132ab10ce175732d256bf8f2ca5f505343821d5cabe62695 SHA512 c95817edb1694fc0a35bf69cfb2efc6eabea8ba97d0c86b9da258b6eb5fd1d22dad1bfc371f6a0fa3189765db48353d0d72ca9185b8943ddc455d73e889a2719
diff --git a/sci-geosciences/josm-bin/josm-bin-19277.ebuild b/sci-geosciences/josm-bin/josm-bin-19277.ebuild
new file mode 100644
index 000000000000..23f514e83b7c
--- /dev/null
+++ b/sci-geosciences/josm-bin/josm-bin-19277.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop java-utils-2 xdg
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="https://josm.openstreetmap.de/"
+# PV should be stable here https://josm.openstreetmap.de/wiki/StartupPage
+SRC_URI="
+	https://josm.openstreetmap.de/download/josm-snapshot-${PV}.jar
+	https://josm.openstreetmap.de/export/${PV}/josm/trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop -> ${P}.desktop
+	https://josm.openstreetmap.de/export/${PV}/josm/trunk/native/linux/tested/usr/share/mime/packages/josm.xml \
+		-> ${P}.mime.xml
+"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0 GPL-2+ GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8"
+BDEPEND="app-arch/unzip"
+
+src_unpack() {
+	default
+
+	cp "${DISTDIR}/${P}.desktop" "org.openstreetmap.${PN}.desktop" || die
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's/^Exec=josm/Exec=josm-bin/' "org.openstreetmap.${PN}.desktop" || die
+	sed -i -e 's/^Icon=org.openstreetmap.josm/Icon=org.openstreetmap.josm-bin/' "org.openstreetmap.${PN}.desktop" || die
+}
+
+src_install() {
+	java-pkg_newjar "${DISTDIR}/josm-snapshot-${PV}.jar" ${PN}.jar
+	java-pkg_dolauncher ${PN} --jar ${PN}.jar \
+		--java_args "\
+			--add-exports=java.base/sun.security.action=ALL-UNNAMED \
+			--add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED \
+			--add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED"
+
+	local icon_size
+	for icon_size in 16 32 48; do
+		newicon -s ${icon_size} -t hicolor \
+			images/logo_${icon_size}x${icon_size}x32.png "org.openstreetmap.${PN}.png"
+		newicon -s ${icon_size} -t locolor \
+			images/logo_${icon_size}x${icon_size}x8.png "org.openstreetmap.${PN}.png"
+	done
+	newicon -s scalable images/logo.svg "org.openstreetmap.${PN}.svg"
+	domenu "${WORKDIR}/org.openstreetmap.${PN}.desktop"
+	insinto /usr/share/mime/packages
+	newins "${DISTDIR}/${P}.mime.xml" "${PN}.xml"
+}
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 7a04578bb1f6..bec627eadcd2 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,2 +1,2 @@
 DIST qmapshack-1.17.1.tar.gz 56704889 BLAKE2B 1fda3f9874f39eb6b7a0c71ac7b681ebc0f6ea7ae2eefae2b6de4d780556fc5aee45aff230bebcf6ba025959beccffe14a59002fd9552b339892956d2fdd5c50 SHA512 79bdeb59e366cefb2d2a6c9bd084760b5935c93f385a6f2d26bdd25bb4af6939003decc4659afd1567a3b6698a0048e5c79baa716139fc20a96cc0e8dc206d9c
-DIST qmapshack-1.17.1_p601.tar.gz 56720740 BLAKE2B 7fd8232e0c5b693d565897dff90ac6c6012918f2739d9cbfa48e7629e3a905609f47b9665d1a7666a131da64739a499a54f9959d275ab4c7f013db0e83d9760a SHA512 9378e1d42a6217cbf169fc67476765f6700886b59518a1c800c5a639b2822e8116cabaac28c147f3a52014bb2393deb1a8e8b7b9c4112f1990361d0376530c80
+DIST qmapshack-1.17.1_p602.tar.gz 56718904 BLAKE2B 1ff2176373201b77f232a6158d853dce1916137f524b05cfd3703314425a293c09a776c417f092b7fda60fd417476736ddaea0e756349fe27e8da38e511ab55d SHA512 3620e3a2f9f5bd3e251779116539bbc6d7bdeb5b25c99df68ee5c6922d31eb3de1019ef02297db92690edba78204c48f163f4223a5f1e0b11c8603a3756d8b17
diff --git a/sci-geosciences/qmapshack/files/dbus-r1.patch b/sci-geosciences/qmapshack/files/dbus-r1.patch
deleted file mode 100644
index 0ab4294f63ad..000000000000
--- a/sci-geosciences/qmapshack/files/dbus-r1.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff '--color=auto' -ur qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/CMakeLists.txt qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/CMakeLists.txt
---- qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/CMakeLists.txt	2024-09-30 20:02:57.701618381 +0200
-+++ qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/CMakeLists.txt	2024-09-30 20:05:59.159600329 +0200
-@@ -200,9 +200,9 @@
- 
- if(USE_QT6DBus)
-     find_package(Qt6DBus REQUIRED)
--    if(Qt5DBus_FOUND)
-+    if(Qt6DBus_FOUND)
-         add_definitions(-DHAVE_DBUS)
--    endif(Qt5DBus_FOUND)
-+    endif(Qt6DBus_FOUND)
- endif(USE_QT6DBus)
- 
- # Everything included. Let's finetune the mess a bit more
-diff '--color=auto' -ur qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/src/qmapshack/CMakeLists.txt qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/src/qmapshack/CMakeLists.txt
---- qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/src/qmapshack/CMakeLists.txt	2024-09-30 20:02:57.687618460 +0200
-+++ qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/src/qmapshack/CMakeLists.txt	2024-09-30 20:06:51.470306845 +0200
-@@ -368,12 +368,12 @@
- )
- 
- 
--if(Qt5DBus_FOUND)
-+if(Qt6DBus_FOUND)
- set( SRCS
-     ${SRCS}
-     device/CDeviceWatcherLinux.cpp
- )
--endif(Qt5DBus_FOUND)
-+endif(Qt6DBus_FOUND)
- 
- 
- if (APPLE)
-@@ -746,12 +746,12 @@
- )
- 
- 
--if(Qt5DBus_FOUND)
-+if(Qt6DBus_FOUND)
- set( HDRS
-     ${HDRS}
-     device/CDeviceWatcherLinux.h
- )
--endif(Qt5DBus_FOUND)
-+endif(Qt6DBus_FOUND)
- 
- 
- if(APPLE)
-@@ -977,11 +977,11 @@
-     )
- endif(${DEVELOPMENT_VERSION})
- 
--if(Qt5DBus_FOUND)
-+if(Qt6DBus_FOUND)
-     set(DBUS_LIB Qt6::DBus)
--else(Qt5DBus_FOUND)
-+else(Qt6DBus_FOUND)
-     set(DBUS_LIB)
--endif(Qt5DBus_FOUND)
-+endif(Qt6DBus_FOUND)
- 
- target_link_libraries(${APPLICATION_NAME}
-     Qt6::Widgets
diff --git a/sci-geosciences/qmapshack/qmapshack-1.17.1_p601.ebuild b/sci-geosciences/qmapshack/qmapshack-1.17.1_p601.ebuild
deleted file mode 100644
index 656f6b3977ce..000000000000
--- a/sci-geosciences/qmapshack/qmapshack-1.17.1_p601.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="GPS mapping utility"
-HOMEPAGE="https://github.com/Maproom/qmapshack/wiki"
-COMMIT="b53959a305587f0a7f2330b99267b3b24abb76f4"
-SRC_URI="https://github.com/Maproom/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${COMMIT}
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="dbus"
-
-RDEPEND="
-	dev-db/sqlite
-	>=dev-libs/quazip-1.3:0=[qt6]
-	dev-qt/qt5compat:6
-	dev-qt/qtbase:6[dbus,gui,network,sql,widgets,xml]
-	dev-qt/qtdeclarative:6
-	dev-qt/qttools:6[assistant,widgets]
-	dev-qt/qtwebengine:6[widgets]
-	sci-geosciences/routino
-	sci-libs/alglib
-	sci-libs/gdal:=
-	sci-libs/proj:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/qttools:6[linguist]"
-
-PATCHES=( "${FILESDIR}"/dbus-r1.patch )
-
-src_configure() {
-	local mycmakeargs=( -DUSE_QT6DBus=$(usex dbus) )
-	cmake_src_configure
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}/html
-	cmake_src_install
-	mv "${D}"/usr/share/doc/HTML "${D}"/usr/share/doc/${PF}/html || die "mv Qt help failed"
-	ewarn "An experimental Qt6 port"
-	ewarn "Translations and the help system are broken"
-	ewarn "Other bugs to https://github.com/Maproom/qmapshack/issues"
-}
diff --git a/sci-geosciences/qmapshack/qmapshack-1.17.1_p602.ebuild b/sci-geosciences/qmapshack/qmapshack-1.17.1_p602.ebuild
new file mode 100644
index 000000000000..e1c1be1c79ab
--- /dev/null
+++ b/sci-geosciences/qmapshack/qmapshack-1.17.1_p602.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="GPS mapping utility"
+HOMEPAGE="https://github.com/Maproom/qmapshack/wiki"
+COMMIT="23d6fe3e11bd251f123fdba1f1cf2ac8170d4f83"
+SRC_URI="https://github.com/Maproom/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus"
+
+RDEPEND="
+	dev-db/sqlite
+	>=dev-libs/quazip-1.3:0=[qt6]
+	dev-qt/qt5compat:6
+	dev-qt/qtbase:6[dbus,gui,network,sql,widgets,xml]
+	dev-qt/qtdeclarative:6
+	dev-qt/qttools:6[assistant,widgets]
+	dev-qt/qtwebengine:6[widgets]
+	sci-geosciences/routino
+	sci-libs/alglib
+	sci-libs/gdal:=
+	sci-libs/proj:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+src_configure() {
+	local mycmakeargs=( -DUSE_QT6DBus=$(usex dbus) )
+	cmake_src_configure
+}
+
+src_install() {
+	docompress -x /usr/share/doc/${PF}/html
+	cmake_src_install
+	mv "${D}"/usr/share/doc/HTML "${D}"/usr/share/doc/${PF}/html || die "mv Qt help failed"
+	ewarn "An experimental Qt6 port"
+	ewarn "Translations and the help system are broken"
+	ewarn "Other bugs to https://github.com/Maproom/qmapshack/issues"
+}
diff --git a/sci-libs/NNPACK/NNPACK-2020.12.22-r2.ebuild b/sci-libs/NNPACK/NNPACK-2020.12.22-r2.ebuild
deleted file mode 100644
index 73905610fde2..000000000000
--- a/sci-libs/NNPACK/NNPACK-2020.12.22-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake python-any-r1
-
-CommitId=c07e3a0400713d546e0dea2d5466dd22ea389c73
-
-DESCRIPTION="acceleration package for neural network computations"
-HOMEPAGE="https://github.com/Maratyszcza/NNPACK/"
-SRC_URI="https://github.com/Maratyszcza/${PN}/archive/${CommitId}.tar.gz
-	-> ${P}.tar.gz"
-
-S="${WORKDIR}"/${PN}-${CommitId}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=test
-RESTRICT="test" # consuming too much CPU
-
-RDEPEND="
-	dev-libs/pthreadpool
-	dev-libs/cpuinfo
-"
-DEPEND="${RDEPEND}
-	dev-libs/FP16
-	dev-libs/FXdiv
-	dev-libs/psimd
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? ( dev-cpp/gtest )
-	$(python_gen_any_dep '
-		dev-python/peachpy[${PYTHON_USEDEP}]
-	')
-"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-python_check_deps() {
-	python_has_version "dev-python/peachpy[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	sed -i -e "/-O/d" CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNNPACK_BUILD_TESTS=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/NNPACK/NNPACK-2020.12.22-r3.ebuild b/sci-libs/NNPACK/NNPACK-2020.12.22-r3.ebuild
new file mode 100644
index 000000000000..413cbf8eac5e
--- /dev/null
+++ b/sci-libs/NNPACK/NNPACK-2020.12.22-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake python-single-r1
+
+CommitId=c07e3a0400713d546e0dea2d5466dd22ea389c73
+
+DESCRIPTION="acceleration package for neural network computations"
+HOMEPAGE="https://github.com/Maratyszcza/NNPACK/"
+SRC_URI="https://github.com/Maratyszcza/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=test
+RESTRICT="test" # consuming too much CPU
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/pthreadpool
+	dev-libs/cpuinfo
+	$(python_gen_cond_dep '
+		<=dev-libs/FP16-2024.05.27[${PYTHON_USEDEP}]
+		dev-python/peachpy[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}
+	dev-libs/FXdiv
+	dev-libs/psimd
+"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	sed -i -e "/-O/d" CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DNNPACK_BUILD_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/cfitsio/cfitsio-4.5.0.ebuild b/sci-libs/cfitsio/cfitsio-4.5.0.ebuild
index 537c27cab1eb..9d18e9b89812 100644
--- a/sci-libs/cfitsio/cfitsio-4.5.0.ebuild
+++ b/sci-libs/cfitsio/cfitsio-4.5.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
@@ -11,7 +11,7 @@ SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/10-r1"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~hppa ~loong ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bzip2 curl test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/composable-kernel/Manifest b/sci-libs/composable-kernel/Manifest
index 9272a772facf..7bdbbc67114a 100644
--- a/sci-libs/composable-kernel/Manifest
+++ b/sci-libs/composable-kernel/Manifest
@@ -1,3 +1,4 @@
 DIST composable-kernel-5.7.1.tar.gz 2158402 BLAKE2B 660c205c2a99cd17f29a9077e9e7b8b88e41f42ab40d92d0a235e7a60683a04234cce6b2eb6110265c2f461dd132c40151b2521b7d64df4cebb7f27094d8b2b0 SHA512 3931c5dbcab59513541103ebf7446311a1e318421a9e12aeafa7a98cf0717a75e1519140e6b2fbcaf4cb90829a11f03a724ff3ccc6636139c61667ac82558c55
 DIST composable-kernel-6.1.1.tar.gz 2520967 BLAKE2B 549d76c5c36b0a273a4c51159abd162403ad035520f97c43dd4b66560ad30021199d2f4cf7e2c12ffe33beee2fb49604db6d7c40b3b33fdcbfde111b9d4833aa SHA512 3f7667cea91760447c3f6ac0bfc261c0bca95abafbfce209d1c889e04f01ec29849e8d7f0e1cb1d77a4309ac06b3c2557721a773e4a67be383de91668cb279b2
+DIST composable-kernel-6.3.0.tar.gz 3376552 BLAKE2B ad3dde27d0134fa8bf6b5935603f7cac17c959ab7b123e8d69cfe82bee188ade0fe9d3666d46d9819de479e875e46c0fdad2574f68a3bcf0e9acbb871f163b24 SHA512 4fa7be3f54d06d894dca7ef9fa8e3db24971fb857fee96e7ccff89844fa466789756d5f140d2791a984311d59a044b5351d0358e676c218ea0b0aadf60954d8e
 DIST gtest-1.14.0_p20220421.tar.gz 849107 BLAKE2B e9c32d9c1d98959583b696430a6be411f5d69e3db96669b16cffc0f1dcad42512391c0a4733f6e829c82953ff33fa243ee782f3cf6e86436f0d290f45d1a3db7 SHA512 967aac7d85da0e216fe13b17d10f894a31d763d9b88201bac7d3dfc37600552b5472d30a166a6ef27f2778677e73fd3e43d082695a48f47824262eb9cd4fcd2f
diff --git a/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild b/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild
index 44abf5d59c81..59853bd41e85 100644
--- a/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild
+++ b/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="${ROCM_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-util/hip
+	dev-util/hip:${SLOT}
 	>=dev-db/sqlite-3.17
 	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
 	>=dev-libs/boost-1.72
diff --git a/sci-libs/composable-kernel/composable-kernel-6.3.0.ebuild b/sci-libs/composable-kernel/composable-kernel-6.3.0.ebuild
new file mode 100644
index 000000000000..bbd6854cb1e8
--- /dev/null
+++ b/sci-libs/composable-kernel/composable-kernel-6.3.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# shellcheck disable=SC2317
+EAPI=8
+
+ROCM_VERSION=${PV}
+PYTHON_COMPAT=( python3_{10..13} python3_13t )
+
+inherit cmake flag-o-matic python-r1 rocm
+
+GTEST_COMMIT="b85864c64758dec007208e56af933fc3f52044ee"
+GTEST_FILE="gtest-1.14.0_p20220421.tar.gz"
+
+DESCRIPTION="High Performance Composable Kernel for AMD GPUs"
+HOMEPAGE="https://github.com/ROCm/composable_kernel"
+SRC_URI="https://github.com/ROCm/composable_kernel/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )"
+S="${WORKDIR}/composable_kernel-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="debug profiler test"
+REQUIRED_USE="${ROCM_REQUIRED_USE} ${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/hip:${SLOT}
+	${PYTHON_DEPS}
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-build/rocm-cmake
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-enable-examples.patch
+	"${FILESDIR}"/${PN}-6.1.1-no-git-no-hash.patch
+	"${FILESDIR}"/${PN}-6.3.0-no-inline-all.patch
+	"${FILESDIR}"/${PN}-6.3.0-conditional-kernels.patch
+	"${FILESDIR}"/${PN}-6.3.0-conditional-ckprofiler.patch
+)
+
+pkg_pretend() {
+	targets=($AMDGPU_TARGETS)
+	if [[ ${#targets[@]} -gt 1 ]]; then
+		ewarn "composable-kernel will be compiled for multiple GPU architectures,"
+		ewarn "which will take a significant amount of time."
+		ewarn "Please consider setting AMDGPU_TARGETS USE_EXPAND variable to a single architecture."
+	fi
+}
+
+src_prepare() {
+	sed -e '/-Werror/d' -i cmake/EnableCompilerWarnings.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	rocm_use_hipcc
+
+	if ! use debug; then
+		append-cflags "-DNDEBUG"
+		append-cxxflags "-DNDEBUG"
+		CMAKE_BUILD_TYPE="Release"
+	else
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_DEV=OFF
+		-DGPU_TARGETS="$(get_amdgpu_flags)"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DCK_USE_PROFILER=$(usex profiler ON OFF)
+		-Wno-dev
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DFETCHCONTENT_SOURCE_DIR_GTEST="${WORKDIR}/googletest-${GTEST_COMMIT}"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	installation() {
+		python_domodule python/ck4inductor
+
+		# install package-data manually, as there is no PEP517 compliance
+		shopt -s globstar
+		package_data=(
+			include/ck/**/*.hpp
+			library/src/tensor_operation_instance/gpu/gemm_universal/**/*.hpp
+		)
+		shopt -u globstar
+
+		inst_path="${D}$(python_get_sitedir)/ck4inductor"
+		for file in "${package_data[@]}"; do
+			location="${inst_path}/$(dirname "$file")"
+			mkdir -p "${location}"
+			cp "${file}" "${location}"
+		done
+	}
+	python_foreach_impl installation
+}
+
+src_test() {
+	check_amdgpu
+	LD_LIBRARY_PATH="${BUILD_DIR}"/lib cmake_src_test -j1
+}
diff --git a/sci-libs/composable-kernel/files/composable-kernel-6.3.0-conditional-ckprofiler.patch b/sci-libs/composable-kernel/files/composable-kernel-6.3.0-conditional-ckprofiler.patch
new file mode 100644
index 000000000000..5a0c81de9879
--- /dev/null
+++ b/sci-libs/composable-kernel/files/composable-kernel-6.3.0-conditional-ckprofiler.patch
@@ -0,0 +1,17 @@
+Add a flag to build without ckprofiler, which takes few GB of space and not used in many cases.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -561,11 +561,13 @@ if(NOT GPU_ARCHS AND USER_GPU_TARGETS)
+    endif()
+ endif()
+ 
++if(CK_USE_PROFILER)
+ rocm_package_setup_component(profiler
+     LIBRARY_NAME composablekernel
+     PACKAGE_NAME ckprofiler
+ )
+ add_subdirectory(profiler)
++endif()
+ 
+ if(CK_USE_CODEGEN AND (GPU_TARGETS MATCHES "gfx9" OR GPU_ARCHS))
+   add_subdirectory(codegen)
diff --git a/sci-libs/composable-kernel/files/composable-kernel-6.3.0-conditional-kernels.patch b/sci-libs/composable-kernel/files/composable-kernel-6.3.0-conditional-kernels.patch
new file mode 100644
index 000000000000..64a8e0b96905
--- /dev/null
+++ b/sci-libs/composable-kernel/files/composable-kernel-6.3.0-conditional-kernels.patch
@@ -0,0 +1,16 @@
+Fix component discovery, when some targets are not installed.
+Upstream bug: https://github.com/ROCm/composable_kernel/issues/1646
+--- a/Config.cmake.in
++++ b/Config.cmake.in
+@@ -6,6 +6,10 @@ foreach(_comp ${composable_kernel_FIND_COMPONENTS})
+ 	if(NOT _comp IN_LIST _composable_kernel_supported_components)
+ 		set(composable_kernel_FOUND False)
+ 		set(composable_kernel_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}")
++	elseif(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/composable_kernel${_comp}Targets.cmake")
++		set(composable_kernel_FOUND False)
++		set(composable_kernel_NOT_FOUND_MESSAGE "Unsupported component for current targets: ${_comp}")
++	else()
++		include("${CMAKE_CURRENT_LIST_DIR}/composable_kernel${_comp}Targets.cmake")
+ 	endif()
+-	include("${CMAKE_CURRENT_LIST_DIR}/composable_kernel${_comp}Targets.cmake")
+ endforeach()
diff --git a/sci-libs/composable-kernel/files/composable-kernel-6.3.0-no-inline-all.patch b/sci-libs/composable-kernel/files/composable-kernel-6.3.0-no-inline-all.patch
new file mode 100644
index 000000000000..5ccf5239cb1e
--- /dev/null
+++ b/sci-libs/composable-kernel/files/composable-kernel-6.3.0-no-inline-all.patch
@@ -0,0 +1,16 @@
+Flag -amdgpu-early-inline-all explodes memory consumption, so that build does not fit 64GB of RAM.
+LLVM bug: https://github.com/llvm/llvm-project/issues/86332
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -213,11 +213,6 @@ if(NOT WIN32 AND check-coerce AND ${hip_VERSION_FLAT} GREATER 600241132 AND ${hi
+    message("Adding the amdgpu-coerce-illegal-types=1")
+    add_compile_options("SHELL: -mllvm -amdgpu-coerce-illegal-types=1")
+ endif()
+-if(NOT WIN32 AND ${hip_VERSION_FLAT} GREATER 600241132)
+-   message("Adding -amdgpu-early-inline-all=true and -amdgpu-function-calls=false")
+-   add_compile_options("SHELL: -mllvm -amdgpu-early-inline-all=true")
+-   add_compile_options("SHELL: -mllvm -amdgpu-function-calls=false")
+-endif()
+ #
+ # Seperate linking jobs from compiling
+ # Too many concurrent linking jobs can break the build
diff --git a/sci-libs/composable-kernel/metadata.xml b/sci-libs/composable-kernel/metadata.xml
index afd22272458c..304ae9aafa5e 100644
--- a/sci-libs/composable-kernel/metadata.xml
+++ b/sci-libs/composable-kernel/metadata.xml
@@ -9,6 +9,9 @@
     <email>sci@gentoo.org</email>
     <name>Science Project</name>
   </maintainer>
+	<use>
+		<flag name="profiler">Build and install the Composable Kernal profiler (ckProfiler)</flag>
+	</use>
   <upstream>
     <remote-id type="github">ROCm/composable_kernel</remote-id>
   </upstream>
diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index c8693334eeea..14d4573ca58f 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -1 +1,3 @@
 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
+DIST flann-1.9.2_p20221027-patches.tar.xz 10232 BLAKE2B 197dd8b81f4a7a43472e440de58a6eb7349e247514ac32a4de9d5c4ea9304da2ab6991f9561dd15fd005a4a55b14f40e4de05b324c55c50632fe9b8cd1f18371 SHA512 04bb6ff3d645ead761b37aa1e8873dc39cc8f910112fc64a55a941a4c0ab9d70a37caf018f1cc649debff04f0ac7cbbd0eb439a8a8d03b879bcddb73979e91c3
+DIST flann-1.9.2_p20221027.tar.gz 34644592 BLAKE2B 822afa518a1efcfd552cee7c9bd9e14587a450d5ddae50c4d225453ab56d7297ca73f5b5bda153aea9ff37e736942057ae071ac41e3d26ac1aeb03a408171162 SHA512 14cd7d3249109ce66c43258f8b9d158efa3b57f654708e76751290eba25e2cb7fc8044a1d882c6b24d0cda1a8b206709acdb5338086ca1f2d60fef35f0fa85be
diff --git a/sci-libs/flann/files/flann-1.9.1-boost-1.87.patch b/sci-libs/flann/files/flann-1.9.1-boost-1.87.patch
new file mode 100644
index 000000000000..a19b8a3f4183
--- /dev/null
+++ b/sci-libs/flann/files/flann-1.9.1-boost-1.87.patch
@@ -0,0 +1,60 @@
+--- a/src/cpp/flann/mpi/client.h
++++ b/src/cpp/flann/mpi/client.h
+@@ -45,17 +45,16 @@ class Client
+ public:
+ 	Client(const std::string& host, const std::string& service)
+ 	{
+-	    tcp::resolver resolver(io_service_);
+-	    tcp::resolver::query query(tcp::v4(), host, service);
+-	    iterator_ = resolver.resolve(query);
++	    tcp::resolver resolver(io_context_);
++            results_ = resolver.resolve(host, service);
+ 	}
+ 
+ 
+ 	template<typename ElementType, typename DistanceType>
+ 	void knnSearch(const flann::Matrix<ElementType>& queries, flann::Matrix<int>& indices, flann::Matrix<DistanceType>& dists, int knn, const SearchParams& params)
+ 	{
+-	    tcp::socket sock(io_service_);
+-	    sock.connect(*iterator_);
++	    tcp::socket sock(io_context_);
++	    boost::asio::connect(sock, results_);
+ 
+ 	    Request<ElementType> req;
+ 	    req.nn = knn;
+@@ -78,8 +77,8 @@ public:
+ 
+ 
+ private:
+-	boost::asio::io_service io_service_;
+-	tcp::resolver::iterator iterator_;
++	boost::asio::io_context io_context_;
++	tcp::resolver::results_type results_;
+ };
+ 
+ 
+--- a/src/cpp/flann/mpi/server.h
++++ b/src/cpp/flann/mpi/server.h
+@@ -119,18 +119,18 @@ public:
+ 	void run()
+ 	{
+ 		boost::mpi::communicator world;
+-		boost::shared_ptr<boost::asio::io_service> io_service;
++		boost::shared_ptr<boost::asio::io_context> io_context;
+ 		boost::shared_ptr<tcp::acceptor> acceptor;
+ 
+ 		if (world.rank()==0) {
+-			io_service.reset(new boost::asio::io_service());
+-			acceptor.reset(new tcp::acceptor(*io_service, tcp::endpoint(tcp::v4(), port_)));
++			io_context.reset(new boost::asio::io_context());
++			acceptor.reset(new tcp::acceptor(*io_context, tcp::endpoint(tcp::v4(), port_)));
+ 			std::cout << "Start listening for queries...\n";
+ 		}
+ 		for (;;) {
+ 			socket_ptr sock;
+ 			if (world.rank()==0) {
+-				sock.reset(new tcp::socket(*io_service));
++				sock.reset(new tcp::socket(*io_context));
+ 				acceptor->accept(*sock);
+ 				std::cout << "Accepted connection\n";
+ 			}
diff --git a/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch b/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch
index f29aef41977c..d0e9ea04bf09 100644
--- a/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch
+++ b/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch
@@ -9,12 +9,6 @@ Subject: [PATCH] build *.oct rather than *.mex files for octave
    LOCATION
 
 Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
----
- src/matlab/CMakeLists.txt | 28 ++++++++++++++++++----------
- 1 file changed, 18 insertions(+), 10 deletions(-)
-
-diff --git a/src/matlab/CMakeLists.txt b/src/matlab/CMakeLists.txt
-index a89b6b8..ebacaea 100755
 --- a/src/matlab/CMakeLists.txt
 +++ b/src/matlab/CMakeLists.txt
 @@ -16,9 +16,6 @@ endif()
diff --git a/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch b/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch
index 4cf8f3a990fc..fccac407c1e6 100644
--- a/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch
+++ b/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch
@@ -1,5 +1,5 @@
---- a/src/cpp/CMakeLists.txt	2019-02-14 21:58:41.567625108 +0100
-+++ b/src/cpp/CMakeLists.txt	2019-02-14 21:59:04.017920926 +0100
+--- a/src/cpp/CMakeLists.txt
++++ b/src/cpp/CMakeLists.txt
 @@ -34,7 +34,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AN
      target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
  
diff --git a/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch b/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch
index b37bedcf6d50..e199a511a48e 100644
--- a/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch
+++ b/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch
@@ -40,14 +40,6 @@ http://autobuild.buildroot.net/results/b2f/b2febfaf8c44ce477b3e4a5b9b976fd25e8d7
 [3] https://github.com/mariusmuja/flann/commit/0fd62b43be2fbb0b8d791ee36290791224dc030c
 
 Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- src/cpp/CMakeLists.txt | 4 ++--
- src/cpp/empty.cpp      | 1 +
- 2 files changed, 3 insertions(+), 2 deletions(-)
- create mode 100644 src/cpp/empty.cpp
-
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index b44a735..a816863 100644
 --- a/src/cpp/CMakeLists.txt
 +++ b/src/cpp/CMakeLists.txt
 @@ -29,7 +29,7 @@ if (BUILD_CUDA_LIB)
@@ -68,9 +60,6 @@ index b44a735..a816863 100644
          set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX)
          target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive)
      else()
-diff --git a/src/cpp/empty.cpp b/src/cpp/empty.cpp
-new file mode 100644
-index 0000000..40a8c17
 --- /dev/null
 +++ b/src/cpp/empty.cpp
 @@ -0,0 +1 @@
diff --git a/sci-libs/flann/files/flann-1.9.1-cuda-9.patch b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch
index 561c379af9ae..5f3483ea6756 100644
--- a/sci-libs/flann/files/flann-1.9.1-cuda-9.patch
+++ b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch
@@ -4,12 +4,6 @@ Date: Fri, 4 May 2018 07:50:24 +0000
 Subject: [PATCH] fix compilation via gcc and cuda 9.1 add missing #include
  <thrust/gather> to kdtree_cuda_3d_index.cu
 
----
- src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu
-index e9b05080..8465322e 100644
 --- a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu
 +++ b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu
 @@ -32,6 +32,7 @@
diff --git a/sci-libs/flann/files/flann-1.9.1-system-lz4.patch b/sci-libs/flann/files/flann-1.9.1-system-lz4.patch
index dcc9fedd4a97..04ef15939284 100644
--- a/sci-libs/flann/files/flann-1.9.1-system-lz4.patch
+++ b/sci-libs/flann/files/flann-1.9.1-system-lz4.patch
@@ -3,16 +3,6 @@ Date: Sun, 14 Oct 2018 00:25:05 +0200
 Subject: Use system version of liblz4
 
 Also make sure that flann_cpp is linked against LZ4.
----
- CMakeLists.txt                     | 3 +++
- cmake/flann.pc.in                  | 2 +-
- examples/CMakeLists.txt            | 3 +++
- src/cpp/CMakeLists.txt             | 8 ++++++--
- src/cpp/flann/util/serialization.h | 4 ++--
- 5 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a01fb7a..995e54e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -142,6 +142,9 @@ if (BUILD_CUDA_LIB)
@@ -25,8 +15,6 @@ index a01fb7a..995e54e 100644
  #set the C/C++ include path to the "include" directory
  include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src/cpp)
  
-diff --git a/cmake/flann.pc.in b/cmake/flann.pc.in
-index 82eee5e..07b8d64 100644
 --- a/cmake/flann.pc.in
 +++ b/cmake/flann.pc.in
 @@ -8,6 +8,6 @@ Name: @PROJECT_NAME@
@@ -37,8 +25,6 @@ index 82eee5e..07b8d64 100644
 +Libs: -L${libdir} @LZ4_STATIC_LDFLAGS@ -lflann -lflann_cpp
  Cflags: -I${includedir}
  
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index e9fef04..2b2bb9d 100644
 --- a/examples/CMakeLists.txt
 +++ b/examples/CMakeLists.txt
 @@ -3,6 +3,7 @@ add_custom_target(examples ALL)
@@ -65,8 +51,6 @@ index e9fef04..2b2bb9d 100644
          target_link_libraries(flann_example_mpi flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES})
  
          add_dependencies(examples flann_example_mpi)
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index b453b27..5c4f693 100644
 --- a/src/cpp/CMakeLists.txt
 +++ b/src/cpp/CMakeLists.txt
 @@ -4,11 +4,12 @@ add_definitions(-D_FLANN_VERSION=${FLANN_VERSION})
@@ -108,8 +92,6 @@ index b453b27..5c4f693 100644
  
          if(MINGW AND OPENMP_FOUND)
            target_link_libraries(flann gomp)
-diff --git a/src/cpp/flann/util/serialization.h b/src/cpp/flann/util/serialization.h
-index d731021..cdc2e5e 100644
 --- a/src/cpp/flann/util/serialization.h
 +++ b/src/cpp/flann/util/serialization.h
 @@ -6,8 +6,8 @@
diff --git a/sci-libs/flann/files/flann-1.9.2-asio-boost187.patch b/sci-libs/flann/files/flann-1.9.2-asio-boost187.patch
new file mode 100644
index 000000000000..be8961c6af68
--- /dev/null
+++ b/sci-libs/flann/files/flann-1.9.2-asio-boost187.patch
@@ -0,0 +1,55 @@
+From 8972fc0ebb7f26e8f1f985d3ada52f9cd4510207 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 16 Dec 2024 15:48:52 +0100
+Subject: [PATCH] Update asio for boost 1.87
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/src/cpp/flann/mpi/client.h b/src/cpp/flann/mpi/client.h
+index 19a410c..8b7fbed 100644
+--- a/src/cpp/flann/mpi/client.h
++++ b/src/cpp/flann/mpi/client.h
+@@ -45,9 +45,8 @@ class Client
+ public:
+ 	Client(const std::string& host, const std::string& service)
+ 	{
+-	    tcp::resolver resolver(io_service_);
+-	    tcp::resolver::query query(tcp::v4(), host, service);
+-	    iterator_ = resolver.resolve(query);
++	    boost::asio::ip::basic_resolver<tcp> resolver(io_service_);
++	    iterator_ = resolver.resolve(tcp::v4(), host, service).begin();
+ 	}
+ 
+ 
+@@ -78,8 +77,8 @@ public:
+ 
+ 
+ private:
+-	boost::asio::io_service io_service_;
+-	tcp::resolver::iterator iterator_;
++	boost::asio::io_context io_service_;
++	boost::asio::ip::basic_resolver_iterator<tcp> iterator_;
+ };
+ 
+ 
+diff --git a/src/cpp/flann/mpi/server.h b/src/cpp/flann/mpi/server.h
+index 2caab43..9d10280 100644
+--- a/src/cpp/flann/mpi/server.h
++++ b/src/cpp/flann/mpi/server.h
+@@ -119,11 +119,11 @@ public:
+ 	void run()
+ 	{
+ 		boost::mpi::communicator world;
+-		boost::shared_ptr<boost::asio::io_service> io_service;
++		boost::shared_ptr<boost::asio::io_context> io_service;
+ 		boost::shared_ptr<tcp::acceptor> acceptor;
+ 
+ 		if (world.rank()==0) {
+-			io_service.reset(new boost::asio::io_service());
++			io_service.reset(new boost::asio::io_context());
+ 			acceptor.reset(new tcp::acceptor(*io_service, tcp::endpoint(tcp::v4(), port_)));
+ 			std::cout << "Start listening for queries...\n";
+ 		}
+-- 
+2.47.1
+
diff --git a/sci-libs/flann/files/flann-1.9.2-boost-config.patch b/sci-libs/flann/files/flann-1.9.2-boost-config.patch
new file mode 100644
index 000000000000..2e3f8598bd79
--- /dev/null
+++ b/sci-libs/flann/files/flann-1.9.2-boost-config.patch
@@ -0,0 +1,23 @@
+From 5127212278ef3675f36e962dc2f057583ab80f57 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 16 Dec 2024 16:02:03 +0100
+Subject: [PATCH] boost config
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 64ead01..0e0b4dc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -108,7 +108,7 @@ endif(USE_MPI)
+ 
+ 
+ if (USE_MPI AND HDF5_IS_PARALLEL)
+-    find_package(Boost COMPONENTS mpi system serialization thread REQUIRED)
++    find_package(Boost COMPONENTS mpi system serialization thread REQUIRED CONFIG)
+     include_directories(${Boost_INCLUDE_DIRS})
+     add_definitions("-DHAVE_MPI")
+ endif()
+-- 
+2.47.1
+
diff --git a/sci-libs/flann/files/flann-1.9.2-system-gtest.patch b/sci-libs/flann/files/flann-1.9.2-system-gtest.patch
new file mode 100644
index 000000000000..f825cf3d529b
--- /dev/null
+++ b/sci-libs/flann/files/flann-1.9.2-system-gtest.patch
@@ -0,0 +1,36 @@
+From 4001b11f20ccfc291a355c52a090fa16e2f5a5f1 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 6 Jan 2025 16:13:09 +0100
+Subject: [PATCH] system gtest
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/cmake/flann_utils.cmake b/cmake/flann_utils.cmake
+index e02a6ff..544f87a 100644
+--- a/cmake/flann_utils.cmake
++++ b/cmake/flann_utils.cmake
+@@ -41,6 +41,13 @@ macro(find_hdf5)
+ endmacro(find_hdf5)
+ 
+ 
++if(BUILD_TESTS)
++enable_testing()
++find_package(GTest)
++if(GTest_FOUND)
++    set(googletest_LIBRARIES GTest::gtest)
++    add_library(googletest ALIAS GTest::gtest)
++else()
+ # Enable ExternalProject CMake module
+ include(ExternalProject)
+ 
+@@ -69,6 +76,8 @@ set(googletest_INCLUDE_DIRS ${source_dir}/googletest/include)
+ ExternalProject_Get_Property(googletest binary_dir)
+ set(googletest_LIBRARIES ${binary_dir}/lib/libgtest.a)
+ include_directories(${googletest_INCLUDE_DIRS})
++endif()
++endif()
+ 
+ 
+ macro(flann_add_gtest exe src)
+-- 
+2.47.1
diff --git a/sci-libs/flann/flann-1.9.1-r7.ebuild b/sci-libs/flann/flann-1.9.1-r7.ebuild
new file mode 100644
index 000000000000..8bd2008b221d
--- /dev/null
+++ b/sci-libs/flann/flann-1.9.1-r7.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake cuda flag-o-matic toolchain-funcs
+
+DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces"
+HOMEPAGE="https://github.com/mariusmuja/flann"
+SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cuda doc examples mpi octave openmp"
+
+BDEPEND="
+	app-arch/unzip
+	doc? ( dev-tex/latex2html )
+	mpi? ( app-admin/chrpath )
+"
+DEPEND="
+	app-arch/lz4:=
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
+	mpi? (
+		dev-libs/boost:=[mpi]
+		sci-libs/hdf5:=[mpi]
+	)
+	!mpi? ( !sci-libs/hdf5[mpi] )
+	octave? ( >=sci-mathematics/octave-3.6.4-r1:= )
+"
+RDEPEND="${DEPEND}"
+# TODO:
+# readd dependencies for test suite,
+# requires multiple ruby dependencies
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake-3.11{,-1}.patch # bug 678030
+	"${FILESDIR}"/${P}-cuda-9.patch
+	"${FILESDIR}"/${P}-system-lz4.patch # bug 681898
+	"${FILESDIR}"/${P}-system-lz4-pkgconfig.patch # bug 827263
+	"${FILESDIR}"/${P}-build-oct-rather-than-mex-files-for-octave.patch # bug 830424
+	"${FILESDIR}"/${P}-boost-1.87.patch # bug 946465
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	# bug #302621
+	use mpi && export CXX=mpicxx
+
+	use cuda && cuda_src_prepare
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+
+	# python bindings are split off into dev-python/pyflann
+	local mycmakeargs=(
+		-DBUILD_C_BINDINGS=ON
+		-DBUILD_PYTHON_BINDINGS=OFF
+		-DPYTHON_EXECUTABLE=
+		-DBUILD_CUDA_LIB=$(usex cuda)
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_DOC=$(usex doc)
+		-DBUILD_TESTS=OFF
+		-DBUILD_MATLAB_BINDINGS=$(usex octave)
+		-DUSE_MPI=$(usex mpi)
+		-DUSE_OPENMP=$(usex openmp)
+	)
+	use cuda && mycmakeargs+=(
+		-DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\""
+	)
+	use doc && mycmakeargs+=( -DDOCDIR=share/doc/${PF} )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name 'lib*.a' -delete || die
+
+	# bug 795828; mpicc volunterely adds some runpaths
+	if use mpi; then
+		chrpath -d "${ED}"/usr/bin/flann_mpi_{client,server} || die
+	fi
+}
diff --git a/sci-libs/flann/flann-1.9.2_p20221027.ebuild b/sci-libs/flann/flann-1.9.2_p20221027.ebuild
new file mode 100644
index 000000000000..d628a4efa00f
--- /dev/null
+++ b/sci-libs/flann/flann-1.9.2_p20221027.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake cuda toolchain-funcs
+
+DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces"
+HOMEPAGE="https://github.com/flann-lib/flann"
+COMMIT="f9caaf609d8b8cb2b7104a85cf59eb92c275a25d"
+SRC_URI="
+	https://github.com/flann-lib/${PN}/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz
+"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cuda doc examples mpi octave openmp test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		dev-tex/latex2html
+	)
+	mpi? (
+		app-admin/chrpath
+	)
+"
+DEPEND="
+	app-arch/lz4:=
+	cuda? (
+		dev-util/nvidia-cuda-toolkit:=
+	)
+	examples? (
+		sci-libs/hdf5:=[mpi?]
+	)
+	mpi? (
+		dev-libs/boost:=[mpi]
+		sci-libs/hdf5[mpi]
+	)
+	octave? (
+		>=sci-mathematics/octave-3.6.4-r1:=
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.1-build-oct-rather-than-mex-files-for-octave.patch # bug 830424
+	"${FILESDIR}"/${PN}-1.9.2-asio-boost187.patch
+	"${FILESDIR}"/${PN}-1.9.2-boost-config.patch
+	"${FILESDIR}"/${PN}-1.9.2-system-gtest.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	# bug #302621
+	use mpi && export CXX=mpicxx
+
+	cmake_src_prepare
+	for patch in "${WORKDIR}/${P}-patches"/*; do
+		eapply "${patch}"
+	done
+}
+
+src_configure() {
+
+	# python bindings are split off into dev-python/pyflann
+	local mycmakeargs=(
+		-DCMAKE_CXX_STANDARD=17
+		-DBUILD_C_BINDINGS="yes"
+		-DBUILD_PYTHON_BINDINGS="no"
+		-DBUILD_CUDA_LIB="$(usex cuda)"
+		-DBUILD_EXAMPLES="$(usex examples)"
+		-DBUILD_DOC="$(usex doc)"
+		-DBUILD_TESTS="$(usex test)"
+		-DBUILD_MATLAB_BINDINGS="$(usex octave)"
+		-DUSE_MPI="$(usex test "$(usex mpi)")"
+		-DUSE_OPENMP="$(usex openmp)"
+		-DCMAKE_BUILD_STATIC_LIBS="no"
+	)
+
+	if use cuda; then
+		cuda_add_sandbox -w
+
+		mycmakeargs+=(
+			-DCMAKE_CUDA_FLAGS="-Xcudafe \"--diag_suppress=partial_override\""
+		)
+		export CUDAHOSTCXX="$(cuda_gccdir)"
+		export CUDAHOSTLD="$(tc-getCXX)"
+	fi
+
+	use doc && mycmakeargs+=( -DDOCDIR="share/doc/${PF}" )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	local targets=( "all" )
+
+	use doc && targets+=( "doc" )
+
+	if use test; then
+		targets+=( "flann_gtests" )
+		if use cuda; then
+			targets+=( "flann_cuda_test" )
+		fi
+	fi
+
+	cmake_src_compile "${targets[@]}"
+}
+
+src_test() {
+	# some fail when run in parallel
+	cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	# bug 795828; mpicc voluntarily adds some runpaths
+	if use mpi; then
+		chrpath -d "${ED}/usr/bin/flann_mpi_"{client,server} || die
+	fi
+}
diff --git a/sci-libs/flann/metadata.xml b/sci-libs/flann/metadata.xml
index c33b2618d660..f54c9e238fb6 100644
--- a/sci-libs/flann/metadata.xml
+++ b/sci-libs/flann/metadata.xml
@@ -19,6 +19,6 @@
     <pkg>sci-mathematics/octave</pkg></flag>
   </use>
   <upstream>
-    <remote-id type="github">mariusmuja/flann</remote-id>
+    <remote-id type="github">flann-lib/flann</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/fplll/fplll-5.5.0.ebuild b/sci-libs/fplll/fplll-5.5.0.ebuild
index fc8117803c94..eb7593559926 100644
--- a/sci-libs/fplll/fplll-5.5.0.ebuild
+++ b/sci-libs/fplll/fplll-5.5.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="qd"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/gdal/files/gdal-3.9.1-poppler-24.12.patch b/sci-libs/gdal/files/gdal-3.9.1-poppler-24.12.patch
new file mode 100644
index 000000000000..9634de6e3941
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.9.1-poppler-24.12.patch
@@ -0,0 +1,27 @@
+From ada4fa75910dab127ee4b79256a676da6d4636c0 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Mon, 9 Dec 2024 18:18:31 +0100
+Subject: [PATCH] PDF: fix build issue on CondaForge build infrastructure (gcc
+ 13.3)
+
+Cf https://github.com/conda-forge/gdal-feedstock/pull/1019#issuecomment-2528710051
+---
+ frmts/pdf/pdfsdk_headers.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/frmts/pdf/pdfsdk_headers.h b/frmts/pdf/pdfsdk_headers.h
+index 00cc4067fe5b..d2a3a449d124 100644
+--- a/frmts/pdf/pdfsdk_headers.h
++++ b/frmts/pdf/pdfsdk_headers.h
+@@ -19,6 +19,11 @@
+ 
+ #ifdef HAVE_POPPLER
+ 
++// The "#define private public" hacks we do below do not play well with the
++// sstream header.
++// Cf https://github.com/conda-forge/gdal-feedstock/pull/1019#issuecomment-2528710051
++#include <sstream>
++
+ /* Horrible hack because there's a conflict between struct FlateDecode of */
+ /* include/poppler/Stream.h and the FlateDecode() function of */
+ /* pdfium/core/include/fpdfapi/fpdf_parser.h. */
diff --git a/sci-libs/gdal/gdal-3.9.1-r1.ebuild b/sci-libs/gdal/gdal-3.9.1-r1.ebuild
index ceed348d315a..aed89b4d8a58 100644
--- a/sci-libs/gdal/gdal-3.9.1-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.9.1-r1.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
@@ -102,6 +102,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch
+	"${FILESDIR}"/${P}-poppler-24.12.patch
 )
 
 pkg_setup() {
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 1e40fec0618c..93b6aa5079f8 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,3 +1,2 @@
-DIST geos-3.11.2.tar.bz2 6774288 BLAKE2B 62ddcaf5b6716983d49a6931c97ebe8d4c457ce7d127531ff3ff985555e9dfc2f1ebd211d1fe7afe183a3858913b4c22ec4674f68fb28ee8c43c9e9ce61abd3b SHA512 b5df5b773bef595335e1be6c6d3325f932f1577e2a4b8bdfa8cf26f09c7d41ed5e0695ca15826d1f95bc4a45b777839c2be8a96a8af5415c8bcf58cc804eb1ec
 DIST geos-3.12.1.tar.bz2 6727199 BLAKE2B 4ffc9cb63f3ac15b3dcb0ba9fec6a1ccaeaf35962a057234f4da38d6bba19df39e800805badfd56fe927da09c9392f0feaf2b7d02085e8f293c4d9503ab28ff9 SHA512 192eba83c651e935b3c9a5cc19321285e4d28b9da9d7a1fa15d9471803027e630db7a7ecea96343d9c5f9846d279062ca3694fe47916a4ebf5698ae66dd5210d
 DIST geos-3.13.0.tar.bz2 6801211 BLAKE2B 8de35093e2819268df2cd15f1661dcbaba6b9c3bd978904fb992fd91905b0056cfa6580cae602511bd8c4b19686597abb81e0af71a8a73a684cafd8013755bad SHA512 8ffaa3f49a8365db693ac948e9d66cf55321eb12151734c7da2775070b7804ffa607de2474b7019d6ea2a99d5e037fb1e8561bf9025e65ddd4bd1ba049382b28
diff --git a/sci-libs/geos/files/geos-3.11.1-gcc-13.patch b/sci-libs/geos/files/geos-3.11.1-gcc-13.patch
deleted file mode 100644
index 45054e860082..000000000000
--- a/sci-libs/geos/files/geos-3.11.1-gcc-13.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-https://github.com/libgeos/geos/commit/0e8d4368b8bd72a7d361286e8523ebce5cff6146
-https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1
-
-From 0e8d4368b8bd72a7d361286e8523ebce5cff6146 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyich@gmail.com>
-Date: Tue, 29 Nov 2022 23:10:22 +0000
-Subject: [PATCH] Add missing <cstdint> includes for gcc-13 (#743)
-
-Without the change build on `gcc-13` fails as:
-
-    geos/include/geos/geomgraph/TopologyLocation.h:143:52: error: 'uint32_t' has not been declared
-      143 |     bool isEqualOnSide(const TopologyLocation& le, uint32_t locIndex) const
-          |                                                    ^~~~~~~~
---- a/include/geos/geomgraph/Depth.h
-+++ b/include/geos/geomgraph/Depth.h
-@@ -24,6 +24,7 @@
- #include <geos/geom/Location.h>
- #include <geos/geom/Position.h>
- #include <string>
-+#include <cstdint>
- 
- // Forward declarations
- namespace geos {
---- a/include/geos/geomgraph/TopologyLocation.h
-+++ b/include/geos/geomgraph/TopologyLocation.h
-@@ -27,6 +27,7 @@
- #include <array>
- #include <string>
- #include <cassert>
-+#include <cstdint>
- 
- #ifdef _MSC_VER
- #pragma warning(push)
---- a/include/geos/io/WKTWriter.h
-+++ b/include/geos/io/WKTWriter.h
-@@ -24,6 +24,7 @@
- 
- #include <string>
- #include <cctype>
-+#include <cstdint>
- 
- #ifdef _MSC_VER
- #pragma warning(push)
---- a/include/geos/operation/overlayng/OverlayLabel.h
-+++ b/include/geos/operation/overlayng/OverlayLabel.h
-@@ -14,6 +14,8 @@
- 
- #pragma once
- 
-+#include <cstdint>
-+
- #include <geos/geom/Location.h>
- #include <geos/geom/Position.h>
- #include <geos/export.h>
---- a/include/geos/shape/fractal/HilbertCode.h
-+++ b/include/geos/shape/fractal/HilbertCode.h
-@@ -17,6 +17,7 @@
- 
- #include <geos/export.h>
- #include <string>
-+#include <cstdint>
- 
- // Forward declarations
- namespace geos {
---- a/include/geos/shape/fractal/MortonCode.h
-+++ b/include/geos/shape/fractal/MortonCode.h
-@@ -17,6 +17,7 @@
- 
- #include <geos/export.h>
- #include <string>
-+#include <cstdint>
- 
- // Forward declarations
- namespace geos {
-
-From bea3188be44075034fd349f5bb117c943bdb7fb1 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <mail@heiko-becker.de>
-Date: Mon, 23 Jan 2023 15:56:11 +0100
-Subject: [PATCH] Fix build with gcc 13 by including <cstdint> (#805)
-
-In addition to [1]. Otherwise geos fails to build with:
-"geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:40:28: error: expected ')' before 'p_level'
-   40 |     HilbertEncoder(uint32_t p_level, geom::Envelope& extent);
-      |                   ~        ^~~~~~~~
-      |                            )
-/var/tmp/paludis/build/sci-libs-geos-3.11.1/work/geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:41:5: error: 'uint32_t' does not name a type
-   41 |     uint32_t encode(const geom::Envelope* env);
-      |     ^~~~~~~~"
-
-[1] 0e8d4368b8bd72a7d361286e8523ebce5cff6146
---- a/include/geos/shape/fractal/HilbertEncoder.h
-+++ b/include/geos/shape/fractal/HilbertEncoder.h
-@@ -19,6 +19,7 @@
- #include <geos/geom/Geometry.h>
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- // Forward declarations
- namespace geos {
---- a/tests/unit/capi/GEOSMakeValidTest.cpp
-+++ b/tests/unit/capi/GEOSMakeValidTest.cpp
-@@ -9,6 +9,7 @@
- #include <cstdlib>
- #include <cmath>
- #include <cstring>
-+#include <cstdint>
- 
- #include "capi_test_utils.h"
- 
-
diff --git a/sci-libs/geos/files/geos-3.11.2-gcc-13.patch b/sci-libs/geos/files/geos-3.11.2-gcc-13.patch
deleted file mode 100644
index fa46cf8bf4d2..000000000000
--- a/sci-libs/geos/files/geos-3.11.2-gcc-13.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1
-
-From bea3188be44075034fd349f5bb117c943bdb7fb1 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <mail@heiko-becker.de>
-Date: Mon, 23 Jan 2023 15:56:11 +0100
-Subject: [PATCH] Fix build with gcc 13 by including <cstdint> (#805)
-
-In addition to [1]. Otherwise geos fails to build with:
-"geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:40:28: error: expected ')' before 'p_level'
-   40 |     HilbertEncoder(uint32_t p_level, geom::Envelope& extent);
-      |                   ~        ^~~~~~~~
-      |                            )
-/var/tmp/paludis/build/sci-libs-geos-3.11.1/work/geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:41:5: error: 'uint32_t' does not name a type
-   41 |     uint32_t encode(const geom::Envelope* env);
-      |     ^~~~~~~~"
-
-[1] 0e8d4368b8bd72a7d361286e8523ebce5cff6146
---- a/include/geos/shape/fractal/HilbertEncoder.h
-+++ b/include/geos/shape/fractal/HilbertEncoder.h
-@@ -19,6 +19,7 @@
- #include <geos/geom/Geometry.h>
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- // Forward declarations
- namespace geos {
---- a/tests/unit/capi/GEOSMakeValidTest.cpp
-+++ b/tests/unit/capi/GEOSMakeValidTest.cpp
-@@ -9,6 +9,7 @@
- #include <cstdlib>
- #include <cmath>
- #include <cstring>
-+#include <cstdint>
- 
- #include "capi_test_utils.h"
- 
-
diff --git a/sci-libs/geos/geos-3.11.2.ebuild b/sci-libs/geos/geos-3.11.2.ebuild
deleted file mode 100644
index ab3842bbb0c3..000000000000
--- a/sci-libs/geos/geos-3.11.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="https://libgeos.org/"
-SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? ( app-text/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-13.patch
-)
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/862702
-	# https://github.com/libgeos/geos/issues/1054
-	filter-lto
-
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_TESTING=$(usex test)
-		-DUSE_CCACHE=OFF
-
-		# bug #709368
-		$(usev arm '-DDISABLE_GEOS_INLINE=ON')
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_src_compile docs
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc ; then
-		HTML_DOCS=( "${BUILD_DIR}"/doxygen/doxygen_docs/html/. )
-		einstalldocs
-	fi
-}
diff --git a/sci-libs/hipBLAS-common/Manifest b/sci-libs/hipBLAS-common/Manifest
new file mode 100644
index 000000000000..562e011d456d
--- /dev/null
+++ b/sci-libs/hipBLAS-common/Manifest
@@ -0,0 +1 @@
+DIST hipBLAS-common-6.3.0.tar.gz 7512 BLAKE2B d074cd925f06619028bf1a5b5ae69f10b8852ef321a9ec6f92b3fe1f63baadc90f8fa39872e433f81bbed072364dd63d0b37bfa49bdc0d9faef5027b52af6c1e SHA512 3812a277fbde7bee2f3ab6040e89b97dd60385797bdab942907d59d01d684cc4ec84476333e9e6efded90400d6f99daad669d027ceb46c9dfe3a0d5d24e584d3
diff --git a/sci-libs/hipBLAS-common/hipBLAS-common-6.3.0.ebuild b/sci-libs/hipBLAS-common/hipBLAS-common-6.3.0.ebuild
new file mode 100644
index 000000000000..8b3b0df3907e
--- /dev/null
+++ b/sci-libs/hipBLAS-common/hipBLAS-common-6.3.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+DESCRIPTION="Common files shared by hipBLAS and hipBLASLt"
+HOMEPAGE="https://github.com/ROCm/hipBLAS-common"
+SRC_URI="https://github.com/ROCm/hipBLAS-common/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/hipBLAS-common-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-build/rocm-cmake"
diff --git a/sci-libs/hipBLAS-common/metadata.xml b/sci-libs/hipBLAS-common/metadata.xml
new file mode 100644
index 000000000000..308181fa9026
--- /dev/null
+++ b/sci-libs/hipBLAS-common/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCm/hipBLAS-common</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/hipBLAS/Manifest b/sci-libs/hipBLAS/Manifest
index 2e8dfa39138c..4b86cef79d3b 100644
--- a/sci-libs/hipBLAS/Manifest
+++ b/sci-libs/hipBLAS/Manifest
@@ -2,3 +2,4 @@ DIST hipBLAS-5.1.3.tar.gz 526704 BLAKE2B d32d7029ea910c341e00dccab1ee9ab98451836
 DIST hipBLAS-5.4.2.tar.gz 930814 BLAKE2B 702df09010b50652feb8f7e5741b27117aa58fc3e3b1b5f89f5043073a47581d1710f0831740453e84f7594b1b305e95d2681709898e5231c3eee2e8207404a3 SHA512 a941350d2d25022cf5142f68559242a048136bdd048dafcd544a0241cf3b510062273163f7a0eecc55f17ec47a1063d84d6102ca766ba7cde9b704eee5c44cd8
 DIST hipBLAS-5.7.1.tar.gz 669163 BLAKE2B e065f77eba0bb99d347f71920e733d30b7693f9eaf0c1f2a87a169360ccff23b8294e367eebfd6489440308b9bb1ae662c39617c5bb94275bf9b0ed60d555f85 SHA512 24c074f07865e1a3dfb0aca0b1d494e340a584ecb408813bb5b053f8282437cfd3644d730163f4faf1b93da306626ba68904141f9c3730a29749537fb7fd1a63
 DIST hipBLAS-6.1.1.tar.gz 835570 BLAKE2B dc8a54f3b6c780f63e57f208d67b15e965d3a7c98e20766ef22ecfd41e8780a6b9464e31efad8003b52562222ec7ad06801d93a502ff99f8456f415db09e5ace SHA512 390b9a9bf0238a5c72d51d034c0053ec8c6b007547b1ec9561064828c24335e099ddb0402ad76e60018ec96742d5acfbb29b9d218a613e1c6d54e4b8b05ceca7
+DIST hipBLAS-6.3.0.tar.gz 993145 BLAKE2B 6bd6108c90c511fb9e68f628714545569dac9afe9f022f9d59e365f44177ae574a4e3b94c9276b64aad3c72c94d5b3d87babe79edbb9cc2e6d5cbaebb82f3a83 SHA512 c5d40a6dcce467e44b091c610d35dc7abfe9e863b37438642e98568a3f8b084ffd94ee41e466a60f21151df765c0df377d553700e2df2b08375a58f40654f7dc
diff --git a/sci-libs/hipBLAS/files/hipBLAS-6.3.0-no-git.patch b/sci-libs/hipBLAS/files/hipBLAS-6.3.0-no-git.patch
new file mode 100644
index 000000000000..63fd25240505
--- /dev/null
+++ b/sci-libs/hipBLAS/files/hipBLAS-6.3.0-no-git.patch
@@ -0,0 +1,18 @@
+Git is not required and rev-parse does nothing for tarballs.
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -44,14 +44,6 @@ if( BUILD_VERBOSE )
+   message( STATUS "\t==>CMAKE_EXE_LINKER link flags: " ${CMAKE_EXE_LINKER_FLAGS} )
+ endif( )
+ 
+-# Get the git hash of the hipBLAS branch
+-find_package(Git REQUIRED)
+-
+-execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD
+-                WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+-                OUTPUT_VARIABLE GIT_HASH_HIPBLAS
+-                OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+ set(hipblas_VERSION_COMMIT_ID "${GIT_HASH_HIPBLAS}")
+ 
+ # log build commits
diff --git a/sci-libs/hipBLAS/hipBLAS-6.1.1.ebuild b/sci-libs/hipBLAS/hipBLAS-6.1.1.ebuild
index 439a778540e9..08e7ed59f34d 100644
--- a/sci-libs/hipBLAS/hipBLAS-6.1.1.ebuild
+++ b/sci-libs/hipBLAS/hipBLAS-6.1.1.ebuild
@@ -23,6 +23,10 @@ RDEPEND="dev-util/hip
 DEPEND="${RDEPEND}"
 
 src_configure() {
+	# Note: hipcc is enforced; clang fails when libc++ is enabled
+	# with an error similar to https://github.com/boostorg/config/issues/392
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		# currently hipBLAS is a wrapper of rocBLAS which has tests, so no need to perform test here
 		-DBUILD_CLIENTS_TESTS=OFF
diff --git a/sci-libs/hipBLAS/hipBLAS-6.3.0.ebuild b/sci-libs/hipBLAS/hipBLAS-6.3.0.ebuild
new file mode 100644
index 000000000000..1faf7edbf78c
--- /dev/null
+++ b/sci-libs/hipBLAS/hipBLAS-6.3.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+DESCRIPTION="ROCm BLAS marshalling library"
+HOMEPAGE="https://github.com/ROCm/hipBLAS"
+SRC_URI="https://github.com/ROCm/hipBLAS/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/hipBLAS-rocm-${PV}"
+
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-util/hip:${SLOT}
+	sci-libs/hipBLAS-common:${SLOT}
+	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
+	sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.3.0-no-git.patch
+)
+
+src_configure() {
+	# Note: hipcc is enforced; clang fails when libc++ is enabled
+	# with an error similar to https://github.com/boostorg/config/issues/392
+	rocm_use_hipcc
+
+	local mycmakeargs=(
+		# currently hipBLAS is a wrapper of rocBLAS which has tests, so no need to perform test here
+		-DBUILD_CLIENTS_TESTS=OFF
+		-DBUILD_CLIENTS_BENCHMARKS=OFF
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/hipBLASLt/Manifest b/sci-libs/hipBLASLt/Manifest
index 83717bb68f79..3287f1b48d5e 100644
--- a/sci-libs/hipBLASLt/Manifest
+++ b/sci-libs/hipBLASLt/Manifest
@@ -1 +1,2 @@
 DIST hipBLASLt-6.1.1.tar.gz 78448557 BLAKE2B 08ac9ce45d7d1e4384a36939af22f65589ed87e25b4db77f5f7ff5fbe65b8070e9c55fbb09db3b7bd49be98981dc8bf939e646ea27571bf1d1ccfa52a50b0f92 SHA512 1aa3a1cb8e9c7f653db66909b38be065b7386b97d4bd6b52ecc6c2bf72c6cdfabde6f12ebc6016b5fa195f979359af875eda8d54ea6772329312cb357bc2ebc5
+DIST hipBLASLt-6.3.0.tar.gz 89379233 BLAKE2B 0f63b1f0fb4686b58b102ad2d2b9baa272b07d203736c3972216cbd75eda38ffaf63939d8c25aadb416348a7b1c9b8bac27a3711121d5e584baa7a404babdd2b SHA512 b86613f818a1819668b3fce69422add97d36b09506d1109e3b739a6f86b8463aef9c8ef2434dd603a956f34e76e3f8fb4ddb2b98d5d2e4028f6f44b62aa6a48b
diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.3.0-min-pip-install.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.3.0-min-pip-install.patch
new file mode 100644
index 000000000000..d2d9d32020b6
--- /dev/null
+++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.3.0-min-pip-install.patch
@@ -0,0 +1,23 @@
+Remove unused libraries and updates from pypi.org
+--- a/cmake/virtualenv.cmake
++++ b/cmake/virtualenv.cmake
+@@ -24,10 +24,6 @@ endfunction()
+ 
+ function(virtualenv_install)
+     virtualenv_create()
+-    execute_process(
+-      COMMAND ${VIRTUALENV_BIN_DIR}/${VIRTUALENV_PYTHON_EXENAME} -m pip install --upgrade pip
+-      COMMAND ${VIRTUALENV_BIN_DIR}/${VIRTUALENV_PYTHON_EXENAME} -m pip install --upgrade setuptools
+-    )
+     message("${VIRTUALENV_BIN_DIR}/${VIRTUALENV_PYTHON_EXENAME} -m pip install ${ARGN}")
+     execute_process(
+       RESULT_VARIABLE rc
+--- a/tensilelite/requirements.txt
++++ b/tensilelite/requirements.txt
+@@ -3,6 +3,3 @@ pyyaml
+ msgpack
+ joblib>=1.4.0; python_version >= '3.8'
+ joblib>=1.1.1; python_version < '3.8'
+-simplejson
+-ujson
+-orjson
diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.3.0-no-arch-extra.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.3.0-no-arch-extra.patch
new file mode 100644
index 000000000000..785ca9008007
--- /dev/null
+++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.3.0-no-arch-extra.patch
@@ -0,0 +1,16 @@
+--- a/library/src/amd_detail/rocblaslt/src/kernels/CompileSourceKernel.cmake
++++ b/library/src/amd_detail/rocblaslt/src/kernels/CompileSourceKernel.cmake
+@@ -25,6 +25,13 @@ function(CompileSourceKernel source archs buildIdKind outputFolder)
+     message("Setup source kernel targets")
+     string(REGEX MATCHALL "gfx[a-z0-9]+" archs "${archs}")
+     list(REMOVE_DUPLICATES archs)
++
++    list(LENGTH archs archs_length)
++    if(archs_length EQUAL 0)
++        message("No architectures specified.")
++        return()
++    endif()
++
+     list(JOIN archs "," archs)
+     message("archs for source kernel compilation: ${archs}")
+     add_custom_target(MatrixTransformKernels ALL
diff --git a/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild b/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild
index 021ed71fd7cd..b0aed5de521f 100644
--- a/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild
+++ b/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild
@@ -25,7 +25,7 @@ IUSE="${IUSE_TARGETS[@]/#/+} test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-util/hip
+	dev-util/hip:${SLOT}
 	dev-cpp/msgpack-cxx
 	sci-libs/hipBLAS:${SLOT}
 "
diff --git a/sci-libs/hipBLASLt/hipBLASLt-6.3.0.ebuild b/sci-libs/hipBLASLt/hipBLASLt-6.3.0.ebuild
new file mode 100644
index 000000000000..3a2f44a97a64
--- /dev/null
+++ b/sci-libs/hipBLASLt/hipBLASLt-6.3.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_SKIP_GLOBALS=1
+PYTHON_COMPAT=( python3_{10..13} )
+
+LLVM_COMPAT=( 19 )
+
+inherit cmake flag-o-matic llvm-r1 prefix python-any-r1 rocm
+DESCRIPTION="General matrix-matrix operations library for AMD Instinct accelerators"
+HOMEPAGE="https://github.com/ROCm/hipBLASLt"
+SRC_URI="https://github.com/ROCm/hipBLASLt/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/hipBLASLt-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+SUPPORTED_GPUS=( gfx908 gfx90a gfx940 gfx941 gfx942 gfx1100 gfx1101 )
+IUSE_TARGETS=( "${SUPPORTED_GPUS[@]/#/amdgpu_targets_}" )
+IUSE="${IUSE_TARGETS[@]/#/+} test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/hip:${SLOT}
+	dev-cpp/msgpack-cxx
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-build/rocm-cmake
+	sci-libs/hipBLAS-common:${SLOT}
+	$(python_gen_any_dep '
+		dev-python/msgpack[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/joblib[${PYTHON_USEDEP}]
+	')
+	$(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}')
+	test? (
+		dev-cpp/gtest
+		virtual/blas
+		dev-util/rocm-smi:${SLOT}
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-fix-msgpack-dependency.patch
+	"${FILESDIR}"/${PN}-6.1.1-no-arch.patch
+	"${FILESDIR}"/${PN}-6.1.1-no-git.patch
+	"${FILESDIR}"/${PN}-6.1.1-clang-19.patch
+	"${FILESDIR}"/${PN}-6.1.1-fix-libcxx.patch
+	"${FILESDIR}"/${PN}-6.3.0-no-arch-extra.patch
+	"${FILESDIR}"/${PN}-6.3.0-min-pip-install.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/msgpack[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/joblib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+pkg_pretend() {
+	if [[ "${AMDGPU_TARGETS[@]}" = "" ]]; then
+		ewarn "hipBLASLt supports only few GPUs: ${SUPPORTED_GPUS[@]},"
+		ewarn "but none of them were defined in AMDGPU_TARGETS USE_EXPAND variable."
+		ewarn
+		ewarn "Library will continue to be built in \"dummy\" mode,"
+		ewarn "serving as a non-functional placeholder for end-user applications."
+	fi
+}
+
+src_prepare() {
+	sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix),g" \
+		"${FILESDIR}"/${PN}-6.1.1-gentoopath.patch > "${S}"/gentoopath.patch || die
+	eapply $(prefixify_ro "${S}"/gentoopath.patch)
+
+	local shebangs=($(grep -rl "#!/usr/bin/env python3" tensilelite/Tensile || die))
+	python_fix_shebang -q ${shebangs[*]}
+
+	sed -e "s:\${rocm_path}/bin/amdclang++:$(get_llvm_prefix)/bin/clang++:" \
+		-i library/src/amd_detail/rocblaslt/src/kernels/compile_code_object.sh || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	rocm_use_hipcc
+
+	# too many warnings
+	append-cxxflags -Wno-explicit-specialization-storage-class
+
+	local targets="$(get_amdgpu_flags)"
+	local build_with_tensile=$([ "${AMDGPU_TARGETS[@]}" = "" ] && echo OFF || echo ON )
+
+	local mycmakeargs=(
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_WITH_TENSILE="${build_with_tensile}"
+		-DAMDGPU_TARGETS="${targets}"
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	local -x ROCM_PATH="${EPREFIX}/usr"
+	# set PYTHONPATH to load Tensile from virtualenv, not the system-wide one
+	local -x PYTHONPATH="${S}_build/virtualenv/lib/${EPYTHON}/site-packages"
+	local -x TENSILE_ROCM_ASSEMBLER_PATH="$(get_llvm_prefix)/bin/clang++"
+	# TensileCreateLibrary reads CMAKE_CXX_COMPILER again
+	local -x CMAKE_CXX_COMPILER="$(get_llvm_prefix)/bin/clang++"
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+
+	# Stop llvm-strip from removing .strtab section from *.hsaco files,
+	# otherwise rocclr/elf/elf.cpp complains with "failed: null sections(STRTAB)" and crashes
+	dostrip -x /usr/$(get_libdir)/hipblaslt/library/
+}
+
+src_test() {
+	check_amdgpu
+
+	# Expected time for 7900 XTX: 340s (full) or 5s with GTEST_FILTER='*quick*'
+	cmake_src_test
+}
diff --git a/sci-libs/hipCUB/Manifest b/sci-libs/hipCUB/Manifest
index 834a95c038cf..d73e1fd7a300 100644
--- a/sci-libs/hipCUB/Manifest
+++ b/sci-libs/hipCUB/Manifest
@@ -1,3 +1,4 @@
 DIST hipCUB-5.1.3.tar.gz 278021 BLAKE2B f30e567370fea80ef63a455c2c27b3f4ff241e7e405688fa4dc33d1e0ce3dffb016a1a1523b20613a7963bff061758eac0c0d110243a9a6cedbc100bb087d7d4 SHA512 dd3ca341b78cf6985ba723feeeb560c0503ab283b63067e9a5e68d12ad42f752a7f56fd60f0f0c26c2853538853e09a102cfc6006c18c31c3162fa7b536ffb9f
 DIST hipCUB-5.7.1.tar.gz 322980 BLAKE2B a9b2a69b47661532858f18e7296ef37be41da814bb4886f7b8b444829e6ad1374d1c3117b57e7599095253ed56ea2403c895bb820dbde9cec77c28a041af3898 SHA512 7cf7dc819a3d8bac2cf70aa077616e65d785d76bae3ad3991db7b940a061f694ac82b1e4219aa16476351f1329e3f0d09a818b0ff0b9c5ad261937879c21dca8
 DIST hipCUB-6.1.1.tar.gz 343181 BLAKE2B 3943278597c5e9d41c225ad86c3cdcc113f35cf1bf218ba357a112c25ae14df8d0e3f385aacd82ab4c694ae2382012aea06c02d40d982d00929d03d0d3908b55 SHA512 37297f6791146cc9db11d3d494555672c021dea06bec1e8a780ca926df1e5de140c8ee560657668df6221279a0418af9e34a235b3b52df3df2a66adabea7ca6f
+DIST hipCUB-6.3.0.tar.gz 387560 BLAKE2B cd5712267d9284a42364e0563503f1213b32bff69f17faea4fbcb7c85e5f95ac742f89a957b9924abd54beff8b010a03ceb095c669e27c870244731a5f05f7ee SHA512 2b3a8fbdae8a2146788d7a34956572bbf63188c7bd871b4eab78017b3144b6e4e0cd902d152f9624eb485b365cdca1d81681dcfeea44e1f57f112f1a12bfead1
diff --git a/sci-libs/hipCUB/hipCUB-6.3.0.ebuild b/sci-libs/hipCUB/hipCUB-6.3.0.ebuild
new file mode 100644
index 000000000000..ae5c0e0c441f
--- /dev/null
+++ b/sci-libs/hipCUB/hipCUB-6.3.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="Wrapper of rocPRIM or CUB for GPU parallel primitives"
+HOMEPAGE="https://github.com/ROCm/hipCUB"
+SRC_URI="https://github.com/ROCm/hipCUB/archive/rocm-${PV}.tar.gz -> hipCUB-${PV}.tar.gz"
+S="${WORKDIR}/hipCUB-rocm-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+REQUIRED_USE="
+	benchmark? ( ${ROCM_REQUIRED_USE} )
+	test? ( ${ROCM_REQUIRED_USE} )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip:${SLOT}
+	sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}]
+	benchmark? ( dev-cpp/benchmark )
+	test? ( dev-cpp/gtest )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" \
+		-i cmake/ROCMExportTargetsHeaderOnly.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	rocm_use_hipcc
+
+	local mycmakeargs=(
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	# Expected time on gfx1100 (-j32) is 85s
+	# hipcub.BlockShuffle fails in parallel tests, but adding -j1 makes tests too slow.
+	local CMAKE_SKIP_TESTS=(hipcub.BlockShuffle)
+	cmake_src_test
+}
diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest
index ace4000e72e3..a37b1a3a190d 100644
--- a/sci-libs/hipFFT/Manifest
+++ b/sci-libs/hipFFT/Manifest
@@ -1,3 +1,4 @@
 DIST hipFFT-rocm-5.1.3.tar.gz 89397 BLAKE2B 3c29d5d660e9f3db8afd8c9e524296c29f50faf06a5d6a58ec628b5cc5ddb47ac2b99f137c7bc5090a311189b44014ea2f6f1f7547d22506f5ba18f837fbeb68 SHA512 8d7a90630cd8bfeade9cb026e45b6b6c1ab9c96dba424559a7ced8c881cd45c1cb06d3f7e82c8e6558e4ccb8bb41b6278842057a0cf0957b0644b1139f2c9706
 DIST hipFFT-rocm-5.7.1.tar.gz 102616 BLAKE2B ee8d6dcb7924c8989987b02533126c4e4419d8dc83067a816f2253efe4537e094f1665d95699d4bf27f30cd13f3fc5df7d3b0062c267ecbdcbb3aad961fab6f6 SHA512 4bfd812fa1e949574b4170833755a435f47e893f0615b65d8d273af6e8f89ea4d28632a208de20321e834c8bc237b11816e2af0363b60adca9af736b9bc87465
 DIST hipFFT-rocm-6.1.1.tar.gz 170796 BLAKE2B 8c957db8e7e2548918539c94262d912c2f33b70d8482b727c78c13323bdb6822c3e95439854b8ab4fed970d21ed0c6fd2ab8c2805db59d3a3606d73e7eb47468 SHA512 531be32b12ed5f0f2352e3e0a893ca988a4c8492e66fc9347b6754ae4e769549d6f638a760de35cb15ef2d301ab4200a76c832d769ecb0cd55e9e42f839a1876
+DIST hipFFT-rocm-6.3.0.tar.gz 267945 BLAKE2B 33d9013ddb20b37b17a05dc647e74eaccede7e952723a177cb0f1e54f2b25cd6a76b1a8b00f419cf197e495dd654b04f418d28ca1023ea4bc88f0ccf8191d6c0 SHA512 a210e044a87845a861c127529143ea8517f5eef30a07007f43bd29a85b5c2999bd6002d12cd2a06c1c8b469ea3d52c081bbcc5146c5fc585df8505ddfa6a3e06
diff --git a/sci-libs/hipFFT/hipFFT-6.3.0.ebuild b/sci-libs/hipFFT/hipFFT-6.3.0.ebuild
new file mode 100644
index 000000000000..8cc68e63e149
--- /dev/null
+++ b/sci-libs/hipFFT/hipFFT-6.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="CU / ROCM agnostic hip FFT implementation"
+HOMEPAGE="https://github.com/ROCm/hipFFT"
+SRC_URI="https://github.com/ROCm/hipFFT/archive/refs/tags/rocm-${PV}.tar.gz -> hipFFT-rocm-${PV}.tar.gz"
+S="${WORKDIR}/hipFFT-rocm-${PV}"
+
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocFFT:${SLOT}[${ROCM_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	# Note: hipcc is enforced; clang fails when libc++ is enabled
+	# with an error similar to https://github.com/boostorg/config/issues/392
+	rocm_use_hipcc
+
+	local mycmakeargs=(
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_CLIENTS_TESTS=OFF
+		-DBUILD_CLIENTS_RIDER=OFF
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/hipRAND/Manifest b/sci-libs/hipRAND/Manifest
index 0459d75805d5..38971fec03ed 100644
--- a/sci-libs/hipRAND/Manifest
+++ b/sci-libs/hipRAND/Manifest
@@ -1,3 +1,4 @@
 DIST hipRAND-rocm-5.6.0.tar.gz 477597 BLAKE2B fdc88ac7076ab6b31ba794f9274881323fba32295bab5b90e38d8c8f336e0255b7d20dcba6e334b7bacd8b67eaac8a3ac6e11e3d490e7c95a973d16c9598922f SHA512 47d0cca92b458f8ef682b3c15fe4ccc5201370b1458e541080dc2150e98256962b78806c20b26d789b232d420eb305639fa50180e379ba123851d35d24d40cb2
 DIST hipRAND-rocm-5.7.1.tar.gz 478352 BLAKE2B 5f435cf53d213b1d95ee8b766df2c9bc4b4d590ccf63fe867bd033eeb4b7fef67e2bde22242525686a8dee59fd811363857312481e9cb3575357c612ab519a41 SHA512 b3c51728c1d7cc37760f49f36ab7765c166f105bc5b1b6ce65ac4a1de9bb70f8e2c10f5c41f89040288b09c9257d913d745a416bd4785b71f170a4f57e1f95e2
 DIST hipRAND-rocm-6.1.1.tar.gz 119063 BLAKE2B dc314d8b09c15351075594335d14f65024be54597e7cbdfb7671ebea29fa208c9a33530a2d406a8a2a9d8738f0aae7e9fc25d8c39304ef2ef27aaf8b327b5975 SHA512 4c350c8a75e6b4064e22cd73679f66e5caf28f7922fc47ef9670c1023b58b36bf3a2a35580463ee7c89e26ed924aaaa68166a11f64823b99f2f8302f80d6e87a
+DIST hipRAND-rocm-6.3.0.tar.gz 125500 BLAKE2B 80b64692c5bc8dc1cb6861f98c927d14215c1115dfb69153cb2d69d17dbe7a8e53c9985d3457762740866f6f773999ed8fc91c70133e8996f50a1413b064bf8c SHA512 47a2b21618ee3f0c91df7a7b707473ef2f82ee75f4084e8acc07e90cf0d668c7903ab4fe44fbb105a476a4730782a9de30446f620e0ba0cfca62257e8ac0fffd
diff --git a/sci-libs/hipRAND/hipRAND-6.3.0.ebuild b/sci-libs/hipRAND/hipRAND-6.3.0.ebuild
new file mode 100644
index 000000000000..1bbe4255434b
--- /dev/null
+++ b/sci-libs/hipRAND/hipRAND-6.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="CU / ROCM agnostic hip RAND implementation"
+HOMEPAGE="https://github.com/ROCm/hipRAND"
+SRC_URI="https://github.com/ROCm/hipRAND/archive/refs/tags/rocm-${PV}.tar.gz -> hipRAND-rocm-${PV}.tar.gz"
+S="${WORKDIR}/hipRAND-rocm-${PV}"
+
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	rocm_use_hipcc
+
+	local mycmakeargs=(
+		-Wno-dev
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/hipSOLVER/Manifest b/sci-libs/hipSOLVER/Manifest
index bb01207f1e20..e017ef01d115 100644
--- a/sci-libs/hipSOLVER/Manifest
+++ b/sci-libs/hipSOLVER/Manifest
@@ -1,2 +1,3 @@
 DIST hipSOLVER-rocm-5.7.1.tar.gz 1516012 BLAKE2B 8d0966d34877978784b9872150283719602465c85036c3a74a72a2fe7c516b6029af3f4aefbc022088b2cf37bb1e0a450c0221aef0ac3227018020de340adfcd SHA512 f9c14b51ea582f17d1b323c7d066d9c0c95f4250f08515768d7a11067774fd2841fa3dec7354d3c98e56bd8dd53cff3b993c68b1d7df4b24f562b3afe9c4625e
 DIST hipSOLVER-rocm-6.1.1.tar.gz 2553462 BLAKE2B 77731b876a7fe5f80f79e5af5128a84d8a5d4dee6d511f3e1cf4964845b636380f7f1e19f07e84ed24b98e99c3bdfbba623b97b48cf4ea1bc09a4c1bd3dccaed SHA512 4f28ecd807717013318f293df8c48d7674f64fd3a538c2b827f4188a00a36165f48277d5ac50e806461d52a8a3b6d626cab91ff7c6687b17fea2580461e08de9
+DIST hipSOLVER-rocm-6.3.0.tar.gz 2575560 BLAKE2B 293a149e162e74bbf5ddc143bb5bb3fffe52fbe0a53f7ad2d3141fb91cd2fe1108f6a12c976e5b4b91de98b146a84f7290f073d6226214e2dbc13ccd1ddca26c SHA512 a648472695c917e3eab49414ceb6eb9a1c4a6dc3f667907f7d9a67f873d8826588dad823f74b8498bc81c23741a52b745451d13e78079e86d95b36da9b789a7b
diff --git a/sci-libs/hipSOLVER/files/hipSOLVER-6.3.0-find-cholmod.patch b/sci-libs/hipSOLVER/files/hipSOLVER-6.3.0-find-cholmod.patch
new file mode 100644
index 000000000000..32c049c5947f
--- /dev/null
+++ b/sci-libs/hipSOLVER/files/hipSOLVER-6.3.0-find-cholmod.patch
@@ -0,0 +1,56 @@
+Builds with -DBUILD_WITH_SPARSE=ON are broken
+Upstream bug: https://github.com/ROCm/hipSOLVER/issues/347
+--- a/library/src/amd_detail/dlopen/cholmod.hpp
++++ b/library/src/amd_detail/dlopen/cholmod.hpp
+@@ -24,7 +24,7 @@
+ #include "lib_macros.hpp"
+ 
+ #ifdef HAVE_ROCSPARSE
+-#include <suitesparse/cholmod.h>
++#include <cholmod.h>
+ #else
+ 
+ // constants
+--- a/library/src/CMakeLists.txt
++++ b/library/src/CMakeLists.txt
+@@ -42,8 +42,6 @@ prepend_path(".." hipsolver_headers_public relative_hipsolver_headers_public)
+ 
+ if(NOT USE_CUDA)
+   set(hipsolver_source
+-    "${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/dlopen/cholmod.cpp"
+-    "${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/dlopen/rocsparse.cpp"
+     "${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/hipsolver_conversions.cpp"
+     "${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/hipsolver.cpp"
+     "${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/hipsolver_dense.cpp"
+@@ -52,6 +50,12 @@ if(NOT USE_CUDA)
+     "${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/hipsolver_sparse.cpp"
+     "${CMAKE_CURRENT_SOURCE_DIR}/common/hipsolver_dense_common.cpp"
+   )
++  if (NOT BUILD_WITH_SPARSE)
++    list(APPEND hipsolver_source
++      "${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/dlopen/cholmod.cpp"
++      "${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/dlopen/rocsparse.cpp"
++    )
++  endif()
+ else()
+   set(hipsolver_source
+     "${CMAKE_CURRENT_SOURCE_DIR}/nvidia_detail/hipsolver_conversions.cpp"
+@@ -149,14 +153,11 @@ if(NOT USE_CUDA)
+       list(APPEND static_depends PACKAGE rocsparse)
+     endif()
+ 
+-    find_package(CHOLMOD QUIET)
+-    if(NOT TARGET SuiteSparse::CHOLMOD)
+-      # try again with the custom find modules for older versions of suitesparse
+-      list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/suitesparse)
+-      find_package(CHOLMOD REQUIRED)
+-    endif()
++    find_package(PkgConfig REQUIRED)
++    pkg_check_modules(CHOLMOD REQUIRED IMPORTED_TARGET cholmod)
++
++    target_link_libraries(hipsolver PRIVATE roc::rocsparse PkgConfig::CHOLMOD)
+ 
+-    target_link_libraries( hipsolver PRIVATE roc::rocsparse SuiteSparse::CHOLMOD)
+     set_source_files_properties(${hipsolver_source}
+       PROPERTIES
+         COMPILE_DEFINITIONS HAVE_ROCSPARSE
diff --git a/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild b/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild
index 99c4a9c0ca41..1a010790ca8d 100644
--- a/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild
+++ b/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild
@@ -22,7 +22,7 @@ IUSE="sparse"
 RESTRICT="test"
 
 RDEPEND="
-	dev-util/hip
+	dev-util/hip:${SLOT}
 	sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}]
 	sparse? (
 		sci-libs/suitesparseconfig
diff --git a/sci-libs/hipSOLVER/hipSOLVER-6.3.0.ebuild b/sci-libs/hipSOLVER/hipSOLVER-6.3.0.ebuild
new file mode 100644
index 000000000000..ea8bafabf7c5
--- /dev/null
+++ b/sci-libs/hipSOLVER/hipSOLVER-6.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="CU / ROCM agnostic marshalling library for LAPACK routines on the GPU"
+HOMEPAGE="https://github.com/ROCm/hipSOLVER"
+SRC_URI="https://github.com/ROCm/hipSOLVER/archive/refs/tags/rocm-${PV}.tar.gz -> hipSOLVER-rocm-${PV}.tar.gz"
+S="${WORKDIR}/hipSOLVER-rocm-${PV}"
+
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="sparse"
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-util/hip:${SLOT}
+	sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}]
+	sparse? (
+		sci-libs/suitesparseconfig
+		sci-libs/cholmod
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.3.0-find-cholmod.patch
+)
+
+src_configure() {
+	rocm_use_hipcc
+
+	local mycmakeargs=(
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_WITH_SPARSE=$(usex sparse ON OFF)
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/hipSOLVER/metadata.xml b/sci-libs/hipSOLVER/metadata.xml
index 9aa1438b519c..426f234221d8 100644
--- a/sci-libs/hipSOLVER/metadata.xml
+++ b/sci-libs/hipSOLVER/metadata.xml
@@ -14,7 +14,7 @@
     <name>Sv. Lockal</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/hipSOLVER</remote-id>
+    <remote-id type="github">ROCm/hipSOLVER</remote-id>
   </upstream>
   <use>
     <flag name="sparse">Build hipSOLVER with sparse functionality (sci-libs/cholmod)</flag>
diff --git a/sci-libs/hipSPARSE/Manifest b/sci-libs/hipSPARSE/Manifest
index c38dc6c9f99c..f41749291572 100644
--- a/sci-libs/hipSPARSE/Manifest
+++ b/sci-libs/hipSPARSE/Manifest
@@ -1,6 +1,7 @@
 DIST hipSPARSE-5.1.tar.gz 449838 BLAKE2B 7727ecb9fa397e2730cfda4c9367188c37ad201d501b50129994869c6ef15b51cdf2d1f481f19f2f37cf0530f1ec3689c40a9651924f70fabe945d80732df64a SHA512 8b01c01a10b8419d14a532ebccfa5b5b5b5c3f6a6e73f3f0ecee58c7e240d2754485a9da020fe4693df3ef9fc08e5bb09b05396472ccbeebf89bc2635d94eb64
 DIST hipSPARSE-5.7.tar.gz 458521 BLAKE2B 94695ef3cf4294f571723e31ab5d4295b5aaa24528e90838375ee8477cf0957b297663d80e5fe3406762b475b6ef4741f9ccfb4dfb1448ce71ea4014da14b46e SHA512 bb28cd81b7ec298eb2e6462a8588ed93eee7b4892923b11087a91d1c32341f29f488fd4e6797debe51a989f463db31030eae02d07be6512d6b755367ba221aac
 DIST hipSPARSE-6.1.tar.gz 471148 BLAKE2B 18119ac355e180adb5ce38561f44e39119226d209a970ae8cac6b85575bad1ab2a690a3bb72de1c179c1190aa2c29d691e6ce02855f3df89a58f634d42e54103 SHA512 09f9e94c5f976e6f17c07f9be2fde31c2e740871215a6b77b49675644b883bd9994fcaacb19864ace3883bb5aea7a7dc589ddbaf9b6aaf3d9f411c7e452a0b78
+DIST hipSPARSE-6.3.tar.gz 537764 BLAKE2B 2989c81ac1f024246fdcf8081fa6969f1efd81d680f39b45edac290b4db7d453154d5d432e0ad3d0bc1e08948e03886a89ff4ec051b30cb7eca6bfe4f433d4a7 SHA512 c011b7d7a2121a20ceb2eee8d7217717ff06196f085f0996b0952b5afdbf2350e7288c4cfd2cfe9214b84c2add203788a1860d9a89bb426df2bc376b348a7f55
 DIST rocSPARSE_ASIC_320k.tar.gz 11301444 BLAKE2B a00cc4a3ededab3fb56339319e34e936645ddce2dee3c630153b37e337384c207b0a2829227fb7f4c2db1fe33383e97410ab7ad459d391c025f5410843d51cf2 SHA512 1db3af391c30a371c1ac0087436e266721474273a39d5b2b6d56408d950dcbbee004750e4dce4e3dbc4cb512f38f6d945676d7f29b62c52fd5a7fed0fe789e03
 DIST rocSPARSE_Chebyshev4.tar.gz 50165660 BLAKE2B f1a95554c8f38937f501488fabfd406b773eb980d7463cadac0de162529ac2f834c655cadd2b65f4c42a8487bc2d67c749601ae33bd789051f9e4d1e157196a0 SHA512 fdec4947a4af923d28b4be8d23690fd6d356c58f8344a5dcdd2e3fa61769d83e47a84d65316b527e6e82d9f988de2675a852367d406e44b44d784137a90b95c0
 DIST rocSPARSE_amazon0312.tar.gz 11303646 BLAKE2B 388947a29380253bb5eecb22d3a3b6f3378711044b3fe98d6d2517cd27330f11b3d12fdb96320a2889e139224f1a6a5ad1c455ff8e91a262aa2aadbe16301330 SHA512 aed2d62581763742d9c7faf3dcaf1eaa983caa1e2e7ad4abebe97c5e7c2aec9942e0e32291092b348b60052c92b130e721ec19ed59bda22e1b233ef72ac7d2ff
diff --git a/sci-libs/hipSPARSE/files/hipSPARSE-6.3.0-fix-filesystem.patch b/sci-libs/hipSPARSE/files/hipSPARSE-6.3.0-fix-filesystem.patch
new file mode 100644
index 000000000000..c688f0c81c53
--- /dev/null
+++ b/sci-libs/hipSPARSE/files/hipSPARSE-6.3.0-fix-filesystem.patch
@@ -0,0 +1,40 @@
+Incorrect usage of C++ filesystem for libc++ and libstdc++
+https://github.com/ROCm/hipSPARSE/issues/555
+--- a/clients/common/utility.cpp
++++ b/clients/common/utility.cpp
+@@ -34,16 +34,22 @@
+ #define strSUITEcmp(A, B) _stricmp(A, B)
+ #endif
+ 
++#ifdef __has_include
++#if __has_include(<version>)
++#include <version>
++#endif
++#endif
++
+ #ifdef __cpp_lib_filesystem
+ #include <filesystem>
++
++namespace fs = std::filesystem;
+ #else
+ #include <experimental/filesystem>
+ 
+-namespace std
+-{
+-    namespace filesystem = experimental::filesystem;
+-}
++namespace fs = std::experimental::filesystem;
+ #endif
++
+ #if 0
+ #ifdef WIN32
+ #include <windows.h>
+@@ -91,7 +97,7 @@ std::string hipsparse_exepath()
+         result.resize(result.size() * 2);
+     }
+ 
+-    std::filesystem::path exepath(result.begin(), result.end());
++    fs::path exepath(result.begin(), result.end());
+     exepath = exepath.remove_filename();
+     exepath += exepath.empty() ? "" : "/";
+     return exepath.string();
diff --git a/sci-libs/hipSPARSE/files/hipSPARSE-6.3.0-no-gtest-in-benchmark.patch b/sci-libs/hipSPARSE/files/hipSPARSE-6.3.0-no-gtest-in-benchmark.patch
new file mode 100644
index 000000000000..4555b1000d38
--- /dev/null
+++ b/sci-libs/hipSPARSE/files/hipSPARSE-6.3.0-no-gtest-in-benchmark.patch
@@ -0,0 +1,22 @@
+GTest is linked/required for hipsparse-bench, but not used
+https://github.com/ROCm/hipSPARSE/issues/557
+--- a/clients/benchmarks/CMakeLists.txt
++++ b/clients/benchmarks/CMakeLists.txt
+@@ -21,8 +21,6 @@
+ #
+ # ########################################################################
+ 
+-find_package(GTest REQUIRED)
+-
+ set(HIPSPARSE_BENCHMARK_SOURCES
+   client.cpp
+   hipsparse_arguments_config.cpp
+@@ -48,7 +46,7 @@ target_compile_options(hipsparse-bench PRIVATE -Wno-deprecated -Wno-unused-comma
+ target_include_directories(hipsparse-bench PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>)
+ 
+ # Target link libraries
+-target_link_libraries(hipsparse-bench PRIVATE GTest::GTest roc::hipsparse)
++target_link_libraries(hipsparse-bench PRIVATE roc::hipsparse)
+ 
+ # Add OpenMP if available
+ if(OPENMP_FOUND AND THREADS_FOUND)
diff --git a/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild b/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild
index 2176f205682a..66e72a372ec5 100644
--- a/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild
+++ b/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild
@@ -43,7 +43,7 @@ REQUIRED_USE="${ROCM_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-util/rocminfo
-		dev-util/hip
+		dev-util/hip:${SLOT}
 		sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}]"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-build/rocm-cmake
@@ -68,6 +68,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# Note: hipcc is enforced; clang fails when libc++ is enabled
+	# with an error similar to https://github.com/boostorg/config/issues/392
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DHIP_RUNTIME="ROCclr"
 		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
diff --git a/sci-libs/hipSPARSE/hipSPARSE-6.3.0.ebuild b/sci-libs/hipSPARSE/hipSPARSE-6.3.0.ebuild
new file mode 100644
index 000000000000..62a5615be846
--- /dev/null
+++ b/sci-libs/hipSPARSE/hipSPARSE-6.3.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake edo rocm toolchain-funcs
+
+DESCRIPTION="ROCm SPARSE marshalling library"
+HOMEPAGE="https://github.com/ROCm/hipSPARSE"
+# share some test datasets with rocSPARSE
+SRC_URI="https://github.com/ROCm/hipSPARSE/archive/rocm-${PV}.tar.gz -> hipSPARSE-$(ver_cut 1-2).tar.gz
+test? (
+http://sparse-files.engr.tamu.edu/MM/SNAP/amazon0312.tar.gz -> rocSPARSE_amazon0312.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> rocSPARSE_Chebyshev4.tar.gz
+http://sparse-files.engr.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> rocSPARSE_sme3Dc.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Williams/webbase-1M.tar.gz -> rocSPARSE_webbase-1M.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Bova/rma10.tar.gz -> rocSPARSE_rma10.tar.gz
+http://sparse-files.engr.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> rocSPARSE_bibd_22_8.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> rocSPARSE_mac_econ_fwd500.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Williams/mc2depi.tar.gz -> rocSPARSE_mc2depi.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Hamm/scircuit.tar.gz -> rocSPARSE_scircuit.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> rocSPARSE_ASIC_320k.tar.gz
+http://sparse-files.engr.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> rocSPARSE_bmwcra_1.tar.gz
+http://sparse-files.engr.tamu.edu/MM/HB/nos1.tar.gz -> rocSPARSE_nos1.tar.gz
+http://sparse-files.engr.tamu.edu/MM/HB/nos2.tar.gz -> rocSPARSE_nos2.tar.gz
+http://sparse-files.engr.tamu.edu/MM/HB/nos3.tar.gz -> rocSPARSE_nos3.tar.gz
+http://sparse-files.engr.tamu.edu/MM/HB/nos4.tar.gz -> rocSPARSE_nos4.tar.gz
+http://sparse-files.engr.tamu.edu/MM/HB/nos5.tar.gz -> rocSPARSE_nos5.tar.gz
+http://sparse-files.engr.tamu.edu/MM/HB/nos6.tar.gz -> rocSPARSE_nos6.tar.gz
+http://sparse-files.engr.tamu.edu/MM/HB/nos7.tar.gz -> rocSPARSE_nos7.tar.gz
+http://sparse-files.engr.tamu.edu/MM/DNVS/shipsec1.tar.gz -> rocSPARSE_shipsec1.tar.gz
+)"
+S="${WORKDIR}/hipSPARSE-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0"/$(ver_cut 1-2)
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/rocminfo:${SLOT}
+	dev-util/hip:${SLOT}
+	sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-build/rocm-cmake
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.3.0-fix-filesystem.patch"
+	"${FILESDIR}/${PN}-6.3.0-no-gtest-in-benchmark.patch"
+)
+
+src_prepare() {
+	# include <filesystem> issue - https://github.com/ROCm/hipSPARSE/issues/555
+	sed -e "s/CMAKE_CXX_STANDARD 14/CMAKE_CXX_STANDARD 17/" -i CMakeLists.txt clients/CMakeLists.txt || die
+
+	cmake_src_prepare
+
+	if use test; then
+		mkdir -p "${BUILD_DIR}"/clients/matrices
+		# compile and use the mtx2bin converter. Do not use any optimization flags!
+		edo $(tc-getCXX) deps/convert.cpp -o deps/convert
+		find "${WORKDIR}" -maxdepth 2 -regextype egrep -regex ".*/(.*)/\1\.mtx" -print0 |
+			while IFS= read -r -d '' mtxfile; do
+				destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' "${mtxfile}").bin
+				ebegin "Converting ${mtxfile} to ${destination}"
+				deps/convert "${mtxfile}" "${destination}"
+				eend $?
+			done
+	fi
+}
+
+src_configure() {
+	# Note: hipcc is enforced; clang fails when libc++ is enabled
+	# with an error similar to https://github.com/boostorg/config/issues/392
+	rocm_use_hipcc
+
+	local mycmakeargs=(
+		-DHIP_RUNTIME="ROCclr"
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}"/clients/staging || die
+	edob ./${PN,,}-test
+}
diff --git a/sci-libs/hipSPARSE/metadata.xml b/sci-libs/hipSPARSE/metadata.xml
index db85e1426e8f..57758b20d8ba 100644
--- a/sci-libs/hipSPARSE/metadata.xml
+++ b/sci-libs/hipSPARSE/metadata.xml
@@ -18,6 +18,9 @@
     <name>Sv. Lockal</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/hipSPARSE</remote-id>
+    <remote-id type="github">ROCm/hipSPARSE</remote-id>
   </upstream>
+  <use>
+    <flag name="benchmark">Build and install hipsparse-bench.</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/libbraiding/Manifest b/sci-libs/libbraiding/Manifest
index a93c14d198dc..7e14e98123eb 100644
--- a/sci-libs/libbraiding/Manifest
+++ b/sci-libs/libbraiding/Manifest
@@ -1 +1,2 @@
+DIST libbraiding-1.3.1.tar.gz 393142 BLAKE2B 6a012005549c6de513463f887202dd0c2774f10d2c72b9bae4b46e73d5592b01011760d034e2c8eb9abbe0f56db3932d96a062e19f767b9efb4f9b639a9f719f SHA512 358c53365f318e5fd77f2332e0f70374d720ebacb9426a2d24abc4e4eff179ff315bbd7447211797e097a0bbead7efc73b2c26f1e068bdb86766af1144a2e823
 DIST libbraiding-1.3.tar.gz 389034 BLAKE2B edc4fbe0a06afec3ddb9c3fa2d63f388ec16bb355100ecf1bb104f72ebf1975d92abc973e8ba118f5cafe998ea4587dc9f456a7a45d076cdae429d607c335a9b SHA512 da8c24183eeaf21a79cd7f723b0082e29e3185594b7cf6695e58de9677a64838da361220b35dd140c920d64dbf5cbf1f1c6f4129709c57efc5d624b766ccd69f
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/sci-libs/libcifpp/libcifpp-7.0.8.ebuild b/sci-libs/libcifpp/libcifpp-7.0.8.ebuild
index 855615bcc0ce..f6fb372e3d07 100644
--- a/sci-libs/libcifpp/libcifpp-7.0.8.ebuild
+++ b/sci-libs/libcifpp/libcifpp-7.0.8.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 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 87aea3cf53e2..1d1c64a7058e 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,3 +1,4 @@
 DIST libqalculate-5.3.0.tar.gz 2705592 BLAKE2B 8a42ab386e6b028c8e8429abedf0606e409c552a722b785bf621ea205fc792d9174fe8f62311fd7587c4a7f5d91fcbf7c1ce99ceb5d0c08ad2b696aba2f6856a SHA512 41aa83a6448158ddfbf6b4e0a88062d20dd199d8bc1fa6f12b704fa0c4085ddac19bc1bc0a7e01e063221e157b1597cf8cc387ee226a90e228723fc0e2e2bed1
 DIST libqalculate-5.4.0.1.tar.gz 2203512 BLAKE2B ccecbfdb9dc026f00bc072124d9582b8f364293d60443fb6136bf2520492b50a76db7bd6a1e678c4c4eea1ff18c9033098d8046415daaba49add765e8fa68fa5 SHA512 453e5048fca023b787f4bc68ef6cf9aac6b9aeb64ef6048543a7d3729c918976dff4336e2a1f697e5e1e7489fe6c2cc92ab016802e0ee8a1a3085b0f807e38cc
 DIST libqalculate-5.4.0.tar.gz 2720059 BLAKE2B e6ec9536a8b0ed3769c2a013bd267ca8202f58ebf54cd4c629d0d993cede797f2f547d02da50ced4ce94d41bbb8d54db9b4136451e960340c6bcd03c040080d6 SHA512 0539fe8053c903653b72716d0f7e5bc17d2ba954854d61f51bf62f2d9b6a02d3160be6a9f0208c67960ae5f9d831cc29eae4e80438cae482e6fb97e7686207e4
+DIST libqalculate-5.5.0.tar.gz 2209195 BLAKE2B 64781eeb1ad06bb25ac604fce10fb6a158e5f704ad311d52d0b3494ddf4f96d6240795b9f1d25aaf415b4e06f9916af12ca3db71d6b97c00f07fd0e31ebc6036 SHA512 c19dd210c03eb3a2966937dafade9f15e5289a04b5c498180b3bff37e202b6707e1942e02dd76fd4f461d5f80bd7ab7b99ba7802916b7ed6a25d1e59b16472e7
diff --git a/sci-libs/libqalculate/libqalculate-5.5.0.ebuild b/sci-libs/libqalculate/libqalculate-5.5.0.ebuild
new file mode 100644
index 000000000000..091c29f432b9
--- /dev/null
+++ b/sci-libs/libqalculate/libqalculate-5.5.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bump with sci-calculators/qalculate-gtk and sci-calculators/qalculate-qt
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_PV="${PV//b/}"
+
+DESCRIPTION="A modern multi-purpose calculator library"
+HOMEPAGE="https://qalculate.github.io/"
+SRC_URI="https://github.com/Qalculate/libqalculate/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/"${PN}-${MY_PV}"
+
+LICENSE="GPL-2+"
+# SONAME changes pretty often on bumps. Check!
+SLOT="0/23.3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl icu gnuplot +hardened readline test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/gmp:=
+	dev-libs/libxml2:2
+	dev-libs/mpfr:=
+	virtual/libiconv
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:= )
+	readline? ( sys-libs/readline:= )"
+RDEPEND="${DEPEND}
+	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
+BDEPEND="dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	cat >po/POTFILES.skip <<-EOF || die
+		# Required by make check
+		data/currencies.xml.in
+		data/datasets.xml.in
+		data/elements.xml.in
+		data/functions.xml.in
+		data/planets.xml.in
+		data/prefixes.xml.in
+		data/units.xml.in
+		data/variables.xml.in
+		src/defs2doc.cc
+	EOF
+
+	eautoreconf
+}
+
+src_configure() {
+	# Needed for po-defs/Makefile
+	export CXX_FOR_BUILD="$(tc-getBUILD_CXX)"
+	export CXXCPP_FOR_BUILD="$(tc-getBUILD_CXX) -E"
+
+	# bug #792027
+	tc-export CC
+
+	# bug #924939
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	local myeconfargs=(
+		$(use_enable test tests)
+		$(use_enable test unittests)
+		$(use_with curl libcurl)
+		$(use_with gnuplot gnuplot-call)
+		$(use_enable !hardened insecure)
+		$(use_with icu)
+		$(use_with readline)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	# docs/reference/Makefile.am -> referencedir=
+	emake \
+		DESTDIR="${D}" \
+		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		install
+
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-9999-depmod.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-9999-depmod.patch
new file mode 100644
index 000000000000..34ae11eea6c7
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-9999-depmod.patch
@@ -0,0 +1,22 @@
+Depmod fails here since we're still in DESTDIR and the actual target path may
+not exist...
+
+
+diff --git a/Makefile b/Makefile
+index 356bba54..8f5b4b63 100644
+--- a/Makefile
++++ b/Makefile
+@@ -27,13 +27,9 @@ clean:
+                 M="$(GPIB_SRCDIR)/drivers/gpib" \
+                 GPIB_TOP_DIR=$(GPIB_SRCDIR) 
+ 
+-#We run depmod explicitly because the depmod.sh script run
+-#by modules_install fails on Debian due to it failing to find
+-#the System.map file.
+ install:
+ 	$(MAKE) -C $(LINUX_SRCDIR) V=$(VERBOSE) modules_install\
+                 M="$(GPIB_SRCDIR)/drivers/gpib" \
+                 GPIB_TOP_DIR=$(GPIB_SRCDIR) \
+                 INSTALL_MOD_DIR=gpib
+-	/sbin/depmod -A
+ 
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-9999.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-9999.ebuild
new file mode 100644
index 000000000000..cf690543f994
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-9999.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/linux-gpib/git"
+	S="${WORKDIR}/${P}/linux-gpib-kernel"
+else
+	SRC_URI="https://downloads.sourceforge.net/linux-gpib/linux-gpib-${PV}.tar.gz"
+	S="${WORKDIR}/linux-gpib-kernel-${PV}"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+	acct-group/gpib
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	# don't fix debian bugs if they break gentoo
+	"${FILESDIR}/${PN}-9999-depmod.patch"
+)
+
+MODULES_KERNEL_MIN=2.6.8
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		default
+		unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
+	fi
+}
+
+src_configure() {
+	MODULES_MAKEARGS+=( LINUX_SRCDIR="${KV_OUT_DIR}" )
+	use debug && MODULES_MAKEARGS+=( 'GPIB-DEBUG=1' )
+}
+
+src_compile() {
+	# The individual modules don't have separate targets so we can't use
+	# modlist here.
+	emake "${MODULES_MAKEARGS[@]}"
+}
+
+src_install() {
+	emake \
+		"${MODULES_MAKEARGS[@]}" \
+		DESTDIR="${ED}" \
+		INSTALL_MOD_PATH="${ED}" \
+		docdir="${ED}/usr/share/doc/${PF}/html" \
+		install
+
+	modules_post_process
+
+	dodoc AUTHORS README* NEWS
+	[[ ${PV} != 9999 ]] && dodoc ChangeLog
+	einstalldocs
+}
diff --git a/sci-libs/linux-gpib/linux-gpib-9999.ebuild b/sci-libs/linux-gpib/linux-gpib-9999.ebuild
new file mode 100644
index 000000000000..25af503e2da7
--- /dev/null
+++ b/sci-libs/linux-gpib/linux-gpib-9999.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GUILE_COMPAT=( 2-2 3-0 )
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit readme.gentoo-r1 autotools distutils-r1 guile-single perl-functions udev
+
+# Check for latest firmware version on bump
+FW_PV="2008-08-10"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/linux-gpib/git"
+	S="${WORKDIR}/${P}/${PN}-user"
+else
+	SRC_URI="https://downloads.sourceforge.net/linux-gpib/${P}.tar.gz"
+	S="${WORKDIR}/${PN}-user-${PV}"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
+SRC_URI+="
+	firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-${FW_PV}.tar.gz )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="pcmcia static guile perl php python tcl doc firmware"
+REQUIRED_USE="
+	guile? ( ${GUILE_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+COMMONDEPEND="
+	sys-libs/readline:=
+	tcl? ( dev-lang/tcl:0= )
+	guile? ( ${GUILE_DEPS} )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:= )
+	firmware? ( sys-apps/fxload )
+"
+RDEPEND="${COMMONDEPEND}
+	acct-group/gpib
+	~sci-libs/linux-gpib-modules-${PV}
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${COMMONDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/docbook-sgml-utils[jadetex] )
+	python? ( ${DISTUTILS_DEPS} ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.0-perl.patch
+)
+
+pkg_setup() {
+	use guile && guile-single_pkg_setup
+	use perl && perl_set_version
+	use python && python_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		default
+		unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz"
+	fi
+}
+
+src_prepare() {
+	default
+
+	use guile && guile_bump_sources
+
+	# We have to use --root instead of --prefix for setup.py.
+	# Otherwise the python files are not installed properly into site-packages.
+	sed -i -e \
+		's/--prefix=$(DESTDIR)$(prefix)/--root=$(DESTDIR)/g' \
+		language/python/Makefile.am || die
+
+	eautoreconf
+
+	if use python; then
+		pushd language/python >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
+}
+
+src_configure() {
+	myeconfargs=(
+		$(use_enable static)
+		$(use_enable guile guile-binding)
+		$(use_enable perl perl-binding)
+		$(use_enable php php-binding)
+		$(use_enable python python-binding)
+		$(use_enable tcl tcl-binding)
+		$(use_enable doc documentation)
+		--disable-python-binding
+	)
+
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		pushd language/python >/dev/null || die
+		distutils-r1_src_configure
+		popd >/dev/null || die
+	fi
+}
+
+src_compile() {
+	default
+	if use python; then
+		pushd language/python >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	# PYTHONDONTWRITEBYTECODE=0 is required, otherwise
+	# installation of the python files is skipped
+	FIRM_DIR="${EPREFIX}"/usr/share/usb
+	emake \
+		DESTDIR="${ED}" \
+		INSTALL_MOD_PATH="${ED}" \
+		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
+		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
+		USB_FIRMWARE_DIR=${FIRM_DIR} \
+		PYTHONDONTWRITEBYTECODE=0 \
+		docdir="/usr/share/doc/${PF}/html" install
+
+	use guile && guile_unstrip_ccache
+
+	if use perl; then
+		einfo "Installing perl module"
+		cd "${S}"/language/perl || die
+		emake DESTDIR="${ED}" install
+		perl_fix_packlist
+		perl_delete_emptybsdir
+		cd "${S}" || die
+	fi
+
+	if use python; then
+		pushd language/python >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules || die
+	udev_dorules 99-gpib.rules
+
+	dodoc AUTHORS README* NEWS
+	if [[ ${PV} == 9999 ]]; then
+		dodoc ../ChangeLog
+	else
+		dodoc doc/linux-gpib.pdf ChangeLog
+	fi
+
+	insinto /etc
+	newins util/templates/gpib.conf gpib.conf
+	newins util/templates/gpib.conf gpib.conf.example
+
+	if use pcmcia; then
+		insinto /etc/pcmcia
+		doins "${S}"/etc/pcmcia/*
+	fi
+
+	# remove .la files
+	find "${ED}" -name '*.la' -delete || die
+
+	DOC_CONTENTS="
+As the udev rules were changed and refactored in this release it is
+necessary to remove any manually installed pre-4.3.0 gpib udev rules files
+in /etc/udev/rules.d/. The files to remove are:
+\n
+	99-agilent_82357a.rules\n
+	99-gpib-generic.rules\n
+	99-ni_usb_gpib.rules\n
+\n
+You need to run the 'gpib_config' utility to setup the driver before
+you can use it. In order to do it automatically you can add to your
+start script something like this (supposing the appropriate driver
+is loaded on the startup):
+\n
+		gpib_config --minor 0
+\n
+To give a user access to the computer's gpib board you will have to add
+them to the group 'gpib' or, you could change the permissions on the device
+files /dev/gpib[0-15] to something you like better, using 'chmod'
+\n
+Edit /etc/gpib.conf to match your interface board, and any devices you wish
+to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for
+more information.
+\n
+"
+
+	if use pcmcia; then
+		DOC_CONTENTS+='
+For PCMCIA cards:\n
+All files needed for a PCMCIA board were copied to /etc/pcmcia.
+You may wish to edit the options passed to the gpib_config call in the
+/etc/pcmcia/linux-gpib-pcmcia script.
+You may need to send a SIGHUP signal to the cardmgr daemon to force it
+to reload the files in /etc/pcmcia \(alternatively you could use your
+pcmcia init.d script to restart the cardmgr, or you could just reboot\).
+The driver module will be loaded as needed by the cardmgr.
+
+'
+	fi
+
+	if use firmware; then
+		DOC_CONTENTS+='
+For Agilent \(HP\) 82341C and 82341D cards:
+The firmware for these boards is uploaded by passing the appropriate
+firmware file from /usr/share/linux-gpib/hp_82341 directory to
+gpib_config using the -I or --init-data command line option. Example:\n
+gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin
+'
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sci-libs/miopen/Manifest b/sci-libs/miopen/Manifest
index 2b9827766bf0..5fc8fe370379 100644
--- a/sci-libs/miopen/Manifest
+++ b/sci-libs/miopen/Manifest
@@ -1,4 +1,5 @@
 DIST MIOpen-5.1.3.tar.gz 88118329 BLAKE2B d24722ffc5f5dab6d6a1de2ce34193ad2f25c9a2562e38c52e010a29870f01d9ea1c56970ba0601a088c8286e97958ee95d0da27fc8082126dd2ebe5ccb36b70 SHA512 a14e28cfcb12e5061e0e7b999ef3e67fa0a0e897e31bc50e7288b8a23eb1791312e33d3b697021c2b654ccc065ae1b046c1cfd77ba8e04b0f3e87e9cc0626dcd
 DIST MIOpen-5.7.1.tar.gz 100751593 BLAKE2B c5f847fe4374ab22737c281a65401125012328412d584fc09244b431ea6265d6d5028429115ee15fa8b04cbe0edd020e4e7ac8deb22561183ed76cb8c3d4d9d4 SHA512 3354b3b154f29a6337403abc5a71ec47c0b2558320c5a1b0cbfbbdb370c4fada2db12d4a19a312b5e30ca2e2302ee50ece3390603e84d132b2212a168e9523fa
 DIST MIOpen-6.1.1.tar.gz 101935496 BLAKE2B 5aadaa5eefa1b22dedfe87deb36f8acdbe57962cac8b7b6b20bc76f136ef29f0441e48112010280c2e674a1ae9fd202ca3e07be47cf4a4bc797234d6dc618be5 SHA512 b8860583919bf2f3e0da7ace30fdb0595ab45b85a367be3737e0b15a22a5565b8d6660c652ee070f21c36ac7d17ef3ba8e2eda7ed89bd6a0c65a4df799626d1a
+DIST MIOpen-6.3.0.tar.gz 104152308 BLAKE2B 46c238314393599a1bd4d3c49b0c95386b36cbee1831bf442ab127082b4c740116e81cf643c773627125b59c3974a2344753939b4287aa4adbbc51e4c4833988 SHA512 14ca2967ed6545ad68c362128be93b8e6a9d4aa69e16e989b187463d15351eca2fc437d07e88c41f693138131a7449add607333c698e24efaf0207077e15ae55
 DIST gtest-1.11.0_p20210611.tar.gz 887296 BLAKE2B 8f29b7028a6dd8190a113cd93398705b23b61d88bee38beaf9dcc0dfc8a463aed7fcd3719f6f1b131d4363aa57231629aaeffa108f6558efb58416cfface6d6e SHA512 cf9e7f3fd3e31ce6677eac355fb8bfe19c5b56a8ec3af8b9417d0904cdf5da92f99f7411a08131cc9fa4fc7d38e6a71fcfac993648e47b269a74a27de7607f7a
diff --git a/sci-libs/miopen/files/miopen-6.1.1-fix-libcxx.patch b/sci-libs/miopen/files/miopen-6.1.1-fix-libcxx.patch
new file mode 100644
index 000000000000..0ce842d1470a
--- /dev/null
+++ b/sci-libs/miopen/files/miopen-6.1.1-fix-libcxx.patch
@@ -0,0 +1,246 @@
+--- a/cmake/EnableCompilerWarnings.cmake
++++ b/cmake/EnableCompilerWarnings.cmake
+@@ -70,6 +70,7 @@ set(__clang_cxx_compile_options
+     -Wno-unused-command-line-argument
+     -Wno-weak-vtables
+     -Wno-covered-switch-default
++    -Wno-switch-default
+     -Wno-unused-result
+     -Wno-unsafe-buffer-usage
+     -Wno-deprecated-declarations
+--- a/src/include/miopen/bfloat16.hpp
++++ b/src/include/miopen/bfloat16.hpp
+@@ -28,6 +28,7 @@
+ #include <boost/operators.hpp>
+ #include <iostream>
+ #include <miopen/config.h>
++#include <miopen/libcxx_compat.hpp>
+ 
+ class bfloat16 : boost::totally_ordered<bfloat16, boost::arithmetic<bfloat16>>
+ {
+@@ -152,7 +153,7 @@ private:
+     std::uint16_t data_;
+ };
+ 
+-namespace std {
++NAMESPACE_STD_BEGIN
+ template <>
+ class numeric_limits<bfloat16>
+ {
+@@ -173,5 +174,5 @@ public:
+         return bfloat16::generate(0x0001); // 0x0.02p-126
+     }
+ };
+-} // namespace std
++NAMESPACE_STD_END
+ #endif
+--- /dev/null
++++ b/src/include/miopen/libcxx_compat.hpp
+@@ -0,0 +1,44 @@
++/*******************************************************************************
++ *
++ * MIT License
++ *
++ * Copyright (c) 2024 Advanced Micro Devices, Inc.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in all
++ * copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++ * SOFTWARE.
++ *
++ *******************************************************************************/
++#ifndef LIBCXX_COMPAT_HPP_
++#define LIBCXX_COMPAT_HPP_
++
++// Definitions for libc++ compatibility
++#ifdef __has_include
++#if __has_include (<__config>)
++#include <__config>
++#endif
++#endif
++
++#ifdef _LIBCPP_VERSION
++#define NAMESPACE_STD_BEGIN _LIBCPP_BEGIN_NAMESPACE_STD
++#define NAMESPACE_STD_END _LIBCPP_END_NAMESPACE_STD
++#else
++#define NAMESPACE_STD_BEGIN namespace std {
++#define NAMESPACE_STD_END }
++#endif
++
++#endif
+--- a/src/kernels/hip_float8.hpp
++++ b/src/kernels/hip_float8.hpp
+@@ -26,6 +26,7 @@
+ #pragma once
+ 
+ #include "miopen_cstdint.hpp"
++#include "libcxx_compat.hpp"
+ 
+ #ifndef MIOPEN_ENABLE_F8_DEVICE_CODE
+ #define MIOPEN_ENABLE_F8_DEVICE_CODE 0
+@@ -590,7 +591,7 @@ public:
+ // from the precompiled header.
+ #else
+ // NOLINTBEGIN(cert-dcl58-cpp)
+-namespace std {
++NAMESPACE_STD_BEGIN
+ inline bool isfinite(miopen_f8::hip_f8<miopen_f8::hip_f8_type::fp8> x) // NOLINT
+ {
+     return !(x.is_inf() || x.is_nan());
+@@ -611,12 +612,12 @@ inline bool isnan(miopen_f8::hip_f8<miopen_f8::hip_f8_type::bf8> x) // NOLINT
+     return x.is_nan();
+ }
+ 
+-} // namespace std
++NAMESPACE_STD_END
+   // NOLINTEND(cert-dcl58-cpp)
+ #endif
+ 
+ // NOLINTBEGIN(cert-dcl58-cpp)
+-namespace std {
++NAMESPACE_STD_BEGIN
+ 
+ template <typename T>
+ class numeric_limits;
+@@ -633,7 +634,7 @@ class numeric_limits<miopen_f8::hip_f8<miopen_f8::hip_f8_type::bf8>>
+ {
+ };
+ 
+-} // namespace std
++NAMESPACE_STD_END
+ // NOLINTEND(cert-dcl58-cpp)
+ 
+ template <miopen_f8::hip_f8_type T>
+--- /dev/null
++++ b/src/kernels/libcxx_compat.hpp
+@@ -0,0 +1,41 @@
++/*******************************************************************************
++ *
++ * MIT License
++ *
++ * Copyright (c) 2024 Advanced Micro Devices, Inc.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in all
++ * copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++ * SOFTWARE.
++ *
++ *******************************************************************************/
++#pragma once
++
++// Definitions for libc++ compatibility
++#ifdef __has_include
++#if __has_include (<__config>)
++#include <__config>
++#endif
++#endif
++
++#ifdef _LIBCPP_VERSION
++#define NAMESPACE_STD_BEGIN _LIBCPP_BEGIN_NAMESPACE_STD
++#define NAMESPACE_STD_END _LIBCPP_END_NAMESPACE_STD
++#else
++#define NAMESPACE_STD_BEGIN namespace std {
++#define NAMESPACE_STD_END }
++#endif
+--- a/src/kernels/miopen_limits.hpp
++++ b/src/kernels/miopen_limits.hpp
+@@ -33,8 +33,9 @@
+ 
+ #define MIOPEN_ENABLE_F8_DEVICE_CODE 1
+ #include "hip_float8.hpp"
++#include "libcxx_compat.hpp"
+ 
+-namespace std {
++NAMESPACE_STD_BEGIN
+ 
+ template <typename T>
+ class numeric_limits;
+@@ -91,7 +92,7 @@ public:
+ };
+ #endif
+ 
+-} // namespace std
++NAMESPACE_STD_END
+ 
+ #else
+ 
+--- a/src/kernels/miopen_type_traits.hpp
++++ b/src/kernels/miopen_type_traits.hpp
+@@ -26,8 +26,9 @@
+ #pragma once
+ 
+ #ifdef MIOPEN_DONT_USE_HIP_RUNTIME_HEADERS
++#include "libcxx_compat.hpp"
+ 
+-namespace std {
++NAMESPACE_STD_BEGIN
+ 
+ template <class T>
+ struct remove_reference
+@@ -140,7 +141,7 @@ struct conditional<false, X, Y>
+ template <bool predicate, typename X, typename Y>
+ using conditional_t = typename conditional<predicate, X, Y>::type;
+ 
+-} // namespace std
++NAMESPACE_STD_END
+ #else
+ 
+ #include <type_traits> // std::remove_reference, std::remove_cv, is_pointer
+--- a/src/kernels/miopen_utility.hpp
++++ b/src/kernels/miopen_utility.hpp
+@@ -28,8 +28,9 @@
+ #ifdef MIOPEN_DONT_USE_HIP_RUNTIME_HEADERS
+ 
+ #include "miopen_type_traits.hpp" // std::remove_reference
++#include "libcxx_compat.hpp"
+ 
+-namespace std {
++NAMESPACE_STD_BEGIN
+ 
+ template <typename T>
+ constexpr T&& forward(typename remove_reference<T>::type& t_) noexcept
+@@ -43,7 +44,7 @@ constexpr T&& forward(typename remove_reference<T>::type&& t_) noexcept
+     return static_cast<T&&>(t_);
+ }
+ 
+-} // namespace std
++NAMESPACE_STD_END
+ 
+ #else
+ 
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -481,6 +481,7 @@ if( MIOPEN_BACKEND MATCHES "OpenCL" OR MIOPEN_BACKEND STREQUAL "HIPOC" OR MIOPEN
+         kernels/gpr_alloc.inc
+         kernels/hip_atomic.hpp
+         kernels/hip_f8_impl.hpp
++        kernels/libcxx_compat.hpp
+         kernels/hip_float8.hpp
+         kernels/inst_wrappers.inc
+         kernels/miopen_cstdint.hpp
diff --git a/sci-libs/miopen/files/miopen-6.3.0-conditional-ck-components.patch b/sci-libs/miopen/files/miopen-6.3.0-conditional-ck-components.patch
new file mode 100644
index 000000000000..b4332d5a1ca6
--- /dev/null
+++ b/sci-libs/miopen/files/miopen-6.3.0-conditional-ck-components.patch
@@ -0,0 +1,46 @@
+composable_kernel does not build some functions/targets depending on GPU.
+Upstream bug: https://github.com/ROCm/composable_kernel/issues/1646
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -847,10 +847,6 @@ target_include_directories(MIOpen PUBLIC
+     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/include>
+ )
+ 
+-if(MIOPEN_USE_COMPOSABLEKERNEL)
+-set(MIOPEN_CK_LINK_FLAGS composable_kernel::device_other_operations composable_kernel::device_gemm_operations composable_kernel::device_conv_operations composable_kernel::device_reduction_operations composable_kernel::device_mha_operations hip::host)
+-endif()
+-
+ if(WIN32)
+     # Refer to https://en.cppreference.com/w/cpp/language/types for details.
+     target_compile_options(MIOpen PRIVATE $<BUILD_INTERFACE:$<$<CXX_COMPILER_ID:Clang>:-U__LP64__>>)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -327,7 +327,27 @@ add_compile_definitions($<$<COMPILE_LANGUAGE:CXX>:HIP_COMPILER_FLAGS=${HIP_COMPI
+ # HIP
+ if( MIOPEN_BACKEND STREQUAL "HIP" OR MIOPEN_BACKEND STREQUAL "HIPOC" OR MIOPEN_BACKEND STREQUAL "HIPNOGPU")
+     if(MIOPEN_USE_COMPOSABLEKERNEL)
+-        find_package(composable_kernel 1.0.0 COMPONENTS device_other_operations device_gemm_operations device_conv_operations device_reduction_operations device_mha_operations)
++        set(MIOPEN_CK_LINK_FLAGS hip::host)
++        set(COMPONENTS_LIST device_other_operations device_gemm_operations device_conv_operations device_reduction_operations device_mha_operations)
++        foreach(component IN LISTS COMPONENTS_LIST)
++            find_package(composable_kernel 1.0.0 COMPONENTS ${component} QUIET)
++            if(TARGET composable_kernel::${component})
++                list(APPEND MIOPEN_CK_LINK_FLAGS "composable_kernel::${component}")
++            else()
++                message(WARNING "CK component '${component}' not found.")
++            endif()
++        endforeach()
++        if(AMDGPU_TARGETS MATCHES "gfx94" OR AMDGPU_TARGETS MATCHES "gfx90a")
++            add_definitions(-DMIOPEN_USE_CK_MHA_OPS=1)
++        else()
++            add_definitions(-DMIOPEN_USE_CK_MHA_OPS=0)
++        endif()
++        if(AMDGPU_TARGETS MATCHES "gfx9")
++            add_definitions(-DMIOPEN_USE_CK_XDL_OPS=1)
++        else()
++            add_definitions(-DMIOPEN_USE_CK_XDL_OPS=0)
++        endif()
++
+     endif()
+     if( MIOPEN_BACKEND STREQUAL "HIPNOGPU")
+         set(MIOPEN_MODE_NOGPU 1)
diff --git a/sci-libs/miopen/files/miopen-6.3.0-isnan-include.patch b/sci-libs/miopen/files/miopen-6.3.0-isnan-include.patch
new file mode 100644
index 000000000000..c7672e96a117
--- /dev/null
+++ b/sci-libs/miopen/files/miopen-6.3.0-isnan-include.patch
@@ -0,0 +1,19 @@
+--- a/driver/reducecalculation_driver.hpp
++++ b/driver/reducecalculation_driver.hpp
+@@ -34,6 +34,7 @@
+ #include <algorithm>
+ #include <cfloat>
+ #include <cstdlib>
++#include <cmath>
+ #include <memory>
+ #include <miopen/miopen.h>
+ #include <miopen/tensor.hpp>
+@@ -77,7 +78,7 @@ int32_t mloReduceCalculationForwardRunHost(miopenTensorDescriptor_t inputDesc,
+         for(size_t i = 0; i < reduce_size; ++i)
+         {
+             Tcheck val = static_cast<Tcheck>(input[input_idx]);
+-            if(nanPropagation && isnan(val))
++            if(nanPropagation && std::isnan(val))
+             {
+                 val = 0.0f;
+             }
diff --git a/sci-libs/miopen/metadata.xml b/sci-libs/miopen/metadata.xml
index e08e7753394d..07d78ddb5aa1 100644
--- a/sci-libs/miopen/metadata.xml
+++ b/sci-libs/miopen/metadata.xml
@@ -19,4 +19,10 @@
   <upstream>
     <remote-id type="github">ROCm/MIOpen</remote-id>
   </upstream>
+  <use>
+    <flag name="composable-kernel">Use composable-kernel for GEMM-like and reduction-like operators.</flag>
+    <flag name="hipblaslt">Use hipBLASLt for some non-batched and strided batched problems.</flag>
+    <flag name="rocblas">Build with rocBLAS support</flag>
+    <flag name="roctracer">Build with roctracer support</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/miopen/miopen-6.1.1.ebuild b/sci-libs/miopen/miopen-6.1.1.ebuild
index f272f435ece8..6cf70cea3434 100644
--- a/sci-libs/miopen/miopen-6.1.1.ebuild
+++ b/sci-libs/miopen/miopen-6.1.1.ebuild
@@ -21,7 +21,7 @@ IUSE="debug test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-util/hip
+	dev-util/hip:${SLOT}
 	>=dev-db/sqlite-3.17
 	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
 	sci-libs/composable-kernel:${SLOT}[${ROCM_USEDEP}]
diff --git a/sci-libs/miopen/miopen-6.3.0.ebuild b/sci-libs/miopen/miopen-6.3.0.ebuild
new file mode 100644
index 000000000000..45b1214c37cd
--- /dev/null
+++ b/sci-libs/miopen/miopen-6.3.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+LLVM_COMPAT=( 19 )
+
+inherit cmake flag-o-matic llvm-r1 rocm
+
+DESCRIPTION="AMD's Machine Intelligence Library"
+HOMEPAGE="https://github.com/ROCm/MIOpen"
+SRC_URI="https://github.com/ROCm/MIOpen/archive/rocm-${PV}.tar.gz -> MIOpen-${PV}.tar.gz"
+S="${WORKDIR}/MIOpen-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="composable-kernel debug hipblaslt rocblas roctracer test"
+
+# tests can freeze machine depending on gpu/kernel
+RESTRICT="test"
+
+RDEPEND="
+	dev-util/hip:${SLOT}
+	>=dev-db/sqlite-3.17
+	sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}]
+	>=dev-libs/boost-1.72
+	dev-cpp/nlohmann_json
+	dev-cpp/frugally-deep
+
+	composable-kernel? ( sci-libs/composable-kernel:${SLOT}[${ROCM_USEDEP}] )
+	hipblaslt? (
+		sci-libs/hipBLAS:${SLOT}[${ROCM_USEDEP}]
+		sci-libs/hipBLASLt:${SLOT}
+	)
+	rocblas? ( sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] )
+	roctracer? ( dev-util/roctracer:${SLOT}[${ROCM_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	>=dev-libs/half-1.12.0-r1
+	dev-build/rocm-cmake
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-build-all-tests.patch
+	"${FILESDIR}"/${PN}-6.1.1-fix-libcxx.patch
+	"${FILESDIR}"/${PN}-6.3.0-conditional-ck-components.patch
+	"${FILESDIR}"/${PN}-6.3.0-isnan-include.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# complementary replacements for conditional-ck-components patch
+	find src -name '*mha*.cpp' -type f | while IFS= read -r file; do
+		sed -i "s/MIOPEN_USE_COMPOSABLEKERNEL/MIOPEN_USE_CK_MHA_OPS/g" "$file" || die
+	done
+
+	sed -i "s/MIOPEN_USE_COMPOSABLEKERNEL/MIOPEN_USE_CK_XDL_OPS/g" \
+		src/mlo_dir_conv.cpp \
+		src/solver/conv_ck_igemm_fwd_bias_res_add_activ_fused.cpp \
+		src/solver/conv_ck_igemm_fwd_bias_activ_fused.cpp || die
+	find src -name '*xdl*.cpp' -type f | while IFS= read -r file; do
+		sed -i "s/MIOPEN_USE_COMPOSABLEKERNEL/MIOPEN_USE_CK_XDL_OPS/g" "$file" || die
+	done
+
+	sed -e '/MIOPEN_TIDY_ERRORS ALL/d' \
+		-e 's/FLAGS_RELEASE} -s/FLAGS_RELEASE}/g' \
+		-i CMakeLists.txt || die
+
+	sed -e "/add_test/s:--build \${CMAKE_CURRENT_BINARY_DIR}:--build ${BUILD_DIR}:" \
+		-i test/CMakeLists.txt || die
+
+	sed -e "s:\${PROJECT_BINARY_DIR}/miopen/include:\${PROJECT_BINARY_DIR}/include:" \
+		-i src/CMakeLists.txt || die
+}
+
+src_configure() {
+	rocm_use_hipcc
+
+	if ! use debug; then
+		append-cflags "-DNDEBUG"
+		append-cxxflags "-DNDEBUG"
+		CMAKE_BUILD_TYPE="Release"
+	else
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DMIOPEN_BACKEND=HIP
+		-DBoost_USE_STATIC_LIBS=OFF
+		-DMIOPEN_USE_MLIR=OFF
+		-DMIOPEN_USE_ROCTRACER=$(usex roctracer ON OFF)
+		-DMIOPEN_USE_ROCBLAS=$(usex rocblas ON OFF)
+		-DMIOPEN_USE_HIPBLASLT=$(usex hipblaslt ON OFF)
+		-DMIOPEN_USE_COMPOSABLEKERNEL=$(usex composable-kernel ON OFF)
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DMIOPEN_HIP_COMPILER="${ESYSROOT}/usr/bin/hipcc"
+		-DMIOPEN_AMDGCN_ASSEMBLER="$(get_llvm_prefix)/bin/clang"
+		-DHIP_OC_COMPILER="$(get_llvm_prefix)/bin/clang"
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DMIOPEN_TEST_ALL=ON
+			-DMIOPEN_TEST_GDB=OFF
+		)
+		# needed by rocminfo
+		addpredict /dev/random
+		check_amdgpu
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	LD_LIBRARY_PATH="${BUILD_DIR}"/lib MIOPEN_SYSTEM_DB_PATH="${BUILD_DIR}"/share/miopen/db/ cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+}
diff --git a/sci-libs/mpfi/mpfi-1.5.4_p20220401.ebuild b/sci-libs/mpfi/mpfi-1.5.4_p20220401.ebuild
index 9694c5abd983..bea69d29e332 100644
--- a/sci-libs/mpfi/mpfi-1.5.4_p20220401.ebuild
+++ b/sci-libs/mpfi/mpfi-1.5.4_p20220401.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 @@ S="${WORKDIR}/${PN}-1.5.4"
 # are LGPL-2.1+
 LICENSE="GPL-3 LGPL-3 LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-libs/gmp:0=
diff --git a/sci-libs/ondselsolver/Manifest b/sci-libs/ondselsolver/Manifest
new file mode 100644
index 000000000000..94934435ef72
--- /dev/null
+++ b/sci-libs/ondselsolver/Manifest
@@ -0,0 +1,2 @@
+DIST ondselsolver-1.0.1_p20241024.tar.gz 4668075 BLAKE2B 82e13168b2f6d988e411613584d9bb943afd9df73716a467d2681658d530e71173abcb31e432075dce8ebc1f0276ecb2b7b837bf057fb68f654c972e2d77f5b5 SHA512 918542fca4bfcb952d6d9500a0f3721549810dd2cde9adfb352d9301e0e1bf0fe1100a301316f15a6dcd18e36d371c58ba4a41b8f8e0878a77db4cbf054a095a
+DIST ondselsolver-1.0.1_p20241127.tar.gz 4669048 BLAKE2B 6f6c4f9468b2474890b05ca394947aa91bc1780e1ef922bba40144a30c247db32d7a5de469ed27e426209013b07a137522bad9c220d9e1862f7e946696974b0b SHA512 3504a6ab379f2d9d943a1a6da8f79abffebd7fe45fd3258f0bfeb0a789d73a2b68714c10e77e48987514c8acb23800412c10daa0046ed82dab4a2aab569851ff
diff --git a/sci-libs/ondselsolver/files/ondselsolver-1.0.1-include-cstdint-gcc15.patch b/sci-libs/ondselsolver/files/ondselsolver-1.0.1-include-cstdint-gcc15.patch
new file mode 100644
index 000000000000..9068c1cf2fad
--- /dev/null
+++ b/sci-libs/ondselsolver/files/ondselsolver-1.0.1-include-cstdint-gcc15.patch
@@ -0,0 +1,70 @@
+From 432aa45ca37ecc3e15a8fb4a62ebf85b0a189775 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Sat, 11 Jan 2025 00:14:18 +0100
+Subject: [PATCH] include cstdint [gcc15]
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/OndselSolver/Constraint.h b/OndselSolver/Constraint.h
+index 119b627..a7409a8 100644
+--- a/OndselSolver/Constraint.h
++++ b/OndselSolver/Constraint.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <memory>
+ 
+ #include "enum.h"
+diff --git a/OndselSolver/DirectionCosineConstraintIqcJqc.h b/OndselSolver/DirectionCosineConstraintIqcJqc.h
+index 5d68fcd..c81a41f 100644
+--- a/OndselSolver/DirectionCosineConstraintIqcJqc.h
++++ b/OndselSolver/DirectionCosineConstraintIqcJqc.h
+@@ -9,6 +9,7 @@
+ #pragma once
+ 
+ #include "DirectionCosineConstraintIqcJc.h"
++#include <cstdint>
+ 
+ namespace MbD {
+     class DirectionCosineConstraintIqcJqc : public DirectionCosineConstraintIqcJc
+diff --git a/OndselSolver/DispCompIecJecO.h b/OndselSolver/DispCompIecJecO.h
+index 74a1ca4..da3243a 100644
+--- a/OndselSolver/DispCompIecJecO.h
++++ b/OndselSolver/DispCompIecJecO.h
+@@ -9,6 +9,7 @@
+ #pragma once
+ 
+ #include "KinematicIeJe.h"
++#include <cstdint>
+ 
+ namespace MbD {
+ 	class DispCompIecJecO : public KinematicIeJe
+diff --git a/OndselSolver/FullMatrix.h b/OndselSolver/FullMatrix.h
+index 1013791..90e54aa 100644
+--- a/OndselSolver/FullMatrix.h
++++ b/OndselSolver/FullMatrix.h
+@@ -9,6 +9,7 @@
+ #pragma once
+ 
+ #include <cmath>
++#include <cstdint>
+ #include <memory>
+ 
+ #include "RowTypeMatrix.h"
+diff --git a/OndselSolver/NewtonRaphson.h b/OndselSolver/NewtonRaphson.h
+index 9d9fb19..bf0c517 100644
+--- a/OndselSolver/NewtonRaphson.h
++++ b/OndselSolver/NewtonRaphson.h
+@@ -8,6 +8,7 @@
+  
+ #pragma once
+ 
++#include <cstdint>
+ #include <memory>
+ #include <vector>
+ 
+-- 
+2.47.1
+
diff --git a/sci-libs/ondselsolver/files/ondselsolver-1.0.1-properly-demangle-typenames.patch b/sci-libs/ondselsolver/files/ondselsolver-1.0.1-properly-demangle-typenames.patch
new file mode 100644
index 000000000000..7d536796d9f5
--- /dev/null
+++ b/sci-libs/ondselsolver/files/ondselsolver-1.0.1-properly-demangle-typenames.patch
@@ -0,0 +1,191 @@
+From 71c1f42d85ee1819741786255dc8876047398e8e Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Sun, 12 Jan 2025 19:22:48 +0100
+Subject: [PATCH] properly demangle typenames
+
+C++ class names are mangled. How these are mangled is implementation specific.
+Using string offsets is naive and caused at minimum testfailures.
+
+For gcc and clang you can use cxxabi.h to get demangled name.
+This initial patch uses this for linux only, so the gentoo build suceeeds.
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/OndselSolver/ASMTItem.cpp b/OndselSolver/ASMTItem.cpp
+index a18e7c9..9d5383a 100644
+--- a/OndselSolver/ASMTItem.cpp
++++ b/OndselSolver/ASMTItem.cpp
+@@ -12,6 +12,7 @@
+ #include "ASMTAssembly.h"
+ #include "Constant.h"
+ #include <algorithm>
++#include "Demangle.h"
+ 
+ using namespace MbD;
+ 
+@@ -41,9 +42,7 @@ void MbD::ASMTItem::noop()
+ 
+ std::string MbD::ASMTItem::classname()
+ {
+-	std::string str = typeid(*this).name();
+-	auto answer = str.substr(11, str.size() - 11);
+-	return answer;
++	return demangle(typeid(*this).name());
+ }
+ 
+ void MbD::ASMTItem::setName(const std::string& str)
+diff --git a/OndselSolver/ASMTJoint.cpp b/OndselSolver/ASMTJoint.cpp
+index 40edd52..bb710e3 100644
+--- a/OndselSolver/ASMTJoint.cpp
++++ b/OndselSolver/ASMTJoint.cpp
+@@ -9,6 +9,7 @@
+ 
+ #include "ASMTJoint.h"
+ #include "Joint.h"
++#include "Demangle.h"
+ 
+ using namespace MbD;
+ 
+@@ -47,9 +48,7 @@ void MbD::ASMTJoint::storeOnLevel(std::ofstream& os, size_t level)
+ 
+ void MbD::ASMTJoint::storeOnTimeSeries(std::ofstream& os)
+ {
+-	std::string label = typeid(*this).name();
+-	label = label.substr(15, label.size() - 15);
+-	os << label << "Series\t" << fullName("") << std::endl;
++	os << demangle(typeid(*this).name()) << "Series\t" << fullName("") << std::endl;
+ 	ASMTItemIJ::storeOnTimeSeries(os);
+ }
+ 
+diff --git a/OndselSolver/Array.h b/OndselSolver/Array.h
+index 636e9a5..e270795 100644
+--- a/OndselSolver/Array.h
++++ b/OndselSolver/Array.h
+@@ -16,6 +16,7 @@
+ #include "Numeric.h"
+ #include <limits>
+ 
++#include "Demangle.h"
+ //#include "Symbolic.h"
+ 
+ namespace MbD {
+@@ -51,10 +52,7 @@ namespace MbD {
+ 		void atitimes(size_t i, double factor);
+ 
+ 		virtual std::ostream& printOn(std::ostream& s) const {
+-			std::string str = typeid(*this).name();
+-			auto classname = str.substr(11, str.size() - 11);
+-			s << classname << std::endl;
+-			return s;
++			return s << demangle(typeid(*this).name()) << std::endl;
+ 		}
+ 		friend std::ostream& operator<<(std::ostream& s, const Array& array)
+ 		{
+diff --git a/OndselSolver/Demangle.h b/OndselSolver/Demangle.h
+new file mode 100644
+index 0000000..810936d
+--- /dev/null
++++ b/OndselSolver/Demangle.h
+@@ -0,0 +1,39 @@
++#ifndef DEMANGLE_H
++#define DEMANGLE_H 1
++#include <string>
++
++#ifdef _WIN32
++#include <typeinfo>
++namespace {
++std::string demangle(const char* mangled_name) noexcept {
++  return mangled_name;
++}
++}
++#else // __linux__
++#include <cxxabi.h>
++namespace {
++std::string demangle(const char* mangled_name) noexcept {
++  int error = 0;
++  char *demang_name = abi::__cxa_demangle(mangled_name, 0, 0, &error);
++
++  switch (error) {
++  case 0:
++    break;
++  case -1:
++    return "memory allocation failed";
++  case -2:
++    return "not a valid mangled name";
++  case -3:
++    return "invalid arguments";
++  default:
++    return "__cxa_demangle failed";
++  }
++
++  std::string name(demang_name);
++  free(demang_name);
++
++  return name.substr(name.find_last_of("::") + 1);
++}
++}
++#endif // __linux__
++#endif
+diff --git a/OndselSolver/Item.cpp b/OndselSolver/Item.cpp
+index 4435d5d..120cd3c 100644
+--- a/OndselSolver/Item.cpp
++++ b/OndselSolver/Item.cpp
+@@ -15,6 +15,7 @@
+ #include "Item.h"
+ #include "System.h"
+ #include "Symbolic.h"
++#include "Demangle.h"
+ 
+ using namespace MbD;
+ 
+@@ -44,10 +45,7 @@ void Item::initialize()
+ 
+ std::ostream& Item::printOn(std::ostream& s) const
+ {
+-	std::string str = typeid(*this).name();
+-	auto classname = str.substr(11, str.size() - 11);
+-	s << classname << std::endl;
+-	return s;
++	return s << demangle(typeid(*this).name()) << std::endl;
+ }
+ 
+ void Item::initializeLocally()
+diff --git a/OndselSolver/Symbolic.cpp b/OndselSolver/Symbolic.cpp
+index 75bcbb6..4961964 100644
+--- a/OndselSolver/Symbolic.cpp
++++ b/OndselSolver/Symbolic.cpp
+@@ -15,6 +15,7 @@
+ #include "Product.h"
+ #include "Sum.h"
+ #include "Power.h"
++#include "Demangle.h"
+ 
+ using namespace MbD;
+ 
+@@ -160,10 +161,7 @@ bool Symbolic::isConstant()
+ 
+ std::ostream& Symbolic::printOn(std::ostream& s) const
+ {
+-	std::string str = typeid(*this).name();
+-	auto classname = str.substr(11, str.size() - 11);
+-	s << classname;
+-	return s;
++	return s << demangle(typeid(*this).name());
+ }
+ 
+ std::shared_ptr<std::vector<Symsptr>> Symbolic::getTerms()
+diff --git a/OndselSolver/CMakeLists.txt b/OndselSolver/CMakeLists.txt
+index 6836e72..30d5bf4 100644
+--- a/OndselSolver/CMakeLists.txt
++++ b/OndselSolver/CMakeLists.txt
+@@ -426,6 +426,7 @@ set(ONDSELSOLVER_HEADERS
+         CREATE.h
+         CylindricalJoint.h
+         CylSphJoint.h
++        Demangle.h
+         DiagonalMatrix.h
+         DifferenceOperator.h
+         DifferentiatedGeneralSpline.h
+-- 
+2.48.0
+
diff --git a/sci-libs/ondselsolver/files/ondselsolver-1.0.1_p20241024-system-gtest.patch b/sci-libs/ondselsolver/files/ondselsolver-1.0.1_p20241024-system-gtest.patch
new file mode 100644
index 000000000000..16258763011a
--- /dev/null
+++ b/sci-libs/ondselsolver/files/ondselsolver-1.0.1_p20241024-system-gtest.patch
@@ -0,0 +1,26 @@
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,11 +1,4 @@
+-include(FetchContent)
+-FetchContent_Declare(
+-  googletest
+-  URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
+-)
+-# For Windows: Prevent overriding the parent project's compiler/linker settings
+-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-FetchContent_MakeAvailable(googletest)
++find_package(GTest QUIET)
+ 
+ if(MSVC)
+     add_compile_options(/wd4251)
+@@ -54,8 +47,8 @@
+ 		${CMAKE_CURRENT_SOURCE_DIR}/test.cpp
+ )
+ target_link_libraries(test_run
+-    gtest_main
+-    gmock_main
++    GTest::gtest
++    GTest::gmock_main
+     ${Google_Tests_LIBS}
+     OndselSolver
+ )
diff --git a/sci-libs/ondselsolver/metadata.xml b/sci-libs/ondselsolver/metadata.xml
new file mode 100644
index 000000000000..a6feb57a7762
--- /dev/null
+++ b/sci-libs/ondselsolver/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>ydmorenoc@unal.edu.co</email>
+		<name>David Moreno</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>nowa@gentoo.org</email>
+		<name>Nowa Ammerlaan</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Ondsel-Development/OndselSolver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241024.ebuild b/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241024.ebuild
new file mode 100644
index 000000000000..b58103dbe5e8
--- /dev/null
+++ b/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241024.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+COMMIT=9e44ac50b84dbce0e04907999ff0f33e69f583bc
+
+DESCRIPTION="Assembly Constraints and Multibody Dynamics code"
+HOMEPAGE="https://github.com/Ondsel-Development/OndselSolver/"
+SRC_URI="https://github.com/Ondsel-Development/OndselSolver/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OndselSolver-${COMMIT}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+# These tests result in "Subprocess aborted"
+CMAKE_SKIP_TESTS=(
+	OndselSolver.Gears
+	OndselSolver.anglejoint
+	OndselSolver.constvel
+	OndselSolver.rackscrew
+	OndselSolver.planarbug
+	OndselSolver.piston
+)
+
+PATCHES=(
+	"${FILESDIR}/${P}-system-gtest.patch"
+	"${FILESDIR}/${PN}-1.0.1-include-cstdint-gcc15.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DONDSELSOLVER_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241127-r1.ebuild b/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241127-r1.ebuild
new file mode 100644
index 000000000000..da2e1dccd90b
--- /dev/null
+++ b/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241127-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+COMMIT=07785b7576a0655660badd845f06ed286208da1a
+
+DESCRIPTION="Assembly Constraints and Multibody Dynamics code"
+HOMEPAGE="https://github.com/Ondsel-Development/OndselSolver/"
+SRC_URI="https://github.com/Ondsel-Development/OndselSolver/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OndselSolver-${COMMIT}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.1_p20241024-system-gtest.patch"
+	"${FILESDIR}/${PN}-1.0.1-properly-demangle-typenames.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DONDSELSOLVER_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/openlibm/files/openlibm-0.8.3-fix-loong-riscv-fenv.patch b/sci-libs/openlibm/files/openlibm-0.8.3-fix-loong-riscv-fenv.patch
new file mode 100644
index 000000000000..3e66dfaa46a9
--- /dev/null
+++ b/sci-libs/openlibm/files/openlibm-0.8.3-fix-loong-riscv-fenv.patch
@@ -0,0 +1,27 @@
+https://github.com/JuliaMath/openlibm/commit/c4667caea25ae3487adf6760b4a1dcf32477a4b8
+https://github.com/JuliaMath/openlibm/pull/308
+shipped in openlibm 0.8.4
+From: Li Bohai <lbhlbhlbh2002@icloud.com>
+Date: Sat, 9 Nov 2024 21:40:26 +0800
+Subject: [PATCH] Fix fenv_t initializer (#308)
+
+--- a/loongarch64/fenv.c
++++ b/loongarch64/fenv.c
+@@ -1,5 +1,5 @@
+ #define	__fenv_static
+-#include <fenv.h>
++#include <openlibm_fenv.h>
+ 
+ #ifdef __GNUC_GNU_INLINE__
+ #error "This file must be compiled with C99 'inline' semantics"
+--- a/riscv64/fenv.c
++++ b/riscv64/fenv.c
+@@ -27,7 +27,7 @@
+  */
+ 
+ #define	__fenv_static
+-#include "fenv.h"
++#include <openlibm_fenv.h>
+ 
+ #ifdef __GNUC_GNU_INLINE__
+ #error "This file must be compiled with C99 'inline' semantics"
diff --git a/sci-libs/openlibm/openlibm-0.8.3.ebuild b/sci-libs/openlibm/openlibm-0.8.3.ebuild
index 1b03b5cf145c..c7e00790e40a 100644
--- a/sci-libs/openlibm/openlibm-0.8.3.ebuild
+++ b/sci-libs/openlibm/openlibm-0.8.3.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,10 +13,11 @@ IUSE="static-libs"
 LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+"
 # See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm
 SLOT="0/4"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-stack-protection.patch
+	"${FILESDIR}"/${P}-fix-loong-riscv-fenv.patch
 )
 
 src_prepare() {
@@ -28,8 +29,11 @@ src_prepare() {
 }
 
 src_compile() {
-	# Build system uses the riscv64 arch variable
-	use riscv && export ARCH=riscv64
+	# Build system uses different ARCH for the following arches
+	case "${ARCH}" in
+		loong) export ARCH=loongarch64 ;;
+		riscv) export ARCH=riscv64 ;;
+	esac
 
 	emake \
 		CC="$(tc-getCC)" \
diff --git a/sci-libs/pcl/files/pcl-1.14.1-boost-1.87.patch b/sci-libs/pcl/files/pcl-1.14.1-boost-1.87.patch
new file mode 100644
index 000000000000..f2b1f248fcbf
--- /dev/null
+++ b/sci-libs/pcl/files/pcl-1.14.1-boost-1.87.patch
@@ -0,0 +1,171 @@
+From 6f64495840c4e5674d542ccf20df96ed12665687 Mon Sep 17 00:00:00 2001
+From: Markus Vieth <mvieth@techfak.uni-bielefeld.de>
+Date: Tue, 5 Nov 2024 20:07:13 +0100
+Subject: [PATCH 1/2] Prepare for Boost 1.87 Some stuff from Boost's asio
+ library has been removed after Boost 1.86. The documentation says that it has
+ been deprecated, but no compiler warnings are shown. This page explains what
+ is considered "old" and what should be used instead: 
+ https://www.boost.org/doc/libs/1_86_0/doc/html/boost_asio/net_ts.html -
+ io_service was simply an alias (typedef) for io_context - make_address
+ replaces from_string - resolver.resolve and connect work a bit different now,
+ see also
+ https://www.boost.org/doc/libs/1_86_0/doc/html/boost_asio/tutorial/tutdaytime1/src.html
+
+--- a/apps/src/openni_mobile_server.cpp
++++ b/apps/src/openni_mobile_server.cpp
+@@ -157,7 +157,7 @@ class PCLMobileServer {
+ 
+     viewer_.showCloud(getLatestPointCloud());
+ 
+-    boost::asio::io_service io_service;
++    boost::asio::io_context io_service;
+     tcp::endpoint endpoint(tcp::v4(), static_cast<unsigned short>(port_));
+     tcp::acceptor acceptor(io_service, endpoint);
+     tcp::socket socket(io_service);
+--- a/apps/src/openni_octree_compression.cpp
++++ b/apps/src/openni_octree_compression.cpp
+@@ -415,7 +415,7 @@ main(int argc, char** argv)
+     if (bEnDecode) {
+       // ENCODING
+       try {
+-        boost::asio::io_service io_service;
++        boost::asio::io_context io_service;
+         tcp::endpoint endpoint(tcp::v4(), 6666);
+         tcp::acceptor acceptor(io_service, endpoint);
+ 
+@@ -423,7 +423,7 @@ main(int argc, char** argv)
+ 
+         std::cout << "Waiting for connection.." << std::endl;
+ 
+-        acceptor.accept(*socketStream.rdbuf());
++        acceptor.accept(socketStream.rdbuf()->socket());
+ 
+         std::cout << "Connected!" << std::endl;
+ 
+--- a/apps/src/openni_organized_compression.cpp
++++ b/apps/src/openni_organized_compression.cpp
+@@ -438,7 +438,7 @@ main(int argc, char** argv)
+     if (bEnDecode) {
+       // ENCODING
+       try {
+-        boost::asio::io_service io_service;
++        boost::asio::io_context io_service;
+         tcp::endpoint endpoint(tcp::v4(), 6666);
+         tcp::acceptor acceptor(io_service, endpoint);
+ 
+@@ -446,7 +446,7 @@ main(int argc, char** argv)
+ 
+         std::cout << "Waiting for connection.." << std::endl;
+ 
+-        acceptor.accept(*socketStream.rdbuf());
++        acceptor.accept(socketStream.rdbuf()->socket());
+ 
+         std::cout << "Connected!" << std::endl;
+ 
+--- a/io/include/pcl/io/hdl_grabber.h
++++ b/io/include/pcl/io/hdl_grabber.h
+@@ -274,7 +274,7 @@ namespace pcl
+       boost::asio::ip::udp::endpoint udp_listener_endpoint_;
+       boost::asio::ip::address source_address_filter_;
+       std::uint16_t source_port_filter_;
+-      boost::asio::io_service hdl_read_socket_service_;
++      boost::asio::io_context hdl_read_socket_service_;
+       boost::asio::ip::udp::socket *hdl_read_socket_;
+       std::string pcap_file_name_;
+       std::thread *queue_consumer_thread_;
+--- a/io/include/pcl/io/robot_eye_grabber.h
++++ b/io/include/pcl/io/robot_eye_grabber.h
+@@ -131,7 +131,7 @@ namespace pcl
+ 
+       boost::asio::ip::address sensor_address_;
+       boost::asio::ip::udp::endpoint sender_endpoint_;
+-      boost::asio::io_service io_service_;
++      boost::asio::io_context io_service_;
+       std::shared_ptr<boost::asio::ip::udp::socket> socket_;
+       std::shared_ptr<std::thread> socket_thread_;
+       std::shared_ptr<std::thread> consumer_thread_;
+--- a/io/include/pcl/io/tim_grabber.h
++++ b/io/include/pcl/io/tim_grabber.h
+@@ -128,7 +128,7 @@ class PCL_EXPORTS TimGrabber : public Grabber
+     std::vector<float> distances_;
+ 
+     boost::asio::ip::tcp::endpoint tcp_endpoint_;
+-    boost::asio::io_service tim_io_service_;
++    boost::asio::io_context tim_io_service_;
+     boost::asio::ip::tcp::socket tim_socket_;
+     //// wait time for receiving data (on the order of milliseconds)
+     unsigned int wait_time_milliseconds_ = 0;
+--- a/io/src/hdl_grabber.cpp
++++ b/io/src/hdl_grabber.cpp
+@@ -287,7 +287,7 @@ pcl::HDLGrabber::loadHDL32Corrections ()
+ boost::asio::ip::address
+ pcl::HDLGrabber::getDefaultNetworkAddress ()
+ {
+-  return (boost::asio::ip::address::from_string ("192.168.3.255"));
++  return (boost::asio::ip::make_address ("192.168.3.255"));
+ }
+ 
+ /////////////////////////////////////////////////////////////////////////////
+--- a/io/src/robot_eye_grabber.cpp
++++ b/io/src/robot_eye_grabber.cpp
+@@ -269,7 +269,7 @@ void
+ pcl::RobotEyeGrabber::socketThreadLoop ()
+ {
+   asyncSocketReceive();
+-  io_service_.reset();
++  io_service_.restart();
+   io_service_.run();
+ }
+ 
+--- a/io/src/tim_grabber.cpp
++++ b/io/src/tim_grabber.cpp
+@@ -184,8 +184,8 @@ pcl::TimGrabber::start ()
+ 
+   try {
+     boost::asio::ip::tcp::resolver resolver (tim_io_service_);
+-    tcp_endpoint_ = *resolver.resolve (tcp_endpoint_);
+-    tim_socket_.connect (tcp_endpoint_);
++    boost::asio::ip::tcp::resolver::results_type endpoints = resolver.resolve (tcp_endpoint_);
++    boost::asio::connect(tim_socket_, endpoints);
+   }
+   catch (std::exception& e)
+   {
+--- a/io/src/vlp_grabber.cpp
++++ b/io/src/vlp_grabber.cpp
+@@ -92,7 +92,7 @@ pcl::VLPGrabber::loadVLP16Corrections ()
+ boost::asio::ip::address
+ pcl::VLPGrabber::getDefaultNetworkAddress ()
+ {
+-  return (boost::asio::ip::address::from_string ("255.255.255.255"));
++  return (boost::asio::ip::make_address ("255.255.255.255"));
+ }
+ 
+ /////////////////////////////////////////////////////////////////////////////
+
+From 25be27e20a017f0ea0a0884b9fe31a50b5cbb82d Mon Sep 17 00:00:00 2001
+From: Markus Vieth <mvieth@techfak.uni-bielefeld.de>
+Date: Thu, 7 Nov 2024 20:43:15 +0100
+Subject: [PATCH 2/2] =?UTF-8?q?Silence=20ABI=20warnings=20with=20GCC=2014?=
+ =?UTF-8?q?=20With=20the=20previous=20flag,=20GCC=2014=20displays=20many?=
+ =?UTF-8?q?=20warnings=20like=20"warning:=20the=20mangled=20name=20of=20..?=
+ =?UTF-8?q?.=20changed=20between=20=E2=80=98-fabi-version=3D17=E2=80=99=20?=
+ =?UTF-8?q?and=20=E2=80=98-fabi-version=3D19=E2=80=99=20[-Wabi]"=20I=20thi?=
+ =?UTF-8?q?nk=20these=20warnings=20are=20not=20useful=20for=20us.=20Since?=
+ =?UTF-8?q?=20PCL=201.15.0=20will=20not=20be=20ABI-compatible=20to=20PCL?=
+ =?UTF-8?q?=201.14.1=20anyway,=20these=20name=20changes=20do=20not=20matte?=
+ =?UTF-8?q?r=20AFAIK.?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -117,7 +117,7 @@ endif()
+ if(CMAKE_COMPILER_IS_GNUCXX)
+   if("${CMAKE_CXX_FLAGS}" STREQUAL "${CMAKE_CXX_FLAGS_DEFAULT}")
+     if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7)
+-      string(APPEND CMAKE_CXX_FLAGS " -Wabi=11")
++      string(APPEND CMAKE_CXX_FLAGS " -Wabi=18")
+     else()
+       string(APPEND CMAKE_CXX_FLAGS " -Wabi")
+     endif()
diff --git a/sci-libs/pcl/files/pcl-1.14.1-boost.patch b/sci-libs/pcl/files/pcl-1.14.1-boost.patch
index 8f99023f741a..0c56c3b18b9a 100644
--- a/sci-libs/pcl/files/pcl-1.14.1-boost.patch
+++ b/sci-libs/pcl/files/pcl-1.14.1-boost.patch
@@ -6,12 +6,6 @@ Subject: [PATCH] Fix boost hash data type (#6053)
 * Fix boost hash data type
 
 * Change file name generation.
----
- visualization/src/pcl_visualizer.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/visualization/src/pcl_visualizer.cpp b/visualization/src/pcl_visualizer.cpp
-index 5f073646ac1..bc9b959c246 100644
 --- a/visualization/src/pcl_visualizer.cpp
 +++ b/visualization/src/pcl_visualizer.cpp
 @@ -4591,10 +4591,12 @@ pcl::visualization::PCLVisualizer::getUniqueCameraFile (int argc, char **argv)
diff --git a/sci-libs/pcl/pcl-1.14.1-r1.ebuild b/sci-libs/pcl/pcl-1.14.1-r1.ebuild
deleted file mode 100644
index 42b8092fcda8..000000000000
--- a/sci-libs/pcl/pcl-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake cuda
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
-else
-	SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${P}"
-	KEYWORDS="amd64 ~arm"
-fi
-
-DESCRIPTION="2D/3D image and point cloud processing"
-HOMEPAGE="https://pointclouds.org/"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt6 usb vtk cpu_flags_x86_sse test tutorials"
-
-REQUIRED_USE="
-	openni? ( usb )
-	openni2? ( usb )
-	tutorials? ( doc )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-cpp/eigen:3
-	>=sci-libs/flann-1.7.1
-	opengl? (
-		media-libs/freeglut
-		virtual/opengl
-	)
-	openni? ( dev-libs/OpenNI )
-	openni2? ( dev-libs/OpenNI2 )
-	pcap? ( net-libs/libpcap )
-	png? ( media-libs/libpng:0= )
-	qhull? ( media-libs/qhull:= )
-	qt6? (
-		dev-qt/qtbase:6[concurrent,gui,opengl]
-		vtk? ( sci-libs/vtk[-qt5(-),qt6] )
-	)
-	usb? ( virtual/libusb:1 )
-	vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-"
-DEPEND="${RDEPEND}
-	!!dev-cpp/metslib
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	doc? (
-		app-text/doxygen[dot]
-		virtual/latex-base
-	)
-	tutorials? (
-		dev-python/sphinx
-		dev-python/sphinx-rtd-theme
-		dev-python/sphinxcontrib-doxylink
-	)
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch
-	"${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch
-	"${FILESDIR}"/${PN}-1.14.1-gcc15.patch
-	"${FILESDIR}"/${PN}-1.14.1-tests.patch
-	"${FILESDIR}"/${PN}-1.14.1-boost.patch
-)
-
-src_prepare() {
-	if use cuda; then
-		cuda_src_prepare
-		cuda_add_sandbox -w
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DDOC_INSTALL_DIR=share/doc/${PF}"
-		"-DLIB_INSTALL_DIR=$(get_libdir)"
-		"-DPCLCONFIG_INSTALL_DIR=share/cmake/${PN}-$(ver_cut 1-2)"
-		"-DWITH_CUDA=$(usex cuda TRUE FALSE)"
-		"-DWITH_LIBUSB=$(usex usb TRUE FALSE)"
-		"-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
-		"-DWITH_PNG=$(usex png TRUE FALSE)"
-		"-DWITH_QHULL=$(usex qhull TRUE FALSE)"
-		"-DWITH_VTK=$(usex vtk TRUE FALSE)"
-		"-DWITH_PCAP=$(usex pcap TRUE FALSE)"
-		"-DWITH_OPENNI=$(usex openni TRUE FALSE)"
-		"-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)"
-		"-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
-		"-DWITH_DOCS=$(usex doc TRUE FALSE)"
-		"-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
-		-DBUILD_global_tests="$(usex test)"
-	)
-
-	if use qt6; then
-		mycmakeargs+=( "-DWITH_QT=QT6" )
-	else
-		mycmakeargs+=( "-DWITH_QT=NO" )
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	BUILD_DIR="${BUILD_DIR}/test" cmake_src_test
-}
diff --git a/sci-libs/pcl/pcl-1.14.1-r2.ebuild b/sci-libs/pcl/pcl-1.14.1-r2.ebuild
new file mode 100644
index 000000000000..217d87752bc7
--- /dev/null
+++ b/sci-libs/pcl/pcl-1.14.1-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake cuda
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
+else
+	SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${P}"
+	KEYWORDS="amd64 ~arm"
+fi
+
+DESCRIPTION="2D/3D image and point cloud processing"
+HOMEPAGE="https://pointclouds.org/"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="cuda doc opengl openni openni2 pcap png +qhull qt6 usb vtk cpu_flags_x86_sse test tutorials"
+
+REQUIRED_USE="
+	openni? ( usb )
+	openni2? ( usb )
+	tutorials? ( doc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-cpp/eigen:3
+	>=sci-libs/flann-1.7.1
+	opengl? (
+		media-libs/freeglut
+		virtual/opengl
+	)
+	openni? ( dev-libs/OpenNI )
+	openni2? ( dev-libs/OpenNI2 )
+	pcap? ( net-libs/libpcap )
+	png? ( media-libs/libpng:0= )
+	qhull? ( media-libs/qhull:= )
+	qt6? (
+		dev-qt/qtbase:6[concurrent,gui,opengl]
+		vtk? ( sci-libs/vtk[-qt5(-),qt6] )
+	)
+	usb? ( virtual/libusb:1 )
+	vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
+"
+DEPEND="${RDEPEND}
+	!!dev-cpp/metslib
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	doc? (
+		app-text/doxygen[dot]
+		virtual/latex-base
+	)
+	tutorials? (
+		dev-python/sphinx
+		dev-python/sphinx-rtd-theme
+		dev-python/sphinxcontrib-doxylink
+	)
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch
+	"${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch
+	"${FILESDIR}"/${PN}-1.14.1-gcc15.patch
+	"${FILESDIR}"/${PN}-1.14.1-tests.patch
+	"${FILESDIR}"/${PN}-1.14.1-boost.patch
+	"${FILESDIR}"/${PN}-1.14.1-boost-1.87.patch
+)
+
+src_prepare() {
+	if use cuda; then
+		cuda_src_prepare
+		cuda_add_sandbox -w
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DDOC_INSTALL_DIR=share/doc/${PF}"
+		"-DLIB_INSTALL_DIR=$(get_libdir)"
+		"-DPCLCONFIG_INSTALL_DIR=share/cmake/${PN}-$(ver_cut 1-2)"
+		"-DWITH_CUDA=$(usex cuda TRUE FALSE)"
+		"-DWITH_LIBUSB=$(usex usb TRUE FALSE)"
+		"-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
+		"-DWITH_PNG=$(usex png TRUE FALSE)"
+		"-DWITH_QHULL=$(usex qhull TRUE FALSE)"
+		"-DWITH_VTK=$(usex vtk TRUE FALSE)"
+		"-DWITH_PCAP=$(usex pcap TRUE FALSE)"
+		"-DWITH_OPENNI=$(usex openni TRUE FALSE)"
+		"-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)"
+		"-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
+		"-DWITH_DOCS=$(usex doc TRUE FALSE)"
+		"-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
+		-DBUILD_global_tests="$(usex test)"
+	)
+
+	if use qt6; then
+		mycmakeargs+=( "-DWITH_QT=QT6" )
+	else
+		mycmakeargs+=( "-DWITH_QT=NO" )
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	BUILD_DIR="${BUILD_DIR}/test" cmake_src_test
+}
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 59bcfe52de4a..74f8d7c5e629 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,6 +1,2 @@
-DIST proj-9.2.1.tar.gz 5536575 BLAKE2B e08dc370cfac2c6358e1b28e44f3893c75e07fd64a4235041edf836885d31af33605673486edb122cec8aa13a2c564156c429a68e5045de52d8ea970d2e440f1 SHA512 5640e9bd4ea24a0e0b1521c90b8f709b64b9ee357190aaf08af0cff5df68ae93bdfb27211bde5c50340b067fc218b4f2aa8fb998ed2852ebeb2c2ad0ac4629ef
-DIST proj-9.3.0.tar.gz 5559825 BLAKE2B 83916294411a35094a2dbc89b1f219eff9b9baa4df6322a51a1965979044a36b4f1b75a99ea96fed8f59937ac000337a3e2e8ad4d9e1ef2ae929ccb7e06654b0 SHA512 1a79a7eaab0859cf615141723b68d6dd7b88390c3e590df12ec0d4c58ba69574863e5892d8108818dbc7e8abbf0b6372496228c02411d506b7169f732ff5cd57
 DIST proj-9.4.1.tar.gz 5665272 BLAKE2B 9751ca658e77650236e5d8888d4d3a5e3da4c5761494d1a544baa565bd0aea967c08d871d7b67de0b0f7ffb07fc16212edbbd3a91532c70677e1702e050a7f7e SHA512 e9e4a80125a9481709fa7a16c8ceed7c5480c1d9152fe0c16ff69cd976081b9f41e23783459ee2a50771ec7f6210f46167de5af9ee943ff274bd27a1de4b6305
-DIST proj-data-1.13.tar.gz 709788173 BLAKE2B 33a487f327d2b35acfd6c7c12286bcd6e338c3459540482f968ef7038d78cea9d1519d89ba979f493e007fa961e0eb955889bf2348a235705ec3b71abf1e31c1 SHA512 14eca1b47dad913de608babc73708a35da8bb614c5374e990564a32549998a16e90d4c548f2dac0cd555fc8a4a645eeaf649db929cc38906bee1050e378a662e
-DIST proj-data-1.15.tar.gz 727387470 BLAKE2B 03d5b69214e23741ae214ff18f523542247fdca5c301891616be6b79c8a916bf762d0a7ee3983cee62236bc0d4d1b5fc93151164b134db220d4582b15a84e8d7 SHA512 4007c639d5c9f0422652315e8d69527eb39e3d045cef3537361e16c61c9aae76d69e3eb7efefead04793350b8502114eec740efe970f25fbbee2db449b2e3694
 DIST proj-data-1.18.tar.gz 735652646 BLAKE2B 62ca77e6f0a58992a914ebc6a7558b5ddb4529a5bf20a96eedbc62ef7c1bcc5c05582663846e43e132a1b8eaf821bbbc0be792335bad03028db085422d3ed269 SHA512 805eadd29665697398f568f5e4f45df8eadea6fc2841ce901c703613fab13f6f064e6f187621e76017b9b67bb1ca0c6dc1dd2be9848c5169d7e6ebaa2aeea950
diff --git a/sci-libs/proj/files/proj-geotiff.patch b/sci-libs/proj/files/proj-geotiff.patch
deleted file mode 100644
index cef1faa4628f..000000000000
--- a/sci-libs/proj/files/proj-geotiff.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/917393
-https://github.com/OSGeo/PROJ/pull/3970
-
-From afccfb609db16524b602216d9dc2b55c154403bb Mon Sep 17 00:00:00 2001
-From: Marco Genasci <fedeliallalinea@gmail.com>
-Date: Sun, 26 Nov 2023 08:40:45 +0100
-Subject: [PATCH] Database: added ability to install *.tif if present in data
-
----
- data/CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index 4cb89e7849..85ed6ba8d4 100644
---- a/data/CMakeLists.txt
-+++ b/data/CMakeLists.txt
-@@ -38,6 +38,8 @@ set(GRIDSHIFT_FILES ${GSB_FILES} ${GTX_FILES})
- 
- file(GLOB SCHEMA_FILES *.json)
- 
-+file(GLOB GEOTIFF_FILES *.tif)
-+
- set(ALL_SQL_IN "${CMAKE_CURRENT_BINARY_DIR}/all.sql.in")
- set(PROJ_DB "${CMAKE_CURRENT_BINARY_DIR}/proj.db")
- include(sql_filelist.cmake)
-@@ -107,6 +109,7 @@ set(ALL_DATA_FILE
-   ${GRIDSHIFT_FILES}
-   ${PROJ_DB}
-   ${SCHEMA_FILES}
-+  ${GEOTIFF_FILES}
- )
- install(
-   FILES ${ALL_DATA_FILE}
diff --git a/sci-libs/proj/proj-9.2.1-r1.ebuild b/sci-libs/proj/proj-9.2.1-r1.ebuild
deleted file mode 100644
index 3dacbba20c97..000000000000
--- a/sci-libs/proj/proj-9.2.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-# Check https://proj.org/download.html for latest data tarball
-PROJ_DATA="proj-data-1.13.tar.gz"
-DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj.org/"
-SRC_URI="
-	https://download.osgeo.org/proj/${P}.tar.gz
-	https://download.osgeo.org/proj/${PROJ_DATA}
-"
-
-LICENSE="MIT"
-# Changes on every major release
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="curl test +tiff"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	curl? ( net-misc/curl )
-	tiff? ( media-libs/tiff:= )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-geotiff.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd "${S}"/data || die
-	mv README README.DATA || die
-
-	unpack ${PROJ_DATA}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DBUILD_PROJSYNC=$(usex curl)
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_TIFF=$(usex tiff)
-	)
-
-	if use test ; then
-		mycmakeargs+=(
-			-DUSE_EXTERNAL_GTEST=ON
-			-DBUILD_BENCHMARKS=OFF
-			-DRUN_NETWORK_DEPENDENT_TESTS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# proj_test_cpp_api: https://lists.osgeo.org/pipermail/proj/2019-September/008836.html
-		# testprojinfo: Also related to map data?
-		-E "(proj_test_cpp_api|testprojinfo)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	cd data || die
-	dodoc README.DATA
-
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/sci-libs/proj/proj-9.3.0-r1.ebuild b/sci-libs/proj/proj-9.3.0-r1.ebuild
deleted file mode 100644
index 4e9fde52d322..000000000000
--- a/sci-libs/proj/proj-9.3.0-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-# Check https://proj.org/download.html for latest data tarball
-PROJ_DATA="proj-data-1.15.tar.gz"
-DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj.org/"
-SRC_URI="
-	https://download.osgeo.org/proj/${P}.tar.gz
-	https://download.osgeo.org/proj/${PROJ_DATA}
-"
-
-LICENSE="MIT"
-# Changes on every major release
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="curl test +tiff"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	curl? ( net-misc/curl )
-	tiff? ( media-libs/tiff:= )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-geotiff.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd "${S}"/data || die
-	mv README README.DATA || die
-
-	unpack ${PROJ_DATA}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DBUILD_PROJSYNC=$(usex curl)
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_TIFF=$(usex tiff)
-	)
-
-	if use test ; then
-		mycmakeargs+=(
-			-DUSE_EXTERNAL_GTEST=ON
-			-DBUILD_BENCHMARKS=OFF
-			-DRUN_NETWORK_DEPENDENT_TESTS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# proj_test_cpp_api: https://lists.osgeo.org/pipermail/proj/2019-September/008836.html
-		# testprojinfo: Also related to map data?
-		-E "(proj_test_cpp_api|testprojinfo)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	cd data || die
-	dodoc README.DATA
-
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/sci-libs/qd/Manifest b/sci-libs/qd/Manifest
index 77c890f33400..d760f8a0a05a 100644
--- a/sci-libs/qd/Manifest
+++ b/sci-libs/qd/Manifest
@@ -1,2 +1 @@
-DIST qd-2.3.23.tar.gz 781558 BLAKE2B bbda1ede1e93c100ca831b3eddc34ad6092007f9674c83803e5a5e140f80cc6b4b41fa71857beb9ef255d77265470537e43ef81886d6a013958a429b1c641c55 SHA512 ab311883db7708cee1c307eead5d02dac3b9809389b8d29e2fda5207decb752ca360a9aab234dd8a70228e0e004a6b6d6cdf92fd098536e96a2fa01c5b2ced2c
 DIST qd-2.3.24.tar.gz 812215 BLAKE2B f9520066d8004befc3c17dc9a79dc8f099e39c3eeb676c8909f2914fa2f7d8e4f52e7e906c928d6fecdf018cdf97ac465fa9aa3f9c57b02279d1cbb8b3952246 SHA512 7f233e9d0edcb442da160a49bc97df87acf258c3251828e2d473206022a36581295f38c685ac5f0c78b106605f12698f3d0cc0b4865be220a50b3536820ac1b7
diff --git a/sci-libs/qd/qd-2.3.23.ebuild b/sci-libs/qd/qd-2.3.23.ebuild
deleted file mode 100644
index 2f8569afa28c..000000000000
--- a/sci-libs/qd/qd-2.3.23.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2
-
-DESCRIPTION="Quad-double and double-double float arithmetics"
-HOMEPAGE="https://www.davidhbailey.com/dhbsoftware/"
-SRC_URI="https://www.davidhbailey.com/dhbsoftware/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran"
-
-src_configure() {
-	econf \
-		--disable-static \
-		--enable-ieee-add \
-		--disable-sloppy-mul \
-		--disable-sloppy-div \
-		--enable-inline \
-		$(use_enable cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4) fma) \
-		$(use_enable fortran)
-}
-
-src_install() {
-	default
-
-	dosym qd_real.h /usr/include/qd/qd.h
-	dosym dd_real.h /usr/include/qd/dd.h
-
-	if ! use doc; then
-		rm "${ED}"/usr/share/doc/${PF}/*.pdf || die
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest
index ca306e9c9efb..466aa900e4c0 100644
--- a/sci-libs/rocBLAS/Manifest
+++ b/sci-libs/rocBLAS/Manifest
@@ -4,3 +4,4 @@ DIST rocm-rocBLAS-5.1.3.tar.gz 13741546 BLAKE2B af10d8cb69bee44ef5aab2dc350e1d9f
 DIST rocm-rocBLAS-5.4.2.tar.gz 15938434 BLAKE2B 14ebafa944fdac443800bb7f9b16f8ecf0f420b168d3c6534f68ad7d14bf058a4cc1673fce8f4b9be53e4a6c1cf05011e01853cd901bce0b59827d2aca4d029f SHA512 e62bb80457c1e89454885499bdce9d60beecd706806724418983c78c65c2ae303550f9670b5a6e71dae6a61c0e42b223ab01b36b8406430731ebcbff54c4a8f4
 DIST rocm-rocBLAS-5.7.1.tar.gz 55389700 BLAKE2B 9e58b1d29c8a04aa58ce17fdd9b0c2504934261851619dc5b696a04e8c6a79e7c44d86a6db7a9c76a434d76593de8c191cba6f163cf398d01cfc001e5fa32b5a SHA512 cfc73f6c490595a3c153c2ac2a3cb5926c48c2c19baa07ff3dcdf3a7ccaed82cfdff64ed5a3be64c349cb43d654d4b104d9090e2ec9f2061049d6a4921c07722
 DIST rocm-rocBLAS-6.1.1.tar.gz 100103895 BLAKE2B df89a21e47730714b80c62717a86d65ac0d819c2d33b2a3c6252b60b8d7cc9eb5f8f1db27159b0a8dfc87aba7ccad97e2f832bc0044e92d0b69c526d382c745a SHA512 74e847c4ddee16cae7f41e268a815ea03875519c365abe7dfce313a9545df245baa73301b432f64a36cc988281fec7530629a0d72583e9ea287c98ec8a0b3907
+DIST rocm-rocBLAS-6.3.0.tar.gz 57907324 BLAKE2B a3cce68e0cc06e8df56e1622889254c75744b0f85c9fe66cb94bbc158f7ce45e40a5798d30e6a10430092490c1e347f19f38b36db767ccb784c5757581b0bccb SHA512 45a524d680f1f0760fd37d49b9bd7c6257731ad5d840d832a8e40c121f7f1045a8d5b57ca8ef0943fdf333c55bccb341b529d2ca24664694203b906e510ecab5
diff --git a/sci-libs/rocBLAS/files/rocBLAS-6.3.0-find-cblas.patch b/sci-libs/rocBLAS/files/rocBLAS-6.3.0-find-cblas.patch
new file mode 100644
index 000000000000..4afb07789581
--- /dev/null
+++ b/sci-libs/rocBLAS/files/rocBLAS-6.3.0-find-cblas.patch
@@ -0,0 +1,19 @@
+diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt
+index 4485fee..51eedc9 100644
+--- a/clients/CMakeLists.txt
++++ b/clients/CMakeLists.txt
+@@ -140,10 +140,12 @@ if( BUILD_CLIENTS_BENCHMARKS OR BUILD_CLIENTS_TESTS)
+         set( BLAS_LIBRARY /usr/local/lib/libblis.a )
+         set( BLIS_INCLUDE_DIR /usr/local/include/blis )
+       else()
+-        message( WARNING "Could not find libblis" )
++        message( FATAL_ERROR "Could not find libblis" )
+       endif()
+     else()
+-      set( BLAS_LIBRARY "blas -lcblas" )
++      find_package( CBLAS CONFIG REQUIRED )
++      set( BLAS_LIBRARY ${CBLAS_LIBRARIES} )
++      set( BLAS_INCLUDE_DIR ${CBLAS_INCLUDE_DIRS} )
+     endif()
+   else() # WIN32
+     file(TO_CMAKE_PATH "C:/Program\ Files/AMD/AOCL-Windows/amd-blis/lib/ILP64/AOCL-LibBlis-Win-MT.lib" AOCL_BLAS_LIBRARY)
diff --git a/sci-libs/rocBLAS/files/rocBLAS-6.3.0-no-git.patch b/sci-libs/rocBLAS/files/rocBLAS-6.3.0-no-git.patch
new file mode 100644
index 000000000000..39ce71a85eb1
--- /dev/null
+++ b/sci-libs/rocBLAS/files/rocBLAS-6.3.0-no-git.patch
@@ -0,0 +1,22 @@
+Git should not be a required dependency, as hash is not available for releases.
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -144,17 +144,8 @@ if( BUILD_VERBOSE )
+   message( STATUS "\t==>CMAKE_SHARED_LINKER_FLAGS_RELEASE: ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}" )
+ endif( )
+ 
+-find_package(Git REQUIRED)
+-
+-# Get the git hash of the rocBLAS branch
+-execute_process(
+-          COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD
+-          WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+-          OUTPUT_VARIABLE GIT_HASH_ROCBLAS
+-          OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+ #set the rocBLAS commit hash
+-set(rocblas_VERSION_COMMIT_ID "${GIT_HASH_ROCBLAS}")
++set(rocblas_VERSION_COMMIT_ID "")
+ 
+ #set the Tensile commit hash
+ set(tensile_VERSION_COMMIT_ID "${tensile_tag}")
diff --git a/sci-libs/rocBLAS/metadata.xml b/sci-libs/rocBLAS/metadata.xml
index 0e8f76b2a76e..bd9344786002 100644
--- a/sci-libs/rocBLAS/metadata.xml
+++ b/sci-libs/rocBLAS/metadata.xml
@@ -19,8 +19,9 @@
   <use>
     <flag name="test">Perform rocblas-test to compare the result between rocBLAS and system BLAS.</flag>
     <flag name="benchmark">Build and install rocblas-bench.</flag>
+    <flag name="hipblaslt">Build with hipBLASLt for some non-batched and strided batched problems on gfx12.</flag>
   </use>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/rocBLAS</remote-id>
+    <remote-id type="github">ROCm/rocBLAS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/rocBLAS/rocBLAS-6.1.1-r1.ebuild b/sci-libs/rocBLAS/rocBLAS-6.1.1-r1.ebuild
index b101aed6dee7..9f2bb6782d44 100644
--- a/sci-libs/rocBLAS/rocBLAS-6.1.1-r1.ebuild
+++ b/sci-libs/rocBLAS/rocBLAS-6.1.1-r1.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,7 +33,7 @@ BDEPEND="
 
 DEPEND="
 	>=dev-cpp/msgpack-cxx-6.0.0
-	=dev-util/hip-6*
+	dev-util/hip:${SLOT}
 	test? (
 		virtual/blas
 		dev-cpp/gtest
@@ -57,6 +57,10 @@ PATCHES=(
 src_prepare() {
 	cmake_src_prepare
 	sed -e "s:,-rpath=.*\":\":" -i clients/CMakeLists.txt || die
+
+	# bug 944820: f16c instuctions cause SIGILL on pre-AVX512 CPUs
+	sed -i -e "s/-mf16c //" clients/benchmarks/CMakeLists.txt \
+		clients/gtest/CMakeLists.txt clients/samples/CMakeLists.txt library/CMakeLists.txt || die
 }
 
 src_configure() {
diff --git a/sci-libs/rocBLAS/rocBLAS-6.3.0.ebuild b/sci-libs/rocBLAS/rocBLAS-6.3.0.ebuild
new file mode 100644
index 000000000000..f35ee735d2fb
--- /dev/null
+++ b/sci-libs/rocBLAS/rocBLAS-6.3.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="docs/.doxygen"
+DOCS_DEPEND="media-gfx/graphviz"
+LLVM_COMPAT=( 19 )
+ROCM_VERSION=${PV}
+
+inherit cmake docs edo flag-o-matic multiprocessing rocm llvm-r1
+
+DESCRIPTION="AMD's library for BLAS on ROCm"
+HOMEPAGE="https://github.com/ROCm/rocBLAS"
+SRC_URI="https://github.com/ROCm/rocBLAS/archive/rocm-${PV}.tar.gz -> rocm-${P}.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark hipblaslt test video_cards_amdgpu"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+BDEPEND="
+	>=dev-build/rocm-cmake-5.3
+	video_cards_amdgpu? (
+		dev-util/Tensile:${SLOT}
+	)
+	hipblaslt? ( sci-libs/hipBLASLt:${SLOT} )
+	test? ( dev-cpp/gtest )
+"
+
+DEPEND="
+	>=dev-cpp/msgpack-cxx-6.0.0
+	dev-util/hip:${SLOT}
+	test? (
+		virtual/blas
+		dev-cpp/gtest
+		llvm-runtimes/openmp
+	)
+	benchmark? (
+		virtual/blas
+		llvm-runtimes/openmp
+	)
+"
+
+QA_FLAGS_IGNORED="/usr/lib64/rocblas/library/.*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.2-add-missing-header.patch
+	"${FILESDIR}"/${PN}-5.4.2-link-cblas.patch
+	"${FILESDIR}"/${PN}-6.0.2-expand-isa-compatibility.patch
+	"${FILESDIR}"/${PN}-6.3.0-no-git.patch
+	"${FILESDIR}"/${PN}-6.3.0-find-cblas.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "s:,-rpath=.*\":\":" -i clients/CMakeLists.txt || die
+}
+
+src_configure() {
+	rocm_use_hipcc
+
+	# too many warnings
+	append-cxxflags -Wno-explicit-specialization-storage-class
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_WITH_TENSILE="$(usex video_cards_amdgpu)"
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocblas"
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DBUILD_CLIENTS_TESTS="$(usex test ON OFF)"
+		-DBUILD_CLIENTS_BENCHMARKS="$(usex benchmark ON OFF)"
+		-DBUILD_WITH_PIP=OFF
+		-DBUILD_WITH_HIPBLASLT="$(usex hipblaslt ON OFF)"
+		-DLINK_BLIS=OFF
+		-Wno-dev
+	)
+
+	if usex video_cards_amdgpu; then
+		mycmakeargs+=(
+			-DTensile_LOGIC="asm_full"
+			-DTensile_COMPILER="hipcc"
+			-DTensile_LIBRARY_FORMAT="msgpack"
+			-DTensile_CODE_OBJECT_VERSION="default"
+			-DTensile_ROOT="${EPREFIX}/usr/share/Tensile"
+			-DTensile_CPU_THREADS="$(makeopts_jobs)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	docs_compile
+	cmake_src_compile
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}"/clients/staging || die
+	export ROCBLAS_TEST_TIMEOUT=3600 ROCBLAS_TENSILE_LIBPATH="${BUILD_DIR}/Tensile/library"
+	export LD_LIBRARY_PATH="${BUILD_DIR}/clients:${BUILD_DIR}/library/src"
+
+	# `--gtest_filter=*quick*:*pre_checkin*-*known_bug*` is >1h on 7900XTX
+	edob ./rocblas-test --yaml rocblas_smoke.yaml
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}" || die
+		dolib.a clients/librocblas_fortran_client.a
+		dobin clients/staging/rocblas-bench
+	fi
+
+	# Stop llvm-strip from removing .strtab section from *.hsaco files,
+	# otherwise rocclr/elf/elf.cpp complains with "failed: null sections(STRTAB)" and crashes
+	dostrip -x "/usr/$(get_libdir)/rocblas/library/"
+}
diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest
index 206e1b4ad564..1596a89e31eb 100644
--- a/sci-libs/rocFFT/Manifest
+++ b/sci-libs/rocFFT/Manifest
@@ -1,3 +1,4 @@
 DIST rocFFT-5.1.3.tar.gz 845470 BLAKE2B 86060ce4f8612869fedc5bc92ed6a5bb7fbc539b26c7f5ab0ded5406ab6c340f64116782285d040824e54557af87d9ddb6f907fd1550b80c3da903d3c1d5e5c0 SHA512 175402856bd4753e74ce14326569be99221e21d0ce675e007900f6982c53e1566ad0b060eec545e0f17ff4dc4811688cc1003dc986226205ee95ee6f22d1ca43
 DIST rocFFT-5.7.1.tar.gz 1192841 BLAKE2B 58f880f7ff866f85af70666d17e8b1a3ac8e63e853520546f746d74cecd805687fd689367a09d2b1ec4e1059b44b858377dce362cd4cae91cb85aad7c3185c00 SHA512 48467589cb4bc1334a4074bacc6a726c850dc2a79ef82622301d61c4269fb81c0b2b9fce56d72bddca584d1797a8634d243a9a6b8cf943e687b2b0f5c931116f
 DIST rocFFT-6.1.1.tar.gz 1257210 BLAKE2B 01d383d32bb91a9cd1d68a3b1ef2c6d71b33a9a49389c558adca2673ce4a74aab9f0a420977d4f4d5e8b8e72f3d9bfe3a8019e137968b58984edac4f2e1a9146 SHA512 fb35b4d21b8bd598702f79707cdf19b7c30a9e62176f5f7a71b93076f904a98446dac4fa8bffcd7ba20ecb797aec727e730c8232de881a52d519c0c00a907bf9
+DIST rocFFT-6.3.0.tar.gz 1386056 BLAKE2B 1aab60818328cb3a6448f6d555faf2db3b3839e2b3abd7a37cc48054e67321e7c98c319b2f078dfd351f56263c35731608ae65fca427fc3eaaf06c8410b99d89 SHA512 4ac2dac24e77a9d767fa08a9d393cb2c94bc2a8ca32cb75ea53dd83011989bd344ae3c11c9bfc557e71c645ebea34c53a5e050ce6810259f84287e6baf829c08
diff --git a/sci-libs/rocFFT/rocFFT-6.3.0.ebuild b/sci-libs/rocFFT/rocFFT-6.3.0.ebuild
new file mode 100644
index 000000000000..c1a62e09e1a5
--- /dev/null
+++ b/sci-libs/rocFFT/rocFFT-6.3.0.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+ROCM_VERSION=${PV}
+
+inherit cmake check-reqs edo multiprocessing python-r1 rocm
+
+DESCRIPTION="Next generation FFT implementation for ROCm"
+HOMEPAGE="https://github.com/ROCm/rocFFT"
+SRC_URI="https://github.com/ROCm/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz"
+S="${WORKDIR}/rocFFT-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+# RDEPEND: perfscripts? dev-python/plotly[${PYTHON_USEDEP}] # currently masked by arch/amd64/x32/package.mask
+RDEPEND="
+perfscripts? (
+	>=media-gfx/asymptote-2.61
+	dev-texlive/texlive-latex
+	dev-tex/latexmk
+	sys-apps/texinfo
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}] )
+${PYTHON_DEPS}"
+
+DEPEND="=dev-util/hip-6*
+	${PYTHON_DEPS}
+	benchmark? (
+		dev-libs/boost
+		sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}]
+	)
+	test? (
+		dev-cpp/gtest
+		dev-libs/boost
+		>=sci-libs/fftw-3
+		llvm-runtimes/openmp
+		sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}]
+	)
+"
+
+BDEPEND="
+	>=dev-build/cmake-3.22
+	dev-build/rocm-cmake
+	dev-db/sqlite
+"
+
+CHECKREQS_DISK_BUILD="7G"
+
+IUSE="benchmark perfscripts test"
+REQUIRED_USE="perfscripts? ( benchmark ) ${PYTHON_REQUIRED_USE} ${ROCM_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch
+)
+
+required_mem() {
+	if use test; then
+		echo "52G"
+	else
+		if [[ -n "${AMDGPU_TARGETS}" ]]; then
+			# count how many archs user specified in ${AMDGPU_TARGETS}
+			local NARCH=$(($(awk -F";" '{print NF-1}' <<< "${AMDGPU_TARGETS}" || die)+1))
+		else
+			# The default number of AMDGPU_TARGETS for rocFFT-4.3.0. May change in the future.
+			local NARCH=7
+		fi
+		echo "$(($(makeopts_jobs)*${NARCH}*25+2200))M" # A linear function estimating how much memory required
+	fi
+}
+
+pkg_pretend() {
+	return # leave the disk space check to pkg_setup phase
+}
+
+pkg_setup() {
+	export CHECKREQS_MEMORY=$(required_mem)
+	check-reqs_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	if use perfscripts; then
+		pushd scripts/perf || die
+		sed -e "/\/opt\/rocm/d" -e "/rocmversion/s,rocm_info.strip(),\"${PV}\"," -i perflib/specs.py || dir
+		sed -e "/^top/,+1d" -i rocfft-perf suites.py || die
+		sed -e "s,perflib,${PN}_perflib,g" -i rocfft-perf suites.py perflib/*.py || die
+		sed -e "/^top = /s,__file__).*$,\"${EPREFIX}/usr/share/${PN}-perflib\")," \
+			-i perflib/pdf.py perflib/generators.py || die
+		popd
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	rocm_use_hipcc
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-Wno-dev
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCH=$(usex benchmark ON OFF)
+		-DSQLITE_USE_SYSTEM_PACKAGE=ON
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}/clients/staging" || die
+	export LD_LIBRARY_PATH=${BUILD_DIR}/library/src/:${BUILD_DIR}/library/src/device
+	edob ./rocfft-test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}"/clients/staging || die
+		dobin dyna-rocfft-bench rocfft-bench
+		dosym dyna-rocfft-bench /usr/bin/dyna-rocfft-rider
+		dosym rocfft-bench /usr/bin/dyna-rocfft-rider
+
+		if ! use perfscripts; then
+			# prevent collision with dev-util/perf
+			rm -rf "${ED}"/usr/bin/perf || die
+		fi
+	fi
+
+	if use perfscripts; then
+		cd "${S}"/scripts/perf || die
+		python_foreach_impl python_doexe rocfft-perf
+		python_moduleinto ${PN}_perflib
+		python_foreach_impl python_domodule perflib/*.py
+		insinto /usr/share/${PN}-perflib
+		doins *.asy suites.py
+	fi
+}
diff --git a/sci-libs/rocPRIM/Manifest b/sci-libs/rocPRIM/Manifest
index cf2bbede484f..1851042b0e4e 100644
--- a/sci-libs/rocPRIM/Manifest
+++ b/sci-libs/rocPRIM/Manifest
@@ -1,3 +1,4 @@
 DIST rocPRIM-5.1.3.tar.gz 374510 BLAKE2B ab6960e7bd2159ac7a0d72ba6d594684f8d47028eca0940eabd35b346ac3d432a734ec575ee71341f339a9d0dead10dfafe81fb651a3b7da681aa900a5132d0e SHA512 54e14f2b40795153b862a64c9b3d336f35feccfda725daad75fae356b0147c577735884b65218c26c370ebec710af0f84aeef3103067a50db077cf9e24d2b64a
 DIST rocPRIM-5.7.1.tar.gz 535649 BLAKE2B 469bf59b5c92c37df96f58bac5a6559dc2cb879e5f82e539881d79bda57d23c25a9b114466042258e87862a88cd53d260155d7785c9a69a1800b0d05e931f56d SHA512 b2f0bc07dbc5cd111dd513f6c05dbc533908c52ea99caf77d6a4dd35db2b28f98c80006bd1f50a232873eab00b70e54231c38bfd1035c8845029d53690fd5e71
 DIST rocPRIM-6.1.1.tar.gz 611372 BLAKE2B 984df214179a6d2c90b31bd30ec9472a0b985d9d488ea195968f25df4cac97ce48bfa4c322f2d578771ac63caeafc2c69c9dae911bc3a9d920ab9558ba7d6e15 SHA512 298eebc8a5d3fd7da71ab98a22fd39183436b3d9e14945e450f0fb35e38ea8fb99c5f2b342f1f77f21899a14d506ce96a965fbdb24f106ec9638dcd6afe6ae98
+DIST rocPRIM-6.3.0.tar.gz 745936 BLAKE2B 1cdcf886c823959bbb03f53cb6e17abdb009fa48f8e00e96f8d962dd28ef9fb8b6ed796be079b0a3948adc832de8e3449d6439711db821b8a26c5cdc7122ce61 SHA512 c38f3cebfb32c0c9d4f9c1ad261c1dbe793dec1ebc92cf024ef32606f99c91e178526d77a24ad18792099e6f3aafcea43f7bc9282bbc144672684cd5fe296a8b
diff --git a/sci-libs/rocPRIM/files/rocPRIM-6.3.0-expand-isa-compatibility.patch b/sci-libs/rocPRIM/files/rocPRIM-6.3.0-expand-isa-compatibility.patch
new file mode 100644
index 000000000000..8a13924c1056
--- /dev/null
+++ b/sci-libs/rocPRIM/files/rocPRIM-6.3.0-expand-isa-compatibility.patch
@@ -0,0 +1,33 @@
+diff --git a/rocprim/include/rocprim/device/config_types.hpp b/rocprim/include/rocprim/device/config_types.hpp
+index 58729b1..7e356da 100644
+--- a/rocprim/include/rocprim/device/config_types.hpp
++++ b/rocprim/include/rocprim/device/config_types.hpp
+@@ -204,16 +204,23 @@ constexpr bool prefix_equals(const char* lhs, const char* rhs, std::size_t n)
+ constexpr target_arch get_target_arch_from_name(const char* const arch_name, const std::size_t n)
+ {
+     constexpr const char* target_names[]
+-        = {"gfx803", "gfx900", "gfx906", "gfx908", "gfx90a", "gfx1030", "gfx1100", "gfx1102"};
++        = {"gfx803",
++        "gfx900", "gfx902", "gfx909", "gfx912",
++        "gfx906",
++        "gfx908",
++        "gfx90a",
++        "gfx1030", "gfx1031", "gfx1032", "gfx1033", "gfx1034", "gfx1035", "gfx1036",
++        "gfx1100", "gfx1101",
++        "gfx1102", "gfx1103", "gfx1150", "gfx1151", "gfx1152", "gfx1153"};
+     constexpr target_arch target_architectures[] = {
+         target_arch::gfx803,
+-        target_arch::gfx900,
++        target_arch::gfx900, target_arch::gfx900, target_arch::gfx900, target_arch::gfx900,
+         target_arch::gfx906,
+         target_arch::gfx908,
+         target_arch::gfx90a,
+-        target_arch::gfx1030,
+-        target_arch::gfx1100,
+-        target_arch::gfx1102,
++        target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030,
++        target_arch::gfx1100, target_arch::gfx1100,
++        target_arch::gfx1102, target_arch::gfx1102, target_arch::gfx1102, target_arch::gfx1102, target_arch::gfx1102, target_arch::gfx1102,
+     };
+     static_assert(sizeof(target_names) / sizeof(target_names[0])
+                       == sizeof(target_architectures) / sizeof(target_architectures[0]),
diff --git a/sci-libs/rocPRIM/files/rocPRIM-6.3.0-fix-clang-template.patch b/sci-libs/rocPRIM/files/rocPRIM-6.3.0-fix-clang-template.patch
new file mode 100644
index 000000000000..089ce6187979
--- /dev/null
+++ b/sci-libs/rocPRIM/files/rocPRIM-6.3.0-fix-clang-template.patch
@@ -0,0 +1,29 @@
+Fix compilation with clang-19
+Backports https://github.com/ROCm/rocPRIM/commit/c57b04baea872078bfb5b4af1165c7584fd3a95b
+--- a/rocprim/include/rocprim/device/detail/device_radix_sort.hpp
++++ b/rocprim/include/rocprim/device/detail/device_radix_sort.hpp
+@@ -526,15 +526,15 @@ ROCPRIM_DEVICE ROCPRIM_FORCE_INLINE void sort_single(KeysInputIterator    keys_i
+ 
+     ROCPRIM_SHARED_MEMORY typename sort_single_helper::storage_type storage;
+ 
+-    sort_single_helper().template sort_single(keys_input,
+-                                              keys_output,
+-                                              values_input,
+-                                              values_output,
+-                                              size,
+-                                              decomposer,
+-                                              bit,
+-                                              current_radix_bits,
+-                                              storage);
++    sort_single_helper().template sort_single<>(keys_input,
++                                                keys_output,
++                                                values_input,
++                                                values_output,
++                                                size,
++                                                decomposer,
++                                                bit,
++                                                current_radix_bits,
++                                                storage);
+ }
+ 
+ template<class T>
diff --git a/sci-libs/rocPRIM/files/rocPRIM-6.3.0-fix-libcxx.patch b/sci-libs/rocPRIM/files/rocPRIM-6.3.0-fix-libcxx.patch
new file mode 100644
index 000000000000..3827829483fb
--- /dev/null
+++ b/sci-libs/rocPRIM/files/rocPRIM-6.3.0-fix-libcxx.patch
@@ -0,0 +1,71 @@
+Fix ambiguous declarations for libc++, which treats __int128_t as integral.
+The issue was fixed in develop branch, but not in release.
+Upstream commit: https://github.com/ROCm/rocPRIM/commit/81f6073790dee8d310e5b68cf46aae4b797cc059
+--- a/rocprim/include/rocprim/thread/radix_key_codec.hpp
++++ b/rocprim/include/rocprim/thread/radix_key_codec.hpp
+@@ -78,6 +78,7 @@ struct radix_key_codec_integral<Key,
+     }
+ };
+ 
++#ifndef _LIBCPP_VERSION
+ template<class Key, class BitKey>
+ struct radix_key_codec_integral<
+     Key,
+@@ -104,6 +105,7 @@ struct radix_key_codec_integral<
+         return static_cast<unsigned int>(bit_key >> start) & mask;
+     }
+ };
++#endif
+ 
+ template<class Key, class BitKey>
+ struct radix_key_codec_integral<Key,
+@@ -135,6 +137,7 @@ struct radix_key_codec_integral<Key,
+     }
+ };
+ 
++#ifndef _LIBCPP_VERSION
+ template<class Key, class BitKey>
+ struct radix_key_codec_integral<Key,
+                                 BitKey,
+@@ -164,6 +167,7 @@ struct radix_key_codec_integral<Key,
+         return static_cast<unsigned int>(bit_key >> start) & mask;
+     }
+ };
++#endif
+ 
+ template<class Key, class BitKey>
+ struct radix_key_codec_floating
+@@ -225,6 +229,7 @@ struct radix_key_codec_base<Key, typename std::enable_if<::rocprim::is_integral<
+     : radix_key_codec_integral<Key, typename std::make_unsigned<Key>::type>
+ {};
+ 
++#ifndef _LIBCPP_VERSION
+ template<class Key>
+ struct radix_key_codec_base<Key,
+                             typename std::enable_if<std::is_same<Key, __int128_t>::value>::type>
+@@ -236,6 +241,7 @@ struct radix_key_codec_base<Key,
+                             typename std::enable_if<std::is_same<Key, __uint128_t>::value>::type>
+     : radix_key_codec_integral<Key, __uint128_t>
+ {};
++#endif
+ 
+ template<>
+ struct radix_key_codec_base<bool>
+--- a/test/rocprim/test_utils_data_generation.hpp
++++ b/test/rocprim/test_utils_data_generation.hpp
+@@ -268,6 +268,7 @@ inline OutputIter segmented_generate_n(OutputIter it, size_t size, Generator&& g
+     return it + size;
+ }
+ 
++#ifndef _LIBCPP_VERSION
+ template<class OutputIter, class U, class V, class Generator>
+ inline auto generate_random_data_n(OutputIter it, size_t size, U min, V max, Generator&& gen)
+     -> std::enable_if_t<std::is_same<it_value_t<OutputIter>, __int128_t>::value, OutputIter>
+@@ -299,6 +300,7 @@ inline auto generate_random_data_n(OutputIter it, size_t size, U min, V max, Gen
+ 
+     return segmented_generate_n(it, size, [&]() { return static_cast<T>(distribution(gen)); });
+ }
++#endif
+ 
+ template<class OutputIter, class U, class V, class Generator>
+ inline auto generate_random_data_n(OutputIter it, size_t size, U min, V max, Generator&& gen)
diff --git a/sci-libs/rocPRIM/rocPRIM-6.3.0.ebuild b/sci-libs/rocPRIM/rocPRIM-6.3.0.ebuild
new file mode 100644
index 000000000000..cd561fb6b22d
--- /dev/null
+++ b/sci-libs/rocPRIM/rocPRIM-6.3.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+inherit cmake flag-o-matic rocm
+
+DESCRIPTION="HIP parallel primitives for developing performant GPU-accelerated code on ROCm"
+HOMEPAGE="https://github.com/ROCm/rocPRIM"
+SRC_URI="https://github.com/ROCm/rocPRIM/archive/rocm-${PV}.tar.gz -> rocPRIM-${PV}.tar.gz"
+S="${WORKDIR}/rocPRIM-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+REQUIRED_USE="
+	benchmark? ( ${ROCM_REQUIRED_USE} )
+	test? ( ${ROCM_REQUIRED_USE} )
+"
+
+RDEPEND="dev-util/hip
+	benchmark? ( dev-cpp/benchmark )
+	test? ( dev-cpp/gtest )"
+BDEPEND="dev-build/rocm-cmake
+	>=dev-build/cmake-3.22"
+DEPEND="${RDEPEND}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.3.0-expand-isa-compatibility.patch
+	"${FILESDIR}"/${PN}-6.3.0-fix-clang-template.patch
+	"${FILESDIR}"/${PN}-6.3.0-fix-libcxx.patch
+)
+
+src_prepare() {
+	# install benchmark files
+	if use benchmark; then
+		sed -e "/get_filename_component/s,\${BENCHMARK_SOURCE},${PN}_\${BENCHMARK_SOURCE}," \
+			-e "/add_executable/a\  install(TARGETS \${BENCHMARK_TARGET})" -i benchmark/CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	rocm_use_hipcc
+
+	# too many warnings in tests
+	append-cxxflags -Wno-explicit-specialization-storage-class -Wno-deprecated-declarations
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	# uses HMM to fit tests to default <512M iGPU VRAM
+	ROCPRIM_USE_HMM="1" cmake_src_test -j1
+}
diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest
index 81980f21cb0e..40045361a8ce 100644
--- a/sci-libs/rocRAND/Manifest
+++ b/sci-libs/rocRAND/Manifest
@@ -3,3 +3,4 @@ DIST rocRAND-5.1.3.tar.gz 11729425 BLAKE2B f61aaedb7b72ceba3868a2069c93db1e2cd88
 DIST rocRAND-5.6.0.tar.gz 23189913 BLAKE2B 2418a90c323f483d1f92630df7134bc060b9052f580259924e79680a7ec37857574973dda69dc3c28fdd5b88a5fc1d29757ed637fcde0730c53b9a5f09668aba SHA512 cccd26a6b80a7705644803a85dad3a43de3f4e2f73f964f2b5aa410f71d3782b68d6cc1ad60b7f7be5193a94098ed3fa25cad30c3acbc141522cdd738d3328a5
 DIST rocRAND-5.7.1.tar.gz 23189653 BLAKE2B c70ab6f3b718c2430394f63b93bee15fa72daae704883fdb203b98b0dc4763b46bc27886af64c48bf4ebe8da9b919158b8cd346f70f9b76bf0492ce3b2c1e20e SHA512 4d74bce9fbd3cb45e3f057d38df747270c6986fea7ad524f7a88109b6a53a4ea5dcd60d4bbf2364888501e9444245fb6898bb79fccad0e37b61e819e8c4ed863
 DIST rocRAND-6.1.1.tar.gz 26683143 BLAKE2B 4108584c6372adbf2f9ef887cf1aa08f5afdfa489ba0739d247e693628f3e23978fe023c2896e7bff666b8822b0011fd3f635338b013898f8d76b3f31ec21f6c SHA512 d8df0e6bf843719e59434c952ef56b112ada23d0c226bec9f2974ed762500202ac809f495de61a4086289e35c2f4b670f4ed7dcd7092a158c0a731c368950a44
+DIST rocRAND-6.3.0.tar.gz 44906536 BLAKE2B 204ba943ba840d78dfc7a69f762dca270f7cb9633dcb9f47df0832958b0c6bf279b0154539c01d0a6037aed9c8ec38edbd566fc102410687d188ff7299d23515 SHA512 aa8f6abc798ac1b24908ec5ef45b38bc63ee79ccf7c333b42f16cb0155f22d1fea34753e61de93a4eaf485457124f23626dd79d35021e3e896bff915a2722455
diff --git a/sci-libs/rocRAND/rocRAND-6.3.0.ebuild b/sci-libs/rocRAND/rocRAND-6.3.0.ebuild
new file mode 100644
index 000000000000..e3b1aa20b634
--- /dev/null
+++ b/sci-libs/rocRAND/rocRAND-6.3.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="Generate pseudo-random and quasi-random numbers"
+HOMEPAGE="https://github.com/ROCm/rocRAND"
+SRC_URI="https://github.com/ROCm/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/rocRAND-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.1_fix_generator_alignment.patch
+)
+
+RDEPEND="dev-util/hip"
+DEPEND="${RDEPEND}
+	dev-build/rocm-cmake
+	benchmark? ( dev-cpp/benchmark )
+	test? ( dev-cpp/gtest )"
+BDEPEND="dev-build/rocm-cmake
+	>=dev-build/cmake-3.22"
+
+src_configure() {
+	rocm_use_hipcc
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	export LD_LIBRARY_PATH="${BUILD_DIR}/library"
+	# uses HMM to fit tests to default <512M iGPU VRAM
+	ROCRAND_USE_HMM="1" cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}"/benchmark
+		dobin benchmark_rocrand_*
+	fi
+}
diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest
index bdd119767929..6af0f8b0eaa7 100644
--- a/sci-libs/rocSOLVER/Manifest
+++ b/sci-libs/rocSOLVER/Manifest
@@ -2,3 +2,4 @@ DIST rocSOLVER-5.1.3.tar.gz 545627 BLAKE2B 2cca24a1310efba7f8c66d1614fb50704221e
 DIST rocSOLVER-5.4.2.tar.gz 674866 BLAKE2B 0628353d567da92e3f7c3a11e19859329f3ea916184d554ee9c7172084ee4698c93408f397f493331d4dc47d833c56ead41bb4445081ba9ac73809ca0478770c SHA512 b3a60c65a18c3864568e1e0b1524850eb1b322f6005cf8a2763c9b457e43e03c8ce74be1d13f3cc3adef1f6ac979f54fb903831f4a60447a9a915a40dcbe5ff6
 DIST rocSOLVER-5.7.1.tar.gz 1859403 BLAKE2B f7a40494deda9dd66f2fb2f57e13665688e89e1f82733701ec60a520bc4b9f7d5899ada618a37e73baa3a910757be4f11d5fced5d4d2ad82c56918b34d265511 SHA512 78e0a2b5b069378696afebf5e3e023449b3d7705aa79099eb7721c142d7525255825b41bf413324c33178091315e3909980a1bf0cbb66e0891c85e757858ee1c
 DIST rocSOLVER-6.1.1.tar.gz 2971118 BLAKE2B 2611b6b65704e7cd64df682728013f07d20c6e17e6729cec7befb91dbed57aabaaed2887a252d4ae610fe0bcb336dfcd4b98d63c107694c22e35be06d06363db SHA512 a96901226cbe5b410fa2885023a080b5ca7dc4659be92b363c37e10eba97d3da09d97488ecdc040452a535ad3284017c64b3b68646f258655583302baa009f34
+DIST rocSOLVER-6.3.0.tar.gz 3077185 BLAKE2B 2ac2260aa631756d32a92b9386bda16a46a1b16922072d6962497b2f009c237a0386cc0006ffdd56e6396322fc2408d49fc18e2ccd7120492a2270fce3eba3d9 SHA512 a2655cce8c2eb287893988e8b69e77e2dbcad0f627fac74916be2789cd3357cf29f3e3090a9c88a86ef9a0e80dd0aa949ddfb145a6a0d1c128eac0a8fe708d94
diff --git a/sci-libs/rocSOLVER/rocSOLVER-6.3.0.ebuild b/sci-libs/rocSOLVER/rocSOLVER-6.3.0.ebuild
new file mode 100644
index 000000000000..0cb4a4616a06
--- /dev/null
+++ b/sci-libs/rocSOLVER/rocSOLVER-6.3.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake edo flag-o-matic rocm
+
+DESCRIPTION="Implementation of a subset of LAPACK functionality on the ROCm platform"
+HOMEPAGE="https://github.com/ROCm/rocSOLVER"
+SRC_URI="https://github.com/ROCm/rocSOLVER/archive/rocm-${PV}.tar.gz -> rocSOLVER-${PV}.tar.gz"
+S=${WORKDIR}/${PN}-rocm-${PV}
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="test benchmark"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
+	sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}]
+	dev-libs/libfmt
+	benchmark? ( virtual/blas )"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-cpp/gtest
+	>=dev-build/cmake-3.22
+	virtual/blas )"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	rocm_use_hipcc
+
+	# too many warnings
+	append-cxxflags -Wno-explicit-specialization-storage-class
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-Wno-dev
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_CLIENTS_SAMPLES=NO
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}"/clients/staging || die
+	# No filters: 64m28s on gfx1100
+	# 'checkin*-*known_bug*': 1m35s
+	HIP_VISIBLE_DEVICES=0 LD_LIBRARY_PATH="${BUILD_DIR}/library/src" \
+		edob ./rocsolver-test --gtest_filter='checkin*-*known_bug*:*GVD*batched*'
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}" || die
+		dobin clients/staging/rocsolver-bench
+	fi
+}
diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest
index ad5d2e4c12ad..af0bf9004390 100644
--- a/sci-libs/rocSPARSE/Manifest
+++ b/sci-libs/rocSPARSE/Manifest
@@ -1,6 +1,7 @@
 DIST rocSPARSE-5.1.3.tar.gz 943788 BLAKE2B f9d5fc34d74bc10f3e5bd0a18da41fe9b35a2f01aca3a74979960958fd0e7648fca96493ba9d767119a452dd75ede0733959d0d4bae84615b7a1ff212c8412a3 SHA512 735aa210bbdc3f31b0ed4defe0288606e255788e877f24ed25506d780552a779305fe5bfd692a3e720e9b286073894300fcbcf161d41e1b23abf2110a9536bf3
 DIST rocSPARSE-5.7.1.tar.gz 1167162 BLAKE2B 20ed88c87afbb041a31aa8bf867dca7ee670af093347c9c6a68b0750e70c796e7cfd599f84a58de2b8038f7681524bcb5909230fc340d1575dae3b72089ec650 SHA512 cd48884c51fcddcb26c42920cf477999160b3f06da4ab182f746a18d1fe54f697d89b1e470c550bd2330b26fb596d4a5baadf64366145e0d07f3fd8891f9af59
 DIST rocSPARSE-6.1.1.tar.gz 1367035 BLAKE2B fc981df5913ea527bb4a7d3eba69373ebc7b74319f387e9f42a94feb1ec029ecca15618ea2d5ff7a91cb6e8959f164ab4be57755ee17db5f155f3b0e373cc487 SHA512 f87bd724b92fdb35e1c70cafcf09d95ab65f514bacfe1c59c5f0a2a75a8bae7a7dca2ee093ecd2e05adf542cc00165c0f8bf0a67e98013e2c4c72145ba951db2
+DIST rocSPARSE-6.3.0.tar.gz 1490336 BLAKE2B 05260170c757247a93c4169603dd8f0c0ce8e1e83ca83775783bee243ed9d174af7762a39f252b1434fb6af8a86fdcc11a7994af79e8a8b9ea9f199670ab3a74 SHA512 c8ddd942ba5765f01457391d028599e8daecd107771a2ff7948f537756c323be516d40fc52f7443472db76f5d7411dcd266f8dbc7f0ae9d9cee8270ec8dcb1f7
 DIST rocSPARSE_ASIC_320k.tar.gz 11301444 BLAKE2B a00cc4a3ededab3fb56339319e34e936645ddce2dee3c630153b37e337384c207b0a2829227fb7f4c2db1fe33383e97410ab7ad459d391c025f5410843d51cf2 SHA512 1db3af391c30a371c1ac0087436e266721474273a39d5b2b6d56408d950dcbbee004750e4dce4e3dbc4cb512f38f6d945676d7f29b62c52fd5a7fed0fe789e03
 DIST rocSPARSE_Chebyshev4.tar.gz 50165660 BLAKE2B f1a95554c8f38937f501488fabfd406b773eb980d7463cadac0de162529ac2f834c655cadd2b65f4c42a8487bc2d67c749601ae33bd789051f9e4d1e157196a0 SHA512 fdec4947a4af923d28b4be8d23690fd6d356c58f8344a5dcdd2e3fa61769d83e47a84d65316b527e6e82d9f988de2675a852367d406e44b44d784137a90b95c0
 DIST rocSPARSE_Chevron2.tar.gz 3210636 BLAKE2B 919bc19931cbcb32c09e6b623c9d3890400895dfd65e83845d351a8e3dd8b30ef43374c3c0ca3ee9708c81b5fb8886f1a4adbea6086495f08f9498f19a2279d5 SHA512 22b71deddec4f1af5b239d4065089230cf70e521102803a77ab3f16b34a0d69534817e54d81dfa7f8d1f299932c0f0424237baeb3d8289bcfffa4b902b00e256
diff --git a/sci-libs/rocSPARSE/rocSPARSE-6.3.0.ebuild b/sci-libs/rocSPARSE/rocSPARSE-6.3.0.ebuild
new file mode 100644
index 000000000000..87320ae0e017
--- /dev/null
+++ b/sci-libs/rocSPARSE/rocSPARSE-6.3.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+ROCM_VERSION=${PV}
+
+inherit cmake edo flag-o-matic python-any-r1 toolchain-funcs rocm
+
+DESCRIPTION="Basic Linear Algebra Subroutines for sparse computation"
+HOMEPAGE="https://github.com/ROCm/rocSPARSE"
+
+SRC_URI="https://github.com/ROCm/rocSPARSE/archive/rocm-${PV}.tar.gz -> rocSPARSE-${PV}.tar.gz
+test? (
+http://sparse-files.engr.tamu.edu/MM/SNAP/amazon0312.tar.gz -> ${PN}_amazon0312.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> ${PN}_Chebyshev4.tar.gz
+http://sparse-files.engr.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> ${PN}_sme3Dc.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Williams/webbase-1M.tar.gz -> ${PN}_webbase-1M.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Bova/rma10.tar.gz -> ${PN}_rma10.tar.gz
+http://sparse-files.engr.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> ${PN}_bibd_22_8.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> ${PN}_mac_econ_fwd500.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Williams/mc2depi.tar.gz -> ${PN}_mc2depi.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Hamm/scircuit.tar.gz -> ${PN}_scircuit.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> ${PN}_ASIC_320k.tar.gz
+http://sparse-files.engr.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> ${PN}_bmwcra_1.tar.gz
+http://sparse-files.engr.tamu.edu/MM/HB/nos1.tar.gz -> ${PN}_nos1.tar.gz
+http://sparse-files.engr.tamu.edu/MM/HB/nos2.tar.gz -> ${PN}_nos2.tar.gz
+http://sparse-files.engr.tamu.edu/MM/HB/nos3.tar.gz -> ${PN}_nos3.tar.gz
+http://sparse-files.engr.tamu.edu/MM/HB/nos4.tar.gz -> ${PN}_nos4.tar.gz
+http://sparse-files.engr.tamu.edu/MM/HB/nos5.tar.gz -> ${PN}_nos5.tar.gz
+http://sparse-files.engr.tamu.edu/MM/HB/nos6.tar.gz -> ${PN}_nos6.tar.gz
+http://sparse-files.engr.tamu.edu/MM/HB/nos7.tar.gz -> ${PN}_nos7.tar.gz
+http://sparse-files.engr.tamu.edu/MM/DNVS/shipsec1.tar.gz -> ${PN}_shipsec1.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Cote/mplate.tar.gz -> ${PN}_mplate.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Bai/qc2534.tar.gz -> ${PN}_qc2534.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Chevron/Chevron2.tar.gz -> ${PN}_Chevron2.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Chevron/Chevron3.tar.gz -> ${PN}_Chevron3.tar.gz
+http://sparse-files.engr.tamu.edu/MM/Chevron/Chevron4.tar.gz -> ${PN}_Chevron4.tar.gz
+)"
+
+S="${WORKDIR}/rocSPARSE-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RDEPEND="=dev-util/hip-6*
+	sci-libs/rocPRIM:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND="test? (
+	dev-cpp/gtest
+	>=dev-build/cmake-3.22
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+)
+"
+
+RESTRICT="!test? ( test )"
+
+python_check_deps() {
+	if use test; then
+		python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	# use python interpreter specifyied by python-any-r1
+	sed -e "s/\${python}/${EPYTHON}/" \
+	    -i clients/tests/CMakeLists.txt || die
+
+	cmake_src_prepare
+
+	# Test need download data from https://sparse-files.engr.tamu.edu (or other mirror site), check MD5,
+	# unpack and convert them into csr format
+	# This process is handled default by ${S}/cmake/ClientMatrices.cmake, but should be the responsibility of portage.
+	if use test; then
+		mkdir -p "${BUILD_DIR}"/clients/matrices
+		# compile and use the mtx2csr converter. Do not use any optimization flags, because it causes error!
+		edo $(tc-getCXX) deps/convert.cpp -o deps/convert
+		find "${WORKDIR}" -maxdepth 2 -regextype egrep -regex ".*/(.*)/\1\.mtx" -print0 |
+			while IFS= read -r -d '' mtxfile; do
+				destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' "${mtxfile}").csr
+				ebegin "Converting ${mtxfile} to ${destination}"
+				deps/convert "${mtxfile}" "${destination}"
+				eend $?
+			done
+	fi
+}
+
+src_configure() {
+	rocm_use_hipcc
+
+	# tons of warnings in tests
+	append-cxxflags -Wno-explicit-specialization-storage-class
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}/clients/staging" || die
+	LD_LIBRARY_PATH="${BUILD_DIR}/library" edob ./rocsparse-test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}" || die
+		dobin clients/staging/rocsparse-bench
+	fi
+}
diff --git a/sci-libs/rocThrust/Manifest b/sci-libs/rocThrust/Manifest
index 3916366accb8..a616d391101f 100644
--- a/sci-libs/rocThrust/Manifest
+++ b/sci-libs/rocThrust/Manifest
@@ -1,3 +1,5 @@
 DIST rocThrust-5.1.3.tar.gz 1186518 BLAKE2B 2defe71247915940917438d4f0d0a811dca7de39e5168248968fa9c165b81d94b0e20f3df9b84db1fbdcd2eb87942dec5d3adbbe1a699eb51eeb4e1b2f0a88d0 SHA512 189c70343a410cf3f3c1589ef24c68a38b5270d8780d15261a124b8250f279a3c3c7afef38e6310d57cb1741b3ee75f0b4ac0bb9dfcf4a4fb0e7e6c0516faf74
 DIST rocThrust-5.7.1.tar.gz 1122808 BLAKE2B 41a5d57d03c7f95baf861b772c9513c7fbc26eee8a2f388897eb9b9f9fad3cdad81e2a79932c5b9a6d88b4e1596bf64e59e01337943a036ddb792f7b352ecd31 SHA512 52a9640808f0ed78ae2d6f25e741af59ae4e977535a0431f16c0fa1ee9a395e6f389cf29e61c02ac274cf16fcd193e5df6fb2edc340059ab282ed7cd877fc8b4
 DIST rocThrust-6.1.1.tar.gz 1147635 BLAKE2B e71288a4666ba1f23cf85d2d269f61f9085efaeb2921b7f3142c5ce0808380b27a8c07945a44b6a651747046020b412838a667232b1ba65308fd7fd336b840b4 SHA512 30eeb6df73ee0dc2361879337faae09cf19cd151510c6e22d774c22b4be19272f9980cc6ba2b2e42f43738a1e475f49fcb4384d66b24639746a05685a90e37d4
+DIST rocThrust-6.3.0.tar.gz 1205810 BLAKE2B bdf617ffac39deb345a2738a7d61ccf282af1ba2d49210aa15e5d3181f64f38bcb609d52d41db892579d9d03013b0ddcad6bc88cd58a3a90fa8e7989e01edfcc SHA512 e73e0fd743dcb5625099aad226b578145e350666eb52ce9682e53a40f4cb17a34f812a94321397acad8dfcf6c573eab86565a220bb42e501296b78450e42647e
+DIST sqlite-amalgamation-3430200.zip 2676699 BLAKE2B b09c59772c920ddef7ba0b15b1721645541678bad9ecb23fb8ecfbb1733177cad836d1d75db8e0722ea7ab4701cfaca187b72c127e9959f7e4f116f1ec7fe41c SHA512 5ef0e65ee92a088187376fa82ccb182dffa35391dd4dbcb3fafeb0a6f1602ced1e212753837079a9cad007d73d3f5b8a67ca1a6596eba6cf0c695052fa307392
diff --git a/sci-libs/rocThrust/files/rocThrust-6.3.0-fix-libcxx.patch b/sci-libs/rocThrust/files/rocThrust-6.3.0-fix-libcxx.patch
new file mode 100644
index 000000000000..2db69a71bd20
--- /dev/null
+++ b/sci-libs/rocThrust/files/rocThrust-6.3.0-fix-libcxx.patch
@@ -0,0 +1,13 @@
+_VSTD macro was removed from libcxx
+Upstream commit: https://github.com/ROCm/rocThrust/commit/bc24ef2613e282d57d96dcf4263e2fa2cab171e4
+--- a/thrust/type_traits/is_contiguous_iterator.h
++++ b/thrust/type_traits/is_contiguous_iterator.h
+@@ -139,7 +139,7 @@ struct is_libcxx_wrap_iter : false_type {};
+ #if defined(_LIBCPP_VERSION)
+ template <typename Iterator>
+ struct is_libcxx_wrap_iter<
+-  _VSTD::__wrap_iter<Iterator>
++  std::__wrap_iter<Iterator>
+ > : true_type {};
+ #endif
+ 
diff --git a/sci-libs/rocThrust/rocThrust-6.3.0.ebuild b/sci-libs/rocThrust/rocThrust-6.3.0.ebuild
new file mode 100644
index 000000000000..7850be793886
--- /dev/null
+++ b/sci-libs/rocThrust/rocThrust-6.3.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="HIP back-end for the parallel algorithm library Thrust"
+HOMEPAGE="https://github.com/ROCm/rocThrust"
+SRC_URI="
+	https://github.com/ROCm/rocThrust/archive/rocm-${PV}.tar.gz -> rocThrust-${PV}.tar.gz
+	test? ( https://www.sqlite.org/2023/sqlite-amalgamation-3430200.zip )
+"
+S="${WORKDIR}/rocThrust-rocm-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+REQUIRED_USE="
+	benchmark? ( ${ROCM_REQUIRED_USE} )
+	test? ( ${ROCM_REQUIRED_USE} )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}]
+	test? ( dev-cpp/gtest )
+	benchmark? (
+		dev-cpp/benchmark
+		sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-build/cmake-3.22
+	test? ( app-arch/unzip )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0-operator_new.patch"
+	"${FILESDIR}/${PN}-6.3.0-fix-libcxx.patch"
+)
+
+src_configure() {
+	rocm_use_hipcc
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARKS=$(usex benchmark ON OFF)
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DFETCHCONTENT_SOURCE_DIR_SQLITE_LOCAL="${WORKDIR}"/sqlite-amalgamation-3430200
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	# uses HMM to fit tests to default <512M iGPU VRAM
+	ROCTHRUST_USE_HMM="1" cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	use benchmark && dobin "${BUILD_DIR}"/benchmarks/benchmark_thrust_bench
+}
diff --git a/sci-libs/rocWMMA/Manifest b/sci-libs/rocWMMA/Manifest
index 7aeb9da75f6f..6f04a53b98a5 100644
--- a/sci-libs/rocWMMA/Manifest
+++ b/sci-libs/rocWMMA/Manifest
@@ -1,2 +1,3 @@
 DIST rocWMMA-5.7.1.tar.gz 3163060 BLAKE2B 47ca55c0cd388ca51ad3843e656a31ce04d9e07988c26bfb69a7c61bfe497609408cfd20dcbe9c6698bd79b800a114ab67d582ced43dc6f1c4db4072e2901d99 SHA512 92c9c634fdf1f5319d34fabbf691df45600abdc5285a76b40255e7d6d260553076f65baa1eda566a163725e2a0cec0a85372eb07add39c65368e84505c176f50
 DIST rocWMMA-6.1.1.tar.gz 3189782 BLAKE2B fd96d8f3ba8f21ee3544d532a59ffdefa1aefc94d73401f48d470f7f699e28771d5495e98c1ee316d8379167b70b945220be6670dee2757a62af162276a2fb0f SHA512 db2bfe805a4f33c48ee98c821efe0b261eca474af9e954843c83faa3335459bfe635326ba2cfc7b8b8ece2cf0f2c418f49ff6aa81537f8d3747cc729738a6b18
+DIST rocWMMA-6.3.0.tar.gz 3225622 BLAKE2B bfcb872393a11c809d1f7d09aeca554c24669650f4e61d5846104d0559b50a584081260ad566b1d79a2d107cc1f2bf9ea26751e0611cba9108a455a2ba48a3cb SHA512 5c72df14eabd0e766ffc03e41cd2e5a07ffb4ab518f7e6c2b1f23517c20a1c076d08a45f9940e499ede02c0d2c77f3f76f65f4748c7c8dfa2e747a406acf0aa1
diff --git a/sci-libs/rocWMMA/rocWMMA-6.3.0.ebuild b/sci-libs/rocWMMA/rocWMMA-6.3.0.ebuild
new file mode 100644
index 000000000000..5a803b20ae90
--- /dev/null
+++ b/sci-libs/rocWMMA/rocWMMA-6.3.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_SKIP_GLOBALS=1
+
+inherit cmake rocm
+
+DESCRIPTION="library for accelerating mixed precision matrix multiply-accumulate operations"
+HOMEPAGE="https://github.com/ROCm/rocWMMA"
+SRC_URI="https://github.com/ROCm/rocWMMA/archive/rocm-${PV}.tar.gz -> rocWMMA-${PV}.tar.gz"
+S="${WORKDIR}/rocWMMA-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+DEPEND="dev-util/hip:${SLOT}"
+
+IUSE_TARGETS=( gfx908 gfx90a gfx940 gfx941 gfx942 gfx1100 gfx1101 gfx1102 )
+IUSE_TARGETS=( "${IUSE_TARGETS[@]/#/amdgpu_targets_}" )
+ROCM_USEDEP_OPTFLAGS=${IUSE_TARGETS[*]/%/(-)?}
+ROCM_USEDEP=${ROCM_USEDEP_OPTFLAGS// /,}
+ROCM_REQUIRED_USE=" || ( ${IUSE_TARGETS[*]} )"
+
+BDEPEND="
+	test? (
+		dev-cpp/gtest
+		sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
+	)
+	dev-build/rocm-cmake
+"
+
+IUSE="${IUSE_TARGETS[*]/#/+} test"
+
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-no-test-install.patch
+)
+
+src_prepare() {
+	# unknown arguments for hipcc
+	sed -e "s/ -parallel-jobs=4//" \
+		-e "s/ -Xclang -fallow-half-arguments-and-returns//" \
+		-i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	rocm_use_hipcc
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DROCM_SYMLINK_LIBS=OFF
+		-DROCWMMA_BUILD_SAMPLES=OFF
+		-DROCWMMA_BUILD_TESTS="$(usex test)"
+	)
+	use test && mycmakeargs+=(-DROCWMMA_USE_SYSTEM_GOOGLETEST=ON)
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+
+	# Expected time on gfx1100 is 1260s (-j1) or 936s (-j32)
+	# Visible devices are limited to the first one to exclude APU (if not disabled in the BIOS)
+	HIP_VISIBLE_DEVICES=0 cmake_src_test
+}
diff --git a/sci-libs/rpp/Manifest b/sci-libs/rpp/Manifest
index 322ed39e26ea..72488241d4a2 100644
--- a/sci-libs/rpp/Manifest
+++ b/sci-libs/rpp/Manifest
@@ -1 +1,2 @@
 DIST rpp-6.1.1.tar.gz 37016755 BLAKE2B 884090ab50e0a4a3aed4e52c5bbd934a8c5b62eca310471c30cf4c5a7cafdd36fed7894320b4d5246620b3c47e90fafd0f8160a7d4ed0295c7668c8d147f4b18 SHA512 a7c10bdd08739eba08209783decf0f4fd7c12194b9ebc63bd16e4cb998645110c089833efb83a77d4bed7f8599cf3a320608be28633f0dc956079f9d70e765f8
+DIST rpp-6.3.0.tar.gz 56092581 BLAKE2B 1a36d98b64745e7cb36322cf21a6983a7efcde737136cbf12c428edd315ce1dff5f92540e5f23750cce01a65d25c0a87e4429bb3ea98059c747569591fb0e22a SHA512 8bab18af168dca51f6a5c2d32e46ca133307d2cf48057c4e9cda6100ea17df54b22533fedbad6d4273904eca53df5a322153a2d7eb45c6ce7faff54d2e57a482
diff --git a/sci-libs/rpp/rpp-6.3.0.ebuild b/sci-libs/rpp/rpp-6.3.0.ebuild
new file mode 100644
index 000000000000..e1bd48117964
--- /dev/null
+++ b/sci-libs/rpp/rpp-6.3.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake flag-o-matic rocm
+
+DESCRIPTION="AMD ROCm Performance Primitives (RPP) high-performance computer vision library"
+HOMEPAGE="https://github.com/ROCm/rpp"
+SRC_URI="https://github.com/ROCm/rpp/archive/refs/tags/rocm-${PV}.tar.gz -> rpp-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+# pkgcheck warning: RequiredUseDefaults
+REQUIRED_USE="
+	cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_f16c
+	${ROCM_REQUIRED_USE}
+"
+
+RDEPEND="
+	dev-util/hip:${SLOT}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-build/cmake-3.22
+	>=dev-libs/half-1.12.0-r1
+	test? (
+		dev-cpp/gtest
+		media-libs/opencv:=
+	)
+"
+
+IUSE="cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_f16c test"
+RESTRICT="!test? ( test )"
+
+DOCS=( CHANGELOG.md LICENSE README.md )
+
+rcc_test_wrapper() {
+	local S="${WORKDIR}/${PN}-rocm-${PV}/utilities/rpp-unittests/HIP_NEW"
+	local CMAKE_USE_DIR="${S}"
+	local BUILD_DIR="${BUILD_DIR}/utilities/rpp-unittests/HIP_NEW"
+	cd "${S}" || die
+	$@
+}
+
+src_prepare() {
+	sed -e "s:\${ROCM_PATH}/llvm/bin/clang++:hipcc:" \
+		-i CMakeLists.txt || die
+
+	cmake_src_prepare
+	if use test; then
+		local PATCHES=()
+		rcc_test_wrapper cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	rocm_use_hipcc
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DROCM_PATH=/usr
+		-DBACKEND=HIP
+		-DBUILD_WITH_AMD_ADVANCE=OFF
+	)
+
+	cmake_src_configure
+
+	if use test; then
+		append-cxxflags -I"${S}/include"
+		append-ldflags -L"${BUILD_DIR}/lib64"
+		local mycmakeargs=(-DROCM_PATH=/usr)
+		use test && rcc_test_wrapper cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+	use test && rcc_test_wrapper cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove unneeded copy
+	rm -r "${ED}/usr/share/doc/${PF}-asan" || die
+}
+
+src_test() {
+	check_amdgpu
+
+	cd "${BUILD_DIR}"/utilities/rpp-unittests/HIP_NEW || die
+	for params in "0 0" "0 1" "1 1" "2 1" "5 1" "0 2" "0 3" "0 4" "0 5" "0 8"; do
+		LD_LIBRARY_PATH="${BUILD_DIR}"/lib64 ./uniqueFunctionalities_hip $params || die
+	done
+}
diff --git a/sci-libs/symengine/symengine-0.13.0.ebuild b/sci-libs/symengine/symengine-0.13.0.ebuild
index 91bda7a4966a..589a31fdb9af 100644
--- a/sci-libs/symengine/symengine-0.13.0.ebuild
+++ b/sci-libs/symengine/symengine-0.13.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="
 	boost debug ecm +flint llvm +mpc +mpfr openmp primesieve tcmalloc
 	test
diff --git a/sci-libs/symmetrica/Manifest b/sci-libs/symmetrica/Manifest
index 9370fd11f54e..3ad3c7b8bf30 100644
--- a/sci-libs/symmetrica/Manifest
+++ b/sci-libs/symmetrica/Manifest
@@ -1 +1,2 @@
 DIST symmetrica-3.0.1.tar.xz 789336 BLAKE2B 88521356bdc006413e0922b49b23f345da96bbe8cb2a4a6ae12bf53fe46150078f086e6d1f6e514817453f2a868b6eb578b716c05f5459397ed8d766d321ec24 SHA512 1e4c42e1ae9fcdf246dff1c1f01522d6cd416c12302363f82356018847df2f64d2f5ea6256459832d195e8e333ae14743794d5a53346e92d8ba1bb1c0949c271
+DIST symmetrica-3.1.0.tar.xz 765568 BLAKE2B 9b4f81ef4e135af5552417b66829ca3a99f3ad039cdc936108dc587d5971364db6fe822679fa110ac0f3e8cc30b0856e27efff4ba9ab3f79ee9a706047bba5c7 SHA512 7bc45802907b4eb82b89e440d628143fc4bbebadbb221711dcdcb4daf6587f1042f0fb701c369434151e5c1a83eeda2eb7d0c8f96ee00afcdc79a6600ff96983
diff --git a/sci-libs/symmetrica/symmetrica-3.1.0.ebuild b/sci-libs/symmetrica/symmetrica-3.1.0.ebuild
new file mode 100644
index 000000000000..eea38fdc5830
--- /dev/null
+++ b/sci-libs/symmetrica/symmetrica-3.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="C library for representation theory, combinatorics, and more"
+HOMEPAGE="https://gitlab.com/sagemath/symmetrica"
+SRC_URI="https://gitlab.com/-/project/16178617/uploads/b24da56820651687cafb611809a4b1b0/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0/3"
+KEYWORDS="~amd64 ~riscv"
+IUSE="doc"
+
+DOCS=( README.md )
+
+src_configure() {
+	econf $(use_enable doc)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/szip/szip-2.1.1.ebuild b/sci-libs/szip/szip-2.1.1.ebuild
index c6bda0f8f2f1..db8b52f2086f 100644
--- a/sci-libs/szip/szip-2.1.1.ebuild
+++ b/sci-libs/szip/szip-2.1.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
@@ -9,7 +9,7 @@ SRC_URI="https://support.hdfgroup.org/ftp/lib-external/${PN}/${PV}/src/${P}.tar.
 
 LICENSE="szip"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="!sci-libs/libaec[szip]"
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 35b64e6287e6..38ddb6b637c5 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,12 +1,6 @@
-DIST VTK-9.3.0.tar.gz 99932810 BLAKE2B 59c2cdfe1c2525ac0f89df77a668783d928b55d2e72b42df45ea9b789da1bb150d52ce4108f2bc39cb8840cdd1998f57d3aedf96c72e402f6115d9efeebf4486 SHA512 2722dc8186779df1af5c534f26b20186ea33cb3bca2cef8cb333542b12e738382616e26e8d4d0341cb98c30403f8a896d77ddb04adb07e26d0d548c4a34b7d2f
 DIST VTK-9.3.1.tar.gz 99964158 BLAKE2B b85aae0aef1a22bd0496e0f5d2c7d3a5c20bbd7db8951ab1f9fe29a48c01ce960e90dc85f36cb6858c2b7dfd7f12cd1cf2e7d0fbb115fc9fd709dd7b481c598e SHA512 5dcd6764b2d9fe476bcc7bd195fab8230b7628579d94656ab037dcaecd07c7d40d0fc4afba446942ca15cd881df17f4c84581047e75a6e11d2e2d339d97c7fa3
-DIST VTKData-9.3.0.tar.gz 612388942 BLAKE2B 66d73ddaf5f2ddf52cf5c6dda5a918a86ae630df207983534478c92a66c39e38b1f4abfb93900b36899a93ad0e26260763573e925bd128c1646a1bc3bef8c54d SHA512 385d609c2adc1746c073690b58a3fc25e496946c03f08e6c9e0a69ee406cee447e66d267986c3e5ba9006dd1cb0015b68134bb3c375ae41aef8f3b1e0d923d51
 DIST VTKData-9.3.1.tar.gz 612744946 BLAKE2B 6b3a09f6cc98630e817aaeca8094c6a6625372269abfa9003212cd1cdbc101b198f5eeb3474ca675be7f03046c58a5d11b4092ab19ed230422c4100011abfee4 SHA512 befc6b68e33d2c2fb6928006d4fe6feda7e0bbaf31df4488911ab8e3865e3fc1cf3834301301aa2b6de94c4489eebf5e2e8521e8830315d2a1f0e65cb73a6fd3
-DIST VTKDataFiles-9.3.0.tar.gz 628646039 BLAKE2B c2a4e875536c0b06f1edc8a8df17defbe1038067d7a04fc07e71ea49cad46139ef25f64d4b434a095ced16a7ff39d5346d34c528c099ea2e126c9f29afe92482 SHA512 c6788acfa790ce6b02aa5545fa4e411d00896b7542416c18b5e5955909f26a8fab9267e44db1c2a86f95f7a7f093695453f3fd0ec4e2c9a73449f9caf3fc09d5
 DIST VTKDataFiles-9.3.1.tar.gz 628903288 BLAKE2B cf5919a627ee49809f79d29577d65a48c3332255551c3c229875b25fce911c75c3edeca8d0dfdf9926f93543963ab0e2c992c7469e2c9eed041c39cfd995647d SHA512 360fadd31ab304a27b208745c674eb31759552e98f587569f481c1bda62c7f8ae72598cd40b2c628bb211aace8f62df2ea7ca66f192f8d2e71bca7a4deaa9e89
-DIST VTKLargeData-9.3.0.tar.gz 247520869 BLAKE2B e01f3d0997d0b328d6c5909d6b891443c1246bdbc36aa978004a1d4bb2770f7923afed2c0d78f7844aae95e067425b9dd25a1c47601c8137ba0a8a958b708cab SHA512 d87eb0fb4ce27ae9f4363c54bb711e66c5d2dbcdf508cb5fae9fcc1574407df2816f29d20037297b834440cd8a54fcf8e1d6db14700054f057bff2fe48404d33
 DIST VTKLargeData-9.3.1.tar.gz 247523669 BLAKE2B 88ec5046f502db14dd6a26ef81e386babaf560619e16d769834e96046eab46cf762d8c80f9b51c434b77e4e145d8f60e32efbdb4f57d8305494177abec0806ef SHA512 edf5610edfae90f8465d68e0e06e82018978ba27f5b2ae9701939aeb72019acaabeda435c15787f1c4828b44e34c79e2837565a81d6a3accd368a92c6eacebd1
-DIST VTKLargeDataFiles-9.3.0.tar.gz 247503839 BLAKE2B 68007af36148eaae43fc0fd75b9f8d3b165c977b7bc44efa4ce7077dc4977514f49a4d7d5e4a9e43fc9dec6562d741bdee5df87efa285b3361f865023da14f55 SHA512 f7def947ff492acbfdaa3d360064c42fdd3fedab27fd5d7bed1dbf8054b814cc8843ba0fed7078926648d1e8949235b877de97747be079ea478b79558975e6ea
 DIST VTKLargeDataFiles-9.3.1.tar.gz 247505524 BLAKE2B 5de069309c59a8a73365fb9faba9904189d723fb72976f372e40db3eb100342a19fecd582bd0aa42fc1012675b442a8e42611632004d6b6d6708468c27a4265e SHA512 bbbf0c193432cb5d8a5618c41e66609c7e6f3e4f24f588124c46b537ecec28b5670420b7f77185da534e4098f8b95d8ec4e392fc017df934a84bfc9dc833f634
-DIST vtkDocHtml-9.3.0.tar.gz 165538725 BLAKE2B 27874998679090d5442ecb3a394b53db05a0215cfee9f912bd01af1d5567efc51b4f56dacb960401195da4f3d385b335bbefc922a45d0199c99d619df0941f08 SHA512 8bf9cc87c4653a65ccc39d88d70b421a7b4353986d380cbf558cbf6e8a96435695a5d54aa7ce5bb1240cb46ca0fd9225a51183a39d1af1101d3f2876a2afc10b
 DIST vtkDocHtml-9.3.1.tar.gz 165542400 BLAKE2B da8084137b2848f82bf091535950738bd718e65cac8f461fdfb8e9c63ef6db68acfa02655531c8fe22e35f89395d2d066aa5b051abac0e774883552c898de6d9 SHA512 de0d2153c97864b49a8b99e6fbfc8bab78c1522d25bf40ed1f271a8bb4f1f205b008d6bd39f835816972c8439d01f78b68f34d1f88f87755174f0d559841ba29
diff --git a/sci-libs/vtk/files/vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch b/sci-libs/vtk/files/vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch
deleted file mode 100644
index 7dd005ff4191..000000000000
--- a/sci-libs/vtk/files/vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: dd7acfb4548dc76f1191aa96778f35c0cda80d35 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-From: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/10712
-Date: Sat, 18 Nov 2023 15:57:18 -0700
-Subject: [PATCH] Fix Java error with integer, enum overloads
-
-The Java wrappers simply cast enum types to 'jint', and do not
-distinguish them as individual types that are distinct from 'int'
-or 'unsigned int'.  So when a method is overloaded with both 'int'
-and an enum type, only one of the overloads can be wrapped.  The
-'int' (or 'unsigned int') is the one that is chosen.
---- a/Wrapping/Tools/vtkParseJava.c
-+++ b/Wrapping/Tools/vtkParseJava.c
-@@ -248,9 +248,10 @@ void return_result_native(FILE* fp)
-  * return 0 if the types do not map to the same type */
- static int CheckMatch(unsigned int type1, unsigned int type2, const char* c1, const char* c2)
- {
-+  /* VTK_PARSE_UNKNOWN is used for enum types, which are mapped to java's int type */
-   static unsigned int byteTypes[] = { VTK_PARSE_UNSIGNED_CHAR, VTK_PARSE_SIGNED_CHAR, 0 };
-   static unsigned int shortTypes[] = { VTK_PARSE_UNSIGNED_SHORT, VTK_PARSE_SHORT, 0 };
--  static unsigned int intTypes[] = { VTK_PARSE_UNSIGNED_INT, VTK_PARSE_INT, 0 };
-+  static unsigned int intTypes[] = { VTK_PARSE_UNKNOWN, VTK_PARSE_UNSIGNED_INT, VTK_PARSE_INT, 0 };
-   static unsigned int longTypes[] = { VTK_PARSE_UNSIGNED_LONG, VTK_PARSE_UNSIGNED_LONG_LONG,
-     VTK_PARSE_LONG, VTK_PARSE_LONG_LONG, 0 };
- 
---- a/Wrapping/Tools/vtkWrapJava.c
-+++ b/Wrapping/Tools/vtkWrapJava.c
-@@ -639,9 +639,10 @@ void OutputFunctionResult(FILE* fp)
-  * return 0 if the types do not map to the same type */
- static int CheckMatch(unsigned int type1, unsigned int type2, const char* c1, const char* c2)
- {
-+  /* VTK_PARSE_UNKNOWN is used for enum types, which are mapped to java's int type */
-   static unsigned int byteTypes[] = { VTK_PARSE_UNSIGNED_CHAR, VTK_PARSE_SIGNED_CHAR, 0 };
-   static unsigned int shortTypes[] = { VTK_PARSE_UNSIGNED_SHORT, VTK_PARSE_SHORT, 0 };
--  static unsigned int intTypes[] = { VTK_PARSE_UNSIGNED_INT, VTK_PARSE_INT, 0 };
-+  static unsigned int intTypes[] = { VTK_PARSE_UNKNOWN, VTK_PARSE_UNSIGNED_INT, VTK_PARSE_INT, 0 };
-   static unsigned int longTypes[] = { VTK_PARSE_UNSIGNED_LONG, VTK_PARSE_UNSIGNED_LONG_LONG,
-     VTK_PARSE_LONG, VTK_PARSE_LONG_LONG, 0 };
- 
--- 
-GitLab
-
diff --git a/sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch b/sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch
deleted file mode 100644
index 261f3736eb3d..000000000000
--- a/sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: ccee5db79d6037c4d752b5f29dc30fb0dfd039bf Mon Sep 17 00:00:00 2001
-From: Timothée Couble <timothee.couble@kitware.com>
-From: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/10692
-Date: Fri, 10 Nov 2023 10:03:07 +0100
-Subject: [PATCH 1/2] IOPDAL: Always links with pdalcpp
-
-pdal_base and pdal_utils libraries are removed in PDAL 2.6.0
-link with pdalcpp instead starting from this version.
---- a/IO/PDAL/CMakeLists.txt
-+++ b/IO/PDAL/CMakeLists.txt
-@@ -3,14 +3,20 @@ vtk_module_find_package(PACKAGE PDAL VERSION 2.1)
- set(classes
-   vtkPDALReader)
- 
--set(pdal_libraries pdal_util)
--if (APPLE OR WIN32)
-+set(pdal_libraries)
-+if (PDAL_VERSION VERSION_LESS "2.6")
-+  set(pdal_libraries pdal_util)
-+  if (APPLE OR WIN32)
-+    list(APPEND pdal_libraries
-+      pdalcpp)
-+  else()
-+    list(APPEND pdal_libraries
-+      pdal_base)
-+  endif()
-+else ()
-   list(APPEND pdal_libraries
-     pdalcpp)
--else()
--  list(APPEND pdal_libraries
--    pdal_base)
--endif()
-+endif ()
- 
- vtk_module_add_module(VTK::IOPDAL
-   CLASSES ${classes})
--- 
-GitLab
-
-
-From 5bf45b44760bac09b0079827346e78af38d981af Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= <timothee.couble@kitware.com>
-Date: Fri, 10 Nov 2023 10:12:32 +0100
-Subject: [PATCH 2/2] Add support for PDAL 2.0 version
-
---- a/IO/PDAL/CMakeLists.txt
-+++ b/IO/PDAL/CMakeLists.txt
-@@ -23,4 +23,13 @@ vtk_module_add_module(VTK::IOPDAL
- vtk_module_link(VTK::IOPDAL
-   PRIVATE
-     ${pdal_libraries})
-+
-+# PDAL 2.0 didn't include interfaces to its exported targets.
-+# Resolved in https://github.com/PDAL/PDAL/issues/2262.
-+if (PDAL_VERSION VERSION_LESS "2.1")
-+  vtk_module_include(VTK::IOPDAL
-+    PRIVATE
-+      ${PDAL_INCLUDE_DIRS})
-+endif ()
-+
- vtk_add_test_mangling(VTK::IOPDAL)
--- 
-GitLab
-
diff --git a/sci-libs/vtk/files/vtk-9.3.0-r1-expat-2.6.0.patch b/sci-libs/vtk/files/vtk-9.3.0-r1-expat-2.6.0.patch
deleted file mode 100644
index ac519f98aa63..000000000000
--- a/sci-libs/vtk/files/vtk-9.3.0-r1-expat-2.6.0.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 3efa07ad277efe5c1d11a2ef2b907c095f68bbef Mon Sep 17 00:00:00 2001
-From: Ben Boeckel <ben.boeckel@kitware.com>
-Date: Mon, 15 Apr 2024 22:22:22 -0400
-Subject: [PATCH] vtkXMLDataParser: track `AppendedData` state explicitly
-
-Newer `libexpat` doesn't like being given the appended data after the
-artificially ended document anymore. Avoid pushing it through to its
-parser.
-
-(cherry picked from commit db8f9efca220c9d16a30958e179abae3379d0011)
-
-Fixes: #19258
----
- IO/XMLParser/vtkXMLDataParser.cxx | 6 +++++-
- IO/XMLParser/vtkXMLDataParser.h   | 3 +++
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/IO/XMLParser/vtkXMLDataParser.cxx b/IO/XMLParser/vtkXMLDataParser.cxx
-index 1f6006d37c2..7d38092fdd7 100644
---- a/IO/XMLParser/vtkXMLDataParser.cxx
-+++ b/IO/XMLParser/vtkXMLDataParser.cxx
-@@ -36,6 +36,7 @@ vtkXMLDataParser::vtkXMLDataParser()
-   this->RootElement = nullptr;
-   this->AppendedDataPosition = 0;
-   this->AppendedDataMatched = 0;
-+  this->AppendedDataFound = false;
-   this->DataStream = nullptr;
-   this->InlineDataStream = vtkBase64InputStream::New();
-   this->AppendedDataStream = vtkBase64InputStream::New();
-@@ -88,6 +89,7 @@ void vtkXMLDataParser::PrintSelf(ostream& os, vtkIndent indent)
- {
-   this->Superclass::PrintSelf(os, indent);
-   os << indent << "AppendedDataPosition: " << this->AppendedDataPosition << "\n";
-+  os << indent << "AppendedDataFound: " << this->AppendedDataFound << "\n";
-   if (this->RootElement)
-   {
-     this->RootElement->PrintXML(os, indent);
-@@ -214,7 +216,7 @@ int vtkXMLDataParser::ParsingComplete()
-   // If we have reached the appended data section, we stop parsing.
-   // This prevents the XML parser from having to walk over the entire
-   // appended data section.
--  if (this->AppendedDataPosition)
-+  if (this->AppendedDataPosition || this->AppendedDataFound)
-   {
-     return 1;
-   }
-@@ -433,6 +435,8 @@ int vtkXMLDataParser::ParseBuffer(const char* buffer, unsigned int count)
-     {
-       return 0;
-     }
-+
-+    this->AppendedDataFound = true;
-   }
- 
-   return 1;
-diff --git a/IO/XMLParser/vtkXMLDataParser.h b/IO/XMLParser/vtkXMLDataParser.h
-index 1504a4d400b..142bf28327d 100644
---- a/IO/XMLParser/vtkXMLDataParser.h
-+++ b/IO/XMLParser/vtkXMLDataParser.h
-@@ -204,6 +204,9 @@ protected:
-   // How much of the string "<AppendedData" has been matched in input.
-   int AppendedDataMatched;
- 
-+  // Whether AppendedData has been dealt with or not.
-+  bool AppendedDataFound;
-+
-   // The byte order of the binary input.
-   int ByteOrder;
- 
--- 
-GitLab
-
diff --git a/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch b/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch
deleted file mode 100644
index 4be0e88b769c..000000000000
--- a/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Paul Zander <negril.nx+gentoo@gmail.com>
-Subject: [PATCH] vtkm: too many initializer values
-
-Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
-
---- a/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx
-+++ b/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx
-@@ -334,7 +334,7 @@
- auto TransformForScalarRange(const ArrayHandleType& src,
-   const vtkm::cont::ArrayHandle<vtkm::UInt8>& ghost, vtkm::UInt8 ghostValueToSkip, bool finitesOnly)
- {
--  DecoratorForScalarRanage decorator{ ghostValueToSkip, finitesOnly };
-+  DecoratorForScalarRanage decorator{ { ghostValueToSkip, finitesOnly } };
-   return vtkm::cont::make_ArrayHandleDecorator(src.GetNumberOfValues(), decorator, src, ghost);
- }
- 
-@@ -342,7 +342,7 @@
- auto TransformForVectorRange(const ArrayHandleType& src,
-   const vtkm::cont::ArrayHandle<vtkm::UInt8>& ghost, vtkm::UInt8 ghostValueToSkip, bool finitesOnly)
- {
--  DecoratorForVectorRanage decorator{ ghostValueToSkip, finitesOnly };
-+  DecoratorForVectorRanage decorator{ { ghostValueToSkip, finitesOnly } };
-   return vtkm::cont::make_ArrayHandleDecorator(src.GetNumberOfValues(), decorator, src, ghost);
- }
- 
diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml
index ce67b30442e4..8012d390eb78 100644
--- a/sci-libs/vtk/metadata.xml
+++ b/sci-libs/vtk/metadata.xml
@@ -17,7 +17,6 @@
     <flag name="all-modules">Build all modules</flag>
     <flag name="boost">Add support for boost</flag>
     <flag name="cgns">Build support to handle CGNS data files</flag>
-    <flag name="freetype">Build support for font rendering</flag>
     <flag name="gdal">Support for gdal formated data</flag>
     <flag name="imaging">Building Imaging modules</flag>
     <flag name="las">Build support for LiDAR files</flag>
diff --git a/sci-libs/vtk/vtk-9.3.0-r3.ebuild b/sci-libs/vtk/vtk-9.3.0-r3.ebuild
deleted file mode 100644
index 3a522724f066..000000000000
--- a/sci-libs/vtk/vtk-9.3.0-r3.ebuild
+++ /dev/null
@@ -1,918 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO:
-# - add USE flag for remote modules? Those modules can be downloaded
-#	properly before building.
-# - replace usex by usev where applicable
-
-PYTHON_COMPAT=( python3_{10..12} )
-WEBAPP_OPTIONAL=yes
-WEBAPP_MANUAL_SLOT=yes
-
-inherit check-reqs cmake cuda java-pkg-opt-2 multiprocessing python-single-r1 toolchain-funcs virtualx webapp
-
-# Short package version
-MY_PV="$(ver_cut 1-2)"
-MY_PV2="${PV/_rc/.rc}"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="https://www.vtk.org/"
-SRC_URI="
-	https://www.vtk.org/files/release/${MY_PV}/VTK-${MY_PV2}.tar.gz
-	https://www.vtk.org/files/release/${MY_PV}/VTKData-${MY_PV2}.tar.gz
-	https://www.vtk.org/files/release/${MY_PV}/VTKDataFiles-${MY_PV2}.tar.gz
-	doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${MY_PV2}.tar.gz )
-	examples? (
-		https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${MY_PV2}.tar.gz
-		https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${MY_PV2}.tar.gz
-	)
-	test? (
-		https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${MY_PV2}.tar.gz
-		https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${MY_PV2}.tar.gz
-	)
-"
-S="${WORKDIR}/VTK-${MY_PV2}"
-
-LICENSE="BSD LGPL-2"
-SLOT="0/${MY_PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-# TODO: Like to simplifiy these. Mostly the flags related to Groups.
-IUSE="all-modules boost cuda debug doc examples ffmpeg +freetype gdal gles2-only imaging
-	java las +logging mpi mysql odbc opencascade openmp openvdb pdal postgres python qt5
-	qt6 +rendering sdl tbb test +threads tk video_cards_nvidia +views vtkm web"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	all-modules? (
-		boost ffmpeg freetype gdal imaging las mysql odbc opencascade openvdb pdal
-		postgres rendering views
-	)
-	cuda? ( video_cards_nvidia vtkm !tbb )
-	java? ( rendering )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( rendering )
-	qt6? ( rendering )
-	sdl? ( rendering )
-	tk? ( python rendering )
-	web? ( python )
-	rendering? ( freetype views )
-"
-
-# eigen, nlohmann_json, pegtl and utfcpp are referenced in the cmake files
-# and need to be available when VTK consumers configure the dependencies.
-RDEPEND="
-	app-arch/lz4:=
-	app-arch/xz-utils
-	dev-db/sqlite:3
-	dev-libs/double-conversion:=
-	dev-libs/expat
-	dev-libs/icu:=
-	dev-libs/jsoncpp:=
-	>=dev-libs/libfmt-8.1.1:=
-	dev-libs/libxml2:2
-	dev-libs/libzip:=
-	dev-libs/pugixml
-	media-libs/freetype
-	media-libs/libjpeg-turbo
-	>=media-libs/libharu-2.4.0:=
-	media-libs/libogg
-	media-libs/libpng:=
-	media-libs/libtheora
-	media-libs/tiff:=
-	>=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=]
-	sci-libs/hdf5:=[mpi=]
-	sci-libs/proj:=
-	sci-libs/netcdf:=[mpi=]
-	sys-libs/zlib
-	boost? ( dev-libs/boost:=[mpi?] )
-	cuda? ( dev-util/nvidia-cuda-toolkit:= )
-	ffmpeg? ( media-video/ffmpeg:= )
-	freetype? ( media-libs/fontconfig )
-	gdal? ( sci-libs/gdal:= )
-	java? ( >=virtual/jdk-11:= )
-	las? ( sci-geosciences/liblas )
-	mpi? ( virtual/mpi[cxx,romio] )
-	mysql? ( dev-db/mariadb-connector-c )
-	odbc? ( dev-db/unixODBC )
-	openvdb? ( media-gfx/openvdb:= )
-	opencascade? ( sci-libs/opencascade:= )
-	pdal? ( sci-libs/pdal:= )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )')
-		$(python_gen_cond_dep 'rendering? ( dev-python/matplotlib[${PYTHON_USEDEP}] )')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtopengl:5
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtsql:5
-		dev-qt/qtwidgets:5
-	)
-	qt6? (
-		!qt5? (
-			dev-qt/qtbase:6[gui,opengl,sql,widgets]
-			dev-qt/qtdeclarative:6[opengl]
-			dev-qt/qtshadertools:6
-			x11-libs/libxkbcommon
-		)
-	)
-	sdl? ( media-libs/libsdl2 )
-	rendering? (
-		media-libs/glew:=
-		virtual/opengl
-		x11-libs/gl2ps
-		x11-libs/libICE
-		x11-libs/libXcursor
-		x11-libs/libXext
-	)
-	tbb? ( dev-cpp/tbb:= )
-	tk? ( dev-lang/tk:= )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	views? (
-		x11-libs/libICE
-		x11-libs/libXext
-	)
-	web? ( ${WEBAPP_DEPEND} )
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-cpp/cli11
-	dev-cpp/eigen
-	dev-cpp/nlohmann_json
-	>=dev-libs/pegtl-3
-	dev-libs/utfcpp
-	test? (
-		media-libs/glew
-		x11-libs/libXcursor
-		rendering? ( media-libs/freeglut )
-	)
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.2.5-pegtl-3.x.patch"
-	"${FILESDIR}/${PN}-9.3.0-pdal-2.6.0.patch"
-	"${FILESDIR}/${PN}-9.3.0-too-many-initializer-values.patch"
-	"${FILESDIR}/${PN}-9.3.0-java.patch"
-	"${FILESDIR}/${PN}-9.3.0-opencascade.patch"
-	"${FILESDIR}/${PN}-9.3.0-fix-Java-error-with-integer-enum-overloads.patch"
-	"${FILESDIR}/${PN}-9.3.0-ThrustPatches.patch"
-	"${FILESDIR}/${PN}-9.3.0-core-octree_node.txx.patch"
-	"${FILESDIR}/${PN}-9.3.0-ThirdParty-gcc15.patch"
-	"${FILESDIR}/${PN}-9.3.0-r1-expat-2.6.0.patch"
-)
-
-DOCS=( CONTRIBUTING.md README.md )
-
-vtk_check_reqs() {
-	local dsk=4096
-
-	dsk=$(( $(usex doc 3072 0) + dsk ))
-	dsk=$(( $(usex examples 3072 0) + dsk ))
-	dsk=$(( $(usex cuda 8192 0) + dsk ))
-	export CHECKREQS_DISK_BUILD=${dsk}M
-
-	# In case users are not aware of the extra NINJAOPTS, check
-	# for the more common MAKEOPTS, in case NINJAOPTS is empty
-	local jobs=1
-	if [[ -n "${NINJAOPTS}" ]]; then
-		jobs=$(makeopts_jobs "${NINJAOPTS}" "$(get_nproc)")
-	elif [[ -n "${MAKEOPTS}" ]]; then
-		jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	fi
-
-	if use cuda; then
-		local mem=$(( $(usex cuda 7168 0) ))
-		mem=$(( mem * $(( jobs > 4 ? 4 : jobs )) ))
-		export CHECKREQS_MEMORY=${mem}M
-	fi
-
-	"check-reqs_pkg_${EBUILD_PHASE}"
-}
-
-vtk_check_compiler() {
-	[[ -z "$1" ]] && die "no compiler specified"
-	local compiler="$1"
-	local package="sys-devel/${compiler}"
-	local version="${package}"
-	local CUDAHOSTCXX_test
-	while
-		CUDAHOSTCXX="${CUDAHOSTCXX_test}"
-		version=$(best_version "${version}")
-		if [[ -z "${version}" ]]; then
-			if [[ -z "${CUDAHOSTCXX}" ]]; then
-				die "could not find supported version of ${package}"
-			fi
-			break
-		fi
-		CUDAHOSTCXX_test="$(
-			dirname "$(
-				realpath "$(
-					which "${compiler}-$(echo "${version}" | grep -oP "(?<=${package}-)[0-9]*")"
-				)"
-			)"
-		)"
-		version="<${version}"
-	do ! echo "int main(){}" | nvcc "-ccbin=${CUDAHOSTCXX_test}" - -x cu &>/dev/null; done
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp
-
-	if [[ $(tc-is-gcc) && $(gcc-majorversion) = 11 ]] && use cuda ; then
-		# FIXME: better use eerror?
-		ewarn "GCC 11 is know to fail building with CUDA support in some cases."
-		ewarn "See bug #820593"
-	fi
-
-	use qt6 && use qt5 && ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!"
-
-	vtk_check_reqs
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp
-
-	if [[ $(tc-is-gcc) && $(gcc-majorversion) = 11 ]] && use cuda ; then
-		# FIXME: better use eerror?
-		ewarn "GCC 11 is know to fail building with CUDA support in some cases."
-		ewarn "See bug #820593"
-	fi
-
-	use qt6 && use qt5 && ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!"
-
-	vtk_check_reqs
-
-	use java && java-pkg-opt-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	use web && webapp_pkg_setup
-}
-
-# Note: The following libraries are marked as internal by kitware
-#	and can currently not unbundled:
-#	diy2, exodusII, fides, h5part, kissfft, loguru, verdict, vpic,
-#	vtkm, xdmf{2,3}, zfp
-# TODO: exprtk, ioss
-# Note: As of v9.2.2 we no longer drop bundled libraries, when using system
-# libraries. This just saves a little space. CMake logic of VTK on ThirdParty
-# libraries avoids automagic builds, so deletion is not needed to catch these.
-src_prepare() {
-	if use doc; then
-		einfo "Removing .md5 files from documents."
-		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
-		sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
-			-i Utilities/Doxygen/CMakeLists.txt || die
-	fi
-
-	if use opencascade && has_version ">=sci-libs/opencascade-7.8.0"; then
-		eapply "${FILESDIR}/vtk-9.3.0-opencascade-7.8.0.patch"
-	fi
-
-	cmake_src_prepare
-
-	if use test; then
-		ebegin "Copying data files to ${BUILD_DIR}"
-		mkdir -p "${BUILD_DIR}/ExternalData" || die
-		pushd "${BUILD_DIR}/ExternalData" >/dev/null || die
-		ln -sf "../../VTK-${MY_PV2}/.ExternalData/README.rst" . || die
-		ln -sf "../../VTK-${MY_PV2}/.ExternalData/SHA512" . || die
-		popd >/dev/null || die
-		eend "$?"
-	fi
-}
-
-# TODO: check these and consider to use them
-#	VTK_BUILD_SCALED_SOA_ARRAYS
-#	VTK_DISPATCH_{AOS,SOA,TYPED}_ARRAYS
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LICENSEDIR="share/${PN}/licenses"
-		-DVTK_DEBUG_MODULE=ON
-		-DVTK_DEBUG_MODULE_ALL=ON
-		-DVTK_IGNORE_CMAKE_CXX11_CHECKS=yes
-
-		-DVTK_ANDROID_BUILD=OFF
-		-DVTK_IOS_BUILD=OFF
-
-		-DVTK_BUILD_ALL_MODULES="$(usex all-modules)"
-		# we use the pre-built documentation and install these with USE=doc
-		-DVTK_BUILD_DOCUMENTATION=OFF
-		-DVTK_BUILD_EXAMPLES="$(usex examples)"
-
-		# no package in the tree: https://github.com/LLNL/conduit
-		-DVTK_ENABLE_CATALYST=OFF
-		-DVTK_ENABLE_KITS=OFF
-		-DVTK_ENABLE_LOGGING="$(usex logging)"
-		# defaults to ON: USE flag for this?
-		-DVTK_ENABLE_REMOTE_MODULES=OFF
-
-		# disable fetching files during build
-		-DVTK_FORBID_DOWNLOADS=OFF
-
-		-DVTK_GROUP_ENABLE_Imaging="$(usex imaging "YES" "NO")"
-		-DVTK_GROUP_ENABLE_Rendering="$(usex rendering "YES" "NO")"
-		-DVTK_GROUP_ENABLE_StandAlone="YES"
-		-DVTK_GROUP_ENABLE_Views="$(usex views "YES" "NO")"
-		-DVTK_GROUP_ENABLE_Web="$(usex web "YES" "NO")"
-
-		-DVTK_INSTALL_SDK=ON
-
-		-DVTK_MODULE_ENABLE_VTK_IOCGNSReader="YES"
-		-DVTK_MODULE_ENABLE_VTK_IOExportPDF="YES"
-		-DVTK_MODULE_ENABLE_VTK_IOLAS="$(usex las "YES" "NO")"
-		-DVTK_MODULE_ENABLE_VTK_IONetCDF="YES"
-		-DVTK_MODULE_ENABLE_VTK_IOOCCT="$(usex opencascade "YES" "NO")"
-		-DVTK_MODULE_ENABLE_VTK_IOOggTheora="YES"
-		-DVTK_MODULE_ENABLE_VTK_IOOpenVDB="$(usex openvdb "YES" "NO")"
-		-DVTK_MODULE_ENABLE_VTK_IOSQL="YES" # sqlite
-		-DVTK_MODULE_ENABLE_VTK_IOPDAL="$(usex pdal "YES" "NO")"
-		-DVTK_MODULE_ENABLE_VTK_IOXML="YES"
-		-DVTK_MODULE_ENABLE_VTK_IOXMLParser="YES"
-		-DVTK_MODULE_ENABLE_VTK_RenderingFreeType="$(usex freetype "YES" "NO")"
-		-DVTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig="$(usex freetype "YES" "NO")"
-		-DVTK_MODULE_ENABLE_VTK_cgns="YES"
-		-DVTK_MODULE_ENABLE_VTK_doubleconversion="YES"
-		-DVTK_MODULE_ENABLE_VTK_eigen="YES"
-		-DVTK_MODULE_ENABLE_VTK_expat="YES"
-		-DVTK_MODULE_ENABLE_VTK_fmt="YES"
-		-DVTK_MODULE_ENABLE_VTK_freetype="YES"
-		-DVTK_MODULE_ENABLE_VTK_hdf5="YES"
-		-DVTK_MODULE_ENABLE_VTK_jpeg="YES"
-		-DVTK_MODULE_ENABLE_VTK_jsoncpp="YES"
-		-DVTK_MODULE_ENABLE_VTK_libharu="YES"
-		-DVTK_MODULE_ENABLE_VTK_libproj="YES"
-		-DVTK_MODULE_ENABLE_VTK_libxml2="YES"
-		-DVTK_MODULE_ENABLE_VTK_lz4="YES"
-		-DVTK_MODULE_ENABLE_VTK_lzma="YES"
-		-DVTK_MODULE_ENABLE_VTK_netcdf="YES"
-		-DVTK_MODULE_ENABLE_VTK_nlohmannjson="YES"
-		-DVTK_MODULE_ENABLE_VTK_ogg="YES"
-		-DVTK_MODULE_ENABLE_VTK_pegtl="YES"
-		-DVTK_MODULE_ENABLE_VTK_png="YES"
-		-DVTK_MODULE_ENABLE_VTK_pugixml="YES"
-		-DVTK_MODULE_ENABLE_VTK_sqlite="YES"
-		-DVTK_MODULE_ENABLE_VTK_theora="YES"
-		-DVTK_MODULE_ENABLE_VTK_tiff="YES"
-		-DVTK_MODULE_ENABLE_VTK_utf8="YES"
-		-DVTK_MODULE_ENABLE_VTK_vtkvtkm="$(usex vtkm "YES" "NO")"
-		-DVTK_MODULE_ENABLE_VTK_zlib="YES"
-
-		# not packaged in Gentoo
-		-DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF
-		-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-		-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
-		-DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
-
-		-DVTK_RELOCATABLE_INSTALL=ON
-
-		-DVTK_SMP_ENABLE_OPENMP="$(usex openmp)"
-		-DVTK_SMP_ENABLE_STDTHREAD="$(usex threads)"
-		-DVTK_SMP_ENABLE_TBB="$(usex tbb)"
-
-		-DVTK_UNIFIED_INSTALL_TREE=ON
-
-		-DVTK_USE_CUDA="$(usex cuda)"
-		# use system libraries where possible
-		-DVTK_USE_EXTERNAL=ON
-		# avoid finding package from either ::guru or ::sci
-		-DVTK_USE_MEMKIND=OFF
-		-DVTK_USE_MPI="$(usex mpi)"
-		-DVTK_USE_TK="$(usex tk)"
-		-DVTK_USE_X=ON
-
-		-DVTK_WHEEL_BUILD=OFF
-
-		-DVTK_WRAP_JAVA="$(usex java)"
-		-DVTK_WRAP_PYTHON="$(usex python)"
-	)
-
-	if use all-modules; then
-		mycmakeargs+=(
-			# no package in ::gentoo
-			-DVTK_ENABLE_OSPRAY=OFF
-			# TODO: some of these are tied to the VTK_ENABLE_REMOTE_MODULES
-			# option. Check whether we can download them clean and enable
-			# them.
-			-DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy="NO"
-			-DVTK_MODULE_ENABLE_VTK_fides="NO"
-			-DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS="NO"
-			-DVTK_MODULE_ENABLE_VTK_IOADIOS2="NO"
-			-DVTK_MODULE_ENABLE_VTK_IOFides="NO"
-
-			-DVTK_MODULE_ENABLE_VTK_RenderingOpenVR="NO"
-			-DVTK_MODULE_ENABLE_VTK_RenderingOpenXR="NO"
-
-			-DVTK_MODULE_USE_EXTERNAL_VTK_cli11="YES"
-		)
-	fi
-
-	if use boost; then
-		mycmakeargs+=(
-			-DVTK_MODULE_ENABLE_VTK_InfovisBoost="YES"
-			-DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms="YES"
-		)
-	fi
-
-	if use cuda; then
-		cuda_add_sandbox -w
-		tc-is-gcc && vtk_check_compiler "gcc"
-		tc-is-clang && vtk_check_compiler "clang"
-		[[ -z "${CUDAARCHS}" ]] && einfo "trying to determine host CUDAARCHS"
-		: "${CUDAARCHS:=$(__nvcc_device_query)}"
-		einfo "building for CUDAARCHS = ${CUDAARCHS}"
-
-		export CUDAARCHS
-		export CUDAHOSTCXX
-		unset NVCCFLAGS
-	fi
-
-	if use debug; then
-		mycmakeargs+=(
-			-DVTK_DEBUG_LEAKS=ON
-			-DVTK_DEBUG_MODULE=ON
-			-DVTK_DEBUG_MODULE_ALL=ON
-			-DVTK_ENABLE_SANITIZER=ON
-			-DVTK_EXTRA_COMPILER_WARNINGS=ON
-			-DVTK_WARN_ON_DISPATCH_FAILURE=ON
-		)
-		if use rendering; then
-			mycmakeargs+=( -DVTK_OPENGL_ENABLE_STREAM_ANNOTATIONS=ON )
-		fi
-	fi
-
-	if use examples || use test; then
-		mycmakeargs+=( -DVTK_USE_LARGE_DATA=ON )
-	fi
-
-	if use ffmpeg; then
-		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOFFMPEG="YES" )
-		if use rendering; then
-			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingFFMPEGOpenGL2="YES" )
-		fi
-	fi
-
-	if use gdal; then
-		mycmakeargs+=(
-			-DVTK_MODULE_ENABLE_VTK_GeovisGDAL="YES"
-			-DVTK_MODULE_ENABLE_VTK_IOGDAL="YES"
-			-DVTK_MODULE_ENABLE_VTK_IOGeoJSON="YES"
-		)
-	fi
-
-	if use imaging; then
-		mycmakeargs+=(
-			-DVTK_MODULE_ENABLE_VTK_ImagingColor="YES"
-			-DVTK_MODULE_ENABLE_VTK_ImagingCore="YES"
-			-DVTK_MODULE_ENABLE_VTK_ImagingFourier="YES"
-			-DVTK_MODULE_ENABLE_VTK_ImagingGeneral="YES"
-			-DVTK_MODULE_ENABLE_VTK_ImagingHybrid="YES"
-			-DVTK_MODULE_ENABLE_VTK_ImagingMath="YES"
-			-DVTK_MODULE_ENABLE_VTK_ImagingMorphological="YES"
-			-DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2="YES"
-			-DVTK_MODULE_ENABLE_VTK_ImagingSources="YES"
-			-DVTK_MODULE_ENABLE_VTK_ImagingStatistics="YES"
-			-DVTK_MODULE_ENABLE_VTK_ImagingStencil="YES"
-		)
-		use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingImage="YES" )
-	fi
-
-	if ! use java && ! use python; then
-		# defaults to ON
-		mycmakeargs+=( -DVTK_ENABLE_WRAPPING=OFF )
-	fi
-
-	if use java; then
-		export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
-		mycmakeargs+=(
-			-DCMAKE_INSTALL_JARDIR="share/${PN}"
-			-DVTK_ENABLE_WRAPPING=ON
-			-DVTK_MODULE_ENABLE_VTK_Java="YES"
-			-DVTK_JAVA_SOURCE_VERSION="$(java-config -g PROVIDES_VERSION)"
-			-DVTK_JAVA_TARGET_VERSION="$(java-config -g PROVIDES_VERSION)"
-		)
-	fi
-
-	if use mpi; then
-		mycmakeargs+=(
-			-DVTK_GROUP_ENABLE_MPI="YES"
-			-DVTK_MODULE_ENABLE_VTK_IOH5part="YES"
-			-DVTK_MODULE_ENABLE_VTK_IOMPIParallel="YES"
-			-DVTK_MODULE_ENABLE_VTK_IOParallel="YES"
-			-DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="YES"
-			-DVTK_MODULE_ENABLE_VTK_IOParallelXML="YES"
-			-DVTK_MODULE_ENABLE_VTK_ParallelMPI="YES"
-			-DVTK_MODULE_ENABLE_VTK_h5part="YES"
-			-DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
-		)
-		use imaging && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMPIImage="YES" )
-		use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py="YES" )
-		if use rendering; then
-			mycmakeargs+=(
-				-DVTK_MODULE_ENABLE_VTK_RenderingParallel="YES"
-				-DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC="YES"
-			)
-		fi
-		use vtkm && mycmakeargs+=( -DVTKm_ENABLE_MPI=ON )
-	else
-		mycmakeargs+=( -DVTK_GROUP_ENABLE_MPI="NO" )
-	fi
-
-	use mysql && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMySQL="YES" )
-	use odbc && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOODBC="YES" )
-	use openvdb && mycmakeargs+=( -DOpenVDB_CMAKE_PATH="${ESYSROOT}/usr/$(get_libdir)/cmake/OpenVDB" )
-	use postgres && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOPostgreSQL="YES" )
-
-	if use python; then
-		mycmakeargs+=(
-			-DPython3_EXECUTABLE="${PYTHON}"
-			-DVTK_ENABLE_WRAPPING=ON
-			-DVTK_MODULE_ENABLE_VTK_Python="YES"
-			-DVTK_MODULE_ENABLE_VTK_PythonInterpreter="YES"
-			-DVTK_MODULE_ENABLE_VTK_WrappingPythonCore="YES"
-			-DVTK_PYTHON_OPTIONAL_LINK="OFF"
-			-DVTK_PYTHON_SITE_PACKAGES_SUFFIX="lib/${EPYTHON}/site-packages"
-		)
-		use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_PythonContext2D="YES" )
-	fi
-
-	if use qt5; then
-		# prefer Qt5: https://wiki.gentoo.org/wiki/Project:qt/Policies
-		mycmakeargs+=(
-			-DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml"
-			-DVTK_QT_VERSION="5"
-		)
-		has_version "dev-qt/qtopengl:5[gles2-only]" || use gles2-only && mycmakeargs+=(
-			# Force using EGL & GLES
-			-DVTK_OPENGL_HAS_EGL=ON
-			-DVTK_OPENGL_USE_GLES=ON
-		)
-	elif use qt6; then
-		mycmakeargs+=(
-			-DCMAKE_INSTALL_QMLDIR="${EPFREIX}/usr/$(get_libdir)/qt6/qml"
-			-DVTK_QT_VERSION="6"
-		)
-		has_version "dev-qt/qtbase:6[gles2-only]" || use gles2-only && mycmakeargs+=(
-			# Force using EGL & GLES
-			-DVTK_OPENGL_HAS_EGL=ON
-			-DVTK_OPENGL_USE_GLES=ON
-		)
-	else
-		mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt="NO" )
-	fi
-
-	if use qt5 || use qt6; then
-		mycmakeargs+=(
-			-DVTK_GROUP_ENABLE_Qt:STRING="YES"
-			-DVTK_MODULE_ENABLE_VTK_GUISupportQt="YES"
-			-DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick="YES"
-		)
-		if use mysql || use postgres; then
-			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="YES" )
-		fi
-		if use rendering; then
-			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingQt="YES" )
-		fi
-		if use views; then
-			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsQt="YES" )
-		fi
-	fi
-
-	if use rendering; then
-		mycmakeargs+=(
-			-DVTK_ENABLE_OSPRAY=OFF
-
-			-DVTK_MODULE_ENABLE_VTK_IOExportGL2PS="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingAnnotation="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingContext2D="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingCore="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingExternal="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingHyperTreeGrid="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingLOD="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingLabel="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingOpenGL2="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingRayTracing="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingSceneGraph="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingUI="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingVolume="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2="YES"
-			-DVTK_MODULE_ENABLE_VTK_RenderingZSpace="NO"
-			-DVTK_MODULE_ENABLE_VTK_gl2ps="YES"
-			-DVTK_MODULE_ENABLE_VTK_glew="YES"
-			-DVTK_MODULE_ENABLE_VTK_opengl="YES"
-
-			-DVTK_USE_SDL2="$(usex sdl "YES" "NO")"
-		)
-		use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib="YES" )
-		use tk && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingTk="YES" )
-		use views && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsContext2D="YES" )
-		use web && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingVtkJS="YES" )
-	fi
-
-	# Testing has been changed in 9.2.5: it is now allowed without
-	# requiring to download, if the data files are available locally!
-	if use test; then
-		mycmakeargs+=(
-			-DVTK_BUILD_TESTING=ON
-			# disable fetching data files for the default 'all' target
-			-DVTK_DATA_EXCLUDE_FROM_ALL=OFF
-
-			# requested even if all use flags are off
-			-DVTK_MODULE_ENABLE_VTK_octree="YES"
-			-DVTK_MODULE_ENABLE_VTK_ViewsCore="YES"
-
-			-DVTK_MODULE_USE_EXTERNAL_VTK_cli11="YES"
-		)
-	else
-		mycmakeargs+=( -DVTK_BUILD_TESTING=OFF )
-	fi
-
-	# FIXME: upstream provides 4 threading models, as of 9.1.0. These are
-	# sequential, stdthread, openmp and tbb. AFAICS all of them can be
-	# enabled at the same time. Sequential and STDThread are enabled by
-	# default. The default selected type for the build is sequential.
-	# Assuming sequential < STDThread < openmp < tbb wrt speed, although
-	# this is dependent on the actual scenario where threading is used.
-	if use tbb; then
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" )
-	elif use openmp; then # FIXME doesn't work with clang
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="OpenMP" )
-	elif use threads; then
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="STDThread" )
-	else
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" )
-	fi
-
-	use tk && mycmakeargs+=( -DVTK_GROUP_ENABLE_Tk="YES" )
-
-	if use views; then
-		mycmakeargs+=(
-			-DVTK_MODULE_ENABLE_VTK_ViewsCore="YES"
-			-DVTK_MODULE_ENABLE_VTK_ViewsInfovis="YES"
-		)
-	fi
-
-	if use vtkm; then
-		mycmakeargs+=(
-			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore="YES"
-			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel="YES"
-			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters="YES"
-
-			-DVTKm_NO_INSTALL_README_LICENSE=ON # bug #793221
-			-DVTKm_Vectorization=native
-		)
-	fi
-
-	if use web; then
-		mycmakeargs+=(
-			-DVTK_MODULE_ENABLE_VTK_WebCore="YES"
-			-DVTK_MODULE_ENABLE_VTK_WebGLExporter="YES"
-		)
-		use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_WebPython="YES" )
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	use test && cmake_build VTKData
-	cmake_src_compile
-}
-
-src_test() {
-	if use cuda; then
-		cuda_add_sandbox -w
-	fi
-
-	# don't work at all
-	REALLY_BAD_TESTS=(
-		"VTK::RenderingRayTracing-HeaderTest$" # (Failed)                                                          #   82
-		"VTK::RenderingFreeTypeFontConfigCxx-TestSystemFontRendering$" # (Failed)                                  #  309
-		"VTK::IOMPIParallelPython-MPI-Plot3DMPIIO$" # (Failed)                                                     #  376
-		"VTK::IOExportPDFCxx-TestPDFTransformedText-VerifyRasterizedPDFPNG$" # (Failed)                            #  483
-		# "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster$" # (Failed)                                          #  494
-		# "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPNG$" # (Failed)                      #  518
-		# "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPDFPNG$" # (Failed)                   #  519
-		"VTK::GUISupportQtQuickCxx-TestQQuickVTKRenderItem$" # (Failed)                                            #  732
-		"VTK::GUISupportQtQuickCxx-TestQQuickVTKRenderItemWidget$" # (Failed)                                      #  733
-		"VTK::GUISupportQtQuickCxx-TestQQuickVTKRenderWindow$" # (Failed)                                          #  734
-		"VTK::FiltersSelectionCxx-TestLinearSelector3D$" # (Failed)                                                # 1102
-		"VTK::FiltersParallelDIY2Cxx-MPI-TestProbeLineFilter$" # (Failed)                                          # 1180
-		"VTK::FiltersFlowPathsCxx-TestEvenlySpacedStreamlines2D$" # (Failed)                                       # 1215
-		"VTK::ChartsCoreCxx-TestChartDoubleColors$" # (Failed)                                                     # 1555
-		"VTK::ChartsCoreCxx-TestChartDoubleColorsOpaque$" # (Failed)                                               # 1556
-		"VTK::ChartsCoreCxx-TestParallelCoordinatesDouble$" # (Failed)                                             # 1599
-		"VTK::AcceleratorsVTKmFiltersCxx-TestVTKMExternalFaces$" # (Failed)                                        # 2142
-		"VTK::AcceleratorsVTKmFiltersCxx-TestVTKMHistogram$" # (Failed)                                            # 2146
-		"VTK::AcceleratorsVTKmFiltersCxx-TestVTKMMarchingCubes$" # (Failed)                                        # 2148
-		"VTK::AcceleratorsVTKmFiltersCxx-TestVTKMMarchingCubes2$" # (Failed)                                       # 2149
-		"VTK::FiltersGeneralCxx-TestContourTriangulatorHoles$" # (Failed)                                          # 2305
-		"VTK::FiltersCoreCxx-TestDecimatePolylineFilter$" # (Failed)                                               # 2497
-		"VTK::FiltersCorePython-TestSphereTreeFilter$" # (Failed)                                                  # 2617
-		"VTK::CommonDataModelCxx-TestTriangle$" # (Failed)                                                         # 2770
-		"VTK::CommonDataModelCxx-UnitTestCells$" # (Failed)                                                        # 2793
-		"VTK::CommonDataModelCxx-TestHyperTreeGridGeometricLocator$" # (Failed)                                    # 2799
-	)
-
-	# don't work in src_test but when on their own
-	BAD_TESTS=(
-		"VTK::IOMotionFXCxx-TestMotionFXCFGReaderPositionFile$" # (Subprocess aborted)                             #  374
-
-		# "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-RasterizePNG$" # (Not Run)                            #  517
-
-		"VTK::FiltersParallelDIY2Cxx-MPI-TestGhostCellsGenerator$" # (Timeout)                                     # 1173
-		"VTK::FiltersParallelDIY2Cxx-MPI-TestRedistributeDataSetFilterOnIOSS$" # (Timeout)                         # 1185
-		"VTK::FiltersParallelDIY2Cxx-TestOverlappingCellsDetector$" # (Timeout)                                    # 1193
-		"VTK::FiltersParallelDIY2Cxx-TestRedistributeDataSetFilter$" # (Timeout)                                   # 1196
-		"VTK::FiltersParallelDIY2Cxx-TestRedistributeDataSetFilterOnIOSS$" # (Timeout)                             # 1197
-		"VTK::FiltersParallelDIY2Cxx-TestRedistributeDataSetFilterWithPolyData$" # (Timeout)                       # 1198
-		"VTK::CommonCoreCxx-TestSMP$"                                                                              # 2945
-
-		# "VTK::IOMovieCxx-TestAVIWriter$" # (Skipped)                                                               #  470
-		# "VTK::IOMovieCxx-TestMP4Writer$" # (Skipped)                                                               #  471
-
-		"VTK::RenderingMatplotlibCxx-TestContextMathTextImage$" # (NUMERICAL)                                      #  243
-		"VTK::RenderingMatplotlibCxx-TestMathTextActor$" # (NUMERICAL)                                             #  244
-		"VTK::RenderingMatplotlibCxx-TestMathTextActor3D$" # (NUMERICAL)                                           #  245
-		"VTK::RenderingMatplotlibCxx-TestRenderString$" # (NUMERICAL)                                              #  246
-		"VTK::RenderingMatplotlibCxx-TestStringToPath$" # (NUMERICAL)                                              #  247
-		"VTK::RenderingMatplotlibCxx-TestIndexedLookupScalarBar$" # (NUMERICAL)                                    #  248
-		"VTK::RenderingMatplotlibCxx-TestScalarBarCombinatorics$" # (NUMERICAL)                                    #  249
-		"VTK::RenderingLICOpenGL2Cxx-TestImageDataLIC2D$" # (NUMERICAL)                                            #  266
-		"VTK::RenderingLICOpenGL2Cxx-TestStructuredGridLIC2DXSlice$" # (NUMERICAL)                                 #  267
-		"VTK::RenderingLICOpenGL2Cxx-TestStructuredGridLIC2DYSlice$" # (NUMERICAL)                                 #  268
-		"VTK::RenderingLICOpenGL2Cxx-TestStructuredGridLIC2DZSlice$" # (NUMERICAL)                                 #  269
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedDefaults$" # (NUMERICAL)                                      #  270
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedBlended$" # (NUMERICAL)                       #  271
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMapped$" # (NUMERICAL)                        #  272
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedEnhancedVectorNormalizeOff$" # (NUMERICAL)                    #  273
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedBlendedSmallGrain$" # (NUMERICAL)             #  274
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallGrain$" # (NUMERICAL)              #  275
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallVectorNormalizeOff$" # (NUMERICAL) #  276
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedDefaultsColor$" # (NUMERICAL)                                 #  277
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrain$" # (NUMERICAL)        #  278
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrain$" # (NUMERICAL)         #  279
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrainMask$" # (NUMERICAL)    #  280
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrainMask$" # (NUMERICAL)     #  281
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedSmallGrainMask$" # (NUMERICAL)                #  282
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarDefaults$" # (NUMERICAL)                                      #  283
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarContrastEnhanced$" # (NUMERICAL)                              #  284
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOff$" # (NUMERICAL)                            #  285
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainUniform$" # (NUMERICAL)          #  286
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainPerlin$" # (NUMERICAL)           #  287
-		"VTK::RenderingLICOpenGL2Cxx-SurfaceLICMultiBlockContrastEnhancedPerlin$" # (NUMERICAL)                    #  288
-		"VTK::RenderingExternalCxx-TestGLUTRenderWindow$" # (Failed)                                               #  311
-		"VTK::ImagingOpenGL2Cxx-TestOpenGLImageGradient$" # (NUMERICAL)                                            #  722
-		# "VTK::InteractionWidgetsCxx-TestPickingManagerSeedWidget$" # (Timeout)                                     #  838
-		"VTK::InteractionWidgetsCxx-TestResliceCursorWidget2$" # (Failed)                                          #  847
-		"VTK::InteractionWidgetsCxx-TestResliceCursorWidget3$" # (Failed)                                          #  848
-		"VTK::InteractionWidgetsPython-TestTensorWidget2$" # (Failed)                                              #  919
-		# "VTK::FiltersModelingPython-TestCookieCutter4$" # (Timeout)                                                # 1319
-		"VTK::RenderingOpenGL2Cxx-TestGlyph3DMapperPickability$" # (Failed)                                        # 1404
-		"VTK::RenderingCoreCxx-TestTextureRGBADepthPeeling$" # (Failed)                                            # 2020
-		"VTK::AcceleratorsVTKmFiltersCxx-TestVTKMCleanGrid$" # (NUMERICAL)                                         # 2138
-		"VTK::AcceleratorsVTKmFiltersCxx-TestVTKMClip$" # (NUMERICAL)                                              # 2140
-		"VTK::AcceleratorsVTKmFiltersCxx-TestVTKMClipWithImplicitFunction$" # (NUMERICAL)                          # 2141
-		"VTK::AcceleratorsVTKmFiltersCxx-TestVTKMExtractVOI$" # (NUMERICAL)                                        # 2143
-		"VTK::AcceleratorsVTKmFiltersCxx-TestVTKMLevelOfDetail$" # (NUMERICAL)                                     # 2147
-		"VTK::AcceleratorsVTKmFiltersCxx-TestVTKMPointElevation$" # (NUMERICAL)                                    # 2152
-		"VTK::AcceleratorsVTKmFiltersCxx-TestVTKMPointTransform$" # (NUMERICAL)                                    # 2153
-		"VTK::AcceleratorsVTKmFiltersCxx-TestVTKMPolyDataNormals$" # (NUMERICAL)                                   # 2155
-		"VTK::AcceleratorsVTKmFiltersCxx-TestVTKMThreshold$" # (NUMERICAL)                                         # 2157
-		"VTK::AcceleratorsVTKmFiltersCxx-TestVTKMThreshold2$" # (NUMERICAL)                                        # 2158
-		"VTK::AcceleratorsVTKmFiltersCxx-TestVTKMTriangleMeshPointNormals$" # (NUMERICAL)                          # 2159
-		"VTK::AcceleratorsVTKmFiltersCxx-TestVTKMWarpScalar$" # (NUMERICAL)                                        # 2160
-		"VTK::AcceleratorsVTKmFiltersCxx-TestVTKMWarpVector$" # (NUMERICAL)                                        # 2161
-		"VTK::AcceleratorsVTKmCoreCxx-TestVTKMImplicitDataArray$" # (NUMERICAL)                                    # 2897
-	)
-
-	SEQUENTIAL_TESTS=(
-		# TODO requires die -n
-		# "VTK::IOExportGL2PSCxx-.*$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSBillboardTextActor3D$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSContext$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSLabeledDataMapper$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSScalarBar$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSTextActor3D$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSTextActor$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSTextMapper$"
-		"VTK::IOExportGL2PSCxx-TestStackedPlotGL2PS$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSExporterMultipleRenderers$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSExporterRaster$"
-		# "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster$" # (Failed)                                          #  494
-		"VTK::IOExportGL2PSCxx-TestGL2PSBillboardTextActor3D-RasterizePNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSBillboardTextActor3D-VerifyRasterizedPNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSContext-RasterizePNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSContext-VerifyRasterizedPNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSLabeledDataMapper-RasterizePNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSLabeledDataMapper-VerifyRasterizedPNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSScalarBar-RasterizePNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSScalarBar-VerifyRasterizedPNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSTextActor3D-RasterizePNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSTextActor3D-VerifyRasterizedPNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSTextActor-RasterizePNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSTextActor-VerifyRasterizedPNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSTextMapper-RasterizePNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSTextMapper-VerifyRasterizedPNG$"
-		"VTK::IOExportGL2PSCxx-TestStackedPlotGL2PS-RasterizePNG$"
-		"VTK::IOExportGL2PSCxx-TestStackedPlotGL2PS-VerifyRasterizedPNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSExporterMultipleRenderers-RasterizePNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSExporterMultipleRenderers-VerifyRasterizedPNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSExporterMultipleRenderers-VerifyRasterizedPDFPNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSExporterRaster-RasterizePNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSExporterRaster-VerifyRasterizedPNG$"
-		"VTK::IOExportGL2PSCxx-TestGL2PSExporterRaster-VerifyRasterizedPDFPNG$"
-		# "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-RasterizePNG$" # (Not Run)                            #  517
-		# "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPNG$" # (Failed)                      #  518
-		# "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPDFPNG$" # (Failed)                   #  519
-		"VTK::InteractionWidgetsCxx-TestPickingManagerSeedWidget$" # (Timeout)                                     #  838
-		"VTK::FiltersModelingPython-TestCookieCutter4$" # (Timeout)                                                # 1319
-	)
-
-	CMAKE_SKIP_TESTS=(
-		"${BAD_TESTS[@]}"
-		"${REALLY_BAD_TESTS[@]}"
-		"${SEQUENTIAL_TESTS[@]}"
-	)
-
-	virtx cmake_src_test
-	unset CMAKE_SKIP_TESTS
-
-	myctestargs=(
-		-R "($( IFS='|'; echo "${SEQUENTIAL_TESTS[*]}"))"
-		-j1
-	)
-	# TODO requires die -n
-	# nonfatal \
-		virtx cmake_src_test || einfo "These tests are known to fail"
-
-	# TODO requires die -n
-	# myctestargs=(
-	# 	-R "($( IFS='|'; echo "${REALLY_BAD_TESTS[*]}"))"
-	# 	--timeout 600
-	# )
-	# nonfatal \
-	# 	virtx cmake_src_test || einfo "These tests are known to fail"
-
-	# TODO requires die -n
-	# myctestargs=(
-	# 	-R "($( IFS='|'; echo "${BAD_TESTS[*]}"))"
-	# 	--timeout 600
-	# )
-	# nonfatal \
-	# 	virtx cmake_src_test || einfo "These tests are known to only fail inside src_test"
-}
-
-src_install() {
-	use web && webapp_src_preinst
-
-	# Stop web page images from being compressed
-	if use doc; then
-		HTML_DOCS=( "${WORKDIR}/html/." )
-	fi
-
-	cmake_src_install
-
-	use java && java-pkg_regjar "${ED}/usr/share/${PN}/${PN}.jar"
-
-	# install examples
-	if use examples; then
-		einfo "Installing examples"
-		mv -v {E,e}xamples || die
-		dodoc -r examples
-		docompress -x "/usr/share/doc/${PF}/examples"
-
-		einfo "Installing datafiles"
-		insinto "/usr/share/${PN}/data"
-		doins -r "${S}/.ExternalData"
-	fi
-
-	use python && python_optimize
-
-	use web && webapp_src_install
-}
-
-# webapp.eclass exports these but we want it optional #534036
-pkg_postinst() {
-	use web && webapp_pkg_postinst
-
-	if use examples; then
-		einfo "You can get more and updated examples at"
-		einfo "https://kitware.github.io/vtk-examples/site/"
-	fi
-}
-
-pkg_prerm() {
-	use web && webapp_pkg_prerm
-}
diff --git a/sci-libs/vtk/vtk-9.3.1.ebuild b/sci-libs/vtk/vtk-9.3.1.ebuild
index 62f33476fe4f..da39cbc90cfc 100644
--- a/sci-libs/vtk/vtk-9.3.1.ebuild
+++ b/sci-libs/vtk/vtk-9.3.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
@@ -37,7 +37,7 @@ S="${WORKDIR}/VTK-${PV}"
 
 LICENSE="BSD LGPL-2"
 SLOT="0/${MY_PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 # TODO: Like to simplify these. Mostly the flags related to Groups.
 IUSE="all-modules boost +cgns cuda debug doc examples ffmpeg gdal gles2-only imaging
@@ -86,7 +86,10 @@ RDEPEND="
 	sci-libs/proj:=
 	sys-libs/zlib
 	boost? ( dev-libs/boost:=[mpi?] )
-	cgns? ( >=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=] )
+	cgns? (
+		>=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=]
+		sci-libs/hdf5[cxx]
+	)
 	cuda? ( dev-util/nvidia-cuda-toolkit:= )
 	ffmpeg? ( media-video/ffmpeg:= )
 	gdal? ( sci-libs/gdal:= )
diff --git a/sci-mathematics/gfan/files/gfan-0.6.2-xcode9.3_compat.patch b/sci-mathematics/gfan/files/gfan-0.6.2-xcode9.3_compat.patch
deleted file mode 100644
index 83f4b66f8239..000000000000
--- a/sci-mathematics/gfan/files/gfan-0.6.2-xcode9.3_compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/app_main.cpp b/src/app_main.cpp
-index a33c042..e7ade81 100644
---- a/src/app_main.cpp
-+++ b/src/app_main.cpp
-@@ -205,7 +205,7 @@ public:
-     }
- 
-     ep->close();
--    delete ep;//<--- In next release, make the class virtual
-+//    delete ep;//<--- In next release, make the class virtual # this is miscompiled clang@xcode-6.3
- 
-     printf("\n");
- 
diff --git a/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
deleted file mode 100644
index fe1b428750be..000000000000
--- a/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Compute Groebner fans and tropical varieties"
-HOMEPAGE="https://users-math.au.dk/~jensen/software/gfan/gfan.html"
-SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz"
-
-S="${WORKDIR}/${PN}${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-BDEPEND="doc? ( virtual/latex-base )"
-DEPEND="dev-libs/gmp:0=[cxx(+)]
-	sci-libs/cddlib:0="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.2-xcode9.3_compat.patch"
-	"${FILESDIR}/${PN}-0.6.2-testsuite.patch"
-	"${FILESDIR}/${PN}-0.6.2-Makefile.patch"
-	)
-
-pkg_setup() {
-	tc-export CC CXX
-
-	# This should really go in cppflags, but that doesn't work with
-	# gfan's hand-written Makefile.
-	append-cxxflags -DNOCDDPREFIX -I"${EPREFIX}"/usr/include/cddlib
-}
-
-src_prepare() {
-	default
-
-	# This test hangs on x86, bug 717112.
-	rm -r testsuite/0602ResultantFanProjection || \
-		die "unable to disable test 0602ResultantFanProjection"
-
-	# And this one fails (harmlessly) on x86, bug 818397.
-	rm -r testsuite/0009RenderStairCase || \
-		die "unable to disable test 0009RenderStairCase"
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/863044
-	# Only contact method is email. I have sent one detailing the issue.
-	filter-lto
-
-	# The upstream Makefile says that GCC produces bad code with -O3.
-	replace-flags "-O3" "-O2"
-	default
-}
-
-src_compile() {
-	default
-	if use doc; then
-		pushd doc > /dev/null || die
-		# The LaTeX build commands need to be repeated until the
-		# document "stops changing," which is not as easy as it
-		# sounds to detect. Running it twice seems to work here.
-		for iteration in 1 2; do
-			latex manual.tex && \
-				bibtex manual && \
-				dvipdf manual.dvi manual.pdf || die
-		done
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" install
-	use doc && dodoc doc/manual.pdf
-}
diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index 46e80c85d618..6ab71e7ab702 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -1,2 +1 @@
-DIST giac_1.9.0-29.tar.gz 115441843 BLAKE2B 9114db489be0c51d67c87b0a0c187fecf9eca84d7cb3117e72793290c8e606e76c3d9bc8a2d573fc2de2f2d885fb34d18583302a5902d69045976114ac02b95e SHA512 57b58aa35c724eae7df36229cb3d45d1b724a8a88acb1d1dd0711be64dd7c891850e7242662e448ce955e76b856973f9065628b65ce0826c60e277cb944b21b7
 DIST giac_1.9.0-995.tar.gz 128346387 BLAKE2B c275d2cad511b906a3822156bd05f83cd77265cf489da82b111973b0a80de7abd1875d0cf0116e34610aa20b5ea2cc36550950dbf1eb1a321db8c7145c789137 SHA512 7111a21df5efe1ef5f14dc744277e18f3e4701842d827da0f8d745e1bcec4c06b45e3306b7ed3c4affee59c5df2454643900eefe32d46019771e6bb07bc971d9
diff --git a/sci-mathematics/giac/files/giac-1.6.0-pari-2.11.patch b/sci-mathematics/giac/files/giac-1.6.0-pari-2.11.patch
deleted file mode 100644
index 24142257a340..000000000000
--- a/sci-mathematics/giac/files/giac-1.6.0-pari-2.11.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Change test output for PARI 2.11
-
-See https://trac.sagemath.org/ticket/25567
-and https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102
-
-diff -ru a/check/TP11-sol.cas.out1 b/check/TP11-sol.cas.out1
---- a/check/TP11-sol.cas.out1	2014-10-21 10:51:48.000000000 +0200
-+++ b/check/TP11-sol.cas.out1	2018-08-07 17:04:12.528052773 +0200
-@@ -10,7 +10,7 @@
- 1073741824000000000000000000061203284109000000000000000000000000008409,
- 2^3*3*389*733*156904374622257604823879982847602392900751802349981470895277241,
- "Done",
--matrix[[2,7,1],[3,2,1],[389,2,1],[733,2,1],[156904374622257604823879982847602392900751802349981470895277241,2,matrix[[2,13,1],[3,3,1],[5,2,1],[7,2,1],[56467,2,1],[6553084925887974620811527,2,matrix[[2,5,1],[19,2,1],[71,2,1],[126823,2,1]]]]]],
-+1,
- 0,
- [],
- 1,
diff --git a/sci-mathematics/giac/files/giac-1.9.0.995-dont-call-g++.patch b/sci-mathematics/giac/files/giac-1.9.0.995-dont-call-g++.patch
new file mode 100644
index 000000000000..d97be3b39002
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.9.0.995-dont-call-g++.patch
@@ -0,0 +1,29 @@
+From 7328ad0895add9acb91f28312c80770530c8be52 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 5 Jan 2025 08:13:35 -0500
+Subject: [PATCH] src/Makefile.am: delete mkjs rule
+
+There's a custom rule to build mkjs from mkjs.cc, and it hard-codes
+the compiler name (g++). But since building an executable from C++
+source is built-in to Make, we can just delete the rule to fix it.
+---
+ src/Makefile.am | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7524632..a6c4767 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -70,9 +70,6 @@ js.c: mkjs qjscalcjs.js xcasjs.js
+ js.h: mkjs qjscalcjs.js xcasjs.js
+ 	./mkjs
+ 
+-mkjs: mkjs.cc
+-	g++ mkjs.cc -o mkjs
+-
+ AM_CPPFLAGS = -DIN_GIAC -I$(srcdir) -I$(top_srcdir) -I$(builddir) \
+ 	      -I$(top_builddir) $(GMP_CFLAGS) $(NTL_CFLAGS) \
+ 	      $(COCOA_CFLAGS) $(PARI_CFLAGS)
+-- 
+2.45.2
+
diff --git a/sci-mathematics/giac/giac-1.9.0.29-r2.ebuild b/sci-mathematics/giac/giac-1.9.0.29-r2.ebuild
deleted file mode 100644
index 157b280018c3..000000000000
--- a/sci-mathematics/giac/giac-1.9.0.29-r2.ebuild
+++ /dev/null
@@ -1,172 +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 xdg-utils
-
-FETCH_P="${PN}_"$(ver_rs  3 '-')
-MY_PV=$(ver_cut 1-3)
-DESCRIPTION="A free C++ Computer Algebra System library and its interfaces"
-HOMEPAGE="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
-SRC_URI="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${FETCH_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-LANGS="el en es pt"
-IUSE="ao doc +ecm examples gc +glpk gui test"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-# nauty and cliquer are automagical dependencies
-RDEPEND="dev-libs/gmp:=[cxx(+)]
-	sys-libs/readline:=
-	gui? ( x11-libs/fltk:1=[opengl]
-		media-libs/libpng:= )
-	ao? ( media-libs/libao )
-	dev-libs/mpfr:=
-	sci-libs/mpfi
-	sci-libs/gsl:=
-	sci-mathematics/pari:=[threads]
-	dev-libs/ntl:=
-	virtual/lapack
-	virtual/blas
-	net-misc/curl
-	sci-mathematics/cliquer
-	sci-mathematics/nauty
-	ecm? ( sci-mathematics/gmp-ecm )
-	glpk? ( sci-mathematics/glpk )
-	gc? ( dev-libs/boehm-gc )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dev-tex/hevea
-	virtual/pkgconfig
-	app-alternatives/yacc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
-	"${FILESDIR}/${PN}-1.6.0-pari-2.11.patch"
-	"${FILESDIR}/${PN}-1.9.0.21-pari-2.15.patch"
-)
-
-REQUIRED_USE="test? ( gui )"
-
-# The mirror restriction is due to the French documentation for which
-# "Other kind of redistributions require the consent of the copyright
-# holder."
-RESTRICT="!test? ( test ) mirror"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++14 # bug 788283
-
-	if use gui; then
-		append-cppflags -I$(fltk-config --includedir)
-		append-lfs-flags
-
-		# Get the big-L flags from fltk's LDFLAGS.
-		append-ldflags $(fltk-config --ldflags | sed -e 's/\(-L\S*\)\s.*/\1/')
-	fi
-
-	# Using libsamplerate is currently broken
-	#
-	# The giac build system supports --docdir, but the path /usr/share/giac/doc
-	# is hard-coded throughout the source code, so passing anything else to
-	# ./configure --docdir just causes problems. Later, we'll put things right.
-	#
-	# micropython is for specific use in an upstream project, so is quickjs.
-	# Note that disabling fltk is not a real option. It just skip autodetection
-	# but doesn't disable compiling against fltk. png is needed as part of fltk
-	# support.
-	#
-	# As of 1.9.0.25, --{en,dis}able-gui is no op. The only way to disable gui is
-	# use the fltk enable flag.
-	econf \
-		--enable-gmpxx \
-		--disable-samplerate \
-		--disable-micropy \
-		--disable-quickjs \
-		--docdir="${EPREFIX}"/usr/share/giac/doc \
-		$(use_enable gui fltk)  \
-		$(use_enable gui png)  \
-		$(use_enable ao) \
-		$(use_enable ecm) \
-		$(use_enable glpk) \
-		$(use_enable gc)
-
-}
-
-src_install() {
-	docompress -x "/usr/share/doc/${PF}/"{aide_cas,doc,examples}
-	emake install DESTDIR="${D}"
-
-	# Move all of /usr/share/giac (which contains only documentation) to
-	# its /usr/share/doc/${PF} counterpart.
-	dodir /usr/share/doc
-	mv "${ED}"/usr/share/giac "${ED}/usr/share/doc/${PF}" || die
-
-	# and create a symlink from the original location to the new one
-	dosym "./doc/${PF}" /usr/share/giac
-
-	# This is duplicated in ${ED}/usr/share/doc/${PF}/examples
-	rm -r "${ED}/usr/share/doc/${PF}/doc/Exemples" || die
-
-	# These aren't supposed to be installed at all.
-	find "${ED}/usr/share/doc/${PF}" -type f -name 'Makefile*' -delete || die
-
-	# The French docs are not freely licensed according to the README.
-	rm -r "${ED}/usr/share/doc/${PF}/doc/fr" || die
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TROUBLES
-	if ! use gui; then
-		rm -rf \
-			"${ED}"/usr/bin/x* \
-			"${ED}"/usr/share/application-registry \
-			"${ED}"/usr/share/applications \
-			"${ED}"/usr/share/icons \
-			|| die "failed to clean up fltk files"
-	fi
-
-	if ! use doc; then
-		rm -r "${ED}/usr/share/doc/${PF}/doc" || die "failed to remove doc directory"
-	else
-		for lang in ${LANGS}; do
-			if use l10n_$lang; then
-				dosym ../aide_cas "/usr/share/doc/${PF}/doc/${lang}/aide_cas"
-			else
-				rm -r "${ED}/usr/share/giac/doc/${lang}" \
-					|| die "failed to remove ${lang} documentation"
-			fi
-		done
-	fi
-
-	if ! use examples; then
-		rm -r "${ED}/usr/share/doc/${PF}/examples" \
-		   || die "failed to remove examples"
-	fi
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}
diff --git a/sci-mathematics/giac/giac-1.9.0.995-r2.ebuild b/sci-mathematics/giac/giac-1.9.0.995-r2.ebuild
index a0a875aadaa6..7fade6bb9179 100644
--- a/sci-mathematics/giac/giac-1.9.0.995-r2.ebuild
+++ b/sci-mathematics/giac/giac-1.9.0.995-r2.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}/${PN}-${MY_PV}"
 LICENSE="GPL-3+"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LANGS="el en es pt"
 IUSE="ao doc +ecm examples gc +glpk gui test"
 for X in ${LANGS} ; do
@@ -60,6 +60,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.9.0.67-system-gl2ps.patch"
 	"${FILESDIR}/${P}-glibcxx-assertions.patch"
 	"${FILESDIR}/${P}-fix-undefined-behavior.patch"
+	"${FILESDIR}/${P}-dont-call-g++.patch"
 )
 
 REQUIRED_USE="test? ( gui )"
diff --git a/sci-mathematics/glpk/glpk-5.0-r1.ebuild b/sci-mathematics/glpk/glpk-5.0-r1.ebuild
deleted file mode 100644
index a0db9eee70b6..000000000000
--- a/sci-mathematics/glpk/glpk-5.0-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="GNU Linear Programming Kit"
-HOMEPAGE="https://www.gnu.org/software/glpk/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/40"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples gmp odbc mysql"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	sci-libs/amd:0=
-	sci-libs/colamd:=
-	sys-libs/zlib:0=
-	gmp? ( dev-libs/gmp:0= )
-	mysql? ( dev-db/mysql-connector-c )
-	odbc? (
-		|| (
-			dev-db/libiodbc:0
-			dev-db/unixODBC:0
-		)
-	)"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.65-fix-mysql-include-prefix.patch
-	"${FILESDIR}"/${PN}-4.65-debundle-system-libs.patch
-)
-
-src_prepare() {
-	# TODO: the ODBC library is dlopen()ed, so we only want to append
-	# -I<foo> to the preprocessor flags, and not all of the CFLAGS that
-	# were used to build libiodbc. That fix and the pkg-config fallback
-	# should be sent upstream, and placed into CPPFLAGS rather than
-	# CFLAGS (as configure.ac does now).
-	use odbc && [[ -z $(type -P odbc_config) ]] && \
-		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/863047
-	# https://lists.gnu.org/archive/html/bug-glpk/2022-08/msg00000.html
-	# No upstream response...
-	#
-	# Do not trust it to LTO either.
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	local myconf
-	if use mysql || use odbc; then
-		myconf="--enable-dl"
-	else
-		myconf="--disable-dl"
-	fi
-
-	econf ${myconf} \
-		--disable-static \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_with gmp)
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		# The top-level Makefile descends into the "examples" directory
-		# unconditionally, building a program and excreting build
-		# artifacts that we don't want to install. Note: this still
-		# leaves the example program /usr/bin/glpsol installed. An
-		# additional "emake ... uninstall" could probably take care
-		# of that if desired.
-		emake -C examples clean
-
-		# Installing the Makefiles for the examples does the user no
-		# good without the top-level Makefile.
-		rm examples/Makefile{.in,.am,} \
-			|| die "failed to remove example Makefiles"
-
-		insinto "/usr/share/doc/${PF}"
-		doins -r examples
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-
-	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-mathematics/glpk/glpk-5.0-r3.ebuild b/sci-mathematics/glpk/glpk-5.0-r3.ebuild
index 15451c216ae9..d9dd2e02a072 100644
--- a/sci-mathematics/glpk/glpk-5.0-r3.ebuild
+++ b/sci-mathematics/glpk/glpk-5.0-r3.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.gz"
 
 LICENSE="GPL-3"
 SLOT="0/40"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples gmp odbc mysql"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index d1dc414b4ea0..6010b6d91a85 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,2 +1,3 @@
 DIST ecm-7.0.5.tar.gz 1159568 BLAKE2B 7fb8d78a6bc8423c9890b9d6e334f8c4317b68cde7d712c5306775c6f07eacb3cbbbd11d651bbbdd687a87692f4920170557b51f9498881a6c5018a2ce0b1b7f SHA512 f5a482a231339304683adc3334c9b86f21a0d9b42ea871418d4c01005057d560cd418eddfcc1c7be7f8c249960b2ee612a1454ccc5d8e41319b06c6f42e6662e
+DIST ecm-7.0.6.tar.gz 971656 BLAKE2B 313197ea8a93e55eef82b24ff54b0f8661e4006ad8d9f3a43fbba0b04d3c5727f68595cb12dcf7e925650c141648294582bf99807145b862bbadce6ef28af827 SHA512 20d152055dda4020d2ccdcc93539a63b10140c63db4441a33a15f45c352e09e116fc1a400617065f2b49ae2f070da82708e22c79b41f709819b24c41d1258fff
 DIST gmp-ecm-7.0.6.tar.bz2 609323 BLAKE2B 30255322bd8e8d49393044bcc55fd05905cb5b6b374c5f2ea59fa9b02864b22fc2b6f14fda2271a4148a2ec361fd524551cafd136bbbdf025137ce101c776def SHA512 7ad262e78c59d33218e1d783ffa79114c04fe4ddac57e4059577aecebbfe3af975c2e1ba6049452c1c96488660ed79fcb546237966489fc2edc03bf7710495c0
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.6-r1.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.6-r1.ebuild
new file mode 100644
index 000000000000..aac9fb107188
--- /dev/null
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.6-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN="ecm"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Elliptic Curve Method for Integer Factorization"
+HOMEPAGE="https://gitlab.inria.fr/zimmerma/ecm"
+SRC_URI="https://gitlab.inria.fr/-/project/24244/uploads/ad3e5019fef98819ceae58b78f4cce93/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~ppc-macos ~x64-macos"
+IUSE="+custom-tune openmp cpu_flags_x86_sse2"
+
+DEPEND="dev-libs/gmp:="
+RDEPEND="${DEPEND}"
+
+# xsltproc is used to produce the manppage in combination with the
+# appropriate stylesheet
+BDEPEND="dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_compile() {
+	default
+	if use custom-tune; then
+		# One "emake" was needed to build the library. Now we can find
+		# the best set of parameters, and then run "emake" one more time
+		# to rebuild the library with the custom parameters. See the
+		# project's README or INSTALL-ecm. The build targets don't depend
+		# on ecm-params.h, so we need to "make clean" to force a rebuild.
+		emake ecm-params && emake clean && emake
+	fi
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable openmp) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable custom-tune asm-redc)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/lcalc/Manifest b/sci-mathematics/lcalc/Manifest
index 740ec007a556..067611668694 100644
--- a/sci-mathematics/lcalc/Manifest
+++ b/sci-mathematics/lcalc/Manifest
@@ -1 +1,2 @@
 DIST lcalc-2.0.5.tar.xz 830360 BLAKE2B 4a282de8548bc0b3d95fe079362ea98dd1397a1f0f7c4c61c6d2df8c5f95b9638aa628a25b138e6037520c69e56bfab635872115139caf3270d473e01276b980 SHA512 d3b7fa25dd3c2a8f88671076dfb5ab5e933be7feff24bbd160c92a476953f5553f9fb58f72c36b9c668929385084918fc3396e1a0bcc55de12ea8cb647c53929
+DIST lcalc-2.1.0.tar.xz 831000 BLAKE2B 2b48fbf488a95f96a8a33b778b5094da4a566e6c4d0b0dddbaad2fb1a33d70e34aed7dbb3b517dbb37622fd7978630ed50c0b342d1d5135588c565640a3dea05 SHA512 31f31f6877c47756bc5b6e91da3ecdbeec9131f7c99d046b7e186f743b0726dc1f257fa107e86e6ececabacbd16a61329aa058196f0e83ef7df517588ec7ff28
diff --git a/sci-mathematics/lcalc/lcalc-2.1.0.ebuild b/sci-mathematics/lcalc/lcalc-2.1.0.ebuild
new file mode 100644
index 000000000000..a39356808db6
--- /dev/null
+++ b/sci-mathematics/lcalc/lcalc-2.1.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="Command-line utility and library for L-function computations"
+HOMEPAGE="https://gitlab.com/sagemath/lcalc"
+SRC_URI="https://gitlab.com/-/project/12934202/uploads/679cb360a06a713233876cd6fa0ba2fa/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+# The subslot is the libLfunction soname major version
+SLOT="0/2"
+KEYWORDS="~amd64 ~riscv"
+
+# Omit USE=mpfr for now because it's broken upstream:
+#
+#   https://gitlab.com/sagemath/lcalc/-/issues/7
+#
+IUSE="+double double-double quad-double pari"
+REQUIRED_USE="^^ ( double double-double quad-double )"
+
+BDEPEND="dev-util/gengetopt"
+DEPEND="double-double? ( sci-libs/qd:= )
+	quad-double? ( sci-libs/qd:= )
+	pari? ( sci-mathematics/pari:= )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_with pari) \
+		  --enable-precision="$(usev double)$(usev double-double)$(usev quad-double)"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 1c695ff917f7..dcd97ace40ff 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1 +1,2 @@
 DIST pari-2.15.5.tar.gz 5186798 BLAKE2B b253c6d8ad38462e81852d7bb364d06a7cbaae7b085672653da8d9f91f0173cfdef8f537ebc7313b6484f610d43e10fb0547f5d920789b95c8d0027dd52e8312 SHA512 59b2ebed43176f1ee750146053644bffbf673b4b4810134bc39132665941152772afb7a9332b842fc64e5ab8d5747a872c1b8ff327d3bd5eedaa1591691fff13
+DIST pari-2.17.1.tar.gz 5325234 BLAKE2B a5d20e5c69235ae815291bef377c195888dcac9e802583ea91e88a16c4eed5f178dcea447524fbcb5b7ea9ef12bbccc6d665eaee582e1e7782b54ba256c56a87 SHA512 77211fe7282558058f69c69889be3f23f7a173939ae8f24897b3df9715eef1bf0378916537eca2a54198b6d0c1860d386db250efafafe936437dc8c1e3cb0253
diff --git a/sci-mathematics/pari/files/pari-2.17.1-gcc15-swap-conflict.patch b/sci-mathematics/pari/files/pari-2.17.1-gcc15-swap-conflict.patch
new file mode 100644
index 000000000000..7e26784cd91c
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.17.1-gcc15-swap-conflict.patch
@@ -0,0 +1,53 @@
+From 4cce8c7b9107053ffd1bb0d6510797dafd632151 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 12 Jan 2025 21:02:40 -0500
+Subject: [PATCH] src/graph/plotfltk.c: swap PARI and FLTK includes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+PARI defines a swap() macro that conflicts with the swap() function
+declared in some C++ headers used by FLTK. This can lead to build
+failures like
+
+  /usr/lib/gcc/x86_64-pc-linux-gnu/15/include/g++-v15/bits/alloc_traits.h
+  :1005:46:error: macro �swap’ requires 2 arguments, but only 1 given
+   1005 |                 __c.get_allocator()).swap(__c);
+        |                                              ^
+
+when using the forthcoming g++-15 to build PARI. Basically this fails
+because the macro is defined before the C++ headers are included. If
+we swap the includes, then the macro clobbers the function, but that's
+okay because PARI only expects the macro to be in scope.
+---
+ src/graph/plotfltk.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/graph/plotfltk.c b/src/graph/plotfltk.c
+index f81515d..e95275e 100644
+--- a/src/graph/plotfltk.c
++++ b/src/graph/plotfltk.c
+@@ -18,16 +18,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
+ //
+ //  Based on plotQt by Nils-Peter Skoruppa (www.countnumber.de)
+ /////////////////////////////////////////////////////////////////////////////
++#include <FL/Fl.H>
++#include <FL/Fl_Window.H>
++#include <FL/fl_draw.H>
++
+ extern "C" {
+ #include "pari.h"
+ #include "paripriv.h"
+ #include "rect.h"
+ }
+ 
+-#include <FL/Fl.H>
+-#include <FL/Fl_Window.H>
+-#include <FL/fl_draw.H>
+-
+ class Plotter: public Fl_Window {
+ 
+ public:
+-- 
+2.47.1
+
diff --git a/sci-mathematics/pari/pari-2.17.1.ebuild b/sci-mathematics/pari/pari-2.17.1.ebuild
new file mode 100644
index 000000000000..d67e5caa41c3
--- /dev/null
+++ b/sci-mathematics/pari/pari-2.17.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Computer-aided number theory C library and tools"
+HOMEPAGE="https://pari.math.u-bordeaux.fr/"
+SRC_URI="https://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
+
+# Their LICENSE file says "or (at your option) any later version"
+LICENSE="GPL-2+"
+
+# The subslot is the value of $soname_num obtained from
+# upstream's config/version script.
+SLOT="0/9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="data doc examples fltk gmp test threads X"
+REQUIRED_USE="fltk? ( !X )" # mutually exclusive plot implementations
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( virtual/latex-base )
+"
+DEPEND="
+	sys-libs/readline:0=
+	data? ( sci-mathematics/pari-data )
+	doc? ( X? ( x11-misc/xdg-utils ) )
+	fltk? ( x11-libs/fltk:1= )
+	gmp? ( dev-libs/gmp:0= )
+	X? ( x11-libs/libX11:0= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-gcc15-swap-conflict.patch" )
+
+src_prepare() {
+	default
+
+	# move doc dir to a gentoo doc dir and replace acroread by xdg-open
+	sed -i \
+		-e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
+		-e 's:"acroread":"xdg-open":' \
+		doc/gphelp.in || die "Failed to fix doc dir"
+
+	# These tests fail when LaTeX is not installed (which we don't
+	# require without USE=doc), most likely due to output formatting
+	# issues but I haven't deleted my LaTeX installation to check.
+	# There's no real upstream support for enabling/disabling the LaTeX
+	# docs, so this is probably the correctest way to skip these tests.
+	if ! use doc; then
+		rm src/test/{in,32}/help || die
+	fi
+}
+
+src_configure() {
+	tc-export CC CXX PKG_CONFIG
+
+	# Workaraound to "asm operand has impossible constraints" as
+	# suggested in bug #499996.
+	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
+	# sysdatadir installs a pari.cfg stuff which is informative only.
+	# It is supposed to be for "architecture-dependent" data.  It needs
+	# to be easily discoverable for downstream packages such as gp2c.
+	# We set LD="" and DLLD="$CC" so that the "shared library linker"
+	# always gets set to the value of the compiler used. Pari's build
+	# system does not cope very well with a naked linker, it is
+	# expecting a compiler driver. See bugs 722090 and 871117.
+	# DLLDFLAGS, on the other hand, is used exactly like LDFLAGS would
+	# be in a less-weird build system.
+	#
+	# There's a lot of automagic involved in the graphics detection.  We
+	# first pass --graphic=none, which disables some of it. We then pass
+	# --graphic=fltk (or --graphic=X11) only if USE=fltk (or USE=X) is
+	# set. This is a stronger hint to the build system than --with-fltk
+	# would be, and importantly does not rely on the corresponding but
+	# nonexistent(!) option option for X11.
+	LD="" DLLD="$(tc-getCC)" DLLDFLAGS="${LDFLAGS}" ./Configure \
+		--prefix="${EPREFIX}"/usr \
+		--datadir="${EPREFIX}/usr/share/${PN}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--sysdatadir="${EPREFIX}"/usr/share/pari \
+		--mandir="${EPREFIX}"/usr/share/man/man1 \
+		--with-readline="${EPREFIX}"/usr \
+		--with-readline-lib="${EPREFIX}/usr/$(get_libdir)" \
+		--with-ncurses-lib="${EPREFIX}/usr/$(get_libdir)" \
+		--graphic=none \
+		$(usex X --graphic=X11 "" "" "") \
+		$(usex fltk --graphic=fltk "" "" "") \
+		$(use_with gmp) \
+		$(usex threads "--mt=pthread" "" "" "") \
+		|| die "./Configure failed"
+}
+
+src_compile() {
+	emake gp
+
+	if use doc; then
+		# To prevent sandbox violations by metafont
+		VARTEXFONTS="${T}/fonts" emake docpdf
+	fi
+}
+
+src_test() {
+	# Welcome to the jungle, where the tests fail if you make your
+	# terminal bigger.
+	emake COLUMNS=80 test-all
+}
+
+src_install() {
+	DOCS=( AUTHORS CHANGES* COMPAT NEW README* )
+
+	# Install examples to a junk location by default because "make
+	# install-nodata" includes the examples with it. Only if the user
+	# has USE=examples set do we provide the correct directory.
+	local exdir="${T}"
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		exdir="${ED}/usr/share/doc/${PF}/examples"
+	fi
+
+	# Use "true" in place of "strip" to sabotage the unconditional
+	# binary stripping.
+	emake DESTDIR="${D}" \
+		  EXDIR="${exdir}" \
+		  STRIP="true" \
+		  install-nodata install-data
+	einstalldocs
+
+	if use doc; then
+		docompress -x "/usr/share/doc/${PF}"
+		emake \
+			DESTDIR="${D}" \
+			DOCDIR="${ED}/usr/share/doc/${PF}" \
+			install-docpdf install-doctex
+	fi
+}
diff --git a/sci-mathematics/primesieve/primesieve-12.3.ebuild b/sci-mathematics/primesieve/primesieve-12.3.ebuild
index 72dec4e01fea..01033ef71a98 100644
--- a/sci-mathematics/primesieve/primesieve-12.3.ebuild
+++ b/sci-mathematics/primesieve/primesieve-12.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/kimwalisch/primesieve"
 SRC_URI="https://github.com/kimwalisch/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0/12"  # subslot is first component of libprimesieve.so version
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="doc +executable test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index cdb530b00ece..7e7b6a0800cf 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,2 +1 @@
-DIST singular-4.3.2p16.tar.gz 20880476 BLAKE2B ce226a6867b764e593ddbf2c71220d9ea14ccdfd956046d5a94dfb768a97927ca3cf961a9ea808cb77028f2c65d989032202d3a0bde555ace945df1e987077a8 SHA512 1dae0e229e124db03e5e240c3ab2f1049c9f77cf369f701c4a2d0767ba9c23baab2d5d14271e415a3ccbf7b9a9297fcf324b8ccc2841a5156d6ee846cb409de2
 DIST singular-4.4.0p6.tar.gz 21097819 BLAKE2B ce78f63b2f90113ba92811a1e02b568328a92dc686d86fa653209c127f8895811e87ca4684dd1df5c2a54e8952cb1b0654055653e4b4734d9729a7de6f6faaa9 SHA512 b88e60f5665cfab7ccb5a2620190d08c1538f876cce24a24c7baddec40554fd0093cc47db89758f0bbf24f7ca298849a9fe700ce2070c8c52861d3bd48d2cc0d
diff --git a/sci-mathematics/singular/files/singular-4.3.2_p16-lto.patch b/sci-mathematics/singular/files/singular-4.3.2_p16-lto.patch
deleted file mode 100644
index a880f4ef5b12..000000000000
--- a/sci-mathematics/singular/files/singular-4.3.2_p16-lto.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 83a4e40c59dd99ff3131cbdb57b24b456aa04b93 Mon Sep 17 00:00:00 2001
-From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
-Date: Tue, 2 Apr 2024 15:09:51 +0200
-Subject: [PATCH] countedref + https://github.com/Singular/Singular/issues/1212
-
-diff --git a/Singular/countedref.cc b/Singular/countedref.cc
-index d3b783ade7..f83d7fab62 100644
---- a/Singular/countedref.cc
-+++ b/Singular/countedref.cc
-@@ -108,7 +108,7 @@ class CountedRefData:
-   BOOLEAN put(leftv res) { return broken() || m_data.put(res);  }
- 
-   /// Extract (shallow) copy of stored data
--  LeftvShallow operator*() const { return (broken()? LeftvShallow(): (const LeftvShallow&)m_data); }
-+  LeftvShallow operator*() { return (broken()? LeftvShallow(): LeftvShallow(m_data)); }
- 
-   /// Determine active ring when ring dependency changes
-   BOOLEAN rering() {
diff --git a/sci-mathematics/singular/files/singular-4.3.2_p16-test-underlinking.patch b/sci-mathematics/singular/files/singular-4.3.2_p16-test-underlinking.patch
deleted file mode 100644
index cf8a66e3944e..000000000000
--- a/sci-mathematics/singular/files/singular-4.3.2_p16-test-underlinking.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From 23444f771ec95036f6589349da232d8b59734a20 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Sat, 9 Mar 2024 14:28:03 -0500
-Subject: [PATCH] **/Makefile.am: links tests with RESOURCES_LIBS
-
-Several test programs use functions from libsingular_resources, such
-as feInitResources(). Here we ensure that those test programs are
-actually linked with libsingular_resources by adding RESOURCES_LIBS to
-the corresponding LDADD lines. In the process, and for consistency, we
-have replaced some references to libomalloc.la with OMALLOC_LIBS.
----
- Singular/Makefile.am              | 6 +++---
- kernel/GBEngine/Makefile.am       | 2 +-
- kernel/Makefile.am                | 2 +-
- kernel/combinatorics/Makefile.am  | 2 +-
- kernel/fglm/Makefile.am           | 2 +-
- kernel/groebner_walk/Makefile.am  | 2 +-
- kernel/linear_algebra/Makefile.am | 2 +-
- kernel/maps/Makefile.am           | 2 +-
- kernel/numeric/Makefile.am        | 2 +-
- kernel/oswrapper/Makefile.am      | 2 +-
- kernel/spectrum/Makefile.am       | 2 +-
- 11 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/Singular/Makefile.am b/Singular/Makefile.am
-index 6e27f805a..c68d2507d 100644
---- a/Singular/Makefile.am
-+++ b/Singular/Makefile.am
-@@ -162,7 +162,7 @@ dist_script_SCRIPTS = singularsurf singularsurf_jupyter singularsurf_win surfex
- ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR -DPROTO
- ESingular_LDADD =  ${top_builddir}/libpolys/reporter/libreporter.la \
- ${top_builddir}/libpolys/misc/libmisc.la ${OMALLOC_LIBS} \
--${top_builddir}/resources/libsingular_resources.la
-+$(RESOURCES_LIBS)
- 
- 
- ESingular_SOURCES = emacs.cc feOptES.inc feOpt.cc
-@@ -171,7 +171,7 @@ ESingular_SOURCES = emacs.cc feOptES.inc feOpt.cc
- TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO
- TSingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
- ${top_builddir}/libpolys/misc/libmisc.la ${OMALLOC_LIBS} \
--${top_builddir}/resources/libsingular_resources.la
-+$(RESOURCES_LIBS)
- 
- TSingular_SOURCES = emacs.cc feOptTS.inc feOpt.cc
- # utils.cc utils.h
-@@ -213,7 +213,7 @@ TESTS=test
- check_PROGRAMS=$(TESTS)
- 
- test_SOURCES = test.cc
--test_LDADD = ${builddir}/../omalloc/libomalloc.la libSingular.la
-+test_LDADD = $(OMALLOC_LIBS) libSingular.la $(RESOURCES_LIBS)
- 
- #########################################################
- # These files are built first
-diff --git a/kernel/GBEngine/Makefile.am b/kernel/GBEngine/Makefile.am
-index 8a3c2c5a9..e3a05483c 100644
---- a/kernel/GBEngine/Makefile.am
-+++ b/kernel/GBEngine/Makefile.am
-@@ -21,7 +21,7 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = libGBEngine.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../combinatorics/libcombinatorics.la ${builddir}/../linear_algebra/liblinear_algebra.la ${builddir}/../libkernelCommon.la  ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = libGBEngine.la $(OMALLOC_LIBS) ${builddir}/../combinatorics/libcombinatorics.la ${builddir}/../linear_algebra/liblinear_algebra.la ${builddir}/../libkernelCommon.la  ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
- 
-diff --git a/kernel/Makefile.am b/kernel/Makefile.am
-index fe093a4af..f615eab51 100644
---- a/kernel/Makefile.am
-+++ b/kernel/Makefile.am
-@@ -51,7 +51,7 @@ TESTS = test
- check_PROGRAMS = $(TESTS)
- 
- test_SOURCES = test.cc
--test_LDADD   = libkernel.la ${builddir}/../omalloc/libomalloc.la ${builddir}/../Singular/libSingular.la
-+test_LDADD   = libkernel.la $(OMALLOC_LIBS) ${builddir}/../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- # These files are built first
- # BUILT_SOURCES = MOD
-diff --git a/kernel/combinatorics/Makefile.am b/kernel/combinatorics/Makefile.am
-index 31ab51968..816a99360 100644
---- a/kernel/combinatorics/Makefile.am
-+++ b/kernel/combinatorics/Makefile.am
-@@ -17,6 +17,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = libcombinatorics.la ${builddir}/../libkernelCommon.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = libcombinatorics.la ${builddir}/../libkernelCommon.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
-diff --git a/kernel/fglm/Makefile.am b/kernel/fglm/Makefile.am
-index 227e2c122..3b32dda76 100644
---- a/kernel/fglm/Makefile.am
-+++ b/kernel/fglm/Makefile.am
-@@ -17,6 +17,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = libfglm.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = libfglm.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
-diff --git a/kernel/groebner_walk/Makefile.am b/kernel/groebner_walk/Makefile.am
-index 9be32dd76..da3364489 100644
---- a/kernel/groebner_walk/Makefile.am
-+++ b/kernel/groebner_walk/Makefile.am
-@@ -17,6 +17,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = libgroebner_walk.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = libgroebner_walk.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
-diff --git a/kernel/linear_algebra/Makefile.am b/kernel/linear_algebra/Makefile.am
-index 82149611b..57fc6b5ef 100644
---- a/kernel/linear_algebra/Makefile.am
-+++ b/kernel/linear_algebra/Makefile.am
-@@ -23,6 +23,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = liblinear_algebra.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = liblinear_algebra.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
-diff --git a/kernel/maps/Makefile.am b/kernel/maps/Makefile.am
-index 6e846ef20..afff63804 100644
---- a/kernel/maps/Makefile.am
-+++ b/kernel/maps/Makefile.am
-@@ -17,6 +17,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = libmaps.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = libmaps.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
-diff --git a/kernel/numeric/Makefile.am b/kernel/numeric/Makefile.am
-index 8fb48461e..f40e9e60a 100644
---- a/kernel/numeric/Makefile.am
-+++ b/kernel/numeric/Makefile.am
-@@ -18,6 +18,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = libnumeric.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = libnumeric.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
-diff --git a/kernel/oswrapper/Makefile.am b/kernel/oswrapper/Makefile.am
-index ed4f2097a..e79f9da6a 100644
---- a/kernel/oswrapper/Makefile.am
-+++ b/kernel/oswrapper/Makefile.am
-@@ -19,6 +19,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = liboswrapper.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = liboswrapper.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
-diff --git a/kernel/spectrum/Makefile.am b/kernel/spectrum/Makefile.am
-index 28ef269b3..6eff47819 100644
---- a/kernel/spectrum/Makefile.am
-+++ b/kernel/spectrum/Makefile.am
-@@ -17,6 +17,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
- TESTS = test
- check_PROGRAMS = $(TESTS)
- test_SOURCES = test.cc
--test_LDADD   = libspectrum.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
-+test_LDADD   = libspectrum.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
- 
- CLEANFILES = $(TESTS)
--- 
-2.43.0
-
diff --git a/sci-mathematics/singular/singular-4.3.2_p16-r1.ebuild b/sci-mathematics/singular/singular-4.3.2_p16-r1.ebuild
deleted file mode 100644
index ec9fb1763617..000000000000
--- a/sci-mathematics/singular/singular-4.3.2_p16-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common
-
-MY_PN=Singular
-MY_PV=$(ver_rs 3 '')
-# Consistency is different...
-MY_DIR2=$(ver_cut 1-3 ${PV})
-MY_DIR=$(ver_rs 1- '-' ${MY_DIR2})
-
-DESCRIPTION="Computer algebra system for polynomial computations"
-HOMEPAGE="https://www.singular.uni-kl.de/ https://github.com/Singular/Singular"
-SRC_URI="https://www.singular.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_DIR2}"
-
-# Most files say "version 2 or version 3 of the License," which is not
-# quite GPL-2+, and is why we have listed GPL-2 below. But AFAIK there
-# are no GPL-2-only files.
-LICENSE="BSD GPL-2 GPL-2+ GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv ~x86 ~x86-linux"
-IUSE="emacs examples polymake +readline"
-
-# The interactive help uses "info" from sys-apps/texinfo.
-RDEPEND="
-	dev-lang/perl
-	dev-libs/gmp:0=
-	dev-libs/ntl:=
-	sci-libs/cddlib
-	sci-mathematics/flint:=
-	sys-apps/texinfo
-	emacs? ( app-editors/emacs:* )
-	polymake? ( sci-mathematics/polymake )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}"
-
-SITEFILE=60${PN}-gentoo.el
-
-PATCHES=(
-	"${FILESDIR}/${P}-test-underlinking.patch"
-	"${FILESDIR}/${P}-lto.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-debug
-		--disable-doc
-		--disable-optimizationflags
-		--disable-pyobject-module
-		--disable-python
-		--disable-python-module
-		--disable-python_module
-		--enable-factory
-		--enable-gfanlib
-		--enable-libfac
-		--with-flint
-		--with-gmp
-		--with-libparse
-		--with-ntl
-		--without-python
-		--without-pythonmodule
-		$(use_enable emacs)
-		$(use_enable polymake polymake-module)
-		$(use_with readline)
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		pushd "${S}"/emacs
-		elisp-compile *.el || die "elisp-compile failed"
-		popd
-	fi
-}
-
-src_install() {
-	# Do not compress singular's info file (singular.hlp)
-	# some consumer of that file do not know how to deal with compression
-	docompress -x /usr/share/info
-
-	default
-
-	dosym Singular /usr/bin/"${PN}"
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-src_test() {
-	# SINGULAR_PROCS_DIR need to be set to "" otherwise plugins from
-	# an already installed version of singular may be used and cause segfault
-	# See https://github.com/Singular/Sources/issues/980
-	SINGULAR_PROCS_DIR="" emake check
-}
-
-pkg_postinst() {
-	einfo "Additional functionality can be enabled by installing"
-	einfo "sci-mathematics/4ti2"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 6ce89cd0d3f3..e474665e7450 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,2 +1 @@
-DIST z3-4.13.3.tar.gz 5583533 BLAKE2B 9b2586eef75cc26b3556fca4657bc1e2c47473ce22772969d3dbc9d8c84be96d6ee8283616bffe8d95efe7e531b62bbd7d4fc1f3d6dc626a097792198266ed5f SHA512 c899f57d8cb5450801463b07cd651869d766a920e41a4beedc96c4978e940bfadff9af2fbbb5ba10f94f6742bb33f7abaca0a351f3e1803d778e84d735d6829e
 DIST z3-4.13.4.tar.gz 5766645 BLAKE2B 99e22754a7b7333868b713d78677de5d8c8ed7fdf15f0a60c224cca49bd89022e80dee86aa23f96cb7ec052ef1286ec6e2d025a6e336001d4c0d09cfce50ac55 SHA512 fd554122f3bb65e5d6622e2e331546d24892dfd3e5310bc4e041bd1c61fecfe53dbb487e4b125d87367338cacc9e06f28c71f380aac5fe8a74f4b45aaa27b6ce
diff --git a/sci-mathematics/z3/z3-4.13.3.ebuild b/sci-mathematics/z3/z3-4.13.3.ebuild
deleted file mode 100644
index 651f968e3285..000000000000
--- a/sci-mathematics/z3/z3-4.13.3.ebuild
+++ /dev/null
@@ -1,107 +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} )
-
-inherit cmake-multilib java-pkg-opt-2 python-single-r1
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="https://github.com/Z3Prover/z3/"
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
-S=${WORKDIR}/z3-${P}
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86"
-IUSE="doc examples gmp isabelle java python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	java? ( >=virtual/jdk-1.8 )
-"
-BDEPEND="
-	doc? ( app-text/doxygen[dot] )
-"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cmake_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DZ3_USE_LIB_GMP=$(usex gmp)
-		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
-		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
-		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
-		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
-		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
-		-DZ3_INCLUDE_GIT_HASH=OFF
-	)
-
-	multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" )
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	cmake_build test-z3
-	set -- "${BUILD_DIR}"/test-z3 /a
-	echo "${@}" >&2
-	"${@}" || die
-}
-
-multilib_src_install_all() {
-	dodoc README.md
-	use examples && dodoc -r examples
-	use python && python_optimize
-
-	if use isabelle; then
-		insinto /usr/share/Isabelle/contrib/${P}/etc
-		newins - settings <<-EOF
-			Z3_COMPONENT="\$COMPONENT"
-			Z3_HOME="${EPREFIX}/usr/bin"
-			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
-			Z3_REMOTE_SOLVER="z3"
-			Z3_VERSION="${PV}"
-			Z3_INSTALLED="yes"
-			Z3_NON_COMMERCIAL="yes"
-		EOF
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [[ -f ${ROOT}/etc/isabelle/components ]]; then
-			sed -e "/contrib\/${PN}-[0-9.]*/d" \
-				-i "${ROOT}/etc/isabelle/components" || die
-			cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
-				contrib/${P}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [[ ! ${REPLACING_VERSIONS} ]]; then
-			if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
-				# Note: this sed should only match the version of this ebuild
-				# Which is what we want as we do not want to remove the line
-				# of a new Isabelle component being installed during an upgrade.
-				sed -e "/contrib\/${P}/d" \
-					-i "${ROOT}/etc/isabelle/components" || die
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/z3/z3-4.13.4.ebuild b/sci-mathematics/z3/z3-4.13.4.ebuild
index 882c1b84099b..aa0ae4da8a05 100644
--- a/sci-mathematics/z3/z3-4.13.4.ebuild
+++ b/sci-mathematics/z3/z3-4.13.4.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 @@ S=${WORKDIR}/z3-${P}
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sci-physics/hepmc/metadata.xml b/sci-physics/hepmc/metadata.xml
index 3e4d21be3b79..8b67c3d2c7a9 100644
--- a/sci-physics/hepmc/metadata.xml
+++ b/sci-physics/hepmc/metadata.xml
@@ -1,33 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person" proxied="yes">
-  <email>alexander@neuwirth-informatik.de</email>
-  <name>Alexander Puck Neuwirth</name>
-</maintainer>
-<maintainer type="project" proxied="proxy">
-  <email>sci-physics@gentoo.org</email>
-  <name>Gentoo Physics Project</name>
-</maintainer>
-<longdescription lang="en">
-  The HepMC package is an object oriented event record written in C++
-  for High Energy Physics Monte Carlo Generators. Many extensions from
-  HEPEVT, the Fortran HEP standard, are supported: the number of entries
-  is unlimited, spin density matrices can be stored with each vertex,
-  flow patterns (such as color) can be stored and traced, integers
-  representing random number generator states can be stored, and an
-  arbitrary number of event weights can be included. Particles and
-  vertices are kept separate in a graph structure, physically similar to
-  a physics event. The added information supports the modularisation of
-  event generators. The package has been kept as simple as possible with
-  minimal internal/external dependencies. Event information is accessed
-  by means of iterators supplied with the package.
-  
-  Reference: M. Dobbs and J.B. Hansen, Comput. Phys. Commun. 134 (2001)41. 
-</longdescription>
-<use>
-  <flag name="gev">Build with GeV instead of default MeV for momentum units</flag>
-  <flag name="cm">Build with cm instead of default mm for length units</flag>
-  <flag name="root">Build with ROOTIO enabled</flag>
-</use>
+  <maintainer type="person" proxied="yes">
+    <email>alexander@neuwirth-informatik.de</email>
+    <name>Alexander Puck Neuwirth</name>
+  </maintainer>
+  <maintainer type="person" proxied="proxy">
+    <email>nowa@gentoo.org</email>
+    <name>Nowa Ammerlaan</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    The HepMC package is an object oriented event record written in C++
+    for High Energy Physics Monte Carlo Generators. Many extensions from
+    HEPEVT, the Fortran HEP standard, are supported: the number of entries
+    is unlimited, spin density matrices can be stored with each vertex,
+    flow patterns (such as color) can be stored and traced, integers
+    representing random number generator states can be stored, and an
+    arbitrary number of event weights can be included. Particles and
+    vertices are kept separate in a graph structure, physically similar to
+    a physics event. The added information supports the modularisation of
+    event generators. The package has been kept as simple as possible with
+    minimal internal/external dependencies. Event information is accessed
+    by means of iterators supplied with the package.
+
+    Reference: M. Dobbs and J.B. Hansen, Comput. Phys. Commun. 134 (2001)41.
+  </longdescription>
+  <use>
+    <flag name="gev">Build with GeV instead of default MeV for momentum units</flag>
+    <flag name="cm">Build with cm instead of default mm for length units</flag>
+    <flag name="root">Build with ROOTIO enabled</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-physics/rivet/metadata.xml b/sci-physics/rivet/metadata.xml
index 859a48e3b204..f3199abf1e65 100644
--- a/sci-physics/rivet/metadata.xml
+++ b/sci-physics/rivet/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexander@neuwirth-informatik.de</email>
 		<name>Alexander Puck Neuwirth</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="person" proxied="proxy">
+		<email>nowa@gentoo.org</email>
+		<name>Nowa Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
 		<email>sci-physics@gentoo.org</email>
 		<name>Gentoo Physics Project</name>
 	</maintainer>
diff --git a/sci-physics/yoda/files/yoda-2.0.2-yamlcpp.patch b/sci-physics/yoda/files/yoda-2.0.2-yamlcpp.patch
new file mode 100644
index 000000000000..ad20bc717f7c
--- /dev/null
+++ b/sci-physics/yoda/files/yoda-2.0.2-yamlcpp.patch
@@ -0,0 +1,22 @@
+From 3e74499ba8bbbd6a872e0563625193505c14df90 Mon Sep 17 00:00:00 2001
+From: Christian Gutschow <chris.g@cern.ch>
+Date: Wed, 11 Dec 2024 19:10:11 +0000
+Subject: [PATCH] add missing header
+
+---
+ src/yamlcpp/emitterutils.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/yamlcpp/emitterutils.cpp b/src/yamlcpp/emitterutils.cpp
+index 5e5f00ea..78615970 100644
+--- a/src/yamlcpp/emitterutils.cpp
++++ b/src/yamlcpp/emitterutils.cpp
+@@ -1,4 +1,5 @@
+ #include <algorithm>
++#include <cstdint>
+ #include <iomanip>
+ #include <sstream>
+ 
+-- 
+GitLab
+
diff --git a/sci-physics/yoda/metadata.xml b/sci-physics/yoda/metadata.xml
index f4b10e9665cc..0d6af921fec9 100644
--- a/sci-physics/yoda/metadata.xml
+++ b/sci-physics/yoda/metadata.xml
@@ -9,7 +9,7 @@
     <email>nowa@gentoo.org</email>
     <name>Nowa Ammerlaan</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>
   </maintainer>
diff --git a/sci-physics/yoda/yoda-2.0.2.ebuild b/sci-physics/yoda/yoda-2.0.2.ebuild
index a30645a6388d..68a18612638b 100644
--- a/sci-physics/yoda/yoda-2.0.2.ebuild
+++ b/sci-physics/yoda/yoda-2.0.2.ebuild
@@ -45,6 +45,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-yamlcpp.patch # 937405
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 66c6e2c1c909..54c60a8d76d8 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1 +1,2 @@
 DIST ParaView-v5.13.0.tar.xz 133195632 BLAKE2B f4e639d01667dfb7ad02fa51133b1e2d29429aefa89e7f77772d0080aa537d910f9b6f7868e4a31d52b392762c38d94ec228b2a754936409077eb2f8ffcf7f1c SHA512 ba0051902efb2a9c599e500f85f9b20bc46eead1e1f68daa0fea0295ee606844fb72fb8eee04f67f7cced3a35be2b2b442c6f1160fc4f2c2eedfbe9c440b5b1f
+DIST ParaView-v5.13.1.tar.xz 146354760 BLAKE2B 359477ea277ec3eebbd6c55fa41d9a8fbdbcef210cc9da60351b08ccd5501b36fac7f5aa41327840e48eef81d4ce279946c956557832562554fc36a236916b91 SHA512 ff352b888f82b2a453ed66c0f7773b1f2c76807cb2e17190776a99970d9b566cc3dcf226def3d580a52c3274c620087ba7f5a0db16146785321ef4324b7ff57e
diff --git a/sci-visualization/paraview/files/paraview-5.13.0-cmake-3.31-compat.patch b/sci-visualization/paraview/files/paraview-5.13.0-cmake-3.31-compat.patch
new file mode 100644
index 000000000000..715cbe3fcf00
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.13.0-cmake-3.31-compat.patch
@@ -0,0 +1,15 @@
+From https://gitlab.kitware.com/paraview/paraview/-/commit/f1543ffcb1db1832d00c0fe8d183c1b63af96827?merge_request_iid=7135
+
+diff --git a/CMake/ParaViewCompilerExtraFlags.cmake b/CMake/ParaViewCompilerExtraFlags.cmake
+index 4feb06da0c481c382605effeee20cc4a00f59cfe..4c1b87876f0b444e751dd3a6ee66d485ae09c32b 100644
+--- a/CMake/ParaViewCompilerExtraFlags.cmake
++++ b/CMake/ParaViewCompilerExtraFlags.cmake
+@@ -37,7 +37,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+       set_target_properties(paraviewbuild
+         PROPERTIES
+         INTERFACE_LINK_OPTIONS
+-        "LINKER:SHELL:${PARAVIEW_EXTRA_SHARED_LINKER_FLAGS} -lc ${CMAKE_SHARED_LINKER_FLAGS}")
++        "LINKER:SHELL:${PARAVIEW_EXTRA_SHARED_LINKER_FLAGS} -lc")
+     endif()
+   endif()
+ 
diff --git a/sci-visualization/paraview/paraview-5.13.0.ebuild b/sci-visualization/paraview/paraview-5.13.0.ebuild
index ab6b661d4c4d..610b10157aeb 100644
--- a/sci-visualization/paraview/paraview-5.13.0.ebuild
+++ b/sci-visualization/paraview/paraview-5.13.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
@@ -100,6 +100,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+	"${FILESDIR}"/${P}-cmake-3.31-compat.patch
 )
 
 # false positive when checking for available HDF5 interface, bug #904731
diff --git a/sci-visualization/paraview/paraview-5.13.1.ebuild b/sci-visualization/paraview/paraview-5.13.1.ebuild
new file mode 100644
index 000000000000..b99ee89f50b9
--- /dev/null
+++ b/sci-visualization/paraview/paraview-5.13.1.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DOCS_BUILDER="doxygen"
+inherit cmake flag-o-matic desktop docs python-single-r1 qmake-utils toolchain-funcs xdg
+
+MAJOR_PV="$(ver_cut 1-2)"
+MINOR_PV="$(ver_cut 3)"
+RC_PV="$(ver_cut 4-5)"
+RC_PV="${RC_PV:+-${RC_PV^^}}"
+MY_P="ParaView-v${MAJOR_PV}.${MINOR_PV}${RC_PV}"
+
+DESCRIPTION="Powerful scientific data visualization application"
+HOMEPAGE="https://www.paraview.org"
+SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+# TODO: check licenses of plugins (USE=plugins)
+LICENSE="BSD MIT PSF-2 VTK"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost cg examples ffmpeg mpi nvcontrol openmp offscreen plugins python +qt6 +sqlite test tk +webengine"
+
+RESTRICT="mirror test"
+
+REQUIRED_USE="
+	python? ( mpi ${PYTHON_REQUIRED_USE} )
+	webengine? ( qt6 )
+	qt6? ( sqlite )
+	?? ( offscreen qt6 )"
+
+RDEPEND="
+	app-arch/lz4
+	dev-libs/expat
+	dev-libs/jsoncpp:=
+	dev-libs/libxml2:2
+	dev-libs/protobuf:=
+	dev-libs/pugixml
+	media-libs/freetype
+	media-libs/glew:0
+	media-libs/libpng:0
+	media-libs/libtheora
+	media-libs/tiff:=
+	sci-libs/cgnslib
+	sci-libs/hdf5:=[mpi=]
+	>=sci-libs/netcdf-4.2[hdf5]
+	>=sci-libs/netcdf-cxx-4.2:3
+	sys-libs/zlib
+	virtual/glu
+	media-libs/libjpeg-turbo:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	ffmpeg? ( media-video/ffmpeg )
+	mpi? ( virtual/mpi[cxx,romio] )
+	offscreen? ( >=media-libs/mesa-18.3.6[osmesa] )
+	!offscreen? ( virtual/opengl )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/constantly[${PYTHON_USEDEP}]
+			dev-python/incremental[${PYTHON_USEDEP}]
+			dev-python/matplotlib[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/sip:5[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			dev-python/twisted[${PYTHON_USEDEP}]
+			dev-python/zope-interface[${PYTHON_USEDEP}]
+			mpi? ( dev-python/mpi4py )
+			qt6? ( dev-python/pyqt6[opengl,${PYTHON_USEDEP}] )
+		')
+	)
+	qt6? (
+		dev-qt/qt5compat:6
+		dev-qt/qtbase:6[gui,opengl,sql]
+		dev-qt/qtdeclarative:6
+		dev-qt/qtsvg:6
+		dev-qt/qttools:6[assistant,designer,widgets]
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	tk? ( dev-lang/tk:0= )
+	webengine? ( dev-qt/qtwebengine:6[widgets] )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	boost? (
+		$(python_gen_cond_dep '
+			dev-libs/boost[mpi?,python,${PYTHON_USEDEP}]
+		')
+	)
+"
+
+BDEPEND="
+	openmp? ( virtual/fortran )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+	"${FILESDIR}"/${PN}-5.13.0-cmake-3.31-compat.patch
+)
+
+# false positive when checking for available HDF5 interface, bug #904731
+QA_CONFIG_IMPL_DECL_SKIP=(
+	H5Pset_coll_metadata_write
+	H5Pset_all_coll_metadata_ops
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use python && python-single-r1_pkg_setup
+	PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
+}
+
+src_prepare() {
+	# Bug #661812
+	mkdir -p Plugins/StreamLinesRepresentation/doc || die
+
+	cmake_src_prepare
+
+	# lib64 fixes
+	sed -i \
+		-e "s:/lib/python:/$(get_libdir)/python:g" \
+		VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
+	sed -i \
+		-e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
+		Remoting/Application/vtkInitializationHelper.cxx || die
+}
+
+src_configure() {
+	# Needed to compile bundled VTK in ParaView 5.11.1 with gcc 12
+	# see also, bug #863299
+	filter-lto
+	append-cflags $(test-flags-CC -fno-strict-aliasing \
+		-Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion)
+	append-cxxflags $(test-flags-CXX -fno-strict-aliasing \
+		-Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion)
+
+	# Make sure qmlplugindump is in path:
+	export PATH="$(qt6_get_bindir):${PATH}"
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
+		-UBUILD_SHARED_LIBS
+		-DPARAVIEW_BUILD_SHARED_LIBS=ON
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+
+		# boost
+		-DVTK_MODULE_ENABLE_VTK_IOInfovis="$(usex boost YES NO)"
+
+		# doc
+		-DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION="$(usex doc)"
+
+		# examples
+		-DBUILD_EXAMPLES="$(usex examples)"
+
+		# ffmpeg
+		-DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
+
+		# mpi
+		-DPARAVIEW_USE_MPI="$(usex mpi)"
+		-DXDMF_BUILD_MPI="$(usex mpi)"
+		-DVTK_GROUP_ENABLE_MPI="$(usex mpi YES NO)"
+
+		# offscreen
+		-DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
+		-DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
+
+		# plugins
+		-DPARAVIEW_PLUGINS_DEFAULT="$(usex plugins)"
+
+		# python
+		-DModule_pqPython="$(usex python)"
+		-DPARAVIEW_USE_PYTHON="$(usex python)"
+
+		# qt6
+		-DPARAVIEW_USE_QT="$(usex qt6)"
+		-DPARAVIEW_QT_VERSION="6"
+		-DVTK_QT_VERSION="6"
+		-DModule_pqPython="$(usex qt6 "$(usex python)" "off")"
+		-DVTK_USE_NVCONTROL="$(usex nvcontrol)"
+		-DVTK_GROUP_ENABLE_Qt="$(usex qt6 YES NO)"
+		-DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt6/qml"
+
+		# sqlite
+		-DVTK_MODULE_ENABLE_VTK_sqlite="$(usex sqlite YES NO)"
+
+		# test
+		-DBUILD_TESTING="$(usex test)"
+
+		# tk
+		-DVTK_USE_TK="$(usex tk)"
+		-DVTK_GROUP_ENABLE_Tk="$(usex tk YES NO)"
+
+		# webengine
+		-DPARAVIEW_USE_QTWEBENGINE="$(usex webengine)"
+		-DVTK_GROUP_ENABLE_Web="$(usex webengine YES NO)"
+	)
+
+	if use openmp; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
+	fi
+
+	if use qt6; then
+		mycmakeargs+=(
+			-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
+			-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove wrapper binaries and put the actual executable in place
+	for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
+		if [ -f "${ED}"/usr/lib/"$i" ]; then
+			mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
+		fi
+	done
+
+	# set up the environment
+	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
+	doenvd "${T}"/40${PN}
+
+	newicon "${S}"/Clients/ParaView/pvIcon-96x96.png paraview.png
+	make_desktop_entry paraview "Paraview" paraview
+
+	use python && python_optimize "${ED}/usr/$(get_libdir)/${PN}-${MAJOR_PV}"
+}
diff --git a/sec-keys/openpgp-keys-apache-tomcat/Manifest b/sec-keys/openpgp-keys-apache-tomcat/Manifest
index 1a5de7e6c639..d99a2c8b4d34 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -1,5 +1,3 @@
-DIST openpgp-keys-apache-tomcat-10.1.33-KEYS.asc 35385 BLAKE2B 1c2bba42759f901fef1cda1871c706cd5f960de4120de62361853b7e6cade3c205852215e8562e066ca675506bf1a8d424fb588dfd856cdc99bca5bcc575be06 SHA512 43d3c06e6eb776b939864a092161f70759e6f095b9b2bb7f00172cb6dca890fb88dff6f646863b882226ac490ad8082c03a84f93dfe917e7b9aab378f54612ce
 DIST openpgp-keys-apache-tomcat-10.1.34-KEYS.asc 35385 BLAKE2B 1c2bba42759f901fef1cda1871c706cd5f960de4120de62361853b7e6cade3c205852215e8562e066ca675506bf1a8d424fb588dfd856cdc99bca5bcc575be06 SHA512 43d3c06e6eb776b939864a092161f70759e6f095b9b2bb7f00172cb6dca890fb88dff6f646863b882226ac490ad8082c03a84f93dfe917e7b9aab378f54612ce
 DIST openpgp-keys-apache-tomcat-11.0.2-KEYS.asc 36169 BLAKE2B 6e29022080dc7cc4e3c9af841ab9274ba8cc983f5cd663699d1c7b29c0d12b6c8e778bac6aa59a1ba9b90d9ff00781e3f715741e27f5b37b1b1e9c87fe4c20fb SHA512 f953bea7820e203608dbe2483d3cee0c082352c7ef86627acc37db3bbef3699b72c5709ce5cbe4ec24379fc7a9b648aa3f31bb7c98847105acb56a283b331239
-DIST openpgp-keys-apache-tomcat-9.0.97-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 DIST openpgp-keys-apache-tomcat-9.0.98-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.33.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.33.ebuild
deleted file mode 100644
index 7481a3964076..000000000000
--- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.33.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
-HOMEPAGE="https://tomcat.apache.org/download-10.cgi"
-SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
-S="${WORKDIR}"
-
-LICENSE="public-domain"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-src_install() {
-	local files=( ${A} )
-	insinto /usr/share/openpgp-keys
-	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
-}
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.97.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.97.ebuild
deleted file mode 100644
index 57c3e1749269..000000000000
--- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.97.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
-HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
-SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
-S="${WORKDIR}"
-
-LICENSE="public-domain"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-src_install() {
-	local files=( ${A} )
-	insinto /usr/share/openpgp-keys
-	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
-}
diff --git a/sec-keys/openpgp-keys-lighttpd/openpgp-keys-lighttpd-20231008.ebuild b/sec-keys/openpgp-keys-lighttpd/openpgp-keys-lighttpd-20231008.ebuild
index 5bbcbc257af4..dd2557f8b06e 100644
--- a/sec-keys/openpgp-keys-lighttpd/openpgp-keys-lighttpd-20231008.ebuild
+++ b/sec-keys/openpgp-keys-lighttpd/openpgp-keys-lighttpd-20231008.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
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/sec-keys/openpgp-keys-virt-manager/Manifest b/sec-keys/openpgp-keys-virt-manager/Manifest
new file mode 100644
index 000000000000..21594dab6a19
--- /dev/null
+++ b/sec-keys/openpgp-keys-virt-manager/Manifest
@@ -0,0 +1 @@
+DIST openpgp-keys-virt-manager-20250106-0x4252d86a52041137c291cadfc85c5e957062a701.asc 30080 BLAKE2B 7597b187b7be1ac81e79405838dea3979f958dc6ff10509f3c33863948464795fdaf1c52b4b1a9638df5621ffeeba321265f5ad031c2a985d8b02232dff653cd SHA512 e1306b04822e40a97611734ea6085ff9037fb311100aa5e0f3fd8cbac15c58bdb26e4b1c7998c5abf12c990840481522674bf143003fc4d45abec2c4089abbaf
diff --git a/sec-keys/openpgp-keys-virt-manager/metadata.xml b/sec-keys/openpgp-keys-virt-manager/metadata.xml
new file mode 100644
index 000000000000..846a77528262
--- /dev/null
+++ b/sec-keys/openpgp-keys-virt-manager/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/sec-keys/openpgp-keys-virt-manager/openpgp-keys-virt-manager-20250106.ebuild b/sec-keys/openpgp-keys-virt-manager/openpgp-keys-virt-manager-20250106.ebuild
new file mode 100644
index 000000000000..1549efb93114
--- /dev/null
+++ b/sec-keys/openpgp-keys-virt-manager/openpgp-keys-virt-manager-20250106.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Pavel Hrdina's OpenPGP keys used to sign virt-manager since version 5.0.0"
+HOMEPAGE="https://virt-manager.org"
+# Grabbed from https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x4252d86a52041137c291cadfc85c5e957062a701
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-0x4252d86a52041137c291cadfc85c5e957062a701.asc"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - virt-manager.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sys-apps/arch-chroot/arch-chroot-29.ebuild b/sys-apps/arch-chroot/arch-chroot-29.ebuild
index 977b7d7aa688..0fec88d1095b 100644
--- a/sys-apps/arch-chroot/arch-chroot-29.ebuild
+++ b/sys-apps/arch-chroot/arch-chroot-29.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
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.archlinux.org/archlinux/arch-install-scripts/-/archive/v
 S="${WORKDIR}/arch-install-scripts-v${PV}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="app-text/asciidoc"
 
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index 3d8ea716212e..3b481981d344 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,2 +1,2 @@
-DIST baobab-45.0.tar.xz 601576 BLAKE2B 786aa2c3ed4d5aab671dc54ac3772a0b802fd8545a37c094719da5e52fa93b97c5e1bafd9b6d0419540389fd9cd61cd3205eb9db00dde22ee534aa61d89a7a8e SHA512 cc3cae0c3ef13dbf2e09c12cc4443b5b1420a06829a4944be98099b03e875c5e88e9611242e1494e1ec85687772519c03c817b6e7d535040e2276e5d6fb902df
 DIST baobab-46.0.tar.xz 605708 BLAKE2B 3689886d843c7346046ff57d93b3e5e3df5ba641d5f97f7db10f8e5773a4aed1ae35e06093b9e8de8c5d4f200c5027eaa08c029fbd3ecec766e0f901396c0309 SHA512 a09e8d47f82c4a193ea941dfc0064e33e019599d10172034a591a19047073235a602c1d5f2fda6303aa5e4524bd5a071faaf40ba447f74c5ab9bde5cb2cdeb49
+DIST baobab-47.0.tar.xz 606432 BLAKE2B ad1303894be304c5693cf48274179f98e1c12e0acc93a2f95ca79ff2c1503ba5021000b90778e9957e455d114cb500043a3192d68ed84e9082db806393fa27a0 SHA512 8e78b7455fe0fbd619ffb44ab1815d57820ba847ffff4b579bcd15a4d64eb9741f99ee7940e08acc56e0d5644a423027854398032733e0152b5bd60e91889d2a
diff --git a/sys-apps/baobab/baobab-45.0.ebuild b/sys-apps/baobab/baobab-45.0.ebuild
deleted file mode 100644
index 408fcea16691..000000000000
--- a/sys-apps/baobab/baobab-45.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Disk usage browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=gui-libs/gtk-4.4.0:4
-	>=gui-libs/libadwaita-1.4_alpha:1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(vala_depend)
-	>=gui-libs/libadwaita-1.4_alpha:1[vala]
-	dev-util/itstool
-	>=sys-devel/gettext-0.21
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/sys-apps/baobab/baobab-47.0.ebuild b/sys-apps/baobab/baobab-47.0.ebuild
new file mode 100644
index 000000000000..c621e0a07c1b
--- /dev/null
+++ b/sys-apps/baobab/baobab-47.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Disk usage browser for GNOME"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/baobab"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=gui-libs/gtk-4.15.1:4
+	>=gui-libs/libadwaita-1.6_alpha:1
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(vala_depend)
+	>=gui-libs/libadwaita-1.4_alpha:1[vala]
+	dev-util/itstool
+	>=sys-devel/gettext-0.21
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/bat/bat-0.24.0-r2.ebuild b/sys-apps/bat/bat-0.24.0-r2.ebuild
index 2624145edab5..6c0cb3864d5a 100644
--- a/sys-apps/bat/bat-0.24.0-r2.ebuild
+++ b/sys-apps/bat/bat-0.24.0-r2.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
@@ -202,7 +202,7 @@ LICENSE+="
 	|| ( CC0-1.0 MIT-0 )
 "
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~mips ppc64 ~riscv ~x86"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
diff --git a/sys-apps/bfs/Manifest b/sys-apps/bfs/Manifest
index 29616248b2ba..12fd1e198df4 100644
--- a/sys-apps/bfs/Manifest
+++ b/sys-apps/bfs/Manifest
@@ -1,5 +1,2 @@
-DIST bfs-3.3.1.tar.gz 262841 BLAKE2B bc848f4daa98172531e6c13100dcd1f3b722f4282acc5fd3677b2c4a83effa49e681d0cac3fa2c104fd1db03543c4f0a6ca9bc494ee3737d0c927f0170171eac SHA512 e31153ef244483e4337bd2bb64fc4ddf55d56048b5af54003a917287868114c81befb771b6cfc7473e384d3157b24cbec7ca27336362a438c7803eb7fc85d8d3
-DIST bfs-4.0.1.tar.gz 272678 BLAKE2B c25165b469ea52ef2e0b73ae0cbcef485a739d25cd3c49d25cd0543ab97009b256637d0dab5cb1ce01c3da7ab77519ac6a5b9cff36634c81415ec309d46c7d1d SHA512 0697aab71e2101638fbb5923ec57b9439d6fdd212dccd2f1b90cd4a1bc9c72acca5dca92e9aa6efef06696b324cb6754784602064f35b529ff97d1933672d73c
-DIST bfs-4.0.2.tar.gz 274986 BLAKE2B d87dd646a0c6bced3881426f8a82501e9a8ab19b0d4a249fd44d774cac9fd37a7a0cb01551a2af343b4f0c64f7b9e926cee8db67f5217bd39dd469a85b0b434e SHA512 a3ce3ccee27576a4a0ffb2bd46635aaabc5718cbe53eef5da52bc510dcf629a613802d0b2f95da47d009873e6ab1b87eb84087b30c227b27676bb14cac9f6e97
-DIST bfs-4.0.3.tar.gz 277809 BLAKE2B c275e65ed6265dab81a10c70fd4012c0140aca0083a903535bb5a1ec7d9bcfb0637addf051430b7e370109d4ac843d7f6d3d4976cd469033d903ade3b5713c30 SHA512 444fa5a012f3b3222794f295f818358897f38c081714b593daeccddf2bb821884df8f9a6eaf3b0426ed7fe83483e31417abc9d97c34019b2e28e948654a5c304
 DIST bfs-4.0.4.tar.gz 278447 BLAKE2B 47a82b0e96d18891815799bd2878266368d3582aeb3aa0b1df9fa79b1eed9125a64dfe061d6f11f9a6265b47c2f3c9d38e21b2d82c7e7f1f9fb313b61d1478f8 SHA512 b372e68fc13624cd410edb64a0429fbb1dac2d01417c78821570b3b1d0e4f6d239d93acffcb5c077f84409edb013c9fec0b2bed50646ed52d62df90d6b1893fb
+DIST bfs-4.0.5.tar.gz 286765 BLAKE2B 9dbcc11a218c0504c2235c23a367a1694e7c8d4739ec92b5acb88a6046698468711ef4257c39495ee92c0a44ad95190f1a2ffd39952b5f4cfed7704053ef1718 SHA512 bc72d81da1b014e7dd9ee792b1b34b6d74aa87d9c3c0a54f1b0e72845a45f36a1ac83bd130634f05c93b440dd9e543892d4ee82bf2d1447879e40a78eb5ec187
diff --git a/sys-apps/bfs/bfs-3.3.1.ebuild b/sys-apps/bfs/bfs-3.3.1.ebuild
deleted file mode 100644
index 265ded51c383..000000000000
--- a/sys-apps/bfs/bfs-3.3.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo flag-o-matic toolchain-funcs
-
-DESCRIPTION="Breadth-first version of the UNIX find command"
-HOMEPAGE="https://tavianator.com/projects/bfs.html"
-SRC_URI="https://github.com/tavianator/bfs/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="0BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
-IUSE="acl caps debug io-uring selinux unicode"
-
-DEPEND="
-	acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	io-uring? ( sys-libs/liburing:= )
-	selinux? ( sys-libs/libselinux )
-	unicode? ( dev-libs/oniguruma:= )
-"
-RDEPEND="${DEPEND}"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# Not available on Linux
-	acl_is_trivial_np acl_trivial fdclosedir getdents getprogname
-	posix_spawn_file_actions_addfchdir getmntinfo posix_getdents strtofflags
-)
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-	use debug || append-cppflags -DNDEBUG
-
-	edo ./configure \
-		$(use_with acl libacl) \
-		$(use_with caps libcap) \
-		$(use_with selinux libselinux) \
-		$(use_with io-uring liburing) \
-		$(use_with unicode oniguruma) \
-		V=1
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_test() {
-	# -n check gets confused so need manual src_test definition?
-	emake V=1 check
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/sys-apps/bfs/bfs-4.0.1.ebuild b/sys-apps/bfs/bfs-4.0.1.ebuild
deleted file mode 100644
index 265ded51c383..000000000000
--- a/sys-apps/bfs/bfs-4.0.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo flag-o-matic toolchain-funcs
-
-DESCRIPTION="Breadth-first version of the UNIX find command"
-HOMEPAGE="https://tavianator.com/projects/bfs.html"
-SRC_URI="https://github.com/tavianator/bfs/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="0BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
-IUSE="acl caps debug io-uring selinux unicode"
-
-DEPEND="
-	acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	io-uring? ( sys-libs/liburing:= )
-	selinux? ( sys-libs/libselinux )
-	unicode? ( dev-libs/oniguruma:= )
-"
-RDEPEND="${DEPEND}"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# Not available on Linux
-	acl_is_trivial_np acl_trivial fdclosedir getdents getprogname
-	posix_spawn_file_actions_addfchdir getmntinfo posix_getdents strtofflags
-)
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-	use debug || append-cppflags -DNDEBUG
-
-	edo ./configure \
-		$(use_with acl libacl) \
-		$(use_with caps libcap) \
-		$(use_with selinux libselinux) \
-		$(use_with io-uring liburing) \
-		$(use_with unicode oniguruma) \
-		V=1
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_test() {
-	# -n check gets confused so need manual src_test definition?
-	emake V=1 check
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/sys-apps/bfs/bfs-4.0.2.ebuild b/sys-apps/bfs/bfs-4.0.2.ebuild
deleted file mode 100644
index f98d49a5b7c4..000000000000
--- a/sys-apps/bfs/bfs-4.0.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo flag-o-matic toolchain-funcs
-
-DESCRIPTION="Breadth-first version of the UNIX find command"
-HOMEPAGE="https://tavianator.com/projects/bfs.html"
-SRC_URI="https://github.com/tavianator/bfs/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="0BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
-IUSE="acl caps debug io-uring selinux unicode"
-
-DEPEND="
-	acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	io-uring? ( sys-libs/liburing:= )
-	selinux? ( sys-libs/libselinux )
-	unicode? ( dev-libs/oniguruma:= )
-"
-RDEPEND="${DEPEND}"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# Not available on Linux
-	acl_is_trivial_np acl_trivial fdclosedir getdents getprogname
-	posix_spawn_file_actions_addfchdir getmntinfo posix_getdents strtofflags
-	# Seems to be in POSIX 2024 but not yet in ncurses?
-	tcgetwinsize
-)
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-	use debug || append-cppflags -DNDEBUG
-
-	edo ./configure \
-		$(use_with acl libacl) \
-		$(use_with caps libcap) \
-		$(use_with selinux libselinux) \
-		$(use_with io-uring liburing) \
-		$(use_with unicode oniguruma) \
-		V=1
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_test() {
-	# -n check gets confused so need manual src_test definition?
-	emake V=1 check
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/sys-apps/bfs/bfs-4.0.3.ebuild b/sys-apps/bfs/bfs-4.0.3.ebuild
deleted file mode 100644
index f98d49a5b7c4..000000000000
--- a/sys-apps/bfs/bfs-4.0.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo flag-o-matic toolchain-funcs
-
-DESCRIPTION="Breadth-first version of the UNIX find command"
-HOMEPAGE="https://tavianator.com/projects/bfs.html"
-SRC_URI="https://github.com/tavianator/bfs/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="0BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
-IUSE="acl caps debug io-uring selinux unicode"
-
-DEPEND="
-	acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	io-uring? ( sys-libs/liburing:= )
-	selinux? ( sys-libs/libselinux )
-	unicode? ( dev-libs/oniguruma:= )
-"
-RDEPEND="${DEPEND}"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# Not available on Linux
-	acl_is_trivial_np acl_trivial fdclosedir getdents getprogname
-	posix_spawn_file_actions_addfchdir getmntinfo posix_getdents strtofflags
-	# Seems to be in POSIX 2024 but not yet in ncurses?
-	tcgetwinsize
-)
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-	use debug || append-cppflags -DNDEBUG
-
-	edo ./configure \
-		$(use_with acl libacl) \
-		$(use_with caps libcap) \
-		$(use_with selinux libselinux) \
-		$(use_with io-uring liburing) \
-		$(use_with unicode oniguruma) \
-		V=1
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_test() {
-	# -n check gets confused so need manual src_test definition?
-	emake V=1 check
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/sys-apps/bfs/bfs-4.0.5.ebuild b/sys-apps/bfs/bfs-4.0.5.ebuild
new file mode 100644
index 000000000000..cb91aa1f0a19
--- /dev/null
+++ b/sys-apps/bfs/bfs-4.0.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo flag-o-matic toolchain-funcs
+
+DESCRIPTION="Breadth-first version of the UNIX find command"
+HOMEPAGE="https://tavianator.com/projects/bfs.html"
+SRC_URI="https://github.com/tavianator/bfs/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="0BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
+IUSE="acl caps debug io-uring selinux unicode"
+
+DEPEND="
+	acl? ( virtual/acl )
+	caps? ( sys-libs/libcap )
+	io-uring? ( sys-libs/liburing:= )
+	selinux? ( sys-libs/libselinux )
+	unicode? ( dev-libs/oniguruma:= )
+"
+RDEPEND="${DEPEND}"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# Not available on Linux
+	acl_is_trivial_np acl_trivial fdclosedir getdents getprogname
+	posix_spawn_file_actions_addfchdir getmntinfo posix_getdents strtofflags
+	# Seems to be in POSIX 2024 but not yet in ncurses?
+	tcgetwinsize
+)
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+	use debug || append-cppflags -DNDEBUG
+
+	edo ./configure \
+		$(use_with acl libacl) \
+		$(use_with caps libcap) \
+		$(use_with selinux libselinux) \
+		$(use_with io-uring liburing) \
+		$(use_with unicode oniguruma) \
+		V=1
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	# -n check gets confused so need manual src_test definition?
+	emake V=1 check
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/sys-apps/bolt/bolt-0.9.8-r1.ebuild b/sys-apps/bolt/bolt-0.9.8-r1.ebuild
index 52152993deca..53796044710b 100644
--- a/sys-apps/bolt/bolt-0.9.8-r1.ebuild
+++ b/sys-apps/bolt/bolt-0.9.8-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_1{0..2} )
+PYTHON_COMPAT=( python3_1{0..3} )
 inherit linux-info python-any-r1 meson udev
 
 DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
@@ -44,6 +44,8 @@ BDEPEND="
 	)
 "
 
+PATCHES=( "${FILESDIR}"/${P}-sockaddr.patch )
+
 pkg_setup() {
 	if use kernel_linux && kernel_is lt 5 6; then
 		CONFIG_CHECK="~THUNDERBOLT"
diff --git a/sys-apps/bolt/files/bolt-0.9.8-sockaddr.patch b/sys-apps/bolt/files/bolt-0.9.8-sockaddr.patch
new file mode 100644
index 000000000000..684e31c5e60c
--- /dev/null
+++ b/sys-apps/bolt/files/bolt-0.9.8-sockaddr.patch
@@ -0,0 +1,46 @@
+https://gitlab.freedesktop.org/bolt/bolt/-/commit/9f85914f1efd7b74fb7bd906b339fcba2214d86a
+From 9f85914f1efd7b74fb7bd906b339fcba2214d86a Mon Sep 17 00:00:00 2001
+From: Kate Hsuan <hpa@redhat.com>
+Date: Mon, 6 Jan 2025 14:12:47 +0800
+Subject: [PATCH] tests: bolt-test: Fix build error with gcc14
+
+Fix build errors with gcc14.
+The fix includes:
+1. Cast sockaddr correctly.
+
+build errors:
+
+x86_64-pc-linux-musl-gcc -Itest-auth.p -I. -I../bolt-0.9.8 -I../bolt-0.9.8/tests -I../bolt-0.9.8/common -I../bolt-0.9.8/boltd -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/sysprof-4 -I/usr/lib/libffi/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/gio-unix-2.0 -I/usr/include/polkit-1 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=gnu99 -fstack-protector-strong -Waggregate-return -Wunused -Warray-bounds -Wcast-align -Wclobbered -Wdeclaration-after-statement -Wempty-body -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-signedness -Wignored-qualifiers -Wimplicit-function-declaration -Winit-self -Wmissing-declarations -Wmissing-format-attribute -Wmissing-include-dirs -Wmissing-noreturn -Wmissing-parameter-type -Wmissing-prototypes -Wnested-externs -Wno-discarded-qualifiers -Wno-missing-field-initializers -Wno-suggest-attribute=format -Wno-unused-parameter -Wold-style-definition -Woverride-init -Wpointer-arith -Wredundant-decls -Wreturn-type -Wshadow -Wsign-compare -Wstrict-aliasing=3 -Wstrict-prototypes -Wstringop-overflow -Wstringop-truncation -Wtype-limits -Wundef -Wuninitialized -Wunused-but-set-variable -Wwrite-strings -O2 -pipe -march=native -fno-diagnostics-color -pthread -MD -MQ test-auth.p/tests_bolt-test.c.o -MF test-auth.p/tests_bolt-test.c.o.d -o test-auth.p/tests_bolt-test.c.o -c ../bolt-0.9.8/tests/bolt-test.c
+../bolt-0.9.8/tests/bolt-test.c: In function 'notify_socket_new':
+../bolt-0.9.8/tests/bolt-test.c:131:17: error: passing argument 2 of 'bind' from incompatible pointer type [-Wincompatible-pointer-types]
+  131 |   r = bind (fd, &sau, socklen);
+      |                 ^~~~
+      |                 |
+      |                 struct sockaddr_un *
+In file included from ../bolt-0.9.8/tests/bolt-test.c:37:
+/usr/include/sys/socket.h:385:16: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_un *'
+  385 | int bind (int, const struct sockaddr *, socklen_t);
+      |                ^~~~~~~~~~~~~~~~~~~~~~~
+
+Resolves: #192
+Link: https://bugs.gentoo.org/937273
+---
+ tests/bolt-test.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/bolt-test.c b/tests/bolt-test.c
+index beabb8d..aa94222 100644
+--- a/tests/bolt-test.c
++++ b/tests/bolt-test.c
+@@ -128,7 +128,7 @@ notify_socket_new (void)
+     + strlen (sau.sun_path)
+     + 1;
+ 
+-  r = bind (fd, &sau, socklen);
++  r = bind (fd, (struct sockaddr *) &sau, socklen);
+   g_assert_cmpint (r, >, -1);
+ 
+   r = setsockopt (fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof (one));
+-- 
+GitLab
+
diff --git a/sys-apps/config-site/Manifest b/sys-apps/config-site/Manifest
new file mode 100644
index 000000000000..5b17284d57a2
--- /dev/null
+++ b/sys-apps/config-site/Manifest
@@ -0,0 +1 @@
+DIST config-site-0.tar.bz2 6588 BLAKE2B 98ad7836316d68fc27e1dc18b419d088e2047f3ebbbb2b7e8a0ab6de4c66c3ae438504146398e697a246ae09804cdcc229701ce2ba52de469cf8e78798fedaa8 SHA512 0e02848dc3176a0963b99d8d785e3a0150917156d9db897d665ede2ddcd8dfacd334b0c761975671c161f79107622226caf2fc422e1c34fa28b83ec78a1ec93a
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/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 83daeb11649a..11435b471ed1 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -4,3 +4,6 @@ DIST coreutils-9.4.tar.xz.sig 833 BLAKE2B 870f7eb28e8851f41954820c7f4f4b43a965e6
 DIST coreutils-9.5-patches.tar.xz 5912 BLAKE2B 873fbe1a60f8f8034b3d35796146765ce388952d649c32dc81ca0e4c2823c9f2f00b69bc5cb3af686434867459b6dc378fb9a6d59563d28b87c3ee1eceeedbb3 SHA512 4b4ad356615d046b8d67ea35b789f887a787ab01ece3234f6344518aef33cd30ca364fef5d85e11acfdb24003114c16ffdab82922fb135d5425fbcd541064a76
 DIST coreutils-9.5.tar.xz 6007136 BLAKE2B 6fd3a77697c9e85f31415c6ad66559faf18acc7d346677a89d4a999c2027886551e78842a7283e7b3b44fe8ef2fde04ba2f88df32a7844d5f69d45bcb7a04b6f SHA512 2ca0deac4dc10a80fd0c6fd131252e99d457fd03b7bd626a6bc74fe5a0529c0a3d48ce1f5da1d3b3a7a150a1ce44f0fbb6b68a6ac543dfd5baa3e71f5d65401c
 DIST coreutils-9.5.tar.xz.sig 833 BLAKE2B 37c29984bceee0ff3bffde76712f71dbb118c228e328dc230d5c53c37da12f5ec2130e0123b97fda4a561f556c3be307fdbe1f0c21279db2c84030818386f626 SHA512 029997e0f4ee64e561853cff7c8a124f58cc891598595b44c4a46f9813b4b71c9d677464bc8a26d294e9971832f4b87c23777fea4fac6e8e30f06ad93b9957d5
+DIST coreutils-9.6-patches.tar.xz 5904 BLAKE2B 1abe214914007804362b9d7c1a7c39f07d74c51857e84484179f11bb8fa512356ee97c811ef62469aaa52db5cc90f2f7587c2dc57ed130ebbfdacc59755dcb90 SHA512 5a609b21da7c78e41184e5d7bca87da4f868975635b6e8aa4bd8f4d18c98a2fabd5b7e8ad6bf7780ca77f6d532bfa5cb1ed618e4bc32617ba2977d4b8a885b9f
+DIST coreutils-9.6.tar.xz 6134764 BLAKE2B 4070d3d272851d3e9c326df9c05ce67797d86852e7f5c26e545f987f444295f2cfca24e8569514d7b5edf8fd50318d07cb20dea4a4ce8c65b34bea0c5a9177be SHA512 398391d7f9d77e6117b750abb8711eebdd9cd2549e7846cab26884fb2dd522b6bcfb8bf7fef35a12683e213ada7f89b817bf615628628d42aee3fa3102647b28
+DIST coreutils-9.6.tar.xz.sig 833 BLAKE2B a9ea9773746d21b526e69ca2ff7637f3dcef4a921da943f281c4d16fed2d8f9eff92353e1ceafbbc8cfe4b9b23bf123bf64dcd79ff598759373c50739a5046c6 SHA512 a8e578b5e1d053b49e3e2c5dc94431d17c6a14662f459b2174cea23865ccca32e5ae5c13fedb0a8345d25269a9b98cb7f463a897c9663f9f9bcaf61e5c781378
diff --git a/sys-apps/coreutils/coreutils-9.6.ebuild b/sys-apps/coreutils/coreutils-9.6.ebuild
new file mode 100644
index 000000000000..6630d91c84d5
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-9.6.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils
+# The upstream coreutils maintainers also maintain the package in Fedora and may
+# backport fixes which we want to pick up.
+#
+# Also recommend subscribing to the coreutils and bug-coreutils MLs.
+
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc
+inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
+
+MY_PATCH="${PN}-9.6-patches"
+DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
+HOMEPAGE="https://www.gnu.org/software/coreutils/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/coreutils.git"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]] ; then
+	# Note: could put this in devspace, but if it's gone, we don't want
+	# it in tree anyway. It's just for testing.
+	MY_SNAPSHOT="$(ver_cut 1-2).185-541b02"
+	SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )"
+	S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
+else
+	SRC_URI="
+		mirror://gnu/${PN}/${P}.tar.xz
+		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
+	"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+fi
+
+SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="acl caps gmp hostname kill multicall nls +openssl selinux +split-usr static test vanilla xattr"
+RESTRICT="!test? ( test )"
+
+LIB_DEPEND="
+	acl? ( sys-apps/acl[static-libs] )
+	caps? ( sys-libs/libcap )
+	gmp? ( dev-libs/gmp:=[static-libs] )
+	openssl? ( dev-libs/openssl:=[static-libs] )
+	xattr? ( sys-apps/attr[static-libs] )
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs]} )
+	selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+BDEPEND="
+	app-arch/xz-utils
+	dev-lang/perl
+	test? (
+		dev-debug/strace
+		dev-lang/perl
+		dev-perl/Expect
+		${PYTHON_DEPS}
+	)
+	verify-sig? ( sec-keys/openpgp-keys-coreutils )
+"
+RDEPEND+="
+	hostname? ( !sys-apps/net-tools[hostname] )
+	kill? (
+		!sys-apps/util-linux[kill]
+		!sys-process/procps[kill]
+	)
+	!<sys-apps/util-linux-2.13
+	!<sys-apps/sandbox-2.10-r4
+	!sys-apps/stat
+	!net-mail/base64
+	!sys-apps/mktemp
+	!<app-forensics/tct-1.18-r1
+	!<net-fs/netatalk-2.0.3-r4
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# gnulib FPs (bug #898370)
+	unreachable MIN alignof static_assert
+)
+
+pkg_setup() {
+	if use test ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+
+		cd "${S}" || die
+		./bootstrap || die
+
+		sed -i -e "s:submodule-checks ?= no-submodule-changes public-submodule-commit:submodule-checks ?= no-submodule-changes:" gnulib/top/maint.mk || die
+	elif use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+	fi
+
+	default
+}
+
+src_prepare() {
+	# TODO: past 2025, we may need to add our own hack for bug #907474.
+	local PATCHES=(
+		# Upstream patches
+	)
+
+	if ! use vanilla && [[ -d "${WORKDIR}"/${MY_PATCH} ]] ; then
+		PATCHES+=( "${WORKDIR}"/${MY_PATCH} )
+	fi
+
+	default
+
+	# Since we've patched many .c files, the make process will try to
+	# re-build the manpages by running `./bin --help`.  When doing a
+	# cross-compile, we can't do that since 'bin' isn't a native bin.
+	#
+	# Also, it's not like we changed the usage on any of these things,
+	# so let's just update the timestamps and skip the help2man step.
+	set -- man/*.x
+	touch ${@/%x/1} || die
+
+	# Avoid perl dep for compiled in dircolors default (bug #348642)
+	if ! has_version dev-lang/perl ; then
+		touch src/dircolors.h || die
+		touch ${@/%x/1} || die
+	fi
+}
+
+src_configure() {
+	# TODO: in future (>9.4?), we may want to wire up USE=systemd:
+	# still experimental at the moment, but:
+	# https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=85edb4afbd119fb69a0d53e1beb71f46c9525dd0
+	local myconf=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		# kill/uptime - procps
+		# groups/su   - shadow
+		# hostname    - net-tools
+		--enable-install-program="arch,$(usev hostname),$(usev kill)"
+		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
+		$(usev !caps --disable-libcap)
+		$(use_enable nls)
+		$(use_enable acl)
+		$(use_enable multicall single-binary)
+		$(use_enable xattr)
+		$(use_with gmp libgmp)
+		$(use_with openssl)
+	)
+
+	if use gmp ; then
+		myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr )
+	fi
+
+	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
+		# bug #311569
+		export fu_cv_sys_stat_statfs2_bsize=yes
+		# bug #416629
+		export gl_cv_func_realpath_works=yes
+	fi
+
+	# bug #409919
+	export gl_cv_func_mknod_works=yes
+
+	if use static ; then
+		append-ldflags -static
+		# bug #321821
+		sed -i '/elf_sys=yes/s:yes:no:' configure || die
+	fi
+
+	if ! use selinux ; then
+		# bug #301782
+		export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# Non-root tests will fail if the full path isn't
+	# accessible to non-root users
+	chmod -R go-w "${WORKDIR}" || die
+	chmod a+rx "${WORKDIR}" || die
+
+	# coreutils tests like to do `mount` and such with temp dirs,
+	# so make sure:
+	# - /etc/mtab is writable (bug #265725)
+	# - /dev/loop* can be mounted (bug #269758)
+	mkdir -p "${T}"/mount-wrappers || die
+	mkwrap() {
+		local w ww
+		for w in "${@}" ; do
+			ww="${T}/mount-wrappers/${w}"
+			cat <<-EOF > "${ww}"
+				#!${EPREFIX}/bin/sh
+				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
+			EOF
+			chmod a+rx "${ww}" || die
+		done
+	}
+	mkwrap mount umount
+
+	addwrite /dev/full
+
+	#local -x RUN_EXPENSIVE_TESTS="yes"
+	#local -x COREUTILS_GROUPS="portage wheel"
+	local -x PATH="${T}/mount-wrappers:${PATH}"
+	local -x gl_public_submodule_commit=
+
+	local xfail_tests=(
+		# bug #629660
+		# Commented out again in 9.6 as it XPASSes on linux-6.12.10
+		# with sandbox-2.43 on tmpfs. Let's see if it lasts..
+		#tests/dd/no-allocate.sh
+
+		# bug #675802
+		tests/env/env-S
+		tests/env/env-S.pl
+
+		# bug #413621 and bug #548250
+		tests/du/long-from-unreadable.sh
+		tests/ls/removed-directory
+		tests/ls/removed-directory.sh
+		tests/ls/stat-free-symlinks
+		tests/ls/stat-free-symlinks.sh
+		tests/rm/deep-2
+		tests/rm/deep-2.sh
+
+		# We have a patch which fixes this (bug #259876)
+		#tests/touch/not-owner
+		#tests/touch/not-owner.sh
+	)
+
+	# This test is flaky (bug #910640).
+	cat > tests/tty/tty-eof.pl <<-EOF || die
+	#!/usr/bin/perl
+	exit 77;
+	EOF
+
+	# We set DISABLE_HARD_ERRORS because some of the tests hard error-out
+	# because of sandbox. They're skipped above but DISABLE_HARD_ERRORS is needed
+	# to downgrade them to FAIL.
+	emake -k check \
+		VERBOSE=yes \
+		DISABLE_HARD_ERRORS=yes \
+		XFAIL_TESTS="${xfail_tests[*]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS
+
+	if use split-usr ; then
+		cd "${ED}"/usr/bin || die
+		dodir /bin
+
+		# Move critical binaries into /bin (required by FHS)
+		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
+		           mkdir mknod mv pwd rm rmdir stty sync true uname"
+		mv ${fhs} ../../bin/ || die "Could not move FHS bins!"
+
+		if use hostname ; then
+			mv hostname ../../bin/ || die
+		fi
+
+		if use kill ; then
+			mv kill ../../bin/ || die
+		fi
+
+		# Move critical binaries into /bin (common scripts)
+		# (Why are these required for booting?)
+		local com="basename chroot cut dir dirname du env expr head mkfifo
+		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
+		mv ${com} ../../bin/ || die "Could not move common bins!"
+
+		# Create a symlink for uname in /usr/bin/ since autotools require it.
+		# (Other than uname, we need to figure out why we are
+		# creating symlinks for these in /usr/bin instead of leaving
+		# the files there in the first place...)
+		local x
+		for x in ${com} uname ; do
+			dosym ../../bin/${x} /usr/bin/${x}
+		done
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure you run 'hash -r' in your active shells."
+	ewarn "You should also re-source your shell settings for LS_COLORS"
+	ewarn "  changes, such as: source /etc/profile"
+}
diff --git a/sys-apps/coreutils/coreutils-9999.ebuild b/sys-apps/coreutils/coreutils-9999.ebuild
index 49d49c308392..6630d91c84d5 100644
--- a/sys-apps/coreutils/coreutils-9999.ebuild
+++ b/sys-apps/coreutils/coreutils-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
@@ -13,7 +13,7 @@ PYTHON_COMPAT=( python3_{10..13} )
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc
 inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
 
-MY_PATCH="${PN}-9.5-patches"
+MY_PATCH="${PN}-9.6-patches"
 DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
 HOMEPAGE="https://www.gnu.org/software/coreutils/"
 
@@ -223,7 +223,9 @@ src_test() {
 
 	local xfail_tests=(
 		# bug #629660
-		tests/dd/no-allocate.sh
+		# Commented out again in 9.6 as it XPASSes on linux-6.12.10
+		# with sandbox-2.43 on tmpfs. Let's see if it lasts..
+		#tests/dd/no-allocate.sh
 
 		# bug #675802
 		tests/env/env-S
diff --git a/sys-apps/dcfldd/dcfldd-1.9.2-r1.ebuild b/sys-apps/dcfldd/dcfldd-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..20a75c5ac003
--- /dev/null
+++ b/sys-apps/dcfldd/dcfldd-1.9.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools bash-completion-r1
+
+DESCRIPTION="enhanced dd with features for forensics and security"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/dcfldd"
+SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+
+DEPEND="virtual/pkgconfig"
+
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	ChangeLog
+	NEWS
+	README.md
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-bash-completion
+}
+
+src_install() {
+	default
+
+	# Fix Bash completion filename
+	mv "${D}$(get_bashcompdir)"/dcfldd{-bash_completion,} || die
+}
+
+src_test() {
+	# Just in case upstream add tests in future
+	default
+
+	# Smoke test for Gentoo bug #930996
+	# Inspired by https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114698#c0
+	expected_sha256sum="$(sha256sum <<<TestInput | awk '{print $1}')"
+	actual_sha256sum="$(src/dcfldd hash=sha256 2>&1 <<<TestInput \
+		| grep -F sha256 | awk '{print $3}')"
+	[[ ${actual_sha256sum} = ${expected_sha256sum} ]] \
+		|| die "dcfldd produced \"${actual_sha256sum}\" instead of expected \"${expected_sha256sum}\"."
+}
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index cae233d525be..245d881f551d 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,2 +1,4 @@
+DIST diffutils-3.10.242-d65b.tar.xz 1924516 BLAKE2B 3d4a2928b0c9462d1cd570d31b5d8ba32f3c3db23c2f96aca53c55a5d0738ee38ebd412138247313e7dc540284c2243ab49bffd23ed7eb320cef39118f195a2a SHA512 ad27490d59e77f5f6ca4d3a7d88d0ccbc1727aeded2427fd3bf7d5ecf478f182ae24938dec30f0eba9524cae771aac732ad26193a9a3f5356ab204152fa35423
+DIST diffutils-3.10.242-d65b.tar.xz.sig 833 BLAKE2B 2a7c70105d2d88edca9d771a21d39fba78ed25213fb922a48eae1e37d3eb2c07cce5ac24713cfdb336e1edd0def6f31aa79bac84ecc5a7d4ea80b4094cfccb26 SHA512 8a0564e14131c01aa93163a026fe9f87a2bebf4d9354b757233a1af81d7e276fb2e0dbc15e0d95ba89315a33d9751badd641755c901daa531d05547f4bcc9fb0
 DIST diffutils-3.10.tar.xz 1624240 BLAKE2B 24a90162b3d876e6378243f19a85a1f1bb4cdfe98d130dee684740a902f2987509d5830dd32df4e26678b468b96960f6f9785ffb922e828cb8b4acce0d8587f6 SHA512 219d2c815a120690c6589846271e43aee5c96c61a7ee4abbef97dfcdb3d6416652ed494b417de0ab6688c4322540d48be63b5e617beb6d20530b5d55d723ccbb
 DIST diffutils-3.10.tar.xz.sig 833 BLAKE2B 06650838d6a3327fda6b2ab09693170ec18b730b1f5981c8f3e2180b2c8a553307ae93199e4be0532a534a8a3f95e4a7b4fccbbd9e5f8d1b1cedd0816b0aac90 SHA512 91aa1fcfca224454e292540ea7813f4a0eb348f06a4374017326d524949775359fc833de597cc201c97f357eb6c675800828a6e3332572376f3554f1f2e1aca1
diff --git a/sys-apps/diffutils/diffutils-3.10_p20250103.ebuild b/sys-apps/diffutils/diffutils-3.10_p20250103.ebuild
new file mode 100644
index 000000000000..069dd2e31342
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.10_p20250103.ebuild
@@ -0,0 +1,58 @@
+# 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/diffutils.asc
+inherit verify-sig
+
+DESCRIPTION="Tools to make diffs and compare files"
+HOMEPAGE="https://www.gnu.org/software/diffutils/"
+
+if [[ ${PV} == *_p* ]] ; then
+	# Subscribe to the 'platform-testers' ML to find these.
+	# Useful to test on our especially more niche arches and report issues upstream.
+	MY_COMMIT="242-d65b"
+	MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
+	SRC_URI="https://meyering.net/diff/${MY_P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://meyering.net/diff/${MY_P}.tar.xz.sig )"
+	S="${WORKDIR}"/${MY_P}
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-diffutils )
+"
+
+src_prepare() {
+	default
+
+	# Needed because of ${P}-diff-D-option-regression.patch
+	#touch man/diff.1 || die
+}
+
+src_configure() {
+	# Disable automagic dependency over libsigsegv; see bug #312351.
+	export ac_cv_libsigsegv=no
+
+	# required for >=glibc-2.26, bug #653914
+	use elibc_glibc && export gl_cv_func_getopt_gnu=yes
+
+	local myeconfargs=(
+		# Interferes with F_S (sets F_S=2)
+		--disable-gcc-warnings
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR}"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index f56ceca3e2af..cc0ca43f0e15 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,2 +1,4 @@
 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
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/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-r2.ebuild b/sys-apps/file/file-5.46-r2.ebuild
new file mode 100644
index 000000000000..17090d64e6a3
--- /dev/null
+++ b/sys-apps/file/file-5.46-r2.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2025 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"
+	"${FILESDIR}/file-5.46-buffer-overflow.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-apps/file/files/file-5.46-buffer-overflow.patch b/sys-apps/file/files/file-5.46-buffer-overflow.patch
new file mode 100644
index 000000000000..75c3383a0e38
--- /dev/null
+++ b/sys-apps/file/files/file-5.46-buffer-overflow.patch
@@ -0,0 +1,22 @@
+https://gitlab.alpinelinux.org/alpine/aports/-/issues/16797
+https://gitlab.alpinelinux.org/alpine/aports/-/commit/5482d8c22c7c560b285ed1df1f691242fc4d5782
+https://bugs.astron.com/view.php?id=579
+https://github.com/file/file/commit/b3384a1fbfa1fee99986e5750ab8e700de4f24ad
+
+From b3384a1fbfa1fee99986e5750ab8e700de4f24ad Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Thu, 5 Dec 2024 18:35:40 +0000
+Subject: [PATCH] PR/579: net147: Fix stack overrun.
+
+--- a/src/readelf.c
++++ b/src/readelf.c
+@@ -1726,7 +1726,7 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
+ 	Elf64_Phdr ph64;
+ 	const char *linking_style;
+ 	unsigned char nbuf[NBUFSIZE];
+-	char interp[128];
++	char interp[NBUFSIZE];
+ 	ssize_t bufsize;
+ 	size_t offset, align, need = 0;
+ 	int pie = 0, dynamic = 0;
+
diff --git a/sys-apps/flatpak/flatpak-1.14.10.ebuild b/sys-apps/flatpak/flatpak-1.14.10.ebuild
index b0d6213c2395..bd593ed1b276 100644
--- a/sys-apps/flatpak/flatpak-1.14.10.ebuild
+++ b/sys-apps/flatpak/flatpak-1.14.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-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 linux-info python-any-r1 systemd tmpfiles
 
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.7.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.7.ebuild
index 3d9dbead55e0..25dd90e2f17a 100644
--- a/sys-apps/fwupd-efi/fwupd-efi-1.7.ebuild
+++ b/sys-apps/fwupd-efi/fwupd-efi-1.7.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
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git"
 else
 	SRC_URI="https://github.com/fwupd/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/sys-apps/gawk/gawk-5.3.1.ebuild b/sys-apps/gawk/gawk-5.3.1.ebuild
index 0aa748dc9c02..65e4aa1189b5 100644
--- a/sys-apps/gawk/gawk-5.3.1.ebuild
+++ b/sys-apps/gawk/gawk-5.3.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
@@ -29,7 +29,7 @@ else
 	SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~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
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-2.0.1.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-2.0.1.ebuild
index cc3c241d5b9a..580b5b726356 100644
--- a/sys-apps/gsmartcontrol/gsmartcontrol-2.0.1.ebuild
+++ b/sys-apps/gsmartcontrol/gsmartcontrol-2.0.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
@@ -16,7 +16,7 @@ else
 		https://github.com/ashaduri/gsmartcontrol/archive/refs/tags/v${PV}.tar.gz
 		-> ${P}.tar.gz
 	"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3 LGPL-3 0BSD Boost-1.0 ZLIB"
diff --git a/sys-apps/hwdata/hwdata-0.390.ebuild b/sys-apps/hwdata/hwdata-0.390.ebuild
index 9e6adae7a4b1..21b1f4e1c15d 100644
--- a/sys-apps/hwdata/hwdata-0.390.ebuild
+++ b/sys-apps/hwdata/hwdata-0.390.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-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/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RESTRICT="test"
 
diff --git a/sys-apps/intune-portal/Manifest b/sys-apps/intune-portal/Manifest
index 87af5741bd88..892fb6d4cb87 100644
--- a/sys-apps/intune-portal/Manifest
+++ b/sys-apps/intune-portal/Manifest
@@ -1 +1,2 @@
 DIST intune-portal_1.2405.17-jammy_amd64.deb 6662402 BLAKE2B 0f745cb0ebe6876645b14db04ba50e840cb11cfa8e9239080704299e461ffaded22f9e854ff8c635c08289e4b15f128780f30a6e2ef03d2ded4f2f1db512d3cc SHA512 5188f7467ed7cd85c8a70a24669ad2906517e71a5ca2f06f27437e9078df569afbf95c3b7b02b2c65dc85c2e58a799313e30211bab9226fabe4399a2bdb52073
+DIST intune-portal_1.2411.14-noble_amd64.deb 6606406 BLAKE2B 3c56cb0f5c264cda4a008dd49860c721c0ab94d25f9af065c7e523e656884ff42a600be2f93f8a5247090e34e63fdf15804bc14b17e2c1e0318db2b23e618db7 SHA512 09c3e00739edbff611334f4faf3e0337e33db9e51d203d12169ef696f8dcf3d96bab0fa57e51edb5800656413e74986d814d30494d20c25b7b709a586364919a
diff --git a/sys-apps/intune-portal/intune-portal-1.2411.14.ebuild b/sys-apps/intune-portal/intune-portal-1.2411.14.ebuild
new file mode 100644
index 000000000000..2eb398023df2
--- /dev/null
+++ b/sys-apps/intune-portal/intune-portal-1.2411.14.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pam prefix systemd tmpfiles unpacker xdg
+
+DESCRIPTION="Microsoft Intune Company Portal to access a corporate environment"
+HOMEPAGE="https://learn.microsoft.com/mem/intune/"
+SRC_URI="https://packages.microsoft.com/ubuntu/24.04/prod/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-noble_amd64.deb"
+S="${WORKDIR}"
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	app-accessibility/at-spi2-core:2
+	app-crypt/libsecret
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/openssl:0/3
+	net-libs/libsoup:3.0
+	net-libs/webkit-gtk:4.1/0
+	net-misc/curl
+	sys-apps/bubblewrap
+	sys-apps/dbus
+	sys-apps/lsb-release
+	sys-apps/systemd
+	sys-apps/util-linux
+	sys-auth/microsoft-identity-broker
+	sys-auth/pambase[pwquality]
+	sys-auth/polkit
+	sys-libs/pam
+	sys-libs/zlib
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/pango
+
+	|| (
+		www-client/microsoft-edge
+		www-client/microsoft-edge-beta
+		www-client/microsoft-edge-dev
+	)
+"
+
+QA_PREBUILT="*"
+DIR="/opt/microsoft/intune"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_install() {
+	exeinto "${DIR}"/bin
+	newexe $(prefixify_ro "${FILESDIR}"/wrapper) intune-portal
+	dosym intune-portal /opt/microsoft/intune/bin/intune-agent
+	dosym intune-portal /opt/microsoft/intune/bin/intune-daemon
+
+	exeinto "${DIR}"/libexec
+	doexe "${DIR#/}"/bin/*
+
+	insinto "${DIR}"/share
+	doins -r "${DIR#/}"/share/*
+
+	insinto /usr/share/polkit-1/actions
+	doins usr/share/polkit-1/actions/com.microsoft.intune.policy
+
+	systemd_dounit lib/systemd/system/*
+	systemd_douserunit lib/systemd/user/*
+
+	dopammod usr/lib/x86_64-linux-gnu/security/pam_intune.so
+	dotmpfiles usr/lib/tmpfiles.d/intune.conf
+
+	domenu usr/share/applications/*.desktop
+	doicon -s 48 usr/share/icons/hicolor/48x48/*/*.png
+}
+
+pkg_postinst() {
+	touch "${EROOT}"/etc/pam.d/common-password || die
+	tmpfiles_process intune.conf
+	xdg_pkg_postinst
+}
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index a6ceec0bf657..bd4101076274 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -1,6 +1,5 @@
 DIST inxi-3.3.27.1.tar.gz 614167 BLAKE2B 1a312255340bfe361eb10dd725cc9fb1421d8dfda34ee944347278e4a293cbcb51d1e2b7aa00f26c16286b90f26d3e0f91f68fb4beeb112ecd8f7a3bc86680ff SHA512 f21285d709d8dc7ce393a6c3b43b5ebabb8ef2c55adf43f00935b728a28f502bbcbd8c1482249e872e4623430f01b4e8cf51f0a6790d56fb12147fa125152575
-DIST inxi-3.3.30.1.tar.gz 643283 BLAKE2B cfcafc643e7e18261fac622df3614e7ad296ec2233ebf6750243d9490e0ca5e8ba3742286a0630ae948d16ac4d09705ffc1b20df666f48ed2c5331a8320919d7 SHA512 dba5c23d991bd6fb34eec9c2b6107da4e0ddab202f97e8aa53efb25d446fbe77f5250a9d14f543014f21d2cc614cd4e2d486a9f1fae78dde37ecee418cb763f5
 DIST inxi-3.3.33.1.tar.gz 679978 BLAKE2B 7445989e64cbb4beb39d6b415230ed70f5b7be90a9b4155104abdb4d57d490ea5ae09cd48871ed3745ba7b719fe4eb49e9706ad168f59245c66f8f576cf022f3 SHA512 7537da7175fe1578a09567e169a309c5258cbb1fd1ae7e58d98df800110cd03333775f8a73f672a5a6a8f0a950123f4f5908a15023648da9150f43464d25be10
-DIST inxi-3.3.34.1.tar.gz 683279 BLAKE2B 5693d8add89185fe626f8f6a9e606f7582175402158cd01e30b91779eb289e00d5e8bc71c0d72028b0d5bf1913c040c206c7db83e5fd4639a622dc847d6f1ba9 SHA512 75b21d4ac99383b44d9a2f0f206b3bc612bd2f10fdae44e4b15373090825eea6c7c70250c8f535438d44fc4e938e4ebdb813016cc4a6ab2dbd6d91b6b50adc27
 DIST inxi-3.3.35.1.tar.gz 689546 BLAKE2B 5b383998a110291f02807e2d61f5454a49437bb1dea682ec677ea9e76b5d9fcfb1b1d644700670d71f999ca6fdd100e852d6ab7936309998e6992507b2083c02 SHA512 f71d18c63d7d4dbe4d9d1d6c1dace2527c5ef1c29f58ea08d0d3f09f86c0a7514ec448b3f1f83392d19bd7c64e3718d1ed5f420589a67893ad9b32cc8d0c810c
 DIST inxi-3.3.36.1.tar.gz 695643 BLAKE2B 7d766ac3fa3751a6dcbf0d02681361690b3b60ad31e8ce16b26a9c4292f7ab9691b95a72a537fbd23635ea866b32c38bb1ffdba0e1e54a3ff130adc8b86d5819 SHA512 e66ee59bc14f06b08e384196a9f4c032c99f2bd402601f9318bb0d9c4092cc4638f992e183b034188cb59ad5cca0f93ae56c4c2deea274b5b428f58bf56e95e8
+DIST inxi-3.3.37.1.tar.gz 706475 BLAKE2B fcbd99541290a9fa0d5aadf8fbce780534482739dac24e443abdb381dabc87518ad169115ebacbb06e3c2556bb218c6b498bc3d20b329977d2220ad8f6faa241 SHA512 f2347106cde96910efe6b0c4f7afa5cdb3694010fc9c6901122d3c0d93900c53ef49a0ff8350ea0e1fcda65eebe03cc5807ac96871546435f8e112df6cf51bbd
diff --git a/sys-apps/inxi/inxi-3.3.30.1.ebuild b/sys-apps/inxi/inxi-3.3.30.1.ebuild
deleted file mode 100644
index 0b242f767d8c..000000000000
--- a/sys-apps/inxi/inxi-3.3.30.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV=$(ver_rs 3 '-')
-# 2.3.56 was the last version with no tagged release.
-# It was also the last Bash based release. Later versions are Perl based
-
-DESCRIPTION="The CLI inxi collects and prints hardware and system information"
-HOMEPAGE="https://codeberg.org/smxi/inxi"
-SRC_URI="https://github.com/smxi/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-IUSE="bluetooth hddtemp opengl"
-
-RDEPEND="dev-lang/perl
-	sys-apps/pciutils
-	sys-apps/usbutils
-	bluetooth? ( net-wireless/bluez )
-	hddtemp? ( app-admin/hddtemp )
-	opengl? ( x11-apps/mesa-progs )
-	"
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc README.txt
-}
diff --git a/sys-apps/inxi/inxi-3.3.34.1.ebuild b/sys-apps/inxi/inxi-3.3.34.1.ebuild
deleted file mode 100644
index 83d9c80c0e50..000000000000
--- a/sys-apps/inxi/inxi-3.3.34.1.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
-
-MY_PV=$(ver_rs 3 '-')
-
-inherit optfeature
-
-DESCRIPTION="The CLI inxi collects and prints hardware and system information"
-HOMEPAGE="https://codeberg.org/smxi/inxi"
-SRC_URI="https://codeberg.org/smxi/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="dev-lang/perl
-	sys-apps/pciutils
-	"
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc README.txt
-}
-
-pkg_postinst() {
-	# All packages are in the same order as displayed by inxi --recommends
-	# including duplicates in order to keep track of changes in the future.
-	optfeature_header "Optional features as suggested by inxi --recommends:"
-
-	optfeature "blockdev: --admin -p/-P (filesystem blocksize)" sys-apps/util-linux
-	optfeature "bt-adapter: -E bluetooth data (if no hciconfig, btmgmt)" net-wireless/bluez-tools
-	optfeature "btmgmt: -E bluetooth data (if no hciconfig)" net-wireless/bluez
-	optfeature "dig: -i wlan IP" net-dns/bind-tools
-	optfeature "dmidecode: -M if no sys machine data; -m" sys-apps/dmidecode
-	optfeature "doas: -Dx hddtemp-user; -o file-user (alt for sudo)" app-admin/doas
-	optfeature "fdisk: -D partition scheme (fallback)" sys-apps/util-linux
-
-	# currently implicit dependency:
-	# optfeature "file: -o unmounted file system (if no lsblk)" sys-apps/file
-	# not packaged yet:
-	# fruid_print: -M machine data, Elbrus only
-
-	optfeature "hciconfig: -E bluetooth data (deprecated, good report)" net-wireless/bluez
-	optfeature "hddtemp: -Dx show hdd temp, if no drivetemp module" app-admin/hddtemp
-	optfeature "ifconfig: -i ip LAN (deprecated)" sys-apps/net-tools
-	optfeature "ip: -i ip LAN" sys-apps/iproute2
-	optfeature "ipmitool: -s IPMI sensors (servers)" sys-apps/ipmitool
-	optfeature "ipmi-sensors: -s IPMI sensors (servers)" sys-libs/freeipmi
-	optfeature "lsblk: -L LUKS/bcache; -o unmounted file system (best option)" sys-apps/util-linux
-	optfeature "lsusb: -A usb audio; -J (optional); -N usb networking" sys-apps/usbutils
-	optfeature "lvs: -L LVM data" sys-fs/lvm2
-	optfeature "mdadm: -Ra advanced mdraid data" sys-fs/mdadm
-	optfeature "modinfo: Ax; -Nx module version" sys-apps/kmod
-	optfeature "runlevel: -I fallback to Perl" sys-apps/sysvinit
-	optfeature "sensors: -s sensors output (optional, /sys supplies most)" sys-apps/lm-sensors
-	optfeature "smartctl: -Da advanced data" sys-apps/smartmontools
-	# TODO optfeature "strings: -I sysvinit version" llvm-core/llvm-toolchain-symlinks
-	optfeature "sudo: -Dx hddtemp-user; -o file-user (try doas!)" app-admin/sudo
-	optfeature "tree: --debugger 20,21 /sys tree" app-text/tree
-	optfeature "udevadm: -m ram data for non-root, or no dmidecode" sys-apps/systemd
-	optfeature "upower: -sx attached device battery info" sys-power/upower
-	optfeature "uptime: -I uptime" sys-process/procps
-	optfeature "eglinfo: -G X11/Wayland EGL info" x11-apps/mesa-progs
-	optfeature "glxinfo: -G X11 GLX info" x11-apps/mesa-progs
-	optfeature "vulkaninfo: -G Vulkan API info" dev-util/vulkan-tools
-	optfeature "wayland-info: -G Wayland data (not for X)" app-misc/wayland-utils
-	optfeature "wmctrl: -S active window manager (fallback)" x11-misc/wmctrl
-	optfeature "xdpyinfo: -G (X) Screen resolution, dpi; -Ga Screen size" x11-apps/xdpyinfo
-	optfeature "xprop: -S (X) desktop data" x11-apps/xprop
-	optfeature "xdriinfo: -G (X) DRI driver (if missing, fallback to Xorg log)" x11-apps/xdriinfo
-	optfeature "xrandr: -G (X) monitors(s) resolution; -Ga monitor data" x11-apps/xrandr
-}
diff --git a/sys-apps/inxi/inxi-3.3.37.1.ebuild b/sys-apps/inxi/inxi-3.3.37.1.ebuild
new file mode 100644
index 000000000000..b71d091fd395
--- /dev/null
+++ b/sys-apps/inxi/inxi-3.3.37.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV=$(ver_rs 3 '-')
+
+inherit optfeature
+
+DESCRIPTION="The CLI inxi collects and prints hardware and system information"
+HOMEPAGE="https://codeberg.org/smxi/inxi"
+SRC_URI="https://codeberg.org/smxi/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="dev-lang/perl
+	sys-apps/pciutils
+	"
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README.txt
+}
+
+pkg_postinst() {
+	# All packages are in the same order as displayed by inxi --recommends
+	# including duplicates in order to keep track of changes in the future.
+	optfeature_header "Optional features as suggested by inxi --recommends:"
+
+	optfeature "blockdev: --admin -p/-P (filesystem blocksize)" sys-apps/util-linux
+	optfeature "bt-adapter: -E bluetooth data (if no hciconfig, btmgmt)" net-wireless/bluez-tools
+	optfeature "btmgmt: -E bluetooth data (if no hciconfig)" net-wireless/bluez
+	optfeature "dig: -i wlan IP" net-dns/bind-tools
+	optfeature "dmidecode: -M if no sys machine data; -m" sys-apps/dmidecode
+	optfeature "doas: -Dx hddtemp-user; -o file-user (alt for sudo)" app-admin/doas
+	optfeature "fdisk: -D partition scheme (fallback)" sys-apps/util-linux
+
+	# currently implicit dependency:
+	# optfeature "file: -o unmounted file system (if no lsblk)" sys-apps/file
+	# not packaged yet:
+	# fruid_print: -M machine data, Elbrus only
+
+	optfeature "hciconfig: -E bluetooth data (deprecated, good report)" net-wireless/bluez
+	optfeature "hddtemp: -Dx show hdd temp, if no drivetemp module" app-admin/hddtemp
+	optfeature "ifconfig: -i ip LAN (deprecated)" sys-apps/net-tools
+	optfeature "ip: -i ip LAN" sys-apps/iproute2
+	optfeature "ipmitool: -s IPMI sensors (servers)" sys-apps/ipmitool
+	optfeature "ipmi-sensors: -s IPMI sensors (servers)" sys-libs/freeipmi
+	optfeature "lsblk: -L LUKS/bcache; -o unmounted file system (best option)" sys-apps/util-linux
+	optfeature "lsusb: -A usb audio; -J (optional); -N usb networking" sys-apps/usbutils
+	optfeature "lvs: -L LVM data" sys-fs/lvm2
+	optfeature "mdadm: -Ra advanced mdraid data" sys-fs/mdadm
+	optfeature "modinfo: Ax; -Nx module version" sys-apps/kmod
+	optfeature "runlevel: -I fallback to Perl" sys-apps/sysvinit
+	optfeature "sensors: -s sensors output (optional, /sys supplies most)" sys-apps/lm-sensors
+	optfeature "smartctl: -Da advanced data" sys-apps/smartmontools
+	# TODO optfeature "strings: -I sysvinit version" llvm-core/llvm-toolchain-symlinks
+	optfeature "sudo: -Dx hddtemp-user; -o file-user (try doas!)" app-admin/sudo
+	optfeature "tree: --debugger 20,21 /sys tree" app-text/tree
+	optfeature "udevadm: -m ram data for non-root, or no dmidecode" sys-apps/systemd
+	optfeature "upower: -sx attached device battery info" sys-power/upower
+	optfeature "uptime: -I uptime" sys-process/procps
+	optfeature "eglinfo: -G X11/Wayland EGL info" x11-apps/mesa-progs
+	optfeature "glxinfo: -G X11 GLX info" x11-apps/mesa-progs
+	optfeature "vulkaninfo: -G Vulkan API info" dev-util/vulkan-tools
+	optfeature "wayland-info: -G Wayland data (not for X)" app-misc/wayland-utils
+	optfeature "wmctrl: -S active window manager (fallback)" x11-misc/wmctrl
+	optfeature "xdpyinfo: -G (X) Screen resolution, dpi; -Ga Screen size" x11-apps/xdpyinfo
+	optfeature "xprop: -S (X) desktop data" x11-apps/xprop
+	optfeature "xdriinfo: -G (X) DRI driver (if missing, fallback to Xorg log)" x11-apps/xdriinfo
+	optfeature "xrandr: -G (X) monitors(s) resolution; -Ga monitor data" x11-apps/xrandr
+}
diff --git a/sys-apps/iproute2/iproute2-6.12.0.ebuild b/sys-apps/iproute2/iproute2-6.12.0.ebuild
index e2a123f5156c..e86e0d2eb78d 100644
--- a/sys-apps/iproute2/iproute2-6.12.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.12.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
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.30.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.30.ebuild
index d0255bda1bc6..01ccb6c2cfe4 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.30.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.30.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 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Load another kernel from the currently executing Linux kernel"
diff --git a/sys-apps/moar/Manifest b/sys-apps/moar/Manifest
index 58d880b9f8c1..fa48bc68a8de 100644
--- a/sys-apps/moar/Manifest
+++ b/sys-apps/moar/Manifest
@@ -1,12 +1,4 @@
-DIST moar-1.24.6-deps.tar.xz 1228028 BLAKE2B f8895cef15f6ab0eb5dcf826d86deb7dc2c67dd6e692e456d5d98830fba93b3a17e5d3b3026c0f7ea10e3810db1f17ccb27b3cb704cff1c9bcbd267fbf68acbd SHA512 f12f2fa563b5170c8fe092f15476692815c2e0ab341d8becff504e5ded426efae5fc20697ef935ca5d037fa40abbfebbe5d0f59ac4e805e2d7d60e19070df3d4
-DIST moar-1.24.6.tar.gz 2806800 BLAKE2B c412c62f7a1c9dba73e1ae7b31d43ffa58789e93a22b357dc4469168fd5cef95732a2363fadb4b4266169de5aaf3e541c4212730425e4c2ad91f194c7e9107f7 SHA512 77d5b789449806e8355702af762cd4cd604a885e7ffdebfcd6601073ea8cd0893c12999662352780d9915a9fbcb3bbc35e1e5b637e1ae15f73a5e65ca632193e
-DIST moar-1.26.0-deps.tar.xz 1228028 BLAKE2B f8895cef15f6ab0eb5dcf826d86deb7dc2c67dd6e692e456d5d98830fba93b3a17e5d3b3026c0f7ea10e3810db1f17ccb27b3cb704cff1c9bcbd267fbf68acbd SHA512 f12f2fa563b5170c8fe092f15476692815c2e0ab341d8becff504e5ded426efae5fc20697ef935ca5d037fa40abbfebbe5d0f59ac4e805e2d7d60e19070df3d4
-DIST moar-1.26.0.tar.gz 2811931 BLAKE2B 8f0ed34aeb5a4116a8a42cbef2f40f0ed81a60f5bb9160ec743694263e35674f126b0ec359e0ec390baed7f8cf6c4d457cf4e401c4ef951cc7dd9163b0a0e2f7 SHA512 e3de7183df6b4e29ffa43f1681b8c5bc207a7f4e33ad42c3021a4260da91bb8ade3bb4f3c7d9cd6603cb416c7f4c976d2525d96862deff3080c9d1ec17c127ef
-DIST moar-1.27.1-deps.tar.xz 1228028 BLAKE2B f8895cef15f6ab0eb5dcf826d86deb7dc2c67dd6e692e456d5d98830fba93b3a17e5d3b3026c0f7ea10e3810db1f17ccb27b3cb704cff1c9bcbd267fbf68acbd SHA512 f12f2fa563b5170c8fe092f15476692815c2e0ab341d8becff504e5ded426efae5fc20697ef935ca5d037fa40abbfebbe5d0f59ac4e805e2d7d60e19070df3d4
-DIST moar-1.27.1.tar.gz 2812825 BLAKE2B 11998da52d8eebf0a2b1e9e82af5e78b5c559efdcc033dabc8d98dc9e324795c481e51dd63ef5eb7f46c544d60215708a967a5a47f2f87e974fc02f4cab78690 SHA512 6363bbb7399af16f844d61a630b192f866a2f9dd9a9f34caee14c7d704c52f193b3c0643053892b0483dbe0378bd87ed40bae5915bf366a877115b060d64d4b9
-DIST moar-1.27.2-deps.tar.xz 1350592 BLAKE2B fc352d2f2b4a6faecdac05306306ba9c6b18c95a8844c1e9e37e0e9e7edb6ce04ef616bd1c627c688c71ab4236c3282c9bd4944347fd3bb0385f96dd7e92aab5 SHA512 e6de09efc97a682bebc6a8f21366a8982c1e211f74e0af80768e14302497b23a37863b8895a7e8fe6aa59cffd4114f57ad9db6ea6cf6cbfc18bfe0225ad8f4ff
-DIST moar-1.27.2.tar.gz 2843838 BLAKE2B 600b070ac47a002cb96f4b87bc5f48a9d6ad5920ef17ba3100f30ca9852884476f41b07d38d98820e553ad0cfc28a679e55e986dfcba633f4fe89beba72ddd49 SHA512 f6ab70e929bfcec575f7f2d6e31ad6fd723355f68bc327d4ee59707b58617e635d089e501bd86cdca5d2c09c7db21fdedb7fab79e0456a5f806ab848ae0aa99b
-DIST moar-1.29.0-deps.tar.xz 1359500 BLAKE2B 302b176f2b22878a6a1eb0e5d57eeb83adf0b3dd790a070d969b4b840741700e4143d9abd7138d556cb7fa04b72412c52e8d4560cb8f925f5e6625633cbd1d4e SHA512 317df040f8541548bfec2d27557cf34a547cea60a3a921860fa50e099c792fd4a2b6822fadc7b0b4d395f7d7f338bc7cb39ef2f267a8a4df27e4d554a8b34b36
-DIST moar-1.29.0.tar.gz 2846285 BLAKE2B 4afbe74849985ac702b5847ebe640f074ea7603eff5d0ed6a04b3716373e0f73cb040c4869a469b8b36ebd964a0ed059ae3dd43d45d532753796b8478192f23f SHA512 a9d4944533aed9deeb2e87572147e522b65273e0eb0b0d04253d2d22d9e6f7c7dbf9ffa045a6e70f1d5f4b37e7e8a301f63f2a080742af90f4db2bdb20a04e18
 DIST moar-1.30.0-deps.tar.xz 1359500 BLAKE2B 302b176f2b22878a6a1eb0e5d57eeb83adf0b3dd790a070d969b4b840741700e4143d9abd7138d556cb7fa04b72412c52e8d4560cb8f925f5e6625633cbd1d4e SHA512 317df040f8541548bfec2d27557cf34a547cea60a3a921860fa50e099c792fd4a2b6822fadc7b0b4d395f7d7f338bc7cb39ef2f267a8a4df27e4d554a8b34b36
 DIST moar-1.30.0.tar.gz 2846509 BLAKE2B 7bd6d1365c8144245c41b7604aababc708c8f91ff0780f261c448725945fe771e327ce16fe8956bdc0a3c72f0a0134441e0a60a3af5b4a352ad2fd5598f44841 SHA512 2a3c4bd6ce42aada69307d2b0d638faa72674defe8dfa67a6bf98808a20b35564b23deb6cb0697f3f5cde993a125c44441c7f50d37d420ed1b160048d7e5dd97
+DIST moar-1.31.2-deps.tar.xz 1359500 BLAKE2B 302b176f2b22878a6a1eb0e5d57eeb83adf0b3dd790a070d969b4b840741700e4143d9abd7138d556cb7fa04b72412c52e8d4560cb8f925f5e6625633cbd1d4e SHA512 317df040f8541548bfec2d27557cf34a547cea60a3a921860fa50e099c792fd4a2b6822fadc7b0b4d395f7d7f338bc7cb39ef2f267a8a4df27e4d554a8b34b36
+DIST moar-1.31.2.tar.gz 2848497 BLAKE2B e6fa227a770b9df1b5eb352c94851179eda42979f496dd621d65329b5ad7d12aa6763823d9f2c23281389133f3961f6a5d3e42d67b2a4c7b381931adaca4d0db SHA512 47aa7c8349460c67a90adccd9331fe5e0a19b2a0647a45492f1d2e9b5cbf3c944f0d64a7cb9b54364ba0ab8e2d501a83dd92e838495626f104fe6d9b52da6505
diff --git a/sys-apps/moar/moar-1.24.6.ebuild b/sys-apps/moar/moar-1.24.6.ebuild
deleted file mode 100644
index 7da7d0e2a6a0..000000000000
--- a/sys-apps/moar/moar-1.24.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-env go-module
-
-DESCRIPTION="Pager designed to do the right thing without any configuration"
-HOMEPAGE="https://github.com/walles/moar"
-SRC_URI="https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# moarvm: https://github.com/walles/moar/issues/143
-RDEPEND="!dev-lang/moarvm"
-BDEPEND="
-	test? (
-		app-arch/bzip2
-		app-arch/xz-utils
-	)
-"
-
-src_unpack() {
-	default
-
-	if [[ -d "${WORKDIR}"/vendor ]] ; then
-		mv "${WORKDIR}"/vendor "${S}"/vendor || die
-	fi
-	go-env_set_compile_environment
-}
-
-src_compile() {
-	# https://github.com/walles/moar/blob/master/build.sh#L28
-	ego build -ldflags="-w -X main.versionString=${PV}" -o moar
-}
-
-src_test() {
-	# From test.sh (we don't run that because it has some linting etc)
-	ego test -timeout 20s ./...
-}
-
-src_install() {
-	dobin moar
-	doman moar.1
-	einstalldocs
-}
diff --git a/sys-apps/moar/moar-1.26.0.ebuild b/sys-apps/moar/moar-1.26.0.ebuild
deleted file mode 100644
index 7da7d0e2a6a0..000000000000
--- a/sys-apps/moar/moar-1.26.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-env go-module
-
-DESCRIPTION="Pager designed to do the right thing without any configuration"
-HOMEPAGE="https://github.com/walles/moar"
-SRC_URI="https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# moarvm: https://github.com/walles/moar/issues/143
-RDEPEND="!dev-lang/moarvm"
-BDEPEND="
-	test? (
-		app-arch/bzip2
-		app-arch/xz-utils
-	)
-"
-
-src_unpack() {
-	default
-
-	if [[ -d "${WORKDIR}"/vendor ]] ; then
-		mv "${WORKDIR}"/vendor "${S}"/vendor || die
-	fi
-	go-env_set_compile_environment
-}
-
-src_compile() {
-	# https://github.com/walles/moar/blob/master/build.sh#L28
-	ego build -ldflags="-w -X main.versionString=${PV}" -o moar
-}
-
-src_test() {
-	# From test.sh (we don't run that because it has some linting etc)
-	ego test -timeout 20s ./...
-}
-
-src_install() {
-	dobin moar
-	doman moar.1
-	einstalldocs
-}
diff --git a/sys-apps/moar/moar-1.27.1.ebuild b/sys-apps/moar/moar-1.27.1.ebuild
deleted file mode 100644
index 928e03d26244..000000000000
--- a/sys-apps/moar/moar-1.27.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-env go-module
-
-DESCRIPTION="Pager designed to do the right thing without any configuration"
-HOMEPAGE="https://github.com/walles/moar"
-SRC_URI="https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# moarvm: https://github.com/walles/moar/issues/143
-RDEPEND="!dev-lang/moarvm"
-BDEPEND="
-	test? (
-		app-arch/bzip2
-		app-arch/xz-utils
-	)
-"
-
-src_unpack() {
-	default
-
-	if [[ -d "${WORKDIR}"/vendor ]] ; then
-		mv "${WORKDIR}"/vendor "${S}"/vendor || die
-	fi
-	go-env_set_compile_environment
-}
-
-src_compile() {
-	# https://github.com/walles/moar/blob/master/build.sh#L28
-	ego build -ldflags="-w -X main.versionString=${PV}" -o moar
-}
-
-src_test() {
-	# From test.sh (we don't run that because it has some linting etc)
-	ego test -timeout 20s ./...
-}
-
-src_install() {
-	dobin moar
-	doman moar.1
-	einstalldocs
-}
diff --git a/sys-apps/moar/moar-1.27.2.ebuild b/sys-apps/moar/moar-1.27.2.ebuild
deleted file mode 100644
index 7da7d0e2a6a0..000000000000
--- a/sys-apps/moar/moar-1.27.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-env go-module
-
-DESCRIPTION="Pager designed to do the right thing without any configuration"
-HOMEPAGE="https://github.com/walles/moar"
-SRC_URI="https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# moarvm: https://github.com/walles/moar/issues/143
-RDEPEND="!dev-lang/moarvm"
-BDEPEND="
-	test? (
-		app-arch/bzip2
-		app-arch/xz-utils
-	)
-"
-
-src_unpack() {
-	default
-
-	if [[ -d "${WORKDIR}"/vendor ]] ; then
-		mv "${WORKDIR}"/vendor "${S}"/vendor || die
-	fi
-	go-env_set_compile_environment
-}
-
-src_compile() {
-	# https://github.com/walles/moar/blob/master/build.sh#L28
-	ego build -ldflags="-w -X main.versionString=${PV}" -o moar
-}
-
-src_test() {
-	# From test.sh (we don't run that because it has some linting etc)
-	ego test -timeout 20s ./...
-}
-
-src_install() {
-	dobin moar
-	doman moar.1
-	einstalldocs
-}
diff --git a/sys-apps/moar/moar-1.29.0.ebuild b/sys-apps/moar/moar-1.29.0.ebuild
deleted file mode 100644
index 928e03d26244..000000000000
--- a/sys-apps/moar/moar-1.29.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-env go-module
-
-DESCRIPTION="Pager designed to do the right thing without any configuration"
-HOMEPAGE="https://github.com/walles/moar"
-SRC_URI="https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# moarvm: https://github.com/walles/moar/issues/143
-RDEPEND="!dev-lang/moarvm"
-BDEPEND="
-	test? (
-		app-arch/bzip2
-		app-arch/xz-utils
-	)
-"
-
-src_unpack() {
-	default
-
-	if [[ -d "${WORKDIR}"/vendor ]] ; then
-		mv "${WORKDIR}"/vendor "${S}"/vendor || die
-	fi
-	go-env_set_compile_environment
-}
-
-src_compile() {
-	# https://github.com/walles/moar/blob/master/build.sh#L28
-	ego build -ldflags="-w -X main.versionString=${PV}" -o moar
-}
-
-src_test() {
-	# From test.sh (we don't run that because it has some linting etc)
-	ego test -timeout 20s ./...
-}
-
-src_install() {
-	dobin moar
-	doman moar.1
-	einstalldocs
-}
diff --git a/sys-apps/moar/moar-1.30.0.ebuild b/sys-apps/moar/moar-1.30.0.ebuild
index 928e03d26244..843bdba6ed6a 100644
--- a/sys-apps/moar/moar-1.30.0.ebuild
+++ b/sys-apps/moar/moar-1.30.0.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
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar
 
 LICENSE="BSD-2 BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ~ppc64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/moar/moar-1.31.2.ebuild b/sys-apps/moar/moar-1.31.2.ebuild
new file mode 100644
index 000000000000..85a4dd69c341
--- /dev/null
+++ b/sys-apps/moar/moar-1.31.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-env go-module
+
+DESCRIPTION="Pager designed to do the right thing without any configuration"
+HOMEPAGE="https://github.com/walles/moar"
+SRC_URI="https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# moarvm: https://github.com/walles/moar/issues/143
+RDEPEND="!dev-lang/moarvm"
+BDEPEND="
+	test? (
+		app-arch/bzip2
+		app-arch/xz-utils
+	)
+"
+
+src_unpack() {
+	default
+
+	if [[ -d "${WORKDIR}"/vendor ]] ; then
+		mv "${WORKDIR}"/vendor "${S}"/vendor || die
+	fi
+	go-env_set_compile_environment
+}
+
+src_compile() {
+	# https://github.com/walles/moar/blob/master/build.sh#L28
+	ego build -ldflags="-w -X main.versionString=${PV}" -o moar
+}
+
+src_test() {
+	# From test.sh (we don't run that because it has some linting etc)
+	ego test -timeout 20s ./...
+}
+
+src_install() {
+	dobin moar
+	doman moar.1
+	einstalldocs
+}
diff --git a/sys-apps/openrazer/openrazer-3.9.0-r1.ebuild b/sys-apps/openrazer/openrazer-3.9.0-r1.ebuild
index 399101f11d6f..549853164608 100644
--- a/sys-apps/openrazer/openrazer-3.9.0-r1.ebuild
+++ b/sys-apps/openrazer/openrazer-3.9.0-r1.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
@@ -20,7 +20,7 @@ else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sys-apps/pcsc-lite/pcsc-lite-2.3.0.ebuild b/sys-apps/pcsc-lite/pcsc-lite-2.3.0.ebuild
index 175265112a7b..0eba5b37d47b 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-2.3.0.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-2.3.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 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.xz"
 # upstream.
 LICENSE="BSD GPL-3+ BSD-2 ISC GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
diff --git a/sys-apps/pkgcraft-tools/Manifest b/sys-apps/pkgcraft-tools/Manifest
index daef2e50c124..f10437c3c20a 100644
--- a/sys-apps/pkgcraft-tools/Manifest
+++ b/sys-apps/pkgcraft-tools/Manifest
@@ -1,3 +1,4 @@
 DIST pkgcraft-tools-0.0.17.tar.xz 20947804 BLAKE2B d574536965680ff5b41848a36e2fa05008d93048d16a1f9932e618c4bd9ef7cf1a3bd918eca8d2c9d189bc88fd112e2aeb999f9b565f7864d7241ba9e825ed22 SHA512 c136a1b2c7e7c1104ff52838afe40b007c7ff6182f3a8a7a9276ccbcd77ec94a1192e61b40c6030fe7ecc44cdfd1ced960c6d4368f43671ce45364435efca9c0
 DIST pkgcraft-tools-0.0.19.tar.xz 20944764 BLAKE2B f7584359f1f3b853b11186eee7f2a2a189e94540d8efbe27d1f624a42d30a03e834ad585b91247f8796676869ff51539ed67ed254437891407eacb1331785599 SHA512 7a4421568693496c2a5185bdf7430cc7f8c2739a2a47512cf31c2696f4f3c7faf1f4d9f523ae4685daa5a14de6f812a3320f24522765ae6004829ec357a9bb8c
 DIST pkgcraft-tools-0.0.21.tar.xz 30344180 BLAKE2B cdbe238ca7b69b25e4abb57594f1c5e837b3bf18a5057005f9e4455e53cd9c7320b34bbef922b96a718e65b28d478d92e3f124e39ad6db86e9e6f0b261e0bbd8 SHA512 4e7e4f3109b53c74e0974968c6839c115da2ea57985c45b44b7e99ca7ef7b79739aa36c7bc57159a78ec65bbea71471fa64c52aa3fd6a612d1b9915f0d3ea51e
+DIST pkgcraft-tools-0.0.22.tar.xz 30423796 BLAKE2B 629aa46a6d11deda0115837b711868956d5d8eb504437c5811feb248c8dd05b494bb2fc610041ba3b8a6a9fd892e576ec58a17f0e67c645114f9cfaed88135ab SHA512 53bde64ff94c23c7f4c149843573fba7a294869fa486631a1cac46fe9dc3560d4fe337d6b242b2709106f6a5da798718a8244349bd058de92856c6d7c0b457ad
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.22.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.22.ebuild
new file mode 100644
index 000000000000..c5968bc757d6
--- /dev/null
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.22.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=" "
+LLVM_COMPAT=( {17..19} )
+RUST_MIN_VER="1.82.0"
+
+inherit cargo edo llvm-r1 shell-completion
+
+DESCRIPTION="pkgcraft-based tools for Gentoo"
+HOMEPAGE="https://pkgcraft.github.io/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft"
+	inherit git-r3
+
+	S="${WORKDIR}"/${P}/crates/pkgcraft-tools
+else
+	SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz"
+
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD-2 BSD CC0-1.0 GPL-3+ ISC MIT Unicode-DFS-2016"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test ) "
+
+QA_FLAGS_IGNORED="usr/bin/pk"
+
+# Clang needed for bindgen
+BDEPEND="
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+	')
+	test? ( dev-util/cargo-nextest )
+"
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_test() {
+	unset CLICOLOR CLICOLOR_FORCE
+
+	edo ${CARGO} nextest run $(usev !debug '--release') --color always --all-features --tests
+}
+
+src_install() {
+	cargo_src_install
+
+	newbashcomp shell/pk.bash pk
+	dozshcomp shell/_pk
+	dofishcomp shell/pk.fish
+}
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
index e90118f5495a..c5968bc757d6 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-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
@@ -7,7 +7,7 @@ CRATES=" "
 LLVM_COMPAT=( {17..19} )
 RUST_MIN_VER="1.82.0"
 
-inherit cargo edo flag-o-matic llvm-r1 shell-completion
+inherit cargo edo llvm-r1 shell-completion
 
 DESCRIPTION="pkgcraft-based tools for Gentoo"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -54,13 +54,6 @@ src_unpack() {
 	fi
 }
 
-src_configure() {
-	# scallop uses modified bash-5.2 which relies on unprotoyped functions
-	append-cflags -std=gnu17
-
-	cargo_src_configure
-}
-
 src_test() {
 	unset CLICOLOR CLICOLOR_FORCE
 
diff --git a/sys-apps/plocate/plocate-1.1.23.ebuild b/sys-apps/plocate/plocate-1.1.23.ebuild
index cfb1c096e464..626c5e3256cf 100644
--- a/sys-apps/plocate/plocate-1.1.23.ebuild
+++ b/sys-apps/plocate/plocate-1.1.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
@@ -13,7 +13,7 @@ SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
 # GPL-2+ for plocate itself
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE="+io-uring"
 
 RDEPEND="
diff --git a/sys-apps/pv/pv-1.9.15.ebuild b/sys-apps/pv/pv-1.9.15.ebuild
index a97a3f9665b7..0785504fbd9d 100644
--- a/sys-apps/pv/pv-1.9.15.ebuild
+++ b/sys-apps/pv/pv-1.9.15.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 @@ else
 		verify-sig? ( https://www.ivarch.com/programs/sources/${P}.tar.gz.txt -> ${P}.tar.gz.asc )
 	"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 98e4743d346d..7ab3077e7601 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -2,3 +2,4 @@ DIST sandbox-2.39.tar.xz 462796 BLAKE2B 330c6f896eba6ff2a38eb8a5d1ff9b242d0e42ab
 DIST sandbox-2.40.tar.xz 465824 BLAKE2B 1e7e8b1c69807d493d5ca242d746b07aa669e18f9aab60cbfd7fe66500ac6822f8b9236077c370ec7e580c8c056f2ccc7825017cd015fca4497e967dcb93cc82 SHA512 e734f380943cc573847f48789a6ad724a3a3fe1017cb7e4bffcd75d2f758d85e937511bbc2eccd0224301b56bc0dd38c92fbaf2d268132be4985f5a768593bdc
 DIST sandbox-2.41.tar.xz 468180 BLAKE2B cb00ec8605b9b51ce559a9e9baa68d757e17900abbe9fff890ddbabcc001e47d72a0e7a693104a6594d3d86bc9afebc6945ed3ec101fd67bfe8a855de3ef010f SHA512 ac787ecc61a625717a66fef663f34ddc855c144226f80e1593033f06ccd9dbd526ffbd032a7b142404a0a5a5aea4b813c9258e9c2202c2e9b0574aa35aae3ef8
 DIST sandbox-2.42.tar.xz 468676 BLAKE2B c4a17c9c6c1644bf27565eab8d76b37689f2a1ca2083d30d65deffd76449f69f68dd4d56ebb19236ca3111996c037fa4e1e5d034dc942349b93ba7c4c68f6248 SHA512 05076394cec77a6443ccc9ba31209fac32c57497210b817e71d10ffc75388673de75de8be6a86ee2f798a285e02ed1af8f134a988eceb6824a3e94bd5be4fc62
+DIST sandbox-2.43.tar.xz 468420 BLAKE2B c407f7c853d53297d4b0b64f1f3e0a6a26402c32990d7a02f6b2d5aec2b73716a0bb9a931371b87917a5390fb3f80b739e9d2884aec07aa6a1679c32926872ab SHA512 aff9bcbc0a26d4d0df2a469e1978051b9cdd2ce67786c90f857576ddfce20eefa78bfdf6c611fa3f60f0cb0247398c4cf6e4413fed0e4f2eb3bfe11e8a5b6e3e
diff --git a/sys-apps/sandbox/sandbox-2.43.ebuild b/sys-apps/sandbox/sandbox-2.43.ebuild
new file mode 100644
index 000000000000..42636c70dce6
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.43.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit flag-o-matic multilib-minimal multiprocessing
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/sandbox.git
+		https://github.com/gentoo/sandbox.git"
+else
+	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+nnp"
+
+# pax-utils lower bound for bug #265376
+DEPEND=">=app-misc/pax-utils-0.1.19"
+# Avoid folks installing with older file, bug #889046. We still need the
+# >= dep in Portage but this is a safety net if people do partial upgrades.
+RDEPEND="!<sys-apps/file-5.44-r1"
+BDEPEND="app-arch/xz-utils"
+
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == *9999 ]]; then
+		eautoreconf
+	fi
+
+	if ! use nnp ; then
+		sed -i 's:PR_SET_NO_NEW_PRIVS:___disable_nnp_hack:' src/sandbox.c || die
+	fi
+}
+
+src_configure() {
+	# sandbox uses `__asm__ (".symver "...` which does
+	# not play well with gcc's LTO: https://gcc.gnu.org/PR48200
+	filter-lto
+
+	filter-lfs-flags #90228
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local ECONF_SOURCE="${S}"
+	econf
+}
+
+multilib_src_test() {
+	# Default sandbox build will run with --jobs set to # cpus.
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+}
+
+multilib_src_install_all() {
+	doenvd "${FILESDIR}"/09sandbox
+
+	dodoc AUTHORS ChangeLog* README.md
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"/var/log/sandbox
+	chown root:portage "${EROOT}"/var/log/sandbox
+	chmod 0770 "${EROOT}"/var/log/sandbox
+}
diff --git a/sys-apps/sandbox/sandbox-9999.ebuild b/sys-apps/sandbox/sandbox-9999.ebuild
new file mode 100644
index 000000000000..42636c70dce6
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-9999.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit flag-o-matic multilib-minimal multiprocessing
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/sandbox.git
+		https://github.com/gentoo/sandbox.git"
+else
+	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+nnp"
+
+# pax-utils lower bound for bug #265376
+DEPEND=">=app-misc/pax-utils-0.1.19"
+# Avoid folks installing with older file, bug #889046. We still need the
+# >= dep in Portage but this is a safety net if people do partial upgrades.
+RDEPEND="!<sys-apps/file-5.44-r1"
+BDEPEND="app-arch/xz-utils"
+
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == *9999 ]]; then
+		eautoreconf
+	fi
+
+	if ! use nnp ; then
+		sed -i 's:PR_SET_NO_NEW_PRIVS:___disable_nnp_hack:' src/sandbox.c || die
+	fi
+}
+
+src_configure() {
+	# sandbox uses `__asm__ (".symver "...` which does
+	# not play well with gcc's LTO: https://gcc.gnu.org/PR48200
+	filter-lto
+
+	filter-lfs-flags #90228
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local ECONF_SOURCE="${S}"
+	econf
+}
+
+multilib_src_test() {
+	# Default sandbox build will run with --jobs set to # cpus.
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+}
+
+multilib_src_install_all() {
+	doenvd "${FILESDIR}"/09sandbox
+
+	dodoc AUTHORS ChangeLog* README.md
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"/var/log/sandbox
+	chown root:portage "${EROOT}"/var/log/sandbox
+	chmod 0770 "${EROOT}"/var/log/sandbox
+}
diff --git a/sys-apps/syd/Manifest b/sys-apps/syd/Manifest
index 4c134330fecf..16a80fbb9466 100644
--- a/sys-apps/syd/Manifest
+++ b/sys-apps/syd/Manifest
@@ -11,6 +11,7 @@ DIST anstyle-parse-0.2.6.crate 22343 BLAKE2B 85eba405dc5cf806283cf442984e86583df
 DIST anstyle-query-1.1.2.crate 9969 BLAKE2B 179b8dd6dd709c2ca67f4eb5c9a502b2867cb6744a39f824c4fdebedc67c6c3e07d107c7d817e2ffb589d13b7ed4900cf9653ddc0a43663217042ee92ce8c9da SHA512 26069d936c4b1fb09bc65cda0253fe9be8fa4e96c0821f980c772602b4e9230035ec8c9d092ef95e0a0354ac559f8d25f57a14c34086d4d241b5fba688951837
 DIST anstyle-wincon-3.0.6.crate 12271 BLAKE2B d9f4d9d46fa93a1168ca340562681718be852ffa94e30c9ea208af53af9d6697ca84921837a325ddc36681caab2b866b7f574901c80b5c0d862dcb765b81b68b SHA512 59ec6f5a53bd68b6344d82e923eb8c45ddac481dd0d270a7b452dc5b0540ee1656705697c1508942ecc131e7c075248c85d8f4159f27d97ea94f22469ce2eeb5
 DIST anyhow-1.0.93.crate 47490 BLAKE2B 1c64b24d3df3307430deb8189ded345ee2858c1990fc343f2400bd67b6d79ee2cf90876326fb29ea311bd857a941fc8319dccbe6c81f2cca2c085dc0c1fffb27 SHA512 237b36bdefeaf8dd2f7d4c5c92d8f7627a5206ded5fa3dafd5710f2fbd3dd7d7187d4a8ae917ae03d0cf06bc8d101a7663bb7bb022507ac1ec88577a37475efc
+DIST anyhow-1.0.95.crate 52155 BLAKE2B fc9cebdfae0afed86f2dfb7faf62f5a108000895317dd0cab9c83d6e48c891558fc3a1d8b9940b623b4c6fd861631a0f0344a9915517a9bc39dbfbe48ec6b45b SHA512 8c5c176381c3e861c3c4451f7cd3d9e2447c0a55735ececfd3199288d65d36dc5fdc4a19a0798f62a0b9d6ca2c155a616c7eab8bcd53e6ece743aed57ec3d0fa
 DIST argv-0.1.11.crate 8683 BLAKE2B 44344e0f3678b159b64d06287d58508479831dc0bd7b044a1ccaebfffdd9023508da5d86f3e6d8af8579cf5351f6c8963581af978ca46bb0b87a37c1802e67d8 SHA512 011e8d5333b305387d7667bbcd4d3e694fb73d16ba4c51a10969d5dae7a7a4286f8583c160949fc2724c56c7d47c618813d0dd55c42665c8c2d1cccfcaf414a3
 DIST arrayref-0.3.9.crate 9186 BLAKE2B 8d7443944c81bf849fbb8a4e09ee379134c173decc712c6fafe483fb1545fba1f7f735979e5e26976502284502b5c7046f0b6aad59f8731a4ac8e1a51929c979 SHA512 f97e33e7fd65a8e908c21ab918350f71f12d49783162b90c5618660217b36516c39750b292a1248125f12429e4e00af9ff20c3846be81175946b8541d96ee606
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
@@ -20,24 +21,32 @@ DIST backtrace-0.3.74.crate 88516 BLAKE2B 594b537f3860560bc790d04d72a91ea25bbf5f
 DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf
+DIST bitvec-1.0.1.crate 224375 BLAKE2B 9f109db6888cf73d69646911cc1c9e90535e54a7afc436d878bbc63ca20a30cc6e5b5b5cd42aa78c38df5a4012454769c126f9072f39d58bdd09e54887ba6d9f SHA512 83d643c5aca020ebbe9094b5aaba6a796e7c3c509228a4348444e57a06bc3a5dd042eed57a2254d91661e73bdab2bc0d1bd02be376906acc6b6d75b5354a8d8e
 DIST blake2b_simd-0.5.11.crate 34096 BLAKE2B 480fc200ce3fa3bb364ae05590fe26f59efb6f81fc2fcb7ae1593671677daa6f1b526d800099d002239e2ad435b919e9b32778021c0790954383079a49a90965 SHA512 4a7657db637869465637cb9a65cb82e7a119c554bd4d532aaf84f9cc77a494fda07d07db89c73e92e5bf4844bb1be53062fc61120e839e414e938e487e7f2257
 DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb
+DIST brunch-0.7.0.crate 21313 BLAKE2B 0845e6509aeddd24775012a480cec34668e00fb38b1918c3fb0b7b8a8c0d3894a4b7220ffd419ca6608a1639586b8d2ccec150b70ad7d3c476b049ef58f2b6f1 SHA512 7798da89eba9eab6cf35fa93e596ea34c327307d3b4e28539c4234276f7026faf9cf84a20603ea1785d206d0add2186ddec3518c35feca5095dff48ee8678ebe
 DIST btoi-0.4.3.crate 10007 BLAKE2B 60a4c0511afc23ec3bdd07a905e82b501f1000081e6dbfca9ee6a0d6aad40ade84ab09d740fbc8e9656653a7f5a9a12a68ffa732618e8dc87f9cf00a90b6d3cd SHA512 35d54183a37c8adb11838724a061b38d286a92603a557ee8b4b80dd230649a0ceb165fcab4b6e41402284f2153e18fad5c246f83d99accb2fdaa8f32f854bd22
 DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
 DIST caps-0.5.5.crate 17575 BLAKE2B 77d788f936eb36c2f4776ee719cdc138dac4b840ce632190f34ed26e705175209f9905c71d96d54f0c69f4c6d25f0a203a4d490f2034c330480bedd5ffab149e SHA512 866312aa0f3847dc2779570d1466aaae00945d78a2f5f3b05a833c67a2abd04c0380715f61dce79814845e4e57321adde67fea97f99dca56a970c6e6f80aa029
 DIST cast-0.3.0.crate 11452 BLAKE2B fe6edddd0589fa436cda32342d7beaabe4003afdbdf1d7c5db7e8748adf23b1b2cdcdd286235837c735d2143f29e692c152a5d56fb0458a54961e4dea303b2cb SHA512 4a3e19bc1e9e5ecc03aaef9bcdce01624ac0e6858c065fa1c41693db0ac172b9735ce872064561347cd9e79f00a274129011f6e4ccf9e61d960c8bb684b6d396
 DIST cc-1.2.2.crate 98719 BLAKE2B 7a7722721f98869bfe773ce90c6d756bb5ab76df05b516067528d7285c47cbc80d965aca97c7d7a118515035326c843b1721429e12afd6b15f187f0c59fe18c0 SHA512 5364d3822a566573d45e40a6076d3f9aef20c67f1a5687895f5a76be210a48cc44857ac778e2cce58d3a5dfb07255a3e6e541dd97be8492ae6f66fa18222492c
+DIST cc-1.2.7.crate 100283 BLAKE2B 98102a93e01ff0fc95a18ec4b2382a0e4b74000c33002da4553c2ea030d5f09b898b5c046bcf1868368b5fbf510d74c710916b98ead11a1bbe21c4f7bd1c5977 SHA512 f3c947912aaeb9d76fc5e3fa3c7ec1f87b19d9815170190b47e9925edfcca2963d56b75a140506656ef49a3a0ca22575304ab76e1b4c028730557b436baa3da4
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cfg_aliases-0.1.1.crate 6009 BLAKE2B 6acfae9a89d3479f7ce1f0b5dbb13bfe27c006b936a96685606a61a06f69d17ab754a8a0d96c54213f758281c2fb32ac74d03a34e0f836dc7e438387955aac37 SHA512 238828445c5b48ca41ff88825af0a1ad30494e423bb6f89b6d5e4d26042afaa1ceb0e32041f7cddd79c3e15c6c82a1ddb9469c4b63a1ac52d4bcc1174900f880
 DIST cfg_aliases-0.2.1.crate 6355 BLAKE2B a758d9c88527f0e6e7cfd6d4c83eda1bcb4d6e2438189fe08e8ecbcaa78d56afc5a4873f3b82bf7da96afd690b44cdf1e44466b6da0f37c358b340481017103e SHA512 74969d12d5d24002a29e08d52e30fbce014dd481a7c35ee0162e69333c5f2d7755f3b02439b31522e12444cf1ac8e65880ce33fe6778dac03757e362cbf8a72c
 DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
+DIST chrono-0.4.39.crate 222248 BLAKE2B eeff1694a98e8775524c261c5c46ebf09bf1ffc6222a945576960e8153af99e4549d8c988bd086507fa430f9cb15a3159be85300247ab3c6f5e77ab515f0988b SHA512 5b258f76bea58ab9baa0fe8fb32c41928b8b655c76bb2fbaae9300ef8380cbb881296cee6b9e9886dce62b0759c73e84f6409e374a86cf0c80e3383512f98571
 DIST ciborium-0.2.2.crate 35611 BLAKE2B 7bb34ed2b16f55af2d762bbc83263bba901a0f05bc7677a370460549297839c4d6e913622e8a6cb3a5c2447b94b0bd17b7d5007228ea8881193d08e5b8deb072 SHA512 8d1af6a09f116e42f0098d7d0e34dd906dc3e718b257ff1a1fde655a235d40619f61f18917c0cf35c55de9160c255a9795d5e7525989037e3512807cc6a900b1
 DIST ciborium-io-0.2.2.crate 6697 BLAKE2B 07636da78f59859515af0075cb36d9ca969113ac327ff727953c73b64b60ddae22e5b1b65d8be5aa401f8b13d34074cbc8b47f23abd7a13d551f0b1c78f23575 SHA512 641b8592f9699d5e6c607815c8e6dfc82b2bd01897015e04ef8853420a7d90c2ec5c1140e39eb7623ce05587bea52ef63659eae76baee5b6592d2ac5298ce106
 DIST ciborium-ll-0.2.2.crate 14695 BLAKE2B 3c9ab0b338070359f9565706a504e4f6c65560072380af6e0a57068ae6716773d40e75dee84ded5e1d32f93445a07a0965759bedace58291b68b94479fb16488 SHA512 2f7ef6ad8bf5a862e8b9daa64bc6d8184c87a22c264b10dbb35c00c9effcd5712f354b4ca6c2eb8e6795d4b99d7cb88fa2acf01f3ad6fb28caf81708a500549a
 DIST clap-4.5.21.crate 56470 BLAKE2B 63b58b49ad5494712d0d45db92bea7a0247715f655c108cb81a4ae7380bdf572c292bee1edfb601aacec401d7d2fcd76068373200be642ac8179a33bc6b941ef SHA512 ca7b55defd85a4e1001d04653aaf1c38af9b43715dc6fd7b7a8c49a66ce1be0c09e0ac78b3a3febb90ad9a7d8676b4ff1ddc136816019eb394b7d4908af2a51e
+DIST clap-4.5.24.crate 56462 BLAKE2B c61dcb14625131c438e3a604e088317c5ca878a1324f39aeaf3a905cb345a30629cd1eb8c9fa6bd9ab6bd4087a934394f4ab70aeb2e8349b7489d4d951639530 SHA512 3d4a065bf43fdaa3481633c6c77e4d6dc464807fd1394dfc1c8c2203919bd5d34b794c5d7bd00315bb5581bcb1da24486bd5e1d14f7c5482994ad84e9b0672f0
 DIST clap_builder-4.5.21.crate 164115 BLAKE2B 7df7a2fb8472e32c1885978f99a77b05f91c96131d00947386930e7249ad7a7b055ae5b1ebf145ddafef4d7d5fb276f3135423101bdb5ebc597b9b15267cfab1 SHA512 48abad9de7b0985138a2586674df36bcb925f3280cc19c7dcbec14d58c1a3bb391c836ff284366fb32d7460a5616b066e4e055e3a5fa7651196e62c59ca49c8c
+DIST clap_builder-4.5.24.crate 167955 BLAKE2B 68b74adfc128d82debc708ad8f4d757779e75e0373edfcd3df5aa246bd6b4b8dda09c0068c264a5088909258ecec8f62e951680790cdfd1313564ce5f027a343 SHA512 69da22f297d26e445eb46302428d5d87861d13e3b81e1f9e5d1939c20647362eb64cbd7a13d359194a572586f5ec396376d1f82bcbe611c3cffa3d2b4a9be3f6
 DIST clap_derive-4.5.18.crate 30131 BLAKE2B ff962e52d8d8afcc9639365e27753c6c6943fd809ef89d9e555e8be5b2f13efa650bf1f9ae451f4c127c1529a0af1d892c3b02153b46deb912029b45983e01cb SHA512 035bb918bc7e9badd59341560f23e3a8a2e7cf945b6d8183f74052c4edfcbecf07c9ea6fce0ceef0b84c89a99d62b11760af39398897e4ee7dad0170a96cfefa
+DIST clap_derive-4.5.24.crate 30669 BLAKE2B bc9be1776010a469c19624dc29241ba8d03380697ceade17bf36477c6635603551e4ea36fce7cb338fd2ae831b5fcf35773ddcc1646aed195b5ec874a43232c3 SHA512 83c4cd37b5a11ee4e4015d5d2dcbe1f32d26f77942a94f8fe70c8c0954f851156fca4ce414045e2241421711b00bd7ff553dcf4e2c9ec0ca28f3d69d04434123
 DIST clap_lex-0.7.3.crate 12841 BLAKE2B e825c027d8f3909cde259236fce6c3f12fcffd92c714cdb29eb886a12ef703c6844dc6a157199e94f8015549311becbdb11b83d49cb89fd5c8ce1e642b9e1e1b SHA512 c76838743e65529d00ce4b1224174007892967622ba820750bc7fb352bb267923fa3baf42dcbd7e831c3d1b247144bac5475548c9d13582b95762695528d952b
+DIST clap_lex-0.7.4.crate 12858 BLAKE2B a5ecd50cc503157dd69746f3b6e9c288e0fe4f6d5d82271499f657134fd401fbe076255e2be6a23ed0b69daf3941c6429dad8b288223b0ad390a2c435575cdd1 SHA512 a2566868f4619679d3b74b70592ffa6a04b13e38e3196c56bb1dae8bea0c711bddbccd778d2aba3cc0ee074c9b1cc0335222818f0d47fb3cc8109cbc35bb992e
 DIST colorchoice-1.0.3.crate 7923 BLAKE2B 7055fe61677143f0d4445ed5f6be2cbc284c155aa6ceac04df6f3fa2563a225e440ba708bf40e298ad09775ab7c7e1842b5f6dd78422b06dbd1250908e3227ee SHA512 fc26696189d3935d5510a1237504339c1f354d03ffd3b4e830b7080335aa778bc72787ac5fa9a67a731b9bde2788da778d497f2ef97ec68bdec5145fedf4cd14
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST constant_time_eq-0.3.1.crate 11561 BLAKE2B 9ac06a1b13da2aacfaa20d60e48df4f32f6462e4036fd9ec116c45a9bbe142a18b82cf18d762989876f31b745d98d52ce7e3d32f6c9700a500f16f00649b5699 SHA512 2b6b0d7572c02606b7c3780013fb1d1773b999a0d9934e4b140dd82f94e6c91d2ef82f6daaa1bda94f95bdf6b5997b2f0ea0c8eba8ca7e28a07d1e06b1071b50
@@ -49,9 +58,11 @@ DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca
 DIST criterion-0.5.1.crate 110088 BLAKE2B b99018b6a6f97fe47d90a2135e3d483ee624d43088d7881bafb2c35ba385629f1a4353110bf190c04903abc4ee99ad1735bc9c5afc6c2854a1aa9221fd714617 SHA512 6a1a32437bdb95f8472bafb5b04bb5999a6ff6fee4ca5965028ec53b4867d01b529241d01809a003722ec7d5710c323274b6f3b50ca0935919a9dee693f4d3b0
 DIST criterion-plot-0.5.0.crate 22706 BLAKE2B 28a50375f2871ce6f168aafabff46f4368bf55cac379c67a2b4396403259372759dba3355786e695b566b1cddee9091a469755a04c06ee949f00aee8e9a28699 SHA512 971e96dcc64a5afa7488f1a99475f0f5639c0ef63f9eeebcada351868697cbff397e99827cc07c0a52e7d7d1a87856fe1fc48c22075776b3bc9c94af62d79f14
 DIST crossbeam-utils-0.8.20.crate 42487 BLAKE2B b50da06721cfbfff07825574feada8a28d3814edb218434288683eec31bddabe2ffbf7e5ef1281ee14a8a77c56db3b66f3c5ceabaea9c72317c1bd2cecda0c26 SHA512 7175eadf9fa7c526fa11ff87e40ff203f0e7a4bcec15cb972f924f3c7ff7cc20b6e2e8dbbc1ede142a0207cd2baa4f446deb25d825d28a54cbd25c263701bfaa
+DIST crossbeam-utils-0.8.21.crate 42691 BLAKE2B cd9015c41f532eb3c90101603f32d383f01e6880718b727d6d1fe46872ae276cda685e1b548cf77dd22bb1a05f0d4c4982332c2bde90e1743dbd7f51919022a7 SHA512 6f4aa7ca10c20da291c4714b56ceb1fab1c06b03b2f4e28e474e9aeb95ab6615a25462dc7819713652c3b5f6a06fa0f24ebc92c533fcf35dfcf2655857d975f8
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
 DIST cty-0.2.2.crate 7230 BLAKE2B f8fc087e6a990a354a1de9a8d0c078757a512e13fb7ca0e337949a22c3af158111b0c1edb50857c0e97db5417943165e695b4f41c328948cb344614f922f214b SHA512 1b6fb2cac48ab796ddae5c51dd27c41ff584b2503ee15f1fdecf29ca92086826efca33d2467b5721dc1dc13b5103a76c0a320f416747230bb48d1b2c4ac784b8
+DIST dactyl-0.8.0.crate 44332 BLAKE2B deb216981726e08bbf711b90da809803558db7735514557331712cbade44699c83bd7733e0d9b4f134e96a131d71aa8d2d5303323a1e4d2a4fcbcf2e77c66280 SHA512 bff270556537f164880002294e5afea65b54793bb6879e09b63ebe9f80d35a8091c9106fdd7a06dd302b839cde371bd3bab9a85c696da2de8403ad1d8495ce64
 DIST darling-0.20.10.crate 32031 BLAKE2B 038c2a4d919a8e9ff6eff5f83911b40cf4e918ac27c90f313b6b9131c41770f83cc3901973fea1c6fea2886a8360f3c5cf73b807d14e579b8b8e87f15e3bc6dc SHA512 7a14eebc20e48fd39ddf7b8376dc937a04f561d723aba864432cabd5ab46eb189706b43e5121a7f4fb0d68dbfd044353875bb479d4bd5cd96b76e3571733ce55
 DIST darling_core-0.20.10.crate 65015 BLAKE2B a94adcc6092a7a69728725ec4bf4cb7c163bc3fe0890f272bba9963c256697bbe1ad964d58a975c80742019c59d4e1b3e56e624f938576996e216d2f99e21f2d SHA512 2b971156b8c1433dd0ddb2213ee522e2fe9968a62889285d1457b5e733daa70a09c21bca9b8573d9c742026b4c06f4dd2025a6a196ec0b08b25a78d8737dff6d
 DIST darling_macro-0.20.10.crate 1874 BLAKE2B 29cbdc6bd63e4eb0731c8f8f0a50cfcae9a88f116f8cfc0068e5d3cddc20b42b7f0f20f128ffa0f7bcb8d72f0188b04b3838b8327fa6f3ab45de4cf5c3bbf317 SHA512 565b8d535248d9d88b49a58e2a210ecc70f1cd39bfaf029ac6576a9b2eac70a6b18b4930aeca746d76d53b745c6aa82172bb341c4844b3757fc7978732fc2f52
@@ -61,16 +72,20 @@ DIST derive_builder_macro-0.20.2.crate 6360 BLAKE2B 6c64582fa68d6cb8d2c865a32af7
 DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c
 DIST dirs-1.0.5.crate 12908 BLAKE2B 0a5c1428087adeca310d7db53850ca0ee4b27df34a7629f13ca0f3c69c019c0ca2339949022317ec55ca0be35aa721e0a9040d9c9d011e1516d99772ccf8f730 SHA512 12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416
 DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b
+DIST dirs-5.0.1.crate 12255 BLAKE2B eadd38e85211ed5aee7fab964e90342273320644c36262aa7b436e493512851a4751a09d22aa8bae0495f4b22df6e7395d13715ca8b8c6196107b1be03af9328 SHA512 cfc329518e85a25c296521b9aeb6e5d5f60b4525aa786ebfa8b9f198446a1ff5892160d1bb4790d7f3fc4a0abdb5921b2e4896e271a3fc3a3225897313b77bd1
 DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f
+DIST dirs-sys-0.4.1.crate 10719 BLAKE2B 30334f2192698d7d03bd4e8bc8a682482da7d13baacb8547a132f55019d3727ac35579926ba4367fe0a5b7fa917945abc03e010cb7363683753c87440581df42 SHA512 53c7c8bc76d7211d08a0e6b25caaed12eeb7283cb4b352c12311db3c796794330943259a08e48ff9d3a280917920a088e5aede32677a4b2f9f819c2dca6adb9a
 DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
 DIST errno-0.3.10.crate 11824 BLAKE2B f9976b538868daba3cd2d47ff2fdcda16b4a436ca767f865f23d1139e7f232aba263dd4aa38d573442c762999c8a8beab8a4a8c10649d21b49090fa65ced1ec7 SHA512 fa4b9a368f254cd90c6f69f6883af4c579829a6da6f31481a1b527ac9602c8ffcb5e9518cdc32c39b5589c151a20e75a7300c8a907d178346185ecc6e8749f3f
 DIST error-chain-0.12.4.crate 29274 BLAKE2B d082bcbce47411477e8b597cfcb76985cc7d6f1696926cb5314f4e84d2c8642939f5263e110aaef56353ec086a21874a8093bcea1d018be81c86ca42c2c30d71 SHA512 c0ee19a0ba2d79ff1843148d0a582045e68466a9dc429e5f3c8a3a75bc1b6e0d6de03ad69fce851bc0297e7db77b2c6817a13c37e1c3d4501ed41db8a454bf79
 DIST expiringmap-0.1.2.crate 4347 BLAKE2B f6a796c42b2873fdac21fdfc4cf3a756cfb7cc099537590b0acfa602b8774ebf3eb50e77c8731d65ee834676708526f4be3f40dc75c8c8bc44af9ae83ac57790 SHA512 3873652411eab7e1164e4c70b7c8d09b5a722f9b22642eb61b6397085bc61291f0ace840ef8c5ff70c25410126bda5e9fd095416a4604b7032bd6be151c475bb
 DIST fastrand-2.2.0.crate 15031 BLAKE2B f3fe05ed1acfda1fbca7ebe3da2b26d05a35ab782db693ca58737dad537c53d16142422a04d2d55a6f9fa9a76abe4454923d85f6948601394f39cea5c90e835d SHA512 de2835aee8d5380a6e1c0f627a876594626e1379f2f7dbd3ad0f785d7c3f3f82162c9c20a68417324506f78264cb9dbcfb2d4d5dc9ca666996150979738822e4
+DIST fastrand-2.3.0.crate 15076 BLAKE2B 15c9a1c4f64d94c4bfd38ae139c6fe19b6b621a495c1b57209edd6d76d978eaf018ba77f356b5086c3f462a6de044fb5e3b172fc288309569911a17ec39951bc SHA512 267fecbb7459c8840f03425733d278dd6c4e7637b85b99552877117ed5e8015e094d86aa95841f77064136b7f382276c3cb2c2bef7b2881d272f4aa57c5cf947
 DIST fixedbitset-0.5.7.crate 26537 BLAKE2B 48b7e02d7fa3fb33f05fb2de50a829e2f25d19ac680d59c754faef754ca4678d1671fcdc66d06c39b51b4f937bca44a89b87da195e43a4a905a0d29fa95996f9 SHA512 320b1b47a9f93590f24d5c111c171c401f15a50dc29617c8715b6c9d0b3f26e17f966a87d8628661dfc62ff8dee98524f3b6f4f4391725b1b77db714eb6eef60
 DIST flate2-1.0.35.crate 109188 BLAKE2B 8bd6e51c3bcc06044e5b8d7ead950c3beab6c6337052fd48e86175f0fc98c8d12804274308ee515dc6156bbedb2277dfa2706cdcd7baaf2a789122473248486e SHA512 aa2c4f0ad46cfbc7d2bfbdffd226eaa37f5223a34d132d8fb2dfd04c20d15a96c4882cc377fd72afbc7d13e512f5e9934386b0390a0ab2b171d081335c58fad4
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST funty-2.0.0.crate 13160 BLAKE2B db6315d63fffe9f70698da0b1b0e4aea4b509242c60e6639f00303dad8d2ba60c6c1c04fe9289695b7aa2d7a0c90c31fba72656afa7ad111b77358772b14a9f5 SHA512 691e1c275b648110ef42c4adece8178cf037bad40d469780280eb2ebe07aa4b0406737c5ba02c9f9f63ee57a99fec27e5e51712e2113655f7522c8678f689155
 DIST futures-0.3.31.crate 54953 BLAKE2B 4b91470d3c85b9260c734dc6be8c985f78491b599d2a6ec0d1e824b82f684cd030be6f64179f7aa7c1d1fbc7cf0c5a1bc5bd045123b73461f490d7c2b9011f9a SHA512 a08d23cdac9e162d0e6ae72bd792201ff4e13d7ade6b498cc597149b3df2062b06814804c0750d941d8b5be5d2ab4cfebbe2d08a98d875d2092bf25e6e71a51d
 DIST futures-channel-0.3.31.crate 31971 BLAKE2B 2a59ebb73f998ec307bef01e997bf2922556d6dea10e2e6e8da9e1b4cd05a8bcfeef01bc1cc57d79c39bbd98b8a0d26871dca5c7641a9d4e9c2bacbb3feb4eeb SHA512 87e49e661cb12c1e03a07d3c94ca9bf5954344a51fa11639a118f5a49877c883387343af54639ad80e7196062a77fa7c9b9aff9804fb1e6ea3d0eb09efc53c69
 DIST futures-core-0.3.31.crate 14318 BLAKE2B 613d16e4f18547e45ed0dd56a7b908306393e479c379ff64f358844eacb1f8d37008ffbbfe6b1a4ed184e501ee9214db149d9cca31651b7d353ab4a99c8f5ee1 SHA512 d2f4c2476c4f480f724a880ee16566fcdd545579d3cacd2f16745812eed9ac4a7a88d59d4a38b163ef466c6f6b612b9cb06308a09d52256506a8a90e358db935
@@ -87,10 +102,12 @@ DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384
 DIST getset-0.1.3.crate 7750 BLAKE2B f303e1797733907aaff01d8562861a73c7fd0d1952a14df84766a8935af6b3bdaf3943c1e870e9fc6ec09f85a6df8e3a28ad389c04d7dca1c201a0fa655321f1 SHA512 552c60910e3cb1a7380b2f5f1e00a8fc5874db765e35eada52981e2d657469c7777f7930b3bb198535457a8e15b3ae4a33c73d4fc7c73c26d5b63f8870f5da6c
 DIST gimli-0.31.1.crate 279515 BLAKE2B c8924ce351af5b8f96ef757a189f7a9be14533c024d496c62037cd4eda790b3f6282cd3013ba82ecc83082acab1b60ea80b83e0fd5f8eeb381fd7f9df88ce0ee SHA512 b9c8c11547dc7420fe936b9f32a4f5ccf3bb68d1d9f39dedffd40d631360f6e032e719d858668826f1099b8a262e8096aa7ae1f6d7d3d7aaf47934d832715949
 DIST goblin-0.8.2.crate 187412 BLAKE2B 1512c29c78cb53b9ea84cb007f37c983c2a20e33849b118d0f22d82e87efe37ae3c24de284bf3c4402a37debb58443dfcbbd335cbf8176f5c7f5c937926f6af6 SHA512 7c193740543754bbfb833232882cb9170328144bca684a442154127903f76e87558d0b6adc0ad9546505160567ac311d716a754b02728297f9624bdd9dbefb23
+DIST goblin-0.9.3.crate 200536 BLAKE2B 0f71ab07ff09ff812205a6218feed8aa9aed2f8d746d48db246cccdc30878449fb2701bfe587c74f2aac05d1d175a5623daaf4efb7359086fd137374d0f74d55 SHA512 f03ca58f92766102fece70556369b4cd1703b8948e60df1b2d09020d27fc7be69a0c0f89c7a0a7f2b0c135331479a16fb219744e4ced88856f285375b13a41dd
 DIST gperftools-0.2.0.crate 99464 BLAKE2B 25ae95883cfce85438f7b3bcea25e319faaee6d1fcc67afa11107b0b3a952891ad0e25de645080a8ce3fdd3cfbb48c714bd062e947752eb7022aa2d94c682111 SHA512 22b9f15b732b0d586180285d703c093cb7a5ff95e2ab1e4dc06189d90875179f3a888f74f854a3b1f1d4989e23ae1ab0cdb0b8f7ed6bcde0298917dbc212500b
 DIST half-2.4.1.crate 50892 BLAKE2B c275a9ec70d2fc0c50cb63421399202d31252b0dbf463798ed0a12a17493817c66b8933811d483b348f8f945cb05aab7cc2a4d952bd16009c3da4860202e28dc SHA512 0bce235583ca128723186e1fb50f636b519bf826c942f02c5b969db4117baa87c644665c541991c16d1f1dd97c7233c017a513d45075fc72c5d99ccc7c1ac193
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
 DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
+DIST hashbrown-0.15.2.crate 138478 BLAKE2B 453888ce68b10cd6e93d787986603fceb29b83fe2dc417e7e57316b9e0060d0bba51ec7fb71d46a038662c99f60deac8237a8f349297208d1d223bcc13f0d0ea SHA512 d6fc0613623f9313533dfcab1240e97f652f78f05baa21419f7edb2eff030c4a2c5f426d3eaae747923cffdd8aa9cc2648340e5fc229395b5eacc6fae087c8cd
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
 DIST hermit-abi-0.4.0.crate 16310 BLAKE2B efcd1dee7bcd6d185cbe0051c7bc7e2776857ffcfd2adc3fb101febd7c1bd75994b7e4a4a0a59c5b4628cc2521b4c1f043e98a0c44935d0180e7499667690ab8 SHA512 b1a21f6d54598185a8e8c29565ffc2e1bc5da57cf1c9d87ba643d23d7c23d53e8ad36ee2f5c1ec8a504334b6f98b0f17a832ff37877c7b7f9238b196f4034e6f
@@ -98,12 +115,15 @@ DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc
 DIST hex-conservative-0.3.0.crate 31161 BLAKE2B 3674a07c9582f1987bbf48cef7f1b8d8f845eac497bee20a756003a84d4a8c0a758d6e9c10c110fa99893357dd3cf7ed7e221b39534ea116a0cc3b70ab7c87a3 SHA512 abe3417803c5b3003fb02f65409ed4176ee14d7480f399a695f2d3d5acc4de7434725874145b26a2283748470f88e12acdd327e2891681800dc8507bebeed7e7
 DIST hkdf-0.12.4.crate 171163 BLAKE2B ffa03876879110dcdd3081cdeadc9490534c44763b3b49f1d6a5f4407a7346e6fa1ea18303f429b23adcd23e8898ba8fbf3797f5ef9f7ab7b11499d130311d68 SHA512 a43fe20b7d14fa26b118c6eba2b84219645f65f2ff33fcca679b139ae3e96f72abc1e7a47eb8887aac5afe4e34211434a4eb5a2fdbc014666d82c4af340a4b21
 DIST hmac-0.12.1.crate 42657 BLAKE2B 5d432a666dbcf9077a98e1f8a4aaa3afc88f3d88553cf7a2356d117c66f38efafe686c148598ad67ae89d64ee3edf56387a6f89b75dd9ab5eee63e13953dcead SHA512 77d4bf51f4633a8c36712ce3178945141df31cd645eafcf4bd130b8ecd7cb498bf1ee6f2d9c8dfbbc9f97ac638919fcc81bd3ee600a1b27c3be3fa87313aa0b8
+DIST home-0.5.11.crate 9926 BLAKE2B d9c0d3660aa7784f3a26f3930a5ee35dd50cd15b7e252d930240ff9bcb70fdb0169f78c02b5fd82318af8c398d7139be18d2e9675a1b85c7845c90266945da1f SHA512 cd107c4cee793b6db8b29157c3aa2629b5ef1b9fe129fd903fe414faadfa06a881a1b685f1c66fa5aa1deefd3013a210603c952bfa4bf02d5d1f90f75ba9ff18
 DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
 DIST iana-time-zone-0.1.61.crate 27685 BLAKE2B 2091f0bdbfae3f63ff846e27136d9779a2d65f85cef899ea3ab0ff7c987329e6a584cf49c57de566f08e0277bd4981ac3db30ea0cec6a6757ed50d96e2c6583f SHA512 d16c67f435606334042c3a286350db46ff3409f142c0782509b136150b4069aafff0dc5c2ecfb7519dd8d105b9a2e6649df2a7bec33ee3966dc94034c9d5a1c4
 DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2
+DIST iced-x86-1.21.0.crate 1240616 BLAKE2B b2ed25eea0997d6de5caf477c782f547f7e9596b614de43e1bbea327544d1d0f160771732758591e41a7fafa68a5ca5cdf511a9ca24d7ed58b8bcaf0b4d39622 SHA512 d954c5d2ac4e84d932d36c5f762c488286c5939eabec13a5d33333d95fe09292a37bf860070d24ae6a5efc0921afd2ead22eaba47436d026f993745ed21a6268
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
 DIST indexmap-2.5.0.crate 85919 BLAKE2B 766da0a2ddc406e3fb1a70a0bee00141045ff72b52cc412adf05972ccef59d416f502c429dada111461cb522a5c442087e01d8fb235c2f1fd5493adea00e79dc SHA512 c4627d43b1bc5c5fd64861d1a7ed66255ec3f790367028b2758a40751286d6677da7170cfb04dd88ca4c2d163df621583d2e0dc4e9db6d7ed9bd0cbea42b1729
+DIST indexmap-2.7.0.crate 85335 BLAKE2B c7430ef510738ac5fc4658f3e4d927ca5cde780774a07848791ea87503be09fb4677c52803f6cdaaed73eee600f47e0595ac3db74a498947d0e180cbd10fb7aa SHA512 efac370b9f365a49489aa2c5406eb503044a4df7d6ceb772e0191b02244b6c2c1bf6c43ad4c8924160c1a2bd76d46c630b500a1c4252fc52366295d1cb04b48d
 DIST io-uring-0.6.4.crate 55060 BLAKE2B 3c65b0676438353c10eea2a987c58ea1808812e32bf938edf12e579586bf80b5242d1115b4dda6b9e47f47f865b3ba3e2a5a1a70b0beab42bf1a05ee98656418 SHA512 a2135b58b370aff3cf75079f33fddd5d4d2dc5d0b93cb69d0f43e97586daa18f3ae1af48b9efdeb52e74abc6697437a5d0cb9986488c0cf000a0d8279fc2a394
 DIST ipnet-2.10.1.crate 28407 BLAKE2B 50c27384d58bf57ad2c3dd0ffe44f1ceb1ae302dd40e451b0c0d69f227050fae17c368c417666c1ec9d087caf775132db7387d5a6c919a0863c78a151912ea64 SHA512 7f55f23b2b0936e3a7dafa2db0447dcf1b63a092df4af8f6fd88a02ecc8f0a290b0d21b18fe777eb573201bf82f56ae475a447650ed0803af676b1e0c0970cb4
 DIST iprange-0.6.7.crate 34510 BLAKE2B f880d3d5e96244dc4bc99cb8f4dcda3d15bcb3d731facd0e89a0534fec22dbb1e2850f6bed78717c43cfe46189878f22afc6022ac60fb9d971e0360f53459c37 SHA512 5b2e1cb5d3e261b4bb95e61fb5d824b43592c083073ec93b37382f09e51754554ed697faf0edcf3de77541858792742fb326b0e20ee64500f79b31dc578ae056
@@ -112,14 +132,19 @@ DIST is_terminal_polyfill-1.70.1.crate 7492 BLAKE2B fa663f858ab8e5fd56202d731b57
 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
 DIST itoa-1.0.14.crate 11210 BLAKE2B b2d33dc384757963eab3ae7d80bb672d828a549967986e3af8c70fe71a0ad46c4a278da2db4dfccef99e804e6cd4934067e97c0697a33ac3302cafbc46eeb416 SHA512 ea2d38df373652ddacccd11e610dfdad4e3ae7f0d476514e6ac58092733c817bd834e8cd88c3bc4178dd5a646ba628ae626195e0aa407e8534ae3c2a7b049987
 DIST js-sys-0.3.74.crate 54505 BLAKE2B 198b655100313906ef836fed5f3f3f8178c2796fcdb21efd325f3901e25f4d8624adfa62a49cfe1cd25f2dfa52ea336f43e7c7a4b493ac60d5a64d89d8f52970 SHA512 7ab02e347d5106d65ffb1a15c2d71b696bdbac323d981231beadbfd1020abb19dd9ffd7e1e3602e34bbcae1564fb73886a6fdd7d138469f384c3fe8e20e92017
+DIST js-sys-0.3.76.crate 54420 BLAKE2B 8d211aee6d8af87c339250e06e321bf02d2ff313b80505f696f66c43298e2aee8286076f2b291aa853730f8e1b9940f09c56535d3534fc7990aeb16653844250 SHA512 54e9a6be3f5a19021351d22d655a3aa55579c80f1453a99aba5989fafc7429078dea57ffebada4240b9185d3260d02f30da250fa539ac12c4bdda975adfe0dad
 DIST keccak-0.1.5.crate 13120 BLAKE2B 26b5d52a18550e67e79eb51d26c5329607699b14014d82136ed34199adf1144be8271fd50ef176b913b366b45f249ae5fc09560b0c6e5626b2fb2041de314e89 SHA512 95d5c12f903c572750ee2fa0829b8ccbf2ee2fa473bf0eae5434e08a7c1980dc435ffb36e53bd2d2fe840a55ca1c13b7650be1a0727cc8b79f649d73634f1b0e
 DIST lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f
 DIST lexis-0.2.3.crate 28357 BLAKE2B 8382e207742c9f973a0b80669ea43762e548ccc6c3c2438d3dd7bf60ca320bd2bacec3291f06204190846e721fbc6293c8ef3fee4df5568d6cd65dd52cac38f9 SHA512 650bcc5515a82fa0969f2f96eb7f8a47e876d50dd03a3b611a6d156b2f53241728fd53be6eca1d5dcd1544ea5b5bc8743869a0ed3f84e1716fb7e06ca6252915
 DIST libc-0.2.167.crate 757723 BLAKE2B 38f1657dea6d13cb6cc87c8cbededa9f0ac280e4f141f780719164451c941ef873cf6348fef7ab249ba7eed1cbf6768c6a8dc9a51796007c8ce31cdd2f90ecaa SHA512 f6690776266836371e5f9e20ec3a93bb17bc4296219755750e4e70e745016245dab9e247fe564e0f21d10d0c7c97ae97bf54da5068464a48ebfac244cf699166
+DIST libc-0.2.169.crate 757901 BLAKE2B 1012cf93d8975aa20fc3f2332e253426ff66be6aed63ace5292cc8568ee419b0f1a4b5b39ddbb78d9c2dfd8d72eb0d068c98faa229ab55556da5e674429f0e97 SHA512 c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce
 DIST libcgroups-0.4.1.crate 94787 BLAKE2B 07f2987ce62b4112e1b76013f64e606368090034e598eb7e33c8d7d22fae0caf581db5099ea43226fcef6baff37aae701bd4acbe91585d0028c4e12663e33641 SHA512 fb46b35f0a7dd2853cff355749a1c63de01728dee8e9d9a3ce841b25cc8a4ec1011fb572e14a132f65b30933eba8edfdf1bc7ef02feabf6d0528ee4b4d924619
+DIST libcgroups-0.5.0.crate 90809 BLAKE2B c880a11c4762a45fbb08a729f17f42ca2b5fbb5e9a1769663eb6df7f3dddd43f803df622756fbf5c2727ba341c4714a8ddfff72f5c84a053df43c7e53c7b4392 SHA512 ad1ac27a87bc16e0ebb4c9871aa6f9d2fd7f07d860bb2d82353081e635f9e2b95cbd3d1f618ef70e0a28824c429399d2ec5d7d4668fc62cd8278fc4bba388ebe
 DIST libcontainer-0.4.1.crate 109717 BLAKE2B 9a67d8e56c8ded089dc8245345426bb17031f09271415cfb3601aa631192c8ef02a03d359830c5948e2a61d17a8f133ef3f58179cf79e1fab0fcdc0dc3a4f98b SHA512 b3a766b011b70707a99725142429d8fb23712a304e2b4ad691a02f45be955e2adfbf124ca8b6e8ecd8c27f33dbc35c82389697a3c6e5e7dfe963928bdbc640fa
+DIST libcontainer-0.5.0.crate 108722 BLAKE2B ea28ef9d46fb9fddd7a8a478346025a6c983d9a8573e19e13ef82d21ca2a2db44543e9b08166b19cc3494b3035b8b3d3dac9fb766712d2acf9e0980c18ffb7ff SHA512 5485c2e316197d0bc84a03526252413a3ed6cd4cadf5380c322e08304307e0dcf6ca3aa5e2515bf94c5f58c592ec07c322375799b64cadd4c346794f8b85c9da
 DIST libloading-0.8.6.crate 28922 BLAKE2B cd9d7c2652bc4b0220e1c29cbfbca41f44d12d76c4dab3d025c21e5d317407ab656a88add0db95f1086934a424f55b4b413f33cb2a52cdcadde7641f9c5b3fc3 SHA512 f49ab79244d4b54c2f181bd9d7506fe5df9824a09446924dc429636e08ed7bcd6f5d2afaf8a0c862982e2c2c5832370b118266d36f36bc7b7522668bd598fc81
 DIST liboci-cli-0.4.1.crate 9433 BLAKE2B 7e6f559c993af6f60ba66f67e0af0888bf2e95de9cd59b4e3797296566faf73a472ac3a1408fc92e39ce42ff3e0a956c0e6106d3d48da898134ed5ecf584fede SHA512 9e97018d059b48c9388f83ae6dcca4b64b9a674028eac8eb40831844313595c91c3b7ad9aa9d914ccf723105737f1daee3a22368cde015cc240ec2f9153cf9ce
+DIST liboci-cli-0.5.0.crate 5561 BLAKE2B 577d0fb098851d9de2683ac0965e0b58f4957a97bd77b5a9b80438b6143ca2a2b6754a4dd70f3968d6631a127094c95968b61400af783757d4a07e502a15bd5b SHA512 f9c0dcccc2264a26a6fe0c3234934e159fd95559abad3b10acff40b37fb4a5680b9c6e7dfafd1b1e096ff9d20d5d5c2275c87ca7456d6062c5ab42c3470c7679
 DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
 DIST libseccomp-0.3.0.crate 50169 BLAKE2B 4752d6d6105aecd71d1553e28c773a7effe220b7d5d44c965e9c5a815bbb2e390dfc2a3914cbc25ca83b8a94cf6dfa6bf672f520e9d238f991f06ef5552c5878 SHA512 3f17bcec7ff5b060d019902ad2e40245cd11512f0e2c02459f41c82180258c95be55179538c17de2bf194d96f847c0c3f038f9239ac976b7b33909f5080d42c1
 DIST libseccomp-sys-0.2.1.crate 11601 BLAKE2B 77a77d6d1f8ef6f5d25b35c299032738aed0a404c855cb84223a7334caaf57392fbd8f0915f4f7be875778176cbfdb8062eabbf7b414d3c198a5d41cd8a466ef SHA512 b53b13f95ac487d802ff051b4cee32be2dfa496846f3104a61399a53a07a7d6fb6b4543088765858e26e060e22e0bf93f8cb3a175c06dae4719f918844c7fe0f
@@ -134,6 +159,7 @@ DIST mimalloc2-rust-0.3.2.crate 5361 BLAKE2B 98b07f982f68c07beebab7a775994cc428a
 DIST mimalloc2-rust-sys-2.1.7-source.crate 166651 BLAKE2B aecb28d3e9443b48932b0d7e4ce5be7e98fc70404f350d050b0ccea5966dcc97d7b50e33856b4a7391884a693893b6080911556db5c417a67b9a89739a0dbd5c SHA512 dc272cc4c7874722d81acb5ef2bca409d48442527ee914c503bdb7a167f9f53421e3ccd36978f9ff9eefe2fcdd122ec605098d237be35b28712eecb2f8ba9f86
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
 DIST miniz_oxide-0.8.0.crate 56343 BLAKE2B e4abcacab4c8698d0489faca8556faa7bff53d272ea0c80e2e7843dc0f6f9229b7d5b0a17ae210344722a379853e7f14212505ee05da4e60549081cf77717c1b SHA512 044b641ce6d98d1968c1ee0906f91963f9f524d6f3fdf3059708177a759e1d498c63e595d3a3f0f9f3210c45c828b9b70274134ba078b899d7fefc2bbddbeee6
+DIST miniz_oxide-0.8.2.crate 59068 BLAKE2B 22808b2137b4afae29cc5cf25d9f643d24824293524542e2cbac3ed0fb0341417c052310602a6f0a003843abdbe7715a95a6068c807cc0c843ed867958650215 SHA512 e58802e332a72123954ba1751cdb59509789bf930ad74da3d06e2c1c3737547fc0b9848be816a66b6585830786b7a0fce7c9fb574789e15f3b540709563cf854
 DIST mortal-0.2.4.crate 54969 BLAKE2B aa21ead245ad805d86cb0a4921ce5fb7b61ec623b43ed0c67e6ab14b54bb3a2978bfbd95f23c11befeb55b9bee73034454021b080e8c55245d227f63d63e7e67 SHA512 b40f436fe718bcb291af0f0e6d58a753299cb4e114d93e8b43370fbc9ec9de33c24ca113b8f088500bc017d60892307b4b59cb0a108ad16d928ee0b9d7617d82
 DIST nc-0.9.5.crate 1052261 BLAKE2B 13faed537a84a498485e03e37b9ad7948177af9409c0753a04ce9cff9e846c358c06a956030275e0be2d4ebef5189040bc125e44d0434d3586f51e9017e7bf35 SHA512 b902ed051348f482e75d9ccc5d41f166f011b3f038b9950ed25fb19b7929e7a06414014a43129f9c763becf4d67642529d795041151c344fdad2ac82922b8083
 DIST nix-0.26.4.crate 279099 BLAKE2B 41debf1f21427ad6c25c6cd26b7867feb8ba46366028c4b74073307e902e526543f536fc0a66db2cdc5a52fbbf9166a6a4843aba57e5e5caada3d914286ddd60 SHA512 cc68ff8e3e8ea8635c6fd4c0a866cf42121aa3e25165666ef3b97b5b2c1d9273cba6f689e80eb812b55b5ee513390924a926d95fce45de0a74b98764dd1fa27d
@@ -144,35 +170,51 @@ DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996
 DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956
 DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
 DIST object-0.36.5.crate 327435 BLAKE2B 1ffbb8ba57024a7273217edb1db76eff03e0689f81ba27b0aef0a622972e7f6acdbdc480384b50d603dee6c38c960fd25125a313264187aa0e429aa839198dd4 SHA512 b85375ab3660a8a0c57833c28c4dc665dc0664857e1eb3cd472a61b9ec8c16c470b16475545c2c311fc23cb3c43755967f93feac12c7bfad013cfed5f879e355
+DIST object-0.36.7.crate 329938 BLAKE2B 0b02cf2f44e99002909b38125edada1a259feae59fd0e5ef52001755b6878cac710c87c60fbafdbe405281e039f68572ea3d8093d16128899090fd70df7f2fa8 SHA512 dd69172349ecf51fd2351d32cc4453760ca1d15e854a1cf5ed99112032901a54b4645b24163b946deed11f81d3e3035e1a5afd8bff20f335dbd05eceab073478
 DIST oci-spec-0.6.8.crate 63061 BLAKE2B e209ac8e919c298e13f5e32b6bb6d9961ae5f700426242436851e6f705e4b6e7531def68f794b9ffb3572eee38814341030684deb0e22ec0e9665957123283dc SHA512 54bc88e9d003ef34f327e55f59609df874033808aa0482925ba477f3cb123f2fe728e7597e3164448a0d6f9172ee65469c4a329104284a44b36cb8b8302e132c
+DIST oci-spec-0.7.1.crate 82051 BLAKE2B 2ffabf2a6a77e64b4089b90d67b3838cabc0e50fd6eda2be506d09e7f3b3cd615a3d4a7a151133e76eca5a5a44659905db14fe48a88942ababe88b8be82bb453 SHA512 95c4dc35ecbc2c4ef686878eb46cb30d82f9eac1b7466489e87c852f3ee0571abbfc474ae00201c3e54fbc45ab290c8a2957c5fc61a601e856deb22a041b1b45
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
+DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
 DIST oorandom-11.1.4.crate 10201 BLAKE2B fc77678ec202bc5ef7314ed876f670575983612db9cc94ddec4ad7e9f04e2e2742d12b746803b33f1dada4a10c8afe19210fbc337803ca59a0df74998fa6de92 SHA512 8d5acd7b344b1eb9635ae597b38d65f0da519366664f02bfd083d37b5e9c88f21403066a8e93d8a61e843e06ad9323cca9796058aabd901d0adf7e7235c17562
+DIST option-ext-0.2.0.crate 7345 BLAKE2B cbfc03e7c960fe3023512a4ad816d657b4f54f8ecbde9f9c4df4c5fee3b36b68ab463c67ad650778279e01c7ffaa63a0dacbd0c080c8c3d15b1611de0e71f92d SHA512 f8539f97b01af97e0b80fc96556002251befa60f8ddd19613311e62f9dc9834d71c22f5d8e7c53c4925046e38cdcf834c3c28042a4da862d6f6a21ddff8d8e56
 DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a055ce717d40633b789b0d005be2bfd6616448cac61bd032e74aa6eed212f1677461907cea2f7f7cf536c157f SHA512 f79bc3321f45df5e3d0e5fa9c4e60524e4e28dd3729a09956766738adcf99ca42c187a01d48701ebe23d39aee00a19d4a07da798edc781b942e866b339613532
 DIST parking_lot-0.12.3.crate 41860 BLAKE2B d1899a1132035aaea3a784290cf4951ea3b36b2018d407e27d333b2a2ce3820e040d635009c44cb6e58ad07cec6565c0347af6f6fb02954eac2d4c348bb036f0 SHA512 368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703
 DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389
 DIST parse-size-1.0.0.crate 6588 BLAKE2B fbfdbf71ca42cfd8397648897b6267d4c49c9e64cadbcd03c13cccc03605afeb62bedd6dd42fd02e2f4b11e010d60ede61ee598e781a76f7d241c5dfe46122e9 SHA512 572d0d13ba87364dd2813fee1ea6ab102dc0970076adf3ce18d08cb0e86cb45f595c19dd1aeee0fdde18904a539451d425524f124c5d4b5123d493f5e89fbbb9
 DIST phf-0.11.2.crate 21569 BLAKE2B c809201298f1c5046874b3bbdd30e33f2bee2e4b977152a2c5faa91019ee5a1c8fe1d42cf91f6d0b0dd52015fc66f0a84c1b3ae014291ad7d5ba647a78debded SHA512 97752bfb44f3d1f9347b4ccfb6fa2fb80b3263d6f67aa703c52ae90d693c537a0db878acef828c79bd4c41e8f7ca0ea45588dee073d12c9bb0f2980c511b65b4
+DIST phf-0.11.3.crate 23231 BLAKE2B 588ff9dfc05a3d2cbe223d97c36c8a596d89cd421b568a0526992a089958e4b4ae8f7d33b3f15cf935d20bffea8f60d39ef2d2e1904101f285ca9b8b8155ecb0 SHA512 20a834481bc43ac8c560b00e337294d3c14d1fe359e7f78ed08166b096305e40277f4cd3c179a740911b5c241aeb4e263afa1a50d37f383ef63da113bd6270a9
 DIST phf_codegen-0.11.2.crate 12977 BLAKE2B 5ceceead850a45fb0f6ad706ca26e79267bba0ffc0870b8a31ee8a586b37dc421d31e5af3453d62eb85efada260a2eb9ceb12d2f76434dcbaaee2f71cd43d38d SHA512 0a11be13927f6d4303a2f10bc3a0c986dfcc4bc91c9e885e8912d077e434098f75ff4ed9633085ccfbeb052d573721750fb80c7a19ee1e75fc09660aac2a6c5d
+DIST phf_codegen-0.11.3.crate 13741 BLAKE2B 88b6f0c206a95945c115401a30ba1bbf6a74e3acd4458f892fcd1eae5312765ed4e17272a814b6242240b97cc0d4eaedbf8c1c37a090d9aeda6ab23bd2280e78 SHA512 e86c3b73de198aa0ac67beb6eeebb88865f77d075b9d7f290eb9b73bfdd6728d9479f796d56e4f3358226ee88b877d848017cd951a14804534e4cb656eed209e
 DIST phf_generator-0.11.2.crate 14190 BLAKE2B a20d6d3d815ca0eb5ef18780587b9963459887a3ddfe3408c99f5ad7c382da014cc0bbbdca24fe13c780460f3e4ec4580665004afbd300fa470a91d3becf1a5f SHA512 122ee5ddb1f65f386d35e438396eafb7c9f2b1254daa11aefe0a6a45aa0662190c0b7fce32b6e003b04d022e60c2af4e355f995d5ddbd1b58df93eedacb809b3
+DIST phf_generator-0.11.3.crate 15431 BLAKE2B 0c8fa88e391141d36d6f128fdc3708a87e34ebd56e201ad56d62de8c05e9bff62258dd7f3a03b432ddcbd83c4f61fb9a57d93574a9f9a68e931720733ecfe1c6 SHA512 52998e20648b6ecd1eaafa407f7da4667fa829d48fe0c9f8f718377cc86a232a6261fc2f831ffc7051b62dbdb880654b1207ac314e57b23d2b70f634d07c2115
 DIST phf_shared-0.11.2.crate 14284 BLAKE2B 3c3bbd24de77b032d194d0b0679a84a4e2848d41ceea5552f73e51e3ebddd5e61188393f126f668689dccbbfa92a8accd9c09a77de39eeaf72b8993dae280dcf SHA512 f2cf9e8ceabde75bb7548e5a47dece9a8fb7eea4a6c5568675e7bd735860c3e51181d749a26cd3dcad1476ec22d524ccb77a956dd267cd0f2b7dfb81db9abcbe
+DIST phf_shared-0.11.3.crate 15199 BLAKE2B 82441a3f6db12e9021552b51ef4ad8b564532833dce782938d7d721e9f2d8b7015eee7483724552b8fcfeeed365259cdfd5044e9d2a999f42baf476df8141db4 SHA512 34bc3c0dff5568f0276777614d92d87882ca6be9e3d405c1e7de90ac16ec52a12acc30ea9ab2033074d0e988fa514247f37de1a21a3727de0ef43f42f477e27e
 DIST pin-project-lite-0.2.15.crate 29683 BLAKE2B da9dd581eca047f089c2a069a355caf66a631b3ff81fc07220a3c378dc77ea2c399b165ff8a1d2f6556595ec52dc1bbdcbbdea5ad9e5e317281650c9158b3669 SHA512 ba3c22c70f98ee0d0e78fb8a25bdc3100b26c3f03f3e4c6c0c238fde75774c5634d6014660c39406a828d1c28f17f44f20fe19dacd331c4da2f4961a7f7c124c
+DIST pin-project-lite-0.2.16.crate 30504 BLAKE2B efd0b426fcc6ea8852bce499fac61f9755a11c6a2999cbec514f093ba7b3f94b1f2d437ee9abb243e31f3838ac1c74491a212851d7798eb249e209b35e015332 SHA512 971adfe54cfed304647fd944c1c915e78b37eaf0de3a582fb984a5e91f1b7d4db2cf0f53a9a64b64427062d4b41c0a36baddef782411a76ae3be0f8ca45f0718
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.31.crate 20880 BLAKE2B ab7676e810751f89639b60ae70bdebe1d57edc76319f83077c3680049a701a26e72e8cc485fe77cdc4346fe3571d32c59e7384c8c86fef17e00d7d81df5daf43 SHA512 ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4
 DIST plain-0.2.3.crate 10664 BLAKE2B b0ea38fcf6d4f4e3ff91d572b5639f01eac4f19b2c451d27bca49d994a07c6f46118cd58a1b86b3d2a61b7ac9e17e8236f1cc98414738d8c86086d37e0fe4d35 SHA512 6909e4b4b4a0a49e6a226d7393b121ec04beb8a13b1652c23337eb09b3c2e5f202b53a7663dfe7828dcb32c3d18135b514e9a982967c188e127a63b6cbeda252
+DIST portable-atomic-1.10.0.crate 174760 BLAKE2B 9a05d6162c95f5140709cbd005c1997449fb6373700e8ed3966e3379898e95f3cbdb90b387f1c7deb3f1eb33125378852a7168d0d22b433813f6c082112b0365 SHA512 fb47ab53fe240d5b0824dd068c6dda473d3e71ae6f5dfccaa17262a8b6de0e1dde05d83975e53bbfcf43f10ef5c634fc024f94613937927ae93f1adad1dadb19
 DIST prctl-1.0.0.crate 5084 BLAKE2B 0d876151fd520cd2dcf1c2367e54187876465de1d4f401b58ad55f87c55db22f9d7f9389cb7dc9b725708551ab5c8ad866fc452fd76ac8a28cb6638c83d61648 SHA512 01ece55afa4003cd1bff278bf75eff772b8a68b7f9d7ad83ecf3e5c849e0b1f0e3c5f5d304bee64f9cc018f9a815b37be079e6f8a337b01c097500ea939c3ce9
 DIST proc-macro-error-attr2-2.0.0.crate 7745 BLAKE2B 6e0e6d0d19bc467550de90a075a602f0be1e6ba24b29b84e42f01ccc953dec4f841625a84930a84cc5c00a1959ebdde9919c8d6d21664dd2161ea4a18a6f1d08 SHA512 8dfdd6aa54b03cc3b29e97f6be2a2d0716cb52b751cb7cbce8ceaa9120f95f9567be5869d6c4467ad16560b6db037d2c48ecf5290817c4e06b6acec1d7aaec44
 DIST proc-macro-error2-2.0.1.crate 24807 BLAKE2B 20bc34aff566445280cc874fc0c2a43ef6ea2ff67f674107f816daceee712749fafcdd1a8fd52fc35f8b875375e5fe05a571b717629e6cbd250b42162c2b3837 SHA512 6406a792b780178e80597709fa34923b59f8a9e8ad22fddafd78b3495b943765f5657542078a88dafa0e904073a22fbd9722d45ee175bcb51725e566682a976b
 DIST proc-macro2-1.0.92.crate 52353 BLAKE2B 9aa29fa6f1c56c0392a94a81b4c61953f4d185012cdca37e356817845535da79d7094bf43472ce63109ce479a2fd0cbef4d802afd61daf92c4db303bcac60e7e SHA512 e614f08acc0a7e97ef580479cf5b682378df1ca16f09bfb2296ebb3490a435229dea9d682c621c54ce57e8e1d3b7803eb8ff83c88bd02e07228dba6d02f14aee
 DIST procfs-0.16.0.crate 60581 BLAKE2B 0df34ca82fe08930d123d7487394dd31a233addcc5ea540952b246b0b036f110242f757a3211e2010fa1e5fba4c53f253ad8d5dbb565491fe502f5d2332d6122 SHA512 bcc08d05a536f34272a0beae3e0fa55360de1aab6942d3b20e95a577bcaa4def8f5ecc96e9432871efb13a8d298b2b0fe61c7188c9d2ee5deed2544371aab707
+DIST procfs-0.17.0.crate 73252 BLAKE2B eb205ec08019da77522599f192dde47d733fd68c08eb68611cf2ece6de93708cc1f2a3e0e941abb48b5d6c2f64da9e2ba158c1dc8f3570ea086b43f3e7ec8030 SHA512 76950134beb05f3df3dd0ba32488e1661a8e90fe5ac59a9227b4a5d2413e4ffc9772c9f79d37fc882fa9ef6b2c2c8c96f00458181926b0a1655500da56183a3e
 DIST procfs-core-0.16.0.crate 68279 BLAKE2B 257abf95553979dcd0b0e9f86bde831382486ddd13691c59f1d0bc36f9c604ef0ecb06461ee7530a2d455181bf588add9fef8022ceea3fa3f939159001a2690d SHA512 aa21eb08ff57b7e86dd4073837bf408ed6e89e46add614c7faa04882d131241c0b01d0267de39aa86f85ba9e60a326de48c7959d878a6b75058cb7d82a31175a
+DIST procfs-core-0.17.0.crate 87533 BLAKE2B 8774dfbc5cd2cfd12c1424de79d6be403c9d3e3a04a0437ec4f4dcbb4535495faf7e6cb30d268bd16c053ec8cd72cfe9a6b2d2e577c6519d15553c9f7e0fa7d5 SHA512 392a6c6702333eca25f4bfbbf10ad0c300d8b1c3f1ffa51151495509b45c0e094e8a8d43a18a9490dbf5910fbffb9fc2669b39b989c8d10bc5aa080377978ef4
 DIST protobuf-3.2.0.crate 211054 BLAKE2B e49bb3ad408fa83512c136e44e04a266962dd3a2829e3a4268487804d91a7590ed6f33247cd79953d4b17cbddb9b73109bcbd68253445beb12148abbc123de2a SHA512 16936a6ca8b84ba494ba9811ea9fa99785f314e5f780a2ead203a3d53163d2ec954a01d0a32260f96dde19d590f3f9182a33cb6647a4a129d802b872e457db42
 DIST protobuf-codegen-3.2.0.crate 56540 BLAKE2B 84d40924d83bd21577660784c34f9b636535397e08efbe9b910623aad20a8cd8e155c0d4534be00619e47d209b41dc4c93350f1e4da8b597080f11e5a2ff0f34 SHA512 8df9ebe24f5ca99cac3981258e3c4e6113327872a878ef72b59113c4eddc0b3ef62dfa8fcae6f62ee33559d6681c8f9f94a8b464f0570872c99aca6aebd2ad8d
 DIST protobuf-parse-3.2.0.crate 65995 BLAKE2B 51089383817818803869d7f7e2ee0c2f0c93349a6fe6dba01b478576fdfb1b1889dfaf1e19172fe329b35bb8f34487e299c4b6a5c5b915cd513cecba9d6d93ea SHA512 e8b3ee2b61bd59098b2de006aee2f6328a42fc710ae3f2f75fe2cbe792884c60fdb96eb36347399e2671dc36d75632d1f469d3eda19d5f9a4be6c1af3a9a9d64
 DIST protobuf-support-3.2.0.crate 10757 BLAKE2B 67dc8319f4438a3338b9f739f03cff060f657a53d48ac8269b3fe17a1da6d6a73cfac92a93ad1008e76748f1f42188f04c523a1d7feeb8496953a39de2f5c557 SHA512 6b0ef0ce706fe748136b96431b7d07a6241fd4e8bb4aa4c320c3a4f149576b3bec6ba9d60a12c5c2a59cabd18df4cfb6e8dff5e38da64878758bd1e06547a657
 DIST quick_cache-0.6.9.crate 41207 BLAKE2B 4a0953cfe9fc99a18e1b1333415cfa116e2e15d689aa99c541a1a354b05923a596e9a76c6e3cc8c574b649cea0e26f69f91ecc4692cac9043da469b294239fdc SHA512 95b2408146e99877957586262d5e898c2b3d00c63dbf95d7e6f2dced8bdef929c91de37beca3b9b2cfcc4d090c7ed9979c66a76adf4fd2f7c0ea73e52467a536
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
+DIST quote-1.0.38.crate 31252 BLAKE2B a3836efbe5c21dec70c684002b47b8fc7cef643c82ee903b537a48bc0707a28106c4b33d98e60ff81e04c7520f7404b1dc4d49446e8d91dded517e476c36e1c2 SHA512 530c47c5e6372b508bf5b2b88a138408a7afa5ef52c47280ed20eccf39f8e97dfc1e0a18c1bd5472efcdc49a7a1e69566333a0a1b4c0b4f0e11e6a7a85bfe8af
+DIST radium-0.7.0.crate 10906 BLAKE2B d576e0ea5c5287bcb6740cee3a3838b6ae4dfdef0ef05d34634b96dba5159e48260233db57a767c9e032fa5d9a5798361335cb19f7844f450113ece30ffbc51d SHA512 51e23cf52997b46c0018a94b0259b29d7bf33ddba19f6db406ca57ee5b1417d7e5f27dda3bb487d0099886011a97f238e8b3dd4d6c86e8464c0b471c1a7622a0
+DIST raki-1.3.1.crate 22795 BLAKE2B 3ee3e6f8347a0985610e221b7ac29f484bca54a357c7b0c9b9adb0852ea37839661a76cd57b49ffed2524005554834b834a1e104be1dac072e75d02a62ca1c6c SHA512 9aa16c957489a0e4c64e949c8e4a17bf51fa521ec0b0c14b8a07a7fa36437c9dfd5ca14af8580188da1dce2ab5f8e4061faec784f90e845054f418fbaa186505
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
+DIST rand_hc-0.3.2.crate 11544 BLAKE2B ce7ea11ae6c6e85032559b843bbf7d799a68ca26d8c45fd4b1f3df3c6b8579e44d5664dafbe47d5355b58381a39d8d2c9815a7eaa44fc00db9a524ef6003bd5f SHA512 d2be113e3c409d6e799253df0aceb2f58ea42a0b322cecbb374b14fbdc32230beb64175b1d1d073996abb80a83b118288edbdd1d111ee227da51d7e83fb58252
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
 DIST redox_syscall-0.5.7.crate 26249 BLAKE2B 97f848b130403686404dc193415e5060c32585aa3638b825b4775e54d9a058695b86457ae9e3cc0240bcac27ab4c05dd6b488bdc1c797faecd236c6e477fbc3f SHA512 e9f2d254279a4063089436b699ecca766a997a72718d132a9b35f7c8c8fc82c4b5e25fd8f3e6cbd17920fec484140db520c262376ed1c74f847929b7f43fb97e
 DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
@@ -180,12 +222,15 @@ DIST redox_users-0.4.6.crate 15585 BLAKE2B 1d60d0b7781395ff271d79264910d24fb021c
 DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
 DIST regex-automata-0.4.9.crate 618525 BLAKE2B ee3fc41c8c445be4c1aa3e5b19a3e61efd641b1a24e7a1ed55f837c1fba9c816272cb4645c13232b66b170bc7c413802928beb22e3891500141ad4ede65b60b0 SHA512 40bde0ec91cc27bc0c3fa237a37ecee5a1f023dbe006a999c5888f8f578ee2c4c64d9edfe1827546cea8e92ca3c10f8b4d494d81f3d0422b40d90bca9cf598d2
 DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff736f2d9991b19814ffc1a414ebc5b76e84fb8fd36c983b38e8e391d165cdd9047832b0d9100f0e1ba7085484b7db5 SHA512 549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8
+DIST ringbuf-0.4.7.crate 31664 BLAKE2B 2686c170d81a97aab92b5359effbafb364d770c3278d7f7ef28c0f80b20021db8f8821c0d99a3262fe4ebfa7379b7b8fa3a54a19dfa5315cfaba6a955b0ec76a SHA512 d305193858923248503efc3831989d178282f085a433a408bfe13daebdc3777bae3870db58984cb4b66e8d70a332b26659d67ef6ee18cd064b9db5ce27346c30
 DIST rust-argon2-0.8.3.crate 28313 BLAKE2B 2d3468c7b5dc027fbbf6ceb264d77f4ae9b03526e0634c645ffd32a4c87532f5a84c224c6c39a15c9e267d268b187ec65210a2edf7df8294913e4958fbc83352 SHA512 f336dd3f90e1a49be107b641f9e9d513b6f8098dbdd1ab8aa2bd1fae329ce6840ad11a902b599922bef45d96ffb556d52b57d61218271bdccb7c85f9fe1da033
 DIST rust-criu-0.4.0.crate 31256 BLAKE2B ae9f2ab330fd33e3583b3ecfc2f2d901a3febd81e0545481d58c41563dc6a70f81cf04893c3b951f866006e573741517468c1d0f63b69c57141d4fc770b53fc2 SHA512 6016dedd72f75ccffd03d65bb1596a31b647b3ec0c3cc5ca1fe7c3bf0cb30324050a453d6a7f5856b46c30346028435f563305d2bc9ddb5c94ad3be4f2fe1347
 DIST rustc-demangle-0.1.24.crate 29047 BLAKE2B 8248b014eedb26cdc0b748544ba91b9aae9c992a6f93b4d3ac256b78f691d572f8885a3575492ea556698a241d2759743968293079ca02bb6a5f318b0ed66dd4 SHA512 eb897c35300b87766e6105917a907fca1c5b1f7691fc03c6c1aaf38075ac883a73d1eb54a245d13ba59c7b0f0333d6543e23fc1b1c542fbbd5c750a84660b9e8
 DIST rustc-hash-2.1.0.crate 13316 BLAKE2B 3e93739234cd36f3cda5d71522e3d2204e98b1d134cf01cae5a93a93e6c4340a7b1b0485c339f312145c723185fb83f6aa87ae2a0b9b726a34cd29c19d3ede56 SHA512 6f6a40586fd7a99016efd53888970c745888a06bb6b9d32eeb4936bcd16906c90ba22fad82a4a6b547df4b6c9cf6d73eaa8d36af097d65d3d6de18a0669d5ad2
 DIST rustix-0.38.41.crate 378463 BLAKE2B 8af17ffb57da36df6407e112d78e8748fd9931a5cc451530bf46c4c2a57685a9ff5de3591e3d7d01d033060f24f55cd1444541e2899dcc622869f077116ef847 SHA512 faefcebbc668605640d156800781f7c8726271e15ca4cbde4057fed22f94032bd083c873f5595ec39d5cb00c203fcdf7cb863bc3cb3ae79c20c2aed4423f0ec1
+DIST rustix-0.38.43.crate 379134 BLAKE2B 7e527b0a98485c029b89f2946f07226d772d9ddcce2f21d7fc7b74c2f2377f780d7fb0529f9af1be6a750a0d1a00393534708dff48f4bbd0678cc75ac1a9a6df SHA512 0122fc3ef3b1199105f63e3d06df0992b7fbf4a3f0bf54cf68ff8035ed96329c90c2ec30b365f02a7a9ae1f0018897489f5be77787b4048c2bfe49b30d7839df
 DIST rustversion-1.0.18.crate 17794 BLAKE2B fa35445404b836214bdbaa3de8e43312b6d8f50eea32540f808a6255908d756bb1a5dcf49ca6268a1d214c535c2ee770e295c0e7d6430268142a190b31032421 SHA512 263d2cef02b6df4d38b35af7a9ee3a6a044f160f3cf7c6771528f23dea342232087f73f89e419ef7869db771e73c273c05b3dccfe9e29f707586b2059e820645
+DIST rustversion-1.0.19.crate 20616 BLAKE2B 025944fe053ef928f26affb890ef6a563b0e63cf6acc0ce7bd4ff104541f819bbda48ebb59fd8a677e44ca1ea21f4a18c209adf2004c9ad79604dfbeca43b5fb SHA512 45b959aea8155ee47c51aa1d87c6c344b5f4b20199a2646ca30bdabe1c2458b014be91fe0c48c29c2261ad9e5de6df7eef7ddead1682e584d4a906c17984baab
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST safe-path-0.1.0.crate 10966 BLAKE2B c87dfd71f93df7e5c81dcaeac41b74fe282a8e8c8cc990cc6d876957e198ea8dc0c06e73f8b27699239d3012ac250520dc08ef91ec20080306d0a6a616bff7ca SHA512 bc673dfa28380208e239c1d2ab7d8b0ca174f7b124288ed6779ed9d257dff1f16e1f9c2a2a61ff69d131024f727ec17147b5a651933a7c0ee5f9126b11aef79b
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
@@ -195,13 +240,18 @@ DIST scroll_derive-0.12.0.crate 4693 BLAKE2B 957aa96820cf40ea49562dbc12a419c7b8b
 DIST secure-string-0.3.0.crate 11291 BLAKE2B 3241d2628c4ccc4b1e18932d6ebb909f968c15953b9236c653c562a17579369870e5bfdf0a1aeccd16bd9711711fa679968680e9728903c7a2b5bb8aadd77295 SHA512 f44ef6fdf1bb99200ee37bc3b9fac126a73c7cf4437377ea6a5ac5d72df60fb5a1d5427b96e6de8738d58fb50993d468291d2c95f43ee382b47f55483649feac
 DIST sendfd-0.4.3.crate 11120 BLAKE2B 5f9e1d170ffd45f3012facead052267a868cf95790e606b6ed9b06b664c3abd703d90470356de604a3b52653634844ae15d275902c5ca5c157741f1ff965c3b3 SHA512 0c17bcad760b74000dc7bf8d4a5b4c4ef68246693997c47b5e7b503cc592fca72ebe3b617da7b2c3aa02fd6afed0aa3b92cb3f36cecced53acbb78a377069849
 DIST serde-1.0.215.crate 78527 BLAKE2B ca8e1175839ca45a4d78a155f5943396211408a85e0840b065c52948188010653d68fc4fc7b63bf2c39a11a6988abb7f6f3c6d878ca1373596e0a5d62186e109 SHA512 3da13f1a74393f1fcb6d659b5e060a11ecae358f55cdf4a2fd05bfc863fea6f75d3140d3bc74902f8feba8cddf7dae71a3f4e4e78e78e1b08ed46b3e4900281f
+DIST serde-1.0.217.crate 79019 BLAKE2B a0aacff795d34583365ddd469fa14c58a6cccf8afbb248210aaff3134c7ce6e34b3d03f437326d7c01b3e78f82a5d19c37ed9fa4372970d8b2793f2889288e1c SHA512 f97b3b54b9e99c9a027390405cc054c3072f49c92803a4ed5f5f69e76a179deda9d77993b645b3581437085912d881da88d0451b9e0da423c64033a23fdd8054
 DIST serde_derive-1.0.215.crate 57092 BLAKE2B f28bb66017599afdcd8d45c514b8e07854eb944c1dcf931e052a01ce421e0de6c20c13b3867da5922e2153e25ce88bf9fa27e2e68ddc9d212977f71fa0bd6352 SHA512 cae686bdf10c683149956ffe1c64fcf3e9b9bf0cd6e33b4ce7429d0ca35b9fdb55443693866c1202fa79348c6ea0f49ab3be3d5f857de4ae0818d2b4c8c67d9b
+DIST serde_derive-1.0.217.crate 57749 BLAKE2B 63b4930122d80d64492ba2718630513012202e42bbaa74510729ee66a0e72b8a1ad123784b479697ba562db43868f4bddfdf5e94bb3d744cd68a547471ba40aa SHA512 31020f4533d04b31ae125580a3c5093fad36438d324e2d9b063923aa8c125c654102ae7fbc3b3df892bb41db6b321962a23e0a37950e080055d715d15b18af76
 DIST serde_json-1.0.133.crate 150739 BLAKE2B 7891eb5b8edcc7fd09ab1e15d3881ffdcb629aa39f2bd758c0505700a5f2dfabd85b1b66c3b094268bc1627b346e204c792f4ca61efa76c54ab9cd5744fb0ee2 SHA512 20e65ec87bff319897a141960d13deb5cadcf821209c1ee8799f1dc7f458ce432bc62c16df5bdada1c8d3cc01ff23b8125e8fa0a03545d4614f32efd687dc69f
+DIST serde_json-1.0.135.crate 154499 BLAKE2B deeb22932145715d6a443b36b9b984b6ace1e254199db9586c48dcfdd270a3208ef127584431e19a826947df705de78f07e58d9126ee1c5ccd2bc73d1e779bd8 SHA512 e19c583aa4a55f1c3b9a4e49b8b5c6b66e91c893db06e52f33e87608be1ff0aa27996065157f45dd4d2c59b752259ae747b2d353fe7cd1d466f56cd8a97fe71d
 DIST sha1-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f
 DIST sha3-0.10.8.crate 858216 BLAKE2B 0251020db34e0be3f150d342d055bae00c7fe17e2eb1f5134016389e45a4d3ef35ab8e533f58cedd7e10412955c4a011ba8e604e129fc5bd9a433ff756f0ca5e SHA512 390102cea4cbb0de4fa772a0842cf6d13dadde9fd95c5dfa9e75ebf89e98a2b4bb10f05257797e8f688af78ac42d951cb71df71e3b7ec36e52e2661932479c7e
 DIST sharded-slab-0.1.7.crate 58227 BLAKE2B 9b4c4e4849ed324cf48c2b905f21139d1d65aa5ab13e7fb11817cac9a32ad09f8dbb1e50a93d40cafa0aba872792bc92f7bd2e219f62f80695409e949c07978b SHA512 3be7438d4a75debb14463477f34de6db1ac38abe958ada5d5dae7ae8d5993e245da69fcb989d91aaaffda5f2b085d4bcc88d10e07ec567b7f40a21437de6d4cb
+DIST shellexpand-3.1.0.crate 25591 BLAKE2B ba395d9d98fed37979e97609689f909b264ddb44dae56ae4958da9a0e85aa382a00bbca42530cda2701e934233aa1d44509495235ba0512beb33a827cee5c9f0 SHA512 9b20074425db359cf92f29c52be91a3a58a91e6f3116b210913f24dc31b5371ef9d77fe46e7da39e42eac87fa4ccb8ebf9175d7bd5fe6b520d12b9d3b31cc65e
 DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST siphasher-0.3.11.crate 10442 BLAKE2B 771221614bbd56f609b9743da4352dc7a2cbd0f6257952fab0cd052e5e5b258a4c95a0461d6d1b579dec90b72d66a0e58e036899b3db8341ae753a421a4cd4d5 SHA512 601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b
+DIST siphasher-1.0.1.crate 10351 BLAKE2B 6653898cf0eb071fe83b7c317f93ffb73bd26ed601961173875b26ec8851632599891ec178b7e14318abb9eb98d522db8022deb852af9ad9f6bf38a5a5708e82 SHA512 d230991add51a555af95b30ef104c0e5ed7011fafb92d6ac9ba0f238c8bf4d2fbd39f4b04dbbe960453f8fdd16d3768ba39f39e4877ad453562e689ec8f24a28
 DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
 DIST smallstr-0.2.0.crate 7521 BLAKE2B de85addbf6f23141a5797b7eb448fac2349f96801fc2f7faea66b21356723406d83e0c46d26198e0bfbd1df9bc4673f611d72f2a3ef222358a3d57fde1f7183e SHA512 88f835ccf1eb7a618d931f2234cab47eed32de67da31fde3dcd64495aeabf17daad83b9c6ef87c42267027e649eb6f5a880fdc7a1716addd3bbbd37315d39563
 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
@@ -210,17 +260,25 @@ DIST strum-0.26.3.crate 7237 BLAKE2B bdc348c718c39609c00b9fa7d47b7090b1467022b7a
 DIST strum_macros-0.26.4.crate 27531 BLAKE2B 7f7d57c957a1591054288fcae6590a5e669fba1b47d8f1a52371ce60fd84f91fdb430e48cc7edbb5fc72914be5ce12af29758b653680da3f4177339b31206750 SHA512 77a17ce47d5e8fe8a89cb6aa6c3ca5d5c2625aea0f93456f05a9994238cd3b08b3f7c6a45e9b3db21bca8fb5759f505f15cc111ac84acbbb34d59cdae8307b0b
 DIST subtle-2.6.1.crate 14562 BLAKE2B 3cf4940b7a01f04715da1057f6a92b1043a6b86ab2ee7f9fee0337b680ff781201d330409460f6f90b3f81bb5fd4b563e17c762c6e824ba3b0af99e4ae7d66bd SHA512 f5946ebd9bcb8776ee3446abcbf4afb3cca5d8bd847cadda87e864333ac7ded537a3efa773e9648adf20ce4add2c1da85172cff88c1e1a3a6cb051401b00c6bd
 DIST syd-3.29.4.tar.gz 1119956 BLAKE2B df26e4b82b7a890aff8c430619110ddcf3aae489f4f599d5cbafd197a7cfa59b851c27688e52743748c596cfb1c7e463cecde24477732aeabc9e7707c20fbec0 SHA512 eb4a33e6b59dcd21b0c93fc57467c3af3ba01e09aac56415eaf8a29be461846de66daca78699224b9e5526ad0c2429060bb7c12fc6f1b82cfbedf23534a72a1b
+DIST syd-3.30.0.tar.gz 1230065 BLAKE2B a66dc86df6751b9a86d5c8a566942bd30e39e7feef3beb907951b67753912a306314eb623576886131b97508ad35aecff3a8a8567f72ace662fce3756e2b8bae SHA512 e65377e40b64d3bcd1c8a45e1ccf85125d3a82300f0b1ef60e55ca81c29a65f8194e4485905046f2bf6575320ab070ec6a4e9ccec898b812713b8f04efa49f20
 DIST syn-2.0.90.crate 290584 BLAKE2B 9f469001c1439ffe57c578119653d3021c2709767e8e881441459a190402679f4fb78aa65e7822ff20913801c3be00d9b8f115189ea8e63ed94ed359b40fc9e1 SHA512 44606124f113c259c19edcb2adc1378d8292b422d800604c0e0d1ba89bd2d13d518cf4a6afa58daded54da9cb285464aadb113815406a0f09c5e18f865789ae0
+DIST syn-2.0.95.crate 297136 BLAKE2B 5f0ec2d11613e7c172ba25302e4303b09c8d81813735a1ac6d368c7aad5171198dd276365ddd2fa3fc9f3cedf4951cace0c56831c7cd40d71ecbdeed9a47886f SHA512 2c1ebc62893830c34815b29fd6788b3a3b80cfddd5e303fa438569262da1bacd9fe3b892881b544e022f10a4f0c2fa9df1569a73418ce003cc7c8cd8c7420035
 DIST tabwriter-1.4.0.crate 9951 BLAKE2B 8833c5a7f37749268187e60d95b07262e77c461ab868cd934e58031703dc0c9ea83b8757e681747900dc07eb5c8e41e589d9c37568b66ca25c95f0fbf07c8a8c SHA512 066846124e3beee816f76ed3a59fb224593537ce5807aa472fbcd0cb98f638dba6801d171b6d1026e56b6eaae6f2e873d64c190c97bbd8d6ffeffc82f3b4d52f
+DIST tabwriter-1.4.1.crate 10047 BLAKE2B ae66ddfc8604ad637496c799bcd50d1387604b2506cae96c31abdbb37f0e3bd800125e56a3b3d38ecaaa83c40346060d1c66e481b191b5189b6333f5ac4ee1c3 SHA512 5001a049b27c5a146ec49d8ad986893cd0ae19aeab42cd8f6f916ddede3cfbba6797c41d251d99edd43d79b16f3739cf56bdf7721f93b3a18cfd853e88c2788e
+DIST tap-1.0.1.crate 11316 BLAKE2B 60786fd5f12c2f06097330c26809fdcfce62716586d2e1985f8c01406d356ed0ab730a04dfe72ee3e1d6208a53c76c66883d45a76130750b41ba5b82aa721b83 SHA512 d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995
 DIST tcmalloc-0.3.0.crate 6674 BLAKE2B 51e898db18b4dc79b8f771bd5990fa38b9af6ec2e9cfb4e7529e09f5b847e6513c47b0b5e13138426eb21ff95bf60d2ab65e502a01316331120825b6d9a6e2d3 SHA512 a8e8e3110da6a736312e48eeda1b0391f82d04aba968a4b857db2bd5615a96e297a4ebf7ad97ca4a59cb15246f0b56d72b20454d5cbc6958d52494aab18eff3b
 DIST tempfile-3.14.0.crate 35065 BLAKE2B d155a39f6ed6e846bfd572ffdc73f306d30942642e07f2b497963ae150b8ef774dd046bfb3ce410fa326c8e1df27b0cada804100215e01d02272d6059d5294e3 SHA512 98c1ab70eb3efd2d8b16ed58c8c83f8599663af7ef269304e908a04c38334f659a4d0b1647a13dc0d1eb90a293f1b37ec8ff0b9b45ef5b7ff1b4452bbfcdcb15
+DIST tempfile-3.15.0.crate 35693 BLAKE2B 1b4d6b17ed4263ff89ef6967650b0c18671b2b80cbfe388cbfd77ca597473e91c1c7aebfc715d0fe4360c20d0f235df31147b1f029b471aea8c57d188f7c2be0 SHA512 82636d50a29e1ea8cc61e80dc1fa28ea4cfaeb6175e5bf0558d6cd6f8da823f50a808a555ec17fc8601acfd0f504e15688fe95f64e8792feeb216bf27678807d
 DIST terminfo-0.8.0.crate 46407 BLAKE2B 8ade6d7b6a1ccb7317f6d30ac5612754c8d324ab4614ab771d6cab692d191d658e9782d2a7f63f12bb30c7164438535b9a7e1cc37fa9daa691634f47c0e5517b SHA512 77b9abe815145962d40a502d04a62c393d97ba8c721c79ebd8f71eb23fc9bc4ab0d6a4b8b8b90ad5b716894ad53249c24270e54a9785f5f66918beb3e656d01d
 DIST thiserror-1.0.69.crate 22198 BLAKE2B fdd8ca8c8ca78702377d0bf7b253440519018275b105db980d63229d0d44aa5c39a703e14aa6fe453c779b3c864d8044009dfef893d2a5294950f067656d7a80 SHA512 ef50d2867d965da1dfb29d26faf6de273b5fadf78f95313f6caf44d68bfc610b9bd4b7544200b05bb0861231cfc84e961007f8db83c7905244c492037fd31899
+DIST thiserror-2.0.9.crate 28531 BLAKE2B 7789458ffcb381e2cf02f182248396c5e6c20a818e4c5a2c7da8a8f50099c548646b51dbfe0630a242f24e9aff65e215a4473e13f63bbffbd80a3429237c65c7 SHA512 b7b5f54cde87c21e8fac3526d5a140c0d64116e700d07eb28714df3db372a42fba30bb37817282d0ee1b5333f1998d1f628d43054e59fc39393fb567c3df4cb0
 DIST thiserror-impl-1.0.69.crate 18365 BLAKE2B 51663251ea6ec99c59aec35fe73c5f9760809d6b6b7eaa8ecbc8f6939acdc4d0ebc11f9034d9204dde7bd689d5e8303ae0be86e298745e9ef96825bf73453a08 SHA512 579eb796c8885feb01d27638862823acd96c79440655bb444c3445ac00121852603396ce7439aed617c0a0ac69f62102167fde5845411c906997574a46d6d9e3
+DIST thiserror-impl-2.0.9.crate 21023 BLAKE2B c2def0cfe9b9854ce33075fc246a2baba386d8f3a70f26516124f5ff4f7dbb0cd0b8887882c491f37652b565ee4fb3e7895a39cf34564a21e96890fa6e3ce125 SHA512 408f6a4c0f6cee36f69fff5a2f08cbd349db44753e6b6ac730c418fa1fc06ba7f69fbf248182af947843ae49d5cb5ff53980cdb18cb850ea8d7d9ac7dc8d67fa
 DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492
 DIST tick_counter-0.4.5.crate 6351 BLAKE2B 27301b8cd6e06498582801d43ee04b602f30f55c6942b40fa945939b119e9ae93a485b58f1672970baf7469482e1a247461b5aea4ec6712824b309ce97af0dba SHA512 d46bc88a7ec129419e19d9d4577e77d96ac3de338ef037253d9fb89865730beec58bdba196f320b19a485a785a2403d52a4dbcdcfe46791a6a2d1ada2797cba8
 DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
 DIST tinyvec-1.8.0.crate 46796 BLAKE2B 720d0e6d881855a36779e12f5ffa708d3a8b96e6d0de9056cb33c9b8ce0d408f99b22f5b2bb9d64bee72a011fef846dbebbea2ccd238d7b951eb5ef0c4866e05 SHA512 b7b32e38229645965900f80f298685f13e6d13e58cfd6945409a6643ca9c9adc2621456956d5998ab9dd91c2db4ae79638b156ca0d9c7c5505023fd9b28414df
+DIST tinyvec-1.8.1.crate 47269 BLAKE2B d72ec2417520fa0481b8447e6d75e1f24731d38f9083a711185785174a8567c81f6416468b9eabf426f9d32683231e7c5e80202292d1e424f9e4ac9cc8b3e765 SHA512 db32a6beb1c86eb3e9f5ff2732a4acc03d1d684f0e54df5de2ecbfd08399639f47396ae8b17eb5f0122a09ba0c313f39bd73a6f7c44cc38d1891d1bdf3f2d176
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST tracing-0.1.41.crate 82448 BLAKE2B c056d938e001654e03efaec7a11eb8ecfbdfe9af2099271fcefa43f4f4683b40c59f7111fdf7f27df4da38bcbe94f1b2ac0abb6ec3d6e6a0d165b9fbb14da3a3 SHA512 dffb8d3a1375f1b9d5418550a46cb7b1d92b2cc8ffbccb430a38f7731547960775bb42798074186711847d256eee30fb3e74078b69cb36f28c07d9f231dbf96c
 DIST tracing-attributes-0.1.28.crate 33280 BLAKE2B 4f4bfab16ad8a296c9399125edfd4314d55ef58977d8a1f3e867618617feed898cd14766527c9b788d5fe3d3f8ee5bcca0e26dae79a2e6cf05366991ac23dc10 SHA512 4a3d5fd76efc414c86af0721aab9e9aa70fcd6b08eed4acee8c2af5af56fd665197aea612187c7f6022d1acf5567d5b9e72a7dcdcf25cc401135d875d95a99ed
@@ -231,6 +289,7 @@ DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882
 DIST unicode-ident-1.0.14.crate 47547 BLAKE2B 30e0b6d7f3a967aaf5b9d91237008a60c3a8ded53bda901696e23cea3931dd71b01ddab866dca9e31e17c395d5f5a68f2a938655b693e894962568c2cff5ca15 SHA512 7c6dcd1724e8cfedc37546d1abd49088b633dad228097acc73d7b6cab255b223e830c541144e05a00388fd8ca8066f27c18792419cfa58ee9da4460a38d0bc0a
 DIST unicode-normalization-0.1.24.crate 126536 BLAKE2B 1d6d535a1236562918d2625172d38c261854cd8c45cccc81c5d5aefb052db5d0e33981d95f5c87e8760cf77b3651c60b7ec1762421a7a9caa72fe7eac3f562a0 SHA512 f7af59688773319b9d1523955ce9b82e6735bd72358715ba5c056f41956ca050b6a612cae1b39199cc089674b3c71e4016d85d48167277c794c5cef3df881754
 DIST unicode-width-0.1.14.crate 271615 BLAKE2B dd2e1504caedecb5d37c397ba05446d3d762b8b6833a8032ebbc213e324d53d89db5e96ed2f7223096e5754d800b39a54105906effc88d9437d7acb9e7beb81e SHA512 3c58a18776aa82cc13c761789a47901616cd98a30356f93d7eb05ae457314209d0a66213e2bbfa5eb8b59be6beacf62438234ce8daafa31b128dbf7d5d6fcadb
+DIST unicode-width-0.2.0.crate 271509 BLAKE2B 53015f24c57ba65d7ffc6e15e947f5ab96fa272996fe5a4d2f9203051972238ea7591c99f1d8ae5d2610c7b83c215b6912eff7aaae034237aec8d79620bfb843 SHA512 38149ad512a44fc79b2c991c6b5667da2e8f8b442ab6bb7e4f404e7fbb034f7540c7e0e8b9e72a1ff6117b899d6034862239f43b6423fa89d55dcf489caff37d
 DIST utf8parse-0.2.2.crate 13499 BLAKE2B 095b5d219ab8ff04c06fd6303e03d913ae36a57845f0b2ca3217a40e31a54cb0fb5ecedbde165d28f5f60f1553d8252986d7098fa83befc84a7cb20bf3b76144 SHA512 f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
 DIST version_check-0.9.5.crate 15554 BLAKE2B 131e75cc287518831e142430e2a39b48e4275874f4473780d47a27552294097aa1cddb65c385583e1022478f940b495eb43c24a8b1617b8ac5a24af3340c0d72 SHA512 d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db
@@ -238,27 +297,44 @@ DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST wasm-bindgen-0.2.97.crate 45515 BLAKE2B 41855074fe53f72625afb5582097e6ac3e1e67fb119fd4399a92e59f4187cbb97f8691f365e55ba44ce738b7fcb3ee217cfc22a037de5a69cdb45b9515d13e4e SHA512 01695edc94bab6bac0ed55d40f29f926a42464f356c9ae8bdd5178c39b384526cf40aa8e5c11dc951dabcf6bc6d2f90f76bbfaf270afd4ce1fd53c3ab25d83bd
+DIST wasm-bindgen-0.2.99.crate 46136 BLAKE2B 04e69294da3dc4feff9001185bcc5b864d1f14a1ead6b9a31c830b2043dde191f9f7c65755d607365a3b8885bd340bbd266e26cfa74c48464933c8d7a1164f94 SHA512 184aec11998b99a730ea5b63d6141260cd0b7cdc29b02696f533b3e75ec79f7c17c6aac892e7a7b24036c6e73592d01df638ca31b54bda11d3bdbf857b1489c2
 DIST wasm-bindgen-backend-0.2.97.crate 31099 BLAKE2B f104f54ccc84e32357ee9b9955d44cd6cb3f7c148c192f6dc1783252d7e4235398afa62bb97dc0af6d025337efce1f0b3126fda3cb600d5c66053adfca4eb68d SHA512 4b910dba7ae5a4f9e6a3eb2400d95ef1b1eef7a4c74d3d438f993e6d0c8ff79ee5d1699a1b0ecf130fb18084e582eb4c8b82383d028e6ee92f203ee37b2bfd62
+DIST wasm-bindgen-backend-0.2.99.crate 30928 BLAKE2B ecfa94a461df79a33fd2bb9807374a2a0c7ac370b443e5a1103ba73a29c9d337ed3feb427c80571ccc15599f81135987742e698199528a9c1bb570baef3e9d09 SHA512 8369a5e618223f09fff7cdc35662a930b3eb11024af51bf5fb9e70c45dfa22452a518d723f3d912c0c970fc4bf748ef2d83d48756483174993f7d04c92d9621f
 DIST wasm-bindgen-macro-0.2.97.crate 7146 BLAKE2B 55edfcf5b1d66dfd78b2b79f5fe8cb00fc56ac9e3796b9baab41199a9928892fb3795ee29e367d8bfa5936043a90072020201362fcb785b165fe702e44d36b6e SHA512 dbff3d975a73f30c1c3ef117f2cd3c2c56a70147b7610c97713212065e017b60bd2d3e98064e141cda798853996cdc915635e647dd8704984eed339596c65111
+DIST wasm-bindgen-macro-0.2.99.crate 7011 BLAKE2B 07182a9fb98f519d1e5c934e609d7a42cf2409319f59dd901e2a5bec77972b4d16fc6f67cf40ade58af874b05faa981c894443d3950616e2aad117ac7355ac6f SHA512 344bf5192e43582246efad257c600003c41b589234c1900f6ed201f96b6f7665eb55226da15d612060042f89c6214e452489cf3aabc61645843be9c27f9cca0b
 DIST wasm-bindgen-macro-support-0.2.97.crate 22824 BLAKE2B 3c66cf2d5faea9d514d223064ff977ed10923ad801461b936a9c10abfa63f6869355227232d38e6f82c9aa6685616096f1c670d54b69eeeb8df9f61dc7cbf559 SHA512 41b8b61626ec86c16a856aaf25b253de0e69c70722a46073fe86ec498d0c8476f1cb4adcb48af062e00d85db038c34ab9c10a887785630e20970b008a78433fd
+DIST wasm-bindgen-macro-support-0.2.99.crate 22800 BLAKE2B 9772cc94a64f768eecae12072e6d700bf95fded306297b84e235f3450f7c5630cb1985def3eaef05aee193c693f92c6fa61d7a6ca18e84a2b73aa38f070d47e7 SHA512 936ab8211a13fbe8b8f21a870a78c03e24219d0872731561353cfcae245e9f632246f179b67f2b13e106c799e68c5c39f9e388370a8ad3f93f299c4804f5907e
 DIST wasm-bindgen-shared-0.2.97.crate 7771 BLAKE2B ab740c64d4dbcca9649d2cd7cc6ce01ff5c319d48ddc057ad24804fe706025219251fe23b37b87da6880a867eace8103df0978bf7248bf5c86d1784819cb1551 SHA512 6e1a42f7b9ddbf2c585e8ea2931c287201f21312a5ef844a9aed43cb77e0bfec4a6490c5cc1a015a2f39ade029ca0340566d5d8b49e617d1b97b64e7da9d0e57
+DIST wasm-bindgen-shared-0.2.99.crate 7773 BLAKE2B 73489af59d16f4d0a1ea51b535cd02d2759b5b7b07873d8a71fa6bd6b6ce1cfc6e8139e6a79346abec13665ed9aeadd0b5b6aed28ae008f9dcb3d5da9fce665a SHA512 8da0f107be99b6666cf1859d68ac0a7295fc03e7b494fce1df9dbe57d21807de8e2bc95f5b974562303923ca4646f38c5297588ad7c97bd59ef236218b2a64f9
 DIST which-4.4.2.crate 15953 BLAKE2B 40ca22cd2f625cb035a1d919ed457a300b482c7751dcee4441974c53d56ce13f1f502535e1f7c0746a01981f4de2e2f761c3a255902d6353db1a4c3c62637448 SHA512 2d12aa1d4c2dbc140e39c8f15bd4ee1eeb8e8de71bcdf579479ef4be860fb0839eaf4cdb818addba242d50420f6e08acaf2bfc979a889e092c83644819246fd5
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.9.crate 12464 BLAKE2B 7fb9dd803fc2608c4e5bc75674472992d82da364f24c22072d5624d6ae6abc44abd3e3ea3c45a7558e045331f3d87572b306b4ab5de52c07ff3706e7f13c2a38 SHA512 c46b893f67ec6e36499b00736bb6b9421e0e2611e76784afa6da01d7ebd033df82f1be7cf8d871d541125d290983f98f26f759488ba9aface49efce8edd682e9
 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-sys-0.59.0.crate 2387323 BLAKE2B 3110c8cd2bc005f8c95cd038a8d574af648dc19788fe4485f977376f92e36b911b1a542d669a07ae9cd4ea72a884ab01ec78b8a2b5587456eb202452d1d8fa0d SHA512 d35e009e979633a1f3c8468cd038bd5c8c0381405165ce03497decd7d9edaaac485d704487e4a61d9aaf4e4d011b4248408912df6a0044d50e8457259867e061
+DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709
 DIST windows-targets-0.52.6.crate 6403 BLAKE2B eb98d0a8daeed5fe76e7fa8edb2743e2a3e77dfb9c4ea68605a6ab10532cb7cfc43bc1cea0180869445bd940be762a40136500e26b84ca88b5e0c502004c7a4c SHA512 d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f
+DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996
 DIST windows_aarch64_gnullvm-0.52.6.crate 435718 BLAKE2B 8b12ae02892cb69401329034bbca671d13bd268a112120b56b90504707cef89decfbd2560492844a9f0588fab62dc1476ab7e931126b939015d25a8cc91ca334 SHA512 f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5
+DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff
 DIST windows_aarch64_msvc-0.52.6.crate 832615 BLAKE2B adc8ff61b6dc96d39c92c7d4221ae6aa0575edfc016cfcd046067ca5d8fcfd56d10e8e227be1c038ce34684be22c7ccaf5f18cd5a7638d28fbff4ba15b48b90b SHA512 a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b
+DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a
 DIST windows_i686_gnu-0.52.6.crate 880402 BLAKE2B 5aab8ee07132eccb7695807eb44811beeb0657aadfb672c54e99b6ae39c067ba9b93e38fc69bb5b9b14a9759f263ccd5e301597d2727d83b31b49a409b6bd405 SHA512 a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822
 DIST windows_i686_gnullvm-0.52.6.crate 475940 BLAKE2B fec4fda8bb2bf319a501a22372fa642ae682e4dee3235b258a028190ee73220bfc55b3142f06249bb4579b17e5fde662bb2b121aefe18544653350d7d0fe7d8e SHA512 95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f
+DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e
 DIST windows_i686_msvc-0.52.6.crate 901163 BLAKE2B 99ed34e052db5ba77bab240ed5d38ce450be347a794d63ec39b719304c32722c9999b540ab40abe0216318900b7412970df99dfb36d1516a9517cae0c77d1bdc SHA512 ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96
+DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
 DIST windows_x86_64_gnu-0.52.6.crate 836363 BLAKE2B e2335829155cdbd4a55cc9f9babc237e14e32aab97f6f91afabcdf80d2aee37d6fb4b8669aaf433ff532c85dba59b3d366c7d41b61a2f29b96f960169c900687 SHA512 c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb
+DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
 DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd
+DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
+DIST wyz-0.5.1.crate 18790 BLAKE2B 07ac1435a812d2f50309348ef8378ea4955c001f01edaf2ffab108f7d524ee731f06b22fd42c043349a4a2271ec47ea203e89562076e8c7c1719112b0214c89a SHA512 15d86c167145c90e3fbabcefd11754fb1cb835896e32d1bb7f4b027e5b2092f5fdbdca4062c129bc38e655cb87c6a3f4e181747ee25d89db5e01fb1fcac18fe9
+DIST yaxpeax-arch-0.3.2.crate 37028 BLAKE2B 911f491f7a4f427e7921ef3f8d8fb03ea34b4d96cc481b4a19a24e005fd6066b8312cda7a7c77282c90fb1f1a9e415a7a737d13638a5f001997a5aa8ed3e31f8 SHA512 8fca1d1de3f1855bdd556baf8eab5cfc6d379e03e36eca87089ce07c0d2791dd8fc890d330b17ff7769314bb421226983019306cc9cebc5468fec68f6c626b73
+DIST yaxpeax-arm-0.3.0.crate 129736 BLAKE2B c93ba6083f4b9ad78fffb77716cf5e22f6804cf567fc6ab610bb96d9a3a80a78089adf76802dfef44d0e95d855bd0b644eae47bfad72a6e6ce3c4ba7dc999db0 SHA512 2b7491aca611c95b377b68b3d3c30caa64cfbd6d93c50c1c0b18d572f0293cbf3b810c2b3820af76f31b3b2dec14b29308963c5ddfb09adfb4defb32c82f1b76
 DIST zerocopy-0.7.35.crate 152645 BLAKE2B 8f13123c9d9257ac5a5c6954d38c3510fa658624442f7e03cdcc6db5a0977d9f26bb4e277be172b7872ec365cf6e58ac742e5578636f7698f9f37093e9249d9a SHA512 17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c
 DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb
 DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe14ab9e7f0b4ef3cb1ecbc42fbec2b951414e26ab00bc65aaddc2c93eddd5a1963b27c6cd613ac71c65d5cc24 SHA512 dd40ebe98b98fd742608d4066b5ab66caba94b2e679428fcaff9fe547d8cd6ff2360dc85d671ee9183e32fb79cb554d00d6aef9eb8f3d8ad0ec92d0435aa4ebe
diff --git a/sys-apps/syd/syd-3.30.0.ebuild b/sys-apps/syd/syd-3.30.0.ebuild
new file mode 100644
index 000000000000..caa1a1cf514b
--- /dev/null
+++ b/sys-apps/syd/syd-3.30.0.ebuild
@@ -0,0 +1,328 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+RESTRICT="test" # fails with sandbox
+
+CRATES="
+	addr2line@0.24.2
+	adler2@2.0.0
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anstream@0.6.18
+	anstyle-parse@0.2.6
+	anstyle-query@1.1.2
+	anstyle-wincon@3.0.6
+	anstyle@1.0.10
+	anyhow@1.0.95
+	argv@0.1.11
+	arrayref@0.3.9
+	arrayvec@0.5.2
+	arrayvec@0.7.6
+	autocfg@1.4.0
+	backtrace@0.3.74
+	base64@0.13.1
+	bitflags@1.3.2
+	bitflags@2.6.0
+	bitvec@1.0.1
+	blake2b_simd@0.5.11
+	block-buffer@0.10.4
+	brunch@0.7.0
+	btoi@0.4.3
+	bumpalo@3.16.0
+	caps@0.5.5
+	cc@1.2.7
+	cfg-if@1.0.0
+	cfg_aliases@0.1.1
+	cfg_aliases@0.2.1
+	chrono@0.4.39
+	clap@4.5.24
+	clap_builder@4.5.24
+	clap_derive@4.5.24
+	clap_lex@0.7.4
+	colorchoice@1.0.3
+	constant_time_eq@0.1.5
+	constant_time_eq@0.3.1
+	core-foundation-sys@0.8.7
+	cpufeatures@0.2.16
+	crc-catalog@2.4.0
+	crc32fast@1.4.2
+	crc@3.2.1
+	crossbeam-utils@0.8.21
+	crypto-common@0.1.6
+	dactyl@0.8.0
+	darling@0.20.10
+	darling_core@0.20.10
+	darling_macro@0.20.10
+	derive_builder@0.20.2
+	derive_builder_core@0.20.2
+	derive_builder_macro@0.20.2
+	digest@0.10.7
+	dirs-sys@0.3.7
+	dirs-sys@0.4.1
+	dirs@1.0.5
+	dirs@4.0.0
+	dirs@5.0.1
+	either@1.13.0
+	equivalent@1.0.1
+	errno@0.3.10
+	error-chain@0.12.4
+	expiringmap@0.1.2
+	fastrand@2.3.0
+	fixedbitset@0.5.7
+	flate2@1.0.35
+	fnv@1.0.7
+	funty@2.0.0
+	generic-array@0.14.7
+	getargs@0.5.0
+	getrandom@0.1.16
+	getrandom@0.2.15
+	getset@0.1.3
+	gimli@0.31.1
+	goblin@0.9.3
+	gperftools@0.2.0
+	hashbrown@0.12.3
+	hashbrown@0.14.5
+	hashbrown@0.15.2
+	heck@0.5.0
+	hermit-abi@0.3.9
+	hex-conservative@0.3.0
+	hex@0.4.3
+	hkdf@0.12.4
+	hmac@0.12.1
+	home@0.5.11
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.61
+	iced-x86@1.21.0
+	ident_case@1.0.1
+	indexmap@1.9.3
+	indexmap@2.7.0
+	io-uring@0.6.4
+	ipnet@2.10.1
+	iprange@0.6.7
+	is_terminal_polyfill@1.70.1
+	itoa@1.0.14
+	js-sys@0.3.76
+	keccak@0.1.5
+	lazy_static@1.5.0
+	lexis@0.2.3
+	libc@0.2.169
+	libcgroups@0.5.0
+	libcontainer@0.5.0
+	libloading@0.8.6
+	liboci-cli@0.5.0
+	libredox@0.1.3
+	libseccomp-sys@0.2.1
+	libseccomp@0.3.0
+	linefeed@0.6.0
+	linux-raw-sys@0.4.14
+	log@0.4.22
+	md5@0.7.0
+	memchr@2.7.4
+	memoffset@0.9.1
+	minimal-lexical@0.2.1
+	miniz_oxide@0.8.2
+	mortal@0.2.4
+	nc@0.9.5
+	nix@0.26.4
+	nix@0.28.0
+	nix@0.29.0
+	nom@7.1.3
+	nu-ansi-term@0.46.0
+	num-traits@0.2.19
+	num_cpus@1.16.0
+	object@0.36.7
+	oci-spec@0.7.1
+	once_cell@1.20.2
+	option-ext@0.2.0
+	overload@0.1.1
+	parse-size@1.0.0
+	phf@0.11.3
+	phf_codegen@0.11.3
+	phf_generator@0.11.3
+	phf_shared@0.11.3
+	pin-project-lite@0.2.16
+	pkg-config@0.3.31
+	plain@0.2.3
+	portable-atomic@1.10.0
+	prctl@1.0.0
+	proc-macro-error-attr2@2.0.0
+	proc-macro-error2@2.0.1
+	proc-macro2@1.0.92
+	procfs-core@0.17.0
+	procfs@0.17.0
+	protobuf-codegen@3.2.0
+	protobuf-parse@3.2.0
+	protobuf-support@3.2.0
+	protobuf@3.2.0
+	quick_cache@0.6.9
+	quote@1.0.38
+	radium@0.7.0
+	raki@1.3.1
+	rand@0.8.5
+	rand_core@0.6.4
+	rand_hc@0.3.2
+	redox_syscall@0.1.57
+	redox_users@0.3.5
+	redox_users@0.4.6
+	regex-automata@0.4.9
+	regex-syntax@0.8.5
+	regex@1.10.6
+	ringbuf@0.4.7
+	rust-argon2@0.8.3
+	rust-criu@0.4.0
+	rustc-demangle@0.1.24
+	rustix@0.38.43
+	rustversion@1.0.19
+	ryu@1.0.18
+	safe-path@0.1.0
+	scroll@0.12.0
+	scroll_derive@0.12.0
+	secure-string@0.3.0
+	sendfd@0.4.3
+	serde@1.0.217
+	serde_derive@1.0.217
+	serde_json@1.0.135
+	sha1@0.10.6
+	sha3@0.10.8
+	sharded-slab@0.1.7
+	shellexpand@3.1.0
+	shlex@1.3.0
+	siphasher@1.0.1
+	smallstr@0.2.0
+	smallvec@1.13.2
+	strsim@0.11.1
+	strum@0.26.3
+	strum_macros@0.26.4
+	subtle@2.6.1
+	syn@2.0.95
+	tabwriter@1.4.1
+	tap@1.0.1
+	tcmalloc@0.3.0
+	tempfile@3.15.0
+	terminfo@0.8.0
+	thiserror-impl@1.0.69
+	thiserror-impl@2.0.9
+	thiserror@1.0.69
+	thiserror@2.0.9
+	thread_local@1.1.8
+	tick_counter@0.4.5
+	tinyvec@1.8.1
+	tinyvec_macros@0.1.1
+	tracing-attributes@0.1.28
+	tracing-core@0.1.33
+	tracing-log@0.2.0
+	tracing-subscriber@0.3.19
+	tracing@0.1.41
+	typenum@1.17.0
+	unicode-ident@1.0.14
+	unicode-normalization@0.1.24
+	unicode-width@0.1.14
+	unicode-width@0.2.0
+	utf8parse@0.2.2
+	valuable@0.1.0
+	version_check@0.9.5
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasi@0.9.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.99
+	wasm-bindgen-macro-support@0.2.99
+	wasm-bindgen-macro@0.2.99
+	wasm-bindgen-shared@0.2.99
+	wasm-bindgen@0.2.99
+	which@4.4.2
+	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.59.0
+	windows-targets@0.48.5
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.6
+	wyz@0.5.1
+	yaxpeax-arch@0.3.2
+	yaxpeax-arm@0.3.0
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+	zeroize@1.8.1
+"
+
+inherit cargo
+
+DESCRIPTION="seccomp and landlock based application sandbox with support for namespaces"
+HOMEPAGE="https://sydbox.exherbolinux.org"
+SRC_URI="https://git.sr.ht/~alip/syd/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+IUSE="static"
+
+LICENSE="GPL-3"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 MIT Unicode-DFS-2016"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="static? ( sys-libs/libseccomp[static-libs] )
+	sys-libs/libseccomp
+	app-text/scdoc"
+RDEPEND="sys-apps/pandora_box
+	${DEPEND}"
+
+S="${WORKDIR}/syd-v${PV}"
+
+src_configure() {
+	if use static; then
+		export LIBSECCOMP_LINK_TYPE="static"
+		export LIBSECCOMP_LIB_PATH=$(pkgconf --variable=libdir libseccomp)
+		export RUSTFLAGS+="-Ctarget-feature=+crt-static"
+		cargo_src_configure
+	else
+		local myfeatures=( "oci" )
+		cargo_src_configure
+	fi
+}
+
+src_compile() {
+	cargo_src_compile
+	emake man
+}
+
+src_install () {
+	cargo_src_install
+	mkdir -p "${D}"/usr/share/man/man{1,2,5,7}
+	emake install-man DESTDIR="${D}" PREFIX="/usr"
+	dodoc README.md
+	insinto /usr/libexec
+	doins src/esyd.sh
+
+	insinto /etc
+	newins data/user.syd-3 user.syd-3.sample
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins vim/ftdetect/syd.vim
+	insinto /usr/share/vim/vimfiles/syntax
+	doins vim/syntax/syd-3.vim
+}
+
+src_test() {
+	RUSTFLAGS="" cargo_src_test
+}
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 8e201b671870..4aa5ab0b6be9 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,4 +1,5 @@
 DIST systemd-256.10.tar.gz 15776970 BLAKE2B 84bdf681e3255c0f8071d8309abe1d12458fddd366b7aad0edea1bcf8074b48e3b594614f087407ab30c1dcd1cd69952f1c41b602927787fab5e5333bfe9f44b SHA512 4ae25a40a473984c4caefd63e69af12c8965184c1c55539086b04050a457bb0175f15adf87b3a86b476357ccb402abc72844033e40e2dc4f9abb6cc3bb65e22c
+DIST systemd-256.11.tar.gz 15777170 BLAKE2B 838a25f04c64fc1513575b01d52a9eef30628fd589a3110818395981c7bff1b820bd141c1f2dcf159a75fb8efab4560056e399f15fe7e029183019c1a0d605f8 SHA512 e0045963f0614dc3019f23d55e792ae1e5837cc1622f0ab73524ef65521f9ebf12ae57b7215712d84f555f506683ef3bc0429dc90a3bfd5f904b50cc016b9baa
 DIST systemd-256.9.tar.gz 15774953 BLAKE2B caeff33d0906583094a44ab89fe9a9c1832a665f8cc768f86c55c5100bdd5c2b1500b2cd65e9519ef21d79bff92d1da3e84240793099a0e0c508afba3669c46e SHA512 aba7a0f7149fe3d28d9f930f244d5b997c28721e93e6f0768b0f0f1c918c87a0e8b7b347cffb2faa4740ca3ee3b04984454e85757365090a2cf32aba09f70681
 DIST systemd-musl-patches-254.3-r1.tar.gz 29971 BLAKE2B 2568c0ce93c410177d775fedb7a67b9498d66f39bfaca220237b3b55cd42c94569d7e3bfde11a9b1faa5eac1804eb75bfdee0ee465c2faac3b8213026b97daec SHA512 817c94765a70eaaa5d23454e03887e149db4612f01c29690baa0c75d61b4b328b742e5d02e8cc63c531eadcd72ae37c0a407aad37c22f1d399dbba81a6bed79d
 DIST systemd-musl-patches-255.14.tar.gz 31519 BLAKE2B 1ada38b3536370f3f20f94abb122b6dc72e2dac6d34baad49ae0c154810197dab6d225457f81c2b78c58cf7fe14070da9ca1902bec6d8f892d55394af67155b5 SHA512 ff9cb11f687e7895b93b55933c330f69067546d48cc0f23a029990e095245c78e046023636f82d11fec1b03a5349d4d747c9625fd34ef7f9445a54a44b25cccb
@@ -6,5 +7,7 @@ DIST systemd-musl-patches-256.8.tar.gz 27395 BLAKE2B c387670f46bb7a484ca320ee8c8
 DIST systemd-stable-254.17.tar.gz 14566862 BLAKE2B fca04c8db285cf22551f7c980da52a8aa3ef3eb78d6005b38cdece4b53ac43a69aa401f8498ee00fcab037dbb22c996b8c626db32c6e4be481f41f752e7a848b SHA512 11ae971e5463fb511c32fbc1ce4012765c73cf87d68ca44c36b85a2ed12f73655b6d071975008c6dd56a27963d1dff5d3c22039fc813bff30be23e6f2dd425ae
 DIST systemd-stable-254.21.tar.gz 14664320 BLAKE2B 3814f3ed8561dc096aa66039d63591ee1462184a0ffe3e34417ec47b1bb411b506be586692898862ebd5ea24c16bdcedde9a702826ca558e95329d0a1264f377 SHA512 96e49fb86284642157be173db763f888a1c34c078f12fee987a5c68e91611a75b6c52e67162dd8390f57f6d10798530a38b4940b1f03f10f97123c2cc242897b
 DIST systemd-stable-254.22.tar.gz 14667273 BLAKE2B d3bfbd34ef47b73e139c37dd3e961fdc17c969e38674d84976183ecad44030fce1db073da6faf522e9ab232ae65c8e70a8d9a1f15053c57269090d3a9f1756f7 SHA512 5cef3912e68060366d7a8030c13825ae872783dd55a8a3ab15aa5ff2c397b50df8fc6e08b9bd1fdc0d54f08f3f7765484a41af0646ded238512921e3d02b553d
+DIST systemd-stable-254.23.tar.gz 14666469 BLAKE2B db685bfd40ed45dd29260085330c8cbe3545d229b50e881e7debb994ab3cc24024cf3e9c9a1c0931013e78701c101fd79e828d8ea3f8dcc19ce46867c0ed1a43 SHA512 e5a02d8e151f48b5fa9c9532d4f0caae56f368e83ed8f33cd4e2172af9209c357269385f99f3177fc92ebf356691f22751e27a6d6356ebaea8d5ad649ecf15e5
 DIST systemd-stable-255.15.tar.gz 15207869 BLAKE2B 5bd314f008782d5d6148bf6a0ab437be23e71ca4dab1fc0aff61e6cc17e9b43da7fbae5a1bfa7d829ba0d8dcb28b43a1a2fbd4fcd0d79fd4154336f98fb25a25 SHA512 39e4d03da90bcceb30517098b012cea991067cdd88cf577a23243c28341424e38a5dbb8f92e51b32f8f651e880ae6ca48490f7de8d0dc3525e6629250f546000
 DIST systemd-stable-255.16.tar.gz 15206112 BLAKE2B a5bc9d73b2ae8e1ebe485ab305bd20161500157b366f8678fccdac56f1844614bd14c849493154dcff40f0283467c910dbe7bf0ca501b40a2be1577c269e7544 SHA512 e2c108af8f895bcdeb47b133b2c26db640d5b5b2bcd1ba548faf8c579fa09b1d88f9e89b3b994a4a396a9f0df56d1a0f5833e71c0c66501d418ae4ea78f37889
+DIST systemd-stable-255.17.tar.gz 15206361 BLAKE2B 71b7eb7c90898ee080b258fa6b500b84c588d52bacfd0b3c301b8fd157bc6c6c3ddde11bb3f94a5f162038c527779872586622da1e0cafb9f8685c541ab6a7a6 SHA512 441f27764af708bb1165e671eee8fa5686adbb32f1a4761fef2d89b882d879534d2e74f7e04028ab06457aaa5173fdbcb099aaa20bb0d23b36ed59e8c7ad1887
diff --git a/sys-apps/systemd-utils/systemd-utils-254.23.ebuild b/sys-apps/systemd-utils/systemd-utils-254.23.ebuild
new file mode 100644
index 000000000000..98f62f62496a
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.23.ebuild
@@ -0,0 +1,585 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
+inherit python-single-r1 secureboot toolchain-funcs udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+	MY_P="systemd-stable-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+	MY_P="systemd-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-254.3-r1"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+	|| ( kernel-install tmpfiles sysusers udev )
+	boot? ( kernel-install )
+	ukify? ( boot )
+	${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	elibc_musl? ( >=sys-libs/musl-1.2.3 )
+	selinux? ( sys-libs/libselinux:0= )
+	tmpfiles? (
+		acl? ( sys-apps/acl:0= )
+	)
+	udev? (
+		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+		virtual/libcrypt:=[${MULTILIB_USEDEP}]
+		acl? ( sys-apps/acl:0= )
+		kmod? ( >=sys-apps/kmod-15:0= )
+	)
+	!udev? (
+		>=sys-apps/util-linux-2.30:0=
+		sys-libs/libcap:0=
+		virtual/libcrypt:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+	boot? ( !<sys-boot/systemd-boot-250 )
+	ukify? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep "${PEFILE_DEPEND}")
+	)
+	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+	udev? (
+		acct-group/audio
+		acct-group/cdrom
+		acct-group/dialout
+		acct-group/disk
+		acct-group/floppy
+		acct-group/input
+		acct-group/kmem
+		acct-group/kvm
+		acct-group/lp
+		acct-group/render
+		acct-group/sgx
+		acct-group/tape
+		acct-group/tty
+		acct-group/usb
+		acct-group/video
+		!sys-apps/gentoo-systemd-integration
+		!sys-apps/hwids[udev]
+		!<sys-fs/udev-250
+		!sys-fs/eudev
+	)
+	!sys-apps/systemd
+"
+PDEPEND="
+	udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_cond_dep "
+		dev-python/jinja2[\${PYTHON_USEDEP}]
+		dev-python/lxml[\${PYTHON_USEDEP}]
+		boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+		ukify? ( test? ( ${PEFILE_DEPEND} ) )
+	")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+	~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+		linux-info_pkg_setup
+	fi
+	use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
+	)
+
+	if use elibc_musl; then
+		PATCHES+=(
+			"${WORKDIR}/${MUSL_PATCHSET}"
+		)
+	fi
+	default
+
+	# Remove install_rpath; we link statically
+	local rpath_pattern="install_rpath : rootpkglibdir,"
+	grep -q -e "${rpath_pattern}" meson.build || die
+	sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+	python_setup
+	meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		# default is developer, bug 918671
+		-Dmode=release
+		$(meson_use split-usr)
+		$(meson_use split-usr split-bin)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dsysvinit-path=
+		$(meson_native_use_bool boot bootloader)
+		$(meson_native_use_bool kernel-install)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool sysusers)
+		$(meson_use test tests)
+		$(meson_native_use_bool tmpfiles)
+		$(meson_use udev hwdb)
+		$(meson_native_use_bool ukify)
+
+		# Link staticly with libsystemd-shared
+		-Dlink-boot-shared=false
+		-Dlink-kernel-install-shared=false
+		-Dlink-udev-shared=false
+
+		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+		-Dstandalone-binaries=true
+
+		# Disable all optional features
+		-Dadm-group=false
+		-Danalyze=false
+		-Dapparmor=false
+		-Daudit=false
+		-Dbacklight=false
+		-Dbinfmt=false
+		-Dbpf-framework=false
+		-Dbzip2=false
+		-Dcoredump=false
+		-Ddbus=false
+		-Delfutils=false
+		-Denvironment-d=false
+		-Dfdisk=false
+		-Dgcrypt=false
+		-Dglib=false
+		-Dgshadow=false
+		-Dgnutls=false
+		-Dhibernate=false
+		-Dhostnamed=false
+		-Didn=false
+		-Dima=false
+		-Dinitrd=false
+		-Dfirstboot=false
+		-Dldconfig=false
+		-Dlibcryptsetup=false
+		-Dlibcurl=false
+		-Dlibfido2=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dlocaled=false
+		-Dlogind=false
+		-Dlz4=false
+		-Dmachined=false
+		-Dmicrohttpd=false
+		-Dnetworkd=false
+		-Dnscd=false
+		-Dnss-myhostname=false
+		-Dnss-resolve=false
+		-Dnss-systemd=false
+		-Doomd=false
+		-Dopenssl=false
+		-Dp11kit=false
+		-Dpam=false
+		-Dpcre2=false
+		-Dpolkit=false
+		-Dportabled=false
+		-Dpstore=false
+		-Dpwquality=false
+		-Drandomseed=false
+		-Dresolve=false
+		-Drfkill=false
+		-Dseccomp=false
+		-Dsmack=false
+		-Dsysext=false
+		-Dtimedated=false
+		-Dtimesyncd=false
+		-Dtpm=false
+		-Dqrencode=false
+		-Dquotacheck=false
+		-Duserdb=false
+		-Dutmp=false
+		-Dvconsole=false
+		-Dwheel-group=false
+		-Dxdg-autostart=false
+		-Dxkbcommon=false
+		-Dxz=false
+		-Dzlib=false
+		-Dzstd=false
+	)
+
+	if use tmpfiles || use udev; then
+		emesonargs+=( $(meson_native_use_bool acl) )
+	else
+		emesonargs+=( -Dacl=false )
+	fi
+
+	if use udev; then
+		emesonargs+=( $(meson_native_use_bool kmod) )
+	else
+		emesonargs+=( -Dkmod=false )
+	fi
+
+	if use elibc_musl; then
+		# Avoid redefinition of struct ethhdr.
+		append-cppflags -D__UAPI_DEF_ETHHDR=0
+	fi
+
+	if multilib_is_native_abi || use udev; then
+		meson_src_configure
+	fi
+}
+
+efi_arch() {
+	case "$(tc-arch)" in
+		amd64) echo x64 ;;
+		arm)   echo arm ;;
+		arm64) echo aa64 ;;
+		x86)   echo x86 ;;
+	esac
+}
+
+multilib_src_compile() {
+	local targets=()
+	if multilib_is_native_abi; then
+		if use boot; then
+			targets+=(
+				bootctl
+				man/bootctl.1
+				src/boot/efi/linux$(efi_arch).efi.stub
+				src/boot/efi/systemd-boot$(efi_arch).efi
+			)
+		fi
+		if use kernel-install; then
+			targets+=(
+				kernel-install
+				src/kernel-install/90-loaderentry.install
+				man/kernel-install.8
+			)
+		fi
+		if use sysusers; then
+			targets+=(
+				systemd-sysusers.standalone
+				man/sysusers.d.5
+				man/systemd-sysusers.8
+			)
+			if use test; then
+				targets+=(
+					systemd-runtest.env
+				)
+			fi
+		fi
+		if use tmpfiles; then
+			targets+=(
+				systemd-tmpfiles.standalone
+				man/tmpfiles.d.5
+				man/systemd-tmpfiles.8
+				tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+			)
+			if use test; then
+				targets+=( test-tmpfile-util )
+			fi
+		fi
+		if use udev; then
+			targets+=(
+				udevadm
+				systemd-hwdb
+				src/udev/ata_id
+				src/udev/cdrom_id
+				src/udev/fido_id
+				src/udev/mtd_probe
+				src/udev/scsi_id
+				src/udev/udev.pc
+				src/udev/v4l_id
+				man/udev.conf.5
+				man/systemd.link.5
+				man/hwdb.7
+				man/udev.7
+				man/systemd-hwdb.8
+				man/systemd-udevd.service.8
+				man/udevadm.8
+				man/libudev.3
+				man/udev_device_get_syspath.3
+				man/udev_device_has_tag.3
+				man/udev_device_new_from_syspath.3
+				man/udev_enumerate_add_match_subsystem.3
+				man/udev_enumerate_new.3
+				man/udev_enumerate_scan_devices.3
+				man/udev_list_entry.3
+				man/udev_monitor_filter_update.3
+				man/udev_monitor_new_from_netlink.3
+				man/udev_monitor_receive_device.3
+				man/udev_new.3
+				hwdb.d/60-autosuspend-chromiumos.hwdb
+				rules.d/50-udev-default.rules
+				rules.d/60-persistent-storage.rules
+				rules.d/64-btrfs.rules
+			)
+			if use test; then
+				targets+=(
+					test-fido-id-desc
+					test-udev-builtin
+					test-udev-event
+					test-udev-node
+					test-udev-util
+					udev-rule-runner
+				)
+			fi
+		fi
+		if use ukify; then
+			targets+=(
+				ukify
+				src/kernel-install/60-ukify.install
+				man/ukify.1
+			)
+		fi
+	fi
+	if use udev; then
+		targets+=(
+			libudev
+			src/libudev/libudev.pc
+		)
+		if use test; then
+			targets+=(
+				test-libudev
+				test-libudev-sym
+				test-udev-device-thread
+			)
+		fi
+	fi
+	if multilib_is_native_abi || use udev; then
+		meson_src_compile "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	local tests=()
+	if multilib_is_native_abi; then
+		if use sysusers; then
+			tests+=(
+				test-sysusers.standalone
+			)
+		fi
+		if use tmpfiles; then
+			tests+=(
+				test-systemd-tmpfiles.standalone
+				test-tmpfile-util
+			)
+		fi
+		if use udev; then
+			tests+=(
+				rule-syntax-check
+				test-fido-id-desc
+				test-udev
+				test-udev-builtin
+				test-udev-event
+				test-udev-node
+				test-udev-util
+			)
+		fi
+	fi
+	if use udev; then
+		tests+=(
+			test-libudev
+			test-libudev-sym
+			test-udev-device-thread
+		)
+	fi
+	if [[ ${#tests[@]} -ne 0 ]]; then
+		meson_src_test "${tests[@]}"
+	fi
+}
+
+src_install() {
+	local rootprefix="$(usex split-usr '' /usr)"
+	meson-multilib_src_install
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		if use boot; then
+			into /usr
+			dobin bootctl
+			doman man/bootctl.1
+			insinto usr/lib/systemd/boot/efi
+			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+		fi
+		if use kernel-install; then
+			dobin kernel-install
+			doman man/kernel-install.8
+			exeinto usr/lib/kernel/install.d
+			doexe src/kernel-install/*.install
+		fi
+		if use sysusers; then
+			into "${rootprefix:-/}"
+			newbin systemd-sysusers{.standalone,}
+			doman man/{systemd-sysusers.8,sysusers.d.5}
+		fi
+		if use tmpfiles; then
+			into "${rootprefix:-/}"
+			newbin systemd-tmpfiles{.standalone,}
+			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+			insinto /usr/lib/tmpfiles.d
+			doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+		fi
+		if use udev; then
+			into "${rootprefix:-/}"
+			dobin udevadm systemd-hwdb
+			dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+			exeinto "${rootprefix}"/lib/udev
+			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+			rm -f rules.d/99-systemd.rules
+			insinto "${rootprefix}"/lib/udev/rules.d
+			doins rules.d/*.rules
+
+			insinto "${rootprefix}"/lib/udev/hwdb.d
+			doins hwdb.d/*.hwdb
+
+			insinto /usr/share/pkgconfig
+			doins src/udev/udev.pc
+
+			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+			newman man/systemd-udevd.service.8 systemd-udevd.8
+			doman man/libudev.3
+			doman man/udev_*.3
+		fi
+		if use ukify; then
+			exeinto "${rootprefix}"/lib/systemd/
+			doexe ukify
+			doman man/ukify.1
+		fi
+	fi
+	if use udev; then
+		meson_install --no-rebuild --tags libudev
+		insinto "/usr/$(get_libdir)/pkgconfig"
+		doins src/libudev/libudev.pc
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use boot; then
+		into /usr
+		dobashcomp shell-completion/bash/bootctl
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/{_bootctl,_kernel-install}
+	fi
+	if use kernel-install; then
+		exeinto usr/lib/kernel/install.d
+		doexe src/kernel-install/*.install
+	fi
+	if use tmpfiles; then
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+		exeinto /etc/cron.daily
+		doexe "${FILESDIR}"/systemd-tmpfiles-clean
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_systemd-tmpfiles
+		insinto /usr/lib/tmpfiles.d
+		doins tmpfiles.d/x11.conf
+		doins "${FILESDIR}"/{legacy,tmp}.conf
+	fi
+	if use udev; then
+		doheader src/libudev/libudev.h
+
+		insinto /etc/udev
+		doins src/udev/udev.conf
+		keepdir /etc/udev/{hwdb.d,rules.d}
+
+		insinto "${rootprefix}"/lib/systemd/network
+		doins network/99-default.link
+
+		# Remove to avoid conflict with elogind
+		# https://bugs.gentoo.org/856433
+		rm rules.d/70-power-switch.rules || die
+		insinto "${rootprefix}"/lib/udev/rules.d
+		doins rules.d/*.rules
+		doins "${FILESDIR}"/40-gentoo.rules
+
+		insinto "${rootprefix}"/lib/udev/hwdb.d
+		doins hwdb.d/*.hwdb
+
+		dobashcomp shell-completion/bash/udevadm
+
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_udevadm
+	fi
+
+	use ukify && python_fix_shebang "${ED}"
+	use boot && secureboot_auto_sign
+}
+
+add_service() {
+	local initd=$1
+	local runlevel=$2
+
+	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+	eend $?
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		add_service systemd-tmpfiles-setup-dev sysinit
+		add_service systemd-tmpfiles-setup boot
+	fi
+	if use udev; then
+		ebegin "Updating hwdb"
+		systemd-hwdb --root="${ROOT}" update
+		eend $?
+		udev_reload
+	fi
+
+	if use boot; then
+		optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
+			"sys-kernel/installkernel[systemd-boot]"
+	fi
+	if use ukify; then
+		optfeature "automatically generating an unified kernel image on each kernel installation" \
+			"sys-kernel/installkernel[ukify]"
+	fi
+}
diff --git a/sys-apps/systemd-utils/systemd-utils-255.17.ebuild b/sys-apps/systemd-utils/systemd-utils-255.17.ebuild
new file mode 100644
index 000000000000..94f49394cabf
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-255.17.ebuild
@@ -0,0 +1,623 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils
+inherit python-single-r1 secureboot udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+	MY_P="systemd-stable-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+	MY_P="systemd-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-255.14"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+	|| ( kernel-install tmpfiles sysusers udev )
+	boot? ( kernel-install )
+	ukify? ( boot )
+	${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	elibc_musl? ( >=sys-libs/musl-1.2.3 )
+	selinux? ( sys-libs/libselinux:0= )
+	tmpfiles? (
+		acl? ( sys-apps/acl:0= )
+	)
+	udev? (
+		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+		virtual/libcrypt:=[${MULTILIB_USEDEP}]
+		acl? ( sys-apps/acl:0= )
+		kmod? ( >=sys-apps/kmod-15:0= )
+	)
+	!udev? (
+		>=sys-apps/util-linux-2.30:0=
+		sys-libs/libcap:0=
+		virtual/libcrypt:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+	boot? ( !<sys-boot/systemd-boot-250 )
+	ukify? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep "${PEFILE_DEPEND}")
+	)
+	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+	udev? (
+		acct-group/audio
+		acct-group/cdrom
+		acct-group/dialout
+		acct-group/disk
+		acct-group/floppy
+		acct-group/input
+		acct-group/kmem
+		acct-group/kvm
+		acct-group/lp
+		acct-group/render
+		acct-group/sgx
+		acct-group/tape
+		acct-group/tty
+		acct-group/usb
+		acct-group/video
+		!sys-apps/gentoo-systemd-integration
+		!<sys-fs/udev-250
+		!sys-fs/eudev
+	)
+	!sys-apps/systemd
+"
+PDEPEND="
+	udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	dev-util/patchelf
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_cond_dep "
+		dev-python/jinja2[\${PYTHON_USEDEP}]
+		dev-python/lxml[\${PYTHON_USEDEP}]
+		boot? (
+			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+			test? ( ${PEFILE_DEPEND} )
+		)
+	")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+	~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+		linux-info_pkg_setup
+	fi
+	use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/systemd-utils-255-musl-fgetxxent.patch"
+	)
+
+	if use elibc_musl; then
+		PATCHES+=(
+			"${WORKDIR}/${MUSL_PATCHSET}"
+			"${FILESDIR}/musl-efi-wchar.patch"
+		)
+	fi
+	default
+}
+
+src_configure() {
+	python_setup
+	meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		# default is developer, bug 918671
+		-Dmode=release
+		-Dsysvinit-path=
+		$(meson_native_use_bool boot bootloader)
+		$(meson_native_use_bool kernel-install)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool sysusers)
+		$(meson_use test tests)
+		$(meson_native_use_bool tmpfiles)
+		$(meson_use udev hwdb)
+		$(meson_native_use_bool ukify)
+
+		# Disable all optional features
+		-Dadm-group=false
+		-Danalyze=false
+		-Dapparmor=false
+		-Daudit=false
+		-Dbacklight=false
+		-Dbinfmt=false
+		-Dbpf-framework=false
+		-Dbzip2=false
+		-Dcoredump=false
+		-Ddbus=false
+		-Delfutils=false
+		-Denvironment-d=false
+		-Dfdisk=false
+		-Dgcrypt=false
+		-Dglib=false
+		-Dgshadow=false
+		-Dgnutls=false
+		-Dhibernate=false
+		-Dhostnamed=false
+		-Didn=false
+		-Dima=false
+		-Dinitrd=false
+		-Dfirstboot=false
+		-Dldconfig=false
+		-Dlibcryptsetup=false
+		-Dlibcurl=false
+		-Dlibfido2=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dlocaled=false
+		-Dlogind=false
+		-Dlz4=false
+		-Dmachined=false
+		-Dmicrohttpd=false
+		-Dnetworkd=false
+		-Dnscd=false
+		-Dnss-myhostname=false
+		-Dnss-resolve=false
+		-Dnss-systemd=false
+		-Doomd=false
+		-Dopenssl=false
+		-Dp11kit=false
+		-Dpam=false
+		-Dpcre2=false
+		-Dpolkit=false
+		-Dportabled=false
+		-Dpstore=false
+		-Dpwquality=false
+		-Drandomseed=false
+		-Dresolve=false
+		-Drfkill=false
+		-Dseccomp=false
+		-Dsmack=false
+		-Dsysext=false
+		-Dtimedated=false
+		-Dtimesyncd=false
+		-Dtpm=false
+		-Dqrencode=false
+		-Dquotacheck=false
+		-Duserdb=false
+		-Dutmp=false
+		-Dvconsole=false
+		-Dwheel-group=false
+		-Dxdg-autostart=false
+		-Dxkbcommon=false
+		-Dxz=false
+		-Dzlib=false
+		-Dzstd=false
+	)
+
+	if use tmpfiles || use udev; then
+		emesonargs+=( $(meson_native_use_bool acl) )
+	else
+		emesonargs+=( -Dacl=false )
+	fi
+
+	if use udev; then
+		emesonargs+=( $(meson_native_use_bool kmod) )
+	else
+		emesonargs+=( -Dkmod=false )
+	fi
+
+	if use elibc_musl; then
+		# Avoid redefinition of struct ethhdr.
+		append-cppflags -D__UAPI_DEF_ETHHDR=0
+	fi
+
+	if multilib_is_native_abi || use udev; then
+		meson_src_configure
+	fi
+}
+
+have_dmi() {
+	# see dmi_arches in meson.build
+	case ${CHOST} in
+		mips64*)
+			return 1 ;;
+		aarch64*|arm*|ia64*|i?86*|loongarch64*|mips*|x86_64*)
+			return 0 ;;
+	esac
+	return 1
+}
+
+multilib_src_compile() {
+	local targets=() optional_targets=()
+	if multilib_is_native_abi; then
+		if use boot; then
+			local efi_arch= efi_arch_alt=
+			case ${CHOST} in
+				aarch64*)     efi_arch=aa64 ;;
+				arm*)         efi_arch=arm ;;
+				loongarch32*) efi_arch=loongarch32 ;;
+				loongarch64*) efi_arch=loongarch64 ;;
+				riscv32*)     efi_arch=riscv32 ;;
+				riscv64*)     efi_arch=riscv64 ;;
+				x86_64*)      efi_arch=x64 efi_arch_alt=ia32;;
+				i?86*)        efi_arch=ia32 ;;
+			esac
+			targets+=(
+				bootctl
+				man/bootctl.1
+				src/boot/efi/systemd-boot${efi_arch}.efi
+				src/boot/efi/linux${efi_arch}.efi.stub
+				src/boot/efi/addon${efi_arch}.efi.stub
+			)
+			if [[ -n ${efi_arch_alt} ]]; then
+				# If we have a multilib toolchain, meson.build will build the
+				# "alt" arch (ia32). There's no easy way to detect this, so try
+				# to build it and ignore failure.
+				optional_targets+=(
+					src/boot/efi/systemd-boot${efi_arch_alt}.efi
+					src/boot/efi/linux${efi_arch_alt}.efi.stub
+					src/boot/efi/addon${efi_arch_alt}.efi.stub
+				)
+			fi
+
+		fi
+		if use kernel-install; then
+			targets+=(
+				kernel-install
+				src/kernel-install/90-loaderentry.install
+				man/kernel-install.8
+			)
+		fi
+		if use sysusers; then
+			targets+=(
+				systemd-sysusers
+				man/sysusers.d.5
+				man/systemd-sysusers.8
+			)
+			if use test; then
+				targets+=(
+					systemd-runtest.env
+				)
+			fi
+		fi
+		if use tmpfiles; then
+			targets+=(
+				systemd-tmpfiles
+				man/tmpfiles.d.5
+				man/systemd-tmpfiles.8
+				tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+			)
+			if use test; then
+				targets+=(
+					test-offline-passwd
+					test-tmpfile-util
+				)
+			fi
+		fi
+		if use udev; then
+			targets+=(
+				udevadm
+				systemd-hwdb
+				ata_id
+				cdrom_id
+				fido_id
+				iocost
+				mtd_probe
+				scsi_id
+				v4l_id
+				src/udev/udev.pc
+				man/udev.conf.5
+				man/systemd.link.5
+				man/hwdb.7
+				man/udev.7
+				man/systemd-hwdb.8
+				man/systemd-udevd.service.8
+				man/udevadm.8
+				man/libudev.3
+				man/udev_device_get_syspath.3
+				man/udev_device_has_tag.3
+				man/udev_device_new_from_syspath.3
+				man/udev_enumerate_add_match_subsystem.3
+				man/udev_enumerate_new.3
+				man/udev_enumerate_scan_devices.3
+				man/udev_list_entry.3
+				man/udev_monitor_filter_update.3
+				man/udev_monitor_new_from_netlink.3
+				man/udev_monitor_receive_device.3
+				man/udev_new.3
+				hwdb.d/60-autosuspend-chromiumos.hwdb
+				rules.d/50-udev-default.rules
+				rules.d/60-persistent-storage.rules
+				rules.d/64-btrfs.rules
+				# Needed for tests
+				rules.d/99-systemd.rules
+			)
+			if have_dmi; then
+				targets+=( dmi_memory_id )
+			fi
+			if use test; then
+				targets+=(
+					test-fido-id-desc
+					test-link-config-tables
+					test-udev-builtin
+					test-udev-device-thread
+					test-udev-format
+					test-udev-manager
+					test-udev-node
+					test-udev-rule-runner
+					test-udev-rules
+					test-udev-spawn
+					test-udev-util
+				)
+			fi
+		fi
+		if use ukify; then
+			targets+=(
+				ukify
+				src/kernel-install/60-ukify.install
+				man/ukify.1
+			)
+		fi
+	fi
+	if use udev; then
+		targets+=(
+			libudev
+			src/libudev/libudev.pc
+		)
+		if use test; then
+			targets+=(
+				test-libudev
+				test-libudev-sym
+				test-udev-device-thread
+			)
+		fi
+	fi
+	if [[ ${#targets[@]} -ne 0 ]]; then
+		meson_src_compile "${targets[@]}"
+	fi
+	if [[ ${#optional_targets[@]} -ne 0 ]]; then
+		ninja ${NINJAOPTS} "${optional_targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	local tests=()
+	if multilib_is_native_abi; then
+		if use boot; then
+			tests+=( --suite boot )
+		fi
+		if use kernel-install; then
+			tests+=( --suite kernel-install )
+		fi
+		if use sysusers; then
+			tests+=( --suite sysusers )
+		fi
+		if use tmpfiles; then
+			tests+=( --suite tmpfiles )
+		fi
+		if use udev; then
+			tests+=( --suite udev )
+		fi
+	fi
+	if use udev; then
+		tests+=( --suite libudev )
+	fi
+	if [[ ${#tests[@]} -ne 0 ]]; then
+		meson_src_test --no-rebuild "${tests[@]}"
+	fi
+}
+
+src_install() {
+	meson-multilib_src_install
+}
+
+set_rpath() {
+	patchelf --set-rpath "${EPREFIX}/usr/$(get_libdir)/systemd" "$@" || die "patchelf failed"
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		exeinto "/usr/$(get_libdir)/systemd"
+		doexe src/shared/libsystemd-shared-${PV%%.*}.so
+		if use boot; then
+			set_rpath bootctl
+			dobin bootctl
+			doman man/bootctl.1
+			meson_install --no-rebuild --tags systemd-boot
+		fi
+		if use kernel-install; then
+			set_rpath kernel-install
+			dobin kernel-install
+			doman man/kernel-install.8
+			exeinto /usr/lib/kernel/install.d
+			doexe src/kernel-install/*.install
+		fi
+		if use sysusers; then
+			set_rpath systemd-sysusers
+			dobin systemd-sysusers
+			doman man/{systemd-sysusers.8,sysusers.d.5}
+		fi
+		if use tmpfiles; then
+			set_rpath systemd-tmpfiles
+			dobin systemd-tmpfiles
+			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+			insinto /usr/lib/tmpfiles.d
+			doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+		fi
+		if use udev; then
+			set_rpath udevadm systemd-hwdb
+			dobin udevadm systemd-hwdb
+			dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd
+			if use split-usr; then
+				# elogind installs udev rules that hard-code /bin/udevadm
+				dosym ../usr/bin/udevadm /bin/udevadm
+			fi
+
+			exeinto /usr/lib/udev
+			set_rpath {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+			doexe {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+
+			if have_dmi; then
+				set_rpath dmi_memory_id
+				doexe dmi_memory_id
+			fi
+
+			rm -f rules.d/99-systemd.rules
+			insinto /usr/lib/udev/rules.d
+			doins rules.d/*.rules
+
+			insinto /usr/lib/udev/hwdb.d
+			doins hwdb.d/*.hwdb
+
+			insinto /usr/share/pkgconfig
+			doins src/udev/udev.pc
+
+			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+			newman man/systemd-udevd.service.8 systemd-udevd.8
+			doman man/libudev.3
+			doman man/udev_*.3
+		fi
+		if use ukify; then
+			dobin ukify
+			dosym ../../bin/ukify /usr/lib/systemd/ukify
+			doman man/ukify.1
+		fi
+	fi
+	if use udev; then
+		meson_install --no-rebuild --tags libudev
+		insinto "/usr/$(get_libdir)/pkgconfig"
+		doins src/libudev/libudev.pc
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use boot; then
+		dobashcomp shell-completion/bash/bootctl
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/{_bootctl,_kernel-install}
+	fi
+	if use kernel-install; then
+		exeinto /usr/lib/kernel/install.d
+		doexe src/kernel-install/*.install
+	fi
+	if use tmpfiles; then
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+		exeinto /etc/cron.daily
+		doexe "${FILESDIR}"/systemd-tmpfiles-clean
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_systemd-tmpfiles
+		insinto /usr/lib/tmpfiles.d
+		doins tmpfiles.d/x11.conf
+		doins "${FILESDIR}"/{legacy,tmp}.conf
+	fi
+	if use udev; then
+		doheader src/libudev/libudev.h
+
+		insinto /etc/udev
+		doins src/udev/udev.conf
+		keepdir /etc/udev/{hwdb.d,rules.d}
+
+		insinto /usr/lib/systemd/network
+		doins network/99-default.link
+
+		# Remove to avoid conflict with elogind
+		# https://bugs.gentoo.org/856433
+		rm rules.d/70-power-switch.rules || die
+		insinto /usr/lib/udev/rules.d
+		doins rules.d/*.rules
+		doins "${FILESDIR}"/40-gentoo.rules
+
+		insinto /usr/lib/udev/hwdb.d
+		doins hwdb.d/*.hwdb
+
+		dobashcomp shell-completion/bash/udevadm
+
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_udevadm
+	fi
+
+	use ukify && python_fix_shebang "${ED}"
+	use boot && secureboot_auto_sign
+}
+
+add_service() {
+	local initd=$1
+	local runlevel=$2
+
+	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+	eend $?
+}
+
+pkg_preinst() {
+	# Migrate /lib/{systemd,udev} to /usr/lib
+	if use split-usr; then
+		local d
+		for d in systemd udev; do
+			dosym ../usr/lib/${d} /lib/${d}
+			if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then
+				einfo "Copying files from '${EROOT}/lib/${d}' to '${EROOT}/usr/lib/${d}'"
+				cp -rpPT "${EROOT}/lib/${d}" "${EROOT}/usr/lib/${d}" || die
+				einfo "Removing '${EROOT}/lib/${d}'"
+				rm -r "${EROOT}/lib/${d}" || die
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		add_service systemd-tmpfiles-setup-dev sysinit
+		add_service systemd-tmpfiles-setup boot
+	fi
+	if use udev; then
+		ebegin "Updating hwdb"
+		systemd-hwdb --root="${ROOT}" update
+		eend $?
+		udev_reload
+	fi
+}
diff --git a/sys-apps/systemd-utils/systemd-utils-256.11.ebuild b/sys-apps/systemd-utils/systemd-utils-256.11.ebuild
new file mode 100644
index 000000000000..2585f8c62440
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-256.11.ebuild
@@ -0,0 +1,614 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils
+inherit python-single-r1 secureboot udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+MY_P="systemd-${PV}"
+MUSL_PATCHSET="systemd-musl-patches-256.8"
+SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz
+	elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+	|| ( kernel-install tmpfiles sysusers udev )
+	boot? ( kernel-install )
+	ukify? ( boot )
+	${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	elibc_musl? ( >=sys-libs/musl-1.2.3 )
+	selinux? ( sys-libs/libselinux:0= )
+	tmpfiles? (
+		acl? ( sys-apps/acl:0= )
+	)
+	udev? (
+		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+		virtual/libcrypt:=[${MULTILIB_USEDEP}]
+		acl? ( sys-apps/acl:0= )
+		kmod? ( >=sys-apps/kmod-15:0= )
+	)
+	!udev? (
+		>=sys-apps/util-linux-2.30:0=
+		sys-libs/libcap:0=
+		virtual/libcrypt:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+	boot? ( !<sys-boot/systemd-boot-250 )
+	ukify? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep "${PEFILE_DEPEND}")
+	)
+	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+	udev? (
+		acct-group/audio
+		acct-group/cdrom
+		acct-group/dialout
+		acct-group/disk
+		acct-group/floppy
+		acct-group/input
+		acct-group/kmem
+		acct-group/kvm
+		acct-group/lp
+		acct-group/render
+		acct-group/sgx
+		acct-group/tape
+		acct-group/tty
+		acct-group/usb
+		acct-group/video
+		!sys-apps/gentoo-systemd-integration
+		!<sys-fs/udev-250
+		!sys-fs/eudev
+	)
+	!sys-apps/systemd
+"
+PDEPEND="
+	udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	dev-util/patchelf
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_cond_dep "
+		dev-python/jinja2[\${PYTHON_USEDEP}]
+		dev-python/lxml[\${PYTHON_USEDEP}]
+		boot? (
+			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+			test? ( ${PEFILE_DEPEND} )
+		)
+	")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+	~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+		linux-info_pkg_setup
+	fi
+	use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+	local PATCHES=()
+
+	if use elibc_musl; then
+		PATCHES+=(
+			"${WORKDIR}/${MUSL_PATCHSET}"
+			"${FILESDIR}/musl-efi-wchar.patch"
+		)
+	fi
+	default
+}
+
+src_configure() {
+	python_setup
+	meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		# default is developer, bug 918671
+		-Dmode=release
+		-Dsysvinit-path=
+		$(meson_native_use_bool boot bootloader)
+		$(meson_native_use_bool kernel-install)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool sysusers)
+		$(meson_use test tests)
+		$(meson_native_use_bool tmpfiles)
+		$(meson_use udev hwdb)
+		$(meson_native_use_bool ukify)
+
+		# Disable all optional features
+		-Dadm-group=false
+		-Danalyze=false
+		-Dapparmor=false
+		-Daudit=false
+		-Dbacklight=false
+		-Dbinfmt=false
+		-Dbpf-framework=false
+		-Dbzip2=false
+		-Dcoredump=false
+		-Ddbus=false
+		-Delfutils=false
+		-Denvironment-d=false
+		-Dfdisk=false
+		-Dgcrypt=false
+		-Dglib=false
+		-Dgshadow=false
+		-Dgnutls=false
+		-Dhibernate=false
+		-Dhostnamed=false
+		-Didn=false
+		-Dima=false
+		-Dinitrd=false
+		-Dfirstboot=false
+		-Dldconfig=false
+		-Dlibcryptsetup=false
+		-Dlibcurl=false
+		-Dlibfido2=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dlocaled=false
+		-Dlogind=false
+		-Dlz4=false
+		-Dmachined=false
+		-Dmicrohttpd=false
+		-Dnetworkd=false
+		-Dnscd=false
+		-Dnss-myhostname=false
+		-Dnss-resolve=false
+		-Dnss-systemd=false
+		-Doomd=false
+		-Dopenssl=false
+		-Dp11kit=false
+		-Dpam=false
+		-Dpcre2=false
+		-Dpolkit=false
+		-Dportabled=false
+		-Dpstore=false
+		-Dpwquality=false
+		-Drandomseed=false
+		-Dresolve=false
+		-Drfkill=false
+		-Dseccomp=false
+		-Dsmack=false
+		-Dsysext=false
+		-Dtimedated=false
+		-Dtimesyncd=false
+		-Dtpm=false
+		-Dqrencode=false
+		-Dquotacheck=false
+		-Duserdb=false
+		-Dutmp=false
+		-Dvconsole=false
+		-Dwheel-group=false
+		-Dxdg-autostart=false
+		-Dxkbcommon=false
+		-Dxz=false
+		-Dzlib=false
+		-Dzstd=false
+	)
+
+	if use tmpfiles || use udev; then
+		emesonargs+=( $(meson_native_use_bool acl) )
+	else
+		emesonargs+=( -Dacl=false )
+	fi
+
+	if use udev; then
+		emesonargs+=( $(meson_native_use_bool kmod) )
+	else
+		emesonargs+=( -Dkmod=false )
+	fi
+
+	if use elibc_musl; then
+		# Avoid redefinition of struct ethhdr.
+		append-cppflags -D__UAPI_DEF_ETHHDR=0
+	fi
+
+	if multilib_is_native_abi || use udev; then
+		meson_src_configure
+	fi
+}
+
+have_dmi() {
+	# see dmi_arches in meson.build
+	case ${CHOST} in
+		mips64*)
+			return 1 ;;
+		aarch64*|arm*|ia64*|i?86*|loongarch64*|mips*|x86_64*)
+			return 0 ;;
+	esac
+	return 1
+}
+
+multilib_src_compile() {
+	local targets=() optional_targets=()
+	if multilib_is_native_abi; then
+		if use boot; then
+			local efi_arch= efi_arch_alt=
+			case ${CHOST} in
+				aarch64*)     efi_arch=aa64 ;;
+				arm*)         efi_arch=arm ;;
+				loongarch32*) efi_arch=loongarch32 ;;
+				loongarch64*) efi_arch=loongarch64 ;;
+				riscv32*)     efi_arch=riscv32 ;;
+				riscv64*)     efi_arch=riscv64 ;;
+				x86_64*)      efi_arch=x64 efi_arch_alt=ia32;;
+				i?86*)        efi_arch=ia32 ;;
+			esac
+			targets+=(
+				bootctl
+				man/bootctl.1
+				src/boot/efi/systemd-boot${efi_arch}.efi
+				src/boot/efi/linux${efi_arch}.efi.stub
+				src/boot/efi/addon${efi_arch}.efi.stub
+			)
+			if [[ -n ${efi_arch_alt} ]]; then
+				# If we have a multilib toolchain, meson.build will build the
+				# "alt" arch (ia32). There's no easy way to detect this, so try
+				# to build it and ignore failure.
+				optional_targets+=(
+					src/boot/efi/systemd-boot${efi_arch_alt}.efi
+					src/boot/efi/linux${efi_arch_alt}.efi.stub
+					src/boot/efi/addon${efi_arch_alt}.efi.stub
+				)
+			fi
+
+		fi
+		if use kernel-install; then
+			targets+=(
+				kernel-install
+				src/kernel-install/90-loaderentry.install
+				man/kernel-install.8
+			)
+		fi
+		if use sysusers; then
+			targets+=(
+				systemd-sysusers
+				man/sysusers.d.5
+				man/systemd-sysusers.8
+			)
+			if use test; then
+				targets+=(
+					systemd-runtest.env
+				)
+			fi
+		fi
+		if use tmpfiles; then
+			targets+=(
+				systemd-tmpfiles
+				man/tmpfiles.d.5
+				man/systemd-tmpfiles.8
+				tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+			)
+			if use test; then
+				targets+=(
+					test-offline-passwd
+					test-tmpfile-util
+				)
+			fi
+		fi
+		if use udev; then
+			targets+=(
+				udevadm
+				systemd-hwdb
+				ata_id
+				cdrom_id
+				fido_id
+				iocost
+				mtd_probe
+				scsi_id
+				v4l_id
+				src/udev/udev.pc
+				man/udev.conf.5
+				man/systemd.link.5
+				man/hwdb.7
+				man/udev.7
+				man/systemd-hwdb.8
+				man/systemd-udevd.service.8
+				man/udevadm.8
+				man/libudev.3
+				man/udev_device_get_syspath.3
+				man/udev_device_has_tag.3
+				man/udev_device_new_from_syspath.3
+				man/udev_enumerate_add_match_subsystem.3
+				man/udev_enumerate_new.3
+				man/udev_enumerate_scan_devices.3
+				man/udev_list_entry.3
+				man/udev_monitor_filter_update.3
+				man/udev_monitor_new_from_netlink.3
+				man/udev_monitor_receive_device.3
+				man/udev_new.3
+				hwdb.d/60-autosuspend-chromiumos.hwdb
+				rules.d/50-udev-default.rules
+				rules.d/60-persistent-storage.rules
+				rules.d/64-btrfs.rules
+				# Needed for tests
+				rules.d/99-systemd.rules
+			)
+			if have_dmi; then
+				targets+=( dmi_memory_id )
+			fi
+			if use test; then
+				targets+=(
+					test-fido-id-desc
+					test-link-config-tables
+					test-udev-builtin
+					test-udev-device-thread
+					test-udev-format
+					test-udev-manager
+					test-udev-node
+					test-udev-rule-runner
+					test-udev-rules
+					test-udev-spawn
+					test-udev-util
+				)
+			fi
+		fi
+		if use ukify; then
+			targets+=(
+				ukify
+				src/kernel-install/60-ukify.install
+				man/ukify.1
+			)
+		fi
+	fi
+	if use udev; then
+		targets+=(
+			libudev
+			src/libudev/libudev.pc
+		)
+		if use test; then
+			targets+=(
+				test-libudev
+				test-libudev-sym
+				test-udev-device-thread
+			)
+		fi
+	fi
+	if [[ ${#targets[@]} -ne 0 ]]; then
+		meson_src_compile "${targets[@]}"
+	fi
+	if [[ ${#optional_targets[@]} -ne 0 ]]; then
+		ninja ${NINJAOPTS} "${optional_targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	local tests=()
+	if multilib_is_native_abi; then
+		if use boot; then
+			tests+=( --suite boot )
+		fi
+		if use kernel-install; then
+			tests+=( --suite kernel-install )
+		fi
+		if use sysusers; then
+			tests+=( --suite sysusers )
+		fi
+		if use tmpfiles; then
+			tests+=( --suite tmpfiles )
+		fi
+		if use udev; then
+			tests+=( --suite udev )
+		fi
+	fi
+	if use udev; then
+		tests+=( --suite libudev )
+	fi
+	if [[ ${#tests[@]} -ne 0 ]]; then
+		meson_src_test --no-rebuild "${tests[@]}"
+	fi
+}
+
+src_install() {
+	meson-multilib_src_install
+}
+
+set_rpath() {
+	patchelf --set-rpath "${EPREFIX}/usr/$(get_libdir)/systemd" "$@" || die "patchelf failed"
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		exeinto "/usr/$(get_libdir)/systemd"
+		doexe src/shared/libsystemd-shared-${PV%%.*}.so
+		if use boot; then
+			set_rpath bootctl
+			dobin bootctl
+			doman man/bootctl.1
+			meson_install --no-rebuild --tags systemd-boot
+		fi
+		if use kernel-install; then
+			set_rpath kernel-install
+			dobin kernel-install
+			doman man/kernel-install.8
+			exeinto /usr/lib/kernel/install.d
+			doexe src/kernel-install/*.install
+		fi
+		if use sysusers; then
+			set_rpath systemd-sysusers
+			dobin systemd-sysusers
+			doman man/{systemd-sysusers.8,sysusers.d.5}
+		fi
+		if use tmpfiles; then
+			set_rpath systemd-tmpfiles
+			dobin systemd-tmpfiles
+			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+			insinto /usr/lib/tmpfiles.d
+			doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+		fi
+		if use udev; then
+			set_rpath udevadm systemd-hwdb
+			dobin udevadm systemd-hwdb
+			dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd
+			if use split-usr; then
+				# elogind installs udev rules that hard-code /bin/udevadm
+				dosym ../usr/bin/udevadm /bin/udevadm
+			fi
+
+			exeinto /usr/lib/udev
+			set_rpath {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+			doexe {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+
+			if have_dmi; then
+				set_rpath dmi_memory_id
+				doexe dmi_memory_id
+			fi
+
+			rm -f rules.d/99-systemd.rules
+			insinto /usr/lib/udev/rules.d
+			doins rules.d/*.rules
+
+			insinto /usr/lib/udev/hwdb.d
+			doins hwdb.d/*.hwdb
+
+			insinto /usr/share/pkgconfig
+			doins src/udev/udev.pc
+
+			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+			newman man/systemd-udevd.service.8 systemd-udevd.8
+			doman man/libudev.3
+			doman man/udev_*.3
+		fi
+		if use ukify; then
+			dobin ukify
+			dosym ../../bin/ukify /usr/lib/systemd/ukify
+			doman man/ukify.1
+		fi
+	fi
+	if use udev; then
+		meson_install --no-rebuild --tags libudev
+		insinto "/usr/$(get_libdir)/pkgconfig"
+		doins src/libudev/libudev.pc
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use boot; then
+		dobashcomp shell-completion/bash/bootctl
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/{_bootctl,_kernel-install}
+	fi
+	if use kernel-install; then
+		exeinto /usr/lib/kernel/install.d
+		doexe src/kernel-install/*.install
+	fi
+	if use tmpfiles; then
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+		exeinto /etc/cron.daily
+		doexe "${FILESDIR}"/systemd-tmpfiles-clean
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_systemd-tmpfiles
+		insinto /usr/lib/tmpfiles.d
+		doins tmpfiles.d/x11.conf
+		doins "${FILESDIR}"/{legacy,tmp}.conf
+	fi
+	if use udev; then
+		doheader src/libudev/libudev.h
+
+		insinto /etc/udev
+		doins src/udev/udev.conf
+		keepdir /etc/udev/{hwdb.d,rules.d}
+
+		insinto /usr/lib/systemd/network
+		doins network/99-default.link
+
+		# Remove to avoid conflict with elogind
+		# https://bugs.gentoo.org/856433
+		rm rules.d/70-power-switch.rules || die
+		insinto /usr/lib/udev/rules.d
+		doins rules.d/*.rules
+		doins "${FILESDIR}"/40-gentoo.rules
+
+		insinto /usr/lib/udev/hwdb.d
+		doins hwdb.d/*.hwdb
+
+		dobashcomp shell-completion/bash/udevadm
+
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_udevadm
+	fi
+
+	use ukify && python_fix_shebang "${ED}"
+	use boot && secureboot_auto_sign
+}
+
+add_service() {
+	local initd=$1
+	local runlevel=$2
+
+	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+	eend $?
+}
+
+pkg_preinst() {
+	# Migrate /lib/{systemd,udev} to /usr/lib
+	if use split-usr; then
+		local d
+		for d in systemd udev; do
+			dosym ../usr/lib/${d} /lib/${d}
+			if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then
+				einfo "Copying files from '${EROOT}/lib/${d}' to '${EROOT}/usr/lib/${d}'"
+				cp -rpPT "${EROOT}/lib/${d}" "${EROOT}/usr/lib/${d}" || die
+				einfo "Removing '${EROOT}/lib/${d}'"
+				rm -r "${EROOT}/lib/${d}" || die
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		add_service systemd-tmpfiles-setup-dev sysinit
+		add_service systemd-tmpfiles-setup boot
+	fi
+	if use udev; then
+		ebegin "Updating hwdb"
+		systemd-hwdb --root="${ROOT}" update
+		eend $?
+		udev_reload
+	fi
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 49941c06bf23..2c7d86d54037 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,10 +1,14 @@
 DIST systemd-256.10.tar.gz 15776970 BLAKE2B 84bdf681e3255c0f8071d8309abe1d12458fddd366b7aad0edea1bcf8074b48e3b594614f087407ab30c1dcd1cd69952f1c41b602927787fab5e5333bfe9f44b SHA512 4ae25a40a473984c4caefd63e69af12c8965184c1c55539086b04050a457bb0175f15adf87b3a86b476357ccb402abc72844033e40e2dc4f9abb6cc3bb65e22c
+DIST systemd-256.11.tar.gz 15777170 BLAKE2B 838a25f04c64fc1513575b01d52a9eef30628fd589a3110818395981c7bff1b820bd141c1f2dcf159a75fb8efab4560056e399f15fe7e029183019c1a0d605f8 SHA512 e0045963f0614dc3019f23d55e792ae1e5837cc1622f0ab73524ef65521f9ebf12ae57b7215712d84f555f506683ef3bc0429dc90a3bfd5f904b50cc016b9baa
 DIST systemd-256.7.tar.gz 15672532 BLAKE2B d718b7bcbf9c3583953a9fa82319f04b32d17c5b7539a49b9999881bd8cea7fd9a06f252d763170613a6cd0fd2535762b233cba74eb87764f662c4bdf2d8c1da SHA512 2ff3805a7d97780a716b23ddeea3722a85aba6326ecee527e53e9d35510a0ffa5ec0bf0cdbf8f3409bb9c6832406916f63eb7e8305db5f67c284e5590c642422
 DIST systemd-256.9.tar.gz 15774953 BLAKE2B caeff33d0906583094a44ab89fe9a9c1832a665f8cc768f86c55c5100bdd5c2b1500b2cd65e9519ef21d79bff92d1da3e84240793099a0e0c508afba3669c46e SHA512 aba7a0f7149fe3d28d9f930f244d5b997c28721e93e6f0768b0f0f1c918c87a0e8b7b347cffb2faa4740ca3ee3b04984454e85757365090a2cf32aba09f70681
 DIST systemd-257.1.tar.gz 16187414 BLAKE2B c6935a2f412a1751e423016c16e9f06137047ac29645566505c314341470e492293e65e1f81bfa9136eda34c9c20ab02d7a77c5799be257292eeaf0035cfba3f SHA512 dded7555077f85d0f8106b72cc46604fbe4249452be6b2d55800770b6deb2a3a122697c5a5f23b22dab416e8c050e53fc30d59dfd3bfd7c9fbbdab3162e8ebe5
+DIST systemd-257.2.tar.gz 16189809 BLAKE2B ade7ad383e572554286595ae78a9e07bd67196093d912f141a581392689c2d1a106beeab698677ef0653f1c7a8b6151dbb7b2aa7a704524414df0c88f0e75251 SHA512 4f47fcd9a4148101ee7b85cf5908a04ec9e025dc7a5a2e8e61c05439cfd427851b6d356bb96a0dfae55566bbf6d3c93a13251d220840c09296e94f80bd4a5945
 DIST systemd-stable-254.17.tar.gz 14566862 BLAKE2B fca04c8db285cf22551f7c980da52a8aa3ef3eb78d6005b38cdece4b53ac43a69aa401f8498ee00fcab037dbb22c996b8c626db32c6e4be481f41f752e7a848b SHA512 11ae971e5463fb511c32fbc1ce4012765c73cf87d68ca44c36b85a2ed12f73655b6d071975008c6dd56a27963d1dff5d3c22039fc813bff30be23e6f2dd425ae
 DIST systemd-stable-254.21.tar.gz 14664320 BLAKE2B 3814f3ed8561dc096aa66039d63591ee1462184a0ffe3e34417ec47b1bb411b506be586692898862ebd5ea24c16bdcedde9a702826ca558e95329d0a1264f377 SHA512 96e49fb86284642157be173db763f888a1c34c078f12fee987a5c68e91611a75b6c52e67162dd8390f57f6d10798530a38b4940b1f03f10f97123c2cc242897b
 DIST systemd-stable-254.22.tar.gz 14667273 BLAKE2B d3bfbd34ef47b73e139c37dd3e961fdc17c969e38674d84976183ecad44030fce1db073da6faf522e9ab232ae65c8e70a8d9a1f15053c57269090d3a9f1756f7 SHA512 5cef3912e68060366d7a8030c13825ae872783dd55a8a3ab15aa5ff2c397b50df8fc6e08b9bd1fdc0d54f08f3f7765484a41af0646ded238512921e3d02b553d
+DIST systemd-stable-254.23.tar.gz 14666469 BLAKE2B db685bfd40ed45dd29260085330c8cbe3545d229b50e881e7debb994ab3cc24024cf3e9c9a1c0931013e78701c101fd79e828d8ea3f8dcc19ce46867c0ed1a43 SHA512 e5a02d8e151f48b5fa9c9532d4f0caae56f368e83ed8f33cd4e2172af9209c357269385f99f3177fc92ebf356691f22751e27a6d6356ebaea8d5ad649ecf15e5
 DIST systemd-stable-255.11.tar.gz 15107037 BLAKE2B 7839323367d47dc57914fb501c7be38206f3bc882e560c4df25c65d421e5756108711b0ce57df6ad444d5eabb256d6730366e21d283cb02e1ef014b670855669 SHA512 be06010b56f4ea0651ebe921cd2a68f1794a64367fedea6752f7ba71ac5e00c5f0167d52ba5b662fd9781f5aa3f372e174b65f99a9bac66d4bf6af92caa67ba7
 DIST systemd-stable-255.15.tar.gz 15207869 BLAKE2B 5bd314f008782d5d6148bf6a0ab437be23e71ca4dab1fc0aff61e6cc17e9b43da7fbae5a1bfa7d829ba0d8dcb28b43a1a2fbd4fcd0d79fd4154336f98fb25a25 SHA512 39e4d03da90bcceb30517098b012cea991067cdd88cf577a23243c28341424e38a5dbb8f92e51b32f8f651e880ae6ca48490f7de8d0dc3525e6629250f546000
 DIST systemd-stable-255.16.tar.gz 15206112 BLAKE2B a5bc9d73b2ae8e1ebe485ab305bd20161500157b366f8678fccdac56f1844614bd14c849493154dcff40f0283467c910dbe7bf0ca501b40a2be1577c269e7544 SHA512 e2c108af8f895bcdeb47b133b2c26db640d5b5b2bcd1ba548faf8c579fa09b1d88f9e89b3b994a4a396a9f0df56d1a0f5833e71c0c66501d418ae4ea78f37889
+DIST systemd-stable-255.17.tar.gz 15206361 BLAKE2B 71b7eb7c90898ee080b258fa6b500b84c588d52bacfd0b3c301b8fd157bc6c6c3ddde11bb3f94a5f162038c527779872586622da1e0cafb9f8685c541ab6a7a6 SHA512 441f27764af708bb1165e671eee8fa5686adbb32f1a4761fef2d89b882d879534d2e74f7e04028ab06457aaa5173fdbcb099aaa20bb0d23b36ed59e8c7ad1887
diff --git a/sys-apps/systemd/systemd-254.17.ebuild b/sys-apps/systemd/systemd-254.17.ebuild
index 27288f01db4d..5bbb9673648a 100644
--- a/sys-apps/systemd/systemd-254.17.ebuild
+++ b/sys-apps/systemd/systemd-254.17.ebuild
@@ -141,6 +141,7 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!sysv-utils? ( sys-apps/sysvinit )
 	resolvconf? ( !net-dns/openresolv )
+	!sys-apps/hwids[udev]
 	!sys-auth/nss-myhostname
 	!sys-fs/eudev
 	!sys-fs/udev
diff --git a/sys-apps/systemd/systemd-254.21.ebuild b/sys-apps/systemd/systemd-254.21.ebuild
index d32eb9cf9067..68cb53d8ae34 100644
--- a/sys-apps/systemd/systemd-254.21.ebuild
+++ b/sys-apps/systemd/systemd-254.21.ebuild
@@ -141,6 +141,7 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!sysv-utils? ( sys-apps/sysvinit )
 	resolvconf? ( !net-dns/openresolv )
+	!sys-apps/hwids[udev]
 	!sys-auth/nss-myhostname
 	!sys-fs/eudev
 	!sys-fs/udev
diff --git a/sys-apps/systemd/systemd-254.22.ebuild b/sys-apps/systemd/systemd-254.22.ebuild
index 3396124deb14..d0fdbfa6de31 100644
--- a/sys-apps/systemd/systemd-254.22.ebuild
+++ b/sys-apps/systemd/systemd-254.22.ebuild
@@ -23,7 +23,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 inherit bash-completion-r1 linux-info meson-multilib optfeature pam python-single-r1
diff --git a/sys-apps/systemd/systemd-254.23.ebuild b/sys-apps/systemd/systemd-254.23.ebuild
new file mode 100644
index 000000000000..ac3b58a047e9
--- /dev/null
+++ b/sys-apps/systemd/systemd-254.23.ebuild
@@ -0,0 +1,540 @@
+# Copyright 2011-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+inherit bash-completion-r1 linux-info meson-multilib optfeature pam python-single-r1
+inherit secureboot systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://systemd.io/"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit boot cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	fido2 +gcrypt gnutls homed http idn importd iptables +kernel-install +kmod
+	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm ukify vanilla xkb +zstd
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	dns-over-tls? ( || ( gnutls openssl ) )
+	fido2? ( cryptsetup openssl )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
+	pwquality? ( homed )
+	boot? ( kernel-install )
+	ukify? ( boot )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="4.15"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	iptables? ( net-firewall/iptables:0= )
+	openssl? ( >=dev-libs/openssl-1.1.0:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	ukify? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep "${PEFILE_DEPEND}")
+	)
+	selinux? (
+		sec-policy/selinux-base-policy[systemd]
+		sec-policy/selinux-ntp
+	)
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/openrc-navi[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-build/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep "
+		dev-python/jinja2[\${PYTHON_USEDEP}]
+		dev-python/lxml[\${PYTHON_USEDEP}]
+		boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+		ukify? ( test? ( ${PEFILE_DEPEND} ) )
+	")
+"
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~BLK_DEV_BSG ~CGROUPS
+			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+
+		if kernel_is -ge 5 10 20; then
+			CONFIG_CHECK+=" ~KCMP"
+		else
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		fi
+
+		if kernel_is -ge 4 18; then
+			CONFIG_CHECK+=" ~AUTOFS_FS"
+		else
+			CONFIG_CHECK+=" ~AUTOFS4_FS"
+		fi
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	use boot && secureboot_pkg_setup
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/systemd-test-process-util.patch"
+		"${FILESDIR}/systemd-253-initrd-generators.patch"
+		"${FILESDIR}/254-PrivateDevices-userdbd.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-journald-audit-r1.patch"
+		)
+	fi
+
+	# Fails with split-usr.
+	sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		$(meson_use split-usr)
+		$(meson_use split-usr split-bin)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Disable compatibility with sysvinit
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool boot bootloader)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_native_use_bool fido2 libfido2)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnutls)
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kernel-install)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use test tests)
+		$(meson_use zstd)
+		$(meson_native_use_bool iptables libiptc)
+		$(meson_native_use_bool openssl)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool ukify)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	local -x COLUMNS=80
+	meson_src_test --timeout-multiplier=10
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+	local sbin=$(usex split-usr sbin bin)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	insinto /usr/lib/tmpfiles.d
+	doins "${FILESDIR}"/legacy.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,shutdown} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	keepdir /etc/udev/hwdb.d
+
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	if use pam; then
+		if use selinux; then
+			newpamd "${FILESDIR}"/systemd-user-selinux.pam systemd-user
+		else
+			newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+		fi
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	gen_usr_ldscript -a systemd udev
+
+	if use kernel-install; then
+		# Dummy config, remove to make room for sys-kernel/installkernel
+		rm "${ED}/usr/lib/kernel/install.conf" || die
+	fi
+
+	use ukify && python_fix_shebang "${ED}"
+	use boot && secureboot_auto_sign
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/sysctl.conf ]]; then
+		# Symlink /etc/sysctl.conf for easy migration.
+		dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+	fi
+
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib usr/sbin; do
+			if [[ ! -L ${EROOT}/${dir} ]]; then
+				eerror "'${EROOT}/${dir}' is not a symbolic link."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "installing ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+	if ! use boot && has_version "sys-apps/systemd[gnuefi(-)]"; then
+		ewarn "The 'gnuefi' USE flag has been renamed to 'boot'."
+		ewarn "Make sure to enable the 'boot' USE flag if you use systemd-boot."
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	systemd-hwdb --root="${ROOT}" update
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+
+	if use boot; then
+		optfeature "installing kernels in systemd-boot's native layout and update loader entries" \
+			"sys-kernel/installkernel[systemd-boot]"
+	fi
+	if use ukify; then
+		optfeature "generating unified kernel image on each kernel installation" \
+			"sys-kernel/installkernel[ukify]"
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-255.11.ebuild b/sys-apps/systemd/systemd-255.11.ebuild
index c7be7d18dd46..068165c7f0ba 100644
--- a/sys-apps/systemd/systemd-255.11.ebuild
+++ b/sys-apps/systemd/systemd-255.11.ebuild
@@ -144,6 +144,7 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!sysv-utils? ( sys-apps/sysvinit )
 	resolvconf? ( !net-dns/openresolv )
+	!sys-apps/hwids[udev]
 	!sys-auth/nss-myhostname
 	!sys-fs/eudev
 	!sys-fs/udev
diff --git a/sys-apps/systemd/systemd-255.15.ebuild b/sys-apps/systemd/systemd-255.15.ebuild
index 9f2c1c44f05d..f45be4631e27 100644
--- a/sys-apps/systemd/systemd-255.15.ebuild
+++ b/sys-apps/systemd/systemd-255.15.ebuild
@@ -144,6 +144,7 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!sysv-utils? ( sys-apps/sysvinit )
 	resolvconf? ( !net-dns/openresolv )
+	!sys-apps/hwids[udev]
 	!sys-auth/nss-myhostname
 	!sys-fs/eudev
 	!sys-fs/udev
diff --git a/sys-apps/systemd/systemd-255.16.ebuild b/sys-apps/systemd/systemd-255.16.ebuild
index 495d14c60483..ba3ffac94631 100644
--- a/sys-apps/systemd/systemd-255.16.ebuild
+++ b/sys-apps/systemd/systemd-255.16.ebuild
@@ -25,7 +25,7 @@ else
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	fi
 fi
 
@@ -144,6 +144,7 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!sysv-utils? ( sys-apps/sysvinit )
 	resolvconf? ( !net-dns/openresolv )
+	!sys-apps/hwids[udev]
 	!sys-auth/nss-myhostname
 	!sys-fs/eudev
 	!sys-fs/udev
diff --git a/sys-apps/systemd/systemd-255.17.ebuild b/sys-apps/systemd/systemd-255.17.ebuild
new file mode 100644
index 000000000000..edff1a46d4f8
--- /dev/null
+++ b/sys-apps/systemd/systemd-255.17.ebuild
@@ -0,0 +1,540 @@
+# Copyright 2011-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+fi
+
+inherit bash-completion-r1 linux-info meson-multilib optfeature pam python-single-r1
+inherit secureboot systemd toolchain-funcs udev
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://systemd.io/"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit boot cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	fido2 +gcrypt gnutls homed http idn importd iptables +kernel-install +kmod
+	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm ukify vanilla xkb +zstd
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	dns-over-tls? ( || ( gnutls openssl ) )
+	fido2? ( cryptsetup openssl )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
+	pwquality? ( homed )
+	boot? ( kernel-install )
+	ukify? ( boot )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="4.15"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.32:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( >=sys-libs/libapparmor-2.13:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( >=net-misc/curl-7.32.0:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	iptables? ( net-firewall/iptables:0= )
+	openssl? ( >=dev-libs/openssl-1.1.0:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.3:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( >=dev-libs/libpwquality-1.4.1:0= )
+	qrcode? ( >=media-gfx/qrencode-3:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( >=sys-libs/libselinux-2.1.9:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	ukify? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep "${PEFILE_DEPEND}")
+	)
+	selinux? (
+		sec-policy/selinux-base-policy[systemd]
+		sec-policy/selinux-ntp
+	)
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/openrc-navi[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-build/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep "
+		dev-python/jinja2[\${PYTHON_USEDEP}]
+		dev-python/lxml[\${PYTHON_USEDEP}]
+		boot? (
+			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+			test? ( ${PEFILE_DEPEND} )
+		)
+	")
+"
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+	if use split-usr; then
+		eerror "Please complete the migration to merged-usr."
+		eerror "https://wiki.gentoo.org/wiki/Merge-usr"
+		die "systemd no longer supports split-usr"
+	fi
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~BLK_DEV_BSG ~CGROUPS
+			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+
+		if kernel_is -ge 5 10 20; then
+			CONFIG_CHECK+=" ~KCMP"
+		else
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		fi
+
+		if kernel_is -ge 4 18; then
+			CONFIG_CHECK+=" ~AUTOFS_FS"
+		else
+			CONFIG_CHECK+=" ~AUTOFS4_FS"
+		fi
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	use boot && secureboot_pkg_setup
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/systemd-test-process-util.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-journald-audit-r1.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		# default is developer, bug 918671
+		-Dmode=release
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		-Dsplit-bin=false
+		# Disable compatibility with sysvinit
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Match /etc/shells, bug 919749
+		-Ddebug-shell="${EPREFIX}/bin/sh"
+		-Ddefault-user-shell="${EPREFIX}/bin/bash"
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool boot bootloader)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_native_use_bool fido2 libfido2)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnutls)
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kernel-install)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use test tests)
+		$(meson_use zstd)
+		$(meson_native_use_bool iptables libiptc)
+		$(meson_native_use_bool openssl)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool ukify)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+		$(meson_native_enabled vmspawn)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	(
+		unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+		export COLUMNS=80
+		addpredict /dev
+		addpredict /proc
+		addpredict /run
+		addpredict /sys/fs/cgroup
+		meson_src_test --timeout-multiplier=10
+	) || die
+}
+
+multilib_src_install_all() {
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	insinto /usr/lib/tmpfiles.d
+	doins "${FILESDIR}"/legacy.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}"/usr/bin/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED}"/usr/bin/{halt,init,poweroff,reboot,shutdown} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	keepdir /etc/udev/hwdb.d
+
+	keepdir /usr/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	if use pam; then
+		if use selinux; then
+			newpamd "${FILESDIR}"/systemd-user-selinux.pam systemd-user
+		else
+			newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+		fi
+	fi
+
+	if use kernel-install; then
+		# Dummy config, remove to make room for sys-kernel/installkernel
+		rm "${ED}/usr/lib/kernel/install.conf" || die
+	fi
+
+	use ukify && python_fix_shebang "${ED}"
+	use boot && secureboot_auto_sign
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/sysctl.conf ]]; then
+		# Symlink /etc/sysctl.conf for easy migration.
+		dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+	fi
+
+	if ! use boot && has_version "sys-apps/systemd[gnuefi(-)]"; then
+		ewarn "The 'gnuefi' USE flag has been renamed to 'boot'."
+		ewarn "Make sure to enable the 'boot' USE flag if you use systemd-boot."
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	systemd-hwdb --root="${ROOT}" update
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager (systemd)"
+		systemctl daemon-reexec
+		eend $? || FAIL=1
+
+		# https://lists.freedesktop.org/archives/systemd-devel/2024-June/050466.html
+		ebegin "Signaling user managers to reexec"
+		systemctl kill --kill-whom='main' --signal='SIGRTMIN+25' 'user@*.service'
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+
+	if use boot; then
+		optfeature "installing kernels in systemd-boot's native layout and update loader entries" \
+			"sys-kernel/installkernel[systemd-boot]"
+	fi
+	if use ukify; then
+		optfeature "generating unified kernel image on each kernel installation" \
+			"sys-kernel/installkernel[ukify]"
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-256.10.ebuild b/sys-apps/systemd/systemd-256.10.ebuild
index 323be45e828c..b1d910074fda 100644
--- a/sys-apps/systemd/systemd-256.10.ebuild
+++ b/sys-apps/systemd/systemd-256.10.ebuild
@@ -140,6 +140,7 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!sysv-utils? ( sys-apps/sysvinit )
 	resolvconf? ( !net-dns/openresolv )
+	!sys-apps/hwids[udev]
 	!sys-auth/nss-myhostname
 	!sys-fs/eudev
 	!sys-fs/udev
diff --git a/sys-apps/systemd/systemd-256.11.ebuild b/sys-apps/systemd/systemd-256.11.ebuild
new file mode 100644
index 000000000000..53273463cc5d
--- /dev/null
+++ b/sys-apps/systemd/systemd-256.11.ebuild
@@ -0,0 +1,573 @@
+# Copyright 2011-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+fi
+
+inherit bash-completion-r1 linux-info meson-multilib optfeature pam python-single-r1
+inherit secureboot systemd toolchain-funcs udev
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://systemd.io/"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit boot bpf cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	fido2 +gcrypt gnutls homed http idn importd iptables +kernel-install +kmod
+	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm ukify vanilla xkb +zstd
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	dns-over-tls? ( || ( gnutls openssl ) )
+	fido2? ( cryptsetup openssl )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
+	pwquality? ( homed )
+	boot? ( kernel-install )
+	ukify? ( boot )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="4.15"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.32:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( >=sys-libs/libapparmor-2.13:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	bpf? ( >=dev-libs/libbpf-1.4.0:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( >=net-misc/curl-7.32.0:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	iptables? ( net-firewall/iptables:0= )
+	openssl? ( >=dev-libs/openssl-1.1.0:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.3:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( >=dev-libs/libpwquality-1.4.1:0= )
+	qrcode? ( >=media-gfx/qrencode-3:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( >=sys-libs/libselinux-2.1.9:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	ukify? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep "${PEFILE_DEPEND}")
+	)
+	selinux? (
+		sec-policy/selinux-base-policy[systemd]
+		sec-policy/selinux-ntp
+	)
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/openrc-navi[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-build/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	bpf? (
+		dev-util/bpftool
+		sys-devel/bpf-toolchain
+	)
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep "
+		dev-python/jinja2[\${PYTHON_USEDEP}]
+		dev-python/lxml[\${PYTHON_USEDEP}]
+		boot? (
+			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+			test? ( ${PEFILE_DEPEND} )
+		)
+	")
+"
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+check_cgroup_layout() {
+	# https://bugs.gentoo.org/935261
+	[[ ${MERGE_TYPE} != buildonly ]] || return
+	[[ -z ${ROOT} ]] || return
+	[[ -e /sys/fs/cgroup/unified ]] || return
+	grep -q 'SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1' /proc/cmdline && return
+
+	eerror "This system appears to be booted with the 'hybrid' cgroup layout."
+	eerror "This layout obsolete and is disabled in systemd."
+
+	if grep -qF 'systemd.unified_cgroup_hierarchy'; then
+		eerror "Remove the systemd.unified_cgroup_hierarchy option"
+		eerror "from the kernel command line and reboot."
+		die "hybrid cgroup layout detected"
+	fi
+}
+
+pkg_pretend() {
+	if use split-usr; then
+		eerror "Please complete the migration to merged-usr."
+		eerror "https://wiki.gentoo.org/wiki/Merge-usr"
+		die "systemd no longer supports split-usr"
+	fi
+
+	check_cgroup_layout
+
+	if use cgroup-hybrid; then
+		eerror "Disable the 'cgroup-hybrid' USE flag."
+		eerror "Rebuild any initramfs images after rebuilding systemd."
+		die "cgroup-hybrid is no longer supported"
+	fi
+
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~BLK_DEV_BSG ~CGROUPS
+			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use bpf && CONFIG_CHECK+=" ~BPF ~BPF_SYSCALL ~BPF_LSM ~DEBUG_INFO_BTF"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+
+		if kernel_is -ge 5 10 20; then
+			CONFIG_CHECK+=" ~KCMP"
+		else
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		fi
+
+		if kernel_is -ge 4 18; then
+			CONFIG_CHECK+=" ~AUTOFS_FS"
+		else
+			CONFIG_CHECK+=" ~AUTOFS4_FS"
+		fi
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	use boot && secureboot_pkg_setup
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/systemd-test-process-util.patch"
+		"${FILESDIR}/256-bpf-gcc.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-journald-audit-r1.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		# default is developer, bug 918671
+		-Dmode=release
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		-Dsplit-bin=false
+		# Disable compatibility with sysvinit
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# no deps
+		-Dima=true
+		# Match /etc/shells, bug 919749
+		-Ddebug-shell="${EPREFIX}/bin/sh"
+		-Ddefault-user-shell="${EPREFIX}/bin/bash"
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool boot bootloader)
+		$(meson_native_use_bool bpf bpf-framework)
+		-Dbpf-compiler=gcc
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_native_use_bool fido2 libfido2)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnutls)
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kernel-install)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use test tests)
+		$(meson_use zstd)
+		$(meson_native_use_bool iptables libiptc)
+		$(meson_native_use_bool openssl)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool ukify)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+	)
+
+	case $(tc-arch) in
+		amd64|arm|arm64|ppc|ppc64|s390|x86)
+			# src/vmspawn/vmspawn-util.h: QEMU_MACHINE_TYPE
+			myconf+=( $(meson_native_enabled vmspawn) ) ;;
+		*)
+			myconf+=( -Dvmspawn=disabled ) ;;
+	esac
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	(
+		unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+		export COLUMNS=80
+		addpredict /dev
+		addpredict /proc
+		addpredict /run
+		addpredict /sys/fs/cgroup
+		meson_src_test --timeout-multiplier=10
+	) || die
+}
+
+multilib_src_install_all() {
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	insinto /usr/lib/tmpfiles.d
+	doins "${FILESDIR}"/legacy.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}"/usr/bin/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED}"/usr/bin/{halt,init,poweroff,reboot,shutdown} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	keepdir /etc/udev/hwdb.d
+
+	keepdir /usr/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	if use pam; then
+		if use selinux; then
+			newpamd "${FILESDIR}"/systemd-user-selinux.pam systemd-user
+		else
+			newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+		fi
+	fi
+
+	if use kernel-install; then
+		# Dummy config, remove to make room for sys-kernel/installkernel
+		rm "${ED}/usr/lib/kernel/install.conf" || die
+	fi
+
+	use ukify && python_fix_shebang "${ED}"
+	use boot && secureboot_auto_sign
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/sysctl.conf ]]; then
+		# Symlink /etc/sysctl.conf for easy migration.
+		dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+	fi
+
+	if ! use boot && has_version "sys-apps/systemd[gnuefi(-)]"; then
+		ewarn "The 'gnuefi' USE flag has been renamed to 'boot'."
+		ewarn "Make sure to enable the 'boot' USE flag if you use systemd-boot."
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	systemd-hwdb --root="${ROOT}" update
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager (systemd)"
+		systemctl daemon-reexec
+		eend $? || FAIL=1
+
+		# https://lists.freedesktop.org/archives/systemd-devel/2024-June/050466.html
+		ebegin "Signaling user managers to reexec"
+		systemctl kill --kill-whom='main' --signal='SIGRTMIN+25' 'user@*.service'
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+
+	if use boot; then
+		optfeature "installing kernels in systemd-boot's native layout and update loader entries" \
+			"sys-kernel/installkernel[systemd-boot]"
+	fi
+	if use ukify; then
+		optfeature "generating unified kernel image on each kernel installation" \
+			"sys-kernel/installkernel[ukify]"
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-256.7.ebuild b/sys-apps/systemd/systemd-256.7.ebuild
index c0c7ddd5805d..b3d42543a971 100644
--- a/sys-apps/systemd/systemd-256.7.ebuild
+++ b/sys-apps/systemd/systemd-256.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2024 Gentoo Authors
+# Copyright 2011-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ else
 	SRC_URI="https://github.com/systemd/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	fi
 fi
 
diff --git a/sys-apps/systemd/systemd-257.2.ebuild b/sys-apps/systemd/systemd-257.2.ebuild
new file mode 100644
index 000000000000..9aaf85cb67d4
--- /dev/null
+++ b/sys-apps/systemd/systemd-257.2.ebuild
@@ -0,0 +1,571 @@
+# Copyright 2011-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+fi
+
+inherit bash-completion-r1 linux-info meson-multilib optfeature pam python-single-r1
+inherit secureboot systemd toolchain-funcs udev
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://systemd.io/"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit boot bpf cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	fido2 +gcrypt gnutls homed http idn importd iptables +kernel-install +kmod
+	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm ukify vanilla xkb +zstd
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	dns-over-tls? ( || ( gnutls openssl ) )
+	fido2? ( cryptsetup openssl )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
+	pwquality? ( homed )
+	boot? ( kernel-install )
+	ukify? ( boot )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="4.15"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.32:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( >=sys-libs/libapparmor-2.13:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	bpf? ( >=dev-libs/libbpf-1.4.0:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( >=net-misc/curl-7.32.0:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	iptables? ( net-firewall/iptables:0= )
+	openssl? ( >=dev-libs/openssl-1.1.0:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.3:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( >=dev-libs/libpwquality-1.4.1:0= )
+	qrcode? ( >=media-gfx/qrencode-3:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( >=sys-libs/libselinux-2.1.9:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	ukify? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep "${PEFILE_DEPEND}")
+	)
+	selinux? (
+		sec-policy/selinux-base-policy[systemd]
+		sec-policy/selinux-ntp
+	)
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/openrc-navi[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-build/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	bpf? (
+		dev-util/bpftool
+		sys-devel/bpf-toolchain
+	)
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep "
+		dev-python/jinja2[\${PYTHON_USEDEP}]
+		dev-python/lxml[\${PYTHON_USEDEP}]
+		boot? (
+			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+			test? ( ${PEFILE_DEPEND} )
+		)
+	")
+"
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+check_cgroup_layout() {
+	# https://bugs.gentoo.org/935261
+	[[ ${MERGE_TYPE} != buildonly ]] || return
+	[[ -z ${ROOT} ]] || return
+	[[ -e /sys/fs/cgroup/unified ]] || return
+	grep -q 'SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1' /proc/cmdline && return
+
+	eerror "This system appears to be booted with the 'hybrid' cgroup layout."
+	eerror "This layout obsolete and is disabled in systemd."
+
+	if grep -qF 'systemd.unified_cgroup_hierarchy'; then
+		eerror "Remove the systemd.unified_cgroup_hierarchy option"
+		eerror "from the kernel command line and reboot."
+		die "hybrid cgroup layout detected"
+	fi
+}
+
+pkg_pretend() {
+	if use split-usr; then
+		eerror "Please complete the migration to merged-usr."
+		eerror "https://wiki.gentoo.org/wiki/Merge-usr"
+		die "systemd no longer supports split-usr"
+	fi
+
+	check_cgroup_layout
+
+	if use cgroup-hybrid; then
+		eerror "Disable the 'cgroup-hybrid' USE flag."
+		eerror "Rebuild any initramfs images after rebuilding systemd."
+		die "cgroup-hybrid is no longer supported"
+	fi
+
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~BLK_DEV_BSG ~CGROUPS
+			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use bpf && CONFIG_CHECK+=" ~BPF ~BPF_SYSCALL ~BPF_LSM ~DEBUG_INFO_BTF"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+
+		if kernel_is -ge 5 10 20; then
+			CONFIG_CHECK+=" ~KCMP"
+		else
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		fi
+
+		if kernel_is -ge 4 18; then
+			CONFIG_CHECK+=" ~AUTOFS_FS"
+		else
+			CONFIG_CHECK+=" ~AUTOFS4_FS"
+		fi
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	use boot && secureboot_pkg_setup
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	local PATCHES=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-journald-audit-r1.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		# default is developer, bug 918671
+		-Dmode=release
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		-Dsplit-bin=false
+		# Disable compatibility with sysvinit
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# no deps
+		-Dima=true
+		# Match /etc/shells, bug 919749
+		-Ddebug-shell="${EPREFIX}/bin/sh"
+		-Ddefault-user-shell="${EPREFIX}/bin/bash"
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool boot bootloader)
+		$(meson_native_use_bool bpf bpf-framework)
+		-Dbpf-compiler=gcc
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_native_use_bool fido2 libfido2)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnutls)
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kernel-install)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use test tests)
+		$(meson_use zstd)
+		$(meson_native_use_bool iptables libiptc)
+		$(meson_native_use_bool openssl)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool ukify)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+	)
+
+	case $(tc-arch) in
+		amd64|arm|arm64|loong|ppc|ppc64|riscv|s390|x86)
+			# src/vmspawn/vmspawn-util.h: QEMU_MACHINE_TYPE
+			myconf+=( $(meson_native_enabled vmspawn) ) ;;
+		*)
+			myconf+=( -Dvmspawn=disabled ) ;;
+	esac
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	(
+		unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+		export COLUMNS=80
+		addpredict /dev
+		addpredict /proc
+		addpredict /run
+		addpredict /sys/fs/cgroup
+		meson_src_test --timeout-multiplier=10
+	) || die
+}
+
+multilib_src_install_all() {
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	insinto /usr/lib/tmpfiles.d
+	doins "${FILESDIR}"/legacy.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}"/usr/bin/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED}"/usr/bin/{halt,init,poweroff,reboot,shutdown} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	keepdir /etc/udev/hwdb.d
+
+	keepdir /usr/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	if use pam; then
+		if use selinux; then
+			newpamd "${FILESDIR}"/systemd-user-selinux.pam systemd-user
+		else
+			newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+		fi
+	fi
+
+	if use kernel-install; then
+		# Dummy config, remove to make room for sys-kernel/installkernel
+		rm "${ED}/usr/lib/kernel/install.conf" || die
+	fi
+
+	use ukify && python_fix_shebang "${ED}"
+	use boot && secureboot_auto_sign
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/sysctl.conf ]]; then
+		# Symlink /etc/sysctl.conf for easy migration.
+		dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+	fi
+
+	if ! use boot && has_version "sys-apps/systemd[gnuefi(-)]"; then
+		ewarn "The 'gnuefi' USE flag has been renamed to 'boot'."
+		ewarn "Make sure to enable the 'boot' USE flag if you use systemd-boot."
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	systemd-hwdb --root="${ROOT}" update
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager (systemd)"
+		systemctl daemon-reexec
+		eend $? || FAIL=1
+
+		# https://lists.freedesktop.org/archives/systemd-devel/2024-June/050466.html
+		ebegin "Signaling user managers to reexec"
+		systemctl kill --kill-whom='main' --signal='SIGRTMIN+25' 'user@*.service'
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+
+	if use boot; then
+		optfeature "installing kernels in systemd-boot's native layout and update loader entries" \
+			"sys-kernel/installkernel[systemd-boot]"
+	fi
+	if use ukify; then
+		optfeature "generating unified kernel image on each kernel installation" \
+			"sys-kernel/installkernel[ukify]"
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 26f2f72f7977..250d179e1c2a 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -140,6 +140,7 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	!sysv-utils? ( sys-apps/sysvinit )
 	resolvconf? ( !net-dns/openresolv )
+	!sys-apps/hwids[udev]
 	!sys-auth/nss-myhostname
 	!sys-fs/eudev
 	!sys-fs/udev
diff --git a/sys-apps/tas/Manifest b/sys-apps/tas/Manifest
index 3f5217e81a11..931ce53a7d31 100644
--- a/sys-apps/tas/Manifest
+++ b/sys-apps/tas/Manifest
@@ -1 +1 @@
-DIST TAS_1.8.0_build.231207.zip 193227 BLAKE2B 4abb31bb6ae099d68e99b707c63b0dc9bbb18dcddd8137c602bdee9dec39c41638d481c117f1479a05ca75e5611d7ab8aa0fb3331d03956f8b952da168266328 SHA512 a1f3dbf41fb691e31381d291a4217a233043ec0a96b92518aaeef4277097499a69c0000ed266aafe17c91f12dd825abeca625ee1a06e3740c7328ef28a833908
+DIST TAS_1.9.0_build.240925.zip 29929687 BLAKE2B ff7a9ec37cd2bb934d73ef2f858bb1980450a9730424acd9bc4f444f2f3d35ab5a4a8363c1702d3fdffc9557f28fb4367a3604c5c2a2453ab46ebe238daf396e SHA512 63f5d27e9062858aa0aaa4dda7261ca3e3d7ba194336a856dff1077c6e0440937f49edac9b9e5b809c3c27c7d438afde02165b1185199de190cbf6c934f170df
diff --git a/sys-apps/tas/tas-1.8.0.231207.ebuild b/sys-apps/tas/tas-1.8.0.231207.ebuild
deleted file mode 100644
index b3be2156ee03..000000000000
--- a/sys-apps/tas/tas-1.8.0.231207.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info optfeature systemd
-
-MY_DATE="$(ver_cut 4)"
-MY_PN="${PN^^}"
-MY_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="Supermicro Thin-Agent Service for monitoring through the BMC/IPMI"
-HOMEPAGE="https://www.supermicro.com"
-SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN}/${MY_PN}_${MY_PV}_build.${MY_DATE}.zip"
-S="${WORKDIR}"
-
-LICENSE="BSD supermicro"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-RDEPEND="
-	net-misc/networkmanager
-	sys-apps/ethtool
-	sys-apps/net-tools
-	sys-apps/smartmontools
-	app-alternatives/bc
-	sys-fs/lsscsi
-	sys-fs/mdadm"
-
-BDEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="usr/bin/IPMITAS"
-
-DOCS=(
-	"clireadme.txt"
-	"ReleaseNotes.txt"
-	"software_license_agreement_pv.pdf"
-	"TAS_UserGuide.pdf"
-)
-
-CONFIG_CHECK="~IPMI_DEVICE_INTERFACE ~IPMI_HANDLER ~IPMI_SI"
-
-src_unpack() {
-	unpack ${A}
-	unpack "${S}"/${MY_PN}_${MY_PV}_build.${MY_DATE}_Linux.tar.gz
-}
-
-src_install() {
-	dobin TAS/$(usex amd64 '64' '32')bit/IPMITAS
-
-	insinto /etc/supermicro
-	doins "${FILESDIR}"/tas.ini
-
-	dodir /var/log/tas
-	local logfiles=( {starttime,tas,tas.com}.log )
-	for logfile in ${logfiles[@]}; do
-		touch "${ED}"/var/log/tas/${logfile} || die
-		dosym ../../var/log/tas/${logfile} /etc/supermicro/${logfile}
-	done
-
-	newinitd "${FILESDIR}"/tas.initd tas
-	systemd_newunit "${FILESDIR}"/tas.service tas.service
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	optfeature "Broadcom controller management" sys-block/storcli
-	optfeature "LSI controller management" sys-block/sas3ircu
-}
diff --git a/sys-apps/tas/tas-1.9.0.240925.ebuild b/sys-apps/tas/tas-1.9.0.240925.ebuild
new file mode 100644
index 000000000000..b918296c5200
--- /dev/null
+++ b/sys-apps/tas/tas-1.9.0.240925.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info optfeature systemd
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="${PN^^}"
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="Supermicro Thin-Agent Service for monitoring through the BMC/IPMI"
+HOMEPAGE="https://www.supermicro.com"
+SRC_URI="https://www.supermicro.com/Bios/sw_download/817/${MY_PN}_${MY_PV}_build.${MY_DATE}.zip"
+S="${WORKDIR}"
+
+LICENSE="BSD supermicro"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+	net-misc/networkmanager
+	sys-apps/ethtool
+	sys-apps/net-tools
+	sys-apps/smartmontools
+	app-alternatives/bc
+	sys-fs/lsscsi
+	sys-fs/mdadm"
+
+BDEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="usr/bin/IPMITAS"
+
+DOCS=(
+	"clireadme.txt"
+	"ReleaseNotes.txt"
+	"software_license_agreement_pv.pdf"
+	"TAS_UserGuide.pdf"
+)
+
+CONFIG_CHECK="~IPMI_DEVICE_INTERFACE ~IPMI_HANDLER ~IPMI_SI"
+
+src_unpack() {
+	unpack ${A}
+	unpack "${S}"/${MY_PN}_${MY_PV}_build.${MY_DATE}_Linux.tar.gz
+}
+
+src_install() {
+	dobin TAS/IPMITAS
+
+	insinto /etc/supermicro
+	doins "${FILESDIR}"/tas.ini
+
+	dodir /var/log/tas
+	local logfiles=( {starttime,tas,tas.com}.log )
+	for logfile in ${logfiles[@]}; do
+		touch "${ED}"/var/log/tas/${logfile} || die
+		dosym ../../var/log/tas/${logfile} /etc/supermicro/${logfile}
+	done
+
+	newinitd "${FILESDIR}"/tas.initd tas
+	systemd_newunit "${FILESDIR}"/tas.service tas.service
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "Broadcom controller management" sys-block/storcli
+	optfeature "LSI controller management" sys-block/sas3ircu
+}
diff --git a/sys-apps/usbguard/usbguard-1.1.3-r2.ebuild b/sys-apps/usbguard/usbguard-1.1.3-r2.ebuild
index 6b5eca2bfe2c..523bc3e68c05 100644
--- a/sys-apps/usbguard/usbguard-1.1.3-r2.ebuild
+++ b/sys-apps/usbguard/usbguard-1.1.3-r2.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="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0/1"  # due to libusbguard.so.<1>.0.0
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="dbus ldap policykit selinux static-libs systemd test umockdev"
 
 # https://github.com/USBGuard/usbguard/issues/449
diff --git a/sys-apps/usbutils/usbutils-018.ebuild b/sys-apps/usbutils/usbutils-018.ebuild
index d26898c292e5..88d3457eca9c 100644
--- a/sys-apps/usbutils/usbutils-018.ebuild
+++ b/sys-apps/usbutils/usbutils-018.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 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/uswid/uswid-0.4.7.ebuild b/sys-apps/uswid/uswid-0.4.7.ebuild
index 8fb812992a0a..ae0dd9060e19 100644
--- a/sys-apps/uswid/uswid-0.4.7.ebuild
+++ b/sys-apps/uswid/uswid-0.4.7.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
@@ -17,7 +17,7 @@ HOMEPAGE="
 # Reminder: relicensed to BSD-2-with-patent between 0.4.7 and 0.5.0
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 
 RDEPEND="
 	dev-python/cbor2[${PYTHON_USEDEP}]
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 6962f539fe50..fbf955f1c6d8 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,4 +1,4 @@
-DIST util-linux-2.39.4.tar.sign 833 BLAKE2B cbefaa4968ac82491c9eaa467c5e84e9b4a0c8dac74855aa04536a08f2c924e5f027f1a6389bd75e4366671addfe10a292f293295734041da7dc90971209134c SHA512 3f29551913cf8206c144edb0f3575beabf6e228564cf4aaf8f83d44d45ec8f24c22c7d178cc225804ecdfc66f6c24ee790e3b3660622975fdeec98fe7e2500aa
-DIST util-linux-2.39.4.tar.xz 8541176 BLAKE2B 53fef6f36b802d5e4c1112376c77e5cd832280d9eaeb9a6a98b2371334a1a3a8a48f5589d16f67c623a5050ae3b16dafc43ee26a9e8cb77079f9b6a2ee6c9480 SHA512 94e0282ac9705ca666d3c3864f2656bd1a21d879339164edd2c413ae7665b1cfec01f9c58a83b3148b8c4b4e857653447e5523c3b27230b175dd39f75ac6fae0
 DIST util-linux-2.40.2.tar.sign 833 BLAKE2B 10aae23d25c1364bac0034d6862df5738c7a405d52198fba1e4e9173a1b2ba9f3d994dacb881d920c3339c0f1018c7dd1c97c7752bdf0e8e634f54235c2b3f5c SHA512 e4ace52333df0c8dd7c8ffc3b813020615c456e06a6978e06c8183ec29896be5af7c25f59e65fc2c2849750d8d7b43043775b8504d6d01f626f1adf296493ce1
 DIST util-linux-2.40.2.tar.xz 8854820 BLAKE2B 8306d651f27db6665e91a937c9f1970938fec5b069636fea3c2688afddebd1a3424f0b0802a034eab049cf7692dd435cf93e82aa5f4a40cc8064d60b4ca59535 SHA512 ffe20b915a518a150401d429b0338bc7022190e4ca0ef91a6d9eea345db8c1e11ad01784163b8fcf978506f3f5cad473f29d5d4ef93a4c66a5ae0ebd9fb0c8f2
+DIST util-linux-2.40.4.tar.sign 833 BLAKE2B 7ed5fe555bc5fe11e99081190e73d0784e91bed78e17af358287c0df6c920a224f8d33428a5f139d8503b12379e93a96619bf4b8e3eec0da757e950c78ad12fe SHA512 1ed2f8710a702e313d690c9c071c7a151df1cef7527a08ab4d1eda7a293239cf00392a78b21125df09f0af7249b473b1a51b92bb8e0494608db437c7ee4e0473
+DIST util-linux-2.40.4.tar.xz 8848216 BLAKE2B 37c095d0ab97d54dd5a35160dd4d7d3ac683c19c799d57dac3a2e850a824160470e8654fbc77752cad9a9b1198cd1aa6594e8fa66f498c653c8a9f34ef0203e8 SHA512 0024955056ba7b4c54040a917f9919f49692e57ba6d42d17a6c29c1eefe88bf48b1214a545072b71c468829a63a8f15237f49733e9127c134e11126d1e435124
diff --git a/sys-apps/util-linux/files/util-linux-2.39.2-backport-1d4456d.patch b/sys-apps/util-linux/files/util-linux-2.39.2-backport-1d4456d.patch
deleted file mode 100644
index 3cce0bcab453..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.39.2-backport-1d4456d.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/920904
-https://github.com/util-linux/util-linux/commit/1d4456dd81a64a73685df9e5f1232d566818e453
-
-From 1d4456dd81a64a73685df9e5f1232d566818e453 Mon Sep 17 00:00:00 2001
-From: John David Anglin <dave@parisc-linux.org>
-Date: Mon, 7 Aug 2023 15:37:17 +0000
-Subject: [PATCH] enosys: fix build on hppa
-
-The following patch fixes the definition of SECCOMP_ARCH_NATIVE
-on hppa.
-
-Signed-off-by: John David Anglin <dave.anglin@bell.net>
----
- include/audit-arch.h | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/include/audit-arch.h b/include/audit-arch.h
-index 63d9eb52c1..f1354eec5d 100644
---- a/include/audit-arch.h
-+++ b/include/audit-arch.h
-@@ -57,6 +57,12 @@
- #    else
- # 	 define SECCOMP_ARCH_NATIVE AUDIT_ARCH_LOONGARCH64
- #    endif
-+#elif __hppa__
-+#    if __SIZEOF_POINTER__ == 4
-+#	 define SECCOMP_ARCH_NATIVE AUDIT_ARCH_PARISC
-+#    else
-+#	 define SECCOMP_ARCH_NATIVE AUDIT_ARCH_PARISC64
-+#    endif
- #else
- #    error Unknown target architecture
- #endif
diff --git a/sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch b/sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch
deleted file mode 100644
index f69876fe0a18..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/627532
-https://github.com/util-linux/util-linux/commit/f5715c117e727d4ff45e0d8568f188753620356e
-
-From f5715c117e727d4ff45e0d8568f188753620356e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
-Date: Mon, 13 Nov 2023 21:05:59 +0100
-Subject: [PATCH] fincore: (tests) also use nosize error file
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Link: https://lore.kernel.org/util-linux/b8cafd0d89878949705782312dfe800ec2779035.camel@physik.fu-berlin.de/
-Signed-off-by: Thomas WeiĂźschuh <thomas@t-8ch.de>
---- a/tests/ts/fincore/count
-+++ b/tests/ts/fincore/count
-@@ -107,6 +107,7 @@ if test -f "$TS_EXPECTED.$PAGE_SIZE"; then
- 	OUT_COLUMNS="PAGES,SIZE,FILE"
- else
- 	TS_EXPECTED+=".nosize"
-+	TS_EXPECTED_ERR+=".nosize"
- 	OUT_COLUMNS="PAGES,FILE"
- fi
- 
diff --git a/sys-apps/util-linux/files/util-linux-2.39.3-fix-use-after-free.patch b/sys-apps/util-linux/files/util-linux-2.39.3-fix-use-after-free.patch
deleted file mode 100644
index 6ebbd0a430f7..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.39.3-fix-use-after-free.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://bugs.gentoo.org/928396
-https://github.com/util-linux/util-linux/commit/4b2e6f5071a4c5beebbd9668d24dc05defc096d7
-
-From 4b2e6f5071a4c5beebbd9668d24dc05defc096d7 Mon Sep 17 00:00:00 2001
-From: Tanish Yadav <devtany@gmail.com>
-Date: Tue, 5 Mar 2024 00:51:41 +0530
-Subject: [PATCH] su: fix use after free in run_shell
-
-Do not free tmp for non login branch as basename may return a pointer to
-some part of it.
-
-[kzak@redhat.com: - improve coding style of the function]
-
-Signed-off-by: Tanish Yadav <devtany@gmail.com>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/su-common.c | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/login-utils/su-common.c b/login-utils/su-common.c
-index 242b6ce4ea..9bc0231961 100644
---- a/login-utils/su-common.c
-+++ b/login-utils/su-common.c
-@@ -835,13 +835,14 @@ static void run_shell(
- 	size_t n_args = 1 + su->fast_startup + 2 * ! !command + n_additional_args + 1;
- 	const char **args = xcalloc(n_args, sizeof *args);
- 	size_t argno = 1;
-+	char *tmp;
- 
- 	DBG(MISC, ul_debug("starting shell [shell=%s, command=\"%s\"%s%s]",
- 				shell, command,
- 				su->simulate_login ? " login" : "",
- 				su->fast_startup ? " fast-start" : ""));
-+	tmp = xstrdup(shell);
- 
--  char* tmp = xstrdup(shell);
- 	if (su->simulate_login) {
- 		char *arg0;
- 		char *shell_basename;
-@@ -851,10 +852,8 @@ static void run_shell(
- 		arg0[0] = '-';
- 		strcpy(arg0 + 1, shell_basename);
- 		args[0] = arg0;
--	} else {
--    args[0] = basename(tmp);
--  }
--  free(tmp);
-+	} else
-+		args[0] = basename(tmp);
- 
- 	if (su->fast_startup)
- 		args[argno++] = "-f";
diff --git a/sys-apps/util-linux/files/util-linux-2.39.3-libmount-Fix-export-of-mnt_context_is_lazy-and-mnt_c.patch b/sys-apps/util-linux/files/util-linux-2.39.3-libmount-Fix-export-of-mnt_context_is_lazy-and-mnt_c.patch
deleted file mode 100644
index 710ca934115f..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.39.3-libmount-Fix-export-of-mnt_context_is_lazy-and-mnt_c.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://bugs.gentoo.org/927258
-https://github.com/util-linux/util-linux/pull/2845
-
-From d271589d9536181184fcd19194f879e7c776d43e Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Mon, 18 Mar 2024 21:29:13 -0400
-Subject: [PATCH] libmount: Fix export of mnt_context_is_lazy and
- mnt_context_is_onlyonce
-
-[kzak@redhat.com: - fix also function docs]
-
-Bug: https://bugs.gentoo.org/927258
-Closes: https://github.com/util-linux/util-linux/issues/2844
-Fixes: 3d1c41c8c ("libmount: add --onlyonce")
-Signed-off-by: Matt Turner <mattst88@gmail.com>
-Signed-off-by: Karel Zak <kzak@redhat.com>
-(cherry picked from commit 6d2917f2eb910fb8bcdc6476be18c34fee152911)
----
- libmount/src/context.c    | 4 ++--
- libmount/src/libmount.sym | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libmount/src/context.c b/libmount/src/context.c
-index 0cd320190..20f4c64ae 100644
---- a/libmount/src/context.c
-+++ b/libmount/src/context.c
-@@ -549,10 +549,10 @@ int mnt_context_enable_onlyonce(struct libmnt_context *cxt, int enable)
- }
- 
- /**
-- * mnt_context_is_lazy:
-+ * mnt_context_is_onlyonce:
-  * @cxt: mount context
-  *
-- * Returns: 1 if lazy umount is enabled or 0
-+ * Returns: 1 if only-once mount is enabled or 0
-  */
- int mnt_context_is_onlyonce(struct libmnt_context *cxt)
- {
-diff --git a/libmount/src/libmount.sym b/libmount/src/libmount.sym
-index 715bb5c5f..1fa8bce3c 100644
---- a/libmount/src/libmount.sym
-+++ b/libmount/src/libmount.sym
-@@ -370,7 +370,7 @@ MOUNT_2_38 {
- MOUNT_2_39 {
- 	mnt_cache_set_sbprobe;
- 	mnt_context_enable_onlyonce;
--	mnt_context_is_lazy;
-+	mnt_context_is_onlyonce;
- 	mnt_context_enable_noautofs;
- 	mnt_table_enable_noautofs;
- 	mnt_table_is_noautofs;
--- 
-2.43.2
-
diff --git a/sys-apps/util-linux/files/util-linux-2.39.3-musl-1.2.5-basename.patch b/sys-apps/util-linux/files/util-linux-2.39.3-musl-1.2.5-basename.patch
deleted file mode 100644
index 519545e17088..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.39.3-musl-1.2.5-basename.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://bugs.gentoo.org/926293
-https://github.com/util-linux/util-linux/commit/77454e58d58f904cfdc02d3ca5bb65f1bd8739fc
-
-From 77454e58d58f904cfdc02d3ca5bb65f1bd8739fc Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 3 Dec 2023 19:59:46 -0800
-Subject: [PATCH] login-utils: include libgen.h for basename API
-
-musl has removed the non-prototype declaration of basename from string.h [1] which now results in build errors with clang-17+ compiler
-
-include libgen.h for using the posix declaration of the funciton.
-
-Fixes
-
-../util-linux-2.39.2/login-utils/su-common.c:847:20: error: call to undeclared function 'basename'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-  847 |                 shell_basename = basename(shell);
-      |                                  ^
-
-[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/login-utils/su-common.c
-+++ b/login-utils/su-common.c
-@@ -26,6 +26,7 @@
- #include <sys/types.h>
- #include <pwd.h>
- #include <grp.h>
-+#include <libgen.h>
- #include <security/pam_appl.h>
- #ifdef HAVE_SECURITY_PAM_MISC_H
- # include <security/pam_misc.h>
-@@ -840,17 +841,20 @@ static void run_shell(
- 				su->simulate_login ? " login" : "",
- 				su->fast_startup ? " fast-start" : ""));
- 
-+  char* tmp = xstrdup(shell);
- 	if (su->simulate_login) {
- 		char *arg0;
- 		char *shell_basename;
- 
--		shell_basename = basename(shell);
-+		shell_basename = basename(tmp);
- 		arg0 = xmalloc(strlen(shell_basename) + 2);
- 		arg0[0] = '-';
- 		strcpy(arg0 + 1, shell_basename);
- 		args[0] = arg0;
--	} else
--		args[0] = basename(shell);
-+	} else {
-+    args[0] = basename(tmp);
-+  }
-+  free(tmp);
- 
- 	if (su->fast_startup)
- 		args[argno++] = "-f";
-
diff --git a/sys-apps/util-linux/files/util-linux-2.39.4-umount-readonly.patch b/sys-apps/util-linux/files/util-linux-2.39.4-umount-readonly.patch
deleted file mode 100644
index 57c8903348af..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.39.4-umount-readonly.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/util-linux/util-linux/commit/9ba8eb5d89f0ebba8b3a542c041a5838e10a0d75
-https://bugs.gentoo.org/573760#c11
-
-From 9ba8eb5d89f0ebba8b3a542c041a5838e10a0d75 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Tue, 23 Apr 2024 10:29:37 +0200
-Subject: [PATCH] libmount: fix umount --read-only
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reported-by: Krzysztof Olędzki <ole@ans.pl>
-Signed-off-by: Karel Zak <kzak@redhat.com>
-(cherry picked from commit a20e7e23a8565e01b1c84de6924d1fbbdb1cfccc)
---- a/libmount/src/context_umount.c
-+++ b/libmount/src/context_umount.c
-@@ -267,6 +267,9 @@ static int lookup_umount_fs_by_statfs(struct libmnt_context *cxt, const char *tg
- 	 * So, let's use statfs() if possible (it's bad idea for --lazy/--force
- 	 * umounts as target is probably unreachable NFS, also for --detach-loop
- 	 * as this additionally needs to know the name of the loop device).
-+	 *
-+	 * For the "umount --read-only" command, we need to read the mountinfo
-+	 * to obtain the mount source.
- 	 */
- 	if (mnt_context_is_restricted(cxt)
- 	    || *tgt != '/'
-@@ -275,6 +278,7 @@ static int lookup_umount_fs_by_statfs(struct libmnt_context *cxt, const char *tg
- 	    || mnt_context_is_lazy(cxt)
- 	    || mnt_context_is_nocanonicalize(cxt)
- 	    || mnt_context_is_loopdel(cxt)
-+	    || mnt_context_is_rdonly_umount(cxt)
- 	    || mnt_safe_stat(tgt, &st) != 0 || !S_ISDIR(st.st_mode)
- 	    || has_utab_entry(cxt, tgt))
- 		return 1; /* not found */
-
diff --git a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild
deleted file mode 100644
index 5e57689f7081..000000000000
--- a/sys-apps/util-linux/util-linux-2.39.4-r1.ebuild
+++ /dev/null
@@ -1,420 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	pam python-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-	inherit autotools git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/karelzak.asc
-	inherit verify-sig
-
-	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"
-	fi
-
-	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.sign )"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="
-	virtual/libcrypt:=
-	audit? ( >=sys-process/audit-2.6:= )
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib:= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 )
-	hardlink? ( dev-libs/libpcre2:= )
-	ncurses? (
-		sys-libs/ncurses:=[unicode(+)?]
-		magic? ( sys-apps/file:0= )
-	)
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	rtas? ( sys-libs/librtas )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	!build? (
-		systemd? ( sys-apps/systemd )
-		udev? ( virtual/libudev:= )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? (
-		app-text/po4a
-		sys-devel/gettext
-	)
-	test? ( app-alternatives/bc )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-	acct-group/root
-"
-RDEPEND+="
-	hardlink? ( !app-arch/hardlink )
-	logger? ( !>=app-admin/sysklogd-2.0[logger] )
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-process/procps[kill]
-	)
-	su? (
-		!<sys-apps/shadow-4.7-r2
-		!>=sys-apps/shadow-4.7-r2[su]
-	)
-	!net-wireless/rfkill
-"
-
-if [[ ${PV} == 9999 ]] ; then
-	# Required for man-page generation
-	BDEPEND+=" dev-ruby/asciidoctor"
-else
-	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-karelzak-20230517 )"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.39.2-fincore-test.patch
-	"${FILESDIR}"/${PN}-2.39.2-backport-1d4456d.patch
-	"${FILESDIR}"/${PN}-2.39.3-musl-1.2.5-basename.patch
-	"${FILESDIR}"/${PN}-2.39.3-libmount-Fix-export-of-mnt_context_is_lazy-and-mnt_c.patch
-	"${FILESDIR}"/${PN}-2.39.3-fix-use-after-free.patch
-	"${FILESDIR}"/${PN}-2.39.4-umount-readonly.patch
-)
-
-pkg_pretend() {
-	if use su && ! use suid ; then
-		elog "su will be installed as suid despite USE=-suid (bug #832092)"
-		elog "To use su without suid, see e.g. Portage's suidctl feature."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		return
-	fi
-
-	if use verify-sig ; then
-		mkdir "${T}"/verify-sig || die
-		pushd "${T}"/verify-sig &>/dev/null || die
-
-		# Upstream sign the decompressed .tar
-		# Let's do it separately in ${T} then cleanup to avoid external
-		# effects on normal unpack.
-		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
-		xz -d ${MY_P}.tar.xz || die
-		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
-
-		popd &>/dev/null || die
-		rm -r "${T}"/verify-sig || die
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	if use test ; then
-		# Known-failing tests
-		# TODO: investigate these
-		local known_failing_tests=(
-			# Subtest 'options-maximum-size-8192' fails
-			hardlink/options
-
-			# Fails in sandbox
-			lsns/ioctl_ns
-
-			lsfd/mkfds-symlink
-			lsfd/mkfds-rw-character-device
-			# Fails with network-sandbox at least in nspawn
-			lsfd/option-inet
-			utmp/last-ipv6
-
-			# Flaky
-			rename/subdir
-		)
-
-		local known_failing_test
-		for known_failing_test in "${known_failing_tests[@]}" ; do
-			einfo "Removing known-failing test: ${known_failing_test}"
-			rm tests/ts/${known_failing_test} || die
-		done
-	fi
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-python_configure() {
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--disable-all-programs
-		--disable-bash-completion
-		--without-systemdsystemunitdir
-		--with-python
-		--enable-libblkid
-		--enable-libmount
-		--enable-pylibmount
-	)
-
-	mkdir "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. bug #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-
-	# bug #485486
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam)
-	# bug #545042
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam)
-
-	# Undo bad ncurses handling by upstream. Fall back to pkg-config.
-	# bug #601530
-	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
-	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
-
-	# Avoid automagic dependency on ppc*
-	export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas)
-
-	# configure args shared by python and non-python builds
-	local commonargs=(
-		--localstatedir="${EPREFIX}/var"
-		--runstatedir="${EPREFIX}/run"
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-
-		# Temporary workaround until ~2.39.2. 2.39.x introduced a big rewrite.
-		# https://github.com/util-linux/util-linux/issues/2287#issuecomment-1576640373
-		--disable-libmount-mountfd-support
-	)
-
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--without-python
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_with readline)
-		$(multilib_native_use_with slang)
-		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
-		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(multilib_native_use_with audit)
-		$(tc-has-tls || echo --disable-tls)
-		$(use_enable nls)
-		$(use_enable nls poman)
-		$(use_enable unicode widechar)
-		$(use_enable static-libs static)
-		$(use_with ncurses tinfo)
-		$(use_with selinux)
-
-		# TODO: Wire this up (bug #931118)
-		--without-econf
-	)
-
-	if use build ; then
-		myeconfargs+=(
-			--without-systemd
-			--without-udev
-		)
-	else
-		myeconfargs+=(
-			$(multilib_native_use_with systemd)
-			$(multilib_native_use_with udev)
-		)
-	fi
-
-	if multilib_is_native_abi ; then
-		myeconfargs+=(
-			--disable-chfn-chsh
-			--disable-login
-			--disable-newgrp
-			--disable-nologin
-			--disable-pylibmount
-			--disable-raw
-			--disable-vipw
-			--enable-agetty
-			--enable-bash-completion
-			--enable-line
-			--enable-partx
-			--enable-rename
-			--enable-rfkill
-			--enable-schedutils
-			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-			$(use_enable caps setpriv)
-			$(use_enable cramfs)
-			$(use_enable fdformat)
-			$(use_enable hardlink)
-			$(use_enable kill)
-			$(use_enable logger)
-			$(use_enable ncurses pg)
-			$(use_enable su)
-			$(use_enable tty-helpers mesg)
-			$(use_enable tty-helpers wall)
-			$(use_enable tty-helpers write)
-			$(use_with cryptsetup)
-		)
-		if [[ ${PV} == *9999 ]] ; then
-			myeconfargs+=( --enable-asciidoc )
-		else
-			# Upstream is shipping pre-generated man-pages for releases
-			myeconfargs+=( --disable-asciidoc )
-		fi
-	else
-		myeconfargs+=(
-			--disable-all-programs
-			--disable-asciidoc
-			--disable-bash-completion
-			--without-systemdsystemunitdir
-			--disable-poman
-
-			# build libraries
-			--enable-libuuid
-			--enable-libblkid
-			--enable-libsmartcols
-			--enable-libfdisk
-			--enable-libmount
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_configure
-	fi
-}
-
-src_configure() {
-	append-lfs-flags
-	multilib-minimal_src_configure
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake all
-	popd >/dev/null || die
-}
-
-multilib_src_compile() {
-	emake all
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_compile
-	fi
-}
-
-python_test() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	popd >/dev/null || die
-}
-
-multilib_src_test() {
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_test
-	fi
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
-	python_optimize
-	popd >/dev/null || die
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_install
-	fi
-
-	# This needs to be called AFTER python_install call, bug #689190
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	dosym hexdump /usr/bin/hd
-	newman - hd.1 <<< '.so man1/hexdump.1'
-
-	# e2fsprogs-libs didn't install .la files, and .pc work fine
-	find "${ED}" -name "*.la" -delete || die
-
-	if use pam ; then
-		# See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt
-		newpamd "${FILESDIR}/runuser.pamd" runuser
-		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-
-		newpamd "${FILESDIR}/su-l.pamd" su-l
-	fi
-
-	if use su && ! use suid ; then
-		# Always force suid su, even when USE=-suid, as su is useless
-		# for the overwhelming-majority case without suid.
-		# Users who wish to truly have a no-suid su can strip it out
-		# via e.g. Portage's suidctl or some other hook.
-		# See bug #832092
-		fperms u+s /bin/su
-	fi
-
-	# Note:
-	# Bash completion for "runuser" command is provided by same file which
-	# would also provide bash completion for "su" command. However, we don't
-	# use "su" command from this package.
-	# This triggers a known QA warning which we ignore for now to magically
-	# keep bash completion for "su" command which shadow package does not
-	# provide.
-
-	local ver=$(tools/git-version-gen .tarballversion)
-	local major=$(ver_cut 1 ${ver})
-	local minor=$(ver_cut 2 ${ver})
-	local release=$(ver_cut 3 ${ver})
-	export QA_PKGCONFIG_VERSION="${major}.${minor}.${release:-0}"
-}
-
-pkg_postinst() {
-	if ! use tty-helpers ; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.40.4.ebuild b/sys-apps/util-linux/util-linux-2.40.4.ebuild
new file mode 100644
index 000000000000..10ecc03207c0
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.40.4.ebuild
@@ -0,0 +1,454 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+TMPFILES_OPTIONAL=1
+
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+	pam python-r1 multilib-minimal multiprocessing systemd tmpfiles
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+	inherit autotools git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/karelzak.asc
+	inherit verify-sig
+
+	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"
+	fi
+
+	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.sign )"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode uuidd"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+RDEPEND="
+	virtual/libcrypt:=
+	audit? ( >=sys-process/audit-2.6:= )
+	caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib:= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 )
+	hardlink? ( dev-libs/libpcre2:= )
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)?]
+		magic? ( sys-apps/file:0= )
+	)
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	rtas? ( sys-libs/librtas )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	!build? (
+		systemd? ( sys-apps/systemd )
+		udev? ( virtual/libudev:= )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	nls? (
+		app-text/po4a
+		sys-devel/gettext
+	)
+	test? ( app-alternatives/bc )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+	acct-group/root
+"
+RDEPEND+="
+	hardlink? ( !app-arch/hardlink )
+	logger? ( !>=app-admin/sysklogd-2.0[logger] )
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-process/procps[kill]
+	)
+	su? (
+		!<sys-apps/shadow-4.7-r2
+		!>=sys-apps/shadow-4.7-r2[su]
+	)
+	uuidd? (
+		acct-user/uuidd
+		systemd? ( virtual/tmpfiles )
+	)
+	!net-wireless/rfkill
+"
+
+if [[ ${PV} == 9999 ]] ; then
+	# Required for man-page generation
+	BDEPEND+=" dev-ruby/asciidoctor"
+else
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-karelzak-20230517 )"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
+RESTRICT="!test? ( test )"
+
+pkg_pretend() {
+	if use su && ! use suid ; then
+		elog "su will be installed as suid despite USE=-suid (bug #832092)"
+		elog "To use su without suid, see e.g. Portage's suidctl feature."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		return
+	fi
+
+	# Upstream sign the decompressed .tar
+	if use verify-sig; then
+		einfo "Unpacking ${MY_P}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -))
+		assert "Unpack failed"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	if use test ; then
+		# Known-failing tests
+		local known_failing_tests=(
+			# Subtest 'options-maximum-size-8192' fails
+			hardlink/options
+
+			# Fails in sandbox
+			# re ioctl_ns: https://github.com/util-linux/util-linux/issues/2967
+			lsns/ioctl_ns
+			lsfd/mkfds-inotify
+			lsfd/mkfds-symlink
+			lsfd/mkfds-rw-character-device
+			# Fails with network-sandbox at least in nspawn
+			lsfd/option-inet
+			utmp/last-ipv6
+
+			# Flaky
+			rename/subdir
+
+			# Permission issues on /dev/random
+			lsfd/mkfds-eventpoll
+			lsfd/column-xmode
+		)
+
+		# debug prints confuse the tests which look for a diff
+		# in output
+		if has_version "=app-shells/bash-5.3_alpha*" ; then
+			known_failing_tests+=(
+				lsfd/column-ainodeclass
+				lsfd/mkfds-netlink-protocol
+				lsfd/column-type
+				lsfd/mkfds-eventfd
+				lsfd/mkfds-signalfd
+				lsfd/mkfds-mqueue
+				lsfd/mkfds-tcp6
+				lsfd/mkfds-tcp
+				lsfd/filter-floating-point-nums
+				lsfd/mkfds-unix-stream-requiring-sockdiag
+				lsfd/mkfds-unix-dgram
+				lsfd/mkfds-directory
+				lsfd/mkfds-pty
+				lsfd/mkfds-pipe-no-fork
+				lsfd/mkfds-unix-stream
+				lsfd/mkfds-ro-regular-file
+				lsfd/mkfds-timerfd
+				lsfd/mkfds-udp
+				lsfd/mkfds-udp6
+			)
+		fi
+
+		local known_failing_test
+		for known_failing_test in "${known_failing_tests[@]}" ; do
+			einfo "Removing known-failing test: ${known_failing_test}"
+			rm tests/ts/${known_failing_test} || die
+		done
+	fi
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+python_configure() {
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--disable-all-programs
+		--disable-bash-completion
+		--without-systemdsystemunitdir
+		--with-python
+		--enable-libblkid
+		--enable-libmount
+		--enable-pylibmount
+	)
+
+	mkdir "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	# The scanf test in a run-time test which fails while cross-compiling.
+	# Blindly assume a POSIX setup since we require libmount, and libmount
+	# itself fails when the scanf test fails. bug #531856
+	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+
+	# bug #485486
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam)
+	# bug #545042
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam)
+
+	# Undo bad ncurses handling by upstream. Fall back to pkg-config.
+	# bug #601530
+	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
+	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
+
+	# Avoid automagic dependency on ppc*
+	export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas)
+
+	# configure args shared by python and non-python builds
+	local commonargs=(
+		--localstatedir="${EPREFIX}/var"
+		--runstatedir="${EPREFIX}/run"
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+	)
+
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--without-python
+		$(multilib_native_use_enable suid makeinstall-chown)
+		$(multilib_native_use_enable suid makeinstall-setuid)
+		$(multilib_native_use_with readline)
+		$(multilib_native_use_with slang)
+		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
+		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+		$(multilib_native_use_with audit)
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable nls)
+		$(use_enable nls poman)
+		$(use_enable unicode widechar)
+		$(use_enable static-libs static)
+		$(use_with ncurses tinfo)
+		$(use_with selinux)
+		$(multilib_native_use_enable uuidd)
+
+		# TODO: Wire this up (bug #931118)
+		--without-econf
+
+		# TODO: Wire this up (bug #931297)
+		# TODO: investigate build failure w/ 2.40.1_rc1
+		--disable-liblastlog2
+		--disable-pam-lastlog2
+	)
+
+	if use build ; then
+		myeconfargs+=(
+			--without-systemd
+			--without-udev
+		)
+	else
+		myeconfargs+=(
+			$(multilib_native_use_with systemd)
+			$(multilib_native_use_with udev)
+		)
+	fi
+
+	if multilib_is_native_abi ; then
+		myeconfargs+=(
+			--disable-chfn-chsh
+			--disable-login
+			--disable-newgrp
+			--disable-nologin
+			--disable-pylibmount
+			--disable-raw
+			--disable-vipw
+			--enable-agetty
+			--enable-bash-completion
+			--enable-line
+			--enable-partx
+			--enable-rename
+			--enable-rfkill
+			--enable-schedutils
+			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+			--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+			$(use_enable caps setpriv)
+			$(use_enable cramfs)
+			$(use_enable fdformat)
+			$(use_enable hardlink)
+			$(use_enable kill)
+			$(use_enable logger)
+			$(use_enable ncurses pg)
+			$(use_enable su)
+			$(use_enable tty-helpers mesg)
+			$(use_enable tty-helpers wall)
+			$(use_enable tty-helpers write)
+			$(use_with cryptsetup)
+		)
+		if [[ ${PV} == *9999 ]] ; then
+			myeconfargs+=( --enable-asciidoc )
+		else
+			# Upstream is shipping pre-generated man-pages for releases
+			myeconfargs+=( --disable-asciidoc )
+		fi
+	else
+		myeconfargs+=(
+			--disable-all-programs
+			--disable-asciidoc
+			--disable-bash-completion
+			--without-systemdsystemunitdir
+			--disable-poman
+
+			# build libraries
+			--enable-libuuid
+			--enable-libblkid
+			--enable-libsmartcols
+			--enable-libfdisk
+			--enable-libmount
+
+			# Support uuidd for non-native libuuid
+			$(use_enable uuidd libuuid-force-uuidd)
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_configure
+	fi
+}
+
+src_configure() {
+	append-lfs-flags
+	multilib-minimal_src_configure
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake all
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	emake all
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_compile
+	fi
+}
+
+python_test() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	popd >/dev/null || die
+}
+
+multilib_src_test() {
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_test
+	fi
+}
+
+python_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_optimize
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_install
+	fi
+
+	# This needs to be called AFTER python_install call, bug #689190
+	# XXX: -j1 as temporary workaround for bug #931301
+	emake DESTDIR="${D}" install -j1
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	dosym hexdump /usr/bin/hd
+	newman - hd.1 <<< '.so man1/hexdump.1'
+
+	# e2fsprogs-libs didn't install .la files, and .pc work fine
+	find "${ED}" -name "*.la" -delete || die
+
+	if use pam ; then
+		# See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt
+		newpamd "${FILESDIR}/runuser.pamd" runuser
+		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+
+		newpamd "${FILESDIR}/su-l.pamd" su-l
+	fi
+
+	if use su && ! use suid ; then
+		# Always force suid su, even when USE=-suid, as su is useless
+		# for the overwhelming-majority case without suid.
+		# Users who wish to truly have a no-suid su can strip it out
+		# via e.g. Portage's suidctl or some other hook.
+		# See bug #832092
+		fperms u+s /bin/su
+	fi
+
+	if use uuidd; then
+		newinitd "${FILESDIR}/uuidd.initd" uuidd
+	fi
+
+	# Note:
+	# Bash completion for "runuser" command is provided by same file which
+	# would also provide bash completion for "su" command. However, we don't
+	# use "su" command from this package.
+	# This triggers a known QA warning which we ignore for now to magically
+	# keep bash completion for "su" command which shadow package does not
+	# provide.
+
+	local ver=$(tools/git-version-gen .tarballversion)
+	local major=$(ver_cut 1 ${ver})
+	local minor=$(ver_cut 2 ${ver})
+	local release=$(ver_cut 3 ${ver})
+	export QA_PKGCONFIG_VERSION="${major}.${minor}.${release:-0}"
+}
+
+pkg_postinst() {
+	if ! use tty-helpers ; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+
+	if use systemd && use uuidd; then
+		tmpfiles_process uuidd-tmpfiles.conf
+	fi
+}
diff --git a/sys-apps/uutils-coreutils/Manifest b/sys-apps/uutils-coreutils/Manifest
index d885b9f3531c..7a7dacf72111 100644
--- a/sys-apps/uutils-coreutils/Manifest
+++ b/sys-apps/uutils-coreutils/Manifest
@@ -1,189 +1,236 @@
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
+DIST adler2-2.0.0.crate 13529 BLAKE2B ec575b0bf12e321399ac3a1d59fce4ddbeabcc60cb3d7c2f362cce23eb29b4ea836451372d6d88552a4435ae29bb41d6230d55f625a4359eace680b9b771d0ad SHA512 12d12579ad617cf1a94cf95ab9d3f5db566c3b2de4bd5735eccd83c668fdad0eff134c996b73c46cbb9f932837682043878b8cc4764191625e9f93ccffcce423
 DIST ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d
-DIST aho-corasick-1.0.4.crate 171175 BLAKE2B b3d450533f0799a18fa6ceba41ce841573a3b9fe9bc66745aba9b5a1ef4d86b107aa68c049bd30df7bc86229c71264142e40da8e1d145e776017269a01aed86e SHA512 7cb8feb3289a508b1345b3cc04b59f2f730b80f561b17c7605ce23bf92780b5b3714ec84f5e3c5f4ba0c3abd47ac44fd0064a8bf4c5a7d00bd580774c6a3aee8
 DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
 DIST allocator-api2-0.2.18.crate 62504 BLAKE2B 8152c5a611be91ba23b1e8647511e21f48e7d4f1a7b9a828083f5bb8747cdc92aee66f73251b19195bbdc1f65aad992632e820d86cbeff287d598257ae3628a6 SHA512 5e5b0e23e1f5b259e5d3746e3e05817af8dee95af7105ea775a5c1d69b4e537a4d6a25e2c1d46ab83e2385217b158f7940dc1315ae581c35ee23289647105e73
+DIST allocator-api2-0.2.21.crate 63622 BLAKE2B 983897fc977118f220dc4af7e801ac08eba77bfde2a25d756bad3e77f849418e74e7c67eaed68e2d719ca7fc6e1e9ce151dd7dbe8707dc43d4a6400294c8fc8e SHA512 1bb5711ed6041b0d7eae2ec784b8aa9d215db0f49cf79c692946eeb0db545d358cbcaa8156ae34e51d05287c08574f1da251ee574f2392949e4ed26d04770d03
 DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
 DIST ansi-width-0.1.0.crate 6116 BLAKE2B f90f1f2cf668ef6d36b8aa723c3dec02b64139d4729f2c286c7298b78752d1e241fc7063ba2571388bba9f06d61feae05b0f48f2eaadb91f04035fe16184875a SHA512 2366fc37e81153dd19554fc4f2688ee1ce4a4794cdc6a56eaf6e7cf6a5459b2b1309bc35d8d049114c64730d9eb6d73a9a1380747b4cde644498a9b39e41c31e
 DIST anstream-0.5.0.crate 19646 BLAKE2B 770dc99092e1c48ad5c1658e83abff3b8c9e0915e360048bfe0fe04faf61991e01e88ca4adca23533bf11fe078066e351778661128d69381756688341022f29d SHA512 8e285cc8f92708cf9482e7b4dc84dd891e5ec0bd8c57894c6bb368eede1127b7b903adb4c40b37287e3644535cc60c92662951c2c8fb5b92e10f49ff5374d359
+DIST anstream-0.6.18.crate 29681 BLAKE2B b6f72cda084b38f1e1cfe60de2562e8d62ebbc352176bdf668a2d6be09349bec46d291cd475e8af814ce66def44d95cb98c325761150130752284a82d8a84f21 SHA512 5149977d6f7b5e9cf6350f1ef130caa3ff46c7e78976358452a185ce196cdd77fee48a3a9838f434ae6ea9c15b19f6bfbab156edf819f81179d6774318f08963
 DIST anstyle-1.0.0.crate 13972 BLAKE2B 741704b6e338834696bc816d8a65ff933f9bff48e71d25269f04c4a24c3dbb06826d2f84f73a1dceeda99cfc5c8e3d59b3d07dbb404cc3471b86cf118d074e80 SHA512 5a0159b9f8a80afadff04ecbec3c1769cef712c77de8062b31323298dab9507f4a87b7c777e6335d310ec464b0982d097b5888b4b351c389b5f4419c2c87be7b
+DIST anstyle-1.0.10.crate 15725 BLAKE2B 36e656bd8f9c584f11fda5cfe0c2e24e8426b9e1b602aad34ed118ae6950a55440e292d2e0ff7615f5e4f466fd06f07536be198a59506a587d40cb0c4ede4f80 SHA512 621e7a89fad13db985f07375d316cf8efba57fd44ae18628a8049a65aefbaef27949f99317872e91e0922bb089a00234055199ea3167f80ae03d00ada4f75dea
 DIST anstyle-parse-0.2.0.crate 24361 BLAKE2B f796ddf1af04c93d7ee2721731e5cd22bb941919940a9edf6b2a658a8c39e87bd801bfd989631d64e9061067f7349796c56009ec61c02d754748181cc4d91a62 SHA512 fbac25189a0f4c0ddf2733c8ff74bdc2dc1a35e522d0201fa48f0f45e1d5d0a42e4806178507d0bc6a2ac22978b813eae5d57f09dddc80582de524690d87147f
+DIST anstyle-parse-0.2.6.crate 22343 BLAKE2B 85eba405dc5cf806283cf442984e86583dfe6c681f849eb7a347b7b67bd2b6f692e84fc9b5bd86486633cb2f05960ec16e8778300df114ae6676da43442db9bb SHA512 e28c9818afcda0e9b84c205d9c6697ce64cb06c21df2c3666869c07d66893105d9c5e96a27fcf2410a09f6af00735252e22b5c7d8c6cb3f68c4a8f376c49d396
 DIST anstyle-query-1.0.0.crate 8620 BLAKE2B 2d296b5066fd6284a2410923215571e6df650c5ef892d6de7a7088a0996ca30608797feabc84f3c325ff4d07001dac80ac5067d2a9c9d15d9ba59a276b399f53 SHA512 2781be5c82293b7ae338ec5046fbeb130de9eb2dbf2e4dfaa73ca5233032e1e52c133e141b02f33d4bc36d996a0a3f680ac82d42d614a5305005f60547133c7a
+DIST anstyle-query-1.1.2.crate 9969 BLAKE2B 179b8dd6dd709c2ca67f4eb5c9a502b2867cb6744a39f824c4fdebedc67c6c3e07d107c7d817e2ffb589d13b7ed4900cf9653ddc0a43663217042ee92ce8c9da SHA512 26069d936c4b1fb09bc65cda0253fe9be8fa4e96c0821f980c772602b4e9230035ec8c9d092ef95e0a0354ac559f8d25f57a14c34086d4d241b5fba688951837
 DIST anstyle-wincon-2.1.0.crate 11757 BLAKE2B b7c1071da1ab24accc33d7af70f09ace8edb2dcbb53936ed5ac13552c6082c0f16ce501f041d2c1792cee7dd9cc3877d29505e12a65022bec44285f13e1f422f SHA512 6c379c46f791b6b1367f3d6f3531dcd16589cc2e12f6f5ce52a3fa32d42e62b719d2277699d1bc8526099a6f791f2e7d5b1068e1295cbcd2997841f0eafc4eeb
+DIST anstyle-wincon-3.0.6.crate 12271 BLAKE2B d9f4d9d46fa93a1168ca340562681718be852ffa94e30c9ea208af53af9d6697ca84921837a325ddc36681caab2b866b7f574901c80b5c0d862dcb765b81b68b SHA512 59ec6f5a53bd68b6344d82e923eb8c45ddac481dd0d270a7b452dc5b0540ee1656705697c1508942ecc131e7c075248c85d8f4159f27d97ea94f22469ce2eeb5
 DIST arbitrary-1.3.2.crate 32037 BLAKE2B f8f6a10a8f42f14eefaad4348b6ff200d0c2fb22faa7a2876247228046359e39c555f3170a1975f64f8537319b97c7ce2030dcab3614229c8334b5d6f9248114 SHA512 faab26c44f25d2c7298add2a657e4010d9fe24b3a61e2270bc6feac05cf2a82895fe225d2fb1c6b63e6c7da54e061955503f39322b96dbdbc4916601bd5e5ccf
+DIST arbitrary-1.4.1.crate 36816 BLAKE2B 86adbf1a2522e972bf4a7fc26e4d88ec45298dc2ce716a1fe30cd49bebf4d5a65af1f097f83be6ee8c554d4b392657efd32ffa1cb35704585a9816b6e234c067 SHA512 a3507aa0ab684464c3559376beabc0992bbb589ddc85d2426b26238d7c5d1d856df5d9226603fe7ad2b17ac6570d62e86ba4f5a2e65f3cbc9ad52bbe294f8123
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
+DIST arrayref-0.3.9.crate 9186 BLAKE2B 8d7443944c81bf849fbb8a4e09ee379134c173decc712c6fafe483fb1545fba1f7f735979e5e26976502284502b5c7046f0b6aad59f8731a4ac8e1a51929c979 SHA512 f97e33e7fd65a8e908c21ab918350f71f12d49783162b90c5618660217b36516c39750b292a1248125f12429e4e00af9ff20c3846be81175946b8541d96ee606
 DIST arrayvec-0.7.4.crate 29856 BLAKE2B 81ffac1db340e919618351819def3880ab1ef70d0acc47d680f15298eb749bcbc3bf7944ba14159be46b1e734c91b4c0f8cbaf774fd864c17caa3c9fb1fc2e9b SHA512 91e8f70330c515c966d78ae235e890594f9607381ac738a2c3586b53f01411e98d1687494f39ccc365948ae60497df3dfb2be18e26ab7e69bc0966b6c250e1ac
+DIST arrayvec-0.7.6.crate 31237 BLAKE2B b9d1df7e3ec47d434a2606fe9540e37e02351873b376a4e113b54461288e9ab20e02285eed5c4bc0f052ec4d6b3c804044413490ea706c31a852624b03bde7bb SHA512 b1f320746018a7f32340a833420089446ec5cefb7f299b4506eab7423d5db49f00b72d8aa8c6600f9159b9480d5eb3ce69407d93f5c9934147860c83e4d6eca8
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST bigdecimal-0.4.5.crate 79843 BLAKE2B cce99886dee926d0859f7d90b0e709cbdff91de941b364e24b935259544def8d583ea8e9212a507e0ef66b847c90d4517a1746687bb85d7d6b2d4404518f1aa0 SHA512 36f947f1604a208d8d638fbaf6a1eb24a4cd43a132c6b24c3154cb46f06dd655b4a71631f8da1b96c3ef7e4862e197c0ae362e9a150a02b00e90951235e9fdcf
+DIST autocfg-1.4.0.crate 17712 BLAKE2B 7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6 SHA512 3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c
 DIST bigdecimal-0.4.6.crate 86155 BLAKE2B 5529cf7133ba9af8246e28a73456f96a4824147093f473f68a6d0a1bca4cc70c972cb47af7fa9cd8773a52fe3889cb9b708bca6973cfb0dc99971ecdabf10d67 SHA512 c419dc313bd4dcb6cf9eae361e0d7fc088aa07ad6c8f687127ee1f657439ddbe7ed3b7fc85b832e7044e93feaccd5c4f1c7b2ac29931cfab6e06401b15634737
+DIST bigdecimal-0.4.7.crate 89252 BLAKE2B 457c97530d89fd78a672aecef6bd0a0210d83f797f9297b7149cf33e9e94aa87b2c298264ceae44979042eeae2a502eea51c378263d4644edcbc877089a0c567 SHA512 7a3493617005dc19b2fa0eaf11e7fbfda734e701f3d5f24bfb01722a2739196daa29b2a33392dea40a47812528691a162773dc602c5053df65aec3a29dfec0ff
 DIST binary-heap-plus-0.5.0.crate 20570 BLAKE2B a0cd30313e52eb33e7fa109c96ef39642d5ec6ef38b96ca37c0b3817299f1a06d39f6245316325e072d7275021e75eceb06a0f78ffd5418ec8bdd3974f10532e SHA512 8ad19390582e20ffe26533db6a452ce8a6768f9fe309f1cf0c58be830d433e1130f9187450a106981cf8d440e2a37ddb95dde90d346decae56340971ff8eed66
 DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
-DIST bindgen-0.69.4.crate 221092 BLAKE2B 69ed55a5827bfe850f589e39bc6e2f4445e20363002c765c5475007b75e4d81cac3d9df358505c63bd6a48300ae4988507abf78dd734bb98b33525bf9212237b SHA512 99530060708690f2ce0b87b97c9ce2998ee968df193137f3c9bf4fa66836814e2ae74c7e0b3057dcff1da7d2c4ea38157e21143c5117be35e94b878c0a427a34
 DIST bindgen-0.70.1.crate 226363 BLAKE2B 4c5b9d70d0aa95ec3dc4cc956b3b101043132054ef47017f1e7b51072dec1ad87885caaaa91ce5353f88332a6412c0377cf9490822357e78b5124ae9b3e9a6e5 SHA512 cf1c87ea7ab9ed4df953795f1aa77e6ae6d72e768de3b517300074501ce49db6a3def1f58b9d824b5727974cab84a48461e7d98086fc440dc73ad9cf173ad5ed
 DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
 DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9
 DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf
+DIST bitflags-2.7.0.crate 45924 BLAKE2B d4266b77e4ee15d7083c8e8eebe1b050029e3f3d21029606d4e9d3c4fe03820b6d5ba2e1309f47cd6ca2a043b5d7e1b19dd991f3fbe97c4bb018aadb54c60818 SHA512 c97246c09551bf1b333850135d82c40650be4aa8df1ab55dc190d80ea8e950ebd122635fa7d82c43d477150e207acfc4e830b9fde41aaca1edbbe7c0a800c174
 DIST bitvec-1.0.1.crate 224375 BLAKE2B 9f109db6888cf73d69646911cc1c9e90535e54a7afc436d878bbc63ca20a30cc6e5b5b5cd42aa78c38df5a4012454769c126f9072f39d58bdd09e54887ba6d9f SHA512 83d643c5aca020ebbe9094b5aaba6a796e7c3c509228a4348444e57a06bc3a5dd042eed57a2254d91661e73bdab2bc0d1bd02be376906acc6b6d75b5354a8d8e
 DIST blake2b_simd-1.0.2.crate 34165 BLAKE2B acb2508f3a36710119ec170bfa3d343d3d99e5f9b7c65bb62d362e316eca3f52bd17dcdfc30ecab99e41883f113b4be51d72d754b8f4ea8e886addfbd93dcb6b SHA512 b2c5da66e8d0c64c00302f0047a4944e1099ddd69b23075874c3bd3b33c7faee9f425b939380da280d2ee347ebc09dbd4c97fa805dee6f752cc40c90e7edbd5e
-DIST blake3-1.5.1.crate 170239 BLAKE2B d966170b27098a9f51a2ee1ad0e16bf09a5b886b9e350fcee70d62c0e42bbe6e7629eb185cea9b11e55fa4f5c3e4b65803472e1b18306316cb33e7854feac0f5 SHA512 86c67b98dc3fd790363dbafc71a47cab96bda5e6e1f971210f532783e3b538b1a62e1580140380aaeaafbfdf63d93bc3b09e01b836eb5a7a11655fec01009763
 DIST blake3-1.5.4.crate 180240 BLAKE2B d0c514ff45a023897dab13be763c04df861da8d5b97b32e534f7c30c2b184fd0d7f337e1a7269ae03824473b9968dff0872769f15b27241c7e2e184d4edb333e SHA512 dc28ab0f5e2b802c8ed9febc781854115e31ec4e29d2c3377cf7ec50215242ad26b3fdc62ef691b4c0bf0999119530260598bcecc4d96f2d0405ba96e067812c
+DIST blake3-1.5.5.crate 181134 BLAKE2B 0195efa92e121dfa22abf56e72daef664f00c36eac9839543a4ea27351be6393d2edae6cfa2f9442a7b6e268bd2fbc76ea718d5d939940097b0e0f9e0c29405c SHA512 93dcfbb3e1236534beaeeedfde2aac7a13c83bdf9f0e85352e8920706df41fbf042fcfafd3726f2a23450d4ac77caa3fc7da3d26abb1477137dc00ad35f543c5
 DIST block-buffer-0.10.3.crate 10465 BLAKE2B 32f0089971bb759244b73a75bdbbeb2d24f0422e92ceb0ae0afe3c698e3fabb371112a2eba3dab16a3859420d492c0ac984bfbb25e59e0c31951501cc652aab7 SHA512 e29faab70f8f2965a58089728274ec34bc97d681526687868c9cb1a2c145db00717f97e77b79a04fa52bd76817d796e104b509cd2a3163085b214f8eb68ac04f
+DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb
 DIST bstr-1.10.0.crate 380426 BLAKE2B 19330a5a293430c09908d2174ff814351b16419f60de6463abf9b8a9dff06a4e6845e889d8047a710cef54842f2790d9cd5080b92cdcb113d89742b869979c74 SHA512 823abdbda9b13802facc7d6b1ed9ad809ed3b0b827d26e418348ffb8481b5f5735f129c5a9a8c7b2ab010d7f32ca57cba69a1ee10a64225c54c6ceacd22c05d2
-DIST bstr-1.9.1.crate 380305 BLAKE2B 52b45bd48874d052636c6b451cc36d8b012808ea5193e0188e5edd09f81d21b8306926cfebb405ad0650ec9aa710f609bacaa773bf854b21f4803dc38bb2eca7 SHA512 67e9f76719310de60f46adf3c39768b4dc078d4c32dc6bdcec1a94cd9f630c5238e427ed84cd6ec25a44f54e84adeb795a0e92060a5372d9fb9ad9f0914e3172
+DIST bstr-1.11.3.crate 351536 BLAKE2B 72a4fcc236942d121f76f42135c332fda2b1ad778d993ee69855c4eb6f909c91491fe6aa68daa0e2d602aea1bce61b1fcf03d03787f84ebb4d63b2bd3f4295fd SHA512 f1082ac8f121c6f9eab4b41c5f60aafe4623696c9f800f9d59f6726efc74f86071910f7749fbcdc8f1c20c83416d58f3ff507978775f602e18ae3d1bb027944d
 DIST bumpalo-3.11.1.crate 81207 BLAKE2B ba76008fb5a975aca12b6f893779e18dd353a22a42cbbeecd5870622a7cbc0cd7e37036af600c570b8a55f26ea8d07f44a9aa1a8373d977b6f75bd4276730292 SHA512 70e90bee1fa4e783ff5a3b18f192b9347bafab7daaa907e74913a415a66c29acfb073fcfb46150801aa7649ab0d2ec8a610de239551565dd167bac72ab13a9bc
+DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
 DIST bytecount-0.6.8.crate 14694 BLAKE2B f534fadb45ce25036313c0c4d54ecfd2091069d5402e02606da36d73696c74e3162990dfdbc95dca4424b498983bf04019234af6eb71e38ca28fb7da61d181fb SHA512 5984dbb71fe22371db00ca56675f409cefcf7c093f406ce1abc330a0b1535f30a43a520fb64d66c04a181a4f05d956300e35f77b43aceeb161eaf8a2c64df614
 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
-DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
 DIST cc-1.1.13.crate 82857 BLAKE2B fe3c076a4f7428e39a1bd00f27e0476446db65b112d3ce3ab6db24d37de7ac788667ce6d8e490fd34d66432d0da418b6e63812d5788890256cced5457635db37 SHA512 6e0ecb082ff35fbc83c312f24f6693c3e4f4ee03c2247fbc5adce4f6774a9d6c8dfa28f93b2ec5a00d4da8a7d60bd4a77f2b904ed6bb1cca02a677b9b3cfebd2
+DIST cc-1.2.8.crate 100790 BLAKE2B 15f707b72adc1a6598d5a88df4346223e0efa863d4798c648daff3606adafcae9cc51109eaee197ebd33e8583167c00d18564c50159e0b393e7b7938b928b0aa SHA512 2566ae63afe078e4ed598cfe81d6a37af958c3f96c9689c8c94f873e42115c1cc0b02bf52437905fcfe8ee058a789b864b9959cd105348b7fa907e21db93f068
 DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST cfg_aliases-0.1.1.crate 6009 BLAKE2B 6acfae9a89d3479f7ce1f0b5dbb13bfe27c006b936a96685606a61a06f69d17ab754a8a0d96c54213f758281c2fb32ac74d03a34e0f836dc7e438387955aac37 SHA512 238828445c5b48ca41ff88825af0a1ad30494e423bb6f89b6d5e4d26042afaa1ceb0e32041f7cddd79c3e15c6c82a1ddb9469c4b63a1ac52d4bcc1174900f880
 DIST cfg_aliases-0.2.1.crate 6355 BLAKE2B a758d9c88527f0e6e7cfd6d4c83eda1bcb4d6e2438189fe08e8ecbcaa78d56afc5a4873f3b82bf7da96afd690b44cdf1e44466b6da0f37c358b340481017103e SHA512 74969d12d5d24002a29e08d52e30fbce014dd481a7c35ee0162e69333c5f2d7755f3b02439b31522e12444cf1ac8e65880ce33fe6778dac03757e362cbf8a72c
 DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
+DIST chrono-0.4.39.crate 222248 BLAKE2B eeff1694a98e8775524c261c5c46ebf09bf1ffc6222a945576960e8153af99e4549d8c988bd086507fa430f9cb15a3159be85300247ab3c6f5e77ab515f0988b SHA512 5b258f76bea58ab9baa0fe8fb32c41928b8b655c76bb2fbaae9300ef8380cbb881296cee6b9e9886dce62b0759c73e84f6409e374a86cf0c80e3383512f98571
+DIST chrono-tz-0.10.1.crate 378405 BLAKE2B fe28162825e464e2eed75ca1415ab575a6f0bbf41c0dfd06b17234c8f86159eed474add7ae17743a1bdac4b0de9d2ea30d1a8c42d85a7f2d06a0e209cc4d8857 SHA512 83a38a648caf9bf899818913072ba214d29082be876d75d83cb4efe1b889ee7f153e23a41e30ea675f59d11777c2d4d61739a8b324974a36574a23cb70fe86e4
+DIST chrono-tz-build-0.4.0.crate 10660 BLAKE2B 5a20ca9fbfb041279779cf758d4d0ee84519065f728ed61313e611aaa3b6add04825af325c5632301faa2064a75e7abc5ea279cf0245f49339401780d3d0fd37 SHA512 27c3a93acfa71dfab4fb56a6f9206e530253564fc2246ca8927364f60dccf9623b1a8f2c636708e01a7669f03c8a1b9548fb936bfdb4c61bc1ae4a70dc598ce6
 DIST clang-sys-1.4.0.crate 38679 BLAKE2B d15bdae2142ed26b4f6bd037bd2062e8c4b7b87fc5b749b872a95ff1952d000066c255aa0984e5f9c4a5c88066db4a20cfd048db4ba5a59b331d5ffa5e9a281d SHA512 062189bb0a341e2e85de4987f4b564c1fc69e4005c9c42cfedb61dee5f48db9126a8114d1d97be1b9c21b8c885243751232fbe8cf532e1d2be593308fe45216a
+DIST clang-sys-1.8.1.crate 44009 BLAKE2B 9173de6dfbd3ef9d5d1fdc559700cd3a52f95cd77302063a97e8cf311a35825825e030b47f252c857853663ae8a16709e1f7bd0c608d67c2a74eb36ed588e778 SHA512 a68c426c20110fddb8bba07d6631517b0528fad45802e5a34a22561d7e6dad82dc5001387019a03f275e9a671b09ee0a06b6e86793c4fb4ec655700bb0f5e125
 DIST clap-4.4.2.crate 54441 BLAKE2B 878b7808985e0cec0de249fb35c3a81b3a583b08e56c159395b0a915ef0d4a555531cd5e280f8c78b11a5f4883a02df65770733bc610ae61dfe820a2b0361bc0 SHA512 7ab5d9f320779e7f249d1f6c5b4fa351e6476fe114ce5975a70f21a19e2ba5ffd3867d383242506c0f86917ba7f271b7e31afdbb087cb590fb6ef9b1466f62dd
+DIST clap-4.5.26.crate 56474 BLAKE2B 986e620055ea5c8546162793958ac147f309df76058b49862e15517b1f060f986e631da5816fc7cd22563f1699a57b5d377622974606c96c454d74d8ba72a07c SHA512 ff41bbc3432504eb80dcd95091aa21f00716337a4e271822d9d0e8f244e01583fdcfb890f6eef908ad3cebe7e2597802d09ba26f9cb7b8c325f616ec4ff6d1f9
 DIST clap_builder-4.4.2.crate 162358 BLAKE2B afe7a9e1f62553a4c25617305b4060152e8a74b8ea8ba37fdb399ee1e4c4c8ae8d387fa81ffd6e9faa1f903da6add42b4711919c9b398770a41ddd9c60a4f4fa SHA512 58f211803ffcc9007aee856f2491b9ab823bea281d35a1f2f177beb8efb5419ea7fa6fe4bb6790f134c288194837bac13b695311b2521fba9f1d0f90608a8336
+DIST clap_builder-4.5.26.crate 167961 BLAKE2B 4cdb5b3d356a2631e86c9130389e6773d061d0842997233ab470c4c0853a966eb8c40e36574fa9708f7d052901bfc267579a26175e6e2da2c74552bb377ccde9 SHA512 474cb2e9b9732c353ba0b1a5fda60332903296fc50019481ccc881680b30602ca545cf36116374a6b15f6e40574b8631aa682becf6a1707ccd42d18e34a68a29
 DIST clap_complete-4.4.0.crate 37256 BLAKE2B bcf58bb9739823bf87d854f9b10206f9ac59a537c5e103915f03dd291f1656943b0aef3a41345b66dd63046b395e6cfde5d19c89b3e1e321fd8374268cedb456 SHA512 56a5d9e49dd5fda7d06100dc2701ce1c231b255400f4fe06fa37066b366ccbd9c8064c9305d29017db8e31d2b88ba1acef4934ec8ae82f649a28bdbabed05d84
+DIST clap_complete-4.5.42.crate 47897 BLAKE2B ef0eec7a432a53dd41306d0d0eaf515467286768eecc3b80074d4c89752b25bac3d1abb7320014bb61a8624d65b2c4a73b0c34f6febf3a63c96d1a7a09e4b716 SHA512 b7cfdae8ff3a2f3cf47646812dad297ce90fc1fe309b2da63afa2017b8b299f35af704c87f5bfabd959abb0ade9d29d1243658370cf9f97eac93b5659a50617e
 DIST clap_lex-0.5.0.crate 11792 BLAKE2B 0409c9d957ea6a566eb8b50f4212702df038d04c4c38f7440d91cb4c58ec887940f0cf500c4c3949c2191399aac3f5cb1ce44868eac587cde90211d3e467b9a2 SHA512 0149ed7c2438a19b4857f895767550d783711078f07bfa9ac8ca531e06f51c7388110f4d558e30bf503536367cc370cb581e8deb6fe51f9b5460a334963daacd
+DIST clap_lex-0.7.4.crate 12858 BLAKE2B a5ecd50cc503157dd69746f3b6e9c288e0fe4f6d5d82271499f657134fd401fbe076255e2be6a23ed0b69daf3941c6429dad8b288223b0ad390a2c435575cdd1 SHA512 a2566868f4619679d3b74b70592ffa6a04b13e38e3196c56bb1dae8bea0c711bddbccd778d2aba3cc0ee074c9b1cc0335222818f0d47fb3cc8109cbc35bb992e
+DIST clap_mangen-0.2.26.crate 15630 BLAKE2B 58af6b1b46c62cf86bc16720db67b195271adb6265f2d04a524bcdc2380e99162b09d1368d44cfe3ddc937f4682f7a910a8d04109a1d51f3371d743f083492b4 SHA512 1655a940575fb8df78595675a702f445ac72a68db1583988ce1e293c7c77c46e60a922ef93a1e545bf314b534bb0e49fc483f44d5e6d0a4cbc4d6481a7a0ac40
 DIST clap_mangen-0.2.9.crate 14623 BLAKE2B 6d944e42fd407e4b224d4ca8f0dbfb43d37d16f42d4d1451f38d503e6ce1edf6fe9fedd5cd07e761475e2864ee5cdb056d25727ba3429f7749aba4fa8d68c4f6 SHA512 5ac77494898b8069e1cfc911d4e88ac228aa95862e240ebe43413e2f293546009171d51da160ee60c99803487c33b7f3633c5e70af3352ab9a83d0edeabbbd5d
 DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
+DIST colorchoice-1.0.3.crate 7923 BLAKE2B 7055fe61677143f0d4445ed5f6be2cbc284c155aa6ceac04df6f3fa2563a225e440ba708bf40e298ad09775ab7c7e1842b5f6dd78422b06dbd1250908e3227ee SHA512 fc26696189d3935d5510a1237504339c1f354d03ffd3b4e830b7080335aa778bc72787ac5fa9a67a731b9bde2788da778d497f2ef97ec68bdec5145fedf4cd14
 DIST compare-0.1.0.crate 9291 BLAKE2B a181687c26ed0433afbbbcd6f6b3d5af43aa5ff5f2305d79b334bafe54732a4d17c82e8efaa19b346e01a3af33a20abc5f7375c52253b0e3b80317a7873234a4 SHA512 ea2747232b94e1233a3ae4f4c5c80ed5280457add6e213f278276912cef904b255c46a3c977f2b769536551a6f9c83eedab132576661cc55abfb9d1fddb25322
+DIST console-0.15.10.crate 36449 BLAKE2B d0d2f161ea045854f0f53af39490c37af170888241b2f63bb47749b288ac387e24e52f936651763a5584a20bcca3512b28d50cfc4435d97ff06cb5de20768e29 SHA512 2d4b99912215a1e7083ac4cdd594f6ef7914152c683f007babecde2be7f3d6c2a861a198c9b4306242d84722d44965185ba846041e2ef13ee9ee9a5d43c370d5
 DIST console-0.15.8.crate 36364 BLAKE2B 467de2c2fbfe31688cea20b338558ae9671e50ba1fd07983d21f32d7eacb73e565ebdd6ec5e78b2ae04446f09615c70983c0ee534e25ca5a28fd1b408acfdf34 SHA512 b05e49ed145785e29631d481885788f0cc5574d4d7c4d90280dfedaee7f8c1515072c9c4cfe6bd2e017230cd228157222af7e7d41a9fce697cd1888095df4de9
 DIST const-random-0.1.16.crate 6629 BLAKE2B a15c6883112b0c3f71b3fdd03c07f2bd9d97eba0d8da351ceb1f54c97d88756b26166ce9ad81b0f977c69a565debb94e59c5724671204ff2b6df3c8844f03fd4 SHA512 b5dbd240a917ddde4f7211fcbb78d672b08e3d2ae51f93a66dabb22c610ab4728daf381d947a9da5e62f11707225a0de4fa383e06612ba170d7a5a6e65012622
+DIST const-random-0.1.18.crate 6646 BLAKE2B 20e71fd7e2b0b9af663073a45d0224a4cf9a6a6bdab5c3565de88b4a66ff24a1b0f8c01bdbb86f5192b723c03030ae02fb86722be7cc41c3154cdc81f843f013 SHA512 e250227850001a3ac6abdda6e7bb88efeaec1504a54348a5ea71ff66c984455eb9181b2acfdc0b6c08ef6f51beb34b7ae7836e370d84d75731a2482226c5ed26
 DIST const-random-macro-0.1.16.crate 6657 BLAKE2B 44a3508e2158b79042cab698b1f31c50fa356098bb5f4537f82fe1b9e893d3e8eab59612a8957e524294ca0a035046468d799e4a0e9253c1464b68ef682f84e2 SHA512 8478bc65b0845e765a69e09fe4152e89f3e3970d2d92e4b32bb0abb7b918c725f325d4b19a45d2a462905bedf837b3a23f31b1ed9dc8655ca502de72616b074d
 DIST constant_time_eq-0.3.0.crate 11369 BLAKE2B a6fb4ad3146b26bb3e18458938e65133431df129963041465291b38a69ba2b53ffcc849f455e67a65a5291803591b350afe4ad4996f1c4cb76c18a987b5b3ee2 SHA512 77bf6817c521daa45c0df7721418b4aa367531adde46b1db97316d52ffb46fc4ee2d3e6f62ff91ca6292db5e1d3e040f0f5287c3936f12a595b2c8c5928bf5e6
+DIST constant_time_eq-0.3.1.crate 11561 BLAKE2B 9ac06a1b13da2aacfaa20d60e48df4f32f6462e4036fd9ec116c45a9bbe142a18b82cf18d762989876f31b745d98d52ce7e3d32f6c9700a500f16f00649b5699 SHA512 2b6b0d7572c02606b7c3780013fb1d1773b999a0d9934e4b140dd82f94e6c91d2ef82f6daaa1bda94f95bdf6b5997b2f0ea0c8eba8ca7e28a07d1e06b1071b50
 DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
+DIST core-foundation-sys-0.8.7.crate 37712 BLAKE2B 0e1dd99a5bbb0fe92f55181a37426f6e86445cb20e355f553b3162c88ccc075644461731a0cdcd93dcca65b6cef1de62b409afbd73ba3070a199ab8e7422dcfa SHA512 17492d5314db03abdb3b1998bf0c396ec8ed0f83bc978ae22d6026afdc86c50b58cbac073b3a0d97b92da7e98be11302faf1249d24313494bc058add4f4cb63a
 DIST coz-0.1.3.crate 21914 BLAKE2B 4c79083d5e699824015e71c8ceae0db119567f34969e644ed18249d7210c92ab503e0384a3b521aae7a5c469a26881840fa4b24c983d4139ac59178c4d8a28d5 SHA512 476b8627d9694813fed0ec262681e18f296977da8fc3ad9d749008e4406a77add8d3c2b15bb82a397d435d99bf8edbeec001a438d64d50038a0a47ac462230de
+DIST cpp-0.5.10.crate 6519 BLAKE2B 4fc434e0841e9e8cc485408a555bb65e16401d37fa5a7695678f834dbce2270d69614126605cd6b8df948c14e8abc4e335b6068a425b9fa8bbbc8cedc837509d SHA512 699e3919c87c94ee5366e8cd968ed4f934f9f6965b47835701fbc503a9b2ddbb7aa09e6051b4e3b2eec66f624447cc90e44f407c734ace46328293e130c60750
 DIST cpp-0.5.9.crate 6494 BLAKE2B a6568749614578a344fc2147d5ef3a469675d8b938018949bb36f901d162203030cf454e4ab5af360eab31aaef99a2b33adcfcddb933cbd0ef549d212c1fdbb5 SHA512 208283b3936be72b9b9dd1c2d7850b7234e00a3b69267c9eb8c71ea3046646d18f16343c4f76dfc02f59a5439c62cab1fd3eb5bc0ab240f2515e1df73509bdcb
+DIST cpp_build-0.5.10.crate 15883 BLAKE2B 440a0e441f35b3f03b060b5b504a6c6fde87bc022a97f8c9dc0213dc08980e1134ba81f0560d3fec13b6c61cf747d7d490c2157dd195dda12e1392592c50bf50 SHA512 d9a6d08a0f77763eebc463137abd81ba1528fc44580ec333d25df90ec4208733f80faac6a04465ff012e5f758d952bffe9066e82c0e8e90312606d503ad2da45
 DIST cpp_build-0.5.9.crate 15713 BLAKE2B ff7e7967ae09eece2708d22531701727048bdcb5ab64d022be7119d4eea67f3746ac89555edce2e825590e70593834089c6349e516d26b93c5d647554d775e56 SHA512 458829c61ce6de865f087b3737e5c3d52896a468e4cba571a08b611ffca997177807404cc16e8329cd71a32843254a3a11d24d7b94a8095deedcfd2183fb28b8
+DIST cpp_common-0.5.10.crate 4760 BLAKE2B 9c5c0f921092981ea323678ea5fbe0a8c65c163d5362c5e4ff4a26a72e0297f9d9f6024da5b6b1d318691aabf5d463bfa708a36f13880b4865a27ded34d7d195 SHA512 71081278c2a9de3044b5b780501a5e4fb48003a1575de23c95964f23ad041e5f3ab5dbc72e2409e47f40fcf986823b7ff364ddcca0b74a3000431e0a79b97e5d
 DIST cpp_common-0.5.9.crate 4725 BLAKE2B c366790121f185010d24dc2a862eb36ad5ca341f1eebc68841795e0896d42ab9e9d2964fd2fd6a291fb735fbd2b217061926092635983847a898bf6d7bb82517 SHA512 fa8843a70e29efc202b6d129c89f18877b859c0595ce0fb7b56c4bcc805cf7b6dd5d5b81a7a75fe8d98843d5276bb774c0454670c48bde56296c3dcde2355aa8
+DIST cpp_macros-0.5.10.crate 7149 BLAKE2B cc51980fc0f6214f94bc9a011df7ba8bece2380de74814163a746f2f8ca10cb142b2ce63913c3964f13954354ecafcf54f842055708b981966688e54f71c0d21 SHA512 773c802ae985c8b71ee87b084bd1009c1576db334ead1f018c0d7509760d7bdf410c818430e8cd8cf20a00ba825ae882f3345aed9af71698cc33f9b73da15631
 DIST cpp_macros-0.5.9.crate 7103 BLAKE2B e7a3502b04d226eb15098d592c120bea080dd41e4a91ddfaafac8490026982edfb801beaa022c922ea19c59f3062084c26705399568a1675165d6d84a839304d SHA512 11621aa045c7cfd62bd1e07cb3b61d2518619716b5bbeb7944c2b032e85d4e10d8762cee2bf6f63904dcbd904d59c081c13910e63835a8aad4eb21bc645c278e
+DIST cpufeatures-0.2.16.crate 13405 BLAKE2B 06d061cb2577057bd2afbc8cd6783488595701dbc46772533645d86aed71ba8b20905625b897840c90aaebb41360a286935824ca49bdebc0763a81df4bd64402 SHA512 97707ae1b533ecd3a6fe412a22fb70cf4ac278c2d7dba407fa7dbebd110d06f88a7b3aee3fb7cf4b0b5ca88f6fecf390c4d3e5ccbd4d18a75fc2f93a647e7074
 DIST cpufeatures-0.2.5.crate 11251 BLAKE2B 2724be40d3bc0e2fda957f645e1cd6472450dee68db3592ab607bdac444283f571f3c904e47981a3fdaa06cab4032734a54470e3dd6e1b67fd856daf010e1277 SHA512 d02327a27ca9fc3c587dcbd10da6b1370671cd7b1df8dfc9078b47180744d0572ef41a7ec205ae9f1c571e5b7f4bc81278ab4c6b076c6ccac0167100e346e74e
 DIST crc32fast-1.4.0.crate 38665 BLAKE2B 77398dedfa5e61357fb9abe3415ee53e45d3f1f7aaee959cbc9774f31a10ed324da2a558d20fd7c0674d450c8985b1e9c78b0b65e6ae2d9da6c873fe631c5ce7 SHA512 3e0bf1d2411ad9c651e0242c574cfda09403db24ab4b55560145ee73b31b08be45e5e12ce2db991d165ff056c7f2f67203fb2c048651f1c66ce90ec3276c455e
+DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd SHA512 c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266
 DIST crossbeam-channel-0.5.10.crate 90442 BLAKE2B f3117110f7c558d2263f0c8522f98a9f38e04d3ce43b4e0fa67f33f23c5c5be6680d177884131dfa75f50cab50b3607be1f09a10126fb960b8a2e04161178292 SHA512 afd65fda772f9f225e1b372d27fd90f991097c57ac9b2747a40702e50791c6d702d1342088c99c2243873cbe6126f7c4e8df8f41b00bf4db3dbccfae1ae0063e
 DIST crossbeam-deque-0.8.4.crate 21752 BLAKE2B 1813e2c0916ac990c5ce54aadd13f309dc4d2cb651995261cf591900a5c820712de7dd730116e8b4cf78bcef19626889fc0658d7f1020cb2c1d7fab41718a31a SHA512 cc036613727a3aa8933bec419ba8a5fd2f506770ad2cf874ff757b048e0d29ea3f1b0e2b72d2d5352ed4b62c6764c7bbb10d0d4e217176da26bf5ae4bca0b68b
+DIST crossbeam-deque-0.8.6.crate 22471 BLAKE2B 02b854df171b0430ca8a40349674ff251698d0c322c317055da8678da6661730c945d86737fa4947c3bd824ffe402271ee2f77fd6a505d2d46b4a41454c510c8 SHA512 9368c0c224c4b84356f1d422d8869a5ab4bfb36b0ff69244a9e7a7304ed51f034001cd9b2bc35849df874d36ed34285c66574943573522ea32bbdc5a05df6989
 DIST crossbeam-epoch-0.9.17.crate 46953 BLAKE2B c5da55d852c649da0275bb3eac67b9dca663b8b1291c60c55b5af226c170cd7f622665719bbe62ccbb8a63804955ca27557b26e129dd81593a560216949f4acd SHA512 9bdeb0415ea26250547ed9f34a8dd4c17f9379e3c56f8f17315e48f9bf63ce1b79c37786ead0f4df026e31b0b5965d181c36839d891c14149529ac42b5cedea4
+DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2
 DIST crossbeam-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9
+DIST crossbeam-utils-0.8.21.crate 42691 BLAKE2B cd9015c41f532eb3c90101603f32d383f01e6880718b727d6d1fe46872ae276cda685e1b548cf77dd22bb1a05f0d4c4982332c2bde90e1743dbd7f51919022a7 SHA512 6f4aa7ca10c20da291c4714b56ceb1fab1c06b03b2f4e28e474e9aeb95ab6615a25462dc7819713652c3b5f6a06fa0f24ebc92c533fcf35dfcf2655857d975f8
 DIST crossterm-0.27.0.crate 125311 BLAKE2B 93724dddcfcce9249db721213985fbd9b30eeabf0e8c1c8626744eae3a15f181cc2bb871a77fdefdb2b1a7139453b1c81081c6d82a62233f3574ccadcef18686 SHA512 b7b2b7d8affd845902e0dfa06edbcba9c7794e0839895998f39ea1b118de5251fb87c6b5de27e85c490a436b04943ff51d609cecb780674c3768c12ec401d2eb
+DIST crossterm-0.28.1.crate 132275 BLAKE2B 30a5bf5b48a4bddbfb53726b675adfdf6d64cc387e027a69d6ab721f5ebe574abed3a862504f0db723a733662fbf0ed13163730a7ab49ac9c7fc05681a3545dd SHA512 0d53e328eb606cabc3e309cc6193b34a14c8746081a7b2c9645c1c03d66dbcda99656d629c0dcfcd43bada7a863df3e83fded6b642b2474035165ed7b16f7931
 DIST crossterm_winapi-0.9.1.crate 16027 BLAKE2B ea63abf751aeab203f326e77260cfbd1de286be26acf714a083ae1262b0cc2a35b5cb6d0bd54f45b33c1942eb22f916141c5870aab34149fdb30faccf4d4642e SHA512 48eee242f477f43b69c00e3a5d4d255de2ce1774f6e73d869c5472b35d85af0b63f3a607097da8ace437b1e52a524ded4106767b83d4ec53c30c2e37ac4b46a7
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
-DIST ctrlc-3.4.4.crate 14660 BLAKE2B fe7c2ca8352dbe40e60ad2c63654beafd9ad3f62483b23b3c614a22dacc8ce0edd2b94e9ec3a2472c581f6a1b8befe0952df092b4c7d34ad92414190e285e51b SHA512 c09c5bb87e4116e4f2604023d9a94afb9985678a4d02aac17baf5b5d13d0ac7321e07dd7b20ed620af9670926acdb6b78be37a56c8be171c21975d34ebf0196c
 DIST ctrlc-3.4.5.crate 14592 BLAKE2B 189b026f4061b68848851dc694c71c6ecf87d6c6cdb4518a3aa215ac3d77739db43aa68e3c628e51dad99d7ad089ae6c66a6d03bd912ab9748a0793d09c2333b SHA512 3fca36deead46f3ca586f0a07ace804251d3c3e49a9a63e8c34546e2305d08158770304ebd0c9ad6ed499f811cbbee0b76ffee1858aae60852a61a19024db3e6
 DIST data-encoding-2.6.0.crate 20769 BLAKE2B 9d5713e63f6f6a4d6e5324fb0be9308a231ccefa20d69cda9e19609a2250e2cd72030ec28309068f71c932327a3ef680b749125658e27d35273354c3465f9931 SHA512 a685c7bbd251a5738b27ac3ac8121a0db049221510c99e0ada6f245ed7499d04ec29d725ad01c688ad283e3d2d5aae0751685c804f6d95cae84e63a160d04c9c
+DIST data-encoding-2.7.0.crate 21086 BLAKE2B 7b2474de9fbce91c1c04490169491cb8debfe5c443df18b407669b0ebe2def915672c697ee9803088981eb224fde3cb1a4d8d696862f3e5a7b58ecf2060b3fd4 SHA512 4ea0901ba3b1b37006ff413b743ba56bbe73edcc0b8735ee14a7bb3e71b3f9bc42c473d17284d1efcd358264dd0518ad63926f6bf43a38e1a30ce1306ba80a8d
 DIST data-encoding-macro-0.1.15.crate 3783 BLAKE2B 33246085b9c11c92920591103f7a72cc42f721b6d3464dace65f1628a26222ba1008ca4f1479d0095e803003b6db87a139e9d0e1e201a6623d00f5fb012f20d3 SHA512 5ace72b564c1c8bd471d1c0179101bdaacd1039489a9846780c79ac91afcaa0a8332d02bcf9c675bd2e9b173dcdbb1f4829d5d836bf4a57313ddc2c14a707a62
+DIST data-encoding-macro-0.1.16.crate 4353 BLAKE2B 93b22fdb397e40cd1607acc91af1efee44d1ab7d8313492f7fa00a477d9a830e1ee593af314d5e2f30220707e406d64c3f4f474fc88981dc86d66acc7848016b SHA512 bf9873774985025ccb7527592ba67c59ba34ca4393e82d1b4e93c1a4040501093e330d9e44fd89e24342b7fd366c96b55bb981d509fa32071000c8559b02d221
 DIST data-encoding-macro-internal-0.1.13.crate 3185 BLAKE2B 142d99c01e39326f9f5729ebc8a6df450de0cb0d1acc829d453ff1fac31feb6ac3a8a5a3a3820444e9661658360d64aec895fd30ef3b4a93860d4574aea057e1 SHA512 81f844fc89da1a95ec6dea35cd89c5a6ed9de53c5e2c447f2b96a4527045bb619f321cc09debcc2add4c1a0f2ce9005278ac97e839e85328dcc29cd04e962eca
+DIST data-encoding-macro-internal-0.1.14.crate 3705 BLAKE2B a6ec78b29e4cff465a0ca93ae8e4250dcf1df444c31519ac743d5930aa0e6b023f587ddfb0cadb9832faefbf73aaf7289159d309bb3cf8e3afc2a7c41d8e80df SHA512 17b8c9530a0cf095365c782b4abdb961ee17bc91ab27121251ad6d349eab37eaf4d6643b8c25e57c379cb0456d2e7cce2565384e2f3c08bf24e64754038f7abb
 DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43
 DIST derive_arbitrary-1.3.2.crate 10614 BLAKE2B df96dfb9000a794e3ee6e633ab527621d321db8006221b482e944d58d4293c3f87f6808af4784c53c06b28f3078ec9be6860e3496d6af044ad6d71db35310dae SHA512 5ff36cdb5fdbc1120442571b21405bca9dc3e7a0c0d6f0b4996fc71be0553e1a8cbf2626457c55198ecd9c66d18dda66909823e7c6f1f16151b5d05e1c69d201
+DIST derive_arbitrary-1.4.1.crate 11521 BLAKE2B 47ab73cc942314a65574d2ef8395dda33361fcd1e33ccdf37843a92b0a5de62540277e6791991ae54835ba4235a9fa504cc8f6d43cbfde20f18f14b70f84defd SHA512 0d499a368f9f97b0a1a52f17fd111109b071c25c2732c206c96485a7a753520ad706320e5a817e1a10e5f8cf154afc6afe0ce09f9187d23b4e2c2ed4961afeb8
 DIST diff-0.1.13.crate 46216 BLAKE2B 27ceeafb7afd45eabbbe22d1f05667f513a6062762e6b77122e267282a8f2a0bf96384989508bf10c9e13af4856bc9f58f09b10055d6fc2c32681e288ffa9f9e SHA512 45e259c9fe7c23bd9e9454891b42d4aef6d681d35ee039d21fdb05ae9ed5856161a40f29889e7880ac2a2daf85f1b7d752d213b4a99a1a74ed2682c18a3ae7fb
 DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c
 DIST displaydoc-0.2.4.crate 23200 BLAKE2B 91b0ae7018109d407095060b6bbd6aed1cc21120bc30348e8b16b5121f7c35ab72b65e80bf97dbea6cb4ee6b4d5215e8e5c4374f92a569697bc9c862348620cd SHA512 a1de2c200584bfac640f8b84b5103d8687919cd29f59a14898e98d480f476a8e4dc06e3b929af479d536cd02186e2a9be72e6414338bc117b97bc0d160029592
+DIST displaydoc-0.2.5.crate 24219 BLAKE2B ba3396c93d27a99a92ff4a0f01a8d192b419bad25e48d9427b76260ebf2f9982291d77f2eb24d239c0b1fbb097e866a20bc46dc1879fdfc6637ea49928444a92 SHA512 5ca35fa59f263162389c1180331e9df607d9374bcb056cb04bc46c98e4d87277162ddb2335ffa8a8c5f69218abc3eabccdcaa71c21b8dd9081cc4146f266b948
 DIST dlv-list-0.5.0.crate 22112 BLAKE2B ed6ba7f0621dea6bad42a96423c147e55d6b120bedf7b1f8eee9f1101e38bc44f5e030c67df29d281829a9951233c0a8138906dd59c454caa44aeca443f08758 SHA512 4acfd27f975f314edb8e520fdd36c45f9dce60db7d0f1a8b483689ce01e099663fb5608a0463b0c4c3453d493787ba4167b21fab50eadceb90bbe202396ef2a6
+DIST dlv-list-0.5.2.crate 22373 BLAKE2B 9edcbd42af8665750bf633dfea9543db4e5f37208523ee05300a599d7107a57e35e9eee2c60ab9cc1c5dc5d7408187dbf846fb0019a1e7ea7de905e08f018453 SHA512 f2fe69a3a5d319ea963c53e6a410f3a5553d6f6b5708e6318b450ae3b5319a19f9d492bcddd233d7a5a65355ca378bc41232c335deb9c4987dd9350a37afbca3
 DIST dns-lookup-2.0.4.crate 13733 BLAKE2B c28840a97de70192d337d078d0e04db5da0b0c01781bc245036dbd2931092c3e381a3792086fc0e84c6a1a0f92d0adf0366f41d4f48479a331a6de1e69af267c SHA512 4b2be29b927a8bc83e983b7caf24f3391dd1046b1d6b255e11edcc69338cec9d04fe5935bd01bed30fe2b551ed7f93585e92fac066e67479fe597acc6bdd87eb
-DIST dunce-1.0.4.crate 8034 BLAKE2B e1e7ffbcf1e3632036c03303ab46fc37b2b0a991598790b2dc65d7a61341a78bf555230ccded8fbb87d6288282af3ed2a8641212a0f1fab929bf99298e878b6b SHA512 f57d9c53c177bac8e10a4b56ae421c604085aef0f264b8d6871abb7e1ff713b55f396c5c5f24422763319c504c6ea6a774416af1c2ba23ba7b67b2282f6731f8
 DIST dunce-1.0.5.crate 8244 BLAKE2B 1499ae0bb3d34e8d42e97eaf551308efc95697366b804dc83c51171a939d45bad46fce9f82a39e17b6b92fc833aecc85eabd2104823c7db30396833388125728 SHA512 36d7d75217d629185a9a9187f7d2e2dc346a28be0ad1c21b1b6bcbe3991e9cd11797e53d745c0b3b5ae94cf1e4cf141cdb2322bab86d97cc258b4145e3b97a56
+DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
 DIST either-1.8.0.crate 15992 BLAKE2B 5b9254d54ced1f23447cc78fca74f12085c37e3c2da441b30521819025ebb808e8cbd9cbcec811f8b3951030914c1736b8bda61744d1323af8c5b8b0a3ef3ee9 SHA512 5089b218af067b51ee39c085568a1a6f542e8f68b362207bd7126cbcd2b76783cd21cc1517a1d088ce4dad1714be03a3660f50e9498a0bb43a8676cd7ec490d2
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
-DIST env_logger-0.8.4.crate 33342 BLAKE2B b1bb359be2f34ca6f93f72154c86920b8254f574b48f693b2ae7296cd1ff25d34dea61e95fb2954569fdebb6c522c851ef7499c107005528aa2226df13b0de33 SHA512 9e4478ff609a2e1e1a902a55b221af43a52622fdb5668dc33fb0be354b964708b7b6d13b7f1ef11982f45fa7e71f0712a2ab3fd4ea98155a5115e5a7c3d33049
+DIST encode_unicode-1.0.0.crate 56986 BLAKE2B 76e8915408c26bdc909e9ff2d59a1655344dcb4ca0e6accaf038434b7518f1b86554954fda8c7874285924c7d16cc81f62e68afcb8b0efc639407b558df1470b SHA512 c9a21d48ba9d50750789cb6fbe32afd903c583c9ef05a9741007dcdf64b1344735f71dd882ad71ab9e5f96f8839578ca53bca14d13d57b9e27b8cce2cd507359
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
+DIST errno-0.3.10.crate 11824 BLAKE2B f9976b538868daba3cd2d47ff2fdcda16b4a436ca767f865f23d1139e7f232aba263dd4aa38d573442c762999c8a8beab8a4a8c10649d21b49090fa65ced1ec7 SHA512 fa4b9a368f254cd90c6f69f6883af4c579829a6da6f31481a1b527ac9602c8ffcb5e9518cdc32c39b5589c151a20e75a7300c8a907d178346185ecc6e8749f3f
 DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
 DIST exacl-0.12.0.crate 64506 BLAKE2B 89471ef3fd6b675ad5cf0f7ecdcdad41a852828fd4fb8f0f96ca0870013222045d7e1f627c365fb8b5a0a8c617a15d045972bae5f87b99258c28a25d13b76846 SHA512 d0eed224863b6d5216d8974bf83ad794123650808ec042d63db138cb252caf408e127fc5707fbeef181cdf50fba0c2a27ce49fa2dfd630da822e4bdee0f130dc
-DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9
 DIST fastrand-2.1.1.crate 14983 BLAKE2B a4535b1612b103376fe64d71a393f7bfc37668c574d9122ca90a631aeb91cf0895bb030e597b79a80a4a37ea4d514c4c0836332030bb10a60bd971573a6d6ee0 SHA512 9a51185132c1c89fc31af463c664e996f431e607ce96676b8301f28ff11a99661d18025dd460e3332e373af68d20017d96481719746fc3c5de742d08d63aba3e
+DIST fastrand-2.3.0.crate 15076 BLAKE2B 15c9a1c4f64d94c4bfd38ae139c6fe19b6b621a495c1b57209edd6d76d978eaf018ba77f356b5086c3f462a6de044fb5e3b172fc288309569911a17ec39951bc SHA512 267fecbb7459c8840f03425733d278dd6c4e7637b85b99552877117ed5e8015e094d86aa95841f77064136b7f382276c3cb2c2bef7b2881d272f4aa57c5cf947
 DIST file_diff-1.0.0.crate 282318 BLAKE2B 628bbbd75e7a8f192e54f75e3898b2c128f23c0111299fe54676f00ebfe532794f4b7fa28b27df3f94d96c8e4405fb9d2dd73e3459dbb888a38a4e99c6383389 SHA512 260313bcf0860e63d9f78523d81416fbc360a33c7c1740306d9d5b8aa1640e509b7330313c38105cd662881a47c46f89193e473f0b7da12d3848ed59d84e9905
 DIST filedescriptor-0.8.2.crate 10830 BLAKE2B 964470acbd1f36487755a74666a46649d6012c0782b3622652bd41b086e5d804298d6126c980ecce5a2ce91994d3a006288739b472ecc518099d4e690c89f402 SHA512 dd808b8f26bff4d8b37826241f30c9396bb0f731a0fc3ef53ecb3bd0c0fb7adec6bfe5ff6ecebb6e02c9de6fc5f2f6c0fc361e9c6ba564708dd1c29ab2662f65
-DIST filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3
 DIST filetime-0.2.25.crate 14940 BLAKE2B 1ffcbad3b2023ba5e9b2d71e279fd8c3564458b28290f3e19bf43b87083e1e3c0e18f191f6dc67540baccb83075df453950230089f243e6276e413321cceedc7 SHA512 90b4f3c4df29a3456c393f78f636d70f2615cba748a972dc9b937c2fcbbf4544f5b0d28c6c8fcfed5d5eda026ac670afffec18ab7d7127cee9afa2717146ccf2
 DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284
+DIST flate2-1.0.35.crate 109188 BLAKE2B 8bd6e51c3bcc06044e5b8d7ead950c3beab6c6337052fd48e86175f0fc98c8d12804274308ee515dc6156bbedb2277dfa2706cdcd7baaf2a789122473248486e SHA512 aa2c4f0ad46cfbc7d2bfbdffd226eaa37f5223a34d132d8fb2dfd04c20d15a96c4882cc377fd72afbc7d13e512f5e9934386b0390a0ab2b171d081335c58fad4
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST foldhash-0.1.4.crate 13764 BLAKE2B 7dde82c52671b93d91b2ec9984c0ce539d89d5c80cb115c0db18cf72f84f4fbbe4f7b36b745143102fc83c307df2cae051e4fb461a3131f52c8f98172fc0e72b SHA512 096efd30917c42e75e162a79d5c0ef068af76c7b6206cef880c4a3af92d096b4b4a1cd3de5b66ddb040730d58678c9a651734517dc8a60a265ebddd5559b95c1
 DIST fs_extra-1.3.0.crate 31298 BLAKE2B 96dfb4e886767d3d3850d94cc789867c3ed461feb9da0ba90c600b2b41c3119067953ba795cea5e6c8c338adb6fe6426769a6e6894ea3e02eb1ab11794eb8d5f SHA512 090d2ace0517b86dd2f54c5491366cbb6e1677f64cf64f024f7dc6a3c42c4f8c54b215e954572e2df10ae7f0e956890ecf7ccbeebf66b645c7647409484c845d
 DIST fsevent-sys-4.1.0.crate 4620 BLAKE2B c203c774d5038d4c4abdd7bb9407a6b5f2b203a609bd92a7fde38afaa71248f4610e89c73eaf982a5d76560f9503081b7b10573046b1a91f09de4b642709417a SHA512 e702686629557b879efaccd37b03a7ec515eeea29d8f8ba46f82b8b68ad157ef9d6b188be031f806d8fd27d4e9d2689cdd6bfa14e4ff77493a7d0be3ef1238a7
 DIST fts-sys-0.2.11.crate 4419 BLAKE2B e0bb7cc3731cce670e81b13fa9bfb1cb019b4d74f8210adf63608b5eff9d7da8273c88e0d4f483733bbeb4db500e6350f5ad847ec5035398df4b78c6f72fd8d4 SHA512 0310d566895146acf836ba6771a296ccfaa216819bfbb603b9494da22efe616c7d55d274cccaa288e56c549fcad79c5642efa8f7b2479142f372ff04ef19a059
-DIST fts-sys-0.2.9.crate 3941 BLAKE2B a499020507ba19604b2b95ca3da4d9cba173c610fdb6f792d417bb237b3ba8a9901cd223cbcf012f155b9afe30a87e91c25a4006a351de24ade4729f429c06f2 SHA512 ff0392ee06d425bd7865da43b4a44f48b61e8b1023a62c897752afe4641499f447afaea72b40d8308aae342bd727c6805b901ccf2f9ae4b3d25d0299e0272307
-DIST fundu-2.0.0.crate 60486 BLAKE2B 657a1b082c78d8eb2888918c4678452c4e4d006a70149a6c15852387aff87456b2c37daf4d36fcb82af1bb86c4c6b73dbae1ee9529dc60c933d717503464b53c SHA512 2a0f530d21acb0f39ad01c664e090778c915e8779d5e91e258b4a673183d1777b5ee3a770b78e239c82188c5c0a09ca51efec53b0c20788ade5aa23a0e2a73c1
+DIST fts-sys-0.2.13.crate 4758 BLAKE2B fed12597d16cfb487133203bc7c7728e8eb6133864b71b55e968ff930ee70eae9edf728406f7fc6caeae64adaf7374d010bf70a357dadba81f7e7df847ea6b3f SHA512 db433284767eeaa41daf055a1f161cfa621ef8ad7b8e751cea9686f8252158f3861193619e82fc5a1e1bd7408dabef84de014c5b8dd986d1b9e80bf7577d46fd
 DIST fundu-2.0.1.crate 60498 BLAKE2B e8061a0fdc5ee015e2096525d33daf04a7d2380c3070b22b003fb7bba25fee2f46685d5c32628bdddd86c8f40eaabb910ca27f1fbe28e220228a8000a13b983d SHA512 327df4dc5dc2ee3571ec6ee9259c73d2bd17cfac491322109c24bbe949179c3eaac8e7da45d30b5638b48b377ded34db8c89dc972ddb281fdb159163f71f47ce
-DIST fundu-core-0.3.0.crate 37430 BLAKE2B 8f473be40b2a0af15b854a9e8069ad3b6955b1b1b926adccac498fa06cf7677efc42ed31520a452ed05ed4dbe641de0ccc6d36454321bf6bc83243d2460633e4 SHA512 4a9a264fa98ad3ae1dade4da636fd38feedbdf9cf47cb213b324a0bd9be7521353d0915f5dcdf6b6b1a5fba0a09b237a88fd106c104406ed04ea398676c43fb6
 DIST fundu-core-0.3.1.crate 36671 BLAKE2B 1a4e5e1867c7bdeead0ca211188f229daff742b666c71a064b52ca093e8987e655292040becf6eb681b92f32d1f487b6f4f06c2d8b4216507875baf72155a051 SHA512 d8d43870e89e246c9af680b7bb066be7ed15d3ef2f87ba32999ec40ffdfe1d2ae37e2252457a7511a495469fb3a3241bcbe05bc6f3e7deb66deb5c373485a82b
 DIST funty-2.0.0.crate 13160 BLAKE2B db6315d63fffe9f70698da0b1b0e4aea4b509242c60e6639f00303dad8d2ba60c6c1c04fe9289695b7aa2d7a0c90c31fba72656afa7ad111b77358772b14a9f5 SHA512 691e1c275b648110ef42c4adece8178cf037bad40d469780280eb2ebe07aa4b0406737c5ba02c9f9f63ee57a99fec27e5e51712e2113655f7522c8678f689155
-DIST futures-0.3.28.crate 53229 BLAKE2B fa4420594a8e261d2622715e5e40123d401b0a549b8eea9f72efe177c606b1fdb3743717a4826bc82479c1700e90a1b3bb3d0955d75e7eda84adbeabe0dddf89 SHA512 271c83c157de76b1c58db49d6f7aa0591c665551e60dbb260c3ad292a48138979b06e76b99a78cb4f3ea57cff3ec5884839cf6a0b807fa212d54ac28799c5e6d
 DIST futures-0.3.30.crate 53828 BLAKE2B 4e595639500f7147ceb994359ef1656ed096ea679409a5721c05ff84ba439fe4e82563a7cf8dca9aed4cd16b03e89ba1385b0a34feed9d4923871225e131b91e SHA512 98fc67bf1047609c8bb0763c00ab9cb39b6a6d0cb7d993bce4966ddc2492a6578b789e98095981b207ddd73ac4b1dfcd5224b352a0e970eed347537c6fbea43e
-DIST futures-channel-0.3.28.crate 32281 BLAKE2B 128709ed9c3f275ee9365135426b626dab7d34a706cb9435a6ee45e2a28f7d2e6702b7bcd8b0788f7171ccc75917f287834a18c8af58b73ec07f46425aecdd97 SHA512 21bcae42859687538a3bbd4a4328b1a176bf8eec3b03f9d341f8ec08e796ada1638c0c3011246995d742e392a3ecf4446ccd2e92ea5426fe658c5f5ad8303b99
 DIST futures-channel-0.3.31.crate 31971 BLAKE2B 2a59ebb73f998ec307bef01e997bf2922556d6dea10e2e6e8da9e1b4cd05a8bcfeef01bc1cc57d79c39bbd98b8a0d26871dca5c7641a9d4e9c2bacbb3feb4eeb SHA512 87e49e661cb12c1e03a07d3c94ca9bf5954344a51fa11639a118f5a49877c883387343af54639ad80e7196062a77fa7c9b9aff9804fb1e6ea3d0eb09efc53c69
-DIST futures-core-0.3.28.crate 14780 BLAKE2B 551327876d54a6ccd97382679d61afb3e344f7c8e26813ac85779a57850cbb1f54041c82d71a7bfe4a30d1c8d9aeb560d8d4bf5babe7010fb7cf3c36c8ebf3cf SHA512 a21900a68f1a9232c245b160e95896b109315f10719147b4f104e11edb5b59c862555e07aee37a7d4fbedf0f09a02d4ed329f92fa1ad4679db1d7c78ae2865e0
 DIST futures-core-0.3.31.crate 14318 BLAKE2B 613d16e4f18547e45ed0dd56a7b908306393e479c379ff64f358844eacb1f8d37008ffbbfe6b1a4ed184e501ee9214db149d9cca31651b7d353ab4a99c8f5ee1 SHA512 d2f4c2476c4f480f724a880ee16566fcdd545579d3cacd2f16745812eed9ac4a7a88d59d4a38b163ef466c6f6b612b9cb06308a09d52256506a8a90e358db935
-DIST futures-executor-0.3.28.crate 17743 BLAKE2B b192025f0838c924783090e7b0bd7806edae0502172e5f961d4cab5a4a5c074050ab6a707a50baa0ac2f505deb1e3ace4259349570beab0bff34b7bf6849e9ef SHA512 1404717a512f1968e3ac6c53bb6c428fa049b0f6c61565ddc4859407cf16c56735cddf7a2931b2816c6c8dc8809f76e7f98ff05d4f80e4567488c2aa7b424a50
 DIST futures-executor-0.3.30.crate 17744 BLAKE2B 927abec40eab31251409149179baa95a8d025f9cdb848afa83f95439c4768abbf6da8e2163291a086ea0b83b0b650d1e19cb8e15f70369b70efdc70eb3121f6b SHA512 fa65c038e5eeee695b2673cd65cf7529713bef47da373290595b554bc287267ee5cd015ddeda5a22169cc8828717987364584a91a69685cdbfc0fc779abd764f
-DIST futures-io-0.3.28.crate 8910 BLAKE2B 5554e9dd8548be47e7195ae8b223288cc2e765dc9feb703092972ec9e19ade825bc9d7093625a77c7dd2213df59e2c70ada84a84446b5a940c3e62daeb9dd57d SHA512 805177f2677a09d94ce5f010af9244e0e0dc285937e355a836179297c4c912a762f8d96bce57af388502810dcb67a772b7a522f5c6b21be3aa4b7ee46372d402
 DIST futures-io-0.3.31.crate 9047 BLAKE2B 667e62b50be304b68b8437d93b734a0e2433d88a3b410010ed0b04eb2bbfbc9984454c3f0a591f720c9983582c6421d7f870f0733c31337c4c518112f52aea54 SHA512 16d21388f7ca083d2c618ec140cb2c0807ca621b8c338698c367d862b99133ec9edda828f051f3f666472c929e7bf7a5cb334fcf167109c7c392c5cc60b54fdf
-DIST futures-macro-0.3.28.crate 11272 BLAKE2B 3f6bd63f402ab3348e1eae96897b4c18aad01b99a1f9ff555496fc6f3114cfb3334b1949604c21af251fdc4923c09e4412f40031ed92646a06ee05f6bee9a0d9 SHA512 accbe4f434b3704fea440e1fa7492c438068ac89798e3b2c85a2b251c55663ef2c65480f6da0884c8e80a9c5f5203aa6ae623059235f4a480a54d91bc5e9426a
 DIST futures-macro-0.3.31.crate 11341 BLAKE2B d91ace97b854cbfeba1df90468fabf6313721ef72bb408ca6bee1c110b0162fe91da18d371b628513644f9d3956540d93c3e13bc9917550338f797967acc3967 SHA512 26c45dd8c037831ce3c41a326ddfd581784c2e7aa2805ca4d93b91e439f4d8c078293cd328bcd66d0283cbd5a14724bc624ec607c343d15193b00bd644b86166
-DIST futures-sink-0.3.28.crate 7852 BLAKE2B 752286cb15ff37e9bf4c6cc80c8ebfeb229dbaa4e8aea6fa505f1e145e5dec99c4818c8e7ba2bd8a03898350e05bc124a5ad83e28989e282dbc132ed13e7fbf3 SHA512 e3535aaffa42215448d78adcba72f1dc3131598169dbcc8b52b82fe3e74f4b0d5631ab3dd3ac5d4315be890b94d6fd8f53de274ee4815f9abb27d40982c96c07
 DIST futures-sink-0.3.31.crate 7958 BLAKE2B 7d42180cfe19ae42e2ff486d83ed46f3aaa4b333256d4c30c5a2ce0e0d0b05ae93516b029e6d07105b4296bf23ba29e6fcce19f0e38ecf59b53c6ec9cfe2e188 SHA512 79a57dbee5cfe98f2c003bd463d252648743f70d13e2054af072978b758c7cb8e5fb652fd2f36c760df358ad23d2893cef24ca6ae3df44def28f1d39bcf348a9
-DIST futures-task-0.3.28.crate 11848 BLAKE2B 79cd7b01d24a5274b0e564edf0f5d041414d9dee02c503f2303958e679db0db3c652c64352052d20bbad7bace078b553f77920e2ae21a948a1c884eeecc663ab SHA512 198f3efa51b1a8492a4151a6e4ef6e7abd09f2f537f5ffc2b8f2cf739718fb9714718226ee1cde7a58d41a2e623445ae64013f02e7f00489320c06292465fa82
 DIST futures-task-0.3.31.crate 11217 BLAKE2B 8c0e0aa0aa14bfc28e668af00a3fcc2532950ca865a9f3935717a4a3770cb60477cd8f4cd080675379315b649fbdc5fee9dce49502f0f24f44db481a24c884bf SHA512 4872fd2f24b07c626efc6fd76c01b44d56efecb9697f972d0877307b38d3ccb06277ff029df38981470ba1f8ac5f93086123ab3af44d3c49bd9c10b6c9158a81
-DIST futures-timer-3.0.2.crate 19879 BLAKE2B 4e25777e567f390799b4b01186d59977f1591f9f8425b6951679226375cf90764bc157dd2271614f16b7b13d3aea67509da0355f3c4de3d323b1bdc668bc7525 SHA512 47cc68f9f134e557d66a003d942d8a4201b1db56f1ed2ae276a2fe6f56b24c06ccd108d9852f9fd9db7d254bf8aefafa56cc0410bea41c3805d7e4bc3dc4d73c
 DIST futures-timer-3.0.3.crate 19739 BLAKE2B b7af71c761197056a6a4db03caa30f31c104de0049c09f52b18b80718ad20c95e0e64bc7a3618c29d1c9a5ef0309379044fdd9c1fee8465930d28b2c58927733 SHA512 c50388e38b45dce2a65a8d7ce56bcd9c3544ae677158c4c10c532136e861c16f0f52df5222a14c0f40ad8e4faf93fde8223affa7fd84d24e95aa6994177e7e76
-DIST futures-util-0.3.28.crate 158510 BLAKE2B 0721356a4947b39cd066dc8a88afa7686b832be269295af3ebff8cd74b42dffe5484399f66e3e11e2b54c2b8e04ee002a9d507eeb5259fbdc00b226e0f94b175 SHA512 0c7dd3701b7ab0a443a56aa64e6d9b6ba7bb9ccba4c05dfe17608df3e2bed1c2fa460a0cb4abb9fb25289d3a776128ffcc4fced75ca73a65d40b18ee2e9a46e4
 DIST futures-util-0.3.31.crate 162124 BLAKE2B 69ca647a261fe24f90a4221d8629169a8dc7eff9dd1c4e07cc700a52a8609ce9b8aa3974b9b09e1ee64d0121d7bcb3efeee6fc15983347aaa0b0b23b068afc34 SHA512 429b1de584546b931b17d475aacbdb0c14824a57d960c44e615aa808e8c0f9c126473e313a7150b3de87ea91b7eebebb1041509f61b3493fee8a9cd2c75c4df3
 DIST gcd-2.3.0.crate 8934 BLAKE2B 7abecae633692861373a962262f8047893508706d8d7e7b9f7c1454b7c17cdfea9f039e52811d56e21de25a593d4a9607ccee9725578fa0c6ae22c4604904d97 SHA512 703bbaeb5ca76efb6f3fa3329566df34924850a3aa21e6cc38fa6f99e2cffcb12e1214d7f23cf5341de9d0edc3528504226a175385308d5a04cf765e98399613
 DIST generic-array-0.14.6.crate 15889 BLAKE2B 7beac5446f5da4d077598af43c238eb7e71a12b0b91e6be5dbfc1ca33dc21d128fc93c9c8b18caac4b88830c8c8a643f2033acaca1d9a9f3d95329d042276156 SHA512 254e6fb6658f083f26e022916795c9ebfac241b9df2d811aac8316b17e1375e1c5aa54d72f1bf6c2627a88484a7df4b14eca231c90578e9aa3d9997047fa0f20
+DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d
+DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb
 DIST getrandom-0.2.9.crate 34457 BLAKE2B ccf7232ece1047000140ed6bb9a1afa784be87b5cf83e2f58dff77abcd79e34120b45336cb05e47fbfde36407957fe9da8b04971092ec05f67b321fde9142d29 SHA512 48e341125223945d1c02c4dfc54df303ae27d3ceca0d5a30b42065f5e40da600cb2010bb59e88af6b990d54b5eb4bf83ae5bbd27e13e56363f5f68be03ea9082
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
+DIST glob-0.3.2.crate 22359 BLAKE2B 564b72e2738cce5311aee12d8d6147631cb571f7b96d8d3823098d3dd449bcc23ffed5a6584f8979402bef95536b0e73fe9772f273295a0079782b9f7d88d19f SHA512 d15389441e337e3fab9c30102fe7b4b1b3e68d8cbb5d14162d2fd7e7d01a9812b2d6d6d2a24a60116418be41e2075e70becd6994c13b34365d512521e8debb02
 DIST half-2.4.1.crate 50892 BLAKE2B c275a9ec70d2fc0c50cb63421399202d31252b0dbf463798ed0a12a17493817c66b8933811d483b348f8f945cb05aab7cc2a4d952bd16009c3da4860202e28dc SHA512 0bce235583ca128723186e1fb50f636b519bf826c942f02c5b969db4117baa87c644665c541991c16d1f1dd97c7233c017a513d45075fc72c5d99ccc7c1ac193
 DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356
+DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
+DIST hashbrown-0.15.2.crate 138478 BLAKE2B 453888ce68b10cd6e93d787986603fceb29b83fe2dc417e7e57316b9e0060d0bba51ec7fb71d46a038662c99f60deac8237a8f349297208d1d223bcc13f0d0ea SHA512 d6fc0613623f9313533dfcab1240e97f652f78f05baa21419f7edb2eff030c4a2c5f426d3eaae747923cffdd8aa9cc2648340e5fc229395b5eacc6fae087c8cd
 DIST hermit-abi-0.3.2.crate 13783 BLAKE2B 43089507a5ca0731a9e9a54fdc8f4dd5f807244797eba5bdcc072c2c2b3761481df65b8cc65900769777d9d21f8345b502cb1915ec36747160e87f179469a661 SHA512 22901ec8976a7c96e93c9e07a2c5d3db49d7af60ce60c7ee6f61c3cbe93190d1f285e737c1c8b2236d540ab14e5d92e42828ec05f1b212332a862baf2b1b57f6
+DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST hex-literal-0.4.1.crate 8559 BLAKE2B ca88420383532a2f2c09e188bc0950cedf74e8335c1e5b3f640dc80607d57bab0aa6967a536a458d149a074f8bc1025a3de99a9081787e7ac80dd8308fa0e5e6 SHA512 8894e48485be7e1d7a16d2e061086c524b039a1be24a4c20126d3f175e12aa87d6d65ae295da6dea88f19708f3f3a051c3c3e334196c094ace68a249ad57fbb6
 DIST hostname-0.4.0.crate 10632 BLAKE2B 85c1b224aa0de4c64a4c56dc284145c50bfe3ddc9063e0884de1cc994b38931552229c57dfa832e927f816df0d93d7b553bd8b4ede582939bebc36c0acf451a8 SHA512 1365d02b3c438d467cee0bb704e98b601390cfc76ff290da198d6c1e85bdd57db5ea07ed9d14b35f4b0cb3c2999eddda69667fca4b01ef3b6c4df1769f0abd21
 DIST iana-time-zone-0.1.53.crate 20176 BLAKE2B 842c3c2a9f5b753363668af5162edb6f2734a51fa6c6fc8bafc3981f5f287451258f5ab31d5ea6c2a1df75934233849bba8dde4ee5aa9fcc456fbafa93d8b51b SHA512 a3f899fe9ebc7501bd22e75b2df34c3b26ad5a53afbff4fa552672d0185d8a291736c48ac2fa76dab36a6621e689b5584a2d7bd0334055994bb21077765aa7cb
+DIST iana-time-zone-0.1.61.crate 27685 BLAKE2B 2091f0bdbfae3f63ff846e27136d9779a2d65f85cef899ea3ab0ff7c987329e6a584cf49c57de566f08e0277bd4981ac3db30ea0cec6a6757ed50d96e2c6583f SHA512 d16c67f435606334042c3a286350db46ff3409f142c0782509b136150b4069aafff0dc5c2ecfb7519dd8d105b9a2e6649df2a7bec33ee3966dc94034c9d5a1c4
 DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2
-DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea
 DIST indexmap-2.5.0.crate 85919 BLAKE2B 766da0a2ddc406e3fb1a70a0bee00141045ff72b52cc412adf05972ccef59d416f502c429dada111461cb522a5c442087e01d8fb235c2f1fd5493adea00e79dc SHA512 c4627d43b1bc5c5fd64861d1a7ed66255ec3f790367028b2758a40751286d6677da7170cfb04dd88ca4c2d163df621583d2e0dc4e9db6d7ed9bd0cbea42b1729
-DIST indicatif-0.17.8.crate 64869 BLAKE2B c534020b2c7b25bb07cdd0fd4414fc817506647cf5b8e2081c22be58857d5adb170082a3756004c69187619fc5625f8b9a1904566dc51c621838e09ecda5b43e SHA512 487e73445c5c7d3c16d6f93a3d9767f41b37d2832e56851154f8b69e678ab7d9ab04eba225a6bcf8b48842ae0db0249b060e998e29a252dedf8afacdc88b1aaf
+DIST indexmap-2.7.0.crate 85335 BLAKE2B c7430ef510738ac5fc4658f3e4d927ca5cde780774a07848791ea87503be09fb4677c52803f6cdaaed73eee600f47e0595ac3db74a498947d0e180cbd10fb7aa SHA512 efac370b9f365a49489aa2c5406eb503044a4df7d6ceb772e0191b02244b6c2c1bf6c43ad4c8924160c1a2bd76d46c630b500a1c4252fc52366295d1cb04b48d
 DIST indicatif-0.17.9.crate 65246 BLAKE2B 9ce758e7dbafb3394d632a6fca910ea3d1237309ac9bad0ca1236cca9563abfc442509ca96fda1cc7be6916875416cf2b85390c53266f59bc18c6589addbeef1 SHA512 a0d798fa86cc4b75d080bd233e274d6554d82e1532b3590d27b9fcdfdfde4da2717afa16ef42b180ca0ad43ad151db8b0963890de106e36b6bdf07f87a519bdf
+DIST inotify-0.11.0.crate 26241 BLAKE2B 9639f8436325544f58fd4db540752826892d943ae52d94ac60652a66fedcb95863076721716f79b3ec27b924b71bbf058b4db7e047c0432b696ca33d24b098bc SHA512 bf1e133e0c3e9e4c31121b24163e5050a76408540235b9b0e9a9644871cc55aa922ccc48799f2f766a3c869ec7f9a1b2275cd8a19f33c47508dd7d061361158c
 DIST inotify-0.9.6.crate 22971 BLAKE2B 7a6cedd29b2503911fb42324fe3b4f4f20abb62a6b4370f8a7f634d9988f1b3053a70d69d6bbd7b850aae2590ded7548b73326a598d31e5b579e19ac3cc781d8 SHA512 39c3db1b6da620df9eaaa41cc20c2f22b9a372e181ed7d8ba0c7ad4e711ba4486bcec7ff86bb4d814d9c53e071cc4e43845567069e45b897c562cb677fc872b2
 DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
-DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST io-lifetimes-1.0.11.crate 37346 BLAKE2B 7f278b7378a8569d3552c9b6d4be06d7908e05d77cdb964267f0b621ec4975a42fb6e48fc030a75ad5865681adf32ff747943ac559ab4ad73331a6611a1b10c6 SHA512 30c6e5ce6f5beabe0d7bee4f4522884d1316cf7d9b8d093ba0f952995997be3d0f10e1e77b9c20b7fe2b65429de0d2ec89bb35e939455795205206a3154ed544
-DIST itertools-0.12.1.crate 137761 BLAKE2B d7db67feb7418d6a779dc17d8a2f33481114cd81a4d53a10cffe08e13f0d3cf4525a5ef43368fe979d5a3ce230872eaf993f7065885531aeb5a6479351857708 SHA512 0d9c1849dcc0ddf7555b0aeb7e4f2ef3b101cfc6f03310ce1b6072d70ac8c8d3387ef4c726146102012e75171e0b0bf13465704b6edfc02752e349dc6af7cf68
+DIST is_terminal_polyfill-1.70.1.crate 7492 BLAKE2B fa663f858ab8e5fd56202d731b572bfdd4ab0e8262100424e27360a9ffd2820182bc57d6718a305ef82d04c3798111841c0d9f9dcfe219765c0f63edb560dc1e SHA512 4730fa09401cb4e69c92b38b2b43afd74699c61f5bd7b37605efbc0c08ca7a1318d43e4a844e46e0f84f83f42432f01e33771be2b18eb5977702ab9f894837e1
 DIST itertools-0.13.0.crate 146261 BLAKE2B b23d59a87f80d24925bc868c0ac7abb6b9d05aad5ca08833634ef760ce228a1b753062ec4bd22237d0e74727edecd7ba3df9789cee896345b69780d7de66866c SHA512 c6cb8f93a93b6ac1a2cbb3033e66fc81a39f83be773b734bea3311332b96bc71bbb518aae3e6b40cb537590c23de1ca4964361c336795c3985bde63232d410c4
+DIST itertools-0.14.0.crate 152715 BLAKE2B 3c075b735a6ae4b66980b1f7ca0ccf4237286b140268ea179e4ac01b1349105da227f03ea9ea721d3e762c3cf8b736cc48b6902148eae73addd864b9c79aa219 SHA512 bb168e21281ef3e43f9c93a079fc1938d79b6db2366fe17e26a90f7ce6fa55df73e54a06334cdb2a7b208b0a64473b5af9de76827a9ecb49378a5f9073d2e645
+DIST itoa-1.0.14.crate 11210 BLAKE2B b2d33dc384757963eab3ae7d80bb672d828a549967986e3af8c70fe71a0ad46c4a278da2db4dfccef99e804e6cd4934067e97c0697a33ac3302cafbc46eeb416 SHA512 ea2d38df373652ddacccd11e610dfdad4e3ae7f0d476514e6ac58092733c817bd834e8cd88c3bc4178dd5a646ba628ae626195e0aa407e8534ae3c2a7b049987
 DIST itoa-1.0.4.crate 10601 BLAKE2B 95545252eaabc3114323a44c8b8ea12a91568d9fc8d26ccb3bdd798ac0e04d9a6a9307927c17558f1284fa5491464cfceba2f0b880d00673449b94c0fb783150 SHA512 a70bb6fbdbcab27fbb5a84041bcbad8e0c8fda58d55ca7ac757f7be5cd373101be40df99e9acd6ae49e637e40de037c6bc59560f96c9adeccb2b2e0bf6531e42
 DIST js-sys-0.3.64.crate 80313 BLAKE2B 7cf5dcb2b9e0b63cb82771c9e98518a4cda70372c5aed07866a07d2aa51274622357e4b5a665499328f5a3c38f7c515303da50421bad4a496fbb658e2132325f SHA512 a4f389a4eb45c2122e7bcf365dccdce8fcf14b1b521b8b839746bba8783296e2f1b959d73bdd874743f49c61a24c4077dec52f63cc7d594cd42e9cd6ea9c2e64
+DIST js-sys-0.3.76.crate 54420 BLAKE2B 8d211aee6d8af87c339250e06e321bf02d2ff313b80505f696f66c43298e2aee8286076f2b291aa853730f8e1b9940f09c56535d3534fc7990aeb16653844250 SHA512 54e9a6be3f5a19021351d22d655a3aa55579c80f1453a99aba5989fafc7429078dea57ffebada4240b9185d3260d02f30da250fa539ac12c4bdda975adfe0dad
 DIST keccak-0.1.4.crate 13049 BLAKE2B f788e96ce56e6d88bfc892db0f71c652ffdadba766d277e7078deb4dc1aca1588902a27751fb7ccdee9f00f9a91793ffd5d51550efb294a04ad5fe1bc26e3e2a SHA512 0ef3912525c019609f98f32a71672467bb7663b12029b03d55a4a3efc637f5ebeb35b3c63e2783f5e49dc7b00b8f4cf8a421399b0a5f7ea19a697470019f35fe
+DIST keccak-0.1.5.crate 13120 BLAKE2B 26b5d52a18550e67e79eb51d26c5329607699b14014d82136ed34199adf1144be8271fd50ef176b913b366b45f249ae5fc09560b0c6e5626b2fb2041de314e89 SHA512 95d5c12f903c572750ee2fa0829b8ccbf2ee2fa473bf0eae5434e08a7c1980dc435ffb36e53bd2d2fe840a55ca1c13b7650be1a0727cc8b79f649d73634f1b0e
 DIST kqueue-1.0.7.crate 12554 BLAKE2B 2302bb9a6aae077c1b69e4892614e87fd86187fc4608cea08cd510a46ddc3a06b27027bcf6a865550187c983f3f80a9c7dcd6d8a6ca891e2cb6fb2d1a5d17396 SHA512 03a1eac44bab42b683312c7f541fc235ead3ec89e7e0b6991acff431f85086df9dd8a9ee1b80f784c9c5452d3e497170b734883ed0fd117ef033079d72f6c1c1
+DIST kqueue-1.0.8.crate 12642 BLAKE2B 93a0ee7484655045986d6d5ca800ca001d68bb327f841bff3e54b38beff09ff10c099b2432ebf90cf8213153370e4c4aeab9bb0eb3bb02b1bb494b461dfd2fa0 SHA512 c8734fa2cfbf8b8f173604acf5d13ad4cc2739c879387b548a1200f8383b81a1b72315449eb73844e4b82280a4c29901d20c12cdc746d48f9047db89849985f3
 DIST kqueue-sys-1.0.3.crate 6673 BLAKE2B 79254d667b4cf1fa556f1773db23b00ac431bdea6c8ecf914e3c0837fe4e25a45c9b6fb76259d628e4c76a20f749df3fc285b54ea63ce3b52d21529358e81c3f SHA512 76023295abaa4415c1d7b37c844432ece522b762f78983cdf58106f65ca553ee96193bd8c93f3fd0af029d266d8414f2ba4d1b8835bcdc180acc7defa6269731
+DIST kqueue-sys-1.0.4.crate 7160 BLAKE2B d75e152cfccbdf7ae000be14e0f84c6d1fd07290fe498349a8715061a83d8c02011b59578db2c451de011ac3eb4b218aeea73963a2a5cd82e7f5f49de0779632 SHA512 6650aef7efd7fbf4f9b6c8c6e4c1a91b79636423d46a0173dcb99de74e6f277cb02ada01cb62aa71c3f174a2c28db62a708b0aada9480fc5bde613204acb30a5
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
-DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
+DIST lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f
 DIST libc-0.2.161.crate 765389 BLAKE2B 4880efbc347e0b92faa893993f37c486a69afd1a3c741cfb9d3a2d3c87fd56e49788f8aeac17baca217f4ceee9180097386ef481f4e142942802f27983f8e6fa SHA512 264d7a872c10484b9cb19ee858c2ac44bf165297653fbc6220672bd2e0ba10913408130f21d370d2861eef529f9ecafece66515b47b4461d56e6b02f55ea2be8
+DIST libc-0.2.169.crate 757901 BLAKE2B 1012cf93d8975aa20fc3f2332e253426ff66be6aed63ace5292cc8568ee419b0f1a4b5b39ddbb78d9c2dfd8d72eb0d068c98faa229ab55556da5e674429f0e97 SHA512 c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce
 DIST libloading-0.7.4.crate 27580 BLAKE2B 491faef2659270b10bb88ac46e0453f747f35e78d7f28b7d6d9151177b4c7a7aec0a1efdf702eda0988c31e9dafff2990eba4e6a9b0b695c535ea9086ccf36e7 SHA512 34439d9eca68bac8fcbe2bc94a70e07550e7e95d713ab74ed60ba6736ec807fd9c9135c178d436fbeb39afb074b2a9b05775d953340845c088f5f8712f5f56a1
+DIST libloading-0.8.6.crate 28922 BLAKE2B cd9d7c2652bc4b0220e1c29cbfbca41f44d12d76c4dab3d025c21e5d317407ab656a88add0db95f1086934a424f55b4b413f33cb2a52cdcadde7641f9c5b3fc3 SHA512 f49ab79244d4b54c2f181bd9d7506fe5df9824a09446924dc429636e08ed7bcd6f5d2afaf8a0c862982e2c2c5832370b118266d36f36bc7b7522668bd598fc81
+DIST libm-0.2.11.crate 111477 BLAKE2B b1247b197dc66a38b9a1f9db0e32655c9ee09575347895bb1e3f22e6953c334d74574a7015f214b0af0eed564ff2ee4576d07d0db5421aae917a7aa1e10ea142 SHA512 86742b5d97dc976cec5bbf75f565b40c7058e74cf840cbc7baf4d84823318040ac692b5796a407bd44caac553dda3f5a087d3bf8d6099cf26305123ce106c7bb
 DIST libm-0.2.7.crate 115688 BLAKE2B e180347d10847c40a88e43d321e08561df053e6fea0cea2cac480c4162c2f31d8697b4572a384edae323d43781d3c6462b2d77220dd71b2fd0da3a2757487db1 SHA512 b7adbf657be812451fc50cd5e5f92b7a71d43b4e48761bd2738d65498c9abad851f8e86d3be06ae75cf39c7798c23cafe767bc5fd40f596774e858f69fcb46d9
 DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
 DIST linux-raw-sys-0.3.8.crate 1013776 BLAKE2B 375b29d2cc700e95d94ea8dc304cb711562952742f65c9664e33560a3da862aba74f2ad2ee66b1dface8cd5371ea9cbbc452ea953a6b6c656ade7d938b7d2ff2 SHA512 cb0e5c54870dacfa513ad05f7a84e9e90dc1a42f55685fe3e252fd25cffa4b875f1b65eaf4ad132ef0a19e6677c7763b360d71ff0060fe6ce5198f38b9956375
-DIST linux-raw-sys-0.4.12.crate 1465800 BLAKE2B 2f70a344c427093fd55732b68239f771cf6563edfe2db4b2f50cdbc904dfc7565b30bf06454b91482eaeea787b9cd4214979665bfa32f3c1c586551333cf4d2e SHA512 d9564d02d5f41356478066592e438629adb3275df0e5a1a44030cc99bf8856b8af64f18f27371f84122a828b34712aae16495a1a16050fbdbece6d95e9cdace9
 DIST linux-raw-sys-0.4.14.crate 1826665 BLAKE2B 804af73daf396bb20da14f831f26ce06325181de14f0c277350bd22d21789f2bdd663a964cc0e7c5cbd2e084285d02a401a6bfbb3e8a8f079c120f9488b56f99 SHA512 28149660bd975ede05624af3582d5c78f498239f5d89713c2c32f5372fc16f4ca024dec35f81ea973a2cf986098890395dbda06ac6cf4ee29df3f9a0e11eaea7
+DIST linux-raw-sys-0.4.15.crate 2150898 BLAKE2B d1936eb74377d9bfddccef3830b56eb716c38ea3cb7e13b73325dfd00f9fc0df74bae49e4214dd7f27c257403b8b12cd1ef332d53336279d13f7e9497caf4135 SHA512 b5c39181fb6b901abddd8b2e7b449142e2e5691cddadb8e6b74ddc3b53076b1d410522cfa45af68dd18befd24ff12313c2494cf2cb0cf142e2228bfe42014309
+DIST lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe884dd69c61c54dec978733b95a853c3e5af26f237e48ebb4ee9dbebfce0f6c06067f74a3d122e92f5ace40e22d7 SHA512 525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
+DIST lockfree-object-pool-0.1.6.crate 12309 BLAKE2B 47c4b3ade2102e8c5154404d6eb8bab943f0173bab01764192a2ba76e4dc454a7763a7e2c6a3df6a72f2d0971c419bf69af4f81a50636c75cac2dd4c692a7962 SHA512 d4a51c7e92184ded686ebeb06467e26905b12dfda6b4da28f230e73901d7406d611798d823c0e1fb5e2c9efec5ab3eabfcd8aadbfe9e319046b3cd0d31008e90
 DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
+DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
 DIST lru-0.12.3.crate 15009 BLAKE2B 2b2587a602409113a7ed61d0dbc44b8b1740e44897bf9273011e6196db64a51e6973436d6bf34df7a1e534cfc0490e0bec4d83c0dcb0f53f640c80b88713974b SHA512 1768ff09e294ad7b0631a4c7cfc1773be57568329901e9c2034b1cffadaca9963180b3bf8194554bad2f9f42f6c5e67d52dc90ba7d75d929cadf31642f4a688a
-DIST lscolors-0.16.0.crate 23368 BLAKE2B f4c39acda48e5da0489b8a5b169a55bd69f9d4a2e7c264e6f785feb6f50c5b51ce793b5b34a85aca90809644d55999ce5158117e6496936ebf13758b064d59e5 SHA512 3b6f65e5cdad090fb05b278d4f5cc3d3219dcaa5413dcdb20ca4f673842906c09c71fab4dfe23a3669a9a3781af0d08a793e1626900a078e7e776286c676195a
+DIST lru-0.12.5.crate 16047 BLAKE2B b5d7d77b4b29973fde0854f55c395edb6ea6e3a309fd33f0c43a6680955bdeb60fab624f02135b637d95e5a0e9da79890a71290c19d797f758c73d16c3d44a27 SHA512 a77230403b1ccb5aa3ed1ed89e7e6af53b3b34d4373e663c1a9789dada12c252e2b5d8b7ac78717c4c4909203c7ea2ce5743ee6cb414aa268c329b889d66a982
 DIST lscolors-0.20.0.crate 26382 BLAKE2B b384a2dde23457681aae0f07a106f3d0dc2d1afccf52d0081815bb310b23f3576bdc4887f0b4d8c3823dbb37e1d749cead8a0fa688bf7eb434d9bda5d44c4081 SHA512 32fc910c5095617c36ac99e5aff9c95bd8a6e766d8aa6b9e60432028855d57c4a4c660d26efdf0e7fed0190882012f63ca2dcc882468705b086db53de8fabe2d
 DIST md-5-0.10.6.crate 16161 BLAKE2B bdd43889aed114cfa97ed0c70bc97b89fda28b14033a0a26bc7309ed744ee907d59151ab92e9cb95f0ff0ca1cfe2af360c48f1b99fc8a246a25c803a4b444a0f SHA512 024a9e14aaf860e748f64dddbb8aec01bb9f40d702d8de31497fde1d66a663e97ca1b06b600d8a818a0c707d1ef02eb0f210befaeacada458acba69ccbf476ca
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
-DIST memmap2-0.9.4.crate 32752 BLAKE2B 1b21af908061e6fe09484ce5f84d31ed1751301dffb6439512b38c53f9f090cef7541b591b968d0207c6d8351ee4d5949007caef7832ce130ffda1b3716b5454 SHA512 8bba078dba73253e8ee88f0bd2202dcd2afd0b7b800d08af8af593b882cb4acff7e297a3f299e253f5adf103893fc390dcd73e882a2e7d93ca96099fc2eace4a
 DIST memmap2-0.9.5.crate 33280 BLAKE2B cffb232e313c40c6a698ad6c9e6bf140193cf1cd4dc003ea6da08d748f11001c5426786f741dfe23490841350363db3b9adea927f3e40138b36f2f4558c7a113 SHA512 947eeaf7ded7241a256fc2b288013585f5034a77a18c8621ab01a4b47c0ae6e9b9414c5e9e2f2d47b661f8c6966b1ed0d159342cae80cf45e51629949c3b1337
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
 DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975cb60f0499498a73ce4375e7d452c9ed62d4b0b6f6a4fa591aab55e5d7ff20033baa007fd6c839b9d74b31142c0b1 SHA512 2f8f09d7afdb9d78bfc80a228ded85a215fea05e577e907921f1808f84aae30ab118048d7b53295f11aeb5de70ab6cbdec892f3a2417bedf6f53a4576d095432
+DIST miniz_oxide-0.8.2.crate 59068 BLAKE2B 22808b2137b4afae29cc5cf25d9f643d24824293524542e2cbac3ed0fb0341417c052310602a6f0a003843abdbe7715a95a6068c807cc0c843ed867958650215 SHA512 e58802e332a72123954ba1751cdb59509789bf930ad74da3d06e2c1c3737547fc0b9848be816a66b6585830786b7a0fce7c9fb574789e15f3b540709563cf854
 DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
-DIST nix-0.28.0.crate 311086 BLAKE2B a07023566f04896fdb3ef8b2a1ae8dd64adaa5eb48217c58588e1b41733642e03e0637350c0ee83ac47e663c02b24d5668be751f8d199aa773de6df8b2213894 SHA512 73c0c94b360f4fc81ff07a13692b2a5b5ceda3a7203bdf1e526facabd36cdf160f0ae8fa479e31a4e4237c09bde11e9bf821aa496311cac8614f9c5626f8d69a
+DIST mio-1.0.3.crate 103703 BLAKE2B 0d2360e4ef45f37104208a31e9aa467d6db041dfeb97403a010a36e1e1427f51d97f8408948c75c0084e6c118f058267bfe87d36e7911cb37366f2b1ac6eb693 SHA512 2142edc7e9378fc3437110c85ba2cee9c9683e87034cd44275d2c389645979db53fbbc29fec304f1d8c8f0464ae17d2a5db1aa9215d696fa0282f5069700b1e2
 DIST nix-0.29.0.crate 318248 BLAKE2B 3a13a88375a359cf77b28d7f77f47f178bd31ef74b7627b6701bc6fc601024706be4e9ac1a076c7cba26b64d3bac4de17aab45fe3c045aa7a36e2d9232e872ca SHA512 86c05084aa0e6238f8d48df0f5ce6e6d7661b589f4f3fbdad43387c59c0d6afafea4badf25d31db1611615de19a0b9ef18ce614846b79a47cad4e2c9367dbe7f
 DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
 DIST notify-6.0.1.crate 36446 BLAKE2B 791dd96c28bb22e7ae457accd0b2c44e60e8fd4d1e71f0a006c45db7465f535d98ac18e0d7a9bfc2d301305a713bd1e282cdad8812a7fef69e47e3acf819baa2 SHA512 114abeb67356c90f3528f74e87f28af384b0db263d8d803043b8122b6689bee80d7a378c6ffe292a962d082665d288bee5a9e8a50a6af806d8d641dad3765c1f
-DIST nu-ansi-term-0.49.0.crate 28211 BLAKE2B 057f2d9a3b6fa773e5b8b7b33eb0bd588db3310f01354701832716d77dd6c49ae17f69728582cdf84e8387f7c57b9eb05cc97ee6e14541878f12fb50f93855cc SHA512 8168f44f3574e56fe70ecbc67255556bb92215d3520d1cfca7be918b3d7d54be7aa0d82359f1044eaf66f11ee85fab1f9ccf32b13cdc39139c2facc78b2d8e71
+DIST notify-8.0.0.crate 35590 BLAKE2B 1e798a9fca0708d2ae4d67cfc7fb8185735e6044cba5266cf70beb326dfec9e5e872cbda14d9621a8a2f7351b3e5c930c607884007da0085bcdd58f008240960 SHA512 0238ed072d632526ed6c464d69674f5f1d3744d878b59a9e1e6bc460000447c158a54a3c2504270807a68cd6a5f953deb56b05d80ae03486688d4a9153d14507
+DIST notify-types-2.0.0.crate 14495 BLAKE2B 4e647ec4682d8cd27b6dede818bb98bd1fbdb6c4d983687057fc1f86e3eb56832d25dc83e7700639e1289da76e3dd987d89648ce438e5869c3236847cd8dc91d SHA512 2364311cb22104a661ee4f0b687777f5887c988a3760162a0b51cece66ce99838bc2224f346994687057fda1e19c01e6b1cf812eb1de8e3aad9667b229f9e5ec
 DIST nu-ansi-term-0.50.0.crate 28482 BLAKE2B 48ab82481353372f72fc52b2b7a9835747634e0bd8704f84489c5c1c68bcb4aebead76b232b97dc7319fbd473a9d1d2606b597567508ab0ea9cf17b3e5c85016 SHA512 cb9a1215a730fed293cfd83e7fe89d049d120435740dca5416ad06c9f5b40f496fe22c9d16eca724a56b9039e9f58b17a3301e80c28724fdba70ec81e6f469d2
-DIST num-bigint-0.4.5.crate 102281 BLAKE2B a25880f907caeb948d0a8619180be7e1e66d0644819a842fd1413a1ecc8d7cd873b4a55a684e8a98f6bc1b74612e20d3d01389c6753389cd9f4cf7f754125fdd SHA512 0d3b1da7f37a441cae0bc276b5b9b8aaad2f5a7ddc3a1c9b6c6e09be70147f7430604c74c57a79dce12d32c242393c8031ec7bbe9b1cc6fb6e496d6fd151474e
+DIST nu-ansi-term-0.50.1.crate 28536 BLAKE2B fc259654aca2119c1d913e101b0fe7a561b44ba4a6145d309bec23d82ba5e4db916852acafecb727efc92b5dea1641304b26c383ac07a8796e296bb179eaa669 SHA512 c29735a5e1562776251dbd7337a3e4b68eeb299e86c534feab6478512ca5e167b42ebd32c6c461b71187cd375b8a2f587feb962f1501a656543f1429731a95a2
 DIST num-bigint-0.4.6.crate 102801 BLAKE2B 0460e7dfdbd44b6c68fc8ead6bff4353e549127158dab8bb5d217ee33104fe9ad5f58b63a01d56fffa8d7c4df1a87dcf5b536e436a0ef98dc4418a4690c4cc15 SHA512 19d14a7755de2b559026547d9e3e1775e636781bdfdd418f2e1d962c51411a0973a46d84d0356e30c0f708a7c7b2097926611960043f71391919cab1aeb6aa04
 DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100
 DIST num-integer-0.1.46.crate 22331 BLAKE2B d88c9f84e5d803a3aa8f44dfc1bd6d9b5e336e7cbf47231cb3a7de30dfe263c41c62c586d31f0029459c8c240475cd329b3fce79f355be7643bdccf8d56dcbba SHA512 e27986d91f6c6dc3d5a0900defe28ab5f47905cde3f84d0914b7acee076dca8fec6fdb7b631ac94d3a31eb01ecbc5854e51afc3187cd1abfa21e1bfafdc700ae
@@ -193,46 +240,51 @@ DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af973
 DIST num_enum-0.7.3.crate 18603 BLAKE2B ae7644ae0697518e538a38e33fc1658057641b719437351a5cd1d5add8ce2b03b834097a4b2ddcadb27937c266bf758894aab5e0949fe82b63150b8332aeae84 SHA512 8b8fc32da39d1c89210fda38098425f21cc384b6a38841f3b04264dbb24ba3c46344835be6e70b794c18365f86796a8af584085dab41bfa677136b8c9c9b6197
 DIST num_enum_derive-0.7.3.crate 17092 BLAKE2B 79b4e4f1def44702347a2291e7c2b3f97a902b4768031795d9fea53c624f31acce9f5ee68316d08af149681afd8374e39b596c3d63e3547445cfcd28d3b5314e SHA512 d670d60cf9a547232190d663d92a288b06953ccc5989c2fd9d4101db35be9e3e7386c42878c15bd820817aa703ba06af3a9641898f4a204fe9d7fbc32c3bd786
 DIST num_threads-0.1.6.crate 7334 BLAKE2B 416efdf395b0299b6b01e1508823afdda08cf67ca54e1d644fc5accbb0490945a492a34bc5ba70c3e838e6405d17ddce164ef87468bd9da27097de8994ad9577 SHA512 b2d9897e29e59353379b6372a629fc7f9afc89f777b4410eaeac7b4729527948a8dbecb175f056899f9076693ef855cc0d40e725cc54f28af588fbac5f7ce3b6
+DIST num_threads-0.1.7.crate 7455 BLAKE2B 282514d1c6ebe67ab2c30f91efd5b6c8880baa078265e22d5d7200eca4f96702aad8b537ba772e5d4e680a6e90fa6919fecfcf37a060668b2a618bb01bbabf2a SHA512 60eecfe49c1afca8efa320c5f4d0cd794f6adf8924193682c903307f484ca0a1ddb56102a772232aca040f29651bbe26ddc1c4939e1f030e229d179837e06bda
 DIST number_prefix-0.4.0.crate 6922 BLAKE2B 81bd3b588c788e6865104e5ce87119b5e0c5a526042963d52cd582ff23c2f8c9f32b4c445ef0397fc402b6d047e031d8e2c67ac97e191bde22e17662eec3a554 SHA512 a43b668d7314218b86ca7451daa9dfef71f6c9f6616bc34c12d94ae6030f182bcca9da83905cb46f3d49d0aa81385a787e92e4f3ae239658067adc249f8174df
-DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
 DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
 DIST onig-6.4.0.crate 32616 BLAKE2B eca949c47870f260310c69302c6a0a60b9329f7324281433170b0f6fde80f91d49267307825652830217cf44b6a77a741f526a3bca63a12fd8f28791c14a0d5c SHA512 5d388d35eaeb4ba4876b5a683010e4e38c7c54abaf15c900681a7c9ed199b6b7ff414aa1d6246153546680eab28505cfda359c3d5df5b9fd3a5cdbfba35953bf
 DIST onig_sys-69.8.1.crate 638216 BLAKE2B 08d5f61f4047cfc841ee9e1881deeee49478bdead87483595e9c81c722e475d137b8cf5e1caad2965ea411d3211738a6848896128b5fa1f727a0a175ac217d05 SHA512 26a7dec69abe1535d575e7db63448abd898d363ef42352605e7b7d046b5abac5733e3cc05b7d442ce67db9366dc96d4a7a82a7f486d3b9af6d298b49b0baa864
 DIST ordered-multimap-0.7.3.crate 23265 BLAKE2B f894c3384d447e4ea0a58dc912e4e5bc6e72ac108365458195ac6af8c0f3b5e1f58941bdb7d9c323c67cd23001cdd5c340e35705a5f017c3f789d0dc777ab043 SHA512 4a0c8e2352037d91428cc54014c2c20385a76500faf345170e15d9354c180a7fd719d361822626842d01c4b19d44ee291bb3ccc07ea934fecdf52e28a5e4e354
 DIST os_display-0.1.3.crate 16800 BLAKE2B 2d3a46bee2aade195bad0080178cfba0c5a5eb178211bceebc6e3c894ba1644667fb1713a6df9b0dbc2e34810bc6c9140641f4f2dad784845e7d1ad38a74b4a9 SHA512 2a413edc3237743a3dbca9645a8f813992ebbd57a9e7b1209a121d6914756bc0ddd4f3e11a1a5e55fb861f44deed4462a1e52dfe96e9f2f1d612c18b1062a165
 DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
+DIST parking_lot-0.12.3.crate 41860 BLAKE2B d1899a1132035aaea3a784290cf4951ea3b36b2018d407e27d333b2a2ce3820e040d635009c44cb6e58ad07cec6565c0347af6f6fb02954eac2d4c348bb036f0 SHA512 368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703
 DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389
-DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb03a3b223173a3bb8cee65a28724eeb7bac87f62aa7b1df5ea3fc93af3cee3ef30b83d06c6773d6b856a7e6fa5fa197ea SHA512 7f0df70f9f1ca8d3da0b9dcc96e49daf05d95c3a995289266b5333f68818d686d32b0c733dfe3a0f62da78fa45caa843a963923b2d0c80899c33413dc749c032
+DIST parse-zoneinfo-0.3.1.crate 97290 BLAKE2B ef2d8128be452c96d9c13e8ac3cfdbfd86753a0578a9a782d0059467f9212cd02ab97893f0f9f73fbcb3393d6049dfedd0a437ffeada1c7672564ce63f4a1bbf SHA512 88f581dadc306585addac8a16fd3bf56f13f6b933689dc6bea36a07d9b283f9c77ed68f4175d676574062b911e3b1220bc82a79fe59ea551a7dcfee91ac74ecf
 DIST parse_datetime-0.6.0.crate 12822 BLAKE2B 016e9c21fdd6af26827ae0cf7fbdbd4f161ca17138018160133efe92ed2c4f5f0d607f5ed4ed1d56059a20582f4df4122fdff0a21c715c411d0dc3e285320106 SHA512 9d1c23241c4668d5ac2332aee1b4f9e42faee923c9f501c69071692e3c7ae4b23c030473013e00c3ed98a7a031e55c1a53110777a41cccdf08d623edeb5aeed8
 DIST phf-0.11.2.crate 21569 BLAKE2B c809201298f1c5046874b3bbdd30e33f2bee2e4b977152a2c5faa91019ee5a1c8fe1d42cf91f6d0b0dd52015fc66f0a84c1b3ae014291ad7d5ba647a78debded SHA512 97752bfb44f3d1f9347b4ccfb6fa2fb80b3263d6f67aa703c52ae90d693c537a0db878acef828c79bd4c41e8f7ca0ea45588dee073d12c9bb0f2980c511b65b4
+DIST phf-0.11.3.crate 23231 BLAKE2B 588ff9dfc05a3d2cbe223d97c36c8a596d89cd421b568a0526992a089958e4b4ae8f7d33b3f15cf935d20bffea8f60d39ef2d2e1904101f285ca9b8b8155ecb0 SHA512 20a834481bc43ac8c560b00e337294d3c14d1fe359e7f78ed08166b096305e40277f4cd3c179a740911b5c241aeb4e263afa1a50d37f383ef63da113bd6270a9
 DIST phf_codegen-0.11.2.crate 12977 BLAKE2B 5ceceead850a45fb0f6ad706ca26e79267bba0ffc0870b8a31ee8a586b37dc421d31e5af3453d62eb85efada260a2eb9ceb12d2f76434dcbaaee2f71cd43d38d SHA512 0a11be13927f6d4303a2f10bc3a0c986dfcc4bc91c9e885e8912d077e434098f75ff4ed9633085ccfbeb052d573721750fb80c7a19ee1e75fc09660aac2a6c5d
+DIST phf_codegen-0.11.3.crate 13741 BLAKE2B 88b6f0c206a95945c115401a30ba1bbf6a74e3acd4458f892fcd1eae5312765ed4e17272a814b6242240b97cc0d4eaedbf8c1c37a090d9aeda6ab23bd2280e78 SHA512 e86c3b73de198aa0ac67beb6eeebb88865f77d075b9d7f290eb9b73bfdd6728d9479f796d56e4f3358226ee88b877d848017cd951a14804534e4cb656eed209e
 DIST phf_generator-0.11.1.crate 11075 BLAKE2B fc8fb9d06ea933ddabef555b01be6d72c108cc5f493981b87ba2d926259a6311f5407eee441377ed0e76d041a792858ec39a19d269677b49f285b60c34f441c5 SHA512 0b6eec4edc5376c30dfde8c7fe4da5905412b944dd56c085e90198c9d716b40aa9928a8d08cd1a7a4c6ca26c83d318fadc61fbb5cddfa239aae07a6c831c5e50
+DIST phf_generator-0.11.3.crate 15431 BLAKE2B 0c8fa88e391141d36d6f128fdc3708a87e34ebd56e201ad56d62de8c05e9bff62258dd7f3a03b432ddcbd83c4f61fb9a57d93574a9f9a68e931720733ecfe1c6 SHA512 52998e20648b6ecd1eaafa407f7da4667fa829d48fe0c9f8f718377cc86a232a6261fc2f831ffc7051b62dbdb880654b1207ac314e57b23d2b70f634d07c2115
 DIST phf_shared-0.11.2.crate 14284 BLAKE2B 3c3bbd24de77b032d194d0b0679a84a4e2848d41ceea5552f73e51e3ebddd5e61188393f126f668689dccbbfa92a8accd9c09a77de39eeaf72b8993dae280dcf SHA512 f2cf9e8ceabde75bb7548e5a47dece9a8fb7eea4a6c5568675e7bd735860c3e51181d749a26cd3dcad1476ec22d524ccb77a956dd267cd0f2b7dfb81db9abcbe
+DIST phf_shared-0.11.3.crate 15199 BLAKE2B 82441a3f6db12e9021552b51ef4ad8b564532833dce782938d7d721e9f2d8b7015eee7483724552b8fcfeeed365259cdfd5044e9d2a999f42baf476df8141db4 SHA512 34bc3c0dff5568f0276777614d92d87882ca6be9e3d405c1e7de90ac16ec52a12acc30ea9ab2033074d0e988fa514247f37de1a21a3727de0ef43f42f477e27e
+DIST pin-project-lite-0.2.16.crate 30504 BLAKE2B efd0b426fcc6ea8852bce499fac61f9755a11c6a2999cbec514f093ba7b3f94b1f2d437ee9abb243e31f3838ac1c74491a212851d7798eb249e209b35e015332 SHA512 971adfe54cfed304647fd944c1c915e78b37eaf0de3a582fb984a5e91f1b7d4db2cf0f53a9a64b64427062d4b41c0a36baddef782411a76ae3be0f8ca45f0718
 DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.26.crate 18662 BLAKE2B 2ad92dfdc8ac0414b12a61dd30ea4ac5f142bbb55d0555ecfa3a53e750367e1b11766a693ef11f8cbe5a2ddb978327632458b2bcf75be7aa8f973262033349ee SHA512 509c4d1494cccc20de6a62d9d037c63ff77ebee8d907747c57ba0926d177b08fcac0231ccdda14511b453deb0b76ddd10f8fbdf63ff94257d72a12a889546435
-DIST platform-info-2.0.3.crate 28454 BLAKE2B 22c60f2db10908c9dd0e07e74ea40823156e2d795bd6e3c279585a424c692762c0d18885c0c5782c3e6caa9a91ee6f3adba2279bb6cd0448041a667a82404fc2 SHA512 305699107d21673ab22e56dc42752f85dae93922dcef93233f355b73838e54c2d157e89db60ffdcfd38f105ca6804f76c524ebb75c4f94845ee0320c46c69d03
+DIST pkg-config-0.3.31.crate 20880 BLAKE2B ab7676e810751f89639b60ae70bdebe1d57edc76319f83077c3680049a701a26e72e8cc485fe77cdc4346fe3571d32c59e7384c8c86fef17e00d7d81df5daf43 SHA512 ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4
 DIST platform-info-2.0.4.crate 28476 BLAKE2B ef2019f0fc3ee02e03f870338bb7eff243ce125653f42d83aaa2c87a5eae9dc3c58299f989663cbb81ae7aef7cbf7025592ee9c85a90f790cd233232501d457d SHA512 a05bec3651c81026e0200ddeb616d801f43e7ae57921729d440669abca609a8f421bcfc8e2e6fe4f860dc133c724916cd9b5f81ed2f7d77468e9be9bbf7a49ac
+DIST platform-info-2.0.5.crate 28541 BLAKE2B 227f29231028e6d440bc218c3f47d37f73a7efafb925a91287b7336a3c651d2ddc93173ed96c3e4e25bbd877c24304a2c64d3edba1d04c870bdb845655d8a92b SHA512 7c9c113f036b6fb6c31572815b6cde9716f014030bd062d00ed17ea7f911003a5e33b5e43a7c4a559c7ab390b086af88051ab8ccd22df4a24fe928e50a129a58
+DIST portable-atomic-1.10.0.crate 174760 BLAKE2B 9a05d6162c95f5140709cbd005c1997449fb6373700e8ed3966e3379898e95f3cbdb90b387f1c7deb3f1eb33125378852a7168d0d22b433813f6c082112b0365 SHA512 fb47ab53fe240d5b0824dd068c6dda473d3e71ae6f5dfccaa17262a8b6de0e1dde05d83975e53bbfcf43f10ef5c634fc024f94613937927ae93f1adad1dadb19
 DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c
 DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029
 DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
-DIST pretty_assertions-1.4.0.crate 78846 BLAKE2B 68583c49f81ab0cf5b90f6de10ef3aae9b525288fec25f9d006f2eed0877c0fa742dad5f878fc78233b54c0cd32dda7ac1f7161bfb475288d8858e8e40aa9e1f SHA512 f76d38c787e91b3739272e3bebeb9763d312b85a43cda5e1311ba8d6b0e4da1ef25bd66208e772b1cf56a34553ee560482b5ad19c5290608b2aaf9c0d0f0e995
+DIST ppv-lite86-0.2.20.crate 22478 BLAKE2B 9d68dc36d8148047d571c0147ed29f586f3c6ac9394b56bd955c8ae5bb18f5a8da5369809f7b8c3199074e23660325158c32c62e1bf69a16cb1f5da2a01f5df0 SHA512 6d171f63b42296f7765732fce3af7ea05d0d81f1541ffb3ad86e81210715ef4afe5bc9e58926e97e757aea6ff96a8012c8411eac78be0fd080898318ed21d7d1
 DIST pretty_assertions-1.4.1.crate 78952 BLAKE2B 016df9fb2f24304b68a6bf4fc8e144387f07a5a15fc8d92757cffad11b4a00e74559abf597d4ac8619a3dfea705c82df1b8c8620c5f32c61ea8f212fd9cbf9f5 SHA512 474f77c61cc17bbe9914c56b98a80e5918450205827cd059d693c2d603ff61a0897cad25dde645cb495200e61ddc14333d15eb8bf2de090a2eb68deeb9aec8b0
 DIST prettyplease-0.2.19.crate 57713 BLAKE2B 244d4fbb94102b0516efd656c0ce0d5ab3188bf9135157c797bcf3db5c417825c9ad92378082a6f682c6096c3f76b26dbc39cfa379ea7e642fa786cc4b08cd87 SHA512 c156eb23076560466ee1001d1d6ccf74fc7afe754518b2a21e16b5d05acb4a829da473dcbe43cd3499efbf03e09ca2dbcf2bf475c8260fae5550315ac09e93e6
-DIST proc-macro-crate-3.1.0.crate 11084 BLAKE2B 9a9d02f0f34a30668ba94e34d51199c332209c47fd8bef28c452924f75984dcf3aef2c92c4ab3fb03205d589e4f773d960064b4d08fdb2480168f10b84fafe98 SHA512 eb5ad763aa700f2cb1604c32a4bf2fad499a03ad868a22d06b0697b77875b1cc13c739fcf165b2bd547207ef6dc3bd13ceb75e1a59c596daf916f356ed27d8e2
+DIST prettyplease-0.2.27.crate 67167 BLAKE2B 657aa36c13a1535431be8628685e9b92c066f20719e5ef2011d460157cb1bcd6179a1c11f6ac40701ca0a9315e9c3799dd0f8846edf2074e689a7d8f08c6ebc3 SHA512 c1f9d0a4be5ad7bac0681d0e7983901bca1e3cfccbd813abec52c5f42c7217b270a410b8be9adbf7d2876c08117e8c529eb15e2e5585c11aa06ab7392664344c
 DIST proc-macro-crate-3.2.0.crate 11164 BLAKE2B dba3e1f4e38f427df72794ad891746fbb8c24239cf06b076e75ab6795a7e8c9abf25ae0f40379e07a696827156e7a3780ae242da7e5442cf1224d058f54b83a6 SHA512 41479ec5e414a8b05dffaa0ece21122387d5165a54e60d8ee3502f8a3c0a2ac0247f56996f933d5d77f1efe41a56bffe16874e8c6a34b66100cf047e4b760863
-DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST proc-macro2-1.0.89.crate 49446 BLAKE2B 844c021394e7a2551bc179592a6769d672360150abf92debcb9ac60a94a2e426c48c408f06aeb2128686f5f04d66dc12973714670c21a5063ee6b9f3bae4e671 SHA512 488ab38a04df1d0330309382a7e4f667238cbc9b4d513da6a8f5718f8a762f76cc122af67fefe8f4b021a286b3d23e3ec83d781fe6ac823042a6daf14d147e2f
-DIST procfs-0.16.0.crate 60581 BLAKE2B 0df34ca82fe08930d123d7487394dd31a233addcc5ea540952b246b0b036f110242f757a3211e2010fa1e5fba4c53f253ad8d5dbb565491fe502f5d2332d6122 SHA512 bcc08d05a536f34272a0beae3e0fa55360de1aab6942d3b20e95a577bcaa4def8f5ecc96e9432871efb13a8d298b2b0fe61c7188c9d2ee5deed2544371aab707
+DIST proc-macro2-1.0.93.crate 52388 BLAKE2B dae4493215b88f68cc485bc0ae80f0a48ebad68e0260839b1c367832d1ab778197bf040647b3fe36cfe9d5f7a496e05cd71b5914f531eb129c2d458d5f0be896 SHA512 1ae650e390e4f1b18d05f42d2ffcd025cabf72568a326cd85496c722600108b0aa0ab0161b39fcc931b8b302427f678650e703f4db57aa1a60f1751db881dc6c
 DIST procfs-0.17.0.crate 73252 BLAKE2B eb205ec08019da77522599f192dde47d733fd68c08eb68611cf2ece6de93708cc1f2a3e0e941abb48b5d6c2f64da9e2ba158c1dc8f3570ea086b43f3e7ec8030 SHA512 76950134beb05f3df3dd0ba32488e1661a8e90fe5ac59a9227b4a5d2413e4ffc9772c9f79d37fc882fa9ef6b2c2c8c96f00458181926b0a1655500da56183a3e
-DIST procfs-core-0.16.0.crate 68279 BLAKE2B 257abf95553979dcd0b0e9f86bde831382486ddd13691c59f1d0bc36f9c604ef0ecb06461ee7530a2d455181bf588add9fef8022ceea3fa3f939159001a2690d SHA512 aa21eb08ff57b7e86dd4073837bf408ed6e89e46add614c7faa04882d131241c0b01d0267de39aa86f85ba9e60a326de48c7959d878a6b75058cb7d82a31175a
 DIST procfs-core-0.17.0.crate 87533 BLAKE2B 8774dfbc5cd2cfd12c1424de79d6be403c9d3e3a04a0437ec4f4dcbb4535495faf7e6cb30d268bd16c053ec8cd72cfe9a6b2d2e577c6519d15553c9f7e0fa7d5 SHA512 392a6c6702333eca25f4bfbbf10ad0c300d8b1c3f1ffa51151495509b45c0e094e8a8d43a18a9490dbf5910fbffb9fc2669b39b989c8d10bc5aa080377978ef4
 DIST proptest-1.5.0.crate 201381 BLAKE2B 08d47d4bed148e132effe1b6df19645ef48d2a34e60cbffe5082d8a59844844359f21b1688e71388725f8b871e4e1c923a65974a32372609e449e3368feb4d4c SHA512 fce20d27da7bec919b1e566898866edc19a7c4b6f800def063ef420be090a9b8552aa9bd7e0aaa1c6c584579d1200a985a9c99eadc15ca1cbbc7588f4569b3b9
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quick-error-2.0.1.crate 14265 BLAKE2B 3815c89e960923bfe0abc962c38714b953fa1d5af991f3de22d1d084a8cd1ba1761fc961ba97e06ead3992ed1b61f525d04bcce459599e5546315932281c1dfd SHA512 e028deb598466ae91663e5d090606be4f117662d0fa6e0c0b0043c7261f26787057e84e644cae72a45b1a0a7b1fb03fc9712faa3abee94b97ce2c8d25c365c32
-DIST quickcheck-1.0.3.crate 28069 BLAKE2B 5f0ddc8e22fec55e879745a95024abaa03d7bcfc6453286eec072663b36a5d6ae247b3c1622c4743e1ca9b7c4bb21da0d095aa5247f32b0bedc393f92cda6bc0 SHA512 07dd707c9d3fd0b9cedbba545bc8b4fc1ca2770d169e444f8c96f8306d3161a6a3e9189cc5d0d6b3dc4221f7dbc05887dfe2dedc914f88d5e69ab2b94179185a
-DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
+DIST quote-1.0.38.crate 31252 BLAKE2B a3836efbe5c21dec70c684002b47b8fc7cef643c82ee903b537a48bc0707a28106c4b33d98e60ff81e04c7520f7404b1dc4d49446e8d91dded517e476c36e1c2 SHA512 530c47c5e6372b508bf5b2b88a138408a7afa5ef52c47280ed20eccf39f8e97dfc1e0a18c1bd5472efcdc49a7a1e69566333a0a1b4c0b4f0e11e6a7a85bfe8af
 DIST radium-0.7.0.crate 10906 BLAKE2B d576e0ea5c5287bcb6740cee3a3838b6ae4dfdef0ef05d34634b96dba5159e48260233db57a767c9e032fa5d9a5798361335cb19f7844f450113ece30ffbc51d SHA512 51e23cf52997b46c0018a94b0259b29d7bf33ddba19f6db406ca57ee5b1417d7e5f27dda3bb487d0099886011a97f238e8b3dd4d6c86e8464c0b471c1a7622a0
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
@@ -241,118 +293,132 @@ DIST rand_pcg-0.3.1.crate 11983 BLAKE2B 87c2a9d0f6fd71076280a0f6447ef2a8c9efb815
 DIST rand_xorshift-0.3.0.crate 9121 BLAKE2B 56c29e159c0beb9c751429130e84e4666f9031b6f70e180544f9cc8f8e85d98676b861b588dbda46f2cdbd254fb908c02c6ba640d53422e6bfa1ae4e48ca5a33 SHA512 256e410e5bc08c56496c53c3d53936f3b1cfed41458b0ee8879d7aa8b95375055746ca49e29000ef847b37f01e9237f569cd000c4b281f6c78ddfc78ce439a49
 DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2a0a0dc24f0282fa7eb01fd1351a7dc8b5af3a55ea321e6526fbe037fec3cf8b32463166a082a6e417a51fca SHA512 3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3
 DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
-DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
-DIST redox_syscall-0.5.2.crate 23957 BLAKE2B 6261df25a59af5119a21d31fc3b6a8800bb1783cf2fd63a5524d48d0b187f5f2e65ebbdec00d9282adf110ba8f307d4ceb154bf029a0c6a26e8a887fc722b2d7 SHA512 b7e39a08e220153370449cec7b058c2dbc4916ff7be01b34658e1793035323ecc28f40712194cb9bfc9b863e4bb316e58662721eb0e54f68f09438bd880ea032
 DIST redox_syscall-0.5.7.crate 26249 BLAKE2B 97f848b130403686404dc193415e5060c32585aa3638b825b4775e54d9a058695b86457ae9e3cc0240bcac27ab4c05dd6b488bdc1c797faecd236c6e477fbc3f SHA512 e9f2d254279a4063089436b699ecca766a997a72718d132a9b35f7c8c8fc82c4b5e25fd8f3e6cbd17920fec484140db520c262376ed1c74f847929b7f43fb97e
+DIST redox_syscall-0.5.8.crate 26319 BLAKE2B bd69a69e2a0f3d84843a8f76199ef6b3991698ebac58b23f69c26d02f5f3e24e77a9d5e8259e9fbff3887f06d15ced94ff23b5a3272ab475918e6e3e753dcde6 SHA512 5f9632f1f89f4963c36ede4da9b955c3474b673c3414d81cdbb61f46c08eff67167f703a0b06b239beeb2d720f8fa592a5493c0f7e872728b5b95f561ff11348
 DIST reference-counted-singleton-0.1.2.crate 6161 BLAKE2B c90d3adc74efdf38c063a7d0a180539ba48f9c70bc96542e6a1fa2f6501f4ebfaf8afc340528b3fcbff45f2a0af0c5879111adf270c4d3102ed9b53dc6d83ce8 SHA512 bafd0bea76a131b21f183f597c7ce71a6d15e76ead76ade929225b4930b2345326ddfccdffa1ac6456627ba50eaaa02bcc364865207f574baea89b4e0c709ea9
-DIST regex-1.10.5.crate 253805 BLAKE2B 9f5418b577209051640c3614a98b15604a1e71144763a6f00caa7757f0ff67fd833a7d14fe9d6acef96386a2a4eb60cf5d490472e73fd62ca8bb0e78d4f9f125 SHA512 177fddb001e14281510e34070f88f8e5167278a46f1d93d9286d9606b7673346f504e4064d7ad53558e6988a400c728e33b663ab398fee12ae23fba7158da5fb
+DIST reference-counted-singleton-0.1.5.crate 6309 BLAKE2B 3a994672ee016129963ef9cd31d9d38980970ac1dd47d661633eadd3a56ec38df29a4142c483eaf58a7a465f38993244234f6c4ffa9ef7cc57900b49be5a4f4f SHA512 857eddae7f7215b8d139ecdb975fd616bf71d3f34d2ba377521a3a98261c50b0780429932697b0ba75b289b8ade165c5af16a5d9e164a83340918a400d670361
 DIST regex-1.11.1.crate 254170 BLAKE2B 5cf41012fc2ba8a006c0eb4a922cbbf1614bf300be361c9e2d98956a9a5e9b140e37bea09132fab7bfb633d4439158723624bcf45e8c619c4061b399253c1b82 SHA512 d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8
-DIST regex-automata-0.4.4.crate 617294 BLAKE2B 68f29fae9479a82dbecf8091250b65486c19af2e5c37c1b2df5d12906bac8aaa4d1e577dc0437a2eb46174a9580410e51a2c53ab265dd8af14e0c758888e92ac SHA512 9705f7949b270003c095f1787a3936ab7d4b0dc9f050ee046ef4e96f4f4630ac56cf0dabb0ac3b9120c462aca6344ca60636cb95e0c0d537ace506159c02b15a
 DIST regex-automata-0.4.8.crate 617784 BLAKE2B 7535c79f6ddf1b1225e21171921594dcf32fc3afd47519d2067b2047b19070cb7e6fdfd1563b884fec6f91dd568522fc95d85bf095c11f8c02daeac128c45020 SHA512 278e3e2ab230ed5fa7d4837e8ea879fae68ebf35c2da5cc3a67f46b7d593abbcf71e6326a0cf34e38edc0f3f2166ff42a4fcc17a400d9604429aa5b4be075a3f
-DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
+DIST regex-automata-0.4.9.crate 618525 BLAKE2B ee3fc41c8c445be4c1aa3e5b19a3e61efd641b1a24e7a1ed55f837c1fba9c816272cb4645c13232b66b170bc7c413802928beb22e3891500141ad4ede65b60b0 SHA512 40bde0ec91cc27bc0c3fa237a37ecee5a1f023dbe006a999c5888f8f578ee2c4c64d9edfe1827546cea8e92ca3c10f8b4d494d81f3d0422b40d90bca9cf598d2
 DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff736f2d9991b19814ffc1a414ebc5b76e84fb8fd36c983b38e8e391d165cdd9047832b0d9100f0e1ba7085484b7db5 SHA512 549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8
-DIST relative-path-1.8.0.crate 24865 BLAKE2B 323d6651eb82f52fc75f237fd45d613dbe122045a4b30dc8dbebca4e299465d99c7994a0602c4c039f22060766a135680ce232cc542f065c4b5aab1777c3620a SHA512 80079cf06d0f908822a0c63c5c2f29826f3b458c56036b300f00f94e090f391013144419b8d0147c7269639c109363775e2d286c207b159f68fe63650d32633b
 DIST relative-path-1.9.3.crate 22400 BLAKE2B c6bd04b060013de042079a741a864150632c02cdc493ca1cfd746bcc12f6ad903f8f0748ec68261c979d833089c0fc091f7c9da2b2936e8f75dad8d4638a7b10 SHA512 fd5c88d370865870570859a110245e009eba557225e4297783a606227b13b42abf0c7e69a4beb5093a5a9dabac1545afd988f4c831abe912c21ccd8013c30382
-DIST rlimit-0.10.1.crate 18802 BLAKE2B 8d77c8ab81bf9d37fdf0fa45ca692897b191cddc879c8724fe91350140547953e773d6aafcdbfc83b4865688345a207db54769b034ea76066a667e15a8a2e41c SHA512 d48292f47dc671ea28e2620897601c20f7207b9eeff9ad5ca7aee1681b3708ac23b82ab2c8c88058ffd9e2b2e1ec0e588a3f219c2bd30871137feadb435506ec
 DIST rlimit-0.10.2.crate 19093 BLAKE2B 1b3cb20fecc89caa3d8079130965476f73cf4e2ed6268d8ae8b0adf42f5759832f5b9c6e43a951dc1945bb68c91f135f3ff63c06602a16c6796ba319595e9bef SHA512 80c713dda749f35753546376b8ad804d9a89f430659b26eea1f56b50ac0c1f28ec3f66e611ec20986e5efcfd70e1cbc38c9be1acc816f668c8f4f864b34a056a
 DIST roff-0.2.1.crate 10605 BLAKE2B 34d66bc4f4eb828523c464cd75632171277f6b1901916f2337013f8daf39915e1b7ee9154e18413145c9ae103917e0f34c2b6261ba16b3e969a2cd078a372c61 SHA512 001cbc21c5c8ca4362f91fb237b867966653e6f49fa20be1a6c3d3e8d9f2cca66c474eb0b59ecff1527c771554e8503cef94181295dcb007fbc1a50dab49ce0f
-DIST rstest-0.21.0.crate 42620 BLAKE2B 0900551b119cfb9e18ea4beada1459b770ef263591a466a2247f27c443d8eb0d9dd508626b1144442f990a42995b0f980ccfd6175f2651fdbf18958ce7d2815f SHA512 baf52d34f47b9e400f35810dea724715cb66c494c44e08cf70c6372bd16d4826ef11e3e5bc8c56871c02d525595fe5198c7e4cfff8f2d1b355a2411d8996bafd
+DIST roff-0.2.2.crate 11648 BLAKE2B 38431e1dbfe394274c09e32a9f4c99f7e208130efd1765e9df0c08cf313a0ca81d13198158af6342ec658648cfcfe2e3cae5a5306f8e27e18af7b8163359e896 SHA512 0098d4cc921435cd48fd924d96e8dd27f6443a9b6cba847388ec4be7c2222bffa7a1507862b8c120314d32d08e0cc04e52d44973e25d85536a3a2560fa2a06aa
 DIST rstest-0.23.0.crate 45414 BLAKE2B 6e31af0811504c2d644963d14c0ba07cc67506363a7d93c85e1ee06616d14f3382765aef635b68dafac531b58c7a4bc41f3ef82580c065d6f002b7b8670ac988 SHA512 5bedc6c08a003189280efbc0c3fc30d5faac227a93fa34083200601f4d8e2ddd337e36026ef2c1c93bad436c761d9969756cf289b5994dea854f06f2a881ecd7
-DIST rstest_macros-0.21.0.crate 54797 BLAKE2B c627a310467fbe13b1a91fafe7d7e6011876f3f73bb53016650123dd75a54a0b9b762256f721ba62cf4535b23527074b11a48ae837e1513cf37ee689b8932377 SHA512 8b1ad5feeb4820e14f64af2d1db081ac98d227a0a9096206c32dbb32501b9a59e44cff0abac605fa6c4a670958477dc95c48796a0dd9c83557acf1e7c08dbd87
+DIST rstest-0.24.0.crate 46969 BLAKE2B 6be6fc9edffb5f0240da1b1aed23f0bcb260260d120cd2ea50eefea3395d941cee629b4bb8286a00ce1813ae7da4882cc1d369d7afc8ad482040463af5f9c7ff SHA512 31b240e3539434e39ef988e2fbb990f49277633fa80a211f663e737df220d862017efd6731fed102b9733cf327bc9dbaad2cf0e0553b6fd8f56ce022520b8cd7
 DIST rstest_macros-0.23.0.crate 61327 BLAKE2B c522dc07e4544dd1694f02f7ad707b8fdcb315afc735e031abab6c4e90b49a3987856241bc3ec445ccbfdb2cbc6e6568d61724dc2a17ca603e4d6068301f784f SHA512 5b404d73088bcf248e66bd58caee3c25a94fc614975996f52bc58e8be771e0152d093174e9c06440a73937bc682d896a0ec089b2a8cef8b6c8f5c6cd58e639b9
-DIST rust-ini-0.21.0.crate 18998 BLAKE2B 75f77baaf63a40fec0e1ae31a36581aa2b3deced5ee0e20c367bf6e519298bd8c0f79adedfb055a8207b866e7cf6f2ed8523bf8b43e4085afb20de1ed1e1341b SHA512 b6ae89cfb2217049b8517954262a853c9e5fd446e769d61d2b078ae4af65031bf276ba186ff9bff1fb7e2c2e48ed5963309c8b4e6b7630783e2ceb713ac1a7a5
+DIST rstest_macros-0.24.0.crate 62664 BLAKE2B 5b291607fb6ddb0d60be6ed0ff667d8426e7f50489c7e1ff0a163190e44708ec75642015e7a550f7a1ca117a0c635226544723aab8bb599a46ce8d8de4035fae SHA512 653bbbf3975fbe79ece4190f7d32481c05e671345ea8679135663e6f68b91d86698b9ca1623ad11c25eb7617db490a3516d94101e75ec8a0ea50d67a2146a730
 DIST rust-ini-0.21.1.crate 19496 BLAKE2B 022b67b09cde779b917a8519f33214f883bb2968b0affb68069096ed79090671d038a09a92e9f449440724e6d5c8adcac421a2141225274e466c2a128a3f85b4 SHA512 8461ea14058014dbd8d059916c4f5f0046fae62da85d81219b7ea0629468c7e6822c4e9194a1b4c3e1bd81493bd78a724bbd9f6663ddf26fe803d06ff612edba
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
-DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
 DIST rustc_version-0.4.1.crate 12245 BLAKE2B 0ed627c560d88e5ade830cc5f72c62f6ba88be3e30d0f8db34761fcd0b284e5b2fc063c240149aabdfb12c8410ecdbe50cb10a3544500b5a020f95a31cd6709c SHA512 7aa8a487ca7411b6d23cae62f7568fa3474a7b1fd1589621071be3428a550ed3b7c4ad68277a8f86849e5900397d7d0e9d678f5d423742a045dc7c660fa6c598
 DIST rustix-0.37.26.crate 324663 BLAKE2B 49876bd8bb34da5d03ffff3c0635b78c985d6d5360f783a902a7b3c878a7dd25d10d72f8990d23adcbed9e60bfe60279c527562edf17e37ec9e95219dabd45d7 SHA512 ac9266a30274ce399d3856f0363ff55708ab5cbc817b6a1da31a2c14d14de3e00af4aff49adf1a9ddf3dbe2d6b6c8d667e6c9c5291e3cd3dc40020f73f3016b7
-DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960
+DIST rustix-0.37.28.crate 325812 BLAKE2B 75c5e49c6d60bce124523689be3b13a2aebb8874845aaa518147588950c2ad664ae528ae11e88d41c6d1ebf32041997c0a89d5cceb4582892f95e4cf8c400125 SHA512 d69a1271ab5fb86b1d63498e650a7626a83a5d17b40ba1ad35c7d348aacce0f7a05e14dfa929adf784f132c47ab102e2a966037ce358ea2a7792d6345b55bdc2
 DIST rustix-0.38.37.crate 371243 BLAKE2B bceaa4861747208f1f2b68f8924c7247648d88deb200e97d8ed17c5cbf9c934488065f0ee7e4406bc96e8709b292ee1fe15beb346bff57b5f05af36174420a0c SHA512 6c0ad1be1fcf1b74f670b2c7599ba68c2ce834c760ff7486674d190ae0d552165b0c2abdc35b13eee8c0333a904c67f5dd1efa742c20fd3735c7ccdf2a439619
+DIST rustix-0.38.43.crate 379134 BLAKE2B 7e527b0a98485c029b89f2946f07226d772d9ddcce2f21d7fc7b74c2f2377f780d7fb0529f9af1be6a750a0d1a00393534708dff48f4bbd0678cc75ac1a9a6df SHA512 0122fc3ef3b1199105f63e3d06df0992b7fbf4a3f0bf54cf68ff8035ed96329c90c2ec30b365f02a7a9ae1f0018897489f5be77787b4048c2bfe49b30d7839df
 DIST rusty-fork-0.3.0.crate 19881 BLAKE2B 01bae755c66d7e4f72789b7140de35573d82961adadcc9febb841e332fc2730b405d4f1dc8aff1db6eba3ca03ee24d5dcd9a9c9a914fd2a94428c796dc9bfcd0 SHA512 8e41e12971c36ae1d4439943e55204e32fb4e62717355a2bf79152825eef7dac305c2fe22468957cb3b7af0b27004ceb18eee2d2fa0a6f8822b28b711f64ccd7
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST self_cell-1.0.4.crate 15220 BLAKE2B 9a617058652ab2a2e92434b6eef58a813ce0be5afed9525c4d4c819c25c7cd87aaa12d129c8c4ca9d74c3ea33d81e9dd295f121887070364185b9ab33021544c SHA512 042467e5f3ac0305e2a634df0b9a9379e92b54813e05c3a7652d5327a4a9a784f49e897c968c5c7a87017284d42a889b5420ad18e97ea84183e0283a46dc907a
-DIST selinux-0.4.4.crate 37266 BLAKE2B 2de8afdfc36c8a4b71ae232d053a5d83e49802a5504910460c4ab49ad4c3384b759bac53bd7fc47f4735a242f2b4da4facff94f5d0873c2030e788874f537e9b SHA512 cefc91ed41a610f3c69b944fa573c7a953164764c91a5f7ffbf3f1110cc5408f4e094863e547ac83fe1e07b8ae4046a6463c39a21791ed1be0d7c69845362864
+DIST self_cell-1.1.0.crate 16636 BLAKE2B e13390f77e929084c0cf5f3a4e4af55989f8028128c4f42f318e83890d24b8234075088750f406992d6b0e06e63cecac51f7ac73e74c121502eecfb68a40398f SHA512 06bb4a3c09c76b0814b60641be8f0bc22bdbf1b715a84e740720aad69f4ade1ba27e130e45699a379692b543b0b2f2d0d04c587a48b90e42aabc0d27acfe9465
 DIST selinux-0.4.6.crate 37249 BLAKE2B 259319a7462a84442b4418bd5fcd515c4933f6f1c6cc85c1db27eb07c457aaac7b6ba028898e4ab83a9457111c11f560113d6322ff4dce2ef7e47e1c7087f2eb SHA512 51c7a6f1f928371d1dffab257e3647d38598a0ff40922e82da4d94401836b192d67a876a362624d6bba23b35135df571632a77c9b9a210b4dbce0e051cfd2718
 DIST selinux-sys-0.6.12.crate 8792 BLAKE2B b09be62aa5b83d9472acc957637391ce2056a9529b107b481da10295565e291b7321bbed67d2b21311ceb6cfac194604a9b8748041ae89c8e33c4c57cddc4d30 SHA512 fe4efa5117b3c23c1a917f5f68c893ff7445c366f8599e472055d7b63f6f6b74ab85fa6af80a80e574e6e9aa09be4f01a7cb6f7978972de7fcdcf7a4ffb268d4
-DIST selinux-sys-0.6.9.crate 8671 BLAKE2B df8ce96ca1b223b1044c134627367cf2e321d018b506cceabb29476d280f74e18565d282644305c6bc217c42b26c8967deb1831f6dd7cb2d5c23ae0afc92b754 SHA512 20c3165d7c1706d69294d90ad6fe1a079bb3c3f9cee17838f7fe2155ba90321fd496e311e3eb6bdbe58a930ea1afee5d0cba20f3ec97b6be71d6c3b889b62aae
+DIST selinux-sys-0.6.13.crate 9067 BLAKE2B 25594a9e3292bcc4189b87939a7a2b2a7a85545425b89bb075100f2824e208b3c4fc0476347652f460419a82b01caf741b8bbf8553af4786f1ccc9d4177b45b5 SHA512 6fe39f4fa192b95b201a33d21530df29457df83757e046a931622a73b8b04c93be200390807b79828d62d09eda2627e73f69ab1e5b0e73e6afa54af163efa896
 DIST semver-1.0.14.crate 29813 BLAKE2B a080f0a65127142a90bf033452241ffebfc7098b56a6a6b8bd818528df3b88fb48b3982125b405c1601e1bd55f3a0fdb4ffd9653e398295d8156651a04b2e903 SHA512 04db4c0a30141c2767d24d6d715b66ecd6355c1c88e572d4c473e0fa8c1fdd7197092b8286c973f25d201c5fcdc9105ba3e28c11ba1546a666167afc1fdf6728
-DIST serde-1.0.203.crate 77935 BLAKE2B 3d3dd4f81f7d74b60483d6759879a9f87c0c7d615aec308bad1bc575fac4e2071dc86551c2789e87331dbf8089e923ae56fff82e6f5a9992cf850121b052ce1d SHA512 a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec
+DIST semver-1.0.24.crate 31267 BLAKE2B 934f55d953ca52f6c11696889182e1e4c660a6eae3917b15b411d91a18b22c6a1178708caf95da93e70e6ea97c0762ed9154333d60bf0a08b156ca7b50c4077e SHA512 751bb04fb50abfbb92b2612e1d1097f612a1ceee1861852681d6ad67fe459d77a72898903b14f2f01d8185fbbc022c7471913785610c2a8e9d6530e48094869a
 DIST serde-1.0.214.crate 78523 BLAKE2B c701f316a3204625d475668d2722991d75c8d9c573ae32e9175ccf99780fbe0c9c9d1dd0b4bac35f2cc91aca888c7f3dc41af2842dd833ab82776a38c2a2f6c0 SHA512 100eac65a39b9b9c32c1671d36fa9cf8aca84a2673e24c2521fdbdb3ed9f932c71548f3f1a26b1e73dd7c92a34ffa8ed1c76eb173fa20d6e85736cdf8dc9a8ee
+DIST serde-1.0.217.crate 79019 BLAKE2B a0aacff795d34583365ddd469fa14c58a6cccf8afbb248210aaff3134c7ce6e34b3d03f437326d7c01b3e78f82a5d19c37ed9fa4372970d8b2793f2889288e1c SHA512 f97b3b54b9e99c9a027390405cc054c3072f49c92803a4ed5f5f69e76a179deda9d77993b645b3581437085912d881da88d0451b9e0da423c64033a23fdd8054
 DIST serde-big-array-0.5.1.crate 6618 BLAKE2B f863cb6238e66da9531a74c0b49bfe828ffbb823b8249d3922a07e7745cffe2599cd20268fe37b0ce442caf3b59101c82bfc06affef0d86d9afed635fa332b3b SHA512 bc333f6d92f8a7741774e345490f05a79c191760a714d2066694eedd1625d179e989fc7f209f5c0c91721ba4e608e1fefe13434941ceb2d09d937018cf8ad61c
-DIST serde_derive-1.0.203.crate 55867 BLAKE2B 1bc8aa96328bb83e4e4ff527b1df855bbcefd333f0c43c96d1e0b93f98a46273dd88a21653bccc8f517c4fc06d17b9b44332a963d024796e0a2c18a5bfecc824 SHA512 b2aeeab33395ac11ebdbd922fcdbda29f2592e7a20e78aef250713baf269cacf497271be7aa407f657aba33da132df0e035be046fef070f915f234097d1dd392
 DIST serde_derive-1.0.214.crate 56630 BLAKE2B c284561109e5d60e103f1bb421e4da48f35c5046aa52359177e286449cf8fe51a92f6295f5bec3dc4cd737025e8d0bc618436e2f7640873f66bc5b77bb4f450a SHA512 70bc0a31d344cfec8d30f2034beab25097ef76ab8d89947b21753f737759e5d4e60e5596e0c7994a7cc35993bae01148120f6cdf5239be25fb243056effa27f0
+DIST serde_derive-1.0.217.crate 57749 BLAKE2B 63b4930122d80d64492ba2718630513012202e42bbaa74510729ee66a0e72b8a1ad123784b479697ba562db43868f4bddfdf5e94bb3d744cd68a547471ba40aa SHA512 31020f4533d04b31ae125580a3c5093fad36438d324e2d9b063923aa8c125c654102ae7fbc3b3df892bb41db6b321962a23e0a37950e080055d715d15b18af76
 DIST sha1-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f
 DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785
 DIST sha3-0.10.8.crate 858216 BLAKE2B 0251020db34e0be3f150d342d055bae00c7fe17e2eb1f5134016389e45a4d3ef35ab8e533f58cedd7e10412955c4a011ba8e604e129fc5bd9a433ff756f0ca5e SHA512 390102cea4cbb0de4fa772a0842cf6d13dadde9fd95c5dfa9e75ebf89e98a2b4bb10f05257797e8f688af78ac42d951cb71df71e3b7ec36e52e2661932479c7e
 DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST signal-hook-0.3.17.crate 50296 BLAKE2B 5469a11485362b4a76f99c06071c69f6cc083bf4cceea93fce0b43385163ac3621b7a3c98d18ea1fb9e1439460ea37f470a29bfde9dea199e60a12b248be5d25 SHA512 045ac6268e504c5561d3884610a48c930dfd936086f793839f42602e92e4a8cef289955776e8eba8a5ca1a91b5f27ccb3724f49b32091f8f06c8bde984d82298
 DIST signal-hook-mio-0.2.3.crate 9064 BLAKE2B 2bd11d0fad02fab92871e0129fc4ea3a609a43cee5d33737d82a624018eaa90077f2c92fec88f7b19d3ada619b8618f9d33fbd2cf6b7c63d3175dc57fb0341a7 SHA512 98429330c109dacbeca5f0788d993d1ec2830b6f95886a433592b2096508dfef2027d62a99b985654dfcd927f7f3f93fbfc19361f8efaef5efe84cbacfc1ab08
+DIST signal-hook-mio-0.2.4.crate 9314 BLAKE2B 018d406ae25802cb376c1f02241ae8e7018f2f7837127a9db40fd17df1cb3e13299c2c372257b0e82aeac1a77b75c732c7344e50e969180e696bf3f8e4836f62 SHA512 1ce372f4550c046f1420b8f4a29cc4c8e904c08fd089cf973f26aa25b39cc6199db56d2ee3bb34684732b79237648e904389eebbc32b5e108f7d6a2d22b1cf3f
 DIST signal-hook-registry-1.4.1.crate 17987 BLAKE2B f1df8bba55c72a506b9210347f9dcac4d158948e73f6d1e60f43340ddfae368aff1bbb6a109af326af47246d9738d49f76d380c52208efc3c6f79ea0acd31f0b SHA512 e83acec2b0083967555f6c659dfaacc32d851a9485c9f6f4b4cf257742ae3ffba8c14708c75f1a5520e9d132ea9e21d6eb65aba492eec481e8492af8b798c5d1
+DIST signal-hook-registry-1.4.2.crate 18064 BLAKE2B 7274d4c115678eae2640a709bf9d682ce867c1f6295a0c5f49e492f95dd1c457f20b56207a74221df1fd9d744b24c6260e28f705777e3c7d47b7bdd36f1d57fb SHA512 16362d232b1d301007c069198d7716848aa73d898ef92e050422b36c09001b4334390dc95a6650e5315377fd8960d4336e5ae869b0a305e8525e977b8327c508
+DIST simd-adler32-0.3.7.crate 12086 BLAKE2B 8e0ae18603b344fd8a6573cc3fe1f8594ad542619a6e0d6e8f62e356a3a97409f4de3a215d561b8ed0e063ab431d81b63967a5a0b6561c45537a27ee84eaa362 SHA512 2976bb7fa153854ecd0d68ccdc108bf81d5da374839d53ce9dfb27e80d8db258bb817ea3dac73921e408541d75e2797b6d20fa63c42c1e8a935b6d75dee14bac
 DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
+DIST siphasher-1.0.1.crate 10351 BLAKE2B 6653898cf0eb071fe83b7c317f93ffb73bd26ed601961173875b26ec8851632599891ec178b7e14318abb9eb98d522db8022deb852af9ad9f6bf38a5a5708e82 SHA512 d230991add51a555af95b30ef104c0e5ed7011fafb92d6ac9ba0f238c8bf4d2fbd39f4b04dbbe960453f8fdd16d3768ba39f39e4877ad453562e689ec8f24a28
 DIST slab-0.4.7.crate 16647 BLAKE2B f567cc822e7b84f64a0b0372c22a0463d260871455a33df025808a0476dcbbd4e051a117d8896d96d6d3d0655b7c296cd691ca22edc54486440f4e2e0f5d1e1b SHA512 659a9ca3323fc2cd236f6cb9eb6feeae8a1f5fa046fa239a34cd7a5ab8a7eadb9e5977e8d5cc41e9138900dd7c75ebc0601480771c5fdd2e084ee76619b82521
+DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
 DIST sm3-0.4.2.crate 10344 BLAKE2B 72d571c1e6c7bf2f30b2286b4bf5dc63a872b838a1bd6c67dc7fb37539367e4ac8ae2cf49224d243af5b938176300681f80e3fc40e44a65e31310e97b390322a SHA512 b5cbb43af4d5be6d18e9e5bdef151817c89ba6962f37d36b2ff46be704d8d7996a5c48bf629e91ca3648229eae0d1e03f7d9407aaad64a1cf0786dcf6b363c5a
 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
 DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f
+DIST smawk-0.3.2.crate 13831 BLAKE2B 551ed3406db797765034e2ba53d5aa75eec57cce608097eaf0f1a94fd1df8aa8bd248087a8a3b037d844fc91773f74501686180802a6d75165f771ea1f20ba96 SHA512 39f3cab5a6eaaef6f4e7703a6840ce7a805f6175e02968090a58a12d3420f0a144533e5d6542f1e9ec0e36902046a180386548713ef6148064922ff837fa1602
 DIST socket2-0.5.3.crate 52588 BLAKE2B 03692b67f27530670048db0920e26da4d95373a3aaa81ffe840b09e73a5730e2cec4fa43c25e63db0a6164c67d6fe555b0fcf1c9f7ce6a231d2972f5224a4d50 SHA512 63cb78d66b057587e4b3b50b9c618db1a202102c72b52b79c2e9f9a401dc1c28fe4523a0f6483b38ca8a3d24d1e2fca0b7176d96fef6ec1b922ae7c4afacc324
+DIST socket2-0.5.8.crate 56309 BLAKE2B 309e5a0e46d0b9debbbd6049a138e56b82df4fc0e9d1115745ed935eb40c81b004ad748844f641934e13b5b88773db5cc4a57fc9e61dc82b5322fa0232110864 SHA512 b7d03608a3d4cf3e2d1539b5a375412effcc96279e8f57668fa8cf67b3f0a3a6b611ea5e2e72f282460582954acbb5364320611f7798a11ec9e4833e53830b60
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
+DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
-DIST syn-2.0.60.crate 255808 BLAKE2B d7a8e415dd72267fd92da48ba8b3e6feb728f0639797db1aa74aeaa2a57935b7565eec37cbd32eec826154e2c54075b121737369eb15af36c322c34b3cfd7930 SHA512 20bfa02b03c193672a9922f9a5e196185341e082a262f7c00d7c2d467d9e2d77f4af3994634923cfaeee34aa9eab510415165f052ffd9b1ed0b1b581e272898d
 DIST syn-2.0.86.crate 276473 BLAKE2B be9de484d0b3ea6818cac64f195c893e39271fdc5eefe2b78fbe6c39f61a7960bfb254324deec6f1b0da2626c3d116ac50fe491427a967a00d20e4affd3e5c54 SHA512 1106de0b14981e4dcc1526d932764837cd2905ca2ca3f259a59e9f9992438f88dff49934bd99f3268055e920c1f226a8bbde0c779fbade7ed311a2d4e5230095
+DIST syn-2.0.96.crate 297497 BLAKE2B 68b62de28ad670572096a1d92ff8ed6fb55fee441f2d429edfeffcc48fa1d4f1cd39327540a4216d94a9763b84831956cb7e5c8ce89b81f1dc5767ea5734620d SHA512 ec2e352a5b0b2aa619774c01d7a7767674a44ffe91dea45d3379bf172d13039c3d37f264e98e26b20fe1d86db6d5190f220831c842f3316469d4ae73c2bfddec
 DIST tap-1.0.1.crate 11316 BLAKE2B 60786fd5f12c2f06097330c26809fdcfce62716586d2e1985f8c01406d356ed0ab730a04dfe72ee3e1d6208a53c76c66883d45a76130750b41ba5b82aa721b83 SHA512 d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995
-DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
 DIST tempfile-3.13.0.crate 34910 BLAKE2B 736378935088ccd8b540997c0554444c3752a74c9a4bd82cfcb700a9b22f572d0f2b3e61252064d4a631b57783199cfb42309e518826346a83fb5adb44843c49 SHA512 68701bee80309cd8dfa96c237b2344f26bd03702d2fc2e1a253820c98654c85d802aee1e0fc856f6372159a92ecbf624f78c8146f34a0cf924f5b56284915f85
+DIST tempfile-3.15.0.crate 35693 BLAKE2B 1b4d6b17ed4263ff89ef6967650b0c18671b2b80cbfe388cbfd77ca597473e91c1c7aebfc715d0fe4360c20d0f235df31147b1f029b471aea8c57d188f7c2be0 SHA512 82636d50a29e1ea8cc61e80dc1fa28ea4cfaeb6175e5bf0558d6cd6f8da823f50a808a555ec17fc8601acfd0f504e15688fe95f64e8792feeb216bf27678807d
 DIST terminal_size-0.2.6.crate 10585 BLAKE2B 8696b9046c717eec8bf7246346af84a5d0cb740ac6e1335a4d8c20476628f4c0dd7c6106cde33513681466e9701d4b05d73f22a3bd2dfabc4d22045a69d31345 SHA512 95f38bc00f8c5e1a6913bb2a0a7c46d96e02a4f3234af1623ad3d7be41eae677e77f1b5d5d005d1e9d778fcc6c87196f67a51ab37caab5b4d299da79c85d06ed
-DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
 DIST terminal_size-0.4.0.crate 10036 BLAKE2B 2f910a6ecd80a3fba12811eff425fe2d1a7c474d8db7f673037c1088ef468e96d41fd13fd3175c84c20da12195a07bbd4354767bdbc64d757feef86f86e384ec SHA512 b1a66cdf4e94997b5291f3becfac1e2a838f6c3f6c068faa1ff1aa775b2a97d41be2aff5460d88928786cfd7dc8dac5e2d46a62b475d40343e1fd517c6299897
+DIST terminal_size-0.4.1.crate 10037 BLAKE2B 1d99577917b88498902d85718b4ba71ddcd7a1daca4f1b38f4b5ea4c34533eab9cda2cc344cdec5a31ffe0152fbcc5d499ccb40dc73f985f083a3ea21b0b1226 SHA512 e07bdbdf695bf9a607ea7c7c4c5b22a8637b0871877114aa305717a04d31a6b7670e2a79435810aefefe25db8c9a655e4c4ba6075d4ec76322a30cdf71ff03be
 DIST textwrap-0.16.1.crate 56012 BLAKE2B 9b5a7c76eca64d089f4fab7095f2d35624527ca223e53b03cc807c6bfe913a99b55197b973a3102e3e5c4055bcd6ab580a0c9d67657180b61435bd6eb7631211 SHA512 3a8d2036c8e4b88866d68b8066a2991756f6bd4ac5c726e63fdffbc894fbdc03bf8b6e0ece4b96684c8e1facb6413190768d51a8539094efe47977c120d31f1b
-DIST thiserror-1.0.61.crate 21264 BLAKE2B 97337830507c009dbb4cad84cdfc02bc097b9d39d0af2fdecfaa63f0c12229e60727244fa4e44c2d54daee67bf8b4e8492d94a5de55d1a90b8eeab8c0d082e80 SHA512 9c08b868eaa47178ee60733aaeeda60dc46d58d2b9c15985ba3dcae4923e8edf02b97556df52f508753b0ff52782f6ca3227e9ef6343066e5d5d3a89e03f3f15
 DIST thiserror-1.0.66.crate 21844 BLAKE2B c078cb2dcacb6ef27873c771450cb2f16aaec1056b952f0a9ac764ef5272bd2a82c7a87507dcbaa2773bfc9463e7c09dc59824f27fd7951beda4e6a9e1a75917 SHA512 d586ff8bdf87efb639e8442eb894ece3850d1fe4fc139d0e1186f72702b07ec646553abfbfc4b1512af8dfdf51a894f7e23962e72ea940086742e4cf804bf94d
-DIST thiserror-impl-1.0.61.crate 15786 BLAKE2B d63773424aa047c6eed8a6c9bcc8dfcee9841a2d4fdf6fc2c117695c09359371931722198b2e0b2bae32b0c54b6275f964e679b78b8bef1c365ca33aa41562c9 SHA512 b43bd2ba6b751b777e2fc78aac92a3e662a1876f704625c4e894019fc68a6b7628b9c3b7ddfbd2cb15fe6fdc0ff679ff94b0c47e2660a40919000ad2fe1cfeec
+DIST thiserror-1.0.69.crate 22198 BLAKE2B fdd8ca8c8ca78702377d0bf7b253440519018275b105db980d63229d0d44aa5c39a703e14aa6fe453c779b3c864d8044009dfef893d2a5294950f067656d7a80 SHA512 ef50d2867d965da1dfb29d26faf6de273b5fadf78f95313f6caf44d68bfc610b9bd4b7544200b05bb0861231cfc84e961007f8db83c7905244c492037fd31899
+DIST thiserror-2.0.11.crate 28648 BLAKE2B 973126f9a9ca5f3118e830af11ddde4b26c905e13df89b2888b42facc4e48b3adea53b66405260f6291c3df7ddb85a93856841be3626b005040b3fd15502e2bd SHA512 ba0c3c2615bb9bfb07affa66ffeb2eeda43b16a974dc9a0482165a4a5a502a376e2fd6b569a228a08647de23d291e2c301dedf89d8caa79833b965a184dd5904
 DIST thiserror-impl-1.0.66.crate 16131 BLAKE2B 2374df81dd44decaacc007083aa8b582fd4ef7aa0cbf6162a392db42f5275875d286f83f4f336bfb937adc48dc93f70612b55a06d6af8edd49f2c6cade27aae7 SHA512 a3152b6fedfb78e67b01cc8e458c10a03e760ff34ba730d352690900c20934aee1d873adaeee0586150ac1597ba774d62de0db9e0ae56b9f09a1366da9d67bce
+DIST thiserror-impl-1.0.69.crate 18365 BLAKE2B 51663251ea6ec99c59aec35fe73c5f9760809d6b6b7eaa8ecbc8f6939acdc4d0ebc11f9034d9204dde7bd689d5e8303ae0be86e298745e9ef96825bf73453a08 SHA512 579eb796c8885feb01d27638862823acd96c79440655bb444c3445ac00121852603396ce7439aed617c0a0ac69f62102167fde5845411c906997574a46d6d9e3
+DIST thiserror-impl-2.0.11.crate 21067 BLAKE2B 33be76d7ab098eaeeaefb2ea5ef20a73221ac51b491d6339e1fff66e24118854f3640de43241e233c68be17804b90d22d75f1d60f7df274acef4647c871e0e17 SHA512 3fb76f16613064917d2b21f1bab06fd4dec9f40ad1f850aa78c5917854347cf9034a72d2091dc792ac06ce9ff9e29ed2bec3a4330b459abff379356e35c8f701
 DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
+DIST time-0.3.37.crate 123257 BLAKE2B 5968d85182e3a945c194c0e405a3c771698472f4b4028a01870e8dedcfc5c10a32e167715c7c12626b46b9ddd758c72e0188b55e45c0396cbaa42a65920ae28e SHA512 6d007507f79c45a7408675b3223bbf83a133bbaf96429ae6a02b5db09acccf884bb8323dc6f3dd05e7ce87a78366a55bafa6c6ba31b04198a31026df4ef425e2
 DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
 DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
+DIST time-macros-0.2.19.crate 24268 BLAKE2B 18f0601f5307d310010bea20dc7171adc8600c5b2e6303dc9b38ebfbaa7fb59a029dddb627cf5a5b7fd2f7ed66186dbb5321cad0f90f3f85b6edcc901a8c2855 SHA512 c58aa596247a4cab720bef74ff43be44686db2da2978826a1f9b58c640113b5696efc2ae1746bf84042fdbb94bec42c7fc34f7ae6812478f55849a12a90dff5e
 DIST tiny-keccak-2.0.2.crate 20129 BLAKE2B 105a2d2af36cc053cd95721ea563108f33b8a3feb2ae84c75a04a65ed5d548dfe35d8b2e48977a82f725c0ebcf914f21157c547f4a74bb4d98c2e894385139be SHA512 c0219f23361eb07e0a68575c461a36b7286d9bdebae89080d9e259178d402b0c7762ccf33e65a16951ea168392322c44a24eb55189cf143e22d09d6dfc4acec1
-DIST toml_datetime-0.6.6.crate 11698 BLAKE2B 8db35da8a3f6fec053bc82995f4abeb8d2855f2e94ed6ef4a4a6f47e956ea2cb6f8d0edd5c1b1cdebf83c7c218d9f2d80f48346e62fa7985532cba925891edd5 SHA512 710182bcca90f0d830423df41ff0f8e7bd10b866fd7ea1f6d37a315c7b4732a3b6fd61cf411b28051959034534010f24e250e10282c4e5a2539c2858f447aca0
 DIST toml_datetime-0.6.8.crate 12028 BLAKE2B 62113366771f22b437b2ed0d3bb2489ae9078cb589cfad2ad2e92c81ddbda48f689e5a573366eea4f54c2b3cbc6b37eaa8b442b6d935b631a992de4917268757 SHA512 d38b98db3b2d4eebd3001d88e2135b6fdbae63b200f7e900c6bb9c121dd3f170e557332bd26f237312c1cbef61666716b0cf550c2d730f86fa7cd9eb5f64a16f
-DIST toml_edit-0.21.1.crate 101661 BLAKE2B e794b6121ba7e2b1b3f50966cd40eebacee6968b6b28986cfe4cb7312b51ffff19f74826910d8e4ce307f74940f11e71e6afdd768ac196427bddf44595bbc797 SHA512 10cd3b16f763f55294923ce8f166f96fbd67a0acc4a93a46fb3044d8a38148097c592ebb405ced87030d35154abfcc971eacf0172b624ab477a11e616efbaa07
 DIST toml_edit-0.22.22.crate 106387 BLAKE2B c658eef2dc8420266a6928d7ef46340372af2593e4db0d3a67ec88aaf8f601d37d1e9b5bac231a799be8a2ee68a7d98b5f651e9c109d23d8b19b60cf75debddb SHA512 0f98b371f7e27ae7f435a207c0915f942af145cc5dfabfe6d57f2b797efa3e706025401e501fccc6df70c001ce27051381556b8e7824447edd23ea25d047da4d
 DIST trim-in-place-0.1.7.crate 2485 BLAKE2B b6a3b845d379c09c3d36658925ececed94e4b8a1cebff0e3333a372efca42899800cdba5642ad72c36266ca5d24dec45f5be8f50b946f9a67ccbfc7bd6e81877 SHA512 9885e2cf7098e5eba7ff2a481e9de189dc509adffc32307e7c6a4a9aaab05a512ae914959cc53d572d86f64a79950fc9b444da5d3a3b703a6f437355c5dba5ef
 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
+DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
 DIST unarray-0.1.4.crate 12895 BLAKE2B 20fab4ce218941bad9ae341d24e92469b01f46523adf9d6c80cf2418b79dc529011f357e3c96a66ad96bf822358581a150f75c4d3ca67043e01814c59f1a9bd1 SHA512 373d16e9688938762c61cc9056a50badfde417f64385de1949678333cf9465cc496a357707989da83ee5e4ab041a89688fcd3ab9dfb9c6ec66446c9f5b56b630
 DIST unicode-ident-1.0.13.crate 43279 BLAKE2B b5e935020d1c9f3aa24f7d382f6b73d6510d654a61ce1c9c024e2e365bb817182e076139f370e822573531356fb78ff7499049b1f29aa1e2f4a2cc74a955b47b SHA512 5ba884f39debe9c8eb0b1d251ca713f7e2bc191d211707ed10cd81465487dbdca53914c19e131edfa1da15af132dc2c346260c3969c61e3747b63399ccb1cc51
-DIST unicode-ident-1.0.5.crate 35455 BLAKE2B 7e14ce97ac53a88ccec015dea690918a673dc5b49e44de7fdcb5421871da35c4f514c6db9a363d6f4bfcf2e9a61a50a593d345d0b6f388ea882b17a00cd0335d SHA512 d355370daac356d900cd4c0a792d6c0eff114524c4bffce4d7e74469fe2117883ee00bf0e27d950b72e88739473f2045d5f83440a0aedfede97b4d9163b64a6c
+DIST unicode-ident-1.0.14.crate 47547 BLAKE2B 30e0b6d7f3a967aaf5b9d91237008a60c3a8ded53bda901696e23cea3931dd71b01ddab866dca9e31e17c395d5f5a68f2a938655b693e894962568c2cff5ca15 SHA512 7c6dcd1724e8cfedc37546d1abd49088b633dad228097acc73d7b6cab255b223e830c541144e05a00388fd8ca8066f27c18792419cfa58ee9da4460a38d0bc0a
 DIST unicode-linebreak-0.1.5.crate 15324 BLAKE2B dc560d5b36ed01357c22750feb7f09fd0f57fb0ea543180f6e31c0b71b51df4faaa70ac8482f9cd60e5d1faa5bfd4bebfbfd628dd5913c2c4a858ec04beeca3f SHA512 f37be2f7b04b886e95bb7d0f33bd392b78bb940ef9a01cec487062cf31ec0367306650fad7004df556887a324c714eeb28f697044aad9a429ce07b7b7344af60
-DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef
 DIST unicode-segmentation-1.12.0.crate 106323 BLAKE2B 268b60aff6694434f05afb7e2b8187eeccdceb77460f8ce2ac0f84d470f8a4e03182ce3f7906177cd2f00f989273a7e69061a763006245f0876bf21b15076804 SHA512 55eebfe5e9972b39d7c0011d80eb5f517d636de37870999119a3d8f064f21f67b66a5ba9761d562738b05f220e21d56b5be7bbd9cc51662994e40dd67c38f946
-DIST unicode-width-0.1.12.crate 24062 BLAKE2B 61afd22353d46a8a77519af9b3580d75dafc7965967f7724cb740f1ee199c7742b3549ad6c67776b876dbda5b8f27c634431f68517e29a72ade1622da9fde446 SHA512 0bafd7a69bdf49c849e7c063ebf0487eca8a76244e3bc18c9a5f4609465dc0e5d482daceb6a9a6f4125b801bf7063cb8225fdb55173e5dc55e7bf278300df1b4
 DIST unicode-width-0.1.13.crate 457228 BLAKE2B 757c4da5fa090369a26130b08440c2348f1cd1c0dfbb6770dd75b65eba797eaa65f5d683f0c2862cced06124d46a89b4825af0d990f6adc2df8709b8ef291665 SHA512 9781d6dab2c6343e8c28ec66b50cb4293261bb2114e122fa80ad2facdb23020f5b621c38030193b918669e58adf143808e5ab4c507c18beb6dc61e97b2e296f4
+DIST unicode-width-0.1.14.crate 271615 BLAKE2B dd2e1504caedecb5d37c397ba05446d3d762b8b6833a8032ebbc213e324d53d89db5e96ed2f7223096e5754d800b39a54105906effc88d9437d7acb9e7beb81e SHA512 3c58a18776aa82cc13c761789a47901616cd98a30356f93d7eb05ae457314209d0a66213e2bbfa5eb8b59be6beacf62438234ce8daafa31b128dbf7d5d6fcadb
 DIST unicode-width-0.2.0.crate 271509 BLAKE2B 53015f24c57ba65d7ffc6e15e947f5ab96fa272996fe5a4d2f9203051972238ea7591c99f1d8ae5d2610c7b83c215b6912eff7aaae034237aec8d79620bfb843 SHA512 38149ad512a44fc79b2c991c6b5667da2e8f8b442ab6bb7e4f404e7fbb034f7540c7e0e8b9e72a1ff6117b899d6034862239f43b6423fa89d55dcf489caff37d
 DIST unicode-xid-0.2.4.crate 15352 BLAKE2B 80c327b39f3b8f2cdb5747cde968cfa1efe7b65b6bee9136adc881fa19f66aa5b1010d9d08de55a61b322d665b5b0cb0395e9ac471f6333c40d8dca5d97e123c SHA512 e67bd1258e1961807d9d5fe583a89ab5b82b2a529ecd32cadfc79aa5331380eb4a2db9fd96b74c8eace47f2f29021587d69bcdbf79f7e2650e92a25f7839d03c
+DIST unicode-xid-0.2.6.crate 15744 BLAKE2B b1bad25897717f6346f988d5a7c90c51fb842da113f19aa434a64add8f2e637258d9fab0f7b871fd2aac02e83c68359fc679b326232793cbc804523e2bff5056 SHA512 f68e78484479a5341b14d7e3391e691265851fa00feeca53af745479af6aa9b4ce3570456df785c8362043db9b04e2e57f9bad05d8305946f16af405bc611764
 DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505
 DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
+DIST utf8parse-0.2.2.crate 13499 BLAKE2B 095b5d219ab8ff04c06fd6303e03d913ae36a57845f0b2ca3217a40e31a54cb0fb5ecedbde165d28f5f60f1553d8252986d7098fa83befc84a7cb20bf3b76144 SHA512 f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266
 DIST utmp-classic-0.1.6.crate 7570 BLAKE2B cb75636a5d412dddef2e865df5ae011581fbfe31bf66d12699b00f4523795eda36b55ee6911f310a2ddd164c76ad6a74534b1d240af949631628754e265a00b9 SHA512 f754345da7748bd96b21cfcff296341949bbdee952142943ef2267d9aa8bb4fdec6d04be220879af124993f161625c9bdbb1eead3c299cfcae66de73c9956bb3
 DIST utmp-classic-raw-0.1.3.crate 3846 BLAKE2B e0f43c174003ec0498dd206c55c2234bcc86e82f4c2726b1f3cd1fe9839eed94a4ca7644b5c76d248074f06c868e13897475c4934bc916d79fd0de5e0533ac03 SHA512 c6e22c28ca7453cffbc00e8e3bf8931730d5a3397b0d13fc3f2366319d46625c02a8f86ddcfe1269ca7d466aa42377c991f09f34c9ea41b67ff3e1695d09376c
+DIST uuid-1.11.1.crate 47721 BLAKE2B 0984a57306558c1f17b6095fcfc603a1105afe9ebf1f24ef716d56db4c4d61c6507b766ccd8f453f7371341d5284061b6d09b75602dd06603a0bc1b320241e8d SHA512 b098511ed0e8c91fac9a11dbbaa335a9318dfc8c44853d806bbb4ff5b93c77cdd704713c16e3bf3fbe36be37864c7345af807fe24d210e49781d932ac831159f
 DIST uuid-1.7.0.crate 42627 BLAKE2B 493f6a3a643d3493a2bd7e0e92a1ccfb7bd722e3a1fc8deb7df0ddc875a822daead1cdd35dc3ac6f26346844100a671318d71e5ad760c9587471d4f05bbb0c69 SHA512 2ea704d082b725d98717d772e1af84fe743929ee32658ebeb111c6fa2395ff5f44558b7e375087617f91c6f7bc242f2db96e80a631071722de6fe15af845e856
-DIST uutils-coreutils-0.0.27.tar.gz 2317966 BLAKE2B 83ee0f7dc45b6eb11cfa77bc4c6dfb019564ff475b5bd99872fe9a312bb90c397003f767eb5660cb9078b267f29b54c49733d0c373f0d0761d3de3fc6fc9d1bd SHA512 e798a14a9d24b2ff857588336e4035817445850a1ed5216b1fa5b876082eb0693c7ae535d0106a7aab95690eb0369481308e877f60e39ae67a38b048e73574bd
 DIST uutils-coreutils-0.0.28.tar.gz 2386859 BLAKE2B 6535a1e4645c7f4e95886b8a21fcafb3774a6fbea3bd04166c87cbdc1a15ec4b4608ca2d7536469a30321f257ef312693c29f73a1ecd81af8d1757dfc387654e SHA512 3c3eb14f75d5dd774b422af236870cc1c55a7f4df5be3979ff78c5de31f6ac9c77b6b0f10c61886d784932cc461968caa3d5c76f21a22ad5fe319cced9b7f5aa
+DIST uutils-coreutils-0.0.29.tar.gz 2428726 BLAKE2B 6477fe3db2ab67793a63ad8cf128510f04132764bd75cdfff07db46933e1aeb844651c9765059e09da6762d8ef6960613c9f20ce3b00aa951a6e2a10735c4a2e SHA512 29bd390f761673f63b41baf36501c21da10fcab642f73da09e4ef897096427ff6660e069cec9f539efacbbc96b5ad992c6978f2a7ab5676e7b9a70af52c589e8
 DIST uutils_term_grid-0.6.0.crate 10904 BLAKE2B 9779eac591c1e9b2e60630fbd49350d171b11fabe2e0d0df64e2c46da186afa579808ea052c8bb5db02f174a8548905dbcaf3b002fc3f240a1fe469cd739c99e SHA512 9d169a6eacc368824924c49d7f4847927f633c6492d921735deedcefc02c53664b094e8d736fe45b1d9085d5c99ea3ec676f25221a2cf2e81ce4c5f261ad40ab
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
+DIST version_check-0.9.5.crate 15554 BLAKE2B 131e75cc287518831e142430e2a39b48e4275874f4473780d47a27552294097aa1cddb65c385583e1022478f940b495eb43c24a8b1617b8ac5a24af3340c0d72 SHA512 d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf3ab82536295019268b3125084da5dbcad818070bfdcb6a5de08da4eb483475bc225a829f58a1e3e040b5fba SHA512 da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST wasm-bindgen-0.2.87.crate 175052 BLAKE2B bf8cf4aa1786ac5c2ba76e80500b5c54313adf9690ef370e60b894401bd1b81416da7bb46b90c014412c96f30f995bd1e52cf7f3a6be1111aea40866e8178396 SHA512 0c3099155ef079d2b91d2d5b135243d687bf865cdd9ae9d97d8cc2eb4c9bf7439b66b28d5b1d7e95048e53be63ed4909b6b3f2427951348de25ca7abb7a03705
+DIST wasm-bindgen-0.2.99.crate 46136 BLAKE2B 04e69294da3dc4feff9001185bcc5b864d1f14a1ead6b9a31c830b2043dde191f9f7c65755d607365a3b8885bd340bbd266e26cfa74c48464933c8d7a1164f94 SHA512 184aec11998b99a730ea5b63d6141260cd0b7cdc29b02696f533b3e75ec79f7c17c6aac892e7a7b24036c6e73592d01df638ca31b54bda11d3bdbf857b1489c2
 DIST wasm-bindgen-backend-0.2.87.crate 26821 BLAKE2B e230aa256a1f681ab3ffd2c83c3f6a810c305bb79a5e1d806b8b2b9f54ef0babc83809f6153b9ca511faa4b122f80bd1cc9eb97e7ae3cb4cba9e2dc1c6bd0b51 SHA512 317ee2bdf85067cb7f4b4ed6ff475ff9e5063143e9b7c8a28572211c09025935815227c4afa8c92823ac92102562d4d34531aa4891d8c922048d37e27377ee94
+DIST wasm-bindgen-backend-0.2.99.crate 30928 BLAKE2B ecfa94a461df79a33fd2bb9807374a2a0c7ac370b443e5a1103ba73a29c9d337ed3feb427c80571ccc15599f81135987742e698199528a9c1bb570baef3e9d09 SHA512 8369a5e618223f09fff7cdc35662a930b3eb11024af51bf5fb9e70c45dfa22452a518d723f3d912c0c970fc4bf748ef2d83d48756483174993f7d04c92d9621f
 DIST wasm-bindgen-macro-0.2.87.crate 13897 BLAKE2B 0926975b0328cdd5525820358795b7b68b4ab9dc460715ed84e5d276e76e936057140efb1ba875acf25f3d2862e680f9827bd05cc47560d54f7ec673f30244cb SHA512 af366d8d853b280014cdf5286f3b1f6d7fb0837ce6e359a81cb6f85161537c8e2cd06d7f893c957f5bf1548d34084d33a213670b471937782b56033a23cb15a6
+DIST wasm-bindgen-macro-0.2.99.crate 7011 BLAKE2B 07182a9fb98f519d1e5c934e609d7a42cf2409319f59dd901e2a5bec77972b4d16fc6f67cf40ade58af874b05faa981c894443d3950616e2aad117ac7355ac6f SHA512 344bf5192e43582246efad257c600003c41b589234c1900f6ed201f96b6f7665eb55226da15d612060042f89c6214e452489cf3aabc61645843be9c27f9cca0b
 DIST wasm-bindgen-macro-support-0.2.87.crate 20006 BLAKE2B d32dfc7231e4fbc226586e66063538208f9e299fbf803c4e2d1e1e61b4a22f51cc7509bdd269a44f072f9843a083ee84d2326408fb3211009ce93542c3fdc6ce SHA512 9390aa2767fed1027be168612c424d4c7cd4423addd83b79afd8c67886f66303ca4846e6454302ecc78b47bc62e8ee46849a4c0d3edb98849ce8476901424e33
+DIST wasm-bindgen-macro-support-0.2.99.crate 22800 BLAKE2B 9772cc94a64f768eecae12072e6d700bf95fded306297b84e235f3450f7c5630cb1985def3eaef05aee193c693f92c6fa61d7a6ca18e84a2b73aa38f070d47e7 SHA512 936ab8211a13fbe8b8f21a870a78c03e24219d0872731561353cfcae245e9f632246f179b67f2b13e106c799e68c5c39f9e388370a8ad3f93f299c4804f5907e
 DIST wasm-bindgen-shared-0.2.87.crate 7248 BLAKE2B 0393ce9452119fd5f92836a76b28d3a697f91fb09de39d1af0a2a83e81d48bd4a17f39b48f15ae97edca3e361d4f8fedae8de04173c4ba1711decc73f64000d5 SHA512 cb9ff537554f56fd07052ddc4adc904a57ee64e13298df1dfca58b361ce163c34640e7dd9ed301ec1375f335dfa424230e22638ea7569ceb34aeca4505f6c008
+DIST wasm-bindgen-shared-0.2.99.crate 7773 BLAKE2B 73489af59d16f4d0a1ea51b535cd02d2759b5b7b07873d8a71fa6bd6b6ce1cfc6e8139e6a79346abec13665ed9aeadd0b5b6aed28ae008f9dcb3d5da9fce665a SHA512 8da0f107be99b6666cf1859d68ac0a7295fc03e7b494fce1df9dbe57d21807de8e2bc95f5b974562303923ca4646f38c5297588ad7c97bd59ef236218b2a64f9
 DIST web-time-1.1.0.crate 18026 BLAKE2B cd72e384aca90c79e587448160587531c417f31a32e9ded23e6b78d492d0e517520170fd03177f28870c313b9302b28c32069a2408acccc076a1e4939a2c8f8d SHA512 73e4ef9851de089fde9381a595cb9e37a434f563f1fd350e345f2617b701caf57a9aef739b922b5b10cda131cdf2fd0af42c55603f8973a623a8b6ae70f6cc9f
-DIST which-4.3.0.crate 9635 BLAKE2B 36556a9eca6d8702c0e3634abc458f7ff831aec28a7117f21f812c6f46cccd8db0e6ce7cc76f8033ba89d51858411251e5fecb0883542669269cade9c1a5aadb SHA512 cad05bd43dfcf9e50fd6e3b9dcd5d9a987175a0f44adbf204079117b70d0b42e6483e635287924698c51d0452f168e48e041453f18ff5720c0e2ec4c734d2578
 DIST wild-2.2.1.crate 8080 BLAKE2B 489a2a625aa8091fdef9f4d49747db7816d82c01384672bd12ff9e4c906f3418fa5a5fa8951b625f6d22a9c1977c523f1b54d7c4252c241413ef6f63d327cb29 SHA512 8f92b83cb2568fed7841ad372111138d9ea5806c21a0affaecc639f0556ab879ca42fe205fe3c1e55a1b5c1c4fb0b705a5566b06bad5c119a1d41df9c01ed2c9
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.8.crate 12416 BLAKE2B 5b48c27dfbb5db5c332f7e248138327b35ceec0909788b940168e7f6fe1402800da5e7690b2b1654da6c510b5c720330a92da16dff53ef15821f37fef6f335e3 SHA512 e186111398f9f0f0686e791ad0d72c39205e5f246b6e020df413e477ee07f32e91d09405c61dc92752f061f54fd7533435545c1a151477b40e2d68acc94a57fd
 DIST winapi-util-0.1.9.crate 12464 BLAKE2B 7fb9dd803fc2608c4e5bc75674472992d82da364f24c22072d5624d6ae6abc44abd3e3ea3c45a7558e045331f3d87572b306b4ab5de52c07ff3706e7f13c2a38 SHA512 c46b893f67ec6e36499b00736bb6b9421e0e2611e76784afa6da01d7ebd033df82f1be7cf8d871d541125d290983f98f26f759488ba9aface49efce8edd682e9
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST windows-0.52.0.crate 11843715 BLAKE2B 0d35225f5d61f71b0cb768f03825031101e05c83d7f12e05cb17b14ba28e6bc6a3d5aaee5ba07e54c1a773b6eadde4ce3523ab87e8e313e5578e2de01a3dcdc7 SHA512 8a9d443cfae3b44ab50bdffd70b70ea3b3d536f464e4beb7cfa9e15eb4e4505cbac20266b44d589bb7231790a87f473ead6d2160b8cd18d62f31b78bf61417da
@@ -362,56 +428,41 @@ DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8
 DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03
 DIST windows-sys-0.59.0.crate 2387323 BLAKE2B 3110c8cd2bc005f8c95cd038a8d574af648dc19788fe4485f977376f92e36b911b1a542d669a07ae9cd4ea72a884ab01ec78b8a2b5587456eb202452d1d8fa0d SHA512 d35e009e979633a1f3c8468cd038bd5c8c0381405165ce03497decd7d9edaaac485d704487e4a61d9aaf4e4d011b4248408912df6a0044d50e8457259867e061
 DIST windows-targets-0.42.2.crate 5492 BLAKE2B 42fc4a7d3e287fe2a70637e890304b49737776596f4a94a6d216668247092135e84322bd04caddd19c83b7700b0f27278e600ce8ed326957fabc21bffcae89b0 SHA512 84fbaffcad9a80beca77506aac26d0c5cb75aa0f21a5a70bcd3f6a16e71e8753ae00d3b89da9262c99756624163dcc0d6074fa9f99dfaae0dc098018209025f9
-DIST windows-targets-0.48.0.crate 7466 BLAKE2B 4ef6d89ad5b1acf26a1a24348122b86d3943bd95935499bc9032fbc7aa01c04999c723df7fecb4989854cb6b7cceffe141537dfb05a9eaf3902c4cb490533116 SHA512 1d2a29602a1e0846c8577ec9167c5f9972091998a5df449d67b13ad918bf37680e7f97247baf5e3010c166d0b3182418c2925470998b92893ee9469939b91e22
 DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709
-DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e
 DIST windows-targets-0.52.6.crate 6403 BLAKE2B eb98d0a8daeed5fe76e7fa8edb2743e2a3e77dfb9c4ea68605a6ab10532cb7cfc43bc1cea0180869445bd940be762a40136500e26b84ca88b5e0c502004c7a4c SHA512 d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f
 DIST windows_aarch64_gnullvm-0.42.2.crate 364071 BLAKE2B 97c4e3b2a2dd3f936f9bfcdad23639c9c4c499eed220aec361d26d6013d798efa118e6b298f9cf841ac149d2ae5d58ca653731718450fcf2910bb5f6fa39159f SHA512 75cd7eb1def8ce9d0ff3d7468d2b1cc31cc76c08f981a2460c3d1eb09cff7100d7442863a3591621c1f5f3b3f4badf0b5c95285b6ed583e37283a8403f1095f1
-DIST windows_aarch64_gnullvm-0.48.0.crate 366543 BLAKE2B 9b10f65089fe6da3ff38a1061783f635644ae84f567f891eaced280af68f7ff3919b34289e8850aa34554bb0346903273ff0a7fa743ca8794c2d23a9f1b0185f SHA512 80c5aa74c5669f7acff3882a8e7575f15e8d7cc58c11a1cb731ff423eb9cc9ba43cc6b80e52803c0d44e6a9001655ba87de6f43a9fe858da6d6e3a5c983a2711
 DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996
-DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f
 DIST windows_aarch64_gnullvm-0.52.6.crate 435718 BLAKE2B 8b12ae02892cb69401329034bbca671d13bd268a112120b56b90504707cef89decfbd2560492844a9f0588fab62dc1476ab7e931126b939015d25a8cc91ca334 SHA512 f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5
 DIST windows_aarch64_msvc-0.42.2.crate 666981 BLAKE2B 9f3cc5592cdede08bcdc1e7c455325279e3b763d96942695e10dccf1dfc37a81c749b69a7d6de883d4c0fa6e8a0d2f578fe2a8d6c42ad8ef6282590bf8fc87b7 SHA512 d2dafa8c94d01c1b65ca1bd631d31f2ef842f1db7accb132ff78c3f8483221b991afd3391563e03dcec42bbc9cbdc0ebdab47b991d25af85b5ba2ac1bbf8db63
-DIST windows_aarch64_msvc-0.48.0.crate 671479 BLAKE2B 0c80f210437628e1d878d1d14e884fea532c7539b3030aa76d46f27d02372c715c6e33d7efdbbd770666472b44a66c30711a33d819ede9cdcd51c96355802d45 SHA512 617e47a7202f1db4dbd3ecea509682135ccd85e3a458c0331b9bc7aa1d84e5756b59c881cb098d5c6d4c951248d13c8253a8e8a50938e1997bd19ceba77262df
 DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff
-DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1
 DIST windows_aarch64_msvc-0.52.6.crate 832615 BLAKE2B adc8ff61b6dc96d39c92c7d4221ae6aa0575edfc016cfcd046067ca5d8fcfd56d10e8e227be1c038ce34684be22c7ccaf5f18cd5a7638d28fbff4ba15b48b90b SHA512 a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b
 DIST windows_i686_gnu-0.42.2.crate 736236 BLAKE2B 4ef0496462afc73d9d72af7e5da1e6d3506a92f8172930e88ae64ab97596ffd31c4f97fb969e9b677e30159c27f00a8e756deb006b630fb98ce83f03c8b762e2 SHA512 ad09d650a05cb91cb6b40f59025c023a4c286bc1194586697c506016df2b9b0d5b02606b81687bc634795a0d9a9b8a73e486599328ae09c853e8e5ba662fc59c
-DIST windows_i686_gnu-0.48.0.crate 741490 BLAKE2B 5a4a584f8d8ee5bbd2d4c5b6749a66f2d43fc9e4ef90faab2227709b270f0d46fc26578c029edd96877c71309316ddb32d91c39f46d88f9a484c614f866e3dbe SHA512 15149fdd48b61b6d993acd392dbd353d0280d984ea88745217e4207937174bb90cdd9701f69ff0fe06a842f03607cbb57937d20d79ab577181e605a8a8fadc68
 DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a
-DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e
 DIST windows_i686_gnu-0.52.6.crate 880402 BLAKE2B 5aab8ee07132eccb7695807eb44811beeb0657aadfb672c54e99b6ae39c067ba9b93e38fc69bb5b9b14a9759f263ccd5e301597d2727d83b31b49a409b6bd405 SHA512 a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822
 DIST windows_i686_gnullvm-0.52.6.crate 475940 BLAKE2B fec4fda8bb2bf319a501a22372fa642ae682e4dee3235b258a028190ee73220bfc55b3142f06249bb4579b17e5fde662bb2b121aefe18544653350d7d0fe7d8e SHA512 95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f
 DIST windows_i686_msvc-0.42.2.crate 724951 BLAKE2B b084286cd4927efd2889b149abf8a9fe9d3d777130db9e592982660dbf9a96a0f5e723ca121465787aa11877d2d29a5a7d7cf066cdc8fa7e90d7ca7dcb7677f1 SHA512 c1706fc36d4b157c020744a11b3eb5d7dfbf05a0b56775bc717e94b7fd725816b20154fdbcd69ac08dbfb8b8bbfa74fab72d7a9c10399aad6a1cc54cf597e804
-DIST windows_i686_msvc-0.48.0.crate 730056 BLAKE2B 4e4ad6ed94948145199c2ed50fc65e4af08455a0fd058bb0f763d481f30b029f99a2b8dbac087b29e762500a19270f6683baf62ba99d141eb002a5b0b5c8ea05 SHA512 11a50800e709712dbea907275bc0faa46d2eb2969118445ed5b932d9c5957a09592a5b26a40e554c1f5fd56c6d074a07637e6f88eedd2224e1001e62df7b469b
 DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e
-DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671
 DIST windows_i686_msvc-0.52.6.crate 901163 BLAKE2B 99ed34e052db5ba77bab240ed5d38ce450be347a794d63ec39b719304c32722c9999b540ab40abe0216318900b7412970df99dfb36d1516a9517cae0c77d1bdc SHA512 ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96
 DIST windows_x86_64_gnu-0.42.2.crate 699373 BLAKE2B 01c70809d564b16b268656e47295e99c992d8f9839fac8a51338a0e7c3b9cdcd0429c456ca8c1c139a8c687ed7ed6c43a82250889d881aadaa65bd037223e0a6 SHA512 5767af3c86e717f93137a89d442230e6b60a649057edb3ab104b1f82c0bcd64fe089dcdf2f4fd486a799bece1ddb5f0449641536b678211945e749ae24f35c1f
-DIST windows_x86_64_gnu-0.48.0.crate 703595 BLAKE2B b227efb78a99c43d0538cceadada3fa1840df29adc665787fdcf845b73e77d782da8a9f9aa602e1da61401b550d0107176feb6c397c922a6240b38cc8f04a180 SHA512 38eff1164fb37dbd2bbe53404b20cba92de84cbbd5e4eb9ad60d51fb43d6fdb8b87a1488e2c88ebd4b3ff3b708f93fdc05df4b14a285d3ff11c33ff0d9828602
 DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
-DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7
 DIST windows_x86_64_gnu-0.52.6.crate 836363 BLAKE2B e2335829155cdbd4a55cc9f9babc237e14e32aab97f6f91afabcdf80d2aee37d6fb4b8669aaf433ff532c85dba59b3d366c7d41b61a2f29b96f960169c900687 SHA512 c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb
 DIST windows_x86_64_gnullvm-0.42.2.crate 364068 BLAKE2B 64bc53e98eb3fc649c9b43a6e734de4e65088e41edacabd49f7afcc5dc6e1065c563ecfc682747dda05978dea2dba4f45c16fcc18c3b00684c3d93681e5a7deb SHA512 d39a8bc948110fe612d3f8d6628b3f0d56620df11d8a49e0fabb6c90389ad407582b3af10e4eab46c79b3d11d2e10753d73d9e55963fbeac085f41e9749bdba3
-DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d1579978045f4058b1a315083a8ab842bddf5800ec3460b1530ad88c3464acab712a229290aca235810de8a3b6a253859a354d9fa97277e58 SHA512 8d82fad4c8445030844708aa026a62f1ca43362b8e15f14b0d226c7e9cda04ffa0715087b6a025dbb738e8891de24fcc4a2df071a532917cf03c4a46f934f396
 DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
-DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0
 DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd
 DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788
-DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
-DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7
 DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
-DIST winnow-0.5.40.crate 159316 BLAKE2B aae5076d59b3459c901d918d8aaa97ba8bfcc993b8484344f52e45f1f37deb96d6cd3a1663a67f3c367be2b05d633286f270274c621bda9f3ab72b98bb652cc2 SHA512 525156f08514b0110697360be6e331a68d08f0cb65ee4ba3ac9d101dd2d42a8c89601e7409bdb5652c5b05145626506651010f58a854c47712065334c61ff39c
 DIST winnow-0.6.20.crate 163617 BLAKE2B b47ba6cd94ec80a72b51ad09c5cb9de350d2243295d3997732d5d3d9f8d08bd83e3129150fb24992243949120da1bd6091d580db5ff10258fd745afaa944c791 SHA512 3347fdfb5b15ec73a40614ecd0cce60f41d3f2d083f49aaafceeaf5db52d5c677dc3eb39fcc2595999fc9f864d1fde81e180e09dc86a6f6124878e16e86e8bc8
+DIST winnow-0.6.24.crate 165680 BLAKE2B 404b91cf890523dc66b2e1c8ed8610a991cc3551de16894a6aed4d6b720b19f33feba9f2257541f9eef6b51051bb5e15e4b7c9c74653a3bdbb782e273d0605a2 SHA512 b0dc1890a59709c61f06096dd37d94bd41cea0b6dd097ae9651c19acbd2963833f5b9cb6c8274aa7577433bff4b3cc68a9de80f7b285035074b5cc96907f967d
 DIST wyz-0.5.1.crate 18790 BLAKE2B 07ac1435a812d2f50309348ef8378ea4955c001f01edaf2ffab108f7d524ee731f06b22fd42c043349a4a2271ec47ea203e89562076e8c7c1719112b0214c89a SHA512 15d86c167145c90e3fbabcefd11754fb1cb835896e32d1bb7f4b027e5b2092f5fdbdca4062c129bc38e655cb87c6a3f4e181747ee25d89db5e01fb1fcac18fe9
 DIST xattr-1.3.1.crate 12580 BLAKE2B 25c414d761a7fcd23bbe057add62c6da971cf33149066aa024320ab80e0ec8e8e8d5d3d0506e8de954b8f8c178d34c52a00a5fa9aa109510678098a3e3564b7f SHA512 4047abda42b949cf58f820e15ee99850de483857bbaaef737eeee48e1a2132972470f15bb2ddda56438f6a934918be96607a8de518a5a3dcec7c8ee6c00ad280
-DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
+DIST xattr-1.4.0.crate 12995 BLAKE2B 8e75a4636c42bdc052e00fcc020554e7431620950c67967af10ae1a61dfd26086ffd8ebd9836def0b79a4264f3b8fa7edef3e598a5bff4127bfc9eb05167a4e7 SHA512 57f5243055743dc5baa3c4028e20f469b93542eef8fad8ce41efb35268bad58f637c0573581d25796f4649ed3ec52bb4fe072613b64fcbc0e7fbc4a9a56d2b0a
 DIST yansi-1.0.1.crate 75497 BLAKE2B c0d396c93a733ed6ec12aca3385d816f39b1f1fbed75da460f491f0cbfc30ba462842ebd1627fa8e5d2b7c0f37913a23747e5f5e23df1cb7c85d965e6c37159b SHA512 182c8c6c60a30a727d8f8b90bbf0527d91fa8ae9d8eb20e5414614b43ee6dc532f4b19241adbfb9299cb0004b39fe627036269b60b0c3860d9e1ea4413aca541
 DIST z85-3.0.5.crate 9084 BLAKE2B fab4d13d859b02211cf1a80fbbe03af5d2eeb65c927ae4a75730be5567de496619e41f365a02c432af5526f262798af7f89056d72404d38157454dc2e405b7f9 SHA512 8b9c3d095ae51b7d0a9183373e8e47635ba1777d86466e160748bab67a45265b90308189efaf0a5a8eefa7c08ffd08a3ba0580be7ad7bafc7fdce463ec05d0dd
-DIST zerocopy-0.7.33.crate 151013 BLAKE2B d9f811a98d0565421cfffcd2e36ef4370c8d2b0f364f0ccfe44d63d6bfc0cb302a0a04659a33f43e2b1cf7cd296b5800548f74f1b43ac15c7d7b2830a2521726 SHA512 8c21b9d743369ca1ed9b56e7cf87e20041b5436aa4727c72e5a6763dde15ccd277a4117aac3d37005a7f1a063dce7c44625aa2cf7de435204d13c86aa6c70a58
 DIST zerocopy-0.7.34.crate 151177 BLAKE2B 30b65131370dfa4f41d3c2705d3b75da9b76f2a4ed723dec66345939de8bafe2c181ab6c98036c25a30739cae1720d927e27e5fa5587442d5cfb7f39a7018c8f SHA512 4d27b1230ebcea4e9d4c15f38a979aa3fe8b23833e95df781a0a67054e920637642b89345596fe331907edc27abab83c766967f2a04399a6fe0a4e89fa0dd148
-DIST zerocopy-derive-0.7.33.crate 37907 BLAKE2B 9106804643067ca3d21a409fc4dc8f86792a142cd770679d49d29da0fad148de00c105fd18f0ca7a615b4c99ad86242fff17043e0ad4e5c5375fa088e2fac2b0 SHA512 8cdb8164906029da51f604675a7c03ae0b60e7ba43a7273cd93028f814d4fe15b231b65b47df4cae1898c154e9a06701dea81bc82278e1732eae17a422b28229
+DIST zerocopy-0.7.35.crate 152645 BLAKE2B 8f13123c9d9257ac5a5c6954d38c3510fa658624442f7e03cdcc6db5a0977d9f26bb4e277be172b7872ec365cf6e58ac742e5578636f7698f9f37093e9249d9a SHA512 17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c
 DIST zerocopy-derive-0.7.34.crate 37907 BLAKE2B 23a698c3c892187307007cbc76c9338dbe163e4f14d4ea73969ba834f5c6732d16f5bc26e2e85c5e3df2100b28e6e72ae6473b2159f5160ee19befdef3615f98 SHA512 1bd93062b0d2c699066f8a991326b4470426aae0517d33748a8f0e52b009fc46e6b0b238abe97462a2e13c870fa3d0d070615870e6dbbf8b6991c0e3fb5c3e63
+DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb
 DIST zip-1.1.4.crate 77910 BLAKE2B 1c6a0e14becbb43faa9510d303ab254486e97730bc741c1fa3c7a88327da0b1e8815026e319abdbeb9e6c9e0ec713d83dbb3a0ae83a32ed2d197923afa803866 SHA512 18c8e7c9246049c7be4ade2bee501da2ff7cfe45aaab88e20650246833ae3f7b492644c0f4a43aa93a7ef7bf95413c9b27d0f5f8d099f19131a682b92a6d3fc4
-DIST zip-1.3.0.crate 85997 BLAKE2B 6ed6ef4c90a77919070216b092e2c509929fd60e48d567778b32636b2fe80079a066e41a22eea7f7f905b8ecfaaca95bdbce7b8fd18f3b24482492a620ab5802 SHA512 f042c88592e9e00ed23f05ed87c18396738dd707e77110e8103e19d1852b63e13d935155d9f2906531ddc458c769d785bc483a5958824133a2ac20847fd25690
+DIST zip-2.2.2.crate 108809 BLAKE2B e6d7792b70ab397ef340d37167266b87538d2e0ad422d02b053f6b492c8ed13535ea18d5d4077350286b3c2f79623a01ec89544f6334eddd07c87b0d443f19ae SHA512 0255079792b786a55dd18587daf178456f2b79f83d767ba42504f8b7163eebc152c02500097edd78bb37916444c9ad9905779367c6d743489502468258f1706e
+DIST zopfli-0.8.1.crate 50972 BLAKE2B 27cde48858dc65ec8082d4e0d81e2758f92d3dcc7a1c1f08aa6448e99f2995a865ac3259353b26e787f108c2f88ce3c7610413ea9d3daae6f864900d74565de6 SHA512 799e25c0cc9f0bf2119a7c03225b11ed94e7c3ac83f872a27da8ae15c90206245121c38f5e2b78fece131f5bb428f01fabbfd1b1e18ea456957940042d38f38d
diff --git a/sys-apps/uutils-coreutils/files/uutils-coreutils-0.0.27-cow-tests.patch b/sys-apps/uutils-coreutils/files/uutils-coreutils-0.0.27-cow-tests.patch
deleted file mode 100644
index 1c9901aa47cd..000000000000
--- a/sys-apps/uutils-coreutils/files/uutils-coreutils-0.0.27-cow-tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://github.com/uutils/coreutils/issues/6456
---- a/tests/by-util/test_cp.rs
-+++ b/tests/by-util/test_cp.rs
-@@ -2318,6 +2318,7 @@ fn test_cp_sparse_never_empty() {
- #[cfg(any(target_os = "linux", target_os = "android"))]
- #[test]
- fn test_cp_sparse_always_empty() {
-+    return;
-     for argument in ["--sparse=always", "--sparse=alway", "--sparse=al"] {
-         let (at, mut ucmd) = at_and_ucmd!();
- 
-@@ -4026,6 +4027,7 @@ fn test_cp_default_virtual_file() {
- #[test]
- #[cfg(any(target_os = "linux", target_os = "android"))]
- fn test_cp_debug_reflink_auto_sparse_always_non_sparse_file_with_long_zero_sequence() {
-+    return;
-     let ts = TestScenario::new(util_name!());
- 
-     let buf: Vec<u8> = vec![0; 4096 * 4];
---- a/tests/by-util/test_cp.rs
-+++ b/tests/by-util/test_cp.rs
-@@ -2339,6 +2339,7 @@ fn test_cp_sparse_always_empty() {
- #[cfg(any(target_os = "linux", target_os = "android"))]
- #[test]
- fn test_cp_sparse_always_non_empty() {
-+    return;
-     let (at, mut ucmd) = at_and_ucmd!();
- 
-     const BUFFER_SIZE: usize = 4096 * 16 + 3;
diff --git a/sys-apps/uutils-coreutils/uutils-coreutils-0.0.27-r1.ebuild b/sys-apps/uutils-coreutils/uutils-coreutils-0.0.27-r1.ebuild
deleted file mode 100644
index 983444b96327..000000000000
--- a/sys-apps/uutils-coreutils/uutils-coreutils-0.0.27-r1.ebuild
+++ /dev/null
@@ -1,415 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.6.2
-
-EAPI=8
-
-CRATES="
-	adler@1.0.2
-	ahash@0.8.11
-	aho-corasick@1.0.4
-	allocator-api2@0.2.18
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	ansi-width@0.1.0
-	anstream@0.5.0
-	anstyle-parse@0.2.0
-	anstyle-query@1.0.0
-	anstyle-wincon@2.1.0
-	anstyle@1.0.0
-	arbitrary@1.3.2
-	arrayref@0.3.6
-	arrayvec@0.7.4
-	autocfg@1.1.0
-	bigdecimal@0.4.5
-	binary-heap-plus@0.5.0
-	bincode@1.3.3
-	bindgen@0.69.4
-	bitflags@1.3.2
-	bitflags@2.5.0
-	bitvec@1.0.1
-	blake2b_simd@1.0.2
-	blake3@1.5.1
-	block-buffer@0.10.3
-	bstr@1.9.1
-	bumpalo@3.11.1
-	bytecount@0.6.8
-	byteorder@1.5.0
-	cc@1.0.79
-	cexpr@0.6.0
-	cfg-if@1.0.0
-	cfg_aliases@0.1.1
-	chrono@0.4.38
-	clang-sys@1.4.0
-	clap@4.4.2
-	clap_builder@4.4.2
-	clap_complete@4.4.0
-	clap_lex@0.5.0
-	clap_mangen@0.2.9
-	colorchoice@1.0.0
-	compare@0.1.0
-	console@0.15.8
-	const-random-macro@0.1.16
-	const-random@0.1.16
-	constant_time_eq@0.3.0
-	core-foundation-sys@0.8.3
-	coz@0.1.3
-	cpp@0.5.9
-	cpp_build@0.5.9
-	cpp_common@0.5.9
-	cpp_macros@0.5.9
-	cpufeatures@0.2.5
-	crc32fast@1.4.0
-	crossbeam-channel@0.5.10
-	crossbeam-deque@0.8.4
-	crossbeam-epoch@0.9.17
-	crossbeam-utils@0.8.19
-	crossterm@0.27.0
-	crossterm_winapi@0.9.1
-	crunchy@0.2.2
-	crypto-common@0.1.6
-	ctrlc@3.4.4
-	data-encoding-macro-internal@0.1.13
-	data-encoding-macro@0.1.15
-	data-encoding@2.6.0
-	deranged@0.3.11
-	derive_arbitrary@1.3.2
-	diff@0.1.13
-	digest@0.10.7
-	displaydoc@0.2.4
-	dlv-list@0.5.0
-	dns-lookup@2.0.4
-	dunce@1.0.4
-	either@1.8.0
-	encode_unicode@0.3.6
-	env_logger@0.8.4
-	equivalent@1.0.1
-	errno@0.3.8
-	exacl@0.12.0
-	fastrand@2.0.1
-	file_diff@1.0.0
-	filedescriptor@0.8.2
-	filetime@0.2.23
-	flate2@1.0.28
-	fnv@1.0.7
-	fs_extra@1.3.0
-	fsevent-sys@4.1.0
-	fts-sys@0.2.9
-	fundu-core@0.3.0
-	fundu@2.0.0
-	funty@2.0.0
-	futures-channel@0.3.28
-	futures-core@0.3.28
-	futures-executor@0.3.28
-	futures-io@0.3.28
-	futures-macro@0.3.28
-	futures-sink@0.3.28
-	futures-task@0.3.28
-	futures-timer@3.0.2
-	futures-util@0.3.28
-	futures@0.3.28
-	gcd@2.3.0
-	generic-array@0.14.6
-	getrandom@0.2.9
-	glob@0.3.1
-	half@2.4.1
-	hashbrown@0.14.3
-	hermit-abi@0.3.2
-	hex-literal@0.4.1
-	hex@0.4.3
-	hostname@0.4.0
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.53
-	indexmap@2.2.6
-	indicatif@0.17.8
-	inotify-sys@0.1.5
-	inotify@0.9.6
-	instant@0.1.12
-	io-lifetimes@1.0.11
-	itertools@0.12.1
-	itertools@0.13.0
-	itoa@1.0.4
-	js-sys@0.3.64
-	keccak@0.1.4
-	kqueue-sys@1.0.3
-	kqueue@1.0.7
-	lazy_static@1.4.0
-	lazycell@1.3.0
-	libc@0.2.155
-	libloading@0.7.4
-	libm@0.2.7
-	linux-raw-sys@0.3.8
-	linux-raw-sys@0.4.12
-	lock_api@0.4.9
-	log@0.4.20
-	lru@0.12.3
-	lscolors@0.16.0
-	md-5@0.10.6
-	memchr@2.7.4
-	memmap2@0.9.4
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.2
-	mio@0.8.11
-	nix@0.28.0
-	nom@7.1.3
-	notify@6.0.1
-	nu-ansi-term@0.49.0
-	num-bigint@0.4.5
-	num-conv@0.1.0
-	num-integer@0.1.46
-	num-modular@0.5.1
-	num-prime@0.4.4
-	num-traits@0.2.19
-	num_threads@0.1.6
-	number_prefix@0.4.0
-	once_cell@1.19.0
-	onig@6.4.0
-	onig_sys@69.8.1
-	ordered-multimap@0.7.3
-	os_display@0.1.3
-	parking_lot@0.12.1
-	parking_lot_core@0.9.9
-	parse_datetime@0.6.0
-	phf@0.11.2
-	phf_codegen@0.11.2
-	phf_generator@0.11.1
-	phf_shared@0.11.2
-	pin-project-lite@0.2.9
-	pin-utils@0.1.0
-	pkg-config@0.3.26
-	platform-info@2.0.3
-	portable-atomic@1.6.0
-	powerfmt@0.2.0
-	ppv-lite86@0.2.17
-	pretty_assertions@1.4.0
-	prettyplease@0.2.19
-	proc-macro-crate@3.1.0
-	proc-macro2@1.0.86
-	procfs-core@0.16.0
-	procfs@0.16.0
-	quick-error@2.0.1
-	quickcheck@1.0.3
-	quote@1.0.36
-	radium@0.7.0
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rand_pcg@0.3.1
-	rayon-core@1.12.1
-	rayon@1.10.0
-	redox_syscall@0.4.1
-	redox_syscall@0.5.2
-	reference-counted-singleton@0.1.2
-	regex-automata@0.4.4
-	regex-syntax@0.8.2
-	regex@1.10.5
-	relative-path@1.8.0
-	rlimit@0.10.1
-	roff@0.2.1
-	rstest@0.21.0
-	rstest_macros@0.21.0
-	rust-ini@0.21.0
-	rustc-hash@1.1.0
-	rustc_version@0.4.0
-	rustix@0.37.26
-	rustix@0.38.31
-	same-file@1.0.6
-	scopeguard@1.2.0
-	self_cell@1.0.4
-	selinux-sys@0.6.9
-	selinux@0.4.4
-	semver@1.0.14
-	serde-big-array@0.5.1
-	serde@1.0.203
-	serde_derive@1.0.203
-	sha1@0.10.6
-	sha2@0.10.8
-	sha3@0.10.8
-	shlex@1.3.0
-	signal-hook-mio@0.2.3
-	signal-hook-registry@1.4.1
-	signal-hook@0.3.17
-	siphasher@0.3.10
-	slab@0.4.7
-	sm3@0.4.2
-	smallvec@1.13.2
-	smawk@0.3.1
-	socket2@0.5.3
-	strsim@0.10.0
-	syn@1.0.109
-	syn@2.0.60
-	tap@1.0.1
-	tempfile@3.10.1
-	terminal_size@0.2.6
-	terminal_size@0.3.0
-	textwrap@0.16.1
-	thiserror-impl@1.0.61
-	thiserror@1.0.61
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tiny-keccak@2.0.2
-	toml_datetime@0.6.6
-	toml_edit@0.21.1
-	trim-in-place@0.1.7
-	typenum@1.15.0
-	unicode-ident@1.0.5
-	unicode-linebreak@0.1.5
-	unicode-segmentation@1.11.0
-	unicode-width@0.1.12
-	unicode-xid@0.2.4
-	unindent@0.2.3
-	utf8parse@0.2.1
-	uuid@1.7.0
-	uutils_term_grid@0.6.0
-	version_check@0.9.4
-	walkdir@2.5.0
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-backend@0.2.87
-	wasm-bindgen-macro-support@0.2.87
-	wasm-bindgen-macro@0.2.87
-	wasm-bindgen-shared@0.2.87
-	wasm-bindgen@0.2.87
-	which@4.3.0
-	wild@2.2.1
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.8
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-core@0.52.0
-	windows-sys@0.45.0
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-targets@0.42.2
-	windows-targets@0.48.0
-	windows-targets@0.52.0
-	windows@0.52.0
-	windows_aarch64_gnullvm@0.42.2
-	windows_aarch64_gnullvm@0.48.0
-	windows_aarch64_gnullvm@0.52.0
-	windows_aarch64_msvc@0.42.2
-	windows_aarch64_msvc@0.48.0
-	windows_aarch64_msvc@0.52.0
-	windows_i686_gnu@0.42.2
-	windows_i686_gnu@0.48.0
-	windows_i686_gnu@0.52.0
-	windows_i686_msvc@0.42.2
-	windows_i686_msvc@0.48.0
-	windows_i686_msvc@0.52.0
-	windows_x86_64_gnu@0.42.2
-	windows_x86_64_gnu@0.48.0
-	windows_x86_64_gnu@0.52.0
-	windows_x86_64_gnullvm@0.42.2
-	windows_x86_64_gnullvm@0.48.0
-	windows_x86_64_gnullvm@0.52.0
-	windows_x86_64_msvc@0.42.2
-	windows_x86_64_msvc@0.48.0
-	windows_x86_64_msvc@0.52.0
-	winnow@0.5.40
-	wyz@0.5.1
-	xattr@1.3.1
-	yansi@0.5.1
-	z85@3.0.5
-	zerocopy-derive@0.7.33
-	zerocopy@0.7.33
-	zip@1.3.0
-"
-
-inherit cargo flag-o-matic
-
-DESCRIPTION="GNU coreutils rewritten in Rust"
-HOMEPAGE="https://uutils.github.io/coreutils/ https://github.com/uutils/coreutils"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/uutils/coreutils"
-	inherit git-r3
-elif [[ ${PV} == *_p* ]] ; then
-	COREUTILS_COMMIT=""
-	SRC_URI="https://github.com/uutils/coreutils/archive/${FINDUTILS_COMMIT}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" ${CARGO_CRATE_URIS}"
-	S="${WORKDIR}"/coreutils-${COREUTILS_COMMIT}
-else
-	SRC_URI="https://github.com/uutils/coreutils/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" ${CARGO_CRATE_URIS}"
-	S="${WORKDIR}"/coreutils-${PV}
-
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0 BSD-2 BSD CC0-1.0 ISC MIT Unicode-DFS-2016"
-SLOT="0"
-IUSE="debug selinux test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/oniguruma:=
-	selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	test? ( dev-util/cargo-nextest )
-"
-
-QA_FLAGS_IGNORED=".*"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.27-xfail-tests.patch
-	"${FILESDIR}"/${PN}-0.0.27-cow-tests.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_compile() {
-	# normally cargo_src_compile sets this for us, but we don't use it
-	filter-lto
-
-	# By default, the crate uses a system version if it can. This just guarantees
-	# that it will error out instead of building a vendored copy.
-	export RUSTONIG_SYSTEM_LIBONIG=1
-
-	makeargs=(
-		# Disable output synchronisation as make calls cargo
-		-Onone
-
-		V=1
-
-		PROFILE=$(usex debug debug release)
-
-		PREFIX="${EPREFIX}/usr"
-		PROG_PREFIX="uu-"
-		MULTICALL=y
-		MANDIR="/share/man/man1"
-
-		SELINUX_ENABLED=$(usex selinux)
-
-		# pinky, uptime, users, and who require utmpx (not available on musl)
-		# bug #832868
-		SKIP_UTILS="$(usev elibc_musl "pinky uptime users who")"
-	)
-
-	emake "${makeargs[@]}"
-}
-
-src_test() {
-	local -x RUST_BACKTRACE=full
-
-	# Nicer output for nextest vs test
-	emake "${makeargs[@]}" \
-		CARGOFLAGS="${CARGOFLAGS} $(usev !debug --release)" \
-		TEST_NO_FAIL_FAST="--no-fail-fast" \
-		nextest
-}
-
-src_install() {
-	emake "${makeargs[@]}" DESTDIR="${D}" install
-}
diff --git a/sys-apps/uutils-coreutils/uutils-coreutils-0.0.29.ebuild b/sys-apps/uutils-coreutils/uutils-coreutils-0.0.29.ebuild
new file mode 100644
index 000000000000..e62645b6edfa
--- /dev/null
+++ b/sys-apps/uutils-coreutils/uutils-coreutils-0.0.29.ebuild
@@ -0,0 +1,413 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.6.2
+
+EAPI=8
+
+CRATES="
+	adler2@2.0.0
+	aho-corasick@1.1.3
+	allocator-api2@0.2.21
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	ansi-width@0.1.0
+	anstream@0.6.18
+	anstyle-parse@0.2.6
+	anstyle-query@1.1.2
+	anstyle-wincon@3.0.6
+	anstyle@1.0.10
+	arbitrary@1.4.1
+	arrayref@0.3.9
+	arrayvec@0.7.6
+	autocfg@1.4.0
+	bigdecimal@0.4.7
+	binary-heap-plus@0.5.0
+	bincode@1.3.3
+	bindgen@0.70.1
+	bitflags@1.3.2
+	bitflags@2.7.0
+	bitvec@1.0.1
+	blake2b_simd@1.0.2
+	blake3@1.5.5
+	block-buffer@0.10.4
+	bstr@1.11.3
+	bumpalo@3.16.0
+	bytecount@0.6.8
+	byteorder@1.5.0
+	cc@1.2.8
+	cexpr@0.6.0
+	cfg-if@1.0.0
+	cfg_aliases@0.2.1
+	chrono-tz-build@0.4.0
+	chrono-tz@0.10.1
+	chrono@0.4.39
+	clang-sys@1.8.1
+	clap@4.5.26
+	clap_builder@4.5.26
+	clap_complete@4.5.42
+	clap_lex@0.7.4
+	clap_mangen@0.2.26
+	colorchoice@1.0.3
+	compare@0.1.0
+	console@0.15.10
+	const-random-macro@0.1.16
+	const-random@0.1.18
+	constant_time_eq@0.3.1
+	core-foundation-sys@0.8.7
+	coz@0.1.3
+	cpp@0.5.10
+	cpp_build@0.5.10
+	cpp_common@0.5.10
+	cpp_macros@0.5.10
+	cpufeatures@0.2.16
+	crc32fast@1.4.2
+	crossbeam-deque@0.8.6
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.21
+	crossterm@0.28.1
+	crossterm_winapi@0.9.1
+	crunchy@0.2.2
+	crypto-common@0.1.6
+	ctrlc@3.4.5
+	data-encoding-macro-internal@0.1.14
+	data-encoding-macro@0.1.16
+	data-encoding@2.7.0
+	deranged@0.3.11
+	derive_arbitrary@1.4.1
+	diff@0.1.13
+	digest@0.10.7
+	displaydoc@0.2.5
+	dlv-list@0.5.2
+	dns-lookup@2.0.4
+	dunce@1.0.5
+	either@1.13.0
+	encode_unicode@1.0.0
+	equivalent@1.0.1
+	errno@0.3.10
+	exacl@0.12.0
+	fastrand@2.3.0
+	file_diff@1.0.0
+	filedescriptor@0.8.2
+	filetime@0.2.25
+	flate2@1.0.35
+	fnv@1.0.7
+	foldhash@0.1.4
+	fs_extra@1.3.0
+	fsevent-sys@4.1.0
+	fts-sys@0.2.13
+	fundu-core@0.3.1
+	fundu@2.0.1
+	funty@2.0.0
+	futures-core@0.3.31
+	futures-macro@0.3.31
+	futures-task@0.3.31
+	futures-timer@3.0.3
+	futures-util@0.3.31
+	gcd@2.3.0
+	generic-array@0.14.7
+	getrandom@0.2.15
+	glob@0.3.2
+	half@2.4.1
+	hashbrown@0.14.5
+	hashbrown@0.15.2
+	hermit-abi@0.3.9
+	hex-literal@0.4.1
+	hex@0.4.3
+	hostname@0.4.0
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.61
+	indexmap@2.7.0
+	indicatif@0.17.9
+	inotify-sys@0.1.5
+	inotify@0.11.0
+	io-lifetimes@1.0.11
+	is_terminal_polyfill@1.70.1
+	itertools@0.13.0
+	itertools@0.14.0
+	itoa@1.0.14
+	js-sys@0.3.76
+	keccak@0.1.5
+	kqueue-sys@1.0.4
+	kqueue@1.0.8
+	lazy_static@1.5.0
+	libc@0.2.169
+	libloading@0.8.6
+	libm@0.2.11
+	libredox@0.1.3
+	linux-raw-sys@0.3.8
+	linux-raw-sys@0.4.15
+	lock_api@0.4.12
+	lockfree-object-pool@0.1.6
+	log@0.4.22
+	lru@0.12.5
+	lscolors@0.20.0
+	md-5@0.10.6
+	memchr@2.7.4
+	memmap2@0.9.5
+	minimal-lexical@0.2.1
+	miniz_oxide@0.8.2
+	mio@1.0.3
+	nix@0.29.0
+	nom@7.1.3
+	notify-types@2.0.0
+	notify@8.0.0
+	nu-ansi-term@0.50.1
+	num-bigint@0.4.6
+	num-conv@0.1.0
+	num-integer@0.1.46
+	num-modular@0.5.1
+	num-prime@0.4.4
+	num-traits@0.2.19
+	num_threads@0.1.7
+	number_prefix@0.4.0
+	once_cell@1.20.2
+	onig@6.4.0
+	onig_sys@69.8.1
+	ordered-multimap@0.7.3
+	os_display@0.1.3
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	parse-zoneinfo@0.3.1
+	parse_datetime@0.6.0
+	phf@0.11.3
+	phf_codegen@0.11.3
+	phf_generator@0.11.3
+	phf_shared@0.11.3
+	pin-project-lite@0.2.16
+	pin-utils@0.1.0
+	pkg-config@0.3.31
+	platform-info@2.0.5
+	portable-atomic@1.10.0
+	powerfmt@0.2.0
+	ppv-lite86@0.2.20
+	pretty_assertions@1.4.1
+	prettyplease@0.2.27
+	proc-macro-crate@3.2.0
+	proc-macro2@1.0.93
+	procfs-core@0.17.0
+	procfs@0.17.0
+	quick-error@2.0.1
+	quote@1.0.38
+	radium@0.7.0
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rand_pcg@0.3.1
+	rayon-core@1.12.1
+	rayon@1.10.0
+	redox_syscall@0.5.8
+	reference-counted-singleton@0.1.5
+	regex-automata@0.4.9
+	regex-syntax@0.8.5
+	regex@1.11.1
+	relative-path@1.9.3
+	rlimit@0.10.2
+	roff@0.2.2
+	rstest@0.24.0
+	rstest_macros@0.24.0
+	rust-ini@0.21.1
+	rustc-hash@1.1.0
+	rustc_version@0.4.1
+	rustix@0.37.28
+	rustix@0.38.43
+	same-file@1.0.6
+	scopeguard@1.2.0
+	self_cell@1.1.0
+	selinux-sys@0.6.13
+	selinux@0.4.6
+	semver@1.0.24
+	serde-big-array@0.5.1
+	serde@1.0.217
+	serde_derive@1.0.217
+	sha1@0.10.6
+	sha2@0.10.8
+	sha3@0.10.8
+	shlex@1.3.0
+	signal-hook-mio@0.2.4
+	signal-hook-registry@1.4.2
+	signal-hook@0.3.17
+	simd-adler32@0.3.7
+	siphasher@1.0.1
+	slab@0.4.9
+	sm3@0.4.2
+	smallvec@1.13.2
+	smawk@0.3.2
+	socket2@0.5.8
+	strsim@0.11.1
+	syn@2.0.96
+	tap@1.0.1
+	tempfile@3.15.0
+	terminal_size@0.2.6
+	terminal_size@0.4.1
+	textwrap@0.16.1
+	thiserror-impl@1.0.69
+	thiserror-impl@2.0.11
+	thiserror@1.0.69
+	thiserror@2.0.11
+	time-core@0.1.2
+	time-macros@0.2.19
+	time@0.3.37
+	tiny-keccak@2.0.2
+	toml_datetime@0.6.8
+	toml_edit@0.22.22
+	trim-in-place@0.1.7
+	typenum@1.17.0
+	unicode-ident@1.0.14
+	unicode-linebreak@0.1.5
+	unicode-segmentation@1.12.0
+	unicode-width@0.1.14
+	unicode-width@0.2.0
+	unicode-xid@0.2.6
+	unindent@0.2.3
+	utf8parse@0.2.2
+	utmp-classic-raw@0.1.3
+	utmp-classic@0.1.6
+	uuid@1.11.1
+	uutils_term_grid@0.6.0
+	version_check@0.9.5
+	walkdir@2.5.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.99
+	wasm-bindgen-macro-support@0.2.99
+	wasm-bindgen-macro@0.2.99
+	wasm-bindgen-shared@0.2.99
+	wasm-bindgen@0.2.99
+	web-time@1.1.0
+	wild@2.2.1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.9
+	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-sys@0.59.0
+	windows-targets@0.48.5
+	windows-targets@0.52.6
+	windows@0.52.0
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.6
+	winnow@0.6.24
+	wyz@0.5.1
+	xattr@1.4.0
+	yansi@1.0.1
+	z85@3.0.5
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+	zip@2.2.2
+	zopfli@0.8.1
+"
+
+inherit cargo flag-o-matic
+
+DESCRIPTION="GNU coreutils rewritten in Rust"
+HOMEPAGE="https://uutils.github.io/coreutils/ https://github.com/uutils/coreutils"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/uutils/coreutils"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]] ; then
+	COREUTILS_COMMIT=""
+	SRC_URI="https://github.com/uutils/coreutils/archive/${FINDUTILS_COMMIT}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" ${CARGO_CRATE_URIS}"
+	S="${WORKDIR}"/coreutils-${COREUTILS_COMMIT}
+else
+	SRC_URI="https://github.com/uutils/coreutils/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" ${CARGO_CRATE_URIS}"
+	S="${WORKDIR}"/coreutils-${PV}
+
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD-2 BSD Boost-1.0 CC0-1.0 ISC MIT Unicode-3.0 ZLIB
+"
+SLOT="0"
+IUSE="debug selinux test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/oniguruma:=
+	selinux? ( sys-libs/libselinux )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? ( dev-util/cargo-nextest )
+"
+
+QA_FLAGS_IGNORED=".*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.27-xfail-tests.patch
+	"${FILESDIR}"/${PN}-0.0.28-cow-tests.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_compile() {
+	# normally cargo_src_compile sets this for us, but we don't use it
+	filter-lto
+
+	# By default, the crate uses a system version if it can. This just guarantees
+	# that it will error out instead of building a vendored copy.
+	export RUSTONIG_SYSTEM_LIBONIG=1
+
+	makeargs=(
+		# Disable output synchronisation as make calls cargo
+		-Onone
+
+		V=1
+
+		PROFILE=$(usex debug debug release)
+
+		PREFIX="${EPREFIX}/usr"
+		PROG_PREFIX="uu-"
+		MULTICALL=y
+		MANDIR="/share/man/man1"
+
+		SELINUX_ENABLED=$(usex selinux)
+
+		# pinky, uptime, users, and who require utmpx (not available on musl)
+		# bug #832868
+		SKIP_UTILS="$(usev elibc_musl "pinky uptime users who")"
+	)
+
+	emake "${makeargs[@]}"
+}
+
+src_test() {
+	local -x RUST_BACKTRACE=full
+
+	# Nicer output for nextest vs test
+	emake "${makeargs[@]}" \
+		CARGOFLAGS="${CARGOFLAGS} $(usev !debug --release)" \
+		TEST_NO_FAIL_FAST="--no-fail-fast" \
+		nextest
+}
+
+src_install() {
+	emake "${makeargs[@]}" DESTDIR="${D}" install
+}
diff --git a/sys-apps/uutils-coreutils/uutils-coreutils-9999.ebuild b/sys-apps/uutils-coreutils/uutils-coreutils-9999.ebuild
index 5b3867e75696..e62645b6edfa 100644
--- a/sys-apps/uutils-coreutils/uutils-coreutils-9999.ebuild
+++ b/sys-apps/uutils-coreutils/uutils-coreutils-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Autogenerated by pycargoebuild 0.6.2
@@ -6,279 +6,273 @@
 EAPI=8
 
 CRATES="
-	adler@1.0.2
-	ahash@0.8.11
+	adler2@2.0.0
 	aho-corasick@1.1.3
-	allocator-api2@0.2.18
+	allocator-api2@0.2.21
 	android-tzdata@0.1.1
 	android_system_properties@0.1.5
 	ansi-width@0.1.0
-	anstream@0.5.0
-	anstyle-parse@0.2.0
-	anstyle-query@1.0.0
-	anstyle-wincon@2.1.0
-	anstyle@1.0.0
-	arbitrary@1.3.2
-	arrayref@0.3.6
-	arrayvec@0.7.4
-	autocfg@1.1.0
-	bigdecimal@0.4.6
+	anstream@0.6.18
+	anstyle-parse@0.2.6
+	anstyle-query@1.1.2
+	anstyle-wincon@3.0.6
+	anstyle@1.0.10
+	arbitrary@1.4.1
+	arrayref@0.3.9
+	arrayvec@0.7.6
+	autocfg@1.4.0
+	bigdecimal@0.4.7
 	binary-heap-plus@0.5.0
 	bincode@1.3.3
 	bindgen@0.70.1
-	bit-set@0.5.3
-	bit-vec@0.6.3
 	bitflags@1.3.2
-	bitflags@2.6.0
+	bitflags@2.7.0
 	bitvec@1.0.1
 	blake2b_simd@1.0.2
-	blake3@1.5.4
-	block-buffer@0.10.3
-	bstr@1.10.0
-	bumpalo@3.11.1
+	blake3@1.5.5
+	block-buffer@0.10.4
+	bstr@1.11.3
+	bumpalo@3.16.0
 	bytecount@0.6.8
 	byteorder@1.5.0
-	cc@1.1.13
+	cc@1.2.8
 	cexpr@0.6.0
 	cfg-if@1.0.0
 	cfg_aliases@0.2.1
-	chrono@0.4.38
-	clang-sys@1.4.0
-	clap@4.4.2
-	clap_builder@4.4.2
-	clap_complete@4.4.0
-	clap_lex@0.5.0
-	clap_mangen@0.2.9
-	colorchoice@1.0.0
+	chrono-tz-build@0.4.0
+	chrono-tz@0.10.1
+	chrono@0.4.39
+	clang-sys@1.8.1
+	clap@4.5.26
+	clap_builder@4.5.26
+	clap_complete@4.5.42
+	clap_lex@0.7.4
+	clap_mangen@0.2.26
+	colorchoice@1.0.3
 	compare@0.1.0
-	console@0.15.8
+	console@0.15.10
 	const-random-macro@0.1.16
-	const-random@0.1.16
-	constant_time_eq@0.3.0
-	core-foundation-sys@0.8.3
+	const-random@0.1.18
+	constant_time_eq@0.3.1
+	core-foundation-sys@0.8.7
 	coz@0.1.3
-	cpp@0.5.9
-	cpp_build@0.5.9
-	cpp_common@0.5.9
-	cpp_macros@0.5.9
-	cpufeatures@0.2.5
-	crc32fast@1.4.0
-	crossbeam-channel@0.5.10
-	crossbeam-deque@0.8.4
-	crossbeam-epoch@0.9.17
-	crossbeam-utils@0.8.19
-	crossterm@0.27.0
+	cpp@0.5.10
+	cpp_build@0.5.10
+	cpp_common@0.5.10
+	cpp_macros@0.5.10
+	cpufeatures@0.2.16
+	crc32fast@1.4.2
+	crossbeam-deque@0.8.6
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.21
+	crossterm@0.28.1
 	crossterm_winapi@0.9.1
 	crunchy@0.2.2
 	crypto-common@0.1.6
 	ctrlc@3.4.5
-	data-encoding-macro-internal@0.1.13
-	data-encoding-macro@0.1.15
-	data-encoding@2.6.0
+	data-encoding-macro-internal@0.1.14
+	data-encoding-macro@0.1.16
+	data-encoding@2.7.0
 	deranged@0.3.11
-	derive_arbitrary@1.3.2
+	derive_arbitrary@1.4.1
 	diff@0.1.13
 	digest@0.10.7
-	displaydoc@0.2.4
-	dlv-list@0.5.0
+	displaydoc@0.2.5
+	dlv-list@0.5.2
 	dns-lookup@2.0.4
 	dunce@1.0.5
-	either@1.8.0
-	encode_unicode@0.3.6
+	either@1.13.0
+	encode_unicode@1.0.0
 	equivalent@1.0.1
-	errno@0.3.8
+	errno@0.3.10
 	exacl@0.12.0
-	fastrand@2.1.1
+	fastrand@2.3.0
 	file_diff@1.0.0
 	filedescriptor@0.8.2
 	filetime@0.2.25
-	flate2@1.0.28
+	flate2@1.0.35
 	fnv@1.0.7
+	foldhash@0.1.4
 	fs_extra@1.3.0
 	fsevent-sys@4.1.0
-	fts-sys@0.2.11
+	fts-sys@0.2.13
 	fundu-core@0.3.1
 	fundu@2.0.1
 	funty@2.0.0
-	futures-channel@0.3.31
 	futures-core@0.3.31
-	futures-executor@0.3.30
-	futures-io@0.3.31
 	futures-macro@0.3.31
-	futures-sink@0.3.31
 	futures-task@0.3.31
 	futures-timer@3.0.3
 	futures-util@0.3.31
-	futures@0.3.30
 	gcd@2.3.0
-	generic-array@0.14.6
-	getrandom@0.2.9
-	glob@0.3.1
+	generic-array@0.14.7
+	getrandom@0.2.15
+	glob@0.3.2
 	half@2.4.1
-	hashbrown@0.14.3
-	hermit-abi@0.3.2
+	hashbrown@0.14.5
+	hashbrown@0.15.2
+	hermit-abi@0.3.9
 	hex-literal@0.4.1
 	hex@0.4.3
 	hostname@0.4.0
 	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.53
-	indexmap@2.5.0
+	iana-time-zone@0.1.61
+	indexmap@2.7.0
 	indicatif@0.17.9
 	inotify-sys@0.1.5
-	inotify@0.9.6
+	inotify@0.11.0
 	io-lifetimes@1.0.11
+	is_terminal_polyfill@1.70.1
 	itertools@0.13.0
-	itoa@1.0.4
-	js-sys@0.3.64
-	keccak@0.1.4
-	kqueue-sys@1.0.3
-	kqueue@1.0.7
-	lazy_static@1.4.0
-	libc@0.2.161
-	libloading@0.7.4
-	libm@0.2.7
+	itertools@0.14.0
+	itoa@1.0.14
+	js-sys@0.3.76
+	keccak@0.1.5
+	kqueue-sys@1.0.4
+	kqueue@1.0.8
+	lazy_static@1.5.0
+	libc@0.2.169
+	libloading@0.8.6
+	libm@0.2.11
 	libredox@0.1.3
 	linux-raw-sys@0.3.8
-	linux-raw-sys@0.4.14
-	lock_api@0.4.9
-	log@0.4.20
-	lru@0.12.3
+	linux-raw-sys@0.4.15
+	lock_api@0.4.12
+	lockfree-object-pool@0.1.6
+	log@0.4.22
+	lru@0.12.5
 	lscolors@0.20.0
 	md-5@0.10.6
 	memchr@2.7.4
 	memmap2@0.9.5
 	minimal-lexical@0.2.1
-	miniz_oxide@0.7.2
-	mio@0.8.11
+	miniz_oxide@0.8.2
+	mio@1.0.3
 	nix@0.29.0
 	nom@7.1.3
-	notify@6.0.1
-	nu-ansi-term@0.50.0
+	notify-types@2.0.0
+	notify@8.0.0
+	nu-ansi-term@0.50.1
 	num-bigint@0.4.6
 	num-conv@0.1.0
 	num-integer@0.1.46
 	num-modular@0.5.1
 	num-prime@0.4.4
 	num-traits@0.2.19
-	num_enum@0.7.3
-	num_enum_derive@0.7.3
-	num_threads@0.1.6
+	num_threads@0.1.7
 	number_prefix@0.4.0
 	once_cell@1.20.2
 	onig@6.4.0
 	onig_sys@69.8.1
 	ordered-multimap@0.7.3
 	os_display@0.1.3
-	parking_lot@0.12.1
+	parking_lot@0.12.3
 	parking_lot_core@0.9.10
+	parse-zoneinfo@0.3.1
 	parse_datetime@0.6.0
-	phf@0.11.2
-	phf_codegen@0.11.2
-	phf_generator@0.11.1
-	phf_shared@0.11.2
-	pin-project-lite@0.2.9
+	phf@0.11.3
+	phf_codegen@0.11.3
+	phf_generator@0.11.3
+	phf_shared@0.11.3
+	pin-project-lite@0.2.16
 	pin-utils@0.1.0
-	pkg-config@0.3.26
-	platform-info@2.0.4
-	portable-atomic@1.6.0
+	pkg-config@0.3.31
+	platform-info@2.0.5
+	portable-atomic@1.10.0
 	powerfmt@0.2.0
-	ppv-lite86@0.2.17
+	ppv-lite86@0.2.20
 	pretty_assertions@1.4.1
-	prettyplease@0.2.19
+	prettyplease@0.2.27
 	proc-macro-crate@3.2.0
-	proc-macro2@1.0.89
+	proc-macro2@1.0.93
 	procfs-core@0.17.0
 	procfs@0.17.0
-	proptest@1.5.0
-	quick-error@1.2.3
 	quick-error@2.0.1
-	quote@1.0.37
+	quote@1.0.38
 	radium@0.7.0
 	rand@0.8.5
 	rand_chacha@0.3.1
 	rand_core@0.6.4
 	rand_pcg@0.3.1
-	rand_xorshift@0.3.0
 	rayon-core@1.12.1
 	rayon@1.10.0
-	redox_syscall@0.5.7
-	reference-counted-singleton@0.1.2
-	regex-automata@0.4.8
+	redox_syscall@0.5.8
+	reference-counted-singleton@0.1.5
+	regex-automata@0.4.9
 	regex-syntax@0.8.5
 	regex@1.11.1
 	relative-path@1.9.3
 	rlimit@0.10.2
-	roff@0.2.1
-	rstest@0.23.0
-	rstest_macros@0.23.0
+	roff@0.2.2
+	rstest@0.24.0
+	rstest_macros@0.24.0
 	rust-ini@0.21.1
 	rustc-hash@1.1.0
 	rustc_version@0.4.1
-	rustix@0.37.26
-	rustix@0.38.37
-	rusty-fork@0.3.0
+	rustix@0.37.28
+	rustix@0.38.43
 	same-file@1.0.6
 	scopeguard@1.2.0
-	self_cell@1.0.4
-	selinux-sys@0.6.12
+	self_cell@1.1.0
+	selinux-sys@0.6.13
 	selinux@0.4.6
-	semver@1.0.14
+	semver@1.0.24
 	serde-big-array@0.5.1
-	serde@1.0.214
-	serde_derive@1.0.214
+	serde@1.0.217
+	serde_derive@1.0.217
 	sha1@0.10.6
 	sha2@0.10.8
 	sha3@0.10.8
 	shlex@1.3.0
-	signal-hook-mio@0.2.3
-	signal-hook-registry@1.4.1
+	signal-hook-mio@0.2.4
+	signal-hook-registry@1.4.2
 	signal-hook@0.3.17
-	siphasher@0.3.10
-	slab@0.4.7
+	simd-adler32@0.3.7
+	siphasher@1.0.1
+	slab@0.4.9
 	sm3@0.4.2
 	smallvec@1.13.2
-	smawk@0.3.1
-	socket2@0.5.3
-	strsim@0.10.0
-	syn@1.0.109
-	syn@2.0.86
+	smawk@0.3.2
+	socket2@0.5.8
+	strsim@0.11.1
+	syn@2.0.96
 	tap@1.0.1
-	tempfile@3.13.0
+	tempfile@3.15.0
 	terminal_size@0.2.6
-	terminal_size@0.4.0
+	terminal_size@0.4.1
 	textwrap@0.16.1
-	thiserror-impl@1.0.66
-	thiserror@1.0.66
+	thiserror-impl@1.0.69
+	thiserror-impl@2.0.11
+	thiserror@1.0.69
+	thiserror@2.0.11
 	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
+	time-macros@0.2.19
+	time@0.3.37
 	tiny-keccak@2.0.2
 	toml_datetime@0.6.8
 	toml_edit@0.22.22
 	trim-in-place@0.1.7
-	typenum@1.15.0
-	unarray@0.1.4
-	unicode-ident@1.0.13
+	typenum@1.17.0
+	unicode-ident@1.0.14
 	unicode-linebreak@0.1.5
 	unicode-segmentation@1.12.0
-	unicode-width@0.1.13
+	unicode-width@0.1.14
 	unicode-width@0.2.0
-	unicode-xid@0.2.4
+	unicode-xid@0.2.6
 	unindent@0.2.3
-	utf8parse@0.2.1
+	utf8parse@0.2.2
 	utmp-classic-raw@0.1.3
 	utmp-classic@0.1.6
-	uuid@1.7.0
+	uuid@1.11.1
 	uutils_term_grid@0.6.0
-	version_check@0.9.4
-	wait-timeout@0.2.0
+	version_check@0.9.5
 	walkdir@2.5.0
 	wasi@0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-backend@0.2.87
-	wasm-bindgen-macro-support@0.2.87
-	wasm-bindgen-macro@0.2.87
-	wasm-bindgen-shared@0.2.87
-	wasm-bindgen@0.2.87
+	wasm-bindgen-backend@0.2.99
+	wasm-bindgen-macro-support@0.2.99
+	wasm-bindgen-macro@0.2.99
+	wasm-bindgen-shared@0.2.99
+	wasm-bindgen@0.2.99
 	web-time@1.1.0
 	wild@2.2.1
 	winapi-i686-pc-windows-gnu@0.4.0
@@ -286,44 +280,36 @@ CRATES="
 	winapi-x86_64-pc-windows-gnu@0.4.0
 	winapi@0.3.9
 	windows-core@0.52.0
-	windows-sys@0.45.0
 	windows-sys@0.48.0
 	windows-sys@0.52.0
 	windows-sys@0.59.0
-	windows-targets@0.42.2
 	windows-targets@0.48.5
 	windows-targets@0.52.6
 	windows@0.52.0
-	windows_aarch64_gnullvm@0.42.2
 	windows_aarch64_gnullvm@0.48.5
 	windows_aarch64_gnullvm@0.52.6
-	windows_aarch64_msvc@0.42.2
 	windows_aarch64_msvc@0.48.5
 	windows_aarch64_msvc@0.52.6
-	windows_i686_gnu@0.42.2
 	windows_i686_gnu@0.48.5
 	windows_i686_gnu@0.52.6
 	windows_i686_gnullvm@0.52.6
-	windows_i686_msvc@0.42.2
 	windows_i686_msvc@0.48.5
 	windows_i686_msvc@0.52.6
-	windows_x86_64_gnu@0.42.2
 	windows_x86_64_gnu@0.48.5
 	windows_x86_64_gnu@0.52.6
-	windows_x86_64_gnullvm@0.42.2
 	windows_x86_64_gnullvm@0.48.5
 	windows_x86_64_gnullvm@0.52.6
-	windows_x86_64_msvc@0.42.2
 	windows_x86_64_msvc@0.48.5
 	windows_x86_64_msvc@0.52.6
-	winnow@0.6.20
+	winnow@0.6.24
 	wyz@0.5.1
-	xattr@1.3.1
+	xattr@1.4.0
 	yansi@1.0.1
 	z85@3.0.5
-	zerocopy-derive@0.7.34
-	zerocopy@0.7.34
-	zip@1.1.4
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+	zip@2.2.2
+	zopfli@0.8.1
 "
 
 inherit cargo flag-o-matic
@@ -349,7 +335,9 @@ fi
 
 LICENSE="MIT"
 # Dependent crate licenses
-LICENSE+=" Apache-2.0 BSD-2 BSD CC0-1.0 ISC MIT Unicode-DFS-2016"
+LICENSE+="
+	Apache-2.0 BSD-2 BSD Boost-1.0 CC0-1.0 ISC MIT Unicode-3.0 ZLIB
+"
 SLOT="0"
 IUSE="debug selinux test"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/uutils-findutils/Manifest b/sys-apps/uutils-findutils/Manifest
index e992c03f7425..085d1ebbb2a1 100644
--- a/sys-apps/uutils-findutils/Manifest
+++ b/sys-apps/uutils-findutils/Manifest
@@ -1,36 +1,27 @@
-DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
 DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
 DIST anstream-0.6.12.crate 30769 BLAKE2B 7e1427a8d81ab52f74c5d25209ba2a410575958139ec5e6a94d0a7751c4a177285ece215222b16bffc0fb12b19014e9925e27a988a52e7dfa5139476bec4cf7b SHA512 47396e1617464188e7b4d7c931c5a6fafa918ca7aa39044a5b3dad1b8685ea96829ee87e7b70820bbe2efb35571fb331539f0fb8938d229034a9b9bb60700a70
-DIST anstyle-1.0.0.crate 13972 BLAKE2B 741704b6e338834696bc816d8a65ff933f9bff48e71d25269f04c4a24c3dbb06826d2f84f73a1dceeda99cfc5c8e3d59b3d07dbb404cc3471b86cf118d074e80 SHA512 5a0159b9f8a80afadff04ecbec3c1769cef712c77de8062b31323298dab9507f4a87b7c777e6335d310ec464b0982d097b5888b4b351c389b5f4419c2c87be7b
 DIST anstyle-1.0.8.crate 15771 BLAKE2B c039613e7de27cc990e5764810f9351754b160928a8954dc19041354cf9fef1422ed964237a5d39d16e4e9f8592ed52c523ccf36b0b5506f464d4f818f3332ff SHA512 3b867f73df0b2f69a0c7d5d6e62c7515045e053656afaa303e5aade8012e838cdf5d15d2c3d7c297db9e297d08ea69a9c8eed04b97922a83f56c58962c1c0b69
 DIST anstyle-parse-0.2.1.crate 24802 BLAKE2B 6304a56c6a9fbaf1bb4d1d177b2315684345dc9d71c35836f9544145364f8d6eb56e25c03076690c594ab7db5914501acb569f6c136952e59c93179ced527fb2 SHA512 5c8fc7d88ffc3a6e78340ffe0f3c2d72e865512030ade4509de9c673eba955c536bb1873dac11f6ba11cc8367fb30c67451ed65d19f81507c9e917c702bfd176
 DIST anstyle-query-1.0.0.crate 8620 BLAKE2B 2d296b5066fd6284a2410923215571e6df650c5ef892d6de7a7088a0996ca30608797feabc84f3c325ff4d07001dac80ac5067d2a9c9d15d9ba59a276b399f53 SHA512 2781be5c82293b7ae338ec5046fbeb130de9eb2dbf2e4dfaa73ca5233032e1e52c133e141b02f33d4bc36d996a0a3f680ac82d42d614a5305005f60547133c7a
 DIST anstyle-wincon-3.0.1.crate 11279 BLAKE2B 593de9443b4c612526550285a6c156db26a233815e77a748597c6eea509ae511f41eb8ee736010f8be853695c9f1d94b034a77190e612f0a00bf00385d66ced2 SHA512 75ab14081b09e031ee0f559538976f39092aaeb6f561a56de83d12911cc2b45e28eec21068792c86a61e344021921ab55e7139ca79acec78e7d4a796dfa42a2e
-DIST assert_cmd-2.0.14.crate 24591 BLAKE2B 2a25812480770ce8549700b6c5afd0e3fc230c280c66b5b61480a2db0dc6c5a95b6a564ca7eb6024fa43498168d8bd3511a6cd659498540bf1a5a3bdbc2a3fc8 SHA512 112c3f933a013715c0dfcf29889ec023c88097a70fe212a7d98d0a5272d5f6da87df9353da006483830a0ac3c42a12e12d8fabeb90eb62453982edbc75215613
 DIST assert_cmd-2.0.16.crate 26554 BLAKE2B fc803af7ca45de94e120c560efb7e1e39ecb706738d292695680f9fe14b2d570f7214dcda37122dbc1227228ba265c6dac7d7afa4fb22178c38b015bc8745828 SHA512 0b9167282d75169b0b1fad0b1401b42884185976ae0dd690851671aedbc1a9af26dd33f3047400eb4a1b5070216acc293aade149aded7e4f86dd5c0ef0e9a6a9
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitflags-2.4.1.crate 37043 BLAKE2B f61c45b142265e9c2944c7054e01704de47510735e9ee5351cd02b98676cc4eb42d68b1fc4849ad5f54654617a74f20cb533b4207c2fe76516b724ba9318b414 SHA512 d3fd7abc95acc1cb5bf16d6acc12dbb8eadd250f069268df13c2e8dc3d5f5c15a929cd17ca931c77393b64dce0516ef8674c469789ed32d78e315b5faada062b
-DIST bstr-1.0.1.crate 340636 BLAKE2B 5c5c67fd6ac1d7219eb0b47fab4a32dcaca91218316a0151e8cdcda0c94dbec06623cb1ac1cc8a2203bd77bfeaaed57042b2dfb401f5f4bd8d397d64a34d9e56 SHA512 b4896364458074cf478c8df412619860858f5eb96e2228e5d083f074dd11b49ec1076df314c5d593dd4f8da1a286305793cdfecbcd9aa5f417706e545c4e8585
 DIST bstr-1.9.1.crate 380305 BLAKE2B 52b45bd48874d052636c6b451cc36d8b012808ea5193e0188e5edd09f81d21b8306926cfebb405ad0650ec9aa710f609bacaa773bf854b21f4803dc38bb2eca7 SHA512 67e9f76719310de60f46adf3c39768b4dc078d4c32dc6bdcec1a94cd9f630c5238e427ed84cd6ec25a44f54e84adeb795a0e92060a5372d9fb9ad9f0914e3172
 DIST bumpalo-3.12.0.crate 81604 BLAKE2B 2370094f0c23a3e9b75c8e523e54637189543d9df90ae7ddc349d316054d3d1abd1319e51cf1578f1630be0673fd7f65d130469b2729aa32617372e8bc5dd5f7 SHA512 37f2228f251340e82c27f2b34da2af6eb520077b3809331547cbe4887c0b4791b1a7d75a017decccef162cd02a088d504214b7a44b484a7d93eb6a278b329ee4
-DIST byteorder-1.4.2.crate 22148 BLAKE2B 4fd246d80ec9e0abf41a0779668d8b383098206eacbf7e16ab94a4aac39858471742934df41e20084f976a738154a97f642bebe51cb871afb2a50ff2cbdbf943 SHA512 f6d2bdc3fb456b3f7a99358a987bb593be027b47b06b896938a30a88d36459ec4d28be166ff8fea9b1ea468d95ad387488cc6aa8f07d0723d6a2a7d43e3617e8
 DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cfg_aliases-0.1.1.crate 6009 BLAKE2B 6acfae9a89d3479f7ce1f0b5dbb13bfe27c006b936a96685606a61a06f69d17ab754a8a0d96c54213f758281c2fb32ac74d03a34e0f836dc7e438387955aac37 SHA512 238828445c5b48ca41ff88825af0a1ad30494e423bb6f89b6d5e4d26042afaa1ceb0e32041f7cddd79c3e15c6c82a1ddb9469c4b63a1ac52d4bcc1174900f880
 DIST cfg_aliases-0.2.1.crate 6355 BLAKE2B a758d9c88527f0e6e7cfd6d4c83eda1bcb4d6e2438189fe08e8ecbcaa78d56afc5a4873f3b82bf7da96afd690b44cdf1e44466b6da0f37c358b340481017103e SHA512 74969d12d5d24002a29e08d52e30fbce014dd481a7c35ee0162e69333c5f2d7755f3b02439b31522e12444cf1ac8e65880ce33fe6778dac03757e362cbf8a72c
-DIST chrono-0.4.37.crate 234441 BLAKE2B d1c10bcdf33324f1dbe9a79cd8c5a70b8223ca289753446aef778c93bf18863714ab2ade88f1e67432d1451b0d408065325a7d8dd3578211a0e39caae733ceee SHA512 46d77f291c7c60a25d0c06ebbd89935ef3ae1b736d504b8faf39aad8210a9fc68b45b5afb024763979f666308750b1a662afdabc36c59974567cadadfc17fcbf
 DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
 DIST clap-4.5.17.crate 56802 BLAKE2B fcdd23d66ecd27ee3820c4abe681bc997dd6cfd69948e11603aa8c4ca39513d5de901373959328986ef81c046318f240ea87a2f19b38921faf76b6c93d0e4f67 SHA512 69f0fe213007a2e0a564945bf58794b891a345c34747e92ec16877253ff60c1a30fab24031b5f56d6e31ea7b0d8c9dc0c815fd1489b2c0df1e2d24b4a2be6406
-DIST clap-4.5.4.crate 55401 BLAKE2B e9ece2eee6be16c366888f6140080c43a182aa758a971ab2f60fa5c8f5e00460c3e6ae6bface1f36445306265ce13d8145ac24cef833b68b2b2c32c13a7a4a00 SHA512 c1e88968a86598a6541cd8f8144909872fe71fc707dc5327293a71425f6ff9d4957491f93c36326a9f615c1cce1a453cc85740ff18e1ca571e91bf8f7a6ad7c0
 DIST clap_builder-4.5.17.crate 163559 BLAKE2B 10731513f76c64027116ec97aa7dcbfbff74e649c64bd32db1a14ed1ec00e81a3b7c8e3ca478e5f077fa49eae9ae48dca4810190924b9af5dccea9cb0f883b5d SHA512 86411378aefae1eeec1128d797a21697d9470fad7ba2e109e00e8ae20d4da218e909d56a2f7065a4b2651d6c5d76d14a7394d747b2a4313c739abe0c9b046492
-DIST clap_builder-4.5.2.crate 163566 BLAKE2B 5eb81df416f3da0bb7e53c59ef4e914f03e2bb0563bb3707fbf70215f249aa523e3f5ef2205d0a8e25c23db6c6d0d344181c1c771566453505c769c55b355374 SHA512 af7eb8326a980cf461442a4dd6d224e61ae31a2fe4a45b34210a2c1f747eed49e00b6254699e82f986f441667f290a5de747b5e9d9d0360ed049504343385864
 DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036
 DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
 DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
-DIST dashmap-5.3.4.crate 22826 BLAKE2B 65932f6ff7a60ae1eb309b8e75f31c4ec8beba09ccd2345b0c133237e3504833efa66d9f811aee123681034360112686c04dd47766537ffe300c0dd8ab86263b SHA512 95310bc2b9e4ab46acc056ed0be8e75bb6e27e6bdb2bf2e0917482cdc86e64e5fb9159307016895f25282771fe3a367731d0e2c68c6aa5435154945cda52b6df
 DIST diff-0.1.13.crate 46216 BLAKE2B 27ceeafb7afd45eabbbe22d1f05667f513a6062762e6b77122e267282a8f2a0bf96384989508bf10c9e13af4856bc9f58f09b10055d6fc2c32681e288ffa9f9e SHA512 45e259c9fe7c23bd9e9454891b42d4aef6d681d35ee039d21fdb05ae9ed5856161a40f29889e7880ac2a2daf85f1b7d752d213b4a99a1a74ed2682c18a3ae7fb
 DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
@@ -38,7 +29,6 @@ DIST dunce-1.0.4.crate 8034 BLAKE2B e1e7ffbcf1e3632036c03303ab46fc37b2b0a9915987
 DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
 DIST faccess-0.2.4.crate 7262 BLAKE2B d069c8ea1555563137a9e7fd4e8626b8327f96e7eb1e05f1281e20fd1f283278cfada7eb2a10064bd03d8057561367283bcc16280132f16ad3e9e977027f8150 SHA512 6d3328238dcdad0a310ad33e28ca32e68314c7a1b99b0c88c4bb5b380c5a385ec8deb23bb5e8f6bb2eff957becf0b514c488564eb6bd88d471f6ebd3a1614efd
 DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9
-DIST filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3
 DIST filetime-0.2.25.crate 14940 BLAKE2B 1ffcbad3b2023ba5e9b2d71e279fd8c3564458b28290f3e19bf43b87083e1e3c0e18f191f6dc67540baccb83075df453950230089f243e6276e413321cceedc7 SHA512 90b4f3c4df29a3456c393f78f636d70f2615cba748a972dc9b937c2fcbbf4544f5b0d28c6c8fcfed5d5eda026ac670afffec18ab7d7127cee9afa2717146ccf2
 DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
 DIST futures-0.3.21.crate 49935 BLAKE2B 290dee4f7662a473d82350092c0b12a8270f6d6f5eae9e4f7e06a6abf59e2d9f2d33e5e62e2682fcf6e109d62f651cb37cc467cff2b20f909c72b5fee2cb7683 SHA512 723fc190e4480fd812a852656fa6509a188f0d06adaa1c22ef24ec4afa7688a1c5d3961e5747f0812d073fc672b0e084af6ad5e5c3fac3ea5829466f993ad865
@@ -50,17 +40,13 @@ DIST futures-sink-0.3.21.crate 7843 BLAKE2B e4b2ac98e89063b23f5e278cad1df6b1b8f9
 DIST futures-task-0.3.21.crate 11815 BLAKE2B ec3f2e2c025e9a482d86912099e68722099c22c0024669906036504d0e70998cb9cb5fd4074928d21847334611ccfcbe6d3e2f686c4d4d7d4436f1e7f501b8fb SHA512 8f3b27865d8c7a290471903297e3c0b52caebfaa55550a4738d7915008b893fce67c7d9ae5c5bd03f2a42ee72a96aa0245c4bee70fc06977b3493eb81bca2033
 DIST futures-util-0.3.21.crate 153768 BLAKE2B b3bc5632bbc7616d33f74361d68f83e0cb051125475101c84212ea2bd03307e927cd125e2f93eeb0f84946cc45d3964a590dcbfcfff88d3ce1970f127e71aed3 SHA512 ff952fb74a54e793de943e3aee2ac771357bf9f1aa5de89af128868c46a6b44e414fc4ea97f2d9b201ff7ff41023e119f1adf90d314343ff53ab987c3e07f5d4
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
-DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
 DIST iana-time-zone-0.1.47.crate 16974 BLAKE2B 841e380fd81def3eb5af424215c36caa9b48adf2368d9da57dd562ea4f806fc5ed1abd0c118eebb532264eb3ab5d8670049cfe20eada40cad7bef4718245c968 SHA512 c1817555149f05ae45f7e54046b79c732f80f5af382680d626dd3e970167092cdc176b259941d3c1533518bef511a92ed24c3aa538897e9d082984684d99f55b
 DIST js-sys-0.3.59.crate 78849 BLAKE2B 2dd42294717ddf922f4d329b3da1acefe1e34c5d9c735132752bab183ea186a879a8218d201238146c20374e724f9219d2c28dca8c530105a18eca81ba86fe39 SHA512 317a0cbce8ccad741dfac48a09e326460bda68a58225bd8d2eb50ff50a7355016c399660e996b328bdbb77d12bc5107d4c2908b11441183f3b3d2f45eedbfd00
-DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
 DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
 DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
 DIST linux-raw-sys-0.4.12.crate 1465800 BLAKE2B 2f70a344c427093fd55732b68239f771cf6563edfe2db4b2f50cdbc904dfc7565b30bf06454b91482eaeea787b9cd4214979665bfa32f3c1c586551333cf4d2e SHA512 d9564d02d5f41356478066592e438629adb3275df0e5a1a44030cc99bf8856b8af64f18f27371f84122a828b34712aae16495a1a16050fbdbece6d95e9cdace9
 DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
-DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40
 DIST nix-0.28.0.crate 311086 BLAKE2B a07023566f04896fdb3ef8b2a1ae8dd64adaa5eb48217c58588e1b41733642e03e0637350c0ee83ac47e663c02b24d5668be751f8d199aa773de6df8b2213894 SHA512 73c0c94b360f4fc81ff07a13692b2a5b5ceda3a7203bdf1e526facabd36cdf160f0ae8fa479e31a4e4237c09bde11e9bf821aa496311cac8614f9c5626f8d69a
 DIST nix-0.29.0.crate 318248 BLAKE2B 3a13a88375a359cf77b28d7f77f47f178bd31ef74b7627b6701bc6fc601024706be4e9ac1a076c7cba26b64d3bac4de17aab45fe3c045aa7a36e2d9232e872ca SHA512 86c05084aa0e6238f8d48df0f5ce6e6d7661b589f4f3fbdad43387c59c0d6afafea4badf25d31db1611615de19a0b9ef18ce614846b79a47cad4e2c9367dbe7f
@@ -76,7 +62,6 @@ DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb
 DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.24.crate 16489 BLAKE2B d0bd099bcc39928b6758c22b14291f2dc4f4452c0837aeed8c3ff6086cdcf29518806e4f3f379804c998d752b717a26d5c0054c071c5f4c224a3e03cc6a3ee51 SHA512 be22c609b3d5a9a38bab1d30792cff397cc908f1c53fb2da68a9a7d1258e53ef64c1c5b26d840b0ed1d35b307c98ffb499c82e5796e88be0a6ecc0c6f3b5dbfb
-DIST predicates-3.1.0.crate 23090 BLAKE2B 6c51fa390f3335501df604afda47ff1d2a69322d928a1412bcc4829f16c3ff5d345ae52f54d797c9698b0eb7b26495e594d8c21f04fdd77c8119ad4635184adb SHA512 1ee38c715b4b55038497a4a4996e12de91d356d53173d3a034d6a1f56859cb3a4a61a82d016fbefdd6ff291519097ce9cef950547d3d437035cd7093d965dbf0
 DIST predicates-3.1.2.crate 23986 BLAKE2B db4209b491f82a1ef6147158fdf86c0bd8a059e61c4a1922dccba257e461be36e31d4a03440c2b80b3c7c49d612dec81fb76f648bd5837c481d93cc9ac5ede65 SHA512 50896189f39842ef424aebc12c2633112fda83eba1bdeaa3e6f398db1e28dca0cc7838948f25e67f6fceede1a91a1b0ede5d4dc4edac6da752e48c7a07bbe3ae
 DIST predicates-core-1.0.6.crate 8084 BLAKE2B 337cbb155bc2859c5a8b891c21d352e998cd1eaaf606cf46c003c9c499a42f12268b071e7a4cca65d50cdfdfd4267f023076e078a0a3eb401ad836755d65298e SHA512 afeb1de4275c76bb1c5950f42bce2f83a21ab217ec60130336286cb48b15f36bf2a1ca346bd652c10a65a1f9e3310d16b23b8333a3e0f7e20fe874c3f728e702
 DIST predicates-tree-1.0.1.crate 6355 BLAKE2B b79f756d9f1822a037c05a65f90cf01592ec6ba83bde2c44aa6fc8a3d476f9e4e3d0ac13afdcd3936b0d43244e8e7ab1eeaf0223cecc3f7941af96e44c45366f SHA512 f97f6e05b3edc1faf82931ab47541b3e459066e0f5181f77a4ab885e10bdce43f71021bf2c848993125a4feef13c3290a312a74ad1d2b4a2cb55fe7d24492a19
@@ -86,10 +71,7 @@ DIST quote-1.0.28.crate 28382 BLAKE2B 9fb16c3bb2a7fec3d8138ffec1f58277061f4a643c
 DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
 DIST redox_syscall-0.5.3.crate 23830 BLAKE2B 0a38235ec277144f0c3e7bcb1d273c7f357d85aef33dbd06328ef16bab7df0a07b523431590899ea58d55e8e1d84c32392478530200cca3a9483e8a47b29e233 SHA512 777d1208004b7756887d6c5745ea408972670e59430e1d299d01a463ae41b98e0920ee77aefef8755fc949d4799dca679afaaae9c1a7d060f76f69af5b90427e
 DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
-DIST regex-1.7.3.crate 239886 BLAKE2B 8d9413178b626b09243e18a1c5e0336cd41e05659128d4026bd551df0c34b9e141e36c3134f3b22200b18828ef89082a08515047159afb4f4960e5fa840fd54b SHA512 f7e8dbcfaa10c2443b9a6dfa514edf0e149d33f1a135e4a828adf97dbb0f1af5a4b58a2bad75ea8cbecb9641f499b30ed06b8ba60c7eaba79409ca18ede85e4f
-DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
 DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3
-DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e
 DIST regex-syntax-0.8.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed
 DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960
 DIST same-file-1.0.4.crate 8678 BLAKE2B a46a2572f18a9adb3a23c8142c78d55757f04e10ddf68568f6af810a6e30a4b212bbf21c453ccd9b2e5ea7c42c6216505a4119fc6f19645c28e5434e3e8d7847 SHA512 bfb961dc7a31d5dd3be748d6ac609006ba71e0a6f61ec06c5f96a651e1ad1e768873b7cc2a10d9a52a6c670e7b56bf015df2974158001cb3138e2108d3160fea
@@ -97,26 +79,21 @@ DIST scc-2.1.0.crate 122739 BLAKE2B 12508415de1d856cac46ac042ff8ec738fdf234dc34b
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST sdd-0.2.0.crate 23494 BLAKE2B 4f104f7dbbe4db9d91a61e44993292c9ca2b0df05f466c6da2f31b1c4b70cd51dd96622298b75f6cdb3a45ad110f07b45eef9f398572052010918460359f36b4 SHA512 851040ba93361673ffc193aef83b0b467f46d1c1d8df2230fcb8a31fa1b0264db95a7df78f4e61f53a2fa9d77547eac450e711247b1cef9490ebe8d1bdb14d55
 DIST serde-1.0.147.crate 76697 BLAKE2B 90fb2df19ad225c96a30cf88dea82a5785bb110f256b882cadef8d1e09f91dd610637a104c2e7629847a14d4a422f89f7ae324c29845788aefb0a6bb51503886 SHA512 d993bd86c61bba602faf7286ff21d36c5d8c83176c5bbb203cb284a3f89dbc8a1ca893a09eb2657f9e98ccb5c5287f44aac06d2e60db96e78d99ee40bd1fe1b0
-DIST serial_test-3.0.0.crate 8483 BLAKE2B 3e392bfae0f75d83bd381f04950d5cdfc1244bbdcce523258d5b13aac567ad0987a7f50a4c0e189f283ed6f385fcebf631322200dee268b8f4a306c258dd4782 SHA512 b743748496b188ef8078204c5ff25823f1aadf50299a353a2afbac5014fd025dcf9b86f63343098f7bc1399866b4841399389bae586b088b69dd75cf23c27cef
 DIST serial_test-3.1.1.crate 8660 BLAKE2B c53e2253af200a40abeba2e9ceffe24b12abb128a123370eff1deb0f430c2ba511e0f59d0d22e541e7993e0e5751665be6457de025fb39b43edb72db4cac963e SHA512 6c339aa658625ecb561f000247df185ff98eb3d9d117fc32c3c57f83fb5d02c4e45fba53d9f53457f87f2e7e635f581d5c4fde48cff6971fe17619307b487aea
-DIST serial_test_derive-3.0.0.crate 6588 BLAKE2B 9f6c2730ae163981931d361053dd579acedb874c86e749d4649a3bbb88a1a1f41c780405b39bb38d6438b0c451726783189f1adc0370d914ae7907dc5d83a312 SHA512 f1574b6eea36ff1d9592971f74de76ffc748b6a495c5c3b26e90baf6ec8bce61042072ebe50bc8e0d12720040d815552765ab092f6fe8e58e8d4b26a6298b3ee
 DIST serial_test_derive-3.1.1.crate 6881 BLAKE2B 8dcadae7d44ecb2f4ca7290d5e1749e0ea2b21462b0020fc7d751f7d254a18afdb99456b4d5cdc35c73c9f5f5112654ecd7e06cb3afdf384d93e48430d11dcbc SHA512 7ea928622fd1c8b0e9103815e181ef179a4bac91b1b7de8937b4c97d7f552b22615129df29598d7415e6d735ac08f5fdd7d09f4393861714354bf47bcd6dba09
 DIST slab-0.4.6.crate 16067 BLAKE2B 0aa3d8914479baf2409ce83644f8eca93f49b426333f1b82392b779fd79cdc04a0a33bc1aa5e34e8248df9ebd88e742b3e870716adf1787bcb7aa5b9caee307c SHA512 788837db210be63579eccf12d96fcaa3280c7515bedebe3040a71ed27d013430815ebc74acc06280daf22c0b16871bad210981d32615c26cb1da344b4b0d9488
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST strsim-0.11.0.crate 13710 BLAKE2B bdc748ffab302c8e1d3412663e300c399ba13bfc0e15b07101a680394204af2df8897ba784dbe57b95c4fa9e732439d0f5aabb090b1b1c81f066bfa125919419 SHA512 ef4165dabaf8cbdd6c58420043cff9c0d1f4bc3ed53de5973b654bd71ac7d462fecaa6e1b750fbcbb8e19b35f6e6b73641a17656b20f5562b6ba7d84e69de226
 DIST syn-2.0.18.crate 240648 BLAKE2B 1e16f0936faf2656ee74cf9c75bdaec19589a4309d68b0cab37438061cfa29c66a1dcd624ad9247d63c85b3c1fdd8a484a65509d672cc6471f3c93f3ecce30d2 SHA512 2642eb35d52022c6d21bb893843beb9b737a267f620e1f5a6c9096d434fd1fab05fe007c8d8b6f1fe00a25007d6f55dbd4ec620b9f5c1154659bf34c246334dd
-DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
 DIST tempfile-3.12.0.crate 34423 BLAKE2B a8b84f54a54be636f5b69791ca567e8b692d6a8485ef37e5a8340d26b32b1b0f9f8e9fcd9a2da90ec2fbd39c281d364dfc5723d06892832edb79ea5cf45d069c SHA512 1a27513548060984be894e6f8fc215831e4b2054b2244c6188bee76c477c001f294c762f2f4a14488c58c04e5d1473806d589c7bba1eaa2cc02d97656709be66
 DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
 DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
 DIST unicode-ident-1.0.9.crate 41978 BLAKE2B 4e78cefb4e7d7f173f1826a5ab6c8ffde386fea67cf3227bd22e6a6e65d3348dc53c9438e6bde9af06fb5e04b0beac866209d2426e7f04cd10b2435db85df7e3 SHA512 4d8cffe699c6f15ee82ab5f5a73421a6bb8b1a476237aefefa6e932c45c30683a4fb015f138bce99d7cb27a27fb7972909c828e77daef091da84ec162315625a
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
-DIST uucore-0.0.25.crate 97954 BLAKE2B 868dfc7d309a4f77f999802709c21b2a868c5a13630b5b58cdc4ad650082c43ad7d3b185d76c72633a50b6e567f3009167639e1ee7905eaa1e81993c7ebab95f SHA512 f1c4b3972df0573134423c23886952ad4c9d277442a9cd6086e38f63fc41b1b2f0872d213679a1e5afe78b82bb601a52278f8efa471b86c12fe819241c02106b
 DIST uucore-0.0.27.crate 107517 BLAKE2B ef4e6c1377021507090df456a9c946b84f28afac4d209aaefae6a6e00281a3fe9115caa2ad335f490ebd99d78d4a6edf654579729ea5ef2c8da9f34a56f1e063 SHA512 2f4366b9f7be62e22872c81e56682c1fa420fbef7091c92acc70bf57d12d328345e0cc5a77c0e96a222f3cd2a357d427f41ba412ad7bca43f0f374a70abaeca4
 DIST uucore_procs-0.0.20.crate 3663 BLAKE2B 77beff8c1e854e8f2a7ef5fd8bb7d312c9407ec81e5c7718330108afd41f28288f5158a7dc962481ec9d5113bd37be7f60cc58143e64c0ae39fd8bc29f5ca7c2 SHA512 04d8fbdacd81d9ba348dc0a8e5a24de762e398f7b730eb101678d7828665573d752cb3e5772fd812e97cf26f883b479223fd2d06ae4d5180969366cf39929091
 DIST uuhelp_parser-0.0.20.crate 2155 BLAKE2B dd7acd2b49c344b72d50ec990937dacb497f7592a08f2cc4513db95b0dad13441da1e866db7c1360b7af4fb54a73ac418d9d24dfbef7989b0d17d91cae7a4c73 SHA512 69aa877af71984248ee44c4fe2c2046877c3f213797847d23ebf95371fcda5841e36f8b7bc9bba44a036c6dbf9cc9ef126b4f2fb63cc558010016b33993ddb33
-DIST uutils-findutils-0.5.0.tar.gz 83146 BLAKE2B ff83010efde356567efe36be22434f9f4c6daac08895313da4be138a4793ab8855cb8bb66ef12ca55a5c5c9323a5e4828265eb80b85f1044e2c53f098cd407de SHA512 9210c1352fef3244a6a5b66981e14cc808c0e7fdb55a37b6aa4274f61f6175de929070bd434b859e0b6c2ca0c63840baaee02dd03a6b73677aaaaa4431f27b18
 DIST uutils-findutils-0.7.0.tar.gz 100780 BLAKE2B a6d19244f6ef1d07de359bd46b39337b9fe411ca9b21617e21eb868b50441a1cad1d5bb1ac2ac39a142ac743e0cca845afe53d7f1297441c3c4ad2160815902e SHA512 c8c17285e7709c0278cc8bef88cb62bc436609a5991f8d4877e8f13b1fbff05728a73273e19f60af9da2229b807bad00c6d41a7f115696d23695d988d73caae7
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf3ab82536295019268b3125084da5dbcad818070bfdcb6a5de08da4eb483475bc225a829f58a1e3e040b5fba SHA512 da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad
@@ -125,39 +102,29 @@ DIST wasm-bindgen-backend-0.2.91.crate 28345 BLAKE2B 912a0471ac64d61f18d1c1749a3
 DIST wasm-bindgen-macro-0.2.91.crate 13898 BLAKE2B dda8dd5d77dc57324b633f056805bf7892c39c5e70257b6d048c2f8cf885f7306f91f3f17de1b63dc740db66d52fe2250ba981077e03dcc731dcf7c80c047c9d SHA512 6b05e0a2657e7e4f313089787b52cc7f59f5a94be6f716ba007fcbc3bf7c38561225ba3f39245d779e28dd30630b2d4c6be12baa6ea1e6cb47e562ccff48372f
 DIST wasm-bindgen-macro-support-0.2.91.crate 20091 BLAKE2B 337b1b2a9e9e9c1350267df0d9f041291a847cf4faa3bcd6fcc8a96e66fda54685da72f6e64e57cde0d4609409ebdc7851e96781f599470f8b0545018bdc2166 SHA512 1277682520d88cb9529adbc054590a732a8890debe33d1d64ebce332c66c02f84065c0f643fa45c01de8b80534b2daf8333979601323b3ed50dc49553233c39c
 DIST wasm-bindgen-shared-0.2.91.crate 7267 BLAKE2B a9dca2db84a33c650a7abbb6dc552bc4bab1446e66aace751d3709d2c63b878b127748a83cb174aae3ff8c5f5ec017b97623e5e9294e6ebf92d669efc618c357 SHA512 97072a8bdfadde104f6e9e760e1ac5ec665fdaff38a93a0bf601c95e652b35403e58a99fa8c0fefea6e47b38fb97f2e1ffcf52736f9ab890b0b9632efb26cb4b
-DIST wild-2.2.0.crate 8067 BLAKE2B 628902dd8c2d252397bb0677b59295f37ab088df79cbc92c32d3a17023535d9c192b49bffe23c74a49145e0e3c57cbb84c0db7d41923adc204b291d19d9f3272 SHA512 12a3484f372b5979715d56afdadc6d9b152ee75c1961fd0352f5cfb500691b526d4fc32bee32af7548cb7e6bb20288a5eae710a473bde9d2065fcbfc3f8de851
 DIST wild-2.2.1.crate 8080 BLAKE2B 489a2a625aa8091fdef9f4d49747db7816d82c01384672bd12ff9e4c906f3418fa5a5fa8951b625f6d22a9c1977c523f1b54d7c4252c241413ef6f63d327cb29 SHA512 8f92b83cb2568fed7841ad372111138d9ea5806c21a0affaecc639f0556ab879ca42fe205fe3c1e55a1b5c1c4fb0b705a5566b06bad5c119a1d41df9c01ed2c9
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9
 DIST winapi-util-0.1.8.crate 12416 BLAKE2B 5b48c27dfbb5db5c332f7e248138327b35ceec0909788b940168e7f6fe1402800da5e7690b2b1654da6c510b5c720330a92da16dff53ef15821f37fef6f335e3 SHA512 e186111398f9f0f0686e791ad0d72c39205e5f246b6e020df413e477ee07f32e91d09405c61dc92752f061f54fd7533435545c1a151477b40e2d68acc94a57fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed
 DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03
 DIST windows-sys-0.59.0.crate 2387323 BLAKE2B 3110c8cd2bc005f8c95cd038a8d574af648dc19788fe4485f977376f92e36b911b1a542d669a07ae9cd4ea72a884ab01ec78b8a2b5587456eb202452d1d8fa0d SHA512 d35e009e979633a1f3c8468cd038bd5c8c0381405165ce03497decd7d9edaaac485d704487e4a61d9aaf4e4d011b4248408912df6a0044d50e8457259867e061
 DIST windows-targets-0.48.0.crate 7466 BLAKE2B 4ef6d89ad5b1acf26a1a24348122b86d3943bd95935499bc9032fbc7aa01c04999c723df7fecb4989854cb6b7cceffe141537dfb05a9eaf3902c4cb490533116 SHA512 1d2a29602a1e0846c8577ec9167c5f9972091998a5df449d67b13ad918bf37680e7f97247baf5e3010c166d0b3182418c2925470998b92893ee9469939b91e22
-DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e
 DIST windows-targets-0.52.6.crate 6403 BLAKE2B eb98d0a8daeed5fe76e7fa8edb2743e2a3e77dfb9c4ea68605a6ab10532cb7cfc43bc1cea0180869445bd940be762a40136500e26b84ca88b5e0c502004c7a4c SHA512 d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f
 DIST windows_aarch64_gnullvm-0.48.0.crate 366543 BLAKE2B 9b10f65089fe6da3ff38a1061783f635644ae84f567f891eaced280af68f7ff3919b34289e8850aa34554bb0346903273ff0a7fa743ca8794c2d23a9f1b0185f SHA512 80c5aa74c5669f7acff3882a8e7575f15e8d7cc58c11a1cb731ff423eb9cc9ba43cc6b80e52803c0d44e6a9001655ba87de6f43a9fe858da6d6e3a5c983a2711
-DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f
 DIST windows_aarch64_gnullvm-0.52.6.crate 435718 BLAKE2B 8b12ae02892cb69401329034bbca671d13bd268a112120b56b90504707cef89decfbd2560492844a9f0588fab62dc1476ab7e931126b939015d25a8cc91ca334 SHA512 f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5
 DIST windows_aarch64_msvc-0.48.0.crate 671479 BLAKE2B 0c80f210437628e1d878d1d14e884fea532c7539b3030aa76d46f27d02372c715c6e33d7efdbbd770666472b44a66c30711a33d819ede9cdcd51c96355802d45 SHA512 617e47a7202f1db4dbd3ecea509682135ccd85e3a458c0331b9bc7aa1d84e5756b59c881cb098d5c6d4c951248d13c8253a8e8a50938e1997bd19ceba77262df
-DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1
 DIST windows_aarch64_msvc-0.52.6.crate 832615 BLAKE2B adc8ff61b6dc96d39c92c7d4221ae6aa0575edfc016cfcd046067ca5d8fcfd56d10e8e227be1c038ce34684be22c7ccaf5f18cd5a7638d28fbff4ba15b48b90b SHA512 a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b
 DIST windows_i686_gnu-0.48.0.crate 741490 BLAKE2B 5a4a584f8d8ee5bbd2d4c5b6749a66f2d43fc9e4ef90faab2227709b270f0d46fc26578c029edd96877c71309316ddb32d91c39f46d88f9a484c614f866e3dbe SHA512 15149fdd48b61b6d993acd392dbd353d0280d984ea88745217e4207937174bb90cdd9701f69ff0fe06a842f03607cbb57937d20d79ab577181e605a8a8fadc68
-DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e
 DIST windows_i686_gnu-0.52.6.crate 880402 BLAKE2B 5aab8ee07132eccb7695807eb44811beeb0657aadfb672c54e99b6ae39c067ba9b93e38fc69bb5b9b14a9759f263ccd5e301597d2727d83b31b49a409b6bd405 SHA512 a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822
 DIST windows_i686_gnullvm-0.52.6.crate 475940 BLAKE2B fec4fda8bb2bf319a501a22372fa642ae682e4dee3235b258a028190ee73220bfc55b3142f06249bb4579b17e5fde662bb2b121aefe18544653350d7d0fe7d8e SHA512 95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f
 DIST windows_i686_msvc-0.48.0.crate 730056 BLAKE2B 4e4ad6ed94948145199c2ed50fc65e4af08455a0fd058bb0f763d481f30b029f99a2b8dbac087b29e762500a19270f6683baf62ba99d141eb002a5b0b5c8ea05 SHA512 11a50800e709712dbea907275bc0faa46d2eb2969118445ed5b932d9c5957a09592a5b26a40e554c1f5fd56c6d074a07637e6f88eedd2224e1001e62df7b469b
-DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671
 DIST windows_i686_msvc-0.52.6.crate 901163 BLAKE2B 99ed34e052db5ba77bab240ed5d38ce450be347a794d63ec39b719304c32722c9999b540ab40abe0216318900b7412970df99dfb36d1516a9517cae0c77d1bdc SHA512 ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96
 DIST windows_x86_64_gnu-0.48.0.crate 703595 BLAKE2B b227efb78a99c43d0538cceadada3fa1840df29adc665787fdcf845b73e77d782da8a9f9aa602e1da61401b550d0107176feb6c397c922a6240b38cc8f04a180 SHA512 38eff1164fb37dbd2bbe53404b20cba92de84cbbd5e4eb9ad60d51fb43d6fdb8b87a1488e2c88ebd4b3ff3b708f93fdc05df4b14a285d3ff11c33ff0d9828602
-DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7
 DIST windows_x86_64_gnu-0.52.6.crate 836363 BLAKE2B e2335829155cdbd4a55cc9f9babc237e14e32aab97f6f91afabcdf80d2aee37d6fb4b8669aaf433ff532c85dba59b3d366c7d41b61a2f29b96f960169c900687 SHA512 c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb
 DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d1579978045f4058b1a315083a8ab842bddf5800ec3460b1530ad88c3464acab712a229290aca235810de8a3b6a253859a354d9fa97277e58 SHA512 8d82fad4c8445030844708aa026a62f1ca43362b8e15f14b0d226c7e9cda04ffa0715087b6a025dbb738e8891de24fcc4a2df071a532917cf03c4a46f934f396
-DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0
 DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd
 DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
-DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7
 DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
diff --git a/sys-apps/uutils-findutils/uutils-findutils-0.5.0-r1.ebuild b/sys-apps/uutils-findutils/uutils-findutils-0.5.0-r1.ebuild
deleted file mode 100644
index ad4207ec668c..000000000000
--- a/sys-apps/uutils-findutils/uutils-findutils-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.6.2
-
-EAPI=8
-
-CRATES="
-	aho-corasick@0.7.18
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	anstream@0.6.12
-	anstyle-parse@0.2.1
-	anstyle-query@1.0.0
-	anstyle-wincon@3.0.1
-	anstyle@1.0.0
-	assert_cmd@2.0.14
-	autocfg@1.1.0
-	bitflags@1.3.2
-	bitflags@2.4.1
-	bstr@1.0.1
-	bumpalo@3.12.0
-	byteorder@1.4.2
-	cc@1.0.72
-	cfg-if@1.0.0
-	cfg_aliases@0.1.1
-	chrono@0.4.37
-	clap@4.5.4
-	clap_builder@4.5.2
-	clap_lex@0.7.0
-	colorchoice@1.0.0
-	core-foundation-sys@0.8.3
-	dashmap@5.3.4
-	diff@0.1.13
-	difflib@0.4.0
-	doc-comment@0.3.3
-	dunce@1.0.4
-	errno@0.3.8
-	faccess@0.2.4
-	fastrand@2.0.1
-	filetime@0.2.23
-	float-cmp@0.9.0
-	futures-channel@0.3.21
-	futures-core@0.3.21
-	futures-executor@0.3.21
-	futures-io@0.3.21
-	futures-sink@0.3.21
-	futures-task@0.3.21
-	futures-util@0.3.21
-	futures@0.3.21
-	glob@0.3.1
-	hashbrown@0.12.3
-	iana-time-zone@0.1.47
-	js-sys@0.3.59
-	lazy_static@1.4.0
-	libc@0.2.153
-	linux-raw-sys@0.4.12
-	lock_api@0.4.7
-	log@0.4.14
-	memchr@2.4.0
-	nix@0.28.0
-	normalize-line-endings@0.3.0
-	num-traits@0.2.14
-	once_cell@1.19.0
-	onig@6.4.0
-	onig_sys@69.8.1
-	os_display@0.1.3
-	parking_lot@0.12.1
-	parking_lot_core@0.9.9
-	pin-project-lite@0.2.9
-	pin-utils@0.1.0
-	pkg-config@0.3.24
-	predicates-core@1.0.6
-	predicates-tree@1.0.1
-	predicates@3.1.0
-	pretty_assertions@1.4.0
-	proc-macro2@1.0.60
-	quote@1.0.28
-	redox_syscall@0.4.1
-	regex-automata@0.1.9
-	regex-syntax@0.6.29
-	regex@1.7.3
-	rustix@0.38.31
-	same-file@1.0.4
-	scopeguard@1.1.0
-	serde@1.0.147
-	serial_test@3.0.0
-	serial_test_derive@3.0.0
-	slab@0.4.6
-	smallvec@1.8.0
-	strsim@0.11.0
-	syn@2.0.18
-	tempfile@3.10.1
-	terminal_size@0.3.0
-	treeline@0.1.0
-	unicode-ident@1.0.9
-	unicode-width@0.1.9
-	utf8parse@0.2.1
-	uucore@0.0.25
-	uucore_procs@0.0.20
-	uuhelp_parser@0.0.20
-	wait-timeout@0.2.0
-	walkdir@2.5.0
-	wasm-bindgen-backend@0.2.91
-	wasm-bindgen-macro-support@0.2.91
-	wasm-bindgen-macro@0.2.91
-	wasm-bindgen-shared@0.2.91
-	wasm-bindgen@0.2.91
-	wild@2.2.0
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.6
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-targets@0.48.0
-	windows-targets@0.52.0
-	windows_aarch64_gnullvm@0.48.0
-	windows_aarch64_gnullvm@0.52.0
-	windows_aarch64_msvc@0.48.0
-	windows_aarch64_msvc@0.52.0
-	windows_i686_gnu@0.48.0
-	windows_i686_gnu@0.52.0
-	windows_i686_msvc@0.48.0
-	windows_i686_msvc@0.52.0
-	windows_x86_64_gnu@0.48.0
-	windows_x86_64_gnu@0.52.0
-	windows_x86_64_gnullvm@0.48.0
-	windows_x86_64_gnullvm@0.52.0
-	windows_x86_64_msvc@0.48.0
-	windows_x86_64_msvc@0.52.0
-	yansi@0.5.1
-"
-
-LLVM_COMPAT=( {17..18} )
-inherit cargo llvm-r1
-
-DESCRIPTION="GNU findutils rewritten in Rust"
-HOMEPAGE="https://uutils.github.io/findutils/ https://github.com/uutils/findutils"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/uutils/findutils"
-	inherit git-r3
-elif [[ ${PV} == *_p* ]] ; then
-	FINDUTILS_COMMIT="59301c788aa610bd9b35d8715af72d87528d07dc"
-	SRC_URI="https://github.com/uutils/findutils/archive/${FINDUTILS_COMMIT}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" ${CARGO_CRATE_URIS}"
-	S="${WORKDIR}"/findutils-${FINDUTILS_COMMIT}
-else
-	SRC_URI="https://github.com/uutils/findutils/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" ${CARGO_CRATE_URIS}"
-	S="${WORKDIR}"/findutils-${PV}
-fi
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0 MIT Unicode-DFS-2016"
-SLOT="0"
-if [[ ${PV} != 9999 ]] ; then
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-RDEPEND=">=dev-libs/oniguruma-6.9.9:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-	')
-"
-
-QA_FLAGS_IGNORED=".*"
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	rust_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_configure() {
-	export RUSTONIG_SYSTEM_LIBONIG=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-
-	cargo_src_configure
-}
-
-src_install() {
-	cargo_src_install
-
-	rm "${ED}"/usr/bin/testing-commandline || die
-
-	local binary
-	for binary in find xargs ; do
-		mv "${ED}"/usr/bin/${binary} "${ED}"/usr/bin/uutils-${binary} || die
-	done
-}
diff --git a/sys-apps/xdg-desktop-portal-gnome/Manifest b/sys-apps/xdg-desktop-portal-gnome/Manifest
index 3caa10356fb1..ce9a497b0e56 100644
--- a/sys-apps/xdg-desktop-portal-gnome/Manifest
+++ b/sys-apps/xdg-desktop-portal-gnome/Manifest
@@ -1,2 +1,2 @@
-DIST xdg-desktop-portal-gnome-45.1.tar.xz 140996 BLAKE2B c77fb2a0f52e27eec73b43a08e6034cbe08afb622ae0863f2ac3402246bc19dec4d058cae2117ddcf80064f3965454f5813f066788c6de1dffb4be80490cb217 SHA512 576139ef4d763e47435a33ecd94ae8d1631c2a515c11ca18e1f1f7618421925a41f0f8a295cfe6d1be377fd162a9e4d239f3a94a73a4aae49e583a0360f8cc36
 DIST xdg-desktop-portal-gnome-46.2.tar.xz 161088 BLAKE2B 586729957351a41cc483e68fc3f8774f662542f8f8e7bb18228ba8adbe852a030bea18ba71192ce9d2219e10199d3b0b4d699d864dbf202a43dbd860f73b7916 SHA512 8257a30fd2303e32c6eebd2fd97e876f2776aeb7442de96040d7fdb5961b674272d03c24ebd89bfb55a88bd668ae75bde3f3405a26cda48b93c23033d0d7bde5
+DIST xdg-desktop-portal-gnome-47.1.tar.xz 163448 BLAKE2B dfaa078689f5f897c8deb289ff21339cab13b01a7ec5e1367da0e0488a4b95c08d6f7778f53fbb4dcffe766093117c41b175bfbce840587168f146245fcceea9 SHA512 bc4118b56baed90c42ae75c99c911d11d1541c8e2d4629672621d29217bc49bfa37218a9b27bd4b2712d95d2b6dbab36212687a6d15bca33467bb8dbde047ef3
diff --git a/sys-apps/xdg-desktop-portal-gnome/files/45.1-c99.patch b/sys-apps/xdg-desktop-portal-gnome/files/45.1-c99.patch
deleted file mode 100644
index 884b0d9c15a6..000000000000
--- a/sys-apps/xdg-desktop-portal-gnome/files/45.1-c99.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/issues/112
-https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/merge_requests/134
-
-From 5fb3c0c23ccd76c6f8239bbb66c3fb1230208d5e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tyrychtr?= <ltyrycht@redhat.com>
-Date: Mon, 11 Dec 2023 11:36:13 +0100
-Subject: [PATCH] input-capture: Pass correct pointer type to
- gtk_window_add_group
-
-It produced only a warning, but will be an error in the future.
-
-Fixes #112
---- a/src/inputcapture.c
-+++ b/src/inputcapture.c
-@@ -409,7 +409,7 @@ create_input_capture_dialog (GDBusMethodInvocation *invocation,
-   gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
- 
-   window_group = gtk_window_group_new ();
--  gtk_window_group_add_window (window_group, dialog);
-+  gtk_window_group_add_window (window_group, GTK_WINDOW (dialog));
- 
-   dialog_handle = g_new0 (InputCaptureDialogHandle, 1);
-   dialog_handle->request = g_object_ref (request);
--- 
-GitLab
diff --git a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-45.1-r1.ebuild b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-45.1-r1.ebuild
deleted file mode 100644
index f263b44b8b24..000000000000
--- a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-45.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic gnome.org meson systemd xdg
-
-DESCRIPTION="Backend implementation for xdg-desktop-portal using GNOME"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-IUSE="wayland X"
-
-# Newer-than-strictly-required xdg-desktop-portal dep for hang/slowness fixes
-# https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/issues/74
-DEPEND="
-	dev-libs/glib:2
-	gnome-base/gnome-desktop:4=
-	>=gui-libs/libadwaita-1.2.0:1
-	media-libs/fontconfig
-	sys-apps/dbus
-	>=sys-apps/xdg-desktop-portal-1.17.0
-	>=sys-apps/xdg-desktop-portal-gtk-1.14.0
-	gui-libs/gtk:4[wayland?,X?]
-	X? ( x11-libs/libX11 )
-	wayland? ( dev-libs/wayland )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	wayland? ( dev-util/wayland-scanner )
-"
-
-PATCHES=(
-	"${FILESDIR}"/45.1-c99.patch
-)
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/919852
-	# https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/issues/113
-	# https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/merge_requests/138
-	#
-	# Recheck this after next version bump!
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	local emesonargs=(
-		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-	)
-
-	meson_src_configure
-}
diff --git a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-47.1.ebuild b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-47.1.ebuild
new file mode 100644
index 000000000000..56557e036313
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-47.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Backend implementation for xdg-desktop-portal using GNOME"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="wayland X"
+
+# Newer-than-strictly-required xdg-desktop-portal dep for hang/slowness fixes
+# https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/issues/74
+DEPEND="
+	dev-libs/glib:2
+	>=gnome-base/gsettings-desktop-schemas-47_alpha
+	gnome-base/gnome-desktop:4=
+	>=gui-libs/libadwaita-1.6_beta:1
+	media-libs/fontconfig
+	sys-apps/dbus
+	>=sys-apps/xdg-desktop-portal-1.18.2
+	>=sys-apps/xdg-desktop-portal-gtk-1.14.0
+	gui-libs/gtk:4[wayland?,X?]
+	X? ( x11-libs/libX11 )
+	wayland? ( dev-libs/wayland )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	wayland? ( dev-util/wayland-scanner )
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-auth/microsoft-identity-broker/microsoft-identity-broker-2.0.1_p2-r1.ebuild b/sys-auth/microsoft-identity-broker/microsoft-identity-broker-2.0.1_p2-r1.ebuild
new file mode 100644
index 000000000000..0e1d9b374b1a
--- /dev/null
+++ b/sys-auth/microsoft-identity-broker/microsoft-identity-broker-2.0.1_p2-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 prefix systemd unpacker
+
+FAKE_OS="ubuntu-22.04"
+DESCRIPTION="Microsoft Authentication Broker to access a corporate environment"
+HOMEPAGE="https://learn.microsoft.com/mem/intune/"
+SRC_URI="https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/${PN:0:1}/${PN}/${PN}_${PV%_p*}_amd64.deb"
+S="${WORKDIR}"
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	acct-user/microsoft-identity-broker
+	acct-group/microsoft-identity-broker
+	sys-apps/bubblewrap
+	sys-apps/dbus
+	virtual/jre:11
+"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_configure() {
+	sed -i -r "s:^Exec(Start)?=.*/([^/]+):Exec\1=${EPREFIX}/usr/bin/\2:" \
+		usr/lib/systemd/*/*.service usr/share/dbus-1/*/*.service || die
+}
+
+src_install() {
+	newbin $(prefixify_ro "${FILESDIR}"/wrapper) microsoft-identity-broker
+	dosym microsoft-identity-broker /usr/bin/microsoft-identity-device-broker
+
+	java-pkg_dojar opt/microsoft/identity-broker/lib/*.jar
+
+	java-pkg_dolauncher microsoft-identity-broker \
+		--main com.microsoft.identity.broker.service.IdentityBrokerService \
+		--java_args '-Xmx256m ${MICROSOFT_IDENTITY_BROKER_OPTS}' \
+		-into /usr/share/${PN}
+
+	java-pkg_dolauncher microsoft-identity-device-broker \
+		--main com.microsoft.identity.broker.service.DeviceBrokerService \
+		--java_args '-Xmx256m ${MICROSOFT_IDENTITY_DEVICE_BROKER_OPTS}' \
+		-into /usr/share/${PN}
+
+	insinto /etc/microsoft-identity-broker
+	newins "${FILESDIR}/lsb-release-${FAKE_OS}" lsb-release
+	newins "${FILESDIR}/os-release-${FAKE_OS}" os-release
+
+	insinto /usr/share
+	doins -r usr/share/dbus-1
+
+	systemd_dounit usr/lib/systemd/system/*
+	systemd_douserunit usr/lib/systemd/user/*
+}
diff --git a/sys-auth/microsoft-identity-broker/microsoft-identity-broker-2.0.1_p2.ebuild b/sys-auth/microsoft-identity-broker/microsoft-identity-broker-2.0.1_p2.ebuild
deleted file mode 100644
index b0fdb17a9c67..000000000000
--- a/sys-auth/microsoft-identity-broker/microsoft-identity-broker-2.0.1_p2.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
-
-inherit java-pkg-2 prefix systemd unpacker
-
-FAKE_OS="ubuntu-22.04"
-DESCRIPTION="Microsoft Authentication Broker to access a corporate environment"
-HOMEPAGE="https://learn.microsoft.com/mem/intune/"
-SRC_URI="https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/${PN:0:1}/${PN}/${PN}_${PV%_p*}_amd64.deb"
-S="${WORKDIR}"
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-user/microsoft-identity-broker
-	acct-group/microsoft-identity-broker
-	sys-apps/bubblewrap
-	sys-apps/dbus
-	virtual/jre:11
-"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_configure() {
-	sed -i -r "s:^Exec(Start)?=.*/([^/]+):Exec\1=${EPREFIX}/usr/bin/\2:" \
-		usr/lib/systemd/*/*.service usr/share/dbus-1/*/*.service || die
-}
-
-src_install() {
-	newbin $(prefixify_ro "${FILESDIR}"/wrapper) microsoft-identity-broker
-	dosym microsoft-identity-broker /usr/bin/microsoft-identity-device-broker
-
-	java-pkg_dojar opt/microsoft/identity-broker/lib/*.jar
-
-	java-pkg_dolauncher microsoft-identity-broker \
-		--main com.microsoft.identity.broker.service.IdentityBrokerService \
-		--java_args '${MICROSOFT_IDENTITY_BROKER_OPTS}' \
-		-into /usr/share/${PN}
-
-	java-pkg_dolauncher microsoft-identity-device-broker \
-		--main com.microsoft.identity.broker.service.DeviceBrokerService \
-		--java_args '${MICROSOFT_IDENTITY_DEVICE_BROKER_OPTS}' \
-		-into /usr/share/${PN}
-
-	insinto /etc/microsoft-identity-broker
-	newins "${FILESDIR}/lsb-release-${FAKE_OS}" lsb-release
-	newins "${FILESDIR}/os-release-${FAKE_OS}" os-release
-
-	insinto /usr/share
-	doins -r usr/share/dbus-1
-
-	systemd_dounit usr/lib/systemd/system/*
-	systemd_douserunit usr/lib/systemd/user/*
-}
diff --git a/sys-auth/nss-docker-ng/Manifest b/sys-auth/nss-docker-ng/Manifest
new file mode 100644
index 000000000000..f7e7001c6d1a
--- /dev/null
+++ b/sys-auth/nss-docker-ng/Manifest
@@ -0,0 +1,2 @@
+DIST nss-docker-ng-1.0.7-crates.tar.xz 12977172 BLAKE2B 972681146d84873ca03b29aaac8a183d74c158735a54b248de62a26446e11df1d7fa5a008d256562c52e261b50913c03701787f482fe9150603710e6945cb1e9 SHA512 d689983ee307ee224b00ac654da794ee64b4e7206c7e4858adefd856f91a4bd3a120f9fe86d4eae820de8b2763bf4bb3c70a947134910fc345b8b79f6b8b2a77
+DIST nss-docker-ng-1.0.7.tar.gz 15285 BLAKE2B 7fa82aab354d928842bea0ed7362842009ce4aedc20eaf5de5ba0a27ce1dca8ae2659e3ac67f9a271c1f48d93ae157089f5285a4ba4cf09e942beef6b43e28c1 SHA512 928604ac2d318cbee78ed6133f68bb641c0b44aefeeb4f5e0ebfeb584ba3eff5fccdd7a8827f37149a64848acaa18387b09d65af30bf114981775c8011b2a588
diff --git a/sys-auth/nss-docker-ng/metadata.xml b/sys-auth/nss-docker-ng/metadata.xml
new file mode 100644
index 000000000000..dc105c2f2d94
--- /dev/null
+++ b/sys-auth/nss-docker-ng/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">petski/nss-docker-ng</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-auth/nss-docker-ng/nss-docker-ng-1.0.7.ebuild b/sys-auth/nss-docker-ng/nss-docker-ng-1.0.7.ebuild
new file mode 100644
index 000000000000..fe350997548b
--- /dev/null
+++ b/sys-auth/nss-docker-ng/nss-docker-ng-1.0.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.3
+
+EAPI=8
+
+CRATES=""
+
+inherit cargo readme.gentoo-r1
+
+DESCRIPTION="NSS plugin for finding Docker containers by their ID or name"
+HOMEPAGE="https://github.com/petski/nss-docker-ng"
+SRC_URI="https://github.com/petski/nss-docker-ng/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/sys-auth/${PN}/${P}-crates.tar.xz"
+fi
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 LGPL-3 MIT MPL-2.0 Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-util/patchelf"
+
+QA_FLAGS_IGNORED="usr/lib.*/libnss_docker_ng.so.*"
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS='
+You must modify your name service switch lookup file to enable nss-docker-ng.
+To do so, add 'docker_ng' to the hosts line in /etc/nsswitch.conf
+
+An example hosts line looks like this:
+	hosts:      docker_ng resolve [!UNAVAIL=return] files myhostname dns
+'
+
+pkg_setup() {
+	rust_pkg_setup
+	# Requires nightly feature proc-macro2, bug #947565
+	export RUSTC_BOOTSTRAP=1
+}
+
+src_install() {
+	cd "$(cargo_target_dir)" || die
+	patchelf --set-soname libnss_docker_ng.so.2 libnss_docker_ng.so || die
+	mv libnss_docker_ng.so libnss_docker_ng.so.2 || die
+	ln -s libnss_docker_ng.so.2 libnss_docker_ng.so || die
+	dolib.so libnss_docker_ng.so*
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.10.4-0003-Fix-incompatible-pointer.patch b/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.10.4-0003-Fix-incompatible-pointer.patch
new file mode 100644
index 000000000000..580e903c0c18
--- /dev/null
+++ b/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.10.4-0003-Fix-incompatible-pointer.patch
@@ -0,0 +1,46 @@
+Description: Avoided incompatible pointer passing to fix GCC 14 build errors.
+ Add missing 'const', cast to expected pointer type (DSA_SIG) and avoid
+ pointer to pointer when pointer is required.
+ Updated for Gentoo.
+Author: Petter Reinholdtsen <pere@debian.org>
+Bug-Debian: https://bugs.debian.org/1075358
+Forwarded: no
+Last-Update: 2024-11-05
+---
+--- a/ssh-ecdsa.c
++++ b/ssh-ecdsa.c
+@@ -73,7 +73,7 @@ ssh_ecdsa_sign(const Key *key, u_char **
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
+ #else
+-    DSA_SIG_get0(sig, &r, &s);
++    DSA_SIG_get0((const DSA_SIG*)sig, (const BIGNUM **)&r, (const BIGNUM **)&s);
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
+ #endif
+--- a/ssh-rsa.c
++++ b/ssh-rsa.c
+@@ -56,9 +56,9 @@ ssh_rsa_sign(const Key *key, u_char **si
+ 		return -1;
+ 	}
+ 	md = EVP_MD_CTX_create();
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	slen = RSA_size(key->rsa);
+ 	sig = pamsshagentauth_xmalloc(slen);
+--- a/ssh-ecdsa.c
++++ b/ssh-ecdsa.c
+@@ -145,7 +145,7 @@
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
+ #else
+-    DSA_SIG_get0(sig, &r, &s);
++    DSA_SIG_get0((const DSA_SIG*)sig, (const BIGNUM **)&r, (const BIGNUM **)&s);
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
+ #endif
diff --git a/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.10.4-0004-Always-call-linker.patch b/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.10.4-0004-Always-call-linker.patch
new file mode 100644
index 000000000000..81d857f4182d
--- /dev/null
+++ b/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.10.4-0004-Always-call-linker.patch
@@ -0,0 +1,44 @@
+From 465a30ec74c5053ac93ecd58d71427a3e2b4f393 Mon Sep 17 00:00:00 2001
+From: Peter Levine <plevine457@gmail.com>
+Date: Sun, 18 Dec 2022 21:19:39 -0500
+Subject: [PATCH] Always use the compiler to call the linker
+
+Let the compiler call the linker to handle LDFLAGS correctly.
+---
+ configure    | 5 +----
+ configure.ac | 6 +-----
+ 2 files changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/configure b/configure
+index 0090b34..ca8cd7f 100755
+--- a/configure
++++ b/configure
+@@ -7577,10 +7577,7 @@ _ACEOF
+ 
+ fi
+ 
+-if test -z "$LD" ; then
+-	LD=$CC
+-fi
+-
++LD=$CC
+ 
+ 
+ ac_fn_c_check_decl "$LINENO" "LLONG_MAX" "ac_cv_have_decl_LLONG_MAX" "#include <limits.h>
+diff --git a/configure.ac b/configure.ac
+index 6496679..7cfd8fc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -116,11 +116,7 @@ if test ! -z "$PATH_PASSWD_PROG" ; then
+ 		[Full path of your "passwd" program])
+ fi
+ 
+-if test -z "$LD" ; then
+-	LD=$CC
+-fi
+-AC_SUBST(LD)
+-
++AC_SUBST(LD, $CC)
+ 
+ AC_CHECK_DECL(LLONG_MAX, have_llong_max=1, , [#include <limits.h>])
+ 
diff --git a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.4-r1.ebuild b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.4-r1.ebuild
index d09b0fea56c1..aa7b2e61f595 100644
--- a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.4-r1.ebuild
+++ b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,6 +36,8 @@ BDEPEND="dev-lang/perl"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.10.4-0001-Fix-function-prototypes-in-configure.patch
 	"${FILESDIR}"/${PN}-0.10.4-0002-Add-missing-includes-implicit-function-declarations.patch
+	"${FILESDIR}"/${PN}-0.10.4-0003-Fix-incompatible-pointer.patch
+	"${FILESDIR}"/${PN}-0.10.4-0004-Always-call-linker.patch
 )
 
 src_prepare() {
diff --git a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-9999.ebuild b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-9999.ebuild
index d633a44c02ec..501e1ff7f51a 100644
--- a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-9999.ebuild
+++ b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,6 +36,8 @@ BDEPEND="dev-lang/perl"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.10.4-0001-Fix-function-prototypes-in-configure.patch
 	"${FILESDIR}"/${PN}-0.10.4-0002-Add-missing-includes-implicit-function-declarations.patch
+	"${FILESDIR}"/${PN}-0.10.4-0003-Fix-incompatible-pointer.patch
+	"${FILESDIR}"/${PN}-0.10.4-0004-Always-call-linker.patch
 )
 
 src_prepare() {
diff --git a/sys-auth/pam_u2f/Manifest b/sys-auth/pam_u2f/Manifest
index b2eb93b2a24d..7fe7791f7ff5 100644
--- a/sys-auth/pam_u2f/Manifest
+++ b/sys-auth/pam_u2f/Manifest
@@ -1,2 +1,3 @@
 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
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-auth/seatd/Manifest b/sys-auth/seatd/Manifest
index 5d4f96af4f6d..b90d6c8b8942 100644
--- a/sys-auth/seatd/Manifest
+++ b/sys-auth/seatd/Manifest
@@ -1,3 +1 @@
-DIST seatd-0.8.0.tar.gz 39349 BLAKE2B 920270808f28c85badb173af22edb03960f2b9cdce5af3124c64fe68c52a77f002272d2f19e97d107303c55ad6de498d279f6b05311793270c6ee84565fc435e SHA512 93b1e5c170564ce9654e4df9985af95cb505274b36e950998bb1f16803d2d46712140eded2bdd8d5e85aec62070afd9c224184276d79a0ff0813408dfc472db7
-DIST seatd-0.9.0.tar.gz 41606 BLAKE2B 17d366fd44541404cd675561d3d22b3f2a45dcb29fc2636f4019df7b2d58f4d90745645ec906d4e2a7325c02ca78029b017106671520b653fb3f96e73e1fb9bc SHA512 531ae25f67ae2c11fc45700391dd6bc38c1213379da6a0867735315595dc760ea89d94eb37d9efce8049bd427c898d33aa54f1c36ccb5286c840e011fc78d264
 DIST seatd-0.9.1.tar.gz 41968 BLAKE2B f935165c00bf0e35d73809d408ae1e0500a8d5be286fba2d14ee30704d0e8555f67f964bf06fb71245eed090b1d1a00abdb26406e0a617e9a592546401f653d2 SHA512 15d24a6646fa82a2bcc21d2a99693e1c54e71b9da24a0ba5c847a72c53d803410cbcee31fc847fef468b18d941d9685391bebf745819d4b24d056cd67e08c3fb
diff --git a/sys-auth/seatd/files/seatd.initd b/sys-auth/seatd/files/seatd.initd
deleted file mode 100644
index f95a52f15632..000000000000
--- a/sys-auth/seatd/files/seatd.initd
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/sbin/openrc-run
-supervisor=supervise-daemon
-command="seatd"
-command_args="-g video"
diff --git a/sys-auth/seatd/seatd-0.8.0.ebuild b/sys-auth/seatd/seatd-0.8.0.ebuild
deleted file mode 100644
index fb8d030f88ca..000000000000
--- a/sys-auth/seatd/seatd-0.8.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson systemd
-
-DESCRIPTION="Minimal seat management daemon and universal library"
-HOMEPAGE="https://sr.ht/~kennylevinsen/seatd"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/seatd"
-else
-	KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
-	SRC_URI="https://git.sr.ht/~kennylevinsen/seatd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-LICENSE="MIT"
-SLOT="0/1"
-IUSE="builtin elogind server systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	server? ( acct-group/seat )
-"
-BDEPEND=">=app-text/scdoc-1.9.7"
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=enabled
-		$(meson_feature builtin libseat-builtin)
-		$(meson_feature server)
-	)
-
-	if use elogind ; then
-		emesonargs+=( -Dlibseat-logind=elogind )
-	elif use systemd; then
-		emesonargs+=( -Dlibseat-logind=systemd )
-	else
-		emesonargs+=( -Dlibseat-logind=disabled )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use server; then
-		newinitd "${FILESDIR}/seatd.initd-r1" seatd
-		systemd_dounit contrib/systemd/seatd.service
-
-		if has_version '<sys-auth/seatd-0.7.0-r2'; then
-			elog "For OpenRC users: seatd is now using the 'seat' group instead of the 'video' group"
-			elog "Make sure your user(s) are in the 'seat' group."
-			elog "Note: 'video' is still needed for GPU access like OpenGL"
-		fi
-	fi
-}
diff --git a/sys-auth/seatd/seatd-0.9.0.ebuild b/sys-auth/seatd/seatd-0.9.0.ebuild
deleted file mode 100644
index 1d71f62aae4a..000000000000
--- a/sys-auth/seatd/seatd-0.9.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson systemd
-
-DESCRIPTION="Minimal seat management daemon and universal library"
-HOMEPAGE="https://sr.ht/~kennylevinsen/seatd"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/seatd"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	SRC_URI="https://git.sr.ht/~kennylevinsen/seatd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-LICENSE="MIT"
-SLOT="0/1"
-IUSE="builtin elogind server systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	server? ( acct-group/seat )
-"
-BDEPEND=">=app-text/scdoc-1.9.7"
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=enabled
-		$(meson_feature builtin libseat-builtin)
-		$(meson_feature server)
-	)
-
-	if use elogind ; then
-		emesonargs+=( -Dlibseat-logind=elogind )
-	elif use systemd; then
-		emesonargs+=( -Dlibseat-logind=systemd )
-	else
-		emesonargs+=( -Dlibseat-logind=disabled )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use server; then
-		newinitd "${FILESDIR}/seatd.initd-r1" seatd
-		systemd_dounit contrib/systemd/seatd.service
-
-		if has_version '<sys-auth/seatd-0.7.0-r2'; then
-			elog "For OpenRC users: seatd is now using the 'seat' group instead of the 'video' group"
-			elog "Make sure your user(s) are in the 'seat' group."
-			elog "Note: 'video' is still needed for GPU access like OpenGL"
-		fi
-	fi
-}
diff --git a/sys-auth/seatd/seatd-0.9.1.ebuild b/sys-auth/seatd/seatd-0.9.1.ebuild
index 1d71f62aae4a..06d9019f8e56 100644
--- a/sys-auth/seatd/seatd-0.9.1.ebuild
+++ b/sys-auth/seatd/seatd-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/seatd"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 	SRC_URI="https://git.sr.ht/~kennylevinsen/seatd/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 LICENSE="MIT"
diff --git a/sys-auth/sssd/files/sssd-2.9.6-conditional-python-install.patch b/sys-auth/sssd/files/sssd-2.9.6-conditional-python-install.patch
new file mode 100644
index 000000000000..ff479dee7f5b
--- /dev/null
+++ b/sys-auth/sssd/files/sssd-2.9.6-conditional-python-install.patch
@@ -0,0 +1,16 @@
+diff '--color=auto' -Naur a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2024-12-05 12:16:16.000000000 +0000
++++ b/Makefile.am	2025-01-14 12:31:45.831435116 +0000
+@@ -21,7 +21,11 @@
+ endif
+ 
+ SUBDIRS += . src/tests/cwrap src/tests/intg src/tests/test_CA \
+-             src/tests/test_ECC_CA src/tools/analyzer
++             src/tests/test_ECC_CA
++
++if BUILD_PYTHON_BINDINGS
++SUBDIRS += src/tools/analyzer
++endif
+ 
+ # Some old versions of automake don't define builddir
+ builddir ?= .
diff --git a/sys-auth/sssd/sssd-2.10.1.ebuild b/sys-auth/sssd/sssd-2.10.1.ebuild
index 471fd5425c7f..3f04d442515f 100644
--- a/sys-auth/sssd/sssd-2.10.1.ebuild
+++ b/sys-auth/sssd/sssd-2.10.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
@@ -23,8 +23,8 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="doc +netlink nfsv4 nls passkey samba selinux systemd systemtap test"
-REQUIRED_USE=" ( ${PYTHON_REQUIRED_USE} ) "
+IUSE="doc +netlink nfsv4 nls passkey python samba selinux systemd systemtap test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -54,11 +54,13 @@ DEPEND="
 	nfsv4? ( >=net-fs/nfs-utils-2.3.1-r2 )
 	nls? ( >=sys-devel/gettext-0.18 )
 	passkey? ( dev-libs/libfido2:= )
-	${PYTHON_DEPS}
-	systemd? (
-		$(python_gen_cond_dep '
-			dev-python/python-systemd[${PYTHON_USEDEP}]
-		')
+	python? (
+		${PYTHON_DEPS}
+		systemd? (
+			$(python_gen_cond_dep '
+				dev-python/python-systemd[${PYTHON_USEDEP}]
+			')
+		)
 	)
 	samba? ( >=net-fs/samba-4.10.2[winbind] )
 	selinux? (
@@ -75,6 +77,8 @@ RDEPEND="${DEPEND}
 	acct-group/sssd
 	passkey? ( sys-apps/pcsc-lite[policykit] )
 	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )"
+DEPEND+="
+	sys-apps/shadow"
 BDEPEND="
 	acct-user/sssd
 	acct-group/sssd
@@ -102,6 +106,7 @@ CONFIG_CHECK="~KEYS"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.8.2-krb5_pw_locked.patch"
+	"${FILESDIR}/${PN}-2.9.6-conditional-python-install.patch"
 	"${FILESDIR}/${PN}-2.10.0_beta2-fix-systemd-systemconfdir.patch"
 )
 
@@ -250,11 +255,12 @@ multilib_src_configure() {
 		--with-subid
 		$(use_enable systemtap)
 		--without-python2-bindings
-		$(multilib_native_with python3-bindings)
+		$(multilib_native_use_with python python3-bindings)
 		# Annoyingly configure requires that you pick systemd XOR sysv
 		--with-initscript=$(usex systemd systemd sysv)
 		--with-sssd-user=sssd
-		 CPPFLAGS="${CPPFLAGS} -I/usr/include/samba-4.0"
+		KRB5_CONFIG="${ESYSROOT}"/usr/bin/krb5-config
+		CPPFLAGS="${CPPFLAGS} -I${ESYSROOT}/usr/include/samba-4.0"
 	)
 
 	use systemd && myconf+=(
@@ -305,8 +311,10 @@ multilib_src_test() {
 multilib_src_install() {
 	if multilib_is_native_abi; then
 		emake -j1 DESTDIR="${D}" install
-		python_fix_shebang "${ED}"
-		python_optimize
+		if use python; then
+			python_fix_shebang "${ED}"
+			python_optimize
+		fi
 	else
 		# easier than playing with automake...
 		dopammod .libs/pam_sss.so
@@ -362,8 +370,15 @@ multilib_src_install_all() {
 
 pkg_postinst() {
 	tmpfiles_process sssd-tmpfiles.conf
+	echo
 	elog "You must set up sssd.conf (default installed into /etc/sssd)"
 	elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
 	elog "features."
+	echo
 	optfeature "Kerberos keytab renew (see krb5_renew_interval)" app-crypt/adcli
+
+	if ! use python; then
+		echo
+		ewarn "sssctl analyze will not work because the python USE flag is disabled."
+	fi
 }
diff --git a/sys-auth/sssd/sssd-2.9.6-r1.ebuild b/sys-auth/sssd/sssd-2.9.6-r1.ebuild
new file mode 100644
index 000000000000..faf744ba4edc
--- /dev/null
+++ b/sys-auth/sssd/sssd-2.9.6-r1.ebuild
@@ -0,0 +1,340 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="ca de es fr ja ko pt_BR ru sv tr uk"
+PLOCALES_BIN="${PLOCALES} bg cs eu fi hu id it ka nb nl pl pt tg zh_TW zh_CN"
+PLOCALE_BACKUP="sv"
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools linux-info multilib-minimal optfeature plocale \
+	python-single-r1 pam systemd toolchain-funcs
+
+DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
+HOMEPAGE="https://github.com/SSSD/sssd"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://github.com/SSSD/sssd/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SSSD/sssd.git"
+	EGIT_BRANCH="master"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl doc +netlink nfsv4 nls passkey python samba selinux systemd systemtap test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=app-crypt/mit-krb5-1.19.1[${MULTILIB_USEDEP}]
+	app-crypt/p11-kit
+	>=dev-libs/ding-libs-0.2
+	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
+	dev-libs/jansson:=
+	dev-libs/libpcre2:=
+	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+	>=dev-libs/popt-1.16
+	>=dev-libs/openssl-1.0.2:=
+	>=net-dns/bind-tools-9.9[gssapi]
+	>=net-dns/c-ares-1.10.0-r1:=[${MULTILIB_USEDEP}]
+	>=net-nds/openldap-2.4.30:=[sasl,experimental]
+	>=sys-apps/dbus-1.6
+	>=sys-apps/keyutils-1.5:=
+	>=sys-libs/pam-0-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.0.7
+	>=sys-libs/tdb-1.2.9
+	>=sys-libs/tevent-0.9.16
+	virtual/ldb:=
+	virtual/libintl
+	acl? ( net-fs/cifs-utils[acl] )
+	netlink? ( dev-libs/libnl:3 )
+	nfsv4? ( >=net-fs/nfs-utils-2.3.1-r2 )
+	nls? ( >=sys-devel/gettext-0.18 )
+	passkey? ( dev-libs/libfido2:= )
+	python? (
+		${PYTHON_DEPS}
+		systemd? (
+			$(python_gen_cond_dep '
+				dev-python/python-systemd[${PYTHON_USEDEP}]
+			')
+		)
+	)
+	samba? ( >=net-fs/samba-4.10.2[winbind] )
+	selinux? (
+		>=sys-libs/libselinux-2.1.9
+		>=sys-libs/libsemanage-2.1
+	)
+	systemd? (
+		sys-apps/systemd:=
+		sys-apps/util-linux
+	)
+	systemtap? ( dev-debug/systemtap )"
+RDEPEND="${DEPEND}
+	passkey? ( sys-apps/pcsc-lite[policykit] )
+	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )"
+DEPEND+="
+	sys-apps/shadow"
+BDEPEND="
+	virtual/pkgconfig
+	app-text/docbook-xml-dtd:4.4
+	>=dev-libs/libxslt-1.1.26
+	${PYTHON_DEPS}
+	doc? ( app-text/doxygen )
+	nls? ( sys-devel/gettext
+	       app-text/po4a )
+	test? (
+		dev-libs/check
+		dev-libs/softhsm:2
+		dev-util/cmocka
+		net-libs/gnutls[pkcs11,tools]
+		sys-libs/libfaketime
+		sys-libs/nss_wrapper
+		sys-libs/pam_wrapper
+		sys-libs/uid_wrapper
+	)
+"
+
+CONFIG_CHECK="~KEYS"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.8.2-krb5_pw_locked.patch"
+	"${FILESDIR}/${PN}-2.9.6-conditional-python-install.patch"
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ipa_hbac.h
+	/usr/include/sss_idmap.h
+	/usr/include/sss_nss_idmap.h
+	# --with-ifp
+	/usr/include/sss_sifp.h
+	/usr/include/sss_sifp_dbus.h
+	# from 1.15.3
+	/usr/include/sss_certmap.h
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_get_locales > src/man/po/LINGUAS || die
+
+	sed -i \
+		-e "/_langs]/ s/ .*//" \
+		src/man/po/po4a.cfg \
+		|| die
+	enable_locale() {
+		local locale=${1}
+
+		sed -i \
+			-e "/_langs]/ s/$/ ${locale}/" \
+			src/man/po/po4a.cfg \
+			|| die
+	}
+
+	plocale_for_each_locale enable_locale
+
+	PLOCALES="${PLOCALES_BIN}"
+	plocale_get_locales > po/LINGUAS || die
+
+	sed -i \
+		-e 's:/var/run:/run:' \
+		src/examples/logrotate \
+		|| die
+
+	# disable flaky test, see https://github.com/SSSD/sssd/issues/5631
+	sed -i \
+		-e '/^\s*pam-srv-tests[ \\]*$/d' \
+		Makefile.am \
+		|| die
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+src_configure() {
+	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1 || die)
+
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		export DTRACE="${BROOT}"/usr/bin/stap-dtrace
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	myconf+=(
+		--libexecdir="${EPREFIX}"/usr/libexec
+		--localstatedir="${EPREFIX}"/var
+		--runstatedir="${EPREFIX}"/run
+		--sbindir="${EPREFIX}"/usr/sbin
+		--with-pid-path="${EPREFIX}"/run
+		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
+		--enable-pammoddir="${EPREFIX}$(getpam_mod_dir)"
+		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
+		--with-db-path="${EPREFIX}"/var/lib/sss/db
+		--with-gpo-cache-path="${EPREFIX}"/var/lib/sss/gpo_cache
+		--with-pubconf-path="${EPREFIX}"/var/lib/sss/pubconf
+		--with-pipe-path="${EPREFIX}"/var/lib/sss/pipes
+		--with-mcache-path="${EPREFIX}"/var/lib/sss/mc
+		--with-secrets-db-path="${EPREFIX}"/var/lib/sss/secrets
+		--with-log-path="${EPREFIX}"/var/log/sssd
+		--with-kcm
+		--enable-kcm-renewal
+		--with-os=gentoo
+		--disable-rpath
+		--disable-static
+		# Valgrind is only used for tests
+		--disable-valgrind
+		$(use_with samba)
+		--with-smb-idmap-interface-version=6
+		$(multilib_native_use_enable acl cifs-idmap-plugin)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with selinux semanage)
+		--enable-krb5-locator-plugin
+		$(use_enable samba pac-responder)
+		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
+		$(use_enable nls)
+		$(multilib_native_use_with netlink libnl)
+		--with-manpages
+		--with-sudo
+		$(multilib_native_with autofs)
+		$(multilib_native_with ssh)
+		--without-oidc-child
+		$(multilib_native_with passkey)
+		--with-subid
+		$(use_enable systemtap)
+		--without-python2-bindings
+		$(multilib_native_use_with python python3-bindings)
+		# Annoyingly configure requires that you pick systemd XOR sysv
+		--with-initscript=$(usex systemd systemd sysv)
+		KRB5_CONFIG="${ESYSROOT}"/usr/bin/krb5-config
+		# Needed for Samba 4.21
+		CPPFLAGS="${CPPFLAGS} -I${ESYSROOT}/usr/include/samba-4.0"
+	)
+
+	use systemd && myconf+=(
+		--with-systemdunitdir=$(systemd_get_systemunitdir)
+	)
+
+	if ! multilib_is_native_abi; then
+		# work-around all the libraries that are used for CLI and server
+		myconf+=(
+			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
+			# ldb headers are fine since native needs it
+			# ldb lib fails... but it does not seem to bother
+			{DHASH,UNISTRING,INI_CONFIG_V{0,1,1_1,1_3}}_{CFLAGS,LIBS}=' '
+			{PCRE,CARES,SYSTEMD_LOGIN,SASL,DBUS,CRYPTO,P11_KIT}_{CFLAGS,LIBS}=' '
+			{NDR_NBT,SAMBA_UTIL,SMBCLIENT,NDR_KRB5PAC,JANSSON}_{CFLAGS,LIBS}=' '
+
+			# use native include path for dbus (needed for build)
+			DBUS_CFLAGS="${native_dbus_cflags}"
+
+			# non-pkgconfig checks
+			ac_cv_lib_ldap_ldap_search=yes
+			--without-kcm
+			--without-manpages
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+		use doc && emake docs
+	else
+		emake libnss_sss.la pam_sss.la pam_sss_gss.la
+		emake sssd_krb5_locator_plugin.la
+		use samba && emake sssd_pac_plugin.la
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		local -x CK_TIMEOUT_MULTIPLIER=10
+		emake check VERBOSE=yes
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake -j1 DESTDIR="${D}" install
+		if use python; then
+			python_fix_shebang "${ED}"
+			python_optimize
+		fi
+	else
+		# easier than playing with automake...
+		dopammod .libs/pam_sss.so
+		dopammod .libs/pam_sss_gss.so
+
+		into /
+		dolib.so .libs/libnss_sss.so*
+
+		exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
+		doexe .libs/sssd_krb5_locator_plugin.so
+
+		if use samba; then
+			exeinto /usr/$(get_libdir)/krb5/plugins/authdata
+			doexe .libs/sssd_pac_plugin.so
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/sssd
+	insopts -m600
+	doins src/examples/sssd-example.conf
+
+	insinto /etc/logrotate.d
+	insopts -m644
+	newins src/examples/logrotate sssd
+
+	newconfd "${FILESDIR}"/sssd.conf sssd
+
+	keepdir /var/lib/sss/db
+	keepdir /var/lib/sss/deskprofile
+	keepdir /var/lib/sss/gpo_cache
+	keepdir /var/lib/sss/keytabs
+	keepdir /var/lib/sss/mc
+	keepdir /var/lib/sss/pipes/private
+	keepdir /var/lib/sss/pubconf/krb5.include.d
+	keepdir /var/lib/sss/secrets
+	keepdir /var/log/sssd
+
+	# strip empty dirs
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/doc/"${PF}"/doc || die
+		rm -r "${ED}"/usr/share/doc/"${PF}"/{hbac,idmap,nss_idmap}_doc || die
+	fi
+
+	rm -r "${ED}"/run || die
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "You must set up sssd.conf (default installed into /etc/sssd)"
+	elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
+	elog "features."
+	echo
+	optfeature "Kerberos keytab renew (see krb5_renew_interval)" app-crypt/adcli
+
+	if ! use python; then
+		echo
+		ewarn "sssctl analyze will not work because the python USE flag is disabled."
+	fi
+}
diff --git a/sys-auth/sssd/sssd-2.9.6.ebuild b/sys-auth/sssd/sssd-2.9.6.ebuild
index cdb1bc58d5fc..be94832ca597 100644
--- a/sys-auth/sssd/sssd-2.9.6.ebuild
+++ b/sys-auth/sssd/sssd-2.9.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
@@ -15,7 +15,7 @@ DESCRIPTION="System Security Services Daemon provides access to identity and aut
 HOMEPAGE="https://github.com/SSSD/sssd"
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/SSSD/sssd/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SSSD/sssd.git"
diff --git a/sys-block/mbuffer/files/mbuffer-20240107-O0-for-libc-name-find.patch b/sys-block/mbuffer/files/mbuffer-20240107-O0-for-libc-name-find.patch
new file mode 100644
index 000000000000..e2d452f966e2
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20240107-O0-for-libc-name-find.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/938689
+
+mbuffer use macro LIBC_(OPEN|READ|WRITE|FSTAT) whic are determined by
+'objdump -T ... | awk ...', but in the case of clag (at least for now),
+depend on the optimization levels, open|read will be optimized to other
+methods which cause LIBC_(OPEN|READ) become "", then error bellow:
+
+expected identifier or '('
+   55 | int LIBC_OPEN(const char *path, int oflag, ...)
+
+I don't know the reason to find the name of open|read|write|fstat by this
+test, so use -O0 for the feature test code.
+
+Upstream Replied:
+> this concept is needed for the tapedrive emulator that replicates the
+> behavior of specific devices.
+
+diff --git a/configure.in b/configure.in
+index 95d6772..081625a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -155,6 +155,8 @@ AC_LANG(C)
+ if test -z "$OBJDUMP"; then
+ 	AC_MSG_WARN([unable to find objdump, which is needed to run tests])
+ else
++	old_CFLAGS="${CFLAGS}"
++	CFLAGS="-O0"
+ 	AC_MSG_CHECKING([linking open() and write() to detect libc names])
+ 	AC_LINK_IFELSE([
+ 	AC_LANG_SOURCE([[
+@@ -191,6 +193,7 @@ else
+ 	],
+ 	[AC_MSG_FAILURE([failed to link open/write test])]
+ 	)
++	CFLAGS="${old_CFLAGS}"
+ fi
+ 
+ 
diff --git a/sys-block/mbuffer/mbuffer-20240107.ebuild b/sys-block/mbuffer/mbuffer-20240107.ebuild
index 6d8e6e093eed..9c6aaa7d7fa0 100644
--- a/sys-block/mbuffer/mbuffer-20240107.ebuild
+++ b/sys-block/mbuffer/mbuffer-20240107.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
@@ -27,6 +27,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
 	"${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
 	"${FILESDIR}/${PN}-20231216-autoconf-warning.patch"
+	"${FILESDIR}/${PN}-20240107-O0-for-libc-name-find.patch"
 )
 
 src_prepare() {
diff --git a/sys-block/mbuffer/mbuffer-20240707.ebuild b/sys-block/mbuffer/mbuffer-20240707.ebuild
index c1354afd7ec1..748d9ea7f1a3 100644
--- a/sys-block/mbuffer/mbuffer-20240707.ebuild
+++ b/sys-block/mbuffer/mbuffer-20240707.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
@@ -28,6 +28,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
 	"${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
 	"${FILESDIR}/${PN}-20231216-autoconf-warning.patch"
+	"${FILESDIR}/${PN}-20240107-O0-for-libc-name-find.patch"
 )
 
 src_prepare() {
diff --git a/sys-block/mbuffer/mbuffer-20241007.ebuild b/sys-block/mbuffer/mbuffer-20241007.ebuild
index e0721f774e17..b8d79941c431 100644
--- a/sys-block/mbuffer/mbuffer-20241007.ebuild
+++ b/sys-block/mbuffer/mbuffer-20241007.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="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="debug ssl test"
 REQUIRED_USE="test? ( ssl )"
 RESTRICT="!test? ( test )"
@@ -27,6 +27,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
 	"${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
 	"${FILESDIR}/${PN}-20231216-autoconf-warning.patch"
+	"${FILESDIR}/${PN}-20240107-O0-for-libc-name-find.patch"
 )
 
 src_prepare() {
diff --git a/sys-block/ndctl/files/ndctl-77-iniparser4.patch b/sys-block/ndctl/files/ndctl-77-iniparser4.patch
deleted file mode 100644
index 9df1782d51bd..000000000000
--- a/sys-block/ndctl/files/ndctl-77-iniparser4.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Adapt to dev-libs/iniparser being slotted in Gentoo.
---- a/meson.build
-+++ b/meson.build
-@@ -179,12 +179,12 @@ iniparser_headers = ['iniparser.h', 'dictionary.h']
- message('Looking for iniparser include headers', iniparser_headers)
- 
- iniparserdir = include_directories(includedir / get_option('iniparserdir'), is_system:true)
--iniparser = cc.find_library('iniparser', required : (get_option('iniparserdir') != '') ,
-+iniparser = cc.find_library('iniparser4', required : (get_option('iniparserdir') != '') ,
- 	  has_headers :iniparser_headers ,header_include_directories : iniparserdir)
- 
- if not iniparser.found()
--   iniparserdir = include_directories(includedir / 'iniparser', is_system:true)
--   iniparser = cc.find_library('iniparser', required : true, has_headers : iniparser_headers,
-+   iniparserdir = include_directories(includedir / 'iniparser4', is_system:true)
-+   iniparser = cc.find_library('iniparser4', required : true, has_headers : iniparser_headers,
- 	     header_include_directories : iniparserdir)
- endif
- iniparser = declare_dependency(include_directories: iniparserdir, dependencies:iniparser)
diff --git a/sys-block/ndctl/ndctl-77-r1.ebuild b/sys-block/ndctl/ndctl-77-r1.ebuild
deleted file mode 100644
index 09d4f90c5f84..000000000000
--- a/sys-block/ndctl/ndctl-77-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit udev meson bash-completion-r1
-
-DESCRIPTION="Helper tools and libraries for managing non-volatile memory on Linux"
-HOMEPAGE="https://github.com/pmem/ndctl"
-SRC_URI="https://github.com/pmem/ndctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT CC0-1.0"
-SLOT="0/6"
-KEYWORDS="amd64 ~x86"
-IUSE="doc libtracefs systemd test"
-
-DEPEND="
-	dev-libs/iniparser:4=
-	dev-libs/json-c:=
-	sys-apps/keyutils:=
-	sys-apps/kmod:=
-	sys-apps/util-linux:=
-	virtual/libudev:=
-	libtracefs? ( dev-libs/libtracefs:= )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)
-	dev-build/libtool
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-# tests require root access
-RESTRICT+=" test"
-
-DOCS=(
-	README.md
-	CONTRIBUTING.md
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-77-iniparser4.patch
-)
-
-src_configure() {
-	local -a emesonargs=(
-		$(meson_feature systemd)
-		$(meson_feature libtracefs)
-		$(meson_feature doc docs)
-		-Dasciidoctor=disabled
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		-Drootprefix=/usr
-		-Drootlibdir="/usr/$(get_libdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# upstream doesn't install udev rules unless using systemd
-	use systemd || udev_dorules daxctl/90-daxctl-device.rules
-
-	bashcomp_alias ndctl daxctl
-	bashcomp_alias ndctl cxl
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-block/ndctl/ndctl-77-r2.ebuild b/sys-block/ndctl/ndctl-77-r2.ebuild
new file mode 100644
index 000000000000..8c808120df76
--- /dev/null
+++ b/sys-block/ndctl/ndctl-77-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit udev meson bash-completion-r1
+
+DESCRIPTION="Helper tools and libraries for managing non-volatile memory on Linux"
+HOMEPAGE="https://github.com/pmem/ndctl"
+SRC_URI="https://github.com/pmem/ndctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC0-1.0"
+SLOT="0/6"
+KEYWORDS="amd64 ~x86"
+IUSE="doc libtracefs systemd test"
+
+DEPEND="
+	>=dev-libs/iniparser-4.1-r2:=
+	dev-libs/json-c:=
+	sys-apps/keyutils:=
+	sys-apps/kmod:=
+	sys-apps/util-linux:=
+	virtual/libudev:=
+	libtracefs? ( dev-libs/libtracefs:= )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+	dev-build/libtool
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+# tests require root access
+RESTRICT+=" test"
+
+DOCS=(
+	README.md
+	CONTRIBUTING.md
+)
+
+src_configure() {
+	local -a emesonargs=(
+		$(meson_feature systemd)
+		$(meson_feature libtracefs)
+		$(meson_feature doc docs)
+		-Dasciidoctor=disabled
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		-Drootprefix=/usr
+		-Drootlibdir="/usr/$(get_libdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# upstream doesn't install udev rules unless using systemd
+	use systemd || udev_dorules daxctl/90-daxctl-device.rules
+
+	bashcomp_alias ndctl daxctl
+	bashcomp_alias ndctl cxl
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index 35c26984026c..fc2e86063b23 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,2 +1,2 @@
 DIST partitionmanager-24.08.3.tar.xz 2322268 BLAKE2B 755cdd5d7b502425545c49c44e572c36431abfbe523b6825ac91465a87e9eaf412b0cb20b50eac8d4d2ab3f3afda6597d0b47ee398203e909b4da2253c2e7694 SHA512 0b62b5c0ba4364ed722ee97961bcbe7293ee78082996eda5a8c8054375396429860c1f41ef1949de1cf780d2f6fcaae973dc0adc96b85a964635b2777e882502
-DIST partitionmanager-24.12.0.tar.xz 2322700 BLAKE2B ca333a8d73a35a80b1a3135120bed32c292d549070ba6c29145c0043558c9bb278a7af1b9ce0cd0fc604ad81ece6b484d43dd8a37d591d3c88016aae7bf3a7c4 SHA512 fc49f450681d4a1a9a569d56abd05eb3cbcbc7728a4c93be7f00cc6b5a87d0483e7f8c10c255c99e67d54db78bb17eebe838958d65f1c3bb1fbb90d5ebcb8651
+DIST partitionmanager-24.12.1.tar.xz 2322844 BLAKE2B 128665ecc5966b10a6aa31a51af8f0be5a107c3448753016dad21180c7acad456a37a700785266a1a75466250cbe58a3b82c31f71a793b68d87701caa81b98d0 SHA512 86f031fa87ffc864b1cf0185b92ab889cde8a98c17a808afced574e108e86cb4468e4312a6350830880487c0367e462e48ffa6d6d41464b514ee725b31e26582
diff --git a/sys-block/partitionmanager/partitionmanager-24.12.0.ebuild b/sys-block/partitionmanager/partitionmanager-24.12.0.ebuild
deleted file mode 100644
index 9c43c9496af9..000000000000
--- a/sys-block/partitionmanager/partitionmanager-24.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=6.5.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Utility for management of disks, partitions and file systems"
-HOMEPAGE="https://apps.kde.org/partitionmanager/"
-
-LICENSE="GPL-3"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=sys-auth/polkit-qt-0.175.0[qt6(+)]
-	>=sys-libs/kpmcore-${PVCUT}:6=
-"
-RDEPEND="${DEPEND}"
diff --git a/sys-block/partitionmanager/partitionmanager-24.12.1.ebuild b/sys-block/partitionmanager/partitionmanager-24.12.1.ebuild
new file mode 100644
index 000000000000..e0bd4cb290f0
--- /dev/null
+++ b/sys-block/partitionmanager/partitionmanager-24.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.7.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Utility for management of disks, partitions and file systems"
+HOMEPAGE="https://apps.kde.org/partitionmanager/"
+
+LICENSE="GPL-3"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=sys-auth/polkit-qt-0.175.0[qt6(+)]
+	>=sys-libs/kpmcore-${PVCUT}:6=
+"
+RDEPEND="${DEPEND}"
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.18-r5.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.18-r5.ebuild
index 58308fd41045..d190de4fda90 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.18-r5.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.18-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Gentoo Authors
+# Copyright 2004-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/gnu-efi/${P}.tar.bz2"
 # - GPL-2+ : setjmp_ia32.S
 LICENSE="GPL-2+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="-* amd64 arm arm64 ~riscv x86"
+KEYWORDS="-* amd64 arm arm64 ~loong ~riscv x86"
 IUSE="abi_x86_32 abi_x86_64 custom-cflags"
 REQUIRED_USE="
 	amd64? ( || ( abi_x86_32 abi_x86_64 ) )
@@ -88,6 +88,7 @@ efimake() {
 		aarch64*) arch=aarch64 ;;
 		ia64*) arch=ia64 ;;
 		i?86*) arch=ia32 ;;
+		loongarch64*) arch=loongarch64 ;;
 		riscv64*) arch=riscv64;;
 		x86_64*) arch=x86_64 ;;
 		*) die "Unknown CHOST" ;;
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild
index ad0bc6c1ac36..7ca85d23f576 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Gentoo Authors
+# Copyright 2004-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ncroxon/gnu-efi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 # - GPL-2+ : setjmp_ia32.S
 LICENSE="GPL-2+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 IUSE="abi_x86_32 abi_x86_64 custom-cflags"
 REQUIRED_USE="
 	amd64? ( || ( abi_x86_32 abi_x86_64 ) )
@@ -88,6 +88,7 @@ efimake() {
 		aarch64*) arch=aarch64 ;;
 		ia64*) arch=ia64 ;;
 		i?86*) arch=ia32 ;;
+		loongarch64*) arch=loongarch64 ;;
 		riscv64*) arch=riscv64;;
 		x86_64*) arch=x86_64 ;;
 		*) die "Unknown CHOST" ;;
diff --git a/sys-boot/gnu-efi/gnu-efi-4.0.0.ebuild b/sys-boot/gnu-efi/gnu-efi-4.0.0.ebuild
index 991d495bd8d8..e491f3efcf05 100644
--- a/sys-boot/gnu-efi/gnu-efi-4.0.0.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Gentoo Authors
+# Copyright 2004-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ncroxon/gnu-efi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 # - GPL-2+ : setjmp_ia32.S
 LICENSE="GPL-2+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 IUSE="abi_x86_32 abi_x86_64 custom-cflags"
 REQUIRED_USE="
 	amd64? ( || ( abi_x86_32 abi_x86_64 ) )
@@ -89,6 +89,7 @@ efimake() {
 		aarch64*) arch=aarch64 ;;
 		ia64*) arch=ia64 ;;
 		i?86*) arch=ia32 ;;
+		loongarch64*) arch=loongarch64 ;;
 		riscv64*) arch=riscv64;;
 		x86_64*) arch=x86_64 ;;
 		*) die "Unknown CHOST" ;;
diff --git a/sys-cluster/ceph/ceph-19.2.0-r2.ebuild b/sys-cluster/ceph/ceph-19.2.0-r2.ebuild
index 717e7282fc6f..aaa14b976b0d 100644
--- a/sys-cluster/ceph/ceph-19.2.0-r2.ebuild
+++ b/sys-cluster/ceph/ceph-19.2.0-r2.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
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ppc64"
 
 CPU_FLAGS_X86=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3)
 
diff --git a/sys-cluster/flux/Manifest b/sys-cluster/flux/Manifest
index 966b2bd23376..fa95ac471ed0 100644
--- a/sys-cluster/flux/Manifest
+++ b/sys-cluster/flux/Manifest
@@ -1,9 +1,9 @@
 DIST flux-0.41.2.tar.gz 395636 BLAKE2B 2d1732729709d0f753ff62aa5b5563b9d42f3cde42a98b5356607b640715e30afa9ebdfdb9c71281eff9188c91ea6e6b082ddc2198e4d790a76aaeb155b8ef2f SHA512 c68ad402c99b61ca9ef737749417b48dc4e852544d76311c11d94bff42c2e081a8e11e72e438cb9e1834ec7d48e69a30473aa6ab1d68c2684dde5c2b817000a2
-DIST flux-2.2.3.tar.gz 388802 BLAKE2B 61bdea26e76f330fc5fc2007958551b2ee5127e66eafe9a5fd0b6b4082a9942ca1884c761d3367bb7d5e8ac9868ce6e2a05fbaf02ca82422747c46691318ca29 SHA512 5f263cb64b164967b5f66ed150384ab518783304d46e641cda048704a9cc91e011299d007e3734c18b71b660e694609a5ab16e9699ac55901d205fead4a86840
 DIST flux-2.3.0.tar.gz 1314856 BLAKE2B 7576faaf28d1155dbc446462c31ab17303fc274e1f93ffb9468c805085c5be463d5d1b21f5c21dbb2989573b3dd2b8a679600601ccd7952b86b816ebde0eb7f7 SHA512 64ae384a3ead62358f00a3ebc203eae111c4a5b5e3b0b4fceaedf9a0d4dc427b87438887b84763508bc0da5fdf5ae05944a800402b91be318f8044a6f5a54864
+DIST flux-2.4.0.tar.gz 1326106 BLAKE2B 373444f4312e1e3495d3d15e10933db40ab66f12abc81ebb2809cd4c1557301ce50b42387113b238f3c65b418ec157ff5ae4a5e7c89f33f51caa361eee29acb8 SHA512 bc5020300d3607d50ef6ef9223be98684df1b296c64a25b0cfc35577b73eda79f52514af4b77904337125d85c1a89178e766a8a978d46929fb36a63be0203ee0
 DIST flux2-0.41.2-deps.tar.xz 166945460 BLAKE2B 292ac5a66237916f1eeb8460f38f803fbe6bfec7cc6ee09512c0893928478049dbf8d482a897e7f4d5bed537f3cae3d73019d6c793764d1b15dc984724bc4ec7 SHA512 da36b3d78066cad548492d368df2b0d31c25a72f4fe4e5791b0c4315d5ed2625da5318b4a010395a587c072a07d23c6d6e7ff3c43bbf201dcd7d45a85dc24297
 DIST flux2-0.41.2-manifests.tar.xz 22904 BLAKE2B e23150ff1b7617f144a1250c890cb48bccbfa4547cc2d46b6d6905349c969a8505e2bc23466a469bb0eae326ec571eb5987ae5c0768b648ba6e35b1daec2b039 SHA512 ba58ffa05be150e32a30a492d28cdc582c9b0e7162b768a83ca8d44a4a08fca195700f8c124cc39cf85a0c62dfbe380304c0d203d0f05619a1b65284d22278de
-DIST flux2-2.2.3-deps.tar.xz 199289224 BLAKE2B 18ee0bab84ac5c0c33b24dcaa4443fc959f351360bef0316e7b4d007f00428395a9b97c72bd7aeb37158064345de8a4e1263feff5082d67b77a5d4e3f1fe1c4e SHA512 f0636d02498be0047057386929dcaf7251b448e1f3716133e63124c85aec18db5d6a7f55924243f10631f2d1404eae7658eb8ca3d49d130c100e6da6f5102598
-DIST flux2-2.2.3-manifests.tar.xz 26796 BLAKE2B f37e25bb07a390cb08928881798ae7e0017b4628cc794a01e2a70bb01c1ff814d2ba39b8251e6ae178af70d8946d24b2fa57df808e36445032b8b8b860f93c12 SHA512 28dd16464e8348fe892242dfe9579dd9c6d9cb442c2024445042e314b12210bed75cbfa7d44ec68333d75a0dab6655ff238e5f2b22953f1d88703d3a3df0b562
 DIST flux2-2.3.0-deps.tar.xz 208907952 BLAKE2B 8359fffa44e526eed512dc8f4c7898c6260c1179163a4d6fdaa0cb12429c9ce2dcf7af4e56b00132ee9b9819ac0422f89a6260ed54b30255bd49b708f38c4abb SHA512 c6c318993156fc3fde406a6125c24cc0fb5a3c985d5befcf2e52d7ff5735882465e0080fbd9a2ba5e0eea32c2f644daf546bd12c129a0207501efc74fe2d54f2
 DIST flux2-2.3.0-manifests.tar.xz 27868 BLAKE2B 41ab954471b11d9b931b5be7400e1ceb43d29b5edff54bdd7a4185de6bf4a126a616b2a0af7253d94917b03cf3bceed85ccabd71c08262cac440e29fb3ba560b SHA512 5f594d24b2010e1e65682b284458af929163dec2b4787559bdd070be3f9c243ad5e9b987242a0e59881b033537f7eb30a10d22b3c265ed1d693517bacb027347
+DIST flux2-2.4.0-deps.tar.xz 198971052 BLAKE2B 4a3995eab9ccef6c3bf4aaf7b4bd1b7c0a4701a4c17945947e4b33b2d69fc14cd4c4d830a8cad9bfa08c16f0ed40c4277022ac079a7322e996048660f3901197 SHA512 bc8a70b1667c9ac7ee80e50066d077b22dd0a98e571e8209e46da0a35429e7e9cbcd7ded42fc30d8e3b3767f9857efde1d074c8dd34bc10c60149aa3470d2006
+DIST flux2-2.4.0-manifests.tar.xz 28132 BLAKE2B ec39f35e215d6a33cfb35a6d069b48984472923b75666bdae002b68fa2ea160b6f31e066a1464d6a705e4066eca3bf065e86643fa03c9b6b03f16ca9fc1c4456 SHA512 f3325c5918e4224905323487aeeeb7843e7604f16523b61696eb52ae4b134a131a358305e2b3284c9c7188c6f62ae896d02e86ea227b3d958bafbb52a3a16a0d
diff --git a/sys-cluster/flux/flux-2.2.3.ebuild b/sys-cluster/flux/flux-2.2.3.ebuild
deleted file mode 100644
index cad63d502521..000000000000
--- a/sys-cluster/flux/flux-2.2.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-MY_PN="flux2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Flux is a tool for keeping Kubernetes clusters in sync"
-HOMEPAGE="https://fluxcd.io https://github.com/fluxcd/flux2"
-SRC_URI="https://github.com/fluxcd/flux2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${MY_P}-deps.tar.xz"
-# Manifests require kustomize to build. Do it with: make cmd/flux/.manifests.done
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${MY_P}-manifests.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.19"
-
-RESTRICT+=" test"
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	mv "${WORKDIR}"/manifests cmd/"${PN}" || die
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		ego build -ldflags="-s -w -X main.VERSION=${PV}" -o ./bin/${PN} ./cmd/${PN}
-}
-
-src_install() {
-	dobin bin/${PN}
-	bin/${PN} completion bash > ${PN}.bash || die
-	bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/flux/flux-2.4.0.ebuild b/sys-cluster/flux/flux-2.4.0.ebuild
new file mode 100644
index 000000000000..36e2f6d6b64a
--- /dev/null
+++ b/sys-cluster/flux/flux-2.4.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+MY_PN="flux2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Flux is a tool for keeping Kubernetes clusters in sync"
+HOMEPAGE="https://fluxcd.io https://github.com/fluxcd/flux2"
+SRC_URI="https://github.com/fluxcd/flux2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${MY_P}-deps.tar.xz"
+# Manifests require kustomize to build. Do it with: make cmd/flux/.manifests.done
+SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${MY_P}-manifests.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+BDEPEND=">=dev-lang/go-1.19"
+
+RESTRICT+=" test"
+
+src_compile() {
+	mv "${WORKDIR}"/manifests cmd/"${PN}" || die
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		ego build -ldflags="-s -w -X main.VERSION=${PV}" -o ./bin/${PN} ./cmd/${PN}
+}
+
+src_install() {
+	dobin bin/${PN}
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/galera/galera-26.4.21.ebuild b/sys-cluster/galera/galera-26.4.21.ebuild
index efbdb7b0b14f..424483e74942 100644
--- a/sys-cluster/galera/galera-26.4.21.ebuild
+++ b/sys-cluster/galera/galera-26.4.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
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~x86"
 IUSE="garbd ssl"
 
 RDEPEND="
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 38d8bbd543d9..88835509ad52 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,7 +1,8 @@
-DIST kubernetes-1.29.11.tar.gz 41212802 BLAKE2B 5f6b6e81bc6f1350121ff4ea40ea49864e1150d537c99cfbd424f69d35ff407660a65a6e6802b0988896eeea2a9c376b5b0cc9bc4d1002cde4d38b2a5f71aebf SHA512 4b25cb37762803f7a796f887d610d8c95cf1651d94fd7cdf198a77edc26f9b9107b7cb36bcbe5178d44033780f38a2fe3587a50ab35fecf8aff3f5dd9931b2d8
 DIST kubernetes-1.29.12.tar.gz 41213761 BLAKE2B 5612ef1b1aabf4b28993effe3438f2fbde636dda09646480a87eaa109f69f876e17df6241556276279d92de93e483313e9f73b5d91730265ac778e877a95971d SHA512 b6d26f551f87c5650c2d9aed1fd572058ae404cffa56b8a0c3c2ee15cb58f9bfa63be218f025972bddfbdb9e79726ee357f9fafff582c4665043ccc1c672b010
-DIST kubernetes-1.30.7.tar.gz 39619882 BLAKE2B e019512760df75f7e03ad371b6da46eabdb2afc80238a0e3850fa8e2c1fe99d8eed0b82ee93751d6012323488cefffa2dbc58b340b0bf12059770f77207053f8 SHA512 f16d9e256ad763685b256647a6b8c07b136168bbea3a5338cee29d591e66dff984ecdb62480ba072573ddf4b3247f58b06147849e66f6e46dcced2f4413d2720
+DIST kubernetes-1.29.13.tar.gz 41213750 BLAKE2B 315e2470fa078edf123fc6c4c691d781fdcce0353ddfef83132a36291979e7a4098c725fa858cfeba0d6e310bc74c5c18027c9930d100e73a38abf29f98fe333 SHA512 7eb00c3b0352ed079b265e578267e3b8dbadda2ca3cc514857f524a90428224bdf71f67e4196986cb042b7310e0322b4e31454fd5d3f1bd21f43362de2dce6b4
 DIST kubernetes-1.30.8.tar.gz 39619616 BLAKE2B 47cef4db8b94bfbc7691daa3afdf409ff0bd1679ec179e17cf4126700b6b09fee9d2f133ab6ca42bd00eeb950e798576a09fedd5654306e209a0e97040c8e6ca SHA512 09ebcb396b2d4109b1eb0802b635e649519dcb71ff3e6bac480f66fb66fe8a50784ce6cf245e55bca422320b3fa83b5703ce0de945c140523c3bc6558c7b26c4
-DIST kubernetes-1.31.3.tar.gz 36572445 BLAKE2B ada6c5620d01e721e20673bebb4edd70bd9e2e6684b1bc3a781d84ab16790b228119c825e5727b5350e6b3a118501e240d863988a5f266c84d2cf0e07ca02cb2 SHA512 9b3e2ceca89bb7d388868eda65ac29dbc7fa2425cc607bd6adeee104b3b2139b24c9042d6fc0ca9e7b80ac5a79a0754a7485a237fa4a14ed0e24340634776c38
+DIST kubernetes-1.30.9.tar.gz 39622344 BLAKE2B 1e82b89eb5ccce5da048596a0e4b3b53fb22658b116b151342ceea69d2eb3da6d2eb8622cf2024bae6a44c44f84b37e262a2c778480ecbf8722c34fb71eb9b14 SHA512 cca4176a6623a2c97a9cc2bd79b39e242e8573c3ec8e2a6c1167f22fb33e89b533bc000a8eb20835fc8a94697d93c6b29c3522d1f6161de0788e9acaa3ca8472
 DIST kubernetes-1.31.4.tar.gz 36572367 BLAKE2B 34ba7b018550d3a569fbe578392194225248988fd840d5f1958950419b898e6fb109da58fae05d683819d3e205e79f85e4f99caaed1b50536a865cc44e9a6377 SHA512 74e3b3a12f9b3322702f48b76b026fed5f2084181ab687acb109eff8b9f42a20067e173255b7ff4adb885525dff13a52d04055dae21b394275dd61c14040e0f6
+DIST kubernetes-1.31.5.tar.gz 36577053 BLAKE2B bda8223b667bbf9153b9c0d383715d565aa6cb768d5f6313229eeefa0c17eef65f6072a04d8ce07145a11bf8ba5cece92241c3eff049fe2eece3e52230fceafa SHA512 6c773d706cb45bf0d8cb18cbd718ab2053fd4d17ae4db35b9159b258b55dbef71d0f6fd6e6057d8b5e027bdfc9ffb7a0a4d2bc63d8f092c48f5b44f3cc73ff96
 DIST kubernetes-1.32.0.tar.gz 39162995 BLAKE2B 72e717b1c3d2d40e46b236c5bdbc1dbe8aaca3b45a0a64dfd9fbd8dbcd7fd56202cb616f6fe35dbcba4d1cb2555c2fc6eba0c630662bb5e9c67763432ba14b9c SHA512 baefc48e15e4ab72636db5d78cf606f586991674308492ff41907611f5630ac8c3e80a5468bd3d4f1379ab54645d4e167a0e1d217a406542b2e32fa9fdf1c549
+DIST kubernetes-1.32.1.tar.gz 36344641 BLAKE2B bd9c74dd30b257f70b8302d645754683df1202c3d7fa89a9966a0fc6c5f4b1daa1ddf7263848871d950a35626ae643575b45d6d960ad33ce209e69ad60167bb7 SHA512 060ebcd2b0b29391d9605cd059f2c5761f9f51c21e2bdd6d99f086e0e65f476c7d7dc3b4ad9b1507fe2c9d71e9ffbde2555ee67e2c2d7ba97d366af97f995322
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.29.11.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.29.11.ebuild
deleted file mode 100644
index 96192b4bd604..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.29.11.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.21.9"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fNO-PIC ' '')" FORCE_HOST_GO="yes" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.29.12.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.29.12.ebuild
index 76d302232ac9..2ff4f0c538c8 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.29.12.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.29.12.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.29.13.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.29.13.ebuild
new file mode 100644
index 000000000000..f8303ef05318
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.29.13.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.21.9"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fNO-PIC ' '')" FORCE_HOST_GO="yes" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.30.7.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.30.7.ebuild
deleted file mode 100644
index b2b28d836906..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.30.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.21.6"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fNO-PIC ' '')" FORCE_HOST_GO="yes" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.30.8.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.30.8.ebuild
index 1e1f4ab1cbbe..7436e9a0fc90 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.30.8.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.30.8.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.30.9.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.30.9.ebuild
new file mode 100644
index 000000000000..bdf3cd3fcea4
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.30.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.21.6"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fNO-PIC ' '')" FORCE_HOST_GO="yes" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.31.3.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.31.3.ebuild
deleted file mode 100644
index 8f7f1f905f31..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.31.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.23.0"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fNO-PIC ' '')" FORCE_HOST_GO="yes" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.31.4.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.31.4.ebuild
index 961d6df18f5f..f884dbb4fae8 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.31.4.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.31.4.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.31.5.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.31.5.ebuild
new file mode 100644
index 000000000000..3de126254891
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.31.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.23.0"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fNO-PIC ' '')" FORCE_HOST_GO="yes" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.32.1.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.32.1.ebuild
new file mode 100644
index 000000000000..940a5e924ceb
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.32.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+S="${WORKDIR}/kubernetes-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.23.3"
+
+RESTRICT+=" test"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fNO-PIC ' '')" FORCE_HOST_GO="yes" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 38d8bbd543d9..88835509ad52 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,7 +1,8 @@
-DIST kubernetes-1.29.11.tar.gz 41212802 BLAKE2B 5f6b6e81bc6f1350121ff4ea40ea49864e1150d537c99cfbd424f69d35ff407660a65a6e6802b0988896eeea2a9c376b5b0cc9bc4d1002cde4d38b2a5f71aebf SHA512 4b25cb37762803f7a796f887d610d8c95cf1651d94fd7cdf198a77edc26f9b9107b7cb36bcbe5178d44033780f38a2fe3587a50ab35fecf8aff3f5dd9931b2d8
 DIST kubernetes-1.29.12.tar.gz 41213761 BLAKE2B 5612ef1b1aabf4b28993effe3438f2fbde636dda09646480a87eaa109f69f876e17df6241556276279d92de93e483313e9f73b5d91730265ac778e877a95971d SHA512 b6d26f551f87c5650c2d9aed1fd572058ae404cffa56b8a0c3c2ee15cb58f9bfa63be218f025972bddfbdb9e79726ee357f9fafff582c4665043ccc1c672b010
-DIST kubernetes-1.30.7.tar.gz 39619882 BLAKE2B e019512760df75f7e03ad371b6da46eabdb2afc80238a0e3850fa8e2c1fe99d8eed0b82ee93751d6012323488cefffa2dbc58b340b0bf12059770f77207053f8 SHA512 f16d9e256ad763685b256647a6b8c07b136168bbea3a5338cee29d591e66dff984ecdb62480ba072573ddf4b3247f58b06147849e66f6e46dcced2f4413d2720
+DIST kubernetes-1.29.13.tar.gz 41213750 BLAKE2B 315e2470fa078edf123fc6c4c691d781fdcce0353ddfef83132a36291979e7a4098c725fa858cfeba0d6e310bc74c5c18027c9930d100e73a38abf29f98fe333 SHA512 7eb00c3b0352ed079b265e578267e3b8dbadda2ca3cc514857f524a90428224bdf71f67e4196986cb042b7310e0322b4e31454fd5d3f1bd21f43362de2dce6b4
 DIST kubernetes-1.30.8.tar.gz 39619616 BLAKE2B 47cef4db8b94bfbc7691daa3afdf409ff0bd1679ec179e17cf4126700b6b09fee9d2f133ab6ca42bd00eeb950e798576a09fedd5654306e209a0e97040c8e6ca SHA512 09ebcb396b2d4109b1eb0802b635e649519dcb71ff3e6bac480f66fb66fe8a50784ce6cf245e55bca422320b3fa83b5703ce0de945c140523c3bc6558c7b26c4
-DIST kubernetes-1.31.3.tar.gz 36572445 BLAKE2B ada6c5620d01e721e20673bebb4edd70bd9e2e6684b1bc3a781d84ab16790b228119c825e5727b5350e6b3a118501e240d863988a5f266c84d2cf0e07ca02cb2 SHA512 9b3e2ceca89bb7d388868eda65ac29dbc7fa2425cc607bd6adeee104b3b2139b24c9042d6fc0ca9e7b80ac5a79a0754a7485a237fa4a14ed0e24340634776c38
+DIST kubernetes-1.30.9.tar.gz 39622344 BLAKE2B 1e82b89eb5ccce5da048596a0e4b3b53fb22658b116b151342ceea69d2eb3da6d2eb8622cf2024bae6a44c44f84b37e262a2c778480ecbf8722c34fb71eb9b14 SHA512 cca4176a6623a2c97a9cc2bd79b39e242e8573c3ec8e2a6c1167f22fb33e89b533bc000a8eb20835fc8a94697d93c6b29c3522d1f6161de0788e9acaa3ca8472
 DIST kubernetes-1.31.4.tar.gz 36572367 BLAKE2B 34ba7b018550d3a569fbe578392194225248988fd840d5f1958950419b898e6fb109da58fae05d683819d3e205e79f85e4f99caaed1b50536a865cc44e9a6377 SHA512 74e3b3a12f9b3322702f48b76b026fed5f2084181ab687acb109eff8b9f42a20067e173255b7ff4adb885525dff13a52d04055dae21b394275dd61c14040e0f6
+DIST kubernetes-1.31.5.tar.gz 36577053 BLAKE2B bda8223b667bbf9153b9c0d383715d565aa6cb768d5f6313229eeefa0c17eef65f6072a04d8ce07145a11bf8ba5cece92241c3eff049fe2eece3e52230fceafa SHA512 6c773d706cb45bf0d8cb18cbd718ab2053fd4d17ae4db35b9159b258b55dbef71d0f6fd6e6057d8b5e027bdfc9ffb7a0a4d2bc63d8f092c48f5b44f3cc73ff96
 DIST kubernetes-1.32.0.tar.gz 39162995 BLAKE2B 72e717b1c3d2d40e46b236c5bdbc1dbe8aaca3b45a0a64dfd9fbd8dbcd7fd56202cb616f6fe35dbcba4d1cb2555c2fc6eba0c630662bb5e9c67763432ba14b9c SHA512 baefc48e15e4ab72636db5d78cf606f586991674308492ff41907611f5630ac8c3e80a5468bd3d4f1379ab54645d4e167a0e1d217a406542b2e32fa9fdf1c549
+DIST kubernetes-1.32.1.tar.gz 36344641 BLAKE2B bd9c74dd30b257f70b8302d645754683df1202c3d7fa89a9966a0fc6c5f4b1daa1ddf7263848871d950a35626ae643575b45d6d960ad33ce209e69ad60167bb7 SHA512 060ebcd2b0b29391d9605cd059f2c5761f9f51c21e2bdd6d99f086e0e65f476c7d7dc3b4ad9b1507fe2c9d71e9ffbde2555ee67e2c2d7ba97d366af97f995322
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.29.11.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.29.11.ebuild
deleted file mode 100644
index e9d4bc00d859..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.29.11.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.21.9"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.29.12.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.29.12.ebuild
index cc65df45233f..282232fdd286 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.29.12.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.29.12.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.29.13.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.29.13.ebuild
new file mode 100644
index 000000000000..6bd6f789c4e2
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.29.13.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.21.9"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.30.7.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.30.7.ebuild
deleted file mode 100644
index 18845fa36260..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.30.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.21.6"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.30.8.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.30.8.ebuild
index 3fd35054c9f4..14fc8f903921 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.30.8.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.30.8.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.30.9.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.30.9.ebuild
new file mode 100644
index 000000000000..9c4553e2106a
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.30.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.21.6"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.31.3.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.31.3.ebuild
deleted file mode 100644
index d05d48b0b0ed..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.31.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.23.0"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.31.4.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.31.4.ebuild
index 656e09872f1e..4668eccb2d52 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.31.4.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.31.4.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.31.5.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.31.5.ebuild
new file mode 100644
index 000000000000..a47c764457ef
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.31.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.23.0"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.32.1.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.32.1.ebuild
new file mode 100644
index 000000000000..bee537bb23cb
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.32.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+S="${WORKDIR}/kubernetes-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.23.3"
+
+RESTRICT+=" test"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 38d8bbd543d9..88835509ad52 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,7 +1,8 @@
-DIST kubernetes-1.29.11.tar.gz 41212802 BLAKE2B 5f6b6e81bc6f1350121ff4ea40ea49864e1150d537c99cfbd424f69d35ff407660a65a6e6802b0988896eeea2a9c376b5b0cc9bc4d1002cde4d38b2a5f71aebf SHA512 4b25cb37762803f7a796f887d610d8c95cf1651d94fd7cdf198a77edc26f9b9107b7cb36bcbe5178d44033780f38a2fe3587a50ab35fecf8aff3f5dd9931b2d8
 DIST kubernetes-1.29.12.tar.gz 41213761 BLAKE2B 5612ef1b1aabf4b28993effe3438f2fbde636dda09646480a87eaa109f69f876e17df6241556276279d92de93e483313e9f73b5d91730265ac778e877a95971d SHA512 b6d26f551f87c5650c2d9aed1fd572058ae404cffa56b8a0c3c2ee15cb58f9bfa63be218f025972bddfbdb9e79726ee357f9fafff582c4665043ccc1c672b010
-DIST kubernetes-1.30.7.tar.gz 39619882 BLAKE2B e019512760df75f7e03ad371b6da46eabdb2afc80238a0e3850fa8e2c1fe99d8eed0b82ee93751d6012323488cefffa2dbc58b340b0bf12059770f77207053f8 SHA512 f16d9e256ad763685b256647a6b8c07b136168bbea3a5338cee29d591e66dff984ecdb62480ba072573ddf4b3247f58b06147849e66f6e46dcced2f4413d2720
+DIST kubernetes-1.29.13.tar.gz 41213750 BLAKE2B 315e2470fa078edf123fc6c4c691d781fdcce0353ddfef83132a36291979e7a4098c725fa858cfeba0d6e310bc74c5c18027c9930d100e73a38abf29f98fe333 SHA512 7eb00c3b0352ed079b265e578267e3b8dbadda2ca3cc514857f524a90428224bdf71f67e4196986cb042b7310e0322b4e31454fd5d3f1bd21f43362de2dce6b4
 DIST kubernetes-1.30.8.tar.gz 39619616 BLAKE2B 47cef4db8b94bfbc7691daa3afdf409ff0bd1679ec179e17cf4126700b6b09fee9d2f133ab6ca42bd00eeb950e798576a09fedd5654306e209a0e97040c8e6ca SHA512 09ebcb396b2d4109b1eb0802b635e649519dcb71ff3e6bac480f66fb66fe8a50784ce6cf245e55bca422320b3fa83b5703ce0de945c140523c3bc6558c7b26c4
-DIST kubernetes-1.31.3.tar.gz 36572445 BLAKE2B ada6c5620d01e721e20673bebb4edd70bd9e2e6684b1bc3a781d84ab16790b228119c825e5727b5350e6b3a118501e240d863988a5f266c84d2cf0e07ca02cb2 SHA512 9b3e2ceca89bb7d388868eda65ac29dbc7fa2425cc607bd6adeee104b3b2139b24c9042d6fc0ca9e7b80ac5a79a0754a7485a237fa4a14ed0e24340634776c38
+DIST kubernetes-1.30.9.tar.gz 39622344 BLAKE2B 1e82b89eb5ccce5da048596a0e4b3b53fb22658b116b151342ceea69d2eb3da6d2eb8622cf2024bae6a44c44f84b37e262a2c778480ecbf8722c34fb71eb9b14 SHA512 cca4176a6623a2c97a9cc2bd79b39e242e8573c3ec8e2a6c1167f22fb33e89b533bc000a8eb20835fc8a94697d93c6b29c3522d1f6161de0788e9acaa3ca8472
 DIST kubernetes-1.31.4.tar.gz 36572367 BLAKE2B 34ba7b018550d3a569fbe578392194225248988fd840d5f1958950419b898e6fb109da58fae05d683819d3e205e79f85e4f99caaed1b50536a865cc44e9a6377 SHA512 74e3b3a12f9b3322702f48b76b026fed5f2084181ab687acb109eff8b9f42a20067e173255b7ff4adb885525dff13a52d04055dae21b394275dd61c14040e0f6
+DIST kubernetes-1.31.5.tar.gz 36577053 BLAKE2B bda8223b667bbf9153b9c0d383715d565aa6cb768d5f6313229eeefa0c17eef65f6072a04d8ce07145a11bf8ba5cece92241c3eff049fe2eece3e52230fceafa SHA512 6c773d706cb45bf0d8cb18cbd718ab2053fd4d17ae4db35b9159b258b55dbef71d0f6fd6e6057d8b5e027bdfc9ffb7a0a4d2bc63d8f092c48f5b44f3cc73ff96
 DIST kubernetes-1.32.0.tar.gz 39162995 BLAKE2B 72e717b1c3d2d40e46b236c5bdbc1dbe8aaca3b45a0a64dfd9fbd8dbcd7fd56202cb616f6fe35dbcba4d1cb2555c2fc6eba0c630662bb5e9c67763432ba14b9c SHA512 baefc48e15e4ab72636db5d78cf606f586991674308492ff41907611f5630ac8c3e80a5468bd3d4f1379ab54645d4e167a0e1d217a406542b2e32fa9fdf1c549
+DIST kubernetes-1.32.1.tar.gz 36344641 BLAKE2B bd9c74dd30b257f70b8302d645754683df1202c3d7fa89a9966a0fc6c5f4b1daa1ddf7263848871d950a35626ae643575b45d6d960ad33ce209e69ad60167bb7 SHA512 060ebcd2b0b29391d9605cd059f2c5761f9f51c21e2bdd6d99f086e0e65f476c7d7dc3b4ad9b1507fe2c9d71e9ffbde2555ee67e2c2d7ba97d366af97f995322
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.29.11.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.29.11.ebuild
deleted file mode 100644
index 3cfaa73c074f..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.29.11.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
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.21.9"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.29.12.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.29.12.ebuild
index 7088f613c25c..65cb74bf741c 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.29.12.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.29.12.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools"
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.29.13.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.29.13.ebuild
new file mode 100644
index 000000000000..159f3e780c8d
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.29.13.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools"
+BDEPEND=">=dev-lang/go-1.21.9"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.30.7.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.30.7.ebuild
deleted file mode 100644
index 2e47e5a64e4c..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.30.7.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
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.21.6"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.30.8.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.30.8.ebuild
index bd858543529e..c61d40679be9 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.30.8.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.30.8.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools"
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.30.9.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.30.9.ebuild
new file mode 100644
index 000000000000..ea070867ebc4
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.30.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools"
+BDEPEND=">=dev-lang/go-1.21.6"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.31.3.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.31.3.ebuild
deleted file mode 100644
index 3ff3ad3e8eca..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.31.3.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
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.23.0"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.31.4.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.31.4.ebuild
index 61c67e1168d2..68f4138e6f50 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.31.4.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.31.4.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools"
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.31.5.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.31.5.ebuild
new file mode 100644
index 000000000000..29c9cb1c6e04
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.31.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools"
+BDEPEND=">=dev-lang/go-1.23.0"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.32.1.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.32.1.ebuild
new file mode 100644
index 000000000000..cc89a766a000
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.32.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+S="${WORKDIR}/kubernetes-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools"
+BDEPEND=">=dev-lang/go-1.23.3"
+
+RESTRICT+=" test"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 38d8bbd543d9..88835509ad52 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,7 +1,8 @@
-DIST kubernetes-1.29.11.tar.gz 41212802 BLAKE2B 5f6b6e81bc6f1350121ff4ea40ea49864e1150d537c99cfbd424f69d35ff407660a65a6e6802b0988896eeea2a9c376b5b0cc9bc4d1002cde4d38b2a5f71aebf SHA512 4b25cb37762803f7a796f887d610d8c95cf1651d94fd7cdf198a77edc26f9b9107b7cb36bcbe5178d44033780f38a2fe3587a50ab35fecf8aff3f5dd9931b2d8
 DIST kubernetes-1.29.12.tar.gz 41213761 BLAKE2B 5612ef1b1aabf4b28993effe3438f2fbde636dda09646480a87eaa109f69f876e17df6241556276279d92de93e483313e9f73b5d91730265ac778e877a95971d SHA512 b6d26f551f87c5650c2d9aed1fd572058ae404cffa56b8a0c3c2ee15cb58f9bfa63be218f025972bddfbdb9e79726ee357f9fafff582c4665043ccc1c672b010
-DIST kubernetes-1.30.7.tar.gz 39619882 BLAKE2B e019512760df75f7e03ad371b6da46eabdb2afc80238a0e3850fa8e2c1fe99d8eed0b82ee93751d6012323488cefffa2dbc58b340b0bf12059770f77207053f8 SHA512 f16d9e256ad763685b256647a6b8c07b136168bbea3a5338cee29d591e66dff984ecdb62480ba072573ddf4b3247f58b06147849e66f6e46dcced2f4413d2720
+DIST kubernetes-1.29.13.tar.gz 41213750 BLAKE2B 315e2470fa078edf123fc6c4c691d781fdcce0353ddfef83132a36291979e7a4098c725fa858cfeba0d6e310bc74c5c18027c9930d100e73a38abf29f98fe333 SHA512 7eb00c3b0352ed079b265e578267e3b8dbadda2ca3cc514857f524a90428224bdf71f67e4196986cb042b7310e0322b4e31454fd5d3f1bd21f43362de2dce6b4
 DIST kubernetes-1.30.8.tar.gz 39619616 BLAKE2B 47cef4db8b94bfbc7691daa3afdf409ff0bd1679ec179e17cf4126700b6b09fee9d2f133ab6ca42bd00eeb950e798576a09fedd5654306e209a0e97040c8e6ca SHA512 09ebcb396b2d4109b1eb0802b635e649519dcb71ff3e6bac480f66fb66fe8a50784ce6cf245e55bca422320b3fa83b5703ce0de945c140523c3bc6558c7b26c4
-DIST kubernetes-1.31.3.tar.gz 36572445 BLAKE2B ada6c5620d01e721e20673bebb4edd70bd9e2e6684b1bc3a781d84ab16790b228119c825e5727b5350e6b3a118501e240d863988a5f266c84d2cf0e07ca02cb2 SHA512 9b3e2ceca89bb7d388868eda65ac29dbc7fa2425cc607bd6adeee104b3b2139b24c9042d6fc0ca9e7b80ac5a79a0754a7485a237fa4a14ed0e24340634776c38
+DIST kubernetes-1.30.9.tar.gz 39622344 BLAKE2B 1e82b89eb5ccce5da048596a0e4b3b53fb22658b116b151342ceea69d2eb3da6d2eb8622cf2024bae6a44c44f84b37e262a2c778480ecbf8722c34fb71eb9b14 SHA512 cca4176a6623a2c97a9cc2bd79b39e242e8573c3ec8e2a6c1167f22fb33e89b533bc000a8eb20835fc8a94697d93c6b29c3522d1f6161de0788e9acaa3ca8472
 DIST kubernetes-1.31.4.tar.gz 36572367 BLAKE2B 34ba7b018550d3a569fbe578392194225248988fd840d5f1958950419b898e6fb109da58fae05d683819d3e205e79f85e4f99caaed1b50536a865cc44e9a6377 SHA512 74e3b3a12f9b3322702f48b76b026fed5f2084181ab687acb109eff8b9f42a20067e173255b7ff4adb885525dff13a52d04055dae21b394275dd61c14040e0f6
+DIST kubernetes-1.31.5.tar.gz 36577053 BLAKE2B bda8223b667bbf9153b9c0d383715d565aa6cb768d5f6313229eeefa0c17eef65f6072a04d8ce07145a11bf8ba5cece92241c3eff049fe2eece3e52230fceafa SHA512 6c773d706cb45bf0d8cb18cbd718ab2053fd4d17ae4db35b9159b258b55dbef71d0f6fd6e6057d8b5e027bdfc9ffb7a0a4d2bc63d8f092c48f5b44f3cc73ff96
 DIST kubernetes-1.32.0.tar.gz 39162995 BLAKE2B 72e717b1c3d2d40e46b236c5bdbc1dbe8aaca3b45a0a64dfd9fbd8dbcd7fd56202cb616f6fe35dbcba4d1cb2555c2fc6eba0c630662bb5e9c67763432ba14b9c SHA512 baefc48e15e4ab72636db5d78cf606f586991674308492ff41907611f5630ac8c3e80a5468bd3d4f1379ab54645d4e167a0e1d217a406542b2e32fa9fdf1c549
+DIST kubernetes-1.32.1.tar.gz 36344641 BLAKE2B bd9c74dd30b257f70b8302d645754683df1202c3d7fa89a9966a0fc6c5f4b1daa1ddf7263848871d950a35626ae643575b45d6d960ad33ce209e69ad60167bb7 SHA512 060ebcd2b0b29391d9605cd059f2c5761f9f51c21e2bdd6d99f086e0e65f476c7d7dc3b4ad9b1507fe2c9d71e9ffbde2555ee67e2c2d7ba97d366af97f995322
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.29.11.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.29.11.ebuild
deleted file mode 100644
index 14684748f25a..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.29.11.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.21.9"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.29.12.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.29.12.ebuild
index 1b77d372e737..1c1d33f7596d 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.29.12.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.29.12.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.29.13.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.29.13.ebuild
new file mode 100644
index 000000000000..a0787bc12a59
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.29.13.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.21.9"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.30.7.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.30.7.ebuild
deleted file mode 100644
index 218282b799fc..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.30.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.21.6"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.30.8.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.30.8.ebuild
index d3b8c1135b94..1b35e185b4d7 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.30.8.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.30.8.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.30.9.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.30.9.ebuild
new file mode 100644
index 000000000000..3f38e54c5bba
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.30.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.21.6"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.31.3.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.31.3.ebuild
deleted file mode 100644
index 577219bae250..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.31.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.23.0"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.31.4.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.31.4.ebuild
index a3f60b02fee1..cc023e55f121 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.31.4.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.31.4.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.31.5.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.31.5.ebuild
new file mode 100644
index 000000000000..a628b5988afd
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.31.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.23.0"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.32.1.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.32.1.ebuild
new file mode 100644
index 000000000000..ae0f49492418
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.32.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+S="${WORKDIR}/kubernetes-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.23.3"
+
+RESTRICT+=" test"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 38d8bbd543d9..88835509ad52 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,7 +1,8 @@
-DIST kubernetes-1.29.11.tar.gz 41212802 BLAKE2B 5f6b6e81bc6f1350121ff4ea40ea49864e1150d537c99cfbd424f69d35ff407660a65a6e6802b0988896eeea2a9c376b5b0cc9bc4d1002cde4d38b2a5f71aebf SHA512 4b25cb37762803f7a796f887d610d8c95cf1651d94fd7cdf198a77edc26f9b9107b7cb36bcbe5178d44033780f38a2fe3587a50ab35fecf8aff3f5dd9931b2d8
 DIST kubernetes-1.29.12.tar.gz 41213761 BLAKE2B 5612ef1b1aabf4b28993effe3438f2fbde636dda09646480a87eaa109f69f876e17df6241556276279d92de93e483313e9f73b5d91730265ac778e877a95971d SHA512 b6d26f551f87c5650c2d9aed1fd572058ae404cffa56b8a0c3c2ee15cb58f9bfa63be218f025972bddfbdb9e79726ee357f9fafff582c4665043ccc1c672b010
-DIST kubernetes-1.30.7.tar.gz 39619882 BLAKE2B e019512760df75f7e03ad371b6da46eabdb2afc80238a0e3850fa8e2c1fe99d8eed0b82ee93751d6012323488cefffa2dbc58b340b0bf12059770f77207053f8 SHA512 f16d9e256ad763685b256647a6b8c07b136168bbea3a5338cee29d591e66dff984ecdb62480ba072573ddf4b3247f58b06147849e66f6e46dcced2f4413d2720
+DIST kubernetes-1.29.13.tar.gz 41213750 BLAKE2B 315e2470fa078edf123fc6c4c691d781fdcce0353ddfef83132a36291979e7a4098c725fa858cfeba0d6e310bc74c5c18027c9930d100e73a38abf29f98fe333 SHA512 7eb00c3b0352ed079b265e578267e3b8dbadda2ca3cc514857f524a90428224bdf71f67e4196986cb042b7310e0322b4e31454fd5d3f1bd21f43362de2dce6b4
 DIST kubernetes-1.30.8.tar.gz 39619616 BLAKE2B 47cef4db8b94bfbc7691daa3afdf409ff0bd1679ec179e17cf4126700b6b09fee9d2f133ab6ca42bd00eeb950e798576a09fedd5654306e209a0e97040c8e6ca SHA512 09ebcb396b2d4109b1eb0802b635e649519dcb71ff3e6bac480f66fb66fe8a50784ce6cf245e55bca422320b3fa83b5703ce0de945c140523c3bc6558c7b26c4
-DIST kubernetes-1.31.3.tar.gz 36572445 BLAKE2B ada6c5620d01e721e20673bebb4edd70bd9e2e6684b1bc3a781d84ab16790b228119c825e5727b5350e6b3a118501e240d863988a5f266c84d2cf0e07ca02cb2 SHA512 9b3e2ceca89bb7d388868eda65ac29dbc7fa2425cc607bd6adeee104b3b2139b24c9042d6fc0ca9e7b80ac5a79a0754a7485a237fa4a14ed0e24340634776c38
+DIST kubernetes-1.30.9.tar.gz 39622344 BLAKE2B 1e82b89eb5ccce5da048596a0e4b3b53fb22658b116b151342ceea69d2eb3da6d2eb8622cf2024bae6a44c44f84b37e262a2c778480ecbf8722c34fb71eb9b14 SHA512 cca4176a6623a2c97a9cc2bd79b39e242e8573c3ec8e2a6c1167f22fb33e89b533bc000a8eb20835fc8a94697d93c6b29c3522d1f6161de0788e9acaa3ca8472
 DIST kubernetes-1.31.4.tar.gz 36572367 BLAKE2B 34ba7b018550d3a569fbe578392194225248988fd840d5f1958950419b898e6fb109da58fae05d683819d3e205e79f85e4f99caaed1b50536a865cc44e9a6377 SHA512 74e3b3a12f9b3322702f48b76b026fed5f2084181ab687acb109eff8b9f42a20067e173255b7ff4adb885525dff13a52d04055dae21b394275dd61c14040e0f6
+DIST kubernetes-1.31.5.tar.gz 36577053 BLAKE2B bda8223b667bbf9153b9c0d383715d565aa6cb768d5f6313229eeefa0c17eef65f6072a04d8ce07145a11bf8ba5cece92241c3eff049fe2eece3e52230fceafa SHA512 6c773d706cb45bf0d8cb18cbd718ab2053fd4d17ae4db35b9159b258b55dbef71d0f6fd6e6057d8b5e027bdfc9ffb7a0a4d2bc63d8f092c48f5b44f3cc73ff96
 DIST kubernetes-1.32.0.tar.gz 39162995 BLAKE2B 72e717b1c3d2d40e46b236c5bdbc1dbe8aaca3b45a0a64dfd9fbd8dbcd7fd56202cb616f6fe35dbcba4d1cb2555c2fc6eba0c630662bb5e9c67763432ba14b9c SHA512 baefc48e15e4ab72636db5d78cf606f586991674308492ff41907611f5630ac8c3e80a5468bd3d4f1379ab54645d4e167a0e1d217a406542b2e32fa9fdf1c549
+DIST kubernetes-1.32.1.tar.gz 36344641 BLAKE2B bd9c74dd30b257f70b8302d645754683df1202c3d7fa89a9966a0fc6c5f4b1daa1ddf7263848871d950a35626ae643575b45d6d960ad33ce209e69ad60167bb7 SHA512 060ebcd2b0b29391d9605cd059f2c5761f9f51c21e2bdd6d99f086e0e65f476c7d7dc3b4ad9b1507fe2c9d71e9ffbde2555ee67e2c2d7ba97d366af97f995322
diff --git a/sys-cluster/kubeadm/kubeadm-1.29.11.ebuild b/sys-cluster/kubeadm/kubeadm-1.29.11.ebuild
deleted file mode 100644
index 2fb49ca0d5a2..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.29.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.21.9"
-RDEPEND="app-containers/cri-tools
-	selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" FORCE_HOST_GO=yes \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.29.12.ebuild b/sys-cluster/kubeadm/kubeadm-1.29.12.ebuild
index f43a19b3ff24..4d96c4757f1d 100644
--- a/sys-cluster/kubeadm/kubeadm-1.29.12.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.29.12.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened selinux"
 
 BDEPEND=">=dev-lang/go-1.21.9"
diff --git a/sys-cluster/kubeadm/kubeadm-1.29.13.ebuild b/sys-cluster/kubeadm/kubeadm-1.29.13.ebuild
new file mode 100644
index 000000000000..06aff4ebac0f
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.29.13.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened selinux"
+
+BDEPEND=">=dev-lang/go-1.21.9"
+RDEPEND="app-containers/cri-tools
+	selinux? ( sec-policy/selinux-kubernetes )"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" FORCE_HOST_GO=yes \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.30.7.ebuild b/sys-cluster/kubeadm/kubeadm-1.30.7.ebuild
deleted file mode 100644
index 846d5f3270c0..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.30.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.21.6"
-RDEPEND="app-containers/cri-tools
-	selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" FORCE_HOST_GO=yes \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.30.8.ebuild b/sys-cluster/kubeadm/kubeadm-1.30.8.ebuild
index d175a9ec3808..aa076de733ac 100644
--- a/sys-cluster/kubeadm/kubeadm-1.30.8.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.30.8.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened selinux"
 
 BDEPEND=">=dev-lang/go-1.21.6"
diff --git a/sys-cluster/kubeadm/kubeadm-1.30.9.ebuild b/sys-cluster/kubeadm/kubeadm-1.30.9.ebuild
new file mode 100644
index 000000000000..e7c0d14f9497
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.30.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened selinux"
+
+BDEPEND=">=dev-lang/go-1.21.6"
+RDEPEND="app-containers/cri-tools
+	selinux? ( sec-policy/selinux-kubernetes )"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" FORCE_HOST_GO=yes \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.31.3.ebuild b/sys-cluster/kubeadm/kubeadm-1.31.3.ebuild
deleted file mode 100644
index 93459fc72e38..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.31.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.23.0"
-RDEPEND="app-containers/cri-tools
-	selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" FORCE_HOST_GO=yes \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.31.4.ebuild b/sys-cluster/kubeadm/kubeadm-1.31.4.ebuild
index 96a6a4b94b0c..e997094cb15d 100644
--- a/sys-cluster/kubeadm/kubeadm-1.31.4.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.31.4.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened selinux"
 
 BDEPEND=">=dev-lang/go-1.23.0"
diff --git a/sys-cluster/kubeadm/kubeadm-1.31.5.ebuild b/sys-cluster/kubeadm/kubeadm-1.31.5.ebuild
new file mode 100644
index 000000000000..59f94a11944f
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.31.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened selinux"
+
+BDEPEND=">=dev-lang/go-1.23.0"
+RDEPEND="app-containers/cri-tools
+	selinux? ( sec-policy/selinux-kubernetes )"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" FORCE_HOST_GO=yes \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.32.1.ebuild b/sys-cluster/kubeadm/kubeadm-1.32.1.ebuild
new file mode 100644
index 000000000000..d654dd467d29
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.32.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+S="${WORKDIR}/kubernetes-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+IUSE="hardened selinux"
+
+RESTRICT+=" test"
+
+RDEPEND="app-containers/cri-tools
+	selinux? ( sec-policy/selinux-kubernetes )"
+BDEPEND=">=dev-lang/go-1.23.3"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" FORCE_HOST_GO=yes \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 38d8bbd543d9..88835509ad52 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,7 +1,8 @@
-DIST kubernetes-1.29.11.tar.gz 41212802 BLAKE2B 5f6b6e81bc6f1350121ff4ea40ea49864e1150d537c99cfbd424f69d35ff407660a65a6e6802b0988896eeea2a9c376b5b0cc9bc4d1002cde4d38b2a5f71aebf SHA512 4b25cb37762803f7a796f887d610d8c95cf1651d94fd7cdf198a77edc26f9b9107b7cb36bcbe5178d44033780f38a2fe3587a50ab35fecf8aff3f5dd9931b2d8
 DIST kubernetes-1.29.12.tar.gz 41213761 BLAKE2B 5612ef1b1aabf4b28993effe3438f2fbde636dda09646480a87eaa109f69f876e17df6241556276279d92de93e483313e9f73b5d91730265ac778e877a95971d SHA512 b6d26f551f87c5650c2d9aed1fd572058ae404cffa56b8a0c3c2ee15cb58f9bfa63be218f025972bddfbdb9e79726ee357f9fafff582c4665043ccc1c672b010
-DIST kubernetes-1.30.7.tar.gz 39619882 BLAKE2B e019512760df75f7e03ad371b6da46eabdb2afc80238a0e3850fa8e2c1fe99d8eed0b82ee93751d6012323488cefffa2dbc58b340b0bf12059770f77207053f8 SHA512 f16d9e256ad763685b256647a6b8c07b136168bbea3a5338cee29d591e66dff984ecdb62480ba072573ddf4b3247f58b06147849e66f6e46dcced2f4413d2720
+DIST kubernetes-1.29.13.tar.gz 41213750 BLAKE2B 315e2470fa078edf123fc6c4c691d781fdcce0353ddfef83132a36291979e7a4098c725fa858cfeba0d6e310bc74c5c18027c9930d100e73a38abf29f98fe333 SHA512 7eb00c3b0352ed079b265e578267e3b8dbadda2ca3cc514857f524a90428224bdf71f67e4196986cb042b7310e0322b4e31454fd5d3f1bd21f43362de2dce6b4
 DIST kubernetes-1.30.8.tar.gz 39619616 BLAKE2B 47cef4db8b94bfbc7691daa3afdf409ff0bd1679ec179e17cf4126700b6b09fee9d2f133ab6ca42bd00eeb950e798576a09fedd5654306e209a0e97040c8e6ca SHA512 09ebcb396b2d4109b1eb0802b635e649519dcb71ff3e6bac480f66fb66fe8a50784ce6cf245e55bca422320b3fa83b5703ce0de945c140523c3bc6558c7b26c4
-DIST kubernetes-1.31.3.tar.gz 36572445 BLAKE2B ada6c5620d01e721e20673bebb4edd70bd9e2e6684b1bc3a781d84ab16790b228119c825e5727b5350e6b3a118501e240d863988a5f266c84d2cf0e07ca02cb2 SHA512 9b3e2ceca89bb7d388868eda65ac29dbc7fa2425cc607bd6adeee104b3b2139b24c9042d6fc0ca9e7b80ac5a79a0754a7485a237fa4a14ed0e24340634776c38
+DIST kubernetes-1.30.9.tar.gz 39622344 BLAKE2B 1e82b89eb5ccce5da048596a0e4b3b53fb22658b116b151342ceea69d2eb3da6d2eb8622cf2024bae6a44c44f84b37e262a2c778480ecbf8722c34fb71eb9b14 SHA512 cca4176a6623a2c97a9cc2bd79b39e242e8573c3ec8e2a6c1167f22fb33e89b533bc000a8eb20835fc8a94697d93c6b29c3522d1f6161de0788e9acaa3ca8472
 DIST kubernetes-1.31.4.tar.gz 36572367 BLAKE2B 34ba7b018550d3a569fbe578392194225248988fd840d5f1958950419b898e6fb109da58fae05d683819d3e205e79f85e4f99caaed1b50536a865cc44e9a6377 SHA512 74e3b3a12f9b3322702f48b76b026fed5f2084181ab687acb109eff8b9f42a20067e173255b7ff4adb885525dff13a52d04055dae21b394275dd61c14040e0f6
+DIST kubernetes-1.31.5.tar.gz 36577053 BLAKE2B bda8223b667bbf9153b9c0d383715d565aa6cb768d5f6313229eeefa0c17eef65f6072a04d8ce07145a11bf8ba5cece92241c3eff049fe2eece3e52230fceafa SHA512 6c773d706cb45bf0d8cb18cbd718ab2053fd4d17ae4db35b9159b258b55dbef71d0f6fd6e6057d8b5e027bdfc9ffb7a0a4d2bc63d8f092c48f5b44f3cc73ff96
 DIST kubernetes-1.32.0.tar.gz 39162995 BLAKE2B 72e717b1c3d2d40e46b236c5bdbc1dbe8aaca3b45a0a64dfd9fbd8dbcd7fd56202cb616f6fe35dbcba4d1cb2555c2fc6eba0c630662bb5e9c67763432ba14b9c SHA512 baefc48e15e4ab72636db5d78cf606f586991674308492ff41907611f5630ac8c3e80a5468bd3d4f1379ab54645d4e167a0e1d217a406542b2e32fa9fdf1c549
+DIST kubernetes-1.32.1.tar.gz 36344641 BLAKE2B bd9c74dd30b257f70b8302d645754683df1202c3d7fa89a9966a0fc6c5f4b1daa1ddf7263848871d950a35626ae643575b45d6d960ad33ce209e69ad60167bb7 SHA512 060ebcd2b0b29391d9605cd059f2c5761f9f51c21e2bdd6d99f086e0e65f476c7d7dc3b4ad9b1507fe2c9d71e9ffbde2555ee67e2c2d7ba97d366af97f995322
diff --git a/sys-cluster/kubectl/kubectl-1.29.11.ebuild b/sys-cluster/kubectl/kubectl-1.29.11.ebuild
deleted file mode 100644
index 8d6a0d86ef54..000000000000
--- a/sys-cluster/kubectl/kubectl-1.29.11.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.21.9"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.29.12.ebuild b/sys-cluster/kubectl/kubectl-1.29.12.ebuild
index d9e842902c85..695778f7bb06 100644
--- a/sys-cluster/kubectl/kubectl-1.29.12.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.29.12.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.21.9"
diff --git a/sys-cluster/kubectl/kubectl-1.29.13.ebuild b/sys-cluster/kubectl/kubectl-1.29.13.ebuild
new file mode 100644
index 000000000000..d26287ca9d59
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.29.13.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+BDEPEND=">=dev-lang/go-1.21.9"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.30.7.ebuild b/sys-cluster/kubectl/kubectl-1.30.7.ebuild
deleted file mode 100644
index 85aea71eb8c5..000000000000
--- a/sys-cluster/kubectl/kubectl-1.30.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.21.6"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.30.8.ebuild b/sys-cluster/kubectl/kubectl-1.30.8.ebuild
index 419b200ff1be..adcf1442b8d9 100644
--- a/sys-cluster/kubectl/kubectl-1.30.8.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.30.8.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.21.6"
diff --git a/sys-cluster/kubectl/kubectl-1.30.9.ebuild b/sys-cluster/kubectl/kubectl-1.30.9.ebuild
new file mode 100644
index 000000000000..fa1c0ad0c7c0
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.30.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+BDEPEND=">=dev-lang/go-1.21.6"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.31.3.ebuild b/sys-cluster/kubectl/kubectl-1.31.3.ebuild
deleted file mode 100644
index ca6154bd67b6..000000000000
--- a/sys-cluster/kubectl/kubectl-1.31.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.23.0"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.31.4.ebuild b/sys-cluster/kubectl/kubectl-1.31.4.ebuild
index 67b1ecc00f15..a3e06f9215ef 100644
--- a/sys-cluster/kubectl/kubectl-1.31.4.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.31.4.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 BDEPEND=">=dev-lang/go-1.23.0"
diff --git a/sys-cluster/kubectl/kubectl-1.31.5.ebuild b/sys-cluster/kubectl/kubectl-1.31.5.ebuild
new file mode 100644
index 000000000000..e0fba8e0708d
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.31.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+BDEPEND=">=dev-lang/go-1.23.0"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.32.1.ebuild b/sys-cluster/kubectl/kubectl-1.32.1.ebuild
new file mode 100644
index 000000000000..3cb06f632403
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.32.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+S="${WORKDIR}/kubernetes-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+BDEPEND=">=dev-lang/go-1.23.3"
+
+RESTRICT+=" test"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 38d8bbd543d9..88835509ad52 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -1,7 +1,8 @@
-DIST kubernetes-1.29.11.tar.gz 41212802 BLAKE2B 5f6b6e81bc6f1350121ff4ea40ea49864e1150d537c99cfbd424f69d35ff407660a65a6e6802b0988896eeea2a9c376b5b0cc9bc4d1002cde4d38b2a5f71aebf SHA512 4b25cb37762803f7a796f887d610d8c95cf1651d94fd7cdf198a77edc26f9b9107b7cb36bcbe5178d44033780f38a2fe3587a50ab35fecf8aff3f5dd9931b2d8
 DIST kubernetes-1.29.12.tar.gz 41213761 BLAKE2B 5612ef1b1aabf4b28993effe3438f2fbde636dda09646480a87eaa109f69f876e17df6241556276279d92de93e483313e9f73b5d91730265ac778e877a95971d SHA512 b6d26f551f87c5650c2d9aed1fd572058ae404cffa56b8a0c3c2ee15cb58f9bfa63be218f025972bddfbdb9e79726ee357f9fafff582c4665043ccc1c672b010
-DIST kubernetes-1.30.7.tar.gz 39619882 BLAKE2B e019512760df75f7e03ad371b6da46eabdb2afc80238a0e3850fa8e2c1fe99d8eed0b82ee93751d6012323488cefffa2dbc58b340b0bf12059770f77207053f8 SHA512 f16d9e256ad763685b256647a6b8c07b136168bbea3a5338cee29d591e66dff984ecdb62480ba072573ddf4b3247f58b06147849e66f6e46dcced2f4413d2720
+DIST kubernetes-1.29.13.tar.gz 41213750 BLAKE2B 315e2470fa078edf123fc6c4c691d781fdcce0353ddfef83132a36291979e7a4098c725fa858cfeba0d6e310bc74c5c18027c9930d100e73a38abf29f98fe333 SHA512 7eb00c3b0352ed079b265e578267e3b8dbadda2ca3cc514857f524a90428224bdf71f67e4196986cb042b7310e0322b4e31454fd5d3f1bd21f43362de2dce6b4
 DIST kubernetes-1.30.8.tar.gz 39619616 BLAKE2B 47cef4db8b94bfbc7691daa3afdf409ff0bd1679ec179e17cf4126700b6b09fee9d2f133ab6ca42bd00eeb950e798576a09fedd5654306e209a0e97040c8e6ca SHA512 09ebcb396b2d4109b1eb0802b635e649519dcb71ff3e6bac480f66fb66fe8a50784ce6cf245e55bca422320b3fa83b5703ce0de945c140523c3bc6558c7b26c4
-DIST kubernetes-1.31.3.tar.gz 36572445 BLAKE2B ada6c5620d01e721e20673bebb4edd70bd9e2e6684b1bc3a781d84ab16790b228119c825e5727b5350e6b3a118501e240d863988a5f266c84d2cf0e07ca02cb2 SHA512 9b3e2ceca89bb7d388868eda65ac29dbc7fa2425cc607bd6adeee104b3b2139b24c9042d6fc0ca9e7b80ac5a79a0754a7485a237fa4a14ed0e24340634776c38
+DIST kubernetes-1.30.9.tar.gz 39622344 BLAKE2B 1e82b89eb5ccce5da048596a0e4b3b53fb22658b116b151342ceea69d2eb3da6d2eb8622cf2024bae6a44c44f84b37e262a2c778480ecbf8722c34fb71eb9b14 SHA512 cca4176a6623a2c97a9cc2bd79b39e242e8573c3ec8e2a6c1167f22fb33e89b533bc000a8eb20835fc8a94697d93c6b29c3522d1f6161de0788e9acaa3ca8472
 DIST kubernetes-1.31.4.tar.gz 36572367 BLAKE2B 34ba7b018550d3a569fbe578392194225248988fd840d5f1958950419b898e6fb109da58fae05d683819d3e205e79f85e4f99caaed1b50536a865cc44e9a6377 SHA512 74e3b3a12f9b3322702f48b76b026fed5f2084181ab687acb109eff8b9f42a20067e173255b7ff4adb885525dff13a52d04055dae21b394275dd61c14040e0f6
+DIST kubernetes-1.31.5.tar.gz 36577053 BLAKE2B bda8223b667bbf9153b9c0d383715d565aa6cb768d5f6313229eeefa0c17eef65f6072a04d8ce07145a11bf8ba5cece92241c3eff049fe2eece3e52230fceafa SHA512 6c773d706cb45bf0d8cb18cbd718ab2053fd4d17ae4db35b9159b258b55dbef71d0f6fd6e6057d8b5e027bdfc9ffb7a0a4d2bc63d8f092c48f5b44f3cc73ff96
 DIST kubernetes-1.32.0.tar.gz 39162995 BLAKE2B 72e717b1c3d2d40e46b236c5bdbc1dbe8aaca3b45a0a64dfd9fbd8dbcd7fd56202cb616f6fe35dbcba4d1cb2555c2fc6eba0c630662bb5e9c67763432ba14b9c SHA512 baefc48e15e4ab72636db5d78cf606f586991674308492ff41907611f5630ac8c3e80a5468bd3d4f1379ab54645d4e167a0e1d217a406542b2e32fa9fdf1c549
+DIST kubernetes-1.32.1.tar.gz 36344641 BLAKE2B bd9c74dd30b257f70b8302d645754683df1202c3d7fa89a9966a0fc6c5f4b1daa1ddf7263848871d950a35626ae643575b45d6d960ad33ce209e69ad60167bb7 SHA512 060ebcd2b0b29391d9605cd059f2c5761f9f51c21e2bdd6d99f086e0e65f476c7d7dc3b4ad9b1507fe2c9d71e9ffbde2555ee67e2c2d7ba97d366af97f995322
diff --git a/sys-cluster/kubelet/kubelet-1.29.11.ebuild b/sys-cluster/kubelet/kubelet-1.29.11.ebuild
deleted file mode 100644
index c0a948f3d3ec..000000000000
--- a/sys-cluster/kubelet/kubelet-1.29.11.ebuild
+++ /dev/null
@@ -1,38 +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="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.21.9"
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-	WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.29.12.ebuild b/sys-cluster/kubelet/kubelet-1.29.12.ebuild
index 91977a28275c..f0b6b0b979bd 100644
--- a/sys-cluster/kubelet/kubelet-1.29.12.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.29.12.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened selinux"
 
 BDEPEND=">=dev-lang/go-1.21.9"
diff --git a/sys-cluster/kubelet/kubelet-1.29.13.ebuild b/sys-cluster/kubelet/kubelet-1.29.13.ebuild
new file mode 100644
index 000000000000..bf3928affd91
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.29.13.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened selinux"
+
+BDEPEND=">=dev-lang/go-1.21.9"
+RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+	WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.30.7.ebuild b/sys-cluster/kubelet/kubelet-1.30.7.ebuild
deleted file mode 100644
index 3a791fbf13b7..000000000000
--- a/sys-cluster/kubelet/kubelet-1.30.7.ebuild
+++ /dev/null
@@ -1,38 +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="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.21.6"
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-	WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.30.8.ebuild b/sys-cluster/kubelet/kubelet-1.30.8.ebuild
index 49e2249286ad..e8fbd2f5648f 100644
--- a/sys-cluster/kubelet/kubelet-1.30.8.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.30.8.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened selinux"
 
 BDEPEND=">=dev-lang/go-1.21.6"
diff --git a/sys-cluster/kubelet/kubelet-1.30.9.ebuild b/sys-cluster/kubelet/kubelet-1.30.9.ebuild
new file mode 100644
index 000000000000..68f85df8ff5d
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.30.9.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened selinux"
+
+BDEPEND=">=dev-lang/go-1.21.6"
+RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+	WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.31.3.ebuild b/sys-cluster/kubelet/kubelet-1.31.3.ebuild
deleted file mode 100644
index 6ee59aa13da2..000000000000
--- a/sys-cluster/kubelet/kubelet-1.31.3.ebuild
+++ /dev/null
@@ -1,38 +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="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.23.0"
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-	WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.31.4.ebuild b/sys-cluster/kubelet/kubelet-1.31.4.ebuild
index a5aae6c40845..ace3978da007 100644
--- a/sys-cluster/kubelet/kubelet-1.31.4.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.31.4.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened selinux"
 
 BDEPEND=">=dev-lang/go-1.23.0"
diff --git a/sys-cluster/kubelet/kubelet-1.31.5.ebuild b/sys-cluster/kubelet/kubelet-1.31.5.ebuild
new file mode 100644
index 000000000000..57c7f202494c
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.31.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened selinux"
+
+BDEPEND=">=dev-lang/go-1.23.0"
+RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+	WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.32.1.ebuild b/sys-cluster/kubelet/kubelet-1.32.1.ebuild
new file mode 100644
index 000000000000..c308f94ac9f3
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.32.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+S="${WORKDIR}/kubernetes-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened selinux"
+
+BDEPEND=">=dev-lang/go-1.23.3"
+RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
+
+RESTRICT+=" test "
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+	WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubeletctl/Manifest b/sys-cluster/kubeletctl/Manifest
index 97b51dbb88ac..82e052c8303a 100644
--- a/sys-cluster/kubeletctl/Manifest
+++ b/sys-cluster/kubeletctl/Manifest
@@ -1,4 +1,4 @@
 DIST kubeletctl-1.12-deps.tar.xz 1586588 BLAKE2B e39f271cfa2a5b0e9283139181d0d988c54643985416c1ca5fa09fd266ddcc5621d7b537b1edb2bbfdc386601bd65591417a483752ec6fbfc883e0d0ad3277bd SHA512 b68bfcc0757e7e0d16648bfa35effe27a1040e189e86417c2967047ee956656eca2ed425a7bae609a076b5a5b408ad1ccb36bc4a0b063fb42df5e0b12e61d850
 DIST kubeletctl-1.12.tar.gz 47285 BLAKE2B f8d7784b9fd64bd91679ebb7f2306fd1613cfdf95c94f816a0823f7e0fd6892a4f5611c6263aee6363186fac2b984dadf4b5484505bf5eea87efdd3556968b5c SHA512 a18d37cc383d196cf620aa48f37d0c6e95b468d29ddc8f55c8b58bfbd0a781bbfbffaa6e57d18c8ec79998a1fe28c44460321e78c05a0d4620cfe74e045138c7
-DIST kubeletctl-1.6-deps.tar.xz 36450320 BLAKE2B 266c6ba630543684f5d20b2c0ca4d0703997fc169bb5abe09302d69981ef65e169682cb9f871b39f0ddd0d76932354983709013ece800f94a28e1f9ce9186f73 SHA512 82f18a1e4b9dbdd8223fea77735616071893241048a82aa7615977d873aebe10a43c8f11c56dcdc3b5c392c1a150606e478d1b04fe67c5340b5f1ccae3316a3f
-DIST kubeletctl-1.6.tar.gz 47987 BLAKE2B f69bf6e1e53a62f0a2f2edfd3a4ee2ec040349136f08077837050bed03de9b6cfc6019cac844227125b979b94976b5336eac5ce42f385c3f60be6b2265e57361 SHA512 2701d66980284cf153fe8305cb812a6bb2af550e7c7ee6aa37187a3b9d5d6ae78e4a9c7a46ae3db05b1e4d863f87f48a60091d18c35e46ce71354e894bc6922a
+DIST kubeletctl-1.13-deps.tar.xz 1591952 BLAKE2B 3a412a78fbb8a2a491491dcebd1543d041647dec76158587d43362389517fd94eda285ec9c525b3928cf142ff02e259cc218aafdc86d5576a878431bb7c46308 SHA512 e7be1372fbf4d925ee5af806e4f691122d607474136238d9ddcb0dfe390a70914f422f0a073cdd96b4f9528aef63463ff184718a0ac9cc8feb30d2030306adbe
+DIST kubeletctl-1.13.tar.gz 48977 BLAKE2B 2a926c5f53f2ac40809f9f5e28fdcbe481489889dc6d13a7083eca5e7fb261d88df8d6c211455a4a74382c3f7c7f88e7b63a60efae54c89123d671b97c127bff SHA512 179b838951246eb975179613c7db652b45555a373a24a6142e5b53dcb275560fd5d7592e7fed118eaaef33ce2725cc565b6c20e9ed2077339036629a7b6780d5
diff --git a/sys-cluster/kubeletctl/kubeletctl-1.13.ebuild b/sys-cluster/kubeletctl/kubeletctl-1.13.ebuild
new file mode 100644
index 000000000000..1abb208e9000
--- /dev/null
+++ b/sys-cluster/kubeletctl/kubeletctl-1.13.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="A client for kubelet"
+HOMEPAGE="https://github.com/cyberark/kubeletctl"
+SRC_URI="https://github.com/cyberark/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT+=" test"
+PATCHES=("${S}/go-mod-sum.patch")
+
+src_compile() {
+	go build -ldflags "-s -w" || die
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README.md
+}
diff --git a/sys-cluster/kubeletctl/kubeletctl-1.6.ebuild b/sys-cluster/kubeletctl/kubeletctl-1.6.ebuild
deleted file mode 100644
index 181e577604b0..000000000000
--- a/sys-cluster/kubeletctl/kubeletctl-1.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-GIT_COMMIT=27d895fb207c9367a2d516f739578bbcb5db0368
-
-DESCRIPTION="A client for kubelet"
-HOMEPAGE="https://github.com/cyberark/kubeletctl"
-SRC_URI="https://github.com/cyberark/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT+=" test"
-
-src_compile() {
-	go build -ldflags "-s -w" || die
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README.md
-}
diff --git a/sys-cluster/kubelogin/kubelogin-1.31.0.ebuild b/sys-cluster/kubelogin/kubelogin-1.31.0.ebuild
index 3df1f523fb01..d159d670feb0 100644
--- a/sys-cluster/kubelogin/kubelogin-1.31.0.ebuild
+++ b/sys-cluster/kubelogin/kubelogin-1.31.0.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
@@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 src_compile() {
 	ego build -ldflags="-s -w" -o ./bin/${PN} .
diff --git a/sys-cluster/kubeseal/Manifest b/sys-cluster/kubeseal/Manifest
index 2e9a23a777c0..a1df54bee664 100644
--- a/sys-cluster/kubeseal/Manifest
+++ b/sys-cluster/kubeseal/Manifest
@@ -1,4 +1,4 @@
-DIST sealed-secrets-0.27.0-deps.tar.xz 60336560 BLAKE2B 65c924910efa021458cbeb655fb96e7acbb7b29437ec333c9f49715b7d0bc297528ccdbeb320a8a0ade1a5d573cd9d5244382021bedf9e3f7c1ba7e7a34cb6c0 SHA512 94991e07b3880dd3d3d9b8eb063f2b8e9b80ef9ad0306aa8d1b03b878b0b31dd9964369c558a7dabbe12f4892a7cd3d84aac908df3bd5ecf3bc922118164d179
-DIST sealed-secrets-0.27.0.tar.gz 1319412 BLAKE2B fc55021494794bbc79c008b4c6e6e780f792d2f50bc93fa7cd27648b2695e90ac43bef79654ed7b84af7e8f7fb43135871c69c6573fdf1146e8a4ca1663370ac SHA512 7327167228a5ecc680c90baf8493b14f331d3269c9a65da9bb1da8db291828f6d1625372f2d28d236be19b81bf9aeface7d7c99b8be3debfccb6fe0679652ea9
 DIST sealed-secrets-0.27.2-deps.tar.xz 129850688 BLAKE2B 04f760ea4ee66e1362fa312aedd89b3ccfbef25f79cfd835edf58ac12b9e94c246a2d10036a2d030f340828ed0c7feff5f794cc30ade31c824ca5cd4182f1f66 SHA512 6d037db955ed9098898fa88cdbc91dbdd5cd8adf8a639ce16f5947b09757cb6ac530aaa637eadfe296ee3ae8660f7648d83ea65e2a3a81d6e56c72a5490f8d9f
 DIST sealed-secrets-0.27.2.tar.gz 1322504 BLAKE2B bfdb27fc6353182758e7dacfc20c3adebac78075f8bac92b6bdab3021df9a1fbcfe4d2198ec63c45146ceba8a35a155acdd2b5c0125996e7432d77bcd0e539ba SHA512 6698785d6ae6b149f550b867c97c8f130d5892c232c4db5a01ea4aa5361534e9c1b6424d447f82822ba04f1b187426a42650fe9091549a930cd9395c4396286d
+DIST sealed-secrets-0.27.3-deps.tar.xz 130068760 BLAKE2B dbc2ce1c8626de04d3ce21f27829325f0f3add16ab8bfdcd2707c8212e94841690b12e3945e3966c1a079aec5b320da91422264bc7a79f7c26ab831c4a6ec2d9 SHA512 b62a4fadf1c8056aca8c398182b2964821524454242067e8c139eb49b37bf1218a607caaa39de0943ef3e3b2d6e4362ac2a5b547283b150e94675ed52ff66fbc
+DIST sealed-secrets-0.27.3.tar.gz 1321624 BLAKE2B 174397bc0eb4029bb172d45fd4dd41499fdd6986f87a70a558a4b2fa8829d3ad429d08c518390e3bcc05bebb704103214c238206c736475c0549a62fb5c62904 SHA512 78235bdc512c43f724ef1f7527ac393f8415e7c2d079a7b8a082a462e7a399a53995a628af637569d54fe1355d67830642f1e05db645a32f6413acba80542836
diff --git a/sys-cluster/kubeseal/kubeseal-0.27.0.ebuild b/sys-cluster/kubeseal/kubeseal-0.27.0.ebuild
deleted file mode 100644
index 8cc013af567b..000000000000
--- a/sys-cluster/kubeseal/kubeseal-0.27.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-MY_PN="sealed-secrets"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Client-side utility for one-way encrypted secrets in kubernetes"
-HOMEPAGE="https://github.com/bitnami-labs/sealed-secrets"
-SRC_URI="https://github.com/bitnami-labs/sealed-secrets/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${MY_P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.19"
-
-RESTRICT+=" test"
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" VERSION="v${PV}" ${PN}
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/sys-cluster/kubeseal/kubeseal-0.27.3.ebuild b/sys-cluster/kubeseal/kubeseal-0.27.3.ebuild
new file mode 100644
index 000000000000..a19435e80808
--- /dev/null
+++ b/sys-cluster/kubeseal/kubeseal-0.27.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+MY_PN="sealed-secrets"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Client-side utility for one-way encrypted secrets in kubernetes"
+HOMEPAGE="https://github.com/bitnami-labs/sealed-secrets"
+SRC_URI="https://github.com/bitnami-labs/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${MY_P}-deps.tar.xz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 BSD ISC MIT"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+BDEPEND=">=dev-lang/go-1.19"
+
+RESTRICT+=" test"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" VERSION="v${PV}" ${PN}
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/sys-cluster/lmod/Manifest b/sys-cluster/lmod/Manifest
index 19f9a0fedbe0..b996d75f4bd6 100644
--- a/sys-cluster/lmod/Manifest
+++ b/sys-cluster/lmod/Manifest
@@ -1,2 +1,3 @@
 DIST lmod-8.6.14.tar.gz 15804818 BLAKE2B 5a5f076cb7121d073de456da3ad2937127c013cc47d0f389eaf00f9923b571bc4c941f8efd5cc527628d14d328d696e27e062629b4eede2f4c0273cc7015293e SHA512 b14acf4a008ccfe04d12352664bc6d4afe87a677803534ea7ccf9c3adb012a3df83edfb205e39f3d0e65db418f16dbce70871932d90b837924b889dc1829e672
 DIST lmod-8.7.23.tar.gz 20609950 BLAKE2B 20b2028c15a602f7b165eae342a83a238313d37ea4669e08c5ff22c47ae4e18e3190c83739bc6e39178b60d9e3ed19c7ade20466a65833e28677ca56799aa065 SHA512 029be9c08dbe3f3f8fd5c034eaab94746679b8403d8c401bc76b18b800f4f72d21f14b0a71fe20d2c1546b8b9d6f2e032226ea3528992ea6cdab8f02c2a5d99d
+DIST lmod-8.7.55.tar.gz 29572901 BLAKE2B a898fbcf738870035548d47ef79651904c31c67476d70434ab9fbd1ff2bee35aa66a65cfa5e2c64a040773521b63da62137d8c7cb93d60b85882fe31f4d345c6 SHA512 d278ef77f58dc67685415410dfe0de3ccf03c6a6507e74b9ce084057c6e6c0b1e881f03e0c8c3b2f35a014266a773a5b5d3a58ba9853bd77c4cddc7755400401
diff --git a/sys-cluster/lmod/files/lmod-8.7.55-fix-bashism-in-configure-script.patch b/sys-cluster/lmod/files/lmod-8.7.55-fix-bashism-in-configure-script.patch
new file mode 100644
index 000000000000..cbea09516b53
--- /dev/null
+++ b/sys-cluster/lmod/files/lmod-8.7.55-fix-bashism-in-configure-script.patch
@@ -0,0 +1,256 @@
+From 46c7622bf324fd61f032065053661a71b0c92af0 Mon Sep 17 00:00:00 2001
+From: Robert McLay <mclay@zaniahgroup.com>
+Date: Tue, 24 Dec 2024 15:52:07 -0700
+Subject: [PATCH] Issue #741: Change configure.ac to use only dash compatible
+ code
+
+---
+ configure                 | 24 ++++++++++++------------
+ configure.ac              | 24 ++++++++++++------------
+ proj_mgmt/DATE_cmd.sh     |  2 +-
+ proj_mgmt/convert_mode.sh |  2 +-
+ rt/end2end/end2end.tdesc  |  3 +--
+ 5 files changed, 27 insertions(+), 28 deletions(-)
+
+diff --git a/configure b/configure
+index 6c335867c..fc0015b5c 100755
+--- a/configure
++++ b/configure
+@@ -4435,7 +4435,7 @@ fi
+ if test ${with_lua+y}
+ then :
+   withval=$with_lua; PATH_TO_LUA="$withval"
+-    if test ${PATH_TO_LUA:0:1} != '/' ; then
++    if test $(printf %.1s "$PATH_TO_LUA") != '/' ; then
+       echo
+       echo "ERROR: Path to lua must be absolute!"
+       exit 1
+@@ -4459,7 +4459,7 @@ fi
+ if test ${with_luac+y}
+ then :
+   withval=$with_luac; PATH_TO_LUAC="$withval"
+-    if test ${PATH_TO_LUAC:0:1} != '/' ; then
++    if test $(printf %.1s "$PATH_TO_LUAC") != '/' ; then
+       echo
+       echo "ERROR: Path to luac must be absolute"
+       exit 1
+@@ -4735,7 +4735,7 @@ PATH_TO_SRC=$SRCDIR
+ 
+ 
+ 
+-if test $MODE == "user_default" ; then
++if test $MODE = "user_default" ; then
+   mode=0755
+   EXEC_BITS=$(( 0111 & $mode ));
+   if test $EXEC_BITS = 0; then
+@@ -5403,14 +5403,14 @@ test -n "$PATH_TO_LS" || PATH_TO_LS=""""
+ 
+ ##### LUA configuration -- start
+ 
+-if ! command -v $PATH_TO_LUA &>/dev/null ; then
++if ! (command -v $PATH_TO_LUA &>/dev/null) ; then
+   echo 'The program "'$PATH_TO_LUA'" must be in your path'
+   rm -f makefile
+   exit 1
+ fi
+ 
+ if test "${LUA_SUFFIX}" != no ; then
+-   if test "${PATH_TO_LUA:0:1}" = '/' -o "${PATH_TO_LUAC:0:1}" = '/'; then
++   if test $(printf %.1s "$PATH_TO_LUA") = '/' -o $(printf %.1s "$PATH_TO_LUA") = '/'; then
+       echo "Neither --with-lua= nor --with-luac= can be used with --with-luaSuffix="
+       rm -f makefile
+       exit 1
+@@ -5420,10 +5420,10 @@ if test "${LUA_SUFFIX}" != no ; then
+    echo "1) PATH_TO_LUA: $PATH_TO_LUA"
+ else
+    mismatch=
+-   if test "${PATH_TO_LUA:0:1}" = '/' -a "${PATH_TO_LUAC:0:1}" != '/'; then
++   if test $(printf %.1s "$PATH_TO_LUA") = '/' -a $(printf %.1s "$PATH_TO_LUA") != '/'; then
+       mismatch="true"
+    fi
+-   if test "${PATH_TO_LUA:0:1}" != '/' -a "${PATH_TO_LUAC:0:1}" = '/'; then
++   if test $(printf %.1s "$PATH_TO_LUA") != '/' -a $(printf %.1s "$PATH_TO_LUA") = '/'; then
+       mismatch="true"
+    fi
+    if test "$mismatch" = true ; then
+@@ -5433,13 +5433,13 @@ else
+    fi
+ fi
+ 
+-if ! command -v $PATH_TO_LUA &>/dev/null ; then
++if ! (command -v $PATH_TO_LUA &>/dev/null) ; then
+   echo 'The program "'$PATH_TO_LUA'" must be in your path'
+   rm -f makefile
+   exit 1
+ fi
+ 
+-if test ${PATH_TO_LUA:0:1} != '/' ; then
++if test $(printf %.1s "$PATH_TO_LUA") != '/' ; then
+   # Extract the first word of "$PATH_TO_LUA", so it can be a program name with args.
+ set dummy $PATH_TO_LUA; ac_word=$2
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+@@ -5488,13 +5488,13 @@ fi
+   PATH_TO_LUA=$(FOLLOW_READLINK $FIND_PATH_TO_LUA)
+ fi
+ 
+-if ! command -v $PATH_TO_LUAC &>/dev/null ; then
++if ! (command -v $PATH_TO_LUAC &>/dev/null) ; then
+   echo 'The program "'$PATH_TO_LUAC'" must be in your path'
+   rm -f makefile
+   exit 1
+ fi
+ 
+-if test "${PATH_TO_LUAC:0:1}" != '/' ; then
++if test $(printf %.1s "$PATH_TO_LUA") != '/' ; then
+   # Extract the first word of "$PATH_TO_LUAC", so it can be a program name with args.
+ set dummy $PATH_TO_LUAC; ac_word=$2
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+@@ -5589,7 +5589,7 @@ printf "checking for lua modules: posix"
+ 
+ missingModules=""
+ for i in posix; do
+-  if ! $PATH_TO_LUA $ac_confdir/proj_mgmt/luaModuleAvailable $i 2> /dev/null ; then
++  if ! ($PATH_TO_LUA $ac_confdir/proj_mgmt/luaModuleAvailable $i 2> /dev/null) ; then
+     missingModules="$missingModules $i"
+   fi
+ done
+diff --git a/configure.ac b/configure.ac
+index 1c9f0645a..90fb56d84 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -678,7 +678,7 @@ AC_SUBST(PATH_TO_LUA)
+ AC_ARG_WITH(lua,
+     AS_HELP_STRING([--with-lua=ans],[absolute path to the lua interpreter to use [[lua]]]),
+     PATH_TO_LUA="$withval"
+-    if test ${PATH_TO_LUA:0:1} != '/' ; then
++    if test $(printf %.1s "$PATH_TO_LUA") != '/' ; then
+       echo 
+       echo "ERROR: Path to lua must be absolute!"
+       exit 1
+@@ -695,7 +695,7 @@ AC_SUBST(PATH_TO_LUAC)
+ AC_ARG_WITH(luac,
+     AS_HELP_STRING([--with-luac=ans],[absolute path to the luac interpreter to use [[luac]]]),
+     PATH_TO_LUAC="$withval"
+-    if test ${PATH_TO_LUAC:0:1} != '/' ; then
++    if test $(printf %.1s "$PATH_TO_LUAC") != '/' ; then
+       echo 
+       echo "ERROR: Path to luac must be absolute"
+       exit 1
+@@ -816,7 +816,7 @@ AC_SUBST(PATH_TO_HASHSUM)
+ AC_SUBST(PATH_TO_PAGER)
+ AC_SUBST(PATH_TO_TCLSH)
+ 
+-if test $MODE == "user_default" ; then
++if test $MODE = "user_default" ; then
+   mode=0755
+   EXEC_BITS=$(( 0111 & $mode ));
+   if test $EXEC_BITS = 0; then
+@@ -909,14 +909,14 @@ AC_PATH_PROGS(PATH_TO_LS, [gls] [ls], "")
+ 
+ ##### LUA configuration -- start
+ 
+-if ! command -v $PATH_TO_LUA &>/dev/null ; then
++if ! (command -v $PATH_TO_LUA &>/dev/null) ; then
+   echo 'The program "'$PATH_TO_LUA'" must be in your path'
+   rm -f makefile
+   exit 1
+ fi
+ 
+ if test "${LUA_SUFFIX}" != no ; then
+-   if test "${PATH_TO_LUA:0:1}" = '/' -o "${PATH_TO_LUAC:0:1}" = '/'; then
++   if test $(printf %.1s "$PATH_TO_LUA") = '/' -o $(printf %.1s "$PATH_TO_LUA") = '/'; then
+       echo "Neither --with-lua= nor --with-luac= can be used with --with-luaSuffix="
+       rm -f makefile
+       exit 1
+@@ -926,10 +926,10 @@ if test "${LUA_SUFFIX}" != no ; then
+    echo "1) PATH_TO_LUA: $PATH_TO_LUA"
+ else   
+    mismatch=
+-   if test "${PATH_TO_LUA:0:1}" = '/' -a "${PATH_TO_LUAC:0:1}" != '/'; then
++   if test $(printf %.1s "$PATH_TO_LUA") = '/' -a $(printf %.1s "$PATH_TO_LUA") != '/'; then
+       mismatch="true"
+    fi
+-   if test "${PATH_TO_LUA:0:1}" != '/' -a "${PATH_TO_LUAC:0:1}" = '/'; then
++   if test $(printf %.1s "$PATH_TO_LUA") != '/' -a $(printf %.1s "$PATH_TO_LUA") = '/'; then
+       mismatch="true"
+    fi
+    if test "$mismatch" = true ; then
+@@ -939,24 +939,24 @@ else
+    fi   
+ fi
+ 
+-if ! command -v $PATH_TO_LUA &>/dev/null ; then
++if ! (command -v $PATH_TO_LUA &>/dev/null) ; then
+   echo 'The program "'$PATH_TO_LUA'" must be in your path'
+   rm -f makefile
+   exit 1
+ fi
+ 
+-if test ${PATH_TO_LUA:0:1} != '/' ; then
++if test $(printf %.1s "$PATH_TO_LUA") != '/' ; then
+   AC_PATH_PROG(FIND_PATH_TO_LUA, $PATH_TO_LUA)
+   PATH_TO_LUA=$(FOLLOW_READLINK $FIND_PATH_TO_LUA)
+ fi
+ 
+-if ! command -v $PATH_TO_LUAC &>/dev/null ; then
++if ! (command -v $PATH_TO_LUAC &>/dev/null) ; then
+   echo 'The program "'$PATH_TO_LUAC'" must be in your path'
+   rm -f makefile
+   exit 1
+ fi
+ 
+-if test "${PATH_TO_LUAC:0:1}" != '/' ; then
++if test $(printf %.1s "$PATH_TO_LUA") != '/' ; then
+   AC_PATH_PROG(FIND_PATH_TO_LUAC, $PATH_TO_LUAC)
+   PATH_TO_LUAC=$(FOLLOW_READLINK $FIND_PATH_TO_LUAC)
+ fi
+@@ -1007,7 +1007,7 @@ printf "checking for lua modules: posix"
+ 
+ missingModules=""
+ for i in posix; do
+-  if ! $PATH_TO_LUA $ac_confdir/proj_mgmt/luaModuleAvailable $i 2> /dev/null ; then
++  if ! ($PATH_TO_LUA $ac_confdir/proj_mgmt/luaModuleAvailable $i 2> /dev/null) ; then
+     missingModules="$missingModules $i"
+   fi
+ done
+diff --git a/proj_mgmt/DATE_cmd.sh b/proj_mgmt/DATE_cmd.sh
+index 1c01fd3ba..059cfc07e 100755
+--- a/proj_mgmt/DATE_cmd.sh
++++ b/proj_mgmt/DATE_cmd.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash 
++#!/bin/sh
+ # -*- shell-script -*-
+ 
+ arg="$1"
+diff --git a/proj_mgmt/convert_mode.sh b/proj_mgmt/convert_mode.sh
+index e56627ee3..51ada7521 100755
+--- a/proj_mgmt/convert_mode.sh
++++ b/proj_mgmt/convert_mode.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ # -*- shell-script -*-
+ 
+ KIND=$1
+diff --git a/rt/end2end/end2end.tdesc b/rt/end2end/end2end.tdesc
+index 8371d7fff..bc749ed08 100644
+--- a/rt/end2end/end2end.tdesc
++++ b/rt/end2end/end2end.tdesc
+@@ -29,7 +29,6 @@ testdescript = {
+      DIR=Lmod
+      dir=lmod
+ 
+-
+      remove_generated_lmod_files build b0 lmod results.csv
+ 
+      GIT_BRANCH=`git status | head -n 1 | sed -e 's/^[# ]*On branch //g' -e 's/^[# ]*HEAD detached at//g'`
+@@ -37,7 +36,7 @@ testdescript = {
+      LmodV=`$LUA_EXEC $projectDir/src/$CMD bash --dumpversion 2>&1`
+      echo LmodV=$LmodV
+      mkdir b0
+-     (cd b0; $(projectDir)/configure --prefix=$(outputDir)/b0 --with-useBuiltinPkgs=yes)
++     (cd b0; sh $(projectDir)/configure --prefix=$(outputDir)/b0 --with-useBuiltinPkgs=yes)
+      (cd $(projectDir); make -f $(outputDir)/b0/makefile dist GIT_BRANCH=$GIT_BRANCH)
+      tar xf $projectDir/${DIR}-$LmodV.tar.bz2
+      rm -rf $projectDir/${DIR}-$LmodV.tar.bz2
diff --git a/sys-cluster/lmod/lmod-8.7.55.ebuild b/sys-cluster/lmod/lmod-8.7.55.ebuild
new file mode 100644
index 000000000000..fe5982b75cb2
--- /dev/null
+++ b/sys-cluster/lmod/lmod-8.7.55.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} )
+inherit autotools lua-single prefix
+
+DESCRIPTION="Environment Module System based on Lua"
+HOMEPAGE="https://lmod.readthedocs.io/en/latest https://github.com/TACC/Lmod"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TACC/Lmod"
+else
+	SRC_URI="https://github.com/TACC/Lmod/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/Lmod-${PV}
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+auto-swap +cache duplicate-paths test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}
+	dev-lang/tcl
+	dev-lang/tk
+	$(lua_gen_cond_dep '
+		>=dev-lua/luafilesystem-1.8.0[${LUA_USEDEP}]
+		dev-lua/luajson[${LUA_USEDEP}]
+		dev-lua/luaposix[${LUA_USEDEP}]
+		dev-lua/lua-term[${LUA_USEDEP}]
+	')
+"
+BDEPEND="${RDEPEND}
+	app-alternatives/bc
+	test? (
+		$(lua_gen_cond_dep '
+			dev-util/hermes[${LUA_SINGLE_USEDEP}]
+		')
+		app-shells/tcsh
+	)
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.4.19-no-libsandbox.patch
+	"${FILESDIR}"/${P}-fix-bashism-in-configure-script.patch
+)
+
+pkg_pretend() {
+	elog "You can control the siteName and syshost settings by"
+	elog "using the variables LMOD_SITENAME and LMOD_SYSHOST, during"
+	elog "build time, which are both set to 'Gentoo' by default."
+	elog "There are a lot of options for this package, especially"
+	elog "for run time behaviour. Remember to use the EXTRA_ECONF variable."
+	elog "To see full list of options visit:"
+	elog "\t https://lmod.readthedocs.io/en/latest/090_configuring_lmod.html"
+}
+
+src_prepare() {
+	default
+	rm -r pkgs/{luafilesystem,term} || die
+	rm -r rt/{ck_mtree_syntax,colorize,end2end,help,ifur,settarg} || die
+	hprefixify -w '/#\!\/bin\/tcsh/' rt/csh_swap/csh_swap.tdesc || die
+	eautoreconf
+}
+
+src_configure() {
+	local LMOD_SITENAME="${LMOD_SITENAME:-Gentoo}"
+	local LMOD_SYSHOST="${LMOD_SYSHOST:-Gentoo}"
+
+	local LUAC="${LUA%/*}/luac${LUA#*lua}"
+
+	local myconf=(
+		--with-tcl
+		--with-fastTCLInterp
+		--with-colorize
+		--with-supportKsh
+		--without-useBuiltinPkgs
+		--with-siteControlPrefix
+		--with-siteName="${LMOD_SITENAME}"
+		--with-syshost="${LMOD_SYSHOST}"
+		--with-lua_include="$(lua_get_include_dir)"
+		--with-lua="${LUA}"
+		--with-luac="${LUAC}"
+		--with-module-root-path="${EPREFIX}/etc/modulefiles"
+		--with-spiderCacheDir="${EPREFIX}/etc/lmod_cache/spider_cache"
+		--with-updateSystemFn="${EPREFIX}/etc/lmod_cache/system.txt"
+		--prefix="${EPREFIX}/usr/share/Lmod"
+		--with-caseIndependentSorting
+		--without-hiddenItalic
+		--with-exportedModuleCmd
+		--without-redirect
+		--with-extendedDefault
+		$(use_with cache cachedLoads)
+		$(use_with duplicate-paths duplicatePaths)
+		$(use_with auto-swap autoSwap)
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+	default
+}
+
+src_test() {
+	local -x PATH="${EPREFIX}/opt/hermes/bin:${PATH}"
+	tm -vvv || die
+	testcleanup || die
+}
+
+src_install() {
+	dosym -r /usr/share/Lmod/init/profile /etc/bash/bashrc.d/z00_lmod.sh
+	dosym -r /usr/share/Lmod/init/profile /etc/profile.d/z00_lmod.sh
+	dosym -r /usr/share/Lmod/init/cshrc /etc/profile.d/z00_lmod.csh
+	dosym -r /usr/share/Lmod/init/profile.fish /etc/fish/conf.d/z00_lmod.fish
+	default
+	newman "${FILESDIR}"/module.1-8.4.20 module.1
+	# not a real man page
+	rm -r "${ED}"/usr/share/Lmod/share/man || die
+	doenvd "${FILESDIR}"/99lmod
+	keepdir /etc/modulefiles
+	keepdir /etc/lmod_cache
+}
+
+pkg_postinst() {
+	if use cache ; then
+		elog "Lmod spider cache has been enabled."
+		elog "Remember to update the spider cache with"
+		elog "/usr/share/Lmod/libexec/update_lmod_system_cache_files \ "
+		elog "\t \$MODULEPATH"
+	fi
+}
diff --git a/sys-cluster/lmod/lmod-9999.ebuild b/sys-cluster/lmod/lmod-9999.ebuild
index b2d53897161a..df3ca153a574 100644
--- a/sys-cluster/lmod/lmod-9999.ebuild
+++ b/sys-cluster/lmod/lmod-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..3} )
 inherit autotools lua-single prefix
@@ -33,16 +33,16 @@ RDEPEND="${LUA_DEPS}
 		dev-lua/luaposix[${LUA_USEDEP}]
 		dev-lua/lua-term[${LUA_USEDEP}]
 	')
-	virtual/pkgconfig
 "
-DEPEND="${RDEPEND}"
 BDEPEND="${RDEPEND}
+	app-alternatives/bc
 	test? (
 		$(lua_gen_cond_dep '
 			dev-util/hermes[${LUA_SINGLE_USEDEP}]
 		')
 		app-shells/tcsh
 	)
+	virtual/pkgconfig
 "
 
 PATCHES=( "${FILESDIR}"/${PN}-8.4.19-no-libsandbox.patch )
@@ -90,7 +90,6 @@ src_configure() {
 		--with-caseIndependentSorting
 		--without-hiddenItalic
 		--with-exportedModuleCmd
-		--with-useDotFiles
 		--without-redirect
 		--with-extendedDefault
 		$(use_with cache cachedLoads)
@@ -112,6 +111,10 @@ src_test() {
 }
 
 src_install() {
+	dosym -r /usr/share/Lmod/init/profile /etc/bash/bashrc.d/z00_lmod.sh
+	dosym -r /usr/share/Lmod/init/profile /etc/profile.d/z00_lmod.sh
+	dosym -r /usr/share/Lmod/init/cshrc /etc/profile.d/z00_lmod.csh
+	dosym -r /usr/share/Lmod/init/profile.fish /etc/fish/conf.d/z00_lmod.fish
 	default
 	newman "${FILESDIR}"/module.1-8.4.20 module.1
 	# not a real man page
diff --git a/sys-cluster/virtctl/Manifest b/sys-cluster/virtctl/Manifest
new file mode 100644
index 000000000000..83b0d9e7e8e8
--- /dev/null
+++ b/sys-cluster/virtctl/Manifest
@@ -0,0 +1,2 @@
+DIST kubevirt-1.4.0-deps.tar.xz 178508248 BLAKE2B ac2e4de8e09071c113f996e55b3ef641c3bbf3ce69b9ab4ea1c343e0190a87d8baa3dc1fb774488fcca7541d7b48dd07688c021d4fe67d76eab9e9b2847737d1 SHA512 f83139256733b7bf214ad239a72ffa73bff4d504035d485c3fae14baffe8c7dee25ad9c4a9d641c18c0ed092e0f24f81590992136cb0db71c17a2ba56538519a
+DIST kubevirt-1.4.0.tar.gz 17785897 BLAKE2B 3f9aa1cd315686991292f5b33ac5899967cac26282a81dd6c746eb3071bb8b012b8f466684eb9b17d4112fd471056502dd7f516e3bb42620441a342a950b23cd SHA512 203dd84bc867961faa97c4ae44e6726911bd06fc50b50f6bbf62cd6b0a232bfe6ce5fdd87ee825563e4bdcd4c566566e4bf1ebcd19737061c2c2934099e80114
diff --git a/sys-cluster/virtctl/metadata.xml b/sys-cluster/virtctl/metadata.xml
new file mode 100644
index 000000000000..eac75f1c467d
--- /dev/null
+++ b/sys-cluster/virtctl/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>concord@gentoo.org</email>
+		<name>Kenton Groombridge</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kubevirt/kubevirt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-cluster/virtctl/virtctl-1.4.0.ebuild b/sys-cluster/virtctl/virtctl-1.4.0.ebuild
new file mode 100644
index 000000000000..42ef20d269ab
--- /dev/null
+++ b/sys-cluster/virtctl/virtctl-1.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module optfeature
+
+# git rev-parse HEAD
+MY_GIT_COMMIT="e8e638edc22587ec7be2cc3d983b61763e33f973"
+
+MY_PN="kubevirt"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Control virtual machine related operations on your kubernetes cluster"
+HOMEPAGE="https://kubevirt.io https://github.com/kubevirt/kubevirt"
+SRC_URI="https://github.com/kubevirt/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${MY_P}-deps.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 BSD-2 BSD ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+src_compile() {
+	ego build -o ./bin/virtctl -ldflags "
+		-X kubevirt.io/client-go/version.buildDate=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+		-X kubevirt.io/client-go/version.gitCommit=${MY_GIT_COMMIT}
+		-X kubevirt.io/client-go/version.gitTreeState=clean
+		-X kubevirt.io/client-go/version.gitVersion=v${PV}
+		" ./cmd/virtctl
+}
+
+src_install() {
+	dobin bin/virtctl
+
+	bin/virtctl completion bash >./virtctl.bash || die "Failed generating bash completions"
+	newbashcomp ./virtctl.bash virtctl
+
+	bin/virtctl completion zsh >./virtctl.zsh || die "Failed generating zsh completions"
+	insinto /usr/share/zsh/site-functions
+	newins ./virtctl.zsh _virtctl
+}
+
+pkg_postinst() {
+	optfeature "graphical console for use with VNC connections" app-emulation/virt-viewer
+}
diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest
index 6a037663f28f..89a797708e32 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -1,2 +1,3 @@
 DIST bc-1.07.1.tar.gz 419850 BLAKE2B dcedc193be5521aa0fa3a19746233ed65bc1fe8ef12e15155341706de6fbeecb6dd7ee4ab11e2d4b3aca2ae7097cce89e389b3573493bbc893e00b4ed3239594 SHA512 02126d0db6b6ed06d56cfc292d6f5475ff1e574779d7e69c7809bbb1e13f946f57ea07da2a7666baa092507a951a822044b0970075f75eefe65a5c1999b75d34
 DIST bc-1.08.0.tar.gz 452231 BLAKE2B f42af858507e72171caf0786ca7b72506d79c93a73aa1816a6471798f63d831c14f66cab6fd5af624a21a09b9930772ebf2e791c06f043b45e8b5893134481c7 SHA512 6ce5b510ad7aa8b489d0c3f060c34cf738da33fde4dda8398d9f75fabadef16d9b423ae8752881eff395b10088cd9d9fb16868c578b0950008f1ee08d12be197
+DIST bc-1.08.1.tar.gz 458434 BLAKE2B 51d1bac17f31bb7dbb044c28752cccfe59dd5bcb78a2c3bfa66a345577ea3aee37fef8d7efae83a57e41ae77d7317008f3682dfbc3165c76888770636deead01 SHA512 256c94833ead8029122d3ba6475cf4ff030c208a5bd3e2e9c5c8888467215e0fa9ab34e4226791bbd6e47498c0c61f0dc6399eecb0c8cf6a43453e84911c1847
diff --git a/sys-devel/bc/bc-1.08.1.ebuild b/sys-devel/bc/bc-1.08.1.ebuild
new file mode 100644
index 000000000000..0a08fa03bab1
--- /dev/null
+++ b/sys-devel/bc/bc-1.08.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Handy console-based calculator utility"
+HOMEPAGE="https://www.gnu.org/software/bc/bc.html"
+SRC_URI="mirror://gnu/bc/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+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"
+IUSE="libedit readline static"
+
+RDEPEND="
+	!readline? ( libedit? ( dev-libs/libedit:= ) )
+	readline? (
+		sys-libs/readline:=
+		sys-libs/ncurses:=
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	app-alternatives/yacc
+"
+PDEPEND="app-alternatives/bc"
+
+src_configure() {
+	local myconf=(
+		$(use_with readline)
+		--program-suffix=-reference
+	)
+
+	if use readline ; then
+		myconf+=( --without-libedit )
+	else
+		myconf+=( $(use_with libedit) )
+	fi
+
+	use static && append-ldflags -static
+
+	# The libedit code isn't compatible currently. #830101
+	use libedit && append-flags -fcommon
+
+	# AC_SYS_LARGEFILE in configure.ac would handle this, but we don't patch
+	# autotools otherwise currently.  This change has been sent upstream, but
+	# who knows when they'll make another release.
+	append-lfs-flags
+
+	# configure dies with other lexes:
+	# "configure: error: readline works only with flex."
+	export LEX=flex
+
+	econf "${myconf[@]}"
+
+	# Do not regen docs -- configure produces a small fragment that includes
+	# the version info which causes all pages to regen (newer file). Bug #554774
+	touch -r doc doc/* || die
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+pkg_postinst() {
+	# ensure to preserve the symlinks before app-alternatives/bc
+	# is installed
+	local x
+	for x in bc dc ; do
+		if [[ ! -h ${EROOT}/usr/bin/${x} ]] ; then
+			ln -s "${x}-reference" "${EROOT}/usr/bin/${x}" || die
+		fi
+	done
+}
diff --git a/sys-devel/binutils/binutils-2.43-r2.ebuild b/sys-devel/binutils/binutils-2.43-r2.ebuild
index ec5d17d21413..3771850d2087 100644
--- a/sys-devel/binutils/binutils-2.43-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.43-r2.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=7
diff --git a/sys-devel/binutils/binutils-2.43.9999.ebuild b/sys-devel/binutils/binutils-2.43.9999.ebuild
index a2146d703da6..1aaa2aa7ea05 100644
--- a/sys-devel/binutils/binutils-2.43.9999.ebuild
+++ b/sys-devel/binutils/binutils-2.43.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=7
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index b262083b7c2f..cf451757ad6c 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-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=7
diff --git a/sys-devel/bpf-toolchain/bpf-toolchain-14.2.0_p1.ebuild b/sys-devel/bpf-toolchain/bpf-toolchain-14.2.0_p1.ebuild
index a166f045908d..3644b4e4e259 100644
--- a/sys-devel/bpf-toolchain/bpf-toolchain-14.2.0_p1.ebuild
+++ b/sys-devel/bpf-toolchain/bpf-toolchain-14.2.0_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,7 +40,7 @@ LICENSE="
 	LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 )
 "
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+bin-symlinks custom-cflags +strip"
 
 RDEPEND="
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index e975ab1e55a7..359fd20db6dc 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,3 +1,4 @@
 DIST crossdev-20240921.tar.xz 31008 BLAKE2B 9daeabcbeefa32624d71b86c5ddeb1f6bf6ccdf4e6f590bf7517388d4d68b73ae2651ca09d122f128f002568127bd5d7d767db9d6c043e5330b62c3104929848 SHA512 6b7f0bce309d2b0a8fdf9b28cf72098de9dafaf7f338a8308e94e2068cefc15cd2407eee39a9eeb0ea0a1bc46569cedc69a51bb01f140faebe374b660cb1cdf6
 DIST crossdev-20241202.tar.xz 33032 BLAKE2B 74ec859e1ae5f816397349c18f8bd98d8fae2f4de471112d70621767733a6c91dfffaabb33afc4bdabf5bed31b83a0cdf8afaffaba3e0df95f70d43cf249fb94 SHA512 c6a8c534135aa15b2005546d3f006953570de1e54ae3d3170c71bed62f044c2db79412ecde3b91fd85fca92e7c996762ba086db29c6132f6f1d9e9a48f1e79ea
 DIST crossdev-20241215.tar.xz 33028 BLAKE2B 3b33284f55fe41a45bfeea1dbc273a828eeceada38d4274f9fcaab06a1d9b342efaa0fcad407bb5a5d921515acc18dac0e4923240e2610a425f7c508b6274ecd SHA512 84960b518767aacc7400cfa32d36b15492dd5e3908c36c0f513470fdfbaedde04d24aecaf0f5020bf69cd7c2095da1cc2961ae090e90340a176292299bbfaf25
+DIST crossdev-20250106.tar.xz 33124 BLAKE2B 45992cd29a6dd48f97d871ba5f4b09b18797c76389a5839c7b02e23b765556561f9b442d594a6bed58ff670e69d4efc27f37cdb1f6bb1722fd1d18e0bc50cc5f SHA512 8d9cdb194f3477dcbe605c4f8126be013e9193acb716e2b12e8f51f826087bbac3f50b44268c150d4e9f86b78182a0b4b323634b0040f0a815dc4a075c662c75
diff --git a/sys-devel/crossdev/crossdev-20241215.ebuild b/sys-devel/crossdev/crossdev-20241215.ebuild
index 969b5344819d..e37bcc5ed9c1 100644
--- a/sys-devel/crossdev/crossdev-20241215.ebuild
+++ b/sys-devel/crossdev/crossdev-20241215.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 @@ if [[ ${PV} == "99999999" ]] ; then
 	"
 else
 	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/crossdev/crossdev-20250106.ebuild b/sys-devel/crossdev/crossdev-20250106.ebuild
new file mode 100644
index 000000000000..8c7f0315b59a
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-20250106.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/crossdev.git
+		https://github.com/gentoo/crossdev
+	"
+else
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo Cross-toolchain generator"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	>=sys-apps/portage-2.1
+	app-shells/bash
+	sys-apps/gentoo-functions
+	sys-apps/config-site
+"
+BDEPEND="app-arch/xz-utils"
+
+src_install() {
+	default
+
+	if [[ ${PV} == "99999999" ]] ; then
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
+	fi
+
+	dodir /usr/share/config.site.d
+	mv "${ED}"/usr/share/config.site{,.d/80crossdev.conf} || die
+}
diff --git a/sys-devel/dwz/dwz-0.15-r4.ebuild b/sys-devel/dwz/dwz-0.15-r4.ebuild
index 4a04a9c3a97b..ab72b7fe628c 100644
--- a/sys-devel/dwz/dwz-0.15-r4.ebuild
+++ b/sys-devel/dwz/dwz-0.15-r4.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
 	S="${WORKDIR}/${PN}"
 
 	#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-2+ GPL-3+"
diff --git a/sys-devel/dwz/dwz-9999.ebuild b/sys-devel/dwz/dwz-9999.ebuild
index 8ce1dc9e912c..8e0c26c75f09 100644
--- a/sys-devel/dwz/dwz-9999.ebuild
+++ b/sys-devel/dwz/dwz-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
@@ -14,7 +14,7 @@ else
 	SRC_URI="https://sourceware.org/ftp/dwz/releases/${P}.tar.xz"
 	S="${WORKDIR}/${PN}"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-2+ GPL-3+"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 536d5a932fa9..586f65f81d9c 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -7,6 +7,8 @@ DIST gcc-11.5.0.tar.xz 82399864 BLAKE2B f4a61faad32aac9e9cb553c1a1a011df0a057f6e
 DIST gcc-12-20241219.tar.xz 79920016 BLAKE2B 71044352515f33eaf0bcc64cc6eacdecb8b7b1dbca6d8836b629f76e60320f5090178ff37b6804fbda0913c0f55afca37588647974fd72e9961edd338ccf6ffb SHA512 e0c08366f392083feb1ae242242e9bd335681234808ed44d4e75afe157be2814bef321d2327186d217f38bbb6176706e1258228904d31fdb3bb37c8e245dacb0
 DIST gcc-12-20241226.tar.xz 79919556 BLAKE2B 774bc4a98e3fc8b6bb9e95ec12aff8e51f546b490953ccf3801f19673973320249fc5163a2b0c1d0eb6929df810f751a59efe29f148c16671707169d6a5388ed SHA512 d8654ebb456c40ae71de2a64dd118497830c92f09041d36da60ac57c10e617f6e62fba9c514f91359b1ce6de8f702809c23deafddf48aa090529deb902b377e6
 DIST gcc-12-20250102.tar.xz 79905420 BLAKE2B 8669137f30b7df547d2aa9d944e0896060d0af159e9a9fec4405a714645b702862928d93d632afb9f3e7a43fd0432bf73f934775c5c5abc836f4c56c7370822c SHA512 67a4f53ba143b57e34c4eb6516e51c3ea12b24cf13b1cfaeff61b675fffb49e61a7697e4877788639cc441a4affa4a9cd2526817037ea37b6eeacabd6068d8c4
+DIST gcc-12-20250109.tar.xz 79908584 BLAKE2B 0266d02c49d4a9f7dab4a8dd857d849987457990880a578fc809dc2e23c2a8313e088697de565f9f7423996b8cd5a2270eee7fcf13522b452009c544e63b2e7a SHA512 f3030cb604f2c934804fd439f6ad9bdbc036c0cef0387b754c48137ef122af21c4c093ffad7136d4384ed7de2406aea1dfeedc5d64273115b7a9d9e8fa1fb6ed
+DIST gcc-12-20250116.tar.xz 79921816 BLAKE2B b4c2ee7fb76b15834b5637d157c39cbdedca4b458d767eaa5b7275ef835db5f2f44437a7242dcccb1c57a706cdb7788cecc42bfb99795b8ed0ccf589c24296f5 SHA512 271f31a7d213da38f197fe8124030780b334dd84b62d09e58757c722232c3465d2344e0664be6c62f0b5187f604e5af01fffa262a6b4f5b27a0199693e563ac4
 DIST gcc-12.4.0-musl-patches-1.tar.xz 3068 BLAKE2B e5e39c24934072ea89e4467d0dc5196f3dadfb5ffba0c856d051648a2fbf57d434a57e95227cdf2b8cea45f0f5555aec2bc372d2f6cb0b69efd87831d248d364 SHA512 b9db204845a25be043d76cae826d42eebeeb4f9be7c3049af6fe7601a552bedfd24731156a6a36b4b5e2e2af656a589a5c556d2b0b3ded33ba290a773ee87c62
 DIST gcc-12.4.0-patches-1.tar.xz 15576 BLAKE2B 98c29888de7701b365be7ac9062f0cee3340d58c85485e26f0d02f1483ec64cc9c10651488a4fd937551afe30f4e19777e6766871a724ae3ba6c290c16f4fdf1 SHA512 3f7c5d36e56e07ea9dd143a5d13342a6c1ccbf0643abd1c0bcbfb46bb7c7b1308aef6e3e882031c9c191610f01af906b19be5aa2b139cf617614f46e97463aec
 DIST gcc-12.4.0-patches-2.tar.xz 14876 BLAKE2B 6bf5abbb2abba4b9fe9fa153ac4112fe5f563e97cd4e1b885ccd0d88abf1124fa91f20d6be972e2242410447be73bca60014785f8551b8087ed0d4cc3e868225 SHA512 dfd5f02d4c1076fad4ee998b2f620171dd3eb65a1160312def9dae89b18327a06db853f569e0e3c049e5ab06c61488bb6faecec52bafe737fddeb43628c54a1f
@@ -14,19 +16,23 @@ DIST gcc-12.4.0.tar.xz 83377372 BLAKE2B 0d5aa9995bf53fa2dc976a846240cfb8fafd125a
 DIST gcc-13-20241220.tar.xz 84504500 BLAKE2B 60d6dcdcafa36399a0c0de7fef3a4eb4ca8e0b6780cd31c9eace2965c53115205bf64e8247b833a4375c1e3ad2d94820b5bdc97a4689be95d8ab55a676afa689 SHA512 10fe009dc3b8872b24350e4fb999f71b848bd5a03e48e8292f76e6eca3dbdef8383a3b13b813aada983ebdbe3ecab1642961b3210cd1e0063a86655a44493017
 DIST gcc-13-20241227.tar.xz 84505012 BLAKE2B 204b9191d7dc6aae9a37df3de09593448e1582e3dd434007849b6229d6b474ad5a3423050bc7a1dfb812e62b8e42fb154d1da28f38f6c32c700f4db8da780019 SHA512 28e9f884a4599ff516ac28c77a929db04e20ee6dbdcee42560ed950cfc022d958a310c9ed598b3f119433ee9a20868bc0e69e12053f3e1dd977df2cfe9a16f47
 DIST gcc-13-20250103.tar.xz 84510800 BLAKE2B 0a2b0c5ca27cdb3ccb8be502b3d6adee43203d3042af50120f57305c7ad354a459466ea96dca049e76c8c772cbb324fce47475d981ac7c47b9263b48bab31c92 SHA512 3d18b065db3dd9f6ad543f37d4b02e7de9ad5f6c65344e3ce87a99fec15b1850a196f69d8d707b0b51b9bf09726757926792bf5d6de807037fbf5686c8c53ee5
+DIST gcc-13-20250117.tar.xz 84520416 BLAKE2B 3ce98ce1a17ec5a733e3cb8eab0a6084d5e32b225213f0af6f3ff699552d162514a0d6eb6e2805b07d5f97229a92a15f67958dc2ccc82e9d937b8af688a9528b SHA512 121f176f2d9779e33245ddc4048f1ca683311cf20c240e8e76ad6fea892a2e968876b838cc1d90cba06184a9cf4b4408b78dcbabc27368e0cadf1d8de749eed2
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
 DIST gcc-13.2.0-patches-3.tar.xz 30956 BLAKE2B 29ce043b46645640ca1e983397af3e158588ad87575f0bc59451ea4a7dd5e3bb5b190ed031de6a22cd790d423ba111e95d222187dd09985dceb12db9f0a2d907 SHA512 4ffecae7be320124ad0c4e71e39e142b7aa8db0e70b5f486f491d7a33ea31efc6464c6abeea77df02a8bd5cf81f08225d625c8af5c27f9afa32c0d7d989f7a3c
 DIST gcc-13.2.0.tar.xz 87858592 BLAKE2B 0034b29d3d6cc05821f0c4253ce077805943aff7b370729dd203bda57d89c107edd657eeddc2fb1e69ea15c7b0323b961f46516c7f4af89a3ccf7fea84701be2 SHA512 d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2
 DIST gcc-13.3.0-patches-2.tar.xz 44440 BLAKE2B ebde73f6c3cd1a5fdc5bbce36414a59dda0925cba9d422d3689fc9c14fece44ee2391982a674411aa99bf47ffd49200f3ce51cc908beb8298adfff78e709a84c SHA512 eb56e0d7e69b5c3cca21f4cbff21c1204cf64ede7e66d689f45cf5ff37de8a59f24eb1f4b30d9c4222fd4126654fe4ffc146851f504761014995553c1202e8fd
 DIST gcc-14-20241221.tar.xz 88198252 BLAKE2B 7491c2e1c8885e201859143bdf5cae95af4c0db77709ec7d761ad535df30042f5deb8488ba7c508de3673e4b0f2af1de8d17476f39cd47b745ddccec6a9e4470 SHA512 91fe1e1d1f8e8fad64930a2eadf942a542bd42f841fceb49f475bccac00f04692b8cd38821ea9ee05f78b5c51001d8bd39df5f71f3a3d89aab8980019cea9be8
 DIST gcc-14-20241228.tar.xz 88192616 BLAKE2B 9f64852ad59b3f41ab3064f353ec29a513f08343421dc16d48df362ef210567243d653857c4932f558c2b9ed8b572112767bc7a914efc18ad14dd1da2a9f0825 SHA512 d5476a3adef59fbc492ec066ffc1eebe8cbed57c370e775dceaae97dc915cf5efc618c05423794da9cae19ca0614bdf6aacd29dba5a1dc487edc2ddd746b1310
+DIST gcc-14-20250104.tar.xz 88191884 BLAKE2B 781fb456b6e7a602503e5a56f8c0de4c677d23c24e14300c7a12a6a48adfac075baacd8dfd198f44d5bd43f9f13eae3fd189fbf915f487d20c7f2ec4b79e7272 SHA512 c55b8d4f27c8c37244ce95f18efae4be8b0eee71465c5b167dd4efed919e1933d9bef24b1753b7b37ba2b791126829478b25416fd22b1abda14e83bd8bffaeb4
+DIST gcc-14-20250111.tar.xz 88197416 BLAKE2B c17d7274c1f3a2e8e55677ff3750f5b7736f56ae70a35eb9407f2ab5710294e1523c0d11bab69cc3bbbd7d16b39bfd0f1068eba38cb284b5933de5bc3a1636f9 SHA512 2acaab2f905934e819545a8f1561a28feaa609cd39452123ec805d59bda230c5447b26f9ec847fabfa41a658a95a3857555b17f81949f359401bf3449f41b871
+DIST gcc-14-20250118.tar.xz 88214804 BLAKE2B dd35140f0565d419eee272f70e668a8614cfc8f6b7d352a1df8ba2408c6533711e024ca1a7b5e309421138e21d63c5b7f8b581d50b0680abf3dfd6002004bd14 SHA512 692fc50fec856c6cc5a0576d1caa59fd8b5ec298e36daaf5855ea0f922ed134fff346f73e38e47673b692cf03606a66f82e6bdb46e5d7729c370299645a2a093
 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-20241222.tar.xz 90484776 BLAKE2B 8889a11be56a47a9cff26573e9e6fcaa2d7b92b7a5c4509503cbcd38eb03f23a009879bcbd5de33b8c993a34c25b3c5aafb6c9506ff5335f05a572523a41fc52 SHA512 5f571cb073e4c9d10154d135a4fc50986d956417af69c9735e39d9fd49f5cf460a5847ea095b61511917ed0a69197e9afb338c2c8c5b3e7b68673828a3d0d95f
-DIST gcc-15-20241229.tar.xz 90519116 BLAKE2B 8d20c82a17754d6debed19b3aeabdc37453a0f3cac6fb5df5dc6e939775fe3124255f02749b47a8c860cefe29b08adf079f10a8d545ee1b037cb4bbf78e25019 SHA512 b82e74028e663bec02765eaad6c10ef9caef006f391c2bc2531e38a31c1a6b5442927659301d890ff70cdb737aef03f7f9a34cb853a29436a6f9794d78d52f0a
+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-34.tar.xz 30468 BLAKE2B cabe6a1831d2c9397838853a9a09482591ff9f4ffbc2304099f535b45eadb1cd61f0bd06ca016333c0e537a4481b52d4fbab4463364b49625f999645b1711846 SHA512 3a737d05991b6349eb585ae2861dba5426d11bb3cc46d33af46e8ecb95c842075eb739c858df22e4aa0fa9e3041d415aecf2141382fe9f14809fec4db48a448f
-DIST gcc-15.0.0-patches-35.tar.xz 29968 BLAKE2B f662a1768f8766395ae8ad810fa74d4e0965d5cf33e0a2e65e352df1784768f4bd78ac35aa0295981a5c0f93b7041f973edec66bc1ec31fdac50226cbcde9f85 SHA512 9195a42910c47f81cf418dbe0f38e8a00c832e83942c6915fb0b196594c1bc2f0fde6a8b8f62169004190d69831c8981417ad16efd5b8f1dad33d8bf9c262230
+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
diff --git a/sys-devel/gcc/gcc-12.4.1_p20250109.ebuild b/sys-devel/gcc/gcc-12.4.1_p20250109.ebuild
new file mode 100644
index 000000000000..83011b194d30
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.4.1_p20250109.ebuild
@@ -0,0 +1,65 @@
+# 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="12.4.0"
+PATCH_VER="2"
+MUSL_VER="1"
+MUSL_GCC_VER="12.4.0"
+PYTHON_COMPAT=( python3_{10..12} )
+
+if [[ ${PV} == *.9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=1
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+	        MY_PV_2=$((${MY_PV_2} - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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-devel/gcc/gcc-12.4.1_p20250116.ebuild b/sys-devel/gcc/gcc-12.4.1_p20250116.ebuild
new file mode 100644
index 000000000000..83011b194d30
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.4.1_p20250116.ebuild
@@ -0,0 +1,65 @@
+# 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="12.4.0"
+PATCH_VER="2"
+MUSL_VER="1"
+MUSL_GCC_VER="12.4.0"
+PYTHON_COMPAT=( python3_{10..12} )
+
+if [[ ${PV} == *.9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=1
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+	        MY_PV_2=$((${MY_PV_2} - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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-devel/gcc/gcc-13.3.1_p20250117.ebuild b/sys-devel/gcc/gcc-13.3.1_p20250117.ebuild
new file mode 100644
index 000000000000..ac245b9b4177
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.3.1_p20250117.ebuild
@@ -0,0 +1,66 @@
+# 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="13.3.0"
+MUSL_GCC_VER="13.2.0"
+PATCH_VER="2"
+MUSL_VER="2"
+PYTHON_COMPAT=( python3_{10..12} )
+
+if [[ ${PV} == *.9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=1
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+		MY_PV_2=$((${MY_PV_2} - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-14.2.1_p20250104.ebuild b/sys-devel/gcc/gcc-14.2.1_p20250104.ebuild
new file mode 100644
index 000000000000..95c826f0298f
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.2.1_p20250104.ebuild
@@ -0,0 +1,54 @@
+# 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="14.2.0"
+PATCH_VER="7"
+MUSL_VER="1"
+MUSL_GCC_VER="14.1.0"
+PYTHON_COMPAT=( python3_{10..12} )
+
+if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# m68k doesnt build (ICE, bug 932733)
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-14.2.1_p20250111.ebuild b/sys-devel/gcc/gcc-14.2.1_p20250111.ebuild
new file mode 100644
index 000000000000..95c826f0298f
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.2.1_p20250111.ebuild
@@ -0,0 +1,54 @@
+# 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="14.2.0"
+PATCH_VER="7"
+MUSL_VER="1"
+MUSL_GCC_VER="14.1.0"
+PYTHON_COMPAT=( python3_{10..12} )
+
+if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# m68k doesnt build (ICE, bug 932733)
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-14.2.1_p20250118.ebuild b/sys-devel/gcc/gcc-14.2.1_p20250118.ebuild
new file mode 100644
index 000000000000..95c826f0298f
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.2.1_p20250118.ebuild
@@ -0,0 +1,54 @@
+# 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="14.2.0"
+PATCH_VER="7"
+MUSL_VER="1"
+MUSL_GCC_VER="14.1.0"
+PYTHON_COMPAT=( python3_{10..12} )
+
+if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# m68k doesnt build (ICE, bug 932733)
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-15.0.0_pre20241222.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20241222.ebuild
deleted file mode 100644
index 89b89fda41e2..000000000000
--- a/sys-devel/gcc/gcc-15.0.0_pre20241222.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-TOOLCHAIN_HAS_TESTS=1
-PATCH_GCC_VER="15.0.0"
-PATCH_VER="34"
-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-devel/gcc/gcc-15.0.0_pre20241229.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20241229.ebuild
deleted file mode 100644
index 4583651aefad..000000000000
--- a/sys-devel/gcc/gcc-15.0.0_pre20241229.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-TOOLCHAIN_HAS_TESTS=1
-PATCH_GCC_VER="15.0.0"
-PATCH_VER="35"
-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-devel/gcc/gcc-15.0.0_pre20250112-r3.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20250112-r3.ebuild
new file mode 100644
index 000000000000..e5348afa3eab
--- /dev/null
+++ b/sys-devel/gcc/gcc-15.0.0_pre20250112-r3.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="41"
+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-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-devel/mold/Manifest b/sys-devel/mold/Manifest
index 984985ba4b09..3c3e3be2a59f 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -2,3 +2,4 @@ DIST mold-2.1.0.tar.gz 9278811 BLAKE2B b31e13f92177553adf5069cf35c8c75c7bc28f0af
 DIST mold-2.34.1.tar.gz 10057683 BLAKE2B 9a9b166e64c4e5d48631147e781ce0d58acf76420f172bdee31fe5c44f37a8e2b098ae5696b52b668255f9a5967b0fb567a51d9fb8b26cddba0e14ed5a3e3464 SHA512 6ddfda8b81b710555272ee67eac7f2b3088a7a78f308843caa1730c1b631fc7031b8f5eac33379b9926c9f000d7b27864c12bb62ea75051d2f1caf9f9d2946ab
 DIST mold-2.35.0.tar.gz 10056856 BLAKE2B 9b039031047263aa959aa6f2bf296d11d51bf02d0a66afa76e08200d4547ee5d66cf522497b86fce7fd8cbd43559b8d19ad0264c749833988592cf7291fd55fe SHA512 6f7be924cb6ea38c0089f0c34beec9ef51160daea3510dac4ed68c519efefe4496739271b35c271f7384c9e436bd8a0636ce47e0847aa2b4daf227accecc7314
 DIST mold-2.35.1.tar.gz 10094602 BLAKE2B 4943588d116a4631ad4404a4f2d92c4f9745546ec1ab7054df2af766f270c634c571f90d5e224f5441e48a3b310819f6993e56d5574c60032dd547d68d08fc64 SHA512 30d9cadfe57288e80ffcaddf1bf7df7b3bff75d337ea2b612bdffa3de3f7bd908b02d24c1f848d4ad0e82f72cd0e04c33ddd01d23c549d81aac5af58e63dbab4
+DIST mold-2.36.0.tar.gz 10094759 BLAKE2B d86e6c7b71bbda0f02fbf2215f15a0e4c15cbb0ba32d4c5d478a6e07d4ed4fb42891610cfdc24ea67b6683f044a9c122db8534580fe12f6164b0db2681178825 SHA512 985ca22400b2d957b4ea8d35d6716cc6f13d1abe9c9e1eed461efda6f2612a5fbfa707aff879c616c756111fea751a335ad3a3fc224c7573855e7b2795596164
diff --git a/sys-devel/mold/mold-2.35.0.ebuild b/sys-devel/mold/mold-2.35.0.ebuild
index 29ba8bfdb0b4..c931932d54b4 100644
--- a/sys-devel/mold/mold-2.35.0.ebuild
+++ b/sys-devel/mold/mold-2.35.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
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	# -alpha: https://github.com/rui314/mold/commit/3711ddb95e23c12991f6b8c7bfeba4f1421d19d4
-	KEYWORDS="-alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~riscv ~sparc ~x86"
+	KEYWORDS="-alpha amd64 ~arm ~arm64 ~loong ~ppc ~riscv ~sparc ~x86"
 fi
 
 # mold (MIT)
diff --git a/sys-devel/mold/mold-2.36.0.ebuild b/sys-devel/mold/mold-2.36.0.ebuild
new file mode 100644
index 000000000000..a58b5bfabc3f
--- /dev/null
+++ b/sys-devel/mold/mold-2.36.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic toolchain-funcs
+
+DESCRIPTION="A Modern Linker"
+HOMEPAGE="https://github.com/rui314/mold"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/rui314/mold.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	# -alpha: https://github.com/rui314/mold/commit/3711ddb95e23c12991f6b8c7bfeba4f1421d19d4
+	KEYWORDS="-alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~riscv ~sparc ~x86"
+fi
+
+# mold (MIT)
+#  - xxhash (BSD-2)
+#  - siphash ( MIT CC0-1.0 )
+LICENSE="MIT BSD-2 CC0-1.0"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+	app-arch/zstd:=
+	>=dev-cpp/tbb-2021.7.0-r1:=
+	dev-libs/blake3:=
+	sys-libs/zlib
+	!kernel_Darwin? (
+		>=dev-libs/mimalloc-2:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+	# Requires a c++20 compiler, see #831473
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]]; then
+			die "${PN} needs at least gcc 10"
+		elif tc-is-clang && [[ $(clang-major-version) -lt 12 ]]; then
+			die "${PN} needs at least clang 12"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Needs unpackaged dwarfdump
+	rm test/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die
+
+	# Heavy tests, need qemu
+	rm test/gdb-index-{compress-output,dwarf{2,3,4,5}}.sh || die
+	rm test/lto-{archive,dso,gcc,llvm,version-script}.sh || die
+
+	# Sandbox sadness
+	rm test/run.sh || die
+	sed -i 's|`pwd`/mold-wrapper.so|"& ${LD_PRELOAD}"|' \
+		test/mold-wrapper{,2}.sh || die
+
+	# static-pie tests require glibc built with static-pie support
+	if ! has_version -d 'sys-libs/glibc[static-pie(+)]'; then
+		rm test/{,ifunc-}static-pie.sh || die
+	fi
+}
+
+src_configure() {
+	use debug || append-cppflags "-DNDEBUG"
+
+	local mycmakeargs=(
+		-DMOLD_ENABLE_QEMU_TESTS=OFF
+		-DMOLD_LTO=OFF # Should be up to the user to decide this with CXXFLAGS.
+		-DMOLD_USE_MIMALLOC=$(usex !kernel_Darwin)
+		-DMOLD_USE_SYSTEM_MIMALLOC=ON
+		-DMOLD_USE_SYSTEM_TBB=ON
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	export TEST_CC="$(tc-getCC)" TEST_GCC="$(tc-getCC)" \
+		TEST_CXX="$(tc-getCXX)" TEST_GXX="$(tc-getCXX)"
+	cmake_src_test
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/${PN}
+
+	# https://bugs.gentoo.org/872773
+	insinto /usr/$(get_libdir)/mold
+	doins "${BUILD_DIR}"/${PN}-wrapper.so
+
+	dodoc docs/{design,execstack}.md
+	doman docs/${PN}.1
+
+	dosym ${PN} /usr/bin/ld.${PN}
+	dosym ${PN} /usr/bin/ld64.${PN}
+	dosym -r /usr/bin/${PN} /usr/libexec/${PN}/ld
+}
diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild
deleted file mode 100644
index da75e4be0756..000000000000
--- a/sys-devel/patch/patch-2.7.6-r4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/patch.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="Utility to apply diffs to files"
-HOMEPAGE="https://www.gnu.org/software/patch/patch.html"
-SRC_URI="mirror://gnu/patch/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-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"
-IUSE="static test xattr"
-RESTRICT="!test? ( test )"
-
-RDEPEND="xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( sys-apps/ed )
-	verify-sig? ( sec-keys/openpgp-keys-patch )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-test-suite.patch
-	"${FILESDIR}"/${PN}-2.7.6-fix-error-handling-with-git-style-patches.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2018-6951.patch
-	"${FILESDIR}"/${PN}-2.7.6-allow-input-files-to-be-missing-for-ed-style-patches.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2018-6952.patch
-	"${FILESDIR}"/${PN}-2.7.6-Do-not-crash-when-RLIMIT_NOFILE-is-set-to-RLIM_INFINITY.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156-fix1.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156-fix2.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2019-13636.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2019-13638.patch
-	"${FILESDIR}"/${PN}-2.7.6-Avoid-invalid-memory-access-in-context-format-diffs.patch
-)
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local myeconfargs=(
-		$(use_enable xattr)
-	)
-	# Do not let $ED mess up the search for `ed` 470210.
-	ac_cv_path_ED=$(type -P ed) \
-		econf "${myeconfargs[@]}"
-}
diff --git a/sys-devel/patch/patch-2.7.6-r5.ebuild b/sys-devel/patch/patch-2.7.6-r5.ebuild
deleted file mode 100644
index b2b7026140c7..000000000000
--- a/sys-devel/patch/patch-2.7.6-r5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/patch.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="Utility to apply diffs to files"
-HOMEPAGE="https://www.gnu.org/software/patch/patch.html"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/patch.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://gnu/patch/${P}.tar.xz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.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"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="static test xattr"
-RESTRICT="!test? ( test )"
-
-RDEPEND="xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( sys-apps/ed )
-	verify-sig? ( sec-keys/openpgp-keys-patch )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-test-suite.patch
-	"${FILESDIR}"/${PN}-2.7.6-fix-error-handling-with-git-style-patches.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2018-6951.patch
-	"${FILESDIR}"/${PN}-2.7.6-allow-input-files-to-be-missing-for-ed-style-patches.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2018-6952.patch
-	"${FILESDIR}"/${PN}-2.7.6-Do-not-crash-when-RLIMIT_NOFILE-is-set-to-RLIM_INFINITY.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156-fix1.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156-fix2.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2019-13636.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2019-13638.patch
-	"${FILESDIR}"/${PN}-2.7.6-Avoid-invalid-memory-access-in-context-format-diffs.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-
-		cd "${S}" || die
-		./bootstrap || die
-	elif use verify-sig ; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
-	fi
-
-	default
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local myeconfargs=(
-		$(use_enable xattr)
-		# rename to gpatch for better BSD compatibility
-		--program-prefix=g
-	)
-	# Do not let $ED mess up the search for `ed` 470210.
-	ac_cv_path_ED=$(type -P ed) \
-		econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake check gl_public_submodule_commit=
-}
-
-src_install() {
-	default
-
-	# symlink to the standard name
-	dosym gpatch /usr/bin/patch
-	dosym gpatch.1 /usr/share/man/man1/patch.1
-}
diff --git a/sys-devel/rust-std/Manifest b/sys-devel/rust-std/Manifest
index b5b8c90bbcec..ffe938c1da83 100644
--- a/sys-devel/rust-std/Manifest
+++ b/sys-devel/rust-std/Manifest
@@ -7,3 +7,4 @@ DIST rustc-1.80.1-src.tar.xz 199234944 BLAKE2B 39891362f2a4bc249f5d943e3ded48d2a
 DIST rustc-1.81.0-src.tar.xz 216743872 BLAKE2B d9f52da9092d0723c862ebbb2dc351cad0670be6872f691b4c9f36faf06803f072720ebd04f06745c355d807991b38312cc830b12d6d3f50b0574bb7325340b7 SHA512 b8a837ced521d2ca2c7f228a0640da591384519e4dbc1ae768524d50616da6abbd2f7bdae3777caebc0447dac91bf76481282ce5a2264d7f30e173caa6321a51
 DIST rustc-1.82.0-src.tar.xz 219769328 BLAKE2B 611f33e134c2d459c9af1695c0a4d033df93afc986e91a17fceb0dd293fb4ffbd5f7475ef571d36cecf49da6c3fdb3801c98d7f72f9dd1c39e42502f649b192f SHA512 d158c7c71c1814bde2a3ec3cbeabe34949bd3201b730c0d7ec6baad4158bb28dd13696c430a6b99dc38b9d23ad7ddf8dde7d2487cbfbbbe9c3473016994210f0
 DIST rustc-1.83.0-src.tar.xz 353808388 BLAKE2B 217c85f7351a7c57a2684da2c7c81a32094187b3812dee628b327a5b2faca57235abc54d033c586c071c8bfa0c7360bb28761aaa42fe18414e388db704d81231 SHA512 64db57949c6ac1df6a3f4c6bd0938685a5fb1bc3d318b34ccfcfccb0f9eff1cffd4d8a53a190ef0409eeca9ad12bc6234c2c1de69196cc74ae02d6afa20d0ce6
+DIST rustc-1.84.0-src.tar.xz 354993944 BLAKE2B e4697d8a9f42484556ed490390aef535b2214ccb3715ade57936211c1c637737da5f2b9a6c53a30df0fba1744fbd80d4d1382c0b74f6b36b36098bf187557201 SHA512 9e964c1b964e74083a9002fa04b072fa8fe7a520b24ad55e88a89bb2a2a2cd5727c5438d6db425b824ae7502ab215c2dd3f49777efd65f76bae09965df2e070a
diff --git a/sys-devel/rust-std/rust-std-1.84.0.ebuild b/sys-devel/rust-std/rust-std-1.84.0.ebuild
new file mode 100644
index 000000000000..de231d3c162c
--- /dev/null
+++ b/sys-devel/rust-std/rust-std-1.84.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit flag-o-matic multiprocessing python-any-r1 rust-toolchain toolchain-funcs
+
+DESCRIPTION="Rust standard library, standalone (for crossdev)"
+HOMEPAGE="https://www.rust-lang.org"
+SRC_URI="https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz"
+S="${WORKDIR}/${P/-std/c}-src"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4"
+SLOT="stable/$(ver_cut 1-2)"
+# please do not keyword
+#KEYWORDS="" #nowarn
+IUSE="debug"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	~dev-lang/rust-${PV}:=
+"
+
+DEPEND="||
+	(
+		>="${CATEGORY}"/gcc-4.7:*
+		>="${CATEGORY/sys-devel/llvm-core}"/clang-3.5:*
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+# need full compiler to run tests
+RESTRICT="test"
+
+QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so"
+
+#
+# The cross magic
+#
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_cross() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+toml_usex() {
+	usex "$1" true false
+}
+
+pkg_pretend() {
+	is_cross || die "${PN} should only be used for cross"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	# do the great cleanup
+	strip-flags
+	filter-flags '-mcpu=*' '-march=*' '-mtune=*' '-m32' '-m64'
+	strip-unsupported-flags
+
+	local rust_root x
+	rust_root="$(rustc --print sysroot)"
+	rtarget="$(rust_abi ${CTARGET})"
+	rtarget="${ERUST_STD_RTARGET:-${rtarget}}" # some targets need to be custom.
+	rbuild="$(rust_abi ${CBUILD})"
+	rhost="$(rust_abi ${CHOST})"
+
+	echo
+	for x in CATEGORY rust_root rbuild rhost rtarget RUSTFLAGS CFLAGS CXXFLAGS LDFLAGS; do
+		einfo "$(printf '%10s' ${x^^}:) ${!x}"
+	done
+
+	cat <<- EOF > "${S}"/config.toml
+		[build]
+		build = "${rbuild}"
+		host = ["${rhost}"]
+		target = ["${rtarget}"]
+		cargo = "${rust_root}/bin/cargo"
+		rustc = "${rust_root}/bin/rustc"
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		extended = true
+		verbose = 2
+		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)
+		debuginfo-level-rustc = 0
+		backtrace = true
+		incremental = false
+		default-linker = "$(tc-getCC)"
+		rpath = false
+		dist-src = false
+		remap-debuginfo = true
+		jemalloc = false
+		[dist]
+		src-tarball = false
+		[target.${rtarget}]
+		ar = "$(tc-getAR ${CTARGET})"
+		cc = "$(tc-getCC ${CTARGET})"
+		cxx = "$(tc-getCXX ${CTARGET})"
+		linker = "$(tc-getCC ${CTARGET})"
+		ranlib = "$(tc-getRANLIB ${CTARGET})"
+		$(usev elibc_musl 'crt-static = false')
+	EOF
+
+	einfo "${PN^} configured with the following settings:"
+	cat "${S}"/config.toml || die
+}
+
+src_compile() {
+	env RUST_BACKTRACE=1 \
+		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \
+		library/std --stage 0 || die
+}
+
+src_test() {
+	ewarn "${PN} can't run tests"
+}
+
+src_install() {
+	local rustlib="lib/rust/${PV}/lib/rustlib"
+	dodir "/usr/${rustlib}"
+	pushd "build/${rhost}/stage0-sysroot/lib/rustlib" > /dev/null || die
+	cp -pPRv "${rtarget}" "${ED}/usr/${rustlib}" || die
+	popd > /dev/null || die
+}
diff --git a/sys-fabric/mstflint/mstflint-4.30.0_p1.ebuild b/sys-fabric/mstflint/mstflint-4.30.0_p1.ebuild
index 4b24fe0fefb2..ddb4f212a954 100644
--- a/sys-fabric/mstflint/mstflint-4.30.0_p1.ebuild
+++ b/sys-fabric/mstflint/mstflint-4.30.0_p1.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}/${PN}-${MY_PV}"
 
 LICENSE="|| ( GPL-2 BSD-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~loong ~x86"
 IUSE="adb-generic-tools inband ssl"
 
 DEPEND="
diff --git a/sys-firmware/edk2-bin/Manifest b/sys-firmware/edk2-bin/Manifest
index bb1fb35f4b77..a1ff3411e480 100644
--- a/sys-firmware/edk2-bin/Manifest
+++ b/sys-firmware/edk2-bin/Manifest
@@ -1,3 +1,6 @@
 DIST edk2-202408-1-amd64.xpak 6406269 BLAKE2B 4989c77321b01165253a8a3bf9955f5b75598cc49371ed74b342786b8158c232f088f1f8a34b8afae0e72f8aabe6cb2a437f5d1f495d3e09d939ef5b4ddfecc6 SHA512 9ead4ac94c634b740ea2a19dcad968e31bc90662b8caf6a9bb96f7517358af23bc1bc996317ca4e7bf2a7b685b2c80fae4757eb1d10fd8d3550388580a0b6ff2
 DIST edk2-202408-1-arm64.xpak 2710314 BLAKE2B e21ee00e178c59cd89cc297f22a044459446f394000e6e959a2cea59c120e9778682ba3e040b02e155d05d5196aebe45c8fc50ae6923a51fd2be2308132b23f9 SHA512 9f2c99755e3ca482ef240f58711d571a57c2e29fc29b696d0345a1c02d185b325f840cd747d139724bde7dfeaced99fd6eecc5e95ec3b45a6651c797d7989576
+DIST edk2-202411-1-amd64.xpak 6551638 BLAKE2B 96cbbfd3cc105805bd2c4b535aa2802258fd7a51a5601c3dbdf6e7a34add424a46f2d0b99ffb95cc4af87c7636aa73ceaf4200a2bcda4d466464dc19798cef38 SHA512 c3df3a7af4460e3ef9fef46f279bf9984a52995335842daec51e3e3a71ebb874e905c95ee35f645787447301d7f12662ceae5fa202399e9d42174253e2c915c5
+DIST edk2-202411-1-arm64.xpak 2694540 BLAKE2B abf73580f8b9b6e6172918b43906d17787fd27b62e067f0950cd8dd7462aa70fa70fda21b634711526328d6c00ed7526764411daaa3801876812a9408fccefc6 SHA512 6f9908c1abd444ea9a2c2fe98b0a34b9f8827d7e909d35503fd90846c6c3c2d9d74adc264e83834f51f48f3cf1b2959ef1c75ce83fd24e916325437dbbb2b741
+DIST edk2-202411-1-riscv.xpak 1424979 BLAKE2B 417b183c4786ad094966765912a5359f6764f868f60e6dfc9689342f8f23c223b1770f00f6f31fc6f2826827b5473586013d7aee2a502dfe403784811814c842 SHA512 a20a2222ea5dc13d8fac7beb63a3287572316343a79913eefcc77db53107a6a8ab34094d5b711631f25188810961a873e468f9b07fd13cbc149d119299e5e4c8
 DIST edk2-ovmf-202202-1.xpak 2672386 BLAKE2B 75c15d4379610ab2af85b78166e350d52f4f1bc1fff5b2eb693ad0d7b1f6648e65d8ae3e2c5467f93f1557ad3b4fa664ab2d76ff10794667de22c2ea8cca6b2d SHA512 06783b89c96bada0fd025ff39eaee501a027abcb03c0bdcf3ff497d52be22927ab03013d90f145ee94a8662cfffe4f8c154dcd06db1bb1acef8a85ae43de14a3
diff --git a/sys-firmware/edk2-bin/edk2-bin-202408.ebuild b/sys-firmware/edk2-bin/edk2-bin-202408.ebuild
index 75bd9bda8186..f6b8f58721e0 100644
--- a/sys-firmware/edk2-bin/edk2-bin-202408.ebuild
+++ b/sys-firmware/edk2-bin/edk2-bin-202408.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 @@ SRC_URI=$(printf "https://dev.gentoo.org/~chewi/distfiles/${BINPKG}-%s.xpak\n" $
 S="${WORKDIR}"
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 RDEPEND="!sys-firmware/edk2"
 
diff --git a/sys-firmware/edk2-bin/edk2-bin-202411.ebuild b/sys-firmware/edk2-bin/edk2-bin-202411.ebuild
new file mode 100644
index 000000000000..c3cc77f723a2
--- /dev/null
+++ b/sys-firmware/edk2-bin/edk2-bin-202411.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1 secureboot
+
+BINPKG="${P/-bin/}-1"
+ARCHES="amd64 arm64 riscv"
+
+DESCRIPTION="TianoCore EDK II UEFI firmware for virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+SRC_URI=$(printf "https://dev.gentoo.org/~chewi/distfiles/${BINPKG}-%s.xpak\n" ${ARCHES})
+S="${WORKDIR}"
+LICENSE="BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="!sys-firmware/edk2"
+
+DOC_CONTENTS="This package includes the TianoCore EDK II UEFI firmware for virtual \
+machines of these architectures: ${ARCHES}. See each architecture's README for \
+usage details."
+
+src_unpack() {
+	local a
+	for a in ${ARCHES}; do
+		mkdir "${a}" || die
+		tar -C "${a}" -xf - < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}-${a}.xpak") ||
+			die "unpacking ${a} binpkg failed"
+	done
+}
+
+src_prepare() {
+	bunzip2 */usr/share/doc/*/README.gentoo.bz2 || die
+	default
+}
+
+src_install() {
+	insinto /usr/share
+	doins -r */usr/share/{edk2,qemu}/
+
+	# Compatibility with older package versions.
+	dosym edk2/OvmfX64 /usr/share/edk2-ovmf
+
+	secureboot_auto_sign --in-place
+	readme.gentoo_create_doc
+
+	local a
+	for a in ${ARCHES}; do
+		newdoc "${a}"/usr/share/doc/*/README.gentoo README-"${a}".gentoo
+	done
+}
+
+pkg_preinst() {
+	local OLD=${EROOT}/usr/share/edk2-ovmf NEW=${EROOT}/usr/share/edk2/OvmfX64
+	if [[ -d ${OLD} && ! -L ${OLD} ]]; then
+		{
+			rm -vf "${OLD}"/{OVMF_{CODE,CODE.secboot,VARS}.fd,EnrollDefaultKeys.efi,Shell.efi,UefiShell.img} &&
+			mkdir -p "${NEW}" &&
+			find "${OLD}" -mindepth 1 -maxdepth 1 -execdir mv --update=none-fail -vt "${NEW}"/ {} + &&
+			rmdir "${OLD}"
+		} || die "unable to replace old directory with compatibility symlink"
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-firmware/edk2/Manifest b/sys-firmware/edk2/Manifest
index 22459411e25d..0a7656de0d30 100644
--- a/sys-firmware/edk2/Manifest
+++ b/sys-firmware/edk2/Manifest
@@ -1,6 +1,7 @@
 DIST arm64_DBXUpdate_05092023.bin 4610 BLAKE2B 4c6628e5c297a26ca5a1235e377a794fdc18f8201dc7bcb134eb5dd164cc16497ff8d7e598509a61dadf3aa6e8525c9c9e4ca597af62a1c93f97945594517303 SHA512 5a2816e3ff73fef1d258c1418a09b264291408493147399da6b71b6a20bd6b347c00153e22589b2635172cdc57de404ff423be41a6c382a9b25ee9a76922f397
 DIST brotli-f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz 512229 BLAKE2B cd86cc2cc7eefad24f87cda8006409bf764922b5f23ccfb951e7a41214b12004ce532b11f94f5fb858b3bf71f9abf8ef17ba219fa96bd5be23b51873afad0fd5 SHA512 7f48e794e738b31c2005e7cef6d8c0cc0d543f1cd8c137ae8ba14602cac2873de6299a3f32ad52be869f513e7548341353ed049609daef1063975694d9a9b80b
 DIST edk2-202408.tar.gz 17548980 BLAKE2B 12723a593d2767577f74cfa69f4a02ec784347994af6eb77aea7eb9e9e9f7fedb6b47698af2f07ef98848bbb4bf16248179cf117cf9abdf17be73157a0a03fc2 SHA512 d679d905f8b0ddbf60b1c9a0282e403bf51d0fbe55d85a8ea3e4af1778874e947d224e3671f9e82cddd5cd906c1472ff3973498d969414bdd67d0b49f5b8a251
+DIST edk2-202411.tar.gz 17669304 BLAKE2B 2aa1d5c5d7b99a1abccf0c8b0b04a74006319a269ec03814ab9a28d38299f7d00f57d457c4e011067ad8dfc816430372ab02130ec138b148999662764a411483 SHA512 633483a1ff915f6e5f5a6d3c329f517d6c070368855f1d5348a80e22e71ac13ff4c6774c8620482a4e5cefe03907edc3a904ae405cbfe2dcd025ddd82f039eaf
 DIST edk2-ovmf-202202-qemu-firmware.tar.xz 664 BLAKE2B 1aa4e25804ce0f3c967c80999315de24eaef6682e42dddd81c274ce4603ec3d15186de752de49e2527c6bd5517080c002a357ed6bc389b5afd6f7a4d93edeb44 SHA512 f9a29212274a99796784673d873e0eee7d3e2a5cf9e63192453841ee3a4ef4b813c7b2357fc7000f39c71ed6c66636daab772abb51d3972a2a56ade8a4c68faf
 DIST edk2-ovmf-202202.tar.gz 14208170 BLAKE2B d8411e6808b335ccd551349a10c983b9448a357e73273fa6c30a07785e27feffed0224950ee98b668712c33f6739a9b006e5043b7dfd014f48dba9fd449b3354 SHA512 200690a4867331de06e0478869b85577bc510213ebe679f2103160efb84d94c82ac8481ef1f15c3e42c1e9f22b7c5ef0d6c8f2c655bce7702ce843551cf9bb83
 DIST edk2-ovmf-202405.tar.gz 17091190 BLAKE2B ee2f4c8674ecd7a17e4ee1b067cf1caffb46c3345f39ab15b715964b8e114d01538ae4d4152ab6a3eeebdae602128604d57c02fc0da83f46c291559fe39f49d2 SHA512 3bad4c8417b0c9b68fc6b6b85a4b15c5be8daf672177ce66d7b224b1da7a90f643021adbdd6bc96f95417fc8654c4c6b191cd39f6c1be955946360bfa8e2cb5f
@@ -9,6 +10,7 @@ DIST libspdm-50924a4c8145fc721e17208f55814d2b38766fe6.tar.gz 1967479 BLAKE2B fe1
 DIST mbedtls-370b5944c046bab043dd8b133727b2135af7747a.tar.gz 4587796 BLAKE2B c28df5c52ac3ed5ef6a2b9eba29f3894d3f5f11083869e8b137cd66d4f72b2a0971c91636ce4626869bd06eeb5e661d90160021f92564b9449fb13001b8e379f SHA512 a421c03c740867210f9e30457bc951928cafec3622e1e304f8c18ce5c5e27c5c8e6c7715180ecb74c6a997e4b91ee160e52b357e1bb65ff76ce8414a87ec4889
 DIST mbedtls-8c89224991adff88d53cd380f42a2baa36f91454.tar.gz 4587796 BLAKE2B c28df5c52ac3ed5ef6a2b9eba29f3894d3f5f11083869e8b137cd66d4f72b2a0971c91636ce4626869bd06eeb5e661d90160021f92564b9449fb13001b8e379f SHA512 a421c03c740867210f9e30457bc951928cafec3622e1e304f8c18ce5c5e27c5c8e6c7715180ecb74c6a997e4b91ee160e52b357e1bb65ff76ce8414a87ec4889
 DIST mipi-sys-t-370b5944c046bab043dd8b133727b2135af7747a.tar.gz 378522 BLAKE2B d3f1033e78ad814ebb991e66d8c1437aa3583e91481af9785b97b6021c7c45fb9dcb8d2d58d0a0fe84fbd9f108d24a27234df298eb8a2ba2340e5c9c85c89c40 SHA512 de6888577ceab7ab6915d792f3c48248cfa53357ccd310fc7f7eae4d25a932de8c7c23e5b898c9ebf61cf86cb538277273f2eb131a628b3bf0d46c9a3b9b6686
+DIST openssl-3.0.15.tar.gz 15318633 BLAKE2B f2900d0894b97e86c709079ca4336d5dc508d69e91d3a4de4420c8d9344cb54dada6ea2cdd408166e53db0c652b06654e670701166b67a0a40578676e1cea535 SHA512 acd80f2f7924d90c1416946a5c61eff461926ad60f4821bb6b08845ea18f8452fd5e88a2c2c5bd0d7590a792cb8341a3f3be042fd0a5b6c9c1b84a497c347bbf
 DIST openssl-d82e959e621a3d597f1e0d50ff8c2d8b96915fd7.tar.gz 10034310 BLAKE2B 6996979dc12a523d565830e7b0943feb682a376f71ddb6f20cb8b9976bb7f12e39f088abaa45d514933ef79c0e4a2933dc6f1af4774fedaa16e74c0081c358e7 SHA512 a89bc652dc4318c5e8a9c594a43d890ca05dfc1acd6b15e2a8ab8b5628b5f33994143ff8024230e07b9e67556b28ea3a5e36763aa72dec20b52022ca8c6f2a7e
 DIST openssl-de90e54bbe82e5be4fb9608b6f5c308bb837d355.tar.gz 15337569 BLAKE2B bb0b2f4ee7838178e8e23317b6c63048611d805e20c81d6c875d9b515e6dbcf981cda38f031965c9ec45bcab3ac4725cfa793718b0212e92bf53b4c7fc3f4e32 SHA512 4bba15075dacc8c1772a95759cfe8620ff3a9d535e5d3d29bb15e4790cc543555ab45f0b239195361e534eca26249ae1b491b63cbf6b7ecda6f0840c7f6253ac
 DIST pylibfdt-cfff805481bdea27f900c32698171286542b8d3c.tar.gz 49659 BLAKE2B 05e954fc2d72618b3f56c08bdfcd64479259902ee2613d034b66ebe50e33b02b243bed1191d8dcdcea9fcb2553f84a737ae12514d30c48e776efc858a4879894 SHA512 c2f4cbda24bc4a2140135de2db19fd7ad0b6eff2a748862b4166bf0e65f3e324e2855ea4331dafa2c82f44b4d01309c8ac50159cbcc076a968a1169c8709a523
diff --git a/sys-firmware/edk2/edk2-202408.ebuild b/sys-firmware/edk2/edk2-202408.ebuild
index 1dbbdba77d98..3e18d683cf73 100644
--- a/sys-firmware/edk2/edk2-202408.ebuild
+++ b/sys-firmware/edk2/edk2-202408.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
@@ -49,7 +49,7 @@ SRC_URI="
 S="${WORKDIR}/${PN}-${PN}-stable${PV}"
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* ~amd64 arm64"
 
 BDEPEND="
 	${PYTHON_DEPS}
diff --git a/sys-firmware/edk2/edk2-202411.ebuild b/sys-firmware/edk2/edk2-202411.ebuild
new file mode 100644
index 000000000000..0d9486646734
--- /dev/null
+++ b/sys-firmware/edk2/edk2-202411.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{12..13} )
+
+inherit edo prefix python-any-r1 readme.gentoo-r1 secureboot toolchain-funcs
+
+DESCRIPTION="TianoCore EDK II UEFI firmware for virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+DBXDATE="05092023" # MMDDYYYY
+BUNDLED_BROTLI_SUBMODULE_SHA="f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
+BUNDLED_LIBFDT_SUBMODULE_SHA="cfff805481bdea27f900c32698171286542b8d3c"
+BUNDLED_LIBSPDM_SUBMODULE_SHA="50924a4c8145fc721e17208f55814d2b38766fe6"
+BUNDLED_MBEDTLS_SUBMODULE_SHA="8c89224991adff88d53cd380f42a2baa36f91454"
+BUNDLED_MIPI_SYS_T_SUBMODULE_SHA="370b5944c046bab043dd8b133727b2135af7747a"
+BUNDLED_OPENSSL_SUBMODULE_P="openssl-3.0.15"
+
+SRC_URI="
+	https://github.com/tianocore/${PN}/archive/${PN}-stable${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
+		-> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
+	https://github.com/DMTF/libspdm/archive/${BUNDLED_LIBSPDM_SUBMODULE_SHA}.tar.gz
+		-> libspdm-${BUNDLED_LIBSPDM_SUBMODULE_SHA}.tar.gz
+	https://github.com/Mbed-TLS/mbedtls/archive/${BUNDLED_MBEDTLS_SUBMODULE_SHA}.tar.gz
+		-> mbedtls-${BUNDLED_MBEDTLS_SUBMODULE_SHA}.tar.gz
+	https://github.com/MIPI-Alliance/public-mipi-sys-t/archive/${BUNDLED_MIPI_SYS_T_SUBMODULE_SHA}.tar.gz
+		-> mipi-sys-t-${BUNDLED_MIPI_SYS_T_SUBMODULE_SHA}.tar.gz
+	https://github.com/openssl/openssl/releases/download/${BUNDLED_OPENSSL_SUBMODULE_P}/${BUNDLED_OPENSSL_SUBMODULE_P}.tar.gz
+
+	amd64? (
+		https://uefi.org/sites/default/files/resources/x64_DBXUpdate_${DBXDATE}.bin
+		https://uefi.org/sites/default/files/resources/x64_DBXUpdate.bin -> x64_DBXUpdate_${DBXDATE}.bin
+	)
+
+	arm64? (
+		https://uefi.org/sites/default/files/resources/arm64_DBXUpdate_${DBXDATE}.bin
+		https://uefi.org/sites/default/files/resources/arm64_DBXUpdate.bin -> arm64_DBXUpdate_${DBXDATE}.bin
+		https://github.com/devicetree-org/pylibfdt/archive/${BUNDLED_LIBFDT_SUBMODULE_SHA}.tar.gz
+			-> pylibfdt-${BUNDLED_LIBFDT_SUBMODULE_SHA}.tar.gz
+	)
+"
+
+S="${WORKDIR}/${PN}-${PN}-stable${PV}"
+LICENSE="BSD-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64 ~riscv"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	app-emulation/qemu
+	app-emulation/virt-firmware
+	>=sys-power/iasl-20160729
+	amd64? ( >=dev-lang/nasm-2.0.7 )
+"
+
+RDEPEND="
+	!sys-firmware/edk2-bin
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-202411-werror.patch"
+	"${FILESDIR}/${PN}-202408-binutils-2.41-textrels.patch"
+)
+
+DISABLE_AUTOFORMATTING="true"
+DIR="/usr/share/${PN}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	secureboot_pkg_setup
+
+	local QEMU_ARCH ARCH_DIRS UNIT0 UNIT1 FMT
+
+	case "${ARCH}" in
+	amd64)
+		TARGET_ARCH="X64"
+		QEMU_ARCH="x86_64"
+		ARCH_DIRS="${DIR}/OvmfX64"
+		UNIT0="OVMF_CODE.fd"
+		UNIT1="OVMF_VARS.fd"
+		FMT="raw"
+		;;
+	arm64)
+		TARGET_ARCH="AARCH64"
+		QEMU_ARCH="aarch64"
+		ARCH_DIRS="${DIR}/ArmVirtQemu-AARCH64"
+		UNIT0="QEMU_EFI.qcow2"
+		UNIT1="QEMU_VARS.qcow2"
+		FMT="qcow2"
+		;;
+	riscv)
+		TARGET_ARCH="RISCV64"
+		QEMU_ARCH="riscv64"
+		ARCH_DIRS="${DIR}/RiscVVirtQemu"
+		UNIT0="RISCV_VIRT_CODE.qcow2"
+		UNIT1="RISCV_VIRT_VARS.qcow2"
+		FMT="qcow2"
+		;;
+	esac
+
+	DOC_CONTENTS="This package includes the TianoCore EDK II UEFI firmware for ${QEMU_ARCH}
+virtual machines. The firmware is located under ${ARCH_DIRS}.
+
+In order to use the firmware, you can run QEMU like so:
+
+	$ qemu-system-${QEMU_ARCH} \\
+		-drive file=${EPREFIX}${ARCH_DIRS%% *}/${UNIT0},if=pflash,format=${FMT},unit=0,readonly=on \\
+		-drive file=/path/to/the/copy/of/${UNIT1},if=pflash,format=${FMT},unit=1 \\
+		..."
+
+	case "${ARCH}" in
+	amd64) DOC_CONTENTS+="
+
+The firmware does not support CSM due to the lack of a free
+implementation. If you need a firmware with CSM support, you have to
+download one for yourself. Firmware blobs are commonly labelled:
+
+	OVMF_CODE-with-csm.fd
+	OVMF_VARS-with-csm.fd"
+		;;
+	arm64) DOC_CONTENTS+="
+
+WARNING! QEMU_EFI.secboot_INSECURE.qcow2 does have Secure Boot
+enabled, but it must not be used in production. The lack of an SMM
+implementation for arm64 in this firmware means that the EFI
+variable store is unprotected, making the firmware unsafe."
+		;;
+	esac
+}
+
+link_mod() {
+	rmdir "$2" && ln -sfT "$1" "$2" || die "linking ${2##*/} failed"
+}
+
+src_prepare() {
+	# Bundled submodules
+	link_mod "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}" \
+		BaseTools/Source/C/BrotliCompress/brotli
+	link_mod "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}" \
+		MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
+	link_mod "${WORKDIR}/libspdm-${BUNDLED_LIBSPDM_SUBMODULE_SHA}" \
+		SecurityPkg/DeviceSecurity/SpdmLib/libspdm
+	link_mod "${WORKDIR}/mbedtls-${BUNDLED_MBEDTLS_SUBMODULE_SHA}" \
+		CryptoPkg/Library/MbedTlsLib/mbedtls
+	link_mod "${WORKDIR}/public-mipi-sys-t-${BUNDLED_MIPI_SYS_T_SUBMODULE_SHA}" \
+		MdePkg/Library/MipiSysTLib/mipisyst
+	link_mod "${WORKDIR}/${BUNDLED_OPENSSL_SUBMODULE_P}" \
+		CryptoPkg/Library/OpensslLib/openssl
+
+	use arm64 &&
+		link_mod "${WORKDIR}/pylibfdt-${BUNDLED_LIBFDT_SUBMODULE_SHA}" \
+			MdePkg/Library/BaseFdtLib/libfdt
+
+	default
+
+	# Fix descriptor paths for prefix.
+	hprefixify "${FILESDIR}"/descriptors/*.json
+}
+
+mybuild() {
+	edo build \
+		-t "${TOOLCHAIN}" \
+		-b "${BUILD_TARGET}" \
+		-D NETWORK_HTTP_BOOT_ENABLE \
+		-D NETWORK_IP6_ENABLE \
+		-D NETWORK_TLS_ENABLE \
+		-D TPM1_ENABLE \
+		-D TPM2_ENABLE \
+		-D TPM2_CONFIG_ENABLE \
+		"${BUILD_ARGS[@]}" \
+		"${@}"
+}
+
+# Add the MS and Red Hat Secure Boot certificates and update the revocation list
+# for the given architecture in the given raw variables image.
+mk_fw_vars() {
+	edo virt-fw-vars \
+		--set-dbx "${DISTDIR}/$1_DBXUpdate_${DBXDATE}.bin" \
+		--secure-boot --enroll-redhat --inplace "$2"
+}
+
+# Convert the given images from raw to QCOW2 and resize them to the amount given
+# as the first argument. Specify 0 to not resize.
+raw_to_qcow2() {
+	local SIZE=$1 RAW
+	shift
+
+	for RAW in "${@}"; do
+		edo qemu-img convert -f raw -O qcow2 -o cluster_size=4096 -S 4096 "${RAW}" "${RAW%.fd}.qcow2"
+		[[ ${SIZE} != 0 ]] && edo qemu-img resize -f qcow2 "${RAW%.fd}.qcow2" "${SIZE}"
+		rm "${RAW}" || die
+	done
+}
+
+src_compile() {
+	TOOLCHAIN="GCC5"
+	BUILD_TARGET="RELEASE"
+	BUILD_DIR="${BUILD_TARGET}_${TOOLCHAIN}"
+	BUILD_ARGS=()
+
+	tc-export_build_env
+	emake -C BaseTools \
+		CC="$(tc-getBUILD_CC)" \
+		CXX="$(tc-getBUILD_CXX)" \
+		EXTRA_OPTFLAGS="${BUILD_CFLAGS}" \
+		EXTRA_LDFLAGS="${BUILD_LDFLAGS}"
+
+	export \
+		"${TOOLCHAIN}_${TARGET_ARCH}_PREFIX=${CHOST}-" \
+		"${TOOLCHAIN}_BIN=${CHOST}-"
+
+	. ./edksetup.sh
+
+	# DO NOT enable the shell with Secure Boot as it can be used as a bypass!
+
+	case "${ARCH}" in
+	amd64)
+		local SIZE
+		for SIZE in _2M _4M; do
+			mybuild -a X64 -p OvmfPkg/OvmfPkgX64.dsc \
+				-D FD_SIZE${SIZE}B \
+				-D BUILD_SHELL=FALSE \
+				-D SECURE_BOOT_ENABLE \
+				-D SMM_REQUIRE
+
+			mv -T Build/OvmfX64 Build/OvmfX64${SIZE}.secboot || die
+
+			mybuild -a X64 -p OvmfPkg/OvmfPkgX64.dsc \
+				-D FD_SIZE${SIZE}B
+
+			mv -T Build/OvmfX64 Build/OvmfX64${SIZE} || die
+
+			mk_fw_vars x64 Build/OvmfX64${SIZE}.secboot/"${BUILD_DIR}"/FV/OVMF_VARS.fd
+		done
+
+		# Fedora only converts newer images to QCOW2. 2MB images are raw.
+		raw_to_qcow2 0 Build/OvmfX64_4M*/"${BUILD_DIR}"/FV/OVMF_{CODE,VARS}.fd
+		;;
+	arm64)
+		BUILD_ARGS+=(
+			# grub.efi uses EfiLoaderData for code
+			--pcd PcdDxeNxMemoryProtectionPolicy=0xC000000000007FD1
+			# shim.efi has broken MemAttr code
+			--pcd PcdUninstallMemAttrProtocol=TRUE
+		)
+
+		mybuild -a AARCH64 -p ArmVirtPkg/ArmVirtQemu.dsc \
+			-D BUILD_SHELL=FALSE \
+			-D SECURE_BOOT_ENABLE
+
+		mv -T Build/ArmVirtQemu-AARCH64 Build/ArmVirtQemu-AARCH64.secboot_INSECURE || die
+
+		mybuild -a AARCH64 -p ArmVirtPkg/ArmVirtQemu.dsc
+
+		mk_fw_vars arm64 Build/ArmVirtQemu-AARCH64.secboot_INSECURE/"${BUILD_DIR}"/FV/QEMU_VARS.fd
+		raw_to_qcow2 64m Build/ArmVirtQemu-AARCH64*/"${BUILD_DIR}"/FV/QEMU_{EFI,VARS}.fd
+		;;
+	riscv)
+		mybuild -a RISCV64 -p OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc
+		raw_to_qcow2 32m Build/RiscVVirtQemu/"${BUILD_DIR}"/FV/RISCV_VIRT_{CODE,VARS}.fd
+		;;
+	esac
+}
+
+src_install() {
+	local SIZE TYPE FMT
+
+	case "${ARCH}" in
+	amd64)
+		insinto ${DIR}/OvmfX64
+		doins Build/OvmfX64_2M/"${BUILD_DIR}"/X64/Shell.efi
+
+		for SIZE in _2M _4M; do
+			for TYPE in "" .secboot; do
+				[[ ${SIZE} = _4M ]] && FMT=qcow2 || FMT=fd
+				newins Build/OvmfX64${SIZE}${TYPE}/"${BUILD_DIR}"/FV/OVMF_CODE.${FMT} OVMF_CODE${SIZE#_2M}${TYPE}.${FMT}
+				newins Build/OvmfX64${SIZE}${TYPE}/"${BUILD_DIR}"/FV/OVMF_VARS.${FMT} OVMF_VARS${SIZE#_2M}${TYPE}.${FMT}
+			done
+		done
+
+		# Compatibility with older package versions.
+		dosym ${PN}/OvmfX64 /usr/share/edk2-ovmf
+		;;
+	arm64)
+		insinto ${DIR}/ArmVirtQemu-AARCH64
+
+		for TYPE in "" .secboot_INSECURE; do
+			newins Build/ArmVirtQemu-AARCH64${TYPE}/"${BUILD_DIR}"/FV/QEMU_EFI.qcow2 QEMU_EFI${TYPE}.qcow2
+			newins Build/ArmVirtQemu-AARCH64${TYPE}/"${BUILD_DIR}"/FV/QEMU_VARS.qcow2 QEMU_VARS${TYPE}.qcow2
+		done
+		;;
+	riscv)
+		insinto ${DIR}/RiscVVirtQemu
+		doins Build/RiscVVirtQemu/"${BUILD_DIR}"/FV/RISCV_VIRT_{CODE,VARS}.qcow2
+		;;
+	esac
+
+	insinto /usr/share/qemu/firmware
+	doins "${FILESDIR}"/descriptors/*"${TARGET_ARCH,,}"*.json
+
+	secureboot_auto_sign --in-place
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	local OLD=${EROOT}/usr/share/edk2-ovmf NEW=${EROOT}/${DIR}/OvmfX64
+	if [[ -d ${OLD} && ! -L ${OLD} ]]; then
+		{
+			rm -vf "${OLD}"/{OVMF_{CODE,CODE.secboot,VARS}.fd,EnrollDefaultKeys.efi,Shell.efi,UefiShell.img} &&
+			mkdir -p "${NEW}" &&
+			find "${OLD}" -mindepth 1 -maxdepth 1 -execdir mv --update=none-fail -vt "${NEW}"/ {} + &&
+			rmdir "${OLD}"
+		} || die "unable to replace old directory with compatibility symlink"
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-firmware/edk2/files/descriptors/50-edk2-riscv64-qcow2-nosb.json b/sys-firmware/edk2/files/descriptors/50-edk2-riscv64-qcow2-nosb.json
new file mode 100644
index 000000000000..a8d6e7498dd9
--- /dev/null
+++ b/sys-firmware/edk2/files/descriptors/50-edk2-riscv64-qcow2-nosb.json
@@ -0,0 +1,33 @@
+{
+    "description": "UEFI for RISC-V VMs",
+    "interface-types": [
+        "uefi"
+    ],
+    "mapping": {
+        "device": "flash",
+        "mode" : "split",
+        "executable": {
+            "filename": "/usr/share/edk2/RiscVVirtQemu/RISCV_VIRT_CODE.qcow2",
+            "format": "qcow2"
+        },
+        "nvram-template": {
+            "filename": "/usr/share/edk2/RiscVVirtQemu/RISCV_VIRT_VARS.qcow2",
+            "format": "qcow2"
+        }
+    },
+    "targets": [
+        {
+            "architecture": "riscv64",
+            "machines": [
+                "virt",
+                "virt-*"
+            ]
+        }
+    ],
+    "features": [
+
+    ],
+    "tags": [
+
+    ]
+}
diff --git a/sys-firmware/edk2/files/edk2-202411-werror.patch b/sys-firmware/edk2/files/edk2-202411-werror.patch
new file mode 100644
index 000000000000..e7b63abc1091
--- /dev/null
+++ b/sys-firmware/edk2/files/edk2-202411-werror.patch
@@ -0,0 +1,56 @@
+diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
+index 14f3b643c4..03fad15ff9 100755
+--- a/BaseTools/Conf/tools_def.template
++++ b/BaseTools/Conf/tools_def.template
+@@ -896,7 +896,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink="$(DEBUG_DIR)/$(MODULE_
+ *_*_*_DTC_PATH                     = DEF(DTC_BIN)

+ 

+ # All supported GCC archs except LOONGARCH64 support -mstack-protector-guard=global, so set that on everything except LOONGARCH64

+-DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common -fstack-protector

++DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Wno-array-bounds -include AutoGen.h -fno-common -fstack-protector

+ DEFINE GCC_IA32_X64_CC_FLAGS       = -mstack-protector-guard=global

+ DEFINE GCC_ARM_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -fno-pic -fno-pie -mstack-protector-guard=global

+ DEFINE GCC_LOONGARCH64_CC_FLAGS    = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d -fno-asynchronous-unwind-tables -Wno-address -fno-short-enums -fsigned-char -ffunction-sections -fdata-sections

+@@ -1006,7 +1006,7 @@ DEFINE GCC5_ARM_ASLDLINK_FLAGS       = DEF(GCC49_ARM_ASLDLINK_FLAGS)
+ DEFINE GCC5_AARCH64_ASLDLINK_FLAGS   = DEF(GCC49_AARCH64_ASLDLINK_FLAGS)

+ DEFINE GCC5_ASLCC_FLAGS              = DEF(GCC49_ASLCC_FLAGS) -fno-lto

+ 

+-DEFINE GCC5_RISCV_ALL_CC_FLAGS                    = -g -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings -msmall-data-limit=0

++DEFINE GCC5_RISCV_ALL_CC_FLAGS                    = -g -fshort-wchar -fno-strict-aliasing -Wall -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings -msmall-data-limit=0

+ DEFINE GCC5_RISCV_ALL_DLINK_COMMON                = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x40

+ DEFINE GCC5_RISCV_ALL_DLINK_FLAGS                 = DEF(GCC5_RISCV_ALL_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map

+ DEFINE GCC5_RISCV_ALL_DLINK2_FLAGS                = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds

+@@ -1022,7 +1022,7 @@ DEFINE GCC5_RISCV64_DLINK_FLAGS            = DEF(GCC5_RISCV_ALL_DLINK_FLAGS) -Wl
+ DEFINE GCC5_RISCV64_DLINK2_FLAGS           = DEF(GCC5_RISCV_ALL_DLINK2_FLAGS)

+ DEFINE GCC5_RISCV64_ASM_FLAGS              = DEF(GCC5_RISCV_ALL_ASM_FLAGS) -march=DEF(GCC5_RISCV64_ARCH) -mcmodel=medany -mabi=lp64

+ 

+-DEFINE GCC5_LOONGARCH64_CC_FLAGS           = DEF(GCC_LOONGARCH64_CC_FLAGS) -march=loongarch64 -mno-memcpy -Werror -Wno-maybe-uninitialized -Wno-stringop-overflow -Wno-pointer-to-int-cast -no-pie -fno-stack-protector -mno-explicit-relocs

++DEFINE GCC5_LOONGARCH64_CC_FLAGS           = DEF(GCC_LOONGARCH64_CC_FLAGS) -march=loongarch64 -mno-memcpy -Wno-maybe-uninitialized -Wno-stringop-overflow -Wno-pointer-to-int-cast -no-pie -fno-stack-protector -mno-explicit-relocs

+ DEFINE GCC5_LOONGARCH64_DLINK_FLAGS        = DEF(GCC_LOONGARCH64_DLINK_FLAGS)

+ DEFINE GCC5_LOONGARCH64_DLINK2_FLAGS       = DEF(GCC_DLINK2_FLAGS_COMMON) -Wl,--defsym=PECOFF_HEADER_SIZE=0x228

+ DEFINE GCC5_LOONGARCH64_ASLDLINK_FLAGS     = DEF(GCC_LOONGARCH64_ASLDLINK_FLAGS) DEF(GCC5_LOONGARCH64_DLINK2_FLAGS)

+diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
+index d369908a09..1bf4caaa53 100644
+--- a/BaseTools/Source/C/Makefiles/header.makefile
++++ b/BaseTools/Source/C/Makefiles/header.makefile
+@@ -92,17 +92,17 @@ BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS)
+ 

+ ifeq ($(DARWIN),Darwin)

+ # assume clang or clang compatible flags on OS X

+-CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \

++CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall \

+ -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g

+ else

+ ifneq ($(CLANG),)

+ CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \

+--fno-delete-null-pointer-checks -Wall -Werror \

++-fno-delete-null-pointer-checks -Wall \

+ -Wno-deprecated-declarations -Wno-self-assign \

+ -Wno-unused-result -nostdlib -g

+ else

+ CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \

+--fno-delete-null-pointer-checks -Wall -Werror \

++-fno-delete-null-pointer-checks -Wall \

+ -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \

+ -Wno-unused-result -nostdlib -g

+ endif

diff --git a/sys-firmware/intel-microcode/intel-microcode-20240813_p20240815.ebuild b/sys-firmware/intel-microcode/intel-microcode-20240813_p20240815.ebuild
index 3af9d1741d1e..b2000fab7d45 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20240813_p20240815.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20240813_p20240815.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
@@ -95,7 +95,7 @@ pkg_pretend() {
 		if use dist-kernel; then
 			# Check, but don't die because we can fix the problem and then
 			# emerge --config ... to re-run installation.
-			[[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
+			nonfatal mount-boot_check_status
 		else
 			mount-boot_pkg_pretend
 		fi
@@ -311,7 +311,7 @@ pkg_postrm() {
 pkg_postinst() {
 	if use initramfs; then
 		if use dist-kernel; then
-			[[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
 		else
 			# Don't forget to umount /boot if it was previously mounted by us.
 			mount-boot_pkg_postinst
diff --git a/sys-firmware/intel-microcode/intel-microcode-20240910_p20240915.ebuild b/sys-firmware/intel-microcode/intel-microcode-20240910_p20240915.ebuild
index 3af9d1741d1e..b2000fab7d45 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20240910_p20240915.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20240910_p20240915.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
@@ -95,7 +95,7 @@ pkg_pretend() {
 		if use dist-kernel; then
 			# Check, but don't die because we can fix the problem and then
 			# emerge --config ... to re-run installation.
-			[[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
+			nonfatal mount-boot_check_status
 		else
 			mount-boot_pkg_pretend
 		fi
@@ -311,7 +311,7 @@ pkg_postrm() {
 pkg_postinst() {
 	if use initramfs; then
 		if use dist-kernel; then
-			[[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
 		else
 			# Don't forget to umount /boot if it was previously mounted by us.
 			mount-boot_pkg_postinst
diff --git a/sys-firmware/intel-microcode/intel-microcode-20241112_p20241103.ebuild b/sys-firmware/intel-microcode/intel-microcode-20241112_p20241103.ebuild
index 3af9d1741d1e..b2000fab7d45 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20241112_p20241103.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20241112_p20241103.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
@@ -95,7 +95,7 @@ pkg_pretend() {
 		if use dist-kernel; then
 			# Check, but don't die because we can fix the problem and then
 			# emerge --config ... to re-run installation.
-			[[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
+			nonfatal mount-boot_check_status
 		else
 			mount-boot_pkg_pretend
 		fi
@@ -311,7 +311,7 @@ pkg_postrm() {
 pkg_postinst() {
 	if use initramfs; then
 		if use dist-kernel; then
-			[[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
 		else
 			# Don't forget to umount /boot if it was previously mounted by us.
 			mount-boot_pkg_postinst
diff --git a/sys-firmware/ipxe/ipxe-1.21.1_p20230601-r1.ebuild b/sys-firmware/ipxe/ipxe-1.21.1_p20230601-r1.ebuild
index 188167274da9..3100d26429e5 100644
--- a/sys-firmware/ipxe/ipxe-1.21.1_p20230601-r1.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.21.1_p20230601-r1.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
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${COMMIT_SHA1}/src"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv x86"
 IUSE="+binary uefi32 uefi64 ipv6 iso lkrn +qemu undi usb vmware"
 REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
 
diff --git a/sys-firmware/seabios-bin/seabios-bin-1.16.3.ebuild b/sys-firmware/seabios-bin/seabios-bin-1.16.3.ebuild
index d7f6e504d2c4..8c2d6ce929f3 100644
--- a/sys-firmware/seabios-bin/seabios-bin-1.16.3.ebuild
+++ b/sys-firmware/seabios-bin/seabios-bin-1.16.3.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 @@ S="${WORKDIR}"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="!sys-firmware/seabios"
 
diff --git a/sys-firmware/seabios/seabios-1.16.3.ebuild b/sys-firmware/seabios/seabios-1.16.3.ebuild
index 479ecc04bb6f..46cb65492f78 100644
--- a/sys-firmware/seabios/seabios-1.16.3.ebuild
+++ b/sys-firmware/seabios/seabios-1.16.3.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
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.seabios.org/downloads/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 x86"
+	KEYWORDS="~alpha amd64 arm64 ~loong ~m68k ~mips ppc ppc64 x86"
 fi
 
 DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index 95df53082d6c..c5d207aa4f5f 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -1 +1,2 @@
 DIST bees-0.10.tar.gz 177509 BLAKE2B 269cf65d5250a07297dfaee6c0fd6bc25199d63fe423d63ce39df8bcdb64d6f8110a0e03d0dc7dc1b105a8886f2a9364da8878481546eaa8dbf3dc46abc569ed SHA512 77a4ae3d66430c2d9dc0351c16c60bad95f21e238fc00f5f5787f55929ba75ee25212ac4bb4a3e4a9419cec27bbcfd2987aa925a54bc2872609b38a698dbedc3
+DIST bees-0.11-rc3.tar.gz 193475 BLAKE2B bb3d867843266ea5766bc079d6731c79bdc80b9df5cf08a3fa3361ecbe439002a396610b32d3875085c672cf891b55c61ccce7260d22a537d705c2a89b040e4c SHA512 66f42ff60ccdbd56a022d94370aa856453d016d69469c503a2182535b630e5b6d0d0fecf12574f1b23750942b48a9473414424cb9ad1954ef11a3b7a8e6ea1a6
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/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 374dde7eb991..06b1e86b2059 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,10 +1,2 @@
-DIST btrfs-progs-v6.10.1.tar.sign 566 BLAKE2B dc18c0048716e422475c6630c26c74e09b3595fb8c5c1a1826464eb837d16edfe7d5fa1f418631ae4d380b24bc3fb91fa79ba1e9b1d42a2534838558362ddc18 SHA512 a8a1805ab22feda9f0535841d44120200e48d6d3762ae98f3323be09c9bd7905ff69f21066a8de1fe5cb34a3113879b73ae030a74ccc74737f06dafb32093375
-DIST btrfs-progs-v6.10.1.tar.xz 2670604 BLAKE2B 7a2631b8462bb02be0936861a42b868907bd4f4e365293f9c95744b963e769b81248ba0a290fca517d689ff9f93d8709cc37e217264b2dac1469a47349f97e8c SHA512 cd10747d1f5f9377abfdf209b517791d3eb13b417c0be65fd5c0c044b01063125b4176c178345387bb3deda7a3a379953f31d46d7834854455a5dbfbf967aa97
-DIST btrfs-progs-v6.10.tar.sign 566 BLAKE2B 493260b4854616eabce943135b4990de4a724ad00f8cba43e9d864e5c67e5896890831d17c742456d422ed15267a753c4eaf18ac30a4c7c3da0b254b01becf8b SHA512 62d9721702eec6eec2c0e51eee4624324c4604d3bc76016cde1ade0572c22b46ede71fcb3d9e4ca14ea0196e84116ce4ef9222b399f8bbdf8e5259c18f3a82e8
-DIST btrfs-progs-v6.10.tar.xz 2669760 BLAKE2B 24b66cc6f7118da817e9abca69e8de9a9496de1ec4eb6800fa8f6b13b677e37a553d90562a38618a63b68b71457ab10ff72541dd3e0c169a1fe05509fd62402c SHA512 aa5af67f3816dcd1a128b69bc6f4bd83423c6c2289e3dd3abe2a07bdccb6b7d5e49426a5a0ece643709c23cdcb0908ca52b271f058fee3a3d810cdfcb9c36639
-DIST btrfs-progs-v6.11.tar.sign 566 BLAKE2B 15db44b5db3265eff9d5195ad4842cef5d001c46e1170f219784fca8d049756dccbc1bd95f20fc343fbdf1078c610a166921c043828cdc5f64c0f465323ca0e4 SHA512 a2fdd9100ad3ddd30cb923a72a2b4f70634277e5fbbf0d2cf912c00dc876dad6cd2c24e624f41dbb83aabdda4e3c08aea9c0ae39084bb3481700491df3d47fd5
-DIST btrfs-progs-v6.11.tar.xz 2695752 BLAKE2B 6dec219394e39a821f29858eddf1d501537d3cebad2dc83f0cea6d88d0b0e94c4fe2e660a48a27942ccfb6f3ac0630d5930f44e083168de65b60af36e895b2af SHA512 fad3c7e908e2020a3983f9737a7e87367023e2ad35aea14197e2bfa71c1e0435bc3da3f7e6ef463de47c033323163f8b1b7933013042c6fcea673d0f4723ade1
 DIST btrfs-progs-v6.12.tar.sign 566 BLAKE2B 3a32b52522acd9e2fcf34cbf90d91ca2491ae1b34142320b987084a60c9f6c13100fcfb554f877c0f659b60415234550c05d980c633015cd8d083df18521187a SHA512 86396dad38f15c19eb4b641632deb99073829896001b71fbdfaa3ebd11468e8b89ed324e563ec9db837c9095501227824f97085347dca4204cbaecceed9da7d3
 DIST btrfs-progs-v6.12.tar.xz 2705336 BLAKE2B d1569ec7b2079a43ac370c3a7e9f1b37a06545675753490f16d6a7bb52281f76df39f924c96569a1c75daa8a998f251c5219e2f09a54cb94c42cba1db3cf43ca SHA512 57da37f460a33b5f5232a5c8e67eb5976fb13483a1437112bd433b179bc0e497a1aadfe24705eb4fb4e0a98d2a33fd3c46808b3ca161421475442a70b964c446
-DIST btrfs-progs-v6.9.2.tar.sign 566 BLAKE2B 4cd95496d355444c7d3e582a7e6c05fbb55683008b1585a26f38aef6cceb1afd5e80c9611518d6bd92dc1167798d4012c4bcab2f9bda752c459d94cfa6f3c477 SHA512 3fb04e1894e231abde388a39d2f0c90f43c1a1494622c2158fab9b94bb340e064404bcf96e24d913c60aaf5e06ade42fbb91a479949109b329682bb089f66bf2
-DIST btrfs-progs-v6.9.2.tar.xz 2661684 BLAKE2B 38ab189ac8271ba8d68b74e82569159c671cca1cb946f56ccab28b6b206cb6ee5b330d83afc3536b7e0d7399da3fb01e368809c1ef4a64b843ea88796ebd28bd SHA512 1df9d5456d07a035c38c17795996a4fc621eeaa244ef54383d4387205826d2a6e971910e55031d20bb1baf23193efa7439e110312ffd8471f07aaf8c0baca20a
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.10.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.10.1.ebuild
deleted file mode 100644
index 89de2ab69fa8..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.10.1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with dev-python/btrfsutil
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit bash-completion-r1 python-any-r1 udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc
-	inherit verify-sig
-
-	MY_PV="v${PV/_/-}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="
-		https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz
-		verify-sig? ( https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign )
-	"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-	fi
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/0" # libbtrfs soname
-IUSE="+convert +man experimental reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:=[static-libs(+)?]
-	sys-libs/zlib:=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd[static-libs(+)] )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	man? (
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
-}
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )"
-fi
-
-pkg_setup() {
-	: # Prevent python-any-r1_python_setup
-}
-
-if [[ ${PV} != 9999 ]]; then
-	src_unpack() {
-		# Upstream sign the decompressed .tar
-		if use verify-sig; then
-			einfo "Unpacking ${MY_P}.tar.xz ..."
-			verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
-				< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -))
-			assert "Unpack failed"
-		else
-			default
-		fi
-	}
-fi
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		local AT_M4DIR=config
-		eautoreconf
-
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-
-		--enable-lzo
-		$(use_enable experimental)
-		--disable-python
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi, openssl, botan
-		--with-crypto=builtin
-		--with-convert=ext2$(usev reiserfs ',reiserfs')
-	)
-
-	export EXTRA_PYTHON_CFLAGS="${CFLAGS}"
-	export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}"
-
-	if use man; then
-		python_setup
-	fi
-
-	# bash as a temporary workaround for https://github.com/kdave/btrfs-progs/pull/721
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_test() {
-	emake V=1 -j1 -C tests test
-}
-
-src_install() {
-	local makeargs=(
-		$(usev static install-static)
-	)
-
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
-	if use experimental; then
-		exeinto /sbin
-		doexe btrfs-corrupt-block
-	fi
-
-	newbashcomp btrfs-completion btrfs
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.10.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.10.ebuild
deleted file mode 100644
index 757755270ab8..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.10.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with dev-python/btrfsutil
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit bash-completion-r1 python-any-r1 udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc
-	inherit verify-sig
-
-	MY_PV="v${PV/_/-}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="
-		https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz
-		verify-sig? ( https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign )
-	"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	fi
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/0" # libbtrfs soname
-IUSE="+convert +man experimental reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:=[static-libs(+)?]
-	sys-libs/zlib:=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd[static-libs(+)] )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	man? (
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
-}
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )"
-fi
-
-pkg_setup() {
-	: # Prevent python-any-r1_python_setup
-}
-
-if [[ ${PV} != 9999 ]]; then
-	src_unpack() {
-		# Upstream sign the decompressed .tar
-		if use verify-sig; then
-			einfo "Unpacking ${MY_P}.tar.xz ..."
-			verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
-				< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -))
-			assert "Unpack failed"
-		else
-			default
-		fi
-	}
-fi
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		local AT_M4DIR=config
-		eautoreconf
-
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-
-		--enable-lzo
-		$(use_enable experimental)
-		--disable-python
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi, openssl, botan
-		--with-crypto=builtin
-		--with-convert=ext2$(usev reiserfs ',reiserfs')
-	)
-
-	export EXTRA_PYTHON_CFLAGS="${CFLAGS}"
-	export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}"
-
-	if use man; then
-		python_setup
-	fi
-
-	# bash as a temporary workaround for https://github.com/kdave/btrfs-progs/pull/721
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_test() {
-	emake V=1 -j1 -C tests test
-}
-
-src_install() {
-	local makeargs=(
-		$(usev static install-static)
-	)
-
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
-	if use experimental; then
-		exeinto /sbin
-		doexe btrfs-corrupt-block
-	fi
-
-	newbashcomp btrfs-completion btrfs
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.11.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.11.ebuild
deleted file mode 100644
index 89de2ab69fa8..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.11.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with dev-python/btrfsutil
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit bash-completion-r1 python-any-r1 udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc
-	inherit verify-sig
-
-	MY_PV="v${PV/_/-}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="
-		https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz
-		verify-sig? ( https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign )
-	"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-	fi
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/0" # libbtrfs soname
-IUSE="+convert +man experimental reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:=[static-libs(+)?]
-	sys-libs/zlib:=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd[static-libs(+)] )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	man? (
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
-}
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )"
-fi
-
-pkg_setup() {
-	: # Prevent python-any-r1_python_setup
-}
-
-if [[ ${PV} != 9999 ]]; then
-	src_unpack() {
-		# Upstream sign the decompressed .tar
-		if use verify-sig; then
-			einfo "Unpacking ${MY_P}.tar.xz ..."
-			verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
-				< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -))
-			assert "Unpack failed"
-		else
-			default
-		fi
-	}
-fi
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		local AT_M4DIR=config
-		eautoreconf
-
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-
-		--enable-lzo
-		$(use_enable experimental)
-		--disable-python
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi, openssl, botan
-		--with-crypto=builtin
-		--with-convert=ext2$(usev reiserfs ',reiserfs')
-	)
-
-	export EXTRA_PYTHON_CFLAGS="${CFLAGS}"
-	export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}"
-
-	if use man; then
-		python_setup
-	fi
-
-	# bash as a temporary workaround for https://github.com/kdave/btrfs-progs/pull/721
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_test() {
-	emake V=1 -j1 -C tests test
-}
-
-src_install() {
-	local makeargs=(
-		$(usev static install-static)
-	)
-
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
-	if use experimental; then
-		exeinto /sbin
-		doexe btrfs-corrupt-block
-	fi
-
-	newbashcomp btrfs-completion btrfs
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.12.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.12.ebuild
index 757755270ab8..a5ea43585677 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-6.12.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.12.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
@@ -26,7 +26,7 @@ else
 	S="${WORKDIR}"/${PN}-${MY_PV}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+		KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 	fi
 fi
 
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild
deleted file mode 100644
index 89de2ab69fa8..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with dev-python/btrfsutil
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit bash-completion-r1 python-any-r1 udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc
-	inherit verify-sig
-
-	MY_PV="v${PV/_/-}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="
-		https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz
-		verify-sig? ( https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign )
-	"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-	fi
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/0" # libbtrfs soname
-IUSE="+convert +man experimental reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:=[static-libs(+)?]
-	sys-libs/zlib:=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd[static-libs(+)] )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	man? (
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
-}
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )"
-fi
-
-pkg_setup() {
-	: # Prevent python-any-r1_python_setup
-}
-
-if [[ ${PV} != 9999 ]]; then
-	src_unpack() {
-		# Upstream sign the decompressed .tar
-		if use verify-sig; then
-			einfo "Unpacking ${MY_P}.tar.xz ..."
-			verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
-				< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -))
-			assert "Unpack failed"
-		else
-			default
-		fi
-	}
-fi
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		local AT_M4DIR=config
-		eautoreconf
-
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-
-		--enable-lzo
-		$(use_enable experimental)
-		--disable-python
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi, openssl, botan
-		--with-crypto=builtin
-		--with-convert=ext2$(usev reiserfs ',reiserfs')
-	)
-
-	export EXTRA_PYTHON_CFLAGS="${CFLAGS}"
-	export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}"
-
-	if use man; then
-		python_setup
-	fi
-
-	# bash as a temporary workaround for https://github.com/kdave/btrfs-progs/pull/721
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_test() {
-	emake V=1 -j1 -C tests test
-}
-
-src_install() {
-	local makeargs=(
-		$(usev static install-static)
-	)
-
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
-	if use experimental; then
-		exeinto /sbin
-		doexe btrfs-corrupt-block
-	fi
-
-	newbashcomp btrfs-completion btrfs
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.7.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.7.5-r1.ebuild
index 99ae9173e684..010d7b023ed9 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.7.5-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.7.5-r1.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 @@ S="${WORKDIR}"/${P/_/-}
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
diff --git a/sys-fs/cryptsetup/cryptsetup-2.7.5.ebuild b/sys-fs/cryptsetup/cryptsetup-2.7.5.ebuild
index 265a6450c1e2..129bb2fc5649 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.7.5.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.7.5.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 @@ S="${WORKDIR}"/${P/_/-}
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index a06e012720ae..1a15dc2aff85 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -1,2 +1,3 @@
 DIST dd_rescue-1.99.13.tar.bz2 182574 BLAKE2B da16f37dffc702695d49517aed9a33ce4d00b5e9903c363deaf4b4ed8b5294246d0fe78e977b8a6f6128b9b643a8986437359c78726695fc8e68be41bb11d93e SHA512 2276128fe176dce3ecbd6aa8e0d00b9547887f0498ce0cd135e61dbf882c521e22e2afce3539a73496da1d0472cd9582971a30eb558ce3211820c8d0358c8241
 DIST dd_rescue-1.99.17.tar.bz2 199774 BLAKE2B fd235ce5cb9d80960451f5a65eef0fdc73cd21f684210037056bc5a4952af40e5d494cf541f9e87b76d5d18508caa221c2f4919d537580d4eb58fd67a0c65177 SHA512 8bdd63ed48413607e1da004f497feec8b8a990488348105d30d4d7e56e342b54b4e6439270e581e434b4b0edcf55ab11490739b0c6563358c59b5a64a390a0df
+DIST dd_rescue-1.99.20.tar.bz2 208147 BLAKE2B 145868765b1126a219d2bf9de2e974ba1824d11efd15d58097674ada52bdd4f8909bbf7b4c11a2dd7314639ce487bd4e526cbcbd82d82d43349366ad1284257c SHA512 eb40916f972a486262d4dc03baafdc4b70b0fdc473cd1c20061f64737a99dcceb5ee56334e36f8fa441a0b1d352763d5b8fc153a2ef8403a5b2295f11273c8c2
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.17.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.17.ebuild
index 49fa8eb2ea56..f4d8e24954eb 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.17.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.17.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cpu_flags_x86_aes cpu_flags_x86_avx2 lzo lzma cpu_flags_x86_rdrand cpu_flags_x86_sha cpu_flags_x86_sse4_2 static test xattr"
+IUSE="cpu_flags_x86_avx2 lzo lzma cpu_flags_x86_sse4_2 static test xattr"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -81,14 +81,13 @@ _emake() {
 	local os=$(usex kernel_linux Linux IDK)
 
 	# HAVE_LZO is special as it's checked for emptiness in test_crypt.sh.
+	# We could try make RDRND and friends controlled via USE but it's too brittle,
+	# see bug #947105.
 	emake \
 		MACH="${arch}" \
 		OS="${os}" \
 		HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \
-		HAVE_AES=$(usex cpu_flags_x86_aes 1 0) \
 		HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
-		HAVE_SHA=$(usex cpu_flags_x86_sha 1 0) \
-		HAVE_RDRND=$(usex cpu_flags_x86_rdrand 1 0) \
 		HAVE_LZMA=$(usex lzma 1 0) \
 		HAVE_LZO=$(usev lzo 1) \
 		HAVE_OPENSSL=0 \
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.20.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.20.ebuild
new file mode 100644
index 000000000000..f4d8e24954eb
--- /dev/null
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.20.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Similar to dd but can copy from source with errors"
+HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/"
+SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cpu_flags_x86_avx2 lzo lzma cpu_flags_x86_sse4_2 static test xattr"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	lzo? ( dev-libs/lzo )
+	xattr? ( sys-apps/attr )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		lzo? (
+			app-arch/lzop
+		)
+	)
+"
+
+src_prepare() {
+	default
+
+	if ! use cpu_flags_x86_sse4_2; then
+		sed -i \
+			-e 's:^CC_FLAGS_CHECK(-msse4.2,SSE42):#&:' \
+			configure.ac || die
+	fi
+
+	if ! use cpu_flags_x86_avx2; then
+		sed -i \
+			-e 's:^CC_FLAGS_CHECK(-mavx2,AVX2):#&:' \
+			configure.ac || die
+	fi
+
+	eautoreconf
+
+	sed -i \
+		-e 's:\(-ldl\):$(LDFLAGS) \1:' \
+		-e 's:\(-shared\):$(CFLAGS) $(LDFLAGS) \1:' \
+		Makefile || die
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	# OpenSSL is only used by a random helper tool we don't install.
+	export ac_cv_header_attr_xattr_h=$(usex xattr)
+	export ac_cv_header_openssl_evp_h=no
+	export ac_cv_lib_crypto_EVP_aes_192_ctr=no
+	export ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo)
+	export ac_cv_header_lzo_lzo1x_h=$(usex lzo)
+	export ac_cv_header_lzma_h=$(usex lzma)
+	export ac_cv_lib_lzma_lzma_easy_encoder=$(usex lzma)
+	econf
+}
+
+_emake() {
+	local arch
+	case ${ARCH} in
+		x86)   arch=i386;;
+		amd64) arch=x86_64;;
+		arm)   arch=arm;;
+		arm64) arch=aarch64;;
+	esac
+
+	local os=$(usex kernel_linux Linux IDK)
+
+	# HAVE_LZO is special as it's checked for emptiness in test_crypt.sh.
+	# We could try make RDRND and friends controlled via USE but it's too brittle,
+	# see bug #947105.
+	emake \
+		MACH="${arch}" \
+		OS="${os}" \
+		HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \
+		HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
+		HAVE_LZMA=$(usex lzma 1 0) \
+		HAVE_LZO=$(usev lzo 1) \
+		HAVE_OPENSSL=0 \
+		RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
+		CFLAGS_OPT='$(CFLAGS)' \
+		LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \
+		CC="$(tc-getCC)" \
+		"$@"
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	if ! use lzo ; then
+		sed -i \
+			-e '/^LZOP=/s:LZOP=.*:LZOP=:' \
+			-e '/^LZOP=/a exit 0' \
+			test_lzo.sh || die
+	fi
+
+	_emake check
+}
+
+src_install() {
+	# easier to install by hand than trying to make sense of the Makefile.
+	dobin dd_rescue
+	dodir /usr/$(get_libdir)/${PN}
+	cp -pPR libddr_*.so "${ED}"/usr/$(get_libdir)/${PN}/ || die
+	dodoc README.dd_rescue
+	doman dd_rescue.1
+	use lzo && doman ddr_lzo.1
+}
diff --git a/sys-fs/ddrescue/Manifest b/sys-fs/ddrescue/Manifest
index 9333a2af998c..3d5fcee9d482 100644
--- a/sys-fs/ddrescue/Manifest
+++ b/sys-fs/ddrescue/Manifest
@@ -1 +1,2 @@
 DIST ddrescue-1.28.tar.lz 93823 BLAKE2B 8c212f0d495e0df8e0398b97730c812ea9ccb77bd42e730198222e9918e3652fc52d932449b1e0dc9bdd453a123e2450c962e33e98d9845ce81b9a934a5bbdaa SHA512 ad3df2361b3b0228e2875792e0f6b301dc4d9cefd3f4fcdbce180a53c32924ee026bd27397b8efc94f40ee10f5f9d453fa72bd19203b6cb90208881e287e2c46
+DIST ddrescue-1.29.tar.lz 96728 BLAKE2B 88eab69f2296464859dc8720930f28f6bc32aa694649e15a99dcd9dfd63ed8ba845d7af347e8b1ee90e954f8317888ec0f2cd90ec98994a7d2b4d654a31adbfc SHA512 b15ca0394a19f0fba577a12c19ffb1d14b0e66a4356bf0e1cdc27ba4edcb208fbce5ca214ddccaa88aa8e116ce76932ba26a14046ccd9c835fefc20557c36cf1
diff --git a/sys-fs/ddrescue/ddrescue-1.29.ebuild b/sys-fs/ddrescue/ddrescue-1.29.ebuild
new file mode 100644
index 000000000000..dc63846261be
--- /dev/null
+++ b/sys-fs/ddrescue/ddrescue-1.29.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic unpacker
+
+DESCRIPTION="Copy data from one file or block device to another with read-error recovery"
+HOMEPAGE="https://www.gnu.org/software/ddrescue/ddrescue.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+IUSE="static"
+
+BDEPEND="$(unpacker_src_uri_depends)"
+
+src_configure() {
+	use static && append-ldflags -static
+
+	# not a normal configure script
+	econf \
+		--prefix="${EPREFIX}"/usr \
+		CXX="$(tc-getCXX)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_test() {
+	./testsuite/check.sh "${S}"/testsuite || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-man
+	einstalldocs
+}
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 158350ccca80..9708bb8bc504 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,2 +1,3 @@
 DIST e2fsprogs-1.47.0.tar.xz 7059372 BLAKE2B 84f58b05a9f0e14e1a66c6e5171ff23b022f51c4e9a02d4d6d1d26c91909f3c7ec9c9f0462663a4457b4479043774502b8891f691e58a61f4ef6bf9ba33f33aa SHA512 0e6d64c565b455becb84166b6a5c7090724bac5cfe69098657a31bf0481b4e2cace3de1363121b7d84820fbae85b7c83ac5f2a2b02bb36280f0e3ae83a934cec
 DIST e2fsprogs-1.47.1.tar.xz 7271444 BLAKE2B 67924c38a6b688e0db5ee77b0e11a8b34ec602a729d48516668e9fdf7f36964c8a9369295f0313bfacdc8e5f3f5a27d79a8d99a1aca3b4fe0ced98a4db4884ea SHA512 2ac51f7654a44adf3ee5a5e32cecd7f129e423bdf3074c60b22a7acdba131e7dd0bb2964c107a06ae133f51836272be166f5da1f996f67ceb6c22e2636117beb
+DIST e2fsprogs-1.47.2.tar.xz 7299932 BLAKE2B 20f93b53c18396dbbf8a9564fd80181e391120554bd63a76c90c88d32616596fb7cf8e1252417b835ef3918ecf3211aebdd7a75daebee11bcb6e7b0f9bd88053 SHA512 a32632e072e535bf164503cf9992a4da7ea971e80f8f84ead4e7bc8899a92c27e4670bdebef1de0187596672e44af7b96078888e0cd4eefa3e3f551344d434d8
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.2.ebuild
new file mode 100644
index 000000000000..55fb96d3c4a9
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.2.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal systemd toolchain-funcs udev
+
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="archive cron fuse nls static-libs test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!sys-libs/${PN}-libs
+	archive? ( app-arch/libarchive:= )
+	cron? ( sys-fs/lvm2[lvm] )
+	fuse? ( sys-fs/fuse:3 )
+	nls? ( virtual/libintl )
+	tools? ( sys-apps/util-linux )
+"
+# For testing lib/ext2fs, lib/support/libsupport.a is required, which
+# unconditionally includes '<blkid/blkid.h>' from sys-apps/util-linux.
+DEPEND="
+	${RDEPEND}
+	test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	sys-apps/texinfo
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ext2fs/ext2_types.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch # bug #516854
+	# We can drop this metadata patch after 6 months or so to let initramfses
+	# upgrade. See bug #904093 and bug #904048.
+	"${FILESDIR}"/${PN}-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch
+
+	# Upstream patches (can usually removed with next version bump)
+)
+
+src_prepare() {
+	default
+
+	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
+
+	# Get rid of doc -- we don't use them. This also prevents a sandbox
+	# violation due to mktexfmt invocation
+	rm -r doc || die "Failed to remove doc dir"
+
+	cat <<-'EOF' > tests/m_rootdir_acl/script || die
+	echo "$test_name: $test_description: skipped (bgo#905221, fails on btrfs)"
+	return 0
+	EOF
+
+	# Prevent included intl cruft from building, bug #81096
+	sed -i -r \
+		-e 's:@LIBINTL@:@LTLIBINTL@:' \
+		MCONFIG.in || die 'intl cruft'
+}
+
+multilib_src_configure() {
+	# Keep the package from doing silly things, bug #261411
+	export VARTEXFONTS="${T}/fonts"
+
+	local myeconfargs=(
+		--with-root-prefix="${EPREFIX}"
+		$(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		--with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
+		--enable-symlink-install
+		--enable-elf-shlibs
+		$(tc-has-tls || echo --disable-tls)
+		$(multilib_native_use_with archive libarchive direct)
+		$(multilib_native_use_enable fuse fuse2fs)
+		$(use_enable nls)
+		$(multilib_native_use_enable tools e2initrd-helper)
+		--disable-fsck
+		--disable-uuidd
+		--disable-lto
+		--with-pthread
+		--enable-largefile
+	)
+
+	# We use blkid/uuid from util-linux now
+	if use kernel_linux ; then
+		export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
+		myeconfargs+=( --disable-lib{blkid,uuid} )
+	fi
+
+	ac_cv_path_LDCONFIG=: \
+		ECONF_SOURCE="${S}" \
+		CC="$(tc-getCC)" \
+		BUILD_CC="$(tc-getBUILD_CC)" \
+		BUILD_LD="$(tc-getBUILD_LD)" \
+		econf "${myeconfargs[@]}"
+
+	if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
+		eerror "INTL sanity check failed, aborting build."
+		eerror "Please post your ${S}/config.log file as an"
+		eerror "attachment to https://bugs.gentoo.org/81096"
+		die "Preventing included intl cruft from building"
+	fi
+}
+
+multilib_src_compile() {
+	# Parallel make issue #936493
+	emake -C lib/et V=1 compile_et
+	emake -C lib/ext2fs V=1 ext2_err.h
+
+	if multilib_is_native_abi && use tools ; then
+		emake V=1
+	else
+		emake -C lib/et V=1
+		emake -C lib/ss V=1
+		emake -C lib/ext2fs V=1
+		emake -C lib/e2p V=1
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi && use tools ; then
+		emake V=1 check
+	else
+		# Required by lib/ext2fs's check target
+		emake -C lib/support V=1
+
+		# For non-native, there's no binaries to test. Just libraries.
+		emake -C lib/et V=1 check
+		emake -C lib/ss V=1 check
+		emake -C lib/ext2fs V=1 check
+		emake -C lib/e2p V=1 check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use tools ; then
+		emake STRIP=':' V=1 DESTDIR="${D}" install
+	else
+		emake -C lib/et V=1 DESTDIR="${D}" install
+		emake -C lib/ss V=1 DESTDIR="${D}" install
+		emake -C lib/ext2fs V=1 DESTDIR="${D}" install
+		emake -C lib/e2p V=1 DESTDIR="${D}" install
+	fi
+
+	# configure doesn't have an option to disable static libs
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use tools ; then
+		insinto /etc
+		doins "${FILESDIR}"/e2fsck.conf
+	fi
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-fs/erofs-utils/Manifest b/sys-fs/erofs-utils/Manifest
index 3275e162d261..55cebbc53f1f 100644
--- a/sys-fs/erofs-utils/Manifest
+++ b/sys-fs/erofs-utils/Manifest
@@ -1,2 +1 @@
-DIST erofs-utils-1.7.tar.gz 165393 BLAKE2B f22183fbc3346db0632f0fc842586251d0e17ea19e1de3be51cd807dfac4a6150a080d6b81625c3e08eeebc2ae28d7840f8209c905ca87fc70481d3d8c3913ec SHA512 0f204cd40644bde28f9bd0c5c234d93e68db3a3998bb089f43bfb3ce9a9db1e1cc2fa65919205cbd4a484fa4388cffadf5b395bc4363de3882e1a19778c2d62b
-DIST erofs-utils-1.8.1.tar.gz 184385 BLAKE2B 0ecf7ad0d42f3941751511f3ab42e7e25b85dc64849867a221272cf4596f6bfff3cb1c22877a485de79b4445f68eea8e77cb3f8c742a23ee5ad7ce0232b85091 SHA512 b7fe2441e5295680bc683e978ad97ee359785fd842d77fa86ef6bf869b5da87ad613f48782b5f59684995b6cbc5c274938c9ea9067baa537f09c029eabb4cca3
+DIST erofs-utils-1.8.4.tar.gz 187276 BLAKE2B da0d80abbfd9b2d547c30bad7647165a3500f20e5de0b5db4c54efb27ec895fd069be983193b06d35728f5a8e1490e6cd255207c76135d8978d86e1512430755 SHA512 c941b0a2ab6c650a9aa4c9cadeb277ebc87007dc51354ff013c7cb763e6e8c9d44ed9e4791730ed05088faaba8c612198b924e70f5e52019382cfdf6d2e6b677
diff --git a/sys-fs/erofs-utils/erofs-utils-1.7.ebuild b/sys-fs/erofs-utils/erofs-utils-1.7.ebuild
deleted file mode 100644
index bae6965ed9b7..000000000000
--- a/sys-fs/erofs-utils/erofs-utils-1.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Userspace tools for EROFS"
-HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
-LICENSE="GPL-2+"
-
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/${PN}.git/snapshot/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm64 ~loong"
-
-SLOT="0"
-IUSE="fuse +lz4 +lzma selinux +uuid +zlib"
-
-RDEPEND="
-	fuse? ( sys-fs/fuse:0 )
-	lz4? ( app-arch/lz4:0= )
-	lzma? ( >=app-arch/xz-utils-5.4.0:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	uuid? ( sys-apps/util-linux )
-	zlib? ( sys-libs/zlib:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-werror
-		$(use_enable fuse)
-		$(use_enable lz4)
-		$(use_enable lzma)
-		$(use_with selinux)
-		$(use_with uuid)
-		$(use_with zlib)
-		--without-libdeflate  # not packaged
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-fs/erofs-utils/erofs-utils-1.8.1.ebuild b/sys-fs/erofs-utils/erofs-utils-1.8.1.ebuild
deleted file mode 100644
index 07c3889f14bb..000000000000
--- a/sys-fs/erofs-utils/erofs-utils-1.8.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Userspace tools for EROFS"
-HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
-
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/${PN}.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong"
-
-IUSE="fuse libdeflate +lz4 +lzma selinux static-libs +threads +uuid +zlib +zstd"
-
-RDEPEND="
-	fuse? ( sys-fs/fuse:0 )
-	lz4? ( app-arch/lz4:0= )
-	lzma? ( >=app-arch/xz-utils-5.4.0:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	uuid? ( sys-apps/util-linux )
-	zlib? (
-		libdeflate? ( app-arch/libdeflate:0= )
-		!libdeflate? ( sys-libs/zlib:0= )
-	)
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-werror
-		$(use_enable fuse)
-		$(use_with libdeflate)
-		$(use_enable lz4)
-		$(use_enable lzma)
-		$(use_with selinux)
-		$(use_enable static-libs static-fuse)
-		$(use_enable threads multithreading)
-		$(use_with uuid)
-		$(use_with zlib)
-		$(use_with zstd libzstd)
-		--without-qpl  # not packaged
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-fs/erofs-utils/erofs-utils-1.8.4.ebuild b/sys-fs/erofs-utils/erofs-utils-1.8.4.ebuild
new file mode 100644
index 000000000000..56cd91d0567f
--- /dev/null
+++ b/sys-fs/erofs-utils/erofs-utils-1.8.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Userspace tools for EROFS"
+HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
+
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/${PN}.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong"
+
+IUSE="fuse libdeflate +lz4 +lzma selinux static-libs +threads +uuid +zlib +zstd"
+
+RDEPEND="
+	dev-libs/xxhash:0=
+	fuse? ( sys-fs/fuse:0 )
+	lz4? ( app-arch/lz4:0= )
+	lzma? ( >=app-arch/xz-utils-5.4.0:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	uuid? ( sys-apps/util-linux )
+	zlib? (
+		libdeflate? ( app-arch/libdeflate:0= )
+		!libdeflate? ( sys-libs/zlib:0= )
+	)
+	zstd? ( app-arch/zstd:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-werror
+		$(use_enable fuse)
+		$(use_with libdeflate)
+		$(use_enable lz4)
+		$(use_enable lzma)
+		$(use_with selinux)
+		$(use_enable static-libs static-fuse)
+		$(use_enable threads multithreading)
+		$(use_with uuid)
+		$(use_with zlib)
+		$(use_with zstd libzstd)
+		--without-qpl  # not packaged
+		# do not use bundled xxhash; also upstream says "expected to be
+		# faster than the internal one"
+		--with-xxhash
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-fs/exfatprogs/exfatprogs-1.2.6.ebuild b/sys-fs/exfatprogs/exfatprogs-1.2.6.ebuild
index 24a35a00a404..11dbdc099704 100644
--- a/sys-fs/exfatprogs/exfatprogs-1.2.6.ebuild
+++ b/sys-fs/exfatprogs/exfatprogs-1.2.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
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-fs/fswatch/Manifest b/sys-fs/fswatch/Manifest
index 29ad9d3d7c9c..55cc514f57fc 100644
--- a/sys-fs/fswatch/Manifest
+++ b/sys-fs/fswatch/Manifest
@@ -1,2 +1,2 @@
-DIST fswatch-1.16.0.tar.gz 844804 BLAKE2B 55527e7d38421f16a9d2c51b5455b73de54220d280233d905a02d192bc374ef91b02c0d68dcd1c1ed6a29351421df0cd0ee9fad50bb98ec9c9018088a6064d4b SHA512 80100b92f5acef503436bbb684f07f5b692099a7eee0970a61c04670de67cd9bfa7942af40b348236dd97fc4d02fcd6a081b96486332efbd06500379c1eff806
 DIST fswatch-1.17.1.tar.gz 853852 BLAKE2B 0d4d6a350325d4c7cc4ed4277e640d3fa4bfade5ec92b1c27abee9b506f34a024abadfbd5f002fdb3afd80a4ae432a071dd94c664123f447167ded6d5dbbaf9d SHA512 8d98b12e538026545052763961fe7d8147809958c25921bc30f43ba0d63c7f63a00c4b8412bbb63e3d1a0807687f8821f20e2667ee716b439cfb254ce346ccad
+DIST fswatch-1.18.0.tar.gz 813482 BLAKE2B 432c7806428ba31585d336c8c21069ea3e55852f3318ecec19bc4094f2d8f13187afc0754f804591df7ad50d220e1674a0509e6d53dd388de03acdc363cc8563 SHA512 f0fd409f04d19830eb5d7244a43c7ef1117e9f6be807d1f4e7dbb637f74d9a494b1e19bf4e4b8df4acd959b221d884c054f680df6438b890c310bf69b2722664
diff --git a/sys-fs/fswatch/fswatch-1.16.0.ebuild b/sys-fs/fswatch/fswatch-1.16.0.ebuild
deleted file mode 100644
index dc84ca695257..000000000000
--- a/sys-fs/fswatch/fswatch-1.16.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="cross-platform file change monitor with multiple backends"
-HOMEPAGE="https://github.com/emcrisostomo/fswatch"
-SRC_URI="https://github.com/emcrisostomo/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="nls static-libs"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-fs/fswatch/fswatch-1.18.0.ebuild b/sys-fs/fswatch/fswatch-1.18.0.ebuild
new file mode 100644
index 000000000000..45b0d7dede13
--- /dev/null
+++ b/sys-fs/fswatch/fswatch-1.18.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="cross-platform file change monitor with multiple backends"
+HOMEPAGE="https://github.com/emcrisostomo/fswatch"
+SRC_URI="https://github.com/emcrisostomo/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/13"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="nls static-libs"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.14.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.14.ebuild
index c235a29f536f..db61aedd328d 100644
--- a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.14.ebuild
+++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-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/containers/fuse-overlayfs/archive/v${PV}.tar.gz -> $
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv"
 
 DEPEND="sys-fs/fuse:3"
 RDEPEND="${DEPEND}"
diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r3.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r3.ebuild
index 203f0abf002b..189fa9cfe1a8 100644
--- a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r3.ebuild
+++ b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r3.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
@@ -38,6 +38,8 @@ src_prepare() {
 src_configure() {
 	# brittle codebase with lots of type punning, breaks LTO (#863902)
 	append-cflags -fno-strict-aliasing
+	# breaks w/ C23 dropping unprototyped funcs
+	append-cflags -std=gnu17
 
 	default
 }
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 327d9221fb6b..ed942f8b7700 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,5 +1,2 @@
-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
+DIST mtools-4.0.47.tar.lz 391656 BLAKE2B 52fdfdaaea09cf3809b0432237b1491be9c2869fe839e951f11178970ebbc82d9dc4bc6446015e50f44098171493c4d4d191d23c03a0b83819b1dd66934493f1 SHA512 7d3db137a121f5fa54b1b2565048a3be5ac197f25240da037c8200232a0282b1541eb220359e6759e96e77836d2babc0b5a9894c91c5ba7b87b9acc5d1458c81
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.44.ebuild b/sys-fs/mtools/mtools-4.0.44.ebuild
deleted file mode 100644
index ada3bde4563a..000000000000
--- a/sys-fs/mtools/mtools-4.0.44.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.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.46.ebuild b/sys-fs/mtools/mtools-4.0.46.ebuild
index 95a421fafd18..712eeed318c3 100644
--- a/sys-fs/mtools/mtools-4.0.46.ebuild
+++ b/sys-fs/mtools/mtools-4.0.46.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-fs/mtools/mtools-4.0.47.ebuild b/sys-fs/mtools/mtools-4.0.47.ebuild
new file mode 100644
index 000000000000..00ad3bb1d910
--- /dev/null
+++ b/sys-fs/mtools/mtools-4.0.47.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2025 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/ncdu-bin/Manifest b/sys-fs/ncdu-bin/Manifest
index 1e0146bd5f9d..f45006d49c3f 100644
--- a/sys-fs/ncdu-bin/Manifest
+++ b/sys-fs/ncdu-bin/Manifest
@@ -1,19 +1,3 @@
-DIST ncdu-2.5-linux-aarch64.tar.gz 283085 BLAKE2B 28518e20460db8abbdfdfa6b61b61024b9550f5bf34fcea9682f5598d05cd417ad4b8b78b662e6cc6ad35b45f514cdfa2d35ef7677c50338a40345daf0ce4b57 SHA512 973139d158ad71ee80939aabb1a419668c95dd25f7e5d78ede78afa66bf1fe835e7c736ae1ba5b56fe6e0bde6125b46d6102629492582910947778821912d199
-DIST ncdu-2.5-linux-aarch64.tar.gz.asc 833 BLAKE2B ef4e246218a81c10aed27829f68a78fc96f9feb7a84dab6f32631ca400b480dc5ef36c185d6afc830537c15297da02ab7b58720576476509ebd554d0a1a338ae SHA512 d9ff6aee538cfbabfddcd59108baaa949e96df722c9e7f8fe81499640041d361b2a7473982cbd7e9a44ea2c5a1394cefd6a0a9bb05733775c0a354459d870ab1
-DIST ncdu-2.5-linux-arm.tar.gz 278582 BLAKE2B 07ff2c8463ff407c5fcafe65db7d3911215b3dd78ae3e65ee6aef43c57d8eea782eae741cebe83488f9b5b504bc9b8830d6cc586866e3a6fdb10b79c6fcff43b SHA512 7fb2ed31eda1e6e4a7f1749ed341d062aa6f6e4502ccd3e50fcfd5fb2e3f892f201d17d6eca605e281a3f2a6f95938fe0af62750b79bde051917cf40747fc374
-DIST ncdu-2.5-linux-arm.tar.gz.asc 833 BLAKE2B d2353572707b4a54053a0a2cc9a606b90d0d91bd42a12677ac9028e1ff64c41ec812056e734e34ff38ab8aaa5d2120b7aee1d8b14d6a3c1a3031dbfeab7dbf4b SHA512 d017e6f4a3546dad5b08ae3f9c8ff9470fa337955705f19175730415abd6f3032eb201f0a5e8876cde8b363259311524082e3ed6c652e9e5c2789d5eb560b3c8
-DIST ncdu-2.5-linux-x86.tar.gz 299610 BLAKE2B 0f644a185de2bc12a7714dec5f5269dad12f47a8e42399b7f5c579913312e5dc5060e7a12ada4ffd345367661baeea5fea50dbba381a1ee3f36d1048bba5f085 SHA512 88d7b8f42a80ddaa3faa6722c9d78669894b7e768e158ce39576e42d6a926912cc2e0f85c1dff1eeb1471ea4bc4fea69d7aa70b40e22782156c5ef28f59f8d28
-DIST ncdu-2.5-linux-x86.tar.gz.asc 833 BLAKE2B 907beb66a768d9639445539f98069b172fdd0c462b2eeb8872bd8c33bc9607a1cae9ccbb542d33717649e73d413f12a8792835cb89f3e7fdf534a2f69d75cbc8 SHA512 508cc5893cb8b1bd7138dbffe91933f007ecb5ac601c5a08806f5c55f541d0bc89111fd7091d1b9b1ebbc7978ff9d7f896d80e2c19e8e28d8973db3bd3b6ad40
-DIST ncdu-2.5-linux-x86_64.tar.gz 286301 BLAKE2B 92f7f6bdfa3838d657f53e14bb58be92e7b7aa2147f2bdd38fc9ac417bd0ffa14021eae587f0ba22c7277315b4251ce53fb78f8f7dbd1dad42d1805d0babe60e SHA512 2c48dd1ceb34de54cf64fcdabd81fea86a113c7914be2d2a17c9242ddbeffab69bf6ae9a51e1dd82f87c408f1cd61f4b1b32c960f4ab274db6c7fafaaa262e86
-DIST ncdu-2.5-linux-x86_64.tar.gz.asc 833 BLAKE2B 44becd2cef14a4b5e0359810c2d9f867afe282431e203db2f88aa3b21cc703174651cfe23e1f6077de779edb980cc7356a099ce926a4f029049d165dc9311640 SHA512 14636902d8475772d6ed3e3d194ef23a5613fe0bcb43a39a10e5598d392251fcf69b6711904f36fbc5a9c13a6953d7c4bcc02e0fdee2c93b2ef7e6c1597fab60
-DIST ncdu-2.6-linux-aarch64.tar.gz 365642 BLAKE2B 721841435e89ea747db547a781a6bf277dde3fdb20231774b658ba3282b211010f672be9d7aa1f4d4d12bbf7e2e22e96859379c34108a43aab52da8bb47dd7da SHA512 f56622e2b3697129b4b12d5429bdb2f5b1ee175977952a532f6cea0ea0e85c8a6f036b247a3e6f28da5da3d568a8554ad39921238261519bd6953b8b1878a6af
-DIST ncdu-2.6-linux-aarch64.tar.gz.asc 833 BLAKE2B c025836c1b4cf30e02d8b4e12df33d4bee638372a79511f0337529b48b3d1943756cc81cfaaf4bd81fc68432e7d6c8c2778e314dcd8725e087350474c80085be SHA512 443607b81a97a2f1a3b59630c0638c67d91688e87a67d67c0616412e4898802bc1bd1695f2db761b55a4e1de11014aaaabad9e6ed4c6fd8703b922ebb23c1415
-DIST ncdu-2.6-linux-arm.tar.gz 366584 BLAKE2B 3cd6c34ab8a4089e9e15e80dd4983a8693a6fd65c2b6651fa2a52990455eb1c0c02b83e7ff399a9041f59c99634342c6830db72e09cbe7a3c6881abcc9729aef SHA512 5e673a49c454a37871c097bbe19e6cb990b3099bb7f0c97c75e39791e48127233e58db708aa1d022778f9b67966bc03eb29ed60cd532ca16434fda5fd6ff56be
-DIST ncdu-2.6-linux-arm.tar.gz.asc 833 BLAKE2B db6ef016e69f0b4366e22106a646d9af33002ffd7e14d75a1a43b622f0bdec7e3c01546b0d633d7a362d781522bd0d9b32dcd57d24760b2ee1f9a1cfb4897518 SHA512 10f81f2e23074a279b648da9e241c256f9dacdc9dd1b093ccf44ad1c15e0cbd0e8f5befe290ab9ee794d2bebdec32191e49bddc77f60f74c32b875f1f02ed8c2
-DIST ncdu-2.6-linux-x86.tar.gz 363591 BLAKE2B fe2aa16b151c9a61a000f8fa860410bc91d7cbbd26631cd51c93db1d7c5268c7f90873771143f508494cec243c941904b2ec7d08e16ea27008203ffc8f9b5a96 SHA512 07ae22a19f88021fbf2bc07fc346e0b80915ca70ebd1ad8d29c53e4306e300fea24ad9c132fc18d15c3a10105b53409a93a61742e064367989c9bd6d9527947e
-DIST ncdu-2.6-linux-x86.tar.gz.asc 833 BLAKE2B 4391519e861694752c0fc3d72fb3ca5f19f45663cc0061d72924be4e145f024385fcfa24627458a175eaf45067bb43a2ee9c46a3e99de1b69f24a63bfafa6d7f SHA512 b6ff15431462f89ba03cc6bc1c21178956a48ac2535b1fa62f6edf4244c5b704ecf1e80735747a19a72ba3dc6e21f583eb15715959e16221feb6633926763aad
-DIST ncdu-2.6-linux-x86_64.tar.gz 348874 BLAKE2B 0cbbf2f4ce109e0f0c7aeddec044de86854facdc94153e04e11519d4c5d4d6af534678dea8ab1b343abc0cd681f5e29e9a9c3b04c104ef3405c7fcae8fba5556 SHA512 fd7a284165ffc19c7a3fabcad28ab17b30ed4d3117d045ca34fa144432d6a8fb051ebc9e4647a3ba8b1e3979864bd49924d0f3d9e9546b7bc19d99b8ba560ca9
-DIST ncdu-2.6-linux-x86_64.tar.gz.asc 833 BLAKE2B d05e8c3a277c6c7e9d6a23db47b333cc712d8a2d33c31864d669d6993b55e9cf1b314539bf3a3f4d523346b919c4cb5678ab26170ad4d7b6a2ed8ba14f73eb94 SHA512 d51c5cf8716cc3ceb4922625bca98308772f63cde88ce24a12e9f3ab0e631edf9452c64019b42d9de164f796401b7cc3a91a20683f484df5f00a13652fb6b30d
 DIST ncdu-2.7-linux-aarch64.tar.gz 369940 BLAKE2B a168fa3def0d5ae1d6d293ff53544b4b34b20361d7efdc415c8d0e85fbd04a49e767f64e840ee86a8f928a80b4702532af19e12227ae1edcf235cc25e43e3eae SHA512 75c1aae70ed16f5bcc4bebfc286a4dd9bf54ee8bf35f0ac33150a0f0c6f756e0b0779206e89afe322b65ad4873f5753cdff235eb980728602affbe6832f1cc9e
 DIST ncdu-2.7-linux-aarch64.tar.gz.asc 833 BLAKE2B 6d42854f51abc9321d3759c493c8699de5447a8c53f8f763a47888b721e726eb989a1ddfcd03d25638427d3e828dcdfb0a86b3590991d7f933eedc4710b58410 SHA512 90934a823fcba110406e901c3dd58d6ed1ff0a29b30176a69572408a0fa85cc3de6d639ebd1343cb9d08cf69cf8664acd86535d293dc3b5cbd02d1a503ee85ca
 DIST ncdu-2.7-linux-arm.tar.gz 370247 BLAKE2B 1d22a34287acc5059f627c418d0d441e36f6a8c1714317e9f0c83bc903e15e7e478e0139f32de0d91dabe2d2ae62ce60d25d73c0eca8239cf4979614a41759bb SHA512 74a7c4a3e689d7630038a5fd63b92ce5a03e3030e13eca40091e4f5251915e261ceefb9772b86145a22a4ae80c74c6e754766d196d4bf34512f65403118b736a
diff --git a/sys-fs/ncdu-bin/ncdu-bin-2.5.ebuild b/sys-fs/ncdu-bin/ncdu-bin-2.5.ebuild
deleted file mode 100644
index 76fc2f6bba95..000000000000
--- a/sys-fs/ncdu-bin/ncdu-bin-2.5.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 verify-sig
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu"
-SRC_URI="
-	amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz )
-	arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz )
-	arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz )
-	x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86.tar.gz )
-	verify-sig? (
-		amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz.asc )
-		arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz.asc )
-		arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz.asc )
-		x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86.tar.gz.asc )
-	)
-"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-yorhel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc
-
-QA_PREBUILT="usr/bin/ncdu-bin"
-
-src_install() {
-	newbin ncdu ncdu-bin
-}
diff --git a/sys-fs/ncdu-bin/ncdu-bin-2.6.ebuild b/sys-fs/ncdu-bin/ncdu-bin-2.6.ebuild
deleted file mode 100644
index 76fc2f6bba95..000000000000
--- a/sys-fs/ncdu-bin/ncdu-bin-2.6.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 verify-sig
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu"
-SRC_URI="
-	amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz )
-	arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz )
-	arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz )
-	x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86.tar.gz )
-	verify-sig? (
-		amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz.asc )
-		arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz.asc )
-		arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz.asc )
-		x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86.tar.gz.asc )
-	)
-"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-yorhel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc
-
-QA_PREBUILT="usr/bin/ncdu-bin"
-
-src_install() {
-	newbin ncdu ncdu-bin
-}
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index 9fbc08e4e0e0..d28e49061fd6 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,10 +1,4 @@
-DIST ncdu-1.20.tar.gz 150835 BLAKE2B 0bb6576ecbb3df281c67a48409db2118521760f378defd9c082f732519c9828451b77897ca49e777674ae73a5aac0fd975b94d5a95b1689cd552b5840ac3b5de SHA512 af9a45cc27bb3cdee7fd65236b9b48cb604f9e54208a762ed7b3b18333e07e87a8ae5a4cd0071496e7e382c60a7760734cad1f68fb69423a79fa3f050d2c09bb
-DIST ncdu-1.20.tar.gz.asc 833 BLAKE2B 487e3b4b1e83a2211e91307ff1ca1778059cc3f923e04b57bc5d4780d0108589a062861a25bafa58c357ad4495edce814a58eeb24087e06b958d8e23a02bbf22 SHA512 168bcc4255bbb7a576af39422797804726f84134dc342f59abfc825f93c5ee4e9fcaa9e0c18626ee87b96b2d19a7c57beaa8e1b3dc57eff2bd659add18027140
 DIST ncdu-1.21.tar.gz 152622 BLAKE2B e16d79a96533ecc8c5bbcbb32cc6080d61e859a9cf8e0cdf5abed28a9f848a347151fb6ec7c28aff3f3fd0420233883f5fd5c72981322227e22da4b01eebb7b7 SHA512 10ffb2fdacf465a410e8733acc3f2f7f6304998e8e6cb9b4c42b5c6aa6e588ef7d262b72d5d83d8bbc80964fa9850b4b4a9bc9c58224fb41598eeae399771674
 DIST ncdu-1.21.tar.gz.asc 833 BLAKE2B 12751c09235d6c91087141b249c76323627c75adb7d40e7ad0a839a4e25d738567a50f95906e95e1d6e3c820295b124ec1f01714b7718ff4adf5ee2a6d5d2570 SHA512 5051b67bed35ebc84302f121851ecaa17b146a5dccbc96f49966a39fd404d777450bf85a653be47ab01d8e675d3a821fbd9c8f25bb934abf481faa57cc8b1873
-DIST ncdu-2.5.tar.gz 56019 BLAKE2B c10fb19f87c3d26334038ee96d857e547f9f6881518a675d9777a6c46cf456748861d84df190c14d6d2582f5ad3998ecdf9d00f0969c996221c0d1d9787570a3 SHA512 f4d499a3ab98a56667c75554c77951e4a42f5acdc1353875c108b0da469665777564405b8fcea5a731de473afacfda9f2c8701ba0ba989de1260119c64d7a9f8
-DIST ncdu-2.5.tar.gz.asc 833 BLAKE2B 86babaf8720898a5bd83a2cc290deb2f0a8041087b9f0afddd2306766b82877bbf51f45ac3622761f231359b2e5f60b8d6c5479963aaf7a6abdf67d24fb18496 SHA512 a28751371f7e7a033379fb5f5dc885c69e716f8b6654b8ee9e5eb023a22b67ca99e3ee813ddc2e335d6e8db9bd5a9a19359910a1b8aad13132f7a8bed1d67d78
-DIST ncdu-2.6.tar.gz 72088 BLAKE2B 21d45bb428a56a040083165b9d467a526cd83eaa05b6f88b90a0b5dac0fa70dc4fd7e37ff52debc619b06103a95dad8ddc26fc9e77b6118eeb39aa97bfa0fd0e SHA512 e94612a56db3831d993d6ffd8c69a4cc2418ebf4b9a810e28444c103225ccc1f53ae31e448b94d40ccf2ab7d3a0af6e8ee02bc700123aca872b3bb35108e3d14
-DIST ncdu-2.6.tar.gz.asc 833 BLAKE2B 110bbb6e2db221316004d4491f174c40cdf8fca44e91290f7ea87fc6788de20c3fd6d90bd4b55e4e720736514509af87bcc5b6533b37a2889e20c023939776e6 SHA512 478afe4a51244bc11dfbea2c12fb217392186c1efe1403b44309e0f0e3d431393173282ebae32ceeca32f4ec3a93f35ca19ac962728cd3d7f06f26bccd56169b
 DIST ncdu-2.7.tar.gz 71122 BLAKE2B 10363968820da2dd3cb17c73eb3cba877ca229b896f44bbdd2b8b04c9e3d13aec8476c1968fc5c1841c856e51a1cba64f840e3320e5655bb2eb2bf7258a88f0e SHA512 58d29583f09f6707b2a903fa37b0f263969b32a289e1f8f442044edb1a61351c7ac841dccebf92af227b35a9e6a90fa298a84dad607ad084f2a5883196935229
 DIST ncdu-2.7.tar.gz.asc 833 BLAKE2B d0dbf91b359bdfaca412601933e0da51cff8d7105df2e0d8767a0231c1fe3f7b4dfb0174b9744a68da1b3726884c77a13a162a21a4006b1d7de8c0917b133b66 SHA512 9f1c8a4b6b316d55a143805da159f22a4facf147ecf805130bcbdf68c83a5b8b0586b231780e7eedd16b3b5587332a06a81c95bb0d47cdd73c44ec3fe867ced8
diff --git a/sys-fs/ncdu/ncdu-1.20.ebuild b/sys-fs/ncdu/ncdu-1.20.ebuild
deleted file mode 100644
index 5430ea4d92e1..000000000000
--- a/sys-fs/ncdu/ncdu-1.20.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit verify-sig
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu"
-SRC_URI="
-	https://dev.yorhel.nl/download/${P}.tar.gz
-	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DEPEND="sys-libs/ncurses:=[unicode(+)]"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-yorhel )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc
diff --git a/sys-fs/ncdu/ncdu-1.21.ebuild b/sys-fs/ncdu/ncdu-1.21.ebuild
index 3e128d3937e4..a14728b48d06 100644
--- a/sys-fs/ncdu/ncdu-1.21.ebuild
+++ b/sys-fs/ncdu/ncdu-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
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND="sys-libs/ncurses:=[unicode(+)]"
 RDEPEND="${DEPEND}"
diff --git a/sys-fs/ncdu/ncdu-2.5-r1.ebuild b/sys-fs/ncdu/ncdu-2.5-r1.ebuild
deleted file mode 100644
index bd4cb00fd75a..000000000000
--- a/sys-fs/ncdu/ncdu-2.5-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit verify-sig edo
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu"
-SRC_URI="
-	https://dev.yorhel.nl/download/${P}.tar.gz
-	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-EZIG_MIN="0.13"
-EZIG_MAX_EXCLUSIVE="0.14"
-
-DEPEND="sys-libs/ncurses:=[unicode(+)]"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-yorhel )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/ncdu"
-
-# Many thanks to Florian Schmaus (Flowdalic)!
-# Adapted from https://github.com/gentoo/gentoo/pull/28986
-# Set the EZIG environment variable.
-zig-set_EZIG() {
-	[[ -n ${EZIG} ]] && return
-
-	if [[ -n ${EZIG_OVERWRITE} ]]; then
-		export EZIG="${EZIG_OVERWRITE}"
-		return
-	fi
-
-	local candidate selected selected_ver ver
-
-	for candidate in "${BROOT}"/usr/bin/zig-*; do
-		if [[ ! -L ${candidate} || ${candidate} != */zig?(-bin)-+([0-9.]) ]]; then
-			continue
-		fi
-
-		ver=${candidate##*-}
-
-		if [[ -n ${EZIG_EXACT_VER} ]]; then
-			ver_test "${ver}" -ne "${EZIG_EXACT_VER}" && continue
-
-			selected="${candidate}"
-			selected_ver="${ver}"
-			break
-		fi
-
-		if [[ -n ${EZIG_MIN} ]] \
-			   && ver_test "${ver}" -lt "${EZIG_MIN}"; then
-			# Candidate does not satisfy EZIG_MIN condition.
-			continue
-		fi
-
-		if [[ -n ${EZIG_MAX_EXCLUSIVE} ]] \
-			   && ver_test "${ver}" -ge "${EZIG_MAX_EXCLUSIVE}"; then
-			# Candidate does not satisfy EZIG_MAX_EXCLUSIVE condition.
-			continue
-		fi
-
-		if [[ -n ${selected_ver} ]] \
-			   && ver_test "${selected_ver}" -gt "${ver}"; then
-			# Candidate is older than the currently selected candidate.
-			continue
-		fi
-
-		selected="${candidate}"
-		selected_ver="${ver}"
-	done
-
-	if [[ -z ${selected} ]]; then
-		die "Could not find (suitable) zig installation in ${BROOT}/usr/bin"
-	fi
-
-	export EZIG="${selected}"
-	export EZIG_VER="${selected_ver}"
-}
-
-# Invoke zig with the optionally provided arguments.
-ezig() {
-	zig-set_EZIG
-
-	# Unfortunately, we cannot add more args here, since syntax is different
-	# for every subcommands. Yes, even target/cpu :( f.i. :
-	# -target/-mcpu for zig build-exe vs -Dtarget/-Dcpu for zig build-
-	# -OReleaseSafe for zig build-exe vs -DReleaseSafe for zig build
-	# (or even none, if hardcoded by upstream so choice is -Drelease=true/false)
-	# Ofc we can patch this, but still...
-
-	edo "${EZIG}" "${@}"
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-	default
-}
-
-src_configure() {
-	zig-set_EZIG
-	export ZIG=${EZIG}
-}
-
-src_test() {
-	ezig build test -Doptimize=ReleaseFast
-}
-
-src_install() {
-	emake PREFIX="${ED}"/usr install
-
-	dodoc README.md ChangeLog
-}
diff --git a/sys-fs/ncdu/ncdu-2.6.ebuild b/sys-fs/ncdu/ncdu-2.6.ebuild
deleted file mode 100644
index fdcf0d107cab..000000000000
--- a/sys-fs/ncdu/ncdu-2.6.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit verify-sig edo
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu"
-SRC_URI="
-	https://dev.yorhel.nl/download/${P}.tar.gz
-	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-EZIG_MIN="0.13"
-EZIG_MAX_EXCLUSIVE="0.14"
-
-DEPEND="
-	app-arch/zstd
-	sys-libs/ncurses:=[unicode(+)]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-yorhel )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/ncdu"
-
-# Many thanks to Florian Schmaus (Flowdalic)!
-# Adapted from https://github.com/gentoo/gentoo/pull/28986
-# Set the EZIG environment variable.
-zig-set_EZIG() {
-	[[ -n ${EZIG} ]] && return
-
-	if [[ -n ${EZIG_OVERWRITE} ]]; then
-		export EZIG="${EZIG_OVERWRITE}"
-		return
-	fi
-
-	local candidate selected selected_ver ver
-
-	for candidate in "${BROOT}"/usr/bin/zig-*; do
-		if [[ ! -L ${candidate} || ${candidate} != */zig?(-bin)-+([0-9.]) ]]; then
-			continue
-		fi
-
-		ver=${candidate##*-}
-
-		if [[ -n ${EZIG_EXACT_VER} ]]; then
-			ver_test "${ver}" -ne "${EZIG_EXACT_VER}" && continue
-
-			selected="${candidate}"
-			selected_ver="${ver}"
-			break
-		fi
-
-		if [[ -n ${EZIG_MIN} ]] \
-			   && ver_test "${ver}" -lt "${EZIG_MIN}"; then
-			# Candidate does not satisfy EZIG_MIN condition.
-			continue
-		fi
-
-		if [[ -n ${EZIG_MAX_EXCLUSIVE} ]] \
-			   && ver_test "${ver}" -ge "${EZIG_MAX_EXCLUSIVE}"; then
-			# Candidate does not satisfy EZIG_MAX_EXCLUSIVE condition.
-			continue
-		fi
-
-		if [[ -n ${selected_ver} ]] \
-			   && ver_test "${selected_ver}" -gt "${ver}"; then
-			# Candidate is older than the currently selected candidate.
-			continue
-		fi
-
-		selected="${candidate}"
-		selected_ver="${ver}"
-	done
-
-	if [[ -z ${selected} ]]; then
-		die "Could not find (suitable) zig installation in ${BROOT}/usr/bin"
-	fi
-
-	export EZIG="${selected}"
-	export EZIG_VER="${selected_ver}"
-}
-
-# Invoke zig with the optionally provided arguments.
-ezig() {
-	zig-set_EZIG
-
-	# Unfortunately, we cannot add more args here, since syntax is different
-	# for every subcommands. Yes, even target/cpu :( f.i. :
-	# -target/-mcpu for zig build-exe vs -Dtarget/-Dcpu for zig build-
-	# -OReleaseSafe for zig build-exe vs -DReleaseSafe for zig build
-	# (or even none, if hardcoded by upstream so choice is -Drelease=true/false)
-	# Ofc we can patch this, but still...
-
-	edo "${EZIG}" "${@}"
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-	default
-}
-
-src_configure() {
-	zig-set_EZIG
-	export ZIG=${EZIG}
-}
-
-src_test() {
-	ezig build test -Doptimize=ReleaseFast
-}
-
-src_install() {
-	emake PREFIX="${ED}"/usr install
-
-	dodoc README.md ChangeLog
-}
diff --git a/sys-fs/ncdu/ncdu-2.7.ebuild b/sys-fs/ncdu/ncdu-2.7.ebuild
deleted file mode 100644
index 82b789c71db2..000000000000
--- a/sys-fs/ncdu/ncdu-2.7.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit verify-sig edo
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu https://code.blicky.net/yorhel/ncdu"
-SRC_URI="
-	https://dev.yorhel.nl/download/${P}.tar.gz
-	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-EZIG_MIN="0.13"
-EZIG_MAX_EXCLUSIVE="0.14"
-
-DEPEND="
-	app-arch/zstd
-	sys-libs/ncurses:=[unicode(+)]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-yorhel )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/ncdu"
-
-DOCS=( "README.md" "ChangeLog" )
-
-# Many thanks to Florian Schmaus (Flowdalic)!
-# Adapted from https://github.com/gentoo/gentoo/pull/28986
-# Set the EZIG environment variable.
-zig-set_EZIG() {
-	[[ -n ${EZIG} ]] && return
-
-	if [[ -n ${EZIG_OVERWRITE} ]]; then
-		export EZIG="${EZIG_OVERWRITE}"
-		return
-	fi
-
-	local candidate selected selected_ver ver
-
-	for candidate in "${BROOT}"/usr/bin/zig-*; do
-		if [[ ! -L ${candidate} || ${candidate} != */zig?(-bin)-+([0-9.]) ]]; then
-			continue
-		fi
-
-		ver=${candidate##*-}
-
-		if [[ -n ${EZIG_EXACT_VER} ]]; then
-			ver_test "${ver}" -ne "${EZIG_EXACT_VER}" && continue
-
-			selected="${candidate}"
-			selected_ver="${ver}"
-			break
-		fi
-
-		if [[ -n ${EZIG_MIN} ]] \
-			   && ver_test "${ver}" -lt "${EZIG_MIN}"; then
-			# Candidate does not satisfy EZIG_MIN condition.
-			continue
-		fi
-
-		if [[ -n ${EZIG_MAX_EXCLUSIVE} ]] \
-			   && ver_test "${ver}" -ge "${EZIG_MAX_EXCLUSIVE}"; then
-			# Candidate does not satisfy EZIG_MAX_EXCLUSIVE condition.
-			continue
-		fi
-
-		if [[ -n ${selected_ver} ]] \
-			   && ver_test "${selected_ver}" -gt "${ver}"; then
-			# Candidate is older than the currently selected candidate.
-			continue
-		fi
-
-		selected="${candidate}"
-		selected_ver="${ver}"
-	done
-
-	if [[ -z ${selected} ]]; then
-		die "Could not find (suitable) zig installation in ${BROOT}/usr/bin"
-	fi
-
-	export EZIG="${selected}"
-	export EZIG_VER="${selected_ver}"
-}
-
-# Invoke zig with the optionally provided arguments.
-ezig() {
-	zig-set_EZIG
-
-	# Unfortunately, we cannot add more args here, since syntax is different
-	# for every subcommands. Yes, even target/cpu :( f.i. :
-	# -target/-mcpu for zig build-exe vs -Dtarget/-Dcpu for zig build-
-	# -OReleaseSafe for zig build-exe vs -DReleaseSafe for zig build
-	# (or even none, if hardcoded by upstream so choice is -Drelease=true/false)
-	# Ofc we can patch this, but still...
-
-	edo "${EZIG}" "${@}"
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-	default
-}
-
-src_configure() {
-	zig-set_EZIG
-	export ZIG=${EZIG}
-}
-
-src_test() {
-	ezig build test --release=fast -Dstrip
-}
-
-src_install() {
-	emake PREFIX="${ED}"/usr install
-	einstalldocs
-}
diff --git a/sys-fs/quota/quota-4.09-r1.ebuild b/sys-fs/quota/quota-4.09-r1.ebuild
index d2b9b2e8851d..a5df6bafdbdf 100644
--- a/sys-fs/quota/quota-4.09-r1.ebuild
+++ b/sys-fs/quota/quota-4.09-r1.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="https://downloads.sourceforge.net/linuxquota/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="ldap netlink nls rpc selinux tcpd"
 
 RDEPEND="
diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest
index 5209b7595bf5..23449349f5c1 100644
--- a/sys-fs/unionfs-fuse/Manifest
+++ b/sys-fs/unionfs-fuse/Manifest
@@ -1,2 +1,3 @@
 DIST unionfs-fuse-3.4.tar.gz 54122 BLAKE2B 8d578a1bd88814acf5e2d437b06a5f400f38e61ea7c998fe38bb7ca536c9092f07872c4b4ccffc9db834eb8430f3e98c543a66920afab2b2371451c17c247d2c SHA512 fb719c8548ab1fa43f236d5c3207d7e8e7a7dc45efed453e447e29452a7c4d03483c84b00fd615bac115781b333c8171d811b87a0227172010a2ab34224150f7
 DIST unionfs-fuse-3.5.tar.gz 54906 BLAKE2B e9fb236fda184766affec0640127d5d2ba4c9f964e8882570f069f83fb8f35b551f3198dd4f252242287bb92a5ddea396f62975d1ecf5b9b002fe0a7fe9c85a8 SHA512 4f9d08a9ac7f374f15aa31bf2d8cc5e37b35f9a63bcbba50c6d805fb66ea019737b4aa2236b425317e638b6275659c4260ff8e1fecdee038079dc64797ab6013
+DIST unionfs-fuse-3.6.tar.gz 56360 BLAKE2B be69579d141c05c4fa0f5350e17a35e40884129c84f844f79055608ae1b7652384fe0d8c49c7c5c035e8818b1f341a2f4af395ffa0924e7f79bfad55ca095adb SHA512 0edc9a4f55236a997bb3d8742b77003201a9d036665df903c8337ced0394e2f0bea3025dbace1f881838fa7699890b7bc93861217e26d27ff8725452e36699cc
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-3.6.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-3.6.ebuild
new file mode 100644
index 000000000000..1b3359d03bc6
--- /dev/null
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-3.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{9..12} )
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="Self-syncing tree-merging file system based on FUSE"
+HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse"
+SRC_URI="https://github.com/rpodgorny/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-fs/fuse:3"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
+
+src_test() {
+	[[ -e /dev/fuse ]] || return 0
+	addwrite /dev/fuse
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/sys-fs/xfsprogs/xfsprogs-6.12.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.12.0.ebuild
index ce66faf7bc7b..d7ac475a1d1f 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.12.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.12.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
@@ -21,7 +21,10 @@ RDEPEND="
 	icu? ( dev-libs/icu:= )
 	libedit? ( dev-libs/libedit )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-6.11
+"
 BDEPEND="nls? ( sys-devel/gettext )"
 RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
 
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 3623d48abe5d..10d2bf1aba83 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -8,9 +8,7 @@ DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B 0bbe36df779aaf19460a75725af9c9b13e64e77a6
 DIST zfs-2.2.6.tar.gz.asc 836 BLAKE2B db66f3e2e629ab8a344a8e0c2609bcbb98d69d110fc9e064760ee0c5c25cd67421a71764c4b65d7005e8ff66167bf24beb4be2560a47318eabffa888c1539f26 SHA512 d09f343b3acc3a81e96c069072cfb16d0b490ee77562f50e14524faf05560f9e1d1325ec4bc1760c86ed29186d5860d59646d4ea07385ee3b28d879f2374b9b4
 DIST zfs-2.2.7.tar.gz 33852602 BLAKE2B 31a066d5d543e3328d1afd065a8da4f9b4c52433d585cdbb41936900fd1453431585c6bc4b6e6d9a497a03e79969bae883e17cf4677099686feb3e32577d2777 SHA512 6493faa8e31d9c042c4e8f748d32cb9243212fdf4e0341c19568b47bcf302e60beb89940b80374610b71e1dca1ca5813f3efaddbf1a2453ceabb38381165b271
 DIST zfs-2.2.7.tar.gz.asc 836 BLAKE2B e8fc5e04f5b37a22c741bda46b4573e0cebe85da051c73cf3c5fc267de3c313399b235fc346ca06f4c22d37d2500044a26adb3ea241a65fbcf8760d0ef880039 SHA512 8d22a64c920c2a983429688a340f4ae281decdd30e465591e6b40af9f3016b8f168f4e8ea460600c832a2f46b383ff307986649a645585fb25c34fdfda75ad6e
-DIST zfs-2.3.0-rc1.tar.gz 33887119 BLAKE2B dd4e159bef6de216cc51c1dd22620e6edb5b7503d95402022d0b9439471fe432181b1e5df2142e63cdac812a74b62657a96573b3bf48ad78bd6fd885a5f8913e SHA512 fe7de046dd48dbb67545726482a501788a1d5601e6e9a17deeb29047946689d9c8deb95f72b2b47c26a205a3c94fa1f0123437479a06b1376b9dac3dd6faf463
-DIST zfs-2.3.0-rc1.tar.gz.asc 195 BLAKE2B f70e6223e94a3f79d6d685b2b06254fba845d79768c82b7a3fedb865b6e6c97499c497def0f4c3e4a2869fed88b0965650ae88d5eb72c0ffaed43c4479d3bf96 SHA512 26b395feaf03e2be20b75ef64e573aa98a0706c46a1eb57503925731bf0cb9bf7fef8a2cdcf163233bccd7da9f5aedc0cae73f0183f39e0f13dcf315b4a5d809
-DIST zfs-2.3.0-rc3.tar.gz 33897910 BLAKE2B 518e2c56130a71d4c35f27328184e882815e2ca5b0524e660e174176bee4fdc554e4d1c8264d71f84b6c9641c08088f96a5c35adb5ef6f21b814ccadf093a256 SHA512 1ac53d3a006580f4a32fa33dddd6600d8abac401ed9fc86a2950a8241e0a9dc4a8954a32c44b28b10f22ba7c5cbd8871d9f21c13ccc291c366e9745e83431723
-DIST zfs-2.3.0-rc3.tar.gz.asc 195 BLAKE2B 34685869cb8d4f911b3ce0a5098411ce4cb346310564b7ad5fbe9cfc50a3bbe7665c8daa36384b2d5f3ee1dad4b98d6d5bad5a6b8e2f45da35354428853f748d SHA512 1f32119b24c703dd5dbdcce63ddc97cd24f2052522cf1f2f9a4228691d0db7c136262d98b38f2d795a4edfce1d25b423c5bc4f65dbc008bd12f64acc24f3406e
-DIST zfs-2.3.0-rc4.tar.gz 33899889 BLAKE2B 97aabe9c020ab496e6fe621ecb34fd33b70b786664aee0ebdc1d9d8b0d8027bb092354451c882bf0a2954967414420b33b081a7302a4805dcf2e04a584b81463 SHA512 77bb0b8f9d8995edfc7ebb298c6b0a0834e89cd58410d8d4bc4e7f04ce04e26d486e9d0ce23dd22e74cff8e9a9e827ca9d3549885045265f8b17638e68f35f0f
-DIST zfs-2.3.0-rc4.tar.gz.asc 195 BLAKE2B 8c1b104c7cf88bc0415d13e4b4d7f21ec5d35722b09e977aa240d842cad36f51d1ae84fbb03d51e3408b7c1a427d56658b90e53109d1e3c6921ae772c256f122 SHA512 a0e74bbcc1062c7196e6e67c77175456ae995159b22c788c5f4c3026dfde662cfb396677b3aa46628576504bc38f374a191dec4ccd55c2b41685be408067b9ee
+DIST zfs-2.3.0-rc5.tar.gz 33907372 BLAKE2B 271e6f7e554e3b94d26edac2c53b12f1217013884fd74b3906107c34a4a8ffbfcee75295d05f50f4a13ba0f9368d7e2a8c86dae75bb73191d136ac9c3b92c375 SHA512 ea69909f70f2a5d4b2e3b6e5be61d224504f8936045372bb2d63279e2a051e53812b093fafcad09083925201b9ba940e9327f9d68d1754bf914b4cea5aa5090b
+DIST zfs-2.3.0-rc5.tar.gz.asc 195 BLAKE2B 9abacfa95552837cac092a9e207cf56e4224dc24c1015c289a49d19f4173bcc1781b6b118bd89b4c4c89060ace5955447aaa96228266bcc77232fdf5c0037e20 SHA512 76c5dc000440b0a90e3bcb0ef0de61153ea80f2d9e1798475a25234be407f061448dbfc7b94813debda696caf323539e08b43651c7eeff507dc395d2c770ffc7
+DIST zfs-2.3.0.tar.gz 34029599 BLAKE2B b9fb7913f95dd0c8aec703961ecc0413aa51df889f15b1541ff8fcd7146ba485947fab83deb062bdffcdeab17a2465b7551c7eba3ec55c62c21aba58846c0da5 SHA512 f0bb1c6e28b325765be809dbc5d38ba294daa38b54eafd7d129cf6081fb209b200580437019faeed3614bbb0687d6583698a9282f3275905a1f5a8314a66cf0b
+DIST zfs-2.3.0.tar.gz.asc 836 BLAKE2B 9d1bd03dc6e5699236bca4c2b20a0a8b46e88d90ea58f7171d087c555da85d6af88acc5990f828ba455f9fbe24c90800c1edf74cd3f865b528730ffef8a931b8 SHA512 ba9a8e8b248de7383c8d33b84b0d70de026b8f3e6a1c82557b74ac274b28e559435541fbdfe816f6b80ce5098b3cac34af69cd53877f1f50fa6a846fa92a5dd0
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.16.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.16.ebuild
index b5ce1e2929b3..35c9a503ac85 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.16.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.16.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
@@ -31,7 +31,7 @@ else
 	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+		KEYWORDS="amd64 arm64 ppc64 ~riscv ~sparc"
 	fi
 fi
 
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild
index 8f1c08d298b6..faf0082b07eb 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.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
@@ -31,7 +31,7 @@ else
 	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+		KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc"
 	fi
 fi
 
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.7.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.7.ebuild
index 6f064f20b142..c9f1cf266b7a 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.7.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.7.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
@@ -31,7 +31,7 @@ else
 	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+		KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc"
 	fi
 fi
 
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.3.0.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.3.0.ebuild
new file mode 100644
index 000000000000..435d8a40d273
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.3.0.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_INITRAMFS_IUSE=+initramfs
+inherit autotools flag-o-matic linux-mod-r1 multiprocessing
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+MODULES_KERNEL_MAX=6.12
+MODULES_KERNEL_MIN=4.18
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+	inherit git-r3
+	unset MODULES_KERNEL_MAX
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
+	MY_PV=${PV/_rc/-rc}
+	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
+	S="${WORKDIR}/zfs-${MY_PV}"
+
+	ZFS_KERNEL_COMPAT="${MODULES_KERNEL_MAX}"
+	# Increments minor eg 5.14 -> 5.15, and still supports override.
+	ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+	fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+RESTRICT="test"
+
+BDEPEND="
+	app-alternatives/awk
+	dev-lang/perl
+"
+
+if [[ ${PV} != 9999 ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+
+	IUSE+=" +dist-kernel-cap"
+	RDEPEND="
+		dist-kernel-cap? ( dist-kernel? (
+			<virtual/dist-kernel-${ZFS_KERNEL_DEP}
+		) )
+	"
+fi
+
+# Used to suggest matching USE, but without suggesting to disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.11-gentoo.patch
+)
+
+pkg_pretend() {
+	use rootfs || return 0
+}
+
+pkg_setup() {
+	local CONFIG_CHECK="
+		EFI_PARTITION
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+		!DEBUG_LOCK_ALLOC
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+	"
+	use debug && CONFIG_CHECK+="
+		DEBUG_INFO
+		FRAME_POINTER
+		!DEBUG_INFO_REDUCED
+	"
+	use rootfs && CONFIG_CHECK+="
+		BLK_DEV_INITRD
+		DEVTMPFS
+	"
+
+	kernel_is -lt 5 && CONFIG_CHECK+=" IOSCHED_NOOP"
+
+	if [[ ${PV} != 9999 ]] ; then
+		local kv_major_max kv_minor_max zcompat
+		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+		kv_major_max="${zcompat%%.*}"
+		zcompat="${zcompat#*.}"
+		kv_minor_max="${zcompat%%.*}"
+		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
+			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
+	fi
+
+	linux-mod-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Run unconditionally (bug #792627)
+	eautoreconf
+
+	if [[ ${PV} != 9999 ]] ; then
+		# Set module revision number
+		sed -Ei "s/(Release:.*)1/\1${PR}-gentoo/" META || die
+	fi
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--sbindir="${EPREFIX}"/sbin
+		--with-config=kernel
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		$(use_enable debug)
+
+		# See gentoo.patch
+		GENTOO_MAKEARGS_EVAL="${MODULES_MAKEARGS[*]@Q}"
+		TEST_JOBS="$(makeopts_jobs)"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake "${MODULES_MAKEARGS[@]}"
+}
+
+src_install() {
+	emake "${MODULES_MAKEARGS[@]}" DESTDIR="${ED}" install
+	modules_post_process
+
+	dodoc AUTHORS COPYRIGHT META README.md
+}
+
+_old_layout_cleanup() {
+	# new files are just extra/{spl,zfs}.ko with no subdirs.
+	local olddir=(
+		avl/zavl
+		icp/icp
+		lua/zlua
+		nvpair/znvpair
+		spl/spl
+		unicode/zunicode
+		zcommon/zcommon
+		zfs/zfs
+		zstd/zzstd
+	)
+
+	# kernel/module/Kconfig contains possible compressed extentions.
+	local kext kextfiles
+		for kext in .ko{,.{gz,xz,zst}}; do
+		kextfiles+=( "${olddir[@]/%/${kext}}" )
+	done
+
+	local oldfile oldpath
+	for oldfile in "${kextfiles[@]}"; do
+		oldpath="${EROOT}/lib/modules/${KV_FULL}/extra/${oldfile}"
+		if [[ -f "${oldpath}" ]]; then
+			ewarn "Found obsolete zfs module ${oldfile} for current kernel ${KV_FULL}, removing."
+			rm -rv "${oldpath}" || die
+			# we do not remove non-empty directories just for safety in case there's something else.
+			# also it may fail if there are both compressed and uncompressed modules installed.
+			rmdir -v --ignore-fail-on-non-empty "${oldpath%/*.*}" || die
+		fi
+	done
+}
+
+pkg_postinst() {
+	# Check for old module layout before doing anything else.
+	# only attempt layout cleanup if new .ko location is used.
+	local newko=( "${EROOT}/lib/modules/${KV_FULL}/extra"/{zfs,spl}.ko* )
+	# We check first array member, if glob above did not exand, it will be "zfs.ko*" and -f will return false.
+	# if glob expanded -f will do correct file precense check.
+	[[ -f ${newko[0]} ]] && _old_layout_cleanup
+
+	linux-mod-r1_pkg_postinst
+
+	if use x86 || use arm ; then
+		ewarn "32-bit kernels will likely require increasing vmalloc to"
+		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+	fi
+
+	if has_version sys-boot/grub ; then
+		ewarn "This version of OpenZFS includes support for new feature flags"
+		ewarn "that are incompatible with previous versions. GRUB2 support for"
+		ewarn "/boot with the new feature flags is not yet available."
+		ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+		ewarn "Any new pools will be created with the new feature flags by default"
+		ewarn "and will not be compatible with older versions of OpenZFS. To"
+		ewarn "create a new pool that is backward compatible wih GRUB2, use "
+		ewarn
+		ewarn "zpool create -o compatibility=grub2 ..."
+		ewarn
+		ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features."
+	fi
+}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.3.0_rc1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.3.0_rc1.ebuild
deleted file mode 100644
index 25ff548135e4..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-2.3.0_rc1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MODULES_INITRAMFS_IUSE=+initramfs
-inherit autotools flag-o-matic linux-mod-r1 multiprocessing
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-MODULES_KERNEL_MAX=6.11
-MODULES_KERNEL_MIN=4.18
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-	inherit git-r3
-	unset MODULES_KERNEL_MAX
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
-	inherit verify-sig
-
-	MY_PV=${PV/_rc/-rc}
-	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
-	S="${WORKDIR}/zfs-${MY_PV}"
-
-	ZFS_KERNEL_COMPAT="${MODULES_KERNEL_MAX}"
-	# Increments minor eg 5.14 -> 5.15, and still supports override.
-	ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
-	fi
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0/${PVR}"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="test"
-
-BDEPEND="
-	app-alternatives/awk
-	dev-lang/perl
-"
-
-if [[ ${PV} != 9999 ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
-
-	IUSE+=" +dist-kernel-cap"
-	RDEPEND="
-		dist-kernel-cap? ( dist-kernel? (
-			<virtual/dist-kernel-${ZFS_KERNEL_DEP}
-		) )
-	"
-fi
-
-# Used to suggest matching USE, but without suggesting to disable
-PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.11-gentoo.patch
-)
-
-pkg_pretend() {
-	use rootfs || return 0
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="
-		EFI_PARTITION
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-		!DEBUG_LOCK_ALLOC
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-	"
-	use debug && CONFIG_CHECK+="
-		DEBUG_INFO
-		FRAME_POINTER
-		!DEBUG_INFO_REDUCED
-	"
-	use rootfs && CONFIG_CHECK+="
-		BLK_DEV_INITRD
-		DEVTMPFS
-	"
-
-	kernel_is -lt 5 && CONFIG_CHECK+=" IOSCHED_NOOP"
-
-	if [[ ${PV} != 9999 ]] ; then
-		local kv_major_max kv_minor_max zcompat
-		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-		kv_major_max="${zcompat%%.*}"
-		zcompat="${zcompat#*.}"
-		kv_minor_max="${zcompat%%.*}"
-		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
-			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
-	fi
-
-	linux-mod-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Run unconditionally (bug #792627)
-	eautoreconf
-
-	if [[ ${PV} != 9999 ]] ; then
-		# Set module revision number
-		sed -Ei "s/(Release:.*)1/\1${PR}-gentoo/" META || die
-	fi
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--sbindir="${EPREFIX}"/sbin
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-
-		# See gentoo.patch
-		GENTOO_MAKEARGS_EVAL="${MODULES_MAKEARGS[*]@Q}"
-		TEST_JOBS="$(makeopts_jobs)"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake "${MODULES_MAKEARGS[@]}"
-}
-
-src_install() {
-	emake "${MODULES_MAKEARGS[@]}" DESTDIR="${ED}" install
-	modules_post_process
-
-	dodoc AUTHORS COPYRIGHT META README.md
-}
-
-_old_layout_cleanup() {
-	# new files are just extra/{spl,zfs}.ko with no subdirs.
-	local olddir=(
-		avl/zavl
-		icp/icp
-		lua/zlua
-		nvpair/znvpair
-		spl/spl
-		unicode/zunicode
-		zcommon/zcommon
-		zfs/zfs
-		zstd/zzstd
-	)
-
-	# kernel/module/Kconfig contains possible compressed extentions.
-	local kext kextfiles
-		for kext in .ko{,.{gz,xz,zst}}; do
-		kextfiles+=( "${olddir[@]/%/${kext}}" )
-	done
-
-	local oldfile oldpath
-	for oldfile in "${kextfiles[@]}"; do
-		oldpath="${EROOT}/lib/modules/${KV_FULL}/extra/${oldfile}"
-		if [[ -f "${oldpath}" ]]; then
-			ewarn "Found obsolete zfs module ${oldfile} for current kernel ${KV_FULL}, removing."
-			rm -rv "${oldpath}" || die
-			# we do not remove non-empty directories just for safety in case there's something else.
-			# also it may fail if there are both compressed and uncompressed modules installed.
-			rmdir -v --ignore-fail-on-non-empty "${oldpath%/*.*}" || die
-		fi
-	done
-}
-
-pkg_postinst() {
-	# Check for old module layout before doing anything else.
-	# only attempt layout cleanup if new .ko location is used.
-	local newko=( "${EROOT}/lib/modules/${KV_FULL}/extra"/{zfs,spl}.ko* )
-	# We check first array member, if glob above did not exand, it will be "zfs.ko*" and -f will return false.
-	# if glob expanded -f will do correct file precense check.
-	[[ -f ${newko[0]} ]] && _old_layout_cleanup
-
-	linux-mod-r1_pkg_postinst
-
-	if use x86 || use arm ; then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	if has_version sys-boot/grub ; then
-		ewarn "This version of OpenZFS includes support for new feature flags"
-		ewarn "that are incompatible with previous versions. GRUB2 support for"
-		ewarn "/boot with the new feature flags is not yet available."
-		ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-		ewarn "Any new pools will be created with the new feature flags by default"
-		ewarn "and will not be compatible with older versions of OpenZFS. To"
-		ewarn "create a new pool that is backward compatible wih GRUB2, use "
-		ewarn
-		ewarn "zpool create -o compatibility=grub2 ..."
-		ewarn
-		ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features."
-	fi
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.3.0_rc3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.3.0_rc3.ebuild
deleted file mode 100644
index 25ff548135e4..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-2.3.0_rc3.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MODULES_INITRAMFS_IUSE=+initramfs
-inherit autotools flag-o-matic linux-mod-r1 multiprocessing
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-MODULES_KERNEL_MAX=6.11
-MODULES_KERNEL_MIN=4.18
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-	inherit git-r3
-	unset MODULES_KERNEL_MAX
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
-	inherit verify-sig
-
-	MY_PV=${PV/_rc/-rc}
-	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
-	S="${WORKDIR}/zfs-${MY_PV}"
-
-	ZFS_KERNEL_COMPAT="${MODULES_KERNEL_MAX}"
-	# Increments minor eg 5.14 -> 5.15, and still supports override.
-	ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
-	fi
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0/${PVR}"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="test"
-
-BDEPEND="
-	app-alternatives/awk
-	dev-lang/perl
-"
-
-if [[ ${PV} != 9999 ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
-
-	IUSE+=" +dist-kernel-cap"
-	RDEPEND="
-		dist-kernel-cap? ( dist-kernel? (
-			<virtual/dist-kernel-${ZFS_KERNEL_DEP}
-		) )
-	"
-fi
-
-# Used to suggest matching USE, but without suggesting to disable
-PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.11-gentoo.patch
-)
-
-pkg_pretend() {
-	use rootfs || return 0
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="
-		EFI_PARTITION
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-		!DEBUG_LOCK_ALLOC
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-	"
-	use debug && CONFIG_CHECK+="
-		DEBUG_INFO
-		FRAME_POINTER
-		!DEBUG_INFO_REDUCED
-	"
-	use rootfs && CONFIG_CHECK+="
-		BLK_DEV_INITRD
-		DEVTMPFS
-	"
-
-	kernel_is -lt 5 && CONFIG_CHECK+=" IOSCHED_NOOP"
-
-	if [[ ${PV} != 9999 ]] ; then
-		local kv_major_max kv_minor_max zcompat
-		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-		kv_major_max="${zcompat%%.*}"
-		zcompat="${zcompat#*.}"
-		kv_minor_max="${zcompat%%.*}"
-		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
-			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
-	fi
-
-	linux-mod-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Run unconditionally (bug #792627)
-	eautoreconf
-
-	if [[ ${PV} != 9999 ]] ; then
-		# Set module revision number
-		sed -Ei "s/(Release:.*)1/\1${PR}-gentoo/" META || die
-	fi
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--sbindir="${EPREFIX}"/sbin
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-
-		# See gentoo.patch
-		GENTOO_MAKEARGS_EVAL="${MODULES_MAKEARGS[*]@Q}"
-		TEST_JOBS="$(makeopts_jobs)"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake "${MODULES_MAKEARGS[@]}"
-}
-
-src_install() {
-	emake "${MODULES_MAKEARGS[@]}" DESTDIR="${ED}" install
-	modules_post_process
-
-	dodoc AUTHORS COPYRIGHT META README.md
-}
-
-_old_layout_cleanup() {
-	# new files are just extra/{spl,zfs}.ko with no subdirs.
-	local olddir=(
-		avl/zavl
-		icp/icp
-		lua/zlua
-		nvpair/znvpair
-		spl/spl
-		unicode/zunicode
-		zcommon/zcommon
-		zfs/zfs
-		zstd/zzstd
-	)
-
-	# kernel/module/Kconfig contains possible compressed extentions.
-	local kext kextfiles
-		for kext in .ko{,.{gz,xz,zst}}; do
-		kextfiles+=( "${olddir[@]/%/${kext}}" )
-	done
-
-	local oldfile oldpath
-	for oldfile in "${kextfiles[@]}"; do
-		oldpath="${EROOT}/lib/modules/${KV_FULL}/extra/${oldfile}"
-		if [[ -f "${oldpath}" ]]; then
-			ewarn "Found obsolete zfs module ${oldfile} for current kernel ${KV_FULL}, removing."
-			rm -rv "${oldpath}" || die
-			# we do not remove non-empty directories just for safety in case there's something else.
-			# also it may fail if there are both compressed and uncompressed modules installed.
-			rmdir -v --ignore-fail-on-non-empty "${oldpath%/*.*}" || die
-		fi
-	done
-}
-
-pkg_postinst() {
-	# Check for old module layout before doing anything else.
-	# only attempt layout cleanup if new .ko location is used.
-	local newko=( "${EROOT}/lib/modules/${KV_FULL}/extra"/{zfs,spl}.ko* )
-	# We check first array member, if glob above did not exand, it will be "zfs.ko*" and -f will return false.
-	# if glob expanded -f will do correct file precense check.
-	[[ -f ${newko[0]} ]] && _old_layout_cleanup
-
-	linux-mod-r1_pkg_postinst
-
-	if use x86 || use arm ; then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	if has_version sys-boot/grub ; then
-		ewarn "This version of OpenZFS includes support for new feature flags"
-		ewarn "that are incompatible with previous versions. GRUB2 support for"
-		ewarn "/boot with the new feature flags is not yet available."
-		ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-		ewarn "Any new pools will be created with the new feature flags by default"
-		ewarn "and will not be compatible with older versions of OpenZFS. To"
-		ewarn "create a new pool that is backward compatible wih GRUB2, use "
-		ewarn
-		ewarn "zpool create -o compatibility=grub2 ..."
-		ewarn
-		ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features."
-	fi
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.3.0_rc4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.3.0_rc4.ebuild
deleted file mode 100644
index 6f064f20b142..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-2.3.0_rc4.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MODULES_INITRAMFS_IUSE=+initramfs
-inherit autotools flag-o-matic linux-mod-r1 multiprocessing
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-MODULES_KERNEL_MAX=6.12
-MODULES_KERNEL_MIN=4.18
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-	inherit git-r3
-	unset MODULES_KERNEL_MAX
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
-	inherit verify-sig
-
-	MY_PV=${PV/_rc/-rc}
-	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
-	S="${WORKDIR}/zfs-${MY_PV}"
-
-	ZFS_KERNEL_COMPAT="${MODULES_KERNEL_MAX}"
-	# Increments minor eg 5.14 -> 5.15, and still supports override.
-	ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
-	fi
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0/${PVR}"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="test"
-
-BDEPEND="
-	app-alternatives/awk
-	dev-lang/perl
-"
-
-if [[ ${PV} != 9999 ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
-
-	IUSE+=" +dist-kernel-cap"
-	RDEPEND="
-		dist-kernel-cap? ( dist-kernel? (
-			<virtual/dist-kernel-${ZFS_KERNEL_DEP}
-		) )
-	"
-fi
-
-# Used to suggest matching USE, but without suggesting to disable
-PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.11-gentoo.patch
-)
-
-pkg_pretend() {
-	use rootfs || return 0
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="
-		EFI_PARTITION
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-		!DEBUG_LOCK_ALLOC
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-	"
-	use debug && CONFIG_CHECK+="
-		DEBUG_INFO
-		FRAME_POINTER
-		!DEBUG_INFO_REDUCED
-	"
-	use rootfs && CONFIG_CHECK+="
-		BLK_DEV_INITRD
-		DEVTMPFS
-	"
-
-	kernel_is -lt 5 && CONFIG_CHECK+=" IOSCHED_NOOP"
-
-	if [[ ${PV} != 9999 ]] ; then
-		local kv_major_max kv_minor_max zcompat
-		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-		kv_major_max="${zcompat%%.*}"
-		zcompat="${zcompat#*.}"
-		kv_minor_max="${zcompat%%.*}"
-		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
-			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
-	fi
-
-	linux-mod-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Run unconditionally (bug #792627)
-	eautoreconf
-
-	if [[ ${PV} != 9999 ]] ; then
-		# Set module revision number
-		sed -Ei "s/(Release:.*)1/\1${PR}-gentoo/" META || die
-	fi
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--sbindir="${EPREFIX}"/sbin
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-
-		# See gentoo.patch
-		GENTOO_MAKEARGS_EVAL="${MODULES_MAKEARGS[*]@Q}"
-		TEST_JOBS="$(makeopts_jobs)"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake "${MODULES_MAKEARGS[@]}"
-}
-
-src_install() {
-	emake "${MODULES_MAKEARGS[@]}" DESTDIR="${ED}" install
-	modules_post_process
-
-	dodoc AUTHORS COPYRIGHT META README.md
-}
-
-_old_layout_cleanup() {
-	# new files are just extra/{spl,zfs}.ko with no subdirs.
-	local olddir=(
-		avl/zavl
-		icp/icp
-		lua/zlua
-		nvpair/znvpair
-		spl/spl
-		unicode/zunicode
-		zcommon/zcommon
-		zfs/zfs
-		zstd/zzstd
-	)
-
-	# kernel/module/Kconfig contains possible compressed extentions.
-	local kext kextfiles
-		for kext in .ko{,.{gz,xz,zst}}; do
-		kextfiles+=( "${olddir[@]/%/${kext}}" )
-	done
-
-	local oldfile oldpath
-	for oldfile in "${kextfiles[@]}"; do
-		oldpath="${EROOT}/lib/modules/${KV_FULL}/extra/${oldfile}"
-		if [[ -f "${oldpath}" ]]; then
-			ewarn "Found obsolete zfs module ${oldfile} for current kernel ${KV_FULL}, removing."
-			rm -rv "${oldpath}" || die
-			# we do not remove non-empty directories just for safety in case there's something else.
-			# also it may fail if there are both compressed and uncompressed modules installed.
-			rmdir -v --ignore-fail-on-non-empty "${oldpath%/*.*}" || die
-		fi
-	done
-}
-
-pkg_postinst() {
-	# Check for old module layout before doing anything else.
-	# only attempt layout cleanup if new .ko location is used.
-	local newko=( "${EROOT}/lib/modules/${KV_FULL}/extra"/{zfs,spl}.ko* )
-	# We check first array member, if glob above did not exand, it will be "zfs.ko*" and -f will return false.
-	# if glob expanded -f will do correct file precense check.
-	[[ -f ${newko[0]} ]] && _old_layout_cleanup
-
-	linux-mod-r1_pkg_postinst
-
-	if use x86 || use arm ; then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	if has_version sys-boot/grub ; then
-		ewarn "This version of OpenZFS includes support for new feature flags"
-		ewarn "that are incompatible with previous versions. GRUB2 support for"
-		ewarn "/boot with the new feature flags is not yet available."
-		ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-		ewarn "Any new pools will be created with the new feature flags by default"
-		ewarn "and will not be compatible with older versions of OpenZFS. To"
-		ewarn "create a new pool that is backward compatible wih GRUB2, use "
-		ewarn
-		ewarn "zpool create -o compatibility=grub2 ..."
-		ewarn
-		ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features."
-	fi
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.3.0_rc5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.3.0_rc5.ebuild
new file mode 100644
index 000000000000..435d8a40d273
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.3.0_rc5.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_INITRAMFS_IUSE=+initramfs
+inherit autotools flag-o-matic linux-mod-r1 multiprocessing
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+MODULES_KERNEL_MAX=6.12
+MODULES_KERNEL_MIN=4.18
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+	inherit git-r3
+	unset MODULES_KERNEL_MAX
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
+	MY_PV=${PV/_rc/-rc}
+	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
+	S="${WORKDIR}/zfs-${MY_PV}"
+
+	ZFS_KERNEL_COMPAT="${MODULES_KERNEL_MAX}"
+	# Increments minor eg 5.14 -> 5.15, and still supports override.
+	ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+	fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+RESTRICT="test"
+
+BDEPEND="
+	app-alternatives/awk
+	dev-lang/perl
+"
+
+if [[ ${PV} != 9999 ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+
+	IUSE+=" +dist-kernel-cap"
+	RDEPEND="
+		dist-kernel-cap? ( dist-kernel? (
+			<virtual/dist-kernel-${ZFS_KERNEL_DEP}
+		) )
+	"
+fi
+
+# Used to suggest matching USE, but without suggesting to disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.11-gentoo.patch
+)
+
+pkg_pretend() {
+	use rootfs || return 0
+}
+
+pkg_setup() {
+	local CONFIG_CHECK="
+		EFI_PARTITION
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+		!DEBUG_LOCK_ALLOC
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+	"
+	use debug && CONFIG_CHECK+="
+		DEBUG_INFO
+		FRAME_POINTER
+		!DEBUG_INFO_REDUCED
+	"
+	use rootfs && CONFIG_CHECK+="
+		BLK_DEV_INITRD
+		DEVTMPFS
+	"
+
+	kernel_is -lt 5 && CONFIG_CHECK+=" IOSCHED_NOOP"
+
+	if [[ ${PV} != 9999 ]] ; then
+		local kv_major_max kv_minor_max zcompat
+		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+		kv_major_max="${zcompat%%.*}"
+		zcompat="${zcompat#*.}"
+		kv_minor_max="${zcompat%%.*}"
+		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
+			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
+	fi
+
+	linux-mod-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Run unconditionally (bug #792627)
+	eautoreconf
+
+	if [[ ${PV} != 9999 ]] ; then
+		# Set module revision number
+		sed -Ei "s/(Release:.*)1/\1${PR}-gentoo/" META || die
+	fi
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--sbindir="${EPREFIX}"/sbin
+		--with-config=kernel
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		$(use_enable debug)
+
+		# See gentoo.patch
+		GENTOO_MAKEARGS_EVAL="${MODULES_MAKEARGS[*]@Q}"
+		TEST_JOBS="$(makeopts_jobs)"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake "${MODULES_MAKEARGS[@]}"
+}
+
+src_install() {
+	emake "${MODULES_MAKEARGS[@]}" DESTDIR="${ED}" install
+	modules_post_process
+
+	dodoc AUTHORS COPYRIGHT META README.md
+}
+
+_old_layout_cleanup() {
+	# new files are just extra/{spl,zfs}.ko with no subdirs.
+	local olddir=(
+		avl/zavl
+		icp/icp
+		lua/zlua
+		nvpair/znvpair
+		spl/spl
+		unicode/zunicode
+		zcommon/zcommon
+		zfs/zfs
+		zstd/zzstd
+	)
+
+	# kernel/module/Kconfig contains possible compressed extentions.
+	local kext kextfiles
+		for kext in .ko{,.{gz,xz,zst}}; do
+		kextfiles+=( "${olddir[@]/%/${kext}}" )
+	done
+
+	local oldfile oldpath
+	for oldfile in "${kextfiles[@]}"; do
+		oldpath="${EROOT}/lib/modules/${KV_FULL}/extra/${oldfile}"
+		if [[ -f "${oldpath}" ]]; then
+			ewarn "Found obsolete zfs module ${oldfile} for current kernel ${KV_FULL}, removing."
+			rm -rv "${oldpath}" || die
+			# we do not remove non-empty directories just for safety in case there's something else.
+			# also it may fail if there are both compressed and uncompressed modules installed.
+			rmdir -v --ignore-fail-on-non-empty "${oldpath%/*.*}" || die
+		fi
+	done
+}
+
+pkg_postinst() {
+	# Check for old module layout before doing anything else.
+	# only attempt layout cleanup if new .ko location is used.
+	local newko=( "${EROOT}/lib/modules/${KV_FULL}/extra"/{zfs,spl}.ko* )
+	# We check first array member, if glob above did not exand, it will be "zfs.ko*" and -f will return false.
+	# if glob expanded -f will do correct file precense check.
+	[[ -f ${newko[0]} ]] && _old_layout_cleanup
+
+	linux-mod-r1_pkg_postinst
+
+	if use x86 || use arm ; then
+		ewarn "32-bit kernels will likely require increasing vmalloc to"
+		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+	fi
+
+	if has_version sys-boot/grub ; then
+		ewarn "This version of OpenZFS includes support for new feature flags"
+		ewarn "that are incompatible with previous versions. GRUB2 support for"
+		ewarn "/boot with the new feature flags is not yet available."
+		ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+		ewarn "Any new pools will be created with the new feature flags by default"
+		ewarn "and will not be compatible with older versions of OpenZFS. To"
+		ewarn "create a new pool that is backward compatible wih GRUB2, use "
+		ewarn
+		ewarn "zpool create -o compatibility=grub2 ..."
+		ewarn
+		ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features."
+	fi
+}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 3623d48abe5d..10d2bf1aba83 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -8,9 +8,7 @@ DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B 0bbe36df779aaf19460a75725af9c9b13e64e77a6
 DIST zfs-2.2.6.tar.gz.asc 836 BLAKE2B db66f3e2e629ab8a344a8e0c2609bcbb98d69d110fc9e064760ee0c5c25cd67421a71764c4b65d7005e8ff66167bf24beb4be2560a47318eabffa888c1539f26 SHA512 d09f343b3acc3a81e96c069072cfb16d0b490ee77562f50e14524faf05560f9e1d1325ec4bc1760c86ed29186d5860d59646d4ea07385ee3b28d879f2374b9b4
 DIST zfs-2.2.7.tar.gz 33852602 BLAKE2B 31a066d5d543e3328d1afd065a8da4f9b4c52433d585cdbb41936900fd1453431585c6bc4b6e6d9a497a03e79969bae883e17cf4677099686feb3e32577d2777 SHA512 6493faa8e31d9c042c4e8f748d32cb9243212fdf4e0341c19568b47bcf302e60beb89940b80374610b71e1dca1ca5813f3efaddbf1a2453ceabb38381165b271
 DIST zfs-2.2.7.tar.gz.asc 836 BLAKE2B e8fc5e04f5b37a22c741bda46b4573e0cebe85da051c73cf3c5fc267de3c313399b235fc346ca06f4c22d37d2500044a26adb3ea241a65fbcf8760d0ef880039 SHA512 8d22a64c920c2a983429688a340f4ae281decdd30e465591e6b40af9f3016b8f168f4e8ea460600c832a2f46b383ff307986649a645585fb25c34fdfda75ad6e
-DIST zfs-2.3.0-rc1.tar.gz 33887119 BLAKE2B dd4e159bef6de216cc51c1dd22620e6edb5b7503d95402022d0b9439471fe432181b1e5df2142e63cdac812a74b62657a96573b3bf48ad78bd6fd885a5f8913e SHA512 fe7de046dd48dbb67545726482a501788a1d5601e6e9a17deeb29047946689d9c8deb95f72b2b47c26a205a3c94fa1f0123437479a06b1376b9dac3dd6faf463
-DIST zfs-2.3.0-rc1.tar.gz.asc 195 BLAKE2B f70e6223e94a3f79d6d685b2b06254fba845d79768c82b7a3fedb865b6e6c97499c497def0f4c3e4a2869fed88b0965650ae88d5eb72c0ffaed43c4479d3bf96 SHA512 26b395feaf03e2be20b75ef64e573aa98a0706c46a1eb57503925731bf0cb9bf7fef8a2cdcf163233bccd7da9f5aedc0cae73f0183f39e0f13dcf315b4a5d809
-DIST zfs-2.3.0-rc3.tar.gz 33897910 BLAKE2B 518e2c56130a71d4c35f27328184e882815e2ca5b0524e660e174176bee4fdc554e4d1c8264d71f84b6c9641c08088f96a5c35adb5ef6f21b814ccadf093a256 SHA512 1ac53d3a006580f4a32fa33dddd6600d8abac401ed9fc86a2950a8241e0a9dc4a8954a32c44b28b10f22ba7c5cbd8871d9f21c13ccc291c366e9745e83431723
-DIST zfs-2.3.0-rc3.tar.gz.asc 195 BLAKE2B 34685869cb8d4f911b3ce0a5098411ce4cb346310564b7ad5fbe9cfc50a3bbe7665c8daa36384b2d5f3ee1dad4b98d6d5bad5a6b8e2f45da35354428853f748d SHA512 1f32119b24c703dd5dbdcce63ddc97cd24f2052522cf1f2f9a4228691d0db7c136262d98b38f2d795a4edfce1d25b423c5bc4f65dbc008bd12f64acc24f3406e
-DIST zfs-2.3.0-rc4.tar.gz 33899889 BLAKE2B 97aabe9c020ab496e6fe621ecb34fd33b70b786664aee0ebdc1d9d8b0d8027bb092354451c882bf0a2954967414420b33b081a7302a4805dcf2e04a584b81463 SHA512 77bb0b8f9d8995edfc7ebb298c6b0a0834e89cd58410d8d4bc4e7f04ce04e26d486e9d0ce23dd22e74cff8e9a9e827ca9d3549885045265f8b17638e68f35f0f
-DIST zfs-2.3.0-rc4.tar.gz.asc 195 BLAKE2B 8c1b104c7cf88bc0415d13e4b4d7f21ec5d35722b09e977aa240d842cad36f51d1ae84fbb03d51e3408b7c1a427d56658b90e53109d1e3c6921ae772c256f122 SHA512 a0e74bbcc1062c7196e6e67c77175456ae995159b22c788c5f4c3026dfde662cfb396677b3aa46628576504bc38f374a191dec4ccd55c2b41685be408067b9ee
+DIST zfs-2.3.0-rc5.tar.gz 33907372 BLAKE2B 271e6f7e554e3b94d26edac2c53b12f1217013884fd74b3906107c34a4a8ffbfcee75295d05f50f4a13ba0f9368d7e2a8c86dae75bb73191d136ac9c3b92c375 SHA512 ea69909f70f2a5d4b2e3b6e5be61d224504f8936045372bb2d63279e2a051e53812b093fafcad09083925201b9ba940e9327f9d68d1754bf914b4cea5aa5090b
+DIST zfs-2.3.0-rc5.tar.gz.asc 195 BLAKE2B 9abacfa95552837cac092a9e207cf56e4224dc24c1015c289a49d19f4173bcc1781b6b118bd89b4c4c89060ace5955447aaa96228266bcc77232fdf5c0037e20 SHA512 76c5dc000440b0a90e3bcb0ef0de61153ea80f2d9e1798475a25234be407f061448dbfc7b94813debda696caf323539e08b43651c7eeff507dc395d2c770ffc7
+DIST zfs-2.3.0.tar.gz 34029599 BLAKE2B b9fb7913f95dd0c8aec703961ecc0413aa51df889f15b1541ff8fcd7146ba485947fab83deb062bdffcdeab17a2465b7551c7eba3ec55c62c21aba58846c0da5 SHA512 f0bb1c6e28b325765be809dbc5d38ba294daa38b54eafd7d129cf6081fb209b200580437019faeed3614bbb0687d6583698a9282f3275905a1f5a8314a66cf0b
+DIST zfs-2.3.0.tar.gz.asc 836 BLAKE2B 9d1bd03dc6e5699236bca4c2b20a0a8b46e88d90ea58f7171d087c555da85d6af88acc5990f828ba455f9fbe24c90800c1edf74cd3f865b528730ffef8a931b8 SHA512 ba9a8e8b248de7383c8d33b84b0d70de026b8f3e6a1c82557b74ac274b28e559435541fbdfe816f6b80ce5098b3cac34af69cd53877f1f50fa6a846fa92a5dd0
diff --git a/sys-fs/zfs/zfs-2.1.16.ebuild b/sys-fs/zfs/zfs-2.1.16.ebuild
index c1b9dfd06703..100af948ca0a 100644
--- a/sys-fs/zfs/zfs-2.1.16.ebuild
+++ b/sys-fs/zfs/zfs-2.1.16.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
@@ -25,7 +25,7 @@ else
 	S="${WORKDIR}/${P%_rc?}"
 
 	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+		KEYWORDS="amd64 arm64 ppc64 ~riscv ~sparc"
 	fi
 fi
 
diff --git a/sys-fs/zfs/zfs-2.2.6.ebuild b/sys-fs/zfs/zfs-2.2.6.ebuild
index 5264247e69af..70455ee1af6a 100644
--- a/sys-fs/zfs/zfs-2.2.6.ebuild
+++ b/sys-fs/zfs/zfs-2.2.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
@@ -25,7 +25,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 
 	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+		KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc"
 	fi
 fi
 
diff --git a/sys-fs/zfs/zfs-2.2.7.ebuild b/sys-fs/zfs/zfs-2.2.7.ebuild
index 5264247e69af..70455ee1af6a 100644
--- a/sys-fs/zfs/zfs-2.2.7.ebuild
+++ b/sys-fs/zfs/zfs-2.2.7.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
@@ -25,7 +25,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 
 	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+		KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc"
 	fi
 fi
 
diff --git a/sys-fs/zfs/zfs-2.3.0.ebuild b/sys-fs/zfs/zfs-2.3.0.ebuild
new file mode 100644
index 000000000000..48dcd8358c6d
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.3.0.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
+	MY_P="${P/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+	S="${WORKDIR}/${MY_P}"
+
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+	fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/6"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite unwind"
+
+DEPEND="
+	dev-libs/openssl:=
+	net-libs/libtirpc:=
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libudev:=
+	!minimal? ( ${PYTHON_DEPS} )
+	pam? ( sys-libs/pam )
+	python? (
+		$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
+	)
+	unwind? ( sys-libs/libunwind:= )
+"
+
+BDEPEND="
+	app-alternatives/awk
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	python? (
+		${DISTUTILS_DEPS}
+		|| (
+			dev-python/packaging[${PYTHON_USEDEP}]
+			dev-python/distlib[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+if [[ ${PV} != "9999" ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
+RDEPEND="
+	${DEPEND}
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
+	!prefix? ( virtual/udev )
+	app-alternatives/awk
+	sys-fs/udev-init-scripts
+	dist-kernel? ( virtual/dist-kernel:= )
+	rootfs? (
+		app-alternatives/cpio
+		app-misc/pax-utils
+	)
+	selinux? ( sec-policy/selinux-zfs )
+	test-suite? (
+		app-shells/ksh
+		sys-apps/kmod[tools]
+		sys-apps/util-linux
+		app-alternatives/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+	)
+"
+
+# PDEPEND in this form is needed to trick portage suggest
+# enabling dist-kernel if only 1 package have it set, without suggesting to disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
+
+REQUIRED_USE="
+	!minimal? ( ${PYTHON_REQUIRED_USE} )
+	python? ( !minimal )
+	test-suite? ( !minimal )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
+)
+
+pkg_pretend() {
+	use rootfs || return 0
+
+	if has_version virtual/dist-kernel && ! use dist-kernel; then
+		ewarn "You have virtual/dist-kernel installed, but"
+		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
+		ewarn "It's recommended to globally enable dist-kernel USE flag"
+		ewarn "to auto-trigger initrd rebuilds with kernel updates"
+	fi
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-info_pkg_setup
+
+		if ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [X] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+}
+
+libsoversion_check() {
+	local bugurl libzfs_sover
+	bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
+
+	libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
+		| grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
+	libzfs_sover="${libzfs_sover%%:*}"
+
+	if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
+		echo
+		eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
+		eerror "ebuild subslot does not match libzfs soversion!"
+		eerror "libzfs soversion: ${libzfs_sover}"
+		eerror "ebuild value: $(ver_cut 2 ${SLOT})"
+		eerror "This is a bug in the ebuild, please use the following URL to report it"
+		eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
+		echo
+		# we want to abort for releases, but just print a warning for live ebuild
+		# to keep package installable
+		[[  ${PV} == "9999" ]] || die
+	fi
+}
+
+src_prepare() {
+	default
+	libsoversion_check
+
+	# Run unconditionally (bug #792627)
+	eautoreconf
+
+	if [[ ${PV} != "9999" ]]; then
+		# Set revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
+
+	# Tries to use /etc/conf.d which we reserve for OpenRC
+	sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die
+
+	# prevent errors showing up on zfs-mount stop, #647688
+	# openrc will unmount all filesystems anyway.
+	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	use minimal || python_setup
+
+	local myconf=(
+		--bindir="${EPREFIX}/bin"
+		--enable-shared
+		--enable-sysvinit
+		--localstatedir="${EPREFIX}/var"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
+		--with-pammoduledir="$(getpam_mod_dir)"
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdpresetdir="$(systemd_get_systempresetdir)"
+		--with-vendor=gentoo
+		# Building zfs-mount-generator.c on musl breaks as strndupa
+		# isn't available. But systemd doesn't support musl anyway, so
+		# just disable building it.
+		# UPDATE: it has been fixed since,
+		# https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a
+		# but we still leave it as this for now.
+		$(use_enable !elibc_musl systemd)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable python pyzfs)
+		$(use_with unwind libunwind)
+		--disable-static
+		$(usex minimal --without-python --with-python="${EPYTHON}")
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	default
+
+	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
+
+	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
+
+	use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; }
+
+	find "${ED}" -name '*.la' -delete || die
+
+	dobashcomp contrib/bash_completion.d/zfs
+	bashcomp_alias zfs zpool
+
+	# strip executable bit from conf.d file
+	fperms 0644 /etc/conf.d/zfs
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	# enforce best available python implementation
+	use minimal || python_fix_shebang "${ED}/bin"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	# we always need userspace utils in sync with zfs-kmod
+	# so force initrd update for userspace as well, to avoid
+	# situation when zfs-kmod trigger initrd rebuild before
+	# userspace component is rebuilt
+	# KV_* variables are provided by linux-info.eclass
+	if [[ -z ${ROOT} ]] && use dist-kernel; then
+		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+	fi
+
+	if use rootfs; then
+		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
+			elog "Root on zfs requires an initramfs to boot"
+			elog "The following packages provide one and are tested on a regular basis:"
+			elog "  sys-kernel/dracut ( preferred, module maintained by zfs developers )"
+			elog "  sys-kernel/genkernel"
+		fi
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset"
+		einfo "for default zfs systemd service configuration"
+	else
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \
+			einfo "You should add zfs-load-key to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
+			einfo "You should add zfs-share to the default runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-fs/zfs/zfs-2.3.0_rc1.ebuild b/sys-fs/zfs/zfs-2.3.0_rc1.ebuild
deleted file mode 100644
index f0e4486cb2ec..000000000000
--- a/sys-fs/zfs/zfs-2.3.0_rc1.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
-	inherit verify-sig
-
-	MY_P="${P/_rc/-rc}"
-	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
-	S="${WORKDIR}/${MY_P}"
-
-	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
-	fi
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-# just libzfs soname major for now.
-# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
-# see libsoversion_check() below as well
-SLOT="0/5"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite unwind"
-
-DEPEND="
-	dev-libs/openssl:=
-	net-libs/libtirpc:=
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libudev:=
-	!minimal? ( ${PYTHON_DEPS} )
-	pam? ( sys-libs/pam )
-	python? (
-		$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
-	)
-	unwind? ( sys-libs/libunwind:= )
-"
-
-BDEPEND="
-	app-alternatives/awk
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	python? (
-		${DISTUTILS_DEPS}
-		|| (
-			dev-python/packaging[${PYTHON_USEDEP}]
-			dev-python/distlib[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-if [[ ${PV} != "9999" ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
-fi
-
-# awk is used for some scripts, completions, and the Dracut module
-RDEPEND="
-	${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
-	!prefix? ( virtual/udev )
-	app-alternatives/awk
-	sys-fs/udev-init-scripts
-	dist-kernel? ( virtual/dist-kernel:= )
-	rootfs? (
-		app-alternatives/cpio
-		app-misc/pax-utils
-	)
-	selinux? ( sec-policy/selinux-zfs )
-	test-suite? (
-		app-shells/ksh
-		sys-apps/kmod[tools]
-		sys-apps/util-linux
-		app-alternatives/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-	)
-"
-
-# PDEPEND in this form is needed to trick portage suggest
-# enabling dist-kernel if only 1 package have it set, without suggesting to disable
-PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
-
-REQUIRED_USE="
-	!minimal? ( ${PYTHON_REQUIRED_USE} )
-	python? ( !minimal )
-	test-suite? ( !minimal )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
-	"${FILESDIR}"/2.2.3-musl.patch
-)
-
-pkg_pretend() {
-	use rootfs || return 0
-
-	if has_version virtual/dist-kernel && ! use dist-kernel; then
-		ewarn "You have virtual/dist-kernel installed, but"
-		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
-		ewarn "It's recommended to globally enable dist-kernel USE flag"
-		ewarn "to auto-trigger initrd rebuilds with kernel updates"
-	fi
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-info_pkg_setup
-
-		if ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [X] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-libsoversion_check() {
-	local bugurl libzfs_sover
-	bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
-
-	libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
-		| grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
-	libzfs_sover="${libzfs_sover%%:*}"
-
-	if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
-		echo
-		eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
-		eerror "ebuild subslot does not match libzfs soversion!"
-		eerror "libzfs soversion: ${libzfs_sover}"
-		eerror "ebuild value: $(ver_cut 2 ${SLOT})"
-		eerror "This is a bug in the ebuild, please use the following URL to report it"
-		eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
-		echo
-		# we want to abort for releases, but just print a warning for live ebuild
-		# to keep package installable
-		[[  ${PV} == "9999" ]] || die
-	fi
-}
-
-src_prepare() {
-	default
-	libsoversion_check
-
-	# Run unconditionally (bug #792627)
-	eautoreconf
-
-	if [[ ${PV} != "9999" ]]; then
-		# Set revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
-
-	# Tries to use /etc/conf.d which we reserve for OpenRC
-	sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die
-
-	# prevent errors showing up on zfs-mount stop, #647688
-	# openrc will unmount all filesystems anyway.
-	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	use minimal || python_setup
-
-	local myconf=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--enable-sysvinit
-		--localstatedir="${EPREFIX}/var"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
-		--with-pammoduledir="$(getpam_mod_dir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="$(systemd_get_systempresetdir)"
-		--with-vendor=gentoo
-		# Building zfs-mount-generator.c on musl breaks as strndupa
-		# isn't available. But systemd doesn't support musl anyway, so
-		# just disable building it.
-		# UPDATE: it has been fixed since,
-		# https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a
-		# but we still leave it as this for now.
-		$(use_enable !elibc_musl systemd)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable pam)
-		$(use_enable python pyzfs)
-		$(use_with unwind libunwind)
-		--disable-static
-		$(usex minimal --without-python --with-python="${EPYTHON}")
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
-
-	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
-
-	use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; }
-
-	find "${ED}" -name '*.la' -delete || die
-
-	dobashcomp contrib/bash_completion.d/zfs
-	bashcomp_alias zfs zpool
-
-	# strip executable bit from conf.d file
-	fperms 0644 /etc/conf.d/zfs
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	# enforce best available python implementation
-	use minimal || python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	# we always need userspace utils in sync with zfs-kmod
-	# so force initrd update for userspace as well, to avoid
-	# situation when zfs-kmod trigger initrd rebuild before
-	# userspace component is rebuilt
-	# KV_* variables are provided by linux-info.eclass
-	if [[ -z ${ROOT} ]] && use dist-kernel; then
-		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-	fi
-
-	if use rootfs; then
-		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-			elog "Root on zfs requires an initramfs to boot"
-			elog "The following packages provide one and are tested on a regular basis:"
-			elog "  sys-kernel/dracut ( preferred, module maintained by zfs developers )"
-			elog "  sys-kernel/genkernel"
-		fi
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset"
-		einfo "for default zfs systemd service configuration"
-	else
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \
-			einfo "You should add zfs-load-key to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
-			einfo "You should add zfs-share to the default runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/zfs/zfs-2.3.0_rc3.ebuild b/sys-fs/zfs/zfs-2.3.0_rc3.ebuild
deleted file mode 100644
index 53bc008f5132..000000000000
--- a/sys-fs/zfs/zfs-2.3.0_rc3.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
-	inherit verify-sig
-
-	MY_P="${P/_rc/-rc}"
-	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
-	S="${WORKDIR}/${MY_P}"
-
-	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
-	fi
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-# just libzfs soname major for now.
-# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
-# see libsoversion_check() below as well
-SLOT="0/6"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite unwind"
-
-DEPEND="
-	dev-libs/openssl:=
-	net-libs/libtirpc:=
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libudev:=
-	!minimal? ( ${PYTHON_DEPS} )
-	pam? ( sys-libs/pam )
-	python? (
-		$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
-	)
-	unwind? ( sys-libs/libunwind:= )
-"
-
-BDEPEND="
-	app-alternatives/awk
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	python? (
-		${DISTUTILS_DEPS}
-		|| (
-			dev-python/packaging[${PYTHON_USEDEP}]
-			dev-python/distlib[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-if [[ ${PV} != "9999" ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
-fi
-
-# awk is used for some scripts, completions, and the Dracut module
-RDEPEND="
-	${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
-	!prefix? ( virtual/udev )
-	app-alternatives/awk
-	sys-fs/udev-init-scripts
-	dist-kernel? ( virtual/dist-kernel:= )
-	rootfs? (
-		app-alternatives/cpio
-		app-misc/pax-utils
-	)
-	selinux? ( sec-policy/selinux-zfs )
-	test-suite? (
-		app-shells/ksh
-		sys-apps/kmod[tools]
-		sys-apps/util-linux
-		app-alternatives/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-	)
-"
-
-# PDEPEND in this form is needed to trick portage suggest
-# enabling dist-kernel if only 1 package have it set, without suggesting to disable
-PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
-
-REQUIRED_USE="
-	!minimal? ( ${PYTHON_REQUIRED_USE} )
-	python? ( !minimal )
-	test-suite? ( !minimal )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
-)
-
-pkg_pretend() {
-	use rootfs || return 0
-
-	if has_version virtual/dist-kernel && ! use dist-kernel; then
-		ewarn "You have virtual/dist-kernel installed, but"
-		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
-		ewarn "It's recommended to globally enable dist-kernel USE flag"
-		ewarn "to auto-trigger initrd rebuilds with kernel updates"
-	fi
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-info_pkg_setup
-
-		if ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [X] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-libsoversion_check() {
-	local bugurl libzfs_sover
-	bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
-
-	libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
-		| grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
-	libzfs_sover="${libzfs_sover%%:*}"
-
-	if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
-		echo
-		eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
-		eerror "ebuild subslot does not match libzfs soversion!"
-		eerror "libzfs soversion: ${libzfs_sover}"
-		eerror "ebuild value: $(ver_cut 2 ${SLOT})"
-		eerror "This is a bug in the ebuild, please use the following URL to report it"
-		eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
-		echo
-		# we want to abort for releases, but just print a warning for live ebuild
-		# to keep package installable
-		[[  ${PV} == "9999" ]] || die
-	fi
-}
-
-src_prepare() {
-	default
-	libsoversion_check
-
-	# Run unconditionally (bug #792627)
-	eautoreconf
-
-	if [[ ${PV} != "9999" ]]; then
-		# Set revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
-
-	# Tries to use /etc/conf.d which we reserve for OpenRC
-	sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die
-
-	# prevent errors showing up on zfs-mount stop, #647688
-	# openrc will unmount all filesystems anyway.
-	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	use minimal || python_setup
-
-	local myconf=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--enable-sysvinit
-		--localstatedir="${EPREFIX}/var"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
-		--with-pammoduledir="$(getpam_mod_dir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="$(systemd_get_systempresetdir)"
-		--with-vendor=gentoo
-		# Building zfs-mount-generator.c on musl breaks as strndupa
-		# isn't available. But systemd doesn't support musl anyway, so
-		# just disable building it.
-		# UPDATE: it has been fixed since,
-		# https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a
-		# but we still leave it as this for now.
-		$(use_enable !elibc_musl systemd)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable pam)
-		$(use_enable python pyzfs)
-		$(use_with unwind libunwind)
-		--disable-static
-		$(usex minimal --without-python --with-python="${EPYTHON}")
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
-
-	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
-
-	use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; }
-
-	find "${ED}" -name '*.la' -delete || die
-
-	dobashcomp contrib/bash_completion.d/zfs
-	bashcomp_alias zfs zpool
-
-	# strip executable bit from conf.d file
-	fperms 0644 /etc/conf.d/zfs
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	# enforce best available python implementation
-	use minimal || python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	# we always need userspace utils in sync with zfs-kmod
-	# so force initrd update for userspace as well, to avoid
-	# situation when zfs-kmod trigger initrd rebuild before
-	# userspace component is rebuilt
-	# KV_* variables are provided by linux-info.eclass
-	if [[ -z ${ROOT} ]] && use dist-kernel; then
-		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-	fi
-
-	if use rootfs; then
-		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-			elog "Root on zfs requires an initramfs to boot"
-			elog "The following packages provide one and are tested on a regular basis:"
-			elog "  sys-kernel/dracut ( preferred, module maintained by zfs developers )"
-			elog "  sys-kernel/genkernel"
-		fi
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset"
-		einfo "for default zfs systemd service configuration"
-	else
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \
-			einfo "You should add zfs-load-key to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
-			einfo "You should add zfs-share to the default runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/zfs/zfs-2.3.0_rc4.ebuild b/sys-fs/zfs/zfs-2.3.0_rc4.ebuild
deleted file mode 100644
index 53bc008f5132..000000000000
--- a/sys-fs/zfs/zfs-2.3.0_rc4.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
-	inherit verify-sig
-
-	MY_P="${P/_rc/-rc}"
-	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
-	S="${WORKDIR}/${MY_P}"
-
-	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
-	fi
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-# just libzfs soname major for now.
-# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
-# see libsoversion_check() below as well
-SLOT="0/6"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite unwind"
-
-DEPEND="
-	dev-libs/openssl:=
-	net-libs/libtirpc:=
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libudev:=
-	!minimal? ( ${PYTHON_DEPS} )
-	pam? ( sys-libs/pam )
-	python? (
-		$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
-	)
-	unwind? ( sys-libs/libunwind:= )
-"
-
-BDEPEND="
-	app-alternatives/awk
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	python? (
-		${DISTUTILS_DEPS}
-		|| (
-			dev-python/packaging[${PYTHON_USEDEP}]
-			dev-python/distlib[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-if [[ ${PV} != "9999" ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
-fi
-
-# awk is used for some scripts, completions, and the Dracut module
-RDEPEND="
-	${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
-	!prefix? ( virtual/udev )
-	app-alternatives/awk
-	sys-fs/udev-init-scripts
-	dist-kernel? ( virtual/dist-kernel:= )
-	rootfs? (
-		app-alternatives/cpio
-		app-misc/pax-utils
-	)
-	selinux? ( sec-policy/selinux-zfs )
-	test-suite? (
-		app-shells/ksh
-		sys-apps/kmod[tools]
-		sys-apps/util-linux
-		app-alternatives/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-	)
-"
-
-# PDEPEND in this form is needed to trick portage suggest
-# enabling dist-kernel if only 1 package have it set, without suggesting to disable
-PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
-
-REQUIRED_USE="
-	!minimal? ( ${PYTHON_REQUIRED_USE} )
-	python? ( !minimal )
-	test-suite? ( !minimal )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
-)
-
-pkg_pretend() {
-	use rootfs || return 0
-
-	if has_version virtual/dist-kernel && ! use dist-kernel; then
-		ewarn "You have virtual/dist-kernel installed, but"
-		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
-		ewarn "It's recommended to globally enable dist-kernel USE flag"
-		ewarn "to auto-trigger initrd rebuilds with kernel updates"
-	fi
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-info_pkg_setup
-
-		if ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [X] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-libsoversion_check() {
-	local bugurl libzfs_sover
-	bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
-
-	libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
-		| grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
-	libzfs_sover="${libzfs_sover%%:*}"
-
-	if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
-		echo
-		eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
-		eerror "ebuild subslot does not match libzfs soversion!"
-		eerror "libzfs soversion: ${libzfs_sover}"
-		eerror "ebuild value: $(ver_cut 2 ${SLOT})"
-		eerror "This is a bug in the ebuild, please use the following URL to report it"
-		eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
-		echo
-		# we want to abort for releases, but just print a warning for live ebuild
-		# to keep package installable
-		[[  ${PV} == "9999" ]] || die
-	fi
-}
-
-src_prepare() {
-	default
-	libsoversion_check
-
-	# Run unconditionally (bug #792627)
-	eautoreconf
-
-	if [[ ${PV} != "9999" ]]; then
-		# Set revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
-
-	# Tries to use /etc/conf.d which we reserve for OpenRC
-	sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die
-
-	# prevent errors showing up on zfs-mount stop, #647688
-	# openrc will unmount all filesystems anyway.
-	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	use minimal || python_setup
-
-	local myconf=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--enable-sysvinit
-		--localstatedir="${EPREFIX}/var"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
-		--with-pammoduledir="$(getpam_mod_dir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="$(systemd_get_systempresetdir)"
-		--with-vendor=gentoo
-		# Building zfs-mount-generator.c on musl breaks as strndupa
-		# isn't available. But systemd doesn't support musl anyway, so
-		# just disable building it.
-		# UPDATE: it has been fixed since,
-		# https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a
-		# but we still leave it as this for now.
-		$(use_enable !elibc_musl systemd)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable pam)
-		$(use_enable python pyzfs)
-		$(use_with unwind libunwind)
-		--disable-static
-		$(usex minimal --without-python --with-python="${EPYTHON}")
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
-
-	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
-
-	use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; }
-
-	find "${ED}" -name '*.la' -delete || die
-
-	dobashcomp contrib/bash_completion.d/zfs
-	bashcomp_alias zfs zpool
-
-	# strip executable bit from conf.d file
-	fperms 0644 /etc/conf.d/zfs
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	# enforce best available python implementation
-	use minimal || python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	# we always need userspace utils in sync with zfs-kmod
-	# so force initrd update for userspace as well, to avoid
-	# situation when zfs-kmod trigger initrd rebuild before
-	# userspace component is rebuilt
-	# KV_* variables are provided by linux-info.eclass
-	if [[ -z ${ROOT} ]] && use dist-kernel; then
-		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-	fi
-
-	if use rootfs; then
-		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-			elog "Root on zfs requires an initramfs to boot"
-			elog "The following packages provide one and are tested on a regular basis:"
-			elog "  sys-kernel/dracut ( preferred, module maintained by zfs developers )"
-			elog "  sys-kernel/genkernel"
-		fi
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset"
-		einfo "for default zfs systemd service configuration"
-	else
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \
-			einfo "You should add zfs-load-key to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
-			einfo "You should add zfs-share to the default runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/zfs/zfs-2.3.0_rc5.ebuild b/sys-fs/zfs/zfs-2.3.0_rc5.ebuild
new file mode 100644
index 000000000000..48dcd8358c6d
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.3.0_rc5.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
+	MY_P="${P/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+	S="${WORKDIR}/${MY_P}"
+
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+	fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/6"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite unwind"
+
+DEPEND="
+	dev-libs/openssl:=
+	net-libs/libtirpc:=
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libudev:=
+	!minimal? ( ${PYTHON_DEPS} )
+	pam? ( sys-libs/pam )
+	python? (
+		$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
+	)
+	unwind? ( sys-libs/libunwind:= )
+"
+
+BDEPEND="
+	app-alternatives/awk
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	python? (
+		${DISTUTILS_DEPS}
+		|| (
+			dev-python/packaging[${PYTHON_USEDEP}]
+			dev-python/distlib[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+if [[ ${PV} != "9999" ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
+RDEPEND="
+	${DEPEND}
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
+	!prefix? ( virtual/udev )
+	app-alternatives/awk
+	sys-fs/udev-init-scripts
+	dist-kernel? ( virtual/dist-kernel:= )
+	rootfs? (
+		app-alternatives/cpio
+		app-misc/pax-utils
+	)
+	selinux? ( sec-policy/selinux-zfs )
+	test-suite? (
+		app-shells/ksh
+		sys-apps/kmod[tools]
+		sys-apps/util-linux
+		app-alternatives/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+	)
+"
+
+# PDEPEND in this form is needed to trick portage suggest
+# enabling dist-kernel if only 1 package have it set, without suggesting to disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
+
+REQUIRED_USE="
+	!minimal? ( ${PYTHON_REQUIRED_USE} )
+	python? ( !minimal )
+	test-suite? ( !minimal )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
+)
+
+pkg_pretend() {
+	use rootfs || return 0
+
+	if has_version virtual/dist-kernel && ! use dist-kernel; then
+		ewarn "You have virtual/dist-kernel installed, but"
+		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
+		ewarn "It's recommended to globally enable dist-kernel USE flag"
+		ewarn "to auto-trigger initrd rebuilds with kernel updates"
+	fi
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-info_pkg_setup
+
+		if ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [X] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+}
+
+libsoversion_check() {
+	local bugurl libzfs_sover
+	bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
+
+	libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
+		| grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
+	libzfs_sover="${libzfs_sover%%:*}"
+
+	if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
+		echo
+		eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
+		eerror "ebuild subslot does not match libzfs soversion!"
+		eerror "libzfs soversion: ${libzfs_sover}"
+		eerror "ebuild value: $(ver_cut 2 ${SLOT})"
+		eerror "This is a bug in the ebuild, please use the following URL to report it"
+		eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
+		echo
+		# we want to abort for releases, but just print a warning for live ebuild
+		# to keep package installable
+		[[  ${PV} == "9999" ]] || die
+	fi
+}
+
+src_prepare() {
+	default
+	libsoversion_check
+
+	# Run unconditionally (bug #792627)
+	eautoreconf
+
+	if [[ ${PV} != "9999" ]]; then
+		# Set revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
+
+	# Tries to use /etc/conf.d which we reserve for OpenRC
+	sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die
+
+	# prevent errors showing up on zfs-mount stop, #647688
+	# openrc will unmount all filesystems anyway.
+	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	use minimal || python_setup
+
+	local myconf=(
+		--bindir="${EPREFIX}/bin"
+		--enable-shared
+		--enable-sysvinit
+		--localstatedir="${EPREFIX}/var"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
+		--with-pammoduledir="$(getpam_mod_dir)"
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdpresetdir="$(systemd_get_systempresetdir)"
+		--with-vendor=gentoo
+		# Building zfs-mount-generator.c on musl breaks as strndupa
+		# isn't available. But systemd doesn't support musl anyway, so
+		# just disable building it.
+		# UPDATE: it has been fixed since,
+		# https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a
+		# but we still leave it as this for now.
+		$(use_enable !elibc_musl systemd)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable python pyzfs)
+		$(use_with unwind libunwind)
+		--disable-static
+		$(usex minimal --without-python --with-python="${EPYTHON}")
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	default
+
+	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
+
+	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
+
+	use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; }
+
+	find "${ED}" -name '*.la' -delete || die
+
+	dobashcomp contrib/bash_completion.d/zfs
+	bashcomp_alias zfs zpool
+
+	# strip executable bit from conf.d file
+	fperms 0644 /etc/conf.d/zfs
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	# enforce best available python implementation
+	use minimal || python_fix_shebang "${ED}/bin"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	# we always need userspace utils in sync with zfs-kmod
+	# so force initrd update for userspace as well, to avoid
+	# situation when zfs-kmod trigger initrd rebuild before
+	# userspace component is rebuilt
+	# KV_* variables are provided by linux-info.eclass
+	if [[ -z ${ROOT} ]] && use dist-kernel; then
+		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+	fi
+
+	if use rootfs; then
+		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
+			elog "Root on zfs requires an initramfs to boot"
+			elog "The following packages provide one and are tested on a regular basis:"
+			elog "  sys-kernel/dracut ( preferred, module maintained by zfs developers )"
+			elog "  sys-kernel/genkernel"
+		fi
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset"
+		einfo "for default zfs systemd service configuration"
+	else
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \
+			einfo "You should add zfs-load-key to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
+			einfo "You should add zfs-share to the default runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 1a5589ae1cf9..5bd1385733bd 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -1,17 +1,31 @@
 DIST genpatches-5.10-244.base.tar.xz 7784252 BLAKE2B ab6f4a3f41b9ba52f1b9d7fc1c0e0b16a5871bc0bd30da7c63b24f11c3c3abaabf141b1aab76f4435fed4d5f25c2ecade6a83a9c3ca20efb9f9c6f44327ce545 SHA512 fe2e006f6a7571e1ab1cb3dcb80d9a6dbb46973918a138af1d6d402bf3702cb89e3764f7838d2d2cebbf9c97974926637d6b58c666899251be8433910dd6dd47
 DIST genpatches-5.10-244.extras.tar.xz 4056 BLAKE2B 48aa848b13eee7909a304b368603f03050f8ca0678e702ca8b302982373ada3b5f88fe1e6b51d7c66a46015c38efea31e82d8d67282b2ae4021c0be30c3a287e SHA512 eba51067dc0fb1074b860afda9ba5be55e83738738e84a70d1219ef5c89bfb7c5e82191f347881f7c82b25e87ec105f9a0c08d0248f5f0a2dc20bbea2e642c08
+DIST genpatches-5.10-245.base.tar.xz 7815984 BLAKE2B fd5b339977af766fc292071eeb16e08fce3185dd3bf1c16dfcc1522b664f84dd5892042707c68f84863bdc19afc35d8fe053476f904dce2ab18b4aa9b3cd61ac SHA512 45754b5713276a852f83be7c23d66deb020b3539457614a80b051cd4e276780101df3c92e2c6ddb96729676bb86b418f77f76807fe96cdfbf5571d2141e5a313
+DIST genpatches-5.10-245.extras.tar.xz 4056 BLAKE2B f4838beef428e2913d3861b26989b10f82391823ebc39811402294c23c5a84623dab8b15346ada7aa3c9552727c857ca80a262fd9dcf4f4751888b0454fcdfdb SHA512 617ac2cae48ac2831bfbb5a0bca25e466087eccabd930ba86c0e9f984822aa5ecade7559d4b1c71031b4db7bdb803ee31a4c392ac36413d97a51e2befcf70166
 DIST genpatches-5.15-185.base.tar.xz 7813568 BLAKE2B a287174103461737a4af5e24410266140ecd2970dd5568557ea1270d7b3d9db98ee218c392a4e8ef35fadedcfb8f9013f6dd830c08c0d9b2147c57658720e1d4 SHA512 edec855e548f4ce61e2aa3e8a86216a75d43405141054c114f7f2ed024f91500b905e953dc07f528d19bd25b13781377d8c60ae70e0bb15330f5cd187762b509
 DIST genpatches-5.15-185.extras.tar.xz 4056 BLAKE2B bab13e1f8b400270ab36e78525947b68468504433f41784c507e6700d23e08b7eff91cd49e50398f90622cc289d6c4c122b3d5f8da77742b01c167ced5284cf2 SHA512 be561334e77afb45e11fe5e8c6c3b61d85c821776bcefc0cbe0d9addc6561a4c0bfc3956a990fa50f703d7defbc4a847ddeeb170d4dc828c2bcbd1a4c6f4429f
+DIST genpatches-5.15-186.base.tar.xz 7849000 BLAKE2B 3bf7560f3bfbc26789d4ae1e93932bd94b46e69c8a9ed29907e47ad493c7f7acd25309bef228306c69e27ac53b65efa8a8bf505fc577ee3a8ccbb196d36c866e SHA512 afa8bfc5d4f9ac104a583bea92b8930db5c2ca165c6c1fb3d5750baeb508df6fcfadcdb3c978bcd8e8ad95cf3ca2fd0c5c6cebcd000e93dbed663f310af01dde
+DIST genpatches-5.15-186.extras.tar.xz 4056 BLAKE2B 68130d315dd2ccff0075d729a10cee298756baff9ecc0c1f218ca4c771ccf30541bdb876ee529292a56c56ba49eefe5839cae263a08bc0f3ba114fa499267141 SHA512 2d1f1af4d251c93d7e45aee1710e44129b8bc71c83d7bb328b07b28c109e394259321ab12e889483369966a52616c1c41b547220e4ee9e4e3ceed21f89503665
 DIST genpatches-6.1-131.base.tar.xz 6701808 BLAKE2B 0ff847805abdeefee31ce75d0b5c02eafdf7b12f3b3c499c0d9d19305b3ae934194bdf58fabb30e51a356eae5e57c7d633b7abbf45a94096e981c671181c9b16 SHA512 7604d45f78bd5a087f0a158acf3767b275315b60c77cb4d6b93139943d56ca917a75ed8ed784a608a52d3e1d06cb36a01f5c3d0f5b211dda6d62d36fbe9ffaf9
 DIST genpatches-6.1-131.extras.tar.xz 4056 BLAKE2B add38a1ea9191009b22ce04a556062e419452bedc85d6afd40d6aa3da2474f4719aacf91bc3680b6a08a7b73cd0dbcc5c3249322f8c47660ef36c256e8792bae SHA512 7d68ef7b616ab8bd62db15ead625f0e449b6ebdde8477676d0aa6ef017f9270727413af62985ed8b271aae1f5288682f4fd0d0804f06577e2c1f4014b5402035
 DIST genpatches-6.1-132.base.tar.xz 6718336 BLAKE2B 3a1d86ff100ded252a1af8cb1cbe50ea55e0789041f0e740c30c6a70c3192d8c90f873c46f9989b4b76071d1364f29b2eb8230e2675d22f2e14b6cb94e3e16b6 SHA512 bd225633a720a3d271969818c01b59792b5783c16743cc020e3cf444a37116ba57b0d82280853b432a3e3043a29f717ad2878dfcce4516a8127c535367ce6c49
 DIST genpatches-6.1-132.extras.tar.xz 4056 BLAKE2B 3f3d5e78761b9322a765bb8bdc137395e8382ffe7bd401f4b474530afd5f9ba570744058772978ac39c897f04eceb524ed53d32c8ed71fddd1a0191f31284c0f SHA512 ac96811e465540e96cfa443bf088bd9795c58080b19b87dcbf62c0a4c94dbbf28ee6d94262ca76bc38b9c591e4d07872294b14807e1d18ce804b69497cb0ee66
 DIST genpatches-6.1-133.base.tar.xz 6730928 BLAKE2B 0a3d788af308b602468d8bc26467d01f1ecc890b5da5fedd65b3eef33cf3da154b48e0ba71f1df6f77eac22ff355570f6096aea7bda695a2f7dad1f409387a9f SHA512 10ab1138a7a7ed000ef431d35af6375c1ad3ed8e3313b4ce43b19ecc4640fbfc8691a8113aba6bb3b3481fbe3077ee623d8f7c6c12337c809ee2f0d533adcecf
 DIST genpatches-6.1-133.extras.tar.xz 4056 BLAKE2B e5510780c454bbdd69f0d5d01bc6d792316f62a9e9217fe7500f688a5b8854b9d8406521e553808cf65e10f937be884fc4bbf3e3ce70f75b28a8254af03b77dc SHA512 e93284e4812b2a0a43e9de73c392874e1d48dfc3ad4d27a145fd43864e310cc60df3f509477570dca011dee7a9fb17ea2a72882e5316a50746a5a6cad58f373d
+DIST genpatches-6.1-134.base.tar.xz 6754804 BLAKE2B 36d49584071a74207d07d353e67b8c0e9f9d5ca3db44d5fc6c392bf34c022fd6ba9022734aba45fdd432673133e9f4f9ade495658550a68ad537153a08cd01af SHA512 214e8b20b52af4fb5b22035955dbafe665245c3ca85a1dab3419385be6f9f0d3b0f5d0ece9180c71a11c9e11b1c69153e82be282b46b41c1eba2df19226f90ea
+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
 DIST genpatches-6.12-11.extras.tar.xz 4056 BLAKE2B f8c2a145a06ea061100ba4d16e873a3186c4025d48610180aed135a8802494855decd8a58c24ffa4dd394cac843e41f45dd8aa93c28e03cdb1d46d8ce496da17 SHA512 e2808c8a70aaf3ef76348542a0aa0656f1ccdbe3523b22e5539d0c3952b4013aafddca5d881bc0458aab33f1b652f178d89ae4e596a9f541274f74eaf97ad16b
+DIST genpatches-6.12-12.base.tar.xz 758168 BLAKE2B 2f9fca909ebc5710fa9154fe4c824116e48adbf9d4e857a75661b0689a0c44add897a502700edf415ba4b664fe586ba490f16b4dd12f00b19b80c34800d4b6be SHA512 c7d125caa03b0ff053f37fc82a4fbd9d3be8f8eee024bf05639d4f3c3b51574983e5d0beadb7714865f6d72e02a22ceb528c8359115ac995b63f5d87eb055bb9
+DIST genpatches-6.12-12.extras.tar.xz 4056 BLAKE2B 8e00efcd3af7862fb8bde9d8a2e9d51fd999474e33e63e058c3580b187abc71c2206663d37b7b4ebd96193c6185a29f5d1e9e9ef98167703f01bc5c3c9b767c7 SHA512 a52dec8d607e64c112a2b1c731f65ca3fe340712bb390c25e8f7bee90cabea619922540998ef6b95b97dc0626b4dfe3a9713a3f8e7efa8f99f3ebd95e8fdf855
+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 genpatches-6.6-75.base.tar.xz 4089936 BLAKE2B f88b0f84e3d73f87025389a3a66edbeeb6c126bf93b2522105859d27911aebb768cbbb2aa8418fe7e778eed6130b2253d85c08cedfa99c188c02d8d043f5fc7d SHA512 ebaf66ba8a338d548041c1ed619c4cde495a3bcbc990caba75dc86bf990a159b7f431e46e84cd16cea62991ca9d50420747a988da6e0c3973aec25943bc00d8d
 DIST genpatches-6.6-75.extras.tar.xz 4056 BLAKE2B 6e2e14f16a7ebc675e84b180a8f26f485aece3f22de1d27bef60b414deea8f3744cbd95536b58722d793aee320b505d5ca3c0af0b1e20f238b02c29a12abada9 SHA512 c8030df10b17675adf3c48931f04c59d1795598c955eef39c7b3dd4f36c1af1d79e8d7405004952cfe4922cf100aa95d2fe3d7c6f6e0d683276d5382bebce399
 DIST genpatches-6.6-76.base.tar.xz 4119292 BLAKE2B 643510f5f01b8b7ac5c24098cd65b21ef02fd75b2682b371b00e8be48c6c335e7135569c58ad91ab6549e298b1dca15b83806143bf260a9e594feeffb2178fc5 SHA512 1345c21e33f3f0433691e03921c7b3d47bfdaad47376c06610170cf82214e3648cbbd2cb250ea4877d5c238f324f499b52e50dd2e5b51b4e336f2a1a5a431a1e
@@ -20,14 +34,28 @@ DIST genpatches-6.6-77.base.tar.xz 4120472 BLAKE2B 99c511e049d8b375eb54c8c00688e
 DIST genpatches-6.6-77.extras.tar.xz 4056 BLAKE2B 72ee0f92105f7e24d08e54614b5fa1514ee8ff75de5781474f56a3655665c5d3152771e3379bb431fb73ce19780620de72858cf64585109033c851be05efb0f0 SHA512 afd1947987efc0268727e6019910aff4f8860ab60707a32a289a454253519137dd7e8da92ea2743706b124ef873f854ff8ed6b3eac719523ca5ff94f466b261e
 DIST genpatches-6.6-78.base.tar.xz 4145152 BLAKE2B 24e2e975f186f08be3d9b75f08e9c8a2e3081f1cae68ccfc8c6f68aae46f8b8806ec91c8dcf7d0b6decf1e402c545dfdba5ee17f09e6d6fd220c62f6e01de939 SHA512 306d617bab4a327c062f2d6d2017dbb3110e8f17484b5a3de4fd9d805cafbb51410ab4fc20f93f4b35e9b6917ef015b0e6280b3f6a76790d4c546a6771765271
 DIST genpatches-6.6-78.extras.tar.xz 4056 BLAKE2B 464b1eda63d76013d5fa0eee1d89b135100f69ddf7e1d773cad3e021d197cf1170d66a3de6a30045a789cc03a6b69913ed222c640201c1b9ce8306ca089b564f SHA512 71a9421ce799323791d0d616204b0095b4b5c799ed8b1c2786bd65cfe2c10b801200d07b0a1fa2c1ccdbe75f0d2a6a18ee62a528895bf5d4d804e42af89aa2c9
+DIST genpatches-6.6-79.base.tar.xz 4222900 BLAKE2B bcd3e23877b7ee2439eb080d304a346c539b2ea2a3b242b89cfd68dec8f3022d2e89b43c939ae11c02d60c93f3c0c7c6569fc41994a8faa3a1fc259d4065bbcf SHA512 a336717d2f9585ddfef9ed6c373d7225bce4c5a76a31d55bbf8998214b1a835435a7510ed5b4cd4aafb4f92e668f7646e0f7ca964bb1505b4bd20f8353f46761
+DIST genpatches-6.6-79.extras.tar.xz 4056 BLAKE2B 70ffc39672faf32971e8b3bf8e41fe2a24e65fb3268447b1c9278fef4cf9fd97ddf9045329ad1431482e6628af911733bf86c7ba7cab624880cc070e68d94f39 SHA512 c3403d427b07a3b70447143d728987ea995b0d3d4d79c1d3a874c3de34cc5c14068320847628de36dbb40cbe63540942969cf2b158b0a563dc34aba927e3ec5b
+DIST genpatches-6.6-80.base.tar.xz 4222992 BLAKE2B cbdd564aecb24378e09623688dfcf5bb1931d63823a339c99d7a8b436e16ed20b98cc682a5ffd10afd4c24a7e91542f140e7448b6b81acdc112c25ef982bb107 SHA512 273542404785a57a14a732c4e0924d0c94fc95c3980293c6d5ba6a30abe30f1f42d756dfef27c9ad5ffe57da84f2368ce9d51293d4b006d13dde2c8d0b1376a9
+DIST genpatches-6.6-80.extras.tar.xz 4060 BLAKE2B c83e6d97ed086ae3b9f3d6bf4cd29d4eae9f57f638eccab183dbcbde85886df00653634b1cf272f26580f32e1a7786f68960bc51f78a01540c61c0f5c7823b79 SHA512 a0e0b309a2022daf6343e21c0f435bd617d2a029c28297c7a082a8380157ea4fa52b12f92bd045ad8c3fb680cfe98edfe69e10f4d6a28f9b115afe8b07d75433
+DIST genpatches-6.6-81.base.tar.xz 4254652 BLAKE2B 20fe02a8fe886c04569ba9490de06956b2927014c1d023dda7d55c4386a0cefae6ee3d4d8138e824798b2d410f52024c701ac0b099c74080d4e3e28a8ba11e8e SHA512 f837dd14a9a5fb677c163660e916751ee6c12ad8cddd6dbc011be87b083339083c4ce110e43e0e364d48cdd9da769ffb8617bcff650068b516e03b33d0996ce0
+DIST genpatches-6.6-81.extras.tar.xz 4056 BLAKE2B f8999d149063deccfd69f06848c39fa87de113d9978b4537e9699b1c9ed5896db929bb28e06919a13c7bf425c5e17438086ab5714b2cff57c0e1a79c097a535f SHA512 99616bba8411fa7a4bf1955abe97612c514f4c299d97b2bbedd467fda98505525545b3a65aa679ffd3171829a99f8d008590503fbdfc14bbb45552b1f85f82ad
 DIST gentoo-kernel-5.10.232-1.amd64.gpkg.tar 63672320 BLAKE2B 43d75308443842d0dbc65d355c09ae0806c187c4ea3e9c87d5322a236081aefa6a1af8661ae1d6203fef60b574996b0dd53699bfe07eb67b08b58f1aa20c3995 SHA512 f5838299ec65113eeabd7e516375641857de9512e9b6bc4e85ecffffb91519baeea4b0eb2769d5e675740620e431fc9955d76fa04524c50f1c292518e8c42d33
 DIST gentoo-kernel-5.10.232-1.arm64.gpkg.tar 56852480 BLAKE2B 6f628a7d0b7feb82c903e2814b2f02ceac867270356ffd3d06ad5bf03a55da340e089739fac83ef727fa03148a7adcef5f00e295a26f7f88ea46cdecb7183b94 SHA512 dc06388259a4d5878c7045eeece9393edbd0981538ae9b7208e3dd4aedc49d9b5f71178812765242cd0383145529af4a273de165c15c1d72f2e852a18620227c
 DIST gentoo-kernel-5.10.232-1.ppc64le.gpkg.tar 52828160 BLAKE2B 1a77533dc0bd3072311120b62246fe8ed2ee57c06354cdd1aa3657ef2aa21f3adaa780910a3f357804fedd6d65006bcb5ba29d5786d291f51acd1142c706118e SHA512 de8aa68bc5960b5dcca618641fdb570dbb77b83f4f02a28f0522f491af0a7d83795879d9b50a1a19c780ef6d4b941019d9cc945af31b8eac7219f5647ede6440
 DIST gentoo-kernel-5.10.232-1.x86.gpkg.tar 53811200 BLAKE2B 89a171b837a0210cb83895e8ce8698b6901153686b1b84088db60a2d6b46083cb6be677087d261f0369adb4c4956258da81aaa18a1dd6de3645b39feaac4636e SHA512 fc53f52f0941d204ccebdf0b1f7828003feda77fee352253d83a4808ea8b32791bfa2483ec88a9eedd1985f6299368a367f731e2f8ce660f3d8fd81c041c0dcc
+DIST gentoo-kernel-5.10.233-1.amd64.gpkg.tar 63692800 BLAKE2B b1807bcd074455292610a08353a8cbd329c9c8eddc09bae9bc089d6c1dc099a3937a98017f577d5d90cf7b7ca15c92845d16af7a124d08b9057a56c5fcc13a6d SHA512 95889f3754ea1601e063866a59599389229346b195b5247151dd34f6fcd397424d9d504a5aefe7d8424e62a4a043e9d9c82fcd32e633928e3905c89baef6e608
+DIST gentoo-kernel-5.10.233-1.arm64.gpkg.tar 56842240 BLAKE2B 80650d6155278c12120fcd831018b565bafcbfa34f782c9a0038d5cf950d975c9eb66754cef37a72379813241359582f1746066dbffd34d11be5b35c64591412 SHA512 c74297b9035a0f74e98ef609a7bf81017f78cec0e1759c278f6f18504f9ae1a2f1609d6286530ceb19ce90c713f7af39abf531b7b3d4ccf5ad2390c207ffae3a
+DIST gentoo-kernel-5.10.233-1.ppc64le.gpkg.tar 52828160 BLAKE2B e7297dfab0cc9303c31f97772c0f91bd47f5e15c7b618b86d701b399cffdf06b58519381be73c6e0c67e8848929a1e058757e82e8653eb90b04e1d5e31e5277b SHA512 1aaf95701bd26cb16a65d9436fb7f6b0a62d74fab6d30bb1cc87b24be91b2149b265411053b14d31d4ff7b4f61c08ef53a589fc9934700a7326bb0cc18603e3b
+DIST gentoo-kernel-5.10.233-1.x86.gpkg.tar 53811200 BLAKE2B 61d2e6000729ad1fa127717df45c6ff325df86402257bb8297b11c23602d7b345ef9c73725e81367e9111e92ba1834da8039bf20e0b18cf806ca92fc8100ad1b SHA512 7f6bce845d3744317864b01f51309d5fb6a7b0d5495e5d037c2d07b7a15137b267d09c9ea3e34c7abdef3b366dc0feaf35e0a0d1484fb62a1b6e628da18ec06b
 DIST gentoo-kernel-5.15.175-1.amd64.gpkg.tar 68833280 BLAKE2B 685aa97574314074905d39fe19b338fbd4443c594251e6084995869cf1588f5de086d2867f15bb66b2cda4b3fad6c49ac8226880cc6af35eb4c3ea2e95f71a91 SHA512 be5e5267f9b58ed91e3548564e7e1259f3af7eef62220b3c4918e563a32fadd320fb02647152d4f3fd57f46f16f32b7c6af75b45b7f9eb54f366084505da86da
 DIST gentoo-kernel-5.15.175-1.arm64.gpkg.tar 62545920 BLAKE2B 2921da5a6c57f597182ff17b93d7fe0b561549105efcd226dc9dcafb73b9cf09f12f71dc3bfa645686b398c98232cfec14f22de0c74cd869cc1d55cdb8a2f841 SHA512 568507b177cc2623068713a5422c7664b01d2d2120b20b34c52b7dcbd4e6e3120cf9d1dd528f2f3771b11a327d66dea0801e3da100ae118983603661290c6ff0
 DIST gentoo-kernel-5.15.175-1.ppc64le.gpkg.tar 56821760 BLAKE2B e3989934dd49c1cf5a326e01786ebeb8d87288d4e2326c4b7fbba738f6e6af7a903694e1b940ee0d70c58873cf7c568ea535d71ef093815f6082f1d0dbc569ee SHA512 1cd0e70023db8c8fd930e58298d2330df53d6ff83954d967e7dbe5808b869da4133fd6e0f7fd76bb103a2bd34b7b46febc3accdb8e99f345ce34b16215c95f91
 DIST gentoo-kernel-5.15.175-1.x86.gpkg.tar 58818560 BLAKE2B 532f9c60134fdd247bb607f64a50d5855498089e493219a98a8429d4e47a58f6e9d728fdbdc4b1f3e329b9c9c44aa3b58f94082851286336d6134f9a531e9fda SHA512 cc34bedc43c66281c0af81a59b3ffdd22ac5792ebcddaccbb60c200968603d611e978c04453fa7c351683922dc40ec5260481794deecd9ec7faa54e7db72737f
+DIST gentoo-kernel-5.15.176-1.amd64.gpkg.tar 68823040 BLAKE2B c368e8ea2286ad3caab0fceaca87f7a60069bfd3d123f5835595debe1a497ed985739e6c2209377a72a8f35acf3a707cb6f12381e5eab24911721ec9f7a6e4f1 SHA512 3992b0cf8b09482bb8b2dea8cee3dad11582e24e7a416ce6375e763a5cbdb4c88f844eb4ec78783ab652814072fd825ae55728185feb3c7ea4d69d06d73e1793
+DIST gentoo-kernel-5.15.176-1.arm64.gpkg.tar 62545920 BLAKE2B 8af35ebf5907382248d2e876f282ae447f24f1602cf66588ce4d3a245fe4e8e3d7048e98796aebb8d26441f3dda52a3b89a6d46476ee9455418d3c9554efc922 SHA512 8e43e8bbcc2b9f75324392bf8d7606e9175858b94efa29bfa0c6d075de88d8210ead3a8d61167b533966968956724a21cb89733dce4135a729be99bc5e2c4484
+DIST gentoo-kernel-5.15.176-1.ppc64le.gpkg.tar 56821760 BLAKE2B cfe9fc6972f4f9cfe6daeab48fb3cd3b3f3fdba7d4b905e91615dfe3b52e22cb631d8bbe97130384ac43cae1c09c1102a65bef481449f8f995d2d999f9c10786 SHA512 a184fbeee5a4ed4c33549e9614eebb095e1f1a132b279537977b5adbfc0b2289fddef2a4182577b65712f6d3a17024f3b748ccb9160649e788d595e5acc668a5
+DIST gentoo-kernel-5.15.176-1.x86.gpkg.tar 58818560 BLAKE2B 20117f1688e5b3ff6abc6b8317c6c0ca0835d996bdbcfec4f5f83fc8c673eb5179c2e17aec0f64c8fb078285541d74eeeed81d553607289817f133e307520eb2 SHA512 f6240ee129ea90653971367f644bde398a1b2b4d98bdc5cc6e7bbe58fd28f511d7d41137952e8bca72cdca700ca870b6192607211ac131098085dd8142983ca7
 DIST gentoo-kernel-6.1.121-1.amd64.gpkg.tar 73000960 BLAKE2B 1f3afb7211ba2e8d33ad24fa4fa78601e9eb85462dfc7472d9103fc8aba27b6bdfabc18154331cac99b0d3873e7120ebb06a6f9222520e05332219f596eb3b26 SHA512 f025e9f3804f65a44ef03a779801f20b4d093612999dbaa7e62b0bceca066dfa80ee4ef1affce06f027d87463c4c3a96baf0cff7e10f2322d4fe639b1320d570
 DIST gentoo-kernel-6.1.121-1.arm64.gpkg.tar 65720320 BLAKE2B 3630b20d56044ab9f85f03f32f8a693f8bf39413a6b5c9bbefa722c2fdd30ae5a6026836f0dd55f6ca3df91691190c1e00bfa88fec281e12709069e95bed637a SHA512 14e0811fc866e31a7d9c983bb6477e601a08bf2df1ab7f854f8ec609d68e28e2b66650178536baccc9c491c2948be1606d5806fc5de261fbafd72dfb95469612
 DIST gentoo-kernel-6.1.121-1.ppc64le.gpkg.tar 59914240 BLAKE2B f5a3ec5585b7cb527ffafd5b701a2d022bef7b9d7d8c29cf3902d6f80282209854db5ce1316b3cee11dfc122c5fa44a50ea260fff68c65d80c983f506e8cf70c SHA512 a9cb921ff44f9153d362f6ec25737f21d88e9e1e709ebf933c90da55dedafe424449926be5688ea90c0874c3e2e6ec7352e63e3d963c4bcd6449267d669c02f0
@@ -40,6 +68,22 @@ DIST gentoo-kernel-6.1.123-1.amd64.gpkg.tar 73011200 BLAKE2B cba36288006a5da11c6
 DIST gentoo-kernel-6.1.123-1.arm64.gpkg.tar 65720320 BLAKE2B 3d0c4d421c2d9d062c99ed57a4f393834dcefe1144c5b5a68babba364f66d7c8eaf7b3c9eabee77ede08816fbe49c684b04bf8f55a2f7b2cf6f3ae0219cd81fb SHA512 a155758eac2b697e6069c5dc824e2b423eecd8b543bef02f1c781ace39c2394b81b976acb3bdf0642f5a8cb2dcf405d4fb54c3c9fe81ba476ffa9eb97bce7958
 DIST gentoo-kernel-6.1.123-1.ppc64le.gpkg.tar 59914240 BLAKE2B 4d9fbab35e1467c5f00fb4d60def4aaea8e67d96e8bb21efd183434ce48983848ebf4fdbccafeebb008487f3a1b64ddbf73d57b2f28666db3b8b2054f43b2201 SHA512 1e6a17ecc3419ac07922c19cdc7e42ef74a321249dec8b1f375bd1241476909e3231d62bfd66394a4e40870bf5ac5c03e96a80177b68752e9f11333e50e24704
 DIST gentoo-kernel-6.1.123-1.x86.gpkg.tar 62351360 BLAKE2B 447be977370406beda6def93a3e308e6ec3cccbdcd28aee42a531dabe933826b08ab65b3df6e58676a1b663c9369578b67c10fc7ef9904211be60afaf48b8580 SHA512 db74ed885d2e9fd07ea465e126753e8cc723f40b6dc2e71c4fcf7553a85c6c9188e2d28937bdb5804b11285130da6a7d3d9696db198ef934c9285ba5a12c79f2
+DIST gentoo-kernel-6.1.124-1.amd64.gpkg.tar 72990720 BLAKE2B 18ab1d61088387bec75437c006827d75008c528fa560525f54a6315acd4706ebab19610ecbf52e8886149a454f75980dc7b69d06a6cefbeed24440a284f4bca0 SHA512 a00709cc63dab5baf37d6aeb14f3fd026359cab00bf12cb9b249d068db1ee6a9791fdedc3730dd1bc4df0187cd84e1da6ce84b0cc9c9baa80c02b5a99191a9a1
+DIST gentoo-kernel-6.1.124-1.arm64.gpkg.tar 65720320 BLAKE2B 0f9eee72cda92c1f6e2c24ca0d428f4f01ae1d1d008abaa13b69caf030a7d134d6e251e5a1ec79e1564fc3ff6367aebd33a437c63964450e54d1f2dd49b4b3f2 SHA512 59680c53bf14af346e5445a13d4f6148694ad823f06f356dd16bf30fc72978910523943cde99c1240bc0ad7a8b16d46fcbbec450960800dcf25fb58e087fcac2
+DIST gentoo-kernel-6.1.124-1.ppc64le.gpkg.tar 59904000 BLAKE2B 942327648753a8418362448f1ed92964c3ac94816e580fb5f5d3380256e6f5b88e60d49deaa9f814bd55365bf5c6b72eac2b48fd72dbc4df7d93063f4ce1fd36 SHA512 0c93cb0a43b2c869f092ac067f099864e5b7811462100714619d78e014aeb98d4ff82fe118c6df914b2cc97103ccda7df61081690746a27e304721ec4c123b3c
+DIST gentoo-kernel-6.1.124-1.x86.gpkg.tar 62361600 BLAKE2B e2672c5ad61949c7ecfe535d2bf1a6ade3733932be7a5ea5e7eee37b3dae5c15bfb8ffa5018668e6f429c28809675ae37e59ce3f42e22e2bdf50fbe94a4999cc SHA512 5c4586c693bd3daed10c5a63b0841229a5631f54e488080d37cde4cff8971a830d9e058da32971e38fada0ca5c109555d6f62df1993e025ba02133774ad9498a
+DIST gentoo-kernel-6.1.125-1.amd64.gpkg.tar 73000960 BLAKE2B 34049964226c50f20239de671312df5eb21d28d9418b60b66c18acda4de25425cb8daa050e13564ee209a4384dee236a7c5c92defcc3e0bb572b89bf2d858f8b SHA512 96e80c4d8e521f24b1aad978ff83b920cc95568c0f3a9f3177dad8c0b3d700251d1f6fe2b6f970bc8bb966084828b44452075df40654e8a32309688c20053bbf
+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
+DIST gentoo-kernel-6.12.10-1.x86.gpkg.tar 77393920 BLAKE2B 1b25c988d32151ff556bde8e69636bda8193f4cfba2b4abd82b104e168d540e060ed0dffcc875c96b7315bf5b280c9bfee929ce74aa6f513dd76e17d0e346d85 SHA512 ad30aef0b07286eda8e6adbc683a50f5e19a3c5a6795d6ea94e702096a2924b04d318785bef33c5a8aee48a7316cc8262cb5734e33c5f9633d86a08570e602ef
 DIST gentoo-kernel-6.12.7-1.amd64.gpkg.tar 298915840 BLAKE2B c4af62bc39de09dd063495bf6d5cca7efd8364b49b797bf90a89af4a049e255ebf3ad6406df4fdc1645e75eb4778f9cc4029b63c343b469b1129a33579c2f598 SHA512 7ae48ee72fbe878f408b753ad97b60cf0c46ee80f098835acfae5cefbb81a4c349945bcdbaa70df9962b8827732a244ee795d1e11d35e5b3d255532057bffde0
 DIST gentoo-kernel-6.12.7-1.arm64.gpkg.tar 272957440 BLAKE2B 0b912595630b087c7e1edfdb91798f2514d2b20869fe526f5e1b759ae6a02156050a435037ef58583049a41d9d392a7618f935d36d0bd11570bc588b5f9b6329 SHA512 0e420669ba619d67e65f6a477f36420fa924341819b31f047ae6d707c43b3f5c955c63faf37b48754dbf852e50c5049b19f0a5cf4e7bbbc4beb4895cf67d9e69
 DIST gentoo-kernel-6.12.7-1.ppc64le.gpkg.tar 73072640 BLAKE2B d9914726e39a58047931ff6ad75e79e6b1c5307a32da26e0d3a5b0235d94c15dd3489bd7b586eda0fc4c73512f8f429bdb700494dc5cc3675dd0b3ce4d51aec4 SHA512 a82245ba62d8779546e5c51f1900aaaabaf7f01fb0ff74f0c6a2754b56724c554268e82254ccd6ee87705dd32a076365075211e61afab38c278d017b3d57fab6
@@ -48,6 +92,10 @@ DIST gentoo-kernel-6.12.8-1.amd64.gpkg.tar 301516800 BLAKE2B 4b35b8ad169c3c97f4c
 DIST gentoo-kernel-6.12.8-1.arm64.gpkg.tar 277544960 BLAKE2B 82bf907f31c7ee3e036e5fa91c903d2a716b968169f04cf5b5cb014995d784f819bd9b6630530445d41b2293ffa5b3cd5d1c3b11274dfacb0872508ba431fa2c SHA512 94f9ea5ab97e40e578df3282ed3202b2d2cd48928a2a9c7840366c604d8d4822e0a28c349a74e1f759bf07ffdb46caa58bf6a8f1ee5a94578e70129083328bc6
 DIST gentoo-kernel-6.12.8-1.ppc64le.gpkg.tar 73082880 BLAKE2B 65857a7613d5c7187f85395b3ffe88af25cdf8fe8152e516362a8aae8f910152bd7d11b0316eb0efc13a01efbe47ca955cd5511bce4a95a1bbe41091b6ae5e0b SHA512 ec54b65278415ad95cb899217022b911a716468757fc8ea454e5a8879f837b283b691f30dc4ac329915643f17d275ee421df284cc46a06e068f51b6c48682625
 DIST gentoo-kernel-6.12.8-1.x86.gpkg.tar 77383680 BLAKE2B 7c855a13851db6e50dcd59a2ec79f43781f78fbf493a63c682f1b8707cb120bea9ab6e6ef6c181256fc5aaf150bdacd65e1ea17e200506290af8bb0d8393d468 SHA512 be64b12113d762978558ecce5fd5777ea29ff8b3052f63b865c0c5d1ed57d0f08902c96f03b5f31a59c0105d233d720706b31ae0c91c8eb9cbffafc317c00c00
+DIST gentoo-kernel-6.12.9-1.amd64.gpkg.tar 301568000 BLAKE2B bc1522fc4b151e9d76a001698a44da923c988587bbbb342dbf8b231af742eb8c5c3da79f9f71ccce5a94c371d0079bf6fcb93647de8b6634b38803641488948f SHA512 d5c478821f3d18704637fa166340a39ee854a545575f5b990529b2ccee89bed6da19b9d51a3b0ff3183d9c31e780333635db2c3874c1e4530f505ae8632b397c
+DIST gentoo-kernel-6.12.9-1.arm64.gpkg.tar 277596160 BLAKE2B 68da94dd39d92a54ed1dc91d547d28a886c4e8e95171d1d50a8ada3abfe7b504fcbde0bc93174c5d72e5af08a9ea6d5f3f1882a6913880c4b80b5fc86c55dc14 SHA512 d3d4e487d2c03e86ccd060c6cae68f92caec53d44ffd2efb336fda5627d9ee485d3832878af0a173044f811c41018b445187c34f41a0132c4694c736c5b6e601
+DIST gentoo-kernel-6.12.9-1.ppc64le.gpkg.tar 73082880 BLAKE2B 494c5edb61300c2c9a53997d5115a01e704db1850a2fdd473a64676eed4237abae55070dbbd332513a5b8650754806e8ec8abc1283d9977847f216c404911b1f SHA512 24c6e132d552530ccf9c416883ee631439cd6f317d8541c9a95f5b1b622b71a0298ca169c8f3dd56fe3a0e636cab33861d3f769ca63abdda8ec28d79ff7bb15d
+DIST gentoo-kernel-6.12.9-1.x86.gpkg.tar 77393920 BLAKE2B 73c7bdbbd09b402856646414b0ba98c8e825e35f1e318d2ba361d652dd25c866bd2c3f9040b8f072c27bb58ebe9d0ccfce723a663dc11b46b98b5c8a094dfbea SHA512 aa9b7ef2ad1562869255842369aadce6028b787008046e9c97594de5f9c9277dfe3497b6bec5b1048df256a59a52b493b58b0d20f91d1195b54c5bc5e756f28b
 DIST gentoo-kernel-6.6.67-1.amd64.gpkg.tar 267724800 BLAKE2B c38c7d1a3f3cf59afc345f1259311433a2086764bf7919051894cca8d442b5d2cbc74016ac4474b11d8855f760e09099d86bc5d31ede56e9e2ddbcfe139bd9c2 SHA512 c86849c88b3ebd4be4ab111876916896b02140bf267a1c071a5db845aab917d1bfce310da2dfd8a7830146963751735a8fff71e6513d513b282ddd57cba2a37f
 DIST gentoo-kernel-6.6.67-1.arm64.gpkg.tar 242319360 BLAKE2B df01eddbaf3d31b91b87bad4372ebf8f46a5a27bd0646593c9a7961b95561479dec4950c25e5a4cbcea4ea1e2be895a7f95d383f87593d7a4fc65f3cdd0fef3a SHA512 6067d6649e7e5253142b5416ddf8daf3087552f33895d2bf273cae7fbbfae26689c7d02231df6926d35caf3e8dc941aac28031f044cd9bba93f7349ac7874575
 DIST gentoo-kernel-6.6.67-1.ppc64le.gpkg.tar 64399360 BLAKE2B 12f72a9b32eaede365570266c84a0342bff045d599952797c902dcd8f0cc22bd64e89b3f89f29945f2c8f10a88f802e7bfa5988cdd42160a5b61131923a792fa SHA512 44ec739e47cfdc56c452b12182953942940edfcda069af413d21b51ca93b2f45712e949af9e24b336743ee0b55db9d658856df8e59aa9bb348075a342848452a
@@ -64,6 +112,18 @@ DIST gentoo-kernel-6.6.69-1.amd64.gpkg.tar 270131200 BLAKE2B 27e5e7e0e330d7174ab
 DIST gentoo-kernel-6.6.69-1.arm64.gpkg.tar 246323200 BLAKE2B 2bbc570c961a505e169cfc8b4f762001838bb100bd1ee544b089218c9f1299093dc8b818319ab925abb44ba1a8795f74da706c71de0706fa8647d361464bc635 SHA512 4b37192c67872701447a4872e038f02876f19abb78ccb16b596e90a46d33654fef9956c4b1a9cdd54aa3b23df7302de81927c772b1cbbc1c16f6101423d7ae05
 DIST gentoo-kernel-6.6.69-1.ppc64le.gpkg.tar 64389120 BLAKE2B 38d41d95e482e9354f83eb71e3c552b87f40971fe1fe7c758aae16654304768b5089cb5ddbfdb06a7cf0a3cbf1e90ae3ba3e50c9046c13f40c1fc5fefa102183 SHA512 921d1f4a7c7dadf4c72541240eb550b43e0463c5b15f670f6ddfec41e00db464acfe5e5526ccce884b138f973f81ab454fab3a32f1f2ba7d9c52fc205f380352
 DIST gentoo-kernel-6.6.69-1.x86.gpkg.tar 68546560 BLAKE2B dc98e8d52ac1442f480e11e918e4cf8eec46868a20122db3fe393e9ef7b03a857aa48c86e97f2daa1da98934267b0049331f4ce10c72e076da21305b84838b0d SHA512 1c88fb1d1f817956824070b4f43836d471a04462d0026a88117654ca5f8b594937b35ad49e16f4a06c265f09cf62474b45659748ee998a40bad6f13c97768e99
+DIST gentoo-kernel-6.6.70-1.amd64.gpkg.tar 270274560 BLAKE2B 23900265e3e31a9a852df93b96e62ac371f1dc03a433f9f76d3c8bbc191349841a8dc19bc4c4d9d2f91aeb223213c3f8bcc6681469795b28774777b28a1e16d0 SHA512 9bdb58cd5aa029fae227fb7cb46cb34433597f369b26d234ff2548cc4e5d7795348f754cb52485485433f5e9a7dc995e7f0b11ffdab00fedff0c9f3efd435dca
+DIST gentoo-kernel-6.6.70-1.arm64.gpkg.tar 246179840 BLAKE2B 41bb0fe6aa0941fa374a92581c5c5ed891d2141c5058506778772f7d59032d8472961b57796364de2916c18af4e3297c616bc130e693cb3010a1d5f9e414e7f8 SHA512 4b7121bddb2933fb893cea937bd84ce019bec02e51418c5b895a198b007153528e700153c7c8cb41d74f6c0417426fb07eb30533fb85549652c40ed0c5c978ee
+DIST gentoo-kernel-6.6.70-1.ppc64le.gpkg.tar 64399360 BLAKE2B dd1b55aaf4214732ee77d4a1c2d4f30ea5cbe1f7c1c505f2f2b73160aeaf0307aee76045b93e951b012982a562edd52c0f8b155583f6538ba09a7a66f444c50d SHA512 fb2470a815378b8f24ac8dc7ab92498e871c551991f8210ffa3cdb933b88a3cad858ed966713a495b7f04f76efda454ccc46a6c52b99ed866f44b719e0907d64
+DIST gentoo-kernel-6.6.70-1.x86.gpkg.tar 68556800 BLAKE2B 9df52948ef931d59f3d00b90f886eb5d853b78675ab240bec0d4ed3982884d745d4ddd11c04c0a5fb51f5d87c5ba5bfcea9026b0ab3910df753cb62cacc5cefa SHA512 775aa6480e309cb1029b36a9c39acab0be96599d723e9bc5ee4ea2c9d4df9907f3269a79cf289b5ede32f49f5fb7738ac56a39afdf4ba9d133d4b233fb289a38
+DIST gentoo-kernel-6.6.71-1.amd64.gpkg.tar 270202880 BLAKE2B cd229d7b4ace8af6b7f68b35e796b339ff8a4b77e2f2af9d2a4eae45991662fbd22fa5c26522ae4a90dee774a318ee31b5d3835e4cc793c99cd91f5ad7e702c6 SHA512 2373ad2f40e6aeb014cdb42c8f354461c9b356680b54435aec7d055b5b86fd8965dc11bb65e2e7ed86d0014ffadb3b7379dc097bacad9277f29ba53f8b8a964b
+DIST gentoo-kernel-6.6.71-1.arm64.gpkg.tar 246159360 BLAKE2B 94535beebeb001a67e6e4336397554b100e0f32a173144e623405f958d2ef2bd69439af1a54d907f69bea8b9d93c9129bf46e999808c695f47ab91fbfdcf9b6b SHA512 2957fef62b3f7bc1def73b6c4223b8a691c3e39f3f2ba4c9fa69d1adf3a22deb266a2583477f7614882f455fbc609aaed4980b5604fc10ed576d6afc69f775a1
+DIST gentoo-kernel-6.6.71-1.ppc64le.gpkg.tar 64399360 BLAKE2B 25c1c2c5f1b26dff82ea6a944db0cd25749d0e5a3db55e2aab258df71b092b04111010c49dd32dea6bc52781adcab919a244a45170551cd4b7b1a2093247945a SHA512 0b051de8c8c3fba59b84bf2e789ac9fbe096237505ad11287a39fe16f82044b7e867a1eb21abddabb41d6ccddc6ef3e4552b2265e16b1c19e4756bb4fdc61cbd
+DIST gentoo-kernel-6.6.71-1.x86.gpkg.tar 68556800 BLAKE2B 067356a5107514d4a18a186ca93d78b69cca9fa9e776e23a239c1a8cd5986c6b75e458e9c4d564d0c21f5438ffd7864f0a6270e83b4d8a3d364e7b07935e4187 SHA512 13af6e7c08c0799c3f92807dcd8bb4ab785386c71421b63e3164ab30fd2d13af840f27d7aaeb943b8dd665070176008cd735a62c043319c341cf806c8547ec39
+DIST gentoo-kernel-6.6.72-1.amd64.gpkg.tar 270202880 BLAKE2B 316645813a2df7d5485fbdcf3e03d8fb4063d3237bc5e5992f8fb7083cc397c3a0183221a389d59ef96ed3d5cbbfb3d56431db1082835a865a6434aa02788264 SHA512 f6d980f57480cb36d09e864789fa427c6966fdaeb87cb028410dc21ae80e78146171efda86253017faedaf6ae29055b0d330faddd88fd108c8719598dd215da6
+DIST gentoo-kernel-6.6.72-1.arm64.gpkg.tar 246159360 BLAKE2B 5c6c39aa530b11ec2db9d73f118e55ec2f8a6570592ca90c0e99d725089e6cce1d6a394db3d04333d6982592a0ed4b1093171a12a1413c900cdf890ecc9cee63 SHA512 0635fb05126164d315b1aea5e5f35a4012326dda22b0cc4d0f99d6d68906540b0c94c44c7c3fe254e35fadc9d0e6c0a51e9329c0ca0f518f09f4ea2cae8e418d
+DIST gentoo-kernel-6.6.72-1.ppc64le.gpkg.tar 64399360 BLAKE2B 362ef7cd03f09fa07c0492d2885f718ace39cbc99ec3612393a57d3baaf499ea57c383cc04382650becca61b523427fd7387f954723f7317c8f185aa60f60326 SHA512 488fbc1bc7a40e7a7edc99bf34de4a9290e335e4d6e5858bd1c02e0ef465663b644e72bcca82424553de7531a2700e18e507d46d03a11c5782a5f594091c8481
+DIST gentoo-kernel-6.6.72-1.x86.gpkg.tar 68556800 BLAKE2B dff3066f7b1a9d8115bd4009face91644c570e00e1a982cede843cfb9785a4e05d4ecf510c894d533093c79336162e067ed4dd807f2a5d0469ef0bed21df757f SHA512 c0ee8bf88db2df041b61fbcfff3069b7b0ed58451b25fd705bf9ec56289018b1df3e26e0ee1dcf06b8d408b7749590febcbd02dd70e8661760b2c58742b15ac4
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.233.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.233.ebuild
new file mode 100644
index 000000000000..88e83cb23916
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.233.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##*.} + 12 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	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-bin/gentoo-kernel-bin-5.15.176.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.176.ebuild
new file mode 100644
index 000000000000..dd88c26ac6f2
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.176.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-bin/gentoo-kernel-bin-6.1.124.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.124.ebuild
new file mode 100644
index 000000000000..dd88c26ac6f2
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.124.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-bin/gentoo-kernel-bin-6.1.125.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.125.ebuild
new file mode 100644
index 000000000000..dd88c26ac6f2
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.125.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-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-bin/gentoo-kernel-bin-6.12.10.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.10.ebuild
new file mode 100644
index 000000000000..8431fd7c468e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.10.ebuild
@@ -0,0 +1,184 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_EFI_ZBOOT=1
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_SECUREBOOT=1
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	dev-util/pahole
+	virtual/libelf
+	app-alternatives/yacc
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
+"
+
+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
+	)
+
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# We need to extract the plain image for the test phase
+		# and USE=-generic-uki.
+		kernel-install_extract_from_uki linux "${uki}" "${image}"
+	fi
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	local rel_kernel_dir=/usr/src/linux-${KPV}
+	local kernel_dir="${BINPKG}/image${rel_kernel_dir}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# Keep the kernel image type we don't want out of install tree
+		# Replace back with placeholder
+		if use generic-uki; then
+			> "${image}" || die
+		else
+			> "${uki}" || die
+		fi
+	fi
+
+	# 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}${rel_kernel_dir}"/ || die
+
+	# Update timestamps on all modules to ensure cleanup works correctly
+	# when switching USE=modules-compress.
+	find "${ED}/lib" -name '*.ko' -exec touch {} + || die
+
+	# Modules were already stripped before signing
+	dostrip -x /lib/modules
+	kernel-install_compress_modules
+
+	# Mirror the logic from kernel-build_src_install, for architectures
+	# where USE=debug is used.
+	if use ppc64; then
+		dostrip -x "${rel_kernel_dir}/$(dist-kernel_get_image_path)"
+	elif use debug && { use amd64 || use arm64; }; then
+		dostrip -x "${rel_kernel_dir}/vmlinux"
+		dostrip -x "${rel_kernel_dir}/vmlinux.ctfa"
+	fi
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.7.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.7.ebuild
index bb92381f7d2b..8431fd7c468e 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.7.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -53,6 +53,8 @@ BDEPEND="
 	dev-util/pahole
 	virtual/libelf
 	app-alternatives/yacc
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
 "
 
 QA_PREBUILT='*'
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.8.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.8.ebuild
index f35401be6b63..8431fd7c468e 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.8.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.8.ebuild
@@ -53,6 +53,8 @@ BDEPEND="
 	dev-util/pahole
 	virtual/libelf
 	app-alternatives/yacc
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
 "
 
 QA_PREBUILT='*'
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.9.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.9.ebuild
new file mode 100644
index 000000000000..8431fd7c468e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.9.ebuild
@@ -0,0 +1,184 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_EFI_ZBOOT=1
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_SECUREBOOT=1
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	dev-util/pahole
+	virtual/libelf
+	app-alternatives/yacc
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
+"
+
+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
+	)
+
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# We need to extract the plain image for the test phase
+		# and USE=-generic-uki.
+		kernel-install_extract_from_uki linux "${uki}" "${image}"
+	fi
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	local rel_kernel_dir=/usr/src/linux-${KPV}
+	local kernel_dir="${BINPKG}/image${rel_kernel_dir}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# Keep the kernel image type we don't want out of install tree
+		# Replace back with placeholder
+		if use generic-uki; then
+			> "${image}" || die
+		else
+			> "${uki}" || die
+		fi
+	fi
+
+	# 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}${rel_kernel_dir}"/ || die
+
+	# Update timestamps on all modules to ensure cleanup works correctly
+	# when switching USE=modules-compress.
+	find "${ED}/lib" -name '*.ko' -exec touch {} + || die
+
+	# Modules were already stripped before signing
+	dostrip -x /lib/modules
+	kernel-install_compress_modules
+
+	# Mirror the logic from kernel-build_src_install, for architectures
+	# where USE=debug is used.
+	if use ppc64; then
+		dostrip -x "${rel_kernel_dir}/$(dist-kernel_get_image_path)"
+	elif use debug && { use amd64 || use arm64; }; then
+		dostrip -x "${rel_kernel_dir}/vmlinux"
+		dostrip -x "${rel_kernel_dir}/vmlinux.ctfa"
+	fi
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.67.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.67.ebuild
index e082635940d4..0f11cef63400 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.67.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.67.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -53,6 +53,8 @@ BDEPEND="
 	dev-util/pahole
 	virtual/libelf
 	app-alternatives/yacc
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
 "
 
 QA_PREBUILT='*'
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.68-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.68-r1.ebuild
index dbe800373773..7ffb1f6159f9 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.68-r1.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.68-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -53,6 +53,8 @@ BDEPEND="
 	dev-util/pahole
 	virtual/libelf
 	app-alternatives/yacc
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
 "
 
 QA_PREBUILT='*'
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.68.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.68.ebuild
index cd18b39c84d7..4f450d6c69b3 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.68.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.68.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -53,6 +53,8 @@ BDEPEND="
 	dev-util/pahole
 	virtual/libelf
 	app-alternatives/yacc
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
 "
 
 QA_PREBUILT='*'
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.69.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.69.ebuild
index a0a5780715fc..7ffb1f6159f9 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.69.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.69.ebuild
@@ -53,6 +53,8 @@ BDEPEND="
 	dev-util/pahole
 	virtual/libelf
 	app-alternatives/yacc
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
 "
 
 QA_PREBUILT='*'
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.70.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.70.ebuild
new file mode 100644
index 000000000000..7ffb1f6159f9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.70.ebuild
@@ -0,0 +1,183 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_EFI_ZBOOT=1
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_SECUREBOOT=1
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+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}
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	dev-util/pahole
+	virtual/libelf
+	app-alternatives/yacc
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
+"
+
+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
+	)
+
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# We need to extract the plain image for the test phase
+		# and USE=-generic-uki.
+		kernel-install_extract_from_uki linux "${uki}" "${image}"
+	fi
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# Keep the kernel image type we don't want out of install tree
+		# Replace back with placeholder
+		if use generic-uki; then
+			> "${image}" || die
+		else
+			> "${uki}" || die
+		fi
+	fi
+
+	# 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
+
+	# Update timestamps on all modules to ensure cleanup works correctly
+	# when switching USE=modules-compress.
+	find "${ED}/lib" -name '*.ko' -exec touch {} + || die
+
+	# Modules were already stripped before signing
+	dostrip -x /lib/modules
+	kernel-install_compress_modules
+
+	# Mirror the logic from kernel-build_src_install, for architectures
+	# where USE=debug is used.
+	if use ppc64; then
+		dostrip -x "${rel_kernel_dir}/$(dist-kernel_get_image_path)"
+	elif use debug && { use amd64 || use arm64; }; then
+		dostrip -x "${rel_kernel_dir}/vmlinux"
+		dostrip -x "${rel_kernel_dir}/vmlinux.ctfa"
+	fi
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.71.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.71.ebuild
new file mode 100644
index 000000000000..7ffb1f6159f9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.71.ebuild
@@ -0,0 +1,183 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_EFI_ZBOOT=1
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_SECUREBOOT=1
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+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}
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	dev-util/pahole
+	virtual/libelf
+	app-alternatives/yacc
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
+"
+
+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
+	)
+
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# We need to extract the plain image for the test phase
+		# and USE=-generic-uki.
+		kernel-install_extract_from_uki linux "${uki}" "${image}"
+	fi
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# Keep the kernel image type we don't want out of install tree
+		# Replace back with placeholder
+		if use generic-uki; then
+			> "${image}" || die
+		else
+			> "${uki}" || die
+		fi
+	fi
+
+	# 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
+
+	# Update timestamps on all modules to ensure cleanup works correctly
+	# when switching USE=modules-compress.
+	find "${ED}/lib" -name '*.ko' -exec touch {} + || die
+
+	# Modules were already stripped before signing
+	dostrip -x /lib/modules
+	kernel-install_compress_modules
+
+	# Mirror the logic from kernel-build_src_install, for architectures
+	# where USE=debug is used.
+	if use ppc64; then
+		dostrip -x "${rel_kernel_dir}/$(dist-kernel_get_image_path)"
+	elif use debug && { use amd64 || use arm64; }; then
+		dostrip -x "${rel_kernel_dir}/vmlinux"
+		dostrip -x "${rel_kernel_dir}/vmlinux.ctfa"
+	fi
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.72.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.72.ebuild
new file mode 100644
index 000000000000..7ffb1f6159f9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.72.ebuild
@@ -0,0 +1,183 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_EFI_ZBOOT=1
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_SECUREBOOT=1
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+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}
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	dev-util/pahole
+	virtual/libelf
+	app-alternatives/yacc
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
+"
+
+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
+	)
+
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# We need to extract the plain image for the test phase
+		# and USE=-generic-uki.
+		kernel-install_extract_from_uki linux "${uki}" "${image}"
+	fi
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# Keep the kernel image type we don't want out of install tree
+		# Replace back with placeholder
+		if use generic-uki; then
+			> "${image}" || die
+		else
+			> "${uki}" || die
+		fi
+	fi
+
+	# 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
+
+	# Update timestamps on all modules to ensure cleanup works correctly
+	# when switching USE=modules-compress.
+	find "${ED}/lib" -name '*.ko' -exec touch {} + || die
+
+	# Modules were already stripped before signing
+	dostrip -x /lib/modules
+	kernel-install_compress_modules
+
+	# Mirror the logic from kernel-build_src_install, for architectures
+	# where USE=debug is used.
+	if use ppc64; then
+		dostrip -x "${rel_kernel_dir}/$(dist-kernel_get_image_path)"
+	elif use debug && { use amd64 || use arm64; }; then
+		dostrip -x "${rel_kernel_dir}/vmlinux"
+		dostrip -x "${rel_kernel_dir}/vmlinux.ctfa"
+	fi
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 2dc744ae4e2e..7887c4d371a4 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,19 +1,35 @@
 DIST genpatches-5.10-244.base.tar.xz 7784252 BLAKE2B ab6f4a3f41b9ba52f1b9d7fc1c0e0b16a5871bc0bd30da7c63b24f11c3c3abaabf141b1aab76f4435fed4d5f25c2ecade6a83a9c3ca20efb9f9c6f44327ce545 SHA512 fe2e006f6a7571e1ab1cb3dcb80d9a6dbb46973918a138af1d6d402bf3702cb89e3764f7838d2d2cebbf9c97974926637d6b58c666899251be8433910dd6dd47
 DIST genpatches-5.10-244.extras.tar.xz 4056 BLAKE2B 48aa848b13eee7909a304b368603f03050f8ca0678e702ca8b302982373ada3b5f88fe1e6b51d7c66a46015c38efea31e82d8d67282b2ae4021c0be30c3a287e SHA512 eba51067dc0fb1074b860afda9ba5be55e83738738e84a70d1219ef5c89bfb7c5e82191f347881f7c82b25e87ec105f9a0c08d0248f5f0a2dc20bbea2e642c08
+DIST genpatches-5.10-245.base.tar.xz 7815984 BLAKE2B fd5b339977af766fc292071eeb16e08fce3185dd3bf1c16dfcc1522b664f84dd5892042707c68f84863bdc19afc35d8fe053476f904dce2ab18b4aa9b3cd61ac SHA512 45754b5713276a852f83be7c23d66deb020b3539457614a80b051cd4e276780101df3c92e2c6ddb96729676bb86b418f77f76807fe96cdfbf5571d2141e5a313
+DIST genpatches-5.10-245.extras.tar.xz 4056 BLAKE2B f4838beef428e2913d3861b26989b10f82391823ebc39811402294c23c5a84623dab8b15346ada7aa3c9552727c857ca80a262fd9dcf4f4751888b0454fcdfdb SHA512 617ac2cae48ac2831bfbb5a0bca25e466087eccabd930ba86c0e9f984822aa5ecade7559d4b1c71031b4db7bdb803ee31a4c392ac36413d97a51e2befcf70166
 DIST genpatches-5.15-185.base.tar.xz 7813568 BLAKE2B a287174103461737a4af5e24410266140ecd2970dd5568557ea1270d7b3d9db98ee218c392a4e8ef35fadedcfb8f9013f6dd830c08c0d9b2147c57658720e1d4 SHA512 edec855e548f4ce61e2aa3e8a86216a75d43405141054c114f7f2ed024f91500b905e953dc07f528d19bd25b13781377d8c60ae70e0bb15330f5cd187762b509
 DIST genpatches-5.15-185.extras.tar.xz 4056 BLAKE2B bab13e1f8b400270ab36e78525947b68468504433f41784c507e6700d23e08b7eff91cd49e50398f90622cc289d6c4c122b3d5f8da77742b01c167ced5284cf2 SHA512 be561334e77afb45e11fe5e8c6c3b61d85c821776bcefc0cbe0d9addc6561a4c0bfc3956a990fa50f703d7defbc4a847ddeeb170d4dc828c2bcbd1a4c6f4429f
+DIST genpatches-5.15-186.base.tar.xz 7849000 BLAKE2B 3bf7560f3bfbc26789d4ae1e93932bd94b46e69c8a9ed29907e47ad493c7f7acd25309bef228306c69e27ac53b65efa8a8bf505fc577ee3a8ccbb196d36c866e SHA512 afa8bfc5d4f9ac104a583bea92b8930db5c2ca165c6c1fb3d5750baeb508df6fcfadcdb3c978bcd8e8ad95cf3ca2fd0c5c6cebcd000e93dbed663f310af01dde
+DIST genpatches-5.15-186.extras.tar.xz 4056 BLAKE2B 68130d315dd2ccff0075d729a10cee298756baff9ecc0c1f218ca4c771ccf30541bdb876ee529292a56c56ba49eefe5839cae263a08bc0f3ba114fa499267141 SHA512 2d1f1af4d251c93d7e45aee1710e44129b8bc71c83d7bb328b07b28c109e394259321ab12e889483369966a52616c1c41b547220e4ee9e4e3ceed21f89503665
 DIST genpatches-6.1-131.base.tar.xz 6701808 BLAKE2B 0ff847805abdeefee31ce75d0b5c02eafdf7b12f3b3c499c0d9d19305b3ae934194bdf58fabb30e51a356eae5e57c7d633b7abbf45a94096e981c671181c9b16 SHA512 7604d45f78bd5a087f0a158acf3767b275315b60c77cb4d6b93139943d56ca917a75ed8ed784a608a52d3e1d06cb36a01f5c3d0f5b211dda6d62d36fbe9ffaf9
 DIST genpatches-6.1-131.extras.tar.xz 4056 BLAKE2B add38a1ea9191009b22ce04a556062e419452bedc85d6afd40d6aa3da2474f4719aacf91bc3680b6a08a7b73cd0dbcc5c3249322f8c47660ef36c256e8792bae SHA512 7d68ef7b616ab8bd62db15ead625f0e449b6ebdde8477676d0aa6ef017f9270727413af62985ed8b271aae1f5288682f4fd0d0804f06577e2c1f4014b5402035
 DIST genpatches-6.1-132.base.tar.xz 6718336 BLAKE2B 3a1d86ff100ded252a1af8cb1cbe50ea55e0789041f0e740c30c6a70c3192d8c90f873c46f9989b4b76071d1364f29b2eb8230e2675d22f2e14b6cb94e3e16b6 SHA512 bd225633a720a3d271969818c01b59792b5783c16743cc020e3cf444a37116ba57b0d82280853b432a3e3043a29f717ad2878dfcce4516a8127c535367ce6c49
 DIST genpatches-6.1-132.extras.tar.xz 4056 BLAKE2B 3f3d5e78761b9322a765bb8bdc137395e8382ffe7bd401f4b474530afd5f9ba570744058772978ac39c897f04eceb524ed53d32c8ed71fddd1a0191f31284c0f SHA512 ac96811e465540e96cfa443bf088bd9795c58080b19b87dcbf62c0a4c94dbbf28ee6d94262ca76bc38b9c591e4d07872294b14807e1d18ce804b69497cb0ee66
 DIST genpatches-6.1-133.base.tar.xz 6730928 BLAKE2B 0a3d788af308b602468d8bc26467d01f1ecc890b5da5fedd65b3eef33cf3da154b48e0ba71f1df6f77eac22ff355570f6096aea7bda695a2f7dad1f409387a9f SHA512 10ab1138a7a7ed000ef431d35af6375c1ad3ed8e3313b4ce43b19ecc4640fbfc8691a8113aba6bb3b3481fbe3077ee623d8f7c6c12337c809ee2f0d533adcecf
 DIST genpatches-6.1-133.extras.tar.xz 4056 BLAKE2B e5510780c454bbdd69f0d5d01bc6d792316f62a9e9217fe7500f688a5b8854b9d8406521e553808cf65e10f937be884fc4bbf3e3ce70f75b28a8254af03b77dc SHA512 e93284e4812b2a0a43e9de73c392874e1d48dfc3ad4d27a145fd43864e310cc60df3f509477570dca011dee7a9fb17ea2a72882e5316a50746a5a6cad58f373d
+DIST genpatches-6.1-134.base.tar.xz 6754804 BLAKE2B 36d49584071a74207d07d353e67b8c0e9f9d5ca3db44d5fc6c392bf34c022fd6ba9022734aba45fdd432673133e9f4f9ade495658550a68ad537153a08cd01af SHA512 214e8b20b52af4fb5b22035955dbafe665245c3ca85a1dab3419385be6f9f0d3b0f5d0ece9180c71a11c9e11b1c69153e82be282b46b41c1eba2df19226f90ea
+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
 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
+DIST genpatches-6.12-12.base.tar.xz 758168 BLAKE2B 2f9fca909ebc5710fa9154fe4c824116e48adbf9d4e857a75661b0689a0c44add897a502700edf415ba4b664fe586ba490f16b4dd12f00b19b80c34800d4b6be SHA512 c7d125caa03b0ff053f37fc82a4fbd9d3be8f8eee024bf05639d4f3c3b51574983e5d0beadb7714865f6d72e02a22ceb528c8359115ac995b63f5d87eb055bb9
+DIST genpatches-6.12-12.experimental.tar.xz 78128 BLAKE2B 771782a7f3c067bac0311f6f45cde1fa5fad2a1546c784bc00a6f3360cb52fe7ca157246e4c33d9674736eddec41a84daf123722b1aade862feecf563af7e145 SHA512 249c330f3844d67ed596c61cf032c0ac141f3319e438194be5cad9df970242564b621a9b28d51c9a3f0424e47d2c4070804a5e7bcd9b9683522991bf7b87a533
+DIST genpatches-6.12-12.extras.tar.xz 4056 BLAKE2B 8e00efcd3af7862fb8bde9d8a2e9d51fd999474e33e63e058c3580b187abc71c2206663d37b7b4ebd96193c6185a29f5d1e9e9ef98167703f01bc5c3c9b767c7 SHA512 a52dec8d607e64c112a2b1c731f65ca3fe340712bb390c25e8f7bee90cabea619922540998ef6b95b97dc0626b4dfe3a9713a3f8e7efa8f99f3ebd95e8fdf855
+DIST genpatches-6.12-13.base.tar.xz 806528 BLAKE2B 0eec1195d5a497e64556d992893f251a54c558151aef1fc1d03de0b95bdbe03588ef486875e7676f9635da62e975dd8509279ed2d96b4dcb3796e1d8a4bb3768 SHA512 3cf8549679aae42fe56a25c0f9d5eb5c59fb867c77dc22c21446064e55d91276ec75f60f5737ab9a39c82dd0e74ab1ee3bd62b5a78f7448827b5577257976aed
+DIST genpatches-6.12-13.experimental.tar.xz 78444 BLAKE2B 721334f36ae20a598295ce87c31acb12eadee9080bed53ba3a4fbd03180abfa4771c39d0b2d79ccdd28b04766ddd6eb80b1c8f3dc9e5fd2b8c17fe921125d1ba SHA512 834f04aed25aa6f9e660e64b02e488f2c99cf8cb4e20a11c813c8e21b7d91a650e0c795c1369147206d707c75f2a1d25144b08ca9b1b02162443d4ea1bd36d26
+DIST genpatches-6.12-13.extras.tar.xz 4056 BLAKE2B af48fba5d81bf8e13658555d94fa131e3f8fa06144148dd11b58823f802c5c4aea823fc4cd8f308ba6518638b65637d0b8a030d513d4b2a05384fc8f40550d94 SHA512 d7b1290d44696284fde4980ad3b90a190659056739a084ae704d1edf1a06ee166fa78960a42999b9e6e2d8aad4fd330621c8865f5e2517f1453c916d6375a365
 DIST genpatches-6.6-75.base.tar.xz 4089936 BLAKE2B f88b0f84e3d73f87025389a3a66edbeeb6c126bf93b2522105859d27911aebb768cbbb2aa8418fe7e778eed6130b2253d85c08cedfa99c188c02d8d043f5fc7d SHA512 ebaf66ba8a338d548041c1ed619c4cde495a3bcbc990caba75dc86bf990a159b7f431e46e84cd16cea62991ca9d50420747a988da6e0c3973aec25943bc00d8d
 DIST genpatches-6.6-75.experimental.tar.xz 5760 BLAKE2B 7709337f3f3eefab7132b6efd7b702068ac11a63ccbce3fa7ea88310e2555ec6fa65b53ac25ff8f0fcef7cce4a6526ff9547da5f826732b6be0eed23c349a4f6 SHA512 3d9ecd5da8ce280be89f764a377bd04733d34a68909a2241ef61ac30b0e7741fb3bffde82b2737ef4798c1c20ceea2d3d224140a381503df89d6293bb46891e0
 DIST genpatches-6.6-75.extras.tar.xz 4056 BLAKE2B 6e2e14f16a7ebc675e84b180a8f26f485aece3f22de1d27bef60b414deea8f3744cbd95536b58722d793aee320b505d5ca3c0af0b1e20f238b02c29a12abada9 SHA512 c8030df10b17675adf3c48931f04c59d1795598c955eef39c7b3dd4f36c1af1d79e8d7405004952cfe4922cf100aa95d2fe3d7c6f6e0d683276d5382bebce399
@@ -26,23 +42,36 @@ DIST genpatches-6.6-77.extras.tar.xz 4056 BLAKE2B 72ee0f92105f7e24d08e54614b5fa1
 DIST genpatches-6.6-78.base.tar.xz 4145152 BLAKE2B 24e2e975f186f08be3d9b75f08e9c8a2e3081f1cae68ccfc8c6f68aae46f8b8806ec91c8dcf7d0b6decf1e402c545dfdba5ee17f09e6d6fd220c62f6e01de939 SHA512 306d617bab4a327c062f2d6d2017dbb3110e8f17484b5a3de4fd9d805cafbb51410ab4fc20f93f4b35e9b6917ef015b0e6280b3f6a76790d4c546a6771765271
 DIST genpatches-6.6-78.experimental.tar.xz 5764 BLAKE2B 2175d1d16800d10c6d6032e42939c3402784fc698d8ca98e4671d62da98da5df38a4133451e2ce8076514eb9f4ffde2091832555430fd3f40798b04c1565473e SHA512 bc5f64b738f6becdabe5e50ee5d82f66aa58e5c755d3987018036bcf45679877cc206c3bfa326d74a88916fa26be68ffa56e12fea186f46a26369f51db465830
 DIST genpatches-6.6-78.extras.tar.xz 4056 BLAKE2B 464b1eda63d76013d5fa0eee1d89b135100f69ddf7e1d773cad3e021d197cf1170d66a3de6a30045a789cc03a6b69913ed222c640201c1b9ce8306ca089b564f SHA512 71a9421ce799323791d0d616204b0095b4b5c799ed8b1c2786bd65cfe2c10b801200d07b0a1fa2c1ccdbe75f0d2a6a18ee62a528895bf5d4d804e42af89aa2c9
+DIST genpatches-6.6-79.base.tar.xz 4222900 BLAKE2B bcd3e23877b7ee2439eb080d304a346c539b2ea2a3b242b89cfd68dec8f3022d2e89b43c939ae11c02d60c93f3c0c7c6569fc41994a8faa3a1fc259d4065bbcf SHA512 a336717d2f9585ddfef9ed6c373d7225bce4c5a76a31d55bbf8998214b1a835435a7510ed5b4cd4aafb4f92e668f7646e0f7ca964bb1505b4bd20f8353f46761
+DIST genpatches-6.6-79.experimental.tar.xz 5760 BLAKE2B 07c668a2025b67cd2c231b63525e98ea269861ab035b9ef85041ebd20be8980159522f0f615bf46f86535e329f3e5f91930d22827a01cb0c86a1f40d45e2b32e SHA512 dced1b5f30e8ed72b546fa8b047caa60891b8df917999a65da1f98a0ebbf008dff6c12d5b9e7f45efc5857d23851a13a68cde4b688f4b520e08bfeb7ddc2165c
+DIST genpatches-6.6-79.extras.tar.xz 4056 BLAKE2B 70ffc39672faf32971e8b3bf8e41fe2a24e65fb3268447b1c9278fef4cf9fd97ddf9045329ad1431482e6628af911733bf86c7ba7cab624880cc070e68d94f39 SHA512 c3403d427b07a3b70447143d728987ea995b0d3d4d79c1d3a874c3de34cc5c14068320847628de36dbb40cbe63540942969cf2b158b0a563dc34aba927e3ec5b
+DIST genpatches-6.6-80.base.tar.xz 4222992 BLAKE2B cbdd564aecb24378e09623688dfcf5bb1931d63823a339c99d7a8b436e16ed20b98cc682a5ffd10afd4c24a7e91542f140e7448b6b81acdc112c25ef982bb107 SHA512 273542404785a57a14a732c4e0924d0c94fc95c3980293c6d5ba6a30abe30f1f42d756dfef27c9ad5ffe57da84f2368ce9d51293d4b006d13dde2c8d0b1376a9
+DIST genpatches-6.6-80.experimental.tar.xz 5760 BLAKE2B de1b3cafd2ec9c84d75c08b2532228df4f234ac94ddee4224d000e7e748a856dda080c4899bf6f7969bae4bd80e1e5ebe017fd18006088464b27504f83db46b9 SHA512 11f72ed0b15f1d251f9ef539f512f39127a9a5721774c496334fffd956f9fab9a885c8325f2fbf711481f9b4874072b1e015dc77854017e47b550d346c72ade2
+DIST genpatches-6.6-80.extras.tar.xz 4060 BLAKE2B c83e6d97ed086ae3b9f3d6bf4cd29d4eae9f57f638eccab183dbcbde85886df00653634b1cf272f26580f32e1a7786f68960bc51f78a01540c61c0f5c7823b79 SHA512 a0e0b309a2022daf6343e21c0f435bd617d2a029c28297c7a082a8380157ea4fa52b12f92bd045ad8c3fb680cfe98edfe69e10f4d6a28f9b115afe8b07d75433
+DIST genpatches-6.6-81.base.tar.xz 4254652 BLAKE2B 20fe02a8fe886c04569ba9490de06956b2927014c1d023dda7d55c4386a0cefae6ee3d4d8138e824798b2d410f52024c701ac0b099c74080d4e3e28a8ba11e8e SHA512 f837dd14a9a5fb677c163660e916751ee6c12ad8cddd6dbc011be87b083339083c4ce110e43e0e364d48cdd9da769ffb8617bcff650068b516e03b33d0996ce0
+DIST genpatches-6.6-81.experimental.tar.xz 5760 BLAKE2B 4f4397b8155470626d119604f7e4d392115fec5f32daf924ac34f3b9898707959b04374338d1ff2928c5e766a51647981cae6ad70662419545c7d41f31b66145 SHA512 83f9dc3099511928141881da7389d28751a421b61f63df6807de5283167fad7aca4ae5a87ed2fa7c0f61b89d2f6eaec43e65a5ce4cd70e2e838b3f7da5743103
+DIST genpatches-6.6-81.extras.tar.xz 4056 BLAKE2B f8999d149063deccfd69f06848c39fa87de113d9978b4537e9699b1c9ed5896db929bb28e06919a13c7bf425c5e17438086ab5714b2cff57c0e1a79c097a535f SHA512 99616bba8411fa7a4bf1955abe97612c514f4c299d97b2bbedd467fda98505525545b3a65aa679ffd3171829a99f8d008590503fbdfc14bbb45552b1f85f82ad
 DIST gentoo-kernel-config-g14.tar.gz 5686 BLAKE2B e5147ff4ffab92428b3e7f1b0897b997f8a298805f4f43b0a4d3047607bbb1a5ebfc268e0bb9688372a5eda561df9f256c78e00cdd7e3caf7868724214722f56 SHA512 f79638f9ff9dd0154512baf0234024216b6708d35a3c03a580ca5913286ad1ea13bdde5ea9b4722c6a7cd8d591c11ec52c1e225111a260343cd56aa1f1a88502
 DIST gentoo-kernel-config-g15.tar.gz 5746 BLAKE2B 2baef40e18cbf3bb975362d71ad674604ad80338d1e6914ffa2fc03af26f1b9c9cec66d39a56077693a7327060bc29bd5eb5787549857dd3779e841192cb2016 SHA512 45d609ee25a529988868b8c99c808f4e6abbde34ae501bf35523431ee85c9f3657663d6f938f2036a5f012a55a68965b32fd41fc44d8f6ca606a6fd38f952445
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.6.1.102-gentoo 252811 BLAKE2B f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc SHA512 41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437
 DIST kernel-aarch64-fedora.config.6.12.5-gentoo 288068 BLAKE2B 4290157a17df36fccd2ead9fa381b5d6aa2079ca918773aa65e389a35127bcbd40074d2f2072371b9b50937bfaa2944168dcba628148dd654811ec93ed028b1e SHA512 62723af8ac13650cef09873f2d57c550171bfe5fa1a4ba00a12bf0650d3aea9f7af52a1d9e0662dd95df51bd0da5aaeb9fc0a0c0450fbb7fa1f76c1ab46bb099
+DIST kernel-aarch64-fedora.config.6.12.8-gentoo 288081 BLAKE2B 08273a34c387621d0ccffcc325a0a34b40e0a8fbe78f2429c8a9efc73aa05f8fb563ed53e5fadb25662089f23ebafb61b2d08f91ea00b073e67e702798255e9c SHA512 58ea4f247aa9af6f7535ab5fe44dae2fbf286c7fbceeda86df532125807bbd4c25a89ddeeff4284592efefbaaef5022626abad7f1d1d64976e3040dc6e89251a
 DIST kernel-aarch64-fedora.config.6.6.12-gentoo 271041 BLAKE2B 5af7c2f57cd6cd9230d9ab1a539a4b12b02cfdd777f5921b2d69329b171060a8085909a60eed9916aea504e8d9c9d1e907a61f0c6681ac75d5c64864052f821e SHA512 f744444f2840020dce2dc8473e3e562fa53ac1c34a641a9f322c2c7efd8fc4d9b3677479d3a31e705fa60beff0b1beca79ab78ad7dd4b6633d4499bebbfc76bd
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.6.1.102-gentoo 228064 BLAKE2B 9e783fc6087efeb0808437bb8bd80ccb54c29fd48a6893087a51b452dab98586f476be8d2dc4e0a2896308c9a0c185879deca46ffba1bb446b142ab3e81303a3 SHA512 4ef3eedd4c1ab78c2c5294121b47a2c4b465b4f537d12d48c397a7ab30ab4dc58b65d680326a23bce661d611aa37a2f98e814ec8e3cb84c3522151f09661e90c
 DIST kernel-i686-fedora.config.6.12.5-gentoo 255123 BLAKE2B 186e22a426f2485ba46429852d94e139b91cc3508eb405028b3fd779a224a2c8eaf3e6a15bbee7ebc54a295bf8c3d434d972cd33b42b87951cf826435a3c3d65 SHA512 90f505be0faab191dc06dba834e4d6726f88d9868b6610ab5b89c496a4b4c37e9ce414e6e1447136edb028420a243b1ce620de5e97aa2b4b784e20a6eeacd015
+DIST kernel-i686-fedora.config.6.12.8-gentoo 255163 BLAKE2B 7015bbcfb2aed0ba70173dc7e9abf464e167184e2bc8cea6d26623972bbe6b42956241a7d75ff8604d70d5c0202db6e40cdb890abfcea3d0c8e0d00aa869353e SHA512 a1b4b688510a231fe079b4158e8aaddaddc4e719367132668279edcb16e32b6c7f2c449ec196646b0986171dc43a82475255502ae40679e0433de9f9876e0a20
 DIST kernel-i686-fedora.config.6.6.12-gentoo 242515 BLAKE2B dbb4df93a5c8ee34d687262cced152a07f412a89ef2e8122429477633424fdac80809ed57a5a6de72de05313ec91f266d37c3494426099621d047c0561ccb57e SHA512 a65fe3299b6d8f89373937d2a782aa1469ebf18954b00bbf2798cee952b9946d7fead795388c079cb508f6d431e49b2812fb6d845c8a0e3861a4a3bd11e81968
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.6.1.102-gentoo 218278 BLAKE2B f4dda4430e9801c4660be4bbf6e4b37052e720656e77c928adb7176ff3dba55feb2fe66dd564d41a181809488941cf392ec9c94d786e4a3d813fbe5d683d305f SHA512 a5e12ab1045fae61b494938047cf1c2a3c34693d3d242968e4ab564a012c70e6d232b9d5333347f5ba114a64bb59dd96919b38c5a1327fb8c5154ef40ad28d2c
 DIST kernel-ppc64le-fedora.config.6.12.5-gentoo 241811 BLAKE2B 59fcfd508a208e7a6a393d1b35811e553098669e9db7302fe929d998fb705330f104b671ba34d6e5992f9c4ddb2e7f30509a261f324400cb3cd5216405ef4614 SHA512 ab0bf86e20bf3348b8703fbf7aeb29105a02ca768f9a4cf47fc59c77e452b4659367bd8c10ceb67295d869158905e2c76c2a55745e01db3fab420ce257c11cb6
+DIST kernel-ppc64le-fedora.config.6.12.8-gentoo 241851 BLAKE2B e7b8833572348037d7af2ba1f9671e8010276d853e0d85b8a175c0dcc5c212c57c7660be54a7ba2621c427cc8120acbeb1063a1c1a1c293894ebe1d63921b684 SHA512 7a81fe1c4b1d4fb9f2d68846882a8869c0888c8fa764ec41f41d27e61b7a69825ea8ceba2209b40deb7c0e8f4bb2c5d81226a4f28e7ca8aff4788bc7a3292194
 DIST kernel-ppc64le-fedora.config.6.6.12-gentoo 232147 BLAKE2B d67c2ab2d089ecdde3879129d2b1f85a592adae811ed053d00d4ff120e6bb44546bb41d74817be558adb1d669d06f3dd50e6ea542c8a9c2f13672f77f4e4eed5 SHA512 b130b4c57959c0f7be983334b08354640d5e2946bfdd956d6c5b895f816f6177d5fa4bb1c4382cca5c4dd4723aac42e9e89a002b71d86f4eb30f755008f8f9af
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.6.1.102-gentoo 228685 BLAKE2B e68236ccc1d51b2aff850eda9f3197b7ea95b8a88716bc7b07dad30348a86fdbb99a948060300dddae73ca82267d851d357f1c9547a9dcefae1364deebdbd124 SHA512 42bec2ddb9cf7eb6e84bbdeb23eb98dc11c9cea41f6134b776010c6b36833b520a290f0ef0145379de15c7f7834398fa5e3aaabd7258d7d4e89567faa09eeb4c
 DIST kernel-x86_64-fedora.config.6.12.5-gentoo 256170 BLAKE2B 39e03735453c66f4262005517fe00e66da0b8c813f7d4a0247083a69eac998c81d75ccdd6c56a389f287f2b9dd5d20e3703b9cfb4d3f89b4672897d026a6a00b SHA512 57f584d82145c5d35bd71f7b3fa5f45adb12cc46915d6f88c7c6f291b6dfde73a4a7f4b796cecf46b145fde5090efc26fdc4fe3945b37d5878efc94ce39b4b7a
+DIST kernel-x86_64-fedora.config.6.12.8-gentoo 256210 BLAKE2B f14f7de8ae573561824df47cf94c3c0ce52a820456ebd0e618e4c1e7f5454b7d3f6f86c559a3cd98dd94c55aaeed397f3d0cee6b0e37cf6b47d3aedd920a9dea SHA512 ea87b4b45c78888e02d0288dd5844cf2d97a14e251b565c7d6451a0e62fbe0dbef38f46715467af2f869995d6bbc8be61d5b70476a86d607a5bfa27fbaf36e92
 DIST kernel-x86_64-fedora.config.6.6.12-gentoo 243607 BLAKE2B 7e670d37c6471e50aa0ba395570cd0173af0210afe63faa48d7a147327110652e3aab5c339cf10ed22a6a20e81e505aee84311beb21fda3eb577e06ea55ecac8 SHA512 c484403a60670dd006ecbe65240cb00d97e8b3fe22d1169c5b6ccb92bcdbddb3ecd474d2b57880b30baf6a38bcef11fc8d56b8b0b02fcddd859833c3640cdc9c
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.233.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.233.ebuild
new file mode 100644
index 000000000000..817cebaa241c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.233.ebuild
@@ -0,0 +1,131 @@
+# 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##*.} + 12 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		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="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.176.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.176.ebuild
new file mode 100644
index 000000000000..9217d46eeff6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.176.ebuild
@@ -0,0 +1,136 @@
+# 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 ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( 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 | 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-kernel/gentoo-kernel-6.1.124.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.124.ebuild
new file mode 100644
index 000000000000..1009a9df0132
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.124.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-kernel/gentoo-kernel-6.1.125.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.125.ebuild
new file mode 100644
index 000000000000..1009a9df0132
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.125.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-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-kernel/gentoo-kernel-6.12.10.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.10.ebuild
new file mode 100644
index 000000000000..dab371bb9c4e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.10.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_MODULES_SIGN=1
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.12.8-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
+	experimental? (
+		https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.experimental.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}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug experimental 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 | loong | 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
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.9.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.9.ebuild
new file mode 100644
index 000000000000..dab371bb9c4e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.9.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_MODULES_SIGN=1
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.12.8-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
+	experimental? (
+		https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.experimental.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}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug experimental 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 | loong | 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
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.70.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.70.ebuild
new file mode 100644
index 000000000000..3cd7741b4cb3
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.70.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_MODULES_SIGN=1
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.6.12-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
+	experimental? (
+		https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.experimental.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}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug experimental 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 | loong | 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
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.71.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.71.ebuild
new file mode 100644
index 000000000000..3cd7741b4cb3
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.71.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_MODULES_SIGN=1
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.6.12-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
+	experimental? (
+		https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.experimental.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}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug experimental 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 | loong | 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
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.72.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.72.ebuild
new file mode 100644
index 000000000000..3cd7741b4cb3
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.72.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_MODULES_SIGN=1
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.6.12-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
+	experimental? (
+		https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.experimental.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}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug experimental 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 | loong | 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
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 82fbd2cbb38e..372a984a98ae 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,71 +1,66 @@
 DIST genpatches-5.10-242.base.tar.xz 7643240 BLAKE2B 53f852e2bb9c745051b4aa727643d696245e711756c20da983dd115eb40215e39ac445932c7b13b11bf37beaba9d0c98b4ba403d0113f4838e365081e11dfdc7 SHA512 cc8a85382291a61aa4c6f8009a58cfc4faa2f6aeca42e13c72fb7404f0983d238b98493e10ae753149a8aed8421e34a6d1d0895cff8e728f4dd228a16d88c2b6
 DIST genpatches-5.10-242.experimental.tar.xz 11860 BLAKE2B 341403a31318d32bbb18904bad811ca2bf51cf0c3a4523d33dd27293376aa24c3b55995ddc5e48699e9562574ea66b3bc53383782d30b531bab00b6f684bacb9 SHA512 78d5a233061f36564187a2339581fda818d0145041d515cf36cf888a07e1dc9b302bf11d2e8fd0d0ecd24fabf81c90a801d9345561e27273a28fc21fb74b1d43
 DIST genpatches-5.10-242.extras.tar.xz 4060 BLAKE2B 9e52b0061daaa25a31b6a80fb9ef0a27b7113c324dc9a16cea15b2f5d9b8c1de68544b6e499a5e5397c93a8353f4ea15cfc71ee5a0e3b9d45c5bc5da0ecf8767 SHA512 042fefb3ae1d7ce342c8667c3a415d260d5638d0b5758b4e00d65af33a343701a540f253459f0043fc859a8bfb0d6f6ef2f7a551c4868e347e395dc0a9316323
-DIST genpatches-5.10-243.base.tar.xz 7771320 BLAKE2B e0892f1d263dfc67edc4ff05b36041f396fa11b826b62df8e99f5a5172eec5c790e05b3f32d29845e48c8b453724ab04b29f6f980a387e1a70a68e1355733fbd SHA512 763504ef9e0f9be85c0dd939a67500d5e3ca8396b66ea73d61f4418b547759dfd50d3b102693614316fe18b77743532d1fa912104678c341b5b51a58340ba34b
-DIST genpatches-5.10-243.experimental.tar.xz 11860 BLAKE2B 747392c8118a41bd780758b697a1ee88243e48c90ec72a8aa6ced56d07864c124b073c4770b7c84e0a1951e0f3da6aa1157d9cb319fa8a2ca720a4d6fa9eece2 SHA512 fdc7606b29f49ff15368bbb37031677719918878d4c0fa1ebc17d598d81071213b19b777b72e38584898f2d71d9904c89b42d40bc1776db7e88083f1bf290356
-DIST genpatches-5.10-243.extras.tar.xz 4056 BLAKE2B f03d2b8f4371f686bdf2d4f9b0b261084e7525d98aaefa0b3fde08df260e79b9bcbf60d2aec576bfa9534bfa903f2cc4c81a55bfed3ebde0ae281749180f9d3f SHA512 712bbf583c6919f4df9cb3f0fd2d0c8f8b20097ac25adfaded89ae319da64a117d587c74d4dee19b96089d32b6385f523e2d027980ad8ffb59bccc9eb0b3e7ab
 DIST genpatches-5.10-244.base.tar.xz 7784252 BLAKE2B ab6f4a3f41b9ba52f1b9d7fc1c0e0b16a5871bc0bd30da7c63b24f11c3c3abaabf141b1aab76f4435fed4d5f25c2ecade6a83a9c3ca20efb9f9c6f44327ce545 SHA512 fe2e006f6a7571e1ab1cb3dcb80d9a6dbb46973918a138af1d6d402bf3702cb89e3764f7838d2d2cebbf9c97974926637d6b58c666899251be8433910dd6dd47
 DIST genpatches-5.10-244.experimental.tar.xz 11860 BLAKE2B 52cd415cbb1ed6c145cc75a6d605bdca966ac47418ea322cfdef9ea7263ac86e49634e5b6fb1c9cf9a9f778442455255fe4f7f6e054946d8a449004205412e72 SHA512 057d35146222b47cfb30bf950bfcca129caf7774694923511df7f91a741f5c141198b0784d7bf621df9cf9d5ad072d6f8335e4c5b1d41eaafbf687935a2b6289
 DIST genpatches-5.10-244.extras.tar.xz 4056 BLAKE2B 48aa848b13eee7909a304b368603f03050f8ca0678e702ca8b302982373ada3b5f88fe1e6b51d7c66a46015c38efea31e82d8d67282b2ae4021c0be30c3a287e SHA512 eba51067dc0fb1074b860afda9ba5be55e83738738e84a70d1219ef5c89bfb7c5e82191f347881f7c82b25e87ec105f9a0c08d0248f5f0a2dc20bbea2e642c08
+DIST genpatches-5.10-245.base.tar.xz 7815984 BLAKE2B fd5b339977af766fc292071eeb16e08fce3185dd3bf1c16dfcc1522b664f84dd5892042707c68f84863bdc19afc35d8fe053476f904dce2ab18b4aa9b3cd61ac SHA512 45754b5713276a852f83be7c23d66deb020b3539457614a80b051cd4e276780101df3c92e2c6ddb96729676bb86b418f77f76807fe96cdfbf5571d2141e5a313
+DIST genpatches-5.10-245.experimental.tar.xz 11860 BLAKE2B 89c182affdd3ee8750936139f3cd277c579574b1598b021a30d8cd01ca34d3cd4f1b073a28473507433a73b7e274de47111fb9a33b91eed005d2f46e70f5e669 SHA512 2ac7e4af8b92a89c497c30068fd09fc4a7bb851bde874a09e867693b1d65364dfb75af0081f98bc6346b108c76c329193a1880dcf36b425c8c381bd3d50c7e24
+DIST genpatches-5.10-245.extras.tar.xz 4056 BLAKE2B f4838beef428e2913d3861b26989b10f82391823ebc39811402294c23c5a84623dab8b15346ada7aa3c9552727c857ca80a262fd9dcf4f4751888b0454fcdfdb SHA512 617ac2cae48ac2831bfbb5a0bca25e466087eccabd930ba86c0e9f984822aa5ecade7559d4b1c71031b4db7bdb803ee31a4c392ac36413d97a51e2befcf70166
 DIST genpatches-5.15-183.base.tar.xz 7657948 BLAKE2B f54aea57a40b7af56cfdf8a754d126651a7378e4d00bd3123f3ec6545bb9bf46e83d66a8e57fbde8d9c719fae161700b4be5bb0d66c3ec767423da1536de2bc2 SHA512 05f4208568518d0c993a4a39dcfbac705878addf328403df20f907274be8bae118ddc61fb31d21a18c9e0dc129848d95494014bed7f50f439b2b377dcc01f578
 DIST genpatches-5.15-183.extras.tar.xz 4060 BLAKE2B 34c8c3466fabebc63d7dcff661305bd8fcf57c4b3404adf6bafeab5d602ca86aa5afb28385aab9e755df2d5a0f71adf72c11a7ba97f93d9698b9368f492afe23 SHA512 094c5a55bdad6eb5a7b4aaa24bf3d7aa1ddb8138078e9bedb225b0863c7a2572bc0824c844930adc20a0f2fdb53771f66382dcf0f3e54ff7825697b61e0fb1d8
-DIST genpatches-5.15-184.base.tar.xz 7799348 BLAKE2B ac6470d6e8e6908ccc7d2f22c7b61a20988a8774f9923cd7ffb9e3fd70ba75c9e515f553641de1a155c059f46cacc3f64c2b3f464b2e03243be2aeeda14bd638 SHA512 74973c07981492df289dda643c70c3b616e272a43d6098d5cd7d8a8be003b71d83f7f4b4ac4f1358da1147b9e75e9e1cb1487b0e7d2d00b14a630836de616562
-DIST genpatches-5.15-184.extras.tar.xz 4056 BLAKE2B d78a2b6c176a91a0eb33f7b8dd7bfe286e6aabde27cee8f591574ec6392763b1db9b15c062f8acf46d3a9aaf4b442f43fdc83ed2f8dadc008146e7d72827c531 SHA512 ebc2c8e2cb4e341e28eb2e8a522ea0680f786a232b84d8bad4027dea9bf977f8d3f81b1af6c2d68747288c0b30b0bef08330e0a6417e5ae8cfdba0215dc554d0
 DIST genpatches-5.15-185.base.tar.xz 7813568 BLAKE2B a287174103461737a4af5e24410266140ecd2970dd5568557ea1270d7b3d9db98ee218c392a4e8ef35fadedcfb8f9013f6dd830c08c0d9b2147c57658720e1d4 SHA512 edec855e548f4ce61e2aa3e8a86216a75d43405141054c114f7f2ed024f91500b905e953dc07f528d19bd25b13781377d8c60ae70e0bb15330f5cd187762b509
 DIST genpatches-5.15-185.extras.tar.xz 4056 BLAKE2B bab13e1f8b400270ab36e78525947b68468504433f41784c507e6700d23e08b7eff91cd49e50398f90622cc289d6c4c122b3d5f8da77742b01c167ced5284cf2 SHA512 be561334e77afb45e11fe5e8c6c3b61d85c821776bcefc0cbe0d9addc6561a4c0bfc3956a990fa50f703d7defbc4a847ddeeb170d4dc828c2bcbd1a4c6f4429f
+DIST genpatches-5.15-186.base.tar.xz 7849000 BLAKE2B 3bf7560f3bfbc26789d4ae1e93932bd94b46e69c8a9ed29907e47ad493c7f7acd25309bef228306c69e27ac53b65efa8a8bf505fc577ee3a8ccbb196d36c866e SHA512 afa8bfc5d4f9ac104a583bea92b8930db5c2ca165c6c1fb3d5750baeb508df6fcfadcdb3c978bcd8e8ad95cf3ca2fd0c5c6cebcd000e93dbed663f310af01dde
+DIST genpatches-5.15-186.extras.tar.xz 4056 BLAKE2B 68130d315dd2ccff0075d729a10cee298756baff9ecc0c1f218ca4c771ccf30541bdb876ee529292a56c56ba49eefe5839cae263a08bc0f3ba114fa499267141 SHA512 2d1f1af4d251c93d7e45aee1710e44129b8bc71c83d7bb328b07b28c109e394259321ab12e889483369966a52616c1c41b547220e4ee9e4e3ceed21f89503665
 DIST genpatches-6.1-128.base.tar.xz 6459108 BLAKE2B f27a537be69a26717ac1e251d7530b97f5f4498a088d80cfccc343b4d50bc7404e59ae9285bc06e4991e166121d52b8a84054ef8b8f707f242626a49ac202a5b SHA512 53277c695af046fd4f8c6362141317270022a4c18764b3563b47375f08f775644dec0929086108c5ddb1f8de8bdf8bdc244084fe0ea4a93fad1677013ea1c42c
 DIST genpatches-6.1-128.experimental.tar.xz 17452 BLAKE2B 80db4f58546c2f93c834711bcce23e91151160f106dbee42136b071093296a2f4f62d7bbc724d29148a68802fb63276d53359da05b6e646ce7ed3ff8977b15ed SHA512 71f2e7e67fe389a47af07884fce18443321a3282412a0d09b2deb42838f03108c2147a1dd4592e3062ddd202df3a9ae632e52cebc15ede012a67625a81272059
 DIST genpatches-6.1-128.extras.tar.xz 4060 BLAKE2B a4f0e9f0b87dfaad00ff0b702b85c6e78c9543bd45887d6f8c550e487f60c744b2912374e972f1bdcff8de6a434d09dd0550579171764afd9a5c741a4468d743 SHA512 b20dfc8580a640d0c9ea07b7b21b38e9632df4705b3a5ae9cfd7d7cad0554b3159ca6cea91280e2a6232d2a2e26bc485bc23616c23e24bb87c5dcd60f8325558
-DIST genpatches-6.1-130.base.tar.xz 6678892 BLAKE2B 53955f1a643453a96c1fa660197efbf391b44da196eaa4391b217010ef58f8e0c4d6c5dff34d8ab177fd5a2f54ac3898694ab34dae3c7bb8f7208ebe0c14d4a0 SHA512 5a3195e6e97bff0f8f058da745dbd165cf63ce0d5d89c38b984c1d0ee51ebe42c325b953f07a3cde8b817b6400bfd3412bfdb54f25c009eab85d56b2529b5a96
-DIST genpatches-6.1-130.experimental.tar.xz 17444 BLAKE2B 5dac1a6b23ece288f770d4420e67caf0d4279a166e5b2544d79651262466f49690afc7ad0d5565a5ae63b21564c9a7f389e003e3e0f341d057d081cd825279b5 SHA512 a0a19e03e1fced60aff1bb207e03cd12ab3951c8d3573498e4bf73dad15da88fb1893a17d6dbf9b1cfda350c13ccb4180531e1a6c1d6fe3abf194e509da09b17
-DIST genpatches-6.1-130.extras.tar.xz 4056 BLAKE2B bd90d7ec57c276a6704c3674922c77744b218a8a86f5d862e092c52d23f6205e3801c294ab3e2a2d97050ca8b6d46d604bcb966ce78c3c08ade6a31a3b33f293 SHA512 6ed1b354bfc2b017ec3e9075a0eb686c6ce76ea7d73706c66b696fa8af46fa58fc35b20fadb68ca9249b64614b59aef58443349b001eb1ba5bbdae26fde27b99
 DIST genpatches-6.1-131.base.tar.xz 6701808 BLAKE2B 0ff847805abdeefee31ce75d0b5c02eafdf7b12f3b3c499c0d9d19305b3ae934194bdf58fabb30e51a356eae5e57c7d633b7abbf45a94096e981c671181c9b16 SHA512 7604d45f78bd5a087f0a158acf3767b275315b60c77cb4d6b93139943d56ca917a75ed8ed784a608a52d3e1d06cb36a01f5c3d0f5b211dda6d62d36fbe9ffaf9
 DIST genpatches-6.1-131.experimental.tar.xz 17456 BLAKE2B bace563f58660ba72d5662511b47ba6e7fd9e3770526db81206441cabe7da4d324bebd30488536e56bb7e07d82f89af6d27baff91712f367222c3839c065994b SHA512 b2a41b3c0c706008db034d901f40cafb054089fe224ff60f96d88097e96890222ad869e59ffb2ea5fe87857f3eee5b278e9418612a9fffec294c494a8c64d382
 DIST genpatches-6.1-131.extras.tar.xz 4056 BLAKE2B add38a1ea9191009b22ce04a556062e419452bedc85d6afd40d6aa3da2474f4719aacf91bc3680b6a08a7b73cd0dbcc5c3249322f8c47660ef36c256e8792bae SHA512 7d68ef7b616ab8bd62db15ead625f0e449b6ebdde8477676d0aa6ef017f9270727413af62985ed8b271aae1f5288682f4fd0d0804f06577e2c1f4014b5402035
-DIST genpatches-6.1-132.base.tar.xz 6718336 BLAKE2B 3a1d86ff100ded252a1af8cb1cbe50ea55e0789041f0e740c30c6a70c3192d8c90f873c46f9989b4b76071d1364f29b2eb8230e2675d22f2e14b6cb94e3e16b6 SHA512 bd225633a720a3d271969818c01b59792b5783c16743cc020e3cf444a37116ba57b0d82280853b432a3e3043a29f717ad2878dfcce4516a8127c535367ce6c49
-DIST genpatches-6.1-132.experimental.tar.xz 17448 BLAKE2B e2d9331ca6249ab23030db8c16a1c103456eafbba7bb59f6274b9e407d443acc9783209838219aafc52ba8c933adf3b01e0d98a92eb5f8c687510493cebcc82c SHA512 8641e826c3d0b6c084454960265d562d8c2416d197439035d3c566ab275bd39b8ae50805e8fa0c818fb8643f64866009c39901780cf4b49462bebdb56dd214e7
-DIST genpatches-6.1-132.extras.tar.xz 4056 BLAKE2B 3f3d5e78761b9322a765bb8bdc137395e8382ffe7bd401f4b474530afd5f9ba570744058772978ac39c897f04eceb524ed53d32c8ed71fddd1a0191f31284c0f SHA512 ac96811e465540e96cfa443bf088bd9795c58080b19b87dcbf62c0a4c94dbbf28ee6d94262ca76bc38b9c591e4d07872294b14807e1d18ce804b69497cb0ee66
 DIST genpatches-6.1-133.base.tar.xz 6730928 BLAKE2B 0a3d788af308b602468d8bc26467d01f1ecc890b5da5fedd65b3eef33cf3da154b48e0ba71f1df6f77eac22ff355570f6096aea7bda695a2f7dad1f409387a9f SHA512 10ab1138a7a7ed000ef431d35af6375c1ad3ed8e3313b4ce43b19ecc4640fbfc8691a8113aba6bb3b3481fbe3077ee623d8f7c6c12337c809ee2f0d533adcecf
 DIST genpatches-6.1-133.experimental.tar.xz 17460 BLAKE2B 56284fa6b223dfa599380586e62534d37621405667280e7abf61b73ae265c39e143c3ddb4aa49a9a9f1bc3018d7ef78e16db4fe2d5dd61467ad9f65031326dfd SHA512 8e18720fb42863ace7834b6ed4ebc6288b80e17cc60fd8260a22ad4191baf04ce975ebe4300056c6f64e8149baa8ffc77bc8592fe9b83ac0cf416ccda6ad8329
 DIST genpatches-6.1-133.extras.tar.xz 4056 BLAKE2B e5510780c454bbdd69f0d5d01bc6d792316f62a9e9217fe7500f688a5b8854b9d8406521e553808cf65e10f937be884fc4bbf3e3ce70f75b28a8254af03b77dc SHA512 e93284e4812b2a0a43e9de73c392874e1d48dfc3ad4d27a145fd43864e310cc60df3f509477570dca011dee7a9fb17ea2a72882e5316a50746a5a6cad58f373d
-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
+DIST genpatches-6.1-134.base.tar.xz 6754804 BLAKE2B 36d49584071a74207d07d353e67b8c0e9f9d5ca3db44d5fc6c392bf34c022fd6ba9022734aba45fdd432673133e9f4f9ade495658550a68ad537153a08cd01af SHA512 214e8b20b52af4fb5b22035955dbafe665245c3ca85a1dab3419385be6f9f0d3b0f5d0ece9180c71a11c9e11b1c69153e82be282b46b41c1eba2df19226f90ea
+DIST genpatches-6.1-134.experimental.tar.xz 17452 BLAKE2B 36962ae71dc40e8792bc38bccbb3b74e9015bb69a8d5866426c87f76bbee08a498e820a9d184399d638e0d5b6e790bf8af05e9b527d65afd30d649aed77165c8 SHA512 511e00e64fe0413d325c0af4b6f4b894cdb30e097d592bda92340a8ac841dd324833acc10e7d8a413bd5718a442242926516b1d405c85121c97d623dcf62a62b
+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.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
-DIST genpatches-6.12-7.base.tar.xz 367676 BLAKE2B 7606acc5d274142a0dd1bbd0ace6cdf5dd74a7a594ed2e6d50cc3b62c03f43371ddab20eb639051077a564783ada9d08c459af88ee144b1310b91beecc24f106 SHA512 c1de8583d5baf08e75137068b868f2cb8cef7409bd481948b430de4390b5625d74f72031644c4e445bf55d5c430c9047cb280a05f2cc277a6a51d9ea372fa155
-DIST genpatches-6.12-7.experimental.tar.xz 78116 BLAKE2B ea60858be3bcebfebab42eb437a58c31ebda504706cec570504f297fc8fe9942efd82b458398f6de17e0554e9dea9091f49d368411019873a19fc3c63000b5d0 SHA512 a764acb018b425101c234cdc6937d67b5e87e70702dcabfcf41edd36d8c71d325351f4152849c3978a68dde38a51a8c05292ca100e7390448ffc2144244b77c5
-DIST genpatches-6.12-7.extras.tar.xz 4052 BLAKE2B e2759676e3ba5088f5cf53dffd34f4f00e9d975434df6cbaf0ca7af418bd361d402183fcb88af172e40f297d0653eb3bdd7f7252ae7433f88155303c54145b99 SHA512 853a9cf03acf258cf39a4e2a1eb1ee203583c5a3efad1e4bbeca3e045604d013f6a0b2b91ce62c4eb5a61b355afadb1838a6fd051962745559a1be0b54cf7117
-DIST genpatches-6.12-8.base.tar.xz 575036 BLAKE2B aa22e2f16cec22a76f2ccba2acd9d55b66a93851e01d2cf0af19e9904c6210550ece4699e19918a88f8ed5d5e78dd5d81afdd2a94541ec97d349bfebae26835c SHA512 4251ebdbcec4649663541c8dba7eaed3b674612aeb68a0cbef94e0d0ea5820370a8996f33c316a3fcd6ee94eafb489dc32a22504e94843a71f464a3650647e1c
-DIST genpatches-6.12-8.experimental.tar.xz 78140 BLAKE2B 06a6d6fb6c6ffdeff130181d643881fa901aba258be61c069287b35d8a90f899288418a5d9f53806b828e3313b0d0772ff7fe5e19fd76625e908326faa377a91 SHA512 4a4f47cbb4515b0a8d54326bd2d1b57d8fc9166332e024967b870af8df2740a6aa9aa7c4c811506d2bafee3c1e3e804e3b7271fafe219915acd8ef45af291c4d
-DIST genpatches-6.12-8.extras.tar.xz 4056 BLAKE2B e6aa730acecdbb82f7983e34df47db46f473a792d19b848d4e4a5d25b52bc7d247217a12f708698f0473ef6eae33eacc704bdb36053378ae8b86e4d80713421b SHA512 c9da9965144e3adc7cc6d0168a1fcfb8165102ccaec2cdb9c4fc909d8e2002578263e12f1c2f56f21ec3b9d2d7a0a69b53dcd7d9dccbe40a9417ca0f6cfb43cb
-DIST genpatches-6.12-9.base.tar.xz 632912 BLAKE2B ed4f40958b1e3069213b309ef89bd7bab5aa7e9d5459fa35517ded1d2347abd4eea399c9df134989157e7b7a7ad68c3e777503884b9d7757be91ace970fb258e SHA512 cfdd660147ae7e686972d7ddaa1511fa4acfb1b5b4f9def30e8d11b5ae230a01fc0e1cb48c7af12b7fed435993936c0413cdfa9c41ecb354130db0ea4a653a0b
-DIST genpatches-6.12-9.experimental.tar.xz 78116 BLAKE2B fbd986e5185250b33abc1b77742996639e5b04a77d6e0c5802929d528d47dea61ae33ee515c95207963adc7705e875ea564273615e137ca28a04d6b0a675c488 SHA512 762f6e889e3ec9426005970cc5b8855111cafea6df889c301814924e46fd191ec63e5dec120b6bebeae890758da1aa927d0ebdb947f3dc580771fac05a345204
-DIST genpatches-6.12-9.extras.tar.xz 4056 BLAKE2B 718d47c2cb619bb1fab14dcf5c06d8137a3f778c728f50e6fd29972efaf0472b040e73cd88a510f35f53e3dcd1fac9a3c4cf5e16cc79d2c6a5ca384e1e2e9056 SHA512 d72cd080d56966d797a61f6b61bc471451296213475aa1b666ad58f8498657500641adc136ff7d07d3607f9eed2da4a0466877e423f67887bfd19a01f17a3aec
+DIST genpatches-6.12-12.base.tar.xz 758168 BLAKE2B 2f9fca909ebc5710fa9154fe4c824116e48adbf9d4e857a75661b0689a0c44add897a502700edf415ba4b664fe586ba490f16b4dd12f00b19b80c34800d4b6be SHA512 c7d125caa03b0ff053f37fc82a4fbd9d3be8f8eee024bf05639d4f3c3b51574983e5d0beadb7714865f6d72e02a22ceb528c8359115ac995b63f5d87eb055bb9
+DIST genpatches-6.12-12.experimental.tar.xz 78128 BLAKE2B 771782a7f3c067bac0311f6f45cde1fa5fad2a1546c784bc00a6f3360cb52fe7ca157246e4c33d9674736eddec41a84daf123722b1aade862feecf563af7e145 SHA512 249c330f3844d67ed596c61cf032c0ac141f3319e438194be5cad9df970242564b621a9b28d51c9a3f0424e47d2c4070804a5e7bcd9b9683522991bf7b87a533
+DIST genpatches-6.12-12.extras.tar.xz 4056 BLAKE2B 8e00efcd3af7862fb8bde9d8a2e9d51fd999474e33e63e058c3580b187abc71c2206663d37b7b4ebd96193c6185a29f5d1e9e9ef98167703f01bc5c3c9b767c7 SHA512 a52dec8d607e64c112a2b1c731f65ca3fe340712bb390c25e8f7bee90cabea619922540998ef6b95b97dc0626b4dfe3a9713a3f8e7efa8f99f3ebd95e8fdf855
+DIST genpatches-6.12-13.base.tar.xz 806528 BLAKE2B 0eec1195d5a497e64556d992893f251a54c558151aef1fc1d03de0b95bdbe03588ef486875e7676f9635da62e975dd8509279ed2d96b4dcb3796e1d8a4bb3768 SHA512 3cf8549679aae42fe56a25c0f9d5eb5c59fb867c77dc22c21446064e55d91276ec75f60f5737ab9a39c82dd0e74ab1ee3bd62b5a78f7448827b5577257976aed
+DIST genpatches-6.12-13.experimental.tar.xz 78444 BLAKE2B 721334f36ae20a598295ce87c31acb12eadee9080bed53ba3a4fbd03180abfa4771c39d0b2d79ccdd28b04766ddd6eb80b1c8f3dc9e5fd2b8c17fe921125d1ba SHA512 834f04aed25aa6f9e660e64b02e488f2c99cf8cb4e20a11c813c8e21b7d91a650e0c795c1369147206d707c75f2a1d25144b08ca9b1b02162443d4ea1bd36d26
+DIST genpatches-6.12-13.extras.tar.xz 4056 BLAKE2B af48fba5d81bf8e13658555d94fa131e3f8fa06144148dd11b58823f802c5c4aea823fc4cd8f308ba6518638b65637d0b8a030d513d4b2a05384fc8f40550d94 SHA512 d7b1290d44696284fde4980ad3b90a190659056739a084ae704d1edf1a06ee166fa78960a42999b9e6e2d8aad4fd330621c8865f5e2517f1453c916d6375a365
+DIST genpatches-6.13-1.base.tar.xz 6348 BLAKE2B da919e38b83672200039934658074119951b6a2448227bac6864185d076a349859f3ba0e9f6f078ba517c91a61d9c348f926865f2efff89f4f52edd99d257fd0 SHA512 98eb401837b38e98d3aebb24942274eebe244a5dbb76509094bbb1d5004c973314a3ec7ce6072d137bef365dcb4f5c62806c9e9f8acd9f5694cf51e454036fbf
+DIST genpatches-6.13-1.experimental.tar.xz 6004 BLAKE2B 786212f705220ac5aecaa207b4570e2a58c9ffcf85230b6580338fb5ede63faf8dd0ea8ed4b3fb28e34b03592360fa7ca01ff81d31cb9f2e9fc60250a920c7f8 SHA512 cab118a55f6808f90790940db8450d123eac958d93f8def780a4d1799cbb5eef717cdb595c7fd64742c41d633d92ca0c573d48a686346958d148e7af8f196882
+DIST genpatches-6.13-1.extras.tar.xz 4056 BLAKE2B f1f78542fb91ee08b6493d231be58c3673e22f813572b276f39852134a6a0021d5371a0b2d5f933bd4dc5b3c3d3df247f309c183c2a9f15fcd0a823e3737d841 SHA512 7033516cb4533596699a16c04efd0dbec3e8d212d8f7c9caeb0ad4dabb3c5a93bdf88500103c8a8c9b80cad24078121437da1d150bf2d01c3f52fbb23de18c28
 DIST genpatches-6.6-70.base.tar.xz 3723176 BLAKE2B 19017743aaa0e1c717746592f253a14ca476eae1658742c6e487023ee5a670473fe582a814a1202f2aeefc78d7dd3dd249810d7665299f740fcfceb1c8c11f84 SHA512 dfaa2df7ceb9411e9e35fc9f4822f7d579c1106b49c57805d657ec14699764a54e10d93f717801db7e33698b1c01dbab489e7b9953b1ff23feacbdec5a99c95b
 DIST genpatches-6.6-70.experimental.tar.xz 5760 BLAKE2B 819eec9931b944363d5da41bddcc17007f9825d6caa736e30869d175cceb138a87a2c22c2b17ebd070b583d69840d2b28597dbf80ce2835e1088cc6c7fa86660 SHA512 b6b1a58c549a1350e4b1479544db9658a8ad78f61dd3c486b909351c29e61d9d6fe97230f01437775d32711633cde4300be1b00bfa6dc9687e60b126427689da
 DIST genpatches-6.6-70.extras.tar.xz 4060 BLAKE2B 65cc5e2a27894992dd78d6cbfe5601f2e10b21f6e588d8a8d75f1f265f1fdab3ab03dd4d5c18e3ac5f48a6a72f021e2f125c5140224b26f0caeba3def4054042 SHA512 728495f3fa06f52f0ececb3b5e69b1cd4c7aa29d8ca02bc7a537616a2c1cf81859b5f624e125332a1def8176f7a878da58843ef8d363a5d622009b31548879c6
-DIST genpatches-6.6-73.base.tar.xz 3928696 BLAKE2B c5955b4fd604c01e2056f167a4e4510e5c450daddc49348fd2434c65f20aa2789cc1823d03623cca15c47840830affd035676189fab16db34acf8df320b79646 SHA512 aea78f633aa046e4e1bbb4ae977eeab8f276cd007b6f7283db03be621293a5f29a5b0da95e761bc72153875ccbb9f2ac88625b3f6a6ea0cc742f565760c93198
-DIST genpatches-6.6-73.experimental.tar.xz 5760 BLAKE2B f1e237ae8f67b4c4d1e3c515bb52fdb97565cbb7fafd14fad0aca39b477fb3dc0452cab55fa41eb7a2042409db308325f6416b220c4e7a0f7a58139dffab7f80 SHA512 53c1a5768565a1f94db56a723ef643062d3502e9da149340e15a966e17ac99cc10a7bb3c5b51686a5a8a2d7d0cbd23bd1369360bdeeedecc0767a0a1d1160077
-DIST genpatches-6.6-73.extras.tar.xz 4056 BLAKE2B 7258b54caee92901aef45569d8d45d218640095b622e0106a0cd640d13fb0c377e9dc51271e5d652922ac250c74e99d091a668cad526d30821e4db676f8314cd SHA512 7b6995087d0f94c7f2cfec46090208bfd36cfee60dd26343cdc108a3e2e1ffb2e906f1e990cacde1f72d5b920a8746d4740f64c64bf39a8dfdae33949a35acac
-DIST genpatches-6.6-74.base.tar.xz 4055280 BLAKE2B 448044e3dd03bc4fdf50e99985b5d3907c0753969b3d3a7e1fbe52859c658b80f06f90cfa42172e132df6989ac8d56a9e638cd11618dca2671de188b792c2e03 SHA512 bb00296da7f6e87eb9f4897cb5bd705ed4fb15caf6664c19f4f3b3f054f767f6b561037d99281068124f7db31d65d933af2a3ed90c488ac9d2ebb0370a3ed8b2
-DIST genpatches-6.6-74.experimental.tar.xz 5764 BLAKE2B 0163705378542deb1e25fa0af8895cf1d1848224f29af8ed1960f990c0578cc1581c951c4644e4ffc5f3c11c9fdd047a988511c05caae221096a096b0154889a SHA512 4facaeb3e98b8e69c2495f20ffe5f2443c7e3a419e166015d46d0919f05b0ce19b5079b604d1cb611071bc7891746dcf7c965f8fc6df3caeb4488c963cb95e2a
-DIST genpatches-6.6-74.extras.tar.xz 4056 BLAKE2B b706064bb40312b20005f2fc3d1f364789d8ab94c6b6893517098dfbfc18f9f51a5336ba492133f28f87daaeb5bd714dd4720b4cdcd2e50f60c0df330a6d23c6 SHA512 a113206e1c5cca4177b537a68b496721e6f51473967ee690e7a1301b285b73a1a1bd279f8df6c8c53b5fce1b2e7220e2d0e473bbcf2698f9993b1284fdc26721
 DIST genpatches-6.6-75.base.tar.xz 4089936 BLAKE2B f88b0f84e3d73f87025389a3a66edbeeb6c126bf93b2522105859d27911aebb768cbbb2aa8418fe7e778eed6130b2253d85c08cedfa99c188c02d8d043f5fc7d SHA512 ebaf66ba8a338d548041c1ed619c4cde495a3bcbc990caba75dc86bf990a159b7f431e46e84cd16cea62991ca9d50420747a988da6e0c3973aec25943bc00d8d
 DIST genpatches-6.6-75.experimental.tar.xz 5760 BLAKE2B 7709337f3f3eefab7132b6efd7b702068ac11a63ccbce3fa7ea88310e2555ec6fa65b53ac25ff8f0fcef7cce4a6526ff9547da5f826732b6be0eed23c349a4f6 SHA512 3d9ecd5da8ce280be89f764a377bd04733d34a68909a2241ef61ac30b0e7741fb3bffde82b2737ef4798c1c20ceea2d3d224140a381503df89d6293bb46891e0
 DIST genpatches-6.6-75.extras.tar.xz 4056 BLAKE2B 6e2e14f16a7ebc675e84b180a8f26f485aece3f22de1d27bef60b414deea8f3744cbd95536b58722d793aee320b505d5ca3c0af0b1e20f238b02c29a12abada9 SHA512 c8030df10b17675adf3c48931f04c59d1795598c955eef39c7b3dd4f36c1af1d79e8d7405004952cfe4922cf100aa95d2fe3d7c6f6e0d683276d5382bebce399
-DIST genpatches-6.6-76.base.tar.xz 4119292 BLAKE2B 643510f5f01b8b7ac5c24098cd65b21ef02fd75b2682b371b00e8be48c6c335e7135569c58ad91ab6549e298b1dca15b83806143bf260a9e594feeffb2178fc5 SHA512 1345c21e33f3f0433691e03921c7b3d47bfdaad47376c06610170cf82214e3648cbbd2cb250ea4877d5c238f324f499b52e50dd2e5b51b4e336f2a1a5a431a1e
-DIST genpatches-6.6-76.experimental.tar.xz 5764 BLAKE2B bb585f5067c7a9fdf4db9ddded50678e192a97aa9e635701255432bf7525110b2aa9424f61562514f8cac165dbf3f2f3ebfc1ce418f58b8a54d6341475465aeb SHA512 9757c33baceea2a37f890562582cda6777423bb3201eccdf2b2acc573c03605b41701ea1c44e0846dddd0ee92be8960c4dd53005015bb13372ccce986b494d11
-DIST genpatches-6.6-76.extras.tar.xz 4056 BLAKE2B 51631e3f138ac1f5146bc8d70f3381ad64e8341336cb1d706b2b3f838c6b5e884a1c60745bebf73ea25ae7ec26ec049d76db7e260593b3e7a4795b98d4488734 SHA512 fdff2ce695891603f3b9bd6b3a44df526559f454edde20e5159c9e53d73fc9820eba1836ef81b22da9d3adf7906fda16e9b6e6a3df65bff56519c40dad56ccc5
-DIST genpatches-6.6-77.base.tar.xz 4120472 BLAKE2B 99c511e049d8b375eb54c8c00688e695d22629a758234fa47e11222b5ab2a448c22e2fc29bff59c95e1c39992e38a22286e791a9dab16b0e3acf59f1681c6adf SHA512 1626b4b76bfe3ae1c6c01d11909fb65fbec2e570d987268aefdcad5558aaf2a3a95f3f159b73e1eeef4d66abc5f42b965d3c9200224433b788fc1a3400a3b9bc
-DIST genpatches-6.6-77.experimental.tar.xz 5764 BLAKE2B f725aaf5fabf0f103206a7d5d191d4b041e73fed0d582d79e547d62f9edb9e0e9f433ab0cd4cf284f768c6c4d2f7b797a4992067e2fc412cfc4ffaf6d84301ff SHA512 49a8f105a67447f8fa2cebe90b0cfb3e00bc17e78c7805fe785a96f49d5e7e6920f7fcbe3302af8b095609f7b795f689e44cc43638401308440e7787ce09aa6b
-DIST genpatches-6.6-77.extras.tar.xz 4056 BLAKE2B 72ee0f92105f7e24d08e54614b5fa1514ee8ff75de5781474f56a3655665c5d3152771e3379bb431fb73ce19780620de72858cf64585109033c851be05efb0f0 SHA512 afd1947987efc0268727e6019910aff4f8860ab60707a32a289a454253519137dd7e8da92ea2743706b124ef873f854ff8ed6b3eac719523ca5ff94f466b261e
-DIST genpatches-6.6-78.base.tar.xz 4145152 BLAKE2B 24e2e975f186f08be3d9b75f08e9c8a2e3081f1cae68ccfc8c6f68aae46f8b8806ec91c8dcf7d0b6decf1e402c545dfdba5ee17f09e6d6fd220c62f6e01de939 SHA512 306d617bab4a327c062f2d6d2017dbb3110e8f17484b5a3de4fd9d805cafbb51410ab4fc20f93f4b35e9b6917ef015b0e6280b3f6a76790d4c546a6771765271
-DIST genpatches-6.6-78.experimental.tar.xz 5764 BLAKE2B 2175d1d16800d10c6d6032e42939c3402784fc698d8ca98e4671d62da98da5df38a4133451e2ce8076514eb9f4ffde2091832555430fd3f40798b04c1565473e SHA512 bc5f64b738f6becdabe5e50ee5d82f66aa58e5c755d3987018036bcf45679877cc206c3bfa326d74a88916fa26be68ffa56e12fea186f46a26369f51db465830
-DIST genpatches-6.6-78.extras.tar.xz 4056 BLAKE2B 464b1eda63d76013d5fa0eee1d89b135100f69ddf7e1d773cad3e021d197cf1170d66a3de6a30045a789cc03a6b69913ed222c640201c1b9ce8306ca089b564f SHA512 71a9421ce799323791d0d616204b0095b4b5c799ed8b1c2786bd65cfe2c10b801200d07b0a1fa2c1ccdbe75f0d2a6a18ee62a528895bf5d4d804e42af89aa2c9
+DIST genpatches-6.6-79.base.tar.xz 4222900 BLAKE2B bcd3e23877b7ee2439eb080d304a346c539b2ea2a3b242b89cfd68dec8f3022d2e89b43c939ae11c02d60c93f3c0c7c6569fc41994a8faa3a1fc259d4065bbcf SHA512 a336717d2f9585ddfef9ed6c373d7225bce4c5a76a31d55bbf8998214b1a835435a7510ed5b4cd4aafb4f92e668f7646e0f7ca964bb1505b4bd20f8353f46761
+DIST genpatches-6.6-79.experimental.tar.xz 5760 BLAKE2B 07c668a2025b67cd2c231b63525e98ea269861ab035b9ef85041ebd20be8980159522f0f615bf46f86535e329f3e5f91930d22827a01cb0c86a1f40d45e2b32e SHA512 dced1b5f30e8ed72b546fa8b047caa60891b8df917999a65da1f98a0ebbf008dff6c12d5b9e7f45efc5857d23851a13a68cde4b688f4b520e08bfeb7ddc2165c
+DIST genpatches-6.6-79.extras.tar.xz 4056 BLAKE2B 70ffc39672faf32971e8b3bf8e41fe2a24e65fb3268447b1c9278fef4cf9fd97ddf9045329ad1431482e6628af911733bf86c7ba7cab624880cc070e68d94f39 SHA512 c3403d427b07a3b70447143d728987ea995b0d3d4d79c1d3a874c3de34cc5c14068320847628de36dbb40cbe63540942969cf2b158b0a563dc34aba927e3ec5b
+DIST genpatches-6.6-80.base.tar.xz 4222992 BLAKE2B cbdd564aecb24378e09623688dfcf5bb1931d63823a339c99d7a8b436e16ed20b98cc682a5ffd10afd4c24a7e91542f140e7448b6b81acdc112c25ef982bb107 SHA512 273542404785a57a14a732c4e0924d0c94fc95c3980293c6d5ba6a30abe30f1f42d756dfef27c9ad5ffe57da84f2368ce9d51293d4b006d13dde2c8d0b1376a9
+DIST genpatches-6.6-80.experimental.tar.xz 5760 BLAKE2B de1b3cafd2ec9c84d75c08b2532228df4f234ac94ddee4224d000e7e748a856dda080c4899bf6f7969bae4bd80e1e5ebe017fd18006088464b27504f83db46b9 SHA512 11f72ed0b15f1d251f9ef539f512f39127a9a5721774c496334fffd956f9fab9a885c8325f2fbf711481f9b4874072b1e015dc77854017e47b550d346c72ade2
+DIST genpatches-6.6-80.extras.tar.xz 4060 BLAKE2B c83e6d97ed086ae3b9f3d6bf4cd29d4eae9f57f638eccab183dbcbde85886df00653634b1cf272f26580f32e1a7786f68960bc51f78a01540c61c0f5c7823b79 SHA512 a0e0b309a2022daf6343e21c0f435bd617d2a029c28297c7a082a8380157ea4fa52b12f92bd045ad8c3fb680cfe98edfe69e10f4d6a28f9b115afe8b07d75433
+DIST genpatches-6.6-81.base.tar.xz 4254652 BLAKE2B 20fe02a8fe886c04569ba9490de06956b2927014c1d023dda7d55c4386a0cefae6ee3d4d8138e824798b2d410f52024c701ac0b099c74080d4e3e28a8ba11e8e SHA512 f837dd14a9a5fb677c163660e916751ee6c12ad8cddd6dbc011be87b083339083c4ce110e43e0e364d48cdd9da769ffb8617bcff650068b516e03b33d0996ce0
+DIST genpatches-6.6-81.experimental.tar.xz 5760 BLAKE2B 4f4397b8155470626d119604f7e4d392115fec5f32daf924ac34f3b9898707959b04374338d1ff2928c5e766a51647981cae6ad70662419545c7d41f31b66145 SHA512 83f9dc3099511928141881da7389d28751a421b61f63df6807de5283167fad7aca4ae5a87ed2fa7c0f61b89d2f6eaec43e65a5ce4cd70e2e838b3f7da5743103
+DIST genpatches-6.6-81.extras.tar.xz 4056 BLAKE2B f8999d149063deccfd69f06848c39fa87de113d9978b4537e9699b1c9ed5896db929bb28e06919a13c7bf425c5e17438086ab5714b2cff57c0e1a79c097a535f SHA512 99616bba8411fa7a4bf1955abe97612c514f4c299d97b2bbedd467fda98505525545b3a65aa679ffd3171829a99f8d008590503fbdfc14bbb45552b1f85f82ad
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.12.tar.xz 147906904 BLAKE2B b2ec2fc69218cacabbbe49f78384a5d259ca581b717617c12b000b16f4a4c59ee348ea886b37147f5f70fb9a7a01c1e2c8f19021078f6b23f5bc62d1c48d5e5e SHA512 a37b1823df7b4f72542f689b65882634740ba0401a42fdcf6601d9efd2e132e5a7650e70450ba76f6cd1f13ca31180f2ccee9d54fe4df89bc0000ade4380a548
+DIST linux-6.13.tar.xz 148523052 BLAKE2B 9f617ecb3f2393b57ba03c654fea62a7213f24c835989f333a1ef29492af551bfa7d9ad786d5ef1484854adc77c7c6af38fb09a72d994d305695f512c325e77f SHA512 1137e6440132b0958f89165440e99208f82b204e7245ae69dc9c808df97d13ce8f58136db92407e0e93394fa7f6283ec7a34597c6e92a5b6d9025e0960357957
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.230.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.230.ebuild
index a22dd3cd09c1..c44a07ac8116 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.230.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.230.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 @@ 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"
+KEYWORDS="arm arm64 hppa ppc ppc64 sparc"
 IUSE="experimental"
 
 pkg_postinst() {
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.231.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.231.ebuild
deleted file mode 100644
index 4684c7a3059e..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.231.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 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="243"
-
-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/gentoo-sources/gentoo-sources-5.10.233.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.233.ebuild
new file mode 100644
index 000000000000..92e366df762a
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.233.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="245"
+
+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/gentoo-sources/gentoo-sources-5.15.173.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.173.ebuild
index be5519d9f248..f85402223796 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.173.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.173.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 @@ 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"
+KEYWORDS="arm arm64 hppa ppc ppc64 sparc"
 IUSE="experimental"
 
 pkg_postinst() {
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.174.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.174.ebuild
deleted file mode 100644
index 1b4a6f8c1273..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.174.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 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="184"
-
-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/gentoo-sources/gentoo-sources-5.15.176.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.176.ebuild
new file mode 100644
index 000000000000..12a1337779d7
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.176.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"
+K_GENPATCHES_VER="186"
+
+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/gentoo-sources/gentoo-sources-6.1.118.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.118.ebuild
index e7bb490fb1d2..86c261138311 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.1.118.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.118.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 @@ 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"
+KEYWORDS="arm arm64 hppa ppc ppc64 sparc"
 IUSE="experimental"
 
 pkg_postinst() {
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.1.120.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.120.ebuild
deleted file mode 100644
index 92ccda7b6f06..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.1.120.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 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="130"
-
-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/gentoo-sources/gentoo-sources-6.1.122.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.122.ebuild
deleted file mode 100644
index 601b674855b4..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.1.122.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 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="132"
-
-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/gentoo-sources/gentoo-sources-6.1.124.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.124.ebuild
new file mode 100644
index 000000000000..6df72001bc91
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.124.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="134"
+
+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/gentoo-sources/gentoo-sources-6.1.125.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.125.ebuild
new file mode 100644
index 000000000000..c33118374165
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.125.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="135"
+
+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/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/gentoo-sources/gentoo-sources-6.12.10.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.12.10.ebuild
new file mode 100644
index 000000000000..70b97d946b6f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.12.10.ebuild
@@ -0,0 +1,37 @@
+# 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="13"
+
+inherit check-reqs 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="experimental"
+
+pkg_pretend() {
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_pretend
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	rm "${S}/tools/testing/selftests/tc-testing/action-ebpf"
+}
+
+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/gentoo-sources/gentoo-sources-6.12.4-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.12.4-r1.ebuild
deleted file mode 100644
index 14c4de703dbd..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.12.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 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="7"
-
-inherit check-reqs 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="experimental"
-
-pkg_pretend() {
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_pretend
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	rm "${S}/tools/testing/selftests/tc-testing/action-ebpf"
-}
-
-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/gentoo-sources/gentoo-sources-6.12.5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.12.5.ebuild
deleted file mode 100644
index 7f6c00018e71..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.12.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 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="8"
-
-inherit check-reqs 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="experimental"
-
-pkg_pretend() {
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_pretend
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	rm "${S}/tools/testing/selftests/tc-testing/action-ebpf"
-}
-
-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/gentoo-sources/gentoo-sources-6.12.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.12.6.ebuild
deleted file mode 100644
index 5b502897a8b9..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.12.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 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="9"
-
-inherit check-reqs 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="experimental"
-
-pkg_pretend() {
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_pretend
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	rm "${S}/tools/testing/selftests/tc-testing/action-ebpf"
-}
-
-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/gentoo-sources/gentoo-sources-6.12.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.12.7.ebuild
deleted file mode 100644
index 5902913b5fb8..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.12.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 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="10"
-
-inherit check-reqs 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="experimental"
-
-pkg_pretend() {
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_pretend
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	rm "${S}/tools/testing/selftests/tc-testing/action-ebpf"
-}
-
-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/gentoo-sources/gentoo-sources-6.12.9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.12.9.ebuild
new file mode 100644
index 000000000000..1ee85a3b8ddf
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.12.9.ebuild
@@ -0,0 +1,37 @@
+# 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="12"
+
+inherit check-reqs 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="experimental"
+
+pkg_pretend() {
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_pretend
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	rm "${S}/tools/testing/selftests/tc-testing/action-ebpf"
+}
+
+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/gentoo-sources/gentoo-sources-6.13.0.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.13.0.ebuild
new file mode 100644
index 000000000000..e211a761a064
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.13.0.ebuild
@@ -0,0 +1,37 @@
+# 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="1"
+
+inherit check-reqs 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="experimental"
+
+pkg_pretend() {
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_pretend
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	rm "${S}/tools/testing/selftests/tc-testing/action-ebpf"
+}
+
+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/gentoo-sources/gentoo-sources-6.6.62.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.6.62.ebuild
index 8bd2fb825c38..9e92379303f7 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.6.62.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.6.62.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 @@ 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="arm arm64 hppa ~loong ppc ppc64 sparc"
 IUSE="experimental"
 
 pkg_postinst() {
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.6.65.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.6.65.ebuild
deleted file mode 100644
index 43235dca56dd..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.6.65.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 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="73"
-
-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 ~loong ~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/gentoo-sources/gentoo-sources-6.6.66.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.6.66.ebuild
deleted file mode 100644
index f74b5de0543f..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.6.66.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 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="74"
-
-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 ~loong ~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/gentoo-sources/gentoo-sources-6.6.68-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.6.68-r1.ebuild
deleted file mode 100644
index 6b1f616fb494..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.6.68-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 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="77"
-
-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 ~loong ~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/gentoo-sources/gentoo-sources-6.6.68.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.6.68.ebuild
deleted file mode 100644
index e355d5b507d5..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.6.68.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 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="76"
-
-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 ~loong ~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/gentoo-sources/gentoo-sources-6.6.69.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.6.69.ebuild
deleted file mode 100644
index e06bf23c9317..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.6.69.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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="78"
-
-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 ~loong ~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/gentoo-sources/gentoo-sources-6.6.70.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.6.70.ebuild
new file mode 100644
index 000000000000..eb9df5c0f584
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.6.70.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="79"
+
+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 ~loong ~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/gentoo-sources/gentoo-sources-6.6.71.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.6.71.ebuild
new file mode 100644
index 000000000000..ee6d582c70c0
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.6.71.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="80"
+
+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 ~loong ~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/gentoo-sources/gentoo-sources-6.6.72.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.6.72.ebuild
new file mode 100644
index 000000000000..24c22d954f7b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.6.72.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="81"
+
+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 ~loong ~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/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index a3f0c6429680..8db65739e482 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -4,3 +4,5 @@ DIST patch-6.13-rc2.patch 45755252 BLAKE2B 8ab895aba64d944bd79a0d0ccb9fb61cb243b
 DIST patch-6.13-rc3.patch 46670516 BLAKE2B ba0e0bff8c1f32d81b9d5b7fd9f777d3c3b46c7504978ac4d2ec7e66668b1d39ce48ee16b875de0f8a10754237d4ad1944999236a299ee443de05b52deb06a9a SHA512 055ab3a368f3ef1000912c973121d373a108998253240dad1d1ce9cbbc9ecae52a06bab1b89d659a56cce127a9605e46c0997aaeafe01724fcc9df0d63534806
 DIST patch-6.13-rc4.patch 46999276 BLAKE2B db5ffe5407033057000a7b6003e7e33c1df39a00e23687228922bf6d25467eaa4a961b4db0bb7a6ae666ca292a81d16a7c941430531a350d058c7013f462fe4f SHA512 0231c8374a24711345cbf88a4ba5a617c0ab22be42053567d53a5a8cbbde57a0ae6dc27d6e1537daaec72b863888bd87be0ef4f5738f814ec5ecefc20abd1816
 DIST patch-6.13-rc5.patch 47079185 BLAKE2B 72e044c4fa41d44d9c61a695c38f40bd617642ec9e65978128a04ea6a514708a5634d409bf3ca10621b636ae1fee888f916a7454ff13e123e07f06cc0d403f86 SHA512 de639760efbf7a2de077003a81e9d9d1dc20df36d9325799377dc7c608fd68c8f4cb5c14e455f8c0561b63a4cd4fca1e70524eacdd3d53b1a60e86afd1cd4fe5
+DIST patch-6.13-rc6.patch 47284877 BLAKE2B e87ea7991218b210e6c455fb635d28794bedc3130e94d888d19f622f871b45096b165d8d3c4d73dd6a2a992474253a218fd4a812413c2dcffe3b4b39fa8dbda8 SHA512 29121085799cda1359e4bb758118f5decc4ff2e911114a716979a493d7e8c0100a0aef2225dc75bf73043bf56cb48be8b686e02d93a2b4c9984c59c1b2c4c9af
+DIST patch-6.13-rc7.patch 47562050 BLAKE2B a2b02bf5f9b5368f6284af23eb2011052bcdaa5881a996e961427e646d331efa0a84643b97ab2d6cf12852812201f54b659ad53a9c31b90396d39df7dd00d7f3 SHA512 87d9887ea625d712429c99399050f0c25794d982f73d8d941d19330c994bf6ccd31c58b13a6b0e8f9ad2e2b482b28b81f2cd5397faae15d203257f57b4330e71
diff --git a/sys-kernel/git-sources/git-sources-6.13_rc6.ebuild b/sys-kernel/git-sources/git-sources-6.13_rc6.ebuild
new file mode 100644
index 000000000000..31f6629155fc
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-6.13_rc6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="6.12"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+K_NODRYRUN="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.6-r5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/git-sources/git-sources-6.13_rc7.ebuild b/sys-kernel/git-sources/git-sources-6.13_rc7.ebuild
new file mode 100644
index 000000000000..31f6629155fc
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-6.13_rc7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="6.12"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+K_NODRYRUN="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.6-r5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index bedd849b193d..44d56d509dea 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,3 +1,3 @@
-DIST linux-firmware-20241017.tar.xz 397400292 BLAKE2B b158855a61324e3194274b0d6dc146bde2b517915a3f1fe5ddba1cc80fca39d7c0c5058eaaf4189c85cd43f1e432c8ccc9c338fc35cd8289e0d661cc5c321b18 SHA512 2b72f1e7651acc04209ab12841915e1bed5819964d9d31f0be5523ad0ea50b51557687b6005014dff1b1f9caa38038321522b17a5de86ee065961fbb5462b5b6
 DIST linux-firmware-20241110.tar.xz 405593676 BLAKE2B 949fbcc2da08c0cbde6e03613cb820d18c9c2443a8c9769e251958cbc600efa31d8b37d108bd7396c6ea539f972344053f3a3d6ab0f9fd8471f2797b833db765 SHA512 74e5e7ae2fb7af7c69b118ba14dea0ee69d36c3b9a39cf1c87f820410c79af9291b900381eaca6d367caa5207d8cb81ffb88e122a5f68e3fa1f16dbb33d0782e
 DIST linux-firmware-20241210.tar.xz 411440732 BLAKE2B 64e02e1c61bddb154f1434c4ee52de3f990730ad7125620f042b9706d1a721feb950b66a0f8d71606d5cba3c0e665c43b8c29e05e84227b7fdaba62b405ec59c SHA512 852e63a936fb324033d819ff14084787a1ac9af8682487cddea889e85e69b3297e262ebc9a1fe029c2ece4e010bfc067b3c8f7f87cd440b6334975f0d81d1226
+DIST linux-firmware-20250109.tar.xz 411464912 BLAKE2B c23ed6d5e0b8ff80666e2c7f3727b991a51dae251778e9ee6e2ab23f45996fbc75d724fbe148d39a180d50384034a01f538daa2abb4f4f5939a7e9773a684240 SHA512 d7bc9d19e1c03ec75d62903f3c6e79947a10aea61aec8958dfea44cfbeb6fec73f2db41e750cf007a7e937380c5956ed919ae24b8a0a92df87b1d4c57464809d
diff --git a/sys-kernel/linux-firmware/files/linux-firmware-check-whence.patch b/sys-kernel/linux-firmware/files/linux-firmware-check-whence.patch
deleted file mode 100644
index 99b0ddf25a85..000000000000
--- a/sys-kernel/linux-firmware/files/linux-firmware-check-whence.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/check_whence.py b/check_whence.py
-index c3d4a2e38f095ec806a150bf25c5065445ff393f..1fece4f4920a1fdcce7589e54cdc37e1b4c2100c 100755
---- a/check_whence.py
-+++ b/check_whence.py
-@@ -60,9 +60,12 @@ def list_links_list():
- 
- 
- def list_git():
--    with os.popen("git ls-files") as git_files:
--        for line in git_files:
--            yield line.rstrip("\n")
-+    git_files = os.popen("git ls-files")
-+    for line in git_files:
-+        yield line.rstrip("\n")
-+
-+    if git_files.close():
-+        sys.stderr.write("W: git file listing failed, skipping some validation\n")
- 
- 
- def main():
-@@ -135,7 +138,7 @@ def main():
-             )
-             ret = 1
- 
--    for name in sorted(list(known_files - git_files)):
-+    for name in sorted(list(known_files - git_files) if len(git_files) else list()):
-         sys.stderr.write("E: %s listed in WHENCE does not exist\n" % name)
-         ret = 1
- 
-@@ -151,10 +154,10 @@ def main():
-                 break
-             valid_targets.add(dirname)
- 
--    for link, target in sorted(links_list):
-+    for link, target in sorted(links_list if len(git_files) else list()):
-         if target not in valid_targets:
-             sys.stderr.write(
--                "E: target %s of link %s in WHENCE" " does not exist\n" % (target, link)
-+                "E: target %s of link %s in WHENCE does not exist\n" % (target, link)
-             )
-             ret = 1
- 
diff --git a/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r4.patch b/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r4.patch
deleted file mode 100644
index f8b713bfe0f5..000000000000
--- a/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r4.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/copy-firmware.sh	2024-02-24 10:47:41.073251066 -0500
-+++ b/copy-firmware.sh	2024-02-24 10:25:45.283922934 -0500
-@@ -50,6 +50,16 @@ while test $# -gt 0; do
-             shift
-             ;;
- 
-+        --firmware-list)
-+            if [ -n "$2" ]; then
-+                FIRMWARE_LIST=`cat $2`
-+                shift 2
-+            else
-+                echo "ERROR: '--firmware-list' requires a non-empty option argument of firmware files to install"
-+                exit 1
-+            fi
-+            ;;
-+
-         -*)
-             if test "$compress" = "cat"; then
-                 echo "ERROR: unknown command-line option: $1"
-@@ -85,6 +95,7 @@ fi
- # shellcheck disable=SC2162 # file/folder name can include escaped symbols
- grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' | while read k f; do
-     test -f "$f" || continue
-+	   [ -n "${FIRMWARE_LIST}" ]  && if ! echo "${FIRMWARE_LIST}" | grep -q "${f}"; then continue; fi
-     install -d "$destdir/$(dirname "$f")"
-     $verbose "copying/compressing file $f$compext"
-     if test "$compress" != "cat" && test "$k" = "RawFile"; then
-@@ -107,6 +118,7 @@ fi
- 
- # shellcheck disable=SC2162 # file/folder name can include escaped symbols
- grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read f d; do
-+	   [ -n "${FIRMWARE_LIST}" ]  && if ! echo "${FIRMWARE_LIST}" | grep -q "${f}"; then continue; fi
-     if test -L "$f$compext"; then
-         test -f "$destdir/$f$compext" && continue
-         $verbose "copying link $f$compext"
diff --git a/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r8.patch b/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r8.patch
new file mode 100644
index 000000000000..e8eba66cc07c
--- /dev/null
+++ b/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r8.patch
@@ -0,0 +1,57 @@
+--- a/copy-firmware.sh
++++ b/copy-firmware.sh
+@@ -66,6 +66,16 @@
+             shift
+             ;;
+ 
++        --firmware-list)
++            if [ -n "$2" ]; then
++                FIRMWARE_LIST=$2
++                shift 2
++            else
++                echo "ERROR: '--firmware-list' requires a non-empty option argument of firmware files to install"
++                exit 1
++            fi
++            ;;
++
+         *)
+             if test -n "$destdir"; then
+                 err "unknown command-line options: $*"
+@@ -90,8 +100,18 @@
+     ./check_whence.py || err "check_whence.py has detected errors."
+ fi
+ 
++if test -n "${FIRMWARE_LIST}"; then
++    grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read l t; do
++        if ! cat "${FIRMWARE_LIST}" | grep -q "${l}"; then continue; fi
++        target="$(realpath --relative-to="$(pwd)" -m -s "$(dirname "$l")/$t")"
++        echo "${target}" >> "${FIRMWARE_LIST}"
++    done
++    FIRMWARE_LIST=$(cat "${FIRMWARE_LIST}")
++fi
++
+ # shellcheck disable=SC2162 # file/folder name can include escaped symbols
+ grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' | while read k f; do
++    [ -n "${FIRMWARE_LIST}" ]  && if ! echo "${FIRMWARE_LIST}" | grep -q "${f}"; then continue; fi
+     install -d "$destdir/$(dirname "$f")"
+     $verbose "copying/compressing file $f$compext"
+     if test "$compress" != "cat" && test "$k" = "RawFile"; then
+@@ -116,6 +136,7 @@
+ echo > "$parallel_args_file"
+ # shellcheck disable=SC2162 # file/folder name can include escaped symbols
+ grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read l t; do
++    [ -n "${FIRMWARE_LIST}" ]  && if ! echo "${FIRMWARE_LIST}" | grep -q "${l}"; then continue; fi
+     directory="$destdir/$(dirname "$l")"
+     install -d "$directory"
+     target="$(cd "$directory" && realpath -m -s "$t")"
+@@ -141,7 +162,9 @@
+ 
+ # Verify no broken symlinks
+ if test "$(find "$destdir" -xtype l | wc -l)" -ne 0 ; then
+-    err "Broken symlinks found:\n$(find "$destdir" -xtype l)"
++    if  [ -z "${FIRMWARE_LIST}" ]; then
++        err "Broken symlinks found:\n$(find "$destdir" -xtype l)"
++    fi
+ fi
+ 
+ exit 0
diff --git a/sys-kernel/linux-firmware/linux-firmware-20241017-r3.ebuild b/sys-kernel/linux-firmware/linux-firmware-20241017-r3.ebuild
deleted file mode 100644
index a631c9c507f1..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20241017-r3.ebuild
+++ /dev/null
@@ -1,407 +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} )
-inherit dist-kernel-utils linux-info mount-boot python-any-r1 savedconfig
-
-# In case this is a real snapshot, fill in commit below.
-# For normal, tagged releases, leave blank
-MY_COMMIT=""
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
-	if [[ -n "${MY_COMMIT}" ]]; then
-		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${MY_COMMIT}"
-	else
-		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
-	fi
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-	redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
-	unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="bindist compress-xz compress-zstd deduplicate dist-kernel +initramfs +redistributable savedconfig unknown-license"
-REQUIRED_USE="initramfs? ( redistributable )
-	?? ( compress-xz compress-zstd )
-	savedconfig? ( !deduplicate )"
-
-RESTRICT="binchecks strip test
-	!bindist? ( bindist )
-	unknown-license? ( bindist )"
-
-BDEPEND="initramfs? ( app-alternatives/cpio )
-	compress-xz? ( app-arch/xz-utils )
-	compress-zstd? ( app-arch/zstd )
-	deduplicate? ( app-misc/rdfind )
-	${PYTHON_DEPS}"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
-		redistributable? (
-			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-			!sys-block/qla-fc-firmware
-			!sys-firmware/raspberrypi-wifi-ucode
-		)
-		unknown-license? (
-			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-			!sys-firmware/alsa-firmware[alsa_cards_sb16]
-			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-		)
-	)
-	dist-kernel? (
-		virtual/dist-kernel
-		initramfs? (
-			app-alternatives/cpio
-		)
-	)
-"
-IDEPEND="
-	dist-kernel? (
-		initramfs? ( sys-kernel/installkernel )
-	)
-"
-
-QA_PREBUILT="*"
-PATCHES=(
-	"${FILESDIR}"/${PN}-copy-firmware-r6.patch
-	"${FILESDIR}"/${PN}-check-whence.patch
-)
-
-pkg_pretend() {
-	if use initramfs; then
-		if use dist-kernel; then
-			# Check, but don't die because we can fix the problem and then
-			# emerge --config ... to re-run installation.
-			[[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
-		else
-			mount-boot_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	if use compress-xz || use compress-zstd ; then
-		local CONFIG_CHECK
-
-		if kernel_is -ge 5 19; then
-			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS_XZ"
-			use compress-zstd && CONFIG_CHECK="~FW_LOADER_COMPRESS_ZSTD"
-		else
-			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS"
-			if use compress-zstd; then
-				eerror "Kernels <5.19 do not support ZSTD-compressed firmware files"
-			fi
-		fi
-	fi
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		if [[ ${#GIT_COMMIT} -gt 8 ]]; then
-			mv ${PN}-*/ ${P} || die
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${PN}-make-amd-ucode-img.bash" "${T}/make-amd-ucode-img" || die
-	chmod +x "${T}/make-amd-ucode-img" || die
-
-	if use initramfs && ! use dist-kernel; then
-		if [[ -d "${S}/amd-ucode" ]]; then
-			"${T}/make-amd-ucode-img" "${S}" "${S}/amd-ucode" || die
-		else
-			# If this will ever happen something has changed which
-			# must be reviewed
-			die "'${S}/amd-ucode' not found!"
-		fi
-	fi
-
-	# whitelist of misc files
-	local misc_files=(
-		build_packages.py
-		carl9170fw/autogen.sh
-		carl9170fw/genapi.sh
-		contrib/process_linux_firmware.py
-		copy-firmware.sh
-		check_whence.py
-		dedup-firmware.sh
-		LICEN[CS]E.*
-		README.md
-		WHENCE
-	)
-
-	# whitelist of images with a free software license
-	local free_software=(
-		# keyspan_pda (GPL-2+)
-		keyspan_pda/keyspan_pda.fw
-		keyspan_pda/xircom_pgs.fw
-		# dsp56k (GPL-2+)
-		dsp56k/bootstrap.bin
-		# ath9k_htc (BSD GPL-2+ MIT)
-		ath9k_htc/htc_7010-1.4.0.fw
-		ath9k_htc/htc_9271-1.4.0.fw
-		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
-		cis/LA-PCM.cis
-		cis/PCMLM28.cis
-		cis/DP83903.cis
-		cis/NE2K.cis
-		cis/tamarack.cis
-		cis/PE-200.cis
-		cis/PE520.cis
-		cis/3CXEM556.cis
-		cis/3CCFEM556.cis
-		cis/MT5634ZLX.cis
-		cis/RS-COM-2P.cis
-		cis/COMpad2.cis
-		cis/COMpad4.cis
-		# serial_cs (GPL-3)
-		cis/SW_555_SER.cis
-		cis/SW_7xx_SER.cis
-		cis/SW_8xx_SER.cis
-		# dvb-ttpci (GPL-2+)
-		av7110/bootcode.bin
-		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
-		usbdux_firmware.bin
-		usbduxfast_firmware.bin
-		usbduxsigma_firmware.bin
-		# brcmfmac (GPL-2+)
-		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-		brcm/brcmfmac43340-sdio.meegopad-t08.txt
-		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
-		brcm/brcmfmac43430-sdio.AP6212.txt
-		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-		brcm/brcmfmac43430-sdio.MUR1DX.txt
-		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-		# isci (GPL-2)
-		isci/isci_firmware.bin
-		# carl9170 (GPL-2+)
-		carl9170-1.fw
-		# atusb (GPL-2+)
-		atusb/atusb-0.2.dfu
-		atusb/atusb-0.3.dfu
-		atusb/rzusb-0.3.bin
-		# mlxsw_spectrum (dual BSD/GPL-2)
-		mellanox/mlxsw_spectrum-13.1420.122.mfa2
-		mellanox/mlxsw_spectrum-13.1530.152.mfa2
-		mellanox/mlxsw_spectrum-13.1620.192.mfa2
-		mellanox/mlxsw_spectrum-13.1702.6.mfa2
-		mellanox/mlxsw_spectrum-13.1703.4.mfa2
-		mellanox/mlxsw_spectrum-13.1910.622.mfa2
-		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-	)
-
-	# blacklist of images with unknown license
-	local unknown_license=(
-		korg/k1212.dsp
-		ess/maestro3_assp_kernel.fw
-		ess/maestro3_assp_minisrc.fw
-		yamaha/ds1_ctrl.fw
-		yamaha/ds1_dsp.fw
-		yamaha/ds1e_ctrl.fw
-		ttusb-budget/dspbootcode.bin
-		emi62/bitstream.fw
-		emi62/loader.fw
-		emi62/midi.fw
-		emi62/spdif.fw
-		ti_3410.fw
-		ti_5052.fw
-		mts_mt9234mu.fw
-		mts_mt9234zba.fw
-		whiteheat.fw
-		whiteheat_loader.fw
-		cpia2/stv0672_vp4.bin
-		vicam/firmware.fw
-		edgeport/boot.fw
-		edgeport/boot2.fw
-		edgeport/down.fw
-		edgeport/down2.fw
-		edgeport/down3.bin
-		sb16/mulaw_main.csp
-		sb16/alaw_main.csp
-		sb16/ima_adpcm_init.csp
-		sb16/ima_adpcm_playback.csp
-		sb16/ima_adpcm_capture.csp
-		sun/cassini.bin
-		acenic/tg1.bin
-		acenic/tg2.bin
-		adaptec/starfire_rx.bin
-		adaptec/starfire_tx.bin
-		yam/1200.bin
-		yam/9600.bin
-		ositech/Xilinx7OD.bin
-		qlogic/isp1000.bin
-		myricom/lanai.bin
-		yamaha/yss225_registers.bin
-		lgs8g75.fw
-	)
-
-	if use !unknown-license; then
-		einfo "Removing files with unknown license ..."
-		rm -v "${unknown_license[@]}" || die
-	fi
-
-	if use !redistributable; then
-		# remove files _not_ in the free_software or unknown_license lists
-		# everything else is confirmed (or assumed) to be redistributable
-		# based on upstream acceptance policy
-		einfo "Removing non-redistributable files ..."
-		local OLDIFS="${IFS}"
-		local IFS=$'\n'
-		set -o pipefail
-		find ! -type d -printf "%P\n" \
-			| grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \
-			| xargs -d '\n' --no-run-if-empty rm -v
-
-		[[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files"
-
-		IFS="${OLDIFS}"
-	fi
-
-	restore_config ${PN}.conf
-}
-
-src_install() {
-
-	local FW_OPTIONS=( "-v" )
-	local files_to_keep=
-
-	if use savedconfig; then
-		if [[ -s "${S}/${PN}.conf" ]]; then
-			files_to_keep="${T}/files_to_keep.lst"
-			grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die
-			[[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?"
-			FW_OPTIONS+=( "--firmware-list" "${files_to_keep}" )
-		fi
-	fi
-
-	if use compress-xz; then
-		FW_OPTIONS+=( "--xz" )
-	elif use compress-zstd; then
-		FW_OPTIONS+=( "--zstd" )
-	fi
-	FW_OPTIONS+=( "${ED}/lib/firmware" )
-	./copy-firmware.sh "${FW_OPTIONS[@]}" || die
-	use deduplicate && { ./dedup-firmware.sh "${ED}/lib/firmware" || die; }
-
-	pushd "${ED}/lib/firmware" &>/dev/null || die
-
-	# especially use !redistributable will cause some broken symlinks
-	einfo "Removing broken symlinks ..."
-	find * -xtype l -print -delete || die
-
-	# remove empty directories, bug #396073
-	find -type d -empty -delete || die
-
-	# sanity check
-	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
-		eerror "No files to install. Check your USE flag settings"
-		eerror "and the list of files in your saved configuration."
-		die "Refusing to install an empty package"
-	fi
-
-	# create config file
-	echo "# Remove files that shall not be installed from this list." > "${S}"/${PN}.conf || die
-	find * ! -type d >> "${S}"/${PN}.conf || die
-	save_config "${S}"/${PN}.conf
-
-	popd &>/dev/null || die
-
-	# Instruct Dracut on whether or not we want the microcode in initramfs
-	(
-		insinto /usr/lib/dracut/dracut.conf.d
-		newins - 10-${PN}.conf <<<"early_microcode=$(usex initramfs)"
-	)
-	if use initramfs; then
-		# Install installkernel/kernel-install hooks for non-dracut initramfs
-		# generators that don't bundled the microcode
-		dobin "${T}/make-amd-ucode-img"
-		(
-			exeinto /usr/lib/kernel/preinst.d
-			doexe "${FILESDIR}/35-amd-microcode.install"
-			exeinto /usr/lib/kernel/install.d
-			doexe "${FILESDIR}/35-amd-microcode-systemd.install"
-		)
-	fi
-
-	if use initramfs && ! use dist-kernel; then
-		insinto /boot
-		doins "${S}"/amd-uc.img
-	fi
-
-	dodoc README.md
-	# some licenses require copyright and permission notice to be included
-	use bindist && dodoc WHENCE LICEN[CS]E.*
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-
-	# Fix 'symlink is blocked by a directory' Bug #871315
-	if has_version "<${CATEGORY}/${PN}-20220913-r2" ; then
-		rm -rf "${EROOT}"/lib/firmware/qcom/LENOVO/21BX
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && ! use dist-kernel && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${ver} -lt 20190514; then
-			elog
-			elog 'Starting with version 20190514, installation of many firmware'
-			elog 'files is controlled by USE flags. Please review your USE flag'
-			elog 'and package.license settings if you are missing some files.'
-			break
-		fi
-	done
-
-	if use initramfs; then
-		if use dist-kernel; then
-			[[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-		else
-			# Don't forget to umount /boot if it was previously mounted by us.
-			mount-boot_pkg_postinst
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
-	use initramfs && ! use dist-kernel && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && ! use dist-kernel && mount-boot_pkg_postrm
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20241110.ebuild b/sys-kernel/linux-firmware/linux-firmware-20241110.ebuild
index e9871c3b719c..c9ea9c688a9a 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20241110.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20241110.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
@@ -82,7 +82,7 @@ pkg_pretend() {
 		if use dist-kernel; then
 			# Check, but don't die because we can fix the problem and then
 			# emerge --config ... to re-run installation.
-			[[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
+			nonfatal mount-boot_check_status
 		else
 			mount-boot_pkg_pretend
 		fi
@@ -387,7 +387,7 @@ pkg_postinst() {
 
 	if use initramfs; then
 		if use dist-kernel; then
-			[[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
 		else
 			# Don't forget to umount /boot if it was previously mounted by us.
 			mount-boot_pkg_postinst
diff --git a/sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild
index 4f68f0a8809f..ec4a3c1f8df9 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20241210-r1.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
@@ -82,7 +82,7 @@ pkg_pretend() {
 		if use dist-kernel; then
 			# Check, but don't die because we can fix the problem and then
 			# emerge --config ... to re-run installation.
-			[[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
+			nonfatal mount-boot_check_status
 		else
 			mount-boot_pkg_pretend
 		fi
@@ -387,7 +387,7 @@ pkg_postinst() {
 
 	if use initramfs; then
 		if use dist-kernel; then
-			[[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
 		else
 			# Don't forget to umount /boot if it was previously mounted by us.
 			mount-boot_pkg_postinst
diff --git a/sys-kernel/linux-firmware/linux-firmware-20241210.ebuild b/sys-kernel/linux-firmware/linux-firmware-20241210.ebuild
deleted file mode 100644
index e9871c3b719c..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20241210.ebuild
+++ /dev/null
@@ -1,406 +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} )
-inherit dist-kernel-utils linux-info mount-boot python-any-r1 savedconfig
-
-# In case this is a real snapshot, fill in commit below.
-# For normal, tagged releases, leave blank
-MY_COMMIT=""
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
-	if [[ -n "${MY_COMMIT}" ]]; then
-		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${MY_COMMIT}"
-	else
-		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
-	fi
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-	redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
-	unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="bindist compress-xz compress-zstd deduplicate dist-kernel +initramfs +redistributable savedconfig unknown-license"
-REQUIRED_USE="initramfs? ( redistributable )
-	?? ( compress-xz compress-zstd )
-	savedconfig? ( !deduplicate )"
-
-RESTRICT="binchecks strip test
-	!bindist? ( bindist )
-	unknown-license? ( bindist )"
-
-BDEPEND="initramfs? ( app-alternatives/cpio )
-	compress-xz? ( app-arch/xz-utils )
-	compress-zstd? ( app-arch/zstd )
-	deduplicate? ( app-misc/rdfind )
-	${PYTHON_DEPS}"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
-		redistributable? (
-			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-			!sys-block/qla-fc-firmware
-			!sys-firmware/raspberrypi-wifi-ucode
-		)
-		unknown-license? (
-			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-			!sys-firmware/alsa-firmware[alsa_cards_sb16]
-			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-		)
-	)
-	dist-kernel? (
-		virtual/dist-kernel
-		initramfs? (
-			app-alternatives/cpio
-		)
-	)
-"
-IDEPEND="
-	dist-kernel? (
-		initramfs? ( sys-kernel/installkernel )
-	)
-"
-
-QA_PREBUILT="*"
-PATCHES=(
-	"${FILESDIR}"/${PN}-copy-firmware-r6.patch
-)
-
-pkg_pretend() {
-	if use initramfs; then
-		if use dist-kernel; then
-			# Check, but don't die because we can fix the problem and then
-			# emerge --config ... to re-run installation.
-			[[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
-		else
-			mount-boot_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	if use compress-xz || use compress-zstd ; then
-		local CONFIG_CHECK
-
-		if kernel_is -ge 5 19; then
-			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS_XZ"
-			use compress-zstd && CONFIG_CHECK="~FW_LOADER_COMPRESS_ZSTD"
-		else
-			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS"
-			if use compress-zstd; then
-				eerror "Kernels <5.19 do not support ZSTD-compressed firmware files"
-			fi
-		fi
-	fi
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		if [[ ${#GIT_COMMIT} -gt 8 ]]; then
-			mv ${PN}-*/ ${P} || die
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${PN}-make-amd-ucode-img.bash" "${T}/make-amd-ucode-img" || die
-	chmod +x "${T}/make-amd-ucode-img" || die
-
-	if use initramfs && ! use dist-kernel; then
-		if [[ -d "${S}/amd-ucode" ]]; then
-			"${T}/make-amd-ucode-img" "${S}" "${S}/amd-ucode" || die
-		else
-			# If this will ever happen something has changed which
-			# must be reviewed
-			die "'${S}/amd-ucode' not found!"
-		fi
-	fi
-
-	# whitelist of misc files
-	local misc_files=(
-		build_packages.py
-		carl9170fw/autogen.sh
-		carl9170fw/genapi.sh
-		contrib/process_linux_firmware.py
-		copy-firmware.sh
-		check_whence.py
-		dedup-firmware.sh
-		LICEN[CS]E.*
-		README.md
-		WHENCE
-	)
-
-	# whitelist of images with a free software license
-	local free_software=(
-		# keyspan_pda (GPL-2+)
-		keyspan_pda/keyspan_pda.fw
-		keyspan_pda/xircom_pgs.fw
-		# dsp56k (GPL-2+)
-		dsp56k/bootstrap.bin
-		# ath9k_htc (BSD GPL-2+ MIT)
-		ath9k_htc/htc_7010-1.4.0.fw
-		ath9k_htc/htc_9271-1.4.0.fw
-		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
-		cis/LA-PCM.cis
-		cis/PCMLM28.cis
-		cis/DP83903.cis
-		cis/NE2K.cis
-		cis/tamarack.cis
-		cis/PE-200.cis
-		cis/PE520.cis
-		cis/3CXEM556.cis
-		cis/3CCFEM556.cis
-		cis/MT5634ZLX.cis
-		cis/RS-COM-2P.cis
-		cis/COMpad2.cis
-		cis/COMpad4.cis
-		# serial_cs (GPL-3)
-		cis/SW_555_SER.cis
-		cis/SW_7xx_SER.cis
-		cis/SW_8xx_SER.cis
-		# dvb-ttpci (GPL-2+)
-		av7110/bootcode.bin
-		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
-		usbdux_firmware.bin
-		usbduxfast_firmware.bin
-		usbduxsigma_firmware.bin
-		# brcmfmac (GPL-2+)
-		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-		brcm/brcmfmac43340-sdio.meegopad-t08.txt
-		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
-		brcm/brcmfmac43430-sdio.AP6212.txt
-		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-		brcm/brcmfmac43430-sdio.MUR1DX.txt
-		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-		# isci (GPL-2)
-		isci/isci_firmware.bin
-		# carl9170 (GPL-2+)
-		carl9170-1.fw
-		# atusb (GPL-2+)
-		atusb/atusb-0.2.dfu
-		atusb/atusb-0.3.dfu
-		atusb/rzusb-0.3.bin
-		# mlxsw_spectrum (dual BSD/GPL-2)
-		mellanox/mlxsw_spectrum-13.1420.122.mfa2
-		mellanox/mlxsw_spectrum-13.1530.152.mfa2
-		mellanox/mlxsw_spectrum-13.1620.192.mfa2
-		mellanox/mlxsw_spectrum-13.1702.6.mfa2
-		mellanox/mlxsw_spectrum-13.1703.4.mfa2
-		mellanox/mlxsw_spectrum-13.1910.622.mfa2
-		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-	)
-
-	# blacklist of images with unknown license
-	local unknown_license=(
-		korg/k1212.dsp
-		ess/maestro3_assp_kernel.fw
-		ess/maestro3_assp_minisrc.fw
-		yamaha/ds1_ctrl.fw
-		yamaha/ds1_dsp.fw
-		yamaha/ds1e_ctrl.fw
-		ttusb-budget/dspbootcode.bin
-		emi62/bitstream.fw
-		emi62/loader.fw
-		emi62/midi.fw
-		emi62/spdif.fw
-		ti_3410.fw
-		ti_5052.fw
-		mts_mt9234mu.fw
-		mts_mt9234zba.fw
-		whiteheat.fw
-		whiteheat_loader.fw
-		cpia2/stv0672_vp4.bin
-		vicam/firmware.fw
-		edgeport/boot.fw
-		edgeport/boot2.fw
-		edgeport/down.fw
-		edgeport/down2.fw
-		edgeport/down3.bin
-		sb16/mulaw_main.csp
-		sb16/alaw_main.csp
-		sb16/ima_adpcm_init.csp
-		sb16/ima_adpcm_playback.csp
-		sb16/ima_adpcm_capture.csp
-		sun/cassini.bin
-		acenic/tg1.bin
-		acenic/tg2.bin
-		adaptec/starfire_rx.bin
-		adaptec/starfire_tx.bin
-		yam/1200.bin
-		yam/9600.bin
-		ositech/Xilinx7OD.bin
-		qlogic/isp1000.bin
-		myricom/lanai.bin
-		yamaha/yss225_registers.bin
-		lgs8g75.fw
-	)
-
-	if use !unknown-license; then
-		einfo "Removing files with unknown license ..."
-		rm -v "${unknown_license[@]}" || die
-	fi
-
-	if use !redistributable; then
-		# remove files _not_ in the free_software or unknown_license lists
-		# everything else is confirmed (or assumed) to be redistributable
-		# based on upstream acceptance policy
-		einfo "Removing non-redistributable files ..."
-		local OLDIFS="${IFS}"
-		local IFS=$'\n'
-		set -o pipefail
-		find ! -type d -printf "%P\n" \
-			| grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \
-			| xargs -d '\n' --no-run-if-empty rm -v
-
-		[[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files"
-
-		IFS="${OLDIFS}"
-	fi
-
-	restore_config ${PN}.conf
-}
-
-src_install() {
-
-	local FW_OPTIONS=( "-v" )
-	local files_to_keep=
-
-	if use savedconfig; then
-		if [[ -s "${S}/${PN}.conf" ]]; then
-			files_to_keep="${T}/files_to_keep.lst"
-			grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die
-			[[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?"
-			FW_OPTIONS+=( "--firmware-list" "${files_to_keep}" )
-		fi
-	fi
-
-	if use compress-xz; then
-		FW_OPTIONS+=( "--xz" )
-	elif use compress-zstd; then
-		FW_OPTIONS+=( "--zstd" )
-	fi
-	FW_OPTIONS+=( "${ED}/lib/firmware" )
-	./copy-firmware.sh "${FW_OPTIONS[@]}" || die
-	use deduplicate && { ./dedup-firmware.sh "${ED}/lib/firmware" || die; }
-
-	pushd "${ED}/lib/firmware" &>/dev/null || die
-
-	# especially use !redistributable will cause some broken symlinks
-	einfo "Removing broken symlinks ..."
-	find * -xtype l -print -delete || die
-
-	# remove empty directories, bug #396073
-	find -type d -empty -delete || die
-
-	# sanity check
-	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
-		eerror "No files to install. Check your USE flag settings"
-		eerror "and the list of files in your saved configuration."
-		die "Refusing to install an empty package"
-	fi
-
-	# create config file
-	echo "# Remove files that shall not be installed from this list." > "${S}"/${PN}.conf || die
-	find * ! -type d >> "${S}"/${PN}.conf || die
-	save_config "${S}"/${PN}.conf
-
-	popd &>/dev/null || die
-
-	# Instruct Dracut on whether or not we want the microcode in initramfs
-	(
-		insinto /usr/lib/dracut/dracut.conf.d
-		newins - 10-${PN}.conf <<<"early_microcode=$(usex initramfs)"
-	)
-	if use initramfs; then
-		# Install installkernel/kernel-install hooks for non-dracut initramfs
-		# generators that don't bundled the microcode
-		dobin "${T}/make-amd-ucode-img"
-		(
-			exeinto /usr/lib/kernel/preinst.d
-			doexe "${FILESDIR}/35-amd-microcode.install"
-			exeinto /usr/lib/kernel/install.d
-			doexe "${FILESDIR}/35-amd-microcode-systemd.install"
-		)
-	fi
-
-	if use initramfs && ! use dist-kernel; then
-		insinto /boot
-		doins "${S}"/amd-uc.img
-	fi
-
-	dodoc README.md
-	# some licenses require copyright and permission notice to be included
-	use bindist && dodoc WHENCE LICEN[CS]E.*
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-
-	# Fix 'symlink is blocked by a directory' Bug #871315
-	if has_version "<${CATEGORY}/${PN}-20220913-r2" ; then
-		rm -rf "${EROOT}"/lib/firmware/qcom/LENOVO/21BX
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && ! use dist-kernel && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${ver} -lt 20190514; then
-			elog
-			elog 'Starting with version 20190514, installation of many firmware'
-			elog 'files is controlled by USE flags. Please review your USE flag'
-			elog 'and package.license settings if you are missing some files.'
-			break
-		fi
-	done
-
-	if use initramfs; then
-		if use dist-kernel; then
-			[[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-		else
-			# Don't forget to umount /boot if it was previously mounted by us.
-			mount-boot_pkg_postinst
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
-	use initramfs && ! use dist-kernel && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && ! use dist-kernel && mount-boot_pkg_postrm
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20250109-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20250109-r1.ebuild
new file mode 100644
index 000000000000..e3634c283c9f
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20250109-r1.ebuild
@@ -0,0 +1,406 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+inherit dist-kernel-utils linux-info mount-boot python-any-r1 savedconfig
+
+# In case this is a real snapshot, fill in commit below.
+# For normal, tagged releases, leave blank
+MY_COMMIT=""
+
+if [[ ${PV} == 99999999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+else
+	if [[ -n "${MY_COMMIT}" ]]; then
+		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${MY_COMMIT}"
+	else
+		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
+	fi
+
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+fi
+
+DESCRIPTION="Linux firmware files"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
+
+LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
+	redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
+	unknown-license? ( all-rights-reserved )"
+SLOT="0"
+IUSE="bindist compress-xz compress-zstd deduplicate dist-kernel +initramfs +redistributable savedconfig unknown-license"
+REQUIRED_USE="initramfs? ( redistributable )
+	?? ( compress-xz compress-zstd )
+	savedconfig? ( !deduplicate )"
+
+RESTRICT="binchecks strip test
+	!bindist? ( bindist )
+	unknown-license? ( bindist )"
+
+BDEPEND="initramfs? ( app-alternatives/cpio )
+	compress-xz? ( app-arch/xz-utils )
+	compress-zstd? ( app-arch/zstd )
+	deduplicate? ( app-misc/rdfind )
+	${PYTHON_DEPS}"
+
+#add anything else that collides to this
+RDEPEND="!savedconfig? (
+		redistributable? (
+			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
+			!sys-block/qla-fc-firmware
+			!sys-firmware/raspberrypi-wifi-ucode
+		)
+		unknown-license? (
+			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
+			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
+			!sys-firmware/alsa-firmware[alsa_cards_sb16]
+			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
+		)
+	)
+	dist-kernel? (
+		virtual/dist-kernel
+		initramfs? (
+			app-alternatives/cpio
+		)
+	)
+"
+IDEPEND="
+	dist-kernel? (
+		initramfs? ( sys-kernel/installkernel )
+	)
+"
+
+QA_PREBUILT="*"
+PATCHES=(
+	"${FILESDIR}"/${PN}-copy-firmware-r8.patch
+)
+
+pkg_pretend() {
+	if use initramfs; then
+		if use dist-kernel; then
+			# Check, but don't die because we can fix the problem and then
+			# emerge --config ... to re-run installation.
+			nonfatal mount-boot_check_status
+		else
+			mount-boot_pkg_pretend
+		fi
+	fi
+}
+
+pkg_setup() {
+	if use compress-xz || use compress-zstd ; then
+		local CONFIG_CHECK
+
+		if kernel_is -ge 5 19; then
+			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS_XZ"
+			use compress-zstd && CONFIG_CHECK="~FW_LOADER_COMPRESS_ZSTD"
+		else
+			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS"
+			if use compress-zstd; then
+				eerror "Kernels <5.19 do not support ZSTD-compressed firmware files"
+			fi
+		fi
+	fi
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 99999999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# rename directory from git snapshot tarball
+		if [[ ${#GIT_COMMIT} -gt 8 ]]; then
+			mv ${PN}-*/ ${P} || die
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${PN}-make-amd-ucode-img.bash" "${T}/make-amd-ucode-img" || die
+	chmod +x "${T}/make-amd-ucode-img" || die
+
+	if use initramfs && ! use dist-kernel; then
+		if [[ -d "${S}/amd-ucode" ]]; then
+			"${T}/make-amd-ucode-img" "${S}" "${S}/amd-ucode" || die
+		else
+			# If this will ever happen something has changed which
+			# must be reviewed
+			die "'${S}/amd-ucode' not found!"
+		fi
+	fi
+
+	# whitelist of misc files
+	local misc_files=(
+		build_packages.py
+		carl9170fw/autogen.sh
+		carl9170fw/genapi.sh
+		contrib/process_linux_firmware.py
+		copy-firmware.sh
+		check_whence.py
+		dedup-firmware.sh
+		LICEN[CS]E.*
+		README.md
+		WHENCE
+	)
+
+	# whitelist of images with a free software license
+	local free_software=(
+		# keyspan_pda (GPL-2+)
+		keyspan_pda/keyspan_pda.fw
+		keyspan_pda/xircom_pgs.fw
+		# dsp56k (GPL-2+)
+		dsp56k/bootstrap.bin
+		# ath9k_htc (BSD GPL-2+ MIT)
+		ath9k_htc/htc_7010-1.4.0.fw
+		ath9k_htc/htc_9271-1.4.0.fw
+		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
+		cis/LA-PCM.cis
+		cis/PCMLM28.cis
+		cis/DP83903.cis
+		cis/NE2K.cis
+		cis/tamarack.cis
+		cis/PE-200.cis
+		cis/PE520.cis
+		cis/3CXEM556.cis
+		cis/3CCFEM556.cis
+		cis/MT5634ZLX.cis
+		cis/RS-COM-2P.cis
+		cis/COMpad2.cis
+		cis/COMpad4.cis
+		# serial_cs (GPL-3)
+		cis/SW_555_SER.cis
+		cis/SW_7xx_SER.cis
+		cis/SW_8xx_SER.cis
+		# dvb-ttpci (GPL-2+)
+		av7110/bootcode.bin
+		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
+		usbdux_firmware.bin
+		usbduxfast_firmware.bin
+		usbduxsigma_firmware.bin
+		# brcmfmac (GPL-2+)
+		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
+		brcm/brcmfmac43340-sdio.meegopad-t08.txt
+		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
+		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
+		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
+		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
+		brcm/brcmfmac43430-sdio.AP6212.txt
+		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
+		brcm/brcmfmac43430-sdio.MUR1DX.txt
+		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
+		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
+		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
+		# isci (GPL-2)
+		isci/isci_firmware.bin
+		# carl9170 (GPL-2+)
+		carl9170-1.fw
+		# atusb (GPL-2+)
+		atusb/atusb-0.2.dfu
+		atusb/atusb-0.3.dfu
+		atusb/rzusb-0.3.bin
+		# mlxsw_spectrum (dual BSD/GPL-2)
+		mellanox/mlxsw_spectrum-13.1420.122.mfa2
+		mellanox/mlxsw_spectrum-13.1530.152.mfa2
+		mellanox/mlxsw_spectrum-13.1620.192.mfa2
+		mellanox/mlxsw_spectrum-13.1702.6.mfa2
+		mellanox/mlxsw_spectrum-13.1703.4.mfa2
+		mellanox/mlxsw_spectrum-13.1910.622.mfa2
+		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
+	)
+
+	# blacklist of images with unknown license
+	local unknown_license=(
+		korg/k1212.dsp
+		ess/maestro3_assp_kernel.fw
+		ess/maestro3_assp_minisrc.fw
+		yamaha/ds1_ctrl.fw
+		yamaha/ds1_dsp.fw
+		yamaha/ds1e_ctrl.fw
+		ttusb-budget/dspbootcode.bin
+		emi62/bitstream.fw
+		emi62/loader.fw
+		emi62/midi.fw
+		emi62/spdif.fw
+		ti_3410.fw
+		ti_5052.fw
+		mts_mt9234mu.fw
+		mts_mt9234zba.fw
+		whiteheat.fw
+		whiteheat_loader.fw
+		cpia2/stv0672_vp4.bin
+		vicam/firmware.fw
+		edgeport/boot.fw
+		edgeport/boot2.fw
+		edgeport/down.fw
+		edgeport/down2.fw
+		edgeport/down3.bin
+		sb16/mulaw_main.csp
+		sb16/alaw_main.csp
+		sb16/ima_adpcm_init.csp
+		sb16/ima_adpcm_playback.csp
+		sb16/ima_adpcm_capture.csp
+		sun/cassini.bin
+		acenic/tg1.bin
+		acenic/tg2.bin
+		adaptec/starfire_rx.bin
+		adaptec/starfire_tx.bin
+		yam/1200.bin
+		yam/9600.bin
+		ositech/Xilinx7OD.bin
+		qlogic/isp1000.bin
+		myricom/lanai.bin
+		yamaha/yss225_registers.bin
+		lgs8g75.fw
+	)
+
+	if use !unknown-license; then
+		einfo "Removing files with unknown license ..."
+		rm -v "${unknown_license[@]}" || die
+	fi
+
+	if use !redistributable; then
+		# remove files _not_ in the free_software or unknown_license lists
+		# everything else is confirmed (or assumed) to be redistributable
+		# based on upstream acceptance policy
+		einfo "Removing non-redistributable files ..."
+		local OLDIFS="${IFS}"
+		local IFS=$'\n'
+		set -o pipefail
+		find ! -type d -printf "%P\n" \
+			| grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \
+			| xargs -d '\n' --no-run-if-empty rm -v
+
+		[[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files"
+
+		IFS="${OLDIFS}"
+	fi
+
+	restore_config ${PN}.conf
+}
+
+src_install() {
+
+	local FW_OPTIONS=( "-v" "-j1" )
+	local files_to_keep=
+
+	if use savedconfig; then
+		if [[ -s "${S}/${PN}.conf" ]]; then
+			files_to_keep="${T}/files_to_keep.lst"
+			grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die
+			[[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?"
+			FW_OPTIONS+=( "--firmware-list" "${files_to_keep}" )
+		fi
+	fi
+
+	if use compress-xz; then
+		FW_OPTIONS+=( "--xz" )
+	elif use compress-zstd; then
+		FW_OPTIONS+=( "--zstd" )
+	fi
+	FW_OPTIONS+=( "${ED}/lib/firmware" )
+	./copy-firmware.sh "${FW_OPTIONS[@]}" || die
+	use deduplicate && { ./dedup-firmware.sh "${ED}/lib/firmware" || die; }
+
+	pushd "${ED}/lib/firmware" &>/dev/null || die
+
+	# especially use !redistributable will cause some broken symlinks
+	einfo "Removing broken symlinks ..."
+	find * -xtype l -print -delete || die
+
+	# remove empty directories, bug #396073
+	find -type d -empty -delete || die
+
+	# sanity check
+	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
+		eerror "No files to install. Check your USE flag settings"
+		eerror "and the list of files in your saved configuration."
+		die "Refusing to install an empty package"
+	fi
+
+	# create config file
+	echo "# Remove files that shall not be installed from this list." > "${S}"/${PN}.conf || die
+	find * ! -type d >> "${S}"/${PN}.conf || die
+	save_config "${S}"/${PN}.conf
+
+	popd &>/dev/null || die
+
+	# Instruct Dracut on whether or not we want the microcode in initramfs
+	(
+		insinto /usr/lib/dracut/dracut.conf.d
+		newins - 10-${PN}.conf <<<"early_microcode=$(usex initramfs)"
+	)
+	if use initramfs; then
+		# Install installkernel/kernel-install hooks for non-dracut initramfs
+		# generators that don't bundled the microcode
+		dobin "${T}/make-amd-ucode-img"
+		(
+			exeinto /usr/lib/kernel/preinst.d
+			doexe "${FILESDIR}/35-amd-microcode.install"
+			exeinto /usr/lib/kernel/install.d
+			doexe "${FILESDIR}/35-amd-microcode-systemd.install"
+		)
+	fi
+
+	if use initramfs && ! use dist-kernel; then
+		insinto /boot
+		doins "${S}"/amd-uc.img
+	fi
+
+	dodoc README.md
+	# some licenses require copyright and permission notice to be included
+	use bindist && dodoc WHENCE LICEN[CS]E.*
+}
+
+pkg_preinst() {
+	if use savedconfig; then
+		ewarn "USE=savedconfig is active. You must handle file collisions manually."
+	fi
+
+	# Fix 'symlink is blocked by a directory' Bug #871315
+	if has_version "<${CATEGORY}/${PN}-20220913-r2" ; then
+		rm -rf "${EROOT}"/lib/firmware/qcom/LENOVO/21BX
+	fi
+
+	# Make sure /boot is available if needed.
+	use initramfs && ! use dist-kernel && mount-boot_pkg_preinst
+}
+
+pkg_postinst() {
+	elog "If you are only interested in particular firmware files, edit the saved"
+	elog "configfile and remove those that you do not want."
+
+	local ver
+	for ver in ${REPLACING_VERSIONS}; do
+		if ver_test ${ver} -lt 20190514; then
+			elog
+			elog 'Starting with version 20190514, installation of many firmware'
+			elog 'files is controlled by USE flags. Please review your USE flag'
+			elog 'and package.license settings if you are missing some files.'
+			break
+		fi
+	done
+
+	if use initramfs; then
+		if use dist-kernel; then
+			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+		else
+			# Don't forget to umount /boot if it was previously mounted by us.
+			mount-boot_pkg_postinst
+		fi
+	fi
+}
+
+pkg_prerm() {
+	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
+	use initramfs && ! use dist-kernel && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && ! use dist-kernel && mount-boot_pkg_postrm
+}
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 2e4486362db9..e81d2971c476 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.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
@@ -73,7 +73,7 @@ IDEPEND="
 
 QA_PREBUILT="*"
 PATCHES=(
-	"${FILESDIR}"/${PN}-copy-firmware-r7.patch
+	"${FILESDIR}"/${PN}-copy-firmware-r8.patch
 )
 
 pkg_pretend() {
@@ -81,7 +81,7 @@ pkg_pretend() {
 		if use dist-kernel; then
 			# Check, but don't die because we can fix the problem and then
 			# emerge --config ... to re-run installation.
-			[[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
+			nonfatal mount-boot_check_status
 		else
 			mount-boot_pkg_pretend
 		fi
@@ -232,7 +232,7 @@ src_prepare() {
 
 src_install() {
 
-	local FW_OPTIONS=( "-v" )
+	local FW_OPTIONS=( "-v" "-j1" )
 	git config --global --add safe.directory "${S}" || die
 	local files_to_keep=
 
@@ -381,7 +381,7 @@ pkg_postinst() {
 
 	if use initramfs; then
 		if use dist-kernel; then
-			[[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
 		else
 			# Don't forget to umount /boot if it was previously mounted by us.
 			mount-boot_pkg_postinst
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index dbeca7c88bcb..1299fd462611 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,6 +1,6 @@
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST mips-sources-4.19.0-patches-v4.tar.xz 290848 BLAKE2B d9e62dac357de63c57e330dfac80d2e841ba6120a33da3b500de8116696e7a3f5c709750c5a730dea72955b356609de4465aa3783f1cf58e6d489841534e804f SHA512 cebf8480b9c5b3a7024a5b3413fd026315b4b64ed9ec559f653986925ec48ff363b1e1bf4ef540a68164957a70a9a524034acf921a2a6147bc6abe58515795c2
+DIST mips-sources-4.19.0-patches-v5.tar.xz 290808 BLAKE2B 0acdb1847e9b4bf2eb68c9425d107da82f1aeb2df81d63f32c7314a4e7d68f8e7ecc09c2ffc5689dcfa5a1234d0977843d7a0e6daf1211753867035e44ef83f9 SHA512 19248c9b1c392f6e50ab1084ac1103081e4fa9f652b491924f5276bc0b1b3f5009a1e2a4d7ea3f7ca2c65d142228c0758be7eabd5504bafeaae51aa6153fb88b
 DIST mips-sources-5.4-patches-v8.tar.xz 199164 BLAKE2B 854536301e0256a00319e0ede47c8f0ff240fac54f56dc8cdfbdd7a7fbd13b603700215ac7ac36067f7798a3a13e5786f2b1b9e8dadf671e325ffba6b4e01c12 SHA512 11d04b4e5fd529302ab7571027261154282cd1b0fef525934f94d39d975c522e3e162720abeb13bdb10c0055802e7a719caf559bac11d0cca5a0f90181cd8fa0
-DIST patch-4.19.319.xz 6095628 BLAKE2B 0ddb2cd30c81f6d428e189373f83328633d2f19259099281e90535ccbb86451085b9cc708da2aa06de8e70f99bdaa8b081efd982117ffebd9f36f40ff8266d20 SHA512 23fbe058022e5d3128175d5d20d7fc2a4c32b5da6cda81c2c3e23ecd22c708ce14776858276de7d1a3e08907d64768632d3540bbbb663363564bf2bdda94fa39
-DIST patch-5.4.281.xz 5633928 BLAKE2B de4d47159338b5fdbbea20d29618e254abaab62f02b7bcc070ab273b0e0b51a4e127ba55e9b62e6b5d3d0e1079f3440c943234389db4401d3e9dccab5dfe7ddb SHA512 004ece4df47fe762f79171efa665b556638a2d7f10e8b0691f7546bcf366610591b289fe68cb6987e53354590b39aa739a4ac0beef205498b13df0bb85a709c7
+DIST patch-4.19.325.xz 6263136 BLAKE2B 82c37a010f1e290b0f26e89f312db62ba666e19084de676626bda7509e7ce9ab585dc6d4e028b9428e8cbf25f94e979972aca17d40dba7e284cd8dd6949f46a3 SHA512 a55c2e649f709b728973faadce69e73db24d6ac17388d1b340853a0520d9f3c4f5f3e6a74b382695a2fd0b9107df6169b3a848e5ba9e5a64c13e4bb831edec19
+DIST patch-5.4.289.xz 5882012 BLAKE2B f4f550cd13dbb930682ccd9a1e64dfdef879f419d402348c34490b6f1259aa2abdf13b8d37b9ae734653dfdcf4f60a000be1d5e515c992457a9122200fec9733 SHA512 bf5f04523e8186fe512f7563a6bf98cdc12864dbf72998a7dd79686631e75d900912df74d3136607e46c997a0650613e67b7500c31658025eb8958c19a37df1d
diff --git a/sys-kernel/mips-sources/mips-sources-4.19.319.ebuild b/sys-kernel/mips-sources/mips-sources-4.19.319.ebuild
deleted file mode 100644
index a1bebc63fe3a..000000000000
--- a/sys-kernel/mips-sources/mips-sources-4.19.319.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# EAPI Version
-EAPI="8"
-
-#//------------------------------------------------------------------------------
-
-# Version Data
-GENPATCHREV="4"				# Tarball revision for patches
-
-# Directories
-MIPS_PATCHES="${WORKDIR}/mips-patches"
-
-# Kernel-2 Vars
-K_SECURITY_UNSUPPORTED="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_BASE_VER="4.18"
-K_FROM_GIT="yes"
-ETYPE="sources"
-
-# Inherit Eclasses
-inherit kernel-2
-detect_version
-
-# Version Data
-F_KV="${PVR}"
-BASE_KV="$(ver_cut 1-2).0"
-[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
-
-# Portage Vars
-DESCRIPTION="Kernel.org sources for MIPS-based machines"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:MIPS"
-SRC_URI="${KERNEL_URI}
-	https://dev.gentoo.org/~kumba/distfiles/${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
-S="${WORKDIR}/linux-${OKV}"
-KEYWORDS="-* ~mips"
-IUSE="experimental ip27 ip28 ip30 symlink"
-
-# Specify any patches or patch familes to NOT apply here.
-# Use only the 4-digit number followed by a '*'.
-P_EXCLUDE=""
-
-# Machine Support Control Variables
-DO_IP22="test"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
-DO_IP27="yes"				# 		   IP27 support		(SGI Origin)
-DO_IP28="test"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
-DO_IP30="yes"				# 		   IP30 support		(SGI Octane)
-DO_IP32="yes"				# 		   IP32 support		(SGI O2, R5000/RM5200 Only)
-
-# Machine Stable Version Variables
-SV_IP22=""				# If set && DO_IP22 == "no", indicates last "good" IP22 version
-SV_IP27=""				# 	    DO_IP27 == "no", 			   IP27
-SV_IP28=""				# 	    DO_IP28 == "no", 			   IP28
-SV_IP30=""				# 	    DO_IP30 == "no", 			   IP30
-SV_IP32=""				# 	    DO_IP32 == "no", 			   IP32
-
-#//------------------------------------------------------------------------------
-
-err_disabled_mach() {
-	# Get args
-	local m_name="${1}"
-	local m_abbr="${2}"
-	local m_use="${3}"
-	local is_test="${4}"
-
-	# Get stable version, if exists
-	local stable_ver="SV_${m_abbr}"
-	stable_ver="${!stable_ver}"
-
-	# See if this machine needs a USE passed or skip dying
-	local has_use
-	[[ "${m_use}" != "skip" ]] \
-		&& has_use="USE=\"${m_use}\" "
-
-	# Print error && (maybe) die
-	echo -e ""
-	if [[ "${is_test}" != "test" ]]; then
-		eerror "${m_name} Support has been disabled in this ebuild"
-		eerror "revision.  If you wish to merge ${m_name} sources, then"
-		eerror "run ${has_use}emerge =mips-sources-${stable_ver}"
-		[[ "${m_use}" != "skip" ]] \
-			&& die "${m_name} Support disabled."
-	else
-		ewarn "${m_name} Support has been marked as needing testing in this"
-		ewarn "ebuild revision.  This usually means that any patches to support"
-		ewarn "${m_name} have been forward ported and maybe even compile-tested,"
-		ewarn "but not yet booted on real hardware, possibly due to a lack of access"
-		ewarn "to such hardware.  If you happen to boot this kernel and have no"
-		ewarn "problems at all, then please inform the maintainer.  Otherwise, if"
-		ewarn "experience a bug, an oops/panic, or some other oddity, then please"
-		ewarn "file a bug at bugs.gentoo.org, and assign it to the mips team."
-	fi
-
-	return 0
-}
-
-err_only_one_mach_allowed() {
-	echo -e ""
-	eerror "A patchset for a specific machine-type has already been selected."
-	eerror "No other patches for machines-types are permitted.  You will need a"
-	eerror "separate copy of the kernel sources for each different machine-type"
-	eerror "you want to build a kernel for."
-	die "Only one machine-type patchset allowed"
-}
-
-fkv_to_machtype() {
-	# For any machines that use external patches, we rename the source
-	# tree to match the machine type.
-	local fkv="${F_KV%-*}"
-	local v="${fkv}"
-	for x in {ip27,ip28,ip30}; do
-		use ${x} && v="${v}.${x}" && break
-	done
-
-	echo "${v}"
-}
-
-pkg_postinst() {
-	if ! use symlink; then
-		return 0
-	fi
-
-	local kern_sym="/usr/src/linux"
-
-	# Check that /usr/src/linux is safe to overwrite
-	if [[ -e "${kern_sym}" && ! -L "${kern_sym}" ]]; then
-		die "${kern_sym} already exists, but is not a symbolic link"
-	fi
-
-	# Symlink /usr/src/linux as appropriate
-	local kern_ver=$(fkv_to_machtype)
-	ln -snf "linux-${kern_ver}" "${kern_sym}"
-}
-
-pkg_setup() {
-	local arch_is_selected="no"
-	local m_ip m_enable m_name
-
-	# Exclusive machine patchsets
-	# These are not allowed to be mixed together, thus only one of them may be applied
-	# to a tree per merge.
-	for x in									\
-		"ip27 SGI Origin 200/2000"						\
-		"ip28 SGI Indigo2 Impact R10000"					\
-		"ip30 SGI Octane"
-	do
-		set -- ${x}		# Set positional params
-		m_ip="${1}"		# Grab the first param (HW IP for SGI)
-		shift			# Shift the positions
-		m_name="${*}"		# Get the rest (Name)
-
-		if ! use ${m_ip}; then
-			continue
-		fi
-
-		# Fetch the value indiciating if the machine is enabled or not
-		m_enable="DO_${m_ip/ip/IP}"
-		m_enable="${!m_enable}"
-
-		# Make sure only one of these exclusive machine patches is selected
-		[[ "${arch_is_selected}" = "no" ]]				\
-			&& arch_is_selected="yes"				\
-			|| err_only_one_mach_allowed
-
-		# Is the machine support disabled or marked as needing testing?
-		case "${m_enable}" in
-			"test") err_disabled_mach "${m_name}" "${m_ip/ip/IP}" "${m_ip}" "test" ;;
-			"no") err_disabled_mach "${m_name}" "${m_ip/ip/IP}" "${m_ip}" ;;
-		esac
-
-		# Show relevant information about the machine
-		show_${m_ip}_info
-	done
-
-	# All other systems that don't have a USE flag go here
-	# These systems have base-line support included in linux-mips git, so
-	# instead of failing, if disabled, we simply warn the user
-	if [[ "${arch_is_selected}" = "no" ]]; then
-		[[ "${DO_IP22}" = "no" ]]						\
-			&& err_disabled_mach "SGI Indy/Indigo2 R4x00" "IP22" "skip"	\
-			|| show_ip22_info
-		[[ "${DO_IP32}" = "no" ]]						\
-			&& err_disabled_mach "SGI O2" "IP32" "skip"			\
-			|| show_ip32_info
-
-	fi
-}
-
-show_ip22_info() {
-	echo -e ""
-	einfo "IP22 systems with an R5000 processor should work with this release."
-	einfo "The R4x00 series of processors tend to be rather flaky, especially the"
-	einfo "R4600.  If you have to run an R4x00 processor, then try to use an R4400."
-	einfo ""
-	einfo "Some Notes:"
-	einfo "\t- Supported graphics card right now is Newport (XL)."
-	einfo "\t- A driver for Extreme (XZ) does not exist at present."
-	echo -e ""
-}
-
-show_ip27_info() {
-	echo -e ""
-	ewarn "IP27 Origin 2k/Onyx2 systems may be prone to sudden hard lockups."
-	ewarn "The exact trigger is unknown at this time."
-	echo -e ""
-}
-
-show_ip28_info() {
-	echo -e ""
-	einfo "Support for the Indigo2 Impact R10000 is now in the mainline kernel.  However,"
-	einfo "due to the R10000 Speculative Execution issue that exists with this machine,"
-	einfo "nothing is guaranteed to work correctly.  Consider enabling ${HILITE}CONFIG_KALLSYMS${NORMAL}"
-	einfo "in your kernel so that if the machine Oopes, you'll be able to provide valuable"
-	einfo "feedback that can be used to trace down the crash."
-	echo -e ""
-}
-
-show_ip30_info() {
-	echo -e ""
-	eerror "Things that DON'T work:"
-	eerror "\t- Do not use CONFIG_SLUB, otherwise, you'll get errors when booting"
-	eerror "\t\040\040regarding duplicate /sys/kernel/slab/* entries in sysfs."
-	eerror "\t- Impact (MGRAS) Xorg driver no longer functions due to severe bitrot."
-	eerror "\t- Octane is limited to a maximum of 2GB of memory right now due to a"
-	eerror "\t\040\040hardware quirk in the BRIDGE PCI chip that limits BRIDGE DMA"
-	eerror "\t\040\040addresses to 31-bits when converted into physical addresses."
-	eerror "\t\040\040Patches that attempt to fix the issue are highly welcome."
-	echo -e ""
-	ewarn "Things that might work, but have problems, or are unknown:"
-	ewarn "\t- CONFIG_TRANSPARENT_HUGEPAGE should work now, but there may still be"
-	ewarn "\t\040\040intermittent issues.  Additionally, CONFIG_HUGETLBFS must also be"
-	ewarn "\t\040\040selected for hugepages to work.  If use of this feature continues"
-	ewarn "\t\040\040to trigger random Instruction Bus Errors (IBEs), then it is best to"
-	ewarn "\t\040\040disable the functionality and perform a cold reset of the machine"
-	ewarn "\t\040\040after powering it down for at least 30 seconds."
-	ewarn "\t- Serial support on the Octane uses a very basic UART driver that drives"
-	ewarn "\t\040\040the 16550A chip on the IOC3 directly.  It does not use interrupts,"
-	ewarn "\t\040\040only a polling routine on a timer, which makes it slow and CPU-"
-	ewarn "\t\040\040intensive.  The baud rate is limited to no more than 38.4kbps on"
-	ewarn "\t\040\040this driver.  Patches for getting the Altix IOC3 serial driver to"
-	ewarn "\t\040\040work (which uses DMA and supports faster baud rates) are welcome."
-	ewarn "\t- UHCI Cards are known to have issues, but should still function."
-	ewarn "\t\040\040This issue primarily manifests itself when using pl2303 USB->Serial"
-	ewarn "\t\040\040adapters."
-	ewarn "\t- MENET boards appear to have the four ethernet ports detected, however"
-	ewarn "\t\040\040the six serial ports don't appear to get picked up by the IOC3"
-	ewarn "\t\040\040UART driver.  The NIC part number is also not read correctly"
-	ewarn "\t\040\040from the four Number-In-a-Cans.  Additional testing would be"
-	ewarn "\t\040\040appreciated and patches welcome."
-	ewarn "\t- Other XIO-based devices, like various Impact addons, remain untested"
-	ewarn "\t\040\040and are not guaranteed to work.  This applies to various digital"
-	ewarn "\t\040\040video conversion boards as well."
-	echo -e ""
-	einfo "Things that DO work:"
-	einfo "\t- SMP works again, celebrate!"
-	einfo "\t- Impact (MGRAS) console only."
-	einfo "\t- VPro (Odyssey) console only (no X driver exists yet)."
-	einfo "\t- PCI Card Cages should work for many devices, except certain types like"
-	einfo "\t\040\040PCI-to-PCI bridges (USB hubs, USB flash card readers for example)."
-	einfo "\t- SCSI, RTC, basic PCI, IOC3 Ethernet, keyboard, and mouse.  Please"
-	einfo "\t\040\040report any problems with these devices."
-	echo -e ""
-}
-
-show_ip32_info() {
-	echo -e ""
-	einfo "IP32 systems function well, however there are some notes:"
-	einfo "\t- A sound driver now exists for IP32.  Celebrate!"
-	einfo "\t- Framebuffer console is limited to 4MB.  Anything greater"
-	einfo "\t\040\040specified when building the kernel will likely oops"
-	einfo "\t\040\040or panic the kernel."
-	einfo "\t- X support is limited to the generic fbdev driver.  No X"
-	einfo "\t\040\040gbefb driver exists for O2 yet.  Feel free to submit"
-	einfo "\t\040\040patches!"
-	echo -e ""
-
-	einfo "To Build 64bit kernels for SGI O2 (IP32) or SGI Indy/Indigo2 R4x00 (IP22)"
-	einfo "systems, you need to use the ${GOOD}vmlinux.32${NORMAL} make target."
-	einfo "Once done, boot the ${GOOD}vmlinux.32${NORMAL} file (NOT vmlinux)."
-}
-
-src_unpack() {
-	# Unpack the kernel sources, update to the latest rev (if needed),
-	# and apply the latest patch from linux-mips git.
-	kernel-2_src_unpack
-
-	# Unpack the mips-sources patchset to ${WORKDIR}/mips-patches-${BASE_KV}.
-	echo -e ""
-	cd "${WORKDIR}"
-	unpack "${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
-
-	# Create a new folder called 'patch-symlinks' and create symlinks to
-	# all mips-patches in there.  If we want to exclude a patch, we'll
-	# just delete the symlink instead of the actual patch.
-	mkdir patch-symlinks
-	cd patch-symlinks
-	for x in ../mips-patches-${BASE_KV}/*.patch; do
-		ln -s "${x}" "${x##../mips-patches-*/}"
-	done
-
-	# With symlinks created, setup the variables referencing external
-	# machine patches and if a machine USE flag is enabled, then unset
-	# its corresponding variable.
-	# See 0000_README for the patch numbers and their meanings.
-	local p_generic="51*"
-	local p_ip27="52*" p_ip28="53*" p_ip30="54*"
-	local p_xp="80*"
-	use ip27 && unset p_generic p_ip27
-	use ip28 && unset p_ip28
-	use ip30 && unset p_generic p_ip30
-	use experimental && unset p_xp
-
-	# Remove symlinks for any patches that we don't want applied.  We
-	# do this by looping through all the above variables, and deleting
-	# matching symlinks that point to the corresponding patches.
-	# The remaining symlinks will be applied to the kernel source.
-	#
-	# $P_EXCLUDE is a new var that can be set in an ebuild to exclude
-	# specific patches by wildcarding the patch number.
-	local patchlist="${p_generic} ${p_ip27} ${p_ip28} ${p_ip30} ${p_xp} ${P_EXCLUDE}"
-	for x in $patchlist;
-		do rm -f "./${x}"
-	done
-
-	# Rename the source tree, if needed.
-	local old="${WORKDIR}/linux-${F_KV%-*/_/-}"
-	local new="${WORKDIR}/linux-$(fkv_to_machtype)"
-	if [[ "${old}" != "${new}" ]]; then
-		mv "${old}" "${new}" || die
-	fi
-	S="${new}"
-
-	# Set the EXTRAVERSION to linux-VERSION-mipsgit-GITDATE
-	EXTRAVERSION="${EXTRAVERSION}-gentoo-mips"
-	unpack_set_extraversion
-}
-
-src_prepare() {
-	# Apply patches to the kernel tree.
-	eapply "${WORKDIR}/patch-symlinks"/
-
-	eapply_user
-}
diff --git a/sys-kernel/mips-sources/mips-sources-4.19.325.ebuild b/sys-kernel/mips-sources/mips-sources-4.19.325.ebuild
new file mode 100644
index 000000000000..bef54f24328f
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-4.19.325.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# EAPI Version
+EAPI="8"
+
+#//------------------------------------------------------------------------------
+
+# Version Data
+GENPATCHREV="5"				# Tarball revision for patches
+
+# Directories
+MIPS_PATCHES="${WORKDIR}/mips-patches"
+
+# Kernel-2 Vars
+K_SECURITY_UNSUPPORTED="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_BASE_VER="4.18"
+K_FROM_GIT="yes"
+ETYPE="sources"
+
+# Inherit Eclasses
+inherit kernel-2
+detect_version
+
+# Version Data
+F_KV="${PVR}"
+BASE_KV="$(ver_cut 1-2).0"
+[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
+
+# Portage Vars
+DESCRIPTION="Kernel.org sources for MIPS-based machines"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:MIPS"
+SRC_URI="${KERNEL_URI}
+	https://dev.gentoo.org/~kumba/distfiles/${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
+S="${WORKDIR}/linux-${OKV}"
+KEYWORDS="-* ~mips"
+IUSE="experimental ip27 ip28 ip30 symlink"
+
+# Specify any patches or patch familes to NOT apply here.
+# Use only the 4-digit number followed by a '*'.
+P_EXCLUDE=""
+
+# Machine Support Control Variables
+DO_IP22="test"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
+DO_IP27="yes"				# 		   IP27 support		(SGI Origin)
+DO_IP28="test"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
+DO_IP30="yes"				# 		   IP30 support		(SGI Octane)
+DO_IP32="yes"				# 		   IP32 support		(SGI O2, R5000/RM5200 Only)
+
+# Machine Stable Version Variables
+SV_IP22=""				# If set && DO_IP22 == "no", indicates last "good" IP22 version
+SV_IP27=""				# 	    DO_IP27 == "no", 			   IP27
+SV_IP28=""				# 	    DO_IP28 == "no", 			   IP28
+SV_IP30=""				# 	    DO_IP30 == "no", 			   IP30
+SV_IP32=""				# 	    DO_IP32 == "no", 			   IP32
+
+#//------------------------------------------------------------------------------
+
+err_disabled_mach() {
+	# Get args
+	local m_name="${1}"
+	local m_abbr="${2}"
+	local m_use="${3}"
+	local is_test="${4}"
+
+	# Get stable version, if exists
+	local stable_ver="SV_${m_abbr}"
+	stable_ver="${!stable_ver}"
+
+	# See if this machine needs a USE passed or skip dying
+	local has_use
+	[[ "${m_use}" != "skip" ]] \
+		&& has_use="USE=\"${m_use}\" "
+
+	# Print error && (maybe) die
+	echo -e ""
+	if [[ "${is_test}" != "test" ]]; then
+		eerror "${m_name} Support has been disabled in this ebuild"
+		eerror "revision.  If you wish to merge ${m_name} sources, then"
+		eerror "run ${has_use}emerge =mips-sources-${stable_ver}"
+		[[ "${m_use}" != "skip" ]] \
+			&& die "${m_name} Support disabled."
+	else
+		ewarn "${m_name} Support has been marked as needing testing in this"
+		ewarn "ebuild revision.  This usually means that any patches to support"
+		ewarn "${m_name} have been forward ported and maybe even compile-tested,"
+		ewarn "but not yet booted on real hardware, possibly due to a lack of access"
+		ewarn "to such hardware.  If you happen to boot this kernel and have no"
+		ewarn "problems at all, then please inform the maintainer.  Otherwise, if"
+		ewarn "experience a bug, an oops/panic, or some other oddity, then please"
+		ewarn "file a bug at bugs.gentoo.org, and assign it to the mips team."
+	fi
+
+	return 0
+}
+
+err_only_one_mach_allowed() {
+	echo -e ""
+	eerror "A patchset for a specific machine-type has already been selected."
+	eerror "No other patches for machines-types are permitted.  You will need a"
+	eerror "separate copy of the kernel sources for each different machine-type"
+	eerror "you want to build a kernel for."
+	die "Only one machine-type patchset allowed"
+}
+
+fkv_to_machtype() {
+	# For any machines that use external patches, we rename the source
+	# tree to match the machine type.
+	local fkv="${F_KV%-*}"
+	local v="${fkv}"
+	for x in {ip27,ip28,ip30}; do
+		use ${x} && v="${v}.${x}" && break
+	done
+
+	echo "${v}"
+}
+
+pkg_postinst() {
+	if ! use symlink; then
+		return 0
+	fi
+
+	local kern_sym="/usr/src/linux"
+
+	# Check that /usr/src/linux is safe to overwrite
+	if [[ -e "${kern_sym}" && ! -L "${kern_sym}" ]]; then
+		die "${kern_sym} already exists, but is not a symbolic link"
+	fi
+
+	# Symlink /usr/src/linux as appropriate
+	local kern_ver=$(fkv_to_machtype)
+	ln -snf "linux-${kern_ver}" "${kern_sym}"
+}
+
+pkg_setup() {
+	local arch_is_selected="no"
+	local m_ip m_enable m_name
+
+	# Exclusive machine patchsets
+	# These are not allowed to be mixed together, thus only one of them may be applied
+	# to a tree per merge.
+	for x in									\
+		"ip27 SGI Origin 200/2000"						\
+		"ip28 SGI Indigo2 Impact R10000"					\
+		"ip30 SGI Octane"
+	do
+		set -- ${x}		# Set positional params
+		m_ip="${1}"		# Grab the first param (HW IP for SGI)
+		shift			# Shift the positions
+		m_name="${*}"		# Get the rest (Name)
+
+		if ! use ${m_ip}; then
+			continue
+		fi
+
+		# Fetch the value indiciating if the machine is enabled or not
+		m_enable="DO_${m_ip/ip/IP}"
+		m_enable="${!m_enable}"
+
+		# Make sure only one of these exclusive machine patches is selected
+		[[ "${arch_is_selected}" = "no" ]]				\
+			&& arch_is_selected="yes"				\
+			|| err_only_one_mach_allowed
+
+		# Is the machine support disabled or marked as needing testing?
+		case "${m_enable}" in
+			"test") err_disabled_mach "${m_name}" "${m_ip/ip/IP}" "${m_ip}" "test" ;;
+			"no") err_disabled_mach "${m_name}" "${m_ip/ip/IP}" "${m_ip}" ;;
+		esac
+
+		# Show relevant information about the machine
+		show_${m_ip}_info
+	done
+
+	# All other systems that don't have a USE flag go here
+	# These systems have base-line support included in linux-mips git, so
+	# instead of failing, if disabled, we simply warn the user
+	if [[ "${arch_is_selected}" = "no" ]]; then
+		[[ "${DO_IP22}" = "no" ]]						\
+			&& err_disabled_mach "SGI Indy/Indigo2 R4x00" "IP22" "skip"	\
+			|| show_ip22_info
+		[[ "${DO_IP32}" = "no" ]]						\
+			&& err_disabled_mach "SGI O2" "IP32" "skip"			\
+			|| show_ip32_info
+
+	fi
+}
+
+show_ip22_info() {
+	echo -e ""
+	einfo "IP22 systems with an R5000 processor should work with this release."
+	einfo "The R4x00 series of processors tend to be rather flaky, especially the"
+	einfo "R4600.  If you have to run an R4x00 processor, then try to use an R4400."
+	einfo ""
+	einfo "Some Notes:"
+	einfo "\t- Supported graphics card right now is Newport (XL)."
+	einfo "\t- A driver for Extreme (XZ) does not exist at present."
+	echo -e ""
+}
+
+show_ip27_info() {
+	echo -e ""
+	ewarn "IP27 Origin 2k/Onyx2 systems may be prone to sudden hard lockups."
+	ewarn "The exact trigger is unknown at this time."
+	echo -e ""
+}
+
+show_ip28_info() {
+	echo -e ""
+	einfo "Support for the Indigo2 Impact R10000 is now in the mainline kernel.  However,"
+	einfo "due to the R10000 Speculative Execution issue that exists with this machine,"
+	einfo "nothing is guaranteed to work correctly.  Consider enabling ${HILITE}CONFIG_KALLSYMS${NORMAL}"
+	einfo "in your kernel so that if the machine Oopes, you'll be able to provide valuable"
+	einfo "feedback that can be used to trace down the crash."
+	echo -e ""
+}
+
+show_ip30_info() {
+	echo -e ""
+	eerror "Things that DON'T work:"
+	eerror "\t- Do not use CONFIG_SLUB, otherwise, you'll get errors when booting"
+	eerror "\t\040\040regarding duplicate /sys/kernel/slab/* entries in sysfs."
+	eerror "\t- Impact (MGRAS) Xorg driver no longer functions due to severe bitrot."
+	eerror "\t- Octane is limited to a maximum of 2GB of memory right now due to a"
+	eerror "\t\040\040hardware quirk in the BRIDGE PCI chip that limits BRIDGE DMA"
+	eerror "\t\040\040addresses to 31-bits when converted into physical addresses."
+	eerror "\t\040\040Patches that attempt to fix the issue are highly welcome."
+	echo -e ""
+	ewarn "Things that might work, but have problems, or are unknown:"
+	ewarn "\t- CONFIG_TRANSPARENT_HUGEPAGE should work now, but there may still be"
+	ewarn "\t\040\040intermittent issues.  Additionally, CONFIG_HUGETLBFS must also be"
+	ewarn "\t\040\040selected for hugepages to work.  If use of this feature continues"
+	ewarn "\t\040\040to trigger random Instruction Bus Errors (IBEs), then it is best to"
+	ewarn "\t\040\040disable the functionality and perform a cold reset of the machine"
+	ewarn "\t\040\040after powering it down for at least 30 seconds."
+	ewarn "\t- Serial support on the Octane uses a very basic UART driver that drives"
+	ewarn "\t\040\040the 16550A chip on the IOC3 directly.  It does not use interrupts,"
+	ewarn "\t\040\040only a polling routine on a timer, which makes it slow and CPU-"
+	ewarn "\t\040\040intensive.  The baud rate is limited to no more than 38.4kbps on"
+	ewarn "\t\040\040this driver.  Patches for getting the Altix IOC3 serial driver to"
+	ewarn "\t\040\040work (which uses DMA and supports faster baud rates) are welcome."
+	ewarn "\t- UHCI Cards are known to have issues, but should still function."
+	ewarn "\t\040\040This issue primarily manifests itself when using pl2303 USB->Serial"
+	ewarn "\t\040\040adapters."
+	ewarn "\t- MENET boards appear to have the four ethernet ports detected, however"
+	ewarn "\t\040\040the six serial ports don't appear to get picked up by the IOC3"
+	ewarn "\t\040\040UART driver.  The NIC part number is also not read correctly"
+	ewarn "\t\040\040from the four Number-In-a-Cans.  Additional testing would be"
+	ewarn "\t\040\040appreciated and patches welcome."
+	ewarn "\t- Other XIO-based devices, like various Impact addons, remain untested"
+	ewarn "\t\040\040and are not guaranteed to work.  This applies to various digital"
+	ewarn "\t\040\040video conversion boards as well."
+	echo -e ""
+	einfo "Things that DO work:"
+	einfo "\t- SMP works again, celebrate!"
+	einfo "\t- Impact (MGRAS) console only."
+	einfo "\t- VPro (Odyssey) console only (no X driver exists yet)."
+	einfo "\t- PCI Card Cages should work for many devices, except certain types like"
+	einfo "\t\040\040PCI-to-PCI bridges (USB hubs, USB flash card readers for example)."
+	einfo "\t- SCSI, RTC, basic PCI, IOC3 Ethernet, keyboard, and mouse.  Please"
+	einfo "\t\040\040report any problems with these devices."
+	echo -e ""
+}
+
+show_ip32_info() {
+	echo -e ""
+	einfo "IP32 systems function well, however there are some notes:"
+	einfo "\t- A sound driver now exists for IP32.  Celebrate!"
+	einfo "\t- Framebuffer console is limited to 4MB.  Anything greater"
+	einfo "\t\040\040specified when building the kernel will likely oops"
+	einfo "\t\040\040or panic the kernel."
+	einfo "\t- X support is limited to the generic fbdev driver.  No X"
+	einfo "\t\040\040gbefb driver exists for O2 yet.  Feel free to submit"
+	einfo "\t\040\040patches!"
+	echo -e ""
+
+	einfo "To Build 64bit kernels for SGI O2 (IP32) or SGI Indy/Indigo2 R4x00 (IP22)"
+	einfo "systems, you need to use the ${GOOD}vmlinux.32${NORMAL} make target."
+	einfo "Once done, boot the ${GOOD}vmlinux.32${NORMAL} file (NOT vmlinux)."
+}
+
+src_unpack() {
+	# Unpack the kernel sources, update to the latest rev (if needed),
+	# and apply the latest patch from linux-mips git.
+	kernel-2_src_unpack
+
+	# Unpack the mips-sources patchset to ${WORKDIR}/mips-patches-${BASE_KV}.
+	echo -e ""
+	cd "${WORKDIR}"
+	unpack "${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
+
+	# Create a new folder called 'patch-symlinks' and create symlinks to
+	# all mips-patches in there.  If we want to exclude a patch, we'll
+	# just delete the symlink instead of the actual patch.
+	mkdir patch-symlinks
+	cd patch-symlinks
+	for x in ../mips-patches-${BASE_KV}/*.patch; do
+		ln -s "${x}" "${x##../mips-patches-*/}"
+	done
+
+	# With symlinks created, setup the variables referencing external
+	# machine patches and if a machine USE flag is enabled, then unset
+	# its corresponding variable.
+	# See 0000_README for the patch numbers and their meanings.
+	local p_generic="51*"
+	local p_ip27="52*" p_ip28="53*" p_ip30="54*"
+	local p_xp="80*"
+	use ip27 && unset p_generic p_ip27
+	use ip28 && unset p_ip28
+	use ip30 && unset p_generic p_ip30
+	use experimental && unset p_xp
+
+	# Remove symlinks for any patches that we don't want applied.  We
+	# do this by looping through all the above variables, and deleting
+	# matching symlinks that point to the corresponding patches.
+	# The remaining symlinks will be applied to the kernel source.
+	#
+	# $P_EXCLUDE is a new var that can be set in an ebuild to exclude
+	# specific patches by wildcarding the patch number.
+	local patchlist="${p_generic} ${p_ip27} ${p_ip28} ${p_ip30} ${p_xp} ${P_EXCLUDE}"
+	for x in $patchlist;
+		do rm -f "./${x}"
+	done
+
+	# Rename the source tree, if needed.
+	local old="${WORKDIR}/linux-${F_KV%-*/_/-}"
+	local new="${WORKDIR}/linux-$(fkv_to_machtype)"
+	if [[ "${old}" != "${new}" ]]; then
+		mv "${old}" "${new}" || die
+	fi
+	S="${new}"
+
+	# Set the EXTRAVERSION to linux-VERSION-mipsgit-GITDATE
+	EXTRAVERSION="${EXTRAVERSION}-gentoo-mips"
+	unpack_set_extraversion
+}
+
+src_prepare() {
+	# Apply patches to the kernel tree.
+	eapply "${WORKDIR}/patch-symlinks"/
+
+	eapply_user
+}
diff --git a/sys-kernel/mips-sources/mips-sources-5.4.281.ebuild b/sys-kernel/mips-sources/mips-sources-5.4.281.ebuild
deleted file mode 100644
index 4a444fa26fe5..000000000000
--- a/sys-kernel/mips-sources/mips-sources-5.4.281.ebuild
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# EAPI Version
-EAPI="8"
-
-#//------------------------------------------------------------------------------
-
-# Version Data
-GENPATCHREV="8"				# Tarball revision for patches
-
-# Directories
-MIPS_PATCHES="${WORKDIR}/mips-patches"
-
-# Kernel-2 Vars
-K_SECURITY_UNSUPPORTED="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_BASE_VER="5.3"
-K_FROM_GIT="yes"
-ETYPE="sources"
-
-# Inherit Eclasses
-inherit kernel-2
-detect_version
-
-# Version Data
-F_KV="${PVR}"
-BASE_KV="$(ver_cut 1-2)"
-[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
-
-# Portage Vars
-DESCRIPTION="Kernel.org sources for MIPS-based machines"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:MIPS"
-SRC_URI="${KERNEL_URI}
-	https://dev.gentoo.org/~kumba/distfiles/${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
-S="${WORKDIR}/linux-${OKV}"
-KEYWORDS="-* ~mips"
-IUSE="experimental ip27 ip28 ip30 symlink"
-
-# Specify any patches or patch familes to NOT apply here.
-# Use only the 4-digit number followed by a '*'.
-P_EXCLUDE=""
-
-# Machine Support Control Variables
-DO_IP22="test"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
-DO_IP27="yes"				# 		   IP27 support		(SGI Origin)
-DO_IP28="no"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
-DO_IP30="yes"				# 		   IP30 support		(SGI Octane)
-DO_IP32="yes"				# 		   IP32 support		(SGI O2, R5000/RM5200 Only)
-
-# Machine Stable Version Variables
-SV_IP22=""				# If set && DO_IP22 == "no", indicates last "good" IP22 version
-SV_IP27=""				# 	    DO_IP27 == "no", 			   IP27
-SV_IP28="4.19.x"			# 	    DO_IP28 == "no", 			   IP28
-SV_IP30=""				# 	    DO_IP30 == "no", 			   IP30
-SV_IP32=""				# 	    DO_IP32 == "no", 			   IP32
-
-#//------------------------------------------------------------------------------
-
-err_disabled_mach() {
-	# Get args
-	local m_name="${1}"
-	local m_abbr="${2}"
-	local m_use="${3}"
-	local is_test="${4}"
-
-	# Get stable version, if exists
-	local stable_ver="SV_${m_abbr}"
-	stable_ver="${!stable_ver}"
-
-	# See if this machine needs a USE passed or skip dying
-	local has_use
-	[[ "${m_use}" != "skip" ]] \
-		&& has_use="USE=\"${m_use}\" "
-
-	# Print error && (maybe) die
-	echo -e ""
-	if [[ "${is_test}" != "test" ]]; then
-		eerror "${m_name} Support has been disabled in this ebuild"
-		eerror "revision.  If you wish to merge ${m_name} sources, then"
-		eerror "run ${has_use}emerge =mips-sources-${stable_ver}"
-		[[ "${m_use}" != "skip" ]] \
-			&& die "${m_name} Support disabled."
-	else
-		ewarn "${m_name} Support has been marked as needing testing in this"
-		ewarn "ebuild revision.  This usually means that any patches to support"
-		ewarn "${m_name} have been forward ported and maybe even compile-tested,"
-		ewarn "but not yet booted on real hardware, possibly due to a lack of access"
-		ewarn "to such hardware.  If you happen to boot this kernel and have no"
-		ewarn "problems at all, then please inform the maintainer.  Otherwise, if"
-		ewarn "experience a bug, an oops/panic, or some other oddity, then please"
-		ewarn "file a bug at bugs.gentoo.org, and assign it to the mips team."
-	fi
-
-	return 0
-}
-
-err_only_one_mach_allowed() {
-	echo -e ""
-	eerror "A patchset for a specific machine-type has already been selected."
-	eerror "No other patches for machines-types are permitted.  You will need a"
-	eerror "separate copy of the kernel sources for each different machine-type"
-	eerror "you want to build a kernel for."
-	die "Only one machine-type patchset allowed"
-}
-
-fkv_to_machtype() {
-	# For any machines that use external patches, we rename the source
-	# tree to match the machine type.
-	local fkv="${F_KV%-*}"
-	local v="${fkv}"
-	for x in {ip27,ip28,ip30}; do
-		use ${x} && v="${v}.${x}" && break
-	done
-
-	echo "${v}"
-}
-
-pkg_postinst() {
-	if ! use symlink; then
-		return 0
-	fi
-
-	local kern_sym="/usr/src/linux"
-
-	# Check that /usr/src/linux is safe to overwrite
-	if [[ -e "${kern_sym}" && ! -L "${kern_sym}" ]]; then
-		die "${kern_sym} already exists, but is not a symbolic link"
-	fi
-
-	# Symlink /usr/src/linux as appropriate
-	local kern_ver=$(fkv_to_machtype)
-	ln -snf "linux-${kern_ver}" "${kern_sym}"
-}
-
-pkg_setup() {
-	local arch_is_selected="no"
-	local m_ip m_enable m_name
-
-	# Exclusive machine patchsets
-	# These are not allowed to be mixed together, thus only one of them may be applied
-	# to a tree per merge.
-	for x in									\
-		"ip27 SGI Origin 200/2000"						\
-		"ip28 SGI Indigo2 Impact R10000"					\
-		"ip30 SGI Octane"
-	do
-		set -- ${x}		# Set positional params
-		m_ip="${1}"		# Grab the first param (HW IP for SGI)
-		shift			# Shift the positions
-		m_name="${*}"		# Get the rest (Name)
-
-		if ! use ${m_ip}; then
-			continue
-		fi
-
-		# Fetch the value indiciating if the machine is enabled or not
-		m_enable="DO_${m_ip/ip/IP}"
-		m_enable="${!m_enable}"
-
-		# Make sure only one of these exclusive machine patches is selected
-		[[ "${arch_is_selected}" = "no" ]]				\
-			&& arch_is_selected="yes"				\
-			|| err_only_one_mach_allowed
-
-		# Is the machine support disabled or marked as needing testing?
-		case "${m_enable}" in
-			"test") err_disabled_mach "${m_name}" "${m_ip/ip/IP}" "${m_ip}" "test" ;;
-			"no") err_disabled_mach "${m_name}" "${m_ip/ip/IP}" "${m_ip}" ;;
-		esac
-
-		# Show relevant information about the machine
-		show_${m_ip}_info
-	done
-
-	# All other systems that don't have a USE flag go here
-	# These systems have base-line support included in linux-mips git, so
-	# instead of failing, if disabled, we simply warn the user
-	if [[ "${arch_is_selected}" = "no" ]]; then
-		[[ "${DO_IP22}" = "no" ]]						\
-			&& err_disabled_mach "SGI Indy/Indigo2 R4x00" "IP22" "skip"	\
-			|| show_ip22_info
-		[[ "${DO_IP32}" = "no" ]]						\
-			&& err_disabled_mach "SGI O2" "IP32" "skip"			\
-			|| show_ip32_info
-
-	fi
-}
-
-show_ip22_info() {
-	echo -e ""
-	einfo "IP22 systems with an R5000 processor should work with this release."
-	einfo "The R4x00 series of processors tend to be rather flaky, especially the"
-	einfo "R4600.  If you have to run an R4x00 processor, then try to use an R4400."
-	einfo ""
-	einfo "Some Notes:"
-	einfo "\t- The only supported graphics card right is Newport (XL)."
-	einfo "\t- There is no driver for Extreme (XZ)."
-	echo -e ""
-}
-
-show_ip27_info() {
-	echo -e ""
-	ewarn "IP27 Origin 2k/Onyx2 systems may be prone to sudden hard lockups."
-	ewarn "The exact trigger is unknown at this time."
-	echo -e ""
-}
-
-show_ip28_info() {
-	echo -e ""
-	einfo "Support for the Indigo2 Impact R10000 is now in the mainline kernel.  However,"
-	einfo "due to the R10000 Speculative Execution issue that exists with this machine,"
-	einfo "nothing is guaranteed to work correctly.  Consider enabling ${HILITE}CONFIG_KALLSYMS${NORMAL}"
-	einfo "in your kernel so that if the machine Oopes, you'll be able to provide valuable"
-	einfo "feedback that can be used to trace down the crash."
-	echo -e ""
-}
-
-show_ip30_info() {
-	echo -e ""
-	eerror "Things that DON'T work:"
-	eerror "\t- Do not use CONFIG_SLUB, otherwise, you'll get errors when booting"
-	eerror "\t\040\040regarding duplicate /sys/kernel/slab/* entries in sysfs."
-	eerror "\t- Impact (MGRAS) Xorg driver no longer functions due to severe bitrot."
-	eerror "\t- Octane is limited to a maximum of 2GB of memory right now due to a"
-	eerror "\t\040\040hardware quirk in the BRIDGE PCI chip that limits BRIDGE DMA"
-	eerror "\t\040\040addresses to 31-bits when converted into physical addresses."
-	echo -e ""
-	ewarn "Things that might work, but have problems, or are unknown:"
-	ewarn "\t- Serial support on the Octane uses a very basic UART driver that drives"
-	ewarn "\t\040\040the 16550A chip on the IOC3 directly.  It does not use interrupts,"
-	ewarn "\t\040\040only a polling routine on a timer, which makes it slow and CPU-"
-	ewarn "\t\040\040intensive.  The baud rate is limited to no more than 38.4kbps on"
-	ewarn "\t\040\040this driver.  Patches for getting the Altix IOC3 serial driver to"
-	ewarn "\t\040\040work (which uses DMA and supports faster baud rates) are welcome."
-	ewarn "\t- MENET boards appear to have the four ethernet ports detected, however"
-	ewarn "\t\040\040the six serial ports don't appear to get picked up by the IOC3"
-	ewarn "\t\040\040UART driver.  The NIC part number is also not read correctly"
-	ewarn "\t\040\040from the four Number-In-a-Cans."
-	ewarn "\t- Other XIO-based devices, like various Impact addons, remain untested"
-	ewarn "\t\040\040and are not guaranteed to work."
-	ewarn "\t- Upon rebooting, Octane may not return to the PROM.  Holding down the"
-	ewarn "\t\040\040reset button for up to ten seconds, releasing, then pressing it"
-	ewarn "\t\040\040again for one or two seconds may trigger the system to return"
-	ewarn "\t\040\040to the PROM.  Please wait at least five seconds after each attempt"
-	ewarn "\t\040\040to see if the machine responds.  As a last resort, unplugging the"
-	ewarn "\t\040\040power cord for 30 seconds will also work, but be aware the power"
-	ewarn "\t\040\040supplies on these systems will not appreciate this due to their"
-	ewarn "\t\040\040relative old age."
-	echo -e ""
-	einfo "Things that DO work:"
-	einfo "\t- SMP support."
-	einfo "\t- Impact (MGRAS), console only."
-	einfo "\t- VPro (Odyssey), console only."
-	einfo "\t- PCI card cages (showbox) should work for many devices, except certain"
-	einfo "\t\040\040types such as PCI-to-PCI bridges (USB hubs, USB flash card readers)."
-	einfo "\t- SCSI, RTC, basic PCI, IOC3 Ethernet, keyboard, and mouse.  Please"
-	einfo "\t\040\040report any problems with these devices."
-	einfo "\t- SGI AceNIC/Tigon II gigabit cards will work in the PCI card cage/shoebox."
-	echo -e ""
-}
-
-show_ip32_info() {
-	echo -e ""
-	einfo "IP32 systems function well, however there are some notes:"
-	einfo "\t- A sound driver now exists for IP32."
-	einfo "\t- Framebuffer console is limited to 4MB.  Anything greater"
-	einfo "\t\040\040specified when building the kernel will oops or"
-	einfo "\t\040\040panic the kernel."
-	echo -e ""
-	eerror "IP32 Systems may be unstable and prone to lockups under a 5.4.x LTS kernel."
-	eerror "The cause is unknown at this time."
-	echo -e ""
-
-	einfo "To Build 64bit kernels for SGI O2 (IP32) or SGI Indy/Indigo2 R4x00 (IP22)"
-	einfo "systems, you need to use the ${GOOD}vmlinux.32${NORMAL} make target."
-	einfo "Once done, boot the ${GOOD}vmlinux.32${NORMAL} file (NOT vmlinux)."
-}
-
-src_unpack() {
-	# Unpack the kernel sources, update to the latest rev (if needed),
-	# and apply the latest patch from linux-mips git.
-	kernel-2_src_unpack
-
-	# Unpack the mips-sources patchset to ${WORKDIR}/mips-patches-${BASE_KV}.
-	echo -e ""
-	cd "${WORKDIR}"
-	unpack "${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
-
-	# Create a new folder called 'patch-symlinks' and create symlinks to
-	# all mips-patches in there.  If we want to exclude a patch, we'll
-	# just delete the symlink instead of the actual patch.
-	mkdir patch-symlinks
-	cd patch-symlinks
-	for x in ../mips-patches-${BASE_KV}/*.patch; do
-		ln -s "${x}" "${x##../mips-patches-*/}"
-	done
-
-	# With symlinks created, setup the variables referencing external
-	# machine patches and if a machine USE flag is enabled, then unset
-	# its corresponding variable.
-	# See 0000_README for the patch numbers and their meanings.
-	local p_generic="51*"
-	local p_ip27="52*" p_ip28="53*" p_ip30="54*"
-	local p_xp="80*"
-	use ip27 && unset p_generic p_ip27
-	use ip28 && unset p_ip28
-	use ip30 && unset p_generic p_ip30
-	use experimental && unset p_xp
-
-	# Remove symlinks for any patches that we don't want applied.  We
-	# do this by looping through all the above variables, and deleting
-	# matching symlinks that point to the corresponding patches.
-	# The remaining symlinks will be applied to the kernel source.
-	#
-	# $P_EXCLUDE is a new var that can be set in an ebuild to exclude
-	# specific patches by wildcarding the patch number.
-	local patchlist="${p_generic} ${p_ip27} ${p_ip28} ${p_ip30} ${p_xp} ${P_EXCLUDE}"
-	for x in $patchlist;
-		do rm -f "./${x}"
-	done
-
-	# Rename the source tree, if needed.
-	local old="${WORKDIR}/linux-${F_KV%-*/_/-}"
-	local new="${WORKDIR}/linux-$(fkv_to_machtype)"
-	if [[ "${old}" != "${new}" ]]; then
-		mv "${old}" "${new}" || die
-	fi
-	S="${new}"
-
-	# Set the EXTRAVERSION to linux-VERSION-mipsgit-GITDATE
-	EXTRAVERSION="${EXTRAVERSION}-gentoo-mips"
-	unpack_set_extraversion
-}
-
-src_prepare() {
-	# Apply patches to the kernel tree.
-	eapply "${WORKDIR}/patch-symlinks"/
-
-	eapply_user
-}
diff --git a/sys-kernel/mips-sources/mips-sources-5.4.289.ebuild b/sys-kernel/mips-sources/mips-sources-5.4.289.ebuild
new file mode 100644
index 000000000000..683912b7a7cd
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-5.4.289.ebuild
@@ -0,0 +1,343 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# EAPI Version
+EAPI="8"
+
+#//------------------------------------------------------------------------------
+
+# Version Data
+GENPATCHREV="8"				# Tarball revision for patches
+
+# Directories
+MIPS_PATCHES="${WORKDIR}/mips-patches"
+
+# Kernel-2 Vars
+K_SECURITY_UNSUPPORTED="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_BASE_VER="5.3"
+K_FROM_GIT="yes"
+ETYPE="sources"
+
+# Inherit Eclasses
+inherit kernel-2
+detect_version
+
+# Version Data
+F_KV="${PVR}"
+BASE_KV="$(ver_cut 1-2)"
+[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
+
+# Portage Vars
+DESCRIPTION="Kernel.org sources for MIPS-based machines"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:MIPS"
+SRC_URI="${KERNEL_URI}
+	https://dev.gentoo.org/~kumba/distfiles/${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
+S="${WORKDIR}/linux-${OKV}"
+KEYWORDS="-* ~mips"
+IUSE="experimental ip27 ip28 ip30 symlink"
+
+# Specify any patches or patch familes to NOT apply here.
+# Use only the 4-digit number followed by a '*'.
+P_EXCLUDE=""
+
+# Machine Support Control Variables
+DO_IP22="test"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
+DO_IP27="yes"				# 		   IP27 support		(SGI Origin)
+DO_IP28="no"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
+DO_IP30="yes"				# 		   IP30 support		(SGI Octane)
+DO_IP32="yes"				# 		   IP32 support		(SGI O2, R5000/RM5200 Only)
+
+# Machine Stable Version Variables
+SV_IP22=""				# If set && DO_IP22 == "no", indicates last "good" IP22 version
+SV_IP27=""				# 	    DO_IP27 == "no", 			   IP27
+SV_IP28="4.19.x"			# 	    DO_IP28 == "no", 			   IP28
+SV_IP30=""				# 	    DO_IP30 == "no", 			   IP30
+SV_IP32=""				# 	    DO_IP32 == "no", 			   IP32
+
+#//------------------------------------------------------------------------------
+
+err_disabled_mach() {
+	# Get args
+	local m_name="${1}"
+	local m_abbr="${2}"
+	local m_use="${3}"
+	local is_test="${4}"
+
+	# Get stable version, if exists
+	local stable_ver="SV_${m_abbr}"
+	stable_ver="${!stable_ver}"
+
+	# See if this machine needs a USE passed or skip dying
+	local has_use
+	[[ "${m_use}" != "skip" ]] \
+		&& has_use="USE=\"${m_use}\" "
+
+	# Print error && (maybe) die
+	echo -e ""
+	if [[ "${is_test}" != "test" ]]; then
+		eerror "${m_name} Support has been disabled in this ebuild"
+		eerror "revision.  If you wish to merge ${m_name} sources, then"
+		eerror "run ${has_use}emerge =mips-sources-${stable_ver}"
+		[[ "${m_use}" != "skip" ]] \
+			&& die "${m_name} Support disabled."
+	else
+		ewarn "${m_name} Support has been marked as needing testing in this"
+		ewarn "ebuild revision.  This usually means that any patches to support"
+		ewarn "${m_name} have been forward ported and maybe even compile-tested,"
+		ewarn "but not yet booted on real hardware, possibly due to a lack of access"
+		ewarn "to such hardware.  If you happen to boot this kernel and have no"
+		ewarn "problems at all, then please inform the maintainer.  Otherwise, if"
+		ewarn "experience a bug, an oops/panic, or some other oddity, then please"
+		ewarn "file a bug at bugs.gentoo.org, and assign it to the mips team."
+	fi
+
+	return 0
+}
+
+err_only_one_mach_allowed() {
+	echo -e ""
+	eerror "A patchset for a specific machine-type has already been selected."
+	eerror "No other patches for machines-types are permitted.  You will need a"
+	eerror "separate copy of the kernel sources for each different machine-type"
+	eerror "you want to build a kernel for."
+	die "Only one machine-type patchset allowed"
+}
+
+fkv_to_machtype() {
+	# For any machines that use external patches, we rename the source
+	# tree to match the machine type.
+	local fkv="${F_KV%-*}"
+	local v="${fkv}"
+	for x in {ip27,ip28,ip30}; do
+		use ${x} && v="${v}.${x}" && break
+	done
+
+	echo "${v}"
+}
+
+pkg_postinst() {
+	if ! use symlink; then
+		return 0
+	fi
+
+	local kern_sym="/usr/src/linux"
+
+	# Check that /usr/src/linux is safe to overwrite
+	if [[ -e "${kern_sym}" && ! -L "${kern_sym}" ]]; then
+		die "${kern_sym} already exists, but is not a symbolic link"
+	fi
+
+	# Symlink /usr/src/linux as appropriate
+	local kern_ver=$(fkv_to_machtype)
+	ln -snf "linux-${kern_ver}" "${kern_sym}"
+}
+
+pkg_setup() {
+	local arch_is_selected="no"
+	local m_ip m_enable m_name
+
+	# Exclusive machine patchsets
+	# These are not allowed to be mixed together, thus only one of them may be applied
+	# to a tree per merge.
+	for x in									\
+		"ip27 SGI Origin 200/2000"						\
+		"ip28 SGI Indigo2 Impact R10000"					\
+		"ip30 SGI Octane"
+	do
+		set -- ${x}		# Set positional params
+		m_ip="${1}"		# Grab the first param (HW IP for SGI)
+		shift			# Shift the positions
+		m_name="${*}"		# Get the rest (Name)
+
+		if ! use ${m_ip}; then
+			continue
+		fi
+
+		# Fetch the value indiciating if the machine is enabled or not
+		m_enable="DO_${m_ip/ip/IP}"
+		m_enable="${!m_enable}"
+
+		# Make sure only one of these exclusive machine patches is selected
+		[[ "${arch_is_selected}" = "no" ]]				\
+			&& arch_is_selected="yes"				\
+			|| err_only_one_mach_allowed
+
+		# Is the machine support disabled or marked as needing testing?
+		case "${m_enable}" in
+			"test") err_disabled_mach "${m_name}" "${m_ip/ip/IP}" "${m_ip}" "test" ;;
+			"no") err_disabled_mach "${m_name}" "${m_ip/ip/IP}" "${m_ip}" ;;
+		esac
+
+		# Show relevant information about the machine
+		show_${m_ip}_info
+	done
+
+	# All other systems that don't have a USE flag go here
+	# These systems have base-line support included in linux-mips git, so
+	# instead of failing, if disabled, we simply warn the user
+	if [[ "${arch_is_selected}" = "no" ]]; then
+		[[ "${DO_IP22}" = "no" ]]						\
+			&& err_disabled_mach "SGI Indy/Indigo2 R4x00" "IP22" "skip"	\
+			|| show_ip22_info
+		[[ "${DO_IP32}" = "no" ]]						\
+			&& err_disabled_mach "SGI O2" "IP32" "skip"			\
+			|| show_ip32_info
+
+	fi
+}
+
+show_ip22_info() {
+	echo -e ""
+	einfo "IP22 systems with an R5000 processor should work with this release."
+	einfo "The R4x00 series of processors tend to be rather flaky, especially the"
+	einfo "R4600.  If you have to run an R4x00 processor, then try to use an R4400."
+	einfo ""
+	einfo "Some Notes:"
+	einfo "\t- The only supported graphics card right is Newport (XL)."
+	einfo "\t- There is no driver for Extreme (XZ)."
+	echo -e ""
+}
+
+show_ip27_info() {
+	echo -e ""
+	ewarn "IP27 Origin 2k/Onyx2 systems may be prone to sudden hard lockups."
+	ewarn "The exact trigger is unknown at this time."
+	echo -e ""
+}
+
+show_ip28_info() {
+	echo -e ""
+	einfo "Support for the Indigo2 Impact R10000 is now in the mainline kernel.  However,"
+	einfo "due to the R10000 Speculative Execution issue that exists with this machine,"
+	einfo "nothing is guaranteed to work correctly.  Consider enabling ${HILITE}CONFIG_KALLSYMS${NORMAL}"
+	einfo "in your kernel so that if the machine Oopes, you'll be able to provide valuable"
+	einfo "feedback that can be used to trace down the crash."
+	echo -e ""
+}
+
+show_ip30_info() {
+	echo -e ""
+	eerror "Things that DON'T work:"
+	eerror "\t- Do not use CONFIG_SLUB, otherwise, you'll get errors when booting"
+	eerror "\t\040\040regarding duplicate /sys/kernel/slab/* entries in sysfs."
+	eerror "\t- Impact (MGRAS) Xorg driver no longer functions due to severe bitrot."
+	eerror "\t- Octane is limited to a maximum of 2GB of memory right now due to a"
+	eerror "\t\040\040hardware quirk in the BRIDGE PCI chip that limits BRIDGE DMA"
+	eerror "\t\040\040addresses to 31-bits when converted into physical addresses."
+	echo -e ""
+	ewarn "Things that might work, but have problems, or are unknown:"
+	ewarn "\t- Serial support on the Octane uses a very basic UART driver that drives"
+	ewarn "\t\040\040the 16550A chip on the IOC3 directly.  It does not use interrupts,"
+	ewarn "\t\040\040only a polling routine on a timer, which makes it slow and CPU-"
+	ewarn "\t\040\040intensive.  The baud rate is limited to no more than 38.4kbps on"
+	ewarn "\t\040\040this driver.  Patches for getting the Altix IOC3 serial driver to"
+	ewarn "\t\040\040work (which uses DMA and supports faster baud rates) are welcome."
+	ewarn "\t- MENET boards appear to have the four ethernet ports detected, however"
+	ewarn "\t\040\040the six serial ports don't appear to get picked up by the IOC3"
+	ewarn "\t\040\040UART driver.  The NIC part number is also not read correctly"
+	ewarn "\t\040\040from the four Number-In-a-Cans."
+	ewarn "\t- Other XIO-based devices, like various Impact addons, remain untested"
+	ewarn "\t\040\040and are not guaranteed to work."
+	ewarn "\t- Upon rebooting, Octane may not return to the PROM.  Holding down the"
+	ewarn "\t\040\040reset button for up to ten seconds, releasing, then pressing it"
+	ewarn "\t\040\040again for one or two seconds may trigger the system to return"
+	ewarn "\t\040\040to the PROM.  Please wait at least five seconds after each attempt"
+	ewarn "\t\040\040to see if the machine responds.  As a last resort, unplugging the"
+	ewarn "\t\040\040power cord for 30 seconds will also work, but be aware the power"
+	ewarn "\t\040\040supplies on these systems will not appreciate this due to their"
+	ewarn "\t\040\040relative old age."
+	echo -e ""
+	einfo "Things that DO work:"
+	einfo "\t- SMP support."
+	einfo "\t- Impact (MGRAS), console only."
+	einfo "\t- VPro (Odyssey), console only."
+	einfo "\t- PCI card cages (showbox) should work for many devices, except certain"
+	einfo "\t\040\040types such as PCI-to-PCI bridges (USB hubs, USB flash card readers)."
+	einfo "\t- SCSI, RTC, basic PCI, IOC3 Ethernet, keyboard, and mouse.  Please"
+	einfo "\t\040\040report any problems with these devices."
+	einfo "\t- SGI AceNIC/Tigon II gigabit cards will work in the PCI card cage/shoebox."
+	echo -e ""
+}
+
+show_ip32_info() {
+	echo -e ""
+	einfo "IP32 systems function well, however there are some notes:"
+	einfo "\t- A sound driver now exists for IP32."
+	einfo "\t- Framebuffer console is limited to 4MB.  Anything greater"
+	einfo "\t\040\040specified when building the kernel will oops or"
+	einfo "\t\040\040panic the kernel."
+	echo -e ""
+	eerror "IP32 Systems may be unstable and prone to lockups under a 5.4.x LTS kernel."
+	eerror "The cause is unknown at this time."
+	echo -e ""
+
+	einfo "To Build 64bit kernels for SGI O2 (IP32) or SGI Indy/Indigo2 R4x00 (IP22)"
+	einfo "systems, you need to use the ${GOOD}vmlinux.32${NORMAL} make target."
+	einfo "Once done, boot the ${GOOD}vmlinux.32${NORMAL} file (NOT vmlinux)."
+}
+
+src_unpack() {
+	# Unpack the kernel sources, update to the latest rev (if needed),
+	# and apply the latest patch from linux-mips git.
+	kernel-2_src_unpack
+
+	# Unpack the mips-sources patchset to ${WORKDIR}/mips-patches-${BASE_KV}.
+	echo -e ""
+	cd "${WORKDIR}"
+	unpack "${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
+
+	# Create a new folder called 'patch-symlinks' and create symlinks to
+	# all mips-patches in there.  If we want to exclude a patch, we'll
+	# just delete the symlink instead of the actual patch.
+	mkdir patch-symlinks
+	cd patch-symlinks
+	for x in ../mips-patches-${BASE_KV}/*.patch; do
+		ln -s "${x}" "${x##../mips-patches-*/}"
+	done
+
+	# With symlinks created, setup the variables referencing external
+	# machine patches and if a machine USE flag is enabled, then unset
+	# its corresponding variable.
+	# See 0000_README for the patch numbers and their meanings.
+	local p_generic="51*"
+	local p_ip27="52*" p_ip28="53*" p_ip30="54*"
+	local p_xp="80*"
+	use ip27 && unset p_generic p_ip27
+	use ip28 && unset p_ip28
+	use ip30 && unset p_generic p_ip30
+	use experimental && unset p_xp
+
+	# Remove symlinks for any patches that we don't want applied.  We
+	# do this by looping through all the above variables, and deleting
+	# matching symlinks that point to the corresponding patches.
+	# The remaining symlinks will be applied to the kernel source.
+	#
+	# $P_EXCLUDE is a new var that can be set in an ebuild to exclude
+	# specific patches by wildcarding the patch number.
+	local patchlist="${p_generic} ${p_ip27} ${p_ip28} ${p_ip30} ${p_xp} ${P_EXCLUDE}"
+	for x in $patchlist;
+		do rm -f "./${x}"
+	done
+
+	# Rename the source tree, if needed.
+	local old="${WORKDIR}/linux-${F_KV%-*/_/-}"
+	local new="${WORKDIR}/linux-$(fkv_to_machtype)"
+	if [[ "${old}" != "${new}" ]]; then
+		mv "${old}" "${new}" || die
+	fi
+	S="${new}"
+
+	# Set the EXTRAVERSION to linux-VERSION-mipsgit-GITDATE
+	EXTRAVERSION="${EXTRAVERSION}-gentoo-mips"
+	unpack_set_extraversion
+}
+
+src_prepare() {
+	# Apply patches to the kernel tree.
+	eapply "${WORKDIR}/patch-symlinks"/
+
+	eapply_user
+}
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 6c8ca1070ae3..310f54c1fe79 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -27,11 +27,11 @@ DIST patch-5.10.231-rt123.patch.xz 171552 BLAKE2B a99c1c1c38e75290a58f958a5d1aae
 DIST patch-5.10.231.xz 6446512 BLAKE2B c5b860d7efd910f12a26c656d7bfcd73d7a8598b950fb9df47e04cbe0db11dde52154b15522792e1b7cd2568ba2c28024f7bf89ad61ddd567092967db382a3f0 SHA512 2ce789cbb35296a5e4bf5e8b3152dfa66d9e01eb4bfff07d3057f3a8622188025a6f05f48b4c0941c728731803756e672ee42b0891e4d9fb3f9e8170cf6ba064
 DIST patch-5.15.173-rt82.patch.xz 80992 BLAKE2B 0b5a2f400f1aa7caf26d31bdc1e729e6ff4dedc65b93686f2ba29f72a889d10d300db09956f989a157a5d471cdd2943b7164fb6ec5b8b1a19c577a975ab7b245 SHA512 90a8ec647ee44e065dc5509a122a7cec7f37a06acc46aa21cbb49ba3f9d50ff32be872b183d2a8e54c1c6f37bf787bc12f2cc28c13aaab845cd1f1223ed838c9
 DIST patch-5.15.173.xz 6431224 BLAKE2B bfaa22de47d30b1cc8d9db9a01ecc89a8c93d76d18ec9376af5bad0e37d55a116ae3d1a4a2902a59d37d6837857fadafde9e6eeabafebf76f89b0b8f9bc7bae1 SHA512 381921711fcb8b606137f79d0fe915ef0b132edd1490e85669f5016a474977ba1a1f63b2e6d6b160ff4903f2cd2e2edd55642625dfdc08d1b7effed4c7fe51fb
-DIST patch-5.4.285-rt93.patch.xz 183316 BLAKE2B 0695cde224e09574b942fa7a98ef1df1c81c7c8402ef1eaa171d653e93877bc7b4ea263a45ab94347485f1dcf07f859b07f1120e611a2b89c50bd481c09bc992 SHA512 437a7763517863f94d2dc243c159c7b69f1c8d6a781ec2574121c96fa3e7e26d40b4f5e10056d34cc564ab9aeebd3981f7f2c778d0964ff17f23688033d8619c
-DIST patch-5.4.285.xz 5848868 BLAKE2B f48953649a0cd30a58591f761c41a0f7ce4c1d06c303485dca43496c032454d0b17694c16a0aa9517e0d5fcbb10a236defc043901d761cdfe90c152f0927d16e SHA512 7b1eee5220e1320137ea19e3448b8be0ce885b03432199f08469e35c6b73ab911257f68ee623caf09a839275a080986a2afe4cb2dd6580b601984991b9f34bde
+DIST patch-5.4.288-rt94.patch.xz 183356 BLAKE2B cdafe86cb2321cabcbc28d42a7821a0113606181042dce9dbcc43a45ee1e3772175cc490a262f59cc13313478524e1e39209983e7cdb9bdf8db49eabd0244417 SHA512 07620bbca0556d3a5cc04ff506e70def11c128c0bfb292bfc16ef587f005ca558421b11b428ff20af29e1a5c928cdf2c11cab8173a82b96b90c1733be2ba6e88
+DIST patch-5.4.288.xz 5871140 BLAKE2B 1b95bf2ee6541a451a6c01c8af9a87323410430151570948307d1260f4258fdfc65942b7e507f458f1e2d0ee35189c5904c9be56d048eaa574b88817663a6755 SHA512 106884bcaeedce6101a3de52a8d6c9ce7984426776336f98e30e9cceaf379fae32a1aed9fdc0912cba848a731ae53388ed55744b5a8e35f813a05ac31dbaca3f
 DIST patch-6.0.5-rt14.patch.xz 59916 BLAKE2B be06477b7733cb280bbb8ab1cc2b4c611d5b133d97e2459877a8aac0c82a6fa74cba7a7640b49ba6dd9d0abd61a9f9682affb032a8b9f0097874fff35fea9b71 SHA512 3e36e45f16499ddbd7029723363ff4cf6e7cd9503ba49f9ce0dbb960b34855c8411abccd32838f9f162412b4a1749f676432e463fce8066496f256313c99d79e
 DIST patch-6.0.5.xz 274580 BLAKE2B b1fd53745b1858f92ded90a78d8060e1c916a8b6c256f96188331e5ac80242a40a83d14377ad0befec5415135925821cb264489cee63fe4ad432ba00c64983ff SHA512 c4ac4387c490e73b8d91d13fbea9a1e065be4bacf9535177e625561adb2411908a546f9c4327748aab6bbfc021f30887f3e5df5d6019c6cfe00fe5bf64aad2eb
-DIST patch-6.1.120-rt46.patch.xz 54308 BLAKE2B f2d374d520acba6df92afe9d6348c5acb8af7bdb08e6e18750b5cbfc21566eabc67ff9d85122c2521ac533e364c5fdc75e0f669bbb2bfc8fe5f7442338bc38da SHA512 261c5bab0906cca6ab19e9e9287549ef584ebd81392e0d6baaef1d6d4eac28f8ad6af103fe10cbfc78fb13734c9dcd4ba70a99497e614c93dcea0ade0d93e2b1
+DIST patch-6.1.120-rt47.patch.xz 54308 BLAKE2B 13ec8951086660cfb5a7fa35e24bb5d558d9c45197573f11c605b8540572c0cb6f9affa4ee5b8cd781d2a2fa9d286ede50e9d360406f200009f76167cb40a240 SHA512 07c510a59ab7c3faa08b49420c418c28101fa001e0e46fb3d5244982fe30af9cd073e508eab476ea78c3c80604725ee30912cd0d3684650c8e854f8f42bb689d
 DIST patch-6.1.120.xz 5628904 BLAKE2B 1e4b6e6082eb3755abd5a98b2367f10c39a1f5bee763a9ac04e8028b88830cc0fe61669757ba5e6d95f10471ec5610e41064044de72ebb89d1b09076562ec92f SHA512 716541c151c3c387297e0e7c5e626a71afca10c42b6ca2dce484f2348036df486dc45f08b90045a4fc5343ee398737df267ec1d95905bf5b9ac6b7b3f42ad755
 DIST patch-6.5.2-rt8.patch.xz 54436 BLAKE2B 296da85395314ce26900eefb32a7c9b565b4242603884ab51e6208576e5fa6ceb3bd6269d8938e24f58a0b5d937e556345b45057f90166574797289152b15ae3 SHA512 9b625e33f5097729fb2462e2a6e96a1e13a7677af875ce028f6f8fadd1ab60bc9064ca9b101334211bdaf49ba36c750bfdf8260ff03a5ac2a2277a28293b309c
 DIST patch-6.5.2.xz 14964 BLAKE2B de3a0d15141199f98873c332f0c0237a39534bffe624f9394a6ba2bb9c3d731121d1b698963c424b919f7683fcffce1a86884bf64d26938cd529a14a211f1904 SHA512 e377f1fd5802321ea8198bbf661b15ec050f5ee902666359c8e1cce8e36abbb67957e04bdc1ee8a91eb3bf2c56ef62e9f5535dc52982eb6185476ce794449402
diff --git a/sys-kernel/rt-sources/rt-sources-5.4.285_p93.ebuild b/sys-kernel/rt-sources/rt-sources-5.4.285_p93.ebuild
deleted file mode 100644
index ced1c46432c8..000000000000
--- a/sys-kernel/rt-sources/rt-sources-5.4.285_p93.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-
-CKV="$(ver_cut 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
-
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-KEYWORDS="~amd64 ~arm64"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
-	default
-
-	# 627796
-	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
-		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-5.4.288_p94.ebuild b/sys-kernel/rt-sources/rt-sources-5.4.288_p94.ebuild
new file mode 100644
index 000000000000..d32c37d7dd33
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-5.4.288_p94.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+
+CKV="$(ver_cut 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
+
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+KEYWORDS="~amd64 ~arm64"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-6.1.120_p46.ebuild b/sys-kernel/rt-sources/rt-sources-6.1.120_p46.ebuild
deleted file mode 100644
index 2a03c9f44c9e..000000000000
--- a/sys-kernel/rt-sources/rt-sources-6.1.120_p46.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-
-CKV="$(ver_cut 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
-
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-KEYWORDS="~amd64 ~arm64"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
-	default
-
-	# 627796
-	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT/g" \
-		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-6.1.120_p47.ebuild b/sys-kernel/rt-sources/rt-sources-6.1.120_p47.ebuild
new file mode 100644
index 000000000000..bfdbb92b20c0
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-6.1.120_p47.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+
+CKV="$(ver_cut 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
+
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+KEYWORDS="~amd64 ~arm64"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT/g" \
+		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/scx/metadata.xml b/sys-kernel/scx/metadata.xml
index 9e74c5106a0b..81f9d5cdb263 100644
--- a/sys-kernel/scx/metadata.xml
+++ b/sys-kernel/scx/metadata.xml
@@ -22,5 +22,7 @@
 	</use>
 	<upstream>
 		<remote-id type="github">sched-ext/scx</remote-id>
+		<changelog>https://github.com/sched-ext/scx/releases</changelog>
+		<bugs-to>https://github.com/sched-ext/scx/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-kernel/scx/scx-1.0.8.ebuild b/sys-kernel/scx/scx-1.0.8.ebuild
index 7fffa4a5be4e..572276fe1c97 100644
--- a/sys-kernel/scx/scx-1.0.8.ebuild
+++ b/sys-kernel/scx/scx-1.0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-LLVM_COMPAT=( {16..18} )
+LLVM_COMPAT=( {16..19} )
 
 # List of crates for pycargoebuild:
 # rust/scx_{loader,rustland_core,stats,utils}
@@ -287,7 +287,7 @@ LICENSE="GPL-2"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="openrc systemd"
 
 DEPEND="
diff --git a/sys-kernel/ugrd/Manifest b/sys-kernel/ugrd/Manifest
index 960cabdfe194..df611727d5fc 100644
--- a/sys-kernel/ugrd/Manifest
+++ b/sys-kernel/ugrd/Manifest
@@ -1,10 +1,8 @@
-DIST ugrd-1.13.0.tar.gz 63781 BLAKE2B 3f2d3095c6303b16947121071dabdbef81baaea5a7e208d53250e57edf136618497710ce3cca2906b87fbdc529b8a9ef119659365bba8c795594774cf8d096f6 SHA512 a745685668e981accfd32d1c47c6cf506ae63304ef5b3fdad200731db75b76fe56a4339876465bb1857c2fed35c273f95bbce390224fa0d01aebd67adbc31aa6
-DIST ugrd-1.17.0.tar.gz 69517 BLAKE2B 2acadac8ab3830791146522ccfff6f8c5e98eff4cea355dafd5f5498bedf5d0f200ec2bc2ee4a20c62e3920590c70b2c788c776c148e7291cd3391eb2e0018df SHA512 5caeebadb579536a60cecd6c9fd9036c178ab5c5700418b95841e7102ac0c3c5fa14ceebc9994a86f65bd0623ca819ed7cb7a986f412e0358c9597c0e579f90c
 DIST ugrd-1.20.0.tar.gz 64541 BLAKE2B d85241e6c0822d3df0d65cc07cb17014b4d66554476caf4d37ebc77943c57ef3004e1e01b4eb504974b2ab9d1a03015812e8b0cb19ebf03667a9f6c7a1bded03 SHA512 88f137fa5fc4cb61418cda03c0c58ff7632c1e61b7688ad9e8cce538842d817e973c1d2293b8bb92b9697a29511cb535059ca060793ba6353d95d5ddad417f3a
 DIST ugrd-1.22.0.tar.gz 65955 BLAKE2B 0573364964ce8d874ff126e87e003aeb90d3f6460ecaca7aaf5f231fe9069dca9239c0ee9e68157eebaab8651401df0c22695d5a81e2984dbfb89b4a38f5a0aa SHA512 78598f0b0d81a9528b84fd829269b7ce0588830bf95ce5e6455c02053e38a25dd9eecb664057ea6bfed653590c39f73dd3f4a4235e056d27c9c100b166a29996
 DIST ugrd-1.24.2.tar.gz 68762 BLAKE2B 2def2144381f66ac79d5c2246f49cacdde3aafd3ee7909cc9bfbfbb31dc554d501b240854452f51e4fd8e66d2af20c7380ee2552eb546f6728d56d59f9a2e9a1 SHA512 d5c756950212509d5a94c8f82b27da2cefdf6b7328f2871a9a56231e8e15d0fde1aea1850066935bdc5c143172fb3b2b09fb9fb131c3f52813d5b609541136d5
-DIST ugrd-1.25.0.tar.gz 70221 BLAKE2B 7f3403dd4c5b6131c61c92679d447df6ef49e6dc6d7f17cef67b90d5d2c06087417fc0700a42be41e73749b127e11df807a93c14e91a50827e6043214ca6990c SHA512 6e4b74ee6d4cf38f76063cb5a15a2b853422a6a9ee25887830dbc158e61b1ea2a25dd36522d3e8642eb05ba875baa03ce18db1d66407f0ea55a4261cdd6df5da
-DIST ugrd-1.26.0.tar.gz 73284 BLAKE2B b96785a408b6a631d6708bf2bd6d570c95b0ba4a7d7bea297f36674d4625f16472256b8470578ff2b973ed162e9c0465a24937d38aead4da19d9085e220c8d1f SHA512 4b2309c53d5d28741974cdfe2f5a58b939afb523f8ba8f30e10b70bd1d0ed44aa925d64a3fcd60ff46d46df6c79250ca21cd1a712ef9e9f77af4512f9ff3874d
-DIST ugrd-1.27.1.tar.gz 76097 BLAKE2B ee43a5f97c2a32ce218871c11bbc1aec1c5d9edf669cc54fc8a677e177354231575f513e5bb0bb75afb9642b206d0601174b919fa9084a5305410573cf5e0205 SHA512 f6aa122a0a9778ac813197cdba1c433c6b1cbdd767eec45ccc56f264b6559f2beb56f4603592efed40f503526ef482f488dc6421be58e76d68f386f54dc5841e
 DIST ugrd-1.27.2.tar.gz 76119 BLAKE2B 7a97f0189f1b39f0a1264c4ac9fbc8dc15f6bf93639db8c232dd6d7f488a98cac422b71d1214e9583491b6fd59064358419a39af14ac9e3c9b1e5f0573c1ec50 SHA512 6b079b31c286771619fbf6306bfbab8685e7b92e06c04fc9139c9bd1ade861816df15174b7e72109215ba941cf73b0514749650a8f0b2ff27c40b4d0d51ed48f
 DIST ugrd-1.28.2.tar.gz 79970 BLAKE2B 545d9a21e3fa5dbee3a29adad5f3df4f4c60c363866277520d0783c0e578d762301c94b0791b5a21b47ef8172cf9658ae47c43a5b696d311a76fea6649f80d17 SHA512 7598cf15869f3e8aca681fd1d8f239da66b84252978152559fa154d43ae06a1edab2cbee0b7fbaf8a48abc40e9b96c769534c95fed4e040e2f9ae7ab90694a6d
+DIST ugrd-1.29.0.tar.gz 81078 BLAKE2B 6f0e25d325878a0bfba442fafd4dcd4ed0f51312339c3cfc8ef4a43b90020b143c34d7f9fddaa7e4af90260e25c5a9776842a61f6ad7483b7dd9e3c3c02049b2 SHA512 68ecfb9694e789df5de12068b4fac97d578d1ce1bc046e67f5859c5742e6cc3c33d3d87703c80d50603a4b1d504fed57a27d8e2a609f243f236f9040ddbf85bf
+DIST ugrd-1.30.1.tar.gz 86277 BLAKE2B ce45778d9e14894b7b77e52eb86b982200f8acb9c06efcf33d07813a0e8611c9a2062fe1ba893d86a96580c8e557ecee3fb93b633554564f32b0508c781ecd74 SHA512 a9c7ae0f2ed2daf77eb36366c31ca1728f54b1a9c1b047809fe30311b152f825276b3314410dcb782c3f4fda603c643521f7e318eab2fb09a567c15659a56f78
+DIST ugrd-1.31.0.tar.gz 87298 BLAKE2B 6020188d072e332e55f71be20664db56921ddee5c1caa8646c29899276946bd058e70ec0fb204d637bb6c89e2b541fa7dec25431814c7948d0e63374521f8de3 SHA512 4fc146feeab87e5aff3fde20c2f9cc57c1a7327d58b6951e1914b0910a74218ac8edbbc284c4f4a0d8fc3b5e578356bc68a62a6d2b3a8c6d68e8d9425ab25d2a
diff --git a/sys-kernel/ugrd/metadata.xml b/sys-kernel/ugrd/metadata.xml
index 9299eb2d63ab..2388cc610e5f 100644
--- a/sys-kernel/ugrd/metadata.xml
+++ b/sys-kernel/ugrd/metadata.xml
@@ -10,6 +10,8 @@
 		<name>Nowa Ammerlaan</name>
 	</maintainer>
 	<upstream>
+		<bugs-to>https://github.com/desultory/ugrd/issues</bugs-to>
+		<changelog>https://github.com/desultory/ugrd/releases</changelog>
 		<remote-id type="github">desultory/ugrd</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-kernel/ugrd/ugrd-1.13.0.ebuild b/sys-kernel/ugrd/ugrd-1.13.0.ebuild
deleted file mode 100644
index 4dd028049afe..000000000000
--- a/sys-kernel/ugrd/ugrd-1.13.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
-inherit distutils-r1 optfeature shell-completion
-
-DESCRIPTION="Python based initramfs generator with TOML defintions"
-HOMEPAGE="https://github.com/desultory/ugrd"
-SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	app-misc/pax-utils
-	>=dev-python/zenlib-2.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pycpio-1.2.1[${PYTHON_USEDEP}]
-	sys-apps/pciutils
-"
-
-python_install_all() {
-	# Call the distutils-r1_python_install_all function
-	distutils-r1_python_install_all
-	# Install the example config into /etc/ugrd/config.toml
-	# Do not overwrite an existing config
-	insinto /etc/ugrd
-	newins examples/example.toml config.toml
-
-	# Install the kernel preinst.d hook
-	exeinto /usr/lib/kernel/preinst.d
-	doexe hooks/installkernel/52-ugrd.install
-	exeinto /usr/lib/kernel/install.d
-	doexe hooks/kernel-install/52-ugrd.install
-
-	dobashcomp completion/ugrd  # Install bash autocomplete script
-	dozshcomp completion/_ugrd  # Install zsh autocomplete script
-}
-
-pkg_postinst() {
-	optfeature "ugrd.crypto.cryptsetup support" sys-fs/cryptsetup
-	optfeature "ugrd.fs.btrfs support" sys-fs/btrfs-progs
-	optfeature "ugrd.crypto.gpg support" app-crypt/gnupg
-	optfeature "ugrd.fs.lvm support" sys-fs/lvm2[lvm]
-}
diff --git a/sys-kernel/ugrd/ugrd-1.17.0.ebuild b/sys-kernel/ugrd/ugrd-1.17.0.ebuild
deleted file mode 100644
index 204c70be070a..000000000000
--- a/sys-kernel/ugrd/ugrd-1.17.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
-inherit distutils-r1 optfeature shell-completion
-
-DESCRIPTION="Python based initramfs generator with TOML defintions"
-HOMEPAGE="https://github.com/desultory/ugrd"
-SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	app-misc/pax-utils
-	>=dev-python/zenlib-2.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pycpio-1.2.1[${PYTHON_USEDEP}]
-	sys-apps/pciutils
-"
-
-python_install_all() {
-	# Call the distutils-r1_python_install_all function
-	distutils-r1_python_install_all
-	# Install the example config into /etc/ugrd/config.toml
-	# Do not overwrite an existing config
-	insinto /etc/ugrd
-	newins examples/example.toml config.toml
-
-	# Install the kernel preinst.d hook
-	exeinto /usr/lib/kernel/preinst.d
-	doexe hooks/installkernel/52-ugrd.install
-	exeinto /usr/lib/kernel/install.d
-	doexe hooks/kernel-install/52-ugrd.install
-
-	dobashcomp completion/ugrd  # Install bash autocomplete script
-	dozshcomp completion/_ugrd  # Install zsh autocomplete script
-}
-
-pkg_postinst() {
-	optfeature "ugrd.crypto.cryptsetup support" sys-fs/cryptsetup
-	optfeature "ugrd.fs.btrfs support" sys-fs/btrfs-progs
-	optfeature "ugrd.crypto.gpg support" app-crypt/gnupg
-	optfeature "ugrd.fs.lvm support" sys-fs/lvm2[lvm]
-}
diff --git a/sys-kernel/ugrd/ugrd-1.20.0.ebuild b/sys-kernel/ugrd/ugrd-1.20.0.ebuild
index a38b24dd7d62..400600630547 100644
--- a/sys-kernel/ugrd/ugrd-1.20.0.ebuild
+++ b/sys-kernel/ugrd/ugrd-1.20.0.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
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{11..12} )
 inherit distutils-r1 optfeature shell-completion
 
-DESCRIPTION="Python based initramfs generator with TOML defintions"
+DESCRIPTION="Python based initramfs generator with TOML definitions"
 HOMEPAGE="https://github.com/desultory/ugrd"
 SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/sys-kernel/ugrd/ugrd-1.22.0.ebuild b/sys-kernel/ugrd/ugrd-1.22.0.ebuild
index 89a9cc845740..0ce85cfdaf22 100644
--- a/sys-kernel/ugrd/ugrd-1.22.0.ebuild
+++ b/sys-kernel/ugrd/ugrd-1.22.0.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
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{11..12} )
 inherit distutils-r1 optfeature shell-completion
 
-DESCRIPTION="Python based initramfs generator with TOML defintions"
+DESCRIPTION="Python based initramfs generator with TOML definitions"
 HOMEPAGE="https://github.com/desultory/ugrd"
 SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/sys-kernel/ugrd/ugrd-1.24.2.ebuild b/sys-kernel/ugrd/ugrd-1.24.2.ebuild
index 789839aa07b4..e5a579969a43 100644
--- a/sys-kernel/ugrd/ugrd-1.24.2.ebuild
+++ b/sys-kernel/ugrd/ugrd-1.24.2.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
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{11..12} )
 inherit distutils-r1 optfeature shell-completion
 
-DESCRIPTION="Python based initramfs generator with TOML defintions"
+DESCRIPTION="Python based initramfs generator with TOML definitions"
 HOMEPAGE="https://github.com/desultory/ugrd"
 SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/sys-kernel/ugrd/ugrd-1.25.0.ebuild b/sys-kernel/ugrd/ugrd-1.25.0.ebuild
deleted file mode 100644
index 61f7ba42490c..000000000000
--- a/sys-kernel/ugrd/ugrd-1.25.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
-inherit distutils-r1 optfeature shell-completion
-
-DESCRIPTION="Python based initramfs generator with TOML defintions"
-HOMEPAGE="https://github.com/desultory/ugrd"
-SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-PROPERTIES="test_privileged"
-
-RDEPEND="
-	app-misc/pax-utils
-	>=dev-python/zenlib-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pycpio-1.4.0[${PYTHON_USEDEP}]
-	sys-apps/pciutils
-"
-
-BDEPEND="
-	test? (
-		amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] )
-		arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] )
-	)
-"
-
-python_install_all() {
-	# Call the distutils-r1_python_install_all function
-	distutils-r1_python_install_all
-	# Install the example config into /etc/ugrd/config.toml
-	# Do not overwrite an existing config
-	insinto /etc/ugrd
-	newins examples/example.toml config.toml
-
-	# Install the kernel preinst.d hook
-	exeinto /usr/lib/kernel/preinst.d
-	doexe hooks/installkernel/52-ugrd.install
-	exeinto /usr/lib/kernel/install.d
-	doexe hooks/kernel-install/52-ugrd.install
-
-	dobashcomp completion/ugrd  # Install bash autocomplete script
-	dozshcomp completion/_ugrd  # Install zsh autocomplete script
-}
-
-pkg_postinst() {
-	optfeature "ugrd.crypto.cryptsetup support" sys-fs/cryptsetup
-	optfeature "ugrd.fs.btrfs support" sys-fs/btrfs-progs
-	optfeature "ugrd.crypto.gpg support" app-crypt/gnupg
-	optfeature "ugrd.fs.lvm support" sys-fs/lvm2[lvm]
-	optfeature "ugrd.fs.mdraid support" sys-fs/mdadm
-	optfeature "ugrd.base.plymouth support" sys-boot/plymouth
-}
-
-distutils_enable_tests unittest
-
-src_test() {
-	addwrite /dev/kvm
-	distutils-r1_src_test
-}
-
-python_test() {
-	eunittest tests/
-}
diff --git a/sys-kernel/ugrd/ugrd-1.26.0.ebuild b/sys-kernel/ugrd/ugrd-1.26.0.ebuild
deleted file mode 100644
index 59dca3e27ae0..000000000000
--- a/sys-kernel/ugrd/ugrd-1.26.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..13} )
-inherit distutils-r1 optfeature shell-completion
-
-DESCRIPTION="Python based initramfs generator with TOML defintions"
-HOMEPAGE="https://github.com/desultory/ugrd"
-SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-PROPERTIES="test_privileged"
-
-RDEPEND="
-	app-misc/pax-utils
-	>=dev-python/zenlib-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pycpio-1.4.0[${PYTHON_USEDEP}]
-	sys-apps/pciutils
-"
-
-BDEPEND="
-	test? (
-		amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] )
-		arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] )
-	)
-"
-
-python_install_all() {
-	# Call the distutils-r1_python_install_all function
-	distutils-r1_python_install_all
-	# Install the example config into /etc/ugrd/config.toml
-	# Do not overwrite an existing config
-	insinto /etc/ugrd
-	newins examples/example.toml config.toml
-
-	# Install the kernel preinst.d hook
-	exeinto /usr/lib/kernel/preinst.d
-	doexe hooks/installkernel/52-ugrd.install
-	exeinto /usr/lib/kernel/install.d
-	doexe hooks/kernel-install/52-ugrd.install
-
-	dobashcomp completion/ugrd  # Install bash autocomplete script
-	dozshcomp completion/_ugrd  # Install zsh autocomplete script
-}
-
-pkg_postinst() {
-	optfeature "ugrd.crypto.cryptsetup support" sys-fs/cryptsetup
-	optfeature "ugrd.fs.btrfs support" sys-fs/btrfs-progs
-	optfeature "ugrd.crypto.gpg support" app-crypt/gnupg
-	optfeature "ugrd.fs.lvm support" sys-fs/lvm2[lvm]
-	optfeature "ugrd.fs.mdraid support" sys-fs/mdadm
-	optfeature "ugrd.base.plymouth support" sys-boot/plymouth
-}
-
-distutils_enable_tests unittest
-
-src_test() {
-	addwrite /dev/kvm
-	distutils-r1_src_test
-}
-
-python_test() {
-	eunittest tests/
-}
diff --git a/sys-kernel/ugrd/ugrd-1.27.1.ebuild b/sys-kernel/ugrd/ugrd-1.27.1.ebuild
deleted file mode 100644
index 21ddb7fb455a..000000000000
--- a/sys-kernel/ugrd/ugrd-1.27.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..13} )
-inherit distutils-r1 optfeature shell-completion
-
-DESCRIPTION="Python based initramfs generator with TOML defintions"
-HOMEPAGE="https://github.com/desultory/ugrd"
-SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-PROPERTIES="test_privileged"
-
-RDEPEND="
-	app-misc/pax-utils
-	>=dev-python/zenlib-2.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pycpio-1.4.0[${PYTHON_USEDEP}]
-	sys-apps/pciutils
-"
-
-BDEPEND="
-	test? (
-		sys-fs/btrfs-progs
-		sys-fs/xfsprogs
-		sys-fs/cryptsetup
-		amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] )
-		arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] )
-	)
-"
-
-python_install_all() {
-	# Call the distutils-r1_python_install_all function
-	distutils-r1_python_install_all
-	# Install the example config into /etc/ugrd/config.toml
-	# Do not overwrite an existing config
-	insinto /etc/ugrd
-	newins examples/example.toml config.toml
-
-	# Install the kernel preinst.d hook
-	exeinto /usr/lib/kernel/preinst.d
-	doexe hooks/installkernel/52-ugrd.install
-	exeinto /usr/lib/kernel/install.d
-	doexe hooks/kernel-install/52-ugrd.install
-
-	dobashcomp completion/ugrd  # Install bash autocomplete script
-	dozshcomp completion/_ugrd  # Install zsh autocomplete script
-}
-
-pkg_postinst() {
-	optfeature "ugrd.crypto.cryptsetup support" sys-fs/cryptsetup
-	optfeature "ugrd.fs.btrfs support" sys-fs/btrfs-progs
-	optfeature "ugrd.crypto.gpg support" app-crypt/gnupg
-	optfeature "ugrd.fs.lvm support" sys-fs/lvm2[lvm]
-	optfeature "ugrd.fs.mdraid support" sys-fs/mdadm
-	optfeature "ugrd.base.plymouth support" sys-boot/plymouth
-}
-
-distutils_enable_tests unittest
-
-src_test() {
-	addwrite /dev/kvm
-	distutils-r1_src_test
-}
-
-python_test() {
-	eunittest tests/
-}
diff --git a/sys-kernel/ugrd/ugrd-1.27.2.ebuild b/sys-kernel/ugrd/ugrd-1.27.2.ebuild
index a8b014580707..cd8653b1b42d 100644
--- a/sys-kernel/ugrd/ugrd-1.27.2.ebuild
+++ b/sys-kernel/ugrd/ugrd-1.27.2.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
@@ -7,13 +7,13 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{11..13} )
 inherit distutils-r1 optfeature shell-completion
 
-DESCRIPTION="Python based initramfs generator with TOML defintions"
+DESCRIPTION="Python based initramfs generator with TOML definitions"
 HOMEPAGE="https://github.com/desultory/ugrd"
 SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm64"
+KEYWORDS="amd64 arm64"
 RESTRICT="test"
 PROPERTIES="test_privileged"
 
diff --git a/sys-kernel/ugrd/ugrd-1.28.2.ebuild b/sys-kernel/ugrd/ugrd-1.28.2.ebuild
index 21ddb7fb455a..062b112fe465 100644
--- a/sys-kernel/ugrd/ugrd-1.28.2.ebuild
+++ b/sys-kernel/ugrd/ugrd-1.28.2.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
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{11..13} )
 inherit distutils-r1 optfeature shell-completion
 
-DESCRIPTION="Python based initramfs generator with TOML defintions"
+DESCRIPTION="Python based initramfs generator with TOML definitions"
 HOMEPAGE="https://github.com/desultory/ugrd"
 SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/sys-kernel/ugrd/ugrd-1.29.0-r1.ebuild b/sys-kernel/ugrd/ugrd-1.29.0-r1.ebuild
new file mode 100644
index 000000000000..bee3a1e62b5e
--- /dev/null
+++ b/sys-kernel/ugrd/ugrd-1.29.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..13} )
+inherit distutils-r1 optfeature shell-completion
+
+DESCRIPTION="Python based initramfs generator with TOML definitions"
+HOMEPAGE="https://github.com/desultory/ugrd"
+SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+RESTRICT="test"
+PROPERTIES="test_privileged"
+
+RDEPEND="
+	app-misc/pax-utils
+	>=dev-python/zenlib-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pycpio-1.4.0[${PYTHON_USEDEP}]
+	sys-apps/pciutils
+"
+
+BDEPEND="
+	test? (
+		sys-fs/btrfs-progs
+		sys-fs/xfsprogs
+		sys-fs/cryptsetup
+		amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] )
+		arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] )
+	)
+"
+
+python_install_all() {
+	# Call the distutils-r1_python_install_all function
+	distutils-r1_python_install_all
+	# Install the example config into /etc/ugrd/config.toml
+	# Do not overwrite an existing config
+	insinto /etc/ugrd
+	newins examples/example.toml config.toml
+
+	# Install the kernel preinst.d hook
+	exeinto /usr/lib/kernel/preinst.d
+	doexe hooks/installkernel/52-ugrd.install
+	exeinto /usr/lib/kernel/install.d
+	doexe hooks/kernel-install/52-ugrd.install
+
+	dobashcomp completion/ugrd  # Install bash autocomplete script
+	dozshcomp completion/_ugrd  # Install zsh autocomplete script
+}
+
+pkg_postinst() {
+	optfeature "ugrd.crypto.cryptsetup support" sys-fs/cryptsetup
+	optfeature "ugrd.fs.btrfs support" sys-fs/btrfs-progs
+	optfeature "ugrd.crypto.gpg support" app-crypt/gnupg
+	optfeature "ugrd.fs.lvm support" sys-fs/lvm2[lvm]
+	optfeature "ugrd.fs.mdraid support" sys-fs/mdadm
+	optfeature "ugrd.base.plymouth support" sys-boot/plymouth
+}
+
+distutils_enable_tests unittest
+
+src_test() {
+	addwrite /dev/kvm
+	distutils-r1_src_test
+}
+
+python_test() {
+	eunittest tests/
+}
diff --git a/sys-kernel/ugrd/ugrd-1.30.1.ebuild b/sys-kernel/ugrd/ugrd-1.30.1.ebuild
new file mode 100644
index 000000000000..bee3a1e62b5e
--- /dev/null
+++ b/sys-kernel/ugrd/ugrd-1.30.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..13} )
+inherit distutils-r1 optfeature shell-completion
+
+DESCRIPTION="Python based initramfs generator with TOML definitions"
+HOMEPAGE="https://github.com/desultory/ugrd"
+SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+RESTRICT="test"
+PROPERTIES="test_privileged"
+
+RDEPEND="
+	app-misc/pax-utils
+	>=dev-python/zenlib-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pycpio-1.4.0[${PYTHON_USEDEP}]
+	sys-apps/pciutils
+"
+
+BDEPEND="
+	test? (
+		sys-fs/btrfs-progs
+		sys-fs/xfsprogs
+		sys-fs/cryptsetup
+		amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] )
+		arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] )
+	)
+"
+
+python_install_all() {
+	# Call the distutils-r1_python_install_all function
+	distutils-r1_python_install_all
+	# Install the example config into /etc/ugrd/config.toml
+	# Do not overwrite an existing config
+	insinto /etc/ugrd
+	newins examples/example.toml config.toml
+
+	# Install the kernel preinst.d hook
+	exeinto /usr/lib/kernel/preinst.d
+	doexe hooks/installkernel/52-ugrd.install
+	exeinto /usr/lib/kernel/install.d
+	doexe hooks/kernel-install/52-ugrd.install
+
+	dobashcomp completion/ugrd  # Install bash autocomplete script
+	dozshcomp completion/_ugrd  # Install zsh autocomplete script
+}
+
+pkg_postinst() {
+	optfeature "ugrd.crypto.cryptsetup support" sys-fs/cryptsetup
+	optfeature "ugrd.fs.btrfs support" sys-fs/btrfs-progs
+	optfeature "ugrd.crypto.gpg support" app-crypt/gnupg
+	optfeature "ugrd.fs.lvm support" sys-fs/lvm2[lvm]
+	optfeature "ugrd.fs.mdraid support" sys-fs/mdadm
+	optfeature "ugrd.base.plymouth support" sys-boot/plymouth
+}
+
+distutils_enable_tests unittest
+
+src_test() {
+	addwrite /dev/kvm
+	distutils-r1_src_test
+}
+
+python_test() {
+	eunittest tests/
+}
diff --git a/sys-kernel/ugrd/ugrd-1.31.0.ebuild b/sys-kernel/ugrd/ugrd-1.31.0.ebuild
new file mode 100644
index 000000000000..b29ffc96c802
--- /dev/null
+++ b/sys-kernel/ugrd/ugrd-1.31.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..13} )
+inherit distutils-r1 optfeature shell-completion
+
+DESCRIPTION="Python based POSIX initramfs generator with TOML definitions"
+HOMEPAGE="https://github.com/desultory/ugrd"
+SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+RESTRICT="test"
+PROPERTIES="test_privileged"
+
+RDEPEND="
+	app-misc/pax-utils
+	>=dev-python/zenlib-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pycpio-1.4.0[${PYTHON_USEDEP}]
+	sys-apps/pciutils
+"
+
+BDEPEND="
+	test? (
+		sys-fs/btrfs-progs
+		sys-fs/xfsprogs
+		sys-fs/cryptsetup
+		amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] )
+		arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] )
+	)
+"
+
+python_install_all() {
+	# Call the distutils-r1_python_install_all function
+	distutils-r1_python_install_all
+	# Install the example config into /etc/ugrd/config.toml
+	# Do not overwrite an existing config
+	insinto /etc/ugrd
+	newins examples/example.toml config.toml
+
+	# Install the kernel preinst.d hook
+	exeinto /usr/lib/kernel/preinst.d
+	doexe hooks/installkernel/52-ugrd.install
+	exeinto /usr/lib/kernel/install.d
+	doexe hooks/kernel-install/52-ugrd.install
+
+	dobashcomp completion/ugrd  # Install bash autocomplete script
+	dozshcomp completion/_ugrd  # Install zsh autocomplete script
+}
+
+pkg_postinst() {
+	optfeature "ugrd.crypto.cryptsetup support" sys-fs/cryptsetup
+	optfeature "ugrd.fs.btrfs support" sys-fs/btrfs-progs
+	optfeature "ugrd.crypto.gpg support" app-crypt/gnupg
+	optfeature "ugrd.fs.lvm support" sys-fs/lvm2[lvm]
+	optfeature "ugrd.fs.mdraid support" sys-fs/mdadm
+	optfeature "ugrd.base.plymouth support" sys-boot/plymouth
+}
+
+distutils_enable_tests unittest
+
+src_test() {
+	addwrite /dev/kvm
+	distutils-r1_src_test
+}
+
+python_test() {
+	eunittest tests/
+}
diff --git a/sys-kernel/ugrd/ugrd-9999.ebuild b/sys-kernel/ugrd/ugrd-9999.ebuild
index 7029a52abb6f..9a954428bf5e 100644
--- a/sys-kernel/ugrd/ugrd-9999.ebuild
+++ b/sys-kernel/ugrd/ugrd-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
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{11..13} )
 inherit distutils-r1 git-r3 optfeature shell-completion
 
-DESCRIPTION="Python based initramfs generator with TOML defintions"
+DESCRIPTION="Python based POSIX initramfs generator with TOML definitions"
 HOMEPAGE="https://github.com/desultory/ugrd"
 EGIT_REPO_URI="https://github.com/desultory/${PN}"
 
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 3b8fcee38d70..97a308a23171 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,43 +1,62 @@
-DIST gentoo-kernel-config-g12.tar.gz 5181 BLAKE2B e5faf714fa197e69c4f17f90d60a9ce4acb2fa2dbd996e1ce474a6ca370541b89f24ecb635657656a57913df87046bfda1766517093898a3c3ce0908ee617811 SHA512 b3fb3c01e0a3c3179921641b8314ce8e4ad50c94c33baebb4446d002d1f16c35b4b26cb02dfcec6ee00d8724abdb03e0fab6b0665d13ce5cadd5e672668420d1
 DIST gentoo-kernel-config-g14.tar.gz 5686 BLAKE2B e5147ff4ffab92428b3e7f1b0897b997f8a298805f4f43b0a4d3047607bbb1a5ebfc268e0bb9688372a5eda561df9f256c78e00cdd7e3caf7868724214722f56 SHA512 f79638f9ff9dd0154512baf0234024216b6708d35a3c03a580ca5913286ad1ea13bdde5ea9b4722c6a7cd8d591c11ec52c1e225111a260343cd56aa1f1a88502
 DIST gentoo-kernel-config-g15.tar.gz 5746 BLAKE2B 2baef40e18cbf3bb975362d71ad674604ad80338d1e6914ffa2fc03af26f1b9c9cec66d39a56077693a7327060bc29bd5eb5787549857dd3779e841192cb2016 SHA512 45d609ee25a529988868b8c99c808f4e6abbde34ae501bf35523431ee85c9f3657663d6f938f2036a5f012a55a68965b32fd41fc44d8f6ca606a6fd38f952445
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
-DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
 DIST kernel-aarch64-fedora.config.6.1.102-gentoo 252811 BLAKE2B f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc SHA512 41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437
 DIST kernel-aarch64-fedora.config.6.12.5-gentoo 288068 BLAKE2B 4290157a17df36fccd2ead9fa381b5d6aa2079ca918773aa65e389a35127bcbd40074d2f2072371b9b50937bfaa2944168dcba628148dd654811ec93ed028b1e SHA512 62723af8ac13650cef09873f2d57c550171bfe5fa1a4ba00a12bf0650d3aea9f7af52a1d9e0662dd95df51bd0da5aaeb9fc0a0c0450fbb7fa1f76c1ab46bb099
+DIST kernel-aarch64-fedora.config.6.12.8-gentoo 288081 BLAKE2B 08273a34c387621d0ccffcc325a0a34b40e0a8fbe78f2429c8a9efc73aa05f8fb563ed53e5fadb25662089f23ebafb61b2d08f91ea00b073e67e702798255e9c SHA512 58ea4f247aa9af6f7535ab5fe44dae2fbf286c7fbceeda86df532125807bbd4c25a89ddeeff4284592efefbaaef5022626abad7f1d1d64976e3040dc6e89251a
 DIST kernel-aarch64-fedora.config.6.6.12-gentoo 271041 BLAKE2B 5af7c2f57cd6cd9230d9ab1a539a4b12b02cfdd777f5921b2d69329b171060a8085909a60eed9916aea504e8d9c9d1e907a61f0c6681ac75d5c64864052f821e SHA512 f744444f2840020dce2dc8473e3e562fa53ac1c34a641a9f322c2c7efd8fc4d9b3677479d3a31e705fa60beff0b1beca79ab78ad7dd4b6633d4499bebbfc76bd
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
-DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
 DIST kernel-i686-fedora.config.6.1.102-gentoo 228064 BLAKE2B 9e783fc6087efeb0808437bb8bd80ccb54c29fd48a6893087a51b452dab98586f476be8d2dc4e0a2896308c9a0c185879deca46ffba1bb446b142ab3e81303a3 SHA512 4ef3eedd4c1ab78c2c5294121b47a2c4b465b4f537d12d48c397a7ab30ab4dc58b65d680326a23bce661d611aa37a2f98e814ec8e3cb84c3522151f09661e90c
 DIST kernel-i686-fedora.config.6.12.5-gentoo 255123 BLAKE2B 186e22a426f2485ba46429852d94e139b91cc3508eb405028b3fd779a224a2c8eaf3e6a15bbee7ebc54a295bf8c3d434d972cd33b42b87951cf826435a3c3d65 SHA512 90f505be0faab191dc06dba834e4d6726f88d9868b6610ab5b89c496a4b4c37e9ce414e6e1447136edb028420a243b1ce620de5e97aa2b4b784e20a6eeacd015
+DIST kernel-i686-fedora.config.6.12.8-gentoo 255163 BLAKE2B 7015bbcfb2aed0ba70173dc7e9abf464e167184e2bc8cea6d26623972bbe6b42956241a7d75ff8604d70d5c0202db6e40cdb890abfcea3d0c8e0d00aa869353e SHA512 a1b4b688510a231fe079b4158e8aaddaddc4e719367132668279edcb16e32b6c7f2c449ec196646b0986171dc43a82475255502ae40679e0433de9f9876e0a20
 DIST kernel-i686-fedora.config.6.6.12-gentoo 242515 BLAKE2B dbb4df93a5c8ee34d687262cced152a07f412a89ef2e8122429477633424fdac80809ed57a5a6de72de05313ec91f266d37c3494426099621d047c0561ccb57e SHA512 a65fe3299b6d8f89373937d2a782aa1469ebf18954b00bbf2798cee952b9946d7fead795388c079cb508f6d431e49b2812fb6d845c8a0e3861a4a3bd11e81968
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
-DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
 DIST kernel-ppc64le-fedora.config.6.1.102-gentoo 218278 BLAKE2B f4dda4430e9801c4660be4bbf6e4b37052e720656e77c928adb7176ff3dba55feb2fe66dd564d41a181809488941cf392ec9c94d786e4a3d813fbe5d683d305f SHA512 a5e12ab1045fae61b494938047cf1c2a3c34693d3d242968e4ab564a012c70e6d232b9d5333347f5ba114a64bb59dd96919b38c5a1327fb8c5154ef40ad28d2c
 DIST kernel-ppc64le-fedora.config.6.12.5-gentoo 241811 BLAKE2B 59fcfd508a208e7a6a393d1b35811e553098669e9db7302fe929d998fb705330f104b671ba34d6e5992f9c4ddb2e7f30509a261f324400cb3cd5216405ef4614 SHA512 ab0bf86e20bf3348b8703fbf7aeb29105a02ca768f9a4cf47fc59c77e452b4659367bd8c10ceb67295d869158905e2c76c2a55745e01db3fab420ce257c11cb6
+DIST kernel-ppc64le-fedora.config.6.12.8-gentoo 241851 BLAKE2B e7b8833572348037d7af2ba1f9671e8010276d853e0d85b8a175c0dcc5c212c57c7660be54a7ba2621c427cc8120acbeb1063a1c1a1c293894ebe1d63921b684 SHA512 7a81fe1c4b1d4fb9f2d68846882a8869c0888c8fa764ec41f41d27e61b7a69825ea8ceba2209b40deb7c0e8f4bb2c5d81226a4f28e7ca8aff4788bc7a3292194
 DIST kernel-ppc64le-fedora.config.6.6.12-gentoo 232147 BLAKE2B d67c2ab2d089ecdde3879129d2b1f85a592adae811ed053d00d4ff120e6bb44546bb41d74817be558adb1d669d06f3dd50e6ea542c8a9c2f13672f77f4e4eed5 SHA512 b130b4c57959c0f7be983334b08354640d5e2946bfdd956d6c5b895f816f6177d5fa4bb1c4382cca5c4dd4723aac42e9e89a002b71d86f4eb30f755008f8f9af
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
-DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
 DIST kernel-x86_64-fedora.config.6.1.102-gentoo 228685 BLAKE2B e68236ccc1d51b2aff850eda9f3197b7ea95b8a88716bc7b07dad30348a86fdbb99a948060300dddae73ca82267d851d357f1c9547a9dcefae1364deebdbd124 SHA512 42bec2ddb9cf7eb6e84bbdeb23eb98dc11c9cea41f6134b776010c6b36833b520a290f0ef0145379de15c7f7834398fa5e3aaabd7258d7d4e89567faa09eeb4c
 DIST kernel-x86_64-fedora.config.6.12.5-gentoo 256170 BLAKE2B 39e03735453c66f4262005517fe00e66da0b8c813f7d4a0247083a69eac998c81d75ccdd6c56a389f287f2b9dd5d20e3703b9cfb4d3f89b4672897d026a6a00b SHA512 57f584d82145c5d35bd71f7b3fa5f45adb12cc46915d6f88c7c6f291b6dfde73a4a7f4b796cecf46b145fde5090efc26fdc4fe3945b37d5878efc94ce39b4b7a
+DIST kernel-x86_64-fedora.config.6.12.8-gentoo 256210 BLAKE2B f14f7de8ae573561824df47cf94c3c0ce52a820456ebd0e618e4c1e7f5454b7d3f6f86c559a3cd98dd94c55aaeed397f3d0cee6b0e37cf6b47d3aedd920a9dea SHA512 ea87b4b45c78888e02d0288dd5844cf2d97a14e251b565c7d6451a0e62fbe0dbef38f46715467af2f869995d6bbc8be61d5b70476a86d607a5bfa27fbaf36e92
 DIST kernel-x86_64-fedora.config.6.6.12-gentoo 243607 BLAKE2B 7e670d37c6471e50aa0ba395570cd0173af0210afe63faa48d7a147327110652e3aab5c339cf10ed22a6a20e81e505aee84311beb21fda3eb577e06ea55ecac8 SHA512 c484403a60670dd006ecbe65240cb00d97e8b3fe22d1169c5b6ccb92bcdbddb3ecd474d2b57880b30baf6a38bcef11fc8d56b8b0b02fcddd859833c3640cdc9c
 DIST linux-5.10.232.tar.sign 993 BLAKE2B d3b71bb420a88ae5e1f9aec2934649089332c343d4f91a7327c62309f9980387dfe8532b22057d8022b630e7ee8504fa439c645ac61bfe671becae18f1c7aa8d SHA512 89f4d467c7b948281862c37053c2077d2339f5d04584b98a2f991037cfd9b36fc9ee6ec86907f301a64d27f826295f582aea352cb1405d277d05ffbc112f31a6
 DIST linux-5.10.232.tar.xz 120744848 BLAKE2B 76ceee78867bb21ae4fab0840210e095ec744fc7035c99b06eb3432c4a592f3f4f9364c483dce4af5d3e178cb8fc7fb9baa6e6c8d25598c3f84b79371f482c59 SHA512 d0f3c2c6f9e47ed8e5de8e99c3e7f3175b6cb015916131ea9f7a9f1ee8aa29c7ae2fa432bcd1283bd0529654874f4f67ace208d2a8d01fc6595e4abe36ff1fd0
+DIST linux-5.10.233.tar.sign 993 BLAKE2B 9c1dbcd403a6f0192cc10af5a7472df308bfda12999b6a6cb503f92dc3061d3879104cef205eedccbcfbe6c0fe4e809a9491bdd91073cc82ca442fdef7321136 SHA512 6608bdfe56e6cc4d89c875a14a4fede5e7b786b8db6a8567b9a0dd819d0623f009a61e99019a84233678d7ea1da5019d8ca2f4e86bb7749d14cb97141bcb2603
+DIST linux-5.10.233.tar.xz 120756924 BLAKE2B d7ef12d74cedf1b9774f35418439019174e76bb24b6fafd982b98429f48811c2ea36134f4c755589d4f8d802a7b47462432c4ed7a098a6c74b9eb923857249a1 SHA512 af558e039d7abd587ef7f3f6001d991b4c63a209e9ef0a8d21d3fc9bfaf253f0a48ab29da3a9f074de41849fe440c299885680e887620826b5609804b369b270
 DIST linux-5.15.175.tar.sign 993 BLAKE2B 580b9336c93e15dadae81be6b8b4c53c4f64fd90a04cbdd28e474d12dd11b131ee95440ec215db069f591bfb4a130ccbb6cd33c2dd69a65f3ba516f91e79676b SHA512 4c774436ed271addf12b208382d4fac5f114e045166999d81d0e4e4289e1fd9a6bf9d252a47e7442cdb2d8aef4530a7eb7bf21b004811b677342bc71e722c6ee
 DIST linux-5.15.175.tar.xz 126721664 BLAKE2B b4eceab9b42c92f71620591efc41d8d0bf585c2cf10b0364276984149115c7f2eb80ffed5083e6d8fc9bce3238fca5b950e93dd972e2e463480b12a917f28410 SHA512 f7215508a564b823d673cebafd102abe05e5d25f0de067f8fede254f30c8ec0e66b42f7d50e76db870b126ffefc14e12d4d02496c17cfe54bdf88287df3c9d19
+DIST linux-5.15.176.tar.sign 993 BLAKE2B d207c274ddc6455c159901d8fe214115818fd60ad8eb2112ee4737e5f83de95d429d705234fc8bcff7293a3f651cbd26f6c500fbb471ceff183214c2ec495852 SHA512 4039803b766a899401894a04fbf2bb01946d1dbbe9d6d0f925d735a0e8abc3b2e1b9ec7f583209b56070338c1c6d702a3a0f445fb51e4cdf16ce1dd62ddd197b
+DIST linux-5.15.176.tar.xz 126707680 BLAKE2B ec80cb78e6b8cb037c7923496188a139030416032c2df47dbabe2ad9f49ef647cd66ed951d00593e3e4d6d6f34f8f59bbb3c68d93a4eb25717ca0ce1c149ab4f SHA512 75fdefd378b0b4f8580c7b471d4f7129d3814c5e808f7ba4a15da03756c18c097723ca39e3c7f08852c18419f203ab56880d2a07ad004cac37dc56ddcbc06cfe
 DIST linux-6.1.121.tar.sign 991 BLAKE2B a7417d28ecf3d3cb4db0aeeb084b3552f8ab5de061bef8316f67b4e74566d965a0a00d967aff155ba92765cd69cf4256d2de6d94bd92d8f72fb3efe5ff9fd80f SHA512 a45b66e9d1d8fe20c70e07ca3269f24f75ce28ac6842a2db1afb63c0aa238b155b5f3dc127bec71376b6da5932e217d7fca3a885dda9d5b4455f30724df193d0
 DIST linux-6.1.121.tar.xz 135248068 BLAKE2B 8a976caffeebc64d97f6ca0fd7f04682d094f429f42eaf9fc134ba53b50253e3240b8b1da9fe833624f67fd6464f1eea3272f2ac3dcdb9604e15ad12ffed5088 SHA512 5a866e29ec747f3247dec86c3a08c6da63b73bbcf7b94a98e91d001e44f935979e55bfb83b7a17d05e9fa9807e024ea42d96ebf901846c32ba3f1db001993807
 DIST linux-6.1.122.tar.sign 991 BLAKE2B 3fa145ae1bbb7d547c6ca1371466ab7cf7f6d335efcf6c055f2d65ce127f35d23465af5691a9fdbf711d4a8def2f90eb23c26855c30649516247ca4c7afeaecc SHA512 98f1c1f07d5a6ef2cc4ae18a4ec6b460a4a339ddfec3187cffc909747e4f14c4b8abd66f8f827c4a7bf3e31ff2c666b205dff2f43a714bab6f5481f165edf395
 DIST linux-6.1.122.tar.xz 135239952 BLAKE2B 546d8d0fd6d9574f5dee9a064fc27571fac28a605c8c684756ede1be90e67a4f305cd7fc7ed2c0b2beb138b4b183ac79330899624a3a11395a6c7e1f1715a773 SHA512 e611f2c4467aa8bc1e7379e510490f708bce9c95121f268476add56259818b2bb76e14cf9e3e69e47f947826b3cd940f96f21517f7a1b3e154e6508ae2001c3d
 DIST linux-6.1.123.tar.sign 991 BLAKE2B 12565e86cddf3073f4d98f63e5512fc21177ca6f8b7260aae7c2ce22e597425891751d2d0fc02c148da88b768edc4d06b402dbf47ffe56a920ab1a3ffd3f1e8c SHA512 58f49089790cf683a14063e780b040876317b6c30808b75601fa57ecd78b41d048554546553b4e663f756520875f496d9eed4c9fffd61ae278e12c4a979327f9
 DIST linux-6.1.123.tar.xz 135237844 BLAKE2B dfeebf5888a20e19b5cea542210beca420c6fb94a54c337ae9a9587704439ca4cd1dc88c1c17f004018439d84f96fc9454ecb85e4421a81bf14460878141c43e SHA512 8df7733f91414c2f0dc97482351c39bd9bd35bb38908c5a02f4a8a487adadb60adc7ed4a9db54f9b74285eb35247b6f6fb188fcad4558875f0b09f94725de7e7
+DIST linux-6.1.124.tar.sign 991 BLAKE2B 7971f9507ecef5558140dae20d7dd94940a5d53c771292912cd748b7f0acf093e9489ce56036a1db4212bbf420cdccab43c9911db3fe771f157db849bd2d4a64 SHA512 9662f5eea7dbc4c1bbc40fe2b5cdfc4aa1d35ef52f1fbe9b2dd3b6779d5d781d4643dedbc9b7df49cdab37cd1df8dc8c31512ea074d0e0e3014d479c950d507b
+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
 DIST linux-6.12.7.tar.xz 147968308 BLAKE2B ddf10abdcc50c077495050bd695b1e6f2547955c8f6a07a689e38a35c205ccc97849a1270be844eb30d07f396eb9af2f3ea8b4ad0c383711785456cc910d4554 SHA512 e8e59e20319346f3489994b92deda5063b558a7445af145f77a3e5bee51aecfe6b7f7f408f7eebf4656d20236c69c0aaee389dae98d07bdcec138fac41d2ebf0
 DIST linux-6.12.8.tar.sign 989 BLAKE2B aedf3bf63936f3c5fa5c92f53dafe3a443a2b77b04e002a2152e7882735cf41c4c423e22acc008decaef3ffef7661467fdc5d160d390582ff6843aa2af16b7f8 SHA512 b610d83a2b85f3b6f5b558ac205abee14e18bab826c79dd1036fb5cad4b2ca2331d20bbc2ea3ee7ba92163cea44e64392e92605703519adfc0cafab235898d89
 DIST linux-6.12.8.tar.xz 147982372 BLAKE2B 62a3f435bbe7d24bea361f2545ba50f8b36030a98bd28d0979b86052d8af34dc7a4c27f7ca2890daba5e5bb51f5848e6b21cd5df4dbbd19919867bf67d38790d SHA512 193b07ce4984d0bf3a808fc0b527650686a06432cfe3bb222c80e7a851adfe4e151335514bed44b5fb4cf18cb24f2251c5895b98e6fec84a097e2b130ff234fa
+DIST linux-6.12.9.tar.sign 989 BLAKE2B c9c9d97e16d9fd4942bf55d006b1d462815dd7530e77e0e7df98768afe2585c5ee285c3f6ff6a1c62f55c6ea16c45b831e6cd3d9b2fad60b031763245c9a4a3b SHA512 2d1b37c16659704facc012079209407a62ef7302e187163e717a4b6a2d44bd1c8a050d308b37005c3430ff4ca990c2e3ef7c39e02f8744529982950647660cf5
+DIST linux-6.12.9.tar.xz 147988468 BLAKE2B 2584e35822a429b6825bf8d99c073848d5ba83d45b382ab82d1caa36ccbf2529036b31d4687dafb29650c87f4b63489caa2cb67a85d05183c572dcad75a35ba8 SHA512 3538c19b22f1810849e01ad7005f39b0c4e1e2de99f3168bb6a35ad9d51d7ec7b22a8203890e7b073bff83951f930245d5857a86cef80454800136a53047ff37
 DIST linux-6.6.67.tar.sign 989 BLAKE2B abc1c4de4fdb8aaa60819eb995ddacac505915bc43b8b34ad0d6dee9b886df84732e584d2a4825ba2e29a0863a4e42cf72df214aa357523c9aa2b10b0fe2dec7 SHA512 c14edffd5f107714b8f5e9dcb345972b9cd7f1cb9accd8ec5ec50ae2ed799ed835f2785a65bb67669f6c31c9b35193f00f31b60683b210f8c17aebb6b6362623
 DIST linux-6.6.67.tar.xz 140474128 BLAKE2B bf0038d4aa9e1857a2dc866c18ed54b16e6ab1f1cd6a3f9636e1c60006ffb226acc97ac221b8337b70d0d1bba7d4b65ea4cb476c21a5972f5a194da8ee0e3728 SHA512 78d52b467d0f7d632efbc626e13adad0bcf87d0bb0acb8ec4aaf218fb35e13007e4b157939cc7fdc6668989554eae0c769684c6b77e0b9014d298afe56c5c4fa
 DIST linux-6.6.68.tar.sign 989 BLAKE2B d374d5d334585a5e5102c1eb1c65f90f34c683e4f8dcfd635afd64fe770bbab39435dcabeb717d1318c503ee8484ec179ac20f413c07d8b7edc28c2f6a531763 SHA512 795a0d4141ecec61597f01676569397735cc12b921ef00070b11c3af168e4e6f43970ac192c31a8ca4902c999fbcba9985f6326d78107b06093110d74e576df5
 DIST linux-6.6.68.tar.xz 140431644 BLAKE2B bbcd2e647aba409aa6191a5887becdaecb47c99d0e50bb35974b907fcf2c54fc7ef124e64ca70255a7d309617493ab4e1e273a2b2fa45bc56e35214d906fd9f3 SHA512 d02d15e32d4f36535cb140b530127d64acdf80a83e39ef44fe9f7c9a745ea01cecc0c727b34ec2e50f42bba8fe1d5dc55a2fc38fa143d9397f235e0eadf0aaff
 DIST linux-6.6.69.tar.sign 989 BLAKE2B 0231f7a32e2b3488ba00cd6a6fb71a580e0409a0679d2086f18f8ee61f1e7ad2157a98e4fb1a952c27e4d820776853dc221ce74442446a51da3f7e624a9d17c5 SHA512 14f71a85c8e623678bc3b187c7d93341c81e0d0a3a169622a952735f1452d65481646b69cee7134f39ba6638827baf80f0c996daaf9412622c56891db9f47c8c
 DIST linux-6.6.69.tar.xz 140462484 BLAKE2B 93916e63a6c59a8a21ab46a6951ebdc9a1258b3c760cf5b57c980cb0bc4ce208276581d528987e70b2fdf5c3317c5c3fd49999a5aff533450314ead69d554360 SHA512 438eb343fda4e214b3c4443d8741f8b4af2cb9020d6d9c73d1601eb4346b7ac1ef86ef39019fdbcefbed05fcc9457e93303363f69ea92041a0d0270562437a69
+DIST linux-6.6.70.tar.sign 989 BLAKE2B afc4ca406214dd444dba859ef21c002ff49012bd521df6eafb607384e1c259d0c796955509b24c1bfcd0921c110cba1b69f0d5a080c255f1c2dc8567d9700bfe SHA512 e9fc4e52eafa2669ab7ad16e65ab7dcc2edf5823694b480056b8c01f00f14542e2b24a0bc6ca12c5a564830a94ecdcb30f15ade500dc14bf95de3ebbd306b8d4
+DIST linux-6.6.70.tar.xz 140448644 BLAKE2B 9fbfdff887a35a1d0256cec0ab0d1e20ae80208cc08cc60549b4f3d5980bbbb4293f1e26de74f10455dbab2ebf7541c1f858e11c77ed2293d34cdbd1abcb2596 SHA512 870768a5d4add6c46030dbd8a0966ec6bd8c4d61eee7921d2910bafdfd2f68a3357223396cb50cf231d9e63513ac199ed8f9c2499384a0f929ca522fbbec0afd
+DIST linux-6.6.71.tar.sign 989 BLAKE2B 4b8b27321a48c4841e9c1cd5376297b79619f6f24d1e270cba8706b3875681c110e0f8c9f5a9f6566b8f479e0249109704a9edb1212c25254229184edac924b0 SHA512 fd9e6f9c9e0a50aa93d3d713927e4fc16d9f810f7df095ce2dc2e7987ece40d6adbd40a9bf66f133c4688e5ec89169041ed249a3e049b93330a36fb9091fb670
+DIST linux-6.6.71.tar.xz 140426396 BLAKE2B ed8d187bc8ce579d8c1212cb4a553c7ad4b8da3d1335841fb000ffce1bdc1258b3748fa260a774c2aacfff91abb16be5c005a103b802c5c64c11098f8fcdc329 SHA512 fabadbadd69f87725ca7679856580ebef887d52af133d2ba83f0d8057acc959beda869e68a2e466b0e7886140acd289a841ebaa3a8cb2f7858ad21f20e5d833c
+DIST linux-6.6.72.tar.sign 989 BLAKE2B 528bc9c3736250b394c7e5fc6a76347cde15ed08644702dbe54c38c6074f931134fefb37bcc514db1419ef5b17c9f0c5cbd65dfa3c8e4957412712fa35fac8ae SHA512 684718316483ba69c1ac90fa021cd097bdd4374b64aa3033f2094e2c73c157406f5d7a0ddb92d1e1a1df6d686e8a4c230924d89ca8261d94b93c525a6702d5f6
+DIST linux-6.6.72.tar.xz 140443868 BLAKE2B 6214a72d784a7b11a3407d5065dc8596c3a15bc0be4401e8fa22c70e268349dcf2a824949d258a6fee276109185b7d5de4ca4eae08cfb39c98ffa98940a10e76 SHA512 a94addbb1ec4647dabf92b37167d69e7b1f8815ce551add5add859ea3c742743496d48e52825a0aadc5dd8d9ee51b16a5372730131d97df4e562f9741920b19b
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.233.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.233.ebuild
new file mode 100644
index 000000000000..4c395b41090d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.233.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
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/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-kernel/vanilla-kernel-5.10.9999.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild
index f1e4891c4a7e..c100e0f28a23 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit git-r3 kernel-build toolchain-funcs
 # https://koji.fedoraproject.org/koji/packageinfo?packageID=8
 CONFIG_VER=5.10.12
 CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=g12
+GENTOO_CONFIG_VER=g15
 
 DESCRIPTION="Linux kernel built from vanilla upstream sources"
 HOMEPAGE="
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.176.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.176.ebuild
new file mode 100644
index 000000000000..f922ce9dc716
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.176.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-kernel/vanilla-kernel-5.15.9999.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild
index 7d069a174e94..1ed50e452f4f 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,9 +6,9 @@ EAPI=8
 inherit git-r3 kernel-build toolchain-funcs
 
 # https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.15.19
-CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
-GENTOO_CONFIG_VER=g12
+# 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="
@@ -19,19 +19,19 @@ SRC_URI+="
 	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
 		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
 	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+		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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
 			-> kernel-aarch64-fedora.config.${CONFIG_VER}
 	)
 	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
 			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
 	)
 	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
 			-> kernel-i686-fedora.config.${CONFIG_VER}
 	)
 "
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.124.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.124.ebuild
new file mode 100644
index 000000000000..f922ce9dc716
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.124.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-kernel/vanilla-kernel-6.1.125.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.125.ebuild
new file mode 100644
index 000000000000..f922ce9dc716
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.125.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-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-kernel/vanilla-kernel-6.1.9999.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.9999.ebuild
new file mode 100644
index 000000000000..11b766f4ddeb
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.9999.ebuild
@@ -0,0 +1,124 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+inherit git-r3 kernel-build toolchain-funcs
+
+# 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://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}
+	)
+"
+
+EGIT_REPO_URI=(
+	https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
+	https://github.com/gregkh/linux/
+)
+EGIT_BRANCH="linux-${PV/.9999/.y}"
+
+LICENSE="GPL-2"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-$(ver_cut 1-2)
+"
+
+src_unpack() {
+	git-r3_src_unpack
+	default
+}
+
+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-kernel/vanilla-kernel-6.12.10.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.10.ebuild
new file mode 100644
index 000000000000..237bf2d71e7c
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.10.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+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.12.8-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 ~loong ~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 | loong)
+			> .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
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9.ebuild
new file mode 100644
index 000000000000..237bf2d71e7c
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.9.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+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.12.8-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 ~loong ~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 | loong)
+			> .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
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.70.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.70.ebuild
new file mode 100644
index 000000000000..f4370e66a954
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.70.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+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.6.12-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 ~loong ~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 | loong)
+			> .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
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.71.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.71.ebuild
new file mode 100644
index 000000000000..f4370e66a954
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.71.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+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.6.12-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 ~loong ~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 | loong)
+			> .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
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.72.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.72.ebuild
new file mode 100644
index 000000000000..f4370e66a954
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.72.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+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.6.12-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 ~loong ~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 | loong)
+			> .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
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild
index ed9c2cfa781a..aeb359d03ec4 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ inherit git-r3 kernel-build toolchain-funcs
 # https://koji.fedoraproject.org/koji/packageinfo?packageID=8
 # forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
 CONFIG_VER=6.6.12-gentoo
-GENTOO_CONFIG_VER=g12
+GENTOO_CONFIG_VER=g15
 
 DESCRIPTION="Linux kernel built from vanilla upstream sources"
 HOMEPAGE="
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 6fec5027a444..455cbaa5e9cb 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -3,10 +3,11 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.12.tar.xz 147906904 BLAKE2B b2ec2fc69218cacabbbe49f78384a5d259ca581b717617c12b000b16f4a4c59ee348ea886b37147f5f70fb9a7a01c1e2c8f19021078f6b23f5bc62d1c48d5e5e SHA512 a37b1823df7b4f72542f689b65882634740ba0401a42fdcf6601d9efd2e132e5a7650e70450ba76f6cd1f13ca31180f2ccee9d54fe4df89bc0000ade4380a548
+DIST linux-6.13.tar.xz 148523052 BLAKE2B 9f617ecb3f2393b57ba03c654fea62a7213f24c835989f333a1ef29492af551bfa7d9ad786d5ef1484854adc77c7c6af38fb09a72d994d305695f512c325e77f SHA512 1137e6440132b0958f89165440e99208f82b204e7245ae69dc9c808df97d13ce8f58136db92407e0e93394fa7f6283ec7a34597c6e92a5b6d9025e0960357957
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
-DIST patch-5.10.232.xz 6453768 BLAKE2B 63ce167f0815718caffacbee152f56e2ce7eecb8bc9929d0ab19678cd63ec6d0d400e607804a50ec41fbccc6678f2a550032a68c410ce663b3448413275fefe9 SHA512 56ae4d48977d4a923a9ce135ddb3ca6fdee0547b06624d98d4ebe70a5b7cacca242eb7b3c8a770948e1b5203fa928a35bbaf4c5e36ff29d0666301a48a7b5d9a
-DIST patch-5.15.175.xz 6507776 BLAKE2B 5350febff587245d42e6cd57520a96a3ae31b51fdd9a62077995c62263b1def1276242719b14fa397d5f3aa1206618e85475197a7d55a56f24c1a162ce46fdaf SHA512 74aba9befec029472b4c5934b06d333c948960a1e380e7f6d47dae3b47b32389899eb99a5c8498be9e45da519f4126d32c1cae6ebc8d4ed9d64513785c3cf757
-DIST patch-5.4.288.xz 5871140 BLAKE2B 1b95bf2ee6541a451a6c01c8af9a87323410430151570948307d1260f4258fdfc65942b7e507f458f1e2d0ee35189c5904c9be56d048eaa574b88817663a6755 SHA512 106884bcaeedce6101a3de52a8d6c9ce7984426776336f98e30e9cceaf379fae32a1aed9fdc0912cba848a731ae53388ed55744b5a8e35f813a05ac31dbaca3f
-DIST patch-6.1.123.xz 5665152 BLAKE2B 0b1da2edb0512f7dc6b8963ede8d312469e7bb9ec415dfe034f1b0e34668c3fa987f95b75c33b162067d90a7ebef84c80f2bfd82c416b25334ddb8ee217b174c SHA512 49d98757e4841feac17f0dbe1e2502501a67eb094a92809f5bb984ed9eec6a767e8485decd6602958251edfc1203ba7ed54e0b134fa1810ca6c0e63f25872d53
-DIST patch-6.12.8.xz 690240 BLAKE2B f4180813724c81f93dd53c558e636057c39988c9791a549d6becb8ec8030cad9db53caa8da2eefe2c6b400852573eb61351371aed6f7602a66e1628ec7eab003 SHA512 fe7f480e8be21dc02af0404dc825a8017b733798cbdea0801772a79b10fb00e6bfdfce5d85e80be88263a1af38604f0b277fbd971eb1fe4052a965a68bfbdd9b
-DIST patch-6.6.69.xz 3648052 BLAKE2B 97849245e0c3e40ddc9ab93c5078aecd6cc9ccb6361554f5b1de953898d0839b28c5a4ed7357d34e5801ee54d2fe97318a66bb66212e7defc7875a4508f80e6f SHA512 91e4f596c21243285ab9f8a07995fe7bdf8056699db68cf4a7ca29c135d4c9efd029d58e69770e7c3d3216d5f26e81eab7fe2f4bd6939d20af955c4d41003624
+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.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
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.232.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.232.ebuild
deleted file mode 100644
index 69e271e7638c..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.10.232.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.233.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.233.ebuild
new file mode 100644
index 000000000000..b5bd198b6294
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.10.233.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.15.175.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.15.175.ebuild
deleted file mode 100644
index 69e271e7638c..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.15.175.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.15.176.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.15.176.ebuild
new file mode 100644
index 000000000000..b5bd198b6294
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.15.176.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.288.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.288.ebuild
deleted file mode 100644
index 69e271e7638c..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.288.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.289.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.289.ebuild
new file mode 100644
index 000000000000..b5bd198b6294
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.289.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.1.123.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.123.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.1.126.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.12.8.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.12.10.ebuild
index fe614dc5495e..fe614dc5495e 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.12.8.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.12.10.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.6.69.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.13.0.ebuild
index fe614dc5495e..fe614dc5495e 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.6.69.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.13.0.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.6.72.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.6.72.ebuild
new file mode 100644
index 000000000000..fe614dc5495e
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.6.72.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index f5a92df463dc..9c17065ad72e 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -1,4 +1,4 @@
-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
+DIST linux-v6.12.10-zen1.patch.zst 166324 BLAKE2B e4003dc5ed2278f85c8ae75bcb16088d58a7d04396c7b1b680861b485e97a02006182d1b0882560b1cdb533401adf3e9bb173a8d06f7740af1d87543ee195f36 SHA512 0c642025c0fb4db5abe69fc2a90e24b92e55cb6e81a533e03d1a3d4498d746096199aeea3d6d64bccfa84f6808c68e89696b51371fe8bef19bb2136d284c16bc
diff --git a/sys-kernel/zen-sources/zen-sources-6.12.10.ebuild b/sys-kernel/zen-sources/zen-sources-6.12.10.ebuild
new file mode 100644
index 000000000000..0830c036303a
--- /dev/null
+++ b/sys-kernel/zen-sources/zen-sources-6.12.10.ebuild
@@ -0,0 +1,54 @@
+# 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="13"
+K_SECURITY_UNSUPPORTED="1"
+K_NOSETEXTRAVERSION="1"
+
+inherit kernel-2 unpacker
+detect_version
+detect_arch
+
+DESCRIPTION="The Zen Kernel Live Sources"
+HOMEPAGE="https://github.com/zen-kernel"
+
+# Needed for zstd compression of the patch
+BDEPEND="$(unpacker_src_uri_depends)"
+
+ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen1/linux-v${PV}-zen1.patch.zst"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+UNIPATCH_LIST="${WORKDIR}/linux-v${PV}-zen1.patch"
+UNIPATCH_STRICTORDER="yes"
+
+K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
+${HOMEPAGE}, also go to #zen-sources on oftc"
+
+src_unpack() {
+	unpacker "linux-v${PV}-zen1.patch.zst"
+	kernel-2_src_unpack
+}
+
+pkg_setup() {
+	ewarn
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the zen developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn
+	kernel-2_pkg_setup
+}
+
+src_install() {
+	rm "${WORKDIR}/linux-v${PV}-zen1.patch" || die
+	kernel-2_src_install
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/zen-sources/zen-sources-6.12.5.ebuild b/sys-kernel/zen-sources/zen-sources-6.12.5.ebuild
deleted file mode 100644
index 58799a16cf7d..000000000000
--- a/sys-kernel/zen-sources/zen-sources-6.12.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="8"
-K_SECURITY_UNSUPPORTED="1"
-K_NOSETEXTRAVERSION="1"
-
-inherit kernel-2 unpacker
-detect_version
-detect_arch
-
-DESCRIPTION="The Zen Kernel Live Sources"
-HOMEPAGE="https://github.com/zen-kernel"
-
-# Needed for zstd compression of the patch
-BDEPEND="$(unpacker_src_uri_depends)"
-
-ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen1/linux-v${PV}-zen1.patch.zst"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-UNIPATCH_LIST="${WORKDIR}/linux-v${PV}-zen1.patch"
-UNIPATCH_STRICTORDER="yes"
-
-K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
-${HOMEPAGE}, also go to #zen-sources on oftc"
-
-src_unpack() {
-	unpacker "linux-v${PV}-zen1.patch.zst"
-	kernel-2_src_unpack
-}
-
-pkg_setup() {
-	ewarn
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the zen developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn
-	kernel-2_pkg_setup
-}
-
-src_install() {
-	rm "${WORKDIR}/linux-v${PV}-zen1.patch" || die
-	kernel-2_src_install
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-libs/efivar/efivar-39-r1.ebuild b/sys-libs/efivar/efivar-39-r1.ebuild
index 0966070ca6d8..68dbf69df601 100644
--- a/sys-libs/efivar/efivar-39-r1.ebuild
+++ b/sys-libs/efivar/efivar-39-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2024 Gentoo Authors
+# Copyright 2014-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,11 +36,14 @@ src_prepare() {
 }
 
 src_configure() {
+	tc-ld-force-bfd
+	tc-export_build_env
+
 	unset CROSS_COMPILE
 	export COMPILER=$(tc-getCC)
 	export HOSTCC=$(tc-getBUILD_CC)
-
-	tc-ld-disable-gold
+	export HOST_CFLAGS=${BUILD_CFLAGS}
+	export HOST_LDFLAGS=${BUILD_LDFLAGS}
 
 	export PREFIX="${EPREFIX}/usr"
 	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
diff --git a/sys-libs/error-standalone/error-standalone-1.0.ebuild b/sys-libs/error-standalone/error-standalone-1.0.ebuild
index 08b868839ca4..c9d61a2c6ecb 100644
--- a/sys-libs/error-standalone/error-standalone-1.0.ebuild
+++ b/sys-libs/error-standalone/error-standalone-1.0.ebuild
@@ -9,6 +9,6 @@ SRC_URI="https://hacktivis.me/releases/error-standalone/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 
 RDEPEND="!sys-libs/glibc"
diff --git a/sys-libs/error-standalone/error-standalone-2.0-r1.ebuild b/sys-libs/error-standalone/error-standalone-2.0-r1.ebuild
new file mode 100644
index 000000000000..4834042e8e2c
--- /dev/null
+++ b/sys-libs/error-standalone/error-standalone-2.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="standalone <error.h> implementation intended for musl"
+HOMEPAGE="https://hacktivis.me/git/error-standalone/"
+SRC_URI="https://hacktivis.me/releases/error-standalone/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
+
+RDEPEND="!sys-libs/glibc"
+
+IUSE="static-libs"
+
+src_compile() {
+	append-flags -fPIC
+
+	emake liberror.so $(usex static-libs liberror.a '')
+}
+
+src_install() {
+	einstalldocs
+
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		DESTDIR="${D}" \
+		install-shared \
+		$(usex static-libs install-static '')
+}
diff --git a/sys-libs/error-standalone/error-standalone-2.0.ebuild b/sys-libs/error-standalone/error-standalone-2.0.ebuild
deleted file mode 100644
index ed2a9dce4f91..000000000000
--- a/sys-libs/error-standalone/error-standalone-2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="standalone <error.h> implementation intended for musl"
-HOMEPAGE="https://hacktivis.me/git/error-standalone/"
-SRC_URI="https://hacktivis.me/releases/error-standalone/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="!sys-libs/glibc"
-
-IUSE="static-libs"
-
-src_compile() {
-	emake liberror.so $(usex static-libs liberror.a '')
-}
-
-src_install() {
-	einstalldocs
-
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		DESTDIR="${D}" \
-		install-shared \
-		$(usex static-libs install-static '')
-}
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index c62f19d44594..8f3c866db9ee 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -1,3 +1,4 @@
 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
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/gdbm/gdbm-1.24.ebuild b/sys-libs/gdbm/gdbm-1.24.ebuild
index 1dec3b5c1908..ef4eb0f76028 100644
--- a/sys-libs/gdbm/gdbm-1.24.ebuild
+++ b/sys-libs/gdbm/gdbm-1.24.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 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0/6" # libgdbm.so version
-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"
 IUSE="+berkdb nls +readline static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/glibc/glibc-2.40-r7.ebuild b/sys-libs/glibc/glibc-2.40-r7.ebuild
index 66f7383c954d..e7b5d78134bb 100644
--- a/sys-libs/glibc/glibc-2.40-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.40-r7.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
@@ -609,13 +609,13 @@ setup_env() {
 		# Last, we need the settings of the *build* environment, not of the
 		# target environment...
 
-		local current_binutils_path=$(env ROOT="${BROOT}" binutils-config -B)
+		local current_binutils_path=$(env CHOST="${CBUILD}" ROOT="${BROOT}" binutils-config -B "${CTARGET}")
 		local current_gcc_path=$(env ROOT="${BROOT}" gcc-config -B)
 		einfo "Overriding clang configuration, since it won't work here"
 
-		export CC="${current_gcc_path}/gcc"
-		export CPP="${current_gcc_path}/cpp"
-		export CXX="${current_gcc_path}/g++"
+		export CC="${current_gcc_path}/${CTARGET}-gcc"
+		export CPP="${current_gcc_path}/${CTARGET}-cpp"
+		export CXX="${current_gcc_path}/${CTARGET}-g++"
 		export LD="${current_binutils_path}/ld.bfd"
 		export AR="${current_binutils_path}/ar"
 		export AS="${current_binutils_path}/as"
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 39f4cd3f2872..ce31d8129015 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-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
@@ -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
@@ -615,13 +616,13 @@ setup_env() {
 		# Last, we need the settings of the *build* environment, not of the
 		# target environment...
 
-		local current_binutils_path=$(env ROOT="${BROOT}" binutils-config -B)
+		local current_binutils_path=$(env CHOST="${CBUILD}" ROOT="${BROOT}" binutils-config -B "${CTARGET}")
 		local current_gcc_path=$(env ROOT="${BROOT}" gcc-config -B)
 		einfo "Overriding clang configuration, since it won't work here"
 
-		export CC="${current_gcc_path}/gcc"
-		export CPP="${current_gcc_path}/cpp"
-		export CXX="${current_gcc_path}/g++"
+		export CC="${current_gcc_path}/${CTARGET}-gcc"
+		export CPP="${current_gcc_path}/${CTARGET}-cpp"
+		export CXX="${current_gcc_path}/${CTARGET}-g++"
 		export LD="${current_binutils_path}/ld.bfd"
 		export AR="${current_binutils_path}/ar"
 		export AS="${current_binutils_path}/as"
@@ -1294,6 +1295,17 @@ glibc_src_test() {
 		done
 	fi
 
+	# on some architectures, libsupport requires libgcc_s.so support for unwinding
+	# if it's not present then many tests fail
+
+	if tc-is-gcc ; then
+		local lgc=$(${CC} -print-libgcc-file-name)
+		lgc=${lgc/.a/_s.so.1}
+		einfo "Copying ${lgc} into build directory"
+		cp "${lgc}" ./ || die
+		chmod ugo+x ./libgcc_s.so.1 || die
+	fi
+
 	# sandbox does not understand unshare() and prevents
 	# writes to /proc/, which makes many tests fail
 
diff --git a/sys-libs/gwenhywfar/Manifest b/sys-libs/gwenhywfar/Manifest
index 17e89385ff99..c5cadeb4d462 100644
--- a/sys-libs/gwenhywfar/Manifest
+++ b/sys-libs/gwenhywfar/Manifest
@@ -1 +1,2 @@
 DIST gwenhywfar-5.10.1.tar.gz 2687042 BLAKE2B 78fb776a605761f309060affef4e84e526ba789039f48f1e68e107d5002c508e19c9c2c2c0b3a8aba39c6c32543816914b504a6212219cfeeb4f0f04b0354f45 SHA512 11781bec2dd1c4156b609574283179278b8070d604a792aeddf92c8f9b873b3ac09273a8558b9adba567af8d016ea10914d2a149f4b6813798b5800e34e29aa5
+DIST gwenhywfar-5.12.0.tar.gz 2721790 BLAKE2B 99c875ff9de6908ebba92cda1fdca62a6c12d3c3994328b207e36003a0ce478abd6777a4a0a73669c9b85a28591429f14ca73a32695f7ee8d226a4aca69f9922 SHA512 0075eb626f0022ecd4ffdd59de7f0817d2def685e1d2cfbca9a32faa4b8d4d213bea631f24c5385da0b8c7743fd6d1887a46f08afa371195d911409ec7655791
diff --git a/sys-libs/gwenhywfar/gwenhywfar-5.12.0.ebuild b/sys-libs/gwenhywfar/gwenhywfar-5.12.0.ebuild
new file mode 100644
index 000000000000..aef1809cabc3
--- /dev/null
+++ b/sys-libs/gwenhywfar/gwenhywfar-5.12.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+DESCRIPTION="Multi-platform helper library for other libraries"
+HOMEPAGE="https://www.aquamaniac.de/sites/aqbanking/index.php"
+SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/529/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/79" # correspond with libgwenhywfar.so version
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug doc gtk qt5 test"
+
+# broken upstream, reported but got no reply
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	dev-libs/libgpg-error
+	dev-libs/libxml2:2
+	dev-libs/openssl:0=
+	net-libs/gnutls:=
+	virtual/libiconv
+	virtual/libintl
+	virtual/opengl
+	gtk? ( x11-libs/gtk+:3 )
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsql:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+
+src_configure() {
+	local myeconfargs=(
+		--with-docpath="${EPREFIX}/usr/share/doc/${PF}/apidoc"
+		--with-libxml2-code=yes
+		$(use_enable debug)
+		$(use_enable doc full-doc)
+	)
+	use qt5 && myeconfargs+=(
+		--with-qt5-moc="$(qt5_get_bindir)/moc"
+		--with-qt5-qmake="$(qt5_get_bindir)/qmake"
+	)
+
+	local guis=()
+	use gtk && guis+=( gtk3 )
+	use qt5 && guis+=( qt5 )
+	econf "${myeconfargs[@]}" "--with-guis=${guis[*]}"
+}
+
+src_compile() {
+	emake
+	use doc && emake srcdoc
+}
+
+src_install() {
+	default
+	use doc && emake DESTDIR="${D}" install-srcdoc
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest
index f51f47a0e72d..284e7ee6824f 100644
--- a/sys-libs/kpmcore/Manifest
+++ b/sys-libs/kpmcore/Manifest
@@ -1,2 +1,2 @@
 DIST kpmcore-24.08.3.tar.xz 646392 BLAKE2B 539170f6fcea02859eac5b243fffc387b7ebc8dbb0dd780752485abb3cd9f512b1a299852e5c225230037e2859c73bd5d012c04d4b4274c6ba95dc223ba7d2ce SHA512 8a35caed3ad889ed1ae9fc6e5e59bb21390aedd3b80657002550dd2ac5030d42bff84e73449fa791886d6d0003b1069b02599b11989698315355ce722c7b18d8
-DIST kpmcore-24.12.0.tar.xz 646316 BLAKE2B d536de2ddf9f03a5de38cf612cb3808d1d59ff4188a5226f2c210b892dd08d428f95ed3fc782fa3c18efb281b9fafac3eed52556fc1b11fa0cdcf04a82091dce SHA512 17ef928d60dae8af243ed4932a333274e2296a9b074a7e531ae64e7350583336b9ac3518a7085597d56127886bad4b07a9d1918efd290b501227d2bfe998afde
+DIST kpmcore-24.12.1.tar.xz 649608 BLAKE2B a9a8a15885eb0b07455957add881e54cdbc34025b8a4cc414dff1340d0b4e591494b99155f8b275f651782e6a397d574f710326b2d7f366dda4a4fafc044466d SHA512 67b93b0fece5b7bf296e9c2a1df3fca472bc95cac1e8b3cd57e5ee84294ab65e09d9865a960d6be25af389d3efa6be107cd94d508b2ee89fd6cbd41a4b191d8b
diff --git a/sys-libs/kpmcore/kpmcore-24.12.0.ebuild b/sys-libs/kpmcore/kpmcore-24.12.0.ebuild
deleted file mode 100644
index b9ff47bc8a51..000000000000
--- a/sys-libs/kpmcore/kpmcore-24.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_NONGUI="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for managing partitions"
-HOMEPAGE="https://apps.kde.org/partitionmanager/"
-
-LICENSE="GPL-3"
-SLOT="6/10"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# bug 689468, tests need polkit etc.
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=sys-apps/util-linux-2.33.2
-	>=sys-auth/polkit-qt-0.175.0[qt6(+)]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
diff --git a/sys-libs/kpmcore/kpmcore-24.12.1.ebuild b/sys-libs/kpmcore/kpmcore-24.12.1.ebuild
new file mode 100644
index 000000000000..a850b19a9ef6
--- /dev/null
+++ b/sys-libs/kpmcore/kpmcore-24.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_NONGUI="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for managing partitions"
+HOMEPAGE="https://apps.kde.org/partitionmanager/"
+
+LICENSE="GPL-3"
+SLOT="6/10"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+# bug 689468, tests need polkit etc.
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=sys-apps/util-linux-2.33.2
+	>=sys-auth/polkit-qt-0.175.0[qt6(+)]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
index 72e3b36bde1a..5bc7fa6d98fe 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-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"
@@ -55,9 +55,6 @@ src_prepare() {
 multilib_src_compile() {
 	tc-export AR CC PKG_CONFIG RANLIB
 
-	# bug 905711
-	use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE
-
 	local -x CFLAGS="${CFLAGS} -fno-semantic-interposition"
 
 	emake \
@@ -65,6 +62,7 @@ multilib_src_compile() {
 		SHLIBDIR="/$(get_libdir)" \
 		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
 		USE_PCRE2=y \
+		USE_LFS=y \
 		FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
 		all
 
@@ -75,6 +73,7 @@ multilib_src_compile() {
 				LIBDIR="\$(PREFIX)/$(get_libdir)" \
 				SHLIBDIR="/$(get_libdir)" \
 				USE_PCRE2=y \
+				USE_LFS=y \
 				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
 				pywrap
 		}
@@ -91,6 +90,7 @@ multilib_src_compile() {
 				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
 				LIBDIR="\$(PREFIX)/$(get_libdir)" \
 				SHLIBDIR="/$(get_libdir)" \
+				USE_LFS=y \
 				USE_PCRE2=y \
 				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
 				rubywrap
@@ -107,6 +107,7 @@ multilib_src_install() {
 	emake DESTDIR="${D}" \
 		LIBDIR="\$(PREFIX)/$(get_libdir)" \
 		SHLIBDIR="/$(get_libdir)" \
+		USE_LFS=y \
 		USE_PCRE2=y \
 		install
 
@@ -115,6 +116,7 @@ multilib_src_install() {
 			emake DESTDIR="${D}" \
 				LIBDIR="\$(PREFIX)/$(get_libdir)" \
 				SHLIBDIR="/$(get_libdir)" \
+				USE_LFS=y \
 				USE_PCRE2=y \
 				install-pywrap
 			python_optimize # bug 531638
@@ -131,6 +133,7 @@ multilib_src_install() {
 				LIBDIR="\$(PREFIX)/$(get_libdir)" \
 				SHLIBDIR="/$(get_libdir)" \
 				RUBY=${1} \
+				USE_LFS=y \
 				USE_PCRE2=y \
 				install-rubywrap
 		}
diff --git a/sys-libs/minizip-ng/Manifest b/sys-libs/minizip-ng/Manifest
index 555f5c7c0576..9cb4bc8012d4 100644
--- a/sys-libs/minizip-ng/Manifest
+++ b/sys-libs/minizip-ng/Manifest
@@ -1,2 +1,3 @@
 DIST minizip-ng-4.0.5.tar.gz 770078 BLAKE2B e9e416a8fae3c4e33c1fe644bbf4f3edf2becc8e8e0dfba079481c8c8fbd871c1591537c58e7aaa9b08ecee430c2acb8c1a5ee085fa8c819714fbe906876241e SHA512 760c540ccedd04c21d72ec7b41bc31a16e4291776580a6febb9400198440b3a64f39d4ba26be2608abf47b9dcc1ed266dad8bc0a8cacb607e4885c9dd05be0d6
 DIST minizip-ng-4.0.7.tar.gz 770098 BLAKE2B 2626a8ff7fe70db5a2ec93829a03d7d274a161aa787de86ab021d1d0590890f84570118f7e372dd13d947c85606886e0d8591bc7d8145b7f9474cb59e6ec6c49 SHA512 af9c8743d34bbc8f371a018debfab5f857aadb9a1129b048dbce9085122bef209ade34837784f91424c9eba92406d2e222476d9f8038839908679f7b7dc9e3eb
+DIST minizip-ng-4.0.8.tar.gz 770957 BLAKE2B 6f97dc609cababfe4939603d9795e39552e3fbc04d1dde7e2389cf6b0326f98cb6ec98e8cb7b768c713b35476aa35ec4c0b56180221f014380aa47271f207601 SHA512 673798114e29a41ce87906b705dd92c5dc1ed1798aefaa20f0e3d7c1f27b9593e0c4c1271e02585ecc234ce835b14b02227c37f1a7fba4c7a98b822f10711b85
diff --git a/sys-libs/minizip-ng/minizip-ng-4.0.8.ebuild b/sys-libs/minizip-ng/minizip-ng-4.0.8.ebuild
new file mode 100644
index 000000000000..838cf729cfac
--- /dev/null
+++ b/sys-libs/minizip-ng/minizip-ng-4.0.8.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Worth keeping an eye on 'develop' branch upstream for possible backports,
+# as they copied this practice from sys-libs/zlib upstream.
+
+inherit cmake-multilib
+
+DESCRIPTION="Fork of the popular zip manipulation library found in the zlib distribution"
+HOMEPAGE="https://github.com/zlib-ng/minizip-ng"
+SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="compat lzma openssl test zstd"
+RESTRICT="!test? ( test )"
+
+# Automagically prefers sys-libs/zlib-ng if installed, so let's
+# just depend on it as presumably it's better tested anyway.
+RDEPEND="
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	sys-libs/zlib-ng[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	compat? ( !sys-libs/zlib[minizip] )
+	lzma? ( app-arch/xz-utils )
+	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.4-libbsd-overlay.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DMZ_COMPAT=$(usex compat)
+
+		-DMZ_BUILD_TESTS=$(usex test)
+		-DMZ_BUILD_UNIT_TESTS=$(usex test)
+
+		-DMZ_FETCH_LIBS=OFF
+		-DMZ_FORCE_FETCH_LIBS=OFF
+
+		# Compression library options
+		-DMZ_ZLIB=ON
+		-DMZ_BZIP2=ON
+		-DMZ_LZMA=$(usex lzma)
+		-DMZ_ZSTD=$(usex zstd)
+		-DMZ_LIBCOMP=OFF
+
+		# Encryption support options
+		-DMZ_PKCRYPT=ON
+		-DMZ_WZAES=ON
+		-DMZ_OPENSSL=$(usex openssl)
+		-DMZ_LIBBSD=ON
+
+		# Character conversion options
+		-DMZ_ICONV=ON
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local myctestargs=(
+		# TODO: investigate
+		-E "(raw-unzip-pkcrypt|raw-append-unzip-pkcrypt|raw-erase-unzip-pkcrypt|deflate-unzip-pkcrypt|deflate-append-unzip-pkcrypt|deflate-erase-unzip-pkcrypt|bzip2-unzip-pkcrypt|bzip2-append-unzip-pkcrypt|bzip2-erase-unzip-pkcrypt|lzma-unzip-pkcrypt|lzma-append-unzip-pkcrypt|lzma-erase-unzip-pkcrypt|xz-unzip-pkcrypt|xz-append-unzip-pkcrypt|xz-erase-unzip-pkcrypt|zstd-unzip-pkcrypt|zstd-append-unzip-pkcrypt|zstd-erase-unzip-pkcrypt)"
+	)
+
+	# TODO: A bunch of tests end up looping and writing over each other's files
+	# It gets better with a patch applied (see https://github.com/zlib-ng/minizip-ng/issues/623#issuecomment-1264518994)
+	# but still hangs.
+	cmake_src_test -j1
+}
+
+pkg_postinst() {
+	if use compat ; then
+		ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous"
+		ewarn "Please be careful!"
+	fi
+}
diff --git a/sys-libs/musl/files/musl-sched.h-reduce-namespace-conflicts.patch b/sys-libs/musl/files/musl-sched.h-reduce-namespace-conflicts.patch
new file mode 100644
index 000000000000..d2d3b9343842
--- /dev/null
+++ b/sys-libs/musl/files/musl-sched.h-reduce-namespace-conflicts.patch
@@ -0,0 +1,58 @@
+commit 1a98576401ff604ff06a030a3644e2780b2a837d
+Author: Rich Felker <dalias@aerifal.cx>
+Date:   Mon Jan 13 08:31:02 2025 -0500
+
+    sched.h: reduce namespace conflicts in _GNU_SOURCE profile
+    
+    we have the cpuset macros call calloc/free/memset/memcmp directly so
+    that they don't depend on any further ABI surface. this is not
+    namespace-clean, but only affects the _GNU_SOURCE feature profile,
+    which is not intended to be namespace-clean. nonetheless, reports come
+    up now and then of things which are gratuitously broken, usually when
+    an application has wrapped malloc with macros.
+    
+    this patch parenthesizes the function names so that function-like
+    macros will not be expanded, and removes the unused declaration of
+    memcpy. this is not a complete solution, but it should improve things
+    for affected applications, particularly ones which are not even trying
+    to use the cpuset interfaces which got them just because g++ always
+    defines _GNU_SOURCE.
+
+diff --git a/include/sched.h b/include/sched.h
+index 204c34f5..8c3b53f0 100644
+--- a/include/sched.h
++++ b/include/sched.h
+@@ -78,11 +78,10 @@ int clone (int (*)(void *), void *, int, void *, ...);
+ int unshare(int);
+ int setns(int, int);
+ 
+-void *memcpy(void *__restrict, const void *__restrict, size_t);
+-int memcmp(const void *, const void *, size_t);
+-void *memset (void *, int, size_t);
+-void *calloc(size_t, size_t);
+-void free(void *);
++int (memcmp)(const void *, const void *, size_t);
++void *(memset)(void *, int, size_t);
++void *(calloc)(size_t, size_t);
++void (free)(void *);
+ 
+ typedef struct cpu_set_t { unsigned long __bits[128/sizeof(long)]; } cpu_set_t;
+ int __sched_cpucount(size_t, const cpu_set_t *);
+@@ -116,13 +115,13 @@ __CPU_op_func_S(XOR, ^)
+ #define CPU_XOR_S(a,b,c,d) __CPU_XOR_S(a,b,c,d)
+ 
+ #define CPU_COUNT_S(size,set) __sched_cpucount(size,set)
+-#define CPU_ZERO_S(size,set) memset(set,0,size)
+-#define CPU_EQUAL_S(size,set1,set2) (!memcmp(set1,set2,size))
++#define CPU_ZERO_S(size,set) (memset)(set,0,size)
++#define CPU_EQUAL_S(size,set1,set2) (!(memcmp)(set1,set2,size))
+ 
+ #define CPU_ALLOC_SIZE(n) (sizeof(long) * ( (n)/(8*sizeof(long)) \
+ 	+ ((n)%(8*sizeof(long)) + 8*sizeof(long)-1)/(8*sizeof(long)) ) )
+-#define CPU_ALLOC(n) ((cpu_set_t *)calloc(1,CPU_ALLOC_SIZE(n)))
+-#define CPU_FREE(set) free(set)
++#define CPU_ALLOC(n) ((cpu_set_t *)(calloc)(1,CPU_ALLOC_SIZE(n)))
++#define CPU_FREE(set) (free)(set)
+ 
+ #define CPU_SETSIZE 1024
+ 
diff --git a/sys-libs/musl/musl-1.2.3-r8.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild
deleted file mode 100644
index a92b617b8fd1..000000000000
--- a/sys-libs/musl/musl-1.2.3-r8.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
-	inherit verify-sig
-
-	SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
-	KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
-fi
-GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
-GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
-SRC_URI+="
-	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
-	https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
-	https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="https://musl.libc.org"
-
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crypt headers-only split-usr"
-
-QA_SONAME="usr/lib/libc.so"
-QA_DT_NEEDED="usr/lib/libc.so"
-# bug #830213
-QA_PRESTRIPPED="usr/lib/crtn.o"
-
-# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
-# built as part as crossdev. Also, elide the blockers when in cross-*,
-# as it doesn't make sense to block the normal CBUILD libxcrypt at all
-# there when we're installing into /usr/${CHOST} anyway.
-if [[ ${CATEGORY} == cross-* ]] ; then
-	IUSE="${IUSE/crypt/+crypt}"
-else
-	RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
-	PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
-fi
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
-	use headers-only && is_crosscompile
-}
-
-pkg_setup() {
-	if [ ${CTARGET} == ${CHOST} ] ; then
-		case ${CHOST} in
-		*-musl*) ;;
-		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
-		esac
-	fi
-
-	# fix for #667126, copied from glibc ebuild
-	# make sure host make.conf doesn't pollute us
-	if is_crosscompile || tc-is-cross-compiler ; then
-		CHOST=${CTARGET} strip-unsupported-flags
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif use verify-sig ; then
-		# We only verify the release; not the additional (fixed, safe) files
-		# we download.
-		# (Seem to get IPC error on verifying in cross?)
-		! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	mkdir "${WORKDIR}"/misc || die
-	cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
-	cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
-	cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
-}
-
-src_configure() {
-	strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343
-	tc-getCC ${CTARGET}
-
-	just_headers && export CC=true
-
-	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	./configure \
-		--target=${CTARGET} \
-		--prefix="${EPREFIX}${sysroot}/usr" \
-		--syslibdir="${EPREFIX}${sysroot}/lib" \
-		--disable-gcc-wrapper || die
-}
-
-src_compile() {
-	emake obj/include/bits/alltypes.h
-	just_headers && return 0
-
-	emake
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		emake -C "${T}" getconf getent iconv \
-			CC="$(tc-getCC)" \
-			CFLAGS="${CFLAGS}" \
-			CPPFLAGS="${CPPFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			VPATH="${WORKDIR}/misc"
-	fi
-
-	$(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o  "${FILESDIR}"/stack_chk_fail_local.c || die
-	$(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
-}
-
-src_install() {
-	local target="install"
-	just_headers && target="install-headers"
-	emake DESTDIR="${D}" ${target}
-	just_headers && return 0
-
-	# musl provides ldd via a sym link to its ld.so
-	local sysroot=
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*)
-	dosym8 -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
-
-	if ! use crypt ; then
-		# Allow sys-libs/libxcrypt[system] to provide it instead
-		rm "${ED}${sysroot}/usr/include/crypt.h" || die
-		rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
-	fi
-
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		# Fish out of config:
-		#   ARCH = ...
-		#   SUBARCH = ...
-		# and print $(ARCH)$(SUBARCH).
-		local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
-
-		# The musl build system seems to create a symlink:
-		# ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
-		# During cross or within prefix, there's no guarantee that the host is
-		# using musl so that file may not exist. Use a relative symlink within
-		# ${D} instead.
-		rm "${ED}"/lib/ld-musl-${arch}.so.1 || die
-		if use split-usr; then
-			dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1
-			# If it's still a dead symlink, OK, we really do need to abort.
-			[[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
-		else
-			dosym libc.so /usr/lib/ld-musl-${arch}.so.1
-			[[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die
-		fi
-
-		cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
-		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
-		eprefixify "${T}"/ldconfig
-		into /
-		dosbin "${T}"/ldconfig
-		into /usr
-		dobin "${T}"/getconf
-		dobin "${T}"/getent
-		dobin "${T}"/iconv
-		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl
-	fi
-
-	if is_crosscompile ; then
-		into /usr/${CTARGET}
-		dolib.a libssp_nonshared.a
-	else
-		dolib.a libssp_nonshared.a
-	fi
-}
-
-pkg_preinst() {
-	# nothing to do if just installing headers
-	just_headers && return
-
-	# prepare /etc/ld.so.conf.d/ for files
-	mkdir -p "${EROOT}"/etc/ld.so.conf.d
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	[ -n "${ROOT}" ] && return 0
-
-	ldconfig || die
-}
diff --git a/sys-libs/musl/musl-1.2.3-r9.ebuild b/sys-libs/musl/musl-1.2.3-r9.ebuild
new file mode 100644
index 000000000000..3436d7f34687
--- /dev/null
+++ b/sys-libs/musl/musl-1.2.3-r9.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
+	inherit verify-sig
+
+	SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
+	KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
+fi
+GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
+GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
+SRC_URI+="
+	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+	https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
+	https://dev.gentoo.org/~blueness/musl-misc/iconv.c
+"
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="https://musl.libc.org"
+
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="crypt headers-only split-usr"
+
+QA_SONAME="usr/lib/libc.so"
+QA_DT_NEEDED="usr/lib/libc.so"
+# bug #830213
+QA_PRESTRIPPED="usr/lib/crtn.o"
+
+# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
+# built as part as crossdev. Also, elide the blockers when in cross-*,
+# as it doesn't make sense to block the normal CBUILD libxcrypt at all
+# there when we're installing into /usr/${CHOST} anyway.
+if [[ ${CATEGORY} == cross-* ]] ; then
+	IUSE="${IUSE/crypt/+crypt}"
+else
+	RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
+	PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-sched.h-reduce-namespace-conflicts.patch
+)
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	use headers-only && is_crosscompile
+}
+
+pkg_setup() {
+	if [ ${CTARGET} == ${CHOST} ] ; then
+		case ${CHOST} in
+		*-musl*) ;;
+		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+		esac
+	fi
+
+	# fix for #667126, copied from glibc ebuild
+	# make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	elif use verify-sig ; then
+		# We only verify the release; not the additional (fixed, safe) files
+		# we download.
+		# (Seem to get IPC error on verifying in cross?)
+		! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	mkdir "${WORKDIR}"/misc || die
+	cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
+	cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
+	cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
+}
+
+src_configure() {
+	strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343
+	tc-getCC ${CTARGET}
+
+	just_headers && export CC=true
+
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	./configure \
+		--target=${CTARGET} \
+		--prefix="${EPREFIX}${sysroot}/usr" \
+		--syslibdir="${EPREFIX}${sysroot}/lib" \
+		--disable-gcc-wrapper || die
+}
+
+src_compile() {
+	emake obj/include/bits/alltypes.h
+	just_headers && return 0
+
+	emake
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		emake -C "${T}" getconf getent iconv \
+			CC="$(tc-getCC)" \
+			CFLAGS="${CFLAGS}" \
+			CPPFLAGS="${CPPFLAGS}" \
+			LDFLAGS="${LDFLAGS}" \
+			VPATH="${WORKDIR}/misc"
+	fi
+
+	$(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o  "${FILESDIR}"/stack_chk_fail_local.c || die
+	$(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
+}
+
+src_install() {
+	local target="install"
+	just_headers && target="install-headers"
+	emake DESTDIR="${D}" ${target}
+	just_headers && return 0
+
+	# musl provides ldd via a sym link to its ld.so
+	local sysroot=
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*)
+	dosym8 -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
+
+	if ! use crypt ; then
+		# Allow sys-libs/libxcrypt[system] to provide it instead
+		rm "${ED}${sysroot}/usr/include/crypt.h" || die
+		rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
+	fi
+
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		# Fish out of config:
+		#   ARCH = ...
+		#   SUBARCH = ...
+		# and print $(ARCH)$(SUBARCH).
+		local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
+
+		# The musl build system seems to create a symlink:
+		# ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
+		# During cross or within prefix, there's no guarantee that the host is
+		# using musl so that file may not exist. Use a relative symlink within
+		# ${D} instead.
+		rm "${ED}"/lib/ld-musl-${arch}.so.1 || die
+		if use split-usr; then
+			dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1
+			# If it's still a dead symlink, OK, we really do need to abort.
+			[[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
+		else
+			dosym libc.so /usr/lib/ld-musl-${arch}.so.1
+			[[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die
+		fi
+
+		cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
+		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+		eprefixify "${T}"/ldconfig
+		into /
+		dosbin "${T}"/ldconfig
+		into /usr
+		dobin "${T}"/getconf
+		dobin "${T}"/getent
+		dobin "${T}"/iconv
+		newenvd - "00musl" <<-EOF
+		# 00musl autogenerated by sys-libs/musl ebuild; DO NOT EDIT.
+		LDPATH="include ld.so.conf.d/*.conf"
+		EOF
+	fi
+
+	if is_crosscompile ; then
+		into /usr/${CTARGET}
+		dolib.a libssp_nonshared.a
+	else
+		dolib.a libssp_nonshared.a
+	fi
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+}
+
+pkg_postinst() {
+	is_crosscompile && return 0
+
+	[ -n "${ROOT}" ] && return 0
+
+	ldconfig || die
+}
diff --git a/sys-libs/musl/musl-1.2.4-r1.ebuild b/sys-libs/musl/musl-1.2.4-r1.ebuild
index 2d9af6f92d44..581ac6ffe152 100644
--- a/sys-libs/musl/musl-1.2.4-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.4-r1.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
@@ -175,8 +175,10 @@ src_install() {
 		dobin "${T}"/getconf
 		dobin "${T}"/getent
 		dobin "${T}"/iconv
-		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl
+		newenvd - "00musl" <<-EOF
+		# 00musl autogenerated by sys-libs/musl ebuild; DO NOT EDIT.
+		LDPATH="include ld.so.conf.d/*.conf"
+		EOF
 	fi
 
 	if target_is_not_host ; then
diff --git a/sys-libs/musl/musl-1.2.4-r2.ebuild b/sys-libs/musl/musl-1.2.4-r2.ebuild
deleted file mode 100644
index 296f83982c96..000000000000
--- a/sys-libs/musl/musl-1.2.4-r2.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit crossdev flag-o-matic toolchain-funcs prefix
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
-	inherit verify-sig
-
-	SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
-	KEYWORDS="-* amd64 arm arm64 ~m68k ~mips ppc ppc64 ~riscv x86"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
-fi
-GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
-GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
-SRC_URI+="
-	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
-	https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
-	https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-"
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="https://musl.libc.org"
-
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crypt headers-only split-usr"
-
-QA_SONAME="usr/lib/libc.so"
-QA_DT_NEEDED="usr/lib/libc.so"
-# bug #830213
-QA_PRESTRIPPED="usr/lib/crtn.o"
-
-# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
-# built as part as crossdev. Also, elide the blockers when in cross-*,
-# as it doesn't make sense to block the normal CBUILD libxcrypt at all
-# there when we're installing into /usr/${CHOST} anyway.
-if is_crosspkg ; then
-	IUSE="${IUSE/crypt/+crypt}"
-else
-	RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
-	PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${P}-elfutils-0.190-relr.patch
-	"${FILESDIR}"/${PN}-1.2.4-arm64-crti-alignment.patch
-)
-
-just_headers() {
-	use headers-only && target_is_not_host
-}
-
-pkg_setup() {
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		case ${CHOST} in
-		*-musl*) ;;
-		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
-		esac
-	fi
-
-	# fix for #667126, copied from glibc ebuild
-	# make sure host make.conf doesn't pollute us
-	if target_is_not_host || tc-is-cross-compiler ; then
-		CHOST=${CTARGET} strip-unsupported-flags
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif use verify-sig ; then
-		# We only verify the release; not the additional (fixed, safe) files
-		# we download.
-		# (Seem to get IPC error on verifying in cross?)
-		! target_is_not_host && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	mkdir "${WORKDIR}"/misc || die
-	cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
-	cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
-	cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
-}
-
-src_configure() {
-	strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343
-	tc-getCC ${CTARGET}
-
-	just_headers && export CC=true
-
-	local sysroot
-	target_is_not_host && sysroot=/usr/${CTARGET}
-	./configure \
-		--target=${CTARGET} \
-		--prefix="${EPREFIX}${sysroot}/usr" \
-		--syslibdir="${EPREFIX}${sysroot}/lib" \
-		--disable-gcc-wrapper || die
-}
-
-src_compile() {
-	emake obj/include/bits/alltypes.h
-	just_headers && return 0
-
-	emake
-	if ! is_crosspkg ; then
-		emake -C "${T}" getconf getent iconv \
-			CC="$(tc-getCC)" \
-			CFLAGS="${CFLAGS}" \
-			CPPFLAGS="${CPPFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			VPATH="${WORKDIR}/misc"
-	fi
-
-	$(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o  "${FILESDIR}"/stack_chk_fail_local.c || die
-	$(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
-}
-
-src_install() {
-	local target="install"
-	just_headers && target="install-headers"
-	emake DESTDIR="${D}" ${target}
-	just_headers && return 0
-
-	# musl provides ldd via a sym link to its ld.so
-	local sysroot=
-	target_is_not_host && sysroot=/usr/${CTARGET}
-	local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*)
-	dosym -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
-
-	if ! use crypt ; then
-		# Allow sys-libs/libxcrypt[system] to provide it instead
-		rm "${ED}${sysroot}/usr/include/crypt.h" || die
-		rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
-	fi
-
-	if ! is_crosspkg ; then
-		# Fish out of config:
-		#   ARCH = ...
-		#   SUBARCH = ...
-		# and print $(ARCH)$(SUBARCH).
-		local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
-
-		# The musl build system seems to create a symlink:
-		# ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
-		# During cross or within prefix, there's no guarantee that the host is
-		# using musl so that file may not exist. Use a relative symlink within
-		# ${D} instead.
-		rm "${ED}"/lib/ld-musl-${arch}.so.1 || die
-		if use split-usr; then
-			dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1
-			# If it's still a dead symlink, OK, we really do need to abort.
-			[[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
-		else
-			dosym libc.so /usr/lib/ld-musl-${arch}.so.1
-			[[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die
-		fi
-
-		cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
-		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
-		eprefixify "${T}"/ldconfig
-		into /
-		dosbin "${T}"/ldconfig
-		into /usr
-		dobin "${T}"/getconf
-		dobin "${T}"/getent
-		dobin "${T}"/iconv
-		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl
-	fi
-
-	if target_is_not_host ; then
-		into /usr/${CTARGET}
-		dolib.a libssp_nonshared.a
-	else
-		dolib.a libssp_nonshared.a
-	fi
-}
-
-pkg_preinst() {
-	# nothing to do if just installing headers
-	just_headers && return
-
-	# prepare /etc/ld.so.conf.d/ for files
-	mkdir -p "${EROOT}"/etc/ld.so.conf.d
-}
-
-pkg_postinst() {
-	target_is_not_host && return 0
-
-	[ -n "${ROOT}" ] && return 0
-
-	ldconfig || die
-}
diff --git a/sys-libs/musl/musl-1.2.4-r3.ebuild b/sys-libs/musl/musl-1.2.4-r3.ebuild
new file mode 100644
index 000000000000..3909d62c13de
--- /dev/null
+++ b/sys-libs/musl/musl-1.2.4-r3.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit crossdev flag-o-matic toolchain-funcs prefix
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
+	inherit verify-sig
+
+	SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
+	KEYWORDS="-* amd64 arm arm64 ~m68k ~mips ppc ppc64 ~riscv x86"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
+fi
+GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
+GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
+SRC_URI+="
+	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+	https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
+	https://dev.gentoo.org/~blueness/musl-misc/iconv.c
+"
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="https://musl.libc.org"
+
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="crypt headers-only split-usr"
+
+QA_SONAME="usr/lib/libc.so"
+QA_DT_NEEDED="usr/lib/libc.so"
+# bug #830213
+QA_PRESTRIPPED="usr/lib/crtn.o"
+
+# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
+# built as part as crossdev. Also, elide the blockers when in cross-*,
+# as it doesn't make sense to block the normal CBUILD libxcrypt at all
+# there when we're installing into /usr/${CHOST} anyway.
+if is_crosspkg ; then
+	IUSE="${IUSE/crypt/+crypt}"
+else
+	RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
+	PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${P}-elfutils-0.190-relr.patch
+	"${FILESDIR}"/${PN}-1.2.4-arm64-crti-alignment.patch
+	"${FILESDIR}"/${PN}-sched.h-reduce-namespace-conflicts.patch
+)
+
+just_headers() {
+	use headers-only && target_is_not_host
+}
+
+pkg_setup() {
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		case ${CHOST} in
+		*-musl*) ;;
+		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+		esac
+	fi
+
+	# fix for #667126, copied from glibc ebuild
+	# make sure host make.conf doesn't pollute us
+	if target_is_not_host || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	elif use verify-sig ; then
+		# We only verify the release; not the additional (fixed, safe) files
+		# we download.
+		# (Seem to get IPC error on verifying in cross?)
+		! target_is_not_host && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	mkdir "${WORKDIR}"/misc || die
+	cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
+	cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
+	cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
+}
+
+src_configure() {
+	strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343
+	tc-getCC ${CTARGET}
+
+	just_headers && export CC=true
+
+	local sysroot
+	target_is_not_host && sysroot=/usr/${CTARGET}
+	./configure \
+		--target=${CTARGET} \
+		--prefix="${EPREFIX}${sysroot}/usr" \
+		--syslibdir="${EPREFIX}${sysroot}/lib" \
+		--disable-gcc-wrapper || die
+}
+
+src_compile() {
+	emake obj/include/bits/alltypes.h
+	just_headers && return 0
+
+	emake
+	if ! is_crosspkg ; then
+		emake -C "${T}" getconf getent iconv \
+			CC="$(tc-getCC)" \
+			CFLAGS="${CFLAGS}" \
+			CPPFLAGS="${CPPFLAGS}" \
+			LDFLAGS="${LDFLAGS}" \
+			VPATH="${WORKDIR}/misc"
+	fi
+
+	$(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o  "${FILESDIR}"/stack_chk_fail_local.c || die
+	$(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
+}
+
+src_install() {
+	local target="install"
+	just_headers && target="install-headers"
+	emake DESTDIR="${D}" ${target}
+	just_headers && return 0
+
+	# musl provides ldd via a sym link to its ld.so
+	local sysroot=
+	target_is_not_host && sysroot=/usr/${CTARGET}
+	local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*)
+	dosym -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
+
+	if ! use crypt ; then
+		# Allow sys-libs/libxcrypt[system] to provide it instead
+		rm "${ED}${sysroot}/usr/include/crypt.h" || die
+		rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
+	fi
+
+	if ! is_crosspkg ; then
+		# Fish out of config:
+		#   ARCH = ...
+		#   SUBARCH = ...
+		# and print $(ARCH)$(SUBARCH).
+		local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
+
+		# The musl build system seems to create a symlink:
+		# ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
+		# During cross or within prefix, there's no guarantee that the host is
+		# using musl so that file may not exist. Use a relative symlink within
+		# ${D} instead.
+		rm "${ED}"/lib/ld-musl-${arch}.so.1 || die
+		if use split-usr; then
+			dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1
+			# If it's still a dead symlink, OK, we really do need to abort.
+			[[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
+		else
+			dosym libc.so /usr/lib/ld-musl-${arch}.so.1
+			[[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die
+		fi
+
+		cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
+		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+		eprefixify "${T}"/ldconfig
+		into /
+		dosbin "${T}"/ldconfig
+		into /usr
+		dobin "${T}"/getconf
+		dobin "${T}"/getent
+		dobin "${T}"/iconv
+		newenvd - "00musl" <<-EOF
+		# 00musl autogenerated by sys-libs/musl ebuild; DO NOT EDIT.
+		LDPATH="include ld.so.conf.d/*.conf"
+		EOF
+	fi
+
+	if target_is_not_host ; then
+		into /usr/${CTARGET}
+		dolib.a libssp_nonshared.a
+	else
+		dolib.a libssp_nonshared.a
+	fi
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+}
+
+pkg_postinst() {
+	target_is_not_host && return 0
+
+	[ -n "${ROOT}" ] && return 0
+
+	ldconfig || die
+}
diff --git a/sys-libs/musl/musl-1.2.5-r1.ebuild b/sys-libs/musl/musl-1.2.5-r1.ebuild
deleted file mode 100644
index beea27bbd243..000000000000
--- a/sys-libs/musl/musl-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit crossdev flag-o-matic toolchain-funcs prefix
-
-DESCRIPTION="Light, fast and, simple C library focused on standards-conformance and safety"
-HOMEPAGE="https://musl.libc.org"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
-	inherit verify-sig
-
-	SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
-	KEYWORDS="-* amd64 arm arm64 ~m68k ~mips ppc ppc64 ~riscv x86"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
-fi
-
-GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
-GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
-SRC_URI+="
-	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
-	https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
-	https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-"
-
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="crypt headers-only split-usr"
-
-QA_SONAME="usr/lib/libc.so"
-QA_DT_NEEDED="usr/lib/libc.so"
-# bug #830213
-QA_PRESTRIPPED="usr/lib/crtn.o"
-
-# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
-# built as part as crossdev. Also, elide the blockers when in cross-*,
-# as it doesn't make sense to block the normal CBUILD libxcrypt at all
-# there when we're installing into /usr/${CHOST} anyway.
-if is_crosspkg ; then
-	IUSE="${IUSE/crypt/+crypt}"
-else
-	RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
-	PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.4-arm64-crti-alignment.patch
-)
-
-just_headers() {
-	use headers-only && target_is_not_host
-}
-
-pkg_setup() {
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		case ${CHOST} in
-			*-musl*) ;;
-			*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
-		esac
-	fi
-
-	# Fix for bug #667126, copied from glibc ebuild:
-	# make sure host make.conf doesn't pollute us
-	if target_is_not_host || tc-is-cross-compiler ; then
-		CHOST=${CTARGET} strip-unsupported-flags
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif use verify-sig ; then
-		# We only verify the release; not the additional (fixed, safe) files
-		# we download.
-		# (Seem to get IPC error on verifying in cross?)
-		! target_is_not_host && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	mkdir "${WORKDIR}"/misc || die
-	cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
-	cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
-	cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
-}
-
-src_configure() {
-	strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343
-	tc-getCC ${CTARGET}
-
-	just_headers && export CC=true
-
-	local sysroot
-	target_is_not_host && sysroot=/usr/${CTARGET}
-	./configure \
-		--target=${CTARGET} \
-		--prefix="${EPREFIX}${sysroot}/usr" \
-		--syslibdir="${EPREFIX}${sysroot}/lib" \
-		--disable-gcc-wrapper || die
-}
-
-src_compile() {
-	emake obj/include/bits/alltypes.h
-	just_headers && return 0
-
-	emake
-	if ! is_crosspkg ; then
-		emake -C "${T}" getconf getent iconv \
-			CC="$(tc-getCC)" \
-			CFLAGS="${CFLAGS}" \
-			CPPFLAGS="${CPPFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			VPATH="${WORKDIR}/misc"
-	fi
-
-	$(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
-	$(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
-}
-
-src_install() {
-	local target="install"
-	just_headers && target="install-headers"
-	emake DESTDIR="${D}" ${target}
-	just_headers && return 0
-
-	# musl provides ldd via a sym link to its ld.so
-	local sysroot=
-	target_is_not_host && sysroot=/usr/${CTARGET}
-	local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*)
-	dosym -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
-
-	if ! use crypt ; then
-		# Allow sys-libs/libxcrypt[system] to provide it instead
-		rm "${ED}${sysroot}/usr/include/crypt.h" || die
-		rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
-	fi
-
-	if ! is_crosspkg ; then
-		# Fish out of config:
-		#   ARCH = ...
-		#   SUBARCH = ...
-		# and print $(ARCH)$(SUBARCH).
-		local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
-
-		# The musl build system seems to create a symlink:
-		# ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
-		# During cross or within prefix, there's no guarantee that the host is
-		# using musl so that file may not exist. Use a relative symlink within
-		# ${D} instead.
-		rm "${ED}"/lib/ld-musl-${arch}.so.1 || die
-		if use split-usr; then
-			dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1
-			# If it's still a dead symlink, OK, we really do need to abort.
-			[[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
-		else
-			dosym libc.so /usr/lib/ld-musl-${arch}.so.1
-			[[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die
-		fi
-
-		cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
-		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
-		eprefixify "${T}"/ldconfig
-		into /
-		dosbin "${T}"/ldconfig
-		into /usr
-		dobin "${T}"/getconf
-		dobin "${T}"/getent
-		dobin "${T}"/iconv
-		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl
-	fi
-
-	if target_is_not_host ; then
-		into /usr/${CTARGET}
-		dolib.a libssp_nonshared.a
-	else
-		dolib.a libssp_nonshared.a
-	fi
-}
-
-pkg_preinst() {
-	# Nothing to do if just installing headers
-	just_headers && return
-
-	# Prepare /etc/ld.so.conf.d/ for files
-	mkdir -p "${EROOT}"/etc/ld.so.conf.d
-}
-
-pkg_postinst() {
-	target_is_not_host && return 0
-
-	[[ -n "${ROOT}" ]] && return 0
-
-	ldconfig || die
-}
diff --git a/sys-libs/musl/musl-1.2.5-r2.ebuild b/sys-libs/musl/musl-1.2.5-r2.ebuild
new file mode 100644
index 000000000000..62c8bedc5e27
--- /dev/null
+++ b/sys-libs/musl/musl-1.2.5-r2.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit crossdev flag-o-matic toolchain-funcs prefix
+
+DESCRIPTION="Light, fast and, simple C library focused on standards-conformance and safety"
+HOMEPAGE="https://musl.libc.org"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc
+	inherit verify-sig
+
+	SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
+	KEYWORDS="-* amd64 arm arm64 ~m68k ~mips ppc ppc64 ~riscv x86"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
+fi
+
+GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
+GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
+SRC_URI+="
+	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+	https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE}
+	https://dev.gentoo.org/~blueness/musl-misc/iconv.c
+"
+
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="crypt headers-only split-usr"
+
+QA_SONAME="usr/lib/libc.so"
+QA_DT_NEEDED="usr/lib/libc.so"
+# bug #830213
+QA_PRESTRIPPED="usr/lib/crtn.o"
+
+# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
+# built as part as crossdev. Also, elide the blockers when in cross-*,
+# as it doesn't make sense to block the normal CBUILD libxcrypt at all
+# there when we're installing into /usr/${CHOST} anyway.
+if is_crosspkg ; then
+	IUSE="${IUSE/crypt/+crypt}"
+else
+	RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )"
+	PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.4-arm64-crti-alignment.patch
+	"${FILESDIR}"/${PN}-sched.h-reduce-namespace-conflicts.patch
+)
+
+just_headers() {
+	use headers-only && target_is_not_host
+}
+
+pkg_setup() {
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		case ${CHOST} in
+			*-musl*) ;;
+			*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+		esac
+	fi
+
+	# Fix for bug #667126, copied from glibc ebuild:
+	# make sure host make.conf doesn't pollute us
+	if target_is_not_host || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	elif use verify-sig ; then
+		# We only verify the release; not the additional (fixed, safe) files
+		# we download.
+		# (Seem to get IPC error on verifying in cross?)
+		! target_is_not_host && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	mkdir "${WORKDIR}"/misc || die
+	cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die
+	cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die
+	cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die
+}
+
+src_configure() {
+	strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343
+	tc-getCC ${CTARGET}
+
+	just_headers && export CC=true
+
+	local sysroot
+	target_is_not_host && sysroot=/usr/${CTARGET}
+	./configure \
+		--target=${CTARGET} \
+		--prefix="${EPREFIX}${sysroot}/usr" \
+		--syslibdir="${EPREFIX}${sysroot}/lib" \
+		--disable-gcc-wrapper || die
+}
+
+src_compile() {
+	emake obj/include/bits/alltypes.h
+	just_headers && return 0
+
+	emake
+	if ! is_crosspkg ; then
+		emake -C "${T}" getconf getent iconv \
+			CC="$(tc-getCC)" \
+			CFLAGS="${CFLAGS}" \
+			CPPFLAGS="${CPPFLAGS}" \
+			LDFLAGS="${LDFLAGS}" \
+			VPATH="${WORKDIR}/misc"
+	fi
+
+	$(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
+	$(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
+}
+
+src_install() {
+	local target="install"
+	just_headers && target="install-headers"
+	emake DESTDIR="${D}" ${target}
+	just_headers && return 0
+
+	# musl provides ldd via a sym link to its ld.so
+	local sysroot=
+	target_is_not_host && sysroot=/usr/${CTARGET}
+	local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*)
+	dosym -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd"
+
+	if ! use crypt ; then
+		# Allow sys-libs/libxcrypt[system] to provide it instead
+		rm "${ED}${sysroot}/usr/include/crypt.h" || die
+		rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
+	fi
+
+	if ! is_crosspkg ; then
+		# Fish out of config:
+		#   ARCH = ...
+		#   SUBARCH = ...
+		# and print $(ARCH)$(SUBARCH).
+		local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak)
+
+		# The musl build system seems to create a symlink:
+		# ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute)
+		# During cross or within prefix, there's no guarantee that the host is
+		# using musl so that file may not exist. Use a relative symlink within
+		# ${D} instead.
+		rm "${ED}"/lib/ld-musl-${arch}.so.1 || die
+		if use split-usr; then
+			dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1
+			# If it's still a dead symlink, OK, we really do need to abort.
+			[[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
+		else
+			dosym libc.so /usr/lib/ld-musl-${arch}.so.1
+			[[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die
+		fi
+
+		cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die
+		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+		eprefixify "${T}"/ldconfig
+		into /
+		dosbin "${T}"/ldconfig
+		into /usr
+		dobin "${T}"/getconf
+		dobin "${T}"/getent
+		dobin "${T}"/iconv
+		newenvd - "00musl" <<-EOF
+		# 00musl autogenerated by sys-libs/musl ebuild; DO NOT EDIT.
+		LDPATH="include ld.so.conf.d/*.conf"
+		EOF
+	fi
+
+	if target_is_not_host ; then
+		into /usr/${CTARGET}
+		dolib.a libssp_nonshared.a
+	else
+		dolib.a libssp_nonshared.a
+	fi
+}
+
+pkg_preinst() {
+	# Nothing to do if just installing headers
+	just_headers && return
+
+	# Prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+}
+
+pkg_postinst() {
+	target_is_not_host && return 0
+
+	[[ -n "${ROOT}" ]] && return 0
+
+	ldconfig || die
+}
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 278e5e367d77..5679adc85bec 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-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
@@ -173,8 +173,10 @@ src_install() {
 		dobin "${T}"/getconf
 		dobin "${T}"/getent
 		dobin "${T}"/iconv
-		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl
+		newenvd - "00musl" <<-EOF
+		# 00musl autogenerated by sys-libs/musl ebuild; DO NOT EDIT.
+		LDPATH="include ld.so.conf.d/*.conf"
+		EOF
 	fi
 
 	if target_is_not_host ; then
diff --git a/sys-libs/ncurses/ncurses-6.5_p20241109.ebuild b/sys-libs/ncurses/ncurses-6.5_p20241109.ebuild
index c95699da9f73..9b250194be84 100644
--- a/sys-libs/ncurses/ncurses-6.5_p20241109.ebuild
+++ b/sys-libs/ncurses/ncurses-6.5_p20241109.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
@@ -269,7 +269,6 @@ do_configure() {
 		#--disable-root-access
 		#--disable-root-environ
 
-		--disable-term-driver
 		--disable-termcap
 		--enable-symlinks
 		--with-manpage-format=normal
@@ -290,6 +289,15 @@ do_configure() {
 		--disable-pkg-ldflags
 	)
 
+	case ${CHOST} in
+		*-mingw32*)
+			conf+=( --enable-term-driver )
+			;;
+		*)
+			conf+=( --disable-term-driver )
+			;;
+	esac
+
 	if [[ ${target} == ncurses*w ]] ; then
 		conf+=( --enable-widec )
 	else
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 626b3811412f..8cf339814c65 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -2,3 +2,4 @@ DIST Linux-PAM-1.5.3-docs.tar.xz 466340 BLAKE2B 6bade3c63ebe6b6ca7a86d7385850bb8
 DIST Linux-PAM-1.5.3.tar.xz 1020076 BLAKE2B 362c939f3afc343e6f4e78e7f6ba6f7a9c6ee0a9948bb5a4fc34cecfd29e9fa974082534d4ceedd04d8d3e34c7b3ef43d2a07ba5f41d26da04ec8330fc3790fb SHA512 af88e8c1b6a9b737ffaffff7dd9ed8eec996d1fbb5804fb76f590bed66d8a1c2c6024a534d7a7b6d18496b300f3d6571a08874cf406cd2e8cea1d5eff49c136a
 DIST Linux-PAM-1.6.1-docs.tar.xz 465516 BLAKE2B c39dfba2e327120edc1f30be6ea7f8e6cf20d1f4dd17752cc34e0ae1c0bd22b3d19b94ab665bf3df5bd6ecc7fc358dbbedd8a3069df95ff6189580e538aa3547 SHA512 c6054ec6832f604c0654cf074e4e241c44037fd41cd37cca7da94abe008ff72adc4466d31bd254517eda083c7ec3f6aefd37785b3ee3d0d4553250bd29963855
 DIST Linux-PAM-1.6.1.tar.xz 1054152 BLAKE2B 649b4ff892fbd3eb90adcbd9ccc5b3f5df51bf1c79b9084c7a1613c432587b13b81761d1eb4f31ef12d58843d16af24a3c441d0b6f5d2f2a1db9c8da15a61e2f SHA512 ddb5a5f296f564b76925324550d29f15d342841a97815336789c7bb922a8663e831edeb54f3dcd1eaf297e3325c9e2e6c14b8740def5c43cf3f160a8a14fa2ea
+DIST pam-1.7.0_p20241230.gh.tar.gz 719108 BLAKE2B c37daabae380ce75c630a0af1b9960676bc973c773025bc7f65ae87aebff4ca3b667e16ec9635c7677e8a00e6b26eb590f84b798529c3340cdc2c262e7e5649e SHA512 d9d53ddd420fe754c76303b99c37e5cc2eca3d4af9f64043f3f9e69c3abfc3c05d5a1efdbbdfb39ad46a301a0df7a18425d0e8c110c1d76bad3e62dfa97b61ef
diff --git a/sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild b/sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild
new file mode 100644
index 000000000000..e1e1c79a8d0e
--- /dev/null
+++ b/sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="Linux-${PN^^}-${PV}"
+
+# Avoid QA warnings
+# Can reconsider w/ EAPI 8 and IDEPEND, bug #810979
+TMPFILES_OPTIONAL=1
+
+inherit db-use fcaps flag-o-matic meson-multilib
+
+DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
+HOMEPAGE="https://github.com/linux-pam/linux-pam"
+
+if [[ ${PV} == *_p* ]] ; then
+	PAM_COMMIT="e634a3a9be9484ada6e93970dfaf0f055ca17332"
+	SRC_URI="
+		https://github.com/linux-pam/linux-pam/archive/${PAM_COMMIT}.tar.gz -> ${P}.gh.tar.gz
+	"
+	S="${WORKDIR}"/linux-${PN}-${PAM_COMMIT}
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/strace.asc
+	inherit verify-sig
+
+	SRC_URI="
+		https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}.tar.xz
+		verify-sig? ( https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}.tar.xz.asc )
+	"
+	S="${WORKDIR}/${MY_P}"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-strace )"
+fi
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit berkdb elogind examples debug nis nls selinux systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+# meson.build specifically checks for bison and then byacc
+# also requires xsltproc
+BDEPEND+="
+	|| ( sys-devel/bison dev-util/byacc )
+	app-text/docbook-xsl-ns-stylesheets
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+DEPEND="
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
+	audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
+	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
+	!berkdb? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] )
+	elogind? ( >=sys-auth/elogind-254 )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	systemd? ( >=sys-apps/systemd-254:= )
+	nis? (
+		net-libs/libnsl:=[${MULTILIB_USEDEP}]
+		>=net-libs/libtirpc-0.2.4-r2:=[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="${DEPEND}"
+PDEPEND=">=sys-auth/pambase-20200616"
+
+src_configure() {
+	# meson.build sets -Wl,--fatal-warnings and with e.g. mold, we get:
+	#  cannot assign version `global` to symbol `pam_sm_open_session`: symbol not found
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	# Do not let user's BROWSER setting mess us up, bug #549684
+	unset BROWSER
+
+	meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+	local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local
+	# Workaround for docbook5 not being packaged (bug #913087#c4)
+	# It's only used for validation of output, so stub it out.
+	# Also, stub out elinks+w3m which are only used for an index.
+	cat >> ${native_file} <<-EOF || die
+	[binaries]
+	xmlcatalog='true'
+	xmllint='true'
+	elinks='true'
+	w3m='true'
+	EOF
+
+	local emesonargs=(
+		--native-file "${native_file}"
+
+		$(meson_feature audit)
+		$(meson_native_use_bool examples)
+		$(meson_use debug pam-debug)
+		$(meson_feature nis)
+		$(meson_feature nls i18n)
+		$(meson_feature selinux)
+
+		-Disadir='.'
+		-Dxml-catalog="${BROOT}"/etc/xml/catalog
+		-Dsbindir="${EPREFIX}"/sbin
+		-Dsecuredir="${EPREFIX}"/$(get_libdir)/security
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		-Dhtmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		-Dpdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf
+
+		-Ddb=$(usex berkdb 'db' 'gdbm')
+		-Ddb-uniquename=$(db_findver sys-libs/db)
+
+		$(meson_native_enabled docs)
+
+		-Dpam_unix=enabled
+
+		# TODO: wire this up now it's more useful as of 1.5.3 (bug #931117)
+		-Deconf=disabled
+
+		# TODO: lastlog is enabled again for now by us as elogind support
+		# wasn't available at first. Even then, disabling lastlog will
+		# probably need a news item.
+		$(meson_native_use_feature systemd logind)
+		$(meson_native_use_feature elogind)
+		$(meson_feature !elibc_musl pam_lastlog)
+	)
+
+	# This whole weird has_version libxcrypt block can go once
+	# musl systems have libxcrypt[system] if we ever make
+	# that mandatory. See bug #867991.
+	#if use elibc_musl && ! has_version sys-libs/libxcrypt[system] ; then
+	#	# Avoid picking up symbol-versioned compat symbol on musl systems
+	#	export ac_cv_search_crypt_gensalt_rn=no
+	#
+	#	# Need to avoid picking up the libxcrypt headers which define
+	#	# CRYPT_GENSALT_IMPLEMENTS_AUTO_ENTROPY.
+	#	cp "${ESYSROOT}"/usr/include/crypt.h "${T}"/crypt.h || die
+	#	append-cppflags -I"${T}"
+	#fi
+
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# tmpfiles.eclass is impossible to use because
+	# there is the pam -> tmpfiles -> systemd -> pam dependency loop
+	dodir /usr/lib/tmpfiles.d
+
+	cat ->> "${ED}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}.conf <<-_EOF_
+		d /run/faillock 0755 root root
+	_EOF_
+	use selinux && cat ->> "${ED}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}-selinux.conf <<-_EOF_
+		d /run/sepermit 0755 root root
+	_EOF_
+}
+
+pkg_postinst() {
+	ewarn "Some software with pre-loaded PAM libraries might experience"
+	ewarn "warnings or failures related to missing symbols and/or versions"
+	ewarn "after any update. While unfortunate this is a limit of the"
+	ewarn "implementation of PAM and the software, and it requires you to"
+	ewarn "restart the software manually after the update."
+	ewarn ""
+	ewarn "You can get a list of such software running a command like"
+	ewarn "  lsof / | grep -E -i 'del.*libpam\\.so'"
+	ewarn ""
+	ewarn "Alternatively, simply reboot your system."
+
+	# The pam_unix module needs to check the password of the user which requires
+	# read access to /etc/shadow only.
+	fcaps cap_dac_override sbin/unix_chkpwd
+}
diff --git a/sys-libs/readline/readline-8.2_p13-r1.ebuild b/sys-libs/readline/readline-8.2_p13-r1.ebuild
index 0917d70cb5c6..6c35907aba4a 100644
--- a/sys-libs/readline/readline-8.2_p13-r1.ebuild
+++ b/sys-libs/readline/readline-8.2_p13-r1.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=7
@@ -83,7 +83,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0/8"  # subslot matches SONAME major
 if is_release ; 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="static-libs +unicode utils"
 
diff --git a/sys-libs/zlib-ng/zlib-ng-2.2.3.ebuild b/sys-libs/zlib-ng/zlib-ng-2.2.3.ebuild
index ae1606c3abad..6059eb4121b5 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.2.3.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
 
 CPU_USE=(
 	x86_{avx2,avx512f,avx512_vnni,sse2,ssse3,sse4_2,pclmul,vpclmulqdq}
diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
index 2f2835921c9c..ba2ab5506de5 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
@@ -45,6 +45,13 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	default
+	# skip this specific doc step as produced files never installed
+	# this avoids calling the col command not available on musl based system.
+	sed -i "/^SUBDIRS/ s/doc//g" Makefile || die
+}
+
 src_configure() {
 	local myconf
 
diff --git a/sys-power/iasl/iasl-20200717.ebuild b/sys-power/iasl/iasl-20200717.ebuild
index 3ec3ccbcbd8e..b3e1c1b46323 100644
--- a/sys-power/iasl/iasl-20200717.ebuild
+++ b/sys-power/iasl/iasl-20200717.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=7
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="iASL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-power/power-profiles-daemon/power-profiles-daemon-0.23.ebuild b/sys-power/power-profiles-daemon/power-profiles-daemon-0.23.ebuild
index 55f670859d3d..bf5a6e5bdcc9 100644
--- a/sys-power/power-profiles-daemon/power-profiles-daemon-0.23.ebuild
+++ b/sys-power/power-profiles-daemon/power-profiles-daemon-0.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/upower/power-profiles-daemon/"
 SRC_URI="https://gitlab.freedesktop.org/upower/${PN}/-/archive/${PV}/${P}.tar.bz2"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 
 IUSE="bash-completion gtk-doc man selinux test zsh-completion"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-process/btop/btop-1.4.0.ebuild b/sys-process/btop/btop-1.4.0.ebuild
index 2385413d54d0..ede2fb1b6671 100644
--- a/sys-process/btop/btop-1.4.0.ebuild
+++ b/sys-process/btop/btop-1.4.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
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	app-text/lowdown
diff --git a/sys-process/dcron/Manifest b/sys-process/dcron/Manifest
index 026c58f9f228..c8f167571a4f 100644
--- a/sys-process/dcron/Manifest
+++ b/sys-process/dcron/Manifest
@@ -1 +1,2 @@
 DIST dcron-4.5.tar.gz 44978 BLAKE2B c77cea026b074eed11200bb335cc2f58f7346410f88ae50685db137583beddab14e50394233b8e0f27ae7e3bf30c7875b539db84c32236f78f52bf91862b3272 SHA512 08521391d16ba5adf80278ec2a734319c26c48841fd94b119c0b27d744c2cfb3562b1a3630135a03d1c43b1668d49262713abb20ff5f7ecd397a2a19a2f6105a
+DIST dcron-4.6.tar.gz 46184 BLAKE2B 2cd90b3638813b2dd683008c43f8233d930a0d642833b67c6a210c626134ee343ecbed7324be89265b74b49f1152666fa7fcc3bc6cc3535787967697f0591184 SHA512 3f0ba26e488df804a9178478fd693ea7ad4b7d5f80230690669485e80f2f148da71d81e44e1c7a7e333078623caba6e1c3a51a8cdfada96437149872b7231863
diff --git a/sys-process/dcron/dcron-4.6.ebuild b/sys-process/dcron/dcron-4.6.ebuild
new file mode 100644
index 000000000000..6c7a9037427c
--- /dev/null
+++ b/sys-process/dcron/dcron-4.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cron toolchain-funcs systemd
+
+DESCRIPTION="Dillon's lightweight and minimalist cron daemon"
+HOMEPAGE="https://github.com/ptchinster/dcron"
+SRC_URI="https://github.com/ptchinster/dcron/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+src_prepare() {
+	default
+	# fix typo: https://github.com/ptchinster/dcron/pull/2
+	sed -i 's/CLFAGS/CFLAGS/g' Makefile || die
+
+	# use system LDFLAGS: https://github.com/ptchinster/dcron/issues/3
+	sed -i 's/^LDFLAGS =//g' Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+
+	cat > config <<-EOF || die
+		PREFIX = /usr
+		CRONTAB_GROUP = cron
+	EOF
+}
+
+src_test(){ : ; } # no tests
+
+src_install() {
+	default
+	dodoc extra/run-cron extra/root.crontab "${FILESDIR}"/crontab
+
+	docrondir
+	docron crond -m0700 -o root -g wheel
+	docrontab
+
+	insinto /etc
+	doins "${FILESDIR}"/crontab
+
+	insinto /etc/cron.d
+	doins extra/prune-cronstamps
+
+	insinto /etc/logrotate.d
+	newins extra/crond.logrotate dcron
+
+	keepdir /var/spool/cron/cronstamps
+
+	newinitd "${FILESDIR}"/dcron.init dcron
+	newconfd "${FILESDIR}"/dcron.confd dcron
+	systemd_dounit "${FILESDIR}"/dcron.service
+}
diff --git a/sys-process/dcron/metadata.xml b/sys-process/dcron/metadata.xml
index ea32759400b4..5cff6cd89566 100644
--- a/sys-process/dcron/metadata.xml
+++ b/sys-process/dcron/metadata.xml
@@ -10,7 +10,9 @@
 		All jobs are run with `/bin/sh` for conformity and portability.
 	</longdescription>
 	<upstream>
-		<bugs-to>https://github.com/dubiousjim/dcron/issues</bugs-to>
-		<remote-id type="github">dubiousjim/dcron</remote-id>
+		<bugs-to>https://github.com/ptchinster/dcron/issues</bugs-to>
+		<!-- readme's the doc -->
+		<changelog>https://github.com/ptchinster/dcron/blob/master/CHANGELOG</changelog>
+		<remote-id type="github">ptchinster/dcron</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-process/iotop-c/Manifest b/sys-process/iotop-c/Manifest
index d16e9629a24d..8362058e08dc 100644
--- a/sys-process/iotop-c/Manifest
+++ b/sys-process/iotop-c/Manifest
@@ -1 +1,2 @@
 DIST iotop-c-1.26.tar.gz 139536 BLAKE2B 90bb3db7dd3b05604fa5368a881434eac06509921447fd53bda7e7291e2c823f82f9015f0c16c516dcfa7c8ee6198466b8634eaf1b111b4f911645b97fc2634f SHA512 47246bc025c396bcd7569bd19d52079701e3b86ab239ac3db1d1386f358f6e95a63d7bad8c1d0552fb61315a9db282967c65e110703863ae71fa6260b775942b
+DIST iotop-c-1.27.tar.gz 142334 BLAKE2B 80e8ff6d90d325533a9097596dd0353d26214e2302931d0268a2d8f491a9e531d795ba450eac2b0f4bea7beb88317053f8d23308fcdbf52570991255afb81ea0 SHA512 55a93e2f3c6aaeb46ca219a77e64706083b8746d1299e8ab576780a2c6a17eb5612c1280531432748afb90ded5e6677149301ea2641b4f77cd3a2d91700b1fbb
diff --git a/sys-process/iotop-c/iotop-c-1.27.ebuild b/sys-process/iotop-c/iotop-c-1.27.ebuild
new file mode 100644
index 000000000000..4a1fa565f4d6
--- /dev/null
+++ b/sys-process/iotop-c/iotop-c-1.27.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps linux-info toolchain-funcs
+
+DESCRIPTION="top utility for IO (C port)"
+HOMEPAGE="https://github.com/Tomas-M/iotop"
+SRC_URI="https://github.com/Tomas-M/iotop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/iotop-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	sys-libs/ncurses:=
+	!sys-process/iotop
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS ~VM_EVENT_COUNTERS"
+
+FILECAPS=(
+	cap_net_admin=eip usr/bin/iotop
+)
+
+src_prepare() {
+	sed -e 's/-D_FORTIFY_SOURCE=2//' -i Makefile || die
+	default
+}
+
+src_compile() {
+	emake V=1 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" NO_FLTO=1
+}
+
+src_install() {
+	dobin iotop
+	dodoc README.md
+	doman iotop.8
+}
diff --git a/sys-process/lsof/lsof-4.99.4.ebuild b/sys-process/lsof/lsof-4.99.4.ebuild
index 8c18e3255daf..9d4ac6411306 100644
--- a/sys-process/lsof/lsof-4.99.4.ebuild
+++ b/sys-process/lsof/lsof-4.99.4.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/lsof-org/lsof/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="lsof"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="rpc selinux"
 
 RDEPEND="
diff --git a/sys-process/numactl/numactl-2.0.19.ebuild b/sys-process/numactl/numactl-2.0.19.ebuild
index 559e2e5aecb6..4ed81ae078b1 100644
--- a/sys-process/numactl/numactl-2.0.19.ebuild
+++ b/sys-process/numactl/numactl-2.0.19.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 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/numactl/numactl.git"
 else
 	SRC_URI="https://github.com/numactl/numactl/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="~alpha amd64 arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-process/systemd-cron/systemd-cron-2.4.1.ebuild b/sys-process/systemd-cron/systemd-cron-2.4.1.ebuild
index 0948f07ffb06..f02bc8ea182e 100644
--- a/sys-process/systemd-cron/systemd-cron-2.4.1.ebuild
+++ b/sys-process/systemd-cron/systemd-cron-2.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="cron-boot etc-crontab-systemd minutely +runparts setgid yearly"
 # We can't run the unshare tests within sandbox/with low privs, and the
 # 'test-nounshare' target just does static analysis (shellcheck etc).
diff --git a/virtual/cron/cron-0-r3.ebuild b/virtual/cron/cron-0-r3.ebuild
index c335f37a234c..4bd107cf1c4d 100644
--- a/virtual/cron/cron-0-r3.ebuild
+++ b/virtual/cron/cron-0-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Virtual for cron"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="|| ( sys-process/cronie
 		sys-process/bcron
diff --git a/virtual/dist-kernel/dist-kernel-5.10.233.ebuild b/virtual/dist-kernel/dist-kernel-5.10.233.ebuild
new file mode 100644
index 000000000000..d1c33967638d
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.233.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 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)
+"
diff --git a/virtual/dist-kernel/dist-kernel-5.15.176.ebuild b/virtual/dist-kernel/dist-kernel-5.15.176.ebuild
new file mode 100644
index 000000000000..e315b66b2d7c
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.15.176.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 ~sparc ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)
+"
diff --git a/virtual/dist-kernel/dist-kernel-6.1.124.ebuild b/virtual/dist-kernel/dist-kernel-6.1.124.ebuild
new file mode 100644
index 000000000000..2fba55980890
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.1.124.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/virtual/dist-kernel/dist-kernel-6.1.125.ebuild b/virtual/dist-kernel/dist-kernel-6.1.125.ebuild
new file mode 100644
index 000000000000..2fba55980890
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.1.125.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/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/virtual/dist-kernel/dist-kernel-6.12.10.ebuild b/virtual/dist-kernel/dist-kernel-6.12.10.ebuild
new file mode 100644
index 000000000000..e66ff2433373
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.12.10.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 ~loong ~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/virtual/dist-kernel/dist-kernel-6.12.9.ebuild b/virtual/dist-kernel/dist-kernel-6.12.9.ebuild
new file mode 100644
index 000000000000..e66ff2433373
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.12.9.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 ~loong ~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/virtual/dist-kernel/dist-kernel-6.6.70.ebuild b/virtual/dist-kernel/dist-kernel-6.6.70.ebuild
new file mode 100644
index 000000000000..e66ff2433373
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.6.70.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 ~loong ~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/virtual/dist-kernel/dist-kernel-6.6.71.ebuild b/virtual/dist-kernel/dist-kernel-6.6.71.ebuild
new file mode 100644
index 000000000000..e66ff2433373
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.6.71.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 ~loong ~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/virtual/dist-kernel/dist-kernel-6.6.72.ebuild b/virtual/dist-kernel/dist-kernel-6.6.72.ebuild
new file mode 100644
index 000000000000..e66ff2433373
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.6.72.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 ~loong ~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/virtual/jdk/jdk-21.ebuild b/virtual/jdk/jdk-21.ebuild
index 0b469d838fcf..d26db1603e04 100644
--- a/virtual/jdk/jdk-21.ebuild
+++ b/virtual/jdk/jdk-21.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="headless-awt"
 
 RDEPEND="|| (
diff --git a/virtual/jdk/jdk-24-r1.ebuild b/virtual/jdk/jdk-24-r1.ebuild
deleted file mode 100644
index 5a23aeed9722..000000000000
--- a/virtual/jdk/jdk-24-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Virtual for Java Development Kit (JDK)"
-SLOT="${PV}"
-#	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="headless-awt"
-
-RDEPEND="|| (
-		dev-java/openjdk-bin:${SLOT}[gentoo-vm(+),headless-awt=]
-		dev-java/openjdk:${SLOT}[gentoo-vm(+),headless-awt=]
-)"
diff --git a/virtual/jdk/jdk-25-r1.ebuild b/virtual/jdk/jdk-25-r1.ebuild
new file mode 100644
index 000000000000..e66faa32a8ad
--- /dev/null
+++ b/virtual/jdk/jdk-25-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Virtual for Java Development Kit (JDK)"
+SLOT="${PV}"
+#	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="headless-awt"
+
+RDEPEND="|| (
+		dev-java/openjdk-bin:${SLOT}[gentoo-vm(+),headless-awt=]
+		dev-java/openjdk:${SLOT}[gentoo-vm(+),headless-awt=]
+)"
diff --git a/virtual/jdk/jdk-25.ebuild b/virtual/jdk/jdk-25.ebuild
deleted file mode 100644
index fa432422ec6c..000000000000
--- a/virtual/jdk/jdk-25.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Virtual for Java Development Kit (JDK)"
-SLOT="${PV}"
-#	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="headless-awt"
-
-RDEPEND="dev-java/openjdk-bin:${SLOT}[gentoo-vm(+),headless-awt=]"
diff --git a/virtual/jre/jre-21.ebuild b/virtual/jre/jre-21.ebuild
index f698d4da833a..27a57baa96ac 100644
--- a/virtual/jre/jre-21.ebuild
+++ b/virtual/jre/jre-21.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="|| (
 		virtual/jdk:${SLOT}
diff --git a/virtual/jre/jre-24.ebuild b/virtual/jre/jre-24.ebuild
deleted file mode 100644
index 3e5caf55150c..000000000000
--- a/virtual/jre/jre-24.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
-SLOT="${PV}"
-#	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="virtual/jdk:${SLOT}"
diff --git a/virtual/opencl/opencl-3-r3.ebuild b/virtual/opencl/opencl-3-r3.ebuild
index 5e9e92b8619a..9924965db66a 100644
--- a/virtual/opencl/opencl-3-r3.ebuild
+++ b/virtual/opencl/opencl-3-r3.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=7
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for OpenCL API"
 SLOT="0"
-KEYWORDS="amd64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/opencl-icd-loader-2023.02.06[${MULTILIB_USEDEP}]
diff --git a/virtual/opengl/opengl-8.ebuild b/virtual/opengl/opengl-8.ebuild
index 659c767daad7..b9237062eaec 100644
--- a/virtual/opengl/opengl-8.ebuild
+++ b/virtual/opengl/opengl-8.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,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for OpenGL implementation"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="X"
 
 RDEPEND="
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.900.0-r1.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.900.0-r1.ebuild
new file mode 100644
index 000000000000..23e2902520f8
--- /dev/null
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.900.0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+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"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.40.0* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.900.0.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.900.0.ebuild
deleted file mode 100644
index 022f82abdd3b..000000000000
--- a/virtual/perl-File-Spec/perl-File-Spec-3.900.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.910.0.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.910.0.ebuild
new file mode 100644
index 000000000000..9851c5b6a5ec
--- /dev/null
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.910.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+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"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.40.1* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.501.184_rc.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.501.184_rc.ebuild
new file mode 100644
index 000000000000..5b2d437076c3
--- /dev/null
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.501.184_rc.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+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"
+
+# Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
+# When bumping this package.
+RDEPEND="
+	|| ( ~dev-lang/perl-5.40.1_rc1 ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Term-Table/perl-Term-Table-0.23.0.ebuild b/virtual/perl-Term-Table/perl-Term-Table-0.23.0.ebuild
index 23c9ca1a0dd4..04553ff612ca 100644
--- a/virtual/perl-Term-Table/perl-Term-Table-0.23.0.ebuild
+++ b/virtual/perl-Term-Table/perl-Term-Table-0.23.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-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"
 
 RDEPEND="
 	~perl-core/${PN#perl-}-${PV}
diff --git a/www-apache/passenger/passenger-6.0.24.ebuild b/www-apache/passenger/passenger-6.0.24.ebuild
index 47dbcae74689..92f46d2ba068 100644
--- a/www-apache/passenger/passenger-6.0.24.ebuild
+++ b/www-apache/passenger/passenger-6.0.24.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 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
 # Passenger is licensed MIT, but vendored code licenses should also be taken into account.
 LICENSE="Boost-1.0 MIT BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="apache2 debug"
 
 ruby_add_bdepend "dev-ruby/rake"
diff --git a/www-apps/airdcpp-webui/Manifest b/www-apps/airdcpp-webui/Manifest
index a31109236f4b..7664f6e313c4 100644
--- a/www-apps/airdcpp-webui/Manifest
+++ b/www-apps/airdcpp-webui/Manifest
@@ -1,4 +1,3 @@
-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
+DIST airdcpp-webui-2.13.1.tgz 8856022 BLAKE2B c418bc193414559fc995f1c900726aef4b954b4903e657d951dc26ffe1aaa1122e065274186d302e5f76bf4db26c5b1291d69d61d4ab6c46185aa215af55fdef SHA512 b8a89b734a16126f96a803d9cd2255dca3cf79e2245e969944e8640a2df340dd837965a226b5d2b5391d964372eb59e7165596ea5f02d64de2feeef22ab06fce
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.12.0.ebuild
deleted file mode 100644
index 0c8325700397..000000000000
--- a/www-apps/airdcpp-webui/airdcpp-webui-2.12.0.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.13.1.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.13.1.ebuild
new file mode 100644
index 000000000000..0b1bf043d331
--- /dev/null
+++ b/www-apps/airdcpp-webui/airdcpp-webui-2.13.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="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/baikal/Manifest b/www-apps/baikal/Manifest
index 82d2098ed889..335f9e2b7671 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,2 +1,3 @@
+DIST baikal-0.10.1.zip 2857336 BLAKE2B fe3177f031105d0367169e4673bb68f473b1797227fb1912077fc7fd97e364a439a4cfa14cab10a7632ca72227e8519bcb4e8294ce7da4beb6599c17472db9e3 SHA512 372027dc424ab3efa0c0f6f597cee15627dbfbb5709d1f9ddf18a721d31c4fa29c7a800c05e57efdf5d2b25cfdb4f1fa110661e19a85c2b2b4bf03eea15981f9
 DIST baikal-0.9.3.zip 2978666 BLAKE2B f2726560916979766c95af0ff63cb1cbd5bb677f377ea20e41064c0a88725742193341e6a3246f64930c445f425a7026499ed55f1949ee221da553bfec538755 SHA512 bdcd3848ba7c99f94a1f20c9fee48f24bb9e004a325f482d6b5324eff1f0aa2fddd284ff5f9ae6dd0b67455852aa82e434174358c58d76b6009945bc3395768c
 DIST baikal-0.9.5.zip 2828793 BLAKE2B bd4c2e5887a78da6e1bd94c73452a1df22a68d626572aca728758bd95553c5f79a99d47418909b339a837efff25a12ef8b3e1c041ba32b888224b04e93201206 SHA512 e544ed39047788bf001c81a44eb69a3db30a871253cb6bf12b54d5d476eaadc63d723192d41b67f2cf908a72d4c722def03d853df68b7fd464a4093e08ed0f19
diff --git a/www-apps/baikal/baikal-0.10.1.ebuild b/www-apps/baikal/baikal-0.10.1.ebuild
new file mode 100644
index 000000000000..2520aead1a69
--- /dev/null
+++ b/www-apps/baikal/baikal-0.10.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit webapp
+
+DESCRIPTION="Lightweight CalDAV+CardDAV server"
+HOMEPAGE="https://sabre.io/baikal/"
+SRC_URI="https://github.com/sabre-io/Baikal/releases/download/${PV}/${P}.zip"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~ppc64 ~riscv"
+IUSE="+mysql sqlite"
+REQUIRED_USE="|| ( mysql sqlite )"
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=dev-lang/php-8.1[ctype,filter,json(+),pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
+	mysql? ( virtual/mysql )
+	sqlite? ( dev-db/sqlite )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc *.md
+
+	einfo "Installing web files"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r html/* html/.htaccess Core vendor
+
+	einfo "Setting up container for configuration"
+	dodir /etc/${PN}
+	fperms o+x /etc/${PN}  # allow webserver to read config
+
+	# setup config in /etc
+	# we are not allowed to use straight-forward absolute symlink :(
+	local root path htdocsdir=${MY_HTDOCSDIR%/}
+	while [[ -n ${htdocsdir} ]] ; do
+		root+="../"
+		htdocsdir=${htdocsdir%/*}
+		# trim duplicate slashes
+		while [[ ${htdocsdir} == */ ]] ; do
+			htdocsdir=${htdocsdir%/}
+		done
+	done
+	dosym ${root%/}/etc/${PN} "${MY_HTDOCSDIR}"/Specific
+	dosym ${root%/}/etc/${PN} "${MY_HTDOCSDIR}"/config
+	dosym . "${MY_HTDOCSDIR}"/html
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-v0.7-en.txt"
+	webapp_src_install
+}
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 80604b607f4b..cc6fb7bcbad5 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1 +1 @@
-DIST chromedriver-bin-131.0.6778.204.linux64.zip 9945236 BLAKE2B e293edd7b92ed187108776110d26f61d6958f0299fe629d61537053e16b7b9ce6edda3c04e0f22819032e81b0775bc44888173e22669d4710742629db49d8ede SHA512 8cc4353be71cefc45e1c450116a0c792e1c5bf986f50134e2559b3007bf2ea81af301a091123b34796c26331fa512e2b9a919087980e5880837eee483a06de2d
+DIST chromedriver-bin-132.0.6834.83.linux64.zip 9325180 BLAKE2B 172a394d9364e0a5dabea49abb31c094d16137d9a1f74f7555a55ff45f48b502ca634e5d4540147ace8764aefa504e2c236141c6c852f91f0f5a5cb978331ccd SHA512 ea565c1e8b68516f1bf77140f74f16e039a0de2e25123222f40bd8a093bcef8c5e0638f954609abb8412fcff70d65b34bbbc9f973f9ad1bcdb77061bbaf76076
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-131.0.6778.204.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-131.0.6778.204.ebuild
deleted file mode 100644
index ff9ba50fc766..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-131.0.6778.204.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# See https://googlechromelabs.github.io/chrome-for-testing/#stable for URLs
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/corp/chromium.org/driver/"
-SRC_URI="amd64? ( https://storage.googleapis.com/chrome-for-testing-public/${PV}/linux64/chromedriver-linux64.zip -> ${P}.linux64.zip )"
-S="${WORKDIR}/chromedriver-linux64"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* amd64"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	sys-libs/glibc
-	www-client/google-chrome
-	!www-client/chromium
-"
-BDEPEND="app-arch/unzip"
-
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install() {
-	dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-132.0.6834.83.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-132.0.6834.83.ebuild
new file mode 100644
index 000000000000..2d548d409de6
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-132.0.6834.83.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# See https://googlechromelabs.github.io/chrome-for-testing/#stable for URLs
+DESCRIPTION="WebDriver for Chrome"
+HOMEPAGE="https://sites.google.com/corp/chromium.org/driver/"
+SRC_URI="amd64? ( https://storage.googleapis.com/chrome-for-testing-public/${PV}/linux64/chromedriver-linux64.zip -> ${P}.linux64.zip )"
+S="${WORKDIR}/chromedriver-linux64"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* amd64"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	sys-libs/glibc
+	www-client/google-chrome
+	!www-client/chromium
+"
+BDEPEND="app-arch/unzip"
+
+QA_PREBUILT="usr/bin/chromedriver"
+
+src_install() {
+	dobin chromedriver
+}
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index ed0cc90cb018..0cb8032204a9 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,2 +1,2 @@
-DIST gitea-1.22.3.tar.gz 54325752 BLAKE2B e556dab98ea210e6bd6106addd7a019b380ffa624010eb095f5042fbf060febc8769192532a3d3506160e9d447a9e7831dbcb8fed87e6e4ecea169cbc3382c75 SHA512 a659c6eb70c01b8776e4533bca8b55bf3a4f276b43564323946076297f7f12486c0f7f872d835dcbaad62b7f79847c42c922db566f156db23f5c33140e46c39e
 DIST gitea-1.22.6.tar.gz 54465618 BLAKE2B 221d30c680eddd7e1aad0f906ffff5a7e564d153f8977a99a3a965d725cef0bf601a7b6c3bbd4fcc235f0a0f58ec1eb39635da3bc85d59e6856384123898a193 SHA512 a36522eeaa89dd1352ad2540966f7306416d8bb85a5e5ef8cbb52e489fd274c69b95e87e60a28aaed0adf7c12c07a66572b401f784edfd117f859bf4265961f7
+DIST gitea-1.23.0.tar.gz 55476961 BLAKE2B 1d9f597ae0b29eaa4230355b8a8a30c13460d8021c7067102749295cca3baf78e8f12d09d7706927d60c9c90c8ff0b32b76add06c1c8f69b471a404672765ff3 SHA512 4f82854c429cf90aca42ae96c94dc58719bfc12b504780b383945a320d902d557db44d2a35101ed40b387e8978ef2456b753378c55f680e505c448ebde1b9e43
diff --git a/www-apps/gitea/gitea-1.22.3.ebuild b/www-apps/gitea/gitea-1.22.3.ebuild
deleted file mode 100644
index 8a70b8201757..000000000000
--- a/www-apps/gitea/gitea-1.22.3.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2016-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module tmpfiles systemd flag-o-matic user-info
-
-DESCRIPTION="A painless self-hosted Git service"
-HOMEPAGE="https://gitea.com https://github.com/go-gitea/gitea"
-
-SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-src-${PV}"
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv ~x86"
-IUSE="+acct gogit pam sqlite pie"
-
-DEPEND="
-	acct? (
-		acct-group/git
-		acct-user/git[gitea] )
-	pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}
-	!gogit? ( dev-vcs/git )"
-BDEPEND=">=dev-lang/go-1.22:="
-
-DOCS=(
-	custom/conf/app.example.ini CHANGELOG.md CONTRIBUTING.md README.md
-)
-FILECAPS=(
-	-m 711 cap_net_bind_service+ep usr/bin/gitea
-)
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -i -e "s#^MODE = console#MODE = file#" custom/conf/app.example.ini || die
-}
-
-src_configure() {
-	# bug 832756 - PIE build issues
-	filter-flags -fPIE
-	filter-ldflags -fPIE -pie
-}
-
-src_compile() {
-	local gitea_tags
-	local -a gitea_settings makeenv
-
-	# The space-separated list of the -tags flag is deprecated, please
-	# always use the comma-separated list in the future.
-	gitea_tags="bindata"
-	gitea_tags+="$(usex gogit ',gogit' '')"
-	gitea_tags+="$(usex pam ',pam' '')"
-	gitea_tags+="$(usex sqlite ',sqlite,sqlite_unlock_notify' '')"
-
-	gitea_settings=(
-		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
-		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
-		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
-	)
-
-	makeenv=(
-		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
-		TAGS="${gitea_tags}"
-	)
-
-	if use pie ; then
-		# Please check the supported platforms when a new keyword request opened,
-		# refer to file: 'go/src/internal/platform/supported.go'.
-		# When PIE buildmode is not supported by internal linker, the external
-		# linker will be used automatically, refer to:
-		# https://github.com/golang/go/blob/ed817f1c4055a559a94afffecbb91c78e4f39942/src/cmd/link/internal/ld/config.go#L149
-		makeenv+=( EXTRA_GOFLAGS="-buildmode=pie" )
-	fi
-
-	env "${makeenv[@]}" emake backend
-}
-
-src_install() {
-	dobin gitea
-
-	einstalldocs
-
-	newconfd "${FILESDIR}/gitea.confd-r1" gitea
-	newinitd "${FILESDIR}/gitea.initd-r3" gitea
-	newtmpfiles - gitea.conf <<-EOF
-		d /run/gitea 0755 git git
-	EOF
-	systemd_newunit "${FILESDIR}"/gitea.service-r4 gitea.service
-
-	insinto /etc/gitea
-	newins custom/conf/app.example.ini app.ini
-	if use acct; then
-		fowners root:git /etc/gitea/{,app.ini}
-		fperms g+w,o-rwx /etc/gitea/{,app.ini}
-
-		diropts -m0750 -o git -g git
-		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
-		keepdir /var/log/gitea
-	fi
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	# It is not guaranteed that the git user and group always exist (due to the acct USE Flag),
-	# but for convenience, the tmpfile uses the git user and group by default.
-	# To avoid installation errors, a condition needs to be added here:
-	#   if there is no git user or group, the installation of tmpfile will be skipped
-	#   and the user will be notified to handle it by themselves.
-	if egetent passwd git &>/dev/null && \
-		egetent group git &>/dev/null; then
-		tmpfiles_process gitea.conf
-	else
-		eerror "Unable to install the tmpfile for gitea due to the git user or group is missing,"
-		eerror "please install tmpfile manually or rebuild this package with USE flag 'acct'."
-		eerror "You can simply copy the default tmpfile from '/usr/lib/tmpfiles.d/gitea.conf'"
-		eerror "to higher priority path '/etc/tmpfiles.d/gitea.conf', and correct it with"
-		eerror "the right User and Group value (see tmpfiles.d(5) for details), then execute:"
-		eerror "  # systemd-tmpfiles --create /etc/tmpfiles.d/gitea.conf"
-		eerror "to install it."
-	fi
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		if ver_test "${REPLACING_VERSIONS}" -lt 1.21; then
-			ewarn "Since version 1.21.0:"
-			ewarn "  1. The built-in SSH server will now only accept SSH user"
-			ewarn "     certificates, not server certificates. This behaviour matches OpenSSH."
-			ewarn "  2. The options of the subcommand must follow the subcommand now."
-			ewarn "  3. Remove 'CHARSET' config option for MySQL, always use 'utf8mb4'."
-			ewarn "For other breaking changes, see <https://github.com/go-gitea/gitea/releases/tag/v1.21.0>."
-		fi
-		if ver_test "${REPLACING_VERSIONS}" -lt 1.22; then
-			ewarn "Since version 1.22.0:"
-			ewarn "  1. Minimum database requirements updated to MySQL 8.0, PostgreSQL 12, and MSSQL 2012."
-			ewarn "  2. There are a lot of refactoring changes related to customizing templates."
-			ewarn "  3. The default duration of the 'Remember login' feature has been"
-			ewarn "     changed from one week to one month."
-			ewarn "  4. Enhanced auth token/remember me, the obsolete setting"
-			ewarn "     '[security].COOKIE_USERNAME' has been removed."
-			ewarn "  5. For MinIO storage, adds a prefix path for all MinIO storage"
-			ewarn "     and override base path will override the path."
-			ewarn "  6. Now use a more restricted sanitizer for the repository description."
-			ewarn "For more details, see <https://github.com/go-gitea/gitea/releases/tag/v1.22.0>."
-		fi
-	fi
-}
diff --git a/www-apps/gitea/gitea-1.22.6.ebuild b/www-apps/gitea/gitea-1.22.6.ebuild
index dd49814314cb..d3835b109f2b 100644
--- a/www-apps/gitea/gitea-1.22.6.ebuild
+++ b/www-apps/gitea/gitea-1.22.6.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${
 S="${WORKDIR}/${PN}-src-${PV}"
 LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 IUSE="+acct gogit pam sqlite pie"
 
 DEPEND="
diff --git a/www-apps/gitea/gitea-1.23.0.ebuild b/www-apps/gitea/gitea-1.23.0.ebuild
new file mode 100644
index 000000000000..119839659298
--- /dev/null
+++ b/www-apps/gitea/gitea-1.23.0.ebuild
@@ -0,0 +1,150 @@
+# Copyright 2016-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps go-module tmpfiles systemd flag-o-matic user-info
+
+DESCRIPTION="A painless self-hosted Git service"
+HOMEPAGE="https://gitea.com https://github.com/go-gitea/gitea"
+
+SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-src-${PV}"
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+IUSE="+acct gogit pam sqlite pie"
+
+DEPEND="
+	acct? (
+		acct-group/git
+		acct-user/git[gitea] )
+	pam? ( sys-libs/pam )"
+RDEPEND="${DEPEND}
+	!gogit? ( dev-vcs/git )"
+BDEPEND=">=dev-lang/go-1.23:="
+
+DOCS=(
+	custom/conf/app.example.ini CHANGELOG.md CONTRIBUTING.md README.md
+)
+FILECAPS=(
+	-m 711 cap_net_bind_service+ep usr/bin/gitea
+)
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	sed -i -e "s#^MODE = console#MODE = file#" custom/conf/app.example.ini || die
+}
+
+src_configure() {
+	# bug 832756 - PIE build issues
+	filter-flags -fPIE
+	filter-ldflags -fPIE -pie
+}
+
+src_compile() {
+	local gitea_tags
+	local -a gitea_settings makeenv
+
+	# The space-separated list of the -tags flag is deprecated, please
+	# always use the comma-separated list in the future.
+	gitea_tags="bindata"
+	gitea_tags+="$(usex gogit ',gogit' '')"
+	gitea_tags+="$(usex pam ',pam' '')"
+	gitea_tags+="$(usex sqlite ',sqlite,sqlite_unlock_notify' '')"
+
+	gitea_settings=(
+		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
+		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
+		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
+	)
+
+	makeenv=(
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
+		TAGS="${gitea_tags}"
+	)
+
+	if use pie ; then
+		# Please check the supported platforms when a new keyword request opened,
+		# refer to file: 'go/src/internal/platform/supported.go'.
+		# When PIE buildmode is not supported by internal linker, the external
+		# linker will be used automatically, refer to:
+		# https://github.com/golang/go/blob/ed817f1c4055a559a94afffecbb91c78e4f39942/src/cmd/link/internal/ld/config.go#L149
+		makeenv+=( EXTRA_GOFLAGS="-buildmode=pie" )
+	fi
+
+	env "${makeenv[@]}" emake backend
+}
+
+src_install() {
+	dobin gitea
+
+	einstalldocs
+
+	newconfd "${FILESDIR}/gitea.confd-r1" gitea
+	newinitd "${FILESDIR}/gitea.initd-r3" gitea
+	newtmpfiles - gitea.conf <<-EOF
+		d /run/gitea 0755 git git
+	EOF
+	systemd_newunit "${FILESDIR}"/gitea.service-r4 gitea.service
+
+	insinto /etc/gitea
+	newins custom/conf/app.example.ini app.ini
+	if use acct; then
+		fowners root:git /etc/gitea/{,app.ini}
+		fperms g+w,o-rwx /etc/gitea/{,app.ini}
+
+		diropts -m0750 -o git -g git
+		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
+		keepdir /var/log/gitea
+	fi
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	# It is not guaranteed that the git user and group always exist (due to the acct USE Flag),
+	# but for convenience, the tmpfile uses the git user and group by default.
+	# To avoid installation errors, a condition needs to be added here:
+	#   if there is no git user or group, the installation of tmpfile will be skipped
+	#   and the user will be notified to handle it by themselves.
+	if egetent passwd git &>/dev/null && \
+		egetent group git &>/dev/null; then
+		tmpfiles_process gitea.conf
+	else
+		eerror "Unable to install the tmpfile for gitea due to the git user or group is missing,"
+		eerror "please install tmpfile manually or rebuild this package with USE flag 'acct'."
+		eerror "You can simply copy the default tmpfile from '/usr/lib/tmpfiles.d/gitea.conf'"
+		eerror "to higher priority path '/etc/tmpfiles.d/gitea.conf', and correct it with"
+		eerror "the right User and Group value (see tmpfiles.d(5) for details), then execute:"
+		eerror "  # systemd-tmpfiles --create /etc/tmpfiles.d/gitea.conf"
+		eerror "to install it."
+	fi
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "${REPLACING_VERSIONS}" -lt 1.22; then
+			ewarn "Since version 1.22.0:"
+			ewarn "  1. Minimum database requirements updated to MySQL 8.0, PostgreSQL 12, and MSSQL 2012."
+			ewarn "  2. There are a lot of refactoring changes related to customizing templates."
+			ewarn "  3. The default duration of the 'Remember login' feature has been"
+			ewarn "     changed from one week to one month."
+			ewarn "  4. Enhanced auth token/remember me, the obsolete setting"
+			ewarn "     '[security].COOKIE_USERNAME' has been removed."
+			ewarn "  5. For MinIO storage, adds a prefix path for all MinIO storage"
+			ewarn "     and override base path will override the path."
+			ewarn "  6. Now use a more restricted sanitizer for the repository description."
+			ewarn "For more details, see <https://github.com/go-gitea/gitea/releases/tag/v1.22.0>."
+		fi
+		if ver_test "${REPLACING_VERSIONS}" -lt 1.23; then
+			ewarn "Since version 1.23.0:"
+			ewarn "  1. The config option '[camo].Allways' has been renamed to '[camo].Always'."
+			ewarn "  2. The SHA1 for support for SSH RSA signing has been removed."
+			ewarn "  3. Use UTC as the default timezone when scheduling Actions cron tasks."
+			ewarn "  4. Make OIDC introspection authentication strictly require Client ID and secret."
+			ewarn "For other breaking changes, see <https://github.com/go-gitea/gitea/releases/tag/v1.23.0>."
+		fi
+	fi
+}
diff --git a/www-apps/haunt/metadata.xml b/www-apps/haunt/metadata.xml
index 72b4388d62c5..631553a7d819 100644
--- a/www-apps/haunt/metadata.xml
+++ b/www-apps/haunt/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>arsen@gentoo.org</email>
-    <description>Arsen Arsenović</description>
+    <name>Arsen Arsenović</name>
   </maintainer>
   <maintainer type="project">
     <email>scheme@gentoo.org</email>
diff --git a/www-apps/jekyll-coffeescript/jekyll-coffeescript-2.0.0-r1.ebuild b/www-apps/jekyll-coffeescript/jekyll-coffeescript-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..b2ae5200e9a4
--- /dev/null
+++ b/www-apps/jekyll-coffeescript/jekyll-coffeescript-2.0.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_GEMSPEC="jekyll-coffeescript.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A CoffeeScript Converter for Jekyll"
+HOMEPAGE="https://github.com/jekyll/jekyll-coffeescript"
+SRC_URI="https://github.com/jekyll/jekyll-coffeescript/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/coffee-script-2.2
+	>=dev-ruby/coffee-script-source-1.12"
+ruby_add_bdepend "test? ( www-apps/jekyll )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' Rakefile || die
+	sed -i -e "/^RSpec/i \
+		require 'jekyll'"\
+		-e "/^RSpec/i \
+		require 'jekyll-coffeescript'" spec/spec_helper.rb || die
+	sed -i -e 's/git ls-files/find -type f -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/www-apps/jekyll-sass-converter/jekyll-sass-converter-2.2.0.ebuild b/www-apps/jekyll-sass-converter/jekyll-sass-converter-2.2.0.ebuild
index 3b10e00824cd..679ab00ab16c 100644
--- a/www-apps/jekyll-sass-converter/jekyll-sass-converter-2.2.0.ebuild
+++ b/www-apps/jekyll-sass-converter/jekyll-sass-converter-2.2.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="ruby30 ruby31"
+USE_RUBY="ruby31 ruby32"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
 RUBY_FAKEGEM_GEMSPEC="jekyll-sass-converter.gemspec"
diff --git a/www-apps/jekyll-watch/jekyll-watch-2.2.1-r2.ebuild b/www-apps/jekyll-watch/jekyll-watch-2.2.1-r2.ebuild
new file mode 100644
index 000000000000..614af0029578
--- /dev/null
+++ b/www-apps/jekyll-watch/jekyll-watch-2.2.1-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+RUBY_FAKEGEM_GEMSPEC="jekyll-watch.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rebuild your Jekyll site when a file changes with the --watch switch"
+HOMEPAGE="https://github.com/jekyll/jekyll-watch"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+ruby_add_rdepend "dev-ruby/listen:3"
+ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
+
+all_ruby_prepare() {
+	rm Rakefile || die
+
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index c892cbb609c2..63b96c471702 100644
--- a/www-apps/jekyll/Manifest
+++ b/www-apps/jekyll/Manifest
@@ -1,2 +1 @@
-DIST jekyll-4.3.3.tar.gz 1448000 BLAKE2B 1b9688ea7ca3991ac65b9be2b1f195c1ad68b840964579b111791b7e4e0491651570e61caed70a6a9fd748a79ecbf8c159cbf7487cc0e9ea35ae7219fb28f9ea SHA512 af3f82d172e187f2d279d8d50b69dedb384ad6d199f5e1feec7eecdfd7f6c78f43c4adc041757e2747800a12ca3ce1c084d462916ad83bb82c0281dd000dc1c2
 DIST jekyll-4.3.4.tar.gz 1458348 BLAKE2B fda9c3eea5283a631e27ae618589d5357f2c221885b11015cb3b6b3dad66d728aa343a3d141ecd006ec1cf4cfbbf8bdaa3b0c0e97d28bd90fece939a37588e90 SHA512 eb4b233ef7d6b0761e462560b2710dca64f61dab3d6a6f0ce6d675e284af5d92a5ea6a195e87b3dee6e117744decaba30c70ad9b123e72c8a5adb25d9dca234f
diff --git a/www-apps/jekyll/jekyll-4.3.3.ebuild b/www-apps/jekyll/jekyll-4.3.3.ebuild
deleted file mode 100644
index 22ad4bceeabb..000000000000
--- a/www-apps/jekyll/jekyll-4.3.3.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
-
-USE_RUBY="ruby31"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
-RUBY_FAKEGEM_EXTRAINSTALL="features"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_BINDIR="exe"
-
-DESCRIPTION="Simple, blog aware, static site generator"
-HOMEPAGE="https://jekyllrb.com https://github.com/jekyll/jekyll"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.4
-	>=dev-ruby/colorator-1.0
-	>=dev-ruby/em-websocket-0.5
-	dev-ruby/i18n:1
-	>=dev-ruby/kramdown-2.3:2
-	dev-ruby/kramdown-parser-gfm:1
-	dev-ruby/liquid:4
-	=dev-ruby/mercenary-0.4*
-	>=dev-ruby/pathutil-0.9
-	|| ( dev-ruby/rouge:4 dev-ruby/rouge:2 )
-	|| ( dev-ruby/terminal-table:3 dev-ruby/terminal-table:2 )
-	>=dev-ruby/webrick-1.7:0
-	>=www-apps/jekyll-sass-converter-2.0
-	>=www-apps/jekyll-watch-2.2.1-r1
-"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/kramdown-syntax-coderay
-		dev-ruby/launchy
-		dev-ruby/nokogiri
-		>=dev-ruby/rdiscount-2.0
-		>=dev-ruby/redcarpet-3.2.3
-		dev-ruby/rspec-mocks
-		>=dev-ruby/shoulda-3
-		dev-ruby/test-unit:2
-		www-apps/jekyll-coffeescript
-	)
-"
-
-all_ruby_prepare() {
-	eapply "${FILESDIR}"/jekyll-3.6.0-test-helper.patch
-	eapply -R "${FILESDIR}/jekyll-4.3.2-sass.patch"
-	eapply "${FILESDIR}"/jekyll-4.3.2-no-safe_yaml.patch
-
-	# Drop tests requiring bundler
-	sed -i -e '/bundle_message/d' test/test_new_command.rb || die
-	rm test/test_plugin_manager.rb || die
-
-	# Drop tests requiring classifier-reborn (ruby27-only package)
-	rm -f test/test_related_posts.rb || die
-
-	# Replace git command in gemspec
-	sed -e 's/git ls-files/find -not -type d -print/' \
-		-e 's:_relative ": "./:' \
-		-i $RUBY_FAKEGEM_GEMSPEC || die
-
-	sed -e '3igem "liquid", "~> 4.0"' -i test/helper.rb || die
-
-	# FIXMEs:
-	# fails to find fixtures because this requires bundler
-	rm -f test/test_theme.rb || die
-	rm -f test/test_theme_{assets_reader,data_reader,drop}.rb || die
-	sed -i -e '/^    should.*theme/,/^    end$/d' \
-		-e '/^      should.*theme/,/^      end$/d' test/test_site.rb || die
-	sed -i -e '/context "with a theme"/,/^    end/ s:^:#:' test/test_layout_reader.rb || die
-	sed -i -e '/normalize paths of rendered items/askip "test-theme"' test/test_liquid_renderer.rb || die
-	# partially requires 'toml'
-	rm test/test_configuration.rb || die
-	# pygments tests fail because of line numbering
-	sed -i -e '/^  context.*pygments/,/^  end$/d' test/test_tags.rb || die
-
-	# Tries to use bundler and install packages.
-	rm -f test/test_new_command.rb || die
-
-	# Fails due to ordering differences in ruby 3.0
-	sed -e '/convert drop to json/askip "hash ordering with ruby 3"' \
-		-i test/test_filters.rb || die
-
-	# Avoid a test failing due to TZ differences
-	sed -e '/contain the proper page data to mimic the post liquid/askip "TZ difference"' \
-		-i test/test_excerpt.rb || die
-
-	# Confused by network-sandbox
-	sed -e "/return true if there's internet/askip \"Confused by network-sandbox\"" \
-		-i test/test_utils.rb || die
-
-	# Avoid tests requiring unmaintained and broken httpclient
-	rm -f test/test_commands_serve.rb || die
-}
-
-src_test() {
-	local -x JEKYLL_NO_BUNDLER_REQUIRE=true
-
-	ruby-ng_src_test
-}
diff --git a/www-apps/jekyll/jekyll-4.3.4-r1.ebuild b/www-apps/jekyll/jekyll-4.3.4-r1.ebuild
new file mode 100644
index 000000000000..a5b0320df33e
--- /dev/null
+++ b/www-apps/jekyll/jekyll-4.3.4-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
+RUBY_FAKEGEM_EXTRAINSTALL="features"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_BINDIR="exe"
+
+DESCRIPTION="Simple, blog aware, static site generator"
+HOMEPAGE="https://jekyllrb.com https://github.com/jekyll/jekyll"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.4
+	>=dev-ruby/colorator-1.0
+	>=dev-ruby/em-websocket-0.5
+	dev-ruby/i18n:1
+	>=dev-ruby/kramdown-2.3.1:2
+	dev-ruby/kramdown-parser-gfm:1
+	dev-ruby/liquid:4
+	=dev-ruby/mercenary-0.4*
+	|| ( dev-ruby/rouge:4 dev-ruby/rouge:2 )
+	|| ( dev-ruby/terminal-table:3 dev-ruby/terminal-table:2 )
+	>=dev-ruby/webrick-1.7:0
+	>=www-apps/jekyll-sass-converter-2.0
+	>=www-apps/jekyll-watch-2.2.1-r1
+"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/kramdown-syntax-coderay
+		dev-ruby/launchy
+		dev-ruby/nokogiri
+		>=dev-ruby/rdiscount-2.0
+		>=dev-ruby/redcarpet-3.2.3
+		dev-ruby/rspec-mocks
+		>=dev-ruby/shoulda-3
+		dev-ruby/test-unit:2
+		www-apps/jekyll-coffeescript
+	)
+"
+
+all_ruby_prepare() {
+	eapply "${FILESDIR}"/jekyll-3.6.0-test-helper.patch
+	eapply -R "${FILESDIR}/jekyll-4.3.2-sass.patch"
+	eapply "${FILESDIR}"/jekyll-4.3.2-no-safe_yaml.patch
+
+	# Avoid pathutil since it is not compatible with ruby 3.2+ and not
+	# Pathutil specific methods seem to be used.
+	sed -e '/pathutil/ s:^:#:' \
+		-i lib/jekyll.rb ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Drop tests requiring bundler
+	sed -i -e '/bundle_message/d' test/test_new_command.rb || die
+	rm test/test_plugin_manager.rb || die
+
+	# Drop tests requiring classifier-reborn (ruby27-only package)
+	rm -f test/test_related_posts.rb || die
+
+	# Replace git command in gemspec
+	sed -e 's/git ls-files/find -not -type d -print/' \
+		-e 's:_relative ": "./:' \
+		-i $RUBY_FAKEGEM_GEMSPEC || die
+
+	sed -e '3igem "liquid", "~> 4.0"' -i test/helper.rb || die
+
+	# FIXMEs:
+	# fails to find fixtures because this requires bundler
+	rm -f test/test_theme.rb || die
+	rm -f test/test_theme_{assets_reader,data_reader,drop}.rb || die
+	sed -i -e '/^    should.*theme/,/^    end$/d' \
+		-e '/^      should.*theme/,/^      end$/d' test/test_site.rb || die
+	sed -i -e '/context "with a theme"/,/^    end/ s:^:#:' test/test_layout_reader.rb || die
+	sed -i -e '/normalize paths of rendered items/askip "test-theme"' test/test_liquid_renderer.rb || die
+	# partially requires 'toml'
+	rm test/test_configuration.rb || die
+	# pygments tests fail because of line numbering
+	sed -i -e '/^  context.*pygments/,/^  end$/d' test/test_tags.rb || die
+
+	# Tries to use bundler and install packages.
+	rm -f test/test_new_command.rb || die
+
+	# Fails due to ordering differences in ruby 3.0
+	sed -e '/convert drop to json/askip "hash ordering with ruby 3"' \
+		-i test/test_filters.rb || die
+
+	# Avoid a test failing due to TZ differences
+	sed -e '/contain the proper page data to mimic the post liquid/askip "TZ difference"' \
+		-i test/test_excerpt.rb || die
+
+	# Confused by network-sandbox
+	sed -e "/return true if there's internet/askip \"Confused by network-sandbox\"" \
+		-i test/test_utils.rb || die
+
+	# Avoid tests requiring unmaintained and broken httpclient
+	rm -f test/test_commands_serve.rb || die
+}
+
+src_test() {
+	local -x JEKYLL_NO_BUNDLER_REQUIRE=true
+
+	ruby-ng_src_test
+}
diff --git a/www-apps/lidarr-bin/Manifest b/www-apps/lidarr-bin/Manifest
index b8db7f1e0908..c83fff1b0cc8 100644
--- a/www-apps/lidarr-bin/Manifest
+++ b/www-apps/lidarr-bin/Manifest
@@ -1,6 +1,6 @@
-DIST Lidarr.develop.2.9.0.4508.linux-core-arm.tar.gz 95170927 BLAKE2B 00100c626fb6d37738c3fd1bda40e046f9a3af9ab733456c3efa90dcf5fd2eed2b92e1cd30ab32578e174bafcc0726e5cf41fb55c17877236e6c2f4078dc5229 SHA512 06d69895acb9c6655b1b412f0d86b253c88dc932dccd18ad5ffbd5fb8a0054b96fe13bcce7fa5613d137885fe7f4f38a5ff5921a5fdac5ac59392874e985cba1
-DIST Lidarr.develop.2.9.0.4508.linux-core-arm64.tar.gz 94766355 BLAKE2B a5d780004039c918d31a3fb92f1694a49db1081f1a2716f46e413e2a3bedba3e617cdf81bcbf1b9d580afa2cd6f1c07f065bbc399ded51d329295d1bb421ef41 SHA512 aeabed75a6d4a2cf558424f546b3edfe3cc8c9bad6dde094fd905895a81e2340331a33d251c007c186fcb90744edd0a718c7c70b947b7cc8966de6f2d474da96
-DIST Lidarr.develop.2.9.0.4508.linux-core-x64.tar.gz 101255986 BLAKE2B 67ec0664339959298afed3a9b9e5755d6068b07f9c6905c2a7254f093c6a091d86b2e0c3704b670d212138a87571735a4d27124465f7fb548613a80bdf771de4 SHA512 cac7b63486bcdda8ef0e7afd395dfb989a77ca54449180f6cfe0cbc961211612c74c3c949067711160cc50be1671aa8bf5d15190430defc897dbaf4ac67d668e
-DIST Lidarr.develop.2.9.0.4508.linux-musl-core-arm.tar.gz 95197838 BLAKE2B 70a8d8b7360ea0396c3874102cbbcc0276e0d236ce271dee4a125cfeee2212debe78fdaad287888d6bd4cea7d293d9054e0e26aa49159ba17b72ff254e0f1a34 SHA512 8d01d5caa5ca488edf0956c3c1953e03c48898ce40277157b345a2507f115a6ed568c4f715e39378f508230a4c492130637402c0b9f260f1ed73a4e37bc10ecd
-DIST Lidarr.develop.2.9.0.4508.linux-musl-core-arm64.tar.gz 94841609 BLAKE2B 60daba2355b3a9cb763fd32201c1adc6e42fc082f5fa4385fb8d78c5893f5fd9179057c930d6425b6dd6cc1b68d12fb5bfa893e3abc64174b30bda3272cbf50d SHA512 686e74dfeda92c92e0813061b879ce54881842f1509e52e26da0e6d313563bd9718790a5b5fa45a185495aa40f6709d4e90811dc627c3e529d25a2ee36e25c62
-DIST Lidarr.develop.2.9.0.4508.linux-musl-core-x64.tar.gz 100336900 BLAKE2B fe64395ee938168f352067e1e430c31460cd7fc1cf8fc5633ee2e1c0c7dea22b5c345ae1e71ad7600333ed07a072adb55173cff7b29aa1a6209cbe92b3010df3 SHA512 1c581fe7cf8110954b43fe5c32073be99565ebb06f11159fe34a2d72c12523dec7e914f487320529f95e148d49b9c67395838b4c5c2f825cf7d873e1e771ce74
+DIST Lidarr.develop.2.9.3.4527.linux-core-arm.tar.gz 96475624 BLAKE2B a8f204d2a83e185ba09ddf75649cbb939f630c518df53b5bac8fced155e2f10496dde7007485992aa1327ad194e3b15179af357662861d95ee5d187ef21ed876 SHA512 b1a12131080a4c5e07729ad424e6ba8fbcd0b3f5d9883bc1be11cf95b7de738c9f321b2769947c861d3907f38fa703e25c88795397f2d45a7e595ee1d05d173c
+DIST Lidarr.develop.2.9.3.4527.linux-core-arm64.tar.gz 96081571 BLAKE2B 8f1e8c082acfd533787312c06fc852d0c58485f0df6caa21f6a43f5d6c2932a00c675d2494ab7f13a8160619a781205aa61717583eea38045cc83ed2ef37a66c SHA512 ab7848e06cca9e09be3cb38f53c9c6ee2dd25550229a7960d8b64f8e21c208222a8146499cc97b7f4322da12d323175b388a513c17411d767b4fb93eb88d55ec
+DIST Lidarr.develop.2.9.3.4527.linux-core-x64.tar.gz 102559193 BLAKE2B 7e3563722398bd3202ff3a0e4e88fbf3d1e53059a36b4e2162749a82dc63ae22f6f8481d1d6904f93fed6240feeb934fcb3174bc3dabbc9b0ce4e5111de10c1b SHA512 272f698c682f7f4367fa99c97b1b3c82c2e88599a9141375a625db51073591d8dec5b664ca78e70cdfcb8c0ded1a8f74fd54548f8a22da062758064a31657d30
+DIST Lidarr.develop.2.9.3.4527.linux-musl-core-arm.tar.gz 96492998 BLAKE2B 2973139cb34dc3637a0304d8a208d0da8386a2676a410bf05d45f1ccaac6d3f319e74e0b855e8a407fc6c7f0d6a2032d89cc1d921b6b3ff8ffef8f94fc947f05 SHA512 3b1e0d189ad6cd811ecce34f77547e7f63a664a7f3c01c9ca8b7ab5e59eda625234936626683b6782a759ccade615bd16ddd468cfec818e27def4399de61bc82
+DIST Lidarr.develop.2.9.3.4527.linux-musl-core-arm64.tar.gz 96137832 BLAKE2B 456ad5b7a084394e26daf5b00a66570e74efa0998a21b78c56999da6aab59918500b6b0f0248efce579965c2da51be3d492cbaea8c59b8446f121d67483b168c SHA512 7d7fd1de0bcc56f5604e2fd08234cb132a6adfa7f6678086a9608a05cc17a21c7a30908391f88d843d30646fc550fff1a8cb38b676cbd038751c5a0bf9ae0e05
+DIST Lidarr.develop.2.9.3.4527.linux-musl-core-x64.tar.gz 101642888 BLAKE2B 73da83b8586626337c93dbe75a2fb7dd7e4e8db891faeec7899ca07fbe8ec775f574ffa5311b5159ff6eff337fd00247ffa0b95025f3776319ccc0a79fd02caf SHA512 572080eea341bad68333acfd817eab44fe48d65fbc3261c114b92c816b62670a6f769084a5945291cabbe356b61cafd8cdaf71684c5edb13ccae1ac8714482b9
diff --git a/www-apps/lidarr-bin/lidarr-bin-2.9.0.4508.ebuild b/www-apps/lidarr-bin/lidarr-bin-2.9.0.4508.ebuild
deleted file mode 100644
index 2676b94f25ac..000000000000
--- a/www-apps/lidarr-bin/lidarr-bin-2.9.0.4508.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 systemd
-
-DESCRIPTION="Looks and smells like Sonarr but made for music"
-HOMEPAGE="https://lidarr.audio/
-	https://github.com/Lidarr/Lidarr/"
-
-SRC_URI="
-	amd64? (
-		elibc_glibc? (
-			https://github.com/Lidarr/Lidarr/releases/download/v${PV}/Lidarr.develop.${PV}.linux-core-x64.tar.gz
-		)
-		elibc_musl? (
-			https://github.com/Lidarr/Lidarr/releases/download/v${PV}/Lidarr.develop.${PV}.linux-musl-core-x64.tar.gz
-		)
-	)
-	arm? (
-		elibc_glibc? (
-			https://github.com/Lidarr/Lidarr/releases/download/v${PV}/Lidarr.develop.${PV}.linux-core-arm.tar.gz
-		)
-		elibc_musl? (
-			https://github.com/Lidarr/Lidarr/releases/download/v${PV}/Lidarr.develop.${PV}.linux-musl-core-arm.tar.gz
-		)
-	)
-	arm64? (
-		elibc_glibc? (
-			https://github.com/Lidarr/Lidarr/releases/download/v${PV}/Lidarr.develop.${PV}.linux-core-arm64.tar.gz
-		)
-		elibc_musl? (
-			https://github.com/Lidarr/Lidarr/releases/download/v${PV}/Lidarr.develop.${PV}.linux-musl-core-arm64.tar.gz
-		)
-	)
-"
-S="${WORKDIR}/Lidarr"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="bindist strip test"
-
-RDEPEND="
-	acct-group/lidarr
-	acct-user/lidarr
-	media-video/mediainfo
-	dev-libs/icu
-	dev-util/lttng-ust:0
-	dev-db/sqlite
-"
-
-QA_PREBUILT="*"
-
-src_prepare() {
-	default
-
-	# https://github.com/dotnet/runtime/issues/57784
-	rm libcoreclrtraceptprovider.so Lidarr.Update/libcoreclrtraceptprovider.so || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}/lidarr.init" lidarr
-
-	keepdir /var/lib/lidarr
-	fowners -R lidarr:lidarr /var/lib/lidarr
-
-	insinto /etc/logrotate.d
-	insopts -m0644 -o root -g root
-	newins "${FILESDIR}/lidarr.logrotate" lidarr
-
-	dodir  "/opt/lidarr"
-	cp -R "${S}/." "${D}/opt/lidarr" || die "Install failed!"
-
-	systemd_dounit "${FILESDIR}/lidarr.service"
-	systemd_newunit "${FILESDIR}/lidarr.service" "lidarr@.service"
-}
diff --git a/www-apps/lidarr-bin/lidarr-bin-2.9.3.4527.ebuild b/www-apps/lidarr-bin/lidarr-bin-2.9.3.4527.ebuild
new file mode 100644
index 000000000000..a9d20cd2945e
--- /dev/null
+++ b/www-apps/lidarr-bin/lidarr-bin-2.9.3.4527.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Looks and smells like Sonarr but made for music"
+HOMEPAGE="https://lidarr.audio/
+	https://github.com/Lidarr/Lidarr/"
+
+SRC_URI="
+	amd64? (
+		elibc_glibc? (
+			https://github.com/Lidarr/Lidarr/releases/download/v${PV}/Lidarr.develop.${PV}.linux-core-x64.tar.gz
+		)
+		elibc_musl? (
+			https://github.com/Lidarr/Lidarr/releases/download/v${PV}/Lidarr.develop.${PV}.linux-musl-core-x64.tar.gz
+		)
+	)
+	arm? (
+		elibc_glibc? (
+			https://github.com/Lidarr/Lidarr/releases/download/v${PV}/Lidarr.develop.${PV}.linux-core-arm.tar.gz
+		)
+		elibc_musl? (
+			https://github.com/Lidarr/Lidarr/releases/download/v${PV}/Lidarr.develop.${PV}.linux-musl-core-arm.tar.gz
+		)
+	)
+	arm64? (
+		elibc_glibc? (
+			https://github.com/Lidarr/Lidarr/releases/download/v${PV}/Lidarr.develop.${PV}.linux-core-arm64.tar.gz
+		)
+		elibc_musl? (
+			https://github.com/Lidarr/Lidarr/releases/download/v${PV}/Lidarr.develop.${PV}.linux-musl-core-arm64.tar.gz
+		)
+	)
+"
+S="${WORKDIR}/Lidarr"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="bindist strip test"
+
+RDEPEND="
+	acct-group/lidarr
+	acct-user/lidarr
+	media-video/mediainfo
+	dev-libs/icu
+	dev-util/lttng-ust:0
+	dev-db/sqlite
+"
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	default
+
+	# https://github.com/dotnet/runtime/issues/57784
+	rm libcoreclrtraceptprovider.so Lidarr.Update/libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}/lidarr.init" lidarr
+
+	keepdir /var/lib/lidarr
+	fowners -R lidarr:lidarr /var/lib/lidarr
+
+	insinto /etc/logrotate.d
+	insopts -m0644 -o root -g root
+	newins "${FILESDIR}/lidarr.logrotate" lidarr
+
+	dodir  "/opt/lidarr"
+	cp -R "${S}/." "${D}/opt/lidarr" || die "Install failed!"
+
+	systemd_dounit "${FILESDIR}/lidarr.service"
+	systemd_newunit "${FILESDIR}/lidarr.service" "lidarr@.service"
+}
diff --git a/www-apps/mediawiki/mediawiki-1.39.11.ebuild b/www-apps/mediawiki/mediawiki-1.39.11.ebuild
index 4bab080ff5a5..067e534bc470 100644
--- a/www-apps/mediawiki/mediawiki-1.39.11.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.39.11.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 @@ HOMEPAGE="http://www.mediawiki.org"
 SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
 IUSE="imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/www-apps/mediawiki/mediawiki-1.42.4.ebuild b/www-apps/mediawiki/mediawiki-1.42.4.ebuild
index 097b61eead1e..c01d7bece82f 100644
--- a/www-apps/mediawiki/mediawiki-1.42.4.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.42.4.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 @@ HOMEPAGE="http://www.mediawiki.org"
 SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
 IUSE="imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/www-apps/mediawiki/mediawiki-1.43.0.ebuild b/www-apps/mediawiki/mediawiki-1.43.0.ebuild
index 097b61eead1e..c01d7bece82f 100644
--- a/www-apps/mediawiki/mediawiki-1.43.0.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.43.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
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.mediawiki.org"
 SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
 IUSE="imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/www-apps/miniflux/Manifest b/www-apps/miniflux/Manifest
index 1a4db76331e4..f012ae893633 100644
--- a/www-apps/miniflux/Manifest
+++ b/www-apps/miniflux/Manifest
@@ -1,4 +1,4 @@
-DIST miniflux-2.1.4-deps.tar.xz 43184308 BLAKE2B d4412a87d07d405f93c2e7449a3e3ff4932f28b9c46ff75519c8398c8b7d0090b0759e2b3be5c20c4e1900e1058724071b3efb8144ff3149a8a06234155900c3 SHA512 75456f40578e3da2866a7ea98c3dc137934b05c73e4a5aa2a96cbce0457a9aa394a598a837b98f50cb97cb2279b8acc331fe08fa5bff245fef1bec0cb92029a8
-DIST miniflux-2.1.4.tar.gz 731511 BLAKE2B a6d099411971af1319825f8b4fc2e56fac8b86eb4b2b91175f4b349aa2dfb6c0036af388deaf34eef00a7fd0c70d73350976332e9fd851fc3a9fb68fc3edceb5 SHA512 e20ddaa8682b492c5eaaef687d4b92fa40c148b0cdb9bc6f4175a2e7da0d0e13c5e93a97145de06e1210015be3361a396c1dc85aaf58b5c02ec86903617732ca
 DIST miniflux-2.2.3-deps.tar.xz 113735492 BLAKE2B 49ddd2fb021a28a2c054769a1a0e098357d8a33ef17530a7a1234f523928557b63c9d8ff55b50921b583e77a3a682802404c41c75bebf8d7750546fb2b87ce38 SHA512 299120e84908200c67e47caf8fc00b3f10c5127209668f44a4fa0479aa46f93c26e2f5765432401cbd4218a727b12dbc09ae1dfcee8c80c8bc0c5319a26f665f
 DIST miniflux-2.2.3.tar.gz 761864 BLAKE2B 35d277ed671f18e2b2c5b59ae561d6c8bda5347e6b4993c5fa21d9b08ee0e92a55efde411a55f0fd47f150b2d2db984551be41aa61ab9a9b143f226514989d8b SHA512 35a60b57936fda1e678a76d4907cdf8d5c96096364fc45702ff2b27ba367a25fa6e06c58073664c4b1ab0b779f3882f8fa7ab6179e4ed70a771d00671e971ff6
+DIST miniflux-2.2.4-deps.tar.xz 121764040 BLAKE2B 978a83a010a1446b60305877fc95ba2a3f69c07bc6f28220d224a541e2d528d2dd5e5a44b8e933058b281d0d264bc430110632dd6cee864ba97f85f27dc53d43 SHA512 23954f3c11503ee3749c9f6fa90b9ba92c9711802af7f0f48c038f116a30adeb70787f964dac25e19b2c342de83fd193834f72b561265c68da107e07601d831d
+DIST miniflux-2.2.4.tar.gz 765890 BLAKE2B fe1d77cb476ee3f879efbf8ae866ac254fb447a275f94aff7b059a866b61cd7b9918ab0901ff709dc54ea34c5fede166ff700cb98a313048922b1c5dbf7830cd SHA512 d0fa96eb1b0768ab551c253d6cc5e5874dbcc26d3fbe767439656c3b66b813e4f4215a2058790ea61001c6a7ccce43834d871b5d72b14763007c26c8da78441d
diff --git a/www-apps/miniflux/miniflux-2.1.4.ebuild b/www-apps/miniflux/miniflux-2.1.4.ebuild
deleted file mode 100644
index e0946b3d9ee7..000000000000
--- a/www-apps/miniflux/miniflux-2.1.4.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-# git rev-parse --short HEAD
-MY_GIT_COMMIT="b683756d"
-
-DESCRIPTION="Minimalist and opinionated feed reader"
-HOMEPAGE="https://miniflux.app https://github.com/miniflux/v2"
-SRC_URI="https://github.com/${PN}/v2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${P}-deps.tar.xz"
-
-S="${WORKDIR}/v2-${PV}"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc64 ~riscv"
-
-RESTRICT="test" # requires network access
-
-DEPEND="acct-user/miniflux"
-RDEPEND="${DEPEND}
-	>=dev-db/postgresql-9.5
-"
-
-src_compile() {
-	ego build -ldflags="
-		-s -w
-		-X 'miniflux.app/v2/internal/version.Version=${PV}'
-		-X 'miniflux.app/v2/internal/version.Commit=${MY_GIT_COMMIT}'
-		-X 'miniflux.app/v2/internal/version.BuildDate=$(date +%FT%T%z)'
-		" -o miniflux main.go
-}
-
-src_install() {
-	dobin miniflux
-
-	insinto /etc
-	doins "${FILESDIR}/${PN}.conf"
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	fowners miniflux:root /etc/${PN}.conf
-	fperms o-rwx /etc/${PN}.conf
-
-	local DOCS=(
-		ChangeLog
-		README.md
-		"${FILESDIR}"/README.gentoo
-	)
-
-	# Makefile has no install target, so call einstalldocs directly
-	einstalldocs
-
-	doman "${PN}".1
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		echo
-		elog "Before using miniflux, you must first create and initialize the database"
-		elog "and enable the hstore extension for it."
-		elog ""
-		elog "Afterwards, create your first admin user by running:"
-		elog "  miniflux -create-admin"
-	else
-		# This is an existing installation
-
-		echo
-		elog "If you are upgrading from a previous version, schema migrations must be performed."
-		elog "To perform the migrations, stop the daemon, backup your database, and run:"
-		elog "  emerge --config =${PF}"
-	fi
-
-	echo
-	elog "Please read"
-	elog ""
-	elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-	elog ""
-	elog "for more information."
-}
-
-pkg_config() {
-	# To be safe, avoid doing migrations if miniflux is running
-	if pgrep miniflux; then
-		die "miniflux appears to be running, refusing to continue."
-	fi
-
-	# Extract the database URL variable instead of just sourcing the config file
-	# because miniflux itself may interpret quotes as part of the URL
-	local DATABASE_URL="$(sed -n 's/^DATABASE_URL=\(.*\)/\1/p' "${EROOT}/etc/${PN}.conf")"
-	[[ -n "${DATABASE_URL}" ]] || die "Failed getting DATABASE_URL from config file"
-
-	DATABASE_URL="${DATABASE_URL}" "${EROOT}"/usr/bin/miniflux -migrate \
-		|| die "miniflux -migrate failed. Please check the above output for errors."
-
-	echo
-	elog "Database migrations complete."
-}
diff --git a/www-apps/miniflux/miniflux-2.2.3.ebuild b/www-apps/miniflux/miniflux-2.2.3.ebuild
index c6cde0b43c88..dfbe221ad02d 100644
--- a/www-apps/miniflux/miniflux-2.2.3.ebuild
+++ b/www-apps/miniflux/miniflux-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ S="${WORKDIR}/v2-${PV}"
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ppc64 ~riscv"
 
 RESTRICT="test" # requires network access
 
diff --git a/www-apps/miniflux/miniflux-2.2.4.ebuild b/www-apps/miniflux/miniflux-2.2.4.ebuild
new file mode 100644
index 000000000000..60521861a744
--- /dev/null
+++ b/www-apps/miniflux/miniflux-2.2.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+# git rev-parse --short HEAD
+MY_GIT_COMMIT="d345c873"
+
+DESCRIPTION="Minimalist and opinionated feed reader"
+HOMEPAGE="https://miniflux.app https://github.com/miniflux/v2"
+SRC_URI="https://github.com/${PN}/v2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${P}-deps.tar.xz"
+
+S="${WORKDIR}/v2-${PV}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv"
+
+RESTRICT="test" # requires network access
+
+DEPEND="acct-user/miniflux"
+RDEPEND="${DEPEND}
+	>=dev-db/postgresql-9.5
+"
+
+src_compile() {
+	ego build -ldflags="
+		-s -w
+		-X 'miniflux.app/v2/internal/version.Version=${PV}'
+		-X 'miniflux.app/v2/internal/version.Commit=${MY_GIT_COMMIT}'
+		-X 'miniflux.app/v2/internal/version.BuildDate=$(date +%FT%T%z)'
+		" -o miniflux main.go
+}
+
+src_install() {
+	dobin miniflux
+
+	insinto /etc
+	doins "${FILESDIR}/${PN}.conf"
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	fowners miniflux:root /etc/${PN}.conf
+	fperms o-rwx /etc/${PN}.conf
+
+	local DOCS=(
+		ChangeLog
+		README.md
+		"${FILESDIR}"/README.gentoo
+	)
+
+	# Makefile has no install target, so call einstalldocs directly
+	einstalldocs
+
+	doman "${PN}".1
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		echo
+		elog "Before using miniflux, you must first create and initialize the database"
+		elog "and enable the hstore extension for it."
+		elog ""
+		elog "Afterwards, create your first admin user by running:"
+		elog "  miniflux -create-admin"
+	else
+		# This is an existing installation
+
+		echo
+		elog "If you are upgrading from a previous version, schema migrations must be performed."
+		elog "To perform the migrations, stop the daemon, backup your database, and run:"
+		elog "  emerge --config =${PF}"
+	fi
+
+	echo
+	elog "Please read"
+	elog ""
+	elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+	elog ""
+	elog "for more information."
+}
+
+pkg_config() {
+	# To be safe, avoid doing migrations if miniflux is running
+	if pgrep miniflux; then
+		die "miniflux appears to be running, refusing to continue."
+	fi
+
+	# Extract the database URL variable instead of just sourcing the config file
+	# because miniflux itself may interpret quotes as part of the URL
+	local DATABASE_URL="$(sed -n 's/^DATABASE_URL=\(.*\)/\1/p' "${EROOT}/etc/${PN}.conf")"
+	[[ -n "${DATABASE_URL}" ]] || die "Failed getting DATABASE_URL from config file"
+
+	DATABASE_URL="${DATABASE_URL}" "${EROOT}"/usr/bin/miniflux -migrate \
+		|| die "miniflux -migrate failed. Please check the above output for errors."
+
+	echo
+	elog "Database migrations complete."
+}
diff --git a/www-apps/mythweb/mythweb-0.28.1-r2.ebuild b/www-apps/mythweb/mythweb-0.28.1-r2.ebuild
index 6f6fcae78019..a38ab1bbdcc8 100644
--- a/www-apps/mythweb/mythweb-0.28.1-r2.ebuild
+++ b/www-apps/mythweb/mythweb-0.28.1-r2.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 @@ SRC_URI="https://github.com/MythTV/mythweb/archive/v${MY_PV}.tar.gz -> mythweb-$
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-lang/php:*[json(+),mysql,session,posix]
diff --git a/www-apps/mythweb/mythweb-34.0.ebuild b/www-apps/mythweb/mythweb-34.0.ebuild
index 6f6fcae78019..a38ab1bbdcc8 100644
--- a/www-apps/mythweb/mythweb-34.0.ebuild
+++ b/www-apps/mythweb/mythweb-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
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/MythTV/mythweb/archive/v${MY_PV}.tar.gz -> mythweb-$
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-lang/php:*[json(+),mysql,session,posix]
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 9f15d6b43461..eb2aa0e4fe99 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -2,6 +2,8 @@ DIST nextcloud-28.0.12.tar.bz2 190777207 BLAKE2B 796235889f7e4ee09a10c41a800ea95
 DIST nextcloud-28.0.14.tar.bz2 192050636 BLAKE2B 4d2b7ff70864f062155fade7cbecb2743ee5e103b0dc98ecac3391724e5c576b7ff9d398f71419b778ed287dd64e6669a1db5198fe09bfa3a1e85b1fb7991cb4 SHA512 2ef507bbc224b73d509fa1788ef4325716ea7dd57f77f8f091f5d7ef9f7362c15ee2cb8f847053aae01f02863bc9954dffabe58cc51b89f092638904cb84ff50
 DIST nextcloud-28.0.6.tar.bz2 188259629 BLAKE2B 304d98076d02a190143d0e9846405a029a16b268eec2dfddde8746deae7ef02e0acd5f7a9a7303e454fbc4d828496cfc101c59e8664834e8a9691ae0c586c8f0 SHA512 f34c895602bd63f2e61492e91b9949852f9d2422c3b8740e851107efe5d46de72d8ec06a15c808fa27503546067d62d3166b55ff9979b18f36546845791941c2
 DIST nextcloud-29.0.10.tar.bz2 207170881 BLAKE2B b05af991b57ab98a782e473fd8a47e422234b06887755171c89702dba7e1a0e8ba5098a6593100058f6e80f2cf5ebfc16f4f03e5a881e3c4a0478b8952b36c5e SHA512 919603f3c1159b4e37d79e1e44bb96957d68384ef0ae60588e152d4d294b06df4d8fab4e7999c965c773ba8c1f1ec974445cf41d64ab1c9aaf65e9c07c606c20
+DIST nextcloud-29.0.11.tar.bz2 208174638 BLAKE2B 1923605b53f7c8ee8e224674bd5fde6df033fbb77b2a1bd129dde6fe6eeb90bc318f0ff9af50c83aad717b4939eead3667284f064b366f29fe457551691c1a63 SHA512 0afd6b67ac7f76273220936c4306231d80a2b9f498f0d6809f562d9c896ff39971828e73e5e932acbaa0167e4a3806dc34677c1167453d3e5137cbfbc438398a
 DIST nextcloud-29.0.7.tar.bz2 204453544 BLAKE2B 8affb8c2c6faf82df014e06fb9df3226e1ea6a0c9922a01a1b0f1e1120925b755163ee15d3a95f5fd4635dcc2d472290de29fc97b52c5e669122b32c7d64a28e SHA512 9a87ea11870aec4b26499e85c9ef91e38644d947c810c619f22f617307014b58adc24ebd19841af8aa3b5185427610f278951e48bb7ae242fa4de1eb3e6abb63
 DIST nextcloud-30.0.2.tar.bz2 186711039 BLAKE2B 96d75fbeb3f1c9de1d122e86f59cbaac591d93d9837a3af9c2b1009ec83b8e5bb672c346d71e1163100a4619b8ed526fc9f71d508269d0f577a063410c0f4069 SHA512 5587fd8a5695b70165bc705cc79294779a7d64e755d8a37e76a13b0f28da3132ea4228615f1fd2ed13727b34d4c03c7fd1965587590aa0dd8847b7a0b00b5fe7
 DIST nextcloud-30.0.4.tar.bz2 187905017 BLAKE2B 3bec2878a64e589aa54a99c0de30ea171a97da126723f86f8190757453cfa83bb191ead07c74b200b332f4d370a8c3d88737aa889311661a034f39e0ba88de5a SHA512 6686bd86f5a7ede656e46f07580ba0c83db42ba5e2f161074b3cd48bbba80c4836125bb6966e052c35eb332bb43d5df58e29c781a56a2ad6ac8498464aa47aec
+DIST nextcloud-30.0.5.tar.bz2 191328352 BLAKE2B dde413f832ba025919e25c5438e60e295b3af9d5a750b55d0f2cab9152ac42d48ae8ea6006824d5e852734813a9f1c7315f47e3d0bdb0cac30746eb00c9a57d8 SHA512 041e5d9670a376480312db525a5791b703682b0061ca4a2aea2aea481e407ce04a726e1e5ae0c45876c749e18aae7926417b4655f591082954e3945677704910
diff --git a/www-apps/nextcloud/nextcloud-28.0.14.ebuild b/www-apps/nextcloud/nextcloud-28.0.14.ebuild
index c4a46ad7ae66..89d301510fe7 100644
--- a/www-apps/nextcloud/nextcloud-28.0.14.ebuild
+++ b/www-apps/nextcloud/nextcloud-28.0.14.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://nextcloud.com/"
 SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
 LICENSE="AGPL-3"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="+curl +imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/www-apps/nextcloud/nextcloud-29.0.10.ebuild b/www-apps/nextcloud/nextcloud-29.0.10.ebuild
index cdae29e997d4..315dd1508114 100644
--- a/www-apps/nextcloud/nextcloud-29.0.10.ebuild
+++ b/www-apps/nextcloud/nextcloud-29.0.10.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://download.nextcloud.com/server/releases/${P}.tar.bz2"
 S=${WORKDIR}/${PN}
 
 LICENSE="AGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 IUSE="+curl +imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
diff --git a/www-apps/nextcloud/nextcloud-29.0.11.ebuild b/www-apps/nextcloud/nextcloud-29.0.11.ebuild
new file mode 100644
index 000000000000..9ff0bf14411d
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-29.0.11.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="https://nextcloud.com/"
+SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
+
+S=${WORKDIR}/${PN}
+
+LICENSE="AGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="+curl +imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	imagemagick? ( dev-php/pecl-imagick )
+	virtual/httpd-php"
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/nextcloud/nextcloud-30.0.5.ebuild b/www-apps/nextcloud/nextcloud-30.0.5.ebuild
new file mode 100644
index 000000000000..9ff0bf14411d
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-30.0.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="https://nextcloud.com/"
+SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
+
+S=${WORKDIR}/${PN}
+
+LICENSE="AGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="+curl +imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	imagemagick? ( dev-php/pecl-imagick )
+	virtual/httpd-php"
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/phpBB/Manifest b/www-apps/phpBB/Manifest
index 58626e0e0818..31b1904c5ac0 100644
--- a/www-apps/phpBB/Manifest
+++ b/www-apps/phpBB/Manifest
@@ -1 +1 @@
-DIST phpBB-3.3.13.tar.bz2 4110534 BLAKE2B 68504b5446b60f19f9e3feb6de08afbd0fa35c0e54782daf7b626917969f71d61af9564495b145191200ed75b41739ab5b526b5e49fecd08effd018f5d1d7fa4 SHA512 2a6725465e6d4f4b42eada17343e0f6fe8fd8e7464d0b444d4dfa80928d6c0127c34a4e0bbcb13a9166ed5cf37772e92d9353092bb0ce9ed6b089f5b6a70dd43
+DIST phpBB-3.3.14.tar.bz2 4110798 BLAKE2B 9131d291ee262f3e4596ead6cf4900db33ed3d99d93b42dd950bfbecc8b30d6892efe22fcf2d377fd11ada73b789a0523d3ec1e6ebc1f8b67f323b5fd488390d SHA512 1eae128e3fec7670fdefb0a1e592a1a77759a201fcc46b6892f4fbda7286c5b13fedd672c8e016d6b06531d1fe6a954366d5b75aa2b13ef30f66f9deddd954dd
diff --git a/www-apps/phpBB/phpBB-3.3.13.ebuild b/www-apps/phpBB/phpBB-3.3.13.ebuild
deleted file mode 100644
index 9032b4419e00..000000000000
--- a/www-apps/phpBB/phpBB-3.3.13.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit webapp
-
-DESCRIPTION="An open-source PHP-based bulletin board package"
-HOMEPAGE="https://www.phpbb.com/"
-SRC_URI="https://download.phpbb.com/pub/release/$(ver_cut 1-2)/${PV}/${P}.tar.bz2"
-S="${WORKDIR}/${PN}${PV%%.*}"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
-IUSE="ftp gd mssql mysqli postgres sqlite zlib"
-REQUIRED_USE="|| ( mssql mysqli postgres sqlite )"
-
-PHP_RDEPEND="(
-	virtual/httpd-php:@SLOT@
-	dev-lang/php:@SLOT@[ftp?,gd?,json(+),mssql?,mysqli?,postgres?,sqlite?,xml,zlib?]
-)"
-
-RDEPEND="|| (
-	${PHP_RDEPEND//@SLOT@/8.3}
-	${PHP_RDEPEND//@SLOT@/8.2}
-	${PHP_RDEPEND//@SLOT@/8.1}
-)"
-
-need_httpd_cgi
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile  "${MY_HTDOCSDIR}"/config.php
-	webapp_hook_script "${FILESDIR}"/permissions
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-
-	# phpBB needs docs together with the other files.
-	dosym ../webapps/${PN}/${SLOT}/htdocs/docs /usr/share/doc/${PF}
-}
-
-pkg_postinst() {
-	einfo "phpBB needs a specific web server configuration. For Apache httpd, an"
-	einfo "example configuration is provided via .htaccess files. For lighttpd and"
-	einfo "NGINX, example configuration files can be found in the documentation."
-
-	if use vhosts; then
-		echo
-		ewarn "When installing with webapp-config, specify a group that includes your"
-		ewarn "PHP user with the -g option. It will default to the web server group"
-		ewarn "when running webapp-config as root."
-	fi
-}
diff --git a/www-apps/phpBB/phpBB-3.3.14.ebuild b/www-apps/phpBB/phpBB-3.3.14.ebuild
new file mode 100644
index 000000000000..08bbfa434096
--- /dev/null
+++ b/www-apps/phpBB/phpBB-3.3.14.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+DESCRIPTION="An open-source PHP-based bulletin board package"
+HOMEPAGE="https://www.phpbb.com/"
+SRC_URI="https://download.phpbb.com/pub/release/$(ver_cut 1-2)/${PV}/${P}.tar.bz2"
+S="${WORKDIR}/${PN}${PV%%.*}"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+IUSE="ftp gd mssql mysqli postgres sqlite zlib"
+REQUIRED_USE="|| ( mssql mysqli postgres sqlite )"
+
+PHP_RDEPEND="(
+	virtual/httpd-php:@SLOT@
+	dev-lang/php:@SLOT@[ftp?,gd?,json(+),mssql?,mysqli?,postgres?,sqlite?,xml,zlib?]
+)"
+
+RDEPEND="|| (
+	${PHP_RDEPEND//@SLOT@/8.3}
+	${PHP_RDEPEND//@SLOT@/8.2}
+)"
+
+need_httpd_cgi
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile  "${MY_HTDOCSDIR}"/config.php
+	webapp_hook_script "${FILESDIR}"/permissions
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+
+	# phpBB needs docs together with the other files.
+	dosym ../webapps/${PN}/${SLOT}/htdocs/docs /usr/share/doc/${PF}
+}
+
+pkg_postinst() {
+	einfo "phpBB needs a specific web server configuration. For Apache httpd, an"
+	einfo "example configuration is provided via .htaccess files. For lighttpd and"
+	einfo "NGINX, example configuration files can be found in the documentation."
+
+	if use vhosts; then
+		echo
+		ewarn "When installing with webapp-config, specify a group that includes your"
+		ewarn "PHP user with the -g option. It will default to the web server group"
+		ewarn "when running webapp-config as root."
+	fi
+}
diff --git a/www-apps/prowlarr-bin/Manifest b/www-apps/prowlarr-bin/Manifest
index 9310acbd06ff..65f549f19fb2 100644
--- a/www-apps/prowlarr-bin/Manifest
+++ b/www-apps/prowlarr-bin/Manifest
@@ -1,6 +1,6 @@
-DIST Prowlarr.develop.1.29.1.4903.linux-core-arm.tar.gz 91869635 BLAKE2B 0cfd7668ca60d8e3f8157505e7d8603abf1ee91c071207f52c2b95fec251ad4f35031d9c8226109de0f7e730a05f90d0a9f134d1725e5f01caa4b9de9ac7de07 SHA512 f85ad4d9a3214fec308aec21fbe092c2f99fb827c69d62e56b204db2dd7e4d73c407a6f86fa1777422a399ee322a827f4c23a85c8736dd24ca213452c9025ac1
-DIST Prowlarr.develop.1.29.1.4903.linux-core-arm64.tar.gz 91130081 BLAKE2B 6947d9defcb5c4c8f90d88c12692d807397cf808c174c172fe7f06354e1c22e74dd4fd23733a1e429e7b1dd4384990a84613c5a5383824870d2434e6e0a785ee SHA512 9ddbe8e3bbe1a5349f1cf7d5651716b0c4a91e861370945351863c563393045def72702994a4c5edce2977a0a7949c4eaeaf004c95f93357485e6bc49e49ba5a
-DIST Prowlarr.develop.1.29.1.4903.linux-core-x64.tar.gz 96118233 BLAKE2B 9f72a0004c6a41fe92741b40b2ea768c34b836dbc6004e19b0373f99e0af546b854a132c4d7a36f5e9ac2df4d38afd4f5ed7e698528f3d5184298a6cced78544 SHA512 952fa058db9b543bf3e314a5d4f41bc9da3c8c12d0e95f05bb92a688a50d873c4db30e4b0e0bc3c93a7734290c3c2f3414d1586314e6dc258c9dbe06af9f22f7
-DIST Prowlarr.develop.1.29.1.4903.linux-musl-core-arm.tar.gz 91900110 BLAKE2B 8f5fb15613ba107560f252eff533a308903834c01947ec58b06a91250ffdfccfade879b71e51909fe8b4eca6688fdbc34d1290523d09e656edd99b601c32de93 SHA512 f937f6a3d0b5ba7a1a86b1e9d83d004c8215c9b2622a7a17dd2e4f6e59083f9fa82a5bab2f14b1d0e96e2d450e931ec032265ac86083335921de1c9af0872101
-DIST Prowlarr.develop.1.29.1.4903.linux-musl-core-arm64.tar.gz 91194378 BLAKE2B c08353cd46b681366969de4a02ed162c862bad0c94c16d4727c44b720626b18be9dcc81d57cced70658eca6b4493aa993ff85978afaaf0a293d963aac83e8006 SHA512 e5db7322403c033bc647b87491c7b127908491ad99f22916cad97d19d715858ecb2220b8a476f2fb4d190022cc4a9f8460016e0d9bb53fde239154104f29eab3
-DIST Prowlarr.develop.1.29.1.4903.linux-musl-core-x64.tar.gz 95184754 BLAKE2B 8eadd39ce894a477761da12634b4cb4aaf4b6d8d7cfcab945aab12fd83bf15f36c976a09f2ead880994584c762fe0e0f00ccad237eaf4d8d56849424447b6ce6 SHA512 2fc7362e08ebf3546eb64010fb3763b29664b9a13165132bcc79c4c50f4e8e29b1badda2e680a6e695df90f395476a6619eadd6ec7a28a491ac4ecb8d80e4209
+DIST Prowlarr.develop.1.30.0.4920.linux-core-arm.tar.gz 91884671 BLAKE2B c54233b914fa7a3e9ea85d5a449dd80d2f88271cbf2fa4ca3a835a92c36482acf907620591067e4a3dbe197d1c041f76d50a776291ab9258e0d7935afac2577c SHA512 832ce39ead6613114654c4dc5ba6a13ad54fe7c61f6160ae72d2cdb0acff5cd0dda0571cb0c4b02f146a691f720f3cd1be348bff2acfb43d556acbfd1b9b1c4a
+DIST Prowlarr.develop.1.30.0.4920.linux-core-arm64.tar.gz 91145661 BLAKE2B 5fbe27cdfeef9b06cad21fdff9f081973dceca979aec05751d616805835297f65470953bb719a069f76dc2dda57a72a345b4d780471c3cf43669d2881085fdb6 SHA512 0733b5b500a7c533a2b6aff577ba86c0abdb2a7f2febdc2ce3a1f77d018f2601a3625b6f33bb59ceebc255d8b756bf700bcc5a4ba568479d6f5fbf7fb3503403
+DIST Prowlarr.develop.1.30.0.4920.linux-core-x64.tar.gz 96116228 BLAKE2B a5e970ded25875dcd3fcd0ac9cd55aef38701b141cf6148267b2d49906e7ddf60ac2f98744ec2c9c9efdfd7796b835b6012bcdb404cdbe11efe642468e4ce184 SHA512 723832ceb148e5091506e0fa1599a0bbd8a412d9ecc0ad80ed902a59385be5b495f0157a1c51c41a61f9ce1138ca14a719864e10107720b0c5a573cdfbf91b74
+DIST Prowlarr.develop.1.30.0.4920.linux-musl-core-arm.tar.gz 91905302 BLAKE2B 8c14fbc8c364961db70ff745d45b441e6c0a231eb08d84e453cab6907b86284ece9df2dd8aa7bfd070b82fc724d31aceeaa5a6b2d0f9e9049a5820dfa63e0dc2 SHA512 e434a70012220a0923dbbf97e25b0d05169ef2a42ae0ca79a6847f6d20db1728a36be3b41afc14d37571c8034d90b885ab4d99424cfeb0b7cc91e78d2355ea31
+DIST Prowlarr.develop.1.30.0.4920.linux-musl-core-arm64.tar.gz 91199514 BLAKE2B 7c31c5cc11d712553b0ba0b234fe2a8ca6906f416b036f7188fffc68556607e481baea445575a42595d9ab867f8a577df066438720548c5883fac6d13e78eb2b SHA512 00937165be52c40a3e200d8e45ba511b342058a382c8975fe67c80e767bbb6a53c451dc8774f63362d9d2ddf3a71d3b17c0a9e230574b646550d6d21ef4ffb56
+DIST Prowlarr.develop.1.30.0.4920.linux-musl-core-x64.tar.gz 95197799 BLAKE2B a1dcdfd02f6517ec0d838a7141e2e311522c8dc2206c64dc68792accd61134001592720419554d748856758b2f04e70bd4128cc014bd63609ddcdfc7cd6d0d60 SHA512 4eb6b7ce059b77c73c4a018c98bf4687275b81c19273e522411c7d267d25ea571dff305350e263351c849d1191fda4c17ec71709fd4098a6dd0f87c86e4a5c7f
diff --git a/www-apps/prowlarr-bin/prowlarr-bin-1.29.1.4903.ebuild b/www-apps/prowlarr-bin/prowlarr-bin-1.29.1.4903.ebuild
deleted file mode 100644
index 6b55e3a00dbf..000000000000
--- a/www-apps/prowlarr-bin/prowlarr-bin-1.29.1.4903.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="An indexer manager/proxy to integrate with your various PVR apps"
-HOMEPAGE="https://wiki.servarr.com/prowlarr/
-	https://github.com/Prowlarr/Prowlarr/"
-
-SRC_URI="
-	amd64? (
-		elibc_glibc? (
-			https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-x64.tar.gz
-		)
-		elibc_musl? (
-			https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-musl-core-x64.tar.gz
-		)
-	)
-	arm? (
-		elibc_glibc? (
-			https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-arm.tar.gz
-		)
-		elibc_musl? (
-			https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-musl-core-arm.tar.gz
-		)
-	)
-	arm64? (
-		elibc_glibc? (
-			https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-arm64.tar.gz
-		)
-		elibc_musl? (
-			https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-musl-core-arm64.tar.gz
-		)
-	)
-"
-S="${WORKDIR}/Prowlarr"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-RESTRICT="bindist strip test"
-
-RDEPEND="
-	acct-group/prowlarr
-	acct-user/prowlarr
-	dev-libs/icu
-	dev-util/lttng-ust:0
-	dev-db/sqlite
-"
-
-QA_PREBUILT="*"
-
-src_prepare() {
-	default
-
-	# https://github.com/dotnet/runtime/issues/57784
-	rm libcoreclrtraceptprovider.so Prowlarr.Update/libcoreclrtraceptprovider.so || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}/prowlarr.init" prowlarr
-
-	keepdir /var/lib/prowlarr
-	fowners -R prowlarr:prowlarr /var/lib/prowlarr
-
-	insinto /etc/logrotate.d
-	insopts -m0644 -o root -g root
-	newins "${FILESDIR}/prowlarr.logrotate" prowlarr
-
-	dodir  "/opt/prowlarr"
-	cp -R "${S}/." "${D}/opt/prowlarr" || die "Install failed!"
-
-	systemd_dounit "${FILESDIR}/prowlarr.service"
-	systemd_newunit "${FILESDIR}/prowlarr.service" "prowlarr@.service"
-}
diff --git a/www-apps/prowlarr-bin/prowlarr-bin-1.30.0.4920.ebuild b/www-apps/prowlarr-bin/prowlarr-bin-1.30.0.4920.ebuild
new file mode 100644
index 000000000000..aad41c803faf
--- /dev/null
+++ b/www-apps/prowlarr-bin/prowlarr-bin-1.30.0.4920.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="An indexer manager/proxy to integrate with your various PVR apps"
+HOMEPAGE="https://wiki.servarr.com/prowlarr/
+	https://github.com/Prowlarr/Prowlarr/"
+
+SRC_URI="
+	amd64? (
+		elibc_glibc? (
+			https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-x64.tar.gz
+		)
+		elibc_musl? (
+			https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-musl-core-x64.tar.gz
+		)
+	)
+	arm? (
+		elibc_glibc? (
+			https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-arm.tar.gz
+		)
+		elibc_musl? (
+			https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-musl-core-arm.tar.gz
+		)
+	)
+	arm64? (
+		elibc_glibc? (
+			https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-arm64.tar.gz
+		)
+		elibc_musl? (
+			https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-musl-core-arm64.tar.gz
+		)
+	)
+"
+S="${WORKDIR}/Prowlarr"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+RESTRICT="bindist strip test"
+
+RDEPEND="
+	acct-group/prowlarr
+	acct-user/prowlarr
+	dev-libs/icu
+	dev-util/lttng-ust:0
+	dev-db/sqlite
+"
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	default
+
+	# https://github.com/dotnet/runtime/issues/57784
+	rm libcoreclrtraceptprovider.so Prowlarr.Update/libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}/prowlarr.init" prowlarr
+
+	keepdir /var/lib/prowlarr
+	fowners -R prowlarr:prowlarr /var/lib/prowlarr
+
+	insinto /etc/logrotate.d
+	insopts -m0644 -o root -g root
+	newins "${FILESDIR}/prowlarr.logrotate" prowlarr
+
+	dodir  "/opt/prowlarr"
+	cp -R "${S}/." "${D}/opt/prowlarr" || die "Install failed!"
+
+	systemd_dounit "${FILESDIR}/prowlarr.service"
+	systemd_newunit "${FILESDIR}/prowlarr.service" "prowlarr@.service"
+}
diff --git a/www-apps/radarr-bin/Manifest b/www-apps/radarr-bin/Manifest
index 2bfaafcfbcdf..5a5c42231d03 100644
--- a/www-apps/radarr-bin/Manifest
+++ b/www-apps/radarr-bin/Manifest
@@ -1,6 +1,6 @@
-DIST Radarr.develop.5.17.1.9561.linux-core-arm.tar.gz 99961325 BLAKE2B 6d25cdc96f0353a5452836b59958b8ba6e0757d721b6f4dc7ee8718cb0ce64aae6d1f3b2b4e8624f82ef4d2fdf3af9fe6ab79485ba28ec5b0c8afc92ab0e05ea SHA512 0d42bac6a3abd4a483d1fc3249cf7edd97bdacd2c3d9f33c93b790c150d5d8ccaf6bab5507dc356dc40f8325e07b6c9686e757f1f5021ac40388013b1d259950
-DIST Radarr.develop.5.17.1.9561.linux-core-arm64.tar.gz 99599159 BLAKE2B d780153852b0267c66a5c8968d3a1902ff2f54fbdbf1e16b1c41b807c104797284b0152ab4a49f437f5de3f5c2dc2ca1dbb7ddf4976ca93315473938ba91c1a5 SHA512 0c824307d3f387d978fca008f2e08968e91743ff1dd11fd974106c44755c05bf95f7ea5ae0742e117c052a9dae0aeaad255e03c1ec517af210e95fbe1bfed44a
-DIST Radarr.develop.5.17.1.9561.linux-core-x64.tar.gz 105583265 BLAKE2B 6c2f5ff5afb903aaa4b150682bc2f83324a4afedcfb2179336452cf69868147d177d92be254adfb46615fa470bb9ba45dd15e650f95e482cf3d7f965187e8852 SHA512 2839db78d2b2b89d26617aafff68b334243fe7b173e292321d93d0bdf9b98546a4e409375ac62822dd0daba57514885f167d23e5e115c37e752b0d6cf8b44e79
-DIST Radarr.develop.5.17.1.9561.linux-musl-core-arm.tar.gz 99999059 BLAKE2B 253b9512973a0ad3ca55f81dc58f000fd560ccd2a15f392bce18ab0b9eb6909c601f430cd877e89db78144fa6b88c74a216b84aa2b36b7bb712f8c7c18411eb8 SHA512 2d37fb2bed91807e2a710c7a44596c5f8fdbcc1e046edc5581fd478c4c428f05b3660678980d5725de1def2b68b000fbc39a4abc8a0977f2c52c99f2d5e8db63
-DIST Radarr.develop.5.17.1.9561.linux-musl-core-arm64.tar.gz 99660121 BLAKE2B 5dc9d8aa3916c346b854089fee50c03d27be44cc5af8e2087efe6a10e06062851442ec8dc64fa278dd6bc3ff14645ea546c26c5a4475c95095406c9140a701ff SHA512 0c00345e4994f339842d2b0bcb88eefaf57c8203db63074477a3a856b1cf53caa0ee4eb7f602f40c9f4c3fa95b95edb2b4abe97e5860e0cb689fe8218b743455
-DIST Radarr.develop.5.17.1.9561.linux-musl-core-x64.tar.gz 104656970 BLAKE2B c8842fb4cb7ed3de5de38ea450bc5fc50ba1156c6760bb66cdc45c50fb6d774f151c70ec803430751e0fa521265324d51e31d9a48c57c3dcd4d22bcd092e068c SHA512 452fa336143e7c4d2b6ed8de6a6de7a7310ad60135bed33a172d52266b8d4dd2a30c3c92af2cdddde5477207c1f110fce8bb23d04683ad73b756fb84dadfe07f
+DIST Radarr.develop.5.18.0.9595.linux-core-arm.tar.gz 99964146 BLAKE2B 5991ec8d61840cc227616fc7844efab3c983be8e142d314407c815522ecfadf315f0ab6d4fade1a411164b3a2031624944087b57a55a4d9c03fec6d63fc9dbf6 SHA512 2d264e81223cc79d4cba992a408ee1860e9c7dc06acb9309db6280c2e03e429a91a39447b56b86a50bd7598ae49136a1e3ca4a6b9dd8b311e5931fd699d07536
+DIST Radarr.develop.5.18.0.9595.linux-core-arm64.tar.gz 99604583 BLAKE2B 455931a8382a4124eb6f70c1f9b19bbea97c7ea7ebc2bb457223291928df7361a590f7bfa237cfce001cb25424a9660e5cea88ed563291ef9238d2982a932bd0 SHA512 b14eb20d0b7d57e1d73f198fd7b81dd354d45f1a122a3c81b386eeb84a6fbfdee3fb166c1d2fd5860639fe19c1c5d99e5d18fdffefa6508aedc966ef07e75b5d
+DIST Radarr.develop.5.18.0.9595.linux-core-x64.tar.gz 105585958 BLAKE2B 233a8402340e2bdd70ad1a9f9edcb7d7f09c87dd33430e0e31307396de8a3812ebc1303014fb86f8362a49d7fb017f3f48505e8466cbc1dbd8edd9ae7e3d21a6 SHA512 5aef8a7294f89b4d70275e5e5cadf653d289fe1b6f69aaca47008d43bb2fc78d3290074cdcef421103af7dcf08ce6d30b1a3108cca740ff2cd83ef413cdf44a1
+DIST Radarr.develop.5.18.0.9595.linux-musl-core-arm.tar.gz 99986085 BLAKE2B e1d19b3801ece2f516b90204710615b5cf14f4f2e9c9fca2360eec51fddbf3bd0c30126179dfb0991beab551e2d2a82abceb1f5300d52cf0a1e3aa88b4edd9f2 SHA512 5d4fa5fb46a59054c735bf07294cb0cb39466f985ca127237c49150a304c40ff947e44bade530980715a308387487ffff379593a7933b8a854aaf863b3a327be
+DIST Radarr.develop.5.18.0.9595.linux-musl-core-arm64.tar.gz 99665637 BLAKE2B fd564632fe80ddf3c0d4a0885cf13c8aeb13758623e5cfb01ded234fd8b7089108fa94e644a5a2b204a2b9838a427c42d9a0dea1af120d7d24161602362f2881 SHA512 054702ae028470e1c0ca257c2c1af8542e699df8909dc25def1b00e13e500c7c7cc13203caf2fa0d9f2d841c3f00274a8a4383f739c9f75932d9c396533384e2
+DIST Radarr.develop.5.18.0.9595.linux-musl-core-x64.tar.gz 104665272 BLAKE2B 1371046afadd1d9baaa83c5fdf2c8cf31c712992946d045622f54e5471c13d2aeed29af09f7c438b4fb6521127879c1b75ec873f0885bc2e775a6946a759b894 SHA512 97987d5521a5db23c17315f64c03ab7996f3f93fd51face1a77943bf5141a36aa52988fe1e53835c66bd98b769b11d15d7f4e2fef73ac17b994895753038c421
diff --git a/www-apps/radarr-bin/radarr-bin-5.17.1.9561.ebuild b/www-apps/radarr-bin/radarr-bin-5.17.1.9561.ebuild
deleted file mode 100644
index 644702692d02..000000000000
--- a/www-apps/radarr-bin/radarr-bin-5.17.1.9561.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 systemd
-
-DESCRIPTION="A fork of Sonarr to work with movies a la Couchpotato"
-HOMEPAGE="https://www.radarr.video/
-	https://github.com/Radarr/Radarr/"
-
-SRC_URI="
-	amd64? (
-		elibc_glibc? (
-			https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-core-x64.tar.gz
-		)
-		elibc_musl? (
-			https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-musl-core-x64.tar.gz
-		)
-	)
-	arm? (
-		elibc_glibc? (
-			https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-core-arm.tar.gz
-		)
-		elibc_musl? (
-			https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-musl-core-arm.tar.gz
-		)
-	)
-	arm64? (
-		elibc_glibc? (
-			https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-core-arm64.tar.gz
-		)
-		elibc_musl? (
-			https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-musl-core-arm64.tar.gz
-		)
-	)
-"
-S="${WORKDIR}/Radarr"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="bindist strip test"
-
-RDEPEND="
-	acct-group/radarr
-	acct-user/radarr
-	media-video/mediainfo
-	dev-libs/icu
-	dev-util/lttng-ust:0
-	dev-db/sqlite
-"
-
-QA_PREBUILT="*"
-
-src_prepare() {
-	default
-
-	# https://github.com/dotnet/runtime/issues/57784
-	rm libcoreclrtraceptprovider.so Radarr.Update/libcoreclrtraceptprovider.so || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}/radarr.init" radarr
-
-	keepdir /var/lib/radarr
-	fowners -R radarr:radarr /var/lib/radarr
-
-	insinto /etc/logrotate.d
-	insopts -m0644 -o root -g root
-	newins "${FILESDIR}/radarr.logrotate" radarr
-
-	dodir  "/opt/radarr"
-	cp -R "${S}/." "${D}/opt/radarr" || die "Install failed!"
-
-	systemd_dounit "${FILESDIR}/radarr.service"
-	systemd_newunit "${FILESDIR}/radarr.service" "radarr@.service"
-}
diff --git a/www-apps/radarr-bin/radarr-bin-5.18.0.9595.ebuild b/www-apps/radarr-bin/radarr-bin-5.18.0.9595.ebuild
new file mode 100644
index 000000000000..eec9a8823ec5
--- /dev/null
+++ b/www-apps/radarr-bin/radarr-bin-5.18.0.9595.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="A fork of Sonarr to work with movies a la Couchpotato"
+HOMEPAGE="https://www.radarr.video/
+	https://github.com/Radarr/Radarr/"
+
+SRC_URI="
+	amd64? (
+		elibc_glibc? (
+			https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-core-x64.tar.gz
+		)
+		elibc_musl? (
+			https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-musl-core-x64.tar.gz
+		)
+	)
+	arm? (
+		elibc_glibc? (
+			https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-core-arm.tar.gz
+		)
+		elibc_musl? (
+			https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-musl-core-arm.tar.gz
+		)
+	)
+	arm64? (
+		elibc_glibc? (
+			https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-core-arm64.tar.gz
+		)
+		elibc_musl? (
+			https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-musl-core-arm64.tar.gz
+		)
+	)
+"
+S="${WORKDIR}/Radarr"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="bindist strip test"
+
+RDEPEND="
+	acct-group/radarr
+	acct-user/radarr
+	media-video/mediainfo
+	dev-libs/icu
+	dev-util/lttng-ust:0
+	dev-db/sqlite
+"
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	default
+
+	# https://github.com/dotnet/runtime/issues/57784
+	rm libcoreclrtraceptprovider.so Radarr.Update/libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}/radarr.init" radarr
+
+	keepdir /var/lib/radarr
+	fowners -R radarr:radarr /var/lib/radarr
+
+	insinto /etc/logrotate.d
+	insopts -m0644 -o root -g root
+	newins "${FILESDIR}/radarr.logrotate" radarr
+
+	dodir  "/opt/radarr"
+	cp -R "${S}/." "${D}/opt/radarr" || die "Install failed!"
+
+	systemd_dounit "${FILESDIR}/radarr.service"
+	systemd_newunit "${FILESDIR}/radarr.service" "radarr@.service"
+}
diff --git a/www-apps/readarr-bin/Manifest b/www-apps/readarr-bin/Manifest
index 4bb6b3c618d9..21f743a6cff9 100644
--- a/www-apps/readarr-bin/Manifest
+++ b/www-apps/readarr-bin/Manifest
@@ -1,6 +1,6 @@
-DIST Readarr.develop.0.4.6.2711.linux-core-arm.tar.gz 88832627 BLAKE2B ed77177b213e780d431e13ae60d216cad5c14fa78691c405103b2192d9ec282d63ab233fa9262f9be7a7ac6a3578088dfa8fbc49aa627e35549f9993abc1f8de SHA512 930ac8285a8d51db71501915938995d791d39559c19c6b28d25d263b346c9feaf5785712e03a6a925228e3ece0728959842b0b81d65bbae6da828f6fdd15ec97
-DIST Readarr.develop.0.4.6.2711.linux-core-arm64.tar.gz 88081280 BLAKE2B 9131330cf1126a6f05188104b08d85bf36280a4bd802dea4e6b8f955195aca6f93b2a3eb04c2c1f34a1c67ee3ab2e4e90902c3a08481a63f1d1d157ae4acc7a9 SHA512 2b3806fe0ec6a11db8126504e2db0321dc9a942b166af5fea7c565f9a45a31cd924198f695ac3fc41f8cbaf027037c45f65e3e837ce011b25159b4bbbef93e92
-DIST Readarr.develop.0.4.6.2711.linux-core-x64.tar.gz 93078907 BLAKE2B f53f7c3d1b0eddc107772616b366d102c0269011e0abfb2cfdb99644bf59434a37e324d7e18bd80e4b0658dd752a87030cd600491aba007db862026ebf84544d SHA512 8d8e74ce08c645549ce10827413c325169dc0de07883ce484a097e476d04e44b85783f24658561d2f59d037e03c7c55e840523b07791fae0c885dd2d44587f3e
-DIST Readarr.develop.0.4.6.2711.linux-musl-core-arm.tar.gz 88845868 BLAKE2B c35e0cf3251d7e5e3ccdbd5daeab657a157ea5e1e38434553ef407b4f462b911bcf8eca5199837a2c004f0d9e4db463b6fafb8bbe3fa5b92772af9f1dd023829 SHA512 23626ca2a9fa383313fef0d2a74fa9966c5b2c7f0d37e4941d29f7c96d114a4dbb90d1233e8ea5262c7853a0a274c84c8dae9a130b27fc13c70b1b01bbe08bad
-DIST Readarr.develop.0.4.6.2711.linux-musl-core-arm64.tar.gz 88148273 BLAKE2B e4d2010df6c5fad8f0fb943554ae34e18ac3396fa18c486342bb8a5f82a1974e1c3d8630232f6d911670ed19a33bfc17000f0e1282476794439c4cb2286fa473 SHA512 ff613fc7c0baea3ebfd499bab302131f053fe3454c7a1bcc8a2c47c573edc9179190cb8719a8c59afd60154a820771aed0c4ff9742be8f8f07096254f5c62059
-DIST Readarr.develop.0.4.6.2711.linux-musl-core-x64.tar.gz 92148971 BLAKE2B 18645d4b4979fca936fa7b5401cc2fc6b2c8b85c8f8d03a75ac6236bf8441369799847746bffafc103e1cb59a22860f0297e604b0aa1a840dd5fab7480699dde SHA512 972113c174f9dbb22b7aa6993850deb29d8613b19e8f05b99786cd16e12e1d885df5b8a809d371abcf2f1d70ba0fc057e7c80b53644e5e37b3ace99c16e08d2c
+DIST Readarr.develop.0.4.8.2726.linux-core-arm.tar.gz 93102920 BLAKE2B 7b29e92bd245fdfad484fa54331bfb012a2bd9a1c1ea3f2ff1265ef5f76f129b87b41050ee17019826f18ff0b187fbf65ed5b1be498129a15c38a63af3c64a70 SHA512 00509e0f838d71dbeaabe93b08a869c9c7db971922fec4b07e90ae2443a2f2092c360e1aa1b71f0fff588c03eb3a209c7054f75b7ad7c0d4720b39d006bca705
+DIST Readarr.develop.0.4.8.2726.linux-core-arm64.tar.gz 92367481 BLAKE2B 43cb5bb3d82f7af1d98b00f601eefd650d89316099e3ddf01a04ffc8f556e875f2457446306ec461ef3232f6808d6b898886659daacafbc1ebc0d64df4819c81 SHA512 dc04291bb59d908c2f6214852c40c9bd9b8a684774c23f6261ac9fa8db04a88b9d01cdeae3a876bb696747baa5f0c32fae5356d8043232a87176f01fea8a6813
+DIST Readarr.develop.0.4.8.2726.linux-core-x64.tar.gz 97363972 BLAKE2B a1ffe8143e5eb2ff84be20dfe29cd4354acc07595849c3efac2e6e1f489f9b2424036c2772f5e7a10558edd6d683e8fd118ed52fb088190335941580d57da7a8 SHA512 3b7205380dfeb2f6025a7fd7bb6c287edd9bd862399e8bb3e2ce8847ef55e588d587f2f54324c113fb6cf33937cbbf8c6828d62d4d1c2b4f032a196e29ab80b1
+DIST Readarr.develop.0.4.8.2726.linux-musl-core-arm.tar.gz 93133800 BLAKE2B 51bb83387fd9755a2c3c9fda9374e1f1c387213fd6e85b805eec4e7a82e774f876273c243bdd05ff8172bbde5c9a166d0b7ff2e4a52534066a6b0e8e8f110dbf SHA512 41402bb38166805620c356e9d430f0cec76b66f3467df9fb23d07f3a56e65a6c1c02c7263820bc653b6e3b80bf76091c1bf239bd613c8fd373c9512c76186a31
+DIST Readarr.develop.0.4.8.2726.linux-musl-core-arm64.tar.gz 92427257 BLAKE2B 665124bc46275a51bec09099dc105bd59c53c51b9eaa77615c61c0f00c40d671b7575925bb2e0ebe6c3e73e5da87b6e79b6a05f73c20f5c030e17372b6c07c0f SHA512 479131564b6dfc4762d242ebd239a4ec19b7244e2883b87970b6b4ed98a478ea16491013f4297552df3db684dd04f17eee0e924e9c017baf0f7645136d87d685
+DIST Readarr.develop.0.4.8.2726.linux-musl-core-x64.tar.gz 96430790 BLAKE2B 9a5a8264a6256e0671013b9a89271a577984d0bd1ba66739a5809ed7ab5612943037715da2e596cc82765e90cfa1a7505802bc82a69236df18946e3665a0961b SHA512 80d0b7b5f5b10a9db2b9840f26b0117670a498e9fc8ad06c5588904b11a79949c27cc044f0fb58b1fa11c4bc7212a2afce398534a65896712d2abb3a6759d7ae
diff --git a/www-apps/readarr-bin/readarr-bin-0.4.6.2711.ebuild b/www-apps/readarr-bin/readarr-bin-0.4.6.2711.ebuild
deleted file mode 100644
index 5ef7e008750e..000000000000
--- a/www-apps/readarr-bin/readarr-bin-0.4.6.2711.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="An ebook and audiobook collection manager for Usenet and BitTorrent users"
-HOMEPAGE="https://readarr.com/
-	https://github.com/Readarr/Readarr/"
-
-SRC_URI="
-	amd64? (
-		elibc_glibc? (
-			https://github.com/Readarr/Readarr/releases/download/v${PV}/Readarr.develop.${PV}.linux-core-x64.tar.gz
-		)
-		elibc_musl? (
-			https://github.com/Readarr/Readarr/releases/download/v${PV}/Readarr.develop.${PV}.linux-musl-core-x64.tar.gz
-		)
-	)
-	arm? (
-		elibc_glibc? (
-			https://github.com/Readarr/Readarr/releases/download/v${PV}/Readarr.develop.${PV}.linux-core-arm.tar.gz
-		)
-		elibc_musl? (
-			https://github.com/Readarr/Readarr/releases/download/v${PV}/Readarr.develop.${PV}.linux-musl-core-arm.tar.gz
-		)
-	)
-	arm64? (
-		elibc_glibc? (
-			https://github.com/Readarr/Readarr/releases/download/v${PV}/Readarr.develop.${PV}.linux-core-arm64.tar.gz
-		)
-		elibc_musl? (
-			https://github.com/Readarr/Readarr/releases/download/v${PV}/Readarr.develop.${PV}.linux-musl-core-arm64.tar.gz
-		)
-	)
-"
-S="${WORKDIR}/Readarr"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="bindist strip test"
-
-RDEPEND="
-	acct-group/readarr
-	acct-user/readarr
-	dev-libs/icu
-	dev-util/lttng-ust:0
-	dev-db/sqlite
-"
-
-QA_PREBUILT="*"
-
-src_prepare() {
-	default
-
-	# https://github.com/dotnet/runtime/issues/57784
-	rm libcoreclrtraceptprovider.so Readarr.Update/libcoreclrtraceptprovider.so || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}/readarr.init" readarr
-
-	keepdir /var/lib/readarr
-	fowners -R readarr:readarr /var/lib/readarr
-
-	insinto /etc/logrotate.d
-	insopts -m0644 -o root -g root
-	newins "${FILESDIR}/readarr.logrotate" readarr
-
-	dodir  "/opt/readarr"
-	cp -R "${S}/." "${D}/opt/readarr" || die "Install failed!"
-
-	systemd_dounit "${FILESDIR}/readarr.service"
-	systemd_newunit "${FILESDIR}/readarr.service" "readarr@.service"
-}
diff --git a/www-apps/readarr-bin/readarr-bin-0.4.8.2726.ebuild b/www-apps/readarr-bin/readarr-bin-0.4.8.2726.ebuild
new file mode 100644
index 000000000000..c7b3e4d7b3bd
--- /dev/null
+++ b/www-apps/readarr-bin/readarr-bin-0.4.8.2726.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="An ebook and audiobook collection manager for Usenet and BitTorrent users"
+HOMEPAGE="https://readarr.com/
+	https://github.com/Readarr/Readarr/"
+
+SRC_URI="
+	amd64? (
+		elibc_glibc? (
+			https://github.com/Readarr/Readarr/releases/download/v${PV}/Readarr.develop.${PV}.linux-core-x64.tar.gz
+		)
+		elibc_musl? (
+			https://github.com/Readarr/Readarr/releases/download/v${PV}/Readarr.develop.${PV}.linux-musl-core-x64.tar.gz
+		)
+	)
+	arm? (
+		elibc_glibc? (
+			https://github.com/Readarr/Readarr/releases/download/v${PV}/Readarr.develop.${PV}.linux-core-arm.tar.gz
+		)
+		elibc_musl? (
+			https://github.com/Readarr/Readarr/releases/download/v${PV}/Readarr.develop.${PV}.linux-musl-core-arm.tar.gz
+		)
+	)
+	arm64? (
+		elibc_glibc? (
+			https://github.com/Readarr/Readarr/releases/download/v${PV}/Readarr.develop.${PV}.linux-core-arm64.tar.gz
+		)
+		elibc_musl? (
+			https://github.com/Readarr/Readarr/releases/download/v${PV}/Readarr.develop.${PV}.linux-musl-core-arm64.tar.gz
+		)
+	)
+"
+S="${WORKDIR}/Readarr"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="bindist strip test"
+
+RDEPEND="
+	acct-group/readarr
+	acct-user/readarr
+	dev-libs/icu
+	dev-util/lttng-ust:0
+	dev-db/sqlite
+"
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	default
+
+	# https://github.com/dotnet/runtime/issues/57784
+	rm libcoreclrtraceptprovider.so Readarr.Update/libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}/readarr.init" readarr
+
+	keepdir /var/lib/readarr
+	fowners -R readarr:readarr /var/lib/readarr
+
+	insinto /etc/logrotate.d
+	insopts -m0644 -o root -g root
+	newins "${FILESDIR}/readarr.logrotate" readarr
+
+	dodir  "/opt/readarr"
+	cp -R "${S}/." "${D}/opt/readarr" || die "Install failed!"
+
+	systemd_dounit "${FILESDIR}/readarr.service"
+	systemd_newunit "${FILESDIR}/readarr.service" "readarr@.service"
+}
diff --git a/www-apps/rutorrent/Manifest b/www-apps/rutorrent/Manifest
index 72281f4c2ccb..8146444678d9 100644
--- a/www-apps/rutorrent/Manifest
+++ b/www-apps/rutorrent/Manifest
@@ -1,2 +1,2 @@
 DIST rutorrent-4.3.10.tar.gz 2378291 BLAKE2B 2e676024e4b8fdec2a3e8b52715348dc7f4ae38adbdffb69e4f22b711d02eb49ce4de30e5e30e6a620819c39a6576c14b4fade6bc3b52a9212f1a96b23d96b99 SHA512 34a8f4b0bca721deb1d1fd017eed3cc722a785acafe2ca99ee56691028fce1fd92d069f69e2a4be18bef059c4c3f8a9d5eea54b86b9f6ed81401526337d7c856
-DIST rutorrent-5.1.4.tar.gz 2694610 BLAKE2B aa02dc87dc4f228aa4ac24f7dea8d5c80500d275b8a60f29bea8098a784c413eac8b902d55395dfc51d83f6c0634dcf61e0c69a86732f69d30cde55135896b0d SHA512 fc318ece9199d203589cb28d0cf4565b7ce2288d00862c61d1ddcc713a77cc0682f446c983a81f59029c61ce09c5811871854a9c017864a657c9a4a27d039919
+DIST rutorrent-5.1.5.tar.gz 2694615 BLAKE2B 4cc69e83edf84dfc2a510949c62c1943ceddfecb224bc9647a1262ce09d27a70671c5493898b05b237108eec7f1cc8689f66276a535e42d90e7bb48d97607fed SHA512 f2178a6310d7b5cde2f3aa7c5650359002d8186db54a562b5a5161ef9253a429ef5e75c5968c6112f652240e13f65dd9d8dda94e3356bfa8987eb6e6c95c54d9
diff --git a/www-apps/rutorrent/rutorrent-5.1.4.ebuild b/www-apps/rutorrent/rutorrent-5.1.4.ebuild
deleted file mode 100644
index 97453fadf5c8..000000000000
--- a/www-apps/rutorrent/rutorrent-5.1.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit webapp optfeature
-
-DESCRIPTION="ruTorrent is a front-end for the popular Bittorrent client rTorrent"
-HOMEPAGE="https://github.com/Novik/ruTorrent"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Novik/ruTorrent.git"
-else
-	SRC_URI="https://github.com/Novik/ruTorrent/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
-	S="${WORKDIR}/ruTorrent-${PV}"
-fi
-
-LICENSE="GPL-2+ MIT"
-
-RDEPEND="
-	dev-lang/php[xml,gd]
-	virtual/httpd-php
-"
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	rm -r .github || die
-	find . \( -name .gitignore -o -name .gitmodules \) -type f -delete || die
-	if [[ ${PV} == 9999 ]]; then
-		rm -r .git .gitattributes || die
-	fi
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	# can not use fperms beacuse of globbing
-	chmod +x "${ED}${MY_HTDOCSDIR}"/plugins/*/*.sh \
-		"${ED}${MY_HTDOCSDIR}"/php/test.sh || die "chmod failed"
-
-	keepdir "${MY_HTDOCSDIR}"/conf/users
-	keepdir "${MY_HTDOCSDIR}"/share/settings
-	keepdir "${MY_HTDOCSDIR}"/share/torrents
-	keepdir "${MY_HTDOCSDIR}"/share/users
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/conf
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/share
-
-	webapp_configfile "${MY_HTDOCSDIR}"/conf/.htaccess
-	webapp_configfile "${MY_HTDOCSDIR}"/conf/config.php
-	webapp_configfile "${MY_HTDOCSDIR}"/conf/access.ini
-	webapp_configfile "${MY_HTDOCSDIR}"/conf/plugins.ini
-	webapp_configfile "${MY_HTDOCSDIR}"/share/.htaccess
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	optfeature "Show audio file spectogram" media-sound/sox
-	optfeature "Display media file information" media-video/mediainfo
-	optfeature "Scrape Cloudflare based sites" dev-python/cloudscraper
-}
diff --git a/www-apps/rutorrent/rutorrent-5.1.5.ebuild b/www-apps/rutorrent/rutorrent-5.1.5.ebuild
new file mode 100644
index 000000000000..4d1d469d1e5c
--- /dev/null
+++ b/www-apps/rutorrent/rutorrent-5.1.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp optfeature
+
+DESCRIPTION="ruTorrent is a front-end for the popular Bittorrent client rTorrent"
+HOMEPAGE="https://github.com/Novik/ruTorrent"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Novik/ruTorrent.git"
+else
+	SRC_URI="https://github.com/Novik/ruTorrent/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+	S="${WORKDIR}/ruTorrent-${PV}"
+fi
+
+LICENSE="GPL-2+ MIT"
+
+RDEPEND="
+	dev-lang/php[xml,gd]
+	virtual/httpd-php
+"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	rm -r .github || die
+	find . \( -name .gitignore -o -name .gitmodules \) -type f -delete || die
+	if [[ ${PV} == 9999 ]]; then
+		rm -r .git .gitattributes || die
+	fi
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# can not use fperms beacuse of globbing
+	chmod +x "${ED}${MY_HTDOCSDIR}"/plugins/*/*.sh \
+		"${ED}${MY_HTDOCSDIR}"/php/test.sh || die "chmod failed"
+
+	keepdir "${MY_HTDOCSDIR}"/conf/users
+	keepdir "${MY_HTDOCSDIR}"/share/settings
+	keepdir "${MY_HTDOCSDIR}"/share/torrents
+	keepdir "${MY_HTDOCSDIR}"/share/users
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/conf
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/share
+
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/.htaccess
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/access.ini
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/plugins.ini
+	webapp_configfile "${MY_HTDOCSDIR}"/share/.htaccess
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	optfeature "Show audio file spectogram" media-sound/sox
+	optfeature "Display media file information" media-video/mediainfo
+	optfeature "Scrape Cloudflare based sites" dev-python/cloudscraper
+}
diff --git a/www-apps/sonarr-bin/Manifest b/www-apps/sonarr-bin/Manifest
index 27194926181d..accab1ffff1c 100644
--- a/www-apps/sonarr-bin/Manifest
+++ b/www-apps/sonarr-bin/Manifest
@@ -1,5 +1,5 @@
-DIST Sonarr.develop.4.0.11.2815.linux-arm.tar.gz 98696223 BLAKE2B c80c88a249d735990e5a0424cf0cd58723a466414bc7a775afd7c266919cf93b33cae3ad66d3dee76e5bb21e1b2c40608be7054c35f74cf9ee263c009cf112ef SHA512 b71cbb27465f82ca3a06e8ec8f90ce07a83f5e98d3d02479063897c28efe213ca602c17c91e5f781eade59e1a27142081781340b4a31f3293fe20274c7b53ff6
-DIST Sonarr.develop.4.0.11.2815.linux-arm64.tar.gz 98435341 BLAKE2B 86b624cb75c7970c30b52106f02f35e871ea24a906831b2d6ab40b03def8c762d684f388059fac1c82183b5a9dc6196adf543da23b1260f9deed4899548f5888 SHA512 a06590a438c67d70f3f3f5142ef32479e127fc9a4bdb35ca0b11cc51d52621ae5d535eab7f4ac9da31c56d6e0f97b16c18edd79c14bcec29ac0a0b83141ab8d2
-DIST Sonarr.develop.4.0.11.2815.linux-musl-arm64.tar.gz 98506703 BLAKE2B 4a1781070ea9e8d163efa4eb2f9bd6b090fa6f02169c1c138d1388bf226080ded1a3bcb334a09971fa460df238608564f2eb6bc383153fb4fef09b6aa98798f3 SHA512 8dd9d4ef394dc8db55512267fe32cf9ddff6ce34d66e8f076bb9b48de94efabe8110606c5c022b342ead42e7aea9f47e85d8ff3674025150675b2b85371d3cdd
-DIST Sonarr.develop.4.0.11.2815.linux-musl-x64.tar.gz 103434675 BLAKE2B f58c400aafbc59f0d9d502760dfacaf0d2c6acccbdf7978c97a6e6c33227b0eb28129028e5651be2986880e5322e5de20d093c3ee9067dca2fc86efa7b2b9adc SHA512 0fa38cde852a0bab55621a072fd2ee3008e6ea29574dda6f794d6731948096487684ed0970a9ab2c2b5eb858f0d44b3ddced23162124f12a18e690e78a7fd2ac
-DIST Sonarr.develop.4.0.11.2815.linux-x64.tar.gz 104360586 BLAKE2B 94703ab9c65f5bd4d1fa49afa81ea2f8c1a700b89465106cd448529b353144cf4ef476743a227d51d4d50f1c428d9828bb66002b0105377056fa62b5b6129922 SHA512 18b5fbe9029ec459000a6e90c0d4d7567a0dec97ebcbbbaa79c16bdd177a6942a6ecdbb75eb1cdbcb36d2cf3de4a19b1e405c9a70776db1f7c14d5a9793c03b1
+DIST Sonarr.develop.4.0.12.2849.linux-arm.tar.gz 98705366 BLAKE2B 6afe282ee9e1d797cdd523be1d048369533e3fd70c5ed6ed0b27e9dbf5b7dd89a8e844cdd4bc1f6e9eaa481107279d1d572c974fb657f33c1ac0a80b2eadac9d SHA512 dc741618b134905f0964a37d5f30c289944283abfdeabe8814ca7eecf814855db1994c513a42360fe58e18f091b12b28353dd06ce2233682fcb73300cb665b51
+DIST Sonarr.develop.4.0.12.2849.linux-arm64.tar.gz 98452158 BLAKE2B 4ba6fa137cc9b158706a7437bd7abc79e64560949a8ab47feb5ee2a943ec3f3b41d53630d3dd9a5046b6edf58875b487995747985eafd8723693d433734539d6 SHA512 d2630abc0901d410f7ae06fb0be070dc34a6651643596178b4964a1bb87b2da69429bae3376d1840a84d02bd0b4e336a2f2eb3c4cc3e0bf7f95df98c2c713f6d
+DIST Sonarr.develop.4.0.12.2849.linux-musl-arm64.tar.gz 98498718 BLAKE2B 07a9c4471c254898130d8dd30655cde6531f2d3bc1e5b52deeb50273b2216b74a469e8bb8046594bb1c0b2477f9f1c31b3c440382df6e8122a70412107d2f78b SHA512 413a03d17167e849ce67af6274704dfa3ac610ff761dfc802167f246e9f5d5b403c47079710d15d3418ea5f964248321fc183ed26fbe0d4e5a5281c90da1d199
+DIST Sonarr.develop.4.0.12.2849.linux-musl-x64.tar.gz 103437298 BLAKE2B 83cc313df23c7a4761a12aa8d2a0f2860841415687281ec7ef2bca0606f44f1aa62591dac8c580dfe170ee1202b986e240d79e3fb2263d23b8b2bf83bd72ebd2 SHA512 7bb2dcb1c3482c2783d313752bc8a5528aed9a053f53d2ad2cbe8d1ed7a3cca29a6e3e295fb2292f353de34763be74153b78773dee9a29cb4455017e46d4dd8a
+DIST Sonarr.develop.4.0.12.2849.linux-x64.tar.gz 104368346 BLAKE2B 20c18c1bffbf563e678f2c6e8743628e05bbce1a54f60a3d702dd31ed3b38a6ee9044788f875517f7b46c6e02d34041212e58326cddf6c365afb79d7235643e9 SHA512 258739d7c1aebd4d29ec48f066b7bd2d7b8430ed27b4225bcc2690aaabe856276ef2de69ce621d6ae78beb493fb99038132f51ff8bf1fb0f244505867ba9c7d3
diff --git a/www-apps/sonarr-bin/sonarr-bin-4.0.11.2815.ebuild b/www-apps/sonarr-bin/sonarr-bin-4.0.11.2815.ebuild
deleted file mode 100644
index f10489599d33..000000000000
--- a/www-apps/sonarr-bin/sonarr-bin-4.0.11.2815.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 systemd
-
-DESCRIPTION="Sonarr is a Smart PVR for newsgroup and bittorrent users"
-HOMEPAGE="https://www.sonarr.tv"
-
-SRC_URI="
-	amd64? (
-		elibc_glibc? (
-			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.develop.${PV}.linux-x64.tar.gz
-		)
-		elibc_musl? (
-			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.develop.${PV}.linux-musl-x64.tar.gz
-		)
-	)
-	arm? (
-		elibc_glibc? (
-			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.develop.${PV}.linux-arm.tar.gz
-		)
-	)
-	arm64? (
-		elibc_glibc? (
-			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.develop.${PV}.linux-arm64.tar.gz
-		)
-		elibc_musl? (
-			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.develop.${PV}.linux-musl-arm64.tar.gz
-		)
-	)
-"
-S="${WORKDIR}/Sonarr"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="bindist strip test"
-
-RDEPEND="
-	acct-group/sonarr
-	acct-user/sonarr
-	media-video/mediainfo
-	dev-libs/icu
-	dev-util/lttng-ust:0
-	dev-db/sqlite
-"
-
-QA_PREBUILT="*"
-
-src_prepare() {
-	default
-
-	# https://github.com/dotnet/runtime/issues/57784
-	rm libcoreclrtraceptprovider.so Sonarr.Update/libcoreclrtraceptprovider.so || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}/sonarr.init-r2" sonarr
-
-	keepdir /var/lib/sonarr
-	fowners -R sonarr:sonarr /var/lib/sonarr
-
-	insinto /etc/logrotate.d
-	insopts -m0644 -o root -g root
-	newins "${FILESDIR}/sonarr.logrotate" sonarr
-
-	dodir  "/opt/sonarr"
-	cp -R "${S}/." "${D}/opt/sonarr" || die "Install failed!"
-
-	systemd_newunit "${FILESDIR}/sonarr.service-r1" "sonarr.service"
-	systemd_newunit "${FILESDIR}/sonarr.service-r1" "sonarr@.service"
-}
diff --git a/www-apps/sonarr-bin/sonarr-bin-4.0.12.2849.ebuild b/www-apps/sonarr-bin/sonarr-bin-4.0.12.2849.ebuild
new file mode 100644
index 000000000000..26a3f8494331
--- /dev/null
+++ b/www-apps/sonarr-bin/sonarr-bin-4.0.12.2849.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Sonarr is a Smart PVR for newsgroup and bittorrent users"
+HOMEPAGE="https://www.sonarr.tv"
+
+SRC_URI="
+	amd64? (
+		elibc_glibc? (
+			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.develop.${PV}.linux-x64.tar.gz
+		)
+		elibc_musl? (
+			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.develop.${PV}.linux-musl-x64.tar.gz
+		)
+	)
+	arm? (
+		elibc_glibc? (
+			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.develop.${PV}.linux-arm.tar.gz
+		)
+	)
+	arm64? (
+		elibc_glibc? (
+			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.develop.${PV}.linux-arm64.tar.gz
+		)
+		elibc_musl? (
+			https://github.com/Sonarr/Sonarr/releases/download/v${PV}/Sonarr.develop.${PV}.linux-musl-arm64.tar.gz
+		)
+	)
+"
+S="${WORKDIR}/Sonarr"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="bindist strip test"
+
+RDEPEND="
+	acct-group/sonarr
+	acct-user/sonarr
+	media-video/mediainfo
+	dev-libs/icu
+	dev-util/lttng-ust:0
+	dev-db/sqlite
+"
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	default
+
+	# https://github.com/dotnet/runtime/issues/57784
+	rm libcoreclrtraceptprovider.so Sonarr.Update/libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}/sonarr.init-r2" sonarr
+
+	keepdir /var/lib/sonarr
+	fowners -R sonarr:sonarr /var/lib/sonarr
+
+	insinto /etc/logrotate.d
+	insopts -m0644 -o root -g root
+	newins "${FILESDIR}/sonarr.logrotate" sonarr
+
+	dodir  "/opt/sonarr"
+	cp -R "${S}/." "${D}/opt/sonarr" || die "Install failed!"
+
+	systemd_newunit "${FILESDIR}/sonarr.service-r1" "sonarr.service"
+	systemd_newunit "${FILESDIR}/sonarr.service-r1" "sonarr@.service"
+}
diff --git a/www-apps/zeppelin-bin/Manifest b/www-apps/zeppelin-bin/Manifest
index e2f5278acf53..613a4059d00d 100644
--- a/www-apps/zeppelin-bin/Manifest
+++ b/www-apps/zeppelin-bin/Manifest
@@ -1,3 +1,2 @@
-DIST zeppelin-bin-0.10.1.tgz 1680577910 BLAKE2B db33bd78f760211629a9ceb99b80d660a8d9d4da73ff2b187fdcab73c7f59052f952ac2bba2b85619c425b4da8f74a3b38229de034523bb8366d00cfcbf56549 SHA512 94cc52d3121afecfd12e1061bb6f4e7e227629236e4374d2fad1e49403a52b31afc3ff888834216e5f3bd9b95324ac6e586da4131712b84aefac0a01839404aa
 DIST zeppelin-bin-0.11.2.tgz 887248195 BLAKE2B 25e5d7813521f05d20867999f8670dac82684bb208df8206d8faea286afcbbb7bf98e4eb4892bf38cf7fa1cc63670c28975dd5bf9ed728ba8799fe3e83c88a5d SHA512 c83579a26bc958638c135f9e9e96670dde0f5c86e9599666e214024a03461ca5a829598937365cd7b2d689e0a5ef85fc9439bf73286d56e2b7b2ef2744c6f418
 DIST zeppelin-bin-0.11.2.tgz.asc 833 BLAKE2B d0bb311205058a2d411c986b66e5c762b50e5f3db87770ceb43285765228b65b74138a5b18eb7b4dd8524313f7e161c2157ec79462f201af045bde3ed3cafe62 SHA512 030d855f2f3127d1dc085fb84b980c382bb44deb8bf8194b4dda5e281f9ceb1be4232e0d7a166341b96996a16445ab10a423bd3593e256c9e54308612d79b759
diff --git a/www-apps/zeppelin-bin/zeppelin-bin-0.10.1.ebuild b/www-apps/zeppelin-bin/zeppelin-bin-0.10.1.ebuild
deleted file mode 100644
index f6142e3c74e3..000000000000
--- a/www-apps/zeppelin-bin/zeppelin-bin-0.10.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PN="zeppelin"
-MY_P="${MY_PN}-${PV}-bin-all"
-
-DESCRIPTION="Web-based interactive data analytics notebook launcher"
-HOMEPAGE="https://zeppelin.apache.org"
-SRC_URI="mirror://apache/zeppelin/${MY_PN}-${PV}/${MY_P}.tgz -> ${P}.tgz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	acct-group/zeppelin
-	acct-user/zeppelin
-	>=virtual/jdk-1.8"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-INSTALL_DIR="/opt/${P}"
-
-src_prepare() {
-	default
-	local SO_TO_DELETE=(
-		interpreter/sh/libpty/freebsd/x86/libpty.so
-		interpreter/sh/libpty/freebsd/x86_64/libpty.so
-		interpreter/sh/libpty/linux/ppc64le/libpty.so
-	)
-
-	for s in "${SO_TO_DELETE[@]}"; do
-		rm -v ${s} || die
-	done
-}
-
-src_install() {
-	keepdir /var/log/zeppelin
-	fowners -R zeppelin:zeppelin /var/log/zeppelin
-
-	newinitd "${FILESDIR}/zeppelin.init.d" zeppelin
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP * "${ED}/${INSTALL_DIR}" || die
-	dosym "${P}" /opt/zeppelin
-	fowners -R zeppelin:zeppelin "${INSTALL_DIR}"
-}
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 6bcb18cc8481..c0ea779dab73 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,21 +1,15 @@
-DIST chromium-130.0.6723.116-gentoo.tar.xz 4699442864 BLAKE2B 571a012f449b757b6a17309cedb3c5cc7da73dc24b1e352554ab14ded9761ce29c62531e9fcb6c0a2290f89bff0e81f4d2cf39f0984bc5c7fc5e9be8c37bcb59 SHA512 e54beef2b445375cba0b1a290a99f7b41b2b9b965c89c0bb062c99be0825ccf64259440bd2b032bb5b1e46eef15b4a4f66fdaeb9974fcfe6f70d55a49ca47850
-DIST chromium-130.0.6723.116-testdata-gentoo.tar.xz 83048 BLAKE2B d95970073cedb9dd5488886c94c0b629a0a15f248e66a409b57be89b52eececf845c3d79f6bde51f4476e927a058ee257bb6d1b3ca0332910660a6e045ccb00d SHA512 0df42b1e8a3c0be8a07d71153a8bc5fdfc59a18d574d8dfd2fd1a3e17ca197e71dfd332c02547e6b456b5037c924dbbecc4551ac1695f36181e3a9cc884ff83b
-DIST chromium-131.0.6778.139-linux-testdata.tar.xz 279152856 BLAKE2B 41f96d726ed0be06735d78f8430031b083e46652a3f94e7ef664502564f850975e3a8755963ee61458d47d779a9676452216322026cd891ae0eb85f664e9bd87 SHA512 99b4b08948ad5dcb9ed931b7b7019bcd015dbdc2bd420be1383d662a179c61e260ff94b7038f2f7a086a91bf2f733d973c2f1b45581f883da877946123b7e096
-DIST chromium-131.0.6778.139-linux.tar.xz 2189495224 BLAKE2B 5e32ffa9de17df58b4017c90dd19b9cf1699c94f2ea1f38890821ef4bc3ed5c558c31cb0d57fb5b00c9bede6a953efc553fd8efa14354fd2314ca6e79bdac27e SHA512 b5aa8045edf483c9c53fe9fc253cd6f62ebef51f2b9dc9d59c225705d68ae7fdd88870fac5162ca7d9d9c4e0e778cdf27e4f9bd93bed8c059e0d1eab5ccac767
-DIST chromium-131.0.6778.204-linux-testdata.tar.xz 279220900 BLAKE2B ab46bc825ba4d70696bf4441b22d36d45fb4c492ff234ccd0e26d66f9cc3790634f72dfcd81db299f0e0f77bc209ab24057a29e9937a8aefdca5109cce064eae SHA512 a7d97e216c1cc1f4145912b94b85a1c80ee57504b6792f0399ca5bff6494fc24c9cc846179de313f876d04e864ff79465df84997649c7d26d55b9d2848cb31f3
-DIST chromium-131.0.6778.204-linux.tar.xz 2189629432 BLAKE2B 35a254700ff906e5f94b07ee4d577e1e4d356ee35972d03dc7c5cfd282e8e2400bd35548ad0bd1619654634abcaffed83d8bc1267727afee0a4294d1fbb3db77 SHA512 86f9fadfc8f2b46c16783767fd10e84129a65d3d7aa22e40d8adb8125e6b1e30f4fbf32d46d482f12999ab6e3fc5a47938921a7ccc77a43a1112003d8805c823
-DIST chromium-132.0.6834.46-linux-testdata.tar.xz 299805496 BLAKE2B e3a5ca8fe2d557ac4f2b731b30c9fbb781e362d5f62d09e93bb4c899f07a841be5467cacfc6c690fac599d9bbc4057e99a03702925fb62fffc206a57781cbb18 SHA512 0ff0cb4d5ce75b63583d003c6a6d9fca895cdeec7e67c65a75ff4468628fc5ffbacdbf9df250bb8a66419205c5ad1933f0f228e821d019d35973ce6ad3ca2b92
-DIST chromium-132.0.6834.46-linux.tar.xz 2193310724 BLAKE2B edacfec054f9ebc51fed26aa20222f6a9c61f0c503484cbef4081d819d110465f661ae1fc18bb4cd0223ed7917a4d191af6cc8f32c8d0ff65e750408b62f5dd8 SHA512 2c161b71ce988d864ea5353221fc1b8eefbf8b26dc4e31c8312574b749e44d07a80f52fea18bf5c9e9f08c90fe724fb20c97963472883fb8a3b49482874878b8
-DIST chromium-132.0.6834.57-linux-testdata.tar.xz 299792072 BLAKE2B bd48dc8a5cbe8286e01a9155c76ed0e4f2ec127bee21500410c5a7cfbdf403abb22ffd76ca03ba3b5ba2d4cc7721d776669cce136ce0576be68aaa8b7b665ef8 SHA512 2276fc6fcca05c17ccbe4af9972615924372a79f70145c274d63b126daf4e14900a5d6c178673512710374e7ed188cb3c46782825e969381719373144539a129
-DIST chromium-132.0.6834.57-linux.tar.xz 2193464100 BLAKE2B 9720b6ec8fa8566e19155527d6f55c9dbd48c7e1384232cb4f928a47b1d8d9d57eb68220929ac338afc5546bbe67d6f35aac45bc5c0ec5cad152bb7017c1d616 SHA512 be9ec2958f61003373a51d9796b8310877734dbe88b1f79213c5e72eea5b8d34d4fc8d0b9303e90beb275dcb19e50efe59c5b364a9719efea3917fe9e4992fc6
-DIST chromium-133.0.6888.2-linux-testdata.tar.xz 299227756 BLAKE2B ecf1a79034c9c06fcd667d812ae7ee4b05b60e9dc1a0db587c7d0c3af5ad8b787b1b885abcc27ec4a3cf89ec3038f686f1d37410109c4845e32c4dec9ead7af4 SHA512 fb37b91b243bc584da41f1be58932817dd757a2be0acfa01aafa23c15a53250934938ea8e51efb3f40d3fbcc12af20b7d13cc1364720a2d4cb977ea6ce432493
-DIST chromium-133.0.6888.2-linux.tar.xz 2286980464 BLAKE2B 747741f415ad00be3120cebd4a691a39f3f0374e57f57272700c366ba50d394359fb22fdc6a89f7ab41a49ff59f2c6c7e664aee1a003be75a4651dd1e642b39e SHA512 11e18014e9f4d3e7ff6b7c8789546a0d8f0d4a24b6fa413c1e10e6d911f4d81fa1c8b1803a9d5e7bf1f8243710c2ad0aa625b2ba6ca52ad9964e37d2b7851af7
-DIST chromium-133.0.6905.0-linux-testdata.tar.xz 299295120 BLAKE2B 7242308e0bef753e090b0f70e4d4017ebac12bfe9dd2254263ae79db2a8d9294c96d3f74297b6f5f3bfacf766dcb0e73314ef76b2d370ecf7b142f12ac9c7935 SHA512 8793bb0d27073851dc5a00183d88001b65de54390c8a3ed4c7fa72e9c0aa4b9d285bc8eabeddf1b8b3d10876c2d30134945f10509fdcf7e27f3c1e23e38faffc
-DIST chromium-133.0.6905.0-linux.tar.xz 2291017800 BLAKE2B bf78df51b3dbf3e0eb97afce911b6e95403d516e978a731f65286aa07841c2f9bf075893e0378cbaf5e5b50f97990f6e09df4262a2e027c2c1d42df638504478 SHA512 b212ebf4534ed38e4d643787f012762786ede5d39c027cdbded703a9dd53712c440ab621eb51c18f69c2b1a5d7e845fa469c84672a6014f8df32b51b5f04b306
+DIST chromium-132.0.6834.83-linux-testdata.tar.xz 299789728 BLAKE2B 043d122ef3ee62012cf55ca2754df932d0e48f08df06b78551cb79ec0c4781a52d5333b02645a981748c2c75928ebc91a21d7caf5e248d94b55fbf6ba4f8c974 SHA512 8122b750f22bb61e257b201bac731975f001a801b626d1ca0b037bc8f6cba34fcd104e47efc48c5122838e8196cdec720fb4a30af8ed0f00eb8943bda67da2d0
+DIST chromium-132.0.6834.83-linux.tar.xz 2193406712 BLAKE2B 65cd156a97bcb4888ed30fc29f30e58e5c701e371454ad16427898ec8c51d54da10c36d1bc05157ad64ad4ca3e4b8c54cdd81c82f7f4c57abe6af71c8c050b13 SHA512 f5f1e1f620988ae5cbf042eb0acad5cc00bcf1854d3fb78574ea123dbeb8f5b065dff3fbd5f169c6acf3ed4bc7394d066b1bf6de53b8ccf1ac0432cfde8585fe
+DIST chromium-133.0.6943.16-linux-testdata.tar.xz 299224176 BLAKE2B 80850cdc182cd8825d3b4ed7392ca00d2b35bd208815ad900e59f493a1d64644c7575b496ee67d761591fa66e6b3b3856b3508abd109a49398c4cd7041073fde SHA512 3c2c3e1236787c39796d6b2b61cc7660d8d6f6b46d5cb554631e3e5a82b209ebcbec0a75174305434bc732af616e48f59a8111153d7d69d4def4919bda604af1
+DIST chromium-133.0.6943.16-linux.tar.xz 2300561364 BLAKE2B 017121eae6209b12faa07cfae86d7c81f4a544f8cf7ec7b20d36150902fcc238c76124317a42b59952134a6804411c8a664ac50403edcd4be71d19450c020bee SHA512 942ab013749b7038c143cc4ced89dba28d3420bf50831ab28ed5bc769896ed23aa3a3c51312767a2bc6708cc0800493a6f62fe3b403d5488bdd5b8867fb26e01
+DIST chromium-134-clang.tar.xz 54177680 BLAKE2B ebe3e42ba0950f067b0febec65e575ec510f64a056e0a1a9dfffebde02809429c98461638784149dc31423ade29f1dbe4b060af06d8371c0ca8d10d83c7d8617 SHA512 4cf26e6f895ca1b268afcde296f2e7c761f99584170e1f3deecb1c5501be2121f173934a4598124bed69d0bd266f799bf03adfdb2190cb9f23c1212072a8bace
+DIST chromium-134-rust.tar.xz 124591376 BLAKE2B c062e7283994ef15055a37f66a1c01dfcbcf03d16b7de48e7d017cec479f306999112dcd0f016157cfd0334349b55ae29512be3063dc6c3de90311520e90a5c1 SHA512 09be07ff0adfcc2928b28f5763a7e18bb7ef1f0cbf4a2475e3e6ae19a0a310a4a8f323375b947a48247853412119781bc9fa1422e24b96423c071f68337d6766
+DIST chromium-134.0.6958.2-linux-testdata.tar.xz 299837732 BLAKE2B 68060ea0c84e951d2cd8427842e5a4bd3cb15a0b4bdd05ec068f8b38c3a14453c02659cdeb77106ac892a88750ea88db124e13bdccdb97eb4bde6d5dd2cdd776 SHA512 ccc7f985b69c72fabbfb9de86aba0872663076d20154338f8ab93e00c883e07040edaf1c1fa8e5c6e76c65fabf70d408fa7fd43149ac2d8c063492c82b7efd99
+DIST chromium-134.0.6958.2-linux.tar.xz 2282858364 BLAKE2B e615acbae612d186445a5e14254dd9f3f9a4cea3ccaf89bdaa0333e3f9ecc21fe7ff000c1df433e64568f298cc0c08e471f019312e894356701a9daa66b1c384 SHA512 061a5625a243df3b3d2144503f8562112cc358f71b4eebf08947343f1bc87cbd5dd6c56f30f1c432bd19d2f339e40fc5d31ae7058123a0952fcb6f47b1e83234
 DIST chromium-openpower-a85b64f07b.tar.bz2 387899 BLAKE2B b01fda2d64ce73068d1536a10cc0896f07a4b714cdb25698b1df8b3252baa0c21c4209b307cf1cb554854f6d0bfe3cd35e06aaa8d02ac5d409a119335084c324 SHA512 05eee81677e8766808441c939bee68e2e6c58ec91f471d88a40181d2eda78614a0a6d27d92ff8f9dda564d12f3451bace4ff2727594748c5c238a3533038019b
-DIST chromium-patches-130-2.tar.bz2 10151 BLAKE2B b46515a3e01153d8c4e5c3ee1f6e9f905265bf88b698d46c8ceed0f90d36a057b8bb30a860e8d934bf0b85f9c0a671bef2c9a00349228fa076b7aec37ff62ca0 SHA512 e1ecca666c3998ee285426751be3220a5b67a057f2c92b1f45c7b786efb8d0b0e1d49ba70471fa74155f79f22811d240af636f61007191756c9981b53d3b23de
-DIST chromium-patches-131-1.tar.bz2 4932 BLAKE2B 72006a6d751ae1207352547cdeef87f8cc9f9639283238da201d879c6fcd0f8bc499669cb030d8b4c2216fcd2730de46b0a071007b3d69a2bbdd22ba38bcd279 SHA512 11d7f861c007e9e28e5192fb354940180aea0e01e6e8ae77547e2dffd7b541b11f1acfe0fd0c8b6b4cbfc6c39ddfa79c8c08db42c1292ad329d49027d1406fc3
+DIST chromium-openpower-c11b515d9a.tar.bz2 396039 BLAKE2B c05653e6bb62188c18864e783197853f4c41f88d1c928044a0ea0cb4677bc17806fac266ab100cbbcec3cb0d964bf2172917df95679927c1f1a88fa34aef4f53 SHA512 e9d9bbb2dd8d998060c78dfd5bbaedc548a8c44b442f6259304797326c585046144a6bb8aa4e24c44b3b56068189bee8a01267db2a392e90fd5603d06c0ef9ff
 DIST chromium-patches-132.tar.bz2 5040 BLAKE2B d5bd84dd90b395c6a15135637f51f931c72a2f301b1c24e9b938c744f2767fa36857b8edfdf5c44cf085a1efcb40475401fec226ce43446442f32fb174b55355 SHA512 29833b306a34ab6562ee58eb03669818da7235cd36666b27d829bcbd3c4d0035a530fb6be1c33cf88c1c11d43e68e3781f9b9602c0c004e7a37ffa69f9ee17c7
 DIST chromium-patches-133-1.tar.bz2 10661 BLAKE2B c8a141bd10e628533e373b08969f95443eb6ae7f4497359db02f370147ac6132fbc31db28915ebdd9f150c13be78f06af938bd7dffdf2c23d90e1b9e07bd92ab SHA512 48a356872acc41c96c92366bd09de5a1c4af87fe4c480dccc7bd7a2aae5c3be8e6411151ed36303a127022001248bd25ef8305e83bd0d533660e3f11943af686
+DIST chromium-patches-134.tar.bz2 10184 BLAKE2B 5ff1022205ef3e0e88b43e6c20d33a86386d80b837135eaa5451b004f09290de3b765694e31c9e6e840ec7e0537bbe6164a61224a55e17cd04356f1d5af8ee37 SHA512 29fc1f70a95501e0f82e2bb66f7eefab2bd75995d660271ab0dd043b18663107547faddf71b555b82da39e31393c7220893e09d4b28a71b18855d82399e3512b
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
 DIST chromium-testfonts-f26f29c9d3.tar.gz 32750602 BLAKE2B 498f8b2e0811c98dc3d4aaa75559e69c782afb4bd12328cfdb7244ddba5cae7ee47becd27b2549d7b36bed417601f70f4c192934b0f08496cef1547d0502d93c SHA512 96b090446862997c8134e2971f0e38793ecc1208d547e554c9b651ccfb4127c4de86754903fea57a7292a2823c45117bae0ec13ed87aed20c248fb779579fbde
diff --git a/www-client/chromium/chromium-130.0.6723.116-r1.ebuild b/www-client/chromium/chromium-130.0.6723.116-r1.ebuild
deleted file mode 100644
index ae7bc679a437..000000000000
--- a/www-client/chromium/chromium-130.0.6723.116-r1.ebuild
+++ /dev/null
@@ -1,1408 +0,0 @@
-# Copyright 2009-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# PACKAGING NOTES
-
-# This uses a gentoo-created tarball due to Google CI Failures.
-# Use 132 as a base for new official tarballs.
-
-GN_MIN_VER=0.2165
-# chromium-tools/get-chromium-toolchain-strings.py
-
-VIRTUALX_REQUIRED="pgo"
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-LLVM_COMPAT=( 18 19 )
-RUST_NEEDS_LLVM="yes please"
-PYTHON_COMPAT=( python3_{11..13} )
-PYTHON_REQ_USE="xml(+)"
-RUST_MIN_VER=1.78.0
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 multiprocessing ninja-utils pax-utils
-inherit python-any-r1 qmake-utils readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://www.chromium.org/"
-PPC64_HASH="a85b64f07b489b8c6fdb13ecf79c16c56c560fc6"
-TEST_FONT=f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35
-PATCH_V="${PV%%\.*}-2"
-SRC_URI="https://chromium-tarballs.distfiles.gentoo.org/${P}.tar.xz -> ${P}-gentoo.tar.xz
-		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
-	test? (
-		https://chromium-tarballs.distfiles.gentoo.org/${P}-testdata.tar.xz -> ${P}-testdata-gentoo.tar.xz
-		https://chromium-fonts.storage.googleapis.com/${TEST_FONT} -> chromium-testfonts-${TEST_FONT:0:10}.tar.gz
-	)
-	ppc64? (
-		https://gitlab.solidsilicon.io/public-development/open-source/chromium/openpower-patches/-/archive/${PPC64_HASH}/openpower-patches-${PPC64_HASH}.tar.bz2 -> chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
-	)
-	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
-
-LICENSE="BSD"
-SLOT="0/stable"
-# Dev exists mostly to give devs some breathing room for beta/stable releases;
-# it shouldn't be keyworded but adventurous users can select it.
-if [[ ${SLOT} != "0/dev" ]]; then
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
-fi
-
-IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
-IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
-IUSE+=" qt5 qt6 +screencast selinux test +vaapi +wayland +widevine cpu_flags_ppc_vsx3"
-RESTRICT="
-	!bindist? ( bindist )
-	!test? ( test )
-"
-
-REQUIRED_USE="
-	!headless? ( || ( X wayland ) )
-	pgo? ( X !wayland )
-	qt6? ( qt5 )
-	screencast? ( wayland )
-	ffmpeg-chromium? ( bindist proprietary-codecs )
-"
-
-COMMON_X_DEPEND="
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxshmfence:=
-"
-
-COMMON_SNAPSHOT_DEPEND="
-	system-icu? ( >=dev-libs/icu-73.0:= )
-	>=dev-libs/libxml2-2.12.4:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	dev-libs/libxslt:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	system-png? ( media-libs/libpng:=[-apng(-)] )
-	system-zstd? ( >=app-arch/zstd-1.5.5:= )
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/mesa:=[gbm(+)]
-	>=media-libs/openh264-1.6.0:=
-	sys-libs/zlib:=
-	x11-libs/libdrm:=
-	!headless? (
-		dev-libs/glib:2
-		>=media-libs/alsa-lib-1.0.19:=
-		pulseaudio? ( media-libs/libpulse:= )
-		sys-apps/pciutils:=
-		kerberos? ( virtual/krb5 )
-		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
-		X? (
-			x11-base/xorg-proto:=
-			x11-libs/libX11:=
-			x11-libs/libxcb:=
-			x11-libs/libXext:=
-		)
-		x11-libs/libxkbcommon:=
-		wayland? (
-			dev-libs/libffi:=
-			dev-libs/wayland:=
-			screencast? ( media-video/pipewire:= )
-		)
-	)
-"
-
-COMMON_DEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	app-arch/bzip2:=
-	dev-libs/expat:=
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	media-libs/flac:=
-	sys-libs/zlib:=[minizip]
-	!headless? (
-		X? ( ${COMMON_X_DEPEND} )
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		media-libs/mesa:=[X?,wayland?]
-		cups? ( >=net-print/cups-1.3.11:= )
-		virtual/udev
-		x11-libs/cairo:=
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango:=
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? ( dev-qt/qtbase:6[gui,widgets] )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!headless? (
-		|| (
-			x11-libs/gtk+:3[X?,wayland?]
-			gui-libs/gtk:4[X?,wayland?]
-		)
-		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
-		qt6? ( dev-qt/qtbase:6[X?,wayland?] )
-	)
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	bindist? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${PV%%\.*} )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	!headless? (
-		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
-		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
-	)
-"
-
-BDEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	!headless? (
-		qt5? ( dev-qt/qtcore:5 )
-		qt6? ( dev-qt/qtbase:6 )
-	)
-	$(llvm_gen_dep "
-		llvm-core/clang:\${LLVM_SLOT}
-		llvm-core/llvm:\${LLVM_SLOT}
-		llvm-core/lld:\${LLVM_SLOT}
-	")
-	pgo? (
-		>=dev-python/selenium-3.141.0
-		>=dev-util/web_page_replay_go-20220314
-	)
-	>=dev-util/bindgen-0.68.0
-	>=dev-build/gn-${GN_MIN_VER}
-	dev-build/ninja
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	dev-vcs/git
-	>=net-libs/nodejs-7.6.0[inspector]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pre_build_checks() {
-	# Check build requirements: bugs #471810, #541816, #914220
-	# We're going to start doing maths here on the size of an unpacked source tarball,
-	# this should make updates easier as chromium continues to balloon in size.
-	local BASE_DISK=24
-	local EXTRA_DISK=1
-	local CHECKREQS_MEMORY="4G"
-	tc-is-cross-compiler && EXTRA_DISK=2
-	if tc-is-lto || use pgo; then
-		CHECKREQS_MEMORY="9G"
-		tc-is-cross-compiler && EXTRA_DISK=4
-		use pgo && EXTRA_DISK=8
-	fi
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		if use custom-cflags; then
-			EXTRA_DISK=13
-		fi
-		CHECKREQS_MEMORY="16G"
-	fi
-	CHECKREQS_DISK_BUILD="$((BASE_DISK + EXTRA_DISK))G"
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
-		pre_build_checks
-	fi
-
-	if use headless; then
-		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland")
-		for myiuse in ${headless_unused_flags[@]}; do
-			use ${myiuse} && ewarn "Ignoring USE=${myiuse}, USE=headless is set."
-		done
-	fi
-
-	if ! use bindist && use ffmpeg-chromium; then
-		ewarn "Ignoring USE=ffmpeg-chromium, USE=bindist is not set."
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
-		pre_build_checks
-
-		# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
-		# This is effectively the 'force-clang' path if GCC support is re-added.
-		use_lto="false"
-		if tc-is-lto; then
-			use_lto="true"
-			# We can rely on GN to do this for us; anecdotally without this builds
-			# take significantly longer with LTO enabled and it doesn't hurt anything.
-			filter-lto
-		fi
-
-		if [ "$use_lto" = "false" ] && use official; then
-			einfo "USE=official selected and LTO not detected."
-			einfo "It is _highly_ recommended that LTO be enabled for performance reasons"
-			einfo "and to be consistent with the upstream \"official\" build optimisations."
-		fi
-
-		if [ "$use_lto" = "false" ] && use test; then
-			die "Tests require CFI which requires LTO"
-		fi
-
-		export use_lto
-
-		# 936858
-		if tc-ld-is-mold; then
-			eerror "Your toolchain is using the mold linker."
-			eerror "This is not supported by Chromium."
-			die "Please switch to a different linker."
-		fi
-
-		llvm-r1_pkg_setup
-		rust_pkg_setup
-
-		# Forcing clang; respect llvm_slot_x to enable selection of impl from LLVM_COMPAT
-		AR=llvm-ar
-		CPP="${CHOST}-clang++-${LLVM_SLOT} -E"
-		NM=llvm-nm
-		CC="${CHOST}-clang-${LLVM_SLOT}"
-		CXX="${CHOST}-clang++-${LLVM_SLOT}"
-
-		if tc-is-cross-compiler; then
-			use pgo && die "The pgo USE flag cannot be used when cross-compiling"
-			CPP="${CBUILD}-clang++-${LLVM_SLOT} -E"
-		fi
-
-		# I hate doing this but upstream Rust have yet to come up with a better solution for
-		# us poor packagers. Required for Split LTO units, which are required for CFI.
-		export RUSTC_BOOTSTRAP=1
-
-		# Users should never hit this, it's purely a development convenience
-		if ver_test $(gn --version || die) -lt ${GN_MIN_VER}; then
-			die "dev-build/gn >= ${GN_MIN_VER} is required to build this Chromium"
-		fi
-	fi
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	unpack ${P}-gentoo.tar.xz
-	unpack chromium-patches-${PATCH_V}.tar.bz2
-
-	use pgo && unpack chromium-profiler-0.2.tar
-
-	if use test; then
-		# A new testdata tarball is available for each release; but testfonts tend to remain stable
-		# for the duration of a release.
-		# This unpacks directly into/over ${WORKDIR}/${P} so we can just use `unpack`.
-		unpack ${P}-testdata-gentoo.tar.xz
-		# This just contains a bunch of font files that need to be unpacked (or moved) to the correct location.
-		local testfonts_dir="${WORKDIR}/${P}/third_party/test_fonts"
-		tar xf "${DISTDIR}/${P%%\.*}-testfonts.tar.gz" -C "${testfonts_dir}" || die "Failed to unpack testfonts"
-	fi
-
-	if use ppc64; then
-		unpack chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# disable global media controls, crashes with libstdc++
-	sed -i -e \
-		"/\"GlobalMediaControlsCastStartStop\"/,+4{s/ENABLED/DISABLED/;}" \
-		"chrome/browser/media/router/media_router_feature.cc"
-
-	local PATCHES=(
-		"${FILESDIR}/chromium-cross-compile.patch"
-		"${FILESDIR}/chromium-109-system-zlib.patch"
-		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-126-oauth2-client-switches.patch"
-		"${FILESDIR}/chromium-127-bindgen-custom-toolchain.patch"
-	)
-
-	shopt -s globstar nullglob
-	# 130: moved the PPC64 patches into the chromium-patches repo
-	local patch
-	for patch in "${WORKDIR}/chromium-patches-${PATCH_V}"/**/*.patch; do
-		elog "Applying patch: ${patch}"
-		if [[ ${patch} == *"ppc64le"* ]]; then
-			use ppc64 && PATCHES+=( "${patch}" )
-		else
-			PATCHES+=( "${patch}" )
-		fi
-	done
-
-	# We can't use the bundled compiler builtins with the system toolchain
-	# `grep` is a development convenience to ensure we fail early when google changes something.
-	local builtins_match="if (is_clang && !is_nacl && !is_cronet_build) {"
-	grep -q "${builtins_match}" build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
-	sed -i -e "/${builtins_match}/,+2d" build/config/compiler/BUILD.gn
-
-	if use ppc64; then
-		# Above this level there are ungoogled-chromium patches that we can't apply
-		local patchset_dir="${WORKDIR}/openpower-patches-${PPC64_HASH}/patches/ppc64le"
-		# Apply the OpenPOWER patches
-		local power9_patch="patches/ppc64le/core/baseline-isa-3-0.patch"
-		for patch in ${patchset_dir}/**/*.{patch,diff}; do
-			if [[ ${patch} == *"${power9_patch}" ]]; then
-				use cpu_flags_ppc_vsx3 && PATCHES+=( "${patch}" )
-			else
-				PATCHES+=( "${patch}" )
-			fi
-		done
-
-		PATCHES+=( "${WORKDIR}/openpower-patches-${PPC64_HASH}/patches/upstream/blink-fix-size-assertions.patch" )
-	fi
-
-	shopt -u globstar nullglob
-
-	default
-
-	rm third_party/node/linux/node-linux-x64/bin/node || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
-	# remove_bundled_libraries.py walks the source tree and looks for paths containing the substring 'third_party'
-	# whitelist matches use the right-most matching path component, so we need to whitelist from that point down.
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/ceval
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/volk
-		third_party/anonymous_tokens
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/bidimapper
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/content_analysis_sdk
-		third_party/cpuinfo
-		third_party/crabbyavif
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/d3
-		third_party/dav1d
-		third_party/dawn
-		third_party/dawn/third_party/gn/webgpu-cts
-		third_party/dawn/third_party/khronos
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/csp_evaluator
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit
-		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/parsel-js
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs
-		third_party/devtools-frontend/src/front_end/third_party/third-party-web
-		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/front_end/third_party/web-vitals
-		third_party/devtools-frontend/src/third_party
-		third_party/distributed_point_functions
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fast_float
-		third_party/fdlibm
-		third_party/ffmpeg
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/fp16
-		third_party/freetype
-		third_party/fusejs
-		third_party/fxdiv
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/highway
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/ipcz
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/lens_server_proto
-		third_party/leveldatabase
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/fastfeat
-		third_party/libaom/source/libaom/third_party/SVT-AV1
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libavif
-		third_party/libc++
-		third_party/libevent
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/liburlpattern
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/libzip
-		third_party/lit
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/markupsafe
-		third_party/material_color_utilities
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/omnibox_proto
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/opus
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg
-		third_party/pdfium/third_party/libtiff
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/perfetto/protos/third_party/simpleperf
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private_membership
-		third_party/private-join-and-compute
-		third_party/protobuf
-		third_party/pthreadpool
-		third_party/puffin
-		third_party/pyjson5
-		third_party/pyyaml
-		third_party/qcms
-		third_party/rapidhash
-		third_party/re2
-		third_party/rnnoise
-		third_party/rust
-		third_party/ruy
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/selenium-atoms
-		third_party/sentencepiece
-		third_party/sentencepiece/src/third_party/darts_clone
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/six
-		third_party/skia
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/snappy
-		third_party/spirv-headers
-		third_party/spirv-tools
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
-		third_party/swiftshader/third_party/SPIRV-Tools
-		third_party/swiftshader/third_party/subzero
-		third_party/tensorflow_models
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/tflite/src/third_party/xla/third_party/tsl
-		third_party/tflite/src/third_party/xla/xla/tsl/util
-		third_party/tflite/src/third_party/xla/xla/tsl/framework
-		third_party/ukey2
-		third_party/unrar
-		third_party/utf
-		third_party/vulkan
-		third_party/wayland
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/xnnpack
-		third_party/zlib/google
-		third_party/zxcvbn-cpp
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/utf8-decoder
-		v8/src/third_party/valgrind
-		v8/third_party/glibc
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-
-	if use test; then
-		# tar tvf /var/cache/distfiles/${P}-testdata.tar.xz | grep '^d' | grep 'third_party' | awk '{print $NF}'
-		keeplibs+=(
-			third_party/google_benchmark/src/include/benchmark
-			third_party/google_benchmark/src/src
-			third_party/perfetto/protos/third_party/pprof
-			third_party/test_fonts
-			third_party/test_fonts/fontconfig
-		)
-	fi
-
-	# USE=system-*
-	if ! use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-
-	if ! use system-png; then
-		keeplibs+=( third_party/libpng )
-	fi
-
-	if ! use system-zstd; then
-		keeplibs+=( third_party/zstd )
-	fi
-
-	# Arch-specific
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		# requires git and clang, bug #832803
-		# Revert https://chromium.googlesource.com/chromium/src/+/b463d0f40b08b4e896e7f458d89ae58ce2a27165%5E%21/third_party/libvpx/generate_gni.sh
-		# and https://chromium.googlesource.com/chromium/src/+/71ebcbce867dd31da5f8b405a28fcb0de0657d91%5E%21/third_party/libvpx/generate_gni.sh
-		# since we're not in a git repo
-		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g; /^git -C/d; /git cl/d; /cd \$BASE_DIR\/\$LIBVPX_SRC_DIR/ign format --in-place \$BASE_DIR\/BUILD.gn\ngn format --in-place \$BASE_DIR\/libvpx_srcs.gni" \
-			generate_gni.sh || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-
-		pushd third_party/ffmpeg >/dev/null || die
-		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
-		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
-		popd >/dev/null || die
-	fi
-
-	# Sanity check keeplibs, on major version bumps it is often necessary to update this list
-	# and this enables us to hit them all at once.
-	# There are some entries that need to be whitelisted (TODO: Why? The file is understandable, the rest seem odd)
-	whitelist_libs=(
-		net/third_party/quic
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/libjingle
-		third_party/mesa
-		third_party/skia/third_party/vulkan
-		third_party/vulkan
-	)
-	local not_found_libs=()
-	for lib in "${keeplibs[@]}"; do
-		if [[ ! -d "${lib}" ]] && ! has "${lib}" "${whitelist_libs[@]}"; then
-			not_found_libs+=( "${lib}" )
-		fi
-	done
-
-	if [[ ${#not_found_libs[@]} -gt 0 ]]; then
-		eerror "The following \`keeplibs\` directories were not found in the source tree:"
-		for lib in "${not_found_libs[@]}"; do
-			eerror "  ${lib}"
-		done
-		die "Please update the ebuild."
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	einfo "Unbundling third-party libraries ..."
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	# TODO: From 127 chromium includes a bunch of binaries? Unbundle them; they're not needed.
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-chromium_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# We already forced the "correct" clang via pkg_setup
-
-	if tc-is-cross-compiler; then
-		CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
-		CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
-		BUILD_AR=${AR}
-		BUILD_CC=${CC}
-		BUILD_CXX=${CXX}
-		BUILD_NM=${NM}
-	fi
-
-	strip-unsupported-flags
-
-	myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	# https://bugs.gentoo.org/918897#c32
-	append-ldflags -Wl,--undefined-version
-	myconf_gn+=" use_lld=true"
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
-		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
-
-		# setup cups-config, build system only uses --libs option
-		if use cups; then
-			mkdir "${T}/cups-config" || die
-			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
-			export PATH="${PATH}:${T}/cups-config"
-		fi
-
-		# Don't inherit PKG_CONFIG_PATH from environment
-		local -x PKG_CONFIG_PATH=
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# bindgen settings
-	# From 127, to make bindgen work, we need to provide a location for libclang.
-	# We patch this in for gentoo - see chromium-*-bindgen-custom-toolchain.patch
-	# rust_bindgen_root = directory with `bin/bindgen` beneath it.
-	myconf_gn+=" rust_bindgen_root=\"${EPREFIX}/usr/\""
-
-	myconf_gn+=" bindgen_libclang_path=\"$(get_llvm_prefix)/$(get_libdir)\""
-	# We don't need to set 'clang_base_bath' for anything in our build
-	# and it defaults to the google toolchain location. Instead provide a location
-	# to where system clang lives sot that bindgen can find system headers (e.g. stddef.h)
-	myconf_gn+=" clang_base_path=\"${EPREFIX}/usr/lib/clang/${LLVM_SLOT}/\""
-
-	# We need to provide this to GN in both the path to rust _and_ the version
-	myconf_gn+=" rust_sysroot_absolute=\"$(get_rust_prefix)\""
-	myconf_gn+=" rustc_version=\"${RUST_SLOT}\""
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=false"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libwebp
-		libxml
-		libxslt
-		openh264
-		zlib
-	)
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-png; then
-		gn_system_libraries+=( libpng )
-	fi
-	if use system-zstd; then
-		gn_system_libraries+=( zstd )
-	fi
-
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-
-	if use headless; then
-		myconf_gn+=" use_cups=false"
-		myconf_gn+=" use_kerberos=false"
-		myconf_gn+=" use_pulseaudio=false"
-		myconf_gn+=" use_vaapi=false"
-		myconf_gn+=" rtc_use_pipewire=false"
-	else
-		myconf_gn+=" use_cups=$(usex cups true false)"
-		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
-	fi
-
-	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
-	# using dlopen. This helps with automated detection of ABI mismatches and
-	# prevents silent errors.
-	if use pulseaudio; then
-		myconf_gn+=" link_pulseaudio=true"
-	fi
-
-	# Non-developer builds of Chromium (for example, non-Chrome browsers, or
-	# Chromium builds provided by Linux distros) should disable the testing config
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# The sysroot is the oldest debian image that chromium supports, we don't need it
-	myconf_gn+=" use_sysroot=false"
-
-	# Use in-tree libc++ (buildtools/third_party/libc++ and buildtools/third_party/libc++abi)
-	# instead of the system C++ library for C++ standard library support.
-	# default: true, but let's be explicit (forced since 120 ; USE removed 127).
-	myconf_gn+=" use_custom_libcxx=true"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	if use bindist ; then
-		# proprietary_codecs just forces Chromium to say that it can use h264/aac,
-		# the work is still done by ffmpeg. If this is set to no Chromium
-		# won't be able to load the codec even if the library can handle it
-		myconf_gn+=" proprietary_codecs=true"
-		myconf_gn+=" ffmpeg_branding=\"Chrome\""
-		# build ffmpeg as an external component (libffmpeg.so) that we can remove / substitute
-		myconf_gn+=" is_component_ffmpeg=true"
-	else
-		ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-		myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-		myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-	fi
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		filter-flags "-g*"
-
-		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
-		if [[ ${myarch} == amd64 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf_gn+=" treat_warnings_as_errors=false"
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Disable external code space for V8 for ppc64. It is disabled for ppc64
-	# by default, but cross-compiling on amd64 enables it again.
-	if tc-is-cross-compiler; then
-		if ! use amd64 && ! use arm64; then
-			myconf_gn+=" v8_enable_external_code_space=false"
-		fi
-	fi
-
-	# Only enabled for clang, but gcc has endian macros too
-	myconf_gn+=" v8_use_libm_trig_functions=true"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	# We don't use the same clang version as upstream, and with -Werror
-	# we need to make sure that we don't get superfluous warnings.
-	append-flags -Wno-unknown-warning-option
-	if tc-is-cross-compiler; then
-			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
-			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
-	fi
-
-	# Explicitly disable ICU data file support for system-icu/headless builds.
-	if use system-icu || use headless; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Don't need nocompile checks and GN crashes with our config
-	myconf_gn+=" enable_nocompile_tests=false"
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	if use headless; then
-		myconf_gn+=" ozone_platform=\"headless\""
-		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
-		myconf_gn+=" use_glib=false use_gio=false"
-		myconf_gn+=" use_pangocairo=false use_alsa=false"
-		myconf_gn+=" use_libpci=false use_udev=false"
-		myconf_gn+=" enable_print_preview=false"
-		myconf_gn+=" enable_remoting=false"
-	else
-		myconf_gn+=" use_system_libdrm=true"
-		myconf_gn+=" use_system_minigbm=true"
-		myconf_gn+=" use_xkbcommon=true"
-		if use qt5 || use qt6; then
-			local cbuild_libdir=$(get_libdir)
-			if tc-is-cross-compiler; then
-				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
-				cbuild_libdir=${cbuild_libdir:2}
-				cbuild_libdir=${cbuild_libdir/% }
-			fi
-			if use qt5; then
-				if tc-is-cross-compiler; then
-					myconf_gn+=" moc_qt5_path=\"${EPREFIX}/${cbuild_libdir}/qt5/bin\""
-				else
-					myconf_gn+=" moc_qt5_path=\"$(qt5_get_bindir)\""
-				fi
-			fi
-			if use qt6; then
-				myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\""
-			fi
-
-			myconf_gn+=" use_qt=true"
-			myconf_gn+=" use_qt6=$(usex qt6 true false)"
-		else
-			myconf_gn+=" use_qt=false"
-		fi
-		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
-		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
-		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
-		use wayland && myconf_gn+=" use_system_libffi=true"
-	fi
-
-	myconf_gn+=" use_thin_lto=${use_lto}"
-	myconf_gn+=" thin_lto_enable_optimizations=${use_lto}"
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		myconf_gn+=" is_cfi=${use_lto}"
-		# Don't add symbols to build
-		myconf_gn+=" symbol_level=0"
-	fi
-
-	if use pgo; then
-		myconf_gn+=" chrome_pgo_phase=${1}"
-		if [[ "$1" == "2" ]]; then
-			myconf_gn+=" pgo_data_path=\"${2}\""
-		fi
-	else
-		# Disable PGO
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	# skipping typecheck is only supported on amd64, bug #876157
-	if ! use amd64; then
-		myconf_gn+=" devtools_skip_typecheck=false"
-	fi
-
-	einfo "Configuring Chromium ..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	chromium_configure $(usex pgo 1 0)
-}
-
-chromium_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	# Build mksnapshot and pax-mark it.
-	if use pax-kernel; then
-		local x
-		for x in mksnapshot v8_context_snapshot_generator; do
-			if tc-is-cross-compiler; then
-				eninja -C out/Release "host/${x}"
-				pax-mark m "out/Release/host/${x}"
-			else
-				eninja -C out/Release "${x}"
-				pax-mark m "out/Release/${x}"
-			fi
-		done
-	fi
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver chrome_sandbox $(use test && echo "base_unittests")
-
-	pax-mark m out/Release/chrome
-
-}
-
-# This function is called from virtx, and must always return so that Xvfb
-# session isn't left running. If we return 1, virtx will call die().
-chromium_profile() {
-	einfo "Profiling for PGO"
-
-	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
-
-	# Remove old profdata in case profiling was interrupted.
-	rm -rf "${1}" || return 1
-
-	if ! "${EPYTHON}" ./chromium_profiler.py \
-		--chrome-executable "${S}/out/Release/chrome" \
-		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
-		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
-		--profile-output "${1}"; then
-		eerror "Profiling failed"
-		return 1
-	fi
-
-	popd >/dev/null || return 1
-}
-
-src_compile() {
-	if use pgo; then
-		local profdata
-
-		profdata="${WORKDIR}/chromium.profdata"
-
-		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
-			chromium_compile
-			virtx chromium_profile "$profdata"
-
-			touch "${WORKDIR}/.pgo-profiled" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
-			# Remove phase 1 output
-			rm -r out/Release || die
-
-			chromium_configure 2 "$profdata"
-
-			touch "${WORKDIR}/.pgo-phase-2-configured" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
-			chromium_compile
-			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
-		fi
-	else
-		chromium_compile
-	fi
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	rm -f out/Release/locales/*.pak.info || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-
-	# Build vk_swiftshader_icd.json; bug #827861
-	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
-		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
-		out/Release/vk_swiftshader_icd.json || die
-}
-
-src_test() {
-	# Initial list of tests to skip pulled from Alpine. Thanks Lauren!
-	# https://issues.chromium.org/issues/40939315
-	local skip_tests=(
-		'MessagePumpLibeventTest.NestedNotification*'
-		ClampTest.Death
-		OptionalTest.DereferencingNoValueCrashes
-		PlatformThreadTest.SetCurrentThreadTypeTest
-		RawPtrTest.TrivialRelocability
-		SafeNumerics.IntMaxOperations
-		StackTraceTest.TraceStackFramePointersFromBuffer
-		StringPieceTest.InvalidLengthDeath
-		StringPieceTest.OutOfBoundsDeath
-		ThreadPoolEnvironmentConfig.CanUseBackgroundPriorityForWorker
-		ValuesUtilTest.FilePath
-		# Gentoo-specific
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/0
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/1
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/2
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/3
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/0
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/1
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/2
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/3
-		CharacterEncodingTest.GetCanonicalEncodingNameByAliasName
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGFPE
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGILL
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGV
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGVNonCanonicalAddress
-		FilePathTest.FromUTF8Unsafe_And_AsUTF8Unsafe
-		ICUStringConversionsTest.ConvertToUtf8AndNormalize
-		NumberFormattingTest.FormatPercent
-		PathServiceTest.CheckedGetFailure
-		PlatformThreadTest.CanChangeThreadType
-		StackCanary.ChangingStackCanaryCrashesOnReturn
-		StackTraceDeathTest.StackDumpSignalHandlerIsMallocFree
-		SysStrings.SysNativeMBAndWide
-		SysStrings.SysNativeMBToWide
-		SysStrings.SysWideToNativeMB
-		TestLauncherTools.TruncateSnippetFocusedMatchesFatalMessagesTest
-		ToolsSanityTest.BadVirtualCallNull
-		ToolsSanityTest.BadVirtualCallWrongType
-	)
-	local test_filter="-$(IFS=:; printf '%s' "${skip_tests[*]}")"
-	# test-launcher-bot-mode enables parallelism and plain output
-	./out/Release/base_unittests --test-launcher-bot-mode \
-		--test-launcher-jobs="$(makeopts_jobs)" \
-		--gtest_filter="${test_filter}" || die "Tests failed!"
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	newexe out/Release/chrome_sandbox chrome-sandbox
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use X && use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-
-	if use bindist; then
-		# We built libffmpeg as a component library, but we can't distribute it
-		# with proprietary codec support. Remove it and make a symlink to the requested
-		# system library.
-		rm -f out/Release/libffmpeg.so \
-			|| die "Failed to remove bundled libffmpeg.so (with proprietary codecs)"
-		# symlink the libffmpeg.so from either ffmpeg-chromium or ffmpeg[chromium].
-		einfo "Creating symlink to libffmpeg.so from $(usex ffmpeg-chromium ffmpeg-chromium ffmpeg[chromium])..."
-		dosym ../chromium/libffmpeg.so$(usex ffmpeg-chromium .${PV%%\.*} "") \
-			/usr/$(get_libdir)/chromium-browser/libffmpeg.so
-	fi
-
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	# Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland"
-	doins out/Release/xdg-{settings,mime}
-
-	if ! use system-icu && ! use headless; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/MEIPreload
-
-	# Install vk_swiftshader_icd.json; bug #827861
-	doins out/Release/vk_swiftshader_icd.json
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if ! use headless; then
-		if use vaapi; then
-			elog "VA-API is disabled by default at runtime. You have to enable it"
-			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-			elog "in /etc/chromium/default."
-		fi
-		if use screencast; then
-			elog "Screencast is disabled by default at runtime. Either enable it"
-			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use gtk4; then
-			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
-			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use qt5 && use qt6; then
-			elog "Chromium automatically selects Qt5 or Qt6 based on your desktop"
-			elog "environment. To override you need to pass --qt-version=5 or"
-			elog "--qt-version=6, e.g. by adding it to CHROMIUM_FLAGS in"
-			elog "/etc/chromium/default."
-		fi
-	fi
-
-	if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then
-		ewarn "The lack of an '/etc/machine-id' file on this system booted with systemd"
-		ewarn "indicates that the Gentoo handbook was not followed to completion."
-		ewarn ""
-		ewarn "Chromium is known to behave unpredictably with this system configuration;"
-		ewarn "please complete the configuration of this system before logging any bugs."
-	fi
-}
diff --git a/www-client/chromium/chromium-131.0.6778.139.ebuild b/www-client/chromium/chromium-131.0.6778.139.ebuild
deleted file mode 100644
index 2fbee807309f..000000000000
--- a/www-client/chromium/chromium-131.0.6778.139.ebuild
+++ /dev/null
@@ -1,1422 +0,0 @@
-# Copyright 2009-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# PACKAGING NOTES
-
-# This uses a gentoo-created tarball due to Google CI Failures.
-# Use 133(?) as a base for new official tarballs.
-
-GN_MIN_VER=0.2165
-# chromium-tools/get-chromium-toolchain-strings.py
-TEST_FONT=f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35
-
-VIRTUALX_REQUIRED="pgo"
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-LLVM_COMPAT=( 19 )
-PYTHON_COMPAT=( python3_{11..13} )
-PYTHON_REQ_USE="xml(+)"
-RUST_MIN_VER=1.78.0
-RUST_NEEDS_LLVM="yes please"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 multiprocessing ninja-utils pax-utils
-inherit python-any-r1 qmake-utils readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://www.chromium.org/"
-PPC64_HASH="a85b64f07b489b8c6fdb13ecf79c16c56c560fc6"
-PATCH_V="${PV%%\.*}-1"
-SRC_URI="https://chromium-tarballs.distfiles.gentoo.org/${P}-linux.tar.xz
-		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
-	test? (
-		https://chromium-tarballs.distfiles.gentoo.org/${P}-linux-testdata.tar.xz
-		https://chromium-fonts.storage.googleapis.com/${TEST_FONT} -> chromium-testfonts-${TEST_FONT:0:10}.tar.gz
-	)
-	ppc64? (
-		https://gitlab.solidsilicon.io/public-development/open-source/chromium/openpower-patches/-/archive/${PPC64_HASH}/openpower-patches-${PPC64_HASH}.tar.bz2 -> chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
-	)
-	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
-
-LICENSE="BSD"
-SLOT="0/stable"
-# Dev exists mostly to give devs some breathing room for beta/stable releases;
-# it shouldn't be keyworded but adventurous users can select it.
-if [[ ${SLOT} != "0/dev" ]]; then
-	KEYWORDS="amd64 arm64"
-fi
-
-IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
-IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
-IUSE+=" qt5 qt6 +screencast selinux test +vaapi +wayland +widevine"
-RESTRICT="
-	!bindist? ( bindist )
-	!test? ( test )
-"
-
-REQUIRED_USE="
-	!headless? ( || ( X wayland ) )
-	pgo? ( X !wayland )
-	qt6? ( qt5 )
-	screencast? ( wayland )
-	ffmpeg-chromium? ( bindist proprietary-codecs )
-"
-
-COMMON_X_DEPEND="
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxshmfence:=
-"
-
-COMMON_SNAPSHOT_DEPEND="
-	system-icu? ( >=dev-libs/icu-73.0:= )
-	>=dev-libs/libxml2-2.12.4:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	dev-libs/libxslt:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	system-png? ( media-libs/libpng:=[-apng(-)] )
-	system-zstd? ( >=app-arch/zstd-1.5.5:= )
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/mesa:=[gbm(+)]
-	>=media-libs/openh264-1.6.0:=
-	sys-libs/zlib:=
-	x11-libs/libdrm:=
-	!headless? (
-		dev-libs/glib:2
-		>=media-libs/alsa-lib-1.0.19:=
-		pulseaudio? ( media-libs/libpulse:= )
-		sys-apps/pciutils:=
-		kerberos? ( virtual/krb5 )
-		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
-		X? (
-			x11-base/xorg-proto:=
-			x11-libs/libX11:=
-			x11-libs/libxcb:=
-			x11-libs/libXext:=
-		)
-		x11-libs/libxkbcommon:=
-		wayland? (
-			dev-libs/libffi:=
-			dev-libs/wayland:=
-			screencast? ( media-video/pipewire:= )
-		)
-	)
-"
-
-COMMON_DEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	app-arch/bzip2:=
-	dev-libs/expat:=
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	media-libs/flac:=
-	sys-libs/zlib:=[minizip]
-	!headless? (
-		X? ( ${COMMON_X_DEPEND} )
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		media-libs/mesa:=[X?,wayland?]
-		cups? ( >=net-print/cups-1.3.11:= )
-		virtual/udev
-		x11-libs/cairo:=
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango:=
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? ( dev-qt/qtbase:6[gui,widgets] )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!headless? (
-		|| (
-			x11-libs/gtk+:3[X?,wayland?]
-			gui-libs/gtk:4[X?,wayland?]
-		)
-		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
-		qt6? ( dev-qt/qtbase:6[X?,wayland?] )
-	)
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	bindist? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${PV%%\.*} )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	!headless? (
-		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
-		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
-	)
-"
-
-BDEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	!headless? (
-		qt5? ( dev-qt/qtcore:5 )
-		qt6? ( dev-qt/qtbase:6 )
-	)
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
-		llvm-core/lld:${LLVM_SLOT}
-	')
-	pgo? (
-		>=dev-python/selenium-3.141.0
-		>=dev-util/web_page_replay_go-20220314
-	)
-	>=dev-util/bindgen-0.68.0
-	>=dev-build/gn-${GN_MIN_VER}
-	dev-build/ninja
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	dev-vcs/git
-	>=net-libs/nodejs-7.6.0[inspector]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pre_build_checks() {
-	# Check build requirements: bugs #471810, #541816, #914220
-	# We're going to start doing maths here on the size of an unpacked source tarball,
-	# this should make updates easier as chromium continues to balloon in size.
-	local BASE_DISK=24
-	local EXTRA_DISK=1
-	local CHECKREQS_MEMORY="4G"
-	tc-is-cross-compiler && EXTRA_DISK=2
-	if tc-is-lto || use pgo; then
-		CHECKREQS_MEMORY="9G"
-		tc-is-cross-compiler && EXTRA_DISK=4
-		use pgo && EXTRA_DISK=8
-	fi
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		if use custom-cflags; then
-			EXTRA_DISK=13
-		fi
-		CHECKREQS_MEMORY="16G"
-	fi
-	CHECKREQS_DISK_BUILD="$((BASE_DISK + EXTRA_DISK))G"
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
-		pre_build_checks
-	fi
-
-	if use headless; then
-		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland")
-		for myiuse in ${headless_unused_flags[@]}; do
-			use ${myiuse} && ewarn "Ignoring USE=${myiuse}, USE=headless is set."
-		done
-	fi
-
-	if ! use bindist && use ffmpeg-chromium; then
-		ewarn "Ignoring USE=ffmpeg-chromium, USE=bindist is not set."
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
-		pre_build_checks
-
-		# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
-		# We'll set these to clang here then use llvm-utils functions to very explicitly set these
-		# to a sane value.
-		# This is effectively the 'force-clang' path if GCC support is re-added.
-		# TODO: check if the user has already selected a specific impl via make.conf and respect that.
-		use_lto="false"
-		if tc-is-lto; then
-			use_lto="true"
-			# We can rely on GN to do this for us; anecdotally without this builds
-			# take significantly longer with LTO enabled and it doesn't hurt anything.
-			filter-lto
-		fi
-
-		if [ "$use_lto" = "false" ] && use official; then
-			einfo "USE=official selected and LTO not detected."
-			einfo "It is _highly_ recommended that LTO be enabled for performance reasons"
-			einfo "and to be consistent with the upstream \"official\" build optimisations."
-		fi
-
-		if [ "$use_lto" = "false" ] && use test; then
-			die "Tests require CFI which requires LTO"
-		fi
-
-		export use_lto
-
-		# 936858
-		if tc-ld-is-mold; then
-			eerror "Your toolchain is using the mold linker."
-			eerror "This is not supported by Chromium."
-			die "Please switch to a different linker."
-		fi
-
-		llvm-r1_pkg_setup
-		rust_pkg_setup
-
-		# Forcing clang; respect llvm_slot_x to enable selection of impl from LLVM_COMPAT
-		AR=llvm-ar
-		CPP="${CHOST}-clang++-${LLVM_SLOT} -E"
-		NM=llvm-nm
-		CC="${CHOST}-clang-${LLVM_SLOT}"
-		CXX="${CHOST}-clang++-${LLVM_SLOT}"
-
-		if tc-is-cross-compiler; then
-			use pgo && die "The pgo USE flag cannot be used when cross-compiling"
-			CPP="${CBUILD}-clang++-${LLVM_SLOT} -E"
-		fi
-
-		# I hate doing this but upstream Rust have yet to come up with a better solution for
-		# us poor packagers. Required for Split LTO units, which are required for CFI.
-		export RUSTC_BOOTSTRAP=1
-
-		# Users should never hit this, it's purely a development convenience
-		if ver_test $(gn --version || die) -lt ${GN_MIN_VER}; then
-			die "dev-build/gn >= ${GN_MIN_VER} is required to build this Chromium"
-		fi
-	fi
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	unpack ${P}-linux.tar.xz
-	unpack chromium-patches-${PATCH_V}.tar.bz2
-
-	use pgo && unpack chromium-profiler-0.2.tar
-
-	if use test; then
-		# A new testdata tarball is available for each release; but testfonts tend to remain stable
-		# for the duration of a release.
-		# This unpacks directly into/over ${WORKDIR}/${P} so we can just use `unpack`.
-		unpack ${P}-linux-testdata.tar.xz
-		# This just contains a bunch of font files that need to be unpacked (or moved) to the correct location.
-		local testfonts_dir="${WORKDIR}/${P}/third_party/test_fonts"
-		local testfonts_tar="${DISTDIR}/chromium-testfonts-${TEST_FONT:0:10}.tar.gz"
-		tar xf "${testfonts_tar}" -C "${testfonts_dir}" || die "Failed to unpack testfonts"
-	fi
-
-	if use ppc64; then
-		unpack chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# disable global media controls, crashes with libstdc++
-	sed -i -e \
-		"/\"GlobalMediaControlsCastStartStop\"/,+4{s/ENABLED/DISABLED/;}" \
-		"chrome/browser/media/router/media_router_feature.cc"
-
-	local PATCHES=(
-		"${FILESDIR}/chromium-cross-compile.patch"
-		"${FILESDIR}/chromium-109-system-zlib.patch"
-		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-127-bindgen-custom-toolchain.patch"
-		"${FILESDIR}/chromium-131-unbundle-icu-target.patch"
-		"${FILESDIR}/chromium-131-oauth2-client-switches.patch"
-		"${FILESDIR}/chromium-131-const-atomicstring-conversion.patch"
-	)
-
-	PATCHES+=( "${WORKDIR}/chromium-patches-${PATCH_V}" )
-	# We can't use the bundled compiler builtins with the system toolchain
-	# `grep` is a development convenience to ensure we fail early when google changes something.
-	local builtins_match="if (is_clang && !is_nacl && !is_cronet_build) {"
-	grep -q "${builtins_match}" build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
-	sed -i -e "/${builtins_match}/,+2d" build/config/compiler/BUILD.gn
-
-	if use ppc64 ; then
-		local p
-		for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do
-			if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then
-				eapply "${WORKDIR}/debian/patches/${p}"
-			fi
-		done
-		PATCHES+=( "${WORKDIR}/ppc64le" )
-		PATCHES+=( "${WORKDIR}/debian/patches/fixes/rust-clanglib.patch" )
-	fi
-
-	default
-
-	rm third_party/node/linux/node-linux-x64/bin/node || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
-	# remove_bundled_libraries.py walks the source tree and looks for paths containing the substring 'third_party'
-	# whitelist matches use the right-most matching path component, so we need to whitelist from that point down.
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/ceval
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/volk
-		third_party/anonymous_tokens
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/bidimapper
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/content_analysis_sdk
-		third_party/cpuinfo
-		third_party/crabbyavif
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/d3
-		third_party/dav1d
-		third_party/dawn
-		third_party/dawn/third_party/gn/webgpu-cts
-		third_party/dawn/third_party/khronos
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/csp_evaluator
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/json5
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/parsel-js
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs
-		third_party/devtools-frontend/src/front_end/third_party/third-party-web
-		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/front_end/third_party/web-vitals
-		third_party/devtools-frontend/src/third_party
-		third_party/distributed_point_functions
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fast_float
-		third_party/fdlibm
-		third_party/ffmpeg
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/fp16
-		third_party/freetype
-		third_party/fusejs
-		third_party/fxdiv
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/highway
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/ink_stroke_modeler/src/ink_stroke_modeler
-		third_party/ink_stroke_modeler/src/ink_stroke_modeler/internal
-		third_party/ink/src/ink/brush
-		third_party/ink/src/ink/color
-		third_party/ink/src/ink/geometry
-		third_party/ink/src/ink/rendering
-		third_party/ink/src/ink/rendering/skia/common_internal
-		third_party/ink/src/ink/rendering/skia/native
-		third_party/ink/src/ink/rendering/skia/native/internal
-		third_party/ink/src/ink/strokes
-		third_party/ink/src/ink/types
-		third_party/inspector_protocol
-		third_party/ipcz
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/lens_server_proto
-		third_party/leveldatabase
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/fastfeat
-		third_party/libaom/source/libaom/third_party/SVT-AV1
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libavif
-		third_party/libc++
-		third_party/libevent
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/liburlpattern
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/libzip
-		third_party/lit
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/markupsafe
-		third_party/material_color_utilities
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/omnibox_proto
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/opus
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg
-		third_party/pdfium/third_party/libtiff
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/perfetto/protos/third_party/simpleperf
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private_membership
-		third_party/private-join-and-compute
-		third_party/protobuf
-		third_party/pthreadpool
-		third_party/puffin
-		third_party/pyjson5
-		third_party/pyyaml
-		third_party/qcms
-		third_party/rapidhash
-		third_party/re2
-		third_party/rnnoise
-		third_party/rust
-		third_party/ruy
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/selenium-atoms
-		third_party/sentencepiece
-		third_party/sentencepiece/src/third_party/darts_clone
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/six
-		third_party/skia
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/snappy
-		third_party/spirv-headers
-		third_party/spirv-tools
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
-		third_party/swiftshader/third_party/SPIRV-Tools
-		third_party/swiftshader/third_party/subzero
-		third_party/tensorflow_models
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/tflite/src/third_party/xla/third_party/tsl
-		third_party/tflite/src/third_party/xla/xla/tsl/framework
-		third_party/tflite/src/third_party/xla/xla/tsl/lib/random
-		third_party/tflite/src/third_party/xla/xla/tsl/protobuf
-		third_party/tflite/src/third_party/xla/xla/tsl/util
-		third_party/ukey2
-		third_party/unrar
-		third_party/utf
-		third_party/vulkan
-		third_party/wayland
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/xnnpack
-		third_party/zlib/google
-		third_party/zxcvbn-cpp
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/utf8-decoder
-		v8/src/third_party/valgrind
-		v8/third_party/glibc
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-
-	if use test; then
-		# tar tvf /var/cache/distfiles/${P}-testdata.tar.xz | grep '^d' | grep 'third_party' | awk '{print $NF}'
-		keeplibs+=(
-			third_party/google_benchmark/src/include/benchmark
-			third_party/google_benchmark/src/src
-			third_party/perfetto/protos/third_party/pprof
-			third_party/test_fonts
-			third_party/test_fonts/fontconfig
-		)
-	fi
-
-	# USE=system-*
-	if ! use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-
-	if ! use system-png; then
-		keeplibs+=( third_party/libpng )
-	fi
-
-	if ! use system-zstd; then
-		keeplibs+=( third_party/zstd )
-	fi
-
-	# Arch-specific
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		# requires git and clang, bug #832803
-		# Revert https://chromium.googlesource.com/chromium/src/+/b463d0f40b08b4e896e7f458d89ae58ce2a27165%5E%21/third_party/libvpx/generate_gni.sh
-		# and https://chromium.googlesource.com/chromium/src/+/71ebcbce867dd31da5f8b405a28fcb0de0657d91%5E%21/third_party/libvpx/generate_gni.sh
-		# since we're not in a git repo
-		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g; /^git -C/d; /git cl/d; /cd \$BASE_DIR\/\$LIBVPX_SRC_DIR/ign format --in-place \$BASE_DIR\/BUILD.gn\ngn format --in-place \$BASE_DIR\/libvpx_srcs.gni" \
-			generate_gni.sh || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-
-		pushd third_party/ffmpeg >/dev/null || die
-		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
-		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
-		popd >/dev/null || die
-	fi
-
-	# Sanity check keeplibs, on major version bumps it is often necessary to update this list
-	# and this enables us to hit them all at once.
-	# There are some entries that need to be whitelisted (TODO: Why? The file is understandable, the rest seem odd)
-	whitelist_libs=(
-		net/third_party/quic
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/libjingle
-		third_party/mesa
-		third_party/skia/third_party/vulkan
-		third_party/vulkan
-	)
-	local not_found_libs=()
-	for lib in "${keeplibs[@]}"; do
-		if [[ ! -d "${lib}" ]] && ! has "${lib}" "${whitelist_libs[@]}"; then
-			not_found_libs+=( "${lib}" )
-		fi
-	done
-
-	if [[ ${#not_found_libs[@]} -gt 0 ]]; then
-		eerror "The following \`keeplibs\` directories were not found in the source tree:"
-		for lib in "${not_found_libs[@]}"; do
-			eerror "  ${lib}"
-		done
-		die "Please update the ebuild."
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	einfo "Unbundling third-party libraries ..."
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	# TODO: From 127 chromium includes a bunch of binaries? Unbundle them; they're not needed.
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-chromium_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# We already forced the "correct" clang via pkg_setup
-
-	if tc-is-cross-compiler; then
-		CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
-		CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
-		BUILD_AR=${AR}
-		BUILD_CC=${CC}
-		BUILD_CXX=${CXX}
-		BUILD_NM=${NM}
-	fi
-
-	strip-unsupported-flags
-
-	myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	# https://bugs.gentoo.org/918897#c32
-	append-ldflags -Wl,--undefined-version
-	myconf_gn+=" use_lld=true"
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
-		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
-
-		# setup cups-config, build system only uses --libs option
-		if use cups; then
-			mkdir "${T}/cups-config" || die
-			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
-			export PATH="${PATH}:${T}/cups-config"
-		fi
-
-		# Don't inherit PKG_CONFIG_PATH from environment
-		local -x PKG_CONFIG_PATH=
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# bindgen settings
-	# From 127, to make bindgen work, we need to provide a location for libclang.
-	# We patch this in for gentoo - see chromium-*-bindgen-custom-toolchain.patch
-	# rust_bindgen_root = directory with `bin/bindgen` beneath it.
-	myconf_gn+=" rust_bindgen_root=\"${EPREFIX}/usr/\""
-
-	myconf_gn+=" bindgen_libclang_path=\"$(get_llvm_prefix)/$(get_libdir)\""
-	# We don't need to set 'clang_base_bath' for anything in our build
-	# and it defaults to the google toolchain location. Instead provide a location
-	# to where system clang lives sot that bindgen can find system headers (e.g. stddef.h)
-	myconf_gn+=" clang_base_path=\"${EPREFIX}/usr/lib/clang/${LLVM_SLOT}/\""
-
-	myconf_gn+=" rust_sysroot_absolute=\"$(get_rust_prefix)\""
-	myconf_gn+=" rustc_version=\"${RUST_SLOT}\""
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=false"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libwebp
-		libxml
-		libxslt
-		openh264
-		zlib
-	)
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-png; then
-		gn_system_libraries+=( libpng )
-	fi
-	if use system-zstd; then
-		gn_system_libraries+=( zstd )
-	fi
-
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# TODO 131: The above call clobbers `enable_freetype = true` in the freetype gni file
-	# drop the last line, then append the freetype line and a new curly brace to end the block
-	local freetype_gni="build/config/freetype/freetype.gni"
-	sed -i -e '$d' ${freetype_gni} || die
-	echo "  enable_freetype = true" >> ${freetype_gni} || die
-	echo "}" >> ${freetype_gni} || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-
-	if use headless; then
-		myconf_gn+=" use_cups=false"
-		myconf_gn+=" use_kerberos=false"
-		myconf_gn+=" use_pulseaudio=false"
-		myconf_gn+=" use_vaapi=false"
-		myconf_gn+=" rtc_use_pipewire=false"
-	else
-		myconf_gn+=" use_cups=$(usex cups true false)"
-		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
-	fi
-
-	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
-	# using dlopen. This helps with automated detection of ABI mismatches and
-	# prevents silent errors.
-	if use pulseaudio; then
-		myconf_gn+=" link_pulseaudio=true"
-	fi
-
-	# Non-developer builds of Chromium (for example, non-Chrome browsers, or
-	# Chromium builds provided by Linux distros) should disable the testing config
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# The sysroot is the oldest debian image that chromium supports, we don't need it
-	myconf_gn+=" use_sysroot=false"
-
-	# Use in-tree libc++ (buildtools/third_party/libc++ and buildtools/third_party/libc++abi)
-	# instead of the system C++ library for C++ standard library support.
-	# default: true, but let's be explicit (forced since 120 ; USE removed 127).
-	myconf_gn+=" use_custom_libcxx=true"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	if use bindist ; then
-		# proprietary_codecs just forces Chromium to say that it can use h264/aac,
-		# the work is still done by ffmpeg. If this is set to no Chromium
-		# won't be able to load the codec even if the library can handle it
-		myconf_gn+=" proprietary_codecs=true"
-		myconf_gn+=" ffmpeg_branding=\"Chrome\""
-		# build ffmpeg as an external component (libffmpeg.so) that we can remove / substitute
-		myconf_gn+=" is_component_ffmpeg=true"
-	else
-		ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-		myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-		myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-	fi
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		filter-flags "-g*"
-
-		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
-		if [[ ${myarch} == amd64 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf_gn+=" treat_warnings_as_errors=false"
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Disable external code space for V8 for ppc64. It is disabled for ppc64
-	# by default, but cross-compiling on amd64 enables it again.
-	if tc-is-cross-compiler; then
-		if ! use amd64 && ! use arm64; then
-			myconf_gn+=" v8_enable_external_code_space=false"
-		fi
-	fi
-
-	# Only enabled for clang, but gcc has endian macros too
-	myconf_gn+=" v8_use_libm_trig_functions=true"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	# We don't use the same clang version as upstream, and with -Werror
-	# we need to make sure that we don't get superfluous warnings.
-	append-flags -Wno-unknown-warning-option
-	if tc-is-cross-compiler; then
-			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
-			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
-	fi
-
-	# Explicitly disable ICU data file support for system-icu/headless builds.
-	if use system-icu || use headless; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Don't need nocompile checks and GN crashes with our config
-	myconf_gn+=" enable_nocompile_tests=false"
-
-	# 131 began laying the groundwork for replacing freetype with
-	# "Rust-based Fontations set of libraries plus Skia path rendering"
-	# We now need to opt-in
-	myconf_gn+=" enable_freetype=true"
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	if use headless; then
-		myconf_gn+=" ozone_platform=\"headless\""
-		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
-		myconf_gn+=" use_glib=false use_gio=false"
-		myconf_gn+=" use_pangocairo=false use_alsa=false"
-		myconf_gn+=" use_libpci=false use_udev=false"
-		myconf_gn+=" enable_print_preview=false"
-		myconf_gn+=" enable_remoting=false"
-	else
-		myconf_gn+=" use_system_libdrm=true"
-		myconf_gn+=" use_system_minigbm=true"
-		myconf_gn+=" use_xkbcommon=true"
-		if use qt5 || use qt6; then
-			local cbuild_libdir=$(get_libdir)
-			if tc-is-cross-compiler; then
-				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
-				cbuild_libdir=${cbuild_libdir:2}
-				cbuild_libdir=${cbuild_libdir/% }
-			fi
-			if use qt5; then
-				if tc-is-cross-compiler; then
-					myconf_gn+=" moc_qt5_path=\"${EPREFIX}/${cbuild_libdir}/qt5/bin\""
-				else
-					myconf_gn+=" moc_qt5_path=\"$(qt5_get_bindir)\""
-				fi
-			fi
-			if use qt6; then
-				myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\""
-			fi
-
-			myconf_gn+=" use_qt=true"
-			myconf_gn+=" use_qt6=$(usex qt6 true false)"
-		else
-			myconf_gn+=" use_qt=false"
-		fi
-		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
-		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
-		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
-		use wayland && myconf_gn+=" use_system_libffi=true"
-	fi
-
-	myconf_gn+=" use_thin_lto=${use_lto}"
-	myconf_gn+=" thin_lto_enable_optimizations=${use_lto}"
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		myconf_gn+=" is_cfi=${use_lto}"
-		# Don't add symbols to build
-		myconf_gn+=" symbol_level=0"
-	fi
-
-	if use pgo; then
-		myconf_gn+=" chrome_pgo_phase=${1}"
-		if [[ "$1" == "2" ]]; then
-			myconf_gn+=" pgo_data_path=\"${2}\""
-		fi
-	else
-		# Disable PGO
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	# skipping typecheck is only supported on amd64, bug #876157
-	if ! use amd64; then
-		myconf_gn+=" devtools_skip_typecheck=false"
-	fi
-
-	einfo "Configuring Chromium ..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	chromium_configure $(usex pgo 1 0)
-}
-
-chromium_compile() {
-
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	# Build mksnapshot and pax-mark it.
-	if use pax-kernel; then
-		local x
-		for x in mksnapshot v8_context_snapshot_generator; do
-			if tc-is-cross-compiler; then
-				eninja -C out/Release "host/${x}"
-				pax-mark m "out/Release/host/${x}"
-			else
-				eninja -C out/Release "${x}"
-				pax-mark m "out/Release/${x}"
-			fi
-		done
-	fi
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver chrome_sandbox $(use test && echo "base_unittests")
-
-	pax-mark m out/Release/chrome
-
-}
-
-# This function is called from virtx, and must always return so that Xvfb
-# session isn't left running. If we return 1, virtx will call die().
-chromium_profile() {
-	einfo "Profiling for PGO"
-
-	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
-
-	# Remove old profdata in case profiling was interrupted.
-	rm -rf "${1}" || return 1
-
-	if ! "${EPYTHON}" ./chromium_profiler.py \
-		--chrome-executable "${S}/out/Release/chrome" \
-		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
-		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
-		--profile-output "${1}"; then
-		eerror "Profiling failed"
-		return 1
-	fi
-
-	popd >/dev/null || return 1
-}
-
-src_compile() {
-	if use pgo; then
-		local profdata
-
-		profdata="${WORKDIR}/chromium.profdata"
-
-		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
-			chromium_compile
-			virtx chromium_profile "$profdata"
-
-			touch "${WORKDIR}/.pgo-profiled" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
-			# Remove phase 1 output
-			rm -r out/Release || die
-
-			chromium_configure 2 "$profdata"
-
-			touch "${WORKDIR}/.pgo-phase-2-configured" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
-			chromium_compile
-			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
-		fi
-	else
-		chromium_compile
-	fi
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	rm -f out/Release/locales/*.pak.info || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-
-	# Build vk_swiftshader_icd.json; bug #827861
-	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
-		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
-		out/Release/vk_swiftshader_icd.json || die
-}
-
-src_test() {
-	# Initial list of tests to skip pulled from Alpine. Thanks Lauren!
-	# https://issues.chromium.org/issues/40939315
-	local skip_tests=(
-		'MessagePumpLibeventTest.NestedNotification*'
-		ClampTest.Death
-		OptionalTest.DereferencingNoValueCrashes
-		PlatformThreadTest.SetCurrentThreadTypeTest
-		RawPtrTest.TrivialRelocability
-		SafeNumerics.IntMaxOperations
-		StackTraceTest.TraceStackFramePointersFromBuffer
-		StringPieceTest.InvalidLengthDeath
-		StringPieceTest.OutOfBoundsDeath
-		ThreadPoolEnvironmentConfig.CanUseBackgroundPriorityForWorker
-		ValuesUtilTest.FilePath
-		# Gentoo-specific
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/0
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/1
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/2
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/3
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/0
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/1
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/2
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/3
-		CharacterEncodingTest.GetCanonicalEncodingNameByAliasName
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGFPE
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGILL
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGV
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGVNonCanonicalAddress
-		FilePathTest.FromUTF8Unsafe_And_AsUTF8Unsafe
-		FileTest.GetInfoForCreationTime
-		ICUStringConversionsTest.ConvertToUtf8AndNormalize
-		NumberFormattingTest.FormatPercent
-		PathServiceTest.CheckedGetFailure
-		PlatformThreadTest.CanChangeThreadType
-		StackCanary.ChangingStackCanaryCrashesOnReturn
-		StackTraceDeathTest.StackDumpSignalHandlerIsMallocFree
-		SysStrings.SysNativeMBAndWide
-		SysStrings.SysNativeMBToWide
-		SysStrings.SysWideToNativeMB
-		TestLauncherTools.TruncateSnippetFocusedMatchesFatalMessagesTest
-		ToolsSanityTest.BadVirtualCallNull
-		ToolsSanityTest.BadVirtualCallWrongType
-	)
-	local test_filter="-$(IFS=:; printf '%s' "${skip_tests[*]}")"
-	# test-launcher-bot-mode enables parallelism and plain output
-	./out/Release/base_unittests --test-launcher-bot-mode \
-		--test-launcher-jobs="$(makeopts_jobs)" \
-		--gtest_filter="${test_filter}" || die "Tests failed!"
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	newexe out/Release/chrome_sandbox chrome-sandbox
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use X && use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-
-	if use bindist; then
-		# We built libffmpeg as a component library, but we can't distribute it
-		# with proprietary codec support. Remove it and make a symlink to the requested
-		# system library.
-		rm -f out/Release/libffmpeg.so \
-			|| die "Failed to remove bundled libffmpeg.so (with proprietary codecs)"
-		# symlink the libffmpeg.so from either ffmpeg-chromium or ffmpeg[chromium].
-		einfo "Creating symlink to libffmpeg.so from $(usex ffmpeg-chromium ffmpeg-chromium ffmpeg[chromium])..."
-		dosym ../chromium/libffmpeg.so$(usex ffmpeg-chromium .${PV%%\.*} "") \
-			/usr/$(get_libdir)/chromium-browser/libffmpeg.so
-	fi
-
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	# Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland"
-	doins out/Release/xdg-{settings,mime}
-
-	if ! use system-icu && ! use headless; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/MEIPreload
-
-	# Install vk_swiftshader_icd.json; bug #827861
-	doins out/Release/vk_swiftshader_icd.json
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if ! use headless; then
-		if use vaapi; then
-			elog "VA-API is disabled by default at runtime. You have to enable it"
-			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-			elog "in /etc/chromium/default."
-		fi
-		if use screencast; then
-			elog "Screencast is disabled by default at runtime. Either enable it"
-			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use gtk4; then
-			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
-			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use qt5 && use qt6; then
-			elog "Chromium automatically selects Qt5 or Qt6 based on your desktop"
-			elog "environment. To override you need to pass --qt-version=5 or"
-			elog "--qt-version=6, e.g. by adding it to CHROMIUM_FLAGS in"
-			elog "/etc/chromium/default."
-		fi
-	fi
-
-	if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then
-		ewarn "The lack of an '/etc/machine-id' file on this system booted with systemd"
-		ewarn "indicates that the Gentoo handbook was not followed to completion."
-		ewarn ""
-		ewarn "Chromium is known to behave unpredictably with this system configuration;"
-		ewarn "please complete the configuration of this system before logging any bugs."
-	fi
-}
diff --git a/www-client/chromium/chromium-131.0.6778.204.ebuild b/www-client/chromium/chromium-131.0.6778.204.ebuild
deleted file mode 100644
index 9704b68b736c..000000000000
--- a/www-client/chromium/chromium-131.0.6778.204.ebuild
+++ /dev/null
@@ -1,1422 +0,0 @@
-# Copyright 2009-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# PACKAGING NOTES
-
-# This uses a gentoo-created tarball due to Google CI Failures.
-# Use 133(?) as a base for new official tarballs.
-
-GN_MIN_VER=0.2165
-# chromium-tools/get-chromium-toolchain-strings.py
-TEST_FONT=f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35
-
-VIRTUALX_REQUIRED="pgo"
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-LLVM_COMPAT=( 19 )
-PYTHON_COMPAT=( python3_{11..13} )
-PYTHON_REQ_USE="xml(+)"
-RUST_MIN_VER=1.78.0
-RUST_NEEDS_LLVM="yes please"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 multiprocessing ninja-utils pax-utils
-inherit python-any-r1 qmake-utils readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://www.chromium.org/"
-PPC64_HASH="a85b64f07b489b8c6fdb13ecf79c16c56c560fc6"
-PATCH_V="${PV%%\.*}-1"
-SRC_URI="https://chromium-tarballs.distfiles.gentoo.org/${P}-linux.tar.xz
-		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
-	test? (
-		https://chromium-tarballs.distfiles.gentoo.org/${P}-linux-testdata.tar.xz
-		https://chromium-fonts.storage.googleapis.com/${TEST_FONT} -> chromium-testfonts-${TEST_FONT:0:10}.tar.gz
-	)
-	ppc64? (
-		https://gitlab.solidsilicon.io/public-development/open-source/chromium/openpower-patches/-/archive/${PPC64_HASH}/openpower-patches-${PPC64_HASH}.tar.bz2 -> chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
-	)
-	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
-
-LICENSE="BSD"
-SLOT="0/stable"
-# Dev exists mostly to give devs some breathing room for beta/stable releases;
-# it shouldn't be keyworded but adventurous users can select it.
-if [[ ${SLOT} != "0/dev" ]]; then
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
-IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
-IUSE+=" qt5 qt6 +screencast selinux test +vaapi +wayland +widevine"
-RESTRICT="
-	!bindist? ( bindist )
-	!test? ( test )
-"
-
-REQUIRED_USE="
-	!headless? ( || ( X wayland ) )
-	pgo? ( X !wayland )
-	qt6? ( qt5 )
-	screencast? ( wayland )
-	ffmpeg-chromium? ( bindist proprietary-codecs )
-"
-
-COMMON_X_DEPEND="
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxshmfence:=
-"
-
-COMMON_SNAPSHOT_DEPEND="
-	system-icu? ( >=dev-libs/icu-73.0:= )
-	>=dev-libs/libxml2-2.12.4:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	dev-libs/libxslt:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	system-png? ( media-libs/libpng:=[-apng(-)] )
-	system-zstd? ( >=app-arch/zstd-1.5.5:= )
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/mesa:=[gbm(+)]
-	>=media-libs/openh264-1.6.0:=
-	sys-libs/zlib:=
-	x11-libs/libdrm:=
-	!headless? (
-		dev-libs/glib:2
-		>=media-libs/alsa-lib-1.0.19:=
-		pulseaudio? ( media-libs/libpulse:= )
-		sys-apps/pciutils:=
-		kerberos? ( virtual/krb5 )
-		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
-		X? (
-			x11-base/xorg-proto:=
-			x11-libs/libX11:=
-			x11-libs/libxcb:=
-			x11-libs/libXext:=
-		)
-		x11-libs/libxkbcommon:=
-		wayland? (
-			dev-libs/libffi:=
-			dev-libs/wayland:=
-			screencast? ( media-video/pipewire:= )
-		)
-	)
-"
-
-COMMON_DEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	app-arch/bzip2:=
-	dev-libs/expat:=
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	media-libs/flac:=
-	sys-libs/zlib:=[minizip]
-	!headless? (
-		X? ( ${COMMON_X_DEPEND} )
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		media-libs/mesa:=[X?,wayland?]
-		cups? ( >=net-print/cups-1.3.11:= )
-		virtual/udev
-		x11-libs/cairo:=
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango:=
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? ( dev-qt/qtbase:6[gui,widgets] )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!headless? (
-		|| (
-			x11-libs/gtk+:3[X?,wayland?]
-			gui-libs/gtk:4[X?,wayland?]
-		)
-		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
-		qt6? ( dev-qt/qtbase:6[X?,wayland?] )
-	)
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	bindist? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${PV%%\.*} )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	!headless? (
-		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
-		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
-	)
-"
-
-BDEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	!headless? (
-		qt5? ( dev-qt/qtcore:5 )
-		qt6? ( dev-qt/qtbase:6 )
-	)
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
-		llvm-core/lld:${LLVM_SLOT}
-	')
-	pgo? (
-		>=dev-python/selenium-3.141.0
-		>=dev-util/web_page_replay_go-20220314
-	)
-	>=dev-util/bindgen-0.68.0
-	>=dev-build/gn-${GN_MIN_VER}
-	dev-build/ninja
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	dev-vcs/git
-	>=net-libs/nodejs-7.6.0[inspector]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pre_build_checks() {
-	# Check build requirements: bugs #471810, #541816, #914220
-	# We're going to start doing maths here on the size of an unpacked source tarball,
-	# this should make updates easier as chromium continues to balloon in size.
-	local BASE_DISK=24
-	local EXTRA_DISK=1
-	local CHECKREQS_MEMORY="4G"
-	tc-is-cross-compiler && EXTRA_DISK=2
-	if tc-is-lto || use pgo; then
-		CHECKREQS_MEMORY="9G"
-		tc-is-cross-compiler && EXTRA_DISK=4
-		use pgo && EXTRA_DISK=8
-	fi
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		if use custom-cflags; then
-			EXTRA_DISK=13
-		fi
-		CHECKREQS_MEMORY="16G"
-	fi
-	CHECKREQS_DISK_BUILD="$((BASE_DISK + EXTRA_DISK))G"
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
-		pre_build_checks
-	fi
-
-	if use headless; then
-		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland")
-		for myiuse in ${headless_unused_flags[@]}; do
-			use ${myiuse} && ewarn "Ignoring USE=${myiuse}, USE=headless is set."
-		done
-	fi
-
-	if ! use bindist && use ffmpeg-chromium; then
-		ewarn "Ignoring USE=ffmpeg-chromium, USE=bindist is not set."
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
-		pre_build_checks
-
-		# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
-		# We'll set these to clang here then use llvm-utils functions to very explicitly set these
-		# to a sane value.
-		# This is effectively the 'force-clang' path if GCC support is re-added.
-		# TODO: check if the user has already selected a specific impl via make.conf and respect that.
-		use_lto="false"
-		if tc-is-lto; then
-			use_lto="true"
-			# We can rely on GN to do this for us; anecdotally without this builds
-			# take significantly longer with LTO enabled and it doesn't hurt anything.
-			filter-lto
-		fi
-
-		if [ "$use_lto" = "false" ] && use official; then
-			einfo "USE=official selected and LTO not detected."
-			einfo "It is _highly_ recommended that LTO be enabled for performance reasons"
-			einfo "and to be consistent with the upstream \"official\" build optimisations."
-		fi
-
-		if [ "$use_lto" = "false" ] && use test; then
-			die "Tests require CFI which requires LTO"
-		fi
-
-		export use_lto
-
-		# 936858
-		if tc-ld-is-mold; then
-			eerror "Your toolchain is using the mold linker."
-			eerror "This is not supported by Chromium."
-			die "Please switch to a different linker."
-		fi
-
-		llvm-r1_pkg_setup
-		rust_pkg_setup
-
-		# Forcing clang; respect llvm_slot_x to enable selection of impl from LLVM_COMPAT
-		AR=llvm-ar
-		CPP="${CHOST}-clang++-${LLVM_SLOT} -E"
-		NM=llvm-nm
-		CC="${CHOST}-clang-${LLVM_SLOT}"
-		CXX="${CHOST}-clang++-${LLVM_SLOT}"
-
-		if tc-is-cross-compiler; then
-			use pgo && die "The pgo USE flag cannot be used when cross-compiling"
-			CPP="${CBUILD}-clang++-${LLVM_SLOT} -E"
-		fi
-
-		# I hate doing this but upstream Rust have yet to come up with a better solution for
-		# us poor packagers. Required for Split LTO units, which are required for CFI.
-		export RUSTC_BOOTSTRAP=1
-
-		# Users should never hit this, it's purely a development convenience
-		if ver_test $(gn --version || die) -lt ${GN_MIN_VER}; then
-			die "dev-build/gn >= ${GN_MIN_VER} is required to build this Chromium"
-		fi
-	fi
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	unpack ${P}-linux.tar.xz
-	unpack chromium-patches-${PATCH_V}.tar.bz2
-
-	use pgo && unpack chromium-profiler-0.2.tar
-
-	if use test; then
-		# A new testdata tarball is available for each release; but testfonts tend to remain stable
-		# for the duration of a release.
-		# This unpacks directly into/over ${WORKDIR}/${P} so we can just use `unpack`.
-		unpack ${P}-linux-testdata.tar.xz
-		# This just contains a bunch of font files that need to be unpacked (or moved) to the correct location.
-		local testfonts_dir="${WORKDIR}/${P}/third_party/test_fonts"
-		local testfonts_tar="${DISTDIR}/chromium-testfonts-${TEST_FONT:0:10}.tar.gz"
-		tar xf "${testfonts_tar}" -C "${testfonts_dir}" || die "Failed to unpack testfonts"
-	fi
-
-	if use ppc64; then
-		unpack chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# disable global media controls, crashes with libstdc++
-	sed -i -e \
-		"/\"GlobalMediaControlsCastStartStop\"/,+4{s/ENABLED/DISABLED/;}" \
-		"chrome/browser/media/router/media_router_feature.cc"
-
-	local PATCHES=(
-		"${FILESDIR}/chromium-cross-compile.patch"
-		"${FILESDIR}/chromium-109-system-zlib.patch"
-		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-127-bindgen-custom-toolchain.patch"
-		"${FILESDIR}/chromium-131-unbundle-icu-target.patch"
-		"${FILESDIR}/chromium-131-oauth2-client-switches.patch"
-		"${FILESDIR}/chromium-131-const-atomicstring-conversion.patch"
-	)
-
-	PATCHES+=( "${WORKDIR}/chromium-patches-${PATCH_V}" )
-	# We can't use the bundled compiler builtins with the system toolchain
-	# `grep` is a development convenience to ensure we fail early when google changes something.
-	local builtins_match="if (is_clang && !is_nacl && !is_cronet_build) {"
-	grep -q "${builtins_match}" build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
-	sed -i -e "/${builtins_match}/,+2d" build/config/compiler/BUILD.gn
-
-	if use ppc64 ; then
-		local p
-		for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do
-			if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then
-				eapply "${WORKDIR}/debian/patches/${p}"
-			fi
-		done
-		PATCHES+=( "${WORKDIR}/ppc64le" )
-		PATCHES+=( "${WORKDIR}/debian/patches/fixes/rust-clanglib.patch" )
-	fi
-
-	default
-
-	rm third_party/node/linux/node-linux-x64/bin/node || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
-	# remove_bundled_libraries.py walks the source tree and looks for paths containing the substring 'third_party'
-	# whitelist matches use the right-most matching path component, so we need to whitelist from that point down.
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/ceval
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/volk
-		third_party/anonymous_tokens
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/bidimapper
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/content_analysis_sdk
-		third_party/cpuinfo
-		third_party/crabbyavif
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/d3
-		third_party/dav1d
-		third_party/dawn
-		third_party/dawn/third_party/gn/webgpu-cts
-		third_party/dawn/third_party/khronos
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/csp_evaluator
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/json5
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/parsel-js
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs
-		third_party/devtools-frontend/src/front_end/third_party/third-party-web
-		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/front_end/third_party/web-vitals
-		third_party/devtools-frontend/src/third_party
-		third_party/distributed_point_functions
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fast_float
-		third_party/fdlibm
-		third_party/ffmpeg
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/fp16
-		third_party/freetype
-		third_party/fusejs
-		third_party/fxdiv
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/highway
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/ink_stroke_modeler/src/ink_stroke_modeler
-		third_party/ink_stroke_modeler/src/ink_stroke_modeler/internal
-		third_party/ink/src/ink/brush
-		third_party/ink/src/ink/color
-		third_party/ink/src/ink/geometry
-		third_party/ink/src/ink/rendering
-		third_party/ink/src/ink/rendering/skia/common_internal
-		third_party/ink/src/ink/rendering/skia/native
-		third_party/ink/src/ink/rendering/skia/native/internal
-		third_party/ink/src/ink/strokes
-		third_party/ink/src/ink/types
-		third_party/inspector_protocol
-		third_party/ipcz
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/lens_server_proto
-		third_party/leveldatabase
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/fastfeat
-		third_party/libaom/source/libaom/third_party/SVT-AV1
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libavif
-		third_party/libc++
-		third_party/libevent
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/liburlpattern
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/libzip
-		third_party/lit
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/markupsafe
-		third_party/material_color_utilities
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/omnibox_proto
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/opus
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg
-		third_party/pdfium/third_party/libtiff
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/perfetto/protos/third_party/simpleperf
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private_membership
-		third_party/private-join-and-compute
-		third_party/protobuf
-		third_party/pthreadpool
-		third_party/puffin
-		third_party/pyjson5
-		third_party/pyyaml
-		third_party/qcms
-		third_party/rapidhash
-		third_party/re2
-		third_party/rnnoise
-		third_party/rust
-		third_party/ruy
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/selenium-atoms
-		third_party/sentencepiece
-		third_party/sentencepiece/src/third_party/darts_clone
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/six
-		third_party/skia
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/snappy
-		third_party/spirv-headers
-		third_party/spirv-tools
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
-		third_party/swiftshader/third_party/SPIRV-Tools
-		third_party/swiftshader/third_party/subzero
-		third_party/tensorflow_models
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/tflite/src/third_party/xla/third_party/tsl
-		third_party/tflite/src/third_party/xla/xla/tsl/framework
-		third_party/tflite/src/third_party/xla/xla/tsl/lib/random
-		third_party/tflite/src/third_party/xla/xla/tsl/protobuf
-		third_party/tflite/src/third_party/xla/xla/tsl/util
-		third_party/ukey2
-		third_party/unrar
-		third_party/utf
-		third_party/vulkan
-		third_party/wayland
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/xnnpack
-		third_party/zlib/google
-		third_party/zxcvbn-cpp
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/utf8-decoder
-		v8/src/third_party/valgrind
-		v8/third_party/glibc
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-
-	if use test; then
-		# tar tvf /var/cache/distfiles/${P}-testdata.tar.xz | grep '^d' | grep 'third_party' | awk '{print $NF}'
-		keeplibs+=(
-			third_party/google_benchmark/src/include/benchmark
-			third_party/google_benchmark/src/src
-			third_party/perfetto/protos/third_party/pprof
-			third_party/test_fonts
-			third_party/test_fonts/fontconfig
-		)
-	fi
-
-	# USE=system-*
-	if ! use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-
-	if ! use system-png; then
-		keeplibs+=( third_party/libpng )
-	fi
-
-	if ! use system-zstd; then
-		keeplibs+=( third_party/zstd )
-	fi
-
-	# Arch-specific
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		# requires git and clang, bug #832803
-		# Revert https://chromium.googlesource.com/chromium/src/+/b463d0f40b08b4e896e7f458d89ae58ce2a27165%5E%21/third_party/libvpx/generate_gni.sh
-		# and https://chromium.googlesource.com/chromium/src/+/71ebcbce867dd31da5f8b405a28fcb0de0657d91%5E%21/third_party/libvpx/generate_gni.sh
-		# since we're not in a git repo
-		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g; /^git -C/d; /git cl/d; /cd \$BASE_DIR\/\$LIBVPX_SRC_DIR/ign format --in-place \$BASE_DIR\/BUILD.gn\ngn format --in-place \$BASE_DIR\/libvpx_srcs.gni" \
-			generate_gni.sh || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-
-		pushd third_party/ffmpeg >/dev/null || die
-		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
-		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
-		popd >/dev/null || die
-	fi
-
-	# Sanity check keeplibs, on major version bumps it is often necessary to update this list
-	# and this enables us to hit them all at once.
-	# There are some entries that need to be whitelisted (TODO: Why? The file is understandable, the rest seem odd)
-	whitelist_libs=(
-		net/third_party/quic
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/libjingle
-		third_party/mesa
-		third_party/skia/third_party/vulkan
-		third_party/vulkan
-	)
-	local not_found_libs=()
-	for lib in "${keeplibs[@]}"; do
-		if [[ ! -d "${lib}" ]] && ! has "${lib}" "${whitelist_libs[@]}"; then
-			not_found_libs+=( "${lib}" )
-		fi
-	done
-
-	if [[ ${#not_found_libs[@]} -gt 0 ]]; then
-		eerror "The following \`keeplibs\` directories were not found in the source tree:"
-		for lib in "${not_found_libs[@]}"; do
-			eerror "  ${lib}"
-		done
-		die "Please update the ebuild."
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	einfo "Unbundling third-party libraries ..."
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	# TODO: From 127 chromium includes a bunch of binaries? Unbundle them; they're not needed.
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-chromium_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# We already forced the "correct" clang via pkg_setup
-
-	if tc-is-cross-compiler; then
-		CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
-		CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
-		BUILD_AR=${AR}
-		BUILD_CC=${CC}
-		BUILD_CXX=${CXX}
-		BUILD_NM=${NM}
-	fi
-
-	strip-unsupported-flags
-
-	myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	# https://bugs.gentoo.org/918897#c32
-	append-ldflags -Wl,--undefined-version
-	myconf_gn+=" use_lld=true"
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
-		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
-
-		# setup cups-config, build system only uses --libs option
-		if use cups; then
-			mkdir "${T}/cups-config" || die
-			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
-			export PATH="${PATH}:${T}/cups-config"
-		fi
-
-		# Don't inherit PKG_CONFIG_PATH from environment
-		local -x PKG_CONFIG_PATH=
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# bindgen settings
-	# From 127, to make bindgen work, we need to provide a location for libclang.
-	# We patch this in for gentoo - see chromium-*-bindgen-custom-toolchain.patch
-	# rust_bindgen_root = directory with `bin/bindgen` beneath it.
-	myconf_gn+=" rust_bindgen_root=\"${EPREFIX}/usr/\""
-
-	myconf_gn+=" bindgen_libclang_path=\"$(get_llvm_prefix)/$(get_libdir)\""
-	# We don't need to set 'clang_base_bath' for anything in our build
-	# and it defaults to the google toolchain location. Instead provide a location
-	# to where system clang lives sot that bindgen can find system headers (e.g. stddef.h)
-	myconf_gn+=" clang_base_path=\"${EPREFIX}/usr/lib/clang/${LLVM_SLOT}/\""
-
-	myconf_gn+=" rust_sysroot_absolute=\"$(get_rust_prefix)\""
-	myconf_gn+=" rustc_version=\"${RUST_SLOT}\""
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=false"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libwebp
-		libxml
-		libxslt
-		openh264
-		zlib
-	)
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-png; then
-		gn_system_libraries+=( libpng )
-	fi
-	if use system-zstd; then
-		gn_system_libraries+=( zstd )
-	fi
-
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# TODO 131: The above call clobbers `enable_freetype = true` in the freetype gni file
-	# drop the last line, then append the freetype line and a new curly brace to end the block
-	local freetype_gni="build/config/freetype/freetype.gni"
-	sed -i -e '$d' ${freetype_gni} || die
-	echo "  enable_freetype = true" >> ${freetype_gni} || die
-	echo "}" >> ${freetype_gni} || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-
-	if use headless; then
-		myconf_gn+=" use_cups=false"
-		myconf_gn+=" use_kerberos=false"
-		myconf_gn+=" use_pulseaudio=false"
-		myconf_gn+=" use_vaapi=false"
-		myconf_gn+=" rtc_use_pipewire=false"
-	else
-		myconf_gn+=" use_cups=$(usex cups true false)"
-		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
-	fi
-
-	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
-	# using dlopen. This helps with automated detection of ABI mismatches and
-	# prevents silent errors.
-	if use pulseaudio; then
-		myconf_gn+=" link_pulseaudio=true"
-	fi
-
-	# Non-developer builds of Chromium (for example, non-Chrome browsers, or
-	# Chromium builds provided by Linux distros) should disable the testing config
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# The sysroot is the oldest debian image that chromium supports, we don't need it
-	myconf_gn+=" use_sysroot=false"
-
-	# Use in-tree libc++ (buildtools/third_party/libc++ and buildtools/third_party/libc++abi)
-	# instead of the system C++ library for C++ standard library support.
-	# default: true, but let's be explicit (forced since 120 ; USE removed 127).
-	myconf_gn+=" use_custom_libcxx=true"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	if use bindist ; then
-		# proprietary_codecs just forces Chromium to say that it can use h264/aac,
-		# the work is still done by ffmpeg. If this is set to no Chromium
-		# won't be able to load the codec even if the library can handle it
-		myconf_gn+=" proprietary_codecs=true"
-		myconf_gn+=" ffmpeg_branding=\"Chrome\""
-		# build ffmpeg as an external component (libffmpeg.so) that we can remove / substitute
-		myconf_gn+=" is_component_ffmpeg=true"
-	else
-		ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-		myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-		myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-	fi
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		filter-flags "-g*"
-
-		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
-		if [[ ${myarch} == amd64 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf_gn+=" treat_warnings_as_errors=false"
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Disable external code space for V8 for ppc64. It is disabled for ppc64
-	# by default, but cross-compiling on amd64 enables it again.
-	if tc-is-cross-compiler; then
-		if ! use amd64 && ! use arm64; then
-			myconf_gn+=" v8_enable_external_code_space=false"
-		fi
-	fi
-
-	# Only enabled for clang, but gcc has endian macros too
-	myconf_gn+=" v8_use_libm_trig_functions=true"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	# We don't use the same clang version as upstream, and with -Werror
-	# we need to make sure that we don't get superfluous warnings.
-	append-flags -Wno-unknown-warning-option
-	if tc-is-cross-compiler; then
-			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
-			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
-	fi
-
-	# Explicitly disable ICU data file support for system-icu/headless builds.
-	if use system-icu || use headless; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Don't need nocompile checks and GN crashes with our config
-	myconf_gn+=" enable_nocompile_tests=false"
-
-	# 131 began laying the groundwork for replacing freetype with
-	# "Rust-based Fontations set of libraries plus Skia path rendering"
-	# We now need to opt-in
-	myconf_gn+=" enable_freetype=true"
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	if use headless; then
-		myconf_gn+=" ozone_platform=\"headless\""
-		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
-		myconf_gn+=" use_glib=false use_gio=false"
-		myconf_gn+=" use_pangocairo=false use_alsa=false"
-		myconf_gn+=" use_libpci=false use_udev=false"
-		myconf_gn+=" enable_print_preview=false"
-		myconf_gn+=" enable_remoting=false"
-	else
-		myconf_gn+=" use_system_libdrm=true"
-		myconf_gn+=" use_system_minigbm=true"
-		myconf_gn+=" use_xkbcommon=true"
-		if use qt5 || use qt6; then
-			local cbuild_libdir=$(get_libdir)
-			if tc-is-cross-compiler; then
-				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
-				cbuild_libdir=${cbuild_libdir:2}
-				cbuild_libdir=${cbuild_libdir/% }
-			fi
-			if use qt5; then
-				if tc-is-cross-compiler; then
-					myconf_gn+=" moc_qt5_path=\"${EPREFIX}/${cbuild_libdir}/qt5/bin\""
-				else
-					myconf_gn+=" moc_qt5_path=\"$(qt5_get_bindir)\""
-				fi
-			fi
-			if use qt6; then
-				myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\""
-			fi
-
-			myconf_gn+=" use_qt=true"
-			myconf_gn+=" use_qt6=$(usex qt6 true false)"
-		else
-			myconf_gn+=" use_qt=false"
-		fi
-		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
-		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
-		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
-		use wayland && myconf_gn+=" use_system_libffi=true"
-	fi
-
-	myconf_gn+=" use_thin_lto=${use_lto}"
-	myconf_gn+=" thin_lto_enable_optimizations=${use_lto}"
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		myconf_gn+=" is_cfi=${use_lto}"
-		# Don't add symbols to build
-		myconf_gn+=" symbol_level=0"
-	fi
-
-	if use pgo; then
-		myconf_gn+=" chrome_pgo_phase=${1}"
-		if [[ "$1" == "2" ]]; then
-			myconf_gn+=" pgo_data_path=\"${2}\""
-		fi
-	else
-		# Disable PGO
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	# skipping typecheck is only supported on amd64, bug #876157
-	if ! use amd64; then
-		myconf_gn+=" devtools_skip_typecheck=false"
-	fi
-
-	einfo "Configuring Chromium ..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	chromium_configure $(usex pgo 1 0)
-}
-
-chromium_compile() {
-
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	# Build mksnapshot and pax-mark it.
-	if use pax-kernel; then
-		local x
-		for x in mksnapshot v8_context_snapshot_generator; do
-			if tc-is-cross-compiler; then
-				eninja -C out/Release "host/${x}"
-				pax-mark m "out/Release/host/${x}"
-			else
-				eninja -C out/Release "${x}"
-				pax-mark m "out/Release/${x}"
-			fi
-		done
-	fi
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver chrome_sandbox $(use test && echo "base_unittests")
-
-	pax-mark m out/Release/chrome
-
-}
-
-# This function is called from virtx, and must always return so that Xvfb
-# session isn't left running. If we return 1, virtx will call die().
-chromium_profile() {
-	einfo "Profiling for PGO"
-
-	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
-
-	# Remove old profdata in case profiling was interrupted.
-	rm -rf "${1}" || return 1
-
-	if ! "${EPYTHON}" ./chromium_profiler.py \
-		--chrome-executable "${S}/out/Release/chrome" \
-		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
-		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
-		--profile-output "${1}"; then
-		eerror "Profiling failed"
-		return 1
-	fi
-
-	popd >/dev/null || return 1
-}
-
-src_compile() {
-	if use pgo; then
-		local profdata
-
-		profdata="${WORKDIR}/chromium.profdata"
-
-		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
-			chromium_compile
-			virtx chromium_profile "$profdata"
-
-			touch "${WORKDIR}/.pgo-profiled" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
-			# Remove phase 1 output
-			rm -r out/Release || die
-
-			chromium_configure 2 "$profdata"
-
-			touch "${WORKDIR}/.pgo-phase-2-configured" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
-			chromium_compile
-			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
-		fi
-	else
-		chromium_compile
-	fi
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	rm -f out/Release/locales/*.pak.info || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-
-	# Build vk_swiftshader_icd.json; bug #827861
-	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
-		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
-		out/Release/vk_swiftshader_icd.json || die
-}
-
-src_test() {
-	# Initial list of tests to skip pulled from Alpine. Thanks Lauren!
-	# https://issues.chromium.org/issues/40939315
-	local skip_tests=(
-		'MessagePumpLibeventTest.NestedNotification*'
-		ClampTest.Death
-		OptionalTest.DereferencingNoValueCrashes
-		PlatformThreadTest.SetCurrentThreadTypeTest
-		RawPtrTest.TrivialRelocability
-		SafeNumerics.IntMaxOperations
-		StackTraceTest.TraceStackFramePointersFromBuffer
-		StringPieceTest.InvalidLengthDeath
-		StringPieceTest.OutOfBoundsDeath
-		ThreadPoolEnvironmentConfig.CanUseBackgroundPriorityForWorker
-		ValuesUtilTest.FilePath
-		# Gentoo-specific
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/0
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/1
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/2
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/3
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/0
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/1
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/2
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/3
-		CharacterEncodingTest.GetCanonicalEncodingNameByAliasName
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGFPE
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGILL
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGV
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGVNonCanonicalAddress
-		FilePathTest.FromUTF8Unsafe_And_AsUTF8Unsafe
-		FileTest.GetInfoForCreationTime
-		ICUStringConversionsTest.ConvertToUtf8AndNormalize
-		NumberFormattingTest.FormatPercent
-		PathServiceTest.CheckedGetFailure
-		PlatformThreadTest.CanChangeThreadType
-		StackCanary.ChangingStackCanaryCrashesOnReturn
-		StackTraceDeathTest.StackDumpSignalHandlerIsMallocFree
-		SysStrings.SysNativeMBAndWide
-		SysStrings.SysNativeMBToWide
-		SysStrings.SysWideToNativeMB
-		TestLauncherTools.TruncateSnippetFocusedMatchesFatalMessagesTest
-		ToolsSanityTest.BadVirtualCallNull
-		ToolsSanityTest.BadVirtualCallWrongType
-	)
-	local test_filter="-$(IFS=:; printf '%s' "${skip_tests[*]}")"
-	# test-launcher-bot-mode enables parallelism and plain output
-	./out/Release/base_unittests --test-launcher-bot-mode \
-		--test-launcher-jobs="$(makeopts_jobs)" \
-		--gtest_filter="${test_filter}" || die "Tests failed!"
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	newexe out/Release/chrome_sandbox chrome-sandbox
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use X && use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-
-	if use bindist; then
-		# We built libffmpeg as a component library, but we can't distribute it
-		# with proprietary codec support. Remove it and make a symlink to the requested
-		# system library.
-		rm -f out/Release/libffmpeg.so \
-			|| die "Failed to remove bundled libffmpeg.so (with proprietary codecs)"
-		# symlink the libffmpeg.so from either ffmpeg-chromium or ffmpeg[chromium].
-		einfo "Creating symlink to libffmpeg.so from $(usex ffmpeg-chromium ffmpeg-chromium ffmpeg[chromium])..."
-		dosym ../chromium/libffmpeg.so$(usex ffmpeg-chromium .${PV%%\.*} "") \
-			/usr/$(get_libdir)/chromium-browser/libffmpeg.so
-	fi
-
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	# Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland"
-	doins out/Release/xdg-{settings,mime}
-
-	if ! use system-icu && ! use headless; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/MEIPreload
-
-	# Install vk_swiftshader_icd.json; bug #827861
-	doins out/Release/vk_swiftshader_icd.json
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if ! use headless; then
-		if use vaapi; then
-			elog "VA-API is disabled by default at runtime. You have to enable it"
-			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-			elog "in /etc/chromium/default."
-		fi
-		if use screencast; then
-			elog "Screencast is disabled by default at runtime. Either enable it"
-			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use gtk4; then
-			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
-			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use qt5 && use qt6; then
-			elog "Chromium automatically selects Qt5 or Qt6 based on your desktop"
-			elog "environment. To override you need to pass --qt-version=5 or"
-			elog "--qt-version=6, e.g. by adding it to CHROMIUM_FLAGS in"
-			elog "/etc/chromium/default."
-		fi
-	fi
-
-	if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then
-		ewarn "The lack of an '/etc/machine-id' file on this system booted with systemd"
-		ewarn "indicates that the Gentoo handbook was not followed to completion."
-		ewarn ""
-		ewarn "Chromium is known to behave unpredictably with this system configuration;"
-		ewarn "please complete the configuration of this system before logging any bugs."
-	fi
-}
diff --git a/www-client/chromium/chromium-132.0.6834.46.ebuild b/www-client/chromium/chromium-132.0.6834.46.ebuild
deleted file mode 100644
index 6f03ccde307f..000000000000
--- a/www-client/chromium/chromium-132.0.6834.46.ebuild
+++ /dev/null
@@ -1,1433 +0,0 @@
-# Copyright 2009-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# PACKAGING NOTES
-
-# This uses a gentoo-created tarball due to Google CI Failures.
-# Use 133(?) as a base for new official tarballs.
-
-GN_MIN_VER=0.2165
-# chromium-tools/get-chromium-toolchain-strings.py
-TEST_FONT=f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35
-
-VIRTUALX_REQUIRED="pgo"
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-LLVM_COMPAT=( 19 )
-PYTHON_COMPAT=( python3_{11..13} )
-PYTHON_REQ_USE="xml(+)"
-RUST_MIN_VER=1.78.0
-RUST_NEEDS_LLVM="yes please"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 multiprocessing ninja-utils pax-utils
-inherit python-any-r1 qmake-utils readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://www.chromium.org/"
-PPC64_HASH="a85b64f07b489b8c6fdb13ecf79c16c56c560fc6"
-PATCH_V="${PV%%\.*}"
-SRC_URI="https://chromium-tarballs.distfiles.gentoo.org/${P}-linux.tar.xz
-		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
-	test? (
-		https://chromium-tarballs.distfiles.gentoo.org/${P}-linux-testdata.tar.xz
-		https://chromium-fonts.storage.googleapis.com/${TEST_FONT} -> chromium-testfonts-${TEST_FONT:0:10}.tar.gz
-	)
-	ppc64? (
-		https://gitlab.solidsilicon.io/public-development/open-source/chromium/openpower-patches/-/archive/${PPC64_HASH}/openpower-patches-${PPC64_HASH}.tar.bz2 -> chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
-	)
-	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
-
-LICENSE="BSD"
-SLOT="0/beta"
-# Dev exists mostly to give devs some breathing room for beta/stable releases;
-# it shouldn't be keyworded but adventurous users can select it.
-if [[ ${SLOT} != "0/dev" ]]; then
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
-IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
-IUSE+=" qt5 qt6 +screencast selinux test +vaapi +wayland +widevine"
-RESTRICT="
-	!bindist? ( bindist )
-	!test? ( test )
-"
-
-REQUIRED_USE="
-	!headless? ( || ( X wayland ) )
-	pgo? ( X !wayland )
-	qt6? ( qt5 )
-	screencast? ( wayland )
-	ffmpeg-chromium? ( bindist proprietary-codecs )
-"
-
-COMMON_X_DEPEND="
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxshmfence:=
-"
-
-COMMON_SNAPSHOT_DEPEND="
-	system-icu? ( >=dev-libs/icu-73.0:= )
-	>=dev-libs/libxml2-2.12.4:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	dev-libs/libxslt:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	system-png? ( media-libs/libpng:=[-apng(-)] )
-	system-zstd? ( >=app-arch/zstd-1.5.5:= )
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/mesa:=[gbm(+)]
-	>=media-libs/openh264-1.6.0:=
-	sys-libs/zlib:=
-	!headless? (
-		dev-libs/glib:2
-		>=media-libs/alsa-lib-1.0.19:=
-		pulseaudio? ( media-libs/libpulse:= )
-		sys-apps/pciutils:=
-		kerberos? ( virtual/krb5 )
-		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
-		X? (
-			x11-base/xorg-proto:=
-			x11-libs/libX11:=
-			x11-libs/libxcb:=
-			x11-libs/libXext:=
-		)
-		x11-libs/libxkbcommon:=
-		wayland? (
-			dev-libs/libffi:=
-			dev-libs/wayland:=
-			screencast? ( media-video/pipewire:= )
-		)
-	)
-"
-
-COMMON_DEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	app-arch/bzip2:=
-	dev-libs/expat:=
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	media-libs/flac:=
-	sys-libs/zlib:=[minizip]
-	!headless? (
-		X? ( ${COMMON_X_DEPEND} )
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		media-libs/mesa:=[X?,wayland?]
-		cups? ( >=net-print/cups-1.3.11:= )
-		virtual/udev
-		x11-libs/cairo:=
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango:=
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? ( dev-qt/qtbase:6[gui,widgets] )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!headless? (
-		|| (
-			x11-libs/gtk+:3[X?,wayland?]
-			gui-libs/gtk:4[X?,wayland?]
-		)
-		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
-		qt6? ( dev-qt/qtbase:6[X?,wayland?] )
-	)
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	bindist? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${PV%%\.*} )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	!headless? (
-		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
-		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
-	)
-"
-
-BDEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	!headless? (
-		qt5? ( dev-qt/qtcore:5 )
-		qt6? ( dev-qt/qtbase:6 )
-	)
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
-		llvm-core/lld:${LLVM_SLOT}
-	')
-	pgo? (
-		>=dev-python/selenium-3.141.0
-		>=dev-util/web_page_replay_go-20220314
-	)
-	>=dev-util/bindgen-0.68.0
-	>=dev-build/gn-${GN_MIN_VER}
-	dev-build/ninja
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	dev-vcs/git
-	>=net-libs/nodejs-7.6.0[inspector]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pre_build_checks() {
-	# Check build requirements: bugs #471810, #541816, #914220
-	# We're going to start doing maths here on the size of an unpacked source tarball,
-	# this should make updates easier as chromium continues to balloon in size.
-	local BASE_DISK=24
-	local EXTRA_DISK=1
-	local CHECKREQS_MEMORY="4G"
-	tc-is-cross-compiler && EXTRA_DISK=2
-	if tc-is-lto || use pgo; then
-		CHECKREQS_MEMORY="9G"
-		tc-is-cross-compiler && EXTRA_DISK=4
-		use pgo && EXTRA_DISK=8
-	fi
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		if use custom-cflags; then
-			EXTRA_DISK=13
-		fi
-		CHECKREQS_MEMORY="16G"
-	fi
-	CHECKREQS_DISK_BUILD="$((BASE_DISK + EXTRA_DISK))G"
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
-		pre_build_checks
-	fi
-
-	if use headless; then
-		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland")
-		for myiuse in ${headless_unused_flags[@]}; do
-			use ${myiuse} && ewarn "Ignoring USE=${myiuse}, USE=headless is set."
-		done
-	fi
-
-	if ! use bindist && use ffmpeg-chromium; then
-		ewarn "Ignoring USE=ffmpeg-chromium, USE=bindist is not set."
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
-		pre_build_checks
-
-		# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
-		# We'll set these to clang here then use llvm-utils functions to very explicitly set these
-		# to a sane value.
-		# This is effectively the 'force-clang' path if GCC support is re-added.
-		# TODO: check if the user has already selected a specific impl via make.conf and respect that.
-		use_lto="false"
-		if tc-is-lto; then
-			use_lto="true"
-			# We can rely on GN to do this for us; anecdotally without this builds
-			# take significantly longer with LTO enabled and it doesn't hurt anything.
-			filter-lto
-		fi
-
-		if [ "$use_lto" = "false" ] && use official; then
-			einfo "USE=official selected and LTO not detected."
-			einfo "It is _highly_ recommended that LTO be enabled for performance reasons"
-			einfo "and to be consistent with the upstream \"official\" build optimisations."
-		fi
-
-		if [ "$use_lto" = "false" ] && use test; then
-			die "Tests require CFI which requires LTO"
-		fi
-
-		export use_lto
-
-		# 936858
-		if tc-ld-is-mold; then
-			eerror "Your toolchain is using the mold linker."
-			eerror "This is not supported by Chromium."
-			die "Please switch to a different linker."
-		fi
-
-		llvm-r1_pkg_setup
-		rust_pkg_setup
-
-		# Forcing clang; respect llvm_slot_x to enable selection of impl from LLVM_COMPAT
-		AR=llvm-ar
-		CPP="${CHOST}-clang++-${LLVM_SLOT} -E"
-		NM=llvm-nm
-		CC="${CHOST}-clang-${LLVM_SLOT}"
-		CXX="${CHOST}-clang++-${LLVM_SLOT}"
-
-		if tc-is-cross-compiler; then
-			use pgo && die "The pgo USE flag cannot be used when cross-compiling"
-			CPP="${CBUILD}-clang++-${LLVM_SLOT} -E"
-		fi
-
-		# I hate doing this but upstream Rust have yet to come up with a better solution for
-		# us poor packagers. Required for Split LTO units, which are required for CFI.
-		export RUSTC_BOOTSTRAP=1
-
-		# Users should never hit this, it's purely a development convenience
-		if ver_test $(gn --version || die) -lt ${GN_MIN_VER}; then
-			die "dev-build/gn >= ${GN_MIN_VER} is required to build this Chromium"
-		fi
-	fi
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	unpack ${P}-linux.tar.xz
-	unpack chromium-patches-${PATCH_V}.tar.bz2
-
-	use pgo && unpack chromium-profiler-0.2.tar
-
-	if use test; then
-		# A new testdata tarball is available for each release; but testfonts tend to remain stable
-		# for the duration of a release.
-		# This unpacks directly into/over ${WORKDIR}/${P} so we can just use `unpack`.
-		unpack ${P}-linux-testdata.tar.xz
-		# This just contains a bunch of font files that need to be unpacked (or moved) to the correct location.
-		local testfonts_dir="${WORKDIR}/${P}/third_party/test_fonts"
-		local testfonts_tar="${DISTDIR}/chromium-testfonts-${TEST_FONT:0:10}.tar.gz"
-		tar xf "${testfonts_tar}" -C "${testfonts_dir}" || die "Failed to unpack testfonts"
-	fi
-
-	if use ppc64; then
-		unpack chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# disable global media controls, crashes with libstdc++
-	sed -i -e \
-		"/\"GlobalMediaControlsCastStartStop\"/,+4{s/ENABLED/DISABLED/;}" \
-		"chrome/browser/media/router/media_router_feature.cc"
-
-	local PATCHES=(
-		"${FILESDIR}/chromium-cross-compile.patch"
-		"${FILESDIR}/chromium-109-system-zlib.patch"
-		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-131-unbundle-icu-target.patch"
-		"${FILESDIR}/chromium-131-oauth2-client-switches.patch"
-		"${FILESDIR}/chromium-132-bindgen-custom-toolchain.patch"
-	)
-
-	PATCHES+=( "${WORKDIR}/chromium-patches-${PATCH_V}" )
-	# We can't use the bundled compiler builtins with the system toolchain
-	# `grep` is a development convenience to ensure we fail early when google changes something.
-	local builtins_match="if (is_clang && !is_nacl && !is_cronet_build) {"
-	grep -q "${builtins_match}" build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
-	sed -i -e "/${builtins_match}/,+2d" build/config/compiler/BUILD.gn
-
-	if use ppc64 ; then
-		local p
-		for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do
-			if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then
-				eapply "${WORKDIR}/debian/patches/${p}"
-			fi
-		done
-		PATCHES+=( "${WORKDIR}/ppc64le" )
-		PATCHES+=( "${WORKDIR}/debian/patches/fixes/rust-clanglib.patch" )
-	fi
-
-	# This is a nightly option that does not exist any current release
-	# https://github.com/rust-lang/rust/commit/389a399a501a626ebf891ae0bb076c25e325ae64
-	if ver_test ${RUST_SLOT} -le "1.82.0"; then
-		sed '/rustflags = \[ "-Zdefault-visibility=hidden" \]/d' -i build/config/gcc/BUILD.gn ||
-			die "Failed to remove default visibility nightly option"
-	fi
-
-	default
-
-	rm third_party/node/linux/node-linux-x64/bin/node || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
-	# remove_bundled_libraries.py walks the source tree and looks for paths containing the substring 'third_party'
-	# whitelist matches use the right-most matching path component, so we need to whitelist from that point down.
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/ceval
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/volk
-		third_party/anonymous_tokens
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/bidimapper
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/content_analysis_sdk
-		third_party/cpuinfo
-		third_party/crabbyavif
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/d3
-		third_party/dav1d
-		third_party/dawn
-		third_party/dawn/third_party/gn/webgpu-cts
-		third_party/dawn/third_party/khronos
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/csp_evaluator
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/json5
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/parsel-js
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs
-		third_party/devtools-frontend/src/front_end/third_party/third-party-web
-		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/front_end/third_party/web-vitals
-		third_party/devtools-frontend/src/third_party
-		third_party/distributed_point_functions
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fast_float
-		third_party/fdlibm
-		third_party/ffmpeg
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/fp16
-		third_party/freetype
-		third_party/fusejs
-		third_party/fxdiv
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/highway
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/ink_stroke_modeler/src/ink_stroke_modeler
-		third_party/ink_stroke_modeler/src/ink_stroke_modeler/internal
-		third_party/ink/src/ink/brush
-		third_party/ink/src/ink/color
-		third_party/ink/src/ink/geometry
-		third_party/ink/src/ink/rendering
-		third_party/ink/src/ink/rendering/skia/common_internal
-		third_party/ink/src/ink/rendering/skia/native
-		third_party/ink/src/ink/rendering/skia/native/internal
-		third_party/ink/src/ink/strokes
-		third_party/ink/src/ink/types
-		third_party/inspector_protocol
-		third_party/ipcz
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/lens_server_proto
-		third_party/leveldatabase
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/fastfeat
-		third_party/libaom/source/libaom/third_party/SVT-AV1
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libavif
-		third_party/libc++
-		third_party/libdrm
-		third_party/libevent
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libtess2/libtess2
-		third_party/libtess2/src/Include
-		third_party/libtess2/src/Source
-		third_party/liburlpattern
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/libzip
-		third_party/lit
-		third_party/llvm-libc
-		third_party/llvm-libc/src/shared/
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/markupsafe
-		third_party/material_color_utilities
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/omnibox_proto
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/opus
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg
-		third_party/pdfium/third_party/libtiff
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/perfetto/protos/third_party/simpleperf
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private_membership
-		third_party/private-join-and-compute
-		third_party/protobuf
-		third_party/pthreadpool
-		third_party/puffin
-		third_party/pyjson5
-		third_party/pyyaml
-		third_party/qcms
-		third_party/rapidhash
-		third_party/re2
-		third_party/rnnoise
-		third_party/rust
-		third_party/ruy
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/selenium-atoms
-		third_party/sentencepiece
-		third_party/sentencepiece/src/third_party/darts_clone
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/six
-		third_party/skia
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/snappy
-		third_party/spirv-headers
-		third_party/spirv-tools
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
-		third_party/swiftshader/third_party/SPIRV-Tools
-		third_party/swiftshader/third_party/subzero
-		third_party/tensorflow_models
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/tflite/src/third_party/xla/third_party/tsl
-		third_party/tflite/src/third_party/xla/xla/tsl/framework
-		third_party/tflite/src/third_party/xla/xla/tsl/lib/random
-		third_party/tflite/src/third_party/xla/xla/tsl/protobuf
-		third_party/tflite/src/third_party/xla/xla/tsl/util
-		third_party/ukey2
-		third_party/unrar
-		third_party/utf
-		third_party/vulkan
-		third_party/wayland
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/xnnpack
-		third_party/zlib/google
-		third_party/zxcvbn-cpp
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/utf8-decoder
-		v8/src/third_party/valgrind
-		v8/third_party/glibc
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-
-	if use test; then
-		# tar tvf /var/cache/distfiles/${P}-testdata.tar.xz | grep '^d' | grep 'third_party' | awk '{print $NF}'
-		keeplibs+=(
-			third_party/breakpad/breakpad/src/processor
-			third_party/google_benchmark/src/include/benchmark
-			third_party/google_benchmark/src/src
-			third_party/perfetto/protos/third_party/pprof
-			third_party/test_fonts
-			third_party/test_fonts/fontconfig
-		)
-	fi
-
-	# USE=system-*
-	if ! use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-
-	if ! use system-png; then
-		keeplibs+=( third_party/libpng )
-	fi
-
-	if ! use system-zstd; then
-		keeplibs+=( third_party/zstd )
-	fi
-
-	# Arch-specific
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		# requires git and clang, bug #832803
-		# Revert https://chromium.googlesource.com/chromium/src/+/b463d0f40b08b4e896e7f458d89ae58ce2a27165%5E%21/third_party/libvpx/generate_gni.sh
-		# and https://chromium.googlesource.com/chromium/src/+/71ebcbce867dd31da5f8b405a28fcb0de0657d91%5E%21/third_party/libvpx/generate_gni.sh
-		# since we're not in a git repo
-		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g; /^git -C/d; /git cl/d; /cd \$BASE_DIR\/\$LIBVPX_SRC_DIR/ign format --in-place \$BASE_DIR\/BUILD.gn\ngn format --in-place \$BASE_DIR\/libvpx_srcs.gni" \
-			generate_gni.sh || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-
-		pushd third_party/ffmpeg >/dev/null || die
-		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
-		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
-		popd >/dev/null || die
-	fi
-
-	# Sanity check keeplibs, on major version bumps it is often necessary to update this list
-	# and this enables us to hit them all at once.
-	# There are some entries that need to be whitelisted (TODO: Why? The file is understandable, the rest seem odd)
-	whitelist_libs=(
-		net/third_party/quic
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/libjingle
-		third_party/mesa
-		third_party/skia/third_party/vulkan
-		third_party/vulkan
-	)
-	local not_found_libs=()
-	for lib in "${keeplibs[@]}"; do
-		if [[ ! -d "${lib}" ]] && ! has "${lib}" "${whitelist_libs[@]}"; then
-			not_found_libs+=( "${lib}" )
-		fi
-	done
-
-	if [[ ${#not_found_libs[@]} -gt 0 ]]; then
-		eerror "The following \`keeplibs\` directories were not found in the source tree:"
-		for lib in "${not_found_libs[@]}"; do
-			eerror "  ${lib}"
-		done
-		die "Please update the ebuild."
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	einfo "Unbundling third-party libraries ..."
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	# TODO: From 127 chromium includes a bunch of binaries? Unbundle them; they're not needed.
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-chromium_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# We already forced the "correct" clang via pkg_setup
-
-	if tc-is-cross-compiler; then
-		CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
-		CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
-		BUILD_AR=${AR}
-		BUILD_CC=${CC}
-		BUILD_CXX=${CXX}
-		BUILD_NM=${NM}
-	fi
-
-	strip-unsupported-flags
-
-	myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	# https://bugs.gentoo.org/918897#c32
-	append-ldflags -Wl,--undefined-version
-	myconf_gn+=" use_lld=true"
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
-		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
-
-		# setup cups-config, build system only uses --libs option
-		if use cups; then
-			mkdir "${T}/cups-config" || die
-			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
-			export PATH="${PATH}:${T}/cups-config"
-		fi
-
-		# Don't inherit PKG_CONFIG_PATH from environment
-		local -x PKG_CONFIG_PATH=
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# bindgen settings
-	# From 127, to make bindgen work, we need to provide a location for libclang.
-	# We patch this in for gentoo - see chromium-*-bindgen-custom-toolchain.patch
-	# rust_bindgen_root = directory with `bin/bindgen` beneath it.
-	myconf_gn+=" rust_bindgen_root=\"${EPREFIX}/usr/\""
-
-	myconf_gn+=" bindgen_libclang_path=\"$(get_llvm_prefix)/$(get_libdir)\""
-	# We don't need to set 'clang_base_bath' for anything in our build
-	# and it defaults to the google toolchain location. Instead provide a location
-	# to where system clang lives sot that bindgen can find system headers (e.g. stddef.h)
-	myconf_gn+=" clang_base_path=\"${EPREFIX}/usr/lib/clang/${LLVM_SLOT}/\""
-
-	myconf_gn+=" rust_sysroot_absolute=\"$(get_rust_prefix)\""
-	myconf_gn+=" rustc_version=\"${RUST_SLOT}\""
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=false"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libjpeg
-		libwebp
-		libxml
-		libxslt
-		openh264
-		zlib
-	)
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-png; then
-		gn_system_libraries+=( libpng )
-	fi
-	if use system-zstd; then
-		gn_system_libraries+=( zstd )
-	fi
-
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# TODO 131: The above call clobbers `enable_freetype = true` in the freetype gni file
-	# drop the last line, then append the freetype line and a new curly brace to end the block
-	local freetype_gni="build/config/freetype/freetype.gni"
-	sed -i -e '$d' ${freetype_gni} || die
-	echo "  enable_freetype = true" >> ${freetype_gni} || die
-	echo "}" >> ${freetype_gni} || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-
-	if use headless; then
-		myconf_gn+=" use_cups=false"
-		myconf_gn+=" use_kerberos=false"
-		myconf_gn+=" use_pulseaudio=false"
-		myconf_gn+=" use_vaapi=false"
-		myconf_gn+=" rtc_use_pipewire=false"
-	else
-		myconf_gn+=" use_cups=$(usex cups true false)"
-		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
-	fi
-
-	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
-	# using dlopen. This helps with automated detection of ABI mismatches and
-	# prevents silent errors.
-	if use pulseaudio; then
-		myconf_gn+=" link_pulseaudio=true"
-	fi
-
-	# Non-developer builds of Chromium (for example, non-Chrome browsers, or
-	# Chromium builds provided by Linux distros) should disable the testing config
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# The sysroot is the oldest debian image that chromium supports, we don't need it
-	myconf_gn+=" use_sysroot=false"
-
-	# Use in-tree libc++ (buildtools/third_party/libc++ and buildtools/third_party/libc++abi)
-	# instead of the system C++ library for C++ standard library support.
-	# default: true, but let's be explicit (forced since 120 ; USE removed 127).
-	myconf_gn+=" use_custom_libcxx=true"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	if use bindist ; then
-		# proprietary_codecs just forces Chromium to say that it can use h264/aac,
-		# the work is still done by ffmpeg. If this is set to no Chromium
-		# won't be able to load the codec even if the library can handle it
-		myconf_gn+=" proprietary_codecs=true"
-		myconf_gn+=" ffmpeg_branding=\"Chrome\""
-		# build ffmpeg as an external component (libffmpeg.so) that we can remove / substitute
-		myconf_gn+=" is_component_ffmpeg=true"
-	else
-		ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-		myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-		myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-	fi
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		filter-flags "-g*"
-
-		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
-		if [[ ${myarch} == amd64 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf_gn+=" treat_warnings_as_errors=false"
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Disable external code space for V8 for ppc64. It is disabled for ppc64
-	# by default, but cross-compiling on amd64 enables it again.
-	if tc-is-cross-compiler; then
-		if ! use amd64 && ! use arm64; then
-			myconf_gn+=" v8_enable_external_code_space=false"
-		fi
-	fi
-
-	# Only enabled for clang, but gcc has endian macros too
-	myconf_gn+=" v8_use_libm_trig_functions=true"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	# We don't use the same clang version as upstream, and with -Werror
-	# we need to make sure that we don't get superfluous warnings.
-	append-flags -Wno-unknown-warning-option
-	if tc-is-cross-compiler; then
-			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
-			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
-	fi
-
-	# Explicitly disable ICU data file support for system-icu/headless builds.
-	if use system-icu || use headless; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Don't need nocompile checks and GN crashes with our config
-	myconf_gn+=" enable_nocompile_tests=false"
-
-	# 131 began laying the groundwork for replacing freetype with
-	# "Rust-based Fontations set of libraries plus Skia path rendering"
-	# We now need to opt-in
-	myconf_gn+=" enable_freetype=true"
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	if use headless; then
-		myconf_gn+=" ozone_platform=\"headless\""
-		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
-		myconf_gn+=" use_glib=false use_gio=false"
-		myconf_gn+=" use_pangocairo=false use_alsa=false"
-		myconf_gn+=" use_libpci=false use_udev=false"
-		myconf_gn+=" enable_print_preview=false"
-		myconf_gn+=" enable_remoting=false"
-	else
-		myconf_gn+=" use_system_minigbm=true"
-		myconf_gn+=" use_xkbcommon=true"
-		if use qt5 || use qt6; then
-			local cbuild_libdir=$(get_libdir)
-			if tc-is-cross-compiler; then
-				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
-				cbuild_libdir=${cbuild_libdir:2}
-				cbuild_libdir=${cbuild_libdir/% }
-			fi
-			if use qt5; then
-				if tc-is-cross-compiler; then
-					myconf_gn+=" moc_qt5_path=\"${EPREFIX}/${cbuild_libdir}/qt5/bin\""
-				else
-					myconf_gn+=" moc_qt5_path=\"$(qt5_get_bindir)\""
-				fi
-			fi
-			if use qt6; then
-				myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\""
-			fi
-
-			myconf_gn+=" use_qt=true"
-			myconf_gn+=" use_qt6=$(usex qt6 true false)"
-		else
-			myconf_gn+=" use_qt=false"
-		fi
-		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
-		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
-		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
-		use wayland && myconf_gn+=" use_system_libffi=true"
-	fi
-
-	myconf_gn+=" use_thin_lto=${use_lto}"
-	myconf_gn+=" thin_lto_enable_optimizations=${use_lto}"
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		myconf_gn+=" is_cfi=${use_lto}"
-		# Don't add symbols to build
-		myconf_gn+=" symbol_level=0"
-	fi
-
-	if use pgo; then
-		myconf_gn+=" chrome_pgo_phase=${1}"
-		if [[ "$1" == "2" ]]; then
-			myconf_gn+=" pgo_data_path=\"${2}\""
-		fi
-	else
-		# Disable PGO
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	# skipping typecheck is only supported on amd64, bug #876157
-	if ! use amd64; then
-		myconf_gn+=" devtools_skip_typecheck=false"
-	fi
-
-	einfo "Configuring Chromium ..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	chromium_configure $(usex pgo 1 0)
-}
-
-chromium_compile() {
-
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	# Build mksnapshot and pax-mark it.
-	if use pax-kernel; then
-		local x
-		for x in mksnapshot v8_context_snapshot_generator; do
-			if tc-is-cross-compiler; then
-				eninja -C out/Release "host/${x}"
-				pax-mark m "out/Release/host/${x}"
-			else
-				eninja -C out/Release "${x}"
-				pax-mark m "out/Release/${x}"
-			fi
-		done
-	fi
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver chrome_sandbox $(use test && echo "base_unittests")
-
-	pax-mark m out/Release/chrome
-
-}
-
-# This function is called from virtx, and must always return so that Xvfb
-# session isn't left running. If we return 1, virtx will call die().
-chromium_profile() {
-	einfo "Profiling for PGO"
-
-	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
-
-	# Remove old profdata in case profiling was interrupted.
-	rm -rf "${1}" || return 1
-
-	if ! "${EPYTHON}" ./chromium_profiler.py \
-		--chrome-executable "${S}/out/Release/chrome" \
-		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
-		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
-		--profile-output "${1}"; then
-		eerror "Profiling failed"
-		return 1
-	fi
-
-	popd >/dev/null || return 1
-}
-
-src_compile() {
-	if use pgo; then
-		local profdata
-
-		profdata="${WORKDIR}/chromium.profdata"
-
-		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
-			chromium_compile
-			virtx chromium_profile "$profdata"
-
-			touch "${WORKDIR}/.pgo-profiled" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
-			# Remove phase 1 output
-			rm -r out/Release || die
-
-			chromium_configure 2 "$profdata"
-
-			touch "${WORKDIR}/.pgo-phase-2-configured" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
-			chromium_compile
-			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
-		fi
-	else
-		chromium_compile
-	fi
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	rm -f out/Release/locales/*.pak.info || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-
-	# Build vk_swiftshader_icd.json; bug #827861
-	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
-		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
-		out/Release/vk_swiftshader_icd.json || die
-}
-
-src_test() {
-	# Initial list of tests to skip pulled from Alpine. Thanks Lauren!
-	# https://issues.chromium.org/issues/40939315
-	local skip_tests=(
-		'MessagePumpLibeventTest.NestedNotification*'
-		ClampTest.Death
-		OptionalTest.DereferencingNoValueCrashes
-		PlatformThreadTest.SetCurrentThreadTypeTest
-		RawPtrTest.TrivialRelocability
-		SafeNumerics.IntMaxOperations
-		StackTraceTest.TraceStackFramePointersFromBuffer
-		StringPieceTest.InvalidLengthDeath
-		StringPieceTest.OutOfBoundsDeath
-		ThreadPoolEnvironmentConfig.CanUseBackgroundPriorityForWorker
-		ValuesUtilTest.FilePath
-		# Gentoo-specific
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/0
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/1
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/2
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/3
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/0
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/1
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/2
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/3
-		CharacterEncodingTest.GetCanonicalEncodingNameByAliasName
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGFPE
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGILL
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGV
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGVNonCanonicalAddress
-		FilePathTest.FromUTF8Unsafe_And_AsUTF8Unsafe
-		FileTest.GetInfoForCreationTime
-		ICUStringConversionsTest.ConvertToUtf8AndNormalize
-		NumberFormattingTest.FormatPercent
-		PathServiceTest.CheckedGetFailure
-		PlatformThreadTest.CanChangeThreadType
-		RustLogIntegrationTest.CheckAllSeverity
-		StackCanary.ChangingStackCanaryCrashesOnReturn
-		StackTraceDeathTest.StackDumpSignalHandlerIsMallocFree
-		SysStrings.SysNativeMBAndWide
-		SysStrings.SysNativeMBToWide
-		SysStrings.SysWideToNativeMB
-		TestLauncherTools.TruncateSnippetFocusedMatchesFatalMessagesTest
-		ToolsSanityTest.BadVirtualCallNull
-		ToolsSanityTest.BadVirtualCallWrongType
-	)
-	local test_filter="-$(IFS=:; printf '%s' "${skip_tests[*]}")"
-	# test-launcher-bot-mode enables parallelism and plain output
-	./out/Release/base_unittests --test-launcher-bot-mode \
-		--test-launcher-jobs="$(makeopts_jobs)" \
-		--gtest_filter="${test_filter}" || die "Tests failed!"
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	newexe out/Release/chrome_sandbox chrome-sandbox
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use X && use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-
-	if use bindist; then
-		# We built libffmpeg as a component library, but we can't distribute it
-		# with proprietary codec support. Remove it and make a symlink to the requested
-		# system library.
-		rm -f out/Release/libffmpeg.so \
-			|| die "Failed to remove bundled libffmpeg.so (with proprietary codecs)"
-		# symlink the libffmpeg.so from either ffmpeg-chromium or ffmpeg[chromium].
-		einfo "Creating symlink to libffmpeg.so from $(usex ffmpeg-chromium ffmpeg-chromium ffmpeg[chromium])..."
-		dosym ../chromium/libffmpeg.so$(usex ffmpeg-chromium .${PV%%\.*} "") \
-			/usr/$(get_libdir)/chromium-browser/libffmpeg.so
-	fi
-
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	# Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland"
-	doins out/Release/xdg-{settings,mime}
-
-	if ! use system-icu && ! use headless; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/MEIPreload
-
-	# Install vk_swiftshader_icd.json; bug #827861
-	doins out/Release/vk_swiftshader_icd.json
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if ! use headless; then
-		if use vaapi; then
-			elog "VA-API is disabled by default at runtime. You have to enable it"
-			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-			elog "in /etc/chromium/default."
-		fi
-		if use screencast; then
-			elog "Screencast is disabled by default at runtime. Either enable it"
-			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use gtk4; then
-			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
-			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use qt5 && use qt6; then
-			elog "Chromium automatically selects Qt5 or Qt6 based on your desktop"
-			elog "environment. To override you need to pass --qt-version=5 or"
-			elog "--qt-version=6, e.g. by adding it to CHROMIUM_FLAGS in"
-			elog "/etc/chromium/default."
-		fi
-	fi
-
-	if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then
-		ewarn "The lack of an '/etc/machine-id' file on this system booted with systemd"
-		ewarn "indicates that the Gentoo handbook was not followed to completion."
-		ewarn ""
-		ewarn "Chromium is known to behave unpredictably with this system configuration;"
-		ewarn "please complete the configuration of this system before logging any bugs."
-	fi
-}
diff --git a/www-client/chromium/chromium-132.0.6834.57.ebuild b/www-client/chromium/chromium-132.0.6834.57.ebuild
deleted file mode 100644
index 6f03ccde307f..000000000000
--- a/www-client/chromium/chromium-132.0.6834.57.ebuild
+++ /dev/null
@@ -1,1433 +0,0 @@
-# Copyright 2009-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# PACKAGING NOTES
-
-# This uses a gentoo-created tarball due to Google CI Failures.
-# Use 133(?) as a base for new official tarballs.
-
-GN_MIN_VER=0.2165
-# chromium-tools/get-chromium-toolchain-strings.py
-TEST_FONT=f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35
-
-VIRTUALX_REQUIRED="pgo"
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-LLVM_COMPAT=( 19 )
-PYTHON_COMPAT=( python3_{11..13} )
-PYTHON_REQ_USE="xml(+)"
-RUST_MIN_VER=1.78.0
-RUST_NEEDS_LLVM="yes please"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 multiprocessing ninja-utils pax-utils
-inherit python-any-r1 qmake-utils readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://www.chromium.org/"
-PPC64_HASH="a85b64f07b489b8c6fdb13ecf79c16c56c560fc6"
-PATCH_V="${PV%%\.*}"
-SRC_URI="https://chromium-tarballs.distfiles.gentoo.org/${P}-linux.tar.xz
-		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
-	test? (
-		https://chromium-tarballs.distfiles.gentoo.org/${P}-linux-testdata.tar.xz
-		https://chromium-fonts.storage.googleapis.com/${TEST_FONT} -> chromium-testfonts-${TEST_FONT:0:10}.tar.gz
-	)
-	ppc64? (
-		https://gitlab.solidsilicon.io/public-development/open-source/chromium/openpower-patches/-/archive/${PPC64_HASH}/openpower-patches-${PPC64_HASH}.tar.bz2 -> chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
-	)
-	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
-
-LICENSE="BSD"
-SLOT="0/beta"
-# Dev exists mostly to give devs some breathing room for beta/stable releases;
-# it shouldn't be keyworded but adventurous users can select it.
-if [[ ${SLOT} != "0/dev" ]]; then
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
-IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
-IUSE+=" qt5 qt6 +screencast selinux test +vaapi +wayland +widevine"
-RESTRICT="
-	!bindist? ( bindist )
-	!test? ( test )
-"
-
-REQUIRED_USE="
-	!headless? ( || ( X wayland ) )
-	pgo? ( X !wayland )
-	qt6? ( qt5 )
-	screencast? ( wayland )
-	ffmpeg-chromium? ( bindist proprietary-codecs )
-"
-
-COMMON_X_DEPEND="
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxshmfence:=
-"
-
-COMMON_SNAPSHOT_DEPEND="
-	system-icu? ( >=dev-libs/icu-73.0:= )
-	>=dev-libs/libxml2-2.12.4:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	dev-libs/libxslt:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	system-png? ( media-libs/libpng:=[-apng(-)] )
-	system-zstd? ( >=app-arch/zstd-1.5.5:= )
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/mesa:=[gbm(+)]
-	>=media-libs/openh264-1.6.0:=
-	sys-libs/zlib:=
-	!headless? (
-		dev-libs/glib:2
-		>=media-libs/alsa-lib-1.0.19:=
-		pulseaudio? ( media-libs/libpulse:= )
-		sys-apps/pciutils:=
-		kerberos? ( virtual/krb5 )
-		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
-		X? (
-			x11-base/xorg-proto:=
-			x11-libs/libX11:=
-			x11-libs/libxcb:=
-			x11-libs/libXext:=
-		)
-		x11-libs/libxkbcommon:=
-		wayland? (
-			dev-libs/libffi:=
-			dev-libs/wayland:=
-			screencast? ( media-video/pipewire:= )
-		)
-	)
-"
-
-COMMON_DEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	app-arch/bzip2:=
-	dev-libs/expat:=
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	media-libs/flac:=
-	sys-libs/zlib:=[minizip]
-	!headless? (
-		X? ( ${COMMON_X_DEPEND} )
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		media-libs/mesa:=[X?,wayland?]
-		cups? ( >=net-print/cups-1.3.11:= )
-		virtual/udev
-		x11-libs/cairo:=
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango:=
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? ( dev-qt/qtbase:6[gui,widgets] )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!headless? (
-		|| (
-			x11-libs/gtk+:3[X?,wayland?]
-			gui-libs/gtk:4[X?,wayland?]
-		)
-		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
-		qt6? ( dev-qt/qtbase:6[X?,wayland?] )
-	)
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	bindist? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${PV%%\.*} )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	!headless? (
-		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
-		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
-	)
-"
-
-BDEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	!headless? (
-		qt5? ( dev-qt/qtcore:5 )
-		qt6? ( dev-qt/qtbase:6 )
-	)
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
-		llvm-core/lld:${LLVM_SLOT}
-	')
-	pgo? (
-		>=dev-python/selenium-3.141.0
-		>=dev-util/web_page_replay_go-20220314
-	)
-	>=dev-util/bindgen-0.68.0
-	>=dev-build/gn-${GN_MIN_VER}
-	dev-build/ninja
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	dev-vcs/git
-	>=net-libs/nodejs-7.6.0[inspector]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pre_build_checks() {
-	# Check build requirements: bugs #471810, #541816, #914220
-	# We're going to start doing maths here on the size of an unpacked source tarball,
-	# this should make updates easier as chromium continues to balloon in size.
-	local BASE_DISK=24
-	local EXTRA_DISK=1
-	local CHECKREQS_MEMORY="4G"
-	tc-is-cross-compiler && EXTRA_DISK=2
-	if tc-is-lto || use pgo; then
-		CHECKREQS_MEMORY="9G"
-		tc-is-cross-compiler && EXTRA_DISK=4
-		use pgo && EXTRA_DISK=8
-	fi
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		if use custom-cflags; then
-			EXTRA_DISK=13
-		fi
-		CHECKREQS_MEMORY="16G"
-	fi
-	CHECKREQS_DISK_BUILD="$((BASE_DISK + EXTRA_DISK))G"
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
-		pre_build_checks
-	fi
-
-	if use headless; then
-		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland")
-		for myiuse in ${headless_unused_flags[@]}; do
-			use ${myiuse} && ewarn "Ignoring USE=${myiuse}, USE=headless is set."
-		done
-	fi
-
-	if ! use bindist && use ffmpeg-chromium; then
-		ewarn "Ignoring USE=ffmpeg-chromium, USE=bindist is not set."
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
-		pre_build_checks
-
-		# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
-		# We'll set these to clang here then use llvm-utils functions to very explicitly set these
-		# to a sane value.
-		# This is effectively the 'force-clang' path if GCC support is re-added.
-		# TODO: check if the user has already selected a specific impl via make.conf and respect that.
-		use_lto="false"
-		if tc-is-lto; then
-			use_lto="true"
-			# We can rely on GN to do this for us; anecdotally without this builds
-			# take significantly longer with LTO enabled and it doesn't hurt anything.
-			filter-lto
-		fi
-
-		if [ "$use_lto" = "false" ] && use official; then
-			einfo "USE=official selected and LTO not detected."
-			einfo "It is _highly_ recommended that LTO be enabled for performance reasons"
-			einfo "and to be consistent with the upstream \"official\" build optimisations."
-		fi
-
-		if [ "$use_lto" = "false" ] && use test; then
-			die "Tests require CFI which requires LTO"
-		fi
-
-		export use_lto
-
-		# 936858
-		if tc-ld-is-mold; then
-			eerror "Your toolchain is using the mold linker."
-			eerror "This is not supported by Chromium."
-			die "Please switch to a different linker."
-		fi
-
-		llvm-r1_pkg_setup
-		rust_pkg_setup
-
-		# Forcing clang; respect llvm_slot_x to enable selection of impl from LLVM_COMPAT
-		AR=llvm-ar
-		CPP="${CHOST}-clang++-${LLVM_SLOT} -E"
-		NM=llvm-nm
-		CC="${CHOST}-clang-${LLVM_SLOT}"
-		CXX="${CHOST}-clang++-${LLVM_SLOT}"
-
-		if tc-is-cross-compiler; then
-			use pgo && die "The pgo USE flag cannot be used when cross-compiling"
-			CPP="${CBUILD}-clang++-${LLVM_SLOT} -E"
-		fi
-
-		# I hate doing this but upstream Rust have yet to come up with a better solution for
-		# us poor packagers. Required for Split LTO units, which are required for CFI.
-		export RUSTC_BOOTSTRAP=1
-
-		# Users should never hit this, it's purely a development convenience
-		if ver_test $(gn --version || die) -lt ${GN_MIN_VER}; then
-			die "dev-build/gn >= ${GN_MIN_VER} is required to build this Chromium"
-		fi
-	fi
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	unpack ${P}-linux.tar.xz
-	unpack chromium-patches-${PATCH_V}.tar.bz2
-
-	use pgo && unpack chromium-profiler-0.2.tar
-
-	if use test; then
-		# A new testdata tarball is available for each release; but testfonts tend to remain stable
-		# for the duration of a release.
-		# This unpacks directly into/over ${WORKDIR}/${P} so we can just use `unpack`.
-		unpack ${P}-linux-testdata.tar.xz
-		# This just contains a bunch of font files that need to be unpacked (or moved) to the correct location.
-		local testfonts_dir="${WORKDIR}/${P}/third_party/test_fonts"
-		local testfonts_tar="${DISTDIR}/chromium-testfonts-${TEST_FONT:0:10}.tar.gz"
-		tar xf "${testfonts_tar}" -C "${testfonts_dir}" || die "Failed to unpack testfonts"
-	fi
-
-	if use ppc64; then
-		unpack chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# disable global media controls, crashes with libstdc++
-	sed -i -e \
-		"/\"GlobalMediaControlsCastStartStop\"/,+4{s/ENABLED/DISABLED/;}" \
-		"chrome/browser/media/router/media_router_feature.cc"
-
-	local PATCHES=(
-		"${FILESDIR}/chromium-cross-compile.patch"
-		"${FILESDIR}/chromium-109-system-zlib.patch"
-		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-131-unbundle-icu-target.patch"
-		"${FILESDIR}/chromium-131-oauth2-client-switches.patch"
-		"${FILESDIR}/chromium-132-bindgen-custom-toolchain.patch"
-	)
-
-	PATCHES+=( "${WORKDIR}/chromium-patches-${PATCH_V}" )
-	# We can't use the bundled compiler builtins with the system toolchain
-	# `grep` is a development convenience to ensure we fail early when google changes something.
-	local builtins_match="if (is_clang && !is_nacl && !is_cronet_build) {"
-	grep -q "${builtins_match}" build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
-	sed -i -e "/${builtins_match}/,+2d" build/config/compiler/BUILD.gn
-
-	if use ppc64 ; then
-		local p
-		for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do
-			if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then
-				eapply "${WORKDIR}/debian/patches/${p}"
-			fi
-		done
-		PATCHES+=( "${WORKDIR}/ppc64le" )
-		PATCHES+=( "${WORKDIR}/debian/patches/fixes/rust-clanglib.patch" )
-	fi
-
-	# This is a nightly option that does not exist any current release
-	# https://github.com/rust-lang/rust/commit/389a399a501a626ebf891ae0bb076c25e325ae64
-	if ver_test ${RUST_SLOT} -le "1.82.0"; then
-		sed '/rustflags = \[ "-Zdefault-visibility=hidden" \]/d' -i build/config/gcc/BUILD.gn ||
-			die "Failed to remove default visibility nightly option"
-	fi
-
-	default
-
-	rm third_party/node/linux/node-linux-x64/bin/node || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
-	# remove_bundled_libraries.py walks the source tree and looks for paths containing the substring 'third_party'
-	# whitelist matches use the right-most matching path component, so we need to whitelist from that point down.
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/ceval
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/volk
-		third_party/anonymous_tokens
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/bidimapper
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/content_analysis_sdk
-		third_party/cpuinfo
-		third_party/crabbyavif
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/d3
-		third_party/dav1d
-		third_party/dawn
-		third_party/dawn/third_party/gn/webgpu-cts
-		third_party/dawn/third_party/khronos
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/csp_evaluator
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/json5
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/parsel-js
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs
-		third_party/devtools-frontend/src/front_end/third_party/third-party-web
-		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/front_end/third_party/web-vitals
-		third_party/devtools-frontend/src/third_party
-		third_party/distributed_point_functions
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fast_float
-		third_party/fdlibm
-		third_party/ffmpeg
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/fp16
-		third_party/freetype
-		third_party/fusejs
-		third_party/fxdiv
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/highway
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/ink_stroke_modeler/src/ink_stroke_modeler
-		third_party/ink_stroke_modeler/src/ink_stroke_modeler/internal
-		third_party/ink/src/ink/brush
-		third_party/ink/src/ink/color
-		third_party/ink/src/ink/geometry
-		third_party/ink/src/ink/rendering
-		third_party/ink/src/ink/rendering/skia/common_internal
-		third_party/ink/src/ink/rendering/skia/native
-		third_party/ink/src/ink/rendering/skia/native/internal
-		third_party/ink/src/ink/strokes
-		third_party/ink/src/ink/types
-		third_party/inspector_protocol
-		third_party/ipcz
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/lens_server_proto
-		third_party/leveldatabase
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/fastfeat
-		third_party/libaom/source/libaom/third_party/SVT-AV1
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libavif
-		third_party/libc++
-		third_party/libdrm
-		third_party/libevent
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libtess2/libtess2
-		third_party/libtess2/src/Include
-		third_party/libtess2/src/Source
-		third_party/liburlpattern
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/libzip
-		third_party/lit
-		third_party/llvm-libc
-		third_party/llvm-libc/src/shared/
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/markupsafe
-		third_party/material_color_utilities
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/omnibox_proto
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/opus
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg
-		third_party/pdfium/third_party/libtiff
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/perfetto/protos/third_party/simpleperf
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private_membership
-		third_party/private-join-and-compute
-		third_party/protobuf
-		third_party/pthreadpool
-		third_party/puffin
-		third_party/pyjson5
-		third_party/pyyaml
-		third_party/qcms
-		third_party/rapidhash
-		third_party/re2
-		third_party/rnnoise
-		third_party/rust
-		third_party/ruy
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/selenium-atoms
-		third_party/sentencepiece
-		third_party/sentencepiece/src/third_party/darts_clone
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/six
-		third_party/skia
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/snappy
-		third_party/spirv-headers
-		third_party/spirv-tools
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
-		third_party/swiftshader/third_party/SPIRV-Tools
-		third_party/swiftshader/third_party/subzero
-		third_party/tensorflow_models
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/tflite/src/third_party/xla/third_party/tsl
-		third_party/tflite/src/third_party/xla/xla/tsl/framework
-		third_party/tflite/src/third_party/xla/xla/tsl/lib/random
-		third_party/tflite/src/third_party/xla/xla/tsl/protobuf
-		third_party/tflite/src/third_party/xla/xla/tsl/util
-		third_party/ukey2
-		third_party/unrar
-		third_party/utf
-		third_party/vulkan
-		third_party/wayland
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/xnnpack
-		third_party/zlib/google
-		third_party/zxcvbn-cpp
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/utf8-decoder
-		v8/src/third_party/valgrind
-		v8/third_party/glibc
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-
-	if use test; then
-		# tar tvf /var/cache/distfiles/${P}-testdata.tar.xz | grep '^d' | grep 'third_party' | awk '{print $NF}'
-		keeplibs+=(
-			third_party/breakpad/breakpad/src/processor
-			third_party/google_benchmark/src/include/benchmark
-			third_party/google_benchmark/src/src
-			third_party/perfetto/protos/third_party/pprof
-			third_party/test_fonts
-			third_party/test_fonts/fontconfig
-		)
-	fi
-
-	# USE=system-*
-	if ! use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-
-	if ! use system-png; then
-		keeplibs+=( third_party/libpng )
-	fi
-
-	if ! use system-zstd; then
-		keeplibs+=( third_party/zstd )
-	fi
-
-	# Arch-specific
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		# requires git and clang, bug #832803
-		# Revert https://chromium.googlesource.com/chromium/src/+/b463d0f40b08b4e896e7f458d89ae58ce2a27165%5E%21/third_party/libvpx/generate_gni.sh
-		# and https://chromium.googlesource.com/chromium/src/+/71ebcbce867dd31da5f8b405a28fcb0de0657d91%5E%21/third_party/libvpx/generate_gni.sh
-		# since we're not in a git repo
-		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g; /^git -C/d; /git cl/d; /cd \$BASE_DIR\/\$LIBVPX_SRC_DIR/ign format --in-place \$BASE_DIR\/BUILD.gn\ngn format --in-place \$BASE_DIR\/libvpx_srcs.gni" \
-			generate_gni.sh || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-
-		pushd third_party/ffmpeg >/dev/null || die
-		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
-		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
-		popd >/dev/null || die
-	fi
-
-	# Sanity check keeplibs, on major version bumps it is often necessary to update this list
-	# and this enables us to hit them all at once.
-	# There are some entries that need to be whitelisted (TODO: Why? The file is understandable, the rest seem odd)
-	whitelist_libs=(
-		net/third_party/quic
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/libjingle
-		third_party/mesa
-		third_party/skia/third_party/vulkan
-		third_party/vulkan
-	)
-	local not_found_libs=()
-	for lib in "${keeplibs[@]}"; do
-		if [[ ! -d "${lib}" ]] && ! has "${lib}" "${whitelist_libs[@]}"; then
-			not_found_libs+=( "${lib}" )
-		fi
-	done
-
-	if [[ ${#not_found_libs[@]} -gt 0 ]]; then
-		eerror "The following \`keeplibs\` directories were not found in the source tree:"
-		for lib in "${not_found_libs[@]}"; do
-			eerror "  ${lib}"
-		done
-		die "Please update the ebuild."
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	einfo "Unbundling third-party libraries ..."
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	# TODO: From 127 chromium includes a bunch of binaries? Unbundle them; they're not needed.
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-chromium_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# We already forced the "correct" clang via pkg_setup
-
-	if tc-is-cross-compiler; then
-		CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
-		CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
-		BUILD_AR=${AR}
-		BUILD_CC=${CC}
-		BUILD_CXX=${CXX}
-		BUILD_NM=${NM}
-	fi
-
-	strip-unsupported-flags
-
-	myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	# https://bugs.gentoo.org/918897#c32
-	append-ldflags -Wl,--undefined-version
-	myconf_gn+=" use_lld=true"
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
-		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
-
-		# setup cups-config, build system only uses --libs option
-		if use cups; then
-			mkdir "${T}/cups-config" || die
-			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
-			export PATH="${PATH}:${T}/cups-config"
-		fi
-
-		# Don't inherit PKG_CONFIG_PATH from environment
-		local -x PKG_CONFIG_PATH=
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# bindgen settings
-	# From 127, to make bindgen work, we need to provide a location for libclang.
-	# We patch this in for gentoo - see chromium-*-bindgen-custom-toolchain.patch
-	# rust_bindgen_root = directory with `bin/bindgen` beneath it.
-	myconf_gn+=" rust_bindgen_root=\"${EPREFIX}/usr/\""
-
-	myconf_gn+=" bindgen_libclang_path=\"$(get_llvm_prefix)/$(get_libdir)\""
-	# We don't need to set 'clang_base_bath' for anything in our build
-	# and it defaults to the google toolchain location. Instead provide a location
-	# to where system clang lives sot that bindgen can find system headers (e.g. stddef.h)
-	myconf_gn+=" clang_base_path=\"${EPREFIX}/usr/lib/clang/${LLVM_SLOT}/\""
-
-	myconf_gn+=" rust_sysroot_absolute=\"$(get_rust_prefix)\""
-	myconf_gn+=" rustc_version=\"${RUST_SLOT}\""
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=false"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libjpeg
-		libwebp
-		libxml
-		libxslt
-		openh264
-		zlib
-	)
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-png; then
-		gn_system_libraries+=( libpng )
-	fi
-	if use system-zstd; then
-		gn_system_libraries+=( zstd )
-	fi
-
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# TODO 131: The above call clobbers `enable_freetype = true` in the freetype gni file
-	# drop the last line, then append the freetype line and a new curly brace to end the block
-	local freetype_gni="build/config/freetype/freetype.gni"
-	sed -i -e '$d' ${freetype_gni} || die
-	echo "  enable_freetype = true" >> ${freetype_gni} || die
-	echo "}" >> ${freetype_gni} || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-
-	if use headless; then
-		myconf_gn+=" use_cups=false"
-		myconf_gn+=" use_kerberos=false"
-		myconf_gn+=" use_pulseaudio=false"
-		myconf_gn+=" use_vaapi=false"
-		myconf_gn+=" rtc_use_pipewire=false"
-	else
-		myconf_gn+=" use_cups=$(usex cups true false)"
-		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
-	fi
-
-	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
-	# using dlopen. This helps with automated detection of ABI mismatches and
-	# prevents silent errors.
-	if use pulseaudio; then
-		myconf_gn+=" link_pulseaudio=true"
-	fi
-
-	# Non-developer builds of Chromium (for example, non-Chrome browsers, or
-	# Chromium builds provided by Linux distros) should disable the testing config
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# The sysroot is the oldest debian image that chromium supports, we don't need it
-	myconf_gn+=" use_sysroot=false"
-
-	# Use in-tree libc++ (buildtools/third_party/libc++ and buildtools/third_party/libc++abi)
-	# instead of the system C++ library for C++ standard library support.
-	# default: true, but let's be explicit (forced since 120 ; USE removed 127).
-	myconf_gn+=" use_custom_libcxx=true"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	if use bindist ; then
-		# proprietary_codecs just forces Chromium to say that it can use h264/aac,
-		# the work is still done by ffmpeg. If this is set to no Chromium
-		# won't be able to load the codec even if the library can handle it
-		myconf_gn+=" proprietary_codecs=true"
-		myconf_gn+=" ffmpeg_branding=\"Chrome\""
-		# build ffmpeg as an external component (libffmpeg.so) that we can remove / substitute
-		myconf_gn+=" is_component_ffmpeg=true"
-	else
-		ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-		myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-		myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-	fi
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		filter-flags "-g*"
-
-		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
-		if [[ ${myarch} == amd64 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf_gn+=" treat_warnings_as_errors=false"
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Disable external code space for V8 for ppc64. It is disabled for ppc64
-	# by default, but cross-compiling on amd64 enables it again.
-	if tc-is-cross-compiler; then
-		if ! use amd64 && ! use arm64; then
-			myconf_gn+=" v8_enable_external_code_space=false"
-		fi
-	fi
-
-	# Only enabled for clang, but gcc has endian macros too
-	myconf_gn+=" v8_use_libm_trig_functions=true"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	# We don't use the same clang version as upstream, and with -Werror
-	# we need to make sure that we don't get superfluous warnings.
-	append-flags -Wno-unknown-warning-option
-	if tc-is-cross-compiler; then
-			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
-			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
-	fi
-
-	# Explicitly disable ICU data file support for system-icu/headless builds.
-	if use system-icu || use headless; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Don't need nocompile checks and GN crashes with our config
-	myconf_gn+=" enable_nocompile_tests=false"
-
-	# 131 began laying the groundwork for replacing freetype with
-	# "Rust-based Fontations set of libraries plus Skia path rendering"
-	# We now need to opt-in
-	myconf_gn+=" enable_freetype=true"
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	if use headless; then
-		myconf_gn+=" ozone_platform=\"headless\""
-		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
-		myconf_gn+=" use_glib=false use_gio=false"
-		myconf_gn+=" use_pangocairo=false use_alsa=false"
-		myconf_gn+=" use_libpci=false use_udev=false"
-		myconf_gn+=" enable_print_preview=false"
-		myconf_gn+=" enable_remoting=false"
-	else
-		myconf_gn+=" use_system_minigbm=true"
-		myconf_gn+=" use_xkbcommon=true"
-		if use qt5 || use qt6; then
-			local cbuild_libdir=$(get_libdir)
-			if tc-is-cross-compiler; then
-				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
-				cbuild_libdir=${cbuild_libdir:2}
-				cbuild_libdir=${cbuild_libdir/% }
-			fi
-			if use qt5; then
-				if tc-is-cross-compiler; then
-					myconf_gn+=" moc_qt5_path=\"${EPREFIX}/${cbuild_libdir}/qt5/bin\""
-				else
-					myconf_gn+=" moc_qt5_path=\"$(qt5_get_bindir)\""
-				fi
-			fi
-			if use qt6; then
-				myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\""
-			fi
-
-			myconf_gn+=" use_qt=true"
-			myconf_gn+=" use_qt6=$(usex qt6 true false)"
-		else
-			myconf_gn+=" use_qt=false"
-		fi
-		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
-		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
-		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
-		use wayland && myconf_gn+=" use_system_libffi=true"
-	fi
-
-	myconf_gn+=" use_thin_lto=${use_lto}"
-	myconf_gn+=" thin_lto_enable_optimizations=${use_lto}"
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		myconf_gn+=" is_cfi=${use_lto}"
-		# Don't add symbols to build
-		myconf_gn+=" symbol_level=0"
-	fi
-
-	if use pgo; then
-		myconf_gn+=" chrome_pgo_phase=${1}"
-		if [[ "$1" == "2" ]]; then
-			myconf_gn+=" pgo_data_path=\"${2}\""
-		fi
-	else
-		# Disable PGO
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	# skipping typecheck is only supported on amd64, bug #876157
-	if ! use amd64; then
-		myconf_gn+=" devtools_skip_typecheck=false"
-	fi
-
-	einfo "Configuring Chromium ..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	chromium_configure $(usex pgo 1 0)
-}
-
-chromium_compile() {
-
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	# Build mksnapshot and pax-mark it.
-	if use pax-kernel; then
-		local x
-		for x in mksnapshot v8_context_snapshot_generator; do
-			if tc-is-cross-compiler; then
-				eninja -C out/Release "host/${x}"
-				pax-mark m "out/Release/host/${x}"
-			else
-				eninja -C out/Release "${x}"
-				pax-mark m "out/Release/${x}"
-			fi
-		done
-	fi
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver chrome_sandbox $(use test && echo "base_unittests")
-
-	pax-mark m out/Release/chrome
-
-}
-
-# This function is called from virtx, and must always return so that Xvfb
-# session isn't left running. If we return 1, virtx will call die().
-chromium_profile() {
-	einfo "Profiling for PGO"
-
-	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
-
-	# Remove old profdata in case profiling was interrupted.
-	rm -rf "${1}" || return 1
-
-	if ! "${EPYTHON}" ./chromium_profiler.py \
-		--chrome-executable "${S}/out/Release/chrome" \
-		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
-		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
-		--profile-output "${1}"; then
-		eerror "Profiling failed"
-		return 1
-	fi
-
-	popd >/dev/null || return 1
-}
-
-src_compile() {
-	if use pgo; then
-		local profdata
-
-		profdata="${WORKDIR}/chromium.profdata"
-
-		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
-			chromium_compile
-			virtx chromium_profile "$profdata"
-
-			touch "${WORKDIR}/.pgo-profiled" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
-			# Remove phase 1 output
-			rm -r out/Release || die
-
-			chromium_configure 2 "$profdata"
-
-			touch "${WORKDIR}/.pgo-phase-2-configured" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
-			chromium_compile
-			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
-		fi
-	else
-		chromium_compile
-	fi
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	rm -f out/Release/locales/*.pak.info || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-
-	# Build vk_swiftshader_icd.json; bug #827861
-	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
-		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
-		out/Release/vk_swiftshader_icd.json || die
-}
-
-src_test() {
-	# Initial list of tests to skip pulled from Alpine. Thanks Lauren!
-	# https://issues.chromium.org/issues/40939315
-	local skip_tests=(
-		'MessagePumpLibeventTest.NestedNotification*'
-		ClampTest.Death
-		OptionalTest.DereferencingNoValueCrashes
-		PlatformThreadTest.SetCurrentThreadTypeTest
-		RawPtrTest.TrivialRelocability
-		SafeNumerics.IntMaxOperations
-		StackTraceTest.TraceStackFramePointersFromBuffer
-		StringPieceTest.InvalidLengthDeath
-		StringPieceTest.OutOfBoundsDeath
-		ThreadPoolEnvironmentConfig.CanUseBackgroundPriorityForWorker
-		ValuesUtilTest.FilePath
-		# Gentoo-specific
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/0
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/1
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/2
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/3
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/0
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/1
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/2
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/3
-		CharacterEncodingTest.GetCanonicalEncodingNameByAliasName
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGFPE
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGILL
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGV
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGVNonCanonicalAddress
-		FilePathTest.FromUTF8Unsafe_And_AsUTF8Unsafe
-		FileTest.GetInfoForCreationTime
-		ICUStringConversionsTest.ConvertToUtf8AndNormalize
-		NumberFormattingTest.FormatPercent
-		PathServiceTest.CheckedGetFailure
-		PlatformThreadTest.CanChangeThreadType
-		RustLogIntegrationTest.CheckAllSeverity
-		StackCanary.ChangingStackCanaryCrashesOnReturn
-		StackTraceDeathTest.StackDumpSignalHandlerIsMallocFree
-		SysStrings.SysNativeMBAndWide
-		SysStrings.SysNativeMBToWide
-		SysStrings.SysWideToNativeMB
-		TestLauncherTools.TruncateSnippetFocusedMatchesFatalMessagesTest
-		ToolsSanityTest.BadVirtualCallNull
-		ToolsSanityTest.BadVirtualCallWrongType
-	)
-	local test_filter="-$(IFS=:; printf '%s' "${skip_tests[*]}")"
-	# test-launcher-bot-mode enables parallelism and plain output
-	./out/Release/base_unittests --test-launcher-bot-mode \
-		--test-launcher-jobs="$(makeopts_jobs)" \
-		--gtest_filter="${test_filter}" || die "Tests failed!"
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	newexe out/Release/chrome_sandbox chrome-sandbox
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use X && use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-
-	if use bindist; then
-		# We built libffmpeg as a component library, but we can't distribute it
-		# with proprietary codec support. Remove it and make a symlink to the requested
-		# system library.
-		rm -f out/Release/libffmpeg.so \
-			|| die "Failed to remove bundled libffmpeg.so (with proprietary codecs)"
-		# symlink the libffmpeg.so from either ffmpeg-chromium or ffmpeg[chromium].
-		einfo "Creating symlink to libffmpeg.so from $(usex ffmpeg-chromium ffmpeg-chromium ffmpeg[chromium])..."
-		dosym ../chromium/libffmpeg.so$(usex ffmpeg-chromium .${PV%%\.*} "") \
-			/usr/$(get_libdir)/chromium-browser/libffmpeg.so
-	fi
-
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	# Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland"
-	doins out/Release/xdg-{settings,mime}
-
-	if ! use system-icu && ! use headless; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/MEIPreload
-
-	# Install vk_swiftshader_icd.json; bug #827861
-	doins out/Release/vk_swiftshader_icd.json
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if ! use headless; then
-		if use vaapi; then
-			elog "VA-API is disabled by default at runtime. You have to enable it"
-			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-			elog "in /etc/chromium/default."
-		fi
-		if use screencast; then
-			elog "Screencast is disabled by default at runtime. Either enable it"
-			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use gtk4; then
-			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
-			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use qt5 && use qt6; then
-			elog "Chromium automatically selects Qt5 or Qt6 based on your desktop"
-			elog "environment. To override you need to pass --qt-version=5 or"
-			elog "--qt-version=6, e.g. by adding it to CHROMIUM_FLAGS in"
-			elog "/etc/chromium/default."
-		fi
-	fi
-
-	if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then
-		ewarn "The lack of an '/etc/machine-id' file on this system booted with systemd"
-		ewarn "indicates that the Gentoo handbook was not followed to completion."
-		ewarn ""
-		ewarn "Chromium is known to behave unpredictably with this system configuration;"
-		ewarn "please complete the configuration of this system before logging any bugs."
-	fi
-}
diff --git a/www-client/chromium/chromium-132.0.6834.83.ebuild b/www-client/chromium/chromium-132.0.6834.83.ebuild
new file mode 100644
index 000000000000..afebf0bd7d16
--- /dev/null
+++ b/www-client/chromium/chromium-132.0.6834.83.ebuild
@@ -0,0 +1,1454 @@
+# Copyright 2009-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# PACKAGING NOTES
+
+# This uses a gentoo-created tarball due to Google CI Failures.
+# Use 133(?) as a base for new official tarballs.
+
+GN_MIN_VER=0.2165
+# chromium-tools/get-chromium-toolchain-strings.py
+TEST_FONT=f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35
+
+VIRTUALX_REQUIRED="pgo"
+
+CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk ur vi zh-CN zh-TW"
+
+LLVM_COMPAT=( 19 )
+PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_REQ_USE="xml(+)"
+RUST_MIN_VER=1.78.0
+RUST_NEEDS_LLVM="yes please"
+
+inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 multiprocessing ninja-utils pax-utils
+inherit python-any-r1 qmake-utils readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://www.chromium.org/"
+PPC64_HASH="c11b515d9addc3f8b516502e553ace507eb81815"
+PATCH_V="${PV%%\.*}"
+SRC_URI="https://chromium-tarballs.distfiles.gentoo.org/${P}-linux.tar.xz
+		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
+	test? (
+		https://chromium-tarballs.distfiles.gentoo.org/${P}-linux-testdata.tar.xz
+		https://chromium-fonts.storage.googleapis.com/${TEST_FONT} -> chromium-testfonts-${TEST_FONT:0:10}.tar.gz
+	)
+	ppc64? (
+		https://gitlab.raptorengineering.com/raptor-engineering-public/chromium/openpower-patches/-/archive/${PPC64_HASH}/openpower-patches-${PPC64_HASH}.tar.bz2 -> chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
+	)
+	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
+
+LICENSE="BSD"
+SLOT="0/stable"
+# Dev exists mostly to give devs some breathing room for beta/stable releases;
+# it shouldn't be keyworded but adventurous users can select it.
+if [[ ${SLOT} != "0/dev" ]]; then
+	KEYWORDS="amd64 arm64 ~ppc64"
+fi
+
+IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
+IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
+IUSE+=" qt5 qt6 +screencast selinux test +vaapi +wayland +widevine cpu_flags_ppc_vsx3"
+RESTRICT="
+	!bindist? ( bindist )
+	!test? ( test )
+"
+
+REQUIRED_USE="
+	!headless? ( || ( X wayland ) )
+	pgo? ( X !wayland )
+	qt6? ( qt5 )
+	screencast? ( wayland )
+	ffmpeg-chromium? ( bindist proprietary-codecs )
+"
+
+COMMON_X_DEPEND="
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libxshmfence:=
+"
+
+COMMON_SNAPSHOT_DEPEND="
+	system-icu? ( >=dev-libs/icu-73.0:= )
+	>=dev-libs/libxml2-2.12.4:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	dev-libs/libxslt:=
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2.11.0-r1:=
+	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
+	media-libs/libjpeg-turbo:=
+	system-png? ( media-libs/libpng:=[-apng(-)] )
+	system-zstd? ( >=app-arch/zstd-1.5.5:= )
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/mesa:=[gbm(+)]
+	>=media-libs/openh264-1.6.0:=
+	sys-libs/zlib:=
+	!headless? (
+		dev-libs/glib:2
+		>=media-libs/alsa-lib-1.0.19:=
+		pulseaudio? ( media-libs/libpulse:= )
+		sys-apps/pciutils:=
+		kerberos? ( virtual/krb5 )
+		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
+		X? (
+			x11-base/xorg-proto:=
+			x11-libs/libX11:=
+			x11-libs/libxcb:=
+			x11-libs/libXext:=
+		)
+		x11-libs/libxkbcommon:=
+		wayland? (
+			dev-libs/libffi:=
+			dev-libs/wayland:=
+			screencast? ( media-video/pipewire:= )
+		)
+	)
+"
+
+COMMON_DEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	app-arch/bzip2:=
+	dev-libs/expat:=
+	net-misc/curl[ssl]
+	sys-apps/dbus:=
+	media-libs/flac:=
+	sys-libs/zlib:=[minizip]
+	!headless? (
+		X? ( ${COMMON_X_DEPEND} )
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		media-libs/mesa:=[X?,wayland?]
+		cups? ( >=net-print/cups-1.3.11:= )
+		virtual/udev
+		x11-libs/cairo:=
+		x11-libs/gdk-pixbuf:2
+		x11-libs/pango:=
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtwidgets:5
+		)
+		qt6? ( dev-qt/qtbase:6[gui,widgets] )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!headless? (
+		|| (
+			x11-libs/gtk+:3[X?,wayland?]
+			gui-libs/gtk:4[X?,wayland?]
+		)
+		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
+		qt6? ( dev-qt/qtbase:6[X?,wayland?] )
+	)
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	bindist? (
+		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${PV%%\.*} )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	!headless? (
+		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
+		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
+	)
+"
+
+BDEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	>=app-arch/gzip-1.7
+	!headless? (
+		qt5? ( dev-qt/qtcore:5 )
+		qt6? ( dev-qt/qtbase:6 )
+	)
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+		llvm-core/lld:${LLVM_SLOT}
+		official? (
+			!ppc64? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[cfi] )
+		)
+	')
+	pgo? (
+		>=dev-python/selenium-3.141.0
+		>=dev-util/web_page_replay_go-20220314
+	)
+	>=dev-util/bindgen-0.68.0
+	>=dev-build/gn-${GN_MIN_VER}
+	dev-build/ninja
+	dev-lang/perl
+	>=dev-util/gperf-3.0.3
+	dev-vcs/git
+	>=net-libs/nodejs-7.6.0[inspector]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+python_check_deps() {
+	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pre_build_checks() {
+	# Check build requirements: bugs #471810, #541816, #914220
+	# We're going to start doing maths here on the size of an unpacked source tarball,
+	# this should make updates easier as chromium continues to balloon in size.
+	local BASE_DISK=24
+	local EXTRA_DISK=1
+	local CHECKREQS_MEMORY="4G"
+	tc-is-cross-compiler && EXTRA_DISK=2
+	if tc-is-lto || use pgo; then
+		CHECKREQS_MEMORY="9G"
+		tc-is-cross-compiler && EXTRA_DISK=4
+		use pgo && EXTRA_DISK=8
+	fi
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		if use custom-cflags; then
+			EXTRA_DISK=13
+		fi
+		CHECKREQS_MEMORY="16G"
+	fi
+	CHECKREQS_DISK_BUILD="$((BASE_DISK + EXTRA_DISK))G"
+	check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
+		pre_build_checks
+	fi
+
+	if use headless; then
+		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland")
+		for myiuse in ${headless_unused_flags[@]}; do
+			use ${myiuse} && ewarn "Ignoring USE=${myiuse}, USE=headless is set."
+		done
+	fi
+
+	if ! use bindist && use ffmpeg-chromium; then
+		ewarn "Ignoring USE=ffmpeg-chromium, USE=bindist is not set."
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
+		pre_build_checks
+
+		# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
+		# We'll set these to clang here then use llvm-utils functions to very explicitly set these
+		# to a sane value.
+		# This is effectively the 'force-clang' path if GCC support is re-added.
+		# TODO: check if the user has already selected a specific impl via make.conf and respect that.
+		use_lto="false"
+		if tc-is-lto; then
+			use_lto="true"
+			# We can rely on GN to do this for us; anecdotally without this builds
+			# take significantly longer with LTO enabled and it doesn't hurt anything.
+			filter-lto
+		fi
+
+		if [ "$use_lto" = "false" ] && use official; then
+			einfo "USE=official selected and LTO not detected."
+			einfo "It is _highly_ recommended that LTO be enabled for performance reasons"
+			einfo "and to be consistent with the upstream \"official\" build optimisations."
+		fi
+
+		if [ "$use_lto" = "false" ] && use test; then
+			die "Tests require CFI which requires LTO"
+		fi
+
+		export use_lto
+
+		# 936858
+		if tc-ld-is-mold; then
+			eerror "Your toolchain is using the mold linker."
+			eerror "This is not supported by Chromium."
+			die "Please switch to a different linker."
+		fi
+
+		llvm-r1_pkg_setup
+		rust_pkg_setup
+
+		# Forcing clang; respect llvm_slot_x to enable selection of impl from LLVM_COMPAT
+		AR=llvm-ar
+		CPP="${CHOST}-clang++-${LLVM_SLOT} -E"
+		NM=llvm-nm
+		CC="${CHOST}-clang-${LLVM_SLOT}"
+		CXX="${CHOST}-clang++-${LLVM_SLOT}"
+
+		if tc-is-cross-compiler; then
+			use pgo && die "The pgo USE flag cannot be used when cross-compiling"
+			CPP="${CBUILD}-clang++-${LLVM_SLOT} -E"
+		fi
+
+		# I hate doing this but upstream Rust have yet to come up with a better solution for
+		# us poor packagers. Required for Split LTO units, which are required for CFI.
+		export RUSTC_BOOTSTRAP=1
+
+		# Users should never hit this, it's purely a development convenience
+		if ver_test $(gn --version || die) -lt ${GN_MIN_VER}; then
+			die "dev-build/gn >= ${GN_MIN_VER} is required to build this Chromium"
+		fi
+	fi
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	unpack ${P}-linux.tar.xz
+	unpack chromium-patches-${PATCH_V}.tar.bz2
+
+	use pgo && unpack chromium-profiler-0.2.tar
+
+	if use test; then
+		# A new testdata tarball is available for each release; but testfonts tend to remain stable
+		# for the duration of a release.
+		# This unpacks directly into/over ${WORKDIR}/${P} so we can just use `unpack`.
+		unpack ${P}-linux-testdata.tar.xz
+		# This just contains a bunch of font files that need to be unpacked (or moved) to the correct location.
+		local testfonts_dir="${WORKDIR}/${P}/third_party/test_fonts"
+		local testfonts_tar="${DISTDIR}/chromium-testfonts-${TEST_FONT:0:10}.tar.gz"
+		tar xf "${testfonts_tar}" -C "${testfonts_dir}" || die "Failed to unpack testfonts"
+	fi
+
+	if use ppc64; then
+		unpack chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local PATCHES=(
+		"${FILESDIR}/chromium-cross-compile.patch"
+		"${FILESDIR}/chromium-109-system-zlib.patch"
+		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-131-unbundle-icu-target.patch"
+		"${FILESDIR}/chromium-131-oauth2-client-switches.patch"
+		"${FILESDIR}/chromium-132-bindgen-custom-toolchain.patch"
+	)
+	shopt -s globstar nullglob
+	# 130: moved the PPC64 patches into the chromium-patches repo
+	local patch
+	for patch in "${WORKDIR}/chromium-patches-${PATCH_V}"/**/*.patch; do
+			if [[ ${patch} == *"ppc64le"* ]]; then
+					use ppc64 && PATCHES+=( "${patch}" )
+			else
+					PATCHES+=( "${patch}" )
+			fi
+	done
+	shopt -u globstar nullglob
+
+	# We can't use the bundled compiler builtins with the system toolchain
+	# `grep` is a development convenience to ensure we fail early when google changes something.
+	local builtins_match="if (is_clang && !is_nacl && !is_cronet_build) {"
+	grep -q "${builtins_match}" build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
+	sed -i -e "/${builtins_match}/,+2d" build/config/compiler/BUILD.gn
+
+	if use ppc64; then
+		local patchset_dir="${WORKDIR}/openpower-patches-${PPC64_HASH}/patches"
+		# patch causes build errors on 4K page systems (https://bugs.gentoo.org/show_bug.cgi?id=940304)
+		local page_size_patch="ppc64le/third_party/use-sysconf-page-size-on-ppc64.patch"
+		local isa_3_patch="ppc64le/core/baseline-isa-3-0.patch"
+		# Apply the OpenPOWER patches (check for page size and isa3.0)
+		openpower_patches=( $(grep -E "^ppc64le|^upstream" "${patchset_dir}/series" | grep -v "${page_size_patch}" |
+			grep -v "${isa_3_patch}" || die) )
+		for patch in "${openpower_patches[@]}"; do
+			PATCHES+=( "${patchset_dir}/${patch}" )
+		done
+		if [[ $(getconf PAGESIZE) == 65536 ]]; then
+			PATCHES+=( "${patchset_dir}/${page_size_patch}" )
+		fi
+		# We use vsx3 as a proxy for 'want isa3.0' (POWER9)
+		if use cpu_flags_ppc_vsx3 ; then
+			PATCHES+=( +"${patchset_dir}/${isa_3_patch}" )
+		fi
+	fi
+
+	# This is a nightly option that does not exist any current release
+	# https://github.com/rust-lang/rust/commit/389a399a501a626ebf891ae0bb076c25e325ae64
+	if ver_test ${RUST_SLOT} -le "1.82.0"; then
+		sed '/rustflags = \[ "-Zdefault-visibility=hidden" \]/d' -i build/config/gcc/BUILD.gn ||
+			die "Failed to remove default visibility nightly option"
+	fi
+
+	default
+
+	rm third_party/node/linux/node-linux-x64/bin/node || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	# adjust python interpreter version
+	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
+
+	# remove_bundled_libraries.py walks the source tree and looks for paths containing the substring 'third_party'
+	# whitelist matches use the right-most matching path component, so we need to whitelist from that point down.
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/ceval
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/volk
+		third_party/anonymous_tokens
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/bidimapper
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4-4.9.3
+		third_party/catapult/third_party/html5lib-1.1
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/content_analysis_sdk
+		third_party/cpuinfo
+		third_party/crabbyavif
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/d3
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/gn/webgpu-cts
+		third_party/dawn/third_party/khronos
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/csp_evaluator
+		third_party/devtools-frontend/src/front_end/third_party/diff
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/json5
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/parsel-js
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs
+		third_party/devtools-frontend/src/front_end/third_party/third-party-web
+		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/front_end/third_party/web-vitals
+		third_party/devtools-frontend/src/third_party
+		third_party/distributed_point_functions
+		third_party/dom_distiller_js
+		third_party/eigen3
+		third_party/emoji-segmenter
+		third_party/farmhash
+		third_party/fast_float
+		third_party/fdlibm
+		third_party/ffmpeg
+		third_party/fft2d
+		third_party/flatbuffers
+		third_party/fp16
+		third_party/freetype
+		third_party/fusejs
+		third_party/fxdiv
+		third_party/gemmlowp
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/highway
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/ink_stroke_modeler/src/ink_stroke_modeler
+		third_party/ink_stroke_modeler/src/ink_stroke_modeler/internal
+		third_party/ink/src/ink/brush
+		third_party/ink/src/ink/color
+		third_party/ink/src/ink/geometry
+		third_party/ink/src/ink/rendering
+		third_party/ink/src/ink/rendering/skia/common_internal
+		third_party/ink/src/ink/rendering/skia/native
+		third_party/ink/src/ink/rendering/skia/native/internal
+		third_party/ink/src/ink/strokes
+		third_party/ink/src/ink/types
+		third_party/inspector_protocol
+		third_party/ipcz
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/lens_server_proto
+		third_party/leveldatabase
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/fastfeat
+		third_party/libaom/source/libaom/third_party/SVT-AV1
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libc++
+		third_party/libdrm
+		third_party/libevent
+		third_party/libgav1
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libtess2/libtess2
+		third_party/libtess2/src/Include
+		third_party/libtess2/src/Source
+		third_party/liburlpattern
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/libzip
+		third_party/lit
+		third_party/llvm-libc
+		third_party/llvm-libc/src/shared/
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/markupsafe
+		third_party/material_color_utilities
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/neon_2_sse
+		third_party/node
+		third_party/omnibox_proto
+		third_party/one_euro_filter
+		third_party/openscreen
+		third_party/openscreen/src/third_party/
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/opus
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg
+		third_party/pdfium/third_party/libtiff
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/perfetto/protos/third_party/simpleperf
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private_membership
+		third_party/private-join-and-compute
+		third_party/protobuf
+		third_party/pthreadpool
+		third_party/puffin
+		third_party/pyjson5
+		third_party/pyyaml
+		third_party/qcms
+		third_party/rapidhash
+		third_party/re2
+		third_party/rnnoise
+		third_party/rust
+		third_party/ruy
+		third_party/s2cellid
+		third_party/securemessage
+		third_party/selenium-atoms
+		third_party/sentencepiece
+		third_party/sentencepiece/src/third_party/darts_clone
+		third_party/shell-encryption
+		third_party/simplejson
+		third_party/six
+		third_party/skia
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/snappy
+		third_party/spirv-headers
+		third_party/spirv-tools
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
+		third_party/swiftshader/third_party/SPIRV-Tools
+		third_party/swiftshader/third_party/subzero
+		third_party/tensorflow_models
+		third_party/tensorflow-text
+		third_party/tflite
+		third_party/tflite/src/third_party/eigen3
+		third_party/tflite/src/third_party/fft2d
+		third_party/tflite/src/third_party/xla/third_party/tsl
+		third_party/tflite/src/third_party/xla/xla/tsl/framework
+		third_party/tflite/src/third_party/xla/xla/tsl/lib/random
+		third_party/tflite/src/third_party/xla/xla/tsl/protobuf
+		third_party/tflite/src/third_party/xla/xla/tsl/util
+		third_party/ukey2
+		third_party/unrar
+		third_party/utf
+		third_party/vulkan
+		third_party/wayland
+		third_party/webdriver
+		third_party/webgpu-cts
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/xnnpack
+		third_party/zlib/google
+		third_party/zxcvbn-cpp
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/utf8-decoder
+		v8/src/third_party/valgrind
+		v8/third_party/glibc
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+
+	if use test; then
+		# tar tvf /var/cache/distfiles/${P}-testdata.tar.xz | grep '^d' | grep 'third_party' | awk '{print $NF}'
+		keeplibs+=(
+			third_party/breakpad/breakpad/src/processor
+			third_party/google_benchmark/src/include/benchmark
+			third_party/google_benchmark/src/src
+			third_party/perfetto/protos/third_party/pprof
+			third_party/test_fonts
+			third_party/test_fonts/fontconfig
+		)
+	fi
+
+	# USE=system-*
+	if ! use system-harfbuzz; then
+		keeplibs+=( third_party/harfbuzz-ng )
+	fi
+
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+
+	if ! use system-png; then
+		keeplibs+=( third_party/libpng )
+	fi
+
+	if ! use system-zstd; then
+		keeplibs+=( third_party/zstd )
+	fi
+
+	# Arch-specific
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		# requires git and clang, bug #832803
+		# Revert https://chromium.googlesource.com/chromium/src/+/b463d0f40b08b4e896e7f458d89ae58ce2a27165%5E%21/third_party/libvpx/generate_gni.sh
+		# and https://chromium.googlesource.com/chromium/src/+/71ebcbce867dd31da5f8b405a28fcb0de0657d91%5E%21/third_party/libvpx/generate_gni.sh
+		# since we're not in a git repo
+		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g; /^git -C/d; /git cl/d; /cd \$BASE_DIR\/\$LIBVPX_SRC_DIR/ign format --in-place \$BASE_DIR\/BUILD.gn\ngn format --in-place \$BASE_DIR\/libvpx_srcs.gni" \
+			generate_gni.sh || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+
+		pushd third_party/ffmpeg >/dev/null || die
+		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
+		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
+		popd >/dev/null || die
+	fi
+
+	# Sanity check keeplibs, on major version bumps it is often necessary to update this list
+	# and this enables us to hit them all at once.
+	# There are some entries that need to be whitelisted (TODO: Why? The file is understandable, the rest seem odd)
+	whitelist_libs=(
+		net/third_party/quic
+		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
+		third_party/libjingle
+		third_party/mesa
+		third_party/skia/third_party/vulkan
+		third_party/vulkan
+	)
+	local not_found_libs=()
+	for lib in "${keeplibs[@]}"; do
+		if [[ ! -d "${lib}" ]] && ! has "${lib}" "${whitelist_libs[@]}"; then
+			not_found_libs+=( "${lib}" )
+		fi
+	done
+
+	if [[ ${#not_found_libs[@]} -gt 0 ]]; then
+		eerror "The following \`keeplibs\` directories were not found in the source tree:"
+		for lib in "${not_found_libs[@]}"; do
+			eerror "  ${lib}"
+		done
+		die "Please update the ebuild."
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	einfo "Unbundling third-party libraries ..."
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+
+	# TODO: From 127 chromium includes a bunch of binaries? Unbundle them; they're not needed.
+
+	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
+	mkdir -p buildtools/third_party/eu-strip/bin || die
+	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
+}
+
+chromium_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# We already forced the "correct" clang via pkg_setup
+
+	if tc-is-cross-compiler; then
+		CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
+		CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
+		BUILD_AR=${AR}
+		BUILD_CC=${CC}
+		BUILD_CXX=${CXX}
+		BUILD_NM=${NM}
+	fi
+
+	strip-unsupported-flags
+
+	myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	# https://bugs.gentoo.org/918897#c32
+	append-ldflags -Wl,--undefined-version
+	myconf_gn+=" use_lld=true"
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
+		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
+
+		# setup cups-config, build system only uses --libs option
+		if use cups; then
+			mkdir "${T}/cups-config" || die
+			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
+			export PATH="${PATH}:${T}/cups-config"
+		fi
+
+		# Don't inherit PKG_CONFIG_PATH from environment
+		local -x PKG_CONFIG_PATH=
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# bindgen settings
+	# From 127, to make bindgen work, we need to provide a location for libclang.
+	# We patch this in for gentoo - see chromium-*-bindgen-custom-toolchain.patch
+	# rust_bindgen_root = directory with `bin/bindgen` beneath it.
+	myconf_gn+=" rust_bindgen_root=\"${EPREFIX}/usr/\""
+
+	myconf_gn+=" bindgen_libclang_path=\"$(get_llvm_prefix)/$(get_libdir)\""
+	# We don't need to set 'clang_base_bath' for anything in our build
+	# and it defaults to the google toolchain location. Instead provide a location
+	# to where system clang lives sot that bindgen can find system headers (e.g. stddef.h)
+	myconf_gn+=" clang_base_path=\"${EPREFIX}/usr/lib/clang/${LLVM_SLOT}/\""
+
+	myconf_gn+=" rust_sysroot_absolute=\"$(get_rust_prefix)\""
+	myconf_gn+=" rustc_version=\"${RUST_SLOT}\""
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
+	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
+	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
+	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=false"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libjpeg
+		libwebp
+		libxml
+		libxslt
+		openh264
+		zlib
+	)
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-png; then
+		gn_system_libraries+=( libpng )
+	fi
+	if use system-zstd; then
+		gn_system_libraries+=( zstd )
+	fi
+
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# TODO 131: The above call clobbers `enable_freetype = true` in the freetype gni file
+	# drop the last line, then append the freetype line and a new curly brace to end the block
+	local freetype_gni="build/config/freetype/freetype.gni"
+	sed -i -e '$d' ${freetype_gni} || die
+	echo "  enable_freetype = true" >> ${freetype_gni} || die
+	echo "}" >> ${freetype_gni} || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+
+	if use headless; then
+		myconf_gn+=" use_cups=false"
+		myconf_gn+=" use_kerberos=false"
+		myconf_gn+=" use_pulseaudio=false"
+		myconf_gn+=" use_vaapi=false"
+		myconf_gn+=" rtc_use_pipewire=false"
+	else
+		myconf_gn+=" use_cups=$(usex cups true false)"
+		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
+		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
+	fi
+
+	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
+	# using dlopen. This helps with automated detection of ABI mismatches and
+	# prevents silent errors.
+	if use pulseaudio; then
+		myconf_gn+=" link_pulseaudio=true"
+	fi
+
+	# Non-developer builds of Chromium (for example, non-Chrome browsers, or
+	# Chromium builds provided by Linux distros) should disable the testing config
+	myconf_gn+=" disable_fieldtrial_testing_config=true"
+
+	# The sysroot is the oldest debian image that chromium supports, we don't need it
+	myconf_gn+=" use_sysroot=false"
+
+	# Use in-tree libc++ (buildtools/third_party/libc++ and buildtools/third_party/libc++abi)
+	# instead of the system C++ library for C++ standard library support.
+	# default: true, but let's be explicit (forced since 120 ; USE removed 127).
+	myconf_gn+=" use_custom_libcxx=true"
+
+	# Disable pseudolocales, only used for testing
+	myconf_gn+=" enable_pseudolocales=false"
+
+	# Disable code formating of generated files
+	myconf_gn+=" blink_enable_generated_code_formatting=false"
+
+	if use bindist ; then
+		# proprietary_codecs just forces Chromium to say that it can use h264/aac,
+		# the work is still done by ffmpeg. If this is set to no Chromium
+		# won't be able to load the codec even if the library can handle it
+		myconf_gn+=" proprietary_codecs=true"
+		myconf_gn+=" ffmpeg_branding=\"Chrome\""
+		# build ffmpeg as an external component (libffmpeg.so) that we can remove / substitute
+		myconf_gn+=" is_component_ffmpeg=true"
+	else
+		ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+		myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+		myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+	fi
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info. The OAuth2 credentials, however, have been left out.
+	# Those OAuth2 credentials have been broken for quite some time anyway.
+	# Instead we apply a patch to use the --oauth2-client-id= and
+	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
+	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
+	# Chromium without baked-in values.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		filter-flags "-g*"
+
+		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
+		if [[ ${myarch} == amd64 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
+		fi
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf_gn+=" treat_warnings_as_errors=false"
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Disable external code space for V8 for ppc64. It is disabled for ppc64
+	# by default, but cross-compiling on amd64 enables it again.
+	if tc-is-cross-compiler; then
+		if ! use amd64 && ! use arm64; then
+			myconf_gn+=" v8_enable_external_code_space=false"
+		fi
+	fi
+
+	# Only enabled for clang, but gcc has endian macros too
+	myconf_gn+=" v8_use_libm_trig_functions=true"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	# We don't use the same clang version as upstream, and with -Werror
+	# we need to make sure that we don't get superfluous warnings.
+	append-flags -Wno-unknown-warning-option
+	if tc-is-cross-compiler; then
+			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
+			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
+	fi
+
+	# Explicitly disable ICU data file support for system-icu/headless builds.
+	if use system-icu || use headless; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Don't need nocompile checks and GN crashes with our config
+	myconf_gn+=" enable_nocompile_tests=false"
+
+	# 131 began laying the groundwork for replacing freetype with
+	# "Rust-based Fontations set of libraries plus Skia path rendering"
+	# We now need to opt-in
+	myconf_gn+=" enable_freetype=true"
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	if use headless; then
+		myconf_gn+=" ozone_platform=\"headless\""
+		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
+		myconf_gn+=" use_glib=false use_gio=false"
+		myconf_gn+=" use_pangocairo=false use_alsa=false"
+		myconf_gn+=" use_libpci=false use_udev=false"
+		myconf_gn+=" enable_print_preview=false"
+		myconf_gn+=" enable_remoting=false"
+	else
+		myconf_gn+=" use_system_minigbm=true"
+		myconf_gn+=" use_xkbcommon=true"
+		if use qt5 || use qt6; then
+			local cbuild_libdir=$(get_libdir)
+			if tc-is-cross-compiler; then
+				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
+				cbuild_libdir=${cbuild_libdir:2}
+				cbuild_libdir=${cbuild_libdir/% }
+			fi
+			if use qt5; then
+				if tc-is-cross-compiler; then
+					myconf_gn+=" moc_qt5_path=\"${EPREFIX}/${cbuild_libdir}/qt5/bin\""
+				else
+					myconf_gn+=" moc_qt5_path=\"$(qt5_get_bindir)\""
+				fi
+			fi
+			if use qt6; then
+				myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\""
+			fi
+
+			myconf_gn+=" use_qt=true"
+			myconf_gn+=" use_qt6=$(usex qt6 true false)"
+		else
+			myconf_gn+=" use_qt=false"
+		fi
+		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
+		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
+		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
+		use wayland && myconf_gn+=" use_system_libffi=true"
+	fi
+
+	myconf_gn+=" use_thin_lto=${use_lto}"
+	myconf_gn+=" thin_lto_enable_optimizations=${use_lto}"
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		if use ppc64; then
+			myconf_gn+=" is_cfi=no" # requires llvm-runtimes/compiler-rt-sanitizers[cfi]
+		else
+			myconf_gn+=" is_cfi=${use_lto}"
+		fi
+		# Don't add symbols to build
+		myconf_gn+=" symbol_level=0"
+	fi
+
+	if use pgo; then
+		myconf_gn+=" chrome_pgo_phase=${1}"
+		if [[ "$1" == "2" ]]; then
+			myconf_gn+=" pgo_data_path=\"${2}\""
+		fi
+	else
+		# Disable PGO
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	# skipping typecheck is only supported on amd64, bug #876157
+	if ! use amd64; then
+		myconf_gn+=" devtools_skip_typecheck=false"
+	fi
+
+	einfo "Configuring Chromium ..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	chromium_configure $(usex pgo 1 0)
+}
+
+chromium_compile() {
+
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
+	local -x PYTHONPATH=
+
+	# Build mksnapshot and pax-mark it.
+	if use pax-kernel; then
+		local x
+		for x in mksnapshot v8_context_snapshot_generator; do
+			if tc-is-cross-compiler; then
+				eninja -C out/Release "host/${x}"
+				pax-mark m "out/Release/host/${x}"
+			else
+				eninja -C out/Release "${x}"
+				pax-mark m "out/Release/${x}"
+			fi
+		done
+	fi
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver chrome_sandbox $(use test && echo "base_unittests")
+
+	pax-mark m out/Release/chrome
+
+}
+
+# This function is called from virtx, and must always return so that Xvfb
+# session isn't left running. If we return 1, virtx will call die().
+chromium_profile() {
+	einfo "Profiling for PGO"
+
+	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
+
+	# Remove old profdata in case profiling was interrupted.
+	rm -rf "${1}" || return 1
+
+	if ! "${EPYTHON}" ./chromium_profiler.py \
+		--chrome-executable "${S}/out/Release/chrome" \
+		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
+		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
+		--profile-output "${1}"; then
+		eerror "Profiling failed"
+		return 1
+	fi
+
+	popd >/dev/null || return 1
+}
+
+src_compile() {
+	if use pgo; then
+		local profdata
+
+		profdata="${WORKDIR}/chromium.profdata"
+
+		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
+			chromium_compile
+			virtx chromium_profile "$profdata"
+
+			touch "${WORKDIR}/.pgo-profiled" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
+			# Remove phase 1 output
+			rm -r out/Release || die
+
+			chromium_configure 2 "$profdata"
+
+			touch "${WORKDIR}/.pgo-phase-2-configured" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
+			chromium_compile
+			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
+		fi
+	else
+		chromium_compile
+	fi
+
+	mv out/Release/chromedriver{.unstripped,} || die
+
+	rm -f out/Release/locales/*.pak.info || die
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+
+	# Build vk_swiftshader_icd.json; bug #827861
+	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
+		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
+		out/Release/vk_swiftshader_icd.json || die
+}
+
+src_test() {
+	# Initial list of tests to skip pulled from Alpine. Thanks Lauren!
+	# https://issues.chromium.org/issues/40939315
+	local skip_tests=(
+		'MessagePumpLibeventTest.NestedNotification*'
+		ClampTest.Death
+		OptionalTest.DereferencingNoValueCrashes
+		PlatformThreadTest.SetCurrentThreadTypeTest
+		RawPtrTest.TrivialRelocability
+		SafeNumerics.IntMaxOperations
+		StackTraceTest.TraceStackFramePointersFromBuffer
+		StringPieceTest.InvalidLengthDeath
+		StringPieceTest.OutOfBoundsDeath
+		ThreadPoolEnvironmentConfig.CanUseBackgroundPriorityForWorker
+		ValuesUtilTest.FilePath
+		# Gentoo-specific
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/0
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/1
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/2
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/3
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/0
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/1
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/2
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/3
+		CharacterEncodingTest.GetCanonicalEncodingNameByAliasName
+		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGFPE
+		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGILL
+		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGV
+		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGVNonCanonicalAddress
+		FilePathTest.FromUTF8Unsafe_And_AsUTF8Unsafe
+		FileTest.GetInfoForCreationTime
+		ICUStringConversionsTest.ConvertToUtf8AndNormalize
+		NumberFormattingTest.FormatPercent
+		PathServiceTest.CheckedGetFailure
+		PlatformThreadTest.CanChangeThreadType
+		RustLogIntegrationTest.CheckAllSeverity
+		StackCanary.ChangingStackCanaryCrashesOnReturn
+		StackTraceDeathTest.StackDumpSignalHandlerIsMallocFree
+		SysStrings.SysNativeMBAndWide
+		SysStrings.SysNativeMBToWide
+		SysStrings.SysWideToNativeMB
+		TestLauncherTools.TruncateSnippetFocusedMatchesFatalMessagesTest
+		ToolsSanityTest.BadVirtualCallNull
+		ToolsSanityTest.BadVirtualCallWrongType
+	)
+	local test_filter="-$(IFS=:; printf '%s' "${skip_tests[*]}")"
+	# test-launcher-bot-mode enables parallelism and plain output
+	./out/Release/base_unittests --test-launcher-bot-mode \
+		--test-launcher-jobs="$(makeopts_jobs)" \
+		--gtest_filter="${test_filter}" || die "Tests failed!"
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	newexe out/Release/chrome_sandbox chrome-sandbox
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver
+	doexe out/Release/chrome_crashpad_handler
+
+	ozone_auto_session () {
+		use X && use wayland && ! use headless && echo true || echo false
+	}
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+
+	if use bindist; then
+		# We built libffmpeg as a component library, but we can't distribute it
+		# with proprietary codec support. Remove it and make a symlink to the requested
+		# system library.
+		rm -f out/Release/libffmpeg.so \
+			|| die "Failed to remove bundled libffmpeg.so (with proprietary codecs)"
+		# symlink the libffmpeg.so from either ffmpeg-chromium or ffmpeg[chromium].
+		einfo "Creating symlink to libffmpeg.so from $(usex ffmpeg-chromium ffmpeg-chromium ffmpeg[chromium])..."
+		dosym ../chromium/libffmpeg.so$(usex ffmpeg-chromium .${PV%%\.*} "") \
+			/usr/$(get_libdir)/chromium-browser/libffmpeg.so
+	fi
+
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	# Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland"
+	doins out/Release/xdg-{settings,mime}
+
+	if ! use system-icu && ! use headless; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/MEIPreload
+
+	# Install vk_swiftshader_icd.json; bug #827861
+	doins out/Release/vk_swiftshader_icd.json
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if ! use headless; then
+		if use vaapi; then
+			elog "VA-API is disabled by default at runtime. You have to enable it"
+			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
+			elog "in /etc/chromium/default."
+		fi
+		if use screencast; then
+			elog "Screencast is disabled by default at runtime. Either enable it"
+			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+		if use gtk4; then
+			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
+			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+		if use qt5 && use qt6; then
+			elog "Chromium automatically selects Qt5 or Qt6 based on your desktop"
+			elog "environment. To override you need to pass --qt-version=5 or"
+			elog "--qt-version=6, e.g. by adding it to CHROMIUM_FLAGS in"
+			elog "/etc/chromium/default."
+		fi
+	fi
+
+	if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then
+		ewarn "The lack of an '/etc/machine-id' file on this system booted with systemd"
+		ewarn "indicates that the Gentoo handbook was not followed to completion."
+		ewarn ""
+		ewarn "Chromium is known to behave unpredictably with this system configuration;"
+		ewarn "please complete the configuration of this system before logging any bugs."
+	fi
+}
diff --git a/www-client/chromium/chromium-133.0.6888.2.ebuild b/www-client/chromium/chromium-133.0.6888.2.ebuild
deleted file mode 100644
index ffe050806e0c..000000000000
--- a/www-client/chromium/chromium-133.0.6888.2.ebuild
+++ /dev/null
@@ -1,1459 +0,0 @@
-# Copyright 2009-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# PACKAGING NOTES
-
-# Since m133 (and backported a bit...) we are using CI-generated tarballs from
-# https://github.com/chromium-linux-tarballs/chromium-tarballs/ (uploaded to S3
-# and made available via https://chromium-tarballs.distfiles.gentoo.org/).
-
-# We do this because upstream tarballs weigh in at about 3.5x the size of our
-# new "Distro tarballs" and include binaries (etc) that are not useful for
-# downstream consumers (like distributions).
-
-# It is probably still possible to download the google Rust and Clang toolchains
-# and use them to build this package, however we removed this when upstream CI
-# broke for m131 and haven't re-added it.
-
-GN_MIN_VER=0.2165
-# chromium-tools/get-chromium-toolchain-strings.py
-TEST_FONT=f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35
-
-VIRTUALX_REQUIRED="pgo"
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-LLVM_COMPAT=( 19 )
-PYTHON_COMPAT=( python3_{11..13} )
-PYTHON_REQ_USE="xml(+)"
-RUST_MIN_VER=1.78.0
-RUST_NEEDS_LLVM="yes please"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 multiprocessing ninja-utils pax-utils
-inherit python-any-r1 qmake-utils readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://www.chromium.org/"
-PPC64_HASH="a85b64f07b489b8c6fdb13ecf79c16c56c560fc6"
-PATCH_V="${PV%%\.*}-1"
-SRC_URI="https://chromium-tarballs.distfiles.gentoo.org/${P}-linux.tar.xz
-		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
-	test? (
-		https://chromium-tarballs.distfiles.gentoo.org/${P}-linux-testdata.tar.xz
-		https://chromium-fonts.storage.googleapis.com/${TEST_FONT} -> chromium-testfonts-${TEST_FONT:0:10}.tar.gz
-	)
-	ppc64? (
-		https://gitlab.solidsilicon.io/public-development/open-source/chromium/openpower-patches/-/archive/${PPC64_HASH}/openpower-patches-${PPC64_HASH}.tar.bz2 -> chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
-	)
-	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
-
-LICENSE="BSD"
-SLOT="0/dev"
-# Dev exists mostly to give devs some breathing room for beta/stable releases;
-# it shouldn't be keyworded but adventurous users can select it.
-if [[ ${SLOT} != "0/dev" ]]; then
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
-IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
-IUSE+=" qt5 qt6 +screencast selinux test +vaapi +wayland +widevine cpu_flags_ppc_vsx3"
-RESTRICT="
-	!bindist? ( bindist )
-	!test? ( test )
-"
-
-REQUIRED_USE="
-	!headless? ( || ( X wayland ) )
-	pgo? ( X !wayland )
-	qt6? ( qt5 )
-	screencast? ( wayland )
-	ffmpeg-chromium? ( bindist proprietary-codecs )
-"
-
-COMMON_X_DEPEND="
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxshmfence:=
-"
-
-COMMON_SNAPSHOT_DEPEND="
-	system-icu? ( >=dev-libs/icu-73.0:= )
-	>=dev-libs/libxml2-2.12.4:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	dev-libs/libxslt:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	system-png? ( media-libs/libpng:=[-apng(-)] )
-	system-zstd? ( >=app-arch/zstd-1.5.5:= )
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/mesa:=[gbm(+)]
-	>=media-libs/openh264-1.6.0:=
-	sys-libs/zlib:=
-	!headless? (
-		dev-libs/glib:2
-		>=media-libs/alsa-lib-1.0.19:=
-		pulseaudio? ( media-libs/libpulse:= )
-		sys-apps/pciutils:=
-		kerberos? ( virtual/krb5 )
-		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
-		X? (
-			x11-base/xorg-proto:=
-			x11-libs/libX11:=
-			x11-libs/libxcb:=
-			x11-libs/libXext:=
-		)
-		x11-libs/libxkbcommon:=
-		wayland? (
-			dev-libs/libffi:=
-			dev-libs/wayland:=
-			screencast? ( media-video/pipewire:= )
-		)
-	)
-"
-
-COMMON_DEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	app-arch/bzip2:=
-	dev-libs/expat:=
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	media-libs/flac:=
-	sys-libs/zlib:=[minizip]
-	!headless? (
-		X? ( ${COMMON_X_DEPEND} )
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		media-libs/mesa:=[X?,wayland?]
-		cups? ( >=net-print/cups-1.3.11:= )
-		virtual/udev
-		x11-libs/cairo:=
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango:=
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? ( dev-qt/qtbase:6[gui,widgets] )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!headless? (
-		|| (
-			x11-libs/gtk+:3[X?,wayland?]
-			gui-libs/gtk:4[X?,wayland?]
-		)
-		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
-		qt6? ( dev-qt/qtbase:6[X?,wayland?] )
-	)
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	bindist? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${PV%%\.*} )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	!headless? (
-		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
-		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
-	)
-"
-
-BDEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	!headless? (
-		qt5? ( dev-qt/qtcore:5 )
-		qt6? ( dev-qt/qtbase:6 )
-	)
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
-		llvm-core/lld:${LLVM_SLOT}
-	')
-	pgo? (
-		>=dev-python/selenium-3.141.0
-		>=dev-util/web_page_replay_go-20220314
-	)
-	>=dev-util/bindgen-0.68.0
-	>=dev-build/gn-${GN_MIN_VER}
-	dev-build/ninja
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	dev-vcs/git
-	>=net-libs/nodejs-7.6.0[inspector]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pre_build_checks() {
-	# Check build requirements: bugs #471810, #541816, #914220
-	# We're going to start doing maths here on the size of an unpacked source tarball,
-	# this should make updates easier as chromium continues to balloon in size.
-	local BASE_DISK=24
-	local EXTRA_DISK=1
-	local CHECKREQS_MEMORY="4G"
-	tc-is-cross-compiler && EXTRA_DISK=2
-	if tc-is-lto || use pgo; then
-		CHECKREQS_MEMORY="9G"
-		tc-is-cross-compiler && EXTRA_DISK=4
-		use pgo && EXTRA_DISK=8
-	fi
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		if use custom-cflags; then
-			EXTRA_DISK=13
-		fi
-		CHECKREQS_MEMORY="16G"
-	fi
-	CHECKREQS_DISK_BUILD="$((BASE_DISK + EXTRA_DISK))G"
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
-		pre_build_checks
-	fi
-
-	if use headless; then
-		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland")
-		for myiuse in ${headless_unused_flags[@]}; do
-			use ${myiuse} && ewarn "Ignoring USE=${myiuse}, USE=headless is set."
-		done
-	fi
-
-	if ! use bindist && use ffmpeg-chromium; then
-		ewarn "Ignoring USE=ffmpeg-chromium, USE=bindist is not set."
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
-		pre_build_checks
-
-		# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
-		# We'll set these to clang here then use llvm-utils functions to very explicitly set these
-		# to a sane value.
-		# This is effectively the 'force-clang' path if GCC support is re-added.
-		# TODO: check if the user has already selected a specific impl via make.conf and respect that.
-		use_lto="false"
-		if tc-is-lto; then
-			use_lto="true"
-			# We can rely on GN to do this for us; anecdotally without this builds
-			# take significantly longer with LTO enabled and it doesn't hurt anything.
-			filter-lto
-		fi
-
-		if [ "$use_lto" = "false" ] && use official; then
-			einfo "USE=official selected and LTO not detected."
-			einfo "It is _highly_ recommended that LTO be enabled for performance reasons"
-			einfo "and to be consistent with the upstream \"official\" build optimisations."
-		fi
-
-		if [ "$use_lto" = "false" ] && use test; then
-			die "Tests require CFI which requires LTO"
-		fi
-
-		export use_lto
-
-		# 936858
-		if tc-ld-is-mold; then
-			eerror "Your toolchain is using the mold linker."
-			eerror "This is not supported by Chromium."
-			die "Please switch to a different linker."
-		fi
-
-		llvm-r1_pkg_setup
-		rust_pkg_setup
-
-		# Forcing clang; respect llvm_slot_x to enable selection of impl from LLVM_COMPAT
-		AR=llvm-ar
-		CPP="${CHOST}-clang++-${LLVM_SLOT} -E"
-		NM=llvm-nm
-		CC="${CHOST}-clang-${LLVM_SLOT}"
-		CXX="${CHOST}-clang++-${LLVM_SLOT}"
-
-		if tc-is-cross-compiler; then
-			use pgo && die "The pgo USE flag cannot be used when cross-compiling"
-			CPP="${CBUILD}-clang++-${LLVM_SLOT} -E"
-		fi
-
-		# I hate doing this but upstream Rust have yet to come up with a better solution for
-		# us poor packagers. Required for Split LTO units, which are required for CFI.
-		export RUSTC_BOOTSTRAP=1
-
-		# Users should never hit this, it's purely a development convenience
-		if ver_test $(gn --version || die) -lt ${GN_MIN_VER}; then
-			die "dev-build/gn >= ${GN_MIN_VER} is required to build this Chromium"
-		fi
-	fi
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	unpack ${P}-linux.tar.xz
-	unpack chromium-patches-${PATCH_V}.tar.bz2
-
-	use pgo && unpack chromium-profiler-0.2.tar
-
-	if use test; then
-		# A new testdata tarball is available for each release; but testfonts tend to remain stable
-		# for the duration of a release.
-		# This unpacks directly into/over ${WORKDIR}/${P} so we can just use `unpack`.
-		unpack ${P}-linux-testdata.tar.xz
-		# This just contains a bunch of font files that need to be unpacked (or moved) to the correct location.
-		local testfonts_dir="${WORKDIR}/${P}/third_party/test_fonts"
-		local testfonts_tar="${DISTDIR}/chromium-testfonts-${TEST_FONT:0:10}.tar.gz"
-		tar xf "${testfonts_tar}" -C "${testfonts_dir}" || die "Failed to unpack testfonts"
-	fi
-
-	if use ppc64; then
-		unpack chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local PATCHES=(
-		"${FILESDIR}/chromium-cross-compile.patch"
-		"${FILESDIR}/chromium-109-system-zlib.patch"
-		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-131-unbundle-icu-target.patch"
-		"${FILESDIR}/chromium-131-oauth2-client-switches.patch"
-		"${FILESDIR}/chromium-132-bindgen-custom-toolchain.patch"
-	)
-
-	shopt -s globstar nullglob
-	# 130: moved the PPC64 patches into the chromium-patches repo
-	local patch
-	for patch in "${WORKDIR}/chromium-patches-${PATCH_V}"/**/*.patch; do
-		if [[ ${patch} == *"ppc64le"* ]]; then
-			use ppc64 && PATCHES+=( "${patch}" )
-		else
-			PATCHES+=( "${patch}" )
-		fi
-	done
-
-	shopt -u globstar nullglob
-
-	# We can't use the bundled compiler builtins with the system toolchain
-	# `grep` is a development convenience to ensure we fail early when google changes something.
-	local builtins_match="if (is_clang && !is_nacl && !is_cronet_build) {"
-	grep -q "${builtins_match}" build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
-	sed -i -e "/${builtins_match}/,+2d" build/config/compiler/BUILD.gn
-
-	if use ppc64; then
-		local patchset_dir="${WORKDIR}/openpower-patches-${PPC64_HASH}/patches"
-		# patch causes build errors on 4K page systems (https://bugs.gentoo.org/show_bug.cgi?id=940304)
-		local page_size_patch="ppc64le/third_party/use-sysconf-page-size-on-ppc64.patch"
-		# Apply the OpenPOWER patches (check for page size)
-		openpower_patches=( $(grep -E "^ppc64le|^upstream" "${patchset_dir}/series" | grep -v "${page_size_patch}" || die) )
-		for patch in "${openpower_patches[@]}"; do
-			PATCHES+=( "${patchset_dir}/${patch}" )
-		done
-		if [[ $(getconf PAGESIZE) == 65536 ]]; then
-			PATCHES+=( "${patchset_dir}/${page_size_patch}" )
-		fi
-		# We use vsx3 as a proxy for 'want isa3.0' (POWER9)
-		if use cpu_flags_ppc_vsx3 ; then
-			PATCHES+=( "${patchset_dir}/ppc64le/core/baseline-isa-3-0.patch" )
-		fi
-	fi
-
-	# This is a nightly option that does not exist any current release
-	# https://github.com/rust-lang/rust/commit/389a399a501a626ebf891ae0bb076c25e325ae64
-	if ver_test ${RUST_SLOT} -le "1.82.0"; then
-		sed '/rustflags = \[ "-Zdefault-visibility=hidden" \]/d' -i build/config/gcc/BUILD.gn ||
-			die "Failed to remove default visibility nightly option"
-	fi
-
-	default
-
-	rm third_party/node/linux/node-linux-x64/bin/node || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
-	# remove_bundled_libraries.py walks the source tree and looks for paths containing the substring 'third_party'
-	# whitelist matches use the right-most matching path component, so we need to whitelist from that point down.
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/ceval
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/volk
-		third_party/anonymous_tokens
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/bidimapper
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/content_analysis_sdk
-		third_party/cpuinfo
-		third_party/crabbyavif
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/d3
-		third_party/dav1d
-		third_party/dawn
-		third_party/dawn/third_party/gn/webgpu-cts
-		third_party/dawn/third_party/khronos
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/csp_evaluator
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/json5
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/parsel-js
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs
-		third_party/devtools-frontend/src/front_end/third_party/third-party-web
-		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/front_end/third_party/web-vitals
-		third_party/devtools-frontend/src/third_party
-		third_party/distributed_point_functions
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fast_float
-		third_party/fdlibm
-		third_party/ffmpeg
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/fp16
-		third_party/freetype
-		third_party/fusejs
-		third_party/fxdiv
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/highway
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/ink_stroke_modeler/src/ink_stroke_modeler
-		third_party/ink_stroke_modeler/src/ink_stroke_modeler/internal
-		third_party/ink/src/ink/brush
-		third_party/ink/src/ink/color
-		third_party/ink/src/ink/geometry
-		third_party/ink/src/ink/rendering
-		third_party/ink/src/ink/rendering/skia/common_internal
-		third_party/ink/src/ink/rendering/skia/native
-		third_party/ink/src/ink/rendering/skia/native/internal
-		third_party/ink/src/ink/strokes
-		third_party/ink/src/ink/types
-		third_party/inspector_protocol
-		third_party/ipcz
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/lens_server_proto
-		third_party/leveldatabase
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/fastfeat
-		third_party/libaom/source/libaom/third_party/SVT-AV1
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libavif
-		third_party/libc++
-		third_party/libdrm
-		third_party/libevent
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libtess2/libtess2
-		third_party/libtess2/src/Include
-		third_party/libtess2/src/Source
-		third_party/liburlpattern
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/libzip
-		third_party/lit
-		third_party/llvm-libc
-		third_party/llvm-libc/src/shared/
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/markupsafe
-		third_party/material_color_utilities
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/omnibox_proto
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/opus
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg
-		third_party/pdfium/third_party/libtiff
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/perfetto/protos/third_party/simpleperf
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private_membership
-		third_party/private-join-and-compute
-		third_party/protobuf
-		third_party/pthreadpool
-		third_party/puffin
-		third_party/pyjson5
-		third_party/pyyaml
-		third_party/qcms
-		third_party/rapidhash
-		third_party/re2
-		third_party/rnnoise
-		third_party/rust
-		third_party/ruy
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/selenium-atoms
-		third_party/sentencepiece
-		third_party/sentencepiece/src/third_party/darts_clone
-		third_party/shell-encryption
-		third_party/simdutf
-		third_party/simplejson
-		third_party/six
-		third_party/skia
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/snappy
-		third_party/spirv-headers
-		third_party/spirv-tools
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
-		third_party/swiftshader/third_party/SPIRV-Tools
-		third_party/swiftshader/third_party/subzero
-		third_party/tensorflow_models
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/tflite/src/third_party/xla/third_party/tsl
-		third_party/tflite/src/third_party/xla/xla/tsl/framework
-		third_party/tflite/src/third_party/xla/xla/tsl/lib/random
-		third_party/tflite/src/third_party/xla/xla/tsl/protobuf
-		third_party/tflite/src/third_party/xla/xla/tsl/util
-		third_party/ukey2
-		third_party/unrar
-		third_party/utf
-		third_party/vulkan
-		third_party/wayland
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/xnnpack
-		third_party/zlib/google
-		third_party/zxcvbn-cpp
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/utf8-decoder
-		v8/src/third_party/valgrind
-		v8/third_party/glibc
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-
-	if use test; then
-		# tar tvf /var/cache/distfiles/${P}-testdata.tar.xz | grep '^d' | grep 'third_party' | awk '{print $NF}'
-		keeplibs+=(
-			third_party/breakpad/breakpad/src/processor
-			third_party/fuzztest
-			third_party/google_benchmark/src/include/benchmark
-			third_party/google_benchmark/src/src
-			third_party/perfetto/protos/third_party/pprof
-			third_party/test_fonts
-			third_party/test_fonts/fontconfig
-		)
-	fi
-
-	# USE=system-*
-	if ! use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-
-	if ! use system-png; then
-		keeplibs+=( third_party/libpng )
-	fi
-
-	if ! use system-zstd; then
-		keeplibs+=( third_party/zstd )
-	fi
-
-	# Arch-specific
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		# requires git and clang, bug #832803
-		# Revert https://chromium.googlesource.com/chromium/src/+/b463d0f40b08b4e896e7f458d89ae58ce2a27165%5E%21/third_party/libvpx/generate_gni.sh
-		# and https://chromium.googlesource.com/chromium/src/+/71ebcbce867dd31da5f8b405a28fcb0de0657d91%5E%21/third_party/libvpx/generate_gni.sh
-		# since we're not in a git repo
-		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g; /^git -C/d; /git cl/d; /cd \$BASE_DIR\/\$LIBVPX_SRC_DIR/ign format --in-place \$BASE_DIR\/BUILD.gn\ngn format --in-place \$BASE_DIR\/libvpx_srcs.gni" \
-			generate_gni.sh || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-
-		pushd third_party/ffmpeg >/dev/null || die
-		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
-		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
-		popd >/dev/null || die
-	fi
-
-	# Sanity check keeplibs, on major version bumps it is often necessary to update this list
-	# and this enables us to hit them all at once.
-	# There are some entries that need to be whitelisted (TODO: Why? The file is understandable, the rest seem odd)
-	whitelist_libs=(
-		net/third_party/quic
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/libjingle
-		third_party/mesa
-		third_party/skia/third_party/vulkan
-		third_party/vulkan
-	)
-	local not_found_libs=()
-	for lib in "${keeplibs[@]}"; do
-		if [[ ! -d "${lib}" ]] && ! has "${lib}" "${whitelist_libs[@]}"; then
-			not_found_libs+=( "${lib}" )
-		fi
-	done
-
-	if [[ ${#not_found_libs[@]} -gt 0 ]]; then
-		eerror "The following \`keeplibs\` directories were not found in the source tree:"
-		for lib in "${not_found_libs[@]}"; do
-			eerror "  ${lib}"
-		done
-		die "Please update the ebuild."
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	einfo "Unbundling third-party libraries ..."
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	# TODO: From 127 chromium includes a bunch of binaries? Unbundle them; they're not needed.
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-chromium_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# We already forced the "correct" clang via pkg_setup
-
-	if tc-is-cross-compiler; then
-		CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
-		CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
-		BUILD_AR=${AR}
-		BUILD_CC=${CC}
-		BUILD_CXX=${CXX}
-		BUILD_NM=${NM}
-	fi
-
-	strip-unsupported-flags
-
-	myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	# https://bugs.gentoo.org/918897#c32
-	append-ldflags -Wl,--undefined-version
-	myconf_gn+=" use_lld=true"
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
-		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
-
-		# setup cups-config, build system only uses --libs option
-		if use cups; then
-			mkdir "${T}/cups-config" || die
-			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
-			export PATH="${PATH}:${T}/cups-config"
-		fi
-
-		# Don't inherit PKG_CONFIG_PATH from environment
-		local -x PKG_CONFIG_PATH=
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# bindgen settings
-	# From 127, to make bindgen work, we need to provide a location for libclang.
-	# We patch this in for gentoo - see chromium-*-bindgen-custom-toolchain.patch
-	# rust_bindgen_root = directory with `bin/bindgen` beneath it.
-	myconf_gn+=" rust_bindgen_root=\"${EPREFIX}/usr/\""
-
-	myconf_gn+=" bindgen_libclang_path=\"$(get_llvm_prefix)/$(get_libdir)\""
-	# We don't need to set 'clang_base_bath' for anything in our build
-	# and it defaults to the google toolchain location. Instead provide a location
-	# to where system clang lives sot that bindgen can find system headers (e.g. stddef.h)
-	myconf_gn+=" clang_base_path=\"${EPREFIX}/usr/lib/clang/${LLVM_SLOT}/\""
-
-	myconf_gn+=" rust_sysroot_absolute=\"$(get_rust_prefix)\""
-	myconf_gn+=" rustc_version=\"${RUST_SLOT}\""
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=false"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libjpeg
-		libwebp
-		libxml
-		libxslt
-		openh264
-		zlib
-	)
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-png; then
-		gn_system_libraries+=( libpng )
-	fi
-	if use system-zstd; then
-		gn_system_libraries+=( zstd )
-	fi
-
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# TODO 131: The above call clobbers `enable_freetype = true` in the freetype gni file
-	# drop the last line, then append the freetype line and a new curly brace to end the block
-	local freetype_gni="build/config/freetype/freetype.gni"
-	sed -i -e '$d' ${freetype_gni} || die
-	echo "  enable_freetype = true" >> ${freetype_gni} || die
-	echo "}" >> ${freetype_gni} || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-
-	if use headless; then
-		myconf_gn+=" use_cups=false"
-		myconf_gn+=" use_kerberos=false"
-		myconf_gn+=" use_pulseaudio=false"
-		myconf_gn+=" use_vaapi=false"
-		myconf_gn+=" rtc_use_pipewire=false"
-	else
-		myconf_gn+=" use_cups=$(usex cups true false)"
-		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
-	fi
-
-	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
-	# using dlopen. This helps with automated detection of ABI mismatches and
-	# prevents silent errors.
-	if use pulseaudio; then
-		myconf_gn+=" link_pulseaudio=true"
-	fi
-
-	# Non-developer builds of Chromium (for example, non-Chrome browsers, or
-	# Chromium builds provided by Linux distros) should disable the testing config
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# The sysroot is the oldest debian image that chromium supports, we don't need it
-	myconf_gn+=" use_sysroot=false"
-
-	# Use in-tree libc++ (buildtools/third_party/libc++ and buildtools/third_party/libc++abi)
-	# instead of the system C++ library for C++ standard library support.
-	# default: true, but let's be explicit (forced since 120 ; USE removed 127).
-	myconf_gn+=" use_custom_libcxx=true"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	if use bindist ; then
-		# proprietary_codecs just forces Chromium to say that it can use h264/aac,
-		# the work is still done by ffmpeg. If this is set to no Chromium
-		# won't be able to load the codec even if the library can handle it
-		myconf_gn+=" proprietary_codecs=true"
-		myconf_gn+=" ffmpeg_branding=\"Chrome\""
-		# build ffmpeg as an external component (libffmpeg.so) that we can remove / substitute
-		myconf_gn+=" is_component_ffmpeg=true"
-	else
-		ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-		myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-		myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-	fi
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		filter-flags "-g*"
-
-		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
-		if [[ ${myarch} == amd64 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf_gn+=" treat_warnings_as_errors=false"
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Disable external code space for V8 for ppc64. It is disabled for ppc64
-	# by default, but cross-compiling on amd64 enables it again.
-	if tc-is-cross-compiler; then
-		if ! use amd64 && ! use arm64; then
-			myconf_gn+=" v8_enable_external_code_space=false"
-		fi
-	fi
-
-	# Only enabled for clang, but gcc has endian macros too
-	myconf_gn+=" v8_use_libm_trig_functions=true"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	# We don't use the same clang version as upstream, and with -Werror
-	# we need to make sure that we don't get superfluous warnings.
-	append-flags -Wno-unknown-warning-option
-	if tc-is-cross-compiler; then
-			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
-			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
-	fi
-
-	# Explicitly disable ICU data file support for system-icu/headless builds.
-	if use system-icu || use headless; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Don't need nocompile checks and GN crashes with our config
-	myconf_gn+=" enable_nocompile_tests=false"
-
-	# 131 began laying the groundwork for replacing freetype with
-	# "Rust-based Fontations set of libraries plus Skia path rendering"
-	# We now need to opt-in
-	myconf_gn+=" enable_freetype=true"
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	if use headless; then
-		myconf_gn+=" ozone_platform=\"headless\""
-		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
-		myconf_gn+=" use_glib=false use_gio=false"
-		myconf_gn+=" use_pangocairo=false use_alsa=false"
-		myconf_gn+=" use_libpci=false use_udev=false"
-		myconf_gn+=" enable_print_preview=false"
-		myconf_gn+=" enable_remoting=false"
-	else
-		myconf_gn+=" use_system_minigbm=true"
-		myconf_gn+=" use_xkbcommon=true"
-		if use qt5 || use qt6; then
-			local cbuild_libdir=$(get_libdir)
-			if tc-is-cross-compiler; then
-				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
-				cbuild_libdir=${cbuild_libdir:2}
-				cbuild_libdir=${cbuild_libdir/% }
-			fi
-			if use qt5; then
-				if tc-is-cross-compiler; then
-					myconf_gn+=" moc_qt5_path=\"${EPREFIX}/${cbuild_libdir}/qt5/bin\""
-				else
-					myconf_gn+=" moc_qt5_path=\"$(qt5_get_bindir)\""
-				fi
-			fi
-			if use qt6; then
-				myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\""
-			fi
-
-			myconf_gn+=" use_qt=true"
-			myconf_gn+=" use_qt6=$(usex qt6 true false)"
-		else
-			myconf_gn+=" use_qt=false"
-		fi
-		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
-		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
-		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
-		use wayland && myconf_gn+=" use_system_libffi=true"
-	fi
-
-	myconf_gn+=" use_thin_lto=${use_lto}"
-	myconf_gn+=" thin_lto_enable_optimizations=${use_lto}"
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		myconf_gn+=" is_cfi=${use_lto}"
-		# Don't add symbols to build
-		myconf_gn+=" symbol_level=0"
-	fi
-
-	if use pgo; then
-		myconf_gn+=" chrome_pgo_phase=${1}"
-		if [[ "$1" == "2" ]]; then
-			myconf_gn+=" pgo_data_path=\"${2}\""
-		fi
-	else
-		# Disable PGO
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	# skipping typecheck is only supported on amd64, bug #876157
-	if ! use amd64; then
-		myconf_gn+=" devtools_skip_typecheck=false"
-	fi
-
-	einfo "Configuring Chromium ..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	chromium_configure $(usex pgo 1 0)
-}
-
-chromium_compile() {
-
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	# Build mksnapshot and pax-mark it.
-	if use pax-kernel; then
-		local x
-		for x in mksnapshot v8_context_snapshot_generator; do
-			if tc-is-cross-compiler; then
-				eninja -C out/Release "host/${x}"
-				pax-mark m "out/Release/host/${x}"
-			else
-				eninja -C out/Release "${x}"
-				pax-mark m "out/Release/${x}"
-			fi
-		done
-	fi
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver chrome_sandbox $(use test && echo "base_unittests")
-
-	pax-mark m out/Release/chrome
-
-}
-
-# This function is called from virtx, and must always return so that Xvfb
-# session isn't left running. If we return 1, virtx will call die().
-chromium_profile() {
-	einfo "Profiling for PGO"
-
-	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
-
-	# Remove old profdata in case profiling was interrupted.
-	rm -rf "${1}" || return 1
-
-	if ! "${EPYTHON}" ./chromium_profiler.py \
-		--chrome-executable "${S}/out/Release/chrome" \
-		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
-		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
-		--profile-output "${1}"; then
-		eerror "Profiling failed"
-		return 1
-	fi
-
-	popd >/dev/null || return 1
-}
-
-src_compile() {
-	if use pgo; then
-		local profdata
-
-		profdata="${WORKDIR}/chromium.profdata"
-
-		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
-			chromium_compile
-			virtx chromium_profile "$profdata"
-
-			touch "${WORKDIR}/.pgo-profiled" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
-			# Remove phase 1 output
-			rm -r out/Release || die
-
-			chromium_configure 2 "$profdata"
-
-			touch "${WORKDIR}/.pgo-phase-2-configured" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
-			chromium_compile
-			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
-		fi
-	else
-		chromium_compile
-	fi
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	rm -f out/Release/locales/*.pak.info || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-
-	# Build vk_swiftshader_icd.json; bug #827861
-	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
-		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
-		out/Release/vk_swiftshader_icd.json || die
-}
-
-src_test() {
-	# Initial list of tests to skip pulled from Alpine. Thanks Lauren!
-	# https://issues.chromium.org/issues/40939315
-	local skip_tests=(
-		'MessagePumpLibeventTest.NestedNotification*'
-		ClampTest.Death
-		OptionalTest.DereferencingNoValueCrashes
-		PlatformThreadTest.SetCurrentThreadTypeTest
-		RawPtrTest.TrivialRelocability
-		SafeNumerics.IntMaxOperations
-		StackTraceTest.TraceStackFramePointersFromBuffer
-		StringPieceTest.InvalidLengthDeath
-		StringPieceTest.OutOfBoundsDeath
-		ThreadPoolEnvironmentConfig.CanUseBackgroundPriorityForWorker
-		ValuesUtilTest.FilePath
-		# Gentoo-specific
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/0
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/1
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/2
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/3
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/0
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/1
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/2
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/3
-		CharacterEncodingTest.GetCanonicalEncodingNameByAliasName
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGFPE
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGILL
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGV
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGVNonCanonicalAddress
-		FilePathTest.FromUTF8Unsafe_And_AsUTF8Unsafe
-		FileTest.GetInfoForCreationTime
-		ICUStringConversionsTest.ConvertToUtf8AndNormalize
-		NumberFormattingTest.FormatPercent
-		PathServiceTest.CheckedGetFailure
-		PlatformThreadTest.CanChangeThreadType
-		RustLogIntegrationTest.CheckAllSeverity
-		StackCanary.ChangingStackCanaryCrashesOnReturn
-		StackTraceDeathTest.StackDumpSignalHandlerIsMallocFree
-		SysStrings.SysNativeMBAndWide
-		SysStrings.SysNativeMBToWide
-		SysStrings.SysWideToNativeMB
-		TestLauncherTools.TruncateSnippetFocusedMatchesFatalMessagesTest
-		ToolsSanityTest.BadVirtualCallNull
-		ToolsSanityTest.BadVirtualCallWrongType
-		CancelableEventTest.BothCancelFailureAndSucceedOccurUnderContention #new m133: TODO investigate
-	)
-	local test_filter="-$(IFS=:; printf '%s' "${skip_tests[*]}")"
-	# test-launcher-bot-mode enables parallelism and plain output
-	./out/Release/base_unittests --test-launcher-bot-mode \
-		--test-launcher-jobs="$(makeopts_jobs)" \
-		--gtest_filter="${test_filter}" || die "Tests failed!"
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	newexe out/Release/chrome_sandbox chrome-sandbox
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use X && use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-
-	if use bindist; then
-		# We built libffmpeg as a component library, but we can't distribute it
-		# with proprietary codec support. Remove it and make a symlink to the requested
-		# system library.
-		rm -f out/Release/libffmpeg.so \
-			|| die "Failed to remove bundled libffmpeg.so (with proprietary codecs)"
-		# symlink the libffmpeg.so from either ffmpeg-chromium or ffmpeg[chromium].
-		einfo "Creating symlink to libffmpeg.so from $(usex ffmpeg-chromium ffmpeg-chromium ffmpeg[chromium])..."
-		dosym ../chromium/libffmpeg.so$(usex ffmpeg-chromium .${PV%%\.*} "") \
-			/usr/$(get_libdir)/chromium-browser/libffmpeg.so
-	fi
-
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	# Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland"
-	doins out/Release/xdg-{settings,mime}
-
-	if ! use system-icu && ! use headless; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/MEIPreload
-
-	# Install vk_swiftshader_icd.json; bug #827861
-	doins out/Release/vk_swiftshader_icd.json
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if ! use headless; then
-		if use vaapi; then
-			elog "VA-API is disabled by default at runtime. You have to enable it"
-			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-			elog "in /etc/chromium/default."
-		fi
-		if use screencast; then
-			elog "Screencast is disabled by default at runtime. Either enable it"
-			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use gtk4; then
-			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
-			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use qt5 && use qt6; then
-			elog "Chromium automatically selects Qt5 or Qt6 based on your desktop"
-			elog "environment. To override you need to pass --qt-version=5 or"
-			elog "--qt-version=6, e.g. by adding it to CHROMIUM_FLAGS in"
-			elog "/etc/chromium/default."
-		fi
-	fi
-
-	if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then
-		ewarn "The lack of an '/etc/machine-id' file on this system booted with systemd"
-		ewarn "indicates that the Gentoo handbook was not followed to completion."
-		ewarn ""
-		ewarn "Chromium is known to behave unpredictably with this system configuration;"
-		ewarn "please complete the configuration of this system before logging any bugs."
-	fi
-}
diff --git a/www-client/chromium/chromium-133.0.6905.0.ebuild b/www-client/chromium/chromium-133.0.6905.0.ebuild
deleted file mode 100644
index f587dd56fac0..000000000000
--- a/www-client/chromium/chromium-133.0.6905.0.ebuild
+++ /dev/null
@@ -1,1459 +0,0 @@
-# Copyright 2009-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# PACKAGING NOTES
-
-
-
-# Since m133 (and backported a bit...) we are using CI-generated tarballs from
-# https://github.com/chromium-linux-tarballs/chromium-tarballs/ (uploaded to S3
-# and made available via https://chromium-tarballs.distfiles.gentoo.org/).
-
-# We do this because upstream tarballs weigh in at about 3.5x the size of our
-# new "Distro tarballs" and include binaries (etc) that are not useful for
-# downstream consumers (like distributions).
-
-# It is probably still possible to download the google Rust and Clang toolchains
-# and use them to build this package, however we removed this when upstream CI
-# broke for m131 and haven't re-added it.
-
-GN_MIN_VER=0.2165
-# chromium-tools/get-chromium-toolchain-strings.py
-TEST_FONT=f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35
-
-VIRTUALX_REQUIRED="pgo"
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-LLVM_COMPAT=( 19 )
-PYTHON_COMPAT=( python3_{11..13} )
-PYTHON_REQ_USE="xml(+)"
-RUST_MIN_VER=1.78.0
-RUST_NEEDS_LLVM="yes please"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 multiprocessing ninja-utils pax-utils
-inherit python-any-r1 qmake-utils readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://www.chromium.org/"
-PPC64_HASH="a85b64f07b489b8c6fdb13ecf79c16c56c560fc6"
-PATCH_V="${PV%%\.*}-1"
-SRC_URI="https://chromium-tarballs.distfiles.gentoo.org/${P}-linux.tar.xz
-		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
-	test? (
-		https://chromium-tarballs.distfiles.gentoo.org/${P}-linux-testdata.tar.xz
-		https://chromium-fonts.storage.googleapis.com/${TEST_FONT} -> chromium-testfonts-${TEST_FONT:0:10}.tar.gz
-	)
-	ppc64? (
-		https://gitlab.solidsilicon.io/public-development/open-source/chromium/openpower-patches/-/archive/${PPC64_HASH}/openpower-patches-${PPC64_HASH}.tar.bz2 -> chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
-	)
-	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
-
-LICENSE="BSD"
-SLOT="0/dev"
-# Dev exists mostly to give devs some breathing room for beta/stable releases;
-# it shouldn't be keyworded but adventurous users can select it.
-if [[ ${SLOT} != "0/dev" ]]; then
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
-IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
-IUSE+=" qt5 qt6 +screencast selinux test +vaapi +wayland +widevine cpu_flags_ppc_vsx3"
-RESTRICT="
-	!bindist? ( bindist )
-	!test? ( test )
-"
-
-REQUIRED_USE="
-	!headless? ( || ( X wayland ) )
-	pgo? ( X !wayland )
-	qt6? ( qt5 )
-	screencast? ( wayland )
-	ffmpeg-chromium? ( bindist proprietary-codecs )
-"
-
-COMMON_X_DEPEND="
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxshmfence:=
-"
-
-COMMON_SNAPSHOT_DEPEND="
-	system-icu? ( >=dev-libs/icu-73.0:= )
-	>=dev-libs/libxml2-2.12.4:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	dev-libs/libxslt:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	system-png? ( media-libs/libpng:=[-apng(-)] )
-	system-zstd? ( >=app-arch/zstd-1.5.5:= )
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/mesa:=[gbm(+)]
-	>=media-libs/openh264-1.6.0:=
-	sys-libs/zlib:=
-	!headless? (
-		dev-libs/glib:2
-		>=media-libs/alsa-lib-1.0.19:=
-		pulseaudio? ( media-libs/libpulse:= )
-		sys-apps/pciutils:=
-		kerberos? ( virtual/krb5 )
-		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
-		X? (
-			x11-base/xorg-proto:=
-			x11-libs/libX11:=
-			x11-libs/libxcb:=
-			x11-libs/libXext:=
-		)
-		x11-libs/libxkbcommon:=
-		wayland? (
-			dev-libs/libffi:=
-			dev-libs/wayland:=
-			screencast? ( media-video/pipewire:= )
-		)
-	)
-"
-
-COMMON_DEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	app-arch/bzip2:=
-	dev-libs/expat:=
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	media-libs/flac:=
-	sys-libs/zlib:=[minizip]
-	!headless? (
-		X? ( ${COMMON_X_DEPEND} )
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		media-libs/mesa:=[X?,wayland?]
-		cups? ( >=net-print/cups-1.3.11:= )
-		virtual/udev
-		x11-libs/cairo:=
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango:=
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? ( dev-qt/qtbase:6[gui,widgets] )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!headless? (
-		|| (
-			x11-libs/gtk+:3[X?,wayland?]
-			gui-libs/gtk:4[X?,wayland?]
-		)
-		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
-		qt6? ( dev-qt/qtbase:6[X?,wayland?] )
-	)
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	bindist? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${PV%%\.*} )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	!headless? (
-		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
-		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
-	)
-"
-
-BDEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	!headless? (
-		qt5? ( dev-qt/qtcore:5 )
-		qt6? ( dev-qt/qtbase:6 )
-	)
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
-		llvm-core/lld:${LLVM_SLOT}
-	')
-	pgo? (
-		>=dev-python/selenium-3.141.0
-		>=dev-util/web_page_replay_go-20220314
-	)
-	>=dev-util/bindgen-0.68.0
-	>=dev-build/gn-${GN_MIN_VER}
-	dev-build/ninja
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	dev-vcs/git
-	>=net-libs/nodejs-7.6.0[inspector]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pre_build_checks() {
-	# Check build requirements: bugs #471810, #541816, #914220
-	# We're going to start doing maths here on the size of an unpacked source tarball,
-	# this should make updates easier as chromium continues to balloon in size.
-	local BASE_DISK=24
-	local EXTRA_DISK=1
-	local CHECKREQS_MEMORY="4G"
-	tc-is-cross-compiler && EXTRA_DISK=2
-	if tc-is-lto || use pgo; then
-		CHECKREQS_MEMORY="9G"
-		tc-is-cross-compiler && EXTRA_DISK=4
-		use pgo && EXTRA_DISK=8
-	fi
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		if use custom-cflags; then
-			EXTRA_DISK=13
-		fi
-		CHECKREQS_MEMORY="16G"
-	fi
-	CHECKREQS_DISK_BUILD="$((BASE_DISK + EXTRA_DISK))G"
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
-		pre_build_checks
-	fi
-
-	if use headless; then
-		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland")
-		for myiuse in ${headless_unused_flags[@]}; do
-			use ${myiuse} && ewarn "Ignoring USE=${myiuse}, USE=headless is set."
-		done
-	fi
-
-	if ! use bindist && use ffmpeg-chromium; then
-		ewarn "Ignoring USE=ffmpeg-chromium, USE=bindist is not set."
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
-		pre_build_checks
-
-		# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
-		# We'll set these to clang here then use llvm-utils functions to very explicitly set these
-		# to a sane value.
-		# This is effectively the 'force-clang' path if GCC support is re-added.
-		# TODO: check if the user has already selected a specific impl via make.conf and respect that.
-		use_lto="false"
-		if tc-is-lto; then
-			use_lto="true"
-			# We can rely on GN to do this for us; anecdotally without this builds
-			# take significantly longer with LTO enabled and it doesn't hurt anything.
-			filter-lto
-		fi
-
-		if [ "$use_lto" = "false" ] && use official; then
-			einfo "USE=official selected and LTO not detected."
-			einfo "It is _highly_ recommended that LTO be enabled for performance reasons"
-			einfo "and to be consistent with the upstream \"official\" build optimisations."
-		fi
-
-		if [ "$use_lto" = "false" ] && use test; then
-			die "Tests require CFI which requires LTO"
-		fi
-
-		export use_lto
-
-		# 936858
-		if tc-ld-is-mold; then
-			eerror "Your toolchain is using the mold linker."
-			eerror "This is not supported by Chromium."
-			die "Please switch to a different linker."
-		fi
-
-		llvm-r1_pkg_setup
-		rust_pkg_setup
-
-		# Forcing clang; respect llvm_slot_x to enable selection of impl from LLVM_COMPAT
-		AR=llvm-ar
-		CPP="${CHOST}-clang++-${LLVM_SLOT} -E"
-		NM=llvm-nm
-		CC="${CHOST}-clang-${LLVM_SLOT}"
-		CXX="${CHOST}-clang++-${LLVM_SLOT}"
-
-		if tc-is-cross-compiler; then
-			use pgo && die "The pgo USE flag cannot be used when cross-compiling"
-			CPP="${CBUILD}-clang++-${LLVM_SLOT} -E"
-		fi
-
-		# I hate doing this but upstream Rust have yet to come up with a better solution for
-		# us poor packagers. Required for Split LTO units, which are required for CFI.
-		export RUSTC_BOOTSTRAP=1
-
-		# Users should never hit this, it's purely a development convenience
-		if ver_test $(gn --version || die) -lt ${GN_MIN_VER}; then
-			die "dev-build/gn >= ${GN_MIN_VER} is required to build this Chromium"
-		fi
-	fi
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	unpack ${P}-linux.tar.xz
-	unpack chromium-patches-${PATCH_V}.tar.bz2
-
-	use pgo && unpack chromium-profiler-0.2.tar
-
-	if use test; then
-		# A new testdata tarball is available for each release; but testfonts tend to remain stable
-		# for the duration of a release.
-		# This unpacks directly into/over ${WORKDIR}/${P} so we can just use `unpack`.
-		unpack ${P}-linux-testdata.tar.xz
-		# This just contains a bunch of font files that need to be unpacked (or moved) to the correct location.
-		local testfonts_dir="${WORKDIR}/${P}/third_party/test_fonts"
-		local testfonts_tar="${DISTDIR}/chromium-testfonts-${TEST_FONT:0:10}.tar.gz"
-		tar xf "${testfonts_tar}" -C "${testfonts_dir}" || die "Failed to unpack testfonts"
-	fi
-
-	if use ppc64; then
-		unpack chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local PATCHES=(
-		"${FILESDIR}/chromium-cross-compile.patch"
-		"${FILESDIR}/chromium-109-system-zlib.patch"
-		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-131-unbundle-icu-target.patch"
-		"${FILESDIR}/chromium-131-oauth2-client-switches.patch"
-		"${FILESDIR}/chromium-132-bindgen-custom-toolchain.patch"
-	)
-
-	shopt -s globstar nullglob
-	# 130: moved the PPC64 patches into the chromium-patches repo
-	local patch
-	for patch in "${WORKDIR}/chromium-patches-${PATCH_V}"/**/*.patch; do
-		if [[ ${patch} == *"ppc64le"* ]]; then
-			use ppc64 && PATCHES+=( "${patch}" )
-		else
-			PATCHES+=( "${patch}" )
-		fi
-	done
-
-	shopt -u globstar nullglob
-
-	# We can't use the bundled compiler builtins with the system toolchain
-	# `grep` is a development convenience to ensure we fail early when google changes something.
-	local builtins_match="if (is_clang && !is_nacl && !is_cronet_build) {"
-	grep -q "${builtins_match}" build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
-	sed -i -e "/${builtins_match}/,+2d" build/config/compiler/BUILD.gn
-
-	if use ppc64; then
-		local patchset_dir="${WORKDIR}/openpower-patches-${PPC64_HASH}/patches"
-		# patch causes build errors on 4K page systems (https://bugs.gentoo.org/show_bug.cgi?id=940304)
-		local page_size_patch="ppc64le/third_party/use-sysconf-page-size-on-ppc64.patch"
-		# Apply the OpenPOWER patches (check for page size)
-		openpower_patches=( $(grep -E "^ppc64le|^upstream" "${patchset_dir}/series" | grep -v "${page_size_patch}" || die) )
-		for patch in "${openpower_patches[@]}"; do
-			PATCHES+=( "${patchset_dir}/${patch}" )
-		done
-		if [[ $(getconf PAGESIZE) == 65536 ]]; then
-			PATCHES+=( "${patchset_dir}/${page_size_patch}" )
-		fi
-		# We use vsx3 as a proxy for 'want isa3.0' (POWER9)
-		if use cpu_flags_ppc_vsx3 ; then
-			PATCHES+=( "${patchset_dir}/ppc64le/core/baseline-isa-3-0.patch" )
-		fi
-	fi
-
-	# This is a nightly option that does not exist any current release
-	# https://github.com/rust-lang/rust/commit/389a399a501a626ebf891ae0bb076c25e325ae64
-	if ver_test ${RUST_SLOT} -le "1.82.0"; then
-		sed '/rustflags = \[ "-Zdefault-visibility=hidden" \]/d' -i build/config/gcc/BUILD.gn ||
-			die "Failed to remove default visibility nightly option"
-	fi
-
-	default
-
-	rm third_party/node/linux/node-linux-x64/bin/node || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
-	# remove_bundled_libraries.py walks the source tree and looks for paths containing the substring 'third_party'
-	# whitelist matches use the right-most matching path component, so we need to whitelist from that point down.
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/ceval
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/volk
-		third_party/anonymous_tokens
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/bidimapper
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/content_analysis_sdk
-		third_party/cpuinfo
-		third_party/crabbyavif
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/d3
-		third_party/dav1d
-		third_party/dawn
-		third_party/dawn/third_party/gn/webgpu-cts
-		third_party/dawn/third_party/khronos
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/csp_evaluator
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/json5
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/parsel-js
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs
-		third_party/devtools-frontend/src/front_end/third_party/third-party-web
-		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/front_end/third_party/web-vitals
-		third_party/devtools-frontend/src/third_party
-		third_party/distributed_point_functions
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fast_float
-		third_party/fdlibm
-		third_party/ffmpeg
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/fp16
-		third_party/freetype
-		third_party/fusejs
-		third_party/fxdiv
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/highway
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/ink_stroke_modeler/src/ink_stroke_modeler
-		third_party/ink_stroke_modeler/src/ink_stroke_modeler/internal
-		third_party/ink/src/ink/brush
-		third_party/ink/src/ink/color
-		third_party/ink/src/ink/geometry
-		third_party/ink/src/ink/rendering
-		third_party/ink/src/ink/rendering/skia/common_internal
-		third_party/ink/src/ink/rendering/skia/native
-		third_party/ink/src/ink/rendering/skia/native/internal
-		third_party/ink/src/ink/strokes
-		third_party/ink/src/ink/types
-		third_party/inspector_protocol
-		third_party/ipcz
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/khronos
-		third_party/lens_server_proto
-		third_party/leveldatabase
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/fastfeat
-		third_party/libaom/source/libaom/third_party/SVT-AV1
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libavif
-		third_party/libc++
-		third_party/libdrm
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libtess2/libtess2
-		third_party/libtess2/src/Include
-		third_party/libtess2/src/Source
-		third_party/liburlpattern
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/libzip
-		third_party/lit
-		third_party/llvm-libc
-		third_party/llvm-libc/src/shared/
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/markupsafe
-		third_party/material_color_utilities
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/omnibox_proto
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/opus
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg
-		third_party/pdfium/third_party/libtiff
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/perfetto/protos/third_party/simpleperf
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private_membership
-		third_party/private-join-and-compute
-		third_party/protobuf
-		third_party/pthreadpool
-		third_party/puffin
-		third_party/pyjson5
-		third_party/pyyaml
-		third_party/qcms
-		third_party/rapidhash
-		third_party/re2
-		third_party/rnnoise
-		third_party/rust
-		third_party/ruy
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/selenium-atoms
-		third_party/sentencepiece
-		third_party/sentencepiece/src/third_party/darts_clone
-		third_party/shell-encryption
-		third_party/simdutf
-		third_party/simplejson
-		third_party/six
-		third_party/skia
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/snappy
-		third_party/spirv-headers
-		third_party/spirv-tools
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
-		third_party/swiftshader/third_party/SPIRV-Tools
-		third_party/swiftshader/third_party/subzero
-		third_party/tensorflow_models
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/tflite/src/third_party/xla/third_party/tsl
-		third_party/tflite/src/third_party/xla/xla/tsl/framework
-		third_party/tflite/src/third_party/xla/xla/tsl/lib/random
-		third_party/tflite/src/third_party/xla/xla/tsl/protobuf
-		third_party/tflite/src/third_party/xla/xla/tsl/util
-		third_party/ukey2
-		third_party/unrar
-		third_party/utf
-		third_party/vulkan
-		third_party/wayland
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/xnnpack
-		third_party/zlib/google
-		third_party/zxcvbn-cpp
-		url/third_party/mozilla
-		v8/third_party/siphash
-		v8/third_party/utf8-decoder
-		v8/third_party/valgrind
-		v8/third_party/glibc
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-
-	if use test; then
-		# tar tvf /var/cache/distfiles/${P}-testdata.tar.xz | grep '^d' | grep 'third_party' | awk '{print $NF}'
-		keeplibs+=(
-			third_party/breakpad/breakpad/src/processor
-			third_party/fuzztest
-			third_party/google_benchmark/src/include/benchmark
-			third_party/google_benchmark/src/src
-			third_party/perfetto/protos/third_party/pprof
-			third_party/test_fonts
-			third_party/test_fonts/fontconfig
-		)
-	fi
-
-	# USE=system-*
-	if ! use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-
-	if ! use system-png; then
-		keeplibs+=( third_party/libpng )
-	fi
-
-	if ! use system-zstd; then
-		keeplibs+=( third_party/zstd )
-	fi
-
-	# Arch-specific
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		# requires git and clang, bug #832803
-		# Revert https://chromium.googlesource.com/chromium/src/+/b463d0f40b08b4e896e7f458d89ae58ce2a27165%5E%21/third_party/libvpx/generate_gni.sh
-		# and https://chromium.googlesource.com/chromium/src/+/71ebcbce867dd31da5f8b405a28fcb0de0657d91%5E%21/third_party/libvpx/generate_gni.sh
-		# since we're not in a git repo
-		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g; /^git -C/d; /git cl/d; /cd \$BASE_DIR\/\$LIBVPX_SRC_DIR/ign format --in-place \$BASE_DIR\/BUILD.gn\ngn format --in-place \$BASE_DIR\/libvpx_srcs.gni" \
-			generate_gni.sh || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-
-		pushd third_party/ffmpeg >/dev/null || die
-		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
-		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
-		popd >/dev/null || die
-	fi
-
-	# Sanity check keeplibs, on major version bumps it is often necessary to update this list
-	# and this enables us to hit them all at once.
-	# There are some entries that need to be whitelisted (TODO: Why? The file is understandable, the rest seem odd)
-	whitelist_libs=(
-		net/third_party/quic
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/libjingle
-		third_party/mesa
-		third_party/skia/third_party/vulkan
-		third_party/vulkan
-	)
-	local not_found_libs=()
-	for lib in "${keeplibs[@]}"; do
-		if [[ ! -d "${lib}" ]] && ! has "${lib}" "${whitelist_libs[@]}"; then
-			not_found_libs+=( "${lib}" )
-		fi
-	done
-
-	if [[ ${#not_found_libs[@]} -gt 0 ]]; then
-		eerror "The following \`keeplibs\` directories were not found in the source tree:"
-		for lib in "${not_found_libs[@]}"; do
-			eerror "  ${lib}"
-		done
-		die "Please update the ebuild."
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	einfo "Unbundling third-party libraries ..."
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	# TODO: From 127 chromium includes a bunch of binaries? Unbundle them; they're not needed.
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-chromium_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# We already forced the "correct" clang via pkg_setup
-
-	if tc-is-cross-compiler; then
-		CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
-		CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
-		BUILD_AR=${AR}
-		BUILD_CC=${CC}
-		BUILD_CXX=${CXX}
-		BUILD_NM=${NM}
-	fi
-
-	strip-unsupported-flags
-
-	myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	# https://bugs.gentoo.org/918897#c32
-	append-ldflags -Wl,--undefined-version
-	myconf_gn+=" use_lld=true"
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
-		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
-
-		# setup cups-config, build system only uses --libs option
-		if use cups; then
-			mkdir "${T}/cups-config" || die
-			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
-			export PATH="${PATH}:${T}/cups-config"
-		fi
-
-		# Don't inherit PKG_CONFIG_PATH from environment
-		local -x PKG_CONFIG_PATH=
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# bindgen settings
-	# From 127, to make bindgen work, we need to provide a location for libclang.
-	# We patch this in for gentoo - see chromium-*-bindgen-custom-toolchain.patch
-	# rust_bindgen_root = directory with `bin/bindgen` beneath it.
-	myconf_gn+=" rust_bindgen_root=\"${EPREFIX}/usr/\""
-
-	myconf_gn+=" bindgen_libclang_path=\"$(get_llvm_prefix)/$(get_libdir)\""
-	# We don't need to set 'clang_base_bath' for anything in our build
-	# and it defaults to the google toolchain location. Instead provide a location
-	# to where system clang lives sot that bindgen can find system headers (e.g. stddef.h)
-	myconf_gn+=" clang_base_path=\"${EPREFIX}/usr/lib/clang/${LLVM_SLOT}/\""
-
-	myconf_gn+=" rust_sysroot_absolute=\"$(get_rust_prefix)\""
-	myconf_gn+=" rustc_version=\"${RUST_SLOT}\""
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=false"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libjpeg
-		libwebp
-		libxml
-		libxslt
-		openh264
-		zlib
-	)
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-png; then
-		gn_system_libraries+=( libpng )
-	fi
-	if use system-zstd; then
-		gn_system_libraries+=( zstd )
-	fi
-
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# TODO 131: The above call clobbers `enable_freetype = true` in the freetype gni file
-	# drop the last line, then append the freetype line and a new curly brace to end the block
-	local freetype_gni="build/config/freetype/freetype.gni"
-	sed -i -e '$d' ${freetype_gni} || die
-	echo "  enable_freetype = true" >> ${freetype_gni} || die
-	echo "}" >> ${freetype_gni} || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-
-	if use headless; then
-		myconf_gn+=" use_cups=false"
-		myconf_gn+=" use_kerberos=false"
-		myconf_gn+=" use_pulseaudio=false"
-		myconf_gn+=" use_vaapi=false"
-		myconf_gn+=" rtc_use_pipewire=false"
-	else
-		myconf_gn+=" use_cups=$(usex cups true false)"
-		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
-	fi
-
-	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
-	# using dlopen. This helps with automated detection of ABI mismatches and
-	# prevents silent errors.
-	if use pulseaudio; then
-		myconf_gn+=" link_pulseaudio=true"
-	fi
-
-	# Non-developer builds of Chromium (for example, non-Chrome browsers, or
-	# Chromium builds provided by Linux distros) should disable the testing config
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# The sysroot is the oldest debian image that chromium supports, we don't need it
-	myconf_gn+=" use_sysroot=false"
-
-	# Use in-tree libc++ (buildtools/third_party/libc++ and buildtools/third_party/libc++abi)
-	# instead of the system C++ library for C++ standard library support.
-	# default: true, but let's be explicit (forced since 120 ; USE removed 127).
-	myconf_gn+=" use_custom_libcxx=true"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	if use bindist ; then
-		# proprietary_codecs just forces Chromium to say that it can use h264/aac,
-		# the work is still done by ffmpeg. If this is set to no Chromium
-		# won't be able to load the codec even if the library can handle it
-		myconf_gn+=" proprietary_codecs=true"
-		myconf_gn+=" ffmpeg_branding=\"Chrome\""
-		# build ffmpeg as an external component (libffmpeg.so) that we can remove / substitute
-		myconf_gn+=" is_component_ffmpeg=true"
-	else
-		ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-		myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-		myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-	fi
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		filter-flags "-g*"
-
-		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
-		if [[ ${myarch} == amd64 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf_gn+=" treat_warnings_as_errors=false"
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Disable external code space for V8 for ppc64. It is disabled for ppc64
-	# by default, but cross-compiling on amd64 enables it again.
-	if tc-is-cross-compiler; then
-		if ! use amd64 && ! use arm64; then
-			myconf_gn+=" v8_enable_external_code_space=false"
-		fi
-	fi
-
-	# Only enabled for clang, but gcc has endian macros too
-	myconf_gn+=" v8_use_libm_trig_functions=true"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	# We don't use the same clang version as upstream, and with -Werror
-	# we need to make sure that we don't get superfluous warnings.
-	append-flags -Wno-unknown-warning-option
-	if tc-is-cross-compiler; then
-			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
-			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
-	fi
-
-	# Explicitly disable ICU data file support for system-icu/headless builds.
-	if use system-icu || use headless; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Don't need nocompile checks and GN crashes with our config
-	myconf_gn+=" enable_nocompile_tests=false"
-
-	# 131 began laying the groundwork for replacing freetype with
-	# "Rust-based Fontations set of libraries plus Skia path rendering"
-	# We now need to opt-in
-	myconf_gn+=" enable_freetype=true"
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	if use headless; then
-		myconf_gn+=" ozone_platform=\"headless\""
-		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
-		myconf_gn+=" use_glib=false use_gio=false"
-		myconf_gn+=" use_pangocairo=false use_alsa=false"
-		myconf_gn+=" use_libpci=false use_udev=false"
-		myconf_gn+=" enable_print_preview=false"
-		myconf_gn+=" enable_remoting=false"
-	else
-		myconf_gn+=" use_system_minigbm=true"
-		myconf_gn+=" use_xkbcommon=true"
-		if use qt5 || use qt6; then
-			local cbuild_libdir=$(get_libdir)
-			if tc-is-cross-compiler; then
-				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
-				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
-				cbuild_libdir=${cbuild_libdir:2}
-				cbuild_libdir=${cbuild_libdir/% }
-			fi
-			if use qt5; then
-				if tc-is-cross-compiler; then
-					myconf_gn+=" moc_qt5_path=\"${EPREFIX}/${cbuild_libdir}/qt5/bin\""
-				else
-					myconf_gn+=" moc_qt5_path=\"$(qt5_get_bindir)\""
-				fi
-			fi
-			if use qt6; then
-				myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\""
-			fi
-
-			myconf_gn+=" use_qt=true"
-			myconf_gn+=" use_qt6=$(usex qt6 true false)"
-		else
-			myconf_gn+=" use_qt=false"
-		fi
-		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
-		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
-		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
-		use wayland && myconf_gn+=" use_system_libffi=true"
-	fi
-
-	myconf_gn+=" use_thin_lto=${use_lto}"
-	myconf_gn+=" thin_lto_enable_optimizations=${use_lto}"
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		myconf_gn+=" is_cfi=${use_lto}"
-		# Don't add symbols to build
-		myconf_gn+=" symbol_level=0"
-	fi
-
-	if use pgo; then
-		myconf_gn+=" chrome_pgo_phase=${1}"
-		if [[ "$1" == "2" ]]; then
-			myconf_gn+=" pgo_data_path=\"${2}\""
-		fi
-	else
-		# Disable PGO
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	# skipping typecheck is only supported on amd64, bug #876157
-	if ! use amd64; then
-		myconf_gn+=" devtools_skip_typecheck=false"
-	fi
-
-	einfo "Configuring Chromium ..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	chromium_configure $(usex pgo 1 0)
-}
-
-chromium_compile() {
-
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	# Build mksnapshot and pax-mark it.
-	if use pax-kernel; then
-		local x
-		for x in mksnapshot v8_context_snapshot_generator; do
-			if tc-is-cross-compiler; then
-				eninja -C out/Release "host/${x}"
-				pax-mark m "out/Release/host/${x}"
-			else
-				eninja -C out/Release "${x}"
-				pax-mark m "out/Release/${x}"
-			fi
-		done
-	fi
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver chrome_sandbox $(use test && echo "base_unittests")
-
-	pax-mark m out/Release/chrome
-
-}
-
-# This function is called from virtx, and must always return so that Xvfb
-# session isn't left running. If we return 1, virtx will call die().
-chromium_profile() {
-	einfo "Profiling for PGO"
-
-	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
-
-	# Remove old profdata in case profiling was interrupted.
-	rm -rf "${1}" || return 1
-
-	if ! "${EPYTHON}" ./chromium_profiler.py \
-		--chrome-executable "${S}/out/Release/chrome" \
-		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
-		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
-		--profile-output "${1}"; then
-		eerror "Profiling failed"
-		return 1
-	fi
-
-	popd >/dev/null || return 1
-}
-
-src_compile() {
-	if use pgo; then
-		local profdata
-
-		profdata="${WORKDIR}/chromium.profdata"
-
-		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
-			chromium_compile
-			virtx chromium_profile "$profdata"
-
-			touch "${WORKDIR}/.pgo-profiled" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
-			# Remove phase 1 output
-			rm -r out/Release || die
-
-			chromium_configure 2 "$profdata"
-
-			touch "${WORKDIR}/.pgo-phase-2-configured" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
-			chromium_compile
-			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
-		fi
-	else
-		chromium_compile
-	fi
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	rm -f out/Release/locales/*.pak.info || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-
-	# Build vk_swiftshader_icd.json; bug #827861
-	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
-		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
-		out/Release/vk_swiftshader_icd.json || die
-}
-
-src_test() {
-	# Initial list of tests to skip pulled from Alpine. Thanks Lauren!
-	# https://issues.chromium.org/issues/40939315
-	local skip_tests=(
-		'MessagePumpLibeventTest.NestedNotification*'
-		ClampTest.Death
-		OptionalTest.DereferencingNoValueCrashes
-		PlatformThreadTest.SetCurrentThreadTypeTest
-		RawPtrTest.TrivialRelocability
-		SafeNumerics.IntMaxOperations
-		StackTraceTest.TraceStackFramePointersFromBuffer
-		StringPieceTest.InvalidLengthDeath
-		StringPieceTest.OutOfBoundsDeath
-		ThreadPoolEnvironmentConfig.CanUseBackgroundPriorityForWorker
-		ValuesUtilTest.FilePath
-		# Gentoo-specific
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/0
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/1
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/2
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/3
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/0
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/1
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/2
-		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/3
-		CharacterEncodingTest.GetCanonicalEncodingNameByAliasName
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGFPE
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGILL
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGV
-		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGVNonCanonicalAddress
-		FilePathTest.FromUTF8Unsafe_And_AsUTF8Unsafe
-		FileTest.GetInfoForCreationTime
-		ICUStringConversionsTest.ConvertToUtf8AndNormalize
-		NumberFormattingTest.FormatPercent
-		PathServiceTest.CheckedGetFailure
-		PlatformThreadTest.CanChangeThreadType
-		RustLogIntegrationTest.CheckAllSeverity
-		StackCanary.ChangingStackCanaryCrashesOnReturn
-		StackTraceDeathTest.StackDumpSignalHandlerIsMallocFree
-		SysStrings.SysNativeMBAndWide
-		SysStrings.SysNativeMBToWide
-		SysStrings.SysWideToNativeMB
-		TestLauncherTools.TruncateSnippetFocusedMatchesFatalMessagesTest
-		ToolsSanityTest.BadVirtualCallNull
-		ToolsSanityTest.BadVirtualCallWrongType
-		CancelableEventTest.BothCancelFailureAndSucceedOccurUnderContention #new m133: TODO investigate
-	)
-	local test_filter="-$(IFS=:; printf '%s' "${skip_tests[*]}")"
-	# test-launcher-bot-mode enables parallelism and plain output
-	./out/Release/base_unittests --test-launcher-bot-mode \
-		--test-launcher-jobs="$(makeopts_jobs)" \
-		--gtest_filter="${test_filter}" || die "Tests failed!"
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	newexe out/Release/chrome_sandbox chrome-sandbox
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use X && use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-
-	if use bindist; then
-		# We built libffmpeg as a component library, but we can't distribute it
-		# with proprietary codec support. Remove it and make a symlink to the requested
-		# system library.
-		rm -f out/Release/libffmpeg.so \
-			|| die "Failed to remove bundled libffmpeg.so (with proprietary codecs)"
-		# symlink the libffmpeg.so from either ffmpeg-chromium or ffmpeg[chromium].
-		einfo "Creating symlink to libffmpeg.so from $(usex ffmpeg-chromium ffmpeg-chromium ffmpeg[chromium])..."
-		dosym ../chromium/libffmpeg.so$(usex ffmpeg-chromium .${PV%%\.*} "") \
-			/usr/$(get_libdir)/chromium-browser/libffmpeg.so
-	fi
-
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	# Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland"
-	doins out/Release/xdg-{settings,mime}
-
-	if ! use system-icu && ! use headless; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/MEIPreload
-
-	# Install vk_swiftshader_icd.json; bug #827861
-	doins out/Release/vk_swiftshader_icd.json
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if ! use headless; then
-		if use vaapi; then
-			elog "VA-API is disabled by default at runtime. You have to enable it"
-			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-			elog "in /etc/chromium/default."
-		fi
-		if use screencast; then
-			elog "Screencast is disabled by default at runtime. Either enable it"
-			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use gtk4; then
-			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
-			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use qt5 && use qt6; then
-			elog "Chromium automatically selects Qt5 or Qt6 based on your desktop"
-			elog "environment. To override you need to pass --qt-version=5 or"
-			elog "--qt-version=6, e.g. by adding it to CHROMIUM_FLAGS in"
-			elog "/etc/chromium/default."
-		fi
-	fi
-
-	if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then
-		ewarn "The lack of an '/etc/machine-id' file on this system booted with systemd"
-		ewarn "indicates that the Gentoo handbook was not followed to completion."
-		ewarn ""
-		ewarn "Chromium is known to behave unpredictably with this system configuration;"
-		ewarn "please complete the configuration of this system before logging any bugs."
-	fi
-}
diff --git a/www-client/chromium/chromium-133.0.6943.16.ebuild b/www-client/chromium/chromium-133.0.6943.16.ebuild
new file mode 100644
index 000000000000..259ac654d394
--- /dev/null
+++ b/www-client/chromium/chromium-133.0.6943.16.ebuild
@@ -0,0 +1,1456 @@
+# Copyright 2009-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# PACKAGING NOTES
+
+# This uses a gentoo-created tarball due to Google CI Failures.
+# Use 133(?) as a base for new official tarballs.
+
+GN_MIN_VER=0.2165
+# chromium-tools/get-chromium-toolchain-strings.py
+TEST_FONT=f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35
+
+VIRTUALX_REQUIRED="pgo"
+
+CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk ur vi zh-CN zh-TW"
+
+LLVM_COMPAT=( 19 )
+PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_REQ_USE="xml(+)"
+RUST_MIN_VER=1.78.0
+RUST_NEEDS_LLVM="yes please"
+
+inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 multiprocessing ninja-utils pax-utils
+inherit python-any-r1 qmake-utils readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://www.chromium.org/"
+PPC64_HASH="a85b64f07b489b8c6fdb13ecf79c16c56c560fc6"
+PATCH_V="${PV%%\.*}-1"
+SRC_URI="https://chromium-tarballs.distfiles.gentoo.org/${P}-linux.tar.xz
+		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
+	test? (
+		https://chromium-tarballs.distfiles.gentoo.org/${P}-linux-testdata.tar.xz
+		https://chromium-fonts.storage.googleapis.com/${TEST_FONT} -> chromium-testfonts-${TEST_FONT:0:10}.tar.gz
+	)
+	ppc64? (
+		https://gitlab.raptorengineering.com/raptor-engineering-public/chromium/openpower-patches/-/archive/${PPC64_HASH}/openpower-patches-${PPC64_HASH}.tar.bz2 -> chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
+	)
+	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
+
+LICENSE="BSD"
+SLOT="0/beta"
+# Dev exists mostly to give devs some breathing room for beta/stable releases;
+# it shouldn't be keyworded but adventurous users can select it.
+if [[ ${SLOT} != "0/dev" ]]; then
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
+IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
+IUSE+=" qt5 qt6 +screencast selinux test +vaapi +wayland +widevine"
+RESTRICT="
+	!bindist? ( bindist )
+	!test? ( test )
+"
+
+REQUIRED_USE="
+	!headless? ( || ( X wayland ) )
+	pgo? ( X !wayland )
+	qt6? ( qt5 )
+	screencast? ( wayland )
+	ffmpeg-chromium? ( bindist proprietary-codecs )
+"
+
+COMMON_X_DEPEND="
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libxshmfence:=
+"
+
+COMMON_SNAPSHOT_DEPEND="
+	system-icu? ( >=dev-libs/icu-73.0:= )
+	>=dev-libs/libxml2-2.12.4:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	dev-libs/libxslt:=
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2.11.0-r1:=
+	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
+	media-libs/libjpeg-turbo:=
+	system-png? ( media-libs/libpng:=[-apng(-)] )
+	system-zstd? ( >=app-arch/zstd-1.5.5:= )
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/mesa:=[gbm(+)]
+	>=media-libs/openh264-1.6.0:=
+	sys-libs/zlib:=
+	!headless? (
+		dev-libs/glib:2
+		>=media-libs/alsa-lib-1.0.19:=
+		pulseaudio? ( media-libs/libpulse:= )
+		sys-apps/pciutils:=
+		kerberos? ( virtual/krb5 )
+		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
+		X? (
+			x11-base/xorg-proto:=
+			x11-libs/libX11:=
+			x11-libs/libxcb:=
+			x11-libs/libXext:=
+		)
+		x11-libs/libxkbcommon:=
+		wayland? (
+			dev-libs/libffi:=
+			dev-libs/wayland:=
+			screencast? ( media-video/pipewire:= )
+		)
+	)
+"
+
+COMMON_DEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	app-arch/bzip2:=
+	dev-libs/expat:=
+	net-misc/curl[ssl]
+	sys-apps/dbus:=
+	media-libs/flac:=
+	sys-libs/zlib:=[minizip]
+	!headless? (
+		X? ( ${COMMON_X_DEPEND} )
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		media-libs/mesa:=[X?,wayland?]
+		cups? ( >=net-print/cups-1.3.11:= )
+		virtual/udev
+		x11-libs/cairo:=
+		x11-libs/gdk-pixbuf:2
+		x11-libs/pango:=
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtwidgets:5
+		)
+		qt6? ( dev-qt/qtbase:6[gui,widgets] )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!headless? (
+		|| (
+			x11-libs/gtk+:3[X?,wayland?]
+			gui-libs/gtk:4[X?,wayland?]
+		)
+		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
+		qt6? ( dev-qt/qtbase:6[X?,wayland?] )
+	)
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	bindist? (
+		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${PV%%\.*} )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	!headless? (
+		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
+		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
+	)
+"
+
+BDEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	>=app-arch/gzip-1.7
+	!headless? (
+		qt5? ( dev-qt/qtcore:5 )
+		qt6? ( dev-qt/qtbase:6 )
+	)
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+		llvm-core/lld:${LLVM_SLOT}
+		official? (
+			!ppc64? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[cfi] )
+		)
+	')
+	pgo? (
+		>=dev-python/selenium-3.141.0
+		>=dev-util/web_page_replay_go-20220314
+	)
+	>=dev-util/bindgen-0.68.0
+	>=dev-build/gn-${GN_MIN_VER}
+	dev-build/ninja
+	dev-lang/perl
+	>=dev-util/gperf-3.0.3
+	dev-vcs/git
+	>=net-libs/nodejs-7.6.0[inspector]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+python_check_deps() {
+	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pre_build_checks() {
+	# Check build requirements: bugs #471810, #541816, #914220
+	# We're going to start doing maths here on the size of an unpacked source tarball,
+	# this should make updates easier as chromium continues to balloon in size.
+	local BASE_DISK=24
+	local EXTRA_DISK=1
+	local CHECKREQS_MEMORY="4G"
+	tc-is-cross-compiler && EXTRA_DISK=2
+	if tc-is-lto || use pgo; then
+		CHECKREQS_MEMORY="9G"
+		tc-is-cross-compiler && EXTRA_DISK=4
+		use pgo && EXTRA_DISK=8
+	fi
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		if use custom-cflags; then
+			EXTRA_DISK=13
+		fi
+		CHECKREQS_MEMORY="16G"
+	fi
+	CHECKREQS_DISK_BUILD="$((BASE_DISK + EXTRA_DISK))G"
+	check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
+		pre_build_checks
+	fi
+
+	if use headless; then
+		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland")
+		for myiuse in ${headless_unused_flags[@]}; do
+			use ${myiuse} && ewarn "Ignoring USE=${myiuse}, USE=headless is set."
+		done
+	fi
+
+	if ! use bindist && use ffmpeg-chromium; then
+		ewarn "Ignoring USE=ffmpeg-chromium, USE=bindist is not set."
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
+		pre_build_checks
+
+		# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
+		# We'll set these to clang here then use llvm-utils functions to very explicitly set these
+		# to a sane value.
+		# This is effectively the 'force-clang' path if GCC support is re-added.
+		# TODO: check if the user has already selected a specific impl via make.conf and respect that.
+		use_lto="false"
+		if tc-is-lto; then
+			use_lto="true"
+			# We can rely on GN to do this for us; anecdotally without this builds
+			# take significantly longer with LTO enabled and it doesn't hurt anything.
+			filter-lto
+		fi
+
+		if [ "$use_lto" = "false" ] && use official; then
+			einfo "USE=official selected and LTO not detected."
+			einfo "It is _highly_ recommended that LTO be enabled for performance reasons"
+			einfo "and to be consistent with the upstream \"official\" build optimisations."
+		fi
+
+		if [ "$use_lto" = "false" ] && use test; then
+			die "Tests require CFI which requires LTO"
+		fi
+
+		export use_lto
+
+		# 936858
+		if tc-ld-is-mold; then
+			eerror "Your toolchain is using the mold linker."
+			eerror "This is not supported by Chromium."
+			die "Please switch to a different linker."
+		fi
+
+		llvm-r1_pkg_setup
+		rust_pkg_setup
+
+		# Forcing clang; respect llvm_slot_x to enable selection of impl from LLVM_COMPAT
+		AR=llvm-ar
+		CPP="${CHOST}-clang++-${LLVM_SLOT} -E"
+		NM=llvm-nm
+		CC="${CHOST}-clang-${LLVM_SLOT}"
+		CXX="${CHOST}-clang++-${LLVM_SLOT}"
+
+		if tc-is-cross-compiler; then
+			use pgo && die "The pgo USE flag cannot be used when cross-compiling"
+			CPP="${CBUILD}-clang++-${LLVM_SLOT} -E"
+		fi
+
+		# I hate doing this but upstream Rust have yet to come up with a better solution for
+		# us poor packagers. Required for Split LTO units, which are required for CFI.
+		export RUSTC_BOOTSTRAP=1
+
+		# Users should never hit this, it's purely a development convenience
+		if ver_test $(gn --version || die) -lt ${GN_MIN_VER}; then
+			die "dev-build/gn >= ${GN_MIN_VER} is required to build this Chromium"
+		fi
+	fi
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	unpack ${P}-linux.tar.xz
+	unpack chromium-patches-${PATCH_V}.tar.bz2
+
+	use pgo && unpack chromium-profiler-0.2.tar
+
+	if use test; then
+		# A new testdata tarball is available for each release; but testfonts tend to remain stable
+		# for the duration of a release.
+		# This unpacks directly into/over ${WORKDIR}/${P} so we can just use `unpack`.
+		unpack ${P}-linux-testdata.tar.xz
+		# This just contains a bunch of font files that need to be unpacked (or moved) to the correct location.
+		local testfonts_dir="${WORKDIR}/${P}/third_party/test_fonts"
+		local testfonts_tar="${DISTDIR}/chromium-testfonts-${TEST_FONT:0:10}.tar.gz"
+		tar xf "${testfonts_tar}" -C "${testfonts_dir}" || die "Failed to unpack testfonts"
+	fi
+
+	if use ppc64; then
+		unpack chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local PATCHES=(
+		"${FILESDIR}/chromium-cross-compile.patch"
+		"${FILESDIR}/chromium-109-system-zlib.patch"
+		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-131-unbundle-icu-target.patch"
+		"${FILESDIR}/chromium-131-oauth2-client-switches.patch"
+		"${FILESDIR}/chromium-132-bindgen-custom-toolchain.patch"
+	)
+
+	shopt -s globstar nullglob
+	# 130: moved the PPC64 patches into the chromium-patches repo
+	local patch
+	for patch in "${WORKDIR}/chromium-patches-${PATCH_V}"/**/*.patch; do
+		if [[ ${patch} == *"ppc64le"* ]]; then
+			use ppc64 && PATCHES+=( "${patch}" )
+		else
+			PATCHES+=( "${patch}" )
+		fi
+	done
+
+	shopt -u globstar nullglob
+	# We can't use the bundled compiler builtins with the system toolchain
+	# `grep` is a development convenience to ensure we fail early when google changes something.
+	local builtins_match="if (is_clang && !is_nacl && !is_cronet_build) {"
+	grep -q "${builtins_match}" build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
+	sed -i -e "/${builtins_match}/,+2d" build/config/compiler/BUILD.gn
+
+	if use ppc64; then
+		local patchset_dir="${WORKDIR}/openpower-patches-${PPC64_HASH}/patches"
+		# patch causes build errors on 4K page systems (https://bugs.gentoo.org/show_bug.cgi?id=940304)
+		local page_size_patch="ppc64le/third_party/use-sysconf-page-size-on-ppc64.patch"
+		local isa_3_patch="ppc64le/core/baseline-isa-3-0.patch"
+		# Apply the OpenPOWER patches (check for page size and isa 3.0)
+		openpower_patches=( $(grep -E "^ppc64le|^upstream" "${patchset_dir}/series" | grep -v "${page_size_patch}" |
+			grep -v "${isa_3_patch}" || die) )
+		for patch in "${openpower_patches[@]}"; do
+			PATCHES+=( "${patchset_dir}/${patch}" )
+		done
+		if [[ $(getconf PAGESIZE) == 65536 ]]; then
+			PATCHES+=( "${patchset_dir}/${page_size_patch}" )
+		fi
+		# We use vsx3 as a proxy for 'want isa3.0' (POWER9)
+		if use cpu_flags_ppc_vsx3 ; then
+			PATCHES+=( +"${patchset_dir}/${isa_3_patch}" )
+		fi
+	fi
+
+	# This is a nightly option that does not exist any current release
+	# https://github.com/rust-lang/rust/commit/389a399a501a626ebf891ae0bb076c25e325ae64
+	if ver_test ${RUST_SLOT} -le "1.82.0"; then
+		sed '/rustflags = \[ "-Zdefault-visibility=hidden" \]/d' -i build/config/gcc/BUILD.gn ||
+			die "Failed to remove default visibility nightly option"
+	fi
+
+	default
+
+	rm third_party/node/linux/node-linux-x64/bin/node || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	# adjust python interpreter version
+	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
+
+	# remove_bundled_libraries.py walks the source tree and looks for paths containing the substring 'third_party'
+	# whitelist matches use the right-most matching path component, so we need to whitelist from that point down.
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/ceval
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/volk
+		third_party/anonymous_tokens
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/bidimapper
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4-4.9.3
+		third_party/catapult/third_party/html5lib-1.1
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/content_analysis_sdk
+		third_party/cpuinfo
+		third_party/crabbyavif
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/d3
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/gn/webgpu-cts
+		third_party/dawn/third_party/khronos
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/csp_evaluator
+		third_party/devtools-frontend/src/front_end/third_party/diff
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/json5
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/parsel-js
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs
+		third_party/devtools-frontend/src/front_end/third_party/third-party-web
+		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/front_end/third_party/web-vitals
+		third_party/devtools-frontend/src/third_party
+		third_party/distributed_point_functions
+		third_party/dom_distiller_js
+		third_party/eigen3
+		third_party/emoji-segmenter
+		third_party/farmhash
+		third_party/fast_float
+		third_party/fdlibm
+		third_party/ffmpeg
+		third_party/fft2d
+		third_party/flatbuffers
+		third_party/fp16
+		third_party/freetype
+		third_party/fusejs
+		third_party/fuzztest
+		third_party/fxdiv
+		third_party/gemmlowp
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/highway
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/ink_stroke_modeler/src/ink_stroke_modeler
+		third_party/ink_stroke_modeler/src/ink_stroke_modeler/internal
+		third_party/ink/src/ink/brush
+		third_party/ink/src/ink/color
+		third_party/ink/src/ink/geometry
+		third_party/ink/src/ink/rendering
+		third_party/ink/src/ink/rendering/skia/common_internal
+		third_party/ink/src/ink/rendering/skia/native
+		third_party/ink/src/ink/rendering/skia/native/internal
+		third_party/ink/src/ink/strokes
+		third_party/ink/src/ink/types
+		third_party/inspector_protocol
+		third_party/ipcz
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/khronos
+		third_party/lens_server_proto
+		third_party/leveldatabase
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/fastfeat
+		third_party/libaom/source/libaom/third_party/SVT-AV1
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libc++
+		third_party/libdrm
+		third_party/libgav1
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libtess2/libtess2
+		third_party/libtess2/src/Include
+		third_party/libtess2/src/Source
+		third_party/liburlpattern
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/libzip
+		third_party/lit
+		third_party/llvm-libc
+		third_party/llvm-libc/src/shared/
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/markupsafe
+		third_party/material_color_utilities
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/neon_2_sse
+		third_party/node
+		third_party/omnibox_proto
+		third_party/one_euro_filter
+		third_party/openscreen
+		third_party/openscreen/src/third_party/
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/opus
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg
+		third_party/pdfium/third_party/libtiff
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/perfetto/protos/third_party/simpleperf
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private_membership
+		third_party/private-join-and-compute
+		third_party/protobuf
+		third_party/pthreadpool
+		third_party/puffin
+		third_party/pyjson5
+		third_party/pyyaml
+		third_party/rapidhash
+		third_party/re2
+		third_party/rnnoise
+		third_party/rust
+		third_party/ruy
+		third_party/s2cellid
+		third_party/securemessage
+		third_party/selenium-atoms
+		third_party/sentencepiece
+		third_party/sentencepiece/src/third_party/darts_clone
+		third_party/shell-encryption
+		third_party/simdutf
+		third_party/simplejson
+		third_party/six
+		third_party/skia
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/snappy
+		third_party/spirv-headers
+		third_party/spirv-tools
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
+		third_party/swiftshader/third_party/SPIRV-Tools
+		third_party/swiftshader/third_party/subzero
+		third_party/tensorflow_models
+		third_party/tensorflow-text
+		third_party/tflite
+		third_party/tflite/src/third_party/eigen3
+		third_party/tflite/src/third_party/fft2d
+		third_party/tflite/src/third_party/xla/third_party/tsl
+		third_party/tflite/src/third_party/xla/xla/tsl/framework
+		third_party/tflite/src/third_party/xla/xla/tsl/lib/random
+		third_party/tflite/src/third_party/xla/xla/tsl/protobuf
+		third_party/tflite/src/third_party/xla/xla/tsl/util
+		third_party/ukey2
+		third_party/unrar
+		third_party/utf
+		third_party/vulkan
+		third_party/wasm_tts_engine
+		third_party/wayland
+		third_party/webdriver
+		third_party/webgpu-cts
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/xnnpack
+		third_party/zlib/google
+		third_party/zxcvbn-cpp
+		url/third_party/mozilla
+		v8/third_party/glibc
+		v8/third_party/inspector_protocol
+		v8/third_party/siphash
+		v8/third_party/utf8-decoder
+		v8/third_party/v8
+		v8/third_party/valgrind
+
+		# gyp -> gn leftovers
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+
+	if use test; then
+		# tar tvf /var/cache/distfiles/${P}-linux-testdata.tar.xz | grep '^d' | grep 'third_party' | awk '{print $NF}'
+		keeplibs+=(
+			third_party/breakpad/breakpad/src/processor
+			third_party/google_benchmark/src/include/benchmark
+			third_party/google_benchmark/src/src
+			third_party/perfetto/protos/third_party/pprof
+			third_party/test_fonts
+			third_party/test_fonts/fontconfig
+		)
+	fi
+
+	# USE=system-*
+	if ! use system-harfbuzz; then
+		keeplibs+=( third_party/harfbuzz-ng )
+	fi
+
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+
+	if ! use system-png; then
+		keeplibs+=( third_party/libpng )
+	fi
+
+	if ! use system-zstd; then
+		keeplibs+=( third_party/zstd )
+	fi
+
+	# Arch-specific
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		# requires git and clang, bug #832803
+		# Revert https://chromium.googlesource.com/chromium/src/+/b463d0f40b08b4e896e7f458d89ae58ce2a27165%5E%21/third_party/libvpx/generate_gni.sh
+		# and https://chromium.googlesource.com/chromium/src/+/71ebcbce867dd31da5f8b405a28fcb0de0657d91%5E%21/third_party/libvpx/generate_gni.sh
+		# since we're not in a git repo
+		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g; /^git -C/d; /git cl/d; /cd \$BASE_DIR\/\$LIBVPX_SRC_DIR/ign format --in-place \$BASE_DIR\/BUILD.gn\ngn format --in-place \$BASE_DIR\/libvpx_srcs.gni" \
+			generate_gni.sh || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+
+		pushd third_party/ffmpeg >/dev/null || die
+		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
+		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
+		popd >/dev/null || die
+	fi
+
+	# Sanity check keeplibs, on major version bumps it is often necessary to update this list
+	# and this enables us to hit them all at once.
+	# There are some entries that need to be whitelisted (TODO: Why? The file is understandable, the rest seem odd)
+	whitelist_libs=(
+		net/third_party/quic
+		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
+		third_party/libjingle
+		third_party/mesa
+		third_party/skia/third_party/vulkan
+		third_party/vulkan
+	)
+	local not_found_libs=()
+	for lib in "${keeplibs[@]}"; do
+		if [[ ! -d "${lib}" ]] && ! has "${lib}" "${whitelist_libs[@]}"; then
+			not_found_libs+=( "${lib}" )
+		fi
+	done
+
+	if [[ ${#not_found_libs[@]} -gt 0 ]]; then
+		eerror "The following \`keeplibs\` directories were not found in the source tree:"
+		for lib in "${not_found_libs[@]}"; do
+			eerror "  ${lib}"
+		done
+		die "Please update the ebuild."
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	einfo "Unbundling third-party libraries ..."
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+
+	# TODO: From 127 chromium includes a bunch of binaries? Unbundle them; they're not needed.
+
+	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
+	mkdir -p buildtools/third_party/eu-strip/bin || die
+	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
+}
+
+chromium_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# We already forced the "correct" clang via pkg_setup
+
+	if tc-is-cross-compiler; then
+		CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
+		CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
+		BUILD_AR=${AR}
+		BUILD_CC=${CC}
+		BUILD_CXX=${CXX}
+		BUILD_NM=${NM}
+	fi
+
+	strip-unsupported-flags
+
+	myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	# https://bugs.gentoo.org/918897#c32
+	append-ldflags -Wl,--undefined-version
+	myconf_gn+=" use_lld=true"
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
+		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
+
+		# setup cups-config, build system only uses --libs option
+		if use cups; then
+			mkdir "${T}/cups-config" || die
+			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
+			export PATH="${PATH}:${T}/cups-config"
+		fi
+
+		# Don't inherit PKG_CONFIG_PATH from environment
+		local -x PKG_CONFIG_PATH=
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# bindgen settings
+	# From 127, to make bindgen work, we need to provide a location for libclang.
+	# We patch this in for gentoo - see chromium-*-bindgen-custom-toolchain.patch
+	# rust_bindgen_root = directory with `bin/bindgen` beneath it.
+	myconf_gn+=" rust_bindgen_root=\"${EPREFIX}/usr/\""
+
+	myconf_gn+=" bindgen_libclang_path=\"$(get_llvm_prefix)/$(get_libdir)\""
+	# We don't need to set 'clang_base_bath' for anything in our build
+	# and it defaults to the google toolchain location. Instead provide a location
+	# to where system clang lives sot that bindgen can find system headers (e.g. stddef.h)
+	myconf_gn+=" clang_base_path=\"${EPREFIX}/usr/lib/clang/${LLVM_SLOT}/\""
+
+	myconf_gn+=" rust_sysroot_absolute=\"$(get_rust_prefix)\""
+	myconf_gn+=" rustc_version=\"${RUST_SLOT}\""
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
+	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
+	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
+	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=false"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libjpeg
+		libwebp
+		libxml
+		libxslt
+		openh264
+		zlib
+	)
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-png; then
+		gn_system_libraries+=( libpng )
+	fi
+	if use system-zstd; then
+		gn_system_libraries+=( zstd )
+	fi
+
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# TODO 131: The above call clobbers `enable_freetype = true` in the freetype gni file
+	# drop the last line, then append the freetype line and a new curly brace to end the block
+	local freetype_gni="build/config/freetype/freetype.gni"
+	sed -i -e '$d' ${freetype_gni} || die
+	echo "  enable_freetype = true" >> ${freetype_gni} || die
+	echo "}" >> ${freetype_gni} || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+
+	if use headless; then
+		myconf_gn+=" use_cups=false"
+		myconf_gn+=" use_kerberos=false"
+		myconf_gn+=" use_pulseaudio=false"
+		myconf_gn+=" use_vaapi=false"
+		myconf_gn+=" rtc_use_pipewire=false"
+	else
+		myconf_gn+=" use_cups=$(usex cups true false)"
+		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
+		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
+	fi
+
+	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
+	# using dlopen. This helps with automated detection of ABI mismatches and
+	# prevents silent errors.
+	if use pulseaudio; then
+		myconf_gn+=" link_pulseaudio=true"
+	fi
+
+	# Non-developer builds of Chromium (for example, non-Chrome browsers, or
+	# Chromium builds provided by Linux distros) should disable the testing config
+	myconf_gn+=" disable_fieldtrial_testing_config=true"
+
+	# The sysroot is the oldest debian image that chromium supports, we don't need it
+	myconf_gn+=" use_sysroot=false"
+
+	# Use in-tree libc++ (buildtools/third_party/libc++ and buildtools/third_party/libc++abi)
+	# instead of the system C++ library for C++ standard library support.
+	# default: true, but let's be explicit (forced since 120 ; USE removed 127).
+	myconf_gn+=" use_custom_libcxx=true"
+
+	# Disable pseudolocales, only used for testing
+	myconf_gn+=" enable_pseudolocales=false"
+
+	# Disable code formating of generated files
+	myconf_gn+=" blink_enable_generated_code_formatting=false"
+
+	if use bindist ; then
+		# proprietary_codecs just forces Chromium to say that it can use h264/aac,
+		# the work is still done by ffmpeg. If this is set to no Chromium
+		# won't be able to load the codec even if the library can handle it
+		myconf_gn+=" proprietary_codecs=true"
+		myconf_gn+=" ffmpeg_branding=\"Chrome\""
+		# build ffmpeg as an external component (libffmpeg.so) that we can remove / substitute
+		myconf_gn+=" is_component_ffmpeg=true"
+	else
+		ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+		myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+		myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+	fi
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info. The OAuth2 credentials, however, have been left out.
+	# Those OAuth2 credentials have been broken for quite some time anyway.
+	# Instead we apply a patch to use the --oauth2-client-id= and
+	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
+	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
+	# Chromium without baked-in values.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		filter-flags "-g*"
+
+		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
+		if [[ ${myarch} == amd64 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
+		fi
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf_gn+=" treat_warnings_as_errors=false"
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Disable external code space for V8 for ppc64. It is disabled for ppc64
+	# by default, but cross-compiling on amd64 enables it again.
+	if tc-is-cross-compiler; then
+		if ! use amd64 && ! use arm64; then
+			myconf_gn+=" v8_enable_external_code_space=false"
+		fi
+	fi
+
+	# Only enabled for clang, but gcc has endian macros too
+	myconf_gn+=" v8_use_libm_trig_functions=true"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	# We don't use the same clang version as upstream, and with -Werror
+	# we need to make sure that we don't get superfluous warnings.
+	append-flags -Wno-unknown-warning-option
+	if tc-is-cross-compiler; then
+			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
+			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
+	fi
+
+	# Explicitly disable ICU data file support for system-icu/headless builds.
+	if use system-icu || use headless; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Don't need nocompile checks and GN crashes with our config
+	myconf_gn+=" enable_nocompile_tests=false"
+
+	# 131 began laying the groundwork for replacing freetype with
+	# "Rust-based Fontations set of libraries plus Skia path rendering"
+	# We now need to opt-in
+	myconf_gn+=" enable_freetype=true"
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	if use headless; then
+		myconf_gn+=" ozone_platform=\"headless\""
+		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
+		myconf_gn+=" use_glib=false use_gio=false"
+		myconf_gn+=" use_pangocairo=false use_alsa=false"
+		myconf_gn+=" use_libpci=false use_udev=false"
+		myconf_gn+=" enable_print_preview=false"
+		myconf_gn+=" enable_remoting=false"
+	else
+		myconf_gn+=" use_system_minigbm=true"
+		myconf_gn+=" use_xkbcommon=true"
+		if use qt5 || use qt6; then
+			local cbuild_libdir=$(get_libdir)
+			if tc-is-cross-compiler; then
+				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
+				cbuild_libdir=${cbuild_libdir:2}
+				cbuild_libdir=${cbuild_libdir/% }
+			fi
+			if use qt5; then
+				if tc-is-cross-compiler; then
+					myconf_gn+=" moc_qt5_path=\"${EPREFIX}/${cbuild_libdir}/qt5/bin\""
+				else
+					myconf_gn+=" moc_qt5_path=\"$(qt5_get_bindir)\""
+				fi
+			fi
+			if use qt6; then
+				myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\""
+			fi
+
+			myconf_gn+=" use_qt=true"
+			myconf_gn+=" use_qt6=$(usex qt6 true false)"
+		else
+			myconf_gn+=" use_qt=false"
+		fi
+		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
+		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
+		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
+		use wayland && myconf_gn+=" use_system_libffi=true"
+	fi
+
+	myconf_gn+=" use_thin_lto=${use_lto}"
+	myconf_gn+=" thin_lto_enable_optimizations=${use_lto}"
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		if use ppc64; then
+			myconf_gn+=" is_cfi=no" # requires llvm-runtimes/compiler-rt-sanitizers[cfi]
+		else
+			myconf_gn+=" is_cfi=${use_lto}"
+		fi
+		# Don't add symbols to build
+		myconf_gn+=" symbol_level=0"
+	fi
+
+	if use pgo; then
+		myconf_gn+=" chrome_pgo_phase=${1}"
+		if [[ "$1" == "2" ]]; then
+			myconf_gn+=" pgo_data_path=\"${2}\""
+		fi
+	else
+		# Disable PGO
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	# skipping typecheck is only supported on amd64, bug #876157
+	if ! use amd64; then
+		myconf_gn+=" devtools_skip_typecheck=false"
+	fi
+
+	einfo "Configuring Chromium ..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	chromium_configure $(usex pgo 1 0)
+}
+
+chromium_compile() {
+
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
+	local -x PYTHONPATH=
+
+	# Build mksnapshot and pax-mark it.
+	if use pax-kernel; then
+		local x
+		for x in mksnapshot v8_context_snapshot_generator; do
+			if tc-is-cross-compiler; then
+				eninja -C out/Release "host/${x}"
+				pax-mark m "out/Release/host/${x}"
+			else
+				eninja -C out/Release "${x}"
+				pax-mark m "out/Release/${x}"
+			fi
+		done
+	fi
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver chrome_sandbox $(use test && echo "base_unittests")
+
+	pax-mark m out/Release/chrome
+
+}
+
+# This function is called from virtx, and must always return so that Xvfb
+# session isn't left running. If we return 1, virtx will call die().
+chromium_profile() {
+	einfo "Profiling for PGO"
+
+	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
+
+	# Remove old profdata in case profiling was interrupted.
+	rm -rf "${1}" || return 1
+
+	if ! "${EPYTHON}" ./chromium_profiler.py \
+		--chrome-executable "${S}/out/Release/chrome" \
+		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
+		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
+		--profile-output "${1}"; then
+		eerror "Profiling failed"
+		return 1
+	fi
+
+	popd >/dev/null || return 1
+}
+
+src_compile() {
+	if use pgo; then
+		local profdata
+
+		profdata="${WORKDIR}/chromium.profdata"
+
+		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
+			chromium_compile
+			virtx chromium_profile "$profdata"
+
+			touch "${WORKDIR}/.pgo-profiled" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
+			# Remove phase 1 output
+			rm -r out/Release || die
+
+			chromium_configure 2 "$profdata"
+
+			touch "${WORKDIR}/.pgo-phase-2-configured" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
+			chromium_compile
+			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
+		fi
+	else
+		chromium_compile
+	fi
+
+	mv out/Release/chromedriver{.unstripped,} || die
+
+	rm -f out/Release/locales/*.pak.info || die
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+
+	# Build vk_swiftshader_icd.json; bug #827861
+	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
+		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
+		out/Release/vk_swiftshader_icd.json || die
+}
+
+src_test() {
+	# Initial list of tests to skip pulled from Alpine. Thanks Lauren!
+	# https://issues.chromium.org/issues/40939315
+	local skip_tests=(
+		'MessagePumpLibeventTest.NestedNotification*'
+		ClampTest.Death
+		OptionalTest.DereferencingNoValueCrashes
+		PlatformThreadTest.SetCurrentThreadTypeTest
+		RawPtrTest.TrivialRelocability
+		SafeNumerics.IntMaxOperations
+		StackTraceTest.TraceStackFramePointersFromBuffer
+		StringPieceTest.InvalidLengthDeath
+		StringPieceTest.OutOfBoundsDeath
+		ThreadPoolEnvironmentConfig.CanUseBackgroundPriorityForWorker
+		ValuesUtilTest.FilePath
+		# Gentoo-specific
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/0
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/1
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/2
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/3
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/0
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/1
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/2
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/3
+		CharacterEncodingTest.GetCanonicalEncodingNameByAliasName
+		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGFPE
+		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGILL
+		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGV
+		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGVNonCanonicalAddress
+		FilePathTest.FromUTF8Unsafe_And_AsUTF8Unsafe
+		FileTest.GetInfoForCreationTime
+		ICUStringConversionsTest.ConvertToUtf8AndNormalize
+		NumberFormattingTest.FormatPercent
+		PathServiceTest.CheckedGetFailure
+		PlatformThreadTest.CanChangeThreadType
+		RustLogIntegrationTest.CheckAllSeverity
+		StackCanary.ChangingStackCanaryCrashesOnReturn
+		StackTraceDeathTest.StackDumpSignalHandlerIsMallocFree
+		SysStrings.SysNativeMBAndWide
+		SysStrings.SysNativeMBToWide
+		SysStrings.SysWideToNativeMB
+		TestLauncherTools.TruncateSnippetFocusedMatchesFatalMessagesTest
+		ToolsSanityTest.BadVirtualCallNull
+		ToolsSanityTest.BadVirtualCallWrongType
+		CancelableEventTest.BothCancelFailureAndSucceedOccurUnderContention #new m133: TODO investigate
+	)
+	local test_filter="-$(IFS=:; printf '%s' "${skip_tests[*]}")"
+	# test-launcher-bot-mode enables parallelism and plain output
+	./out/Release/base_unittests --test-launcher-bot-mode \
+		--test-launcher-jobs="$(makeopts_jobs)" \
+		--gtest_filter="${test_filter}" || die "Tests failed!"
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	newexe out/Release/chrome_sandbox chrome-sandbox
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver
+	doexe out/Release/chrome_crashpad_handler
+
+	ozone_auto_session () {
+		use X && use wayland && ! use headless && echo true || echo false
+	}
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+
+	if use bindist; then
+		# We built libffmpeg as a component library, but we can't distribute it
+		# with proprietary codec support. Remove it and make a symlink to the requested
+		# system library.
+		rm -f out/Release/libffmpeg.so \
+			|| die "Failed to remove bundled libffmpeg.so (with proprietary codecs)"
+		# symlink the libffmpeg.so from either ffmpeg-chromium or ffmpeg[chromium].
+		einfo "Creating symlink to libffmpeg.so from $(usex ffmpeg-chromium ffmpeg-chromium ffmpeg[chromium])..."
+		dosym ../chromium/libffmpeg.so$(usex ffmpeg-chromium .${PV%%\.*} "") \
+			/usr/$(get_libdir)/chromium-browser/libffmpeg.so
+	fi
+
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	# Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland"
+	doins out/Release/xdg-{settings,mime}
+
+	if ! use system-icu && ! use headless; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/MEIPreload
+
+	# Install vk_swiftshader_icd.json; bug #827861
+	doins out/Release/vk_swiftshader_icd.json
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if ! use headless; then
+		if use vaapi; then
+			elog "VA-API is disabled by default at runtime. You have to enable it"
+			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
+			elog "in /etc/chromium/default."
+		fi
+		if use screencast; then
+			elog "Screencast is disabled by default at runtime. Either enable it"
+			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+		if use gtk4; then
+			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
+			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+		if use qt5 && use qt6; then
+			elog "Chromium automatically selects Qt5 or Qt6 based on your desktop"
+			elog "environment. To override you need to pass --qt-version=5 or"
+			elog "--qt-version=6, e.g. by adding it to CHROMIUM_FLAGS in"
+			elog "/etc/chromium/default."
+		fi
+	fi
+
+	if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then
+		ewarn "The lack of an '/etc/machine-id' file on this system booted with systemd"
+		ewarn "indicates that the Gentoo handbook was not followed to completion."
+		ewarn ""
+		ewarn "Chromium is known to behave unpredictably with this system configuration;"
+		ewarn "please complete the configuration of this system before logging any bugs."
+	fi
+}
diff --git a/www-client/chromium/chromium-134.0.6958.2.ebuild b/www-client/chromium/chromium-134.0.6958.2.ebuild
new file mode 100644
index 000000000000..ac347ae5b096
--- /dev/null
+++ b/www-client/chromium/chromium-134.0.6958.2.ebuild
@@ -0,0 +1,1559 @@
+# Copyright 2009-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# PACKAGING NOTES
+
+# Upstream roll their bundled Clang every two weeks, and the bundled Rust
+# is rolled regularly and depends on that. While we do our best to build
+# with system Clang, we may eventually hit the point where we need to use
+# the bundled Clang due to the use of prerelease features.
+
+# USE=bundled-toolchain is intended for users who want to use the same toolchain
+# as the upstream releases. It's also a good fallback in case we fall behind
+# and need to get a release out quickly (less likely with `dev` in-tree).
+
+# Since m133 we are using CI-generated tarballs from
+# https://github.com/chromium-linux-tarballs/chromium-tarballs/ (uploaded to S3
+# and made available via https://chromium-tarballs.distfiles.gentoo.org/).
+
+# We do this because upstream tarballs weigh in at about 3.5x the size of our
+# new "Distro tarballs" and include binaries (etc) that are not useful for
+# downstream consumers (like distributions).
+
+GN_MIN_VER=0.2207
+# chromium-tools/get-chromium-toolchain-strings.py
+TEST_FONT=f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35
+BUNDLED_CLANG_VER=llvmorg-20-init-17108-g29ed6000-1
+BUNDLED_RUST_VER=ad211ced81509462cdfe4c29ed10f97279a0acae-1
+
+VIRTUALX_REQUIRED="pgo"
+
+CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk ur vi zh-CN zh-TW"
+
+LLVM_COMPAT=( 19 )
+PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_REQ_USE="xml(+)"
+RUST_MIN_VER=1.78.0
+RUST_NEEDS_LLVM="yes please"
+RUST_OPTIONAL="yes" # Not actually optional, but we don't need system Rust (or LLVM) with USE=bundled-toolchain
+
+inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 multiprocessing ninja-utils pax-utils
+inherit python-any-r1 qmake-utils readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://www.chromium.org/"
+PPC64_HASH="a85b64f07b489b8c6fdb13ecf79c16c56c560fc6"
+PATCH_V="${PV%%\.*}"
+SRC_URI="https://chromium-tarballs.distfiles.gentoo.org/${P}-linux.tar.xz
+	!bundled-toolchain? (
+		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
+	)
+	bundled-toolchain? (
+		https://gsdview.appspot.com/chromium-browser-clang/Linux_x64/clang-${BUNDLED_CLANG_VER}.tar.xz
+			-> chromium-${PV%%\.*}-clang.tar.xz
+		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-${BUNDLED_RUST_VER}-${BUNDLED_CLANG_VER%-*}.tar.xz
+			-> chromium-${PV%%\.*}-rust.tar.xz
+	)
+	test? (
+		https://chromium-tarballs.distfiles.gentoo.org/${P}-linux-testdata.tar.xz
+		https://chromium-fonts.storage.googleapis.com/${TEST_FONT} -> chromium-testfonts-${TEST_FONT:0:10}.tar.gz
+	)
+	ppc64? (
+		https://gitlab.raptorengineering.com/raptor-engineering-public/chromium/openpower-patches/-/archive/${PPC64_HASH}/openpower-patches-${PPC64_HASH}.tar.bz2 -> chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
+	)
+	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
+
+LICENSE="BSD"
+SLOT="0/dev"
+# Dev exists mostly to give devs some breathing room for beta/stable releases;
+# it shouldn't be keyworded but adventurous users can select it.
+if [[ ${SLOT} != "0/dev" ]]; then
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
+IUSE="+X ${IUSE_SYSTEM_LIBS} bindist bundled-toolchain cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo"
+IUSE+=" +proprietary-codecs pulseaudio qt5 qt6 +screencast selinux test +vaapi +wayland +widevine cpu_flags_ppc_vsx3"
+RESTRICT="
+	!bindist? ( bindist )
+	!test? ( test )
+"
+
+REQUIRED_USE="
+	!headless? ( || ( X wayland ) )
+	pgo? ( X !wayland )
+	qt6? ( qt5 )
+	screencast? ( wayland )
+	ffmpeg-chromium? ( bindist proprietary-codecs )
+"
+
+COMMON_X_DEPEND="
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libxshmfence:=
+"
+
+COMMON_SNAPSHOT_DEPEND="
+	system-icu? ( >=dev-libs/icu-73.0:= )
+	>=dev-libs/libxml2-2.12.4:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	dev-libs/libxslt:=
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2.11.0-r1:=
+	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
+	media-libs/libjpeg-turbo:=
+	system-png? ( media-libs/libpng:=[-apng(-)] )
+	system-zstd? ( >=app-arch/zstd-1.5.5:= )
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/mesa:=[gbm(+)]
+	>=media-libs/openh264-1.6.0:=
+	sys-libs/zlib:=
+	!headless? (
+		dev-libs/glib:2
+		>=media-libs/alsa-lib-1.0.19:=
+		pulseaudio? ( media-libs/libpulse:= )
+		sys-apps/pciutils:=
+		kerberos? ( virtual/krb5 )
+		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
+		X? (
+			x11-base/xorg-proto:=
+			x11-libs/libX11:=
+			x11-libs/libxcb:=
+			x11-libs/libXext:=
+		)
+		x11-libs/libxkbcommon:=
+		wayland? (
+			dev-libs/libffi:=
+			dev-libs/wayland:=
+			screencast? ( media-video/pipewire:= )
+		)
+	)
+"
+
+COMMON_DEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	app-arch/bzip2:=
+	dev-libs/expat:=
+	net-misc/curl[ssl]
+	sys-apps/dbus:=
+	media-libs/flac:=
+	sys-libs/zlib:=[minizip]
+	!headless? (
+		X? ( ${COMMON_X_DEPEND} )
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		media-libs/mesa:=[X?,wayland?]
+		cups? ( >=net-print/cups-1.3.11:= )
+		virtual/udev
+		x11-libs/cairo:=
+		x11-libs/gdk-pixbuf:2
+		x11-libs/pango:=
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtwidgets:5
+		)
+		qt6? ( dev-qt/qtbase:6[gui,widgets] )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!headless? (
+		|| (
+			x11-libs/gtk+:3[X?,wayland?]
+			gui-libs/gtk:4[X?,wayland?]
+		)
+		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
+		qt6? ( dev-qt/qtbase:6[X?,wayland?] )
+	)
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	bindist? (
+		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${PV%%\.*} )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	!headless? (
+		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
+		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
+	)
+"
+
+BDEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	>=app-arch/gzip-1.7
+	!headless? (
+		qt5? ( dev-qt/qtcore:5 )
+		qt6? ( dev-qt/qtbase:6 )
+	)
+	!bundled-toolchain? ( $(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+		llvm-core/lld:${LLVM_SLOT}
+		official? (
+			!ppc64? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[cfi] )
+		) ')
+		${RUST_DEPEND}
+	)
+	pgo? (
+		>=dev-python/selenium-3.141.0
+		>=dev-util/web_page_replay_go-20220314
+	)
+	>=dev-util/bindgen-0.68.0
+	>=dev-build/gn-${GN_MIN_VER}
+	dev-build/ninja
+	dev-lang/perl
+	>=dev-util/gperf-3.0.3
+	dev-vcs/git
+	>=net-libs/nodejs-7.6.0[inspector]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+python_check_deps() {
+	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pre_build_checks() {
+	# Check build requirements: bugs #471810, #541816, #914220
+	# We're going to start doing maths here on the size of an unpacked source tarball,
+	# this should make updates easier as chromium continues to balloon in size.
+	local BASE_DISK=24
+	local EXTRA_DISK=1
+	local CHECKREQS_MEMORY="4G"
+	tc-is-cross-compiler && EXTRA_DISK=2
+	if tc-is-lto || use pgo; then
+		CHECKREQS_MEMORY="9G"
+		tc-is-cross-compiler && EXTRA_DISK=4
+		use pgo && EXTRA_DISK=8
+	fi
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		if use custom-cflags; then
+			EXTRA_DISK=13
+		fi
+		CHECKREQS_MEMORY="16G"
+	fi
+	CHECKREQS_DISK_BUILD="$((BASE_DISK + EXTRA_DISK))G"
+	check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
+		pre_build_checks
+	fi
+
+	if use headless; then
+		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland")
+		for myiuse in ${headless_unused_flags[@]}; do
+			use ${myiuse} && ewarn "Ignoring USE=${myiuse}, USE=headless is set."
+		done
+	fi
+
+	if ! use bindist && use ffmpeg-chromium; then
+		ewarn "Ignoring USE=ffmpeg-chromium, USE=bindist is not set."
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
+		pre_build_checks
+
+		# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
+		# We'll set these to clang here then use llvm-utils functions to very explicitly set these
+		# to a sane value.
+		# This is effectively the 'force-clang' path if GCC support is re-added.
+		# TODO: check if the user has already selected a specific impl via make.conf and respect that.
+		use_lto="false"
+		if tc-is-lto; then
+			use_lto="true"
+			# We can rely on GN to do this for us; anecdotally without this builds
+			# take significantly longer with LTO enabled and it doesn't hurt anything.
+			filter-lto
+		fi
+
+		if [ "$use_lto" = "false" ] && use official; then
+			einfo "USE=official selected and LTO not detected."
+			einfo "It is _highly_ recommended that LTO be enabled for performance reasons"
+			einfo "and to be consistent with the upstream \"official\" build optimisations."
+		fi
+
+		if [ "$use_lto" = "false" ] && use test; then
+			die "Tests require CFI which requires LTO"
+		fi
+
+		export use_lto
+
+		# 936858
+		if tc-ld-is-mold; then
+			eerror "Your toolchain is using the mold linker."
+			eerror "This is not supported by Chromium."
+			die "Please switch to a different linker."
+		fi
+
+		if use !bundled-toolchain; then
+			llvm-r1_pkg_setup
+			rust_pkg_setup
+		fi
+
+		# Forcing clang; respect llvm_slot_x to enable selection of impl from LLVM_COMPAT
+		AR=llvm-ar
+		CPP="${CHOST}-clang++-${LLVM_SLOT} -E"
+		NM=llvm-nm
+		CC="${CHOST}-clang-${LLVM_SLOT}"
+		CXX="${CHOST}-clang++-${LLVM_SLOT}"
+
+		if tc-is-cross-compiler; then
+			use pgo && die "The pgo USE flag cannot be used when cross-compiling"
+			CPP="${CBUILD}-clang++-${LLVM_SLOT} -E"
+		fi
+
+		# I hate doing this but upstream Rust have yet to come up with a better solution for
+		# us poor packagers. Required for Split LTO units, which are required for CFI.
+		export RUSTC_BOOTSTRAP=1
+
+		# Users should never hit this, it's purely a development convenience
+		if ver_test $(gn --version || die) -lt ${GN_MIN_VER}; then
+			die "dev-build/gn >= ${GN_MIN_VER} is required to build this Chromium"
+		fi
+	fi
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	unpack ${P}-linux.tar.xz
+	# These should only be required when we're not using the official toolchain
+	use !bundled-toolchain && unpack chromium-patches-${PATCH_V}.tar.bz2
+
+	use pgo && unpack chromium-profiler-0.2.tar
+
+	if use test; then
+		# A new testdata tarball is available for each release; but testfonts tend to remain stable
+		# for the duration of a release.
+		# This unpacks directly into/over ${WORKDIR}/${P} so we can just use `unpack`.
+		unpack ${P}-linux-testdata.tar.xz
+		# This just contains a bunch of font files that need to be unpacked (or moved) to the correct location.
+		local testfonts_dir="${WORKDIR}/${P}/third_party/test_fonts"
+		local testfonts_tar="${DISTDIR}/chromium-testfonts-${TEST_FONT:0:10}.tar.gz"
+		tar xf "${testfonts_tar}" -C "${testfonts_dir}" || die "Failed to unpack testfonts"
+	fi
+
+	# We need to manually unpack this since M126 else we'd unpack one toolchain over the other.
+	# Since we're doing that anyway let's unpack to sensible locations to make symlink creation easier.
+	if use bundled-toolchain; then
+		einfo "Unpacking bundled Clang ..."
+		mkdir -p "${WORKDIR}"/clang || die "Failed to create clang directory"
+		tar xf "${DISTDIR}/chromium-${PV%%\.*}-clang.tar.xz" -C "${WORKDIR}/clang" || die "Failed to unpack Clang"
+		einfo "Unpacking bundled Rust ..."
+		local rust_dir="${WORKDIR}/rust-toolchain"
+		mkdir -p ${rust_dir} || die "Failed to create rust toolchain directory"
+		tar xf "${DISTDIR}/chromium-${PV%%\.*}-rust.tar.xz" -C ${rust_dir} || die "Failed to unpack Rust"
+	fi
+
+	if use ppc64; then
+		unpack chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local PATCHES=(
+		"${FILESDIR}/chromium-cross-compile.patch"
+		"${FILESDIR}/chromium-109-system-zlib.patch"
+		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-131-unbundle-icu-target.patch"
+		"${FILESDIR}/chromium-134-oauth2-client-switches.patch"
+	)
+
+	if use bundled-toolchain; then
+		# We need to symlink the toolchain into the expected location
+		einfo "Symlinking Clang toolchain to expected location ..."
+		mkdir -p third_party/llvm-build/ || die "Failed to create llvm-build directory"
+		# the 'Chromium Linux Tarballs' seem to already have 'Release+Asserts/{lib,bin}'; not sure if this is an
+		# upstream change - we're using the same scripts to build, theoretically. We'll still attempt to create
+		# llvm-build, but we'll rm Release+Asserts and symlink directly.
+		if [[ -d third_party/llvm-build/Release+Asserts ]]; then
+			rm -r third_party/llvm-build/Release+Asserts || die "Failed to remove third_party/llvm-build/Release+Asserts"
+		fi
+		ln -s "${WORKDIR}"/clang third_party/llvm-build/Release+Asserts || die "Failed to bundle Clang"
+		einfo "Symlinking Rust toolchain to expected location ..."
+		# As above, so below
+		if [[ -d third_party/rust-toolchain ]]; then
+			rm -r third_party/rust-toolchain || die "Failed to remove third_party/rust-toolchain"
+		fi
+		ln -s "${WORKDIR}"/rust-toolchain third_party/rust-toolchain || die "Failed to bundle rust"
+		cp "${WORKDIR}"/rust-toolchain/VERSION \
+			"${WORKDIR}"/rust-toolchain/INSTALLED_VERSION || die "Failed to set rust version"
+	else
+		# This patch breaks bundled-toolchain builds as the required path_suffix clearly differs
+		# between the two. Probably just need to update the patch to gate updating this value on the 'unbundle'
+		# toolchain? Alternative: move to chromium-patches, but this is probably something that we
+		# can upstream, so let's try to do it properly. For now apply conditionally so that we have _a_ dev
+		# channel ebuild.
+		# Currently evaluates to:
+		# `-resource-dir', `'../../third_party/llvm-build/Release+Asserts/include'`
+		# This is correct if the first part of the concatenated variable points to /usr/lib/clang/<majver>
+		# Correct for bundled toolchain is:
+		# `-resource-dir', `'../../third_party/llvm-build/Release+Asserts/lib/clang/<majver>/include'`
+		# TODO: fix before this leaves dev.
+		PATCHES+=( "${FILESDIR}/chromium-132-bindgen-custom-toolchain.patch" )
+		# We don't need our toolchain patches if we're using the official toolchain
+		shopt -s globstar nullglob
+		# 130: moved the PPC64 patches into the chromium-patches repo
+		local patch
+		for patch in "${WORKDIR}/chromium-patches-${PATCH_V}"/**/*.patch; do
+			if [[ ${patch} == *"ppc64le"* ]]; then
+				use ppc64 && PATCHES+=( "${patch}" )
+			else
+				PATCHES+=( "${patch}" )
+			fi
+		done
+
+		shopt -u globstar nullglob
+
+		# We can't use the bundled compiler builtins with the system toolchain
+		# `grep` is a development convenience to ensure we fail early when google changes something.
+		local builtins_match="if (is_clang && !is_nacl && !is_cronet_build) {"
+		grep -q "${builtins_match}" build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
+		sed -i -e "/${builtins_match}/,+2d" build/config/compiler/BUILD.gn
+
+		# Strictly speaking this doesn't need to be gated (no bundled toolchain for ppc64); it keeps the logic together
+		if use ppc64; then
+			local patchset_dir="${WORKDIR}/openpower-patches-${PPC64_HASH}/patches"
+			# patch causes build errors on 4K page systems (https://bugs.gentoo.org/show_bug.cgi?id=940304)
+			local page_size_patch="ppc64le/third_party/use-sysconf-page-size-on-ppc64.patch"
+			local isa_3_patch="ppc64le/core/baseline-isa-3-0.patch"
+			# Apply the OpenPOWER patches (check for page size and isa 3.0)
+			openpower_patches=( $(grep -E "^ppc64le|^upstream" "${patchset_dir}/series" | grep -v "${page_size_patch}" |
+				grep -v "${isa_3_patch}" || die) )
+			for patch in "${openpower_patches[@]}"; do
+				PATCHES+=( "${patchset_dir}/${patch}" )
+			done
+			if [[ $(getconf PAGESIZE) == 65536 ]]; then
+				PATCHES+=( "${patchset_dir}/${page_size_patch}" )
+			fi
+			# We use vsx3 as a proxy for 'want isa3.0' (POWER9)
+			if use cpu_flags_ppc_vsx3 ; then
+				PATCHES+=( +"${patchset_dir}/${isa_3_patch}" )
+			fi
+		fi
+
+		# Oxidised hacks, let's keep 'em all in one place
+		# This is a nightly option that does not exist in older releases
+		# https://github.com/rust-lang/rust/commit/389a399a501a626ebf891ae0bb076c25e325ae64
+		if ver_test ${RUST_SLOT} -lt "1.83.0"; then
+			sed '/rustflags = \[ "-Zdefault-visibility=hidden" \]/d' -i build/config/gcc/BUILD.gn ||
+				die "Failed to remove default visibility nightly option"
+		fi
+
+		# Upstream Rust replaced adler with adler2, for older versions of Rust we still need
+		# to tell GN that we have the older lib when it tries to copy the Rust sysroot
+		# into the bulid directory.
+		if ver_test ${RUST_SLOT} -lt "1.85.0"; then
+			sed -i 's/adler2/adler/' build/rust/std/BUILD.gn ||
+				die "Failed to tell GN that we have adler and not adler2"
+		fi
+	fi
+
+	default
+
+	rm third_party/node/linux/node-linux-x64/bin/node || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	# adjust python interpreter version
+	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
+
+	# remove_bundled_libraries.py walks the source tree and looks for paths containing the substring 'third_party'
+	# whitelist matches use the right-most matching path component, so we need to whitelist from that point down.
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/ceval
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/volk
+		third_party/anonymous_tokens
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/bidimapper
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4-4.9.3
+		third_party/catapult/third_party/html5lib-1.1
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/content_analysis_sdk
+		third_party/cpuinfo
+		third_party/crabbyavif
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/d3
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/gn/webgpu-cts
+		third_party/dawn/third_party/khronos
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/csp_evaluator
+		third_party/devtools-frontend/src/front_end/third_party/diff
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/json5
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/parsel-js
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs
+		third_party/devtools-frontend/src/front_end/third_party/third-party-web
+		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/front_end/third_party/web-vitals
+		third_party/devtools-frontend/src/third_party
+		third_party/distributed_point_functions
+		third_party/dom_distiller_js
+		third_party/eigen3
+		third_party/emoji-segmenter
+		third_party/farmhash
+		third_party/fast_float
+		third_party/fdlibm
+		third_party/ffmpeg
+		third_party/fft2d
+		third_party/flatbuffers
+		third_party/fp16
+		third_party/freetype
+		third_party/fusejs
+		third_party/fxdiv
+		third_party/gemmlowp
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/highway
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/ink_stroke_modeler/src/ink_stroke_modeler
+		third_party/ink_stroke_modeler/src/ink_stroke_modeler/internal
+		third_party/ink/src/ink/brush
+		third_party/ink/src/ink/color
+		third_party/ink/src/ink/geometry
+		third_party/ink/src/ink/rendering
+		third_party/ink/src/ink/rendering/skia/common_internal
+		third_party/ink/src/ink/rendering/skia/native
+		third_party/ink/src/ink/rendering/skia/native/internal
+		third_party/ink/src/ink/strokes
+		third_party/ink/src/ink/types
+		third_party/inspector_protocol
+		third_party/ipcz
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/khronos
+		third_party/lens_server_proto
+		third_party/leveldatabase
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/fastfeat
+		third_party/libaom/source/libaom/third_party/SVT-AV1
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libc++
+		third_party/libdrm
+		third_party/libgav1
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libtess2/libtess2
+		third_party/libtess2/src/Include
+		third_party/libtess2/src/Source
+		third_party/liburlpattern
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/libzip
+		third_party/lit
+		third_party/llvm-libc
+		third_party/llvm-libc/src/shared/
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/markupsafe
+		third_party/material_color_utilities
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/neon_2_sse
+		third_party/node
+		third_party/omnibox_proto
+		third_party/one_euro_filter
+		third_party/openscreen
+		third_party/openscreen/src/third_party/
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/opus
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg
+		third_party/pdfium/third_party/libtiff
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/perfetto/protos/third_party/simpleperf
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private_membership
+		third_party/private-join-and-compute
+		third_party/protobuf
+		third_party/pthreadpool
+		third_party/puffin
+		third_party/pyjson5
+		third_party/pyyaml
+		third_party/rapidhash
+		third_party/re2
+		third_party/rnnoise
+		third_party/rust
+		third_party/ruy
+		third_party/s2cellid
+		third_party/securemessage
+		third_party/selenium-atoms
+		third_party/sentencepiece
+		third_party/sentencepiece/src/third_party/darts_clone
+		third_party/shell-encryption
+		third_party/simdutf
+		third_party/simplejson
+		third_party/six
+		third_party/skia
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/snappy
+		third_party/spirv-headers
+		third_party/spirv-tools
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
+		third_party/swiftshader/third_party/SPIRV-Tools
+		third_party/swiftshader/third_party/subzero
+		third_party/tensorflow_models
+		third_party/tensorflow-text
+		third_party/tflite
+		third_party/tflite/src/third_party/eigen3
+		third_party/tflite/src/third_party/fft2d
+		third_party/tflite/src/third_party/xla/third_party/tsl
+		third_party/tflite/src/third_party/xla/xla/tsl/framework
+		third_party/tflite/src/third_party/xla/xla/tsl/lib/random
+		third_party/tflite/src/third_party/xla/xla/tsl/protobuf
+		third_party/tflite/src/third_party/xla/xla/tsl/util
+		third_party/ukey2
+		third_party/unrar
+		third_party/utf
+		third_party/vulkan
+		third_party/wasm_tts_engine
+		third_party/wayland
+		third_party/webdriver
+		third_party/webgpu-cts
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/xnnpack
+		third_party/zlib/google
+		third_party/zxcvbn-cpp
+		url/third_party/mozilla
+		v8/third_party/siphash
+		v8/third_party/utf8-decoder
+		v8/third_party/valgrind
+		v8/third_party/glibc
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+
+	if use test; then
+		# tar tvf /var/cache/distfiles/${P}-testdata.tar.xz | grep '^d' | grep 'third_party' | awk '{print $NF}'
+		keeplibs+=(
+			third_party/breakpad/breakpad/src/processor
+			third_party/fuzztest
+			third_party/google_benchmark/src/include/benchmark
+			third_party/google_benchmark/src/src
+			third_party/perfetto/protos/third_party/pprof
+			third_party/test_fonts
+			third_party/test_fonts/fontconfig
+		)
+	fi
+
+	# USE=system-*
+	if ! use system-harfbuzz; then
+		keeplibs+=( third_party/harfbuzz-ng )
+	fi
+
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+
+	if ! use system-png; then
+		keeplibs+=( third_party/libpng )
+	fi
+
+	if ! use system-zstd; then
+		keeplibs+=( third_party/zstd )
+	fi
+
+	# Arch-specific
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		# requires git and clang, bug #832803
+		# Revert https://chromium.googlesource.com/chromium/src/+/b463d0f40b08b4e896e7f458d89ae58ce2a27165%5E%21/third_party/libvpx/generate_gni.sh
+		# and https://chromium.googlesource.com/chromium/src/+/71ebcbce867dd31da5f8b405a28fcb0de0657d91%5E%21/third_party/libvpx/generate_gni.sh
+		# since we're not in a git repo
+		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g; /^git -C/d; /git cl/d; /cd \$BASE_DIR\/\$LIBVPX_SRC_DIR/ign format --in-place \$BASE_DIR\/BUILD.gn\ngn format --in-place \$BASE_DIR\/libvpx_srcs.gni" \
+			generate_gni.sh || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+
+		pushd third_party/ffmpeg >/dev/null || die
+		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
+		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
+		popd >/dev/null || die
+	fi
+
+	# Sanity check keeplibs, on major version bumps it is often necessary to update this list
+	# and this enables us to hit them all at once.
+	# There are some entries that need to be whitelisted (TODO: Why? The file is understandable, the rest seem odd)
+	whitelist_libs=(
+		net/third_party/quic
+		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
+		third_party/libjingle
+		third_party/mesa
+		third_party/skia/third_party/vulkan
+		third_party/vulkan
+	)
+	local not_found_libs=()
+	for lib in "${keeplibs[@]}"; do
+		if [[ ! -d "${lib}" ]] && ! has "${lib}" "${whitelist_libs[@]}"; then
+			not_found_libs+=( "${lib}" )
+		fi
+	done
+
+	if [[ ${#not_found_libs[@]} -gt 0 ]]; then
+		eerror "The following \`keeplibs\` directories were not found in the source tree:"
+		for lib in "${not_found_libs[@]}"; do
+			eerror "  ${lib}"
+		done
+		die "Please update the ebuild."
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	einfo "Unbundling third-party libraries ..."
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+
+	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
+	mkdir -p buildtools/third_party/eu-strip/bin || die
+	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
+}
+
+chromium_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	if use !bundled-toolchain; then
+		# We already forced the "correct" clang via pkg_setup
+
+		if tc-is-cross-compiler; then
+			CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
+			CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
+			BUILD_AR=${AR}
+			BUILD_CC=${CC}
+			BUILD_CXX=${CXX}
+			BUILD_NM=${NM}
+		fi
+
+		strip-unsupported-flags
+
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+		# https://bugs.gentoo.org/918897#c32
+		append-ldflags -Wl,--undefined-version
+		myconf_gn+=" use_lld=true"
+
+		# Make sure the build system will use the right tools, bug #340795.
+		tc-export AR CC CXX NM
+
+		myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+		if tc-is-cross-compiler; then
+			tc-export BUILD_{AR,CC,CXX,NM}
+			myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+			myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+			myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
+			myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
+
+			# setup cups-config, build system only uses --libs option
+			if use cups; then
+				mkdir "${T}/cups-config" || die
+				cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
+				export PATH="${PATH}:${T}/cups-config"
+			fi
+
+			# Don't inherit PKG_CONFIG_PATH from environment
+			local -x PKG_CONFIG_PATH=
+		else
+			myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+		fi
+
+		# bindgen settings
+		# From 127, to make bindgen work, we need to provide a location for libclang.
+		# We patch this in for gentoo - see chromium-*-bindgen-custom-toolchain.patch
+		# rust_bindgen_root = directory with `bin/bindgen` beneath it.
+		myconf_gn+=" rust_bindgen_root=\"${EPREFIX}/usr/\""
+
+		myconf_gn+=" bindgen_libclang_path=\"$(get_llvm_prefix)/$(get_libdir)\""
+		# We don't need to set 'clang_base_bath' for anything in our build
+		# and it defaults to the google toolchain location. Instead provide a location
+		# to where system clang lives sot that bindgen can find system headers (e.g. stddef.h)
+		myconf_gn+=" clang_base_path=\"${EPREFIX}/usr/lib/clang/${LLVM_SLOT}/\""
+
+		myconf_gn+=" rust_sysroot_absolute=\"$(get_rust_prefix)\""
+		myconf_gn+=" rustc_version=\"${RUST_SLOT}\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
+	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
+	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
+	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=false"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libjpeg
+		libwebp
+		libxml
+		libxslt
+		openh264
+		zlib
+	)
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-png; then
+		gn_system_libraries+=( libpng )
+	fi
+	if use system-zstd; then
+		gn_system_libraries+=( zstd )
+	fi
+
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# TODO 131: The above call clobbers `enable_freetype = true` in the freetype gni file
+	# drop the last line, then append the freetype line and a new curly brace to end the block
+	local freetype_gni="build/config/freetype/freetype.gni"
+	sed -i -e '$d' ${freetype_gni} || die
+	echo "  enable_freetype = true" >> ${freetype_gni} || die
+	echo "}" >> ${freetype_gni} || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+
+	if use headless; then
+		myconf_gn+=" use_cups=false"
+		myconf_gn+=" use_kerberos=false"
+		myconf_gn+=" use_pulseaudio=false"
+		myconf_gn+=" use_vaapi=false"
+		myconf_gn+=" rtc_use_pipewire=false"
+	else
+		myconf_gn+=" use_cups=$(usex cups true false)"
+		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
+		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
+	fi
+
+	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
+	# using dlopen. This helps with automated detection of ABI mismatches and
+	# prevents silent errors.
+	if use pulseaudio; then
+		myconf_gn+=" link_pulseaudio=true"
+	fi
+
+	# Non-developer builds of Chromium (for example, non-Chrome browsers, or
+	# Chromium builds provided by Linux distros) should disable the testing config
+	myconf_gn+=" disable_fieldtrial_testing_config=true"
+
+	# The sysroot is the oldest debian image that chromium supports, we don't need it
+	myconf_gn+=" use_sysroot=false"
+
+	# Use in-tree libc++ (buildtools/third_party/libc++ and buildtools/third_party/libc++abi)
+	# instead of the system C++ library for C++ standard library support.
+	# default: true, but let's be explicit (forced since 120 ; USE removed 127).
+	myconf_gn+=" use_custom_libcxx=true"
+
+	# Disable pseudolocales, only used for testing
+	myconf_gn+=" enable_pseudolocales=false"
+
+	# Disable code formating of generated files
+	myconf_gn+=" blink_enable_generated_code_formatting=false"
+
+	if use bindist ; then
+		# proprietary_codecs just forces Chromium to say that it can use h264/aac,
+		# the work is still done by ffmpeg. If this is set to no Chromium
+		# won't be able to load the codec even if the library can handle it
+		myconf_gn+=" proprietary_codecs=true"
+		myconf_gn+=" ffmpeg_branding=\"Chrome\""
+		# build ffmpeg as an external component (libffmpeg.so) that we can remove / substitute
+		myconf_gn+=" is_component_ffmpeg=true"
+	else
+		ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+		myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+		myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+	fi
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info. The OAuth2 credentials, however, have been left out.
+	# Those OAuth2 credentials have been broken for quite some time anyway.
+	# Instead we apply a patch to use the --oauth2-client-id= and
+	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
+	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
+	# Chromium without baked-in values.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		filter-flags "-g*"
+
+		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
+		if [[ ${myarch} == amd64 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
+		fi
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf_gn+=" treat_warnings_as_errors=false"
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Disable external code space for V8 for ppc64. It is disabled for ppc64
+	# by default, but cross-compiling on amd64 enables it again.
+	if tc-is-cross-compiler; then
+		if ! use amd64 && ! use arm64; then
+			myconf_gn+=" v8_enable_external_code_space=false"
+		fi
+	fi
+
+	# Only enabled for clang, but gcc has endian macros too
+	myconf_gn+=" v8_use_libm_trig_functions=true"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	# We don't use the same clang version as upstream, and with -Werror
+	# we need to make sure that we don't get superfluous warnings.
+	append-flags -Wno-unknown-warning-option
+	if tc-is-cross-compiler; then
+			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
+			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
+	fi
+
+	# Explicitly disable ICU data file support for system-icu/headless builds.
+	if use system-icu || use headless; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Don't need nocompile checks and GN crashes with our config
+	myconf_gn+=" enable_nocompile_tests=false"
+
+	# 131 began laying the groundwork for replacing freetype with
+	# "Rust-based Fontations set of libraries plus Skia path rendering"
+	# We now need to opt-in
+	myconf_gn+=" enable_freetype=true"
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	if use headless; then
+		myconf_gn+=" ozone_platform=\"headless\""
+		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
+		myconf_gn+=" use_glib=false use_gio=false"
+		myconf_gn+=" use_pangocairo=false use_alsa=false"
+		myconf_gn+=" use_libpci=false use_udev=false"
+		myconf_gn+=" enable_print_preview=false"
+		myconf_gn+=" enable_remoting=false"
+	else
+		myconf_gn+=" use_system_minigbm=true"
+		myconf_gn+=" use_xkbcommon=true"
+		if use qt5 || use qt6; then
+			local cbuild_libdir=$(get_libdir)
+			if tc-is-cross-compiler; then
+				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
+				cbuild_libdir=${cbuild_libdir:2}
+				cbuild_libdir=${cbuild_libdir/% }
+			fi
+			if use qt5; then
+				if tc-is-cross-compiler; then
+					myconf_gn+=" moc_qt5_path=\"${EPREFIX}/${cbuild_libdir}/qt5/bin\""
+				else
+					myconf_gn+=" moc_qt5_path=\"$(qt5_get_bindir)\""
+				fi
+			fi
+			if use qt6; then
+				myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\""
+			fi
+
+			myconf_gn+=" use_qt=true"
+			myconf_gn+=" use_qt6=$(usex qt6 true false)"
+		else
+			myconf_gn+=" use_qt=false"
+		fi
+		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
+		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
+		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
+		use wayland && myconf_gn+=" use_system_libffi=true"
+	fi
+
+	myconf_gn+=" use_thin_lto=${use_lto}"
+	myconf_gn+=" thin_lto_enable_optimizations=${use_lto}"
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		if use ppc64; then
+			myconf_gn+=" is_cfi=no" # requires llvm-runtimes/compiler-rt-sanitizers[cfi]
+		else
+			myconf_gn+=" is_cfi=${use_lto}"
+		fi
+		# Don't add symbols to build
+		myconf_gn+=" symbol_level=0"
+	fi
+
+	if use pgo; then
+		myconf_gn+=" chrome_pgo_phase=${1}"
+		if [[ "$1" == "2" ]]; then
+			myconf_gn+=" pgo_data_path=\"${2}\""
+		fi
+	else
+		# Disable PGO
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	# skipping typecheck is only supported on amd64, bug #876157
+	if ! use amd64; then
+		myconf_gn+=" devtools_skip_typecheck=false"
+	fi
+
+	einfo "Configuring Chromium ..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	chromium_configure $(usex pgo 1 0)
+}
+
+chromium_compile() {
+
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
+	local -x PYTHONPATH=
+
+	# Build mksnapshot and pax-mark it.
+	if use pax-kernel; then
+		local x
+		for x in mksnapshot v8_context_snapshot_generator; do
+			if tc-is-cross-compiler; then
+				eninja -C out/Release "host/${x}"
+				pax-mark m "out/Release/host/${x}"
+			else
+				eninja -C out/Release "${x}"
+				pax-mark m "out/Release/${x}"
+			fi
+		done
+	fi
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver chrome_sandbox $(use test && echo "base_unittests")
+
+	pax-mark m out/Release/chrome
+
+	# This codepath does minimal patching, so we're at the mercy of upstream
+	# CFLAGS. This is fine - we're not intending to force this on users
+	# and we do a lot of flag 'management' anyway.
+	if use bundled-toolchain; then
+		QA_FLAGS_IGNORED="
+			usr/lib64/chromium-browser/chrome
+			usr/lib64/chromium-browser/chrome-sandbox
+			usr/lib64/chromium-browser/chromedriver
+			usr/lib64/chromium-browser/chrome_crashpad_handler
+			usr/lib64/chromium-browser/libEGL.so
+			usr/lib64/chromium-browser/libGLESv2.so
+			usr/lib64/chromium-browser/libVkICD_mock_icd.so
+			usr/lib64/chromium-browser/libVkLayer_khronos_validation.so
+			usr/lib64/chromium-browser/libqt5_shim.so
+			usr/lib64/chromium-browser/libvk_swiftshader.so
+			usr/lib64/chromium-browser/libvulkan.so.1
+		"
+	fi
+}
+
+# This function is called from virtx, and must always return so that Xvfb
+# session isn't left running. If we return 1, virtx will call die().
+chromium_profile() {
+	einfo "Profiling for PGO"
+
+	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
+
+	# Remove old profdata in case profiling was interrupted.
+	rm -rf "${1}" || return 1
+
+	if ! "${EPYTHON}" ./chromium_profiler.py \
+		--chrome-executable "${S}/out/Release/chrome" \
+		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
+		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
+		--profile-output "${1}"; then
+		eerror "Profiling failed"
+		return 1
+	fi
+
+	popd >/dev/null || return 1
+}
+
+src_compile() {
+	if use pgo; then
+		local profdata
+
+		profdata="${WORKDIR}/chromium.profdata"
+
+		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
+			chromium_compile
+			virtx chromium_profile "$profdata"
+
+			touch "${WORKDIR}/.pgo-profiled" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
+			# Remove phase 1 output
+			rm -r out/Release || die
+
+			chromium_configure 2 "$profdata"
+
+			touch "${WORKDIR}/.pgo-phase-2-configured" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
+			chromium_compile
+			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
+		fi
+	else
+		chromium_compile
+	fi
+
+	mv out/Release/chromedriver{.unstripped,} || die
+
+	rm -f out/Release/locales/*.pak.info || die
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+
+	# Build vk_swiftshader_icd.json; bug #827861
+	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
+		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
+		out/Release/vk_swiftshader_icd.json || die
+}
+
+src_test() {
+	# Initial list of tests to skip pulled from Alpine. Thanks Lauren!
+	# https://issues.chromium.org/issues/40939315
+	local skip_tests=(
+		'MessagePumpLibeventTest.NestedNotification*'
+		ClampTest.Death
+		OptionalTest.DereferencingNoValueCrashes
+		PlatformThreadTest.SetCurrentThreadTypeTest
+		RawPtrTest.TrivialRelocability
+		SafeNumerics.IntMaxOperations
+		StackTraceTest.TraceStackFramePointersFromBuffer
+		StringPieceTest.InvalidLengthDeath
+		StringPieceTest.OutOfBoundsDeath
+		ThreadPoolEnvironmentConfig.CanUseBackgroundPriorityForWorker
+		ValuesUtilTest.FilePath
+		# Gentoo-specific
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/0
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/1
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/2
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/3
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/0
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/1
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/2
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/3
+		CharacterEncodingTest.GetCanonicalEncodingNameByAliasName
+		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGFPE
+		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGILL
+		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGV
+		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGVNonCanonicalAddress
+		FilePathTest.FromUTF8Unsafe_And_AsUTF8Unsafe
+		FileTest.GetInfoForCreationTime
+		ICUStringConversionsTest.ConvertToUtf8AndNormalize
+		NumberFormattingTest.FormatPercent
+		PathServiceTest.CheckedGetFailure
+		PlatformThreadTest.CanChangeThreadType
+		RustLogIntegrationTest.CheckAllSeverity
+		StackCanary.ChangingStackCanaryCrashesOnReturn
+		StackTraceDeathTest.StackDumpSignalHandlerIsMallocFree
+		SysStrings.SysNativeMBAndWide
+		SysStrings.SysNativeMBToWide
+		SysStrings.SysWideToNativeMB
+		TestLauncherTools.TruncateSnippetFocusedMatchesFatalMessagesTest
+		ToolsSanityTest.BadVirtualCallNull
+		ToolsSanityTest.BadVirtualCallWrongType
+		CancelableEventTest.BothCancelFailureAndSucceedOccurUnderContention #new m133: TODO investigate
+	)
+	local test_filter="-$(IFS=:; printf '%s' "${skip_tests[*]}")"
+	# test-launcher-bot-mode enables parallelism and plain output
+	./out/Release/base_unittests --test-launcher-bot-mode \
+		--test-launcher-jobs="$(makeopts_jobs)" \
+		--gtest_filter="${test_filter}" || die "Tests failed!"
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	newexe out/Release/chrome_sandbox chrome-sandbox
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver
+	doexe out/Release/chrome_crashpad_handler
+
+	ozone_auto_session () {
+		use X && use wayland && ! use headless && echo true || echo false
+	}
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+
+	if use bindist; then
+		# We built libffmpeg as a component library, but we can't distribute it
+		# with proprietary codec support. Remove it and make a symlink to the requested
+		# system library.
+		rm -f out/Release/libffmpeg.so \
+			|| die "Failed to remove bundled libffmpeg.so (with proprietary codecs)"
+		# symlink the libffmpeg.so from either ffmpeg-chromium or ffmpeg[chromium].
+		einfo "Creating symlink to libffmpeg.so from $(usex ffmpeg-chromium ffmpeg-chromium ffmpeg[chromium])..."
+		dosym ../chromium/libffmpeg.so$(usex ffmpeg-chromium .${PV%%\.*} "") \
+			/usr/$(get_libdir)/chromium-browser/libffmpeg.so
+	fi
+
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	# Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland"
+	doins out/Release/xdg-{settings,mime}
+
+	if ! use system-icu && ! use headless; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/MEIPreload
+
+	# Install vk_swiftshader_icd.json; bug #827861
+	doins out/Release/vk_swiftshader_icd.json
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if ! use headless; then
+		if use vaapi; then
+			elog "VA-API is disabled by default at runtime. You have to enable it"
+			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
+			elog "in /etc/chromium/default."
+		fi
+		if use screencast; then
+			elog "Screencast is disabled by default at runtime. Either enable it"
+			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+		if use gtk4; then
+			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
+			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+		if use qt5 && use qt6; then
+			elog "Chromium automatically selects Qt5 or Qt6 based on your desktop"
+			elog "environment. To override you need to pass --qt-version=5 or"
+			elog "--qt-version=6, e.g. by adding it to CHROMIUM_FLAGS in"
+			elog "/etc/chromium/default."
+		fi
+	fi
+
+	if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then
+		ewarn "The lack of an '/etc/machine-id' file on this system booted with systemd"
+		ewarn "indicates that the Gentoo handbook was not followed to completion."
+		ewarn ""
+		ewarn "Chromium is known to behave unpredictably with this system configuration;"
+		ewarn "please complete the configuration of this system before logging any bugs."
+	fi
+}
diff --git a/www-client/chromium/files/chromium-126-oauth2-client-switches.patch b/www-client/chromium/files/chromium-126-oauth2-client-switches.patch
deleted file mode 100644
index b7ddf794aa27..000000000000
--- a/www-client/chromium/files/chromium-126-oauth2-client-switches.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From b6cda4bc2283a02a5b5209c0f4282a8365f6f33e Mon Sep 17 00:00:00 2001
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Tue, 21 May 2024 10:04:24 +1000
-Subject: [PATCH] www-client/chromium: work around dead oauth2 credentials -
- 126 update
-
-126 changed the function proto; patch rebased.
-
-Google doesn't let us bake in OAuth2 credentials, and for some time,
-Google sign-in has been broken. Arch dealt with this in March, and so
-did we to some degree, but in the last few months, our sign-in
-credentials have been broken. It appears that we actually did remove API
-credentials in March around Chrome 89, but they got added back, perhaps
-when rotating newer versions to replace older versions. Work around this
-by following Arch's lead: we remove the predefined credentials, as
-before, but also we patch Chromium so that people can use their own
-easily, using Arch's patch for that.
-
-For more info, see:
-
-https://archlinux.org/news/chromium-losing-sync-support-in-early-march/
-https://bodhi.fedoraproject.org/updates/FEDORA-2021-48866282e5
-https://hackaday.com/2021/01/26/whats-the-deal-with-chromium-on-linux-google-at-odds-with-package-maintainers/
-
-Bug: https://bugs.gentoo.org/791871
-Signed-off-by: Matt Jolly <kangie@gentoo.org>
---- a/google_apis/google_api_keys-inc.cc
-+++ b/google_apis/google_api_keys-inc.cc
-@@ -193,11 +193,11 @@ class APIKeyCache {
-     std::string default_client_id = CalculateKeyValue(
-         GOOGLE_DEFAULT_CLIENT_ID,
-         STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(),
--        nullptr, std::string(), environment.get(), command_line, gaia_config);
-+        ::switches::kOAuth2ClientID, std::string(), environment.get(), command_line, gaia_config);
-     std::string default_client_secret = CalculateKeyValue(
-         GOOGLE_DEFAULT_CLIENT_SECRET,
-         STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), std::string(),
--        nullptr, std::string(), environment.get(), command_line, gaia_config);
-+        ::switches::kOAuth2ClientSecret, std::string(), environment.get(), command_line, gaia_config);
- 
-     // We currently only allow overriding the baked-in values for the
-     // default OAuth2 client ID and secret using a command-line
--- 
-2.45.1
-
diff --git a/www-client/chromium/files/chromium-127-bindgen-custom-toolchain.patch b/www-client/chromium/files/chromium-127-bindgen-custom-toolchain.patch
deleted file mode 100644
index aaf4b19a556f..000000000000
--- a/www-client/chromium/files/chromium-127-bindgen-custom-toolchain.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 6df5a080f58ddb6a49a9d33e4a3619a34fffa78c Mon Sep 17 00:00:00 2001
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Fri, 5 Jul 2024 20:49:01 +1000
-Subject: [PATCH] Make bindgen wrapper work with unbundled toolchain
-
-The `run_bindgen.py` wrapper takes a --libclang-path option
-and uses it to set the appropriate environment variable.
-
-This is currently hardcoded to use libclang shipped alongside
-bindgen (in our rust toolchain), but distributions may want to
-override this and use a system path.
-
-Additionally enable distros to feed in appropriate library paths.
---- a/build/config/rust.gni
-+++ b/build/config/rust.gni
-@@ -60,6 +60,17 @@ declare_args() {
-   # the bindgen exectuable).
-   rust_bindgen_root = "//third_party/rust-toolchain"
- 
-+  # Directory under which to find one of `libclang.{dll,so}` (a `lib[64]` or
-+  # `bin` directory containing the libclang shared library).
-+  # We don't need to worry about multlib, but specify the full path here
-+  # in case a distribution does.
-+  if (host_os == "win") {
-+    bindgen_libclang_path = "//third_party/rust-toolchain/bin"
-+  } else {
-+    bindgen_libclang_path = "//third_party/rust-toolchain/lib"
-+  }
-+
-+
-   # If you're using a Rust toolchain as specified by rust_sysroot_absolute,
-   # set this to the output of `rustc -V`. Changing this string will cause all
-   # Rust targets to be rebuilt, which allows you to update your toolchain and
---- a/build/rust/rust_bindgen.gni
-+++ b/build/rust/rust_bindgen.gni
-@@ -16,13 +16,13 @@ if (host_os == "win") {
-   _bindgen_path = "${_bindgen_path}.exe"
- }
- 
--# On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
--# ../lib.
--_libclang_path = rust_bindgen_root
--if (host_os == "win") {
--  _libclang_path += "/bin"
-+if (clang_base_path != default_clang_base_path && custom_toolchain == "//build/toolchain/linux/unbundle:default") {
-+  # Assume that the user has set this up properly, including handling multilib
-+  _clang_libpath = clang_base_path + "/include"
-+  _clang_ld_libpath  = bindgen_libclang_path
- } else {
--  _libclang_path += "/lib"
-+  _clang_libpath = clang_base_path + "/lib/clang/" + clang_version
-+  _clang_ld_libpath = clang_base_path + "/lib"
- }
- 
- # Template to build Rust/C bindings with bindgen.
-@@ -100,7 +100,7 @@ template("rust_bindgen") {
-       "--output",
-       rebase_path(out_gen_rs, root_build_dir),
-       "--libclang-path",
--      rebase_path(_libclang_path, root_build_dir),
-+      rebase_path(bindgen_libclang_path, root_build_dir),
-     ]
- 
-     if (wrap_static_fns) {
-@@ -117,7 +117,7 @@ template("rust_bindgen") {
-       # point to.
-       args += [
-         "--ld-library-path",
--        rebase_path(clang_base_path + "/lib", root_build_dir),
-+        rebase_path(_clang_ld_libpath, root_build_dir),
-       ]
-     }
- 
-@@ -145,8 +145,7 @@ template("rust_bindgen") {
-     # make it behave consistently with our other command line flags and allows
-     # system headers to be found.
-     clang_resource_dir =
--        rebase_path(clang_base_path + "/lib/clang/" + clang_version,
--                    root_build_dir)
-+        rebase_path(_clang_libpath, root_build_dir)
-     args += [
-       "-resource-dir",
-       clang_resource_dir,
-@@ -167,6 +166,15 @@ template("rust_bindgen") {
-       }
-     }
- 
-+    if (custom_toolchain == "//build/toolchain/linux/unbundle:default") {
-+      # We need to pass the path to the libstdc++ headers to bindgen so that it
-+      # can find them when parsing C++ headers.
-+      args += [
-+        "-I",
-+        rebase_path(clang_base_path + "/include/", root_build_dir),
-+      ]
-+    }
-+
-     if (is_win) {
-       # On Windows we fall back to using system headers from a sysroot from
-       # depot_tools. This is negotiated by python scripts and the result is
--- 
-2.45.2
-
diff --git a/www-client/chromium/files/chromium-131-const-atomicstring-conversion.patch b/www-client/chromium/files/chromium-131-const-atomicstring-conversion.patch
deleted file mode 100644
index 52f746669b55..000000000000
--- a/www-client/chromium/files/chromium-131-const-atomicstring-conversion.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 403ee5b14df12c8ee3b3583177bbd30d930e9aaf Mon Sep 17 00:00:00 2001
-From: Matt Jolly <kangie@gentoo.org>
-Date: Sat, 12 Oct 2024 13:45:37 +1000
-Subject: [PATCH] Convert 'Const AtomicString' to 'const char *'.
-
-I don't know why this is suddenly required?
---- a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
-+++ b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
-@@ -323,7 +323,10 @@ void TextCodecICU::CreateICUConverter() const {
-   DCHECK(!converter_icu_);
- 
- #if defined(USING_SYSTEM_ICU)
--  const char* name = encoding_.GetName();
-+  //convert to WTF::String to use existing `const char *` dependent functions
-+  WTF::String nameString = encoding_.GetName();
-+  std::string nameUtf8 = nameString.Utf8();
-+  const char* name = nameUtf8.c_str();
-   needs_gbk_fallbacks_ =
-       name[0] == 'G' && name[1] == 'B' && name[2] == 'K' && !name[3];
- #endif
-@@ -448,7 +451,10 @@ String TextCodecICU::Decode(base::span<const uint8_t> data,
-   // <http://bugs.webkit.org/show_bug.cgi?id=17014>
-   // Simplified Chinese pages use the code A3A0 to mean "full-width space", but
-   // ICU decodes it as U+E5E5.
--  if (!strcmp(encoding_.GetName(), "GBK")) {
-+  // Convert AtomicString to String
-+  WTF::String nameString = encoding_.GetName();
-+  std::string nameUtf8 = nameString.Utf8();
-+  if (!strcmp(nameUtf8.c_str(), "GBK")) {
-     if (EqualIgnoringASCIICase(encoding_.GetName(), "gb18030"))
-       resultString.Replace(0xE5E5, kIdeographicSpaceCharacter);
-     // Make GBK compliant to the encoding spec and align with GB18030
--- 
-2.46.2
-
diff --git a/www-client/chromium/files/chromium-133-openh264-decoder-source-set.patch b/www-client/chromium/files/chromium-133-openh264-decoder-source-set.patch
deleted file mode 100644
index db366cf83eb1..000000000000
--- a/www-client/chromium/files/chromium-133-openh264-decoder-source-set.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3cdb3cdccbaafc1d41713894dac7affc9e4cab6d Mon Sep 17 00:00:00 2001
-From: Matt Jolly <kangie@gentoo.org>
-Date: Fri, 6 Dec 2024 10:46:55 +1000
-Subject: [PATCH] unbundle: add decoder source set to openh264
-
---- a/build/linux/unbundle/openh264.gn
-+++ b/build/linux/unbundle/openh264.gn
-@@ -40,6 +40,13 @@ source_set("processing") {
-   public_configs = [ ":config" ]
- }
- 
-+source_set("decoder") {
-+  deps = [ ":openh264_shim" ]
-+  public_configs = [
-+    ":config",
-+  ]
-+}
-+
- source_set("encoder") {
-   deps = [ ":openh264_shim" ]
-   public_configs = [
--- 
-2.47.0
-
diff --git a/www-client/chromium/files/chromium-134-oauth2-client-switches.patch b/www-client/chromium/files/chromium-134-oauth2-client-switches.patch
new file mode 100644
index 000000000000..b7137e524809
--- /dev/null
+++ b/www-client/chromium/files/chromium-134-oauth2-client-switches.patch
@@ -0,0 +1,35 @@
+From 628c8aad603791ec1276c6a5b8d3704a03840f86 Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kangie@gentoo.org>
+Date: Sat, 18 Jan 2025 11:09:46 +1000
+Subject: [PATCH] www-client/chromium: work around dead oauth2 credentials
+
+Google doesn't let us bake in OAuth2 credentials, and for some time,
+Google sign-in has been broken. Arch dealt with this in March, and so
+did we to some degree, but in the last few months, our sign-in
+credentials have been broken. It appears that we actually did remove API
+credentials in March around Chrome 89, but they got added back, perhaps
+when rotating newer versions to replace older versions. Work around this
+by following Arch's lead: we remove the predefined credentials, as
+before, but also we patch Chromium so that people can use their own
+easily, using Arch's patch for that.
+--- a/google_apis/api_key_cache.cc
++++ b/google_apis/api_key_cache.cc
+@@ -192,13 +192,13 @@ ApiKeyCache::ApiKeyCache(const DefaultApiKeys& default_api_keys) {
+ 
+   std::string default_client_id = CalculateKeyValue(
+       default_api_keys.google_default_client_id,
+-      STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr, std::string(),
++      STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID, std::string(),
+       environment.get(), command_line, gaia_config,
+       default_api_keys.allow_override_via_environment,
+       default_api_keys.allow_unset_values);
+   std::string default_client_secret = CalculateKeyValue(
+       default_api_keys.google_default_client_secret,
+-      STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr,
++      STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientID,
+       std::string(), environment.get(), command_line, gaia_config,
+       default_api_keys.allow_override_via_environment,
+       default_api_keys.allow_unset_values);
+-- 
+2.48.0
+
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index 23780016b881..e5778b508d89 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -10,11 +10,12 @@
 		<name>Matt Jolly</name>
 	</maintainer>
 	<use>
-		<flag name="ffmpeg-chromium">(binpkg only) Use Chromium FFmpeg fork (<pkg>media-video/ffmpeg-chromium</pkg>) rather than mainline FFmpeg (<pkg>media-video/ffmpeg</pkg>)</flag>
+		<flag name="bundled-toolchain">Download and use the upstream binary toolchain(s) to build Chromium</flag>
 		<flag name="debug">Enable DCHECK feature with severity configurable at runtime. Mostly intended for debugging and development, NOT RECOMMENDED for general use.</flag>
+		<flag name="ffmpeg-chromium">(binpkg only) Use Chromium FFmpeg fork (<pkg>media-video/ffmpeg-chromium</pkg>) rather than mainline FFmpeg (<pkg>media-video/ffmpeg</pkg>)</flag>
 		<flag name="gtk4">Build with GTK4 headers.</flag>
-		<flag name="headless">Build Ozone only with headless backend, NOT RECOMMENDED for general use.</flag>
 		<flag name="hangouts">Enable support for Google Hangouts features such as screen sharing</flag>
+		<flag name="headless">Build Ozone only with headless backend, NOT RECOMMENDED for general use.</flag>
 		<flag name="official">Enable Official build instead of Developer build.</flag>
 		<flag name="pax-kernel">Allow building on a PaX-enabled kernel</flag>
 		<flag name="pgo">Build with Profile Guided Optimizations (2-stage compilation)</flag>
diff --git a/www-client/dillo/dillo-3.1.1-r1.ebuild b/www-client/dillo/dillo-3.1.1-r1.ebuild
deleted file mode 100644
index 53222bcbf650..000000000000
--- a/www-client/dillo/dillo-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Lean FLTK based web browser"
-HOMEPAGE="https://dillo-browser.github.io/"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dillo-browser/dillo.git"
-else
-	SRC_URI="https://github.com/dillo-browser/dillo/releases/download/v${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug doc +gif +jpeg mbedtls +png +ssl +openssl +xembed"
-REQUIRED_USE="
-	ssl? ( || ( openssl mbedtls ) )
-"
-
-RDEPEND="
-	=x11-libs/fltk-1.3*:1=
-	sys-libs/zlib
-	x11-libs/libX11
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	png? ( >=media-libs/libpng-1.2:= )
-	ssl? (
-		mbedtls? ( net-libs/mbedtls:= )
-		openssl? ( dev-libs/openssl:= )
-	)
-	test? (
-		media-fonts/dejavu
-		media-gfx/imagemagick[X]
-		x11-apps/xwd
-		x11-apps/xwininfo
-	)
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	doc? (
-		app-text/doxygen[dot]
-		app-text/texlive
-	)
-"
-
-DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-unused-constructor.patch
-	"${FILESDIR}"/${P}-remove-which.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug rtfl)
-		$(use_enable gif)
-		$(use_enable jpeg)
-		$(use_enable mbedtls)
-		$(use_enable openssl)
-		$(use_enable png)
-		$(use_enable ssl tls)
-		$(use_enable xembed)
-		--enable-ipv6
-	)
-
-	use test && myeconfargs+=( --enable-html-tests=yes )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-
-	if use doc; then
-		doxygen Doxyfile || die
-	fi
-}
-
-src_test() {
-	# The test suite consistently fails with -jN in portage
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-
-	use doc && dodoc -r html
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/www-client/dillo/dillo-3.1.1-r2.ebuild b/www-client/dillo/dillo-3.1.1-r2.ebuild
new file mode 100644
index 000000000000..59b02fe21509
--- /dev/null
+++ b/www-client/dillo/dillo-3.1.1-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs virtualx xdg-utils
+
+DESCRIPTION="Lean FLTK based web browser"
+HOMEPAGE="https://dillo-browser.github.io/"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dillo-browser/dillo.git"
+else
+	SRC_URI="https://github.com/dillo-browser/dillo/releases/download/v${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug doc +gif +jpeg mbedtls +png +ssl +openssl +xembed"
+REQUIRED_USE="
+	ssl? ( || ( openssl mbedtls ) )
+"
+
+RDEPEND="
+	=x11-libs/fltk-1.3*:1=
+	sys-libs/zlib
+	x11-libs/libX11
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( >=media-libs/libpng-1.2:= )
+	ssl? (
+		mbedtls? ( net-libs/mbedtls:0= )
+		openssl? ( dev-libs/openssl:= )
+	)
+	test? (
+		media-fonts/dejavu
+		media-gfx/imagemagick[X]
+		x11-apps/xwd
+		x11-apps/xwininfo
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	doc? (
+		app-text/doxygen[dot]
+		app-text/texlive
+	)
+"
+
+DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-unused-constructor.patch
+	"${FILESDIR}"/${P}-remove-which.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug rtfl)
+		$(use_enable gif)
+		$(use_enable jpeg)
+		$(use_enable mbedtls)
+		$(use_enable openssl)
+		$(use_enable png)
+		$(use_enable ssl tls)
+		$(use_enable xembed)
+		--enable-ipv6
+	)
+
+	use test && myeconfargs+=( --enable-html-tests=yes )
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+
+	if use doc; then
+		doxygen Doxyfile || die
+	fi
+}
+
+src_test() {
+	# The test suite consistently fails with -jN in portage
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+
+	use doc && dodoc -r html
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/www-client/dillo/dillo-9999.ebuild b/www-client/dillo/dillo-9999.ebuild
index 6afd97ac6375..cd0dca3283fe 100644
--- a/www-client/dillo/dillo-9999.ebuild
+++ b/www-client/dillo/dillo-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
@@ -30,7 +30,7 @@ RDEPEND="
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	png? ( >=media-libs/libpng-1.2:= )
 	ssl? (
-		mbedtls? ( net-libs/mbedtls:= )
+		mbedtls? ( net-libs/mbedtls:0= )
 		openssl? ( dev-libs/openssl:= )
 	)
 	test? (
diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest
index 60dbd1294692..b7112568e47b 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -1,2 +1,2 @@
 DIST falkon-24.08.3.tar.xz 2635964 BLAKE2B 07417017ee93f598749048d331827904d2cb7406ee9bac5da77bddc720e7c3131f655b6cb6ef35a84db73e62a11f435d347841047371590d4a889e44946a2706 SHA512 1c6020d805668de38be95f9d63a07c5b6eafb200b6b181d59c791a145ffb8926c5ecf5feb9f46c5d69deb682692574b8a557271d08f945cf1a52c1eee7b2d55b
-DIST falkon-24.12.0.tar.xz 2652572 BLAKE2B dced89f4a7d95bc97c7bfd60e42efca392c9d9b9d7bb87501e44df74b2cc1e34cd7fe1f86e80f31d70db986d0bb22089b58dd4955e75a386745c8cd3dd8cc6fc SHA512 5509c8e3c6910902bdc8237d8a71755b6851613150df1d85584dbb177d3ce67edfccc0273d6ae65fce80502aaef976c7e2d6dc1b3cee7b3a3f85fbb15fedf4f9
+DIST falkon-24.12.1.tar.xz 2654264 BLAKE2B ed9e70aea4caf20da69795997e55d44c4b9fe1c0ca40b7b4296195a0b602103131184c886bde7793b59822caae6cc315af380810eb30ef707b5d0b5a294a142f SHA512 b990f304f82ad5663f62585727b2eea7f2c7702d08c7a0b299f6890090f76e968cc9ba6100a6787e74d7d77edac0aafccc6792f08250613c0ece3f8c17fde448
diff --git a/www-client/falkon/falkon-24.08.3-r1.ebuild b/www-client/falkon/falkon-24.08.3-r1.ebuild
deleted file mode 100644
index 4da6bc55c8ea..000000000000
--- a/www-client/falkon/falkon-24.08.3-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-PYTHON_COMPAT=( python3_{10..12} )
-inherit ecm gear.kde.org python-single-r1
-
-DESCRIPTION="Cross-platform web browser using QtWebEngine"
-HOMEPAGE="https://www.falkon.org/ https://apps.kde.org/falkon/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="dbus kde python +X"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test" # bug 653046
-
-COMMON_DEPEND="
-	dev-libs/openssl:0=
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus?,gui,network,sql,sqlite,ssl,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
-	>=dev-qt/qtwebchannel-${QTMIN}:6
-	>=dev-qt/qtwebengine-${QTMIN}:6=[widgets]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	virtual/libintl
-	kde? (
-		>=kde-frameworks/kcoreaddons-${KFMIN}:6
-		>=kde-frameworks/kcrash-${KFMIN}:6
-		>=kde-frameworks/kio-${KFMIN}:6
-		>=kde-frameworks/kjobwidgets-${KFMIN}:6
-		>=kde-frameworks/kwallet-${KFMIN}:6
-		>=kde-frameworks/purpose-${KFMIN}:6
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep "
-			>=dev-python/pyside6-${QTMIN}[designer,gui,positioning,webengine,widgets,\${PYTHON_USEDEP}] \
-			>=dev-python/shiboken6-${QTMIN}[\${PYTHON_USEDEP}]
-		")
-	)
-	X? (
-		x11-libs/libxcb:=
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
-"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	DEPEND+=" >=kde-frameworks/ki18n-${KFMIN}:6"
-fi
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtsvg-${QTMIN}:6
-"
-BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
-
-PATCHES=( "${FILESDIR}/${P}-fix-printing.patch" ) # bug 945887
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_KEYRING=OFF
-		-DDISABLE_DBUS=$(usex !dbus)
-		$(cmake_use_find_package kde KF6Wallet)
-		$(cmake_use_find_package kde KF6KIO)
-		-DBUILD_PYTHON_SUPPORT=$(usex python)
-		-DNO_X11=$(usex !X)
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" # shiboken_helpers.cmake quirk
-		-DPython3_INCLUDE_DIR=$(python_get_includedir)
-		-DPython3_LIBRARY=$(python_get_library_path)
-	)
-	ecm_src_configure
-}
diff --git a/www-client/falkon/falkon-24.08.3-r2.ebuild b/www-client/falkon/falkon-24.08.3-r2.ebuild
new file mode 100644
index 000000000000..e6874c742db9
--- /dev/null
+++ b/www-client/falkon/falkon-24.08.3-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=6.5.0
+QTMIN=6.7.2
+PYTHON_COMPAT=( python3_{10..12} )
+inherit ecm gear.kde.org python-single-r1
+
+DESCRIPTION="Cross-platform web browser using QtWebEngine"
+HOMEPAGE="https://www.falkon.org/ https://apps.kde.org/falkon/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm64"
+IUSE="dbus kde python +X"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test" # bug 653046
+
+COMMON_DEPEND="
+	dev-libs/openssl:0=
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus?,gui,network,sql,sqlite,ssl,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtwebchannel-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6=[widgets]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	virtual/libintl
+	kde? (
+		>=kde-frameworks/kcoreaddons-${KFMIN}:6
+		>=kde-frameworks/kcrash-${KFMIN}:6
+		>=kde-frameworks/kio-${KFMIN}:6
+		>=kde-frameworks/kjobwidgets-${KFMIN}:6
+		>=kde-frameworks/kwallet-${KFMIN}:6
+		>=kde-frameworks/purpose-${KFMIN}:6
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep "
+			>=dev-python/pyside6-${QTMIN}[gui,positioning,uitools(-),webengine,widgets,\${PYTHON_USEDEP}]
+			>=dev-python/shiboken6-${QTMIN}[\${PYTHON_USEDEP}]
+		")
+	)
+	X? (
+		x11-libs/libxcb:=
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	DEPEND+=" >=kde-frameworks/ki18n-${KFMIN}:6"
+fi
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtsvg-${QTMIN}:6
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_KEYRING=OFF
+		-DDISABLE_DBUS=$(usex !dbus)
+		$(cmake_use_find_package kde KF6Wallet)
+		$(cmake_use_find_package kde KF6KIO)
+		-DBUILD_PYTHON_SUPPORT=$(usex python)
+		-DNO_X11=$(usex !X)
+	)
+	use python && mycmakeargs+=(
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" # shiboken_helpers.cmake quirk
+		-DPython3_INCLUDE_DIR=$(python_get_includedir)
+		-DPython3_LIBRARY=$(python_get_library_path)
+	)
+	ecm_src_configure
+}
diff --git a/www-client/falkon/falkon-24.08.3-r3.ebuild b/www-client/falkon/falkon-24.08.3-r3.ebuild
new file mode 100644
index 000000000000..77b5e21cab13
--- /dev/null
+++ b/www-client/falkon/falkon-24.08.3-r3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=6.5.0
+QTMIN=6.7.2
+PYTHON_COMPAT=( python3_{10..12} )
+inherit ecm gear.kde.org python-single-r1
+
+DESCRIPTION="Cross-platform web browser using QtWebEngine"
+HOMEPAGE="https://www.falkon.org/ https://apps.kde.org/falkon/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="dbus kde python +X"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test" # bug 653046
+
+COMMON_DEPEND="
+	dev-libs/openssl:0=
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus?,gui,network,sql,sqlite,ssl,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtwebchannel-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6=[widgets]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	virtual/libintl
+	kde? (
+		>=kde-frameworks/kcoreaddons-${KFMIN}:6
+		>=kde-frameworks/kcrash-${KFMIN}:6
+		>=kde-frameworks/kio-${KFMIN}:6
+		>=kde-frameworks/kjobwidgets-${KFMIN}:6
+		>=kde-frameworks/kwallet-${KFMIN}:6
+		>=kde-frameworks/purpose-${KFMIN}:6
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep "
+			>=dev-python/pyside6-${QTMIN}[gui,positioning,uitools(-),webengine,widgets,\${PYTHON_USEDEP}]
+			>=dev-python/shiboken6-${QTMIN}[\${PYTHON_USEDEP}]
+		")
+	)
+	X? (
+		x11-libs/libxcb:=
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	DEPEND+=" >=kde-frameworks/ki18n-${KFMIN}:6"
+fi
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtsvg-${QTMIN}:6
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+PATCHES=( "${FILESDIR}/${P}-fix-printing.patch" ) # bug 945887
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_KEYRING=OFF
+		-DDISABLE_DBUS=$(usex !dbus)
+		$(cmake_use_find_package kde KF6Wallet)
+		$(cmake_use_find_package kde KF6KIO)
+		-DBUILD_PYTHON_SUPPORT=$(usex python)
+		-DNO_X11=$(usex !X)
+	)
+	use python && mycmakeargs+=(
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" # shiboken_helpers.cmake quirk
+		-DPython3_INCLUDE_DIR=$(python_get_includedir)
+		-DPython3_LIBRARY=$(python_get_library_path)
+	)
+	ecm_src_configure
+}
diff --git a/www-client/falkon/falkon-24.08.3.ebuild b/www-client/falkon/falkon-24.08.3.ebuild
deleted file mode 100644
index a24a2e1de13c..000000000000
--- a/www-client/falkon/falkon-24.08.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-PYTHON_COMPAT=( python3_{10..12} )
-inherit ecm gear.kde.org python-single-r1
-
-DESCRIPTION="Cross-platform web browser using QtWebEngine"
-HOMEPAGE="https://www.falkon.org/ https://apps.kde.org/falkon/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-IUSE="dbus kde python +X"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test" # bug 653046
-
-COMMON_DEPEND="
-	dev-libs/openssl:0=
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus?,gui,network,sql,sqlite,ssl,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
-	>=dev-qt/qtwebchannel-${QTMIN}:6
-	>=dev-qt/qtwebengine-${QTMIN}:6=[widgets]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	virtual/libintl
-	kde? (
-		>=kde-frameworks/kcoreaddons-${KFMIN}:6
-		>=kde-frameworks/kcrash-${KFMIN}:6
-		>=kde-frameworks/kio-${KFMIN}:6
-		>=kde-frameworks/kjobwidgets-${KFMIN}:6
-		>=kde-frameworks/kwallet-${KFMIN}:6
-		>=kde-frameworks/purpose-${KFMIN}:6
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep "
-			>=dev-python/pyside6-${QTMIN}[designer,gui,positioning,webengine,widgets,\${PYTHON_USEDEP}] \
-			>=dev-python/shiboken6-${QTMIN}[\${PYTHON_USEDEP}]
-		")
-	)
-	X? (
-		x11-libs/libxcb:=
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
-"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	DEPEND+=" >=kde-frameworks/ki18n-${KFMIN}:6"
-fi
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtsvg-${QTMIN}:6
-"
-BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_KEYRING=OFF
-		-DDISABLE_DBUS=$(usex !dbus)
-		$(cmake_use_find_package kde KF6Wallet)
-		$(cmake_use_find_package kde KF6KIO)
-		-DBUILD_PYTHON_SUPPORT=$(usex python)
-		-DNO_X11=$(usex !X)
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" # shiboken_helpers.cmake quirk
-		-DPython3_INCLUDE_DIR=$(python_get_includedir)
-		-DPython3_LIBRARY=$(python_get_library_path)
-	)
-	ecm_src_configure
-}
diff --git a/www-client/falkon/falkon-24.12.0.ebuild b/www-client/falkon/falkon-24.12.0.ebuild
deleted file mode 100644
index 4322d900bde0..000000000000
--- a/www-client/falkon/falkon-24.12.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=6.5.0
-QTMIN=6.7.2
-PYTHON_COMPAT=( python3_{10..12} )
-inherit ecm gear.kde.org python-single-r1
-
-DESCRIPTION="Cross-platform web browser using QtWebEngine"
-HOMEPAGE="https://www.falkon.org/ https://apps.kde.org/falkon/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="dbus kde python +X"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test" # bug 653046
-
-COMMON_DEPEND="
-	dev-libs/openssl:0=
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=dev-qt/qtbase-${QTMIN}:6[dbus?,gui,network,sql,sqlite,ssl,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
-	>=dev-qt/qtwebchannel-${QTMIN}:6
-	>=dev-qt/qtwebengine-${QTMIN}:6=[widgets]
-	>=kde-frameworks/karchive-${KFMIN}:6
-	virtual/libintl
-	kde? (
-		>=kde-frameworks/kcoreaddons-${KFMIN}:6
-		>=kde-frameworks/kcrash-${KFMIN}:6
-		>=kde-frameworks/kio-${KFMIN}:6
-		>=kde-frameworks/kjobwidgets-${KFMIN}:6
-		>=kde-frameworks/kwallet-${KFMIN}:6
-		>=kde-frameworks/purpose-${KFMIN}:6
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep "
-			>=dev-python/pyside6-${QTMIN}[designer,gui,positioning,webengine,widgets,\${PYTHON_USEDEP}] \
-			>=dev-python/shiboken6-${QTMIN}[\${PYTHON_USEDEP}]
-		")
-	)
-	X? (
-		x11-libs/libxcb:=
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
-"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	DEPEND+=" >=kde-frameworks/ki18n-${KFMIN}:6"
-fi
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtsvg-${QTMIN}:6
-"
-BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_KEYRING=OFF
-		-DDISABLE_DBUS=$(usex !dbus)
-		$(cmake_use_find_package kde KF6Wallet)
-		$(cmake_use_find_package kde KF6KIO)
-		-DBUILD_PYTHON_SUPPORT=$(usex python)
-		-DNO_X11=$(usex !X)
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" # shiboken_helpers.cmake quirk
-		-DPython3_INCLUDE_DIR=$(python_get_includedir)
-		-DPython3_LIBRARY=$(python_get_library_path)
-	)
-	ecm_src_configure
-}
diff --git a/www-client/falkon/falkon-24.12.1.ebuild b/www-client/falkon/falkon-24.12.1.ebuild
new file mode 100644
index 000000000000..46095f11fb25
--- /dev/null
+++ b/www-client/falkon/falkon-24.12.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=6.7.0
+QTMIN=6.7.2
+PYTHON_COMPAT=( python3_{10..12} )
+inherit ecm gear.kde.org python-single-r1
+
+DESCRIPTION="Cross-platform web browser using QtWebEngine"
+HOMEPAGE="https://www.falkon.org/ https://apps.kde.org/falkon/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="dbus kde python +X"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test" # bug 653046
+
+COMMON_DEPEND="
+	dev-libs/openssl:0=
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus?,gui,network,sql,sqlite,ssl,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtwebchannel-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6=[widgets]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	virtual/libintl
+	kde? (
+		>=kde-frameworks/kcoreaddons-${KFMIN}:6
+		>=kde-frameworks/kcrash-${KFMIN}:6
+		>=kde-frameworks/kio-${KFMIN}:6
+		>=kde-frameworks/kjobwidgets-${KFMIN}:6
+		>=kde-frameworks/kwallet-${KFMIN}:6
+		>=kde-frameworks/purpose-${KFMIN}:6
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep "
+			>=dev-python/pyside6-${QTMIN}[gui,positioning,uitools(-),webengine,widgets,\${PYTHON_USEDEP}]
+			>=dev-python/shiboken6-${QTMIN}[\${PYTHON_USEDEP}]
+		")
+	)
+	X? (
+		x11-libs/libxcb:=
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	DEPEND+=" >=kde-frameworks/ki18n-${KFMIN}:6"
+fi
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtsvg-${QTMIN}:6
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_KEYRING=OFF
+		-DDISABLE_DBUS=$(usex !dbus)
+		$(cmake_use_find_package kde KF6Wallet)
+		$(cmake_use_find_package kde KF6KIO)
+		-DBUILD_PYTHON_SUPPORT=$(usex python)
+		-DNO_X11=$(usex !X)
+	)
+	use python && mycmakeargs+=(
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" # shiboken_helpers.cmake quirk
+		-DPython3_INCLUDE_DIR=$(python_get_includedir)
+		-DPython3_LIBRARY=$(python_get_library_path)
+	)
+	ecm_src_configure
+}
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 854d02953219..1201b3de20a1 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -95,6 +95,103 @@ DIST firefox-128.5.2esr-vi.xpi 673227 BLAKE2B 82ce1ab2302defa025b4cdbf2ac5c161e1
 DIST firefox-128.5.2esr-xh.xpi 418471 BLAKE2B 8a79bc0d5fe75f202ac8f360597972dd18df110f780a1eb52706e0b8785056bbc3fa060ef19bd3c1cf4b89d0f9756524e9bf8705b7ab391b3188146ee920499f SHA512 7d7595ebce9862136b7a484e00f8746ae50265b6a23b9dbf5128e9c342ba5c56b1efcfbd61582011cc8d88e9ac543b8f11f266cf1854ed18b63933e21c5f757d
 DIST firefox-128.5.2esr-zh-CN.xpi 675193 BLAKE2B 7004692438b358a9c8510964f50799782bd60e83133fca53a13eca5662ef01b771b7fac7a44486a88b388938b51074efaa5b943c495d3f9054326430283c33e2 SHA512 b61920aa802aa5679dca274899a6b97f846ebc221cd5a111cf2be217d9579cfb595fafee93d8e0c4eb67e19f79921e902ffcd84be90e6fd96d258ae1647de7b9
 DIST firefox-128.5.2esr-zh-TW.xpi 677421 BLAKE2B 531da7844db037a22c4671c11dd647f3d9d0497597012f7c0247188fd5a79389c5dacd8a7da8fbe748599ac8057064b410022843bdc39a87a8817272bfc3720a SHA512 3c789734b539984435210b24fae49facce506757f45888136e46c67bf7446e7d3adc67d2153a5354e58fca858eab2ebef884d666b74dcf9bf654f3fa41cb5f8a
+DIST firefox-128.6.0esr-ach.xpi 465504 BLAKE2B 857c044f90e951128b9d7a9dcff9fb535ba4cc3ee7d5684436f9d74c0d5fac992bacce11c77f34a08e4ec01a88856d79915ef50d6b237c18dd061e6520533e1f SHA512 c3d2ff31056794ab936fe3bb9cf8f83517a2366a03018d2cf8852e07f1fd2a0249362d5c010e24db63670811142c90bb10bd3375cb6904686bbe5b361392bda3
+DIST firefox-128.6.0esr-af.xpi 418826 BLAKE2B b4b10cfd93a6b1e6c9b01c75381385fcaf3103574df7669c24ca2940a380c1e3d4ff8df980d3f5f2fd0eb7e6f8301b41c2bead66435e1c5413f31686a7dd684f SHA512 24904f5d1344482625c94fdff3b54dc93307aa394b65d07418677805eaf58744ad0e9c2efb93936e1e0113ea32bf2645f65319c3d5c633f7051b746bac7a8fe0
+DIST firefox-128.6.0esr-an.xpi 508453 BLAKE2B 63d6aa8c405e11cf50e01f0066d2fd26e9385ecdf740522202e419e6164a9f6f6aea6dc928881ddebfd076591604d81dbc6ecb0a90edf544681b9bce85a7d567 SHA512 4018f9c6ae66c3ef81c8dc2302725b8bae72369e2b7ee94cb5aaff1b88a2624e6d489bd0ef5cc0a421fa1822ea0c8e2261e5d10815a3d2e91489b34d86db8ebe
+DIST firefox-128.6.0esr-ar.xpi 630815 BLAKE2B 7716b1343ab0967907411714dc13ab547248c6bd892ba990562b50aac39f1f2652736a2d6ce70847292318c57cb8939a581f4f64f261adbe51d5289bee983e1e SHA512 a2e9b2c97e5e79d2353fd5a481d1aae4e1141e1b69df19d6df5831416d1518e2c05d94fc3e80ed8cafbc0d055c7151b3cf9595db77c9514661184d73500602de
+DIST firefox-128.6.0esr-ast.xpi 497758 BLAKE2B 80875b9c913e53bf118902559f54dd25bbb719d8d15bc88f25c03978d1bb43fe9a1fd2db7d2a9621a0dab8ff66adfa897c1e3cdbac64badad4746e4ff557a640 SHA512 aaa2ecb2c98aafc045d39aaf90b4299e30586af6f575a7a6b065cb1f2abc2af5080f33e01592536a4092f2a346b8947af9e87c6751aa1657801abf7af0168ca1
+DIST firefox-128.6.0esr-az.xpi 492191 BLAKE2B fcc5825ba3c7b3330bf648acb6ae19cfb1a501247d774da47cfbb085a8099a0e565bdf27913750c8fcaf68c4b78d39effcfcf3d97cc6b60d2d29fbcec90a6134 SHA512 7fbc47590f755b9f1e814ad5986cde3a33866d0543beb50fa4200e15e342c938a91c1b1a2b8232a523499d941f48b7b78fce0c29fd6fb775efbebf58f53eb36b
+DIST firefox-128.6.0esr-be.xpi 731591 BLAKE2B 567a192258f0e99d8f088fadfaac2f1b79cb97cb5dcdfadf042f54e68841c62533ec3ee8d55e9f24eb5283e415bfb57361986c5b57cbd75a82068d709e5fb463 SHA512 bf0e480f65b4731716584830adca8453cb9300f208bcaab9dfe7dfa6d80bbe6f07b97febdc8870ef8607b534bf959f340867899e36bcbd1c5ef0b7083f95e5bd
+DIST firefox-128.6.0esr-bg.xpi 647391 BLAKE2B 1bf8dbfc1afc3e0e6ca878f378201994e147fc8841644b774d2941ad8cf42dbefa36d88692ae869455a4e97a10a2336b0b1ef691462eba508210034cb1dab2c1 SHA512 bf925585c15ee62b945cbf347e45e2fc2a5f429761d43c84a56a6aed307492e6da8dd3288a2ad988cc7d9f65043244d45572ccd35f6f433eac4db12fad4fdda9
+DIST firefox-128.6.0esr-bn.xpi 582957 BLAKE2B 8ba95dc85bcaec8e337dd2c35985a485d1f565ef2d83f9fd29b4a232684dd6614f6676e2d778468686634b68df4ba3388a63bd17ab908e1f19dac7dca270428f SHA512 68e2ad66267936f96005f0d2c23611fc824203beea7f2d444d9b7f59ecbe96031a9dbbac6037988363fd4e1883bda7ad186c5c863d4442fb27ae810d3699d40d
+DIST firefox-128.6.0esr-br.xpi 595354 BLAKE2B 473fc7786989fcfedda4e7bde73da2e5bad739e15b61557f3b9c99baa13eef83de62301472d185a5dae999d938c4b6347458c06707fc74f81df02dfcac1d31a5 SHA512 0e48a1a8945770f5237c1ec4c531a8aacbe990a46279c0729c0854ef6bc12ed947a13d2360f16094c402bdeda02c30c9304cc87cf121610bb98183b106defb28
+DIST firefox-128.6.0esr-bs.xpi 515708 BLAKE2B d9611ba1573c73f8026c1930a91f0113a84e294a1691718633ed45d7d911d2f74fabc4e4cd0e2ec5fb0128f49a905e99fe4c9fa047d20f8d806264cf87c4bca5 SHA512 ae15bd9f602aef8c0748ed104ae59ae1e3ab10e7a1b01c48f246ae6614f8327a0d1a70d82822221b7ead31e8716e3c6e165817c676a2b986d1a0ade54ee592af
+DIST firefox-128.6.0esr-ca-valencia.xpi 547675 BLAKE2B 22feb1b9f49a93e7e9bc429a205745725cd5273c7672a89bcec0484ce22bf38e1213e8a055c7b0390495bd703f5d05317440f48eaad4a5fe0ff4d431f4b4bee1 SHA512 16a8c9cfbd95b5341486496fceec363e1b4b9321e1430ef7286fa254ad0dc6ad9dd14f85f213ca2f66d7859d9e31e8cd7e2cf9733ce662e7655d5a2b0bc55722
+DIST firefox-128.6.0esr-ca.xpi 599206 BLAKE2B d2b9f3c9569bae1ff5aafd301ba023feb2cb58026855b629eb848c109cfd377449fda7b17c818b5602c77767e1f88dc3125df8ff9aeebc719c2328088de55f3e SHA512 22fd4d70bc61568d4fa8c37501a16a4505a03fb49182bbb3e22c091b83903aaa32d53720c0cb3cdfabbe67a2ab5bc7fc31bae79d1f5f6db8b6ff48f8f664b6b6
+DIST firefox-128.6.0esr-cak.xpi 594640 BLAKE2B cb68c2ebe84378c9268f5a849ead273bbfa1674a330eb3211fbf282067ab2f30767c6c2a5608ad1cb2be4a552b21e92df17427dcf51eb03716113094606cfd3a SHA512 9332eb8e66cc5e24090caef1b4f93d4a2634ee8458984db048634a412267bd582519cb9952004d15110124dd91649f7cc79f756489544987d5346a68b75dd953
+DIST firefox-128.6.0esr-cs.xpi 675114 BLAKE2B f7a3039c32b801837153571e7ae0d44f53323bba1b6cf0df1b341b0d4ba20e2ed2ebc0cce52255d515ee9b35287b3082de3603317f6a9d306c4657c7e9b46201 SHA512 d6686ef7e2f3b0b734f26a27d4915e8341eff94909316a941ee885bee4a96c41691907561df4223bdb22dd4fcc018c07a5ff5b4363838586007db2be5ba553c7
+DIST firefox-128.6.0esr-cy.xpi 641501 BLAKE2B 2c9004e4c04982c31ab23cb8728b84ce5ee31484488bcb998b9662ba4dbe9a6137f7dfff5afefd52b25757375891cd83cf9cf35489268c079e6f71e742ccafda SHA512 a232f9eca3180a6f8161bf634c1052433561a951eaea8d77ac5ccd856e422782ad4334f755b8c8f4b010744cb3f02c10b2e7af9d4aba102034a3de2d78144b73
+DIST firefox-128.6.0esr-da.xpi 624946 BLAKE2B 2c08f5edd374422fb68cfb3e081dbc07448d980de1a1ddbfb22bb86c718972bd8455520f95db079143ebbf15cb6d8c6ef59285eea24ef2be8daaa98d024a5d7d SHA512 2cfa41910a873e9bc6e751dcf9e89e93a1b0922fa2640537105938110fe86fbcbedd0219a8bbbcfd25a80ffa7a6b49f50e287542072b0d80998a6b8eaf55db7b
+DIST firefox-128.6.0esr-de.xpi 647909 BLAKE2B 6ee4e7b6ce49114594f2b433b55f705a5f7e674659176a0a5751e0e7785b416187fc68de98710d27009e32138d1d7d8c0245b433ab83d4f225bfe146d6be52be SHA512 27eb856cb97d676cb83fcf543b52dc122f6e6b76cf9adacc8f344cc28b2deb2d7b09ccc068b4c6f498e7e453d72ee74d558d804b6dcf9126f3ed8b9b0ea2b56d
+DIST firefox-128.6.0esr-dsb.xpi 667675 BLAKE2B 1a548b5312ef452c8855e68c5d0fc86ed80afbd04a19b94c25e7c79ee80cfa6f36329cdcbd4609ca0f2b37ce2f0e1b63f25522101deaca0f9c7c389dc474f5b0 SHA512 6d497300803deac950efd51a5ef03e287c785800b3a46d67b68757f2b479e19830d08e5eeaf6d56883944a954ba5f7ffc214d18bc7bf68709b435e6099b9ae80
+DIST firefox-128.6.0esr-el.xpi 752467 BLAKE2B 5b290f3866ec26a2fe93618bbb8b9325a1f3babcafe9c9b10a907472dd0f29831ce1467889eb8cf8dd1798405a22e7ceb6095b59836f59bab1043166fd8ee9f5 SHA512 aa71e4b1e6e4a34b35f9bb410e3960c6a2eb3b1599d8d3d9f91fee70dc8d18d66f985522305c1a909b5cabd1de78e5e99ff4ed63068fd0f35ffd055abb940b83
+DIST firefox-128.6.0esr-en-CA.xpi 597230 BLAKE2B b2211eb4fc5f0286d80a61645185621bbdf28da27fe5a4598b8c02655a3df396765afa1f120910c3a2010fcb220ab84dadf92e73e9e7fa05f4b8ea834f61c86e SHA512 780ebb6403a77f1de24ab6cf150a83d540bbce0e79eb66aea47a4cb2b89ea65bd02f554d0762119c17265efa0ab42098b26f23dd65e43d48daa836d2233e914c
+DIST firefox-128.6.0esr-en-GB.xpi 600789 BLAKE2B a56509c7bc959c4aa637ca479730ac528e5ece613d310d3c7c7c50528625113c0f1ed58e9a89d813ca557c78e07c89cf6fd5aba9980daecf5705a2a138dba931 SHA512 506c6e4494955e811ccb51d8a96edface042767f70ab4d8d54016a8386afe81ad4c4778a6769ac4c09138dad993c6626a85791d5821f7d6afdd437fe3db2c34f
+DIST firefox-128.6.0esr-eo.xpi 628843 BLAKE2B 10c3c92c17f9615e762f0eae0bc7779261e40a97b595d33e5d0291ae151e178d146d895a9991f8b6853d02242dcebe3f6e828023b7608abf3eee5985b128d96d SHA512 653d3f2cb16471b32c47d46c08b2b4b011aabfd2c52e02e994ecca85e728143e04ec4abb0d4f446de6257c554eb22b94011231264729a4f52a70cf4447077371
+DIST firefox-128.6.0esr-es-AR.xpi 644956 BLAKE2B a825e1af97cdef7823e98587ac931e77dcbb8ef09af0b2904f15e18ecfaac0bddbe62926711b5e826fe1db30f1f3b72d3a9eb58a1730ea649a120231388dcabd SHA512 c0431df8b855a631ae822d90e049bdf85b97f5c0f59119407a19178474f84e6da76598c99d23601def729a16bc9f9d4a208638ce9e98636101220ac2340b342c
+DIST firefox-128.6.0esr-es-CL.xpi 644429 BLAKE2B fce77e57b5f8f5fd988ed9ce4e9893e69a6ece12a595739679c3adf5d726877e76e334d62343cf29db990b325d195c7664cc8f2e18fbff618fe801e4b5ff98ef SHA512 579dd240a25efb4cb89b650f9fca4395ebc9e5e02596fb397cb33fb08bb2c809dc88fc8f9fd2e62783773074c972088b684bb5b566d9adfd06533392bee87836
+DIST firefox-128.6.0esr-es-ES.xpi 637338 BLAKE2B 4e8e7cba5dba5154172d61aeda56679935e616daa4d6ff0bd337cbf71f75a8eb1d012e76518a783cac94d229228b8a10de0e193fc58d8ef1ed77a2e6af057b29 SHA512 79cee18ea8b0a6c58ca67e45a2de60275d459f906c6dd5796d1d1c0f3455b4a89e9e8ea5d55e058f7c5213dbc88ebce51683da637114727edca6299b71b33263
+DIST firefox-128.6.0esr-es-MX.xpi 638917 BLAKE2B bc7508a6ee1d7b4d6626e705371d70f920f24bd73a985dd763c9c1aa86e59c25e728b7af46a96f2390dcfc229fb6addcce6e1edae12028d5c84c99fa384b61d8 SHA512 21b37b22ee6c3d8215af1fb8f20232a43eb67e47da15c8c6f32d21c7f69d2fc83fe7862cc1001a06d7f2ba20c48bf71acfb78792c0d25e30867c18bd2796e01e
+DIST firefox-128.6.0esr-et.xpi 541122 BLAKE2B 519f09a25188664c84b2bbd8c55f54e2da4f690447a602d4263fec3c2d2680430e5c01791dd619b1f88a108110d9d47b76d293a32218a1b7dc8cd0127c0e57df SHA512 534ca55968f2894d2fb24e9abd676feb6c99b76d44a52cd37299e45578c8a4db8dfae12d3649d8ba312abb03f3167c9019b5f86ea38a1ae262528d2fa8b8a201
+DIST firefox-128.6.0esr-eu.xpi 612330 BLAKE2B ccb09539a2cef5c8ec62de66cdc03534d74e054ce1a53e94927629ade8c32b4ed154dab0ad518bf81f2943686ec434f6287b29035f319afabdc7034447d40d60 SHA512 2c0ed6e2fb0a2bdf78c99f071ea37eb36628310644b45edc324f4b5201ccccd024f85faeeab6f17705900881251b9dbfec6c52f496df0d2acaae78476d232634
+DIST firefox-128.6.0esr-fa.xpi 593837 BLAKE2B 4bad4e83ecb7e1671c052b118e9ae78d9206f85054c7cd4f5303cb5f9b71aa5e69521a4c592c9db0dc882d57de2013dea8750782579dffae0d0982eba038b889 SHA512 0930a2720bdb15653c1f82e5821176d7ed8177361f243545464818a65c9d5ac3aacd6cede451dc8257402922658a29d37107281f1f186e915a9b371f09bf8f32
+DIST firefox-128.6.0esr-ff.xpi 477477 BLAKE2B 1597e6a91c1eb0a14b991cc230314ec8dee458c6036d06ea24cb366020eda1f27e40141db0a35f17f91fc841260b8ff44c084e3ecf53784980af322ada2c836b SHA512 de6a0f1faa810ee6e150776107bfc6ddf81a98919fea265a9071b515ddfc934c7da2c8e105a6e5a989b5e4e5c857944dc2f4199b70d144d148f0bad0bc135727
+DIST firefox-128.6.0esr-fi.xpi 623010 BLAKE2B f186c84b54ad5a99712ce969a0debf34e21dce68f2f8ea99e2a514b51be95b1f97e4c46b419562bc5559037933f66aae49af8743d2a40325306511f817e130fc SHA512 5baaa8fd6caa7d61ea8abca1245c651dd810861b34687dc9cb2b4d93d42195f40e6302b31917be478cd93fb6c3ca0142206650822f55ff33424c86babee5619f
+DIST firefox-128.6.0esr-fr.xpi 655850 BLAKE2B 2533380d72f00be9ffe7682c347cccbfd9262b59b6048fdcecdbb43a533b8b3f86d1a88dd65e8e0b1d366f3c02ac76e674b39eb138618f85b94b62f694466adc SHA512 8e3283c68ab189eba0b17067654a115b8419a7394ecf5f219ffa274fb84ad4f0ef8d886c0e91a3f84a65477ba706d8f3e2e57b2f6c6b16889247b1864b806a71
+DIST firefox-128.6.0esr-fy-NL.xpi 640610 BLAKE2B d9130a3ea8e6933bd621010a3c6f570570b362f7b11a44e8b15879af8350bd09d1fca9472ac29b779a4fd3f8f2138f45d98934660961fc7df14c36d2a2991053 SHA512 3dc3b9e4e59c9e78b3f18c576b2224ffdb4f56c9b4a40b2783c9b853fdbd6fe1b6d285102c84087258d17a45e6a9f8cec6c08917052869d5aa4b750416411e23
+DIST firefox-128.6.0esr-ga-IE.xpi 472337 BLAKE2B 5e37c28bdd64c69afdf2ca5ccf3bc1f6d2eb6e652b14a3d05f744e9f459b5fce375f0deadf60e34fba5d3f12d57d533c26a9f1a98184704dc6e6d35ba674f2cf SHA512 fba47ee2628e4da5d069092cf8877b9c1ad5eb30722c3925148dbb20828d87abaf584ebe24d32e8cd9ca96449859da9e22bf7252050453ecf17882110f4d7def
+DIST firefox-128.6.0esr-gd.xpi 598312 BLAKE2B 2cb61bcb98c48b0eac93171c3f6b6c290081f5d242e4499f56bad8aed351b9fdfc5143ff877734b78896d88f126be4d42e34dffe09d98802620478e7e64bd8bb SHA512 43e2df032788c147ddd0a39a00952656fa42fdd69ae08b9744e73c7ff91a315c30dadaf44328dfc12e0007ed0aaa1274a425cd3de78af5b3c3ff6e07a626fb0e
+DIST firefox-128.6.0esr-gl.xpi 609640 BLAKE2B e171fb79edba97be1e7eb45d2845497003db664a9acf377e109c854767bffcac7c9e9174b9c1cc9730c373c95245c1aa4db5976362127c14c5a4b86a1275380d SHA512 14c14b64c90560fdb768752295df53eae0def47964e146e7264e48628e5ef38e670484f7bfc948d071a0e783c29dc68ac34849be86bd98a669e2eeb9e99c6b3f
+DIST firefox-128.6.0esr-gn.xpi 652882 BLAKE2B da66349f0d3c356eb40470c4235db1d5dae37e945af667404076b6d08b1a594e3db4bd58a76eec3629a6c43a01da971f4717355b850218b939768be433371974 SHA512 68742e9ef1f8dc50f45d0c73d7f3fad5920912e78de8eb4454b4f0436014a0b46520e87ac82436dc1e1bad90dbbb2f53412463a8b5656ca3c9cd141b5e10b298
+DIST firefox-128.6.0esr-gu-IN.xpi 528786 BLAKE2B e2538e33e7790470add24e3aeb11955ff7321adfd373a3f2d64a915170eafcd2a2e6f244dc6597ab4b03f599591f7cde11195a0b7ef7b3bb4ec8ca85bff9e938 SHA512 04db30d7eeec3266dae78b7709e8b3c1445e00e3825d2790099954265b67db7b8308b03134bd386076fbdd1f7c4ab3fafe036ec77bd882e0058403414882431c
+DIST firefox-128.6.0esr-he.xpi 647291 BLAKE2B bfb9ee9d7b1aa9df99eeb8cc2025c65596c8519e134177ebdebdd48816af1c6062e9c594e805cd2389a3ef57681873bbc4e96ce498d5207b16f95f93ef03f8dd SHA512 a047f1d56b2fd682aa448b8da223ccfee005064104a7bf3304126946c49793cb808dcd7d52a9dd13301e5381d02bc5d66a25a8bb82801a6a985ea63d642d1517
+DIST firefox-128.6.0esr-hi-IN.xpi 568356 BLAKE2B 243b663b52d81e0d8fa614e9591ad54a918b2c534167bb4c48a9cb6d9172bf01769e5e84e7e00cae3d6f1f8f17fcb72d1c6d8d6b1649c48c6a65291c68f55941 SHA512 b94fd2dc53b5076650b2b783f4c9e7012a706fb207551067fe94327976030922571a2a6999115708136f3a954726c78ca16a727810ffaa9bff68f6090dcd00c4
+DIST firefox-128.6.0esr-hr.xpi 619158 BLAKE2B 6cbb1f616ee5620d84ae295c2c578e93cc0b43268552d7e891fce7944020bcd2b0d56a52a0a0405302990feffa57aae75623ede0d8cdd0e0cee8de0703076f4e SHA512 18ef34aa4ff4f317cd301d88a06a6398d4eb091134228ba175b6574678d364a991dffbfe8590434a2474ee302b2957fded13e41531eb947b052111f5b83eeb68
+DIST firefox-128.6.0esr-hsb.xpi 663552 BLAKE2B 008e7f2789d285a1fc19aea1141b57c0c372689848849413810454a742ab821dd7b9c2cce9791b749facb2bd5eaed817d080be1f83443bd2ca86be6250ecf208 SHA512 643622b993b2bf1376031cdf83e294a91793d2515e5f09f8b48658cbf898db48a9a6672579465adb881e11833c07e6988fb881cefdad8e206b71e9f95b6137e5
+DIST firefox-128.6.0esr-hu.xpi 667802 BLAKE2B e46b0ffb7f815182df21f84d3924e3a04334692a082dfbd4fbd56ce8f17d966a2b218a95e79ccd9896d4481e77838069b498780fffea3d16f83aa74f20b1bd56 SHA512 702059867a2fa6401c2174f17a7a07f8d63db3949f87a9ea37ac018e99f2913954251819e1229a50b576943a80582d769b7707e16cc2db593f6535e11aa38a0c
+DIST firefox-128.6.0esr-hy-AM.xpi 653028 BLAKE2B 5102591387703070ba95f3056f34beee4b54b4d024fac7aa9e63254d53584f5783e41dce590f9b7d5074be967882d8428f9206799aa822052cbd3cd6f91583c4 SHA512 9fa8b1682241494dafd934d6ab71ef23200925af1752da47d1d01da40d3639014bc2a6cfe404588f96c89d72a8308b13cb68078f364c0321ee07cd1e22d7c57e
+DIST firefox-128.6.0esr-ia.xpi 627658 BLAKE2B 41d6b428fe6171cc24efff3b006697c3f6273a37b99c1c48ee56244a3b49f763a54c6eaddc69001762267b99a926055f67825d0339d76b5a7807c4514de5e65d SHA512 e10aee1e1304f6b4db147940cfa5bd389b083274fc642720e45c2e96a51daf06753f63a8d7ebb966f58d35a0c4ef562bc82cbb913d3aa18c09aaf22fe79f3060
+DIST firefox-128.6.0esr-id.xpi 587630 BLAKE2B d676ae3cafff54eed30747e452becfe98df089e1d42157e17bb0104395a434c976858b72ae2097c43b4359dc89e4954d455db51f0c5e43678003cfb8ac18adae SHA512 449649c801ead408b28a308858b389de1e30bcd4a996b6d1c73119a9a26a7b8413a7177534610c82fbee4142a3b02f70cc71c4d67f5af5bba378a1ea20a98afe
+DIST firefox-128.6.0esr-is.xpi 630677 BLAKE2B b0f5248d89ad7fb50b7d544de20b1f95e00be9fb688d2e10f78f1710f9d71733f6fbcabe0ebecdfbbba4ad3337a6bd6524c2709bc54d799a3155bf7c9bf1ea26 SHA512 5c8a3e0849f49ef89eaf834d0982f033a3a407b4a6d1f96cf06487f8f57ea61862c4cca22112f5d83e81552f38b4f5a106348bfca0179e44de67984bd99f779f
+DIST firefox-128.6.0esr-it.xpi 584354 BLAKE2B 9a09d36382461a31d34b7c492d59a2c1225e773ebdc85e3d879caed1d900caba90717eeb52b5f0c46f56ce498f139e103021470b1aaca5ab986e389baea0b172 SHA512 5c43e6670cedcfc925e9aefb6e5f4815df0b3ed688cf3f904b92f73f89dd03c813f825731dd77d6ed4a136c864f4b72d511898f192552805a36ccdf4c41733aa
+DIST firefox-128.6.0esr-ja.xpi 691960 BLAKE2B 8e14f28f947b71af58a1bd4acc0bc33f56fce4c264332e09829109c9ad63c77c8aab3edd3924132dced379461874648d3eddb868846d3b328e552513c4cc3a89 SHA512 c89c58b262c530f68850bbaf869f66f59f1e0cbcbc40f60ea77052ba099f19ac9351873722b44d9c7a5ccba2f71c0a01d8261f712d85049cd7fbdb5cb290d68c
+DIST firefox-128.6.0esr-ka.xpi 662321 BLAKE2B 7596e3c4922209954da957ed5925c3e2a06453ecb48a0fa2bb8baf6294c1283dc013b243a1e12e56f59d7317c33ceec4983685bc82e8db6dcf03fdce33450909 SHA512 3d4edaf35ea639cc43a983cb8085cb842441c221ca7ae8caf677e5dea5bed8f5cfbde0df6cb0736518eaba751c9e4fa2d727db506b24e3f442dbc83b61a5bf8e
+DIST firefox-128.6.0esr-kab.xpi 619287 BLAKE2B c398f5afcefe2ae1058412728186d7c60f96239aae08c30ee55c18f6864f91303876930fddf568596035a150cb5c3bf07e100c737f2bb98aaa03fba00e8c8e27 SHA512 26f70d5ad34b98156b1a62979c27b1d0d7fe2f01a9b02c4a73ce5bacf9118cc72768f0c999d36bdb7591ef1557d5c0fc47df981281314184167d88d80536bc1f
+DIST firefox-128.6.0esr-kk.xpi 727329 BLAKE2B 2e5a2288126c12f6561ee4205f9336d44626768875cb533165e9e754e64ce8bff744a1b33835771501167031de59df0520895adccb34290539d6aed12265f108 SHA512 ece135953bb349ba1626ad48ef3f0cad4e568723afa97db4087d334a37389ae0f74290fd3237686d011779e470d745e02bf6b8f53b2191dfdfa423b2d8d58bf2
+DIST firefox-128.6.0esr-km.xpi 527177 BLAKE2B 2960a58929595048ff9ce18bc33a101e3f28ff092f273eedc7ee1a98a184e4d7190ea041083e31fdf8100b7975ac1bd623b14199a21bce5502f5bfa4bcce55f6 SHA512 5e72047111759d5959115cf0ac01fa84935cbd10c761ec74af097fb2fb647420afc0d1069cbc75462eccaf74dc59cbd6c57b84414bf9c5253cb0866a4aca005a
+DIST firefox-128.6.0esr-kn.xpi 492535 BLAKE2B 58aebbe2878a536b8a9dd09135c074873fa728abba40eebcf14a9056676a4dbb089b1edeb50ff8a7cf1e5a777dd1a681188e92f344209c4dbe50b7f42e0e152e SHA512 ba100dff5667a75e8391f26ea7f16d1e1a6fc92e3359165eeca25ac5403a884165d19fc2b8c41b4914f1344d10256017e878646d34ced7f05e3379d338c25353
+DIST firefox-128.6.0esr-ko.xpi 679383 BLAKE2B cbd9321527050e6bbc0ea77a7bc4c19b285d8b8f9fcbf7a888033f3428a6b20f5500977c946909f7e5b6d6e54732c1516177f1ef6f544c500f37cd092ae0c251 SHA512 099d04c79f6aa3bb601685d65f096d75f0aed84b59b140bd92ad5aa51c37f219a23189c8ea2c08b71e88247bc1cc82a8ab3ad9f23ad8210e549065850ad71c51
+DIST firefox-128.6.0esr-lij.xpi 485537 BLAKE2B 7bb433d1f5fcbc794909c721c9a15296187af6279b59991aaa06f8d09a7b116de7b4066ff6d2f9d1993c518551db2f89801ab5b0211b6d3c28ba555437d437de SHA512 db67752ec92df976344bebf418a2e4d88cd6fa1eb0ae330ddf26db4cc184679ad3ae427ba1e304ba1f52abc78b765ef01b67aec2b903c895ac003154834b43b0
+DIST firefox-128.6.0esr-lt.xpi 574119 BLAKE2B 2b2704e6202424669a26a3f9252337f09b5faa5e44b650308c6ad6650b8114204f9099f700feaff1039bf94928791cfa538e90bbf5f5b45863cc6f5ea21921c6 SHA512 082e579ae1ee15a3b859d09fed9459f18fab7890a74c57bc888e8fc0519ef91b90a78f5800041a869bd7ef48d2f4e38c16c309bda35d82c5a56e97f9245b34f2
+DIST firefox-128.6.0esr-lv.xpi 587210 BLAKE2B eaa5c4eefab6abd5c2af6d597a1ebfc1f013818baf39482e9e99fad393021d05ff596b8a450546e25c125d26f289d93004e303cd4d7235a27cc0f12d8adb2e69 SHA512 ced660d9912b58744ab8ebc229585a2479caa043fa9968c00b19941e6ebe73dac44173bacd8e2cc3faa54da101e436ecc2e4b48797547c2c8a6dfb03ea272adf
+DIST firefox-128.6.0esr-mk.xpi 495165 BLAKE2B e5054bd084ef3e25e9eeb6b02b4bd7389898888eb09426984c595426a92d892423ff045822ef8a343a3016f644481679693baa7a36f28c9f492f0ed3f3a5b580 SHA512 871d92b38b0808f1811d061aa8eaa88b63248b8717dc02b4c069f7bb6ff58a55d5fa288a160a005aebb9911343fb935ec80c6fe6f19a522997454e4e7964364b
+DIST firefox-128.6.0esr-mr.xpi 533534 BLAKE2B d57dda5f03f20f22ca98bcd1de883046f78f811d5962a146b254653148d64535158a7cfc3690b5f9cb11dd61dc759000f239d114e285aa37fe08658f59a45c89 SHA512 87d4da0f89745d91d15372c3c45fd355777a8dfbde83d842414126ae2e6380c03d0af208b8e91066e28da1517a7596c9971510284d626ccad6a1a1abf8701271
+DIST firefox-128.6.0esr-ms.xpi 451147 BLAKE2B 0a4f9f96dee62a14f270d0edc636f152a948d4cc1b8d7b5dde1ffcf5ff5d13f59174537df385245e4536cd5d0a03bffccdb9441b837064e49d157496af058f8d SHA512 14bd523dd44ca57e9a8c23c8288fb503681bf2c9ec6bfe1b12fb33e16d4fc27caf5c2445ae737ed185824a69f36c45f95909333e0ff017626cca4f1c8136e789
+DIST firefox-128.6.0esr-my.xpi 519910 BLAKE2B 03071e3dd1457ff3cc0d35ae2590c2faf4288d9905d023f88ae46534871507ad52475b459df53a46f1a5a4582d8b34cae8e952ec45d63c46d4d29c4c67ae68c3 SHA512 f8c20dd32e0f9722a10185f80d90f1d3de67522f4aed4ba8870262e37c83d9bae532d16ea9ebb8d6554cc532f66677fedbf3fe2ffb83a1ea7c8c2a34dd218740
+DIST firefox-128.6.0esr-nb-NO.xpi 620020 BLAKE2B da7a8e555d33538e350175243086307205e5060c76e916b59d067f2e81a471480e3661eeea0337cb41bcf6a15929e6133f965bd54fab97fa0dc305da50eb763a SHA512 812084ea21768add892369460c5858f7bedaca39964ac2ada3ba7216aadd60e591b7a818ba3bc3a925d9a18d7eb767451b1e100fe795bb8706c2c9c4ef15cc33
+DIST firefox-128.6.0esr-ne-NP.xpi 522148 BLAKE2B 4e982af7eb9616b4fb55b8d030fef87d6bb8ec6ae796f90bacb6d19dad02985553817b2f735f757f715b6eaebe3fe63608702267181b9b57b35b4505ec562af6 SHA512 7a9422fdb21aac753eb980bcef6c49019aa63b74c0984d23fca795d012467b860fd98adc4d91368c069f4e6a5ded6cc0feb5b6be9f1249a31127ba1adfc5c54e
+DIST firefox-128.6.0esr-nl.xpi 634305 BLAKE2B adc32a6f172fa93049181af1ca05024c246b3fcbdc16e6718fcbf5eb0302deacc45fe222a9489bcdf77eb9858f5293139a6e3c5cd27268b0ca265747a795c2ce SHA512 8c027d374c288362635e1d340d7f32cd97e4ef4abfdb5489cf61ab046ac6b8a77963153c1ed45c0b729946982ef3870aff0dd84229bf669b7ecfd8c0f8dbfe1e
+DIST firefox-128.6.0esr-nn-NO.xpi 622824 BLAKE2B 0b805d3cd846b16624c4d56afda5ce16a31c2acd3370a785b46306a129c67d4a9e727651403799bd1443b8eb41ff4833f88518ed7b8155b2fa0de98b063f3d3b SHA512 f974094a0292caee7d8443ac1f43b02f6a361ad591da818ef6d0123b65b15ab545db6cf5ce552ed82fcbf4a8fe0d0abb999f702db5561e6f4775dd3c693013be
+DIST firefox-128.6.0esr-oc.xpi 615794 BLAKE2B c10fe377bfd4cdf6354e1d2dc4985fc1ccce906ac0f8ad494234198a429978c54e4fc6d96a8b609b8e6d38934c2b6ba1c4fe0258a40750509e439844868128fa SHA512 a01dd847a70da1fa7bda6b5cf023e6012f046359d67ec25dc41c12710bf78981d93d7c019955b8f20529893c09b18e1c9986e091cd8fe57632a4038977b7197d
+DIST firefox-128.6.0esr-pa-IN.xpi 711068 BLAKE2B a0cf1a4f330e34d729b4ca5b14b72dc72e80fb8152b9a58c2b68f3e1e7e5c72aa9b2c7ef7af108ff9fe1531f243c039707a4e536ea413c7f584b746c85582ce8 SHA512 bc93c90a0de1e8f3ff3745a5bcba1f60a8a89a27311751cf70ee2ac0f819185ffbc79816aba9c6cc0071c2bd07e4979e40406eed48feda97dcf1fbfabd362ab3
+DIST firefox-128.6.0esr-pl.xpi 648786 BLAKE2B 571c08713973feb528b7eb05b77d0cacf6574a8603c23854f992bbc9bd245a333668e1fc2fb805bf4960d0c9152b0e9eb442b48e947b88c93c60bcf1b66b746e SHA512 dfd63c4441e38c9c8702af0e34f1cd014819593878e7efde0c583c49ad17c0c6c6764a9f52fa1effb2092a2decfafdd7285a0d8331f97b6de36d6b09ad522158
+DIST firefox-128.6.0esr-pt-BR.xpi 638904 BLAKE2B d8279cd78edd9552684da1b5dcecacbb4803b107577b946d7087fb4e8f23a864ceaf8db29f86cceead37692a3aab382cc4f9688164c05c0da84e75455a0f0f4e SHA512 ca6494ebc58bc02610eb7f33b2369350aa01fa40107c508cba593f23965f3207cedc8972cf12cc56fa530427987bbd1e5702fca8d2d4479fee6ae23f146188fa
+DIST firefox-128.6.0esr-pt-PT.xpi 642493 BLAKE2B cc0f3a685886eed4b79c977b50b31dff25b5ada520204ad7895a5bbc551e4ad55f741981b3ac4a4a8788f5adce4901f0efebc03c7032069127c6eb783851a788 SHA512 d9d0a987394effb6a4518b876577b139f2109e29bacb5b55465902008fd2184177ce2f00b85214a9d36d9b55b1a4ad5b3707b0e91df1185d32aec298cab472e3
+DIST firefox-128.6.0esr-rm.xpi 631437 BLAKE2B 46cb86f955a744d6fc9bb648e980676b2170993b905bbf5de1513fa3cd7dcf15d035343b17145118b9c2cb16d9b1679eb20cd15400092cad6f2b867e4fdfba5d SHA512 855391ee46e4770ee0a9ab0587f5e78b1acbf0d2e06684bf8f8862f14c9bc56e16b9127252cdccf9e27ece9c19d16e6f31b0bacd9ccf7c069620054ba60f9939
+DIST firefox-128.6.0esr-ro.xpi 551221 BLAKE2B 8c9dbd2c4a5726ff5db1f03e6bab4a14815b36a0b6a23b5869fc6b6482bddc96a7165f22304a12a006d62c4de107f1b659eae81f2cc5dca95555d3763abce9d3 SHA512 08ee74d44196fee131ac132f035a1330665d96e0d8e156199591fec52f7b6440794de6baacfc5ada72821bd84fd77be87899b73a8a65dcb569c64a8297f7628a
+DIST firefox-128.6.0esr-ru.xpi 740412 BLAKE2B 0fe5e32976119659fdf4415acced13c671176734259fefa613bab51e594999084b5332723cb5abcd68ed1cca204a6f26d0f859ecb22246d77ba47fe6c620c166 SHA512 ecede072767616a0b931cc3aeb96f8861f5921a8103513b905ac4f405bc9f0783188dfc03be359f933b604259be09c63f9707bb683581f1d1b3708fabf201cc2
+DIST firefox-128.6.0esr-sco.xpi 512698 BLAKE2B b84e6defb1374b72160b6efcdec8eefa0d0de912e2f66f8e9b2a98bbdbbc016540a1b651406de0d989ed66d57111189d46f1509cde7583093e91579ee6cd7939 SHA512 679e149e2294e3aec38ea45d46eab66267c3a1fd45f1b1935a2dd704ad9f9196ebd238a125c236262e7ee1973208660be490691ac7dc3d8a786fc2c4426d4c2a
+DIST firefox-128.6.0esr-si.xpi 621565 BLAKE2B b1af6bc875f56c1f4bfb497de81dc185a050733367e90c5607d4c6e40107dc4d2f1e0f4daa74312caa72ca4a77a76c4abf0c8f8a8c248bc28cb57e5c3bb582a5 SHA512 87329117ace931192d842beca881b2658692858702f86c40ba5da82be730cfbb6019881ebff9b1ff4f0566eac9790c2db0bba88fdc5a14796e709155d1c5ccb0
+DIST firefox-128.6.0esr-sk.xpi 670792 BLAKE2B 36ff406c68bd24ce6ebcb1207a4ab943e4b2035bba56c4bcd117f313f829d41b4b8a8615f207b9d84c94147f1d316fc933410792afbb5cdba17f18c7052c7c26 SHA512 d5cfa93d724de2e5731d69e1fa14dbb72673ed3127a358916f4f6c5529b117fe55106deb107d3d44ba618c60855ed2eb43e2b55d44cb37a712ef805a80a9e669
+DIST firefox-128.6.0esr-skr.xpi 722726 BLAKE2B 0e321fee6ba51f2500a12b420b0fbd6f8f023b5130b17eb0f8dc0f87f4d39c37de32431e7aaa2659d969a66da027cc6d7a1856fb598fb924a2965cda8301fb1d SHA512 2f9c339b7a3f8940cfc605350d797612edeca894098f5d553aaa264d4ff8019f97f23681654764a1eb1f121bc3fd0b8c7bfd47fde8d8e3bdfb739db86d45ecd6
+DIST firefox-128.6.0esr-sl.xpi 633851 BLAKE2B 48bda89d76fbfac20db647823e3ecfa2857285f6598f94ad822e79aba5673ad255fb3ffafabe55cd20db3757239227fa2c346edaef63d7b7126eb49572959fbf SHA512 32239c96fe2faf9070dd2a022104a16a4637d23a362980e0c581d94e5eafd919a8c1c9dbbe3712d03447fc7d8d5b6449897b6d4ed114994a75fda41b0391cff4
+DIST firefox-128.6.0esr-son.xpi 417709 BLAKE2B fdeb7316afbf830dc40734fdb145c7c35a8d8bd415f0ae816a68404ea4cf04a9b95d65c24a5eb38b80ae499557aba73ee5fb02c22b1a71ee5366ad10c8582e54 SHA512 450788ce9cdbd6ac9e3b38112e2b109cf5c0dbe38b3c8ab140a87916dba0ee7ff4f2fd44f4f120e53fd0359a507a3ddedd2ecefd0836b05c9e42e7c1a6252fe3
+DIST firefox-128.6.0esr-sq.xpi 652183 BLAKE2B cf68c19aacdb9bf29f1787e2ff614b3c1106aa678d9b409e35a01b6ff3214f2efd2cb81acb5523b5f0c0371cc7298cd41a3dc86fa3d387aeffd4e8659d4a6a18 SHA512 740fd69f5b53b1f637979dab05b373a720c61b17b9d36708de01734700bc523b4c361670a4e1e0e584a2152a81024c37479a22600538738d62cfc1e6eaf6ad12
+DIST firefox-128.6.0esr-sr.xpi 640909 BLAKE2B 3cb57cd660e574b7ea1712d14b6369f7317535675bf5f57f860bc8de58d588d55b65139e0ab39179d4ba4da421f70e07369e2715c18e914a8eea170a6a3e0db8 SHA512 9295372e6c78dee88a6bca4800be4d772e92e3e39b30be64fa5e3bc1d7c2d6e0009e2930c84b6f499c9ec657fb3bcf5738b29f15d28bc114c3a5de0e783f6df2
+DIST firefox-128.6.0esr-sv-SE.xpi 635647 BLAKE2B 66965736235528ff4ddd07a26351abe1b3ca9b1ead0a585c240a727e648f223b749a2cb68adac43ea14ee3141c7b9ab7d021cc94affe1388b95b8efe2e39aee8 SHA512 9f38f36ac6c791425a5d92d68d8c86ab158c624f3fb1863a7392027d228b0b40eeea05e8c784003f25c81db1aeb771c7639da00be821cccbb4f27c10d5e9dad4
+DIST firefox-128.6.0esr-ta.xpi 508811 BLAKE2B c89ece045b13d8ae09ba76791d4eb16b9a1d1e306eb5b0893e6a62f0cbbb1bbe535b89a16dd2b3200cbc6604a8150a6ed7bb31e6e132fd8e92d9f513cc04e369 SHA512 4fb5eb14bfe02eebbf580d52ad3942fba36696e4e52bcffc3354742dc081e2a73582b518f6df7bd96ddfd38bfb6495e9f4186686482ca211c85d780b9ee9ebe1
+DIST firefox-128.6.0esr-te.xpi 565161 BLAKE2B 35e879ce133dfa203d69e425a7719c73948ddcd3e1fa80ed07857547a7800ca5ba7cf27502ca934256388f9e21b5bdc09407602b93207056e5af32e51efe28a3 SHA512 c8904fb3f0934a2be39860e054c6cedb390765c932e4a6fb01f73f8bad4ccd0654b0bbe560cfc41a1ca4ec2cb47463f08db37256554f9891035fe8208bc9579c
+DIST firefox-128.6.0esr-th.xpi 711790 BLAKE2B bff18428f65a23e87e802e7db44c86e477bab0cf37a187a14a45f8c898bc5eef8f761b48a577f608a89d490c8c114aa2a785d1f4f2a95ebbec958c3bfc74d6d1 SHA512 8e45e0fa6ae94576a85267dbfa6e5a99797110c3e87ce97663ac05e1a7f1ef6a0ccab83ca64e0f2593fed92f363ce744ba080128e155743767386cf7d2326fc3
+DIST firefox-128.6.0esr-tl.xpi 535606 BLAKE2B 5e01efe9c63dbba5f06bf0e8f1f72f0182ae1fe2d5a82a507d1ae92b3aaef632e5128bb1ca6a55892824e7f9ff97232ce6fbadd131806f4a45e08acf39d8e61d SHA512 86aabf2de88ad7ca4fecbb233b4031bf066cd7e53290de908d0f1f257ad73035da29d8aeb5ebaec09f0c7ea4e430f1b8fbde6f615daa65a679c63740ef780f8a
+DIST firefox-128.6.0esr-tr.xpi 649212 BLAKE2B f6cdbab52ec6a58c408742726bcf8f6b48b4c7ad7a1bef788a30a146b85cb6a0125f7a765da140e00cad3613c1d6836110f49cdb9f0ca23de98579e71060b371 SHA512 be764182fbcb8debad0739c8c5249d34295844608503f3ea241775129aa1382a7c31cd6e39ef4ab735bfc93dd6421c366a4da567f55a0ad1d188184d693f4aee
+DIST firefox-128.6.0esr-trs.xpi 505794 BLAKE2B 1b69e5d2487619993e03c31789790d131c3c24259f69e4262b755d7af558c0e5f5e35eba361286a598e84cfd86b56ab760eb2d2135be867afb84af2ad5f1dd03 SHA512 a843bed4965acc49299146c0809e988c8c42c0fb8023302eb6663094ef2333448a5abda5a9d56145d22c1de592f271d799a8eb7495e227aefb4ecb9f66795ab3
+DIST firefox-128.6.0esr-uk.xpi 731681 BLAKE2B bcd8e7fcc66a78ab1cfe5bf2fa07f054a82ab3c572efc8cb990bdfc7b62fc3331b05f809490ca2cd7ea302b5f650d7e8b465891eeebd541bc93dcb95cb065afa SHA512 12040d3a2b01a3f8ce12afc0e48bca246374e18abf407efabea1d502513af4ca261b2408c4df0b79e7157d0065d88e4d38e960c947765def54a99bd6a19c5d09
+DIST firefox-128.6.0esr-ur.xpi 561783 BLAKE2B 2b620d28ce998e043ee1ffb5047e94a9ab6711eb5e69678ff7d4ff94930ed5b6c57fd0990b684774d0631057814102da3d4d35967fe5e17f445a6184fe351c7e SHA512 7b1a8097ddd7f05ab4dcedee854a346c5384dac0e18e2dc94b335dfe6a2719b75875e1e7ca854711d9b56e143be4bd82a719869e4ec26f5eb968dfee1a7e3280
+DIST firefox-128.6.0esr-uz.xpi 480216 BLAKE2B b13cba4bf49685e8580fdd4905f1328212e429a158685c92e4106122433f792f378ddec87d39eac92ac8d9e2fef76d130f12c16aef19176e0e6d07a0b5e79d6a SHA512 d8ad2d2ec1269c0ddca496c38c2aa16cbc02b6179a59b4492e5fad6296ff9f141e62ed288d4224f5a575684a44b55000e56447ffb5f9ad9ca2794ecbaf83979b
+DIST firefox-128.6.0esr-vi.xpi 673230 BLAKE2B bc2dd96a1a960238055cf50b2997d50dd8193b194da8db190b9cd88a81179e3e156fd2570dda88d35feb8499b9a78fe81f9adf6e8adb032452ad6f882ad75052 SHA512 cd73f67b272d9d89b2f019b204d8dbba5fef1ad0f31d0ec8daca913c9ca2e267f69d3480bf4f98faa32522599a62ab5bf01b5d5ca149f64c56fcdf74c5c670b9
+DIST firefox-128.6.0esr-xh.xpi 418478 BLAKE2B 54d8625ccc0303bd0168476884a60a2018044e6d10c503ae7077bd27076bafe8326d390d3f86ce7a4bbdce60a42467d62ef56ac74437f537c843613e5791693e SHA512 905c1136f9dfbd372efa13a3174d52dde3674eeb9f3f1c0f5fcb3a6ca4efe591c7e77731ff69619f4a81e8f6550e8f26ecb504509128b91f06e99604d2d667ff
+DIST firefox-128.6.0esr-zh-CN.xpi 675204 BLAKE2B 25bf725f17d878b72125bef0d3f18e8424b3cd19c53ea98e6b5822b278b39e71e60cd19efb8f5d300b19d185e14f3f92eaa8f5247475b7fb81d90b3bba9fcc74 SHA512 ddeb8b74783d6654d9becda9108b1e2285d761de7170f850b854b78006a59775f341772de5806a50758d675f341e34b64b195772028d07a75cd6ceb27da0918b
+DIST firefox-128.6.0esr-zh-TW.xpi 677426 BLAKE2B b1c7f621ef3a73053ac60f57845d721fbedee579f098beac71f3b9d97b60c6a9ef97963829b4911cc1215f7a1dc935f3c9d30720b92f0eafa0f9d4ee46ebabb1 SHA512 1c415b1c94bbaabd6bb454a517aba30b7c19bab2a57641b48aedc2362ed8cffac1956cf56adee45ede9a9604dd1ce270d294b56363e859cf9e12e24d7adae48a
 DIST firefox-133.0.3-ach.xpi 468546 BLAKE2B 6da604850f3d69b4eb65a42e3d7c48a9d88803f91dd95b5fde30801a2041ca2cf0f11083fc565f21ed30c6588471bbdd8019f6d4cff8734b67ea105d2cfaef2f SHA512 8ee31a3c51ed6d2d1fdfbf98750ab54e0c2ddd96cb836a2ae310dce095f0b29bafb731329af845208c9b04fcacdcfb2fc92405a01394200e41453d4b1bb1759e
 DIST firefox-133.0.3-af.xpi 421558 BLAKE2B 0a9adf8f87950c28cd7cc56ab75a391d2795cdcb60b6d9f7680a7456cd0886e169376ff18dd0e0fbb3ed702ea333c8668c2bf3a635ff6e54f2913a93fe668b5c SHA512 2196953781da16c7e01128ffc89325c1f13d55f6d9528f0dac0671954fb7a0f7da3f55a31e821efefeefea65d32339945ff988b90febc91a4750779f21b919b0
 DIST firefox-133.0.3-an.xpi 511311 BLAKE2B ae9c162cca93513a10ef31e1e43421b7a1caec7928cf63a658f95e34aac9f1c81c58d314f8cd8bee54fe2f6f91bd418c63dcc2758a6ceb92a31dc0e2d9594b83 SHA512 372ef860f44df17c7e2f1a8a53504b11156a19238b350bf189ad5c7d647ebd1a3e1235993ea989569610e5606644f5c2d768535b0e82c9ac9cd8b9d14eb2242c
@@ -192,7 +289,207 @@ DIST firefox-133.0.3-vi.xpi 677944 BLAKE2B c520f4174be263dd011d3c856eac0053a5a34
 DIST firefox-133.0.3-xh.xpi 421372 BLAKE2B 79238c6ce683f1d9cc585f8ce40e1603df46a926b9d8bf02c001e70a4924cfd1a913b73dbbb5bb6301d01e988ef216241b67a3bda8e88ccd8fcc13a17440cb59 SHA512 a2b63a6d79d2c9f388d9ef2ebccb71327057a188268c816d66abd2847493ca5fbfd8b1ece1fe8653f3c88dfe5459e9038d1c2c254084ca6afb0007ae97e7ac81
 DIST firefox-133.0.3-zh-CN.xpi 679309 BLAKE2B b6f9d3ac6055a258b78857dddffb89c97f2b77bd859bdab6bb20c7791f811267bcc09db2b451ed56855c074cbb9a7c6b09c375819e951f89d67b011178b30f82 SHA512 c42eba97f3069b38fdae933489c6dc1b9fbd7ab866830b4d3fbdbaf10969e1cf4665235193ae6985d032fd4007c12dc221f8a6f284625f60b36a043dcbf3c6b3
 DIST firefox-133.0.3-zh-TW.xpi 681633 BLAKE2B 7f67226c9bf2a2d311b7a13c5aaf68bae1c784c53256f3e971490980f6d739f2dedcde7803d0f1955d6be8390ad461d3fe1f84083a7ea093624ae39564aa6ffc SHA512 975b508f569eff982575a5d62387882a4fe0bc061ef5af510cdfcd4b8c04480b260d9bd89b0da857d481272b12ba5007b73b46938bcb24e2754139d7ec16a3d8
+DIST firefox-134.0-ach.xpi 468175 BLAKE2B a9eaab4624ae5675cc0f380c877b8aa5205cd768f640bdfac44e97714c1dd754f8bb89dcd2a71732438f6027b20b0f5f8493e839cf18640bc8d47b604034a1b9 SHA512 ca12411ab30de0f101656b4c2cc9914cc5602580ecb16a0af463c251de36d13641b468690961d4170dfcef89fb62242a73665ea320704e5c23227f5b6edbf8fe
+DIST firefox-134.0-af.xpi 421162 BLAKE2B a9bdd1b7f129a9d3a08df608e1b2d23a844b367bc2985fb6904ed233be5e0d57f36b840bf88712596117970ceb2d20c48f2afda4db3b6e767b1d7d39f72ab2f5 SHA512 36411f485e16856ca96fd5a8ad6a9f4b8266ccd880a9196b5f8052dfec32765e248c53f65930b9cc9b151123ad240edbd3095b7005ff132a6937cc48d2b9be25
+DIST firefox-134.0-an.xpi 510952 BLAKE2B ff0e62dc07bf174b68e691c5285931593312aad5b9522a8310dd5d78c6cde894d768cc394ca75082ea4085f80da164a8f46c632d30c09dc61d548a95362018e7 SHA512 2e1ea28b965ceb2ba8317635045b775084c239ab726a8c8ff5e95388abc09d54e4472914302f5b0c817801c3a962859ed3edb1c15a4cce39e5ccaa86899ae4af
+DIST firefox-134.0-ar.xpi 633883 BLAKE2B 499a63f6432343a0e0917ccdc5b74a381114683fb22a0361f2fbf1f1a57722cc3896ebae5cf7c8d1ac59fdb7ac201a1cbdc9108a9903ff0227754a91ba0e3a99 SHA512 4033c754a91f88b4b883ce539940a8e13241770df6bf41f30fe1dbcf7eff3589b3e7b67696bc62abf64294c044e25f54cb28179ea1af672147a8247bb5926c26
+DIST firefox-134.0-ast.xpi 500083 BLAKE2B 4806276202782d21fc715abd1f9acc3aa6c7971a419fdbcee9dbf11baccaaad6fb2176691631ddbea62351076cdeaa1f49454a2f383aff2aff9d1acec6b6c931 SHA512 2268f5d46db69cf61dfa9c7dd17f3178060180c856eb78fd0a930d98049cbbc81d1d7bcc542f55c586e59d417220ba7f6a6ef8862596d6fb7580434919b3e917
+DIST firefox-134.0-az.xpi 494914 BLAKE2B 98fed19418868442f33ab74a1d9400e91b9e71e4e028b9cf29751730b7f315c4eb419cb6d146a3cf15acfa8404753e408571bf4a8ad8ba38387aac268fc7cef0 SHA512 e5f22868fec85d0082abb5ea8ba24ae6833d38f5f70d0e717aabea718c513bef58bb519feb9a889f5bc6ec4d6d18c1cc9b4b8916100e0344e426841416d0175d
+DIST firefox-134.0-be.xpi 744276 BLAKE2B 5b85f995f7a8a065b8febb2cb31ca4681bce49c7df5a06d742c4bc47f3e0afba5a0181a09c58a3d3f9e99a2cda14a1489df68a31ec537c93dc155cce5b1ef51a SHA512 40ccdab86a13601506174c395812ab285b212332aed946c309979332d050aedf10983114fe9540538b8d45a783d6712acfa6ddeb334bb06b9bb7cec6c6f0c1c2
+DIST firefox-134.0-bg.xpi 670917 BLAKE2B c74f8c258ff87da9036b7720fa8f1b667815cc369b59084a06b298fe8fd0c7278ec302596b834b514ffc89e194996f8dadf485d50b94a3687078482bcc6230b5 SHA512 2984937477e5e15cc78e8d14a58a3ced09a60e9e72cb0decce8950969ce954ac5e18889cf804cd28421a4c799adb8041e761b8c8fd444fd4a8f596069af0e944
+DIST firefox-134.0-bn.xpi 615540 BLAKE2B 8598aecc24159a9ce4a3130351f7eb9a3d52121e9c4ddbb386101041818bfb7012b379e57e6a4162832278807fdd8c99e32230284934ae54b1dd1dbafd0624bc SHA512 56b3394fd8da1f189db1ccd7b636307e592199db2f9109710591d4c9fd77fb25ac0ca8ebd317c91eb3fcba143bc2648844f4b74ed76f6bc9e58aa3c710501e2f
+DIST firefox-134.0-br.xpi 598074 BLAKE2B 02a67188192651658c7bdea7a5256e11964e7ca86d479577bb9ec314b64796f47ffcdd21726e5b7b495196b26b7c4aa8d86f086c0c9b7eeb0fe556b61cb15e28 SHA512 280c030873b3e29ca1245ed0104b14a34c74e41bac485066058cb87f7e2e2df56fd5b89fc9378c7b018aff9e776e9e1032c2331011676c6c2bd2527c4607a57b
+DIST firefox-134.0-bs.xpi 557244 BLAKE2B c19d9a67887fc21ae1df78001759d5b44f45d2bb1e394c5e008ecc89fce9288b42f9320ed8b83bf1cabf83429be5e11bdb2edea8322a40bf8c1c1645805d8e03 SHA512 b4a8c5b09188afa95caa0694342160c8082b6b6668145e161d137144791fe85ef982ca852e67b56aab4301cfb6271259ae41eacbe6da211a2e07919f52c360d3
+DIST firefox-134.0-ca-valencia.xpi 550243 BLAKE2B 2b94db9efa25a8d72d2071824d923da49fdae896d83ad2ad3a20f765cfaa7c0761f8e0befda7eee70f8db0a82d62daac9712946a2645a2ccdd70b55b558b3ea1 SHA512 48bbbe27199f39b3b7b6db5d3aa2b475978d234c50a2f4d1e82d62c4478c4ff3a0a4406b1b473d54560e95146fd82f15789a3655c47ca72130f07303b865e978
+DIST firefox-134.0-ca.xpi 607760 BLAKE2B e369bcf5ac6faec9e2b80267785f8e80ae5f38f1cbc80be82b8cbb676ff44543229d43d73cdaa8c31610ce427b30324bec42ce59affb164190c6b291e3747e1c SHA512 0d411187a750975309071936c93e7ec5d179cf600acec8d5a63d00b5bc1124d6cd71d86c4ed29678bbd8bcceb56472c4ddb96231ffc704473e7cd27eeb0e8d73
+DIST firefox-134.0-cak.xpi 597775 BLAKE2B 338ceee303e1f61923827c61bc183f36c210371a5df8f4affe9f43c946003f07071c8c2b0b25e3f0575a007f9d818e703781daec8cc84aeae661a5687ca0db78 SHA512 e94b4320478188cc2cbcac3818bdf01c739e84f1503427264a3c0f8fa81abb8bfad05fef05f2b87e7a0f2a5d3185cd7c3ee172917fd8560d9a97dff7b95183a5
+DIST firefox-134.0-cs.xpi 688675 BLAKE2B 89750207ac3755d2ae8cd56f38d574447d7c547c153bd59779b6af421416c710fead0df0125ba41a3041ff096dce680abbf4cdcc2c61a88903051d0675be541d SHA512 787dd821e6cc4d8dc8b077854b21a7e2b2a444cfdaef21cb905d87584c43270900f368de049a940211c82d8d34c5a944c101483cefe1aa98a6a5f01afaf512fb
+DIST firefox-134.0-cy.xpi 649374 BLAKE2B a012dcf4dc063dad39349feeebc57f65d2dbd19dd9bcb30c6e0cf352832e40f431b1354299ae87c5ba84ba8f59b125fbc4cabc46f8c1d5808d47f893fecbb5e1 SHA512 535104977911640070b0a90915eb12863fedb3dbb9aba673cf2ea3f336cf449fe09daa198f9852c8643369e85b9a6da8791a0e0a93892ec94b7111de3c6a9631
+DIST firefox-134.0-da.xpi 637277 BLAKE2B beac566965ad67645341e95370dacdac62744ccdf70fab3fa3766c2b7aa5dbaec8ad07638e379e6bd0d72785cb5b7a2bd2b49721e409fda8fc9dc458df2c9533 SHA512 7bfd03093ffe0ce226d556322a26889008b362ccea90bb02b195061c83ba214773113aeecc18c791ab7e8d181457008cb9908e9fc1d57bc1d9f76c3a35b0244a
+DIST firefox-134.0-de.xpi 661278 BLAKE2B 2ae531ae6f9eb6a9f24267069e268f55e34cb3a8f316294000edecbfaeecce3256b0796131251fd88d1f796b1fa58049eae83c2a7fc7d239a1efa90bb046397c SHA512 a4b859e5536c6c7f5dd54fc1bd275efb16bb2d37b83299967ba97d8368a17c6d3bfc66c7288fe0d56369010015d8b0b97ce453e66830a203c6e716fa00ea2b93
+DIST firefox-134.0-dsb.xpi 678094 BLAKE2B 4ef86f513736609808ac2e2c0ec3b5a993795a24647c3871f4b2c877b9b6b03889629f6483d278ce86ab76c63c1c34a8a01241426d630a4ba19c4ac507bfd768 SHA512 e4c35f7544466b1f44b83b1837cd9100b57aebc574290ceed487cf38fa77eb9da8fea66c3c0043d7919b61e3c0ed9e7103ba5b9c4bd0e2189d7afcf1949dbdff
+DIST firefox-134.0-el.xpi 760444 BLAKE2B b01b4ed8767c4736ee103442d575947d984820c7c7b83e5302100c5b7e040d5d3977032a1e72eb4efb23e091fafcace0c374ac8c72bda5c952df1a8f8c8aee53 SHA512 1b85d8383a2186602f19125e0a2d8ea7a7e4fd2b7065db41419074254688f767c5d77c9874c768b83b5473d97519d50cc53025208d069e7fc6fb965a449e8fdb
+DIST firefox-134.0-en-CA.xpi 607990 BLAKE2B 84aa24343d7f657f9170f532900e719673fe9a81c03d340c3fb0b9d7b204b13b87df9aad63405b5b53d60dbc6bed2480b8dba4cb66f3f4f141b894ed5383e45a SHA512 8bd7905d288ca2efaa8e66aa24a00d062d15dfc82f256e9ce3c5d48f25196c625b4f9d03d2e848e417c6a77a98c47ddd142a390e5a1ad8b25bf08dcfbf5bb817
+DIST firefox-134.0-en-GB.xpi 609127 BLAKE2B 621027a1962b61a62ad6ece1028fb18e86d01ca760fcb51361bbd3b2b9bc7787118378bb5a4149caae17045e1703bea4956869cc7b9414731e7d4ad0ebd912c8 SHA512 bb5c07495920787b224160e8b80965c661b3a5e3efc281205a4f72f15c9195f12feae1843832439ccc58f6b7db9e1fb3a415bed0cb23e1bb3d68558e55edea73
+DIST firefox-134.0-eo.xpi 640106 BLAKE2B dc07c9670fd4d7340c7df5d21fa4e4e6a51d278b97ee5937953e12008b0c39ab36c00fcb1c5e28a7ab47518e9dbf53dd8877fae94d1e839e522d83c27e91b8d2 SHA512 783337aaf0e88f64992e90ec659a59859282678ad9a1330ceae9f1ec0cf050732e6ea4547f0525cc39674c680c8323afed3daa6bf9c66c7a519ed7ba0679ddcf
+DIST firefox-134.0-es-AR.xpi 654030 BLAKE2B f903a48e6dbef2e5820b6d9f783b68297b7eba7f3cfefaac6e4376cca626321a4e03d5c65c248d592e78c42e23981eb3883c0e1395d840e013176942fbfc0ff5 SHA512 4eb99e6e13f63df53006eff38c03f2ca25e8494e5406ccaa23e7d3eb51aa2049ea1fb558faa114248af92d885d3010c01d9637401f60623102fa3a8e20c06b94
+DIST firefox-134.0-es-CL.xpi 653726 BLAKE2B 92d312e3b68cf562d85a2980efc367a374bb380de5461770fddf66dd9a2f57bfaf4d1869c2bd433b56159ba91a4d65c07328b87615f38d7f5c39b2ad4f7572f0 SHA512 1175f079f704f3b4ecde696a0aa6a19646ca31f1ce7bd52762caefc7c9c88cb9ceaefe425d6ea2a86f9a428aad620ae83a9c4074c2820248333f9957d1e16d08
+DIST firefox-134.0-es-ES.xpi 648570 BLAKE2B 4889a95618d3a66e6e351086f023d616507bad730f18f691088b612ba0fd5e722d8946f66c826fe91e072fbd431a9d4fc297bafcd5aacdc21fb93940fc737038 SHA512 19ce7b26ee126a95587368c40b08cfb1b856c573b06a6b5adabb9eeb9bcd1ec00a18b09e51ddbe2a0e11a54e65ce88adb159d6f275ab932fb6c13484d6082621
+DIST firefox-134.0-es-MX.xpi 657163 BLAKE2B 55adbd7d260524a017c808aee37e22ee1c9aca9a92a812d6b79303fe2b2d2d12068a40883a5f43bebf1e400a201c9bdb75ae45521361a2372733e973231ce52a SHA512 60de9104db9fd3e76f1f0611e9aed423c16ef957f8ce6a6f3534d3fcf80462650c5c7aaae3659b80f9d8df40a54dcce5656302956afdad23125ed9bb717d984d
+DIST firefox-134.0-et.xpi 546711 BLAKE2B 6f76c5b5e2633c1024c8927427a2dff039fbebe68c5f5114d1e6d1296e07357636ef1438ec548169199d2bcf9cd7aec2d44b0b21298290f9b94c33ce6791433b SHA512 83bfe20856f81493d222bd5d8676c3ea3b87553def038b3ba7cc15b0b5d35e7c1980df51f8ab036e0835f17029c9e776403a3e498353513ab3830d2bf586cd9a
+DIST firefox-134.0-eu.xpi 622849 BLAKE2B de83771937c91d360fc2aa62a7247fd66cf0dc6a8a78256e3577138d121ef810ba8058203d30f33c023a9434a481e95f31df1b98fbdfd8ee2a2859f1bac973d4 SHA512 e1638c31fd4dcaa1a082cc9f8b278c968dfe2b377381638e3682638f211a363beedb3221f33acb65e325ef98b3b75f2a812c5de991674fa4092246f68427da72
+DIST firefox-134.0-fa.xpi 625175 BLAKE2B 29d1200918b50ab32150995f9c72ed3c3ed495a691b4d446c99d099c64ef4254fd4d4194d726904e04c1f17826313e2ab4a8afd048579007f750c804a065221f SHA512 92a9bd736629e6ad97ffd6609ef6bed2be43a770a1e356b94e8fd74bd3471364d605141b8e257aca88ceaafc586424e79b7b63cb5a3258126b14ebbeabd6477a
+DIST firefox-134.0-ff.xpi 479999 BLAKE2B 85c2fdec3c0e3f37e33f756e5751aae6e17f02d3d503f913200a2788b0b5aaa3492c46b6c381f633b96eaba3f13164177392658ceb2d18d39473b0b58760cb77 SHA512 779a6ce6ebf1d2dd82345a92a166d8e83e8216287d8a6066bdb46fdc42b9342f5556be11ed78625c87179567845b1eb93bb4d101ed7c39297bec657802bfb2c6
+DIST firefox-134.0-fi.xpi 634177 BLAKE2B c4a28dd11b971b7d3b74011d6d6137f6fd7890a98f860cdaee0cbbe9edf48bd511c08fe22bc2922aa3bb3d26665b745584a2bb712ca7df515c89bd6c70a8b4a1 SHA512 4f0479c83b457b575f70a149c37c90877a55100d8b3fcee0b5216d6b4d73b62e9e0d04467fedab9a2aaefe01b7feefcf2c4f623ab997ebbf3e6617739b349fdb
+DIST firefox-134.0-fr.xpi 667546 BLAKE2B 510825119b5ae19935623860ac038c0345d3583f80d8c296b8e4f7aea2e474bcfda1cfd538fc2c79d8ec19ad88b12cc84f7f31f7b972b2364e752672d5ef14a6 SHA512 116e99d4f0b543739127131470b07f0fea478de71e395f999a71f99b799df8c1c33e7352472ec40b443d620a05269ce98587f74322e898e08daf0a236ca01606
+DIST firefox-134.0-fy-NL.xpi 649694 BLAKE2B bf3f00c9b4c7bbfb103002a1382d3c99b44bfc157d8b9865137263515d950bb5d9797623844a2cd053746f2bf0c0db577bb12827c19e04a514bc231dabae69fa SHA512 b2d7f8672ed0360b2ad95017cddb0b31f030e8e5dc87679a059e6b31ebe687eface7a7120224b55a310c476b82d1adb47c35858f71de77238f3ad9ae70892f3d
+DIST firefox-134.0-ga-IE.xpi 474982 BLAKE2B ebee8e595678b4dcd4adc159b9e81e42481746af9f90c8a4d0c26b04bf194804be7f2eea84d54115924e712725c8b7670b082082a737603ea4c516f9539a609a SHA512 c28ee784a56b5535930645e7398c13c07ea6822486c6b9260ec20ea5ff0a0b30b7dafbd93b7abacb3880bd521243b72dae72ab33780afff1a1c4b4640d07fbb6
+DIST firefox-134.0-gd.xpi 603300 BLAKE2B 019e09fd2c46919aac770689c17a06f8d3c83006e27f7f92b29cadefe529951c18f50f9e6081d4bc4e49895d0f28e49398fb957764cac912868226a088cb969b SHA512 7f9535446536919fb9c6c4ee5f4cf8874d41e500a0a9cd65d1eaa436d7cfd8edbac2c4a1fc2b4481b53ab017019e5da176c45240c5525cc06d1e9fb7537df79b
+DIST firefox-134.0-gl.xpi 614908 BLAKE2B 35c1cff09869b2fa556b112fb1e46deacc645f37f3af8dbf9ef4aca60596d06e966dd65a68554c365c5a72495bf94ee215b0b5a884d9dd316a30108e197cdc31 SHA512 ad794ad32fcea6c5d3d677f215c78cddcfb6f9bf7ce2001f13da5ae0bb3ab83fcf932b2ed5937a5248d96bb3b052f53a11c3ed9289b851e5c7d7573c80d0f986
+DIST firefox-134.0-gn.xpi 661081 BLAKE2B 96af2541f39a6bf0d1f84210cb78a0eda3aaf698773a5d484dd76927fc3faca0a28581e95e42afbe404cb867f5730c4f15d1719011ee90fc875116ec154c5e94 SHA512 61f5612fbdfed0ebee60a118734761a9c8c382b0d50b8281566c9f3896a3eb509b86b2bf9f59de08a231f9af80bee9b40acfea8149e378b6e851a42d711cfdfc
+DIST firefox-134.0-gu-IN.xpi 531510 BLAKE2B aed65e51e72a525bfb74e9efe52af651c787bdce71962e2f035bea4b6c0af2c7d6b293a7c99c65c2e7b76748b58dc5c425759786eed73530be60860e654fbdc7 SHA512 b5daef8e06b003511a0bf34a7e802f3c278342d0d1964930e2904c002c76ad22d7c839b4450c88709f3da3662d8a8d97ad412806d9d2d8582c30a8bc17b2135a
+DIST firefox-134.0-he.xpi 656241 BLAKE2B e5e33c5205019120333e1bf28f0bc7ff5fc651e72452650fb3ff5211c773185149b5b0328c4384778f46f42a12f11e17cbf96af8d60908d71b43b41f88dbf4ef SHA512 9948154b38aa50ec11a3f478682bf61c5f7a9d2c9022feb4b2e0e379c42901d5604e32a8455c4caa2a8e4bf94e9232d5b3d24e2e93d970f15570c45cadbc92f5
+DIST firefox-134.0-hi-IN.xpi 570956 BLAKE2B 516aa55421d863261421ed8bf3dc93c63157aa4cf324be8ad2658780861128c5fb3828c5237208654e49cc0f11dd8cd64bb4e2b02f99e112f6077b2471a916a8 SHA512 6836bd4de8ba0c57a9a1e9f8079d6eab4230442fb3ab29e69a27c9e836afa11124a1c761b90a0ad2d37f21a98542d04d6c87f30d4ad83420a7ae49c6598b0665
+DIST firefox-134.0-hr.xpi 633368 BLAKE2B 96b344a5bd091e574bfd0ca7350df579732484edcf54f3db709901cf63415d306b2c4919d8f7942dca3876892394732a975f245d652c50a487525a7d61039381 SHA512 aebfd94df4e98412410953b922850a58c37c6ca149b64a4301e4e0cc82d646a9e050260cd0e237e8e685415cdec6a377618cb7cd1db2773056f859ce003c2e11
+DIST firefox-134.0-hsb.xpi 674109 BLAKE2B 7f053ef3ca21c59ad5d2d55ddda8136d54b60f51694131dfa4b5d8fc47ccde6d922c50967ccb1047ec607af489e1cb64313628a9f5fbd865d8741dae77c9a907 SHA512 a7885aaa5f03138dae3a70aecd77d090cc57d5deff3cd7c36b9b3c3a5250b814db1edd69f00d49845d98ba8ac0ee6130c88ecba23a3208010c26a5ac7b72d652
+DIST firefox-134.0-hu.xpi 678173 BLAKE2B 1865fd393f9dea7fbc0bae251c0c6fa7a1f8047e87508e06c21f2d755635b372a713f32d4ecc32a112c77cec249d3e883900384085ecc2d652d9bce604d8e320 SHA512 5b1247bdf0fe4cc4a5ff31db0398589bf4b17fa72b6f61814f74fafbe52a00a0754ea0e5585cc909d14bda0a7a3301e5efa8501fe707c23b5d9c24d4732ba729
+DIST firefox-134.0-hy-AM.xpi 661671 BLAKE2B 027c9a6ac7b9139b2e5b633c359005728b1d8f80f3627e1770702781b7b4ea039eb6d14b6aebf51d610659d72019b34efff3fcba9fe6f22aa0ff087e43865c4f SHA512 48c686539e93f8b0510ee1484e261e0f700767fbace31c745d4242e8604c23921eb102e89136f96c8ff46e5caa360dcbe10fde2a3111785357fead8099938a9a
+DIST firefox-134.0-ia.xpi 636635 BLAKE2B 52033a26972eda686ad6b18ed18552cb75ad79ad36f2b25ae1798cdf276efecfd480a0e8c7eb8e6907d95989251ef1210218ea6d80dc226c3c7a535720e18540 SHA512 8d7d17fb12797ac7866a202e213048195fd3a888f308153bddee559c308d974d3c28f4e7c7ba33f466276a5dd133adc6f47d043855562f2570ff229522c07371
+DIST firefox-134.0-id.xpi 620028 BLAKE2B 4a6b509ed71d455a952098606db488e246441d5708036e2ec5c5da5f6423ff10807ddcf5159e0f30f102a3e651e81b2d50806e25ee45e5f0df4f86a8aa1e1325 SHA512 a198e8e85167ab37a158d2ce3dcaeac4a66875e8a3bcf14b9e93f1c041266165a8757f42d42f8bf333a8935968c61929b7a01e808f2bede03617d03dc34075b1
+DIST firefox-134.0-is.xpi 642110 BLAKE2B 56b463c588dc2b43861ba7d16e08df029f390451702cf38eccdec73abd989c6e46216078c85cb870f983cf311ce1eaa65997caee07f685e06ac51e05ef5f1269 SHA512 26036a48139178aa4609bc70371814543830385224c8c9b5c9291356ba0f530426062c69b9b2d2bce92d10d927fda9aebbf78324bad01793ffc59b23cbc4fc63
+DIST firefox-134.0-it.xpi 646160 BLAKE2B 8dca9f809cded5193b34b9682114aefeaf27383fabbbcc94a46de294959e301fd1454d868e242355078a989fe6da83951ddc02d693c38f481fe172d7009a3776 SHA512 39c328508f6bb53b0688ee40fcf7e50e21ff85a397fefa1612edb284f2b7e36502984ff8e543398db4c8b295f2c1523f260e97aaacabe27bc8d987ab950ba16f
+DIST firefox-134.0-ja.xpi 704024 BLAKE2B 76aee1734dced3a87537ae0f8d7f82ff74171a87c4f9418c3f69359fef32ed199527c8e1ea1259a070e421d84c62d1d57bbf9cb5f7f2ccf6704013e60720d6d4 SHA512 9b1f0c27cfc472a22aef82fb446c8ddf923f997442a1369575c98723b33ec7a31da7b61bc5744cdab40d1f7812d6768c5f6c47db9c1b1dfa1648499d84bd98c0
+DIST firefox-134.0-ka.xpi 711240 BLAKE2B 8f221b7f4ea16e5e2fb3d8c2cb274997f95f21f9419fb9606fd4a7e8e245a971d4a7f825d97c6c04d2bcc9a7a0ef996980e5bf3612c9b68a0d69cedca90f4df9 SHA512 f2ca38b1e8ebbe73c37d0c009b1ab65e103175a69c2d42a0c9e1e27576f1ac7051f051f2dfc323d417c3cffadaded2a178b2c927975a7377fe4d42a7f7e73eb6
+DIST firefox-134.0-kab.xpi 626328 BLAKE2B fe69b8c014967ddc649ed98e17f56967a2449f9b7107e9603d6202a97a093e4ffaa04431ca83867348bda9b5101ccbb936e3bcdde063eb2231e3012f8e06739d SHA512 76c6e9db97ebd1daec554e24ab48564281b4ad8fd198f5750c14bc94bbb40115cb76716e4f5a7b44d0b7ab2073f68f4ceee23f8b5a6c4425734268d19c21d2a9
+DIST firefox-134.0-kk.xpi 734784 BLAKE2B 6f77c28fd237f8ca9634ab0ad9fbe820dc78603b09ef3fe796b9152c4cb14bdfc3d0189c97ef3a6b19cfba01025ea112d3d6f46bbc7c0a7dc2f7e273d2edc6a4 SHA512 d2e32e4a9d9e2ad35b5fab0ef79921d60dc62e21e51b792f9316e60bf77394354e13b480cc4248579a31f470ed307ac8e66921f8cc5ae59c3fe73b5e209d72cf
+DIST firefox-134.0-km.xpi 529770 BLAKE2B d684dfcf62f0e5ec777e8dba8c58cd3ea0f3be9c3ff2db58164382b0ee11b03591bdc50604fab00bdd4d266a6e73202fb1bfabce854b15d9e1e9590cfd6bf5e2 SHA512 a4624a5cb60041ba2b94c199a0f6a8e09c5ce29f577bec7a791afc3d9eed944f9e416801c88fe158a0734f83d48a3076495e146095b2fa5b2ff481af86fa20ee
+DIST firefox-134.0-kn.xpi 494779 BLAKE2B 8f2e7d9ad8d67d0b03982738d3db00ce921befb54f1bb67a4451013ea8f583f91c79a468de37abc59c073f77667ebb3f7116edb08f393cea4591695c4dfb3263 SHA512 92fbc828362f09572fbf909e4b50b3bf3572dd5495f6449c622d6072d89f50ac095f8ed48cb7cb99c9aa92195ef033ec3fa4a44b21fbb13aa07380004aa20210
+DIST firefox-134.0-ko.xpi 688670 BLAKE2B 46552c5fb5a08da2e25a15baab5ed5d64aa9964e93ec6769a532f7e8808f56baa74b3c402eb80196f176c4fc90ebb3493971e2e70f96caf2da9e6e9d8f36f197 SHA512 b82a3c0d9aa69afc94f8e74fe1021cc28ff1d2521f432ade955940cf6c24418aebc3ca26f169d57ae105256d2cb34697d256ce4b9fb08f448c6d90eacc6fee50
+DIST firefox-134.0-lij.xpi 488327 BLAKE2B 9a2b0ee6328da5b1efc83be48a0cc5eea886df98f1f1bd55e9b3ded4eeec1ab5c2bdf105eaaad0ac547f3c0cfbb8e8a558a25429abb0bc7dfb8391e52a007db1 SHA512 5e405965493f3aeedbff0f06852bc1ec40c3ea9b440fd18a9de169956a554fe0ca0b31aeeec9840de49e223e1a87a446d9921e92120b59d7ccc6ebbc6a3134cd
+DIST firefox-134.0-lt.xpi 577201 BLAKE2B fa99bf93f7298e69381a4a986c10fbe203629edbb51c761c08b7ea40dcd9c6a616611096a3036cbeeb1c6c8e7fc8b6e272d0319c00be273c84cff934745d25f4 SHA512 2f37c3b318b1d5d985e32755a8a351791e83a0cec6215d02e435ceab7915d08afb06870f0fb272a179a63fbdb94de1c3f84bb94a679bb7bad66a7da29c85b76a
+DIST firefox-134.0-lv.xpi 590048 BLAKE2B 5a8623e003c2aef172d0796433797e9eb510b442066bcb45cb6fec5002e63fd7b81056f57f10ac59c905cc274e011e30ec92df5465e734b4297741156b7543a6 SHA512 73099be1cae3f0232acde3063d8b9f60bc3f22876449ffc53ab19e981db9927f7adce57553ddb80b2efa31f3db14bcb37257583c7c83360a2d65c2fb605f80d4
+DIST firefox-134.0-mk.xpi 497213 BLAKE2B bfad1e6a9c919f96d6692b2b2eea7ae841cae24cb532118b177c0c3fb99c040e72da88617f42ead86c63b9a83b945958a84b6b39839b91e9dd74e5e1e6c94baf SHA512 2d102dfeeb17d66abf6c2c40b35d99541dab01d64ff143d28da1950a1ffc46e99cf45317b4382fdd0a25de9db331589590ee7d8976ba50e12de5360aba0071dd
+DIST firefox-134.0-mr.xpi 536143 BLAKE2B be8b5a11105da49ab2479fec5fb15fbf7efbd7de6838c326515d296bc4e1bc2ea5c4feed5d65ac5de0da62a46ad33675ae027c5525c6615bfb2ace406366d523 SHA512 59d7555d590cbf6dfb855725e9ce85f6d033a0b3fb714b92e9b9a954868ed590df55dd67b4a45bcd1b5f4c5c029cc65dd7b7fbf7ec9f71d50668082f417f283e
+DIST firefox-134.0-ms.xpi 453846 BLAKE2B ede75605082be68e8965eff116fc19741cf338d987ad0c03dae4bdb441aacd2c5151e2fa8655c15937b7a69033d9f88474928ce60560872d71b812aa23db49a4 SHA512 15dbc9b1c56d97aecc79ebe99965b05238b37c127cdcb4c52035fa88d23b7ab3f8f5b97b6cabf9193c77d37a669a2d4de52e31a0796d801b0443125412d2de8f
+DIST firefox-134.0-my.xpi 522468 BLAKE2B 00a9e7328968c4ed0636c0531b835b1fdfaf94f451ea297e1dbcbe05c5946adee87a5ad9d6e20af897b4f56de0ce964773fdd90ace5f6e68ade4cc36b46d04a2 SHA512 e7794350f214bd015896e5c8cdd4a24e02b71a2bb73ae2f95ef23de030c7fb2e9f70431c342a99e12d8899da164ab820b56011f1ac7fb2bf313d51ff879b2596
+DIST firefox-134.0-nb-NO.xpi 625554 BLAKE2B 9ef2a904ce19d095acc49ec9ef043ccca21d94c79f84b69356e8f812f2acdaef768eed0922e688728d659701e84d09eeafc405363e931cfd30cb660bb3177879 SHA512 ee97217855b3cdc73f4d4529ffffcb570026becafbe542a8477ccc743475762af69edaa788278a60b9ea8d733a8b20bcc7a17f9303a603daf5a09585eabad68c
+DIST firefox-134.0-ne-NP.xpi 524811 BLAKE2B c1d4403220341adec278fc204b44c1443fc94b00158a3deebd4bc1a5c790c9706e2bd18d150ecd27efdac966c57a2c32aa67d6f367bb1b752176020a1a484563 SHA512 47e50fdfe3fd4921e4cdcc2fc72501a754d0e51d3e149cc093b82b9c4ad00e0e9951c83afa19b7b1e85e96923e9ec31f6dcc55f8b992bf742affe662fc153b00
+DIST firefox-134.0-nl.xpi 642841 BLAKE2B ed7bd0d0419819f3d9939b598328598de04b03b02fd3b4b65b2f24a419824d34640bbc51d8374de78db222120629768eaaacbafcb894fe83e85ba5dfba4207cc SHA512 44620f7fef6c7c4c3e41a966aca5902e58c1f04401e0e1bfd9cfca285355d00c82d038be55d62ab0769b3be0ca81400d12c731c2b82e4964c8ba05701387cdb2
+DIST firefox-134.0-nn-NO.xpi 629840 BLAKE2B fbbba8a0590f849df7b17e1cdad0a088649fd57a81fd008bc72c3d0a819773966bea710a7d234b3cd272e0650359031485e6c8c64cc97dbc03e09fca98679209 SHA512 d73d2338a401fb0fe950f78bf080f5021bd60da33077cc1a525c3da8b8297d2f9fe28f6d20bb3c0786f2c0f19dc65256456426d646533d60cb2d8adc9799fe7d
+DIST firefox-134.0-oc.xpi 626181 BLAKE2B 51e33ed53bc1e730867ada9498c2cc69a0a81ffc7c3d79c293e8c378036690467297cc33cd16519fd48b44214998ececda9c8fce0082227230ace54dff615d3f SHA512 67e2473eac8176557dce11ffae66c68bca5597f79d7f6151087acc3c2ee79806c34582d6e2337885a5941bc20c5524db4b0d081d8feb6918aada10ee15564f47
+DIST firefox-134.0-pa-IN.xpi 723083 BLAKE2B df9a2c5a04add3716b31aed17ed44389a24bdaf4d174ef7d728a74d5675a68857f2ac5944bd608e8da56a8c18c3ff02f3ecb07b5b43c7734ed7a2bb16dadcf03 SHA512 7ff4909d046317a4ef6329a109061d771a054672fced6365ec2c2d7487f665b98ea90ec5f5a45c9410e1916ad0122f92828a3267ea829cb38cca90ed9a503a17
+DIST firefox-134.0-pl.xpi 661734 BLAKE2B 0f83a5628415325aa808244c91ea7cd5483b19b5d6237ba0b949fb0ea4a2e4b42d002467d6d6313b0870c0decfd1b28e4969a94a136f9ae9c7a4cf719281b70f SHA512 ad8329ed1e96be483e9a1e809fa4dea71d867e7359b13e24db8b71dbda908972ed456ed89917eb0af4fffc4e8c952bf2060bd96dc46a4ca980ce839463765ae9
+DIST firefox-134.0-pt-BR.xpi 647955 BLAKE2B 8c8006f9bc32dbd1c24827be85af0be7f895a40a2ea7d7a2ce5f57da82381f3f919d132dba4db181c84fdc216ebacf49deddcb0fa290a4c64bbd3513f7e67771 SHA512 5a5613be6cb85e6e5175b7ef028a6554c37748f6439bc8fbcb7c0a92c94c7e0a21c1b67e1b6d243fcb533af9c5550435f4a19e132df98642d089c00318ab6dd9
+DIST firefox-134.0-pt-PT.xpi 654969 BLAKE2B ef28cfb5c6432a7a6544f689b2650b220f539bbae2ba8db1643812eba253168abb91be37679550155b090c3d9111a6636aa13879018c79aee838de6ad075033e SHA512 2f6119783cd9c5f7c8426b9be9dfcf3856c465e63966d38d4863b15734de53898c00fde3896beb965845bc0df2a33089b4353b82ca812660efd0ef73256f420e
+DIST firefox-134.0-rm.xpi 644069 BLAKE2B 4e00656d142d6fe2b47e1c37c44daf99ba49ef5e2c977fc4608dce721870fd18aae83802576e917e36cb8e1036ad8784f7cd22d37ef3da2dd961d56f3c87ada4 SHA512 5e95251b36d4ac8cf36307c2fefa6fecdba532177efed439d12f5492aa6b3114b2f13c31411ae38a7e05e3f15da703c4f06f3c519309349424ea4140ad59317d
+DIST firefox-134.0-ro.xpi 554204 BLAKE2B 152690cf27c8b66b1201ed2d5158ec466a2954cc94ea39d6781811fba05499fd127e9b0ee7fea54f48da69c183d91901e39f6e01fb124b51d0bfd0b002d23737 SHA512 a498a0be99a01ce8c70d099e32c25f1b84e9442fd940d288c2037e646db8cd408c7bae12f9a764759b04065a47aa455e5da7f9075d3e71e3be2516d19bb62cd2
+DIST firefox-134.0-ru.xpi 750993 BLAKE2B c1696b5da1d593a3439a27ceee154b12db6256c53cd45c29a684a2bdf6b4bbd3fdb8e70f76d488f8c5653db3875aa67049acbee5d10857cbc7ac9324280a0d8a SHA512 8777c13f33b6c6cdd8a051fdd1b4671a77d9e8c74754ad16129f28042aa5ad44981eb2859b1abb9cac6b8caab8163d0f4b909a9817b52395b9c233c817fb7451
+DIST firefox-134.0-sco.xpi 515423 BLAKE2B e1d0654918a714460c2790717346c469671735a07f330fcada32c4947991e7b0da93e497eb0e80d893f03b12097edf1d71dfed5cfa46eaa582ce8de73bcae4ad SHA512 7cb519be6f4c23b311bf3423b69895c19fb14e6fd372a2b75fabc7ea2d8c63cedf42f28f3c6e61f37db47879ada678655238b223c21686d642a8cdd6cd80dcb7
+DIST firefox-134.0-si.xpi 626867 BLAKE2B 077c7f1fc1320669968eaf605c6614799f6b2bafcd330b3f489a0624ff25e831a7bc38351bbb5adc0de64dbe04ced481f1c0e7a78ee45e868b5175fc8063f161 SHA512 b627fd841542107b098e4c6b7e705bec76f646e1822a99ed70daed8a5bba0048d9092aa958d1ae73bf7a41ff3d5fd74490d0b973e448f9d10091fe83d8001014
+DIST firefox-134.0-sk.xpi 680487 BLAKE2B c3dd9a39b74231e0af76498557d770898ba4620f95f144fc36d53d0ab588b350ca3eef5b8071764cbcdaa5d6005c23309d5bed497220ba8a340ff8582f99b1d6 SHA512 55b3c48e0593d0902042557245c5f2747e3796b24e5bdbf5bcd7c22a7c221684147058daa599eab3d0556fcde28620d81bbdb24a2ee874e15414ebed39f6384c
+DIST firefox-134.0-skr.xpi 727787 BLAKE2B 43539ce890c628d4cfc07d5169de790964f1a56ff17b7760e08e189c0de717f6a7014ce94176e2cf3539067b2906ba3415f183d3646499e77d51e0b3f9a91077 SHA512 2df6f26d44f1e0fd8b61660b2e493c5f6d477de708b86a08d425b886c4973bb92a4b98d18f66a9e2e99966e47ace1c2a2f143ae82d3681a2d37454ce5cbfd91c
+DIST firefox-134.0-sl.xpi 647162 BLAKE2B 59c456d0a606323663d03a7e76344ef8c5b7d909535017dee9a711bddb8672e1df23f10568ae5f09d49547dd97b4c03e28546bb2a13f3b45b706228c125e25d2 SHA512 c23b7540f60ccd69db8a462d34747babbd825ef35d0f68d72a1ae329889cfefcc0916ee7ffa6aebfd4cffd757a2ba6f1142cc3ee2a0cd95eda342fb947d9cbc4
+DIST firefox-134.0-son.xpi 420277 BLAKE2B dbf934e75653ccd7f8c7f987b5640aae1891c02a07baf0718e7cb0a633f20b079d910998242ce37f0105650e3a2777bc1f1da7fd46d799839707a615df060ed1 SHA512 9355c045bdb761e66bdd7ccb131993ae073015d9ce80712d64eff9fe7c27a109308dc14e6090103ccfe75c4d375b3348688cbedc47fda69cc6b13a95ebcb4239
+DIST firefox-134.0-sq.xpi 665689 BLAKE2B 7283bb5bfee040c8404bb60b3a4bec4a420ce9287719cbb22c4f596b7b00f98b7db25292c69017c92575d1088b7819946db20b0eca69d8bb6a2d67e44573485a SHA512 f1bca9246daba492d5e2ffb29781cd299eda64e4944ea885d1b25a8b31989831b83f830021862431ec5828c6bc35154a359b388af3dcb4caf8a28b0e3506e753
+DIST firefox-134.0-sr.xpi 676512 BLAKE2B 5052293123365b0655010824485aac2188c41acf68593469970596350de7db000f98043d32f863f7032253ae1075539178dfcdce8c4411175a15559335737c55 SHA512 6ffc9baf2fa80bcc61337c75b28f77b9e5c9915dc8c4ab3db3d968be0f80d6f5cc62f3e3057b5423fd158b663066a0f9b938763548c8717182be9911c5ba9fde
+DIST firefox-134.0-sv-SE.xpi 644572 BLAKE2B 2473d4381cc01a331621950916badbf6e8ed441f81bbee1f91fd86e218df50be1bc0c33a9f342454731072be9c1b39a05b0cedb1811a39c483952a676f471f36 SHA512 b364924165cc1e463ccb572ef79cfd2014352ccd4ed73d09215ce977f9682f0cb1f7653bcfadf26bd8f73eb1cfa9c7edc9509c1de19620eb3b7400b10792ada5
+DIST firefox-134.0-ta.xpi 511223 BLAKE2B 923c419aa600a129a26a4b6ae8f25a19b17804ba3b158904488c5fd072eaa04955dc74985f00baac68baf8583ac82b76607167873c3d86dbfc3ee76503c9208f SHA512 6354017396ca9b0aa2c7ab1922194b6406cb14648d96c7dce53f6d59933245e21292009afa8154358e82ee46da98caec94c6728199cfe5af18fc6013911129ae
+DIST firefox-134.0-te.xpi 575374 BLAKE2B a6cd392aa090ab43c15a25547dc635cdc2515342d4e71c5107c8dfa584861a50615bfc9604439595de43c66878df45617c6f114fce42136cbc3f3a690187330a SHA512 a4024e7e9a7301b93ffa0e19f770ab2380db675802d7ccb55f709d7ebdfa11188372b7eb8a83a2fcf44260943572ede7ea53823300609bba570151df356f732f
+DIST firefox-134.0-th.xpi 727737 BLAKE2B 5db06b144fd0dcae2412ed238c2025e87069972057e6e00c27cbaca2c6864537bbcb0a527ae0f220b7e5a3e9faf02034733a29f026e75be4a95b2aaaadb1e3df SHA512 f2580bd7fdce036cfe275d1bd0a44b31e93f155faccf980a4b662acc2b6daf6dc463911888d7a786ea107a0f8f986aa7999d792b24f908f87263b9ab6a5fa660
+DIST firefox-134.0-tl.xpi 538552 BLAKE2B 15ee6b545f884659252025d983339d71498b258b50062a1ecf6f542697ae5c4556acb7ee898471ea530c97e6f754180cc010f91ec50c9815829615d179000c6d SHA512 c14a59836795062f96059b6eca08b5b46dcf056bc360ddaed6181fa06f80aa8987955204b42da81b4e850816df265b50843e7b920f9e750f2f8e6530da0e16b1
+DIST firefox-134.0-tr.xpi 656854 BLAKE2B 706941944a18ea03de340e471e418d4201058105cba51a6eada0805505dc8b17df8d62bfb95209fd8de67e7500106bb132aee58f4484002305cddfc2cafeb6b0 SHA512 f8e31694235fd77d5d1e3136dd3a53ce4680c07b3c243a0d70e2f32ad98801c3af7c417de2d129fdb170238e6b55499f213d4d6e2b7437b1fab9f6743b1200d7
+DIST firefox-134.0-trs.xpi 507813 BLAKE2B 7f1fb796821aaf37fbf7052163fabedc57453f9cdbf2c4521db48e3fbe871dff6c2e873be091923073703cdc27668f31d13fee0ae82045f8dba4e7805af94d96 SHA512 9383f0a069e47f5ae6959df6ac026b69d074a7b163ff5c1f3c72861d558d0bf9ae0d280853414d84ae5d7b6f32688d134f5a5db0b6b27720747913e0c967248f
+DIST firefox-134.0-uk.xpi 742077 BLAKE2B bbc0c8813459ba0c0f54fbdaaecadc9c729535b896005f6d2947ca9ba09233e7507ff026579632604598e768d396fd34ac3291d25a0ad56855584b24ccdabc85 SHA512 920969f555f31fef82325d8cebd213a59c7b0d895044538cd34e5eee0b9f688657e76e9c0f7c6489a7bda660ff6747a7902515734277adea2a7939ce59a56d96
+DIST firefox-134.0-ur.xpi 564382 BLAKE2B 90aec1224989da6d6fcc88e99416a02b84909bf018e594a09082fbfd4947cd9afd649e83b972a72791a2074ea4e01b93997bb6022dcebfc0c5987798d49fa2b0 SHA512 e1c354defed3fec88cba9869296ac698d380c7c4450135ede9409c0c049bba0af01e774591881bfb1a71536361e2d4c82e67848138a37cdced3bac6b6f4f37b4
+DIST firefox-134.0-uz.xpi 482831 BLAKE2B e9bdaf98797a83b71e49390d7f5a048158f771734d213165911160550d5cc092f4701922ff3ab5c58ebedca88ee45a369977d6ba76249797061987f986b694c5 SHA512 ebc41f4d9e12935d6d815eb782a41e7ebf8e237f3e0d3896f5330690b80454f00c36d3f067be26b068913bad93bea876a7519f557aa0c497298c6225a0b99161
+DIST firefox-134.0-vi.xpi 683428 BLAKE2B b734c15bfb6712a665ea53d27c6eadef985c3c40235b52d4438ffe8c3984b387468c95e4b1671ed179377d94b71eb60e7275520806707b5aed19ccf14cc044e8 SHA512 4e15d75acf84a780bc34cf11d78a0568fdae087be441870df82f8fbb6f99f6bffc45763542d5fd8983b4410d7c10d6c900730c7d55b3f611c2b302e71dbb8a83
+DIST firefox-134.0-xh.xpi 421002 BLAKE2B d491bfa4f6be41b9403e13e0c1752878222a0d8f6eb3a7466e19efb217a2916143beedaab4512378811faf733d2ab39e9355e4bdd7c45333499be970333b98a8 SHA512 2c6005ba3716f6124a4baeb3210b2cf90ee9dbc51a1b3ace99dc1a3b72d3142c6b62d91363be17629cc0819aba23ebf38fbd53eb37b929e04231eac52436c4b2
+DIST firefox-134.0-zh-CN.xpi 684492 BLAKE2B e0d23ae8493c56b890e1390e6f472cc6d8921f296f0b792fe7c4dc82c3af465597152ec41adbf819a5a775af8f2eb486f3a62c01de246dbadf106926dfe855b4 SHA512 71486999caa8e8a3f8b6420ebe97111855b132fe1f1837ae85af112cb5a30a6b264bc659060f9da48aa7c7745515dc30eb05e44b2ffeada09b5885e53231e443
+DIST firefox-134.0-zh-TW.xpi 686751 BLAKE2B cca65375ac4d4569873a79d331604c88022b9ec8a19967d5faeba855aa89092830cd1cebb16d45aa8135bf38fbdfec53c69a307e79965a8ffc4c308ac617aa56 SHA512 18d9b8025eb99302644b7a2c535e750414e0f419886c4fefb517403881798bc66aa5084e3878b9e37aface79a624c725a62f3b00a89825ac061ff2469a704485
+DIST firefox-134.0.1-ach.xpi 468175 BLAKE2B 788b4c43d946082fedebb17be89e3cf434015c882655a5372dcd409d63eb7792ec5e10b1482ce5fd0b925d77441fa12804e4ebfc71a7d82f61d4b0805e7ec0e7 SHA512 e13f7cc1d3f7d27ec7e11a980cf89a767dccc7c4f35b464d27dea4ebce5ef781fa2556dd57b9c8335177165cdef11bc777ba21e361fe38cb771a31a99a1762f4
+DIST firefox-134.0.1-af.xpi 421160 BLAKE2B 2d7a974dd2862c6e69412045908847ef9725398d099169320da54b03249f9f2e56caef908a416f4e2ac4595bd1ffcb7636f156f8d06de7f4cc198c5de41e6e46 SHA512 99e97009f5a63210a1582712801a997d8dbba70b21853df6e9eaceaa52351df447936d5656b03c6b7072d824d0b5ae00b898b52e2475802eeb095386dbbc4c18
+DIST firefox-134.0.1-an.xpi 510941 BLAKE2B 8c161c455a5156992c5927bf7ad72742986a6018c514e71e2b8ff3a9207d86bcd80424c11e18692af8283da8ad8580337984f61cfdc8abeb190b3b2a3ad34270 SHA512 19b722c6fb8114e73bccf239dd08c8e184ba66fa615c5dcc8aae577f469248b85cc25b26050d0ca675c0ae3793b14d0f2d10b02c24d1d89959d0a03978fc155c
+DIST firefox-134.0.1-ar.xpi 633882 BLAKE2B a19e83d00690f621e2bcc1729a981135e1a888935187057d6263b3d29b5959c4a7f842d0b566a733be15bbbb810bdc857fd7d589e56892bfd50f015a0cbc9855 SHA512 28114c4f7971dabd3e74bc22f052faa0ff151fd87a693a681217e4e4e15a912c1f6ebc54d4564f96456f666509127a0abfd7bb761a092487b62f1e8ecde3f235
+DIST firefox-134.0.1-ast.xpi 500078 BLAKE2B 1bfd6aaa0b1959c1039c1e3b9aa1212ee2bf94d07dee1d0b0e9a77d33ac4c83a58f46bcaac9039a2af6e2fe4a258c54d5478fb0e3211bb146764195eae8516cf SHA512 f39812dcdbe5641ce2e1b347bea72060e5d337d39d3133f2b272d3f743daf825aec187015fb086cdd57ead5e0b357ccc77cb9183d706f29ef1c37884a0549960
+DIST firefox-134.0.1-az.xpi 494905 BLAKE2B f417e13bc2d2152542becb6143eb7f4af0352d0a82171b729a5d5118ab934af46153bae95f1bad56665567e12dc01bebcd7bd6d5c727183e41993029572c99a9 SHA512 54ebc1385587a4ec21332e102aaa6f20ca4a4be4945540f2f3dcc2e2ab4fb12df7d6b5d8c5d3d5743131eaf0d30086bfab91735f211adb9a85ad872753c4187f
+DIST firefox-134.0.1-be.xpi 744277 BLAKE2B 5fff8ea83331f397a4ab1828cf2fee3645abf897a6fbd2340e43e11e0ad8c42211e5c418e1dfde2e1e9452837954f04bac9bbb76424bfaa4a8f072bcfc5e229d SHA512 c1af86b6fd488da66c1d7bf11cbb63c45383b0e9aedc1c3bbd2092fab159248047b8e9e16be7d156b498652c52e745eb86866d9f0fabc8df72e0e72012b06618
+DIST firefox-134.0.1-bg.xpi 670911 BLAKE2B 01b8dc1038b7b6e9128958b5e739c5a4b3639807cff8df1b050359f2c3fe9811888c5c9370f647e7b3bbad154758a0e1f6b882b8afa51474ef157930e7cf04ba SHA512 8f9d8be21c16001c74fa19d627f2c2957d131dfbefdca91b27f002cf565038501bb0411828fe78bed2345868fb6afe6d674b2dc06c51dab8519081e8613e326e
+DIST firefox-134.0.1-bn.xpi 615533 BLAKE2B 53b652f52a148c45ce7d329944eed7e84f00c93c26070e312d52312c0a1f0681ed547b8ade89271d851ff10fe2299d78272df512da0d4667c42fabef1e12ced1 SHA512 c676dd896b38358f798d721ace3dec428ef6be5d23284ec0dc808eed6e99cc740f602413d61a38033de9438986eb9e8ddbbf87c9ce06af3d4ae4273073e3bb99
+DIST firefox-134.0.1-br.xpi 598067 BLAKE2B 1261ec2774e698f450dc310eb567ef553a61c74a952a294561063e07488fad48df6f13a53ddfec5a167583d0d09f2a8b4bbd94cddf9fec59530fc2834797abdb SHA512 1c33a1bde8b0a8eb217314803b09b36d876d90cd5b539edce79b89e7751e3b50d6c21e8645cff75ed955d9fd2bab4df6df4e65582ba4b7975e2023d726440e81
+DIST firefox-134.0.1-bs.xpi 557253 BLAKE2B c28892d717b30aae7aaf7aea077197a307678d6fc53a0aad48f639357d61a3b93de2b370263dbe793f372fda644d7d539435bd9a232b990ee954d80578b04d39 SHA512 a7220eba676b0346ec1f2ca59dd84590182c4b908a2c8b886578a035f92b6c1d921f31f7083dd0f172756e6a182b4bf3e90c86ffb520a6b08a9cbf19378e1206
+DIST firefox-134.0.1-ca-valencia.xpi 550233 BLAKE2B 57d2fda6869373e843cb307884d3f4d63f3b7e9d7502effd2dacd3e7ce87d08611f8c4ca8882f2a2bcf0a0dfb6db66b8af8ce90fc5a58f5aed0b7def6bd7a422 SHA512 90f360c20371763990a90a958f4be72c34897e372ca2133312f5b3325e33a9163c30a76b1b3cd667497e3dfb680d2aecf276616ffe9842834957062895bbb894
+DIST firefox-134.0.1-ca.xpi 607763 BLAKE2B 471abe72ded5f9810f7b1d91b1f897772cbefa09c4ecb14d8cad38dcc1add0b97f229cca207eabf66989f06ebeaa9404185b46888828b45f6e7e295a194c265d SHA512 4f422d4d2c7800d194cf03741b7b9a51b53c14842e96a6358e6967040d3866f451ef977b1a099b32469b362b2704eb3349c39a5c0e981dc5c016c8eceeec3af9
+DIST firefox-134.0.1-cak.xpi 597763 BLAKE2B 551137974d12f5e85bd92e6e98b9ccb0ab021034c05ddd48885405610d78283fc923bc3bb9a93006cf2cd421e6d2b0049028671af8b5fd21fee85f6f3eeeec8b SHA512 e20e9320d6acb09aa99750c8124ecc657456bbaa8f55bf106a7105f7e6fc57b43a91edd5da4aeb9a7bcf7f4019c0e6e1f4c5d532f14efff7f517b7459f920f15
+DIST firefox-134.0.1-cs.xpi 688666 BLAKE2B 2cbebbe2d3232d528d53cabdda6302980d06c668519d749e901a121f5cf770b4b138f3e360f84bf7a36216cc254270368aa5226dfd249a62d11be141369550f3 SHA512 de5838393bbc6de2e38b142fa4a87d19b72e4233342436b7cc7bd9c7d9a4ce472eaa26b5a7bd4db4107f6e1d48536b29dc1ccd8fa69a7514cbb792fb2b2de4c6
+DIST firefox-134.0.1-cy.xpi 649379 BLAKE2B cdd5ba1d5aedd5851d255dfff6b921fb410d100b562640ff5b4933296e307dd3663f6d4b5b850517034d33f5818dc34856655a0379e7160342d7060818d59a13 SHA512 f7f630e45abbacab40e647bc88ba3d1aeeaf3c9c59f029c86264812713df0f221d33179f7d0f88a32e741d55d31cdb7c1f7826c2399a0c5b7f3b0a5955d7c9ef
+DIST firefox-134.0.1-da.xpi 637282 BLAKE2B 8e164298378decb7ee8619099fb6f6dbce3ac154943fbd3d4ce8a626127dc2cb7ceaace59866b2fa923f48ce3c58fb9e055e27518ddc9b949b40753e99ad0ad7 SHA512 565f69bd98a0d5b921deae553436a2ac2e0ed72e04029bf1488d81a05d202729642e0e1bf93d6d9e51f718a9b05fd4f10da4aeae3620743fc5745d613b5dd49e
+DIST firefox-134.0.1-de.xpi 661272 BLAKE2B 1151184923790742a50fbdb05b2477fca7404c2ad245d65c0ab8fe0ffa599cc3676cd1795da779bb60a16f6f76c0f520ef890d7eb776fa91e164da6803fbb7e0 SHA512 fd1dd3da2d952cb1eaf9f21f38a3f158a057249c4a2f7d761bd1d8e9a6453d4c50d494dbd3c81876693655c866cedac4204ab72b58174f07319a68de9714e197
+DIST firefox-134.0.1-dsb.xpi 678091 BLAKE2B 72bc98f77b5c4675f6c1631af4df7ab82a3d7d2807c6dda96f72b1c6be03b40e87fe093ba8d6486d04af78f67b2c4824555f8bab4c7598850201f8ec4975c862 SHA512 46780423beadeeeb8cd590886c29364be69e9a6886fd0e9238c346cb036f7b069c7d7c947f2e9c6fb9ea6f89566211057882093adbb9da252c364fb7797c46f2
+DIST firefox-134.0.1-el.xpi 760434 BLAKE2B 9fd7aca441b63d304e2c5d6ced84d7ce6dcd76000475171fb9c77be6cb9b8807dd4be9bb22efc74fc3744e49f38be02fcbdbacf4d92a3d5253cd8875dafd956e SHA512 a52d07337891d3fbe583651e24c91c378bfd1bb5fe1d6041c27b2cf441ae168a9ae3f5eb5d1d74fae25b719e908091aece73c415188ca70bb01c21b23815727b
+DIST firefox-134.0.1-en-CA.xpi 607984 BLAKE2B d1a0d2e889d59ee0d7c006b12ca97f0c284f53563dabb963294981cc9c4462cf7d28d3d5bed1aa9b9ac999cec154e88967a59c1c596cdbb68358c89ba002abbd SHA512 bb0774b4d6fb47ff411b90ca0ab9d98ad58eadfab9123185b7f46bd7ac610cc5e2b0f4a2ea643b4bca10c2d7ce34ce2de5a0fa9548667a322c82eb4235a25ae9
+DIST firefox-134.0.1-en-GB.xpi 609115 BLAKE2B 362948f71c974bcdab609bf9516f2f98b52540fd0a790dc8109897c78360ddf3dcccf661167f986974d0d9f0111a023fc5b86f2e784bc1787621022efc6268ff SHA512 a93dac733809e4842d0828388e613cd093526b762507676ed147c08d20aab711f36431c8517c592f590761781e48bf543ff8c4a7af0c3792345bec1714acd720
+DIST firefox-134.0.1-eo.xpi 640105 BLAKE2B 09ab880f6a2d34f2857205d409839078f4a2c7126f45dabc94f1c06b657bbb9f94514260007b1c6882433621281ca229a7115fa8dabd04038b091a99ec25bf18 SHA512 c1b8d251f86174ca7807de476d0465e0ef92f76a3bc4b1f0baf4e5dc85727d0f75c5e534ed9851c7d2b8b670a0a981e825f6dcbdbae38072ffb1df2111d6ee1d
+DIST firefox-134.0.1-es-AR.xpi 654023 BLAKE2B 4c1016c614999770a7fbd396bf17ebb8a0b87140cfdff8ae00108f8b5597828ff517692fb3521f69dfc698e4dc50ce7b80df9e3133f791c88ad7069e1a97c671 SHA512 5fa435a477224b2cd15a0f94648b9240d5e29da3102169cb3bd8098f7269c92566debab34c462d38ed3da7b1f77c942f29f1541e9539cf0a9bb8bc6e829240aa
+DIST firefox-134.0.1-es-CL.xpi 653723 BLAKE2B 55a8eda049f5eb410a12cfe4ea09f486e9a0626b9a3a0e3f4ba3a95f930243572f595edff3b416c265c086d847e8b7e50212f506e934dd2faaea18b73ec5826e SHA512 251911b2690b22c57234bec301efbb7e5a85a894827279dd19c28317b1883e1e586c0074aae0aab0b726b06f143d19d8626d424f378d51e22e703a7c2272456a
+DIST firefox-134.0.1-es-ES.xpi 648563 BLAKE2B 620d4736cd3e41c8210cb4319e5ce9c9fc8262bd599eb7c8585740a7f118a74c599a5f4a2592b4aa0dee2bc33a3a39ae0b48779d8d156e9d185b7914c4646caa SHA512 c65720d87b60f9f9d68078bfc5f1d0b9420940527ae42d43bcad9d74464b6eb35aa2cbf2cd1583e09cd7edeb930dbce5270b4b17ff2041bd4fbd58534a21ae7f
+DIST firefox-134.0.1-es-MX.xpi 657160 BLAKE2B 4e8ee9b9b1bfafa2ed83ae79581f349f46acf0baaf0481976168b7414547c6e9736ac513de6e414a7fa25279c90ab651131e789fb7e36dd2f4c35ac04645ac11 SHA512 1a5e312dab7ec5cbd6f1679dd8b53ac4fc0d856ad458b1f762c358c2d2a731e7b753e9b6354a0ef369bac5d87dab661abfe603fbeb6da287e57affb3c634af4a
+DIST firefox-134.0.1-et.xpi 546711 BLAKE2B b673824bf57de531f23c34ef8917132adc739f4da1668c34e8d075b231c42e90a0c2d6ff1848b63ed1b7a6bcec142af682186ee66aca601a42ce5ffb0cd58466 SHA512 0d2f9b5af88b640d25428cf6f189be31d98e17a04d57061a6321eef82fd47c3a566326f4e7098cc066e239c4f900016518dfb1e7cce258cd31eaf14672ffd78b
+DIST firefox-134.0.1-eu.xpi 622843 BLAKE2B 1834e4d050bc6b400a0474e8064593254a9ff6f43eeec7aad06be98efd5a082ced7dd8eaf62575bf11d3dbe5aa620466d8ba35f89583c1fc2be919a4674b5c9b SHA512 110b7f787d8374e7e586ff6ccbeb9ec7d87cd5886e388a586e8d5fbf0617931f98705880ce4b916eeea6740c8f92fdc30d27a448b0a94b67c37052b7ff2be3cf
+DIST firefox-134.0.1-fa.xpi 625170 BLAKE2B 34943c9a14758165c3685684e74dc19d381a5192375bb2ebf500d3bed5f62d8dd771bce500ab5d9d71a4c63765bf3aa30afdef496bd9708974dc31324c76b85a SHA512 55dbb1949d62e042e3ad17b77044660292889488a357a0f880c5b901982298a41899e3d5ce782506045ec5be4d53b0a99dd9d8c002d754c523c23a284e5a3e3a
+DIST firefox-134.0.1-ff.xpi 479988 BLAKE2B 72bdf2767f69b94ea78e24e9991aa0a71d73c9f9ab1fce94af26e5292959109b8c0a8ff91b22642eb65c6d244d6aa85edc110f48e08752abea379a3efe4bffa7 SHA512 4eb31ded1971a531f19f6f3852bff48a67f855204956ae41eba137dcf43d5e84cc4de4282c3b7efe971e1013c4dc87d8928ea78148c5457b56417b1328a9499d
+DIST firefox-134.0.1-fi.xpi 634175 BLAKE2B c28718ede4a3628809d7f9d77809540775a454e16f23a436ca22ada68d8fb75c28e0a39013ab9f8fb591c579c5582766845fc51f88a8c9cb65b15bb648c26178 SHA512 76d16c818beb8286fe4e633d20f5c0def02184f06773fa3bfa554fdddfa6855e4137d5691dea56d0df6c7887706fa4b59464f0dc8ec42d357f53ea310006a5a0
+DIST firefox-134.0.1-fr.xpi 667539 BLAKE2B c5edf355d8301bf0a4a245eb8ad2a543af2c12a2f4549e6cf6611514387c4f3b1dc8603a9c2d41cbcd690db46df707a9a584077b59285f4c5c118689ad6d1820 SHA512 82b4756b45effab7cd322869d3c0f82707b7fba8d79c154df3e748df1e04b57264a1b9ee6bc8e8bbe597c91d011e0b4ebb62877dc847867444798af0cfbd05a9
+DIST firefox-134.0.1-fy-NL.xpi 649682 BLAKE2B 00c39830cc589349b2e4aa92f24552d10a1df719d6273d86b2e02ba2c661d548914ece5371441c68ec6412086adf886f894e7797025affca93cec26ce62247d2 SHA512 b5fb3a7444ad8cf21ce6302642e23a6dea4025289a2d381b8fddb6605acfe3e69008c124f6995f634a1063dd5339b7edd6463cba3b4e6bbdfc447f3fd55f1eb7
+DIST firefox-134.0.1-ga-IE.xpi 474979 BLAKE2B 9fe63cd9e01f371803d0ce5afd0797016c24d17c742e47ba60c1a9020465103825d9218bbcc29053aee8a41dcc80b9f018c66d5b0a9f6d9016088d29114724c8 SHA512 0c5a1e62956e91d468dcddfe7f055ac9177cc1129f3158a99e186400ae62cca687b0a305833fb4bed240d42da3736bcd4727816b236920af6df7990e57797729
+DIST firefox-134.0.1-gd.xpi 603290 BLAKE2B 7d111ad363dc155d48761105bb846f3a0d815cad1dbac38dc398b2145a13af4c20a86f82b0ed160662f7157cbf1ed4c1307503884ffe9ca3265501a09584f8cc SHA512 bbc0757de6f144efda90c58b3a61281971fb854310f73e64b6eebcece81162cee81734830de4d4000b763fa30032ec7cc1107fbfa4204a5a2df5dcf40641447e
+DIST firefox-134.0.1-gl.xpi 614904 BLAKE2B 5faa407f5698eceda380505156b7e7ecda69e2871ae3cf1ba46a1198d3ed9636c762178209cef8b1cc285bbd58f1fdd106e724fc91cf738a7cce073ae2ac542b SHA512 8a30c2ea9ed3e6b6f335f2d7d0e1f58ba8cbd6b58859ffbde90ddf935c9cb17f56cd17439169be10a226b2a69268ec96f934211b3941ee8cd2da9cd1335aa74d
+DIST firefox-134.0.1-gn.xpi 661075 BLAKE2B d651686fff74773c3cdfd5d510d2dde2f666642c860b34610780c10cf66acbb938557700bbb1e565409fc26e00e2663b5c83edd2f308f9e2629fb5efb28ffc15 SHA512 a1c192261a0e5e325227dcfce712fc38d09e6f7546f74f82c229c3a16964ef5c0e8aa702303420394821eeb10ced49bf4c4fcf1d0e3494c64f91b13052b85904
+DIST firefox-134.0.1-gu-IN.xpi 531505 BLAKE2B 40d949467fd2fe93e99c7f496927b436b74cd0233af2d2c83efb06079aa2152b8006f953965199221666676c420b705057a30f827921b348d8e24e6568b36621 SHA512 f62798ba22e9163adae024de3349457ab4016edc1601c0fd1ff724b7c82c02dee8ef87fedd2265a1ea1e071ab7d0d72937523efae3d1d49bf15a7055b5a4da98
+DIST firefox-134.0.1-he.xpi 656240 BLAKE2B 39590855f02159d23f5cd8e60c940a4052a6f75be8045a37f678c99d877bbae9cb9efb1f5b05795b15ad3c2d0b3fc3d42fe913caf29af5dea703930a14f2dcff SHA512 8e8aa41eda57bdd2db844142fa49579edb43dde0d954fc78837dc9d4ebe3e3ad56142b6363c831409f2f0ba552c1d78014d06aa85c01bd4287b23a8685604696
+DIST firefox-134.0.1-hi-IN.xpi 570947 BLAKE2B 967cf67999796bd0be99befcc0afb425ddf13fa2deef026fad18951d402b3c321b1c4172b6cf5b108dee6813ddbbbc999be95ad11d375a5391576a5d0d6ce701 SHA512 c16dfdc8a9f178b39df53262936e39a2dfc3e1f53e208e2e589b7dbf9ba888c28b86814404ad798bc70f9ce814c2023d6ed0f238da263b173de987ce5660dba1
+DIST firefox-134.0.1-hr.xpi 633368 BLAKE2B 798befba32b265836933f7d19bcaeaa24cba8edd322b7ac996880f8dc4ab549bd9c53e002e68cb18f3ffc40953c4c4369944cabe00d06ddc0e07a35c8872808f SHA512 f2d230be6cb825458cb4e636095e74d737bf14997ee24f39a80c0882534df5af9a4c9702cbf45d86b7fb37b23c4627c7955fa56377c1d8a2478d73cb4e1fc825
+DIST firefox-134.0.1-hsb.xpi 674093 BLAKE2B 8c4cff5e920c63a394e0c393e5ffcdf2da24802a154fb9adda381ce15e802842d09fe6e83693b5401b24c92dc6a37861175b59a1d0cbb61d98fdfd6eaa589f6d SHA512 c455f94453e1cd9b730299eff59650ac304514ad241757c6ca895ac49db50018831fd901e0e508921677775e3777151310f24e667db4cc75a2924b3f1a9ec412
+DIST firefox-134.0.1-hu.xpi 678160 BLAKE2B 45810ebc540dd5796ca79eb4506df9b059f8abb9d832e0838a897d0ebd9fa32a17ab9e712fbaa7708a6d2a3b7e43aba140e54ff6632568242042e16199cd86be SHA512 120f50eee0b1e1219fd02d5d7d8057d0cdc519727aa319442154890b99b3ce3fe544283c77b8af946bd236edbd4bfc97273ec17aa4b6f02765083b501813c523
+DIST firefox-134.0.1-hy-AM.xpi 661668 BLAKE2B 1bf61ae9d99823097e1eeb4de17a521735c4dcb3b05c566c2bcb1cf755e1618880413a7030988b2b2420aba0ba212e36906e3e7097243189e64a5f4f484ff772 SHA512 dc8187317224ea007e39481a6c5872a15c15c0a21fed056d9f8ff5b3ee733a8f0619e6d988d0653edd6eac048305d88cc4bef8d3a45a54655ed454d756512c6a
+DIST firefox-134.0.1-ia.xpi 636637 BLAKE2B 75b0cc092f632bad4e8b05e8455aa403373a4d41ae7cfc11aedda32a4e932b297101459d53e8cf2a4f8b1583e86044456d285be1989bcef1e9dbce1de3a5e291 SHA512 dec17bd540588eab7ede462a897e6022dd7d6d0d48c04101ad566f09ac77c0cfe004e209ce6518961b540ef56856251eb2390d73d91bfe3f781790801e3c9c24
+DIST firefox-134.0.1-id.xpi 620031 BLAKE2B 3d9594e939287dfda94a271b07e9d05fcabd26021b5e75d7b23d72c905e6488188afad09654865addead69f70e158156761732c6380ebfc4450067e0eb121a97 SHA512 dd7d8b978eb809d99be1ea930496270b5b0a728eecb0893a15c600bb14063e898fbce3424e261048fec6e193c6838d990630f7aa8029333dfe149484cc571e58
+DIST firefox-134.0.1-is.xpi 642121 BLAKE2B 4da6a20307cde66f5a39246d966fff223c9f112340c23bfca79747caace201753cb51e8484a770f2f78229e936768b7722ebfd24e0b00ec52a704fc8bce2781f SHA512 a5816e6169cfd2031429454f4f4ec1943a2e79dbcb7531dc3c131cd035c4901390dcb122064d6e7687d9a727d1059dfcc9173a48c0974051c1fce6e7705b767a
+DIST firefox-134.0.1-it.xpi 646156 BLAKE2B ef69e5d790b476ae98bf2f9d3cb0fa27e2b8b9f54754f6f206b68922163465a707170ccbe673e91dd26fe9711d46b5b4bde8d99fe2b2ac0abff51f781d5a0ef6 SHA512 b45be9b36a93f21bf885d3c70fdcda2252509ee9b8e5c4e22e9278d168b5573741caa73226a57806f2455263b52a6e3bfa7db204e0ea461d5a47f533a7c5f73a
+DIST firefox-134.0.1-ja.xpi 704020 BLAKE2B caa33493e15fc4a0faa044d7b10dea04bdcc722e95c7bfc72a0eb78f97a4551c9d397ea4afba086364c1052d98c5904024084cfe06e23236fe1d00d45ae0e3fb SHA512 454b05d7a9238bbd3c8395e1175db275729950553e31dcdfb9d728964d3053b2cabcd019f76d738454c06554c1aaa41ef0e8f9dd2db44b62c0ea191c31da46a8
+DIST firefox-134.0.1-ka.xpi 711239 BLAKE2B c4571dbf8ab7ae8a9c5917eeb5614641221acdecd0e23cb1567bcbe7927e4457248353c72db1a8abb2ab14e1e8cc9411c6c4dfe17fe86c98845872b2a3db6593 SHA512 2dea45cce48b936cac676883d27efc7378adb4729dc639036c12902956c8e6eaaaf2a91274216c3a6c7b826a00aad81fa82d00cfc596cb44b683525afcfb2e88
+DIST firefox-134.0.1-kab.xpi 626324 BLAKE2B ef543360e97676a3a6cabdb3136f160aee3d1c2000f4828ef447f87c9aaef349df4e68df12f9dcd7ea10ee05f5b0e6b1543200f55cded988af3546913cd1e7d4 SHA512 1460708b8772a3feb4dcdae5cb93e0ad5b5ec31b8b002312493079d294af729e643f5ebd98b868c1d8b0f00b84fb307c6c2c80d4ed0d4530b431164e878fe23e
+DIST firefox-134.0.1-kk.xpi 734779 BLAKE2B 997bbeb292ae336cf892137f6247d996e9275ad178d4bbfe3ec436400a0b70433bb9faf6ca1db2bf2333ec723eaf3b062e9b5b3757603474d88129772c800cea SHA512 810f48ec04699b0ededac2abe79e4bec78fabfdde207b4cc18a9a4f770f5ce79e24dd2b35283709835bf61094309c171184a62b826924021053ecd8195872fec
+DIST firefox-134.0.1-km.xpi 529766 BLAKE2B ffc3986397992b7ea52fcf734ac3fe750825be92a2ad316f60a63a0e2b8364279f01741f4a6de07d852a5e02710124814baa48040f14efa5d179a13193bb5884 SHA512 512552f3a0b8a8500350e48f8b95b08b6fbd13e197c2a1375494140c7108720f17673a055783bc0563d7f1f2db643ff74ccc8f3e5ce1e27e8558ba47fd56be03
+DIST firefox-134.0.1-kn.xpi 494780 BLAKE2B 9526039df0db78e3f3f91a286b0918c8bc64c01373ac59a6a3e9c0282b8455ea3329b23dc740d0f134e909c5ca3d7049526477c1490d0266a720fae7c84967d9 SHA512 20c0ea269b76a481df5c03ecc9c9db0354978b9d39bd9d43bd55bc5956298d8b56c1a1edde1ec3d6b04e9cd83da3eb9cc4ebfee856c207f959569c282611cda3
+DIST firefox-134.0.1-ko.xpi 688661 BLAKE2B 026baa4268d3752812e9174e828667586873da09d12ae5f83e4391ba6fbcfec184e36b2364b2a72674eb17ba7c3a4627b41270f9c69f8959cc2627be8f8d9b1b SHA512 ec01d896bd887aea151527d456c52819dd201eb98f8a5e5bfb189fe33163e5c6811382fdd380f4da0a78bae5bc20e07147fe285d971a449ea72906ce22591d4b
+DIST firefox-134.0.1-lij.xpi 488308 BLAKE2B 14da2a82cfc53a9f87a568f4cc5b60e0d8f16b009c77cea776e05cdc4ac93f29e21d0e75e4c1f66ffa445d7e4ba02a4c68e8d1986d1514d05555d1738dc6e0ba SHA512 9f7a2805943b6b47fab323a5b258bdd2c9420955d48b9ad5fb9ddde64481feb1a4d540c47c73ec83385faf30a013c07bfae49c4cf1f2d7dc151767e7022f3b6e
+DIST firefox-134.0.1-lt.xpi 577195 BLAKE2B 091011e0e17b9eed978c7ac7ce688521d2cc0ab232884d4912ff2e2464a0541b475ef94ef8cfa5ed80addfa85586d246b44031b5988d9f78a21f2beef2ff7c05 SHA512 374e5870a1f17c183faeb7e0a69fd8378b27334ba7e21ba421548fcf95eab71d6a1fe89f404a83ae5e8c6bb881db41d48aeb9c0aa043c8568616aeb22f894a91
+DIST firefox-134.0.1-lv.xpi 590047 BLAKE2B 58ea9e0aa3202ccc3c31c83be173d94f528a6312ce4e7213edb2ccabf1921de88baf35f4114f8fe6f2d1cb94e863b9ffaab7f3dd1dfb1e57bd6511c7ec7c5b93 SHA512 8537d86331d77221903f3a5445db1cc37546f7ddb5586421449adc15a396c5308548e908e8a7a4188b0f2f4581aa007282461331192d3a8365b76bce0b234fff
+DIST firefox-134.0.1-mk.xpi 497207 BLAKE2B 509213b1283627c6ed7b1391d38f27e7f1a7a72f6221e8fc411e2e95175ca5747b4a4b88a0bedeef9d5a33a230a2c78879a841dce931f5c11bd672d8d1006293 SHA512 cdfae1bc8020fe9d561cdd1f7e0277b9f0a772d12514a8678f5f8ea96e20b649f8448b2d9e67ee2366c263bc5c72e83bd98d5bb20e32e559f0970fd26879629c
+DIST firefox-134.0.1-mr.xpi 536146 BLAKE2B d50880231e938be54d44fed045801f7eed192c0f710d36c6f2fcb9119074045611140c8c24d8b17f118f609f976d62df839965ffa25adb63a93aeabea432d739 SHA512 2cdd92c32658545fdf41f8b0ae50658be644c4c71dbdbfaefc7adabcdb5e6bf4fa5a32ea2fa16c8af5af232c12bfcd7c68551c9f3093863d433e2e6ae58f1733
+DIST firefox-134.0.1-ms.xpi 453846 BLAKE2B d9e1443563eff6d1bb2f09864e42632e4eb5e2f794f462654f25d062d6ceb989480b520b2a8afd067f4757f1d35154349f4e82433ec8931b7dd37b8c063e05d0 SHA512 40f99116731ac80fd4fd49fbc5d5fbbfaa7860e9806aba308a01960e2cf098f3c50d301e1a8ed9162e88f6bb56d9ff01566c0d3f835adca7ca66f11a08d144a2
+DIST firefox-134.0.1-my.xpi 522476 BLAKE2B 65d6149824f5fdc87552904f4fc5f569f9bfd70249e38e8ef8a7c723988f0ab18b08db085fe8c1ea1baab3b92e2a6749ca7e7bc434d73dbb771568014eae3122 SHA512 6dba49140c2a9c6a5348f18378da6730ea354bbc3366e289a1af2a5d5a7275bb56a4775ab958d42124690f1f51ba547d41abc2e1172eb5370433018016f989c5
+DIST firefox-134.0.1-nb-NO.xpi 625552 BLAKE2B c3c85efe7902e9d3e49cb6a72da6860eee84c4d79351a999484c3bad407bca372aea475825f6f3360156efb8b0ccf82945dc1ccb61a2914612ba7f89a6df7222 SHA512 7e06651cf7facc1ab104dc4a75fc3e232601afe9827556481e0bc28865f8b47abb8b7328ba90a730b5e811afead62152e028db8fdd94a835b9a70792d3fbb2fd
+DIST firefox-134.0.1-ne-NP.xpi 524800 BLAKE2B 0714bd61a28deada6e1d4097552cd5b67b6f8d0c8e8be973086eda3858f423665e2a0cf03ab23de00b77bd9bcacc780d93a4b15e457eeeb01447d2c40ee95769 SHA512 bac85169e2f70e7d5c358bdb78204d7d8b8b5e10003f9e6e67962cc38066f79366f00127187de2a131abe331cd998559b82a06073c24d6f13f570ec3a9a0267a
+DIST firefox-134.0.1-nl.xpi 642843 BLAKE2B 4d692e5d0beac05dca50dd178c1217a2076281a8eb55802e6e95ce56f8a6536fee16fdd2cba8451665a56c808ac484c7472e906db5c264170062b6a295d3285e SHA512 fa01408d61a098e26177f5a6b15f70e8812d4aa69cb7cc1fbb40cb414365fb7feda05f9880d5dbf4e552a62b527f5ea089b1fe2c26e6504528fee835b431ca5d
+DIST firefox-134.0.1-nn-NO.xpi 629834 BLAKE2B 4d7141b7774bf89fe9d6b46bd49fe1786921ae80604ca9c98fe872e18a0d118c43ce4c2ff7542e5892b90408b398ae3989528598455abfe41f936ea6064ca34c SHA512 31f5487c3de90a49464f45e0479f91442fc96d543a780d0381c3f88a33e13a0cbe39359fa2ef0162edc1e46c571749c8c09a212a96c3a0385ebdcad03e138cf9
+DIST firefox-134.0.1-oc.xpi 626180 BLAKE2B 968f2e94f341d0bf6fdb7d65f5ddd2393f0657e1dd1e24188a7642c7cd195c466910f5f937b8d8cbecfc8abc014b212e91be853559a4517b5ae144b0b3017b3c SHA512 00695e0dd5bea54332a288decfcdc45422bc20eb44b9e83b94e7c55de378dda22da2b23478d16b34744458d6db564ca022b63d90d724d000f8c7fae7f3359287
+DIST firefox-134.0.1-pa-IN.xpi 723077 BLAKE2B 053f71b2a2cd6ca574a30cfcf1af4e1ff7e08a8efb4d67908304230f88e477408c37576e9cb3aa1a22095aa3261d86e5bb4e597a74878fcd9f9562fda86a2ce9 SHA512 1c8ec921c5de189911c6f2c80d9ccac77b70c75752e43c4e8173682042cd104d9e416af065114cc8c32a7958cf3b470877fd8dbb7c59d2fe8ff7203d5731d03c
+DIST firefox-134.0.1-pl.xpi 661730 BLAKE2B 89079300e7317e686e68b61d9ae0ae1c0360882f7f01933f102634635c96ba8897bf00f9ae4288b7246071ccc0e83338267061b1df0da098abf11b10d552da79 SHA512 ec4fa15d1b3719c765277df503ee6ea42e1949d37ee2524b5d6ae30307db0ceee86837ce992a008938601966c925e439f42dbd96f421d781d2ec66a48bbae546
+DIST firefox-134.0.1-pt-BR.xpi 647946 BLAKE2B e14d24bc7d3bb37633a19f8f4f73fde518837819f91f0d551f370004a6061ede536939e51c3204a27b00cb2b93d2ee33d773e7d481777ff0af8c13c509e887f1 SHA512 8d0c6c5252064d7be5eee30384a3d39851319b206c158b78ee6cce146335c78bc847f37743fa76460f893578220e9c598103249c6b323ed816b1986b32001952
+DIST firefox-134.0.1-pt-PT.xpi 654958 BLAKE2B 438c9ad7cb9e2099d43f7989d09ca2ef8444e428e11ddd2e3c60878dd75b1370259b5302462d70dc3c5e5a6e97dfa6122eacd99abf363b78a2bae03f42295695 SHA512 04bd15d670f40827b25a47321d03fe20deeb511e82423e43336eb23b932de32cc606b87ce327e2d89860fc59c7c768a986dec0e880129804e5e63ed2165082f7
+DIST firefox-134.0.1-rm.xpi 644065 BLAKE2B 15f0becba9faa5ec3b83445103a6396c4f18b3dadda9491e9ecb9167fe042dbd2e06da47d03eac7d478973ad1a33f3c9aa6c3aa289d697ffb39a629c75ee884e SHA512 6e7a0aaa8a4e784997067284124e9441701e91cd52236e121651bf4eeb8f846bb04396f6eaa72010ac35ff8dba58e1da360b8b9f2e6213ea0de1d85888b35682
+DIST firefox-134.0.1-ro.xpi 554201 BLAKE2B 70e452ba9951671e6dd79265ec14c9cd5c1a1b96fb86586c916560674809b8ca1fe069ea1897b63533797c38fe568c68adfda7169c0107f57618d61f5790da1b SHA512 03e38daa7b9027458d0993624161bae6c2db824ff0421858ce11a90e4724e6fda754b1b71c4cd09b5b10b3bb59fbb6e419011c5d6e14ea3ece402bc7debd32aa
+DIST firefox-134.0.1-ru.xpi 750985 BLAKE2B b5e15f23836309493e20bfeebec3c5d364c3c33dda136407f006b65756b84aa4332a87b87c1fc6f3e2d073310fb2f595154121cee7a852dc73684aa63aa0456d SHA512 bdcc365a4659c3c7ccbd13632e93822572e4037d70f562aa944dad7b04811ac270554ee741bab77a16ee5bf9248b0423008f635c97eca2696ecdddace4f169e8
+DIST firefox-134.0.1-sco.xpi 515424 BLAKE2B ed5cce9dea2fd6ef9f12604db52282dc22f35fbe6a190cf6141245712205c8b5961fe0f04c06b72de3b4f8c855d9e5c0bc4e52956b91540e6f270a2b0e5c09c5 SHA512 d7a7e95bcb0753cb7697628b7229ef8a729d9fe32e3160d776842e6fa2dce2a34e76e6a63d89ccd86164b5c61b997898e44f5d30196d305bd5feb4f1e93b3a89
+DIST firefox-134.0.1-si.xpi 626864 BLAKE2B b6b9163b7cf77aa53a38cdaa22f382b4e2c244574e899dc2486f65d29746088e81c045673e7c66a5f44d69727f2f7124480c6cc13c4233c1bc8da4936f7a5cf8 SHA512 fd4b0bff150e04d402d7dc7730a95d254505fd71e500396986b5732b5adf121c40b77d1b6ee6d5e0450e240f12d359b491c85eee9381881b60b294fdd367fcfd
+DIST firefox-134.0.1-sk.xpi 680478 BLAKE2B a4d4bea37c48c58d819539a698ddcb3ba78e05747dde612092ca3616d7c754ed96eb7830c592fe1dbad2e9a3c589f93a9e6c318c7142abe0a23d5e2e1793f434 SHA512 9e0b0a832691dfa04fb524343b156059df58bcf9f9bba424e4c8865dfbf5dcdd28bba82b2db5fa60db1488d41b0512969c154e5d66d666362e51379c6a344a84
+DIST firefox-134.0.1-skr.xpi 727787 BLAKE2B 361fcf3bc793ffbc035ee7e16855f94025aa380c2cf432783a584a783b53b00544ee0d3bdfd58646600f1a57c1605becbb7f61bef27acb60ff0db6feeb377bf5 SHA512 85c1d0aa771bc23355818ecae2249e7bdd9c48fe57856aaa356b9c0527be1bae8afde2a8c063776ef1fb56cd0c7bff9a88285339353c75fcb304b8f637189368
+DIST firefox-134.0.1-sl.xpi 647153 BLAKE2B 1cc065a6fc66c9d912096c0b7f795d562389885848f42aacb1dfbfb8c80b9049c0600ae126c2b9daab98726028895efeeac1c518607864bae7bee9f06dc51d12 SHA512 cacc3bc097e493850f966f2d651beef9f139ebce1161c247cab19fd8ba0b93643795235e7bce9240e912255ac0d42a344313600d8a6abf6d2b1722053f5ae642
+DIST firefox-134.0.1-son.xpi 420280 BLAKE2B 50c91dacd8ab84485133ca9aba6989ca105193809607dcba3b83722108c662a51bd580edbe90f2945231362427d3e5a0066aa2c2d12f02cea3c3c905134ac000 SHA512 5ac00b2d8968fbb9bb3c03ea0218a47c29accd3dfa6314b84babb6727d2e017d5e0d858af7f38c873c09be61c70fa97ca92cd8857e6225c3a84e4918a3fc1398
+DIST firefox-134.0.1-sq.xpi 665680 BLAKE2B 0cd71ccd45dd4817b3a39b20fda396dc7e0cdb05df30590227091c583e576c0473299a688bda58ae45eee8669628ae4c4aedcf88debef8d263a7392072c46f38 SHA512 d2486637ffeddfe57b27d6e5a696d1aedec6ab5824e2b401e3e9a57eae02ee34d18ed63e80997c951d8c511f56794dc0b9dfb5bb8cc5e0c2c9683d385bb0b166
+DIST firefox-134.0.1-sr.xpi 676500 BLAKE2B 4f335c0f542ca7d4f7e4e0218fc67cfaf30088a78b1681c517e15a55a279885f4e4813a720b1e87fbaf39c4715ecee3eb4e79127fbdf23d090b72c4c126ec0dd SHA512 7c761fa604deb8c72898cbde1f2593f09b543d23919ab1b4b006ec80f8eb23acdda521b18328dda6449ab40da00e13d230d6f530b193af8b4ddcf2df745a407b
+DIST firefox-134.0.1-sv-SE.xpi 644569 BLAKE2B 51d03f40f61fab659f622df7626044b416b0aae95b6f5e29b792d0593c681cc931f97395999a11e6c2f6ba0ce22aebcb27c41eaf33a9ef4843a0e000674e1d1d SHA512 cacc53adc221f3ca66b03e3acd91b4b486f1df816e163de7514c04aa2b822b709c2cc572753b11f84bec3f4ee44c9b3f856630450fa4aa964c08be446639e2dc
+DIST firefox-134.0.1-ta.xpi 511214 BLAKE2B 1473f6543931c5b045a05a32232c18d0aa3cfcd9836459bf346c5c9828946358ad98a5905c22762fcd6f470f0dd6b385234730cfcf9c87105b8d0a3657215cc3 SHA512 abc7dcc57ee6ed1a1e4ef78183cf17a4801437d9993838adc30c07115c592743343706cfa1c3c03e5b102dbb3bada26f9af41e06efe622430c09511348938ee4
+DIST firefox-134.0.1-te.xpi 575369 BLAKE2B 1e941acb251bfbbd9c497dfad0aaf20727455a5ca1ca20e913f04a744c91349a6c221aed669abedc2cdc9c1eff255f9eabfce1c1f183a7a1d71f18a4f25bcca5 SHA512 c432f53a30adfd8e33188af5851674a75c80f612a784c031aed7b77e5f12b0aa311f157e3ea22d42742e6ab96b411db57624326c516378e2295bb194d5c5a78f
+DIST firefox-134.0.1-th.xpi 727726 BLAKE2B b58b778f7e8969ae9f7b624a814a1702283946239c85b67465fe3ea45d12d620fd3e41dba023e3837f41f3a95bedb68a4312adda2d1d599b4a3d0c24ae616251 SHA512 5f7085c7e6e1d3fd509d21539d1efe82e480bbb571d661748dedfc2550f25a21daeb1e5730b665f79759b6433a89274452dc38ac3d1784846a52f7d34b2e1489
+DIST firefox-134.0.1-tl.xpi 538547 BLAKE2B a411c7f6ef10343e11963a16e9303f16f239903b246f438c98be7e019fdaeb3dcaf1decb98fd4b4b2cb56921cc7fa87dd34bdc1f8d2d29a30ab43e0fd87cd84a SHA512 33755684f6c881fa4164bd710a988a9b9ae186ed2d987fcfab84351137c2f166b5732c32661cd9d9ca5c4c4ab180b8e6c6e93ae12e6e74aeb8be5abc325acb72
+DIST firefox-134.0.1-tr.xpi 656842 BLAKE2B 1667f7e399f9407130cc6b6c003ee86502aa5d7e54350201ab457b7e354855d41e01058beaf4ac0a8b500c6ace40408753418209f7bf653d76888d8a52efca5c SHA512 02f105c1ce0142c063c41abb41a3e89933cf86b53a9106fd6c48950580b318a3928bc746ede5b1efd6f09f690abbcad2fd47d4e5a4398475dd130f18a7e4c375
+DIST firefox-134.0.1-trs.xpi 507815 BLAKE2B 7695fb9055440fb411d3a14fefb9c0468ea6021fb726a910a79e0dc5fb6ccb1254492a091d11a67488cda194d3a176a426f42b5c3b5daf92ab294621069866ec SHA512 04f7913b61bfbfd8eca29907a56f2ea7afded4a7df892510b70717895095978444f8d3ee6259adb451aa1c57f9b2606b5d8d471e1295ec2219ae1c914a0a8816
+DIST firefox-134.0.1-uk.xpi 742087 BLAKE2B 16c52791649d5c23764694b852f7530bb02e8a959143c2891dd4ed90f6e95484930ffa7c24238065e0b33105b6ac9fa675cc4ec7532a34228d1ea0e890e2c0ac SHA512 5b2d0d98c5ab94304b6998f6d0a99a341db2d63df775c21bcdb181ddbba385b1c552a850690b7f8518f0a7301ea71ae5e394fc907b3632dee7446c7085a44797
+DIST firefox-134.0.1-ur.xpi 564371 BLAKE2B 680680c8b3ff393734f6cbd69a4474dc34748fa80124a9e28114b98f7e864eaa0356d1480d6f4b071c871704ac8472930142199ccad6a9086435fbb6d5608998 SHA512 e8660617e96cb4fb44d828f19a3350c78eec71595e57f5ebd6d8f16a2d132523debb6fdfa902d0a5231f7efad1c1fb2dd7e7b231fdb36b041f85983c10006750
+DIST firefox-134.0.1-uz.xpi 482821 BLAKE2B 929e808752c36b2970cf5e20de52818ab0d284d1047591645a1813edfd97cca455cc03da9bf1e95edadf5960809a73899279506369f3697048d2251efde2a8bd SHA512 8ec21ac0a20c3200c77acd371f0cdef717b919eefb9f3597c80f4eb67466ce09ad863c734c1c82c56d97f1fc360d579d59dbe1349d991df7ced56de025918934
+DIST firefox-134.0.1-vi.xpi 683427 BLAKE2B 0b9926c6ea07a0f43ead4201d4d639358f37c7ea5ce0950cb81320bd52050702bf28038b85604185f655779c8456d88960410b1541cac48d9b8f2d758031e017 SHA512 bbfe3a33e5784ab5bad0dad1e2ae9cf183cdc7e325613d42f28765a7b93631db147b4e4a0430a047248329ba025f04e388ffb636d960427e6d538facdf157177
+DIST firefox-134.0.1-xh.xpi 421000 BLAKE2B e294f811b4631e5f82a4cb5bd78b6975a57aca1e4d81ceab9847579823f6f38652551bd8df931f9798a5afc23ea6e70cd9a5e6b64f18deb797b1eb4b4012d15e SHA512 cd46448d84f973d38887d19d57a34e9bb049ba4f550d8acc901c67a0825460fd8970df1e2a88560f633234919840e77aeb29d39561a51da026484b783d2543a1
+DIST firefox-134.0.1-zh-CN.xpi 684489 BLAKE2B 2113c7de306fce3c07f98a2301bb9a86e4a9ff0b5dc4af4f1a99b08b787f71a99aca078fc0d7eb1cd86cdf04d46ae5b42f7fb0018bbada84e6e6ad9115de9e0f SHA512 beeea5e91bb502bd560b8100033dc922b51f2e06da01754845ffdc58c08b62154f3ccbaf6b71a4b12da8bb30da5ec2a63b7019c1665a881757fca7f6f8a8f2cc
+DIST firefox-134.0.1-zh-TW.xpi 686744 BLAKE2B 77b3cc5fa4e33e2ff940599082bb741bbd0dd3d5f75ce1f9c3f77c8440ee6b7eaca575883215756a5c40290bf706b4580f9a7b4a9d03277098e86105424d3020 SHA512 fe9393f2b5ed97c24efb82181df81d971238440bc41f6f716f66a3359dc9d8b583a81af8c69b504cdf2ae99fa69bff53f8240293c126eb2b06130e3ce031dc76
 DIST firefox-bin_i686-128.5.2.tar.bz2 88105701 BLAKE2B 7b939adeea9a6373c45513076ea21d67c320beb61c5514bec151bd044094b5e2dff1b0e2a0f5718975a3d22faee5c25a2b4f29564c3336ac5bde6e89311e381b SHA512 b7cda570a73523516b31792d14c53388fc197ea24131fd885ec2447dfddc030fb9d5cd040c788cb299ee701eb8cfcd4567d986acd7ed9f304336cdb4ad0cb5ab
+DIST firefox-bin_i686-128.6.0.tar.bz2 88053413 BLAKE2B 029e72ebb128fbeb4957a1ec570834e39080dacb9200b100b4f1f04a1beb298d5e589e904ec7a4a5c4808c6270ed2cf453cf3d5b1d51bbaafd89561d9c548b00 SHA512 580e2833fdbd315d152000e8d91998122fc0d09b95a179609d5f19aff47fda5747147443103425ae6873c0c7679206b2f6999ec46d25ff083177a5aeb2848323
 DIST firefox-bin_i686-133.0.3.tar.bz2 91076838 BLAKE2B 17e76bdcdef72c4729ac3bc97b9ed0b40fbca05dd49ce43d5875ba6a6af2b12efd4c8c149c688483dc000f88c3841defbb47f70584cef1626cee6e4f8aeb23c2 SHA512 21b9f400cb2be49615c44be5028dd1dabd7e76c54a4a89864606a7c9ba7bd32fb87fd592421c1b4229cadd06a862fcbc3332703797622b485e5a9266c6c943f3
+DIST firefox-bin_i686-134.0.1.tar.bz2 91561315 BLAKE2B 18ee672392d7d910ed3b9e08ed16fb1ca4ab2a40feb20659d263722358a353a16799c3dc0f2e970996e8a0eb957568118b2e2b47e35a833a14af1648aa206485 SHA512 a34757e46cd95d69cf98f7541c8a92bf232dcfb98521c19693048e6b27dc92b3d287a58f0e4281ecbe3ac09ac311bb7eeb71cd9ad95e78defffb3f2d32bdc3c3
+DIST firefox-bin_i686-134.0.tar.bz2 91691672 BLAKE2B de7cf31c7d13ce4ce7f9316ed2ef3f3f48840468f2a6452deb84364f666bf463230be23760d2bbd7f3fc5ff93e062a836dbe31e29e9411ad65ab60d3e3c68fa2 SHA512 76007936da48940871419cb6d64728108dd1ca2c47bb3d69466623588b51e8f99f2cda2fbe4dca47e7d4102cbca0a3251550fd9b51d7212e43fea3b5601fe443
 DIST firefox-bin_x86_64-128.5.2.tar.bz2 86795865 BLAKE2B be3466ca68de34bb32935cec4ac2eccd04fcaf3f4fd786573a2d00a7e0a108c920029eb635912b9bd6b5a78c4aad1302c05c51af8ccf76c6eeb2b3f67bf86996 SHA512 84117928f87166c884823aa63edb3b3ea067f00b26efbfd59d42b71b9e17b32102e05be629a45d46c1d6f06f1b67e5bcf312c25d36f0a513ca414bb4e5128523
+DIST firefox-bin_x86_64-128.6.0.tar.bz2 86756811 BLAKE2B acabef818f34376361c83a51dee7a3c0687f0899640f3a7b5b6c0598f8bb17763665151b02b51c15f92af47ac2e2b37ca90143e8bc957a256132753617ed40d8 SHA512 38d6367fb5556c86df933cc6859e3ea7a5571643ea8815c65eb2029539e07fce8092ee13cd3ae603120751d0edc994bc9afeebe0fb3ef2065106c4c4d75600b4
 DIST firefox-bin_x86_64-133.0.3.tar.bz2 89495132 BLAKE2B b66760769d17661bdfd7053968b632612a158bf604a5f687b6036e62547b364a16bd109fe068a5a1f8d100d99e8b1a27f310697a662295cfd838b9d916b9c746 SHA512 6d0c1e3afb5382a31d8cab5107de8c6d9ac07b233cf76154113ad074f1d0f555ccdb56898cdfff2075c97a13670f7f00049f761875612b2196ff14c5752a0034
+DIST firefox-bin_x86_64-134.0.1.tar.bz2 89774359 BLAKE2B d72416a3be6d82778af54fe00225ca32b92e3d955fb82c8db68889b838dde87986952b4a08eb799382a7c724324cc85cc7c19ba074bab3974d250452f8c14b50 SHA512 2e19abad3e7e05b3934cd35c86ce88c0f3f5232c1c2e4c7164a96de0e0e065d996dcf2bb94d828ada88a62a65f6d96540bcef5749f1a442fc05dee52c14bb13a
+DIST firefox-bin_x86_64-134.0.tar.bz2 89698416 BLAKE2B 99f8dbbf1a2cb4b5db5040a2acd2af877830b8ebcf9aed8d8ae5bf307e2e3d6aba9a0cb11f58f17bf86e5545cf5e4bba9fdc85e82ffc7f9bb1a6ff15141b9cee SHA512 6d49b9bd7acd5441b51e7cd414233e16e1df70552c2d61021e630477645bdbbe9af8fd95e8d6b8dd8b48bcf1b619b6de14681a7fcfb26a3915a626d1dd9d8404
diff --git a/www-client/firefox-bin/firefox-bin-128.6.0.ebuild b/www-client/firefox-bin/firefox-bin-128.6.0.ebuild
new file mode 100644
index 000000000000..63d369476e43
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-128.6.0.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+	HOMEPAGE="https://www.mozilla.com/firefox https://www.mozilla.org/firefox/enterprise/"
+	SLOT="esr"
+else
+	HOMEPAGE="https://www.mozilla.com/firefox"
+	SLOT="rapid"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop linux-info optfeature pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Firefox Web Browser"
+
+KEYWORDS="-* amd64 ~x86"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+gmp-autoupdate selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="${DEPEND}
+	!www-client/firefox-bin:0
+	|| (
+		media-libs/libpulse
+		media-sound/apulse
+	)
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	>=dev-libs/glib-2.26:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.11:3[X,wayland?]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libxcb
+	>=x11-libs/pango-1.22.0
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+# ESR and rapid dependencies.
+if [[ -n ${MOZ_ESR} ]] ; then
+	RDEPEND+=" !www-client/firefox-bin:rapid"
+else
+	RDEPEND+=" !www-client/firefox-bin:esr"
+fi
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru sco
+	si sk skr sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^} (bin)"
+	local desktop_file="${FILESDIR}/${PN}-r3.desktop"
+	local desktop_filename="${PN}.desktop"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if [[ -n ${MOZ_ESR} ]] ; then
+		local exec_command="${PN} --name=firefox"
+	else
+		local exec_command="${PN}"
+	fi
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Add apulse support through our wrapper shell launcher, patchelf-method broken since 119.0.
+	# See bgo#916230, bgo#941873
+	local apulselib=
+	if has_version -r media-sound/apulse[-sdk] ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		ewarn "media-sound/apulse with -sdk use flag detected!"
+		ewarn "Firefox-bin will be installed with a wrapper, that attempts to load"
+		ewarn "apulse instead of pipewire/pulseadio. This may lead to sound issues."
+		ewarn "Please either enable sdk use flag for apulse, or remove apulse"
+		ewarn "completely and re-install firefox-bin to utilize pipewire/pulseaudio instead."
+	fi
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${EPREFIX}${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "speech syntesis (text-to-speech) support" app-accessibility/speech-dispatcher
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+	optfeature "ffmpeg-based audio/video codec support, required for HTML5 video rendering" media-video/ffmpeg
+	optfeature "desktop notifications" x11-libs/libnotify
+}
diff --git a/www-client/firefox-bin/firefox-bin-134.0.1.ebuild b/www-client/firefox-bin/firefox-bin-134.0.1.ebuild
new file mode 100644
index 000000000000..4c5943a46216
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-134.0.1.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+	HOMEPAGE="https://www.mozilla.com/firefox https://www.mozilla.org/firefox/enterprise/"
+	SLOT="esr"
+else
+	HOMEPAGE="https://www.mozilla.com/firefox"
+	SLOT="rapid"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop linux-info optfeature pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Firefox Web Browser"
+
+KEYWORDS="-* amd64 ~x86"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+gmp-autoupdate selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="${DEPEND}
+	!www-client/firefox-bin:0
+	|| (
+		media-libs/libpulse
+		media-sound/apulse
+	)
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	>=dev-libs/glib-2.26:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.11:3[X,wayland?]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libxcb
+	>=x11-libs/pango-1.22.0
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+# ESR and rapid dependencies.
+if [[ -n ${MOZ_ESR} ]] ; then
+	RDEPEND+=" !www-client/firefox-bin:rapid"
+else
+	RDEPEND+=" !www-client/firefox-bin:esr"
+fi
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru sco
+	si sk skr sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^} (bin)"
+	local desktop_file="${FILESDIR}/${PN}-r3.desktop"
+	local desktop_filename="${PN}.desktop"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if [[ -n ${MOZ_ESR} ]] ; then
+		local exec_command="${PN} --name=firefox"
+	else
+		local exec_command="${PN}"
+	fi
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Add apulse support through our wrapper shell launcher, patchelf-method broken since 119.0.
+	# See bgo#916230, bgo#941873
+	local apulselib=
+	if has_version -r media-sound/apulse[-sdk] ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		ewarn "media-sound/apulse with -sdk use flag detected!"
+		ewarn "Firefox-bin will be installed with a wrapper, that attempts to load"
+		ewarn "apulse instead of pipewire/pulseadio. This may lead to sound issues."
+		ewarn "Please either enable sdk use flag for apulse, or remove apulse"
+		ewarn "completely and re-install firefox-bin to utilize pipewire/pulseaudio instead."
+	fi
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${EPREFIX}${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "speech syntesis (text-to-speech) support" app-accessibility/speech-dispatcher
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+	optfeature "ffmpeg-based audio/video codec support, required for HTML5 video rendering" media-video/ffmpeg
+	optfeature "desktop notifications" x11-libs/libnotify
+}
diff --git a/www-client/firefox-bin/firefox-bin-134.0.ebuild b/www-client/firefox-bin/firefox-bin-134.0.ebuild
new file mode 100644
index 000000000000..4c5943a46216
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-134.0.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+	HOMEPAGE="https://www.mozilla.com/firefox https://www.mozilla.org/firefox/enterprise/"
+	SLOT="esr"
+else
+	HOMEPAGE="https://www.mozilla.com/firefox"
+	SLOT="rapid"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop linux-info optfeature pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Firefox Web Browser"
+
+KEYWORDS="-* amd64 ~x86"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+gmp-autoupdate selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="${DEPEND}
+	!www-client/firefox-bin:0
+	|| (
+		media-libs/libpulse
+		media-sound/apulse
+	)
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	>=dev-libs/glib-2.26:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.11:3[X,wayland?]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libxcb
+	>=x11-libs/pango-1.22.0
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+# ESR and rapid dependencies.
+if [[ -n ${MOZ_ESR} ]] ; then
+	RDEPEND+=" !www-client/firefox-bin:rapid"
+else
+	RDEPEND+=" !www-client/firefox-bin:esr"
+fi
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru sco
+	si sk skr sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^} (bin)"
+	local desktop_file="${FILESDIR}/${PN}-r3.desktop"
+	local desktop_filename="${PN}.desktop"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if [[ -n ${MOZ_ESR} ]] ; then
+		local exec_command="${PN} --name=firefox"
+	else
+		local exec_command="${PN}"
+	fi
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Add apulse support through our wrapper shell launcher, patchelf-method broken since 119.0.
+	# See bgo#916230, bgo#941873
+	local apulselib=
+	if has_version -r media-sound/apulse[-sdk] ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		ewarn "media-sound/apulse with -sdk use flag detected!"
+		ewarn "Firefox-bin will be installed with a wrapper, that attempts to load"
+		ewarn "apulse instead of pipewire/pulseadio. This may lead to sound issues."
+		ewarn "Please either enable sdk use flag for apulse, or remove apulse"
+		ewarn "completely and re-install firefox-bin to utilize pipewire/pulseaudio instead."
+	fi
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${EPREFIX}${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "speech syntesis (text-to-speech) support" app-accessibility/speech-dispatcher
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+	optfeature "ffmpeg-based audio/video codec support, required for HTML5 video rendering" media-video/ffmpeg
+	optfeature "desktop notifications" x11-libs/libnotify
+}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 0307b661e5eb..94700b030ddf 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -200,7 +200,109 @@ DIST firefox-128.5.1esr-xh.xpi 418473 BLAKE2B f380e0e675c4532fdfec0e685ca53608cd
 DIST firefox-128.5.1esr-zh-CN.xpi 675197 BLAKE2B 5ef7cbbd136ad19effbaa3e27c6e0d16627b5f0cf38fa849e4e88086f0a421b9b4e1009e5572573c3f69f7e93509433b0047690d27784247e5990b5909233844 SHA512 d82fb4e9eecd1037d7ecc9660d656da9e7d679a8fdb850d5c4109d0c8ab20fe5dba0325d91efcf4025b1453d6c39e0036c20d18314ff6ce0d4a918c4be0b79c2
 DIST firefox-128.5.1esr-zh-TW.xpi 677431 BLAKE2B d7b0a38dbb8a14146d2b26a5c5885e89c89a7b9ec2638eb97ea7d7f0157b57164b29ef7c26461ba196222809e86ff12befdde48be30ac87e2ed5d1b258d8a8be SHA512 44da6850818affc80e9257150d6fd001b50f238f2e40b61298329540cdaad94b6431c5a3d522f921a8f9b1393591ec90ceef654c7403d01f0deaf3cf0c77ab56
 DIST firefox-128.5.1esr.source.tar.xz 559760256 BLAKE2B 45c1e9cb54ccc031ab8ce53d61337b3105cb76c7a00043ca62b323aae968c3e3642fd5141355a96b43fb3bafc43f72f4127d6bfdeac6a51be2f6a56f0e66699f SHA512 476d71ff45a7178301081191d1b4c47fb21b42618f12191605f95ad48603b84a9150cb5c96f668751a43c8f6a4a43ecf337d38007d8e2b546f006faead2d66d5
+DIST firefox-128.6.0esr-ach.xpi 465504 BLAKE2B 857c044f90e951128b9d7a9dcff9fb535ba4cc3ee7d5684436f9d74c0d5fac992bacce11c77f34a08e4ec01a88856d79915ef50d6b237c18dd061e6520533e1f SHA512 c3d2ff31056794ab936fe3bb9cf8f83517a2366a03018d2cf8852e07f1fd2a0249362d5c010e24db63670811142c90bb10bd3375cb6904686bbe5b361392bda3
+DIST firefox-128.6.0esr-af.xpi 418826 BLAKE2B b4b10cfd93a6b1e6c9b01c75381385fcaf3103574df7669c24ca2940a380c1e3d4ff8df980d3f5f2fd0eb7e6f8301b41c2bead66435e1c5413f31686a7dd684f SHA512 24904f5d1344482625c94fdff3b54dc93307aa394b65d07418677805eaf58744ad0e9c2efb93936e1e0113ea32bf2645f65319c3d5c633f7051b746bac7a8fe0
+DIST firefox-128.6.0esr-an.xpi 508453 BLAKE2B 63d6aa8c405e11cf50e01f0066d2fd26e9385ecdf740522202e419e6164a9f6f6aea6dc928881ddebfd076591604d81dbc6ecb0a90edf544681b9bce85a7d567 SHA512 4018f9c6ae66c3ef81c8dc2302725b8bae72369e2b7ee94cb5aaff1b88a2624e6d489bd0ef5cc0a421fa1822ea0c8e2261e5d10815a3d2e91489b34d86db8ebe
+DIST firefox-128.6.0esr-ar.xpi 630815 BLAKE2B 7716b1343ab0967907411714dc13ab547248c6bd892ba990562b50aac39f1f2652736a2d6ce70847292318c57cb8939a581f4f64f261adbe51d5289bee983e1e SHA512 a2e9b2c97e5e79d2353fd5a481d1aae4e1141e1b69df19d6df5831416d1518e2c05d94fc3e80ed8cafbc0d055c7151b3cf9595db77c9514661184d73500602de
+DIST firefox-128.6.0esr-ast.xpi 497758 BLAKE2B 80875b9c913e53bf118902559f54dd25bbb719d8d15bc88f25c03978d1bb43fe9a1fd2db7d2a9621a0dab8ff66adfa897c1e3cdbac64badad4746e4ff557a640 SHA512 aaa2ecb2c98aafc045d39aaf90b4299e30586af6f575a7a6b065cb1f2abc2af5080f33e01592536a4092f2a346b8947af9e87c6751aa1657801abf7af0168ca1
+DIST firefox-128.6.0esr-az.xpi 492191 BLAKE2B fcc5825ba3c7b3330bf648acb6ae19cfb1a501247d774da47cfbb085a8099a0e565bdf27913750c8fcaf68c4b78d39effcfcf3d97cc6b60d2d29fbcec90a6134 SHA512 7fbc47590f755b9f1e814ad5986cde3a33866d0543beb50fa4200e15e342c938a91c1b1a2b8232a523499d941f48b7b78fce0c29fd6fb775efbebf58f53eb36b
+DIST firefox-128.6.0esr-be.xpi 731591 BLAKE2B 567a192258f0e99d8f088fadfaac2f1b79cb97cb5dcdfadf042f54e68841c62533ec3ee8d55e9f24eb5283e415bfb57361986c5b57cbd75a82068d709e5fb463 SHA512 bf0e480f65b4731716584830adca8453cb9300f208bcaab9dfe7dfa6d80bbe6f07b97febdc8870ef8607b534bf959f340867899e36bcbd1c5ef0b7083f95e5bd
+DIST firefox-128.6.0esr-bg.xpi 647391 BLAKE2B 1bf8dbfc1afc3e0e6ca878f378201994e147fc8841644b774d2941ad8cf42dbefa36d88692ae869455a4e97a10a2336b0b1ef691462eba508210034cb1dab2c1 SHA512 bf925585c15ee62b945cbf347e45e2fc2a5f429761d43c84a56a6aed307492e6da8dd3288a2ad988cc7d9f65043244d45572ccd35f6f433eac4db12fad4fdda9
+DIST firefox-128.6.0esr-bn.xpi 582957 BLAKE2B 8ba95dc85bcaec8e337dd2c35985a485d1f565ef2d83f9fd29b4a232684dd6614f6676e2d778468686634b68df4ba3388a63bd17ab908e1f19dac7dca270428f SHA512 68e2ad66267936f96005f0d2c23611fc824203beea7f2d444d9b7f59ecbe96031a9dbbac6037988363fd4e1883bda7ad186c5c863d4442fb27ae810d3699d40d
+DIST firefox-128.6.0esr-br.xpi 595354 BLAKE2B 473fc7786989fcfedda4e7bde73da2e5bad739e15b61557f3b9c99baa13eef83de62301472d185a5dae999d938c4b6347458c06707fc74f81df02dfcac1d31a5 SHA512 0e48a1a8945770f5237c1ec4c531a8aacbe990a46279c0729c0854ef6bc12ed947a13d2360f16094c402bdeda02c30c9304cc87cf121610bb98183b106defb28
+DIST firefox-128.6.0esr-bs.xpi 515708 BLAKE2B d9611ba1573c73f8026c1930a91f0113a84e294a1691718633ed45d7d911d2f74fabc4e4cd0e2ec5fb0128f49a905e99fe4c9fa047d20f8d806264cf87c4bca5 SHA512 ae15bd9f602aef8c0748ed104ae59ae1e3ab10e7a1b01c48f246ae6614f8327a0d1a70d82822221b7ead31e8716e3c6e165817c676a2b986d1a0ade54ee592af
+DIST firefox-128.6.0esr-ca-valencia.xpi 547675 BLAKE2B 22feb1b9f49a93e7e9bc429a205745725cd5273c7672a89bcec0484ce22bf38e1213e8a055c7b0390495bd703f5d05317440f48eaad4a5fe0ff4d431f4b4bee1 SHA512 16a8c9cfbd95b5341486496fceec363e1b4b9321e1430ef7286fa254ad0dc6ad9dd14f85f213ca2f66d7859d9e31e8cd7e2cf9733ce662e7655d5a2b0bc55722
+DIST firefox-128.6.0esr-ca.xpi 599206 BLAKE2B d2b9f3c9569bae1ff5aafd301ba023feb2cb58026855b629eb848c109cfd377449fda7b17c818b5602c77767e1f88dc3125df8ff9aeebc719c2328088de55f3e SHA512 22fd4d70bc61568d4fa8c37501a16a4505a03fb49182bbb3e22c091b83903aaa32d53720c0cb3cdfabbe67a2ab5bc7fc31bae79d1f5f6db8b6ff48f8f664b6b6
+DIST firefox-128.6.0esr-cak.xpi 594640 BLAKE2B cb68c2ebe84378c9268f5a849ead273bbfa1674a330eb3211fbf282067ab2f30767c6c2a5608ad1cb2be4a552b21e92df17427dcf51eb03716113094606cfd3a SHA512 9332eb8e66cc5e24090caef1b4f93d4a2634ee8458984db048634a412267bd582519cb9952004d15110124dd91649f7cc79f756489544987d5346a68b75dd953
+DIST firefox-128.6.0esr-cs.xpi 675114 BLAKE2B f7a3039c32b801837153571e7ae0d44f53323bba1b6cf0df1b341b0d4ba20e2ed2ebc0cce52255d515ee9b35287b3082de3603317f6a9d306c4657c7e9b46201 SHA512 d6686ef7e2f3b0b734f26a27d4915e8341eff94909316a941ee885bee4a96c41691907561df4223bdb22dd4fcc018c07a5ff5b4363838586007db2be5ba553c7
+DIST firefox-128.6.0esr-cy.xpi 641501 BLAKE2B 2c9004e4c04982c31ab23cb8728b84ce5ee31484488bcb998b9662ba4dbe9a6137f7dfff5afefd52b25757375891cd83cf9cf35489268c079e6f71e742ccafda SHA512 a232f9eca3180a6f8161bf634c1052433561a951eaea8d77ac5ccd856e422782ad4334f755b8c8f4b010744cb3f02c10b2e7af9d4aba102034a3de2d78144b73
+DIST firefox-128.6.0esr-da.xpi 624946 BLAKE2B 2c08f5edd374422fb68cfb3e081dbc07448d980de1a1ddbfb22bb86c718972bd8455520f95db079143ebbf15cb6d8c6ef59285eea24ef2be8daaa98d024a5d7d SHA512 2cfa41910a873e9bc6e751dcf9e89e93a1b0922fa2640537105938110fe86fbcbedd0219a8bbbcfd25a80ffa7a6b49f50e287542072b0d80998a6b8eaf55db7b
+DIST firefox-128.6.0esr-de.xpi 647909 BLAKE2B 6ee4e7b6ce49114594f2b433b55f705a5f7e674659176a0a5751e0e7785b416187fc68de98710d27009e32138d1d7d8c0245b433ab83d4f225bfe146d6be52be SHA512 27eb856cb97d676cb83fcf543b52dc122f6e6b76cf9adacc8f344cc28b2deb2d7b09ccc068b4c6f498e7e453d72ee74d558d804b6dcf9126f3ed8b9b0ea2b56d
+DIST firefox-128.6.0esr-dsb.xpi 667675 BLAKE2B 1a548b5312ef452c8855e68c5d0fc86ed80afbd04a19b94c25e7c79ee80cfa6f36329cdcbd4609ca0f2b37ce2f0e1b63f25522101deaca0f9c7c389dc474f5b0 SHA512 6d497300803deac950efd51a5ef03e287c785800b3a46d67b68757f2b479e19830d08e5eeaf6d56883944a954ba5f7ffc214d18bc7bf68709b435e6099b9ae80
+DIST firefox-128.6.0esr-el.xpi 752467 BLAKE2B 5b290f3866ec26a2fe93618bbb8b9325a1f3babcafe9c9b10a907472dd0f29831ce1467889eb8cf8dd1798405a22e7ceb6095b59836f59bab1043166fd8ee9f5 SHA512 aa71e4b1e6e4a34b35f9bb410e3960c6a2eb3b1599d8d3d9f91fee70dc8d18d66f985522305c1a909b5cabd1de78e5e99ff4ed63068fd0f35ffd055abb940b83
+DIST firefox-128.6.0esr-en-CA.xpi 597230 BLAKE2B b2211eb4fc5f0286d80a61645185621bbdf28da27fe5a4598b8c02655a3df396765afa1f120910c3a2010fcb220ab84dadf92e73e9e7fa05f4b8ea834f61c86e SHA512 780ebb6403a77f1de24ab6cf150a83d540bbce0e79eb66aea47a4cb2b89ea65bd02f554d0762119c17265efa0ab42098b26f23dd65e43d48daa836d2233e914c
+DIST firefox-128.6.0esr-en-GB.xpi 600789 BLAKE2B a56509c7bc959c4aa637ca479730ac528e5ece613d310d3c7c7c50528625113c0f1ed58e9a89d813ca557c78e07c89cf6fd5aba9980daecf5705a2a138dba931 SHA512 506c6e4494955e811ccb51d8a96edface042767f70ab4d8d54016a8386afe81ad4c4778a6769ac4c09138dad993c6626a85791d5821f7d6afdd437fe3db2c34f
+DIST firefox-128.6.0esr-eo.xpi 628843 BLAKE2B 10c3c92c17f9615e762f0eae0bc7779261e40a97b595d33e5d0291ae151e178d146d895a9991f8b6853d02242dcebe3f6e828023b7608abf3eee5985b128d96d SHA512 653d3f2cb16471b32c47d46c08b2b4b011aabfd2c52e02e994ecca85e728143e04ec4abb0d4f446de6257c554eb22b94011231264729a4f52a70cf4447077371
+DIST firefox-128.6.0esr-es-AR.xpi 644956 BLAKE2B a825e1af97cdef7823e98587ac931e77dcbb8ef09af0b2904f15e18ecfaac0bddbe62926711b5e826fe1db30f1f3b72d3a9eb58a1730ea649a120231388dcabd SHA512 c0431df8b855a631ae822d90e049bdf85b97f5c0f59119407a19178474f84e6da76598c99d23601def729a16bc9f9d4a208638ce9e98636101220ac2340b342c
+DIST firefox-128.6.0esr-es-CL.xpi 644429 BLAKE2B fce77e57b5f8f5fd988ed9ce4e9893e69a6ece12a595739679c3adf5d726877e76e334d62343cf29db990b325d195c7664cc8f2e18fbff618fe801e4b5ff98ef SHA512 579dd240a25efb4cb89b650f9fca4395ebc9e5e02596fb397cb33fb08bb2c809dc88fc8f9fd2e62783773074c972088b684bb5b566d9adfd06533392bee87836
+DIST firefox-128.6.0esr-es-ES.xpi 637338 BLAKE2B 4e8e7cba5dba5154172d61aeda56679935e616daa4d6ff0bd337cbf71f75a8eb1d012e76518a783cac94d229228b8a10de0e193fc58d8ef1ed77a2e6af057b29 SHA512 79cee18ea8b0a6c58ca67e45a2de60275d459f906c6dd5796d1d1c0f3455b4a89e9e8ea5d55e058f7c5213dbc88ebce51683da637114727edca6299b71b33263
+DIST firefox-128.6.0esr-es-MX.xpi 638917 BLAKE2B bc7508a6ee1d7b4d6626e705371d70f920f24bd73a985dd763c9c1aa86e59c25e728b7af46a96f2390dcfc229fb6addcce6e1edae12028d5c84c99fa384b61d8 SHA512 21b37b22ee6c3d8215af1fb8f20232a43eb67e47da15c8c6f32d21c7f69d2fc83fe7862cc1001a06d7f2ba20c48bf71acfb78792c0d25e30867c18bd2796e01e
+DIST firefox-128.6.0esr-et.xpi 541122 BLAKE2B 519f09a25188664c84b2bbd8c55f54e2da4f690447a602d4263fec3c2d2680430e5c01791dd619b1f88a108110d9d47b76d293a32218a1b7dc8cd0127c0e57df SHA512 534ca55968f2894d2fb24e9abd676feb6c99b76d44a52cd37299e45578c8a4db8dfae12d3649d8ba312abb03f3167c9019b5f86ea38a1ae262528d2fa8b8a201
+DIST firefox-128.6.0esr-eu.xpi 612330 BLAKE2B ccb09539a2cef5c8ec62de66cdc03534d74e054ce1a53e94927629ade8c32b4ed154dab0ad518bf81f2943686ec434f6287b29035f319afabdc7034447d40d60 SHA512 2c0ed6e2fb0a2bdf78c99f071ea37eb36628310644b45edc324f4b5201ccccd024f85faeeab6f17705900881251b9dbfec6c52f496df0d2acaae78476d232634
+DIST firefox-128.6.0esr-fa.xpi 593837 BLAKE2B 4bad4e83ecb7e1671c052b118e9ae78d9206f85054c7cd4f5303cb5f9b71aa5e69521a4c592c9db0dc882d57de2013dea8750782579dffae0d0982eba038b889 SHA512 0930a2720bdb15653c1f82e5821176d7ed8177361f243545464818a65c9d5ac3aacd6cede451dc8257402922658a29d37107281f1f186e915a9b371f09bf8f32
+DIST firefox-128.6.0esr-ff.xpi 477477 BLAKE2B 1597e6a91c1eb0a14b991cc230314ec8dee458c6036d06ea24cb366020eda1f27e40141db0a35f17f91fc841260b8ff44c084e3ecf53784980af322ada2c836b SHA512 de6a0f1faa810ee6e150776107bfc6ddf81a98919fea265a9071b515ddfc934c7da2c8e105a6e5a989b5e4e5c857944dc2f4199b70d144d148f0bad0bc135727
+DIST firefox-128.6.0esr-fi.xpi 623010 BLAKE2B f186c84b54ad5a99712ce969a0debf34e21dce68f2f8ea99e2a514b51be95b1f97e4c46b419562bc5559037933f66aae49af8743d2a40325306511f817e130fc SHA512 5baaa8fd6caa7d61ea8abca1245c651dd810861b34687dc9cb2b4d93d42195f40e6302b31917be478cd93fb6c3ca0142206650822f55ff33424c86babee5619f
+DIST firefox-128.6.0esr-fr.xpi 655850 BLAKE2B 2533380d72f00be9ffe7682c347cccbfd9262b59b6048fdcecdbb43a533b8b3f86d1a88dd65e8e0b1d366f3c02ac76e674b39eb138618f85b94b62f694466adc SHA512 8e3283c68ab189eba0b17067654a115b8419a7394ecf5f219ffa274fb84ad4f0ef8d886c0e91a3f84a65477ba706d8f3e2e57b2f6c6b16889247b1864b806a71
+DIST firefox-128.6.0esr-fur.xpi 651342 BLAKE2B e14f787c25a5de9a06d29603fa5f8dd941356f1d0cec126071a3a2e5f08d17fc7d5c694291230a4a723125400af4a639d46681bc48420fb7fe6bc536e5e204c0 SHA512 8f9e90a4471c94f42b321e6f4593a90cbc625749d11894e90b2fa799814aa5da8557f6302b3243545bb9f61144a75e6311b24a648c7209010c990255cb019607
+DIST firefox-128.6.0esr-fy-NL.xpi 640610 BLAKE2B d9130a3ea8e6933bd621010a3c6f570570b362f7b11a44e8b15879af8350bd09d1fca9472ac29b779a4fd3f8f2138f45d98934660961fc7df14c36d2a2991053 SHA512 3dc3b9e4e59c9e78b3f18c576b2224ffdb4f56c9b4a40b2783c9b853fdbd6fe1b6d285102c84087258d17a45e6a9f8cec6c08917052869d5aa4b750416411e23
+DIST firefox-128.6.0esr-ga-IE.xpi 472337 BLAKE2B 5e37c28bdd64c69afdf2ca5ccf3bc1f6d2eb6e652b14a3d05f744e9f459b5fce375f0deadf60e34fba5d3f12d57d533c26a9f1a98184704dc6e6d35ba674f2cf SHA512 fba47ee2628e4da5d069092cf8877b9c1ad5eb30722c3925148dbb20828d87abaf584ebe24d32e8cd9ca96449859da9e22bf7252050453ecf17882110f4d7def
+DIST firefox-128.6.0esr-gd.xpi 598312 BLAKE2B 2cb61bcb98c48b0eac93171c3f6b6c290081f5d242e4499f56bad8aed351b9fdfc5143ff877734b78896d88f126be4d42e34dffe09d98802620478e7e64bd8bb SHA512 43e2df032788c147ddd0a39a00952656fa42fdd69ae08b9744e73c7ff91a315c30dadaf44328dfc12e0007ed0aaa1274a425cd3de78af5b3c3ff6e07a626fb0e
+DIST firefox-128.6.0esr-gl.xpi 609640 BLAKE2B e171fb79edba97be1e7eb45d2845497003db664a9acf377e109c854767bffcac7c9e9174b9c1cc9730c373c95245c1aa4db5976362127c14c5a4b86a1275380d SHA512 14c14b64c90560fdb768752295df53eae0def47964e146e7264e48628e5ef38e670484f7bfc948d071a0e783c29dc68ac34849be86bd98a669e2eeb9e99c6b3f
+DIST firefox-128.6.0esr-gn.xpi 652882 BLAKE2B da66349f0d3c356eb40470c4235db1d5dae37e945af667404076b6d08b1a594e3db4bd58a76eec3629a6c43a01da971f4717355b850218b939768be433371974 SHA512 68742e9ef1f8dc50f45d0c73d7f3fad5920912e78de8eb4454b4f0436014a0b46520e87ac82436dc1e1bad90dbbb2f53412463a8b5656ca3c9cd141b5e10b298
+DIST firefox-128.6.0esr-gu-IN.xpi 528786 BLAKE2B e2538e33e7790470add24e3aeb11955ff7321adfd373a3f2d64a915170eafcd2a2e6f244dc6597ab4b03f599591f7cde11195a0b7ef7b3bb4ec8ca85bff9e938 SHA512 04db30d7eeec3266dae78b7709e8b3c1445e00e3825d2790099954265b67db7b8308b03134bd386076fbdd1f7c4ab3fafe036ec77bd882e0058403414882431c
+DIST firefox-128.6.0esr-he.xpi 647291 BLAKE2B bfb9ee9d7b1aa9df99eeb8cc2025c65596c8519e134177ebdebdd48816af1c6062e9c594e805cd2389a3ef57681873bbc4e96ce498d5207b16f95f93ef03f8dd SHA512 a047f1d56b2fd682aa448b8da223ccfee005064104a7bf3304126946c49793cb808dcd7d52a9dd13301e5381d02bc5d66a25a8bb82801a6a985ea63d642d1517
+DIST firefox-128.6.0esr-hi-IN.xpi 568356 BLAKE2B 243b663b52d81e0d8fa614e9591ad54a918b2c534167bb4c48a9cb6d9172bf01769e5e84e7e00cae3d6f1f8f17fcb72d1c6d8d6b1649c48c6a65291c68f55941 SHA512 b94fd2dc53b5076650b2b783f4c9e7012a706fb207551067fe94327976030922571a2a6999115708136f3a954726c78ca16a727810ffaa9bff68f6090dcd00c4
+DIST firefox-128.6.0esr-hr.xpi 619158 BLAKE2B 6cbb1f616ee5620d84ae295c2c578e93cc0b43268552d7e891fce7944020bcd2b0d56a52a0a0405302990feffa57aae75623ede0d8cdd0e0cee8de0703076f4e SHA512 18ef34aa4ff4f317cd301d88a06a6398d4eb091134228ba175b6574678d364a991dffbfe8590434a2474ee302b2957fded13e41531eb947b052111f5b83eeb68
+DIST firefox-128.6.0esr-hsb.xpi 663552 BLAKE2B 008e7f2789d285a1fc19aea1141b57c0c372689848849413810454a742ab821dd7b9c2cce9791b749facb2bd5eaed817d080be1f83443bd2ca86be6250ecf208 SHA512 643622b993b2bf1376031cdf83e294a91793d2515e5f09f8b48658cbf898db48a9a6672579465adb881e11833c07e6988fb881cefdad8e206b71e9f95b6137e5
+DIST firefox-128.6.0esr-hu.xpi 667802 BLAKE2B e46b0ffb7f815182df21f84d3924e3a04334692a082dfbd4fbd56ce8f17d966a2b218a95e79ccd9896d4481e77838069b498780fffea3d16f83aa74f20b1bd56 SHA512 702059867a2fa6401c2174f17a7a07f8d63db3949f87a9ea37ac018e99f2913954251819e1229a50b576943a80582d769b7707e16cc2db593f6535e11aa38a0c
+DIST firefox-128.6.0esr-hy-AM.xpi 653028 BLAKE2B 5102591387703070ba95f3056f34beee4b54b4d024fac7aa9e63254d53584f5783e41dce590f9b7d5074be967882d8428f9206799aa822052cbd3cd6f91583c4 SHA512 9fa8b1682241494dafd934d6ab71ef23200925af1752da47d1d01da40d3639014bc2a6cfe404588f96c89d72a8308b13cb68078f364c0321ee07cd1e22d7c57e
+DIST firefox-128.6.0esr-ia.xpi 627658 BLAKE2B 41d6b428fe6171cc24efff3b006697c3f6273a37b99c1c48ee56244a3b49f763a54c6eaddc69001762267b99a926055f67825d0339d76b5a7807c4514de5e65d SHA512 e10aee1e1304f6b4db147940cfa5bd389b083274fc642720e45c2e96a51daf06753f63a8d7ebb966f58d35a0c4ef562bc82cbb913d3aa18c09aaf22fe79f3060
+DIST firefox-128.6.0esr-id.xpi 587630 BLAKE2B d676ae3cafff54eed30747e452becfe98df089e1d42157e17bb0104395a434c976858b72ae2097c43b4359dc89e4954d455db51f0c5e43678003cfb8ac18adae SHA512 449649c801ead408b28a308858b389de1e30bcd4a996b6d1c73119a9a26a7b8413a7177534610c82fbee4142a3b02f70cc71c4d67f5af5bba378a1ea20a98afe
+DIST firefox-128.6.0esr-is.xpi 630677 BLAKE2B b0f5248d89ad7fb50b7d544de20b1f95e00be9fb688d2e10f78f1710f9d71733f6fbcabe0ebecdfbbba4ad3337a6bd6524c2709bc54d799a3155bf7c9bf1ea26 SHA512 5c8a3e0849f49ef89eaf834d0982f033a3a407b4a6d1f96cf06487f8f57ea61862c4cca22112f5d83e81552f38b4f5a106348bfca0179e44de67984bd99f779f
+DIST firefox-128.6.0esr-it.xpi 584354 BLAKE2B 9a09d36382461a31d34b7c492d59a2c1225e773ebdc85e3d879caed1d900caba90717eeb52b5f0c46f56ce498f139e103021470b1aaca5ab986e389baea0b172 SHA512 5c43e6670cedcfc925e9aefb6e5f4815df0b3ed688cf3f904b92f73f89dd03c813f825731dd77d6ed4a136c864f4b72d511898f192552805a36ccdf4c41733aa
+DIST firefox-128.6.0esr-ja.xpi 691960 BLAKE2B 8e14f28f947b71af58a1bd4acc0bc33f56fce4c264332e09829109c9ad63c77c8aab3edd3924132dced379461874648d3eddb868846d3b328e552513c4cc3a89 SHA512 c89c58b262c530f68850bbaf869f66f59f1e0cbcbc40f60ea77052ba099f19ac9351873722b44d9c7a5ccba2f71c0a01d8261f712d85049cd7fbdb5cb290d68c
+DIST firefox-128.6.0esr-ka.xpi 662321 BLAKE2B 7596e3c4922209954da957ed5925c3e2a06453ecb48a0fa2bb8baf6294c1283dc013b243a1e12e56f59d7317c33ceec4983685bc82e8db6dcf03fdce33450909 SHA512 3d4edaf35ea639cc43a983cb8085cb842441c221ca7ae8caf677e5dea5bed8f5cfbde0df6cb0736518eaba751c9e4fa2d727db506b24e3f442dbc83b61a5bf8e
+DIST firefox-128.6.0esr-kab.xpi 619287 BLAKE2B c398f5afcefe2ae1058412728186d7c60f96239aae08c30ee55c18f6864f91303876930fddf568596035a150cb5c3bf07e100c737f2bb98aaa03fba00e8c8e27 SHA512 26f70d5ad34b98156b1a62979c27b1d0d7fe2f01a9b02c4a73ce5bacf9118cc72768f0c999d36bdb7591ef1557d5c0fc47df981281314184167d88d80536bc1f
+DIST firefox-128.6.0esr-kk.xpi 727329 BLAKE2B 2e5a2288126c12f6561ee4205f9336d44626768875cb533165e9e754e64ce8bff744a1b33835771501167031de59df0520895adccb34290539d6aed12265f108 SHA512 ece135953bb349ba1626ad48ef3f0cad4e568723afa97db4087d334a37389ae0f74290fd3237686d011779e470d745e02bf6b8f53b2191dfdfa423b2d8d58bf2
+DIST firefox-128.6.0esr-km.xpi 527177 BLAKE2B 2960a58929595048ff9ce18bc33a101e3f28ff092f273eedc7ee1a98a184e4d7190ea041083e31fdf8100b7975ac1bd623b14199a21bce5502f5bfa4bcce55f6 SHA512 5e72047111759d5959115cf0ac01fa84935cbd10c761ec74af097fb2fb647420afc0d1069cbc75462eccaf74dc59cbd6c57b84414bf9c5253cb0866a4aca005a
+DIST firefox-128.6.0esr-kn.xpi 492535 BLAKE2B 58aebbe2878a536b8a9dd09135c074873fa728abba40eebcf14a9056676a4dbb089b1edeb50ff8a7cf1e5a777dd1a681188e92f344209c4dbe50b7f42e0e152e SHA512 ba100dff5667a75e8391f26ea7f16d1e1a6fc92e3359165eeca25ac5403a884165d19fc2b8c41b4914f1344d10256017e878646d34ced7f05e3379d338c25353
+DIST firefox-128.6.0esr-ko.xpi 679383 BLAKE2B cbd9321527050e6bbc0ea77a7bc4c19b285d8b8f9fcbf7a888033f3428a6b20f5500977c946909f7e5b6d6e54732c1516177f1ef6f544c500f37cd092ae0c251 SHA512 099d04c79f6aa3bb601685d65f096d75f0aed84b59b140bd92ad5aa51c37f219a23189c8ea2c08b71e88247bc1cc82a8ab3ad9f23ad8210e549065850ad71c51
+DIST firefox-128.6.0esr-lij.xpi 485537 BLAKE2B 7bb433d1f5fcbc794909c721c9a15296187af6279b59991aaa06f8d09a7b116de7b4066ff6d2f9d1993c518551db2f89801ab5b0211b6d3c28ba555437d437de SHA512 db67752ec92df976344bebf418a2e4d88cd6fa1eb0ae330ddf26db4cc184679ad3ae427ba1e304ba1f52abc78b765ef01b67aec2b903c895ac003154834b43b0
+DIST firefox-128.6.0esr-lt.xpi 574119 BLAKE2B 2b2704e6202424669a26a3f9252337f09b5faa5e44b650308c6ad6650b8114204f9099f700feaff1039bf94928791cfa538e90bbf5f5b45863cc6f5ea21921c6 SHA512 082e579ae1ee15a3b859d09fed9459f18fab7890a74c57bc888e8fc0519ef91b90a78f5800041a869bd7ef48d2f4e38c16c309bda35d82c5a56e97f9245b34f2
+DIST firefox-128.6.0esr-lv.xpi 587210 BLAKE2B eaa5c4eefab6abd5c2af6d597a1ebfc1f013818baf39482e9e99fad393021d05ff596b8a450546e25c125d26f289d93004e303cd4d7235a27cc0f12d8adb2e69 SHA512 ced660d9912b58744ab8ebc229585a2479caa043fa9968c00b19941e6ebe73dac44173bacd8e2cc3faa54da101e436ecc2e4b48797547c2c8a6dfb03ea272adf
+DIST firefox-128.6.0esr-mk.xpi 495165 BLAKE2B e5054bd084ef3e25e9eeb6b02b4bd7389898888eb09426984c595426a92d892423ff045822ef8a343a3016f644481679693baa7a36f28c9f492f0ed3f3a5b580 SHA512 871d92b38b0808f1811d061aa8eaa88b63248b8717dc02b4c069f7bb6ff58a55d5fa288a160a005aebb9911343fb935ec80c6fe6f19a522997454e4e7964364b
+DIST firefox-128.6.0esr-mr.xpi 533534 BLAKE2B d57dda5f03f20f22ca98bcd1de883046f78f811d5962a146b254653148d64535158a7cfc3690b5f9cb11dd61dc759000f239d114e285aa37fe08658f59a45c89 SHA512 87d4da0f89745d91d15372c3c45fd355777a8dfbde83d842414126ae2e6380c03d0af208b8e91066e28da1517a7596c9971510284d626ccad6a1a1abf8701271
+DIST firefox-128.6.0esr-ms.xpi 451147 BLAKE2B 0a4f9f96dee62a14f270d0edc636f152a948d4cc1b8d7b5dde1ffcf5ff5d13f59174537df385245e4536cd5d0a03bffccdb9441b837064e49d157496af058f8d SHA512 14bd523dd44ca57e9a8c23c8288fb503681bf2c9ec6bfe1b12fb33e16d4fc27caf5c2445ae737ed185824a69f36c45f95909333e0ff017626cca4f1c8136e789
+DIST firefox-128.6.0esr-my.xpi 519910 BLAKE2B 03071e3dd1457ff3cc0d35ae2590c2faf4288d9905d023f88ae46534871507ad52475b459df53a46f1a5a4582d8b34cae8e952ec45d63c46d4d29c4c67ae68c3 SHA512 f8c20dd32e0f9722a10185f80d90f1d3de67522f4aed4ba8870262e37c83d9bae532d16ea9ebb8d6554cc532f66677fedbf3fe2ffb83a1ea7c8c2a34dd218740
+DIST firefox-128.6.0esr-nb-NO.xpi 620020 BLAKE2B da7a8e555d33538e350175243086307205e5060c76e916b59d067f2e81a471480e3661eeea0337cb41bcf6a15929e6133f965bd54fab97fa0dc305da50eb763a SHA512 812084ea21768add892369460c5858f7bedaca39964ac2ada3ba7216aadd60e591b7a818ba3bc3a925d9a18d7eb767451b1e100fe795bb8706c2c9c4ef15cc33
+DIST firefox-128.6.0esr-ne-NP.xpi 522148 BLAKE2B 4e982af7eb9616b4fb55b8d030fef87d6bb8ec6ae796f90bacb6d19dad02985553817b2f735f757f715b6eaebe3fe63608702267181b9b57b35b4505ec562af6 SHA512 7a9422fdb21aac753eb980bcef6c49019aa63b74c0984d23fca795d012467b860fd98adc4d91368c069f4e6a5ded6cc0feb5b6be9f1249a31127ba1adfc5c54e
+DIST firefox-128.6.0esr-nl.xpi 634305 BLAKE2B adc32a6f172fa93049181af1ca05024c246b3fcbdc16e6718fcbf5eb0302deacc45fe222a9489bcdf77eb9858f5293139a6e3c5cd27268b0ca265747a795c2ce SHA512 8c027d374c288362635e1d340d7f32cd97e4ef4abfdb5489cf61ab046ac6b8a77963153c1ed45c0b729946982ef3870aff0dd84229bf669b7ecfd8c0f8dbfe1e
+DIST firefox-128.6.0esr-nn-NO.xpi 622824 BLAKE2B 0b805d3cd846b16624c4d56afda5ce16a31c2acd3370a785b46306a129c67d4a9e727651403799bd1443b8eb41ff4833f88518ed7b8155b2fa0de98b063f3d3b SHA512 f974094a0292caee7d8443ac1f43b02f6a361ad591da818ef6d0123b65b15ab545db6cf5ce552ed82fcbf4a8fe0d0abb999f702db5561e6f4775dd3c693013be
+DIST firefox-128.6.0esr-oc.xpi 615794 BLAKE2B c10fe377bfd4cdf6354e1d2dc4985fc1ccce906ac0f8ad494234198a429978c54e4fc6d96a8b609b8e6d38934c2b6ba1c4fe0258a40750509e439844868128fa SHA512 a01dd847a70da1fa7bda6b5cf023e6012f046359d67ec25dc41c12710bf78981d93d7c019955b8f20529893c09b18e1c9986e091cd8fe57632a4038977b7197d
+DIST firefox-128.6.0esr-pa-IN.xpi 711068 BLAKE2B a0cf1a4f330e34d729b4ca5b14b72dc72e80fb8152b9a58c2b68f3e1e7e5c72aa9b2c7ef7af108ff9fe1531f243c039707a4e536ea413c7f584b746c85582ce8 SHA512 bc93c90a0de1e8f3ff3745a5bcba1f60a8a89a27311751cf70ee2ac0f819185ffbc79816aba9c6cc0071c2bd07e4979e40406eed48feda97dcf1fbfabd362ab3
+DIST firefox-128.6.0esr-pl.xpi 648786 BLAKE2B 571c08713973feb528b7eb05b77d0cacf6574a8603c23854f992bbc9bd245a333668e1fc2fb805bf4960d0c9152b0e9eb442b48e947b88c93c60bcf1b66b746e SHA512 dfd63c4441e38c9c8702af0e34f1cd014819593878e7efde0c583c49ad17c0c6c6764a9f52fa1effb2092a2decfafdd7285a0d8331f97b6de36d6b09ad522158
+DIST firefox-128.6.0esr-pt-BR.xpi 638904 BLAKE2B d8279cd78edd9552684da1b5dcecacbb4803b107577b946d7087fb4e8f23a864ceaf8db29f86cceead37692a3aab382cc4f9688164c05c0da84e75455a0f0f4e SHA512 ca6494ebc58bc02610eb7f33b2369350aa01fa40107c508cba593f23965f3207cedc8972cf12cc56fa530427987bbd1e5702fca8d2d4479fee6ae23f146188fa
+DIST firefox-128.6.0esr-pt-PT.xpi 642493 BLAKE2B cc0f3a685886eed4b79c977b50b31dff25b5ada520204ad7895a5bbc551e4ad55f741981b3ac4a4a8788f5adce4901f0efebc03c7032069127c6eb783851a788 SHA512 d9d0a987394effb6a4518b876577b139f2109e29bacb5b55465902008fd2184177ce2f00b85214a9d36d9b55b1a4ad5b3707b0e91df1185d32aec298cab472e3
+DIST firefox-128.6.0esr-rm.xpi 631437 BLAKE2B 46cb86f955a744d6fc9bb648e980676b2170993b905bbf5de1513fa3cd7dcf15d035343b17145118b9c2cb16d9b1679eb20cd15400092cad6f2b867e4fdfba5d SHA512 855391ee46e4770ee0a9ab0587f5e78b1acbf0d2e06684bf8f8862f14c9bc56e16b9127252cdccf9e27ece9c19d16e6f31b0bacd9ccf7c069620054ba60f9939
+DIST firefox-128.6.0esr-ro.xpi 551221 BLAKE2B 8c9dbd2c4a5726ff5db1f03e6bab4a14815b36a0b6a23b5869fc6b6482bddc96a7165f22304a12a006d62c4de107f1b659eae81f2cc5dca95555d3763abce9d3 SHA512 08ee74d44196fee131ac132f035a1330665d96e0d8e156199591fec52f7b6440794de6baacfc5ada72821bd84fd77be87899b73a8a65dcb569c64a8297f7628a
+DIST firefox-128.6.0esr-ru.xpi 740412 BLAKE2B 0fe5e32976119659fdf4415acced13c671176734259fefa613bab51e594999084b5332723cb5abcd68ed1cca204a6f26d0f859ecb22246d77ba47fe6c620c166 SHA512 ecede072767616a0b931cc3aeb96f8861f5921a8103513b905ac4f405bc9f0783188dfc03be359f933b604259be09c63f9707bb683581f1d1b3708fabf201cc2
+DIST firefox-128.6.0esr-sc.xpi 598935 BLAKE2B 78378cc604135a98b40a89c4b0e703706acbc322ada32dfcbccf495abdfa7986fa0bd476930c49c3cebc45958616581843c628ddab0f3f9ae41b7f652e9e77d9 SHA512 57586fb6b270a1fc82df693b50bd1ac89b11cba748ad95ac5355ba1496002eb1ea00470001b7d420245afd35b3ced18c2b0c0a72e8ea4dc89695018f264a1917
+DIST firefox-128.6.0esr-sco.xpi 512698 BLAKE2B b84e6defb1374b72160b6efcdec8eefa0d0de912e2f66f8e9b2a98bbdbbc016540a1b651406de0d989ed66d57111189d46f1509cde7583093e91579ee6cd7939 SHA512 679e149e2294e3aec38ea45d46eab66267c3a1fd45f1b1935a2dd704ad9f9196ebd238a125c236262e7ee1973208660be490691ac7dc3d8a786fc2c4426d4c2a
+DIST firefox-128.6.0esr-si.xpi 621565 BLAKE2B b1af6bc875f56c1f4bfb497de81dc185a050733367e90c5607d4c6e40107dc4d2f1e0f4daa74312caa72ca4a77a76c4abf0c8f8a8c248bc28cb57e5c3bb582a5 SHA512 87329117ace931192d842beca881b2658692858702f86c40ba5da82be730cfbb6019881ebff9b1ff4f0566eac9790c2db0bba88fdc5a14796e709155d1c5ccb0
+DIST firefox-128.6.0esr-sk.xpi 670792 BLAKE2B 36ff406c68bd24ce6ebcb1207a4ab943e4b2035bba56c4bcd117f313f829d41b4b8a8615f207b9d84c94147f1d316fc933410792afbb5cdba17f18c7052c7c26 SHA512 d5cfa93d724de2e5731d69e1fa14dbb72673ed3127a358916f4f6c5529b117fe55106deb107d3d44ba618c60855ed2eb43e2b55d44cb37a712ef805a80a9e669
+DIST firefox-128.6.0esr-skr.xpi 722726 BLAKE2B 0e321fee6ba51f2500a12b420b0fbd6f8f023b5130b17eb0f8dc0f87f4d39c37de32431e7aaa2659d969a66da027cc6d7a1856fb598fb924a2965cda8301fb1d SHA512 2f9c339b7a3f8940cfc605350d797612edeca894098f5d553aaa264d4ff8019f97f23681654764a1eb1f121bc3fd0b8c7bfd47fde8d8e3bdfb739db86d45ecd6
+DIST firefox-128.6.0esr-sl.xpi 633851 BLAKE2B 48bda89d76fbfac20db647823e3ecfa2857285f6598f94ad822e79aba5673ad255fb3ffafabe55cd20db3757239227fa2c346edaef63d7b7126eb49572959fbf SHA512 32239c96fe2faf9070dd2a022104a16a4637d23a362980e0c581d94e5eafd919a8c1c9dbbe3712d03447fc7d8d5b6449897b6d4ed114994a75fda41b0391cff4
+DIST firefox-128.6.0esr-son.xpi 417709 BLAKE2B fdeb7316afbf830dc40734fdb145c7c35a8d8bd415f0ae816a68404ea4cf04a9b95d65c24a5eb38b80ae499557aba73ee5fb02c22b1a71ee5366ad10c8582e54 SHA512 450788ce9cdbd6ac9e3b38112e2b109cf5c0dbe38b3c8ab140a87916dba0ee7ff4f2fd44f4f120e53fd0359a507a3ddedd2ecefd0836b05c9e42e7c1a6252fe3
+DIST firefox-128.6.0esr-sq.xpi 652183 BLAKE2B cf68c19aacdb9bf29f1787e2ff614b3c1106aa678d9b409e35a01b6ff3214f2efd2cb81acb5523b5f0c0371cc7298cd41a3dc86fa3d387aeffd4e8659d4a6a18 SHA512 740fd69f5b53b1f637979dab05b373a720c61b17b9d36708de01734700bc523b4c361670a4e1e0e584a2152a81024c37479a22600538738d62cfc1e6eaf6ad12
+DIST firefox-128.6.0esr-sr.xpi 640909 BLAKE2B 3cb57cd660e574b7ea1712d14b6369f7317535675bf5f57f860bc8de58d588d55b65139e0ab39179d4ba4da421f70e07369e2715c18e914a8eea170a6a3e0db8 SHA512 9295372e6c78dee88a6bca4800be4d772e92e3e39b30be64fa5e3bc1d7c2d6e0009e2930c84b6f499c9ec657fb3bcf5738b29f15d28bc114c3a5de0e783f6df2
+DIST firefox-128.6.0esr-sv-SE.xpi 635647 BLAKE2B 66965736235528ff4ddd07a26351abe1b3ca9b1ead0a585c240a727e648f223b749a2cb68adac43ea14ee3141c7b9ab7d021cc94affe1388b95b8efe2e39aee8 SHA512 9f38f36ac6c791425a5d92d68d8c86ab158c624f3fb1863a7392027d228b0b40eeea05e8c784003f25c81db1aeb771c7639da00be821cccbb4f27c10d5e9dad4
+DIST firefox-128.6.0esr-szl.xpi 527829 BLAKE2B 2044dd30829c122e6cbb4a3d7c2f477e3597d8f84e7cd2ff1c4d1a1d23e84ff70fc1e61239a8bfff7da914ec85f561f39ee8a7b9234ad28ede2a6ee4a2704b38 SHA512 9a29ae7bf79e5354ef41ba2f7ed44b88c58b3d8184cb368eaa87a3021895883259804b125ca69549d9626ed77d845c63b617c820bcf77dd1c1cf35e3473876e4
+DIST firefox-128.6.0esr-ta.xpi 508811 BLAKE2B c89ece045b13d8ae09ba76791d4eb16b9a1d1e306eb5b0893e6a62f0cbbb1bbe535b89a16dd2b3200cbc6604a8150a6ed7bb31e6e132fd8e92d9f513cc04e369 SHA512 4fb5eb14bfe02eebbf580d52ad3942fba36696e4e52bcffc3354742dc081e2a73582b518f6df7bd96ddfd38bfb6495e9f4186686482ca211c85d780b9ee9ebe1
+DIST firefox-128.6.0esr-te.xpi 565161 BLAKE2B 35e879ce133dfa203d69e425a7719c73948ddcd3e1fa80ed07857547a7800ca5ba7cf27502ca934256388f9e21b5bdc09407602b93207056e5af32e51efe28a3 SHA512 c8904fb3f0934a2be39860e054c6cedb390765c932e4a6fb01f73f8bad4ccd0654b0bbe560cfc41a1ca4ec2cb47463f08db37256554f9891035fe8208bc9579c
+DIST firefox-128.6.0esr-th.xpi 711790 BLAKE2B bff18428f65a23e87e802e7db44c86e477bab0cf37a187a14a45f8c898bc5eef8f761b48a577f608a89d490c8c114aa2a785d1f4f2a95ebbec958c3bfc74d6d1 SHA512 8e45e0fa6ae94576a85267dbfa6e5a99797110c3e87ce97663ac05e1a7f1ef6a0ccab83ca64e0f2593fed92f363ce744ba080128e155743767386cf7d2326fc3
+DIST firefox-128.6.0esr-tl.xpi 535606 BLAKE2B 5e01efe9c63dbba5f06bf0e8f1f72f0182ae1fe2d5a82a507d1ae92b3aaef632e5128bb1ca6a55892824e7f9ff97232ce6fbadd131806f4a45e08acf39d8e61d SHA512 86aabf2de88ad7ca4fecbb233b4031bf066cd7e53290de908d0f1f257ad73035da29d8aeb5ebaec09f0c7ea4e430f1b8fbde6f615daa65a679c63740ef780f8a
+DIST firefox-128.6.0esr-tr.xpi 649212 BLAKE2B f6cdbab52ec6a58c408742726bcf8f6b48b4c7ad7a1bef788a30a146b85cb6a0125f7a765da140e00cad3613c1d6836110f49cdb9f0ca23de98579e71060b371 SHA512 be764182fbcb8debad0739c8c5249d34295844608503f3ea241775129aa1382a7c31cd6e39ef4ab735bfc93dd6421c366a4da567f55a0ad1d188184d693f4aee
+DIST firefox-128.6.0esr-trs.xpi 505794 BLAKE2B 1b69e5d2487619993e03c31789790d131c3c24259f69e4262b755d7af558c0e5f5e35eba361286a598e84cfd86b56ab760eb2d2135be867afb84af2ad5f1dd03 SHA512 a843bed4965acc49299146c0809e988c8c42c0fb8023302eb6663094ef2333448a5abda5a9d56145d22c1de592f271d799a8eb7495e227aefb4ecb9f66795ab3
+DIST firefox-128.6.0esr-uk.xpi 731681 BLAKE2B bcd8e7fcc66a78ab1cfe5bf2fa07f054a82ab3c572efc8cb990bdfc7b62fc3331b05f809490ca2cd7ea302b5f650d7e8b465891eeebd541bc93dcb95cb065afa SHA512 12040d3a2b01a3f8ce12afc0e48bca246374e18abf407efabea1d502513af4ca261b2408c4df0b79e7157d0065d88e4d38e960c947765def54a99bd6a19c5d09
+DIST firefox-128.6.0esr-ur.xpi 561783 BLAKE2B 2b620d28ce998e043ee1ffb5047e94a9ab6711eb5e69678ff7d4ff94930ed5b6c57fd0990b684774d0631057814102da3d4d35967fe5e17f445a6184fe351c7e SHA512 7b1a8097ddd7f05ab4dcedee854a346c5384dac0e18e2dc94b335dfe6a2719b75875e1e7ca854711d9b56e143be4bd82a719869e4ec26f5eb968dfee1a7e3280
+DIST firefox-128.6.0esr-uz.xpi 480216 BLAKE2B b13cba4bf49685e8580fdd4905f1328212e429a158685c92e4106122433f792f378ddec87d39eac92ac8d9e2fef76d130f12c16aef19176e0e6d07a0b5e79d6a SHA512 d8ad2d2ec1269c0ddca496c38c2aa16cbc02b6179a59b4492e5fad6296ff9f141e62ed288d4224f5a575684a44b55000e56447ffb5f9ad9ca2794ecbaf83979b
+DIST firefox-128.6.0esr-vi.xpi 673230 BLAKE2B bc2dd96a1a960238055cf50b2997d50dd8193b194da8db190b9cd88a81179e3e156fd2570dda88d35feb8499b9a78fe81f9adf6e8adb032452ad6f882ad75052 SHA512 cd73f67b272d9d89b2f019b204d8dbba5fef1ad0f31d0ec8daca913c9ca2e267f69d3480bf4f98faa32522599a62ab5bf01b5d5ca149f64c56fcdf74c5c670b9
+DIST firefox-128.6.0esr-xh.xpi 418478 BLAKE2B 54d8625ccc0303bd0168476884a60a2018044e6d10c503ae7077bd27076bafe8326d390d3f86ce7a4bbdce60a42467d62ef56ac74437f537c843613e5791693e SHA512 905c1136f9dfbd372efa13a3174d52dde3674eeb9f3f1c0f5fcb3a6ca4efe591c7e77731ff69619f4a81e8f6550e8f26ecb504509128b91f06e99604d2d667ff
+DIST firefox-128.6.0esr-zh-CN.xpi 675204 BLAKE2B 25bf725f17d878b72125bef0d3f18e8424b3cd19c53ea98e6b5822b278b39e71e60cd19efb8f5d300b19d185e14f3f92eaa8f5247475b7fb81d90b3bba9fcc74 SHA512 ddeb8b74783d6654d9becda9108b1e2285d761de7170f850b854b78006a59775f341772de5806a50758d675f341e34b64b195772028d07a75cd6ceb27da0918b
+DIST firefox-128.6.0esr-zh-TW.xpi 677426 BLAKE2B b1c7f621ef3a73053ac60f57845d721fbedee579f098beac71f3b9d97b60c6a9ef97963829b4911cc1215f7a1dc935f3c9d30720b92f0eafa0f9d4ee46ebabb1 SHA512 1c415b1c94bbaabd6bb454a517aba30b7c19bab2a57641b48aedc2362ed8cffac1956cf56adee45ede9a9604dd1ce270d294b56363e859cf9e12e24d7adae48a
+DIST firefox-128.6.0esr.source.tar.xz 563259116 BLAKE2B 401c54e4c3e81dd1d4aa9fed072e5266a7549d9ac05e03f9755d3da192c9c46d2bc636e8bf0a7fad2269074615789ab274b897c8bd75fd524f4a5f138c3aa1d5 SHA512 49bce966e062766861712bd65cca46a438b339fe31598f69e4fe64da78ef6f8b4581c1d502341ef1c032aafaab2f4f88e69cb93a0b845ba7173fec277ae695b5
 DIST firefox-128esr-patches-07.tar.xz 18856 BLAKE2B 44d0ddf11518c7eef0a96de4f475a6ae1535e43e5bf89b8f61dc95330f28d6a053d08e6a183cf71432107256c83cd6ee6f742b235ca82babe4dd83698bf80d07 SHA512 60b4f18f5d91fc25f86cceccd561b55f167299908fbf2f9d7d69a8ce299c643f0b538d613d4348e42dd17c3812e4fa315e15004614af1f40fbe2adda417a1a81
+DIST firefox-128esr-patches-08.tar.xz 17564 BLAKE2B d904b74fdae2e76866ded11de5377a7b6883d35996b358ae3419ffb7da53b04b2c7d4bb10d48998a8318a84e8221de39955289cb33a8f278c131b4af2006be62 SHA512 344a2d04dec679cd8ed714dcecc9dd5b56696803cee9267e7c0c45c439d78728e7eae674bb5f0a64f2e5802dc59c1ec25f1703885024d88bda8a02e2b3e0d69e
 DIST firefox-133-patches-06.tar.xz 20296 BLAKE2B 4665a955e844460ecad42bb888c15772a16a8c28ece22e3130803cbb7ee00272c067ce160525f45efa4441e1e74084262ea012ad5e9b30afa7ebd66ef5abe7ef SHA512 1b630605c4b91acf56deefb476d8aaf2ec6c37b4fd79b09fb2eeec79113d92c8f3417301afe8b0da4d1992291b7c17d1eb37e877de2c3d0503021b0eccc53c7e
 DIST firefox-133.0.3-ach.xpi 468546 BLAKE2B 6da604850f3d69b4eb65a42e3d7c48a9d88803f91dd95b5fde30801a2041ca2cf0f11083fc565f21ed30c6588471bbdd8019f6d4cff8734b67ea105d2cfaef2f SHA512 8ee31a3c51ed6d2d1fdfbf98750ab54e0c2ddd96cb836a2ae310dce095f0b29bafb731329af845208c9b04fcacdcfb2fc92405a01394200e41453d4b1bb1759e
 DIST firefox-133.0.3-af.xpi 421558 BLAKE2B 0a9adf8f87950c28cd7cc56ab75a391d2795cdcb60b6d9f7680a7456cd0886e169376ff18dd0e0fbb3ed702ea333c8668c2bf3a635ff6e54f2913a93fe668b5c SHA512 2196953781da16c7e01128ffc89325c1f13d55f6d9528f0dac0671954fb7a0f7da3f55a31e821efefeefea65d32339945ff988b90febc91a4750779f21b919b0
@@ -303,5 +405,210 @@ DIST firefox-133.0.3-xh.xpi 421372 BLAKE2B 79238c6ce683f1d9cc585f8ce40e1603df46a
 DIST firefox-133.0.3-zh-CN.xpi 679309 BLAKE2B b6f9d3ac6055a258b78857dddffb89c97f2b77bd859bdab6bb20c7791f811267bcc09db2b451ed56855c074cbb9a7c6b09c375819e951f89d67b011178b30f82 SHA512 c42eba97f3069b38fdae933489c6dc1b9fbd7ab866830b4d3fbdbaf10969e1cf4665235193ae6985d032fd4007c12dc221f8a6f284625f60b36a043dcbf3c6b3
 DIST firefox-133.0.3-zh-TW.xpi 681633 BLAKE2B 7f67226c9bf2a2d311b7a13c5aaf68bae1c784c53256f3e971490980f6d739f2dedcde7803d0f1955d6be8390ad461d3fe1f84083a7ea093624ae39564aa6ffc SHA512 975b508f569eff982575a5d62387882a4fe0bc061ef5af510cdfcd4b8c04480b260d9bd89b0da857d481272b12ba5007b73b46938bcb24e2754139d7ec16a3d8
 DIST firefox-133.0.3.source.tar.xz 580071280 BLAKE2B e686408397a886e36ead739851ec190f108db2bda92b7147ec16c12233459dc23ab256ba125fb8902fb2a855ea76d9cb02e6c55ea62e7639f8700dba6bae9acb SHA512 ce48beaa5bb1717d9b6dbfff035b1bb5de1456df14b6a91adfaf3ccfb7ac550ab7ee854546231424a920e01d981825253609fce2ec326c4aa1ca316bbbdb31f8
+DIST firefox-134-patches-01.tar.xz 13880 BLAKE2B 4f80540acf09b51de091882318e205e1d9c7a8d65de62f453953d1e943321ba334d8f337244800e705fc38d7fac8c1cee87f4a8532020b708338cbbbb8b69426 SHA512 bd454754a5b14d9e34b8970d992639196672ee4472ee6c473287700c38f1a0127480c3a5eaf4de0a59ba72097f703fe231ef52fb4ab86d5dc5b99569285ce164
+DIST firefox-134.0-ach.xpi 468175 BLAKE2B a9eaab4624ae5675cc0f380c877b8aa5205cd768f640bdfac44e97714c1dd754f8bb89dcd2a71732438f6027b20b0f5f8493e839cf18640bc8d47b604034a1b9 SHA512 ca12411ab30de0f101656b4c2cc9914cc5602580ecb16a0af463c251de36d13641b468690961d4170dfcef89fb62242a73665ea320704e5c23227f5b6edbf8fe
+DIST firefox-134.0-af.xpi 421162 BLAKE2B a9bdd1b7f129a9d3a08df608e1b2d23a844b367bc2985fb6904ed233be5e0d57f36b840bf88712596117970ceb2d20c48f2afda4db3b6e767b1d7d39f72ab2f5 SHA512 36411f485e16856ca96fd5a8ad6a9f4b8266ccd880a9196b5f8052dfec32765e248c53f65930b9cc9b151123ad240edbd3095b7005ff132a6937cc48d2b9be25
+DIST firefox-134.0-an.xpi 510952 BLAKE2B ff0e62dc07bf174b68e691c5285931593312aad5b9522a8310dd5d78c6cde894d768cc394ca75082ea4085f80da164a8f46c632d30c09dc61d548a95362018e7 SHA512 2e1ea28b965ceb2ba8317635045b775084c239ab726a8c8ff5e95388abc09d54e4472914302f5b0c817801c3a962859ed3edb1c15a4cce39e5ccaa86899ae4af
+DIST firefox-134.0-ar.xpi 633883 BLAKE2B 499a63f6432343a0e0917ccdc5b74a381114683fb22a0361f2fbf1f1a57722cc3896ebae5cf7c8d1ac59fdb7ac201a1cbdc9108a9903ff0227754a91ba0e3a99 SHA512 4033c754a91f88b4b883ce539940a8e13241770df6bf41f30fe1dbcf7eff3589b3e7b67696bc62abf64294c044e25f54cb28179ea1af672147a8247bb5926c26
+DIST firefox-134.0-ast.xpi 500083 BLAKE2B 4806276202782d21fc715abd1f9acc3aa6c7971a419fdbcee9dbf11baccaaad6fb2176691631ddbea62351076cdeaa1f49454a2f383aff2aff9d1acec6b6c931 SHA512 2268f5d46db69cf61dfa9c7dd17f3178060180c856eb78fd0a930d98049cbbc81d1d7bcc542f55c586e59d417220ba7f6a6ef8862596d6fb7580434919b3e917
+DIST firefox-134.0-az.xpi 494914 BLAKE2B 98fed19418868442f33ab74a1d9400e91b9e71e4e028b9cf29751730b7f315c4eb419cb6d146a3cf15acfa8404753e408571bf4a8ad8ba38387aac268fc7cef0 SHA512 e5f22868fec85d0082abb5ea8ba24ae6833d38f5f70d0e717aabea718c513bef58bb519feb9a889f5bc6ec4d6d18c1cc9b4b8916100e0344e426841416d0175d
+DIST firefox-134.0-be.xpi 744276 BLAKE2B 5b85f995f7a8a065b8febb2cb31ca4681bce49c7df5a06d742c4bc47f3e0afba5a0181a09c58a3d3f9e99a2cda14a1489df68a31ec537c93dc155cce5b1ef51a SHA512 40ccdab86a13601506174c395812ab285b212332aed946c309979332d050aedf10983114fe9540538b8d45a783d6712acfa6ddeb334bb06b9bb7cec6c6f0c1c2
+DIST firefox-134.0-bg.xpi 670917 BLAKE2B c74f8c258ff87da9036b7720fa8f1b667815cc369b59084a06b298fe8fd0c7278ec302596b834b514ffc89e194996f8dadf485d50b94a3687078482bcc6230b5 SHA512 2984937477e5e15cc78e8d14a58a3ced09a60e9e72cb0decce8950969ce954ac5e18889cf804cd28421a4c799adb8041e761b8c8fd444fd4a8f596069af0e944
+DIST firefox-134.0-bn.xpi 615540 BLAKE2B 8598aecc24159a9ce4a3130351f7eb9a3d52121e9c4ddbb386101041818bfb7012b379e57e6a4162832278807fdd8c99e32230284934ae54b1dd1dbafd0624bc SHA512 56b3394fd8da1f189db1ccd7b636307e592199db2f9109710591d4c9fd77fb25ac0ca8ebd317c91eb3fcba143bc2648844f4b74ed76f6bc9e58aa3c710501e2f
+DIST firefox-134.0-br.xpi 598074 BLAKE2B 02a67188192651658c7bdea7a5256e11964e7ca86d479577bb9ec314b64796f47ffcdd21726e5b7b495196b26b7c4aa8d86f086c0c9b7eeb0fe556b61cb15e28 SHA512 280c030873b3e29ca1245ed0104b14a34c74e41bac485066058cb87f7e2e2df56fd5b89fc9378c7b018aff9e776e9e1032c2331011676c6c2bd2527c4607a57b
+DIST firefox-134.0-bs.xpi 557244 BLAKE2B c19d9a67887fc21ae1df78001759d5b44f45d2bb1e394c5e008ecc89fce9288b42f9320ed8b83bf1cabf83429be5e11bdb2edea8322a40bf8c1c1645805d8e03 SHA512 b4a8c5b09188afa95caa0694342160c8082b6b6668145e161d137144791fe85ef982ca852e67b56aab4301cfb6271259ae41eacbe6da211a2e07919f52c360d3
+DIST firefox-134.0-ca-valencia.xpi 550243 BLAKE2B 2b94db9efa25a8d72d2071824d923da49fdae896d83ad2ad3a20f765cfaa7c0761f8e0befda7eee70f8db0a82d62daac9712946a2645a2ccdd70b55b558b3ea1 SHA512 48bbbe27199f39b3b7b6db5d3aa2b475978d234c50a2f4d1e82d62c4478c4ff3a0a4406b1b473d54560e95146fd82f15789a3655c47ca72130f07303b865e978
+DIST firefox-134.0-ca.xpi 607760 BLAKE2B e369bcf5ac6faec9e2b80267785f8e80ae5f38f1cbc80be82b8cbb676ff44543229d43d73cdaa8c31610ce427b30324bec42ce59affb164190c6b291e3747e1c SHA512 0d411187a750975309071936c93e7ec5d179cf600acec8d5a63d00b5bc1124d6cd71d86c4ed29678bbd8bcceb56472c4ddb96231ffc704473e7cd27eeb0e8d73
+DIST firefox-134.0-cak.xpi 597775 BLAKE2B 338ceee303e1f61923827c61bc183f36c210371a5df8f4affe9f43c946003f07071c8c2b0b25e3f0575a007f9d818e703781daec8cc84aeae661a5687ca0db78 SHA512 e94b4320478188cc2cbcac3818bdf01c739e84f1503427264a3c0f8fa81abb8bfad05fef05f2b87e7a0f2a5d3185cd7c3ee172917fd8560d9a97dff7b95183a5
+DIST firefox-134.0-cs.xpi 688675 BLAKE2B 89750207ac3755d2ae8cd56f38d574447d7c547c153bd59779b6af421416c710fead0df0125ba41a3041ff096dce680abbf4cdcc2c61a88903051d0675be541d SHA512 787dd821e6cc4d8dc8b077854b21a7e2b2a444cfdaef21cb905d87584c43270900f368de049a940211c82d8d34c5a944c101483cefe1aa98a6a5f01afaf512fb
+DIST firefox-134.0-cy.xpi 649374 BLAKE2B a012dcf4dc063dad39349feeebc57f65d2dbd19dd9bcb30c6e0cf352832e40f431b1354299ae87c5ba84ba8f59b125fbc4cabc46f8c1d5808d47f893fecbb5e1 SHA512 535104977911640070b0a90915eb12863fedb3dbb9aba673cf2ea3f336cf449fe09daa198f9852c8643369e85b9a6da8791a0e0a93892ec94b7111de3c6a9631
+DIST firefox-134.0-da.xpi 637277 BLAKE2B beac566965ad67645341e95370dacdac62744ccdf70fab3fa3766c2b7aa5dbaec8ad07638e379e6bd0d72785cb5b7a2bd2b49721e409fda8fc9dc458df2c9533 SHA512 7bfd03093ffe0ce226d556322a26889008b362ccea90bb02b195061c83ba214773113aeecc18c791ab7e8d181457008cb9908e9fc1d57bc1d9f76c3a35b0244a
+DIST firefox-134.0-de.xpi 661278 BLAKE2B 2ae531ae6f9eb6a9f24267069e268f55e34cb3a8f316294000edecbfaeecce3256b0796131251fd88d1f796b1fa58049eae83c2a7fc7d239a1efa90bb046397c SHA512 a4b859e5536c6c7f5dd54fc1bd275efb16bb2d37b83299967ba97d8368a17c6d3bfc66c7288fe0d56369010015d8b0b97ce453e66830a203c6e716fa00ea2b93
+DIST firefox-134.0-dsb.xpi 678094 BLAKE2B 4ef86f513736609808ac2e2c0ec3b5a993795a24647c3871f4b2c877b9b6b03889629f6483d278ce86ab76c63c1c34a8a01241426d630a4ba19c4ac507bfd768 SHA512 e4c35f7544466b1f44b83b1837cd9100b57aebc574290ceed487cf38fa77eb9da8fea66c3c0043d7919b61e3c0ed9e7103ba5b9c4bd0e2189d7afcf1949dbdff
+DIST firefox-134.0-el.xpi 760444 BLAKE2B b01b4ed8767c4736ee103442d575947d984820c7c7b83e5302100c5b7e040d5d3977032a1e72eb4efb23e091fafcace0c374ac8c72bda5c952df1a8f8c8aee53 SHA512 1b85d8383a2186602f19125e0a2d8ea7a7e4fd2b7065db41419074254688f767c5d77c9874c768b83b5473d97519d50cc53025208d069e7fc6fb965a449e8fdb
+DIST firefox-134.0-en-CA.xpi 607990 BLAKE2B 84aa24343d7f657f9170f532900e719673fe9a81c03d340c3fb0b9d7b204b13b87df9aad63405b5b53d60dbc6bed2480b8dba4cb66f3f4f141b894ed5383e45a SHA512 8bd7905d288ca2efaa8e66aa24a00d062d15dfc82f256e9ce3c5d48f25196c625b4f9d03d2e848e417c6a77a98c47ddd142a390e5a1ad8b25bf08dcfbf5bb817
+DIST firefox-134.0-en-GB.xpi 609127 BLAKE2B 621027a1962b61a62ad6ece1028fb18e86d01ca760fcb51361bbd3b2b9bc7787118378bb5a4149caae17045e1703bea4956869cc7b9414731e7d4ad0ebd912c8 SHA512 bb5c07495920787b224160e8b80965c661b3a5e3efc281205a4f72f15c9195f12feae1843832439ccc58f6b7db9e1fb3a415bed0cb23e1bb3d68558e55edea73
+DIST firefox-134.0-eo.xpi 640106 BLAKE2B dc07c9670fd4d7340c7df5d21fa4e4e6a51d278b97ee5937953e12008b0c39ab36c00fcb1c5e28a7ab47518e9dbf53dd8877fae94d1e839e522d83c27e91b8d2 SHA512 783337aaf0e88f64992e90ec659a59859282678ad9a1330ceae9f1ec0cf050732e6ea4547f0525cc39674c680c8323afed3daa6bf9c66c7a519ed7ba0679ddcf
+DIST firefox-134.0-es-AR.xpi 654030 BLAKE2B f903a48e6dbef2e5820b6d9f783b68297b7eba7f3cfefaac6e4376cca626321a4e03d5c65c248d592e78c42e23981eb3883c0e1395d840e013176942fbfc0ff5 SHA512 4eb99e6e13f63df53006eff38c03f2ca25e8494e5406ccaa23e7d3eb51aa2049ea1fb558faa114248af92d885d3010c01d9637401f60623102fa3a8e20c06b94
+DIST firefox-134.0-es-CL.xpi 653726 BLAKE2B 92d312e3b68cf562d85a2980efc367a374bb380de5461770fddf66dd9a2f57bfaf4d1869c2bd433b56159ba91a4d65c07328b87615f38d7f5c39b2ad4f7572f0 SHA512 1175f079f704f3b4ecde696a0aa6a19646ca31f1ce7bd52762caefc7c9c88cb9ceaefe425d6ea2a86f9a428aad620ae83a9c4074c2820248333f9957d1e16d08
+DIST firefox-134.0-es-ES.xpi 648570 BLAKE2B 4889a95618d3a66e6e351086f023d616507bad730f18f691088b612ba0fd5e722d8946f66c826fe91e072fbd431a9d4fc297bafcd5aacdc21fb93940fc737038 SHA512 19ce7b26ee126a95587368c40b08cfb1b856c573b06a6b5adabb9eeb9bcd1ec00a18b09e51ddbe2a0e11a54e65ce88adb159d6f275ab932fb6c13484d6082621
+DIST firefox-134.0-es-MX.xpi 657163 BLAKE2B 55adbd7d260524a017c808aee37e22ee1c9aca9a92a812d6b79303fe2b2d2d12068a40883a5f43bebf1e400a201c9bdb75ae45521361a2372733e973231ce52a SHA512 60de9104db9fd3e76f1f0611e9aed423c16ef957f8ce6a6f3534d3fcf80462650c5c7aaae3659b80f9d8df40a54dcce5656302956afdad23125ed9bb717d984d
+DIST firefox-134.0-et.xpi 546711 BLAKE2B 6f76c5b5e2633c1024c8927427a2dff039fbebe68c5f5114d1e6d1296e07357636ef1438ec548169199d2bcf9cd7aec2d44b0b21298290f9b94c33ce6791433b SHA512 83bfe20856f81493d222bd5d8676c3ea3b87553def038b3ba7cc15b0b5d35e7c1980df51f8ab036e0835f17029c9e776403a3e498353513ab3830d2bf586cd9a
+DIST firefox-134.0-eu.xpi 622849 BLAKE2B de83771937c91d360fc2aa62a7247fd66cf0dc6a8a78256e3577138d121ef810ba8058203d30f33c023a9434a481e95f31df1b98fbdfd8ee2a2859f1bac973d4 SHA512 e1638c31fd4dcaa1a082cc9f8b278c968dfe2b377381638e3682638f211a363beedb3221f33acb65e325ef98b3b75f2a812c5de991674fa4092246f68427da72
+DIST firefox-134.0-fa.xpi 625175 BLAKE2B 29d1200918b50ab32150995f9c72ed3c3ed495a691b4d446c99d099c64ef4254fd4d4194d726904e04c1f17826313e2ab4a8afd048579007f750c804a065221f SHA512 92a9bd736629e6ad97ffd6609ef6bed2be43a770a1e356b94e8fd74bd3471364d605141b8e257aca88ceaafc586424e79b7b63cb5a3258126b14ebbeabd6477a
+DIST firefox-134.0-ff.xpi 479999 BLAKE2B 85c2fdec3c0e3f37e33f756e5751aae6e17f02d3d503f913200a2788b0b5aaa3492c46b6c381f633b96eaba3f13164177392658ceb2d18d39473b0b58760cb77 SHA512 779a6ce6ebf1d2dd82345a92a166d8e83e8216287d8a6066bdb46fdc42b9342f5556be11ed78625c87179567845b1eb93bb4d101ed7c39297bec657802bfb2c6
+DIST firefox-134.0-fi.xpi 634177 BLAKE2B c4a28dd11b971b7d3b74011d6d6137f6fd7890a98f860cdaee0cbbe9edf48bd511c08fe22bc2922aa3bb3d26665b745584a2bb712ca7df515c89bd6c70a8b4a1 SHA512 4f0479c83b457b575f70a149c37c90877a55100d8b3fcee0b5216d6b4d73b62e9e0d04467fedab9a2aaefe01b7feefcf2c4f623ab997ebbf3e6617739b349fdb
+DIST firefox-134.0-fr.xpi 667546 BLAKE2B 510825119b5ae19935623860ac038c0345d3583f80d8c296b8e4f7aea2e474bcfda1cfd538fc2c79d8ec19ad88b12cc84f7f31f7b972b2364e752672d5ef14a6 SHA512 116e99d4f0b543739127131470b07f0fea478de71e395f999a71f99b799df8c1c33e7352472ec40b443d620a05269ce98587f74322e898e08daf0a236ca01606
+DIST firefox-134.0-fur.xpi 652563 BLAKE2B 3faf2cb17a496470d49bda53f4811c517f77860a02c4dd4222b2bea97a1e4380f7ca6624ece7bd416686aff047cb7c40cfaff38bb20fb49cadbf77a32451f510 SHA512 febb5f87a803dd81459e92fd55c0236a4225d927df21ed95f0fbc9c6727c9e73916d18508acfaaa0b77bed013c6f7c39be0a5bf066d66c6767cd28c7bb356918
+DIST firefox-134.0-fy-NL.xpi 649694 BLAKE2B bf3f00c9b4c7bbfb103002a1382d3c99b44bfc157d8b9865137263515d950bb5d9797623844a2cd053746f2bf0c0db577bb12827c19e04a514bc231dabae69fa SHA512 b2d7f8672ed0360b2ad95017cddb0b31f030e8e5dc87679a059e6b31ebe687eface7a7120224b55a310c476b82d1adb47c35858f71de77238f3ad9ae70892f3d
+DIST firefox-134.0-ga-IE.xpi 474982 BLAKE2B ebee8e595678b4dcd4adc159b9e81e42481746af9f90c8a4d0c26b04bf194804be7f2eea84d54115924e712725c8b7670b082082a737603ea4c516f9539a609a SHA512 c28ee784a56b5535930645e7398c13c07ea6822486c6b9260ec20ea5ff0a0b30b7dafbd93b7abacb3880bd521243b72dae72ab33780afff1a1c4b4640d07fbb6
+DIST firefox-134.0-gd.xpi 603300 BLAKE2B 019e09fd2c46919aac770689c17a06f8d3c83006e27f7f92b29cadefe529951c18f50f9e6081d4bc4e49895d0f28e49398fb957764cac912868226a088cb969b SHA512 7f9535446536919fb9c6c4ee5f4cf8874d41e500a0a9cd65d1eaa436d7cfd8edbac2c4a1fc2b4481b53ab017019e5da176c45240c5525cc06d1e9fb7537df79b
+DIST firefox-134.0-gl.xpi 614908 BLAKE2B 35c1cff09869b2fa556b112fb1e46deacc645f37f3af8dbf9ef4aca60596d06e966dd65a68554c365c5a72495bf94ee215b0b5a884d9dd316a30108e197cdc31 SHA512 ad794ad32fcea6c5d3d677f215c78cddcfb6f9bf7ce2001f13da5ae0bb3ab83fcf932b2ed5937a5248d96bb3b052f53a11c3ed9289b851e5c7d7573c80d0f986
+DIST firefox-134.0-gn.xpi 661081 BLAKE2B 96af2541f39a6bf0d1f84210cb78a0eda3aaf698773a5d484dd76927fc3faca0a28581e95e42afbe404cb867f5730c4f15d1719011ee90fc875116ec154c5e94 SHA512 61f5612fbdfed0ebee60a118734761a9c8c382b0d50b8281566c9f3896a3eb509b86b2bf9f59de08a231f9af80bee9b40acfea8149e378b6e851a42d711cfdfc
+DIST firefox-134.0-gu-IN.xpi 531510 BLAKE2B aed65e51e72a525bfb74e9efe52af651c787bdce71962e2f035bea4b6c0af2c7d6b293a7c99c65c2e7b76748b58dc5c425759786eed73530be60860e654fbdc7 SHA512 b5daef8e06b003511a0bf34a7e802f3c278342d0d1964930e2904c002c76ad22d7c839b4450c88709f3da3662d8a8d97ad412806d9d2d8582c30a8bc17b2135a
+DIST firefox-134.0-he.xpi 656241 BLAKE2B e5e33c5205019120333e1bf28f0bc7ff5fc651e72452650fb3ff5211c773185149b5b0328c4384778f46f42a12f11e17cbf96af8d60908d71b43b41f88dbf4ef SHA512 9948154b38aa50ec11a3f478682bf61c5f7a9d2c9022feb4b2e0e379c42901d5604e32a8455c4caa2a8e4bf94e9232d5b3d24e2e93d970f15570c45cadbc92f5
+DIST firefox-134.0-hi-IN.xpi 570956 BLAKE2B 516aa55421d863261421ed8bf3dc93c63157aa4cf324be8ad2658780861128c5fb3828c5237208654e49cc0f11dd8cd64bb4e2b02f99e112f6077b2471a916a8 SHA512 6836bd4de8ba0c57a9a1e9f8079d6eab4230442fb3ab29e69a27c9e836afa11124a1c761b90a0ad2d37f21a98542d04d6c87f30d4ad83420a7ae49c6598b0665
+DIST firefox-134.0-hr.xpi 633368 BLAKE2B 96b344a5bd091e574bfd0ca7350df579732484edcf54f3db709901cf63415d306b2c4919d8f7942dca3876892394732a975f245d652c50a487525a7d61039381 SHA512 aebfd94df4e98412410953b922850a58c37c6ca149b64a4301e4e0cc82d646a9e050260cd0e237e8e685415cdec6a377618cb7cd1db2773056f859ce003c2e11
+DIST firefox-134.0-hsb.xpi 674109 BLAKE2B 7f053ef3ca21c59ad5d2d55ddda8136d54b60f51694131dfa4b5d8fc47ccde6d922c50967ccb1047ec607af489e1cb64313628a9f5fbd865d8741dae77c9a907 SHA512 a7885aaa5f03138dae3a70aecd77d090cc57d5deff3cd7c36b9b3c3a5250b814db1edd69f00d49845d98ba8ac0ee6130c88ecba23a3208010c26a5ac7b72d652
+DIST firefox-134.0-hu.xpi 678173 BLAKE2B 1865fd393f9dea7fbc0bae251c0c6fa7a1f8047e87508e06c21f2d755635b372a713f32d4ecc32a112c77cec249d3e883900384085ecc2d652d9bce604d8e320 SHA512 5b1247bdf0fe4cc4a5ff31db0398589bf4b17fa72b6f61814f74fafbe52a00a0754ea0e5585cc909d14bda0a7a3301e5efa8501fe707c23b5d9c24d4732ba729
+DIST firefox-134.0-hy-AM.xpi 661671 BLAKE2B 027c9a6ac7b9139b2e5b633c359005728b1d8f80f3627e1770702781b7b4ea039eb6d14b6aebf51d610659d72019b34efff3fcba9fe6f22aa0ff087e43865c4f SHA512 48c686539e93f8b0510ee1484e261e0f700767fbace31c745d4242e8604c23921eb102e89136f96c8ff46e5caa360dcbe10fde2a3111785357fead8099938a9a
+DIST firefox-134.0-ia.xpi 636635 BLAKE2B 52033a26972eda686ad6b18ed18552cb75ad79ad36f2b25ae1798cdf276efecfd480a0e8c7eb8e6907d95989251ef1210218ea6d80dc226c3c7a535720e18540 SHA512 8d7d17fb12797ac7866a202e213048195fd3a888f308153bddee559c308d974d3c28f4e7c7ba33f466276a5dd133adc6f47d043855562f2570ff229522c07371
+DIST firefox-134.0-id.xpi 620028 BLAKE2B 4a6b509ed71d455a952098606db488e246441d5708036e2ec5c5da5f6423ff10807ddcf5159e0f30f102a3e651e81b2d50806e25ee45e5f0df4f86a8aa1e1325 SHA512 a198e8e85167ab37a158d2ce3dcaeac4a66875e8a3bcf14b9e93f1c041266165a8757f42d42f8bf333a8935968c61929b7a01e808f2bede03617d03dc34075b1
+DIST firefox-134.0-is.xpi 642110 BLAKE2B 56b463c588dc2b43861ba7d16e08df029f390451702cf38eccdec73abd989c6e46216078c85cb870f983cf311ce1eaa65997caee07f685e06ac51e05ef5f1269 SHA512 26036a48139178aa4609bc70371814543830385224c8c9b5c9291356ba0f530426062c69b9b2d2bce92d10d927fda9aebbf78324bad01793ffc59b23cbc4fc63
+DIST firefox-134.0-it.xpi 646160 BLAKE2B 8dca9f809cded5193b34b9682114aefeaf27383fabbbcc94a46de294959e301fd1454d868e242355078a989fe6da83951ddc02d693c38f481fe172d7009a3776 SHA512 39c328508f6bb53b0688ee40fcf7e50e21ff85a397fefa1612edb284f2b7e36502984ff8e543398db4c8b295f2c1523f260e97aaacabe27bc8d987ab950ba16f
+DIST firefox-134.0-ja.xpi 704024 BLAKE2B 76aee1734dced3a87537ae0f8d7f82ff74171a87c4f9418c3f69359fef32ed199527c8e1ea1259a070e421d84c62d1d57bbf9cb5f7f2ccf6704013e60720d6d4 SHA512 9b1f0c27cfc472a22aef82fb446c8ddf923f997442a1369575c98723b33ec7a31da7b61bc5744cdab40d1f7812d6768c5f6c47db9c1b1dfa1648499d84bd98c0
+DIST firefox-134.0-ka.xpi 711240 BLAKE2B 8f221b7f4ea16e5e2fb3d8c2cb274997f95f21f9419fb9606fd4a7e8e245a971d4a7f825d97c6c04d2bcc9a7a0ef996980e5bf3612c9b68a0d69cedca90f4df9 SHA512 f2ca38b1e8ebbe73c37d0c009b1ab65e103175a69c2d42a0c9e1e27576f1ac7051f051f2dfc323d417c3cffadaded2a178b2c927975a7377fe4d42a7f7e73eb6
+DIST firefox-134.0-kab.xpi 626328 BLAKE2B fe69b8c014967ddc649ed98e17f56967a2449f9b7107e9603d6202a97a093e4ffaa04431ca83867348bda9b5101ccbb936e3bcdde063eb2231e3012f8e06739d SHA512 76c6e9db97ebd1daec554e24ab48564281b4ad8fd198f5750c14bc94bbb40115cb76716e4f5a7b44d0b7ab2073f68f4ceee23f8b5a6c4425734268d19c21d2a9
+DIST firefox-134.0-kk.xpi 734784 BLAKE2B 6f77c28fd237f8ca9634ab0ad9fbe820dc78603b09ef3fe796b9152c4cb14bdfc3d0189c97ef3a6b19cfba01025ea112d3d6f46bbc7c0a7dc2f7e273d2edc6a4 SHA512 d2e32e4a9d9e2ad35b5fab0ef79921d60dc62e21e51b792f9316e60bf77394354e13b480cc4248579a31f470ed307ac8e66921f8cc5ae59c3fe73b5e209d72cf
+DIST firefox-134.0-km.xpi 529770 BLAKE2B d684dfcf62f0e5ec777e8dba8c58cd3ea0f3be9c3ff2db58164382b0ee11b03591bdc50604fab00bdd4d266a6e73202fb1bfabce854b15d9e1e9590cfd6bf5e2 SHA512 a4624a5cb60041ba2b94c199a0f6a8e09c5ce29f577bec7a791afc3d9eed944f9e416801c88fe158a0734f83d48a3076495e146095b2fa5b2ff481af86fa20ee
+DIST firefox-134.0-kn.xpi 494779 BLAKE2B 8f2e7d9ad8d67d0b03982738d3db00ce921befb54f1bb67a4451013ea8f583f91c79a468de37abc59c073f77667ebb3f7116edb08f393cea4591695c4dfb3263 SHA512 92fbc828362f09572fbf909e4b50b3bf3572dd5495f6449c622d6072d89f50ac095f8ed48cb7cb99c9aa92195ef033ec3fa4a44b21fbb13aa07380004aa20210
+DIST firefox-134.0-ko.xpi 688670 BLAKE2B 46552c5fb5a08da2e25a15baab5ed5d64aa9964e93ec6769a532f7e8808f56baa74b3c402eb80196f176c4fc90ebb3493971e2e70f96caf2da9e6e9d8f36f197 SHA512 b82a3c0d9aa69afc94f8e74fe1021cc28ff1d2521f432ade955940cf6c24418aebc3ca26f169d57ae105256d2cb34697d256ce4b9fb08f448c6d90eacc6fee50
+DIST firefox-134.0-lij.xpi 488327 BLAKE2B 9a2b0ee6328da5b1efc83be48a0cc5eea886df98f1f1bd55e9b3ded4eeec1ab5c2bdf105eaaad0ac547f3c0cfbb8e8a558a25429abb0bc7dfb8391e52a007db1 SHA512 5e405965493f3aeedbff0f06852bc1ec40c3ea9b440fd18a9de169956a554fe0ca0b31aeeec9840de49e223e1a87a446d9921e92120b59d7ccc6ebbc6a3134cd
+DIST firefox-134.0-lt.xpi 577201 BLAKE2B fa99bf93f7298e69381a4a986c10fbe203629edbb51c761c08b7ea40dcd9c6a616611096a3036cbeeb1c6c8e7fc8b6e272d0319c00be273c84cff934745d25f4 SHA512 2f37c3b318b1d5d985e32755a8a351791e83a0cec6215d02e435ceab7915d08afb06870f0fb272a179a63fbdb94de1c3f84bb94a679bb7bad66a7da29c85b76a
+DIST firefox-134.0-lv.xpi 590048 BLAKE2B 5a8623e003c2aef172d0796433797e9eb510b442066bcb45cb6fec5002e63fd7b81056f57f10ac59c905cc274e011e30ec92df5465e734b4297741156b7543a6 SHA512 73099be1cae3f0232acde3063d8b9f60bc3f22876449ffc53ab19e981db9927f7adce57553ddb80b2efa31f3db14bcb37257583c7c83360a2d65c2fb605f80d4
+DIST firefox-134.0-mk.xpi 497213 BLAKE2B bfad1e6a9c919f96d6692b2b2eea7ae841cae24cb532118b177c0c3fb99c040e72da88617f42ead86c63b9a83b945958a84b6b39839b91e9dd74e5e1e6c94baf SHA512 2d102dfeeb17d66abf6c2c40b35d99541dab01d64ff143d28da1950a1ffc46e99cf45317b4382fdd0a25de9db331589590ee7d8976ba50e12de5360aba0071dd
+DIST firefox-134.0-mr.xpi 536143 BLAKE2B be8b5a11105da49ab2479fec5fb15fbf7efbd7de6838c326515d296bc4e1bc2ea5c4feed5d65ac5de0da62a46ad33675ae027c5525c6615bfb2ace406366d523 SHA512 59d7555d590cbf6dfb855725e9ce85f6d033a0b3fb714b92e9b9a954868ed590df55dd67b4a45bcd1b5f4c5c029cc65dd7b7fbf7ec9f71d50668082f417f283e
+DIST firefox-134.0-ms.xpi 453846 BLAKE2B ede75605082be68e8965eff116fc19741cf338d987ad0c03dae4bdb441aacd2c5151e2fa8655c15937b7a69033d9f88474928ce60560872d71b812aa23db49a4 SHA512 15dbc9b1c56d97aecc79ebe99965b05238b37c127cdcb4c52035fa88d23b7ab3f8f5b97b6cabf9193c77d37a669a2d4de52e31a0796d801b0443125412d2de8f
+DIST firefox-134.0-my.xpi 522468 BLAKE2B 00a9e7328968c4ed0636c0531b835b1fdfaf94f451ea297e1dbcbe05c5946adee87a5ad9d6e20af897b4f56de0ce964773fdd90ace5f6e68ade4cc36b46d04a2 SHA512 e7794350f214bd015896e5c8cdd4a24e02b71a2bb73ae2f95ef23de030c7fb2e9f70431c342a99e12d8899da164ab820b56011f1ac7fb2bf313d51ff879b2596
+DIST firefox-134.0-nb-NO.xpi 625554 BLAKE2B 9ef2a904ce19d095acc49ec9ef043ccca21d94c79f84b69356e8f812f2acdaef768eed0922e688728d659701e84d09eeafc405363e931cfd30cb660bb3177879 SHA512 ee97217855b3cdc73f4d4529ffffcb570026becafbe542a8477ccc743475762af69edaa788278a60b9ea8d733a8b20bcc7a17f9303a603daf5a09585eabad68c
+DIST firefox-134.0-ne-NP.xpi 524811 BLAKE2B c1d4403220341adec278fc204b44c1443fc94b00158a3deebd4bc1a5c790c9706e2bd18d150ecd27efdac966c57a2c32aa67d6f367bb1b752176020a1a484563 SHA512 47e50fdfe3fd4921e4cdcc2fc72501a754d0e51d3e149cc093b82b9c4ad00e0e9951c83afa19b7b1e85e96923e9ec31f6dcc55f8b992bf742affe662fc153b00
+DIST firefox-134.0-nl.xpi 642841 BLAKE2B ed7bd0d0419819f3d9939b598328598de04b03b02fd3b4b65b2f24a419824d34640bbc51d8374de78db222120629768eaaacbafcb894fe83e85ba5dfba4207cc SHA512 44620f7fef6c7c4c3e41a966aca5902e58c1f04401e0e1bfd9cfca285355d00c82d038be55d62ab0769b3be0ca81400d12c731c2b82e4964c8ba05701387cdb2
+DIST firefox-134.0-nn-NO.xpi 629840 BLAKE2B fbbba8a0590f849df7b17e1cdad0a088649fd57a81fd008bc72c3d0a819773966bea710a7d234b3cd272e0650359031485e6c8c64cc97dbc03e09fca98679209 SHA512 d73d2338a401fb0fe950f78bf080f5021bd60da33077cc1a525c3da8b8297d2f9fe28f6d20bb3c0786f2c0f19dc65256456426d646533d60cb2d8adc9799fe7d
+DIST firefox-134.0-oc.xpi 626181 BLAKE2B 51e33ed53bc1e730867ada9498c2cc69a0a81ffc7c3d79c293e8c378036690467297cc33cd16519fd48b44214998ececda9c8fce0082227230ace54dff615d3f SHA512 67e2473eac8176557dce11ffae66c68bca5597f79d7f6151087acc3c2ee79806c34582d6e2337885a5941bc20c5524db4b0d081d8feb6918aada10ee15564f47
+DIST firefox-134.0-pa-IN.xpi 723083 BLAKE2B df9a2c5a04add3716b31aed17ed44389a24bdaf4d174ef7d728a74d5675a68857f2ac5944bd608e8da56a8c18c3ff02f3ecb07b5b43c7734ed7a2bb16dadcf03 SHA512 7ff4909d046317a4ef6329a109061d771a054672fced6365ec2c2d7487f665b98ea90ec5f5a45c9410e1916ad0122f92828a3267ea829cb38cca90ed9a503a17
+DIST firefox-134.0-pl.xpi 661734 BLAKE2B 0f83a5628415325aa808244c91ea7cd5483b19b5d6237ba0b949fb0ea4a2e4b42d002467d6d6313b0870c0decfd1b28e4969a94a136f9ae9c7a4cf719281b70f SHA512 ad8329ed1e96be483e9a1e809fa4dea71d867e7359b13e24db8b71dbda908972ed456ed89917eb0af4fffc4e8c952bf2060bd96dc46a4ca980ce839463765ae9
+DIST firefox-134.0-pt-BR.xpi 647955 BLAKE2B 8c8006f9bc32dbd1c24827be85af0be7f895a40a2ea7d7a2ce5f57da82381f3f919d132dba4db181c84fdc216ebacf49deddcb0fa290a4c64bbd3513f7e67771 SHA512 5a5613be6cb85e6e5175b7ef028a6554c37748f6439bc8fbcb7c0a92c94c7e0a21c1b67e1b6d243fcb533af9c5550435f4a19e132df98642d089c00318ab6dd9
+DIST firefox-134.0-pt-PT.xpi 654969 BLAKE2B ef28cfb5c6432a7a6544f689b2650b220f539bbae2ba8db1643812eba253168abb91be37679550155b090c3d9111a6636aa13879018c79aee838de6ad075033e SHA512 2f6119783cd9c5f7c8426b9be9dfcf3856c465e63966d38d4863b15734de53898c00fde3896beb965845bc0df2a33089b4353b82ca812660efd0ef73256f420e
+DIST firefox-134.0-rm.xpi 644069 BLAKE2B 4e00656d142d6fe2b47e1c37c44daf99ba49ef5e2c977fc4608dce721870fd18aae83802576e917e36cb8e1036ad8784f7cd22d37ef3da2dd961d56f3c87ada4 SHA512 5e95251b36d4ac8cf36307c2fefa6fecdba532177efed439d12f5492aa6b3114b2f13c31411ae38a7e05e3f15da703c4f06f3c519309349424ea4140ad59317d
+DIST firefox-134.0-ro.xpi 554204 BLAKE2B 152690cf27c8b66b1201ed2d5158ec466a2954cc94ea39d6781811fba05499fd127e9b0ee7fea54f48da69c183d91901e39f6e01fb124b51d0bfd0b002d23737 SHA512 a498a0be99a01ce8c70d099e32c25f1b84e9442fd940d288c2037e646db8cd408c7bae12f9a764759b04065a47aa455e5da7f9075d3e71e3be2516d19bb62cd2
+DIST firefox-134.0-ru.xpi 750993 BLAKE2B c1696b5da1d593a3439a27ceee154b12db6256c53cd45c29a684a2bdf6b4bbd3fdb8e70f76d488f8c5653db3875aa67049acbee5d10857cbc7ac9324280a0d8a SHA512 8777c13f33b6c6cdd8a051fdd1b4671a77d9e8c74754ad16129f28042aa5ad44981eb2859b1abb9cac6b8caab8163d0f4b909a9817b52395b9c233c817fb7451
+DIST firefox-134.0-sc.xpi 602167 BLAKE2B a6c567999ff69fe2ce1e582bf1832ba9e5e96d522acdb8ab93dbfeb70131d9b241d71b0a1a16c18569e754c2415d6241acd4b2753c9da70b90334e9c42113403 SHA512 a4ca14be44f2b8ded0152b9c5bcffa710dba48d21f5ec96c47251e327b5cede1965281d2006c3ef881dadb317fcfa0b5bf962227773968b856946789a1e5e68b
+DIST firefox-134.0-sco.xpi 515423 BLAKE2B e1d0654918a714460c2790717346c469671735a07f330fcada32c4947991e7b0da93e497eb0e80d893f03b12097edf1d71dfed5cfa46eaa582ce8de73bcae4ad SHA512 7cb519be6f4c23b311bf3423b69895c19fb14e6fd372a2b75fabc7ea2d8c63cedf42f28f3c6e61f37db47879ada678655238b223c21686d642a8cdd6cd80dcb7
+DIST firefox-134.0-si.xpi 626867 BLAKE2B 077c7f1fc1320669968eaf605c6614799f6b2bafcd330b3f489a0624ff25e831a7bc38351bbb5adc0de64dbe04ced481f1c0e7a78ee45e868b5175fc8063f161 SHA512 b627fd841542107b098e4c6b7e705bec76f646e1822a99ed70daed8a5bba0048d9092aa958d1ae73bf7a41ff3d5fd74490d0b973e448f9d10091fe83d8001014
+DIST firefox-134.0-sk.xpi 680487 BLAKE2B c3dd9a39b74231e0af76498557d770898ba4620f95f144fc36d53d0ab588b350ca3eef5b8071764cbcdaa5d6005c23309d5bed497220ba8a340ff8582f99b1d6 SHA512 55b3c48e0593d0902042557245c5f2747e3796b24e5bdbf5bcd7c22a7c221684147058daa599eab3d0556fcde28620d81bbdb24a2ee874e15414ebed39f6384c
+DIST firefox-134.0-skr.xpi 727787 BLAKE2B 43539ce890c628d4cfc07d5169de790964f1a56ff17b7760e08e189c0de717f6a7014ce94176e2cf3539067b2906ba3415f183d3646499e77d51e0b3f9a91077 SHA512 2df6f26d44f1e0fd8b61660b2e493c5f6d477de708b86a08d425b886c4973bb92a4b98d18f66a9e2e99966e47ace1c2a2f143ae82d3681a2d37454ce5cbfd91c
+DIST firefox-134.0-sl.xpi 647162 BLAKE2B 59c456d0a606323663d03a7e76344ef8c5b7d909535017dee9a711bddb8672e1df23f10568ae5f09d49547dd97b4c03e28546bb2a13f3b45b706228c125e25d2 SHA512 c23b7540f60ccd69db8a462d34747babbd825ef35d0f68d72a1ae329889cfefcc0916ee7ffa6aebfd4cffd757a2ba6f1142cc3ee2a0cd95eda342fb947d9cbc4
+DIST firefox-134.0-son.xpi 420277 BLAKE2B dbf934e75653ccd7f8c7f987b5640aae1891c02a07baf0718e7cb0a633f20b079d910998242ce37f0105650e3a2777bc1f1da7fd46d799839707a615df060ed1 SHA512 9355c045bdb761e66bdd7ccb131993ae073015d9ce80712d64eff9fe7c27a109308dc14e6090103ccfe75c4d375b3348688cbedc47fda69cc6b13a95ebcb4239
+DIST firefox-134.0-sq.xpi 665689 BLAKE2B 7283bb5bfee040c8404bb60b3a4bec4a420ce9287719cbb22c4f596b7b00f98b7db25292c69017c92575d1088b7819946db20b0eca69d8bb6a2d67e44573485a SHA512 f1bca9246daba492d5e2ffb29781cd299eda64e4944ea885d1b25a8b31989831b83f830021862431ec5828c6bc35154a359b388af3dcb4caf8a28b0e3506e753
+DIST firefox-134.0-sr.xpi 676512 BLAKE2B 5052293123365b0655010824485aac2188c41acf68593469970596350de7db000f98043d32f863f7032253ae1075539178dfcdce8c4411175a15559335737c55 SHA512 6ffc9baf2fa80bcc61337c75b28f77b9e5c9915dc8c4ab3db3d968be0f80d6f5cc62f3e3057b5423fd158b663066a0f9b938763548c8717182be9911c5ba9fde
+DIST firefox-134.0-sv-SE.xpi 644572 BLAKE2B 2473d4381cc01a331621950916badbf6e8ed441f81bbee1f91fd86e218df50be1bc0c33a9f342454731072be9c1b39a05b0cedb1811a39c483952a676f471f36 SHA512 b364924165cc1e463ccb572ef79cfd2014352ccd4ed73d09215ce977f9682f0cb1f7653bcfadf26bd8f73eb1cfa9c7edc9509c1de19620eb3b7400b10792ada5
+DIST firefox-134.0-szl.xpi 530484 BLAKE2B cb68fb9eb03a1b2fae3d3359e9912e6317f7487709093151bda3270d0f27e803c21975964e02c424e7fe7c9a6e0ad78c3d5b6f8c7f73bf1861d1174dccf647db SHA512 247dc50b03ee0db9773ccef63b69c81494ff9f68d9a7958730aa466ade17f1d01fcf186e9619767c49d75eaa8d9726ebf7b4f03c3fd24e820b8e4d2b53a4222a
+DIST firefox-134.0-ta.xpi 511223 BLAKE2B 923c419aa600a129a26a4b6ae8f25a19b17804ba3b158904488c5fd072eaa04955dc74985f00baac68baf8583ac82b76607167873c3d86dbfc3ee76503c9208f SHA512 6354017396ca9b0aa2c7ab1922194b6406cb14648d96c7dce53f6d59933245e21292009afa8154358e82ee46da98caec94c6728199cfe5af18fc6013911129ae
+DIST firefox-134.0-te.xpi 575374 BLAKE2B a6cd392aa090ab43c15a25547dc635cdc2515342d4e71c5107c8dfa584861a50615bfc9604439595de43c66878df45617c6f114fce42136cbc3f3a690187330a SHA512 a4024e7e9a7301b93ffa0e19f770ab2380db675802d7ccb55f709d7ebdfa11188372b7eb8a83a2fcf44260943572ede7ea53823300609bba570151df356f732f
+DIST firefox-134.0-th.xpi 727737 BLAKE2B 5db06b144fd0dcae2412ed238c2025e87069972057e6e00c27cbaca2c6864537bbcb0a527ae0f220b7e5a3e9faf02034733a29f026e75be4a95b2aaaadb1e3df SHA512 f2580bd7fdce036cfe275d1bd0a44b31e93f155faccf980a4b662acc2b6daf6dc463911888d7a786ea107a0f8f986aa7999d792b24f908f87263b9ab6a5fa660
+DIST firefox-134.0-tl.xpi 538552 BLAKE2B 15ee6b545f884659252025d983339d71498b258b50062a1ecf6f542697ae5c4556acb7ee898471ea530c97e6f754180cc010f91ec50c9815829615d179000c6d SHA512 c14a59836795062f96059b6eca08b5b46dcf056bc360ddaed6181fa06f80aa8987955204b42da81b4e850816df265b50843e7b920f9e750f2f8e6530da0e16b1
+DIST firefox-134.0-tr.xpi 656854 BLAKE2B 706941944a18ea03de340e471e418d4201058105cba51a6eada0805505dc8b17df8d62bfb95209fd8de67e7500106bb132aee58f4484002305cddfc2cafeb6b0 SHA512 f8e31694235fd77d5d1e3136dd3a53ce4680c07b3c243a0d70e2f32ad98801c3af7c417de2d129fdb170238e6b55499f213d4d6e2b7437b1fab9f6743b1200d7
+DIST firefox-134.0-trs.xpi 507813 BLAKE2B 7f1fb796821aaf37fbf7052163fabedc57453f9cdbf2c4521db48e3fbe871dff6c2e873be091923073703cdc27668f31d13fee0ae82045f8dba4e7805af94d96 SHA512 9383f0a069e47f5ae6959df6ac026b69d074a7b163ff5c1f3c72861d558d0bf9ae0d280853414d84ae5d7b6f32688d134f5a5db0b6b27720747913e0c967248f
+DIST firefox-134.0-uk.xpi 742077 BLAKE2B bbc0c8813459ba0c0f54fbdaaecadc9c729535b896005f6d2947ca9ba09233e7507ff026579632604598e768d396fd34ac3291d25a0ad56855584b24ccdabc85 SHA512 920969f555f31fef82325d8cebd213a59c7b0d895044538cd34e5eee0b9f688657e76e9c0f7c6489a7bda660ff6747a7902515734277adea2a7939ce59a56d96
+DIST firefox-134.0-ur.xpi 564382 BLAKE2B 90aec1224989da6d6fcc88e99416a02b84909bf018e594a09082fbfd4947cd9afd649e83b972a72791a2074ea4e01b93997bb6022dcebfc0c5987798d49fa2b0 SHA512 e1c354defed3fec88cba9869296ac698d380c7c4450135ede9409c0c049bba0af01e774591881bfb1a71536361e2d4c82e67848138a37cdced3bac6b6f4f37b4
+DIST firefox-134.0-uz.xpi 482831 BLAKE2B e9bdaf98797a83b71e49390d7f5a048158f771734d213165911160550d5cc092f4701922ff3ab5c58ebedca88ee45a369977d6ba76249797061987f986b694c5 SHA512 ebc41f4d9e12935d6d815eb782a41e7ebf8e237f3e0d3896f5330690b80454f00c36d3f067be26b068913bad93bea876a7519f557aa0c497298c6225a0b99161
+DIST firefox-134.0-vi.xpi 683428 BLAKE2B b734c15bfb6712a665ea53d27c6eadef985c3c40235b52d4438ffe8c3984b387468c95e4b1671ed179377d94b71eb60e7275520806707b5aed19ccf14cc044e8 SHA512 4e15d75acf84a780bc34cf11d78a0568fdae087be441870df82f8fbb6f99f6bffc45763542d5fd8983b4410d7c10d6c900730c7d55b3f611c2b302e71dbb8a83
+DIST firefox-134.0-xh.xpi 421002 BLAKE2B d491bfa4f6be41b9403e13e0c1752878222a0d8f6eb3a7466e19efb217a2916143beedaab4512378811faf733d2ab39e9355e4bdd7c45333499be970333b98a8 SHA512 2c6005ba3716f6124a4baeb3210b2cf90ee9dbc51a1b3ace99dc1a3b72d3142c6b62d91363be17629cc0819aba23ebf38fbd53eb37b929e04231eac52436c4b2
+DIST firefox-134.0-zh-CN.xpi 684492 BLAKE2B e0d23ae8493c56b890e1390e6f472cc6d8921f296f0b792fe7c4dc82c3af465597152ec41adbf819a5a775af8f2eb486f3a62c01de246dbadf106926dfe855b4 SHA512 71486999caa8e8a3f8b6420ebe97111855b132fe1f1837ae85af112cb5a30a6b264bc659060f9da48aa7c7745515dc30eb05e44b2ffeada09b5885e53231e443
+DIST firefox-134.0-zh-TW.xpi 686751 BLAKE2B cca65375ac4d4569873a79d331604c88022b9ec8a19967d5faeba855aa89092830cd1cebb16d45aa8135bf38fbdfec53c69a307e79965a8ffc4c308ac617aa56 SHA512 18d9b8025eb99302644b7a2c535e750414e0f419886c4fefb517403881798bc66aa5084e3878b9e37aface79a624c725a62f3b00a89825ac061ff2469a704485
+DIST firefox-134.0.1-ach.xpi 468175 BLAKE2B 788b4c43d946082fedebb17be89e3cf434015c882655a5372dcd409d63eb7792ec5e10b1482ce5fd0b925d77441fa12804e4ebfc71a7d82f61d4b0805e7ec0e7 SHA512 e13f7cc1d3f7d27ec7e11a980cf89a767dccc7c4f35b464d27dea4ebce5ef781fa2556dd57b9c8335177165cdef11bc777ba21e361fe38cb771a31a99a1762f4
+DIST firefox-134.0.1-af.xpi 421160 BLAKE2B 2d7a974dd2862c6e69412045908847ef9725398d099169320da54b03249f9f2e56caef908a416f4e2ac4595bd1ffcb7636f156f8d06de7f4cc198c5de41e6e46 SHA512 99e97009f5a63210a1582712801a997d8dbba70b21853df6e9eaceaa52351df447936d5656b03c6b7072d824d0b5ae00b898b52e2475802eeb095386dbbc4c18
+DIST firefox-134.0.1-an.xpi 510941 BLAKE2B 8c161c455a5156992c5927bf7ad72742986a6018c514e71e2b8ff3a9207d86bcd80424c11e18692af8283da8ad8580337984f61cfdc8abeb190b3b2a3ad34270 SHA512 19b722c6fb8114e73bccf239dd08c8e184ba66fa615c5dcc8aae577f469248b85cc25b26050d0ca675c0ae3793b14d0f2d10b02c24d1d89959d0a03978fc155c
+DIST firefox-134.0.1-ar.xpi 633882 BLAKE2B a19e83d00690f621e2bcc1729a981135e1a888935187057d6263b3d29b5959c4a7f842d0b566a733be15bbbb810bdc857fd7d589e56892bfd50f015a0cbc9855 SHA512 28114c4f7971dabd3e74bc22f052faa0ff151fd87a693a681217e4e4e15a912c1f6ebc54d4564f96456f666509127a0abfd7bb761a092487b62f1e8ecde3f235
+DIST firefox-134.0.1-ast.xpi 500078 BLAKE2B 1bfd6aaa0b1959c1039c1e3b9aa1212ee2bf94d07dee1d0b0e9a77d33ac4c83a58f46bcaac9039a2af6e2fe4a258c54d5478fb0e3211bb146764195eae8516cf SHA512 f39812dcdbe5641ce2e1b347bea72060e5d337d39d3133f2b272d3f743daf825aec187015fb086cdd57ead5e0b357ccc77cb9183d706f29ef1c37884a0549960
+DIST firefox-134.0.1-az.xpi 494905 BLAKE2B f417e13bc2d2152542becb6143eb7f4af0352d0a82171b729a5d5118ab934af46153bae95f1bad56665567e12dc01bebcd7bd6d5c727183e41993029572c99a9 SHA512 54ebc1385587a4ec21332e102aaa6f20ca4a4be4945540f2f3dcc2e2ab4fb12df7d6b5d8c5d3d5743131eaf0d30086bfab91735f211adb9a85ad872753c4187f
+DIST firefox-134.0.1-be.xpi 744277 BLAKE2B 5fff8ea83331f397a4ab1828cf2fee3645abf897a6fbd2340e43e11e0ad8c42211e5c418e1dfde2e1e9452837954f04bac9bbb76424bfaa4a8f072bcfc5e229d SHA512 c1af86b6fd488da66c1d7bf11cbb63c45383b0e9aedc1c3bbd2092fab159248047b8e9e16be7d156b498652c52e745eb86866d9f0fabc8df72e0e72012b06618
+DIST firefox-134.0.1-bg.xpi 670911 BLAKE2B 01b8dc1038b7b6e9128958b5e739c5a4b3639807cff8df1b050359f2c3fe9811888c5c9370f647e7b3bbad154758a0e1f6b882b8afa51474ef157930e7cf04ba SHA512 8f9d8be21c16001c74fa19d627f2c2957d131dfbefdca91b27f002cf565038501bb0411828fe78bed2345868fb6afe6d674b2dc06c51dab8519081e8613e326e
+DIST firefox-134.0.1-bn.xpi 615533 BLAKE2B 53b652f52a148c45ce7d329944eed7e84f00c93c26070e312d52312c0a1f0681ed547b8ade89271d851ff10fe2299d78272df512da0d4667c42fabef1e12ced1 SHA512 c676dd896b38358f798d721ace3dec428ef6be5d23284ec0dc808eed6e99cc740f602413d61a38033de9438986eb9e8ddbbf87c9ce06af3d4ae4273073e3bb99
+DIST firefox-134.0.1-br.xpi 598067 BLAKE2B 1261ec2774e698f450dc310eb567ef553a61c74a952a294561063e07488fad48df6f13a53ddfec5a167583d0d09f2a8b4bbd94cddf9fec59530fc2834797abdb SHA512 1c33a1bde8b0a8eb217314803b09b36d876d90cd5b539edce79b89e7751e3b50d6c21e8645cff75ed955d9fd2bab4df6df4e65582ba4b7975e2023d726440e81
+DIST firefox-134.0.1-bs.xpi 557253 BLAKE2B c28892d717b30aae7aaf7aea077197a307678d6fc53a0aad48f639357d61a3b93de2b370263dbe793f372fda644d7d539435bd9a232b990ee954d80578b04d39 SHA512 a7220eba676b0346ec1f2ca59dd84590182c4b908a2c8b886578a035f92b6c1d921f31f7083dd0f172756e6a182b4bf3e90c86ffb520a6b08a9cbf19378e1206
+DIST firefox-134.0.1-ca-valencia.xpi 550233 BLAKE2B 57d2fda6869373e843cb307884d3f4d63f3b7e9d7502effd2dacd3e7ce87d08611f8c4ca8882f2a2bcf0a0dfb6db66b8af8ce90fc5a58f5aed0b7def6bd7a422 SHA512 90f360c20371763990a90a958f4be72c34897e372ca2133312f5b3325e33a9163c30a76b1b3cd667497e3dfb680d2aecf276616ffe9842834957062895bbb894
+DIST firefox-134.0.1-ca.xpi 607763 BLAKE2B 471abe72ded5f9810f7b1d91b1f897772cbefa09c4ecb14d8cad38dcc1add0b97f229cca207eabf66989f06ebeaa9404185b46888828b45f6e7e295a194c265d SHA512 4f422d4d2c7800d194cf03741b7b9a51b53c14842e96a6358e6967040d3866f451ef977b1a099b32469b362b2704eb3349c39a5c0e981dc5c016c8eceeec3af9
+DIST firefox-134.0.1-cak.xpi 597763 BLAKE2B 551137974d12f5e85bd92e6e98b9ccb0ab021034c05ddd48885405610d78283fc923bc3bb9a93006cf2cd421e6d2b0049028671af8b5fd21fee85f6f3eeeec8b SHA512 e20e9320d6acb09aa99750c8124ecc657456bbaa8f55bf106a7105f7e6fc57b43a91edd5da4aeb9a7bcf7f4019c0e6e1f4c5d532f14efff7f517b7459f920f15
+DIST firefox-134.0.1-cs.xpi 688666 BLAKE2B 2cbebbe2d3232d528d53cabdda6302980d06c668519d749e901a121f5cf770b4b138f3e360f84bf7a36216cc254270368aa5226dfd249a62d11be141369550f3 SHA512 de5838393bbc6de2e38b142fa4a87d19b72e4233342436b7cc7bd9c7d9a4ce472eaa26b5a7bd4db4107f6e1d48536b29dc1ccd8fa69a7514cbb792fb2b2de4c6
+DIST firefox-134.0.1-cy.xpi 649379 BLAKE2B cdd5ba1d5aedd5851d255dfff6b921fb410d100b562640ff5b4933296e307dd3663f6d4b5b850517034d33f5818dc34856655a0379e7160342d7060818d59a13 SHA512 f7f630e45abbacab40e647bc88ba3d1aeeaf3c9c59f029c86264812713df0f221d33179f7d0f88a32e741d55d31cdb7c1f7826c2399a0c5b7f3b0a5955d7c9ef
+DIST firefox-134.0.1-da.xpi 637282 BLAKE2B 8e164298378decb7ee8619099fb6f6dbce3ac154943fbd3d4ce8a626127dc2cb7ceaace59866b2fa923f48ce3c58fb9e055e27518ddc9b949b40753e99ad0ad7 SHA512 565f69bd98a0d5b921deae553436a2ac2e0ed72e04029bf1488d81a05d202729642e0e1bf93d6d9e51f718a9b05fd4f10da4aeae3620743fc5745d613b5dd49e
+DIST firefox-134.0.1-de.xpi 661272 BLAKE2B 1151184923790742a50fbdb05b2477fca7404c2ad245d65c0ab8fe0ffa599cc3676cd1795da779bb60a16f6f76c0f520ef890d7eb776fa91e164da6803fbb7e0 SHA512 fd1dd3da2d952cb1eaf9f21f38a3f158a057249c4a2f7d761bd1d8e9a6453d4c50d494dbd3c81876693655c866cedac4204ab72b58174f07319a68de9714e197
+DIST firefox-134.0.1-dsb.xpi 678091 BLAKE2B 72bc98f77b5c4675f6c1631af4df7ab82a3d7d2807c6dda96f72b1c6be03b40e87fe093ba8d6486d04af78f67b2c4824555f8bab4c7598850201f8ec4975c862 SHA512 46780423beadeeeb8cd590886c29364be69e9a6886fd0e9238c346cb036f7b069c7d7c947f2e9c6fb9ea6f89566211057882093adbb9da252c364fb7797c46f2
+DIST firefox-134.0.1-el.xpi 760434 BLAKE2B 9fd7aca441b63d304e2c5d6ced84d7ce6dcd76000475171fb9c77be6cb9b8807dd4be9bb22efc74fc3744e49f38be02fcbdbacf4d92a3d5253cd8875dafd956e SHA512 a52d07337891d3fbe583651e24c91c378bfd1bb5fe1d6041c27b2cf441ae168a9ae3f5eb5d1d74fae25b719e908091aece73c415188ca70bb01c21b23815727b
+DIST firefox-134.0.1-en-CA.xpi 607984 BLAKE2B d1a0d2e889d59ee0d7c006b12ca97f0c284f53563dabb963294981cc9c4462cf7d28d3d5bed1aa9b9ac999cec154e88967a59c1c596cdbb68358c89ba002abbd SHA512 bb0774b4d6fb47ff411b90ca0ab9d98ad58eadfab9123185b7f46bd7ac610cc5e2b0f4a2ea643b4bca10c2d7ce34ce2de5a0fa9548667a322c82eb4235a25ae9
+DIST firefox-134.0.1-en-GB.xpi 609115 BLAKE2B 362948f71c974bcdab609bf9516f2f98b52540fd0a790dc8109897c78360ddf3dcccf661167f986974d0d9f0111a023fc5b86f2e784bc1787621022efc6268ff SHA512 a93dac733809e4842d0828388e613cd093526b762507676ed147c08d20aab711f36431c8517c592f590761781e48bf543ff8c4a7af0c3792345bec1714acd720
+DIST firefox-134.0.1-eo.xpi 640105 BLAKE2B 09ab880f6a2d34f2857205d409839078f4a2c7126f45dabc94f1c06b657bbb9f94514260007b1c6882433621281ca229a7115fa8dabd04038b091a99ec25bf18 SHA512 c1b8d251f86174ca7807de476d0465e0ef92f76a3bc4b1f0baf4e5dc85727d0f75c5e534ed9851c7d2b8b670a0a981e825f6dcbdbae38072ffb1df2111d6ee1d
+DIST firefox-134.0.1-es-AR.xpi 654023 BLAKE2B 4c1016c614999770a7fbd396bf17ebb8a0b87140cfdff8ae00108f8b5597828ff517692fb3521f69dfc698e4dc50ce7b80df9e3133f791c88ad7069e1a97c671 SHA512 5fa435a477224b2cd15a0f94648b9240d5e29da3102169cb3bd8098f7269c92566debab34c462d38ed3da7b1f77c942f29f1541e9539cf0a9bb8bc6e829240aa
+DIST firefox-134.0.1-es-CL.xpi 653723 BLAKE2B 55a8eda049f5eb410a12cfe4ea09f486e9a0626b9a3a0e3f4ba3a95f930243572f595edff3b416c265c086d847e8b7e50212f506e934dd2faaea18b73ec5826e SHA512 251911b2690b22c57234bec301efbb7e5a85a894827279dd19c28317b1883e1e586c0074aae0aab0b726b06f143d19d8626d424f378d51e22e703a7c2272456a
+DIST firefox-134.0.1-es-ES.xpi 648563 BLAKE2B 620d4736cd3e41c8210cb4319e5ce9c9fc8262bd599eb7c8585740a7f118a74c599a5f4a2592b4aa0dee2bc33a3a39ae0b48779d8d156e9d185b7914c4646caa SHA512 c65720d87b60f9f9d68078bfc5f1d0b9420940527ae42d43bcad9d74464b6eb35aa2cbf2cd1583e09cd7edeb930dbce5270b4b17ff2041bd4fbd58534a21ae7f
+DIST firefox-134.0.1-es-MX.xpi 657160 BLAKE2B 4e8ee9b9b1bfafa2ed83ae79581f349f46acf0baaf0481976168b7414547c6e9736ac513de6e414a7fa25279c90ab651131e789fb7e36dd2f4c35ac04645ac11 SHA512 1a5e312dab7ec5cbd6f1679dd8b53ac4fc0d856ad458b1f762c358c2d2a731e7b753e9b6354a0ef369bac5d87dab661abfe603fbeb6da287e57affb3c634af4a
+DIST firefox-134.0.1-et.xpi 546711 BLAKE2B b673824bf57de531f23c34ef8917132adc739f4da1668c34e8d075b231c42e90a0c2d6ff1848b63ed1b7a6bcec142af682186ee66aca601a42ce5ffb0cd58466 SHA512 0d2f9b5af88b640d25428cf6f189be31d98e17a04d57061a6321eef82fd47c3a566326f4e7098cc066e239c4f900016518dfb1e7cce258cd31eaf14672ffd78b
+DIST firefox-134.0.1-eu.xpi 622843 BLAKE2B 1834e4d050bc6b400a0474e8064593254a9ff6f43eeec7aad06be98efd5a082ced7dd8eaf62575bf11d3dbe5aa620466d8ba35f89583c1fc2be919a4674b5c9b SHA512 110b7f787d8374e7e586ff6ccbeb9ec7d87cd5886e388a586e8d5fbf0617931f98705880ce4b916eeea6740c8f92fdc30d27a448b0a94b67c37052b7ff2be3cf
+DIST firefox-134.0.1-fa.xpi 625170 BLAKE2B 34943c9a14758165c3685684e74dc19d381a5192375bb2ebf500d3bed5f62d8dd771bce500ab5d9d71a4c63765bf3aa30afdef496bd9708974dc31324c76b85a SHA512 55dbb1949d62e042e3ad17b77044660292889488a357a0f880c5b901982298a41899e3d5ce782506045ec5be4d53b0a99dd9d8c002d754c523c23a284e5a3e3a
+DIST firefox-134.0.1-ff.xpi 479988 BLAKE2B 72bdf2767f69b94ea78e24e9991aa0a71d73c9f9ab1fce94af26e5292959109b8c0a8ff91b22642eb65c6d244d6aa85edc110f48e08752abea379a3efe4bffa7 SHA512 4eb31ded1971a531f19f6f3852bff48a67f855204956ae41eba137dcf43d5e84cc4de4282c3b7efe971e1013c4dc87d8928ea78148c5457b56417b1328a9499d
+DIST firefox-134.0.1-fi.xpi 634175 BLAKE2B c28718ede4a3628809d7f9d77809540775a454e16f23a436ca22ada68d8fb75c28e0a39013ab9f8fb591c579c5582766845fc51f88a8c9cb65b15bb648c26178 SHA512 76d16c818beb8286fe4e633d20f5c0def02184f06773fa3bfa554fdddfa6855e4137d5691dea56d0df6c7887706fa4b59464f0dc8ec42d357f53ea310006a5a0
+DIST firefox-134.0.1-fr.xpi 667539 BLAKE2B c5edf355d8301bf0a4a245eb8ad2a543af2c12a2f4549e6cf6611514387c4f3b1dc8603a9c2d41cbcd690db46df707a9a584077b59285f4c5c118689ad6d1820 SHA512 82b4756b45effab7cd322869d3c0f82707b7fba8d79c154df3e748df1e04b57264a1b9ee6bc8e8bbe597c91d011e0b4ebb62877dc847867444798af0cfbd05a9
+DIST firefox-134.0.1-fur.xpi 652555 BLAKE2B 66b9f111b853085b5277f31bce69b808ae9ad4a4bbe91d4355433606ff5bbad0a22f6ca371dadece69ceb125d9773ad101302d0cd11fe537bc5c741438152faf SHA512 163c6339a3e573bee6beb15c12dd0292da765156cb98422550de97d4e24c0c2d8c0f0021564c7f23699c0d64cb139544ef484287cb462b33704449a55ab85a2b
+DIST firefox-134.0.1-fy-NL.xpi 649682 BLAKE2B 00c39830cc589349b2e4aa92f24552d10a1df719d6273d86b2e02ba2c661d548914ece5371441c68ec6412086adf886f894e7797025affca93cec26ce62247d2 SHA512 b5fb3a7444ad8cf21ce6302642e23a6dea4025289a2d381b8fddb6605acfe3e69008c124f6995f634a1063dd5339b7edd6463cba3b4e6bbdfc447f3fd55f1eb7
+DIST firefox-134.0.1-ga-IE.xpi 474979 BLAKE2B 9fe63cd9e01f371803d0ce5afd0797016c24d17c742e47ba60c1a9020465103825d9218bbcc29053aee8a41dcc80b9f018c66d5b0a9f6d9016088d29114724c8 SHA512 0c5a1e62956e91d468dcddfe7f055ac9177cc1129f3158a99e186400ae62cca687b0a305833fb4bed240d42da3736bcd4727816b236920af6df7990e57797729
+DIST firefox-134.0.1-gd.xpi 603290 BLAKE2B 7d111ad363dc155d48761105bb846f3a0d815cad1dbac38dc398b2145a13af4c20a86f82b0ed160662f7157cbf1ed4c1307503884ffe9ca3265501a09584f8cc SHA512 bbc0757de6f144efda90c58b3a61281971fb854310f73e64b6eebcece81162cee81734830de4d4000b763fa30032ec7cc1107fbfa4204a5a2df5dcf40641447e
+DIST firefox-134.0.1-gl.xpi 614904 BLAKE2B 5faa407f5698eceda380505156b7e7ecda69e2871ae3cf1ba46a1198d3ed9636c762178209cef8b1cc285bbd58f1fdd106e724fc91cf738a7cce073ae2ac542b SHA512 8a30c2ea9ed3e6b6f335f2d7d0e1f58ba8cbd6b58859ffbde90ddf935c9cb17f56cd17439169be10a226b2a69268ec96f934211b3941ee8cd2da9cd1335aa74d
+DIST firefox-134.0.1-gn.xpi 661075 BLAKE2B d651686fff74773c3cdfd5d510d2dde2f666642c860b34610780c10cf66acbb938557700bbb1e565409fc26e00e2663b5c83edd2f308f9e2629fb5efb28ffc15 SHA512 a1c192261a0e5e325227dcfce712fc38d09e6f7546f74f82c229c3a16964ef5c0e8aa702303420394821eeb10ced49bf4c4fcf1d0e3494c64f91b13052b85904
+DIST firefox-134.0.1-gu-IN.xpi 531505 BLAKE2B 40d949467fd2fe93e99c7f496927b436b74cd0233af2d2c83efb06079aa2152b8006f953965199221666676c420b705057a30f827921b348d8e24e6568b36621 SHA512 f62798ba22e9163adae024de3349457ab4016edc1601c0fd1ff724b7c82c02dee8ef87fedd2265a1ea1e071ab7d0d72937523efae3d1d49bf15a7055b5a4da98
+DIST firefox-134.0.1-he.xpi 656240 BLAKE2B 39590855f02159d23f5cd8e60c940a4052a6f75be8045a37f678c99d877bbae9cb9efb1f5b05795b15ad3c2d0b3fc3d42fe913caf29af5dea703930a14f2dcff SHA512 8e8aa41eda57bdd2db844142fa49579edb43dde0d954fc78837dc9d4ebe3e3ad56142b6363c831409f2f0ba552c1d78014d06aa85c01bd4287b23a8685604696
+DIST firefox-134.0.1-hi-IN.xpi 570947 BLAKE2B 967cf67999796bd0be99befcc0afb425ddf13fa2deef026fad18951d402b3c321b1c4172b6cf5b108dee6813ddbbbc999be95ad11d375a5391576a5d0d6ce701 SHA512 c16dfdc8a9f178b39df53262936e39a2dfc3e1f53e208e2e589b7dbf9ba888c28b86814404ad798bc70f9ce814c2023d6ed0f238da263b173de987ce5660dba1
+DIST firefox-134.0.1-hr.xpi 633368 BLAKE2B 798befba32b265836933f7d19bcaeaa24cba8edd322b7ac996880f8dc4ab549bd9c53e002e68cb18f3ffc40953c4c4369944cabe00d06ddc0e07a35c8872808f SHA512 f2d230be6cb825458cb4e636095e74d737bf14997ee24f39a80c0882534df5af9a4c9702cbf45d86b7fb37b23c4627c7955fa56377c1d8a2478d73cb4e1fc825
+DIST firefox-134.0.1-hsb.xpi 674093 BLAKE2B 8c4cff5e920c63a394e0c393e5ffcdf2da24802a154fb9adda381ce15e802842d09fe6e83693b5401b24c92dc6a37861175b59a1d0cbb61d98fdfd6eaa589f6d SHA512 c455f94453e1cd9b730299eff59650ac304514ad241757c6ca895ac49db50018831fd901e0e508921677775e3777151310f24e667db4cc75a2924b3f1a9ec412
+DIST firefox-134.0.1-hu.xpi 678160 BLAKE2B 45810ebc540dd5796ca79eb4506df9b059f8abb9d832e0838a897d0ebd9fa32a17ab9e712fbaa7708a6d2a3b7e43aba140e54ff6632568242042e16199cd86be SHA512 120f50eee0b1e1219fd02d5d7d8057d0cdc519727aa319442154890b99b3ce3fe544283c77b8af946bd236edbd4bfc97273ec17aa4b6f02765083b501813c523
+DIST firefox-134.0.1-hy-AM.xpi 661668 BLAKE2B 1bf61ae9d99823097e1eeb4de17a521735c4dcb3b05c566c2bcb1cf755e1618880413a7030988b2b2420aba0ba212e36906e3e7097243189e64a5f4f484ff772 SHA512 dc8187317224ea007e39481a6c5872a15c15c0a21fed056d9f8ff5b3ee733a8f0619e6d988d0653edd6eac048305d88cc4bef8d3a45a54655ed454d756512c6a
+DIST firefox-134.0.1-ia.xpi 636637 BLAKE2B 75b0cc092f632bad4e8b05e8455aa403373a4d41ae7cfc11aedda32a4e932b297101459d53e8cf2a4f8b1583e86044456d285be1989bcef1e9dbce1de3a5e291 SHA512 dec17bd540588eab7ede462a897e6022dd7d6d0d48c04101ad566f09ac77c0cfe004e209ce6518961b540ef56856251eb2390d73d91bfe3f781790801e3c9c24
+DIST firefox-134.0.1-id.xpi 620031 BLAKE2B 3d9594e939287dfda94a271b07e9d05fcabd26021b5e75d7b23d72c905e6488188afad09654865addead69f70e158156761732c6380ebfc4450067e0eb121a97 SHA512 dd7d8b978eb809d99be1ea930496270b5b0a728eecb0893a15c600bb14063e898fbce3424e261048fec6e193c6838d990630f7aa8029333dfe149484cc571e58
+DIST firefox-134.0.1-is.xpi 642121 BLAKE2B 4da6a20307cde66f5a39246d966fff223c9f112340c23bfca79747caace201753cb51e8484a770f2f78229e936768b7722ebfd24e0b00ec52a704fc8bce2781f SHA512 a5816e6169cfd2031429454f4f4ec1943a2e79dbcb7531dc3c131cd035c4901390dcb122064d6e7687d9a727d1059dfcc9173a48c0974051c1fce6e7705b767a
+DIST firefox-134.0.1-it.xpi 646156 BLAKE2B ef69e5d790b476ae98bf2f9d3cb0fa27e2b8b9f54754f6f206b68922163465a707170ccbe673e91dd26fe9711d46b5b4bde8d99fe2b2ac0abff51f781d5a0ef6 SHA512 b45be9b36a93f21bf885d3c70fdcda2252509ee9b8e5c4e22e9278d168b5573741caa73226a57806f2455263b52a6e3bfa7db204e0ea461d5a47f533a7c5f73a
+DIST firefox-134.0.1-ja.xpi 704020 BLAKE2B caa33493e15fc4a0faa044d7b10dea04bdcc722e95c7bfc72a0eb78f97a4551c9d397ea4afba086364c1052d98c5904024084cfe06e23236fe1d00d45ae0e3fb SHA512 454b05d7a9238bbd3c8395e1175db275729950553e31dcdfb9d728964d3053b2cabcd019f76d738454c06554c1aaa41ef0e8f9dd2db44b62c0ea191c31da46a8
+DIST firefox-134.0.1-ka.xpi 711239 BLAKE2B c4571dbf8ab7ae8a9c5917eeb5614641221acdecd0e23cb1567bcbe7927e4457248353c72db1a8abb2ab14e1e8cc9411c6c4dfe17fe86c98845872b2a3db6593 SHA512 2dea45cce48b936cac676883d27efc7378adb4729dc639036c12902956c8e6eaaaf2a91274216c3a6c7b826a00aad81fa82d00cfc596cb44b683525afcfb2e88
+DIST firefox-134.0.1-kab.xpi 626324 BLAKE2B ef543360e97676a3a6cabdb3136f160aee3d1c2000f4828ef447f87c9aaef349df4e68df12f9dcd7ea10ee05f5b0e6b1543200f55cded988af3546913cd1e7d4 SHA512 1460708b8772a3feb4dcdae5cb93e0ad5b5ec31b8b002312493079d294af729e643f5ebd98b868c1d8b0f00b84fb307c6c2c80d4ed0d4530b431164e878fe23e
+DIST firefox-134.0.1-kk.xpi 734779 BLAKE2B 997bbeb292ae336cf892137f6247d996e9275ad178d4bbfe3ec436400a0b70433bb9faf6ca1db2bf2333ec723eaf3b062e9b5b3757603474d88129772c800cea SHA512 810f48ec04699b0ededac2abe79e4bec78fabfdde207b4cc18a9a4f770f5ce79e24dd2b35283709835bf61094309c171184a62b826924021053ecd8195872fec
+DIST firefox-134.0.1-km.xpi 529766 BLAKE2B ffc3986397992b7ea52fcf734ac3fe750825be92a2ad316f60a63a0e2b8364279f01741f4a6de07d852a5e02710124814baa48040f14efa5d179a13193bb5884 SHA512 512552f3a0b8a8500350e48f8b95b08b6fbd13e197c2a1375494140c7108720f17673a055783bc0563d7f1f2db643ff74ccc8f3e5ce1e27e8558ba47fd56be03
+DIST firefox-134.0.1-kn.xpi 494780 BLAKE2B 9526039df0db78e3f3f91a286b0918c8bc64c01373ac59a6a3e9c0282b8455ea3329b23dc740d0f134e909c5ca3d7049526477c1490d0266a720fae7c84967d9 SHA512 20c0ea269b76a481df5c03ecc9c9db0354978b9d39bd9d43bd55bc5956298d8b56c1a1edde1ec3d6b04e9cd83da3eb9cc4ebfee856c207f959569c282611cda3
+DIST firefox-134.0.1-ko.xpi 688661 BLAKE2B 026baa4268d3752812e9174e828667586873da09d12ae5f83e4391ba6fbcfec184e36b2364b2a72674eb17ba7c3a4627b41270f9c69f8959cc2627be8f8d9b1b SHA512 ec01d896bd887aea151527d456c52819dd201eb98f8a5e5bfb189fe33163e5c6811382fdd380f4da0a78bae5bc20e07147fe285d971a449ea72906ce22591d4b
+DIST firefox-134.0.1-lij.xpi 488308 BLAKE2B 14da2a82cfc53a9f87a568f4cc5b60e0d8f16b009c77cea776e05cdc4ac93f29e21d0e75e4c1f66ffa445d7e4ba02a4c68e8d1986d1514d05555d1738dc6e0ba SHA512 9f7a2805943b6b47fab323a5b258bdd2c9420955d48b9ad5fb9ddde64481feb1a4d540c47c73ec83385faf30a013c07bfae49c4cf1f2d7dc151767e7022f3b6e
+DIST firefox-134.0.1-lt.xpi 577195 BLAKE2B 091011e0e17b9eed978c7ac7ce688521d2cc0ab232884d4912ff2e2464a0541b475ef94ef8cfa5ed80addfa85586d246b44031b5988d9f78a21f2beef2ff7c05 SHA512 374e5870a1f17c183faeb7e0a69fd8378b27334ba7e21ba421548fcf95eab71d6a1fe89f404a83ae5e8c6bb881db41d48aeb9c0aa043c8568616aeb22f894a91
+DIST firefox-134.0.1-lv.xpi 590047 BLAKE2B 58ea9e0aa3202ccc3c31c83be173d94f528a6312ce4e7213edb2ccabf1921de88baf35f4114f8fe6f2d1cb94e863b9ffaab7f3dd1dfb1e57bd6511c7ec7c5b93 SHA512 8537d86331d77221903f3a5445db1cc37546f7ddb5586421449adc15a396c5308548e908e8a7a4188b0f2f4581aa007282461331192d3a8365b76bce0b234fff
+DIST firefox-134.0.1-mk.xpi 497207 BLAKE2B 509213b1283627c6ed7b1391d38f27e7f1a7a72f6221e8fc411e2e95175ca5747b4a4b88a0bedeef9d5a33a230a2c78879a841dce931f5c11bd672d8d1006293 SHA512 cdfae1bc8020fe9d561cdd1f7e0277b9f0a772d12514a8678f5f8ea96e20b649f8448b2d9e67ee2366c263bc5c72e83bd98d5bb20e32e559f0970fd26879629c
+DIST firefox-134.0.1-mr.xpi 536146 BLAKE2B d50880231e938be54d44fed045801f7eed192c0f710d36c6f2fcb9119074045611140c8c24d8b17f118f609f976d62df839965ffa25adb63a93aeabea432d739 SHA512 2cdd92c32658545fdf41f8b0ae50658be644c4c71dbdbfaefc7adabcdb5e6bf4fa5a32ea2fa16c8af5af232c12bfcd7c68551c9f3093863d433e2e6ae58f1733
+DIST firefox-134.0.1-ms.xpi 453846 BLAKE2B d9e1443563eff6d1bb2f09864e42632e4eb5e2f794f462654f25d062d6ceb989480b520b2a8afd067f4757f1d35154349f4e82433ec8931b7dd37b8c063e05d0 SHA512 40f99116731ac80fd4fd49fbc5d5fbbfaa7860e9806aba308a01960e2cf098f3c50d301e1a8ed9162e88f6bb56d9ff01566c0d3f835adca7ca66f11a08d144a2
+DIST firefox-134.0.1-my.xpi 522476 BLAKE2B 65d6149824f5fdc87552904f4fc5f569f9bfd70249e38e8ef8a7c723988f0ab18b08db085fe8c1ea1baab3b92e2a6749ca7e7bc434d73dbb771568014eae3122 SHA512 6dba49140c2a9c6a5348f18378da6730ea354bbc3366e289a1af2a5d5a7275bb56a4775ab958d42124690f1f51ba547d41abc2e1172eb5370433018016f989c5
+DIST firefox-134.0.1-nb-NO.xpi 625552 BLAKE2B c3c85efe7902e9d3e49cb6a72da6860eee84c4d79351a999484c3bad407bca372aea475825f6f3360156efb8b0ccf82945dc1ccb61a2914612ba7f89a6df7222 SHA512 7e06651cf7facc1ab104dc4a75fc3e232601afe9827556481e0bc28865f8b47abb8b7328ba90a730b5e811afead62152e028db8fdd94a835b9a70792d3fbb2fd
+DIST firefox-134.0.1-ne-NP.xpi 524800 BLAKE2B 0714bd61a28deada6e1d4097552cd5b67b6f8d0c8e8be973086eda3858f423665e2a0cf03ab23de00b77bd9bcacc780d93a4b15e457eeeb01447d2c40ee95769 SHA512 bac85169e2f70e7d5c358bdb78204d7d8b8b5e10003f9e6e67962cc38066f79366f00127187de2a131abe331cd998559b82a06073c24d6f13f570ec3a9a0267a
+DIST firefox-134.0.1-nl.xpi 642843 BLAKE2B 4d692e5d0beac05dca50dd178c1217a2076281a8eb55802e6e95ce56f8a6536fee16fdd2cba8451665a56c808ac484c7472e906db5c264170062b6a295d3285e SHA512 fa01408d61a098e26177f5a6b15f70e8812d4aa69cb7cc1fbb40cb414365fb7feda05f9880d5dbf4e552a62b527f5ea089b1fe2c26e6504528fee835b431ca5d
+DIST firefox-134.0.1-nn-NO.xpi 629834 BLAKE2B 4d7141b7774bf89fe9d6b46bd49fe1786921ae80604ca9c98fe872e18a0d118c43ce4c2ff7542e5892b90408b398ae3989528598455abfe41f936ea6064ca34c SHA512 31f5487c3de90a49464f45e0479f91442fc96d543a780d0381c3f88a33e13a0cbe39359fa2ef0162edc1e46c571749c8c09a212a96c3a0385ebdcad03e138cf9
+DIST firefox-134.0.1-oc.xpi 626180 BLAKE2B 968f2e94f341d0bf6fdb7d65f5ddd2393f0657e1dd1e24188a7642c7cd195c466910f5f937b8d8cbecfc8abc014b212e91be853559a4517b5ae144b0b3017b3c SHA512 00695e0dd5bea54332a288decfcdc45422bc20eb44b9e83b94e7c55de378dda22da2b23478d16b34744458d6db564ca022b63d90d724d000f8c7fae7f3359287
+DIST firefox-134.0.1-pa-IN.xpi 723077 BLAKE2B 053f71b2a2cd6ca574a30cfcf1af4e1ff7e08a8efb4d67908304230f88e477408c37576e9cb3aa1a22095aa3261d86e5bb4e597a74878fcd9f9562fda86a2ce9 SHA512 1c8ec921c5de189911c6f2c80d9ccac77b70c75752e43c4e8173682042cd104d9e416af065114cc8c32a7958cf3b470877fd8dbb7c59d2fe8ff7203d5731d03c
+DIST firefox-134.0.1-pl.xpi 661730 BLAKE2B 89079300e7317e686e68b61d9ae0ae1c0360882f7f01933f102634635c96ba8897bf00f9ae4288b7246071ccc0e83338267061b1df0da098abf11b10d552da79 SHA512 ec4fa15d1b3719c765277df503ee6ea42e1949d37ee2524b5d6ae30307db0ceee86837ce992a008938601966c925e439f42dbd96f421d781d2ec66a48bbae546
+DIST firefox-134.0.1-pt-BR.xpi 647946 BLAKE2B e14d24bc7d3bb37633a19f8f4f73fde518837819f91f0d551f370004a6061ede536939e51c3204a27b00cb2b93d2ee33d773e7d481777ff0af8c13c509e887f1 SHA512 8d0c6c5252064d7be5eee30384a3d39851319b206c158b78ee6cce146335c78bc847f37743fa76460f893578220e9c598103249c6b323ed816b1986b32001952
+DIST firefox-134.0.1-pt-PT.xpi 654958 BLAKE2B 438c9ad7cb9e2099d43f7989d09ca2ef8444e428e11ddd2e3c60878dd75b1370259b5302462d70dc3c5e5a6e97dfa6122eacd99abf363b78a2bae03f42295695 SHA512 04bd15d670f40827b25a47321d03fe20deeb511e82423e43336eb23b932de32cc606b87ce327e2d89860fc59c7c768a986dec0e880129804e5e63ed2165082f7
+DIST firefox-134.0.1-rm.xpi 644065 BLAKE2B 15f0becba9faa5ec3b83445103a6396c4f18b3dadda9491e9ecb9167fe042dbd2e06da47d03eac7d478973ad1a33f3c9aa6c3aa289d697ffb39a629c75ee884e SHA512 6e7a0aaa8a4e784997067284124e9441701e91cd52236e121651bf4eeb8f846bb04396f6eaa72010ac35ff8dba58e1da360b8b9f2e6213ea0de1d85888b35682
+DIST firefox-134.0.1-ro.xpi 554201 BLAKE2B 70e452ba9951671e6dd79265ec14c9cd5c1a1b96fb86586c916560674809b8ca1fe069ea1897b63533797c38fe568c68adfda7169c0107f57618d61f5790da1b SHA512 03e38daa7b9027458d0993624161bae6c2db824ff0421858ce11a90e4724e6fda754b1b71c4cd09b5b10b3bb59fbb6e419011c5d6e14ea3ece402bc7debd32aa
+DIST firefox-134.0.1-ru.xpi 750985 BLAKE2B b5e15f23836309493e20bfeebec3c5d364c3c33dda136407f006b65756b84aa4332a87b87c1fc6f3e2d073310fb2f595154121cee7a852dc73684aa63aa0456d SHA512 bdcc365a4659c3c7ccbd13632e93822572e4037d70f562aa944dad7b04811ac270554ee741bab77a16ee5bf9248b0423008f635c97eca2696ecdddace4f169e8
+DIST firefox-134.0.1-sc.xpi 602163 BLAKE2B 3cf87bb1f2e4d2435d1d01fd7208db1a7c780d4a7a43fb210826825be0adb49b19fa86673a9d069e05fb182816d54310c30899c822e911cdc7c0908d78b81097 SHA512 67170cac304862b610e4e5c08648b4db10284e215b05651353badcc293ff98e2570372481ac682c6bb8921307be46f718803ac8d0dadd070e2c093c7ce52c1de
+DIST firefox-134.0.1-sco.xpi 515424 BLAKE2B ed5cce9dea2fd6ef9f12604db52282dc22f35fbe6a190cf6141245712205c8b5961fe0f04c06b72de3b4f8c855d9e5c0bc4e52956b91540e6f270a2b0e5c09c5 SHA512 d7a7e95bcb0753cb7697628b7229ef8a729d9fe32e3160d776842e6fa2dce2a34e76e6a63d89ccd86164b5c61b997898e44f5d30196d305bd5feb4f1e93b3a89
+DIST firefox-134.0.1-si.xpi 626864 BLAKE2B b6b9163b7cf77aa53a38cdaa22f382b4e2c244574e899dc2486f65d29746088e81c045673e7c66a5f44d69727f2f7124480c6cc13c4233c1bc8da4936f7a5cf8 SHA512 fd4b0bff150e04d402d7dc7730a95d254505fd71e500396986b5732b5adf121c40b77d1b6ee6d5e0450e240f12d359b491c85eee9381881b60b294fdd367fcfd
+DIST firefox-134.0.1-sk.xpi 680478 BLAKE2B a4d4bea37c48c58d819539a698ddcb3ba78e05747dde612092ca3616d7c754ed96eb7830c592fe1dbad2e9a3c589f93a9e6c318c7142abe0a23d5e2e1793f434 SHA512 9e0b0a832691dfa04fb524343b156059df58bcf9f9bba424e4c8865dfbf5dcdd28bba82b2db5fa60db1488d41b0512969c154e5d66d666362e51379c6a344a84
+DIST firefox-134.0.1-skr.xpi 727787 BLAKE2B 361fcf3bc793ffbc035ee7e16855f94025aa380c2cf432783a584a783b53b00544ee0d3bdfd58646600f1a57c1605becbb7f61bef27acb60ff0db6feeb377bf5 SHA512 85c1d0aa771bc23355818ecae2249e7bdd9c48fe57856aaa356b9c0527be1bae8afde2a8c063776ef1fb56cd0c7bff9a88285339353c75fcb304b8f637189368
+DIST firefox-134.0.1-sl.xpi 647153 BLAKE2B 1cc065a6fc66c9d912096c0b7f795d562389885848f42aacb1dfbfb8c80b9049c0600ae126c2b9daab98726028895efeeac1c518607864bae7bee9f06dc51d12 SHA512 cacc3bc097e493850f966f2d651beef9f139ebce1161c247cab19fd8ba0b93643795235e7bce9240e912255ac0d42a344313600d8a6abf6d2b1722053f5ae642
+DIST firefox-134.0.1-son.xpi 420280 BLAKE2B 50c91dacd8ab84485133ca9aba6989ca105193809607dcba3b83722108c662a51bd580edbe90f2945231362427d3e5a0066aa2c2d12f02cea3c3c905134ac000 SHA512 5ac00b2d8968fbb9bb3c03ea0218a47c29accd3dfa6314b84babb6727d2e017d5e0d858af7f38c873c09be61c70fa97ca92cd8857e6225c3a84e4918a3fc1398
+DIST firefox-134.0.1-sq.xpi 665680 BLAKE2B 0cd71ccd45dd4817b3a39b20fda396dc7e0cdb05df30590227091c583e576c0473299a688bda58ae45eee8669628ae4c4aedcf88debef8d263a7392072c46f38 SHA512 d2486637ffeddfe57b27d6e5a696d1aedec6ab5824e2b401e3e9a57eae02ee34d18ed63e80997c951d8c511f56794dc0b9dfb5bb8cc5e0c2c9683d385bb0b166
+DIST firefox-134.0.1-sr.xpi 676500 BLAKE2B 4f335c0f542ca7d4f7e4e0218fc67cfaf30088a78b1681c517e15a55a279885f4e4813a720b1e87fbaf39c4715ecee3eb4e79127fbdf23d090b72c4c126ec0dd SHA512 7c761fa604deb8c72898cbde1f2593f09b543d23919ab1b4b006ec80f8eb23acdda521b18328dda6449ab40da00e13d230d6f530b193af8b4ddcf2df745a407b
+DIST firefox-134.0.1-sv-SE.xpi 644569 BLAKE2B 51d03f40f61fab659f622df7626044b416b0aae95b6f5e29b792d0593c681cc931f97395999a11e6c2f6ba0ce22aebcb27c41eaf33a9ef4843a0e000674e1d1d SHA512 cacc53adc221f3ca66b03e3acd91b4b486f1df816e163de7514c04aa2b822b709c2cc572753b11f84bec3f4ee44c9b3f856630450fa4aa964c08be446639e2dc
+DIST firefox-134.0.1-szl.xpi 530485 BLAKE2B 6d306e4796e095454e8b3ee6b4c69c6be2b2e14c6802aaa442229ea9092f4d44444fb1e244ccc40afa283b8829df91d6d31f39ec18f4f5aefaa25b043ccb9dad SHA512 b0d861e1cca91ca02426bd07123c60b96849b3862cc0c5e2af680b56ff03267ac40de138f3ebedfd87458d7cf0f994240902161145a43ea67e803737a2eee6b9
+DIST firefox-134.0.1-ta.xpi 511214 BLAKE2B 1473f6543931c5b045a05a32232c18d0aa3cfcd9836459bf346c5c9828946358ad98a5905c22762fcd6f470f0dd6b385234730cfcf9c87105b8d0a3657215cc3 SHA512 abc7dcc57ee6ed1a1e4ef78183cf17a4801437d9993838adc30c07115c592743343706cfa1c3c03e5b102dbb3bada26f9af41e06efe622430c09511348938ee4
+DIST firefox-134.0.1-te.xpi 575369 BLAKE2B 1e941acb251bfbbd9c497dfad0aaf20727455a5ca1ca20e913f04a744c91349a6c221aed669abedc2cdc9c1eff255f9eabfce1c1f183a7a1d71f18a4f25bcca5 SHA512 c432f53a30adfd8e33188af5851674a75c80f612a784c031aed7b77e5f12b0aa311f157e3ea22d42742e6ab96b411db57624326c516378e2295bb194d5c5a78f
+DIST firefox-134.0.1-th.xpi 727726 BLAKE2B b58b778f7e8969ae9f7b624a814a1702283946239c85b67465fe3ea45d12d620fd3e41dba023e3837f41f3a95bedb68a4312adda2d1d599b4a3d0c24ae616251 SHA512 5f7085c7e6e1d3fd509d21539d1efe82e480bbb571d661748dedfc2550f25a21daeb1e5730b665f79759b6433a89274452dc38ac3d1784846a52f7d34b2e1489
+DIST firefox-134.0.1-tl.xpi 538547 BLAKE2B a411c7f6ef10343e11963a16e9303f16f239903b246f438c98be7e019fdaeb3dcaf1decb98fd4b4b2cb56921cc7fa87dd34bdc1f8d2d29a30ab43e0fd87cd84a SHA512 33755684f6c881fa4164bd710a988a9b9ae186ed2d987fcfab84351137c2f166b5732c32661cd9d9ca5c4c4ab180b8e6c6e93ae12e6e74aeb8be5abc325acb72
+DIST firefox-134.0.1-tr.xpi 656842 BLAKE2B 1667f7e399f9407130cc6b6c003ee86502aa5d7e54350201ab457b7e354855d41e01058beaf4ac0a8b500c6ace40408753418209f7bf653d76888d8a52efca5c SHA512 02f105c1ce0142c063c41abb41a3e89933cf86b53a9106fd6c48950580b318a3928bc746ede5b1efd6f09f690abbcad2fd47d4e5a4398475dd130f18a7e4c375
+DIST firefox-134.0.1-trs.xpi 507815 BLAKE2B 7695fb9055440fb411d3a14fefb9c0468ea6021fb726a910a79e0dc5fb6ccb1254492a091d11a67488cda194d3a176a426f42b5c3b5daf92ab294621069866ec SHA512 04f7913b61bfbfd8eca29907a56f2ea7afded4a7df892510b70717895095978444f8d3ee6259adb451aa1c57f9b2606b5d8d471e1295ec2219ae1c914a0a8816
+DIST firefox-134.0.1-uk.xpi 742087 BLAKE2B 16c52791649d5c23764694b852f7530bb02e8a959143c2891dd4ed90f6e95484930ffa7c24238065e0b33105b6ac9fa675cc4ec7532a34228d1ea0e890e2c0ac SHA512 5b2d0d98c5ab94304b6998f6d0a99a341db2d63df775c21bcdb181ddbba385b1c552a850690b7f8518f0a7301ea71ae5e394fc907b3632dee7446c7085a44797
+DIST firefox-134.0.1-ur.xpi 564371 BLAKE2B 680680c8b3ff393734f6cbd69a4474dc34748fa80124a9e28114b98f7e864eaa0356d1480d6f4b071c871704ac8472930142199ccad6a9086435fbb6d5608998 SHA512 e8660617e96cb4fb44d828f19a3350c78eec71595e57f5ebd6d8f16a2d132523debb6fdfa902d0a5231f7efad1c1fb2dd7e7b231fdb36b041f85983c10006750
+DIST firefox-134.0.1-uz.xpi 482821 BLAKE2B 929e808752c36b2970cf5e20de52818ab0d284d1047591645a1813edfd97cca455cc03da9bf1e95edadf5960809a73899279506369f3697048d2251efde2a8bd SHA512 8ec21ac0a20c3200c77acd371f0cdef717b919eefb9f3597c80f4eb67466ce09ad863c734c1c82c56d97f1fc360d579d59dbe1349d991df7ced56de025918934
+DIST firefox-134.0.1-vi.xpi 683427 BLAKE2B 0b9926c6ea07a0f43ead4201d4d639358f37c7ea5ce0950cb81320bd52050702bf28038b85604185f655779c8456d88960410b1541cac48d9b8f2d758031e017 SHA512 bbfe3a33e5784ab5bad0dad1e2ae9cf183cdc7e325613d42f28765a7b93631db147b4e4a0430a047248329ba025f04e388ffb636d960427e6d538facdf157177
+DIST firefox-134.0.1-xh.xpi 421000 BLAKE2B e294f811b4631e5f82a4cb5bd78b6975a57aca1e4d81ceab9847579823f6f38652551bd8df931f9798a5afc23ea6e70cd9a5e6b64f18deb797b1eb4b4012d15e SHA512 cd46448d84f973d38887d19d57a34e9bb049ba4f550d8acc901c67a0825460fd8970df1e2a88560f633234919840e77aeb29d39561a51da026484b783d2543a1
+DIST firefox-134.0.1-zh-CN.xpi 684489 BLAKE2B 2113c7de306fce3c07f98a2301bb9a86e4a9ff0b5dc4af4f1a99b08b787f71a99aca078fc0d7eb1cd86cdf04d46ae5b42f7fb0018bbada84e6e6ad9115de9e0f SHA512 beeea5e91bb502bd560b8100033dc922b51f2e06da01754845ffdc58c08b62154f3ccbaf6b71a4b12da8bb30da5ec2a63b7019c1665a881757fca7f6f8a8f2cc
+DIST firefox-134.0.1-zh-TW.xpi 686744 BLAKE2B 77b3cc5fa4e33e2ff940599082bb741bbd0dd3d5f75ce1f9c3f77c8440ee6b7eaca575883215756a5c40290bf706b4580f9a7b4a9d03277098e86105424d3020 SHA512 fe9393f2b5ed97c24efb82181df81d971238440bc41f6f716f66a3359dc9d8b583a81af8c69b504cdf2ae99fa69bff53f8240293c126eb2b06130e3ce031dc76
+DIST firefox-134.0.1.source.tar.xz 602467028 BLAKE2B 8ca00a9701eedf9b29aaf33ff1fbb57f515a006dc747ebac358383a49ab8492315ca321bd5b8e1c6d9966d5fefd83c0493c6df6419abddd3f07396ec7495e2fa SHA512 3f40ca5a753a66e08af4e8b12d75feab67b0567ecffd34f5cf013f49aeb809ccd458c8011e9456dc902c24eaf626078117874514eb40cee5574eafce93ee772d
+DIST firefox-134.0.source.tar.xz 604421068 BLAKE2B 599049006a65bc70ce7a43b8412a260e033888609fefdec33a7aa4cf5427e0a89a725e6a74b396097a9263acafc9251f9a54294c666af1f7355c66ffeff4a007 SHA512 1275a686dc0a27b48df4ae05616511512f676e03474e3095b2521eac25a385d345aa3e8786716dbe812af49e07d72b32772479089d648968e2004ca0c9c35344
 DIST wasi-sdk-24.0-arm64-linux.tar.gz 119660865 BLAKE2B 5067fe0d63a8be0e3466131a7f1e0a92185e09879e5256b8d12428606920fb074198d7c5b4f949466f5179852f53911333baf8fb2409068de4a9a6c4d62bbd96 SHA512 412df3d066ef4a175bc5a10353d4bf853c6aee101a024b84b2fc10c1e2a48c0dde1b7162c08a56726861a5b5b9838c05da75c5069d3454513ed862ba3f4629bc
 DIST wasi-sdk-24.0-x86_64-linux.tar.gz 118879731 BLAKE2B 385dced143f463427e48839b4c9a810161b2791f0a1a335ad53b1cff9e20fd004b1c24c80443ec213f448dc31a5b1748f447569161c88ca8fc01b3bf35421aa6 SHA512 e320e1d3965324dcc435aab15e0ec3597dae914fae9634af4e7181a76609d35fd01cdca07621f39a6c894b528055e2d014ce0c1fcfe23a154343f51fb48928bc
+DIST wasi-sdk-25.0-arm64-linux.tar.gz 115160800 BLAKE2B 1ce22aaea87d0720d40d46ebdd96508c8fb0593b53c4489022fd5a1a9afb043a26a6e162a992d73454f612f2b6ab01e17a99c189c0c8b8c2d2d68fd96fabee1b SHA512 ef4eff22c1efec4dc5ab199d09d93ee0004f9fa67b32cac0030f8b6a40def10f714391cec8e803c200995dd8bfad3ebad9ec79b4195aa6b2ea61ea47a8b9e61f
+DIST wasi-sdk-25.0-x86_64-linux.tar.gz 114450290 BLAKE2B 07618828d4c25d67421aa72d38fc49bbff9052b8ecfe0fa9f4207e71880e9c650f458567cfa5bd389d5f830fcfee89142a77d33c29e7bccd1da7ddba2bc47b95 SHA512 716acc4b737ad6f51c6b32c3423612c03df9a3165bde3d6e24df5c86779b8be9463f5a79e620f2fc49707275563a6c9710242caca27e1ad9dd2c69e8fce8a766
diff --git a/www-client/firefox/firefox-128.6.0.ebuild b/www-client/firefox/firefox-128.6.0.ebuild
new file mode 100644
index 000000000000..ef66fd5507fb
--- /dev/null
+++ b/www-client/firefox/firefox-128.6.0.ebuild
@@ -0,0 +1,1376 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-128esr-patches-08.tar.xz"
+
+LLVM_COMPAT=( 17 18 19 )
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+# This will also filter rust versions that don't match LLVM_COMPAT in the non-clang path; this is fine.
+RUST_NEEDS_LLVM=1
+# If not building with clang we need at least rust 1.76
+RUST_MIN_VER=1.77.1
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="manual"
+
+# Information about the bundled wasi toolchain from
+# https://github.com/WebAssembly/wasi-sdk/
+WASI_SDK_VER=25.0
+WASI_SDK_LLVM_VER=19
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+	HOMEPAGE="https://www.mozilla.org/firefox https://www.mozilla.org/firefox/enterprise/"
+	SLOT="esr"
+else
+	HOMEPAGE="https://www.mozilla.org/firefox"
+	SLOT="rapid"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
+	optfeature pax-utils python-any-r1 readme.gentoo-r1 rust toolchain-funcs virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~juippis/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+DESCRIPTION="Firefox Web Browser"
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}
+	wasm-sandbox? (
+		amd64? ( https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VER/.*/}/wasi-sdk-${WASI_SDK_VER}-x86_64-linux.tar.gz )
+		arm64? ( https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VER/.*/}/wasi-sdk-${WASI_SDK_VER}-arm64-linux.tar.gz )
+	)"
+S="${WORKDIR}/${PN}-${PV%_*}"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+
+IUSE="+clang dbus debug eme-free hardened hwaccel jack libproxy pgo pulseaudio selinux sndio"
+IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx"
+IUSE+=" system-png +system-webp wayland wifi +X"
+
+# Firefox-only IUSE
+IUSE+=" +gmp-autoupdate gnome-shell +jumbo-build openh264 +telemetry wasm-sandbox"
+
+# "wasm-sandbox? ( llvm_slot_19 )" - most likely due to wasi-sdk-25.0 being llvm-19 based, and
+# llvm/clang-19 turning on reference types for wasm targets. Luckily clang-19 is already stable in
+# Gentoo so it should be widely adopted already - however, it might be possible to workaround
+# the constraint simply by modifying CFLAGS when using clang-17/18. Will need to investigate (bmo#1905251)
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( jumbo-build )
+	wasm-sandbox? ( llvm_slot_19 )
+	wayland? ( dbus )
+	wifi? ( dbus )"
+
+FF_ONLY_DEPEND="!www-client/firefox:0
+	selinux? ( sec-policy/selinux-mozilla )"
+BDEPEND="${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+		clang? (
+			llvm-core/lld:${LLVM_SLOT}
+			pgo? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[profile] )
+		)
+		wasm-sandbox? ( llvm-core/lld:${LLVM_SLOT} )
+	')
+	app-alternatives/awk
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.26.0
+	net-libs/nodejs
+	virtual/pkgconfig
+	amd64? ( >=dev-lang/nasm-2.14 )
+	x86? ( >=dev-lang/nasm-2.14 )
+	pgo? (
+		X? (
+			sys-devel/gettext
+			x11-base/xorg-server[xvfb]
+			x11-apps/xhost
+		)
+		!X? (
+			|| (
+				gui-wm/tinywl
+				<gui-libs/wlroots-0.17.3[tinywl(-)]
+			)
+			x11-misc/xkeyboard-config
+		)
+	)"
+COMMON_DEPEND="${FF_ONLY_DEPEND}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libffi:=
+	>=dev-libs/nss-3.101
+	>=dev-libs/nspr-4.35
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa
+	media-video/ffmpeg
+	sys-libs/zlib
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	x11-libs/pixman
+	dbus? (
+		sys-apps/dbus
+	)
+	jack? ( virtual/jack )
+	pulseaudio? (
+		|| (
+			media-libs/libpulse
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	libproxy? ( net-libs/libproxy )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( >=media-sound/sndio-1.8.0-r1 )
+	system-av1? (
+		>=media-libs/dav1d-1.0.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.8.1:0=
+		!wasm-sandbox? ( >=media-gfx/graphite2-1.3.13 )
+	)
+	system-icu? ( >=dev-libs/icu-73.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
+	system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wayland? (
+		>=media-libs/libepoxy-1.5.10-r1
+		x11-libs/gtk+:3[wayland]
+	)
+	wifi? (
+		kernel_linux? (
+			|| (
+				net-misc/networkmanager
+				net-misc/connman[networkmanager]
+			)
+			sys-apps/dbus
+		)
+	)
+	X? (
+		virtual/opengl
+		x11-libs/cairo[X]
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXrandr
+		x11-libs/libxcb:=
+	)"
+RDEPEND="${COMMON_DEPEND}
+	hwaccel? (
+		media-video/libva-utils
+		sys-apps/pciutils
+	)
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )"
+DEPEND="${COMMON_DEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libICE
+		x11-libs/libSM
+	)"
+
+# ESR and rapid dependencies.
+if [[ -n ${MOZ_ESR} ]] ; then
+	RDEPEND+=" !www-client/firefox:rapid"
+else
+	RDEPEND+=" !www-client/firefox:esr"
+fi
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version -b "llvm-core/clang:${LLVM_SLOT}" ; then
+		einfo "llvm-core/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && ! tc-ld-is-mold ; then
+		if ! has_version -b "llvm-core/lld:${LLVM_SLOT}" ; then
+			einfo "llvm-core/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+	fi
+
+	if use pgo ; then
+		if ! has_version -b "=llvm-runtimes/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+			einfo "=llvm-runtimes/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
+			einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+# Firefox-only LANGS
+MOZ_LANGS+=( ach )
+MOZ_LANGS+=( an )
+MOZ_LANGS+=( az )
+MOZ_LANGS+=( bn )
+MOZ_LANGS+=( bs )
+MOZ_LANGS+=( ca-valencia )
+MOZ_LANGS+=( eo )
+MOZ_LANGS+=( es-CL )
+MOZ_LANGS+=( es-MX )
+MOZ_LANGS+=( fa )
+MOZ_LANGS+=( ff )
+MOZ_LANGS+=( fur )
+MOZ_LANGS+=( gn )
+MOZ_LANGS+=( gu-IN )
+MOZ_LANGS+=( hi-IN )
+MOZ_LANGS+=( hy-AM )
+MOZ_LANGS+=( ia )
+MOZ_LANGS+=( km )
+MOZ_LANGS+=( kn )
+MOZ_LANGS+=( lij )
+MOZ_LANGS+=( mk )
+MOZ_LANGS+=( mr )
+MOZ_LANGS+=( my )
+MOZ_LANGS+=( ne-NP )
+MOZ_LANGS+=( oc )
+MOZ_LANGS+=( sc )
+MOZ_LANGS+=( sco )
+MOZ_LANGS+=( si )
+MOZ_LANGS+=( skr )
+MOZ_LANGS+=( son )
+MOZ_LANGS+=( szl )
+MOZ_LANGS+=( ta )
+MOZ_LANGS+=( te )
+MOZ_LANGS+=( tl )
+MOZ_LANGS+=( trs )
+MOZ_LANGS+=( ur )
+MOZ_LANGS+=( xh )
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json || die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+virtwl() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
+	[[ -n $XDG_RUNTIME_DIR ]] || die "${FUNCNAME} needs XDG_RUNTIME_DIR to be set; try xdg_environment_reset"
+	tinywl -h >/dev/null || die 'tinywl -h failed'
+
+	local VIRTWL VIRTWL_PID
+	coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY; read _; kill $PPID'; }
+	local -x WAYLAND_DISPLAY
+	read WAYLAND_DISPLAY <&${VIRTWL[0]}
+
+	debug-print "${FUNCNAME}: $@"
+	"$@"
+	local r=$?
+
+	[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
+	exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
+	return $r
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || tc-is-lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6600M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+
+	# Get LTO from environment; export after this phase for use in src_configure (etc)
+	use_lto=no
+
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+
+		if tc-is-lto; then
+			use_lto=yes
+			# LTO is handled via configure
+			filter-lto
+		fi
+
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		if [[ ${use_lto} = yes ]]; then
+			# -Werror=lto-type-mismatch -Werror=odr are going to fail with GCC,
+			# bmo#1516758, bgo#942288
+			filter-flags -Werror=lto-type-mismatch -Werror=odr
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || [[ ${use_lto} == "yes" ]] || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+		llvm-r1_pkg_setup
+		rust_pkg_setup
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if use pgo ; then
+			# Update 105.0: "/proc/self/oom_score_adj" isn't enough anymore with pgo, but not sure
+			# whether that's due to better OOM handling by Firefox (bmo#1771712), or portage
+			# (PORTAGE_SCHEDULING_POLICY) update...
+			addpredict /proc
+
+			# Clear tons of conditions, since PGO is hardware-dependant.
+			addpredict /dev
+		fi
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+
+	export use_lto
+
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	if [[ ${use_lto} == "yes" ]]; then
+		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
+	fi
+
+	# Workaround for bgo#917599
+	if has_version ">=dev-libs/icu-74.1" && use system-icu ; then
+		eapply "${WORKDIR}"/firefox-patches/*-bmo-1862601-system-icu-74.patch
+	fi
+	rm -v "${WORKDIR}"/firefox-patches/*-bmo-1862601-system-icu-74.patch || die
+
+	# Workaround for bgo#915651 on musl
+	if use elibc_glibc ; then
+		rm -v "${WORKDIR}"/firefox-patches/*bgo-748849-RUST_TARGET_override.patch || die
+	fi
+
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make cargo respect MAKEOPTS
+	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
+
+	# Workaround for bgo#915651
+	if ! use elibc_glibc ; then
+		if use amd64 ; then
+			export RUST_TARGET="x86_64-unknown-linux-musl"
+		elif use x86 ; then
+			export RUST_TARGET="i686-unknown-linux-musl"
+		elif use arm64 ; then
+			export RUST_TARGET="aarch64-unknown-linux-musl"
+		elif use ppc64 ; then
+			export RUST_TARGET="powerpc64le-unknown-linux-musl"
+		elif use riscv ; then
+			# We can pretty safely rule out any 32-bit riscvs, but 64-bit riscvs also have tons of
+			# different ABIs available. riscv64gc-unknown-linux-musl seems to be the best working
+			# guess right now though.
+			elog "riscv detected, forcing a riscv64 target for now."
+			export RUST_TARGET="riscv64gc-unknown-linux-musl"
+		else
+			die "Unknown musl chost, please post a new bug with your rustc -vV along with emerge --info"
+		fi
+	fi
+
+	# Pre-built wasm-sandbox path manipulation.
+	if use wasm-sandbox ; then
+		if use amd64 ; then
+			export wasi_arch="x86_64"
+		elif use arm64 ; then
+			export wasi_arch="arm64"
+		else
+			die "wasm-sandbox enabled on unknown/unsupported arch!"
+		fi
+
+		sed -i \
+			-e "s:%%PORTAGE_WORKDIR%%:${WORKDIR}:" \
+			-e "s:%%WASI_ARCH%%:${wasi_arch}:" \
+			-e "s:%%WASI_SDK_VER%%:${WASI_SDK_VER}:" \
+			-e "s:%%WASI_SDK_LLVM_VER%%:${WASI_SDK_LLVM_VER}:" \
+			toolkit/moz.configure || die "Failed to update wasi-related paths."
+	fi
+
+	# Make LTO respect MAKEOPTS
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure || die "Failed sedding multiprocessing.cpu_count"
+
+	# Make ICU respect MAKEOPTS
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py || die "Failed sedding multiprocessing.cpu_count"
+
+	# Respect MAKEOPTS all around (maybe some find+sed is better)
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/python/mozbuild/mozbuild/base.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/libwebrtc/build/toolchain/get_cpu_count.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/libwebrtc/build/toolchain/get_concurrent_links.py ||
+			die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/python/gyp/pylib/gyp/input.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/python/mozbuild/mozbuild/code_analysis/mach_commands.py || die "Failed sedding multiprocessing.cpu_count"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py || die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py || die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clear checksums from cargo crates we've manually patched.
+	# moz_clear_vendor_checksums xyz
+
+	# Respect choice for "jumbo-build"
+	# Changing the value for FILES_PER_UNIFIED_FILE may not work, see #905431
+	if [[ -n ${FILES_PER_UNIFIED_FILE} ]] && use jumbo-build; then
+		local my_files_per_unified_file=${FILES_PER_UNIFIED_FILE:=16}
+		elog ""
+		elog "jumbo-build defaults modified to ${my_files_per_unified_file}."
+		elog "if you get a build failure, try undefining FILES_PER_UNIFIED_FILE,"
+		elog "if that fails try -jumbo-build before opening a bug report."
+		elog ""
+
+		sed -i -e "s/\"FILES_PER_UNIFIED_FILE\", 16/\"FILES_PER_UNIFIED_FILE\", "${my_files_per_unified_file}"/" \
+			python/mozbuild/mozbuild/frontend/data.py ||
+				die "Failed to adjust FILES_PER_UNIFIED_FILE in python/mozbuild/mozbuild/frontend/data.py"
+		sed -i -e "s/FILES_PER_UNIFIED_FILE = 6/FILES_PER_UNIFIED_FILE = "${my_files_per_unified_file}"/" \
+			js/src/moz.build ||
+				die "Failed to adjust FILES_PER_UNIFIED_FILE in js/src/moz.build"
+	fi
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+
+		local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }')
+		[[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}")
+		[[ -z ${version_clang} ]] && die "Failed to read clang version!"
+
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
+
+		AR=llvm-ar
+		CC=${CHOST}-clang-${version_clang}
+		CXX=${CHOST}-clang++-${version_clang}
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain,
+	# AS is used in a non-standard way by upstream, #bmo1654031
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
+
+	# Configuration tests expect llvm-readelf output, bug 913130
+	READELF="llvm-readelf"
+
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB READELF PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=browser
+	mozconfig_add_options_ac '' --enable-project=browser
+
+	# Set Gentoo defaults
+	if use telemetry; then
+		export MOZILLA_OFFICIAL=1
+	fi
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-disk-remnant-avoidance \
+		--disable-geckodriver \
+		--disable-gpsd \
+		--disable-install-strip \
+		--disable-legacy-profile-creation \
+		--disable-parental-controls \
+		--disable-strip \
+		--disable-tests \
+		--disable-updater \
+		--disable-valgrind \
+		--disable-wmf \
+		--enable-negotiateauth \
+		--enable-new-pass-manager \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--enable-system-policies \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${ESYSROOT}/usr/include" \
+		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	# For future keywording: This is currently (97.0) only supported on:
+	# amd64, arm, arm64 & x86.
+	# Might want to flip the logic around if Firefox is to support more arches.
+	# bug 833001, bug 903411#c8
+	if use ppc64 || use riscv; then
+		mozconfig_add_options_ac '' --disable-sandbox
+	else
+		mozconfig_add_options_ac '' --enable-sandbox
+	fi
+
+	# Enable JIT on riscv64 explicitly, since it's not activated automatically via "known arches" list.
+	# Update 128.1.0: Disable jit on riscv (this line can be blanked to disable by default),
+	# bgo#937867.
+	use riscv && mozconfig_add_options_ac 'Disable JIT for RISC-V 64' --disable-jit
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-png
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+	mozconfig_use_enable libproxy
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+
+		# Increase the FORTIFY_SOURCE value, #910071.
+		sed -i -e '/-D_FORTIFY_SOURCE=/s:2:3:' "${S}"/build/moz.configure/toolchain.configure || die
+	fi
+
+	local myaudiobackends=""
+	use jack && myaudiobackends+="jack,"
+	use sndio && myaudiobackends+="sndio,"
+	use pulseaudio && myaudiobackends+="pulseaudio,"
+	! use pulseaudio && myaudiobackends+="alsa,"
+
+	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
+
+	mozconfig_use_enable wifi necko-wifi
+
+	! use jumbo-build && mozconfig_add_options_ac '--disable-unified-build' --disable-unified-build
+
+	if use X && use wayland ; then
+		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
+	elif ! use X && use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland-only
+	else
+		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3-x11-only
+	fi
+
+	# wasm-sandbox
+	# Since graphite2 is one of the sandboxed libraries, system-graphite2 obviously can't work with +wasm-sandbox.
+	if use wasm-sandbox ; then
+		mozconfig_add_options_ac '+wasm-sandbox' --with-wasi-sysroot="${WORKDIR}/wasi-sdk-${WASI_SDK_VER}-${wasi_arch}-linux/share/wasi-sysroot/"
+	else
+		mozconfig_add_options_ac 'no wasm-sandbox' --without-wasm-sandboxed-libraries
+		mozconfig_use_with system-harfbuzz system-graphite2
+	fi
+
+	if [[ ${use_lto} == "yes" ]] ; then
+		if use clang ; then
+			# Upstream only supports lld or mold when using clang.
+			if tc-ld-is-mold ; then
+				# mold expects the -flto line from *FLAGS configuration, bgo#923119
+				append-ldflags "-flto=thin"
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+			fi
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+
+		else
+			# ThinLTO is currently broken, see bmo#1644409.
+			# mold does not support gcc+lto combination.
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# lld is upstream's default
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+			fi
+
+		else
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "linker is set to bfd due to USE=-clang" --enable-linker=bfd
+			fi
+		fi
+	fi
+
+	# PGO was moved outside lto block to allow building pgo without lto.
+	if use pgo ; then
+		mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+		if use clang ; then
+			# Used in build/pgo/profileserver.py
+			export LLVM_PROFDATA="llvm-profdata"
+		fi
+	fi
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+		mozconfig_add_options_ac '+debug' --enable-jemalloc
+		mozconfig_add_options_ac '+debug' --enable-real-time-tracing
+	else
+		mozconfig_add_options_ac 'Gentoo defaults' --disable-real-time-tracing
+
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# elf-hack
+	# Filter "-z,pack-relative-relocs" and let the build system handle it instead.
+	if use amd64 || use x86 ; then
+		filter-flags "-z,pack-relative-relocs"
+
+		if tc-ld-is-mold ; then
+			# relr-elf-hack is currently broken with mold, bgo#916259
+			mozconfig_add_options_ac 'disable elf-hack with mold linker' --disable-elf-hack
+		else
+			mozconfig_add_options_ac 'relr elf-hack' --enable-elf-hack=relr
+		fi
+	elif use ppc64 || use riscv ; then
+		# '--disable-elf-hack' is not recognized on ppc64/riscv,
+		# see bgo #917049, #930046
+		:;
+	else
+		mozconfig_add_options_ac 'disable elf-hack on non-supported arches' --disable-elf-hack
+	fi
+
+	if ! use elibc_glibc; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# System-av1 fix
+	use system-av1 && append-ldflags "-Wl,--undefined-version"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+
+	if ! use telemetry; then
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_CRASHREPORTER=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_DATA_REPORTING=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_SERVICES_HEALTHREPORT=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_TELEMETRY_REPORTING=0"
+	fi
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if [[ ${use_lto} == "yes" ]] && tc-ld-is-mold ; then
+		# increase ulimit with mold+lto, bugs #892641, #907485
+		if ! ulimit -n 16384 1>/dev/null 2>&1 ; then
+			ewarn "Unable to modify ulimits - building with mold+lto might fail due to low ulimit -n resources."
+			ewarn "Please see bugs #892641 & #907485."
+		else
+			ulimit -n 16384
+		fi
+	fi
+
+	if use pgo; then
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+
+		if ! use X; then
+			virtx_cmd=virtwl
+		else
+			virtx_cmd=virtx
+		fi
+	fi
+
+	if ! use X; then
+		local -x GDK_BACKEND=wayland
+	else
+		local -x GDK_BACKEND=x11
+	fi
+
+	${virtx_cmd} ./mach build --verbose || die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from llvm-core/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path", "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r2 \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+
+		if use wayland; then
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
+			pref("gfx.x11-egl.force-enabled", false);
+			EOF
+		else
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
+			pref("gfx.x11-egl.force-enabled", true);
+			EOF
+		fi
+
+		# Install the vaapitest binary on supported arches (122.0 supports all platforms, bmo#1865969)
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/vaapitest
+
+		# Install the v4l2test on supported arches (+ arm, + riscv64 when keyworded)
+		if use arm64 ; then
+			exeinto "${MOZILLA_FIVE_HOME}"
+			doexe "${BUILD_DIR}"/dist/bin/v4l2test
+		fi
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate", false);
+			EOF
+		done
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Add telemetry config prefs, just in case something happens in future and telemetry build
+	# options stop working.
+	if ! use telemetry ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set telemetry prefs"
+		sticky_pref("toolkit.telemetry.dap_enabled", false);
+		pref("toolkit.telemetry.dap_helper", "");
+		pref("toolkit.telemetry.dap_leader", "");
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/browser/branding/official"
+	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^}"
+	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if [[ -n ${MOZ_ESR} ]] ; then
+		local desktop_filename="${PN}-esr.desktop"
+	else
+		local desktop_filename="${PN}.desktop"
+	fi
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" || die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	if use gnome-shell ; then
+		# Install search provider for Gnome
+		insinto /usr/share/gnome-shell/search-providers/
+		doins browser/components/shell/search-provider-files/org.mozilla.firefox.search-provider.ini
+
+		insinto /usr/share/dbus-1/services/
+		doins browser/components/shell/search-provider-files/org.mozilla.firefox.SearchProvider.service
+
+		# Toggle between rapid and esr desktop file names
+		if [[ -n ${MOZ_ESR} ]] ; then
+			sed -e "s/firefox.desktop/${desktop_filename}/g" \
+				-i "${ED}/usr/share/gnome-shell/search-providers/org.mozilla.firefox.search-provider.ini" ||
+					die "Failed to sed org.mozilla.firefox.search-provider.ini file."
+		fi
+
+		# Make the dbus service aware of a previous session, bgo#939196
+		sed -e \
+			"s/Exec=\/usr\/bin\/firefox/Exec=\/usr\/$(get_libdir)\/firefox\/firefox --dbus-service \/usr\/bin\/firefox/g" \
+			-i "${ED}/usr/share/dbus-1/services/org.mozilla.firefox.SearchProvider.service" ||
+				die "Failed to sed org.mozilla.firefox.SearchProvider.service dbus file"
+
+		# Update prefs to enable Gnome search provider
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to enable gnome-search-provider via prefs"
+		pref("browser.gnome-search-provider.enabled", true);
+		EOF
+	fi
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	# bug 835078
+	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
+		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
+		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
+		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
+		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
+	fi
+
+	readme.gentoo_print_elog
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+	optfeature "screencasting with pipewire" sys-apps/xdg-desktop-portal
+	if use hwaccel && has_version "x11-drivers/nvidia-drivers"; then
+		optfeature "hardware acceleration with NVIDIA cards" media-libs/nvidia-vaapi-driver
+	fi
+
+	if ! has_version "sys-libs/glibc"; then
+		elog
+		elog "glibc not found! You won't be able to play DRM content."
+		elog "See Gentoo bug #910309 or upstream bug #1843683."
+		elog
+	fi
+}
diff --git a/www-client/firefox/firefox-134.0.1.ebuild b/www-client/firefox/firefox-134.0.1.ebuild
new file mode 100644
index 000000000000..af9245e50f9b
--- /dev/null
+++ b/www-client/firefox/firefox-134.0.1.ebuild
@@ -0,0 +1,1371 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-134-patches-01.tar.xz"
+
+LLVM_COMPAT=( 17 18 19 )
+
+# This will also filter rust versions that don't match LLVM_COMPAT in the non-clang path; this is fine.
+RUST_NEEDS_LLVM=1
+
+# If not building with clang we need at least rust 1.76
+RUST_MIN_VER=1.77.1
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.71"
+
+VIRTUALX_REQUIRED="manual"
+
+# Information about the bundled wasi toolchain from
+# https://github.com/WebAssembly/wasi-sdk/
+WASI_SDK_VER=25.0
+WASI_SDK_LLVM_VER=19
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+	HOMEPAGE="https://www.mozilla.org/firefox https://www.mozilla.org/firefox/enterprise/"
+	SLOT="esr"
+else
+	HOMEPAGE="https://www.mozilla.org/firefox"
+	SLOT="rapid"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
+	optfeature pax-utils python-any-r1 readme.gentoo-r1 rust toolchain-funcs virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~juippis/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+DESCRIPTION="Firefox Web Browser"
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}
+	wasm-sandbox? (
+		amd64? ( https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VER/.*/}/wasi-sdk-${WASI_SDK_VER}-x86_64-linux.tar.gz )
+		arm64? ( https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VER/.*/}/wasi-sdk-${WASI_SDK_VER}-arm64-linux.tar.gz )
+	)"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+IUSE="+clang dbus debug eme-free hardened hwaccel jack libproxy pgo pulseaudio sndio selinux"
+IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-jpeg +system-libevent"
+IUSE+=" +system-libvpx system-png +system-webp valgrind wayland wifi +X"
+
+# Firefox-only IUSE
+IUSE+=" +gmp-autoupdate gnome-shell +jumbo-build openh264 +telemetry wasm-sandbox"
+
+# "wasm-sandbox? ( llvm_slot_19 )" - most likely due to wasi-sdk-25.0 being llvm-19 based, and
+# llvm/clang-19 turning on reference types for wasm targets. Luckily clang-19 is already stable in
+# Gentoo so it should be widely adopted already - however, it might be possible to workaround
+# the constraint simply by modifying CFLAGS when using clang-17/18. Will need to investigate (bmo#1905251)
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( jumbo-build )
+	wasm-sandbox? ( llvm_slot_19 )
+	wayland? ( dbus )
+	wifi? ( dbus )
+"
+
+FF_ONLY_DEPEND="!www-client/firefox:0
+	selinux? ( sec-policy/selinux-mozilla )"
+BDEPEND="${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+		clang? (
+			llvm-core/lld:${LLVM_SLOT}
+			pgo? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[profile] )
+		)
+		wasm-sandbox? ( llvm-core/lld:${LLVM_SLOT} )
+	')
+	app-alternatives/awk
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.26.0
+	net-libs/nodejs
+	virtual/pkgconfig
+	amd64? ( >=dev-lang/nasm-2.14 )
+	x86? ( >=dev-lang/nasm-2.14 )
+	pgo? (
+		X? (
+			sys-devel/gettext
+			x11-base/xorg-server[xvfb]
+			x11-apps/xhost
+		)
+		!X? (
+			|| (
+				gui-wm/tinywl
+				<gui-libs/wlroots-0.17.3[tinywl(-)]
+			)
+			x11-misc/xkeyboard-config
+		)
+	)"
+COMMON_DEPEND="${FF_ONLY_DEPEND}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libffi:=
+	>=dev-libs/nss-3.107
+	>=dev-libs/nspr-4.35
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa
+	media-video/ffmpeg
+	sys-libs/zlib
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	x11-libs/pixman
+	dbus? (
+		sys-apps/dbus
+	)
+	jack? ( virtual/jack )
+	pulseaudio? (
+		|| (
+			media-libs/libpulse
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	libproxy? ( net-libs/libproxy )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( >=media-sound/sndio-1.8.0-r1 )
+	system-av1? (
+		>=media-libs/dav1d-1.0.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.8.1:0=
+		!wasm-sandbox? ( >=media-gfx/graphite2-1.3.13 )
+	)
+	system-icu? ( >=dev-libs/icu-73.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
+	system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	valgrind? ( dev-debug/valgrind )
+	wayland? (
+		>=media-libs/libepoxy-1.5.10-r1
+		x11-libs/gtk+:3[wayland]
+	)
+	wifi? (
+		kernel_linux? (
+			|| (
+				net-misc/networkmanager
+				net-misc/connman[networkmanager]
+			)
+			sys-apps/dbus
+		)
+	)
+	X? (
+		virtual/opengl
+		x11-libs/cairo[X]
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXrandr
+		x11-libs/libxcb:=
+	)"
+RDEPEND="${COMMON_DEPEND}
+	hwaccel? (
+		media-video/libva-utils
+		sys-apps/pciutils
+	)
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )"
+DEPEND="${COMMON_DEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libICE
+		x11-libs/libSM
+	)"
+
+# ESR and rapid dependencies.
+if [[ -n ${MOZ_ESR} ]] ; then
+	RDEPEND+=" !www-client/firefox:rapid"
+else
+	RDEPEND+=" !www-client/firefox:esr"
+fi
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version -b "llvm-core/clang:${LLVM_SLOT}" ; then
+		einfo "llvm-core/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && ! tc-ld-is-mold ; then
+		if ! has_version -b "llvm-core/lld:${LLVM_SLOT}" ; then
+			einfo "llvm-core/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+	fi
+
+	if use pgo ; then
+		if ! has_version -b "=llvm-runtimes/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+			einfo "=llvm-runtimes/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
+			einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+# Firefox-only LANGS
+MOZ_LANGS+=( ach )
+MOZ_LANGS+=( an )
+MOZ_LANGS+=( az )
+MOZ_LANGS+=( bn )
+MOZ_LANGS+=( bs )
+MOZ_LANGS+=( ca-valencia )
+MOZ_LANGS+=( eo )
+MOZ_LANGS+=( es-CL )
+MOZ_LANGS+=( es-MX )
+MOZ_LANGS+=( fa )
+MOZ_LANGS+=( ff )
+MOZ_LANGS+=( fur )
+MOZ_LANGS+=( gn )
+MOZ_LANGS+=( gu-IN )
+MOZ_LANGS+=( hi-IN )
+MOZ_LANGS+=( hy-AM )
+MOZ_LANGS+=( ia )
+MOZ_LANGS+=( km )
+MOZ_LANGS+=( kn )
+MOZ_LANGS+=( lij )
+MOZ_LANGS+=( mk )
+MOZ_LANGS+=( mr )
+MOZ_LANGS+=( my )
+MOZ_LANGS+=( ne-NP )
+MOZ_LANGS+=( oc )
+MOZ_LANGS+=( sc )
+MOZ_LANGS+=( sco )
+MOZ_LANGS+=( si )
+MOZ_LANGS+=( skr )
+MOZ_LANGS+=( son )
+MOZ_LANGS+=( szl )
+MOZ_LANGS+=( ta )
+MOZ_LANGS+=( te )
+MOZ_LANGS+=( tl )
+MOZ_LANGS+=( trs )
+MOZ_LANGS+=( ur )
+MOZ_LANGS+=( xh )
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json || die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+virtwl() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
+	[[ -n $XDG_RUNTIME_DIR ]] || die "${FUNCNAME} needs XDG_RUNTIME_DIR to be set; try xdg_environment_reset"
+	tinywl -h >/dev/null || die 'tinywl -h failed'
+
+	local VIRTWL VIRTWL_PID
+	coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY; read _; kill $PPID'; }
+	local -x WAYLAND_DISPLAY
+	read WAYLAND_DISPLAY <&${VIRTWL[0]}
+
+	debug-print "${FUNCNAME}: $@"
+	"$@"
+	local r=$?
+
+	[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
+	exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
+	return $r
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use debug ; then
+			CHECKREQS_DISK_BUILD="14300M"
+		elif tc-is-lto ; then
+			CHECKREQS_DISK_BUILD="10600M"
+		else
+			CHECKREQS_DISK_BUILD="6800M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+
+	# Get LTO from environment; export after this phase for use in src_configure (etc)
+	use_lto=no
+
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+
+		if tc-is-lto; then
+			use_lto=yes
+			# LTO is handled via configure
+			filter-lto
+		fi
+
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		if [[ ${use_lto} = yes ]]; then
+			# -Werror=lto-type-mismatch -Werror=odr are going to fail with GCC,
+			# bmo#1516758, bgo#942288
+			filter-flags -Werror=lto-type-mismatch -Werror=odr
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use debug ; then
+			CHECKREQS_DISK_BUILD="14300M"
+		elif [[ ${use_lto} == "yes" ]] ; then
+			CHECKREQS_DISK_BUILD="10600M"
+		else
+			CHECKREQS_DISK_BUILD="6800M"
+		fi
+
+		check-reqs_pkg_setup
+		llvm-r1_pkg_setup
+		rust_pkg_setup
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if use pgo ; then
+			# Update 105.0: "/proc/self/oom_score_adj" isn't enough anymore with pgo, but not sure
+			# whether that's due to better OOM handling by Firefox (bmo#1771712), or portage
+			# (PORTAGE_SCHEDULING_POLICY) update...
+			addpredict /proc
+
+			# Clear tons of conditions, since PGO is hardware-dependant.
+			addpredict /dev
+		fi
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+
+	export use_lto
+
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	if [[ ${use_lto} == "yes" ]]; then
+		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
+	fi
+
+	# Workaround for bgo#915651 on musl
+	if use elibc_glibc ; then
+		rm -v "${WORKDIR}"/firefox-patches/*bgo-748849-RUST_TARGET_override.patch || die
+	fi
+
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make cargo respect MAKEOPTS
+	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
+
+	# Workaround for bgo#915651
+	if ! use elibc_glibc ; then
+		if use amd64 ; then
+			export RUST_TARGET="x86_64-unknown-linux-musl"
+		elif use x86 ; then
+			export RUST_TARGET="i686-unknown-linux-musl"
+		elif use arm64 ; then
+			export RUST_TARGET="aarch64-unknown-linux-musl"
+		elif use ppc64 ; then
+			export RUST_TARGET="powerpc64le-unknown-linux-musl"
+		elif use riscv ; then
+			# We can pretty safely rule out any 32-bit riscvs, but 64-bit riscvs also have tons of
+			# different ABIs available. riscv64gc-unknown-linux-musl seems to be the best working
+			# guess right now though.
+			elog "riscv detected, forcing a riscv64 target for now."
+			export RUST_TARGET="riscv64gc-unknown-linux-musl"
+		else
+			die "Unknown musl chost, please post a new bug with your rustc -vV along with emerge --info"
+		fi
+	fi
+
+	# Pre-built wasm-sandbox path manipulation.
+	if use wasm-sandbox ; then
+		if use amd64 ; then
+			export wasi_arch="x86_64"
+		elif use arm64 ; then
+			export wasi_arch="arm64"
+		else
+			die "wasm-sandbox enabled on unknown/unsupported arch!"
+		fi
+
+		sed -i \
+			-e "s:%%PORTAGE_WORKDIR%%:${WORKDIR}:" \
+			-e "s:%%WASI_ARCH%%:${wasi_arch}:" \
+			-e "s:%%WASI_SDK_VER%%:${WASI_SDK_VER}:" \
+			-e "s:%%WASI_SDK_LLVM_VER%%:${WASI_SDK_LLVM_VER}:" \
+			toolkit/moz.configure || die "Failed to update wasi-related paths."
+	fi
+
+	# Make LTO respect MAKEOPTS
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/chromium/build/toolchain/get_cpu_count.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/python/gyp/pylib/gyp/input.py || die "Failed sedding multiprocessing.cpu_count"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py || die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py || die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clear checksums from cargo crates we've manually patched.
+	# moz_clear_vendor_checksums xyz
+
+	# Respect choice for "jumbo-build"
+	# Changing the value for FILES_PER_UNIFIED_FILE may not work, see #905431
+	if [[ -n ${FILES_PER_UNIFIED_FILE} ]] && use jumbo-build; then
+		local my_files_per_unified_file=${FILES_PER_UNIFIED_FILE:=16}
+		elog ""
+		elog "jumbo-build defaults modified to ${my_files_per_unified_file}."
+		elog "if you get a build failure, try undefining FILES_PER_UNIFIED_FILE,"
+		elog "if that fails try -jumbo-build before opening a bug report."
+		elog ""
+
+		sed -i -e "s/\"FILES_PER_UNIFIED_FILE\", 16/\"FILES_PER_UNIFIED_FILE\", "${my_files_per_unified_file}"/" \
+			python/mozbuild/mozbuild/frontend/data.py ||
+				die "Failed to adjust FILES_PER_UNIFIED_FILE in python/mozbuild/mozbuild/frontend/data.py"
+		sed -i -e "s/FILES_PER_UNIFIED_FILE = 6/FILES_PER_UNIFIED_FILE = "${my_files_per_unified_file}"/" \
+			js/src/moz.build ||
+				die "Failed to adjust FILES_PER_UNIFIED_FILE in js/src/moz.build"
+	fi
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+
+		local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }')
+		[[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}")
+		[[ -z ${version_clang} ]] && die "Failed to read clang version!"
+
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
+
+		AR=llvm-ar
+		CC=${CHOST}-clang-${version_clang}
+		CXX=${CHOST}-clang++-${version_clang}
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain,
+	# AS is used in a non-standard way by upstream, #bmo1654031
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
+
+	# Configuration tests expect llvm-readelf output, bug 913130
+	READELF="llvm-readelf"
+
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB READELF PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=browser
+	mozconfig_add_options_ac '' --enable-project=browser
+
+	# Set Gentoo defaults
+	if use telemetry; then
+		export MOZILLA_OFFICIAL=1
+	fi
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-disk-remnant-avoidance \
+		--disable-geckodriver \
+		--disable-install-strip \
+		--disable-legacy-profile-creation \
+		--disable-parental-controls \
+		--disable-strip \
+		--disable-tests \
+		--disable-updater \
+		--disable-wmf \
+		--enable-negotiateauth \
+		--enable-new-pass-manager \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--enable-system-policies \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${ESYSROOT}/usr/include" \
+		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	# For future keywording: This is currently (97.0) only supported on:
+	# amd64, arm, arm64 & x86.
+	# Might want to flip the logic around if Firefox is to support more arches.
+	# bug 833001, bug 903411#c8
+	if use ppc64 || use riscv; then
+		mozconfig_add_options_ac '' --disable-sandbox
+	elif use valgrind; then
+		mozconfig_add_options_ac 'valgrind requirement' --disable-sandbox
+	else
+		mozconfig_add_options_ac '' --enable-sandbox
+	fi
+
+	# Enable JIT on riscv64 explicitly
+	# Can be removed once upstream enable it by default in the future.
+	use riscv && mozconfig_add_options_ac 'Enable JIT for RISC-V 64' --enable-jit
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-png
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+	mozconfig_use_enable libproxy
+	mozconfig_use_enable valgrind
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+
+		# Increase the FORTIFY_SOURCE value, #910071.
+		sed -i -e '/-D_FORTIFY_SOURCE=/s:2:3:' "${S}"/build/moz.configure/toolchain.configure || die
+	fi
+
+	local myaudiobackends=""
+	use jack && myaudiobackends+="jack,"
+	use sndio && myaudiobackends+="sndio,"
+	use pulseaudio && myaudiobackends+="pulseaudio,"
+	! use pulseaudio && myaudiobackends+="alsa,"
+
+	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
+
+	mozconfig_use_enable wifi necko-wifi
+
+	! use jumbo-build && mozconfig_add_options_ac '--disable-unified-build' --disable-unified-build
+
+	if use X && use wayland ; then
+		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
+	elif ! use X && use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland-only
+	else
+		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3-x11-only
+	fi
+
+	# wasm-sandbox
+	# Since graphite2 is one of the sandboxed libraries, system-graphite2 obviously can't work with +wasm-sandbox.
+	if use wasm-sandbox ; then
+		mozconfig_add_options_ac '+wasm-sandbox' --with-wasi-sysroot="${WORKDIR}/wasi-sdk-${WASI_SDK_VER}-${wasi_arch}-linux/share/wasi-sysroot/"
+	else
+		mozconfig_add_options_ac 'no wasm-sandbox' --without-wasm-sandboxed-libraries
+		mozconfig_use_with system-harfbuzz system-graphite2
+	fi
+
+	if [[ ${use_lto} == "yes" ]] ; then
+		if use clang ; then
+			# Upstream only supports lld or mold when using clang.
+			if tc-ld-is-mold ; then
+				# mold expects the -flto line from *FLAGS configuration, bgo#923119
+				append-ldflags "-flto=thin"
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+			fi
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+
+		else
+			# ThinLTO is currently broken, see bmo#1644409.
+			# mold does not support gcc+lto combination.
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# lld is upstream's default
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+			fi
+
+		else
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "linker is set to bfd due to USE=-clang" --enable-linker=bfd
+			fi
+		fi
+	fi
+
+	# PGO was moved outside lto block to allow building pgo without lto.
+	if use pgo ; then
+		mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+		if use clang ; then
+			# Used in build/pgo/profileserver.py
+			export LLVM_PROFDATA="llvm-profdata"
+		fi
+	fi
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+		mozconfig_add_options_ac '+debug' --enable-jemalloc
+		mozconfig_add_options_ac '+debug' --enable-real-time-tracing
+	else
+		mozconfig_add_options_ac 'Gentoo defaults' --disable-real-time-tracing
+
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# elf-hack
+	# Filter "-z,pack-relative-relocs" and let the build system handle it instead.
+	if use amd64 || use x86 ; then
+		filter-flags "-z,pack-relative-relocs"
+
+		if tc-ld-is-mold ; then
+			# relr-elf-hack is currently broken with mold, bgo#916259
+			mozconfig_add_options_ac 'disable elf-hack with mold linker' --disable-elf-hack
+		else
+			mozconfig_add_options_ac 'relr elf-hack' --enable-elf-hack=relr
+		fi
+	elif use ppc64 || use riscv ; then
+		# '--disable-elf-hack' is not recognized on ppc64/riscv,
+		# see bgo #917049, #930046
+		:;
+	else
+		mozconfig_add_options_ac 'disable elf-hack on non-supported arches' --disable-elf-hack
+	fi
+
+	if ! use elibc_glibc; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	if use valgrind; then
+		mozconfig_add_options_ac 'valgrind requirement' --disable-jemalloc
+	fi
+
+	# System-av1 fix
+	use system-av1 && append-ldflags "-Wl,--undefined-version"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+
+	if ! use telemetry; then
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_CRASHREPORTER=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_DATA_REPORTING=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_SERVICES_HEALTHREPORT=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_TELEMETRY_REPORTING=0"
+	fi
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	if use valgrind; then
+		sed -i -e 's/--enable-optimize=-O[0-9s]/--enable-optimize="-g -O2"/' .mozconfig || die
+	fi
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if [[ ${use_lto} == "yes" ]] && tc-ld-is-mold; then
+		# increase ulimit with mold+lto, bugs #892641, #907485
+		if ! ulimit -n 16384 1>/dev/null 2>&1 ; then
+			ewarn "Unable to modify ulimits - building with mold+lto might fail due to low ulimit -n resources."
+			ewarn "Please see bugs #892641 & #907485."
+		else
+			ulimit -n 16384
+		fi
+	fi
+
+	if use pgo; then
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+
+		if ! use X; then
+			virtx_cmd=virtwl
+		else
+			virtx_cmd=virtx
+		fi
+	fi
+
+	if ! use X; then
+		local -x GDK_BACKEND=wayland
+	else
+		local -x GDK_BACKEND=x11
+	fi
+
+	${virtx_cmd} ./mach build --verbose || die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from llvm-core/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path", "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r2 \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+
+		if use wayland; then
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
+			pref("gfx.x11-egl.force-enabled", false);
+			EOF
+		else
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
+			pref("gfx.x11-egl.force-enabled", true);
+			EOF
+		fi
+
+		# Install the vaapitest binary on supported arches (122.0 supports all platforms, bmo#1865969)
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/vaapitest
+
+		# Install the v4l2test on supported arches (+ arm, + riscv64 when keyworded)
+		if use arm64 ; then
+			exeinto "${MOZILLA_FIVE_HOME}"
+			doexe "${BUILD_DIR}"/dist/bin/v4l2test
+		fi
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate", false);
+			EOF
+		done
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Add telemetry config prefs, just in case something happens in future and telemetry build
+	# options stop working.
+	if ! use telemetry ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set telemetry prefs"
+		sticky_pref("toolkit.telemetry.dap_enabled", false);
+		pref("toolkit.telemetry.dap_helper", "");
+		pref("toolkit.telemetry.dap_leader", "");
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/browser/branding/official"
+	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^}"
+	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if [[ -n ${MOZ_ESR} ]] ; then
+		local desktop_filename="${PN}-esr.desktop"
+	else
+		local desktop_filename="${PN}.desktop"
+	fi
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" || die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	if use gnome-shell ; then
+		# Install search provider for Gnome
+		insinto /usr/share/gnome-shell/search-providers/
+		doins browser/components/shell/search-provider-files/org.mozilla.firefox.search-provider.ini
+
+		insinto /usr/share/dbus-1/services/
+		doins browser/components/shell/search-provider-files/org.mozilla.firefox.SearchProvider.service
+
+		# Toggle between rapid and esr desktop file names
+		if [[ -n ${MOZ_ESR} ]] ; then
+			sed -e "s/firefox.desktop/${desktop_filename}/g" \
+				-i "${ED}/usr/share/gnome-shell/search-providers/org.mozilla.firefox.search-provider.ini" ||
+					die "Failed to sed org.mozilla.firefox.search-provider.ini file."
+		fi
+
+		# Make the dbus service aware of a previous session, bgo#939196
+		sed -e \
+			"s/Exec=\/usr\/bin\/firefox/Exec=\/usr\/$(get_libdir)\/firefox\/firefox --dbus-service \/usr\/bin\/firefox/g" \
+			-i "${ED}/usr/share/dbus-1/services/org.mozilla.firefox.SearchProvider.service" ||
+				die "Failed to sed org.mozilla.firefox.SearchProvider.service dbus file"
+
+		# Update prefs to enable Gnome search provider
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to enable gnome-search-provider via prefs"
+		pref("browser.gnome-search-provider.enabled", true);
+		EOF
+	fi
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	# bug 835078
+	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
+		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
+		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
+		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
+		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
+	fi
+
+	readme.gentoo_print_elog
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+	optfeature "screencasting with pipewire" sys-apps/xdg-desktop-portal
+	if use hwaccel && has_version "x11-drivers/nvidia-drivers"; then
+		optfeature "hardware acceleration with NVIDIA cards" media-libs/nvidia-vaapi-driver
+	fi
+
+	if ! has_version "sys-libs/glibc"; then
+		elog
+		elog "glibc not found! You won't be able to play DRM content."
+		elog "See Gentoo bug #910309 or upstream bug #1843683."
+		elog
+	fi
+}
diff --git a/www-client/firefox/firefox-134.0.ebuild b/www-client/firefox/firefox-134.0.ebuild
new file mode 100644
index 000000000000..af9245e50f9b
--- /dev/null
+++ b/www-client/firefox/firefox-134.0.ebuild
@@ -0,0 +1,1371 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-134-patches-01.tar.xz"
+
+LLVM_COMPAT=( 17 18 19 )
+
+# This will also filter rust versions that don't match LLVM_COMPAT in the non-clang path; this is fine.
+RUST_NEEDS_LLVM=1
+
+# If not building with clang we need at least rust 1.76
+RUST_MIN_VER=1.77.1
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.71"
+
+VIRTUALX_REQUIRED="manual"
+
+# Information about the bundled wasi toolchain from
+# https://github.com/WebAssembly/wasi-sdk/
+WASI_SDK_VER=25.0
+WASI_SDK_LLVM_VER=19
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+	HOMEPAGE="https://www.mozilla.org/firefox https://www.mozilla.org/firefox/enterprise/"
+	SLOT="esr"
+else
+	HOMEPAGE="https://www.mozilla.org/firefox"
+	SLOT="rapid"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
+	optfeature pax-utils python-any-r1 readme.gentoo-r1 rust toolchain-funcs virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~juippis/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+DESCRIPTION="Firefox Web Browser"
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}
+	wasm-sandbox? (
+		amd64? ( https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VER/.*/}/wasi-sdk-${WASI_SDK_VER}-x86_64-linux.tar.gz )
+		arm64? ( https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VER/.*/}/wasi-sdk-${WASI_SDK_VER}-arm64-linux.tar.gz )
+	)"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+IUSE="+clang dbus debug eme-free hardened hwaccel jack libproxy pgo pulseaudio sndio selinux"
+IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-jpeg +system-libevent"
+IUSE+=" +system-libvpx system-png +system-webp valgrind wayland wifi +X"
+
+# Firefox-only IUSE
+IUSE+=" +gmp-autoupdate gnome-shell +jumbo-build openh264 +telemetry wasm-sandbox"
+
+# "wasm-sandbox? ( llvm_slot_19 )" - most likely due to wasi-sdk-25.0 being llvm-19 based, and
+# llvm/clang-19 turning on reference types for wasm targets. Luckily clang-19 is already stable in
+# Gentoo so it should be widely adopted already - however, it might be possible to workaround
+# the constraint simply by modifying CFLAGS when using clang-17/18. Will need to investigate (bmo#1905251)
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( jumbo-build )
+	wasm-sandbox? ( llvm_slot_19 )
+	wayland? ( dbus )
+	wifi? ( dbus )
+"
+
+FF_ONLY_DEPEND="!www-client/firefox:0
+	selinux? ( sec-policy/selinux-mozilla )"
+BDEPEND="${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+		clang? (
+			llvm-core/lld:${LLVM_SLOT}
+			pgo? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[profile] )
+		)
+		wasm-sandbox? ( llvm-core/lld:${LLVM_SLOT} )
+	')
+	app-alternatives/awk
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.26.0
+	net-libs/nodejs
+	virtual/pkgconfig
+	amd64? ( >=dev-lang/nasm-2.14 )
+	x86? ( >=dev-lang/nasm-2.14 )
+	pgo? (
+		X? (
+			sys-devel/gettext
+			x11-base/xorg-server[xvfb]
+			x11-apps/xhost
+		)
+		!X? (
+			|| (
+				gui-wm/tinywl
+				<gui-libs/wlroots-0.17.3[tinywl(-)]
+			)
+			x11-misc/xkeyboard-config
+		)
+	)"
+COMMON_DEPEND="${FF_ONLY_DEPEND}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libffi:=
+	>=dev-libs/nss-3.107
+	>=dev-libs/nspr-4.35
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa
+	media-video/ffmpeg
+	sys-libs/zlib
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	x11-libs/pixman
+	dbus? (
+		sys-apps/dbus
+	)
+	jack? ( virtual/jack )
+	pulseaudio? (
+		|| (
+			media-libs/libpulse
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	libproxy? ( net-libs/libproxy )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( >=media-sound/sndio-1.8.0-r1 )
+	system-av1? (
+		>=media-libs/dav1d-1.0.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.8.1:0=
+		!wasm-sandbox? ( >=media-gfx/graphite2-1.3.13 )
+	)
+	system-icu? ( >=dev-libs/icu-73.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
+	system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	valgrind? ( dev-debug/valgrind )
+	wayland? (
+		>=media-libs/libepoxy-1.5.10-r1
+		x11-libs/gtk+:3[wayland]
+	)
+	wifi? (
+		kernel_linux? (
+			|| (
+				net-misc/networkmanager
+				net-misc/connman[networkmanager]
+			)
+			sys-apps/dbus
+		)
+	)
+	X? (
+		virtual/opengl
+		x11-libs/cairo[X]
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXrandr
+		x11-libs/libxcb:=
+	)"
+RDEPEND="${COMMON_DEPEND}
+	hwaccel? (
+		media-video/libva-utils
+		sys-apps/pciutils
+	)
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )"
+DEPEND="${COMMON_DEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libICE
+		x11-libs/libSM
+	)"
+
+# ESR and rapid dependencies.
+if [[ -n ${MOZ_ESR} ]] ; then
+	RDEPEND+=" !www-client/firefox:rapid"
+else
+	RDEPEND+=" !www-client/firefox:esr"
+fi
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version -b "llvm-core/clang:${LLVM_SLOT}" ; then
+		einfo "llvm-core/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && ! tc-ld-is-mold ; then
+		if ! has_version -b "llvm-core/lld:${LLVM_SLOT}" ; then
+			einfo "llvm-core/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+	fi
+
+	if use pgo ; then
+		if ! has_version -b "=llvm-runtimes/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+			einfo "=llvm-runtimes/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
+			einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+# Firefox-only LANGS
+MOZ_LANGS+=( ach )
+MOZ_LANGS+=( an )
+MOZ_LANGS+=( az )
+MOZ_LANGS+=( bn )
+MOZ_LANGS+=( bs )
+MOZ_LANGS+=( ca-valencia )
+MOZ_LANGS+=( eo )
+MOZ_LANGS+=( es-CL )
+MOZ_LANGS+=( es-MX )
+MOZ_LANGS+=( fa )
+MOZ_LANGS+=( ff )
+MOZ_LANGS+=( fur )
+MOZ_LANGS+=( gn )
+MOZ_LANGS+=( gu-IN )
+MOZ_LANGS+=( hi-IN )
+MOZ_LANGS+=( hy-AM )
+MOZ_LANGS+=( ia )
+MOZ_LANGS+=( km )
+MOZ_LANGS+=( kn )
+MOZ_LANGS+=( lij )
+MOZ_LANGS+=( mk )
+MOZ_LANGS+=( mr )
+MOZ_LANGS+=( my )
+MOZ_LANGS+=( ne-NP )
+MOZ_LANGS+=( oc )
+MOZ_LANGS+=( sc )
+MOZ_LANGS+=( sco )
+MOZ_LANGS+=( si )
+MOZ_LANGS+=( skr )
+MOZ_LANGS+=( son )
+MOZ_LANGS+=( szl )
+MOZ_LANGS+=( ta )
+MOZ_LANGS+=( te )
+MOZ_LANGS+=( tl )
+MOZ_LANGS+=( trs )
+MOZ_LANGS+=( ur )
+MOZ_LANGS+=( xh )
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json || die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+virtwl() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
+	[[ -n $XDG_RUNTIME_DIR ]] || die "${FUNCNAME} needs XDG_RUNTIME_DIR to be set; try xdg_environment_reset"
+	tinywl -h >/dev/null || die 'tinywl -h failed'
+
+	local VIRTWL VIRTWL_PID
+	coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY; read _; kill $PPID'; }
+	local -x WAYLAND_DISPLAY
+	read WAYLAND_DISPLAY <&${VIRTWL[0]}
+
+	debug-print "${FUNCNAME}: $@"
+	"$@"
+	local r=$?
+
+	[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
+	exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
+	return $r
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use debug ; then
+			CHECKREQS_DISK_BUILD="14300M"
+		elif tc-is-lto ; then
+			CHECKREQS_DISK_BUILD="10600M"
+		else
+			CHECKREQS_DISK_BUILD="6800M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+
+	# Get LTO from environment; export after this phase for use in src_configure (etc)
+	use_lto=no
+
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+
+		if tc-is-lto; then
+			use_lto=yes
+			# LTO is handled via configure
+			filter-lto
+		fi
+
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		if [[ ${use_lto} = yes ]]; then
+			# -Werror=lto-type-mismatch -Werror=odr are going to fail with GCC,
+			# bmo#1516758, bgo#942288
+			filter-flags -Werror=lto-type-mismatch -Werror=odr
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use debug ; then
+			CHECKREQS_DISK_BUILD="14300M"
+		elif [[ ${use_lto} == "yes" ]] ; then
+			CHECKREQS_DISK_BUILD="10600M"
+		else
+			CHECKREQS_DISK_BUILD="6800M"
+		fi
+
+		check-reqs_pkg_setup
+		llvm-r1_pkg_setup
+		rust_pkg_setup
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if use pgo ; then
+			# Update 105.0: "/proc/self/oom_score_adj" isn't enough anymore with pgo, but not sure
+			# whether that's due to better OOM handling by Firefox (bmo#1771712), or portage
+			# (PORTAGE_SCHEDULING_POLICY) update...
+			addpredict /proc
+
+			# Clear tons of conditions, since PGO is hardware-dependant.
+			addpredict /dev
+		fi
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+
+	export use_lto
+
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	if [[ ${use_lto} == "yes" ]]; then
+		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
+	fi
+
+	# Workaround for bgo#915651 on musl
+	if use elibc_glibc ; then
+		rm -v "${WORKDIR}"/firefox-patches/*bgo-748849-RUST_TARGET_override.patch || die
+	fi
+
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make cargo respect MAKEOPTS
+	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
+
+	# Workaround for bgo#915651
+	if ! use elibc_glibc ; then
+		if use amd64 ; then
+			export RUST_TARGET="x86_64-unknown-linux-musl"
+		elif use x86 ; then
+			export RUST_TARGET="i686-unknown-linux-musl"
+		elif use arm64 ; then
+			export RUST_TARGET="aarch64-unknown-linux-musl"
+		elif use ppc64 ; then
+			export RUST_TARGET="powerpc64le-unknown-linux-musl"
+		elif use riscv ; then
+			# We can pretty safely rule out any 32-bit riscvs, but 64-bit riscvs also have tons of
+			# different ABIs available. riscv64gc-unknown-linux-musl seems to be the best working
+			# guess right now though.
+			elog "riscv detected, forcing a riscv64 target for now."
+			export RUST_TARGET="riscv64gc-unknown-linux-musl"
+		else
+			die "Unknown musl chost, please post a new bug with your rustc -vV along with emerge --info"
+		fi
+	fi
+
+	# Pre-built wasm-sandbox path manipulation.
+	if use wasm-sandbox ; then
+		if use amd64 ; then
+			export wasi_arch="x86_64"
+		elif use arm64 ; then
+			export wasi_arch="arm64"
+		else
+			die "wasm-sandbox enabled on unknown/unsupported arch!"
+		fi
+
+		sed -i \
+			-e "s:%%PORTAGE_WORKDIR%%:${WORKDIR}:" \
+			-e "s:%%WASI_ARCH%%:${wasi_arch}:" \
+			-e "s:%%WASI_SDK_VER%%:${WASI_SDK_VER}:" \
+			-e "s:%%WASI_SDK_LLVM_VER%%:${WASI_SDK_LLVM_VER}:" \
+			toolkit/moz.configure || die "Failed to update wasi-related paths."
+	fi
+
+	# Make LTO respect MAKEOPTS
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/chromium/build/toolchain/get_cpu_count.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/python/gyp/pylib/gyp/input.py || die "Failed sedding multiprocessing.cpu_count"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py || die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py || die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clear checksums from cargo crates we've manually patched.
+	# moz_clear_vendor_checksums xyz
+
+	# Respect choice for "jumbo-build"
+	# Changing the value for FILES_PER_UNIFIED_FILE may not work, see #905431
+	if [[ -n ${FILES_PER_UNIFIED_FILE} ]] && use jumbo-build; then
+		local my_files_per_unified_file=${FILES_PER_UNIFIED_FILE:=16}
+		elog ""
+		elog "jumbo-build defaults modified to ${my_files_per_unified_file}."
+		elog "if you get a build failure, try undefining FILES_PER_UNIFIED_FILE,"
+		elog "if that fails try -jumbo-build before opening a bug report."
+		elog ""
+
+		sed -i -e "s/\"FILES_PER_UNIFIED_FILE\", 16/\"FILES_PER_UNIFIED_FILE\", "${my_files_per_unified_file}"/" \
+			python/mozbuild/mozbuild/frontend/data.py ||
+				die "Failed to adjust FILES_PER_UNIFIED_FILE in python/mozbuild/mozbuild/frontend/data.py"
+		sed -i -e "s/FILES_PER_UNIFIED_FILE = 6/FILES_PER_UNIFIED_FILE = "${my_files_per_unified_file}"/" \
+			js/src/moz.build ||
+				die "Failed to adjust FILES_PER_UNIFIED_FILE in js/src/moz.build"
+	fi
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+
+		local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }')
+		[[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}")
+		[[ -z ${version_clang} ]] && die "Failed to read clang version!"
+
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
+
+		AR=llvm-ar
+		CC=${CHOST}-clang-${version_clang}
+		CXX=${CHOST}-clang++-${version_clang}
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain,
+	# AS is used in a non-standard way by upstream, #bmo1654031
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
+
+	# Configuration tests expect llvm-readelf output, bug 913130
+	READELF="llvm-readelf"
+
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB READELF PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=browser
+	mozconfig_add_options_ac '' --enable-project=browser
+
+	# Set Gentoo defaults
+	if use telemetry; then
+		export MOZILLA_OFFICIAL=1
+	fi
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-disk-remnant-avoidance \
+		--disable-geckodriver \
+		--disable-install-strip \
+		--disable-legacy-profile-creation \
+		--disable-parental-controls \
+		--disable-strip \
+		--disable-tests \
+		--disable-updater \
+		--disable-wmf \
+		--enable-negotiateauth \
+		--enable-new-pass-manager \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--enable-system-policies \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${ESYSROOT}/usr/include" \
+		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	# For future keywording: This is currently (97.0) only supported on:
+	# amd64, arm, arm64 & x86.
+	# Might want to flip the logic around if Firefox is to support more arches.
+	# bug 833001, bug 903411#c8
+	if use ppc64 || use riscv; then
+		mozconfig_add_options_ac '' --disable-sandbox
+	elif use valgrind; then
+		mozconfig_add_options_ac 'valgrind requirement' --disable-sandbox
+	else
+		mozconfig_add_options_ac '' --enable-sandbox
+	fi
+
+	# Enable JIT on riscv64 explicitly
+	# Can be removed once upstream enable it by default in the future.
+	use riscv && mozconfig_add_options_ac 'Enable JIT for RISC-V 64' --enable-jit
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-png
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+	mozconfig_use_enable libproxy
+	mozconfig_use_enable valgrind
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+
+		# Increase the FORTIFY_SOURCE value, #910071.
+		sed -i -e '/-D_FORTIFY_SOURCE=/s:2:3:' "${S}"/build/moz.configure/toolchain.configure || die
+	fi
+
+	local myaudiobackends=""
+	use jack && myaudiobackends+="jack,"
+	use sndio && myaudiobackends+="sndio,"
+	use pulseaudio && myaudiobackends+="pulseaudio,"
+	! use pulseaudio && myaudiobackends+="alsa,"
+
+	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
+
+	mozconfig_use_enable wifi necko-wifi
+
+	! use jumbo-build && mozconfig_add_options_ac '--disable-unified-build' --disable-unified-build
+
+	if use X && use wayland ; then
+		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
+	elif ! use X && use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland-only
+	else
+		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3-x11-only
+	fi
+
+	# wasm-sandbox
+	# Since graphite2 is one of the sandboxed libraries, system-graphite2 obviously can't work with +wasm-sandbox.
+	if use wasm-sandbox ; then
+		mozconfig_add_options_ac '+wasm-sandbox' --with-wasi-sysroot="${WORKDIR}/wasi-sdk-${WASI_SDK_VER}-${wasi_arch}-linux/share/wasi-sysroot/"
+	else
+		mozconfig_add_options_ac 'no wasm-sandbox' --without-wasm-sandboxed-libraries
+		mozconfig_use_with system-harfbuzz system-graphite2
+	fi
+
+	if [[ ${use_lto} == "yes" ]] ; then
+		if use clang ; then
+			# Upstream only supports lld or mold when using clang.
+			if tc-ld-is-mold ; then
+				# mold expects the -flto line from *FLAGS configuration, bgo#923119
+				append-ldflags "-flto=thin"
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+			fi
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+
+		else
+			# ThinLTO is currently broken, see bmo#1644409.
+			# mold does not support gcc+lto combination.
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# lld is upstream's default
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+			fi
+
+		else
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "linker is set to bfd due to USE=-clang" --enable-linker=bfd
+			fi
+		fi
+	fi
+
+	# PGO was moved outside lto block to allow building pgo without lto.
+	if use pgo ; then
+		mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+		if use clang ; then
+			# Used in build/pgo/profileserver.py
+			export LLVM_PROFDATA="llvm-profdata"
+		fi
+	fi
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+		mozconfig_add_options_ac '+debug' --enable-jemalloc
+		mozconfig_add_options_ac '+debug' --enable-real-time-tracing
+	else
+		mozconfig_add_options_ac 'Gentoo defaults' --disable-real-time-tracing
+
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# elf-hack
+	# Filter "-z,pack-relative-relocs" and let the build system handle it instead.
+	if use amd64 || use x86 ; then
+		filter-flags "-z,pack-relative-relocs"
+
+		if tc-ld-is-mold ; then
+			# relr-elf-hack is currently broken with mold, bgo#916259
+			mozconfig_add_options_ac 'disable elf-hack with mold linker' --disable-elf-hack
+		else
+			mozconfig_add_options_ac 'relr elf-hack' --enable-elf-hack=relr
+		fi
+	elif use ppc64 || use riscv ; then
+		# '--disable-elf-hack' is not recognized on ppc64/riscv,
+		# see bgo #917049, #930046
+		:;
+	else
+		mozconfig_add_options_ac 'disable elf-hack on non-supported arches' --disable-elf-hack
+	fi
+
+	if ! use elibc_glibc; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	if use valgrind; then
+		mozconfig_add_options_ac 'valgrind requirement' --disable-jemalloc
+	fi
+
+	# System-av1 fix
+	use system-av1 && append-ldflags "-Wl,--undefined-version"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+
+	if ! use telemetry; then
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_CRASHREPORTER=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_DATA_REPORTING=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_SERVICES_HEALTHREPORT=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_TELEMETRY_REPORTING=0"
+	fi
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	if use valgrind; then
+		sed -i -e 's/--enable-optimize=-O[0-9s]/--enable-optimize="-g -O2"/' .mozconfig || die
+	fi
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if [[ ${use_lto} == "yes" ]] && tc-ld-is-mold; then
+		# increase ulimit with mold+lto, bugs #892641, #907485
+		if ! ulimit -n 16384 1>/dev/null 2>&1 ; then
+			ewarn "Unable to modify ulimits - building with mold+lto might fail due to low ulimit -n resources."
+			ewarn "Please see bugs #892641 & #907485."
+		else
+			ulimit -n 16384
+		fi
+	fi
+
+	if use pgo; then
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+
+		if ! use X; then
+			virtx_cmd=virtwl
+		else
+			virtx_cmd=virtx
+		fi
+	fi
+
+	if ! use X; then
+		local -x GDK_BACKEND=wayland
+	else
+		local -x GDK_BACKEND=x11
+	fi
+
+	${virtx_cmd} ./mach build --verbose || die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from llvm-core/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path", "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r2 \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+
+		if use wayland; then
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
+			pref("gfx.x11-egl.force-enabled", false);
+			EOF
+		else
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
+			pref("gfx.x11-egl.force-enabled", true);
+			EOF
+		fi
+
+		# Install the vaapitest binary on supported arches (122.0 supports all platforms, bmo#1865969)
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/vaapitest
+
+		# Install the v4l2test on supported arches (+ arm, + riscv64 when keyworded)
+		if use arm64 ; then
+			exeinto "${MOZILLA_FIVE_HOME}"
+			doexe "${BUILD_DIR}"/dist/bin/v4l2test
+		fi
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate", false);
+			EOF
+		done
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Add telemetry config prefs, just in case something happens in future and telemetry build
+	# options stop working.
+	if ! use telemetry ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set telemetry prefs"
+		sticky_pref("toolkit.telemetry.dap_enabled", false);
+		pref("toolkit.telemetry.dap_helper", "");
+		pref("toolkit.telemetry.dap_leader", "");
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/browser/branding/official"
+	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^}"
+	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if [[ -n ${MOZ_ESR} ]] ; then
+		local desktop_filename="${PN}-esr.desktop"
+	else
+		local desktop_filename="${PN}.desktop"
+	fi
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" || die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	if use gnome-shell ; then
+		# Install search provider for Gnome
+		insinto /usr/share/gnome-shell/search-providers/
+		doins browser/components/shell/search-provider-files/org.mozilla.firefox.search-provider.ini
+
+		insinto /usr/share/dbus-1/services/
+		doins browser/components/shell/search-provider-files/org.mozilla.firefox.SearchProvider.service
+
+		# Toggle between rapid and esr desktop file names
+		if [[ -n ${MOZ_ESR} ]] ; then
+			sed -e "s/firefox.desktop/${desktop_filename}/g" \
+				-i "${ED}/usr/share/gnome-shell/search-providers/org.mozilla.firefox.search-provider.ini" ||
+					die "Failed to sed org.mozilla.firefox.search-provider.ini file."
+		fi
+
+		# Make the dbus service aware of a previous session, bgo#939196
+		sed -e \
+			"s/Exec=\/usr\/bin\/firefox/Exec=\/usr\/$(get_libdir)\/firefox\/firefox --dbus-service \/usr\/bin\/firefox/g" \
+			-i "${ED}/usr/share/dbus-1/services/org.mozilla.firefox.SearchProvider.service" ||
+				die "Failed to sed org.mozilla.firefox.SearchProvider.service dbus file"
+
+		# Update prefs to enable Gnome search provider
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to enable gnome-search-provider via prefs"
+		pref("browser.gnome-search-provider.enabled", true);
+		EOF
+	fi
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	# bug 835078
+	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
+		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
+		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
+		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
+		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
+	fi
+
+	readme.gentoo_print_elog
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+	optfeature "screencasting with pipewire" sys-apps/xdg-desktop-portal
+	if use hwaccel && has_version "x11-drivers/nvidia-drivers"; then
+		optfeature "hardware acceleration with NVIDIA cards" media-libs/nvidia-vaapi-driver
+	fi
+
+	if ! has_version "sys-libs/glibc"; then
+		elog
+		elog "glibc not found! You won't be able to play DRM content."
+		elog "See Gentoo bug #910309 or upstream bug #1843683."
+		elog
+	fi
+}
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index 0d8cb0c75363..8508735d5c7c 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -38,6 +38,7 @@
 	<flag name="system-webp">Use the system-wide <pkg>media-libs/libwebp</pkg>
 		instead of bundled</flag>
 	<flag name="wasm">Sandbox certain third-party libraries through WebAssembly using RLBox</flag>
+	<flag name="wasm-sandbox">Sandbox certain third-party libraries through WebAssembly using RLBox</flag>
 	<flag name="wifi">Enable necko-wifi for NetworkManager integration, and access point MAC
 		address scanning for better precision with opt-in geolocation services</flag>
 </use>
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index b4388f2bb7cb..5215a7f1e6f3 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1 +1 @@
-DIST google-chrome-beta_132.0.6834.57-1_amd64.deb 112536512 BLAKE2B efd0ca05596f5fb14126807c174be47485d71066b3ba06ee80edf57cd54007813cfd003372efb564661796873b3c688ca66665c839b4b3c5d620ae868c7949c6 SHA512 7048e514f585703bcbec1f87be67a34e8f3324d1df6d8307cd540cd16047f86d805fd26ae8cdaf068c1cceacdf0281b1382adcde395096f4ba31cb9a8311e825
+DIST google-chrome-beta_133.0.6943.16-1_amd64.deb 114090924 BLAKE2B e01d4785a1709c0722de2c9473333a9899abf060cb6ef43ba1f1c06e04977f4824fd7b5415cecc45e0e93cd09f31ea8376fd04416b30c26cdad73060cd8f9c07 SHA512 2772aa95d60c86644815af0a0c317ef7a77aea0b6e526239f8d317f146262d6bd00621342ca13cbd5aee91d94bc3543e9aabbfc8a196f34a619434942c134657
diff --git a/www-client/google-chrome-beta/google-chrome-beta-132.0.6834.57.ebuild b/www-client/google-chrome-beta/google-chrome-beta-132.0.6834.57.ebuild
deleted file mode 100644
index dd9e9c497aea..000000000000
--- a/www-client/google-chrome-beta/google-chrome-beta-132.0.6834.57.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 2011-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-inherit chromium-2 desktop pax-utils unpacker xdg
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-S=${WORKDIR}
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-IUSE="qt5 qt6 selinux"
-
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	>=dev-libs/nss-3.26
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/glibc
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	|| (
-		x11-libs/gtk+:3[X]
-		gui-libs/gtk:4[X]
-	)
-	x11-libs/libdrm
-	>=x11-libs/libX11-1.5.0
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-	x11-misc/xdg-utils
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[X]
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-	selinux? ( sec-policy/selinux-chromium )
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
-		rm usr/share/man/man1/google-chrome.1.gz || die
-		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
-	fi
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if ! use qt5; then
-		rm "${CHROME_HOME}/libqt5_shim.so" || die
-	fi
-	if ! use qt6; then
-		rm "${CHROME_HOME}/libqt6_shim.so" || die
-	fi
-
-	local suffix=
-	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
-	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-}
diff --git a/www-client/google-chrome-beta/google-chrome-beta-133.0.6943.16.ebuild b/www-client/google-chrome-beta/google-chrome-beta-133.0.6943.16.ebuild
new file mode 100644
index 000000000000..edbd80731e3d
--- /dev/null
+++ b/www-client/google-chrome-beta/google-chrome-beta-133.0.6943.16.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2011-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk ur vi zh-CN zh-TW"
+
+inherit chromium-2 desktop pax-utils unpacker xdg
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+S=${WORKDIR}
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+IUSE="qt5 qt6 selinux"
+
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	>=dev-libs/nss-3.26
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/glibc
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	|| (
+		x11-libs/gtk+:3[X]
+		gui-libs/gtk:4[X]
+	)
+	x11-libs/libdrm
+	>=x11-libs/libX11-1.5.0
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+	x11-misc/xdg-utils
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+	selinux? ( sec-policy/selinux-chromium )
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
+		rm usr/share/man/man1/google-chrome.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
+	fi
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if ! use qt5; then
+		rm "${CHROME_HOME}/libqt5_shim.so" || die
+	fi
+	if ! use qt6; then
+		rm "${CHROME_HOME}/libqt6_shim.so" || die
+	fi
+
+	local suffix=
+	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
+	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+}
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index ac564aa7d0a5..78eb2d4dbee9 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1 +1 @@
-DIST google-chrome-unstable_133.0.6905.0-1_amd64.deb 114266772 BLAKE2B fb232825db06d805ce9cb35c84eb0a9a8bb58bea4b5c2222cb24309bfb5f09f8804f3e08b2276192ab9adf1f0f404ab5270b01430c882931ba7573708fe9bfef SHA512 df1145cddba76c25b3197da939802604fe70eece62e93305ad151bdbc1e027db92f214cb8634ed32ba1d99dd215ad692197404bd4b0af116ef71964cc154bc7b
+DIST google-chrome-unstable_134.0.6958.2-1_amd64.deb 114406436 BLAKE2B d6e635a6609c2f00c9cd4ec1089e9f5a8d8a0184256c81db122853cbd910ef91a7eae3d02be87aecde6ece336336a703227a81aaa12202f5fdd8c0fa776f4e6f SHA512 04a6b931b52c35a32cedbc4dea2734479af753310d27b8ef4cd510c5c640ec151358de4964b84974fe89912daec7a9e52b058b7063177dd2dc374003904b929f
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-133.0.6905.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-133.0.6905.0.ebuild
deleted file mode 100644
index dd9e9c497aea..000000000000
--- a/www-client/google-chrome-unstable/google-chrome-unstable-133.0.6905.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 2011-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-inherit chromium-2 desktop pax-utils unpacker xdg
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-S=${WORKDIR}
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-IUSE="qt5 qt6 selinux"
-
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	>=dev-libs/nss-3.26
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/glibc
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	|| (
-		x11-libs/gtk+:3[X]
-		gui-libs/gtk:4[X]
-	)
-	x11-libs/libdrm
-	>=x11-libs/libX11-1.5.0
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-	x11-misc/xdg-utils
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[X]
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-	selinux? ( sec-policy/selinux-chromium )
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
-		rm usr/share/man/man1/google-chrome.1.gz || die
-		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
-	fi
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if ! use qt5; then
-		rm "${CHROME_HOME}/libqt5_shim.so" || die
-	fi
-	if ! use qt6; then
-		rm "${CHROME_HOME}/libqt6_shim.so" || die
-	fi
-
-	local suffix=
-	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
-	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-}
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-134.0.6958.2.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-134.0.6958.2.ebuild
new file mode 100644
index 000000000000..edbd80731e3d
--- /dev/null
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-134.0.6958.2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2011-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk ur vi zh-CN zh-TW"
+
+inherit chromium-2 desktop pax-utils unpacker xdg
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+S=${WORKDIR}
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+IUSE="qt5 qt6 selinux"
+
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	>=dev-libs/nss-3.26
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/glibc
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	|| (
+		x11-libs/gtk+:3[X]
+		gui-libs/gtk:4[X]
+	)
+	x11-libs/libdrm
+	>=x11-libs/libX11-1.5.0
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+	x11-misc/xdg-utils
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+	selinux? ( sec-policy/selinux-chromium )
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
+		rm usr/share/man/man1/google-chrome.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
+	fi
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if ! use qt5; then
+		rm "${CHROME_HOME}/libqt5_shim.so" || die
+	fi
+	if ! use qt6; then
+		rm "${CHROME_HOME}/libqt6_shim.so" || die
+	fi
+
+	local suffix=
+	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
+	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+}
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index a789753d7703..7aa55ade565d 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1 +1 @@
-DIST google-chrome-stable_131.0.6778.204-1_amd64.deb 112770956 BLAKE2B 73c69f9ef4ea5a8400121886c9e6a1b671434cbd12a34222517390390c3e5c1cab9a3abe2995f5bbe45d2a9410390de3d1d04f3d787670deb91e0c3b0521f1c6 SHA512 e3d7ffbb51ef3a251358ddf67ec36c7ff45c5a6eaa8b118e93fd26212a024f369f017b92808fa9681e8e8452e8da77c9cd693a67d33d729685fd66673e8f6fc2
+DIST google-chrome-stable_132.0.6834.83-1_amd64.deb 112253548 BLAKE2B 1e1b263174d97493820e28fc5cc538a216c5436881938fe6dc1b139d9111450f691c4095803f4ffdff2325d7d823a146f99741b48b1cf664547b2ca7bf7074a8 SHA512 3e8b9fcf711f89241b17071f1187021d651c5ea147395e1d12f1d9f47e7b1f0704fc217bb2fa04b13ee3c8b6eac2f84da4a26140c536c03dd5ae466afa033d5c
diff --git a/www-client/google-chrome/google-chrome-131.0.6778.204.ebuild b/www-client/google-chrome/google-chrome-131.0.6778.204.ebuild
deleted file mode 100644
index a6673ff33b80..000000000000
--- a/www-client/google-chrome/google-chrome-131.0.6778.204.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 2011-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-inherit chromium-2 desktop pax-utils unpacker xdg
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-S=${WORKDIR}
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* amd64"
-
-IUSE="qt5 qt6 selinux"
-
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	>=dev-libs/nss-3.26
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/glibc
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	|| (
-		x11-libs/gtk+:3[X]
-		gui-libs/gtk:4[X]
-	)
-	x11-libs/libdrm
-	>=x11-libs/libX11-1.5.0
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-	x11-misc/xdg-utils
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[X]
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-	selinux? ( sec-policy/selinux-chromium )
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
-		rm usr/share/man/man1/google-chrome.1.gz || die
-		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
-	fi
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if ! use qt5; then
-		rm "${CHROME_HOME}/libqt5_shim.so" || die
-	fi
-	if ! use qt6; then
-		rm "${CHROME_HOME}/libqt6_shim.so" || die
-	fi
-
-	local suffix=
-	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
-	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-}
diff --git a/www-client/google-chrome/google-chrome-132.0.6834.83.ebuild b/www-client/google-chrome/google-chrome-132.0.6834.83.ebuild
new file mode 100644
index 000000000000..f579ec5a9cbc
--- /dev/null
+++ b/www-client/google-chrome/google-chrome-132.0.6834.83.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2011-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk ur vi zh-CN zh-TW"
+
+inherit chromium-2 desktop pax-utils unpacker xdg
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+S=${WORKDIR}
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* amd64"
+
+IUSE="qt5 qt6 selinux"
+
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	>=dev-libs/nss-3.26
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/glibc
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	|| (
+		x11-libs/gtk+:3[X]
+		gui-libs/gtk:4[X]
+	)
+	x11-libs/libdrm
+	>=x11-libs/libX11-1.5.0
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+	x11-misc/xdg-utils
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+	selinux? ( sec-policy/selinux-chromium )
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
+		rm usr/share/man/man1/google-chrome.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
+	fi
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if ! use qt5; then
+		rm "${CHROME_HOME}/libqt5_shim.so" || die
+	fi
+	if ! use qt6; then
+		rm "${CHROME_HOME}/libqt6_shim.so" || die
+	fi
+
+	local suffix=
+	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
+	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+}
diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index 43d4ff97bfa7..c866684c01d1 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -1,2 +1 @@
-DIST luakit-2.3.3.tar.gz 507343 BLAKE2B 4b9c3b3e4d5ff50f1c7409cf8f77ca7c81032f13051c3cca2aef4f794ee159fd12c5bfe0706e74414056899ef64330e888fe141256e52bc6d89eb572cca975e0 SHA512 ae5088541118c693db4a90f7e727d1f4094b56d4ea4cd51d2019351ff6b44672a1d7b9f80b351a37767556564b68633d815649ceaa4d8bd3b966a20a155ba2b2
 DIST luakit-2.3.6.tar.gz 508466 BLAKE2B 2f5d727349a72c3f9ec9e10030f9e916e7f0ba50e66f94c96973215595ebb6105d198f9b5efcaae93a90dc1f0b898753253bd5cb1c071a06413e84e31120ce1c SHA512 0f6fe8f4805fe5ee7de5534534e3ad3d2c459aad152d3b5598e7c25d9c06cfee177098cbcd305bbcd351733dea7e03370139a7ecbd1b022b8cee8da6ca242e1c
diff --git a/www-client/luakit/luakit-2.3.3-r1.ebuild b/www-client/luakit/luakit-2.3.3-r1.ebuild
deleted file mode 100644
index 52b701f85e4a..000000000000
--- a/www-client/luakit/luakit-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 luajit )
-
-inherit lua-single toolchain-funcs xdg
-
-DESCRIPTION="A fast, extensible, and customizable web browser"
-HOMEPAGE="https://luakit.github.io/luakit"
-
-SRC_URI="https://github.com/luakit/luakit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm64"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="doc test"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	net-libs/webkit-gtk:4=
-	x11-libs/gtk+:3
-	${LUA_DEPS}
-	$(lua_gen_cond_dep '
-		dev-lua/luafilesystem[${LUA_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		dev-lua/luafilesystem
-		app-text/doxygen
-		media-gfx/graphviz
-	)
-	test? (
-		$(lua_gen_cond_dep '
-			dev-lua/luassert[${LUA_USEDEP}]
-			dev-lua/luacheck[${LUA_USEDEP}]
-		')
-		x11-base/xorg-server[xvfb]
-	)
-"
-src_configure() {
-	export LUA_BIN_NAME=${ELUA}
-	export LUA_PKG_NAME=${ELUA}
-	tc-export CC PKG_CONFIG
-}
-
-src_compile() {
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		USE_LUAJIT=$(usex lua_single_target_luajit 1 0) \
-		${PN} ${PN}.so
-
-	use doc && emake doc
-}
-
-src_test() {
-	local failing_test
-	for failing_test in test_clib_luakit test_image_css; do
-		mv tests/async/${failing_test}.lua{,.disabled} || die
-	done
-
-	emake \
-		USE_LUAJIT=$(usex lua_single_target_luajit 1 0) \
-		run-tests
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		PREFIX="${EPREFIX}/usr" \
-		USE_LUAJIT=$(usex lua_single_target_luajit 1 0) \
-		XDGPREFIX="${EPREFIX}/etc/xdg" \
-		install
-
-	rm "${ED}/usr/share/doc/${PF}/COPYING.GPLv3" || die
-
-	use doc && dodoc -r doc/html
-}
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index ce32fb367bbe..966c63a4c435 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,3 +1,3 @@
-DIST microsoft-edge-beta_132.0.2957.26-1_amd64.deb 168158222 BLAKE2B d73d4033933d4bc70ebbfd521bb273c417c202879b27e11c3e7a5a904b46b57bf068b07e083ce4a923be3407569eba56ce2d70beb0cf4b9623f1433c8c89acc1 SHA512 d059d16a8e770e37376648c21616a87eb5733df0ceb3d9c1b4b5e6aaced95d481e65187abc10415216ab4e40f6ed7c6a955bb7be6f216327cbff1a03ed3e40ec
-DIST microsoft-edge-beta_132.0.2957.41-1_amd64.deb 168122314 BLAKE2B 6258dcef23958c087bae8fe964a3392ef96ff979dcbf58d4f734e1bcd72cd316c0ef58ed29114d9dd4aba61d720313663430d08a251ff96586b1abbf935a4438 SHA512 502019af5ce65619675f55896cc4e488c4df57ebcfc16703eb6048e3657e3c9dd46575fdcd482d23f29ac5106703ab163b7d0acb9474d0fa45165c0972d1d306
-DIST microsoft-edge-beta_132.0.2957.55-1_amd64.deb 168243378 BLAKE2B d9df026a906be25c740b7cbd7396ef53a8cc584da1a402a1a69885621151cad149cec1c13a8ec5450e6ace80d1c8633e3e734f5a9e425aca5450a968d08f41f8 SHA512 d1d37a878211d875debe855b8e3d57db624d42264047deb4ca8fd7c9613a86c2fc6245ceca44530a9dfaac0d2fea1752e3d2e2435c3443da3ae40c0bd87092a1
+DIST microsoft-edge-beta_132.0.2957.106-1_amd64.deb 168228374 BLAKE2B 409f4c72731f60810796f17fae40f07b33d813bf751ee54439c85ba15f8bc3b6ad2010a51b2a41e525d79a41d2435ac15b5d6992dcdae0f5e5c22239ba2ffd42 SHA512 b0e5d90b66f39595505526776a74678457d3d7b3b268e38e309c34f8f8dc702e3b10a92c2c091ec868b1e1bdc216901bd0ca633bb3e991573aaec1eb7e5614ec
+DIST microsoft-edge-beta_132.0.2957.111-1_amd64.deb 168276318 BLAKE2B d620074731ae9af2162d76fdb977c8fd44655794cdec09ca418344df092c3b0e681c417496467d63fed886e73ec374b152c247ef2b9089274b97e17d38d793b3 SHA512 5ee59f429e3cac4d8b67ad569fd4e27368b307c58b5303fe19e12aafb0a0245449a501350dae999335832301d583af8304a6b66e717dfb9614fc502ec6234297
+DIST microsoft-edge-beta_133.0.3065.10-1_amd64.deb 169738070 BLAKE2B 30231288a498b65809c242abe2fdfa520b0a83aa0e038e540dc9819765e1bc58d12cc6dad32f62de3ad69207310d0641d00494f6ff94b6d7a3d6931a61d82aff SHA512 91d1417930a8403c096de56e1134939529df5eacf02545f7cf6c6557a1590892d859bc8910041bbb0e6e3ffb4cfa4226ff2b01ff3a49bd6cb15b55dd9ab7d3f9
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-132.0.2957.106.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-132.0.2957.106.ebuild
new file mode 100644
index 000000000000..32c5a4f611f9
--- /dev/null
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-132.0.2957.106.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2011-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit chromium-2 desktop pax-utils unpacker xdg
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/edge"
+
+if [[ ${PN} == microsoft-edge ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
+S=${WORKDIR}
+
+LICENSE="microsoft-edge"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+IUSE="+mip qt5 qt6"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl[ssl]
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+	x11-misc/xdg-utils
+	mip? ( app-crypt/libsecret )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -f _gpgorigin || die
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/${PN}.1.gz ]]; then
+		rm usr/share/man/man1/${PN}.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/${PN}.1
+	fi
+
+	local suffix=
+	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	if ! use mip; then
+		rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die
+	fi
+
+	if ! use qt5; then
+		rm "${EDGE_HOME}/libqt5_shim.so" || die
+	fi
+	if ! use qt6; then
+		rm "${EDGE_HOME}/libqt6_shim.so" || die
+	fi
+
+	pax-mark m "${EDGE_HOME}/msedge"
+}
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-132.0.2957.111.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-132.0.2957.111.ebuild
new file mode 100644
index 000000000000..32c5a4f611f9
--- /dev/null
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-132.0.2957.111.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2011-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit chromium-2 desktop pax-utils unpacker xdg
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/edge"
+
+if [[ ${PN} == microsoft-edge ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
+S=${WORKDIR}
+
+LICENSE="microsoft-edge"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+IUSE="+mip qt5 qt6"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl[ssl]
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+	x11-misc/xdg-utils
+	mip? ( app-crypt/libsecret )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -f _gpgorigin || die
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/${PN}.1.gz ]]; then
+		rm usr/share/man/man1/${PN}.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/${PN}.1
+	fi
+
+	local suffix=
+	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	if ! use mip; then
+		rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die
+	fi
+
+	if ! use qt5; then
+		rm "${EDGE_HOME}/libqt5_shim.so" || die
+	fi
+	if ! use qt6; then
+		rm "${EDGE_HOME}/libqt6_shim.so" || die
+	fi
+
+	pax-mark m "${EDGE_HOME}/msedge"
+}
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-132.0.2957.26.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-132.0.2957.26.ebuild
deleted file mode 100644
index 0ff710cc5ddc..000000000000
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-132.0.2957.26.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 2011-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit chromium-2 desktop pax-utils unpacker xdg
-
-DESCRIPTION="The web browser from Microsoft"
-HOMEPAGE="https://www.microsoft.com/edge"
-
-if [[ ${PN} == microsoft-edge ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
-S=${WORKDIR}
-
-LICENSE="microsoft-edge"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-IUSE="+mip qt5 qt6"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl[ssl]
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-	x11-misc/xdg-utils
-	mip? ( app-crypt/libsecret )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[X]
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
-EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "microsoft-edge only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -f _gpgorigin || die
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-	if [[ -L usr/share/man/man1/${PN}.1.gz ]]; then
-		rm usr/share/man/man1/${PN}.1.gz || die
-		dosym ${MY_PN}.1 usr/share/man/man1/${PN}.1
-	fi
-
-	local suffix=
-	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
-	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	if ! use mip; then
-		rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die
-	fi
-
-	if ! use qt5; then
-		rm "${EDGE_HOME}/libqt5_shim.so" || die
-	fi
-	if ! use qt6; then
-		rm "${EDGE_HOME}/libqt6_shim.so" || die
-	fi
-
-	pax-mark m "${EDGE_HOME}/msedge"
-}
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-132.0.2957.41.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-132.0.2957.41.ebuild
deleted file mode 100644
index 0ff710cc5ddc..000000000000
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-132.0.2957.41.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 2011-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit chromium-2 desktop pax-utils unpacker xdg
-
-DESCRIPTION="The web browser from Microsoft"
-HOMEPAGE="https://www.microsoft.com/edge"
-
-if [[ ${PN} == microsoft-edge ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
-S=${WORKDIR}
-
-LICENSE="microsoft-edge"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-IUSE="+mip qt5 qt6"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl[ssl]
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-	x11-misc/xdg-utils
-	mip? ( app-crypt/libsecret )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[X]
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
-EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "microsoft-edge only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -f _gpgorigin || die
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-	if [[ -L usr/share/man/man1/${PN}.1.gz ]]; then
-		rm usr/share/man/man1/${PN}.1.gz || die
-		dosym ${MY_PN}.1 usr/share/man/man1/${PN}.1
-	fi
-
-	local suffix=
-	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
-	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	if ! use mip; then
-		rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die
-	fi
-
-	if ! use qt5; then
-		rm "${EDGE_HOME}/libqt5_shim.so" || die
-	fi
-	if ! use qt6; then
-		rm "${EDGE_HOME}/libqt6_shim.so" || die
-	fi
-
-	pax-mark m "${EDGE_HOME}/msedge"
-}
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-132.0.2957.55.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-132.0.2957.55.ebuild
deleted file mode 100644
index 0ff710cc5ddc..000000000000
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-132.0.2957.55.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 2011-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit chromium-2 desktop pax-utils unpacker xdg
-
-DESCRIPTION="The web browser from Microsoft"
-HOMEPAGE="https://www.microsoft.com/edge"
-
-if [[ ${PN} == microsoft-edge ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
-S=${WORKDIR}
-
-LICENSE="microsoft-edge"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-IUSE="+mip qt5 qt6"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl[ssl]
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-	x11-misc/xdg-utils
-	mip? ( app-crypt/libsecret )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[X]
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
-EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "microsoft-edge only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -f _gpgorigin || die
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-	if [[ -L usr/share/man/man1/${PN}.1.gz ]]; then
-		rm usr/share/man/man1/${PN}.1.gz || die
-		dosym ${MY_PN}.1 usr/share/man/man1/${PN}.1
-	fi
-
-	local suffix=
-	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
-	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	if ! use mip; then
-		rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die
-	fi
-
-	if ! use qt5; then
-		rm "${EDGE_HOME}/libqt5_shim.so" || die
-	fi
-	if ! use qt6; then
-		rm "${EDGE_HOME}/libqt6_shim.so" || die
-	fi
-
-	pax-mark m "${EDGE_HOME}/msedge"
-}
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-133.0.3065.10.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-133.0.3065.10.ebuild
new file mode 100644
index 000000000000..32c5a4f611f9
--- /dev/null
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-133.0.3065.10.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2011-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit chromium-2 desktop pax-utils unpacker xdg
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/edge"
+
+if [[ ${PN} == microsoft-edge ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
+S=${WORKDIR}
+
+LICENSE="microsoft-edge"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+IUSE="+mip qt5 qt6"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl[ssl]
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+	x11-misc/xdg-utils
+	mip? ( app-crypt/libsecret )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -f _gpgorigin || die
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/${PN}.1.gz ]]; then
+		rm usr/share/man/man1/${PN}.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/${PN}.1
+	fi
+
+	local suffix=
+	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	if ! use mip; then
+		rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die
+	fi
+
+	if ! use qt5; then
+		rm "${EDGE_HOME}/libqt5_shim.so" || die
+	fi
+	if ! use qt6; then
+		rm "${EDGE_HOME}/libqt6_shim.so" || die
+	fi
+
+	pax-mark m "${EDGE_HOME}/msedge"
+}
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index 8b22205ccbe5..43d1bb301c51 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,3 +1,3 @@
-DIST microsoft-edge-dev_133.0.2992.0-1_amd64.deb 169074410 BLAKE2B 91820f824cdec369e457072d3f0205de8d8ed53ef59c3bba58bca970995e2e7a045ca89b85e9fea2d6ed1072833b067610bcfeab55c498c4fa80b82d826fbc37 SHA512 1c4cd5ca019ba91882e49e548904faad0014cccacf31dc341367c96eaa1a3fef824432acbde6fac2e6169ac72b53b7d446d8b6de43c6d415528c175403b0dec2
-DIST microsoft-edge-dev_133.0.3000.0-1_amd64.deb 168735746 BLAKE2B 6ac6d274e2cfd4f2406f881a5350f44237efb5e99a7c4d8b5274b7cffdf1d8d8e7e2298258571851ae0b2a88956380b74d6705454fe0965b3125bd937957e46d SHA512 e38b1b85616619940336836a72ba83393718f4c173f8b08c733ded0ce3a31683ac8618cd3fdf1221aa3d53a559a072bd7f69b384d388a0956035e801af48c8ee
 DIST microsoft-edge-dev_133.0.3014.0-1_amd64.deb 168560610 BLAKE2B 6605181310249479c2735211d14919f37bcc9818b699eb7d68d4abe269d7e2305cfc208cfe236c21697c3a7a1d87e785813a2a64c6d781795f4240279c99c518 SHA512 158be0e0873952a3f9f002ba98123d9542005291ac298b5f3137cb783de7ab19ad655bf5966982b248c287a072efcd23c2275af8f67fb3c311586ed768d1dfca
+DIST microsoft-edge-dev_133.0.3054.1-1_amd64.deb 170070226 BLAKE2B 32955289661dcf3bffa545fee6849b44d303ea3e9260ec1146ee4dd4e4b3fdf376da64fb4380a64b7f08142264690af969ad4eafde20a834d801c16433618bd4 SHA512 0c5a40bb3234dd23ae4e11e5b8dc8050becd936af76ec9328c6ac6fd5670cdf6ffea8b74494910a5329e4880fb4134ead09f8545333bef7a30b76162c3d52780
+DIST microsoft-edge-dev_133.0.3065.7-1_amd64.deb 169717050 BLAKE2B 03ac92615860728473167a274bff69d01f8c3645dd8ebdb21aaa675e9365a396cf246e70e72aaaaced0c9426697490da2b0a1b9b52687ed74d5916d18e5342a6 SHA512 fdd9a184549192793b3e7d08a9dafb31c63e714acf8e831d67d7d02f4b66d6f15205149afa4fd52dc2ad7dc04dc1691c76c75e9e8ce8a3f32b35fb191ec3a426
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-133.0.2992.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-133.0.2992.0.ebuild
deleted file mode 100644
index 0ff710cc5ddc..000000000000
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-133.0.2992.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 2011-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit chromium-2 desktop pax-utils unpacker xdg
-
-DESCRIPTION="The web browser from Microsoft"
-HOMEPAGE="https://www.microsoft.com/edge"
-
-if [[ ${PN} == microsoft-edge ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
-S=${WORKDIR}
-
-LICENSE="microsoft-edge"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-IUSE="+mip qt5 qt6"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl[ssl]
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-	x11-misc/xdg-utils
-	mip? ( app-crypt/libsecret )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[X]
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
-EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "microsoft-edge only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -f _gpgorigin || die
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-	if [[ -L usr/share/man/man1/${PN}.1.gz ]]; then
-		rm usr/share/man/man1/${PN}.1.gz || die
-		dosym ${MY_PN}.1 usr/share/man/man1/${PN}.1
-	fi
-
-	local suffix=
-	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
-	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	if ! use mip; then
-		rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die
-	fi
-
-	if ! use qt5; then
-		rm "${EDGE_HOME}/libqt5_shim.so" || die
-	fi
-	if ! use qt6; then
-		rm "${EDGE_HOME}/libqt6_shim.so" || die
-	fi
-
-	pax-mark m "${EDGE_HOME}/msedge"
-}
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-133.0.3000.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-133.0.3000.0.ebuild
deleted file mode 100644
index 0ff710cc5ddc..000000000000
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-133.0.3000.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 2011-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit chromium-2 desktop pax-utils unpacker xdg
-
-DESCRIPTION="The web browser from Microsoft"
-HOMEPAGE="https://www.microsoft.com/edge"
-
-if [[ ${PN} == microsoft-edge ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
-S=${WORKDIR}
-
-LICENSE="microsoft-edge"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-IUSE="+mip qt5 qt6"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl[ssl]
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-	x11-misc/xdg-utils
-	mip? ( app-crypt/libsecret )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[X]
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
-EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "microsoft-edge only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -f _gpgorigin || die
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-	if [[ -L usr/share/man/man1/${PN}.1.gz ]]; then
-		rm usr/share/man/man1/${PN}.1.gz || die
-		dosym ${MY_PN}.1 usr/share/man/man1/${PN}.1
-	fi
-
-	local suffix=
-	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
-	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	if ! use mip; then
-		rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die
-	fi
-
-	if ! use qt5; then
-		rm "${EDGE_HOME}/libqt5_shim.so" || die
-	fi
-	if ! use qt6; then
-		rm "${EDGE_HOME}/libqt6_shim.so" || die
-	fi
-
-	pax-mark m "${EDGE_HOME}/msedge"
-}
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-133.0.3054.1.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-133.0.3054.1.ebuild
new file mode 100644
index 000000000000..32c5a4f611f9
--- /dev/null
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-133.0.3054.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2011-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit chromium-2 desktop pax-utils unpacker xdg
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/edge"
+
+if [[ ${PN} == microsoft-edge ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
+S=${WORKDIR}
+
+LICENSE="microsoft-edge"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+IUSE="+mip qt5 qt6"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl[ssl]
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+	x11-misc/xdg-utils
+	mip? ( app-crypt/libsecret )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -f _gpgorigin || die
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/${PN}.1.gz ]]; then
+		rm usr/share/man/man1/${PN}.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/${PN}.1
+	fi
+
+	local suffix=
+	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	if ! use mip; then
+		rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die
+	fi
+
+	if ! use qt5; then
+		rm "${EDGE_HOME}/libqt5_shim.so" || die
+	fi
+	if ! use qt6; then
+		rm "${EDGE_HOME}/libqt6_shim.so" || die
+	fi
+
+	pax-mark m "${EDGE_HOME}/msedge"
+}
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-133.0.3065.7.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-133.0.3065.7.ebuild
new file mode 100644
index 000000000000..32c5a4f611f9
--- /dev/null
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-133.0.3065.7.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2011-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit chromium-2 desktop pax-utils unpacker xdg
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/edge"
+
+if [[ ${PN} == microsoft-edge ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
+S=${WORKDIR}
+
+LICENSE="microsoft-edge"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+IUSE="+mip qt5 qt6"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl[ssl]
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+	x11-misc/xdg-utils
+	mip? ( app-crypt/libsecret )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -f _gpgorigin || die
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/${PN}.1.gz ]]; then
+		rm usr/share/man/man1/${PN}.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/${PN}.1
+	fi
+
+	local suffix=
+	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	if ! use mip; then
+		rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die
+	fi
+
+	if ! use qt5; then
+		rm "${EDGE_HOME}/libqt5_shim.so" || die
+	fi
+	if ! use qt6; then
+		rm "${EDGE_HOME}/libqt6_shim.so" || die
+	fi
+
+	pax-mark m "${EDGE_HOME}/msedge"
+}
diff --git a/www-client/microsoft-edge/Manifest b/www-client/microsoft-edge/Manifest
index 619b0b688f02..0b77a121ae1d 100644
--- a/www-client/microsoft-edge/Manifest
+++ b/www-client/microsoft-edge/Manifest
@@ -1 +1 @@
-DIST microsoft-edge-stable_131.0.2903.112-1_amd64.deb 169052722 BLAKE2B 1358eba64643e297f8d33a282f5d330067009f96a86a227aa10fef50b2157e92f5a3b121cfe269767c8e5a17a80ffff4893c0535cecde72de01eb842e4ad052f SHA512 ca4f162081fdd4465f1c4dfe547ede5ee5808c6510d40710d298f947b06a9c11795d60c6c2492437fda07cbf335108a1ca47fe6b5037b22c43b571145b4d4dd2
+DIST microsoft-edge-stable_132.0.2957.115-1_amd64.deb 168269722 BLAKE2B 9b20632dbc0baf6923a6c2be8f54485c2ecbe8e3bbedefa636a55f2bb857252f39b9b7b5b13853d903597991b6c52dbe684de219c12372f6920129912cfcf1e1 SHA512 00f959692a8fa2193ba617195a9a13abacc2ad88a58362bd8d6cf0e42ced2ebdec59c7645db576cf8bfe6f0b413b3aad8467f071b75ab7d3827abe90241be726
diff --git a/www-client/microsoft-edge/microsoft-edge-131.0.2903.112.ebuild b/www-client/microsoft-edge/microsoft-edge-131.0.2903.112.ebuild
deleted file mode 100644
index 7ea339bd40f9..000000000000
--- a/www-client/microsoft-edge/microsoft-edge-131.0.2903.112.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 2011-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit chromium-2 desktop pax-utils unpacker xdg
-
-DESCRIPTION="The web browser from Microsoft"
-HOMEPAGE="https://www.microsoft.com/edge"
-
-if [[ ${PN} == microsoft-edge ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
-S=${WORKDIR}
-
-LICENSE="microsoft-edge"
-SLOT="0"
-KEYWORDS="-* amd64"
-
-IUSE="+mip qt5 qt6"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl[ssl]
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-	x11-misc/xdg-utils
-	mip? ( app-crypt/libsecret )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[X]
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
-EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "microsoft-edge only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -f _gpgorigin || die
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-	if [[ -L usr/share/man/man1/${PN}.1.gz ]]; then
-		rm usr/share/man/man1/${PN}.1.gz || die
-		dosym ${MY_PN}.1 usr/share/man/man1/${PN}.1
-	fi
-
-	local suffix=
-	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
-	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	if ! use mip; then
-		rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die
-	fi
-
-	if ! use qt5; then
-		rm "${EDGE_HOME}/libqt5_shim.so" || die
-	fi
-	if ! use qt6; then
-		rm "${EDGE_HOME}/libqt6_shim.so" || die
-	fi
-
-	pax-mark m "${EDGE_HOME}/msedge"
-}
diff --git a/www-client/microsoft-edge/microsoft-edge-132.0.2957.115.ebuild b/www-client/microsoft-edge/microsoft-edge-132.0.2957.115.ebuild
new file mode 100644
index 000000000000..a61bd8cbcd59
--- /dev/null
+++ b/www-client/microsoft-edge/microsoft-edge-132.0.2957.115.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2011-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit chromium-2 desktop pax-utils unpacker xdg
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/edge"
+
+if [[ ${PN} == microsoft-edge ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
+S=${WORKDIR}
+
+LICENSE="microsoft-edge"
+SLOT="0"
+KEYWORDS="-* amd64"
+
+IUSE="+mip qt5 qt6"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl[ssl]
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+	x11-misc/xdg-utils
+	mip? ( app-crypt/libsecret )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -f _gpgorigin || die
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/${PN}.1.gz ]]; then
+		rm usr/share/man/man1/${PN}.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/${PN}.1
+	fi
+
+	local suffix=
+	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	if ! use mip; then
+		rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die
+	fi
+
+	if ! use qt5; then
+		rm "${EDGE_HOME}/libqt5_shim.so" || die
+	fi
+	if ! use qt6; then
+		rm "${EDGE_HOME}/libqt6_shim.so" || die
+	fi
+
+	pax-mark m "${EDGE_HOME}/msedge"
+}
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 671ca56db5eb..6bacd30cdf17 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,3 +1,3 @@
 DIST opera-beta_116.0.5366.13_amd64.deb 124345880 BLAKE2B f374a0a5167c7d571334d6369d9addf97375cbd34e90d301b6ac6fdcb301c8554e63c8d4fcabfad9e59aeaeb6d3a4b03566d69d9649b526c977a3fd84c92844b SHA512 4ad232663b1f224ec2ec544297fe3b0a34feb819d8b1e1d441e13d4337a6de835a8d9eaa656b88ba68727936a297ea8b6636ea1d7c7000a78ac924057690027f
-DIST opera-beta_116.0.5366.5_amd64.deb 125047088 BLAKE2B 178f890dbfa409dd22436d175d7166026b0e1d6f5851efac6fd3ca81e609c0a0766c533964649c9dcc2b28747c48e19282f05e8a46f5e94513119c5a4349217e SHA512 fe774dc93ca287ebd5c2fe1ceef550d3393d77c61d3675b025b8b0d85cb68c7c7b3190ea0f86f8dc49a98cfde1ce995ef1a31dd70c7895dd2cb484da2791493d
 DIST opera-beta_116.0.5366.7_amd64.deb 125054764 BLAKE2B 08c80ce7acd935102c26bf10fd90681af1a3287f8dc9528b336b501eb34e1f37a91d43f37be31aa712c6f3595f717a25de865e81547507ee52e8f33aeff1af1f SHA512 2a12ec9eeceb87ade212b32338e7d2b91af642baafc2435b31248acadc064b014a2ddc4a01a0333162a854653b8b1dc9d1890af2d424c2922337f55f2835c340
+DIST opera-beta_117.0.5408.4_amd64.deb 126400584 BLAKE2B 673c7b300e6fe87f44071d65c191ea248691eb3074d167107b0e9a73d395af2bdb37a5da63b7be5189a3583c5833aa53c3674a6d7e5c118932b55f70ed63dd41 SHA512 e5fdea04227b9c56d9e3d6efe3376c4023130f6a5a68ac2e07d31f30ff80cc27e0ac7ef65ee2300b02619f2233b3b6d755ded80387822e1ec4ccbed16c390873
diff --git a/www-client/opera-beta/opera-beta-116.0.5366.5.ebuild b/www-client/opera-beta/opera-beta-116.0.5366.5.ebuild
deleted file mode 100644
index 1cab05aa0a7e..000000000000
--- a/www-client/opera-beta/opera-beta-116.0.5366.5.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_LANGS="
-	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-
-# These are intended for ebuild maintainer use to force RPM if DEB is not available.
-: ${OPERA_FORCE_RPM=no}
-
-inherit chromium-2 pax-utils xdg
-
-if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-	inherit rpm
-	OPERA_ARCHIVE_EXT="rpm"
-else
-	inherit unpacker
-	OPERA_ARCHIVE_EXT="deb"
-fi
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-
-SRC_URI_BASE=(
-	"https://download1.operacdn.com/pub/${PN}"
-	"https://download2.operacdn.com/pub/${PN}"
-	"https://download3.operacdn.com/pub/${PN}"
-	"https://download4.operacdn.com/pub/${PN}"
-)
-
-if [[ ${PN} == opera ]]; then
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	MY_PN=${PN}
-fi
-
-# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
-# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
-# Does not need to be updated for every new version of Opera, only when it breaks
-CHROMIUM_VERSION="131"
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
-S=${WORKDIR}
-
-LICENSE="OPERA-2018"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gsettings-desktop-schemas
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/pango
-	proprietary-codecs? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[X]
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-
-QA_PREBUILT="*"
-OPERA_HOME="opt/opera${PN#opera}"
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "opera only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rpm_src_unpack "${A[0]}"
-	else
-		unpacker
-	fi
-
-	# move to /opt, bug #573052
-	mkdir -p "${OPERA_HOME%${PN}}"
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
-	else
-		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
-	fi
-	rm -r "usr/lib" || die
-
-	# disable auto update
-	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
-
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rm "${OPERA_HOME}/setup_repo.sh" || die
-	else
-		rm -r "usr/share/lintian" || die
-
-		# fix docs
-		mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-		gzip -d usr/share/doc/${PF}/changelog.gz || die
-	fi
-
-	# fix desktop file
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-
-	# remove unused language packs
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# setup opera symlink
-	rm "usr/bin/${PN}" || die
-	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
-
-	# install proprietary codecs
-	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
-			  /${OPERA_HOME}/libffmpeg.so
-	fi
-
-	if ! use qt5; then
-		rm "${OPERA_HOME}/libqt5_shim.so" || die
-	fi
-	if ! use qt6; then
-		rm "${OPERA_HOME}/libqt6_shim.so" || die
-	fi
-
-	# pax mark opera, bug #562038
-	pax-mark m "${OPERA_HOME}/opera"
-	# enable suid sandbox if requested
-	use suid && fperms 4711 "/${OPERA_HOME}/opera_sandbox"
-}
diff --git a/www-client/opera-beta/opera-beta-117.0.5408.4.ebuild b/www-client/opera-beta/opera-beta-117.0.5408.4.ebuild
new file mode 100644
index 000000000000..4ee8f9792fe3
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-117.0.5408.4.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="
+	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+
+# These are intended for ebuild maintainer use to force RPM if DEB is not available.
+: ${OPERA_FORCE_RPM=no}
+
+inherit chromium-2 pax-utils xdg
+
+if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+	inherit rpm
+	OPERA_ARCHIVE_EXT="rpm"
+else
+	inherit unpacker
+	OPERA_ARCHIVE_EXT="deb"
+fi
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+
+SRC_URI_BASE=(
+	"https://download1.operacdn.com/pub/${PN}"
+	"https://download2.operacdn.com/pub/${PN}"
+	"https://download3.operacdn.com/pub/${PN}"
+	"https://download4.operacdn.com/pub/${PN}"
+)
+
+if [[ ${PN} == opera ]]; then
+	MY_PN=${PN}-stable
+	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
+else
+	MY_PN=${PN}
+fi
+
+# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
+# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
+# Does not need to be updated for every new version of Opera, only when it breaks
+CHROMIUM_VERSION="132"
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
+S=${WORKDIR}
+
+LICENSE="OPERA-2018"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gsettings-desktop-schemas
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/pango
+	proprietary-codecs? (
+		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+
+QA_PREBUILT="*"
+OPERA_HOME="opt/opera${PN#opera}"
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "opera only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rpm_src_unpack "${A[0]}"
+	else
+		unpacker
+	fi
+
+	# move to /opt, bug #573052
+	mkdir -p "${OPERA_HOME%${PN}}"
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
+	else
+		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	fi
+	rm -r "usr/lib" || die
+
+	# disable auto update
+	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
+
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rm "${OPERA_HOME}/setup_repo.sh" || die
+	else
+		rm -r "usr/share/lintian" || die
+
+		# fix docs
+		mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+		gzip -d usr/share/doc/${PF}/changelog.gz || die
+	fi
+
+	# fix desktop file
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+
+	# remove unused language packs
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# setup opera symlink
+	rm "usr/bin/${PN}" || die
+	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
+
+	# install proprietary codecs
+	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
+			  /${OPERA_HOME}/libffmpeg.so
+	fi
+
+	if ! use qt5; then
+		rm "${OPERA_HOME}/libqt5_shim.so" || die
+	fi
+	if ! use qt6; then
+		rm "${OPERA_HOME}/libqt6_shim.so" || die
+	fi
+
+	# pax mark opera, bug #562038
+	pax-mark m "${OPERA_HOME}/opera"
+	# enable suid sandbox if requested
+	use suid && fperms 4711 "/${OPERA_HOME}/opera_sandbox"
+}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 6c842b39c4e8..b22d860e7020 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,3 +1,3 @@
-DIST opera-developer_117.0.5369.0_amd64.deb 125121468 BLAKE2B 80d099b270c5598ce2cfadf4a75d67f64a14e069b41207b03263f50302d0f4bf958d00a49e2c68ba551e208b710cd6a7df9bdfc8048dbf2c12f57fd529b27ef6 SHA512 606370edb1c691a49473c9109b4971793ce7f13da57f81eb0f1f793de47753dfdd121d6791f9a98a0a7edc4b08bb9c33f332b62d3bea3cdb31a540320f95d831
-DIST opera-developer_117.0.5378.0_amd64.deb 124205104 BLAKE2B 660a87fde76f3484708d98c5a538c73cb54afa146c2b26fdee581af765a373daa3efd737fd787e23c60a60d5c1e3f2f4a1eebc618ce5f52e21a4c1dea58c5dcb SHA512 13895f0d6f3e672b262711e2c5fc6e148b236b17a59af05629f46aab4372999dae7c4593362a3c3f22cf2ff16dd6a50c932f6c75cfe593af81e511b640e58bd6
-DIST opera-developer_117.0.5383.0_amd64.deb 124192636 BLAKE2B 46af2334c8f9c8c337e1e0385cb688029cb32692958b53d96f0989983fbd033b475cf60f4a95c0893fbb280237d8c23d39e8b3bc8cccbb5f7d842e93ffdc27d0 SHA512 dbcfab9a46eb4683a8d02b920c6085992b4aeefb7a6e04b5a41c4730a6f4d81da1a6bbe3c1c99dbf84dcc1f0e3926cb00175cef696bbaf8245520c38f1c2152d
+DIST opera-developer_117.0.5405.0_amd64.deb 127733944 BLAKE2B 8e865990c21253be8b8191d2e611bb05d18754a69e30b0fd4a18911d5d50445c80faea3c4d3387375d6d3273a5e0ef13395805817760442512d6f7055188e026 SHA512 719dac3dc7a63a97f320c95dce22994485d3767a973a2cda46cc27a3cb54c0173afabb40cd71004830618bae1550bd42fa2de465f8fde1388555828882bf9016
+DIST opera-developer_118.0.5411.0_amd64.deb 126407304 BLAKE2B 6a04f1d9e23bc231e56654206e4d9ef8e11cd265dac1dc37e0c054967e1baec3577913a719d5363aa91d1b5d8c919a62d6c5b0f3b3efc3a52126ab9acc9cb3df SHA512 8d59a2d20611b2364967476b977749efb40328f3f13bb61557933012f7894f4250afed44217c1c389b5e7d35390d57407963a05e0d7ddabcc6918e01ea133fc6
+DIST opera-developer_118.0.5415.0_amd64.deb 126514628 BLAKE2B 62eb78cac2359b2da897d03ad4e8aa2a731dfdf68d7c36071dc4555aa533af6523483897129cf0c9bad2ef21d33130611f6fe207d1d90096ccd9f34f081a5685 SHA512 8349fd299fd3360d64debfe384af954fc5398ded0be767cf1e3473a77da86e686cfd80d7f2343d7bf6677711eba913e95bea21f62d45b3446593569848667fba
diff --git a/www-client/opera-developer/opera-developer-117.0.5369.0.ebuild b/www-client/opera-developer/opera-developer-117.0.5369.0.ebuild
deleted file mode 100644
index 1cab05aa0a7e..000000000000
--- a/www-client/opera-developer/opera-developer-117.0.5369.0.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_LANGS="
-	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-
-# These are intended for ebuild maintainer use to force RPM if DEB is not available.
-: ${OPERA_FORCE_RPM=no}
-
-inherit chromium-2 pax-utils xdg
-
-if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-	inherit rpm
-	OPERA_ARCHIVE_EXT="rpm"
-else
-	inherit unpacker
-	OPERA_ARCHIVE_EXT="deb"
-fi
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-
-SRC_URI_BASE=(
-	"https://download1.operacdn.com/pub/${PN}"
-	"https://download2.operacdn.com/pub/${PN}"
-	"https://download3.operacdn.com/pub/${PN}"
-	"https://download4.operacdn.com/pub/${PN}"
-)
-
-if [[ ${PN} == opera ]]; then
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	MY_PN=${PN}
-fi
-
-# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
-# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
-# Does not need to be updated for every new version of Opera, only when it breaks
-CHROMIUM_VERSION="131"
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
-S=${WORKDIR}
-
-LICENSE="OPERA-2018"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gsettings-desktop-schemas
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/pango
-	proprietary-codecs? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[X]
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-
-QA_PREBUILT="*"
-OPERA_HOME="opt/opera${PN#opera}"
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "opera only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rpm_src_unpack "${A[0]}"
-	else
-		unpacker
-	fi
-
-	# move to /opt, bug #573052
-	mkdir -p "${OPERA_HOME%${PN}}"
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
-	else
-		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
-	fi
-	rm -r "usr/lib" || die
-
-	# disable auto update
-	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
-
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rm "${OPERA_HOME}/setup_repo.sh" || die
-	else
-		rm -r "usr/share/lintian" || die
-
-		# fix docs
-		mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-		gzip -d usr/share/doc/${PF}/changelog.gz || die
-	fi
-
-	# fix desktop file
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-
-	# remove unused language packs
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# setup opera symlink
-	rm "usr/bin/${PN}" || die
-	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
-
-	# install proprietary codecs
-	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
-			  /${OPERA_HOME}/libffmpeg.so
-	fi
-
-	if ! use qt5; then
-		rm "${OPERA_HOME}/libqt5_shim.so" || die
-	fi
-	if ! use qt6; then
-		rm "${OPERA_HOME}/libqt6_shim.so" || die
-	fi
-
-	# pax mark opera, bug #562038
-	pax-mark m "${OPERA_HOME}/opera"
-	# enable suid sandbox if requested
-	use suid && fperms 4711 "/${OPERA_HOME}/opera_sandbox"
-}
diff --git a/www-client/opera-developer/opera-developer-117.0.5378.0.ebuild b/www-client/opera-developer/opera-developer-117.0.5378.0.ebuild
deleted file mode 100644
index 1cab05aa0a7e..000000000000
--- a/www-client/opera-developer/opera-developer-117.0.5378.0.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_LANGS="
-	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-
-# These are intended for ebuild maintainer use to force RPM if DEB is not available.
-: ${OPERA_FORCE_RPM=no}
-
-inherit chromium-2 pax-utils xdg
-
-if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-	inherit rpm
-	OPERA_ARCHIVE_EXT="rpm"
-else
-	inherit unpacker
-	OPERA_ARCHIVE_EXT="deb"
-fi
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-
-SRC_URI_BASE=(
-	"https://download1.operacdn.com/pub/${PN}"
-	"https://download2.operacdn.com/pub/${PN}"
-	"https://download3.operacdn.com/pub/${PN}"
-	"https://download4.operacdn.com/pub/${PN}"
-)
-
-if [[ ${PN} == opera ]]; then
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	MY_PN=${PN}
-fi
-
-# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
-# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
-# Does not need to be updated for every new version of Opera, only when it breaks
-CHROMIUM_VERSION="131"
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
-S=${WORKDIR}
-
-LICENSE="OPERA-2018"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gsettings-desktop-schemas
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/pango
-	proprietary-codecs? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[X]
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-
-QA_PREBUILT="*"
-OPERA_HOME="opt/opera${PN#opera}"
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "opera only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rpm_src_unpack "${A[0]}"
-	else
-		unpacker
-	fi
-
-	# move to /opt, bug #573052
-	mkdir -p "${OPERA_HOME%${PN}}"
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
-	else
-		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
-	fi
-	rm -r "usr/lib" || die
-
-	# disable auto update
-	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
-
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rm "${OPERA_HOME}/setup_repo.sh" || die
-	else
-		rm -r "usr/share/lintian" || die
-
-		# fix docs
-		mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-		gzip -d usr/share/doc/${PF}/changelog.gz || die
-	fi
-
-	# fix desktop file
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-
-	# remove unused language packs
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# setup opera symlink
-	rm "usr/bin/${PN}" || die
-	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
-
-	# install proprietary codecs
-	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
-			  /${OPERA_HOME}/libffmpeg.so
-	fi
-
-	if ! use qt5; then
-		rm "${OPERA_HOME}/libqt5_shim.so" || die
-	fi
-	if ! use qt6; then
-		rm "${OPERA_HOME}/libqt6_shim.so" || die
-	fi
-
-	# pax mark opera, bug #562038
-	pax-mark m "${OPERA_HOME}/opera"
-	# enable suid sandbox if requested
-	use suid && fperms 4711 "/${OPERA_HOME}/opera_sandbox"
-}
diff --git a/www-client/opera-developer/opera-developer-117.0.5383.0.ebuild b/www-client/opera-developer/opera-developer-117.0.5383.0.ebuild
deleted file mode 100644
index 1cab05aa0a7e..000000000000
--- a/www-client/opera-developer/opera-developer-117.0.5383.0.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_LANGS="
-	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-
-# These are intended for ebuild maintainer use to force RPM if DEB is not available.
-: ${OPERA_FORCE_RPM=no}
-
-inherit chromium-2 pax-utils xdg
-
-if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-	inherit rpm
-	OPERA_ARCHIVE_EXT="rpm"
-else
-	inherit unpacker
-	OPERA_ARCHIVE_EXT="deb"
-fi
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-
-SRC_URI_BASE=(
-	"https://download1.operacdn.com/pub/${PN}"
-	"https://download2.operacdn.com/pub/${PN}"
-	"https://download3.operacdn.com/pub/${PN}"
-	"https://download4.operacdn.com/pub/${PN}"
-)
-
-if [[ ${PN} == opera ]]; then
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	MY_PN=${PN}
-fi
-
-# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
-# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
-# Does not need to be updated for every new version of Opera, only when it breaks
-CHROMIUM_VERSION="131"
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
-S=${WORKDIR}
-
-LICENSE="OPERA-2018"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gsettings-desktop-schemas
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/pango
-	proprietary-codecs? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[X]
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-
-QA_PREBUILT="*"
-OPERA_HOME="opt/opera${PN#opera}"
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "opera only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rpm_src_unpack "${A[0]}"
-	else
-		unpacker
-	fi
-
-	# move to /opt, bug #573052
-	mkdir -p "${OPERA_HOME%${PN}}"
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
-	else
-		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
-	fi
-	rm -r "usr/lib" || die
-
-	# disable auto update
-	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
-
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rm "${OPERA_HOME}/setup_repo.sh" || die
-	else
-		rm -r "usr/share/lintian" || die
-
-		# fix docs
-		mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-		gzip -d usr/share/doc/${PF}/changelog.gz || die
-	fi
-
-	# fix desktop file
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-
-	# remove unused language packs
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# setup opera symlink
-	rm "usr/bin/${PN}" || die
-	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
-
-	# install proprietary codecs
-	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
-			  /${OPERA_HOME}/libffmpeg.so
-	fi
-
-	if ! use qt5; then
-		rm "${OPERA_HOME}/libqt5_shim.so" || die
-	fi
-	if ! use qt6; then
-		rm "${OPERA_HOME}/libqt6_shim.so" || die
-	fi
-
-	# pax mark opera, bug #562038
-	pax-mark m "${OPERA_HOME}/opera"
-	# enable suid sandbox if requested
-	use suid && fperms 4711 "/${OPERA_HOME}/opera_sandbox"
-}
diff --git a/www-client/opera-developer/opera-developer-117.0.5405.0.ebuild b/www-client/opera-developer/opera-developer-117.0.5405.0.ebuild
new file mode 100644
index 000000000000..604325658279
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-117.0.5405.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="
+	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+
+# These are intended for ebuild maintainer use to force RPM if DEB is not available.
+: ${OPERA_FORCE_RPM=no}
+
+inherit chromium-2 pax-utils xdg
+
+if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+	inherit rpm
+	OPERA_ARCHIVE_EXT="rpm"
+else
+	inherit unpacker
+	OPERA_ARCHIVE_EXT="deb"
+fi
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+
+SRC_URI_BASE=(
+	"https://download1.operacdn.com/pub/${PN}"
+	"https://download2.operacdn.com/pub/${PN}"
+	"https://download3.operacdn.com/pub/${PN}"
+	"https://download4.operacdn.com/pub/${PN}"
+)
+
+if [[ ${PN} == opera ]]; then
+	MY_PN=${PN}-stable
+	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
+else
+	MY_PN=${PN}
+fi
+
+# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
+# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
+# Does not need to be updated for every new version of Opera, only when it breaks
+CHROMIUM_VERSION="131"
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
+S=${WORKDIR}
+
+LICENSE="OPERA-2018"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gsettings-desktop-schemas
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/pango
+	proprietary-codecs? (
+		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+
+QA_PREBUILT="*"
+OPERA_HOME="opt/opera${PN#opera}"
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "opera only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rpm_src_unpack "${A[0]}"
+	else
+		unpacker
+	fi
+
+	# move to /opt, bug #573052
+	mkdir -p "${OPERA_HOME%${PN}}"
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
+	else
+		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	fi
+	rm -r "usr/lib" || die
+
+	# disable auto update
+	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
+
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rm "${OPERA_HOME}/setup_repo.sh" || die
+	else
+		rm -r "usr/share/lintian" || die
+
+		# fix docs
+		mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+		gzip -d usr/share/doc/${PF}/changelog.gz || die
+	fi
+
+	# fix desktop file
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+
+	# remove unused language packs
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# setup opera symlink
+	rm "usr/bin/${PN}" || die
+	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
+
+	# install proprietary codecs
+	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
+			  /${OPERA_HOME}/libffmpeg.so
+	fi
+
+	if ! use qt5; then
+		rm "${OPERA_HOME}/libqt5_shim.so" || die
+	fi
+	if ! use qt6; then
+		rm "${OPERA_HOME}/libqt6_shim.so" || die
+	fi
+
+	# pax mark opera, bug #562038
+	pax-mark m "${OPERA_HOME}/opera"
+	# enable suid sandbox if requested
+	use suid && fperms 4711 "/${OPERA_HOME}/opera_sandbox"
+}
diff --git a/www-client/opera-developer/opera-developer-118.0.5411.0-r1.ebuild b/www-client/opera-developer/opera-developer-118.0.5411.0-r1.ebuild
new file mode 100644
index 000000000000..4ee8f9792fe3
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-118.0.5411.0-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="
+	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+
+# These are intended for ebuild maintainer use to force RPM if DEB is not available.
+: ${OPERA_FORCE_RPM=no}
+
+inherit chromium-2 pax-utils xdg
+
+if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+	inherit rpm
+	OPERA_ARCHIVE_EXT="rpm"
+else
+	inherit unpacker
+	OPERA_ARCHIVE_EXT="deb"
+fi
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+
+SRC_URI_BASE=(
+	"https://download1.operacdn.com/pub/${PN}"
+	"https://download2.operacdn.com/pub/${PN}"
+	"https://download3.operacdn.com/pub/${PN}"
+	"https://download4.operacdn.com/pub/${PN}"
+)
+
+if [[ ${PN} == opera ]]; then
+	MY_PN=${PN}-stable
+	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
+else
+	MY_PN=${PN}
+fi
+
+# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
+# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
+# Does not need to be updated for every new version of Opera, only when it breaks
+CHROMIUM_VERSION="132"
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
+S=${WORKDIR}
+
+LICENSE="OPERA-2018"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gsettings-desktop-schemas
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/pango
+	proprietary-codecs? (
+		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+
+QA_PREBUILT="*"
+OPERA_HOME="opt/opera${PN#opera}"
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "opera only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rpm_src_unpack "${A[0]}"
+	else
+		unpacker
+	fi
+
+	# move to /opt, bug #573052
+	mkdir -p "${OPERA_HOME%${PN}}"
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
+	else
+		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	fi
+	rm -r "usr/lib" || die
+
+	# disable auto update
+	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
+
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rm "${OPERA_HOME}/setup_repo.sh" || die
+	else
+		rm -r "usr/share/lintian" || die
+
+		# fix docs
+		mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+		gzip -d usr/share/doc/${PF}/changelog.gz || die
+	fi
+
+	# fix desktop file
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+
+	# remove unused language packs
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# setup opera symlink
+	rm "usr/bin/${PN}" || die
+	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
+
+	# install proprietary codecs
+	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
+			  /${OPERA_HOME}/libffmpeg.so
+	fi
+
+	if ! use qt5; then
+		rm "${OPERA_HOME}/libqt5_shim.so" || die
+	fi
+	if ! use qt6; then
+		rm "${OPERA_HOME}/libqt6_shim.so" || die
+	fi
+
+	# pax mark opera, bug #562038
+	pax-mark m "${OPERA_HOME}/opera"
+	# enable suid sandbox if requested
+	use suid && fperms 4711 "/${OPERA_HOME}/opera_sandbox"
+}
diff --git a/www-client/opera-developer/opera-developer-118.0.5415.0.ebuild b/www-client/opera-developer/opera-developer-118.0.5415.0.ebuild
new file mode 100644
index 000000000000..4ee8f9792fe3
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-118.0.5415.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="
+	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+
+# These are intended for ebuild maintainer use to force RPM if DEB is not available.
+: ${OPERA_FORCE_RPM=no}
+
+inherit chromium-2 pax-utils xdg
+
+if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+	inherit rpm
+	OPERA_ARCHIVE_EXT="rpm"
+else
+	inherit unpacker
+	OPERA_ARCHIVE_EXT="deb"
+fi
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+
+SRC_URI_BASE=(
+	"https://download1.operacdn.com/pub/${PN}"
+	"https://download2.operacdn.com/pub/${PN}"
+	"https://download3.operacdn.com/pub/${PN}"
+	"https://download4.operacdn.com/pub/${PN}"
+)
+
+if [[ ${PN} == opera ]]; then
+	MY_PN=${PN}-stable
+	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
+else
+	MY_PN=${PN}
+fi
+
+# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
+# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
+# Does not need to be updated for every new version of Opera, only when it breaks
+CHROMIUM_VERSION="132"
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
+S=${WORKDIR}
+
+LICENSE="OPERA-2018"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gsettings-desktop-schemas
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/pango
+	proprietary-codecs? (
+		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+
+QA_PREBUILT="*"
+OPERA_HOME="opt/opera${PN#opera}"
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "opera only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rpm_src_unpack "${A[0]}"
+	else
+		unpacker
+	fi
+
+	# move to /opt, bug #573052
+	mkdir -p "${OPERA_HOME%${PN}}"
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
+	else
+		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	fi
+	rm -r "usr/lib" || die
+
+	# disable auto update
+	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
+
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rm "${OPERA_HOME}/setup_repo.sh" || die
+	else
+		rm -r "usr/share/lintian" || die
+
+		# fix docs
+		mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+		gzip -d usr/share/doc/${PF}/changelog.gz || die
+	fi
+
+	# fix desktop file
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+
+	# remove unused language packs
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# setup opera symlink
+	rm "usr/bin/${PN}" || die
+	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
+
+	# install proprietary codecs
+	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
+			  /${OPERA_HOME}/libffmpeg.so
+	fi
+
+	if ! use qt5; then
+		rm "${OPERA_HOME}/libqt5_shim.so" || die
+	fi
+	if ! use qt6; then
+		rm "${OPERA_HOME}/libqt6_shim.so" || die
+	fi
+
+	# pax mark opera, bug #562038
+	pax-mark m "${OPERA_HOME}/opera"
+	# enable suid sandbox if requested
+	use suid && fperms 4711 "/${OPERA_HOME}/opera_sandbox"
+}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 6df47ee4c7af..9cbf4c181afb 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1 +1 @@
-DIST opera-stable_115.0.5322.109_amd64.deb 123855044 BLAKE2B 8f07df24bdb916e2159133b5f532058444d9c0f2e7219d5e2d7a0bd5787bcb610b5c34827f97b7a53980b6e8a108942e56a14c5d1dfabd57c9cff928e27b1dd7 SHA512 50b45be519e6b78823856cdf3aac1c43fe96b3adab9b7d09048e8be8e7b14d8b375caedeb9d6473571d5554c63e235521846005cfccad25835ae89c8bb30e893
+DIST opera-stable_116.0.5366.35_amd64.deb 128188572 BLAKE2B 6644efc1233d65bbe2b0cfc2129c9dd113d43dd0bdb03083a93a5d7942dad7f5d1f682dd6aeccdf2844349f3f46de7e3c6c5bff695c339e419aa3712fa52c37d SHA512 4f2487f7a2596d69455745a0e7934551d053417ced3d9268521d56e3e6afa58c64355ca85ea95de8afc4f7550de0e2cbe58cb20932fba20a5806741cc20e9c8e
diff --git a/www-client/opera/opera-115.0.5322.109.ebuild b/www-client/opera/opera-115.0.5322.109.ebuild
deleted file mode 100644
index 6768372b2cf2..000000000000
--- a/www-client/opera/opera-115.0.5322.109.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_LANGS="
-	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-
-# These are intended for ebuild maintainer use to force RPM if DEB is not available.
-: ${OPERA_FORCE_RPM=no}
-
-inherit chromium-2 pax-utils xdg
-
-if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-	inherit rpm
-	OPERA_ARCHIVE_EXT="rpm"
-else
-	inherit unpacker
-	OPERA_ARCHIVE_EXT="deb"
-fi
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-
-SRC_URI_BASE=(
-	"https://download1.operacdn.com/pub/${PN}"
-	"https://download2.operacdn.com/pub/${PN}"
-	"https://download3.operacdn.com/pub/${PN}"
-	"https://download4.operacdn.com/pub/${PN}"
-)
-
-if [[ ${PN} == opera ]]; then
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	MY_PN=${PN}
-fi
-
-# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
-# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
-# Does not need to be updated for every new version of Opera, only when it breaks
-CHROMIUM_VERSION="130"
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
-S=${WORKDIR}
-
-LICENSE="OPERA-2018"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gsettings-desktop-schemas
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/pango
-	proprietary-codecs? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[X]
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-"
-
-QA_PREBUILT="*"
-OPERA_HOME="opt/opera${PN#opera}"
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "opera only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rpm_src_unpack "${A[0]}"
-	else
-		unpacker
-	fi
-
-	# move to /opt, bug #573052
-	mkdir -p "${OPERA_HOME%${PN}}"
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
-	else
-		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
-	fi
-	rm -r "usr/lib" || die
-
-	# disable auto update
-	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
-
-	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
-		rm "${OPERA_HOME}/setup_repo.sh" || die
-	else
-		rm -r "usr/share/lintian" || die
-
-		# fix docs
-		mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-		gzip -d usr/share/doc/${PF}/changelog.gz || die
-	fi
-
-	# fix desktop file
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-
-	# remove unused language packs
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# setup opera symlink
-	rm "usr/bin/${PN}" || die
-	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
-
-	# install proprietary codecs
-	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
-			  /${OPERA_HOME}/libffmpeg.so
-	fi
-
-	if ! use qt5; then
-		rm "${OPERA_HOME}/libqt5_shim.so" || die
-	fi
-	if ! use qt6; then
-		rm "${OPERA_HOME}/libqt6_shim.so" || die
-	fi
-
-	# pax mark opera, bug #562038
-	pax-mark m "${OPERA_HOME}/opera"
-	# enable suid sandbox if requested
-	use suid && fperms 4711 "/${OPERA_HOME}/opera_sandbox"
-}
diff --git a/www-client/opera/opera-116.0.5366.35.ebuild b/www-client/opera/opera-116.0.5366.35.ebuild
new file mode 100644
index 000000000000..4a38b4f4f31d
--- /dev/null
+++ b/www-client/opera/opera-116.0.5366.35.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="
+	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+
+# These are intended for ebuild maintainer use to force RPM if DEB is not available.
+: ${OPERA_FORCE_RPM=no}
+
+inherit chromium-2 pax-utils xdg
+
+if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+	inherit rpm
+	OPERA_ARCHIVE_EXT="rpm"
+else
+	inherit unpacker
+	OPERA_ARCHIVE_EXT="deb"
+fi
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+
+SRC_URI_BASE=(
+	"https://download1.operacdn.com/pub/${PN}"
+	"https://download2.operacdn.com/pub/${PN}"
+	"https://download3.operacdn.com/pub/${PN}"
+	"https://download4.operacdn.com/pub/${PN}"
+)
+
+if [[ ${PN} == opera ]]; then
+	MY_PN=${PN}-stable
+	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
+else
+	MY_PN=${PN}
+fi
+
+# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
+# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium)
+# Does not need to be updated for every new version of Opera, only when it breaks
+CHROMIUM_VERSION="131"
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}"
+S=${WORKDIR}
+
+LICENSE="OPERA-2018"
+SLOT="0"
+KEYWORDS="-* amd64"
+IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gsettings-desktop-schemas
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/pango
+	proprietary-codecs? (
+		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+
+QA_PREBUILT="*"
+OPERA_HOME="opt/opera${PN#opera}"
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "opera only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rpm_src_unpack "${A[0]}"
+	else
+		unpacker
+	fi
+
+	# move to /opt, bug #573052
+	mkdir -p "${OPERA_HOME%${PN}}"
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		mv "usr/lib64/${PN}" "${OPERA_HOME%${PN}}" || die
+	else
+		mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	fi
+	rm -r "usr/lib" || die
+
+	# disable auto update
+	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
+
+	if [[ ${OPERA_FORCE_RPM} == yes ]]; then
+		rm "${OPERA_HOME}/setup_repo.sh" || die
+	else
+		rm -r "usr/share/lintian" || die
+
+		# fix docs
+		mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+		gzip -d usr/share/doc/${PF}/changelog.gz || die
+	fi
+
+	# fix desktop file
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+
+	# remove unused language packs
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# setup opera symlink
+	rm "usr/bin/${PN}" || die
+	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
+
+	# install proprietary codecs
+	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
+			  /${OPERA_HOME}/libffmpeg.so
+	fi
+
+	if ! use qt5; then
+		rm "${OPERA_HOME}/libqt5_shim.so" || die
+	fi
+	if ! use qt6; then
+		rm "${OPERA_HOME}/libqt6_shim.so" || die
+	fi
+
+	# pax mark opera, bug #562038
+	pax-mark m "${OPERA_HOME}/opera"
+	# enable suid sandbox if requested
+	use suid && fperms 4711 "/${OPERA_HOME}/opera_sandbox"
+}
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index a5ec3e584c4e..3f815c1c1b2b 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,4 +1,2 @@
-DIST qutebrowser-3.3.1.tar.gz 6059431 BLAKE2B 287946f3a6c4e0585f8e1659aa99e771aba21002187cbedeb07ee27d0e9ed69a685b78eeeda25d78e2286cbfb96377bc1c63c582f7f9d6ff79560245afc9f702 SHA512 7d95620f8e5c30f44e21c5644364a41500ca7c568fcd90f67efab9657346ee9c31a7322f6b574bfb6f68e0e4a80f37395b4b567268ca2df183af3db798c64f84
-DIST qutebrowser-3.3.1.tar.gz.asc 659 BLAKE2B 34a0e258d3dd068261fcedeca9897a9529d313781b4dd1eefcc9aefebf9ae52be67b51a958cd39bd73bfaf2fca76f09a6c5238f5cb606e11bdb4940c88e229c3 SHA512 e4bf7ddd31101a856a6f76555b6fbd26d05591e63238c9dd149abe967b153d1ba0b07dca30c2510dc3cabf52805161e3ca7ff120f0c71ff8f68c1b70f96626bb
 DIST qutebrowser-3.4.0.tar.gz 6065180 BLAKE2B fb4b8c7207b9320ce185465f249cdfa430330935cac40ae02d41e583d7f41da4deb2ac24489cf8c76473468706c8d812eceb7b24c4a430767b758615703b7e57 SHA512 9f056012e53a75c06cf2a6f113dd9ce53d1052250c4fdaa969586b182ec1b36ed077b1a140f10c779e8ae5eb0df69b7d3d466bbf14a21c433a84c9d621f53f96
 DIST qutebrowser-3.4.0.tar.gz.asc 659 BLAKE2B 4e9438d9b3b33e2fc61dca1e264cf83b09e77cdb6fcaebe779347097ab4be064f2c1cd18cb59e23e959dc65da94cca578da2adc909c6f0e05b6e6304db25b23b SHA512 6fe8276f2873334dc433c7eeef96c36158a301b53a7bd3f0e670ec539e6c41d47c7c3d4979e590627fb9bf5656ce568bfb1231cab6485e7ca0d761b063b747d7
diff --git a/www-client/qutebrowser/qutebrowser-3.3.1.ebuild b/www-client/qutebrowser/qutebrowser-3.3.1.ebuild
deleted file mode 100644
index d38ed30059cb..000000000000
--- a/www-client/qutebrowser/qutebrowser-3.3.1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-inherit distutils-r1 xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git"
-else
-	inherit verify-sig
-	SRC_URI="
-		https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
-		verify-sig? ( https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc )
-	"
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg
-	KEYWORDS="amd64 ~arm64"
-fi
-
-DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
-HOMEPAGE="https://qutebrowser.org/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+adblock pdf widevine"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets]
-		dev-python/pyqt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/jinja2[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/zipp[${PYTHON_USEDEP}]
-		dev-qt/qtbase:6[icu,sqlite]
-		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
-		pdf? ( www-plugins/pdfjs )
-		widevine? ( www-plugins/chrome-binary-plugins )
-	')
-"
-# <pytest-bdd-8: https://github.com/qutebrowser/qutebrowser/issues/8342
-BDEPEND="
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/pyqt6[testlib]
-			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-			dev-python/cheroot[${PYTHON_USEDEP}]
-			dev-python/flask[${PYTHON_USEDEP}]
-			dev-python/hypothesis[${PYTHON_USEDEP}]
-			dev-python/pillow[${PYTHON_USEDEP}]
-			<dev-python/pytest-bdd-8[${PYTHON_USEDEP}]
-			dev-python/pytest-mock[${PYTHON_USEDEP}]
-			dev-python/pytest-qt[${PYTHON_USEDEP}]
-			dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-			dev-python/pytest-xvfb[${PYTHON_USEDEP}]
-			dev-python/tldextract[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" app-text/asciidoc"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-qutebrowser )"
-fi
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	if use pdf; then
-		# does not hurt to enable by default if it was explicitly requested
-		sed -e '/^content.pdfjs:/,+1s/false/true/' \
-			-i ${PN}/config/configdata.yml || die
-	fi
-
-	# let eclass handle python
-	sed -i '/setup.py/d' misc/Makefile || die
-
-	if [[ ${PV} == 9999 ]]; then
-		# call asciidoc(1) rather than the single target python module
-		sed -e '/cmdline = /s/= .*/= ["asciidoc"]/' \
-			-i scripts/asciidoc2html.py || die
-
-		"${EPYTHON}" scripts/asciidoc2html.py || die
-	fi
-
-	if use test; then
-		# skip unnecessary (for us) pytest plugins, and ignore Qt's
-		# warnings that tend to newly appear with new versions
-		sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
-			-e '/pytest-instafail/d' -e 's/--instafail//' \
-			-e '/qt_log_level_fail/s/WARNING/CRITICAL/' \
-			-i pytest.ini || die
-
-		if [[ ${PV} == 9999 ]]; then
-			# likewise, needs vulture
-			rm tests/unit/scripts/test_run_vulture.py || die
-		else
-			# https://github.com/qutebrowser/qutebrowser/issues/7620
-			rm tests/unit/scripts/test_problemmatchers.py || die
-		fi
-	fi
-}
-
-python_test() {
-	local -x PYTEST_QT_API=pyqt6
-
-	local EPYTEST_DESELECT=(
-		# end2end/IPC tests are broken with "Name error" if socket path is over
-		# ~108 characters (>124 in /var/tmp/portage) due to Linux limitations,
-		# skip rather than bother using /tmp+cleanup over ${T} (end2end tests
-		# are important, but the other tests should be enough for downstream)
-		tests/end2end
-		tests/unit/misc/test_ipc.py
-		# python eclasses provide a fake "failing" python2 and trips this test
-		tests/unit/misc/test_checkpyver.py::test_old_python
-		# not worth running dbus over
-		tests/unit/browser/test_notification.py::TestDBus
-		# fails in ebuild, seems due to saving fake downloads in the wrong location
-		tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
-		# may fail if environment is very large (bug #819393)
-		tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\]
-		# may fail if chromium version is unrecognized (aka newer qtwebengine)
-		tests/unit/utils/test_version.py
-		# new type added in (currently prerelease-only) PyQt6-WebEngine-6.8,
-		# *should* be safe to ignore until qutebrowser upstream updates this
-		# https://github.com/qutebrowser/qutebrowser/issues/8069#issuecomment-2439490061
-		tests/unit/browser/webengine/test_webengineinterceptor.py::test_no_missing_resource_types
-		# upstream is also ignoring this failure w/ Qt6.8 in live for now
-		# https://github.com/qutebrowser/qutebrowser/issues/8330
-		tests/unit/browser/webengine/test_webenginesettings.py::test_existing_dict
-	)
-
-	local epytestargs=(
-		# prefer pytest-xvfb over virtx given same upstream and is expected
-		-p xvfb
-		# skip warning tests broken by -Wdefault, and benchmarks
-		-k 'not _bench and not _matches_tree and not _warning'
-		# override eclass' settings, tempdirs are re-used by Qt
-		-o tmp_path_retention_policy=all
-	)
-
-	epytest "${epytestargs[@]}"
-}
-
-python_install_all() {
-	emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-
-	rm -- "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die
-	fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
-	python_fix_shebang "${ED}"/usr/share/${PN}
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "Note that optional scripts in ${EROOT}/usr/share/${PN}/{user,}scripts"
-		elog "have additional dependencies not covered by this ebuild, for example"
-		elog "view_in_mpv needs media-video/mpv[lua] and net-misc/yt-dlp."
-	fi
-
-	if has_version 'dev-qt/qtwebengine:6[bindist]'; then
-		ewarn
-		ewarn "USE=bindist is set on dev-qt/qtwebengine, be warned that this"
-		ewarn "will prevent playback of proprietary media formats (e.g. h264)."
-	fi
-}
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index b00316e71646..07915eb3b0c1 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,6 +1,6 @@
-DIST vivaldi-snapshot_7.1.3550.4-1_amd64.deb 121584684 BLAKE2B c5bf0a141764bd221812c6e10866ec9b5c3dc2c841d73f7e2db51229f42914a82f8bc811204230a3058fee18c0e6b846caf7bef368b39dec6cf6aa49eb7ba96d SHA512 e31fb4730b07507f70f1c2ce806cf77b8a4533849b3cc53941a442ef746f5829c2257a458d3146a650dddad9880a6246c8bb2045c95859326d09148dc1c8b3f4
-DIST vivaldi-snapshot_7.1.3550.4-1_arm64.deb 113676640 BLAKE2B 3d4c20dc4ef6684403266436b15588af5a21a6855def06315a32369c3a2438738de5c7afc4084c4ec0069574f6d61c01f466d70c70e976135eea1e6c38ee44b2 SHA512 00a64ab9ca3144a94f409f649f79218449e9e281a83512ba4bb88b0c501e9bc10a2d973a65b7ed4b50b4685ed6e6933d2aa1f173ef7e7b976c34b8a21eeed258
-DIST vivaldi-snapshot_7.1.3550.4-1_armhf.deb 114767348 BLAKE2B 1d23ee82b6a3df2e65bf40e938ca0ee9479878375399a5ea37ea6c0b99b55f8a6649798e5949a3248093daae1f2bf4260ca3df143b72e60f317b6994e782e61a SHA512 b2f9313cb266d4dc71ded2239fe5c53b57385d27feea728675018113ef9334a2daa140fbc760d37bb237eb91acd3a3950628b5ce36754a0404d05042ce9c413b
-DIST vivaldi-snapshot_7.1.3554.3-1_amd64.deb 121585032 BLAKE2B 24d7dd94bf1dfafc2726b0a8f5ccedf3adffe913905306503d926b2aa2243ddfaefdd38071c86d02168b1792c48a45b41d31b1db0e7a8cffe502265903f90473 SHA512 fd12b1db457dbe728aa26b9aa4bb82ecfbe65c8ed0761767136429bf85c2049a317e109f8cdde3000f3904810be36fb144b19baf07358e68c2a51b24be425a03
-DIST vivaldi-snapshot_7.1.3554.3-1_arm64.deb 113712444 BLAKE2B 46c6659ce7b24f8d63c3e7deda6b267c7e3c68338b80ed513fb055b813bb1d164cc7c822547e10620e2b1bd5ea4fc571d50dd247807d5254f196d38167179936 SHA512 ab5fea9372aab1e2ebc0f7d494aa5b79c3bea17ef5ff603456f75cf9e2a2cfc6492ece20f8cb194729318b89f0b8f0545fee1bfd9e822adbe00741dc9a9f77d3
-DIST vivaldi-snapshot_7.1.3554.3-1_armhf.deb 114778124 BLAKE2B ecd9458dd17c65ac38b9bf0bd73a4b71d38e2e1293220d6a7af298705c8f25f3565c66b3bd4dcaf6930e8e4763bea2beaf850e58fc72aed6e19807a574bcac68 SHA512 952c24ed5040fc2061d54a4610b3d9da01e59ed37bed626ddb6b2877a5f45a0aae34618e6337789df353150efe2aa6d1d56699c926669dcc0f5db1764e4bee73
+DIST vivaldi-snapshot_7.1.3570.27-1_amd64.deb 121921700 BLAKE2B 43dacc9d58b49e05467181d7e7da5a4705e47faf3abab41d8577fd27576fc69e68334594a9c4e01997e0a129005d052d58257175795784b54ed1e7a123594b4f SHA512 d853f33d2cda8383b792019167946e2b65899e8dcc0a262cf882adf587ebe3c268a1f7859ddb7440c86ba4cc5f39db360dda8306964190875e603f862225e9f1
+DIST vivaldi-snapshot_7.1.3570.27-1_arm64.deb 113881820 BLAKE2B 4721f1b215e477f76414dd7dd47ce62269a944fc58b157c970d5b82d755560e036ddea503aa768da8365fadabf33887e03d0d7bcecddb422651c698d599d1c26 SHA512 f9552dd82c31c25e75ec965ddc1e9da1dd3436766861f374ebbb5fa26f720c79223eddcece5414b92e4e81d8998fc0c039d750ab65edebc0e83b993a4cedc904
+DIST vivaldi-snapshot_7.1.3570.27-1_armhf.deb 114842072 BLAKE2B 566b838ff2a2280dc55a69ce97a537c0795cb17ba4f873466b9ce2844487a83fb8bf316b5565ce6b95887f92f730f7011c58b37c2df2d120968bde618d7f66c7 SHA512 a8cca21275db39225c9b19f8ad942855a3ac945cb6339e8edda12e429cce303da020a104fa2c6cbef5cba11d3d813601a62fbfc80a918578146b724f7e7c5b5f
+DIST vivaldi-snapshot_7.1.3570.3-1_amd64.deb 121835656 BLAKE2B 1a5f1e0b8f617d3dd6f45a1d0a49317d072a186ae31c1f2967228d9626e96dcf092436a4e48f6f6287c22d2ec2a628312e3c7b5b881050213990a87604657e34 SHA512 2b106e74b03d521432fa4673c67d088eda8ec1bf27521050c6488693bd7b9f5a23bec63fe133ea84250b27b8b5aea0bb2afe8fb7468f3fa306efa28159749c70
+DIST vivaldi-snapshot_7.1.3570.3-1_arm64.deb 113747528 BLAKE2B b3cbcdd4fb3697c5e0e454846f245d1df30c664006d8b658291080d7dd30e8c4c8de25cfbb40151278a49af6ba5fb768594c3ee971d5d545594df3a2adaee15d SHA512 9a5a147a1cb0268b144a6c2c7906e83bcf10dec12619b9427a9211d7e2ffdcd1a53f327b7a82782ad97dfe53418171afeac0091dfb1bccafd42ad09c29dadc07
+DIST vivaldi-snapshot_7.1.3570.3-1_armhf.deb 114832316 BLAKE2B 80502f6ec18170ddd499e0adfe43196016a04f1d21a6c139af112407bf08fca750d50d5c168b4b2997965208125ea762a04288d4192d4c938126cb1c9e285ca3 SHA512 14d8583590a44b95f68922406f6b3604490e590fbb0175151ccd2b4a88a9cad92c2b8ac5b13d4ad19c78771ea48dfb46fe9151a4a370eb2a4366a8ede952fabd
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-7.1.3550.4.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-7.1.3550.4.ebuild
deleted file mode 100644
index 284be765fc30..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-7.1.3550.4.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_VERSION="132"
-CHROMIUM_LANGS="
-	af
-	am
-	ar
-	az
-	be
-	bg
-	bn
-	ca
-	ca-valencia
-	cs
-	da
-	de
-	de-CH
-	el
-	en-GB
-	en-US
-	eo
-	es
-	es-419
-	es-PE
-	et
-	eu
-	fa
-	fi
-	fil
-	fr
-	fy
-	gd
-	gl
-	gu
-	he
-	hi
-	hr
-	hu
-	hy
-	id
-	io
-	is
-	it
-	ja
-	jbo
-	ka
-	kab
-	kn
-	ko
-	lt
-	lv
-	mk
-	ml
-	mr
-	ms
-	nb
-	nl
-	nn
-	pa
-	pl
-	pt-BR
-	pt-PT
-	ro
-	ru
-	sc
-	sk
-	sl
-	sq
-	sr
-	sr-Latn
-	sv
-	sw
-	ta
-	te
-	th
-	tr
-	uk
-	ur
-	vi
-	zh-CN
-	zh-TW
-"
-
-inherit chromium-2 desktop linux-info toolchain-funcs unpacker xdg
-
-VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-
-if [[ ${PV} = *_p* ]]; then
-	DEB_REV="${PV#*_p}"
-else
-	DEB_REV=1
-fi
-
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
-"
-
-S="${WORKDIR}"
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine"
-RESTRICT="bindist mirror"
-#REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libXrandr
-	x11-libs/pango
-	gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 )
-	proprietary-codecs? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-CONFIG_CHECK="~CPU_FREQ"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	# Rename docs directory to our needs.
-	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
-
-	# Decompress the docs.
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
-
-	# Remove cron job for updating from Debian repos.
-	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
-	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
-
-	# Remove scripts that will most likely break things.
-	rm -vf ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
-
-	pushd ${VIVALDI_HOME}/locales > /dev/null || die
-	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
-	rm kmr.pak || die # No flag for Kurmanji.
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use proprietary-codecs; then
-		einfo Bundled $($(tc-getSTRINGS) ${VIVALDI_HOME}/lib/libffmpeg.so | grep -m1 "^FFmpeg version ")
-		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
-		rmdir ${VIVALDI_HOME}/lib || die
-	fi
-
-	if ! use qt5; then
-		rm ${VIVALDI_HOME}/libqt5_shim.so || die
-	fi
-
-	if ! use qt6; then
-		rm ${VIVALDI_HOME}/libqt6_shim.so || die
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	mv */ "${D}" || die
-	dosym ../../${VIVALDI_HOME}/${PN} /usr/bin/${VIVALDI_PN}
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-
-	local logo size
-	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
-		size=${logo##*_}
-		size=${size%.*}
-		newicon -s "${size}" "${logo}" ${PN}.png
-	done
-
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
-			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
-	fi
-
-	if use widevine; then
-		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
-			  /${VIVALDI_HOME}/WidevineCdm
-	else
-		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
-	fi
-
-	case ${PN} in
-		vivaldi) dosym ${VIVALDI_PN} /usr/bin/${PN} ;;
-		vivaldi-snapshot) dosym ${PN} /${VIVALDI_HOME}/vivaldi ;;
-	esac
-}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-7.1.3554.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-7.1.3554.3.ebuild
deleted file mode 100644
index 284be765fc30..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-7.1.3554.3.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_VERSION="132"
-CHROMIUM_LANGS="
-	af
-	am
-	ar
-	az
-	be
-	bg
-	bn
-	ca
-	ca-valencia
-	cs
-	da
-	de
-	de-CH
-	el
-	en-GB
-	en-US
-	eo
-	es
-	es-419
-	es-PE
-	et
-	eu
-	fa
-	fi
-	fil
-	fr
-	fy
-	gd
-	gl
-	gu
-	he
-	hi
-	hr
-	hu
-	hy
-	id
-	io
-	is
-	it
-	ja
-	jbo
-	ka
-	kab
-	kn
-	ko
-	lt
-	lv
-	mk
-	ml
-	mr
-	ms
-	nb
-	nl
-	nn
-	pa
-	pl
-	pt-BR
-	pt-PT
-	ro
-	ru
-	sc
-	sk
-	sl
-	sq
-	sr
-	sr-Latn
-	sv
-	sw
-	ta
-	te
-	th
-	tr
-	uk
-	ur
-	vi
-	zh-CN
-	zh-TW
-"
-
-inherit chromium-2 desktop linux-info toolchain-funcs unpacker xdg
-
-VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-
-if [[ ${PV} = *_p* ]]; then
-	DEB_REV="${PV#*_p}"
-else
-	DEB_REV=1
-fi
-
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
-"
-
-S="${WORKDIR}"
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine"
-RESTRICT="bindist mirror"
-#REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libXrandr
-	x11-libs/pango
-	gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 )
-	proprietary-codecs? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-CONFIG_CHECK="~CPU_FREQ"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	# Rename docs directory to our needs.
-	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
-
-	# Decompress the docs.
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
-
-	# Remove cron job for updating from Debian repos.
-	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
-	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
-
-	# Remove scripts that will most likely break things.
-	rm -vf ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
-
-	pushd ${VIVALDI_HOME}/locales > /dev/null || die
-	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
-	rm kmr.pak || die # No flag for Kurmanji.
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use proprietary-codecs; then
-		einfo Bundled $($(tc-getSTRINGS) ${VIVALDI_HOME}/lib/libffmpeg.so | grep -m1 "^FFmpeg version ")
-		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
-		rmdir ${VIVALDI_HOME}/lib || die
-	fi
-
-	if ! use qt5; then
-		rm ${VIVALDI_HOME}/libqt5_shim.so || die
-	fi
-
-	if ! use qt6; then
-		rm ${VIVALDI_HOME}/libqt6_shim.so || die
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	mv */ "${D}" || die
-	dosym ../../${VIVALDI_HOME}/${PN} /usr/bin/${VIVALDI_PN}
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-
-	local logo size
-	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
-		size=${logo##*_}
-		size=${size%.*}
-		newicon -s "${size}" "${logo}" ${PN}.png
-	done
-
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
-			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
-	fi
-
-	if use widevine; then
-		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
-			  /${VIVALDI_HOME}/WidevineCdm
-	else
-		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
-	fi
-
-	case ${PN} in
-		vivaldi) dosym ${VIVALDI_PN} /usr/bin/${PN} ;;
-		vivaldi-snapshot) dosym ${PN} /${VIVALDI_HOME}/vivaldi ;;
-	esac
-}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-7.1.3570.27.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-7.1.3570.27.ebuild
new file mode 100644
index 000000000000..545ea51d964a
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-7.1.3570.27.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_VERSION="132"
+CHROMIUM_LANGS="
+	af
+	am
+	ar
+	az
+	be
+	bg
+	bn
+	ca
+	ca-valencia
+	cs
+	da
+	de
+	de-CH
+	el
+	en-GB
+	en-US
+	eo
+	es
+	es-419
+	es-PE
+	et
+	eu
+	fa
+	fi
+	fil
+	fr
+	fy
+	gd
+	gl
+	gu
+	he
+	hi
+	hr
+	hu
+	hy
+	id
+	io
+	is
+	it
+	ja
+	jbo
+	ka
+	kab
+	kn
+	ko
+	lt
+	lv
+	mk
+	ml
+	mr
+	ms
+	nb
+	nl
+	nn
+	pa
+	pl
+	pt-BR
+	pt-PT
+	ro
+	ru
+	sc
+	sk
+	sl
+	sq
+	sr
+	sr-Latn
+	sv
+	sw
+	ta
+	te
+	th
+	tr
+	uk
+	ur
+	vi
+	zh-CN
+	zh-TW
+"
+
+inherit chromium-2 desktop linux-info toolchain-funcs unpacker xdg
+
+VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+
+if [[ ${PV} = *_p* ]]; then
+	DEB_REV="${PV#*_p}"
+else
+	DEB_REV=1
+fi
+
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
+
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
+	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
+"
+
+S="${WORKDIR}"
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE="ffmpeg-chromium gtk proprietary-codecs qt6 widevine"
+RESTRICT="bindist mirror"
+#REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/pango
+	gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 )
+	proprietary-codecs? (
+		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+CONFIG_CHECK="~CPU_FREQ"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	# Rename docs directory to our needs.
+	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
+
+	# Decompress the docs.
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	# The appdata directory is deprecated.
+	mv usr/share/{appdata,metainfo}/ || die
+
+	# Remove cron job for updating from Debian repos.
+	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
+	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
+
+	# Remove scripts that will most likely break things.
+	rm -vf ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
+
+	pushd ${VIVALDI_HOME}/locales > /dev/null || die
+	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
+	rm kmr.pak || die # No flag for Kurmanji.
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use proprietary-codecs; then
+		einfo Bundled $($(tc-getSTRINGS) ${VIVALDI_HOME}/lib/libffmpeg.so | grep -m1 "^FFmpeg version ")
+		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
+		rmdir ${VIVALDI_HOME}/lib || die
+	fi
+
+	# Qt5 is obsolete now.
+	rm ${VIVALDI_HOME}/libqt5_shim.so || die
+
+	if ! use qt6; then
+		rm ${VIVALDI_HOME}/libqt6_shim.so || die
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	mv */ "${D}" || die
+	dosym ../../${VIVALDI_HOME}/${PN} /usr/bin/${VIVALDI_PN}
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+
+	local logo size
+	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
+		size=${logo##*_}
+		size=${size%.*}
+		newicon -s "${size}" "${logo}" ${PN}.png
+	done
+
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
+			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
+	fi
+
+	if use widevine; then
+		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
+			  /${VIVALDI_HOME}/WidevineCdm
+	else
+		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
+	fi
+
+	case ${PN} in
+		vivaldi) dosym ${VIVALDI_PN} /usr/bin/${PN} ;;
+		vivaldi-snapshot) dosym ${PN} /${VIVALDI_HOME}/vivaldi ;;
+	esac
+}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-7.1.3570.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-7.1.3570.3.ebuild
new file mode 100644
index 000000000000..545ea51d964a
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-7.1.3570.3.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_VERSION="132"
+CHROMIUM_LANGS="
+	af
+	am
+	ar
+	az
+	be
+	bg
+	bn
+	ca
+	ca-valencia
+	cs
+	da
+	de
+	de-CH
+	el
+	en-GB
+	en-US
+	eo
+	es
+	es-419
+	es-PE
+	et
+	eu
+	fa
+	fi
+	fil
+	fr
+	fy
+	gd
+	gl
+	gu
+	he
+	hi
+	hr
+	hu
+	hy
+	id
+	io
+	is
+	it
+	ja
+	jbo
+	ka
+	kab
+	kn
+	ko
+	lt
+	lv
+	mk
+	ml
+	mr
+	ms
+	nb
+	nl
+	nn
+	pa
+	pl
+	pt-BR
+	pt-PT
+	ro
+	ru
+	sc
+	sk
+	sl
+	sq
+	sr
+	sr-Latn
+	sv
+	sw
+	ta
+	te
+	th
+	tr
+	uk
+	ur
+	vi
+	zh-CN
+	zh-TW
+"
+
+inherit chromium-2 desktop linux-info toolchain-funcs unpacker xdg
+
+VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+
+if [[ ${PV} = *_p* ]]; then
+	DEB_REV="${PV#*_p}"
+else
+	DEB_REV=1
+fi
+
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
+
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
+	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
+"
+
+S="${WORKDIR}"
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE="ffmpeg-chromium gtk proprietary-codecs qt6 widevine"
+RESTRICT="bindist mirror"
+#REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/pango
+	gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 )
+	proprietary-codecs? (
+		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+CONFIG_CHECK="~CPU_FREQ"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	# Rename docs directory to our needs.
+	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
+
+	# Decompress the docs.
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	# The appdata directory is deprecated.
+	mv usr/share/{appdata,metainfo}/ || die
+
+	# Remove cron job for updating from Debian repos.
+	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
+	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
+
+	# Remove scripts that will most likely break things.
+	rm -vf ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
+
+	pushd ${VIVALDI_HOME}/locales > /dev/null || die
+	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
+	rm kmr.pak || die # No flag for Kurmanji.
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use proprietary-codecs; then
+		einfo Bundled $($(tc-getSTRINGS) ${VIVALDI_HOME}/lib/libffmpeg.so | grep -m1 "^FFmpeg version ")
+		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
+		rmdir ${VIVALDI_HOME}/lib || die
+	fi
+
+	# Qt5 is obsolete now.
+	rm ${VIVALDI_HOME}/libqt5_shim.so || die
+
+	if ! use qt6; then
+		rm ${VIVALDI_HOME}/libqt6_shim.so || die
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	mv */ "${D}" || die
+	dosym ../../${VIVALDI_HOME}/${PN} /usr/bin/${VIVALDI_PN}
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+
+	local logo size
+	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
+		size=${logo##*_}
+		size=${size%.*}
+		newicon -s "${size}" "${logo}" ${PN}.png
+	done
+
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
+			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
+	fi
+
+	if use widevine; then
+		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
+			  /${VIVALDI_HOME}/WidevineCdm
+	else
+		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
+	fi
+
+	case ${PN} in
+		vivaldi) dosym ${VIVALDI_PN} /usr/bin/${PN} ;;
+		vivaldi-snapshot) dosym ${PN} /${VIVALDI_HOME}/vivaldi ;;
+	esac
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 8525e36af0b8..60899be61b10 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,6 +1,6 @@
-DIST vivaldi-stable_7.0.3495.26-1_amd64.deb 120943624 BLAKE2B e6ead07fdf054d56704202b7781f0ddfa01a2ee0c63743c81fa0481d6aa68bb74dc9f80123339fa8971e701e32ce8927fbbef2e1770882a7ea82f0ff752e6a8f SHA512 cd86b6d0b4a8c174cf82506bf06c0b18eb4b5b486ca11b7266d49ae5d3e40814df65f70c7447434d56518eca9ff7d9afe79f5e3be3c2176b1000bc9932137dfd
-DIST vivaldi-stable_7.0.3495.26-1_arm64.deb 112830460 BLAKE2B 8f8c27010e54e836bfc114d5988bb4520081c6fc386fa6d21c1d8f2815d58fae3d7ec8d003014ae027423476ba642b6c7260c6f1dd9b2d6bdadbd0f95a4e13be SHA512 8586f8fda735b0ea821bf9a95e6fd92892c1cdcd99bbf0949f252760cff1112d9ba9cb573dde6236a95d61bf7f23d77aa2139c74f067dbc700148fcf14d3b06d
-DIST vivaldi-stable_7.0.3495.26-1_armhf.deb 113968304 BLAKE2B 924255a316e8985bd41d689a5fe5cd9975a81d42289fee6994b0c6d4448078d2cb4ddb9ca31d4fcb02f8b9f47b22003bffca83f1a26fd2f20752035cbcd296be SHA512 9275006e325d65f6c9fcd1bcd33c96372ccb12ca0b24e9fc0ca251933ba4838ceccbd5cc34910669eacfdc24e34b028a42bd90b8269a66ba49f4f904fd6ae994
 DIST vivaldi-stable_7.0.3495.27-1_amd64.deb 120952460 BLAKE2B 7bb746de3ce8a11d265640b3c090dcb9e5a00e5943343d0075f1e14d7f17059019497c85d65a59dd0a616c33890486948d6beb5283bb0d99223dc9e85eabf0b0 SHA512 11db587161471db9583d962dd48971870db199663b0c60275be2481b2b80088a84784396b2a37e08678da9a113c9f06ae6a1e8c326c7aab03672dcb8fa6df11f
 DIST vivaldi-stable_7.0.3495.27-1_arm64.deb 112852456 BLAKE2B 3488858ecce9ca6b3ada8aba8a4059d7e7c884c87c8ef0398bd7dacd65e30e9ace556c71b8ca1b40887e57867db9150ff1450bcc030fa5c46e42f50bb35cc580 SHA512 81a04ab7aad7e601eddbc6f1c8627c23963715f6f02ea28ee33d7fb0fbcbb77e5fa69c026c1031e5b1216338b8af430b824171ed63e90b43673b57013fbd9cbe
 DIST vivaldi-stable_7.0.3495.27-1_armhf.deb 113974364 BLAKE2B a86b3931b786038d42c553574ca8e685207930a90edb11c20efe93721b05f318217ed897f58fca20411ec767955ba2ddd9a623d30597c1137be12d5ba9da5b90 SHA512 37c904b3798f29462a91a148d0cb90eca9eca705547194ceb729fc99f6f7224bd997cddd33e4e0b7ad0d80d250c8001e64e3cff6ca48a4f63b880e32a86950bd
+DIST vivaldi-stable_7.0.3495.29-1_amd64.deb 120955208 BLAKE2B e7dc6a93a791c9478c5a6236b536acb4320fb536535785f0df211efb197bae1cf93d50ca0195f310f627bdb7ba22a0dde467517844344568eaa26a80da05694d SHA512 7ee6dcbfd0277f06ed3fccd897f63b7b85f9525720205774847e7c847a6b292add93c99fb6adc3aefc321d6cf2ea8ab439bb2659fe39f1d2b48acf31e0e8d37f
+DIST vivaldi-stable_7.0.3495.29-1_arm64.deb 112832248 BLAKE2B c4d2388dac270f470390424e4ec9be6ec6a359d9a715e966787366ad4d72864912c334d0c0207cff20e17a679caad58d0f437443d2443025fac62b9777ff8307 SHA512 3c0c87652ef5677f143f873354d087b6ccf69e3f1290b33efd148f9e39440883fcb5bca0e5013f04b3c7c956bc0a2320f57ef630a456f0b5d9243e69ba788240
+DIST vivaldi-stable_7.0.3495.29-1_armhf.deb 113973704 BLAKE2B ddc465d5dc7af4b608e7d49da3f650839fa4cea8510bb859e35e07d519a8621b51ab8a039e80593a4cbb3ad7a10acd56f0eac8c4eeb92ed0a4831f0b9632953a SHA512 46565c32493d7a80784b15418020299c0a3829719d7f0e9ebc33e19b32d6708ea66421e34e648ff7cb16c06d07970e40c33a587341b9b506ca7240aae15792c3
diff --git a/www-client/vivaldi/vivaldi-7.0.3495.26.ebuild b/www-client/vivaldi/vivaldi-7.0.3495.26.ebuild
deleted file mode 100644
index 73ea8c901c06..000000000000
--- a/www-client/vivaldi/vivaldi-7.0.3495.26.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_VERSION="128"
-CHROMIUM_LANGS="
-	af
-	am
-	ar
-	az
-	be
-	bg
-	bn
-	ca
-	ca-valencia
-	cs
-	da
-	de
-	de-CH
-	el
-	en-GB
-	en-US
-	eo
-	es
-	es-419
-	es-PE
-	et
-	eu
-	fa
-	fi
-	fil
-	fr
-	fy
-	gd
-	gl
-	gu
-	he
-	hi
-	hr
-	hu
-	hy
-	id
-	io
-	is
-	it
-	ja
-	jbo
-	ka
-	kab
-	kn
-	ko
-	lt
-	lv
-	mk
-	ml
-	mr
-	ms
-	nb
-	nl
-	nn
-	pa
-	pl
-	pt-BR
-	pt-PT
-	ro
-	ru
-	sc
-	sk
-	sl
-	sq
-	sr
-	sr-Latn
-	sv
-	sw
-	ta
-	te
-	th
-	tr
-	uk
-	ur
-	vi
-	zh-CN
-	zh-TW
-"
-
-inherit chromium-2 desktop linux-info toolchain-funcs unpacker xdg
-
-VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-
-if [[ ${PV} = *_p* ]]; then
-	DEB_REV="${PV#*_p}"
-else
-	DEB_REV=1
-fi
-
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
-"
-
-S="${WORKDIR}"
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64"
-IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine"
-RESTRICT="bindist mirror"
-#REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libXrandr
-	x11-libs/pango
-	gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 )
-	proprietary-codecs? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,widgets] )
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-CONFIG_CHECK="~CPU_FREQ"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	# Rename docs directory to our needs.
-	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
-
-	# Decompress the docs.
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
-
-	# Remove cron job for updating from Debian repos.
-	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
-	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
-
-	# Remove scripts that will most likely break things.
-	rm -vf ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
-
-	pushd ${VIVALDI_HOME}/locales > /dev/null || die
-	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
-	rm kmr.pak || die # No flag for Kurmanji.
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use proprietary-codecs; then
-		einfo Bundled $($(tc-getSTRINGS) ${VIVALDI_HOME}/lib/libffmpeg.so | grep -m1 "^FFmpeg version ")
-		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
-		rmdir ${VIVALDI_HOME}/lib || die
-	fi
-
-	if ! use qt5; then
-		rm ${VIVALDI_HOME}/libqt5_shim.so || die
-	fi
-
-	if ! use qt6; then
-		rm ${VIVALDI_HOME}/libqt6_shim.so || die
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	mv */ "${D}" || die
-	dosym ../../${VIVALDI_HOME}/${PN} /usr/bin/${VIVALDI_PN}
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-
-	local logo size
-	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
-		size=${logo##*_}
-		size=${size%.*}
-		newicon -s "${size}" "${logo}" ${PN}.png
-	done
-
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
-			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
-	fi
-
-	if use widevine; then
-		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
-			  /${VIVALDI_HOME}/WidevineCdm
-	else
-		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
-	fi
-
-	case ${PN} in
-		vivaldi) dosym ${VIVALDI_PN} /usr/bin/${PN} ;;
-		vivaldi-snapshot) dosym ${PN} /${VIVALDI_HOME}/vivaldi ;;
-	esac
-}
diff --git a/www-client/vivaldi/vivaldi-7.0.3495.27.ebuild b/www-client/vivaldi/vivaldi-7.0.3495.27.ebuild
index 8063fc01d0e9..3c057d296779 100644
--- a/www-client/vivaldi/vivaldi-7.0.3495.27.ebuild
+++ b/www-client/vivaldi/vivaldi-7.0.3495.27.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
@@ -108,7 +108,7 @@ SRC_URI="
 S="${WORKDIR}"
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+KEYWORDS="-* amd64 ~arm ~arm64"
 IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine"
 RESTRICT="bindist mirror"
 #REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
diff --git a/www-client/vivaldi/vivaldi-7.0.3495.29.ebuild b/www-client/vivaldi/vivaldi-7.0.3495.29.ebuild
new file mode 100644
index 000000000000..4cec9cc02485
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-7.0.3495.29.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_VERSION="128"
+CHROMIUM_LANGS="
+	af
+	am
+	ar
+	az
+	be
+	bg
+	bn
+	ca
+	ca-valencia
+	cs
+	da
+	de
+	de-CH
+	el
+	en-GB
+	en-US
+	eo
+	es
+	es-419
+	es-PE
+	et
+	eu
+	fa
+	fi
+	fil
+	fr
+	fy
+	gd
+	gl
+	gu
+	he
+	hi
+	hr
+	hu
+	hy
+	id
+	io
+	is
+	it
+	ja
+	jbo
+	ka
+	kab
+	kn
+	ko
+	lt
+	lv
+	mk
+	ml
+	mr
+	ms
+	nb
+	nl
+	nn
+	pa
+	pl
+	pt-BR
+	pt-PT
+	ro
+	ru
+	sc
+	sk
+	sl
+	sq
+	sr
+	sr-Latn
+	sv
+	sw
+	ta
+	te
+	th
+	tr
+	uk
+	ur
+	vi
+	zh-CN
+	zh-TW
+"
+
+inherit chromium-2 desktop linux-info toolchain-funcs unpacker xdg
+
+VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+
+if [[ ${PV} = *_p* ]]; then
+	DEB_REV="${PV#*_p}"
+else
+	DEB_REV=1
+fi
+
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
+
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
+	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
+"
+
+S="${WORKDIR}"
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE="ffmpeg-chromium gtk proprietary-codecs qt6 widevine"
+RESTRICT="bindist mirror"
+#REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/pango
+	gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 )
+	proprietary-codecs? (
+		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+CONFIG_CHECK="~CPU_FREQ"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	# Rename docs directory to our needs.
+	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
+
+	# Decompress the docs.
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	# The appdata directory is deprecated.
+	mv usr/share/{appdata,metainfo}/ || die
+
+	# Remove cron job for updating from Debian repos.
+	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
+	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
+
+	# Remove scripts that will most likely break things.
+	rm -vf ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
+
+	pushd ${VIVALDI_HOME}/locales > /dev/null || die
+	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
+	rm kmr.pak || die # No flag for Kurmanji.
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use proprietary-codecs; then
+		einfo Bundled $($(tc-getSTRINGS) ${VIVALDI_HOME}/lib/libffmpeg.so | grep -m1 "^FFmpeg version ")
+		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
+		rmdir ${VIVALDI_HOME}/lib || die
+	fi
+
+	# Qt5 is obsolete now.
+	rm ${VIVALDI_HOME}/libqt5_shim.so || die
+
+	if ! use qt6; then
+		rm ${VIVALDI_HOME}/libqt6_shim.so || die
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	mv */ "${D}" || die
+	dosym ../../${VIVALDI_HOME}/${PN} /usr/bin/${VIVALDI_PN}
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+
+	local logo size
+	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
+		size=${logo##*_}
+		size=${size%.*}
+		newicon -s "${size}" "${logo}" ${PN}.png
+	done
+
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
+			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
+	fi
+
+	if use widevine; then
+		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
+			  /${VIVALDI_HOME}/WidevineCdm
+	else
+		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
+	fi
+
+	case ${PN} in
+		vivaldi) dosym ${VIVALDI_PN} /usr/bin/${PN} ;;
+		vivaldi-snapshot) dosym ${PN} /${VIVALDI_HOME}/vivaldi ;;
+	esac
+}
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 47252f35de48..686653b88706 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_132.0.6834.57-1_amd64.deb 112536512 BLAKE2B efd0ca05596f5fb14126807c174be47485d71066b3ba06ee80edf57cd54007813cfd003372efb564661796873b3c688ca66665c839b4b3c5d620ae868c7949c6 SHA512 7048e514f585703bcbec1f87be67a34e8f3324d1df6d8307cd540cd16047f86d805fd26ae8cdaf068c1cceacdf0281b1382adcde395096f4ba31cb9a8311e825
-DIST google-chrome-stable_131.0.6778.204-1_amd64.deb 112770956 BLAKE2B 73c69f9ef4ea5a8400121886c9e6a1b671434cbd12a34222517390390c3e5c1cab9a3abe2995f5bbe45d2a9410390de3d1d04f3d787670deb91e0c3b0521f1c6 SHA512 e3d7ffbb51ef3a251358ddf67ec36c7ff45c5a6eaa8b118e93fd26212a024f369f017b92808fa9681e8e8452e8da77c9cd693a67d33d729685fd66673e8f6fc2
-DIST google-chrome-unstable_133.0.6905.0-1_amd64.deb 114266772 BLAKE2B fb232825db06d805ce9cb35c84eb0a9a8bb58bea4b5c2222cb24309bfb5f09f8804f3e08b2276192ab9adf1f0f404ab5270b01430c882931ba7573708fe9bfef SHA512 df1145cddba76c25b3197da939802604fe70eece62e93305ad151bdbc1e027db92f214cb8634ed32ba1d99dd215ad692197404bd4b0af116ef71964cc154bc7b
+DIST google-chrome-beta_133.0.6943.16-1_amd64.deb 114090924 BLAKE2B e01d4785a1709c0722de2c9473333a9899abf060cb6ef43ba1f1c06e04977f4824fd7b5415cecc45e0e93cd09f31ea8376fd04416b30c26cdad73060cd8f9c07 SHA512 2772aa95d60c86644815af0a0c317ef7a77aea0b6e526239f8d317f146262d6bd00621342ca13cbd5aee91d94bc3543e9aabbfc8a196f34a619434942c134657
+DIST google-chrome-stable_132.0.6834.83-1_amd64.deb 112253548 BLAKE2B 1e1b263174d97493820e28fc5cc538a216c5436881938fe6dc1b139d9111450f691c4095803f4ffdff2325d7d823a146f99741b48b1cf664547b2ca7bf7074a8 SHA512 3e8b9fcf711f89241b17071f1187021d651c5ea147395e1d12f1d9f47e7b1f0704fc217bb2fa04b13ee3c8b6eac2f84da4a26140c536c03dd5ae466afa033d5c
+DIST google-chrome-unstable_134.0.6958.2-1_amd64.deb 114406436 BLAKE2B d6e635a6609c2f00c9cd4ec1089e9f5a8d8a0184256c81db122853cbd910ef91a7eae3d02be87aecde6ece336336a703227a81aaa12202f5fdd8c0fa776f4e6f SHA512 04a6b931b52c35a32cedbc4dea2734479af753310d27b8ef4cd510c5c640ec151358de4964b84974fe89912daec7a9e52b058b7063177dd2dc374003904b929f
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-131.0.6778.204.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-131.0.6778.204.ebuild
deleted file mode 100644
index 01e48ea7c665..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-131.0.6778.204.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2012-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit unpacker
-
-DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
-HOMEPAGE="https://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_alpha}-1
-		;;
-	*_beta*)
-		SLOT="beta"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_beta}-1
-		;;
-	*)
-		SLOT="stable"
-		CHROMEDIR="opt/google/chrome"
-		MY_PV=${PV}-1
-		;;
-esac
-
-MY_PN="google-chrome-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-S="${WORKDIR}/${CHROMEDIR}"
-
-LICENSE="google-chrome"
-KEYWORDS="-* amd64"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	sys-libs/glibc
-"
-
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)/chromium-browser"
-	doins -r WidevineCdm
-}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-132.0.6834.57_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-132.0.6834.57_beta.ebuild
deleted file mode 100644
index 3dabec912ba2..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-132.0.6834.57_beta.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2012-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit unpacker
-
-DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
-HOMEPAGE="https://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_alpha}-1
-		;;
-	*_beta*)
-		SLOT="beta"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_beta}-1
-		;;
-	*)
-		SLOT="stable"
-		CHROMEDIR="opt/google/chrome"
-		MY_PV=${PV}-1
-		;;
-esac
-
-MY_PN="google-chrome-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-S="${WORKDIR}/${CHROMEDIR}"
-
-LICENSE="google-chrome"
-KEYWORDS="-* ~amd64"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	sys-libs/glibc
-"
-
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)/chromium-browser"
-	doins -r WidevineCdm
-}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-132.0.6834.83.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-132.0.6834.83.ebuild
new file mode 100644
index 000000000000..57e4c7d71e26
--- /dev/null
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-132.0.6834.83.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2012-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
+HOMEPAGE="https://www.google.com/chrome"
+
+case ${PV} in
+	*_alpha*)
+		SLOT="unstable"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_alpha}-1
+		;;
+	*_beta*)
+		SLOT="beta"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_beta}-1
+		;;
+	*)
+		SLOT="stable"
+		CHROMEDIR="opt/google/chrome"
+		MY_PV=${PV}-1
+		;;
+esac
+
+MY_PN="google-chrome-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+S="${WORKDIR}/${CHROMEDIR}"
+
+LICENSE="google-chrome"
+KEYWORDS="-* amd64"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	sys-libs/glibc
+"
+
+for x in 0 beta stable unstable; do
+	if [[ ${SLOT} != ${x} ]]; then
+		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+	fi
+done
+
+QA_PREBUILT="*"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
+}
+
+src_install() {
+	insinto "/usr/$(get_libdir)/chromium-browser"
+	doins -r WidevineCdm
+}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-133.0.6905.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-133.0.6905.0_alpha.ebuild
deleted file mode 100644
index 3dabec912ba2..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-133.0.6905.0_alpha.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2012-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit unpacker
-
-DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
-HOMEPAGE="https://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_alpha}-1
-		;;
-	*_beta*)
-		SLOT="beta"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_beta}-1
-		;;
-	*)
-		SLOT="stable"
-		CHROMEDIR="opt/google/chrome"
-		MY_PV=${PV}-1
-		;;
-esac
-
-MY_PN="google-chrome-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-S="${WORKDIR}/${CHROMEDIR}"
-
-LICENSE="google-chrome"
-KEYWORDS="-* ~amd64"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	sys-libs/glibc
-"
-
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)/chromium-browser"
-	doins -r WidevineCdm
-}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-133.0.6943.16_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-133.0.6943.16_beta.ebuild
new file mode 100644
index 000000000000..f6ac2535ffcc
--- /dev/null
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-133.0.6943.16_beta.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2012-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
+HOMEPAGE="https://www.google.com/chrome"
+
+case ${PV} in
+	*_alpha*)
+		SLOT="unstable"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_alpha}-1
+		;;
+	*_beta*)
+		SLOT="beta"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_beta}-1
+		;;
+	*)
+		SLOT="stable"
+		CHROMEDIR="opt/google/chrome"
+		MY_PV=${PV}-1
+		;;
+esac
+
+MY_PN="google-chrome-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+S="${WORKDIR}/${CHROMEDIR}"
+
+LICENSE="google-chrome"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	sys-libs/glibc
+"
+
+for x in 0 beta stable unstable; do
+	if [[ ${SLOT} != ${x} ]]; then
+		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+	fi
+done
+
+QA_PREBUILT="*"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
+}
+
+src_install() {
+	insinto "/usr/$(get_libdir)/chromium-browser"
+	doins -r WidevineCdm
+}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-134.0.6958.2_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-134.0.6958.2_alpha.ebuild
new file mode 100644
index 000000000000..f6ac2535ffcc
--- /dev/null
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-134.0.6958.2_alpha.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2012-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
+HOMEPAGE="https://www.google.com/chrome"
+
+case ${PV} in
+	*_alpha*)
+		SLOT="unstable"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_alpha}-1
+		;;
+	*_beta*)
+		SLOT="beta"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_beta}-1
+		;;
+	*)
+		SLOT="stable"
+		CHROMEDIR="opt/google/chrome"
+		MY_PV=${PV}-1
+		;;
+esac
+
+MY_PN="google-chrome-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+S="${WORKDIR}/${CHROMEDIR}"
+
+LICENSE="google-chrome"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	sys-libs/glibc
+"
+
+for x in 0 beta stable unstable; do
+	if [[ ${SLOT} != ${x} ]]; then
+		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+	fi
+done
+
+QA_PREBUILT="*"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
+}
+
+src_install() {
+	insinto "/usr/$(get_libdir)/chromium-browser"
+	doins -r WidevineCdm
+}
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 654a8e6c4062..9d4bb8106bd2 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,4 +1,4 @@
-DIST lighttpd-1.4.75.tar.xz 1102080 BLAKE2B 3cf89678922e319fa140beb56a95b11eb85ca1b833c9d21195d0ad0b8ea8679c71764558d03eafda0ff3aab994212375b433e56ff54349da739cd7c5384b61ae SHA512 2066ad3e9eeaed4179bd6d3a2becc4ed57d6b00cbdd729a3c0d9a7276ee9c7906c9f1274f4def696d5ef0e662158ea13eb7ecb8e107cac5519ac98a83cf9d7ef
-DIST lighttpd-1.4.75.tar.xz.asc 833 BLAKE2B c632a3ab7e97c981c0930129a430ee4b3776f34611831c7a8f484de4f2915be31f24df15ee517bcb0271c96c6217429333cbd67bc6f1a4c71936736246d8357c SHA512 791aab9bfb21c3c54b157e4348adbca83fae9186cc3ba27b9f0badc0af6bd74d2e70d6bb565317393b6dafb0e0b5da6e4442c77eac8d9ce597ccdb8b9176f3f9
 DIST lighttpd-1.4.76.tar.xz 847132 BLAKE2B 497e2dd802718dac10fdcd49bc917f44ddc1eebd4fa244a047ffba2a0ac92d89900e6285f385126a29100a5fd024868908fd5028ac1b947ca648305199661976 SHA512 940f00f2d84e3424c389108d09756a0af41db3559474135b6c502deccd08ad051b5184f3f7907436384964d2b05045e27dca463af98c889cee69b0ae6e202782
 DIST lighttpd-1.4.76.tar.xz.asc 833 BLAKE2B b46b3543e694c132d6e49ee239ef2d71718b5257cfc33506208b0b28bb318ffaf04fcf6282e3b54b08eedf4a3ef6da2ef2c4fd84da89316ce02d70b8f9f26faf SHA512 5a9bc460584479212ac2adddbc4dd5d4374cb08f703fdebd60471cee9c93f6cf4c7bf431a183d615aa9d1a25e237b8dd0f4f06e7249d6bb61a341565a29e2bb9
+DIST lighttpd-1.4.77.tar.xz 857872 BLAKE2B 52775633d494d502b76ec200efefadb99996d32e5127ac858d11712f683ffd8233855c8dcd30b3e5f285389ba2fbfbddc1090752d38e4ec0c0f267fc7d4afe80 SHA512 696fd4fd8486a6c3fd1131c7e8a935a02b5384882b74ddc19bf79d085e2a0abed9184a30f97e3a7aafb816d3589e110e8d70115daa15cdc52cf61aa4129e3565
+DIST lighttpd-1.4.77.tar.xz.asc 833 BLAKE2B 5d3bdccd5788fce50d908eb028760290bd8033d27c0f15f414d2c5fe7d07b31ecd05aa2028d3a6b37ebdaaf2aafebb37c685834af6c502b80de185740c52de3a SHA512 5068f871244929054cc63c0381ec99f43cea573bd1d303ce3ad8a46df09e4358a96679fcb0a689d49ee2ab0228f11a95270b4e8418b7d69b7cddce425f1b14b1
diff --git a/www-servers/lighttpd/files/lighttpd-1.4.75-sparc.patch b/www-servers/lighttpd/files/lighttpd-1.4.75-sparc.patch
deleted file mode 100644
index d7bd72973b94..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.4.75-sparc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-https://bugs.gentoo.org/931305
-https://github.com/lighttpd/lighttpd1.4/commit/524614455554163ec78b27b89ff52bbf7fe96958
-
-From 524614455554163ec78b27b89ff52bbf7fe96958 Mon Sep 17 00:00:00 2001
-From: Glenn Strauss <gstrauss@gluelogic.com>
-Date: Wed, 24 Apr 2024 03:07:37 -0400
-Subject: [PATCH] [core] special value for Linux POLLRDHUP on SPARC (fixes
- #3251)
-
-x-ref:
-  "[1.4.76] buildroot compile error with bootlin-sparc{64-g,-uc}libc"
-  https://redmine.lighttpd.net/issues/3251
---- a/src/fdevent.h
-+++ b/src/fdevent.h
-@@ -40,6 +40,8 @@ struct fdnode_st {
- #if (defined(__sun) && defined(__SVR4)) /* Solaris */ \
-  || defined(__FreeBSD__)
- #define FDEVENT_RDHUP  0x4000
-+#elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
-+#define FDEVENT_RDHUP  0x2800 /*(0x2000 EPOLLRDHUP | 0x0800 POLLRDHUP)*/
- #else
- #define FDEVENT_RDHUP  0x2000
- #endif
---- a/src/fdevent_impl.c
-+++ b/src/fdevent_impl.c
-@@ -338,6 +338,11 @@ fdevent_linux_sysepoll_event_set (fdevents *ev, fdnode *fdn, int events)
-     struct epoll_event ep;
-   #ifndef EPOLLRDHUP
-     events &= ~FDEVENT_RDHUP;
-+  #elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
-+    if (events & FDEVENT_RDHUP) {
-+        events &= ~FDEVENT_RDHUP;
-+        events |= EPOLLRDHUP;
-+    }
-   #endif
-     ep.events = events | EPOLLERR | EPOLLHUP;
-     ep.data.ptr = fdn;
-@@ -376,7 +381,11 @@ fdevent_linux_sysepoll_init (fdevents *ev)
-     ck_static_assert(EPOLLERR   == FDEVENT_ERR);
-     ck_static_assert(EPOLLHUP   == FDEVENT_HUP);
-   #ifdef EPOLLRDHUP
-+   #if (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
-+    ck_static_assert(EPOLLRDHUP  & FDEVENT_RDHUP);
-+   #else
-     ck_static_assert(EPOLLRDHUP == FDEVENT_RDHUP);
-+   #endif
-   #endif
- 
-     ev->type      = FDEVENT_HANDLER_LINUX_SYSEPOLL;
-@@ -770,6 +779,11 @@ fdevent_poll_event_set (fdevents *ev, fdnode *fdn, int events)
- 
-   #ifndef POLLRDHUP
-     events &= ~FDEVENT_RDHUP;
-+  #elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
-+    if (events & FDEVENT_RDHUP) {
-+        events &= ~FDEVENT_RDHUP;
-+        events |= POLLRDHUP;
-+    }
-   #endif
- 
-     if (k >= 0) {
-@@ -854,7 +868,11 @@ fdevent_poll_init (fdevents *ev)
-     ck_static_assert(POLLHUP   == FDEVENT_HUP);
-     ck_static_assert(POLLNVAL  == FDEVENT_NVAL);
-   #ifdef POLLRDHUP
-+   #if (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
-+    ck_static_assert(POLLRDHUP  & FDEVENT_RDHUP);
-+   #else
-     ck_static_assert(POLLRDHUP == FDEVENT_RDHUP);
-+   #endif
-   #endif
- 
-     ev->type      = FDEVENT_HANDLER_POLL;
-
diff --git a/www-servers/lighttpd/files/lighttpd.initd-r1 b/www-servers/lighttpd/files/lighttpd.initd-r1
deleted file mode 100644
index f355a5c7232d..000000000000
--- a/www-servers/lighttpd/files/lighttpd.initd-r1
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload graceful"
-
-LIGHTTPD_PID="$($(which lighttpd) -pf ${LIGHTTPD_CONF} | grep server.pid-file | cut -d '=' -f 2 | tr -d \\\" | tr -d [:space:])"
-
-depend() {
-	need net
-	use mysql logger spawn-fcgi ldap slapd netmount dns
-	after famd
-	after sshd
-}
-
-checkconfig() {
-	if [ ! -f "${LIGHTTPD_CONF}" ] ; then
-		ewarn "${LIGHTTPD_CONF} does not exist."
-		return 1
-	fi
-
-	if [ -z "${LIGHTTPD_PID}" ] ; then
-		eerror "server.pid-file variable in ${LIGHTTPD_CONF}"
-		eerror "is not set. Please set this variable properly"
-		eerror "and try again"
-		return 1
-	fi
-	/usr/sbin/lighttpd -t -f ${LIGHTTPD_CONF} >/dev/null
-}
-
-start() {
-	checkconfig || return 1
-	# Glean lighttpd's credentials from the configuration file
-	# Fixes bug 454366
-	LIGHTTPD_USER="$(awk '/^server.username/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF})"
-	LIGHTTPD_GROUP="$(awk '/^server.groupname/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF})"
-	checkpath -d -q -m 0750 -o "${LIGHTTPD_USER}":"${LIGHTTPD_GROUP}" /run/lighttpd/
-
-	ebegin "Starting lighttpd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/lighttpd \
-		--pidfile "${LIGHTTPD_PID}" -- -f "${LIGHTTPD_CONF}"
-	eend $?
-}
-
-stop() {
-	local rv=0
-	ebegin "Stopping lighttpd"
-	start-stop-daemon --stop --quiet --pidfile "${LIGHTTPD_PID}"
-	eend $?
-}
-
-reload() {
-	if ! service_started "${SVCNAME}" ; then
-		eerror "${SVCNAME} isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-
-	ebegin "Re-opening lighttpd log files"
-	start-stop-daemon --quiet --pidfile "${LIGHTTPD_PID}" \
-		--signal HUP
-	eend $?
-}
-
-graceful() {
-	if ! service_started "${SVCNAME}" ; then
-		eerror "${SVCNAME} isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-
-	ebegin "Gracefully stopping lighttpd"
-	start-stop-daemon --quiet --pidfile "${LIGHTTPD_PID}" \
-		--signal INT
-	if eend $? ; then
-		rm -f "${LIGHTTPD_PID}"
-		start
-	fi
-}
diff --git a/www-servers/lighttpd/files/lighttpd.service-r2 b/www-servers/lighttpd/files/lighttpd.service-r2
new file mode 100644
index 000000000000..09fd87d2dfda
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd.service-r2
@@ -0,0 +1,15 @@
+[Unit]
+Description=Lighttpd Daemon
+After=syslog.target network-online.target
+
+[Service]
+Type=simple
+PIDFile=/run/lighttpd.pid
+ExecStartPre=/usr/sbin/lighttpd -tt -f /etc/lighttpd/lighttpd.conf
+ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf
+ExecReload=/usr/sbin/lighttpd -tt -f /etc/lighttpd/lighttpd.conf
+ExecReload=/bin/kill -USR1 $MAINPID
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild
deleted file mode 100644
index 5026b7a768e0..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/lighttpd.asc
-inherit lua-single meson readme.gentoo-r1 systemd tmpfiles verify-sig
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
-SRC_URI="
-	https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz
-	verify-sig? ( https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz.asc )
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-"
-
-# Match the bundled xxhash version for the minimum version
-COMMON_DEPEND="
-	acct-group/lighttpd
-	acct-user/lighttpd
-	>=dev-libs/xxhash-0.8.2
-	virtual/libcrypt:=
-	brotli? ( app-arch/brotli:= )
-	dbi? (
-		dev-db/libdbi
-	)
-	gnutls? ( net-libs/gnutls )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2.1.26:= )
-	lua? ( ${LUA_DEPS} )
-	maxminddb? ( dev-libs/libmaxminddb )
-	mbedtls? ( net-libs/mbedtls )
-	nettle? ( dev-libs/nettle:= )
-	nss? ( dev-libs/nss )
-	pcre? ( dev-libs/libpcre2 )
-	php? ( dev-lang/php:*[cgi] )
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? ( >=dev-libs/openssl-0.9.7:= )
-	unwind? ( sys-libs/libunwind:= )
-	webdav? (
-		dev-libs/libxml2
-		dev-db/sqlite
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? ( >=sys-libs/zlib-1.1 )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-apache )
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( virtual/perl-Test-Harness )
-	verify-sig? ( sec-keys/openpgp-keys-lighttpd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.75-sparc.patch
-)
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="${ED}/etc/lighttpd/lighttpd.conf"
-
-	# Enable php/mod_fastcgi settings
-	if use php; then
-		sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die
-	fi
-
-	# Automatically listen on IPv6 if built with USE=ipv6 (which we now always do)
-	# bug #234987
-	sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die
-}
-
-pkg_setup() {
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}."
-	fi
-
-	DOC_CONTENTS="IPv6 migration guide:\n
-		https://wiki.lighttpd.net/IPv6-Config
-	"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dmoduledir="$(get_libdir)"/${PN}
-
-		$(meson_feature brotli with_brotli)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_bzip=disabled
-
-		$(meson_feature dbi with_dbi)
-
-		# Unpackaged in Gentoo
-		-Dwith_libdeflate=disabled
-		# Obsolete
-		-Dwith_fam=disabled
-
-		$(meson_use gnutls with_gnutls)
-		$(meson_feature kerberos with_krb5)
-		$(meson_feature ldap with_ldap)
-
-		$(meson_feature unwind with_libunwind)
-
-		$(meson_use lua with_lua)
-		-Dlua_version=${ELUA}
-
-		$(meson_feature maxminddb with_maxminddb)
-		$(meson_use mbedtls with_mbedtls)
-
-		$(meson_use nettle with_nettle)
-		$(meson_use nss with_nss)
-
-		# Obsolete
-		-Dwith_pcre=disabled
-
-		$(meson_use pcre with_pcre2)
-
-		$(meson_feature sasl with_sasl)
-		$(meson_use ssl with_openssl)
-
-		-Dwith_xxhash=enabled
-		$(meson_feature webdav with_webdav_props)
-
-		# Unpackaged in Gentoo
-		-Dwith_wolfssl=false
-
-		$(meson_use xattr with_xattr)
-		$(meson_feature zlib with_zlib)
-		$(meson_feature zstd with_zstd)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Init script stuff
-	newinitd "${FILESDIR}"/lighttpd.initd-r2 lighttpd
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
-
-	# Configs
-	insinto /etc/lighttpd
-	newins "${FILESDIR}"/conf/lighttpd.conf-r2 lighttpd.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.conf
-
-	# Update lighttpd.conf directives based on conditionals
-	update_config
-
-	# Docs
-	dodoc AUTHORS README NEWS doc/scripts/*.sh
-	newdoc doc/config/lighttpd.conf lighttpd.conf.distrib
-	readme.gentoo_create_doc
-
-	docinto txt
-	dodoc doc/outdated/*.txt
-
-	doman doc/*.8
-
-	# Logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-
-	readme.gentoo_print_elog
-
-	if [[ -f ${EROOT}/etc/lighttpd.conf ]] ; then
-		elog
-		elog "Gentoo has a customized configuration,"
-		elog "which is now located in ${EROOT}/etc/lighttpd. Please migrate your"
-		elog "existing configuration."
-	fi
-
-	if use brotli || use zstd || use zlib ; then
-		elog
-		elog "Remember to clean your cache directory when using"
-		elog "output compression!"
-		elog "https://wiki.lighttpd.net/Docs_ModDeflate"
-	fi
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.75.ebuild b/www-servers/lighttpd/lighttpd-1.4.75.ebuild
deleted file mode 100644
index 0d53fc5ba126..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.75.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/lighttpd.asc
-inherit lua-single meson readme.gentoo-r1 systemd tmpfiles verify-sig
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
-SRC_URI="
-	https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz
-	verify-sig? ( https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz.asc )
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-"
-
-# Match the bundled xxhash version for the minimum version
-COMMON_DEPEND="
-	acct-group/lighttpd
-	acct-user/lighttpd
-	>=dev-libs/xxhash-0.8.2
-	virtual/libcrypt:=
-	brotli? ( app-arch/brotli:= )
-	dbi? (
-		dev-db/libdbi
-	)
-	gnutls? ( net-libs/gnutls )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2.1.26:= )
-	lua? ( ${LUA_DEPS} )
-	maxminddb? ( dev-libs/libmaxminddb )
-	mbedtls? ( net-libs/mbedtls )
-	nettle? ( dev-libs/nettle:= )
-	nss? ( dev-libs/nss )
-	pcre? ( dev-libs/libpcre2 )
-	php? ( dev-lang/php:*[cgi] )
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? ( >=dev-libs/openssl-0.9.7:= )
-	unwind? ( sys-libs/libunwind:= )
-	webdav? (
-		dev-libs/libxml2
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? ( >=sys-libs/zlib-1.1 )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-apache )
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( virtual/perl-Test-Harness )
-	verify-sig? ( sec-keys/openpgp-keys-lighttpd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.75-sparc.patch
-)
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="${ED}/etc/lighttpd/lighttpd.conf"
-
-	# Enable php/mod_fastcgi settings
-	if use php; then
-		sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die
-	fi
-
-	# Automatically listen on IPv6 if built with USE=ipv6 (which we now always do)
-	# bug #234987
-	sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die
-}
-
-pkg_setup() {
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}."
-	fi
-
-	DOC_CONTENTS="IPv6 migration guide:\n
-		https://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config
-	"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dmoduledir="$(get_libdir)"/${PN}
-
-		$(meson_feature brotli with_brotli)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_bzip=disabled
-
-		$(meson_feature dbi with_dbi)
-
-		# Unpackaged in Gentoo
-		-Dwith_libdeflate=disabled
-		# Obsolete
-		-Dwith_fam=disabled
-
-		$(meson_use gnutls with_gnutls)
-		$(meson_feature kerberos with_krb5)
-		$(meson_feature ldap with_ldap)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_libev=disabled
-
-		$(meson_feature unwind with_libunwind)
-
-		$(meson_use lua with_lua)
-		-Dlua_version=${ELUA}
-
-		$(meson_feature maxminddb with_maxminddb)
-		$(meson_use mbedtls with_mbedtls)
-
-		$(meson_use nettle with_nettle)
-		$(meson_use nss with_nss)
-
-		# Obsolete
-		-Dwith_pcre=disabled
-
-		$(meson_use pcre with_pcre2)
-
-		$(meson_feature sasl with_sasl)
-		$(meson_use ssl with_openssl)
-
-		-Dwith_xxhash=enabled
-		$(meson_feature webdav with_webdav_props)
-
-		# Unpackaged in Gentoo
-		-Dwith_wolfssl=false
-
-		$(meson_use xattr with_xattr)
-		$(meson_feature zlib with_zlib)
-		$(meson_feature zstd with_zstd)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Init script stuff
-	newinitd "${FILESDIR}"/lighttpd.initd-r1 lighttpd
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
-
-	# Configs
-	insinto /etc/lighttpd
-	newins "${FILESDIR}"/conf/lighttpd.conf-r1 lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.conf
-
-	# Update lighttpd.conf directives based on conditionals
-	update_config
-
-	# Docs
-	dodoc AUTHORS README NEWS doc/scripts/*.sh
-	newdoc doc/config/lighttpd.conf lighttpd.conf.distrib
-	readme.gentoo_create_doc
-
-	docinto txt
-	dodoc doc/outdated/*.txt
-
-	doman doc/*.8
-
-	# Logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-
-	readme.gentoo_print_elog
-
-	if [[ -f ${EROOT}/etc/lighttpd.conf ]] ; then
-		elog
-		elog "Gentoo has a customized configuration,"
-		elog "which is now located in ${EROOT}/etc/lighttpd. Please migrate your"
-		elog "existing configuration."
-	fi
-
-	if use brotli || use zstd || use zlib ; then
-		elog
-		elog "Remember to clean your cache directory when using"
-		elog "output compression!"
-		elog "https://wiki.lighttpd.net/Docs_ModDeflate"
-	fi
-
-	elog
-	elog "Upstream has deprecated a number of features. They are not missing"
-	elog "but have been migrated to other mechanisms. Please see upstream"
-	elog "changelog for details."
-	elog "https://www.lighttpd.net/2022/1/19/1.4.64/"
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild
deleted file mode 100644
index 0b9a59cceedd..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/lighttpd.asc
-inherit lua-single meson readme.gentoo-r1 systemd tmpfiles verify-sig
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://git.lighttpd.net/lighttpd/lighttpd1.4.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz
-		verify-sig? ( https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz.asc )
-	"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-IUSE="+brotli dbi gnutls kerberos ldap libdeflate +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-"
-
-# Match the bundled xxhash version for the minimum version
-COMMON_DEPEND="
-	acct-group/lighttpd
-	acct-user/lighttpd
-	>=dev-libs/xxhash-0.8.2
-	virtual/libcrypt:=
-	brotli? ( app-arch/brotli:= )
-	dbi? (
-		dev-db/libdbi
-	)
-	gnutls? ( net-libs/gnutls )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2.1.26:= )
-	libdeflate? ( app-arch/libdeflate )
-	lua? ( ${LUA_DEPS} )
-	maxminddb? ( dev-libs/libmaxminddb )
-	mbedtls? ( net-libs/mbedtls )
-	nettle? ( dev-libs/nettle:= )
-	nss? ( dev-libs/nss )
-	pcre? ( dev-libs/libpcre2 )
-	php? ( dev-lang/php:*[cgi] )
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? ( >=dev-libs/openssl-0.9.7:= )
-	unwind? ( sys-libs/libunwind:= )
-	webdav? (
-		dev-libs/libxml2
-		dev-db/sqlite
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? ( >=sys-libs/zlib-1.1 )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-apache )
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( virtual/perl-Test-Harness )
-	verify-sig? ( sec-keys/openpgp-keys-lighttpd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sparc.patch
-)
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="${ED}/etc/lighttpd/lighttpd.conf"
-
-	# Enable php/mod_fastcgi settings
-	if use php; then
-		sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die
-	fi
-
-	# Automatically listen on IPv6 if built with USE=ipv6 (which we now always do)
-	# bug #234987
-	sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die
-}
-
-pkg_setup() {
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}."
-	fi
-
-	DOC_CONTENTS="IPv6 migration guide:\n
-		https://wiki.lighttpd.net/IPv6-Config
-	"
-}
-
-src_configure() {
-	# (One specific library might be preferred on embedded systems via
-	#  MYMESONARGS with e.g. -DFORCE_blah_CRYPTO)
-	local emesonargs=(
-		-Dmoduledir="$(get_libdir)"/${PN}
-
-		${c_args}
-
-		$(meson_feature brotli with_brotli)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_bzip=disabled
-
-		$(meson_feature dbi with_dbi)
-
-		# Obsolete
-		-Dwith_fam=disabled
-
-		$(meson_use gnutls with_gnutls)
-		$(meson_feature kerberos with_krb5)
-		$(meson_feature ldap with_ldap)
-
-		$(meson_feature libdeflate with_libdeflate)
-
-		$(meson_feature unwind with_libunwind)
-
-		$(meson_use lua with_lua)
-		-Dlua_version=${ELUA}
-
-		$(meson_feature maxminddb with_maxminddb)
-		$(meson_use mbedtls with_mbedtls)
-
-		$(meson_use nettle with_nettle)
-		$(meson_use nss with_nss)
-
-		# Obsolete
-		-Dwith_pcre=disabled
-
-		$(meson_use pcre with_pcre2)
-
-		$(meson_feature sasl with_sasl)
-		$(meson_use ssl with_openssl)
-
-		-Dwith_xxhash=enabled
-		$(meson_feature webdav with_webdav_props)
-
-		# Unpackaged in Gentoo
-		-Dwith_wolfssl=false
-
-		$(meson_use xattr with_xattr)
-		$(meson_feature zlib with_zlib)
-		$(meson_feature zstd with_zstd)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Init script stuff
-	newinitd "${FILESDIR}"/lighttpd.initd-r2 lighttpd
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
-
-	# Configs
-	insinto /etc/lighttpd
-	newins "${FILESDIR}"/conf/lighttpd.conf-r3 lighttpd.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.conf
-	doins doc/config/conf.d/mime.conf
-
-	# Update lighttpd.conf directives based on conditionals
-	update_config
-
-	# Docs
-	dodoc AUTHORS README NEWS doc/scripts/*.sh
-	newdoc doc/config/lighttpd.conf lighttpd.conf.distrib
-	readme.gentoo_create_doc
-
-	docinto txt
-	dodoc doc/outdated/*.txt
-
-	doman doc/*.8
-
-	# Logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-
-	readme.gentoo_print_elog
-
-	if [[ -f ${EROOT}/etc/lighttpd.conf ]] ; then
-		elog
-		elog "Gentoo has a customized configuration,"
-		elog "which is now located in ${EROOT}/etc/lighttpd. Please migrate your"
-		elog "existing configuration."
-	fi
-
-	if use brotli || use zstd || use zlib ; then
-		elog
-		elog "Remember to clean your cache directory when using"
-		elog "output compression!"
-		elog "https://wiki.lighttpd.net/Docs_ModDeflate"
-	fi
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.76-r3.ebuild b/www-servers/lighttpd/lighttpd-1.4.76-r3.ebuild
new file mode 100644
index 000000000000..a2ca309dcecd
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.76-r3.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/lighttpd.asc
+inherit lua-single meson readme.gentoo-r1 systemd tmpfiles verify-sig
+
+DESCRIPTION="Lightweight high-performance web server"
+HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://git.lighttpd.net/lighttpd/lighttpd1.4.git"
+	inherit git-r3
+else
+	SRC_URI="
+		https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz
+		verify-sig? ( https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz.asc )
+	"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+fi
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+IUSE="+brotli dbi gnutls kerberos ldap libdeflate +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+"
+
+# Match the bundled xxhash version for the minimum version
+COMMON_DEPEND="
+	acct-group/lighttpd
+	acct-user/lighttpd
+	>=dev-libs/xxhash-0.8.2
+	virtual/libcrypt:=
+	brotli? ( app-arch/brotli:= )
+	dbi? (
+		dev-db/libdbi
+	)
+	gnutls? ( net-libs/gnutls )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2.1.26:= )
+	libdeflate? ( app-arch/libdeflate )
+	lua? ( ${LUA_DEPS} )
+	maxminddb? ( dev-libs/libmaxminddb )
+	mbedtls? ( net-libs/mbedtls:0= )
+	nettle? ( dev-libs/nettle:= )
+	nss? ( dev-libs/nss )
+	pcre? ( dev-libs/libpcre2 )
+	php? ( dev-lang/php:*[cgi] )
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( >=dev-libs/openssl-0.9.7:= )
+	unwind? ( sys-libs/libunwind:= )
+	webdav? (
+		dev-libs/libxml2
+		dev-db/sqlite
+	)
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	zlib? ( >=sys-libs/zlib-1.1 )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-apache )
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( virtual/perl-Test-Harness )
+	verify-sig? ( sec-keys/openpgp-keys-lighttpd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sparc.patch
+)
+
+# update certain parts of lighttpd.conf based on conditionals
+update_config() {
+	local config="${ED}/etc/lighttpd/lighttpd.conf"
+
+	# Enable php/mod_fastcgi settings
+	if use php; then
+		sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die
+	fi
+
+	# Automatically listen on IPv6 if built with USE=ipv6 (which we now always do)
+	# bug #234987
+	sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die
+}
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+
+	if ! use pcre ; then
+		ewarn "It is highly recommended that you build ${PN}"
+		ewarn "with perl regular expressions support via USE=pcre."
+		ewarn "Otherwise you lose support for some core options such"
+		ewarn "as conditionals and modules such as mod_re{write,direct}."
+	fi
+
+	DOC_CONTENTS="IPv6 migration guide:\n
+		https://wiki.lighttpd.net/IPv6-Config
+	"
+}
+
+src_configure() {
+	# (One specific library might be preferred on embedded systems via
+	#  MYMESONARGS with e.g. -DFORCE_blah_CRYPTO)
+	local emesonargs=(
+		-Dmoduledir="$(get_libdir)"/${PN}
+
+		${c_args}
+
+		$(meson_feature brotli with_brotli)
+
+		# TODO: revisit (was off in autotools ebuild)
+		-Dwith_bzip=disabled
+
+		$(meson_feature dbi with_dbi)
+
+		# Obsolete
+		-Dwith_fam=disabled
+
+		$(meson_use gnutls with_gnutls)
+		$(meson_feature kerberos with_krb5)
+		$(meson_feature ldap with_ldap)
+
+		$(meson_feature libdeflate with_libdeflate)
+
+		$(meson_feature unwind with_libunwind)
+
+		$(meson_use lua with_lua)
+		-Dlua_version=${ELUA}
+
+		$(meson_feature maxminddb with_maxminddb)
+		$(meson_use mbedtls with_mbedtls)
+
+		$(meson_use nettle with_nettle)
+		$(meson_use nss with_nss)
+
+		# Obsolete
+		-Dwith_pcre=disabled
+
+		$(meson_use pcre with_pcre2)
+
+		$(meson_feature sasl with_sasl)
+		$(meson_use ssl with_openssl)
+
+		-Dwith_xxhash=enabled
+		$(meson_feature webdav with_webdav_props)
+
+		# Unpackaged in Gentoo
+		-Dwith_wolfssl=false
+
+		$(meson_use xattr with_xattr)
+		$(meson_feature zlib with_zlib)
+		$(meson_feature zstd with_zstd)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Init script stuff
+	newinitd "${FILESDIR}"/lighttpd.initd-r2 lighttpd
+	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
+
+	# Configs
+	insinto /etc/lighttpd
+	newins "${FILESDIR}"/conf/lighttpd.conf-r3 lighttpd.conf
+	doins "${FILESDIR}"/conf/mod_cgi.conf
+	doins "${FILESDIR}"/conf/mod_fastcgi.conf
+	doins doc/config/conf.d/mime.conf
+
+	# Update lighttpd.conf directives based on conditionals
+	update_config
+
+	# Docs
+	dodoc AUTHORS README NEWS doc/scripts/*.sh
+	newdoc doc/config/lighttpd.conf lighttpd.conf.distrib
+	readme.gentoo_create_doc
+
+	docinto txt
+	dodoc doc/outdated/*.txt
+
+	doman doc/*.8
+
+	# Logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
+
+	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
+	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
+	fperms 0750 /var/l{ib,og}/lighttpd
+
+	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	readme.gentoo_print_elog
+
+	if [[ -f ${EROOT}/etc/lighttpd.conf ]] ; then
+		elog
+		elog "Gentoo has a customized configuration,"
+		elog "which is now located in ${EROOT}/etc/lighttpd. Please migrate your"
+		elog "existing configuration."
+	fi
+
+	if use brotli || use zstd || use zlib ; then
+		elog
+		elog "Remember to clean your cache directory when using"
+		elog "output compression!"
+		elog "https://wiki.lighttpd.net/Docs_ModDeflate"
+	fi
+}
diff --git a/www-servers/lighttpd/lighttpd-1.4.76.ebuild b/www-servers/lighttpd/lighttpd-1.4.76.ebuild
deleted file mode 100644
index 7f4673b4f6ee..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.76.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/lighttpd.asc
-inherit lua-single meson readme.gentoo-r1 systemd tmpfiles verify-sig
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
-SRC_URI="
-	https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz
-	verify-sig? ( https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz.asc )
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-"
-
-# Match the bundled xxhash version for the minimum version
-COMMON_DEPEND="
-	acct-group/lighttpd
-	acct-user/lighttpd
-	>=dev-libs/xxhash-0.8.2
-	virtual/libcrypt:=
-	brotli? ( app-arch/brotli:= )
-	dbi? (
-		dev-db/libdbi
-	)
-	gnutls? ( net-libs/gnutls )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2.1.26:= )
-	lua? ( ${LUA_DEPS} )
-	maxminddb? ( dev-libs/libmaxminddb )
-	mbedtls? ( net-libs/mbedtls )
-	nettle? ( dev-libs/nettle:= )
-	nss? ( dev-libs/nss )
-	pcre? ( dev-libs/libpcre2 )
-	php? ( dev-lang/php:*[cgi] )
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? ( >=dev-libs/openssl-0.9.7:= )
-	unwind? ( sys-libs/libunwind:= )
-	webdav? (
-		dev-libs/libxml2
-		dev-db/sqlite
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? ( >=sys-libs/zlib-1.1 )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-apache )
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( virtual/perl-Test-Harness )
-	verify-sig? ( sec-keys/openpgp-keys-lighttpd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sparc.patch
-)
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="${ED}/etc/lighttpd/lighttpd.conf"
-
-	# Enable php/mod_fastcgi settings
-	if use php; then
-		sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die
-	fi
-
-	# Automatically listen on IPv6 if built with USE=ipv6 (which we now always do)
-	# bug #234987
-	sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die
-}
-
-pkg_setup() {
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}."
-	fi
-
-	DOC_CONTENTS="IPv6 migration guide:\n
-		https://wiki.lighttpd.net/IPv6-Config
-	"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dmoduledir="$(get_libdir)"/${PN}
-
-		$(meson_feature brotli with_brotli)
-
-		# TODO: revisit (was off in autotools ebuild)
-		-Dwith_bzip=disabled
-
-		$(meson_feature dbi with_dbi)
-
-		# Unpackaged in Gentoo
-		-Dwith_libdeflate=disabled
-		# Obsolete
-		-Dwith_fam=disabled
-
-		$(meson_use gnutls with_gnutls)
-		$(meson_feature kerberos with_krb5)
-		$(meson_feature ldap with_ldap)
-
-		$(meson_feature unwind with_libunwind)
-
-		$(meson_use lua with_lua)
-		-Dlua_version=${ELUA}
-
-		$(meson_feature maxminddb with_maxminddb)
-		$(meson_use mbedtls with_mbedtls)
-
-		$(meson_use nettle with_nettle)
-		$(meson_use nss with_nss)
-
-		# Obsolete
-		-Dwith_pcre=disabled
-
-		$(meson_use pcre with_pcre2)
-
-		$(meson_feature sasl with_sasl)
-		$(meson_use ssl with_openssl)
-
-		-Dwith_xxhash=enabled
-		$(meson_feature webdav with_webdav_props)
-
-		# Unpackaged in Gentoo
-		-Dwith_wolfssl=false
-
-		$(meson_use xattr with_xattr)
-		$(meson_feature zlib with_zlib)
-		$(meson_feature zstd with_zstd)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Init script stuff
-	newinitd "${FILESDIR}"/lighttpd.initd-r2 lighttpd
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
-
-	# Configs
-	insinto /etc/lighttpd
-	newins "${FILESDIR}"/conf/lighttpd.conf-r2 lighttpd.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.conf
-
-	# Update lighttpd.conf directives based on conditionals
-	update_config
-
-	# Docs
-	dodoc AUTHORS README NEWS doc/scripts/*.sh
-	newdoc doc/config/lighttpd.conf lighttpd.conf.distrib
-	readme.gentoo_create_doc
-
-	docinto txt
-	dodoc doc/outdated/*.txt
-
-	doman doc/*.8
-
-	# Logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-
-	readme.gentoo_print_elog
-
-	if [[ -f ${EROOT}/etc/lighttpd.conf ]] ; then
-		elog
-		elog "Gentoo has a customized configuration,"
-		elog "which is now located in ${EROOT}/etc/lighttpd. Please migrate your"
-		elog "existing configuration."
-	fi
-
-	if use brotli || use zstd || use zlib ; then
-		elog
-		elog "Remember to clean your cache directory when using"
-		elog "output compression!"
-		elog "https://wiki.lighttpd.net/Docs_ModDeflate"
-	fi
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.77.ebuild b/www-servers/lighttpd/lighttpd-1.4.77.ebuild
new file mode 100644
index 000000000000..54f788708629
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.77.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/lighttpd.asc
+inherit lua-single meson readme.gentoo-r1 systemd tmpfiles verify-sig
+
+DESCRIPTION="Lightweight high-performance web server"
+HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://git.lighttpd.net/lighttpd/lighttpd1.4.git"
+	inherit git-r3
+else
+	SRC_URI="
+		https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz
+		verify-sig? ( https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz.asc )
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+IUSE="+brotli dbi gnutls kerberos ldap libdeflate +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+"
+
+# Match the bundled xxhash version for the minimum version
+COMMON_DEPEND="
+	acct-group/lighttpd
+	acct-user/lighttpd
+	>=dev-libs/xxhash-0.8.2
+	virtual/libcrypt:=
+	brotli? ( app-arch/brotli:= )
+	dbi? (
+		dev-db/libdbi
+	)
+	gnutls? ( net-libs/gnutls )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2.1.26:= )
+	libdeflate? ( app-arch/libdeflate )
+	lua? ( ${LUA_DEPS} )
+	maxminddb? ( dev-libs/libmaxminddb )
+	mbedtls? ( net-libs/mbedtls:0= )
+	nettle? ( dev-libs/nettle:= )
+	nss? ( dev-libs/nss )
+	pcre? ( dev-libs/libpcre2 )
+	php? ( dev-lang/php:*[cgi] )
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( >=dev-libs/openssl-0.9.7:= )
+	unwind? ( sys-libs/libunwind:= )
+	webdav? (
+		dev-libs/libxml2
+		dev-db/sqlite
+	)
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	zlib? ( >=sys-libs/zlib-1.1 )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-apache )
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( virtual/perl-Test-Harness )
+	verify-sig? ( sec-keys/openpgp-keys-lighttpd )
+"
+
+# update certain parts of lighttpd.conf based on conditionals
+update_config() {
+	local config="${ED}/etc/lighttpd/lighttpd.conf"
+
+	# Enable php/mod_fastcgi settings
+	if use php; then
+		sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die
+	fi
+
+	# Automatically listen on IPv6 if built with USE=ipv6 (which we now always do)
+	# bug #234987
+	sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die
+}
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+
+	if ! use pcre ; then
+		ewarn "It is highly recommended that you build ${PN}"
+		ewarn "with perl regular expressions support via USE=pcre."
+		ewarn "Otherwise you lose support for some core options such"
+		ewarn "as conditionals and modules such as mod_re{write,direct}."
+	fi
+
+	DOC_CONTENTS="IPv6 migration guide:\n
+		https://wiki.lighttpd.net/IPv6-Config
+	"
+}
+
+src_configure() {
+	# (One specific library might be preferred on embedded systems via
+	#  MYMESONARGS with e.g. -DFORCE_blah_CRYPTO)
+	local emesonargs=(
+		-Dmoduledir="$(get_libdir)"/${PN}
+
+		${c_args}
+
+		$(meson_feature brotli with_brotli)
+
+		# TODO: revisit (was off in autotools ebuild)
+		-Dwith_bzip=disabled
+
+		$(meson_feature dbi with_dbi)
+
+		# Obsolete
+		-Dwith_fam=disabled
+
+		$(meson_use gnutls with_gnutls)
+		$(meson_feature kerberos with_krb5)
+		$(meson_feature ldap with_ldap)
+
+		$(meson_feature libdeflate with_libdeflate)
+
+		$(meson_feature unwind with_libunwind)
+
+		$(meson_use lua with_lua)
+		-Dlua_version=${ELUA}
+
+		$(meson_feature maxminddb with_maxminddb)
+		$(meson_use mbedtls with_mbedtls)
+
+		$(meson_use nettle with_nettle)
+		$(meson_use nss with_nss)
+
+		# Obsolete
+		-Dwith_pcre=disabled
+
+		$(meson_use pcre with_pcre2)
+
+		$(meson_feature sasl with_sasl)
+		$(meson_use ssl with_openssl)
+
+		-Dwith_xxhash=enabled
+		$(meson_feature webdav with_webdav_props)
+
+		# Unpackaged in Gentoo
+		-Dwith_wolfssl=false
+
+		$(meson_use xattr with_xattr)
+		$(meson_feature zlib with_zlib)
+		$(meson_feature zstd with_zstd)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Init script stuff
+	newinitd "${FILESDIR}"/lighttpd.initd-r2 lighttpd
+	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
+
+	# Configs
+	insinto /etc/lighttpd
+	newins "${FILESDIR}"/conf/lighttpd.conf-r3 lighttpd.conf
+	doins "${FILESDIR}"/conf/mod_cgi.conf
+	doins "${FILESDIR}"/conf/mod_fastcgi.conf
+	doins doc/config/conf.d/mime.conf
+
+	# Update lighttpd.conf directives based on conditionals
+	update_config
+
+	# Docs
+	dodoc AUTHORS README NEWS doc/scripts/*.sh
+	newdoc doc/config/lighttpd.conf lighttpd.conf.distrib
+	readme.gentoo_create_doc
+
+	docinto txt
+	dodoc doc/outdated/*.txt
+
+	doman doc/*.8
+
+	# Logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
+
+	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
+	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
+	fperms 0750 /var/l{ib,og}/lighttpd
+
+	systemd_newunit "${FILESDIR}"/${PN}.service-r2 ${PN}.service
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	readme.gentoo_print_elog
+
+	if [[ -f ${EROOT}/etc/lighttpd.conf ]] ; then
+		elog
+		elog "Gentoo has a customized configuration,"
+		elog "which is now located in ${EROOT}/etc/lighttpd. Please migrate your"
+		elog "existing configuration."
+	fi
+
+	if use brotli || use zstd || use zlib ; then
+		elog
+		elog "Remember to clean your cache directory when using"
+		elog "output compression!"
+		elog "https://wiki.lighttpd.net/Docs_ModDeflate"
+	fi
+}
diff --git a/www-servers/lighttpd/lighttpd-9999.ebuild b/www-servers/lighttpd/lighttpd-9999.ebuild
index 6d7428614b30..54f788708629 100644
--- a/www-servers/lighttpd/lighttpd-9999.ebuild
+++ b/www-servers/lighttpd/lighttpd-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
@@ -17,7 +17,7 @@ else
 		https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz
 		verify-sig? ( https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz.asc )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="BSD GPL-2"
@@ -45,7 +45,7 @@ COMMON_DEPEND="
 	libdeflate? ( app-arch/libdeflate )
 	lua? ( ${LUA_DEPS} )
 	maxminddb? ( dev-libs/libmaxminddb )
-	mbedtls? ( net-libs/mbedtls )
+	mbedtls? ( net-libs/mbedtls:0= )
 	nettle? ( dev-libs/nettle:= )
 	nss? ( dev-libs/nss )
 	pcre? ( dev-libs/libpcre2 )
@@ -198,7 +198,7 @@ src_install() {
 	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
 	fperms 0750 /var/l{ib,og}/lighttpd
 
-	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}.service-r2 ${PN}.service
 	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf
 }
 
diff --git a/www-servers/mongrel2/mongrel2-1.11.0-r2.ebuild b/www-servers/mongrel2/mongrel2-1.11.0-r2.ebuild
deleted file mode 100644
index 987bf4d75046..000000000000
--- a/www-servers/mongrel2/mongrel2-1.11.0-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A language agnostic web server focused on web applications"
-HOMEPAGE="http://mongrel2.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-db/sqlite:3
-	>=net-libs/mbedtls-2.1[havege(-)]
-	net-libs/zeromq"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-polarssl-platform-590512.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-	"${FILESDIR}"/${PN}-1.11.0-respect-FLAGS.patch
-)
-
-src_prepare() {
-	cp "${FILESDIR}"/systemtls.mak Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-	default
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install
-	dodoc README examples/configs/mongrel2.conf
-}
diff --git a/www-servers/mongrel2/mongrel2-1.11.0-r3.ebuild b/www-servers/mongrel2/mongrel2-1.11.0-r3.ebuild
new file mode 100644
index 000000000000..7a3fa27cb5d4
--- /dev/null
+++ b/www-servers/mongrel2/mongrel2-1.11.0-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A language agnostic web server focused on web applications"
+HOMEPAGE="http://mongrel2.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-db/sqlite:3
+	>=net-libs/mbedtls-2.1:0=[havege(-)]
+	net-libs/zeromq"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-polarssl-platform-590512.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${PN}-1.11.0-respect-FLAGS.patch
+)
+
+src_prepare() {
+	cp "${FILESDIR}"/systemtls.mak Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+	default
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install
+	dodoc README examples/configs/mongrel2.conf
+}
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index b4945ca8d919..af4f89b3ad3f 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -1,2 +1,3 @@
 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
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
new file mode 100644
index 000000000000..20f2c7f88c5b
--- /dev/null
+++ b/www-servers/nginx-unit/nginx-unit-1.34.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{12..13} )
+
+inherit flag-o-matic python-single-r1 systemd toolchain-funcs
+
+MY_P="unit-${PV}"
+MY_USE="perl python ruby"
+MY_USE_PHP="php8-3"
+
+DESCRIPTION="Dynamic web and application server"
+HOMEPAGE="https://unit.nginx.org"
+SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="${MY_USE} ${MY_USE_PHP} perl ssl"
+
+REQUIRED_USE="|| ( ${IUSE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="perl? ( dev-lang/perl:= )
+	php8-3? ( dev-lang/php:8.3[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		dev-lang/ruby:=
+		dev-ruby/rubygems:=
+	)
+	ssl? ( dev-libs/openssl:0= )
+	virtual/libcrypt:0="
+BDEPEND="
+	sys-apps/which
+"
+RDEPEND="${DEPEND}
+	acct-user/nginx-unit
+	acct-group/nginx-unit"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	sed -i '/^CFLAGS/d' auto/make || die
+	default
+}
+
+src_configure() {
+	local opt=(
+		--control=unix:/run/${PN}.sock
+		--log=/var/log/${PN}
+		--modules=/usr/$(get_libdir)/${PN}
+		--pid=/run/${PN}.pid
+		--prefix=/usr
+		--state=/var/lib/${PN}
+		--user=${PN}
+		--group=${PN}
+	)
+
+	use ssl && opt+=( --openssl )
+	export AR="$(tc-getAR)"
+	export CC="$(tc-getCC)"
+	./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed"
+
+	# Modules require position-independent code
+	append-cflags $(test-flags-CC -fPIC)
+
+	for flag in ${MY_USE} ; do
+		if use ${flag} ; then
+			./configure ${flag} || die "Module configuration failed: ${flag}"
+		fi
+	done
+
+	for flag in ${MY_USE_PHP} ; do
+		if use ${flag} ; then
+			local php_slot="/usr/$(get_libdir)/${flag/-/.}"
+			./configure php \
+				--module=${flag} \
+				--config=${php_slot}/bin/php-config \
+				--lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
+		fi
+	done
+}
+
+src_install() {
+	default
+
+	if use perl ; then
+		emake DESTDIR="${D}/" perl-install
+	fi
+
+	rm -rf "${ED}"/usr/var
+
+	diropts -m 0770
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}"/nginx-unit.confd nginx-unit
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+}
diff --git a/www-servers/pound/Manifest b/www-servers/pound/Manifest
index 751f3d7fe38f..0fe772636e47 100644
--- a/www-servers/pound/Manifest
+++ b/www-servers/pound/Manifest
@@ -1,2 +1 @@
-DIST Pound-3.0.2.tgz 76000 BLAKE2B 0e3f2dc69771a1d1f3de00a721f02cdc4ff31f4d17ab81f64c368668f03c0c1f12484e2d40e7c1d2d203b033488f2bad57cafd8da5022dfe680a09cdc6b73bec SHA512 4c96a93df2b340049778ed7782377e521fbdd7b6ccaa157748b05941ac7a825b2688f37f3081a7e577b2fa1ec4f64d68a25d27af2210f59da5be0dc10d1391e9
 DIST pound-4.10.tar.gz 554678 BLAKE2B 895ee69bcbac680062af270655af3433daffd60ea7a90875dd1fb867447a9be6b28d18444db758fa9c034002ab256fc76d932b893a426d77b6069e03a63a7e74 SHA512 2e0fadbcdeb87fb8357c14467b7b31e598881e7db7bde725f81fb4668370cad993e00a9c7617ff4343a444393f05521cda6c8e1b3d663af6b5053b7c7fd7c874
diff --git a/www-servers/pound/files/pound-3.0.2-hpack.patch b/www-servers/pound/files/pound-3.0.2-hpack.patch
deleted file mode 100644
index d413082216ab..000000000000
--- a/www-servers/pound/files/pound-3.0.2-hpack.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/hpack.c
-+++ b/src/hpack.c
-@@ -69,9 +69,6 @@ static size_t	 hbuf_left(struct hbuf *);
- 
- static struct hpack	 hpack_global;
- 
--#ifdef  __GLIBC__
--/* these functions are available on BSD, but not on Linux */
--
- #include    <stdlib.h>
- 
- void *
-@@ -100,8 +97,6 @@ freezero(void *ptr, size_t size)
-     return;
- }
- 
--#endif
--
- int
- hpack_init(void)
- {
diff --git a/www-servers/pound/files/pound.init-1.9 b/www-servers/pound/files/pound.init-1.9
deleted file mode 100644
index 905c97b78a81..000000000000
--- a/www-servers/pound/files/pound.init-1.9
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting pound"
-	if [ ! -f "/etc/pound.cfg" ]; then
-		eend 1 "configfile /etc/pound.cfg not found."
-	fi
-	start-stop-daemon --quiet --start --exec /usr/sbin/pound -- -f /etc/pound.cfg -p /var/run/pound.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping pound"
-	start-stop-daemon --quiet --stop --pidfile /var/run/pound.pid
-	eend $?
-}
diff --git a/www-servers/pound/pound-3.0.2.ebuild b/www-servers/pound/pound-3.0.2.ebuild
deleted file mode 100644
index bd273b0c3b0a..000000000000
--- a/www-servers/pound/pound-3.0.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_P="${P/p/P}"
-
-DESCRIPTION="A http/https reverse-proxy and load-balancer"
-HOMEPAGE="https://www.apsis.ch/pound.html"
-SRC_URI="https://www.apsis.ch/pound/${MY_P}.tgz"
-
-LICENSE="BSD GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-
-DEPEND="
-	dev-libs/libpcre:=
-	dev-libs/libyaml:=
-	dev-libs/nanomsg:=
-	dev-libs/openssl:=
-	net-libs/mbedtls:=
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-hpack.patch
-)
-
-src_install() {
-	rm GPL.txt || die
-
-	dosbin "${BUILD_DIR}"/pound
-	doman "${S}"/man/pound.8
-	einstalldocs
-
-	dodir /etc/init.d
-	newinitd "${FILESDIR}"/pound.init-1.9 pound
-
-	insinto /etc
-	newins "${FILESDIR}"/pound-2.2.cfg pound.cfg
-}
-
-pkg_postinst() {
-	elog "No demo-/sample-configfile is included in the distribution;"
-	elog "read the man-page for more info."
-	elog "A sample (localhost:8888 -> localhost:80)"
-	elog "for gentoo is given in \"/etc/pound.cfg\"."
-}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7ed492aaeeab..efdab7147a4a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,10 +1,6 @@
-DIST apache-tomcat-10.1.33-src.tar.gz 6926625 BLAKE2B 4502c02d618569eb9f526769877f0817722d4a474a72ad9020c2fbf86ff6ec17599df547d019d81656d433a22efb7d81c56902e435bf3fde636849957070cdd5 SHA512 63ef609bbb2d664f5fe969216eee157a3f45f040f2aa90b6885c9ebe706099896beb620b7659d2dc8c759a08a0370d7849f5e664844e3b78bc82d521617bfd8d
-DIST apache-tomcat-10.1.33-src.tar.gz.asc 833 BLAKE2B 8bf20910fbefc277cf7e677c06aa3476ad4190f38fafb820063e4af59854d955666ff77eede13e6a7a952a21b88d169d9601655dcfcd38682f87db5522310e2a SHA512 111e8d7c7d7d365a8fee2207307fb64685a3c77e1b87a73ede8fe87a083e3e2f3425c41ca6072f6ded51ba6e59ff2997b7198f048d86daa1a947a91fcfe276e4
 DIST apache-tomcat-10.1.34-src.tar.gz 6946871 BLAKE2B 9e25c8fd0ca4a8d19e2d4f912bb904d691b98b1597fbdd823a3381bdf99073a00cc8655924ef733c13214afb2a9ef92f75708eb4454e266245ad8861f90f64cb SHA512 0124d92eb1d184bdce1a50d5934958a0c796460a7157a8622aeee2b21060f5377198939a0260285bcdaa25cea42b880cb97575469a63f7b33ec22d532927e6ca
 DIST apache-tomcat-10.1.34-src.tar.gz.asc 833 BLAKE2B 564c266e4967967450c10944a388c3df051971d00a632d8ecfe68f0a8741f89b270d965f8f62ff8cdc1f097f184f34025ec18b0e4ecfef26bed3a8db9ff8e028 SHA512 2c96d2f89f2bfc449516cdc06682a5404168cdd9e473211444a141aafe3fabe743d68d4e7e32c8a2bc2bb23d875e09c28781ca4cb33e9e13288086c97c20e891
 DIST apache-tomcat-11.0.2-src.tar.gz 6877090 BLAKE2B 3ed1b184ecf43d12678d3682830065562ce4442aab571ee926b91f509195e314aeceeb10ff2ad935332b38607fd09237eeca274d526df9b7daad17fe6f144508 SHA512 38c5b9c75edb7e620a89376deab0c2e2af08e5853021e207ba26f8b4a2fa1dae2aecffb79bc9c443eb989c96317268a947a42b6869ca2cd827d2bda3be426433
 DIST apache-tomcat-11.0.2-src.tar.gz.asc 849 BLAKE2B 0e670e67396068747d5371da13135696be8b4555892e1cd8338413f7540ded08203c986074cfe42bd077e475a30a05299fd35def29e8a089e570e68be473366c SHA512 ae10b95f4a5a9e922721d190ff9abfeeb62d5814277b076e1d12a5dec64491de8c382273a1b4ccc3f3d193ce561ba34214334048a9e28dcb22a50458d9103016
-DIST apache-tomcat-9.0.97-src.tar.gz 7072346 BLAKE2B ab6e4359d01016f83d66ed516471701c4a9ecc6c4bffc13474978b7bf01cf4336ea88a6f3c3bb9e97f63f9056e4b3fc7d766e144f100862b2c0e5540109f46e9 SHA512 e0500e0c7e4af40f0a6db845b73f41423a7b7746e110053c36744fc376a0db96d141069035171f5b6efdf6011c155cbc29815cd286a0508cefaddb776909a00a
-DIST apache-tomcat-9.0.97-src.tar.gz.asc 833 BLAKE2B 0efe929bc4e6be06cfdb4ea424af5d7a07633aeab42320b46eb724f25a3bdb8eccee0cd7cdd437579d49c63e40b4bfe6689620048e3a23196e5b34345a9c7c17 SHA512 00ae9e08cdec0ddee501ba51f42b44979dd2a9ffd8211eb121eb8851cd8332e2ff00de25d1ba517a494b5ef71b5ae8934a6fbf8094623631bd2cc70c49c0140c
 DIST apache-tomcat-9.0.98-src.tar.gz 7091158 BLAKE2B 040f6a1a02140b85e324f1a17485c3866d9d336f8c032e7de4b8e3880d405339d43e853cf0999ff3e5e4e12c0551d64a39a3bb218dd0cad4cc5124ce2915a3cd SHA512 eb380dae515a259d23d5311d0b96b8ef5068c0d8d72da215410e5475582d2ff82182b7331e0d197eb993d8014a99ea40290154a343e961a07ed02be6894759cc
 DIST apache-tomcat-9.0.98-src.tar.gz.asc 833 BLAKE2B 2f232eeb4af506cf81a32ae6f2bca8c2e7b7c3bc8cc8fade48685fd888e7bd7ea4da1967eb815ae2321d2a02ffbc5598f1ecc8a52695d41e3b2830447331b1ac SHA512 fb6f36bb4a19cc52c3bc1f7d6ccd922db7b61e0274a0aa93e5d79bf2ca0938446509b1e3f966963a583ca9a513fafc9d5c9039bac9d7a03dae1cdd94a722ef3b
diff --git a/www-servers/tomcat/tomcat-10.1.33.ebuild b/www-servers/tomcat/tomcat-10.1.33.ebuild
deleted file mode 100644
index 335e0c37e0dd..000000000000
--- a/www-servers/tomcat/tomcat-10.1.33.ebuild
+++ /dev/null
@@ -1,179 +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"
-
-inherit java-pkg-2 prefix verify-sig
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
-	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="10.1"
-KEYWORDS="amd64 ~arm64 ~amd64-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.26"
-
-COMMON_DEP="dev-java/bnd-annotation:0
-	dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/jax-rpc-api:0
-	>=dev-java/jakartaee-migration-1.0.7-r2:0
-	dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
-	acct-group/tomcat
-	acct-user/tomcat
-	>=virtual/jre-11:*"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	>=dev-java/ant-1.10.14-r3:0
-	dev-java/bnd:0
-	dev-java/bnd-ant:0
-	dev-java/bnd-util:0
-	dev-java/bndlib:0
-	dev-java/libg:0
-	dev-java/osgi-cmpn:8
-	dev-java/osgi-core:0
-	dev-java/slf4j-api:0
-	>=virtual/jdk-17:*
-	test? (
-		>=dev-java/ant-1.10.14-r3:0[junit]
-		dev-java/easymock:3.2
-	)"
-
-BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
-
-PATCHES=(
-	"${FILESDIR}/tomcat-10.1.20-do-not-copy.patch"
-	"${FILESDIR}/tomcat-10.1.20-offline.patch"
-	"${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch"
-)
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-	java-pkg_clean
-
-	cat > build.properties <<-EOF || die
-		compile.debug=false
-		execute.download=false
-		exist=true # skip target="downloadfile-2"
-		version=${PV}-gentoo
-		version.number=${PV}
-		ant.jar=$(java-pkg_getjar --build-only ant ant.jar)
-		bnd-annotation.jar=$(java-pkg_getjars bnd-annotation)
-		bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant)
-		bnd-util.jar=$(java-pkg_getjars --build-only bnd-util)
-		bnd.jar=$(java-pkg_getjars --build-only bnd)
-		bndlib.jar=$(java-pkg_getjars --build-only bndlib)
-		jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api)
-		jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT})
-		libg.jar=$(java-pkg_getjars --build-only libg)
-		migration-lib.jar=$(java-pkg_getjars jakartaee-migration)
-		osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8)
-		osgi-core.jar=$(java-pkg_getjars --build-only osgi-core)
-		slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api)
-		wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j)
-	EOF
-	if use test; then
-		echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \
-			>> build.properties || die "easymock"
-	fi
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-}
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
-	LC_ALL=C eant
-	use doc && LC_ALL=C eant javadoc
-}
-
-src_test() {
-	eant test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
-	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "Please note that since version 10 the primary package for all implemented APIs"
-	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
-	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat"
-}
diff --git a/www-servers/tomcat/tomcat-10.1.34.ebuild b/www-servers/tomcat/tomcat-10.1.34.ebuild
index 4eeadd5c4bce..4b4c261716e6 100644
--- a/www-servers/tomcat/tomcat-10.1.34.ebuild
+++ b/www-servers/tomcat/tomcat-10.1.34.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
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="10.1"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~amd64-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-11.0.2.ebuild b/www-servers/tomcat/tomcat-11.0.2.ebuild
index 0a27c5cc1870..b370601d77b4 100644
--- a/www-servers/tomcat/tomcat-11.0.2.ebuild
+++ b/www-servers/tomcat/tomcat-11.0.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
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="11"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~amd64-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.97.ebuild b/www-servers/tomcat/tomcat-9.0.97.ebuild
deleted file mode 100644
index 65bb2104fdd8..000000000000
--- a/www-servers/tomcat/tomcat-9.0.97.ebuild
+++ /dev/null
@@ -1,172 +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"
-
-inherit java-pkg-2 prefix verify-sig
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
-	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="amd64 ~arm64 ~amd64-linux ~x86-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.20"
-
-COMMON_DEP="dev-java/bnd-annotation:0
-	dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/jax-rpc-api:0
-	dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
-	acct-group/tomcat
-	acct-user/tomcat
-	>=virtual/jre-1.8:*"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	>=dev-java/ant-1.10.14-r3:0
-	dev-java/bnd:0
-	dev-java/bnd-ant:0
-	dev-java/bnd-util:0
-	dev-java/bndlib:0
-	dev-java/libg:0
-	dev-java/osgi-cmpn:8
-	dev-java/osgi-core:0
-	dev-java/slf4j-api:0
-	>=virtual/jdk-17:*
-	test? (
-		>=dev-java/ant-1.10.14-r3:0[junit]
-		dev-java/easymock:3.2
-	)"
-
-BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
-
-PATCHES=(
-	"${FILESDIR}/tomcat-9.0.87-build.xml.patch"
-	"${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch"
-)
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-	java-pkg_clean
-
-	cat > build.properties <<-EOF || die
-		compile.debug=false
-		execute.download=false
-		exist=true # skip target="downloadfile-2"
-		version=${PV}-gentoo
-		version.number=${PV}
-		ant.jar=$(java-pkg_getjar --build-only ant ant.jar)
-		bnd-annotation.jar=$(java-pkg_getjars bnd-annotation)
-		bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant)
-		bnd-util.jar=$(java-pkg_getjars --build-only bnd-util)
-		bnd.jar=$(java-pkg_getjars --build-only bnd)
-		bndlib.jar=$(java-pkg_getjars --build-only bndlib)
-		jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api)
-		jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT})
-		libg.jar=$(java-pkg_getjars --build-only libg)
-		osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8)
-		osgi-core.jar=$(java-pkg_getjars --build-only osgi-core)
-		slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api)
-		wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j)
-	EOF
-	if use test; then
-		echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \
-			>> build.properties || die "easymock"
-	fi
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-}
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
-	LC_ALL=C eant
-	use doc && LC_ALL=C eant javadoc
-}
-
-src_test() {
-	eant test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
-	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat"
-}
diff --git a/www-servers/tomcat/tomcat-9.0.98.ebuild b/www-servers/tomcat/tomcat-9.0.98.ebuild
index 01ffb2ede3e3..eeca0d02b4c7 100644
--- a/www-servers/tomcat/tomcat-9.0.98.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.98.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
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~amd64-linux ~x86-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/x11-apps/fonttosfnt/Manifest b/x11-apps/fonttosfnt/Manifest
index 97fd321180d9..e92a15ea7a72 100644
--- a/x11-apps/fonttosfnt/Manifest
+++ b/x11-apps/fonttosfnt/Manifest
@@ -1,2 +1 @@
-DIST fonttosfnt-1.2.3.tar.xz 140068 BLAKE2B 62f3e332ce598cdf22e0db18e109ec9e7a425448697f18ef948cf6cafd2129a7fb44f251e7d43b76186d5b84cecf0fd58518a332a81d0a514c62ab2f57d28cc0 SHA512 9464ef05f3ff7dddfd7a4f0d46a6cc5bb79cf8e019824c2d40164cd18025cd9ed33b31d7b808b4c289af58f09be0be7591f6dfab5624aab1931e4c6a7da68463
 DIST fonttosfnt-1.2.4.tar.xz 143928 BLAKE2B 82469dd753da5e9e9c48b800f57f5442c6e828f1d45783d50985ea4da39adab1fd59c3b7642ba057e821997a5bc7e892c25c46c2903098340adac2e5c70719c2 SHA512 37654d66e8d63abc4801c76d48082cc99dc3cc7813376e634c287d97207d17592323cefefd305328a504e432c94e102260b92308088d5e0bf3931a471cb4b851
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.2.3.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.2.3.ebuild
deleted file mode 100644
index 890aad101c6e..000000000000
--- a/x11-apps/fonttosfnt/fonttosfnt-1.2.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="X.Org fonttosfnt application"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="media-libs/freetype:2
-	x11-libs/libX11
-	x11-libs/libfontenc"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/fslsfonts/fslsfonts-1.0.7.ebuild b/x11-apps/fslsfonts/fslsfonts-1.0.7.ebuild
index 1716e11ebe0a..2ac042bdeef3 100644
--- a/x11-apps/fslsfonts/fslsfonts-1.0.7.ebuild
+++ b/x11-apps/fslsfonts/fslsfonts-1.0.7.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
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="list fonts served by X font server"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="x11-libs/libFS"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/oclock/oclock-1.0.6.ebuild b/x11-apps/oclock/oclock-1.0.6.ebuild
index 385ece76f18d..1407ac328f99 100644
--- a/x11-apps/oclock/oclock-1.0.6.ebuild
+++ b/x11-apps/oclock/oclock-1.0.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
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="round X clock"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/transset/transset-1.0.4.ebuild b/x11-apps/transset/transset-1.0.4.ebuild
index 19b96c5bdd6a..3c347b03099b 100644
--- a/x11-apps/transset/transset-1.0.4.ebuild
+++ b/x11-apps/transset/transset-1.0.4.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,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="An utility for setting opacity property"
 
 LICENSE="SGI-B-2.0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 43e8e71ec08b..2f4aa3ce6a07 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1 +1,2 @@
 DIST xinit-1.4.2.tar.xz 156728 BLAKE2B 8f5c16d5ec9cc16c734b1661def4f7e68321259f24e7aac2b039b8e142fb4a324d2471a0f04d3b4448ae713082ad9ec7018083b00ed1a93aac90fa7db172247d SHA512 4b62c2edd97b40133577cbba88b3f31b36c5634b4eb667ef0c302e8358dc1c55a255abe42aaadc910d8aa9ea0e3add157a12a301382f1cdbe091df4e1215fae0
+DIST xinit-1.4.3.tar.xz 158348 BLAKE2B 321400aa6572a7309ece961c1f053382825de5c12a235eb7f4345d5da4f95a199a9e1987e21baa5c3a472d2638e8c18a1610e4f0d617f3205f58cd66415efb6a SHA512 ff754567d2224d1ff5023b302cae3a435950a6f24a773e214ea108b96d18b722d4cc86d0e25a7d92edea1307e3037248b4da004c1b392f73ba7bc1e04a94b77b
diff --git a/x11-apps/xinit/files/xinit-1.4.3-gentoo-customizations.patch b/x11-apps/xinit/files/xinit-1.4.3-gentoo-customizations.patch
new file mode 100644
index 000000000000..bdbde8614105
--- /dev/null
+++ b/x11-apps/xinit/files/xinit-1.4.3-gentoo-customizations.patch
@@ -0,0 +1,60 @@
+From 51b59e76c26da000de8a3d3f32d440d4213c2964 Mon Sep 17 00:00:00 2001
+From: Tomas Chvatal <scarabeus@gentoo.org>
+Date: Mon, 1 Nov 2010 16:46:36 +0100
+Subject: [PATCH] Gentoo customizations.
+
+Signed-off-by: Tomas Chvatal <scarabeus@gentoo.org>
+---
+ xinitrc.cpp | 26 ++++++++++++++++++--------
+ 1 file changed, 18 insertions(+), 8 deletions(-)
+
+diff --git ./xinitrc.cpp ./xinitrc.cpp
+index fa1675c..7cff166 100644
+--- ./xinitrc.cpp
++++ ./xinitrc.cpp
+@@ -9,8 +9,8 @@ xmodmap=XMODMAP
+ 
+ userresources=$HOME/.Xresources
+ usermodmap=$HOME/.Xmodmap
+-sysresources=$xinitdir/.Xresources
+-sysmodmap=$xinitdir/.Xmodmap
++sysresources=$xinitdir/Xresources
++sysmodmap=$xinitdir/Xmodmap
+ 
+ XCOMM merge in defaults and keymaps
+ 
+@@ -40,15 +40,25 @@ fi
+ 
+ XCOMM start some nice programs
+ 
++if [ -n "`/etc/X11/chooser.sh`" ]; then
++	command="`/etc/X11/chooser.sh`"
++else
++	failsafe="yes"
++fi
++
+ if [ -d $xinitdir/xinitrc.d ] ; then
+-	for f in "$xinitdir/xinitrc.d"/?*.sh ; do
++	for f in "$xinitdir/xinitrc.d"/?* ; do
+ 		[ -x "$f" ] && . "$f"
+ 	done
+ 	unset f
+ fi
+ 
+-$twm &
+-$xclock -geometry 50x50-1+1 &
+-$xterm -geometry 80x50+494+51 &
+-$xterm -geometry 80x20+494-0 &
+-exec $xterm -geometry 80x66+0+0 -name login
++if [ -n "$failsafe" ]; then
++	$twm &
++	$xclock -geometry 50x50-1+1 &
++	$xterm -geometry 80x50+494+51 &
++	$xterm -geometry 80x20+494-0 &
++	exec $xterm -geometry 80x66+0+0 -name login
++else
++	exec $command
++fi
+-- 
+2.45.2
+
diff --git a/x11-apps/xinit/files/xinit-1.4.3-startx-current-vt.patch b/x11-apps/xinit/files/xinit-1.4.3-startx-current-vt.patch
new file mode 100644
index 000000000000..2feaedca6c2f
--- /dev/null
+++ b/x11-apps/xinit/files/xinit-1.4.3-startx-current-vt.patch
@@ -0,0 +1,34 @@
+From 14903751c4d53bb69c3ee241524888cf746784c6 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sat, 3 Dec 2022 18:21:50 -0500
+Subject: [PATCH] files/xinit-1.4.0-startx-current-vt.patch
+
+---
+ startx.cpp | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git ./startx.cpp ./startx.cpp
+index 645566f..aa1dd7a 100644
+--- ./startx.cpp
++++ ./startx.cpp
+@@ -211,17 +211,6 @@ XCOMM process server arguments
+ if [ "$server" = "" ]; then
+     server=$defaultserver
+ 
+-if [ "$(uname -s)" = "Linux" ] ; then
+-    XCOMM When starting the defaultserver start X on the current tty to avoid
+-    XCOMM the startx session being seen as inactive:
+-    XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491"
+-    tty=$(tty)
+-    if expr "$tty" : '/dev/tty[0-9][0-9]*$' > /dev/null; then
+-        tty_num=${tty#/dev/tty}
+-        vtarg="vt$tty_num -keeptty"
+-    fi
+-fi
+-
+     XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
+     if [ "$serverargs" = "" ] && [ "$display" = "" ]; then
+ 	if [ -f "$userserverrc" ]; then
+-- 
+2.45.2
+
diff --git a/x11-apps/xinit/xinit-1.4.3.ebuild b/x11-apps/xinit/xinit-1.4.3.ebuild
new file mode 100644
index 000000000000..204a32fcc6aa
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.4.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xorg-3
+
+DESCRIPTION="X Window System initializer"
+
+LICENSE="${LICENSE} GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm-linux ~x86-linux"
+IUSE="twm"
+
+RDEPEND="
+	x11-apps/xauth
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+PDEPEND="x11-apps/xrdb
+	twm? (
+		x11-apps/xclock
+		x11-apps/xsm
+		x11-terms/xterm
+		x11-wm/twm
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.3-gentoo-customizations.patch"
+	"${FILESDIR}/${PN}-1.4.3-startx-current-vt.patch"
+	"${FILESDIR}/${PN}-1.4.2-move-serverauthfile-into-tmp.patch"
+)
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-xinitdir="${EPREFIX}"/etc/X11/xinit
+)
+
+src_install() {
+	xorg-3_src_install
+
+	exeinto /etc/X11
+	doexe "${FILESDIR}"/chooser.sh
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/Xsession
+	exeinto /etc/X11/xinit
+	newexe "${FILESDIR}"/xserverrc.2 xserverrc
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}"/00-xhost
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/Xsession.desktop
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
+		ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
+		ewarn "any executable. When you run startx, it will run this as the login session."
+		ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
+		ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
+		ewarn "Here's an example of setting it for the whole system:"
+		ewarn "    echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
+		ewarn "    env-update && source /etc/profile"
+	fi
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "1.4.1"; then
+			ewarn "Starting with ${CATEGORY}/${PN}-1.4.1 serverauth files are no longer kept in the"
+			ewarn "home directory but rather are created in \$TMPDIR (typically /tmp).  The change"
+			ewarn "is transparent for most of users, however those that use runtime temporary"
+			ewarn "directories cleaning tools, like app-admin/tmpreaper, may need to adjust them"
+			ewarn "not to remove the 'serverauth.*' files."
+		fi
+	done
+}
diff --git a/x11-apps/xkbevd/xkbevd-1.1.6.ebuild b/x11-apps/xkbevd/xkbevd-1.1.6.ebuild
index 4917d62cea9c..de119def7cbb 100644
--- a/x11-apps/xkbevd/xkbevd-1.1.6.ebuild
+++ b/x11-apps/xkbevd/xkbevd-1.1.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
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="XKB event daemon"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-base/xorg-server/xorg-server-21.1.15.ebuild b/x11-base/xorg-server/xorg-server-21.1.15.ebuild
index 78236916640e..99cda86cb914 100644
--- a/x11-base/xorg-server/xorg-server-21.1.15.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.15.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
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="xephyr xnest xorg xvfb"
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 9d707356ffd8..dd9e3eb3d87c 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,47 +1,60 @@
 DIST NVIDIA-Linux-aarch64-535.216.01.run 269827921 BLAKE2B 37e76e90411e883d0f911edc1a3883fba9db6a5e281e5bba265fab6b892382b202aa0ffb44a0d3b4a181c6855e2b9ffe54874049f331fea50a3429d8c2b298af SHA512 f68794249bf18ba626c6a665880721c8cc0dada6c7c1d8b15bf17174a4cac35ca2ab534fff2410c8bc0326c48f6ab913b6d9a92630505eeb768e02610a7772d9
-DIST NVIDIA-Linux-aarch64-550.135.run 236446786 BLAKE2B c1f3afb1f28555389ebb4d4263509801102818900be287c5547a050f7b0f535058e052f28a68172cde9e42f4cada45acf109c2a87631284578b82e6904663a2c SHA512 62871e26d0eca725ec381561c8086a107b536225aa689b6760f126f8125a6c969a3362133c527cbe18198650973133ad80388082370918499cd74513b0a3305d
+DIST NVIDIA-Linux-aarch64-535.230.02.run 269922956 BLAKE2B 153d598eb73007e0a4f4e58c5072c955b6fc0b8d44c224f91895ab0fefad5a180241d66b0c2de7f6c8c0b976f74aa9cef6e55fef235c415927e814d93c70db24 SHA512 7954350fe91419fa85c25483e2572e63c14da3e6fef27ffd13b5a4fcc814cde32faf4cd289333d6a22db26c64658f3e2df0ff8a9ec17094e29a25d35517048e4
 DIST NVIDIA-Linux-aarch64-550.142.run 236424737 BLAKE2B bd2a43b6db8b228b871896eda3046161f6e3525b24adf322e5b27b0af5ab1be1af12de29c99aa5f86488f69d7ae0821e8925821a83aa5f354fec56d0daa80e8f SHA512 9ab19a145bb8f9ebad3981ae6bc1ad8900b8598230a7283fa58e594ce42d889a5d963ebd965ce737d1f56f9b273d1a9dad90644312f59ebc0f43ee7c626d7e73
+DIST NVIDIA-Linux-aarch64-550.144.03.run 236384330 BLAKE2B 773c0ee75a2fcaa405539afdfd3a700bb6b2694f4f6c6770778141838ca06ed2e3cd97416f43ac446ede245a21e6c5e03e8a26a8558bb5c3815f77f13b633be0 SHA512 8bf610acbb92dd4cace8dd18263623db6a4108d988da91603c61fc46402289edd78423a329c2b91f8af922327a1f7aa0357fd5431e88acf99242a712357c335f
 DIST NVIDIA-Linux-aarch64-565.77.run 253994527 BLAKE2B 3fb41a7958c58742817eaf3c7bab9dc5620cdaea7244918d963cc54b0708572ae22de30866671d77474c2c61413797865efa1a6ef4e53e4fbdcd283e0324a4b5 SHA512 89be8b0b1fd645fe2ae1ea5d1af787b21e665a7f0b0d911acb749b545ccc70770bc42f8842f2c0cf1b965a980e4260fe025e2aa8a678de2036c3aeef49b7f336
 DIST NVIDIA-Linux-x86-390.157.run 49417041 BLAKE2B 435b5e0e60468cc74b41cc5d9b5bb0105d29c11a2d408457835212a96519c9334ecf19278b36749d3ff7f498f5b0ae45a2efae2d428703dac21245c62f1efebe SHA512 dae9ac2c12f9ad90f7441e00e01a984147c577892421911d7f67f6a31e616ac1cb7d434bc9c7f58fbd9b8ae909521b5bece607a63c79588c0bb9d99c6bad5fb0
 DIST NVIDIA-Linux-x86_64-390.157.run 85835541 BLAKE2B 44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b SHA512 4780503a4cff0180b1b1f37d20a6ba3438dd78b51fa7f69b98d35521835e5d61099129746929d51d63afa2d47b672b3e145e1e1897584dc3799e7f822c5b3a0a
 DIST NVIDIA-Linux-x86_64-470.256.02.run 272850014 BLAKE2B 0fdc867f92b82b2a60810c3b43751cad7ac2c39928c92c6c343c0c6044f4d7d923d93b8599db3f7c999c0ee7d16940e65d991a61cbb30e1d9e49c5639ac6bdc8 SHA512 a837946dd24d7945c1962a695f1f31965f3ceb6927f52cd08fd51b8db138b7a888bbeab69243f5c8468a7bd7ccd47f5dbdb48a1ca81264866c1ebb7d88628f88
 DIST NVIDIA-Linux-x86_64-535.216.01.run 341874992 BLAKE2B 65fc3674982ecbf122f565af70121ca6c022a4df8f352e259e6b0e8892b9112b182c32ed615edae737f3354808e37b54051bed0cdd2f661c4082692f9e0477dd SHA512 3b4ae3584368fcc5f81a680dd8588d8b9e48f43dafe2490f5414ed258fa8c9799ebd40d2fd115e20bd02648eeb3e5c6dff39562d89353580fa679d011cebf6f8
-DIST NVIDIA-Linux-x86_64-550.135.run 307349369 BLAKE2B fb6bb69781c0c1bb635c897ee39cfdb46bdda35525e3bf1c0bfff6e8170aa3a07c7444563ec686ab766178a4846e68588efb7961c78c51a582b0b9b60d387565 SHA512 1e93424a527023bd28d9349e1a5afd2053b8c9f20ef8ecd5d185b661bccaec972ffca604b67b0e7fe596a2d1de9d57256f2ec3f1afd1571ac155d06ae7d87f0a
+DIST NVIDIA-Linux-x86_64-535.230.02.run 341903243 BLAKE2B 954ad0d390aa786a0a95298bd0c98a3b909074e5c7bc5d40a6a4fcea41d423ad1f429f175968c98f5e14c07cdf68d3340420f97269a36a0df41ace6ac8224cb5 SHA512 2154e28682fe1663dc64b18569c67839995d496a6c1b353fcdc17fc4520420c8d629d441312a6cedc054d6322a267d6f275d1daef210d2f24a179d931a4c99b8
 DIST NVIDIA-Linux-x86_64-550.142.run 307296728 BLAKE2B c11b3483d2ab895cd7f7eeea2661d21b7c8db04af14d72f55a86b6291f398ed111366d10886ac98670060dcd05f63a34a0c44e2596ef3ec3be6405ea45a6c305 SHA512 7b33d8f335c735e196a5de85998981ef4a11a2b14f791a60a820a7e5cc7bf0ddcc96e57169687d4eb9768d0c669a4a5887a40673807ba0eead825bb19bcd287c
+DIST NVIDIA-Linux-x86_64-550.144.03.run 307272669 BLAKE2B 6d1daf41eb3f65071b42dc9bc5b8e0cf48170b03f3418c938f956ddb843f5a1e0f3d968b8825207e3237fa0490f0c29e3ffc4403b4558ef557dadf4fcf5ad17c SHA512 b7c4638695ef3e75043fd1726f0153ff0c140475f965d88c21f46d2909e68d023ebe6aa1e758ed81ab58440ba9a789e00b9b84200c03f00d429e11938a2bed65
 DIST NVIDIA-Linux-x86_64-550.40.82.run 312434148 BLAKE2B a63292fe92b78b9bb7fa62eb80718bba02af2f539606db44c73033a6dcedd262e4d340b5f612c9a6c587a787f8e7982d8eb3c8c750de180eea3cca3bb9922dac SHA512 69c40883b017d285de662b60d3bb4367e2ba3edfe20082c05942ef68d1e42c581b4913a5a7d4b1b2cbd8d63ae15b451861f1262896915bde09136e0b4025fce1
 DIST NVIDIA-Linux-x86_64-565.77.run 339246825 BLAKE2B 6c3c57048b6ac25f08a4d493123816c534ed310197aef532ebfbe7f9327897020506fa892b80bb150e6edb953a74ad8d649d743ce7d33d2117850d3308470a0a SHA512 62a85223b1cbc00b65113235642a4a39eb8e78e085845e4c7d12abf916ea2c1d86030849040bba118ba6af56a1d0da073d4a96791674fc18d7154e55a3587b63
 DIST NVIDIA-kernel-module-source-535.216.01.tar.xz 12517044 BLAKE2B f305acd878b6a8e715607d1ef330b6f60492f9291183a139520b011fe77d344556708df811eabd5f47d1e509d2ce179e243eecee8629dc480ca5a1ac4ca57529 SHA512 b5127fe5c29c476decea81f4c9916d2670a048f3e65ef898b1055fa1aa87c0936415c33fb271bc30d03f28fa9d3a5c2247e5f3ac67e12f93454e3da2706ff9a5
-DIST NVIDIA-kernel-module-source-550.135.tar.xz 13523028 BLAKE2B d989d0f902b0d1712fc65313efddc625f2e2167516f22cfe37b5481a4271b9237518dd111592c06782b02d2dc7e4b15e5b1e43b6437818e944a18fdc840a8092 SHA512 927c93227407027610e68d49aeac9cb35f44ba929b40392ca6bcfd93094f2dbaaf34f54572776095ff720a710e6712525968a4d1e696e3629c3e06b72253eaf5
+DIST NVIDIA-kernel-module-source-535.230.02.tar.xz 12527212 BLAKE2B fd641d03cf7b417f1300b39dc271b08c920d11861491c510ceb713aaf69f1b4d373a1b0417993a0483dc6b2cb1d3e2d176d9c23edf9586f129df13bef495ce0b SHA512 d9080f257312b6760140a7dad3bb8e1d6f5982e7b25b3e623a74c519a7c296b1a12eece07335fc79f2d209b790a8239df81948cdb4031852d6225c4768ae42c3
 DIST NVIDIA-kernel-module-source-550.142.tar.xz 13547504 BLAKE2B a10553e780b2517fbcb72263c32d3c1d67bcbeba1afd0edf816ef452eed488a5ff935affe96f2fe5aeee9e5fcfbb1667b7dbadfa2a97b86dfe290f4f23e19e75 SHA512 bf1def2d605bde8d304340759bf596f51005b98f1dabb7c2d1d87c6042425987662029a766009f98137fae8d5252e71e5de94423f55ed30d20b0eca26fe7b3b0
+DIST NVIDIA-kernel-module-source-550.144.03.tar.xz 13544304 BLAKE2B d68c1bc8914289b5f90a7fabaec029394871175b0563d64416fe596d7dc30c35b607b3fca5c88d03e59f1944e44663810b20609fccaa32aee89ce79b9fb061e9 SHA512 5923c7e6cdc3d8bfe4cdaf079d07e26b638f35ffa6b7a6c74c5ca2f9478a757ca92a1ced5f5b105f8ec0a61ef792653460683dcd1069beafba68264fb180fb14
 DIST NVIDIA-kernel-module-source-565.77.tar.xz 15374480 BLAKE2B 0ca329dd09db37e283c8066722718182e43beee77fc5f3f3e2a06f74a8a6d481beb4ad90260afd3b93a45b1dc462dadcec6e11919c535cdbc4af950836e5af3f SHA512 dcc5d7a53e1c67d42dc0d4bff8ac8181fac15bb05ccd0990e50d4675c94a54a3ed5d56c60cc7f65a958b0d9f2075620a79add51c5ba443869eb47c9c414da586
 DIST nvidia-installer-390.157.tar.bz2 150323 BLAKE2B 8058ca87a6dea956d564af9f7eab9b1fc82b1f2382bd5cb2f6d97cbe2e19292533522d5f8f2eacbeb16520372715fcb72f8f9b0998962af5d4e75522c8d74524 SHA512 93a7ece648602157496c8e27a88864ede341a100f5328a4c1a25faf8f0b94d252060e5e2f71d0c302fd0566c10773c30b76b3b5f431d8039b71c90a7969f7d7e
 DIST nvidia-installer-470.256.02.tar.bz2 146269 BLAKE2B 4402e725c8fd0157eb84d4ec140a33f97e873014577487ef1e32fb8921cabe79c60ff46532e5bfaabb2b6ac894f7c80086dbab19e61906e2e27346fb85f98829 SHA512 c962dc17d9696256d1ebedcaeb3010994f2ce3895aedc47987599ebfec132a9b9a249d2ece6502b15bd4a93f9b0106aa13487a7da5f64199c274ce11eba27cfd
 DIST nvidia-installer-535.216.01.tar.bz2 148531 BLAKE2B 1b112ba9532fab9754e8f278c5e7ee9e9f6c064caec568de678f1baa966c992f8e8e6a9711d69586d58688aa8ffd76a80c37aaaac57230284e76a9d6e52b766f SHA512 7362ad1ba364505afde6ef72b4aeeaeb38b3ab11d331daba1d000efb0e3645a8b3e987bfac30579c25293a8b7e269b388701b63c1019ea9705928016e888f8c7
+DIST nvidia-installer-535.230.02.tar.bz2 148662 BLAKE2B ca0c35eca37f66fa169b693b35bd3d4fe3d0960729db33c32b849ac6742b3615c3049b6ace8eac9899809c9ccb92192374ee5cefaf414d696d1fd7ee71410045 SHA512 9f15574aa5293d8881c8a79b23a1bc353ccc66224b260cec2db4c6d43c24cb8d6bab09e798d64074d5200c8d520b92dfa0620f1ee3a547ed624ddd4efd4027cf
 DIST nvidia-installer-550.135.tar.bz2 155713 BLAKE2B f4161cf56daec14f79eab44fc3a6bca752fa8e39380d9b341150707ed3a78e3975f07988e7df51f7dc056c82790af23da1bf048d497b8f0d01e9c9533701c04e SHA512 891cb7cc42cee76f8cf9f70fd233aaa4050ebe20308348486a0d29174c1426b15eff263281914af03e52cebd3967decf05e105495c10179ee2534bea4d2b4bf8
 DIST nvidia-installer-550.142.tar.bz2 155571 BLAKE2B bf781937c2a9f7f784c99d324a6d5361ba659b151d5c30cd6c7ab4e25e66972fc247acabcf9cd25c24edf2c372438f354918e8243d8c182a8be1ebc6021b41e2 SHA512 b432f7db870bca60c458837a3ef59e65984db7ac71ffa51d84d5c6f8a0faabef8c0411fd7d165b466802c8336809d5fab4a4d4ee16fb0a27e2a6b952d5faa71b
+DIST nvidia-installer-550.144.03.tar.bz2 155619 BLAKE2B 457f33a2c66f8f687124ecf8695bcf8fe39292e2017de69f98be856aec95e4abb41e03a8b23583a3c819c3b4cacebe7d51b3a9c2a16f05745a7b772a098b81aa SHA512 0b0e360250d2d9ef6d8da10db2b7c85b7614a032a0d274b0b3bf19ebef029a9d4f83607241073ec6bce25ee1a28570d86fabdfdbf2b7232cbfc06cb202c99f25
 DIST nvidia-installer-565.77.tar.bz2 168880 BLAKE2B 646183592cf837d9d1521cd9e539d7009289dbfb4c13c894ee94f2613df4a7fab9fa26a9e4e88c16193052c15133f6d227719138d24eb7aae7af694fefdcc582 SHA512 e73d6215f5a3c2984b99232ca93fa8e795a59f559f207c8d4999a5ba48dbaf9082f74fa6304a0d6f186d4c4d9d6f67a991f0dde0a548f05149526759c903a16e
 DIST nvidia-modprobe-390.157.tar.bz2 35306 BLAKE2B 80d202b39c2f95ec0f909712c2e101483af50124092c32efb33bd98ff58ddfb97b737ff07f1ddc941f688c1b4c26a15f392566d522e18506771f10422fcd571c SHA512 109bbe24a3758b568ea65fe1e9d78f69fae6108ec0497b796c885a3912825fe04ffd7389a3e22987f1a10a2926bf6eaa384faabc59478aa3ee244dd3ac91c6d3
 DIST nvidia-modprobe-470.256.02.tar.bz2 38769 BLAKE2B 0db444b09b0b6d24c04877fae95249e781d82b3141f90eb05d869b64d2b6e65ad00bf44c4e427c64dbd4765fa99a8699f80a1d95b00c66137a54dc878d7ea298 SHA512 c1cbfa6c8e188e5a5eb5d390b9a903406cbff103d212fc30e611e4023be3fde896ad84e8bb45b030beb5d1bcd8155c9e55a8f9636c45ce1e2a5c03f672989a31
 DIST nvidia-modprobe-535.216.01.tar.bz2 40657 BLAKE2B 7852ffd82321a68b6ee3d66e19f3fa5b4a71da264d7c75d1ede325d6ef90219bdecde8d4681537e0ae50a2caf4d746e0b6a192ee8ad38e371dc651c323fa2105 SHA512 dd41512568c55c58c4ad3a775819fcd2a7dc71fbb95dd13e7462d1599950f92b3207980605b443ef988a46334415c0eb18c7f39ed986b8d4108e19a557b6ebf0
+DIST nvidia-modprobe-535.230.02.tar.bz2 40755 BLAKE2B a3d65084214237416dfb564a5e85ad83fa8e37bbf4a056c57c05020b792a3fff0ae01d55469348e7de3bafdd5ab045ee254ee9f019e33160ce4b155bbd608dbc SHA512 d48859f5ef6dc467fca4da763d6f67076b4da27831a2d6ef6aeafdf8109d7e69311383f0ea3841f653a594b51b207a4d8851b58e9345f7d4a9ff7d57d390d6f6
 DIST nvidia-modprobe-550.135.tar.bz2 41401 BLAKE2B 79392d30b3e145e5169ec42f0a66e8b392ed815dc27b5fc6a5e4132f1f3b56a8aaa738c8a02ccb7369df118f1fd855f83a902bf9d0288b5991db8d12bb021ce3 SHA512 6994c3356fb49208106d3fac80952fd8ecffe9d76a5df27788ce65dc0ce2511fa7557acca8a5917c10c73719859589f989275a3d90959957c9e4fd8bdf5085e8
 DIST nvidia-modprobe-550.142.tar.bz2 41391 BLAKE2B 1fc1afd549f9cf8c3994dd14fa6cdf866147fe082c7f7ea6b1025acbcd6ca215039df2e4be60c274fd1107db870891eb285e0bd73a6712ecfdd5ee49077fa3bd SHA512 198ace3c2cc09aa3318ed977fb6427b1426f2446d033915252c6681cb3c931fe8b1a6f9b900de1916352350c3a2b19adf181793c0da8bd7053fed6456e451ed9
+DIST nvidia-modprobe-550.144.03.tar.bz2 41461 BLAKE2B 2efaf72026775651ae1c6b8bac94d36643a00940eec8b89754c7712fc33a5d003180f95a123dfe4b538636567628f7fba88cdb54b48424a8fe50b5796e59ce28 SHA512 8ee0bae7acf1c590308ff1dd0a616659c416e18a582c55ff539aab728a164fa27e7fc57d29dc3519cf680390748902d509d4230a6812a40c850598a33bee4c3b
 DIST nvidia-modprobe-565.77.tar.bz2 41644 BLAKE2B 6eccaf62ba02cd68bb3547266df65cdd6514e925748043ab4089f7b1d6f73d36e6d167293a1bc1c6339ab42cf76ea65e06676180563ad89484bc8d71c64293c5 SHA512 f9cc72d0e07e53541cb3eb6811d4fc6783a82d7a0c6fed2693885fdaa8ea5ff25d6f63a72e99e7fae9fc0e2b337bb1a28cb935768ed283fe9d8f62e2eea374f1
 DIST nvidia-persistenced-390.157.tar.bz2 48654 BLAKE2B 2cf6c92da90acff55e8c180a06b0c6a29d48be9fd8ca3c541202fd14f0697220fba6b66452942aa7ae7cc8821f5c5eb9fa8f7a31d2248624e5f9141d83a176b8 SHA512 70f0707ed6f2b877e69ef90cf782f66cbc9d2071db53ca09ceb7b89427b0fe176708517340621fa251539b7d481b238adeeb60261674eed74de1f62db6dbb72e
 DIST nvidia-persistenced-470.256.02.tar.bz2 46567 BLAKE2B 8f837322a3b88412fd2f6acf38721b49a6cb444fbd842d652519e5596f2e545d8f06bbdf017f46a22301ce87455f96147fab2829ca5fbf26131ec3e4a772e282 SHA512 4fd19258649b7d39945fb5c8578bf11ab118617dd14f3d11cdf15cb3fe77daf7b4719e4ae57af59031b1b809d02f4e8e8afed0ec60b9d0aed4d2488bd3013cd9
 DIST nvidia-persistenced-535.216.01.tar.bz2 48566 BLAKE2B 5fb17d54bf4046323d1f95c45e32dea077083ee07fd7b8f1adabbdce28d569195d61f72c849d5d26ea2dad07fa476b833a2235e9c4edfcd4a57fed3153ea9678 SHA512 2298df7a04d5b449491afea400fef50d406a3a393862b72cf7ee30600e026886009237ecd1669725a8802fb88f1d4c1ab99c10ada00fb57051151bf7169060de
+DIST nvidia-persistenced-535.230.02.tar.bz2 48593 BLAKE2B 3db9b706f42abe108787ba56066b54f0cb4fa76a7f3da5e0f927da8b1dde37d8c9fb39b5f06859c1087b2e634edf1f2bfc69e4f62d15a5b0f54a0af0b7cc1b2a SHA512 f5482032bba92b94fb95d71830e8596e44f3f22c5804cda32a1f5f856711ae66740ba35fb9930fefe2fab688026a292705cb882e6ae408f74c8dc494ff3c4600
 DIST nvidia-persistenced-550.135.tar.bz2 61306 BLAKE2B b096ae7b8a1fe9fb4bb2838e29621d0a1e3991acc80a0798d6442896031fec061305fe88b0694cb1242036e5cd7a1c811719967eaf29b558f538a9084447272a SHA512 0abb22a4a1f1caa4909e64a7f9f6cd982e7bc2f23ca85ad0942fd4700af40e338ddea60772d277045590debb53c835de3adf0a2d291386e441944126864f834f
 DIST nvidia-persistenced-550.142.tar.bz2 61276 BLAKE2B ba2b7e012feca41c60710133d3a5dc4e0ef8e5ae3b1d81f002dd69046fa0961dd646635f02e24e6e1a660eba25502e85802cefd333131b4c7bb082fd75d0fd68 SHA512 9df5d47c2fb710bd0b7ff9f795c4c42ff64ac6688b18c2952763e2ac14446549b2de8071e54788d0d00b5f540d3b091c868fdaef74f99e70ef0f0f936b808889
+DIST nvidia-persistenced-550.144.03.tar.bz2 61298 BLAKE2B c9b6f35fef2779f4dc3e505d3fac9680fd792b227c5770ed518187bf16eeb01dda65f02bb0323d845d7f27e4d7d14ae424d8c6782a455396894869ab8c462423 SHA512 a9f4c46255c4e61d106bfa1df49fcc24dc754e1df1a7b1d62bb00054c5936aaad19d4c4d4aead4276681b73ce40111a3f15226ac138aa43b0919af4c91045236
 DIST nvidia-persistenced-565.77.tar.bz2 49679 BLAKE2B 42cb002e207274b4e3100879d3a1dfb7f458f600d8ae82637771d38a0d06998cbc53061df1e84fec26d2a1b713a033bb96ae07e4a30307a7c3a9965033024682 SHA512 7268953c5e17891498bf75fd9b3fecdf27eaa1e9488eb390b939a08cab04568b1be5363a8cd788aa4491315ca0285a6edbde8a661a7fa1a2ad7ae7bcf5ff0e95
 DIST nvidia-settings-390.157.tar.bz2 1108938 BLAKE2B d9ec1ab5d7f157d74627272adf752a671dd17e2ede02069437b6180b927fe315b15cc6416d584ab2f038b76fe01e5b64514a834f24d88ac16676e55205fdecdd SHA512 b16699009bf56a1ff3b623a528c58061c4f5a2c5c4a373756a07bcd667743a1df7c733a572d2d0baa835a904ac2fda8a5c85890dcc00c3a0f223e0467aea902d
 DIST nvidia-settings-470.256.02.tar.bz2 1062273 BLAKE2B 8e66201e7861469b12932595ef8f9fd29d4cfd570c2576ae7fbb7383f61c55ac71fe721cc431e79d6d69f86d998b5b4c3cafe531b573f439e6b499b0fc047a19 SHA512 626e66118ae2e62eacfdf44e37529c409b945a6f33637b9690d74abd87a2afb581aaca5f90328d280da99ceb659959d0e5dc5c22ef8013b2205b2b1c72e08007
 DIST nvidia-settings-535.216.01.tar.bz2 1094718 BLAKE2B 19d87eed2263fbff32a6ca1f61f28e4d46e7b98e05e07f2e9f005a94ca1a89c61351aeb568b83ec1eab6e41a7a77a121cc156730a04137c43e03113df56289e3 SHA512 a4100e3382486508da74474e6252b2967c9a961fc08ff6824a321ffb929bf47096c8e4cc91348b57fb07cd637436d5bd7c3b9bbf9f07a6671503b2f9a9c96114
+DIST nvidia-settings-535.230.02.tar.bz2 1094719 BLAKE2B 492a7c190b10ff6703eb1d5a18702f71f7cfdb9d2657aa6ff63487dfd6bc133d7df980af40c12ccb4fc834025776a72791fb2df39628e81ade0588bc0e3ad1a7 SHA512 9e4cfd71198be0c6a8df15d0a4c57d117da8674922b4b3d9584aac13df704def146f4ffef7f8c39f2064c76ce3813f13daed3e96f0b2bebd2dfb6ac612fea990
 DIST nvidia-settings-550.135.tar.bz2 1099109 BLAKE2B c8d9deeeb11e6c51c028300cc45bc094dab24848a61b58d9c91edb424645eb1369a53ce8abfd8d705e7f2225cf4751799f8cb00a8cdb30bf4d126939a78d28a7 SHA512 e576f44ac9f40bb0b24fc1567213dbfe82f2c21a7249b0d21bc0ec78ddfc7ce28fc61463d471f5750777645e82d9010a669365d7a8a599d55d02c534d639eba6
 DIST nvidia-settings-550.142.tar.bz2 1099095 BLAKE2B 20509a335feada839f87427cf6bd4125e48781688cfef546a407a8387f985f05b871102a6c663283434d13b2fd1d51d1872486def8517d1c84bc45a37366719d SHA512 7a1af9563e1ff3713431296451ad7f15f33f2d57b19d4ae8aa09553a3bbf8d316d5739ca34dca12fac329d972e3cba3c9de836ae6718f45728d9600ee07fec23
+DIST nvidia-settings-550.144.03.tar.bz2 1099313 BLAKE2B 16f111b49a38063d7b7dac5559f8775d6871fac322017e6ad789e4cca737ffe1c75934cd44c44008f1ae55ab5a3d2f85924086227d18035a00bedfdbfe0e73fd SHA512 223a71474001d9e57888fee41c5a61c86b79438a1502d40f3c5de5e0c8919bf78f2c5042dfb529893c4c3dea537942f9fab8458ad87418e2f43cd613cd3dc815
 DIST nvidia-settings-565.77.tar.bz2 1119070 BLAKE2B 74f3a0a68a9bf10d7a8cd96a5db9b6e11d70073de2f1e8494f5d40ed79fb88895f158797b3b70bc0656c9d65d9920f033ed5aa1f3c95f71cbfcf04a118478d9c SHA512 100560edbf1575a365e09394409333bbfc28bdd03761b13b89b6d052e195f65f94c9e47c9f0588f40a0f6d375a8e16b543ca84f82cc1a5a76ec37ea1941fae1f
 DIST nvidia-xconfig-390.157.tar.bz2 107399 BLAKE2B 0cbb3b1ba508ddc3ba4a161c290b31bf7a67f67880bdbd01171a962c5fa97ca945b1ef17932403f8589309380743f1da632c728d8accb6d4e56dbd895e7486bb SHA512 50b390811c9bf091b14add41f886925b17496b41006b7d3981d2398caa65cf5db8a579c8cebed78278384bf3acc629befb07b54339c61abcc75852c0dcb8b8ca
 DIST nvidia-xconfig-470.256.02.tar.bz2 108698 BLAKE2B e468574e4bc57e7279d4120e2b08a201671b50d408be0c530eabe5da7d45daaf21cbf5c7fa31410d0d732fe8ea1551cbfb21d1ae193c1b3f5b5c50c764c9e236 SHA512 9dcec1e0c2b56b4d38a5f2c76086302f8bc0860cc15012cce29c3a5062f801a48b6a2bb78344361b07a2717b58502783441a2daf402d9973a17526175b1f15ca
 DIST nvidia-xconfig-535.216.01.tar.bz2 111063 BLAKE2B 4b7826a78ca917884399b14bd74b12d6b9f1dd8b37654a86f63c04f19dafe3048f29dbbde503dec3945484a009973575a1e969df7eb231a3723ff964af0c81aa SHA512 39ae9e355efbe48d7952ae6cfce3b92a8de116516a8084d8aaede97f133b9a92555d50e0ac98db98cce6d1e29304d9ca352f9cfe999089b95e5d716560886f85
+DIST nvidia-xconfig-535.230.02.tar.bz2 111060 BLAKE2B a29389a0d73f66b47131ce420a8b0c06134737dc01c9175b146305fa1e534d4c8e722a3af73ec9e745de6e027810836e7a77a0c05e771b46932cf47ce03de198 SHA512 4d0f5e239b47dcccf9abb1208c74d2baff87d93ad8d691772353bc84a340ec1b097e4cc436109ebe063b8180baab39a8c713992eb48c9f76206d54b890a5381c
 DIST nvidia-xconfig-550.135.tar.bz2 111674 BLAKE2B 0913687b89856f1371ec50caadcacb51ed61e6533e16de427d26297cf11429820581bca40d4e7ff5977889a1eb176436293e2bec48c318a14ebae167fdb771cd SHA512 aa15efd3fc39359848f09789bab158f31c66dcf816e6a81001cbbc72fa3a94caf5a5e5f28ff7ae3961d16a872e665dd422e8ced669eb3d1dc7d6da38159e465c
 DIST nvidia-xconfig-550.142.tar.bz2 111198 BLAKE2B ca7e9a465ca5a12c2bce6cd83634e505d02a2e7212a7d77ef33b368c196d78fb735cc5a422ef8417f1d2f4e805f95fcc48365a8ad43a028d36e526c3a9b6c784 SHA512 6d367130f83a6dca37bf6ebaf6d1e18c3a7d69f51446e85a2111a89b26f9cb64a47d36c30a059287fec790ecdbd8e43ba6f2a2a371ff02c5629744b92be785a5
+DIST nvidia-xconfig-550.144.03.tar.bz2 111209 BLAKE2B 733058b0960b04212ad058616a93e79fbc1d18b51d7bf8b2cf9a5227fe1f5fbc2af1accd4043b71137a9c12ef534c454db9a8b46c1c707bc22fbf618d76c0dd2 SHA512 98c637a243bfd0a7f3154994b05400701d3b1ddfe8a38cf7782c237baa33f11cbc5be305b9bce8ac98813af1d37143cf96c13b3e6d3357c30d3f89a9be8bee0d
 DIST nvidia-xconfig-565.77.tar.bz2 111235 BLAKE2B 75cc8a5ed9248f044159482940e6d4eead7b4cb8321b15883ce0c97230c85b260cacdd74cdad45ee8a8248271e081ae94623d195151840b07c8f747eea33a0e1 SHA512 641ca934b79d2a597be56309dfab968ab1b908bfc346c33fe69d9c13c56636e643388b6c1d83918bcc3fda70ecc2a34d6a305422539130424eafd973fc94c41e
 DIST open-gpu-kernel-modules-550.40.82.tar.gz 13813356 BLAKE2B 6c972499ce44f5168faf8a051e232c4f29992965ae59a9927f805a6de770e471c036d009318c58879bf02d51a7e58c1875fd0b1c1c17d7cdafd7de75ce5a6945 SHA512 37f6aea501a59cc1c880fa775d97d7426a21f8f304c1020793fe510dbd42693905b96fb7b4bc274ebe6980d2dbda2defd07e4cdc993fce4fb1a5a4384eb59833
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild
new file mode 100644
index 000000000000..453710b8362a
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild
@@ -0,0 +1,616 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_IUSE=+modules
+inherit desktop eapi9-pipestatus flag-o-matic linux-mod-r1 multilib
+inherit readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
+
+MODULES_KERNEL_MAX=6.13
+NV_URI="https://download.nvidia.com/XFree86/"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="https://www.nvidia.com/"
+SRC_URI="
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
+	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
+	$(printf "${NV_URI}%s/%s-${PV}.tar.bz2 " \
+		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
+	${NV_URI}NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-${PV}.tar.xz
+"
+# nvidia-installer is unused but here for GPL-2's "distribute sources"
+S=${WORKDIR}
+
+LICENSE="NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
+SLOT="0/${PV%%.*}"
+KEYWORDS="-* ~amd64 ~arm64"
+IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland"
+REQUIRED_USE="kernel-open? ( modules )"
+
+COMMON_DEPEND="
+	acct-group/video
+	X? ( x11-libs/libpciaccess )
+	persistenced? (
+		acct-user/nvpd
+		net-libs/libtirpc:=
+	)
+	tools? (
+		>=app-accessibility/at-spi2-core-2.46:2
+		dev-libs/glib:2
+		dev-libs/jansson:=
+		media-libs/harfbuzz:=
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		x11-libs/pango
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-libs/openssl:0/3
+	sys-libs/glibc
+	X? (
+		media-libs/libglvnd[X,abi_x86_32(-)?]
+		x11-libs/libX11[abi_x86_32(-)?]
+		x11-libs/libXext[abi_x86_32(-)?]
+	)
+	powerd? ( sys-apps/dbus[abi_x86_32(-)?] )
+	wayland? (
+		gui-libs/egl-gbm
+		>=gui-libs/egl-wayland-1.1.10
+		media-libs/libglvnd
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	static-libs? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	tools? (
+		media-libs/libglvnd
+		sys-apps/dbus
+		x11-base/xorg-proto
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libvdpau
+	)
+"
+BDEPEND="
+	sys-devel/m4
+	virtual/pkgconfig
+"
+
+QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
+
+PATCHES=(
+	"${FILESDIR}"/nvidia-kernel-module-source-515.86.01-raw-ldflags.patch
+	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
+	"${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
+	"${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch
+)
+
+pkg_setup() {
+	use modules && [[ ${MERGE_TYPE} != binary ]] || return
+
+	local CONFIG_CHECK="
+		PROC_FS
+		~DRM_KMS_HELPER
+		~SYSVIPC
+		~!LOCKDEP
+		~!PREEMPT_RT
+		~!SLUB_DEBUG_ON
+		!DEBUG_MUTEXES
+		$(usev powerd '~CPU_FREQ')
+	"
+
+	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
+	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
+	Cannot be directly selected in the kernel's menuconfig, and may need
+	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
+	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
+
+	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set and, if the CPU supports the feature,
+	this *could* lead to modules load failure with ENDBR errors, or to
+	broken CUDA/NVENC. Please ignore if not having issues, but otherwise
+	try to unset or pass ibt=off to the kernel's command line." #911142
+	use kernel-open || CONFIG_CHECK+=" ~!X86_KERNEL_IBT"
+
+	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+
+	use kernel-open && CONFIG_CHECK+=" MMU_NOTIFIER" #843827
+	local ERROR_MMU_NOTIFIER="CONFIG_MMU_NOTIFIER: is not set but needed to build with USE=kernel-open.
+	Cannot be directly selected in the kernel's menuconfig, and may need
+	selection of another option that requires it such as CONFIG_KVM."
+
+	local ERROR_PREEMPT_RT="CONFIG_PREEMPT_RT: is set but is unsupported by NVIDIA upstream and
+	will fail to build unless the env var IGNORE_PREEMPT_RT_PRESENCE=1 is
+	set. Please do not report issues if run into e.g. kernel panics while
+	ignoring this."
+
+	linux-mod-r1_pkg_setup
+}
+
+src_prepare() {
+	# make patches usable across versions
+	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
+	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
+	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
+	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
+	mv NVIDIA-kernel-module-source-${PV} kernel-module-source || die
+
+	default
+
+	# prevent detection of incomplete kernel DRM support (bug #603818)
+	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
+		-i kernel{,-module-source/kernel-open}/conftest.sh || die
+
+	# adjust service files
+	sed 's/__USER__/nvpd/' \
+		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
+		> "${T}"/nvidia-persistenced.service || die
+	use !powerd || # file is missing on arm64 (masked)
+		sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
+
+	# use alternative vulkan icd option if USE=-X (bug #909181)
+	use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die
+
+	# enable nvidia-drm.modeset=1 by default with USE=wayland
+	cp "${FILESDIR}"/nvidia-470.conf "${T}"/nvidia.conf || die
+	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
+
+	# makefile attempts to install wayland library even if not built
+	use wayland || sed -i 's/ WAYLAND_LIB_install$//' \
+		nvidia-settings/src/Makefile || die
+
+	# temporary option, nvidia will remove in the future
+	use !kernel-open ||
+		sed -i '/blacklist/a\
+\
+# Enable using kernel-open with workstation GPUs (experimental)\
+options nvidia NVreg_OpenRmEnableUnsupportedGpus=1' "${T}"/nvidia.conf || die
+}
+
+src_compile() {
+	tc-export AR CC CXX LD OBJCOPY OBJDUMP PKG_CONFIG
+	local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch
+
+	local xnvflags=-fPIC #840389
+	# lto static libraries tend to cause problems without fat objects
+	tc-is-lto && xnvflags+=" $(test-flags-CC -ffat-lto-objects)"
+
+	NV_ARGS=(
+		PREFIX="${EPREFIX}"/usr
+		HOST_CC="$(tc-getBUILD_CC)"
+		HOST_LD="$(tc-getBUILD_LD)"
+		BUILD_GTK2LIB=
+		NV_USE_BUNDLED_LIBJANSSON=0
+		NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
+		WAYLAND_AVAILABLE=$(usex wayland 1 0)
+		XNVCTRL_CFLAGS="${xnvflags}"
+	)
+
+	if use modules; then
+		local o_cflags=${CFLAGS} o_cxxflags=${CXXFLAGS} o_ldflags=${LDFLAGS}
+
+		# conftest.sh is broken with c23 due to func() changing meaning,
+		# and then fails later due to ealier misdetections
+		# TODO: try without now and then + drop modargs' CC= (bug #944092)
+		KERNEL_CC+=" -std=gnu17"
+
+		local modlistargs=video:kernel
+		if use kernel-open; then
+			modlistargs+=-module-source:kernel-module-source/kernel-open
+
+			# environment flags are normally unused for modules, but nvidia
+			# uses it for building the "blob" and it is a bit fragile
+			filter-flags -fno-plt #912949
+			filter-lto
+			CC=${KERNEL_CC} CXX=${KERNEL_CXX} strip-unsupported-flags
+		fi
+
+		local modlist=( nvidia{,-drm,-modeset,-peermem,-uvm}=${modlistargs} )
+		local modargs=(
+			CC="${KERNEL_CC}" # needed for above gnu17 workaround
+			IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
+			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
+
+			# kernel takes "x86" and "x86_64" as meaning the same, but nvidia
+			# makes the distinction (since 550.135) and is not happy with "x86"
+			# TODO?: it should be ok/better for tc-arch-kernel to do x86_64
+			$(usev amd64 ARCH=x86_64)
+		)
+
+		# temporary workaround for bug #914468
+		CPP="${KERNEL_CC} -E" tc-is-clang && addpredict "${KV_OUT_DIR}"
+
+		linux-mod-r1_src_compile
+		CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags}
+	fi
+
+	emake "${NV_ARGS[@]}" -C nvidia-modprobe
+	use persistenced && emake "${NV_ARGS[@]}" -C nvidia-persistenced
+	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
+
+	if use tools; then
+		# avoid noisy *very* noisy logs with deprecation warnings
+		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
+			emake "${NV_ARGS[@]}" -C nvidia-settings
+	elif use static-libs; then
+		# pretend GTK+3 is available, not actually used (bug #880879)
+		emake "${NV_ARGS[@]}" BUILD_GTK3LIB=1 \
+			-C nvidia-settings/src out/libXNVCtrl.a
+	fi
+}
+
+src_install() {
+	local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
+
+	NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
+
+	local -A paths=(
+		[APPLICATION_PROFILE]=/usr/share/nvidia
+		[CUDA_ICD]=/etc/OpenCL/vendors
+		[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
+		[FIRMWARE]=/lib/firmware/nvidia/${PV}
+		[GBM_BACKEND_LIB_SYMLINK]=/usr/${libdir}/gbm
+		[GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
+		[OPENGL_DATA]=/usr/share/nvidia
+		[VULKAN_ICD_JSON]=/usr/share/vulkan
+		[WINE_LIB]=/usr/${libdir}/nvidia/wine
+		[XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
+
+		[GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
+		[GLX_MODULE_SYMLINK]=/usr/${libdir}/xorg/modules
+		[XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
+	)
+
+	local skip_files=(
+		$(usev !X "libGLX_nvidia libglxserver_nvidia")
+		$(usev !wayland libnvidia-vulkan-producer)
+		libGLX_indirect # non-glvnd unused fallback
+		libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source
+		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
+		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
+		libnvidia-pkcs11.so # using the openssl3 version instead
+	)
+	local skip_modules=(
+		$(usev !X "nvfbc vdpau xdriver")
+		$(usev !modules gsp)
+		$(usev !powerd powerd)
+		installer nvpd # handled separately / built from source
+	)
+	local skip_types=(
+		GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # media-libs/libglvnd
+		OPENCL_WRAPPER.\* # virtual/opencl
+		DOCUMENTATION DOT_DESKTOP .\*_SRC DKMS_CONF SYSTEMD_UNIT # handled separately / unused
+	)
+
+	local DOCS=(
+		README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
+		nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
+	)
+	local HTML_DOCS=( html/. )
+	einstalldocs
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Trusted users should be in the 'video' group to use NVIDIA devices.
+You can add yourself by using: gpasswd -a my-user video\
+$(usev modules "
+
+Like all out-of-tree kernel modules, it is necessary to rebuild
+${PN} after upgrading or rebuilding the Linux kernel
+by for example running \`emerge @module-rebuild\`. Alternatively,
+if using a distribution kernel (sys-kernel/gentoo-kernel{,-bin}),
+this can be automated by setting USE=dist-kernel globally.
+
+Loaded kernel modules also must not mismatch with the installed
+${PN} version (excluding -r revision), meaning should
+ensure \`eselect kernel list\` points to the kernel that will be
+booted before building and preferably reboot after upgrading
+${PN} (the ebuild will emit a warning if mismatching).
+
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.")\
+$(use amd64 && usev !abi_x86_32 "
+
+Note that without USE=abi_x86_32 on ${PN}, 32bit applications
+(typically using wine / steam) will not be able to use GPU acceleration.")
+
+For additional information or for troubleshooting issues, please see
+https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers and NVIDIA's own
+documentation that is installed alongside this README."
+	readme.gentoo_create_doc
+
+	if use modules; then
+		linux-mod-r1_src_install
+
+		insinto /etc/modprobe.d
+		doins "${T}"/nvidia.conf
+
+		# used for gpu verification with binpkgs (not kept, see pkg_preinst)
+		insinto /usr/share/nvidia
+		doins supported-gpus/supported-gpus.json
+	fi
+
+	emake "${NV_ARGS[@]}" -C nvidia-modprobe install
+	fowners :video /usr/bin/nvidia-modprobe #505092
+	fperms 4710 /usr/bin/nvidia-modprobe
+
+	if use persistenced; then
+		emake "${NV_ARGS[@]}" -C nvidia-persistenced install
+		newconfd "${FILESDIR}"/nvidia-persistenced.confd nvidia-persistenced
+		newinitd "${FILESDIR}"/nvidia-persistenced.initd nvidia-persistenced
+		systemd_dounit "${T}"/nvidia-persistenced.service
+	fi
+
+	if use tools; then
+		emake "${NV_ARGS[@]}" -C nvidia-settings install
+
+		doicon nvidia-settings/doc/nvidia-settings.png
+		domenu nvidia-settings/doc/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	if use static-libs; then
+		dolib.a nvidia-settings/src/out/libXNVCtrl.a
+
+		insinto /usr/include/NVCtrl
+		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
+	fi
+
+	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
+
+	# mimic nvidia-installer by reading .manifest to install files
+	# 0:file 1:perms 2:type 3+:subtype/arguments -:module
+	local m into
+	while IFS=' ' read -ra m; do
+		! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
+			[[ " ${m[0]##*/}" =~ ^(\ ${skip_files[*]/%/.*|\\} )$ ]] ||
+			[[ " ${m[2]}" =~ ^(\ ${skip_types[*]/%/|\\} )$ ]] ||
+			has ${m[-1]#MODULE:} "${skip_modules[@]}" && continue
+
+		case ${m[2]} in
+			MANPAGE)
+				gzip -dc ${m[0]} | newman - ${m[0]%.gz}
+				pipestatus || die
+				continue
+			;;
+			GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../
+			VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/
+		esac
+
+		if [[ -v 'paths[${m[2]}]' ]]; then
+			into=${paths[${m[2]}]}
+		elif [[ ${m[2]} == EXPLICIT_PATH ]]; then
+			into=${m[3]}
+		elif [[ ${m[2]} == *_BINARY ]]; then
+			into=/opt/bin
+		elif [[ ${m[3]} == COMPAT32 ]]; then
+			use abi_x86_32 || continue
+			into=/usr/${libdir32}
+		elif [[ ${m[2]} == *_@(LIB|SYMLINK) ]]; then
+			into=/usr/${libdir}
+		else
+			die "No known installation path for ${m[0]}"
+		fi
+		[[ ${m[3]: -2} == ?/ ]] && into+=/${m[3]%/}
+		[[ ${m[4]: -2} == ?/ ]] && into+=/${m[4]%/}
+
+		if [[ ${m[2]} =~ _SYMLINK$ ]]; then
+			[[ ${m[4]: -1} == / ]] && m[4]=${m[5]}
+			dosym ${m[4]} ${into}/${m[0]}
+			continue
+		fi
+		[[ ${m[0]} =~ ^libnvidia-ngx.so|^libnvidia-egl-gbm.so ]] &&
+			dosym ${m[0]} ${into}/${m[0]%.so*}.so.1 # soname not in .manifest
+
+		printf -v m[1] %o $((m[1] | 0200)) # 444->644
+		insopts -m${m[1]}
+		insinto ${into}
+		doins ${m[0]}
+	done < .manifest || die
+	insopts -m0644 # reset
+
+	# MODULE:installer non-skipped extras
+	: "$(systemd_get_sleepdir)"
+	exeinto "${_#"${EPREFIX}"}"
+	doexe systemd/system-sleep/nvidia
+	dobin systemd/nvidia-sleep.sh
+	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
+
+	dobin nvidia-bug-report.sh
+
+	# MODULE:powerd extras
+	if use powerd; then
+		newinitd "${FILESDIR}"/nvidia-powerd.initd nvidia-powerd #923117
+		systemd_dounit systemd/system/nvidia-powerd.service
+
+		insinto /usr/share/dbus-1/system.d
+		doins nvidia-dbus.conf
+	fi
+
+	# enabling is needed for sleep to work properly and little reason not to do
+	# it unconditionally for a better user experience
+	: "$(systemd_get_systemunitdir)"
+	local unitdir=${_#"${EPREFIX}"}
+	# not using relative symlinks to match systemd's own links
+	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-hibernate.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-resume.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-suspend.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-resume.service
+	# also add a custom elogind hook to do the equivalent of the above
+	exeinto /usr/lib/elogind/system-sleep
+	newexe "${FILESDIR}"/system-sleep.elogind nvidia
+	# <elogind-255.5 used a different path (bug #939216), keep a compat symlink
+	# TODO: cleanup after 255.5 been stable for a few months
+	dosym {/usr/lib,/"${libdir}"}/elogind/system-sleep/nvidia
+
+	# needed with >=systemd-256 or may fail to resume with some setups
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1072722
+	insinto "${unitdir}"/systemd-homed.service.d
+	newins - 10-nvidia.conf <<-EOF
+		[Service]
+		Environment=SYSTEMD_HOME_LOCK_FREEZE_SESSION=false
+	EOF
+	insinto "${unitdir}"/systemd-suspend.service.d
+	newins - 10-nvidia.conf <<-EOF
+		[Service]
+		Environment=SYSTEMD_SLEEP_FREEZE_USER_SESSIONS=false
+	EOF
+	dosym -r "${unitdir}"/systemd-{suspend,hibernate}.service.d/10-nvidia.conf
+	dosym -r "${unitdir}"/systemd-{suspend,hybrid-sleep}.service.d/10-nvidia.conf
+	dosym -r "${unitdir}"/systemd-{suspend,suspend-then-hibernate}.service.d/10-nvidia.conf
+
+	# symlink non-versioned so nvidia-settings can use it even if misdetected
+	dosym nvidia-application-profiles-${PV}-key-documentation \
+		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
+
+	# don't attempt to strip firmware files (silences errors)
+	dostrip -x ${paths[FIRMWARE]}
+
+	# sandbox issues with /dev/nvidiactl (and /dev/char wrt bug #904292)
+	# are widespread and sometime affect revdeps of packages built with
+	# USE=opencl/cuda making it hard to manage in ebuilds (minimal set,
+	# ebuilds should handle manually if need others or addwrite)
+	insinto /etc/sandbox.d
+	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/char"'
+
+	# dracut does not use /etc/modprobe.d if hostonly=no, but want to make sure
+	# our settings are used for bug 932781#c8 and nouveau blacklist if either
+	# modules are included (however, just best-effort without initramfs regen)
+	if use modules; then
+		echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
+			"${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die
+	fi
+}
+
+pkg_preinst() {
+	has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=
+
+	use modules || return
+
+	# set video group id based on live system (bug #491414)
+	local g=$(egetent group video | cut -d: -f3)
+	[[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')"
+	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
+
+	# try to find driver mismatches using temporary supported-gpus.json
+	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
+		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
+			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
+		if [[ ${g} ]]; then
+			g=$((${g##*\"}+1))
+			if ver_test -ge ${g}; then
+				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
+				break
+			fi
+		fi
+	done
+	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
+}
+
+pkg_postinst() {
+	linux-mod-r1_pkg_postinst
+
+	readme.gentoo_print_elog
+
+	if [[ -r /proc/driver/nvidia/version &&
+		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
+		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
+		ewarn "libraries and may prevent launching GPU-accelerated applications."
+		if use modules; then
+			ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
+			ewarn "(e.g. API mismatch messages in the \`dmesg\` output), please verify"
+			ewarn "that the running kernel is ${KV_FULL} and that (if used) the"
+			ewarn "initramfs does not include NVIDIA modules (or at least, not old ones)."
+		fi
+	fi
+
+	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
+		ewarn "Detected that the current kernel command line is using 'slub_debug=',"
+		ewarn "this may lead to system instability/freezes with this version of"
+		ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
+	fi
+
+	if [[ -v NV_LEGACY_MASK ]]; then
+		ewarn
+		ewarn "***WARNING***"
+		ewarn
+		ewarn "You are installing a version of ${PN} known not to work"
+		ewarn "with a GPU of the current system. If unwanted, add the mask:"
+		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
+			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
+		else
+			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
+		fi
+		ewarn "...then downgrade to a legacy[1] branch if possible (not all old versions"
+		ewarn "are available or fully functional, may need to consider nouveau[2])."
+		ewarn "[1] https://www.nvidia.com/object/IO_32667.html"
+		ewarn "[2] https://wiki.gentoo.org/wiki/Nouveau"
+	fi
+
+	if use kernel-open; then
+		ewarn
+		ewarn "Open source variant of ${PN} was selected, be warned it is experimental"
+		ewarn "and only for modern GPUs (e.g. GTX 1650+). Try to disable if run into issues."
+		ewarn "Please also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
+	fi
+
+	if use wayland && use modules && [[ ! -v NV_HAD_WAYLAND ]]; then
+		elog
+		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
+		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
+		elog "experimental but is required for wayland."
+		elog
+		elog "If you experience issues, either disable wayland or edit nvidia.conf."
+		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
+	fi
+
+	# these can be removed after some time, only to help the transition
+	# given users are unlikely to do further custom solutions if it works
+	# (see also https://github.com/elogind/elogind/issues/272)
+	if grep -riq "^[^#]*HandleNvidiaSleep=yes" "${EROOT}"/etc/elogind/sleep.conf.d/ 2>/dev/null
+	then
+		ewarn
+		ewarn "!!! WARNING !!!"
+		ewarn "Detected HandleNvidiaSleep=yes in ${EROOT}/etc/elogind/sleep.conf.d/."
+		ewarn "This 'could' cause issues if used in combination with the new hook"
+		ewarn "installed by the ebuild to handle sleep using the official upstream"
+		ewarn "script. It is recommended to disable the option."
+	fi
+	if [[ $(realpath "${EROOT}"{/etc,{/usr,}/lib*}/elogind/system-sleep 2>/dev/null | \
+		sort | uniq | xargs -d'\n' grep -Ril nvidia 2>/dev/null | wc -l) -gt 2 ]]
+	then
+		ewarn
+		ewarn "!!! WARNING !!!"
+		ewarn "Detected a custom script at ${EROOT}{/etc,{/usr,}/lib*}/elogind/system-sleep"
+		ewarn "referencing NVIDIA. This version of ${PN} has installed its own"
+		ewarn "hook at ${EROOT}/usr/lib/elogind/system-sleep/nvidia and it is recommended"
+		ewarn "to remove the custom one to avoid potential issues."
+		ewarn
+		ewarn "Feel free to ignore this warning if you know the other NVIDIA-related"
+		ewarn "scripts can be used together. The warning will be removed in the future."
+	fi
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 535.183.01-r1 # may get repeated
+	then
+		elog
+		elog "For suspend/sleep, 'NVreg_PreserveVideoMemoryAllocations=1' is now default"
+		elog "with this version of ${PN}. This is recommended (or required) by"
+		elog "major DEs especially with wayland but, *if* experience regressions with"
+		elog "suspend, try reverting to =0 in '${EROOT}/etc/modprobe.d/nvidia.conf'."
+		elog
+		elog "May notably be an issue when using neither systemd nor elogind to suspend."
+		elog
+		elog "Also, the systemd suspend/hibernate/resume services are now enabled by"
+		elog "default, and for openrc+elogind a similar hook has been installed."
+	fi
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.135.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.135.ebuild
deleted file mode 100644
index da413e81b3df..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.135.ebuild
+++ /dev/null
@@ -1,609 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MODULES_OPTIONAL_IUSE=+modules
-inherit desktop eapi9-pipestatus flag-o-matic linux-mod-r1 readme.gentoo-r1
-inherit systemd toolchain-funcs unpacker user-info
-
-MODULES_KERNEL_MAX=6.12
-NV_URI="https://download.nvidia.com/XFree86/"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/"
-SRC_URI="
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
-	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
-	$(printf "${NV_URI}%s/%s-${PV}.tar.bz2 " \
-		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
-	${NV_URI}NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-${PV}.tar.xz
-"
-# nvidia-installer is unused but here for GPL-2's "distribute sources"
-S=${WORKDIR}
-
-LICENSE="NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
-SLOT="0/${PV%%.*}"
-KEYWORDS="-* amd64 ~arm64"
-IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland"
-REQUIRED_USE="kernel-open? ( modules )"
-
-COMMON_DEPEND="
-	acct-group/video
-	X? ( x11-libs/libpciaccess )
-	persistenced? (
-		acct-user/nvpd
-		net-libs/libtirpc:=
-	)
-	tools? (
-		>=app-accessibility/at-spi2-core-2.46:2
-		dev-libs/glib:2
-		dev-libs/jansson:=
-		media-libs/harfbuzz:=
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3[X]
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		x11-libs/pango
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-libs/openssl:0/3
-	sys-libs/glibc
-	X? (
-		media-libs/libglvnd[X,abi_x86_32(-)?]
-		x11-libs/libX11[abi_x86_32(-)?]
-		x11-libs/libXext[abi_x86_32(-)?]
-	)
-	powerd? ( sys-apps/dbus[abi_x86_32(-)?] )
-	wayland? (
-		gui-libs/egl-gbm
-		>=gui-libs/egl-wayland-1.1.10
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	static-libs? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	tools? (
-		media-libs/libglvnd
-		sys-apps/dbus
-		x11-base/xorg-proto
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libvdpau
-	)
-"
-BDEPEND="
-	sys-devel/m4
-	virtual/pkgconfig
-"
-
-QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
-
-PATCHES=(
-	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-	"${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch
-)
-
-pkg_setup() {
-	use modules && [[ ${MERGE_TYPE} != binary ]] || return
-
-	# do early before linux-mod-r1 so can use chkconfig to setup CONFIG_CHECK
-	get_version
-	require_configured_kernel
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!LOCKDEP
-		~!PREEMPT_RT
-		~!SLUB_DEBUG_ON
-		!DEBUG_MUTEXES
-		$(usev powerd '~CPU_FREQ')
-	"
-
-	kernel_is -ge 6 11 && linux_chkconfig_present DRM_FBDEV_EMULATION &&
-		CONFIG_CHECK+=" DRM_TTM_HELPER"
-
-	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
-
-	use kernel-open && CONFIG_CHECK+=" MMU_NOTIFIER" #843827
-
-	local drm_helper_msg="Cannot be directly selected in the kernel's config menus, and may need
-	selection of a DRM device even if unused, e.g. CONFIG_DRM_QXL=m or
-	DRM_AMDGPU=m (among others, consult the kernel config's help), can
-	also use DRM_NOUVEAU=m as long as built as module *not* built-in."
-	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
-	${drm_helper_msg}"
-	local ERROR_DRM_TTM_HELPER="CONFIG_DRM_TTM_HELPER: is not set but is needed to compile when using
-	kernel version 6.11.x or newer while DRM_FBDEV_EMULATION is set.
-	${drm_helper_msg}"
-	local ERROR_MMU_NOTIFIER="CONFIG_MMU_NOTIFIER: is not set but needed to build with USE=kernel-open.
-	Cannot be directly selected in the kernel's menuconfig, and may need
-	selection of another option that requires it such as CONFIG_KVM."
-	local ERROR_PREEMPT_RT="CONFIG_PREEMPT_RT: is set but is unsupported by NVIDIA upstream and
-	will fail to build unless the env var IGNORE_PREEMPT_RT_PRESENCE=1 is
-	set. Please do not report issues if run into e.g. kernel panics while
-	ignoring this."
-
-	linux-mod-r1_pkg_setup
-}
-
-src_prepare() {
-	# make patches usable across versions
-	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
-	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
-	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
-	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
-	mv NVIDIA-kernel-module-source-${PV} kernel-module-source || die
-
-	default
-
-	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
-		-i kernel{,-module-source/kernel-open}/conftest.sh || die
-
-	# adjust service files
-	sed 's/__USER__/nvpd/' \
-		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-		> "${T}"/nvidia-persistenced.service || die
-	sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
-
-	# use alternative vulkan icd option if USE=-X (bug #909181)
-	use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die
-
-	# enable nvidia-drm.modeset=1 by default with USE=wayland
-	cp "${FILESDIR}"/nvidia-545.conf "${T}"/nvidia.conf || die
-	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
-
-	# makefile attempts to install wayland library even if not built
-	use wayland || sed -i 's/ WAYLAND_LIB_install$//' \
-		nvidia-settings/src/Makefile || die
-}
-
-src_compile() {
-	tc-export AR CC CXX LD OBJCOPY OBJDUMP PKG_CONFIG
-
-	local xnvflags=-fPIC #840389
-	# lto static libraries tend to cause problems without fat objects
-	tc-is-lto && xnvflags+=" $(test-flags-CC -ffat-lto-objects)"
-
-	NV_ARGS=(
-		PREFIX="${EPREFIX}"/usr
-		HOST_CC="$(tc-getBUILD_CC)"
-		HOST_LD="$(tc-getBUILD_LD)"
-		BUILD_GTK2LIB=
-		NV_USE_BUNDLED_LIBJANSSON=0
-		NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-		WAYLAND_AVAILABLE=$(usex wayland 1 0)
-		XNVCTRL_CFLAGS="${xnvflags}"
-	)
-
-	if use modules; then
-		local o_cflags=${CFLAGS} o_cxxflags=${CXXFLAGS} o_ldflags=${LDFLAGS}
-
-		# conftest.sh is broken with c23 due to func() changing meaning,
-		# and then fails later due to ealier misdetections
-		# TODO: try without now and then + drop modargs' CC= (bug #944092)
-		KERNEL_CC+=" -std=gnu17"
-
-		local modlistargs=video:kernel
-		if use kernel-open; then
-			modlistargs+=-module-source:kernel-module-source/kernel-open
-
-			# environment flags are normally unused for modules, but nvidia
-			# uses it for building the "blob" and it is a bit fragile
-			filter-flags -fno-plt #912949
-			filter-lto
-			CC=${KERNEL_CC} CXX=${KERNEL_CXX} strip-unsupported-flags
-		fi
-
-		local modlist=( nvidia{,-drm,-modeset,-peermem,-uvm}=${modlistargs} )
-		local modargs=(
-			CC="${KERNEL_CC}" # needed for above gnu17 workaround
-			IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
-			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
-
-			# kernel takes "x86" and "x86_64" as meaning the same, but nvidia
-			# makes the distinction (since 550.135) and is not happy with "x86"
-			# TODO?: it should be ok/better for tc-arch-kernel to do x86_64
-			$(usev amd64 ARCH=x86_64)
-		)
-
-		# temporary workaround for bug #914468
-		CPP="${KERNEL_CC} -E" tc-is-clang && addpredict "${KV_OUT_DIR}"
-
-		linux-mod-r1_src_compile
-		CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags}
-	fi
-
-	emake "${NV_ARGS[@]}" -C nvidia-modprobe
-	use persistenced && emake "${NV_ARGS[@]}" -C nvidia-persistenced
-	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
-
-	if use tools; then
-		# avoid noisy *very* noisy logs with deprecation warnings
-		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
-			emake "${NV_ARGS[@]}" -C nvidia-settings
-	elif use static-libs; then
-		# pretend GTK+3 is available, not actually used (bug #880879)
-		emake "${NV_ARGS[@]}" BUILD_GTK3LIB=1 \
-			-C nvidia-settings/src out/libXNVCtrl.a
-	fi
-}
-
-src_install() {
-	local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
-
-	NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
-
-	local -A paths=(
-		[APPLICATION_PROFILE]=/usr/share/nvidia
-		[CUDA_ICD]=/etc/OpenCL/vendors
-		[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
-		[FIRMWARE]=/lib/firmware/nvidia/${PV}
-		[GBM_BACKEND_LIB_SYMLINK]=/usr/${libdir}/gbm
-		[GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
-		[OPENGL_DATA]=/usr/share/nvidia
-		[VULKAN_ICD_JSON]=/usr/share/vulkan
-		[WINE_LIB]=/usr/${libdir}/nvidia/wine
-		[XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
-
-		[GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
-		[GLX_MODULE_SYMLINK]=/usr/${libdir}/xorg/modules
-		[XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
-	)
-
-	local skip_files=(
-		$(usev !X "libGLX_nvidia libglxserver_nvidia")
-		libGLX_indirect # non-glvnd unused fallback
-		libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source
-		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
-		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
-		libnvidia-pkcs11.so # using the openssl3 version instead
-	)
-	local skip_modules=(
-		$(usev !X "nvfbc vdpau xdriver")
-		$(usev !modules gsp)
-		$(usev !powerd powerd)
-		installer nvpd # handled separately / built from source
-	)
-	local skip_types=(
-		GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # media-libs/libglvnd
-		OPENCL_WRAPPER.\* # virtual/opencl
-		DOCUMENTATION DOT_DESKTOP .\*_SRC DKMS_CONF SYSTEMD_UNIT # handled separately / unused
-	)
-
-	local DOCS=(
-		README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
-		nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-	)
-	local HTML_DOCS=( html/. )
-	einstalldocs
-
-	local DISABLE_AUTOFORMATTING=yes
-	local DOC_CONTENTS="\
-Trusted users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video\
-$(usev modules "
-
-Like all out-of-tree kernel modules, it is necessary to rebuild
-${PN} after upgrading or rebuilding the Linux kernel
-by for example running \`emerge @module-rebuild\`. Alternatively,
-if using a distribution kernel (sys-kernel/gentoo-kernel{,-bin}),
-this can be automated by setting USE=dist-kernel globally.
-
-Loaded kernel modules also must not mismatch with the installed
-${PN} version (excluding -r revision), meaning should
-ensure \`eselect kernel list\` points to the kernel that will be
-booted before building and preferably reboot after upgrading
-${PN} (the ebuild will emit a warning if mismatching).
-
-See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.")\
-$(use amd64 && usev !abi_x86_32 "
-
-Note that without USE=abi_x86_32 on ${PN}, 32bit applications
-(typically using wine / steam) will not be able to use GPU acceleration.")
-
-For additional information or for troubleshooting issues, please see
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers and NVIDIA's own
-documentation that is installed alongside this README."
-	readme.gentoo_create_doc
-
-	if use modules; then
-		linux-mod-r1_src_install
-
-		insinto /etc/modprobe.d
-		doins "${T}"/nvidia.conf
-
-		# used for gpu verification with binpkgs (not kept, see pkg_preinst)
-		insinto /usr/share/nvidia
-		doins supported-gpus/supported-gpus.json
-	fi
-
-	emake "${NV_ARGS[@]}" -C nvidia-modprobe install
-	fowners :video /usr/bin/nvidia-modprobe #505092
-	fperms 4710 /usr/bin/nvidia-modprobe
-
-	if use persistenced; then
-		emake "${NV_ARGS[@]}" -C nvidia-persistenced install
-		newconfd "${FILESDIR}"/nvidia-persistenced.confd nvidia-persistenced
-		newinitd "${FILESDIR}"/nvidia-persistenced.initd nvidia-persistenced
-		systemd_dounit "${T}"/nvidia-persistenced.service
-	fi
-
-	if use tools; then
-		emake "${NV_ARGS[@]}" -C nvidia-settings install
-
-		doicon nvidia-settings/doc/nvidia-settings.png
-		domenu nvidia-settings/doc/nvidia-settings.desktop
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	if use static-libs; then
-		dolib.a nvidia-settings/src/out/libXNVCtrl.a
-
-		insinto /usr/include/NVCtrl
-		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
-	fi
-
-	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
-
-	# mimic nvidia-installer by reading .manifest to install files
-	# 0:file 1:perms 2:type 3+:subtype/arguments -:module
-	local m into
-	while IFS=' ' read -ra m; do
-		! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
-			[[ " ${m[0]##*/}" =~ ^(\ ${skip_files[*]/%/.*|\\} )$ ]] ||
-			[[ " ${m[2]}" =~ ^(\ ${skip_types[*]/%/|\\} )$ ]] ||
-			has ${m[-1]#MODULE:} "${skip_modules[@]}" && continue
-
-		case ${m[2]} in
-			MANPAGE)
-				gzip -dc ${m[0]} | newman - ${m[0]%.gz}
-				pipestatus || die
-				continue
-			;;
-			GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../
-			VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/
-		esac
-
-		if [[ -v 'paths[${m[2]}]' ]]; then
-			into=${paths[${m[2]}]}
-		elif [[ ${m[2]} == EXPLICIT_PATH ]]; then
-			into=${m[3]}
-		elif [[ ${m[2]} == *_BINARY ]]; then
-			into=/opt/bin
-		elif [[ ${m[3]} == COMPAT32 ]]; then
-			use abi_x86_32 || continue
-			into=/usr/${libdir32}
-		elif [[ ${m[2]} == *_@(LIB|SYMLINK) ]]; then
-			into=/usr/${libdir}
-		else
-			die "No known installation path for ${m[0]}"
-		fi
-		[[ ${m[3]: -2} == ?/ ]] && into+=/${m[3]%/}
-		[[ ${m[4]: -2} == ?/ ]] && into+=/${m[4]%/}
-
-		if [[ ${m[2]} =~ _SYMLINK$ ]]; then
-			[[ ${m[4]: -1} == / ]] && m[4]=${m[5]}
-			dosym ${m[4]} ${into}/${m[0]}
-			continue
-		fi
-		[[ ${m[0]} =~ ^libnvidia-ngx.so|^libnvidia-egl-gbm.so ]] &&
-			dosym ${m[0]} ${into}/${m[0]%.so*}.so.1 # soname not in .manifest
-
-		printf -v m[1] %o $((m[1] | 0200)) # 444->644
-		insopts -m${m[1]}
-		insinto ${into}
-		doins ${m[0]}
-	done < .manifest || die
-	insopts -m0644 # reset
-
-	# MODULE:installer non-skipped extras
-	: "$(systemd_get_sleepdir)"
-	exeinto "${_#"${EPREFIX}"}"
-	doexe systemd/system-sleep/nvidia
-	dobin systemd/nvidia-sleep.sh
-	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
-
-	dobin nvidia-bug-report.sh
-
-	# MODULE:powerd extras
-	if use powerd; then
-		newinitd "${FILESDIR}"/nvidia-powerd.initd nvidia-powerd #923117
-		systemd_dounit systemd/system/nvidia-powerd.service
-
-		insinto /usr/share/dbus-1/system.d
-		doins nvidia-dbus.conf
-	fi
-
-	# enabling is needed for sleep to work properly and little reason not to do
-	# it unconditionally for a better user experience
-	: "$(systemd_get_systemunitdir)"
-	local unitdir=${_#"${EPREFIX}"}
-	# not using relative symlinks to match systemd's own links
-	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-hibernate.service
-	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-resume.service
-	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-suspend.service
-	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-resume.service
-	# also add a custom elogind hook to do the equivalent of the above
-	exeinto /usr/lib/elogind/system-sleep
-	newexe "${FILESDIR}"/system-sleep.elogind nvidia
-	# <elogind-255.5 used a different path (bug #939216), keep a compat symlink
-	# TODO: cleanup after 255.5 been stable for a few months
-	dosym {/usr/lib,/"${libdir}"}/elogind/system-sleep/nvidia
-
-	# needed with >=systemd-256 or may fail to resume with some setups
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1072722
-	insinto "${unitdir}"/systemd-homed.service.d
-	newins - 10-nvidia.conf <<-EOF
-		[Service]
-		Environment=SYSTEMD_HOME_LOCK_FREEZE_SESSION=false
-	EOF
-	insinto "${unitdir}"/systemd-suspend.service.d
-	newins - 10-nvidia.conf <<-EOF
-		[Service]
-		Environment=SYSTEMD_SLEEP_FREEZE_USER_SESSIONS=false
-	EOF
-	dosym -r "${unitdir}"/systemd-{suspend,hibernate}.service.d/10-nvidia.conf
-	dosym -r "${unitdir}"/systemd-{suspend,hybrid-sleep}.service.d/10-nvidia.conf
-	dosym -r "${unitdir}"/systemd-{suspend,suspend-then-hibernate}.service.d/10-nvidia.conf
-
-	# symlink non-versioned so nvidia-settings can use it even if misdetected
-	dosym nvidia-application-profiles-${PV}-key-documentation \
-		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
-
-	# don't attempt to strip firmware files (silences errors)
-	dostrip -x ${paths[FIRMWARE]}
-
-	# sandbox issues with /dev/nvidiactl and others (bug #904292,#921578)
-	# are widespread and sometime affect revdeps of packages built with
-	# USE=opencl/cuda making it hard to manage in ebuilds (minimal set,
-	# ebuilds should handle manually if need others or addwrite)
-	insinto /etc/sandbox.d
-	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-caps:/dev/char"'
-
-	# dracut does not use /etc/modprobe.d if hostonly=no, but want to make sure
-	# our settings are used for bug 932781#c8 and nouveau blacklist if either
-	# modules are included (however, just best-effort without initramfs regen)
-	if use modules; then
-		echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
-			"${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die
-	fi
-}
-
-pkg_preinst() {
-	has_version "${CATEGORY}/${PN}[kernel-open]" && NV_HAD_KERNEL_OPEN=
-	has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=
-
-	use modules || return
-
-	# set video group id based on live system (bug #491414)
-	local g=$(egetent group video | cut -d: -f3)
-	[[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')"
-	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
-
-	# try to find driver mismatches using temporary supported-gpus.json
-	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
-		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
-			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
-		if [[ ${g} ]]; then
-			g=$((${g##*\"}+1))
-			if ver_test -ge ${g}; then
-				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
-				break
-			fi
-		fi
-	done
-	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-}
-
-pkg_postinst() {
-	linux-mod-r1_pkg_postinst
-
-	readme.gentoo_print_elog
-
-	if [[ -r /proc/driver/nvidia/version &&
-		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
-		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
-		ewarn "libraries and may prevent launching GPU-accelerated applications."
-		if use modules; then
-			ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
-			ewarn "(e.g. API mismatch messages in the \`dmesg\` output), please verify"
-			ewarn "that the running kernel is ${KV_FULL} and that (if used) the"
-			ewarn "initramfs does not include NVIDIA modules (or at least, not old ones)."
-		fi
-	fi
-
-	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
-		ewarn "Detected that the current kernel command line is using 'slub_debug=',"
-		ewarn "this may lead to system instability/freezes with this version of"
-		ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
-	fi
-
-	if [[ -v NV_LEGACY_MASK ]]; then
-		ewarn
-		ewarn "***WARNING***"
-		ewarn
-		ewarn "You are installing a version of ${PN} known not to work"
-		ewarn "with a GPU of the current system. If unwanted, add the mask:"
-		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
-			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
-		else
-			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
-		fi
-		ewarn "...then downgrade to a legacy[1] branch if possible (not all old versions"
-		ewarn "are available or fully functional, may need to consider nouveau[2])."
-		ewarn "[1] https://www.nvidia.com/object/IO_32667.html"
-		ewarn "[2] https://wiki.gentoo.org/wiki/Nouveau"
-	fi
-
-	if use kernel-open && [[ ! -v NV_HAD_KERNEL_OPEN ]]; then
-		ewarn
-		ewarn "Open source variant of ${PN} was selected, be warned it is experimental"
-		ewarn "and only for modern GPUs (e.g. GTX 1650+). Try to disable if run into issues."
-		ewarn "Please also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
-	fi
-
-	if use wayland && use modules && [[ ! -v NV_HAD_WAYLAND ]]; then
-		elog
-		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
-		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
-		elog "experimental but is required for wayland."
-		elog
-		elog "If you experience issues, either disable wayland or edit nvidia.conf."
-		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
-	fi
-
-	# these can be removed after some time, only to help the transition
-	# given users are unlikely to do further custom solutions if it works
-	# (see also https://github.com/elogind/elogind/issues/272)
-	if grep -riq "^[^#]*HandleNvidiaSleep=yes" "${EROOT}"/etc/elogind/sleep.conf.d/ 2>/dev/null
-	then
-		ewarn
-		ewarn "!!! WARNING !!!"
-		ewarn "Detected HandleNvidiaSleep=yes in ${EROOT}/etc/elogind/sleep.conf.d/."
-		ewarn "This 'could' cause issues if used in combination with the new hook"
-		ewarn "installed by the ebuild to handle sleep using the official upstream"
-		ewarn "script. It is recommended to disable the option."
-	fi
-	if [[ $(realpath "${EROOT}"{/etc,{/usr,}/lib*}/elogind/system-sleep 2>/dev/null | \
-		sort | uniq | xargs -d'\n' grep -Ril nvidia 2>/dev/null | wc -l) -gt 2 ]]
-	then
-		ewarn
-		ewarn "!!! WARNING !!!"
-		ewarn "Detected a custom script at ${EROOT}{/etc,{/usr,}/lib*}/elogind/system-sleep"
-		ewarn "referencing NVIDIA. This version of ${PN} has installed its own"
-		ewarn "hook at ${EROOT}/usr/lib/elogind/system-sleep/nvidia and it is recommended"
-		ewarn "to remove the custom one to avoid potential issues."
-		ewarn
-		ewarn "Feel free to ignore this warning if you know the other NVIDIA-related"
-		ewarn "scripts can be used together. The warning will be removed in the future."
-	fi
-	if [[ ${REPLACING_VERSIONS##* } ]] &&
-		ver_test ${REPLACING_VERSIONS##* } -lt 550.107.02-r1 # may get repeated
-	then
-		elog
-		elog "For suspend/sleep, 'NVreg_PreserveVideoMemoryAllocations=1' is now default"
-		elog "with this version of ${PN}. This is recommended (or required) by"
-		elog "major DEs especially with wayland but, *if* experience regressions with"
-		elog "suspend, try reverting to =0 in '${EROOT}/etc/modprobe.d/nvidia.conf'."
-		elog
-		elog "May notably be an issue when using neither systemd nor elogind to suspend."
-		elog
-		elog "Also, the systemd suspend/hibernate/resume services are now enabled by"
-		elog "default, and for openrc+elogind a similar hook has been installed."
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild
new file mode 100644
index 000000000000..d0b12cad7fcb
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild
@@ -0,0 +1,609 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_IUSE=+modules
+inherit desktop eapi9-pipestatus flag-o-matic linux-mod-r1 readme.gentoo-r1
+inherit systemd toolchain-funcs unpacker user-info
+
+MODULES_KERNEL_MAX=6.13
+NV_URI="https://download.nvidia.com/XFree86/"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="https://www.nvidia.com/"
+SRC_URI="
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
+	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
+	$(printf "${NV_URI}%s/%s-${PV}.tar.bz2 " \
+		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
+	${NV_URI}NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-${PV}.tar.xz
+"
+# nvidia-installer is unused but here for GPL-2's "distribute sources"
+S=${WORKDIR}
+
+LICENSE="NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
+SLOT="0/${PV%%.*}"
+KEYWORDS="-* ~amd64 ~arm64"
+IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland"
+REQUIRED_USE="kernel-open? ( modules )"
+
+COMMON_DEPEND="
+	acct-group/video
+	X? ( x11-libs/libpciaccess )
+	persistenced? (
+		acct-user/nvpd
+		net-libs/libtirpc:=
+	)
+	tools? (
+		>=app-accessibility/at-spi2-core-2.46:2
+		dev-libs/glib:2
+		dev-libs/jansson:=
+		media-libs/harfbuzz:=
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		x11-libs/pango
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-libs/openssl:0/3
+	sys-libs/glibc
+	X? (
+		media-libs/libglvnd[X,abi_x86_32(-)?]
+		x11-libs/libX11[abi_x86_32(-)?]
+		x11-libs/libXext[abi_x86_32(-)?]
+	)
+	powerd? ( sys-apps/dbus[abi_x86_32(-)?] )
+	wayland? (
+		gui-libs/egl-gbm
+		>=gui-libs/egl-wayland-1.1.10
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	static-libs? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	tools? (
+		media-libs/libglvnd
+		sys-apps/dbus
+		x11-base/xorg-proto
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libvdpau
+	)
+"
+BDEPEND="
+	sys-devel/m4
+	virtual/pkgconfig
+"
+
+QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
+
+PATCHES=(
+	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
+	"${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch
+)
+
+pkg_setup() {
+	use modules && [[ ${MERGE_TYPE} != binary ]] || return
+
+	# do early before linux-mod-r1 so can use chkconfig to setup CONFIG_CHECK
+	get_version
+	require_configured_kernel
+
+	local CONFIG_CHECK="
+		PROC_FS
+		~DRM_KMS_HELPER
+		~SYSVIPC
+		~!LOCKDEP
+		~!PREEMPT_RT
+		~!SLUB_DEBUG_ON
+		!DEBUG_MUTEXES
+		$(usev powerd '~CPU_FREQ')
+	"
+
+	kernel_is -ge 6 11 && linux_chkconfig_present DRM_FBDEV_EMULATION &&
+		CONFIG_CHECK+=" DRM_TTM_HELPER"
+
+	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+
+	use kernel-open && CONFIG_CHECK+=" MMU_NOTIFIER" #843827
+
+	local drm_helper_msg="Cannot be directly selected in the kernel's config menus, and may need
+	selection of a DRM device even if unused, e.g. CONFIG_DRM_QXL=m or
+	DRM_AMDGPU=m (among others, consult the kernel config's help), can
+	also use DRM_NOUVEAU=m as long as built as module *not* built-in."
+	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
+	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
+	${drm_helper_msg}"
+	local ERROR_DRM_TTM_HELPER="CONFIG_DRM_TTM_HELPER: is not set but is needed to compile when using
+	kernel version 6.11.x or newer while DRM_FBDEV_EMULATION is set.
+	${drm_helper_msg}"
+	local ERROR_MMU_NOTIFIER="CONFIG_MMU_NOTIFIER: is not set but needed to build with USE=kernel-open.
+	Cannot be directly selected in the kernel's menuconfig, and may need
+	selection of another option that requires it such as CONFIG_KVM."
+	local ERROR_PREEMPT_RT="CONFIG_PREEMPT_RT: is set but is unsupported by NVIDIA upstream and
+	will fail to build unless the env var IGNORE_PREEMPT_RT_PRESENCE=1 is
+	set. Please do not report issues if run into e.g. kernel panics while
+	ignoring this."
+
+	linux-mod-r1_pkg_setup
+}
+
+src_prepare() {
+	# make patches usable across versions
+	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
+	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
+	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
+	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
+	mv NVIDIA-kernel-module-source-${PV} kernel-module-source || die
+
+	default
+
+	# prevent detection of incomplete kernel DRM support (bug #603818)
+	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
+		-i kernel{,-module-source/kernel-open}/conftest.sh || die
+
+	# adjust service files
+	sed 's/__USER__/nvpd/' \
+		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
+		> "${T}"/nvidia-persistenced.service || die
+	sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
+
+	# use alternative vulkan icd option if USE=-X (bug #909181)
+	use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die
+
+	# enable nvidia-drm.modeset=1 by default with USE=wayland
+	cp "${FILESDIR}"/nvidia-545.conf "${T}"/nvidia.conf || die
+	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
+
+	# makefile attempts to install wayland library even if not built
+	use wayland || sed -i 's/ WAYLAND_LIB_install$//' \
+		nvidia-settings/src/Makefile || die
+}
+
+src_compile() {
+	tc-export AR CC CXX LD OBJCOPY OBJDUMP PKG_CONFIG
+
+	local xnvflags=-fPIC #840389
+	# lto static libraries tend to cause problems without fat objects
+	tc-is-lto && xnvflags+=" $(test-flags-CC -ffat-lto-objects)"
+
+	NV_ARGS=(
+		PREFIX="${EPREFIX}"/usr
+		HOST_CC="$(tc-getBUILD_CC)"
+		HOST_LD="$(tc-getBUILD_LD)"
+		BUILD_GTK2LIB=
+		NV_USE_BUNDLED_LIBJANSSON=0
+		NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
+		WAYLAND_AVAILABLE=$(usex wayland 1 0)
+		XNVCTRL_CFLAGS="${xnvflags}"
+	)
+
+	if use modules; then
+		local o_cflags=${CFLAGS} o_cxxflags=${CXXFLAGS} o_ldflags=${LDFLAGS}
+
+		# conftest.sh is broken with c23 due to func() changing meaning,
+		# and then fails later due to ealier misdetections
+		# TODO: try without now and then + drop modargs' CC= (bug #944092)
+		KERNEL_CC+=" -std=gnu17"
+
+		local modlistargs=video:kernel
+		if use kernel-open; then
+			modlistargs+=-module-source:kernel-module-source/kernel-open
+
+			# environment flags are normally unused for modules, but nvidia
+			# uses it for building the "blob" and it is a bit fragile
+			filter-flags -fno-plt #912949
+			filter-lto
+			CC=${KERNEL_CC} CXX=${KERNEL_CXX} strip-unsupported-flags
+		fi
+
+		local modlist=( nvidia{,-drm,-modeset,-peermem,-uvm}=${modlistargs} )
+		local modargs=(
+			CC="${KERNEL_CC}" # needed for above gnu17 workaround
+			IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
+			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
+
+			# kernel takes "x86" and "x86_64" as meaning the same, but nvidia
+			# makes the distinction (since 550.135) and is not happy with "x86"
+			# TODO?: it should be ok/better for tc-arch-kernel to do x86_64
+			$(usev amd64 ARCH=x86_64)
+		)
+
+		# temporary workaround for bug #914468
+		CPP="${KERNEL_CC} -E" tc-is-clang && addpredict "${KV_OUT_DIR}"
+
+		linux-mod-r1_src_compile
+		CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags}
+	fi
+
+	emake "${NV_ARGS[@]}" -C nvidia-modprobe
+	use persistenced && emake "${NV_ARGS[@]}" -C nvidia-persistenced
+	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
+
+	if use tools; then
+		# avoid noisy *very* noisy logs with deprecation warnings
+		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
+			emake "${NV_ARGS[@]}" -C nvidia-settings
+	elif use static-libs; then
+		# pretend GTK+3 is available, not actually used (bug #880879)
+		emake "${NV_ARGS[@]}" BUILD_GTK3LIB=1 \
+			-C nvidia-settings/src out/libXNVCtrl.a
+	fi
+}
+
+src_install() {
+	local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
+
+	NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
+
+	local -A paths=(
+		[APPLICATION_PROFILE]=/usr/share/nvidia
+		[CUDA_ICD]=/etc/OpenCL/vendors
+		[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
+		[FIRMWARE]=/lib/firmware/nvidia/${PV}
+		[GBM_BACKEND_LIB_SYMLINK]=/usr/${libdir}/gbm
+		[GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
+		[OPENGL_DATA]=/usr/share/nvidia
+		[VULKAN_ICD_JSON]=/usr/share/vulkan
+		[WINE_LIB]=/usr/${libdir}/nvidia/wine
+		[XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
+
+		[GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
+		[GLX_MODULE_SYMLINK]=/usr/${libdir}/xorg/modules
+		[XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
+	)
+
+	local skip_files=(
+		$(usev !X "libGLX_nvidia libglxserver_nvidia")
+		libGLX_indirect # non-glvnd unused fallback
+		libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source
+		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
+		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
+		libnvidia-pkcs11.so # using the openssl3 version instead
+	)
+	local skip_modules=(
+		$(usev !X "nvfbc vdpau xdriver")
+		$(usev !modules gsp)
+		$(usev !powerd powerd)
+		installer nvpd # handled separately / built from source
+	)
+	local skip_types=(
+		GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # media-libs/libglvnd
+		OPENCL_WRAPPER.\* # virtual/opencl
+		DOCUMENTATION DOT_DESKTOP .\*_SRC DKMS_CONF SYSTEMD_UNIT # handled separately / unused
+	)
+
+	local DOCS=(
+		README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
+		nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
+	)
+	local HTML_DOCS=( html/. )
+	einstalldocs
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Trusted users should be in the 'video' group to use NVIDIA devices.
+You can add yourself by using: gpasswd -a my-user video\
+$(usev modules "
+
+Like all out-of-tree kernel modules, it is necessary to rebuild
+${PN} after upgrading or rebuilding the Linux kernel
+by for example running \`emerge @module-rebuild\`. Alternatively,
+if using a distribution kernel (sys-kernel/gentoo-kernel{,-bin}),
+this can be automated by setting USE=dist-kernel globally.
+
+Loaded kernel modules also must not mismatch with the installed
+${PN} version (excluding -r revision), meaning should
+ensure \`eselect kernel list\` points to the kernel that will be
+booted before building and preferably reboot after upgrading
+${PN} (the ebuild will emit a warning if mismatching).
+
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.")\
+$(use amd64 && usev !abi_x86_32 "
+
+Note that without USE=abi_x86_32 on ${PN}, 32bit applications
+(typically using wine / steam) will not be able to use GPU acceleration.")
+
+For additional information or for troubleshooting issues, please see
+https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers and NVIDIA's own
+documentation that is installed alongside this README."
+	readme.gentoo_create_doc
+
+	if use modules; then
+		linux-mod-r1_src_install
+
+		insinto /etc/modprobe.d
+		doins "${T}"/nvidia.conf
+
+		# used for gpu verification with binpkgs (not kept, see pkg_preinst)
+		insinto /usr/share/nvidia
+		doins supported-gpus/supported-gpus.json
+	fi
+
+	emake "${NV_ARGS[@]}" -C nvidia-modprobe install
+	fowners :video /usr/bin/nvidia-modprobe #505092
+	fperms 4710 /usr/bin/nvidia-modprobe
+
+	if use persistenced; then
+		emake "${NV_ARGS[@]}" -C nvidia-persistenced install
+		newconfd "${FILESDIR}"/nvidia-persistenced.confd nvidia-persistenced
+		newinitd "${FILESDIR}"/nvidia-persistenced.initd nvidia-persistenced
+		systemd_dounit "${T}"/nvidia-persistenced.service
+	fi
+
+	if use tools; then
+		emake "${NV_ARGS[@]}" -C nvidia-settings install
+
+		doicon nvidia-settings/doc/nvidia-settings.png
+		domenu nvidia-settings/doc/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	if use static-libs; then
+		dolib.a nvidia-settings/src/out/libXNVCtrl.a
+
+		insinto /usr/include/NVCtrl
+		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
+	fi
+
+	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
+
+	# mimic nvidia-installer by reading .manifest to install files
+	# 0:file 1:perms 2:type 3+:subtype/arguments -:module
+	local m into
+	while IFS=' ' read -ra m; do
+		! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
+			[[ " ${m[0]##*/}" =~ ^(\ ${skip_files[*]/%/.*|\\} )$ ]] ||
+			[[ " ${m[2]}" =~ ^(\ ${skip_types[*]/%/|\\} )$ ]] ||
+			has ${m[-1]#MODULE:} "${skip_modules[@]}" && continue
+
+		case ${m[2]} in
+			MANPAGE)
+				gzip -dc ${m[0]} | newman - ${m[0]%.gz}
+				pipestatus || die
+				continue
+			;;
+			GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../
+			VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/
+		esac
+
+		if [[ -v 'paths[${m[2]}]' ]]; then
+			into=${paths[${m[2]}]}
+		elif [[ ${m[2]} == EXPLICIT_PATH ]]; then
+			into=${m[3]}
+		elif [[ ${m[2]} == *_BINARY ]]; then
+			into=/opt/bin
+		elif [[ ${m[3]} == COMPAT32 ]]; then
+			use abi_x86_32 || continue
+			into=/usr/${libdir32}
+		elif [[ ${m[2]} == *_@(LIB|SYMLINK) ]]; then
+			into=/usr/${libdir}
+		else
+			die "No known installation path for ${m[0]}"
+		fi
+		[[ ${m[3]: -2} == ?/ ]] && into+=/${m[3]%/}
+		[[ ${m[4]: -2} == ?/ ]] && into+=/${m[4]%/}
+
+		if [[ ${m[2]} =~ _SYMLINK$ ]]; then
+			[[ ${m[4]: -1} == / ]] && m[4]=${m[5]}
+			dosym ${m[4]} ${into}/${m[0]}
+			continue
+		fi
+		[[ ${m[0]} =~ ^libnvidia-ngx.so|^libnvidia-egl-gbm.so ]] &&
+			dosym ${m[0]} ${into}/${m[0]%.so*}.so.1 # soname not in .manifest
+
+		printf -v m[1] %o $((m[1] | 0200)) # 444->644
+		insopts -m${m[1]}
+		insinto ${into}
+		doins ${m[0]}
+	done < .manifest || die
+	insopts -m0644 # reset
+
+	# MODULE:installer non-skipped extras
+	: "$(systemd_get_sleepdir)"
+	exeinto "${_#"${EPREFIX}"}"
+	doexe systemd/system-sleep/nvidia
+	dobin systemd/nvidia-sleep.sh
+	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
+
+	dobin nvidia-bug-report.sh
+
+	# MODULE:powerd extras
+	if use powerd; then
+		newinitd "${FILESDIR}"/nvidia-powerd.initd nvidia-powerd #923117
+		systemd_dounit systemd/system/nvidia-powerd.service
+
+		insinto /usr/share/dbus-1/system.d
+		doins nvidia-dbus.conf
+	fi
+
+	# enabling is needed for sleep to work properly and little reason not to do
+	# it unconditionally for a better user experience
+	: "$(systemd_get_systemunitdir)"
+	local unitdir=${_#"${EPREFIX}"}
+	# not using relative symlinks to match systemd's own links
+	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-hibernate.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-resume.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-suspend.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-resume.service
+	# also add a custom elogind hook to do the equivalent of the above
+	exeinto /usr/lib/elogind/system-sleep
+	newexe "${FILESDIR}"/system-sleep.elogind nvidia
+	# <elogind-255.5 used a different path (bug #939216), keep a compat symlink
+	# TODO: cleanup after 255.5 been stable for a few months
+	dosym {/usr/lib,/"${libdir}"}/elogind/system-sleep/nvidia
+
+	# needed with >=systemd-256 or may fail to resume with some setups
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1072722
+	insinto "${unitdir}"/systemd-homed.service.d
+	newins - 10-nvidia.conf <<-EOF
+		[Service]
+		Environment=SYSTEMD_HOME_LOCK_FREEZE_SESSION=false
+	EOF
+	insinto "${unitdir}"/systemd-suspend.service.d
+	newins - 10-nvidia.conf <<-EOF
+		[Service]
+		Environment=SYSTEMD_SLEEP_FREEZE_USER_SESSIONS=false
+	EOF
+	dosym -r "${unitdir}"/systemd-{suspend,hibernate}.service.d/10-nvidia.conf
+	dosym -r "${unitdir}"/systemd-{suspend,hybrid-sleep}.service.d/10-nvidia.conf
+	dosym -r "${unitdir}"/systemd-{suspend,suspend-then-hibernate}.service.d/10-nvidia.conf
+
+	# symlink non-versioned so nvidia-settings can use it even if misdetected
+	dosym nvidia-application-profiles-${PV}-key-documentation \
+		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
+
+	# don't attempt to strip firmware files (silences errors)
+	dostrip -x ${paths[FIRMWARE]}
+
+	# sandbox issues with /dev/nvidiactl and others (bug #904292,#921578)
+	# are widespread and sometime affect revdeps of packages built with
+	# USE=opencl/cuda making it hard to manage in ebuilds (minimal set,
+	# ebuilds should handle manually if need others or addwrite)
+	insinto /etc/sandbox.d
+	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-caps:/dev/char"'
+
+	# dracut does not use /etc/modprobe.d if hostonly=no, but want to make sure
+	# our settings are used for bug 932781#c8 and nouveau blacklist if either
+	# modules are included (however, just best-effort without initramfs regen)
+	if use modules; then
+		echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
+			"${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die
+	fi
+}
+
+pkg_preinst() {
+	has_version "${CATEGORY}/${PN}[kernel-open]" && NV_HAD_KERNEL_OPEN=
+	has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=
+
+	use modules || return
+
+	# set video group id based on live system (bug #491414)
+	local g=$(egetent group video | cut -d: -f3)
+	[[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')"
+	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
+
+	# try to find driver mismatches using temporary supported-gpus.json
+	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
+		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
+			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
+		if [[ ${g} ]]; then
+			g=$((${g##*\"}+1))
+			if ver_test -ge ${g}; then
+				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
+				break
+			fi
+		fi
+	done
+	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
+}
+
+pkg_postinst() {
+	linux-mod-r1_pkg_postinst
+
+	readme.gentoo_print_elog
+
+	if [[ -r /proc/driver/nvidia/version &&
+		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
+		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
+		ewarn "libraries and may prevent launching GPU-accelerated applications."
+		if use modules; then
+			ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
+			ewarn "(e.g. API mismatch messages in the \`dmesg\` output), please verify"
+			ewarn "that the running kernel is ${KV_FULL} and that (if used) the"
+			ewarn "initramfs does not include NVIDIA modules (or at least, not old ones)."
+		fi
+	fi
+
+	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
+		ewarn "Detected that the current kernel command line is using 'slub_debug=',"
+		ewarn "this may lead to system instability/freezes with this version of"
+		ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
+	fi
+
+	if [[ -v NV_LEGACY_MASK ]]; then
+		ewarn
+		ewarn "***WARNING***"
+		ewarn
+		ewarn "You are installing a version of ${PN} known not to work"
+		ewarn "with a GPU of the current system. If unwanted, add the mask:"
+		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
+			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
+		else
+			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
+		fi
+		ewarn "...then downgrade to a legacy[1] branch if possible (not all old versions"
+		ewarn "are available or fully functional, may need to consider nouveau[2])."
+		ewarn "[1] https://www.nvidia.com/object/IO_32667.html"
+		ewarn "[2] https://wiki.gentoo.org/wiki/Nouveau"
+	fi
+
+	if use kernel-open && [[ ! -v NV_HAD_KERNEL_OPEN ]]; then
+		ewarn
+		ewarn "Open source variant of ${PN} was selected, be warned it is experimental"
+		ewarn "and only for modern GPUs (e.g. GTX 1650+). Try to disable if run into issues."
+		ewarn "Please also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
+	fi
+
+	if use wayland && use modules && [[ ! -v NV_HAD_WAYLAND ]]; then
+		elog
+		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
+		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
+		elog "experimental but is required for wayland."
+		elog
+		elog "If you experience issues, either disable wayland or edit nvidia.conf."
+		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
+	fi
+
+	# these can be removed after some time, only to help the transition
+	# given users are unlikely to do further custom solutions if it works
+	# (see also https://github.com/elogind/elogind/issues/272)
+	if grep -riq "^[^#]*HandleNvidiaSleep=yes" "${EROOT}"/etc/elogind/sleep.conf.d/ 2>/dev/null
+	then
+		ewarn
+		ewarn "!!! WARNING !!!"
+		ewarn "Detected HandleNvidiaSleep=yes in ${EROOT}/etc/elogind/sleep.conf.d/."
+		ewarn "This 'could' cause issues if used in combination with the new hook"
+		ewarn "installed by the ebuild to handle sleep using the official upstream"
+		ewarn "script. It is recommended to disable the option."
+	fi
+	if [[ $(realpath "${EROOT}"{/etc,{/usr,}/lib*}/elogind/system-sleep 2>/dev/null | \
+		sort | uniq | xargs -d'\n' grep -Ril nvidia 2>/dev/null | wc -l) -gt 2 ]]
+	then
+		ewarn
+		ewarn "!!! WARNING !!!"
+		ewarn "Detected a custom script at ${EROOT}{/etc,{/usr,}/lib*}/elogind/system-sleep"
+		ewarn "referencing NVIDIA. This version of ${PN} has installed its own"
+		ewarn "hook at ${EROOT}/usr/lib/elogind/system-sleep/nvidia and it is recommended"
+		ewarn "to remove the custom one to avoid potential issues."
+		ewarn
+		ewarn "Feel free to ignore this warning if you know the other NVIDIA-related"
+		ewarn "scripts can be used together. The warning will be removed in the future."
+	fi
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 550.107.02-r1 # may get repeated
+	then
+		elog
+		elog "For suspend/sleep, 'NVreg_PreserveVideoMemoryAllocations=1' is now default"
+		elog "with this version of ${PN}. This is recommended (or required) by"
+		elog "major DEs especially with wayland but, *if* experience regressions with"
+		elog "suspend, try reverting to =0 in '${EROOT}/etc/modprobe.d/nvidia.conf'."
+		elog
+		elog "May notably be an issue when using neither systemd nor elogind to suspend."
+		elog
+		elog "Also, the systemd suspend/hibernate/resume services are now enabled by"
+		elog "default, and for openrc+elogind a similar hook has been installed."
+	fi
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-565.77.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-565.77.ebuild
index 746ae36bcfc7..2f947bfb056e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-565.77.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-565.77.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
@@ -7,9 +7,6 @@ MODULES_OPTIONAL_IUSE=+modules
 inherit desktop eapi9-pipestatus flag-o-matic linux-mod-r1 readme.gentoo-r1
 inherit systemd toolchain-funcs unpacker user-info
 
-# note: known failing with 6.13 (550.142 builds), and (at least)
-# fbdev=1 is furthermore known broken and not planning to patch
-# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749
 MODULES_KERNEL_MAX=6.12
 NV_URI="https://download.nvidia.com/XFree86/"
 
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index 054314735732..84ad682c6457 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1 +1,2 @@
+DIST xf86-input-synaptics-1.10.0.tar.xz 431316 BLAKE2B 02b90fca8baba07323141efbca0cc039d52406cc0272de12f6c08ac90769ffb14a7725a5e25f47d6235661f69136b5a9d8edef76203c63a027d7b12b3368f540 SHA512 deb14ba039f423c4575825ecdeb74f31e30f044a4efc7dae9c1634f841dcf7066970cd470be7e63f68eccd4899e0434d602e59c297042cb2f38ff2a3a02d7e91
 DIST xf86-input-synaptics-1.9.2.tar.xz 432380 BLAKE2B 7ba94565f454fff8ddaf33695a7a16526810bf2677ef01e9ae740fd00a95810b4d42fb0077fe93120ac72398ca18ade48c7b389ecbc37f2438beaa97a6a21db5 SHA512 6fd46505f22bba79f612fbd48dddd4818f7d874cc29caac71840744de27f1d224c68861e3a18d2a866b78178924d2f093f5260e27b221aa1fb17dbc09d66b649
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.10.0.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.10.0.ebuild
new file mode 100644
index 000000000000..fbafe8dc0c29
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.10.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info xorg-3
+
+DESCRIPTION="Driver for Synaptics touchpads"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=x11-base/xorg-server-1.14
+	x11-libs/libX11
+	>=x11-libs/libXi-1.2
+	>=x11-libs/libXtst-1.1.0
+	kernel_linux? ( >=dev-libs/libevdev-0.4 )"
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.37
+	x11-base/xorg-proto"
+
+check_reqs() {
+	linux-info_pkg_setup
+
+	# Just a friendly warning
+	if ! linux_config_exists \
+			|| ! linux_chkconfig_present INPUT_EVDEV; then
+		ewarn
+		ewarn "This driver requires event interface support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>     Event interface"
+		ewarn
+	fi
+}
+
+pkg_pretend() {
+	check_reqs
+}
+
+pkg_setup() {
+	check_reqs
+}
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-1.2.3.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-1.2.3.ebuild
index 47926243f2ae..8d3e38056e6b 100644
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-1.2.3.ebuild
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-1.2.3.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://linuxwacom.github.io/"
 SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-drivers/xf86-video-ast/Manifest b/x11-drivers/xf86-video-ast/Manifest
index e8357bf7681e..a020b2c8aa1a 100644
--- a/x11-drivers/xf86-video-ast/Manifest
+++ b/x11-drivers/xf86-video-ast/Manifest
@@ -1 +1,2 @@
 DIST xf86-video-ast-1.1.6.tar.xz 317848 BLAKE2B 6336de38ec08da6014c40d6af50dee31f3a0b2bcacc96220100ed04c102d0f37292364c00e41c849151a3b3edefe4891c2037e282f130add0b1f5acb9f34d3e9 SHA512 8482fec8d6be577f293cb820e623544475163f713fd74ec415f899bf5e9cf9453ffe4f96e141da3671437ebf616b47395d30d4b10858053c5893f5f5b7575ef1
+DIST xf86-video-ast-1.2.0.tar.xz 317756 BLAKE2B c91c2cd1d9a3e4c71ceabbdb997ffd0331f6f71612430d6dc12b1d57675d9b6d3e078840e21d5472fca648915d2429f3af7471375da7a2124c797ae4c3521f45 SHA512 08e89eef33ce97d87f996ad52ed77387267614911df8d9f820a12742b82a5d036c8f5350d4d130a570d5c9f99b650d43f0be3c01eeae4e9979b92e9dc2d6499c
diff --git a/x11-drivers/xf86-video-ast/xf86-video-ast-1.2.0.ebuild b/x11-drivers/xf86-video-ast/xf86-video-ast-1.2.0.ebuild
new file mode 100644
index 000000000000..7d8c1825a907
--- /dev/null
+++ b/x11-drivers/xf86-video-ast/xf86-video-ast-1.2.0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xorg-3
+
+DESCRIPTION="X.Org driver for ASpeedTech cards"
+KEYWORDS="~amd64 ~loong ~ppc ~ppc64 ~x86"
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-libs/libICE/libICE-1.1.2.ebuild b/x11-libs/libICE/libICE-1.1.2.ebuild
index 785a1fb65354..47280a7a1084 100644
--- a/x11-libs/libICE/libICE-1.1.2.ebuild
+++ b/x11-libs/libICE/libICE-1.1.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
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Inter-Client Exchange library"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	elibc_glibc? (
diff --git a/x11-libs/libSM/libSM-1.2.5.ebuild b/x11-libs/libSM/libSM-1.2.5.ebuild
index 10ddac0c4b4d..177a1d623a5f 100644
--- a/x11-libs/libSM/libSM-1.2.5.ebuild
+++ b/x11-libs/libSM/libSM-1.2.5.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,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Session Management library"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+uuid"
 
 RDEPEND="
diff --git a/x11-libs/libX11/libX11-1.8.10-r1.ebuild b/x11-libs/libX11/libX11-1.8.10-r1.ebuild
new file mode 100644
index 000000000000..ccd2a3bec8b1
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.8.10-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit toolchain-funcs xorg-3
+
+# Note: please bump this with x11-misc/compose-tables
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# HACK: libX11 produces .pc files that depend on xproto.pc. When libX11
+#       is installed as a binpkg, DEPEND packages are not pulled in,
+#       but to build source packages against libX11, xorg-proto is
+#       needed. Until a "build-against-depend" option is available in
+#       ebuilds, we RDEPEND on xproto. See bug #903707 and others.
+RDEPEND="
+	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+	x11-misc/compose-tables
+	x11-base/xorg-proto
+"
+DEPEND="${RDEPEND}
+	x11-libs/xtrans
+"
+BDEPEND="test? ( dev-lang/perl )"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+		$(use_enable doc specs)
+		--enable-ipv6
+		--without-fop
+		--with-keysymdefdir="${ESYSROOT}/usr/include/X11"
+		CPP="$(tc-getPROG CPP cpp)"
+	)
+	xorg-3_src_configure
+}
+
+src_install() {
+	xorg-3_src_install
+	rm -rf "${ED}"/usr/share/X11/locale || die
+}
diff --git a/x11-libs/libX11/libX11-1.8.10.ebuild b/x11-libs/libX11/libX11-1.8.10.ebuild
deleted file mode 100644
index 35d1e55b1484..000000000000
--- a/x11-libs/libX11/libX11-1.8.10.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit toolchain-funcs xorg-3
-
-# Note: please bump this with x11-misc/compose-tables
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
-	x11-misc/compose-tables
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/xtrans
-"
-BDEPEND="test? ( dev-lang/perl )"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		--enable-ipv6
-		--without-fop
-		--with-keysymdefdir="${ESYSROOT}/usr/include/X11"
-		CPP="$(tc-getPROG CPP cpp)"
-	)
-	xorg-3_src_configure
-}
-
-src_install() {
-	xorg-3_src_install
-	rm -rf "${ED}"/usr/share/X11/locale || die
-}
diff --git a/x11-libs/libXau/libXau-1.0.12.ebuild b/x11-libs/libXau/libXau-1.0.12.ebuild
index 1c0a73d5c571..6bd3964c2e4d 100644
--- a/x11-libs/libXau/libXau-1.0.12.ebuild
+++ b/x11-libs/libXau/libXau-1.0.12.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
@@ -9,6 +9,6 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X authorization library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXrender/libXrender-0.9.12.ebuild b/x11-libs/libXrender/libXrender-0.9.12.ebuild
index 7b1f6b8804a9..7880fefcb9d4 100644
--- a/x11-libs/libXrender/libXrender-0.9.12.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.12.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,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xrender library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXt/libXt-1.3.1.ebuild b/x11-libs/libXt/libXt-1.3.1.ebuild
index 84310ee76088..5fa91b5b4630 100644
--- a/x11-libs/libXt/libXt-1.3.1.ebuild
+++ b/x11-libs/libXt/libXt-1.3.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
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org X Toolkit Intrinsics library"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libXv/libXv-1.0.13.ebuild b/x11-libs/libXv/libXv-1.0.13.ebuild
index 3d72f8daa912..88c34bad9a17 100644
--- a/x11-libs/libXv/libXv-1.0.13.ebuild
+++ b/x11-libs/libXv/libXv-1.0.13.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,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Xv library"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.6.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.6.ebuild
index b2f93a3265e5..facbdeffbf2d 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.6.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.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
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xxf86vm library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libdrm/libdrm-2.4.124.ebuild b/x11-libs/libdrm/libdrm-2.4.124.ebuild
index 25b11549579e..4ef9a65457ce 100644
--- a/x11-libs/libdrm/libdrm-2.4.124.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.124.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
@@ -16,7 +16,7 @@ DESCRIPTION="X.Org libdrm library"
 HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
 if [[ ${PV} != 9999* ]]; then
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libxcvt/libxcvt-0.1.3.ebuild b/x11-libs/libxcvt/libxcvt-0.1.3.ebuild
index 1653d2ad10a4..1d613cf6cd4c 100644
--- a/x11-libs/libxcvt/libxcvt-0.1.3.ebuild
+++ b/x11-libs/libxcvt/libxcvt-0.1.3.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
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-3 meson
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="X.Org xcvt library and cvt program"
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3.3.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3.3.ebuild
index f49c7bf9b6de..ab7c647c7834 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3.3.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3.3.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,6 +8,6 @@ inherit xorg-3
 
 DESCRIPTION="Shared memory fences using futexes"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 7f3b0ef8668b..7a6de0881c2d 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,2 +1,3 @@
 DIST pango-1.52.1.tar.xz 1956856 BLAKE2B 0b7f58f3d74bd37df285f3fbf14d2d2d776fbcf773568d63f12f26976d2ff505c19616fcee11562933df2594762e9ca30fe96a1d02dcd174381b976d63c68ac1 SHA512 7cddbd61afc3c98ffd09ea08c5d7613e454b6705f72304cb9b3578865b6bda70ca20f98605dea73f2cbca5e264217c8d79e4539e9eb36b8775d5d2a4f769cf32
 DIST pango-1.52.2.tar.xz 1963588 BLAKE2B 9367703addcc6805fc14f0c0184d9d1b4093b8947fea9d260c54eb6c86ce56a0d6cfe35c3d6340eaa5d96fb84f0a94c5979ae308bfa79f02e4ce25c4c093556e SHA512 6b3d762d133e7c900c6dfa85f43c950699930f6149cb3c90bf0e787f1b5a126a0b90220b90e649f84e4c244e44c46d4b575d5d7afeb305232c333712effc0981
+DIST pango-1.54.0.tar.xz 1963180 BLAKE2B 92c389ab3f21631c245575e30804ffee6fef7b60bc6acdf08159aa325d878cf335203267720aec9143ea2a4e590578424cd64011f73da22e1b0beca85e85a276 SHA512 b08792a811e033b2dc9ae78278ea522fad1064de3a4d33460271eb0502613ee21d2c82349f8e7d8f59d59e0c020b7a3a8efa194572e16e2e78db422956fd97ea
diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml
index dfaa55f180f5..4882f116d6ea 100644
--- a/x11-libs/pango/metadata.xml
+++ b/x11-libs/pango/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
   <use>
+    <flag name="examples">Install source code examples</flag>
     <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
     <flag name="X">Build and install the legacy pangoxft library</flag>
   </use>
diff --git a/x11-libs/pango/pango-1.54.0.ebuild b/x11-libs/pango/pango-1.54.0.ebuild
new file mode 100644
index 000000000000..7054129b4593
--- /dev/null
+++ b/x11-libs/pango/pango-1.54.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic gnome2-utils meson-multilib xdg
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="https://pango.gnome.org/ https://gitlab.gnome.org/GNOME/pango"
+SRC_URI="https://download.gnome.org/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+IUSE="debug examples +introspection sysprof test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.13.0:1.0[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.10[X?,${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	dev-util/glib-utils
+	sys-apps/help2man
+	virtual/pkgconfig
+	test? ( media-fonts/cantarell )
+"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	gnome2_environment_reset
+
+	# get rid of a win32 example
+	rm examples/pangowin32tobmp.c || die
+}
+
+multilib_src_configure() {
+	if use debug; then
+		append-cflags -DPANGO_ENABLE_DEBUG
+	else
+		append-cflags -DG_DISABLE_CAST_CHECKS
+	fi
+
+	local emesonargs=(
+		# Never use gi-docgen subproject
+		--wrap-mode nofallback
+
+		-Ddocumentation=false # we ship pregenerated docs
+		$(meson_native_use_feature introspection)
+		$(meson_use test build-testsuite)
+		-Dbuild-examples=false
+		-Dfontconfig=enabled
+		$(meson_feature sysprof)
+		-Dlibthai=disabled
+		-Dcairo=enabled
+		$(meson_feature X xft)
+		-Dfreetype=enabled
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	if use examples; then
+		dodoc -r examples
+	fi
+
+	insinto /usr/share/gtk-doc/html
+	# This will install PangoXft API docs regardless of USE=-X, but this is intentional
+	doins -r "${S}"/docs/Pango*
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if has_version 'media-libs/freetype[-harfbuzz]' ; then
+		ewarn "media-libs/freetype is installed without harfbuzz support. This may"
+		ewarn "lead to minor font rendering problems, see bug 712374."
+	fi
+}
diff --git a/x11-misc/grsync/files/grsync-1.3.0-desktop.patch b/x11-misc/grsync/files/grsync-1.3.0-desktop.patch
deleted file mode 100644
index 5cdc49194371..000000000000
--- a/x11-misc/grsync/files/grsync-1.3.0-desktop.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur grsync-1.3.0.orig/configure.in grsync-1.3.0/configure.in
---- grsync-1.3.0.orig/configure.in	2020-05-28 10:16:05.000000000 +0200
-+++ grsync-1.3.0/configure.in	2020-12-04 09:30:40.082105813 +0100
-@@ -30,7 +30,7 @@
- 		GTK_API_VERSION="2.0"
- fi
- pkg_modules="gtk+-$GTK_API_VERSION >= 2.16.0"
--OTHER_DESKTOP_ENTRIES="Icon=grsync.png"
-+OTHER_DESKTOP_ENTRIES="Icon=grsync"
- MIMEINFO_XMLNS="xmlns='http://www.freedesktop.org/standards/shared-mime-info'"
- MIME_OSSOCAT=""
- 
-diff -Naur grsync-1.3.0.orig/grsync.desktop.in grsync-1.3.0/grsync.desktop.in
---- grsync-1.3.0.orig/grsync.desktop.in	2015-09-11 13:21:28.000000000 +0200
-+++ grsync-1.3.0/grsync.desktop.in	2020-12-04 09:30:50.473110946 +0100
-@@ -4,7 +4,7 @@
- Terminal=false
- Type=Application
- MimeType=application/x-grsync-session;
--Categories=Application;System;
-+Categories=System;
- GenericName=Synchronize files with rsync
- GenericName[fr]=Interface GTK pour rsync
- GenericName[it]=Sincronizza file con rsync
diff --git a/x11-misc/grsync/files/grsync-1.3.0-nested_func.patch b/x11-misc/grsync/files/grsync-1.3.0-nested_func.patch
deleted file mode 100644
index 6d135674bac8..000000000000
--- a/x11-misc/grsync/files/grsync-1.3.0-nested_func.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur grsync-1.3.0.orig/src/callbacks.c grsync-1.3.0/src/callbacks.c
---- grsync-1.3.0.orig/src/callbacks.c	2020-11-23 14:52:42.000000000 +0100
-+++ grsync-1.3.0/src/callbacks.c	2020-12-04 09:18:27.573776667 +0100
-@@ -40,12 +40,12 @@
- gboolean more = FALSE, first = TRUE;
- 
- 
--void dialog_set_labels_selectable(GtkWidget *dialog) {
--	void _set_label_selectable(gpointer data, gpointer user_data) {
--		GtkWidget *widget = GTK_WIDGET(data);
--		if (GTK_IS_LABEL(widget)) gtk_label_set_selectable(GTK_LABEL(widget), TRUE);
--	}
-+void _set_label_selectable(gpointer data, gpointer user_data) {
-+	GtkWidget *widget = GTK_WIDGET(data);
-+	if (GTK_IS_LABEL(widget)) gtk_label_set_selectable(GTK_LABEL(widget), TRUE);
-+}
- 
-+void dialog_set_labels_selectable(GtkWidget *dialog) {
- 	GtkWidget *area = gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(dialog));
- 	GtkContainer *box = (GtkContainer *) area;
- 	GList *children = gtk_container_get_children(box);
diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest
index 80b9c168215f..8f3f56e91111 100644
--- a/x11-misc/j4-dmenu-desktop/Manifest
+++ b/x11-misc/j4-dmenu-desktop/Manifest
@@ -1,2 +1 @@
-DIST j4-dmenu-desktop-3.1.tar.gz 108974 BLAKE2B fd0527ee27855ef453b76e52cd15402bb86b9812255edacfacd5b5486162b052eb74d41f072fcf151837698d352dfa743a6bd30cd28156f62ddafc39d2402edb SHA512 6baa4bdf0564683e09bf3dd34f619ec9dcfc840be68ec0f68b4cd643bee5acbc09ebfffaf82daced991899fb467c84ed441257915a9c6b411f317e9947471fca
 DIST j4-dmenu-desktop-3.2.tar.gz 125056 BLAKE2B 7fd26fd749961feb2a0de73b888e085fc4275743335923ab4c8674e79aa85bb2fca4787069fc2cf40ddc0f1748df0ec7f77164ff1cca80cc3c648fff016584c7 SHA512 d6bffa372a461feb1b09293bf51eb8dc081cf1d7aef21f059c51b296dc52804c3cefd9ab6d64d9025bbdee325cb7d24f78719a8f9504f55b868f10ca9715ae5a
diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.1.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.1.ebuild
deleted file mode 100644
index a44226418300..000000000000
--- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PV="r${PV}"
-
-DESCRIPTION="A fast desktop replacement for i3-dmenu-desktop"
-HOMEPAGE="https://github.com/enkore/j4-dmenu-desktop"
-SRC_URI="https://github.com/enkore/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+dmenu test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-cpp/catch:0 )"
-DEPEND="
-	dev-libs/libfmt:=
-	dev-libs/spdlog:=
-"
-RDEPEND="
-	${DEPEND}
-	dmenu? ( x11-misc/dmenu )
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Respect users CFLAGS
-	sed -i -e "s/-pedantic -O2//" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNO_DOWNLOAD="ON"
-		-DWITH_GIT_CATCH="no"
-		-DWITH_TESTS="$(usex test)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	doman j4-dmenu-desktop.1
-}
-
-pkg_postinst() {
-	if ! use dmenu; then
-		elog "As you have disabled the 'dmenu' use flag,"
-		elog "x11-misc/dmenu won't be installed by default."
-		elog ""
-		elog "Since x11-misc/j4-dmenu-desktop uses x11-misc/dmenu as default,"
-		elog "you must configure your own replacement with --dmenu=<command>,"
-		elog "as otherwise it won't work."
-	fi
-}
diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.2.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.2.ebuild
index e56bc1b3ab29..88673cd9d27c 100644
--- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.2.ebuild
+++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.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
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+dmenu test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/obconf-qt/obconf-qt-0.16.5.ebuild b/x11-misc/obconf-qt/obconf-qt-0.16.5.ebuild
index 35a0a21befc1..237280b6fb36 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.16.5.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.16.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/x11-misc/qarma/Manifest b/x11-misc/qarma/Manifest
index 162db8e02e2c..25b52f9f2261 100644
--- a/x11-misc/qarma/Manifest
+++ b/x11-misc/qarma/Manifest
@@ -1 +1 @@
-DIST qarma-1.tar.gz 20688 BLAKE2B 6cee7ba418c2e71398690b46a7415c9a6708a04757f0cdc9e91c4f9a084fad8668264c3360eb48249b19b601540dbca09546730e09eb208daacb8e8b688cd17f SHA512 011275b73df25a49e9810cabead8811d4c09fe20272c71e6208fb49b12ca59321d51c8dfb4fb32735c9e93c8ce7742122eea40fc14228904abb1447ef4d0f600
+DIST qarma-1.0.0.tar.gz 28288 BLAKE2B 6e9bb0d81fb0ba85f2cd0d1fa3a509f95da87dfe88b1f3a4a4fa9031394820fae212557555b96033eaa7f8940aa6f15acae32dbd1dd7f46649bd398bd07b33f4 SHA512 64b81b4401752bc76a6b04ec5f87eed7910c355006e7c15cd2cc5a4bb770b0b39f6ddcaba451ec1164bd3ef160dc852e287185a560e82a4b1453549429b80ab1
diff --git a/x11-misc/qarma/qarma-1.0.0-r1.ebuild b/x11-misc/qarma/qarma-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..5a482f344b01
--- /dev/null
+++ b/x11-misc/qarma/qarma-1.0.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+DESCRIPTION="Zenity Clone for Qt"
+HOMEPAGE="https://github.com/luebking/qarma"
+SRC_URI="https://github.com/luebking/qarma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-qt/qtbase:6[X,dbus,gui,widgets]"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	eqmake6
+}
+
+src_install() {
+	dobin qarma
+}
diff --git a/x11-misc/qarma/qarma-1.ebuild b/x11-misc/qarma/qarma-1.ebuild
deleted file mode 100644
index 941c13cbebca..000000000000
--- a/x11-misc/qarma/qarma-1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="Zenity Clone for Qt5"
-HOMEPAGE="https://github.com/luebking/qarma"
-SRC_URI="https://github.com/luebking/qarma/archive/t${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-t${PV}"
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	dobin qarma
-}
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 713f330e8fd6..5049c4406197 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,2 +1,4 @@
 DIST rofi-1.7.5.tar.xz 772952 BLAKE2B 54511f4f793f3ba0b58294daa1d2974228904a637d13d729b0b7d974c0ebf8d0d98514705212bd42500fe90b0685a3515dc67793baa95baefe6dfc0ecdee83c7 SHA512 84cbb8ccef14fdb5d68062b17245fbcb0e9bab46534eb6c7ce532750b86fb33ce6e43ed24cf3c65e553d15b23a201c9168d97d257da4dddeddb0a7c44dd59cc0
 DIST rofi-1.7.6.tar.xz 812496 BLAKE2B 18728bde962a1082927c87c19e00356206632430975f8718f2d961966047026a2cb1266ed868f4510fbe127e7f3e3cae1308a9da69fe46609f78dbc0e8394d2f SHA512 9e2d39abd3dbd7703646e6c0f16383da8f1ec26b911817f574f388cd019c9440fca26100d2de14883c30e74f6c1c451722777dbeee1d2551fc64d78d60fa3023
+DIST rofi-1.7.7.tar.xz 812568 BLAKE2B b5b341d13f2d8609994e9b138722ce6af3896394b60a6734e90ac50cd7921704dcacd3fcbdbc3c1ce4632df1995f7abc1c6399371a483721424181bb9a7b9a69 SHA512 8286bc5f33ab4eb93677b24815730f159347a1e545ff109784fe161eeb4500c4fd4307c7894adb2060d6bef5137c9d6506a71c565e2676be230e5ad740bed9d0
+DIST rofi-1.7.8.tar.xz 812732 BLAKE2B 8f6ecf0ff9db4ccadcf8814ae014e0a1041a2494d934214bd9f22487ff9c73f35ec1a6c7ead8f764a0ac64d248260b550effec1102acb0e8e757e8c6a270241f SHA512 8a33f5eb933cbba645056eeba3b82e236135e5a72251bd5bb3e6019e66e5626b126572f6874f5e39e381bb5108f261d4c80bb945ed0900c2179854d475d6518b
diff --git a/x11-misc/rofi/metadata.xml b/x11-misc/rofi/metadata.xml
index 76403db3f6b0..8e8eedee6d0a 100644
--- a/x11-misc/rofi/metadata.xml
+++ b/x11-misc/rofi/metadata.xml
@@ -11,5 +11,7 @@
 	</use>
 	<upstream>
 		<remote-id type="github">davatorium/rofi</remote-id>
+		<changelog>https://github.com/davatorium/rofi/releases</changelog>
+		<bugs-to>https://github.com/davatorium/rofi/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/rofi/rofi-1.7.7.ebuild b/x11-misc/rofi/rofi-1.7.7.ebuild
new file mode 100644
index 000000000000..99c15ca7964b
--- /dev/null
+++ b/x11-misc/rofi/rofi-1.7.7.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson toolchain-funcs xdg-utils
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://github.com/davatorium/rofi"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/davatorium/rofi"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+drun test +windowmode"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	sys-devel/bison
+	>=sys-devel/flex-2.5.39
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/glib-2.72:2
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libxcb:=
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-wm
+	x11-misc/xkeyboard-config
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/xcb-util-keysyms
+	test? ( >=dev-libs/check-0.11 )
+"
+
+DOCS=(
+	AUTHORS
+	Changelog
+	Examples/
+	README.md
+)
+
+src_configure() {
+	# Doesn't work with reflex, bug #887049
+	export LEX=flex
+
+	# Requires bison, see https://bugs.gentoo.org/894634.
+	unset YACC
+
+	tc-export CC
+
+	local emesonargs=(
+		$(meson_use drun)
+		$(meson_use windowmode window)
+		$(meson_feature test check)
+	   -Dimdkit=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/rofi/rofi-1.7.8.ebuild b/x11-misc/rofi/rofi-1.7.8.ebuild
new file mode 100644
index 000000000000..99c15ca7964b
--- /dev/null
+++ b/x11-misc/rofi/rofi-1.7.8.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson toolchain-funcs xdg-utils
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://github.com/davatorium/rofi"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/davatorium/rofi"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+drun test +windowmode"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	sys-devel/bison
+	>=sys-devel/flex-2.5.39
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/glib-2.72:2
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libxcb:=
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-wm
+	x11-misc/xkeyboard-config
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/xcb-util-keysyms
+	test? ( >=dev-libs/check-0.11 )
+"
+
+DOCS=(
+	AUTHORS
+	Changelog
+	Examples/
+	README.md
+)
+
+src_configure() {
+	# Doesn't work with reflex, bug #887049
+	export LEX=flex
+
+	# Requires bison, see https://bugs.gentoo.org/894634.
+	unset YACC
+
+	tc-export CC
+
+	local emesonargs=(
+		$(meson_use drun)
+		$(meson_use windowmode window)
+		$(meson_feature test check)
+	   -Dimdkit=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch b/x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch
deleted file mode 100644
index 93430da89b88..000000000000
--- a/x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 043d9c5018431b3b41cc2bcfacdaaa7f0db1563c Mon Sep 17 00:00:00 2001
-From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
-Date: Thu, 9 Nov 2023 12:14:13 -0400
-Subject: [PATCH] Fix with python3.12
-
-imp is deprecated in 3.4 and removed in 3.12. this caused safe eyes to
-break on upgrading to fedora 39
-
-Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
----
- safeeyes/utility.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/safeeyes/utility.py b/safeeyes/utility.py
-index e145d4d..3976140 100644
---- a/safeeyes/utility.py
-+++ b/safeeyes/utility.py
-@@ -21,7 +21,6 @@
- """
- 
- import errno
--import imp
- import inspect
- import importlib
- import json
-@@ -355,7 +354,7 @@ def module_exist(module):
-     Check wther the given Python module exists or not.
-     """
-     try:
--        imp.find_module(module)
-+        importlib.util.find_spec(module)
-         return True
-     except ImportError:
-         return False
diff --git a/x11-misc/sddm/sddm-0.21.0_p20240723-r10.ebuild b/x11-misc/sddm/sddm-0.21.0_p20240723-r10.ebuild
index 7024c639d357..37d61531c354 100644
--- a/x11-misc/sddm/sddm-0.21.0_p20240723-r10.ebuild
+++ b/x11-misc/sddm/sddm-0.21.0_p20240723-r10.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 @@ else
 	COMMIT=4ec29a8bba033d475f197693fac6cb0c383a1da2
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 QTMIN=6.7.2
diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r6.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r6.ebuild
deleted file mode 100644
index fc0c96334ecd..000000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.2.1-r6.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-if [[ ${PV} == *_p* ]] ; then
-	MY_COMMIT="d4f00e1d803038af4f245949d8c747a384117852"
-	SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2"
-	S="${WORKDIR}"/xdg-utils-${MY_COMMIT}
-else
-	SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-	S="${WORKDIR}"/${PN}-v${PV}
-fi
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc gnome plasma X"
-REQUIRED_USE="gnome? ( dbus )"
-
-RDEPEND="
-	dev-perl/File-MimeInfo
-	dev-util/desktop-file-utils
-	x11-misc/shared-mime-info
-	dbus? (
-		sys-apps/dbus
-		gnome? (
-			dev-perl/Net-DBus
-			dev-perl/X11-Protocol
-		)
-	)
-	plasma? (
-		virtual/pkgconfig
-	)
-	X? (
-		x11-apps/xprop
-		x11-apps/xset
-	)
-"
-PDEPEND="
-	plasma? (
-		|| (
-			(
-				kde-frameworks/kservice:6
-				dev-qt/qtbase:6
-			)
-			(
-				kde-frameworks/kservice:5
-				dev-qt/qtpaths:5
-			)
-		)
-	)
-"
-BDEPEND="
-	app-alternatives/awk
-	>=app-text/xmlto-0.0.28-r3[text(+)]
-"
-
-# Tests run random system programs, including interactive programs
-# that block forever
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-xdg-mime-default.patch
-	"${FILESDIR}"/${PN}-1.2.1-qtpaths.patch
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == *_p* ]] ; then
-		# If you choose to do git snapshot instead of patchset, you need to remember
-		# to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
-		# all the files
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
-	default
-	emake -C scripts scripts-clean
-}
-
-src_install() {
-	default
-
-	dodoc RELEASE_NOTES
-
-	newdoc scripts/xsl/README README.xsl
-	use doc && dodoc -r scripts/html
-
-	# Install default XDG_DATA_DIRS, bug #264647
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local || die
-	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local || die
-	doenvd 30xdg-data-local
-
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base || die
-	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base || die
-	doenvd 90xdg-data-base
-}
-
-pkg_postinst() {
-	[[ -x $(type -P gtk-update-icon-cache) ]] \
-		|| elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command."
-}
diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r8.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r8.ebuild
new file mode 100644
index 000000000000..87f50b61f5c2
--- /dev/null
+++ b/x11-misc/xdg-utils/xdg-utils-1.2.1-r8.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
+if [[ ${PV} == *_p* ]] ; then
+	MY_COMMIT="d4f00e1d803038af4f245949d8c747a384117852"
+	SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2"
+	S="${WORKDIR}"/xdg-utils-${MY_COMMIT}
+else
+	SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+	S="${WORKDIR}"/${PN}-v${PV}
+fi
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="dbus doc gnome perl plasma X"
+REQUIRED_USE="gnome? ( dbus )"
+
+# dev-perl/File-MimeInfo: mimeopen used by xdg-open
+RDEPEND="
+	dev-util/desktop-file-utils
+	x11-misc/shared-mime-info
+	dbus? (
+		sys-apps/dbus
+		gnome? (
+			dev-perl/Net-DBus
+			dev-perl/X11-Protocol
+		)
+	)
+	perl? ( dev-perl/File-MimeInfo )
+	plasma? (
+		virtual/pkgconfig
+	)
+	X? (
+		x11-apps/xprop
+		x11-apps/xset
+	)
+"
+PDEPEND="
+	plasma? (
+		kde-plasma/kde-cli-tools:*
+		|| (
+			(
+				kde-frameworks/kservice:6
+				dev-qt/qtbase:6
+			)
+			(
+				kde-frameworks/kservice:5
+				dev-qt/qtpaths:5
+			)
+		)
+	)
+"
+BDEPEND="
+	app-alternatives/awk
+	>=app-text/xmlto-0.0.28-r3[text(+)]
+"
+
+# Tests run random system programs, including interactive programs
+# that block forever
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-xdg-mime-default.patch
+	"${FILESDIR}"/${PN}-1.2.1-qtpaths.patch
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == *_p* ]] ; then
+		# If you choose to do git snapshot instead of patchset, you need to remember
+		# to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
+		# all the files
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
+	default
+	emake -C scripts scripts-clean
+}
+
+src_install() {
+	default
+
+	dodoc RELEASE_NOTES
+
+	newdoc scripts/xsl/README README.xsl
+	use doc && dodoc -r scripts/html
+
+	# Install default XDG_DATA_DIRS, bug #264647
+	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local || die
+	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local || die
+	doenvd 30xdg-data-local
+
+	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base || die
+	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base || die
+	doenvd 90xdg-data-base
+}
+
+pkg_postinst() {
+	[[ -x $(type -P gtk-update-icon-cache) ]] \
+		|| elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command."
+}
diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest
index 1cbda4530a73..afd30a40e4c5 100644
--- a/x11-misc/xtermcontrol/Manifest
+++ b/x11-misc/xtermcontrol/Manifest
@@ -1 +1,2 @@
+DIST xtermcontrol-3.10.tar.gz 187902 BLAKE2B 781ae40aa17cc57e9ac52544e1d04282a04024a489881577bbbcb782155612f9504eb58d4e80050535ac286180327a1469c5049d701f431d3f93557e5c29d509 SHA512 a7d4b3d5e7f9e7cd0c7a85c11584528d73507d258d3c48b832e2f842c88967d40a867c4ea75503dfd5288949992a6f6ead2a9fd73e9695c490e2935a133a92d2
 DIST xtermcontrol-3.8.tar.gz 181399 BLAKE2B b65acd8ecdf6e0293fcd856cd05f7a3c2eaf868f6f7e0ea34829fbfece4e2a17c2085042e6eeb50a20504200db754badde8ffba0305358547d5f65cf18df564c SHA512 9dacddc57c31705d00f52753f906cd83ae4b7ae34ff2e712869becc452535dbce9fb3e0e9aaf689b55edd34889d9e37553e3702c26ccbd136f544016fcfedbf1
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.10.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.10.ebuild
new file mode 100644
index 000000000000..8b73bc9ddfb4
--- /dev/null
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.10.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="xtermcontrol enables dynamic control of XFree86 xterm properties"
+HOMEPAGE="https://www.thrysoee.dk/xtermcontrol/"
+SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.15.2.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.15.2.ebuild
index bc327aa6a916..a35f7168d893 100644
--- a/x11-misc/xvfb-run/xvfb-run-21.1.15.2.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-21.1.15.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
@@ -13,7 +13,7 @@ S="${WORKDIR}"/
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 
 BDEPEND="dev-util/patchutils"
 RDEPEND="x11-apps/xauth
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 810472407ad9..9342ffc74391 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1 +1,2 @@
 DIST zim-0.75.2.tar.gz 3257345 BLAKE2B 452716cbc6c149645c5146d8fcef2449c7c316ac57da9870dbe26b9fec13b6827a6368295277dc3b2b7a7874a7c930da27612a8e8e00b295ae9ecb3942d0e65b SHA512 ea6f361047690dfb314a3510d34880a4831d142c94fc0ca08e1c29869fd42d5fd1182c47edc241edeb512fed601a474af6d9970f819e8a8b67135c7589ae461a
+DIST zim-0.76.0.tar.gz 3363266 BLAKE2B 36a34965ede3f544926bba515e66fdf6e1fbb211ecba96eaf9778f3e52cc6bacee5f03c91aadf0c4290f27b96e93fae450c3563c78be443e12aee84a5e0c65cb SHA512 f8504d936db7335a7f31c011b710e785ee58d2c9321e12dbd15848a4326ac24df7bc8069c4d2c8d07c2f537a694d9cf48be7acd36ab8a60b9ba35b4f3e094f8e
diff --git a/x11-misc/zim/zim-0.76.0.ebuild b/x11-misc/zim/zim-0.76.0.ebuild
new file mode 100644
index 000000000000..bc5254db5c21
--- /dev/null
+++ b/x11-misc/zim/zim-0.76.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..13} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+VIRTUALX_REQUIRED=test
+inherit distutils-r1 optfeature virtualx xdg
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="
+	https://zim-wiki.org/
+	https://github.com/zim-desktop-wiki/zim-desktop-wiki
+"
+SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	')
+	x11-libs/gtk+:3[introspection]
+	x11-misc/xdg-utils
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+
+python_prepare_all() {
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+	export XDG_RUNTIME_DIR=fakethis
+}
+
+python_compile() {
+	sed -e "s#./build#${BUILD_DIR}/build#" -i setup.py || die
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	if has_version dev-vcs/git; then
+		git config --global user.email "git@example.com" || die
+		git config --global user.name "GitExample" || die
+	fi
+
+	virtx ./test.py
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	insinto /usr/share/icons
+	doins -r xdg/hicolor
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "Spell checker" app-text/gtkspell[introspection]
+	optfeature "GNU R Plot Editor" dev-lang/R
+	optfeature "Version control Bazaar support" dev-vcs/breezy
+	optfeature "Diagram Editor" media-gfx/graphviz
+	optfeature "Insert Screenshot" "media-gfx/imagemagick media-gfx/scrot"
+	optfeature "Score Editor" media-sound/lilypond
+	optfeature "Gnuplot Editor" sci-visualization/gnuplot
+	optfeature "Equation Editor" virtual/latex-base app-text/dvipng
+}
diff --git a/x11-plugins/wmbinclock/Manifest b/x11-plugins/wmbinclock/Manifest
index efc0adc2e99b..c6a74a55cae8 100644
--- a/x11-plugins/wmbinclock/Manifest
+++ b/x11-plugins/wmbinclock/Manifest
@@ -1,2 +1 @@
-DIST wmbinclock-0.5.tar.bz2 15909 BLAKE2B 71a5e53fea8f042bd8e01c0a8dde9057b22e398a4d483b556221d8344b5542f097e835f0d4eafd7cf24964b4b08f04f844c476cddc443ebc8f469e8fbb5142ec SHA512 f0f1f46b19e9c34f9168e03df2d4be2f9c7a73b09dd8247a7bc977309a3354069adf34032f3c0106aa763fe259993176edd84b029941191d05a11505e27de695
 DIST wmbinclock-0.51.tar.gz 11501 BLAKE2B f727a9497a452525bf08daf1a30e8485ca85777a0b938c45634a779cd1adb92afd172ec9455b46e832761d8a45df7a57a4bd93ebbeaa4637da5edb6087f7e30c SHA512 343ac121c93801d69beeef6b4e5ca52020229f61ac723de9b7ee7bea3fb50c51d793b217f848ba9672eb97ec1b70629186e29c27f907798af9d33d5a4faea069
diff --git a/x11-plugins/wmbinclock/files/wmbinclock-0.5-gcc-14.patch b/x11-plugins/wmbinclock/files/wmbinclock-0.5-gcc-14.patch
new file mode 100644
index 000000000000..80e8b99dbf54
--- /dev/null
+++ b/x11-plugins/wmbinclock/files/wmbinclock-0.5-gcc-14.patch
@@ -0,0 +1,77 @@
+https://bugs.gentoo.org/877109
+fix type confusion
+also add fix glib feature macro for usleep
+diff -ru a/wmBinClock.c b/wmBinClock.c
+--- a/wmBinClock.c	2025-01-05 11:53:41.163293987 +0400
++++ b/wmBinClock.c	2025-01-05 11:55:33.251648423 +0400
+@@ -6,6 +6,7 @@
+ * Copyright (C) 2015 - Thomas Kuiper <tkuiper at inxsoft.net> and Sune Molgaard <sune at molgaard.org> (BSD license)
+ */
+ 
++#define _DEFAULT_SOURCE
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+@@ -66,7 +67,7 @@
+ int             DisplayDepth;
+ GC NormalGC;
+ 
+-void IntToBinary(int x, int *str[]);
++void IntToBinary(int x, int str[]);
+ void PrintHelp(char err[]);
+ 
+ int main(int argc, char *argv[])
+@@ -667,7 +668,7 @@
+ 	    }
+ 
+ 	    tmp_hour = tmworld->tm_hour;
+-	    IntToBinary(tmp_hour, &tmp_str);
++	    IntToBinary(tmp_hour, tmp_str);
+ 
+ 	    for (s = 0; s < 6; s++)
+ 	    {
+@@ -678,7 +679,7 @@
+ 	    }
+ 
+ 	    tmp_minute = tmworld->tm_min;
+-	    IntToBinary(tmp_minute, &tmp_str);
++	    IntToBinary(tmp_minute, tmp_str);
+ 	    for (s = 0; s < 6; s++)
+ 	    {
+ 		if (tmp_str[s] == 1)
+@@ -688,7 +689,7 @@
+ 	    }
+ 	
+ 	    tmp_second = tmworld->tm_sec;
+-	    IntToBinary(tmp_second, &tmp_str);
++	    IntToBinary(tmp_second, tmp_str);
+ 	    
+ 	    for (s = 0; s < 6; s++)
+ 	    {
+@@ -699,7 +700,7 @@
+ 	    }
+ 	    
+ 	    tmp_day = tmworld->tm_mday;
+-	    IntToBinary(tmp_day, &tmp_str);
++	    IntToBinary(tmp_day, tmp_str);
+ 	    
+ 	    for (s = 0; s < 6; s++)
+ 	    {
+@@ -710,7 +711,7 @@
+ 	    }
+ 
+ 	    tmp_month = tmworld->tm_mon + 1;
+-	    IntToBinary(tmp_month, &tmp_str);
++	    IntToBinary(tmp_month, tmp_str);
+ 	    
+ 	    for (s = 0; s < 6; s++)
+ 	    {
+@@ -780,7 +781,7 @@
+ 	usleep(DELAY);
+     }
+ }
+-void IntToBinary(int x, int *str[])
++void IntToBinary(int x, int str[])
+ {
+     int i = 0;
+     int counter = 0;
diff --git a/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild b/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild
deleted file mode 100644
index f74bf755749f..000000000000
--- a/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="a nifty little binary clock dockapp"
-HOMEPAGE="https://www.dockapps.net/wmbinclock"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
-		INCDIR="-I/usr/include/X11" LIBDIR="" \
-		SYSTEM="${LDFLAGS}"
-}
-
-src_install() {
-	dobin wmBinClock
-	dosym wmBinClock /usr/bin/${PN}
-	dodoc CHANGELOG README
-}
diff --git a/x11-plugins/wmbinclock/wmbinclock-0.51-r1.ebuild b/x11-plugins/wmbinclock/wmbinclock-0.51-r1.ebuild
new file mode 100644
index 000000000000..f95e8c142994
--- /dev/null
+++ b/x11-plugins/wmbinclock/wmbinclock-0.51-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="a nifty little binary clock dockapp"
+HOMEPAGE="https://www.dockapps.net/wmbinclock"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5-gcc-10.patch
+	"${FILESDIR}"/${PN}-0.5-gcc-14.patch
+)
+DOCS=( CHANGELOG README.md )
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
+		INCDIR="-I/usr/include/X11" LIBDIR="" \
+		SYSTEM="${LDFLAGS}"
+}
+
+src_install() {
+	dobin wmBinClock
+	einstalldocs
+}
diff --git a/x11-plugins/wminet/files/wminet-3.0.0-missing-include.patch b/x11-plugins/wminet/files/wminet-3.0.0-missing-include.patch
new file mode 100644
index 000000000000..1857a8feb3ea
--- /dev/null
+++ b/x11-plugins/wminet/files/wminet-3.0.0-missing-include.patch
@@ -0,0 +1,11 @@
+for toupper(), implicit function declaration
+--- a/src/wminet.c
++++ b/src/wminet.c
+@@ -20,6 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <ctype.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <signal.h>
diff --git a/x11-plugins/wminet/wminet-3.0.0-r3.ebuild b/x11-plugins/wminet/wminet-3.0.0-r3.ebuild
new file mode 100644
index 000000000000..87c681b7942f
--- /dev/null
+++ b/x11-plugins/wminet/wminet-3.0.0-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs autotools
+
+DESCRIPTION="dockapp for monitoring internet connections to and from your computer"
+HOMEPAGE="https://www.improbability.net/#wminet"
+SRC_URI="https://www.improbability.net/wmdock//${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-list.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-missing-include.patch
+	)
+
+DOCS=( AUTHORS ChangeLog NEWS README wminetrc )
+
+src_prepare() {
+	default
+
+	# bug https://bugs.gentoo.org/875137
+	# bug https://bugs.gentoo.org/908912
+	eautoreconf
+}
+
+src_compile() {
+	tc-export CC
+	emake LDFLAGS="${LDFLAGS}"
+}
diff --git a/x11-plugins/wmsystray/files/wmsystray-0.1.1-implicit-function.patch b/x11-plugins/wmsystray/files/wmsystray-0.1.1-implicit-function.patch
new file mode 100644
index 000000000000..4496bb47df67
--- /dev/null
+++ b/x11-plugins/wmsystray/files/wmsystray-0.1.1-implicit-function.patch
@@ -0,0 +1,55 @@
+bug https://bugs.gentoo.org/876346
+diff -ru a/wmsystray/systray.h b/wmsystray/systray.h
+--- a/wmsystray/systray.h	2025-01-04 23:45:21.765262521 +0400
++++ b/wmsystray/systray.h	2025-01-04 23:48:21.590340299 +0400
+@@ -36,5 +36,7 @@
+ int event_is_systray_event(XEvent *ev);
+ int handle_systray_event(XEvent *ev);
+ void repaint_systray();
++struct systray_item *find_systray_item (Window id);
++int systray_property_update (struct systray_item *item);
+ 
+ #endif
+diff -ru a/wmsystray/ui.c b/wmsystray/ui.c
+--- a/wmsystray/ui.c	2025-01-04 23:45:21.765262521 +0400
++++ b/wmsystray/ui.c	2025-01-04 23:49:04.894118218 +0400
+@@ -10,6 +10,7 @@
+ 
+ #include <stdlib.h>
+ #include <signal.h>
++#include <unistd.h>
+ 
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+diff -ru a/wmsystray/ui.h b/wmsystray/ui.h
+--- a/wmsystray/ui.h	2025-01-04 23:45:21.766262516 +0400
++++ b/wmsystray/ui.h	2025-01-04 23:48:51.661186082 +0400
+@@ -24,5 +24,6 @@
+ extern Display *main_disp;
+ extern Window main_wind, icon_wind, sel_wind, draw_wind;
+ extern char * wmsystray_xpm[];
++void draw_ui_elements();
+ 
+ #endif
+--- a/xembed/xembed.c	2025-01-04 23:45:21.766262516 +0400
++++ b/xembed/xembed.c	2025-01-04 23:46:29.884913173 +0400
+@@ -2,6 +2,8 @@
+  xembed.c
+  ****************************************************************************/
+ 
++#include <string.h>
++
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include "xembed.h"
+diff -ru a/wmsystray/Makefile b/wmsystray/Makefile
+--- a/wmsystray/Makefile	2025-01-05 00:02:39.013943053 +0400
++++ b/wmsystray/Makefile	2025-01-05 00:07:41.053394062 +0400
+@@ -1,6 +1,6 @@
+ include ../Rules.make
+ 
+-CFLAGS = ${X11CFLAGS} -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -g ${EXTRACFLAGS}
++CFLAGS = ${X11CFLAGS} -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -g -D_POSIX_C_SOURCE=199309L -D_XOPEN_SOURCE=500 ${EXTRACFLAGS}
+ LDFLAGS = ${X11LDFLAGS} -lXpm
+ 
+ OBJS = main.o ui.o systray.o xpms.o
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1-r2.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1-r2.ebuild
new file mode 100644
index 000000000000..d6047f1b921c
--- /dev/null
+++ b/x11-plugins/wmsystray/wmsystray-0.1.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Window Maker dock app that provides a system tray for GNOME/KDE applications"
+HOMEPAGE="https://github.com/bbidulock/wmsystray"
+SRC_URI="https://github.com/bbidulock/wmsystray/releases/download/${PV}/${P}.tar.bz2"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-Makefile.patch"
+	"${FILESDIR}/${P}-gcc-3.4.patch"
+	"${FILESDIR}/${P}-return-type.patch"
+	"${FILESDIR}/${P}-implicit-function.patch"
+)
+
+DOCS=( README HACKING AUTHORS )
+
+src_prepare() {
+	default
+	# Fix parallel compilation
+	sed -ie "s/make EXTRACFLAGS/make \${MAKEOPTS} EXTRACFLAGS/" Makefile || die
+
+	# Honour Gentoo LDFLAGS, see bug #336296
+	sed -ie "s/-o wmsystray/${LDFLAGS} -o wmsystray/" wmsystray/Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" EXTRACFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}/${PN}
+	doman doc/${PN}.1
+	domenu "${FILESDIR}/${PN}.desktop"
+	einstalldocs
+}
diff --git a/x11-terms/alacritty/Manifest b/x11-terms/alacritty/Manifest
index 3b86f6ab8f35..e6f4fde7f441 100644
--- a/x11-terms/alacritty/Manifest
+++ b/x11-terms/alacritty/Manifest
@@ -1,33 +1,43 @@
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
+DIST adler2-2.0.0.crate 13529 BLAKE2B ec575b0bf12e321399ac3a1d59fce4ddbeabcc60cb3d7c2f362cce23eb29b4ea836451372d6d88552a4435ae29bb41d6230d55f625a4359eace680b9b771d0ad SHA512 12d12579ad617cf1a94cf95ab9d3f5db566c3b2de4bd5735eccd83c668fdad0eff134c996b73c46cbb9f932837682043878b8cc4764191625e9f93ccffcce423
 DIST ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d
 DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c
 DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
 DIST alacritty-0.12.3.tar.gz 1494086 BLAKE2B 7947c880c6eefa41c5e2cc54f7f46a17a57c61d51224d44d6521d81c34d972b89a902a661b5fffb2a63281ca1850ea2ca78e600ef760d7bd33d0db4f14d995cc SHA512 9e3b35d0df0b357ef33ba49a918d6a6e0885a82bfec3a1d5b57784ab0102fa97fcdee5a79f6cf0e9fc3278a4bee5d9ee44a595625c0caf8b76491261eaa4561e
 DIST alacritty-0.13.2.tar.gz 1636908 BLAKE2B 818c9e9294ba06491a7c2cc4fcb6e7127a75cc777800724e6c71d6020013ec0c7164538ec7cf9295f49812e255ff5fad80ad346ddbcf95df6f43de54e499144d SHA512 945ed27355bf16b0ce78be26a6a525104a7db9160590fa3dc7769d4e9b3db5d3cfd5e6a2a4f95364c95c132a3ea545b6b72286130c3d2fcfd1400042dd2bbe5c
 DIST alacritty-0.14.0.tar.gz 1643797 BLAKE2B 3e496e77f6c94ae2c4a047f916e7a8711d319044cc123e6ea133be2d8b2525d190e73fa7fe5eadf18542827c7b77728783a06a58972e46a744f13d1a3ffd2f94 SHA512 3001ca78b3f4b2a22076cb701108b77263962c1f4cb50a17219dfb0165d11a1f7b4e879af0358c1c7a5cca7949951169127e45603cfb74e932f14f2299f76962
+DIST alacritty-0.15.0.tar.gz 1644528 BLAKE2B c4cb4f8eade9ed57970b595b6c0a4c0f896fa6c0f1df7ad3f74606f12846f6f0493b0cbecbb321f2b78ad58ac13551ddaec102b9ef49f6aac1f63f644547262c SHA512 a4cb13a3d280fad8b803b1c41c314bf946d935b6725ef26405a48472f4d2c93e2ae5820720437b0e6387d7c78e96bfa09c910775bc400e7fbda412b62b72c84d
 DIST android-activity-0.4.0.crate 235580 BLAKE2B 20740b4da158ce347c08c50f5a8c307ec159acd78399c781d10ea164ba4bc09e19595fff8c45e6b0f7ac4d58e23341d3a338cacca8a6ce824a2df779247a8b35 SHA512 50beaa5353ccece025d913898a070122e7680f8f50e7cc3ee7e23ab972244a0f7623ca34639dad8313f4b62e530c1e2b00ae65a7f84ff5a14e619975339fcca1
 DIST android-activity-0.5.2.crate 258406 BLAKE2B bebcddb062921b10915959704d1339c0d200843b887be4588010a359f8b46fba6dce94d4f87a37e006c01e66e6ec061f33f4aaaf32ff616fdd2f52d2d0287b2b SHA512 281f2c3afaaa80d71f5aa6b531aae8e551897bb10c70da40787ee03ff194129da0df79f2e14d5432c9eb4a92c6227a1f9e1a3bd12e7060bbcae85fef177c009f
 DIST android-activity-0.6.0.crate 258597 BLAKE2B 6036c801a6a7a419257c0cb8a5daa7f3813ef3920cb0e5e279eaaafe4bab55f99da806c6156982e9262e9c5771e954a085a4ad939cf76a61c0ee586223c2ad13 SHA512 24c4fb0b8985df8927bac994a22ac6ebabc4c2f3f5c509769146c517d05750f7457cb056d954fba1e5cb638e349744379adc870d1d5e44370ffaae026a05a7e6
 DIST android-properties-0.2.2.crate 4563 BLAKE2B 00634bbee4d6dcd3254ee37dd7e5560963b35700aa95c47c84c129f0774cbac436347f0abdaa4ec33216358d9f079559552bd5a95de5026b7dba4e04d9cd674b SHA512 dae9a12ffa7d5fbabc28d3ddcc32f1b5300884cf2b3ef2e123f2dea596b3a796b9c3cb6c5381bf8f6caf04a633c5f2f0b56804fed8fb2a6f06c36d6c76539431
 DIST anstream-0.6.13.crate 30928 BLAKE2B 0c6d0932dc486ccbe8d7e6f97bd8aae03fb84d4db90d0488070b7109de673e0af845a70a39e546af87f71f4c7f7bb159ab8ed68ac0f03a0297457062d9d69dc0 SHA512 4f9ccfd135de9be22a01230f39d571c8d8ccf7c3eba837fbf0868c9660693b60ee0c1c2f9490a587d5307e892ed45cb946da7a0690a9f972619c94fb050bde09
 DIST anstream-0.6.14.crate 29160 BLAKE2B 1120895a51ed7a285c5d5a03d2f7e26dc956d95f39cf500ba9f547d71a62ed0326f519860ddcf8db77cb09e9119e914a62693369eca51cbf9c01ef874ade9112 SHA512 65ece20958e3fb1ed4a5ff1d45f5bfdcb942c64994a3d14eefb0dfd5b04f433f6e1b06ebff240c67ed8ff7cc01d93ca0acf8c8ea29cb41309c6c882e7c192b34
+DIST anstream-0.6.18.crate 29681 BLAKE2B b6f72cda084b38f1e1cfe60de2562e8d62ebbc352176bdf668a2d6be09349bec46d291cd475e8af814ce66def44d95cb98c325761150130752284a82d8a84f21 SHA512 5149977d6f7b5e9cf6350f1ef130caa3ff46c7e78976358452a185ce196cdd77fee48a3a9838f434ae6ea9c15b19f6bfbab156edf819f81179d6774318f08963
+DIST anstyle-1.0.10.crate 15725 BLAKE2B 36e656bd8f9c584f11fda5cfe0c2e24e8426b9e1b602aad34ed118ae6950a55440e292d2e0ff7615f5e4f466fd06f07536be198a59506a587d40cb0c4ede4f80 SHA512 621e7a89fad13db985f07375d316cf8efba57fd44ae18628a8049a65aefbaef27949f99317872e91e0922bb089a00234055199ea3167f80ae03d00ada4f75dea
 DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa
 DIST anstyle-1.0.7.crate 15709 BLAKE2B 872e0ed09e7e94c6f6b812349e39f949aff4d7cbb87744ab26fe49f57a7d330e0f79447213374f7f862ea276aab2dd1077dc8df3f7c5f34079ef30c4d17eeeba SHA512 e20d49f7d148e03f7b127be7802e0b6b7a2b05720614d46c2ade5e440ce322b44ddd3a9239b897886faa03ed1cb30f947ee27d3811fa83dffba10b3975eba7ed
 DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399
 DIST anstyle-parse-0.2.4.crate 23069 BLAKE2B e80bd81e351326a222238b3f559020a2430ac37293e61b6b6309b37bbb8bdb78ec11ca9c0fd270098af5e5ffb2f5660cfbfda949d20fd2efd336ed1c143215b2 SHA512 c1dac475df77d090a4d2041ba40ff418abe66e93e4ddda54653bf024fb4995e431166684343509a2337bc813fe06f362d3df8a1d7d05d177cec1a488bcb9942a
+DIST anstyle-parse-0.2.6.crate 22343 BLAKE2B 85eba405dc5cf806283cf442984e86583dfe6c681f849eb7a347b7b67bd2b6f692e84fc9b5bd86486633cb2f05960ec16e8778300df114ae6676da43442db9bb SHA512 e28c9818afcda0e9b84c205d9c6697ce64cb06c21df2c3666869c07d66893105d9c5e96a27fcf2410a09f6af00735252e22b5c7d8c6cb3f68c4a8f376c49d396
 DIST anstyle-query-1.0.0.crate 8620 BLAKE2B 2d296b5066fd6284a2410923215571e6df650c5ef892d6de7a7088a0996ca30608797feabc84f3c325ff4d07001dac80ac5067d2a9c9d15d9ba59a276b399f53 SHA512 2781be5c82293b7ae338ec5046fbeb130de9eb2dbf2e4dfaa73ca5233032e1e52c133e141b02f33d4bc36d996a0a3f680ac82d42d614a5305005f60547133c7a
 DIST anstyle-query-1.1.0.crate 9832 BLAKE2B de106e289c874bca806214e275647415bdd02e2878f3a80e7d337cfbcdb755d8c182b2879371f00f5cad97cdf68224ac11ca41cc89ad7ab3929f854a9f9e76a6 SHA512 321ddfa7b090142116c96bc8c70d81cec3e816922249ae0f07389e2d1b62c8b40636675ccfdfd23d52e29c162ae7d929637dfc7d697dafb79e596d04eb8cd90b
+DIST anstyle-query-1.1.2.crate 9969 BLAKE2B 179b8dd6dd709c2ca67f4eb5c9a502b2867cb6744a39f824c4fdebedc67c6c3e07d107c7d817e2ffb589d13b7ed4900cf9653ddc0a43663217042ee92ce8c9da SHA512 26069d936c4b1fb09bc65cda0253fe9be8fa4e96c0821f980c772602b4e9230035ec8c9d092ef95e0a0354ac559f8d25f57a14c34086d4d241b5fba688951837
 DIST anstyle-wincon-3.0.1.crate 11279 BLAKE2B 593de9443b4c612526550285a6c156db26a233815e77a748597c6eea509ae511f41eb8ee736010f8be853695c9f1d94b034a77190e612f0a00bf00385d66ced2 SHA512 75ab14081b09e031ee0f559538976f39092aaeb6f561a56de83d12911cc2b45e28eec21068792c86a61e344021921ab55e7139ca79acec78e7d4a796dfa42a2e
 DIST anstyle-wincon-3.0.3.crate 12179 BLAKE2B 37793975a05ad60bb2b670c208db11c5cda8a2a456242cd118748709d0a220b541b6f088676eccd19870cfb8f910d4aa1e7764393785a6db0531af4a3ffc8047 SHA512 55217c65fc9ec674e5b4dd70716a221bd108b507dce9baaeb542f0e0a47027ec7fe61f9cd3cccfda43e4a4cd785b42f13400daf89884c32d3768e48bdff2d179
+DIST anstyle-wincon-3.0.6.crate 12271 BLAKE2B d9f4d9d46fa93a1168ca340562681718be852ffa94e30c9ea208af53af9d6697ca84921837a325ddc36681caab2b866b7f574901c80b5c0d862dcb765b81b68b SHA512 59ec6f5a53bd68b6344d82e923eb8c45ddac481dd0d270a7b452dc5b0540ee1656705697c1508942ecc131e7c075248c85d8f4159f27d97ea94f22469ce2eeb5
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayref-0.3.7.crate 9620 BLAKE2B 69d25ca9c15c188ca954a862f320869a448a5d8ed5765a6fc26309abb030e1d846d12800d960c8a97aa3ab422e8d2b883bd154781ed219a858e02b20cc803613 SHA512 dcf1c7de6d1d4b921e26a39cd70070bd460cd27f0a38be9099e41fc8b05fb60ba4f9aa91f92401cdcd0847bad08bffa7db4dca8d7cc84a3c8a1416d1758838ce
+DIST arrayref-0.3.9.crate 9186 BLAKE2B 8d7443944c81bf849fbb8a4e09ee379134c173decc712c6fafe483fb1545fba1f7f735979e5e26976502284502b5c7046f0b6aad59f8731a4ac8e1a51929c979 SHA512 f97e33e7fd65a8e908c21ab918350f71f12d49783162b90c5618660217b36516c39750b292a1248125f12429e4e00af9ff20c3846be81175946b8541d96ee606
 DIST arrayvec-0.7.2.crate 29341 BLAKE2B eae9d3f494033ea2d837a6024cb24bd4574683ed1e76ac6be7f7c6b0d8ee65c0eaf03dbae7fea04cf0921299f69234ad91e1cf41342de86f554f74e287dd3ba1 SHA512 80cc6e55b6032f4882362813de970d3d99e600ada774b28ac6a24c9c8e018fda3b35c5750ac3a09fca6fb9496e2e3fe608b58d21b1b84685ebd170f567a0ecbc
 DIST arrayvec-0.7.4.crate 29856 BLAKE2B 81ffac1db340e919618351819def3880ab1ef70d0acc47d680f15298eb749bcbc3bf7944ba14159be46b1e734c91b4c0f8cbaf774fd864c17caa3c9fb1fc2e9b SHA512 91e8f70330c515c966d78ae235e890594f9607381ac738a2c3586b53f01411e98d1687494f39ccc365948ae60497df3dfb2be18e26ab7e69bc0966b6c250e1ac
+DIST arrayvec-0.7.6.crate 31237 BLAKE2B b9d1df7e3ec47d434a2606fe9540e37e02351873b376a4e113b54461288e9ab20e02285eed5c4bc0f052ec4d6b3c804044413490ea706c31a852624b03bde7bb SHA512 b1f320746018a7f32340a833420089446ec5cefb7f299b4506eab7423d5db49f00b72d8aa8c6600f9159b9480d5eb3ce69407d93f5c9934147860c83e4d6eca8
 DIST as-raw-xcb-connection-1.0.1.crate 6460 BLAKE2B 678c4c28852bddfb8ec9660742370e480df6cc379bd7d653e12fa00aa99b598d9e5519e15c33e59fbbf43d260fd01856129ad4e9e8dab28af6e043e3ea651fa0 SHA512 79afaab72e5a5af2e70b1b66deed1dcec5b40a4a47516bee4845684c0cb8afcb2f141af0bd4034e7fb76e57a0c7e7778c3deed2e73ab780915e04e3604fb9a98
 DIST atomic-waker-1.1.2.crate 12422 BLAKE2B fc6632f3c9d719b1d24a1c8e05947d94028909d1c629b80576e176e567636dd4cca699c7e91cae2df63541da574146b3ce766374e93f0ee429bb5bc89a4d3cae SHA512 e07e58db7955791259d0ec00fc4d53318aefb4506e062914819c4220c6dc75fa11a7af0289b4653aa1f9041eb975a025635190de68b4800a0e91e33cdb0ba11c
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
+DIST autocfg-1.4.0.crate 17712 BLAKE2B 7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6 SHA512 3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST base64-0.22.0.crate 81568 BLAKE2B 55e6bf8888de846bc14010fd706686544a1706dc9cea034435b5bf97bbbfcdab57210e69b425c9f2adf7b088b6f2cbe0f8148077a8be3aad88114c404738682c SHA512 116928d2fed66b43ecc8ffb4e1cdafb1aec3005e0034e2cacf1cd3cac7a591aed8e423fb2523900c25a4592ada49d3a0e438703afe7bb66dd1ab9fcaade24000
 DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9763070e269b56a14b150cbfc4b7f599d4c2a0a5f783638170ee132f0796fefb14fcac7fd73c58db0791007a SHA512 91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20
@@ -46,8 +56,10 @@ DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4e
 DIST bytemuck-1.12.1.crate 38293 BLAKE2B f714ba0b4b0d693c5b26a3bcbe9de8c1496851a298bb70770e6284ed68caea61d7b8c14d67ed0e8b6d9146e76f791192fcfe11e897146203d5acf536b9721e67 SHA512 50626367364cf0cb33658f6cbb99675f1191ed3e7ad447bd7d2c24f360bd3524ebe1b2d1fcc7d78d1a0692408da8d95795b54efee91a87c55e8b54711a968790
 DIST bytemuck-1.15.0.crate 47672 BLAKE2B 49f2d92cfd5abfbe3fd94e7e4c9a3d4ac22c67b58e73947f461cf8e5022738b7d38c790de2a1717b731d658f1646066bee2f936a1575e2995e6de39d20f918b2 SHA512 5b6886f252945449c4546c181bbb6c95597e498aba6b1faf81c5a4af69bcb9e3e024d7d6e849d347682e8ca72ecaa9a70d13fb06c174e17846f0c85bb4810433
 DIST bytemuck-1.16.1.crate 48321 BLAKE2B ae8525a829a2c981200dfbc17de7f2a4e14fc6df71328c1a62b27dfa7488fdf634b4a6f45e65104bc45b828a91d3d0a70d06e9dd4c61dcba18db09204a22a6f2 SHA512 ba9e5eaae4d4d5ffd654da0359cdb5e85ad2d111b26a3b5147bae69519963ae3118ebe2afd34e92305cad3b3e573cd5aaf175c3bf81e94126f65ca3c9320b9dd
+DIST bytemuck-1.20.0.crate 50943 BLAKE2B 5a2f373961718e994650c5f4c02a3f0e41bc7382a5b05a4488474e2ea6b077db7f773a02b77bf9b9d5b5a6da53ea79e87861ea57d944735efd225d1ee8c08425 SHA512 5ab5917e650184720a751f310d8cd7502d183a0942d97922e0bac25f257762bbe07c09b1f8427e04669f0fe449d07bd66893593cf11846cb8ec6632cb7eb271f
 DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3
 DIST bytes-1.6.1.crate 60723 BLAKE2B a6f28770d1c42d7bb02964cafedc205c2730351cfca81520dbf62300284416a49e19c5d858dc37ba001d21846efb75d20977162a7e203e7171ef33868a720309 SHA512 4826cdba7a772b68f7352a3160a4c8ff93002110644c2e99537274cbb9776ba2f40ed8be9cde564f58b884c1985bdbce07cd7f5a46d34b48146ff51f317b5ab7
+DIST bytes-1.9.0.crate 67320 BLAKE2B d5a89fc1dced217bd78c6c50d0494308b69b0841506c4663b6df3755b91a9eedbd242ce1322a71b8a96847db7920b2b15744fb060aa2d69f5c8d9bcbf2745b9a SHA512 e6c0681c535db6035c1fb1c0481725bb8ab341b6324acde07ac4b60cc4f490ec6ff01478bc00fae00ade2bc5420f9d14cc44438e5d156bcce91cc0f06118296b
 DIST calloop-0.10.4.crate 53697 BLAKE2B 028666bd659e5b383b10b2b8b6d1979352f50494f9308e15e1cb3f349539cd7ef89852c6231183b717bf6ad295d70119fb242f3a7e40b12973bee604753aed1c SHA512 a68430d68cae720e625fee026e398fc71fa5840c4f7a3754cc5c11069e297e247cceb4b27cd212df6983bd4bd7935e8c509eb0253dd1641e04b7d8a70f915e10
 DIST calloop-0.12.4.crate 69583 BLAKE2B 5cfab752477b0e08af797268b1b4cb1a4cbd866ea789da25b5b42b8579889da8b589d2e843c774cf98f29c78d40749c60a14fb972812216eced717002a92d731 SHA512 657c6a17ca47f633e3bc3e3b6e98160bbae6ec51e496c720c35f2fffd2b9c1c5fa175b69cdd567f6bcef0088fc5af35c2a142c3b9a14ad9720a9ff7dbff2f53d
 DIST calloop-0.13.0.crate 69698 BLAKE2B 8aea51f40fb2af897975e4d596cd33071e0e163cd846e564ccfc20f2a997d377269f1dc67a47ae653b70f21cb807da7bd32dffc10e8e17ec1876c661d19ce6ac SHA512 f3c4aca6eb6eab8fd95901af245df907de6fd32aeff9dfc323166b60067b0d4d56647274db91908f30171ab06cdca865bd27033d8a42bc4f334391b846e8cce2
@@ -56,6 +68,7 @@ DIST calloop-wayland-source-0.3.0.crate 11300 BLAKE2B af213882cc57aab71deeb239a7
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cc-1.0.90.crate 73954 BLAKE2B 840417889519dec96a745c49ecbc8b0d3da9b37a4b6b0165ee8983c07b8150061690b34409381365ae4c70c5780923d19cddce29d5fbc370eb6b6fff29121436 SHA512 349f3c3f8208632f8754cc05d70976eb14f3f13a14d59413994c656efc36bb32b7310adc7d5f3a6745f15e0aaa88334644c9aba8d29fb961215d74bec605307e
 DIST cc-1.1.5.crate 81493 BLAKE2B 3edd99cd9d05b090a57cf62f1236c02d0731baa8b2bdcd6c14f21e68323cdf4a65439f81701c1b1960b70919f1a342f1ad8e0bc830bfd187eedbbf443a5df77b SHA512 2ee646d3808bd06b3bba5788d0f93762009875e1f5c25dad67b0f8dafcb512be3ff105bf9d2e92a2507a2fd942b8d774004971c1f203ad40894336ffb89ceebd
+DIST cc-1.2.4.crate 99823 BLAKE2B f05e52fd921578f14907911730f1c5bd7cf2c03e83f2d5ebaae9c2710025f5e5ea7c8f713888bd75d80abfed1b8e932a2047410f043f0b62e296389c9bf695a4 SHA512 76274e9676f09277a22e4cfb8c53a08bf562f98b710b479af6f95d590d3762fca1d6ec34791a219d59e3184774f13f624e84733f7c90c13c48707b75d75c0ec9
 DIST cesu8-1.1.0.crate 10555 BLAKE2B 4fe369d1247c3b30ff9beb644dbe2a517d78632191f3216bb83d632bc8857f9541a1b60d0bb583cf3fc0ae974f7c9d2b07fca5efe2057d9ef281de76fe810a49 SHA512 2d902b624c7ccfe3633c7bcf99b833b120c0ed7760ea825bfb2fa03ae90df543e637efd46e0743782b81e468e0fd3b534956ffca81f9bdfbf742ff3beae8f8b8
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
@@ -64,18 +77,23 @@ DIST cfg_aliases-0.2.1.crate 6355 BLAKE2B a758d9c88527f0e6e7cfd6d4c83eda1bcb4d6e
 DIST cgl-0.3.2.crate 7557 BLAKE2B 6c61b46f4157a3a400f75e81be8ec456759a0c3efaec2fd134a81d8070d47c478f7392a2e63e13b7b09fc0b620b27ec6831b9829927ae6685dcfcaedfc8bbb19 SHA512 230301b0f0ee7828bf0152b01ff97464609da32dc78edf2fc8518f2341cc48ef39bba946965e93069fa9e4fcda0d165195dbc6c1d594afcf1155707933b3dc73
 DIST clap-3.2.21.crate 218792 BLAKE2B 73ba5a9581329fee3fc8d68ccde39d64cf2f7da99a03cfdcb7b66e4350c819632deb7773dd383318749d7e5d18de408fef915a866d8ed1ef37b61dac8d92e51a SHA512 425bfd4bb4893f1d6ec031acb53edb9da5884742262e368d88fc536bad7d315b780c71565fae31f0b96b90366836d64eb1f89a20f763d6b400a7b7cb4d7d8e80
 DIST clap-4.4.11.crate 54782 BLAKE2B 293721f850d5a5ddce6b26610ef47316d5914e9281312068c26e45d23cb568c1ce2da7e0546accdd0cd4cc703ddb9fad98b0c772907f52dcdc31e6ec463d2b27 SHA512 9da3f445523183e16f4c104a2f4029ee9f3fa70e6c8e579aadad0607293ff5963417d8534aa1f3cef6ef8f8a7529a898c01630d3eff42330ec369cf0f760929b
+DIST clap-4.5.23.crate 56460 BLAKE2B 5c0ff6ecc072368022b8dc08703d87802160817e40228fccbf9cbdc15d86dfaf0eec141dec4e8f1327e5a6d1622df9b334e94797027372dbe8765a12b918961e SHA512 4a8ef8731c9768844debcd1ba83a79a607fd32d9fbfe7411abefb8939c5c442e8a206738bb54dddd136117d3992f519ffd1640694ad7796c4e0aae3f95502c7c
 DIST clap-4.5.9.crate 56348 BLAKE2B e2c60cc6dacc6d6c7d3718ae3748ed5f681722ef060c6b2c4ec1262da4ff4c3b235df3127946816ad61aa03d3b98c55739877dd14d1182a7d4c37daf6e1e349b SHA512 6eae38d69f99fdcc7e2a1f799b4ae770a00dc8556def97a10d578426f6770e0d86fc32816aac2dc5a59c147dbd7501eb9f7b94953a2342cf74b1034459705e88
 DIST clap_builder-4.4.11.crate 163317 BLAKE2B d2d998c4eff422436f36f71d681132b2545b561433ee733a8a64a640b97ebe8e35e97abc91d820189918d5fe9fa9496c89b02959aada1d55692957a86c8e14a0 SHA512 b601fd313e65dbf2b723f3ae5d2d3bfdfa1ec184962883503df9b31a7d43f4967ad5f81b0bc2fc8614e06d67ce52d399221df6f4fc9da311cca1c9134784d7c4
+DIST clap_builder-4.5.23.crate 164180 BLAKE2B 90948ac5e8ea620be3e1ec1334677b0ae9dc227a00354fcd3d78e2cf23a1c101e009e6cc96fc19c0a2395e1b9ac6272fd9615abc1acf1a5d60392e337cfc961b SHA512 0889876990f0a361cc6b6d41f2a8f4b1decd376987a02fe69888455c92f3e583d6ff70880c6f0ea154ba62f4be7d2e7b18cdc4e0e2f243e6b17f250c3e8d1c2a
 DIST clap_builder-4.5.9.crate 164088 BLAKE2B 47021738e0d3e946360ddbc144923daadf7151129e8548607ea3688b75f9a71ba676a31dc543a7258981fd3e561359fc0c5ed5fb6a921420a679e5d7f072c5d1 SHA512 5f9e297036a86bc33daeb76a8d906e14c58899c460ab66c934b7db0309ed5a7f63bb10d644f84e692fbb84081c20102ae97e33cb39e9ed71bea920d4e5e6aac7
 DIST clap_complete-3.2.5.crate 31625 BLAKE2B c76baef63d773b81eb4d8d953da4a94769b618da45fb0f13fb9d6c6738b67ccdbd58ad2b5361bae99705fd2b7aadb520d6e7f4d258d872971e0e308a36900965 SHA512 c26d6c15a0ab44720cd7a5979dd4c66a9171082b99c04cda10fe4f6dd9a1405f8ca9022c344d03d7d2af7788bc28be033c9e2311f6879993901773176783f61e
 DIST clap_complete-4.4.4.crate 37405 BLAKE2B fd43c668a29b8e8329f94153a5e5ce19e27437f60d88ea0a59573456c50a475e6dca659588d137909659a05b04ba5b4b412fd33d3daca20ee317a9890eadc8e8 SHA512 880b3022105d4ca68846e35e359a1613e177ce0be2b5f75b15bb3c4630bba93f8ebb4c7832205783f8bbe84dcd49d756468ac10c48d0e803d644a158f1163991
+DIST clap_complete-4.5.38.crate 47669 BLAKE2B 4cb85c4605460a657abfed6f47da0582bdc7d5f99bd2e801a4263390dd2816319a00d091597bb62699a6f351e693d96062130acd3d06c26695779acadbd11f4f SHA512 a0d40df8eaf56a0688557b517d84a676c86c5b080aae118375201d2196ad3230540f5f8f728f1e3dfbd0c5c95ecdc7b75188959bc6b44743859aee00f85abd77
 DIST clap_complete-4.5.8.crate 39228 BLAKE2B e829b87fd096dbcf7d4cf51670aa51cd28ebcc89663657c509311baf3b5cba93cb80f53f2bcd954cde79f49ae73e43bb15b3934d59449d1c36f255357d95e727 SHA512 08dafabf7b6f07c0d9028680dd2a5a1ecc0d3308f11b419bf6fb2566d220fcfd585c221adc7d550f1625129b4c1e58b2fb9b1d4ffdabd3341877fd729a41a29b
 DIST clap_derive-3.2.18.crate 28208 BLAKE2B 05a23083a8e792858819d7eebf057257b1d49b0e8246d3f24c6f812456cbabfc75d9271c295a0d44539bd531ea6808ca7490e787c1fcae63bce045422d33d280 SHA512 d5349b3d5711bd4900173aa5210d7c4aebb0bf70128e11f26b362f5acb43687f6ce5ef73e4d614ce9c1d649d34b68ff15ab8b65fdf1898fd295ee4b4a7523497
 DIST clap_derive-4.4.7.crate 29046 BLAKE2B 96ca919b8f9901b2e89c58ee8cf8bd3881ff715ac27999c03c867b317321e4839d9e923f68d411a05b45c34d54557af12b8a173f2445732fb6de16f30dad8e2b SHA512 4be40460468f7ce22906cdc9eea8d01bb07cb206d4ce0c3df2abd929d6925b175a49cf63907925ca16ae6297d6f4d933087fa5b35958e551117ec7ae050be167
+DIST clap_derive-4.5.18.crate 30131 BLAKE2B ff962e52d8d8afcc9639365e27753c6c6943fd809ef89d9e555e8be5b2f13efa650bf1f9ae451f4c127c1529a0af1d892c3b02153b46deb912029b45983e01cb SHA512 035bb918bc7e9badd59341560f23e3a8a2e7cf945b6d8183f74052c4edfcbecf07c9ea6fce0ceef0b84c89a99d62b11760af39398897e4ee7dad0170a96cfefa
 DIST clap_derive-4.5.8.crate 30024 BLAKE2B 3d2d7e3652c6e16329a0897b985288d8beb6c68051d3f6216e75c6aa98a773d2cf609c1df82df7ab2b5f43c62c8a028da29ff1e314cbde096376bd43ff6b3b70 SHA512 587b63b99ad47b6902094d40ee4cea6c4e1d547e11fa50095b007a8495b11b25b3b6ef37583526938a56103982aac7d2addda833d2323545b753a852fc830b43
 DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f
 DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e
 DIST clap_lex-0.7.1.crate 12766 BLAKE2B e0e3a1a4a65bf9df3c21753f9298a7461046e6b34c7a8d26521efc551ef3511a7d202f25ebdddf285ff68c4073364f48cf739ff0bda32f41d4fd0c87c4cf02fb SHA512 4cdede5eb9fa527567e9f3f94fd8fe7e1022d9e9236e78d30b3068befbaadedd778b5464f800e74bf187c44af9df582365f4d41a0113f8ab0fe9abc936171fc2
+DIST clap_lex-0.7.4.crate 12858 BLAKE2B a5ecd50cc503157dd69746f3b6e9c288e0fe4f6d5d82271499f657134fd401fbe076255e2be6a23ed0b69daf3941c6429dad8b288223b0ad390a2c435575cdd1 SHA512 a2566868f4619679d3b74b70592ffa6a04b13e38e3196c56bb1dae8bea0c711bddbccd778d2aba3cc0ee074c9b1cc0335222818f0d47fb3cc8109cbc35bb992e
 DIST clipboard-win-3.1.1.crate 11964 BLAKE2B 5e22d3a662285762128650e6b46249584683cff5e899e7ff90047fbd3d5b0ce077278f947fe12e1b04757328046ae59b6953a07e845451b1abb090dda42359e7 SHA512 5592f400830119e2512c5fb68f6ab190d8bcd16120c53d66f6f55bd0441f8dfc5c53663a3ebd5cc5e57e4d48ac55e2b2575b987ffc175664c85e2953037ad8f1
 DIST cmake-0.1.48.crate 15142 BLAKE2B 5566d196c7ebcaa6b4d91e3361d7c92eb9c60c0a940b6d581d8cfc547606781f04f77d707ed128a6a391ec46fe801a4f65acac3c7c9bc90e0e43cd9e1bd6be03 SHA512 c836208d43f4a716be6ef043a6b5f526d3961b9414f1419171895903491176a2a8dc2f271062667a7568c7deb2bebfe96541b4e4fe73c31aa9aa760557b188b9
 DIST cmake-0.1.50.crate 16748 BLAKE2B cd3b131fbc27764e15fcefdac31f97a9d12f82ac9758b2aad256ccb371ce3e2db8aed3c76fbf4816df3483dad9fffe9973940ced65be6d31463d8c059c543646 SHA512 868d5cece75d79382ac6176aabde1723bb7e26dc745383a636516ff45856dc9187fe5a83e139f17e3bb0c114624e9e71b93c8a460b89b8facbafbca50d1d0923
@@ -85,6 +103,7 @@ DIST cocoa-foundation-0.1.0.crate 10645 BLAKE2B 8ea7db02939a5cf1785b2770743d609e
 DIST cocoa-foundation-0.1.2.crate 15028 BLAKE2B 170dabad57dc131636faa3d5d406fb6d7788540cc3ef71db17fdf451d947cdea56b3aa1af8ca0d65c869d9c2034caa096f647fdaf7388019fdd79b9a55d17d00 SHA512 5e9387ccce5cfd7fb6738d402d84cf825c3c9ea2ed5a5485af887f5dbd5bae7ae62ea884242673fcc23d7964febeb6d0b12bca636f79a9cb58649f774c269072
 DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
 DIST colorchoice-1.0.1.crate 7895 BLAKE2B f1c841e74f01f33fa83cf41c5f0a1286ca3899239d9a188a838550abde507af374a4fe3e85934d10d28bd5eae2c7fa1f662307bd46d5dd4daa52249cb64ebb5b SHA512 3d216ba46cfcca5c52a56884ed09fe7d6d350ccb44144a60c75006582f7f9a28df21d44375a8cb304c721b9de615875675b3a03c485eb209b2a12d745fa609cd
+DIST colorchoice-1.0.3.crate 7923 BLAKE2B 7055fe61677143f0d4445ed5f6be2cbc284c155aa6ceac04df6f3fa2563a225e440ba708bf40e298ad09775ab7c7e1842b5f6dd78422b06dbd1250908e3227ee SHA512 fc26696189d3935d5510a1237504339c1f354d03ffd3b4e830b7080335aa778bc72787ac5fa9a67a731b9bde2788da778d497f2ef97ec68bdec5145fedf4cd14
 DIST combine-4.6.6.crate 132428 BLAKE2B fb52e724a52f1a551255591fedc134178080ea5efc0c488efbc369e6272f7f2b87dd7d0ce63361754d8ff0cf1b0a59bbc7b0396c50c53210f3e2c28ac965e0e6 SHA512 ff9ef9329de2cfc103271a25ad1fcb7e478f3328843bd8a65653e80b74112728ad4a33326a58ed7ef8cf39eec7c3b797fc287295ba149ee0dccb1de9721b5819
 DIST combine-4.6.7.crate 134808 BLAKE2B 1f3ea9962f4ed4177a9c028d04934b5e261df405c1c0282c74609e0e6a1490a92b262ad26d1d21dae977cff8795bfa3c1f85aa43fab13a88227394d61d93861d SHA512 b8232b0e1f94039cef3ad4a0a35a972eb49f4f198749d2fe50aa3fd2a77614f2d24e51f3b4465243ce9140aed6bd048aaaae189a7ba864e3d23843e9be0c437f
 DIST concurrent-queue-2.4.0.crate 20244 BLAKE2B b30b97eeaabf0205bbd8f4eddcc57e59b6863f18969731be66b134cdc5bcac9eb543493c54b17bb394b6e227e808f016e4f3c1da2fd6b40269b9b24a5c433f7f SHA512 5821bb396a73692e5b033d8406c2996bc4318cebf8807e596e441a2bdc28715fc6bb8eb29b575ea318f84b748ce47341a8d23f5c4de65660f86056e99b6a8b78
@@ -95,6 +114,7 @@ DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c516
 DIST core-foundation-0.9.4.crate 27743 BLAKE2B 5b695e671cc833170bc6bad436b2d0d8d386ffb8181bfcf2e92a1d93cee67c3ba1768cf57064fb91b0897c6aec1be7db40b5bd256a052c1bdaf872ec19f6e15e SHA512 82d0878a1b9e3d56b3666fb5a78f92c6f7806d01665c242c06a640bd6b1fd36260211e92dc05e1a16d1430622bfdd650aabb0b5bd8e5592f74abdcf412448e33
 DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
 DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100
+DIST core-foundation-sys-0.8.7.crate 37712 BLAKE2B 0e1dd99a5bbb0fe92f55181a37426f6e86445cb20e355f553b3162c88ccc075644461731a0cdcd93dcca65b6cef1de62b409afbd73ba3070a199ab8e7422dcfa SHA512 17492d5314db03abdb3b1998bf0c396ec8ed0f83bc978ae22d6026afdc86c50b58cbac073b3a0d97b92da7e98be11302faf1249d24313494bc058add4f4cb63a
 DIST core-graphics-0.22.3.crate 29514 BLAKE2B 6e89281ea95f323c60d1948aa2ebc808bd886e4f5f6bea8dc6c79bf8e290480cde7e54bdd4368f2976a5169948538a8b65233eadd619e279eb9c2c866426e9cc SHA512 94f0c5d55aeebfe6e6e8b335f6789e4f980dcfc2206c44b888d984747fea0f67e43df26acf8cc0d418cafa81ad1435ab584af05657c613b656bab4ede80b4557
 DIST core-graphics-0.23.1.crate 30714 BLAKE2B 291e5cc4cfcf1a6507dc0e4dbeb304fb445530c60d7bef79dbaa53524233fc453d1ee977e7ed43513319e1d5641e756749f43b536535fee730308322190462e8 SHA512 2b0e2c00900d4a9e09c718197692ab2aa0d009a43fc03a30075eb33ed7648f6ef640bc2d827fd9cf17f752b810eaecb77107096aeb1daa0348b3b7e17ae47fe4
 DIST core-graphics-0.23.2.crate 30763 BLAKE2B 6cf9d7d1e933bf06175699eae7ee1e7dae993e390cf9b509a756123cdff78a42d7aa9a59ae2f48d251d6dbeea5479e95694c38700f4ca93751dfc664d4c7af34 SHA512 40ac912fd8bbf25488f665091e974d9b5c40a2a20aa1abe0393c9f39a77b6f3b13761719cbfde067e5e078fe8ec55dca51777ff3ffdff4aeecca6e4789069d1b
@@ -128,21 +148,28 @@ DIST downcast-rs-1.2.0.crate 11670 BLAKE2B 7d44d708c1ac068a02ea5d72dd3caa8a7f6d1
 DIST downcast-rs-1.2.1.crate 11821 BLAKE2B e8a78afcd8d2f17c9505973359e2151d59b233e1757b4c7019047f148b1c8a4f28dc3a0d6eff6cc7f4a7ed986bf592ccf0481dc112768a9751475e1b0dbe27f2 SHA512 f37804c1b1e2cb0ecf2460fd6ab274c843c43e94aa7dfbf4e3c53529cca9b5624c4ea5ab5ceaafd72481165c7335f3cd1f846ae43deaabd18f363572825a5f86
 DIST dpi-0.1.1.crate 11131 BLAKE2B 3b457f2811ba80745b76a9c00030a6f4972757feadeac8340a0f683335cbd05a8286a90ab429ea925ca2488d11c3149e637ab41472b862ee30bc49caa36131df SHA512 428d2e11a246446f01b0e82b2a01c2447bc223c492a153178bc2b4ff4834f4afd3bd715ec51d6b364d7b89a27ffc8920e69ad7ac9b0b42b46656235bb2960f8a
 DIST dwrote-0.11.0.crate 21715 BLAKE2B 8ef802f393939f95ba750e941fb5b6f908a2cdca41d3eba5a405214ab56b2fdba148106c0537034316d1d594fcd86a13774de1853c2dad2f27d0ef87ba21bf86 SHA512 b319820cffacbd55f27d74d4d8e7ae3f15d758f718611c354551ba526614f5221357269734840706170e26446efb8d504035859f47c68eb0a7a89444d08ffecc
+DIST dwrote-0.11.2.crate 21647 BLAKE2B 6860ca3ebc1ec6a0edb92f44d6fe6cb1e5213ae271bffe9b1ebcea009ff5907dfd8f9d018fd2b99047f6781713a5ef1b899d4ef6a8f509b0ea257682c9b7cf95 SHA512 7d0a24ef4aa7b077f3a1560c4c9e4cca2ab5ec9fe7e9f0f76c2b90c5fd879fbefcd0863443e38db4c3d2b5c45e63a4cfdc69906baa9e04deda7f43a4a7737377
 DIST embed-resource-1.7.3.crate 13707 BLAKE2B e0fbe2ffd1f40ca12a0b8f692d4fd59a1d8c2645a6d59c769b4c4fe36af8b7d35c5fb2a0d2f16b3af18aa9871f82648077a0eb1180f83a857c7f4313de9d4754 SHA512 c5345a45fe084403d2cd329bcb82f19217ecae2447228bb4220d7140a700be8cbffed0cb4fa780da8f5bcf4226be93e802c8670ee291bbe749aaf066a91c6e25
 DIST embed-resource-2.4.2.crate 16553 BLAKE2B 8a69faacabda9ba6560e352229f91121348ae40358156bacb560ad135364d82059f503f46aaa323e327c5f7a39886d779e1a77a8bed5c2f24d150f07b30af33e SHA512 22e821ff36fcc39638358946972295b20020c4851f39a66329405d39ba1916453f3c0b11bd9d31f94b787d8fd8fe7800ef13a7b0207edd00934e747cf50fb0bf
+DIST embed-resource-2.5.1.crate 16796 BLAKE2B c8d06418cf7865cacbc72c5f957dbafb1409703c199499dbc78505f8f471008959cb93f2203865f957d109f89385cd6701b6be986a5b742f7a4c7b5e159c34d1 SHA512 e2cef36fa5b1cc8f5692c5ec710bab630c2bf397d1fcf7eb5c04c3e1cc525b1bce4aefeebabd7b7cabe6c4c9971ba7572f05571b82c576f883259c2709911384
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
+DIST errno-0.3.10.crate 11824 BLAKE2B f9976b538868daba3cd2d47ff2fdcda16b4a436ca767f865f23d1139e7f232aba263dd4aa38d573442c762999c8a8beab8a4a8c10649d21b49090fa65ced1ec7 SHA512 fa4b9a368f254cd90c6f69f6883af4c579829a6da6f31481a1b527ac9602c8ffcb5e9518cdc32c39b5589c151a20e75a7300c8a907d178346185ecc6e8749f3f
 DIST errno-0.3.7.crate 10712 BLAKE2B 1ac3a3084673791fc31e228ea3f49d334eea106f1bb6de3f9548882167d8982153e0d9cd9dbb4bde68fb9a12ea8eced99a4a128c507fe8a6ca90caf849cda1dd SHA512 ba4cd3919fefff84bd5ae473392ecdbaaec52ccaa9d1d93ae06ea5962523054d0fa1c5866787e36114a00d449a60df811a110f89c923a6acf7430d3668c2f54e
 DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
 DIST expat-sys-2.1.6.crate 518887 BLAKE2B 12e06f38859124c8da67aaf41477e0c94e9b2421a17c93666f019fd17de3579d52c66403ff95c6fdf27ec1e4db0652bc611e2b426705a177e615b5064d15adc1 SHA512 35d0c405a164e685972ea11df718e50a32a90b730332c3ccad74055544e750423ce2cd76edfd5de2810167cdc8ab6103db82bc4e2710a8e298ac0dd9e81648f8
 DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9
 DIST fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104
+DIST fastrand-2.3.0.crate 15076 BLAKE2B 15c9a1c4f64d94c4bfd38ae139c6fe19b6b621a495c1b57209edd6d76d978eaf018ba77f356b5086c3f462a6de044fb5e3b172fc288309569911a17ec39951bc SHA512 267fecbb7459c8840f03425733d278dd6c4e7637b85b99552877117ed5e8015e094d86aa95841f77064136b7f382276c3cb2c2bef7b2881d272f4aa57c5cf947
 DIST fdeflate-0.3.4.crate 25001 BLAKE2B 69bffdb689dc467bd62738299ea17295bf7dd9d51c78b17e1ef6eee265056308703646791676c44430a686e1d713a8f561c5db972de7ab7c5e7b21050cad70f8 SHA512 a38b493eba656beb97275faf5a2f32c8a2c2cb12c5d5c280d37bbcf1406fe404151fd6312ec496aafdce802ef08745a6927e571890f9b290010ca5ac45ac9bdf
+DIST fdeflate-0.3.7.crate 27188 BLAKE2B 284998759bf6eff9122224eeb14864d2693a166c140a2fbf84a1ad195599b5c005d1128499d2fa37431a87bfb15f65edbedf9b62a47c0964f635b6fd32033499 SHA512 7418eb5e55736788fbc3637e0ff4ee84e3b1d833684862049b3025991a5449cea6131bb04911d541178b0a91e0600546b8f2b646fc468dba6e631501b202c306
 DIST filetime-0.2.17.crate 14484 BLAKE2B c181cf4c3ddc5831c006917e7432620a62a0ca7aa379ea7f1aab9b99a8cf725055e8510f7f63ae5add770dc8f91c824d3b4e9e86ec0f3e7faa4e9a647c431a8b SHA512 3f7cc4e64381f4076ae04bbc0adbe2ecb024719f1f2fcc2ef537b0285261e03b8af7655d2db72358185dcce109df060d4a4a4015b3168fae0f6a952878860087
 DIST filetime-0.2.22.crate 15029 BLAKE2B 068f4a84388d04d900bc5518a94895985ecba9c618a47b6483cabc31abd267e37ce69d78c51703ec5745307800d96ac801f37ac9959c60283c3c3d6ccd349c0a SHA512 d40d8baeb57ec85bb9ccf76ff0f898915c4e6cf384020121b53f4a2a1ef2840af5b4c9e8e1ff177034273f4f7a6bf81d2dd7a02cf498b61ea31ceaa30b877067
 DIST filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3
+DIST filetime-0.2.25.crate 14940 BLAKE2B 1ffcbad3b2023ba5e9b2d71e279fd8c3564458b28290f3e19bf43b87083e1e3c0e18f191f6dc67540baccb83075df453950230089f243e6276e413321cceedc7 SHA512 90b4f3c4df29a3456c393f78f636d70f2615cba748a972dc9b937c2fcbbf4544f5b0d28c6c8fcfed5d5eda026ac670afffec18ab7d7127cee9afa2717146ccf2
 DIST flate2-1.0.24.crate 70191 BLAKE2B f5ff04557dd0a57151b4c704cce60622157be4c847fb0a42eeb5a9d531ba28d34b41632bc1b34d2f935ab576f152479f72877dc4e6b296edf125becc6e6d52b2 SHA512 8faf97c28dcc4553f4880295677b1269b4acbc6518d006913d32d7e319990c6631e10f1baf7199b96e03f6de95b9e2de04502522bb1eb45bc301a0fbb0bfc0c5
 DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284
 DIST flate2-1.0.30.crate 75511 BLAKE2B c25d9ab787ef60312523d80cf277bcaae16c7e54b1deb0fc8723a3b22c2586092343db1c538d96a37690d21e52ff822a38c90e10bc554fedb75671fdff6df309 SHA512 21528f80c1709cfa764723dce012903581dbc2b63ecad194ec601fc75103307e1b2ef17479186ad895ad957c9a33c6fd666b2981382a8a68ca78dfac7cb5d578
+DIST flate2-1.0.35.crate 109188 BLAKE2B 8bd6e51c3bcc06044e5b8d7ead950c3beab6c6337052fd48e86175f0fc98c8d12804274308ee515dc6156bbedb2277dfa2706cdcd7baaf2a789122473248486e SHA512 aa2c4f0ad46cfbc7d2bfbdffd226eaa37f5223a34d132d8fb2dfd04c20d15a96c4882cc377fd72afbc7d13e512f5e9934386b0390a0ab2b171d081335c58fad4
 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-0.5.0.crate 7824 BLAKE2B 01a5111a11e48462914f9877d3228008590093633e957883fdafd3a7017e144c14fbbe713bb8b0061ebae78d20a49978191ce416a4e28317b67ec69e38acb879 SHA512 d07c92cf99c99419a3ebe05ba9154e396ab88116f46af736ffdd958c8e47741bca5d9f478f6719d5361360e844375968c1cbf6ac40995d47128a5e5fda3f6c82
@@ -158,6 +185,7 @@ DIST fsevent-sys-4.1.0.crate 4620 BLAKE2B c203c774d5038d4c4abdd7bb9407a6b5f2b203
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST futures-io-0.3.30.crate 8910 BLAKE2B c9af4290f45a9fd0839e107fbdfa4abff4f9077ff45b61054670419076f1c4508d7d560d4d86f8cd7ce146e436e531b9f5e0abfed2c4f2406c57be209cfdd498 SHA512 077acf5eab1101917b5b4b4b83347d30d533110d9a34c2de6db1411ffae0f0530f457033c5a5c14249119e89375c9f12127790b46e486dcd003a12a6fad48bc2
+DIST futures-io-0.3.31.crate 9047 BLAKE2B 667e62b50be304b68b8437d93b734a0e2433d88a3b410010ed0b04eb2bbfbc9984454c3f0a591f720c9983582c6421d7f870f0733c31337c4c518112f52aea54 SHA512 16d21388f7ca083d2c618ec140cb2c0807ca621b8c338698c367d862b99133ec9edda828f051f3f666472c929e7bf7a5cb334fcf167109c7c392c5cc60b54fdf
 DIST gethostname-0.2.3.crate 8174 BLAKE2B a7579a33f8180729787d2489f0936191a911b2ab085d151e6bf6ff8dae1bda0d6707a69c1d6ba829b2b087042bdb6eb676b77fd722a61423eeb37fcb30554f81 SHA512 c3ce5187057ea09def22331d2f67a97cb53759e8c45179687a8bf9c67d16fac5f58d6c1e553b4f74b702bae0baa7c70eb5ed71f99ded3d508338a4b1e9f115fa
 DIST gethostname-0.4.3.crate 9336 BLAKE2B 12be5fdca0b6e3788cf3d67a4a80f283d240611b4fd37b6d1c37eb2503e4a7025b17bbb70adf421ac840d8f952434bdedf4691f31362780a267e21e8c4d3a006 SHA512 8c5dc404132f2ecf9bf82d8b89cbd698b4cb6d43141c47a60b95401da2e8c314347ab0a0ad5fba50cf98f01a621faa68293cb78f48977d3ddfe6e6f21926abf7
 DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee
@@ -167,6 +195,7 @@ DIST gl_generator-0.14.0.crate 22330 BLAKE2B d2e84bf81e7c4e2869c3e23872bd86466ed
 DIST glutin-0.30.9.crate 65356 BLAKE2B abca047f4ff7f80965b09d06b4710efefb8096300abb9be163486ee14a2fca046c8b058e80c8483ebadd5ac12a3de0b2a94a21d123fe8e15577b499e5a423907 SHA512 7b86dc0f2f292be2086f33323a2b08d26668043836df57396622ad38a6950e0905095ee1f76c9f088fb9433d45be79a9bb02fb20f35ef0224a23f99da4c33728
 DIST glutin-0.31.3.crate 66749 BLAKE2B 5f474b8d231c8e0a65aaf680c06755d07cb5fbd0a9c0800bd554f4e0874f3d77d64c199f8dbff90a995df4d3a5c82ad2d8a90cc20378d865360dc64673e5ebab SHA512 31b2217d77bc0a221184acfcd237b2f98d0688eefbc5abb010f95e14249615813d53b489d8c133923d2dbf47c18c9b4811d3191e035ef43a55573c26d8f0f719
 DIST glutin-0.32.0.crate 67115 BLAKE2B 12cab7228786c285d3eb06962d53af3756fd9ad4f0d3f16c4c318a226e78bc564b32f9eb4cef0a499a9ffb85248afde61376c062d6dff387a3c0fa9deecd854f SHA512 a2187838d508bc1f8ca7cd0a31ea7df41cea64b100e93669f4a19981b5d8f4d49f5d76c2d00971ec748d7d3effea0269eea8fe0a3a46203b675cbd37f9517dc0
+DIST glutin-0.32.1.crate 68633 BLAKE2B 2ecc7774fa3468037bb41402f2eac6c358f0136089d0906a166004ddebb26fd718cf7fee56eb0195be651f9477904c8124f3930027dbc48bcca95da666361368 SHA512 94fbcb29d1cb5a9d48410e8ae120d5586792dad140c891801ffd1d32e0f6966e86a92eabd76790e4442560189df0ca4123f1532814c1192c4fd67c8c79725376
 DIST glutin_egl_sys-0.5.0.crate 6053 BLAKE2B a08e48d765b7843ca2b04650e8390c3c317124ee2d36cfdc266cd087708a3d62f8e59541e788d5c809ffd9c87e13b803baf4215c4f62a4d15119f662b7816245 SHA512 37923d03ded4d2907cde637e3203f07dc0d2f3544e08a896e6eb2f3419a198743e5645d61201d01442e82b41d981bb7e18da8551d22d1f9c9b06f2f0003cf181
 DIST glutin_egl_sys-0.6.0.crate 6261 BLAKE2B 3f299883ceffc8740c8b144da64b5962b5ec46c02b8881b8b2182a3722c8f666ce9969e4126254bd8b2ea987f9ee956f1f570a9f224f1d8920bf60ac9fc12f84 SHA512 93576abc5f06d95390de68bafe002b9b8f157d1034229f738d53ed235e5400f2199601e2859682d707d4eb0a854840e90919a56cbd105fd84dc254480eb38c7c
 DIST glutin_egl_sys-0.7.0.crate 7427 BLAKE2B 4b204ed21a6bc13c1417fc3785207a37d1dc762b46b1465992db9cdb7804497ecaffe0e313abf05d1343141db4c2f3fd846271deeaf218b2c88e5733953a0751 SHA512 e11f0322d0c22e1e3bee5d612ad4aff3d56b93107e5fc631d183d2dbc79fb550b345b0ba74796dbdbf96835e4d5e45e3ddb7fd35f1835f9d44f69d204f9f183d
@@ -179,6 +208,7 @@ DIST glutin_wgl_sys-0.6.0.crate 5472 BLAKE2B cceb466cd3d4649ad7b495c9008a78a0108
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
 DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356
 DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
+DIST hashbrown-0.15.2.crate 138478 BLAKE2B 453888ce68b10cd6e93d787986603fceb29b83fe2dc417e7e57316b9e0060d0bba51ec7fb71d46a038662c99f60deac8237a8f349297208d1d223bcc13f0d0ea SHA512 d6fc0613623f9313533dfcab1240e97f652f78f05baa21419f7edb2eff030c4a2c5f426d3eaae747923cffdd8aa9cc2648340e5fc229395b5eacc6fae087c8cd
 DIST heck-0.4.0.crate 11161 BLAKE2B 13b8bc39cf3ab90e71433e3c7b3e5f1c19404bec58dc4298dca05d94d5c14c2fc97350de737cb78aa45196b1241aa8f1ccf3a11ca309da5fe0f6a657673412b3 SHA512 33bdbf4ff9ecc4f4d74cf06590e056f4d96bf0d990d5381b9da5b65682b2495ed74e27b45419c2afa986c1f6200909d5175b137ae73ced5cc8ac869e4e1bce8f
 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
@@ -190,21 +220,26 @@ DIST icrate-0.0.4.crate 1040120 BLAKE2B bf09a1f5e4dcb6b119f158a6d7c93124d7f8a243
 DIST indexmap-1.9.1.crate 54114 BLAKE2B 71e4968c85d5b3fac550590658f9fed72c754a9443221fc804efb97bd39b5fca7f894ee67f8d2c330bf212eb8a6b5c85879cd813ed56e3fc43a54f0bb689af5a SHA512 7eac99056123332ad38ef32eb65235c810e8b4d051d9b0ddd5582348c9cd3b162d36defe8e46a532e2066562f224e37fae94b52b4649ee9cfac7673b76a2513e
 DIST indexmap-2.2.5.crate 81498 BLAKE2B 8914a50344951aad58766fbfebe8780298098e3a7c923287e3a84f6de41e2924a6a3bb3ee91ceae9b5b49654b83ddc7516a4cfa6253584b0657995d7c8f63a89 SHA512 84fbb6e61756d5ff746f6ffb2c3c8552f96d3af205075a381f06df85258c7597ce24b0d193127a797f975a3fddc1fa92110738227babc73a7fa37505331f8d78
 DIST indexmap-2.5.0.crate 85919 BLAKE2B 766da0a2ddc406e3fb1a70a0bee00141045ff72b52cc412adf05972ccef59d416f502c429dada111461cb522a5c442087e01d8fb235c2f1fd5493adea00e79dc SHA512 c4627d43b1bc5c5fd64861d1a7ed66255ec3f790367028b2758a40751286d6677da7170cfb04dd88ca4c2d163df621583d2e0dc4e9db6d7ed9bd0cbea42b1729
+DIST indexmap-2.7.0.crate 85335 BLAKE2B c7430ef510738ac5fc4658f3e4d927ca5cde780774a07848791ea87503be09fb4677c52803f6cdaaed73eee600f47e0595ac3db74a498947d0e180cbd10fb7aa SHA512 efac370b9f365a49489aa2c5406eb503044a4df7d6ceb772e0191b02244b6c2c1bf6c43ad4c8924160c1a2bd76d46c630b500a1c4252fc52366295d1cb04b48d
 DIST inotify-0.9.6.crate 22971 BLAKE2B 7a6cedd29b2503911fb42324fe3b4f4f20abb62a6b4370f8a7f634d9988f1b3053a70d69d6bbd7b850aae2590ded7548b73326a598d31e5b579e19ac3cc781d8 SHA512 39c3db1b6da620df9eaaa41cc20c2f22b9a372e181ed7d8ba0c7ad4e711ba4486bcec7ff86bb4d814d9c53e071cc4e43845567069e45b897c562cb677fc872b2
 DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
 DIST is_terminal_polyfill-1.70.0.crate 7451 BLAKE2B 9efe76f14d61a5af6d3cd30d5e64209971d4292d8d2c12f4a621ef65324a5bccbb7e1d79d5efa75ea7456431241d6325cdeaa0af802b1480c6cd9c1bc5a35994 SHA512 c07d5076978e4c5d8d6a191d8880fb62643161979c473564881feb17726cd9ac8da25c40094ff12727dbdb064fe88fbda1867120a2c3fda1051bcc39380645d6
+DIST is_terminal_polyfill-1.70.1.crate 7492 BLAKE2B fa663f858ab8e5fd56202d731b572bfdd4ab0e8262100424e27360a9ffd2820182bc57d6718a305ef82d04c3798111841c0d9f9dcfe219765c0f63edb560dc1e SHA512 4730fa09401cb4e69c92b38b2b43afd74699c61f5bd7b37605efbc0c08ca7a1318d43e4a844e46e0f84f83f42432f01e33771be2b18eb5977702ab9f894837e1
 DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
+DIST itoa-1.0.14.crate 11210 BLAKE2B b2d33dc384757963eab3ae7d80bb672d828a549967986e3af8c70fe71a0ad46c4a278da2db4dfccef99e804e6cd4934067e97c0697a33ac3302cafbc46eeb416 SHA512 ea2d38df373652ddacccd11e610dfdad4e3ae7f0d476514e6ac58092733c817bd834e8cd88c3bc4178dd5a646ba628ae626195e0aa407e8534ae3c2a7b049987
 DIST itoa-1.0.3.crate 10481 BLAKE2B aa516e8b2fdea4e4e1260a0783fb7aa2672c1bccdf519c45c608fe3f3fd4fe652d7f56f0cd6eeb6a56bc324c68ff241f601660a0dc3c5ffdf7fa239f470078ec SHA512 1290c027ec8a13d2d15ace2b58a1d1a3a18730cd5fb55bc995826b8f4d04ede650b8315a8905f6737c4c4988690ae03bf32c86ab3a31ae068a67d5be04cd618b
 DIST jni-0.21.1.crate 105028 BLAKE2B b384973d4d991de027da3f0c27aaae33a5d1f2ae8037f0121e8c637a96382055611da753c14732cd9fda56f929b307c988f1c3f6bc2c7617e2e5182a66a943b6 SHA512 46897d5fb968e598fe39179307376305f4604db61ea5d7f12050506a6813e242c05785536528ff2d59de8a3877f6b24be15c30f451f1bec40a5c72fa3b772835
 DIST jni-sys-0.3.0.crate 10232 BLAKE2B dd6334daa6db9fae6cf1b31b9c13f09f9dc3f6a0e227bf6779880a6e197189d91583cd463b9876125cf892ffa5f8417dcc51aa010cdb8c99bb4f969990e969b1 SHA512 1e47582ed4dcf608ffd218549f1eef5ee3c87a89e28c65eeb5bba801edd6cabc0f095e213e8df606e050a57608653a59ced6f01a8bc76a5eb32ba1a337a63321
 DIST jobserver-0.1.25.crate 21888 BLAKE2B 2ecd417446f9eb975119af4ec74c9b3463d061f5348ebca380f0ab9963ccce6dcea8c1671c7701f3f867c7e49d0ec130809a37bff466261a2fc75e80cc01d15c SHA512 0c014e7c72a070e3332463cfa6e9c9095d542a68f8631150bad0efa3706a2d6de0347bf7d1221cc3bc0f3d5f9840fe7188aad949559375403b929d43b4a524b7
 DIST jobserver-0.1.28.crate 25543 BLAKE2B 90fb1d8696b575b16b5b12d6fa4e7bc7890f5f09110b147d65eef8888a16ace1446a789f8079a3706f0252be8a04061d989bc8fc53e6c004d6b8a4094baf1642 SHA512 8ffb33b8c162935de1226e0ca4048f36e6e90bd1731cc7f06110bc97e2adef904f777df0ca4ed48b3b8ee4f2c243b2f883f6897427867904aa3385098abcbcee
 DIST jobserver-0.1.31.crate 27306 BLAKE2B 08ed4a90dfdad5bd7d67b8e15cf61bccb4a9669dfe4a479680c481e7066c70d833cd199b56a4ce7d1180cc9fef565d0afe722a13a436b86326cdfc8c10fb0424 SHA512 0488e5eafc5a99583d4626ae8900d49082aa09228b35a8992d8e715b5a39aade47f51562dc4db8ac41305e069988c4c63e1c78e92d65561e3e8a09d4dfa5fe25
+DIST jobserver-0.1.32.crate 27549 BLAKE2B 5f6556788d10af992fafcb578ecfd2c81698eea31b636d3adb7544e12155796082623735c8b10ac4c04d891d1acc307fb4e4ac3f88b2006e181013006f51c8cb SHA512 d4528113dd5a5d4a3765d55599a07e0998c69c7d21a90d2872679755ec4bd7726e9721af9220c36e1179b153ad8a39214a422af63aea15eaafd7cefc828ddff4
 DIST js-sys-0.3.60.crate 79257 BLAKE2B 714facdab00d567d074de4a25b69487400c23194d0f58ca784159483f9e02289acadce084b1514d8816cc9e0597800de82a5298b071b7df19a24df93541f23c1 SHA512 543dfd444539fad27bafcbbf112366f53d4ccf4bc63f8bb17820d818c3e1804656697ed6268a793f383ddf6b6227f7e9b3a11fb6fbb24e10732fdbd971801665
 DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9
+DIST js-sys-0.3.76.crate 54420 BLAKE2B 8d211aee6d8af87c339250e06e321bf02d2ff313b80505f696f66c43298e2aee8286076f2b291aa853730f8e1b9940f09c56535d3534fc7990aeb16653844250 SHA512 54e9a6be3f5a19021351d22d655a3aa55579c80f1453a99aba5989fafc7429078dea57ffebada4240b9185d3260d02f30da250fa539ac12c4bdda975adfe0dad
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST khronos_api-3.1.0.crate 599718 BLAKE2B 945600455c85874c37c7c395162a3e56531b417a1e6ce414386ecf31f8951fb40049604c27d719014b5379028e5da25fb9977c7487433cebcee4ccc49e00c7d5 SHA512 f9ed9e1bac648a82bc608bc7df339d3ef1db868c8ce8bda9598926839b3de9e3c11c2b45886b9a7dfe5ad6900770fd59c690bfe9a87f7c5b479945ffb8dfd292
 DIST kqueue-1.0.7.crate 12554 BLAKE2B 2302bb9a6aae077c1b69e4892614e87fd86187fc4608cea08cd510a46ddc3a06b27027bcf6a865550187c983f3f80a9c7dcd6d8a6ca891e2cb6fb2d1a5d17396 SHA512 03a1eac44bab42b683312c7f541fc235ead3ec89e7e0b6991acff431f85086df9dd8a9ee1b80f784c9c5452d3e497170b734883ed0fd117ef033079d72f6c1c1
@@ -218,9 +253,11 @@ DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc524
 DIST libc-0.2.132.crate 595317 BLAKE2B 1b1ae80e034d94468befcafd4bae4c41f29424cbf3770b827dd1d7099cd2364db62cf2e7343da5010e230a47fbd91d320b162f7b54fa3955fd195b6976c3fb45 SHA512 48340dd173ed4d487f6504f4c32cb3c13dac8ad4da95469c8dd79386a7564d258a9ca42ccf1b174154717bafc1d3551b87c8fe35f7e4e062c8e33da9259fec50
 DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
 DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
+DIST libc-0.2.168.crate 757025 BLAKE2B 2597fdf5a77345754b8c9168d9f07f83ebaa0413262b94ebb19f976f49cc2c47893e788ee2abb3d00a995bc8f99b6ebcf24abbdb320e18037e779e1241599b44 SHA512 499f7273ab5eac0961fd927d5204ff4d5b3b290c20d00ac99054ee596b6d3ec4d6712772c52b09c84554f0514a8f66b41995ceb5b0ec38a7295a4fccf0e94349
 DIST libloading-0.7.3.crate 27378 BLAKE2B da36353819cbbc85dbb3196585970b431eb5570140978fed8a6b5e46bec2560b373e20fc108b9520589bfd1f804eea57a524a0cb497620d4a8fd11030e9c4818 SHA512 58da6e73f86aa05132949939507a128188ec2e26e2245e23b1534d90673c9909c7d5220aa4aeab2c16249f7433b4d0f98f20c94b8b1f7434c7abadc8b8039ae9
 DIST libloading-0.8.3.crate 28480 BLAKE2B b8588be0e7034e94c808490adb8ee6e81c29e962aec436a0d8f8c7617b3ba9177887ce59b95b2f0af00ab030bc77b73e0a889d8a77b84deb437245211a969c94 SHA512 af8fa5fe2428fa98177d6adfc01bcd6e701b0d77ac18c95b8b8d5abb3a6376f16241ccc71b9fe100782c73c843ca53c9bad465545d8bb7def52320dad0eecef9
 DIST libloading-0.8.4.crate 28636 BLAKE2B 5961c69ce15cf2bfb4ad743ead808374f5a7a9d98ad5585d895fa4654b1c31309d968eb3f5d63e7dd5fa95b77ea59c80e666ab0e467849c858a807cc3a68ffb2 SHA512 670d82fde2ddbfcc28efaf7736d799690e4fe4b7872d95854b9c4320d64f45d4b33c0e1917228302a7625f2e5e55e5ad56e113ee8e67d59fb384b7054a0cc849
+DIST libloading-0.8.6.crate 28922 BLAKE2B cd9d7c2652bc4b0220e1c29cbfbca41f44d12d76c4dab3d025c21e5d317407ab656a88add0db95f1086934a424f55b4b413f33cb2a52cdcadde7641f9c5b3fc3 SHA512 f49ab79244d4b54c2f181bd9d7506fe5df9824a09446924dc429636e08ed7bcd6f5d2afaf8a0c862982e2c2c5832370b118266d36f36bc7b7522668bd598fc81
 DIST libredox-0.0.1.crate 4212 BLAKE2B fecbb90e2842a69f3967bb2a09b0181dce1720b60c5d762a334a279b52c00a9b4b52de72c6484603981c0c3e1cd8e173ef5e15fa290ce8b8888739204956be92 SHA512 31a9234201f5128f1519e108f7424d1740a67699828265cc725304a70f6a51e139f1d0c0e626b487857a7b421f25ad93e81b95b65cf0d3e0ad912388deecfb41
 DIST libredox-0.0.2.crate 4538 BLAKE2B 3b160b1ed9a476b1d51fb6a107ce2a5955495cd862d01854c79ac4f1cc1aacaff57f83e03be9b14f3c8fbb67c4124946aae19046620eb968fe97745d8cf46fce SHA512 4c321f6072bc4d6c32f9a2a8bc3ea64443e1b1b770e9d2626be86b3506cfb804c3cbafe376c7300efb09788510a57a626ffa65c9eecd447a2ad29532c307dc9f
 DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
@@ -239,11 +276,13 @@ DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST memmap2-0.5.10.crate 26847 BLAKE2B 1cf50f710ffedcebade4f131b8c3103b036778b320da671305c0244077743c53da155d444bcc4d0eece294234bb6e86bffe67da67aaf12a116573c64ce0ebc50 SHA512 39bd2734ce4f16c7f5a5e771f9ef92272b26f511421d5f39dfd2aaca072400ee38f2cd38352005c0c8c359095131770ce1c14570790bfe19ce6a17f711deff8a
 DIST memmap2-0.9.4.crate 32752 BLAKE2B 1b21af908061e6fe09484ce5f84d31ed1751301dffb6439512b38c53f9f090cef7541b591b968d0207c6d8351ee4d5949007caef7832ce130ffda1b3716b5454 SHA512 8bba078dba73253e8ee88f0bd2202dcd2afd0b7b800d08af8af593b882cb4acff7e297a3f299e253f5adf103893fc390dcd73e882a2e7d93ca96099fc2eace4a
+DIST memmap2-0.9.5.crate 33280 BLAKE2B cffb232e313c40c6a698ad6c9e6bf140193cf1cd4dc003ea6da08d748f11001c5426786f741dfe23490841350363db3b9adea927f3e40138b36f2f4558c7a113 SHA512 947eeaf7ded7241a256fc2b288013585f5034a77a18c8621ab01a4b47c0ae6e9b9414c5e9e2f2d47b661f8c6966b1ed0d159342cae80cf45e51629949c3b1337
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
 DIST miniz_oxide-0.5.4.crate 53485 BLAKE2B 8836697bdc3707f89fa869e6b09a36ee4d83ce2ae0a53bc7b06bbad70ed7ac25f8f67d841f3f611f6756d891f0eddb0abf7fcaf87570f8ab32220f113583ea6d SHA512 589dac16ca9c2f94e6fa92b68bcf51d140f46562cbb3a1b791b75c59feae51da5ec16042604bbd6bcb7d7f0c7f75e98ea1af8cf42d177133a5eaa86429cf3114
 DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975cb60f0499498a73ce4375e7d452c9ed62d4b0b6f6a4fa591aab55e5d7ff20033baa007fd6c839b9d74b31142c0b1 SHA512 2f8f09d7afdb9d78bfc80a228ded85a215fea05e577e907921f1808f84aae30ab118048d7b53295f11aeb5de70ab6cbdec892f3a2417bedf6f53a4576d095432
 DIST miniz_oxide-0.7.4.crate 56119 BLAKE2B 68facfec9ff405bebe99f52bcf3aac6788f1b5eef313ca393e2a15e1158bf294003cbe31efea4c793e644e8ab4e00ef67d38f7d32849ab6f01a8e19d31c30221 SHA512 482bf02d7bfd25bd8abe5e5959132677202d8c5dc014b9b0b64fbdc204be1b8431867095c140a1183dd1ca59f6ba871a355422fbd148ce34d62960cad2b7a978
+DIST miniz_oxide-0.8.0.crate 56343 BLAKE2B e4abcacab4c8698d0489faca8556faa7bff53d272ea0c80e2e7843dc0f6f9229b7d5b0a17ae210344722a379853e7f14212505ee05da4e60549081cf77717c1b SHA512 044b641ce6d98d1968c1ee0906f91963f9f524d6f3fdf3059708177a759e1d498c63e595d3a3f0f9f3210c45c828b9b70274134ba078b899d7fefc2bbddbeee6
 DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e936753c76927826fbc5444dbe33b7465a15d0ae6c122bcc98899959391a5418bff31c176d51d7b2f33077 SHA512 ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c
 DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
 DIST mio-0.8.4.crate 93013 BLAKE2B bc9722d2211195dcfaf574d83b2967d299eb02ff40b4fb4df2eb6b08d78e018ae1a9e198f43268ab2d38733feaa8298e9736dec9fb9add66c401d57406fd1292 SHA512 b44675c90daa37336a25e7eef53cdc664e6f52590ed4955bac82641baf8099d3d94850da79d985255eb74b61a499b1ea4a9d7309f6ea4c41454b3dbb090b70ee
@@ -268,8 +307,10 @@ DIST notify-5.1.0.crate 37269 BLAKE2B a11937c11bf32aa9b872e78009a5b92f04f326ef1d
 DIST notify-6.1.1.crate 40117 BLAKE2B e8f2626841903b7cb261ece9ff7d42aa6655b439a2d613f43a0d518355af2842e8731a6a2a92fdb84d82f0f7cf7423f051ab529cd22248944a19b3338e5b0f29 SHA512 58a44759d96c3ec7c431a37d92e1c1a0f112d75fac9651e9fead7a3a1de46074d79a251320b0522891711879da4ab42dd008c5a28a994039890f8d434d215e69
 DIST num_enum-0.5.7.crate 15199 BLAKE2B 8ff2688036ecab51fbfd74c1ff9b6ad22b229aa4dd0f9a57547252862bd149659e307042c07f473f99a8f15c744a6e6a484d57ca3b31eec785227632521966e0 SHA512 14749c9fb3cb30366e4915b2afd00b1f005de753ac3458982ef53285efa718c8059bf4804f4db170f43c1978c222aa706f30757c191f8613b8165a54a7c5f4ce
 DIST num_enum-0.7.2.crate 18571 BLAKE2B d68d127db218d8c4a34849cbf64a8dae823e9404bb4231504ecbe02236d04d96ac161c3dc6e400a05fb458e42bb24418ff08f937335d37839b0f9174e3a5725f SHA512 a002a35079c81eb39945b3b2a903c1d904924c8417e12f54b9825ccc04a2f1ea1b1b93ec540c746926536851c2f6a9aa71be3c05a29afbd5924236b3e7874389
+DIST num_enum-0.7.3.crate 18603 BLAKE2B ae7644ae0697518e538a38e33fc1658057641b719437351a5cd1d5add8ce2b03b834097a4b2ddcadb27937c266bf758894aab5e0949fe82b63150b8332aeae84 SHA512 8b8fc32da39d1c89210fda38098425f21cc384b6a38841f3b04264dbb24ba3c46344835be6e70b794c18365f86796a8af584085dab41bfa677136b8c9c9b6197
 DIST num_enum_derive-0.5.7.crate 12225 BLAKE2B 44ddaa0a4c3e9e49a4c476ee8b9db92a4ba6047628fce0758811aec2dc594a0902e4b168ff5c34aae48c3b1ef647bf1c3d84ce548d1826c7ea6877e6a4575159 SHA512 716d9b58d192230ec633207af741cd198772c6f0880a27255bf1b7d48e51f14ee987af14580982b0d22fe0e876167d9850b077f1b50557f47c6ff81b64542b15
 DIST num_enum_derive-0.7.2.crate 17090 BLAKE2B 708f474f6be67cf1f3a63d989b6e84ff33a165f0fce98a2d82d99eee71970f2bcc2c9b58395049d0b6e7e089446a9155ae6b7d6621895326c48049416b5817f9 SHA512 f3d825aad4a04bddaa42d07ef4dbc69c793cc53999cc2b32ef49fb28499cd812896e0c5b89b9118d9def495de0caa05e473109a0937876da4c1a628964a8ba6b
+DIST num_enum_derive-0.7.3.crate 17092 BLAKE2B 79b4e4f1def44702347a2291e7c2b3f97a902b4768031795d9fea53c624f31acce9f5ee68316d08af149681afd8374e39b596c3d63e3547445cfcd28d3b5314e SHA512 d670d60cf9a547232190d663d92a288b06953ccc5989c2fd9d4101db35be9e3e7386c42878c15bd820817aa703ba06af3a9641898f4a204fe9d7fbc32c3bd786
 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-sys-0.2.0-beta.2.crate 19364 BLAKE2B 19d9a4abc50b6e5f3629f44cc6f6e27d860d7482912d07bf8a7e54873daef69c102ab60f8bca5f7403a95320ca2395ef65a6040371c194fd4186d1a40486739a SHA512 8c01288c171522bddcc56e8a3a4e8e8e927b138298127aa4c7c72f5150111680a2cc2ef787febee14cf1c7104b10df1ae6f79d128a4931137974015b72cf9d01
@@ -298,9 +339,11 @@ DIST objc2-user-notifications-0.2.2.crate 9600 BLAKE2B 2ecbd3968df53f50a6d524fe6
 DIST objc_id-0.1.1.crate 3258 BLAKE2B 9a74fc17235ffdd7987c2735a7a9d136376fd13355f0561b4ecf234784aed077d1ab5aa11c1a82fcee7d47d4d36e471ca4ba3e5bb725a2ed0049a5565967326f SHA512 ec36fae6f5cefda00f3e44618b3c9fe6ec8f528f70d1a95def6421704bfa128a6e5b4a32e9dd686bf6ff60c4f87fe8094aa5e1c8070bcde58b17fdc06f49f9f5
 DIST once_cell-1.14.0.crate 31614 BLAKE2B b9ac8f889c86d4160ee026fca20b5135aa7bd60e8bfaf23946d003bcf0b666929a4da5859d874449d15b6ba0ec4c26e98273d020be50184b9d44ae90b8608175 SHA512 81531f06f32854e1794555e10ccd6ee2b6913bfefdd9eed52dd44a02e799fa6371cdf102cc67bc70d581a0cc4abb7dd16c9c12ede6df4ff38b20dc5908bad186
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
+DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
 DIST option-ext-0.2.0.crate 7345 BLAKE2B cbfc03e7c960fe3023512a4ad816d657b4f54f8ecbde9f9c4df4c5fee3b36b68ab463c67ad650778279e01c7ffaa63a0dacbd0c080c8c3d15b1611de0e71f92d SHA512 f8539f97b01af97e0b80fc96556002251befa60f8ddd19613311e62f9dc9834d71c22f5d8e7c53c4925046e38cdcf834c3c28042a4da862d6f6a21ddff8d8e56
 DIST orbclient-0.3.42.crate 1327060 BLAKE2B cee8c4f3bf0880ee132580262297f60bf3f19180e8e0391b414e96b8be5369505dbf471201e99cc047c2606e76302c6d67ff62415c8305e22ea59530179509e3 SHA512 9ab75b573fa32a4adaf1b640488fa5eaa88f5652428a89b700c2a871a595b77e35ae71689d4ecb9c64d0ff262e26e053a1455ada220a1cd5b8622c7828317eee
 DIST orbclient-0.3.47.crate 1324509 BLAKE2B 6596cba24e840b64db31ad9791cbfb60d82d46695fa15718918947040d9b8076d3134ad0959e1b7499c457dfe75b270e7feae9fc4474db5ae1a33c21e4de4009 SHA512 dd232376bef63b9d422949eaf2a210625c4b644faed72d58621ac8693ba6095c8f7a4df1a5d1743fca8d6d68e5aa44ccc0f4cd3dd2b2f18e7b10c263edeedb8a
+DIST orbclient-0.3.48.crate 1324601 BLAKE2B 1bdc302ed1e10272dadfdfbac73ccf1a889f2ac2755d372f00865c57a976b4ecf3bbd7a1546ddb3b288494881f608950f8715d981f3806b6cf622b7121e2de3a SHA512 b05ec78963f0e12ecb5d6675df26e8af30cb11aac96f0f1eabc16086d85403c3c6b34792921a36a96a9d81205a5df9b6a626391e2fcd1e0fb2b8995cb28a1acd
 DIST os_str_bytes-6.3.0.crate 22928 BLAKE2B 84e8197375742373bc7c7a3b459f8a9f97ffa0b8a2e517bee0d8ebb420a8509056cf56984612f44171c6b5e219b6ea91b14134fa6386b3cf3502b13ab92386c9 SHA512 34f861a15543933c9fcb560a835bd943231ffcef2c68126d8633f8e792d2d59a20765947feddb0c795a15329d74260d6c2bf74a1f10ee88f355f47240acbb42e
 DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
 DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
@@ -312,29 +355,40 @@ DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb
 DIST percent-encoding-2.2.0.crate 10075 BLAKE2B 397e59acc3953868c709244b89a2e0db3304c0b574ecba761026b570a485f2cb5b0b2a0159586d1f342ec395ef02ace536da3bc1c72093e1cf93f8b37b26b0ec SHA512 890a5256d2b4290e12e04a02c3529f3a017faa2b6016a4dd0f08b36509f0b1107eacfcb4702024d6a21ff8852a11f263c1adc096b16ef8d12c45a734c087fe68
 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
 DIST pin-project-1.1.5.crate 54214 BLAKE2B f4adef2c4f5587ab0523e92b7a662c035882237620fc87aa3919bfd360745b587ab84cce3cd0db24f4f15bd358a46af1cfd196c2071836f4d300be998b6bbcf7 SHA512 103e58f1779cd2d6c63053e9448d0f53edc7f08f29540fe0de2dded1dd0b7de50cd62d31ecaf6cf30b1a7f1f5e4728beb2cab3e40dacf8ad5d5a7a6254527578
+DIST pin-project-1.1.7.crate 55438 BLAKE2B c7cc110f906d29e25325ce1fee00777917d0d07a4b53e65bd6e25d54df96bcd8fbab0ec33a8b994f8e0574ad78fc3c590ce46eab296653af560b629a5b93d51d SHA512 ca3cb06148fe20d64d37f6f115f838da2e8fd0836b8f08b316518f4f5e679b3776cc0fddc393add0f147bfc74756c03a2273dba7000e218698f9b6cf4b2eb093
 DIST pin-project-internal-1.1.5.crate 28280 BLAKE2B fa30a86b1c2d1a66d7e427b04772efb68bfd7c006194dfcc458713b4dfc8c90929e43732e0792a9c33285855857f0979780e854e303322243b7654a120f74ece SHA512 f0c264460bb111ed8d0d3bf57cbb0f6a1adca16500accca4be7e5ec0d292ce6e1319c6b98108c583b85c3211ca1a84a5470f3e31caa63989f52022abafddc032
+DIST pin-project-internal-1.1.7.crate 28549 BLAKE2B cf09f51caeab7b9bdc8e21e9a4b711666ba4f1fef47b9168fca4ed4cbfa1fd4a2d1a258c3c9ec9c5538e38c454e03b54f6c03d3dff976d0156418d7ae7f5dcbc SHA512 7ebeb0cebc01fefa327e40470df1d0bf40aa3c8f5e3ece8786bec5bde0df7bce3a12039267e731f56964fb8b45d38f2e8971be0e3753159ab47b99fa5176fb29
 DIST pin-project-lite-0.2.13.crate 29141 BLAKE2B c434a336716c9cdd16ebc297fed393e9106ef167a693c4aa0b12c681e03141b8ba3cdf64c310916cb7d5cc43cbbfcaaeb39bb5fb1e8b3efb9e94a3f72af914eb SHA512 7f12595d751d315de6c0d380e2f501b74154661eb676987d2cab6fdc956091a68c9cac658df45dbff73615e982e6ae2ea138c09ebb708cd6c351f0d18dbbdbee
 DIST pin-project-lite-0.2.14.crate 28817 BLAKE2B 8e9875967059faff399fbffff82cf8835982c46ea8df942acf50b038e3f500e04d3d8cde39da5a71ebcc38b869553f8c49830e484d1109b353247a4cfdeda89e SHA512 f90a6b9f5ab8701718f72677a4f3597c1b9f32e5fa53198b47a94696227ea37815997599abaa6058b217c5b32a94602582c6b13fdb66e2d683bc98921de95293
+DIST pin-project-lite-0.2.15.crate 29683 BLAKE2B da9dd581eca047f089c2a069a355caf66a631b3ff81fc07220a3c378dc77ea2c399b165ff8a1d2f6556595ec52dc1bbdcbbdea5ad9e5e317281650c9158b3669 SHA512 ba3c22c70f98ee0d0e78fb8a25bdc3100b26c3f03f3e4c6c0c238fde75774c5634d6014660c39406a828d1c28f17f44f20fe19dacd331c4da2f4961a7f7c124c
 DIST piper-0.2.1.crate 15878 BLAKE2B bf63206c72b08a87da7ec5949124bb2742ec0aadb116f4c2ea86b09adeec4f741479b64e92f824a3df87ae9dba07ebdf812cbb6622853f9223f8ed90ee6dc389 SHA512 86d2195b8811bc2d30050e977925a947b175ca674e99497b7202dd8c515e09fb83e42f389ed3c6b554dc2c6480892bfd26c91fee463115ef1c710aaea858afe1
 DIST piper-0.2.3.crate 15924 BLAKE2B 13263d38692f954b321568d999c92640040b4a411ceb82fa68ad84e32c40f56d62db49a0611f4afc24825fd8aa7252422120581e173d9adc236e0294cd11e759 SHA512 18867a2ca43c3224c3c749debdcfb65c07e0fe28759973140320712ec0d6a86125635665aceb4feae0c3aca9667048b6754121b7667a2c8caa1ecd2e3b3af7c9
+DIST piper-0.2.4.crate 15950 BLAKE2B 265ee8a57029e6ffa6532dda8e4da94a288504b658fceca9426d2c13086255cfe5a1013b58dd02e029ac658b6bfc8ff59b88458fa620a41e0203413b78b7ce1b SHA512 88c6fd8d1118b37b77217fae004e47c01db8f95b9b925f1302c0577971a8a9f239b4ac07ccbec924d8912cc47ccfd88eb2045cc607b5fef3fbaf496d24ef7df4
 DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8
 DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
+DIST pkg-config-0.3.31.crate 20880 BLAKE2B ab7676e810751f89639b60ae70bdebe1d57edc76319f83077c3680049a701a26e72e8cc485fe77cdc4346fe3571d32c59e7384c8c86fef17e00d7d81df5daf43 SHA512 ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4
 DIST png-0.17.13.crate 103176 BLAKE2B 99bfd1c444f5967b715b81607e3c3266fb3b1d8110897e4c93afb5b6e0e28df262f9c9d842aefed922c38a5ff9d16e75cca065d7cc14ddadb3a7e9ea4776e787 SHA512 064a932f4c48c2243286a9b4cdec0487cc976291bc8ecf4753691afdfe43acda4b17ea8d48ec933f309d158df28f40ee93b5b32b3ab5252e2e7aa1ee1c0e4e84
+DIST png-0.17.15.crate 117111 BLAKE2B a3bc96ce64ee03b9f3a3fa427f11d15407128a8ac7ba1dbe87f630721f54395de80c849cdba4588cb1540974b3061428635f4a7b7e3a84ef78c188a49029389c SHA512 0609636be889a3895246563cdf0a5fdec28362fce1e8da52af24b756c7c489a3e10a60f64628a015223648d828594e6c97450edbd609d21eb50f4f80ec0119db
 DIST png-0.17.6.crate 80695 BLAKE2B 2fd956ff04d32a386aec4210939cb9cec5dfca4b72c98dfe49aefa130a229414e6e1692ed55fe9704dd56ef11851b61c3fe0fc50a9207192407432c1332c3f15 SHA512 16a3c657efb1a23b47b2bd51f635ef35338c3b9920b604f216dd6d0ac3a8b21e12e854591739bded2947036f4fc1abde0604d9a8ae5a6639562a46e98d29ee9e
 DIST polling-3.3.0.crate 53946 BLAKE2B 1a2af5e871903a27601e50074d3091b8fa8704f2cf8389cb66b5d0719aa8ff17ecb289cb383951fe01acd8fb89ec094eaa1cafd4857c099504b9f0ad65a85129 SHA512 71bf001ae4cd488a2ec272e9f764cfe127ac5bdedaf4284cc4bea912ea0581c68e2e68477de3602e6cdb40c634217c4565310a60c578d6e18c78dc08a9616c6c
 DIST polling-3.7.2.crate 57988 BLAKE2B 4a957ac93d2d4b1d1cda0525b42b6f5b9a3a93b115fd107339e7cdadeb7344833749467ee99cd7c77de0a065378faf89dbf85520fa1a71b67f71e7f9dd5eaa53 SHA512 d98ead0c929458f65ff75b9712ef9665878ad2656c729333eaea4340a236f67876b1c665eb683f695c9f12a89420401e1461c39ae8297081f4789dd5d2a7562b
+DIST polling-3.7.4.crate 58239 BLAKE2B 4d42d4112693a14938aa40692674ea1d791ec251ba864d4820b7f884fa859bb8e285f997150974a1b09fba0be1f0f77b196376aeab02295e4f433705a105fbe7 SHA512 0a137aed396f9b6a34a69ceb043a355efbdbb6674d36664e767516b2555b51ca494b74cbfafd530ba2f9b48eb7ffa55ae1bbfe7b1e8ce7745d41600709a5d324
 DIST proc-macro-crate-1.2.1.crate 9161 BLAKE2B 4c498132d80ee3de239991e2c631ba219accccf093460b2e3f22ab364207336f575692ceecd92be9735713b0c999578f13e9a3a6bcdb26024914450f9bc3711c SHA512 94e39efafb9afd36996b4b03f23398c2b01e3da3f029d868e7cc9c114dee4263628460037f194b3e31580c931ee7842882633fec3f39d344c71f961e4deed0a7
 DIST proc-macro-crate-3.1.0.crate 11084 BLAKE2B 9a9d02f0f34a30668ba94e34d51199c332209c47fd8bef28c452924f75984dcf3aef2c92c4ab3fb03205d589e4f773d960064b4d08fdb2480168f10b84fafe98 SHA512 eb5ad763aa700f2cb1604c32a4bf2fad499a03ad868a22d06b0697b77875b1cc13c739fcf165b2bd547207ef6dc3bd13ceb75e1a59c596daf916f356ed27d8e2
+DIST proc-macro-crate-3.2.0.crate 11164 BLAKE2B dba3e1f4e38f427df72794ad891746fbb8c24239cf06b076e75ab6795a7e8c9abf25ae0f40379e07a696827156e7a3780ae242da7e5442cf1224d058f54b83a6 SHA512 41479ec5e414a8b05dffaa0ece21122387d5165a54e60d8ee3502f8a3c0a2ac0247f56996f933d5d77f1efe41a56bffe16874e8c6a34b66100cf047e4b760863
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro2-1.0.43.crate 41512 BLAKE2B da0577094cb0b8b419f3160bab6342f97865b01337be4cd7a344d4dea98fc2f8905dd05a56427792379f59565a25f8e16cfe4a37edb3bf77bf2e703f27953fdb SHA512 3139c668dbf593afeb77b970c77edc70f7b46b42d80f1d0e30773dedb14ab98c9eeca0dc953bc940610954860fbce663174ea6c270b8711db45aef4d57f3b910
 DIST proc-macro2-1.0.79.crate 47200 BLAKE2B fff8e514d618b8ef60d6a4ca7610607641cb25701fc5e8452e0db5f942a3c38c724acbbfb0474823fe0f4864df07958c1524383e7640105266608f1d5a741368 SHA512 8bfa6fc1022556cbabe0050a37b93c5ef1056ebda9d3dd368e705a7c695df9dfb5cd5adc18ad1eadf7338631ad1d5ed6f63f0adff3616429ef8c50a930b1838f
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
+DIST proc-macro2-1.0.92.crate 52353 BLAKE2B 9aa29fa6f1c56c0392a94a81b4c61953f4d185012cdca37e356817845535da79d7094bf43472ce63109ce479a2fd0cbef4d802afd61daf92c4db303bcac60e7e SHA512 e614f08acc0a7e97ef580479cf5b682378df1ca16f09bfb2296ebb3490a435229dea9d682c621c54ce57e8e1d3b7803eb8ff83c88bd02e07228dba6d02f14aee
 DIST quick-xml-0.31.0.crate 172236 BLAKE2B b83c7f485a30576027a4ae77aa23cd6284942d786f0f0a14faafdfecff646371ba15133b3ba90f820183c8537c8ac47ad3e1e7deaad65e56761bc662be406026 SHA512 9b1f4f9c32694ccb244938a9a4e9373c3902314afb6af5d2f6b1be55e5ec63fee5cf1085f8f32161570cc10fdd96f3375c7564b1d884bb152542b86593f175de
 DIST quick-xml-0.34.0.crate 184595 BLAKE2B 5e51d79b64aadbbf23269b7a0a344e2c70465a74107bf633b258e2cc0165745d2b43132392fe97792ff15a3cd641be404c420680290fed4c1843747f77f9c2fa SHA512 d7c9e0ba651da1cdb322c10d575d9a650767c1694bea7df50b49dc98f0296a671bea2a3700ea3099dd708f0ed3f480fc921c90e86796f36afff42edafbc76a86
+DIST quick-xml-0.36.2.crate 185201 BLAKE2B 4541812a73fd95bedf21f90f07f27b31eea6c514ae17818ba957dd83ed176b0f17bcf3860fdbda07f0fedfdd7ac660bdde5e8ae2aa9903bf7a7c8ad2d4770470 SHA512 7cd4778dbb1f50fdfd7290241fbb42c8529f7d44c2633cac017657010d0d443024f049287e1a1806f5bebe46465549973cccc660959c587fe383490a150ddcdc
 DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
 DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
+DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
 DIST raw-window-handle-0.5.0.crate 11715 BLAKE2B eb6748446b380699be47d2ac601854c25b4af685ce1b3999e73de504288020b79783e0f9d32d4a8b80293c5be26caf63e80176952773cf63e9a26ddbb9e84844 SHA512 bb7db6e426ec2c8040c48757ed418efd39314db0250f31787d5bd7bdabfa0ab08c9290da601d4d449167ad6f24d3b8a8e7203c58b6c8b45b65a8c2785ba88b5c
 DIST raw-window-handle-0.5.2.crate 17063 BLAKE2B af6170239d2a2e9db62ed9450cee9be6350fd8f74d6344ddd76acfa873d124996dd8dff798a79e8c03fed50fdf26b2731b150bd20f8dcf905c8d68da351e0861 SHA512 51d93a4609533742178ab15d4454ffca1668e2a03c2a6e742ee2a61554564c74307311a50e3992919451f4f4d30ac112284413fb4310abbf06c0fa24d85d5971
 DIST raw-window-handle-0.6.2.crate 20234 BLAKE2B 9bc9b1188cd3ee8d799d45908de10f98a4069850e7855c1f7db86ffdcf49661f8ff1294da2f542fe9c09a3e8551bb34e2702f6a88f85306bcf8a36e03bfb738c SHA512 41020ee56615607aa0cd75a3f09348f3255abbf8705d68f001b3f2d7ecdc6c4f5ee060e97c4a2ca08607892e49d2ef009ea4f3b4f3c6256e593c6b66f52ffb1b
@@ -343,18 +397,24 @@ DIST redox_syscall-0.3.4.crate 23293 BLAKE2B d4fe86f60f12117e318bb19630ac5a2cf65
 DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde
 DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
 DIST redox_syscall-0.5.3.crate 23830 BLAKE2B 0a38235ec277144f0c3e7bcb1d273c7f357d85aef33dbd06328ef16bab7df0a07b523431590899ea58d55e8e1d84c32392478530200cca3a9483e8a47b29e233 SHA512 777d1208004b7756887d6c5745ea408972670e59430e1d299d01a463ae41b98e0920ee77aefef8755fc949d4799dca679afaaae9c1a7d060f76f69af5b90427e
+DIST redox_syscall-0.5.8.crate 26319 BLAKE2B bd69a69e2a0f3d84843a8f76199ef6b3991698ebac58b23f69c26d02f5f3e24e77a9d5e8259e9fbff3887f06d15ced94ff23b5a3272ab475918e6e3e753dcde6 SHA512 5f9632f1f89f4963c36ede4da9b955c3474b673c3414d81cdbb61f46c08eff67167f703a0b06b239beeb2d720f8fa592a5493c0f7e872728b5b95f561ff11348
 DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
 DIST redox_users-0.4.4.crate 15438 BLAKE2B 5f44e9ef20f1a6c8b22239838f8f6a6648dbebd5b4386b3a2c417e39add8c4a0dc32e4369b8bb4e0ea17678140f596b9bc981b1d56f06de6a38a503600420481 SHA512 7c208116d1171b1f52f22aedcf8ad00076a3d1f062f4018f4a9f5fb2c38d7ed83258589062d1559f64e43f3e2a9ddf789799f57cf87a49ad8a37463ea09aa269
 DIST redox_users-0.4.5.crate 15514 BLAKE2B 9fc9d9c4875ed711efb75fb08f345b5f4f0667717d37710143742e48251a709c53760bcbc31ce13e6432672f9417be429c38c2e77a6b786887841714290a1194 SHA512 7a25cc91c9d1bfe537f20b83255990681d136ced5aaa7aa0cdb1b1fc024ba36aa1fb75c335c768a85ee078019a9ca2460efd911cad8ae6fe8b0385fb171aa4b4
+DIST redox_users-0.4.6.crate 15585 BLAKE2B 1d60d0b7781395ff271d79264910d24fb021cd8ef612714265abae25b26ac158d48f542f1e73701bf5b99bd67546a7b878e4a14e40cdbd478b35bcc8b4778f5f SHA512 719d63fec42bad3cbed39deb9242ce1daf3f391bccafa8121f63198120371f112d78b0da8d66458519e946581511004983f04b0a697071f22294ac7c831120c9
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-automata-0.4.6.crate 617565 BLAKE2B 8f1e2a3cc1d2d50478776281d2bf10164ef441dcf7127994f4a0341ec40588ec8dc1c07fdf9f670da9e61a7753551500b80314df130370b61d2c03c2b2e3135a SHA512 b288e1facae2612f73d3de3fe9fd1af13d337107004f990263abe6277b31b948478ad9c2b807dcafa73fa565e48bdf2113139f5ca67eb73165b7d29e2ee5c9f1
 DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3
+DIST regex-automata-0.4.9.crate 618525 BLAKE2B ee3fc41c8c445be4c1aa3e5b19a3e61efd641b1a24e7a1ed55f837c1fba9c816272cb4645c13232b66b170bc7c413802928beb22e3891500141ad4ede65b60b0 SHA512 40bde0ec91cc27bc0c3fa237a37ecee5a1f023dbe006a999c5888f8f578ee2c4c64d9edfe1827546cea8e92ca3c10f8b4d494d81f3d0422b40d90bca9cf598d2
 DIST regex-syntax-0.6.27.crate 297300 BLAKE2B 4ca1a2e23d04e29c5925085ea4ab7ebcc398dfe135eacaab1e686aa8be43a110a28e8bec05a6910183f9a6bb1fd0d635fcb1a60b5a6a03fed4d2cf937a542a5a SHA512 5cc705a5dda08cbdb4dbcf3fa98763cadcda13d9c3ba407b35f3e88d77935efc2704bb40b3fb5aad7dfbad0df43bcb4c4cad9732defb954e2228a0739f7c37c6
 DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
 DIST regex-syntax-0.8.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed
+DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff736f2d9991b19814ffc1a414ebc5b76e84fb8fd36c983b38e8e391d165cdd9047832b0d9100f0e1ba7085484b7db5 SHA512 549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8
 DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
+DIST rustc_version-0.4.1.crate 12245 BLAKE2B 0ed627c560d88e5ade830cc5f72c62f6ba88be3e30d0f8db34761fcd0b284e5b2fc063c240149aabdfb12c8410ecdbe50cb10a3544500b5a020f95a31cd6709c SHA512 7aa8a487ca7411b6d23cae62f7568fa3474a7b1fd1589621071be3428a550ed3b7c4ad68277a8f86849e5900397d7d0e9d678f5d423742a045dc7c660fa6c598
 DIST rustix-0.38.25.crate 362735 BLAKE2B 8d368458850d031d63c76c75e716d8e580a763fa365aaf3f065de7f6f28fa314cd57c558286b0322438b9a8fe5475ebc709b02dc804862e02ebf02ad8fd2f30b SHA512 f14d3112f82e254ee01059a845062e305b5386b84e2de14fd89443606b37c5640322258cac91dda3be79b11cd72de60557515649ee266bfe7a796a284afe6a11
 DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
+DIST rustix-0.38.42.crate 378683 BLAKE2B 4071e1118ab8111bab9efef39c6e35f8a3030cb230cb3643df7ae09ffc750b18becf1f069c2714b0b6d13e334c12446433057fd015c9dec04d7a1372a354ae05 SHA512 438bf1e4663cacbc7c0af23b10ecc11c8b01c53e18c2e82a740c46b4a61f06cdd25d926aff27a9c39084c39d9c950c222a1a3a6d5878dd240554fa593fa762a5
 DIST rustix-openpty-0.1.1.crate 11478 BLAKE2B aa0a3d7bc32106abd32c63ac079cc8a875d9bd24c7ead610d05d8ab42670a7336dee3799a53734578d3220bfb30446135f277dd70ce7e0a1b61960c227f79b1d SHA512 8703471173aa17ba82ecc6f231c88f13dd9a5486e7a5931071920418fc8f5e2c1dfea1e17f2b2fb95fd6cec0a4896d823c00b7986048caec8b20c8f9a7c1b708
 DIST ryu-1.0.11.crate 47007 BLAKE2B d03e8df69c3b21c1b2e4ffa91ece794f141e9f9bce4e9ed1ebf394b1cb0f796147b86189885f0734df8f431b2d166d8f6ed6a261be398d6d088fd56046a85c2e SHA512 dd2642aab2d3017c31432436226d5350b894c8b88a09395eb7de6350964b3cc48451a829ce78b04a9e4e0480076fe1bddd0604f4e57700faa2d60cac6e361408
 DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4
@@ -370,22 +430,28 @@ DIST sctk-adwaita-0.8.1.crate 53712 BLAKE2B 2d54470cc5b8f3c6bbca1cec1760c5e64797
 DIST semver-1.0.14.crate 29813 BLAKE2B a080f0a65127142a90bf033452241ffebfc7098b56a6a6b8bd818528df3b88fb48b3982125b405c1601e1bd55f3a0fdb4ffd9653e398295d8156651a04b2e903 SHA512 04db4c0a30141c2767d24d6d715b66ecd6355c1c88e572d4c473e0fa8c1fdd7197092b8286c973f25d201c5fcdc9105ba3e28c11ba1546a666167afc1fdf6728
 DIST semver-1.0.22.crate 30446 BLAKE2B b77a951d959a3685b0373c80b9991a8567f8926d093b23b7b8fab48595b5d565acf7408fbfc8f4d58331f39e316a8068885d28bcd70c1476d1cda436a2dd88b2 SHA512 7dcf9b6a02650d71d6c9ab3c29e44fdef95af296208f26aa7be6fd6e16773e5e5e66418c303a0589d1165df6dbfd46ad6ebf9eb5b3adab25a51f340947b2d949
 DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743ad0feca0929bf2409eb81e03637ec5f92ba9f38ea386c4ee5cde72bd3d2042083e2fb0d6fa0b839b1c5093a SHA512 5ea1fa17c08d1280c3a4bc8d28494e88ee05acd5dc969ef6f0c6f91fd3b5a8fbe999c9e8bbd2da383413038b8d29fabf02b87bd5265bbb8333f3fcbe409103ec
+DIST semver-1.0.24.crate 31267 BLAKE2B 934f55d953ca52f6c11696889182e1e4c660a6eae3917b15b411d91a18b22c6a1178708caf95da93e70e6ea97c0762ed9154333d60bf0a08b156ca7b50c4077e SHA512 751bb04fb50abfbb92b2612e1d1097f612a1ceee1861852681d6ad67fe459d77a72898903b14f2f01d8185fbbc022c7471913785610c2a8e9d6530e48094869a
 DIST serde-1.0.144.crate 76387 BLAKE2B 7e66355c24e1116eec4a3ba4f9164570b6d4ab57196d39d19a0bca912c9d2acfb33d8e17e09bc07903984dad154034187d0ffcc8f9073b36336ac2b38ea012cf SHA512 d7388a40e4a5e0a65ec7b49193f2d53d758adcf26b98ca3bc6270351c7553add2f38a8434223a95826994c6d039dd91fc4f4020ce191410fe57bebd29e4938de
 DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410
 DIST serde-1.0.204.crate 78253 BLAKE2B 6fdebf3cbcc0327b404caaae43c87ba2b6105374a5ee3eaa34d44866e782132cff535da4c069c007783b7b6468d55cb1ceb6a41da74b9eab03ace7cf4811e09e SHA512 2fefbeed0117bd791fd25dd5ad0c99ed4f60aac5919605b6f642050f748dd472bf9d4d121b78b0cfe8719db30a675559d097bcc7542cb57451d1779dfd8d294f
+DIST serde-1.0.216.crate 79000 BLAKE2B 98c0f5cee2f9212c6b7620d2068665379471ceb7557d1454cab9b1c2120b526ef597fbb642f65440e70f92a4764cad33613b478bacf99138dd5bd51fdbdbee6b SHA512 baabf4c7aac4a540c9ed18b336662087258b71c9cb0e547c8d83a2734818ab2cbbe62f910d812eb61d3d46e653c41a3eebc99b1d679bfc51f95710c71a8ecc20
 DIST serde_derive-1.0.144.crate 54867 BLAKE2B d1eabf53f4efdf95c3c12a907090617e0aa02661fa0e3cc51bf0ef8dcdbf45f0382a57588565ce26ef7baca330c19ad216a8a0975247bc02af37c4440bdd6859 SHA512 d41208452b36b8d3f0644e58164c9c4e75f8cab2d8be09cfd1b38bdfc690e880a062e0eafe46dd4400d01f541b34c9acd3574504c4aa856afb00cfc2e9617a0a
 DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994
 DIST serde_derive-1.0.204.crate 55871 BLAKE2B 8f0cdb244a820712d557a3273e505c4461f4d7db89e8394040b4c66ede787b6b38b4c9923b38959ab4042c9076b8af72008c0dd15ac93a0ecdeb99da8fb526ae SHA512 bbb2b5e60e2af5bc7528b937ffaf0d3ffd433dbd9cb2592c1e07090620309057e4f11cbd6112fc1d2c5557e1bb3c0f4d59eb06ff06fa021ec683ab880997140e
+DIST serde_derive-1.0.216.crate 57674 BLAKE2B 12a9228679c16288c08c8b256707e276aec79f84ac7af0c4cfd1f109500dfea80438df17d798acdd30a9743c753e70093b22bd324217529bac483f257682a3e2 SHA512 80fcb552279ac7562297df878f2f5e9ac09241701f5cf1088fcbf473b638f58cd3092a7930d8937ca0df9a47b9ae1a42d490cd46a275259cd8089fe8f5426469
 DIST serde_json-1.0.114.crate 146986 BLAKE2B 229f0a8e2c0bc35435b49774fab9d4cec4e2323e85e2f97ccaa2a18277ecfb9cff9e9b165786e782cba043e9ac670717364b0f9c145254eefd74582b728f2186 SHA512 2c35cd0e29ee2af6046ce849b5854b82b90f402b51c04ea86b32ce7d67869736f17a4d028dd8245c31201036bcca7a1d3df11d842a92a45b0eaebd809687d436
 DIST serde_json-1.0.120.crate 147062 BLAKE2B 54f93ef2b0f1c9e7c5a8e8797fd298c96513913a20c3e08a21aea39a15ffb5ad0269d5daab10fceea7164ba432e355b89d89dea2985f86bd0e73ac3920f827c5 SHA512 dab44850326f9020d6f6dd3fc8147e22eed693527fe9cac2c6bc8f6a030f461061e8e54d2780382ce32cced63b5a016372a4f9938effdd1631d8f3dc96014e3e
+DIST serde_json-1.0.133.crate 150739 BLAKE2B 7891eb5b8edcc7fd09ab1e15d3881ffdcb629aa39f2bd758c0505700a5f2dfabd85b1b66c3b094268bc1627b346e204c792f4ca61efa76c54ab9cd5744fb0ee2 SHA512 20e65ec87bff319897a141960d13deb5cadcf821209c1ee8799f1dc7f458ce432bc62c16df5bdada1c8d3cc01ff23b8125e8fa0a03545d4614f32efd687dc69f
 DIST serde_json-1.0.85.crate 144635 BLAKE2B 03d2de5563c8b8e9150b656b62329a87a5dc42c1fe389e40291a3b2a7232e2342b6e52f6625ecfaa8cde4420017a0db82b2ef332f82f2fc1caa50b98e544031b SHA512 b9ba5c8f5e5c977d31c720995317c99486897a064993784e8abd4e35e0c9ccf20d421552b4436cd88420b5e6fe1d7ebc411bbc2e803cf1732e133c29365834bc
 DIST serde_spanned-0.6.5.crate 8349 BLAKE2B f4f8f798ae3a02c0d5178aa12a94bd1bc08fef88b6a81d782ba07ba36fb0d89927ecf621087faf376b6e53de12f6a96e0880ce0cd01ecc31c5dab7dadc6f3ff4 SHA512 bffe2398629ae5a5a5bb6d5fc2fa0f4b94d02c96e25d1be2fb9ad95d8ca2fa9bfdeb3af11049ee9c050e497f3beca108f03020f88f6de29b208063c3898af354
 DIST serde_spanned-0.6.7.crate 9164 BLAKE2B 559a62c0ac00a1559947224bd268842f35c52f65d0d52102c98b5e683dfe4c36acb015edf97c5f79ff818dc575b3ae43c3f100d18eb7afc3ab9c96e348ba6794 SHA512 d0ef413867a705080fa68f84a059b4d04b604bec59323329ded7ae03e0caec49c89fc53640c1e58c27bb23b5c9f260ed176ac52f3a93d25d8d7643252dba037f
+DIST serde_spanned-0.6.8.crate 9330 BLAKE2B 630bb2cabd74e8d9736e315ac57c4d2c5c4f72264aab35ecc8e0040cb4186885722051a9f7b8a9006fd121fe58428cbb151e5cf541e7de30b6528c84e968f7ac SHA512 2343a2fda35ff57ed8ff7d8eeadd651821fce7e22f91c2d5797c6af7db9e009b7d637382f6f390c17911912865a5aea1ce87a86fbe36f4b6aeccb065a4c8942d
 DIST serde_yaml-0.8.26.crate 40670 BLAKE2B 78ed7b0d45677e2ff5bb94e9a12be0ab72eb2229e064a3e357a7ea3566648f10fc6c2ad5c07ce6067841392c97d4034da5d54d51939a08d81f64815ccd798642 SHA512 f6bde42539fe35dcb09fd506149c564f2056102f15ce275034b33c40ae666e22d6beaecfed8a0048704547f153fe13d52b8b305c95a61007784ee42f6a8372dd
 DIST serde_yaml-0.9.33.crate 65165 BLAKE2B d72edc6e5fe569d20bd909d079d3f8a3db0aa85bf016eeee755923c5f4dcb4dbf896cc6c15920d9b2c1ccde909a6d8733b63843dd2f8149ce34ef4a09889dee1 SHA512 cd41feeabc886b1f02a240d1234f31ea0a67b787e9888e5d8d4397dd5bd389cb5c920bc6dc72f44c5b25e1cb4434e410d8c0b01559f1338e8b1a3f90505f6e02
 DIST serde_yaml-0.9.34+deprecated.crate 65290 BLAKE2B 1c1f8c7dd1a7952948596d8c727fb6fd36426c7b80ddaba2e6065db7551757e6fb170c77373ba9784f6b32de9f8aec94f90e1c85df98b9ac1f75a7cc8e5da174 SHA512 64329436d18bc3b1a0737afff7c8727f7e04c71b2bf6022f597a45f0860fa3a678eac688f61f0bf7a7846f98809f427c9907625e1d00c8691c383043c1cffaca
 DIST servo-fontconfig-0.5.1.crate 9738 BLAKE2B 427324bb5c44a5d254000b86e21b2a52ccc41eb40f0492b54cda09c02f4e66da2242d2af662adff1c55098dc46b776d92fd3259aa34cea1d76beb18fe62d2c0a SHA512 7b76733b15e083d2edf2c90b56ada7442898508f992bd91e94f751c21cd42168fc28ad70743e03ea01d99b0f79b2608f126b5241c864c25a21eacb820d9c2de3
 DIST servo-fontconfig-sys-5.1.0.crate 1790708 BLAKE2B 558927804da2698ea6538ace2732912da54216634f4b6f2578d64c4b7da78dd62339a771ed56a57bc66ec48d6f194916057d6753bd25f1d9d93bdf398d365f43 SHA512 7c73c1c3b6fe3bac24d373998e14ac875990434395e543a241f53287297ebcab4b90e0e2a32ddc6a24e1eafcc095cc5cef91f0370959249d08c6994e1c4933c7
+DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST signal-hook-0.3.14.crate 49446 BLAKE2B 927363305748118e235fc4add923678cce406d6c5041cced17bf2a0602cf5a912d31143a4479672eb12ef86bcb682f54bef8489407aa1c1067542da295fc788f SHA512 32ecf012e46b94d3a87f2e56cd4c03a97886013309a4e52ef3e7769ed14b49ae2814bb6346cfc9766525dcf15db4182d260d3c9311134e3e6f5301c58729442a
 DIST signal-hook-0.3.17.crate 50296 BLAKE2B 5469a11485362b4a76f99c06071c69f6cc083bf4cceea93fce0b43385163ac3621b7a3c98d18ea1fb9e1439460ea37f470a29bfde9dea199e60a12b248be5d25 SHA512 045ac6268e504c5561d3884610a48c930dfd936086f793839f42602e92e4a8cef289955776e8eba8a5ca1a91b5f27ccb3724f49b32091f8f06c8bde984d82298
 DIST signal-hook-mio-0.2.3.crate 9064 BLAKE2B 2bd11d0fad02fab92871e0129fc4ea3a609a43cee5d33737d82a624018eaa90077f2c92fec88f7b19d3ada619b8618f9d33fbd2cf6b7c63d3175dc57fb0341a7 SHA512 98429330c109dacbeca5f0788d993d1ec2830b6f95886a433592b2096508dfef2027d62a99b985654dfcd927f7f3f93fbfc19361f8efaef5efe84cbacfc1ab08
@@ -415,15 +481,19 @@ DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b
 DIST syn-1.0.99.crate 236084 BLAKE2B 852493506271ee364ecb6e907fca55f18af9dc7ec4b4737e43e104d04064a37a2a59b31f5f780621785e44606d43e74adca5cf24c9ac1a8e186955c6b3e43b85 SHA512 47a9ec4d5e6702709c1069d1804d29880a1c5bbbed5a91c44e80eec657c62ceb223d6fbd942deef591463664766ae1997d154525f4e7a212bb84151418f40d10
 DIST syn-2.0.53.crate 254828 BLAKE2B 4bbff9a430e12baae231eec35dca4a3130e9977c6272dcad4a25266441959461e6e2b69832492a6895948fada9152abf8630c1d011c93912356397360bfb7b8e SHA512 0c3e40e1af47910b59877246700dd695e2bf03c35e036adb99e9756f8e055c8b3421020fc43f71954aa7adfdc56712d58968f3f39ca2e93c0daedfebd8862b9b
 DIST syn-2.0.71.crate 266398 BLAKE2B 78760c9965b59e14ab5d97e83c4dabdba99cd1933b66350c7d5c5f9e55f34fe68207597b51aeb023b211a065d986889655ab701b94347397ca6856a4fcbcdc85 SHA512 cf6264bc148ec550d943d7d146c7360a7d753e37ef553e6d0c6dc265bf516084530a5617f6826069275cc6f71d9f820014f7d92f04356ae964df8b79edaf7bbe
+DIST syn-2.0.90.crate 290584 BLAKE2B 9f469001c1439ffe57c578119653d3021c2709767e8e881441459a190402679f4fb78aa65e7822ff20913801c3be00d9b8f115189ea8e63ed94ed359b40fc9e1 SHA512 44606124f113c259c19edcb2adc1378d8292b422d800604c0e0d1ba89bd2d13d518cf4a6afa58daded54da9cb285464aadb113815406a0f09c5e18f865789ae0
 DIST tempfile-3.12.0.crate 34423 BLAKE2B a8b84f54a54be636f5b69791ca567e8b692d6a8485ef37e5a8340d26b32b1b0f9f8e9fcd9a2da90ec2fbd39c281d364dfc5723d06892832edb79ea5cf45d069c SHA512 1a27513548060984be894e6f8fc215831e4b2054b2244c6188bee76c477c001f294c762f2f4a14488c58c04e5d1473806d589c7bba1eaa2cc02d97656709be66
+DIST tempfile-3.14.0.crate 35065 BLAKE2B d155a39f6ed6e846bfd572ffdc73f306d30942642e07f2b497963ae150b8ef774dd046bfb3ce410fa326c8e1df27b0cada804100215e01d02272d6059d5294e3 SHA512 98c1ab70eb3efd2d8b16ed58c8c83f8599663af7ef269304e908a04c38334f659a4d0b1647a13dc0d1eb90a293f1b37ec8ff0b9b45ef5b7ff1b4452bbfcdcb15
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST textwrap-0.15.1.crate 55940 BLAKE2B 5db6b617e3d2546a74c240cc405568226dea66947fd8c79e9b8655e4292b39d3a7964688e97b1bd82e924a125b1271a7e4ee5cef9d01b6f6e659f6865ceb9c96 SHA512 dd710f1c36354243d09d1c5e4d217cf66c5a86df7e87d6dfe86cc26b3055cb456041f057cad78063a2ac17d4439f5abe7effb42cfad580aa82398d3fbbd09b12
 DIST thiserror-1.0.35.crate 18451 BLAKE2B 5ffe5fba8734291cd5304285ef327e4af2f2e2d9c7272d878ac2d3235761deeb789cfe55752b5876bb7949b02f2483ddc8749ce85f2241385249b5a4c479cf79 SHA512 2a55a0cb831cbec2529132a4d230360ba8f89f55b46d1116bb7a3461e92141d58935ff83b6d6e3c8eb99b690752f9aad2281c99dc9b3a242b3cf349d32d61912
 DIST thiserror-1.0.58.crate 21025 BLAKE2B 2915ed6ab691fe94e97a834ce5874d37a388c3240499889cff633ee6c67d46a2ca88098ba40c225ca0e2e3c1ac7bdcfafcfde3dcefc50867e299dc49505d6fc0 SHA512 3cba2d1f4965bc56bac8fc70540d8cd442ab6b8c7d25d328bde7f4cc108535d83c75f293316d730bbd86eb247400b6e35107d610c7caf47f43a28b1f52fed578
 DIST thiserror-1.0.62.crate 21323 BLAKE2B fd2061bc5e7ea7ba43ed59c355c8cdbbcf416b189d0b2a3c33f725c270c1d0a8c6ca18ae538bc7d4634166ba747172c32be98b8139bd333a7522aa35730bed7b SHA512 29efa072b31e63e78a3e31fe84758fabbe7337d3e7338be4e4bfd35c8b083b53dc3cb68be78aaddf80eebabe301de00e2ee1908c7b00dd5a2168b0b66d8edffc
+DIST thiserror-1.0.69.crate 22198 BLAKE2B fdd8ca8c8ca78702377d0bf7b253440519018275b105db980d63229d0d44aa5c39a703e14aa6fe453c779b3c864d8044009dfef893d2a5294950f067656d7a80 SHA512 ef50d2867d965da1dfb29d26faf6de273b5fadf78f95313f6caf44d68bfc610b9bd4b7544200b05bb0861231cfc84e961007f8db83c7905244c492037fd31899
 DIST thiserror-impl-1.0.35.crate 15433 BLAKE2B af40ee4a29ae92c02bd7681ff9c3f434462056a7386b3b8d7b370d1fff2235f0b674ed9c282daf48cab760cd6232962593ddd1afdb6de2f40092a42e0fd9ff0f SHA512 8669781bc8165126274813653ec9ccbce2df18f6549415571e5db28f64b7715e11ac3f87128769e14b6b49535aaf6964db6a382e0ac482c35fe983b88f9fb1cc
 DIST thiserror-impl-1.0.58.crate 15645 BLAKE2B 9c6f643a582666ee4eb43330340888e7141f0dd89d927e3345268c3eaca02fa42b018514ef38b3db3ff9722b25ebdd43c36b11ecfc7bcb36950ce2c204ff78e1 SHA512 9bbc623f54c71595e48b33bdb3e4f12eb2e48074b15ebe400d6faab43410b363e5af94df071aaa324c59dc6958173e3c301fd51b216969f095e19cb98a27292b
 DIST thiserror-impl-1.0.62.crate 16047 BLAKE2B 63a1fe66d3dadec304b9ecc241cfd71a6b278081336f4377fd435c9f959997bd0e0b0de2b5c318ad60d747f1fcf27df0f03932ba63f1288491f9935d3ebba735 SHA512 5f852f4b37af396336a941ec9f0340d93c8c70bc39f0a2cdfae3c20f180e06e51b4590a7535ddbcb87a792eba7e52ef9274019a98ee870f1eaf1b3b7cadf3303
+DIST thiserror-impl-1.0.69.crate 18365 BLAKE2B 51663251ea6ec99c59aec35fe73c5f9760809d6b6b7eaa8ecbc8f6939acdc4d0ebc11f9034d9204dde7bd689d5e8303ae0be86e298745e9ef96825bf73453a08 SHA512 579eb796c8885feb01d27638862823acd96c79440655bb444c3445ac00121852603396ce7439aed617c0a0ac69f62102167fde5845411c906997574a46d6d9e3
 DIST tiny-skia-0.11.4.crate 201082 BLAKE2B fe350137665e6229ea707bedbb535b8d5c3fd24752ec9c97e2a6c43b28ce7fb9107935a6f91074e0613dd2a156a45dde695343cde7ca78f3f9079636c5e1f9d9 SHA512 1371fa11934c1223169fb4494accf3b47958003e19a603e8fde446216e2c1253a6ef80da5d7bf3c9c73038f5282e3c47cc5f8eb87f8456cc5706392b28b4ecac
 DIST tiny-skia-0.8.3.crate 192796 BLAKE2B 9ab67b6c37421e0d8f653b5e95e6f1e9e9febe33d9caf2f9801ddb44368a09e7512ef328bea78b1ce1f2c35765e99e0e7a065146c586c63e6dc15bce14ad70e3 SHA512 b656d7f2a25e4a16daeaee0619e22dc270929b1bdee40a0e3b01c717b3e4e3b7418c2439bdf51c2b5c251482de687718d99cb80a94b404ebe6e1ba80cdac4942
 DIST tiny-skia-path-0.11.4.crate 47764 BLAKE2B 55b76adc467fb4c063ac2136271c353b92254f20a68e5205395081582c624481687bc319845e217868e5f2c54ef320728d0b2ddefe32fab1a17b90882168c2dd SHA512 723557dcb08cbdbc4d442ccfbba38481b922e367cec07fa23957f9271a96d1c656fd46bb0e0b5609686e5c830d1a988b0e209f57d0765d0afa738e5b2b0d8dc8
@@ -431,30 +501,39 @@ DIST tiny-skia-path-0.8.3.crate 45814 BLAKE2B d18c9f95a9d8dd7c1fb856ddf2035048a3
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST toml-0.8.11.crate 51146 BLAKE2B 105dc2202867eee9fda569d8af0cdfa79bea45617de8adc66820e5b75e4ee37b9629302b21016c86bcbb2660a0183b8b8c544c9977f4e619750d2ebe63253abf SHA512 375f38cf272cf62ae4ab6dd5e495e3ec85dfc1effd61581afc5ba3a7e991fb0f6f778405c331b2969946116b43d7777acf5a3bdf43798b987bbdc47322564034
 DIST toml-0.8.14.crate 50645 BLAKE2B 264a757d09f443e9d4d2cd7efa07bec4bfa382d1ca82e59d268c0099114547536858be323e8004fe7add72967b5c193bea176a823b688ad8be2bd71b186607f2 SHA512 31af40bb5d8a172f45b5f0ea7f089862cfec57bc9bcea6559932b045efefe9e8be349df24f55d6ebe536f414fc35950f6545a4703e13a202212eec9fed6ecf62
+DIST toml-0.8.19.crate 50974 BLAKE2B f68987353837b74421256fd9a76134bfbfe93887cfb25145b65b7e6b31ad2c3a3384829a06f50c771a2a0be0c5467c856cc631af69f586ea056c4f15af9e3b7c SHA512 16fdc58d14516e81badbe8c9a4506db75b559b377c9c4fecee79e76007b31a4abfc8c8868bf9159f79c6f7c0218f93bdcfb92b669b0917db7da42b51ec155751
 DIST toml_datetime-0.6.5.crate 10910 BLAKE2B 93a21ab2784e96ee2e6b56c7b4f733f6ac4c68c1e7d7dac3fbd8aceedb3580e25b4a9c7d9c3f9b5ed152560353b3e80906e37824956dc4ea90bc6f039768f6cb SHA512 502bdedbcbd2ac9fbaa5f4b51f2e409af185f3633f01f8845de5e3b007f2400215ddeb82ac588bc915ed5a5f9d7251ccf93fe2a57cd40fca2927f4c0966357e6
 DIST toml_datetime-0.6.8.crate 12028 BLAKE2B 62113366771f22b437b2ed0d3bb2489ae9078cb589cfad2ad2e92c81ddbda48f689e5a573366eea4f54c2b3cbc6b37eaa8b442b6d935b631a992de4917268757 SHA512 d38b98db3b2d4eebd3001d88e2135b6fdbae63b200f7e900c6bb9c121dd3f170e557332bd26f237312c1cbef61666716b0cf550c2d730f86fa7cd9eb5f64a16f
 DIST toml_edit-0.21.1.crate 101661 BLAKE2B e794b6121ba7e2b1b3f50966cd40eebacee6968b6b28986cfe4cb7312b51ffff19f74826910d8e4ce307f74940f11e71e6afdd768ac196427bddf44595bbc797 SHA512 10cd3b16f763f55294923ce8f166f96fbd67a0acc4a93a46fb3044d8a38148097c592ebb405ced87030d35154abfcc971eacf0172b624ab477a11e616efbaa07
 DIST toml_edit-0.22.21.crate 106010 BLAKE2B 01b16c823cb68352b96c01e758c9b26debc072212cbe09f1365f1d0aca6e361c4b6c7a1c7f421ba601fe6c5c5a6968b7e5f0b17c04a35a0c0cf2201a034519fb SHA512 5c9f17a213164ed981a7ffefef402e5575891c68a1d247f01eb9066b80dbb117e47a359a3ad26c67504e6ba7225b35b4bf74937ff25fa130fab948e8e4a05c21
+DIST toml_edit-0.22.22.crate 106387 BLAKE2B c658eef2dc8420266a6928d7ef46340372af2593e4db0d3a67ec88aaf8f601d37d1e9b5bac231a799be8a2ee68a7d98b5f651e9c109d23d8b19b60cf75debddb SHA512 0f98b371f7e27ae7f435a207c0915f942af145cc5dfabfe6d57f2b797efa3e706025401e501fccc6df70c001ce27051381556b8e7824447edd23ea25d047da4d
 DIST toml_edit-0.22.7.crate 104001 BLAKE2B dd1685032655842750c4d5bfd754d7df643eb25cb497fccd48e8a4b1fa9527c60af5514bc250c13f20e2c93eff2da8d7b819a96f8d9af759a3e6e5c6d2958422 SHA512 db3c648ed54301f510769d572b0b0b1ebb445fbb7f38dbd572bc8f15efe1256ba50403fec1288cd8b74c834399386a05da40d472bc9ac726a8124ca6e93d0fcc
 DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275
+DIST tracing-0.1.41.crate 82448 BLAKE2B c056d938e001654e03efaec7a11eb8ecfbdfe9af2099271fcefa43f4f4683b40c59f7111fdf7f27df4da38bcbe94f1b2ac0abb6ec3d6e6a0d165b9fbb14da3a3 SHA512 dffb8d3a1375f1b9d5418550a46cb7b1d92b2cc8ffbccb430a38f7731547960775bb42798074186711847d256eee30fb3e74078b69cb36f28c07d9f231dbf96c
 DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521
+DIST tracing-core-0.1.33.crate 63434 BLAKE2B bc36332ffe5f4c95ae2d12df43944bcf589746cdb923a39098e5f4007fd1f19d7c3bb115011ddc40c13e3ae0e5cfc9a59c49861824e99fed7430fd29479abacf SHA512 1c6f0cf3b7bd6c8f6316ed9ea0b315a619308de6cbf7e50e665a193cf8c3399b5227d4f145d83b10c7e01a2f9fbc83d16e108cf09b7fd6cef413aa5c1acf89ef
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
+DIST unicode-ident-1.0.14.crate 47547 BLAKE2B 30e0b6d7f3a967aaf5b9d91237008a60c3a8ded53bda901696e23cea3931dd71b01ddab866dca9e31e17c395d5f5a68f2a938655b693e894962568c2cff5ca15 SHA512 7c6dcd1724e8cfedc37546d1abd49088b633dad228097acc73d7b6cab255b223e830c541144e05a00388fd8ca8066f27c18792419cfa58ee9da4460a38d0bc0a
 DIST unicode-ident-1.0.4.crate 35491 BLAKE2B b92d4f09ec86fe1e0b403b8cb0787989c313f29e6b24961fc2ca046ee5e3b50f43f49469a290880412dd37fc1b46cbeb9123e9636e1f39e425f722a5aa44ad08 SHA512 db41d5c3f72cfaf654b4c250e18ac0ac077a816fd582f1548ed384653f467c15f85fcfbbb4ed2f9e8182587181abf1db14059d50f3e43b60434ddf38c8f65d89
 DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef
+DIST unicode-segmentation-1.12.0.crate 106323 BLAKE2B 268b60aff6694434f05afb7e2b8187eeccdceb77460f8ce2ac0f84d470f8a4e03182ce3f7906177cd2f00f989273a7e69061a763006245f0876bf21b15076804 SHA512 55eebfe5e9972b39d7c0011d80eb5f517d636de37870999119a3d8f064f21f67b66a5ba9761d562738b05f220e21d56b5be7bbd9cc51662994e40dd67c38f946
 DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b
 DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe
 DIST unicode-width-0.1.13.crate 457228 BLAKE2B 757c4da5fa090369a26130b08440c2348f1cd1c0dfbb6770dd75b65eba797eaa65f5d683f0c2862cced06124d46a89b4825af0d990f6adc2df8709b8ef291665 SHA512 9781d6dab2c6343e8c28ec66b50cb4293261bb2114e122fa80ad2facdb23020f5b621c38030193b918669e58adf143808e5ab4c507c18beb6dc61e97b2e296f4
+DIST unicode-width-0.1.14.crate 271615 BLAKE2B dd2e1504caedecb5d37c397ba05446d3d762b8b6833a8032ebbc213e324d53d89db5e96ed2f7223096e5754d800b39a54105906effc88d9437d7acb9e7beb81e SHA512 3c58a18776aa82cc13c761789a47901616cd98a30356f93d7eb05ae457314209d0a66213e2bbfa5eb8b59be6beacf62438234ce8daafa31b128dbf7d5d6fcadb
 DIST unsafe-libyaml-0.2.11.crate 62101 BLAKE2B 7ba17f2c19d96fc8999448594ba67bfc0eceaff47a39e560f856d13229ad5e69a9c8ba8794ec814e6b7c3cb7d597b7c7a366c8e880f17c0efc6a03a5677d82bf SHA512 a42c95eaed1ae2e438d3ba19ccd92337327c34f6174a43db80e1f37c507154249c7510e93f81726890c6032c89fe21b1876582afb7fbb811e3931480c4727712
 DIST utf8parse-0.2.0.crate 13392 BLAKE2B 05296f48fe429a871f42e729e3540ec3a974a69892c6bc9da95e23c0aee2163c9b115a9614eb1943363076793e17ac4c89e28066a9816cab30c451524a5832c0 SHA512 1f6a2eca32e42c8e4b53d28c4fea54c426ed66fc01447b3cf8fc0fd75694453eadbe3ba000ac8ee0347d16dbfec47681254117949109081798eab5370886827c
 DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
 DIST utf8parse-0.2.2.crate 13499 BLAKE2B 095b5d219ab8ff04c06fd6303e03d913ae36a57845f0b2ca3217a40e31a54cb0fb5ecedbde165d28f5f60f1553d8252986d7098fa83befc84a7cb20bf3b76144 SHA512 f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
+DIST version_check-0.9.5.crate 15554 BLAKE2B 131e75cc287518831e142430e2a39b48e4275874f4473780d47a27552294097aa1cddb65c385583e1022478f940b495eb43c24a8b1617b8ac5a24af3340c0d72 SHA512 d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db
 DIST vswhom-0.1.0.crate 9420 BLAKE2B ad748822fa9650d011c5f240f5e52ae1e27380fc1b22db2ceaaece4fbc814ac2f2792cf6772079199202efe88fb968618a13d91609e5245639f25b32640fad44 SHA512 0ac192e6a1d296904246d89a08021b55384b48959f26f1f0dca893f8fa1e71a012a0d731d1e48e41ca8e4427da84e50fa43ced621e435b010cbcda4f19c45a58
 DIST vswhom-sys-0.1.1.crate 15804 BLAKE2B 9e453a1e548157a08ef1f2ad5883c3d4dbe2a080a0d1324ea7d238d7c577279a424e7aaae7340406ce0e2f8c244e65be5628e25effddf033df3a28fec7533ae5 SHA512 1a676ebe81833893335101d6dfc4fcef50fbc0fab0bb55aff600eddd0018a7acf5c07c436d43a24d742784a46004606957f1a3c4fab4721f9b7e6610fb43760d
 DIST vswhom-sys-0.1.2.crate 15852 BLAKE2B b21fbc0af440d3feac8ffb769f951f504e01f630d6f806d78a8f218eeb09ff8940328d6a9289e195deae9fdc43fdd55cfd037ae9c57b366ae57906b80d2f4785 SHA512 cd7e7b9e1953c70470d2f17210e83d28cd2c5ab8fc34ef0c9e06390e928853e375ed7bc2bda343b2f15820e989b5adc5bd33d9cea078716bc31545ff019435c8
 DIST vte-0.10.1.crate 24947 BLAKE2B c7e94b7bba2423d14e5aa85f94dba856a6c984261551f204f029c55ef923c0012b259e5b229974b54b4eb5da1e85bae3c8cdb680372b5f9dc6caf51d1075b0ba SHA512 0c8fed2cfca5ad07d2a146e1e26979d390347a409cdc2b960246fc2fadd85019b9febf2dfd618f7a144493084b55f285c58ef5204e613bd9013af26faa9f2033
 DIST vte-0.13.0.crate 55338 BLAKE2B 24a891db19d37980a3c920fdc3b0f8336d8ef8bd389e50f5900a5284593208bc6c92110b6035bef12ee01b527c62544f37ec45f9b55a43c54045e4a15fda6879 SHA512 833dc2f1c42cc0537f0185c00eca2ec76cd07cdd96a066a23366ffc2d7b8ae6903167d53002497265962954974e734cdd9bc06080030761cc1f7fd87c29d3bca
+DIST vte-0.13.1.crate 55713 BLAKE2B 96eb3ce1735a1a8270fe2fcde84fd556d5743242e369b3989156795a06fad78c8ee36807c35b899d49635dfc59ac9fbb9716aecefec4c4da7b45433ff8bd098a SHA512 45d80fa65d8c758e38ad5ec89c875fa14dabf1c2a1c080c507706336fec37f023839a8808d337b7ed9fe95314f9373c650e50294649dca57ee4c93dd1d6284c5
 DIST vte_generate_state_changes-0.1.1.crate 2422 BLAKE2B 6e8fb4ce0ca0fd6b9a4dcccdfb02445babbc13d47de5fae9bbb81e8c67ada8a40e8dc5e57c120c36876293b111ccc71e1069ea3fdabade6f9ba5ea2d44ff4632 SHA512 ba09352e037cbd279cbf5641c9783a24f76e54f1f09e13f0ab1ca99c9646c1e3c958e8e302d7cc88431073bad2e2d5619410f2f93f96f1db25f0f0ded0236f7e
 DIST vte_generate_state_changes-0.1.2.crate 6503 BLAKE2B c7ebe8ce8014bd9dfe6f2daa61ef7913c60fdbf7f3e3c205c0543894e5d56117d4536b13a931555043355cd043d279776e820c481337f71edf6f62a8c75723af SHA512 343f639b9393569378fa9353f1a37c7a355cfd56948568ed49828308a1100dc3a6cc0a8253f8f8a82d6246eaed31bfdc206762a62a6ab9a862e4ed11a9e3bd14
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
@@ -462,41 +541,56 @@ DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST wasm-bindgen-0.2.83.crate 169618 BLAKE2B f6158596c80a0385bee0a05bd9cf0b3beee83a7958efb40244956b4fec2c83baa1a1b4605eb604f313db3508a7911c78f645acbb19f6fc93eef27e9f7f0ac109 SHA512 ec93d1334417d0329e113d5f2da7f16c0f1209d71e5cbd21a2dc9278d877e70ca2327ff7863b40505504883ed51d6bf20dda98c22ef44011a47c604a7b44e82d
 DIST wasm-bindgen-0.2.92.crate 184119 BLAKE2B ca256c686bb3854492bad6afe3cd27dab314561a1ea2e0205579820066b462bacdb2cc01075fb420bd20eb33b03a648ce1ff46feee04d8759ea8aa990ff8232a SHA512 6e46501276c0d4befbf930c816d6ae6c3764e3b5ce0ef4aafa627a6ea371f1a056ecc15970a817e9e9bf51c0a2ffa57df427d758b2d367beb6a474d75b8939a5
+DIST wasm-bindgen-0.2.99.crate 46136 BLAKE2B 04e69294da3dc4feff9001185bcc5b864d1f14a1ead6b9a31c830b2043dde191f9f7c65755d607365a3b8885bd340bbd266e26cfa74c48464933c8d7a1164f94 SHA512 184aec11998b99a730ea5b63d6141260cd0b7cdc29b02696f533b3e75ec79f7c17c6aac892e7a7b24036c6e73592d01df638ca31b54bda11d3bdbf857b1489c2
 DIST wasm-bindgen-backend-0.2.83.crate 25620 BLAKE2B 3cbba20a2f5344c0ed2791de7b04ee294746606289ba83a9c139b53b56edf31eab8d3b3802cec309d5395e2404bbd75b7fab5d748a9961b36906fabeb0e66493 SHA512 dd1b65733e4d0a198d61a5287bb75db3e03ef738d2c2dcd3ce3e873c27d41c90cfcbb775ad40b2a546190db8d7213e5866f8e3f9913c28fe4b43a49054bfea44
 DIST wasm-bindgen-backend-0.2.92.crate 28348 BLAKE2B 425497aa7a023b70549c55d5a15dfed80877c5503863b186c0a9d11b29551c4606c1cd5961c7dfdeee2eab5662952ad7ad215513e93abe727a33f84b30bd181e SHA512 22e4f5848d62bd1fd55f4f054ea1293e223b3cd6f916bde2523eec10388e733623492c3a3246d61831e696dffdec5d000b95e9aa1217be6e38dd6459872166aa
+DIST wasm-bindgen-backend-0.2.99.crate 30928 BLAKE2B ecfa94a461df79a33fd2bb9807374a2a0c7ac370b443e5a1103ba73a29c9d337ed3feb427c80571ccc15599f81135987742e698199528a9c1bb570baef3e9d09 SHA512 8369a5e618223f09fff7cdc35662a930b3eb11024af51bf5fb9e70c45dfa22452a518d723f3d912c0c970fc4bf748ef2d83d48756483174993f7d04c92d9621f
 DIST wasm-bindgen-futures-0.4.42.crate 15380 BLAKE2B a20ba9f2bc814d7aac031f1cbaec90289f63893b76c60b536a65af85379771e102d6c3d949a8528328587ac776d7a3b684c12a217f9e186bf10046a1fcb34652 SHA512 0a77203499381b6bc4e9258480d7ef499d9c26b195baf38d0b7b228872f844d24c827cd57c8e2b0176927fd5957428084f53fe80cf60b35b7ba02d02b27a4682
+DIST wasm-bindgen-futures-0.4.49.crate 14838 BLAKE2B a549a84dae70f480e387e01b4366994404370ae8f0989146d8548106267884096442d2fd6bca0a8cd22e21a3eff6b16aca1edcbc23c73af757a043311aa49081 SHA512 e141d6a97d2bbd6c54bc23d4857124d6e43ca1ab51c37e867287d771fcc0d8b7a2488acc56d46202c2e9b2380684ebeed688e7322175dae67475b77fb307ebda
 DIST wasm-bindgen-macro-0.2.83.crate 12075 BLAKE2B 3b358ba7c2a3563840f54f11170cde78044a8f087659daa7c784fa252f5dd4b7f6200eba425d95b568e50fd43c04c32a509994ddaf5248120feaa67586402150 SHA512 eb83e06f998e858cf25494c1d171984269e72db798147d4d1d8aeeb25ea7a35c5986b882011e131968621742ceecff976430856b4e8b7d7fd7f1237767cf01b4
 DIST wasm-bindgen-macro-0.2.92.crate 13835 BLAKE2B 1f2202fdaeb78c32813eaf08b2fbd7aa9c469228386df71b8ffd81a46374e39a7104b79991f702505f9b7e97957fda8574517fbb03e3f9e93098c4d6e1e46be3 SHA512 78d2ddac88a9ca3ca5eef8a7af81cdf2366187a67d844e69f65f6893d1949f9723ab5f2be762c2217a5c21aee2f3dbc2d5d55ef0c9cbf0dec0d52d67a6ba7462
+DIST wasm-bindgen-macro-0.2.99.crate 7011 BLAKE2B 07182a9fb98f519d1e5c934e609d7a42cf2409319f59dd901e2a5bec77972b4d16fc6f67cf40ade58af874b05faa981c894443d3950616e2aad117ac7355ac6f SHA512 344bf5192e43582246efad257c600003c41b589234c1900f6ed201f96b6f7665eb55226da15d612060042f89c6214e452489cf3aabc61645843be9c27f9cca0b
 DIST wasm-bindgen-macro-support-0.2.83.crate 18530 BLAKE2B f305c9fc1f7bba5bee65a1c76fc2216c98aa306a072286e1ced048ab191f49e7e4436bf2f67d4c1fff558f59b2cef5e9b40e9e940268128ab1ebeb3c64696107 SHA512 804014c75ae5f8c1c7f0fad3f3209887fa346d74029e5f6e1830e44f7318719e65c4a643c71d87cf388f131fd370af40d536bbc15fc11c25b91cb785f56a908b
 DIST wasm-bindgen-macro-support-0.2.92.crate 20092 BLAKE2B 8e274a4053e7afc680740e811c3941478caf5342e2206e3d28cdea9f9514bedbfa4f2b6bc608817306a1c455dd7134b7e17f0f04499f6bfb5302f29b041ac7ae SHA512 92543d2aad0b25798ec20e68832b823610c2c01401088cd9cac1684a86ddd1b567b3e2712acb862060f9c645a0df509b01d9834fd3e13cdaab97960f66d8daa7
+DIST wasm-bindgen-macro-support-0.2.99.crate 22800 BLAKE2B 9772cc94a64f768eecae12072e6d700bf95fded306297b84e235f3450f7c5630cb1985def3eaef05aee193c693f92c6fa61d7a6ca18e84a2b73aa38f070d47e7 SHA512 936ab8211a13fbe8b8f21a870a78c03e24219d0872731561353cfcae245e9f632246f179b67f2b13e106c799e68c5c39f9e388370a8ad3f93f299c4804f5907e
 DIST wasm-bindgen-shared-0.2.83.crate 7194 BLAKE2B 4dd1cffea1edc98dcd4993bf6fdde8100fe00d1e97322ce8bc0bdefd0c659047c8c726e5da27b59fd7a6621c1e5385c18204e834c6c6fd1fb9de52f95b40e40d SHA512 2bfc1a068fa41a9ecacce7bda494fc0485c57ccb102c1d76c87a42e00ad30b944b0cb788642e8339d050a0e831ce8306844a77292ab9f79ed765b65cdb4765e7
 DIST wasm-bindgen-shared-0.2.92.crate 7263 BLAKE2B e54895486b9a31cc4651b7bb042059cc84421708346c06a9764315ebd4f440a1077520c7d325d6889a690b2c06aa185d40cede2dc4d061b363594cbde20fac31 SHA512 70e3a22731ed8aec428433bf30500eb3f62e3b7f4f1be34d8bb3b6f34f99690fc85d49eb413caecab807064494cfec64242c6a42709dffd638046e370bf86e07
+DIST wasm-bindgen-shared-0.2.99.crate 7773 BLAKE2B 73489af59d16f4d0a1ea51b535cd02d2759b5b7b07873d8a71fa6bd6b6ce1cfc6e8139e6a79346abec13665ed9aeadd0b5b6aed28ae008f9dcb3d5da9fce665a SHA512 8da0f107be99b6666cf1859d68ac0a7295fc03e7b494fce1df9dbe57d21807de8e2bc95f5b974562303923ca4646f38c5297588ad7c97bd59ef236218b2a64f9
 DIST wayland-backend-0.3.3.crate 70455 BLAKE2B 9c6bbb5c8982411b8d63305cd109d5dba3b396ea1c130e0327dc31d4f6d0df56e8d8fe5992fc80c000bb8127ad4e8d32d2ef5e7fec925fe3b0b508e63b4149d9 SHA512 fb3c7f25074747954b5dbf8455c2faa92862ae53864599f49ed64b74e5f114d7e578ed388cb3b7240fac3fff98a5d231a977154bbe976354938d66fc5da5b8e4
 DIST wayland-backend-0.3.6.crate 71562 BLAKE2B 33a91c4fdab42e7fc18100ba124905172c1cc3fc4aafa250c3b55b69dfe230eb39015c64d9ea8461cb57ac6b1665dfdab1c61db5186eaaa0be0988879e8ab2a1 SHA512 afe17c8855eeef89afc91b52ce1c0b0a4a7f6e3ebc72892693601033626038b1ebabdbae883336ae30ef9ac49b9e444831c6a5c2249fd167f45772d127395476
+DIST wayland-backend-0.3.7.crate 71771 BLAKE2B c01c0112f3cb48fa99863186efb144564edbbb0dee07b1f96f0a433c7d843a15d15504b58941cd325401a025803256c9fa14a979bdacdb0728042bc29edc6ca8 SHA512 a8542609c5745138dbb0eb88cdadfb53d29e85b6646f418c06b572cc336b27e44051041e5d86b1276b5925a58ef3e0a9fb9e10c9776093c3e765c095d0d1c23e
 DIST wayland-client-0.29.5.crate 71041 BLAKE2B 8473069b5a575509a0a7d518ffe98786282b2e7d726690f8c782b5cc93d31f865d040efda8fdc9132cbe5b338fa9f8cde47d828273bf4d34cd57ffebd8e50b8d SHA512 07405d2749893743f9c6341dcc333203ceac22d96a9c2bddb0777b22fc7d54ecb3cec19f48d4fc60e372c9269f4f85f8aa94378d54f2400f3d41de9b439589a2
 DIST wayland-client-0.31.2.crate 62976 BLAKE2B f7c4e1f581bace8b491c7ffd393106db44b7be028c136b1ab99c9f091f828c6ff6e5157234882a7926da5cc0de22c1ce14dda7e00ccd5e2ecc5e3356dec86e71 SHA512 1f15b1f8787e1b25b90369106ac6119f208a60ab9c3fe851287fa9c7c8d9fb03217c3f33ffb1dfba5df4f2a749be19402d25ed80e1ed9d7301c1c40e847911b8
 DIST wayland-client-0.31.5.crate 63042 BLAKE2B 9efa3be373b5bd938eef796faa0c7647844f7e222e8e1c8e8f69cd0100122a2c4191ba70baff4a17f78e3d99c7270e523b3030327cc670f820afd4a7341ff586 SHA512 bc49d4c9d4f923ecb4416afb279f45da88742d372e716aa7299fb7b8778268e81e43298fbca122148ddc995fc7350a9bc80c27672603c2bcea834535c6827037
+DIST wayland-client-0.31.7.crate 64486 BLAKE2B 8705a1d5ba33c51a1e7be6eb9c942090ff7d519771d3fb32fda1069be2da4d0aa3393e00a5a8c8a03e5e1231d3343d2a8ce6b2d9df3517dba647e3d4a182ed0d SHA512 205a8e84af4ed9092d0980eac3374feb06c4c2ff82f70c4ca51b44a4db272881096e72062515f0432719dbb3717589237c1bff3bab3a1f0c96e2910d053f50e7
 DIST wayland-commons-0.29.5.crate 20771 BLAKE2B 6f13e38ed1278a36bea0bfb1a051feb64edbe21e49a29d0b25490659c496bb287f549a88987f97d14c4d95c90e76ceb7ec8aa8fb597980893809a17fbcaa9225 SHA512 91d1ed58be31c47ae12d6ffe7cb475d9bf040b6aa3a2753bd0f5ab92407165e729f89f52f6972d9fef39aaf0e32a01bdb7e9fb76e04b827133255078abc98778
 DIST wayland-csd-frame-0.3.0.crate 5696 BLAKE2B cc475e52f9cb0bd06569b7a6996cc78158a07ed2cad7282973806d4b4dd345b968088d5d035ce1f52909aeb3aeb804b93243f6fe98c38c0e8032d961992cbc1a SHA512 2ae56291ebf40e84ff690f15ce43cee36a29fc67975cb1331c47a44cd93aab7c19fc8b385b67149a62836b3bcbe1d5bdb646078b9cf2b00e5288893ba9840bb8
 DIST wayland-cursor-0.29.5.crate 6195 BLAKE2B 4baea584e033faad9d576be78353e1d000257bafc6ff4d950282cffd7fbf882abe1e548fa886ebb09579ed23e623f15ff36c1db25c68ad57476ea29625a08d6b SHA512 3308fdd4e6819867b2ba00c4d612deeab9636db6d3363f7496ea6eaec4b14da5ff12975216f2b01214d8f26a4bf36163b72540d227aa4fd267746a97ca27b111
 DIST wayland-cursor-0.31.1.crate 6883 BLAKE2B b70a56f45fc16d0dbb63ac64c69270ef1ef4185101c77751fd063913489e49e0c0257e83a07a136f2f6ac8d923a495d52bfd6bbbaca69b5f3de2f4f50fe0ae44 SHA512 42b975a1c9097b588505243c2923ff3acfe0aa312e8dce5390cb7aea98924f3e29d1cf29245a54a54b617829028c96ad2b5ad51f3854a3e85ce840eaf0edf844
 DIST wayland-cursor-0.31.5.crate 7521 BLAKE2B 24194606485dfa406d87e5e49c2ece63e91370c8fa757da736ac28dd2b75b10d927aab84c3677b4bbea8fd4e8ad922a689b7f6fde25fb621e1eb361628b4836f SHA512 d8fda4c393954aa7b99432dfb405aed7dff76e6c3efb329bdf39ea677290953ee580dbd9c27772439a20b71c42b864301b4405bad2d8a2dc1bf93bb267f0237c
+DIST wayland-cursor-0.31.7.crate 7567 BLAKE2B 031c0f440408ea436e31fc54b37823ccae4ef5da5d6f4f659bf7e70af8ee48c8d3443a0d981e60091f80659fcfc01b9d720eb4e811e3cfff6ee5f7095b89db3e SHA512 3bfd3e77f3ff623e3fc1b61d285f10919946855dbdde44e0015c4bb7a49fb9b24157f845f8db7312659031559568dc96fcaadc1e89e91f6f84bb90ac05156bc7
 DIST wayland-protocols-0.29.5.crate 140859 BLAKE2B 746bdb7e46529f5d33298067a190c2d35f4ceb1c2cb2995745c7728841eda7d8bc4a5ea4d2e9b6f4ee00c599bce9ee49f92e6203adfe27a865c11baabaf9f593 SHA512 d7c21cb1976b9ede6fc13ba3781e11dafab1009a2aeaf792e96ed1816569b9f7c061c6c57990b7274f12e61bb7730421578029749447d46ab6aacf0434422a8f
 DIST wayland-protocols-0.31.2.crate 147062 BLAKE2B 62d5ea52833d9edc661d405c83159f97c5bdbc41bdefbc9418a08971236cb74d317efe11e2e23ed6d96f0be27e4a830b4d47bf27d5b269e30e5a4cb97c469c8b SHA512 8f295413b20f308fbf337d8d6e2b6905061d32baa0aeea2aac55edeceadc754a121c56b8b96ca218aa902cfb26fa168c84334ef5033f8cc72e1505f1cfba06fa
 DIST wayland-protocols-0.32.3.crate 165197 BLAKE2B f82eb1064e2d2d356926aa2a45ea5c5d6e1ce488908b99356d7c99b3d90ad37fe00e54087879bf38446209cd93cecd7791aa3f7094d81436f4aa2b0f3dd94d70 SHA512 0636b48c00e245a0bba50456e555b38918b50b770a565b8cb8d231cda650d559bdfbd4fccaa3dc601e12e4dd293c5bcd38d205f348c4686246158d24cf6ce865
+DIST wayland-protocols-0.32.5.crate 176196 BLAKE2B 945bac8768b9874c2708bf5a04e52cc0225675f880e5c8320dfa498dc759e817126326c874fb0ff591b87b416b003ef450d420b59a0a6551a7b1e7837f58dd10 SHA512 97e9db749c0df9eb13e655bdfdd84fd0864fd7d2528cca25f5ba34936de552a04ae3cf58697d39f5ad4d25ff0590d131a7fed2dcb5612bccb6b8fa412c9c3c39
 DIST wayland-protocols-plasma-0.2.0.crate 59992 BLAKE2B e43993c207db0ab01c09ca2ad523adaefa1b07978fe2bf67c1e16a8d7e24f443e181a4ebaab2555bc45119d0c66a26ac4f91de932d13b3fe1c881d9bcf0a211a SHA512 d72a03ae0c34b9102567b584971714734aa97e0bd85a3447663a0f88b05bc06a295b1aabc46b6c92701e620c2af87ad6a321a5daddab0df08e7e09f1337f3cb6
 DIST wayland-protocols-plasma-0.3.3.crate 60493 BLAKE2B 75a2ee620ce9842951cc88b580122a678fa401c31a7ea84eb08109f73c98170d6ed4e4091ba22541a3a6815f43f8ff2037ae4fe526073d36319e56c478ac7365 SHA512 f45d3331d5eb74136fbfde7c77987d5a008f396e3d5a42b1c028fe89c14bca4c928caa09a7bd0525ca3ce3770c89c0139a80e259128f12cc457549f2df928438
+DIST wayland-protocols-plasma-0.3.5.crate 60530 BLAKE2B a30b9eea14c4ce609994b9634820656fa81eeec287db28cb8b3a93ce5c96549c5ea6fbe628cfdeaae89cd5b6958afc5eb6465ca2a3b3d1e10615bd80ad4e4213 SHA512 cf6df401204282ffe93212ed1cebe2ef07d6ff76fb1160ef4560b90bfb20d1fce59eb838a0d48cf1330dc9c3b45c81317731bd06478f82a09a6e01d7832623d8
 DIST wayland-protocols-wlr-0.2.0.crate 25804 BLAKE2B 226af653146d7eef2ee0a7b6d1484048c5f8b1d2618d3bb9d33eca7e019579c9868d42e5488ba8dc830457ca186a0aa07599accef22902b982d653e381b2f4ef SHA512 b1e5025dbe50a9b90bfd7a38d7564ea8a02c84c8c802d2200864dc604847a4b0979f8a0e05d8d76c2b7c1e198c7847e4d59ad49311b00ab2d4d36eceb776a16a
 DIST wayland-protocols-wlr-0.3.3.crate 26005 BLAKE2B 0f58f4901adb4c0a35faeb99b3cfa17348785136cf8a3f6241fa96f0973255e30c96e88cb05ca566eb0e6148a2066a7a91d8c8903eb633f0d39784a1da6a813c SHA512 419787efc3565acf03e576f4a0c04fe132c041bc5ddb14a22c1e3d5d71e2876478fdcb5739a70f0f23b3e3195969a6224c793bf5cfe3a5dcf3d7310cfa0aa00a
+DIST wayland-protocols-wlr-0.3.5.crate 26282 BLAKE2B cbc12e0e0cad296242da02237582e3cb1fe42c69d5c29bcbfd7bbdd237d70b7f7cf9dfba17133c2efa9e125b4341b98581bd4e603d802ac1c08e93c2465fd58b SHA512 689640fd3209ba126bb62b312c6f18094444f3c051a9b209a0712f80f6949a84573b1ed886e9a693502008578b705e2399d663e6c672e7e356f87c43e045054e
 DIST wayland-scanner-0.29.5.crate 17248 BLAKE2B de239ef313e5c4fa4aaebfc4c7aea945634d0de2bb51eca04e81982c9f71933d0ee704696b787922702f60437a3fd55f6026375fc61017bedce6d750bdeafc4c SHA512 7c2ebee011db8714801a3b3af9552129a502f983fc1737a40a520d2a2de92cf003b9bef24f4b55e2e7ffa0c843fbb77096efeb20606b61e74c2c082fa55a2e6d
 DIST wayland-scanner-0.31.1.crate 35419 BLAKE2B adaf9d19f395c5b11e35113ef31b5e11e76fda4929365e61f5a40fbc3f8505e68cacc4e31eb0137da2a07edaca898a2835a22e7236affddf7fea012f087197b7 SHA512 61521f39f414bce7bf372656544294382676649a42d3e2751b6a33874bf12ea3fe87d55c9389799197bbbab36fade2f386a6a83437434d4e0175347b232f7f62
 DIST wayland-scanner-0.31.4.crate 35691 BLAKE2B e9c2cbf97719e7729892a777c37e865f22d22a6e1138d189a512c938e24ac710b6f431f7808c656facfb189a47a27564ccb6b687dcf3dc794b1ea87dfc8a6fc4 SHA512 44c41437a20e2f895e3330b4fe72eb6b7846a2287ce5f7e1f2aec1407cc324dc43549cbfc82aeaa23c69709e2c5c339b32aaf298b63ee675b8dded175ec7d0cc
+DIST wayland-scanner-0.31.5.crate 35779 BLAKE2B 904a811f9903805a00c2e55a7c7a5eba2b3e0b10a04275fbd42a9630d828ccd3031c13f65f2b421fd6879916d8b22e8b6963681eae1d0aae5e10b9c8c21e7a71 SHA512 50c269c98cf2e6cb8e68e32894d3f499d12bbb208471ef05c29da97f5c6d1dc682813daef56d6e2635360ef1a9e80bade832bb0ac65cd6ca473c087278b73994
 DIST wayland-sys-0.29.5.crate 7926 BLAKE2B bf09b522dc69b2a49493e769696196e18bfede5681120ceeee94b0cb3393ed8c4d0d3b1acc967d5231735cbc65d71d13394a25845e30a1ce40e6f8461647daca SHA512 ec99802c44e75840e029b771fcdfb57ba4f0e0f143b012f91eaf661ccedf4eb82122950fec25c6692f24c0f7c123e697e7cca890131f04bc8bb4b670485b2191
 DIST wayland-sys-0.30.0.crate 8295 BLAKE2B 8a0e3e7113e3612ffc679c6667536e1400d06ca4cbe2261e0dcbca7976064acf4ad6fe9a89d062a5cb8f65e9947d0b62afec447943bb4d1216051e5dfd39919c SHA512 b9b1c0275dabb7df64dfb612829f4814919f6b81165751dedcafeb987c0fc0a7580f96f948c9786e7ae7d6276580956d9f8bb894fa9d1ac6fc18350f2769c222
 DIST wayland-sys-0.31.1.crate 8577 BLAKE2B 9252740742340e1f4a4192f610c3c8e6788e08e9c37528c97371762a8949d5eedcc9c052f2b74edf23218e8a6dfce3c63adea0da769ff805e3f68d689d041fab SHA512 79d6feda8a2a4307218ad51b292efd7d0e80707630908a9ae9bca6c0ceed57af874f3b6467915fefd078279ff4f7d39291d84d6250312f692305d38d7f0bed3e
 DIST wayland-sys-0.31.4.crate 8571 BLAKE2B 4a29e3250be6e9058e6c8a50b7146b37a77addbf434a926bda422f269d353cc0b97d33b8dbe39ed88a626374ee2346ae04693df9aee1142f22a6035abbbcb1e6 SHA512 fc33c5364501aed5145c95b095955fc71599fb626d30a3e33b58750e67cff7d3a9a765124e5c45e436ac0fdfcd416c825a63af6fb6500627fe28fab14cc1401d
+DIST wayland-sys-0.31.5.crate 8630 BLAKE2B 82662fb5dfddb9650e4b6ec3031859d8840add7084c6d10a6e43e6aa5aa59c53c85124bb2e9858b430c5560b34b74d67f4259b24d7ebeaaae1fa92a7d72dbb96 SHA512 bf9237dbce8f55cb5176d2cab1769beff95f9a984eb607b5460673d69631b3346564024cc8f78f0af130cdd0f070d66518a903adf8d63bef8afa2aee06569715
 DIST web-sys-0.3.60.crate 700485 BLAKE2B 13942a583dd8462b0591a19759a41f41fb17d2356b3bcd78402e420fdf5726782e5b4ed211c3716a81c1cdf64ce9b8adecaa3fa22756a3ec84eb7c3e12e3018c SHA512 d883363f99300e2d50bc5bf198f0fb8d6c53e5a778217e340573560ac07db26a71c98419fa2ced32820472126d6f97ad5773ad082521be0a1c9a374af9d61df9
 DIST web-sys-0.3.69.crate 728877 BLAKE2B 9f1678cbddb15f5a37331216a43785c72896f87e8ce62c6b9e69007316ca6eeaa7edbb33b9f2d9bf96c98de2a1e10afe491d8734657b186e2c3905ad1ff19ad9 SHA512 78b79ceb6a47485c766ad660bb8b971ba549424542a020c35c7db64a19f7b161617e464eaea0602f433b6ac4973b8d1a86a56e76dcda179ccea60aef1245347b
+DIST web-sys-0.3.76.crate 635842 BLAKE2B ecd166e739e4ae4ebccc51fe0d429723ed7e4209bc9bd4658b5447486d7d58d8f2d2a6186e433e8ff11e7b52fe159d842a28de6251d61cd5f5876a92a7d945fe SHA512 370fb49edffd9ce125f77a9451389dd23ab5b70fd49263248d5794310ed757c28839a29436111df2fe6369ae8d6af56a64ac59af5258743cccfd9d18cd07dbd1
 DIST web-time-0.2.4.crate 15743 BLAKE2B b0255c2d8742c736a2900e32422c439c90878b3bf883943bb6772b91ab13411fbe6617b7801434062b1529843c57d7debfc454cc7a67553c6247047e4def4413 SHA512 d52025a11a11e3286aa0fcd20639eac6cb93ac189b368419adc0ccd2045b288bee9df8c0042a65744a78700e4576f3055478fd52c5a5381088f9a6e28ca3e3c3
 DIST web-time-1.1.0.crate 18026 BLAKE2B cd72e384aca90c79e587448160587531c417f31a32e9ded23e6b78d492d0e517520170fd03177f28870c313b9302b28c32069a2408acccc076a1e4939a2c8f8d SHA512 73e4ef9851de089fde9381a595cb9e37a434f563f1fd350e345f2617b701caf57a9aef739b922b5b10cda131cdf2fd0af42c55603f8973a623a8b6ae70f6cc9f
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
@@ -506,6 +600,7 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9
 DIST winapi-util-0.1.8.crate 12416 BLAKE2B 5b48c27dfbb5db5c332f7e248138327b35ceec0909788b940168e7f6fe1402800da5e7690b2b1654da6c510b5c720330a92da16dff53ef15821f37fef6f335e3 SHA512 e186111398f9f0f0686e791ad0d72c39205e5f246b6e020df413e477ee07f32e91d09405c61dc92752f061f54fd7533435545c1a151477b40e2d68acc94a57fd
+DIST winapi-util-0.1.9.crate 12464 BLAKE2B 7fb9dd803fc2608c4e5bc75674472992d82da364f24c22072d5624d6ae6abc44abd3e3ea3c45a7558e045331f3d87572b306b4ab5de52c07ff3706e7f13c2a38 SHA512 c46b893f67ec6e36499b00736bb6b9421e0e2611e76784afa6da01d7ebd033df82f1be7cf8d871d541125d290983f98f26f759488ba9aface49efce8edd682e9
 DIST winapi-wsapoll-0.1.1.crate 2881 BLAKE2B 752a56fd63334b38528eca1bfaa4ba4e07de8b7b4f35aa71165038c70f7f6d482c994a9d8367fa5c8d17df48de746bdf773e32a1109b847d8998ab78c6fc33b9 SHA512 110bcb68119ce5848b9de19a9af0a752bb7f3bbb9c07f2e0d303b428166197d3525c8b4ca6afd56f132f14b4948054cf1dbcc7669c02775b66343e089488fba6
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
@@ -555,8 +650,10 @@ DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cac
 DIST winit-0.28.7.crate 407921 BLAKE2B 5753e07d53ab5ff52dadb992430ae8dc6e16197afea612e273651da49521686debc0a39a9ff408af71f4b735b4f3bb78c708600a06b7a12ea4caecbb0d59f445 SHA512 4879d3676efd3be8523456be54277684fee8d804482eba6c6e6ba1ac00606da9424f352a8d8ed79a80f61938d442f5fbcd32ee1fad8ae7927b5d96e55a2e7ebb
 DIST winit-0.29.15.crate 588797 BLAKE2B a22d11d2f6a733624ff093df348e0b4fb2dfb01b40d2e6483a4c72ed93a964df9af6a15d624f99a54c0e0e4cf9a751036be4bd8c3f3bbfd7a3fb8eb41118d9f7 SHA512 eb1ffc450eb4254b45e44d0291e6574247254eea39e0703379c81a14a4ac77429710f5b8e2f25b84c44ad0fa080318cbff12012bcf28b892f56321aa8eb13160
 DIST winit-0.30.4.crate 600087 BLAKE2B 854ebc6ef5020012ffba931f0aa8998d335fda7fe1a444be5d8f6cf34623a5d1249acace3cc322c87515064d52a2551fbb0c1ec19d22baecff2b3a15e7ea2c44 SHA512 b11afd9fdf11e635945b9f23e263761c63173a3aa91feb3a6cd495feac6dcecc9c09d7a2855bcabc5bb705ae76f3e28249c45d6eec11b2de8c8aa124cba1364b
+DIST winit-0.30.8.crate 596137 BLAKE2B 1786cd9fc07890423adb77517f0bdfd213336bbadcedd0920239fddd3741b8ee65dfd46e685f5379565bbab829c95737aa4c04636213aff5dc0861ddeae24a8a SHA512 74cbb9f8388c0953123906426d1f177598b74b9d56eec22f13b61f88193e706281319ff8fa6398e1046746f96f0fe3571901124811ebb14b4d628d206f4c3296
 DIST winnow-0.5.40.crate 159316 BLAKE2B aae5076d59b3459c901d918d8aaa97ba8bfcc993b8484344f52e45f1f37deb96d6cd3a1663a67f3c367be2b05d633286f270274c621bda9f3ab72b98bb652cc2 SHA512 525156f08514b0110697360be6e331a68d08f0cb65ee4ba3ac9d101dd2d42a8c89601e7409bdb5652c5b05145626506651010f58a854c47712065334c61ff39c
 DIST winnow-0.6.18.crate 163357 BLAKE2B 7a43eba294c43b187211c6eabc449775081f44405045ec4786c5f10290639e18d002e872f9db14caa94e26fd99079c7ce2f99e70dcb20d842c0886ac203d8ca8 SHA512 3a146d9dc8fe3fcc855f7766852cd69c49a28f9048d553d3952d7722d49216cb44652d98b15ae1ddee99b2bbc3caefb107a9b85c309242dac943deeca65a81dc
+DIST winnow-0.6.20.crate 163617 BLAKE2B b47ba6cd94ec80a72b51ad09c5cb9de350d2243295d3997732d5d3d9f8d08bd83e3129150fb24992243949120da1bd6091d580db5ff10258fd745afaa944c791 SHA512 3347fdfb5b15ec73a40614ecd0cce60f41d3f2d083f49aaafceeaf5db52d5c677dc3eb39fcc2595999fc9f864d1fde81e180e09dc86a6f6124878e16e86e8bc8
 DIST winnow-0.6.5.crate 159316 BLAKE2B d28c6a069e3d557335c09ae04f1d90a9086b1744d711e259da230c031a0302e270e304f8f9e8bc690c01cedcf07b46e05938ab3468b3e388ae8c51ac361b6408 SHA512 5395db16797beb158e9458099279abf53c5ea62c65584bbb9e0111213ab21c88cd0b0674062757e57ceb6c762a349f22db6ef60deef866fe15ebb0818287ab99
 DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c
 DIST winreg-0.52.0.crate 30148 BLAKE2B 7b458d356ed1385b23ace88d8a7e2a4e2e3211ba4bd22e6488b60fe508ab2b5f6d93c7547e45e0564f512391a8fbc2af1bbd3e3e3a773865d87adff67b5b2fb5 SHA512 50659afe4fa9671696bb5c6a50d62e493ef5359a324a71f7877e2ff0b522560ad65196ac6d2f7f4117edb2e47e84adce7d1de5ed2ce273f132cb2d5006472e25
@@ -575,6 +672,7 @@ DIST x11rb-protocol-0.13.0.crate 507838 BLAKE2B 11955c1908fef177bef859c1207f8fb9
 DIST x11rb-protocol-0.13.1.crate 508522 BLAKE2B abd88b4175e2fadebc44f232262b71261fac9b1289ee749d31fbd4a9d9c8ff426ccf9edef8eced4b41e4fba3401cd81d109fbf8aef1c99b4529f57910d000a8d SHA512 5c1a40fcbc77aa6e3357ac64af37958ac54aa3a78af354c1ea5f8e8b28f352c6e5d8b4762d8c4eb93fa8a1a122184b89c9b1c95a53d35b08819654dbd4cc4db0
 DIST xcursor-0.3.4.crate 6069 BLAKE2B 0597eb71a6ad7ad5360674c76bab042a80f1f52f490edcdd824661288eae98f2bf2c4d7da7079bffda0fbfed0409a7ddb329d855deb784fc952d1c2f2d5dbdd1 SHA512 229ea7516d8a07c3fac46b70329e89c19fcf282134b5063b8302a64f8723d31b52b4fcf23c49aecd3a3a0a736ba4a52cd033f8c3db21a775084c6c0a0e1f6c1e
 DIST xcursor-0.3.5.crate 6256 BLAKE2B 09af0002e0fc70790dd4a132fd74525c18d45cd285fc5ba263e9e6faf83a97aeaaef2ef6e04fc7eb939c501e865623a0f454cbc93913d9821fa6005b8f4445e7 SHA512 284f0012a07776f351d9951de33187636f8410651ed71cee3169c0cc082fda6a01a39fddbed4185dae894f7d5314ce204078ce0848308672ee19789a1fdfb05c
+DIST xcursor-0.3.8.crate 7191 BLAKE2B 3f34ce4a29b7679c099d3df633e734b0304d4bd2b1d749b37281a5d76def9f0f15b0bf6d292a2efcb1b0e99ab11b386fffc3fa8544f079ac5e21a582a35debfe SHA512 6b50ee95595993fc3a5b28ab3b88bea10068136e8b5b319b8b17f77dd923e0c73ee852555eaaaae510acd0c8f00e0f32dc1c9fc83201ea5871386e5b991b49f7
 DIST xdg-2.4.1.crate 14034 BLAKE2B 7fd98ef4e1534d13da125a78cb7425318f1f2f0c7e06a8c8045b2145c1696bf86daf820577aa9757af0deb11951315efd382091b1c73dd3853841388927c2b01 SHA512 23e69abbe79a0977900af37feb9f367a82d0ba4e69fc9421e356a5957920e316379355b1c6eeda1235feb3d028f738c41f520d28665f919e775b20240219e07e
 DIST xdg-2.5.2.crate 14394 BLAKE2B 9d7ad2681ba450b73c66aefd8602a1d32e13e0ec751a368188b61000a5efb3fac943f6e5d6875f409aff6eddff3b2ba22631f71dcda4ea44dac080d551053f4a SHA512 12c7f42d2afd63d8d196511fa069519a0c495fc2555c87c059b96b46d7e2a2c51c31836c48fb329806d312a45a2fd67b4243793aa91e2139e2aa3f05230b2edd
 DIST xkbcommon-dl-0.4.2.crate 5879 BLAKE2B f80fdcd23e71ac64a302f89d572ae8eb61be3115f298c4a6a5b65345cc625bac089c131aa7f77a3601ee898405c0b1a6a1cb4d754fae200c932456964d12ee1e SHA512 71d6a8468bb05d5c1dac130c90135dec88804708f8f2061b861953a980948b1e7c1f893b86ba8bbf251012d834398394deaa26934939ad161fd4ab9a28578cba
@@ -582,6 +680,7 @@ DIST xkeysym-0.2.0.crate 101431 BLAKE2B 626c023f399c3fb2dc155934e2b0d14d74e0b4cd
 DIST xkeysym-0.2.1.crate 103129 BLAKE2B ece5c6af4230b6a0397621a5b2b2bcc9bc0465beee89ea397660ff3800a8a7cdfd7752c4cb73b14596cbe20333479febdc5859bd484bbe5b07d62461934079a7 SHA512 47ff2d219c097f2e3c6d74f1ed4bfdb919c449a055b204154af4fe4b39cf5aba41d53a9f073833a75ee441b90171bdbbb528b765d68745d2b95d24ef81045834
 DIST xml-rs-0.8.19.crate 54051 BLAKE2B 667358226fd5fa1829110ee9b587dae7d95fe1f010f8106f515af12435d3c49b0f9f3c09bb4ec4fa019f8e9b25575b3c5fc2dd5858b37b5bbca9bfa263df842a SHA512 a46796ed542a7396e760ee327ec191e96d61b3fd8b78cef2ab2da75c5290433f422a34cabef20267e8a6a162e0a48fc8f81cd66a5dcf997ddd539e55d9130199
 DIST xml-rs-0.8.20.crate 54443 BLAKE2B 67396f3666765ff3d9f0df71454d59ff391fa8d3abaaf60e63ad764e4dd7a9f015179eb3eaaa177fae1f03ef8731d0c903ab0b37cfd4df1192df28f905f0f2d8 SHA512 82190f37e42ca409501ee645c38f7b6a918bc17f6ea86f5a1fc7070babeb2eaedb20a5434e96f60685d7a1176add87c87cc6ca74d7d1c6d78481921c53ecf961
+DIST xml-rs-0.8.24.crate 54815 BLAKE2B 69be4f30c761ec573b03c657171d351ffaeca86e20de579460f9e3c5bf3a5905d3d71c48979e7c3f5e74c234f3db88f050aca849b97526d15e910f2a8b77c1f7 SHA512 7249a8702c9ef7c7775a69634e9be0909a8e1c9665e9c0473d97294a211e4c924af3db6a04d9198c96505f01b962fd577a25cfe089704757b922ed5a0ca71005
 DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 DIST yeslogic-fontconfig-sys-5.0.0.crate 6718 BLAKE2B 949fa4eab74fca63b0bd110a9c8f96707d8e924ca7ec29e6a07c463d70f25ea3ba5f28614bff09e4aa78295f5f00b62bd39f8ac10c5cbb384711d19384828eaf SHA512 a956133ce286502032746e7c37ad9532f011d911deafd2e5d108827bdbe0765068c013fa0c08eaf7410317596302487dbbbe2878915ca08e0f71e3156c32c5bd
diff --git a/x11-terms/alacritty/alacritty-0.12.3-r1.ebuild b/x11-terms/alacritty/alacritty-0.12.3-r1.ebuild
index 3a469281ea15..229ed05ac9b3 100644
--- a/x11-terms/alacritty/alacritty-0.12.3-r1.ebuild
+++ b/x11-terms/alacritty/alacritty-0.12.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2024 Gentoo Authors
+# Copyright 2017-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -302,6 +302,11 @@ src_unpack() {
 	fi
 }
 
+pkg_setup() {
+	python-any-r1_pkg_setup
+	rust_pkg_setup
+}
+
 src_configure() {
 	local myfeatures=(
 		$(usex X x11 '')
diff --git a/x11-terms/alacritty/alacritty-0.14.0-r1.ebuild b/x11-terms/alacritty/alacritty-0.14.0-r1.ebuild
index b9100de330a0..b0542bd469e6 100644
--- a/x11-terms/alacritty/alacritty-0.14.0-r1.ebuild
+++ b/x11-terms/alacritty/alacritty-0.14.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2024 Gentoo Authors
+# Copyright 2017-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -299,7 +299,7 @@ else
 		https://github.com/${PN}/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz
 		${CARGO_CRATE_URIS}
 	"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
 fi
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/x11-terms/alacritty/alacritty-0.15.0.ebuild b/x11-terms/alacritty/alacritty-0.15.0.ebuild
new file mode 100644
index 000000000000..78142340faec
--- /dev/null
+++ b/x11-terms/alacritty/alacritty-0.15.0.ebuild
@@ -0,0 +1,412 @@
+# Copyright 2017-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	adler2@2.0.0
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	android-activity@0.6.0
+	android-properties@0.2.2
+	anstream@0.6.18
+	anstyle-parse@0.2.6
+	anstyle-query@1.1.2
+	anstyle-wincon@3.0.6
+	anstyle@1.0.10
+	arrayref@0.3.9
+	arrayvec@0.7.6
+	as-raw-xcb-connection@1.0.1
+	atomic-waker@1.1.2
+	autocfg@1.4.0
+	base64@0.22.1
+	bitflags@1.3.2
+	bitflags@2.6.0
+	block2@0.5.1
+	block@0.1.6
+	bumpalo@3.16.0
+	bytemuck@1.20.0
+	bytes@1.9.0
+	calloop-wayland-source@0.3.0
+	calloop@0.13.0
+	cc@1.2.4
+	cesu8@1.1.0
+	cfg-if@1.0.0
+	cfg_aliases@0.2.1
+	cgl@0.3.2
+	clap@4.5.23
+	clap_builder@4.5.23
+	clap_complete@4.5.38
+	clap_derive@4.5.18
+	clap_lex@0.7.4
+	clipboard-win@3.1.1
+	cocoa-foundation@0.1.2
+	cocoa@0.25.0
+	colorchoice@1.0.3
+	combine@4.6.7
+	concurrent-queue@2.5.0
+	copypasta@0.10.1
+	core-foundation-sys@0.8.7
+	core-foundation@0.9.4
+	core-graphics-types@0.1.3
+	core-graphics@0.23.2
+	core-text@20.1.0
+	crc32fast@1.4.2
+	crossbeam-channel@0.5.13
+	crossbeam-utils@0.8.20
+	crossfont@0.8.0
+	cstr@0.2.12
+	cursor-icon@1.1.0
+	dirs-sys@0.4.1
+	dirs@5.0.1
+	dispatch@0.2.0
+	dlib@0.5.2
+	downcast-rs@1.2.1
+	dpi@0.1.1
+	dwrote@0.11.2
+	embed-resource@2.5.1
+	equivalent@1.0.1
+	errno@0.3.10
+	fastrand@2.3.0
+	fdeflate@0.3.7
+	filetime@0.2.25
+	flate2@1.0.35
+	foreign-types-macros@0.2.3
+	foreign-types-shared@0.3.1
+	foreign-types@0.5.0
+	freetype-rs@0.36.0
+	freetype-sys@0.20.1
+	fsevent-sys@4.1.0
+	futures-io@0.3.31
+	gethostname@0.4.3
+	getrandom@0.2.15
+	gl_generator@0.14.0
+	glutin@0.32.1
+	glutin_egl_sys@0.7.0
+	glutin_glx_sys@0.6.0
+	glutin_wgl_sys@0.6.0
+	hashbrown@0.15.2
+	heck@0.5.0
+	hermit-abi@0.4.0
+	home@0.5.9
+	indexmap@2.7.0
+	inotify-sys@0.1.5
+	inotify@0.9.6
+	is_terminal_polyfill@1.70.1
+	itoa@1.0.14
+	jni-sys@0.3.0
+	jni@0.21.1
+	jobserver@0.1.32
+	js-sys@0.3.76
+	khronos_api@3.1.0
+	kqueue-sys@1.0.4
+	kqueue@1.0.8
+	lazy-bytes-cast@5.0.1
+	lazy_static@1.5.0
+	libc@0.2.168
+	libloading@0.8.6
+	libredox@0.1.3
+	linux-raw-sys@0.4.14
+	lock_api@0.4.12
+	log@0.4.22
+	malloc_buf@0.0.6
+	memchr@2.7.4
+	memmap2@0.9.5
+	miniz_oxide@0.8.0
+	mio@0.8.11
+	miow@0.6.0
+	ndk-context@0.1.1
+	ndk-sys@0.6.0+11769913
+	ndk@0.9.0
+	notify@6.1.1
+	num_enum@0.7.3
+	num_enum_derive@0.7.3
+	objc-foundation@0.1.1
+	objc-sys@0.3.5
+	objc2-app-kit@0.2.2
+	objc2-cloud-kit@0.2.2
+	objc2-contacts@0.2.2
+	objc2-core-data@0.2.2
+	objc2-core-image@0.2.2
+	objc2-core-location@0.2.2
+	objc2-encode@4.0.3
+	objc2-foundation@0.2.2
+	objc2-link-presentation@0.2.2
+	objc2-metal@0.2.2
+	objc2-quartz-core@0.2.2
+	objc2-symbols@0.2.2
+	objc2-ui-kit@0.2.2
+	objc2-uniform-type-identifiers@0.2.2
+	objc2-user-notifications@0.2.2
+	objc2@0.5.2
+	objc@0.2.7
+	objc_id@0.1.1
+	once_cell@1.20.2
+	option-ext@0.2.0
+	orbclient@0.3.48
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	percent-encoding@2.3.1
+	pin-project-internal@1.1.7
+	pin-project-lite@0.2.15
+	pin-project@1.1.7
+	piper@0.2.4
+	pkg-config@0.3.31
+	png@0.17.15
+	polling@3.7.4
+	proc-macro-crate@3.2.0
+	proc-macro2@1.0.92
+	quick-xml@0.36.2
+	quote@1.0.37
+	raw-window-handle@0.6.2
+	redox_syscall@0.4.1
+	redox_syscall@0.5.8
+	redox_users@0.4.6
+	regex-automata@0.4.9
+	regex-syntax@0.8.5
+	rustc_version@0.4.1
+	rustix-openpty@0.1.1
+	rustix@0.38.42
+	ryu@1.0.18
+	same-file@1.0.6
+	scoped-tls@1.0.1
+	scopeguard@1.2.0
+	sctk-adwaita@0.10.1
+	semver@1.0.24
+	serde@1.0.216
+	serde_derive@1.0.216
+	serde_json@1.0.133
+	serde_spanned@0.6.8
+	serde_yaml@0.9.34+deprecated
+	shlex@1.3.0
+	signal-hook-registry@1.4.2
+	signal-hook@0.3.17
+	simd-adler32@0.3.7
+	slab@0.4.9
+	smallvec@1.13.2
+	smithay-client-toolkit@0.19.2
+	smithay-clipboard@0.7.2
+	smol_str@0.2.2
+	strict-num@0.1.1
+	strsim@0.11.1
+	syn@2.0.90
+	tempfile@3.14.0
+	thiserror-impl@1.0.69
+	thiserror@1.0.69
+	tiny-skia-path@0.11.4
+	tiny-skia@0.11.4
+	toml@0.8.19
+	toml_datetime@0.6.8
+	toml_edit@0.22.22
+	tracing-core@0.1.33
+	tracing@0.1.41
+	unicode-ident@1.0.14
+	unicode-segmentation@1.12.0
+	unicode-width@0.1.14
+	unsafe-libyaml@0.2.11
+	utf8parse@0.2.2
+	version_check@0.9.5
+	vswhom-sys@0.1.2
+	vswhom@0.1.0
+	vte@0.13.1
+	vte_generate_state_changes@0.1.2
+	walkdir@2.5.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.99
+	wasm-bindgen-futures@0.4.49
+	wasm-bindgen-macro-support@0.2.99
+	wasm-bindgen-macro@0.2.99
+	wasm-bindgen-shared@0.2.99
+	wasm-bindgen@0.2.99
+	wayland-backend@0.3.7
+	wayland-client@0.31.7
+	wayland-csd-frame@0.3.0
+	wayland-cursor@0.31.7
+	wayland-protocols-plasma@0.3.5
+	wayland-protocols-wlr@0.3.5
+	wayland-protocols@0.32.5
+	wayland-scanner@0.31.5
+	wayland-sys@0.31.5
+	web-sys@0.3.76
+	web-time@1.1.0
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.9
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.45.0
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-sys@0.59.0
+	windows-targets@0.42.2
+	windows-targets@0.48.5
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.42.2
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.42.2
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.42.2
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.42.2
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.42.2
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.42.2
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.42.2
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.6
+	winit@0.30.8
+	winnow@0.6.20
+	winreg@0.52.0
+	wio@0.2.2
+	x11-clipboard@0.9.3
+	x11-dl@2.21.0
+	x11rb-protocol@0.13.1
+	x11rb@0.13.1
+	xcursor@0.3.8
+	xdg@2.5.2
+	xkbcommon-dl@0.4.2
+	xkeysym@0.2.1
+	xml-rs@0.8.24
+	yeslogic-fontconfig-sys@5.0.0
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+"
+
+MY_PV="${PV//_rc/-rc}"
+
+RUST_MIN_VER="1.74.1"
+
+inherit bash-completion-r1 cargo desktop
+
+DESCRIPTION="GPU-accelerated terminal emulator"
+HOMEPAGE="https://alacritty.org"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alacritty/alacritty"
+else
+	SRC_URI="
+		https://github.com/${PN}/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		${CARGO_CRATE_URIS}
+	"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD-2 BSD Boost-1.0 CC0-1.0 ISC MIT MPL-2.0
+	Unicode-DFS-2016
+"
+SLOT="0"
+IUSE="wayland +X"
+
+REQUIRED_USE="|| ( wayland X )"
+
+COMMON_DEPEND="
+	media-libs/fontconfig:=
+	media-libs/freetype:2
+	x11-libs/libxkbcommon[X?,wayland?]
+	X? ( x11-libs/libxcb:= )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	media-libs/mesa[X?,wayland?]
+	sys-libs/zlib
+	sys-libs/ncurses:0
+	wayland? ( dev-libs/wayland )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXi
+		x11-libs/libXrandr
+	)
+"
+
+BDEPEND="
+	dev-build/cmake
+	app-text/scdoc
+"
+
+QA_FLAGS_IGNORED="usr/bin/alacritty"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usex X x11 '')
+		$(usev wayland)
+	)
+	cargo_src_configure --no-default-features
+}
+
+src_compile() {
+	scdoc < ./extra/man/alacritty.1.scd > ./alacritty.1 || die
+	scdoc < ./extra/man/alacritty.5.scd > ./alacritty.5 || die
+	scdoc < ./extra/man/alacritty-msg.1.scd > ./alacritty-msg.1 || die
+	scdoc < ./extra/man/alacritty-bindings.5.scd > ./alacritty-bindings.5 || die
+
+	cd alacritty || die
+	cargo_src_compile
+}
+
+src_install() {
+	cargo_src_install --path alacritty
+
+	doman alacritty.1 alacritty.5 alacritty-msg.1 alacritty-bindings.5
+
+	newbashcomp extra/completions/alacritty.bash alacritty
+
+	insinto /usr/share/fish/vendor_completions.d/
+	doins extra/completions/alacritty.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins extra/completions/_alacritty
+
+	domenu extra/linux/Alacritty.desktop
+	newicon extra/logo/compat/alacritty-term.svg Alacritty.svg
+
+	insinto /usr/share/metainfo
+	doins extra/linux/org.alacritty.Alacritty.appdata.xml
+
+	insinto /usr/share/alacritty/scripts
+	doins -r scripts/*
+
+	local DOCS=(
+		CHANGELOG.md README.md
+	)
+	einstalldocs
+}
+
+src_test() {
+	cd alacritty || die
+	cargo_src_test
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		einfo "For information on how to configure alacritty, see the manpage:"
+		einfo "man 5 alacritty"
+	fi
+}
diff --git a/x11-terms/alacritty/alacritty-9999.ebuild b/x11-terms/alacritty/alacritty-9999.ebuild
index 2471fa74d0ce..9db259027ce0 100644
--- a/x11-terms/alacritty/alacritty-9999.ebuild
+++ b/x11-terms/alacritty/alacritty-9999.ebuild
@@ -94,7 +94,7 @@ src_compile() {
 }
 
 src_install() {
-	cargo_src_install --path alacritty
+	cargo_src_install --locked --path alacritty
 
 	doman alacritty.1 alacritty.5 alacritty-msg.1 alacritty-bindings.5
 
diff --git a/x11-terms/ghostty/files/ghostty-1.0.1-apprt-gtk-move-most-version-checks-to-runtime.patch b/x11-terms/ghostty/files/ghostty-1.0.1-apprt-gtk-move-most-version-checks-to-runtime.patch
new file mode 100644
index 000000000000..f8dca8663911
--- /dev/null
+++ b/x11-terms/ghostty/files/ghostty-1.0.1-apprt-gtk-move-most-version-checks-to-runtime.patch
@@ -0,0 +1,125 @@
+From 83bb35ffa3dae7093b829aec380d1ef322a10efb Mon Sep 17 00:00:00 2001
+From: sin-ack <sin-ack@protonmail.com>
+Date: Tue, 7 Jan 2025 19:12:53 +0000
+Subject: [PATCH 1/2] apprt/gtk: Add version.runtimeAtLeast
+
+This will be used for version checks that are independent of the version
+of GTK we built against.
+---
+ src/apprt/gtk/version.zig | 38 ++++++++++++++++++++++++++++++--------
+ 1 file changed, 30 insertions(+), 8 deletions(-)
+
+diff --git a/src/apprt/gtk/version.zig b/src/apprt/gtk/version.zig
+index af7ad12ea0..d8686fa28a 100644
+--- a/src/apprt/gtk/version.zig
++++ b/src/apprt/gtk/version.zig
+@@ -7,6 +7,11 @@ const c = @import("c.zig").c;
+ /// in the headers. If it is run in a runtime context, it will
+ /// check the actual version of the library we are linked against.
+ ///
++/// This function should be used in cases where the version check
++/// would affect code generation, such as using symbols that are
++/// only available beyond a certain version. For checks which only
++/// depend on GTK's runtime behavior, use `runtimeAtLeast`.
++///
+ /// This is inlined so that the comptime checks will disable the
+ /// runtime checks if the comptime checks fail.
+ pub inline fn atLeast(
+@@ -26,6 +31,20 @@ pub inline fn atLeast(
+     // If we're in comptime then we can't check the runtime version.
+     if (@inComptime()) return true;
+ 
++    return runtimeAtLeast(major, minor, micro);
++}
++
++/// Verifies that the GTK version at runtime is at least the given
++/// version.
++///
++/// This function should be used in cases where the only the runtime
++/// behavior is affected by the version check. For checks which would
++/// affect code generation, use `atLeast`.
++pub inline fn runtimeAtLeast(
++    comptime major: u16,
++    comptime minor: u16,
++    comptime micro: u16,
++) bool {
+     // We use the functions instead of the constants such as
+     // c.GTK_MINOR_VERSION because the function gets the actual
+     // runtime version.
+@@ -44,15 +63,18 @@ test "atLeast" {
+     const std = @import("std");
+     const testing = std.testing;
+ 
+-    try testing.expect(atLeast(c.GTK_MAJOR_VERSION, c.GTK_MINOR_VERSION, c.GTK_MICRO_VERSION));
++    const funs = &.{ atLeast, runtimeAtLeast };
++    inline for (funs) |fun| {
++        try testing.expect(fun(c.GTK_MAJOR_VERSION, c.GTK_MINOR_VERSION, c.GTK_MICRO_VERSION));
+ 
+-    try testing.expect(!atLeast(c.GTK_MAJOR_VERSION, c.GTK_MINOR_VERSION, c.GTK_MICRO_VERSION + 1));
+-    try testing.expect(!atLeast(c.GTK_MAJOR_VERSION, c.GTK_MINOR_VERSION + 1, c.GTK_MICRO_VERSION));
+-    try testing.expect(!atLeast(c.GTK_MAJOR_VERSION + 1, c.GTK_MINOR_VERSION, c.GTK_MICRO_VERSION));
++        try testing.expect(!fun(c.GTK_MAJOR_VERSION, c.GTK_MINOR_VERSION, c.GTK_MICRO_VERSION + 1));
++        try testing.expect(!fun(c.GTK_MAJOR_VERSION, c.GTK_MINOR_VERSION + 1, c.GTK_MICRO_VERSION));
++        try testing.expect(!fun(c.GTK_MAJOR_VERSION + 1, c.GTK_MINOR_VERSION, c.GTK_MICRO_VERSION));
+ 
+-    try testing.expect(atLeast(c.GTK_MAJOR_VERSION - 1, c.GTK_MINOR_VERSION, c.GTK_MICRO_VERSION));
+-    try testing.expect(atLeast(c.GTK_MAJOR_VERSION - 1, c.GTK_MINOR_VERSION + 1, c.GTK_MICRO_VERSION));
+-    try testing.expect(atLeast(c.GTK_MAJOR_VERSION - 1, c.GTK_MINOR_VERSION, c.GTK_MICRO_VERSION + 1));
++        try testing.expect(fun(c.GTK_MAJOR_VERSION - 1, c.GTK_MINOR_VERSION, c.GTK_MICRO_VERSION));
++        try testing.expect(fun(c.GTK_MAJOR_VERSION - 1, c.GTK_MINOR_VERSION + 1, c.GTK_MICRO_VERSION));
++        try testing.expect(fun(c.GTK_MAJOR_VERSION - 1, c.GTK_MINOR_VERSION, c.GTK_MICRO_VERSION + 1));
+ 
+-    try testing.expect(atLeast(c.GTK_MAJOR_VERSION, c.GTK_MINOR_VERSION - 1, c.GTK_MICRO_VERSION + 1));
++        try testing.expect(fun(c.GTK_MAJOR_VERSION, c.GTK_MINOR_VERSION - 1, c.GTK_MICRO_VERSION + 1));
++    }
+ }
+
+From 8a7e6c050c556463b126181e01f256a0043ca14a Mon Sep 17 00:00:00 2001
+From: sin-ack <sin-ack@protonmail.com>
+Date: Tue, 7 Jan 2025 19:53:27 +0000
+Subject: [PATCH 2/2] apprt/gtk: Move most version checks to runtime
+
+Unless we are guarding against symbols added in new versions we now
+check against the runtime version of GTK to handle them even when we
+didn't build against that version.
+---
+ src/apprt/gtk/App.zig | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/apprt/gtk/App.zig b/src/apprt/gtk/App.zig
+index 3cc1782c86..993dfcc328 100644
+--- a/src/apprt/gtk/App.zig
++++ b/src/apprt/gtk/App.zig
+@@ -104,12 +104,12 @@ pub fn init(core_app: *CoreApp, opts: Options) !App {
+     // Disabling Vulkan can improve startup times by hundreds of
+     // milliseconds on some systems. We don't use Vulkan so we can just
+     // disable it.
+-    if (version.atLeast(4, 16, 0)) {
++    if (version.runtimeAtLeast(4, 16, 0)) {
+         // From gtk 4.16, GDK_DEBUG is split into GDK_DEBUG and GDK_DISABLE.
+         // For the remainder of "why" see the 4.14 comment below.
+         _ = internal_os.setenv("GDK_DISABLE", "gles-api,vulkan");
+         _ = internal_os.setenv("GDK_DEBUG", "opengl");
+-    } else if (version.atLeast(4, 14, 0)) {
++    } else if (version.runtimeAtLeast(4, 14, 0)) {
+         // We need to export GDK_DEBUG to run on Wayland after GTK 4.14.
+         // Older versions of GTK do not support these values so it is safe
+         // to always set this. Forwards versions are uncertain so we'll have to
+@@ -131,7 +131,7 @@ pub fn init(core_app: *CoreApp, opts: Options) !App {
+         _ = internal_os.setenv("GDK_DEBUG", "vulkan-disable");
+     }
+ 
+-    if (version.atLeast(4, 14, 0)) {
++    if (version.runtimeAtLeast(4, 14, 0)) {
+         // We need to export GSK_RENDERER to opengl because GTK uses ngl by
+         // default after 4.14
+         _ = internal_os.setenv("GSK_RENDERER", "opengl");
+@@ -983,7 +983,7 @@ fn loadRuntimeCss(
+         unfocused_fill.b,
+     });
+ 
+-    if (version.atLeast(4, 16, 0)) {
++    if (version.runtimeAtLeast(4, 16, 0)) {
+         switch (window_theme) {
+             .ghostty => try writer.print(
+                 \\:root {{
diff --git a/x11-terms/ghostty/ghostty-1.0.1-r3.ebuild b/x11-terms/ghostty/ghostty-1.0.1-r3.ebuild
new file mode 100644
index 000000000000..84f3e8132f7c
--- /dev/null
+++ b/x11-terms/ghostty/ghostty-1.0.1-r3.ebuild
@@ -0,0 +1,124 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Fast, feature-rich, and cross-platform terminal emulator"
+HOMEPAGE="https://ghostty.org/ https://github.com/ghostty-org/ghostty"
+
+declare -g -r -A ZBS_DEPENDENCIES=(
+	[breakpad-12207fd37bb8251919c112dcdd8f616a491857b34a451f7e4486490077206dc2a1ea.tar.gz]='https://github.com/getsentry/breakpad/archive/b99f444ba5f6b98cac261cbb391d8766b34a5918.tar.gz'
+	[fontconfig-12201149afb3326c56c05bb0a577f54f76ac20deece63aa2f5cd6ff31a4fa4fcb3b7.tar.gz]='https://deps.files.ghostty.org/fontconfig-2.14.2.tar.gz'
+	[freetype-1220b81f6ecfb3fd222f76cf9106fecfa6554ab07ec7fdc4124b9bb063ae2adf969d.tar.gz]='https://github.com/freetype/freetype/archive/refs/tags/VER-2-13-2.tar.gz'
+	[glfw-1220736fa4ba211162c7a0e46cc8fe04d95921927688bff64ab5da7420d098a7272d.tar.gz]='https://github.com/mitchellh/glfw/archive/b552c6ec47326b94015feddb36058ea567b87159.tar.gz'
+	[glslang-12201278a1a05c0ce0b6eb6026c65cd3e9247aa041b1c260324bf29cee559dd23ba1.tar.gz]='https://github.com/KhronosGroup/glslang/archive/refs/tags/14.2.0.tar.gz'
+	[harfbuzz-1220b8588f106c996af10249bfa092c6fb2f35fbacb1505ef477a0b04a7dd1063122.tar.gz]='https://github.com/harfbuzz/harfbuzz/archive/refs/tags/8.4.0.tar.gz'
+	[highway-12205c83b8311a24b1d5ae6d21640df04f4b0726e314337c043cde1432758cbe165b.tar.gz]='https://github.com/google/highway/archive/refs/tags/1.1.0.tar.gz'
+	[imgui-1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402.tar.gz]='https://github.com/ocornut/imgui/archive/e391fe2e66eb1c96b1624ae8444dc64c23146ef4.tar.gz'
+	[iterm2_themes-1220cc25b537556a42b0948437c791214c229efb78b551c80b1e9b18d70bf0498620.tar.gz]='https://github.com/mbadolato/iTerm2-Color-Schemes/archive/e030599a6a6e19fcd1ea047c7714021170129d56.tar.gz'
+	[libpng-1220aa013f0c83da3fb64ea6d327f9173fa008d10e28bc9349eac3463457723b1c66.tar.gz]='https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.43.tar.gz'
+	[libxev-12206029de146b685739f69b10a6f08baee86b3d0a5f9a659fa2b2b66c9602078bbf.tar.gz]='https://github.com/mitchellh/libxev/archive/db6a52bafadf00360e675fefa7926e8e6c0e9931.tar.gz'
+	[libxml2-122032442d95c3b428ae8e526017fad881e7dc78eab4d558e9a58a80bfbd65a64f7d.tar.gz]='https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.5.tar.gz'
+	[mach-glfw-12206ed982e709e565d536ce930701a8c07edfd2cfdce428683f3f2a601d37696a62.tar.gz]='https://github.com/mitchellh/mach-glfw/archive/37c2995f31abcf7e8378fba68ddcf4a3faa02de0.tar.gz'
+	[oniguruma-1220c15e72eadd0d9085a8af134904d9a0f5dfcbed5f606ad60edc60ebeccd9706bb.tar.gz]='https://github.com/kkos/oniguruma/archive/refs/tags/v6.9.9.tar.gz'
+	[sentry-1220446be831adcca918167647c06c7b825849fa3fba5f22da394667974537a9c77e.tar.gz]='https://github.com/getsentry/sentry-native/archive/refs/tags/0.7.8.tar.gz'
+	[spirv_cross-1220fb3b5586e8be67bc3feb34cbe749cf42a60d628d2953632c2f8141302748c8da.tar.gz]='https://github.com/KhronosGroup/SPIRV-Cross/archive/476f384eb7d9e48613c45179e502a15ab95b6b49.tar.gz'
+	[utfcpp-1220d4d18426ca72fc2b7e56ce47273149815501d0d2395c2a98c726b31ba931e641.tar.gz]='https://github.com/nemtrif/utfcpp/archive/refs/tags/v4.0.5.tar.gz'
+	[vaxis-12200df4ebeaed45de26cb2c9f3b6f3746d8013b604e035dae658f86f586c8c91d2f.tar.gz]='https://github.com/rockorager/libvaxis/archive/6d729a2dc3b934818dffe06d2ba3ce02841ed74b.tar.gz'
+	[vaxis-1220c72c1697dd9008461ead702997a15d8a1c5810247f02e7983b9f74c6c6e4c087.tar.gz]='https://github.com/rockorager/libvaxis/archive/dc0a228a5544988d4a920cfb40be9cd28db41423.tar.gz'
+	[vulkan_headers-122004bfd4c519dadfb8e6281a42fc34fd1aa15aea654ea8a492839046f9894fa2cf.tar.gz]='https://github.com/mitchellh/vulkan-headers/archive/04c8a0389d5a0236a96312988017cd4ce27d8041.tar.gz'
+	[wayland_headers-1220b3164434d2ec9db146a40bf3a30f490590d68fa8529776a3138074f0da2c11ca.tar.gz]='https://github.com/mitchellh/wayland-headers/archive/5f991515a29f994d87b908115a2ab0b899474bd1.tar.gz'
+	[wuffs-12200984439edc817fbcbbaff564020e5104a0d04a2d0f53080700827052de700462.tar.gz]='https://github.com/google/wuffs/archive/refs/tags/v0.4.0-alpha.8.tar.gz'
+	[x11_headers-122089c326186c84aa2fd034b16abc38f3ebf4862d9ae106dc1847ac44f557b36465.tar.gz]='https://github.com/mitchellh/x11-headers/archive/2ffbd62d82ff73ec929dd8de802bc95effa0ef88.tar.gz'
+	[xcode_frameworks-12202adbfecdad671d585c9a5bfcbd5cdf821726779430047742ce1bf94ad67d19cb.tar.gz]='https://github.com/mitchellh/xcode-frameworks/archive/69801c154c39d7ae6129ea1ba8fe1afe00585fc8.tar.gz'
+	[z2d-12201f0d542e7541cf492a001d4d0d0155c92f58212fbcb0d224e95edeba06b5416a.tar.gz]='https://github.com/vancluever/z2d/archive/4638bb02a9dc41cc2fb811f092811f6a951c752a.tar.gz'
+	[zf-1220edc3b8d8bedbb50555947987e5e8e2f93871ca3c8e8d4cc8f1377c15b5dd35e8.tar.gz]='https://github.com/natecraddock/zf/archive/ed99ca18b02dda052e20ba467e90b623c04690dd.tar.gz'
+	[zg-122055beff332830a391e9895c044d33b15ea21063779557024b46169fb1984c6e40.tar.gz]='https://codeberg.org/atman/zg/archive/v0.13.2.tar.gz'
+	[zig-objc-1220e17e64ef0ef561b3e4b9f3a96a2494285f2ec31c097721bf8c8677ec4415c634.tar.gz]='https://github.com/mitchellh/zig-objc/archive/9b8ba849b0f58fe207ecd6ab7c147af55b17556e.tar.gz'
+	[zig_js-12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc.tar.gz]='https://github.com/mitchellh/zig-js/archive/d0b8b0a57c52fbc89f9d9fecba75ca29da7dd7d1.tar.gz'
+	[zigimg-1220dd654ef941fc76fd96f9ec6adadf83f69b9887a0d3f4ee5ac0a1a3e11be35cf5.tar.gz]='https://github.com/zigimg/zigimg/archive/3a667bdb3d7f0955a5a51c8468eac83210c1439e.tar.gz'
+	[ziglyph-12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25.tar.gz]='https://deps.files.ghostty.org/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz'
+	[zlib-1220fed0c74e1019b3ee29edae2051788b080cd96e90d56836eea857b0b966742efb.tar.gz]='https://github.com/madler/zlib/archive/refs/tags/v1.3.1.tar.gz'
+)
+
+ZIG_SLOT="0.13"
+ZIG_NEEDS_LLVM=1
+inherit zig xdg
+
+SRC_URI="
+	https://release.files.ghostty.org/${PV}/ghostty-${PV}.tar.gz
+	${ZBS_DEPENDENCIES_SRC_URI}
+"
+
+LICENSE="Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# TODO: simdutf integration (missing Gentoo version)
+# TODO: spirv-cross integration (missing Gentoo package)
+RDEPEND="
+	>=dev-libs/oniguruma-6.9.9:=
+	>=dev-util/glslang-1.3.296.0:=
+	gui-libs/gtk:4=[X?]
+	>=media-libs/fontconfig-2.14.2:=
+	>=media-libs/freetype-2.13.2:=[bzip2,harfbuzz,png]
+	>=media-libs/harfbuzz-8.4.0:=[truetype]
+	X? ( x11-libs/libX11 )
+	adwaita? ( gui-libs/libadwaita:1= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	man? ( virtual/pandoc )
+"
+
+IUSE="+X +adwaita man"
+
+# XXX: Because we set --release=fast below, Zig will automatically strip
+#      the binary. Until Ghostty provides a way to disable the banner while
+#      having debug symbols we have ignore pre-stripped file warnings.
+QA_PRESTRIPPED="usr/bin/ghostty"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-bzip2-dependency.patch
+	"${FILESDIR}"/${PN}-1.0.1-copy-terminfo-using-installdir.patch
+	"${FILESDIR}"/${PN}-1.0.1-apprt-gtk-move-most-version-checks-to-runtime.patch
+)
+
+src_configure() {
+	local my_zbs_args=(
+		# XXX: Ghostty displays a banner saying it is a debug build unless ReleaseFast is used.
+		--release=fast
+
+		-Dapp-runtime=gtk
+		-Dfont-backend=fontconfig_freetype
+		-Drenderer=opengl
+		-Dgtk-adwaita=$(usex adwaita true false)
+		-Dgtk-x11=$(usex X true false)
+		-Demit-docs=$(usex man true false)
+		-Dversion-string="${PV}"
+
+		-fsys=fontconfig
+		-fsys=freetype
+		-fsys=glslang
+		-fsys=harfbuzz
+		-fsys=libpng
+		-fsys=libxml2
+		-fsys=oniguruma
+		-fsys=zlib
+
+		# See TODO above RDEPEND
+		-fno-sys=simdutf
+		-fno-sys=spirv-cross
+	)
+
+	zig_src_configure
+}
+
+src_install() {
+	zig_src_install
+
+	# HACK: Zig 0.13.0 build system's InstallDir step has a bug where it
+	#       fails to install symbolic links, so we manually create it
+	#       here.
+	dosym -r /usr/share/terminfo/x/xterm-ghostty /usr/share/terminfo/g/ghostty
+}
diff --git a/x11-terms/ghostty/ghostty-1.0.1.ebuild b/x11-terms/ghostty/ghostty-1.0.1.ebuild
deleted file mode 100644
index e00e89040d49..000000000000
--- a/x11-terms/ghostty/ghostty-1.0.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Fast, feature-rich, and cross-platform terminal emulator"
-HOMEPAGE="https://ghostty.org/"
-
-declare -g -r -A ZBS_DEPENDENCIES=(
-	[breakpad-12207fd37bb8251919c112dcdd8f616a491857b34a451f7e4486490077206dc2a1ea.tar.gz]='https://github.com/getsentry/breakpad/archive/b99f444ba5f6b98cac261cbb391d8766b34a5918.tar.gz'
-	[fontconfig-12201149afb3326c56c05bb0a577f54f76ac20deece63aa2f5cd6ff31a4fa4fcb3b7.tar.gz]='https://deps.files.ghostty.org/fontconfig-2.14.2.tar.gz'
-	[freetype-1220b81f6ecfb3fd222f76cf9106fecfa6554ab07ec7fdc4124b9bb063ae2adf969d.tar.gz]='https://github.com/freetype/freetype/archive/refs/tags/VER-2-13-2.tar.gz'
-	[glfw-1220736fa4ba211162c7a0e46cc8fe04d95921927688bff64ab5da7420d098a7272d.tar.gz]='https://github.com/mitchellh/glfw/archive/b552c6ec47326b94015feddb36058ea567b87159.tar.gz'
-	[glslang-12201278a1a05c0ce0b6eb6026c65cd3e9247aa041b1c260324bf29cee559dd23ba1.tar.gz]='https://github.com/KhronosGroup/glslang/archive/refs/tags/14.2.0.tar.gz'
-	[harfbuzz-1220b8588f106c996af10249bfa092c6fb2f35fbacb1505ef477a0b04a7dd1063122.tar.gz]='https://github.com/harfbuzz/harfbuzz/archive/refs/tags/8.4.0.tar.gz'
-	[highway-12205c83b8311a24b1d5ae6d21640df04f4b0726e314337c043cde1432758cbe165b.tar.gz]='https://github.com/google/highway/archive/refs/tags/1.1.0.tar.gz'
-	[imgui-1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402.tar.gz]='https://github.com/ocornut/imgui/archive/e391fe2e66eb1c96b1624ae8444dc64c23146ef4.tar.gz'
-	[iterm2_themes-1220cc25b537556a42b0948437c791214c229efb78b551c80b1e9b18d70bf0498620.tar.gz]='https://github.com/mbadolato/iTerm2-Color-Schemes/archive/e030599a6a6e19fcd1ea047c7714021170129d56.tar.gz'
-	[libpng-1220aa013f0c83da3fb64ea6d327f9173fa008d10e28bc9349eac3463457723b1c66.tar.gz]='https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.43.tar.gz'
-	[libxev-12206029de146b685739f69b10a6f08baee86b3d0a5f9a659fa2b2b66c9602078bbf.tar.gz]='https://github.com/mitchellh/libxev/archive/db6a52bafadf00360e675fefa7926e8e6c0e9931.tar.gz'
-	[libxml2-122032442d95c3b428ae8e526017fad881e7dc78eab4d558e9a58a80bfbd65a64f7d.tar.gz]='https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.5.tar.gz'
-	[mach-glfw-12206ed982e709e565d536ce930701a8c07edfd2cfdce428683f3f2a601d37696a62.tar.gz]='https://github.com/mitchellh/mach-glfw/archive/37c2995f31abcf7e8378fba68ddcf4a3faa02de0.tar.gz'
-	[oniguruma-1220c15e72eadd0d9085a8af134904d9a0f5dfcbed5f606ad60edc60ebeccd9706bb.tar.gz]='https://github.com/kkos/oniguruma/archive/refs/tags/v6.9.9.tar.gz'
-	[sentry-1220446be831adcca918167647c06c7b825849fa3fba5f22da394667974537a9c77e.tar.gz]='https://github.com/getsentry/sentry-native/archive/refs/tags/0.7.8.tar.gz'
-	[spirv_cross-1220fb3b5586e8be67bc3feb34cbe749cf42a60d628d2953632c2f8141302748c8da.tar.gz]='https://github.com/KhronosGroup/SPIRV-Cross/archive/476f384eb7d9e48613c45179e502a15ab95b6b49.tar.gz'
-	[utfcpp-1220d4d18426ca72fc2b7e56ce47273149815501d0d2395c2a98c726b31ba931e641.tar.gz]='https://github.com/nemtrif/utfcpp/archive/refs/tags/v4.0.5.tar.gz'
-	[vaxis-12200df4ebeaed45de26cb2c9f3b6f3746d8013b604e035dae658f86f586c8c91d2f.tar.gz]='https://github.com/rockorager/libvaxis/archive/6d729a2dc3b934818dffe06d2ba3ce02841ed74b.tar.gz'
-	[vaxis-1220c72c1697dd9008461ead702997a15d8a1c5810247f02e7983b9f74c6c6e4c087.tar.gz]='https://github.com/rockorager/libvaxis/archive/dc0a228a5544988d4a920cfb40be9cd28db41423.tar.gz'
-	[vulkan_headers-122004bfd4c519dadfb8e6281a42fc34fd1aa15aea654ea8a492839046f9894fa2cf.tar.gz]='https://github.com/mitchellh/vulkan-headers/archive/04c8a0389d5a0236a96312988017cd4ce27d8041.tar.gz'
-	[wayland_headers-1220b3164434d2ec9db146a40bf3a30f490590d68fa8529776a3138074f0da2c11ca.tar.gz]='https://github.com/mitchellh/wayland-headers/archive/5f991515a29f994d87b908115a2ab0b899474bd1.tar.gz'
-	[wuffs-12200984439edc817fbcbbaff564020e5104a0d04a2d0f53080700827052de700462.tar.gz]='https://github.com/google/wuffs/archive/refs/tags/v0.4.0-alpha.8.tar.gz'
-	[x11_headers-122089c326186c84aa2fd034b16abc38f3ebf4862d9ae106dc1847ac44f557b36465.tar.gz]='https://github.com/mitchellh/x11-headers/archive/2ffbd62d82ff73ec929dd8de802bc95effa0ef88.tar.gz'
-	[xcode_frameworks-12202adbfecdad671d585c9a5bfcbd5cdf821726779430047742ce1bf94ad67d19cb.tar.gz]='https://github.com/mitchellh/xcode-frameworks/archive/69801c154c39d7ae6129ea1ba8fe1afe00585fc8.tar.gz'
-	[z2d-12201f0d542e7541cf492a001d4d0d0155c92f58212fbcb0d224e95edeba06b5416a.tar.gz]='https://github.com/vancluever/z2d/archive/4638bb02a9dc41cc2fb811f092811f6a951c752a.tar.gz'
-	[zf-1220edc3b8d8bedbb50555947987e5e8e2f93871ca3c8e8d4cc8f1377c15b5dd35e8.tar.gz]='https://github.com/natecraddock/zf/archive/ed99ca18b02dda052e20ba467e90b623c04690dd.tar.gz'
-	[zg-122055beff332830a391e9895c044d33b15ea21063779557024b46169fb1984c6e40.tar.gz]='https://codeberg.org/atman/zg/archive/v0.13.2.tar.gz'
-	[zig-objc-1220e17e64ef0ef561b3e4b9f3a96a2494285f2ec31c097721bf8c8677ec4415c634.tar.gz]='https://github.com/mitchellh/zig-objc/archive/9b8ba849b0f58fe207ecd6ab7c147af55b17556e.tar.gz'
-	[zig_js-12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc.tar.gz]='https://github.com/mitchellh/zig-js/archive/d0b8b0a57c52fbc89f9d9fecba75ca29da7dd7d1.tar.gz'
-	[zigimg-1220dd654ef941fc76fd96f9ec6adadf83f69b9887a0d3f4ee5ac0a1a3e11be35cf5.tar.gz]='https://github.com/zigimg/zigimg/archive/3a667bdb3d7f0955a5a51c8468eac83210c1439e.tar.gz'
-	[ziglyph-12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25.tar.gz]='https://deps.files.ghostty.org/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz'
-	[zlib-1220fed0c74e1019b3ee29edae2051788b080cd96e90d56836eea857b0b966742efb.tar.gz]='https://github.com/madler/zlib/archive/refs/tags/v1.3.1.tar.gz'
-)
-
-ZIG_SLOT="0.13"
-inherit zig xdg
-
-SRC_URI="
-	https://release.files.ghostty.org/${PV}/ghostty-${PV}.tar.gz
-	${ZBS_DEPENDENCIES_SRC_URI}
-"
-
-LICENSE="
-	Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 MIT MPL-2.0
-	!system-freetype? ( || ( FTL GPL-2+ ) )
-	!system-harfbuzz? ( Old-MIT ISC icu )
-	!system-libpng? ( libpng2 )
-	!system-zlib? ( ZLIB )
-"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: simdutf integration (missing Gentoo version)
-# TODO: spirv-cross integration (missing Gentoo package)
-# TODO: glfw integration (no option from upstream)
-# NOTE: gtk backend requires X right now since ghostty unconditionally
-#       includes gdk/x11/gdkx.h.
-#       https://github.com/ghostty-org/ghostty/issues/3477
-RDEPEND="
-	adwaita? ( gui-libs/libadwaita:1= )
-	gtk? ( gui-libs/gtk:4=[X] )
-
-	system-fontconfig? ( >=media-libs/fontconfig-2.14.2:= )
-	system-freetype? ( >=media-libs/freetype-2.13.2:=[bzip2] )
-	system-glslang? ( >=dev-util/glslang-1.3.296.0:= )
-	system-harfbuzz? ( >=media-libs/harfbuzz-8.4.0:= )
-	system-libpng? ( >=media-libs/libpng-1.6.43:= )
-	system-libxml2? ( >=dev-libs/libxml2-2.11.5:= )
-	system-oniguruma? ( >=dev-libs/oniguruma-6.9.9:= )
-	system-zlib? ( >=sys-libs/zlib-1.3.1:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	man? ( virtual/pandoc )
-"
-
-IUSE="+adwaita man +gtk glfw"
-# System integrations
-IUSE+="
-	+system-fontconfig +system-freetype +system-glslang +system-harfbuzz +system-libpng +system-libxml2
-	+system-oniguruma +system-zlib
-"
-
-REQUIRED_USE="
-	adwaita? ( gtk )
-	^^ ( gtk glfw )
-"
-
-# XXX: Because we set --release=fast below, Zig will automatically strip
-#      the binary. Until Ghostty provides a way to disable the banner while
-#      having debug symbols we have ignore pre-stripped file warnings.
-QA_PRESTRIPPED="usr/bin/ghostty"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.0-bzip2-dependency.patch
-	"${FILESDIR}"/${PN}-1.0.1-copy-terminfo-using-installdir.patch
-)
-
-src_configure() {
-	local my_zbs_args=(
-		# XXX: Ghostty displays a banner saying it is a debug build unless ReleaseFast is used.
-		--release=fast
-
-		-Dfont-backend=fontconfig_freetype
-		-Drenderer=opengl
-		-Dgtk-adwaita=$(usex adwaita true false)
-		-Demit-docs=$(usex man true false)
-		-Dversion-string="${PV}"
-
-		-f$(usex system-fontconfig sys no-sys)=fontconfig
-		-f$(usex system-freetype sys no-sys)=freetype
-		-f$(usex system-glslang sys no-sys)=glslang
-		-f$(usex system-harfbuzz sys no-sys)=harfbuzz
-		-f$(usex system-libpng sys no-sys)=libpng
-		-f$(usex system-libxml2 sys no-sys)=libxml2
-		-f$(usex system-oniguruma sys no-sys)=oniguruma
-		-f$(usex system-zlib sys no-sys)=zlib
-	)
-
-	if use gtk; then
-		my_zbs_args+=(
-			-Dapp-runtime=gtk
-		)
-	elif use glfw; then
-		my_zbs_args+=(
-			-Dapp-runtime=glfw
-		)
-	fi
-
-	zig_src_configure
-}
-
-src_install() {
-	zig_src_install
-
-	# HACK: Zig 0.13.0 build system's InstallDir step has a bug where it
-	#       fails to install symbolic links, so we manually create it
-	#       here.
-	dosym -r /usr/share/terminfo/x/xterm-ghostty /usr/share/terminfo/g/ghostty
-}
diff --git a/x11-terms/ghostty/metadata.xml b/x11-terms/ghostty/metadata.xml
index 264c58bdd6c6..9dd86c295709 100644
--- a/x11-terms/ghostty/metadata.xml
+++ b/x11-terms/ghostty/metadata.xml
@@ -14,15 +14,5 @@
 	</upstream>
 	<use>
 		<flag name="adwaita">Use <pkg>gui-libs/libadwaita</pkg> for better GNOME integration</flag>
-		<flag name="gtk">Use the GTK 4 backend for windowing</flag>
-		<flag name="glfw">Use the GLFW backend for windowing</flag>
-		<flag name="system-fontconfig">Use system fontconfig instead of the bundled one</flag>
-		<flag name="system-freetype">Use system freetype instead of the bundled one</flag>
-		<flag name="system-glslang">Use system glslang instead of the bundled one</flag>
-		<flag name="system-harfbuzz">Use system harfbuzz instead of the bundled one</flag>
-		<flag name="system-libpng">Use system libpng instead of the bundled one</flag>
-		<flag name="system-libxml2">Use system libxml2 instead of the bundled one</flag>
-		<flag name="system-oniguruma">Use system oniguruma instead of the bundled one</flag>
-		<flag name="system-zlib">Use system zlib instead of the bundled one</flag>
 	</use>
 </pkgmetadata>
diff --git a/x11-terms/kitty-shell-integration/Manifest b/x11-terms/kitty-shell-integration/Manifest
index 0f8b5e4e7b8d..ee4064e1be1f 100644
--- a/x11-terms/kitty-shell-integration/Manifest
+++ b/x11-terms/kitty-shell-integration/Manifest
@@ -1,5 +1,3 @@
 DIST kitty-0.35.2.tar.xz 8220608 BLAKE2B 277803c7036890af34f2e0497ab1d33cb578cba4bfba425d6699e02e2106cde4e10f7dcc6859ce7eea1b4f34795a2f5180328665450ccb49d8a6da4183fa4f50 SHA512 edc78046f942965c823a1202a6d7c85cc2d2acb376824a0f5224d4ba6f48ed0978a00eb7a3e1e6053622a7d5fdcf80009ecfb61a63272cf407dd30f828f47b56
-DIST kitty-0.36.4.tar.xz 8875060 BLAKE2B 530b11a719360997230ef12dc857dea975ccfce1f111c23ccabf392bd463ebe3ae80aef8cb8a1f7c3877e7847d750ad04f6185c0d8e05ac9770f2b7dfc407bf5 SHA512 3ffabb181903495d6a11a8b790e75331a5ab0986de0b7a7958ea7dfee724c29aee88c31672e2f7711d3fc51a81e1a3c84e4469228872aa62df840ded2c0d5218
-DIST kitty-0.37.0.tar.xz 8881224 BLAKE2B ad1fb416ac692dcaf6b05306f4cc5838db8e0c172bab483ee52cddf86c21f864071d22d0f122031635227379957c9bd7fd2f4e971c2ddc74f99ad2e6212cb440 SHA512 786b3361147c988e7bbafcc0706940b8dbd172b07b88c1d6b49ae4a3caefba2cb72a05bf4f173ac963989be6d435bef60d6f8e8abb76362f8a07c231cfa04e31
-DIST kitty-0.38.0.tar.xz 8927688 BLAKE2B 451bde695143b348bdf6cb2e1bc55c434960b790bbe9d12daf4b3817ef0585df03c253c50161d8495eceefa1becd92dc282ce1ec0d0db02eaeedd415599083b7 SHA512 a7c462b92e5ec4db95ec233963010d20a091cdc0660a6ee250863f9fb8ce07dbc6287075c41ee19e3455933991f77273da90814a5178775f00a5364553809c81
 DIST kitty-0.38.1.tar.xz 8935276 BLAKE2B 3cb8cdd8ecdefcbc0317c0ab343df8a71d257f34e0fd961bf9a5991a0a259545cc87adbc4931330eb7ec380608a67a68690f704c35469a57cc82c119bde5d3cb SHA512 273a9fc959973ad73105f5d589e420df9360bb20818165b05e14981c42f7146cec6cbb17539a91089a5af9b94dbb3f416421671bbe20cdb0b876cde5043b784c
+DIST kitty-0.39.0.tar.xz 8938592 BLAKE2B bd9bc47e58824e18c9dd61ab83f8322abcd7b296902dde3e4bb66516b7d83991fce45d3f4580cd9cfb26f7f51f427e0f2a47dfbf695e2236b5f7042643c672fc SHA512 765f1c4bd6aa8fe751c4e0d4a44b924858ed1eb97b37beaa60e5a90b16df353e9b7db32990aa93bc960e8f01ae3de88381fe4cbc1a4dc69c0bdf655077fdf3ab
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.36.4.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.36.4.ebuild
deleted file mode 100644
index bfc3d0b6f88c..000000000000
--- a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.36.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Shell integration scripts for kitty, a GPU-based terminal emulator"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-RESTRICT="test" # intended to be ran on the full kitty package
-
-src_compile() { :; }
-
-src_install() {
-	# install the whole directory in the upstream suggested location
-	# for consistency (i.e. less variation between distros if someone
-	# ssh into Gentoo), then set symlinks to autoload where possible
-	# (these exit immediately if KITTY_SHELL_INTEGRATION is unset)
-	insinto /usr/share/kitty
-	doins -r shell-integration
-
-	dosym -r {/usr/share/kitty/shell-integration/bash/,/etc/bash/bashrc.d/90-}kitty.bash
-
-	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_completions.d/kitty.fish
-	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_conf.d/kitty-shell-integration.fish
-
-	dosym -r /usr/share/{kitty/shell-integration/zsh/completions,zsh/site-functions}/_kitty
-	# zsh integration is handled automatically without needing to modify rc files,
-	# but may require user intervention depending on zsh invocation or if remote
-
-	# this is used internally by the ssh kitten and is not useful there
-	rm -r "${ED}"/usr/share/kitty/shell-integration/ssh || die
-}
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.37.0.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.37.0.ebuild
deleted file mode 100644
index a50a1338ca92..000000000000
--- a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.37.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Shell integration scripts for kitty, a GPU-based terminal emulator"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-RESTRICT="test" # intended to be ran on the full kitty package
-
-src_compile() { :; }
-
-src_install() {
-	# install the whole directory in the upstream suggested location
-	# for consistency (i.e. less variation between distros if someone
-	# ssh into Gentoo), then set symlinks to autoload where possible
-	# (these exit immediately if KITTY_SHELL_INTEGRATION is unset)
-	insinto /usr/share/kitty
-	doins -r shell-integration
-
-	dosym -r {/usr/share/kitty/shell-integration/bash/,/etc/bash/bashrc.d/90-}kitty.bash
-
-	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_completions.d/kitty.fish
-	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_conf.d/kitty-shell-integration.fish
-
-	dosym -r /usr/share/{kitty/shell-integration/zsh/completions,zsh/site-functions}/_kitty
-	# zsh integration is handled automatically without needing to modify rc files,
-	# but may require user intervention depending on zsh invocation or if remote
-
-	# this is used internally by the ssh kitten and is not useful there
-	rm -r "${ED}"/usr/share/kitty/shell-integration/ssh || die
-}
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.38.0.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.38.0.ebuild
deleted file mode 100644
index a50a1338ca92..000000000000
--- a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.38.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Shell integration scripts for kitty, a GPU-based terminal emulator"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-RESTRICT="test" # intended to be ran on the full kitty package
-
-src_compile() { :; }
-
-src_install() {
-	# install the whole directory in the upstream suggested location
-	# for consistency (i.e. less variation between distros if someone
-	# ssh into Gentoo), then set symlinks to autoload where possible
-	# (these exit immediately if KITTY_SHELL_INTEGRATION is unset)
-	insinto /usr/share/kitty
-	doins -r shell-integration
-
-	dosym -r {/usr/share/kitty/shell-integration/bash/,/etc/bash/bashrc.d/90-}kitty.bash
-
-	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_completions.d/kitty.fish
-	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_conf.d/kitty-shell-integration.fish
-
-	dosym -r /usr/share/{kitty/shell-integration/zsh/completions,zsh/site-functions}/_kitty
-	# zsh integration is handled automatically without needing to modify rc files,
-	# but may require user intervention depending on zsh invocation or if remote
-
-	# this is used internally by the ssh kitten and is not useful there
-	rm -r "${ED}"/usr/share/kitty/shell-integration/ssh || die
-}
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.38.1.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.38.1.ebuild
index a50a1338ca92..50b0342fa51d 100644
--- a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.38.1.ebuild
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.38.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ S="${WORKDIR}/kitty-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 RESTRICT="test" # intended to be ran on the full kitty package
 
 src_compile() { :; }
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.39.0.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.39.0.ebuild
new file mode 100644
index 000000000000..4f04ac04c22a
--- /dev/null
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.39.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Shell integration scripts for kitty, a GPU-based terminal emulator"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
+SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
+S="${WORKDIR}/kitty-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+RESTRICT="test" # intended to be ran on the full kitty package
+
+src_compile() { :; }
+
+src_install() {
+	# install the whole directory in the upstream suggested location
+	# for consistency (i.e. less variation between distros if someone
+	# ssh into Gentoo), then set symlinks to autoload where possible
+	# (these exit immediately if KITTY_SHELL_INTEGRATION is unset)
+	insinto /usr/share/kitty
+	doins -r shell-integration
+
+	dosym -r {/usr/share/kitty/shell-integration/bash/,/etc/bash/bashrc.d/90-}kitty.bash
+
+	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_completions.d/kitty.fish
+	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_conf.d/kitty-shell-integration.fish
+
+	dosym -r /usr/share/{kitty/shell-integration/zsh/completions,zsh/site-functions}/_kitty
+	# zsh integration is handled automatically without needing to modify rc files,
+	# but may require user intervention depending on zsh invocation or if remote
+
+	# this is used internally by the ssh kitten and is not useful there
+	rm -r "${ED}"/usr/share/kitty/shell-integration/ssh || die
+}
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 0f8b5e4e7b8d..ee4064e1be1f 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,5 +1,3 @@
 DIST kitty-0.35.2.tar.xz 8220608 BLAKE2B 277803c7036890af34f2e0497ab1d33cb578cba4bfba425d6699e02e2106cde4e10f7dcc6859ce7eea1b4f34795a2f5180328665450ccb49d8a6da4183fa4f50 SHA512 edc78046f942965c823a1202a6d7c85cc2d2acb376824a0f5224d4ba6f48ed0978a00eb7a3e1e6053622a7d5fdcf80009ecfb61a63272cf407dd30f828f47b56
-DIST kitty-0.36.4.tar.xz 8875060 BLAKE2B 530b11a719360997230ef12dc857dea975ccfce1f111c23ccabf392bd463ebe3ae80aef8cb8a1f7c3877e7847d750ad04f6185c0d8e05ac9770f2b7dfc407bf5 SHA512 3ffabb181903495d6a11a8b790e75331a5ab0986de0b7a7958ea7dfee724c29aee88c31672e2f7711d3fc51a81e1a3c84e4469228872aa62df840ded2c0d5218
-DIST kitty-0.37.0.tar.xz 8881224 BLAKE2B ad1fb416ac692dcaf6b05306f4cc5838db8e0c172bab483ee52cddf86c21f864071d22d0f122031635227379957c9bd7fd2f4e971c2ddc74f99ad2e6212cb440 SHA512 786b3361147c988e7bbafcc0706940b8dbd172b07b88c1d6b49ae4a3caefba2cb72a05bf4f173ac963989be6d435bef60d6f8e8abb76362f8a07c231cfa04e31
-DIST kitty-0.38.0.tar.xz 8927688 BLAKE2B 451bde695143b348bdf6cb2e1bc55c434960b790bbe9d12daf4b3817ef0585df03c253c50161d8495eceefa1becd92dc282ce1ec0d0db02eaeedd415599083b7 SHA512 a7c462b92e5ec4db95ec233963010d20a091cdc0660a6ee250863f9fb8ce07dbc6287075c41ee19e3455933991f77273da90814a5178775f00a5364553809c81
 DIST kitty-0.38.1.tar.xz 8935276 BLAKE2B 3cb8cdd8ecdefcbc0317c0ab343df8a71d257f34e0fd961bf9a5991a0a259545cc87adbc4931330eb7ec380608a67a68690f704c35469a57cc82c119bde5d3cb SHA512 273a9fc959973ad73105f5d589e420df9360bb20818165b05e14981c42f7146cec6cbb17539a91089a5af9b94dbb3f416421671bbe20cdb0b876cde5043b784c
+DIST kitty-0.39.0.tar.xz 8938592 BLAKE2B bd9bc47e58824e18c9dd61ab83f8322abcd7b296902dde3e4bb66516b7d83991fce45d3f4580cd9cfb26f7f51f427e0f2a47dfbf695e2236b5f7042643c672fc SHA512 765f1c4bd6aa8fe751c4e0d4a44b924858ed1eb97b37beaa60e5a90b16df353e9b7db32990aa93bc960e8f01ae3de88381fe4cbc1a4dc69c0bdf655077fdf3ab
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.36.4.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.36.4.ebuild
deleted file mode 100644
index 5d9e89c307ab..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.36.4.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
-
-DESCRIPTION="Terminfo for kitty, a GPU-based terminal emulator"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-RESTRICT="test" # intended to be ran on the full kitty package
-
-BDEPEND="sys-libs/ncurses"
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/share/terminfo
-	tic -xo "${ED}"/usr/share/terminfo terminfo/kitty.terminfo || die
-}
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.37.0.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.37.0.ebuild
deleted file mode 100644
index b5c7cbc40759..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.37.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
-
-DESCRIPTION="Terminfo for kitty, a GPU-based terminal emulator"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-RESTRICT="test" # intended to be ran on the full kitty package
-
-BDEPEND="sys-libs/ncurses"
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/share/terminfo
-	tic -xo "${ED}"/usr/share/terminfo terminfo/kitty.terminfo || die
-}
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.38.0.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.38.0.ebuild
deleted file mode 100644
index b5c7cbc40759..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.38.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
-
-DESCRIPTION="Terminfo for kitty, a GPU-based terminal emulator"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-RESTRICT="test" # intended to be ran on the full kitty package
-
-BDEPEND="sys-libs/ncurses"
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/share/terminfo
-	tic -xo "${ED}"/usr/share/terminfo terminfo/kitty.terminfo || die
-}
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.38.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.38.1.ebuild
index b5c7cbc40759..fbf0f5d71de1 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.38.1.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.38.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
@@ -10,7 +10,7 @@ S="${WORKDIR}/kitty-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 RESTRICT="test" # intended to be ran on the full kitty package
 
 BDEPEND="sys-libs/ncurses"
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.39.0.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.39.0.ebuild
new file mode 100644
index 000000000000..f8b7fac6a2f0
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.39.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Terminfo for kitty, a GPU-based terminal emulator"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
+SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
+S="${WORKDIR}/kitty-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+RESTRICT="test" # intended to be ran on the full kitty package
+
+BDEPEND="sys-libs/ncurses"
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr/share/terminfo
+	tic -xo "${ED}"/usr/share/terminfo terminfo/kitty.terminfo || die
+}
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 3e1f8229659c..c3fa970c3ece 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,15 +1,9 @@
 DIST kitty-0.35.2-vendor.tar.xz 1558376 BLAKE2B be02d81411e8549afa81f1f84f05fbc9f9aef8b634bb5572f4301721b25b18c22381e5d8d9ab724cd98e5aee45ac58c338b56e69813cc5d38b6ec1eb39c2b3fb SHA512 bd1ecd57b7a29bbc391fcc093c3a92223656422ee7726815f07015bfd9fd829118570d8177c19867a3e6a200d1f5ba73919e7a7639584d1bfcae21853c3d7140
 DIST kitty-0.35.2.tar.xz 8220608 BLAKE2B 277803c7036890af34f2e0497ab1d33cb578cba4bfba425d6699e02e2106cde4e10f7dcc6859ce7eea1b4f34795a2f5180328665450ccb49d8a6da4183fa4f50 SHA512 edc78046f942965c823a1202a6d7c85cc2d2acb376824a0f5224d4ba6f48ed0978a00eb7a3e1e6053622a7d5fdcf80009ecfb61a63272cf407dd30f828f47b56
 DIST kitty-0.35.2.tar.xz.sig 566 BLAKE2B 89e636f2fcd8ee12be37e41187d131d2092e667ec8b62a5ca1c745d8c5813e55c1d776cafa7d1b9ba7b6142f6bd9c204c6943f22ecc0236329a02912d767831c SHA512 bc3d6734012e81727494c5879f847a72e0a84263a9c156578260592b5ae55558b880315977c586e0f9c4845485d2a10ef414929fb3a12a27ae3248df46338bfc
-DIST kitty-0.36.4-vendor.tar.xz 1563664 BLAKE2B f51f8360e40a4accc504444e1f681b126a9e7d93e75d25f01284f744489fd9cb7ea9ba439136d0fe291d71eee2f05efe5f4cec0c5a94552753da522bdf60c7a8 SHA512 b0a39549a6d1e90fc0b36fdddbcfcf1f8f41c03b5457b92717be3f2f2747ec75fb04a0fcd7394510616de7da3ebb33fc0cbcd1483f4419edd750bfce6788dce5
-DIST kitty-0.36.4.tar.xz 8875060 BLAKE2B 530b11a719360997230ef12dc857dea975ccfce1f111c23ccabf392bd463ebe3ae80aef8cb8a1f7c3877e7847d750ad04f6185c0d8e05ac9770f2b7dfc407bf5 SHA512 3ffabb181903495d6a11a8b790e75331a5ab0986de0b7a7958ea7dfee724c29aee88c31672e2f7711d3fc51a81e1a3c84e4469228872aa62df840ded2c0d5218
-DIST kitty-0.36.4.tar.xz.sig 566 BLAKE2B 94f7bc5dd8c121cd9f10b06a3e0644bfb30e9f66716999fee3a2bab302f8f79965e2c3cce000a074424d84ac902db4784600416afba51e7bad90dc2f66a5580b SHA512 14c629f01e5f92d06388fb0effd256447ee24f1a24492a5478091745c7a5ebe839be70be053652b0329b85d78ef471ce6b34c46c2d4b3bddf8ea8ba9281d4e6d
-DIST kitty-0.37.0-vendor.tar.xz 1564152 BLAKE2B e7fc6b208221fd4abd67ea6659f7f0853d33bfe4c69395000487902bc29c33d7305361409ce7f9c8f5790a700bbd4ddcc83782d976a3136222a370c3ada05d03 SHA512 1eb187669d18d156ac38f20cb7de18ca95862fc0d1913c62974a5c8d1fd9ebb21b80d574169c443e7ee3632b9c7868157a0f1539e8f701f2d1778d31246b74c8
-DIST kitty-0.37.0.tar.xz 8881224 BLAKE2B ad1fb416ac692dcaf6b05306f4cc5838db8e0c172bab483ee52cddf86c21f864071d22d0f122031635227379957c9bd7fd2f4e971c2ddc74f99ad2e6212cb440 SHA512 786b3361147c988e7bbafcc0706940b8dbd172b07b88c1d6b49ae4a3caefba2cb72a05bf4f173ac963989be6d435bef60d6f8e8abb76362f8a07c231cfa04e31
-DIST kitty-0.37.0.tar.xz.sig 566 BLAKE2B 6ebf0de7685cd17c573ca72a201496f8892863b92e2f7febd38d02bac5d6abbfc31d42d2a9084f275fd1956241e444f751e11433fc4e666d929315c80328c4d4 SHA512 ac13807941dee89650f46713727de1dce57e50d99ad31b4f5c96ecb14491a5ec781cde7a078c0e8cf29ff5120c28f31cc7279a9251e3349c9c6bbb4c760804dc
-DIST kitty-0.38.0-vendor.tar.xz 1568056 BLAKE2B eef05af4e925418b405dd7ed9e923ca5390f8074c85fcfb2fe6b70a21b19329514b79fde9a915d9a9f1b3197889e305acaacdc96ea9d1bcf82ab066ee1f611e3 SHA512 e4c183354801e9fcc64918e5e50593c0853e6a27ffe4476708be43929114ba1fdc2200bb318789642207830bae05253b3cf3405cb04c5a3af628b24a488587e3
-DIST kitty-0.38.0.tar.xz 8927688 BLAKE2B 451bde695143b348bdf6cb2e1bc55c434960b790bbe9d12daf4b3817ef0585df03c253c50161d8495eceefa1becd92dc282ce1ec0d0db02eaeedd415599083b7 SHA512 a7c462b92e5ec4db95ec233963010d20a091cdc0660a6ee250863f9fb8ce07dbc6287075c41ee19e3455933991f77273da90814a5178775f00a5364553809c81
-DIST kitty-0.38.0.tar.xz.sig 566 BLAKE2B a28dc67ea1baf5922c554a989cd88017cb63415a5ae46c313ed960bc8d398ceef638c080ebacae7d2e79b5bab149bdd6f8134155d4fb6b73b710a5cce9e48da6 SHA512 6532a6cd270e1ab8ef3d847f6ef2bebdd742716c621ab625f61dc2a793fd6064941ade5bb74740b12fdc40a0049d7aaaa5e2785bb4182de0b2004396b5160926
 DIST kitty-0.38.1-vendor.tar.xz 1568124 BLAKE2B 9f8ce2c2a30f95085cd8c9096b586895074a69c1e7a310fbbf586e352423aadb0114cb1e01e6dc99f55b3e38b4c3e35942a3fcb5407c315bfe7bef19d48397fc SHA512 2578a8e1e1abb49f19a1052b12d79772ca3d3385dbf06620ee11af30c427fc89451b2a2b051833a33c51d8992988c292160fadf3f6a90e8513253c5bec6654c7
 DIST kitty-0.38.1.tar.xz 8935276 BLAKE2B 3cb8cdd8ecdefcbc0317c0ab343df8a71d257f34e0fd961bf9a5991a0a259545cc87adbc4931330eb7ec380608a67a68690f704c35469a57cc82c119bde5d3cb SHA512 273a9fc959973ad73105f5d589e420df9360bb20818165b05e14981c42f7146cec6cbb17539a91089a5af9b94dbb3f416421671bbe20cdb0b876cde5043b784c
 DIST kitty-0.38.1.tar.xz.sig 566 BLAKE2B 8915e05e08b2950c08afe7a4f79879d13561e5f1293da67f89cb8ba8b5907c2ca86fc0ad7a76cf9a16f1c956f0eeb69f6334766615e2da07e1fa2d63e45cab33 SHA512 844d12c1b3eb9e2fa3ff0b8675c58df14744c391ffd0ef3394a1fce8c8cbe9e9575a96fbbe44ee44486a706b0fb0d23c21ba28a3f1abd65861ff1d312307e43e
+DIST kitty-0.39.0-vendor.tar.xz 1575432 BLAKE2B e717e8953e59197daac236876b1922e4116d7a2934f5436a06c4f904d1f5fb7fc6cace67ce8f989c87a8c2d4815c6daa1437a7a6b816050a18be204110c2b6ca SHA512 7f24277da1216dd5465606b25b244aa795de9fcc56093310388a3cefd934f14ff5adc1b41ee676a72dbb2ebf1374603f8e908903ce9d1860c689eb78efce4c53
+DIST kitty-0.39.0.tar.xz 8938592 BLAKE2B bd9bc47e58824e18c9dd61ab83f8322abcd7b296902dde3e4bb66516b7d83991fce45d3f4580cd9cfb26f7f51f427e0f2a47dfbf695e2236b5f7042643c672fc SHA512 765f1c4bd6aa8fe751c4e0d4a44b924858ed1eb97b37beaa60e5a90b16df353e9b7db32990aa93bc960e8f01ae3de88381fe4cbc1a4dc69c0bdf655077fdf3ab
+DIST kitty-0.39.0.tar.xz.sig 566 BLAKE2B 6cc923fc0654e47bbc1ad856258f545f52f392518c90d876a5310ada6e3dff11d6137efa714647c22c7c7b552222d3f23e41b1e08ae0ebf769c09d7778038f65 SHA512 c92aa044cb1a82832e8fdb172eaeddb14eb869a025b29bcfa7bb34098f11896fe41059ecc8c46e9906a186cd4dcd07f4e8c713a56fa623cfdc11391a7b2c4129
diff --git a/x11-terms/kitty/kitty-0.36.4.ebuild b/x11-terms/kitty/kitty-0.36.4.ebuild
deleted file mode 100644
index 2615db39c339..000000000000
--- a/x11-terms/kitty/kitty-0.36.4.ebuild
+++ /dev/null
@@ -1,187 +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} )
-inherit edo go-env optfeature multiprocessing
-inherit python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-else
-	inherit verify-sig
-	SRC_URI="
-		https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
-		https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
-		verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )
-	"
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Fast, feature-rich, GPU-based terminal"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-
-LICENSE="GPL-3 ZLIB"
-LICENSE+=" Apache-2.0 BSD BSD-2 MIT MPL-2.0" # go
-SLOT="0"
-IUSE="+X test wayland"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( X wayland )
-	test? ( X wayland )
-"
-RESTRICT="!test? ( test )"
-
-# dlopen: fontconfig,libglvnd
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/openssl:=
-	dev-libs/xxhash
-	media-fonts/symbols-nerd-font
-	media-libs/fontconfig
-	media-libs/harfbuzz:=[truetype]
-	media-libs/lcms:2
-	media-libs/libglvnd[X?]
-	media-libs/libpng:=
-	sys-apps/dbus
-	sys-libs/zlib:=
-	x11-libs/libxkbcommon[X?]
-	x11-misc/xkeyboard-config
-	~x11-terms/kitty-shell-integration-${PV}
-	~x11-terms/kitty-terminfo-${PV}
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcursor
-	)
-	wayland? ( dev-libs/wayland )
-	!sci-mathematics/kissat
-"
-DEPEND="
-	${RDEPEND}
-	amd64? ( >=dev-libs/simde-0.8.0-r1 )
-	arm64? ( dev-libs/simde )
-	x86? ( dev-libs/simde )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-	)
-	wayland? ( dev-libs/wayland-protocols )
-"
-# bug #919751 wrt go subslot
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-lang/go-1.23:=
-	sys-libs/ncurses
-	virtual/pkgconfig
-	test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') )
-	wayland? ( dev-util/wayland-scanner )
-"
-[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
-
-QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-		cd "${S}" || die
-		edo go mod vendor
-	else
-		use verify-sig &&
-			verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# sed unfortunately feels easier on maintenance than patches here
-	local sedargs=(
-		-e "/num_workers =/s/=.*/= $(makeopts_jobs)/"
-		-e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//'
-		-e "s/cflags.append(fortify_source)/pass/" # use toolchain's _f_s
-		-e "s/ld_flags.append('-[sw]')/pass/"
-	)
-
-	# kitty is often popular on wayland-only setups, try to allow this
-	use !X && sedargs+=( -e '/gl_libs =/s/=.*/= []/' ) #857918
-	use !X || use !wayland &&
-		sedargs+=( -e "s/'x11 wayland'/'$(usex X x11 wayland)'/" )
-
-	# skip docs for live version, missing dependencies
-	[[ ${PV} == 9999 ]] && sedargs+=( -e '/exists.*_build/,/docs(ddir)/d' )
-
-	sed -i setup.py "${sedargs[@]}" || die
-
-	local skiptests=(
-		# relies on 'who' command which doesn't detect users with pid-sandbox
-		kitty_tests/utmp.py
-		# may fail/hang depending on environment and shell initialization
-		kitty_tests/{shell_integration,ssh}.py
-		# relies on /proc/self/fd and gets confused when ran from here
-		tools/utils/tpmfile_test.go
-	)
-	use !test || rm "${skiptests[@]}" || die
-}
-
-src_compile() {
-	tc-export CC
-	local -x PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
-
-	go-env_set_compile_environment
-	local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false"
-	use ppc64 && [[ $(tc-endian) == big ]] || GOFLAGS+=" -buildmode=pie"
-
-	local conf=(
-		--disable-link-time-optimization
-		--ignore-compiler-warnings
-		--libdir-name=$(get_libdir)
-		--shell-integration="enabled no-rc no-sudo"
-		--update-check-interval=0
-		--verbose
-	)
-
-	edo "${EPYTHON}" setup.py linux-package "${conf[@]}"
-	use test && edo "${EPYTHON}" setup.py build-launcher "${conf[@]}"
-
-	rm -r linux-package/share/terminfo || die # provided by kitty-terminfo
-
-	if [[ ${PV} == 9999 ]]; then
-		mkdir -p linux-package/share/doc/${PF} || die
-	else
-		mv linux-package/share/doc/{${PN},${PF}} || die
-	fi
-
-	# generate default config as reference, command taken from docs/conf.rst
-	if ! tc-is-cross-compiler; then
-		linux-package/bin/kitty +runpy \
-			'from kitty.config import *; print(commented_out_default_config())' \
-			> linux-package/share/doc/${PF}/kitty.conf || die
-	fi
-}
-
-src_test() {
-	KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty
-}
-
-src_install() {
-	edo mv linux-package "${ED}"/usr
-
-	# kitty currently detects and copies the system's nerd font at build
-	# time, then uses that rather than the system's at runtime
-	dosym -r /usr/share/fonts/symbols-nerd-font/SymbolsNerdFontMono-Regular.ttf \
-		/usr/"$(get_libdir)"/kitty/fonts/SymbolsNerdFontMono-Regular.ttf
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "audio-based terminal bell support" media-libs/libcanberra
-	use X && optfeature "X11 startup notification support" x11-libs/startup-notification
-	optfeature "opening links from the terminal" x11-misc/xdg-utils
-}
diff --git a/x11-terms/kitty/kitty-0.37.0.ebuild b/x11-terms/kitty/kitty-0.37.0.ebuild
deleted file mode 100644
index 5b29cd01b6e8..000000000000
--- a/x11-terms/kitty/kitty-0.37.0.ebuild
+++ /dev/null
@@ -1,187 +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} )
-inherit edo go-env optfeature multiprocessing
-inherit python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-else
-	inherit verify-sig
-	SRC_URI="
-		https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
-		https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
-		verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )
-	"
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Fast, feature-rich, GPU-based terminal"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-
-LICENSE="GPL-3 ZLIB"
-LICENSE+=" Apache-2.0 BSD BSD-2 MIT MPL-2.0" # go
-SLOT="0"
-IUSE="+X test wayland"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( X wayland )
-	test? ( X wayland )
-"
-RESTRICT="!test? ( test )"
-
-# dlopen: fontconfig,libglvnd
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/openssl:=
-	dev-libs/xxhash
-	media-fonts/symbols-nerd-font
-	media-libs/fontconfig
-	media-libs/harfbuzz:=[truetype]
-	media-libs/lcms:2
-	media-libs/libglvnd[X?]
-	media-libs/libpng:=
-	sys-apps/dbus
-	sys-libs/zlib:=
-	x11-libs/libxkbcommon[X?]
-	x11-misc/xkeyboard-config
-	~x11-terms/kitty-shell-integration-${PV}
-	~x11-terms/kitty-terminfo-${PV}
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcursor
-	)
-	wayland? ( dev-libs/wayland )
-	!sci-mathematics/kissat
-"
-DEPEND="
-	${RDEPEND}
-	amd64? ( >=dev-libs/simde-0.8.0-r1 )
-	arm64? ( dev-libs/simde )
-	x86? ( dev-libs/simde )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-	)
-	wayland? ( dev-libs/wayland-protocols )
-"
-# bug #919751 wrt go subslot
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-lang/go-1.23:=
-	sys-libs/ncurses
-	virtual/pkgconfig
-	test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') )
-	wayland? ( dev-util/wayland-scanner )
-"
-[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
-
-QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-		cd "${S}" || die
-		edo go mod vendor
-	else
-		use verify-sig &&
-			verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# sed unfortunately feels easier on maintenance than patches here
-	local sedargs=(
-		-e "/num_workers =/s/=.*/= $(makeopts_jobs)/"
-		-e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//'
-		-e "s/cflags.append(fortify_source)/pass/" # use toolchain's _f_s
-		-e "s/ld_flags.append('-[sw]')/pass/"
-	)
-
-	# kitty is often popular on wayland-only setups, try to allow this
-	use !X && sedargs+=( -e '/gl_libs =/s/=.*/= []/' ) #857918
-	use !X || use !wayland &&
-		sedargs+=( -e "s/'x11 wayland'/'$(usex X x11 wayland)'/" )
-
-	# skip docs for live version, missing dependencies
-	[[ ${PV} == 9999 ]] && sedargs+=( -e '/exists.*_build/,/docs(ddir)/d' )
-
-	sed -i setup.py "${sedargs[@]}" || die
-
-	local skiptests=(
-		# relies on 'who' command which doesn't detect users with pid-sandbox
-		kitty_tests/utmp.py
-		# may fail/hang depending on environment and shell initialization
-		kitty_tests/{shell_integration,ssh}.py
-		# relies on /proc/self/fd and gets confused when ran from here
-		tools/utils/tpmfile_test.go
-	)
-	use !test || rm "${skiptests[@]}" || die
-}
-
-src_compile() {
-	tc-export CC
-	local -x PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
-
-	go-env_set_compile_environment
-	local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false"
-	use ppc64 && [[ $(tc-endian) == big ]] || GOFLAGS+=" -buildmode=pie"
-
-	local conf=(
-		--disable-link-time-optimization
-		--ignore-compiler-warnings
-		--libdir-name=$(get_libdir)
-		--shell-integration="enabled no-rc no-sudo"
-		--update-check-interval=0
-		--verbose
-	)
-
-	edo "${EPYTHON}" setup.py linux-package "${conf[@]}"
-	use test && edo "${EPYTHON}" setup.py build-launcher "${conf[@]}"
-
-	rm -r linux-package/share/terminfo || die # provided by kitty-terminfo
-
-	if [[ ${PV} == 9999 ]]; then
-		mkdir -p linux-package/share/doc/${PF} || die
-	else
-		mv linux-package/share/doc/{${PN},${PF}} || die
-	fi
-
-	# generate default config as reference, command taken from docs/conf.rst
-	if ! tc-is-cross-compiler; then
-		linux-package/bin/kitty +runpy \
-			'from kitty.config import *; print(commented_out_default_config())' \
-			> linux-package/share/doc/${PF}/kitty.conf || die
-	fi
-}
-
-src_test() {
-	KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty
-}
-
-src_install() {
-	edo mv linux-package "${ED}"/usr
-
-	# kitty currently detects and copies the system's nerd font at build
-	# time, then uses that rather than the system's at runtime
-	dosym -r /usr/share/fonts/symbols-nerd-font/SymbolsNerdFontMono-Regular.ttf \
-		/usr/"$(get_libdir)"/kitty/fonts/SymbolsNerdFontMono-Regular.ttf
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "audio-based terminal bell support" media-libs/libcanberra
-	use X && optfeature "X11 startup notification support" x11-libs/startup-notification
-	optfeature "opening links from the terminal" x11-misc/xdg-utils
-}
diff --git a/x11-terms/kitty/kitty-0.38.0.ebuild b/x11-terms/kitty/kitty-0.38.0.ebuild
deleted file mode 100644
index 5b29cd01b6e8..000000000000
--- a/x11-terms/kitty/kitty-0.38.0.ebuild
+++ /dev/null
@@ -1,187 +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} )
-inherit edo go-env optfeature multiprocessing
-inherit python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-else
-	inherit verify-sig
-	SRC_URI="
-		https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
-		https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
-		verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )
-	"
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Fast, feature-rich, GPU-based terminal"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-
-LICENSE="GPL-3 ZLIB"
-LICENSE+=" Apache-2.0 BSD BSD-2 MIT MPL-2.0" # go
-SLOT="0"
-IUSE="+X test wayland"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( X wayland )
-	test? ( X wayland )
-"
-RESTRICT="!test? ( test )"
-
-# dlopen: fontconfig,libglvnd
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/openssl:=
-	dev-libs/xxhash
-	media-fonts/symbols-nerd-font
-	media-libs/fontconfig
-	media-libs/harfbuzz:=[truetype]
-	media-libs/lcms:2
-	media-libs/libglvnd[X?]
-	media-libs/libpng:=
-	sys-apps/dbus
-	sys-libs/zlib:=
-	x11-libs/libxkbcommon[X?]
-	x11-misc/xkeyboard-config
-	~x11-terms/kitty-shell-integration-${PV}
-	~x11-terms/kitty-terminfo-${PV}
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcursor
-	)
-	wayland? ( dev-libs/wayland )
-	!sci-mathematics/kissat
-"
-DEPEND="
-	${RDEPEND}
-	amd64? ( >=dev-libs/simde-0.8.0-r1 )
-	arm64? ( dev-libs/simde )
-	x86? ( dev-libs/simde )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-	)
-	wayland? ( dev-libs/wayland-protocols )
-"
-# bug #919751 wrt go subslot
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-lang/go-1.23:=
-	sys-libs/ncurses
-	virtual/pkgconfig
-	test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') )
-	wayland? ( dev-util/wayland-scanner )
-"
-[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
-
-QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-		cd "${S}" || die
-		edo go mod vendor
-	else
-		use verify-sig &&
-			verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# sed unfortunately feels easier on maintenance than patches here
-	local sedargs=(
-		-e "/num_workers =/s/=.*/= $(makeopts_jobs)/"
-		-e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//'
-		-e "s/cflags.append(fortify_source)/pass/" # use toolchain's _f_s
-		-e "s/ld_flags.append('-[sw]')/pass/"
-	)
-
-	# kitty is often popular on wayland-only setups, try to allow this
-	use !X && sedargs+=( -e '/gl_libs =/s/=.*/= []/' ) #857918
-	use !X || use !wayland &&
-		sedargs+=( -e "s/'x11 wayland'/'$(usex X x11 wayland)'/" )
-
-	# skip docs for live version, missing dependencies
-	[[ ${PV} == 9999 ]] && sedargs+=( -e '/exists.*_build/,/docs(ddir)/d' )
-
-	sed -i setup.py "${sedargs[@]}" || die
-
-	local skiptests=(
-		# relies on 'who' command which doesn't detect users with pid-sandbox
-		kitty_tests/utmp.py
-		# may fail/hang depending on environment and shell initialization
-		kitty_tests/{shell_integration,ssh}.py
-		# relies on /proc/self/fd and gets confused when ran from here
-		tools/utils/tpmfile_test.go
-	)
-	use !test || rm "${skiptests[@]}" || die
-}
-
-src_compile() {
-	tc-export CC
-	local -x PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
-
-	go-env_set_compile_environment
-	local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false"
-	use ppc64 && [[ $(tc-endian) == big ]] || GOFLAGS+=" -buildmode=pie"
-
-	local conf=(
-		--disable-link-time-optimization
-		--ignore-compiler-warnings
-		--libdir-name=$(get_libdir)
-		--shell-integration="enabled no-rc no-sudo"
-		--update-check-interval=0
-		--verbose
-	)
-
-	edo "${EPYTHON}" setup.py linux-package "${conf[@]}"
-	use test && edo "${EPYTHON}" setup.py build-launcher "${conf[@]}"
-
-	rm -r linux-package/share/terminfo || die # provided by kitty-terminfo
-
-	if [[ ${PV} == 9999 ]]; then
-		mkdir -p linux-package/share/doc/${PF} || die
-	else
-		mv linux-package/share/doc/{${PN},${PF}} || die
-	fi
-
-	# generate default config as reference, command taken from docs/conf.rst
-	if ! tc-is-cross-compiler; then
-		linux-package/bin/kitty +runpy \
-			'from kitty.config import *; print(commented_out_default_config())' \
-			> linux-package/share/doc/${PF}/kitty.conf || die
-	fi
-}
-
-src_test() {
-	KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty
-}
-
-src_install() {
-	edo mv linux-package "${ED}"/usr
-
-	# kitty currently detects and copies the system's nerd font at build
-	# time, then uses that rather than the system's at runtime
-	dosym -r /usr/share/fonts/symbols-nerd-font/SymbolsNerdFontMono-Regular.ttf \
-		/usr/"$(get_libdir)"/kitty/fonts/SymbolsNerdFontMono-Regular.ttf
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "audio-based terminal bell support" media-libs/libcanberra
-	use X && optfeature "X11 startup notification support" x11-libs/startup-notification
-	optfeature "opening links from the terminal" x11-misc/xdg-utils
-}
diff --git a/x11-terms/kitty/kitty-0.38.1.ebuild b/x11-terms/kitty/kitty-0.38.1.ebuild
index 5b29cd01b6e8..e280fcfb10a5 100644
--- a/x11-terms/kitty/kitty-0.38.1.ebuild
+++ b/x11-terms/kitty/kitty-0.38.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
@@ -18,7 +18,7 @@ else
 		verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )
 	"
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Fast, feature-rich, GPU-based terminal"
diff --git a/x11-terms/kitty/kitty-0.39.0.ebuild b/x11-terms/kitty/kitty-0.39.0.ebuild
new file mode 100644
index 000000000000..5847cd29360a
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.39.0.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit edo go-env optfeature multiprocessing
+inherit python-single-r1 toolchain-funcs xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+else
+	inherit verify-sig
+	SRC_URI="
+		https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
+		https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
+		verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )
+	"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Fast, feature-rich, GPU-based terminal"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
+
+LICENSE="GPL-3 ZLIB"
+LICENSE+=" Apache-2.0 BSD BSD-2 MIT MPL-2.0" # go
+SLOT="0"
+IUSE="+X test wayland"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( X wayland )
+	test? ( X wayland )
+"
+RESTRICT="!test? ( test )"
+
+# dlopen: fontconfig,libglvnd
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/openssl:=
+	dev-libs/xxhash
+	media-fonts/symbols-nerd-font
+	media-libs/fontconfig
+	media-libs/harfbuzz:=[truetype]
+	media-libs/lcms:2
+	media-libs/libglvnd[X?]
+	media-libs/libpng:=
+	sys-apps/dbus
+	sys-libs/zlib:=
+	x11-libs/libxkbcommon[X?]
+	x11-misc/xkeyboard-config
+	~x11-terms/kitty-shell-integration-${PV}
+	~x11-terms/kitty-terminfo-${PV}
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+	)
+	wayland? ( dev-libs/wayland )
+	!sci-mathematics/kissat
+"
+DEPEND="
+	${RDEPEND}
+	amd64? ( >=dev-libs/simde-0.8.0-r1 )
+	arm64? ( dev-libs/simde )
+	x86? ( dev-libs/simde )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+	)
+	wayland? ( dev-libs/wayland-protocols )
+"
+# bug #919751 wrt go subslot
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-lang/go-1.23:=
+	sys-libs/ncurses
+	virtual/pkgconfig
+	test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') )
+	wayland? ( dev-util/wayland-scanner )
+"
+[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
+
+QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+		cd "${S}" || die
+		edo go mod vendor
+	else
+		use verify-sig &&
+			verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# sed unfortunately feels easier on maintenance than patches here
+	local sedargs=(
+		-e "/num_workers =/s/=.*/= $(makeopts_jobs)/"
+		-e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//'
+		-e "s/cflags.append(fortify_source)/pass/" # use toolchain's _f_s
+		-e "s/ld_flags.append('-[sw]')/pass/"
+	)
+
+	# kitty is often popular on wayland-only setups, try to allow this
+	use !X && sedargs+=( -e '/gl_libs =/s/=.*/= []/' ) #857918
+	use !X || use !wayland &&
+		sedargs+=( -e "s/'x11 wayland'/'$(usex X x11 wayland)'/" )
+
+	# skip docs for live version, missing dependencies
+	[[ ${PV} == 9999 ]] && sedargs+=( -e '/exists.*_build/,/docs(ddir)/d' )
+
+	sed -i setup.py "${sedargs[@]}" || die
+
+	local skiptests=(
+		# relies on 'who' command which doesn't detect users with pid-sandbox
+		kitty_tests/utmp.py
+		# may fail/hang depending on environment and shell initialization
+		kitty_tests/{shell_integration,ssh}.py
+		# relies on /proc/self/fd and gets confused when ran from here
+		tools/utils/tpmfile_test.go
+	)
+	use !test || rm "${skiptests[@]}" || die
+}
+
+src_compile() {
+	tc-export CC
+	local -x PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
+
+	go-env_set_compile_environment
+	local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false"
+	use ppc64 && [[ $(tc-endian) == big ]] || GOFLAGS+=" -buildmode=pie"
+
+	local conf=(
+		--disable-link-time-optimization
+		--ignore-compiler-warnings
+		--libdir-name=$(get_libdir)
+		--shell-integration="enabled no-rc no-sudo"
+		--update-check-interval=0
+		--verbose
+	)
+
+	edo "${EPYTHON}" setup.py linux-package "${conf[@]}"
+	use test && edo "${EPYTHON}" setup.py build-launcher "${conf[@]}"
+
+	rm -r linux-package/share/terminfo || die # provided by kitty-terminfo
+
+	if [[ ${PV} == 9999 ]]; then
+		mkdir -p linux-package/share/doc/${PF} || die
+	else
+		mv linux-package/share/doc/{${PN},${PF}} || die
+	fi
+
+	# generate default config as reference, command taken from docs/conf.rst
+	if ! tc-is-cross-compiler; then
+		linux-package/bin/kitty +runpy \
+			'from kitty.config import *; print(commented_out_default_config())' \
+			> linux-package/share/doc/${PF}/kitty.conf || die
+	fi
+}
+
+src_test() {
+	KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty
+}
+
+src_install() {
+	edo mv linux-package "${ED}"/usr
+
+	# kitty currently detects and copies the system's nerd font at build
+	# time, then uses that rather than the system's at runtime
+	dosym -r /usr/share/fonts/symbols-nerd-font/SymbolsNerdFontMono-Regular.ttf \
+		/usr/"$(get_libdir)"/kitty/fonts/SymbolsNerdFontMono-Regular.ttf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "audio-based terminal bell support" media-libs/libcanberra
+	use X && optfeature "X11 startup notification support" x11-libs/startup-notification
+	optfeature "opening links from the terminal" x11-misc/xdg-utils
+}
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 9d8b9f604b4f..5a6494d5c86e 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -6,3 +6,5 @@ DIST xterm-395.tgz 1580365 BLAKE2B 8183da30b491a0e43c34e2728586816e733a18aa8bf87
 DIST xterm-395.tgz.asc 729 BLAKE2B f87f732939a52aac55b51a0296144c600d87dca10c5140c39fa0c259e300a8bafe64721aa2c392bcb925521956eb55d11a9be21f6b21112b161db974f4442672 SHA512 c636e13e5c1122d3e9eeb92e013dbb8e9fedc25a7a42b2f2220b33a6a62ea37ae454e97447c65790b454b2c5fda074845e196339a3c861e01013739808dfccf2
 DIST xterm-396.tgz 1584505 BLAKE2B d57751d1f50f5c17a84f8e2fdb591929b6030c44e0fbadb92c8c2dad1f53e16b9fd33f864e35e3e669955622680a860ddc028bcf06b02731150420107bcae490 SHA512 a531acb6104f436c41aab1f7c363ff32fa85bc494caab9ad035bbef3091d82cbe67fda960606176b172b01869ba32cc251b15337e3c10a60c5a238bebae1c9d8
 DIST xterm-396.tgz.asc 729 BLAKE2B 520402ff23afc663472a7b55ae39b6de73160da4a70a0b4348e055063d6ee6b2e834f21e529dd657237ba11d0a4e14654ae413a6825a8c68d78d7aa8b7c4719b SHA512 d5c13f7616930d5e666419bf5359413a2819453bb6536b6186c4e60cf576c0176695cd04d1d9871974e912e7636158a729ce85600c6135c7f7a2670c2f00b51b
+DIST xterm-397.tgz 1588389 BLAKE2B cce4054e83edb9b4203b53a34f7415d038202a10cb997d0c0fe53bb985399bd16626f3e2c5cfdfa8d9eea31d697e532fc858c74c0ba0649936814d5c91825c76 SHA512 cc9770f566199b5e0050c6443eb8382acda02501f14001027fafcaaa3146d9fe3185f304f784d8c61c571d57d33b84a771113658aa4e3aa7f3e66d129781eb73
+DIST xterm-397.tgz.asc 729 BLAKE2B 1ea61c56ba3db5b1dcbaf67ea228b765c198dc8ac4bd66803f3f2c91b0f50551d7100a1f03870578ad8a204bb6da0101ca19c12f7e8e9d44aac4fd67ec9aa6b5 SHA512 3d825b7efdf7e52a98cf3ae050b04ae6652af47a9dad3a049be6ff93f4369c992c094b49ebf41320a6c0fe33d9247c9273fc4e377a130a5f98c2d8f82292a96f
diff --git a/x11-terms/xterm/xterm-396.ebuild b/x11-terms/xterm/xterm-396.ebuild
index 5754b239353d..5e86e25d2c90 100644
--- a/x11-terms/xterm/xterm-396.ebuild
+++ b/x11-terms/xterm/xterm-396.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 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 DEPEND="
diff --git a/x11-terms/xterm/xterm-397.ebuild b/x11-terms/xterm/xterm-397.ebuild
new file mode 100644
index 000000000000..c8942b813d01
--- /dev/null
+++ b/x11-terms/xterm/xterm-397.ebuild
@@ -0,0 +1,106 @@
+# 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/thomasdickey.asc
+inherit desktop flag-o-matic toolchain-funcs verify-sig xdg
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="https://invisible-island.net/xterm/"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
+
+DEPEND="
+	kernel_linux? ( sys-libs/libutempter )
+	media-libs/fontconfig:1.0
+	>=sys-libs/ncurses-5.7-r7:=
+	x11-apps/xmessage
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXft
+	x11-libs/libxkbfile
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	unicode? ( x11-apps/luit )
+	Xaw3d? ( x11-libs/libXaw3d )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${DEPEND}
+	media-fonts/font-misc-misc
+	x11-apps/rgb"
+DEPEND+=" x11-base/xorg-proto"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
+"
+
+DOCS=( README{,.i18n} ctlseqs.txt )
+
+src_configure() {
+	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
+
+	# bug #454736
+	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
+	# something sane like pkg-config or ncurses5-config and stops guessing libs
+	# Everything gets linked against ncurses anyways, so don't shout
+	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
+
+	local myeconfargs=(
+		--disable-full-tgetent
+		--disable-imake
+		--disable-setgid
+		--disable-setuid
+		--enable-256-color
+		--enable-broken-osc
+		--enable-broken-st
+		--enable-dabbrev
+		--enable-exec-xterm
+		--enable-i18n
+		--enable-load-vt-fonts
+		--enable-logging
+		--enable-screen-dumps
+		--enable-warnings
+		--enable-wide-chars
+		--libdir="${EPREFIX}"/etc
+		--with-app-defaults="${DEFAULTS_DIR}"
+		--with-icon-theme=hicolor
+		--with-icondir="${EPREFIX}"/usr/share/icons
+		--with-utempter
+		--with-x
+		$(use_enable openpty)
+		$(use_enable sixel sixel-graphics)
+		$(use_enable toolbar)
+		$(use_enable truetype freetype)
+		$(use_enable unicode luit)
+		$(use_enable unicode mini-luit)
+		$(use_with Xaw3d)
+		$(use_with xinerama)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc xterm.log.html
+	sed -i -e 's/_48x48//g' *.desktop || die
+	domenu *.desktop
+
+	# Fix permissions -- it grabs them from live system, and they can
+	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+	# respectively (#69510).
+	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+	fperms 0755 /usr/bin/xterm
+
+	# restore the navy blue
+	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
+}
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index 92fe13dca827..5dc2cf132b50 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -1,4 +1,4 @@
 DIST adwaita-icon-theme-3.32.0.tar.xz 18540012 BLAKE2B a82ca6758cdbf459ac617d3b3d834e4147c3a3c5e6ca7c705ed2d16e8cf0a1255f5ae999d7e930b9716585b8c498c220f1ab40fec929dde7679efd56f3b18a45 SHA512 9609732cd51c6794d4d86598818bb2a589b0f4b6b795e57f3507dad69b21ef1b2fc2e83e24e937428bbace32fcccf587a5771cbc02c5768206e704f0456a6d1d
-DIST adwaita-icon-theme-45.0.tar.xz 4296512 BLAKE2B b069b12a85cd4e0aa17e1e457ef2083c259723c41e018db360076111e0c68a08189110c0bcd0808f0b31068c1b7c37436fd695ce8daf73b89fe8e63c7ed381b1 SHA512 0511acabb18cd8a07a53c5714d921b562a5d2ed5922d9922521b58d234518af7b9fd97d91e04d18d1a6c97d3a22fb555b8836288eba5ab7c5e9aa51807c2dbf4
 DIST adwaita-icon-theme-46.2.tar.xz 4597704 BLAKE2B 4ced0826a57915b02796e83b1066844e1e053d301eb802b455e3e994486441a166c4285e73062e569873b9725dc1daf330b47026966647c6aef5293f92aa0d96 SHA512 dc4126038b3f7415bc14dc258a7a7a449ae3c12ce635d26e40bea335a410e21ac434a00fc09c897b66d8a1acff58b900611d491cd338c70ddfa2cc8ec2f76a6e
+DIST adwaita-icon-theme-47.0.tar.xz 4199092 BLAKE2B 3f6fcd7b554f6c36946343f17bfa8e9540c542d0f6506b1114f13c40d8617deb722ec95a2d2f5171c128d8dc11be26fb9442576588cf4fcee22627510a53f043 SHA512 6ce983ac2ca16096c161a2ae737a6eeb531d3b4a4c584067c70a2d552ae42687986902f4a0fd48333cd33de5483a328f4d50e6541f2b2144fe0db25023dc86c3
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-45.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-45.0.ebuild
deleted file mode 100644
index b619c6c66506..000000000000
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-45.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson xdg
-
-DESCRIPTION="GNOME default icon theme"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-
-SRC_URI="${SRC_URI}
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-LICENSE="
-	|| ( LGPL-3 CC-BY-SA-3.0 )
-	branding? ( CC-BY-SA-4.0 )
-"
-SLOT="0"
-IUSE="branding"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-# gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
-# librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via
-# its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
-DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
-RDEPEND="${DEPEND}
-	>=gnome-base/librsvg-2.48:2
-"
-BDEPEND="
-	>=gnome-base/librsvg-2.48:2
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-libs/gtk+:3
-"
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_prepare() {
-	if use branding; then
-		for i in 16; do
-			cp "${WORKDIR}"/tango-gentoo-v1.1/${i}x${i}/gentoo.png \
-			"${S}"/Adwaita/${i}x${i}/places/start-here.png \
-			|| die "Copying gentoo logos failed"
-		done
-		cp "${WORKDIR}"/tango-gentoo-v1.1/scalable/gentoo.svg \
-			"${S}"/Adwaita/scalable/places/start-here.svg || die
-	fi
-
-	default
-}
-
-src_test() {
-	:; # No tests
-}
-
-src_install() {
-	meson_src_install
-
-	# Gentoo uses the following location for cursors too, but keep
-	# upstream path to prevent issues like bugs #838451, #834277, #834001
-	dosym ../../../../usr/share/icons/Adwaita/cursors /usr/share/cursors/xorg-x11/Adwaita
-}
-
-pkg_preinst() {
-	# Needed until bug #834600 is solved
-	if [[ -d "${EROOT}"/usr/share/cursors/xorg-x11/Adwaita ]] ; then
-		rm -r "${EROOT}"/usr/share/cursors/xorg-x11/Adwaita || die
-	fi
-	xdg_pkg_preinst
-}
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-47.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-47.0.ebuild
new file mode 100644
index 000000000000..0bfb489c838e
--- /dev/null
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-47.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson xdg
+
+DESCRIPTION="GNOME default icon theme"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
+
+SRC_URI="${SRC_URI}
+	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+"
+LICENSE="
+	|| ( LGPL-3 CC-BY-SA-3.0 )
+	branding? ( CC-BY-SA-4.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="branding"
+
+# gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
+# librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via
+# its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
+# adwaita-icon-theme-legacy needed to be FDO compatible (as done in other distributions
+# as Fedora:
+# https://bugs.gentoo.org/927897
+# https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/issues/288
+# https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/commit/9cb8144b387251eef9c0a221b2febe18802e2435
+DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
+RDEPEND="${DEPEND}
+	>=gnome-base/librsvg-2.48:2
+	x11-themes/adwaita-icon-theme-legacy
+"
+BDEPEND="
+	>=gnome-base/librsvg-2.48:2
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-libs/gtk+:3
+"
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	if use branding; then
+		for i in 16; do
+			cp "${WORKDIR}"/tango-gentoo-v1.1/${i}x${i}/gentoo.png \
+			"${S}"/Adwaita/${i}x${i}/places/start-here.png \
+			|| die "Copying gentoo logos failed"
+		done
+		cp "${WORKDIR}"/tango-gentoo-v1.1/scalable/gentoo.svg \
+			"${S}"/Adwaita/scalable/places/start-here.svg || die
+	fi
+
+	default
+}
+
+src_test() {
+	:; # No tests
+}
+
+src_install() {
+	meson_src_install
+
+	# Gentoo uses the following location for cursors too, but keep
+	# upstream path to prevent issues like bugs #838451, #834277, #834001
+	dosym ../../../../usr/share/icons/Adwaita/cursors /usr/share/cursors/xorg-x11/Adwaita
+}
+
+pkg_preinst() {
+	# Needed until bug #834600 is solved
+	if [[ -d "${EROOT}"/usr/share/cursors/xorg-x11/Adwaita ]] ; then
+		rm -r "${EROOT}"/usr/share/cursors/xorg-x11/Adwaita || die
+	fi
+	xdg_pkg_preinst
+}
diff --git a/x11-themes/gnome-backgrounds/Manifest b/x11-themes/gnome-backgrounds/Manifest
index e8fab1a3c567..73ca299ae831 100644
--- a/x11-themes/gnome-backgrounds/Manifest
+++ b/x11-themes/gnome-backgrounds/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-backgrounds-45.0.tar.xz 32091076 BLAKE2B f8ac82069fb6beb71c7776356c7d87e6b57c9de1c8dd1becdff6a60f22b73284b0231c10c6af5a64addb4a890704808c00757b5f71d6f3a9deeaf59d97441d88 SHA512 6f25f8b22e5ae9ff3c522367af549de7260d34bef38d2b272df538217823cf880132d8be025344e97fd7f108acae4eed4dcac4e93b5f34b843e142687702b0ee
 DIST gnome-backgrounds-46.0.tar.xz 19181236 BLAKE2B a4ca2b0af5f86d3abcfe8960fe270bb8da7d9cfa489481d67078e26c33e9e214345f2c57aeb02b94e9b1460b8b0572a212bcac6d9e9fc9daea25ffaf7f84a97c SHA512 d6b7c5bcc74ea36e9cc2757bf41eb7a5d3794f5782aeee9087b3ff1a17b7526dfbde2a0568d90e41ae707c9c290f4c09c2edd16f4768d8ca4889a96badb9e2b6
+DIST gnome-backgrounds-47.0.tar.xz 13204932 BLAKE2B 99d86c056b698725e55f45e797f937a02ac19e223eb9cc8599d7060808bf59d490b69b9905a19b9d3e485b94b1a7513b1e19a1b56e2af711c885bcd1e447d2d9 SHA512 513aabb9ec00159c638d3ccc8199a0d93eb2da41640e2b664a65fa86e3a1eaa8447a7a7daff1016d245ca099e128c79d02793433a5f556c128ada867805734af
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-47.0.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-47.0.ebuild
new file mode 100644
index 000000000000..17089ba5de1d
--- /dev/null
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-47.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org meson
+
+DESCRIPTION="A set of backgrounds packaged with the GNOME desktop"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+
+LICENSE="CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0 CC-BY-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+
+RDEPEND="
+	media-libs/libjxl[gdk-pixbuf]
+	gnome-base/librsvg
+"
+BDEPEND=">=sys-devel/gettext-0.19.8"
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index b61c009486e7..426a219ddfa6 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1 +1,2 @@
 DIST enlightenment-0.26.0.tar.xz 409678784 BLAKE2B e03cb4485fafd3b03a69ca20b5910fc5b0d7070b625a5f9f6c365d57b62b6be00f7c370f38e127e92f29e430045c3502e7868219cb246f84f044d418808a3ae1 SHA512 52a656b397348a4f6baa28b9da4b42c81160b06d28dba58c22bdf00bf749aed3a9b194e171a5ac349745a4c11afc8ae8c38f9bf8c31bacbc0d196cfb24b15a1e
+DIST enlightenment-0.27.0.tar.xz 409707052 BLAKE2B 9ba22bc619eaf424794dfd34304be9fca205d27b3e318d0dc1d8a126c72174e4a4d71923bdd63076d8984641041bc69fe50b0646299c112f9ce221eb8afe7ff2 SHA512 cd4cad76a4a7e63d4f5f05fb4664580dbb4fb19b2aff059a3c2b32bdcd2495a87eea0a373ed67bc844aa4e4600ad62a0a0de995896a0eda8fb5857590a2affc5
diff --git a/x11-wm/enlightenment/enlightenment-0.27.0.ebuild b/x11-wm/enlightenment/enlightenment-0.27.0.ebuild
new file mode 100644
index 000000000000..3aa941e8b51f
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.27.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature xdg
+
+DESCRIPTION="Enlightenment window manager"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+
+# Historically enlightenment was slotted to separate e16 from e17. e16 is now
+# packaged as x11-wm/e16, but the slot is kept because it's more complicated to
+# reset it rather than just to keep it.
+SLOT="0.17/${PV%%_*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="bluetooth connman doc exif geolocation nls pam policykit systemd udisks wayland xwayland"
+
+REQUIRED_USE="xwayland? ( wayland )"
+
+RDEPEND=">=dev-libs/efl-1.28.0[eet,fontconfig,sound,X]
+	virtual/udev
+	x11-libs/libXext
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	x11-misc/xkeyboard-config
+	bluetooth? ( net-wireless/bluez )
+	connman? ( dev-libs/efl[connman] )
+	exif? ( media-libs/libexif )
+	geolocation? ( app-misc/geoclue:2.0 )
+	pam? ( sys-libs/pam )
+	policykit? ( sys-auth/polkit )
+	systemd? ( sys-apps/systemd )
+	udisks? ( sys-fs/udisks:2 )
+	wayland? (
+		|| (
+			dev-libs/efl[systemd]
+			dev-libs/efl[elogind]
+		)
+		dev-libs/efl[drm,wayland]
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+		x11-libs/pixman
+	)
+	xwayland? (
+		dev-libs/efl[X,wayland]
+		x11-base/xwayland
+	)"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		-Dconvertible=true
+		-Ddevice-udev=true
+		-Delput=true
+		-Dinstall-enlightenment-menu=true
+
+		-Dinstall-sysactions=true
+		-Dinstall-system=true
+		-Dmount-eeze=false
+
+		-Dpackagekit=false
+
+		$(meson_use udisks mount-udisks)
+		$(meson_use bluetooth bluez5)
+		$(meson_use connman)
+		$(meson_use exif libexif)
+		$(meson_use geolocation)
+		$(meson_use nls)
+		$(meson_use pam)
+		$(meson_use policykit polkit)
+		$(meson_use systemd)
+		$(meson_use wayland wl)
+		$(meson_use xwayland)
+	)
+
+	if ! use wayland; then
+		emesonargs+=(
+			-Dwl-buffer=false
+			-Dwl-desktop-shell=false
+			-Dwl-drm=false
+			-Dwl-text-input=false
+			-Dwl-weekeyboard=false
+			-Dwl-wl=false
+			-Dwl-x11=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/. )
+	meson_src_install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	optfeature_header "Additional programs to complement the full EFL suite:"
+	optfeature "efl-based pinentry interface" app-crypt/pinentry[efl]
+	optfeature "an efl-based text editor" app-editors/ecrire
+	optfeature "better monitor backlight and brightness controls" app-misc/ddcutil
+	optfeature "office file thumbnails" app-office/libreoffice app-office/libreoffice-bin
+	optfeature "an EFL-based IDE" dev-util/edi
+	optfeature "image viewer" media-gfx/entice
+	optfeature "image viewer" media-gfx/ephoto
+	optfeature "a media player" media-video/rage
+	optfeature "system and process monitor" sys-process/evisum
+	optfeature "feature rich terminal emulator" x11-terms/terminology
+	optfeature "a matching GTK theme" x11-themes/e-gtk-theme
+}
diff --git a/x11-wm/i3/i3-4.24.ebuild b/x11-wm/i3/i3-4.24.ebuild
index 4fda32915069..4f6536be9bce 100644
--- a/x11-wm/i3/i3-4.24.ebuild
+++ b/x11-wm/i3/i3-4.24.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 @@ if [[ "${PV}" = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index 3d58bf974216..558ed50f7029 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1 +1,2 @@
 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
diff --git a/x11-wm/lumina/files/1.6.1-desktop-files.patch b/x11-wm/lumina/files/1.6.1-desktop-files.patch
deleted file mode 100644
index 33a7165b5901..000000000000
--- a/x11-wm/lumina/files/1.6.1-desktop-files.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -r -U3 lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-info.desktop lumina-1.6.1/src-qt5/core/lumina-info/lumina-info.desktop
---- lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-info.desktop	2021-10-03 02:05:49.000000000 +0700
-+++ lumina-1.6.1/src-qt5/core/lumina-info/lumina-info.desktop	2021-12-05 11:42:18.142573885 +0700
-@@ -5,7 +5,7 @@
- Type=Application
- StartupNotify=true
- Categories=System;
--OnlyShowIn=Lumina;
-+OnlyShowIn=X-Lumina;
- Name=Desktop Information
- Name[pt]=Informações do ambiente de trabalho
- GenericName=Version and Legal Information
-diff -r -U3 lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-support.desktop lumina-1.6.1/src-qt5/core/lumina-info/lumina-support.desktop
---- lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-support.desktop	2021-10-03 02:05:49.000000000 +0700
-+++ lumina-1.6.1/src-qt5/core/lumina-info/lumina-support.desktop	2021-12-05 11:41:50.668573204 +0700
-@@ -3,7 +3,7 @@
- URL=https://t.me/luminadesktop
- Icon=Lumina-DE
- Categories=System;
--OnlyShowIn=Lumina;
-+OnlyShowIn=X-Lumina;
- Name=Community Support
- Name[pt]=Suporte da comunidade
- GenericName=Get Desktop Help
-diff -r -U3 lumina-1.6.1.orig/src-qt5/core-utils/lumina-config/lumina-config.desktop lumina-1.6.1/src-qt5/core-utils/lumina-config/lumina-config.desktop
---- lumina-1.6.1.orig/src-qt5/core-utils/lumina-config/lumina-config.desktop	2021-10-03 02:05:49.000000000 +0700
-+++ lumina-1.6.1/src-qt5/core-utils/lumina-config/lumina-config.desktop	2021-12-05 11:42:58.002574873 +0700
-@@ -9,4 +9,4 @@
- Name[pt]=Configurar ambiente de trabalho
- Comment=Modify the desktop
- Comment[pt]=Modificar ambiente de trabalho
--OnlyShowIn=Lumina;
-+OnlyShowIn=X-Lumina;
diff --git a/x11-wm/lumina/files/desktop-files.patch b/x11-wm/lumina/files/desktop-files.patch
new file mode 100644
index 000000000000..be2043ca8a99
--- /dev/null
+++ b/x11-wm/lumina/files/desktop-files.patch
@@ -0,0 +1,34 @@
+diff '--color=auto' -r -U3 lumina-1.6.2.orig/src-qt5/core/lumina-info/lumina-info.desktop lumina-1.6.2/src-qt5/core/lumina-info/lumina-info.desktop
+--- lumina-1.6.2.orig/src-qt5/core/lumina-info/lumina-info.desktop	2021-12-26 09:33:45.000000000 +0700
++++ lumina-1.6.2/src-qt5/core/lumina-info/lumina-info.desktop	2025-01-16 11:34:04.805877243 +0700
+@@ -5,7 +5,7 @@
+ Type=Application
+ StartupNotify=true
+ Categories=System;
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+ Name=Desktop Information
+ Name[pt]=Informações do ambiente de trabalho
+ GenericName=Version and Legal Information
+diff '--color=auto' -r -U3 lumina-1.6.2.orig/src-qt5/core/lumina-info/lumina-support.desktop lumina-1.6.2/src-qt5/core/lumina-info/lumina-support.desktop
+--- lumina-1.6.2.orig/src-qt5/core/lumina-info/lumina-support.desktop	2021-12-26 09:33:45.000000000 +0700
++++ lumina-1.6.2/src-qt5/core/lumina-info/lumina-support.desktop	2025-01-16 11:36:39.415880173 +0700
+@@ -2,8 +2,7 @@
+ Type=Link
+ URL=https://t.me/luminadesktop
+ Icon=Lumina-DE
+-Categories=System;
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+ Name=Community Support
+ Name[pt]=Suporte da comunidade
+ GenericName=Get Desktop Help
+diff '--color=auto' -r -U3 lumina-1.6.2.orig/src-qt5/core-utils/lumina-config/lumina-config.desktop lumina-1.6.2/src-qt5/core-utils/lumina-config/lumina-config.desktop
+--- lumina-1.6.2.orig/src-qt5/core-utils/lumina-config/lumina-config.desktop	2021-12-26 09:33:45.000000000 +0700
++++ lumina-1.6.2/src-qt5/core-utils/lumina-config/lumina-config.desktop	2025-01-16 11:34:04.805877243 +0700
+@@ -9,4 +9,4 @@
+ Name[pt]=Configurar ambiente de trabalho
+ Comment=Modify the desktop
+ Comment[pt]=Modificar ambiente de trabalho
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
diff --git a/x11-wm/lumina/lumina-1.6.2-r1.ebuild b/x11-wm/lumina/lumina-1.6.2-r1.ebuild
index 565a7424dea0..552669231790 100644
--- a/x11-wm/lumina/lumina-1.6.2-r1.ebuild
+++ b/x11-wm/lumina/lumina-1.6.2-r1.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
@@ -9,6 +9,7 @@ inherit plocale qmake-utils xdg
 DESCRIPTION="Lumina desktop environment"
 HOMEPAGE="https://lumina-desktop.org/"
 SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_/-}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -49,8 +50,6 @@ RDEPEND="${DEPEND}
 BDEPEND="
 	dev-qt/linguist-tools:5"
 
-S="${WORKDIR}/${P/_/-}"
-
 PATCHES=(
 	"${FILESDIR}/1.6.1-desktop-files.patch"
 )
diff --git a/x11-wm/lumina/lumina-1.6.2-r3.ebuild b/x11-wm/lumina/lumina-1.6.2-r3.ebuild
new file mode 100644
index 000000000000..848e0aadbdcd
--- /dev/null
+++ b/x11-wm/lumina/lumina-1.6.2-r3.ebuild
@@ -0,0 +1,92 @@
+# 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 qmake-utils xdg
+
+DESCRIPTION="Lumina desktop environment"
+HOMEPAGE="https://lumina-desktop.org/"
+SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_/-}"
+
+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-misc/xscreensaver
+	x11-wm/fluxbox"
+
+BDEPEND="
+	dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/desktop-files.patch"
+)
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+
+	if ! use desktop-utils ; then
+		rm -rf src-qt5/desktop-utils || die
+		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
+	fi
+
+	plocale_find_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
+}
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
+		CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+	einstalldocs
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}/lumina-session" lumina ||die
+
+	remove_locale() {
+		rm -f "${ED}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
+
+	}
+	plocale_for_each_disabled_locale remove_locale
+}
diff --git a/x11-wm/lumina/lumina-1.6.2.ebuild b/x11-wm/lumina/lumina-1.6.2.ebuild
deleted file mode 100644
index 59b5abb352d1..000000000000
--- a/x11-wm/lumina/lumina-1.6.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 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 qmake-utils xdg
-
-DESCRIPTION="Lumina desktop environment"
-HOMEPAGE="https://lumina-desktop.org/"
-SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-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/libxcb:0
-	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-fs/inotify-tools
-	sys-power/acpi
-	|| (
-		x11-apps/xbacklight
-		sys-power/acpilight
-	)
-	x11-misc/numlockx
-	x11-wm/fluxbox"
-
-BDEPEND="
-	dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=(
-	"${FILESDIR}/1.6.1-desktop-files.patch"
-)
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-
-	if ! use desktop-utils ; then
-		rm -rf src-qt5/desktop-utils || die
-		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
-	fi
-
-	plocale_find_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
-}
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
-		CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	einstalldocs
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}/lumina-session" lumina ||die
-
-	remove_locale() {
-		rm -f "${ED}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
-
-	}
-	plocale_for_each_disabled_locale remove_locale
-}
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/x11-wm/mutter/mutter-46.4-r1.ebuild b/x11-wm/mutter/mutter-46.4-r1.ebuild
new file mode 100644
index 000000000000..c923d571f568
--- /dev/null
+++ b/x11-wm/mutter/mutter-46.4-r1.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
+
+DESCRIPTION="GNOME compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+LICENSE="GPL-2+"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git"
+	SRC_URI=""
+	SLOT="0/14" # This can get easily out of date, but better than 9967
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+fi
+
+IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	wayland? ( ^^ ( elogind systemd ) udev )
+	test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# USE=libei was first introduced in xwayland-23.2.1; we min dep on that to ensure the [libei(+)] works right, as missing USE flag with
+# previous versions meant that it's not there, while the intention seems to be to make it always enabled without USE flag in the future;
+# this ensures have_enable_ei_portal is always there in xwayland.pc, which affects how Xwayland is launched, thus if it were toggled off
+# in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's
+# really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow).
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
+RDEPEND="
+	>=media-libs/graphene-1.10.2[introspection?]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.46[introspection?]
+	>=x11-libs/cairo-1.14[X]
+	>=x11-libs/pixman-0.42
+	>=dev-libs/fribidi-1.0.0
+	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
+	>=dev-libs/glib-2.75.1:2
+	gnome-base/gnome-settings-daemon
+	>=x11-libs/libxkbcommon-0.4.3
+	x11-libs/libICE
+	>=app-accessibility/at-spi2-core-2.46:2[introspection?]
+	sys-apps/dbus
+	>=x11-misc/colord-1.4.5:=
+	>=media-libs/lcms-2.6:2
+	>=media-libs/harfbuzz-2.6.0:=
+	>=dev-libs/libei-1.0.901
+	media-libs/libdisplay-info:=
+
+	gnome? ( gnome-base/gnome-desktop:4= )
+
+	>=media-libs/libcanberra-0.26
+
+	media-libs/libglvnd[X]
+
+	wayland? (
+		>=dev-libs/wayland-protocols-1.33
+		>=dev-libs/wayland-1.22.0
+
+		>=x11-libs/libdrm-2.4.118
+		media-libs/mesa[gbm(+)]
+		>=dev-libs/libinput-1.19.0:=
+
+		elogind? ( sys-auth/elogind )
+		>=x11-base/xwayland-23.2.1[libei(+)]
+		video_cards_nvidia? ( gui-libs/egl-wayland )
+	)
+	udev? (
+		>=virtual/libudev-232-r1:=
+		>=dev-libs/libgudev-232
+	)
+	systemd? ( sys-apps/systemd )
+	x11-libs/libSM
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
+	>=x11-libs/startup-notification-0.7
+	screencast? ( >=media-video/pipewire-0.3.33:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	test? (
+		>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+		gnome-extra/zenity
+	)
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 >=dev-util/sysprof-3.46.0 )
+"
+# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional.
+#	X? (
+RDEPEND+="
+		>=gui-libs/gtk-4.0.0:4[X,introspection?]
+		>=x11-libs/libX11-1.7.0
+		>=x11-libs/libXcomposite-0.4
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXext
+		>=x11-libs/libXfixes-6
+		>=x11-libs/libXi-1.7.4
+		x11-libs/libXtst
+		x11-libs/libxkbfile
+		x11-misc/xkeyboard-config
+		>=x11-libs/libxkbcommon-0.4.3[X]
+		x11-libs/libXrender
+		>=x11-libs/libXrandr-1.5.0
+		x11-libs/libxcb:=
+		x11-libs/libXinerama
+		x11-libs/libXau
+"
+#	)"
+
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			>=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]
+		')
+		app-text/docbook-xml-dtd:4.5
+		x11-misc/xvfb-run
+	)
+	wayland? (
+		>=sys-kernel/linux-headers-4.4
+		x11-libs/libxcvt
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch
+)
+
+python_check_deps() {
+	if use test; then
+		python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_configure() {
+	use debug && EMESON_BUILDTYPE=debug
+	local emesonargs=(
+		# Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass
+		#
+		#   -Dopengl_libname=libOpenGL.so.0
+		#
+		# while we build the x11 renderer, as we currently enable gles2 only
+		# with USE=wayland and x11 renderer wouldn't find the needed GLX symbols
+		# in a configuration where wayland is disabled, as libOpenGL doesn't
+		# include them.
+		#
+		# See
+		# - https://bugs.gentoo.org/835786
+		# - https://forums.gentoo.org/viewtopic-p-8695669.html
+
+		-Dopengl=true
+		$(meson_use wayland gles2)
+		#gles2_libname
+		-Degl=true
+		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use wayland xwayland)
+		$(meson_use systemd)
+		$(meson_use wayland native_backend)
+		$(meson_use screencast remote_desktop)
+		$(meson_use gnome libgnome_desktop)
+		$(meson_use udev)
+		-Dudev_dir=$(get_udevdir)
+		$(meson_use input_devices_wacom libwacom)
+		-Dsound_player=true
+		-Dpango_ft2=true
+		-Dstartup_notification=true
+		-Dsm=true
+		$(meson_use introspection)
+		$(meson_use gtk-doc docs)
+		$(meson_use test cogl_tests)
+		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+		-Dnative_tests=false
+		$(meson_use test clutter_tests)
+		$(meson_use test tests)
+		-Dkvm_tests=false
+		-Dtty_tests=false
+		$(meson_use sysprof profiler)
+		-Dinstalled_tests=false
+
+		#verbose # Let upstream choose default for verbose mode
+		#xwayland_path
+		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+		#xwayland_grab_default_access_rules
+	)
+
+	if use wayland && use video_cards_nvidia; then
+		emesonargs+=(
+			-Degl_device=true
+			-Dwayland_eglstream=true
+		)
+	else
+		emesonargs+=(
+			-Degl_device=false
+			-Dwayland_eglstream=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	# Reset variables to avoid issues from /etc/profile.d/flatpak.sh file
+	gnome2_environment_reset
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+	glib-compile-schemas "${BUILD_DIR}"/data
+	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	use udev && udev_reload
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-wm/mutter/mutter-46.4.ebuild b/x11-wm/mutter/mutter-46.4.ebuild
deleted file mode 100644
index 69fca7491985..000000000000
--- a/x11-wm/mutter/mutter-46.4.ebuild
+++ /dev/null
@@ -1,233 +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} )
-inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-LICENSE="GPL-2+"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git"
-	SRC_URI=""
-	SLOT="0/14" # This can get easily out of date, but better than 9967
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-	SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-fi
-
-IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# USE=libei was first introduced in xwayland-23.2.1; we min dep on that to ensure the [libei(+)] works right, as missing USE flag with
-# previous versions meant that it's not there, while the intention seems to be to make it always enabled without USE flag in the future;
-# this ensures have_enable_ei_portal is always there in xwayland.pc, which affects how Xwayland is launched, thus if it were toggled off
-# in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's
-# really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow).
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
-DEPEND="
-	>=media-libs/graphene-1.10.2[introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.46[introspection?]
-	>=x11-libs/cairo-1.14[X]
-	>=x11-libs/pixman-0.42
-	>=dev-libs/fribidi-1.0.0
-	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
-	>=dev-libs/glib-2.75.1:2
-	gnome-base/gnome-settings-daemon
-	>=x11-libs/libxkbcommon-0.4.3
-	x11-libs/libICE
-	>=app-accessibility/at-spi2-core-2.46:2[introspection?]
-	sys-apps/dbus
-	>=x11-misc/colord-1.4.5:=
-	>=media-libs/lcms-2.6:2
-	>=media-libs/harfbuzz-2.6.0:=
-	>=dev-libs/libei-1.0.901
-
-	gnome? ( gnome-base/gnome-desktop:4= )
-
-	>=media-libs/libcanberra-0.26
-
-	media-libs/libglvnd[X]
-
-	wayland? (
-		>=dev-libs/wayland-protocols-1.33
-		>=dev-libs/wayland-1.22.0
-
-		>=x11-libs/libdrm-2.4.118
-		media-libs/mesa[gbm(+)]
-		>=dev-libs/libinput-1.19.0:=
-
-		elogind? ( sys-auth/elogind )
-		>=x11-base/xwayland-23.2.1[libei(+)]
-		video_cards_nvidia? ( gui-libs/egl-wayland )
-	)
-	udev? (
-		>=virtual/libudev-232-r1:=
-		>=dev-libs/libgudev-232
-	)
-	systemd? ( sys-apps/systemd )
-	x11-libs/libSM
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
-	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.33:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	test? (
-		>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-		gnome-extra/zenity
-	)
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 >=dev-util/sysprof-3.46.0 )
-"
-# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional.
-#	X? (
-DEPEND+="
-		>=gui-libs/gtk-4.0.0:4[X,introspection?]
-		>=x11-libs/libX11-1.7.0
-		>=x11-libs/libXcomposite-0.4
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXext
-		>=x11-libs/libXfixes-6
-		>=x11-libs/libXi-1.7.4
-		x11-libs/libXtst
-		x11-libs/libxkbfile
-		x11-misc/xkeyboard-config
-		>=x11-libs/libxkbcommon-0.4.3[X]
-		x11-libs/libXrender
-		>=x11-libs/libXrandr-1.5.0
-		x11-libs/libxcb:=
-		x11-libs/libXinerama
-		x11-libs/libXau
-"
-#	)"
-
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-"
-BDEPEND="
-	dev-util/wayland-scanner
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			>=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]
-		')
-		app-text/docbook-xml-dtd:4.5
-		x11-misc/xvfb-run
-	)
-	wayland? (
-		>=sys-kernel/linux-headers-4.4
-		x11-libs/libxcvt
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_configure() {
-	use debug && EMESON_BUILDTYPE=debug
-	local emesonargs=(
-		# Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass
-		#
-		#   -Dopengl_libname=libOpenGL.so.0
-		#
-		# while we build the x11 renderer, as we currently enable gles2 only
-		# with USE=wayland and x11 renderer wouldn't find the needed GLX symbols
-		# in a configuration where wayland is disabled, as libOpenGL doesn't
-		# include them.
-		#
-		# See
-		# - https://bugs.gentoo.org/835786
-		# - https://forums.gentoo.org/viewtopic-p-8695669.html
-
-		-Dopengl=true
-		$(meson_use wayland gles2)
-		#gles2_libname
-		-Degl=true
-		-Dglx=true
-		$(meson_use wayland)
-		$(meson_use wayland xwayland)
-		$(meson_use systemd)
-		$(meson_use wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		$(meson_use gnome libgnome_desktop)
-		$(meson_use udev)
-		-Dudev_dir=$(get_udevdir)
-		$(meson_use input_devices_wacom libwacom)
-		-Dsound_player=true
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(meson_use gtk-doc docs)
-		$(meson_use test cogl_tests)
-		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
-		-Dnative_tests=false
-		$(meson_use test clutter_tests)
-		$(meson_use test tests)
-		-Dkvm_tests=false
-		-Dtty_tests=false
-		$(meson_use sysprof profiler)
-		-Dinstalled_tests=false
-
-		#verbose # Let upstream choose default for verbose mode
-		#xwayland_path
-		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
-		#xwayland_grab_default_access_rules
-	)
-
-	if use wayland && use video_cards_nvidia; then
-		emesonargs+=(
-			-Degl_device=true
-			-Dwayland_eglstream=true
-		)
-	else
-		emesonargs+=(
-			-Degl_device=false
-			-Dwayland_eglstream=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_test() {
-	# Reset variables to avoid issues from /etc/profile.d/flatpak.sh file
-	gnome2_environment_reset
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-46.7-r1.ebuild b/x11-wm/mutter/mutter-46.7-r1.ebuild
new file mode 100644
index 000000000000..aac907e2ac69
--- /dev/null
+++ b/x11-wm/mutter/mutter-46.7-r1.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
+
+DESCRIPTION="GNOME compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+LICENSE="GPL-2+"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git"
+	SRC_URI=""
+	SLOT="0/14" # This can get easily out of date, but better than 9967
+else
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+	SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+fi
+
+IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	wayland? ( ^^ ( elogind systemd ) udev )
+	test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# USE=libei was first introduced in xwayland-23.2.1; we min dep on that to ensure the [libei(+)] works right, as missing USE flag with
+# previous versions meant that it's not there, while the intention seems to be to make it always enabled without USE flag in the future;
+# this ensures have_enable_ei_portal is always there in xwayland.pc, which affects how Xwayland is launched, thus if it were toggled off
+# in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's
+# really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow).
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via wdependency() call order
+RDEPEND="
+	>=media-libs/graphene-1.10.2[introspection?]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.46[introspection?]
+	>=x11-libs/cairo-1.14[X]
+	>=x11-libs/pixman-0.42
+	>=dev-libs/fribidi-1.0.0
+	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
+	>=dev-libs/glib-2.75.1:2
+	gnome-base/gnome-settings-daemon
+	>=x11-libs/libxkbcommon-0.4.3
+	x11-libs/libICE
+	>=app-accessibility/at-spi2-core-2.46:2[introspection?]
+	sys-apps/dbus
+	>=x11-misc/colord-1.4.5:=
+	>=media-libs/lcms-2.6:2
+	>=media-libs/harfbuzz-2.6.0:=
+	>=dev-libs/libei-1.0.901
+	media-libs/libdisplay-info:=
+
+	gnome? ( gnome-base/gnome-desktop:4= )
+
+	>=media-libs/libcanberra-0.26
+
+	media-libs/libglvnd[X]
+
+	wayland? (
+		>=dev-libs/wayland-protocols-1.33
+		>=dev-libs/wayland-1.22.0
+
+		>=x11-libs/libdrm-2.4.118
+		media-libs/mesa[gbm(+)]
+		>=dev-libs/libinput-1.19.0:=
+
+		elogind? ( sys-auth/elogind )
+		>=x11-base/xwayland-23.2.1[libei(+)]
+		video_cards_nvidia? ( gui-libs/egl-wayland )
+	)
+	udev? (
+		>=virtual/libudev-232-r1:=
+		>=dev-libs/libgudev-238
+	)
+	systemd? ( sys-apps/systemd )
+	x11-libs/libSM
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
+	>=x11-libs/startup-notification-0.7
+	screencast? ( >=media-video/pipewire-0.3.33:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	test? (
+		>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+		gnome-extra/zenity
+	)
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 >=dev-util/sysprof-3.46.0 )
+"
+# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional.
+#	X? (
+RDEPEND+="
+		>=gui-libs/gtk-4.0.0:4[X,introspection?]
+		>=x11-libs/libX11-1.7.0
+		>=x11-libs/libXcomposite-0.4
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXext
+		>=x11-libs/libXfixes-6
+		>=x11-libs/libXi-1.7.4
+		x11-libs/libXtst
+		x11-libs/libxkbfile
+		x11-misc/xkeyboard-config
+		>=x11-libs/libxkbcommon-0.4.3[X]
+		x11-libs/libXrender
+		>=x11-libs/libXrandr-1.5.0
+		x11-libs/libxcb:=
+		x11-libs/libXinerama
+		x11-libs/libXau
+"
+#	)"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			>=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]
+		')
+		app-text/docbook-xml-dtd:4.5
+		x11-misc/xvfb-run
+	)
+	wayland? (
+		>=sys-kernel/linux-headers-4.4
+		x11-libs/libxcvt
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch
+)
+
+python_check_deps() {
+	if use test; then
+		python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_configure() {
+	use debug && EMESON_BUILDTYPE=debug
+	local emesonargs=(
+		# Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass
+		#
+		#   -Dopengl_libname=libOpenGL.so.0
+		#
+		# while we build the x11 renderer, as we currently enable gles2 only
+		# with USE=wayland and x11 renderer wouldn't find the needed GLX symbols
+		# in a configuration where wayland is disabled, as libOpenGL doesn't
+		# include them.
+		#
+		# See
+		# - https://bugs.gentoo.org/835786
+		# - https://forums.gentoo.org/viewtopic-p-8695669.html
+
+		-Dopengl=true
+		$(meson_use wayland gles2)
+		#gles2_libname
+		-Degl=true
+		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use wayland xwayland)
+		$(meson_use systemd)
+		$(meson_use wayland native_backend)
+		$(meson_use screencast remote_desktop)
+		$(meson_use gnome libgnome_desktop)
+		$(meson_use udev)
+		-Dudev_dir=$(get_udevdir)
+		$(meson_use input_devices_wacom libwacom)
+		-Dsound_player=true
+		-Dpango_ft2=true
+		-Dstartup_notification=true
+		-Dsm=true
+		$(meson_use introspection)
+		$(meson_use gtk-doc docs)
+		$(meson_use test cogl_tests)
+		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+		-Dnative_tests=false
+		$(meson_use test clutter_tests)
+		$(meson_use test tests)
+		-Dkvm_tests=false
+		-Dtty_tests=false
+		$(meson_use sysprof profiler)
+		-Dinstalled_tests=false
+
+		#verbose # Let upstream choose default for verbose mode
+		#xwayland_path
+		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+		#xwayland_grab_default_access_rules
+	)
+
+	if use wayland && use video_cards_nvidia; then
+		emesonargs+=(
+			-Degl_device=true
+			-Dwayland_eglstream=true
+		)
+	else
+		emesonargs+=(
+			-Degl_device=false
+			-Dwayland_eglstream=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	# Reset variables to avoid issues from /etc/profile.d/flatpak.sh file
+	gnome2_environment_reset
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+	glib-compile-schemas "${BUILD_DIR}"/data
+	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	use udev && udev_reload
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-wm/mutter/mutter-46.7.ebuild b/x11-wm/mutter/mutter-46.7.ebuild
deleted file mode 100644
index 6136cb52f942..000000000000
--- a/x11-wm/mutter/mutter-46.7.ebuild
+++ /dev/null
@@ -1,233 +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} )
-inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-LICENSE="GPL-2+"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git"
-	SRC_URI=""
-	SLOT="0/14" # This can get easily out of date, but better than 9967
-else
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-	SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-fi
-
-IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# USE=libei was first introduced in xwayland-23.2.1; we min dep on that to ensure the [libei(+)] works right, as missing USE flag with
-# previous versions meant that it's not there, while the intention seems to be to make it always enabled without USE flag in the future;
-# this ensures have_enable_ei_portal is always there in xwayland.pc, which affects how Xwayland is launched, thus if it were toggled off
-# in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's
-# really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow).
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
-DEPEND="
-	>=media-libs/graphene-1.10.2[introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.46[introspection?]
-	>=x11-libs/cairo-1.14[X]
-	>=x11-libs/pixman-0.42
-	>=dev-libs/fribidi-1.0.0
-	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
-	>=dev-libs/glib-2.75.1:2
-	gnome-base/gnome-settings-daemon
-	>=x11-libs/libxkbcommon-0.4.3
-	x11-libs/libICE
-	>=app-accessibility/at-spi2-core-2.46:2[introspection?]
-	sys-apps/dbus
-	>=x11-misc/colord-1.4.5:=
-	>=media-libs/lcms-2.6:2
-	>=media-libs/harfbuzz-2.6.0:=
-	>=dev-libs/libei-1.0.901
-
-	gnome? ( gnome-base/gnome-desktop:4= )
-
-	>=media-libs/libcanberra-0.26
-
-	media-libs/libglvnd[X]
-
-	wayland? (
-		>=dev-libs/wayland-protocols-1.33
-		>=dev-libs/wayland-1.22.0
-
-		>=x11-libs/libdrm-2.4.118
-		media-libs/mesa[gbm(+)]
-		>=dev-libs/libinput-1.19.0:=
-
-		elogind? ( sys-auth/elogind )
-		>=x11-base/xwayland-23.2.1[libei(+)]
-		video_cards_nvidia? ( gui-libs/egl-wayland )
-	)
-	udev? (
-		>=virtual/libudev-232-r1:=
-		>=dev-libs/libgudev-238
-	)
-	systemd? ( sys-apps/systemd )
-	x11-libs/libSM
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
-	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.33:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	test? (
-		>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-		gnome-extra/zenity
-	)
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 >=dev-util/sysprof-3.46.0 )
-"
-# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional.
-#	X? (
-DEPEND+="
-		>=gui-libs/gtk-4.0.0:4[X,introspection?]
-		>=x11-libs/libX11-1.7.0
-		>=x11-libs/libXcomposite-0.4
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXext
-		>=x11-libs/libXfixes-6
-		>=x11-libs/libXi-1.7.4
-		x11-libs/libXtst
-		x11-libs/libxkbfile
-		x11-misc/xkeyboard-config
-		>=x11-libs/libxkbcommon-0.4.3[X]
-		x11-libs/libXrender
-		>=x11-libs/libXrandr-1.5.0
-		x11-libs/libxcb:=
-		x11-libs/libXinerama
-		x11-libs/libXau
-"
-#	)"
-
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-"
-BDEPEND="
-	dev-util/wayland-scanner
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			>=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]
-		')
-		app-text/docbook-xml-dtd:4.5
-		x11-misc/xvfb-run
-	)
-	wayland? (
-		>=sys-kernel/linux-headers-4.4
-		x11-libs/libxcvt
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_configure() {
-	use debug && EMESON_BUILDTYPE=debug
-	local emesonargs=(
-		# Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass
-		#
-		#   -Dopengl_libname=libOpenGL.so.0
-		#
-		# while we build the x11 renderer, as we currently enable gles2 only
-		# with USE=wayland and x11 renderer wouldn't find the needed GLX symbols
-		# in a configuration where wayland is disabled, as libOpenGL doesn't
-		# include them.
-		#
-		# See
-		# - https://bugs.gentoo.org/835786
-		# - https://forums.gentoo.org/viewtopic-p-8695669.html
-
-		-Dopengl=true
-		$(meson_use wayland gles2)
-		#gles2_libname
-		-Degl=true
-		-Dglx=true
-		$(meson_use wayland)
-		$(meson_use wayland xwayland)
-		$(meson_use systemd)
-		$(meson_use wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		$(meson_use gnome libgnome_desktop)
-		$(meson_use udev)
-		-Dudev_dir=$(get_udevdir)
-		$(meson_use input_devices_wacom libwacom)
-		-Dsound_player=true
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(meson_use gtk-doc docs)
-		$(meson_use test cogl_tests)
-		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
-		-Dnative_tests=false
-		$(meson_use test clutter_tests)
-		$(meson_use test tests)
-		-Dkvm_tests=false
-		-Dtty_tests=false
-		$(meson_use sysprof profiler)
-		-Dinstalled_tests=false
-
-		#verbose # Let upstream choose default for verbose mode
-		#xwayland_path
-		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
-		#xwayland_grab_default_access_rules
-	)
-
-	if use wayland && use video_cards_nvidia; then
-		emesonargs+=(
-			-Degl_device=true
-			-Dwayland_eglstream=true
-		)
-	else
-		emesonargs+=(
-			-Degl_device=false
-			-Dwayland_eglstream=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_test() {
-	# Reset variables to avoid issues from /etc/profile.d/flatpak.sh file
-	gnome2_environment_reset
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild
index 69fca7491985..60a229a50d19 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-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
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	SRC_URI=""
 	SLOT="0/14" # This can get easily out of date, but better than 9967
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 	SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
 fi
 
@@ -34,15 +34,15 @@ RESTRICT="!test? ( test )"
 # in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's
 # really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow).
 # v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
-DEPEND="
+RDEPEND="
 	>=media-libs/graphene-1.10.2[introspection?]
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/pango-1.46[introspection?]
 	>=x11-libs/cairo-1.14[X]
 	>=x11-libs/pixman-0.42
 	>=dev-libs/fribidi-1.0.0
-	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
-	>=dev-libs/glib-2.75.1:2
+	>=gnome-base/gsettings-desktop-schemas-47.0[introspection?]
+	>=dev-libs/glib-2.81.1:2
 	gnome-base/gnome-settings-daemon
 	>=x11-libs/libxkbcommon-0.4.3
 	x11-libs/libICE
@@ -52,6 +52,7 @@ DEPEND="
 	>=media-libs/lcms-2.6:2
 	>=media-libs/harfbuzz-2.6.0:=
 	>=dev-libs/libei-1.0.901
+	>=media-libs/libdisplay-info-0.2:=
 
 	gnome? ( gnome-base/gnome-desktop:4= )
 
@@ -60,12 +61,12 @@ DEPEND="
 	media-libs/libglvnd[X]
 
 	wayland? (
-		>=dev-libs/wayland-protocols-1.33
-		>=dev-libs/wayland-1.22.0
+		>=dev-libs/wayland-protocols-1.38
+		>=dev-libs/wayland-1.23.0
 
 		>=x11-libs/libdrm-2.4.118
 		media-libs/mesa[gbm(+)]
-		>=dev-libs/libinput-1.19.0:=
+		>=dev-libs/libinput-1.26.0:=
 
 		elogind? ( sys-auth/elogind )
 		>=x11-base/xwayland-23.2.1[libei(+)]
@@ -73,13 +74,13 @@ DEPEND="
 	)
 	udev? (
 		>=virtual/libudev-232-r1:=
-		>=dev-libs/libgudev-232
+		>=dev-libs/libgudev-238
 	)
 	systemd? ( sys-apps/systemd )
 	x11-libs/libSM
 	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
 	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.33:= )
+	screencast? ( >=media-video/pipewire-1.2.0:= )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 	test? (
 		>=x11-libs/gtk+-3.19.8:3[X,introspection?]
@@ -89,7 +90,7 @@ DEPEND="
 "
 # for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional.
 #	X? (
-DEPEND+="
+RDEPEND+="
 		>=gui-libs/gtk-4.0.0:4[X,introspection?]
 		>=x11-libs/libX11-1.7.0
 		>=x11-libs/libXcomposite-0.4
@@ -110,7 +111,7 @@ DEPEND+="
 "
 #	)"
 
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
 "
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index 537f58c1be39..4a5ab9777476 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,2 +1,3 @@
 DIST qtile-0.28.1.tar.gz 601217 BLAKE2B 04f24c5b628e1c3d0eca395135ef0d0093af5a57d23aea751e76197da4f148ae679a9fb650e2589e5f2e253673cab86642e3f0695ac219641c65192eb9a37274 SHA512 95b4d95206aeac4bb59d47c94eb93b55ac413681050345a0d61cdb19b71dd785bb6c13c0161757b9bfa5e8d0ce345fcf64eea04fc44b2f596a65b70f5da5d32e
 DIST qtile-0.29.0.tar.gz 607026 BLAKE2B 71a282b08b6d15e08f616e28a59a632a76ef4a180788177606873dec7870d715fa96403ece6745de8898716e863b7462a745426f59fb13fd40ba87207be30d24 SHA512 745a9a79209c0dbac5e49b8ee90d567204fd022c63e9321afbb6a3a064f8e9376fdbbe67a5115e50b251d28129f4907761cbbd3e0b3d2e0676e047ef8369c92c
+DIST qtile-0.30.0.tar.gz 617632 BLAKE2B c26d51d7e31ef058a5a08ef8ef47ccce19bc59b9337d0dc1d874b2c4047ea2e1827cc694a9199ea808d22b7845a8bb019eb85a1912ddfb00801763b43e62b0f2 SHA512 218b7ba42315884faf11460c18a9fa8f34a3284d3fd4632c24997657e7ec659e337be9b0845e00dc7d4106828d7e5efcfd401ea7d031e0725598e60ad4172147
diff --git a/x11-wm/qtile/qtile-0.30.0.ebuild b/x11-wm/qtile/qtile-0.30.0.ebuild
new file mode 100644
index 000000000000..75008ae99ce6
--- /dev/null
+++ b/x11-wm/qtile/qtile-0.30.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi virtualx
+
+DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
+HOMEPAGE="
+	https://qtile.org/
+	https://github.com/qtile/qtile/
+	https://pypi.org/project/qtile/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pulseaudio wayland"
+
+DEPEND="
+	>=dev-python/cairocffi-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/dbus-fast[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	>=dev-python/xcffib-1.4.0[${PYTHON_USEDEP}]
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango
+	pulseaudio? (
+		dev-python/pulsectl-asyncio[${PYTHON_USEDEP}]
+		media-libs/libpulse
+	)
+	wayland? (
+		>=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}]
+		>=dev-python/pywlroots-0.17[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/libcst[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[X]
+		x11-base/xorg-server[xephyr,xvfb]
+	)
+	wayland? (
+		>=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}]
+		>=dev-python/pywlroots-0.17[${PYTHON_USEDEP}]
+	)
+"
+
+: ${EPYTEST_TIMEOUT:=180}
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "s/can_import(\"wlroots.ffi_build\")/$(usex wayland True False)/" \
+		-i setup.py || die
+
+	mkdir bin || die
+}
+
+src_compile() {
+	local -x CFFI_TMPDIR=${T}
+	distutils-r1_src_compile
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# mypy stuff
+		test/test_check.py
+		test/migrate/test_check_migrations.py
+		# TODO: this test clearly requires x11 — so why is wayland
+		# variant being run?
+		'test/backend/x11/test_window.py::test_urgent_hook_fire[wayland-2]'
+		# TODO
+		test/test_hook.py::test_net_wm_icon_change
+	)
+
+	# force usage of built module
+	rm -rf libqtile || die
+
+	# some tests expect bin/qtile
+	ln -fs "$(type -P qtile)" bin/qtile || die
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x TZ=UTC
+	nonfatal epytest -p rerunfailures --reruns=5 \
+		--backend=x11 $(usev wayland '--backend=wayland') ||
+		die -n "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGELOG README.rst )
+	distutils-r1_python_install_all
+
+	insinto /usr/share/xsessions
+	doins resources/qtile.desktop
+
+	insinto /usr/share/wayland-sessions
+	doins resources/qtile-wayland.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session-r1 ${PN}
+}
diff --git a/xfce-base/xfdesktop/xfdesktop-4.20.0.ebuild b/xfce-base/xfdesktop/xfdesktop-4.20.0.ebuild
index d97cfd02a29d..035aed4acb44 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.20.0.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.20.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
@@ -25,7 +25,7 @@ DEPEND="
 	>=x11-libs/gtk+-3.24.0:3[wayland?,X?]
 	>=xfce-base/exo-0.11:=
 	>=xfce-base/garcon-0.6:=
-	>=xfce-base/libxfce4ui-4.18.0:=
+	>=xfce-base/libxfce4ui-4.18.0:=[X(+)?]
 	>=xfce-base/libxfce4util-4.13:=
 	>=xfce-base/libxfce4windowing-4.19.8:=[X?]
 	>=xfce-base/xfconf-4.19.3:=
diff --git a/xfce-extra/thunar-shares-plugin/Manifest b/xfce-extra/thunar-shares-plugin/Manifest
index c948b22e0093..c3b3a75917ad 100644
--- a/xfce-extra/thunar-shares-plugin/Manifest
+++ b/xfce-extra/thunar-shares-plugin/Manifest
@@ -1 +1,2 @@
 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
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
+}